diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7778595da407..05ce9aec0135 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -203,3 +203,6 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b # sqlc: format with nixfmt 2bdec131b2bb2c8563f4556d741d34ccb77409e2 + +# treewide: migrate packages to pkgs/by-name, take 1 +571c71e6f73af34a229414f51585738894211408 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index eb8b282c7b36..000000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,4 +0,0 @@ -# Use ci/OWNERS instead -# -# This file would be for the native code owner feature of GitHub, -# but is not being used because of its problems, see ci/OWNERS diff --git a/.github/ISSUE_TEMPLATE/module_request.md b/.github/ISSUE_TEMPLATE/module_request.md new file mode 100644 index 000000000000..db0b68cfe453 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/module_request.md @@ -0,0 +1,27 @@ +--- +name: Module requests +about: For NixOS modules that you would like to see +title: 'Module request: MODULENAME' +labels: '9.needs: module (new)' +assignees: '' + +--- + +### Description + + + +### Notify maintainers + + + +----- + +Note for maintainers: Please tag this issue in your PR. + +--- + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/labeler.yml b/.github/labeler.yml index 2a22d38cff16..1d8e612d4ed3 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,4 @@ +# NOTE: bsd, darwin and cross-compilation labels are handled by ofborg "6.topic: agda": - any: - changed-files: @@ -21,6 +22,47 @@ - pkgs/by-name/ne/nemo/**/* - pkgs/by-name/ne/nemo-*/**/* +"6.topic: continuous integration": + - any: + - changed-files: + - any-glob-to-any-file: + - .github/**/* + - ci/**/* + +"6.topic: coq": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/science/logic/coq/**/* + - pkgs/development/coq-modules/**/* + - pkgs/top-level/coq-packages.nix + +"6.topic: crystal": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/compilers/crystal/**/* + +"6.topic: cuda": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/cuda-modules/**/* + - pkgs/top-level/cuda-packages.nix + +"6.topic: deepin": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/desktops/deepin/**/* + - pkgs/desktops/deepin/**/* + +"6.topic: docker tools": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/virtualization/docker/**/* + "6.topic: dotnet": - any: - changed-files: @@ -86,6 +128,12 @@ - pkgs/build-support/flutter/*.nix - pkgs/development/compilers/flutter/**/*.nix +"6.topic: games": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/games/**/* + "6.topic: GNOME": - any: - changed-files: @@ -105,6 +153,12 @@ - pkgs/build-support/go/**/* - pkgs/development/compilers/go/**/* +"6.topic: hardware": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/hardware/**/* + "6.topic: haskell": - any: - changed-files: @@ -118,6 +172,28 @@ - pkgs/top-level/haskell-packages.nix - pkgs/top-level/release-haskell.nix +"6.topic: java": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/programs/java.nix + - pkgs/development/compilers/graalvm/**/* + - pkgs/development/compilers/openjdk/**/* + - pkgs/development/compilers/temurin-bin/**/* + - pkgs/development/compilers/zulu/**/* + - pkgs/development/java-modules/**/* + - pkgs/top-level/java-packages.nix + +"6.topic: jitsi": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/networking/jitsi-videobridge.nix + - nixos/modules/services/web-apps/jitsi-meet.nix + - pkgs/servers/web-apps/jitsi-meet/**/* + - pkgs/servers/jitsi-videobridge/**/* + - pkgs/applications/networking/instant-messengers/jitsi/**/* + "6.topic: julia": - any: - changed-files: @@ -205,13 +281,27 @@ - lib/tests/modules.sh - lib/tests/modules/** +"6.topic: musl": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/linux/musl/**/* + "6.topic: nixos": - any: - changed-files: - any-glob-to-any-file: - nixos/**/* + - pkgs/by-name/sw/switch-to-configuration-ng/**/* - pkgs/os-specific/linux/nixos-rebuild/**/* +"6.topic: nixos-container": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/virtualisation/nixos-containers.nix + - pkgs/tools/virtualization/nixos-container/**/* + "6.topic: nim": - any: - changed-files: @@ -233,6 +323,15 @@ - pkgs/development/tools/pnpm/**/* - pkgs/development/web/nodejs/* +"6.topic: nvidia": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/hardware/video/nvidia.nix + - nixos/modules/services/hardware/nvidia-container-toolkit/**/* + - nixos/modules/services/hardware/nvidia-optimus.nix + - pkgs/os-specific/linux/nvidia-x11/**/* + "6.topic: ocaml": - any: - changed-files: @@ -305,6 +404,19 @@ - pkgs/development/libraries/kde-frameworks/**/* - pkgs/development/libraries/qt-5/**/* +"6.topic: R": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/science/math/R/**/* + - pkgs/development/r-modules/**/* + +"6.topic: rocm": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/rocm-modules/**/* + "6.topic: ruby": - any: - changed-files: @@ -373,6 +485,12 @@ - nixos/tests/make-test-python.nix # legacy # lib/debug.nix has a test framework (runTests) but it's not the main focus +"6.topic: updaters": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/common-updater/**/* + "6.topic: vim": - any: - changed-files: @@ -389,6 +507,12 @@ - any-glob-to-any-file: - pkgs/applications/editors/vscode/**/* +"6.topic: windows": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/windows/**/* + "6.topic: xen-project": - any: - changed-files: diff --git a/.mailmap b/.mailmap index 12ba1f6ae442..0f088a4fd3be 100644 --- a/.mailmap +++ b/.mailmap @@ -6,6 +6,8 @@ Christina Sørensen Christina Sørensen <89321978+cafkafk@users.noreply.github.com> Daniel Løvbrøtte Olsen Fabian Affolter +Fiona Behrens +Fiona Behrens goatastronaut0212 Janne Heß Jörg Thalheim diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b9599f4a2e66..f40d7df3b557 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -313,6 +313,7 @@ Container system, boot system and library changes are some examples of the pull To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise: +- the PR author should be @r-ryantm; - the commenter that issued the command should be among the package maintainers; - the package should reside in `pkgs/by-name`. diff --git a/ci/OWNERS b/ci/OWNERS index cf2e1a86d36f..f94fdbc77eaf 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -18,8 +18,8 @@ /.github/workflows/check-nix-format.yml @infinisil /.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron /.github/workflows/codeowners-v2.yml @infinisil -/ci/OWNERS @infinisil /ci @infinisil @philiptaron @NixOS/Security +/ci/OWNERS @infinisil @philiptaron # Development support /.editorconfig @Mic92 @zowoq @@ -58,7 +58,7 @@ /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus -/pkgs/build-support/setup-hooks/auto-patchelf.py @layus +/pkgs/by-name/au/auto-patchelf @layus /pkgs/pkgs-lib @infinisil ## Format generators/serializers /pkgs/pkgs-lib/formats/libconfig @h7x4 @@ -206,6 +206,12 @@ pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt +# Java +/doc/languages-frameworks/java.section.md @NixOS/java +/doc/languages-frameworks/gradle.section.md @NixOS/java +/doc/languages-frameworks/maven.section.md @NixOS/java +/pkgs/top-level/java-packages.nix @NixOS/java + # Jetbrains /pkgs/applications/editors/jetbrains @edwtjo @@ -226,17 +232,17 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel # PostgreSQL and related stuff -/pkgs/servers/sql/postgresql @thoughtpolice -/nixos/modules/services/databases/postgresql.md @thoughtpolice -/nixos/modules/services/databases/postgresql.nix @thoughtpolice -/nixos/tests/postgresql.nix @thoughtpolice +/pkgs/servers/sql/postgresql @NixOS/postgres +/nixos/modules/services/databases/postgresql.md @NixOS/postgres +/nixos/modules/services/databases/postgresql.nix @NixOS/postgres +/nixos/tests/postgresql @NixOS/postgres # Hardened profile & related modules -/nixos/modules/profiles/hardened.nix @joachifm -/nixos/modules/security/lock-kernel-modules.nix @joachifm -/nixos/modules/security/misc.nix @joachifm -/nixos/tests/hardened.nix @joachifm -/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm +/nixos/modules/profiles/hardened.nix @joachifm +/nixos/modules/security/lock-kernel-modules.nix @joachifm +/nixos/modules/security/misc.nix @joachifm +/nixos/tests/hardened.nix @joachifm +/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr @joachifm # Home Automation /nixos/modules/services/home-automation/home-assistant.nix @mweinelt @@ -248,13 +254,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Network Time Daemons /pkgs/by-name/ch/chrony @thoughtpolice -/pkgs/tools/networking/ntp @thoughtpolice -/pkgs/tools/networking/openntpd @thoughtpolice +/pkgs/by-name/nt/ntp @thoughtpolice +/pkgs/by-name/op/openntpd @thoughtpolice /nixos/modules/services/networking/ntp @thoughtpolice # Network -/pkgs/tools/networking/kea/default.nix @mweinelt -/pkgs/tools/networking/babeld/default.nix @mweinelt +/pkgs/by-name/ke/kea @mweinelt +/pkgs/by-name/ba/babeld @mweinelt /nixos/modules/services/networking/babeld.nix @mweinelt /nixos/modules/services/networking/kea.nix @mweinelt /nixos/modules/services/networking/knot.nix @mweinelt @@ -296,10 +302,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/kakoune @philiptaron # Neovim -/pkgs/applications/editors/neovim @figsoda @teto +/pkgs/applications/editors/neovim @NixOS/neovim # VimPlugins -/pkgs/applications/editors/vim/plugins @figsoda +/pkgs/applications/editors/vim/plugins @NixOS/neovim # VsCode Extensions /pkgs/applications/editors/vscode/extensions @@ -338,6 +344,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/by-name/ne/nemo @mkg20001 /pkgs/by-name/ne/nemo-* @mkg20001 +# Xfce +/doc/hooks/xfce4-dev-tools.section.md @NixOS/xfce + # nim /doc/languages-frameworks/nim.section.md @ehmry /pkgs/build-support/build-nim-package.nix @ehmry @@ -404,14 +413,19 @@ pkgs/by-name/lx/lxc* @adamcstephens # GNU Tar & Zip /pkgs/tools/archivers/gnutar @RossComputerGuy -/pkgs/tools/archivers/zip @RossComputerGuy +/pkgs/by-name/zi/zip @RossComputerGuy # SELinux -/pkgs/os-specific/linux/checkpolicy @RossComputerGuy -/pkgs/os-specific/linux/libselinux @RossComputerGuy -/pkgs/os-specific/linux/libsepol @RossComputerGuy +/pkgs/by-name/ch/checkpolicy @RossComputerGuy +/pkgs/by-name/li/libselinux @RossComputerGuy +/pkgs/by-name/li/libsepol @RossComputerGuy # installShellFiles /pkgs/by-name/in/installShellFiles/* @Ericson2314 /pkgs/test/install-shell-files/* @Ericson2314 /doc/hooks/installShellFiles.section.md @Ericson2314 + +# Darwin +/pkgs/by-name/ap/apple-sdk @NixOS/darwin-core +/pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core +/pkgs/stdenv/darwin @NixOS/darwin-core diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md index b1640af9dff9..cbd40ab6c35f 100644 --- a/doc/build-helpers/images/appimagetools.section.md +++ b/doc/build-helpers/images/appimagetools.section.md @@ -117,7 +117,7 @@ in appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ $out/share/icons/hicolor/512x512/apps/irccloud.png substituteInPlace $out/share/applications/irccloud.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; } ``` @@ -147,7 +147,7 @@ let appimageContents = appimageTools.extract { inherit pname version src; postExtract = '' - substituteInPlace $out/irccloud.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; }; in appimageTools.wrapType2 { diff --git a/doc/hooks/aws-c-common.section.md b/doc/hooks/aws-c-common.section.md new file mode 100644 index 000000000000..c631f61589df --- /dev/null +++ b/doc/hooks/aws-c-common.section.md @@ -0,0 +1,4 @@ +# `aws-c-common` {#aws-c-common} + +This hook exposes its own [CMake](#cmake) modules by setting [`CMAKE_MODULE_PATH`](https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html) through [the `cmakeFlags` variable](#cmake-flags) +to the nonstandard `$out/lib/cmake` directory, as a workaround for [an upstream bug](https://github.com/awslabs/aws-c-common/issues/844). diff --git a/doc/hooks/index.md b/doc/hooks/index.md index aaa447373516..e4b744056c5e 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -8,6 +8,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks). autoconf.section.md automake.section.md autopatchelf.section.md +aws-c-common.section.md bmake.section.md breakpoint.section.md cernlib.section.md @@ -39,4 +40,5 @@ versionCheckHook.section.md waf.section.md zig.section.md xcbuild.section.md +xfce4-dev-tools.section.md ``` diff --git a/doc/hooks/just.section.md b/doc/hooks/just.section.md index 0eb4864ac74b..b01a0d04e4cf 100644 --- a/doc/hooks/just.section.md +++ b/doc/hooks/just.section.md @@ -6,7 +6,7 @@ This setup hook attempts to use [the `just` command runner](https://just.systems ## `buildPhase` {#just-hook-buildPhase} -This phase attempts to invoke `just` with [the default recipe](https://just.systems/man/en/chapter_23.html). +This phase attempts to invoke `just` with [the default recipe](https://just.systems/man/en/the-default-recipe.html). []{#just-hook-dontUseJustBuild} This behavior can be disabled by setting `dontUseJustBuild` to `true`. diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 1f468950580a..7658f413b880 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -21,7 +21,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. npmHooks, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ glib-networking # Most Tauri apps need networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/doc/hooks/xfce4-dev-tools.section.md b/doc/hooks/xfce4-dev-tools.section.md new file mode 100644 index 000000000000..6c0d54a0b005 --- /dev/null +++ b/doc/hooks/xfce4-dev-tools.section.md @@ -0,0 +1,5 @@ +# `xfce.xfce4-dev-tools` {#xfce4-dev-tools} + +This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`. + +[]{#dontUseXdtAutogenPhase} This behavior can be disabled by setting `dontUseXdtAutogenPhase` to `true`. diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index af52a3d31d05..bb394a243b79 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -150,7 +150,7 @@ All new projects should use the CUDA redistributables available in [`cudaPackage In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. -## Running Docker or Podman containers with CUDA support {#running-docker-or-podman-containers-with-cuda-support} +## Running Docker or Podman containers with CUDA support {#cuda-docker-podman} It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html). diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 02dfa3508c4f..8374d55ac2f7 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -64,7 +64,7 @@ To avoid costly file system access when locating icons, GTK, [as well as Qt](htt ### Packaging icon themes {#ssec-icon-theme-packaging} -Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. +Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. The package `hicolor-icon-theme` provides a setup hook which makes symbolic links for the parent themes into the directory `share/icons` of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with `hicolor-icon-theme`. diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 247daf8d1dbe..feeb6f38673d 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -191,6 +191,10 @@ and `version` from Hackage. `sha256` : Hash to use for the default case of `src`. +`sourceRoot`, `setSourceRoot` +: Passed to `stdenv.mkDerivation`; see [“Variables controlling the unpack +phase”](#variables-controlling-the-unpack-phase). + `revision` : Revision number of the updated cabal file to fetch from Hackage. If `null` (which is the default value), the one included in `src` is used. @@ -760,7 +764,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_6_2_0; + Cabal = self.Cabal_3_14_0_0; }) ``` diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md index 6d56ffcd4503..5208a6388a32 100644 --- a/doc/languages-frameworks/java.section.md +++ b/doc/languages-frameworks/java.section.md @@ -33,8 +33,7 @@ stdenv.mkDerivation { ``` Note that `jdk` is an alias for the OpenJDK (self-built where available, -or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs -(`Aarch32`, `Aarch64`) point to the (unfree) `oraclejdk`. +or pre-built via Zulu). Also note that not using `stripJavaArchivesHook` will likely cause the generated `.jar` files to be non-deterministic, which is not optimal. diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 808936f49e60..db1fd01bf0f1 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -162,9 +162,10 @@ rustPlatform.buildRustPackage { } ``` -Note that setting `cargoLock.lockFile` or `cargoLock.lockFileContents` -doesn't add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still -required to build a rust package. A simple fix is to use: +If the upstream source repository lacks a `Cargo.lock` file, you must add one +to `src`, as it is essential for building a Rust package. Setting +`cargoLock.lockFile` or `cargoLock.lockFileContents` will not automatically add +a `Cargo.lock` file to `src`. A straightforward solution is to use: ```nix { @@ -678,7 +679,7 @@ Some projects, especially GNOME applications, are built with the Meson Build Sys , blueprint-compiler , libadwaita , libsecret -, tracker +, tinysparql }: stdenv.mkDerivation rec { @@ -712,7 +713,7 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita libsecret - tracker + tinysparql ]; # ... diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index 9b0fdd149f9a..7e06a9bab30f 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -2,66 +2,301 @@ ## Darwin (macOS) {#sec-darwin} -Some common issues when packaging software for Darwin: +The Darwin `stdenv` differs from most other ones in Nixpkgs in a few key ways. +These differences reflect the default assumptions for building software on that platform. +In many cases, you can ignore these differences because the software you are packaging is already written with them in mind. +When you do that, write your derivation as normal. You don’t have to include any Darwin-specific special cases. +The easiest way to know whether your derivation requires special handling for Darwin is to write it as if it doesn’t and see if it works. +If it does, you’re done; skip the rest of this. -- The Darwin `stdenv` uses clang instead of gcc. When referring to the compiler `$CC` or `cc` will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like `makeFlags = [ "CC=cc" ];` or by patching the build scripts. +- Darwin uses Clang by default instead of GCC. Packages that refer to `$CC` or `cc` should just work in most cases. + Some packages may hardcode `gcc` or `g++`. You can usually fix that by setting `makeFlags = [ "CC=cc" "CXX=C++" ]`. + If that does not work, you will have to patch the build scripts yourself to use the correct compiler for Darwin. +- Darwin needs an SDK to build software. + The SDK provides a default set of frameworks and libraries to build software, most of which are specific to Darwin. + There are multiple versions of the SDK packages in Nixpkgs, but one is included by default in the `stdenv`. + Usually, you don’t have to change or pick a different SDK. When in doubt, use the default. +- The SDK used by your build can be found using the `DEVELOPER_DIR` environment variable. + There are also versions of this variable available when cross-compiling depending on the SDK’s role. + The `SDKROOT` variable is also set with the path to the SDK’s libraries and frameworks. + `SDKROOT` is always a sub-folder of `DEVELOPER_DIR`. +- Darwin includes a platform-specific tool called `xcrun` to help builds locate binaries they need. + A version of `xcrun` is part of the `stdenv` on Darwin. + If your package invokes `xcrun` via an absolute path (such as `/usr/bin/xcrun`), you will need to patch the build scripts to use `xcrun` instead. - ```nix - stdenv.mkDerivation { - name = "libfoo-1.2.3"; +To reiterate: you usually don’t have to worry about this stuff. +Start with writing your derivation as if everything is already set up for you (because in most cases it already is). +If you run into issues or failures, continue reading below for how to deal with the most common issues you may encounter. + +### Darwin Issue Troubleshooting {#sec-darwin-troubleshooting} + +#### Package requires a non-default SDK or fails to build due to missing frameworks or symbols {#sec-darwin-troubleshooting-using-sdks} + +In some cases, you may have to use a non-default SDK. +This can happen when a package requires APIs that are not present in the default SDK. +For example, Metal Performance Shaders were added in macOS 12. +If the default SDK is 11.3, then a package that requires Metal Performance Shaders will fail to build due to missing frameworks and symbols. + +To use a non-default SDK, add it to your derivation’s `buildInputs`. +It is not necessary to override the SDK in the `stdenv` nor is it necessary to override the SDK used by your dependencies. +If your derivation needs a non-default SDK at build time (e.g., for a `depsBuildBuild` compiler), see the cross-compilation documentation for which input you should use. + +When determining whether to use a non-default SDK, consider the following: + +- Try building your derivation with the default SDK. If it works, you’re done. +- If the package specifies a specific version, use that. See below for how to map Xcode version to SDK version. +- If the package’s documentation indicates it supports optional features on newer SDKs, consider using the SDK that enables those features. + If you’re not sure, use the default SDK. + +Note: It is possible to have multiple, different SDK versions in your inputs. +When that happens, the one with the highest version is always used. + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildInputs = [ apple-sdk_14 ]; +} +``` + +#### What is a “deployment target” (or minimum version)? {#sec-darwin-troubleshooting-using-deployment-targets} + +The “deployment target” refers to the minimum version of macOS that is expected to run an application. +In most cases, the default is fine, and you don’t have to do anything else. +If you’re not sure, don’t do anything, and that will probably be fine. + +Some packages require setting a non-default deployment target (or minimum version) to gain access to certain APIs. +You do that using the `darwinMinVersionHook`, which takes the deployment target version as a parameter. +There are primarily two ways to determine the deployment target. + +- The upstream documentation will specify a deployment target or minimum version. Use that. +- The build will fail because an API requires a certain version. Use that. +- In all other cases, you probably don’t need to specify a minimum version. The default is usually good enough. + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 12.5. + buildInputs = [ (darwinMinVersionHook "12.5") ]; +} +``` + +Note: It is possible to have multiple, different instances of `darwinMinVerisonHook` in your inputs. +When that happens, the one with the highest version is always used. + +#### Picking an SDK version {#sec-darwin-troubleshooting-picking-sdk-version} + +The following is a list of Xcode versions, the SDK version in Nixpkgs, and the attribute to use to add it. +Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use. +Generally, only the last SDK release for a major version is packaged (each _x_ in 10._x_ until 10.15 is considered a major version). + +| Xcode version | SDK version | Nixpkgs attribute | +|--------------------|---------------------------------------------------|-------------------| +| Varies by platform | 10.12.2 (x86_64-darwin)
11.3 (aarch64-darwin) | `apple-sdk` | +| 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` | +| 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` | +| 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` | +| 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` | +| 12.0–12.5.1 | 11.3 | `apple-sdk_11` | +| 13.0–13.4.1 | 12.3 | `apple-sdk_12` | +| 14.0–14.3.1 | 13.3 | `apple-sdk_13` | +| 15.0–15.4 | 14.4 | `apple-sdk_14` | +| 16.0 | 15.0 | `apple-sdk_15` | + + +#### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults} + +The current default versions of the deployment target (minimum version) and SDK are indicated by Darwin-specific attributes on the platform. Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds. +If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes. + +- `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin. + It sets the default deployment target. +- `darwinSdkVersion` defaults to 10.12 on x86-64-darwin and 11.0 on aarch64-darwin. + Only the major version determines the SDK version, resulting in the 10.12.2 and 11.3 SDKs being used on these platforms respectively. + + +#### `xcrun` cannot find a binary {#sec-darwin-troubleshooting-xcrun} + +`xcrun` searches `PATH` and the SDK’s toolchain for binaries to run. +If it cannot find a required binary, it will fail. When that happens, add the package for that binary to your derivation’s `nativeBuildInputs` (or `nativeCheckInputs` if the failure is happening when running tests). + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + nativeBuildInputs = [ bison ]; + buildCommand = '' + xcrun bison foo.y # produces foo.tab.c # ... - buildPhase = '' - $CC -o hello hello.c - ''; - } - ``` + ''; +} +``` -- On Darwin, libraries are linked using absolute paths, libraries are resolved by their `install_name` at link time. Sometimes packages won’t set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running `install_name_tool -id` during the `fixupPhase`. +#### Package requires `xcodebuild` {#sec-darwin-troubleshooting-xcodebuild} - ```nix - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - makeFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; - } - ``` +The xcbuild package provides an `xcodebuild` command for packages that really depend on Xcode. +This replacement is not 100% compatible and may run into some issues, but it is able to build many packages. +To use `xcodebuild`, add `xcbuildHook` to your package’s `nativeBuildInputs`. +It will provide a `buildPhase` for your derivation. +You can use `xcbuildFlags` to specify flags to `xcodebuild` such as the required schema. +If a schema has spaces in its name, you must set `__structuredAttrs` to `true`. +See MoltenVK for an example of setting up xcbuild. -- Even if the libraries are linked using absolute paths and resolved via their `install_name` correctly, tests can sometimes fail to run binaries. This happens because the `checkPhase` runs before the libraries are installed. +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + xcbuildFlags = [ + "-configuration" + "Release" + "-project" + "libfoo-project.xcodeproj" + "-scheme" + "libfoo Package (macOS only)" + ]; + __structuredAttrs = true; +} +``` - This can usually be solved by running the tests after the `installPhase` or alternatively by using `DYLD_LIBRARY_PATH`. More information about this variable can be found in the *dyld(1)* manpage. +##### Fixing absolute paths to `xcodebuild`, `xcrun`, and `PlistBuddy` {#sec-darwin-troubleshooting-xcodebuild-absolute-paths} - ``` - dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib - Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq - Reason: image not found - ./tests/jqtest: line 5: 75779 Abort trap: 6 - ``` +Many build systems hardcode the absolute paths to `xcodebuild`, `xcrun`, and `PlistBuddy` as `/usr/bin/xcodebuild`, `/usr/bin/xcrun`, and `/usr/libexec/PlistBuddy` respectively. +These paths will need to be replaced with relative paths and the xcbuild package if `xcodebuild` or `PListBuddy` are used. - ```nix - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - doInstallCheck = true; - installCheckTarget = "check"; - } - ``` +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + postPatch = '' + subsituteInPlace Makefile \ + --replace-fail '/usr/bin/xcodebuild' 'xcodebuild' \ + --replace-fail '/usr/bin/xcrun' 'xcrun' \ + --replace-fail '/usr/bin/PListBuddy' 'PListBuddy' + ''; +} +``` -- Some packages assume xcode is available and use `xcrun` to resolve build tools like `clang`, etc. This causes errors like `xcode-select: error: no developer tools were found at '/Applications/Xcode.app'` while the build doesn’t actually depend on xcode. +#### How to use libiconv on Darwin {#sec-darwin-troubleshooting-libiconv} - ```nix - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - prePatch = '' - substituteInPlace Makefile \ - --replace-fail '/usr/bin/xcrun clang' clang - ''; - } - ``` +The libiconv package is included in the SDK by default along with libresolv and libsbuf. +You do not need to do anything to use these packages. They are available automatically. +If your derivation needs the `iconv` binary, add the `libiconv` package to your `nativeBuildInputs` (or `nativeCheckInputs` for tests). - The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. +#### Library install name issues {#sec-darwin-troubleshooting-install-name} -- x86_64-darwin uses the 10.12 SDK by default, but some software is not compatible with that version of the SDK. In that case, - the 11.0 SDK used by aarch64-darwin is available for use on x86_64-darwin. To use it, reference `apple_sdk_11_0` instead of - `apple_sdk` in your derivation and use `pkgs.darwin.apple_sdk_11_0.callPackage` instead of `pkgs.callPackage`. On Linux, this will - have the same effect as `pkgs.callPackage`, so you can use `pkgs.darwin.apple_sdk_11_0.callPackage` regardless of platform. +Libraries on Darwin are usually linked with absolute paths. +This is determined by something called an “install name”, which is resolved at link time. +Sometimes packages will not set this correctly, causing binaries linking to it not to find their libraries at runtime. +This can be fixed by adding extra linker flags or by using `install_name_tool` to set it in `fixupPhase`. + +##### Setting the install name via linker flags {#sec-darwin-troubleshooting-install-name-linker-flags} + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; +} +``` + +##### Setting the install name using `install_name_tool` {#sec-darwin-troubleshooting-install-name-install_name_tool} + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + postFixup = '' + # `-id ` takes the install name. The last parameter is the path to the library. + ${stdenv.cc.targetPrefix}install_name_tool -id "$out/lib/libfoo.dylib" "$out/lib/libfoo.dylib" + ''; +} +``` + +Even if libraries are linked using absolute paths and resolved via their install name correctly, tests in `checkPhase` can sometimes fail to run binaries because they are linked against libraries that have not yet been installed. +This can usually be solved by running the tests after the `installPhase` or by using `DYLD_LIBRARY_PATH` (see {manpage}`dyld(1)` for more on setting `DYLD_LIBRARY_PATH`). + +##### Setting the install name using `fixDarwinDylibNames` hook {#sec-darwin-troubleshooting-install-name-fixDarwinDylibNames} + +If your package has numerous dylibs needing fixed, while it is preferable to fix the issue in the package’s build, you can update them all by adding the `fixDarwinDylibNames` hook to your `nativeBuildInputs`. +This hook will scan your package’s outputs for dylibs and correct their install names. +Note that if any binaries in your outputs linked those dylibs, you may need to use `install_name_tool` to replace references to them with the correct paths. + +#### Propagating an SDK (advanced, compilers-only) {#sec-darwin-troubleshooting-propagating-sdks} + +The SDK is a package, and it can be propagated. +`darwinMinVersionHook` with a version specified can also be propagated. +However, most packages should *not* do this. +The exception is compilers. +When you propagate an SDK, it becomes part of your derivation’s public API, and changing the SDK or removing it can be a breaking change. +That is why propagating it is only recommended for compilers. + +When authoring a compiler derivation, propagate the SDK only for the ways you expect users to use your compiler. +Depending on your expected use cases, you may have to do one or all of these. + +- Put it in `depsTargetTargetPropagated` when your compiler is expected to be added to `nativeBuildInputs`. + That will ensure the SDK is effectively part of the target derivation’s `buildInputs`. +- If your compiler uses a hook, put it in the hook’s `depsTargetTargetPropagated` instead. + The effect should be the same as the above. +- If your package uses the builder pattern, update your builder to add the SDK to the derivation’s `buildInputs`. + +If you’re not sure whether to propagate an SDK, don’t. +If your package is a compiler or language, and you’re not sure, ask @NixOS/darwin-maintainers for help deciding. + +### Dealing with `darwin.apple_sdk.frameworks` {#sec-darwin-legacy-frameworks} + +You may see references to `darwin.apple_sdk.frameworks`. +This is the legacy SDK pattern, and it is being phased out. +All packages in `darwin.apple_sdk`, `darwin.apple_sdk_11_0`, and `darwin.apple_sdk_12_3` are stubs that do nothing. +If your derivation references them, you can delete them. The default SDK should be enough to build your package. + +Note: the new SDK pattern uses the name `apple-sdk` to better align with Nixpkgs naming conventions. +The legacy SDK pattern uses `apple_sdk`. +You always know you are using the old SDK pattern if the name is `apple_sdk`. + +Some derivations may depend on the location of frameworks in those old packages. +To update your derivation to find them in the new SDK, use `$SDKROOT` instead in `preConfigure`. +For example, if you substitute `${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework` in `postPatch`, replace it with `$SDKROOT/System/Library/Frameworks/OpenGL.framework` in `preConfigure`. + +Note that if your derivation is changing a system path (such as `/System/Library/Frameworks/OpenGL.framework`), you may be able to remove the path. +Compilers and binutils targeting Darwin look for system paths in the SDK sysroot. +Some of them (such as Zig or `bindgen` for Rust) depend on it. + +#### Updating legacy SDK overrides {#sec-darwin-legacy-frameworks-overrides} + +The legacy SDK provided two ways of overriding the default SDK. +These are both being phased out along with the legacy SDKs. +They have been updated to set up the new SDK for you, but you should replace them with doing that directly. + +- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK. + It now adds the `apple-sdk_11` package to your derivation’s build inputs. +- `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies. + It now adds the `apple-sdk_11` package for `11.0` or the `apple-sdk_12` package for `12.3`. + If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version. + No other SDK versions are supported. + +### Darwin Cross-Compilation {#sec-darwin-legacy-cross-compilation} + +Darwin supports cross-compilation between Darwin platforms. +Cross-compilation from Linux is not currently supported but may be supported in the future. +To cross-compile to Darwin, you can set `crossSystem` or use one of the Darwin systems in `pkgsCross`. +The `darwinMinVersionHook` and the SDKs support cross-compilation. +If you need to specify a different SDK version for a `depsBuildBuild` compiler, add it to your `nativeBuildInputs`. + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ apple-sdk_12 ]; + buildInputs = [ apple-sdk_13 ]; + depsTargetTargetPropagated = [ apple-sdk_14 ]; +} +# The build-build `clang` will use the 12.3 SDK while the package build itself will use the 13.3 SDK. +# Derivations that add this package as an input will have the 14.4 SDK propagated to them. +``` + +The different target SDK and hooks are mangled based on role: + +- `DEVELOPER_DIR_FOR_BUILD` and `MACOSX_DEPLOYMENT_TARGET_FOR_BUILD` for the build platform; +- `DEVELOPER_DIR` and `MACOSX_DEPLOYMENT_TARGET` for the host platform; and +- `DEVELOPER_DIR_FOR_TARGET` and `MACOSX_DEPLOYMENT_TARGET_FOR_TARGET` for the build platform. + +In static compilation situations, it is possible for the build and host platform to be the same platform but have different SDKs with the same version (one dynamic and one static). +cc-wrapper and bintools-wrapper take care of handling this distinction. diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 7b8feb4fe89b..3001e4ec93b5 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -7,7 +7,7 @@ let inherit (builtins) head length; inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs warn warnIf; inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; - inherit (lib.lists) foldr foldl' concatMap elemAt all partition groupBy take foldl; + inherit (lib.lists) filter foldr foldl' concatMap elemAt all partition groupBy take foldl; in rec { @@ -644,8 +644,7 @@ rec { filterAttrs = pred: set: - listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set)); - + removeAttrs set (filter (name: ! pred name set.${name}) (attrNames set)); /** Filter an attribute set recursively by removing all attributes for diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index ccc897755c11..1de5351d95aa 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -160,7 +160,9 @@ rec { A fixed-point function returning an attribute set has the form ```nix - final: { # attributes } + final: { + # attributes + } ``` where `final` refers to the lazily evaluated attribute set returned by the fixed-point function. @@ -168,7 +170,9 @@ rec { An overlay to such a fixed-point function has the form ```nix - final: prev: { # attributes } + final: prev: { + # attributes + } ``` where `prev` refers to the result of the original function to `final`, and `final` is the result of the composition of the overlay and the original function. @@ -177,8 +181,12 @@ rec { ```nix let - f = final: { # attributes }; - overlay = final: prev: { # attributes }; + f = final: { + # attributes + }; + overlay = final: prev: { + # attributes + }; in extends overlay f; ``` @@ -186,8 +194,12 @@ rec { ```nix let - f = final: { # attributes }; - overlay = final: prev: { # attributes }; + f = final: { + # attributes + }; + overlay = final: prev: { + # attributes + }; g = extends overlay f; in fix g ``` diff --git a/lib/licenses.nix b/lib/licenses.nix index 6ba244b88b82..9affe6a2d63c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1212,6 +1212,11 @@ lib.mapAttrs mkLicense ({ fullName = "TCL/TK License"; }; + tost = { + fullName = "Tomorrow Open Source Technology License 1.0"; + url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt"; + }; + ucd = { fullName = "Unicode Character Database License"; url = "https://fedoraproject.org/wiki/Licensing:UCD"; @@ -1290,6 +1295,15 @@ lib.mapAttrs mkLicense ({ watcom = { spdxId = "Watcom-1.0"; fullName = "Sybase Open Watcom Public License 1.0"; + # Despite being OSI‐approved, this licence is not considered FOSS + # by Debian, Fedora, or the FSF, due to an onerous restriction that + # requires publication of even privately‐deployed modifications. + # This violates the FSF’s freedom 3 and Debian’s “desert island + # test” and “dissident test”. + # + # See: + free = false; + redistributable = true; }; w3c = { diff --git a/lib/minver.nix b/lib/minver.nix index 507d45bba4dc..cb9c6ee3156f 100644 --- a/lib/minver.nix +++ b/lib/minver.nix @@ -1,2 +1,2 @@ # Expose the minimum required version for evaluating Nixpkgs -"2.3" +"2.3.17" diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 6939e9a40c2d..f60c6a8addef 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -55,7 +55,7 @@ let "wasm64-wasi" "wasm32-wasi" # Windows - "x86_64-windows" "i686-windows" + "aarch64-windows" "x86_64-windows" "i686-windows" ]; allParsed = map parse.mkSystemFromString all; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 5059f6e0c838..20f96f0849d1 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -325,6 +325,13 @@ rec { libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain }; + # LLVM-based mingw-w64 for ARM + ucrtAarch64 = { + config = "aarch64-w64-mingw32"; + libc = "ucrt"; + useLLVM = true; + }; + # BSDs x86_64-freebsd = { diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 116d86cdfb3f..72b3d630b8da 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -47,6 +47,7 @@ let evalModules extends filter + filterAttrs fix fold foldAttrs @@ -1102,6 +1103,25 @@ runTests { }; }; + testFilterAttrs = { + expr = filterAttrs (n: v: n != "a" && (v.hello or false) == true) { + a.hello = true; + b.hello = true; + c = { + hello = true; + world = false; + }; + d.hello = false; + }; + expected = { + b.hello = true; + c = { + hello = true; + world = false; + }; + }; + }; + # code from example testFoldlAttrs = { expr = { diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index f5e7bdd5b705..3a8054ef4bc8 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -60,7 +60,7 @@ lib.runTests ( testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; - testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; + testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "aarch64-windows" "i686-windows" "x86_64-windows" ]; testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox); }) diff --git a/maintainers/README.md b/maintainers/README.md index 848cb9fed9b5..118356a5168f 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -172,3 +172,6 @@ to the team without an approval by at least one existing member. Various utility scripts, which are mainly useful for nixpkgs maintainers, are available under `./scripts/`. See its [README](./scripts/README.md) for further information. + +# nixpkgs-merge-bot +To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name and the commenter is among the package maintainers. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73a33c907feb..fdd7825291e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -870,6 +870,12 @@ githubId = 56970006; keys = [ { fingerprint = "50E2 669C AB38 2F4A 5F72 1667 0D6B FC01 D45E DADD"; } ]; }; + akotro = { + name = "Antonis Kotronakis"; + email = "mail@akotro.dev"; + github = "akotro"; + githubId = 20772540; + }; akru = { email = "mail@akru.me"; github = "akru"; @@ -1038,6 +1044,12 @@ github = "Alexnortung"; githubId = 1552267; }; + alex-nt = { + email = "nix@azuremyst.org"; + github = "alex-nt"; + githubId = 12470950; + name = "AN"; + }; alexoundos = { email = "alexoundos@gmail.com"; github = "AleXoundOS"; @@ -1070,6 +1082,12 @@ githubId = 50754358; name = "Alex Winter"; }; + alexymantha = { + email = "alexy@mantha.dev"; + github = "alexymantha"; + githubId = 1365231; + name = "Alexy Mantha"; + }; alfarel = { email = "alfarelcynthesis@proton.me"; github = "alfarelcynthesis"; @@ -2122,7 +2140,6 @@ }; aucub = { name = "aucub"; - email = "dr56ekgbb@mozmail.com"; github = "aucub"; githubId = 78630225; }; @@ -2345,7 +2362,7 @@ email = "baduhai@pm.me"; github = "baduhai"; githubId = 31864305; - name = "William"; + name = "William Hai"; }; baitinq = { email = "manuelpalenzuelamerino@gmail.com"; @@ -2951,6 +2968,12 @@ githubId = 535135; name = "Brennon Loveless"; }; + bloxx12 = { + email = "charlie@charlieroot.dev"; + github = "bloxx12"; + githubId = 75451918; + name = "Charlie Root"; + }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; @@ -3891,6 +3914,13 @@ github = "CHN-beta"; githubId = 35858462; }; + ChocolateLoverRaj = { + email = "paranjperajas@gmail.com"; + github = "ChocolateLoverRaj"; + githubId = 52586855; + matrix = "@chocolateloverraj:matrix.org"; + name = "Rajas Paranjpe"; + }; cholli = { email = "christoph.hollizeck@hey.com"; github = "Daholli"; @@ -4349,6 +4379,12 @@ githubId = 18414241; name = "Andreas Erdes"; }; + computerdane = { + email = "danerieber@gmail.com"; + github = "computerdane"; + githubId = 6487079; + name = "Dane Rieber"; + }; confus = { email = "con-f-use@gmx.net"; github = "con-f-use"; @@ -4369,7 +4405,7 @@ githubId = 2083950; }; conni2461 = { - email = "simon.hauser@outlook.com"; + email = "simon-hauser@outlook.com"; github = "Conni2461"; name = "Simon Hauser"; githubId = 15233006; @@ -4416,6 +4452,12 @@ { fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; } ]; }; + corbinwunderlich = { + email = "corbin@wcopy.net"; + github = "CorbinWunderlich"; + githubId = 140280062; + name = "Corbin Wunderlich"; + }; corngood = { email = "corngood@gmail.com"; github = "corngood"; @@ -4747,12 +4789,6 @@ githubId = 24708079; name = "Dan Eads"; }; - danerieber = { - email = "danerieber@gmail.com"; - github = "danerieber"; - githubId = 6487079; - name = "Dane Rieber"; - }; danid3v = { email = "sch220233@spengergasse.at"; github = "DaniD3v"; @@ -5090,6 +5126,11 @@ githubId = 130508846; name = "Elliot Cameron"; }; + deadbaed = { + name = "Philippe Loctaux"; + github = "deadbaed"; + githubId = 8809909; + }; dearrude = { name = "Ebrahim Nejati"; email = "dearrude@tfwno.gf"; @@ -5437,6 +5478,12 @@ githubId = 4490283; name = "diadatp"; }; + diamond-deluxe = { + email = "carbon_lattice@proton.me"; + github = "diamond-deluxe"; + githubId = 112557036; + name = "Diamond"; + }; DianaOlympos = { github = "DianaOlympos"; githubId = 15774340; @@ -5862,6 +5909,12 @@ githubId = 1931963; name = "David Sferruzza"; }; + dsluijk = { + name = "Dany Sluijk"; + email = "nix@dany.dev"; + github = "dsluijk"; + githubId = 8537327; + }; dstengele = { name = "Dennis Stengele"; email = "dennis@stengele.me"; @@ -6613,6 +6666,14 @@ github = "ErinvanderVeen"; githubId = 10973664; }; + erooke = { + email = "ethan@roo.ke"; + name = "Ethan Rooke"; + keys = [ { fingerprint = "B66B EB9F 6111 E44B 7588 8240 B287 4A77 049A 5923"; } ]; + github = "erooke"; + githubId = 46689793; + matrix = "@ethan:roo.ke"; + }; erosennin = { email = "ag@sologoc.com"; github = "erosennin"; @@ -6830,14 +6891,6 @@ githubId = 873530; name = "Alexey Levan"; }; - expipiplus1 = { - email = "nix@monoid.al"; - matrix = "@ellie:monoid.al"; - github = "expipiplus1"; - githubId = 857308; - name = "Ellie Hermaszewska"; - keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; - }; exploitoverload = { email = "nix@exploitoverload.com"; github = "exploitoverload"; @@ -7403,6 +7456,11 @@ githubId = 13279982; name = "freezeboy"; }; + frenetic00 = { + github = "frenetic00"; + githubId = 50942055; + name = "frenetic00"; + }; Fresheyeball = { email = "fresheyeball@gmail.com"; github = "Fresheyeball"; @@ -8241,6 +8299,13 @@ githubId = 201997; name = "Eric Seidel"; }; + griffi-gh = { + name = "Alex Prasol"; + email = "prasol258@gmail.com"; + matrix = "@voxel:nyanbinary.rs"; + github = "griffi-gh"; + githubId = 45996170; + }; grimmauld = { name = "Sören Bender"; email = "soeren@benjos.de"; @@ -8638,6 +8703,12 @@ githubId = 186660; name = "Miao, ZhiCheng"; }; + helsinki-Jo = { + email = "joachim.ernst@helsinki-systems.de"; + github = "helsinki-Jo"; + githubId = 155722885; + name = "Joachim Ernst"; + }; henkery = { email = "jim@reupload.nl"; github = "henkery"; @@ -9101,12 +9172,6 @@ githubId = 30196; name = "Ian Liu Rodrigues"; }; - ianmjones = { - email = "ian@ianmjones.com"; - github = "ianmjones"; - githubId = 4710; - name = "Ian M. Jones"; - }; ianwookim = { email = "ianwookim@gmail.com"; github = "wavewave"; @@ -9342,6 +9407,12 @@ githubId = 36996706; name = "Philip Rying"; }; + imsick = { + email = "lent-lather-excuse@duck.com"; + github = "dvishal485"; + githubId = 26341736; + name = "Vishal Das"; + }; imuli = { email = "i@imu.li"; github = "imuli"; @@ -9487,6 +9558,11 @@ github = "istoph"; githubId = 114227790; }; + istudyatuni = { + name = "Ilia"; + github = "istudyatuni"; + githubId = 43654815; + }; itepastra = { name = "Noa Aarts"; github = "itepastra"; @@ -9494,6 +9570,13 @@ email = "itepastra@gmail.com"; keys = [ { fingerprint = "E681 4CAF 06AE B076 D55D 3E32 A16C DCBF 1472 541F"; } ]; }; + itsvic-dev = { + email = "contact@itsvic.dev"; + name = "Victor B."; + github = "itsvic-dev"; + githubId = 17727163; + keys = [ { fingerprint = "FBAA B86A 101B 4C5F D4F1 25D2 E93D DAC1 7E5D 6CA1"; } ]; + }; ius = { email = "j.de.gram@gmail.com"; name = "Joerie de Gram"; @@ -9697,6 +9780,13 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakecleary = { + email = "shout@jakecleary.net"; + github = "jakecleary"; + githubId = 4572429; + name = "Jake Cleary"; + keys = [ { fingerprint = "6192 E5CC 28B8 FA7E F5F3 775F 3726 5B1E 496C 92A2"; } ]; + }; jakedevs = { email = "work@jakedevs.net"; github = "jakedevs"; @@ -11170,6 +11260,7 @@ name = "katanallama"; }; katexochen = { + email = "katexochen0@gmail.com"; github = "katexochen"; githubId = 49727155; matrix = "@katexochen:matrix.org"; @@ -11223,6 +11314,19 @@ github = "keenanweaver"; githubId = 37268985; }; + kekschen = { + email = "kx@imkx.dev"; + github = "kek5chen"; + githubId = 52585984; + name = "Kek5chen"; + }; + keksgesicht = { + name = "Jan Braun"; + email = "git@keksgesicht.de"; + github = "Keksgesicht"; + githubId = 32649612; + keys = [ { fingerprint = "65DF D21C 22A9 E4CD FD1A 0804 C3D7 16E7 29B3 C86A"; } ]; + }; keldu = { email = "mail@keldu.de"; github = "keldu"; @@ -11518,11 +11622,11 @@ }; kloenk = { email = "me@kloenk.dev"; - matrix = "@kloenk:petabyte.dev"; - name = "Finn Behrens"; - github = "Kloenk"; + matrix = "@kloenk:kloenk.eu"; + name = "Fiona Behrens"; + github = "kloenk"; githubId = 12898828; - keys = [ { fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; } ]; + keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF DD8B 8609 A7B5 19E5 E342"; } ]; }; kmcopper = { email = "kmcopper@danwin1210.me"; @@ -12150,6 +12254,11 @@ github = "lenivaya"; githubId = 49302467; }; + lenny = { + name = "Lenny."; + matrix = "lenny@flipdot.org"; + keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD C7ED 738F C800 6E9E A634"; } ]; + }; leo248 = { github = "leo248"; githubId = 95365184; @@ -12434,6 +12543,12 @@ githubId = 40217331; name = "LizeLive"; }; + llakala = { + email = "elevenaka11@gmail.com"; + github = "llakala"; + githubId = 78693624; + name = "llakala"; + }; lluchs = { email = "lukas.werling@gmail.com"; github = "lluchs"; @@ -13394,6 +13509,12 @@ githubId = 322214; name = "Mathnerd314"; }; + mathstlouis = { + email = "matfino+gh@gmail.com"; + github = "mathstlouis"; + githubId = 35696151; + name = "mathstlouis"; + }; matklad = { email = "aleksey.kladov@gmail.com"; github = "matklad"; @@ -13690,12 +13811,6 @@ githubId = 2971615; name = "Marius Bergmann"; }; - mcaju = { - email = "cajum.bugs@yandex.com"; - github = "CajuM"; - githubId = 10420834; - name = "Mihai-Drosi Caju"; - }; mccartykim = { email = "mccartykim@zoho.com"; github = "mccartykim"; @@ -14189,6 +14304,12 @@ githubId = 38543128; name = "Miles Breslin"; }; + milescranmer = { + email = "miles.cranmer@gmail.com"; + github = "MilesCranmer"; + githubId = 7593028; + name = "Miles Cranmer"; + }; milibopp = { email = "contact@ebopp.de"; github = "milibopp"; @@ -14652,6 +14773,12 @@ githubId = 2072185; name = "Marc Scholten"; }; + mrbenjadmin = { + email = "mrbenjadmin@gmail.com"; + github = "mrbenjadmin"; + githubId = 68156310; + name = "Benjamin Strachan"; + }; mrcjkb = { email = "marc@jakobi.dev"; matrix = "@mrcjk:matrix.org"; @@ -15008,6 +15135,12 @@ name = "Daniel Nagy"; keys = [ { fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; } ]; }; + naho = { + github = "trueNAHO"; + githubId = 90870942; + name = "Noah Pierre Biewesch"; + keys = [ { fingerprint = "5FC6 088A FB1A 609D 4532 F919 0C1C 177B 3B64 68E0"; } ]; + }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; @@ -15525,6 +15658,12 @@ githubId = 3159451; name = "Nicolas Schneider"; }; + nipeharefa = { + name = "Nipe Harefa"; + email = "nipeharefa@gmail.com"; + github = "nipeharefa"; + githubId = 12620257; + }; NIS = { name = "NSC IT Solutions"; github = "dev-nis"; @@ -16095,6 +16234,12 @@ githubId = 1538622; name = "Michael Reilly"; }; + ondt = { + name = "Ondrej Telka"; + email = "nix@ondt.dev"; + github = "ondt"; + githubId = 20520951; + }; onedragon = { name = "YiLong Liu"; email = "18922251299@163.com"; @@ -16712,6 +16857,12 @@ githubId = 63069986; name = "Per Stark"; }; + petee = { + name = "Pete Erickson"; + email = "pete.perickson@gmail.com"; + github = "petee"; + githubId = 89916; + }; petercommand = { email = "petercommand@gmail.com"; github = "petercommand"; @@ -17565,6 +17716,12 @@ githubId = 43755002; name = "Dmitriy P"; }; + pta2002 = { + email = "pta2002@pta2002.com"; + github = "pta2002"; + githubId = 7443916; + name = "Pedro Alves"; + }; ptival = { email = "valentin.robert.42@gmail.com"; github = "Ptival"; @@ -17670,6 +17827,12 @@ githubId = 12017109; name = "Rabindra Dhakal"; }; + qbisi = { + name = "qbisicwate"; + email = "qbisicwate@gmail.com"; + github = "qbisi"; + githubId = 84267544; + }; qbit = { name = "Aaron Bieber"; email = "aaron@bolddaemon.com"; @@ -18246,6 +18409,11 @@ githubId = 3302; name = "Renzo Carbonara"; }; + reputable2772 = { + name = "Reputable2772"; + github = "Reputable2772"; + githubId = 153411261; + }; rettetdemdativ = { email = "michael@koeppl.dev"; github = "rettetdemdativ"; @@ -21312,6 +21480,11 @@ githubId = 38222826; name = "Aamaruvi Yogamani"; }; + technobaboo = { + github = "technobaboo"; + githubId = 4541968; + name = "Nova King"; + }; teh = { email = "tehunger@gmail.com"; github = "teh"; @@ -21605,6 +21778,12 @@ githubId = 57180880; name = "Ansh Tyagi"; }; + therealgramdalf = { + email = "gramdalftech@gmail.com"; + github = "TheRealGramdalf"; + githubId = 79593869; + name = "Gramdalf"; + }; therealr5 = { email = "rouven@rfive.de"; github = "therealr5"; @@ -21735,6 +21914,12 @@ githubId = 1391883; name = "Tom Hall"; }; + thtrf = { + email = "thtrf@proton.me"; + github = "thtrf"; + githubId = 82712122; + name = "thtrf"; + }; Thunderbottom = { email = "chinmaydpai@gmail.com"; github = "Thunderbottom"; @@ -23013,6 +23198,12 @@ githubId = 7677567; name = "Victor SENE"; }; + vtimofeenko = { + email = "nixpkgs.maintain@vtimofeenko.com"; + github = "VTimofeenko"; + githubId = 9886026; + name = "Vladimir Timofeenko"; + }; vtuan10 = { email = "mail@tuan-vo.de"; github = "vtuan10"; @@ -23177,6 +23368,12 @@ githubId = 24979302; name = "Vladimír Zahradník"; }; + wfdewith = { + name = "Wim de With"; + email = "wf@dewith.io"; + github = "wfdewith"; + githubId = 2306085; + }; wgunderwood = { email = "wg.underwood13@gmail.com"; github = "WGUNDERWOOD"; @@ -23252,7 +23449,6 @@ github = "willbush"; githubId = 2023546; name = "Will Bush"; - keys = [ { fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; } ]; }; willcohen = { github = "willcohen"; @@ -23915,6 +24111,13 @@ github = "youhaveme9"; githubId = 58213083; }; + youwen5 = { + name = "Youwen Wu"; + email = "youwenw@gmail.com"; + github = "youwen5"; + githubId = 38934577; + keys = [ { fingerprint = "8F5E 6C1A F909 76CA 7102 917A 8656 58ED 1FE6 1EC3"; } ]; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/maintainers/scripts/pluginupdate-py/pluginupdate.py index afe60069dd29..e37e82fef3e7 100644 --- a/maintainers/scripts/pluginupdate-py/pluginupdate.py +++ b/maintainers/scripts/pluginupdate-py/pluginupdate.py @@ -4,7 +4,7 @@ # - pkgs/development/lua-modules/updater/updater.py # format: -# $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py +# $ nix run nixpkgs#ruff maintainers/scripts/pluginupdate.py # type-check: # $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py # linted: @@ -142,7 +142,7 @@ class Repo: return loaded def prefetch(self, ref: Optional[str]) -> str: - print("Prefetching %s", self.uri) + log.info("Prefetching %s", self.uri) loaded = self._prefetch(ref) return loaded["sha256"] @@ -195,7 +195,7 @@ class RepoGitHub(Repo): xml = req.read() # Filter out illegal XML characters - illegal_xml_regex = re.compile(b"[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]") + illegal_xml_regex = re.compile(b"[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]") xml = illegal_xml_regex.sub(b"", xml) root = ET.fromstring(xml) @@ -256,13 +256,7 @@ class PluginDesc: @property def name(self): - if self.alias is None: - return self.repo.name - else: - return self.alias - - def __lt__(self, other): - return self.repo.name < other.repo.name + return self.alias or self.repo.name @staticmethod def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc": @@ -270,7 +264,12 @@ class PluginDesc: branch = row["branch"] repo = make_repo(row["repo"], branch.strip()) repo.token = config.github_token - return PluginDesc(repo, branch.strip(), row["alias"]) + return PluginDesc( + repo, + branch.strip(), + # alias is usually an empty string + row["alias"] if row["alias"] else None, + ) @staticmethod def load_from_string(config: FetchConfig, line: str) -> "PluginDesc": @@ -328,12 +327,11 @@ def load_plugins_from_csv( return plugins - def run_nix_expr(expr, nixpkgs: str, **args): - ''' + """ :param expr nix expression to fetch current plugins :param nixpkgs Path towards a nixpkgs checkout - ''' + """ with CleanEnvironment(nixpkgs) as nix_path: cmd = [ "nix", @@ -382,16 +380,14 @@ class Editor: fetch_config = FetchConfig(args.proc, args.github_token) editor = self for plugin_line in args.add_plugins: - log.debug("using plugin_line", plugin_line) + log.debug("using plugin_line %s", plugin_line) pdesc = PluginDesc.load_from_string(fetch_config, plugin_line) - log.debug("loaded as pdesc", pdesc) + log.debug("loaded as pdesc %s", pdesc) append = [pdesc] editor.rewrite_input( fetch_config, args.input_file, editor.deprecated, append=append ) - plugin, _ = prefetch_plugin( - pdesc, - ) + plugin, _ = prefetch_plugin(pdesc) autocommit = not args.no_commit if autocommit: commit( @@ -406,9 +402,9 @@ class Editor: # Expects arguments generated by 'update' subparser def update(self, args): """CSV spec""" - print("the update member function should be overriden in subclasses") + print("the update member function should be overridden in subclasses") - def get_current_plugins(self, nixpkgs) -> List[Plugin]: + def get_current_plugins(self, nixpkgs: str) -> List[Plugin]: """To fill the cache""" data = run_nix_expr(self.get_plugins, nixpkgs) plugins = [] @@ -440,6 +436,7 @@ class Editor: plugins, redirects = check_results(results) + plugins = sorted(plugins, key=lambda v: v[1].normalized_name) self.generate_nix(plugins, outfile) return redirects @@ -559,6 +556,7 @@ class Editor: parser = self.create_parser() args = parser.parse_args() command = args.command or "update" + logging.basicConfig() log.setLevel(LOG_LEVELS[args.debug]) log.info("Chose to run command: %s", command) self.nixpkgs = args.nixpkgs @@ -591,25 +589,24 @@ def prefetch_plugin( p: PluginDesc, cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Optional[Repo]]: - repo, branch, alias = p.repo, p.branch, p.alias - name = alias or p.repo.name commit = None - log.info(f"Fetching last commit for plugin {name} from {repo.uri}@{branch}") - commit, date = repo.latest_commit() + log.info(f"Fetching last commit for plugin {p.name} from {p.repo.uri}@{p.branch}") + commit, date = p.repo.latest_commit() + cached_plugin = cache[commit] if cache else None if cached_plugin is not None: - log.debug("Cache hit !") - cached_plugin.name = name + log.debug(f"Cache hit for {p.name}!") + cached_plugin.name = p.name cached_plugin.date = date - return cached_plugin, repo.redirect + return cached_plugin, p.repo.redirect - has_submodules = repo.has_submodules() - log.debug(f"prefetch {name}") - sha256 = repo.prefetch(commit) + has_submodules = p.repo.has_submodules() + log.debug(f"prefetch {p.name}") + sha256 = p.repo.prefetch(commit) return ( - Plugin(name, commit, has_submodules, sha256, date=date), - repo.redirect, + Plugin(p.name, commit, has_submodules, sha256, date=date), + p.repo.redirect, ) @@ -624,7 +621,7 @@ def print_download_error(plugin: PluginDesc, ex: Exception): def check_results( - results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]] + results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]], ) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]: """ """ failures: List[Tuple[PluginDesc, Exception]] = [] @@ -642,10 +639,9 @@ def check_results( print(f"{len(results) - len(failures)} plugins were checked", end="") if len(failures) == 0: - print() return plugins, redirects else: - print(f", {len(failures)} plugin(s) could not be downloaded:\n") + log.error(f", {len(failures)} plugin(s) could not be downloaded:\n") for plugin, exception in failures: print_download_error(plugin, exception) @@ -738,10 +734,7 @@ def rewrite_input( append: List[PluginDesc] = [], ): log.info("Rewriting input file %s", input_file) - plugins = load_plugins_from_csv( - config, - input_file, - ) + plugins = load_plugins_from_csv(config, input_file) plugins.extend(append) @@ -753,15 +746,25 @@ def rewrite_input( deprecations = json.load(f) # TODO parallelize this step for pdesc, new_repo in redirects.items(): - log.info("Rewriting input file %s", input_file) + log.info("Resolving deprecated plugin %s -> %s", pdesc.name, new_repo.name) new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias) + old_plugin, _ = prefetch_plugin(pdesc) new_plugin, _ = prefetch_plugin(new_pdesc) + if old_plugin.normalized_name != new_plugin.normalized_name: deprecations[old_plugin.normalized_name] = { "new": new_plugin.normalized_name, "date": cur_date_iso, } + + # remove plugin from index file, so we won't add it to deprecations again + for i, plugin in enumerate(plugins): + if plugin.name == pdesc.name: + plugins.pop(i) + break + plugins.append(new_pdesc) + with open(deprecated, "w") as f: json.dump(deprecations, f, indent=4, sort_keys=True) f.write("\n") @@ -772,7 +775,7 @@ def rewrite_input( fieldnames = ["repo", "branch", "alias"] writer = csv.DictWriter(f, fieldnames, dialect="unix", quoting=csv.QUOTE_NONE) writer.writeheader() - for plugin in sorted(plugins): + for plugin in sorted(plugins, key=lambda x: x.name): writer.writerow(asdict(plugin)) @@ -792,9 +795,11 @@ def update_plugins(editor: Editor, args): log.info("Start updating plugins") if args.proc > 1 and args.github_token == None: - log.warning("You have enabled parallel updates but haven't set a github token.\n" - "You may be hit with `HTTP Error 429: too many requests` as a consequence." - "Either set --proc=1 or --github-token=YOUR_TOKEN. ") + log.warning( + "You have enabled parallel updates but haven't set a github token.\n" + "You may be hit with `HTTP Error 429: too many requests` as a consequence." + "Either set --proc=1 or --github-token=YOUR_TOKEN. " + ) fetch_config = FetchConfig(args.proc, args.github_token) update = editor.get_update(args.input_file, args.outfile, fetch_config) @@ -810,11 +815,9 @@ def update_plugins(editor: Editor, args): if autocommit: try: repo = git.Repo(os.getcwd()) - updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') + updated = datetime.now(tz=UTC).strftime("%Y-%m-%d") print(args.outfile) - commit(repo, - f"{editor.attr_path}: update on {updated}", [args.outfile] - ) + commit(repo, f"{editor.attr_path}: update on {updated}", [args.outfile]) except git.InvalidGitRepositoryError as e: print(f"Not in a git repository: {e}", file=sys.stderr) sys.exit(1) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9b6bcd5fb569..3deec6c11555 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -194,9 +194,13 @@ with lib.maintainers; }; darwin = { - members = [ toonn ]; - githubTeams = [ "darwin-maintainers" ]; - scope = "Maintain Darwin compatibility of packages and Darwin-only packages."; + members = [ + emily + reckenrode + toonn + ]; + githubTeams = [ "darwin-core" ]; + scope = "Maintain core platform support and packages for macOS and other Apple platforms."; shortName = "Darwin"; enableFeatureFreezePing = true; }; @@ -445,7 +449,6 @@ with lib.maintainers; haskell = { members = [ cdepillabout - expipiplus1 maralorn ncfavier sternenseemann @@ -461,6 +464,7 @@ with lib.maintainers; members = [ das_j conni2461 + helsinki-Jo ]; scope = "Group registration for packages maintained by Helsinki Systems"; shortName = "Helsinki Systems employees"; @@ -493,6 +497,19 @@ with lib.maintainers; shortName = "Input-Output Global employees"; }; + java = { + githubTeams = [ "java" ]; + members = [ + chayleaf + fliegendewurst + infinidoge + tomodachi94 + ]; + shortName = "Java"; + scope = "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects)"; + enableFeatureFreezePing = true; + }; + jitsi = { members = [ cleeyv @@ -841,9 +858,14 @@ with lib.maintainers; }; postgres = { - members = [ thoughtpolice ]; + members = [ + thoughtpolice + ma27 + wolfgangwalther + ]; scope = "Maintain the PostgreSQL package and plugins along with the NixOS module."; shortName = "PostgreSQL"; + enableFeatureFreezePing = true; }; python = { diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md index 074932b3f110..db7a6c60fade 100644 --- a/nixos/doc/manual/configuration/customizing-packages.section.md +++ b/nixos/doc/manual/configuration/customizing-packages.section.md @@ -33,8 +33,8 @@ Unfortunately, Nixpkgs currently lacks a way to query available package configur ::: {.note} For example, many packages come with extensions one might add. Examples include: -- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp) -- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests) +- [`passExtensions.pass-otp`](https://search.nixos.org/packages?query=passExtensions.pass-otp) +- [`python312Packages.requests`](https://search.nixos.org/packages?query=python312Packages.requests) You can use them like this: ```nix diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index 67a5cc23a6aa..4b1be6520ef8 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -140,7 +140,8 @@ in { path = [ pkgs.su ]; script = '' - mkdir -m 0755 -p $(dirname ${toString cfg.output}) + mkdir -p $(dirname ${toString cfg.output}) + chmod 0755 $(dirname ${toString cfg.output}) exec updatedb \ --localuser=${cfg.localuser} \ ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md index 415119bd8c89..a887a923e57f 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md @@ -1,10 +1,8 @@ # Installing in a VirtualBox guest {#sec-installing-virtualbox-guest} Installing NixOS into a VirtualBox guest is convenient for users who -want to try NixOS without installing it on bare metal. If you want to -use a pre-made VirtualBox appliance, it is available at [the downloads -page](https://nixos.org/download/#nixos-virtualbox). If you want to set -up a VirtualBox guest manually, follow these instructions: +want to try NixOS without installing it on bare metal. If you want to set +up a VirtualBox guest, follow these instructions: 1. Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a0600247bcd1..335618dbc48d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -7,7 +7,8 @@ - **This will be the last release of Nixpkgs to support macOS Sierra 10.12 to macOS Catalina 10.15.** Starting with release 25.05, the minimum supported version will be macOS Big Sur 11, and we cannot guarantee that packages will continue to work on older versions of macOS. Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. - If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to Mac OS X Snow Leopard 10.6. + If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports versions back to Mac OS X Snow Leopard 10.6. + - Nix was updated to 2.24, which brings a lot of improvements and fixes. See the release notes for [2.19](https://nix.dev/manual/nix/latest/release-notes/rl-2.19), [2.20](https://nix.dev/manual/nix/latest/release-notes/rl-2.20), @@ -15,35 +16,38 @@ [2.22](https://nix.dev/manual/nix/latest/release-notes/rl-2.22), [2.23](https://nix.dev/manual/nix/latest/release-notes/rl-2.23), [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24). - Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements. + Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life additions. - This will be the last release of Nixpkgs to support versions of CUDA prior to CUDA 12.0. These versions only work with old compiler versions that will be unsupported by the time of the Nixpkgs 25.05 release. - In future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows. + In the future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows. -- Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`. +- Convenience options for `amdgpu`, the open source driver for Radeon cards, are now available under [`hardware.amdgpu`](#opt-hardware.amdgpu.initrd.enable). -- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option. - This also allows configuring runtime settings of AMDVLK and enabling experimental features. -- The `moonlight-qt` package ([Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems. +- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured under the [`hardware.amdgpu.amdvlk`](#opt-hardware.amdgpu.amdvlk.enable) option. + This also allows configuring runtime settings for AMDVLK, including enabling experimental features. + +- The `moonlight-qt` package (for [Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems. - PostgreSQL now defaults to major version 16. +- GNOME has been updated to version 47. Refer to the [release notes](https://release.gnome.org/47/) for more details. + - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/). - This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version. + This release also deprecates some configuration keys which are likely to be removed in version 5.0.0. - `compressDrv` can compress selected files in a derivation. `compressDrvWeb` compresses files for common web server usage (`.gz` with `zopfli`, `.br` with `brotli`). -- `hardware.display` is a new module implementing workarounds for misbehaving monitors - through setting up custom EDID files and forcing kernel/framebuffer modes. +- [`hardware.display`](#opt-hardware.display.edid.enable) is a new module implementing workarounds for misbehaving monitors + by setting up custom EDID files and forcing kernel/framebuffer modes. -- A new display-manager `services.displayManager.ly` was added. - It is a tui based replacement of sddm and lightdm for window manager users. - Users can use it by `services.displayManager.ly.enable` and config it by - `services.displayManager.ly.settings` to generate `/etc/ly/config.ini` +- [`services.displayManager.ly`](#opt-services.displayManager.ly.enable) is a new module for configuring the display manager [ly](https://github.com/fairyglade/ly), + a TUI-based replacement for SDDM and LightDM meant for window manager users. + +- `srcOnly` was rewritten to be more readable, have additional warnings in the event that something is probably wrong, use the `stdenv` provided by the derivation, and Noogle-compatible documentation was added. - The default sound server for most graphical sessions has been switched from PulseAudio to PipeWire. - Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. + Users that want to keep using PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs. - The Rust rewrite of the `switch-to-configuration` program is now used for system activation by default. @@ -51,7 +55,7 @@ The original Perl script is deprecated and is planned for removal in the 25.05 release. It will remain accessible until then by setting `system.switch.enableNg` to `false`. - Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html) - was added through the `boot.initrd.systemd.dmVerity` option. + was added through the [`boot.initrd.systemd.dmVerity`](#opt-boot.initrd.systemd.dmVerity.enable) option. - The [Xen Project Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable). - This release includes Xen [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes) and support for booting the hypervisor on EFI systems. @@ -75,62 +79,61 @@ - [Cyrus IMAP](https://github.com/cyrusimap/cyrus-imapd), an email, contacts and calendar server. Available as [services.cyrus-imap](#opt-services.cyrus-imap.enable) service. -- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). +- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server. Available as [services.taskchampion-sync-server](#opt-services.taskchampion-sync-server.enable). -- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. +- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), a proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable). - [Gancio](https://gancio.org/), a shared agenda for local communities. Available as [services.gancio](#opt-services.gancio.enable). -- [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable). +- [Goatcounter](https://www.goatcounter.com/), an easy web analytics platform with no tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable). -- [Privatebin](https://github.com/PrivateBin/PrivateBin/), A minimalist, open source online pastebin where the server has zero knowledge of pasted data. Available as [services.privatebin](#opt-services.privatebin.enable) +- [Privatebin](https://github.com/PrivateBin/PrivateBin/), a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Available as [services.privatebin](#opt-services.privatebin.enable). -- [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland Compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable). +- [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable). -- [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI - for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable) - service. +- [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable). -- [Quickwit](https://quickwit.io), sub-second search & analytics engine on cloud storage. Available as [services.quickwit](options.html#opt-services.quickwit). +- [Quickwit](https://quickwit.io), a sub-second search & analytics engine on cloud storage. Available as [services.quickwit](options.html#opt-services.quickwit.enable). - [Userborn](https://github.com/nikstur/userborn), a service for declarative user management. This can be used instead of the `update-users-groups.pl` - Perl script and instead of systemd-sysusers. To achieve a system without - Perl, this is the now recommended tool over systemd-sysusers because it can - also create normal users and change passwords. Available as - [services.userborn](#opt-services.userborn.enable) + Perl script and/or systemd-sysusers. This is now recommended over + systemd-sysusers to achieve a system without Perl, as it can create normal + users and change passwords. Available as [services.userborn](#opt-services.userborn.enable). -- [Hatsu](https://github.com/importantimport/hatsu), a self-hosted bridge that interacts with Fediverse on behalf of your static site. Available as [services.hatsu](options.html#opt-services.hatsu). +- [Hatsu](https://github.com/importantimport/hatsu), a self-hosted bridge that interacts with Fediverse on behalf of your static site. Available as [services.hatsu](options.html#opt-services.hatsu.enable). -- [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). +- [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood.enable). - [Niri](https://github.com/YaLTeR/niri), a scrollable-tiling Wayland compositor. Available as [programs.niri](options.html#opt-programs.niri.enable). -- [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer) +- [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer.enable). + +- [Dashy](https://dashy.to), an open source, highly customizable, easy to use, privacy-respecting dashboard app. Available as [services.dashy](options.html#opt-services.dashy). - [QGroundControl], a ground station support and configuration manager for the PX4 and APM Flight Stacks. Available as [programs.qgroundcontrol](options.html#opt-programs.qgroundcontrol.enable). -- [Eintopf](https://eintopf.info), community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf). +- [Eintopf](https://eintopf.info), a community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf.enable). - [Radicle](https://radicle.xyz), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable). -- [ddns-updater](https://github.com/qdm12/ddns-updater), a service to update DNS records periodically with WebUI for many DNS providers. Available as [services.ddns-updater](#opt-services.ddns-updater.enable). +- [ddns-updater](https://github.com/qdm12/ddns-updater), a service with a WebUI to update DNS records periodically for many providers. Available as [services.ddns-updater](#opt-services.ddns-updater.enable). - [Immersed](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed](#opt-programs.immersed.enable). -- [HomeBox](https://github.com/sysadminsmedia/homebox): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable). +- [HomeBox](https://github.com/sysadminsmedia/homebox), an inventory and organization system built for the home user. Available as [services.homebox](#opt-services.homebox.enable). - [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable). -- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). +- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various Git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). -- [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable). +- [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources that can stream to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable). - [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks). - [Collabora Online](https://www.collaboraonline.com/), a collaborative online office suite based on LibreOffice technology. Available as [services.collabora-online](options.html#opt-services.collabora-online.enable). -- [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable). +- [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a WebUI for connecting devices. Available as [services.wg-access-server](#opt-services.wg-access-server.enable). - [Pingvin Share](https://github.com/stonith404/pingvin-share), a self-hosted file sharing platform and an alternative for WeTransfer. Available as [services.pingvin-share](#opt-services.pingvin-share.enable). @@ -140,65 +143,65 @@ - [Gatus](https://github.com/TwiN/gatus), an automated developer-oriented status page. Available as [services.gatus](#opt-services.gatus.enable). -- [cryptpad](https://cryptpad.org/), a privacy-oriented collaborative platform (docs/drive/etc), has been added back. Available as [services.cryptpad](#opt-services.cryptpad.enable). +- [cryptpad](https://cryptpad.org/), a privacy-oriented collaborative office suite, has been added back. Available as [services.cryptpad](#opt-services.cryptpad.enable). -- [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable). +- [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in Rust. Available as [services.realm](#opt-services.realm.enable). -- [Gotenberg](https://gotenberg.dev), an API server for converting files to PDFs that can be used alongside Paperless-ngx. Available as [services.gotenberg](options.html#opt-services.gotenberg). +- [Gotenberg](https://gotenberg.dev), an API server for converting files to PDFs that can be used alongside Paperless-ngx. Available as [services.gotenberg](options.html#opt-services.gotenberg.enable). -- [Suricata](https://suricata.io/), a free and open source, mature, fast and robust network threat detection engine. Available as [services.suricata](options.html#opt-services.suricata). +- [Suricata](https://suricata.io/), a free and open source, mature, fast and robust network threat detection engine. Available as [services.suricata](options.html#opt-services.suricata.enable). -- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). +- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld.enable). -- [MenhirLib](https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib) A support library for verified Coq parsers produced by Menhir. +- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance.enable). -- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance). +- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika.enable). -- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika). +- [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey.enable). -- [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey). - -- [Improved File Manager](https://github.com/misterunknown/ifm), or IFM, a single-file web-based file manager. Available as [services.ifm](options.html#opt-services.ifm.enable) +- [Improved File Manager (IFM)](https://github.com/misterunknown/ifm), a single-file web-based file manager. Available as [services.ifm](options.html#opt-services.ifm.enable). - [OpenGFW](https://github.com/apernet/OpenGFW), an implementation of the Great Firewall on Linux. Available as [services.opengfw](#opt-services.opengfw.enable). - [Rathole](https://github.com/rapiz1/rathole), a lightweight and high-performance reverse proxy for NAT traversal. Available as [services.rathole](#opt-services.rathole.enable). -- [Proton Mail bridge](https://proton.me/mail/bridge), a desktop application that runs in the background, encrypting and decrypting messages as they enter and leave your computer. It lets you add your Proton Mail account to your favorite email client via IMAP/SMTP by creating a local email server on your computer. +- [Proton Mail bridge](https://proton.me/mail/bridge), a desktop application that runs in the background, encrypting and decrypting messages as they enter and leave your computer. Available as [services.protonmail-bridge](#opt-services.protonmail-bridge.enable). -- [chromadb](https://www.trychroma.com/), an open-source AI application - database. Batteries included. Available as [services.chromadb](options.html#opt-services.chromadb.enable). +- [chromadb](https://www.trychroma.com/), an open-source AI application database with batteries included. Available as [services.chromadb](options.html#opt-services.chromadb.enable). -- [bitmagnet](https://bitmagnet.io/), A self-hosted BitTorrent indexer, DHT crawler, content classifier and torrent search engine with web UI, GraphQL API and Servarr stack integration. - Available as [services.bitmagnet](options.html#opt-services.bitmagnet.enable). +- [bitmagnet](https://bitmagnet.io/), a self-hosted BitTorrent indexer, DHT crawler, content classifier and torrent search engine with WebUI, GraphQL API and Servarr stack integration. Available as [services.bitmagnet](options.html#opt-services.bitmagnet.enable). - [Wakapi](https://wakapi.dev/), a time tracking software for programmers. Available as [services.wakapi](#opt-services.wakapi.enable). - [foot](https://codeberg.org/dnkl/foot), a fast, lightweight and minimalistic Wayland terminal emulator. Available as [programs.foot](#opt-programs.foot.enable). -- [ToDesk](https://www.todesk.com/linux.html), a remote desktop applicaton. Available as [services.todesk.enable](#opt-services.todesk.enable). +- [ToDesk](https://www.todesk.com/linux.html), a remote desktop application. Available as [services.todesk](#opt-services.todesk.enable). -- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track). +- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track.enable). - [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable). -- [saunafs](https://saunafs.com) Distributed POSIX file system. Available as [services.saunafs](options.html#opt-services.saunafs). +- [saunafs](https://saunafs.com), a distributed POSIX file system. Available as [services.saunafs](options.html#opt-services.saunafs.enable). -- [obs-studio](https://obsproject.com/), Free and open source software for video recording and live streaming. Available as [programs.obs-studio.enable](#opt-programs.obs-studio.enable). +- [obs-studio](https://obsproject.com/), a free and open source software for video recording and live streaming. Available as [programs.obs-studio](#opt-programs.obs-studio.enable). -- [Veilid](https://veilid.com), a headless server that enables privacy-focused data sharing and messaging on a peer-to-peer network. Available as [services.veilid](#opt-services.veilid.enable). +- [Veilid](https://veilid.com), a privacy-focused, headless server for data sharing and messaging on a peer-to-peer network. Available as [services.veilid](#opt-services.veilid.enable). - [Fedimint](https://github.com/fedimint/fedimint), a module based system for building federated applications (Federated E-Cash Mint). Available as [services.fedimintd](#opt-services.fedimintd). -- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](options.html#opt-services.zapret). - - [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable). +- [Swapspace](https://github.com/Tookmund/Swapspace), a dynamic swap space manager that turns your unused free space into swap automatically. Available as [services.swapspace](#opt-services.swapspace.enable). + +- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret.enable). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} +- Nixpkgs now requires Nix 2.3.17 or newer to allow for zstd compressed binary artifacts. + - The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details. -- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. +- The NVIDIA driver no longer defaults to the proprietary kernel module with versions >= 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open modules. - The `(buildPythonPackage { ... }).override` attribute is now deprecated and removed in favour of `overridePythonAttrs`. This change does not affect the override interface of most Python packages, as [`.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute. @@ -207,7 +210,7 @@ - All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). -- `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: +- `transmission` has been aliased with a `trace` warning to `transmission_3`, since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0) and Transmission 3 will eventually go away -- this is meant to make people aware of the new version. `services.transmission.package` now also defaults to `transmission_3`, as the upgrade can cause data loss in some cases (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory if you may be affected: - `transmission-gtk`: `~/.config/transmission` - `transmission-daemon` using NixOS module: `${config.services.transmission.home}/.config/transmission-daemon` (defaults to `/var/lib/transmission/.config/transmission-daemon`) @@ -217,11 +220,15 @@ - `unifi` has been updated to UniFi 8. `unifi7` was removed as it is vulnerable to CVE-2024-42025 and required a version of MongoDB that has reached end of life. -- `androidenv.androidPkgs_9_0` has been removed, and replaced with `androidenv.androidPkgs` for a more complete Android SDK including support for Android 9 and later. +- `androidenv.androidPkgs_9_0` has been removed. It is replaced with `androidenv.androidPkgs` for a more complete Android SDK, including support for Android 9 and later. + +- The VirtualBox demo installer appliance has been removed. + Please use the standard installer ISOs instead. - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. -- `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release). +- `deno` has been updated to Deno 2, which has breaking changes. + See the [migration guide](https://docs.deno.com/runtime/reference/migration_guide/) for details. - `gogs` has been removed. Upstream development has stalled and it has several [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed @@ -234,14 +241,16 @@ - `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: . Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`). - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust. - The module was updated to accommodate for breaking changes. - Breaking changes to the module API were minimised as much as possible, - but some were nonetheless inevitable due to changes in the upstream CLI. - Certain options were moved from separate CLI arguments into the forward specifications, - and those options were also removed from the module's API, - please consult the wstunnel man page for more detail. + The module was updated to accommodate for breaking changes and breaking changes to the + module options were minimised as much as possible. Nonetheless, some were inevitable due + to changes in the upstream CLI. Certain options were moved from separate CLI arguments into + the forward specifications, and those options were also removed from the module's options. + Please consult the wstunnel man page for more details. Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}..extraArgs`, - that those might have been removed or modified upstream. + they may have been modified or removed upstream. + +- `gnat` and `gnatPackages` now use GNAT 13 instead of GNAT 12. This matches + the default `gcc` version. - `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed. @@ -252,29 +261,29 @@ - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`. - Top-level `clang_tools_` attributes are now aliases; these will be removed in a future release. -- `buildbot` was updated to 4.0, the AngularJS frontend has been replaced by a React frontend, see the [upstream release notes](https://docs.buildbot.net/current/manual/upgrading/4.0-upgrade.html). +- `buildbot` was updated to 4.0 and the AngularJS frontend replaced by a React frontend. See the [upstream release notes](https://docs.buildbot.net/current/manual/upgrading/4.0-upgrade.html). -- `headscale` has been updated to version 0.23.0 which reworked large parts of the configuration including DNS, Magic DNS prefixes and ACL policy files. See the [upstream changelog](https://github.com/juanfont/headscale/releases/tag/v0.23.0) for details. +- `headscale` has been updated to version 0.23.0 which reworked large parts of the configuration, including DNS, Magic DNS prefixes and ACL policy files. See the [upstream changelog](https://github.com/juanfont/headscale/releases/tag/v0.23.0) for details. -- `nginx` package no longer includes `gd` and `geoip` dependencies. For enabling it, override `nginx` package with the optionals `withImageFilter` and `withGeoIP`. +- `nginx` package no longer includes the `gd` and `geoip` dependencies. To re-enable them, override `nginx` with the options `withImageFilter = true;` and `withGeoIP = true;`. -- `systemd.enableUnifiedCgroupHierarchy` option has been removed. - In systemd 256 support for cgroup v1 ('legacy' and 'hybrid' hierarchies) is now considered obsolete and systemd by default will refuse to boot under it. - To forcibly reenable cgroup v1 support, you can `set boot.kernelParams = [ "systemd.unified_cgroup_hierachy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ]`. - NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own. +- `systemd.enableUnifiedCgroupHierarchy` has been removed. + In systemd 256, support for cgroup v1 ('legacy' and 'hybrid' hierarchies) is now considered obsolete and systemd will refuse to boot under it by default. + To forcibly re-enable cgroup v1 support, you can set `boot.kernelParams = [ "systemd.unified_cgroup_hierarchy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ]`. + This is not an officially supported configuration and might cause your system to become unbootable in future versions. You are on your own. -- `nrfutil` which previously pointed to the now-deprecated `pc-nrfutil` python package, has been repackaged under the same name with the new nrfutil tool. +- `nrfutil` -- which previously pointed to the now-deprecated `pc-nrfutil` Python package -- has been repackaged under the same name with the new nrfutil tool. -- `openssh` and `openssh_hpn` are now compiled without Kerberos 5 / GSSAPI support in an effort to reduce the attack surface of the components for the majority of users. Users needing this support can - use the new `opensshWithKerberos` and `openssh_hpnWithKerberos` flavors (e.g. `programs.ssh.package = pkgs.openssh_gssapi`). +- `openssh` and `openssh_hpn` are now compiled without Kerberos 5 / GSSAPI support in an effort to reduce the attack surface of the components. Users needing this support can + use the new `opensshWithKerberos` and `openssh_hpnWithKerberos` package flavors (e.g. `programs.ssh.package = pkgs.openssh_gssapi`). - `security.ipa.ipaHostname` now defaults to the value of `networking.fqdn` if it is set, instead of the previous hardcoded default of `${networking.hostName}.${security.ipa.domain}`. -- The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. +- The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. -- The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network. +- The logrotate service has been hardened and now requires enabling `allowNetworking` if network access is required. - `mautrix-whatsapp` has been updated to version 0.11.0, which is a major rewrite of the bridge. Config file changes are required. @@ -291,8 +300,12 @@ Processes also now run as a dynamically allocated user by default instead of root. -- The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work. - In case you want to update your configuration make sure to check the NixOS manual. +- The `mautrix-signal` module was adapted to incorporate the configuration changes that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work. + In case you want to update your configuration, make sure to check the NixOS manual. + +- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. + +- `postgresql` no longer accepts the `enableSystemd` override. Use `systemdSupport` instead. - The dhcpcd service (`networking.useDHCP`) has been hardened and now runs exclusively as the "dhcpcd" user. Users that were relying on the root privileges in `networking.dhcpcd.runHook` will have to write specific [sudo](security.sudo.extraRules) or [polkit](security.polkit.extraConfig) rules to allow dhcpcd to perform privileged actions. @@ -301,15 +314,15 @@ - `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead. -- Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases. +- The `mkLayer` and `shellScript` build helpers in `singularity-tools` are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases. - The `rust.toTargetArch`, `rust.toTargetOs`, `rust.toTargetFamily`, `rust.toTargetVendor`, `rust.toRustTarget`, `rust.toRustTargetSpec`, `rust.toRustTargetSpecShort`, and `rust.IsNoStdTarget` functions are deprecated in favour of the `rust.platform.arch`, `rust.platform.os`, `rust.platform.target-family`, `rust.platform.vendor`, `rust.rustcTarget`, `rust.rustcTargetSpec`, `rust.cargoShortTarget`, `rust.cargoEnvVarTarget`, and `rust.isNoStdTarget` platform attributes respectively. -- The `budgie` and `budgiePlugins` scope have been removed and their packages - moved into the top level scope (i.e., `budgie.budgie-desktop` is now - `budgie-desktop`) +- All Budgie and `budgiePlugins` packages have been moved to top-level (i.e., + `budgie.budgie-desktop` is now `budgie-desktop` and `budgiePlugins.budgie-media-player-applet` + is now `budgie-media-player-applet`). -- The method to safely handle secrets in the `networking.wireless` module has been changed to benefit from a [new feature](https://w1.fi/cgit/hostap/commit/?id=e680a51e94a33591f61edb210926bcb71217a21a) of wpa_supplicant. +- The method of safely handling secrets in the `networking.wireless` module has been changed to benefit from a [new feature](https://w1.fi/cgit/hostap/commit/?id=e680a51e94a33591f61edb210926bcb71217a21a) of `wpa_supplicant`. The syntax to refer to secrets has changed slightly and the option `networking.wireless.environmentFile` has been replaced by `networking.wireless.secretsFile`; see the description of the latter for how to upgrade. - NetBox was updated to `>= 4.1.0`. @@ -324,35 +337,58 @@ This change requires granting access to the repositories to this user or setting the appropriate one through `services.cgit.some-instance.user`. +- All Oracle JDKs and JREs (`oraclejdk`, `oraclejdk8`, `oraclejre`, `oraclejre8`, + `jrePlugin`, `jre8Plugin`, `jdkdistro`, `oraclejdk8distro`, and `oraclejdk11`) + were dropped due to being unmaintained and heavily insecure. OpenJDK provides + compatible replacements for JDKs and JREs. + +- `gradle_6` was removed due to being [unsupported upstream as of 10 Feb 2023](https://endoflife.date/gradle). + Additionally, it had numerous security vulnerabilities that were only patched + in later versions, such as [CVE-2021-29429](https://nvd.nist.gov/vuln/detail/CVE-2021-32751), + [CVE-2021-29427](https://nvd.nist.gov/vuln/detail/CVE-2021-29427), [CVE-2021-29428](https://nvd.nist.gov/vuln/detail/CVE-2021-29428), and [CVE-2021-32751](https://nvd.nist.gov/vuln/detail/CVE-2021-32751). + - `nvimpager` was updated to version 0.13.0, which changes the order of user and nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. +- `javacard-devkit` was dropped due to having a dependency on the Oracle JDK, + as well as being several years out-of-date. + - Kubernetes `featureGates` have changed from a `listOf str` to `attrsOf bool`. This refactor makes it possible to also disable feature gates, without having to use `extraOpts` flags. A previous configuration may have looked like this: + ```nix - featureGates = [ "EphemeralContainers" ]; - extraOpts = pkgs.lib.concatStringsSep " " ( - [ - ''--feature-gates="CSIMigration=false"'' - }); + { + featureGates = [ "EphemeralContainers" ]; + extraOpts = pkgs.lib.concatStringsSep " " ( + [ + ''--feature-gates="CSIMigration=false"'' + ] + ); + } ``` - Using an AttrSet instead, the new configuration would be: + Using an attribute set instead, the new configuration would be: + ```nix - featureGates = {EphemeralContainers = true; CSIMigration=false;}; + { + featureGates = { + EphemeralContainers = true; + CSIMigration=false; + }; + } ``` -- `pkgs.nextcloud27` has been removed since it's EOL. +- `pkgs.nextcloud27` has been removed as it has reached EOL. - The `environment.noXlibs` option has been removed. It was a common source of unexpected rebuilds and breakage that was often hard to diagnose. If you need to disable certain libraries, you're encouraged to add your own overlay to your configuration that targets the packages you care about. -- `frigate` was updated past 0.14.0. This release includes various breaking changes, so please go read the [release notes](https://github.com/blakeblackshear/frigate/releases/tag/v0.14.0). - Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created +- `frigate` was updated past 0.14.0. This release includes various breaking changes, so please review the [release notes](https://github.com/blakeblackshear/frigate/releases/tag/v0.14.0). + Most prominently, access to the web interface and API are now protected by authentication. Retrieve the auto-created admin account from the `frigate.service` journal after upgrading. - `nodePackages.coc-python` was dropped, as [its upstream is unmaintained](https://github.com/neoclide/coc-python). The associated `vimPlugins.coc-python` was also dropped. @@ -372,7 +408,10 @@ - `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. -- `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042. +- `services.pgbouncer` systemd service is now configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the freeform type option under [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings). + +- Docear was removed because it was unmaintained upstream. + JabRef, Zotero, or Mendeley are potential replacements. - `nodePackages.coc-metals` was removed due to being deprecated upstream. `vimPlugins.nvim-metals` is its official replacement. @@ -390,23 +429,23 @@ 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. +- `tests.overriding`'s `passthru.tests` has been restructured as an attribute set instead of a list, making individual tests accessible by their names. -- Package `skk-dict` was split into multiple packages under `skkDictionaries`. - If in doubt, try `skkDictionaries.l`. As part of this change, the dictionaries - were moved from `$out/share` to `$out/share/skk`. Also, the dictionaries won't - be converted to UTF-8 unless the `useUtf8` package option is enabled. UTF-8 +- `skk-dict` was split into multiple packages under `skkDictionaries`. + If in doubt of what to use, try `skkDictionaries.l`. As part of this change, the dictionaries + were moved from `$out/share` to `$out/share/skk`. The dictionaries also won't + be converted to UTF-8 unless the `useUtf8` package option is enabled; UTF-8 converted dictionaries will have the .utf8 suffix appended to its filename. - `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. + your configuration. -- The Invoiceplane module now only accepts the structured `settings` option. - `extraConfig` is now removed. +- `services.invoiceplane.sites..extraConfig` was removed. Configuration must now be done + through the structured `services.invoiceplane.sites..settings` option. -- The `ollama` services replaces its `sandbox` toggle with options to configure - a static `user` and `group`. The `writablePaths` option has been removed and +- `services.ollama.sandbox` has been replaced with options to configure + a static `user` and `group`. The `writablePaths` option has also been removed and the models directory is now always exempt from sandboxing. - The `gns3-server` service now runs under the `gns3` system user @@ -423,13 +462,15 @@ before changing the package to `pkgs.stalwart-mail` in [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package). -- The `nomad_1_5` package was dropped, as [it has reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating it will throw an error. +- `nomad_1_5` and `nomad_1_6` were dropped, as [they have reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating them will throw an error. + +- The default `nomad` package has been updated to 1.8.x. For more information, see [breaking changes for Nomad 1.8](https://developer.hashicorp.com/nomad/docs/upgrade/upgrade-specific#nomad-1-8-0) - `androidndkPkgs` has been updated to `androidndkPkgs_26`. - Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android. -- the `ankisyncd` package and its `services.ankisyncd` have been removed, use [`services.anki-sync-server`](#opt-services.anki-sync-server.enable) instead. +- `ankisyncd` package and its `services.ankisyncd` have been removed. Use [`services.anki-sync-server`](#opt-services.anki-sync-server.enable) instead. - `nodePackages.vscode-css-languageserver-bin`, `nodePackages.vscode-html-languageserver-bin`, and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream. @@ -438,35 +479,35 @@ - `nodePackages.prisma` has been replaced by `prisma`. - `fetchNextcloudApp` has been rewritten to use `fetchurl` rather than - `fetchzip`. This invalidates all existing hashes but you can restore the old + `fetchzip`. This invalidates all existing hashes, but you can restore the old behavior by passing it `unpack = true`. -- `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the - output by default, to alert users to closure size issues caused by +- `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in its + output by default to alert users to closure size issues caused by [#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging Helpers" in the Haskell section of the Nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell-packaging-helpers) for information on working around `output '...' is not allowed to refer to the following paths` errors caused by this change. -- The `stalwart-mail` service now runs under the `stalwart-mail` system user - instead of a dynamically created one via `DynamicUser`, to avoid automatic - ownership changes on its large file store each time the service was started. +- `services.stalwart-mail` now runs under the `stalwart-mail` system user + instead of a dynamic one via `DynamicUser` in order to avoid automatic + ownership changes on its large file store on service restart. This change requires to manually move the state directory from - `/var/lib/private/stalwart-mail` to `/var/lib/stalwart-mail` and to + `/var/lib/private/stalwart-mail` to `/var/lib/stalwart-mail`, and to change the ownership of the directory and its content to `stalwart-mail`. -- The `stalwart-mail` module now uses RocksDB as the default storage backend - for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured - data and the filesystem for blobs). +- `services.stalwart-mail` now uses RocksDB as the default storage backend + for `stateVersion` ≥ 24.11. It was previously using SQLite for structured + data and the filesystem for blobs. -- The `stargazer` service has been hardened to improve security, but these +- `services.stargazer` has been hardened to improve security, but these changes make break certain setups, particularly around traditional CGI. - - The `stargazer.allowCgiUser` option has been added, enabling + - `services.stargazer.allowCgiUser` has been added, enabling Stargazer's `cgi-user` option to work, which was previously broken. -- The `shiori` service now requires an HTTP secret value `SHIORI_HTTP_SECRET_KEY` to be provided via environment variable. The nixos module therefore, now provides an environmentFile option: +- `services.shiori` now requires the HTTP secret value `SHIORI_HTTP_SECRET_KEY` to be provided as an environment variable. `services.shiori.environmentFile` has been introduced to handle this: ``` # This is how a environment file can be generated: @@ -476,29 +517,32 @@ - `/share/nano` is now only linked when `programs.nano.enable` is enabled. -- PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value. +- PPD files for Utax printers were renamed (spaces replaced by underscores) in the newest `foomatic-db` package. Users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value to account for this. -- The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`. +- `sqldeveloper` was dropped due to being severely out-of-date and having a dependency on + JavaFX for Java 8, which we do not support. + +- The `kvdo` kernel module package was removed as it was upstreamed in kernel version 6.9, where it is now called `dm-vdo`. - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details. - `gitlab` deprecated support for *runner registration tokens* in GitLab 16.0, disabled their support in GitLab 17.0 and will - ultimately remove it in GitLab 18.0, as outlined in the - [documentation](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#estimated-time-frame-for-planned-changes). + ultimately remove it in GitLab 18.0 (as outlined in the + [documentation](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#estimated-time-frame-for-planned-changes)). After upgrading to GitLab >= 17.0, it is possible to re-enable support for registration tokens in the UI until GitLab 18.0. Refer to the manual on [using registration tokens after GitLab 17.0](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#using-registration-tokens-after-gitlab-170). GitLab administrators should migrate to the [new runner registration workflow](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#using-registration-tokens-after-gitlab-170) with *runner authentication tokens* until the release of GitLab 18.0. -- `gitlab` has been updated from 16.x to 17.x and requires at least `postgresql` 14.9, as stated in the [documentation](https://docs.gitlab.com/17.1/ee/install/requirements.html#postgresql-requirements). Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. +- `gitlab` has been updated from 16.x to 17.x and requires `postgresql` >= 14.9, as stated in the [documentation](https://docs.gitlab.com/17.1/ee/install/requirements.html#postgresql-requirements). Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. -- `gitaly` (part of `gitlab`) is now using the bundled `git` package instead of `pkgs.git` to maintain compatibility with GitLab. +- `gitaly` (part of `gitlab`) is now using the bundled `git` package instead of `pkgs.git`, to maintain compatibility with GitLab. - `nixos/gitlab` no longer adds `pkgs.git` to `environment.systemPackages` by default. - The `replay-sorcery` package and module was removed as it unmaintained upstream. Consider using `gpu-screen-recorder` or `obs-studio` instead. -- To follow [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) a few options of `samba` have been moved from `extraConfig` and `configText` to the new freeform option `settings` and renamed, e.g.: +- A few options of `services.samba` have been moved from `extraConfig` and `configText` to the new freeform option `settings` and renamed, e.g.: - `services.samba.invalidUsers` to `services.samba.settings.global."invalid users"` - `services.samba.securityType` to `services.samba.settings.global."security type"` - `services.samba.shares` to `services.samba.settings` @@ -508,10 +552,10 @@ - `zx` was updated to v8, which introduces several breaking changes. See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information. -- `feishin` removed support for Navidrome `< v0.53.2` due to an API change; more information in the [v0.10.0 release notes](https://github.com/jeffvli/feishin/releases/tag/v0.10.0). +- `feishin` removed support for Navidrome `< v0.53.2` due to an API change. See the [v0.10.0 release notes](https://github.com/jeffvli/feishin/releases/tag/v0.10.0) for more information. -- The `dnscrypt-wrapper` module was removed since the project has been effectively unmaintained since 2018; moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys. - To wrap a resolver with DNSCrypt you can instead use `dnsdist`. See options `services.dnsdist.dnscrypt.*` +- `services.dnscrypt-wrapper` was removed, as the project has been effectively unmaintained since 2018. Moreover, the NixOS module had to rely on an abandoned version of `dnscrypt-proxy` v1 for the rotation of keys. + To wrap a resolver with DNSCrypt, you can instead use `dnsdist`. See `services.dnsdist.dnscrypt` - The `portunus` package and service do not support weak password hashes anymore. If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing. @@ -526,7 +570,7 @@ 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). +- Docker now defaults to 27.x, as version 24.x stopped receiving security updates and bug fixes after [February 1, 2024](https://github.com/moby/moby/pull/46772#discussion_r1686464084). - `postgresql` was split into default and -dev outputs. To make this work without circular dependencies, the output of the `pg_config` system view has been removed. The `pg_config` binary is provided in the -dev output and still works as expected. @@ -541,42 +585,62 @@ The `shout` top-level attribute was an alias to this package. The associated `services.shout` module has also been removed. +- `prometheus-openldap-exporter` was removed, as it was unmaintained both upstream and in nixpkgs. + - The `indi-full` package no longer contains non-free drivers. To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers. E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}` - `/share/vim-plugins` now only gets linked if `programs.vim.enable` is enabled +- The `services.guix` module now manages trusted substitute servers + declaratively. Instead of `guix archive --authorize`, list keys with + `services.guix.substituters.authorizedKeys`. Default substitute servers can be + set via `services.guix.substituters.urls`. + - The `tracy` package no longer works on X11, since it's moved to Wayland support, which is the intended default behavior by Tracy maintainers. X11 users have to switch to the new package `tracy-x11`. -- The `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained. +- `gollum` has been upgraded to major version 6. Please review their [migration notes](https://github.com/gollum/gollum/wiki/6.0-Release-Notes). + +- `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained. Minio now has built-in [Prometheus metrics exposure](https://min.io/docs/minio/linux/operations/monitoring/collect-minio-metrics-using-prometheus.html), which can be used instead. -- The `services.patroni.raft` option has been removed, as Raft has been [deprecated by upstream since 3.0.0](https://github.com/patroni/patroni/blob/master/docs/releases.rst#version-300) +- The `services.prometheus.exporters.tor` option has been removed, as its upstream implementation was broken and unmaintained. + +- `services.patroni.raft` has been removed, as Raft has been [deprecated by upstream since 3.0.0](https://github.com/patroni/patroni/blob/master/docs/releases.rst#version-300). + +- The `jd-cli` package was removed due to an inactive upstream and a dependency on the shut down + JCenter JAR repository. + Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI). + +- The `jd-gui` package was removed due to an inactive upstream and a dependency on the end-of-life Gradle 6. + Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI). - `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments. -- 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. +- `services.mxisd` has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are no longer maintained. + Consequently, the package `ma1sd` has also been removed. - The `rss-bridge` service drops the support to load a configuration file from `${config.services.rss-bridge.dataDir}/config.ini.php`. Consider using the `services.rss-bridge.config` option instead. -- The `xdg.portal.gtkUsePortal` option has been removed, as it had been deprecated for over 2 years. Using the `GTK_USE_PORTAL` environment variable in this manner is not intended nor encouraged by the GTK developers, but can still be done manually via `environment.sessionVariables`. +- `mikutter` has been removed, as the package was broken and had no maintainers in nixpkgs. + +- `xdg.portal.gtkUsePortal` has been removed, as it had been deprecated for over 2 years. Using the `GTK_USE_PORTAL` environment variable in this manner is not intended nor encouraged by the GTK developers, but can still be done manually via `environment.sessionVariables`. - Support for the legacy CUPS browsing and LDAP have been removed from `services.printing`. If `cups` or `ldap` are in the `BrowseRemoteProtocols` setting in `services.printing.browsedConf`, it needs to be removed. -- The `services.trust-dns` module has been renamed to `services.hickory-dns`. +- `services.trust-dns` has been renamed to `services.hickory-dns`. -- The option `services.prometheus.exporters.pgbouncer.connectionStringFile` has been removed since +- `services.prometheus.exporters.pgbouncer.connectionStringFile` has been removed since it leaked the connection string (and thus potentially the DB password) into the cmdline of process making it effectively world-readable. Use [`services.prometheus.exporters.pgbouncer.connectionEnvFile`](#opt-services.prometheus.exporters.pgbouncer.connectionEnvFile) instead. -- The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`. +- `lsh` and `services.lshd` have been removed as they had no maintainer in Nixpkgs and no upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`. - `ceph` has been upgraded to v19. See the [Ceph "squid" release notes](https://docs.ceph.com/en/latest/releases/squid/#v19-2-0-squid) for details and recommended upgrade procedure. @@ -590,30 +654,29 @@ were not used by any other package. External users are encouraged to migrate to OpenCV 4. -- The `tvheadend` package and the `services.tvheadend` module have been - removed as nobody was willing to maintain them and they were stuck on - an unmaintained version that required FFmpeg 4; please see [pull +- `tvheadend` package and the `services.tvheadend` module have been + removed due to lack of maintenance in Nixpkgs and being stuck on + an unmaintained version that required FFmpeg 4. Please see the related [pull request #332259](https://github.com/NixOS/nixpkgs/pull/332259) if you are interested in maintaining a newer version. -- The `antennas` package and the `services.antennas` module have been - removed as they only work with `tvheadend` (see above). +- `antennas` and `services.antennas` have been removed as they only work with `tvheadend` (see above). -- The `system.build.brightboxImage` image has been removed as It did not build anymore and has not seen any maintenance in over 7 years (excluding tree-wide changes). +- `system.build.brightboxImage` has been removed as it no longer built and has not seen any maintenance in over 7 years (excluding tree-wide changes). -- The `services.syncplay` module now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup. +- `services.syncplay` now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup. The systemd service now uses `DynamicUser`/`StateDirectory` and the `user` and `group` options have been deprecated. -- The `openlens` package got removed, suggested replacement `lens-desktop` +- `openlens` was removed. It is recommended to use `lens-desktop` instead. -- The `services.dnsmasq.extraConfig` option has been removed, as it had been deprecated for over 2 years. This option has been replaced by `services.dnsmasq.settings`. +- `services.dnsmasq.extraConfig` has been removed, as it had been deprecated for over 2 years. This option has been replaced by `services.dnsmasq.settings`. - The NixOS installation media no longer support the ReiserFS or JFS file systems by default. - Minimal installer ISOs are no longer built on the small channel. Please obtain installer images from the full release channels. -- The default FFmpeg version is now 7, and FFmpeg 5 has been removed. +- The default FFmpeg version is now 7.1, and FFmpeg 5 has been removed. Please prefer using the package variants without a version suffix, or pin FFmpeg 6 or 4 if necessary for compatibility. Note that we keep old versions around only as required @@ -623,23 +686,32 @@ - `openssl` now defaults to the latest version line `3.3.x`, instead of `3.0.x` before. While there should be no major code incompatibilities, newer OpenSSL versions typically strengthen the default security level. This means that you may have to explicitly allow weak ciphers, hashes and key lengths if necessary. See: [OpenSSL security level documentation](https://docs.openssl.org/3.3/man3/SSL_CTX_set_security_level/). -- The `isync` package has been updated to version `1.5.0`, which introduces some breaking changes. See the [compatibility concerns](https://sourceforge.net/projects/isync/files/isync/1.5.0/) for more details. +- `isync` has been updated to version `1.5.0`, which introduces some breaking changes. See the [compatibility concerns](https://sourceforge.net/projects/isync/files/isync/1.5.0/) for more details. - Legacy package `globalprotect-openconnect` 1.x and related module - `globalprotect-vpn` were dropped. Two new packages `gpauth` and `gpclient` - from the 2.x version of the GlobalProtect-openconnect project are added in its + `services.globalprotect` were dropped. Two new packages -- `gpauth` and `gpclient` + from the 2.x version of the GlobalProtect-openconnect project -- are added in its place. The GUI components related to the project are non-free and not packaged. - Compatible string matching for `hardware.deviceTree.overlays` has been changed to a more correct behavior. See [below](#sec-release-24.11-migration-dto-compatible) for details. -- The `rustic` package was upgrade to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0). +- `rustic` was upgraded to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0). - `pkgs.formats.ini` and `pkgs.formats.iniWithGlobalSection` with `listsAsDuplicateKeys` or `listToValue` no longer merge non-list values into lists by default. Backwards-compatible behavior can be enabled with `atomsCoercedToLists`. +- Atlassian Server products have been removed, as support for the Atlassian Server + products ended in February 2024 and there was insufficient interest in + maintaining the Atlassian Data Center replacements: + - The `atlassian-bamboo` package + - The `atlassian-confluence` package and its `services.confluence` NixOS module + - The `atlassian-crowd` package and its `services.crowd` NixOS module + - The `atlassian-jira` package and its `services.jira` NixOS module + + - `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12. Please switch to `pytest` or another test runner/framework. @@ -676,6 +748,8 @@ - `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead. +- `virtualisation.docker.liveRestore` has been renamed to `virtualisation.docker.daemon.settings."live-restore"` and turned off by default for state versions of at least 24.11. + - Tailscale's `authKeyFile` can now have its corresponding parameters set through `config.services.tailscale.authKeyParameters`, allowing for non-ephemeral unsupervised deployment and more. See [Registering new nodes using OAuth credentials](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) for the supported options. @@ -707,9 +781,9 @@ The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. -- The new `boot.loader.systemd-boot.windows` option makes setting up dual-booting with Windows on a different drive easier +- The new `boot.loader.systemd-boot.windows` option makes setting up dual-booting with Windows on a different drive easier. -- Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11 +- Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11. - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an unrestricted access to it can set `boot.kernel.sysctl."kernel.dmesg_restrict" = false`. @@ -717,12 +791,11 @@ - The `i18n.inputMethod` module introduces two new properties: `enable` and `type`, for declaring whether to enable an alternative input method and defining which input method respectfully. The options available in `type` are the same as the existing `enabled` option. `enabled` is now deprecated, and will be removed in a future release. -- `security.pam.u2f` now follows RFC42. - All module options are now settable through the freeform `.settings`. +- `security.pam.u2f` now uses freeform options; all module options are now configurable through `security.pam.u2f.settings`. -- Mikutter was removed because the package was broken and had no maintainers. +- `mikutter` was removed as the package was broken and had no maintainers. -- The new option `services.getty.autologinOnce` was added to limit the automatic login to once per boot and on the first tty only. +- `services.getty.autologinOnce` was added to limit the automatic login to once per boot and on the first tty only. When using full disk encryption, this option allows to unlock the system without retyping the passphrase while keeping the other ttys protected. - Gollum was upgraded to major version 6. Read their [migration notes](https://github.com/gollum/gollum/wiki/6.0-Release-Notes). @@ -733,18 +806,16 @@ - `services.timesyncd.fallbackServers` was added and defaults to `networking.timeServers`. -- Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details. - Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. +- Cinnamon has been updated to 6.2. Please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details. + Following Mint 22 defaults, the Cinnamon module no longer ships `geary` and `hexchat` by default. - `zfs.latestCompatibleLinuxPackages` is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention. - The `shadowstack` hardening flag has been added, though disabled by default. -- `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package. +- `xxd` is now provided by the `tinyxxd` package rather than `vim.xxd` to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package. -- `prometheus-openldap-exporter` was removed since it was unmaintained upstream and had no nixpkgs maintainers. - -- `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..inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep). +- `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..inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep). - The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped. @@ -767,6 +838,11 @@ - `iproute2` now has libbpf support. +- `postgresql` is now [hardened by default](#module-services-postgres-hardening) using the common `systemd` settings for that. + + If you use extensions that are not packaged in nixpkgs, please review whether it still works + with the current settings and adjust accordingly if needed. + - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overridden by the `NIX_PATH` configuration variable. @@ -780,7 +856,7 @@ - `qgis` and `qgis-ltr` are now built without `grass` by default. `grass` support can be enabled with `qgis.override { withGrass = true; }`. -## Detailed migration information {#sec-release-24.11-migration} +## Detailed Migration Information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index ede54318d558..39961f0f25d5 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -99,8 +99,9 @@ in rec { l = reverseList (stringToCharacters s); suffix = head l; nums = tail l; - in elem suffix (["K" "M" "G" "T"] ++ digits) - && all (num: elem num digits) nums; + in builtins.isInt s + || (elem suffix (["K" "M" "G" "T"] ++ digits) + && all (num: elem num digits) nums); assertByteFormat = name: group: attr: optional (attr ? ${name} && ! isByteFormat attr.${name}) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 69646e550f1f..845f9fdaf68e 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -6,6 +6,7 @@ let attrNames attrValues concatMap + concatMapStringsSep concatStrings elem filter @@ -13,6 +14,7 @@ let flatten flip foldr + generators getAttr hasAttr id @@ -944,16 +946,18 @@ in { warnings = flip concatMap (attrValues cfg.users) (user: let - unambiguousPasswordConfiguration = 1 >= length (filter (x: x != null) ([ - user.hashedPassword - user.hashedPasswordFile - user.password + passwordOptions = [ + "hashedPassword" + "hashedPasswordFile" + "password" ] ++ optionals cfg.mutableUsers [ # For immutable users, initialHashedPassword is set to hashedPassword, # so using these options would always trigger the assertion. - user.initialHashedPassword - user.initialPassword - ])); + "initialHashedPassword" + "initialPassword" + ]; + unambiguousPasswordConfiguration = 1 >= length + (filter (x: x != null) (map (flip getAttr user) passwordOptions)); in optional (!unambiguousPasswordConfiguration) '' The user '${user.name}' has multiple of the options `hashedPassword`, `password`, `hashedPasswordFile`, `initialPassword` @@ -961,6 +965,13 @@ in { The options silently discard others by the order of precedence given above which can lead to surprising results. To resolve this warning, set at most one of the options above to a non-`null` value. + + The values of these options are: + ${concatMapStringsSep + "\n" + (value: + "* users.users.\"${user.name}\".${value}: ${generators.toPretty {} user.${value}}") + passwordOptions} '') ++ filter (x: x != null) ( flip mapAttrsToList cfg.users (_: user: diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 6f33f592cf57..8fc3cb9920fa 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html). + [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest). ''; }; }; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index b0267d21d3eb..5fc7b3506a1d 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html). + [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest). ''; }; xdg.icons.fallbackCursorThemes = lib.mkOption { diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index a71a46dd36cc..6c05d49189ad 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html). + [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/latest). ''; }; }; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 9bd1af397002..20a49a5346e2 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -17,8 +17,8 @@ in default = true; description = '' Whether to install files to support the - [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html) and the - [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html). + [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/latest) and the + [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/latest). ''; }; @@ -32,7 +32,7 @@ in description = '' Adds associations between mimetypes and applications. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. ''; }; @@ -46,7 +46,7 @@ in description = '' Sets the default applications for given mimetypes. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#default) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information. ''; }; @@ -60,7 +60,7 @@ in description = '' Removes associations between mimetypes and applications. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. ''; }; }; diff --git a/nixos/modules/hardware/corectrl.nix b/nixos/modules/hardware/corectrl.nix index 88b94e12f6b6..6e680ddc846e 100644 --- a/nixos/modules/hardware/corectrl.nix +++ b/nixos/modules/hardware/corectrl.nix @@ -1,23 +1,35 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let + inherit (lib) + mkEnableOption + mkIf + mkOption + mkPackageOption + ; + cfg = config.programs.corectrl; in { options.programs.corectrl = { - enable = lib.mkEnableOption '' + enable = mkEnableOption '' CoreCtrl, a tool to overclock amd graphics cards and processors. Add your user to the corectrl group to run corectrl without needing to enter your password ''; - package = lib.mkPackageOption pkgs "corectrl" { + package = mkPackageOption pkgs "corectrl" { extraDescription = "Useful for overriding the configuration options used for the package."; }; gpuOverclock = { - enable = lib.mkEnableOption '' + enable = mkEnableOption '' GPU overclocking ''; - ppfeaturemask = lib.mkOption { + ppfeaturemask = mkOption { type = lib.types.str; default = "0xfffd7fff"; example = "0xffffffff"; @@ -31,33 +43,34 @@ in }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - environment.systemPackages = [ cfg.package ]; + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; - services.dbus.packages = [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; - users.groups.corectrl = { }; + users.groups.corectrl = { }; - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if ((action.id == "org.corectrl.helper.init" || - action.id == "org.corectrl.helperkiller.init") && - subject.local == true && - subject.active == true && - subject.isInGroup("corectrl")) { - return polkit.Result.YES; - } - }); - ''; - } + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if ((action.id == "org.corectrl.helper.init" || + action.id == "org.corectrl.helperkiller.init") && + subject.local == true && + subject.active == true && + subject.isInGroup("corectrl")) { + return polkit.Result.YES; + } + }); + ''; - (lib.mkIf cfg.gpuOverclock.enable { - # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169 - # The overdrive bit - boot.kernelParams = [ "amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}" ]; - }) - ]); + # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169 + # The overdrive bit + boot.kernelParams = mkIf cfg.gpuOverclock.enable [ + "amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}" + ]; + }; - meta.maintainers = with lib.maintainers; [ artturin ]; + meta.maintainers = with lib.maintainers; [ + artturin + Scrumplex + ]; } diff --git a/nixos/modules/hardware/hackrf.nix b/nixos/modules/hardware/hackrf.nix index 7f03b765bbda..467fd71ff1b0 100644 --- a/nixos/modules/hardware/hackrf.nix +++ b/nixos/modules/hardware/hackrf.nix @@ -12,6 +12,7 @@ in description = '' Enables hackrf udev rules and ensures 'plugdev' group exists. This is a prerequisite to using HackRF devices without being root, since HackRF USB descriptors will be owned by plugdev through udev. + Ensure your user is a member of the 'plugdev' group after enabling. ''; }; }; diff --git a/nixos/modules/hardware/tuxedo-drivers.nix b/nixos/modules/hardware/tuxedo-drivers.nix new file mode 100644 index 000000000000..aa951782dbc0 --- /dev/null +++ b/nixos/modules/hardware/tuxedo-drivers.nix @@ -0,0 +1,35 @@ +{ config, lib, ... }: +let + cfg = config.hardware.tuxedo-drivers; + tuxedo-drivers = config.boot.kernelPackages.tuxedo-drivers; +in +{ + imports = [ + (lib.mkRenamedOptionModule + [ + "hardware" + "tuxedo-keyboard" + ] + [ + "hardware" + "tuxedo-drivers" + ] + ) + ]; + + options.hardware.tuxedo-drivers = { + enable = lib.mkEnableOption '' + The tuxedo-drivers driver enables access to the following on TUXEDO notebooks: + - Driver for Fn-keys + - SysFS control of brightness/color/mode for most TUXEDO keyboards + - Hardware I/O driver for TUXEDO Control Center + + For more inforation it is best to check at the source code description: + ''; + }; + + config = lib.mkIf cfg.enable { + boot.kernelModules = [ "tuxedo_keyboard" ]; + boot.extraModulePackages = [ tuxedo-drivers ]; + }; +} diff --git a/nixos/modules/hardware/tuxedo-keyboard.nix b/nixos/modules/hardware/tuxedo-keyboard.nix deleted file mode 100644 index 01ec486fb88f..000000000000 --- a/nixos/modules/hardware/tuxedo-keyboard.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.hardware.tuxedo-keyboard; - tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard; -in - { - options.hardware.tuxedo-keyboard = { - enable = lib.mkEnableOption '' - the tuxedo-keyboard driver. - - To configure the driver, pass the options to the {option}`boot.kernelParams` configuration. - There are several parameters you can change. It's best to check at the source code description which options are supported. - You can find all the supported parameters at: - - In order to use the `custom` lighting with the maximumg brightness and a color of `0xff0a0a` one would put pass {option}`boot.kernelParams` like this: - - ``` - boot.kernelParams = [ - "tuxedo_keyboard.mode=0" - "tuxedo_keyboard.brightness=255" - "tuxedo_keyboard.color_left=0xff0a0a" - ]; - ``` - ''; - }; - - config = lib.mkIf cfg.enable - { - boot.kernelModules = ["tuxedo_keyboard"]; - boot.extraModulePackages = [ tuxedo-keyboard ]; - }; - } diff --git a/nixos/modules/i18n/input-method/default.md b/nixos/modules/i18n/input-method/default.md index 8101717a4da7..b7312348cd7a 100644 --- a/nixos/modules/i18n/input-method/default.md +++ b/nixos/modules/i18n/input-method/default.md @@ -40,6 +40,7 @@ Available extra IBus engines are: - Anthy (`ibus-engines.anthy`): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Hangul (`ibus-engines.hangul`): Korean input method. + - libpinyin (`ibus-engines.libpinyin`): A Chinese input method. - m17n (`ibus-engines.m17n`): m17n is an input method that uses input methods and corresponding icons in the m17n database. - mozc (`ibus-engines.mozc`): A Japanese input method from diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index cc4c2211e3d3..bbcf4815aced 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -101,6 +101,11 @@ in ) // { __structuredAttrs = true; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + nativeBuildInputs = [ systemd fakeroot diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix index e8706a5f79d0..d270dc069f34 100644 --- a/nixos/modules/image/repart-verity-store.nix +++ b/nixos/modules/image/repart-verity-store.nix @@ -117,10 +117,6 @@ in # do not prepare the ESP, this is done in the final image systemdRepartFlags = previousAttrs.systemdRepartFlags ++ [ "--defer-partitions=esp" ]; - - # the image will be self-contained so we can drop references - # to the closure that was used to build it - unsafeDiscardReferences.out = true; } ); @@ -210,10 +206,6 @@ in rm -v repart-output_orig.json ''; - - # the image will be self-contained so we can drop references - # to the closure that was used to build it - unsafeDiscardReferences.out = true; } ); }; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 0bc5787af676..36ce0fb728f0 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/2nhrwv91g6ycpyxvhmvc0xs8p92wp4bk-nix-2.24.9"; - i686-linux = "/nix/store/idaxj9ji6ggpn1h47a35mf0c8ns4ma39-nix-2.24.9"; - aarch64-linux = "/nix/store/7b5q44l2p70bf6m6dprr8f0587ypwq1z-nix-2.24.9"; - riscv64-linux = "/nix/store/mgw3il1qk59750g5hbf02km79rgyx00y-nix-riscv64-unknown-linux-gnu-2.24.9"; - x86_64-darwin = "/nix/store/rp8rc0pfgham7d7spj5s9syzb138dmmd-nix-2.24.9"; - aarch64-darwin = "/nix/store/1n95r340s7p3vdwqh7m94q0a42crahqq-nix-2.24.9"; + x86_64-linux = "/nix/store/hdy82qidsybc3fg561pqfwagv44vschb-nix-2.24.10"; + i686-linux = "/nix/store/dyx4p79q6blva585bf90wbjjb7iyq8ra-nix-2.24.10"; + aarch64-linux = "/nix/store/30gnc15nig1awa11vii9yz3z8518rnr3-nix-2.24.10"; + riscv64-linux = "/nix/store/bxc2pyp1vj8kr77khyx5nglw73jqb98w-nix-riscv64-unknown-linux-gnu-2.24.10"; + x86_64-darwin = "/nix/store/6mrkghigrci6dz2lnncqpgf80yi8gl7h-nix-2.24.10"; + aarch64-darwin = "/nix/store/3f81gjiv836rjmsb29zab0pbjwf9did8-nix-2.24.10"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index ee7c3e8c887f..0887dd56a67e 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -106,11 +106,12 @@ let # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # packages = with pkgs; [ - # firefox # tree # ]; # }; + # programs.firefox.enable = true; + # List packages installed in system profile. To search, run: # \$ nix search wget # environment.systemPackages = with pkgs; [ @@ -216,7 +217,7 @@ in imports = let mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: { options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // { - default = config.nix.enable; + default = config.nix.enable && ! config.system.disableInstallerTools; internal = true; }; @@ -227,34 +228,21 @@ in in [ (mkToolModule { name = "nixos-build-vms"; }) (mkToolModule { name = "nixos-enter"; }) - (mkToolModule { name = "nixos-generate-config"; package = nixos-generate-config; }) - (mkToolModule { name = "nixos-install"; package = nixos-install; }) + (mkToolModule { name = "nixos-generate-config"; package = config.system.build.nixos-generate-config; }) + (mkToolModule { name = "nixos-install"; package = config.system.build.nixos-install; }) (mkToolModule { name = "nixos-option"; }) - (mkToolModule { name = "nixos-rebuild"; package = nixos-rebuild; }) + (mkToolModule { name = "nixos-rebuild"; package = config.system.build.nixos-rebuild; }) (mkToolModule { name = "nixos-version"; package = nixos-version; }) ]; - config = lib.mkMerge [ - (lib.mkIf config.system.disableInstallerTools { - system.tools = { - nixos-build-vms.enable = false; - nixos-enter.enable = false; - nixos-generate-config.enable = false; - nixos-install.enable = false; - nixos-option.enable = false; - nixos-rebuild.enable = false; - nixos-version.enable = false; - }; - }) - { - documentation.man.man-db.skipPackages = [ nixos-version ]; + config = { + documentation.man.man-db.skipPackages = [ nixos-version ]; - # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. - system.build = { - inherit nixos-generate-config nixos-install nixos-rebuild; - nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; - nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; - }; - } - ]; + # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. + system.build = { + inherit nixos-generate-config nixos-install nixos-rebuild; + nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; + nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; + }; + }; } diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix deleted file mode 100644 index 289a8cf9e506..000000000000 --- a/nixos/modules/installer/virtualbox-demo.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - imports = - [ ../virtualisation/virtualbox-image.nix - ../installer/cd-dvd/channel.nix - ../profiles/demo.nix - ../profiles/clone-config.nix - ]; - - # FIXME: UUID detection is currently broken - boot.loader.grub.fsIdentifier = "provided"; - - # Allow mounting of shared folders. - users.users.demo.extraGroups = [ "vboxsf" ]; - - # Add some more video drivers to give X11 a shot at working in - # VMware and QEMU. - services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; - - powerManagement.enable = false; - system.stateVersion = lib.mkDefault lib.trivial.release; - - installer.cloneConfigExtra = '' - # Let demo build as a trusted user. - # nix.settings.trusted-users = [ "demo" ]; - - # Mount a VirtualBox shared folder. - # This is configurable in the VirtualBox menu at - # Machine / Settings / Shared Folders. - # fileSystems."/mnt" = { - # fsType = "vboxsf"; - # device = "nameofdevicetomount"; - # options = [ "rw" ]; - # }; - - # By default, the NixOS VirtualBox demo image includes SDDM and Plasma. - # If you prefer another desktop manager or display manager, you may want - # to disable the default. - # services.xserver.desktopManager.plasma5.enable = lib.mkForce false; - # services.displayManager.sddm.enable = lib.mkForce false; - - # Enable GDM/GNOME by uncommenting above two lines and two lines below. - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome.enable = true; - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # List packages installed in system profile. To search, run: - # \$ nix search wget - # environment.systemPackages = with pkgs; [ - # wget vim - # ]; - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - ''; -} diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index ab3568c4d992..814ee77c0119 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -356,7 +356,24 @@ in localtimed = 325; automatic-timezoned = 326; - # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! + # When adding a uid, make sure it doesn't match an existing gid. + # + # !!! Don't use uids above "399"! !!! + # + # The reason behind this restriction is that, NixOS by default allocates + # system user UIDs/GIDs in the range of `400..999`. System users/groups + # created using command like `useradd` will have UID and GID in this range[1]. + # + # If a newly added ID goes beyond "399", it may conflict with existing + # system user or group of the same id in someone else's NixOS. + # This could break their system and make that person upset for a whole day. + # + # Sidenote: the default is defined in `shadow` module[2], and the relavent change + # was made way back in 2014[3]. + # + # [1]: https://man7.org/linux/man-pages/man5/login.defs.5.html#:~:text=SYS_UID_MAX%20(number)%2C%20SYS_UID_MIN%20(number) + # [2]: + # [3]: https://github.com/NixOS/nixpkgs/commit/0e23a175de3687df8232fe118cbe87f04228ff28 nixbld = 30000; # start of range of uids nobody = 65534; @@ -669,7 +686,24 @@ in # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal - # uids and gids. Also, don't use gids above 399! + # uids and gids. + # + # !!! Don't use gids above "399"! !!! + # + # The reason behind this restriction is that, NixOS by default allocates + # system user UIDs/GIDs in the range of `400..999`. System users/groups + # created using command like `useradd` will have UID and GID in this range[1]. + # + # If a newly added ID goes beyond "399", it may conflict with existing + # system user or group of the same id in someone else's NixOS. + # This could break their system and make that person upset for a whole day. + # + # Sidenote: the default is defined in `shadow` module[2], and the relavent change + # was made way back in 2014[3]. + # + # [1]: https://man7.org/linux/man-pages/man5/login.defs.5.html#:~:text=SYS_UID_MAX%20(number)%2C%20SYS_UID_MIN%20(number) + # [2]: + # [3]: https://github.com/NixOS/nixpkgs/commit/0e23a175de3687df8232fe118cbe87f04228ff28 # For exceptional cases where you really need a gid above 399, leave a # comment stating why. diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index db917f73a064..5fe9b6c1c700 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -22,21 +22,26 @@ let { NAME = "${cfg.distroName}"; ID = "${cfg.distroId}"; + ID_LIKE = optionalString (!isNixos) "nixos"; + VENDOR_NAME = cfg.vendorName; VERSION = "${cfg.release} (${cfg.codeName})"; VERSION_CODENAME = toLower cfg.codeName; VERSION_ID = cfg.release; BUILD_ID = cfg.version; PRETTY_NAME = "${cfg.distroName} ${cfg.release} (${cfg.codeName})"; + CPE_NAME = "cpe:/o:${cfg.vendorId}:${cfg.distroId}:${cfg.release}"; LOGO = "nix-snowflake"; HOME_URL = optionalString isNixos "https://nixos.org/"; + VENDOR_URL = optionalString isNixos "https://nixos.org/"; DOCUMENTATION_URL = optionalString isNixos "https://nixos.org/learn.html"; SUPPORT_URL = optionalString isNixos "https://nixos.org/community.html"; BUG_REPORT_URL = optionalString isNixos "https://github.com/NixOS/nixpkgs/issues"; ANSI_COLOR = optionalString isNixos "1;34"; IMAGE_ID = optionalString (config.system.image.id != null) config.system.image.id; IMAGE_VERSION = optionalString (config.system.image.version != null) config.system.image.version; - } // lib.optionalAttrs (cfg.variant_id != null) { - VARIANT_ID = cfg.variant_id; + VARIANT = optionalString (cfg.variantName != null) cfg.variantName; + VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id; + DEFAULT_HOSTNAME = config.networking.fqdnOrHostName; }; initrdReleaseContents = (removeAttrs osReleaseContents [ "BUILD_ID" ]) // { @@ -116,6 +121,27 @@ in description = "A lower-case string identifying a specific variant or edition of the operating system"; example = "installer"; }; + + variantName = mkOption { + type = types.nullOr types.str; + default = null; + description = "A string identifying a specific variant or edition of the operating system suitable for presentation to the user"; + example = "NixOS Installer Image"; + }; + + vendorId = mkOption { + internal = true; + type = types.str; + default = "nixos"; + description = "The id of the operating system vendor"; + }; + + vendorName = mkOption { + internal = true; + type = types.str; + default = "NixOS"; + description = "The name of the operating system vendor"; + }; }; image = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a014c93afede..0537dbf3ad1c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -98,7 +98,7 @@ ./hardware/sensor/iio.nix ./hardware/steam-hardware.nix ./hardware/system-76.nix - ./hardware/tuxedo-keyboard.nix + ./hardware/tuxedo-drivers.nix ./hardware/ubertooth.nix ./hardware/uinput.nix ./hardware/uni-sync.nix @@ -520,10 +520,10 @@ ./services/desktops/gnome/gnome-remote-desktop.nix ./services/desktops/gnome/gnome-settings-daemon.nix ./services/desktops/gnome/gnome-user-share.nix + ./services/desktops/gnome/localsearch.nix ./services/desktops/gnome/rygel.nix ./services/desktops/gnome/sushi.nix - ./services/desktops/gnome/tracker-miners.nix - ./services/desktops/gnome/tracker.nix + ./services/desktops/gnome/tinysparql.nix ./services/desktops/gsignond.nix ./services/desktops/gvfs.nix ./services/desktops/malcontent.nix @@ -1357,6 +1357,7 @@ ./services/system/nscd.nix ./services/system/saslauthd.nix ./services/system/self-deploy.nix + ./services/system/swapspace.nix ./services/system/systembus-notify.nix ./services/system/systemd-lock-handler.nix ./services/system/uptimed.nix @@ -1390,9 +1391,6 @@ ./services/web-apps/alps.nix ./services/web-apps/anuko-time-tracker.nix ./services/web-apps/artalk.nix - ./services/web-apps/atlassian/confluence.nix - ./services/web-apps/atlassian/crowd.nix - ./services/web-apps/atlassian/jira.nix ./services/web-apps/audiobookshelf.nix ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix @@ -1482,6 +1480,7 @@ ./services/web-apps/ocis.nix ./services/web-apps/onlyoffice.nix ./services/web-apps/openvscode-server.nix + ./services/web-apps/mediagoblin.nix ./services/web-apps/mobilizon.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix deleted file mode 100644 index 52ba40902e87..000000000000 --- a/nixos/modules/profiles/demo.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -{ - imports = [ ./graphical.nix ]; - - users.users.demo = - { isNormalUser = true; - description = "Demo user account"; - extraGroups = [ "wheel" ]; - password = "demo"; - uid = 1000; - }; - - services.displayManager = { - autoLogin = { - enable = true; - user = "demo"; - }; - sddm.autoLogin.relogin = true; - }; -} diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index df21b75c82b1..4ca2b8cc207f 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -29,8 +29,6 @@ with lib; programs.command-not-found.enable = mkDefault false; - programs.ssh.setXAuthLocation = mkDefault false; - services.logrotate.enable = mkDefault false; services.udisks2.enable = mkDefault false; diff --git a/nixos/modules/programs/localsend.nix b/nixos/modules/programs/localsend.nix index 47f54246a40f..a4580057ba4b 100644 --- a/nixos/modules/programs/localsend.nix +++ b/nixos/modules/programs/localsend.nix @@ -12,14 +12,19 @@ in options.programs.localsend = { enable = lib.mkEnableOption "localsend, an open source cross-platform alternative to AirDrop"; - openFirewall = lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" // { - default = true; - }; + package = lib.mkPackageOption pkgs "localsend" { }; + + openFirewall = + lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" + // { + default = true; + }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.localsend ]; + environment.systemPackages = [ cfg.package ]; networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; + networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; }; meta.maintainers = with lib.maintainers; [ pandapip1 ]; diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 770cccd13b50..edfe7f1f6a3e 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -34,7 +34,7 @@ in environment.pathsToLink = [ "/share/nix-ld" ]; - environment.variables = { + environment.sessionVariables = { NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so"; NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib"; }; diff --git a/nixos/modules/programs/openvpn3.nix b/nixos/modules/programs/openvpn3.nix index 10042b44471f..085775af173b 100644 --- a/nixos/modules/programs/openvpn3.nix +++ b/nixos/modules/programs/openvpn3.nix @@ -1,29 +1,87 @@ { config, lib, pkgs, ... }: let + json = pkgs.formats.json { }; cfg = config.programs.openvpn3; -in -{ + + inherit (lib) mkEnableOption mkPackageOption mkOption literalExpression max options lists; + inherit (lib.types) bool submodule ints; +in { options.programs.openvpn3 = { - enable = lib.mkEnableOption "the openvpn3 client"; - package = lib.mkOption { - type = lib.types.package; - default = pkgs.openvpn3.override { - enableSystemdResolved = config.services.resolved.enable; + enable = mkEnableOption "the openvpn3 client"; + package = mkPackageOption pkgs "openvpn3" { }; + netcfg = mkOption { + description = "Network configuration"; + default = { }; + type = submodule { + options = { + settings = mkOption { + description = "Options stored in {file}`/etc/openvpn3/netcfg.json` configuration file"; + default = { }; + type = submodule { + freeformType = json.type; + options = { + systemd_resolved = mkOption { + type = bool; + description = "Whether to use systemd-resolved integration"; + default = config.services.resolved.enable; + defaultText = literalExpression "config.services.resolved.enable"; + example = false; + }; + }; + }; + }; + }; + }; + }; + log-service = mkOption { + description = "Log service configuration"; + default = { }; + type = submodule { + options = { + settings = mkOption { + description = "Options stored in {file}`/etc/openvpn3/log-service.json` configuration file"; + default = { }; + type = submodule { + freeformType = json.type; + options = { + journald = mkOption { + description = "Use systemd-journald"; + type = bool; + default = true; + example = false; + }; + log_dbus_details = mkOption { + description = "Add D-Bus details in log file/syslog"; + type = bool; + default = true; + example = false; + }; + log_level = mkOption { + description = "How verbose should the logging be"; + type = (ints.between 0 7) // { + merge = _loc: defs: + lists.foldl max 0 (options.getValues defs); + }; + default = 3; + example = 6; + }; + timestamp = mkOption { + description = "Add timestamp log file"; + type = bool; + default = false; + example = true; + }; + }; + }; + }; + }; }; - defaultText = lib.literalExpression ''pkgs.openvpn3.override { - enableSystemdResolved = config.services.resolved.enable; - }''; - description = '' - Which package to use for `openvpn3`. - ''; }; }; config = lib.mkIf cfg.enable { - services.dbus.packages = [ - cfg.package - ]; + services.dbus.packages = [ cfg.package ]; users.users.openvpn = { isSystemUser = true; @@ -31,13 +89,25 @@ in group = "openvpn"; }; - users.groups.openvpn = { - gid = config.ids.gids.openvpn; + users.groups.openvpn = { gid = config.ids.gids.openvpn; }; + + environment = { + systemPackages = [ cfg.package ]; + etc = { + "openvpn3/netcfg.json".source = + json.generate "netcfg.json" cfg.netcfg.settings; + "openvpn3/log-service.json".source = + json.generate "log-service.json" cfg.log-service.settings; + }; }; - environment.systemPackages = [ - cfg.package - ]; + systemd = { + packages = [ cfg.package ]; + tmpfiles.rules = [ + "d /etc/openvpn3/configs 0750 openvpn openvpn - -" + ]; + }; }; + meta.maintainers = with lib.maintainers; [ shamilton progrm_jarvis ]; } diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 1fae6b120074..74fc216569e5 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -85,9 +85,10 @@ in extraPackages = lib.mkOption { type = with lib.types; listOf package; - default = with pkgs; [ swaylock swayidle foot dmenu wmenu ]; + # Packages used in default config + default = with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ]; defaultText = lib.literalExpression '' - with pkgs; [ swaylock swayidle foot dmenu wmenu ]; + with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ]; ''; example = lib.literalExpression '' with pkgs; [ i3status i3status-rust termite rofi light ] diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 85dae5ba664b..f1ed26ddb569 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -93,7 +93,7 @@ in default = ""; description = '' Shell commands executed before the `oh-my-zsh` is loaded. - For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt force` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt) + For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt no` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt) ''; }; }; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 160ad91e42aa..18b7e9faaa72 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -62,7 +62,9 @@ in (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "confluence" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "crowd" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] '' @@ -82,6 +84,7 @@ in (mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.") (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") + (mkRemovedOptionModule [ "services" "jira" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 86e86585e405..3bfe921673ed 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -253,8 +253,8 @@ in }; in { # These are mount related wrappers that require the +s permission. - fusermount = mkSetuidRoot "${pkgs.fuse}/bin/fusermount"; - fusermount3 = mkSetuidRoot "${pkgs.fuse3}/bin/fusermount3"; + fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount"; + fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3"; mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount"; umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount"; }; diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index c1e5f8cf43e1..189923f0ed96 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -80,6 +80,8 @@ in { ''; }; + package = lib.options.mkPackageOption pkgs "snapcast" { }; + listenAddress = lib.mkOption { type = lib.types.str; default = "::"; @@ -286,7 +288,7 @@ in { serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.snapcast}/bin/snapserver --daemon ${optionString}"; + ExecStart = "${cfg.package}/bin/snapserver --daemon ${optionString}"; Type = "forking"; LimitRTPRIO = 50; LimitRTTIME = "infinity"; diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index 66a762763cb8..247174028adc 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -1,14 +1,18 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - cfg = config.services.lighthouse; -in { - +in +{ options = { services.lighthouse = { beacon = lib.mkOption { description = "Beacon node"; - default = {}; + default = { }; type = lib.types.submodule { options = { enable = lib.mkEnableOption "Lightouse Beacon node"; @@ -133,7 +137,7 @@ in { validator = lib.mkOption { description = "Validator node"; - default = {}; + default = { }; type = lib.types.submodule { options = { enable = lib.mkOption { @@ -152,7 +156,7 @@ in { beaconNodes = lib.mkOption { type = lib.types.listOf lib.types.str; - default = ["http://localhost:5052"]; + default = [ "http://localhost:5052" ]; description = '' Beacon nodes to connect to. ''; @@ -190,7 +194,13 @@ in { }; network = lib.mkOption { - type = lib.types.enum [ "mainnet" "gnosis" "chiado" "sepolia" "holesky" ]; + type = lib.types.enum [ + "mainnet" + "gnosis" + "chiado" + "sepolia" + "holesky" + ]; default = "mainnet"; description = '' The network to connect to. Mainnet is the default ethereum network. @@ -205,19 +215,19 @@ in { default = ""; example = ""; }; + + package = lib.mkPackageOption pkgs "lighthouse" { }; }; }; config = lib.mkIf (cfg.beacon.enable || cfg.validator.enable) { - - environment.systemPackages = [ pkgs.lighthouse ] ; + environment.systemPackages = [ cfg.package ]; networking.firewall = lib.mkIf cfg.beacon.enable { allowedTCPPorts = lib.mkIf cfg.beacon.openFirewall [ cfg.beacon.port ]; allowedUDPPorts = lib.mkIf cfg.beacon.openFirewall [ cfg.beacon.port ]; }; - systemd.services.lighthouse-beacon = lib.mkIf cfg.beacon.enable { description = "Lighthouse beacon node (connect to P2P nodes and verify blocks)"; wantedBy = [ "multi-user.target" ]; @@ -227,7 +237,7 @@ in { # make sure the chain data directory is created on first run mkdir -p ${cfg.beacon.dataDir}/${cfg.network} - ${pkgs.lighthouse}/bin/lighthouse beacon_node \ + ${lib.getExe cfg.package} beacon_node \ --disable-upnp \ ${lib.optionalString cfg.beacon.disableDepositContractSync "--disable-deposit-contract-sync"} \ --port ${toString cfg.beacon.port} \ @@ -236,8 +246,8 @@ in { --datadir ${cfg.beacon.dataDir}/${cfg.network} \ --execution-endpoint http://${cfg.beacon.execution.address}:${toString cfg.beacon.execution.port} \ --execution-jwt ''${CREDENTIALS_DIRECTORY}/LIGHTHOUSE_JWT \ - ${lib.optionalString cfg.beacon.http.enable '' --http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}''} \ - ${lib.optionalString cfg.beacon.metrics.enable '' --metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}''} \ + ${lib.optionalString cfg.beacon.http.enable ''--http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}''} \ + ${lib.optionalString cfg.beacon.metrics.enable ''--metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}''} \ ${cfg.extraArgs} ${cfg.beacon.extraArgs} ''; serviceConfig = { @@ -262,7 +272,10 @@ in { RestrictNamespaces = true; LockPersonality = true; RemoveIPC = true; - SystemCallFilter = [ "@system-service" "~@privileged" ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; }; }; @@ -275,7 +288,7 @@ in { # make sure the chain data directory is created on first run mkdir -p ${cfg.validator.dataDir}/${cfg.network} - ${pkgs.lighthouse}/bin/lighthouse validator_client \ + ${lib.getExe cfg.package} validator_client \ --network ${cfg.network} \ --beacon-nodes ${lib.concatStringsSep "," cfg.validator.beaconNodes} \ --datadir ${cfg.validator.dataDir}/${cfg.network} \ @@ -305,8 +318,14 @@ in { RestrictNamespaces = true; LockPersonality = true; RemoveIPC = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; - SystemCallFilter = [ "@system-service" "~@privileged" ]; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; }; }; }; diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index 01608d33d8d1..9f01a00aad6d 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -95,7 +95,7 @@ in after = ["network.target"]; wantedBy = ["multi-user.target"]; script = '' - ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag} + exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag} ''; serviceConfig = { User = "boinc"; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index f4944d3ce318..dd739798963c 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -32,6 +32,12 @@ let ${cfg.extraCgroupConfig} ''; + mpiConf = pkgs.writeTextDir "mpi.conf" + '' + PMIxCliTmpDirBase=${cfg.mpi.PmixCliTmpDirBase} + ${cfg.mpi.extraMpiConfig} + ''; + slurmdbdConf = pkgs.writeText "slurmdbd.conf" '' DbdHost=${cfg.dbdserver.dbdHost} @@ -45,7 +51,7 @@ let # in the same directory as slurm.conf etcSlurm = pkgs.symlinkJoin { name = "etc-slurm"; - paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths; + paths = [ configFile cgroupConfig plugStackConfig mpiConf ] ++ cfg.extraConfigPaths; }; in @@ -242,6 +248,24 @@ in ''; }; + mpi = { + PmixCliTmpDirBase = lib.mkOption { + default = "/tmp/pmix"; + type = lib.types.str; + description = '' + Base path for PMIx temporary files. + ''; + }; + + extraMpiConfig = lib.mkOption { + default = ""; + type = lib.types.lines; + description = '' + Extra configuration for that will be added to `mpi.conf`. + ''; + }; + }; + extraPlugstackConfig = lib.mkOption { default = ""; type = lib.types.lines; @@ -372,8 +396,9 @@ in }; }; - systemd.tmpfiles.rules = lib.mkIf cfg.client.enable [ + systemd.tmpfiles.rules = lib.optionals cfg.client.enable [ "d /var/spool/slurmd 755 root root -" + "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -" ]; services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true); diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index b4cad5ee23c1..617d58450326 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -5,7 +5,7 @@ let opt = options.services.buildbot-master; package = cfg.package.python.pkgs.toPythonModule cfg.package; - python = package.pythonModule; + python = cfg.package.python; escapeStr = lib.escape [ "'" ]; @@ -93,13 +93,13 @@ in { }; extraConfig = lib.mkOption { - type = lib.types.str; + type = lib.types.lines; description = "Extra configuration to append to master.cfg"; default = "c['buildbotNetUsageData'] = None"; }; extraImports = lib.mkOption { - type = lib.types.str; + type = lib.types.lines; description = "Extra python imports to prepend to master.cfg"; default = ""; example = "from buildbot.process.project import Project"; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 189aaf86dd2d..45d6b2428a46 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -330,12 +330,12 @@ in ln -sf ${hydraConf} ${baseDir}/hydra.conf - mkdir -m 0700 -p ${baseDir}/www + mkdir -m 0700 ${baseDir}/www || true chown hydra-www:hydra ${baseDir}/www - mkdir -m 0700 -p ${baseDir}/queue-runner - mkdir -m 0750 -p ${baseDir}/build-logs - mkdir -m 0750 -p ${baseDir}/runcommand-logs + mkdir -m 0700 ${baseDir}/queue-runner || true + mkdir -m 0750 ${baseDir}/build-logs || true + mkdir -m 0750 ${baseDir}/runcommand-logs || true chown hydra-queue-runner:hydra \ ${baseDir}/queue-runner \ ${baseDir}/build-logs \ @@ -362,8 +362,8 @@ in # Move legacy hydra-www roots. if [ -e /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots ]; then - find /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots/ -type f \ - | xargs -r mv -f -t ${cfg.gcRootsDir}/ + find /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots/ -type f -print0 \ + | xargs -0 -r mv -f -t ${cfg.gcRootsDir}/ rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots fi @@ -520,7 +520,7 @@ in elif [[ $compression == zstd ]]; then compression="zstd --rm" fi - find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "$compression" --force --quiet ''; startAt = "Sun 01:45"; serviceConfig.Slice = "system-hydra.slice"; diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 5108f040e968..6cd3defb24a3 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -364,6 +364,24 @@ postgresql.withJIT.pname evaluates to `"foobar"`. +## Service hardening {#module-services-postgres-hardening} + +The service created by the [`postgresql`-module](#opt-services.postgresql.enable) uses +several common hardening options from `systemd`, most notably: + +* Memory pages must not be both writable and executable (this only applies to non-JIT setups). +* A system call filter (see {manpage}`systemd.exec(5)` for details on `@system-service`). +* A stricter default UMask (`0027`). +* Only sockets of type `AF_INET`/`AF_INET6`/`AF_NETLINK`/`AF_UNIX` allowed. +* Restricted filesystem access (private `/tmp`, most of the file-system hierachy is mounted read-only, only process directories in `/proc` that are owned by the same user). + +The NixOS module also contains necessary adjustments for extensions from `nixpkgs` +if these are enabled. If an extension or a postgresql feature from `nixpkgs` breaks +with hardening, it's considered a bug. + +When using extensions that are not packaged in `nixpkgs`, hardening adjustments may +become necessary. + ## Notable differences to upstream {#module-services-postgres-upstream-deviation} - To avoid circular dependencies between default and -dev outputs, the output of the `pg_config` system view has been removed. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ceaccde813a0..876969ef9bb5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -623,7 +623,46 @@ in TimeoutSec = 120; ExecStart = "${postgresql}/bin/postgres"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + MemoryDenyWriteExecute = lib.mkDefault (cfg.settings.jit == "off"); + NoNewPrivileges = true; + LockPersonality = true; + PrivateDevices = true; + PrivateMounts = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" # used for network interface enumeration + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + ]; + UMask = if groupAccessAvailable then "0027" else "0077"; } + (mkIf (cfg.dataDir != "/var/lib/postgresql") { + ReadWritePaths = [ cfg.dataDir ]; + }) (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; StateDirectoryMode = if groupAccessAvailable then "0750" else "0700"; diff --git a/nixos/modules/services/databases/surrealdb.nix b/nixos/modules/services/databases/surrealdb.nix index b88129ebc6f4..d38b7b311f1f 100644 --- a/nixos/modules/services/databases/surrealdb.nix +++ b/nixos/modules/services/databases/surrealdb.nix @@ -14,9 +14,9 @@ in { type = lib.types.str; description = '' The path that surrealdb will write data to. Use null for in-memory. - Can be one of "memory", "file://:path", "tikv://:addr". + Can be one of "memory", "rocksdb://:path", "surrealkv://:path", "tikv://:addr", "fdb://:addr". ''; - default = "file:///var/lib/surrealdb/"; + default = "rocksdb:///var/lib/surrealdb/"; example = "memory"; }; @@ -41,10 +41,9 @@ in { extraFlags = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; - example = [ "--allow-all" "--auth" "--user root" "--pass root" ]; + example = [ "--allow-all" "--user" "root" "--pass" "root" ]; description = '' - Specify a list of additional command line flags, - which get escaped and are then passed to surrealdb. + Specify a list of additional command line flags. ''; }; }; @@ -61,7 +60,7 @@ in { after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${lib.escapeShellArgs cfg.extraFlags} -- ${cfg.dbPath}"; + ExecStart = "${cfg.package}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${lib.strings.concatStringsSep " " cfg.extraFlags} -- ${cfg.dbPath}"; DynamicUser = true; Restart = "on-failure"; StateDirectory = "surrealdb"; diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix index 923163a8049e..b26ad47c9a13 100644 --- a/nixos/modules/services/databases/victoriametrics.nix +++ b/nixos/modules/services/databases/victoriametrics.nix @@ -1,65 +1,188 @@ -{ config, pkgs, lib, ... }: -let cfg = config.services.victoriametrics; in { - options.services.victoriametrics = with lib; { - enable = mkEnableOption "VictoriaMetrics, a time series database, long-term remote storage for Prometheus"; + config, + pkgs, + lib, + ... +}: +with lib; +let + cfg = config.services.victoriametrics; + settingsFormat = pkgs.formats.yaml { }; + + startCLIList = + [ + "${cfg.package}/bin/victoria-metrics" + "-storageDataPath=/var/lib/${cfg.stateDir}" + "-httpListenAddr=${cfg.listenAddress}" + + ] + ++ lib.optionals (cfg.retentionPeriod != null) [ "-retentionPeriod=${cfg.retentionPeriod}" ] + ++ cfg.extraOptions; + prometheusConfigYml = checkedConfig ( + settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig + ); + + checkedConfig = + file: + pkgs.runCommand "checked-config" { nativeBuildInputs = [ cfg.package ]; } '' + ln -s ${file} $out + ${lib.escapeShellArgs startCLIList} -promscrape.config=${file} -dryRun + ''; +in +{ + options.services.victoriametrics = { + enable = mkEnableOption "VictoriaMetrics is a fast, cost-effective and scalable monitoring solution and time series database."; package = mkPackageOption pkgs "victoriametrics" { }; + listenAddress = mkOption { default = ":8428"; type = types.str; description = '' - The listen address for the http interface. + TCP address to listen for incoming http requests. ''; }; - retentionPeriod = mkOption { - type = types.int; - default = 1; + + stateDir = mkOption { + type = types.str; + default = "victoriametrics"; description = '' - Retention period in months. + Directory below `/var/lib` to store VictoriaMetrics metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. ''; }; + + retentionPeriod = mkOption { + type = types.nullOr types.str; + default = null; + example = "15d"; + description = '' + How long to retain samples in storage. + The minimum retentionPeriod is 24h or 1d. See also -retentionFilter + The following optional suffixes are supported: s (second), h (hour), d (day), w (week), y (year). + If suffix isn't set, then the duration is counted in months (default 1) + ''; + }; + + prometheusConfig = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; }; + default = { }; + example = literalExpression '' + { + scrape_configs = [ + { + job_name = "postgres-exporter"; + metrics_path = "/metrics"; + static_configs = [ + { + targets = ["1.2.3.4:9187"]; + labels.type = "database"; + } + ]; + } + { + job_name = "node-exporter"; + metrics_path = "/metrics"; + static_configs = [ + { + targets = ["1.2.3.4:9100"]; + labels.type = "node"; + } + { + targets = ["5.6.7.8:9100"]; + labels.type = "node"; + } + ]; + } + ]; + } + ''; + description = '' + Config for prometheus style metrics. + See the docs: + for more information. + ''; + }; + extraOptions = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; + example = literalExpression '' + [ + "-httpAuth.username=username" + "-httpAuth.password=file:///abs/path/to/file" + "-loggerLevel=WARN" + ] + ''; description = '' - Extra options to pass to VictoriaMetrics. See the README: - - or {command}`victoriametrics -help` for more - information. + Extra options to pass to VictoriaMetrics. See the docs: + + or {command}`victoriametrics -help` for more information. ''; }; }; + config = lib.mkIf cfg.enable { systemd.services.victoriametrics = { description = "VictoriaMetrics time series database"; + wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; startLimitBurst = 5; + serviceConfig = { - Restart = "on-failure"; - RestartSec = 1; - StateDirectory = "victoriametrics"; + ExecStart = lib.escapeShellArgs ( + startCLIList + ++ lib.optionals (cfg.prometheusConfig != null) [ "-promscrape.config=${prometheusConfigYml}" ] + ); + DynamicUser = true; - ExecStart = '' - ${cfg.package}/bin/victoria-metrics \ - -storageDataPath=/var/lib/victoriametrics \ - -httpListenAddr ${cfg.listenAddress} \ - -retentionPeriod ${toString cfg.retentionPeriod} \ - ${lib.escapeShellArgs cfg.extraOptions} - ''; - # victoriametrics 1.59 with ~7GB of data seems to eventually panic when merging files and then - # begins restart-looping forever. Set LimitNOFILE= to a large number to work around this issue. - # - # panic: FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": - # cannot open source part for merging: cannot open values file in stream mode: - # cannot open file "/var/lib/victoriametrics/data/small/2021_08/[...]/values.bin": - # open /var/lib/victoriametrics/data/small/2021_08/[...]/values.bin: too many open files + RestartSec = 1; + Restart = "on-failure"; + RuntimeDirectory = "victoriametrics"; + RuntimeDirectoryMode = "0700"; + StateDirectory = cfg.stateDir; + StateDirectoryMode = "0700"; + + # Increase the limit to avoid errors like 'too many open files' when merging small parts LimitNOFILE = 1048576; + + # Hardening + DeviceAllow = [ "/dev/null rw" ]; + DevicePolicy = "strict"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; }; - wantedBy = [ "multi-user.target" ]; postStart = let - bindAddr = (lib.optionalString (lib.hasPrefix ":" cfg.listenAddress) "127.0.0.1") + cfg.listenAddress; + bindAddr = + (lib.optionalString (lib.hasPrefix ":" cfg.listenAddress) "127.0.0.1") + cfg.listenAddress; in lib.mkBefore '' until ${lib.getBin pkgs.curl}/bin/curl -s -o /dev/null http://${bindAddr}/ping; do diff --git a/nixos/modules/services/desktops/gnome/localsearch.nix b/nixos/modules/services/desktops/gnome/localsearch.nix new file mode 100644 index 000000000000..9160d1f06431 --- /dev/null +++ b/nixos/modules/services/desktops/gnome/localsearch.nix @@ -0,0 +1,50 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + meta = { + maintainers = lib.teams.gnome.members; + }; + + imports = [ + (lib.mkRenamedOptionModule + [ + "services" + "gnome" + "tracker-miners" + "enable" + ] + [ + "services" + "gnome" + "localsearch" + "enable" + ] + ) + ]; + + options = { + services.gnome.localsearch = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable LocalSearch, indexing services for TinySPARQL + search engine and metadata storage system. + ''; + }; + }; + }; + + config = lib.mkIf config.services.gnome.localsearch.enable { + environment.systemPackages = [ pkgs.localsearch ]; + + services.dbus.packages = [ pkgs.localsearch ]; + + systemd.packages = [ pkgs.localsearch ]; + }; +} diff --git a/nixos/modules/services/desktops/gnome/tinysparql.nix b/nixos/modules/services/desktops/gnome/tinysparql.nix new file mode 100644 index 000000000000..551b5800e84c --- /dev/null +++ b/nixos/modules/services/desktops/gnome/tinysparql.nix @@ -0,0 +1,66 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.gnome.tinysparql; +in +{ + meta = { + maintainers = lib.teams.gnome.members; + }; + + imports = [ + (lib.mkRemovedOptionModule + [ + "services" + "gnome" + "tracker" + "subcommandPackages" + ] + '' + This option is broken since 3.7 and since 3.8 tracker (tinysparql) no longer expect + CLI to be extended by external projects, note that tracker-miners (localsearch) now + provides its own CLI tool. + '' + ) + (lib.mkRenamedOptionModule + [ + "services" + "gnome" + "tracker" + "enable" + ] + [ + "services" + "gnome" + "tinysparql" + "enable" + ] + ) + ]; + + options = { + services.gnome.tinysparql = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable TinySPARQL services, a search engine, + search tool and metadata storage system. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.tinysparql ]; + + services.dbus.packages = [ pkgs.tinysparql ]; + + systemd.packages = [ pkgs.tinysparql ]; + }; +} diff --git a/nixos/modules/services/desktops/gnome/tracker-miners.nix b/nixos/modules/services/desktops/gnome/tracker-miners.nix deleted file mode 100644 index d5d42cee9f8b..000000000000 --- a/nixos/modules/services/desktops/gnome/tracker-miners.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Tracker Miners daemons. - -{ config, pkgs, lib, ... }: - -{ - - meta = { - maintainers = lib.teams.gnome.members; - }; - - ###### interface - - options = { - - services.gnome.tracker-miners = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable Tracker miners, indexing services for Tracker - search engine and metadata storage system. - ''; - }; - - }; - - }; - - ###### implementation - - config = lib.mkIf config.services.gnome.tracker-miners.enable { - - environment.systemPackages = [ pkgs.tracker-miners ]; - - services.dbus.packages = [ pkgs.tracker-miners ]; - - systemd.packages = [ pkgs.tracker-miners ]; - - services.gnome.tracker.subcommandPackages = [ pkgs.tracker-miners ]; - - }; - -} diff --git a/nixos/modules/services/desktops/gnome/tracker.nix b/nixos/modules/services/desktops/gnome/tracker.nix deleted file mode 100644 index 45b679571c70..000000000000 --- a/nixos/modules/services/desktops/gnome/tracker.nix +++ /dev/null @@ -1,66 +0,0 @@ -# Tracker daemon. - -{ config, pkgs, lib, ... }: - -let - cfg = config.services.gnome.tracker; -in -{ - - meta = { - maintainers = lib.teams.gnome.members; - }; - - ###### interface - - options = { - - services.gnome.tracker = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable Tracker services, a search engine, - search tool and metadata storage system. - ''; - }; - - subcommandPackages = lib.mkOption { - type = lib.types.listOf lib.types.package; - default = [ ]; - internal = true; - description = '' - List of packages containing tracker3 subcommands. - ''; - }; - - }; - - }; - - - ###### implementation - - config = lib.mkIf cfg.enable { - - environment.systemPackages = [ pkgs.tracker ]; - - services.dbus.packages = [ pkgs.tracker ]; - - systemd.packages = [ pkgs.tracker ]; - - environment.variables = { - TRACKER_CLI_SUBCOMMANDS_DIR = - let - subcommandPackagesTree = pkgs.symlinkJoin { - name = "tracker-with-subcommands-${pkgs.tracker.version}"; - paths = [ pkgs.tracker ] ++ cfg.subcommandPackages; - }; - in - "${subcommandPackagesTree}/libexec/tracker3"; - }; - - }; - -} diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 532c64c0f424..9431a09b9936 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -332,7 +332,7 @@ in { { # JACK intentionally not checked, as PW-on-JACK setups are a thing that some people may want assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable; - message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true."; + message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Either set `services.pipewire.audio.enable` to true to enable audio support, or set both `services.pipewire.pulse.enable` and `services.pipewire.alsa.enable` to false to use pipewire exclusively for the compositor."; } { assertion = length diff --git a/nixos/modules/services/hardware/amdvlk.nix b/nixos/modules/services/hardware/amdvlk.nix index 32d6fb3be21d..e2fd91811d01 100644 --- a/nixos/modules/services/hardware/amdvlk.nix +++ b/nixos/modules/services/hardware/amdvlk.nix @@ -37,8 +37,6 @@ in { extraPackages32 = [ cfg.support32Bit.package ]; }; - services.xserver.videoDrivers = [ "amdgpu" ]; - environment.sessionVariables = lib.mkIf cfg.supportExperimental.enable { AMDVLK_ENABLE_DEVELOPING_EXT = "all"; }; diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index a73cc970576a..741abfba30b6 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -62,7 +62,10 @@ in ControllerMode = "bredr"; }; }; - description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; + description = '' + Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf). + See for full list of options. + ''; }; input = mkOption { @@ -74,7 +77,10 @@ in ClassicBondedOnly = true; }; }; - description = "Set configuration for the input service (/etc/bluetooth/input.conf)."; + description = '' + Set configuration for the input service (/etc/bluetooth/input.conf). + See for full list of options. + ''; }; network = mkOption { @@ -85,7 +91,10 @@ in DisableSecurity = true; }; }; - description = "Set configuration for the network service (/etc/bluetooth/network.conf)."; + description = '' + Set configuration for the network service (/etc/bluetooth/network.conf). + See for full list of options. + ''; }; }; }; diff --git a/nixos/modules/services/hardware/monado.nix b/nixos/modules/services/hardware/monado.nix index 9f9c6c39a0b4..f7fdf421ac17 100644 --- a/nixos/modules/services/hardware/monado.nix +++ b/nixos/modules/services/hardware/monado.nix @@ -1,10 +1,18 @@ -{ config -, lib -, pkgs -, ... +{ + config, + lib, + pkgs, + ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkOption mkPackageOption types; + inherit (lib) + mkDefault + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; cfg = config.services.monado; @@ -27,7 +35,8 @@ in example = true; }; - highPriority = mkEnableOption "high priority capability for monado-service" + highPriority = + mkEnableOption "high priority capability for monado-service" // mkOption { default = true; }; }; @@ -61,9 +70,10 @@ in serviceConfig = { ExecStart = - if cfg.highPriority - then "${config.security.wrapperDir}/monado-service" - else lib.getExe' cfg.package "monado-service"; + if cfg.highPriority then + "${config.security.wrapperDir}/monado-service" + else + lib.getExe' cfg.package "monado-service"; Restart = "no"; }; @@ -93,6 +103,8 @@ in environment.systemPackages = [ cfg.package ]; environment.pathsToLink = [ "/share/openxr" ]; + hardware.graphics.extraPackages = [ pkgs.monado-vulkan-layers ]; + environment.etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime { source = "${cfg.package}/share/openxr/1/openxr_monado.json"; }; diff --git a/nixos/modules/services/hardware/spacenavd.nix b/nixos/modules/services/hardware/spacenavd.nix index c09439356998..db3ab37dc267 100644 --- a/nixos/modules/services/hardware/spacenavd.nix +++ b/nixos/modules/services/hardware/spacenavd.nix @@ -1,8 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.hardware.spacenavd; - -in { - +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.hardware.spacenavd; +in +{ options = { hardware.spacenavd = { enable = lib.mkEnableOption "spacenavd to support 3DConnexion devices"; @@ -10,12 +15,9 @@ in { }; config = lib.mkIf cfg.enable { - systemd.user.services.spacenavd = { - description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion"; - wantedBy = [ "graphical.target" ]; - serviceConfig = { - ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog"; - }; + systemd = { + packages = [ pkgs.spacenavd ]; + services.spacenavd.enable = true; }; }; } diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix index d2137971b3a7..a9bcf250cf69 100644 --- a/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.triggerhappy; @@ -6,35 +11,53 @@ let socket = "/run/thd.socket"; configFile = pkgs.writeText "triggerhappy.conf" '' - ${lib.concatMapStringsSep "\n" - ({ keys, event, cmd, ... }: - ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}'' - ) - cfg.bindings} + ${lib.concatMapStringsSep "\n" ( + { + keys, + event, + cmd, + ... + }: + ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ + toString + { + press = 1; + hold = 2; + release = 0; + } + .${event} + } ${cmd}'' + ) cfg.bindings} ${cfg.extraConfig} ''; - bindingCfg = { ... }: { - options = { + bindingCfg = + { ... }: + { + options = { + + keys = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; + }; + + event = lib.mkOption { + type = lib.types.enum [ + "press" + "hold" + "release" + ]; + default = "press"; + description = "Event to match."; + }; + + cmd = lib.mkOption { + type = lib.types.str; + description = "What to run."; + }; - keys = lib.mkOption { - type = lib.types.listOf lib.types.str; - description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; }; - - event = lib.mkOption { - type = lib.types.enum ["press" "hold" "release"]; - default = "press"; - description = "Event to match."; - }; - - cmd = lib.mkOption { - type = lib.types.str; - description = "What to run."; - }; - }; - }; in @@ -65,9 +88,9 @@ in bindings = lib.mkOption { type = lib.types.listOf (lib.types.submodule bindingCfg); - default = []; + default = [ ]; example = lib.literalExpression '' - [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc-cli}/bin/mpc -q toggle"; } ] + [ { keys = ["PLAYPAUSE"]; cmd = "''${lib.getExe pkgs.mpc} -q toggle"; } ] ''; description = '' Key bindings for {command}`triggerhappy`. @@ -86,7 +109,6 @@ in }; - ###### implementation config = lib.mkIf cfg.enable { @@ -101,18 +123,22 @@ in wantedBy = [ "multi-user.target" ]; description = "Global hotkey daemon"; serviceConfig = { - ExecStart = "${pkgs.triggerhappy}/bin/thd ${lib.optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; + ExecStart = "${pkgs.triggerhappy}/bin/thd ${ + lib.optionalString (cfg.user != "root") "--user ${cfg.user}" + } --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; }; }; - services.udev.packages = lib.singleton (pkgs.writeTextFile { - name = "triggerhappy-udev-rules"; - destination = "/etc/udev/rules.d/61-triggerhappy.rules"; - text = '' - ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ - RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" - ''; - }); + services.udev.packages = lib.singleton ( + pkgs.writeTextFile { + name = "triggerhappy-udev-rules"; + destination = "/etc/udev/rules.d/61-triggerhappy.rules"; + text = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ + RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" + ''; + } + ); }; diff --git a/nixos/modules/services/hardware/tuxedo-rs.nix b/nixos/modules/services/hardware/tuxedo-rs.nix index cfdc1c64d118..4ba7825ae8a5 100644 --- a/nixos/modules/services/hardware/tuxedo-rs.nix +++ b/nixos/modules/services/hardware/tuxedo-rs.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { - hardware.tuxedo-keyboard.enable = true; + hardware.tuxedo-drivers.enable = true; systemd = { services.tailord = { diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index c7b28b910515..d5af0bcd5e91 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -6,17 +6,21 @@ let cfg = config.services.home-assistant; format = pkgs.formats.yaml {}; - # Render config attribute sets to YAML - # Values that are null will be filtered from the output, so this is one way to have optional - # options shown in settings. - # We post-process the result to add support for YAML functions, like secrets or includes, see e.g. + # Post-process YAML output to add support for YAML functions, like + # secrets or includes, by naively unquoting strings with leading bangs + # and at least one space-separated parameter. # https://www.home-assistant.io/docs/configuration/secrets/ - filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) (lib.recursiveUpdate customLovelaceModulesResources (cfg.config or {})); - configFile = pkgs.runCommandLocal "configuration.yaml" { } '' - cp ${format.generate "configuration.yaml" filteredConfig} $out + renderYAMLFile = fn: yaml: pkgs.runCommandLocal fn { } '' + cp ${format.generate fn yaml} $out sed -i -e "s/'\!\([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out ''; - lovelaceConfigFile = format.generate "ui-lovelace.yaml" cfg.lovelaceConfig; + + # Filter null values from the configuration, so that we can still advertise + # optional options in the config attribute. + filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) (lib.recursiveUpdate customLovelaceModulesResources (cfg.config or {})); + configFile = renderYAMLFile "configuration.yaml" filteredConfig; + + lovelaceConfigFile = renderYAMLFile "ui-lovelace.yaml" cfg.lovelaceConfig; # Components advertised by the home-assistant package availableComponents = cfg.package.availableComponents; diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 644a93214516..d6038055c05c 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -10,15 +10,29 @@ let allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile; positionsFile = cfg.configuration.positions.filename; + + configFile = if cfg.configFile != null + then cfg.configFile + else prettyJSON cfg.configuration; + in { options.services.promtail = with types; { enable = mkEnableOption "the Promtail ingresser"; - configuration = mkOption { type = (pkgs.formats.json {}).type; description = '' Specify the configuration for Promtail in Nix. + This option will be ignored if `services.promtail.configFile` is defined. + ''; + }; + + configFile = mkOption { + type = nullOr path; + default = null; + description = '' + Config file path for Promtail. + If this option is defined, the value of `services.promtail.configuration` will be ignored. ''; }; @@ -42,14 +56,14 @@ in { stopIfChanged = false; preStart = '' - ${lib.getExe pkgs.promtail} -config.file=${prettyJSON cfg.configuration} -check-syntax + ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax ''; serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix index c484f67327d8..98ed19abd366 100644 --- a/nixos/modules/services/matrix/conduit.nix +++ b/nixos/modules/services/matrix/conduit.nix @@ -111,6 +111,8 @@ in description = "Conduit Matrix Server"; documentation = [ "https://gitlab.com/famedly/conduit/" ]; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; environment = lib.mkMerge ([ { CONDUIT_CONFIG = configFile; } cfg.extraEnvironment diff --git a/nixos/modules/services/matrix/hebbot.nix b/nixos/modules/services/matrix/hebbot.nix index 9f344fbe08d0..ba676422ca1f 100644 --- a/nixos/modules/services/matrix/hebbot.nix +++ b/nixos/modules/services/matrix/hebbot.nix @@ -70,7 +70,7 @@ in LoadCredential = "bot-password-file:${cfg.botPasswordFile}"; RestartSec = "10s"; StateDirectory = "hebbot"; - WorkingDirectory = "hebbot"; + WorkingDirectory = "/var/lib/hebbot"; }; }; }; diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index e00dece33cab..085f38e522e6 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -186,6 +186,10 @@ in } ]; + # This defaults to true in the application, + # which breaks older configs using pantalaimon or access tokens + services.mjolnir.settings.encryption.use = lib.mkDefault false; + services.pantalaimon-headless.instances."mjolnir" = lib.mkIf cfg.pantalaimon.enable { homeserver = cfg.homeserverUrl; diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix index 7174ff36b709..9cd346a92b51 100644 --- a/nixos/modules/services/misc/guix/default.nix +++ b/nixos/modules/services/misc/guix/default.nix @@ -46,6 +46,17 @@ let GUIX_LOCPATH = "${cfg.stateDir}/guix/profiles/per-user/root/guix-profile/lib/locale"; LC_ALL = "C.UTF-8"; }; + + # Currently, this is just done the lazy way with the official Guix script. A + # more "formal" way would be creating our own Guix script to handle and + # generate the ACL file ourselves. + aclFile = pkgs.runCommandLocal "guix-acl" { } '' + export GUIX_CONFIGURATION_DIRECTORY=./ + for official_server_keys in ${lib.concatStringsSep " " cfg.substituters.authorizedKeys}; do + ${lib.getExe' cfg.package "guix"} archive --authorize < "$official_server_keys" + done + install -Dm0600 ./acl "$out" + ''; in { meta.maintainers = with lib.maintainers; [ foo-dogsquared ]; @@ -118,6 +129,57 @@ in example = "/gnu/var"; }; + substituters = { + urls = lib.mkOption { + type = with lib.types; listOf str; + default = [ + "https://ci.guix.gnu.org" + "https://bordeaux.guix.gnu.org" + "https://berlin.guix.gnu.org" + ]; + example = lib.literalExpression '' + options.services.guix.substituters.urls.default ++ [ + "https://guix.example.com" + "https://guix.example.org" + ] + ''; + description = '' + A list of substitute servers' URLs for the Guix daemon to download + substitutes from. + ''; + }; + + authorizedKeys = lib.mkOption { + type = with lib.types; listOf path; + default = [ + "${cfg.package}/share/guix/ci.guix.gnu.org.pub" + "${cfg.package}/share/guix/bordeaux.guix.gnu.org.pub" + "${cfg.package}/share/guix/berlin.guix.gnu.org.pub" + ]; + defaultText = '' + The packaged signing keys from {option}`services.guix.package`. + ''; + example = lib.literalExpression '' + options.services.guix.substituters.authorizedKeys.default ++ [ + (builtins.fetchurl { + url = "https://guix.example.com/signing-key.pub"; + }) + + (builtins.fetchurl { + url = "https://guix.example.org/static/signing-key.pub"; + }) + ] + ''; + description = '' + A list of signing keys for each substitute server to be authorized as + a source of substitutes. Without this, the listed substitute servers + from {option}`services.guix.substituters.urls` would be ignored [with + some + exceptions](https://guix.gnu.org/manual/en/html_node/Substitute-Authentication.html). + ''; + }; + }; + publish = { enable = mkEnableOption "substitute server for your Guix store directory"; @@ -213,8 +275,10 @@ in systemd.services.guix-daemon = { environment = serviceEnv; script = '' - ${lib.getExe' package "guix-daemon"} \ + exec ${lib.getExe' package "guix-daemon"} \ --build-users-group=${cfg.group} \ + ${lib.optionalString (cfg.substituters.urls != [ ]) + "--substitute-urls='${lib.concatStringsSep " " cfg.substituters.urls}'"} \ ${lib.escapeShellArgs cfg.extraArgs} ''; serviceConfig = { @@ -254,11 +318,7 @@ in # Make transferring files from one store to another easier with the usual # case being of most substitutes from the official Guix CI instance. - system.activationScripts.guix-authorize-keys = '' - for official_server_keys in ${package}/share/guix/*.pub; do - ${lib.getExe' package "guix"} archive --authorize < $official_server_keys - done - ''; + environment.etc."guix/acl".source = aclFile; # Link the usual Guix profiles to the home directory. This is useful in # ephemeral setups where only certain part of the filesystem is @@ -270,8 +330,8 @@ in in '' [ -d "${userProfile}" ] && ln -sfn "${userProfile}" "${location}" ''; - linkProfileToPath = acc: profile: location: let - in acc + (linkProfile profile location); + linkProfileToPath = acc: profile: location: + acc + (linkProfile profile location); # This should contain export-only Guix user profiles. The rest of it is # handled manually in the activation script. @@ -324,7 +384,7 @@ in } ''; script = '' - ${lib.getExe' package "guix"} publish \ + exec ${lib.getExe' package "guix"} publish \ --user=${cfg.publish.user} --port=${builtins.toString cfg.publish.port} \ ${lib.escapeShellArgs cfg.publish.extraArgs} ''; @@ -380,14 +440,12 @@ in description = "Guix garbage collection"; startAt = cfg.gc.dates; script = '' - ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs} + exec ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs} ''; - serviceConfig = { Type = "oneshot"; - PrivateDevices = true; - PrivateNetworks = true; + PrivateNetwork = true; ProtectControlGroups = true; ProtectHostname = true; ProtectKernelTunables = true; diff --git a/nixos/modules/services/misc/mollysocket.nix b/nixos/modules/services/misc/mollysocket.nix index f40caa4a782e..460e8aa05266 100644 --- a/nixos/modules/services/misc/mollysocket.nix +++ b/nixos/modules/services/misc/mollysocket.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) getExe mkIf mkOption mkEnableOption optionals types; + inherit (lib) getExe mkIf mkOption mkEnableOption types; cfg = config.services.mollysocket; configuration = format.generate "mollysocket.conf" cfg.settings; @@ -85,9 +85,7 @@ in { after = [ "network-online.target" ]; wants = [ "network-online.target" ]; environment.RUST_LOG = cfg.logLevel; - serviceConfig = let - capabilities = [ "" ] ++ optionals (cfg.settings.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; - in { + serviceConfig = { EnvironmentFile = cfg.environmentFile; ExecStart = "${getExe package} server"; KillSignal = "SIGINT"; @@ -97,8 +95,6 @@ in { WorkingDirectory = "/var/lib/mollysocket"; # hardening - AmbientCapabilities = capabilities; - CapabilityBoundingSet = capabilities; DevicePolicy = "closed"; DynamicUser = true; LockPersonality = true; diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index a2726d455009..4738baf6d3e5 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -1,7 +1,6 @@ { config, pkgs, lib, ... }: let cfg = config.services.nzbget; - pkg = pkgs.nzbget; stateDir = "/var/lib/nzbget"; configFile = "${stateDir}/nzbget.conf"; configOpts = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-o ${name}=${lib.escapeShellArg (toStr value)}") cfg.settings); @@ -24,6 +23,8 @@ in services.nzbget = { enable = lib.mkEnableOption "NZBGet, for downloading files from news servers"; + package = lib.mkPackageOption pkgs "nzbget" { }; + user = lib.mkOption { type = lib.types.str; default = "nzbget"; @@ -64,8 +65,8 @@ in InfoTarget = "screen"; DetailTarget = "screen"; # required paths - ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf"; - WebDir = "${pkg}/share/nzbget/webui"; + ConfigTemplate = "${cfg.package}/share/nzbget/nzbget.conf"; + WebDir = "${cfg.package}/share/nzbget/webui"; # nixos handles package updates UpdateCheck = "none"; }; @@ -81,7 +82,7 @@ in preStart = '' if [ ! -f ${configFile} ]; then - ${pkgs.coreutils}/bin/install -m 0700 ${pkg}/share/nzbget/nzbget.conf ${configFile} + ${pkgs.coreutils}/bin/install -m 0700 ${cfg.package}/share/nzbget/nzbget.conf ${configFile} fi ''; @@ -92,8 +93,8 @@ in Group = cfg.group; UMask = "0002"; Restart = "on-failure"; - ExecStart = "${pkg}/bin/nzbget --server --configfile ${stateDir}/nzbget.conf ${configOpts}"; - ExecStop = "${pkg}/bin/nzbget --quit"; + ExecStart = "${cfg.package}/bin/nzbget --server --configfile ${stateDir}/nzbget.conf ${configOpts}"; + ExecStop = "${cfg.package}/bin/nzbget --quit"; }; }; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 42b2926a7a1e..d8e4c9c302b3 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -5,10 +5,9 @@ let baseConfig = { plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine"; - server.host = cfg.host; server.port = cfg.port; webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg"; - }; + } // lib.optionalAttrs (cfg.host != null) {server.host = cfg.host;}; fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig; @@ -29,8 +28,8 @@ in enable = lib.mkEnableOption "OctoPrint, web interface for 3D printers"; host = lib.mkOption { - type = lib.types.str; - default = "0.0.0.0"; + type = lib.types.nullOr lib.types.str; + default = null; description = '' Host to bind OctoPrint to. ''; diff --git a/nixos/modules/services/misc/ombi.nix b/nixos/modules/services/misc/ombi.nix index 51f3c3e468a5..89d8b5c53763 100644 --- a/nixos/modules/services/misc/ombi.nix +++ b/nixos/modules/services/misc/ombi.nix @@ -12,6 +12,8 @@ in { on how to set up a reverse proxy ''; + package = lib.mkPackageOption pkgs "ombi" { }; + dataDir = lib.mkOption { type = lib.types.str; default = "/var/lib/ombi"; @@ -58,7 +60,7 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.ombi}/bin/Ombi --storage '${cfg.dataDir}' --host 'http://*:${toString cfg.port}'"; + ExecStart = "${lib.getExe cfg.package} --storage '${cfg.dataDir}' --host 'http://*:${toString cfg.port}'"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 988d54d65695..70cf4f9ff6c6 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -372,9 +372,6 @@ in SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ]; # Needs to serve web page PrivateNetwork = false; - } // lib.optionalAttrs (cfg.port < 1024) { - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; environment = env // { PYTHONPATH = "${cfg.package.python.pkgs.makePythonPath cfg.package.propagatedBuildInputs}:${cfg.package}/lib/paperless-ngx/src"; diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix index 9062b7424b68..9fbd8ec9e1ac 100644 --- a/nixos/modules/services/misc/renovate.nix +++ b/nixos/modules/services/misc/renovate.nix @@ -100,12 +100,10 @@ in ] ++ cfg.runtimePackages; serviceConfig = { - Type = "oneshot"; User = "renovate"; Group = "renovate"; DynamicUser = true; LoadCredential = lib.mapAttrsToList (name: value: "SECRET-${name}:${value}") cfg.credentials; - RemainAfterExit = false; Restart = "on-failure"; CacheDirectory = "renovate"; StateDirectory = "renovate"; diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix index 1c903d280378..f8a85e0ac221 100644 --- a/nixos/modules/services/misc/tandoor-recipes.nix +++ b/nixos/modules/services/misc/tandoor-recipes.nix @@ -119,9 +119,6 @@ in # gunicorn needs setuid SystemCallFilter = [ "@system-service" "~@privileged" "@resources" "@setuid" "@keyring" ]; UMask = "0066"; - } // lib.optionalAttrs (cfg.port < 1024) { - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/misc/transfer-sh.nix b/nixos/modules/services/misc/transfer-sh.nix index 150af2337e14..b0d1b724d727 100644 --- a/nixos/modules/services/misc/transfer-sh.nix +++ b/nixos/modules/services/misc/transfer-sh.nix @@ -69,7 +69,6 @@ in wantedBy = [ "multi-user.target" ]; environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings; serviceConfig = { - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; DevicePolicy = "closed"; DynamicUser = true; ExecStart = "${getExe cfg.package} --provider ${cfg.provider}"; diff --git a/nixos/modules/services/misc/wastebin.nix b/nixos/modules/services/misc/wastebin.nix index f24bf94fa52b..51dfe625c010 100644 --- a/nixos/modules/services/misc/wastebin.nix +++ b/nixos/modules/services/misc/wastebin.nix @@ -126,7 +126,6 @@ in wantedBy = [ "multi-user.target" ]; environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings; serviceConfig = { - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; DevicePolicy = "closed"; DynamicUser = true; ExecStart = "${getExe cfg.package}"; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d2b23bf17570..01e7a7366709 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -1834,8 +1834,6 @@ in StateDirectory = cfg.stateDir; StateDirectoryMode = "0700"; # Hardening - AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; - CapabilityBoundingSet = if (cfg.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ]; DeviceAllow = [ "/dev/null rw" ]; DevicePolicy = "strict"; LockPersonality = true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index cf840a2d4514..c388a7aa5558 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -88,7 +88,6 @@ let "statsd" "surfboard" "systemd" - "tor" "unbound" "unifi" "unpoller" @@ -299,6 +298,9 @@ in The Minio exporter has been removed, as it was broken and unmaintained. See the 24.11 release notes for more information. '') + (lib.mkRemovedOptionModule [ "tor" ] '' + The Tor exporter has been removed, as it was broken and unmaintained. + '') ]; }; description = "Prometheus exporter configuration"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix deleted file mode 100644 index d39112d0c283..000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, lib, pkgs, options, ... }: - -let - cfg = config.services.prometheus.exporters.tor; - inherit (lib) mkOption types concatStringsSep; -in -{ - port = 9130; - extraOpts = { - torControlAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = '' - Tor control IP address or hostname. - ''; - }; - - torControlPort = mkOption { - type = types.port; - default = 9051; - description = '' - Tor control port. - ''; - }; - }; - serviceOpts = { - serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \ - -b ${cfg.listenAddress} \ - -p ${toString cfg.port} \ - -a ${cfg.torControlAddress} \ - -c ${toString cfg.torControlPort} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - - # CPython requires a process to either have $HOME defined or run as a UID - # defined in /etc/passwd. The latter is false with DynamicUser, so define a - # dummy $HOME. https://bugs.python.org/issue10496 - environment = { HOME = "/var/empty"; }; - }; -} diff --git a/nixos/modules/services/monitoring/rustdesk-server.nix b/nixos/modules/services/monitoring/rustdesk-server.nix index e757d8fdf054..10495ee0618d 100644 --- a/nixos/modules/services/monitoring/rustdesk-server.nix +++ b/nixos/modules/services/monitoring/rustdesk-server.nix @@ -3,6 +3,12 @@ let TCPPorts = [21115 21116 21117 21118 21119]; UDPPorts = [21116]; in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "rustdesk-server" "relayIP" ] "This option has been replaced by services.rustdesk-server.signal.relayHosts") + (lib.mkRenamedOptionModule [ "services" "rustdesk-server" "extraRelayArgs" ] [ "services" "rustdesk-server" "relay" "extraArgs" ]) + (lib.mkRenamedOptionModule [ "services" "rustdesk-server" "extraSignalArgs" ] [ "services" "rustdesk-server" "signal" "extraArgs" ]) + ]; + options.services.rustdesk-server = with lib; with types; { enable = mkEnableOption "RustDesk, a remote access and remote control software, allowing maintenance of computers and other devices"; @@ -18,30 +24,53 @@ in { ''; }; - relayIP = mkOption { - type = str; - description = '' - The public facing IP of the RustDesk relay. - ''; + signal = { + enable = mkOption { + type = bool; + default = true; + description = '' + Whether to enable the RustDesk signal server. + ''; + }; + + relayHosts = mkOption { + type = listOf str; + default = []; + # reference: https://rustdesk.com/docs/en/self-host/rustdesk-server-pro/relay/ + description = '' + The relay server IP addresses or DNS names of the RustDesk relay. + ''; + }; + + extraArgs = mkOption { + type = listOf str; + default = []; + example = [ "-k" "_" ]; + description = '' + A list of extra command line arguments to pass to the `hbbs` process. + ''; + }; + }; - extraSignalArgs = mkOption { - type = listOf str; - default = []; - example = [ "-k" "_" ]; - description = '' - A list of extra command line arguments to pass to the `hbbs` process. - ''; + relay = { + enable = mkOption { + type = bool; + default = true; + description = '' + Whether to enable the RustDesk relay server. + ''; + }; + extraArgs = mkOption { + type = listOf str; + default = []; + example = [ "-k" "_" ]; + description = '' + A list of extra command line arguments to pass to the `hbbr` process. + ''; + }; }; - extraRelayArgs = mkOption { - type = listOf str; - default = []; - example = [ "-k" "_" ]; - description = '' - A list of extra command line arguments to pass to the `hbbr` process. - ''; - }; }; config = let @@ -96,13 +125,17 @@ in { wantedBy = [ "multi-user.target" ]; }; - systemd.services.rustdesk-signal = lib.mkMerge [ serviceDefaults { - serviceConfig.ExecStart = "${cfg.package}/bin/hbbs -r ${cfg.relayIP} ${lib.escapeShellArgs cfg.extraSignalArgs}"; - } ]; + systemd.services.rustdesk-signal = + let + relayArg = builtins.concatStringsSep ":" cfg.signal.relayHosts; + in + lib.mkIf cfg.signal.enable (lib.mkMerge [ serviceDefaults { + serviceConfig.ExecStart = "${cfg.package}/bin/hbbs --relay-servers ${relayArg} ${lib.escapeShellArgs cfg.signal.extraArgs}"; + } ]); - systemd.services.rustdesk-relay = lib.mkMerge [ serviceDefaults { - serviceConfig.ExecStart = "${cfg.package}/bin/hbbr ${lib.escapeShellArgs cfg.extraRelayArgs}"; - } ]; + systemd.services.rustdesk-relay = lib.mkIf cfg.relay.enable (lib.mkMerge [ serviceDefaults { + serviceConfig.ExecStart = "${cfg.package}/bin/hbbr ${lib.escapeShellArgs cfg.relay.extraArgs}"; + } ]); }; meta.maintainers = with lib.maintainers; [ ppom ]; diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index 360cdd1c6b6a..45bb45a53c1b 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -1,37 +1,31 @@ { config, lib, pkgs, ... }: -with lib; - let - cfg = config.services.teamviewer; - in - { - - ###### interface - options = { - - services.teamviewer.enable = mkEnableOption "TeamViewer daemon"; - + services.teamviewer = { + enable = lib.mkEnableOption "TeamViewer daemon & system package"; + package = lib.mkPackageOption pkgs "teamviewer" { }; + }; }; - ###### implementation + config = lib.mkIf (cfg.enable) { + environment.systemPackages = [ cfg.package ]; - config = mkIf (cfg.enable) { - - environment.systemPackages = [ pkgs.teamviewer ]; - - services.dbus.packages = [ pkgs.teamviewer ]; + services.dbus.packages = [ cfg.package ]; systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; - after = [ "network-online.target" "network.target" "dbus.service" ]; + after = [ + "network-online.target" + "network.target" + "dbus.service" + ]; requires = [ "dbus.service" ]; preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; @@ -39,12 +33,11 @@ in startLimitBurst = 10; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f"; + ExecStart = "${cfg.package}/bin/teamviewerd -f"; PIDFile = "/run/teamviewerd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-abort"; }; }; }; - } diff --git a/nixos/modules/services/networking/fastnetmon-advanced.nix b/nixos/modules/services/networking/fastnetmon-advanced.nix index 26e8ad8b76d9..d534c7fbc058 100644 --- a/nixos/modules/services/networking/fastnetmon-advanced.nix +++ b/nixos/modules/services/networking/fastnetmon-advanced.nix @@ -160,6 +160,8 @@ in { } }); ''; + # dbus/polkit with DynamicUser is broken with the default implementation + services.dbus.implementation = "broker"; # We don't use the existing gobgp NixOS module and package, because the gobgp # version might not be compatible with fastnetmon. Also, the service name diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index bf1795f87e73..5ee0db32d65d 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -36,7 +36,7 @@ in description = '' Options passed to iwd. - See [here](https://iwd.wiki.kernel.org/networkconfigurationsettings) for supported options. + See {manpage}`iwd.config(5)` for supported options. ''; }; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index c47a684571fe..9e346d3384fa 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -6,7 +6,7 @@ let cfg = config.services.murmur; forking = cfg.logFile != null; configFile = pkgs.writeText "murmurd.ini" '' - database=/var/lib/murmur/murmur.sqlite + database=${cfg.stateDir}/murmur.sqlite dbDriver=QSQLITE autobanAttempts=${toString cfg.autobanAttempts} @@ -69,6 +69,32 @@ in ''; }; + user = mkOption { + type = types.str; + default = "murmur"; + description = '' + The name of an existing user to use to run the service. + If not specified, the default user will be created. + ''; + }; + + group = mkOption { + type = types.str; + default = "murmur"; + description = '' + The name of an existing group to use to run the service. + If not specified, the default group will be created. + ''; + }; + + stateDir = mkOption { + type = types.path; + default = "/var/lib/murmur"; + description = '' + Directory to store data for the server. + ''; + }; + autobanAttempts = mkOption { type = types.int; default = 10; @@ -257,7 +283,7 @@ in environmentFile = mkOption { type = types.nullOr types.path; default = null; - example = "/var/lib/murmur/murmurd.env"; + example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"''; description = '' Environment file as defined in {manpage}`systemd.exec(5)`. @@ -289,14 +315,14 @@ in }; config = mkIf cfg.enable { - users.users.murmur = { + users.users.murmur = mkIf (cfg.user == "murmur") { description = "Murmur Service user"; - home = "/var/lib/murmur"; + home = cfg.stateDir; createHome = true; uid = config.ids.uids.murmur; - group = "murmur"; + group = cfg.group; }; - users.groups.murmur = { + users.groups.murmur = mkIf (cfg.group == "murmur") { gid = config.ids.gids.murmur; }; @@ -324,8 +350,8 @@ in Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; - User = "murmur"; - Group = "murmur"; + User = cfg.user; + Group = cfg.group; # service hardening AmbientCapabilities = "CAP_NET_BIND_SERVICE"; @@ -362,7 +388,7 @@ in "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - + @@ -387,9 +413,9 @@ in r ${config.environment.etc."os-release".source}, r ${config.environment.etc."lsb-release".source}, - owner rwk /var/lib/murmur/murmur.sqlite, - owner rw /var/lib/murmur/murmur.sqlite-journal, - owner r /var/lib/murmur/, + owner rwk ${cfg.stateDir}/murmur.sqlite, + owner rw ${cfg.stateDir}/murmur.sqlite-journal, + owner r ${cfg.stateDir}/, r /run/murmur/murmurd.pid, r /run/murmur/murmurd.ini, r ${configFile}, diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index fba6d5e48f92..56b1f6f5ab8f 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -73,8 +73,9 @@ let openvpn-restart = { wantedBy = [ "sleep.target" ]; path = [ pkgs.procps ]; - script = "pkill --signal SIGHUP --exact openvpn"; - #SIGHUP makes openvpn process to self-exit and then it got restarted by systemd because of Restart=always + script = let + unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers); + in "systemctl try-restart ${lib.escapeShellArgs unitNames}"; description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep"; }; }; diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 1cc137341e11..bbd6bde5ebc1 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -308,7 +308,8 @@ in { description = "Authelia authentication and authorization server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup + wants = [ "network-online.target" ]; environment = (lib.filterAttrs (_: v: v != null) { X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 845a6703dcfb..a368b6eee2a6 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -198,16 +198,19 @@ let ''; serverPort = + let + address = cfg.serverSettings.bindaddress; + in # ipv6: - if hasInfix "]:" cfg.serverSettings.bindaddress then - last (splitString "]:" cfg.serverSettings.bindaddress) + if hasInfix "]:" address then + last (splitString "]:" address) else # ipv4: - if hasInfix "." cfg.serverSettings.bindaddress then - last (splitString ":" cfg.serverSettings.bindaddress) + if hasInfix "." address then + last (splitString ":" address) # default is 8443 else - "8443"; + throw "Address not parseable as IPv4 nor IPv6."; in { options.services.kanidm = { @@ -225,6 +228,7 @@ in bindaddress = mkOption { description = "Address/port combination the webserver binds to."; example = "[::1]:8443"; + default = "127.0.0.1:8443"; type = types.str; }; # Should be optional but toml does not accept null diff --git a/nixos/modules/services/system/swapspace.nix b/nixos/modules/services/system/swapspace.nix new file mode 100644 index 000000000000..9dfea492cd67 --- /dev/null +++ b/nixos/modules/services/system/swapspace.nix @@ -0,0 +1,120 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.swapspace; + inherit (lib) + types + mkOption + mkPackageOption + mkEnableOption + ; + configFile = pkgs.writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings); +in +{ + options.services.swapspace = { + enable = mkEnableOption "Swapspace, a dynamic swap space manager"; + package = mkPackageOption pkgs "swapspace" { }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "-P" + "-v" + ]; + description = "Any extra arguments to pass to swapspace"; + }; + settings = mkOption { + type = types.submodule { + options = { + swappath = mkOption { + type = types.str; + default = "/var/lib/swapspace"; + description = "Location where swapspace may create and delete swapfiles"; + }; + lower_freelimit = mkOption { + type = types.ints.between 0 99; + default = 20; + description = "Lower free-space threshold: if the percentage of free space drops below this number, additional swapspace is allocated"; + }; + upper_freelimit = mkOption { + type = types.ints.between 0 100; + default = 60; + description = "Upper free-space threshold: if the percentage of free space exceeds this number, swapspace will attempt to free up swapspace"; + }; + freetarget = mkOption { + type = types.ints.between 2 99; + default = 30; + description = '' + Percentage of free space swapspace should aim for when adding swapspace. + This should fall somewhere between lower_freelimit and upper_freelimit. + ''; + }; + min_swapsize = mkOption { + type = types.str; + default = "4m"; + description = "Smallest allowed size for individual swapfiles"; + }; + max_swapsize = mkOption { + type = types.str; + default = "2t"; + description = "Greatest allowed size for individual swapfiles"; + }; + cooldown = mkOption { + type = types.ints.unsigned; + default = 600; + description = '' + Duration (roughly in seconds) of the moratorium on swap allocation that is instated if disk space runs out, or the cooldown time after a new swapfile is successfully allocated before swapspace will consider deallocating swap space again. + The default cooldown period is about 10 minutes. + ''; + }; + buffer_elasticity = mkOption { + type = types.ints.between 0 100; + default = 30; + description = ''Percentage of buffer space considered to be "free"''; + }; + cache_elasticity = mkOption { + type = types.ints.between 0 100; + default = 80; + description = ''Percentage of cache space considered to be "free"''; + }; + }; + }; + default = { }; + description = '' + Config file for swapspace. + See the options here: + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; + systemd.services.swapspace = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = [ + "" + "${lib.getExe cfg.package} -c ${configFile} ${utils.escapeSystemdExecArgs cfg.extraArgs}" + ]; + }; + }; + systemd.tmpfiles.settings.swapspace = { + ${cfg.settings.swappath}.d = { + mode = "0700"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ + Luflosi + phanirithvij + ]; + }; +} diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix index 231a0b7f93ec..83a081aa6741 100644 --- a/nixos/modules/services/wayland/hypridle.nix +++ b/nixos/modules/services/wayland/hypridle.nix @@ -20,6 +20,11 @@ in systemd = { packages = [ cfg.package ]; user.services.hypridle.wantedBy = [ "graphical-session.target" ]; + user.services.hypridle.path = [ + config.programs.hyprland.package + config.programs.hyprlock.package + pkgs.procps + ]; }; }; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix deleted file mode 100644 index 683a1c7603ef..000000000000 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ /dev/null @@ -1,224 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.confluence; - - pkg = cfg.package.override (optionalAttrs cfg.sso.enable { - enableSSO = cfg.sso.enable; - }); - - crowdProperties = pkgs.writeText "crowd.properties" '' - application.name ${cfg.sso.applicationName} - application.password ${if cfg.sso.applicationPassword != null then cfg.sso.applicationPassword else "@NIXOS_CONFLUENCE_CROWD_SSO_PWD@"} - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.confluence = { - enable = mkEnableOption "Atlassian Confluence service"; - - user = mkOption { - type = types.str; - default = "confluence"; - description = "User which runs confluence."; - }; - - group = mkOption { - type = types.str; - default = "confluence"; - description = "Group which runs confluence."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/confluence"; - description = "Home directory of the confluence instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8090; - description = "Port to listen on."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" "-Dconfluence.disable.peopledirectory.all=true" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "proxy support"; - - name = mkOption { - type = types.str; - example = "confluence.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - }; - - sso = { - enable = mkEnableOption "SSO with Atlassian Crowd"; - - crowd = mkOption { - type = types.str; - example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; - }; - - applicationName = mkOption { - type = types.str; - example = "jira"; - description = "Exact name of this Confluence instance in Crowd"; - }; - - applicationPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = "Application password of this Confluence instance in Crowd"; - }; - - applicationPasswordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = "Path to the application password for Crowd of Confluence."; - }; - - validationInterval = mkOption { - type = types.int; - default = 2; - example = 0; - description = '' - Set to 0, if you want authentication checks to occur on each - request. Otherwise set to the number of minutes between request - to validate if the user is logged in or out of the Crowd SSO - server. Setting this value to 1 or higher will increase the - performance of Crowd's integration. - ''; - }; - }; - - package = mkPackageOption pkgs "atlassian-confluence" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - assertions = [ - { assertion = cfg.sso.enable -> ((cfg.sso.applicationPassword == null) != (cfg.sso.applicationPasswordFile)); - message = "Please set either applicationPassword or applicationPasswordFile"; - } - ]; - - warnings = mkIf (cfg.sso.enable && cfg.sso.applicationPassword != null) [ - "Using `services.confluence.sso.applicationPassword` is deprecated! Use `applicationPasswordFile` instead!" - ]; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} - - -" - "d /run/confluence - - - - -" - - "L+ /run/confluence/home - - - - ${cfg.home}" - "L+ /run/confluence/logs - - - - ${cfg.home}/logs" - "L+ /run/confluence/temp - - - - ${cfg.home}/temp" - "L+ /run/confluence/work - - - - ${cfg.home}/work" - "L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.confluence = { - description = "Atlassian Confluence"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage pkgs.bash ]; - - environment = { - CONF_USER = cfg.user; - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - mkdir -p ${cfg.home}/{logs,work,temp,deploy} - - sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \ - '') + '' - ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString cfg.sso.enable '' - install -m660 ${crowdProperties} ${cfg.home}/crowd.properties - ${optionalString (cfg.sso.applicationPasswordFile != null) '' - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_CONFLUENCE_CROWD_SSO_PWD@' \ - ${cfg.sso.applicationPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/bin/start-confluence.sh -fg"; - ExecStop = "${pkg}/bin/stop-confluence.sh"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix deleted file mode 100644 index 527fa1743df2..000000000000 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.crowd; - - pkg = cfg.package.override { - home = cfg.home; - port = cfg.listenPort; - openidPassword = cfg.openidPassword; - } // (optionalAttrs cfg.proxy.enable { - proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; - }); - - crowdPropertiesFile = pkgs.writeText "crowd.properties" '' - application.name crowd-openid-server - application.password @NIXOS_CROWD_OPENID_PW@ - application.base.url http://localhost:${toString cfg.listenPort}/openidserver - application.login.url http://localhost:${toString cfg.listenPort}/openidserver - application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL} - - crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval 0 - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.crowd = { - enable = mkEnableOption "Atlassian Crowd service"; - - user = mkOption { - type = types.str; - default = "crowd"; - description = "User which runs Crowd."; - }; - - group = mkOption { - type = types.str; - default = "crowd"; - description = "Group which runs Crowd."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/crowd"; - description = "Home directory of the Crowd instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8092; - description = "Port to listen on."; - }; - - openidPassword = mkOption { - type = types.str; - default = "WILL_NEVER_BE_SET"; - description = "Application password for OpenID server."; - }; - - openidPasswordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = "Path to the file containing the application password for OpenID server."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "reverse proxy support"; - - name = mkOption { - type = types.str; - example = "crowd.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - - secure = mkOption { - type = types.bool; - default = true; - description = "Whether the connections to the proxy should be considered secure."; - }; - }; - - package = mkPackageOption pkgs "atlassian-crowd" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -" - "d /run/atlassian-crowd - - - - -" - - "L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database" - "L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs" - "L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work" - "L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.atlassian-crowd = { - description = "Atlassian Crowd"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage ]; - - environment = { - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - CATALINA_TMPDIR = "/tmp"; - JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - rm -rf ${cfg.home}/work - mkdir -p ${cfg.home}/{logs,database,work} - - sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ - '') + '' - ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString (cfg.openidPasswordFile != null) '' - install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_CROWD_OPENID_PW@' \ - ${cfg.openidPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/start_crowd.sh -fg"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix deleted file mode 100644 index 40c5d95cae3a..000000000000 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.jira; - - pkg = cfg.package.override (optionalAttrs cfg.sso.enable { - enableSSO = cfg.sso.enable; - }); - - crowdProperties = pkgs.writeText "crowd.properties" '' - application.name ${cfg.sso.applicationName} - application.password @NIXOS_JIRA_CROWD_SSO_PWD@ - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.jira = { - enable = mkEnableOption "Atlassian JIRA service"; - - user = mkOption { - type = types.str; - default = "jira"; - description = "User which runs JIRA."; - }; - - group = mkOption { - type = types.str; - default = "jira"; - description = "Group which runs JIRA."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/jira"; - description = "Home directory of the JIRA instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8091; - description = "Port to listen on."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "reverse proxy support"; - - name = mkOption { - type = types.str; - example = "jira.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - - secure = mkOption { - type = types.bool; - default = true; - description = "Whether the connections to the proxy should be considered secure."; - }; - }; - - sso = { - enable = mkEnableOption "SSO with Atlassian Crowd"; - - crowd = mkOption { - type = types.str; - example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; - }; - - applicationName = mkOption { - type = types.str; - example = "jira"; - description = "Exact name of this JIRA instance in Crowd"; - }; - - applicationPasswordFile = mkOption { - type = types.str; - description = "Path to the file containing the application password of this JIRA instance in Crowd"; - }; - - validationInterval = mkOption { - type = types.int; - default = 2; - example = 0; - description = '' - Set to 0, if you want authentication checks to occur on each - request. Otherwise set to the number of minutes between request - to validate if the user is logged in or out of the Crowd SSO - server. Setting this value to 1 or higher will increase the - performance of Crowd's integration. - ''; - }; - }; - - package = mkPackageOption pkgs "atlassian-jira" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - home = cfg.home; - }; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} - - -" - "d /run/atlassian-jira - - - - -" - - "L+ /run/atlassian-jira/home - - - - ${cfg.home}" - "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs" - "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work" - "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp" - "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.atlassian-jira = { - description = "Atlassian JIRA"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage pkgs.bash ]; - - environment = { - JIRA_USER = cfg.user; - JIRA_HOME = cfg.home; - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - mkdir -p ${cfg.home}/{logs,work,temp,deploy} - - sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ - '') + '' - ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString cfg.sso.enable '' - install -m660 ${crowdProperties} ${cfg.home}/crowd.properties - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_JIRA_CROWD_SSO_PWD@' \ - ${cfg.sso.applicationPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/bin/start-jira.sh -fg"; - ExecStop = "${pkg}/bin/stop-jira.sh"; - }; - }; - }; - - imports = [ - (mkRemovedOptionModule [ "services" "jira" "sso" "applicationPassword" ] '' - Use `applicationPasswordFile` instead! - '') - ]; -} diff --git a/nixos/modules/services/web-apps/dashy.nix b/nixos/modules/services/web-apps/dashy.nix new file mode 100644 index 000000000000..47bcab976e6d --- /dev/null +++ b/nixos/modules/services/web-apps/dashy.nix @@ -0,0 +1,173 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib.types) package str; + inherit (lib) + mkIf + mkOption + mkEnableOption + mkPackageOption + ; + cfg = config.services.dashy; +in +{ + options.services.dashy = { + enable = mkEnableOption '' + Dashy, a highly customizable, easy to use, privacy-respecting dashboard app. + + Note that this builds a static web app as opposed to running a full node server, unlike the default docker image. + + Writing config changes to disk through the UI, triggering a rebuild through the UI and application status checks are + unavailable without the node server; Everything else will work fine. + + See the deployment docs for [building from source](https://dashy.to/docs/deployment#build-from-source), [hosting with a CDN](https://dashy.to/docs/deployment#hosting-with-cdn) and [CDN cloud deploy](https://dashy.to/docs/deployment#cdn--cloud-deploy) for more information. + ''; + + virtualHost = { + enableNginx = mkEnableOption "a virtualhost to serve dashy through nginx"; + + domain = mkOption { + description = '' + Domain to use for the virtual host. + + This can be used to change nginx options like + ```nix + services.nginx.virtualHosts."$\{config.services.dashy.virtualHost.domain}".listen = [ ... ] + ``` + or + ```nix + services.nginx.virtualHosts."example.com".listen = [ ... ] + ``` + ''; + type = str; + }; + }; + + package = mkPackageOption pkgs "dashy-ui" { }; + + finalDrv = mkOption { + readOnly = true; + default = + if cfg.settings != { } then cfg.package.override { inherit (cfg) settings; } else cfg.package; + defaultText = '' + if cfg.settings != {} + then cfg.package.override {inherit (cfg) settings;} + else cfg.package; + ''; + type = package; + description = '' + Final derivation containing the fully built static files + ''; + }; + + settings = mkOption { + default = { }; + description = '' + Settings serialized into `user-data/conf.yml` before build. + If left empty, the default configuration shipped with the package will be used instead. + + Note that the full configuration will be written to the nix store as world readable, which may include secrets such as [password hashes](https://dashy.to/docs/configuring#appconfigauthusers-optional). + + To add files such as icons or backgrounds, you can reference them in line such as + ```nix + icon = "$\{./icon.png}"; + ``` + This will add the file to the nix store upon build, referencing it by file path as expected by Dashy. + ''; + example = '' + { + appConfig = { + cssThemes = [ + "example-theme-1" + "example-theme-2" + ]; + enableFontAwesome = true; + fontAwesomeKey = "e9076c7025"; + theme = "thebe"; + }; + pageInfo = { + description = "My Awesome Dashboard"; + navLinks = [ + { + path = "/"; + title = "Home"; + } + { + path = "https://example.com"; + title = "Example 1"; + } + { + path = "https://example.com"; + title = "Example 2"; + } + ]; + title = "Dashy"; + }; + sections = [ + { + displayData = { + collapsed = true; + cols = 2; + customStyles = "border: 2px dashed red;"; + itemSize = "large"; + }; + items = [ + { + backgroundColor = "#0079ff"; + color = "#00ffc9"; + description = "Source code and documentation on GitHub"; + icon = "fab fa-github"; + target = "sametab"; + title = "Source"; + url = "https://github.com/Lissy93/dashy"; + } + { + description = "View currently open issues, or raise a new one"; + icon = "fas fa-bug"; + title = "Issues"; + url = "https://github.com/Lissy93/dashy/issues"; + } + { + description = "Live Demo #1"; + icon = "fas fa-rocket"; + target = "iframe"; + title = "Demo 1"; + url = "https://dashy-demo-1.as93.net"; + } + { + description = "Live Demo #2"; + icon = "favicon"; + target = "newtab"; + title = "Demo 2"; + url = "https://dashy-demo-2.as93.net"; + } + ]; + name = "Getting Started"; + } + ]; + } + ''; + inherit (pkgs.formats.json { }) type; + }; + }; + + config = mkIf cfg.enable { + services.nginx = mkIf cfg.virtualHost.enableNginx { + enable = true; + virtualHosts."${cfg.virtualHost.domain}" = { + locations."/" = { + root = cfg.finalDrv; + tryFiles = "$uri /index.html "; + }; + }; + }; + }; + + meta.maintainers = [ + lib.maintainers.therealgramdalf + ]; +} diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index 7fbbd8a0c284..45e16603373d 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -80,7 +80,6 @@ in ]; RuntimeDirectory = "dex"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; BindReadOnlyPaths = [ "/nix/store" "-/etc/dex" @@ -91,7 +90,6 @@ in "-/etc/ssl/certs/ca-certificates.crt" ]; BindPaths = optional (cfg.settings.storage.type == "postgres") "/var/run/postgresql"; - CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; # ProtectClock= adds DeviceAllow=char-rtc r DeviceAllow = ""; DynamicUser = true; diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 9622913feca0..0e8bcc703efa 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -164,7 +164,6 @@ in let defaultServiceConfig = { ReadWritePaths = "${cfg.dataDir}"; - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; DeviceAllow = ""; LockPersonality = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index b9761061aaae..862ba730abfc 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -9,7 +9,7 @@ }; }; in { - meta.maintainers = with maintainers; [ das_j ]; + meta.maintainers = teams.helsinki-systems.members; options.services.icingaweb2 = with types; { enable = mkEnableOption "the icingaweb2 web interface"; diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index c5820049c215..6d9c909c4568 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -6,6 +6,7 @@ }: let cfg = config.services.immich; + format = pkgs.formats.json { }; isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host; isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host; @@ -110,6 +111,37 @@ in description = "The group immich should run as."; }; + settings = mkOption { + default = null; + description = '' + Configuration for Immich. + See or navigate to + for + options and defaults. + Setting it to `null` allows configuring Immich in the web interface. + ''; + type = types.nullOr ( + types.submodule { + freeformType = format.type; + options = { + newVersionCheck.enabled = mkOption { + type = types.bool; + default = false; + description = '' + Check for new versions. + This feature relies on periodic communication with github.com. + ''; + }; + server.externalDomain = mkOption { + type = types.str; + default = ""; + description = "Domain for publicly shared links, including `http(s)://`."; + }; + }; + } + ); + }; + machine-learning = { enable = mkEnableOption "immich's machine-learning functionality to detect faces and search for objects" @@ -238,7 +270,7 @@ in let postgresEnv = if isPostgresUnixSocket then - { DB_URL = "socket://${cfg.database.host}?dbname=${cfg.database.name}"; } + { DB_URL = "postgresql:///${cfg.database.name}?host=${cfg.database.host}"; } else { DB_HOSTNAME = cfg.database.host; @@ -262,6 +294,9 @@ in IMMICH_PORT = toString cfg.port; IMMICH_MEDIA_LOCATION = cfg.mediaLocation; IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003"; + } + // lib.optionalAttrs (cfg.settings != null) { + IMMICH_CONFIG_FILE = "${format.generate "immich.json" cfg.settings}"; }; services.immich.machine-learning.environment = { @@ -272,15 +307,26 @@ in IMMICH_PORT = "3003"; }; + systemd.slices.system-immich = { + description = "Immich (self-hosted photo and video backup solution) slice"; + documentation = [ "https://immich.app/docs" ]; + }; + systemd.services.immich-server = { description = "Immich backend server (Self-hosted photo and video backup solution)"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; inherit (cfg) environment; + path = [ + # gzip and pg_dumpall are used by the backup service + pkgs.gzip + config.services.postgresql.package + ]; serviceConfig = commonServiceConfig // { ExecStart = lib.getExe cfg.package; EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; + Slice = "system-immich.slice"; StateDirectory = "immich"; SyslogIdentifier = "immich"; RuntimeDirectory = "immich"; @@ -300,6 +346,7 @@ in inherit (cfg.machine-learning) environment; serviceConfig = commonServiceConfig // { ExecStart = lib.getExe (cfg.package.machine-learning.override { immich = cfg.package; }); + Slice = "system-immich.slice"; CacheDirectory = "immich"; User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix new file mode 100644 index 000000000000..a6f2e5cdd0a3 --- /dev/null +++ b/nixos/modules/services/web-apps/mediagoblin.nix @@ -0,0 +1,377 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.mediagoblin; + + mkSubSectionKeyValue = + depth: k: v: + if lib.isAttrs v then + let + inherit (lib.strings) replicate; + in + "${replicate depth "["}${k}${replicate depth "]"}\n" + + lib.generators.toINIWithGlobalSection { + mkKeyValue = mkSubSectionKeyValue (depth + 1); + } { globalSection = v; } + else + lib.generators.mkKeyValueDefault { + mkValueString = v: if lib.isString v then ''"${v}"'' else lib.generators.mkValueStringDefault { } v; + } " = " k v; + + iniFormat = pkgs.formats.ini { }; + + # we need to build our own GI_TYPELIB_PATH because celery and paster need this information, too and cannot easily be re-wrapped + GI_TYPELIB_PATH = + let + needsGst = + (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.audio") + || (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.video"); + in + lib.makeSearchPathOutput "out" "lib/girepository-1.0" ( + with pkgs.gst_all_1; + [ + pkgs.glib + gst-plugins-base + gstreamer + ] + # audio and video share most dependencies, so we can just take audio + ++ lib.optionals needsGst cfg.package.optional-dependencies.audio + ); + + finalPackage = cfg.package.python.buildEnv.override { + extraLibs = + with cfg.package.python.pkgs; + [ + (toPythonModule cfg.package) + ] + ++ cfg.pluginPackages + # not documented in extras... + ++ lib.optional (lib.hasPrefix "postgresql://" cfg.settings.mediagoblin.sql_engine) psycopg2 + ++ ( + let + inherit (cfg.settings.mediagoblin) plugins; + in + with cfg.package.optional-dependencies; + lib.optionals (plugins ? "mediagoblin.media_types.audio") audio + ++ lib.optionals (plugins ? "mediagoblin.media_types.video") video + ++ lib.optionals (plugins ? "mediagoblin.media_types.raw_image") raw_image + ++ lib.optionals (plugins ? "mediagoblin.media_types.ascii") ascii + ++ lib.optionals (plugins ? "mediagoblin.plugins.ldap") ldap + ); + }; +in +{ + options = { + services.mediagoblin = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable MediaGoblin. + + After the initial deployment, make sure to add an admin account: + ``` + mediagoblin-gmg adduser --username admin --email admin@example.com + mediagoblin-gmg makeadmin admin + ``` + ''; + }; + + domain = lib.mkOption { + type = lib.types.str; + example = "mediagoblin.example.com"; + description = "Domain under which mediagoblin will be served."; + }; + + createDatabaseLocally = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = "Whether to configure a local postgres database and connect to it."; + }; + + package = lib.mkPackageOption pkgs "mediagoblin" { }; + + pluginPackages = lib.mkOption { + type = with lib.types; listOf package; + default = [ ]; + description = "Plugins to add to the environment of MediaGoblin. They still need to be enabled in the config."; + }; + + settings = lib.mkOption { + description = "Settings which are written into `mediagoblin.ini`."; + default = { }; + type = lib.types.submodule { + freeformType = lib.types.anything; + + options = { + mediagoblin = { + allow_registration = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable user self registration. This is generally not recommend due to spammers. + See [upstream FAQ](https://docs.mediagoblin.org/en/stable/siteadmin/production-deployments.html#should-i-keep-open-registration-enabled). + ''; + }; + + email_debug_mode = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = '' + Disable email debug mode to start sending outgoing mails. + This requires configuring SMTP settings, + see the [upstream docs](https://docs.mediagoblin.org/en/stable/siteadmin/configuration.html#enabling-email-notifications) + for details. + ''; + }; + + email_sender_address = lib.mkOption { + type = lib.types.str; + example = "noreply@example.org"; + description = "Email address which notices are sent from."; + }; + + sql_engine = lib.mkOption { + type = lib.types.str; + default = "sqlite:///var/lib/mediagoblin/mediagoblin.db"; + example = "postgresql:///mediagoblin"; + description = "Database to use."; + }; + + plugins = lib.mkOption { + defaultText = '' + { + "mediagoblin.plugins.geolocation" = { }; + "mediagoblin.plugins.processing_info" = { }; + "mediagoblin.plugins.basic_auth" = { }; + "mediagoblin.media_types.image" = { }; + } + ''; + description = '' + Plugins to enable. See [upstream docs](https://docs.mediagoblin.org/en/stable/siteadmin/plugins.html) for details. + Extra dependencies are automatically enabled. + ''; + }; + }; + }; + }; + }; + + paste = { + port = lib.mkOption { + type = lib.types.port; + default = 6543; + description = "Port under which paste will listen."; + }; + + settings = lib.mkOption { + description = "Settings which are written into `paste.ini`."; + default = { }; + type = lib.types.submodule { + freeformType = iniFormat.type; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + (pkgs.writeShellScriptBin "mediagoblin-gmg" '' + sudo=exec + if [[ "$USER" != mediagoblin ]]; then + sudo='exec /run/wrappers/bin/sudo -u mediagoblin' + fi + $sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} ${lib.getExe' finalPackage "gmg"} $@" + '') + ]; + + services = { + mediagoblin.settings.mediagoblin = { + plugins = { + "mediagoblin.media_types.image" = { }; + "mediagoblin.plugins.basic_auth" = { }; + "mediagoblin.plugins.geolocation" = { }; + "mediagoblin.plugins.processing_info" = { }; + }; + sql_engine = lib.mkIf cfg.createDatabaseLocally "postgresql:///mediagoblin"; + }; + + nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; + virtualHosts = { + # see https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/nginx.conf.template + "${cfg.domain}" = { + forceSSL = true; + extraConfig = '' + # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/Dockerfile.nginx.in#L5 + client_max_body_size 100M; + + more_set_headers X-Content-Type-Options nosniff; + ''; + locations = { + "/".proxyPass = "http://127.0.0.1:${toString cfg.paste.port}"; + "/mgoblin_static/".alias = "${finalPackage}/${finalPackage.python.sitePackages}/mediagoblin/static/"; + "/mgoblin_media/".alias = "/var/lib/mediagoblin/user_dev/media/public/"; + "/theme_static/".alias = "/var/lib/mediagoblin/user_dev/theme_static/"; + "/plugin_static/".alias = "/var/lib/mediagoblin/user_dev/plugin_static/"; + }; + }; + }; + }; + + postgresql = lib.mkIf cfg.createDatabaseLocally { + enable = true; + ensureDatabases = [ "mediagoblin" ]; + ensureUsers = [ + { + name = "mediagoblin"; + ensureDBOwnership = true; + } + ]; + }; + + rabbitmq.enable = true; + }; + + systemd.services = + let + serviceDefaults = { + wantedBy = [ "multi-user.target" ]; + path = + lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.stl") [ pkgs.blender ] + ++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") ( + with pkgs; + [ + poppler_utils + unoconv + ] + ); + serviceConfig = { + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + Group = "mediagoblin"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RemoveIPC = true; + StateDirectory = "mediagoblin"; + StateDirectoryMode = "0750"; + User = "mediagoblin"; + WorkingDirectory = "/var/lib/mediagoblin/"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "@chown" + ]; + UMask = "0027"; + }; + }; + + generatedPasteConfig = iniFormat.generate "paste.ini" cfg.paste.settings; + pasteConfig = pkgs.runCommand "paste-combined.ini" { nativeBuildInputs = [ pkgs.crudini ]; } '' + cp ${cfg.package.src}/paste.ini $out + chmod +w $out + crudini --merge $out < ${generatedPasteConfig} + ''; + in + { + mediagoblin-celeryd = lib.recursiveUpdate serviceDefaults { + # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug + # https://todo.sr.ht/~mediagoblin/mediagoblin/57 + preStart = '' + cp --remove-destination ${ + pkgs.writeText "mediagoblin.ini" ( + lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings) + + "\n" + + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } { + inherit (cfg.settings.mediagoblin) plugins; + } + ) + } /var/lib/mediagoblin/mediagoblin.ini + ''; + serviceConfig = { + Environment = [ + "CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery" + "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}" + "MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini" + "PASTE_CONFIG=${pasteConfig}" + ]; + ExecStart = "${lib.getExe' finalPackage "celery"} worker --loglevel=INFO"; + }; + unitConfig.Description = "MediaGoblin Celery"; + }; + + mediagoblin-paster = lib.recursiveUpdate serviceDefaults { + after = [ + "mediagoblin-celeryd.service" + "postgresql.service" + ]; + requires = [ + "mediagoblin-celeryd.service" + "postgresql.service" + ]; + preStart = '' + cp --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini + ${lib.getExe' finalPackage "gmg"} dbupdate + ''; + serviceConfig = { + Environment = [ + "CELERY_ALWAYS_EAGER=false" + "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}" + ]; + ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini"; + }; + unitConfig.Description = "Mediagoblin"; + }; + }; + + systemd.tmpfiles.settings."mediagoblin"."/var/lib/mediagoblin/user_dev".d = { + group = "mediagoblin"; + mode = "2750"; + user = "mediagoblin"; + }; + + users = { + groups.mediagoblin = { }; + users = { + mediagoblin = { + group = "mediagoblin"; + home = "/var/lib/mediagoblin"; + isSystemUser = true; + }; + nginx.extraGroups = [ "mediagoblin" ]; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/microbin.nix b/nixos/modules/services/web-apps/microbin.nix index 0ebe644a2595..e404609a4c22 100644 --- a/nixos/modules/services/web-apps/microbin.nix +++ b/nixos/modules/services/web-apps/microbin.nix @@ -61,7 +61,6 @@ in wantedBy = [ "multi-user.target" ]; environment = lib.mapAttrs (_: v: if lib.isBool v then lib.boolToString v else toString v) cfg.settings; serviceConfig = { - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; DevicePolicy = "closed"; DynamicUser = true; EnvironmentFile = lib.optional (cfg.passwordFile != null) cfg.passwordFile; diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index b7fad7f3066e..922d385f8d3b 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -52,7 +52,7 @@ let dbUser = if repoSettings.username != null then repoSettings.username else "mobilizon"; postgresql = config.services.postgresql.package; - postgresqlSocketDir = "/var/run/postgresql"; + postgresqlSocketDir = "/run/postgresql"; secretEnvFile = "/var/lib/mobilizon/secret-env.sh"; in diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index e3f15f4f438c..4f5ea3390e88 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -432,7 +432,6 @@ in { path = with pkgs; [ nodejs_18 yarn ffmpeg-headless openssl ]; script = '' - #!/bin/sh umask 077 cat > /var/lib/peertube/config/local.yaml < `. - - WARNING: The generate file contains the users' passwords in a - non-cryptographically-securely hashed way. + Can be created by running {command}`nix-shell --packages apacheHttpd --run 'htpasswd -B -c FILENAME USERNAME'`. ''; }; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 24fcb101c910..895fa8499715 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -345,10 +345,7 @@ with lib; default = null; description = '' Basic Auth password file for a vhost. - Can be created via: {command}`htpasswd -c `. - - WARNING: The generate file contains the users' passwords in a - non-cryptographically-securely hashed way. + Can be created by running {command}`nix-shell --packages apacheHttpd --run 'htpasswd -B -c FILENAME USERNAME'`. ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index 6641bc9ff43b..f959c0912652 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -39,16 +39,16 @@ Note that this mechanism can only exclude core utilities, games and core develop ### Disabling GNOME services {#sec-gnome-disabling-services} -It is also possible to disable many of the [core services](https://github.com/NixOS/nixpkgs/blob/b8ec4fd2a4edc4e30d02ba7b1a2cc1358f3db1d5/nixos/modules/services/x11/desktop-managers/gnome.nix#L329-L348). For example, if you do not need indexing files, you can disable Tracker with: +It is also possible to disable many of the [core services](https://github.com/NixOS/nixpkgs/blob/b8ec4fd2a4edc4e30d02ba7b1a2cc1358f3db1d5/nixos/modules/services/x11/desktop-managers/gnome.nix#L329-L348). For example, if you do not need indexing files, you can disable TinySPARQL with: ```nix { - services.gnome.tracker-miners.enable = false; - services.gnome.tracker.enable = false; + services.gnome.localsearch.enable = false; + services.gnome.tinysparql.enable = false; } ``` -Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without Tracker. +Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without TinySPARQL. ### GNOME games {#sec-gnome-games} diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 372300f34950..cbbce8468569 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -265,8 +265,8 @@ in services.gnome.evolution-data-server.enable = true; services.gnome.gnome-keyring.enable = true; services.gnome.gnome-online-accounts.enable = mkDefault true; - services.gnome.tracker-miners.enable = mkDefault true; - services.gnome.tracker.enable = mkDefault true; + services.gnome.localsearch.enable = mkDefault true; + services.gnome.tinysparql.enable = mkDefault true; services.hardware.bolt.enable = mkDefault true; # TODO: Enable once #177946 is resolved # services.packagekit.enable = mkDefault true; @@ -383,6 +383,7 @@ in pkgs.gnome-menus pkgs.gtk3.out # for gtk-launch program pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks ]; in mandatoryPackages diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 14e7769ca8fe..e052241acfd7 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -205,10 +205,14 @@ in system.build.installBootLoader = mkOption { internal = true; - # "; true" => make the `$out` argument from switch-to-configuration.pl - # go to `true` instead of `echo`, hiding the useless path - # from the log. - default = "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; + default = pkgs.writeShellScript "no-bootloader" '' + echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2 + ''; + defaultText = lib.literalExpression '' + pkgs.writeShellScript "no-bootloader" ''' + echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2 + ''' + ''; description = '' A program that writes a bootloader installation script to the path passed in the first command line argument. diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index c56a5b3bfdfa..130d6098b1e2 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -915,7 +915,9 @@ let "UseAddress" "UseDNS" "UseNTP" + "SendHostname" "UseHostname" + "Hostname" "UseDomains" "RouteMetric" "RapidCommit" @@ -936,6 +938,7 @@ let (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) (assertInt "RouteMetric") diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix index 8cda7b3aabe8..3f25dca0cbf9 100644 --- a/nixos/modules/system/boot/shutdown.nix +++ b/nixos/modules/system/boot/shutdown.nix @@ -14,6 +14,7 @@ with lib; unitConfig = { DefaultDependencies = false; ConditionPathExists = "/dev/rtc"; + ConditionPathIsReadWrite = "/etc/"; }; serviceConfig = { diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 64077125caf3..280d38ce32f4 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -405,7 +405,7 @@ let ${lib.optionalString (config.boot.initrd.secrets == {}) "exit 0"} - export PATH=${pkgs.coreutils}/bin:${pkgs.libarchive}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin + export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin function cleanup { if [ -n "$tmp" -a -d "$tmp" ]; then @@ -426,7 +426,7 @@ let } # mindepth 1 so that we don't change the mode of / - (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ + (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null) | \ ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1" ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 6173fca20dbb..9260bc22b13e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -198,7 +198,7 @@ in package = mkPackageOption pkgs "systemd" {}; - enableStrictShellChecks = mkEnableOption "running shellcheck on the generated scripts for systemd units."; + enableStrictShellChecks = mkEnableOption "" // { description = "Whether to run shellcheck on the generated scripts for systemd units."; }; units = mkOption { description = "Definition of systemd units; see {manpage}`systemd.unit(5)`."; diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index 3b64f580aaf4..30cf3ff8105e 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -30,11 +30,11 @@ in example = lib.literalExpression '' { - general.animations = true; - theme = { - default = "pmos-dark"; - alternate = "pmos-light"; - }; + general.animations = true; + theme = { + default = "pmos-dark"; + alternate = "pmos-light"; + }; } ''; default = { }; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 594b9aab61b7..e8eeae03a360 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -231,13 +231,13 @@ in if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]] && [[ "${config.system.build.etc}/etc" != "$(readlink -f /run/current-system/etc)" ]]; then echo "remounting /etc..." - tmpMetadataMount=$(mktemp --directory) + tmpMetadataMount=$(mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX) mount --type erofs ${config.system.build.etcMetadataImage} $tmpMetadataMount # Mount the new /etc overlay to a temporary private mount. # This needs the indirection via a private bind mount because you # cannot move shared mounts. - tmpEtcMount=$(mktemp --directory) + tmpEtcMount=$(mktemp --directory -t nixos-etc.XXXXXXXXXX) mount --bind --make-private $tmpEtcMount $tmpEtcMount mount --type overlay overlay \ --options lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \ @@ -276,6 +276,22 @@ in # Unmount the top /etc mount to atomically reveal the new mount. umount --lazy --recursive /etc + + # Unmount the temporary mount + umount --lazy "$tmpEtcMount" + rmdir "$tmpEtcMount" + + # Unmount old metadata mounts + # For some reason, `findmnt /tmp --submounts` does not show the nested + # mounts. So we'll just find all mounts of type erofs and filter on the + # name of the mountpoint. + findmnt --type erofs --list --kernel --output TARGET | while read -r mountPoint; do + if [[ "$mountPoint" =~ ^/tmp/nixos-etc-metadata\..{10}$ && + "$mountPoint" != "$tmpMetadataMount" ]]; then + umount --lazy $mountPoint + rmdir "$mountPoint" + fi + done fi '' else '' # Set up the statically computed bits of /etc. diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 03b67438d7b6..87876867c572 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, options, pkgs, utils, ... }: # # TODO: zfs tunables @@ -56,7 +56,10 @@ let # sufficient amount of time has passed that we can assume it won't be. In the # latter case it makes one last attempt at importing, allowing the system to # (eventually) boot even with a degraded pool. - importLib = {zpoolCmd, awkCmd, cfgZfs}: '' + importLib = {zpoolCmd, awkCmd, pool}: let + devNodes = if pool != null && cfgZfs.pools ? ${pool} then cfgZfs.pools.${pool}.devNodes else cfgZfs.devNodes; + in '' + # shellcheck disable=SC2013 for o in $(cat /proc/cmdline); do case $o in zfs_force|zfs_force=1|zfs_force=y) @@ -66,7 +69,7 @@ let done poolReady() { pool="$1" - state="$("${zpoolCmd}" import -d "${cfgZfs.devNodes}" 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" + state="$("${zpoolCmd}" import -d "${devNodes}" 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" if [[ "$state" = "ONLINE" ]]; then return 0 else @@ -80,7 +83,8 @@ let } poolImport() { pool="$1" - "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool" + # shellcheck disable=SC2086 + "${zpoolCmd}" import -d "${devNodes}" -N $ZFS_FORCE "$pool" } ''; @@ -141,12 +145,12 @@ let # See comments at importLib definition. zpoolCmd = "${cfgZfs.package}/sbin/zpool"; awkCmd = "${pkgs.gawk}/bin/awk"; - inherit cfgZfs; + inherit pool; }) + '' if ! poolImported "${pool}"; then echo -n "importing ZFS pool \"${pool}\"..." # Loop across the import until it succeeds, because the devices needed may not be discovered yet. - for trial in `seq 1 60`; do + for _ in $(seq 1 60); do poolReady "${pool}" && poolImport "${pool}" && break sleep 1 done @@ -157,7 +161,7 @@ let ${lib.optionalString keyLocations.hasKeys '' - ${keyLocations.command} | while IFS=$'\t' read ds kl ks; do + ${keyLocations.command} | while IFS=$'\t' read -r ds kl ks; do { if [[ "$ks" != unavailable ]]; then continue @@ -217,7 +221,7 @@ in type = lib.types.package; default = pkgs.zfs; defaultText = lib.literalExpression "pkgs.zfs"; - description = "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch."; + description = "Configured ZFS userland tools package."; }; modulePackage = lib.mkOption { @@ -267,10 +271,11 @@ in type = lib.types.path; default = "/dev/disk/by-id"; description = '' - Name of directory from which to import ZFS devices. + Name of directory from which to import ZFS device, this is passed to `zpool import` + as the value of the `-d` option. - This should be a path under /dev containing stable names for all devices needed, as - import may fail if device nodes are renamed concurrently with a device failing. + For guidance on choosing this value, see + [the ZFS documentation](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/FAQ.html#selecting-dev-names-when-creating-a-pool-linux). ''; }; @@ -327,6 +332,23 @@ in ''; }; + pools = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule { + options = { + devNodes = lib.mkOption { + type = lib.types.path; + default = cfgZfs.devNodes; + defaultText = "config.boot.zfs.devNodes"; + description = options.boot.zfs.devNodes.description; + }; + }; + }); + default = { }; + description = '' + Configuration for individual pools to override global defaults. + ''; + }; + removeLinuxDRM = lib.mkOption { type = lib.types.bool; default = false; @@ -608,12 +630,12 @@ in # See comments at importLib definition. zpoolCmd = "zpool"; awkCmd = "awk"; - inherit cfgZfs; + pool = null; })] ++ (map (pool: '' echo -n "importing root ZFS pool \"${pool}\"..." # Loop across the import until it succeeds, because the devices needed may not be discovered yet. if ! poolImported "${pool}"; then - for trial in `seq 1 60`; do + for _ in $(seq 1 60); do poolReady "${pool}" > /dev/null && msg="$(poolImport "${pool}" 2>&1)" && break sleep 1 echo -n . @@ -865,6 +887,7 @@ in Type = "simple"; }; script = '' + # shellcheck disable=SC2046 ${cfgZfs.package}/bin/zpool scrub -w ${ if cfgScrub.pools != [] then (lib.concatStringsSep " " cfgScrub.pools) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 4f38bc0b94d6..741828c7468a 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -52,10 +52,26 @@ in daemon.settings = mkOption { - type = settingsFormat.type; + type = types.submodule { + freeformType = settingsFormat.type; + options = { + live-restore = mkOption { + type = types.bool; + # Prior to NixOS 24.11, this was set to true by default, while upstream defaulted to false. + # Keep the option unset to follow upstream defaults + default = versionOlder config.system.stateVersion "24.11"; + defaultText = literalExpression "lib.versionOlder config.system.stateVersion \"24.11\""; + description = '' + Allow dockerd to be restarted without affecting running container. + This option is incompatible with docker swarm. + ''; + }; + }; + }; default = { }; example = { ipv6 = true; + "live-restore" = true; "fixed-cidr-v6" = "fd00::/80"; }; description = '' @@ -75,16 +91,6 @@ in ''; }; - liveRestore = - mkOption { - type = types.bool; - default = true; - description = '' - Allow dockerd to be restarted without affecting running container. - This option is incompatible with docker swarm. - ''; - }; - storageDriver = mkOption { type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); @@ -167,6 +173,11 @@ in }; }; + imports = [ + (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active") + (mkAliasOptionModule ["virtualisation" "docker" "liveRestore"] ["virtualisation" "docker" "daemon" "settings" "live-restore"]) + ]; + ###### implementation config = mkIf cfg.enable (mkMerge [{ @@ -253,7 +264,6 @@ in hosts = [ "fd://" ]; log-driver = mkDefault cfg.logDriver; storage-driver = mkIf (cfg.storageDriver != null) (mkDefault cfg.storageDriver); - live-restore = mkDefault cfg.liveRestore; runtimes = mkIf cfg.enableNvidia { nvidia = { # Use the legacy nvidia-container-runtime wrapper to allow @@ -266,9 +276,4 @@ in }; } ]); - - imports = [ - (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active") - ]; - } diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index c80181f287b3..5379a481be5b 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -1,50 +1,62 @@ { config, lib, pkgs, ... }: let + inherit (lib) getExe' literalExpression mkEnableOption mkIf mkOption mkRenamedOptionModule optionals optionalString types; cfg = config.virtualisation.vmware.guest; - open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { imports = [ - (lib.mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) + (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) ]; + meta = { + maintainers = [ lib.maintainers.kjeremy ]; + }; + options.virtualisation.vmware.guest = { - enable = lib.mkEnableOption "VMWare Guest Support"; - headless = lib.mkOption { - type = lib.types.bool; + enable = mkEnableOption "VMWare Guest Support"; + headless = mkOption { + type = types.bool; default = !config.services.xserver.enable; - defaultText = "!config.services.xserver.enable"; + defaultText = literalExpression "!config.services.xserver.enable"; description = "Whether to disable X11-related features."; }; + + package = mkOption { + type = types.package; + default = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; + defaultText = literalExpression "if config.virtualisation.vmware.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools;"; + example = literalExpression "pkgs.open-vm-tools"; + description = "Package providing open-vm-tools."; + }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { assertions = [ { assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64; message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}"; } ]; boot.initrd.availableKernelModules = [ "mptspi" ]; - boot.initrd.kernelModules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ "vmw_pvscsi" ]; + boot.initrd.kernelModules = optionals pkgs.stdenv.hostPlatform.isx86 [ "vmw_pvscsi" ]; - environment.systemPackages = [ open-vm-tools ]; + environment.systemPackages = [ cfg.package ]; systemd.services.vmware = { description = "VMWare Guest Service"; wantedBy = [ "multi-user.target" ]; after = [ "display-manager.service" ]; unitConfig.ConditionVirtualization = "vmware"; - serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; + serviceConfig.ExecStart = getExe' cfg.package "vmtoolsd"; }; # Mount the vmblock for drag-and-drop and copy-and-paste. - systemd.mounts = lib.mkIf (!cfg.headless) [ + systemd.mounts = mkIf (!cfg.headless) [ { description = "VMware vmblock fuse mount"; documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ]; unitConfig.ConditionVirtualization = "vmware"; - what = "${open-vm-tools}/bin/vmware-vmblock-fuse"; + what = getExe' cfg.package "vmware-vmblock-fuse"; where = "/run/vmblock-fuse"; type = "fuse"; options = "subtype=vmware-vmblock,default_permissions,allow_other"; @@ -52,19 +64,19 @@ in } ]; - security.wrappers.vmware-user-suid-wrapper = lib.mkIf (!cfg.headless) { + security.wrappers.vmware-user-suid-wrapper = mkIf (!cfg.headless) { setuid = true; owner = "root"; group = "root"; - source = "${open-vm-tools}/bin/vmware-user-suid-wrapper"; + source = getExe' cfg.package "vmware-user-suid-wrapper"; }; - environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*"; + environment.etc.vmware-tools.source = "${cfg.package}/etc/vmware-tools/*"; - services.xserver = lib.mkIf (!cfg.headless) { - modules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ xf86inputvmmouse ]; + services.xserver = mkIf (!cfg.headless) { + modules = optionals pkgs.stdenv.hostPlatform.isx86 [ xf86inputvmmouse ]; - config = lib.optionalString (pkgs.stdenv.hostPlatform.isx86) '' + config = optionalString (pkgs.stdenv.hostPlatform.isx86) '' Section "InputClass" Identifier "VMMouse" MatchDevicePath "/dev/input/event*" @@ -74,10 +86,10 @@ in ''; displayManager.sessionCommands = '' - ${open-vm-tools}/bin/vmware-user-suid-wrapper + ${getExe' cfg.package "vmware-user-suid-wrapper"} ''; }; - services.udev.packages = [ open-vm-tools ]; + services.udev.packages = [ cfg.package ]; }; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 0724d51b1971..06403e0fe81e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -53,7 +53,6 @@ in rec { (onFullSupported "nixos.iso_plasma6") (onFullSupported "nixos.iso_gnome") (onFullSupported "nixos.manual") - (onSystems ["x86_64-linux"] "nixos.ova") (onSystems ["aarch64-linux"] "nixos.sd_image") (onFullSupported "nixos.tests.acme") (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom") diff --git a/nixos/release.nix b/nixos/release.nix index 797a07ec575e..67fb96740007 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -230,21 +230,6 @@ in rec { inherit system; }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). - ova = forMatchingSystems [ "x86_64-linux" ] (system: - - with import ./.. { inherit system; }; - - hydraJob ((import lib/eval-config.nix { - inherit system; - modules = - [ versionModule - ./modules/installer/virtualbox-demo.nix - ]; - }).config.system.build.virtualBoxOVA) - - ); - # KVM image for proxmox in VMA format proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (system: with import ./.. { inherit system; }; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 710a5cb72910..308032cccc45 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -466,6 +466,15 @@ in { f"{switcher_path} test" ) + # Start a unit explicitly, then wait for it to activate. + # This is used for the acme-finished-* targets, as those + # aren't started by switch-to-configuration, meaning + # wait_for_unit(target) will fail with "no pending jobs" + # if it wins the race and checks the target state before + # the actual unit is started. + def start_and_wait(node, unit): + node.start_job(unit) + node.wait_for_unit(unit) # Ensures the issuer of our cert matches the chain # and matches the issuer we expect it to be. @@ -567,7 +576,7 @@ in { # Perform http-01 w/ lego test first with subtest("Can request certificate with Lego's built in web server"): switch_to(webserver, "http01lego") - webserver.wait_for_unit("acme-finished-http.example.test.target") + start_and_wait(webserver, "acme-finished-http.example.test.target") check_fullchain(webserver, "http.example.test") check_issuer(webserver, "http.example.test", "pebble") @@ -581,7 +590,7 @@ in { with subtest("Can renew certificates when they expire"): hash = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem") switch_to(webserver, "renew") - webserver.wait_for_unit("acme-finished-http.example.test.target") + start_and_wait(webserver, "acme-finished-http.example.test.target") check_fullchain(webserver, "http.example.test") check_issuer(webserver, "http.example.test", "pebble") hash_after = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem") @@ -591,7 +600,7 @@ in { with subtest("Handles email change correctly"): hash = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem") switch_to(webserver, "accountchange") - webserver.wait_for_unit("acme-finished-http.example.test.target") + start_and_wait(webserver, "acme-finished-http.example.test.target") check_fullchain(webserver, "http.example.test") check_issuer(webserver, "http.example.test", "pebble") hash_after = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem") @@ -602,15 +611,15 @@ in { switch_to(webserver, "general") with subtest("Can request certificate with HTTP-01 challenge"): - webserver.wait_for_unit("acme-finished-a.example.test.target") + start_and_wait(webserver, "acme-finished-a.example.test.target") check_fullchain(webserver, "a.example.test") check_issuer(webserver, "a.example.test", "pebble") webserver.wait_for_unit("nginx.service") check_connection(client, "a.example.test") with subtest("Runs 1 cert for account creation before others"): - webserver.wait_for_unit("acme-finished-b.example.test.target") - webserver.wait_for_unit("acme-finished-c.example.test.target") + start_and_wait(webserver, "acme-finished-b.example.test.target") + start_and_wait(webserver, "acme-finished-c.example.test.target") check_connection(client, "b.example.test") check_connection(client, "c.example.test") @@ -645,12 +654,12 @@ in { with subtest("Correctly implements OCSP stapling"): switch_to(webserver, "ocsp_stapling") - webserver.wait_for_unit("acme-finished-a.example.test.target") + start_and_wait(webserver, "acme-finished-a.example.test.target") check_stapling(client, "a.example.test") with subtest("Can request certificate with HTTP-01 using lego's internal web server"): switch_to(webserver, "lego_server") - webserver.wait_for_unit("acme-finished-lego.example.test.target") + start_and_wait(webserver, "acme-finished-lego.example.test.target") webserver.wait_for_unit("nginx.service") webserver.succeed("echo HENLO && systemctl cat nginx.service") webserver.succeed('test "$(stat -c \'%U\' /var/lib/acme/* | uniq)" = "root"') @@ -660,23 +669,23 @@ in { with subtest("Can request certificate with HTTP-01 when nginx startup is delayed"): webserver.execute("systemctl stop nginx") switch_to(webserver, "slow_startup") - webserver.wait_for_unit("acme-finished-slow.example.test.target") + start_and_wait(webserver, "acme-finished-slow.example.test.target") check_issuer(webserver, "slow.example.test", "pebble") webserver.wait_for_unit("nginx.service") check_connection(client, "slow.example.test") with subtest("Can limit concurrency of running renewals"): switch_to(webserver, "concurrency_limit") - webserver.wait_for_unit("acme-finished-f.example.test.target") - webserver.wait_for_unit("acme-finished-g.example.test.target") - webserver.wait_for_unit("acme-finished-h.example.test.target") + start_and_wait(webserver, "acme-finished-f.example.test.target") + start_and_wait(webserver, "acme-finished-g.example.test.target") + start_and_wait(webserver, "acme-finished-h.example.test.target") check_connection(client, "f.example.test") check_connection(client, "g.example.test") check_connection(client, "h.example.test") with subtest("Works with caddy"): switch_to(webserver, "caddy") - webserver.wait_for_unit("acme-finished-example.test.target") + start_and_wait(webserver, "acme-finished-example.test.target") webserver.wait_for_unit("caddy.service") # FIXME reloading caddy is not sufficient to load new certs. # Restart it manually until this is fixed. @@ -685,7 +694,7 @@ in { with subtest("security.acme changes reflect on caddy"): switch_to(webserver, "caddy_change_acme_conf") - webserver.wait_for_unit("acme-finished-example.test.target") + start_and_wait(webserver, "acme-finished-example.test.target") webserver.wait_for_unit("caddy.service") # FIXME reloading caddy is not sufficient to load new certs. # Restart it manually until this is fixed. @@ -703,7 +712,8 @@ in { switch_to(webserver, server) for domain in domains: if domain != "wildcard": - webserver.wait_for_unit( + start_and_wait( + webserver, f"acme-finished-{server}-{domain}.example.test.target" ) except Exception as err: @@ -737,7 +747,8 @@ in { with subtest("Can remove an alias from a domain + cert is updated"): test_alias = f"{server}-{domains[0]}-alias.example.test" switch_to(webserver, f"{server}_remove_alias") - webserver.wait_for_unit(f"acme-finished-{test_domain}.target") + wait_for_server() + start_and_wait(webserver, f"acme-finished-{test_domain}.target") wait_for_server() check_connection(client, test_domain) rc, _s = client.execute( @@ -752,7 +763,7 @@ in { switch_to(webserver, server) wait_for_server() switch_to(webserver, f"{server}_change_acme_conf") - webserver.wait_for_unit(f"acme-finished-{test_domain}.target") + start_and_wait(webserver, f"acme-finished-{test_domain}.target") wait_for_server() check_connection_key_bits(client, test_domain, "384") @@ -763,7 +774,7 @@ in { switch_to(webserver, "http01lego_legacyAccountHash", allow_fail=True) # unit is failed, but in a way that this throws no exception: try: - webserver.wait_for_unit("acme-finished-http.example.test.target") + start_and_wait(webserver, "acme-finished-http.example.test.target") except Exception: # The unit is allowed – or even expected – to fail due to not being able to # reach the actual letsencrypt server. We only use it for serialising the diff --git a/nixos/tests/activation/etc-overlay-immutable.nix b/nixos/tests/activation/etc-overlay-immutable.nix index 601ac77cbd84..882bc651841a 100644 --- a/nixos/tests/activation/etc-overlay-immutable.nix +++ b/nixos/tests/activation/etc-overlay-immutable.nix @@ -27,9 +27,14 @@ specialisation.new-generation.configuration = { environment.etc."newgen".text = "newgen"; }; + specialisation.newer-generation.configuration = { + environment.etc."newergen".text = "newergen"; + }; }; - testScript = '' + testScript = /* python */ '' + newergen = machine.succeed("realpath /run/current-system/specialisation/newer-generation/bin/switch-to-configuration").rstrip() + with subtest("/run/etc-metadata/ is mounted"): print(machine.succeed("mountpoint /run/etc-metadata")) @@ -79,5 +84,13 @@ print(machine.succeed("ls /etc/mountpoint")) print(machine.succeed("stat /etc/mountpoint/extra-file")) print(machine.succeed("findmnt /etc/filemount")) + + machine.succeed(f"{newergen} switch") + + tmpMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc\\..*' | wc -l").rstrip() + metaMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc-metadata\\..*' | wc -l").rstrip() + + assert tmpMounts == "0", f"Found {tmpMounts} remaining tmpmounts" + assert metaMounts == "1", f"Found {metaMounts} remaining metamounts" ''; } diff --git a/nixos/tests/activation/etc-overlay-mutable.nix b/nixos/tests/activation/etc-overlay-mutable.nix index fe6165212470..ef465e3616c3 100644 --- a/nixos/tests/activation/etc-overlay-mutable.nix +++ b/nixos/tests/activation/etc-overlay-mutable.nix @@ -15,9 +15,14 @@ specialisation.new-generation.configuration = { environment.etc."newgen".text = "newgen"; }; + specialisation.newer-generation.configuration = { + environment.etc."newergen".text = "newergen"; + }; }; - testScript = '' + testScript = /* python */ '' + newergen = machine.succeed("realpath /run/current-system/specialisation/newer-generation/bin/switch-to-configuration").rstrip() + with subtest("/run/etc-metadata/ is mounted"): print(machine.succeed("mountpoint /run/etc-metadata")) @@ -55,5 +60,14 @@ print(machine.succeed("findmnt /etc/mountpoint")) print(machine.succeed("stat /etc/mountpoint/extra-file")) print(machine.succeed("findmnt /etc/filemount")) + + machine.succeed(f"{newergen} switch") + assert machine.succeed("cat /etc/newergen") == "newergen" + + tmpMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc\\..*' | wc -l").rstrip() + metaMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc-metadata\\..*' | wc -l").rstrip() + + assert tmpMounts == "0", f"Found {tmpMounts} remaining tmpmounts" + assert metaMounts == "1", f"Found {metaMounts} remaining metamounts" ''; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8b674bfb7342..37e005f128a2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -775,13 +775,10 @@ in { peering-manager = handleTest ./web-apps/peering-manager.nix {}; peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; peroxide = handleTest ./peroxide.nix {}; - pg_anonymizer = handleTest ./pg_anonymizer.nix {}; pgadmin4 = handleTest ./pgadmin4.nix {}; pgbouncer = handleTest ./pgbouncer.nix {}; pghero = runTest ./pghero.nix; - pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; - pgvecto-rs = handleTest ./pgvecto-rs.nix {}; phosh = handleTest ./phosh.nix {}; photonvision = handleTest ./photonvision.nix {}; photoprism = handleTest ./photoprism.nix {}; @@ -814,13 +811,7 @@ in { postfix = handleTest ./postfix.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; postfixadmin = handleTest ./postfixadmin.nix {}; - postgis = handleTest ./postgis.nix {}; - apache_datasketches = handleTest ./apache_datasketches.nix {}; - postgresql = handleTest ./postgresql.nix {}; - postgresql-jit = handleTest ./postgresql-jit.nix {}; - postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; - postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {}; - postgresql-wal2json = handleTest ./postgresql-wal2json.nix {}; + postgresql = handleTest ./postgresql {}; powerdns = handleTest ./powerdns.nix {}; powerdns-admin = handleTest ./powerdns-admin.nix {}; power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; @@ -870,7 +861,7 @@ in { realm = handleTest ./realm.nix {}; redis = handleTest ./redis.nix {}; redlib = handleTest ./redlib.nix {}; - redmine = handleTest ./redmine.nix {}; + redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix {}; renovate = handleTest ./renovate.nix {}; replace-dependencies = handleTest ./replace-dependencies {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; @@ -960,6 +951,7 @@ in { swap-file-btrfs = handleTest ./swap-file-btrfs.nix {}; swap-partition = handleTest ./swap-partition.nix {}; swap-random-encryption = handleTest ./swap-random-encryption.nix {}; + swapspace = handleTestOn ["aarch64-linux" "x86_64-linux"] ./swapspace.nix {}; sway = handleTest ./sway.nix {}; swayfx = handleTest ./swayfx.nix {}; switchTest = handleTest ./switch-test.nix { ng = false; }; @@ -1046,8 +1038,8 @@ in { tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; tika = runTest ./tika.nix; - timescaledb = handleTest ./timescaledb.nix {}; timezone = handleTest ./timezone.nix {}; + timidity = handleTestOn ["aarch64-linux" "x86_64-linux"] ./timidity {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; tinyproxy = handleTest ./tinyproxy.nix {}; @@ -1065,7 +1057,6 @@ in { trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; - tsja = handleTest ./tsja.nix {}; tsm-client-gui = handleTest ./tsm-client-gui.nix {}; ttyd = handleTest ./web-servers/ttyd.nix {}; txredisapi = handleTest ./txredisapi.nix {}; @@ -1100,7 +1091,6 @@ in { uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; - varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; }; varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; }; vault = handleTest ./vault.nix {}; vault-agent = handleTest ./vault-agent.nix {}; diff --git a/nixos/tests/apache_datasketches.nix b/nixos/tests/apache_datasketches.nix deleted file mode 100644 index 2bf099ac7991..000000000000 --- a/nixos/tests/apache_datasketches.nix +++ /dev/null @@ -1,29 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "postgis"; - meta = with pkgs.lib.maintainers; { - maintainers = [ lsix ]; # TODO: Who's the maintener now? - }; - - nodes = { - master = - { pkgs, ... }: - - { - services.postgresql = let mypg = pkgs.postgresql_15; in { - enable = true; - package = mypg; - extraPlugins = with mypg.pkgs; [ - apache_datasketches - ]; - }; - }; - }; - - testScript = '' - start_all() - master.wait_for_unit("postgresql") - master.sleep(10) # Hopefully this is long enough!! - master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION datasketches;'") - master.succeed("sudo -u postgres psql -c 'SELECT hll_sketch_to_string(hll_sketch_build(1));'") - ''; -}) diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index f07802b8c31e..bc6caa8ee627 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -157,7 +157,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail("pgrep -a canary1") machine.fail("kill -0 $(< /run/canary2.pid)") machine.succeed('pgrep -a -f "^@canary3$"') - machine.succeed('pgrep -a -f "^kcanary$"') + machine.succeed('pgrep -a -f "^\\[kcanary\\]$"') ''; meta.maintainers = with pkgs.lib.maintainers; [ aszlig ]; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index 6781388e639b..14e33899affc 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { ... }: { virtualisation.docker.enable = true; - virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 + virtualisation.docker.storageDriver = "overlay2"; }; }; diff --git a/nixos/tests/etcd/etcd.nix b/nixos/tests/etcd/etcd.nix index a32d0f9a55d1..1ffa5b100975 100644 --- a/nixos/tests/etcd/etcd.nix +++ b/nixos/tests/etcd/etcd.nix @@ -1,8 +1,6 @@ # This test runs simple etcd node - import ../make-test-python.nix ({ pkgs, ... } : { name = "etcd"; - meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; @@ -17,6 +15,8 @@ import ../make-test-python.nix ({ pkgs, ... } : { with subtest("should start etcd node"): node.start() node.wait_for_unit("etcd.service") + # Add additional wait for actual readiness + node.wait_until_succeeds("etcdctl endpoint health") with subtest("should write and read some values to etcd"): node.succeed("etcdctl put /foo/bar 'Hello world'") diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index d2315b7f013e..5e6f19e56df0 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -188,7 +188,7 @@ let assert "hello world" == client.succeed("cat /tmp/repo-clone/testfile").strip() with subtest("Testing git protocol version=2 over ssh"): - git_protocol = client.succeed("GIT_TRACE2_EVENT=true git -C /tmp/repo-clone fetch |& grep negotiated-version") + git_protocol = client.succeed("GIT_TRACE2_EVENT=true GIT_TRACE2_EVENT_NESTING=3 git -C /tmp/repo-clone fetch |& grep negotiated-version") version = json.loads(git_protocol).get("value") assert version == "2", f"git did not negotiate protocol version 2, but version {version} instead." diff --git a/nixos/tests/guix/publish.nix b/nixos/tests/guix/publish.nix index eb56fc97478c..4a1e49fea903 100644 --- a/nixos/tests/guix/publish.nix +++ b/nixos/tests/guix/publish.nix @@ -47,12 +47,12 @@ in { services.guix = { enable = true; - extraArgs = [ - # Force to only get all substitutes from the local server. We don't - # have anything in the Guix store directory and we cannot get - # anything from the official substitute servers anyways. - "--substitute-urls='http://server.local:${toString publishPort}'" + # Force to only get all substitutes from the local server. We don't + # have anything in the Guix store directory and we cannot get + # anything from the official substitute servers anyways. + substituters.urls = [ "http://server.local:${toString publishPort}" ]; + extraArgs = [ # Enable autodiscovery of the substitute servers in the local # network. This machine shouldn't need to import the signing key from # the substitute server since it is automatically done anyways. diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix index e631e667bd50..9d05e9fe1390 100644 --- a/nixos/tests/icingaweb2.nix +++ b/nixos/tests/icingaweb2.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "icingaweb2"; - meta = with pkgs.lib.maintainers; { - maintainers = [ das_j ]; + meta = { + maintainers = pkgs.lib.teams.helsinki-systems.members; }; nodes = { diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 45e30af9a9a5..2046ea86d5ac 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -22,9 +22,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { forceSSL = true; }; - security.acme.email = "me@example.org"; + security.acme.defaults.email = "me@example.org"; security.acme.acceptTerms = true; - security.acme.server = "https://example.com"; # self-signed only + security.acme.defaults.server = "https://example.com"; # self-signed only }; testScript = '' @@ -44,7 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "journalctl -b -u prosody -o cat | grep -q 'Authenticated as jibri@auth.machine'", timeout=33 ) machine.wait_until_succeeds( - "cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Joined MUC: jibribrewery@internal.machine'", timeout=34 + "cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Joined MUC: jibribrewery@internal.auth.machine'", timeout=34 ) assert '"busyStatus":"IDLE","health":{"healthStatus":"HEALTHY"' in machine.succeed( diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 5cb298fe9243..abbc8dc8a476 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... }: with subtest("Test unixd connection"): client.wait_for_unit("kanidm-unixd.service") client.wait_for_file("/run/kanidm-unixd/sock") - client.wait_until_succeeds("kanidm-unix status | grep working!") + client.wait_until_succeeds("kanidm-unix status | grep online") with subtest("Test user creation"): client.wait_for_unit("getty@tty1.service") @@ -107,7 +107,7 @@ import ./make-test-python.nix ({ pkgs, ... }: client.send_chars("kanidm person posix set-password testuser\n") client.wait_until_tty_matches("1", "Enter new") client.send_chars("${testCredentials.password}\n") - client.wait_until_tty_matches("1", "Retype") + client.wait_until_tty_matches("1", "Reenter") client.send_chars("${testCredentials.password}\n") output = client.succeed("getent passwd testuser") assert "TestUser" in output diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index a4f452412cdf..d487d87fbacb 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -17,6 +17,11 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; + # for better OCR + environment.etc."icewm/prefoverride".text = '' + ColorActiveTitleBar = "rgb:FF/FF/FF" + ''; + # Regression test for https://github.com/NixOS/nixpkgs/issues/163482 qt = { enable = true; @@ -41,7 +46,7 @@ import ./make-test-python.nix ({ pkgs, ...} : machine.wait_for_x() with subtest("Can create database and entry with CLI"): - ${aliceDo "keepassxc-cli db-create -k foo.keyfile foo.kdbx"} + ${aliceDo "keepassxc-cli db-create --set-key-file foo.keyfile foo.kdbx"} ${aliceDo "keepassxc-cli add --no-password -k foo.keyfile foo.kdbx bar"} with subtest("Ensure KeePassXC starts"): @@ -62,10 +67,21 @@ import ./make-test-python.nix ({ pkgs, ...} : # Wait for the enter password screen to appear. machine.wait_for_text("/home/alice/foo.kdbx") - # Click on "Browse" button to select keyfile + # Click on "I have key file" button to open keyfile dialog machine.send_key("tab") + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("ret") + + # Select keyfile + machine.wait_for_text("Select key file") machine.send_chars("/home/alice/foo.keyfile") machine.send_key("ret") + + # Open database + machine.wait_for_text("foo.kdbx \\[Locked] - KeePassXC") + machine.send_key("ret") + # Database is unlocked (doesn't have "[Locked]" in the title anymore) machine.wait_for_text("foo.kdbx - KeePassXC") ''; diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index e5d3b36642e7..0171a1e79e1f 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,6 +30,7 @@ let linux_5_15_hardened linux_6_1_hardened linux_6_6_hardened + linux_6_11_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/nixos/tests/localsend.nix b/nixos/tests/localsend.nix index 8c0a6ac68190..551b6dd73ce8 100644 --- a/nixos/tests/localsend.nix +++ b/nixos/tests/localsend.nix @@ -16,6 +16,7 @@ import ./make-test-python.nix ( machine.wait_for_open_port(53317) machine.wait_for_window("LocalSend", 10) machine.succeed("netstat --listening --program --tcp | grep -P 'tcp.*53317.*localsend'") + machine.succeed("netstat --listening --program --udp | grep -P 'udp.*53317.*localsend'") ''; } ) diff --git a/nixos/tests/lvm2/vdo.nix b/nixos/tests/lvm2/vdo.nix index 18d25b7b366d..2b4a3df5159e 100644 --- a/nixos/tests/lvm2/vdo.nix +++ b/nixos/tests/lvm2/vdo.nix @@ -1,7 +1,7 @@ { kernelPackages ? null, mkXfsFlags ? "" }: import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "lvm2-vdo"; - meta.maintainers = lib.teams.helsinki-systems.members; + meta.maintainers = [ ]; nodes.machine = { pkgs, lib, ... }: { # Minimum required size for VDO volume: 5063921664 bytes diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 0772c05d12ac..e268eb573808 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -1,12 +1,13 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ( + { pkgs, lib, ... }: let track = pkgs.fetchurl { # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in - # License: http://creativecommons.org/licenses/by-sa/4.0/ name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; - sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp"; + hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; + meta.license = lib.licenses.cc-by-sa-40; }; defaultCfg = rec { @@ -16,42 +17,56 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: musicDirectory = "${dataDir}/music"; }; - defaultMpdCfg = with defaultCfg; { - inherit dataDir musicDirectory user group; + defaultMpdCfg = { + inherit (defaultCfg) + dataDir + musicDirectory + user + group + ; enable = true; }; - musicService = { user, group, musicDirectory }: { - description = "Sets up the music file(s) for MPD to use."; - requires = [ "mpd.service" ]; - after = [ "mpd.service" ]; - wantedBy = [ "default.target" ]; - script = '' - cp ${track} ${musicDirectory} - ''; - serviceConfig = { - User = user; - Group = group; + musicService = + { + user, + group, + musicDirectory, + }: + { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + cp ${track} ${musicDirectory} + ''; + serviceConfig = { + User = user; + Group = group; + }; }; - }; - mkServer = { mpd, musicService, }: - { boot.kernelModules = [ "snd-dummy" ]; + mkServer = + { mpd, musicService }: + { + boot.kernelModules = [ "snd-dummy" ]; services.mpd = mpd; systemd.services.musicService = musicService; }; - in { + in + { name = "mpd"; - meta = with pkgs.lib.maintainers; { - maintainers = [ emmanuelrosa ]; + meta = { + maintainers = with lib.maintainers; [ emmanuelrosa ]; }; - nodes = - { client = - { ... }: { }; + nodes = { + client = { ... }: { }; serverALSA = - { ... }: lib.mkMerge [ + { ... }: + lib.mkMerge [ (mkServer { mpd = defaultMpdCfg // { network.listenAddress = "any"; @@ -63,13 +78,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: } ''; }; - musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; }) { networking.firewall.allowedTCPPorts = [ 6600 ]; } ]; serverPulseAudio = - { ... }: lib.mkMerge [ + { ... }: + lib.mkMerge [ (mkServer { mpd = defaultMpdCfg // { extraConfig = '' @@ -80,7 +96,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ''; }; - musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; }) { hardware.pulseaudio = { @@ -94,40 +110,41 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ]; }; - testScript = '' - mpc = "${pkgs.mpc-cli}/bin/mpc --wait" + testScript = '' + mpc = "${lib.getExe pkgs.mpc} --wait" - # Connects to the given server and attempts to play a tune. - def play_some_music(server): - server.wait_for_unit("mpd.service") - server.succeed(f"{mpc} update") - _, tracks = server.execute(f"{mpc} ls") + # Connects to the given server and attempts to play a tune. + def play_some_music(server): + server.wait_for_unit("mpd.service") + server.succeed(f"{mpc} update") + _, tracks = server.execute(f"{mpc} ls") - for track in tracks.splitlines(): - server.succeed(f"{mpc} add {track}") + for track in tracks.splitlines(): + server.succeed(f"{mpc} add {track}") - _, added_tracks = server.execute(f"{mpc} playlist") + _, added_tracks = server.execute(f"{mpc} playlist") - # Check we succeeded adding audio tracks to the playlist - assert len(added_tracks.splitlines()) > 0 + # Check we succeeded adding audio tracks to the playlist + assert len(added_tracks.splitlines()) > 0 - server.succeed(f"{mpc} play") + server.succeed(f"{mpc} play") - _, output = server.execute(f"{mpc} status") - # Assure audio track is playing - assert "playing" in output + _, output = server.execute(f"{mpc} status") + # Assure audio track is playing + assert "playing" in output - server.succeed(f"{mpc} stop") + server.succeed(f"{mpc} stop") - play_some_music(serverALSA) - play_some_music(serverPulseAudio) + play_some_music(serverALSA) + play_some_music(serverPulseAudio) - client.wait_for_unit("multi-user.target") - client.succeed(f"{mpc} -h serverALSA status") + client.wait_for_unit("multi-user.target") + client.succeed(f"{mpc} -h serverALSA status") - # The PulseAudio-based server is configured not to accept external client connections - # to perform the following test: - client.fail(f"{mpc} -h serverPulseAudio status") - ''; -}) + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + client.fail(f"{mpc} -h serverPulseAudio status") + ''; + } +) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 034de0620d88..18b646c80890 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -84,6 +84,10 @@ in { docbook5 docbook_xsl_ns grub2 + nixos-artwork.wallpapers.simple-dark-gray-bootloader + perlPackages.FileCopyRecursive + perlPackages.XMLSAX + perlPackages.XMLSAXBase kbd kbd.dev kmod.dev @@ -92,16 +96,20 @@ in { libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom - ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON perlPackages.ListCompare perlPackages.XMLLibXML - python3 + # make-options-doc/default.nix + (python3.withPackages (p: [ p.mistune ])) shared-mime-info - stdenv sudo + switch-to-configuration-ng texinfo unionfs-fuse xorg.lndir + os-prober # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download diff --git a/nixos/tests/pg_anonymizer.nix b/nixos/tests/pg_anonymizer.nix deleted file mode 100644 index b26e4dca0580..000000000000 --- a/nixos/tests/pg_anonymizer.nix +++ /dev/null @@ -1,94 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "pg_anonymizer"; - meta.maintainers = lib.teams.flyingcircus.members; - - nodes.machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.pg-dump-anon ]; - services.postgresql = { - enable = true; - extraPlugins = ps: [ ps.anonymizer ]; - settings.shared_preload_libraries = [ "anon" ]; - }; - }; - - testScript = '' - start_all() - machine.wait_for_unit("multi-user.target") - machine.wait_for_unit("postgresql.service") - - with subtest("Setup"): - machine.succeed("sudo -u postgres psql --command 'create database demo'") - machine.succeed( - "sudo -u postgres psql -d demo -f ${pkgs.writeText "init.sql" '' - create extension anon cascade; - select anon.init(); - create table player(id serial, name text, points int); - insert into player(id,name,points) values (1,'Foo', 23); - insert into player(id,name,points) values (2,'Bar',42); - security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name();'; - security label for anon on column player.points is 'MASKED WITH VALUE NULL'; - ''}" - ) - - def get_player_table_contents(): - return [ - x.split(',') for x in machine.succeed("sudo -u postgres psql -d demo --csv --command 'select * from player'").splitlines()[1:] - ] - - def check_anonymized_row(row, id, original_name): - assert row[0] == id, f"Expected first row to have ID {id}, but got {row[0]}" - assert row[1] != original_name, f"Expected first row to have a name other than {original_name}" - assert not bool(row[2]), "Expected points to be NULL in first row" - - def find_xsv_in_dump(dump, sep=','): - """ - Expecting to find a CSV (for pg_dump_anon) or TSV (for pg_dump) structure, looking like - - COPY public.player ... - 1,Shields, - 2,Salazar, - \. - - in the given dump (the commas are tabs in case of pg_dump). - Extract the CSV lines and split by `sep`. - """ - - try: - from itertools import dropwhile, takewhile - return [x.split(sep) for x in list(takewhile( - lambda x: x != "\\.", - dropwhile( - lambda x: not x.startswith("COPY public.player"), - dump.splitlines() - ) - ))[1:]] - except: - print(f"Dump to process: {dump}") - raise - - def check_original_data(output): - assert output[0] == ['1','Foo','23'], f"Expected first row from player table to be 1,Foo,23; got {output[0]}" - assert output[1] == ['2','Bar','42'], f"Expected first row from player table to be 2,Bar,42; got {output[1]}" - - def check_anonymized_rows(output): - check_anonymized_row(output[0], '1', 'Foo') - check_anonymized_row(output[1], '2', 'Bar') - - with subtest("Check initial state"): - check_original_data(get_player_table_contents()) - - with subtest("Anonymous dumps"): - check_original_data(find_xsv_in_dump( - machine.succeed("sudo -u postgres pg_dump demo"), - sep='\t' - )) - check_anonymized_rows(find_xsv_in_dump( - machine.succeed("sudo -u postgres pg_dump_anon -U postgres -h /run/postgresql -d demo"), - sep=',' - )) - - with subtest("Anonymize"): - machine.succeed("sudo -u postgres psql -d demo --command 'select anon.anonymize_database();'") - check_anonymized_rows(get_player_table_contents()) - ''; -}) diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix deleted file mode 100644 index 0df6c4d62d28..000000000000 --- a/nixos/tests/pgjwt.nix +++ /dev/null @@ -1,34 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ...}: - -with pkgs; { - name = "pgjwt"; - meta = with lib.maintainers; { - maintainers = [ spinus willibutz ]; - }; - - nodes = { - master = { ... }: - { - services.postgresql = { - enable = true; - extraPlugins = ps: with ps; [ pgjwt pgtap ]; - }; - }; - }; - - testScript = { nodes, ... }: - let - sqlSU = "${nodes.master.services.postgresql.superUser}"; - pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; - in - '' - start_all() - master.wait_for_unit("postgresql") - master.succeed( - "${pkgs.gnused}/bin/sed -e '12 i SET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql" - ) - master.succeed( - "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql" - ) - ''; -}) diff --git a/nixos/tests/pgvecto-rs.nix b/nixos/tests/pgvecto-rs.nix deleted file mode 100644 index 8d9d6c0b88f5..000000000000 --- a/nixos/tests/pgvecto-rs.nix +++ /dev/null @@ -1,76 +0,0 @@ -# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix -# as it seemed unapproriate to test additional extensions for postgresql there. - -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - -let - postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; - # Test cases from https://docs.pgvecto.rs/use-cases/hybrid-search.html - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION vectors; - - CREATE TABLE items ( - id bigserial PRIMARY KEY, - content text NOT NULL, - embedding vectors.vector(3) NOT NULL -- 3 dimensions - ); - - INSERT INTO items (content, embedding) VALUES - ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'), - ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'), - ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'), - ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]'); - ''; - make-postgresql-test = postgresql-name: postgresql-package: makeTest { - name = postgresql-name; - meta = with pkgs.lib.maintainers; { - maintainers = [ diogotcorreia ]; - }; - - nodes.machine = { ... }: - { - services.postgresql = { - enable = true; - package = postgresql-package; - extraPlugins = ps: with ps; [ - pgvecto-rs - ]; - settings.shared_preload_libraries = "vectors"; - }; - }; - - testScript = '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extension vectors is available just after unit start"): - machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${postgresql-package.pkgs.pgvecto-rs.version}';", 1)) - - machine.succeed("sudo -u postgres psql -f ${test-sql}") - - machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2)) - - machine.shutdown() - ''; - - }; - applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "14") postgresql-versions; -in -mapAttrs' - (name: package: { - inherit name; - value = make-postgresql-test name package; - }) - applicablePostgresqlVersions diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix deleted file mode 100644 index 5b63e2ba73eb..000000000000 --- a/nixos/tests/postgis.nix +++ /dev/null @@ -1,38 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "postgis"; - meta = with pkgs.lib.maintainers; { - maintainers = [ lsix ]; - }; - - nodes = { - master = - { pkgs, ... }: - - { - services.postgresql = { - enable = true; - package = pkgs.postgresql; - extraPlugins = ps: with ps; [ - postgis - ]; - }; - }; - }; - - testScript = '' - start_all() - master.wait_for_unit("postgresql") - master.sleep(10) # Hopefully this is long enough!! - master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'") - master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'") - master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'") - master.succeed("sudo -u postgres psql -c 'select postgis_version();'") - master.succeed("[ \"$(sudo -u postgres psql --no-psqlrc --tuples-only -c 'select postgis_version();')\" = \" ${ - pkgs.lib.versions.major pkgs.postgis.version - }.${ - pkgs.lib.versions.minor pkgs.postgis.version - } USE_GEOS=1 USE_PROJ=1 USE_STATS=1\" ]") - # st_makepoint goes through c code - master.succeed("sudo -u postgres psql --no-psqlrc --tuples-only -c 'select st_makepoint(1, 1)'") - ''; -}) diff --git a/nixos/tests/postgresql-jit.nix b/nixos/tests/postgresql-jit.nix deleted file mode 100644 index f4b1d07a7faf..000000000000 --- a/nixos/tests/postgresql-jit.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ system ? builtins.currentSystem -, config ? {} -, pkgs ? import ../.. { inherit system config; } -, package ? null -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - -let - inherit (pkgs) lib; - packages = builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs); - - mkJitTestFromName = name: - mkJitTest pkgs.${name}; - - mkJitTest = package: makeTest { - name = package.name; - meta.maintainers = with lib.maintainers; [ ma27 ]; - nodes.machine = { pkgs, lib, ... }: { - services.postgresql = { - inherit package; - enable = true; - enableJIT = true; - initialScript = pkgs.writeText "init.sql" '' - create table demo (id int); - insert into demo (id) select generate_series(1, 5); - ''; - }; - }; - testScript = '' - machine.start() - machine.wait_for_unit("postgresql.service") - - with subtest("JIT is enabled"): - machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'") - - with subtest("Test JIT works fine"): - output = machine.succeed( - "cat ${pkgs.writeText "test.sql" '' - set jit_above_cost = 1; - EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo; - SELECT CONCAT('jit result = ', SUM(id)) from demo; - ''} | sudo -u postgres psql" - ) - assert "JIT:" in output - assert "jit result = 15" in output - - machine.shutdown() - ''; - }; -in -if package == null then - lib.genAttrs packages mkJitTestFromName -else - mkJitTest package diff --git a/nixos/tests/postgresql-tls-client-cert.nix b/nixos/tests/postgresql-tls-client-cert.nix deleted file mode 100644 index c1678ed733be..000000000000 --- a/nixos/tests/postgresql-tls-client-cert.nix +++ /dev/null @@ -1,141 +0,0 @@ -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } -, package ? null -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - -let - lib = pkgs.lib; - - # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. - makeTestAttribute = name: - { - inherit name; - value = makePostgresqlTlsClientCertTest pkgs."${name}"; - }; - - makePostgresqlTlsClientCertTest = pkg: - let - runWithOpenSSL = file: cmd: pkgs.runCommand file - { - buildInputs = [ pkgs.openssl ]; - } - cmd; - caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; - caCert = runWithOpenSSL - "ca.crt" - '' - openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500 - ''; - serverKey = - runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; - serverKeyPath = "/var/lib/postgresql"; - serverCert = - runWithOpenSSL "server.crt" '' - openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example" - openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \ - -CAcreateserial -out $out -days 36500 -sha256 - ''; - clientKey = - runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; - clientCert = - runWithOpenSSL "client.crt" '' - openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test" - openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \ - -CAcreateserial -out $out -days 36500 -sha256 - ''; - clientKeyPath = "/root"; - - in - makeTest { - name = "postgresql-tls-client-cert-${pkg.name}"; - meta.maintainers = with lib.maintainers; [ erictapen ]; - - nodes.server = { ... }: { - system.activationScripts = { - keyPlacement.text = '' - mkdir -p '${serverKeyPath}' - cp '${serverKey}' '${serverKeyPath}/server.key' - chown postgres:postgres '${serverKeyPath}/server.key' - chmod 600 '${serverKeyPath}/server.key' - ''; - }; - services.postgresql = { - package = pkg; - enable = true; - enableTCPIP = true; - ensureUsers = [ - { - name = "test"; - ensureDBOwnership = true; - } - ]; - ensureDatabases = [ "test" ]; - settings = { - ssl = "on"; - ssl_ca_file = toString caCert; - ssl_cert_file = toString serverCert; - ssl_key_file = "${serverKeyPath}/server.key"; - }; - authentication = '' - hostssl test test ::/0 cert clientcert=verify-full - ''; - }; - networking = { - interfaces.eth1 = { - ipv6.addresses = [ - { address = "fc00::1"; prefixLength = 120; } - ]; - }; - firewall.allowedTCPPorts = [ 5432 ]; - }; - }; - - nodes.client = { ... }: { - system.activationScripts = { - keyPlacement.text = '' - mkdir -p '${clientKeyPath}' - cp '${clientKey}' '${clientKeyPath}/client.key' - chown root:root '${clientKeyPath}/client.key' - chmod 600 '${clientKeyPath}/client.key' - ''; - }; - environment = { - variables = { - PGHOST = "db.test.example"; - PGPORT = "5432"; - PGDATABASE = "test"; - PGUSER = "test"; - PGSSLMODE = "verify-full"; - PGSSLCERT = clientCert; - PGSSLKEY = "${clientKeyPath}/client.key"; - PGSSLROOTCERT = caCert; - }; - systemPackages = [ pkg ]; - }; - networking = { - interfaces.eth1 = { - ipv6.addresses = [ - { address = "fc00::2"; prefixLength = 120; } - ]; - }; - hosts = { "fc00::1" = [ "db.test.example" ]; }; - }; - }; - - testScript = '' - server.wait_for_unit("multi-user.target") - client.wait_for_unit("multi-user.target") - client.succeed("psql -c \"SELECT 1;\"") - ''; - }; - -in -if package == null then -# all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages - builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))) -else -# Called directly from .tests - makePostgresqlTlsClientCertTest package diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix deleted file mode 100644 index ab2ab4ad0d4f..000000000000 --- a/nixos/tests/postgresql-wal-receiver.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; }, - package ? null -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - -let - lib = pkgs.lib; - - # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. - makeTestAttribute = name: - { - inherit name; - value = makePostgresqlWalReceiverTest pkgs."${name}"; - }; - - makePostgresqlWalReceiverTest = pkg: - let - postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}"; - replicationUser = "wal_receiver_user"; - replicationSlot = "wal_receiver_slot"; - replicationConn = "postgresql://${replicationUser}@localhost"; - baseBackupDir = "/tmp/pg_basebackup"; - walBackupDir = "/tmp/pg_wal"; - - recoveryFile = pkgs.writeTextDir "recovery.signal" ""; - - in makeTest { - name = "postgresql-wal-receiver-${pkg.name}"; - meta.maintainers = with lib.maintainers; [ pacien ]; - - nodes.machine = { ... }: { - services.postgresql = { - package = pkg; - enable = true; - settings = { - max_replication_slots = 10; - max_wal_senders = 10; - recovery_end_command = "touch recovery.done"; - restore_command = "cp ${walBackupDir}/%f %p"; - wal_level = "archive"; # alias for replica on pg >= 9.6 - }; - authentication = '' - host replication ${replicationUser} all trust - ''; - initialScript = pkgs.writeText "init.sql" '' - create user ${replicationUser} replication; - select * from pg_create_physical_replication_slot('${replicationSlot}'); - ''; - }; - - services.postgresqlWalReceiver.receivers.main = { - postgresqlPackage = pkg; - connection = replicationConn; - slot = replicationSlot; - directory = walBackupDir; - }; - # This is only to speedup test, it isn't time racing. Service is set to autorestart always, - # default 60sec is fine for real system, but is too much for a test - systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; - }; - - testScript = '' - # make an initial base backup - machine.wait_for_unit("postgresql") - machine.wait_for_unit("postgresql-wal-receiver-main") - # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other - # required only for 9.4 - machine.sleep(5) - machine.succeed( - "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" - ) - - # create a dummy table with 100 records - machine.succeed( - "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" - ) - - # stop postgres and destroy data - machine.systemctl("stop postgresql") - machine.systemctl("stop postgresql-wal-receiver-main") - machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") - - # restore the base backup - machine.succeed( - "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" - ) - - # prepare WAL and recovery - machine.succeed("chmod a+rX -R ${walBackupDir}") - machine.execute( - "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" - ) # make use of partial segments too - machine.succeed( - "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" - ) - - # replay WAL - machine.systemctl("start postgresql") - machine.wait_for_file("${postgresqlDataDir}/recovery.done") - machine.systemctl("restart postgresql") - machine.wait_for_unit("postgresql") - - # check that our records have been restored - machine.succeed( - "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" - ) - ''; - }; - -in -if package == null then - # all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages - builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))) -else - # Called directly from .tests - makePostgresqlWalReceiverTest package diff --git a/nixos/tests/postgresql-wal2json.nix b/nixos/tests/postgresql-wal2json.nix deleted file mode 100644 index 043ad48cbc6e..000000000000 --- a/nixos/tests/postgresql-wal2json.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, - postgresql ? null, -}: - -let - makeTest = import ./make-test-python.nix; - # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. - makeTestAttribute = name: { - inherit name; - value = makePostgresqlWal2jsonTest pkgs."${name}"; - }; - - makePostgresqlWal2jsonTest = - postgresqlPackage: - makeTest { - name = "postgresql-wal2json-${postgresqlPackage.name}"; - meta.maintainers = with pkgs.lib.maintainers; [ euank ]; - - nodes.machine = { - services.postgresql = { - package = postgresqlPackage; - enable = true; - extraPlugins = with postgresqlPackage.pkgs; [ wal2json ]; - settings = { - wal_level = "logical"; - max_replication_slots = "10"; - max_wal_senders = "10"; - }; - }; - }; - - testScript = '' - machine.wait_for_unit("postgresql") - machine.succeed( - "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example2.sql} postgres > /tmp/example2.out" - ) - machine.succeed( - "diff ${./postgresql/wal2json/example2.out} /tmp/example2.out" - ) - machine.succeed( - "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example3.sql} postgres > /tmp/example3.out" - ) - machine.succeed( - "diff ${./postgresql/wal2json/example3.out} /tmp/example3.out" - ) - ''; - }; - -in -# By default, create one test per postgresql version -if postgresql == null then - builtins.listToAttrs ( - map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)) - ) -# but if postgresql is set, we're being made as a passthru test for a specific postgres + wal2json version, just run one -else - makePostgresqlWal2jsonTest postgresql diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix deleted file mode 100644 index c0dd24cf6ad2..000000000000 --- a/nixos/tests/postgresql.nix +++ /dev/null @@ -1,224 +0,0 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - -let - postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION pgcrypto; -- just to check if lib loading works - CREATE TABLE sth ( - id int - ); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - CREATE TABLE xmltest ( doc xml ); - INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - ''; - make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest { - name = postgresql-name; - meta = with pkgs.lib.maintainers; { - maintainers = [ zagy ]; - }; - - nodes.machine = {...}: - { - services.postgresql = { - enable = true; - package = postgresql-package; - }; - - services.postgresqlBackup = { - enable = true; - databases = optional (!backup-all) "postgres"; - }; - }; - - testScript = let - backupName = if backup-all then "all" else "postgres"; - backupService = if backup-all then "postgresqlBackup" else "postgresqlBackup-postgres"; - backupFileBase = "/var/backup/postgresql/${backupName}"; - in '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql is available just after unit start"): - machine.succeed( - "cat ${test-sql} | sudo -u postgres psql" - ) - - with subtest("Postgresql survives restart (bug #1735)"): - machine.shutdown() - import time - time.sleep(2) - machine.start() - machine.wait_for_unit("postgresql") - - machine.fail(check_count("SELECT * FROM sth;", 3)) - machine.succeed(check_count("SELECT * FROM sth;", 5)) - machine.fail(check_count("SELECT * FROM sth;", 4)) - machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1)) - - with subtest("Backup service works"): - machine.succeed( - "systemctl start ${backupService}.service", - "zcat ${backupFileBase}.sql.gz | grep 'ok'", - "ls -hal /var/backup/postgresql/ >/dev/console", - "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", - ) - with subtest("Backup service removes prev files"): - machine.succeed( - # Create dummy prev files. - "touch ${backupFileBase}.prev.sql{,.gz,.zstd}", - "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}", - - # Run backup. - "systemctl start ${backupService}.service", - "ls -hal /var/backup/postgresql/ >/dev/console", - - # Since nothing has changed in the database, the cur and prev files - # should match. - "zcat ${backupFileBase}.sql.gz | grep 'ok'", - "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz", - - # The prev files with unused suffix should be removed. - "[ ! -f '${backupFileBase}.prev.sql' ]", - "[ ! -f '${backupFileBase}.prev.sql.zstd' ]", - - # Both cur and prev file should only be accessible by the postgres user. - "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", - "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600", - ) - with subtest("Backup service fails gracefully"): - # Sabotage the backup process - machine.succeed("rm /run/postgresql/.s.PGSQL.5432") - machine.fail( - "systemctl start ${backupService}.service", - ) - machine.succeed( - "ls -hal /var/backup/postgresql/ >/dev/console", - "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", - "stat ${backupFileBase}.in-progress.sql.gz", - ) - # In a previous version, the second run would overwrite prev.sql.gz, - # so we test a second run as well. - machine.fail( - "systemctl start ${backupService}.service", - ) - machine.succeed( - "stat ${backupFileBase}.in-progress.sql.gz", - "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", - ) - - - with subtest("Initdb works"): - machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") - - machine.shutdown() - ''; - - }; - - mk-ensure-clauses-test = postgresql-name: postgresql-package: makeTest { - name = postgresql-name; - meta = with pkgs.lib.maintainers; { - maintainers = [ zagy ]; - }; - - nodes.machine = {...}: - { - services.postgresql = { - enable = true; - package = postgresql-package; - ensureUsers = [ - { - name = "all-clauses"; - ensureClauses = { - superuser = true; - createdb = true; - createrole = true; - "inherit" = true; - login = true; - replication = true; - bypassrls = true; - }; - } - { - name = "default-clauses"; - } - ]; - }; - }; - - testScript = let - getClausesQuery = user: pkgs.lib.concatStringsSep " " - [ - "SELECT row_to_json(row)" - "FROM (" - "SELECT" - "rolsuper," - "rolinherit," - "rolcreaterole," - "rolcreatedb," - "rolcanlogin," - "rolreplication," - "rolbypassrls" - "FROM pg_roles" - "WHERE rolname = '${user}'" - ") row;" - ]; - in '' - import json - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("All user permissions are set according to the ensureClauses attr"): - clauses = json.loads( - machine.succeed( - "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\"" - ) - ) - print(clauses) - assert clauses['rolsuper'], 'expected user with clauses to have superuser clause' - assert clauses['rolinherit'], 'expected user with clauses to have inherit clause' - assert clauses['rolcreaterole'], 'expected user with clauses to have create role clause' - assert clauses['rolcreatedb'], 'expected user with clauses to have create db clause' - assert clauses['rolcanlogin'], 'expected user with clauses to have login clause' - assert clauses['rolreplication'], 'expected user with clauses to have replication clause' - assert clauses['rolbypassrls'], 'expected user with clauses to have bypassrls clause' - - with subtest("All user permissions default when ensureClauses is not provided"): - clauses = json.loads( - machine.succeed( - "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\"" - ) - ) - assert not clauses['rolsuper'], 'expected user with no clauses set to have default superuser clause' - assert clauses['rolinherit'], 'expected user with no clauses set to have default inherit clause' - assert not clauses['rolcreaterole'], 'expected user with no clauses set to have default create role clause' - assert not clauses['rolcreatedb'], 'expected user with no clauses set to have default create db clause' - assert clauses['rolcanlogin'], 'expected user with no clauses set to have default login clause' - assert not clauses['rolreplication'], 'expected user with no clauses set to have default replication clause' - assert not clauses['rolbypassrls'], 'expected user with no clauses set to have default bypassrls clause' - - machine.shutdown() - ''; - }; -in - concatMapAttrs (name: package: { - ${name} = make-postgresql-test name package false; - ${name + "-backup-all"} = make-postgresql-test "${name + "-backup-all"}" package true; - ${name + "-clauses"} = mk-ensure-clauses-test name package; - }) postgresql-versions diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix new file mode 100644 index 000000000000..3a5f69086eaa --- /dev/null +++ b/nixos/tests/postgresql/anonymizer.nix @@ -0,0 +1,116 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + makeTest { + name = "postgresql_anonymizer-${package.name}"; + meta.maintainers = lib.teams.flyingcircus.members; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.pg-dump-anon ]; + services.postgresql = { + inherit package; + enable = true; + extraPlugins = ps: [ ps.anonymizer ]; + settings.shared_preload_libraries = [ "anon" ]; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("postgresql.service") + + with subtest("Setup"): + machine.succeed("sudo -u postgres psql --command 'create database demo'") + machine.succeed( + "sudo -u postgres psql -d demo -f ${pkgs.writeText "init.sql" '' + create extension anon cascade; + select anon.init(); + create table player(id serial, name text, points int); + insert into player(id,name,points) values (1,'Foo', 23); + insert into player(id,name,points) values (2,'Bar',42); + security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name();'; + security label for anon on column player.points is 'MASKED WITH VALUE NULL'; + ''}" + ) + + def get_player_table_contents(): + return [ + x.split(',') for x in machine.succeed("sudo -u postgres psql -d demo --csv --command 'select * from player'").splitlines()[1:] + ] + + def check_anonymized_row(row, id, original_name): + assert row[0] == id, f"Expected first row to have ID {id}, but got {row[0]}" + assert row[1] != original_name, f"Expected first row to have a name other than {original_name}" + assert not bool(row[2]), "Expected points to be NULL in first row" + + def find_xsv_in_dump(dump, sep=','): + """ + Expecting to find a CSV (for pg_dump_anon) or TSV (for pg_dump) structure, looking like + + COPY public.player ... + 1,Shields, + 2,Salazar, + \. + + in the given dump (the commas are tabs in case of pg_dump). + Extract the CSV lines and split by `sep`. + """ + + try: + from itertools import dropwhile, takewhile + return [x.split(sep) for x in list(takewhile( + lambda x: x != "\\.", + dropwhile( + lambda x: not x.startswith("COPY public.player"), + dump.splitlines() + ) + ))[1:]] + except: + print(f"Dump to process: {dump}") + raise + + def check_original_data(output): + assert output[0] == ['1','Foo','23'], f"Expected first row from player table to be 1,Foo,23; got {output[0]}" + assert output[1] == ['2','Bar','42'], f"Expected first row from player table to be 2,Bar,42; got {output[1]}" + + def check_anonymized_rows(output): + check_anonymized_row(output[0], '1', 'Foo') + check_anonymized_row(output[1], '2', 'Bar') + + with subtest("Check initial state"): + check_original_data(get_player_table_contents()) + + with subtest("Anonymous dumps"): + check_original_data(find_xsv_in_dump( + machine.succeed("sudo -u postgres pg_dump demo"), + sep='\t' + )) + check_anonymized_rows(find_xsv_in_dump( + machine.succeed("sudo -u postgres pg_dump_anon -U postgres -h /run/postgresql -d demo"), + sep=',' + )) + + with subtest("Anonymize"): + machine.succeed("sudo -u postgres psql -d demo --command 'select anon.anonymize_database();'") + check_anonymized_rows(get_player_table_contents()) + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix new file mode 100644 index 000000000000..4fe7e7a37e7e --- /dev/null +++ b/nixos/tests/postgresql/default.nix @@ -0,0 +1,26 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, +}: + +with import ../../lib/testing-python.nix { inherit system pkgs; }; + +let + importWithArgs = path: import path { inherit pkgs makeTest; }; +in +{ + # postgresql + postgresql = importWithArgs ./postgresql.nix; + postgresql-jit = importWithArgs ./postgresql-jit.nix; + postgresql-wal-receiver = importWithArgs ./postgresql-wal-receiver.nix; + postgresql-tls-client-cert = importWithArgs ./postgresql-tls-client-cert.nix; + + # extensions + anonymizer = importWithArgs ./anonymizer.nix; + pgjwt = importWithArgs ./pgjwt.nix; + pgvecto-rs = importWithArgs ./pgvecto-rs.nix; + timescaledb = importWithArgs ./timescaledb.nix; + tsja = importWithArgs ./tsja.nix; + wal2json = importWithArgs ./wal2json.nix; +} diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix new file mode 100644 index 000000000000..81e5dac41ada --- /dev/null +++ b/nixos/tests/postgresql/pgjwt.nix @@ -0,0 +1,57 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + makeTest { + name = "pgjwt-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ + spinus + willibutz + ]; + }; + + nodes.master = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + extraPlugins = + ps: with ps; [ + pgjwt + pgtap + ]; + }; + }; + + testScript = + { nodes, ... }: + let + sqlSU = "${nodes.master.services.postgresql.superUser}"; + pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; + inherit (nodes.master.services.postgresql.package.pkgs) pgjwt; + in + '' + start_all() + master.wait_for_unit("postgresql") + master.succeed( + "${pkgs.sudo}/bin/sudo -u ${sqlSU} ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql" + ) + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix new file mode 100644 index 000000000000..9d8389eecf99 --- /dev/null +++ b/nixos/tests/postgresql/pgvecto-rs.nix @@ -0,0 +1,81 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + # Test cases from https://docs.pgvecto.rs/use-cases/hybrid-search.html + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION vectors; + + CREATE TABLE items ( + id bigserial PRIMARY KEY, + content text NOT NULL, + embedding vectors.vector(3) NOT NULL -- 3 dimensions + ); + + INSERT INTO items (content, embedding) VALUES + ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'), + ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'), + ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'), + ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]'); + ''; + + makeTestFor = + postgresqlPackage: + makeTest { + name = "pgvecto-rs-${postgresqlPackage.name}"; + meta = with lib.maintainers; { + maintainers = [ diogotcorreia ]; + }; + + nodes.machine = + { ... }: + { + services.postgresql = { + enable = true; + package = postgresqlPackage; + extraPlugins = + ps: with ps; [ + pgvecto-rs + ]; + settings.shared_preload_libraries = "vectors"; + }; + }; + + testScript = + { nodes, ... }: + let + inherit (nodes.machine.services.postgresql.package.pkgs) pgvecto-rs; + in + '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql with extension vectors is available just after unit start"): + machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${pgvecto-rs.version}';", 1)) + + machine.succeed("sudo -u postgres psql -f ${test-sql}") + + machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2)) + + machine.shutdown() + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/postgresql-jit.nix b/nixos/tests/postgresql/postgresql-jit.nix new file mode 100644 index 000000000000..5d0406062eae --- /dev/null +++ b/nixos/tests/postgresql/postgresql-jit.nix @@ -0,0 +1,58 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + makeTest { + name = "postgresql-jit-${package.name}"; + meta.maintainers = with lib.maintainers; [ ma27 ]; + + nodes.machine = + { pkgs, ... }: + { + services.postgresql = { + inherit package; + enable = true; + enableJIT = true; + initialScript = pkgs.writeText "init.sql" '' + create table demo (id int); + insert into demo (id) select generate_series(1, 5); + ''; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("postgresql.service") + + with subtest("JIT is enabled"): + machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'") + + with subtest("Test JIT works fine"): + output = machine.succeed( + "cat ${pkgs.writeText "test.sql" '' + set jit_above_cost = 1; + EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo; + SELECT CONCAT('jit result = ', SUM(id)) from demo; + ''} | sudo -u postgres psql" + ) + assert "JIT:" in output + assert "jit result = 15" in output + + machine.shutdown() + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix new file mode 100644 index 000000000000..d7cddb625256 --- /dev/null +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -0,0 +1,135 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + runWithOpenSSL = + file: cmd: + pkgs.runCommand file { + buildInputs = [ pkgs.openssl ]; + } cmd; + caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + caCert = runWithOpenSSL "ca.crt" '' + openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500 + ''; + serverKey = runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + serverKeyPath = "/var/lib/postgresql"; + serverCert = runWithOpenSSL "server.crt" '' + openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example" + openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \ + -CAcreateserial -out $out -days 36500 -sha256 + ''; + clientKey = runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + clientCert = runWithOpenSSL "client.crt" '' + openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test" + openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \ + -CAcreateserial -out $out -days 36500 -sha256 + ''; + clientKeyPath = "/root"; + + makeTestFor = + package: + makeTest { + name = "postgresql-tls-client-cert-${package.name}"; + meta.maintainers = with lib.maintainers; [ erictapen ]; + + nodes.server = + { ... }: + { + system.activationScripts = { + keyPlacement.text = '' + mkdir -p '${serverKeyPath}' + cp '${serverKey}' '${serverKeyPath}/server.key' + chown postgres:postgres '${serverKeyPath}/server.key' + chmod 600 '${serverKeyPath}/server.key' + ''; + }; + services.postgresql = { + inherit package; + enable = true; + enableTCPIP = true; + ensureUsers = [ + { + name = "test"; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ "test" ]; + settings = { + ssl = "on"; + ssl_ca_file = toString caCert; + ssl_cert_file = toString serverCert; + ssl_key_file = "${serverKeyPath}/server.key"; + }; + authentication = '' + hostssl test test ::/0 cert clientcert=verify-full + ''; + }; + networking = { + interfaces.eth1 = { + ipv6.addresses = [ + { + address = "fc00::1"; + prefixLength = 120; + } + ]; + }; + firewall.allowedTCPPorts = [ 5432 ]; + }; + }; + + nodes.client = + { ... }: + { + system.activationScripts = { + keyPlacement.text = '' + mkdir -p '${clientKeyPath}' + cp '${clientKey}' '${clientKeyPath}/client.key' + chown root:root '${clientKeyPath}/client.key' + chmod 600 '${clientKeyPath}/client.key' + ''; + }; + environment = { + variables = { + PGHOST = "db.test.example"; + PGPORT = "5432"; + PGDATABASE = "test"; + PGUSER = "test"; + PGSSLMODE = "verify-full"; + PGSSLCERT = clientCert; + PGSSLKEY = "${clientKeyPath}/client.key"; + PGSSLROOTCERT = caCert; + }; + systemPackages = [ package ]; + }; + networking = { + interfaces.eth1 = { + ipv6.addresses = [ + { + address = "fc00::2"; + prefixLength = 120; + } + ]; + }; + hosts = { + "fc00::1" = [ "db.test.example" ]; + }; + }; + }; + + testScript = '' + server.wait_for_unit("multi-user.target") + client.wait_for_unit("multi-user.target") + client.succeed("psql -c \"SELECT 1;\"") + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix new file mode 100644 index 000000000000..5c1551c5f2fd --- /dev/null +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -0,0 +1,115 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + let + postgresqlDataDir = "/var/lib/postgresql/${package.psqlSchema}"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/var/cache/wals/pg_basebackup"; + walBackupDir = "/var/cache/wals/pg_wal"; + recoveryFile = pkgs.writeTextDir "recovery.signal" ""; + in + makeTest { + name = "postgresql-wal-receiver-${package.name}"; + meta.maintainers = with lib.maintainers; [ pacien ]; + + nodes.machine = + { ... }: + { + systemd.tmpfiles.rules = [ + "d /var/cache/wals 0750 postgres postgres - -" + ]; + + services.postgresql = { + inherit package; + enable = true; + settings = { + max_replication_slots = 10; + max_wal_senders = 10; + recovery_end_command = "touch recovery.done"; + restore_command = "cp ${walBackupDir}/%f %p"; + wal_level = "archive"; # alias for replica on pg >= 9.6 + }; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; + }; + + services.postgresqlWalReceiver.receivers.main = { + postgresqlPackage = package; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; + systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/var/cache/wals" ]; + }; + + testScript = '' + # make an initial base backup + machine.wait_for_unit("postgresql") + machine.wait_for_unit("postgresql-wal-receiver-main") + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + machine.sleep(5) + machine.succeed( + "${package}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" + ) + + # create a dummy table with 100 records + machine.succeed( + "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" + ) + + # stop postgres and destroy data + machine.systemctl("stop postgresql") + machine.systemctl("stop postgresql-wal-receiver-main") + machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") + + # restore the base backup + machine.succeed( + "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" + ) + + # prepare WAL and recovery + machine.succeed("chmod a+rX -R ${walBackupDir}") + machine.execute( + "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" + ) # make use of partial segments too + machine.succeed( + "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" + ) + + # replay WAL + machine.systemctl("start postgresql") + machine.wait_for_file("${postgresqlDataDir}/recovery.done") + machine.systemctl("restart postgresql") + machine.wait_for_unit("postgresql") + + # check that our records have been restored + machine.succeed( + "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" + ) + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix new file mode 100644 index 000000000000..509a14411de9 --- /dev/null +++ b/nixos/tests/postgresql/postgresql.nix @@ -0,0 +1,244 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + lib.recurseIntoAttrs { + postgresql = makeTestForWithBackupAll package false; + postgresql-backup-all = makeTestForWithBackupAll package true; + postgresql-clauses = makeEnsureTestFor package; + }; + + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION pgcrypto; -- just to check if lib loading works + CREATE TABLE sth ( + id int + ); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + CREATE TABLE xmltest ( doc xml ); + INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled + ''; + + makeTestForWithBackupAll = + package: backupAll: + makeTest { + name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ zagy ]; + }; + + nodes.machine = + { ... }: + { + services.postgresql = { + inherit (package) ; + enable = true; + }; + + services.postgresqlBackup = { + enable = true; + databases = lib.optional (!backupAll) "postgres"; + }; + }; + + testScript = + let + backupName = if backupAll then "all" else "postgres"; + backupService = if backupAll then "postgresqlBackup" else "postgresqlBackup-postgres"; + backupFileBase = "/var/backup/postgresql/${backupName}"; + in + '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql is available just after unit start"): + machine.succeed( + "cat ${test-sql} | sudo -u postgres psql" + ) + + with subtest("Postgresql survives restart (bug #1735)"): + machine.shutdown() + import time + time.sleep(2) + machine.start() + machine.wait_for_unit("postgresql") + + machine.fail(check_count("SELECT * FROM sth;", 3)) + machine.succeed(check_count("SELECT * FROM sth;", 5)) + machine.fail(check_count("SELECT * FROM sth;", 4)) + machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1)) + + with subtest("Backup service works"): + machine.succeed( + "systemctl start ${backupService}.service", + "zcat ${backupFileBase}.sql.gz | grep 'ok'", + "ls -hal /var/backup/postgresql/ >/dev/console", + "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", + ) + with subtest("Backup service removes prev files"): + machine.succeed( + # Create dummy prev files. + "touch ${backupFileBase}.prev.sql{,.gz,.zstd}", + "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}", + + # Run backup. + "systemctl start ${backupService}.service", + "ls -hal /var/backup/postgresql/ >/dev/console", + + # Since nothing has changed in the database, the cur and prev files + # should match. + "zcat ${backupFileBase}.sql.gz | grep 'ok'", + "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz", + + # The prev files with unused suffix should be removed. + "[ ! -f '${backupFileBase}.prev.sql' ]", + "[ ! -f '${backupFileBase}.prev.sql.zstd' ]", + + # Both cur and prev file should only be accessible by the postgres user. + "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", + "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600", + ) + with subtest("Backup service fails gracefully"): + # Sabotage the backup process + machine.succeed("rm /run/postgresql/.s.PGSQL.5432") + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "ls -hal /var/backup/postgresql/ >/dev/console", + "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", + "stat ${backupFileBase}.in-progress.sql.gz", + ) + # In a previous version, the second run would overwrite prev.sql.gz, + # so we test a second run as well. + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "stat ${backupFileBase}.in-progress.sql.gz", + "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", + ) + + + with subtest("Initdb works"): + machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") + + machine.log(machine.execute("systemd-analyze security postgresql.service | grep -v ✓")[1]) + + machine.shutdown() + ''; + }; + + makeEnsureTestFor = + package: + makeTest { + name = "postgresql-clauses-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ zagy ]; + }; + + nodes.machine = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + ensureUsers = [ + { + name = "all-clauses"; + ensureClauses = { + superuser = true; + createdb = true; + createrole = true; + "inherit" = true; + login = true; + replication = true; + bypassrls = true; + }; + } + { + name = "default-clauses"; + } + ]; + }; + }; + + testScript = + let + getClausesQuery = + user: + lib.concatStringsSep " " [ + "SELECT row_to_json(row)" + "FROM (" + "SELECT" + "rolsuper," + "rolinherit," + "rolcreaterole," + "rolcreatedb," + "rolcanlogin," + "rolreplication," + "rolbypassrls" + "FROM pg_roles" + "WHERE rolname = '${user}'" + ") row;" + ]; + in + '' + import json + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("All user permissions are set according to the ensureClauses attr"): + clauses = json.loads( + machine.succeed( + "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\"" + ) + ) + print(clauses) + assert clauses['rolsuper'], 'expected user with clauses to have superuser clause' + assert clauses['rolinherit'], 'expected user with clauses to have inherit clause' + assert clauses['rolcreaterole'], 'expected user with clauses to have create role clause' + assert clauses['rolcreatedb'], 'expected user with clauses to have create db clause' + assert clauses['rolcanlogin'], 'expected user with clauses to have login clause' + assert clauses['rolreplication'], 'expected user with clauses to have replication clause' + assert clauses['rolbypassrls'], 'expected user with clauses to have bypassrls clause' + + with subtest("All user permissions default when ensureClauses is not provided"): + clauses = json.loads( + machine.succeed( + "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\"" + ) + ) + assert not clauses['rolsuper'], 'expected user with no clauses set to have default superuser clause' + assert clauses['rolinherit'], 'expected user with no clauses set to have default inherit clause' + assert not clauses['rolcreaterole'], 'expected user with no clauses set to have default create role clause' + assert not clauses['rolcreatedb'], 'expected user with no clauses set to have default create db clause' + assert clauses['rolcanlogin'], 'expected user with no clauses set to have default login clause' + assert not clauses['rolreplication'], 'expected user with no clauses set to have default replication clause' + assert not clauses['rolbypassrls'], 'expected user with no clauses set to have default bypassrls clause' + + machine.shutdown() + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix new file mode 100644 index 000000000000..b29d59c744f0 --- /dev/null +++ b/nixos/tests/postgresql/timescaledb.nix @@ -0,0 +1,100 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION timescaledb; + CREATE EXTENSION timescaledb_toolkit; + + CREATE TABLE sth ( + time TIMESTAMPTZ NOT NULL, + value DOUBLE PRECISION + ); + + SELECT create_hypertable('sth', 'time'); + + INSERT INTO sth (time, value) VALUES + ('2003-04-12 04:05:06 America/New_York', 1.0), + ('2003-04-12 04:05:07 America/New_York', 2.0), + ('2003-04-12 04:05:08 America/New_York', 3.0), + ('2003-04-12 04:05:09 America/New_York', 4.0), + ('2003-04-12 04:05:10 America/New_York', 5.0) + ; + + WITH t AS ( + SELECT + time_bucket('1 day'::interval, time) AS dt, + stats_agg(value) AS stats + FROM sth + GROUP BY time_bucket('1 day'::interval, time) + ) + SELECT + average(stats) + FROM t; + + SELECT * FROM sth; + ''; + + makeTestFor = + package: + makeTest { + name = "timescaledb-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ typetetris ]; + }; + + nodes.machine = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + extraPlugins = + ps: with ps; [ + timescaledb + timescaledb_toolkit + ]; + settings = { + shared_preload_libraries = "timescaledb, timescaledb_toolkit"; + }; + }; + }; + + testScript = '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"): + machine.succeed( + "sudo -u postgres psql -f ${test-sql}" + ) + + machine.fail(check_count("SELECT * FROM sth;", 3)) + machine.succeed(check_count("SELECT * FROM sth;", 5)) + machine.fail(check_count("SELECT * FROM sth;", 4)) + + machine.shutdown() + ''; + }; +in +# Not run by default, because this requires allowUnfree. +# To run these tests: +# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb +lib.dontRecurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix new file mode 100644 index 000000000000..7c976da21b68 --- /dev/null +++ b/nixos/tests/postgresql/tsja.nix @@ -0,0 +1,50 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + makeTest { + name = "tsja-${package.name}"; + meta = { + maintainers = with lib.maintainers; [ chayleaf ]; + }; + + nodes.master = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + extraPlugins = + ps: with ps; [ + tsja + ]; + }; + }; + + testScript = '' + start_all() + master.wait_for_unit("postgresql") + master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql") + # make sure "日本語" is parsed as a separate lexeme + master.succeed(""" + sudo -u postgres \\ + psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\ + | grep "{日本語}" + """) + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix new file mode 100644 index 000000000000..551254a68ebd --- /dev/null +++ b/nixos/tests/postgresql/wal2json.nix @@ -0,0 +1,52 @@ +{ + pkgs, + makeTest, +}: + +let + inherit (pkgs) lib; + + makeTestFor = + package: + makeTest { + name = "wal2json-${package.name}"; + meta.maintainers = with pkgs.lib.maintainers; [ euank ]; + + nodes.machine = { + services.postgresql = { + inherit package; + enable = true; + extraPlugins = with package.pkgs; [ wal2json ]; + settings = { + wal_level = "logical"; + max_replication_slots = "10"; + max_wal_senders = "10"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + machine.succeed( + "sudo -u postgres psql -qAt -f ${./wal2json/example2.sql} postgres > /tmp/example2.out" + ) + machine.succeed( + "diff ${./wal2json/example2.out} /tmp/example2.out" + ) + machine.succeed( + "sudo -u postgres psql -qAt -f ${./wal2json/example3.sql} postgres > /tmp/example3.out" + ) + machine.succeed( + "diff ${./wal2json/example3.out} /tmp/example3.out" + ) + ''; + }; +in +lib.recurseIntoAttrs ( + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions + ) + // { + passthru.override = p: makeTestFor p; + } +) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 71eef72df6f3..4aacd8e5a849 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -356,6 +356,46 @@ let ''; }; + exportarr-sonarr = let apikey = "eccff6a992bc2e4b88e46d064b26bb4e"; in { + nodeName = "exportarr_sonarr"; + exporterConfig = { + enable = true; + url = "http://127.0.0.1:8989"; + apiKeyFile = pkgs.writeText "dummy-api-key" apikey; + }; + metricProvider = { + services.sonarr.enable = true; + systemd.services.sonarr.serviceConfig.ExecStartPre = + let + sonarr_config = pkgs.writeText "config.xml" '' + + info + False + 8989 + 9898 + + * + ${apikey} + None + BuiltIn + main + Sonarr + + ''; + in + [ + ''${pkgs.coreutils}/bin/install -D -m 777 ${sonarr_config} -T /var/lib/sonarr/.config/NzbDrone/config.xml'' + ]; + }; + exporterTest = '' + wait_for_unit("sonarr.service") + wait_for_open_port(8989) + wait_for_unit("prometheus-exportarr-sonarr-exporter.service") + wait_for_open_port(9708) + succeed("curl -sSf http://localhost:9708/metrics | grep sonarr_series_total") + ''; + }; + fastly = { exporterConfig = { enable = true; @@ -597,6 +637,8 @@ let rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7 zmqpubrawblock=tcp://127.0.0.1:28332 zmqpubrawtx=tcp://127.0.0.1:28333 + # https://github.com/lightningnetwork/lnd/issues/9163 + deprecatedrpc=warnings ''; extraCmdlineOptions = [ "-regtest" ]; }; @@ -1511,25 +1553,6 @@ let ''; }; - tor = { - exporterConfig = { - enable = true; - }; - metricProvider = { - # Note: this does not connect the test environment to the Tor network. - # Client, relay, bridge or exit connectivity are disabled by default. - services.tor.enable = true; - services.tor.settings.ControlPort = 9051; - }; - exporterTest = '' - wait_for_unit("tor.service") - wait_for_open_port(9051) - wait_for_unit("prometheus-tor-exporter.service") - wait_for_open_port(9130) - succeed("curl -sSf localhost:9130/metrics | grep 'tor_version{.\\+} 1'") - ''; - }; - unpoller = { nodeName = "unpoller"; exporterConfig.enable = true; @@ -1627,7 +1650,7 @@ let varnish = { exporterConfig = { enable = true; - instance = "/var/spool/varnish/varnish"; + instance = "/run/varnish/varnish"; group = "varnish"; }; metricProvider = { @@ -1636,6 +1659,7 @@ let ]; services.varnish = { enable = true; + stateDir = "/run/varnish/varnish"; config = '' vcl 4.0; backend default { diff --git a/nixos/tests/renovate.nix b/nixos/tests/renovate.nix index a30b5b3d60b9..deaac4faa5ce 100644 --- a/nixos/tests/renovate.nix +++ b/nixos/tests/renovate.nix @@ -58,12 +58,12 @@ import ./make-test-python.nix ( machine.succeed("git -C /tmp/kitty push origin") machine.succeed(f"echo '{accessToken}' > /etc/renovate-token") - machine.systemctl("start renovate.service") + machine.systemctl("start --wait renovate.service") machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'") machine.succeed("tea pulls merge --repo meow/kitty 1") - machine.systemctl("start renovate.service") + machine.systemctl("start --wait renovate.service") ''; } ) diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 0e5f60aa8be2..d13ed074b9c9 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -1,10 +1,14 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ( + { pkgs, ... }: { name = "retroarch"; - meta = with pkgs.lib; { maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; }; + meta = with pkgs.lib; { + maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; + }; - nodes.machine = { ... }: + nodes.machine = + { ... }: { imports = [ ./common/user-account.nix ]; @@ -23,11 +27,13 @@ import ./make-test-python.nix ({ pkgs, ... }: }; }; - testScript = { nodes, ... }: + testScript = + { nodes, ... }: let user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; - in '' + in + '' with subtest("Wait for login"): start_all() machine.wait_for_file("/tmp/xauth_*") @@ -35,7 +41,7 @@ import ./make-test-python.nix ({ pkgs, ... }: with subtest("Check RetroArch started"): machine.wait_until_succeeds("pgrep retroarch") - machine.wait_for_window("^RetroArch ") + machine.wait_for_window("^RetroArch") with subtest("Check configuration created"): machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg") @@ -46,4 +52,5 @@ import ./make-test-python.nix ({ pkgs, ... }: ) machine.screenshot("screen") ''; - }) + } +) diff --git a/nixos/tests/swapspace.nix b/nixos/tests/swapspace.nix new file mode 100644 index 000000000000..ab0174629eb8 --- /dev/null +++ b/nixos/tests/swapspace.nix @@ -0,0 +1,69 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + { + name = "swapspace"; + + meta = with pkgs.lib.maintainers; { + maintainers = [ + Luflosi + phanirithvij + ]; + }; + + nodes.machine = { + virtualisation.memorySize = 512; + + services.swapspace = { + enable = true; + extraArgs = [ "-v" ]; + settings = { + # test outside /var/lib/swapspace + swappath = "/swamp"; + cooldown = 1; + }; + }; + + swapDevices = lib.mkOverride 0 [ + { + size = 127; + device = "/root/swapfile"; + } + ]; + boot.kernel.sysctl."vm.swappiness" = 60; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("swapspace.service") + machine.wait_for_unit("root-swapfile.swap") + + swamp = False + with subtest("swapspace works"): + machine.execute("mkdir /root/memfs") + machine.execute("mount -o size=2G -t tmpfs none /root/memfs") + i = 0 + while i < 14: + print(machine.succeed("free -h")) + out = machine.succeed("sh -c 'swapon --show --noheadings --raw --bytes | grep /root/swapfile'") + row = out.split(' ') + # leave 1MB free to not get killed by oom + freebytes=int(row[2]) - int(row[3]) - 1*1024*1024 + machine.succeed(f"dd if=/dev/random of=/root/memfs/{i} bs={freebytes} count=1") + machine.sleep(1) + out = machine.succeed("swapon --show") + print(out) + swamp = "/swamp" in out + if not swamp: + i += 1 + else: + print("*"*10, "SWAPED", "*"*10) + machine.succeed("rm -f /root/memfs/*") + break + + print(machine.succeed("swapspace -e -s /swamp")) + assert "/swamp" not in machine.execute("swapon --show") + assert swamp + ''; + } +) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index e00c22b81682..a55155579b4b 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -53,11 +53,8 @@ in { environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; - # For boot/switch testing - system.build.installBootLoader = lib.mkForce (pkgs.writeShellScript "install-dummy-loader" '' - echo "installing dummy bootloader" - touch /tmp/bootloader-installed - ''); + # Test that no boot loader still switches, e.g. in the ISO + boot.loader.grub.enable = false; specialisation = rec { brokenInitInterface.configuration.config.system.extraSystemBuilderCmds = '' @@ -596,6 +593,19 @@ in { imports = [ slice.configuration ]; systemd.slices.testslice.sliceConfig.MemoryMax = lib.mkForce null; }; + + dbusReload.configuration = { config, ... }: let + dbusService = { + "dbus" = "dbus"; + "broker" = "dbus-broker"; + }.${config.services.dbus.implementation}; + in { + # We want to make sure that stc catches this as a reload, + # not a restart. + systemd.services.${dbusService}.restartTriggers = [ + (pkgs.writeText "dbus-reload-dummy" "dbus reload dummy") + ]; + }; }; }; @@ -672,22 +682,18 @@ in { "${stderrRunner} ${otherSystem}/bin/switch-to-configuration test" ) + boot_loader_text = "Warning: do not know how to make this configuration bootable; please enable a boot loader." with subtest("actions"): # boot action - machine.fail("test -f /tmp/bootloader-installed") out = switch_to_specialisation("${machine}", "simpleService", action="boot") - assert_contains(out, "installing dummy bootloader") + assert_contains(out, boot_loader_text) assert_lacks(out, "activating the configuration...") # good indicator of a system activation - machine.succeed("test -f /tmp/bootloader-installed") - machine.succeed("rm /tmp/bootloader-installed") # switch action - machine.fail("test -f /tmp/bootloader-installed") out = switch_to_specialisation("${machine}", "", action="switch") - assert_contains(out, "installing dummy bootloader") + assert_contains(out, boot_loader_text) assert_contains(out, "activating the configuration...") # good indicator of a system activation - machine.succeed("test -f /tmp/bootloader-installed") # test and dry-activate actions are tested further down below @@ -749,7 +755,7 @@ in { out = switch_to_specialisation("${machine}", "") assert_contains(out, "stopping the following units: test.mount\n") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: ${dbusService}\n") + assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -757,7 +763,7 @@ in { out = switch_to_specialisation("${machine}", "storeMountModified") assert_lacks(out, "stopping the following units:") assert_contains(out, "NOT restarting the following changed units: -.mount") - assert_contains(out, "reloading the following units: ${dbusService}\n") + assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -768,7 +774,7 @@ in { out = switch_to_specialisation("${machine}", "swap") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: ${dbusService}\n") + assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: swapfile.swap") @@ -777,7 +783,7 @@ in { assert_contains(out, "stopping swap device: /swapfile") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: ${dbusService}\n") + assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -795,10 +801,10 @@ in { # Start a simple service out = switch_to_specialisation("${machine}", "simpleService") - assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader + assert_lacks(out, boot_loader_text) # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: ${dbusService}\n") # huh + assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") @@ -872,10 +878,10 @@ in { # Ensure the service can be started when the activation script isn't in toplevel # This is a lot like "Start a simple service", except activation-only deps could be gc-ed out = run_switch("${nodes.machine.specialisation.simpleServiceSeparateActivationScript.configuration.system.build.separateActivationScript}/bin/switch-to-configuration"); - assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader + assert_lacks(out, boot_loader_text) # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: ${dbusService}\n") # huh + assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") @@ -1429,5 +1435,15 @@ in { assert_lacks(out, "the following new units were started:") machine.succeed("systemctl start testservice.service") machine.succeed("echo 1 > /proc/sys/vm/panic_on_oom") # disallow OOMing + + with subtest("dbus reloads"): + out = switch_to_specialisation("${machine}", "") + out = switch_to_specialisation("${machine}", "dbusReload") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: ${dbusService}\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") ''; }) diff --git a/nixos/tests/timescaledb.nix b/nixos/tests/timescaledb.nix deleted file mode 100644 index 8ee788daeac7..000000000000 --- a/nixos/tests/timescaledb.nix +++ /dev/null @@ -1,93 +0,0 @@ -# mostly copied from ./postgresql.nix as it seemed unapproriate to -# test additional extensions for postgresql there. - -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - -let - postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION timescaledb; - CREATE EXTENSION timescaledb_toolkit; - - CREATE TABLE sth ( - time TIMESTAMPTZ NOT NULL, - value DOUBLE PRECISION - ); - - SELECT create_hypertable('sth', 'time'); - - INSERT INTO sth (time, value) VALUES - ('2003-04-12 04:05:06 America/New_York', 1.0), - ('2003-04-12 04:05:07 America/New_York', 2.0), - ('2003-04-12 04:05:08 America/New_York', 3.0), - ('2003-04-12 04:05:09 America/New_York', 4.0), - ('2003-04-12 04:05:10 America/New_York', 5.0) - ; - - WITH t AS ( - SELECT - time_bucket('1 day'::interval, time) AS dt, - stats_agg(value) AS stats - FROM sth - GROUP BY time_bucket('1 day'::interval, time) - ) - SELECT - average(stats) - FROM t; - ''; - make-postgresql-test = postgresql-name: postgresql-package: makeTest { - name = postgresql-name; - meta = with pkgs.lib.maintainers; { - maintainers = [ typetetris ]; - }; - - nodes.machine = { ... }: - { - services.postgresql = { - enable = true; - package = postgresql-package; - extraPlugins = ps: with ps; [ - timescaledb - timescaledb_toolkit - ]; - settings = { shared_preload_libraries = "timescaledb, timescaledb_toolkit"; }; - }; - }; - - testScript = '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"): - machine.succeed( - "sudo -u postgres psql -f ${test-sql}" - ) - - machine.fail(check_count("SELECT * FROM sth;", 3)) - machine.succeed(check_count("SELECT * FROM sth;", 5)) - machine.fail(check_count("SELECT * FROM sth;", 4)) - - machine.shutdown() - ''; - - }; - applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "14") postgresql-versions; -in -mapAttrs' - (name: package: { - inherit name; - value = make-postgresql-test name package; - }) - applicablePostgresqlVersions diff --git a/nixos/tests/timidity/basic.nix b/nixos/tests/timidity/basic.nix new file mode 100644 index 000000000000..4bbbac8fbc6c --- /dev/null +++ b/nixos/tests/timidity/basic.nix @@ -0,0 +1,20 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + { + + name = "timidity"; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.timidity ]; + }; + + testScript = '' + start_all () + + ## TiMidity++ is around. + machine.succeed("command -v timidity") + ''; + } +) diff --git a/nixos/tests/timidity/default.nix b/nixos/tests/timidity/default.nix new file mode 100644 index 000000000000..8e136a9721e6 --- /dev/null +++ b/nixos/tests/timidity/default.nix @@ -0,0 +1,4 @@ +inputs: { + basic = import ./basic.nix inputs; + with-vorbis = import ./with-vorbis.nix inputs; +} diff --git a/nixos/tests/timidity/tam-lin.midi b/nixos/tests/timidity/tam-lin.midi new file mode 100644 index 000000000000..38560e1ade44 Binary files /dev/null and b/nixos/tests/timidity/tam-lin.midi differ diff --git a/nixos/tests/timidity/with-vorbis.nix b/nixos/tests/timidity/with-vorbis.nix new file mode 100644 index 000000000000..db7d23a8c9c0 --- /dev/null +++ b/nixos/tests/timidity/with-vorbis.nix @@ -0,0 +1,40 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + { + + name = "timidity-with-vorbis"; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + (timidity.override { enableVorbis = true; }) + ffmpeg # # for `ffprobe` + ]; + }; + + testScript = '' + import json + + start_all() + + ## TiMidity++ is around and it claims to support Ogg Vorbis. + machine.succeed("command -v timidity") + machine.succeed("timidity --help | grep 'Ogg Vorbis'") + + ## TiMidity++ manages to process a MIDI input and produces an Ogg Vorbis + ## output file. NOTE: the `timidity` CLI succeeds even when the input file + ## does not exist; hence our test for the output file's existence. + machine.succeed("cp ${./tam-lin.midi} tam-lin.midi") + machine.succeed("timidity -Ov tam-lin.midi && test -e tam-lin.ogg") + + ## The output file has the expected characteristics. + metadata_as_text = machine.succeed("ffprobe -show_format -print_format json -i tam-lin.ogg") + metadata = json.loads(metadata_as_text) + assert metadata['format']['format_name'] == 'ogg', \ + f"expected 'format_name' to be 'ogg', got '{metadata['format']['format_name']}'" + assert 37 <= float(metadata['format']['duration']) <= 38, \ + f"expected 'duration' to be between 37s and 38s, got {metadata['format']['duration']}s" + ''; + } +) diff --git a/nixos/tests/tsja.nix b/nixos/tests/tsja.nix deleted file mode 100644 index f34358ff3f5f..000000000000 --- a/nixos/tests/tsja.nix +++ /dev/null @@ -1,32 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : { - name = "tsja"; - meta = { - maintainers = with lib.maintainers; [ chayleaf ]; - }; - - nodes = { - master = - { config, ... }: - - { - services.postgresql = { - enable = true; - extraPlugins = ps: with ps; [ - tsja - ]; - }; - }; - }; - - testScript = '' - start_all() - master.wait_for_unit("postgresql") - master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql") - # make sure "日本語" is parsed as a separate lexeme - master.succeed(""" - sudo -u postgres \\ - psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\ - | grep "{日本語}" - """) - ''; -}) diff --git a/nixos/tests/varnish.nix b/nixos/tests/varnish.nix index 76cea1ada547..b7cb79a71cb0 100644 --- a/nixos/tests/varnish.nix +++ b/nixos/tests/varnish.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let in { name = "varnish"; meta = { - maintainers = lib.teams.helsinki-systems.members; + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/victoriametrics.nix b/nixos/tests/victoriametrics.nix index 5e364b67bf87..e45d0a30f3a6 100644 --- a/nixos/tests/victoriametrics.nix +++ b/nixos/tests/victoriametrics.nix @@ -1,33 +1,41 @@ -# This test runs influxdb and checks if influxdb is up and running +# This test runs victoriametrics and checks if victoriametrics is able to write points and run simple query -import ./make-test-python.nix ({ pkgs, ...} : { - name = "victoriametrics"; - meta = with pkgs.lib.maintainers; { - maintainers = [ yorickvp ]; - }; - - nodes = { - one = { ... }: { - services.victoriametrics.enable = true; +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "victoriametrics"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + yorickvp + ryan4yin + ]; }; - }; - testScript = '' - start_all() + nodes = { + one = + { ... }: + { + services.victoriametrics.enable = true; + }; + }; - one.wait_for_unit("victoriametrics.service") + testScript = '' + start_all() - # write some points and run simple query - out = one.succeed( - "curl -f -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'" - ) - cmd = ( - """curl -f -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'""" - ) - # data takes a while to appear - one.wait_until_succeeds(f"[[ $({cmd} | wc -l) -ne 0 ]]") - out = one.succeed(cmd) - assert '"values":[123]' in out - assert '"values":[1.23]' in out - ''; -}) + one.wait_for_unit("victoriametrics.service") + + # write some points and run simple query + out = one.succeed( + "curl -f -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'" + ) + cmd = ( + """curl -f -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'""" + ) + # data takes a while to appear + one.wait_until_succeeds(f"[[ $({cmd} | wc -l) -ne 0 ]]") + out = one.succeed(cmd) + assert '"values":[123]' in out + assert '"values":[1.23]' in out + ''; + } +) diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 278f2308cc16..305f931d4df1 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -28,7 +28,7 @@ in { networking.interfaces.eth1.ipv4.addresses = [ { address = serverAddress; prefixLength = 24; } ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; - virtualisation.additionalPaths = with pkgs; [ patchelf bintools stdenv.cc.cc.lib ]; + virtualisation.additionalPaths = with pkgs; [ patchelf bintools (lib.getLib stdenv.cc.cc) ]; }; client = { ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix index 8004afd93c05..94a63fbfb9c1 100644 --- a/nixos/tests/web-apps/immich.nix +++ b/nixos/tests/web-apps/immich.nix @@ -31,21 +31,30 @@ import ../make-test-python.nix ( machine.succeed("curl --fail http://localhost:2283/") machine.succeed(""" - curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:2283/api/auth/admin-sign-up + curl -f --json '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' http://localhost:2283/api/auth/admin-sign-up """) res = machine.succeed(""" - curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:2283/api/auth/login + curl -f --json '{ "email": "test@example.com", "password": "admin" }' http://localhost:2283/api/auth/login """) token = json.loads(res)['accessToken'] res = machine.succeed(""" - curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:2283/api/api-keys + curl -f -H 'Cookie: immich_access_token=%s' --json '{ "name": "API Key", "permissions": ["all"] }' http://localhost:2283/api/api-keys """ % token) key = json.loads(res)['secret'] machine.succeed(f"immich login http://localhost:2283/api {key}") res = machine.succeed("immich server-info") print(res) + + machine.succeed(""" + curl -f -X PUT -H 'Cookie: immich_access_token=%s' --json '{ "command": "start" }' http://localhost:2283/api/jobs/backupDatabase + """ % token) + res = machine.succeed(""" + curl -f -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/jobs + """ % token) + assert json.loads(res)["backupDatabase"]["jobCounts"]["active"] == 1 + machine.wait_until_succeeds("ls /var/lib/immich/backups/*.sql.gz") ''; } ) diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix deleted file mode 100644 index 45daafa88d79..000000000000 --- a/pkgs/applications/audio/ashuffle/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, meson -, ninja -, libmpdclient -, yaml-cpp -, darwin -}: - -stdenv.mkDerivation rec { - pname = "ashuffle"; - version = "3.14.8"; - - src = fetchFromGitHub { - owner = "joshkunz"; - repo = "ashuffle"; - rev = "v${version}"; - hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E="; - fetchSubmodules = true; - }; - - dontUseCmakeConfigure = true; - nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ libmpdclient yaml-cpp ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; - - mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; - - meta = with lib; { - homepage = "https://github.com/joshkunz/ashuffle"; - description = "Automatic library-wide shuffle for mpd"; - maintainers = [ maintainers.tcbravo ]; - platforms = platforms.unix; - license = licenses.mit; - mainProgram = "ashuffle"; - }; -} diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 00764831c2de..deed9e3684ad 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "audacious"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "audacious-media-player"; repo = "audacious"; rev = "${pname}-${version}"; - hash = "sha256-Bz/OI38+IFTHlBH3p2NTzSj8YD/7Xd4JeWpHgCSpMXw="; + hash = "sha256-Vh39uY15Pj2TbPk8gU55YykhFf5ytSUxN2gJ0VlC3tQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index 429d0bce74c3..53026e3fa267 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { pname = "audacious-plugins"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "audacious-media-player"; repo = "audacious-plugins"; rev = "${pname}-${version}"; - hash = "sha256-F2kcGc6VCaBsL5Zx7qtZjPvqzaxmR87Q9LTFEU+nqmo="; + hash = "sha256-fA7xB04WLlleLIBDEZOVqDQguKAXtTsJoedQ9A/ZHQg="; }; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 77ee141ef070..419a53006ef1 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -17,14 +17,14 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; stdenv.mkDerivation (finalAttrs: { pname = "bambootracker"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rMYs2jixzoMGem9lxAjDMbFOMrnK8BLFjZIagdZk/Ok="; + hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g="; }; postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' @@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: { qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" + ] ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [ + # Clang is extra-strict about some deprecations + # Latest Qt6 deprecated QCheckBox::stateChanged(int) + "CONFIG+=no_warnings_are_errors" ]; postConfigure = "make qmake_all"; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 71243f677460..2bc9a28b961f 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor (lib.getLib stdenv.cc.cc) ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 6e0643b270d1..efbeb091e210 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxkbcommon pipewire pulseaudio - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 0ab023e2300c..2c5911cfda0e 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pango pipewire pulseaudio - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) vulkan-loader xcb-imdkit xcbutil diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix deleted file mode 100644 index a9ce19cfdb81..000000000000 --- a/pkgs/applications/audio/cantata/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qtbase -, qtsvg -, qttools -, perl - - # Cantata doesn't build with cdparanoia enabled so we disable that - # default for now until I (or someone else) figure it out. -, withCdda ? false -, cdparanoia -, withCddb ? false -, libcddb -, withLame ? false -, lame -, withMusicbrainz ? false -, libmusicbrainz5 - -, withTaglib ? true -, taglib -, taglib_extras -, withHttpStream ? true -, qtmultimedia -, withReplaygain ? true -, ffmpeg -, speex -, mpg123 -, withMtp ? true -, libmtp -, withOnlineServices ? true -, withDevices ? true -, udisks2 -, withDynamic ? true -, withHttpServer ? true -, withLibVlc ? false -, libvlc -, withStreams ? true -}: - -# Inter-dependencies. -assert withCddb -> withCdda && withTaglib; -assert withCdda -> withCddb && withMusicbrainz; -assert withLame -> withCdda && withTaglib; -assert withMtp -> withTaglib; -assert withMusicbrainz -> withCdda && withTaglib; -assert withOnlineServices -> withTaglib; -assert withReplaygain -> withTaglib; -assert withLibVlc -> withHttpStream; - -let - fstat = x: fn: - "-DENABLE_${fn}=${if x then "ON" else "OFF"}"; - - withUdisks = (withTaglib && withDevices); - - options = [ - { names = [ "CDDB" ]; enable = withCddb; pkgs = [ libcddb ]; } - { names = [ "CDPARANOIA" ]; enable = withCdda; pkgs = [ cdparanoia ]; } - { names = [ "DEVICES_SUPPORT" ]; enable = withDevices; pkgs = [ ]; } - { names = [ "DYNAMIC" ]; enable = withDynamic; pkgs = [ ]; } - { names = [ "FFMPEG" "MPG123" "SPEEXDSP" ]; enable = withReplaygain; pkgs = [ ffmpeg speex mpg123 ]; } - { names = [ "HTTPS_SUPPORT" ]; enable = true; pkgs = [ ]; } - { names = [ "HTTP_SERVER" ]; enable = withHttpServer; pkgs = [ ]; } - { names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qtmultimedia ]; } - { names = [ "LAME" ]; enable = withLame; pkgs = [ lame ]; } - { names = [ "LIBVLC" ]; enable = withLibVlc; pkgs = [ libvlc ]; } - { names = [ "MTP" ]; enable = withMtp; pkgs = [ libmtp ]; } - { names = [ "MUSICBRAINZ" ]; enable = withMusicbrainz; pkgs = [ libmusicbrainz5 ]; } - { names = [ "ONLINE_SERVICES" ]; enable = withOnlineServices; pkgs = [ ]; } - { names = [ "STREAMS" ]; enable = withStreams; pkgs = [ ]; } - { names = [ "TAGLIB" "TAGLIB_EXTRAS" ]; enable = withTaglib; pkgs = [ taglib taglib_extras ]; } - { names = [ "UDISKS2" ]; enable = withUdisks; pkgs = [ udisks2 ]; } - ]; - -in -mkDerivation rec { - pname = "cantata"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "CDrummond"; - repo = "cantata"; - rev = "v${version}"; - sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw="; - }; - - patches = [ - # Cantata wants to check if perl is in the PATH at runtime, but we - # patchShebangs the playlists scripts, making that unnecessary (perl will - # always be available because it's a dependency) - ./dont-check-for-perl-in-PATH.diff - ]; - - postPatch = '' - patchShebangs playlists - ''; - - buildInputs = [ - qtbase - qtsvg - (perl.withPackages (ppkgs: with ppkgs; [ URI ])) - ] - ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options)); - - nativeBuildInputs = [ cmake pkg-config qttools ]; - - cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options); - - meta = with lib; { - description = "Graphical client for MPD"; - mainProgram = "cantata"; - homepage = "https://github.com/cdrummond/cantata"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ peterhoeg ]; - # Technically, Cantata should run on Darwin/Windows so if someone wants to - # bother figuring that one out, be my guest. - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix deleted file mode 100644 index f77b03daac78..000000000000 --- a/pkgs/applications/audio/clerk/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, rofi -, tmux -, fzf -, mpc-cli -, perl -, util-linux -, libnotify -, perlPackages -}: - -stdenv.mkDerivation { - pname = "clerk"; - version = "unstable-2023-10-07"; - - src = fetchFromGitHub { - owner = "carnager"; - repo = "clerk"; - rev = "907138d8fc2b1709fb49d062d0b663a48eb210bd"; - hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk="; - }; - - postPatch = '' - substituteInPlace clerk_rating_client.service \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = with perlPackages; [ - perl - DataMessagePack - DataSectionSimple - ConfigSimple - TryTiny - IPCRun - HTTPDate - FileSlurper - ArrayUtils - NetMPD - ]; - - dontBuild = true; - - strictDeps = true; - - installPhase = '' - runHook preInstall - - install -D clerk.pl $out/bin/clerk - install -D clerk_rating_client $out/bin/clerk_rating_client - install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service - runHook postInstall - ''; - - postFixup = let - binPath = lib.makeBinPath [ - libnotify - mpc-cli - rofi - tmux - fzf - util-linux - ]; - in - '' - wrapProgram $out/bin/clerk --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}" - wrapProgram $out/bin/clerk_rating_client --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}" - ''; - - meta = with lib; { - description = "MPD client based on rofi/fzf"; - homepage = "https://github.com/carnager/clerk"; - license = licenses.mit; - maintainers = with maintainers; [ anderspapitto rewine ]; - mainProgram = "clerk"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index bef7d46a53e4..2ca612841cc3 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -92,13 +92,13 @@ in stdenv.mkDerivation rec { pname = "cmus"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; rev = "v${version}"; - hash = "sha256-kUJC+ORLkYD57mPL/1p5VCm9yiNzVdOZhxp7sVP6oMw="; + hash = "sha256-8hgibGtkiwzenMI9YImIApRmw2EzTwE6RhglALpUkp4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix deleted file mode 100644 index 1da0b6ee0d22..000000000000 --- a/pkgs/applications/audio/distrho/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, fetchFromGitHub -, fftwFloat -, freetype -, libGL -, libX11 -, libXcursor -, libXext -, libXrender -, meson -, ninja -, pkg-config -}: - -let rpathLibs = [ - fftwFloat -]; -in -stdenv.mkDerivation rec { - pname = "distrho-ports"; - version = "2021-03-15"; - - src = fetchFromGitHub { - owner = "DISTRHO"; - repo = "DISTRHO-Ports"; - rev = version; - sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; - }; - - nativeBuildInputs = [ pkg-config meson ninja ]; - - buildInputs = rpathLibs ++ [ - alsa-lib - freetype - libGL - libX11 - libXcursor - libXext - libXrender - ]; - - postFixup = '' - for file in \ - $out/lib/lv2/vitalium.lv2/vitalium.so \ - $out/lib/vst/vitalium.so \ - $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so - do - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file - done - ''; - - meta = with lib; { - homepage = "http://distrho.sourceforge.net/ports"; - description = "Linux audio plugins and LV2 ports"; - longDescription = '' - Includes: - arctican-function - arctican-pilgrim - dexed - drowaudio-distortion - drowaudio-distortionshaper - drowaudio-flanger - drowaudio-reverb - drowaudio-tremolo - drumsynth - easySSP - eqinox - HiReSam - juce-opl - klangfalter - LUFSMeter - LUFSMeter-Multi - luftikus - obxd - pitchedDelay - refine - stereosourceseparation - swankyamp - tal-dub-3 - tal-filter - tal-filter-2 - tal-noisemaker - tal-reverb - tal-reverb-2 - tal-reverb-3 - tal-vocoder-2 - temper - vex - vitalium - wolpertinger - ''; - license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ]; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch b/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch index ed7a462d02c6..ebd13112e796 100644 --- a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch +++ b/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7065538..b2716e1 100644 +index 34f3094..b161ba8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ if (VCPKG) @@ -8,6 +8,6 @@ index 7065538..b2716e1 100644 -project("Easy Audio Sync" +project("easyaudiosync" - VERSION 1.1.1 + VERSION 1.1.2 DESCRIPTION "Audio library syncing and conversion utility" HOMEPAGE_URL "https://github.com/complexlogic/EasyAudioSync" diff --git a/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch b/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch deleted file mode 100644 index 523c1821a10f..000000000000 --- a/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e7befae..8689f13 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -43,11 +43,14 @@ configure_file("${PROJECT_SOURCE_DIR}/translations/languages.hpp.in" "${PROJECT_ - - # Make lupdate target for Qt 6 - if (${QT_VERSION} VERSION_GREATER_EQUAL "6") -- qt_add_lupdate(${EXECUTABLE_NAME} -+ qt_add_lupdate( - TS_FILES ${TS_FILES} "${PROJECT_SOURCE_DIR}/translations/source.ts" -+ SOURCE_TARGETS ${EXECUTABLE_NAME} - ) - endif () --qt_add_translation(QM_FILES "${TS_FILES}") -+qt_add_translations( -+ ${EXECUTABLE_NAME} -+) - foreach (FILE ${QM_FILES}) - get_filename_component(BASENAME ${FILE} NAME) - string(APPEND TRANSLATION_FILES " ${BASENAME}\n") diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix index 38fe6b15d937..b5f6a522ff5a 100644 --- a/pkgs/applications/audio/easyaudiosync/default.nix +++ b/pkgs/applications/audio/easyaudiosync/default.nix @@ -15,18 +15,17 @@ stdenv.mkDerivation rec { pname = "easyaudiosync"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "complexlogic"; repo = "EasyAudioSync"; rev = "v${version}"; - hash = "sha256-w98tj9BuixPhuDgwn74EYY0gvKH6kbfQmtg030RWRU0="; + hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc="; }; patches = [ ./0001-fix-project-name.patch - ./0002-fix-qt67-deprecated-methods.patch ./0003-fix-darwin-app.patch ./0004-force-qt6.patch ]; diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix deleted file mode 100644 index a1ac12d00757..000000000000 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, buildDotnetModule -, fetchFromGitHub -, fontconfig -, xorg -, libglvnd -, makeDesktopItem -, copyDesktopItems -, graphicsmagick -}: - -buildDotnetModule rec { - pname = "galaxy-buds-client"; - version = "4.5.4"; - - src = fetchFromGitHub { - owner = "ThePBone"; - repo = "GalaxyBudsClient"; - rev = version; - hash = "sha256-mmhXTtESjc8uNULc9zV2Qy/815BEEL7ybdnjArF2CXY="; - }; - - projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; - nugetDeps = ./deps.nix; - dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; - - nativeBuildInputs = [ - copyDesktopItems - graphicsmagick - ]; - - buildInputs = [ stdenv.cc.cc.lib fontconfig ]; - - runtimeDeps = [ - libglvnd - xorg.libSM - xorg.libICE - xorg.libX11 - ]; - - postFixup = '' - mkdir -p $out/share/icons/hicolor/256x256/apps/ - gm convert $src/GalaxyBudsClient/Resources/icon_white.ico $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png - ''; - - desktopItems = [ - (makeDesktopItem { - name = meta.mainProgram; - exec = meta.mainProgram; - icon = meta.mainProgram; - desktopName = meta.mainProgram; - genericName = "Galaxy Buds Client"; - comment = meta.description; - type = "Application"; - categories = [ "Settings" ]; - startupNotify = true; - }) - ]; - - meta = with lib; { - mainProgram = "GalaxyBudsClient"; - description = "Unofficial Galaxy Buds Manager for Windows and Linux"; - homepage = "https://github.com/ThePBone/GalaxyBudsClient"; - license = licenses.gpl3; - maintainers = [ maintainers.icy-thought ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/applications/audio/galaxy-buds-client/deps.nix deleted file mode 100644 index 1e72808d9068..000000000000 --- a/pkgs/applications/audio/galaxy-buds-client/deps.nix +++ /dev/null @@ -1,238 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.16"; sha256 = "1gsm421gzzymc6rys4sw4hds33grg2mwpnm5xpbhwfh4bnbfblg8"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.17"; sha256 = "05g761may9xa1n75lmzib5hknjk7k0nz453bmg2d5m0xxqw6yc13"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.17"; sha256 = "0k0xnbayplndc6xld98jdla8zv769aj5s285cpbdgm2dril0rywj"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.17"; sha256 = "0smxxr0b8585x0fq57y3jcaxpl5qyxmkr0c6pd83bsczk8p4rjfy"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { pname = "Config.Net"; version = "4.15.0"; sha256 = "0hsyma0r8hssz2h7bx38rr8ajx28x5ya2h4k665cbd65z3cs1di1"; }) - (fetchNuGet { pname = "Config.Net.Json"; version = "4.15.0"; sha256 = "1q6v4pj76h0hhn26ln4kc8vg75jm8jnlp1ssnrqzwxy88yf82z4h"; }) - (fetchNuGet { pname = "CS-Script.Core"; version = "1.4.2-preview"; sha256 = "0djliiixl3ncc1b29s9knal1ascg359na0pacsm73p98ad1f7pzh"; }) - (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.1"; sha256 = "1g5g7mnfr668hww9r84pfl04x0s44cq5ppykqg406a0lkdb2g8yp"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.1"; sha256 = "0z0fadsicysa77ji4fnjkaaqfpc0d1w7x9qlkq40kb3jg7xhsmyx"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.1"; sha256 = "15671jvv5j98rkv249nn1fchxcd9gq8b37iwjqbmijig3r4ir718"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) - (fetchNuGet { pname = "InputSimulatorCore"; version = "1.0.5"; sha256 = "1vfqhqjcrpzahhvv5kyh6pk6j5c06wd0b2831y31fbxpdkxhbs2p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) - (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.7"; sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.6.0"; sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.6.0"; sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.6.0"; sha256 = "0qbd995ip41x5mzyspl3asgj9w3fq3c6qsd0sj719aimqm1p57cd"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.6.0"; sha256 = "1gz5ik2vwjdsyl5im7b37j1s2a1vsmmgkhxwm93897cx6q1bpjyg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) - (fetchNuGet { pname = "NetSparkle.New"; version = "2.0.0-preview20210114001"; sha256 = "170czxvhh285rymajc28qk34lrg09nvl6ib5ldws8fwy917w4w2s"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) - (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.8.9"; sha256 = "1w6kcaifklym8fwlgs7dncjpkflcyf2vyrb5i0i0lxwglyygzpqb"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.17.0"; sha256 = "0gqldkxmvb0g4zsam102vk9yahdhydfzd765aq3fa8r1b8nz865d"; }) - (fetchNuGet { pname = "Sentry.Serilog"; version = "3.17.0"; sha256 = "1igf78dcz6c9bampb4vwdj798vqlk6m042j3cpfx469fxk9fkgcy"; }) - (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) - (fetchNuGet { pname = "Serilog"; version = "2.11.0-dev-01367"; sha256 = "1z9ddq1ym94dm8rx1x6m3mqzc424hvqfvn1zpcgm71q1p20psvx0"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1-dev-00876"; sha256 = "1s9m75hvaw4dilmgp3sdh7xb15v2mq2h252n9x76nvmw56ipsdnz"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; sha256 = "10byjmh2s0c13lmnzfw24qmr11kry9hg9y5fib3556y7759qwbqv"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.16"; sha256 = "06qf63bx6m18wbhvzfs89m5yl5s08spgg02gr7qy8j36r04k6cc5"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.1"; sha256 = "0r14s3zyn3cpic02j80xjh8x6dd8g671f9nfnng5zk1x497qdw3a"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.16"; sha256 = "0qp0vmknclaahf1aj8y2jl4xbaq30rf4ia55fpawxi25dfxsa4wy"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.16"; sha256 = "0c2hk7wgvd2lbc96jxnkcwmzbbdnwgnhh4km9ijb5248qkghs1b1"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.16"; sha256 = "0ra6svakyg5h6m19ww5yrxl85w8yi3v5vrzqgcnqlvzndk696cyf"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.1"; sha256 = "095vinsbb9pbphbhh7x7rxvs8a3b9w1nnz7gxn9bw5is01qnhgdm"; }) - (fetchNuGet { pname = "Trinet.Core.IO.Ntfs"; version = "4.1.1"; sha256 = "0a30xjmxjr6l8fdjivy70zsxk9p6qlgjs3g8h1q26jn40hpjbswr"; }) -] diff --git a/pkgs/applications/audio/grandorgue/darwin-fixes.patch b/pkgs/applications/audio/grandorgue/darwin-fixes.patch new file mode 100644 index 000000000000..f38a1dded2ec --- /dev/null +++ b/pkgs/applications/audio/grandorgue/darwin-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index d231e3d1..73f389a2 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -62,7 +62,7 @@ if(WIN32) + DEPENDS "${CMAKE_SOURCE_DIR}/resources/GrandOrgue.manifest") + LIST(APPEND DEPLIST "${RESOURCEDIR}/GOIcon.ico" "${RESOURCEDIR}/GrandOrgue.rc" "${RESOURCEDIR}/GrandOrgue.manifest") + elseif(APPLE) +- ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND iconutil -c icns --output "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR} DEPENDS ${GENERATED_ICONS}) ++ ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND png2icns "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png DEPENDS ${GENERATED_ICONS}) + INSTALL(FILES "${RESOURCEDIR}/GrandOrgue.icns" DESTINATION "${RESOURCEINSTDIR}") + LIST(APPEND DEPLIST "${RESOURCEDIR}/GrandOrgue.icns") + elseif(UNIX) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 771bef276221..7b3be4d9bb0d 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,22 +21,17 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.15.1-1"; + version = "3.15.2-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = "grandorgue"; rev = version; fetchSubmodules = true; - hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM="; + hash = "sha256-U0DAWCzhXqdL2klSFQjnLiWp7yTdw/n0dmNUJSAg/5c="; }; - postPatch = '' - substituteInPlace resources/CMakeLists.txt \ - --replace \ - "iconutil -c icns \''${GENERATED_ICONS_DIR}" \ - "png2icns \''${GENERATED_ICONS_DIR}/../GrandOrgue.icns \''${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png" \ - ''; + patches = [ ./darwin-fixes.patch ]; nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix deleted file mode 100644 index 45cf34588948..000000000000 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, alsa-lib, freetype, xorg, curl, libGL, libjack2, zenity -, pkg-config, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "helio-workstation"; - version = "3.13"; - - src = fetchFromGitHub { - owner = "helio-fm"; - repo = pname; - rev = version; - fetchSubmodules = true; - hash = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; - }; - - buildInputs = [ - alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 zenity - ]; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - - preBuild = '' - cd Projects/LinuxMakefile - substituteInPlace Makefile --replace alsa "alsa jack" - ''; - buildFlags = [ "CONFIG=Release64" ]; - - installPhase = '' - mkdir -p $out/bin - install -Dm755 build/helio $out/bin - wrapProgram $out/bin/helio --prefix PATH ":" ${zenity}/bin - - mkdir -p $out/share - cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share - substituteInPlace $out/share/applications/Helio.desktop \ - --replace "/usr/bin/helio" "$out/bin/helio" - ''; - - meta = with lib; { - description = "One music sequencer for all major platforms, both desktop and mobile"; - mainProgram = "helio"; - homepage = "https://helio.fm/"; - license = licenses.gpl3Only; - maintainers = [ maintainers.suhr ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index fa5a7b5e46a3..6e71620ad444 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libXext # libXext.so.6 alsa-lib # libasound.so.2 freetype # libfreetype.so.6 - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 ]; in '' patchelf \ diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix deleted file mode 100644 index c58c6831edf4..000000000000 --- a/pkgs/applications/audio/mpc/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, installShellFiles -, libiconv -, libmpdclient -, meson -, ninja -, pkg-config -, sphinx -}: - -stdenv.mkDerivation rec { - pname = "mpc"; - version = "0.34"; - - src = fetchFromGitHub { - owner = "MusicPlayerDaemon"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; - }; - - patches = [ - # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76) - (fetchpatch { - url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch"; - sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw="; - }) - ]; - - buildInputs = [ - libmpdclient - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - - nativeBuildInputs = [ - installShellFiles - meson - ninja - pkg-config - sphinx - ]; - - postInstall = '' - installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash - ''; - - postFixup = '' - rm $out/share/doc/mpc/contrib/mpc-completion.bash - ''; - - meta = with lib; { - homepage = "https://www.musicpd.org/clients/mpc/"; - description = "Minimalist command line interface to MPD"; - changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - mainProgram = "mpc"; - }; -} diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 6f28bf98a1b1..bd6513e4e4f7 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -50,27 +50,14 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8="; + sha256 = "sha256-bHpPhav9JBPkwJA9o+IFHRWbvxWnGkD1wHBHS4XJ/YE="; }; - patches = [ - # https://github.com/musescore/MuseScore/pull/24326 - (fetchpatch { - name = "fix-menubar-with-qt6.5+.patch"; - url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch"; - hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0="; - }) - (fetchpatch { - name = "fix-crash-accessing-uninitialized-properties.patch"; - url = "https://github.com/musescore/MuseScore/pull/24714.patch"; - hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA="; - }) - ]; cmakeFlags = [ "-DMUSE_APP_BUILD_MODE=release" diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix deleted file mode 100644 index 6db465c0d5ae..000000000000 --- a/pkgs/applications/audio/mympd/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libmpdclient -, openssl -, lua5_3 -, libid3tag -, flac -, pcre2 -, gzip -, perl -, jq -, nixosTests -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mympd"; - version = "18.0.0"; - - src = fetchFromGitHub { - owner = "jcorporation"; - repo = "myMPD"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-h88wqKwkxY/5uOU0SQp8vb4ri3Ndi3ezHPTDFJGVE2Q="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - gzip - perl - jq - ]; - preConfigure = '' - env MYMPD_BUILDDIR=$PWD/build ./build.sh createassets - ''; - buildInputs = [ - libmpdclient - openssl - lua5_3 - libid3tag - flac - pcre2 - ]; - - cmakeFlags = [ - # Otherwise, it tries to parse $out/etc/mympd.conf on startup. - "-DCMAKE_INSTALL_SYSCONFDIR=/etc" - # similarly here - "-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd" - ]; - hardeningDisable = [ - # causes redefinition of _FORTIFY_SOURCE - "fortify3" - ]; - # 5 tests out of 23 fail, probably due to the sandbox... - doCheck = false; - - passthru.tests = { inherit (nixosTests) mympd; }; - - meta = { - homepage = "https://jcorporation.github.io/myMPD"; - description = "Standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; - maintainers = [ lib.maintainers.doronbehar ]; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; - mainProgram = "mympd"; - }; -}) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix deleted file mode 100644 index 027d3880bd9d..000000000000 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - 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 (finalAttrs: { - pname = "pavucontrol"; - version = "6.0"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pulseaudio"; - repo = "pavucontrol"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-nxzFvD/KUevIJOw9jgcr0Hfvg7KiSOmTBfKN3jLu3Cg="; - }; - - buildInputs = [ - libpulseaudio - gtkmm4 - libsigcxx - (lib.optionals withLibcanberra libcanberra-gtk3) - json-glib - adwaita-icon-theme - libpressureaudio - ]; - - nativeBuildInputs = [ - pkg-config - intltool - wrapGAppsHook4 - meson - ninja - ]; - - mesonFlags = [ - "--prefix=${placeholder "out"}" - (lib.mesonBool "lynx" false) - ]; - - enableParallelBuilding = true; - - 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. - ''; - mainProgram = "pavucontrol"; - maintainers = with lib.maintainers; [ abbradar ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 908c667253d1..13b179331215 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -45,7 +45,7 @@ let ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 # libX11.so.6 xorg.libXext # libXext.so.6 alsa-lib # libasound.so.2 diff --git a/pkgs/applications/audio/psst/Cargo.lock b/pkgs/applications/audio/psst/Cargo.lock index 6ef92630caf9..b8a5524665aa 100644 --- a/pkgs/applications/audio/psst/Cargo.lock +++ b/pkgs/applications/audio/psst/Cargo.lock @@ -49,6 +49,12 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" 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" version = "0.9.1" @@ -250,7 +256,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.35", + "rustix 0.38.37", "slab", "tracing", "windows-sys 0.59.0", @@ -289,7 +295,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.35", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -316,7 +322,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.35", + "rustix 0.38.37", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -513,15 +519,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - [[package]] name = "blocking" version = "1.6.1" @@ -1011,24 +1008,24 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "1.0.2" +name = "directories" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1365,6 +1362,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1389,12 +1392,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futf" version = "0.1.5" @@ -2033,6 +2030,17 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.3.3" @@ -2246,9 +2254,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", "byteorder-lite", @@ -2269,9 +2277,9 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f" dependencies = [ "byteorder-lite", "quick-error", @@ -2290,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -2573,12 +2581,6 @@ dependencies = [ "libc", ] -[[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.3.8" @@ -2617,12 +2619,12 @@ dependencies = [ ] [[package]] -name = "lru-cache" -version = "0.1.2" +name = "lru" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "linked-hash-map", + "hashbrown 0.15.0", ] [[package]] @@ -2936,6 +2938,15 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "oauth2" version = "4.4.2" @@ -2965,40 +2976,6 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", -] - [[package]] name = "object" version = "0.36.4" @@ -3033,9 +3010,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "open" @@ -3048,6 +3025,12 @@ dependencies = [ "pathdiff", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-stream" version = "0.2.0" @@ -3337,15 +3320,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platform-dirs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e188d043c1a692985f78b5464853a263f1a27e5bd6322bad3a4078ee3c998a38" -dependencies = [ - "dirs-next", -] - [[package]] name = "png" version = "0.17.13" @@ -3385,7 +3359,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.35", + "rustix 0.38.37", "tracing", "windows-sys 0.59.0", ] @@ -3510,7 +3484,6 @@ dependencies = [ "aes", "audio_thread_priority", "byteorder", - "chrono", "cpal", "crossbeam-channel", "ctr", @@ -3537,6 +3510,7 @@ dependencies = [ "socks", "symphonia", "tempfile", + "time", "ureq", "url", "windows 0.58.0", @@ -3547,19 +3521,18 @@ name = "psst-gui" version = "0.1.0" dependencies = [ "crossbeam-channel", + "directories", "druid", "druid-enums", "druid-shell", "env_logger", - "fs_extra", - "image 0.25.2", + "image 0.25.4", "itertools 0.13.0", "log", - "lru-cache", + "lru", "once_cell", "open", "parking_lot", - "platform-dirs", "psst-core", "rand", "raw-window-handle", @@ -3573,7 +3546,6 @@ dependencies = [ "time-humanize", "ureq", "url", - "webbrowser", "winres", ] @@ -3765,9 +3737,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -3777,9 +3749,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -3788,9 +3760,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -3838,9 +3810,6 @@ name = "rgb" version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" -dependencies = [ - "bytemuck", -] [[package]] name = "ring" @@ -3894,9 +3863,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -4034,18 +4003,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -4054,9 +4023,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -4474,14 +4443,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.35", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -4554,7 +4523,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -5079,24 +5050,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webbrowser" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" -dependencies = [ - "block2", - "core-foundation", - "home", - "jni", - "log", - "ndk-context", - "objc2", - "objc2-foundation", - "url", - "web-sys", -] - [[package]] name = "webpki-roots" version = "0.25.4" diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index af5b7a51f999..24dad343fc54 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-10-07"; + version = "unstable-2024-10-24"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "38d1c75d59848c54cb88896a93e05da3c71c7df4"; - hash = "sha256-iMtrZ1Mto3j4lFXI2Sm2R85+m8LpR7V1WoJ3X5JyF60="; + rev = "02923198ba0e27b2b6271340cf57dd8ce109049b"; + hash = "sha256-gEK0yf37eREsI6kCIYTBlkkM6Fnjy0KGnd0XqcawGjU="; }; cargoLock = { diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch index edaf46af94ab..0e4f3c75a89e 100644 --- a/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -1,20 +1,22 @@ diff --git a/psst-core/build.rs b/psst-core/build.rs deleted file mode 100644 -index cac2c23..0000000 +index 4e899af..0000000 --- a/psst-core/build.rs +++ /dev/null -@@ -1,41 +0,0 @@ +@@ -1,43 +0,0 @@ +-use gix_config::File; -use std::{env, fs, io::Write}; +-use time::OffsetDateTime; - -fn main() { - let outdir = env::var("OUT_DIR").unwrap(); - let outfile = format!("{}/build-time.txt", outdir); - - let mut fh = fs::File::create(outfile).unwrap(); -- write!(fh, r#""{}""#, chrono::Local::now()).ok(); +- let now = OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); +- write!(fh, r#""{}""#, now).ok(); - -- let git_config = -- gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!"); +- let git_config = File::from_git_dir("../.git/".into()).expect("Git Config not found!"); - // Get Git's 'Origin' URL - let mut remote_url = git_config - .raw_value("remote.origin.url") @@ -46,7 +48,7 @@ index cac2c23..0000000 - write!(file, r#""{}""#, remote_url).ok(); -} diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs -index 2faa317..7d7501d 100644 +index 2faa317..b890a2d 100644 --- a/psst-core/src/lib.rs +++ b/psst-core/src/lib.rs @@ -2,9 +2,9 @@ @@ -56,7 +58,7 @@ index 2faa317..7d7501d 100644 -pub const GIT_VERSION: &str = git_version!(); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -+pub const GIT_VERSION: &str = "38d1c75d59848c54cb88896a93e05da3c71c7df4"; ++pub const GIT_VERSION: &str = "02923198ba0e27b2b6271340cf57dd8ce109049b"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/applications/audio/pwvucontrol/Cargo.lock deleted file mode 100644 index d3df103deeca..000000000000 --- a/pkgs/applications/audio/pwvucontrol/Cargo.lock +++ /dev/null @@ -1,1302 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "annotate-snippets" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "annotate-snippets", - "bitflags", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bitmaps" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "cairo-rs" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2755ff20a1d93490d26ba33a6f092a38a508398a5320df5d4b3014fcccce9410" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cookie-factory" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gio" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys", -] - -[[package]] -name = "glib" -version = "0.19.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "log", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.19.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "gtk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "imbl" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb" -dependencies = [ - "bitmaps", - "imbl-sized-chunks", - "rand_core", - "rand_xoshiro", - "version_check", -] - -[[package]] -name = "imbl-sized-chunks" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" -dependencies = [ - "bitmaps", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libadwaita" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" -dependencies = [ - "cfg-if", - "windows-targets", -] - -[[package]] -name = "libspa" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" -dependencies = [ - "bitflags", - "cc", - "convert_case", - "cookie-factory", - "libc", - "libspa-sys", - "nix", - "nom", - "system-deps", -] - -[[package]] -name = "libspa-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" -dependencies = [ - "bindgen", - "cc", - "system-deps", -] - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags", - "cfg-if", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "pango" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pipewire" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" -dependencies = [ - "anyhow", - "bitflags", - "libc", - "libspa", - "libspa-sys", - "nix", - "once_cell", - "pipewire-sys", - "thiserror", -] - -[[package]] -name = "pipewire-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" -dependencies = [ - "bindgen", - "libspa-sys", - "system-deps", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pwvucontrol" -version = "0.4.5" -dependencies = [ - "anyhow", - "futures", - "gettext-rs", - "glib", - "gtk4", - "imbl", - "libadwaita", - "log", - "pipewire", - "wireplumber", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core", -] - -[[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", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[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.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "syn" -version = "2.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.14", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.13", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" -dependencies = [ - "memchr", -] - -[[package]] -name = "wireplumber" -version = "0.1.0" -source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "libspa-sys", - "pipewire-sys", - "pkg-config", - "semver", - "wireplumber-sys", -] - -[[package]] -name = "wireplumber-sys" -version = "0.1.0" -source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "libspa-sys", - "pipewire-sys", - "system-deps", -] - -[[package]] -name = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/applications/audio/pwvucontrol/default.nix deleted file mode 100644 index 2726f1bedcab..000000000000 --- a/pkgs/applications/audio/pwvucontrol/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchFromGitLab -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 -, cairo -, gdk-pixbuf -, glib -, gtk4 -, libadwaita -, pango -, pipewire -, wireplumber -}: - -let - wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { - version = "0.4.17"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "wireplumber"; - rev = version; - hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "pwvucontrol"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "saivert"; - repo = "pwvucontrol"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-s4sop1qmqPVOGX7erRfClUUcixNhi+wUY5MXSmv+zVk="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "wireplumber-0.1.0" = "sha256-ocagwmjyhfx6n/9xKxF2vhylqy2HunKQRx3eMo6m/l4="; - }; - }; - - nativeBuildInputs = [ - cargo - desktop-file-utils - meson - ninja - pkg-config - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - cairo - gdk-pixbuf - glib - gtk4 - libadwaita - pango - pipewire - wireplumber_0_4 - ]; - - meta = { - description = "Pipewire Volume Control"; - homepage = "https://github.com/saivert/pwvucontrol"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - figsoda - Guanran928 - johnrtitor - ]; - mainProgram = "pwvucontrol"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix deleted file mode 100644 index 6e9edbebf030..000000000000 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchgit -, autoreconfHook -, lv2 -, pkg-config -, qt5 -, alsa-lib -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "qmidiarp"; - version = "0.7.0"; - - src = fetchgit { - url = "https://git.code.sf.net/p/qmidiarp/code"; - sha256 = "sha256-oUdgff2xsXTis+C2Blv0tspWNIMGSODrKxWDpMDYnEU="; - rev = "qmidiarp-${version}"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - qt5.wrapQtAppsHook - ]; - - buildInputs = [ - alsa-lib - lv2 - libjack2 - ] ++ (with qt5; [ - qttools - ]); - - meta = with lib; { - description = "Advanced MIDI arpeggiator"; - mainProgram = "qmidiarp"; - longDescription = '' - An advanced MIDI arpeggiator, programmable step sequencer and LFO for Linux. - It can hold any number of arpeggiator, sequencer, or LFO modules running in - parallel. - ''; - - homepage = "https://qmidiarp.sourceforge.net"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ sjfloat ]; - }; -} diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index a575cd57978a..d1accf5c66d2 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-FOoqnJeh29J0clsqZ+wbhQmsaybrAbIqgeB7m/7Q+3M="; + hash = "sha256-SHMPmZMAlC9L5EAecaZNB0pWnq0heeD8bcbhKeI+YOo="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix deleted file mode 100644 index 5444ffb4a178..000000000000 --- a/pkgs/applications/audio/r128gain/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, fetchFromGitHub -, gitUpdater -, substituteAll -, ffmpeg -, python3Packages -, sox -}: - -python3Packages.buildPythonApplication rec { - pname = "r128gain"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "desbma"; - repo = "r128gain"; - rev = version; - sha256 = "0w2i2szajv1vcmc96w0fczdr8xc28ijcf1gdg180f21gi6yh96sc"; - }; - - patches = [ - (substituteAll { - src = ./ffmpeg-location.patch; - inherit ffmpeg; - }) - ]; - - propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; - nativeCheckInputs = with python3Packages; [ requests sox ]; - - # Testing downloads media files for testing, which requires the - # sandbox to be disabled. - doCheck = false; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; - mainProgram = "r128gain"; - homepage = "https://github.com/desbma/r128gain"; - license = licenses.lgpl2Plus; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/applications/audio/r128gain/ffmpeg-location.patch deleted file mode 100644 index c01f115c1d6d..000000000000 --- a/pkgs/applications/audio/r128gain/ffmpeg-location.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- i/r128gain/__init__.py -+++ w/r128gain/__init__.py -@@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None): - Example: 0x3040100 for FFmpeg 3.4.1 - """ - r = collections.OrderedDict() -- cmd = (ffmpeg_path or "ffmpeg", "-version") -+ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version") - output = subprocess.run(cmd, - check=True, - stdout=subprocess.PIPE, -@@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin - os.devnull, - **additional_ffmpeg_args, - f="null").global_args("-hide_banner", "-nostats"), -- cmd=ffmpeg_path or "ffmpeg") -+ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg") - - # run - logger().debug(cmd_to_string(cmd)) -@@ -740,7 +740,7 @@ def cl_main(): - help="Maximum number of tracks to scan in parallel. If not specified, autodetect CPU count") - arg_parser.add_argument("-f", - "--ffmpeg-path", -- default=shutil.which("ffmpeg"), -+ default="@ffmpeg@/bin/ffmpeg", - help="""Full file path of ffmpeg executable (only needed if not in PATH). - If not specified, autodetect""") - arg_parser.add_argument("-d", diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index db5d74810bee..91b6598ece94 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; buildInputs = [ - stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. # Note that libcurl and libxml2 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix deleted file mode 100644 index a21202ebd5ba..000000000000 --- a/pkgs/applications/audio/redux/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchurl -, writeScript -, libX11 -, libXext -, alsa-lib -, autoPatchelfHook -, releasePath ? null -}: - -# To use the full release version (same as renoise): -# 1) Sign into https://backstage.renoise.com and download the release version to some stable location. -# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. -# Note: Renoise creates an individual build for each license which screws somewhat with the -# use of functions like requireFile as the hash will be different for every user. - -stdenv.mkDerivation rec { - pname = "redux"; - version = "1.3.5"; - - src = if releasePath != null then releasePath - else fetchurl { - urls = [ - "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz" - "https://files.renoise.com/demo/archive/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz" - ]; - sha256 = "sha256-eznsdLzgdJ7MyWe5WAEg1MHId5VlfyanoZ6+I9nI/0I="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - libX11 - libXext - alsa-lib - stdenv.cc.cc.lib - ]; - - installPhase = '' - runHook preInstall - - OUTDIR=$out/lib/vst2/RenoiseRedux.vst2 - mkdir -p $OUTDIR - cp -r ./renoise_redux_x86_64/* $OUTDIR - - runHook postInstall - ''; - - - passthru.updateScript = writeScript "update-redux" '' - #!/usr/bin/env nix-shell - #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts - set -euo pipefail - - new_version="$( - curl 'https://files.renoise.com/demo/' \ - | htmlq a --text \ - | grep -E '^Renoise_Redux_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \ - | grep -Eo '[0-9]+(_[0-9]+)*' \ - | head -n1 \ - | tr _ . - )" - update-source-version redux "$new_version" --system="x86_64-linux" - ''; - - meta = with lib; { - description = "Sample-based instrument, with a powerful phrase sequencer"; - homepage = "https://www.renoise.com/products/redux"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ mihnea-s ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix deleted file mode 100644 index 7e178728c2dd..000000000000 --- a/pkgs/applications/audio/renoise/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ lib -, stdenv -, writeScript -, alsa-lib -, fetchurl -, libjack2 -, libX11 -, libXcursor -, libXext -, libXinerama -, libXrandr -, libXtst -, mpg123 -, pipewire -, releasePath ? null -}: - -# To use the full release version: -# 1) Sign into https://backstage.renoise.com and download the release version to some stable location. -# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. -# Note: Renoise creates an individual build for each license which screws somewhat with the -# use of functions like requireFile as the hash will be different for every user. -let - platforms = { - x86_64-linux = { - archSuffix = "x86_64"; - hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss="; - }; - aarch64-linux = { - archSuffix = "arm64"; - hash = "sha256-l54FAtT+Rj4Mv3GuOF0/9WuKdJowgbZDZYo7VCh6Flg="; - }; - }; - -in stdenv.mkDerivation rec { - pname = "renoise"; - version = "3.4.4"; - - src = if releasePath != null then - releasePath - else - let - platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; - in fetchurl { - urls = [ - "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz" - "https://files.renoise.com/demo/archive/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz" - ]; - hash = platform.hash; - }; - - buildInputs = [ - alsa-lib - libjack2 - libX11 - libXcursor - libXext - libXinerama - libXrandr - libXtst - pipewire - ]; - - installPhase = '' - cp -r Resources $out - - mkdir -p $out/lib/ - - cp renoise $out/renoise - - for path in ${toString buildInputs}; do - ln -s $path/lib/*.so* $out/lib/ - done - - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ - - mkdir $out/bin - ln -s $out/renoise $out/bin/renoise - - # Desktop item - mkdir -p $out/share/applications - cp -r Installer/renoise.desktop $out/share/applications/renoise.desktop - - # Desktop item icons - mkdir -p $out/share/icons/hicolor/{48x48,64x64,128x128}/apps - cp Installer/renoise-48.png $out/share/icons/hicolor/48x48/apps/renoise.png - cp Installer/renoise-64.png $out/share/icons/hicolor/64x64/apps/renoise.png - cp Installer/renoise-128.png $out/share/icons/hicolor/128x128/apps/renoise.png - ''; - - postFixup = '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath ${mpg123}/lib:$out/lib \ - $out/renoise - - for path in $out/AudioPluginServer*; do - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath $out/lib \ - $path - done - - substituteInPlace $out/share/applications/renoise.desktop \ - --replace Exec=renoise Exec=$out/bin/renoise - ''; - - passthru.updateScript = writeScript "update-renoise" '' - #!/usr/bin/env nix-shell - #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts - set -euo pipefail - - new_version="$( - curl 'https://files.renoise.com/demo/' \ - | htmlq a --text \ - | grep -E '^Renoise_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \ - | grep -Eo '[0-9]+(_[0-9]+)*' \ - | head -n1 \ - | tr _ . - )" - hash_x86_64="$(nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_x86_64.tar.gz")" - hash_arm64="$( nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_arm64.tar.gz")" - sri_x86_64="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_x86_64")" - sri_arm64="$( nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_arm64")" - update-source-version renoise "$new_version" "$sri_x86_64" --system="x86_64-linux" --ignore-same-version - update-source-version renoise "$new_version" "$sri_arm64" --system="aarch64-linux" --ignore-same-version - ''; - - meta = { - description = "Modern tracker-based DAW"; - homepage = "https://www.renoise.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ uakci ]; - platforms = lib.attrNames platforms; - mainProgram = "renoise"; - }; -} diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix deleted file mode 100644 index 4fecaf373726..000000000000 --- a/pkgs/applications/audio/rymcast/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper -, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }: - -stdenv.mkDerivation rec { - pname = "rymcast"; - version = "1.0.6"; - - src = fetchzip { - url = "https://www.inphonik.com/files/rymcast/rymcast-${version}-linux-x64.tar.gz"; - hash = "sha256:0vjjhfrwdibjjgz3awbg30qxkjrzc4cya1f4pigwjh3r0vvrq0ga"; - stripRoot = false; - }; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - - buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ]; - - installPhase = '' - mkdir -p "$out/bin" - cp RYMCast "$out/bin/" - wrapProgram "$out/bin/RYMCast" \ - --set PATH "${lib.makeBinPath [ zenity ]}" - ''; - - meta = with lib; { - description = "Player for Mega Drive/Genesis VGM files"; - homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ astsmtl ]; - }; -} diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix deleted file mode 100644 index c1f3f53416fd..000000000000 --- a/pkgs/applications/audio/shortwave/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, cargo -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, gitMinimal -, glib -, gst_all_1 -, gtk4 -, libadwaita -, meson -, ninja -, openssl -, pkg-config -, rustPlatform -, rustc -, sqlite -, wrapGAppsHook4 -, cmake -, libshumate -}: - -stdenv.mkDerivation rec { - pname = "shortwave"; - version = "3.2.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "Shortwave"; - rev = version; - sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - gitMinimal - glib # for glib-compile-schemas - meson - ninja - pkg-config - cargo - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - cmake - ]; - - buildInputs = [ - dbus - gdk-pixbuf - glib - gtk4 - libadwaita - openssl - sqlite - libshumate - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]); - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/Shortwave"; - description = "Find and listen to internet radio stations"; - mainProgram = "shortwave"; - longDescription = '' - Shortwave is a streaming audio player designed for the GNOME - desktop. It is the successor to the older Gradio application. - ''; - maintainers = with maintainers; [ lasandell ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix deleted file mode 100644 index 8fab5a4e54da..000000000000 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, nix-update-script -, alsaSupport ? stdenv.hostPlatform.isLinux -, alsa-lib -, autoreconfHook -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio -, libsidplayfp -, out123Support ? stdenv.hostPlatform.isDarwin -, mpg123 -, perl -, pkg-config -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sidplayfp"; - version = "2.10.0"; - - src = fetchFromGitHub { - owner = "libsidplayfp"; - repo = "sidplayfp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-PT0WijNvcF7opTVxpj6oRb514Alz12gZCSMYa4bqyrY="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - ]; - - buildInputs = [ - libsidplayfp - ] ++ lib.optionals alsaSupport [ - alsa-lib - ] ++ lib.optionals pulseSupport [ - libpulseaudio - ] ++ lib.optionals out123Support [ - mpg123 - ]; - - configureFlags = [ - (lib.strings.withFeature out123Support "out123") - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "SID player using libsidplayfp"; - homepage = "https://github.com/libsidplayfp/sidplayfp"; - license = with licenses; [ gpl2Plus ]; - mainProgram = "sidplayfp"; - maintainers = with maintainers; [ dezgeg OPNA2608 ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8bb0bf1387e2..5ac935bcc70c 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "24.5"; + version = "24.8"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-Y497KAlUXtWhkrCd1QrqJkvWGwnzZfYRKaALiEo/7EI="; + sha256 = "sha256-iH/y2dHeQL3ZHwKl5qkrXpSDgrqI/U31BwpwFAzBzEE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix deleted file mode 100644 index a3c51cfaaba2..000000000000 --- a/pkgs/applications/audio/spotify-player/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, cmake -# deps for audio backends -, alsa-lib -, libpulseaudio -, portaudio -, libjack2 -, SDL2 -, gst_all_1 -, dbus -, fontconfig -, libsixel - -# build options -, withStreaming ? true -, withDaemon ? true -, withAudioBackend ? "rodio" # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl -, withMediaControl ? true -, withLyrics ? true -, withImage ? true -, withNotify ? true -, withSixel ? true -, withFuzzy ? true -, stdenv -, darwin -, makeBinaryWrapper -}: - -assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ]; - -rustPlatform.buildRustPackage rec { - pname = "spotify-player"; - version = "0.19.1"; - - src = fetchFromGitHub { - owner = "aome510"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-R8F7s8FPnCe+shNUN/u0qcxFy3IbyfVo2xZ5/E/qwaw="; - }; - - cargoHash = "sha256-7vximGisIIXBrwHXSWQjO08OraaweG7ZT6v+gVdYGVc="; - - nativeBuildInputs = [ - pkg-config - cmake - rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - makeBinaryWrapper - ]; - - buildInputs = [ - openssl - dbus - fontconfig - ] - ++ lib.optionals withSixel [ libsixel ] - ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] - ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] - ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ] - ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] - ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] - ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] - ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ] - ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - AppKit - AudioUnit - Cocoa - ]); - - buildNoDefaultFeatures = true; - - buildFeatures = [ ] - ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ] - ++ lib.optionals withMediaControl [ "media-control" ] - ++ lib.optionals withImage [ "image" ] - ++ lib.optionals withLyrics [ "lyric-finder" ] - ++ lib.optionals withDaemon [ "daemon" ] - ++ lib.optionals withNotify [ "notify" ] - ++ lib.optionals withStreaming [ "streaming" ] - ++ lib.optionals withSixel [ "sixel" ] - ++ lib.optionals withFuzzy [ "fzf" ]; - - # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' - wrapProgram $out/bin/spotify_player \ - --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" - ''; - - meta = { - description = "Terminal spotify player that has feature parity with the official client"; - homepage = "https://github.com/aome510/spotify-player"; - changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; - mainProgram = "spotify_player"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith ]; - }; -} diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix deleted file mode 100644 index 3383e47cb8fe..000000000000 --- a/pkgs/applications/audio/spotify/linux.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype -, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity -, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon -, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL - # High-DPI support: Spotify's --force-device-scale-factor argument - # not added if `null`, otherwise, should be a number. -, deviceScaleFactor ? null -}: - -let - # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update) - # "rev" decides what is actually being downloaded - # If an update breaks things, one of those might have valuable info: - # https://aur.archlinux.org/packages/spotify/ - # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.45.454.gc16ec9f6"; - # To get the latest stable revision: - # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' - # To get general information: - # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' - # More examples of api usage: - # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "79"; - - deps = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curlWithGnuTls - dbus - expat - ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - harfbuzz - libayatana-appindicator - libdbusmenu - libdrm - libgcrypt - libGL - libnotify - libpng - libpulseaudio - libxkbcommon - mesa - nss_latest - pango - stdenv.cc.cc - systemd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst - zlib - ]; - -in - -stdenv.mkDerivation { - inherit pname version; - - # fetch from snapcraft instead of the debian repository most repos fetch from. - # That is a bit more cumbersome. But the debian repository only keeps the last - # two versions, while snapcraft should provide versions indefinitely: - # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 - - # This is the next-best thing, since we're not allowed to re-distribute - # spotify ourselves: - # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 - src = fetchurl { - name = "spotify-${version}-${rev}.snap"; - url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-F1Npz/oKCsMKaQx2M5dm1dhWhaSlt8422tpRWnwuk2yjwLWrOYDY2uKYph8YFXfOdS3mV6u5yVlzgFdDqAFmCQ=="; - }; - - nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; - - dontStrip = true; - dontPatchELF = true; - - unpackPhase = '' - runHook preUnpack - unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' - cd squashfs-root - if ! grep -q 'grade: stable' meta/snap.yaml; then - # Unfortunately this check is not reliable: At the moment (2018-07-26) the - # latest version in the "edge" channel is also marked as stable. - echo "The snap package is marked as unstable:" - grep 'grade: ' meta/snap.yaml - echo "You probably chose the wrong revision." - exit 1 - fi - if ! grep -q '${version}' meta/snap.yaml; then - echo "Package version differs from version found in snap metadata:" - grep 'version: ' meta/snap.yaml - echo "While the nix package specifies: ${version}." - echo "You probably chose the wrong revision or forgot to update the nix version." - exit 1 - fi - runHook postUnpack - ''; - - # Prevent double wrapping - dontWrapGApps = true; - - env = rec { - libdir = "${placeholder "out"}/lib/spotify"; - librarypath = "${lib.makeLibraryPath deps}:${libdir}"; - }; - - installPhase = - '' - runHook preInstall - - mkdir -p $libdir - mv ./usr/* $out/ - - # Work around Spotify referring to a specific minor version of - # OpenSSL. - - ln -s ${lib.getLib openssl}/lib/libssl.so $libdir/libssl.so.1.0.0 - ln -s ${lib.getLib openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 - ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so - ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - - ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir - - rpath="$out/share/spotify:$libdir" - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $rpath $out/share/spotify/spotify - - # fix Icon line in the desktop file (#48062) - sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" - - # Desktop file - mkdir -p "$out/share/applications/" - cp "$out/share/spotify/spotify.desktop" "$out/share/applications/" - - # Icons - for i in 16 22 24 32 48 64 128 256 512; do - ixi="$i"x"$i" - mkdir -p "$out/share/icons/hicolor/$ixi/apps" - ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \ - "$out/share/icons/hicolor/$ixi/apps/spotify-client.png" - done - - runHook postInstall - ''; - - fixupPhase = '' - runHook preFixup - - wrapProgramShell $out/share/spotify/spotify \ - ''${gappsWrapperArgs[@]} \ - ${lib.optionalString (deviceScaleFactor != null) '' - --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ - ''} \ - --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${zenity}/bin" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" - - runHook postFixup - ''; - - meta = meta // { - maintainers = with lib.maintainers; [ ftrvxmtrx sheenobu timokau ma27 ]; - }; -} diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix deleted file mode 100644 index 032706e47f46..000000000000 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoPatchelfHook, - dpkg, - alsa-lib, - freetype, - libglvnd, - curl, - libXcursor, - libXinerama, - libXrandr, - libXrender, - libjack2, -}: - -stdenv.mkDerivation rec { - pname = "tonelib-gfx"; - version = "4.8.5"; - - src = fetchurl { - url = "https://tonelib.vip/download/24-10-03/ToneLib-GFX-amd64.deb"; - hash = "sha256-RG5rliF4/9LDd07i5dSFQzTGPqyF6UmTfatKb59LZA4="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - stdenv.cc.cc.lib - alsa-lib - freetype - libglvnd - ] ++ runtimeDependencies; - - runtimeDependencies = map lib.getLib [ - curl - libXcursor - libXinerama - libXrandr - libXrender - libjack2 - ]; - - unpackCmd = "dpkg -x $curSrc source"; - - installPhase = '' - mv usr $out - substituteInPlace $out/share/applications/ToneLib-GFX.desktop --replace /usr/ $out/ - ''; - - meta = with lib; { - description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass"; - homepage = "https://tonelib.net/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ - dan4ik605743 - husjon - orivej - ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "ToneLib-GFX"; - }; -} diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix deleted file mode 100644 index 289f8b92a189..000000000000 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "tonelib-jam"; - version = "4.7.8"; - - src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-Jam-amd64.deb"; - sha256 = "sha256-c6At2lRPngQPpE7O+VY/Hsfw+QfIb3COIuHfbqqIEuM="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - stdenv.cc.cc.lib - alsa-lib - freetype - libglvnd - ] ++ runtimeDependencies; - - runtimeDependencies = map lib.getLib [ - curl - libXcursor - libXinerama - libXrandr - libXrender - libjack2 - ]; - - unpackCmd = "dpkg -x $curSrc source"; - - installPhase = '' - mv usr $out - substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/ - ''; - - meta = with lib; { - description = "ToneLib Jam – the learning and practice software for guitar players"; - homepage = "https://tonelib.net/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "ToneLib-Jam"; - }; -} diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix deleted file mode 100644 index aee3c383ae68..000000000000 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, mesa -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "tonelib-metal"; - version = "1.2.6"; - - src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-Metal-amd64.deb"; - sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU="; - }; - - nativeBuildInputs = [ autoPatchelfHook dpkg ]; - - buildInputs = [ - stdenv.cc.cc.lib - alsa-lib - freetype - libglvnd - mesa - ] ++ runtimeDependencies; - - runtimeDependencies = map lib.getLib [ - curl - libXcursor - libXinerama - libXrandr - libXrender - libjack2 - ]; - - unpackCmd = "dpkg -x $curSrc source"; - - installPhase = '' - mv usr $out - substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ - ''; - - meta = with lib; { - description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; - homepage = "https://tonelib.net/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "ToneLib-Metal"; - }; -} diff --git a/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/applications/audio/tonelib-noisereducer/default.nix deleted file mode 100644 index f2f01b9326bc..000000000000 --- a/pkgs/applications/audio/tonelib-noisereducer/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, mesa -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "tonelib-noisereducer"; - version = "1.2.0"; - - src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-NoiseReducer-amd64.deb"; - sha256 = "sha256-27JuFVmamIUUKRrpjlsE0E6x+5X9RutNGPiDf5dxitI="; - }; - - nativeBuildInputs = [ autoPatchelfHook dpkg ]; - - buildInputs = [ - stdenv.cc.cc.lib - alsa-lib - freetype - libglvnd - mesa - ] ++ runtimeDependencies; - - runtimeDependencies = map lib.getLib [ - curl - libXcursor - libXinerama - libXrandr - libXrender - libjack2 - ]; - - unpackCmd = "dpkg -x $curSrc source"; - - installPhase = '' - mv usr $out - ''; - - meta = with lib; { - description = "ToneLib NoiseReducer – two-unit noise reduction rack effect plugin"; - homepage = "https://tonelib.net/tl-noisereducer.html"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ orivej ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "ToneLib-NoiseReducer"; - }; -} diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix deleted file mode 100644 index af5dd750c50a..000000000000 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 -, webkitgtk_4_0 -}: - -stdenv.mkDerivation rec { - pname = "tonelib-zoom"; - version = "4.3.1"; - - src = fetchurl { - url = "https://www.tonelib.net/download/0129/ToneLib-Zoom-amd64.deb"; - sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - stdenv.cc.cc.lib - alsa-lib - freetype - libglvnd - webkitgtk_4_0 - ] ++ runtimeDependencies; - - runtimeDependencies = map lib.getLib [ - curl - libXcursor - libXinerama - libXrandr - libXrender - libjack2 - ]; - - unpackCmd = "dpkg -x $curSrc source"; - - installPhase = '' - mv usr $out - substituteInPlace $out/share/applications/ToneLib-Zoom.desktop --replace /usr/ $out/ - ''; - - meta = with lib; { - description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; - homepage = "https://tonelib.net/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "ToneLib-Zoom"; - }; -} diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index e63be43fe6b5..a212a5122907 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib ]; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix deleted file mode 100644 index 22e18502866a..000000000000 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv -, fetchzip -, libX11 -, libXi -, libGL -, alsa-lib -, SDL2 -, autoPatchelfHook -}: - -stdenv.mkDerivation rec { - pname = "virtual-ans"; - version = "3.0.3"; - - src = fetchzip { - url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; - sha256 = "sha256-tqR7icgURUFOyLJ8+mS17JRf2gK53I2FW/2m8IJPtJE="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - libX11 - libXi - libGL - alsa-lib - SDL2 - ]; - - installPhase = '' - mkdir -p $out - cp -R ./* $out/ - - # Remove all executables except for current architecture - ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf - ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf - - # Start script performs relative search for resources, so it cannot be moved - # to bin directory - ln -s $out/${startScript} $out/bin/virtual-ans - ''; - - startScript = if stdenv.hostPlatform.isx86_32 then "START_LINUX_X86" - else if stdenv.hostPlatform.isx86_64 then "START_LINUX_X86_64" - #else if stdenv.hostPlatform.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin - else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; - - linuxExecutable = if stdenv.hostPlatform.isx86_32 then "pixilang_linux_x86" - else if stdenv.hostPlatform.isx86_64 then "pixilang_linux_x86_64" - else ""; - - meta = with lib; { - description = "Photoelectronic microtonal/spectral musical instrument"; - longDescription = '' - Virtual ANS is a software simulator of the unique Russian synthesizer ANS - - photoelectronic musical instrument created by Evgeny Murzin from 1938 to - 1958. The ANS made it possible to draw music in the form of a spectrogram - (sonogram), without live instruments and performers. It was used by - Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet - composers in their experimental works. You can also hear the sound of the - ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker. - - The simulator extends the capabilities of the original instrument. Now - it's a full-featured graphics editor where you can convert sound into an - image, load and play pictures, draw microtonal/spectral music and create - some unusual deep atmospheric sounds. This app is for everyone who loves - experiments and is looking for something new. - - Key features: - - + unlimited number of pure tone generators; - + powerful sonogram editor - you can draw the spectrum and play it at the same time; - + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa; - + support for MIDI devices; - + polyphonic synth mode with MIDI mapping; - + supported file formats: WAV, AIFF, PNG, JPEG, GIF; - + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. - ''; - homepage = "https://warmplace.ru/soft/ans/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - # I cannot test the Darwin version, so I'll leave it disabled - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ jacg ]; - }; - -} diff --git a/pkgs/applications/audio/vital/default.nix b/pkgs/applications/audio/vital/default.nix deleted file mode 100644 index 84c910eecb95..000000000000 --- a/pkgs/applications/audio/vital/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchzip -, autoPatchelfHook -, makeBinaryWrapper - -, alsa-lib -, libjack2 -, curl -, xorg -, libGL -, freetype -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vital"; - version = "1.5.5"; - - src = fetchzip { - url = "https://builds.vital.audio/VitalAudio/vital/${builtins.replaceStrings ["."] ["_"] finalAttrs.version}/VitalInstaller.zip"; - hash = "sha256-hCwXSUiBB0YpQ1oN6adLprwAoel6f72tBG5fEb61OCI="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - makeBinaryWrapper - ]; - - buildInputs = [ - alsa-lib - stdenv.cc.cc.lib - libGL - xorg.libSM - xorg.libICE - xorg.libX11 - freetype - libjack2 - ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - # copy each output to its destination (individually) - mkdir -p $out/{bin,lib/{clap,vst,vst3}} - for f in bin/Vital lib/{clap/Vital.clap,vst/Vital.so,vst3/Vital.vst3}; do - cp -r $f $out/$f - done - - wrapProgram $out/bin/Vital \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl libjack2 ]}" - - runHook postInstall - ''; - - - meta = with lib; { - description = "Spectral warping wavetable synth"; - homepage = "https://vital.audio/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = with licenses; [ unfree gpl3Plus ]; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ PowerUser64 ]; - mainProgram = "Vital"; - }; -}) diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 4325d934e84b..54291ef25b9d 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { }) ]; + # ld64 on darwin doesn't support nested archives and as the nested lib + # (libbase64.a) is not required to build so leave it out + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace share/Makefile.am \ + --replace-fail libpicture_a_LIBADD '#libpicture_a_LIBADD' + ''; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix deleted file mode 100644 index d152eee637a1..000000000000 --- a/pkgs/applications/audio/yoshimi/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, alsa-lib -, boost -, cairo -, cmake -, fftwSinglePrec -, fltk -, libGLU -, libjack2 -, libsndfile -, libXdmcp -, lv2 -, minixml -, pcre -, pkg-config -, readline -, xorg -, zlib -}: - -stdenv.mkDerivation rec { - pname = "yoshimi"; - version = "2.3.2"; - - src = fetchFromGitHub { - owner = "Yoshimi"; - repo = pname; - rev = version; - hash = "sha256-UaZjT7B9T3a3W9PD9abA/WPmt9Id8/zUUSZU05+8x9c="; - }; - - sourceRoot = "${src.name}/src"; - - postPatch = '' - substituteInPlace Misc/Config.cpp --replace /usr $out - substituteInPlace Misc/Bank.cpp --replace /usr $out - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - alsa-lib - boost - cairo - fftwSinglePrec - fltk - libGLU - libjack2 - libsndfile - libXdmcp - lv2 - minixml - pcre - readline - xorg.libpthreadstubs - zlib - ]; - - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.cc.libc}/lib/libm.so" ]; - - meta = with lib; { - description = "High quality software synthesizer based on ZynAddSubFX"; - longDescription = '' - Yoshimi delivers the same synthesizer capabilities as - ZynAddSubFX along with very good Jack and Alsa midi/audio - functionality on Linux - ''; - homepage = "https://yoshimi.github.io/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - mainProgram = "yoshimi"; - }; -} diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index a3f45fee24a2..b46e11a35e8d 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.5.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-6aAaIugho8yHohEHp0HVkmzIOfhpkNYts6BOKPp9Wbw="; + hash = "sha256-S13f3vGMQJvpJbdfUstJlA8MfY5Q1efRA7QcPXYvhMI="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-6Fh1fbl7Y33EyWbWUhe70CGzhc4y+I59vPbzZydoJ18="; + hash = "sha256-brHNp19BEYzgxhdNnn7n1GYhBdyi3S/2VqvKWXmKGX8="; }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 28315b0a3701..da36dfde736b 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -79,11 +79,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zrythm"; - version = "1.0.0-rc.1"; + version = "1.0.0-rc.2"; src = fetchzip { url = "https://www.zrythm.org/releases/zrythm-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw="; + sha256 = "sha256-Da//nY0yXSbDPEg6t9jgL32NoT8dFYSQ4Kzc/KbHGSk="; }; passthru.updateScript = writeScript "update-zrythm" '' diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 59f0310263a4..b419ec217a80 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -117,9 +117,10 @@ in stdenv.mkDerivation rec { # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let disabledTests = - # PortChecker test fails when lashSupport is enabled because - # zynaddsubfx takes to long to start trying to connect to lash - lib.optionals lashSupport [ "PortChecker" ] + # PortChecker is non-deterministic. It's fixed in the master + # branch, but backporting would require an update to rtosc, so + # we'll just disable it until the next release. + [ "PortChecker" ] # Tests fail on aarch64 ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "MessageTest" "UnisonTest" ]; diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix deleted file mode 100644 index 3dc1356c90cb..000000000000 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "lightning-loop"; - version = "0.24.1-beta"; - - src = fetchFromGitHub { - owner = "lightninglabs"; - repo = "loop"; - rev = "v${version}"; - hash = "sha256-gPWiKSwXS1eSuHss+hkiqqxqonGYSGmSh3/jL+NlqEg="; - }; - - vendorHash = "sha256-6bRg6is1g/eRCr82tHMXTWVFv2S0d2h/J3w1gpentjo="; - - subPackages = [ "cmd/loop" "cmd/loopd" ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Lightning Loop Client"; - homepage = "https://github.com/lightninglabs/loop"; - license = licenses.mit; - maintainers = with maintainers; [ proofofkeags prusnak ]; - }; -} diff --git a/pkgs/applications/blockchains/lndinit/default.nix b/pkgs/applications/blockchains/lndinit/default.nix deleted file mode 100644 index 839d3402acc4..000000000000 --- a/pkgs/applications/blockchains/lndinit/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -buildGoModule rec { - pname = "lndinit"; - version = "0.1.5-beta"; - - src = fetchFromGitHub { - owner = "lightninglabs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7ibjDIDKP1ASvCWiF03aLCR6RXqLxmdkR5UZoU3dneA="; - }; - - vendorHash = "sha256-2AHU5/XSDJAEvAg7LmGxCmrJ/oS84fNF3mXigKFDsb4="; - - subPackages = ["."]; - - meta = with lib; { - description = "Wallet initializer utility for lnd"; - homepage = "https://github.com/lightninglabs/lndinit"; - mainProgram = "lndinit"; - license = licenses.mit; - maintainers = with maintainers; [aldoborrero]; - }; -} diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix deleted file mode 100644 index 170316494a8a..000000000000 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildDotnetModule -, fetchFromGitHub -, dotnetCorePackages -}: - -buildDotnetModule rec { - pname = "nbxplorer"; - version = "2.5.6"; - - src = fetchFromGitHub { - owner = "dgarage"; - repo = "NBXplorer"; - rev = "v${version}"; - sha256 = "sha256-GPquY5kfn08TUCum/INdHPasx8BWK2mf+PQlSgTl4iw="; - }; - - projectFile = "NBXplorer/NBXplorer.csproj"; - nugetDeps = ./deps.nix; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; - - # macOS has a case-insensitive filesystem, so these two can be the same file - postFixup = '' - mv $out/bin/{NBXplorer,nbxplorer} || : - ''; - - meta = with lib; { - description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; - maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - mainProgram = "nbxplorer"; - }; -} diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index e43e628f0ec4..ec5bea453502 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -136,7 +136,7 @@ let sparrow-modules = stdenvNoCC.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook (lib.getLib stdenv.cc.cc) zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them. diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix deleted file mode 100644 index fef54f6844fa..000000000000 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv -, fetchurl -, dpkg -, makeWrapper -, electron -, asar -}: - -let - inherit (stdenv.hostPlatform) system; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - sha256 = { - "x86_64-linux" = "139nlr191bsinx6ixpi2glcr03lsnzq7b0438h3245napsnjpx6p"; - }."${system}" or throwSystem; - - arch = { - "x86_64-linux" = "amd64"; - }."${system}" or throwSystem; - -in - -stdenv.mkDerivation rec { - pname = "terra-station"; - version = "1.2.0"; - - src = fetchurl { - url = "https://github.com/terra-money/station-desktop/releases/download/v${version}/Terra.Station_${version}_${arch}.deb"; - inherit sha256; - }; - - nativeBuildInputs = [ makeWrapper asar ]; - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x $src . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} - - cp -a usr/share/* $out/share - cp -a "opt/Terra Station/"{locales,resources} $out/share/${pname} - - # patch pre-built node modules - asar e $out/share/${pname}/resources/app.asar asar-unpacked - find asar-unpacked -name '*.node' -exec patchelf \ - --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ - {} \; - asar p asar-unpacked $out/share/${pname}/resources/app.asar - - substituteInPlace $out/share/applications/station-electron.desktop \ - --replace "/opt/Terra Station/station-electron" ${pname} - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.aasar - ''; - - meta = with lib; { - description = "Terra station is the official wallet of the Terra blockchain"; - homepage = "https://docs.terra.money/docs/learn/terra-station/README.html"; - license = licenses.isc; - maintainers = [ maintainers.peterwilli ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "terra-station"; - }; -} diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix deleted file mode 100644 index 59a3c1689b07..000000000000 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - buildDotnetModule, - dotnetCorePackages, - zlib, - openssl, - nixosTests, -}: -buildDotnetModule rec { - pname = "wasabibackend"; - version = "2.0.2.1"; - - src = fetchFromGitHub { - owner = "zkSNACKs"; - repo = "WalletWasabi"; - rev = "refs/tags/v${version}"; - hash = "sha512-JuCl3SyejzwUd2n8Fy7EdxUuO4bIcGb8yMWZQOhZzsY4fvg9prFOnVZEquxahD0a41MLKHRNA1R2N3NMapcc0A=="; - }; - - projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; - nugetDeps = ./deps.nix; - - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - - buildInputs = [stdenv.cc.cc.lib zlib]; - - runtimeDeps = [openssl zlib]; - - preConfigure = '' - makeWrapperArgs+=( - --chdir "$out/lib/${pname}" - ) - ''; - - postFixup = '' - mv $out/bin/WalletWasabi.Backend $out/bin/WasabiBackend - ''; - - passthru.tests = { - inherit (nixosTests) wasabibackend; - }; - - meta = with lib; { - description = "Backend for the Wasabi Wallet"; - homepage = "https://wasabiwallet.io/"; - sourceProvenance = with sourceTypes; [binaryNativeCode]; - license = licenses.mit; - maintainers = with maintainers; [mmahut]; - platforms = ["x86_64-linux"]; - }; -} diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix deleted file mode 100644 index b010eb1184e7..000000000000 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv -, autoPatchelfHook -, makeWrapper -, fetchurl -, makeDesktopItem -, lttng-ust_2_12 -, fontconfig -, openssl -, xorg -, zlib -}: - -let - # These libraries are dynamically loaded by the application, - # and need to be present in LD_LIBRARY_PATH - runtimeLibs = [ - fontconfig.lib - openssl - stdenv.cc.cc.lib - xorg.libX11 - xorg.libICE - xorg.libSM - zlib - ]; -in -stdenv.mkDerivation rec { - pname = "wasabiwallet"; - version = "2.0.8.1"; - - src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w="; - }; - - dontBuild = true; - - desktopItem = makeDesktopItem { - name = "wasabi"; - exec = "wasabiwallet"; - desktopName = "Wasabi"; - genericName = "Bitcoin wallet"; - comment = meta.description; - categories = [ "Network" "Utility" ]; - }; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = runtimeLibs ++ [ - lttng-ust_2_12 - ]; - - installPhase = '' - mkdir -p $out/opt/${pname} $out/bin $out/share/applications - cp -Rv . $out/opt/${pname} - - makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" - - makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" - - cp -v $desktopItem/share/applications/* $out/share/applications - ''; - - meta = with lib; { - description = "Privacy focused Bitcoin wallet"; - homepage = "https://wasabiwallet.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mmahut ]; - }; -} diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 35a3bdb91e8a..f2c3cc7a065f 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -39,9 +39,9 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. configurePhase = "configurePhase"; - buildPhase = "buildPhase"; - checkPhase = "checkPhase"; - installPhase = "installPhase"; + dontCargoBuild = true; + dontCargoCheck = true; + dontCargoInstall = true; postPatch = '' # Have to do this here instead of in preConfigure because diff --git a/pkgs/applications/display-managers/lemurs/default.nix b/pkgs/applications/display-managers/lemurs/default.nix deleted file mode 100644 index bb085c8a406b..000000000000 --- a/pkgs/applications/display-managers/lemurs/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - fetchFromGitHub, - lib, - linux-pam, - rustPlatform, - testers, - lemurs, -}: -rustPlatform.buildRustPackage rec { - pname = "lemurs"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "coastalwhite"; - repo = "lemurs"; - rev = "v${version}"; - hash = "sha256-YDopY+wdWlVL2X+/wc1tLSSqFclAkt++JXMK3VodD4s="; - }; - - cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; - - buildInputs = [ - linux-pam - ]; - - passthru.tests.version = testers.testVersion { - package = lemurs; - }; - - meta = with lib; { - description = "Customizable TUI display/login manager written in Rust"; - homepage = "https://github.com/coastalwhite/lemurs"; - license = with licenses; [asl20 mit]; - maintainers = with maintainers; [jeremiahs]; - mainProgram = "lemurs"; - }; -} diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 28d9f496ae8c..04887dd80868 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -137,7 +137,7 @@ let e2fsprogs # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index fc77ac423b0e..cc8c4e1caa21 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -258,6 +258,10 @@ in timerfunctions = ignoreCompilationErrorIfOlder super.timerfunctions "1.4.2.0.20201129.225252"; + # kv is required in triples-test.el + # Alternatively, we can delete that file. But adding a dependency is easier. + triples = addPackageRequires super.triples [ self.kv ]; + wisitoken-grammar-mode = ignoreCompilationError super.wisitoken-grammar-mode; # elisp error xeft = super.xeft.overrideAttrs (old: { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index f01f841edbe5..0033e3e5cbbd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -312,10 +312,10 @@ elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.2.0.0.20240117.23410"; + version = "1.2.0.0.20240913.70017"; src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar"; - sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml"; + url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240913.70017.tar"; + sha256 = "1pblmksnvjm88acv3l08zn6cm8h6kxdiiimxbsxdc16ldxhf9iji"; }; packageRequires = [ ]; meta = { @@ -419,10 +419,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.8.0.20240811.143437"; + version = "1.9.9.0.20241005.182443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240811.143437.tar"; - sha256 = "0fybzmnw8gyz2c1zw1qbgk5j5sllgxnjjzj3jw5lqqa211ppy700"; + url = "https://elpa.gnu.org/devel/async-1.9.9.0.20241005.182443.tar"; + sha256 = "11a8hy4y0rad9c38w74gpczzb45zgv63mikx9slkv5hfbhihjz2a"; }; packageRequires = [ ]; meta = { @@ -440,10 +440,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.6.0.20240819.102544"; + version = "14.0.7.0.20241010.141835"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240819.102544.tar"; - sha256 = "1ca4h7d3shaykzay0cv48sfwkykjwc717557f1syy42xgnq1ghhd"; + url = "https://elpa.gnu.org/devel/auctex-14.0.7.0.20241010.141835.tar"; + sha256 = "121b3xh5329mfwfm2zf19ddcp3hjbkwz4qnz1ybbd2y9yd6qw19z"; }; packageRequires = [ ]; meta = { @@ -676,10 +676,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.1.1.0.20240815.175555"; + version = "1.1.1.0.20240913.70315"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240815.175555.tar"; - sha256 = "1rzc4r9dfp0wnjlc1j662avpip1m8s00amv9sdshpbkz142c7paq"; + url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240913.70315.tar"; + sha256 = "0didf8l9rnkvymyv8qv4vc1q47c2xc8n8n7n74akw021mfvyld8v"; }; packageRequires = [ ]; meta = { @@ -762,10 +762,10 @@ elpaBuild { pname = "bluetooth"; ename = "bluetooth"; - version = "0.3.1.0.20230119.122638"; + version = "0.3.1.0.20241007.201319"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar"; - sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g"; + url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20241007.201319.tar"; + sha256 = "1zq3169ci5ysdxh3cvp8dnnzcg032swgh4akfymmi8swm7p1laz0"; }; packageRequires = [ dash ]; meta = { @@ -784,10 +784,10 @@ elpaBuild { pname = "bnf-mode"; ename = "bnf-mode"; - version = "0.4.5.0.20221205.150230"; + version = "0.4.5.0.20240915.211838"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar"; - sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip"; + url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20240915.211838.tar"; + sha256 = "109lfqv767ka7k8klxlr66sfzih2ypy4y0gkkrw5q14pzdx0149x"; }; packageRequires = [ cl-lib ]; meta = { @@ -876,10 +876,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.91.0.20240401.34715"; + version = "5.92.0.20240823.62608"; src = fetchurl { - url = "https://elpa.gnu.org/devel/brief-5.91.0.20240401.34715.tar"; - sha256 = "1knpamvbpz92b9zql6p0l7g1p5595l6kns0gw1vfhm7cl37dngyr"; + url = "https://elpa.gnu.org/devel/brief-5.92.0.20240823.62608.tar"; + sha256 = "0v2cdk4bs9xq7sn2a3qj3iaxmpmji5m9063cjhkhfd1crngv8a5a"; }; packageRequires = [ cl-lib @@ -944,10 +944,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.8.0.20240621.221659"; + version = "0.8.0.20240920.145100"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar"; - sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp"; + url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240920.145100.tar"; + sha256 = "1ai7y5nxjglzbxwq4ln8mlmxw8irh0m005izcrx9qby8i3zs4fwz"; }; packageRequires = [ ]; meta = { @@ -1035,10 +1035,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.6.0.20240818.141447"; + version = "1.7.0.20241007.50103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.6.0.20240818.141447.tar"; - sha256 = "0gs6xqmv3qv6b1d373n42g6qhb5v4g5x0g6ra2z58bjggz1qz30h"; + url = "https://elpa.gnu.org/devel/cape-1.7.0.20241007.50103.tar"; + sha256 = "0gqyr8d7yh0sqwrl62h6kb9j6zv578xsas0skhm51bgkv5v7px92"; }; packageRequires = [ compat ]; meta = { @@ -1205,10 +1205,10 @@ elpaBuild { pname = "cobol-mode"; ename = "cobol-mode"; - version = "1.1.0.20240505.191317"; + version = "1.1.0.20241012.193933"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20240505.191317.tar"; - sha256 = "1nv0594a244yp5rv9y7bna37sr4cn0869g7i48888dphg6savlb7"; + url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20241012.193933.tar"; + sha256 = "0l04al26n7b6nh9824r75jv60byx32s0xk3b943d4lqn1g7ww9bv"; }; packageRequires = [ cl-lib ]; meta = { @@ -1219,6 +1219,7 @@ ) { }; code-cells = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -1226,12 +1227,12 @@ elpaBuild { pname = "code-cells"; ename = "code-cells"; - version = "0.4.0.20240809.93222"; + version = "0.4.0.20241003.103649"; src = fetchurl { - url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20240809.93222.tar"; - sha256 = "19mibw99y13fmbngbg1x1zv02j50pcbrifl62slrx4aj3v796839"; + url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20241003.103649.tar"; + sha256 = "1lzr37w7i2bb2sqh48i92s6hbih1q0j311mavb8xsdsf04dz1yzb"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.gnu.org/devel/code-cells.html"; license = lib.licenses.free; @@ -1248,10 +1249,10 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.0.4.0.20240712.155246"; + version = "1.0.4.0.20240924.193317"; src = fetchurl { - url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240712.155246.tar"; - sha256 = "1n2b5av3k8kwx6f5x0ziq7virv7n2d9npw11s934qzq3qfk2m8i3"; + url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240924.193317.tar"; + sha256 = "06rzr4g2qv7d8hgil46v1vipq6rw4518sf5vqf22n8g893blcvjm"; }; packageRequires = [ compat ]; meta = { @@ -1269,10 +1270,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.4.0.20240810.184048"; + version = "0.6.0.20240928.153818"; src = fetchurl { - url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240810.184048.tar"; - sha256 = "0gaz8f730d6z8y1f8yckklgimm85c7qm96ascdj8yw0mh483xcg6"; + url = "https://elpa.gnu.org/devel/comint-mime-0.6.0.20240928.153818.tar"; + sha256 = "1vhkv3a2vccj2lbb5dn1gz9dfni0f5y03qwfkyl6r785i0ss976i"; }; packageRequires = [ ]; meta = { @@ -1311,10 +1312,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20240729.84605"; + version = "1.0.2.0.20240926.212727"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240729.84605.tar"; - sha256 = "09r7jjz0hqks08syxg889d1qbwwla6kwp29n5h660np4ymx38gbq"; + url = "https://elpa.gnu.org/devel/company-1.0.2.0.20240926.212727.tar"; + sha256 = "1qp8k5f0pa4c3mlk48dw3j9y67fhlfyfb123jbl213gdc6wlqjp9"; }; packageRequires = [ ]; meta = { @@ -1407,10 +1408,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "30.0.0.0.0.20240803.181300"; + version = "30.0.0.0.0.20240910.150701"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240803.181300.tar"; - sha256 = "15an93nh3l0njb9vl1bmg59r8z7mcp3zpjp27vwg0rmvldqg72r3"; + url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240910.150701.tar"; + sha256 = "1mi1fk574fdi1xx6pj0i449ng9y8a8hpj46dxmjjl8kgzipi79pq"; }; packageRequires = [ seq ]; meta = { @@ -1419,6 +1420,27 @@ }; } ) { }; + constants = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "constants"; + ename = "constants"; + version = "2.11.1.0.20240827.95043"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/constants-2.11.1.0.20240827.95043.tar"; + sha256 = "0ar6j385kifqyd01996li7ni1c1kwn11m80bssbc4agsrmk5kn02"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/constants.html"; + license = lib.licenses.free; + }; + } + ) { }; consult = callPackage ( { compat, @@ -1429,10 +1451,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.8.0.20240818.112757"; + version = "1.8.0.20241001.205748"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.8.0.20240818.112757.tar"; - sha256 = "1f5likm0mv41by193dc714lvcjz9604k31pswr2nnfknia164x5k"; + url = "https://elpa.gnu.org/devel/consult-1.8.0.20241001.205748.tar"; + sha256 = "1y9mc132c4azj0jzcwy4dw22ch78aq0c3zl3amrvmj2ypnbjxmyg"; }; packageRequires = [ compat ]; meta = { @@ -1452,10 +1474,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.1.1.0.20240703.93551"; + version = "0.2.1.0.20240915.62227"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-denote-0.1.1.0.20240703.93551.tar"; - sha256 = "1275qhz4fyrh1qr1mjhzy923x4rs90v80sdiazmszn72dcvp25bq"; + url = "https://elpa.gnu.org/devel/consult-denote-0.2.1.0.20240915.62227.tar"; + sha256 = "062wzk3yq2bbav24mxw184chv0g76xn7l1panvl4nwjsxsr3vxra"; }; packageRequires = [ consult @@ -1469,6 +1491,7 @@ ) { }; consult-hoogle = callPackage ( { + consult, elpaBuild, fetchurl, haskell-mode, @@ -1477,12 +1500,15 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.2.1.0.20240427.131842"; + version = "0.2.2.0.20240922.132051"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar"; - sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m"; + url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.2.0.20240922.132051.tar"; + sha256 = "11x88j0j7lxfrf2lww4h9dw1m4sbxwz5d615cl8qsr2hsa46bv75"; }; - packageRequires = [ haskell-mode ]; + packageRequires = [ + consult + haskell-mode + ]; meta = { homepage = "https://elpa.gnu.org/devel/consult-hoogle.html"; license = lib.licenses.free; @@ -1542,10 +1568,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.5.0.20240818.102943"; + version = "1.5.0.20241001.155010"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.5.0.20240818.102943.tar"; - sha256 = "0arfkrnls7gj6z1k764p6vgfmb915fa61hwbflfgsnhms3x0vpmv"; + url = "https://elpa.gnu.org/devel/corfu-1.5.0.20241001.155010.tar"; + sha256 = "0xmki9d0szqpqg1agyx9l6viqmcw6ndwj9mi4zkmxqyy8589qf16"; }; packageRequires = [ compat ]; meta = { @@ -1759,10 +1785,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.1.0.20240425.35714"; + version = "1.1.0.0.20240914.63105"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar"; - sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72"; + url = "https://elpa.gnu.org/devel/cursory-1.1.0.0.20240914.63105.tar"; + sha256 = "0g5mv4sabmyz5d9b43zby6cm2bg6sfh3s0hn1wm86zv5zpzpy0hq"; }; packageRequires = [ ]; meta = { @@ -1802,10 +1828,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.14.0.0.20240818.195258"; + version = "0.16.0.0.20241013.222215"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.14.0.0.20240818.195258.tar"; - sha256 = "0bl8a05vrf7z7pc5gj947cir7cg3rzzljn2ck11l5801w5zq5yr5"; + url = "https://elpa.gnu.org/devel/dape-0.16.0.0.20241013.222215.tar"; + sha256 = "0nfs1293sb5m5dn7cz7z983q7kp5qb7b5bmv54zp9lx33kxm5z9z"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1889,10 +1915,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.40.0.20240812.95045"; + version = "0.41.0.20241011.103524"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240812.95045.tar"; - sha256 = "0lylhjg1a6iwb7w08xnblv9890c3din8w7hgja8bf4qq8j6w8xwq"; + url = "https://elpa.gnu.org/devel/debbugs-0.41.0.20241011.103524.tar"; + sha256 = "1lgr0bcaqifxmf27mhlhbyxbfbz98ykdzfmjhp8hbhjab08wxisg"; }; packageRequires = [ soap-client ]; meta = { @@ -1936,10 +1962,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.0.8.0.20240804.85702"; + version = "3.1.0.0.20241011.101951"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-3.0.8.0.20240804.85702.tar"; - sha256 = "01kvkcdl60xdfrdxj02llbdxnp5dbkkmyabw9188hd58kvvxkwdn"; + url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20241011.101951.tar"; + sha256 = "0m38i2pzl4182bxk356hwcja2j9xs0syq8qjdsydh80jaq8j2rsy"; }; packageRequires = [ ]; meta = { @@ -1993,6 +2019,7 @@ ) { }; devdocs = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -2000,12 +2027,12 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.6.1.0.20240428.71147"; + version = "0.6.1.0.20241006.5137"; src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar"; - sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s"; + url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20241006.5137.tar"; + sha256 = "19xbq406mlj6nm7dfp38kisxabjdqr89nsvnaghjilpc59bjqnxj"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.gnu.org/devel/devdocs.html"; license = lib.licenses.free; @@ -2071,10 +2098,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.10.0.0.20240802.231611"; + version = "1.10.0.0.20241012.214233"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20240802.231611.tar"; - sha256 = "11zp0h0n1myj1d9x5bi8b0kdrgs4wf0nc3zc2zkz8zh7fz5rhc9p"; + url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20241012.214233.tar"; + sha256 = "0i681c501a6hyzik6hrlwdgmq46ajj62hizm7j525wpwlv45012g"; }; packageRequires = [ cl-lib ]; meta = { @@ -2198,10 +2225,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.2.0.0.20240805.90710"; + version = "0.3.0.0.20240916.102011"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240805.90710.tar"; - sha256 = "0n606w117y7swf95hxycxdf7nrzyxz8lsa6723p7bbrjnbal5863"; + url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20240916.102011.tar"; + sha256 = "1yap9a1ywdld13pcbqgx42sczyah9rg398jpdlg93dl6a2df5ccw"; }; packageRequires = [ ]; meta = { @@ -2347,10 +2374,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.3.0.20240810.74103"; + version = "0.3.0.20240929.81709"; src = fetchurl { - url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240810.74103.tar"; - sha256 = "0l1xgw6wh1j6xmiqhf7h5h9wg010dhclpxn6xxb372mqxlnylvld"; + url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240929.81709.tar"; + sha256 = "14b8argsv9i1aqzvkkx11810g9rf93kn6kz2qcd552pxllcpyf1l"; }; packageRequires = [ comint-mime ]; meta = { @@ -2506,10 +2533,10 @@ elpaBuild { pname = "ediprolog"; ename = "ediprolog"; - version = "2.2.0.20221026.91800"; + version = "2.3.0.20241006.95158"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar"; - sha256 = "0y2xa0k7sv21yabxkfzxnl0fdnppgcwx5jdnm1zw2j2sbaf9k6ca"; + url = "https://elpa.gnu.org/devel/ediprolog-2.3.0.20241006.95158.tar"; + sha256 = "0jbbxyx2xcfqg8jgs63dri1d5cc3x6b3scys8khf6acd4f9grnxd"; }; packageRequires = [ ]; meta = { @@ -2527,10 +2554,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240811.0.20240811.220128"; + version = "20241002.0.20241013.214806"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20240811.0.20240811.220128.tar"; - sha256 = "0smywkzygmbmzv4zj95y6cjj9gjj5ggh4cknscgsrbva2nffrp7v"; + url = "https://elpa.gnu.org/devel/eev-20241002.0.20241013.214806.tar"; + sha256 = "19694hal4v7qfrpjmpm1m6yfgqmgyvzf5cwkiz290m3nc65znnzw"; }; packageRequires = [ ]; meta = { @@ -2548,10 +2575,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.7.0.0.20240819.163406"; + version = "1.8.0.0.20241007.133203"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240819.163406.tar"; - sha256 = "1shapc9zjw3ca1x4gxwy7pz7ajm0h07nk8xrf4bypc629gzsg107"; + url = "https://elpa.gnu.org/devel/ef-themes-1.8.0.0.20241007.133203.tar"; + sha256 = "07dzmvbzvyyxd747kgdsjwgg95minzfn5kw74qhy8x3xh95n6wwl"; }; packageRequires = [ ]; meta = { @@ -2578,10 +2605,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20240817.135350"; + version = "1.17.0.20241012.55327"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240817.135350.tar"; - sha256 = "1sk1xgliar7c5glhx8k9r6di7f5xpxx6m0myh8kdsmrsh67198gh"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20241012.55327.tar"; + sha256 = "14clgkni1awzac58ffqx9cwjy939y4y0fmzjkhnahii5sj1hp2mj"; }; packageRequires = [ compat @@ -2731,10 +2758,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.11.13.0.20240721.113845"; + version = "0.11.14.0.20240915.152338"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.11.13.0.20240721.113845.tar"; - sha256 = "123gzcxmszx25464d7as8w9c2pv94kpr1br2njf03474vj7fa91m"; + url = "https://elpa.gnu.org/devel/ellama-0.11.14.0.20240915.152338.tar"; + sha256 = "0qxwhk6kdj9w1436p7hxlwhi7c9mb8j3ghrp8sskcqy6dck7mqn3"; }; packageRequires = [ compat @@ -2778,10 +2805,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.1.0.20240724.120153"; + version = "1.1.0.20241003.135329"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.1.0.20240724.120153.tar"; - sha256 = "15qbmcx86yb8qk1k89gdrdj09bdaganzd82w23710z5qblmkpn44"; + url = "https://elpa.gnu.org/devel/embark-1.1.0.20241003.135329.tar"; + sha256 = "0m1ljw87b95gpjs7m3by3vvb9mp05kyk4wqph9cn55w8xxv8piv2"; }; packageRequires = [ compat ]; meta = { @@ -2802,10 +2829,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1.0.20240724.120153"; + version = "1.1.0.20241003.135329"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240724.120153.tar"; - sha256 = "1i17xwlnmimnqzgnm2chghv1jnd026iiz6n94nfgwvw0avs7h5g2"; + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20241003.135329.tar"; + sha256 = "0xm33iv8z0hq62wgck4a3ygnvgigsfjn4i8y36iq7pfgzwic7500"; }; packageRequires = [ compat @@ -2834,10 +2861,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.16pre0.20240707.203749"; + version = "0.16.0.20241012.164056"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.16pre0.20240707.203749.tar"; - sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2"; + url = "https://elpa.gnu.org/devel/ement-0.16.0.20241012.164056.tar"; + sha256 = "0fsck2gx84y8r94770zhjiq37g97vgc61dkrp9k7f3q4xb05gqvi"; }; packageRequires = [ map @@ -2866,10 +2893,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "20.1.0.20240704.95932"; + version = "20.1.0.20240924.230829"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-20.1.0.20240704.95932.tar"; - sha256 = "1mid0m39af2mcq99xbdjxiiliw6axaysm6cfriyl00w0w6ybfrjf"; + url = "https://elpa.gnu.org/devel/emms-20.1.0.20240924.230829.tar"; + sha256 = "1prhwlhfvfr81j02xsadh8gw1qbirmmzlhafnwq9w1qcaz9jnclw"; }; packageRequires = [ cl-lib @@ -2955,10 +2982,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1snapshot0.20240813.11230"; + version = "5.6.1snapshot0.20241011.161309"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240813.11230.tar"; - sha256 = "1r2a3n4lfsjmlg7vg816hmxvdzmapp89vym2jh4vwkng1v5bfzq1"; + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20241011.161309.tar"; + sha256 = "1pps1r3b49zppdqdfd4ikh121myw7fwpnk0glmr27d7fdrihwfmk"; }; packageRequires = [ compat ]; meta = { @@ -2978,10 +3005,10 @@ elpaBuild { pname = "ergoemacs-mode"; ename = "ergoemacs-mode"; - version = "5.16.10.12.0.20240809.174605"; + version = "5.16.10.12.0.20240828.210215"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240809.174605.tar"; - sha256 = "1pq78fyr26rmg1vg4xhl095yhaxi8pdnhx0hjcwv5gvxxd462ggq"; + url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240828.210215.tar"; + sha256 = "1n87f2si44hyyiy3nj3hr0pjxkjdb419pkybs7vawi27k59dd8rw"; }; packageRequires = [ cl-lib @@ -3002,10 +3029,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20240819.131103"; + version = "24.1.1.0.20240821.145259"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240819.131103.tar"; - sha256 = "0kh6xbnw3w21dxz7d32cfckfrii104bjh05gi94agqqb2npkhgkm"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240821.145259.tar"; + sha256 = "15qani3cvb5sb087k8rmsm55h3fx6dhhhjkv18c50060phwxr2q5"; }; packageRequires = [ ]; meta = { @@ -3057,10 +3084,10 @@ elpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "1.0.0.0.20240119.103925"; + version = "1.0.0.0.20240919.142744"; src = fetchurl { - url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar"; - sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50"; + url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240919.142744.tar"; + sha256 = "01mr4aqzl8cb8jhap6pz6y561dv2hj5mykc5gdjnnfaqhypipwnq"; }; packageRequires = [ ]; meta = { @@ -3122,10 +3149,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.31.0.20240818.191337"; + version = "0.32.0.20241006.3203"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240818.191337.tar"; - sha256 = "1mx4a3pvymja31g0b97h90qgqj11w5gddldyk4xragxq71avnf18"; + url = "https://elpa.gnu.org/devel/exwm-0.32.0.20241006.3203.tar"; + sha256 = "0rbn0w867wihfpg2d1hffnnvif300f8b7ss6a4r0ls6929i8qcr5"; }; packageRequires = [ compat @@ -3277,10 +3304,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20240707.154630"; + version = "1.3.7.0.20240829.203038"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240707.154630.tar"; - sha256 = "1y1r7hz8692y1q9n75vgq26liilaaiz1h8l3jh3n6dqyzll6c2wi"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240829.203038.tar"; + sha256 = "1iswrkqxhsfrqgm976iyd5rdvf6q99h805b4cdnbynfix3xp207j"; }; packageRequires = [ eldoc @@ -3344,10 +3371,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "2.0.0.0.20240819.122228"; + version = "2.1.0.0.20240913.71012"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240819.122228.tar"; - sha256 = "17l62k153g6qd79kmpy4rw2y05dd442vm6cyslxw3n8bkgfma6xi"; + url = "https://elpa.gnu.org/devel/fontaine-2.1.0.0.20240913.71012.tar"; + sha256 = "16wsmqkm9n0hz4s50m5janni7lzvvwgrcbnp17ngyqlzkld656yk"; }; packageRequires = [ ]; meta = { @@ -3793,10 +3820,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.11.15.0.20240806.162404"; + version = "0.11.18.0.20240921.191926"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.11.15.0.20240806.162404.tar"; - sha256 = "11mh3cii9713bdl00kcxf2jhk04k9yi4x2bpazymz1iwfg4pk1hq"; + url = "https://elpa.gnu.org/devel/greader-0.11.18.0.20240921.191926.tar"; + sha256 = "1bnss7xgzzclkk715i3v6bpr2zn1b85hr7mpxvpprm3hknpalq5p"; }; packageRequires = [ compat @@ -4033,10 +4060,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20240819.10443"; + version = "9.0.2pre0.20241008.11453"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240819.10443.tar"; - sha256 = "0j3rz9hpqbv8757y3cbg5yx1kf56f5wkdvncch5pmg774v4lk5cl"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20241008.11453.tar"; + sha256 = "015cwlrqz4pyxk6ffki0l44ycajzd509vlbz10skwikl2xqmp01x"; }; packageRequires = [ ]; meta = { @@ -4087,6 +4114,28 @@ }; } ) { }; + indent-bars = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "indent-bars"; + ename = "indent-bars"; + version = "0.8.0.20241013.161522"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/indent-bars-0.8.0.20241013.161522.tar"; + sha256 = "0h7r1lm06rybqp7lq3ggclgv8b2akgqabizqy6xzimmibgf61vwj"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/indent-bars.html"; + license = lib.licenses.free; + }; + } + ) { }; inspector = callPackage ( { elpaBuild, @@ -4096,10 +4145,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.37.0.20240731.203714"; + version = "0.38.0.20240911.94847"; src = fetchurl { - url = "https://elpa.gnu.org/devel/inspector-0.37.0.20240731.203714.tar"; - sha256 = "0w6hqi2hv7vps8l5mgzvgxn53wxnyc24fhrmvxldajw8q8isi122"; + url = "https://elpa.gnu.org/devel/inspector-0.38.0.20240911.94847.tar"; + sha256 = "1w7zaxf77f7r0bdwqa276vqnhql1jsxl3y13gc13ikibhxb5jf2w"; }; packageRequires = [ ]; meta = { @@ -4181,10 +4230,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.14.2.0.20240524.114155"; + version = "0.14.2.0.20240829.172705"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar"; - sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9"; + url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240829.172705.tar"; + sha256 = "0rsgrrzy33gpm8h0w0zk7al5awj14rvxlklgb7v2jllsd6z6c9gx"; }; packageRequires = [ ]; meta = { @@ -4388,10 +4437,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.10.0.20240724.91709"; + version = "1.10.0.20240926.181428"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.10.0.20240724.91709.tar"; - sha256 = "1pfx68hcd0gfs78kq2xwr34cq6p1fm6ab4kmmhalld87jkq11ss1"; + url = "https://elpa.gnu.org/devel/jinx-1.10.0.20240926.181428.tar"; + sha256 = "1qn5lrc2843x1bihg38iba8dc4r24d257hwnyqjfpgpffak7ma4b"; }; packageRequires = [ compat ]; meta = { @@ -4432,10 +4481,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20231224.0.20240418.608"; + version = "20231224.0.20240908.123607"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar"; - sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240908.123607.tar"; + sha256 = "03zp9nsl06z1v2f3a78rbr8b7ng4dfhn3ar0rim30r99dyvf21kw"; }; packageRequires = [ cl-lib ]; meta = { @@ -4581,10 +4630,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.3.2.0.20240815.172320"; + version = "0.4.1.0.20241004.194446"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kubed-0.3.2.0.20240815.172320.tar"; - sha256 = "0rzf1vyzmxm36w1ljxc09adqrp2w8bn0bn5gk5k0z4vy3r5yysj6"; + url = "https://elpa.gnu.org/devel/kubed-0.4.1.0.20241004.194446.tar"; + sha256 = "1ja8kk7vpwfayqkcf7maz8y25xlxl77i1mk8s4qq9q6fm06n14w5"; }; packageRequires = [ ]; meta = { @@ -4722,10 +4771,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20240102.14710"; + version = "1.0.6.0.20240919.15459"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar"; - sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240919.15459.tar"; + sha256 = "1h82ar9izb3a16w35qcvfv7k5s8rzjlkk6g3d3x7wk3rfivp8brl"; }; packageRequires = [ ]; meta = { @@ -4764,10 +4813,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "1.1.0.0.20240805.61912"; + version = "1.1.0.0.20240913.71045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/lin-1.1.0.0.20240805.61912.tar"; - sha256 = "1r7l28h60cv3ba361rq1r6ksf8401q147j4n76q6d51w4v0gvjfm"; + url = "https://elpa.gnu.org/devel/lin-1.1.0.0.20240913.71045.tar"; + sha256 = "1sba8z5qq14rz0a9fa8mi48agkkylcc64ngp3v97lhg9imich8iy"; }; packageRequires = [ ]; meta = { @@ -4789,10 +4838,10 @@ elpaBuild { pname = "listen"; ename = "listen"; - version = "0.10pre0.20240818.210429"; + version = "0.10pre0.20240923.201649"; src = fetchurl { - url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240818.210429.tar"; - sha256 = "1cww04hcna6biv9928xrfwh6vxhp8n66z3ws1xckg08wj18apnwv"; + url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240923.201649.tar"; + sha256 = "0klkjl8g7r6i0cx5yp1f2z6vafxpx0llbsk024bp6jjx9l6n7vp9"; }; packageRequires = [ persist @@ -4833,16 +4882,22 @@ fetchurl, lib, plz, + plz-event-source, + plz-media-type, }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.17.1.0.20240817.163032"; + version = "0.17.4.0.20241003.232025"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.17.1.0.20240817.163032.tar"; - sha256 = "13c6fr5xjiynya6dx39bp5zs9q0csq98a92nb8mg4bdx6lkldqaa"; + url = "https://elpa.gnu.org/devel/llm-0.17.4.0.20241003.232025.tar"; + sha256 = "1wsbf0c0hmspw3sx94ji0xr9h65q1xbls1nhhadajayclrp3rxhq"; }; - packageRequires = [ plz ]; + packageRequires = [ + plz + plz-event-source + plz-media-type + ]; meta = { homepage = "https://elpa.gnu.org/devel/llm.html"; license = lib.licenses.free; @@ -4965,10 +5020,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.1.1.0.20240224.55443"; + version = "1.2.0.0.20240903.93854"; src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar"; - sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3"; + url = "https://elpa.gnu.org/devel/logos-1.2.0.0.20240903.93854.tar"; + sha256 = "0vpvqzvxvgnvlrihd4ms3q76270x7my94rcxfskiis3547m8z1pp"; }; packageRequires = [ ]; meta = { @@ -5072,10 +5127,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.7.0.20240818.101722"; + version = "1.7.0.20240926.91821"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20240818.101722.tar"; - sha256 = "1pvr1sr97hbibbpypvp82z85l0g4pmr3mm0qqynv5g5rfb51k53k"; + url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20240926.91821.tar"; + sha256 = "1rdv3jkc7g59gypa949har94wl0sqpr6qpbjcravailbhd8a4zsn"; }; packageRequires = [ compat ]; meta = { @@ -5135,10 +5190,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.0.0.0.20240429.72524"; + version = "1.0.0.0.20240913.71126"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar"; - sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a"; + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240913.71126.tar"; + sha256 = "0nxw6vnc9q63vnly9ffvrj8m1dnn9wlhcidld478p07qlighp8lm"; }; packageRequires = [ ]; meta = { @@ -5327,10 +5382,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.4.0.0.20240811.50238"; + version = "4.5.0.0.20241007.133219"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240811.50238.tar"; - sha256 = "1bmjhjgj44h4g7fg1m937s5l3rf565kczi3jmm4yc7hhh50k1had"; + url = "https://elpa.gnu.org/devel/modus-themes-4.5.0.0.20241007.133219.tar"; + sha256 = "1smf7zlwvkinjm6kdlmb5qm2dc9qxg5dpn0nyd7vjz1krycmvni6"; }; packageRequires = [ ]; meta = { @@ -5369,10 +5424,10 @@ elpaBuild { pname = "multi-mode"; ename = "multi-mode"; - version = "1.14.0.20221221.80812"; + version = "1.14.0.20240919.113013"; src = fetchurl { - url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar"; - sha256 = "1r41alsvaab8h5cngy0hjs78shv60qp1g68jppl5qlhd6a7h95ih"; + url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20240919.113013.tar"; + sha256 = "0h99nppak4xr3difyh86ng1sv6k9d1ad41kvafaqbf69v4xs711m"; }; packageRequires = [ ]; meta = { @@ -5669,10 +5724,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.2.0.0.20240511.94138"; + version = "1.2.0.0.20240913.71211"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar"; - sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1"; + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240913.71211.tar"; + sha256 = "1h6ain7zhr6qv29r9i9zwyha3074198igq61swpx3xhajskkxa0y"; }; packageRequires = [ ]; meta = { @@ -5734,10 +5789,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.16.0.20221221.81302"; + version = "0.17.0.20240830.100757"; src = fetchurl { - url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar"; - sha256 = "1imdggvj98db8cs0s2qx72ifavi6h3flym70zm2g1w8v2fmcq8dj"; + url = "https://elpa.gnu.org/devel/oauth2-0.17.0.20240830.100757.tar"; + sha256 = "0y602ffm77d6f97hml9g6b1c3f2f7gfwzw5zw54iy4nl4fc7xk09"; }; packageRequires = [ cl-lib @@ -5887,10 +5942,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.1.0.20240717.75820"; + version = "1.2.0.20240926.92100"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240717.75820.tar"; - sha256 = "0x54jhhxm1j8hbxhwpn5ws3dcg20bszpwm7qhqg3hk1jf3f9xp61"; + url = "https://elpa.gnu.org/devel/orderless-1.2.0.20240926.92100.tar"; + sha256 = "1clbmlfrr4dq30q0yh6mrrk8i8rc49yljs83hh77z000vxzmc8qk"; }; packageRequires = [ compat ]; meta = { @@ -5908,10 +5963,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8pre0.20240818.102310"; + version = "9.8pre0.20241013.101728"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.8pre0.20240818.102310.tar"; - sha256 = "0mcisziws7nx445csnz6q89gwm4q2fxy4ddz1d4dixqsj4r1pkdj"; + url = "https://elpa.gnu.org/devel/org-9.8pre0.20241013.101728.tar"; + sha256 = "1lr95jkjdp19cv5k21h5yn29sy744sxr2995v4a6pkjif0dnvj5v"; }; packageRequires = [ ]; meta = { @@ -6000,10 +6055,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.5.0.20240803.195206"; + version = "1.5.0.20240926.92259"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20240803.195206.tar"; - sha256 = "1nrry2zn7ldmbmsr0iznf4w01dhkc618ywbqbbz10ahhja509z2v"; + url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20240926.92259.tar"; + sha256 = "0i99ky6csk3gvshvr2f6gpql1k3a8dl6xvnyd8nk33jydacjs6bl"; }; packageRequires = [ compat ]; meta = { @@ -6069,10 +6124,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.2.0.20240629.103632"; + version = "1.2.2.0.20241010.195850"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar"; - sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20241010.195850.tar"; + sha256 = "1y260csn6810dbv7libfyjlrx6r1rcna3kh4wbd5mn79ik1f8f6z"; }; packageRequires = [ org ]; meta = { @@ -6091,10 +6146,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.4.0.0.20240520.170949"; + version = "1.4.0.0.20240922.152934"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar"; - sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240922.152934.tar"; + sha256 = "1p391rjvzp9im2fas8vih3mpvd9w176ykashyy5g94i0pmjfazfi"; }; packageRequires = [ org ]; meta = { @@ -6177,10 +6232,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.4.0.20240723.220720"; + version = "1.4.0.20241006.1334"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-1.4.0.20240723.220720.tar"; - sha256 = "0z3ng8p5921haj0ynn6sfgsdssfmkz2gsm5ybrz9wanxznswrs9d"; + url = "https://elpa.gnu.org/devel/osm-1.4.0.20241006.1334.tar"; + sha256 = "0k6ncc3xlvz804m0ixqn2p18ggq6knx7xpvzcl99fcn85x0wqals"; }; packageRequires = [ compat ]; meta = { @@ -6390,10 +6445,10 @@ elpaBuild { pname = "phpinspect"; ename = "phpinspect"; - version = "0.0.20240819.94625"; + version = "2.1.0.0.20240930.174944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240819.94625.tar"; - sha256 = "1xmyhfzl04aq82a1880p9l7m0az3267amz2qi0a36p5pxcnshz7z"; + url = "https://elpa.gnu.org/devel/phpinspect-2.1.0.0.20240930.174944.tar"; + sha256 = "04jhw53rjljf1qmha6xv4q9cx3j8r0af0307qlkm262brymqn6kg"; }; packageRequires = [ compat ]; meta = { @@ -6475,10 +6530,10 @@ elpaBuild { pname = "plz-event-source"; ename = "plz-event-source"; - version = "0.1.1.0.20240814.73632"; + version = "0.1.2pre0.20240924.181709"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-event-source-0.1.1.0.20240814.73632.tar"; - sha256 = "1bcmc2wribnhvkp0yg57k8xvdbi2hp39jmvapjfpy6hhs1c5j7n9"; + url = "https://elpa.gnu.org/devel/plz-event-source-0.1.2pre0.20240924.181709.tar"; + sha256 = "0ydi2xs9sbbc3qz4dp0jpaipdbmzc1nw36wm0cgmqk71a3s5aw67"; }; packageRequires = [ plz-media-type ]; meta = { @@ -6497,10 +6552,10 @@ elpaBuild { pname = "plz-media-type"; ename = "plz-media-type"; - version = "0.2.1.0.20240814.73530"; + version = "0.2.2pre0.20240924.181631"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-media-type-0.2.1.0.20240814.73530.tar"; - sha256 = "0lw95balq4zasj7q2ck1fmbkzs8rkasaqsda3aj859y3zdsqlqkd"; + url = "https://elpa.gnu.org/devel/plz-media-type-0.2.2pre0.20240924.181631.tar"; + sha256 = "0pm4hh03bgrq1c7xmb4xw4x7ns967biq0nq7y0bqn42bzcjfxbh9"; }; packageRequires = [ plz ]; meta = { @@ -6645,10 +6700,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.3.0.20240703.35906"; + version = "1.4.4.0.20240827.65408"; src = fetchurl { - url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar"; - sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj"; + url = "https://elpa.gnu.org/devel/posframe-1.4.4.0.20240827.65408.tar"; + sha256 = "0bpakrjgasx911k9niqmd4zf3g08zvwydfyxj6fr8096wazqyrrc"; }; packageRequires = [ ]; meta = { @@ -6709,10 +6764,10 @@ elpaBuild { pname = "preview-auto"; ename = "preview-auto"; - version = "0.3.0.20240818.113948"; + version = "0.3.0.20240915.183530"; src = fetchurl { - url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240818.113948.tar"; - sha256 = "1nr80nrzkq0pak5pinxz3v6j6kr879y35whaxn9q6as1c93aay9d"; + url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240915.183530.tar"; + sha256 = "0di2idjrxz5xb9klb6cvcwdgnd9q5h8b3pl6qkg4m8nb30w71mka"; }; packageRequires = [ auctex ]; meta = { @@ -6753,10 +6808,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.11.1.0.20240817.24032"; + version = "0.11.1.0.20241007.234715"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240817.24032.tar"; - sha256 = "1f29qrv2g772sgc4m1y2agm3hwz9fl06mpizak1kbx6ak8klw6zk"; + url = "https://elpa.gnu.org/devel/project-0.11.1.0.20241007.234715.tar"; + sha256 = "185nx2ww47c8808b0z8gsf2f4arc4cj3i31fp735i5qamxlx1bxp"; }; packageRequires = [ xref ]; meta = { @@ -6816,10 +6871,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20240429.64508"; + version = "1.1.0.0.20241006.54333"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar"; - sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n"; + url = "https://elpa.gnu.org/devel/pulsar-1.1.0.0.20241006.54333.tar"; + sha256 = "03q0mxkm06mdp9y11nmwxfbgcc4r4h2w41lj6ba67npawjc0m5mg"; }; packageRequires = [ ]; meta = { @@ -6859,16 +6914,17 @@ elpaBuild, fetchurl, lib, + pyim, }: elpaBuild { pname = "pyim-basedict"; ename = "pyim-basedict"; - version = "0.5.4.0.20220614.110824"; + version = "0.5.5.0.20240923.73912"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar"; - sha256 = "0md12ysqcmz737vcs8wh561zl8s98w04cgzs69pbdnzzxas7iy2j"; + url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.5.0.20240923.73912.tar"; + sha256 = "01czkf0i4hg2fdd7m3qas5wvb6ziczsrlnyr7phr1vrgh7qfl6n2"; }; - packageRequires = [ ]; + packageRequires = [ pyim ]; meta = { homepage = "https://elpa.gnu.org/devel/pyim-basedict.html"; license = lib.licenses.free; @@ -6886,10 +6942,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20240708.74355"; + version = "0.28.0.20241013.93011"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20240708.74355.tar"; - sha256 = "0q4s3lqifq6nrs9irqz709msja5slw6kc66gigm653m1n9j9kr1i"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20241013.93011.tar"; + sha256 = "01rcnwk7hdzx5qlrhd8mnkqzsn7x5dpn3zwh16941cjc3fr9xq7r"; }; packageRequires = [ compat @@ -7037,10 +7093,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "1.0.2.0.20240606.194313"; + version = "1.0.3.0.20240926.134441"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar"; - sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm"; + url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.3.0.20240926.134441.tar"; + sha256 = "1pz9gflnyz0p6bg0x87gs7byy34yhi1qf84f3mah79489wad1x84"; }; packageRequires = [ ]; meta = { @@ -7272,10 +7328,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.9.3.0.20231120.221944"; + version = "1.9.4.0.20240830.70150"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar"; - sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z"; + url = "https://elpa.gnu.org/devel/rec-mode-1.9.4.0.20240830.70150.tar"; + sha256 = "0jdz5hf8ials41vi90jrklv1sh7f83l6h2g7z3csqah0lgb19xxk"; }; packageRequires = [ ]; meta = { @@ -7358,10 +7414,10 @@ elpaBuild { pname = "rich-minority"; ename = "rich-minority"; - version = "1.0.3.0.20190419.83620"; + version = "1.0.3.0.20240924.201748"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar"; - sha256 = "0kx516s0kv8ni3w408hb9bpnig83bv4m1l7b5lhdigmp8zvqm8jm"; + url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20240924.201748.tar"; + sha256 = "1jywghc41c5i0y0f2vi32yykfbkh7kccs9h46idlfq7a2fq42z55"; }; packageRequires = [ cl-lib ]; meta = { @@ -7619,10 +7675,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.4.2.0.20240801.143007"; + version = "2.4.2.0.20240912.220425"; src = fetchurl { - url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240801.143007.tar"; - sha256 = "0mhr5yki3b0px40ldk8wzwpzy5ji0l301v4wilivzii8lgaq571c"; + url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240912.220425.tar"; + sha256 = "16yxmv8nhbnsdancnn8zj81zba9dfzmkfjxp9sb9d2f0wnyza2i4"; }; packageRequires = [ ]; meta = { @@ -7673,6 +7729,27 @@ }; } ) { }; + show-font = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "show-font"; + ename = "show-font"; + version = "0.1.1.0.20240915.55011"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/show-font-0.1.1.0.20240915.55011.tar"; + sha256 = "0rfav8axwqkgihnhf51c3w1igi9w6ia2ambw6vd2zg7gl54ga2vm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/show-font.html"; + license = lib.licenses.free; + }; + } + ) { }; sisu-mode = callPackage ( { elpaBuild, @@ -8112,10 +8189,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.1.0.0.20240811.61021"; + version = "2.1.0.0.20240913.71400"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20240811.61021.tar"; - sha256 = "15p3fa8a5gqxkzkk5ldcjbzq7ja478w0w3xc4xhw4hbklzknph6n"; + url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20240913.71400.tar"; + sha256 = "1zxspsd2mca3pkwbkkkdy32lh5krqjlsi7p9z73xah68r8jyps7j"; }; packageRequires = [ ]; meta = { @@ -8154,10 +8231,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.3.1.0.20240522.34122"; + version = "0.3.1.0.20240913.71434"; src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar"; - sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq"; + url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240913.71434.tar"; + sha256 = "1a217jx9lwjl4hl7a3rd982004780d1p2pg1qqph9g16y0k36b7q"; }; packageRequires = [ ]; meta = { @@ -8240,10 +8317,10 @@ elpaBuild { pname = "svg-tag-mode"; ename = "svg-tag-mode"; - version = "0.3.2.0.20240624.85758"; + version = "0.3.2.0.20240828.82058"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar"; - sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln"; + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240828.82058.tar"; + sha256 = "1jx2dx1d8w4p37q4x5shj1xf1fqbclv10i6a8q8inq05qjlfq1ak"; }; packageRequires = [ svg-lib ]; meta = { @@ -8262,10 +8339,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.14.2.0.20240520.120545"; + version = "0.14.2.0.20240829.172807"; src = fetchurl { - url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar"; - sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma"; + url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240829.172807.tar"; + sha256 = "0hv9dmn5gbbnx2yx7x91p20is41h7l7s4qk1y805kp6r5lknz2b3"; }; packageRequires = [ ivy ]; meta = { @@ -8305,10 +8382,10 @@ elpaBuild { pname = "sxhkdrc-mode"; ename = "sxhkdrc-mode"; - version = "1.0.0.0.20240117.30132"; + version = "1.0.0.0.20240913.71503"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar"; - sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs"; + url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240913.71503.tar"; + sha256 = "02qgyk2f1jglwkk34sph8j1ab1rq8r6pad7ixvi9idq7ya6wzfdb"; }; packageRequires = [ ]; meta = { @@ -8439,10 +8516,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.14.0.20240816.184417"; + version = "0.14.3.0.20240923.174028"; src = fetchurl { - url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14.0.20240816.184417.tar"; - sha256 = "1r1akz148a9sbqcsycc8i5vdifxsamcy8qhrlq0s8fj39qcdj39m"; + url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14.3.0.20240923.174028.tar"; + sha256 = "104vhlbr03sz1lrvqh3qs96a61d0kcjqqc71q84q400890an3gh9"; }; packageRequires = [ magit-section @@ -8485,10 +8562,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.2.0.20240723.220630"; + version = "1.2.0.20240926.233155"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-1.2.0.20240723.220630.tar"; - sha256 = "0a5z3lw4lf6swanvs22z2wpayclmk573gb6r9v93xwj3941dwgnk"; + url = "https://elpa.gnu.org/devel/tempel-1.2.0.20240926.233155.tar"; + sha256 = "0qflff5c96pipxnnjnb960qbh1dqr6bnjixqk86hnnddwv67p414"; }; packageRequires = [ compat ]; meta = { @@ -8549,10 +8626,10 @@ elpaBuild { pname = "tex-parens"; ename = "tex-parens"; - version = "0.4.0.20240630.70456"; + version = "0.6.0.20241012.150939"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tex-parens-0.4.0.20240630.70456.tar"; - sha256 = "0rz6qmmmfajndq3irvrfvmjp1l3j0cfkz5fp36nabyrpj0v8g821"; + url = "https://elpa.gnu.org/devel/tex-parens-0.6.0.20241012.150939.tar"; + sha256 = "0f48c5x6mpf0c456d0jy2jprbclhcifmjid8s77ghmlnvazypg7b"; }; packageRequires = [ ]; meta = { @@ -8635,10 +8712,10 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "0.4.0.0.20240117.30342"; + version = "1.0.0.0.20240913.71556"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar"; - sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw"; + url = "https://elpa.gnu.org/devel/tmr-1.0.0.0.20240913.71556.tar"; + sha256 = "11y91803ldwvij73zw7g7dchdpzz9qrx1jv37rlrav7j52rc1awx"; }; packageRequires = [ compat ]; meta = { @@ -8703,10 +8780,10 @@ elpaBuild { pname = "track-changes"; ename = "track-changes"; - version = "1.2.0.20240604.221628"; + version = "1.2.0.20241003.143209"; src = fetchurl { - url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar"; - sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf"; + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20241003.143209.tar"; + sha256 = "1xzx886gzvm0rchzchnd4cl675mlkgnjbmkvzjkx9wpi42xnw94j"; }; packageRequires = [ ]; meta = { @@ -8724,10 +8801,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.1.1.0.20240730.150621"; + version = "2.7.1.3.0.20240929.75703"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.7.1.1.0.20240730.150621.tar"; - sha256 = "13abfs3a483ird3gwc49ixbxdwmayrlqnh349wm0j1hlmbciqczh"; + url = "https://elpa.gnu.org/devel/tramp-2.7.1.3.0.20240929.75703.tar"; + sha256 = "0bcxhgbjaysrvj3y4dhq0xzwna3nlm332yvswsy4qw7fwa4n9x6c"; }; packageRequires = [ ]; meta = { @@ -8810,10 +8887,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.7.4.0.20240805.123130"; + version = "0.7.7.0.20241008.182431"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.7.4.0.20240805.123130.tar"; - sha256 = "1bm1kv7n24bzixa2gmb6km2iacqag4l8kwrcxdf09yxwisg0a3zf"; + url = "https://elpa.gnu.org/devel/transient-0.7.7.0.20241008.182431.tar"; + sha256 = "1vih4zkjzklj00fnp3yjj99vs0xy528316qf9b9bidgpqnsfk9mi"; }; packageRequires = [ compat @@ -8904,10 +8981,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3.5.0.20240201.233852"; + version = "0.4.0.0.20240831.171334"; src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar"; - sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi"; + url = "https://elpa.gnu.org/devel/triples-0.4.0.0.20240831.171334.tar"; + sha256 = "1xa6yhgjpj8vb5i9znx7nhavz21yv0wbiknwiv2ccal03dfs3n1c"; }; packageRequires = [ seq ]; meta = { @@ -9033,10 +9110,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.5.1snapshot0.20240729.214836"; + version = "0.5.2snapshot0.20240822.215612"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240729.214836.tar"; - sha256 = "008kdywxj0zpgiqbjcngs8kbj4az2liisblkcc2cifhj31427cyd"; + url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20240822.215612.tar"; + sha256 = "01bkcz0zmzgf75x9zqm67i6bgz7rj5kazqqv0yjvnz4657cb5isr"; }; packageRequires = [ compat @@ -9128,10 +9205,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5.0.20240804.85212"; + version = "2.4.6.0.20240907.62515"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240804.85212.tar"; - sha256 = "1i1vm2vsc9wa25lxyrfaizrnj47l5cbfaxaan3n6rc7i88zw62bx"; + url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20240907.62515.tar"; + sha256 = "0z6iz3v3k6jay4xp471nxlkaqvnwngdl3gq6r6d6s682svfs8hy7"; }; packageRequires = [ bind-key ]; meta = { @@ -9324,10 +9401,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2024.3.1.121933719.0.20240707.154630"; + version = "2024.10.9.140346409.0.20241009.223438"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240707.154630.tar"; - sha256 = "1sh1piff0jiahn7w9i607l6j28g74ysylr3n7xrp59nh07y2br6b"; + url = "https://elpa.gnu.org/devel/verilog-mode-2024.10.9.140346409.0.20241009.223438.tar"; + sha256 = "1zkdlq5ly9phjmg4ga1blbr184a7l3jldfpw58qx5njvyq5b3jq8"; }; packageRequires = [ ]; meta = { @@ -9346,10 +9423,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.9.0.20240726.213105"; + version = "1.9.0.20241004.135012"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.9.0.20240726.213105.tar"; - sha256 = "1gdmn8xs5d4mma8q8zvvnqvzdblxcv2xyc3lbkjw1rjjqg5xzj2i"; + url = "https://elpa.gnu.org/devel/vertico-1.9.0.20241004.135012.tar"; + sha256 = "1dfhnn1n3i8a916adgzbvpy1fiqbam40r4k0c8ildxg1rhq5zmwg"; }; packageRequires = [ compat ]; meta = { @@ -9369,10 +9446,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.7.0.20240202.84736"; + version = "0.7.7.0.20241010.24145"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar"; - sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20241010.24145.tar"; + sha256 = "05np5iassbia1acn99cy4l4947lkq7vggcnh5gp21xjjm1mpk0jw"; }; packageRequires = [ posframe @@ -9605,10 +9682,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.1.0.20240727.42753"; + version = "3.6.1.0.20240928.75916"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20240727.42753.tar"; - sha256 = "1db4g0yhin44lxl4hpzsnn68f8hik705a89dgq20jiyihdji5ldq"; + url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20240928.75916.tar"; + sha256 = "0z2vl3w5yhy77y96c7hxkncwi0pgxanb712hhdyjybmkg73v8qmn"; }; packageRequires = [ ]; meta = { @@ -9780,10 +9857,10 @@ elpaBuild { pname = "wrap-search"; ename = "wrap-search"; - version = "4.16.19.0.20240813.40618"; + version = "4.17.6.0.20240929.62253"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wrap-search-4.16.19.0.20240813.40618.tar"; - sha256 = "1g8c6wdwb6clrqy61n914ilk1bq1023dilfcqx98c37x8yi0wmm2"; + url = "https://elpa.gnu.org/devel/wrap-search-4.17.6.0.20240929.62253.tar"; + sha256 = "0y0pscf44blym8hkirbhrpcr9sjk2jdx7rfwvnfs9nnhq2a57ihm"; }; packageRequires = [ ]; meta = { @@ -9801,10 +9878,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.11.0.20221221.82941"; + version = "1.11.1.0.20240912.92814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar"; - sha256 = "18l69h1vg98fd35hsbbzdlhgmilyj192g9vr34kkwzj0r6bak4l2"; + url = "https://elpa.gnu.org/devel/xclip-1.11.1.0.20240912.92814.tar"; + sha256 = "1w4sprqnhlrmwq2jccwxz1mc9jsm2hlmzwfb42jvraanybcbal4n"; }; packageRequires = [ ]; meta = { @@ -9912,10 +9989,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.7.0.0.20240707.154630"; + version = "1.7.0.0.20241005.224023"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar"; - sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7"; + url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20241005.224023.tar"; + sha256 = "0526agg3b6aj1pfdcr22yf666vpsbwhj2clskilk8axa0ki0cn2h"; }; packageRequires = [ ]; meta = { @@ -9955,10 +10032,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1.0.20240406.91451"; + version = "0.14.1.0.20241013.115755"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar"; - sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20241013.115755.tar"; + sha256 = "1wfq3z1kygwcxdj9sl32r3v0x3qqyrv61f6adipjrv7fnrk9l0fk"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index d9839c4d46e5..b343604a9b6f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -398,10 +398,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.8.tar"; - sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v"; + url = "https://elpa.gnu.org/packages/async-1.9.9.tar"; + sha256 = "00slbyzjjn2v90lkaa9kc3wvlibs0rldh9crzjgp43y31xrzgpsg"; }; packageRequires = [ ]; meta = { @@ -419,10 +419,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.6"; + version = "14.0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar"; - sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr"; + url = "https://elpa.gnu.org/packages/auctex-14.0.7.tar"; + sha256 = "1m71jr853b4d713z1k4jj73c8ba4753hv8nighx62razgmpn4ci8"; }; packageRequires = [ ]; meta = { @@ -855,10 +855,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.91"; + version = "5.92"; src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.91.tar"; - sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb"; + url = "https://elpa.gnu.org/packages/brief-5.92.tar"; + sha256 = "0nfnk5aag5w7170njdl9gq2kf48gzmbmdpz209y1vzdxw91jrwql"; }; packageRequires = [ cl-lib @@ -1014,10 +1014,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.6.tar"; - sha256 = "1pqkdajl7nd510hxq4lph5cqj3j84mi01nl0ka2k4j8wrvb9zagn"; + url = "https://elpa.gnu.org/packages/cape-1.7.tar"; + sha256 = "03npj4a8g73dgrivjgc27w0c957naqhxq0hfzshdqci6mrq1gph3"; }; packageRequires = [ compat ]; meta = { @@ -1248,10 +1248,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.4"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar"; - sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa"; + url = "https://elpa.gnu.org/packages/comint-mime-0.6.tar"; + sha256 = "017d62n3n2jmsxb3r9jm4vk8vpapddbxfjjh8ww1vgcbzqr76zwy"; }; packageRequires = [ ]; meta = { @@ -1290,10 +1290,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.10.2.tar"; - sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz"; + url = "https://elpa.gnu.org/packages/company-1.0.2.tar"; + sha256 = "00vmqra0fav0w4q13ngwpyqpxqah0ahfg7kp5l2nd0h2l8sp79qr"; }; packageRequires = [ ]; meta = { @@ -1398,6 +1398,27 @@ }; } ) { }; + constants = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "constants"; + ename = "constants"; + version = "2.11.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/constants-2.11.1.tar"; + sha256 = "0n1wa9hr0841733s6w30x1n5mmis8fpjfzl5mn7s9q12djpp20fy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/constants.html"; + license = lib.licenses.free; + }; + } + ) { }; consult = callPackage ( { compat, @@ -1431,10 +1452,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.1.1"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar"; - sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1"; + url = "https://elpa.gnu.org/packages/consult-denote-0.2.1.tar"; + sha256 = "15hih62a6lyfgw3ha86hppc9wp468gslrdcnx8kcz0dlkvp0k1kx"; }; packageRequires = [ consult @@ -1448,6 +1469,7 @@ ) { }; consult-hoogle = callPackage ( { + consult, elpaBuild, fetchurl, haskell-mode, @@ -1456,12 +1478,15 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar"; - sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr"; + url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.2.tar"; + sha256 = "07z98nnxcaaws18by4id6c45yxlfwb9fk3p0gzll4ngym29zkd8c"; }; - packageRequires = [ haskell-mode ]; + packageRequires = [ + consult + haskell-mode + ]; meta = { homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; license = lib.licenses.free; @@ -1738,10 +1763,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar"; - sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr"; + url = "https://elpa.gnu.org/packages/cursory-1.1.0.tar"; + sha256 = "1n2d7nxg4m4i303vmsz0cxv9p5q6630y6x2g7mq51wbc7g0zdrhc"; }; packageRequires = [ ]; meta = { @@ -1781,10 +1806,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.14.0"; + version = "0.16.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.14.0.tar"; - sha256 = "1aakk2v3nw1pl4ai9bb4h748z6bkfkilw283ndfah7jz61j90van"; + url = "https://elpa.gnu.org/packages/dape-0.16.0.tar"; + sha256 = "0zv2l2d91ywbi2v36kn7na94lm09zz5yyq50xdf5i44h9ridz7zw"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1868,10 +1893,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.40"; + version = "0.41"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.40.tar"; - sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl"; + url = "https://elpa.gnu.org/packages/debbugs-0.41.tar"; + sha256 = "0nchb7dnkrn34nh3bi0k5xmsn3da9m9v4iksh18045mfj6wn6bl5"; }; packageRequires = [ soap-client ]; meta = { @@ -1915,10 +1940,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.0.8"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-3.0.8.tar"; - sha256 = "0hqv0lbjjs3df2vjwx3mnyj98kl3shh9aahl2y9mnmfq4fingdi8"; + url = "https://elpa.gnu.org/packages/denote-3.1.0.tar"; + sha256 = "03l9ya2n0nrj72dpnflxv19k8agzl3lab7hq0aqb7vzxafjfip74"; }; packageRequires = [ ]; meta = { @@ -2177,10 +2202,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar"; - sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l"; + url = "https://elpa.gnu.org/packages/dired-preview-0.3.0.tar"; + sha256 = "0cfwpdh70a7n37nkwqqnjfjb6nc8mfkcry3dl95xj2wj70bavsf8"; }; packageRequires = [ ]; meta = { @@ -2485,10 +2510,10 @@ elpaBuild { pname = "ediprolog"; ename = "ediprolog"; - version = "2.2"; + version = "2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar"; - sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm"; + url = "https://elpa.gnu.org/packages/ediprolog-2.3.tar"; + sha256 = "02ynwqhkpv4wcz87zkr9188kjmhd8s9zkfiawn7gywb5jkki6nd0"; }; packageRequires = [ ]; meta = { @@ -2506,10 +2531,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240811"; + version = "20241002"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20240811.tar"; - sha256 = "1m5d0jr408fc42kk5vdkdb2kk3x4k1q7k32hwbjb7fkmp8nkv7ll"; + url = "https://elpa.gnu.org/packages/eev-20241002.tar"; + sha256 = "0cl65zxryr6mlhbbpb9nbmabn8vnwc17vpqr7611s79jb9a7xsvf"; }; packageRequires = [ ]; meta = { @@ -2527,10 +2552,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar"; - sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v"; + url = "https://elpa.gnu.org/packages/ef-themes-1.8.0.tar"; + sha256 = "0fv7m4cd4sdn8skx5li8g41kyjniwzfp8sn7jd9s4f7wzls5rnay"; }; packageRequires = [ ]; meta = { @@ -2706,10 +2731,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.11.13"; + version = "0.11.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.11.13.tar"; - sha256 = "1i5pn976a8y3b6927wq51cy9adjipn7xqlmdxy9gnhfnjsma2446"; + url = "https://elpa.gnu.org/packages/ellama-0.11.14.tar"; + sha256 = "1xd1pj02kgz83wsvygi5p7hlzx2898d38jmwq899qzpjn80jajb1"; }; packageRequires = [ compat @@ -2809,10 +2834,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.15.1"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.15.1.tar"; - sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld"; + url = "https://elpa.gnu.org/packages/ement-0.16.tar"; + sha256 = "1c496sm9lad5m18pjfwnqf6l1kjrnyayip8flj1ijm13996c3mp3"; }; packageRequires = [ map @@ -3097,10 +3122,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.31.tar"; - sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq"; + url = "https://elpa.gnu.org/packages/exwm-0.32.tar"; + sha256 = "0k3c7grgkkpgd0r8b9vsqa5ywhb4vwxr3wfjyfxw8xy0yq7y0jvn"; }; packageRequires = [ compat @@ -3317,10 +3342,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar"; - sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk"; + url = "https://elpa.gnu.org/packages/fontaine-2.1.0.tar"; + sha256 = "10wywr7h4li99zxw3mzmy44rnkvii8rwri23b7vkacvhv3z8sfrf"; }; packageRequires = [ ]; meta = { @@ -3766,10 +3791,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.11.15"; + version = "0.11.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.11.15.tar"; - sha256 = "0052gsjdqnlxgwd8l3h3x2zh2lzw76cwfdxvgxdk6x1g4cvhmjbx"; + url = "https://elpa.gnu.org/packages/greader-0.11.18.tar"; + sha256 = "122mvjcbvi7dzggx1dl02iw9jl0h33l8ka4mzvlr6sl0wwwzfpr8"; }; packageRequires = [ compat @@ -4064,6 +4089,28 @@ }; } ) { }; + indent-bars = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "indent-bars"; + ename = "indent-bars"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/indent-bars-0.8.tar"; + sha256 = "0sy34xkghlwndyrismdrrsgnsz2901j8pdpfy8drbka6x4g6x36k"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/indent-bars.html"; + license = lib.licenses.free; + }; + } + ) { }; inspector = callPackage ( { elpaBuild, @@ -4073,10 +4120,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.37.tar"; - sha256 = "0825qd5ldx63li3vf89dsizn6w2gj87jn16yrfw0bxxn5jg255a0"; + url = "https://elpa.gnu.org/packages/inspector-0.38.tar"; + sha256 = "1b0hb8cd85p41kzalkkg698qx515gzrr85d6j7wn2b8h3rrpp3g4"; }; packageRequires = [ ]; meta = { @@ -4558,10 +4605,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.3.2"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kubed-0.3.2.tar"; - sha256 = "1adr74gdfvg9djd8hr457jgx2p08drc235l3p4ni76fnjngki1z2"; + url = "https://elpa.gnu.org/packages/kubed-0.4.1.tar"; + sha256 = "1p0r6jcwydh25ff613imr49yjw4hhy9wcxlzxrk3d2szipj4q8hs"; }; packageRequires = [ ]; meta = { @@ -4814,10 +4861,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.17.1"; + version = "0.17.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.17.1.tar"; - sha256 = "15raqqychsag53q4pnlh6iwzb81z9zmi7nd0x5zkfpf4q71llsxc"; + url = "https://elpa.gnu.org/packages/llm-0.17.4.tar"; + sha256 = "01a4vnbffrh53q1j2if63a05j4859rzrrf7p3fisfbfj1cr2ywvw"; }; packageRequires = [ plz ]; meta = { @@ -4940,10 +4987,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-1.1.1.tar"; - sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb"; + url = "https://elpa.gnu.org/packages/logos-1.2.0.tar"; + sha256 = "0a609jfgfwq71ksxw4h2q25qbix75yrf7vm0dfpyzjvgcmqiviab"; }; packageRequires = [ ]; meta = { @@ -5302,10 +5349,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar"; - sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71"; + url = "https://elpa.gnu.org/packages/modus-themes-4.5.0.tar"; + sha256 = "1f75rkl6bvqsc2s4fz67rk3h3fl9qw4vay0dj1agas4x0zskm89v"; }; packageRequires = [ ]; meta = { @@ -5706,10 +5753,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.16.tar"; - sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311"; + url = "https://elpa.gnu.org/packages/oauth2-0.17.tar"; + sha256 = "0ah0h3k6hiqm977414kyg96r6rrvnwvik3hz3ra3r0mxx7lksqha"; }; packageRequires = [ cl-lib @@ -5851,6 +5898,7 @@ ) { }; orderless = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -5858,12 +5906,12 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.1.tar"; - sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3"; + url = "https://elpa.gnu.org/packages/orderless-1.2.tar"; + sha256 = "1iyfnvwqwn8y4bkv25zw15y8yy5dm89kyk7wlxw0al22bhfc2cm7"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.gnu.org/packages/orderless.html"; license = lib.licenses.free; @@ -5879,10 +5927,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7.10"; + version = "9.7.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.7.10.tar"; - sha256 = "0rabxq2diikdwifybril1b9cxkwry7agyw8gsdyf1n800f8vq5ka"; + url = "https://elpa.gnu.org/packages/org-9.7.12.tar"; + sha256 = "0v0mims57k5ffaf9i8szmrq3zvk3zd7xz7386k8lwc58mmhhdw15"; }; packageRequires = [ ]; meta = { @@ -6351,6 +6399,28 @@ }; } ) { }; + phpinspect = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "phpinspect"; + ename = "phpinspect"; + version = "2.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/phpinspect-2.1.0.tar"; + sha256 = "1ic5dnp2sgahzpfxxgkfbk5as91l23vs1ly23b1igi3b4ajcaqjz"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/phpinspect.html"; + license = lib.licenses.free; + }; + } + ) { }; phps-mode = callPackage ( { elpaBuild, @@ -6573,10 +6643,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar"; - sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax"; + url = "https://elpa.gnu.org/packages/posframe-1.4.4.tar"; + sha256 = "18cvfr2jxwsnsdg9f8wr0g64rkk6q1cc4gchrw76lnnknanidpk7"; }; packageRequires = [ ]; meta = { @@ -6723,10 +6793,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar"; - sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k"; + url = "https://elpa.gnu.org/packages/pulsar-1.1.0.tar"; + sha256 = "0hs65y2avl8w5g4zd68sdg4rl4q15ac53xlbc4qrfjynlajma6mm"; }; packageRequires = [ ]; meta = { @@ -6766,16 +6836,17 @@ elpaBuild, fetchurl, lib, + pyim, }: elpaBuild { pname = "pyim-basedict"; ename = "pyim-basedict"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar"; - sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8"; + url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.5.tar"; + sha256 = "04sfiywyrvilymg013gk81ya0ax6p24d4zyrjg8limjw0fn1b347"; }; - packageRequires = [ ]; + packageRequires = [ pyim ]; meta = { homepage = "https://elpa.gnu.org/packages/pyim-basedict.html"; license = lib.licenses.free; @@ -6939,10 +7010,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar"; - sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28"; + url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.3.tar"; + sha256 = "11m6n93qwfkn6jhn3vlvdz48wsqixlkbwbxsx3qdyj8jmjqpjvz6"; }; packageRequires = [ ]; meta = { @@ -7174,10 +7245,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar"; - sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx"; + url = "https://elpa.gnu.org/packages/rec-mode-1.9.4.tar"; + sha256 = "0pi483g5qgz6gvyi13a4ldfbkaad3xkad08aqfcnmsdylvc9zzma"; }; packageRequires = [ ]; meta = { @@ -7554,6 +7625,27 @@ }; } ) { }; + show-font = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "show-font"; + ename = "show-font"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/show-font-0.1.1.tar"; + sha256 = "0l7l2kx5kq5p5kzigj0h3dwsf2hbcz8xlj06bz5m91gjblm3q6pd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/show-font.html"; + license = lib.licenses.free; + }; + } + ) { }; sisu-mode = callPackage ( { elpaBuild, @@ -8274,10 +8366,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.14"; + version = "0.14.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.14.tar"; - sha256 = "13xwhqlvzfkm5gpprv683r8jri6wy54bhbzg3wiw3m020hqw6ygi"; + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.14.3.tar"; + sha256 = "16j1a2vx9awr5vk1x3i1m526ym6836zxlypx1f50fcwjy0w8q8a3"; }; packageRequires = [ magit-section @@ -8377,7 +8469,6 @@ ) { }; tex-parens = callPackage ( { - auctex, elpaBuild, fetchurl, lib, @@ -8385,12 +8476,12 @@ elpaBuild { pname = "tex-parens"; ename = "tex-parens"; - version = "0.4"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar"; - sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd"; + url = "https://elpa.gnu.org/packages/tex-parens-0.6.tar"; + sha256 = "0pgzs0fw2ijns2xqbyq7whlhjjrhp0axja0381q9v75c7fxrp6ba"; }; - packageRequires = [ auctex ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.gnu.org/packages/tex-parens.html"; license = lib.licenses.free; @@ -8463,6 +8554,7 @@ ) { }; tmr = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -8470,12 +8562,12 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "0.4.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar"; - sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv"; + url = "https://elpa.gnu.org/packages/tmr-1.0.0.tar"; + sha256 = "02dj5kh8ayhfy1w9vy77s7izz4495n4jkcbw6xscc8wyfml0j15f"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.gnu.org/packages/tmr.html"; license = lib.licenses.free; @@ -8559,10 +8651,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.1.1"; + version = "2.7.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.7.1.1.tar"; - sha256 = "1b14gwgfwx9n01mvbpi8q8lr9n4ik8lm580b8dvcaz456pm7bxb8"; + url = "https://elpa.gnu.org/packages/tramp-2.7.1.3.tar"; + sha256 = "0ii16y283yidql05f69yx0x2jf71w8niq5k8mlrqq05z5h4h3sw3"; }; packageRequires = [ ]; meta = { @@ -8645,10 +8737,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.7.4"; + version = "0.7.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.7.4.tar"; - sha256 = "00fcrbdk7gxaa25n5j1g688mlislnyj6w4743870liavvg982z9w"; + url = "https://elpa.gnu.org/packages/transient-0.7.7.tar"; + sha256 = "07c1n76nlchm5pp74hnx7bkwiibpal1ajdkmj559ja3099rgghkx"; }; packageRequires = [ compat @@ -8739,10 +8831,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3.5"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.3.5.tar"; - sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m"; + url = "https://elpa.gnu.org/packages/triples-0.4.0.tar"; + sha256 = "0g29i33bmh9gh4mmk92h6vhhw42k1f2ph02qlrasn0w5fq3pg8vp"; }; packageRequires = [ seq ]; meta = { @@ -8868,10 +8960,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar"; - sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi"; + url = "https://elpa.gnu.org/packages/urgrep-0.5.1.tar"; + sha256 = "1g0gcd3ayqjaj5yl95psh8qnjgaxd6l4r8gn4wlj5pnjnkz4llmv"; }; packageRequires = [ compat @@ -8963,10 +9055,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar"; - sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp"; + url = "https://elpa.gnu.org/packages/use-package-2.4.6.tar"; + sha256 = "0idy78mpg9zikjqfg431q7fd34mwz18blvp6yq1bf29q582a9jyf"; }; packageRequires = [ bind-key ]; meta = { @@ -9158,10 +9250,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2024.3.1.121933719"; + version = "2024.10.9.140346409"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar"; - sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w"; + url = "https://elpa.gnu.org/packages/verilog-mode-2024.10.9.140346409.tar"; + sha256 = "1hm0id8sivb7znvw1f63asbs4sf4v6hkimr0j8bqqda3h9sz197l"; }; packageRequires = [ ]; meta = { @@ -9613,10 +9705,10 @@ elpaBuild { pname = "wrap-search"; ename = "wrap-search"; - version = "4.16.19"; + version = "4.17.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wrap-search-4.16.19.tar"; - sha256 = "1qrvn5cxvd5sl18hyn979f9kany5vnypbflkhzmxas5q0n2miyfw"; + url = "https://elpa.gnu.org/packages/wrap-search-4.17.6.tar"; + sha256 = "0wq0fw5ry5fnp96q9bffawc1vdl4p6kknwhlyf4xypmja011afys"; }; packageRequires = [ ]; meta = { @@ -9634,10 +9726,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.11"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.11.tar"; - sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr"; + url = "https://elpa.gnu.org/packages/xclip-1.11.1.tar"; + sha256 = "0raqlpskjrkxv7a0q5ikq8dqf2h21g0vcxdw03vqcah2v43zxflx"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 5981faab2d1c..2186fede2562 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -15,10 +15,6 @@ lib.packagesFromDirectoryRecursive { inherit (pkgs) codeium; }; - consult-gh = callPackage ./manual-packages/consult-gh { - inherit (pkgs) gh; - }; - lsp-bridge = callPackage ./manual-packages/lsp-bridge { inherit (pkgs) basedpyright git go gopls python3; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix deleted file mode 100644 index c70ec74ee763..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - consult, - embark-consult, - fetchFromGitHub, - forge, - gh, - markdown-mode, - melpaBuild, - unstableGitUpdater, -}: - -melpaBuild { - pname = "consult-gh"; - version = "1.0-unstable-2024-08-24"; - - src = fetchFromGitHub { - owner = "armindarvish"; - repo = "consult-gh"; - rev = "b1d85d179438e4b6469e1b78906a7dde8f07c822"; - hash = "sha256-VmxuXvO0nl0h9IKU+XWfjW90KG/1B+qHoOVhvYJ8XTs="; - }; - - packageRequires = [ - consult - embark-consult - forge - markdown-mode - ]; - - propagatedUserEnvPkgs = [ gh ]; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/armindarvish/consult-gh"; - description = "GitHub CLI client inside GNU Emacs using Consult"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 274888930916..670b6faa51b5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -153,8 +153,8 @@ let # https://github.com/Golevka/emacs-clang-complete-async/issues/90 auto-complete-clang-async = (addPackageRequires super.auto-complete-clang-async [ self.auto-complete ]).overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; - CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include"; - LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib"; + CFLAGS = "-I${lib.getLib pkgs.llvmPackages.libclang}/include"; + LDFLAGS = "-L${lib.getLib pkgs.llvmPackages.libclang}/lib"; }); # part of a larger package @@ -806,7 +806,11 @@ let boa-mode = ignoreCompilationError super.boa-mode; # elisp error # missing optional dependencies - boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ]; + # https://github.com/boogie-org/boogie-friends/issues/42 + boogie-friends = ignoreCompilationError (addPackageRequires super.boogie-friends [ self.lsp-mode ]); + + # this package probably should not be compiled in nix build sandbox + borg = ignoreCompilationError super.borg; bpr = super.bpr.overrideAttrs ( finalAttrs: previousAttrs: { @@ -930,6 +934,12 @@ let # missing optional dependencies conda = addPackageRequires super.conda [ self.projectile ]; + consult-gh = super.consult-gh.overrideAttrs (old: { + propagatedUserEnvPkgs = old.propagatedUserEnvPkgs or [ ] ++ [ pkgs.gh ]; + }); + + consult-gh-forge = buildWithGit super.consult-gh-forge; + counsel-gtags = ignoreCompilationError super.counsel-gtags; # elisp error # https://github.com/fuxialexander/counsel-notmuch/issues/3 @@ -1113,6 +1123,8 @@ let gh-notify = buildWithGit super.gh-notify; + "git-gutter-fringe+" = ignoreCompilationError super."git-gutter-fringe+"; # elisp error + # https://github.com/nlamirault/emacs-gitlab/issues/68 gitlab = addPackageRequires super.gitlab [ self.f ]; @@ -1228,6 +1240,23 @@ let # missing optional dependencies: vterm or eat julia-snail = addPackageRequires super.julia-snail [ self.eat ]; + kanagawa-themes = super.kanagawa-themes.overrideAttrs ( + finalAttrs: previousAttrs: { + patches = + if lib.versionOlder finalAttrs.version "20241015.2237" then + previousAttrs.patches or [ ] + ++ [ + (pkgs.fetchpatch { + name = "fix-compilation-error.patch"; + url = "https://github.com/Fabiokleis/kanagawa-emacs/commit/83c2b5c292198b46a06ec0ad62619d83fd965433.patch"; + hash = "sha256-pB1ht03XCh+BWKHhxBAp701qt/KWAMJ2SQQaN3FgMjU="; + }) + ] + else + previousAttrs.patches or null; + } + ); + kite = ignoreCompilationError super.kite; # elisp error # missing optional dependencies @@ -1356,6 +1385,13 @@ let org-trello = ignoreCompilationError super.org-trello; # elisp error + # Requires xwidgets compiled into emacs, so mark this package + # as broken if emacs hasn't been compiled with the flag. + org-xlatex = + if self.emacs.withXwidgets + then super.org-xlatex + else markBroken super.org-xlatex; + # Optimizer error: too much on the stack orgnav = ignoreCompilationError super.orgnav; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index c416ba6cdb34..b4b009d0ac9c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -135,10 +135,10 @@ elpaBuild { pname = "anzu"; ename = "anzu"; - version = "0.64.0.20240201.224751"; + version = "0.66.0.20240928.212403"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/anzu-0.64.0.20240201.224751.tar"; - sha256 = "0gfhzb3064d8j4z91636imrh11202sy4905gc4j5rn2raylwwx73"; + url = "https://elpa.nongnu.org/nongnu-devel/anzu-0.66.0.20240928.212403.tar"; + sha256 = "1a96jbbg2miprbdj79l4q2k12r4wxklmbrrw3smfyrp5hisj71gc"; }; packageRequires = [ ]; meta = { @@ -177,10 +177,10 @@ elpaBuild { pname = "apropospriate-theme"; ename = "apropospriate-theme"; - version = "0.2.0.0.20240517.142324"; + version = "0.2.0.0.20240921.102210"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240517.142324.tar"; - sha256 = "0pcgwz5qwl45h2c0mknw7h977v74lzpyyaxavnnm3hr8mfx1jlgm"; + url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240921.102210.tar"; + sha256 = "04x4s341lvygxxnjq3wjy8sp8p9y66kx3csklp46x33qyqbbdx82"; }; packageRequires = [ ]; meta = { @@ -284,10 +284,10 @@ elpaBuild { pname = "bash-completion"; ename = "bash-completion"; - version = "3.1.1.0.20230612.110320"; + version = "3.1.1.0.20240914.174817"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20230612.110320.tar"; - sha256 = "1jw3cx6mzxv0mpk9xs1q3vll9sfyvw2mvvvpk9zirq2l13c31cjg"; + url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20240914.174817.tar"; + sha256 = "1s5wx8374naay0silh95vlci5qrxxz04av4f5iz94iwvi6jz0fa0"; }; packageRequires = [ ]; meta = { @@ -305,10 +305,10 @@ elpaBuild { pname = "beancount"; ename = "beancount"; - version = "0.9.0.20240801.232930"; + version = "0.9.0.20240908.163924"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240801.232930.tar"; - sha256 = "0mjf5nsp4zpck6nrqrbzk4xwkwglngs1nv8vdifdzgfdj1gxc8l0"; + url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240908.163924.tar"; + sha256 = "0iqshz6xamnhx4m5phr5zrfmai61l41f44hmyiqvwqg6spyf6nzi"; }; packageRequires = [ ]; meta = { @@ -326,10 +326,10 @@ elpaBuild { pname = "better-jumper"; ename = "better-jumper"; - version = "1.0.1.0.20220111.101829"; + version = "1.0.1.0.20241009.111701"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/better-jumper-1.0.1.0.20220111.101829.tar"; - sha256 = "10wgfplj5sxr6lp0i9p5r0mvb2cf2xbpyfs6ky2kr4i5d9x29gaq"; + url = "https://elpa.nongnu.org/nongnu-devel/better-jumper-1.0.1.0.20241009.111701.tar"; + sha256 = "1ghi9g9bdai7i7fh9s5nldl9zfk3si9vjjn66qldb6q7v4g86gxx"; }; packageRequires = [ ]; meta = { @@ -453,10 +453,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.35.0.20240718.1456"; + version = "1.36.0.20240904.231112"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.35.0.20240718.1456.tar"; - sha256 = "1f71i87mxd3z24mywwj3pdrdj4irg1k5bmrrlknbkm7i3427mm1z"; + url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.36.0.20240904.231112.tar"; + sha256 = "1kshwvzszv5jpjf3j5rpwas0zs60xprk0v30w58822vh13swcqrc"; }; packageRequires = [ ]; meta = { @@ -516,10 +516,10 @@ elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.18.4.0.20231118.64512"; + version = "4.18.5.0.20241007.162342"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cdlatex-4.18.4.0.20231118.64512.tar"; - sha256 = "037lh3j49cv8yz0vwl441gg9s24im614gzjys6095mj794q47bq7"; + url = "https://elpa.nongnu.org/nongnu-devel/cdlatex-4.18.5.0.20241007.162342.tar"; + sha256 = "0zk8whr3644kab13p11rvbdrqlr2np6s0h329ggvw7bnsphg35yw"; }; packageRequires = [ ]; meta = { @@ -544,10 +544,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.15.1.0.20240815.91839"; + version = "1.16.0.0.20240925.134028"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240815.91839.tar"; - sha256 = "0bp0f886gmka3ryb8yr8qspwl5rxnca38yn6fhrwnm5ga8j11d90"; + url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.0.0.20240925.134028.tar"; + sha256 = "1j874gyrdiy90f8hlxjkvxjdwzs8pixi19l28d009npj69mv0f6n"; }; packageRequires = [ clojure-mode @@ -594,10 +594,10 @@ elpaBuild { pname = "clojure-ts-mode"; ename = "clojure-ts-mode"; - version = "0.2.2.0.20240725.113944"; + version = "0.2.2.0.20240930.131600"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240725.113944.tar"; - sha256 = "0v487r0inll37lp6rvd9ljyv5286xqpkcv28lbchbl71x2pm73ac"; + url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240930.131600.tar"; + sha256 = "0qs76xj2fjhp42882ay1sg7ihzanzdh8mq4yffmqj1ljhkdyxsxc"; }; packageRequires = [ ]; meta = { @@ -638,10 +638,10 @@ elpaBuild { pname = "consult-flycheck"; ename = "consult-flycheck"; - version = "1.0.0.20240718.101150"; + version = "1.0.0.20240926.91748"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240718.101150.tar"; - sha256 = "054mkwddsdyh3kkj0ky35gq38j2j4hxx98k5igx6awqsm1mpwgz1"; + url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240926.91748.tar"; + sha256 = "1f5869y8614hv91f3sc7i10wr3393mygz841crw4an4m03kxkq7f"; }; packageRequires = [ consult @@ -795,10 +795,10 @@ elpaBuild { pname = "dart-mode"; ename = "dart-mode"; - version = "1.0.7.0.20240523.181912"; + version = "1.0.7.0.20240925.1934"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20240523.181912.tar"; - sha256 = "1v2nxiin07g3kycids2f9ixgnc3gcm592xs6022ks9px5x3rnnv9"; + url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20240925.1934.tar"; + sha256 = "0pzhvlbfdk0adj4by21knbpvkj99dzclhixad2cdyfvqgw3j1xkk"; }; packageRequires = [ ]; meta = { @@ -850,6 +850,27 @@ }; } ) { }; + devil = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devil"; + ename = "devil"; + version = "0.7.0beta3.0.20240129.2809"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.0beta3.0.20240129.2809.tar"; + sha256 = "1fhvp1kvvli5g9a3575bsa8zyfnf1q0p5wn15819zvncjp1912nl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/devil.html"; + license = lib.licenses.free; + }; + } + ) { }; diff-ansi = callPackage ( { elpaBuild, @@ -901,10 +922,10 @@ elpaBuild { pname = "dockerfile-mode"; ename = "dockerfile-mode"; - version = "1.7.0.20240324.61044"; + version = "1.7.0.20240914.114946"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.7.0.20240324.61044.tar"; - sha256 = "0815zw60kjhsypriafi603vm3svp5x1bh5la0m9m9kw7dvgy04bj"; + url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.7.0.20240914.114946.tar"; + sha256 = "1v7yv221p844249m75ip41p0khn2gas7hfv8b0np3g78pzdai4mw"; }; packageRequires = [ ]; meta = { @@ -922,10 +943,10 @@ elpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "1.8.2.0.20240614.130330"; + version = "1.8.2.0.20240912.203213"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240614.130330.tar"; - sha256 = "04z1n3ay5n75bdz2fic9nzgjgsvvagl6620abi8gnznig85d60k7"; + url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240912.203213.tar"; + sha256 = "1wkyn7wswrgda7y267mxb6bi0h5ywp7hh2d4cmz3yfglnq1pmp1g"; }; packageRequires = [ ]; meta = { @@ -1071,10 +1092,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.6.2.0.20240702.81639"; + version = "3.6.3.0.20240930.91332"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.2.0.20240702.81639.tar"; - sha256 = "18b8g5z0w81704b84av6mcq2mf9mlj83qr18l2y7fv2qv16kwz85"; + url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.3.0.20240930.91332.tar"; + sha256 = "1mf0d6gzykvpyjk2kxivlqs5xwxqdsxj9adfi92bna01dv5vrj3n"; }; packageRequires = [ ]; meta = { @@ -1092,10 +1113,10 @@ elpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "4.0.1.0.20240819.155921"; + version = "4.0.3.0.20240906.134234"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.1.0.20240819.155921.tar"; - sha256 = "0xm5b913ja85rw7h7fjhbzz288brsgd8xiq5wi7f8s8dwkbmqdv4"; + url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.3.0.20240906.134234.tar"; + sha256 = "0a9456snizy8w47vh8zj00180kncg0h3vv3iq86lckqhv2qbp0az"; }; packageRequires = [ ]; meta = { @@ -1132,18 +1153,20 @@ fetchurl, goto-chg, lib, + nadvice, }: elpaBuild { pname = "evil"; ename = "evil"; - version = "1.15.0.0.20240810.165559"; + version = "1.15.0.0.20241006.175409"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240810.165559.tar"; - sha256 = "0a406n947j8blv7yrx691bjfgfqmkbpszxjdvwq5hda0mrc9g2kl"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20241006.175409.tar"; + sha256 = "0w752hhnpkfa5wqm1rk6nzq6n9y8c8mjzjhzri91l06jngpl6ckd"; }; packageRequires = [ cl-lib goto-chg + nadvice ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/evil.html"; @@ -1745,10 +1768,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.31.0.20240726.121756"; + version = "0.31.1.0.20240907.224131"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.0.20240726.121756.tar"; - sha256 = "19mfyvr13c95qpjrx7ngrraifiaqihpxkh7d6p5j0pda37hq5vav"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.1.0.20240907.224131.tar"; + sha256 = "1h8ifdccg72rfj1hgp8lshaklnql1vhgdi9i35057z76zwivsxn2"; }; packageRequires = [ project ]; meta = { @@ -1878,10 +1901,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.28.2.0.20240811.112008"; + version = "0.28.3.0.20240920.3540"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.2.0.20240811.112008.tar"; - sha256 = "144543qkxxycnailc8m7fhfqz4c8wphi9xc4b4p2cc009zn51xqs"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.3.0.20240920.3540.tar"; + sha256 = "1ijrhz86nva194qsdch2zm9v4bzdppcg3vslnh03ss4f6qkcrfzz"; }; packageRequires = [ geiser @@ -1925,10 +1948,10 @@ elpaBuild { pname = "geiser-mit"; ename = "geiser-mit"; - version = "0.15.0.20211204.193555"; + version = "0.15.0.20240909.114537"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-mit-0.15.0.20211204.193555.tar"; - sha256 = "146pvaj6y60vg57swna1nh9f7hjkkxq3033204vqyn0gbqy6psyw"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-mit-0.15.0.20240909.114537.tar"; + sha256 = "1a0j47f6qmn0p5zfv7gylgz8q9iax4xl6a7y9xq76cs2x6mi5883"; }; packageRequires = [ geiser ]; meta = { @@ -1994,10 +2017,10 @@ elpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "4.0.0.0.20240818.190757"; + version = "4.0.0.0.20240822.173501"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/git-commit-4.0.0.0.20240818.190757.tar"; - sha256 = "057xpp0w1hyb2c8h0sr4lnpyr5hphgb9yn27rq5jqhwkn8v9r8b2"; + url = "https://elpa.nongnu.org/nongnu-devel/git-commit-4.0.0.0.20240822.173501.tar"; + sha256 = "0k3bd17112xvgiykybb5sffk2vywz56zgm2h56bykhqq35sdcww8"; }; packageRequires = [ compat @@ -2045,10 +2068,10 @@ elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.4.1.0.20240818.212703"; + version = "0.4.5.0.20241009.160730"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.1.0.20240818.212703.tar"; - sha256 = "1nw13pfbgfja5c70zpmcrm6wqvps4zchskj26x1fh171233m8wln"; + url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.5.0.20241009.160730.tar"; + sha256 = "0kmmxhbmxi7l1ig01b2v36diidlz0192y8nxjr3znycx0qzdbn7x"; }; packageRequires = [ compat @@ -2112,10 +2135,10 @@ elpaBuild { pname = "gnuplot"; ename = "gnuplot"; - version = "0.8.1.0.20230727.75810"; + version = "0.8.1.0.20240914.153054"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20230727.75810.tar"; - sha256 = "16708cxz3jc0yw7wppdbqywy1k9drq9kqbk6j1sv1s7n1gc0xh00"; + url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20240914.153054.tar"; + sha256 = "0pv7ql14d7srb98nidw6fr4mwgssqyv95yskflz27dbbwjlycmn6"; }; packageRequires = [ ]; meta = { @@ -2219,10 +2242,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.0.0.20240814.85808"; + version = "0.9.5.0.20241013.125757"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240814.85808.tar"; - sha256 = "0kpd0fypky0mwfb1lfyd3jbpr2lxispx02nqiz3a61zziljgdazd"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.5.0.20241013.125757.tar"; + sha256 = "123bvwfh6anp6arwznzinyckakpadagz6pn7381848k9zp5xz6lg"; }; packageRequires = [ compat @@ -2243,10 +2266,10 @@ elpaBuild { pname = "graphql-mode"; ename = "graphql-mode"; - version = "1.0.0.0.20240328.173129"; + version = "1.0.0.0.20240918.121927"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240328.173129.tar"; - sha256 = "1pwlmi35iyp397a3f7ipb5i1lx6v6qc03xz0l7nh4xlv0bkwxzk5"; + url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240918.121927.tar"; + sha256 = "198kbpazgczyb0qjclm8xgaha6wh6spr8ybvrbhm6nsf90zgv5kw"; }; packageRequires = [ ]; meta = { @@ -2350,10 +2373,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.5.0.20240527.85346"; + version = "17.5.0.20241007.132004"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20240527.85346.tar"; - sha256 = "0wdanl6dh3j4z00mrqz3763gg8gjx9c3qsfd1mkz4as17dmqppjm"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241007.132004.tar"; + sha256 = "1dj72kjy3jjxbfxxhj27yspc7n0059p7bxrv66hrzb0iginip45f"; }; packageRequires = [ ]; meta = { @@ -2384,6 +2407,27 @@ }; } ) { }; + haskell-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haskell-ts-mode"; + ename = "haskell-ts-mode"; + version = "1.0.20240925.24042"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20240925.24042.tar"; + sha256 = "1kkfg9b0cfa2ygxkp5da98sc0w2b8q2q99rcfdqm00i8l6lj5wm9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; helm = callPackage ( { elpaBuild, @@ -2395,10 +2439,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.9.9.0.20240818.123128"; + version = "4.0.0.20240929.41608"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240818.123128.tar"; - sha256 = "01zj0bi9189nbpgp88sdpl61ly1xhqaf33cp8k41sfpka3v0g24f"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20240929.41608.tar"; + sha256 = "1xf7nbnd2399cz2qkpvb0h38cdwx76jk9sq9wk67y6l23kvqh0sr"; }; packageRequires = [ helm-core @@ -2420,10 +2464,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.9.9.0.20240818.123128"; + version = "4.0.0.20240929.41608"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240818.123128.tar"; - sha256 = "185acikmdvzlwjnac7xkh5agzihka1h6r8ng3ma05gwdxkxnb28s"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20240929.41608.tar"; + sha256 = "0lfk8hamfbaz0ifs4fkl836dqlcyw4g7kbsnmi5qjlyqc27yk8f9"; }; packageRequires = [ async ]; meta = { @@ -2525,10 +2569,10 @@ elpaBuild { pname = "htmlize"; ename = "htmlize"; - version = "1.57.0.20240527.145632"; + version = "1.58.0.20240915.165713"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/htmlize-1.57.0.20240527.145632.tar"; - sha256 = "1wcx6hi2jiaac801hzhiix5ymhxmh8whwbjd5l9fbjfhxf0m0r9b"; + url = "https://elpa.nongnu.org/nongnu-devel/htmlize-1.58.0.20240915.165713.tar"; + sha256 = "1i2gp0m2qy7rknymn3ps1ss1vsbrx0zkxb6ya1ymc5vlqblqfwya"; }; packageRequires = [ ]; meta = { @@ -2553,10 +2597,10 @@ elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.4pre0.20240818.142318"; + version = "0.5pre0.20241012.232703"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240818.142318.tar"; - sha256 = "0ggsxw2s974l7m4v8p3f535fz13d0z15gwpx6pp7k3rrs5was9vp"; + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241012.232703.tar"; + sha256 = "1wj52cs86jzl2cx9a3599fjncnra1x8as9md6i5afwmm9flb3yn6"; }; packageRequires = [ compat @@ -2573,6 +2617,32 @@ }; } ) { }; + hyperdrive-org-transclusion = callPackage ( + { + elpaBuild, + fetchurl, + hyperdrive, + lib, + org-transclusion, + }: + elpaBuild { + pname = "hyperdrive-org-transclusion"; + ename = "hyperdrive-org-transclusion"; + version = "0.3pre0.20240930.224512"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion-0.3pre0.20240930.224512.tar"; + sha256 = "13wacgy29zm9yly58hznj0k1liah9kqw2b6gkpk8804yrjzjhgd4"; + }; + packageRequires = [ + hyperdrive + org-transclusion + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion.html"; + license = lib.licenses.free; + }; + } + ) { }; idle-highlight-mode = callPackage ( { elpaBuild, @@ -2672,10 +2742,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.8.1.0.20240627.213541"; + version = "2.8.1.0.20240925.4944"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240627.213541.tar"; - sha256 = "0yw67r2jwhrsxdzx1hnri6w8wxm5z76fxxbk333xf043gw5cg8ay"; + url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240925.4944.tar"; + sha256 = "1wl5nzrbafvmvvvq477lsvc14pvlmq8x9j1cqbd0cj11lvn4k1qb"; }; packageRequires = [ ]; meta = { @@ -2740,10 +2810,10 @@ elpaBuild { pname = "j-mode"; ename = "j-mode"; - version = "2.0.1.0.20240611.171122"; + version = "2.0.1.0.20240920.120622"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240611.171122.tar"; - sha256 = "1c4k74an4ib2zv19mjxxn9vl34w0ybyhmmgiv1l8jimqn5vi293h"; + url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240920.120622.tar"; + sha256 = "1v0qffz9qd943fmxny0ik5vrgrfskmf6rv9mgxp7xz6wz3v38ypd"; }; packageRequires = [ ]; meta = { @@ -2803,10 +2873,10 @@ elpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "0.4.0.20240506.120530"; + version = "1.0.0.0.20240926.152808"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-0.4.0.20240506.120530.tar"; - sha256 = "0kiwlc017bw8y2p166y2hpkpssml2rrx6p056qqn99ki5m682kav"; + url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.0.0.20240926.152808.tar"; + sha256 = "0hhpzarz8xa61mp6drm0j98832h8sdammkp55ap6bj35vlyppc13"; }; packageRequires = [ ]; meta = { @@ -2932,7 +3002,6 @@ dash, elpaBuild, fetchurl, - git-commit, lib, magit-section, seq, @@ -2942,15 +3011,14 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.0.0.0.20240817.175213"; + version = "4.1.1.0.20241001.205222"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.0.0.0.20240817.175213.tar"; - sha256 = "1abp8d21dm8ygmmmx2bhq1wsz23w259l110743zyx77jbrynizci"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.1.0.20241001.205222.tar"; + sha256 = "1qfaaqhm8m7cg4lrllv770w7bl2mfnpyx551accw757jxpnw8qdn"; }; packageRequires = [ compat dash - git-commit magit-section seq transient @@ -2974,10 +3042,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.0.0.0.20240818.190757"; + version = "4.1.1.0.20241001.205222"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.0.0.0.20240818.190757.tar"; - sha256 = "1bm8k9a8x06310099s71s11igh838fk4k26nb0gsd8xp1szima38"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.1.0.20241001.205222.tar"; + sha256 = "1lad3vqflf4fdsjfiyarjgcl7w73k8rj0bbsndc3xd6j5q53azfr"; }; packageRequires = [ compat @@ -2990,6 +3058,27 @@ }; } ) { }; + markdown-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "markdown-mode"; + ename = "markdown-mode"; + version = "2.7alpha0.20240829.32430"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20240829.32430.tar"; + sha256 = "0npgvcni0h5nr253fsn0d1cm3fnq1s662ba7aa23vsvkyk1x54d9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/markdown-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; mastodon = callPackage ( { elpaBuild, @@ -3001,10 +3090,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.0.26.0.20240816.70908"; + version = "1.0.27.0.20240920.183931"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.26.0.20240816.70908.tar"; - sha256 = "0nayg2py0n2m1ldpl1hwmiqv7yzvjxbbwndzxwipak0wvjzw0psl"; + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.27.0.20240920.183931.tar"; + sha256 = "0wy6ibdbj984aycscvsg24k4z3a0dlzi2ghbvrb8zq3lma8sy2a6"; }; packageRequires = [ persist @@ -3076,10 +3165,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.4.5.0.20240818.154515"; + version = "1.4.5.0.20241014.63605"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240818.154515.tar"; - sha256 = "0n716x8vyk44n4cw1rw68b747n2r3hvagx4asbhjck8mprnlw6z7"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20241014.63605.tar"; + sha256 = "1ws4i72gmr6g8fxvc27p28rm6wjdm71xpi03xiwy33x7m960g470"; }; packageRequires = [ ]; meta = { @@ -3139,10 +3228,10 @@ elpaBuild { pname = "monokai-theme"; ename = "monokai-theme"; - version = "3.5.3.0.20240710.102754"; + version = "3.5.3.0.20240911.104603"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/monokai-theme-3.5.3.0.20240710.102754.tar"; - sha256 = "0xncnb5fx7q55cl18gs6gw63di7p9kjyrfq7an5fig1rkmsyp4sx"; + url = "https://elpa.nongnu.org/nongnu-devel/monokai-theme-3.5.3.0.20240911.104603.tar"; + sha256 = "0721jwpyzvnqhzjldjdp98j585ivg02240jnxlnmry3428vc37av"; }; packageRequires = [ ]; meta = { @@ -3335,10 +3424,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.4.2.0.20240518.90129"; + version = "0.6.0.20240907.102556"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.4.2.0.20240518.90129.tar"; - sha256 = "0rkvdmff5fnjaziq14vwr4af0msq5lwzf4cyqrnyakh4dq7ffmpx"; + url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20240907.102556.tar"; + sha256 = "16dv65jz0ykzi0dk2zd1gj46113wq1bnzxzbacpbddix53vkfbc1"; }; packageRequires = [ org ]; meta = { @@ -3406,10 +3495,10 @@ elpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.3.3.0.20240818.24342"; + version = "0.3.4.0.20241001.42820"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.3.0.20240818.24342.tar"; - sha256 = "0xg73swqd6dff1nh4z2jhhvj9ssq65wymq3jlbyb1nscm3g4lr83"; + url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.4.0.20241001.42820.tar"; + sha256 = "1xcdk15z18s073q3hlg7dck8p5ssgap35a6m0f6cbmd5dbd3r05f"; }; packageRequires = [ ]; meta = { @@ -3568,10 +3657,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.23.0.20240516.73305"; + version = "0.24.0.20241007.131950"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.23.0.20240516.73305.tar"; - sha256 = "1g1jinavkrlxnrpsjkfc8d9n9ag9y1svi0p8yqb4rswvjv0l6vll"; + url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241007.131950.tar"; + sha256 = "1srjs8xwwiqzjh550snzk0yzd4vy3ynk0d3i41y2i7wgfdggyl0p"; }; packageRequires = [ let-alist ]; meta = { @@ -3611,10 +3700,10 @@ elpaBuild { pname = "page-break-lines"; ename = "page-break-lines"; - version = "0.15.0.20240311.102621"; + version = "0.15.0.20240911.171451"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240311.102621.tar"; - sha256 = "03bz8kr6mk7k9sfnai805kjfb7w4q45ba83k4vylwb8c1x5km32h"; + url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240911.171451.tar"; + sha256 = "142s6q9fyr030rkdj1i349nbsfab7r742h2i1x430g8m19qai4zr"; }; packageRequires = [ ]; meta = { @@ -3623,6 +3712,27 @@ }; } ) { }; + paredit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "paredit"; + ename = "paredit"; + version = "27beta0.20230718.202710"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20230718.202710.tar"; + sha256 = "0fz65pr6p6dz3i78rzprzznzhyw34w8msnd4mzkls63bm4548gmd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/paredit.html"; + license = lib.licenses.free; + }; + } + ) { }; parseclj = callPackage ( { elpaBuild, @@ -3747,10 +3857,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.25.1.0.20240722.164315"; + version = "1.26.1.0.20240912.223846"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.25.1.0.20240722.164315.tar"; - sha256 = "1fz4w8sbz59ylrag2kdv4wqjmvxj4dhi4q0bhslxa55vwgg2yfd6"; + url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20240912.223846.tar"; + sha256 = "09jppnrpl6y1y41g7bshy674c3p39l8r060zq57kr2f022z93mg8"; }; packageRequires = [ ]; meta = { @@ -3810,10 +3920,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.9.0snapshot0.20240814.185449"; + version = "2.9.0snapshot0.20241009.115247"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240814.185449.tar"; - sha256 = "059pjfr5gqmd7mrpxmkgasqaqcbhp8q0nj9dhrwqrlfm6g5xgg1q"; + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241009.115247.tar"; + sha256 = "0lns0g1b52ib512dc0mqr8si6yqvnpcv148s262j5jqmm4a2sdm5"; }; packageRequires = [ ]; meta = { @@ -3831,10 +3941,10 @@ elpaBuild { pname = "proof-general"; ename = "proof-general"; - version = "4.6snapshot0.20240708.152546"; + version = "4.6snapshot0.20241004.113700"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20240708.152546.tar"; - sha256 = "1gc8g6gm0q7iirvgniv7fm3djlb651czr9iws0p41fvi4kq28b1r"; + url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241004.113700.tar"; + sha256 = "1kki60ds5mqkm89lfyx2ac510200bqfnmlkfcjkn7zcrkkcl6s7r"; }; packageRequires = [ ]; meta = { @@ -3874,10 +3984,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20240813.124142"; + version = "1.0.20241001.105847"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240813.124142.tar"; - sha256 = "0ypqv36wibcagkqpjwl3mwpqa4k59wns6kb1v55w2gywnk6qgv1y"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241001.105847.tar"; + sha256 = "0yhvr3c6f2hsdj4i699h7z4gjjim359wk09z917lb8dqdd3ddjdv"; }; packageRequires = [ ]; meta = { @@ -3958,10 +4068,10 @@ elpaBuild { pname = "reformatter"; ename = "reformatter"; - version = "0.8.0.20240515.204925"; + version = "0.8.0.20241007.102705"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20240515.204925.tar"; - sha256 = "1iq4a99fxaaq2k0q9rfsprxx21sam8cpn455jddpcdcl71flbd72"; + url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241007.102705.tar"; + sha256 = "1z3zdmq78vziv45g133y1bnyzaszx0v16vdmwdfpcakj7b11qqw7"; }; packageRequires = [ ]; meta = { @@ -4042,10 +4152,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.5.0.20240520.74946"; + version = "1.0.6.0.20240919.160702"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.5.0.20240520.74946.tar"; - sha256 = "0k64mr7z18rf1w8fn83ajsbdghc9i8qf6lmc2wyckif8cwj3f9fa"; + url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20240919.160702.tar"; + sha256 = "10ack1z2zpfsn2li5nl6l7rpsm43hivgikjdqz5zgiskmqdfy1m5"; }; packageRequires = [ ]; meta = { @@ -4090,10 +4200,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "94.0.0.20240708.212011"; + version = "94.0.0.20240926.92457"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240708.212011.tar"; - sha256 = "01jyhpqqskizsclvxzii1kv20iklb8y01hglhhavrddf1dri7jza"; + url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240926.92457.tar"; + sha256 = "09hgnzzfi6wdy3p0nfl6a00npxpsdy30dyc89m1h087wlhkjjyci"; }; packageRequires = [ compat ]; meta = { @@ -4217,10 +4327,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.30snapshot0.20240731.151818"; + version = "2.30snapshot0.20241013.100856"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240731.151818.tar"; - sha256 = "16xbiwqbp2zpppymxxwkbg1qmahih6dfb535dfa47b26j2wschhp"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20241013.100856.tar"; + sha256 = "19i9vgb1h20lmfskr13b7jkj7xg16dkm0ymhndi41xbimdnvav42"; }; packageRequires = [ macrostep ]; meta = { @@ -4301,10 +4411,10 @@ elpaBuild { pname = "spacemacs-theme"; ename = "spacemacs-theme"; - version = "0.2.0.20240815.213429"; + version = "0.2.0.20240825.170904"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240815.213429.tar"; - sha256 = "1g7fzghy5nmz8v8vx5y6g3cwc2n9c1ryr09nrdfz3zlrv7r32df6"; + url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240825.170904.tar"; + sha256 = "196nby3c283qls06m6vgjr0g964jpyy760y1mmllkczbm4ia34aw"; }; packageRequires = [ ]; meta = { @@ -4322,10 +4432,10 @@ elpaBuild { pname = "spell-fu"; ename = "spell-fu"; - version = "0.3.0.20240616.234552"; + version = "0.3.0.20241011.20613"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20240616.234552.tar"; - sha256 = "1dnyz5dm2p6nj8imqpmz23n2j368ygnff4z6f90vl6g52pv07d9r"; + url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20241011.20613.tar"; + sha256 = "1v9qzc7hqq0scs9vsgp88pp8hihxlsa8mcq5hmcz4g3p1ffhc1lb"; }; packageRequires = [ ]; meta = { @@ -4406,10 +4516,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.14.0.20240724.164835"; + version = "1.2.16.0.20241006.204608"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.14.0.20240724.164835.tar"; - sha256 = "153rx77g6v6klyb4y3r322lbd7s1ympkya3sj04gvz3ka5d7znf3"; + url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.16.0.20241006.204608.tar"; + sha256 = "0xqqdjpkbf27yaixh60k79xnqpj8kppy9lc1z2ij73sp3lync0gb"; }; packageRequires = [ ]; meta = { @@ -4428,10 +4538,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.27.5.0.20240411.60241"; + version = "0.27.6.0.20240905.90947"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.5.0.20240411.60241.tar"; - sha256 = "03diw4psd0chk3l6vd3fm1y99xby9b77nnd48jlxa06dgdx3jan9"; + url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20240905.90947.tar"; + sha256 = "0wsl9dnz1vrr5qajcps5095gaxpqwspb16qac72sdafxidjfgabh"; }; packageRequires = [ compat ]; meta = { @@ -4450,10 +4560,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.1.0.0.20240622.93531"; + version = "9.2.0.0.20240921.44423"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.1.0.0.20240622.93531.tar"; - sha256 = "0b4x4p8iypmmqw0yn4c683rbvkn5n7nccr9pjnn89yx93d4pab0y"; + url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.2.0.0.20240921.44423.tar"; + sha256 = "113gx8yrb5b75fca04k1335pfqwm5mhy5ns7wa9115wagdksfkj8"; }; packageRequires = [ seq ]; meta = { @@ -4472,10 +4582,10 @@ elpaBuild { pname = "symbol-overlay"; ename = "symbol-overlay"; - version = "4.1.0.20240311.120733"; + version = "4.3.0.20240913.162400"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.1.0.20240311.120733.tar"; - sha256 = "0q4jj92l2xj5lj6hbxx42flrx4x923jidqmvkqq3japc2gvp8g00"; + url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20240913.162400.tar"; + sha256 = "0i5rs6cqfjl1c6m8wf0wwlzbsc7zvw9x0b8g8rds9n5c23b7gv15"; }; packageRequires = [ seq ]; meta = { @@ -4882,10 +4992,10 @@ elpaBuild { pname = "vm"; ename = "vm"; - version = "8.3.0snapshot0.20240814.44941"; + version = "8.3.0snapshot0.20240917.131054"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240814.44941.tar"; - sha256 = "1w5a0jm22xr6m1i2c5gghgy159dpqndkqhkyma3sagx5bmdsldrb"; + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240917.131054.tar"; + sha256 = "0csg8ng38jqw5jlj5db24ngh5ay9qi8p8bvfgg3acxa26qjma03l"; }; packageRequires = [ cl-lib @@ -4929,10 +5039,10 @@ elpaBuild { pname = "webpaste"; ename = "webpaste"; - version = "3.2.2.0.20240306.62647"; + version = "3.2.2.0.20241002.53654"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20240306.62647.tar"; - sha256 = "1iw744ncnfq8mhr5r1v09n14nvf26bhvja7fqwjsw5ainhfxzw6y"; + url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20241002.53654.tar"; + sha256 = "0y63yrid0cxszfsm99pj6nig2siq85flma5l12fiydkpa6xh3ybj"; }; packageRequires = [ cl-lib @@ -4953,10 +5063,10 @@ elpaBuild { pname = "wfnames"; ename = "wfnames"; - version = "1.2.0.20240418.100527"; + version = "1.2.0.20240822.162149"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20240418.100527.tar"; - sha256 = "112m3y96bdsk75vza4lh9lgdcnv35c3iqgidkgpynsgxil4njshj"; + url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20240822.162149.tar"; + sha256 = "0wcnw48gpf0frx9fdhz4f4cxisb4v7dwbhd9q3i7j1ivdd07diwg"; }; packageRequires = [ ]; meta = { @@ -5017,10 +5127,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.4.1.0.20240816.195813"; + version = "3.4.2.0.20240831.223035"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.1.0.20240816.195813.tar"; - sha256 = "1z9c5ymia0g8mpx0nszrbw0yy23a7f91kyqxpvx544kbxh6k62dy"; + url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.2.0.20240831.223035.tar"; + sha256 = "120v2n8py0qjcmlnf8l7p83w3bb5vg614ci65gliqhgmikhbwafh"; }; packageRequires = [ compat ]; meta = { @@ -5127,10 +5237,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "25.9.20240725161125.0.20240725.161208"; + version = "26.6.20241009212806.0.20241009.212859"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-25.9.20240725161125.0.20240725.161208.tar"; - sha256 = "06pvcbwj7b7h7nbv223yfjrxanf25s6rm3fq09zwmphwyy3ldlaw"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.6.20241009212806.0.20241009.212859.tar"; + sha256 = "07vpnsrifc6nkf7zrhahzgxn196wm3w71zvsvb249sjf3za9gz07"; }; packageRequires = [ ]; meta = { @@ -5191,10 +5301,10 @@ elpaBuild { pname = "yaml-mode"; ename = "yaml-mode"; - version = "0.0.16.0.20240317.160205"; + version = "0.0.16.0.20241003.15333"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20240317.160205.tar"; - sha256 = "08k4bygryrv0byczs6v06bm18m654fc070jjx85d3a2fxr9dh9a9"; + url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20241003.15333.tar"; + sha256 = "1c6lid3iwxa911zk579rvy1dq8azq6xmp0s6lahchkcq40dvbjl5"; }; packageRequires = [ ]; meta = { @@ -5213,10 +5323,10 @@ elpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "1.0.0.20240603.75736"; + version = "1.0.0.20240911.80118"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240603.75736.tar"; - sha256 = "0nw30a4ilgm65ic97vsvxjj6bw4p27mblrlymwnsg8hm7rnxmnwy"; + url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240911.80118.tar"; + sha256 = "1wn5ckrlpacrlil6ap9j1x1lfr1yydnf0hcy268ji52hwvkdf55p"; }; packageRequires = [ yasnippet ]; meta = { @@ -5234,10 +5344,10 @@ elpaBuild { pname = "zenburn-theme"; ename = "zenburn-theme"; - version = "2.9.0snapshot0.20240612.125832"; + version = "2.9.0snapshot0.20240926.61928"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0snapshot0.20240612.125832.tar"; - sha256 = "1wgpb9x591z28gy7cm8i45qxl7srhj6sgcpnbzi303rbh90rd4sg"; + url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0snapshot0.20240926.61928.tar"; + sha256 = "029ip7ar11vif0c7qazsizp8600z7j0yznwl3j6wywpi6dzx4sii"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 832fc2c9b16f..e4b11ec07df7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -135,10 +135,10 @@ elpaBuild { pname = "anzu"; ename = "anzu"; - version = "0.64"; + version = "0.66"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar"; - sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb"; + url = "https://elpa.nongnu.org/nongnu/anzu-0.66.tar"; + sha256 = "17pyi02mydv59g5qwdzmf1rymkvvg52kx4b8n45pkwkhrwdmj2g3"; }; packageRequires = [ ]; meta = { @@ -453,10 +453,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.35"; + version = "1.36"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar"; - sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.36.tar"; + sha256 = "1glcsigj1s796xr9wps6a5mzrdl5qlfvmsnsa2yp5cwhkb9h1f50"; }; packageRequires = [ ]; meta = { @@ -516,10 +516,10 @@ elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.18.4"; + version = "4.18.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar"; - sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.5.tar"; + sha256 = "0d7ivpxkn7a4cam0cmgar9s0r943ni046dfn6z9k50zhzhaxcw6y"; }; packageRequires = [ ]; meta = { @@ -544,10 +544,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar"; - sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6"; + url = "https://elpa.nongnu.org/nongnu/cider-1.16.0.tar"; + sha256 = "1chp9ixd0k6yv4m727si6pgn2kys3zi5xkiq88xbv7bjcjryqmgz"; }; packageRequires = [ clojure-mode @@ -1116,10 +1116,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar"; - sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.6.3.tar"; + sha256 = "0vjsb2jfgnf9jya14zigy2jcd8agxsncm7cxg61jm940jyvs8fsq"; }; packageRequires = [ ]; meta = { @@ -1137,10 +1137,10 @@ elpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.1.tar"; - sha256 = "0098ixlx70vx4mxlcyddkij9aj4sgcf7p699cii0pz51lg9bymc0"; + url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.3.tar"; + sha256 = "1179z8d5mzhmnq2b1q9pf450jflxvrk5y2i3hzdl8lvd4nrm6kgw"; }; packageRequires = [ ]; meta = { @@ -1785,10 +1785,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.31"; + version = "0.31.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar"; - sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.31.1.tar"; + sha256 = "14d8syc51fkagc5isb8pym7mq5bw6ng83qxv1g5dnnj7nydl0gcr"; }; packageRequires = [ project ]; meta = { @@ -1918,10 +1918,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.28.2"; + version = "0.28.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.2.tar"; - sha256 = "02s44dj6cr6fmiby6yljil7cgp00h31h3fs1a428lr3v51z1i38m"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.3.tar"; + sha256 = "163p8ll68qdgpz6l1ixwcmffcsv1kas095davgwgq001hfx9db5x"; }; packageRequires = [ geiser @@ -2085,10 +2085,10 @@ elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.4.1"; + version = "0.4.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.1.tar"; - sha256 = "1iqpssf3gxv54gig718529y3cfjybvvjcvndzhjsiyw5b33pkbby"; + url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.5.tar"; + sha256 = "00rca3rfij2c8120kzs8wc6xsarpcj20gzwys05c7fhf7j8l5bdy"; }; packageRequires = [ compat @@ -2259,10 +2259,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.0"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar"; - sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4"; + url = "https://elpa.nongnu.org/nongnu/gptel-0.9.5.tar"; + sha256 = "0ixji76xaqkm0ziidjmanax4q0xqyj1qcwva6r5sbsks6gpmrziv"; }; packageRequires = [ compat @@ -2423,6 +2423,27 @@ }; } ) { }; + haskell-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haskell-ts-mode"; + ename = "haskell-ts-mode"; + version = "1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.tar"; + sha256 = "16x2dr64f6s8837pl7dn7my3xpfc0x11p556r1ds5hwg0c82ikh4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/haskell-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; helm = callPackage ( { elpaBuild, @@ -2434,10 +2455,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.9.9"; + version = "4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar"; - sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0"; + url = "https://elpa.nongnu.org/nongnu/helm-4.0.tar"; + sha256 = "1nvdadphkqizrpd92wp9n8dhbqp7dh7m4vhpxf9m18hqwrwsbm0v"; }; packageRequires = [ helm-core @@ -2459,10 +2480,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.9.9"; + version = "4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar"; - sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck"; + url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.tar"; + sha256 = "043pavv01m7frhdvfnp3f1xfbs1xjv43p1xs96yg75gyg1cigfd5"; }; packageRequires = [ async ]; meta = { @@ -2564,10 +2585,10 @@ elpaBuild { pname = "htmlize"; ename = "htmlize"; - version = "1.56"; + version = "1.58"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar"; - sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c"; + url = "https://elpa.nongnu.org/nongnu/htmlize-1.58.tar"; + sha256 = "1vd7pq8rrxnc5x2nc6qjjkh3hyk89m7g8zdijpw463d4v6wrrfpx"; }; packageRequires = [ ]; meta = { @@ -2583,6 +2604,7 @@ fetchurl, lib, map, + org, persist, plz, taxy-magit-section, @@ -2591,14 +2613,15 @@ elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.3"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar"; - sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw"; + url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.4.2.tar"; + sha256 = "19cgx0x54xj2z98m8mr1xmz0bbja0nilh8n47mkbnzmcqidv75gq"; }; packageRequires = [ compat map + org persist plz taxy-magit-section @@ -2610,6 +2633,32 @@ }; } ) { }; + hyperdrive-org-transclusion = callPackage ( + { + elpaBuild, + fetchurl, + hyperdrive, + lib, + org-transclusion, + }: + elpaBuild { + pname = "hyperdrive-org-transclusion"; + ename = "hyperdrive-org-transclusion"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion-0.2.tar"; + sha256 = "1zbhbsfrdcc5mfkpbzwkyn9bgapf8hs0jzy14lv9d5g99wskzbis"; + }; + packageRequires = [ + hyperdrive + org-transclusion + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion.html"; + license = lib.licenses.free; + }; + } + ) { }; idle-highlight-mode = callPackage ( { elpaBuild, @@ -2840,10 +2889,10 @@ elpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "0.4"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar"; - sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi"; + url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.0.tar"; + sha256 = "02xab8qhf1z4cdn847n9ar2g65843qknca88jkaa94zzkxpv2bi1"; }; packageRequires = [ ]; meta = { @@ -2969,7 +3018,6 @@ dash, elpaBuild, fetchurl, - git-commit, lib, magit-section, seq, @@ -2979,15 +3027,14 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-4.0.0.tar"; - sha256 = "0sii8gr69j29fzvcdyabnabldkvi6r5dpiamfs3bsmh66vf8wvjh"; + url = "https://elpa.nongnu.org/nongnu/magit-4.1.1.tar"; + sha256 = "0rjxlrs5ik6mqnvs9mz2pjmz23np3ch0ybkzimd9ji70283fyif6"; }; packageRequires = [ compat dash - git-commit magit-section seq transient @@ -3011,10 +3058,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-4.0.0.tar"; - sha256 = "1dyw275qfnpz7fs1s952b9fl9vgfzfk8aiclznfhhl43nvxxglb7"; + url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.1.tar"; + sha256 = "1vbfvnmmm026zk098vxk21zh8r444cy476br4b6y20lhnniybh7s"; }; packageRequires = [ compat @@ -3059,10 +3106,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.0.26"; + version = "1.0.27"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.26.tar"; - sha256 = "1p4nzgw8rf7zx4z17nn7bdh106qdhb54m20dkkz43wr4dgqp61bn"; + url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.27.tar"; + sha256 = "0kbbzmqnnh0pvd215660p1c2wljnxr5139vs17k9cnh8n5qsddjr"; }; packageRequires = [ persist @@ -3400,10 +3447,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.4.2"; + version = "0.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar"; - sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.6.tar"; + sha256 = "02rpy7psjp1mj2nbzzbc06i4961m83hkq5ndks56mfkcz4hdhj2m"; }; packageRequires = [ org ]; meta = { @@ -3471,10 +3518,10 @@ elpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.3.tar"; - sha256 = "1ylsdfifa4ykrf5vncnnj6v2bgc3ixlskgxb1v7qggmkb5mzy2yv"; + url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.4.tar"; + sha256 = "06ard0fndp1iffd8lqqrf4dahbxkh76blava9s6xzxf75zzmlsyj"; }; packageRequires = [ ]; meta = { @@ -3633,10 +3680,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.23"; + version = "0.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar"; - sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.24.tar"; + sha256 = "1cdm86vyi3whq2gmb3dfkzir6hx2pf5m0yxg8pfj7ja31jfi4r25"; }; packageRequires = [ let-alist ]; meta = { @@ -3833,10 +3880,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.25.1"; + version = "1.26.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar"; - sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc"; + url = "https://elpa.nongnu.org/nongnu/php-mode-1.26.1.tar"; + sha256 = "151hk9kmwlaq243qfwh2s1vqk5xsyikl9gj5b65ywhhf326dirz1"; }; packageRequires = [ ]; meta = { @@ -3960,10 +4007,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20240813.124142"; + version = "1.0.20241001.105847"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240813.124142.tar"; - sha256 = "0arsrq5lp8a6s6gh2dwc4m43f7gmhrwlpgxn6xsglscpvhlrair8"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241001.105847.tar"; + sha256 = "0wwg30wbigmnb7yz9wc2yrq58jzysd2vp1g2324lbc95z61ng5yd"; }; packageRequires = [ ]; meta = { @@ -4128,10 +4175,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar"; - sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4"; + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.6.tar"; + sha256 = "1x2hj5rhdcm9hdnr78430jh1ycwjiva5vv7xqm7758vcxw7x0nag"; }; packageRequires = [ ]; meta = { @@ -4488,10 +4535,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.14"; + version = "1.2.16"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar"; - sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.16.tar"; + sha256 = "0fsxsp8g70mr36njmv2h3qrmp1mw3r4clrlzib33iq02wmw7q3rg"; }; packageRequires = [ ]; meta = { @@ -4510,10 +4557,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.27.5"; + version = "0.27.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar"; - sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.6.tar"; + sha256 = "063bindr1rfbpa59nf0zrjq3axj3siiskaxd7d37pada411j654i"; }; packageRequires = [ compat ]; meta = { @@ -4532,10 +4579,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.1.0"; + version = "9.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar"; - sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-9.2.0.tar"; + sha256 = "1mnkwy7cglwrfln8hknbxyzg4z6zb6cmycl19acxslbgrviwh9j3"; }; packageRequires = [ seq ]; meta = { @@ -4571,16 +4618,17 @@ elpaBuild, fetchurl, lib, + seq, }: elpaBuild { pname = "symbol-overlay"; ename = "symbol-overlay"; - version = "4.1"; + version = "4.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar"; - sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn"; + url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.3.tar"; + sha256 = "0f27axzjbrh4nx6ixpjbb8vx7s2y6l074cdqzia1c87a8b6301c6"; }; - packageRequires = [ ]; + packageRequires = [ seq ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/symbol-overlay.html"; license = lib.licenses.free; @@ -5073,10 +5121,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.1.tar"; - sha256 = "0nhlr2qjn351p0vd8vdnrwsb6wi2klh5ny84k90m8kzwcmvglhfd"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.2.tar"; + sha256 = "0z6zi271p2ch4gylkz4ynj44hyxjmvvmg7xjsxwjmsyi800kwr58"; }; packageRequires = [ compat ]; meta = { @@ -5183,10 +5231,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "25.9.20240725161125"; + version = "26.6.20241009212806"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240725161125.tar"; - sha256 = "1kkis9qrfks40dlibkn4f75al0h61ixdw30a45ql09nsg4n5rzky"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.6.20241009212806.tar"; + sha256 = "17xyb1dvsi2hqnhhk8vzbrskhlbh6w869c1iy14cdy3yndj7y8v2"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 5dbcd958b31d..44e12d675eef 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -117,11 +117,11 @@ "repo": "skeeto/at-el", "unstable": { "version": [ - 20240121, - 1413 + 20240923, + 1318 ], - "commit": "a6ba21d9eb9b311b441312057430d10e5c7bc661", - "sha256": "1k84r20i7yhrjdvv3rhj6fzl6zhffykkyrd7yhqy1rmmvl1a78yv" + "commit": "0489e15cd0bc2fd9da56a4147f9083c6d816ebb9", + "sha256": "0l282g3wd33z435y7f6psrds12lx9cdvql4xjmndcy3jsc4sk5q3" } }, { @@ -1581,8 +1581,8 @@ }, { "ename": "ack-menu", - "commit": "8ff331ed45e5b7697e4862e723408602ecc98bc7", - "sha256": "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "0hvmn90a8ckqfcz6fc46m6y91f15drzf8l6gp8daxhhqs379w3bv", "fetcher": "github", "repo": "chumpage/ack-menu", "unstable": { @@ -1634,6 +1634,14 @@ ], "commit": "90d7d626691591b24d83596149bc89fd51ba39b4", "sha256": "14ym2i12d3nz7wrqbq6xy44zvh8fw601idapafi5zcsl1mpfc9f0" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "90d7d626691591b24d83596149bc89fd51ba39b4", + "sha256": "14ym2i12d3nz7wrqbq6xy44zvh8fw601idapafi5zcsl1mpfc9f0" } }, { @@ -1702,11 +1710,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240713, - 1754 + 20240915, + 1446 ], - "commit": "1e7ea28c1cdfe10a37855105bd47f820bfc90a27", - "sha256": "1z1w4wxk7dkhyjp4wh5m3r7v8izbr0iikc09gyq0120h7k51nagx" + "commit": "99bfa648f5a1a8d935a0540264e0c6b989a3b2b0", + "sha256": "0499iir8yl5im7rdgr7xrbwvsfsqzx1zg15d21kfc4mzib3w2v0n" } }, { @@ -1824,11 +1832,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20240103, - 1856 + 20240925, + 1925 ], - "commit": "dc63bf47819b3e1f2656ec5c78b2fe57244e9c0d", - "sha256": "0j4l2izi0dgbafscsvs2hdpa008dcf0answmy6rdxjad4c0wrpd3" + "commit": "856d84f4ee29ada5c60eb1c25685822c6701c3d1", + "sha256": "1qfswdvcbyd7nlxc96w4ghhx9xsfk894wq1lwafax6b9lrr6w8v7" }, "stable": { "version": [ @@ -1919,14 +1927,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20240718, - 1250 + 20240926, + 927 ], "deps": [ "consult" ], - "commit": "e82be0be353dafe15c5ff617917806bd3728463a", - "sha256": "08ph4h883fyzx88jd70pjjraj0ya4rq3k7g2q9l1jjcf2hh0wmmb" + "commit": "569c661aa2333502759aee2d4c7c87a046b09d33", + "sha256": "11h7j0j9hw04ph6w4s9hcrxnszaca4krzllm6z0ynxrzbs7075g7" }, "stable": { "version": [ @@ -2451,8 +2459,8 @@ }, { "ename": "alectryon", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0x0n8g6dx622drp591z8dp0dkbhdbdq0039zb4x1lni316gg81il", + "commit": "004b6f281b85db923f4170adbe63e1229b4f360d", + "sha256": "1a2ifs1hxkb3nc2j76pnw3acysyswl19mfzzifvrgz23k0y7caac", "fetcher": "github", "repo": "cpitclaudel/alectryon", "unstable": { @@ -2992,16 +3000,15 @@ "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20230409, - 1018 + 20240903, + 1534 ], "deps": [ - "cl-lib", "hydra", "pyim" ], - "commit": "b8622ae7b05f27d6f84c4e5d724bc79163ba9ce3", - "sha256": "1xjm3bqv517v95lcjjncw2yb6vamjc4la6xdw6afc6dwyq0cy19l" + "commit": "bf06b05c6322fe74f0e5ac2436cad46f66f673c6", + "sha256": "1hw1n15pmkfpsfx3ach27idy976cbhsl08rkgc0y94wcdbn7zp9h" } }, { @@ -3276,11 +3283,11 @@ "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20240716, - 1922 + 20240928, + 843 ], - "commit": "ba7c7bf3269f7630ef8c06f342ab04bdd8efea53", - "sha256": "1pf243pv9mnqb1dlb2n3677abg7r3b69zizc7laxxqhik5dn9dd9" + "commit": "be75eb8b3f476770349b3fe0446fd7ae0edc5357", + "sha256": "1qx1q12z0cx87i2mqwfggbn0gbw7vim7dvf15g8z5i01r7dgh0qs" } }, { @@ -3440,10 +3447,11 @@ "version": [ 2, 7, - 0 + 0, + 1 ], - "commit": "df1a26d96683ebb06aa8476e4af6bbeddf23efbe", - "sha256": "1vi2h8lwfixpphh0kz5jiam43ld8ddzz71jspwfvmyhmyrriabb8" + "commit": "a6fc20c27ae953149b53a8997ba4a1c8b17d628a", + "sha256": "1dh9fi8lwjv9rk6zik2bwjgqln0f0d36m3hm9m3zmmk4fby4rsi2" } }, { @@ -3512,15 +3520,15 @@ "repo": "emacs-ansible/emacs-ansible", "unstable": { "version": [ - 20240624, - 1452 + 20240926, + 2144 ], "deps": [ "f", "s" ], - "commit": "eebb2fb49d3c0a0586d1e4ead9ba618c7d003cae", - "sha256": "0ivmhavvi25kwz9kn5pf5kmsncwaqj4hzsf4i77c14sh8s0fjka9" + "commit": "e171dacc12eeaba5dbd7fd887f94d11b357fe958", + "sha256": "11ls81zr5b62cykc28rldw1y1hx0bhf2s6xqypdsxblk5ymgr491" }, "stable": { "version": [ @@ -3708,19 +3716,19 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20240202, - 447 + 20240929, + 201 ], - "commit": "26fb50b429ee968eb944b0615dd0aed1dd66172c", - "sha256": "0jwi5lc7gai3cbyfidi1pq9w4vmbph9ynm643nsy7if4qx3l9byp" + "commit": "bc3a0032bb6aa7f5886f10460cd53eb7b8b020af", + "sha256": "1qi305wz0m2m05yp9md8f06s4i6ccwsicw66l23vx4y3l6jgg098" }, "stable": { "version": [ 0, - 64 + 67 ], - "commit": "bdb3da5028935a4aea55c40769bc191a81afb54e", - "sha256": "1jfn5nm6r68wa0gn2k2zy6sdq6c8shw8x04ylzzm5cw7zm60jw0n" + "commit": "be015183090dbe8fe5f9eeb26ddf469af3ee360c", + "sha256": "1jnqzywzqq8jzvqaiba5szmj9zbxx9kvdmnaldwgldi8yyiy7il4" } }, { @@ -3788,8 +3796,8 @@ }, { "ename": "apel", - "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", - "sha256": "0cxd1k4xzv1dad402kkhng9k3rjhmiymdih4z4vsg0alngcrdndm", + "commit": "235012164f093451c0f7409f57e271d8b895833c", + "sha256": "1w2ljg3pfxjp9jpl3f4p5iggd44gab7ps19xxdp8iz8dq0rxgpf9", "fetcher": "github", "repo": "wanderlust/apel", "unstable": { @@ -3809,11 +3817,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20240803, - 2322 + 20241006, + 142 ], - "commit": "3e347cff47eb0072b47c56f6188c4f440e477770", - "sha256": "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj" + "commit": "d6f520752a77923a420f2ef894a6f2d26d29d7d0", + "sha256": "0zsaxm72qbnjb35sain605zlrlxfia2m9yfp371cfgvn6bgpgn31" }, "stable": { "version": [ @@ -3893,17 +3901,17 @@ }, { "ename": "apparmor-mode", - "commit": "6dece118970184e7fc2cfd3e26f97f2028d7f5f2", - "sha256": "1ilp4srliacwgvzkbkky6ka0p60ni6v4na270iniklmjglbbs5f0", - "fetcher": "github", - "repo": "alexmurray/apparmor-mode", + "commit": "b2e8d53d3f3fbd628cb84347fe599ba531776ac1", + "sha256": "091lrfyh7qn8qzwykhdb2dhrz2px3lav3cyyb9mmxyfmkf81nxxi", + "fetcher": "gitlab", + "repo": "apparmor/apparmor-mode", "unstable": { "version": [ - 20240801, - 505 + 20241014, + 554 ], - "commit": "770f2f0356dbf56a5ae2e2d3abc11f317f5e2556", - "sha256": "0jlxy7q4p05d922cm1prxk06b9dzc791kly66gkflgkwl5jmwb3a" + "commit": "73c34f8e5a102da05d78bad12931c8e2c80352f2", + "sha256": "1m8qb0wryibbccbmz5h18rvjpfwzrvagwr41l6n4a8bka0mln40v" } }, { @@ -3984,11 +3992,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20240517, - 1823 + 20240921, + 1422 ], - "commit": "84ee370da4c19db8051761b1b64bbdc8e1c7dc73", - "sha256": "13zccq7q1rwhb671f3501j75gy676n611khhzdqxizsgy2mb72nz" + "commit": "055693f52b5179f896a49c0570b5a6ca441fb2b9", + "sha256": "0n9xyfxsd1ypn6psa4qwlbiwa5vvprh6js18rlhki67v6df3lwgp" }, "stable": { "version": [ @@ -4192,6 +4200,30 @@ "sha256": "1n5axwn498ahb6984ir1zfl8vvwgbvq9bbrdfzydkmjljhgrp0rd" } }, + { + "ename": "arscript-mode", + "commit": "1e220ee8dfcd59b8c4b8b9076e9cec3a7def74a9", + "sha256": "0ah51219830cvz8akr210l9az6d0mak3jmkr2zn8bsjljsakynj6", + "fetcher": "github", + "repo": "captainflasmr/arscript-mode", + "unstable": { + "version": [ + 20240819, + 1927 + ], + "commit": "797e1d0ef1312e8ff846abd0c6853358041f7691", + "sha256": "0g9yfglszdxb2sshd1qyhla0kw0qcr6fmc9xn2dm5sgqfrhbrxw1" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "b325cae3b8ec5c528a42044f225d31e2bbaabde6", + "sha256": "0w5dawyc6limxwwwzlnl10kdpz8d98mysscdrhz4r34darwkm42w" + } + }, { "ename": "artbollocks-mode", "commit": "22b237ab91ddd3c17986ea12e6a32f2ce62d3a79", @@ -4434,6 +4466,21 @@ "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2" } }, + { + "ename": "astute", + "commit": "5f7a2f714991553a933f9985097f58ccc4bc2e7b", + "sha256": "0qilrv9dzk95wynacszqlqlnjylyc75vzdial441hz9f89dfhlqp", + "fetcher": "github", + "repo": "rnkn/astute", + "unstable": { + "version": [ + 20240910, + 1312 + ], + "commit": "54ed0a94b1f0ce03becf91847a026403c697d2b6", + "sha256": "02zgk44hv17qqp5065a84fdpqkwa5wzs6r68fqy0r6lag38j1aih" + } + }, { "ename": "astyle", "commit": "b495f29653edd15cef8eb3c9ea4d8aea35b0ac75", @@ -4475,20 +4522,20 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20240811, - 1434 + 20241005, + 1824 ], - "commit": "e1d46f97a56e0c57206bd1ea31d04311097a8cbb", - "sha256": "0ik0vb37nlrx6pg4x8dd3cm3b585a9fp6bgp341f5slr108k8nsg" + "commit": "af47d6f930f93d4fdc4ca46e19e17547bf486c4c", + "sha256": "1kxxkjv9cys3z25g3bcq5sdm99s1kfj909vzi12dfyrzmxh30kk0" }, "stable": { "version": [ 1, 9, - 8 + 9 ], - "commit": "00e07e060218fbd1e16faaf10116c03b12e62580", - "sha256": "191bjmwg5bgih1322n4q4i2jxx7aa3cb9lx0ymkwc3r2bdhkn0lp" + "commit": "f317b0c9c3e60a959f45d035ed5e31a78f1263ac", + "sha256": "0krg7n8l3yv1fnixnx6j5imdh10jpfabm6ym9s1s610hp47gpfaz" } }, { @@ -5426,11 +5473,20 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20240711, - 2247 + 20240927, + 1255 ], - "commit": "39b168e8e09b89ae8c8ef2388b895140901be48e", - "sha256": "1id8i9p6l46m1c09a7mz2335i168dj4q701d3a2q21i22lamhbff" + "commit": "117e20cddf171bcc288dac32907eb5d856951268", + "sha256": "0cp4hcac2kya3m8cc8xfrv01cg06vi70zgp4m6q39cw2i9dnlnch" + }, + "stable": { + "version": [ + 0, + 13, + 2 + ], + "commit": "117e20cddf171bcc288dac32907eb5d856951268", + "sha256": "0cp4hcac2kya3m8cc8xfrv01cg06vi70zgp4m6q39cw2i9dnlnch" } }, { @@ -6695,11 +6751,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20240819, - 340 + 20240908, + 114 ], - "commit": "c49bb721af8f15434731bccf42f64dd226c38733", - "sha256": "1bv537jys33jv8hkvpdw686wwqjq4k8d13bx8n0iq2j61zsx49fv" + "commit": "077726249216bef6d98d0542eb6289641a58e8d0", + "sha256": "0ydr1qmx6f4zpfhhpx180sqp1x4p2an3157m7z51nivs79hx0nsm" }, "stable": { "version": [ @@ -7099,8 +7155,8 @@ }, { "ename": "bbdb2erc", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "012vz1wq06yrrzzbyrk19jlscgb72q035nswkwjwdn42kphb22am", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "15ciaw0162qkykv7b5gi644az382i47yvfr8ai7vpch3idajadah", "fetcher": "github", "repo": "unhammer/bbdb2erc", "unstable": { @@ -7437,11 +7493,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20220110, - 118 + 20241009, + 1517 ], - "commit": "205e7a539d1611dbe50f003ddf52890360f87597", - "sha256": "0877p6wc3ppfnqixrcq0cxvk8f82lfkysgbc592fv3q6977r18b1" + "commit": "b1bf7a3c8cb820d942a0305e0e6412ef369f819c", + "sha256": "0cq99w9lpd9sg7hb6i9r6qirq626xcgzyjbk438h8qrjgm3xigh4" } }, { @@ -7793,26 +7849,26 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20240810, - 2050 + 20240831, + 2208 ], "deps": [ "compat" ], - "commit": "80858c93ba5e24b89f1ccc6e4b21548f3eec35ae", - "sha256": "0l3lfx362vpbix3hq0hrimxdgv2s4nx1kg7ldsk5qnv8yxmf3xh6" + "commit": "04c3e44eb10303b81c47c1d333df1fa23a224963", + "sha256": "1a5mdr3g0kwjz3891cg6v3b3lc5v0b0rgwp4b39qncry3l4k5yjg" }, "stable": { "version": [ + 1, 0, - 4, - 8 + 0 ], "deps": [ "compat" ], - "commit": "2f1f037af123df2b8c971f0137da87e55813eefa", - "sha256": "0q0cd4xyw0wi6hyj9d914mwvm57vglh82r8mc29rca21ss143id5" + "commit": "04c3e44eb10303b81c47c1d333df1fa23a224963", + "sha256": "1a5mdr3g0kwjz3891cg6v3b3lc5v0b0rgwp4b39qncry3l4k5yjg" } }, { @@ -7974,19 +8030,19 @@ }, { "ename": "binder", - "commit": "b11447ece6105f59abec185b6ca809f488f2b864", - "sha256": "0hfg1rq4qhfqzxi5y51sjsqw069w15x1fkknqq8dwv8a7sjj6yaz", - "fetcher": "github", - "repo": "rnkn/binder", + "commit": "8cfde8aab4a470c649a49454d6ce6fca03eab023", + "sha256": "00ihhddcjsgfwfzz3i7npsfcfh4mszsg9138fwrfygfp3vv668j4", + "fetcher": "codeberg", + "repo": "divyaranjan/binder", "unstable": { "version": [ - 20240630, - 725 + 20241002, + 1408 ], "deps": [ "seq" ], - "commit": "a17eb5089bbab05372c018e67b3da9aa25217d81", + "commit": "0a86e1e60c04b525c9017b0479c1135044273f32", "sha256": "0nbczlvcdygfjy0grlxqpc5ygnwk8nyxi3pk8kkgp681c19bcpdi" }, "stable": { @@ -7998,8 +8054,8 @@ "deps": [ "seq" ], - "commit": "9881ca21d30400681e0b3de404e5cc020e060209", - "sha256": "01y9yd1rvi1ll3pp2i44g7ivkvz1cvc22207f8a3dbv90jw4c66m" + "commit": "f02d6951b778adfa210dd94f177d2608277c94f4", + "sha256": "065cqvdjdb5w60b7ga7q51920ib5vpz63zq9s68q0fjwb55q3k8z" } }, { @@ -8034,14 +8090,14 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20240525, - 715 + 20241011, + 1931 ], "deps": [ "dash" ], - "commit": "39c1a1e78aea36f79104fdc256949901e3d3d2c0", - "sha256": "086rcvdr58c9p2snqgh2mdnmrdigkzn8909a6ncg9c3j18x55bzj" + "commit": "604cbee86e829f9db47887e092b0835a6dbf47dd", + "sha256": "1zlnwg5ggpjywqvdj2xxmk55bh8q50l8f1hh7anfqfkgfqr843lg" }, "stable": { "version": [ @@ -8168,6 +8224,21 @@ "sha256": "1a929lxra50f99vc865iy2icprq3m40zg2zsgr5hxd2pvcpch927" } }, + { + "ename": "bitbake-ts-mode", + "commit": "d196bb29ab1689036b1aa40df3b18d030239f3c0", + "sha256": "0kwasl3plf7w2hzlk72629l3v76l5vl5j42lydk4cz5dbvmb9hm8", + "fetcher": "github", + "repo": "seokbeomKim/bitbake-ts-mode", + "unstable": { + "version": [ + 20240908, + 1435 + ], + "commit": "224d7fb93f0c06968421dd8536c64840a2f13273", + "sha256": "0xa3cma2pa9h0as2n7ljqbvn9ngnqshq71hyq1dnhqcfzchk1vdn" + } + }, { "ename": "bitlbee", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -8327,28 +8398,28 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20240701, - 1909 + 20240918, + 2113 ], "deps": [ "async", "posframe" ], - "commit": "a6526820ac37a2ab041c4abda57b78f133299bf2", - "sha256": "1snm5k56142drdi84vg328yzl00l0fm4sl704pnk9bj6wb28l6q2" + "commit": "8a79c1f370f7c5f041c980e0b727960462c192ba", + "sha256": "089y8jyn78hx8pzv1q9iz94fh5b61j2jzqjnr6r91xa0s3b7kmq9" }, "stable": { "version": [ 0, 9, - 1 + 4 ], "deps": [ "async", "posframe" ], - "commit": "281963da789fe9e47ce9efc4f7a9c4d19bf3a405", - "sha256": "0imqw1nczhi2wvl7wzbiwdh0rf2gklrl1ck5wrr2lg26hkjs0fmz" + "commit": "8a79c1f370f7c5f041c980e0b727960462c192ba", + "sha256": "089y8jyn78hx8pzv1q9iz94fh5b61j2jzqjnr6r91xa0s3b7kmq9" } }, { @@ -8613,14 +8684,14 @@ "repo": "sergeyklay/bnf-mode", "unstable": { "version": [ - 20221205, - 1451 + 20240915, + 2118 ], "deps": [ "cl-lib" ], - "commit": "dcdb422e219b29d53a9385e19083441c57f0beb3", - "sha256": "18fmka9hvdrz402kvjzz25437x3y36007d3vd439i1r6rj3axmg4" + "commit": "5304ab647e04916c5be4fdde41477ad429a89120", + "sha256": "0ylp0b8x7aycyv9336zfpkmskv7pmnahbkdzds7hqin5lj80qf6x" }, "stable": { "version": [ @@ -8917,34 +8988,34 @@ }, { "ename": "borg", - "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", - "sha256": "10nszv2wwzp5g95wgw2yj9n0na1a8rp6iy84b4myhpii9bvs5bd6", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "1mq6wa51la32islmx277jz9a5vz5wp3jgzgna4p7462f3wd09kch", "fetcher": "github", "repo": "emacscollective/borg", "unstable": { "version": [ - 20240817, - 1958 + 20240831, + 2310 ], "deps": [ "epkg", "magit" ], - "commit": "ad76a76424654d77b2b5d95472d86c03ce2c5410", - "sha256": "0vfyxd8si7ffwy1jryqk0d92zn0g3w09xr8130ikksazwqjfqzvx" + "commit": "cdae2c905ea5f819dec3b183214f5e19670d35f4", + "sha256": "0m2h4mka751vxjac4c2ijznb8lwf473660d2nrrb84zh4h505xqf" }, "stable": { "version": [ 4, - 0, + 1, 0 ], "deps": [ "epkg", "magit" ], - "commit": "e7a5a696d776f2b61c38335a8cec6108f4af2166", - "sha256": "1aclajsxr2nqd0mamr50j8xlgzk7pycigjw3n5wi6yr5c37pq30p" + "commit": "cdae2c905ea5f819dec3b183214f5e19670d35f4", + "sha256": "0m2h4mka751vxjac4c2ijznb8lwf473660d2nrrb84zh4h505xqf" } }, { @@ -8985,20 +9056,20 @@ "repo": "ascii-boxes/boxes", "unstable": { "version": [ - 20240217, - 1143 + 20241003, + 847 ], - "commit": "75dfd61801b3ec23ec30c88640ea31bbca5b36b9", - "sha256": "1gb3f42ayinfm8b0fbdbdnpp5j3i26yb86yl78q635nzy3k3y1zy" + "commit": "bae35281d0f814c704ef4a174a5f734541e1f457", + "sha256": "028vg9h3vxz3icy7hmxgyqhn62953h1ls6bxwbhdwhl1lpj5py3n" }, "stable": { "version": [ 2, 3, - 0 + 1 ], - "commit": "75dfd61801b3ec23ec30c88640ea31bbca5b36b9", - "sha256": "1gb3f42ayinfm8b0fbdbdnpp5j3i26yb86yl78q635nzy3k3y1zy" + "commit": "bae35281d0f814c704ef4a174a5f734541e1f457", + "sha256": "028vg9h3vxz3icy7hmxgyqhn62953h1ls6bxwbhdwhl1lpj5py3n" } }, { @@ -9062,8 +9133,8 @@ }, { "ename": "bpr", - "commit": "422e51d5467b6a417147e07865392f17dcc6de21", - "sha256": "1jpwx0z5wb20jv1mnl0d8azzpak39swbsjvym7aqvhjiy4zagcfq", + "commit": "eff13c740d848997213b13ecb2a79912f77d4c04", + "sha256": "0wr2z12b4nlf6f06p23354r4w5sznvks5sl4fs5kjp5fdldy0c3m", "fetcher": "github", "repo": "iliabv/emacs-bpr", "unstable": { @@ -9083,11 +9154,15 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20240721, - 2036 + 20241012, + 1136 ], - "commit": "80f6be6ca678d2f072be7a39e88b10d3c56e63e5", - "sha256": "1nwa39yslizdqkh8wixx55b153gri8gnj68s6b612jn8mry1dgny" + "deps": [ + "compat", + "eros" + ], + "commit": "c7b71c85e69c8b1bcec2bdd718d7a91929af28d7", + "sha256": "1kzbmmxwm4v05614pqy16fdlh8xs2dnvzk0d90sjq5nfkjr6z472" } }, { @@ -10137,19 +10212,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20240718, - 14 + 20240904, + 2311 ], - "commit": "dfbef2177209e3a045e981b7d2956ec46ce3b25b", - "sha256": "1vgk6v22pldgi62f3gf816hdzbxfrl3sg4snxs0snfzb16si1bpc" + "commit": "bf01a33f8bc2d3664121d3b20f7496e67ce55e6a", + "sha256": "1xa8nlvjhwq0ryz8n3f7i671zm5qfbvr7qs75m7d52rmv60zkajc" }, "stable": { "version": [ 1, - 35 + 36 ], - "commit": "a1a86b027ffe030e1c78a9f43c50cd20a6fed19a", - "sha256": "0s5c7ia7b873dr6rqljkb1z4bf84zb3p3wjvcvpjhdcnf67m5x10" + "commit": "bf01a33f8bc2d3664121d3b20f7496e67ce55e6a", + "sha256": "1xa8nlvjhwq0ryz8n3f7i671zm5qfbvr7qs75m7d52rmv60zkajc" } }, { @@ -10846,25 +10921,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240818, - 1414 + 20241007, + 501 ], "deps": [ "compat" ], - "commit": "944c60cc3ff81ceceeb239746f7dd9d8e7d0a663", - "sha256": "1y043hha07bi4q6wnq1sii8g4fihmm458xsvlk55p43c3dph1ms9" + "commit": "485d8d4ad5aeb17a0f5d3337e600070276448c54", + "sha256": "0r9igz35h3w3rqx9r34p9lwjs69xfq9cic4s6rwhsnix7n32apmf" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "5c468d6d657e8dc604ddf3feb80f70e1e05ac0a1", - "sha256": "0bkkb4fpga7r0rmyj8i621xmn5s0l7w49xyj1byy8z4rgl73zlhb" + "commit": "9110956a5155d5e3c460160fa1b4dac59322c229", + "sha256": "0dr7x258n9px15cr90bd2877dc8hzy726g0h6vix284w675c2nvi" } }, { @@ -11008,11 +11083,20 @@ "repo": "ayrat555/cargo-mode", "unstable": { "version": [ - 20240116, - 1949 + 20240928, + 1910 ], - "commit": "c2df42d18afe2fbc3fde0be3e8b2abeecb3b00c8", - "sha256": "157glxw622ijm53sljcqlqhpf5pj1jhd810sq49hmzxxd5pvyfjp" + "commit": "8321d01fa4d30391a9918bd9782fadbab27843fd", + "sha256": "1ng8kwx45ycjglwywnyimzfsny11a1a1dczi8740vr8s9cpfjp9a" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "8321d01fa4d30391a9918bd9782fadbab27843fd", + "sha256": "1ng8kwx45ycjglwywnyimzfsny11a1a1dczi8740vr8s9cpfjp9a" } }, { @@ -11102,11 +11186,11 @@ "url": "https://hg.sr.ht/~zck/caser.el", "unstable": { "version": [ - 20230901, - 526 + 20241003, + 131 ], - "commit": "4df467dc50a09bf5a0c6cc0ce8b2720cbf5c3879", - "sha256": "1hqagxyfvd2j5fsvjxcbiia1sfnwps1awh7ncnahr6f77pjwcf6g" + "commit": "6ed8fe13ff6a4c39a831cf51b031a9e9fdcba5ff", + "sha256": "05ykqmmpcc7qhwcyq1n5z8chrlw2wgvksa9lxxyvd5rqznwdlvs7" } }, { @@ -11206,6 +11290,38 @@ "sha256": "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a" } }, + { + "ename": "casual-agenda", + "commit": "f77aab9a5e31ccc0fc45876572172d234d204463", + "sha256": "08kygh0wxsan6qq26wp894pp1mkf04m2rzpb25cr0j72h65m0q7c", + "fetcher": "github", + "repo": "kickingvegas/casual-agenda", + "unstable": { + "version": [ + 20241001, + 714 + ], + "deps": [ + "casual-lib", + "org" + ], + "commit": "ca0433e257297d0adcd96238f64a1116d25b4372", + "sha256": "1y7idm7v9yxfddj9vrwwj98j610bc61r2wrcgkc0ganfm9fglvp3" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "deps": [ + "casual-lib", + "org" + ], + "commit": "ca0433e257297d0adcd96238f64a1116d25b4372", + "sha256": "1y7idm7v9yxfddj9vrwwj98j610bc61r2wrcgkc0ganfm9fglvp3" + } + }, { "ename": "casual-avy", "commit": "1650f2d8352c64072794a1563f5b7728206acebd", @@ -11214,28 +11330,28 @@ "repo": "kickingvegas/casual-avy", "unstable": { "version": [ - 20240714, - 202 + 20241001, + 649 ], "deps": [ "avy", "casual-lib" ], - "commit": "0f9072dc98b1af9200cf03c15b776cbd901333fc", - "sha256": "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg" + "commit": "9aa3e63326d65590c22d42c3ed9f37626c2a2c31", + "sha256": "1fscfv91ii1pg7wi42xvk330f4fjq81334fk28ya47vwq3132ccn" }, "stable": { "version": [ 1, 4, - 1 + 3 ], "deps": [ "avy", "casual-lib" ], - "commit": "0f9072dc98b1af9200cf03c15b776cbd901333fc", - "sha256": "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg" + "commit": "9aa3e63326d65590c22d42c3ed9f37626c2a2c31", + "sha256": "1fscfv91ii1pg7wi42xvk330f4fjq81334fk28ya47vwq3132ccn" } }, { @@ -11246,26 +11362,26 @@ "repo": "kickingvegas/casual-bookmarks", "unstable": { "version": [ - 20240806, - 2233 + 20241001, + 635 ], "deps": [ "casual-lib" ], - "commit": "d105638d9440581c4557a76f4d042a64b34e10ab", - "sha256": "18i4agmm00vn8lzjlnxm6iqgdfsww8yc0zx8isfjliw0c52licyl" + "commit": "99aea407da07aef1a87d67b12648280347bdeed8", + "sha256": "0q3nrx4fwx2nm8mxc52rynishqp8zlaj7431z9nmb7ap1jhvbw1g" }, "stable": { "version": [ 1, 1, - 0 + 2 ], "deps": [ "casual-lib" ], - "commit": "d105638d9440581c4557a76f4d042a64b34e10ab", - "sha256": "18i4agmm00vn8lzjlnxm6iqgdfsww8yc0zx8isfjliw0c52licyl" + "commit": "99aea407da07aef1a87d67b12648280347bdeed8", + "sha256": "0q3nrx4fwx2nm8mxc52rynishqp8zlaj7431z9nmb7ap1jhvbw1g" } }, { @@ -11276,26 +11392,26 @@ "repo": "kickingvegas/casual-calc", "unstable": { "version": [ - 20240811, - 103 + 20241001, + 611 ], "deps": [ "casual-lib" ], - "commit": "a304f1ad086fad8cd78087f6b541940bf36d20d0", - "sha256": "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa" + "commit": "fa4a1bf695025908245651ee641262bce6de0369", + "sha256": "1695vgysn17zhk5wnrfh1cqp8rzrfmcxg3vj80axs961qd1mrm9w" }, "stable": { "version": [ 1, 11, - 2 + 4 ], "deps": [ "casual-lib" ], - "commit": "a304f1ad086fad8cd78087f6b541940bf36d20d0", - "sha256": "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa" + "commit": "fa4a1bf695025908245651ee641262bce6de0369", + "sha256": "1695vgysn17zhk5wnrfh1cqp8rzrfmcxg3vj80axs961qd1mrm9w" } }, { @@ -11306,26 +11422,62 @@ "repo": "kickingvegas/casual-dired", "unstable": { "version": [ - 20240811, - 2038 + 20241001, + 709 ], "deps": [ "casual-lib" ], - "commit": "9f0b49035c8bf16e0b3c1869709ce4a86fc2f31c", - "sha256": "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c" + "commit": "9b42c976dcaeb3ea3baacfd67c850b82ef9d164c", + "sha256": "1ps2ffsl0smfp1zqp24slzw5zd7jrmacplnxbg714fb1r5z2pfya" }, "stable": { "version": [ 1, 8, - 0 + 3 ], "deps": [ "casual-lib" ], - "commit": "9f0b49035c8bf16e0b3c1869709ce4a86fc2f31c", - "sha256": "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c" + "commit": "9b42c976dcaeb3ea3baacfd67c850b82ef9d164c", + "sha256": "1ps2ffsl0smfp1zqp24slzw5zd7jrmacplnxbg714fb1r5z2pfya" + } + }, + { + "ename": "casual-editkit", + "commit": "401fe3e5097d3187a67632e8cb2279043aa82227", + "sha256": "1h2hbyv9rn229x2gdnqdala3hvz24vvc615sy8bg00iwgwf90kyf", + "fetcher": "github", + "repo": "kickingvegas/casual-editkit", + "unstable": { + "version": [ + 20241009, + 2252 + ], + "deps": [ + "casual-lib", + "casual-symbol-overlay", + "magit", + "transpose-frame" + ], + "commit": "53ea0e05e275f9359b5a3aed8a0c864eb3cf8b50", + "sha256": "08ixzsm4xml3mas0scnc2qcwq3if5v2r18p4qxj89fg4flbqmkm7" + }, + "stable": { + "version": [ + 1, + 0, + 13 + ], + "deps": [ + "casual-lib", + "casual-symbol-overlay", + "magit", + "transpose-frame" + ], + "commit": "53ea0e05e275f9359b5a3aed8a0c864eb3cf8b50", + "sha256": "08ixzsm4xml3mas0scnc2qcwq3if5v2r18p4qxj89fg4flbqmkm7" } }, { @@ -11336,26 +11488,26 @@ "repo": "kickingvegas/casual-ibuffer", "unstable": { "version": [ - 20240730, - 329 + 20241001, + 622 ], "deps": [ "casual-lib" ], - "commit": "877bffe4e69f2715f5f84ad15ca54f4a14493b80", - "sha256": "0gpklvr70vwkhsbb0s9khaj4mv8mizdyjrag8q6f5ajivaxp67vi" + "commit": "6d58d18d42e5433d5eac271a7b987ee9756c9c89", + "sha256": "0wnfz5i0xrafqln9lsv6drfa5hc2mqq4d3fd84lhyn74ya86w2mc" }, "stable": { "version": [ 1, 1, - 3 + 5 ], "deps": [ "casual-lib" ], - "commit": "877bffe4e69f2715f5f84ad15ca54f4a14493b80", - "sha256": "0gpklvr70vwkhsbb0s9khaj4mv8mizdyjrag8q6f5ajivaxp67vi" + "commit": "6d58d18d42e5433d5eac271a7b987ee9756c9c89", + "sha256": "0wnfz5i0xrafqln9lsv6drfa5hc2mqq4d3fd84lhyn74ya86w2mc" } }, { @@ -11366,26 +11518,26 @@ "repo": "kickingvegas/casual-info", "unstable": { "version": [ - 20240711, - 712 + 20241001, + 706 ], "deps": [ "casual-lib" ], - "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c", - "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz" + "commit": "79d9bae486e92c0eabf82cc566d5578cf05015b3", + "sha256": "1cw3pcwp08bv6hrfkza2iprpqppas63v2sxyhn2b3z8wywh65vg6" }, "stable": { "version": [ 1, 3, - 1 + 3 ], "deps": [ "casual-lib" ], - "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c", - "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz" + "commit": "79d9bae486e92c0eabf82cc566d5578cf05015b3", + "sha256": "1cw3pcwp08bv6hrfkza2iprpqppas63v2sxyhn2b3z8wywh65vg6" } }, { @@ -11396,26 +11548,26 @@ "repo": "kickingvegas/casual-isearch", "unstable": { "version": [ - 20240808, - 1638 + 20241001, + 700 ], "deps": [ "casual-lib" ], - "commit": "812355ca972c81d9a31611572c490a2ea8ed8881", - "sha256": "1kpwq046lw1sp07grxf9qlgnhiar32r65flrgbnyqafwgy95biky" + "commit": "1568edca4aeb280a10e943f38cff8d744d5822f4", + "sha256": "1913r2hf62zhldii1w175i5fg21c1famb8742nvikv8n6vj8d0p7" }, "stable": { "version": [ 1, - 8, - 3 + 10, + 1 ], "deps": [ "casual-lib" ], - "commit": "812355ca972c81d9a31611572c490a2ea8ed8881", - "sha256": "1kpwq046lw1sp07grxf9qlgnhiar32r65flrgbnyqafwgy95biky" + "commit": "1568edca4aeb280a10e943f38cff8d744d5822f4", + "sha256": "1913r2hf62zhldii1w175i5fg21c1famb8742nvikv8n6vj8d0p7" } }, { @@ -11426,26 +11578,26 @@ "repo": "kickingvegas/casual-lib", "unstable": { "version": [ - 20240815, - 1946 + 20241001, + 704 ], "deps": [ "transient" ], - "commit": "db18e23ca60c9b0ba21644d54bb343a1099c6dbb", - "sha256": "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3" + "commit": "212313b1cd80e2757224d34ab34a098ff1cb37ee", + "sha256": "0s9yx9s1d4zr35j3pd6dnhldax1h0sgr5zrraqva4ysbflwlvy50" }, "stable": { "version": [ 1, 1, - 2 + 4 ], "deps": [ "transient" ], - "commit": "db18e23ca60c9b0ba21644d54bb343a1099c6dbb", - "sha256": "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3" + "commit": "212313b1cd80e2757224d34ab34a098ff1cb37ee", + "sha256": "0s9yx9s1d4zr35j3pd6dnhldax1h0sgr5zrraqva4ysbflwlvy50" } }, { @@ -11456,26 +11608,26 @@ "repo": "kickingvegas/casual-re-builder", "unstable": { "version": [ - 20240730, - 49 + 20241001, + 655 ], "deps": [ "casual-lib" ], - "commit": "f52e0f2ae1faee0d2988fe701880f13fda66ab86", - "sha256": "1j9mqj1xf09q1iwkxrgz2k83dcaa214khk3xcmndbl0c86amzd0z" + "commit": "5b4af74b7e7a82cc15122035e4e6286d843f1ef0", + "sha256": "09cqpji9zshwn9gaf7rw34w8pggkkp3g5rq8a7pizx7hxjlaskkd" }, "stable": { "version": [ 1, 1, - 1 + 3 ], "deps": [ "casual-lib" ], - "commit": "f52e0f2ae1faee0d2988fe701880f13fda66ab86", - "sha256": "1j9mqj1xf09q1iwkxrgz2k83dcaa214khk3xcmndbl0c86amzd0z" + "commit": "5b4af74b7e7a82cc15122035e4e6286d843f1ef0", + "sha256": "09cqpji9zshwn9gaf7rw34w8pggkkp3g5rq8a7pizx7hxjlaskkd" } }, { @@ -11486,40 +11638,78 @@ "repo": "kickingvegas/casual-suite", "unstable": { "version": [ - 20240730, - 426 + 20241001, + 607 ], "deps": [ + "casual-agenda", "casual-avy", "casual-bookmarks", "casual-calc", "casual-dired", + "casual-editkit", "casual-ibuffer", "casual-info", "casual-isearch", - "casual-re-builder" + "casual-re-builder", + "casual-symbol-overlay" ], - "commit": "328c9a02af56d56fe794fb073c0b720cb7ff7efc", - "sha256": "09n9b1g6diclj3wvy3nqig4a7hq9l1y8fjga7y5zn51bawmk6spd" + "commit": "fbab88e8390085079df60b2295979d73205bc64f", + "sha256": "0d0xjnfyab26xki89nb2q0r1zplir99ywa0p661njvj5gqmviwxg" }, "stable": { "version": [ 1, - 4, - 1 + 7, + 4 ], "deps": [ + "casual-agenda", "casual-avy", "casual-bookmarks", "casual-calc", "casual-dired", + "casual-editkit", "casual-ibuffer", "casual-info", "casual-isearch", - "casual-re-builder" + "casual-re-builder", + "casual-symbol-overlay" ], - "commit": "328c9a02af56d56fe794fb073c0b720cb7ff7efc", - "sha256": "09n9b1g6diclj3wvy3nqig4a7hq9l1y8fjga7y5zn51bawmk6spd" + "commit": "fbab88e8390085079df60b2295979d73205bc64f", + "sha256": "0d0xjnfyab26xki89nb2q0r1zplir99ywa0p661njvj5gqmviwxg" + } + }, + { + "ename": "casual-symbol-overlay", + "commit": "0c608bf895a3b5230b781662510e1326af17ea13", + "sha256": "0xhlvxfbflqss3684r68by01d6j75jx0vv1n1mcpnhs29z19b5f4", + "fetcher": "github", + "repo": "kickingvegas/casual-symbol-overlay", + "unstable": { + "version": [ + 20241008, + 2317 + ], + "deps": [ + "casual-lib", + "symbol-overlay" + ], + "commit": "9481daf1b9b027dbd12cfed8219b89e73ec3728a", + "sha256": "1m1bfds64adfa3r1al1fchb7skfj6m19dv3k9vi67nd50sal7w4r" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "casual-lib", + "symbol-overlay" + ], + "commit": "9481daf1b9b027dbd12cfed8219b89e73ec3728a", + "sha256": "1m1bfds64adfa3r1al1fchb7skfj6m19dv3k9vi67nd50sal7w4r" } }, { @@ -11554,11 +11744,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20240818, - 734 + 20241006, + 2057 ], - "commit": "0b4a7e43b80aedcb7a8088ce0ab4928bd34d5f95", - "sha256": "0875x96djls8yhk1j6g6rl9pml8zyx4r5vysbqjda1m98vdm23np" + "commit": "f579a6aa26234f067c06e85e203ac2b89db99b4d", + "sha256": "1bxamcmh8qzz2ncmy7yhlr05zry2np0l5y5cw8sglivnbfcnb054" }, "stable": { "version": [ @@ -11716,11 +11906,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20231118, - 645 + 20241007, + 1623 ], - "commit": "33770dec73138909714711b05a63e79da5a19ccd", - "sha256": "05wxwc28wsndj2ks0ymdbfr2sz4ybr0py85p3dryps82vv2qzbpj" + "commit": "fac070f0164ac9f5859cb4cccba7d29a65c337f3", + "sha256": "1851nf6bghgzh9nbv8x92yzgdc9rl2jiiwqw2kpninr5myk7fh9y" }, "stable": { "version": [ @@ -11839,14 +12029,14 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20240813, - 1143 + 20240921, + 642 ], "deps": [ "powerline" ], - "commit": "ecee903518f1650421891f6c7bf521f200e22765", - "sha256": "0npi4r8bzbsha5m2zi77srlwyak6fk35xcmqyzl233dm7k9yi4sv" + "commit": "3d78b1e608b7c203e4e788894d8fa52a0a13207c", + "sha256": "1r0jvy3c5svwq3xj06fin5xzh0gf23r1pfk8bqa6r0fgfrq0rj5g" }, "stable": { "version": [ @@ -12060,13 +12250,13 @@ }, { "ename": "cfn-mode", - "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97", - "sha256": "0yk7zlgbr0s3lc2b05g057g55x3rl767xd317hb162lg0d7d900v", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1z7wzsf8h6ls8rc8xpb007aqkp1j6252g8gg8mfhrbvrl281232g", "fetcher": "gitlab", "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240811, + 20241013, 805 ], "deps": [ @@ -12074,8 +12264,8 @@ "s", "yaml-mode" ], - "commit": "4784f043b214aa38c0c2c7f01e67802832a6c380", - "sha256": "0zjwf654wf6d18jgn1kw8ll6pb476jqzrlixzlf8bbygsypw5pr8" + "commit": "442f374ee338c6f7ffacbf1bca4233218303b6c1", + "sha256": "1rjyivcsaxc4d7mfks8bc7c8dgibrzfjvbrjc8m04w0g26q2llma" }, "stable": { "version": [ @@ -12189,11 +12379,11 @@ "repo": "challenger-deep-theme/emacs", "unstable": { "version": [ - 20231218, - 1042 + 20240913, + 937 ], - "commit": "1afd5787374c2bf3bfb46beb18e64d5677c07366", - "sha256": "09pcdwk24j1jjvvwy2x9qp1pya4kzs0ly0wniydlmkzzj4xjr4n4" + "commit": "8f688eda0d9b138e41e21d2ca246c89c3547002f", + "sha256": "0cfw05kz21dy7xv6yyc43acb9x3fskkf3q3hi1gm0i8zy3l4yyb0" } }, { @@ -12339,26 +12529,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240816, - 737 + 20241011, + 1057 ], "deps": [ "shell-maker" ], - "commit": "0efead292f053774bba3c0789370e8e383aa49ec", - "sha256": "0bqc5d93nplfhhcfh1605pi6ymqbb15774f7ij58wvy98yb5rh0s" + "commit": "433f7625e885ef72b5fdc6ea0ada95a6c529367d", + "sha256": "13ms3kazw1z01hmg00hbdxnja8973q1hmd6x2bwdijv7agxzcbxc" }, "stable": { "version": [ 1, - 3, + 8, 1 ], "deps": [ "shell-maker" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" } }, { @@ -12388,11 +12578,11 @@ "repo": "ataka/chatwork", "unstable": { "version": [ - 20170511, - 442 + 20240910, + 1531 ], - "commit": "fea231d479f06bf40dbfcf45de143eecc9ed744c", - "sha256": "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z" + "commit": "5abbf07bd6063c922191cc645f5771a943e3043c", + "sha256": "1gxaycb22wj9sw83n3807j46vr60higv0a5lg6igwm603v8xmg7c" }, "stable": { "version": [ @@ -12476,8 +12666,8 @@ }, { "ename": "chee", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0dk30kadpagz1in8jnj7550865hxa7wmyl15pb8ivz1llm3v85bf", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0hfjnqv2ynvd2sawiar99haxwbnzi6fpc8s79yixkbig83g4nfmb", "fetcher": "github", "repo": "eikek/chee", "unstable": { @@ -12510,8 +12700,8 @@ }, { "ename": "cheerilee", - "commit": "da435df8d78b7c8d4834e00e35c69248a7043c0a", - "sha256": "15igjlnq35cg9nslyqa63i1inqipx3y8g7zg4r26m69k25simqrv", + "commit": "6567568fd1ca2945cc84bfcea5d40601503dd1fb", + "sha256": "14z07g4m73dxzfraqdx5mjf5ja3hd0lcfqszzvnvvg2gn7pxdy9i", "fetcher": "github", "repo": "Vannil/cheerilee.el", "unstable": { @@ -12840,8 +13030,8 @@ }, { "ename": "chronometrist", - "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", - "sha256": "0bq5840cpnbxawfm0x3nf15m5yycwd0iilw11rsfnssahmlc3lfz", + "commit": "96ab36a3c29cfa48623678a1e2414a1991f5c77d", + "sha256": "1n5dmn4gxr2zm1ccqz8xab47r99ji6lyyb2bz5rm20xyx6yq83ij", "fetcher": "codeberg", "repo": "contrapunctus/chronometrist", "unstable": { @@ -12893,20 +13083,20 @@ }, { "ename": "chronometrist-key-values", - "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", - "sha256": "08j7fm0wky0qbaz6xv8kvn5sbb1dqm1zjjz25kdxfp05mi7dpmyk", + "commit": "90388ccc7ab8518d8419daa095f98482783b74f0", + "sha256": "1qmha3mc316fpkmc80qnzv2r4wwfm214g3aay563fhysw3jn64w8", "fetcher": "codeberg", "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20230629, - 1039 + 20220321, + 349 ], "deps": [ "chronometrist" ], - "commit": "d8290a82ea65730413627325a705067269cfa2f1", - "sha256": "1yzd3zfr99wgfb29gcs3gnznl7vbw2fjvxkl7cmbix3aw0pbpq10" + "commit": "239f733dd8f784a5251ae253d350a99fb739da6e", + "sha256": "0z2zbcpl9aad12vpk1lg096sh4nqmq96rr6cq0x0gbsq69i65iv9" }, "stable": { "version": [ @@ -12994,11 +13184,11 @@ "repo": "chyla/ChylaDarkThemeForEmacs", "unstable": { "version": [ - 20240708, - 2033 + 20240824, + 1615 ], - "commit": "8d5c9a2eaaf04e0f1ad953a34b15e9777407b760", - "sha256": "0lx51z5iwm0wz9c8d2fjx9974z2rp48q50dljvcfw795zgbdm79b" + "commit": "274ff01146e265f773478b16a59483b638b986f8", + "sha256": "0kg25ldi341wqz47fgk9f4dkfxy3hxbwq1ijcl3490ww87q3cx27" } }, { @@ -13024,8 +13214,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240815, - 918 + 20240924, + 1959 ], "deps": [ "clojure-mode", @@ -13036,14 +13226,14 @@ "spinner", "transient" ], - "commit": "144811a819b469cd797c88ec1f24119cfa8454af", - "sha256": "0lydhza3jy60y5wcqgaikbq3wa2gv4n4d4rkbbkqm6kbm5mphk5j" + "commit": "0b70bf86ef726dd8947b9fdfd459e805a2487c89", + "sha256": "0qkhl1q0araykzdvxqagc5in1nghb6fsp6f88jcxb8pa9h1sv94b" }, "stable": { "version": [ 1, - 15, - 1 + 16, + 0 ], "deps": [ "clojure-mode", @@ -13054,8 +13244,8 @@ "spinner", "transient" ], - "commit": "810337cee931d9f14aa16550a74516f8337a47f3", - "sha256": "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1" + "commit": "76eac5aa634adba9a5b632cfe670467ebe319126", + "sha256": "1r90w7n10zyqspvm52bjbkalxzzp3jxwmbrfmifiyqzqrl0lyfrr" } }, { @@ -13336,16 +13526,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20240419, - 2232 + 20240907, + 1157 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "07d2a63c99fe35cbd468f8e6a322de05f1a29469", - "sha256": "0806av5mbxnhgmdam47lz6bswi8fr9xq4hff8had7l7g27adldgy" + "commit": "0f1786b7fee58452a3225e4b9b7c94176fff9b5a", + "sha256": "032k6wi8kxcgfbff6qbawkl8cvicp7hzaf8agj70451qxqiav8xi" }, "stable": { "version": [ @@ -13370,16 +13560,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240709, - 1954 + 20240908, + 2154 ], "deps": [ "citar", "dash", "denote" ], - "commit": "8333093ffcd05aaf5ec98568d9e4abe03a6eebb2", - "sha256": "19vrmsykp4j9p7ib686jc4qya2rra09685wp9c715r5kas4y8rva" + "commit": "c0c467653976ab40ff330fcb4586fadb69e48a29", + "sha256": "03fqq24ql6pgkjhjfv41xgsxqyd4czns9r9fzcnn1m4gbzpprf4v" }, "stable": { "version": [ @@ -13645,14 +13835,14 @@ "repo": "emacsmirror/clang-format", "unstable": { "version": [ - 20240115, - 1750 + 20240828, + 1832 ], "deps": [ "cl-lib" ], - "commit": "9f4358fcc8b04018cc1ed46fcc96fc7bfa361a47", - "sha256": "0cing1dk1zbb5pclf6zrndj26byssggh5fxlsly7cf9hyjwj2c1j" + "commit": "7a955a4ed7e92fdb82983e307cb523547bb0285a", + "sha256": "1x9zw2css02cmy3l7wy96qh4zhv4c5z04xg94xwb6vc33ca09lgx" } }, { @@ -14476,11 +14666,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20240725, - 1139 + 20240930, + 1316 ], - "commit": "0e6816e76ea31c0f0e4d39d8f016c262e57dcb10", - "sha256": "13dwgkqricisnxkp7x066f7gm9w22myc9s7m88s3kslvf9k4qap2" + "commit": "dc74c4546f3bd9e026eef5b0519e8b5aff9781cc", + "sha256": "0a6pdkzcmv23yj5bj26wp7n4m7h36h6fw0g5aymnr50hl9r695f2" }, "stable": { "version": [ @@ -14739,10 +14929,10 @@ "version": [ 3, 30, - 2 + 5 ], - "commit": "d88682dff6bf053e5bbdc10accf5d6825303e656", - "sha256": "1apk3vkg7n6mqpqibib02xmvzsy99zhyc6ajsk4ajr1iri9wyv1h" + "commit": "9c4a0a9ff09735b847bbbc38caf6da7f6c7238f2", + "sha256": "0v6aqbrmk2mlbjd03319panq9zsz03rph230ypb9njliv7lxd6kv" } }, { @@ -14894,11 +15084,14 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20231119, - 2138 + 20241003, + 1036 ], - "commit": "44546ca256f3da29e3ac884e3d699c8455acbd6e", - "sha256": "1fc5l87kzmnwxmrq2v7x4jzcplq375v9j0h2yz4grzaql3jcc419" + "deps": [ + "compat" + ], + "commit": "6511793ce9092c3f68f7cd5340267472a4b1b7dc", + "sha256": "1gpfzgv32mfms2x0k3d5wjp6vbsayhsk6hpbis7wrq6x0a6m8m2j" } }, { @@ -15039,14 +15232,14 @@ "repo": "abingham/emacs-codesearch", "unstable": { "version": [ - 20181006, - 1431 + 20240828, + 618 ], "deps": [ "log4e" ], - "commit": "f6eb96f034a925444412cfa03e45e0ccbbafe3f2", - "sha256": "1xdkm1f04z1h3ivd6zm8hckf3n3fbi5rwybg4dwi5mim6w84i7j9" + "commit": "92b4c2557c0bbf7da4d26c413feccb6766e70a9c", + "sha256": "1p4qplfcs1lrsgnag0qlqc8fczlj1404dbz94sydg5lqaw1lhf6j" } }, { @@ -15072,6 +15265,21 @@ "sha256": "0yg2v8q7w5siyrq5jfsdjm8a4jx9mqlqyw6k69snsj95kzgj11g6" } }, + { + "ename": "codex-theme", + "commit": "1d8c6470c5371a2c2590e3a62a0ce0eba452d33e", + "sha256": "07ssy2xx21l60kdawwdii2g9cnbf4ppm70b56jyyr0cqvayim6f4", + "fetcher": "github", + "repo": "hsnovel/codex-theme", + "unstable": { + "version": [ + 20240914, + 204 + ], + "commit": "fe5ce22e801423e7a5dafb7b57674e2dffbeb86d", + "sha256": "00w533g3xajnfjj2zij6nca9iy4gp9p49y9q6lccd8na3dzqwrs5" + } + }, { "ename": "codic", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -15211,14 +15419,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20240505, - 2245 + 20240930, + 2149 ], "deps": [ "dash" ], - "commit": "8e189b03ad602cc457308934fbb91b2dc8f286df", - "sha256": "1dhikxir170ssrl8l8qwgg5f9kk391y0wmaa9dw2v20y2jvhpvzh" + "commit": "3a11607d7b02d7783572d7f4a1a6e30441f3cd4b", + "sha256": "0sivgxz18sr9dcy48fv3wsahky37yg29d6ap47i2b54cq1rph5lm" }, "stable": { "version": [ @@ -15821,20 +16029,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20240729, - 846 + 20240926, + 2127 ], - "commit": "1321e285a54dfe43cae71f52e58bff4f0c8c161d", - "sha256": "0h6hls2w2yl00wqqs187k3zr3g0yjkg7zw7v3g4dsjynkkri55f9" + "commit": "9c273fc7c1a9dd69ccf508589211c4f8bd0e0765", + "sha256": "0p55yaf8ac2q53l9palsyw8qrxjiylbs0npid8v5rdgf8ah9n6ag" }, "stable": { "version": [ + 1, 0, - 10, 2 ], - "commit": "34e92d9b7084b03d087866abcd1e6a22a244c9bb", - "sha256": "1s2d0x7s8vgnc7idzcbpa3y1nrmgmpahzzzi9xh8dcsn5ss42sl1" + "commit": "393940f76aec1f2500441d4e0b97f783acbb536b", + "sha256": "18w57gwk6ymhp6xafrd1vmq9xwd42crfws1byj83g5lbr1yv0rs8" } }, { @@ -16815,15 +17023,15 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20220103, - 1622 + 20240816, + 1648 ], "deps": [ "company", "native-complete" ], - "commit": "1bf5e24069e543953602a3aee67336d8e0e7d817", - "sha256": "17bc7xshsfz23snjmwfrsdvsqgnp2m08wy37yb2fqvafwcvn2an1" + "commit": "452c8d429f51434f5d53bd9920b7c2d06bf559d9", + "sha256": "17whf160k8rwvvmwlxs6fyjl061l0rzqb6n17f8wwn78j77m0c6b" } }, { @@ -17774,79 +17982,108 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240507, - 1829 + 20240923, + 1814 ], - "commit": "1fbd38806c70ebe8ebfec49cc7606284396a31e6", - "sha256": "138wayb49ywjgxdc19xlv7gr5is0yc9jwaxrxhjp1jj9mjidy1x0" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", - "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" } }, { "ename": "compile-multi-all-the-icons", - "commit": "d137a781874d564c5e5037663fae3073ef62c469", - "sha256": "087kqb4jklhjflw2vpglm05l8ls606ca2xl0ai8pkhysxalhjdv6", + "commit": "0d723a43edc2b00d62a6ff08f542eb448726d2ff", + "sha256": "1ax8bvvzvkp0mh01sdxvng59ia2v4aavbi67sgc5r1ng1qlsf1h8", "fetcher": "github", "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240506, - 1319 + 20240923, + 1814 ], "deps": [ "all-the-icons-completion" ], - "commit": "4f9cc1d3c448ecc496540a65578191733c09b0fd", - "sha256": "0q95fs78wz63s3lldh7h8l4gqmk67dlwg2kkiyl8f4byp77cf0p4" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "all-the-icons-completion" ], - "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", - "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" } }, { "ename": "compile-multi-embark", - "commit": "0c9f94bf7b6d6a0bd56087073f9a58e7b8dab693", + "commit": "345ab342d3bfb42b0dd9421f6b4ad71c17dd02de", "sha256": "0p8c6jmagfhf3n04xna1fywj1a097myy0cgn04spn2b74zgkhbj2", "fetcher": "github", "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230904, - 1806 + 20240923, + 1814 ], "deps": [ "compile-multi", "embark" ], - "commit": "30edb0e86287101269debf20f43cead92310029a", - "sha256": "0ppm9zw65f1a7b6qb5hx60i6fxkqarrhlz2kn6p2b48s089dykyp" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "compile-multi", "embark" ], - "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", - "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" + } + }, + { + "ename": "compile-multi-nerd-icons", + "commit": "039b04da36001449531df13611e5663f8e61d313", + "sha256": "1bz76skwjmk927a3x6mnklwby4sxc0mq6s7dbixipjf1fyrnlkx3", + "fetcher": "github", + "repo": "mohkale/compile-multi", + "unstable": { + "version": [ + 20240921, + 1212 + ], + "deps": [ + "nerd-icons-completion" + ], + "commit": "d6115349becc71cce3a335bf9b34265fe073e0bf", + "sha256": "06kvp3cmv70gbf4mkwavip9w9z9wx4jwar7sky9dnw1w7agffspb" + }, + "stable": { + "version": [ + 0, + 6 + ], + "deps": [ + "nerd-icons-completion" + ], + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" } }, { @@ -17857,8 +18094,8 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20240617, - 2114 + 20241009, + 2026 ], "deps": [ "eldoc", @@ -17866,8 +18103,8 @@ "plz", "seq" ], - "commit": "be99c0f00d4814c3602ea55ca116f5dcda6645a6", - "sha256": "1hdsa6jm75sga62xsw4054dnr1l8wqbb86bxqmq4zwlqnhi7rdp7" + "commit": "0d94e8b8a7ac81777cb8cccd801db7a2e082f0d6", + "sha256": "0kv0kd5qqaa4vvhkp3dnbsvd9kfyawhppnxvzxzfdpvvd6rkms8b" }, "stable": { "version": [ @@ -18018,8 +18255,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20240708, - 2135 + 20241005, + 2057 ], "deps": [ "dash", @@ -18027,8 +18264,8 @@ "pythonic", "s" ], - "commit": "ce748a53f9c7d7a7d112632d32c848d6e5482e18", - "sha256": "0l63dbkv91ashpjvnns4z5fzhmacal1pslycnmj05gar4sj4339v" + "commit": "05de0c8f0cf336d90c044446aaa066ee13001b83", + "sha256": "038ay0crl693g6ag7q54ckhgcwl6x4d3pik4mriqrjfaq0cp6f1b" }, "stable": { "version": [ @@ -18167,11 +18404,11 @@ "repo": "tralph3/conner", "unstable": { "version": [ - 20240816, - 2343 + 20240828, + 123 ], - "commit": "7ea91fb4f1a067a3352ad66b70acfe86c76610da", - "sha256": "1av59fgwpp9gvhdlkfxqa20lk0g2vmj9pxdbiwkkvn65jxpn4hml" + "commit": "93caf208e8e7f6b0627e5eb162f1488311d16b4c", + "sha256": "18rn5gbbscyy6558lxgja83x3jyhj9acnz79zc16a4x8jc994qjc" }, "stable": { "version": [ @@ -18205,14 +18442,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240818, - 1112 + 20241001, + 2057 ], "deps": [ "compat" ], - "commit": "d403b8bd1b49922de5a8060e79f647db7988ace6", - "sha256": "0kwa6vyd54hvlfscjy2i3rc0ln1n7d4614n1hy9vgk5w27iqnnng" + "commit": "07ea5421fbcb65b2207a43a0941124a95a47abc7", + "sha256": "0xhn7sxzx7qwij76mi5s52xrvh2af6sjppmqspd445vxpl8pgffx" }, "stable": { "version": [ @@ -18312,27 +18549,27 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240507, - 1949 + 20240923, + 1814 ], "deps": [ "compile-multi", "consult" ], - "commit": "a8782ac55115b1afe0bee52664b46bfbd9bf202e", - "sha256": "1rr74klnariax66n7r5sbkqjszqslxg8l58rxmb1b3yv5mzic10y" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "compile-multi", "consult" ], - "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", - "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" + "commit": "94b2f267d1e424cf523643a3c9841c83f0a86368", + "sha256": "0myyl5h62c9qn22piinh605pl6sj4jy8vik69w31zpmvskvvcjfh" } }, { @@ -18393,20 +18630,20 @@ "unstable": { "version": [ 20240324, - 1137 + 1211 ], "deps": [ "consult", "eglot", "project" ], - "commit": "4fa151f83f15de22eb2a241ddce95bed80b8ba79", - "sha256": "1bri48z9yarys95w77mxmbn6nj7wypb23bjmz410p885ma98wn1x" + "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d", + "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ @@ -18414,14 +18651,14 @@ "eglot", "project" ], - "commit": "0da8801dd8435160ce1f62ad8066bd52e38f5cbd", - "sha256": "1qxk1npxbf8m3g9spikgdxcf6mzjx6cwy3f5vn6zz5ksh14xw3sd" + "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d", + "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh" } }, { "ename": "consult-eglot-embark", - "commit": "5ffb32a540ebf6ebffd1913de1d82019674177fe", - "sha256": "1avmvd2rz6py9m089id9adi5ympic1cz0pp0xwh2kbbhyij30ns4", + "commit": "258a113cb0f7902ca083c931c064c093b3721b52", + "sha256": "1k0iq93wx7azm8lxzvihgihlk5sxhax5syynl8irlw8cibfs1wip", "fetcher": "github", "repo": "mohkale/consult-eglot", "unstable": { @@ -18445,15 +18682,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20240718, - 1011 + 20240926, + 917 ], "deps": [ "consult", "flycheck" ], - "commit": "3b999ae983900c16c0b5b5c30b7eca640d386a76", - "sha256": "108ajqqi0dbcjykippsa6v25bvcc3d17jjyypknznlskch68yw88" + "commit": "bad8a8a25328782dfce3a9e4de6ad6d325b353d7", + "sha256": "1wg8n0lxmrwm8m7rv3bkjrj33qyms1fvg7cqb3cj8cazsqrz92h2" }, "stable": { "version": [ @@ -18486,6 +18723,100 @@ "sha256": "09zng143lcxlvsbi9y5sck9z7626lqxmr9yr897ka9h525lvykc4" } }, + { + "ename": "consult-gh", + "commit": "139d2c2d0806559265946345c9efa0c26ae939ad", + "sha256": "01rw5yz96awm9qipklh4yh8ww6xwfnd76cpfskifwdm12bwgvd1w", + "fetcher": "github", + "repo": "armindarvish/consult-gh", + "unstable": { + "version": [ + 20241001, + 23 + ], + "deps": [ + "consult", + "markdown-mode" + ], + "commit": "bdc5516435ffa9efcd4de102b5d8549386b0ba6a", + "sha256": "1wc1fdg5f52nrpm7jd3sv3lldm02habr3ldqdgixfg2h867cgp0w" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "consult" + ], + "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", + "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + } + }, + { + "ename": "consult-gh-embark", + "commit": "9b7865b6f04dc4524951f44d1551b5a2bcb3e281", + "sha256": "0w5yv89qcdx71w01zjql4bkpbibrdjir839iqch7wl3yjbipxd2r", + "fetcher": "github", + "repo": "armindarvish/consult-gh", + "unstable": { + "version": [ + 20240929, + 803 + ], + "deps": [ + "consult-gh", + "embark-consult" + ], + "commit": "4e4a1ef9a4823b37cf7057208f712aa69e1e0e2c", + "sha256": "0yx8mqx17iz2q28077z0w2pxnbxqr41mvj418wrqw2fgwm012v6n" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "consult", + "consult-gh" + ], + "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", + "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + } + }, + { + "ename": "consult-gh-forge", + "commit": "2ae6fbd7c248665f973e503106269ce33ad8b88d", + "sha256": "0qx0l1w0gwwfrcc59rbq5lbpbscw5qvj0x3kh0m0f0sz3f2zx5fn", + "fetcher": "github", + "repo": "armindarvish/consult-gh", + "unstable": { + "version": [ + 20240927, + 1004 + ], + "deps": [ + "consult", + "consult-gh", + "forge" + ], + "commit": "79204bab021d9c58687dbce44694419c966d6998", + "sha256": "008gak4q21qw4bm1lsrxsz8dad5s6rh8v0fvlasjhhyfwwywdk09" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "consult", + "consult-gh", + "forge" + ], + "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", + "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + } + }, { "ename": "consult-ghq", "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce", @@ -19025,6 +19356,35 @@ "sha256": "1vf4rr97y326lq76q57i2f7j3s264gqz36dnhaav0ivrzx8zwnyl" } }, + { + "ename": "copilot-chat", + "commit": "6e3852d02866ef577717fae04a56c876efa4217d", + "sha256": "1xzaa9rn8bnbjlcvlir2nnvidnmyhhcjqi7yi7xadv5i0rw66zxz", + "fetcher": "github", + "repo": "chep/copilot-chat.el", + "unstable": { + "version": [ + 20241008, + 2152 + ], + "deps": [ + "chatgpt-shell", + "markdown-mode", + "request" + ], + "commit": "48445c1d42f29cea7d02fc1aa15c38c47a0d4119", + "sha256": "1ndgf0p70s7yi2rwihm05hs1ysg7yjlfvvv5bax78244l9ca186p" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "80918ac52c118f987fa1bc2eec8aeb6f76a5c92f", + "sha256": "001niz36am46mfn1a6z2w9jmq5zv92hpb1bdk8gv2zdgr9pkqg9x" + } + }, { "ename": "copy-as-format", "commit": "42fe8a2113d1c15701abe7a7e0a68e939c3d789b", @@ -19175,14 +19535,14 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20240726, - 359 + 20241014, + 915 ], "deps": [ "compat" ], - "commit": "5e3a959766d2313651c5db3beedd937bfc27b57a", - "sha256": "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0" + "commit": "fa2be6c66ff2eb10b4b609832f25df49e90381af", + "sha256": "15fmwmsbbb4609rcg0xmcip88rzy6vv9ri8camdysy6lisi9fhsa" }, "stable": { "version": [ @@ -19280,6 +19640,24 @@ "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7" } }, + { + "ename": "corsair", + "commit": "b3329e0a7ef889126c673eb9cc151629ec1e1acf", + "sha256": "0hxdvgc36gc21kmnib5b107zakhz2isw7hwxw60cwq6ymh61il93", + "fetcher": "github", + "repo": "rob137/Corsair", + "unstable": { + "version": [ + 20241007, + 922 + ], + "deps": [ + "gptel" + ], + "commit": "bb46a8004de71f715bc60ed52fbcb5fd7a27103f", + "sha256": "1k8lxh8z0k1hjcwyb8dz7pi3lnm50w7zy3kk2495fqkwcjj5b35w" + } + }, { "ename": "cort", "commit": "1c99109a816303b1a14ff15e7a8300c73910e3a7", @@ -20584,8 +20962,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20240813, - 1802 + 20240823, + 857 ], "deps": [ "dash", @@ -20593,8 +20971,8 @@ "multi", "shut-up" ], - "commit": "bea3a94f4e1b4d3b32a4ed7943d2beda794908b5", - "sha256": "17mq1wkf9rx3idrvn99y2vyylm2xvh9k7288xjl0c6whznaya3zs" + "commit": "34e208ba29bf5a8679a07607d29951f7657676e1", + "sha256": "17rrgmby1dhl1j0a42bh3x5i06jn4lz5ipmxq2ysdpypivlrarkn" }, "stable": { "version": [ @@ -21532,26 +21910,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240814, - 938 + 20241011, + 805 ], "deps": [ "shell-maker" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" }, "stable": { "version": [ 1, - 3, + 8, 1 ], "deps": [ "shell-maker" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" } }, { @@ -21786,11 +22164,11 @@ "repo": "grtcdr/darkman.el", "unstable": { "version": [ - 20240203, - 1209 + 20240919, + 651 ], - "commit": "136eac628595c6777eb6b2246a014dfcb3b6c625", - "sha256": "0g8jwnx6cgsk02ncfa9bi6nnvw5s5k2fvji7qwz52m2vb2c2l1i6" + "commit": "f4c11edc86f16b7ce88c33dc6112e17e751171dc", + "sha256": "0bg99fz8f94p81p4zvihli7nh0m0r4p9j7bb0y7m54h3hhj6p1cz" }, "stable": { "version": [ @@ -21888,8 +22266,8 @@ }, { "ename": "dart-server", - "commit": "e798e4fbe5a1d1dbe08c9bfc5c54d32cfe4bde62", - "sha256": "1w7qxd78cnxycg34hxlcw8yda2ixkl683k7mxm20wfqyg5f46bxm", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1ms94kwi6wd3xy8gpwm656slf6invnahihypiyigfsy343vs3900", "fetcher": "github", "repo": "bradyt/dart-server", "unstable": { @@ -22033,11 +22411,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20240813, - 838 + 20240923, + 2345 ], - "commit": "187699e2d80f6a3b0ec7b2fb2e1d7ece2712208f", - "sha256": "0agx20phxdx4wrm4y6zhsin061a6945sdqh5vnqgs4kg1irhan42" + "commit": "946b9957470a3cac6b089bdf2d9edd07a29fcc9c", + "sha256": "0baz0kyzmp9zjdsh79sh4shfx4wbkgq8fcrp8rhih9x1jwg2bk4k" }, "stable": { "version": [ @@ -22057,15 +22435,15 @@ "repo": "hyakt/emacs-dashboard-hackernews", "unstable": { "version": [ - 20220516, - 1809 + 20240918, + 1301 ], "deps": [ "dashboard", "request" ], - "commit": "34d86bffcde7e6d10ffa7c5080a71a144f01f3aa", - "sha256": "0vxdys6jpxkih95h9qb687jgykrdmlpvxcfhldhn9zd8v8kz4sky" + "commit": "ea49fd79d12c26a2c3f9bcdffd0d70dcfee7cd74", + "sha256": "1s5rs8snd82fcq5ic7vy1612462958h02n23bpvl2mss6m7w33w0" } }, { @@ -22355,6 +22733,30 @@ "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k" } }, + { + "ename": "dbml-mode", + "commit": "0197a69ab700b1e8610db451115a9011fc7ea4da", + "sha256": "1hsyf5w0ai0xis4j39yl2k5cls0w8pdk6cg29aqq08h3ax4z7ppg", + "fetcher": "github", + "repo": "KeyWeeUsr/dbml-mode", + "unstable": { + "version": [ + 20240928, + 1643 + ], + "commit": "42ddcf4f19a823120477a9f22881d02099b85f1f", + "sha256": "1dxr5xzx5qa5bq4p138l6nkdjzfshxjysz0gnzqv8bd62lj3rf20" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "42ddcf4f19a823120477a9f22881d02099b85f1f", + "sha256": "1dxr5xzx5qa5bq4p138l6nkdjzfshxjysz0gnzqv8bd62lj3rf20" + } + }, { "ename": "ddate", "commit": "e3da6cf03b3fca63621dc9992924aeaa7d9a3a69", @@ -22372,8 +22774,8 @@ }, { "ename": "ddskk", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0gw3k5hw2ndhjjvf86cpz8p2ww1pq3dg6xk2g4prnq5csv2dzhgh", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1nf0f1aya2m3yzkks3kk79y2w5bg1a4y7hjspjpzcggh5p31hlz7", "fetcher": "github", "repo": "skk-dev/ddskk", "unstable": { @@ -22387,6 +22789,18 @@ ], "commit": "8c47f46e38a29a0f3eabcd524268d20573102467", "sha256": "0k97n084wahsfmnv6xq2rifkclazbqp8482ap36iswvlqcmpkxn3" + }, + "stable": { + "version": [ + 17, + 1 + ], + "deps": [ + "ccc", + "cdb" + ], + "commit": "9aff088a6caf34aadc5a75476bba097e2c887f4a", + "sha256": "0rqphxakz49rl577zy6r29g1rfiqhra846cqnbbsz2j8c4lp19zg" } }, { @@ -22428,16 +22842,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20240627, - 1535 + 20241012, + 1511 ], "deps": [ "dash", "s", "spinner" ], - "commit": "609a9c3bf52f44998dd0ec7275374d059a3fdc15", - "sha256": "0j8ggh70xvf72bf0d86kxqn19vpdylj7rchyf8asd0b9gq6l2ah6" + "commit": "8d9213990a50e55b8fd1ab6bed99e5c6a4ae229b", + "sha256": "187i1pzz8fspislj0c6d2bd08wzzxngpn3wpgj72zdgqx9y99yd3" }, "stable": { "version": [ @@ -22461,11 +22875,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20240727, - 2230 + 20241009, + 2240 ], - "commit": "232a4b3f20ca7834a8993c4aac2678b7aecca505", - "sha256": "1n1c3gnv6svq9v4pji5ry4h6m1kr8gcrdfwrh26l5s61q6bdzk68" + "commit": "7a955451f923c05eba40b56488dacff9f0fcc893", + "sha256": "1rlkj0gs3abg2dp6nzl86qy6zx7y0f85pvwrhjxghrhzv01h2cqc" }, "stable": { "version": [ @@ -22529,20 +22943,20 @@ "repo": "lifelike/decide-mode", "unstable": { "version": [ - 20230424, - 1647 + 20241013, + 2142 ], - "commit": "9c0e4c4493f9af9a981627d0630ac6cb2d8c98f0", - "sha256": "1d2z1nci47nhgb5j5nm9zhx5h9zjp2qnzkl1yn9jrsqpr2n1wfcp" + "commit": "cdd1cf76fdf4f08fb9dbe7de25b59af81337cce6", + "sha256": "00ns3kss0pir3ig0zqfww3k3lc7dpn9mzf56f8q2zsw47fisqn3w" }, "stable": { "version": [ 0, - 9, - 1 + 10, + 0 ], - "commit": "cc67cd24791accd17a2656512d863e24ca3fd578", - "sha256": "0i28pgqw3rv4ak1rrf8zv5cbqil7gmdaycyir85lmry4axhcbmsc" + "commit": "cdd1cf76fdf4f08fb9dbe7de25b59af81337cce6", + "sha256": "00ns3kss0pir3ig0zqfww3k3lc7dpn9mzf56f8q2zsw47fisqn3w" } }, { @@ -23028,15 +23442,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240727, - 804 + 20240825, + 2045 ], "deps": [ "dash", "denote" ], - "commit": "ffa666846ab1c890b9475a13c196d9ab7511cbe4", - "sha256": "0sj6bpdsyxwp5axprmnhrnybphrmq6d4kh1gass13hkaxdg2f63r" + "commit": "3d4b43f73210444942c95ee5db8e9976dfc9a1d9", + "sha256": "0d141146dapmrq3gby6ggnvdcp87zqj0amja3yjc2wr6s1z906fh" } }, { @@ -23276,11 +23690,14 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20240428, - 711 + 20241006, + 51 ], - "commit": "c14d1306648d3ae09ee3a3b3f45592334943cfeb", - "sha256": "0d9v5596k2cwb7zcc29v4gli1yydw3jcqcsz8d2dc18wl5dfks9z" + "deps": [ + "compat" + ], + "commit": "98518166efe18c2f2dd9a1c4c89430b83fdbbe3c", + "sha256": "0nm9ryq29hsgvmis2f51vwlhm5lw1571smmb2gq0qbm4zrd1h9pk" } }, { @@ -23291,11 +23708,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20240511, - 306 + 20240909, + 1711 ], - "commit": "0655b89651458777354a3b89c1d486e0fda1928d", - "sha256": "1yamaqscprvrwvgxm5q0bgjmdd31jg86z4zd2mp62xq5mqhg9ncj" + "commit": "3de7b1f013cbecebedeeeb16d5fec532ef56c2e2", + "sha256": "1sp6r1i2r8ws6l5i2dlb85lszfhwcqh10kx1a1d3gz9r993mb9g3" } }, { @@ -23546,14 +23963,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240802, - 2316 + 20241012, + 2142 ], "deps": [ "cl-lib" ], - "commit": "b80ff9b4a772f7ea000e86fbf88175104ddf9557", - "sha256": "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw" + "commit": "9e39dfc666ac03a8474b3a05da17e0c935894414", + "sha256": "0dclq2v92n2raaj80p9k6z44a5ini56z7gf3d5japllqqys2cn9q" }, "stable": { "version": [ @@ -23927,11 +24344,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20240612, - 52 + 20240926, + 16 ], - "commit": "ba65fec96983ae471edbeee2b38c2107bee94f31", - "sha256": "0blnbr4prdm1bg9qvyh8h2bkzzqnzbijrqzsz1327b1agqjh6j7c" + "commit": "cc23f16e3735403eedde64078035240480a445f4", + "sha256": "0svp4hzyzxqqi30w088w62grdp92d19yhgj046bk3qn32ids63bb" }, "stable": { "version": [ @@ -24015,11 +24432,11 @@ "repo": "jamescherti/dir-config.el", "unstable": { "version": [ - 20240819, - 1747 + 20240823, + 1339 ], - "commit": "d070df87aa5872c9d36e20e6f10b1b2a6642e1fd", - "sha256": "1wnlp35wz7gyywxvb1lmj8b0sqnav0dl9n034wf5sd1n01abmdap" + "commit": "39b835572f0d170da51560b583b2416f0b84d2d0", + "sha256": "02xfazs28qrqbx4b3v4hl4qrvy32bwy8v58idigxrlg7m5iqqrw3" }, "stable": { "version": [ @@ -24129,14 +24546,14 @@ "repo": "amno1/dired-auto-readme", "unstable": { "version": [ - 20240318, - 953 + 20241010, + 1014 ], "deps": [ "markdown-mode" ], - "commit": "8c31904ec8200e04e3d4efa2be2d1c935675423e", - "sha256": "0dp1b52748fdhsjma9s4np3zq83mqc6rcamxhdlawccaq0dn9ipg" + "commit": "4a57b4adfaeeadcf24bc73d3e90256e53aa2e93d", + "sha256": "063ji4bjr9fvqk14swxc2jx1ig7fndz7rjqlvqiz1q4y9rhpazaq" } }, { @@ -24191,6 +24608,14 @@ ], "commit": "5c5f24bea92159987f65f01ef32b261e905997bd", "sha256": "0cfbllnr8l67g61d6mbb0c8hq3c0jn2qx3k1i91dk0ns5s6208v7" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "5c5f24bea92159987f65f01ef32b261e905997bd", + "sha256": "0cfbllnr8l67g61d6mbb0c8hq3c0jn2qx3k1i91dk0ns5s6208v7" } }, { @@ -24604,19 +25029,19 @@ "repo": "FrostyX/dired-open-with", "unstable": { "version": [ - 20240614, - 2213 + 20240923, + 2050 ], - "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81", - "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc" + "commit": "5f9fddecea3d467a6d7bdb6a1863505b92a81e0d", + "sha256": "0439grmaly9sbkk3ivnmahdlc67h8ygrb8plbblhkrjfz632pm15" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81", - "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc" + "commit": "5f9fddecea3d467a6d7bdb6a1863505b92a81e0d", + "sha256": "0439grmaly9sbkk3ivnmahdlc67h8ygrb8plbblhkrjfz632pm15" } }, { @@ -24861,30 +25286,6 @@ "sha256": "090dqaqyjmkzrz4szjpk1iip0bdvb0frp4l79393f8ki8w7c16c1" } }, - { - "ename": "dired-single", - "commit": "52fe8f60a691af714ade2ee613d37d650508a283", - "sha256": "1xqczkhgplc20hx0zks6r55fr83afsva654ysarff8v3s7jn7hi8", - "fetcher": "codeberg", - "repo": "amano.kenji/dired-single", - "unstable": { - "version": [ - 20240131, - 1148 - ], - "commit": "60fce6599326e12cc2033c28d50b8bf6c6ba164a", - "sha256": "125c8w9msr02qdxx9wykg7g1l8xd5zvy0s8rdhql0m71dvdmyj4n" - }, - "stable": { - "version": [ - 0, - 3, - 1 - ], - "commit": "c781b7dcff6e7f9a5060b067d2cdb0acbc840c49", - "sha256": "01p3m68pq2k2q3b94m2iy66mmra8zf9dfmn734ac5v6glrapx9gq" - } - }, { "ename": "dired-subtree", "commit": "d6a947ac9476f10b95a3c153ec784d2a8330dd4c", @@ -24990,14 +25391,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20240421, - 428 + 20240828, + 1536 ], "deps": [ "key-assist" ], - "commit": "dadcb326be31fd03c1891473b1bcd1983b155c28", - "sha256": "01fnv2j3hsal4waapkf6s1s57sda1hvx7jsrpfk2js1a21dmmwa4" + "commit": "447cd0a87dc188793e0482ab8289d09ccdea0bee", + "sha256": "0p7pi0qd7np6nd3p4i9dq25d6lrhfqkr688lyh4cn9h3m980ky5k" }, "stable": { "version": [ @@ -25019,19 +25420,19 @@ "repo": "purcell/diredfl", "unstable": { "version": [ - 20230224, - 1302 + 20240909, + 1723 ], - "commit": "17e805763d57370c4eff2c92ed257b72eeb9f94a", - "sha256": "0p9fznvblw6md37lgqjpyw8ifvgp513v2sgfyh6sqwpvzz0zl80g" + "commit": "bca8f0f7b3e9e46b9c7692275ced8c1d59e0d208", + "sha256": "125a49ibbaicp6kxv0ja9mz9paryqgz30xhl0pk3kvnm8z40hlr6" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "45e9c46f58c655694758d4986b9195c8bb40ddf3", - "sha256": "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z" + "commit": "bca8f0f7b3e9e46b9c7692275ced8c1d59e0d208", + "sha256": "125a49ibbaicp6kxv0ja9mz9paryqgz30xhl0pk3kvnm8z40hlr6" } }, { @@ -25240,11 +25641,11 @@ "repo": "jart/disaster", "unstable": { "version": [ - 20230311, - 2324 + 20240822, + 708 ], - "commit": "16bba9afb92aacf06c088c29ba47813b65a80d87", - "sha256": "1jbnycp9k78c9gp14flf4997fmsd95x3n62a108l8wr26a3cy95i" + "commit": "b20f8e1ef96167a7beed5eb4fc6ef72488bd3662", + "sha256": "15qi8szd1cggvy7qjd0z9aryw1qgps7hx97shvz03jakg8ik13fv" }, "stable": { "version": [ @@ -25930,8 +26331,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20240805, - 1313 + 20240917, + 1355 ], "deps": [ "aio", @@ -25940,8 +26341,8 @@ "tablist", "transient" ], - "commit": "d837c7dfc6c5a949f19e9d673a4ac70b960d282e", - "sha256": "09fyd6affgp7rfzfviw1qqqfpizkpyh0dl5pk7ck1ha1m2dymna0" + "commit": "6f8bba0d11a5143872dfc25afdabe16cae410d11", + "sha256": "00bc768jknzym99k56jhbrj1hyzj7yygi513vw2wz89vq2axjdkg" }, "stable": { "version": [ @@ -26074,11 +26475,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20240324, - 1010 + 20240914, + 1549 ], - "commit": "39a012a27fcf6fb629c447d13b6974baf906714c", - "sha256": "04r8y5zhgv0nv85bw0li47r577rw7wczikx65aazvxk0skgda5sw" + "commit": "4d893bd2da15833ce056332e6c972d5d93e78f04", + "sha256": "1cdcdzmw4i1i73q0dgjpk4wmwkr71wijz642l2g5l36cik5whk41" }, "stable": { "version": [ @@ -26135,14 +26536,14 @@ "repo": "hrs/docsim.el", "unstable": { "version": [ - 20230627, - 47 + 20240906, + 421 ], "deps": [ "org" ], - "commit": "069569deba0f08906a42274ade321120b433f39a", - "sha256": "1bqvm7bg1pmd34x9s935gfahlicw7vyr3jjsh5pvnxh7sba3lamx" + "commit": "1441436621835eb9c6fe80bb07299043133f2942", + "sha256": "19vzq6naksym6zg8pvfhm8i1jb4h66hbz13pysm7ncv7hpih0ip4" } }, { @@ -26331,16 +26732,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240816, - 749 + 20241002, + 1003 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "37fc5cfe4cc8487e82942cf8478c4e42eb0a95bd", - "sha256": "104k3mj44qhb6m3bi3h84zgqrncfbhcc4frlig1ikbzpybmlxyi3" + "commit": "ec6bc00ac035e75ad10b52e516ea5d95cc9e0bd9", + "sha256": "0sk1h3g3dslngzrl5ghw1g8a4gpz59pcm5ivyafiv2qqw5gvdjwi" }, "stable": { "version": [ @@ -26384,14 +26785,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20240809, - 2135 + 20240909, + 2117 ], "deps": [ "cl-lib" ], - "commit": "c589b245d643dcc5ec93054ea436efc5255f9b88", - "sha256": "1dqcfh72x87lyx8f60nl25k7x9vdvgncl3a0cv952p022rclry00" + "commit": "1cac71a4b2434036496a49b4440fdba3d0b5b387", + "sha256": "0423xhs2vd08adh1ar3qz651fdi6a2131c5haq3a9jx3fk464pdd" }, "stable": { "version": [ @@ -26611,14 +27012,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20240727, - 2303 + 20240924, + 529 ], "deps": [ "debian-el" ], - "commit": "eb00c58726be5e914b2487bccf7e3f716e7a61e1", - "sha256": "0by13757bxq794b1c11all0yd418mwjb0az70pf3m4lq6j9kn6pm" + "commit": "eb37cb7a464f205650962d7dc7b0e39d72daeb7d", + "sha256": "1gk5vi1v7bd4j597h1fwgar88mas66264gl3vqkblkjk2ynnqkif" }, "stable": { "version": [ @@ -26664,11 +27065,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20240614, - 1303 + 20240912, + 2032 ], - "commit": "1dd3702bcca1191b082783062bde42668515c700", - "sha256": "0sxanisx51vcplnhgz7yn3xslslky4xp4ydjkrgwq045ppmq3rr7" + "commit": "c1614c68bb7cb6f9a6f4f779f47cf0d24b938b6f", + "sha256": "1n1pdgm6xa2g1bk5wnb8lhwabzl05cms3qn52sag8xngph2p43vh" }, "stable": { "version": [ @@ -26945,8 +27346,8 @@ "repo": "thomp/dtk", "unstable": { "version": [ - 20240317, - 2328 + 20241013, + 331 ], "deps": [ "cl-lib", @@ -26954,8 +27355,8 @@ "s", "seq" ], - "commit": "461f30f2e2038c3c469e710309046c0af4d6b41a", - "sha256": "12v1lac0sq72aip6k29l3agxbqagcf300wdbpbx3rq65kimdnvid" + "commit": "a80891a3f59381de1ae902417a19bc4f75255d00", + "sha256": "1cwgmzc8xwmif1kacv4hkxjf9qcx9i6dlgazln61p55lyzbl7290" } }, { @@ -27157,6 +27558,21 @@ "sha256": "0z39a1c227si435j3k8vkf4q6l01jdf70x69dywsmnrkcrcvrbf8" } }, + { + "ename": "dup-transform", + "commit": "4ed9d9037a704b71c89d3a7fc12c6b30af53e124", + "sha256": "0mpwawhcxmg1js67rysyky2a0b60sk4jjkmbaqn4h8c4vjib48jr", + "fetcher": "github", + "repo": "garyo/dup-transform.el", + "unstable": { + "version": [ + 20240922, + 1924 + ], + "commit": "6cbfb9b6fdf811a4e1e2ddad993fb16f35ec7622", + "sha256": "0ww2hrkc6brci1wgqmj1w6j2yw2lbml5ir9gm8hp8lyy1k83hzq5" + } + }, { "ename": "duplexer", "commit": "e234c8611281688c25cb954b14ec9af1a32f203a", @@ -27165,20 +27581,26 @@ "repo": "liuyinz/duplexer.el", "unstable": { "version": [ - 20230903, - 1836 + 20240919, + 1018 ], - "commit": "aa617ffa1cc37a06ce89a02fd8b38963e09fd4f3", - "sha256": "1zcgg6l2xf6z3zrkzmyym1qhc1n51chvqkamk1hh4g4c739xjx0r" + "deps": [ + "dash" + ], + "commit": "883e9e24f1c7bb7132c1eac0bf5bedf78081058f", + "sha256": "0mpjjyqnr8izirpgnyckci2fmnxfnmlblzayribgzqrj8mgyzdhy" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "aa617ffa1cc37a06ce89a02fd8b38963e09fd4f3", - "sha256": "1zcgg6l2xf6z3zrkzmyym1qhc1n51chvqkamk1hh4g4c739xjx0r" + "deps": [ + "dash" + ], + "commit": "883e9e24f1c7bb7132c1eac0bf5bedf78081058f", + "sha256": "0mpjjyqnr8izirpgnyckci2fmnxfnmlblzayribgzqrj8mgyzdhy" } }, { @@ -27258,11 +27680,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240818, - 1615 + 20240925, + 2058 ], - "commit": "2a97a027a0bb1c48fc2004d6e9ae4340522a9bfc", - "sha256": "1vb1irv81hzzpbdhgzxmq9zdfih1w9ckri9db4pfciy54gcsbwk8" + "commit": "9ee831bf05eb54f04baeb3d2e57d70752661e286", + "sha256": "0izngjxkv0ffn81hha0jd211anr0k5wyigmps7mppx5bcjv5dgax" }, "stable": { "version": [ @@ -27735,20 +28157,20 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20240614, - 541 + 20241014, + 738 ], - "commit": "8015c62602188c008988fc6825ff97b04c614c8f", - "sha256": "1qz7jql5g2n643hws5ybaj78zdrqm6pnnbi0bvgzchfbc5nc1h2b" + "commit": "34fd32468a62604b5d75e3ad562cb9e84a5e5ac7", + "sha256": "10sv8d22zqrh7qijh19byddbry971xk72b7lvdmp15i1ra3842xv" }, "stable": { "version": [ 0, 10, - 0 + 1 ], - "commit": "94a45a3422a04819a5090d8acaec4fc563c6dfa9", - "sha256": "0wm2bhadsgs429f67bgvxxfdxkhf4z3v3mypdxbyrhlkzwqdmiag" + "commit": "34c20849530c59547e032900bba87f5ef05f192a", + "sha256": "1jy29mjkw0a6y8aawsmzcq246m4bg85iq35jcl7kdjccwywpj1b7" } }, { @@ -28001,26 +28423,26 @@ "repo": "jamescherti/easysession.el", "unstable": { "version": [ - 20240814, - 1817 + 20241014, + 1422 ], "deps": [ "f" ], - "commit": "7bf893a307be84af43c00fa6b9eed2e4f9d920b8", - "sha256": "1mg6kkvgdb8fwbmw2ipb1jmrm4gdmkl62cdqr045mii5vkpmpmmf" + "commit": "d8a5a491cbfe0536348713b556bd2790450136bb", + "sha256": "0rx9j64c4rlf2g4ch5zc9fisrncwziwki8plhmyjm0n8yfd32a40" }, "stable": { "version": [ 1, - 0, - 5 + 1, + 0 ], "deps": [ "f" ], - "commit": "3558bcf052e5cd9936ffd2a0d648d991a35581bd", - "sha256": "18ga3sq8jfyp4y7w16hkpbvlpmshv5la3ajgvagmanlqg3q81pys" + "commit": "0ed3925e768ccf177328242dd2403838de52d13d", + "sha256": "0x0wp5m3rma1sr983017wgmyqr799fs49y9q3b88cj45i1ffr94h" } }, { @@ -28096,28 +28518,27 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240723, - 1149 + 20240925, + 2235 ], "deps": [ "compat", "parsebib" ], - "commit": "5ea510a1e4ab17a442352d0212777da5f78d4be2", - "sha256": "080n9k0r9w4hdcg5g89blyyr0c6q2jhwqn42fvizn6z8xkkn5cbp" + "commit": "92da7850b864af89f4b546bb8f562fcbbe042392", + "sha256": "0sk5q205cw0cihidmaakg3jyp6z1b8rib0x57gsh3qw5g5bzhbq1" }, "stable": { "version": [ 2, - 42, - 2 + 44 ], "deps": [ "compat", "parsebib" ], - "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f", - "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k" + "commit": "73159eba01c34ec103db9e15e959eee87c2242eb", + "sha256": "1fl3spc2090nwswsqxmkw55ibw0ncdmi4igac0ywqs515cw07ywl" } }, { @@ -28179,11 +28600,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20231113, - 748 + 20240921, + 839 ], - "commit": "c854d128cba8576fe9693c19109b5deafb573e99", - "sha256": "0zfgns9q8bqiwjckfqcywzv00j3984r5kni5xp5rz3wxx8pgqvkv" + "commit": "45294cedeeefdcb0193b18dc3e2254db0aa700c3", + "sha256": "11canjhvwpj2hy5czav2hn1hx0lzckicsbr3p8fr6pjrg3gg2bwh" } }, { @@ -29150,21 +29571,21 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20240318, - 1159 + 20240911, + 1352 ], "deps": [ "cl-generic", "eglot", "project" ], - "commit": "1d9cab682380f37ca1e9e9933cda13164600706d", - "sha256": "0ynrqvshr8jzndqq17m5r8jn4lk3k5bfi8nqb6aa7hyfk7bcriy3" + "commit": "7c968cc61fb64016ebe6dc8ff83fd05923db4374", + "sha256": "1xy6lssg5x8m2d5802in2b5nl5wrcxz4pilw85kk0mc8640kg2ma" }, "stable": { "version": [ 2, - 3, + 4, 0 ], "deps": [ @@ -29172,8 +29593,8 @@ "eglot", "project" ], - "commit": "ab5e6835ea9a16e90ad1b5f369a96a60455e855c", - "sha256": "144q4fj3am165vf1vx2ljlsmpn8vvvs1b95qi3rxlwqskkx0lig3" + "commit": "7c968cc61fb64016ebe6dc8ff83fd05923db4374", + "sha256": "1xy6lssg5x8m2d5802in2b5nl5wrcxz4pilw85kk0mc8640kg2ma" } }, { @@ -29242,15 +29663,30 @@ "repo": "fejfighter/eglot-tempel", "unstable": { "version": [ - 20230626, - 1004 + 20241012, + 1053 ], "deps": [ "eglot", + "peg", "tempel" ], - "commit": "70fee6ac33df7a6c5cce967005766b6702a9e9a5", - "sha256": "062lkwbpxm97pw2hnrr0kpgk09g2bc41607y1f94gvgz51xjcxml" + "commit": "72d5069809084db4447cad40531449714d75041e", + "sha256": "00v94h3zvl2pm1yizjmdfqgmzwqq8aghjixdcb23x703inq5p82x" + }, + "stable": { + "version": [ + 0, + 8, + 2 + ], + "deps": [ + "eglot", + "peg", + "tempel" + ], + "commit": "2e796a2fb4785d0aa68f0aad61b582c11e5238df", + "sha256": "00v94h3zvl2pm1yizjmdfqgmzwqq8aghjixdcb23x703inq5p82x" } }, { @@ -29420,28 +29856,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20240818, - 437 + 20240928, + 1903 ], "deps": [ "llm", "triples" ], - "commit": "789cb6d954e0b31f8c25cc0bfa84ba812820f5cf", - "sha256": "0klwjc2k0kmbqpija9r4cjmdnf1j58n1gmmhqdp123q22pk4d96y" + "commit": "839c6ce9a40bd7b7a12b791dc74f172ac1f378e6", + "sha256": "0953qmg8mfpd018w95y90sns41gcng9fw6spb31a496yvqs85z68" }, "stable": { "version": [ 0, 6, - 2 + 3 ], "deps": [ "llm", "triples" ], - "commit": "00ae22d95ee7a006214589b905fc9b7e268141b2", - "sha256": "1hfp2v3d6wgbi8v53da72yanqrksyqygmqq6wkfhz896h21fi99j" + "commit": "12d2524b4b7fdbb2e60b564456c463e594919ca2", + "sha256": "0pqdlwwm67r26pf90q93xkxhsbpv02pac3b9d8p7haxxdsdv10vd" } }, { @@ -29508,8 +29944,8 @@ }, { "ename": "el-get", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0vfimgla3bfxy3hc08a1ia711wz81d5cpgwipdj4i7gvqbpjxima", + "commit": "bfa04bef05bdeab1a097cb5204263ee9078f83a9", + "sha256": "08rasl83dcy90na5aq1isl7rli6baw04z72kzafd25axh22mfazl", "fetcher": "github", "repo": "dimitri/el-get", "unstable": { @@ -29815,6 +30251,21 @@ "sha256": "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn" } }, + { + "ename": "el-who", + "commit": "951fb343c4a9e2f7d9ea2f3fcdddb566fbe7f5b6", + "sha256": "1dvdw3qyycbvzcp0ragbgnj0kvkwr4iz838g6inn1zgywsbnzzfd", + "fetcher": "github", + "repo": "alejandrogallo/el-who", + "unstable": { + "version": [ + 20240916, + 613 + ], + "commit": "bfefb23742ac3695578d4b748895df5ccbba6b44", + "sha256": "1kcnmw6hrl8xwhby6cd1khy9wkqb4g9i4r3g1nwk19xxfznpn379" + } + }, { "ename": "el2markdown", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -29913,11 +30364,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20240815, - 30 + 20240826, + 1824 ], - "commit": "252019e21d7de9c06124f4ceddae324b477a64b8", - "sha256": "1bvscz7v17p9f03n9mmxqwvnfp316f2z90h8zrd6fyvcafbw3af5" + "commit": "b47767e1cdc8e0e4aa50913db19609e7e093f002", + "sha256": "1qc4c6cix17gihr7sgi3a5kyc1jya4g5yynv4r04z4pwz60d9ybh" } }, { @@ -29962,11 +30413,11 @@ "repo": "vilij/slurpbarf-elcute", "unstable": { "version": [ - 20240724, - 2106 + 20240920, + 1226 ], - "commit": "b604f934c0c919f5eb0155e38202875b796ac4de", - "sha256": "1ba6kf4fzjzcz30sv5976c4p25wd4xavw8hyh50hyyi4zsaqxdp6" + "commit": "481b7ea70b8ba6c972b33abad169494097e699cd", + "sha256": "0kc3m1khd8fnq15c8hzfi12yh8mykl16sxfj8dxbrvmwhyx4k7gg" } }, { @@ -29977,20 +30428,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240609, - 1211 + 20241012, + 1650 ], - "commit": "bb1938237ee85e477243cd45421330403df29390", - "sha256": "01fmgafs294lns10nj31pj327v943x7r4y81plp43gm8cngzgf0r" + "commit": "9e11978ad72a1c97a2d35ef72176226b58fc9800", + "sha256": "1wzq4hmj0qp55i8h1gfm68hvzfnd2lqzh0qav1ap35xxja3cqzff" }, "stable": { "version": [ 1, 10, - 1 + 2 ], - "commit": "56335373099a6e2d3756fe5b7cce539d91c43bd3", - "sha256": "1qir0wagqb8yhmkb12zzadl146w952p3q92bpffd0hq0y6gcp2n5" + "commit": "260f13a21e3733d24ccaffccd04c4de6196cb21c", + "sha256": "0qs2n7zwsn4gffdl67329ww0dfr403q5c7229wpkc92zg29xi979" } }, { @@ -30001,11 +30452,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20240605, - 1742 + 20240928, + 1746 ], - "commit": "9658ba7d4616e97f2feeda3abf4aab3e96c91f28", - "sha256": "0gr8k2xbqc43jhzd3j91dzl639hgq5083qx8k9rx30wjdlpd4j09" + "commit": "0af5a65934f2fc4d83a1936c02cb3551b2563fae", + "sha256": "1bap3xq398rqvjv95bhn8wn9wg5g2s7a6plyi333w26r8vbq7awv" }, "stable": { "version": [ @@ -30285,6 +30736,14 @@ ], "commit": "d4c0c0491dbb7c90e953d7a16172107c37103605", "sha256": "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "ae1aebc8abe293d5d6949d290628537c3705078d", + "sha256": "1vlrklhy18gswgjip5ih5g5v1b80zf5n4w3nrkygyq6f4s24r9ak" } }, { @@ -30504,15 +30963,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20231007, - 1535 + 20240822, + 805 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "bcefb85a1d4075f36e73a94bda569e71f28a52c2", - "sha256": "1n5bns7181j6n603a626jsv26v06s3wm86ml7vixlp234p0frypp" + "commit": "4f5e77a28c501db686ac06a2ea250a7b37d5420c", + "sha256": "04dvg0haz5b2gl4iz7aqiryys24fwjrp6h23fcga3gjipwwwxzmb" }, "stable": { "version": [ @@ -30566,15 +31025,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20231231, - 1456 + 20240929, + 2043 ], "deps": [ "elfeed", "magit-section" ], - "commit": "7e308adaa351f8c7f6ba839cbcfd4e3cd145401c", - "sha256": "1wdycmr7yl4qn921fwnbkwjpl5ys38yikc3y8b2mjp7bzjp38w1w" + "commit": "76b4b93838b0420a114f934bbf8c09f25bf6ad16", + "sha256": "0ic2nzs88ck4f5vkk8m7sln2hawglnj4b2vzfl80vlip13dj3l3a" }, "stable": { "version": [ @@ -31072,14 +31531,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20240116, - 645 + 20240820, + 947 ], "deps": [ "heex-ts-mode" ], - "commit": "6db05baed9a34d01edf0bfdd804d951dedc6dccb", - "sha256": "1036gh81fhk3q0lfz0k10cxgxvkwq17148l2jcv2czcsmzqiaviq" + "commit": "b35c983f551ccf821ebebad50747b5b417133e52", + "sha256": "0cdkcrjnljdc6nq7ljyrdcfz3x7h1chjrq2b8fbh8xk2fmq8wgqa" } }, { @@ -31120,30 +31579,30 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240721, - 1138 + 20240915, + 1523 ], "deps": [ "compat", "llm", "spinner" ], - "commit": "8270e71c335b1656384e6c1b9d61c2a7ecc65bbb", - "sha256": "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl" + "commit": "74767cbd6dc582bd6ce99a83bc84d41bfad4b4ee", + "sha256": "1nkd6dvmad54w2x13agmzfqmhil3rh8dw5v23brna9ldl1x0ap57" }, "stable": { "version": [ 0, 11, - 13 + 14 ], "deps": [ "compat", "llm", "spinner" ], - "commit": "8270e71c335b1656384e6c1b9d61c2a7ecc65bbb", - "sha256": "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl" + "commit": "74767cbd6dc582bd6ce99a83bc84d41bfad4b4ee", + "sha256": "1nkd6dvmad54w2x13agmzfqmhil3rh8dw5v23brna9ldl1x0ap57" } }, { @@ -31300,20 +31759,20 @@ "repo": "sp1ff/elmpd", "unstable": { "version": [ - 20240208, - 1457 + 20240902, + 1520 ], - "commit": "c6c8c3fa52951c9570041fe78674f267ca8001a5", - "sha256": "0kh1zxvzys88f8cl7d27rhyikrykqfdcq9q1p7qw7224f8gzv7ch" + "commit": "db808e58993310a01419649985b2f732b1067e9e", + "sha256": "0qikw0ayvdcckapl8873fpg08a5wvxfs23r3djpgfqyn26lkc2xw" }, "stable": { "version": [ + 1, 0, - 2, - 4 + 0 ], - "commit": "c6c8c3fa52951c9570041fe78674f267ca8001a5", - "sha256": "0kh1zxvzys88f8cl7d27rhyikrykqfdcq9q1p7qw7224f8gzv7ch" + "commit": "db808e58993310a01419649985b2f732b1067e9e", + "sha256": "0qikw0ayvdcckapl8873fpg08a5wvxfs23r3djpgfqyn26lkc2xw" } }, { @@ -31503,11 +31962,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20240702, - 816 + 20240930, + 913 ], - "commit": "0bd12913940a047724d830725bf8649e4f8df499", - "sha256": "0pbx9zgig14qzgaar0ks425hmrmmgl3a50w4ykzy6r7ahbg93g88" + "commit": "e3760dfedbd803dd8ff2a5d4fbbda249c1963bd1", + "sha256": "0w8n30wdpf9alx7cjb2d8vb9a6a66dn181va2sg2cb2vl5j87lpj" }, "stable": { "version": [ @@ -31909,6 +32368,36 @@ "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k" } }, + { + "ename": "elysium", + "commit": "f6f5f8f0c571c85549e3f674fc73980a3fbb03e2", + "sha256": "1pqmk071s672gyqr8jfb88rmlmzsqqdpl3xbj7a0cnizds0l1fv4", + "fetcher": "github", + "repo": "lanceberge/elysium", + "unstable": { + "version": [ + 20241012, + 2351 + ], + "deps": [ + "gptel" + ], + "commit": "89d025337aae6aff2f32e06865d20d9a7ee4bb22", + "sha256": "086nxx6pzn77q1dchkg4fsd80fagyrv4dm7f56fwbj5275n7hn6j" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "gptel" + ], + "commit": "c53afa442bc02a8b9002744f93ee8806187ed381", + "sha256": "1fqffcy3vhihsxnc6cnsyyg5irp2g0a4nwvaiswzvkyd5i33fz87" + } + }, { "ename": "emacs-everywhere", "commit": "12713e28c8c1fd736f06d4a3271d466941954665", @@ -31972,20 +32461,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240819, - 1559 + 20240906, + 1342 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -31996,20 +32485,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240808, - 2016 + 20240825, + 1837 ], - "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", - "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d", + "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -32020,20 +32509,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240808, - 2016 + 20240825, + 1837 ], - "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", - "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d", + "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -32044,20 +32533,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240808, - 2016 + 20240825, + 1837 ], - "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", - "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d", + "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -32068,20 +32557,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240808, - 2016 + 20240825, + 1837 ], - "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", - "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d", + "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -32092,20 +32581,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240808, - 2016 + 20240825, + 1837 ], - "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", - "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d", + "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -32116,20 +32605,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240808, - 2016 + 20240825, + 1837 ], - "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", - "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d", + "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj" }, "stable": { "version": [ 4, 0, - 1 + 3 ], - "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", - "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" + "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53", + "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii" } }, { @@ -32236,14 +32725,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240724, - 1801 + 20241003, + 1953 ], "deps": [ "compat" ], - "commit": "19a13e344e04bbf861eaa74491b23da52b398672", - "sha256": "1w9xr6dq625mnpzzxlkkkln5mmf85msjzm4nqgxh910xslk1xbrr" + "commit": "d2daad08e04090391b3221fa95000492a1f8aabe", + "sha256": "10p76inl6b5xpjyr039p3zbrzw7dkz6hjflv8hn3lrv01krk95vn" }, "stable": { "version": [ @@ -32265,16 +32754,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240717, - 2103 + 20240919, + 1831 ], "deps": [ "compat", "consult", "embark" ], - "commit": "4ddbe6326bc596a05b574cf0109acdb5a79bc748", - "sha256": "0919drkk78ksqar8a9k2k9n84aq7fhmx5cpdbc3kqrwsyf3g8alm" + "commit": "718f0f293440b2d5e951c6c4a88ee548180af016", + "sha256": "1dy5mbaapdsaw7pn25lkpvc47sajsfxxfsk876b5k7lrfbyy0a45" }, "stable": { "version": [ @@ -32349,14 +32838,14 @@ "repo": "madnificent/ember-mode", "unstable": { "version": [ - 20240301, - 1056 + 20240507, + 915 ], "deps": [ "cl-lib" ], - "commit": "2fd5da9e360db134232d373edf09373fa762e092", - "sha256": "0x6k1r8r1vdgf88dz8saz9d71d16cl1rqx5ij0gfi252bfwqnq8y" + "commit": "38145ad189000c58860594c05523e42bacb3d246", + "sha256": "01bkv0f31l6rqi4kjxab6nz20vv0spdw9n9ln1mn3dv6q9xd0y1m" } }, { @@ -32474,16 +32963,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20240704, - 1359 + 20240925, + 308 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "b5567be2176dcbdf42aa2d0ccad32a44f245dd09", - "sha256": "1kwybpr86ih0g739x3mqfpvbgsd9pfns1h6hm89f79qlgla282xz" + "commit": "ccbcc509d09301289e2be279e34304ba06644073", + "sha256": "16kqxf2k744hh45sv114pym8cmrkxi4v8g7andx59r78nzgxl304" }, "stable": { "version": [ @@ -32886,15 +33375,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240818, - 1845 + 20241006, + 1234 ], "deps": [ "compat", "s" ], - "commit": "4bb96d112cab80a7c3a2cdf24e9457c313a9e3d2", - "sha256": "0j9qqmyszbaizzz6fwnkf0640wivjav1l3lqa0myi3spby3abnqn" + "commit": "ed38218885b99ddccbafb8a37482228a61d87d65", + "sha256": "1n6s6a79bfj3lganag3qyc8pnnc1bavplwgq5y4wdachmiagbls9" }, "stable": { "version": [ @@ -33025,11 +33514,11 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20230619, - 1503 + 20240906, + 453 ], - "commit": "687266bff45cda00c1de57a22ad2b03de6823c28", - "sha256": "1d29da3giy9jmp2njxp0axpqr3nyv71na5ddqb6agjxj026518i2" + "commit": "1cfdaef7e019aecc1b648036c3434c99d6d308bc", + "sha256": "0pranwbrnc9slkxv819540c8c8wp8jsa3218jcr6m83lscn07yc4" }, "stable": { "version": [ @@ -33052,11 +33541,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20240724, - 1809 + 20240925, + 1920 ], - "commit": "69484d6cf0cb2d8bb1f873319bd7c448cb7add33", - "sha256": "00fcy97sfyac0c38xcq18zm3qcw2wvqa6149h617c4hlq9rx1lh8" + "commit": "b9cea578ef6738ce675243296c3abf91b9323e11", + "sha256": "0j130xxph6iygrxqagy1flsvxzlhk305ypzf8cb02bf3kvjdjfmg" }, "stable": { "version": [ @@ -33356,14 +33845,14 @@ }, { "ename": "epkg", - "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", - "sha256": "1p9l23c9ym306n1nlap2hvx9fy75pkx36cw2l467v954rj2ja5qa", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "0k9gx778ladcybyspfhbbzyzas1k6cad0f9sr9chbag01cn1jj1p", "fetcher": "github", "repo": "emacscollective/epkg", "unstable": { "version": [ - 20240818, - 1954 + 20241001, + 1037 ], "deps": [ "closql", @@ -33371,14 +33860,14 @@ "emacsql", "llama" ], - "commit": "b0003f88afae8b9843e77149c1b1284f7ec4de33", - "sha256": "0mffnxs5wwjx6vm82i4217kr8dwkylhdf7cpq5zqvbygs4p7sfhg" + "commit": "f568083014664cc63eb942ee04a925634527793e", + "sha256": "1kg0jd8067brd4772sd6r0lj7vbf5pxhbj916nd6293a0hc10i58" }, "stable": { "version": [ 4, 0, - 0 + 2 ], "deps": [ "closql", @@ -33386,8 +33875,8 @@ "emacsql", "llama" ], - "commit": "e14d2b4808631d37faac1ff1c7f962d60ec28825", - "sha256": "0w06bpwbwsl3diypywfzrwp6l0kr3h34xja34xssym2bmdl11z8p" + "commit": "f568083014664cc63eb942ee04a925634527793e", + "sha256": "1kg0jd8067brd4772sd6r0lj7vbf5pxhbj916nd6293a0hc10i58" } }, { @@ -33398,32 +33887,30 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20240808, - 1951 + 20240821, + 2319 ], "deps": [ "compat", "epkg", - "llama", "marginalia" ], - "commit": "1e291facfbcce0d515a7a90b0bfd82d5b6358e92", - "sha256": "1fyfsav3n4y635apda6601g3jnyyfjq58jsclp6xb0b0sbq1gws8" + "commit": "58d5f2b6b6f68a22510cf4301dadf2ec4b5ffcaa", + "sha256": "0kbflck869lbwh9l97231jxpypmx0fm7vlxafqfyf69vpsiib5xh" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ "compat", "epkg", - "llama", "marginalia" ], - "commit": "1e291facfbcce0d515a7a90b0bfd82d5b6358e92", - "sha256": "1fyfsav3n4y635apda6601g3jnyyfjq58jsclp6xb0b0sbq1gws8" + "commit": "58d5f2b6b6f68a22510cf4301dadf2ec4b5ffcaa", + "sha256": "0kbflck869lbwh9l97231jxpypmx0fm7vlxafqfyf69vpsiib5xh" } }, { @@ -34032,10 +34519,11 @@ "version": [ 2, 7, - 0 + 0, + 1 ], - "commit": "df1a26d96683ebb06aa8476e4af6bbeddf23efbe", - "sha256": "1vi2h8lwfixpphh0kz5jiam43ld8ddzz71jspwfvmyhmyrriabb8" + "commit": "a6fc20c27ae953149b53a8997ba4a1c8b17d628a", + "sha256": "1dh9fi8lwjv9rk6zik2bwjgqln0f0d36m3hm9m3zmmk4fby4rsi2" } }, { @@ -34074,26 +34562,26 @@ }, { "ename": "erlang", - "commit": "4eda604708e52f417e30d284538aa02847de7f19", - "sha256": "1bmqwjq6lkj3a6szc2x0f25674a43674gfz8xg5r07d7z9xks5xa", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1xq2j2rj65y8hncsrslciw2vynhnhyfavi81m6dw36fhqi4qfx2m", "fetcher": "github", "repo": "erlang/otp", "unstable": { "version": [ - 20240709, - 1136 + 20241004, + 914 ], - "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa", - "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if" + "commit": "088d904d0abdc68f031fa3e17b1aa67d903bfc7f", + "sha256": "0j66glb69i0kbcsy2a95jscmv23004x5ql2syf0yw8q2kkpvgxx5" }, "stable": { "version": [ 27, - 0, + 1, 1 ], - "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa", - "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if" + "commit": "f4d130fd3512875ee95ce05b30f77e7c7689915f", + "sha256": "1j4n8zl79hnskpncc0jcgkqjpi15xkmmma77vpmpmzznk43zignb" } }, { @@ -34141,6 +34629,38 @@ "sha256": "04nkqsvh8c988hc3ajigs206ad64204qdhhqzdvm3k7m7qiiwga8" } }, + { + "ename": "eros-inspector", + "commit": "c8a3006709dd63461cdfcf1db34009a1f588aaf2", + "sha256": "1hqh2w7ay29lx65s2xghg25dd6p9q7q8504i0ndcpbf1c626y7py", + "fetcher": "github", + "repo": "port19x/eros-inspector", + "unstable": { + "version": [ + 20240923, + 613 + ], + "deps": [ + "eros", + "inspector" + ], + "commit": "c1625f553ec944883867f0975bff08f10dd3086f", + "sha256": "1szilrqd1v7gzfpjymfqfz4ckyih97z8972yiq0bwbrlmmhmjrrg" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "eros", + "inspector" + ], + "commit": "c1625f553ec944883867f0975bff08f10dd3086f", + "sha256": "1szilrqd1v7gzfpjymfqfz4ckyih97z8972yiq0bwbrlmmhmjrrg" + } + }, { "ename": "ert-async", "commit": "2ec669e3fc73b0b499b84cec87d0f8621274732e", @@ -34426,14 +34946,14 @@ "repo": "dieggsy/esh-autosuggest", "unstable": { "version": [ - 20210906, - 1446 + 20241002, + 1820 ], "deps": [ "company" ], - "commit": "bf676b137d35553debe32ff134dbec25f3978ae7", - "sha256": "1m255pgi2zlkjrjr3l8gk76qc5543qnaxqrwgcpb2z9gq51ivfw2" + "commit": "b3ae8eb2d6f8da1dc59f61a589003d741514d6f6", + "sha256": "1n4zswxs49qn2jngr82w9kk7qdhdwysknsm95iq3ija2azyvqgcr" }, "stable": { "version": [ @@ -35110,11 +35630,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20240803, - 1733 + 20240821, + 1952 ], - "commit": "950bf61054bd96d2203ac0457792c0af8dfba721", - "sha256": "19b88yd09rxrljfbai8q5hqcdpnsx8pjxkprzprk1smaqc4ppifg" + "commit": "d60c13a6a347ea7a91ea3408bb464cff0ab4fef6", + "sha256": "1i3g0bm0nih8ww3qp8rq8zr7chiz5bhm5rli4yq6sa02h7imviz5" }, "stable": { "version": [ @@ -35306,15 +35826,15 @@ "repo": "sje30/essgd", "unstable": { "version": [ - 20240418, - 752 + 20240929, + 2107 ], "deps": [ "ess", "websocket" ], - "commit": "2a88e9cc0e47b2bb3ec39db0399b279e2276280e", - "sha256": "1c1pwn4c25kqaq3vnn16jzhsjkb8ingxb8q9k086w7a5q26h2jpn" + "commit": "d9a3729ebaeeeec78984f00508cf2785bc7e8978", + "sha256": "19hg6sfd9aja0m6j3dhadcp2pndsvkv8f4l073icykhgpj2hp90i" } }, { @@ -35699,6 +36219,21 @@ "sha256": "1q5s1ffmfh5dby92853xm8kjhgjfd5vbvcg1xbf8lswc1i41k7n7" } }, + { + "ename": "evangelion-theme", + "commit": "403d06d358f7675cb403bcb09e7abf94053f8448", + "sha256": "0jz7x2rpkljfdmyd65a9slq5mkbg1vhvqw1i0jp8h46b2rqp369m", + "fetcher": "github", + "repo": "crmsnbleyd/evangelion-theme", + "unstable": { + "version": [ + 20240907, + 723 + ], + "commit": "59fb3f39611d995c2e322a22e661165b87f4667e", + "sha256": "0r5c1s0in6al72b3hrhnfiqixsmxabgi31b60m13292hfm4f13ks" + } + }, { "ename": "eve-mode", "commit": "e0f197adfe64ef88d90d24dfd6532bf52a5bce0d", @@ -35773,15 +36308,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240810, - 1655 + 20241006, + 1754 ], "deps": [ "cl-lib", - "goto-chg" + "goto-chg", + "nadvice" ], - "commit": "5db0bdc7dcd9300b983526d37cbe480f35e36211", - "sha256": "1vq7ks1j7h3h2x51mf64pph0ix5jnl6qfpvp3lvvy6wsrcvnmf07" + "commit": "b7ab3840dbfc1da5f9ad56542fc94e3dab4be5f1", + "sha256": "0y2yrxrdcd0ddyby9yrygyyfvdas5zf7y090r5lcaa6l71fj1cgy" }, "stable": { "version": [ @@ -35924,15 +36460,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20221230, - 1443 + 20241004, + 1613 ], "deps": [ "evil", "evil-snipe" ], - "commit": "ea519b962f051cabced8aadaf6ed0134b861225c", - "sha256": "10gk3gi1g35xjkg6qfs3k83p9z8bz5pbi4av7g4ibj5f8h70gxzi" + "commit": "9465c8da35fe7dd0f66184e671e357ec91faa3fe", + "sha256": "1w1d239c7ivqdz46vnqhaz2fkx8xzzc2209ldf9w4f68nd6awqj3" }, "stable": { "version": [ @@ -35974,15 +36510,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20240817, - 2119 + 20241011, + 2043 ], "deps": [ "annalist", "evil" ], - "commit": "772571fc6762b6cd1d35cc869e266de9a5c6022b", - "sha256": "196j1jnshb5skbngqisb43im0cl6s2fgpbxgwasyrxhingpzaj8i" + "commit": "d9399cb3eb03b54bbf535d5be96a15d4b51c42a4", + "sha256": "1dk47pdi9nhh8rrg2c3lkj9hjr0mima54fg38yg21r98zi99kg2c" }, "stable": { "version": [ @@ -36734,11 +37270,14 @@ "repo": "VanLaser/evil-nl-break-undo", "unstable": { "version": [ - 20181125, - 2054 + 20240921, + 953 ], - "commit": "8acaecadd32937f6f1d8c3f8141fcee0de7d324e", - "sha256": "1155bbp7mais3cf378zxnrxc5qg9qai7rcr7whd0ljf9i4aic0y9" + "deps": [ + "evil" + ], + "commit": "fabd063c097f1b23112a29936dc5be5214153a0d", + "sha256": "10pgkc08avigd8nl24sn77f3qgahqn278zzi84aqpvdcj531nwz5" } }, { @@ -37534,11 +38073,19 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20240213, - 522 + 20240829, + 247 ], - "commit": "856773515072bdce88c8420f44bc84fbcbf96af4", - "sha256": "10shjlp6dihhnriw8mg7mkwb2b5xnagkikzq5nknf9xpn7pjp3rr" + "commit": "b4ef204ff80ed00b03cf8839ee29101ed867dd58", + "sha256": "0jjvx0p78wqxba22llvayrl9lyd4fqhb2qgbhr99r85m5ksixn73" + }, + "stable": { + "version": [ + 0, + 5 + ], + "commit": "cf25134c3af3aece61f866ae42bc7ab3714b59ea", + "sha256": "1dm6qa3lpkngyv3b9zrpwifrk3kjrah2vrnrs1syh5h1fyssl648" } }, { @@ -38073,8 +38620,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20240610, - 32 + 20240831, + 715 ], "deps": [ "a", @@ -38086,8 +38633,8 @@ "s", "transient" ], - "commit": "f9a287a4cd533fdbd3b0e645f425a7b9c469e6ab", - "sha256": "0lf6xa0x2g0izwfcpi48b0s0146mz8r60gf4ynqpx4fmyl2mccj5" + "commit": "44fb97fe6e34925b13bfb1dc027a7a3f55ab145d", + "sha256": "0v4j84whlnf2rl5b92yg9lh4zdfnbisbpfjrcvs8hx9xg362w2zj" } }, { @@ -38152,11 +38699,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20240119, - 1039 + 20240919, + 1427 ], - "commit": "e8f4e0fe9c9a80a6a26e2b438502aba9a799d580", - "sha256": "0mw1jlgdp17k56rq4g801z7y35h4infm9cy3mh8jw5wqqar5ifa6" + "commit": "541d971f7c77ca5c0f66c88bcbfeb0d165883023", + "sha256": "0i612v2v5s2yjj69wq92rm8qsm5cpqaksslwp02pf64hkf50ylmw" }, "stable": { "version": [ @@ -38655,28 +39202,28 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20240308, - 906 + 20241003, + 1131 ], "deps": [ "dash", "s" ], - "commit": "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c", - "sha256": "07pbjgwnvjvbl1hsar6kjcy7f4390gl1jy712ln09vkiqn8ln5dq" + "commit": "931b6d0667fe03e7bf1c6c282d6d8d7006143c52", + "sha256": "0ccrcfhqfbv9qff38sfym69mai7k7z89yndi6nip8wi5hpd2addc" }, "stable": { "version": [ 0, - 20, + 21, 0 ], "deps": [ "dash", "s" ], - "commit": "de6d4d40ddc844eee643e92d47b9d6a63fbebb48", - "sha256": "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk" + "commit": "931b6d0667fe03e7bf1c6c282d6d8d7006143c52", + "sha256": "0ccrcfhqfbv9qff38sfym69mai7k7z89yndi6nip8wi5hpd2addc" } }, { @@ -39262,14 +39809,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20240711, - 753 + 20241010, + 725 ], "deps": [ "markdown-mode" ], - "commit": "7c31f0d580bb20f70285bae136c6b4634a6c21b5", - "sha256": "0jxs8ic6z2rcv8l62614phf1hgq4zr4nmfm2bznbqf49kc5hpxhk" + "commit": "9d4f0d501e4b65210e233554ff90941adff2ebac", + "sha256": "0z9zhw9hijh68zfq5jdbgxijlk2vwbfzy673dvd6ngc1my4kdkvv" }, "stable": { "version": [ @@ -40495,15 +41042,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20240729, - 1757 + 20240930, + 2208 ], "deps": [ "buffer-manage", "dash" ], - "commit": "335f6f2e9abb5b5bc1ccabf1136688a3a4e851b6", - "sha256": "077q93apmaibia9wr61zi3vzw43sj9y8vbicpnyq4s4cqj72hplv" + "commit": "a31aa3b8c2844829b8a2ddd0f56ad31ecfb2eb70", + "sha256": "0w3c7w108rgcqk0911m5s4n8l2jihzqai2bfw04y9mddxz6cc6zg" }, "stable": { "version": [ @@ -40541,11 +41088,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20240702, - 1515 + 20240901, + 1100 ], - "commit": "e9c352075eb3a0d06e280d60968b6147f9678b6e", - "sha256": "1g0n72j05s2k70a5d4plawrmffvinkc970pidysfjc7rpzfzrpgc" + "commit": "860de68a971e0f8cae98da897ba626ae7c27261e", + "sha256": "0b6r42l4m435a7kp2jcam0m9ssg10hyj18pvcw8ci6ks7ym5m197" } }, { @@ -40724,11 +41271,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20240202, - 1241 + 20240823, + 1231 ], - "commit": "004c91e070a9b4a2a5042f5bb20015ec65453acf", - "sha256": "0waav7n1n4k5jz49wnkgq4s28pcizkn7qykwxjwzpma46w84c4dy" + "commit": "e71235d400787d977da7ed792709437899c2a03c", + "sha256": "1d6iyy8igg59gm19y4xilmh83gny5rkq2yjcvlci8zqda1pcg2ww" } }, { @@ -40739,15 +41286,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220502, - 50 + 20240823, + 1231 ], "deps": [ "flutter", "flycheck" ], - "commit": "a2cb56015f5716d6dc0e38fecb7c5b4906a5ba74", - "sha256": "0xliydy4fz899f6whdw0rihjl45zs25g4y3npqap96qz0ga7v7b6" + "commit": "e71235d400787d977da7ed792709437899c2a03c", + "sha256": "1d6iyy8igg59gm19y4xilmh83gny5rkq2yjcvlci8zqda1pcg2ww" } }, { @@ -41068,8 +41615,8 @@ }, { "ename": "flycheck-cfn", - "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97", - "sha256": "16ls9xbg7s8c4li51zvv9frlinrwflp6blgxw5psnvvdrm6gavi5", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0y99pnl28kbsdw1sahpidbmjz653awff2h0apqaa1bjazwgmmpr7", "fetcher": "gitlab", "repo": "worr/cfn-mode", "unstable": { @@ -41683,15 +42230,15 @@ "repo": "flycheck/flycheck-eglot", "unstable": { "version": [ - 20240705, - 1738 + 20240927, + 2343 ], "deps": [ "eglot", "flycheck" ], - "commit": "09e37f4c726d9b565b040ba9e89215158d3bd6b6", - "sha256": "0hxkgdgxlj4faylckbfj68pg0dxj5y8nfyq3rkqshswma1537zg1" + "commit": "18d0c9869585e6a9ea5c40678f266cf7f5bb2d2e", + "sha256": "0ilhf3jlknkmkqm67vc5r5n43gqzjxjxgj29p3ax5bp4g82lh327" } }, { @@ -43176,15 +43723,15 @@ "repo": "purcell/flycheck-relint", "unstable": { "version": [ - 20200721, - 2217 + 20240910, + 1036 ], "deps": [ "flycheck", "relint" ], - "commit": "d1e54d4bfdb12d0b60a1b9a8c2b11799426ddc57", - "sha256": "095vxjy6aacvmav86sg8b43svlnad7h8a83nl830v4nynpmx3183" + "commit": "88da7151b1781ec950eb9ec0b2ad32b90dae7427", + "sha256": "1r8bcn29mv0s5jcv14h1n04xd6akzm4blnd4ngsqqdmgxh714f8c" }, "stable": { "version": [ @@ -43666,14 +44213,14 @@ "repo": "ROCKTAKEY/flymake-actionlint", "unstable": { "version": [ - 20231104, - 239 + 20240826, + 1658 ], "deps": [ "flymake-easy" ], - "commit": "17ee78db1e1639ac8272d5c0919b82865b638aaf", - "sha256": "1ln8ajn6vscnq4wkyqcqd8lw5bx2ypzi9qr9piv895g73667bd4h" + "commit": "c502456fd445794f166d537eccd7b113d2c6fc64", + "sha256": "104yc321hjvhk3i3bd1ixmqjjpdhswh9wyq3w3mpchvprwvjgwk3" }, "stable": { "version": [ @@ -43688,6 +44235,30 @@ "sha256": "1qg145crrkfbpfkqjisvshwr1x7xlvz4b2sj0srzcchnmrmn10l4" } }, + { + "ename": "flymake-ansible-lint", + "commit": "04f051aa801989bf15dbcddf2e66ccb4cd33deb1", + "sha256": "1fhs42z1zbnmx0sgxgwjr7csw5m7gg9qflkvl80a8zdk5nqhr4i7", + "fetcher": "github", + "repo": "jamescherti/flymake-ansible-lint.el", + "unstable": { + "version": [ + 20240922, + 1632 + ], + "commit": "77a4488e7d13b556db81c6b3edb40e3bca999dfa", + "sha256": "1wqaazggarv39ms51228xxqdycfr11880bpxg5sjh21rap95zm4p" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "77a4488e7d13b556db81c6b3edb40e3bca999dfa", + "sha256": "1wqaazggarv39ms51228xxqdycfr11880bpxg5sjh21rap95zm4p" + } + }, { "ename": "flymake-aspell", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", @@ -43703,6 +44274,51 @@ "sha256": "1lnkkj4p8mnghrdcdfb66n6b6h974ik68l2d460njc4yxryjk6di" } }, + { + "ename": "flymake-bashate", + "commit": "648f415b972fe5a42d3cf9e7ee6e1509faec38f2", + "sha256": "1nmvc9lnk3vaw3sc1avapdwh45lg9hwh5nxpxcxp249757q19gkw", + "fetcher": "github", + "repo": "jamescherti/flymake-bashate.el", + "unstable": { + "version": [ + 20240918, + 1343 + ], + "deps": [ + "flymake-quickdef" + ], + "commit": "71acb57748694e7f18de252d4f808e12bfa07fef", + "sha256": "0ng19madpkvm0mh5lnq51gdvmqv56la1085b94pzipl772z8sly3" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "flymake-quickdef" + ], + "commit": "2339c28cd2aa6e63c5aeb5e904dd5b0060dc264e", + "sha256": "0mf0rqg9fjaiwh43v47kvcybnpzygvzj90qxmxc4kcjfblwi606w" + } + }, + { + "ename": "flymake-biome", + "commit": "08648a75ca14698338e69543a89c2f72041b7a34", + "sha256": "0lkikqiv4xvfjqz585vhz0028qm0r01124hch5cdh6x8g0akimxh", + "fetcher": "github", + "repo": "erickgnavar/flymake-biome", + "unstable": { + "version": [ + 20241007, + 1626 + ], + "commit": "03fa55d23fdc80fb4bc963cd144da460e7da0220", + "sha256": "0ph83hhvrn5i3g2pjhs723kk8514fsg3yckfl26mg76msfjyaaik" + } + }, { "ename": "flymake-clippy", "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", @@ -43755,15 +44371,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20240331, - 1808 + 20240903, + 1828 ], "deps": [ "flymake", "let-alist" ], - "commit": "46b65939c8363ec7efd594390a3c5d0becc7b8ab", - "sha256": "199rpiwwf5fji6skv2bjdbwid83lpjsqdsa2pykrb3ci2lial53w" + "commit": "ecc15c74630fa75e7792aa23cec79ea4afc28cc2", + "sha256": "1fqqjl9nd6gam790m7d3pzq162w2q7lwvk38cmh0nq9v318h8vqv" }, "stable": { "version": [ @@ -44012,11 +44628,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20240819, - 1943 + 20240925, + 1224 ], - "commit": "8d6e7e23a1407eb0c6a68213622de7ac24338c5f", - "sha256": "097qd7740vrfbjrpbrp9sf443qybcnb1sb6ixmalqn7wajcgc50q" + "commit": "66a4f7d619ecf9a8e9ce958482c8e814044f607f", + "sha256": "1ygsb7n2hm2d45zjw92c8vk1gg59qa767gwxgfznm4dzkqaa5yyb" }, "stable": { "version": [ @@ -45643,11 +46259,11 @@ "repo": "emacsorphanage/fontawesome", "unstable": { "version": [ - 20170305, - 1356 + 20240925, + 814 ], - "commit": "a743f80bfd53767ca9ee32da34c5ca032172a480", - "sha256": "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip" + "commit": "d81096e5e8fa7e386a6bbfe02a50f0f7d6a5dca6", + "sha256": "1bjz4mshyvh4cq1gp526l6hlfg4fn0qwjddmq133h232njg9bxzq" }, "stable": { "version": [ @@ -45826,14 +46442,14 @@ }, { "ename": "forge", - "commit": "09f3189b08b8d8fcf2aebc17c048e4ccf7f55583", - "sha256": "0f97q2l3q127s3xh8p8ja51ghdf7ysralcmziw3izs9rql3k2zzb", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "0d0n1lic86gfnhx82vyadhs225j43h9f1d9mrdsvdkp9car32q5n", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20240818, - 1702 + 20241014, + 1340 ], "deps": [ "closql", @@ -45848,14 +46464,14 @@ "transient", "yaml" ], - "commit": "a56eb3cbb27c61387d35cbff6b036a2c1bc1559d", - "sha256": "0in7qznyxl2b2y1dpfadbbpq3zy6bfhnz66cffiizwzgla7zgy17" + "commit": "c819271dd056d9608e6dd7e788bb3007f0a44517", + "sha256": "01gvx5imldgx3mmj1glgrspvxwnp8x068d1x6k8c928ad535z60x" }, "stable": { "version": [ 0, 4, - 1 + 4 ], "deps": [ "closql", @@ -45870,8 +46486,8 @@ "transient", "yaml" ], - "commit": "22a7aa5f0fe8cad99770fdcdb163de919a74ba76", - "sha256": "1kn3n1a6gdsd0l2v831sh43cly4p8s1snn494gdd23cw4jkk3qsv" + "commit": "a63685b921f25e861bf1e172e46beb771e56b924", + "sha256": "1nrr3l19p3hcm4jyghkl16d1pn0nqq6v6s19s54xl5yzjxfj44yq" } }, { @@ -45921,15 +46537,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20240511, - 1811 + 20241001, + 839 ], "deps": [ "inheritenv", "language-id" ], - "commit": "c5ddfc5f3317eaa2a7541a818a0fce961e5e61dd", - "sha256": "0br35g9pyif8qws2x9nzn9p3l7ajqsni94japmrwsd943fqixzl0" + "commit": "9ae47456dad2925e4d41f58bd2c864b87f82aa8b", + "sha256": "17ighxn3nk6i6k03hdri572z5d1dv7jbvcbhyib3p48clvqki0qb" }, "stable": { "version": [ @@ -46069,14 +46685,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240716, - 311 + 20240914, + 535 ], "deps": [ "seq" ], - "commit": "f3e821797beecc73cc16e81bfcbbe126581359ec", - "sha256": "1jsa85gk92yvnaxf2ra31df7w5l0qzy5rcrzfch44zq4pj9iv7s5" + "commit": "c809fe6f44ef765cae2a33124705b41febb80f6e", + "sha256": "0qxzs5ph0ajq9fnf5ac0q8nx56kmx1dalv1pi1fgnby73k44fl10" }, "stable": { "version": [ @@ -46099,11 +46715,11 @@ "repo": "gmlarumbe/fpga", "unstable": { "version": [ - 20240329, - 1759 + 20240828, + 906 ], - "commit": "34e521962ba3842321d456bd587aa93e4b627969", - "sha256": "07v8ybmljx9894q5q8qpvqdia892907ikl9q7vixhxkx5g4adjb6" + "commit": "2c1b20fde1030208cddb4e50a56821a33f2b1323", + "sha256": "1j0hkbhhk9npiafjq3s4vyaw8f9j9skqnajjia4n18l4ga7wc7kc" }, "stable": { "version": [ @@ -46623,8 +47239,8 @@ }, { "ename": "frontside-javascript", - "commit": "73ac023ee296b2b890265832d68d1d1d9f59fe33", - "sha256": "1yqp9zpahd808q5c2cpb2sb7xh8z75vqbrb5jxxrng4n4dxqj3yj", + "commit": "9c3e471f468c932dc377fee72f5ab360d2143f85", + "sha256": "1661s1477v55x43fha0lc2kpfwjwqdm1c3ckz7y41kdx8yry3nww", "fetcher": "github", "repo": "thefrontside/frontmacs", "unstable": { @@ -46751,31 +47367,31 @@ }, { "ename": "fuel", - "commit": "1e2a0e4698d4e71ec28656594f6a83504a823490", - "sha256": "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z", + "commit": "4a3d7cdefacce68fcc53e9428cb2a9a5ec1bf978", + "sha256": "1cgdhbf2x05dpl4nwwnvliqdhv2478iiys4yi0vds5vr2snmxn9d", "fetcher": "github", - "repo": "factor/factor", + "repo": "factor/fuel", "unstable": { "version": [ - 20240523, - 1604 + 20241006, + 231 ], "deps": [ "cl-lib" ], - "commit": "436d9a61aaa1fdaa319f14d0eac6b5aec920db05", - "sha256": "0z2xrin546dycz0vp9y9rq6jb3i13x0sfnmq0041zmr9nywb7wr6" + "commit": "6d0e98494f89d8b7dcfcae4cf83775562bf44ea9", + "sha256": "0s0a7r9r4lzfmh2b11mwsfhpvlhcfmknaii2h95z62hpa5nqpz03" }, "stable": { "version": [ 0, - 99 + 100 ], "deps": [ "cl-lib" ], - "commit": "e10b64dbc53a8583098e73580a1eb9ff4ce0c709", - "sha256": "0fscknmhqc1lzjrv920wlch33vbxkys4290n51r9mrgz830lg41s" + "commit": "80a4633f05a47547c60556baee1b43546f20e331", + "sha256": "1nzaxwljrz8xb6rf8w2wwbb4z17ayawznq00ix6x82fpzhimyzhs" } }, { @@ -46946,14 +47562,15 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20240403, - 1143 + 20241003, + 1821 ], "deps": [ - "cl-lib" + "cl-lib", + "reformatter" ], - "commit": "98f9e7e890e082d45034f935d311a399326010ef", - "sha256": "1cbm1navpw8kh6dj5hqk3d0a1fap7bsgfw414scdmjrq3rp672sp" + "commit": "54246aa75867d72648effd9cbb8d8b41a4d448e4", + "sha256": "0pkvg0l2a27kz8xwc8lx9lv16ivjda5d94xw017km6whrh94q925" } }, { @@ -47133,11 +47750,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20230403, - 1304 + 20240822, + 201 ], - "commit": "3a55b983921c620fb5a2cc811f42aa4daaad8266", - "sha256": "1apf2w783gadbl93il6hwidwadnkw5wlkyby29gz3x1rg6v42x8h" + "commit": "641aef33c88df3733f13d559bcb2acc548a4a0c3", + "sha256": "1nyvam5jg4gih0x2rvwr4jn97lyhaic3adpdxpdfx682ckj1k2vp" }, "stable": { "version": [ @@ -47291,10 +47908,10 @@ }, { "ename": "gdb-x", - "commit": "563763f2ef13c67fef65d54df6a7370cfa07ab81", - "sha256": "1ilzb1gagis1jkwnr00xq2szvmbzv0a1k99n1gv4x2a9crn122ma", + "commit": "1791b9e79fe26fc441e83ea8fcb707d7f066e235", + "sha256": "010px3xrx4a7ypqjfxhcr96kcvd6vby2m8mmrq3ld92w03n3yzyy", "fetcher": "codeberg", - "repo": "shepherd/gdb-x", + "repo": "pastor/gdb-x", "unstable": { "version": [ 20240814, @@ -47413,25 +48030,26 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20240726, - 1217 + 20240907, + 2235 ], "deps": [ "project" ], - "commit": "3b02581c8422d416d1d4dc3168db5cf7b0ef16fc", - "sha256": "0afsymy0751ngly1kwyw7i9i66ddm1sxdv3vags966n7i03lcj4r" + "commit": "32196db8f8ddab071565a5ae6d799ada4f8fbe6b", + "sha256": "13r87v4aqrdsk62jwp0ywnl0ih51fvgskygg9r6pr9cxswddfaim" }, "stable": { "version": [ 0, - 31 + 31, + 1 ], "deps": [ "project" ], - "commit": "b6b4ac070d136345345c80ff649f0084e3c512a5", - "sha256": "1lxvgj50c3lbyib4lcv4f5xjhgnngnklc8sszrx5yy9snsrd1sn5" + "commit": "c034c129cfa7442881f13ae146c87785b367cff5", + "sha256": "194k1bj4ncl9w68s0dkm9ya853hxbm9lxwsckqsmaj57jz7hw46f" } }, { @@ -47585,28 +48203,28 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20240811, - 1520 + 20240920, + 35 ], "deps": [ "geiser", "transient" ], - "commit": "5a856c2982030ff77e2d151ead4fcd991512f362", - "sha256": "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy" + "commit": "a0f111f8dedd31c593c4ed12c0b99745f3c1340f", + "sha256": "0i6drqz7cnx97bs5kprvb0hsg2h4bwkfdi61ajv43dqgb368jbff" }, "stable": { "version": [ 0, 28, - 2 + 3 ], "deps": [ "geiser", "transient" ], - "commit": "5a856c2982030ff77e2d151ead4fcd991512f362", - "sha256": "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy" + "commit": "a0f111f8dedd31c593c4ed12c0b99745f3c1340f", + "sha256": "0i6drqz7cnx97bs5kprvb0hsg2h4bwkfdi61ajv43dqgb368jbff" } }, { @@ -47646,14 +48264,14 @@ "repo": "emacs-geiser/mit", "unstable": { "version": [ - 20211204, - 1935 + 20240909, + 1145 ], "deps": [ "geiser" ], - "commit": "4e90e9ae815e89f3540fb9644e6016c663ef5765", - "sha256": "1j06y77nq6q33fhvf4kq0md4xmcrvimiycjgv35cpkxvkcprfafa" + "commit": "ddd2ba733e8274d40a26b5d6d2ee11f1bac8abe6", + "sha256": "17dgil5hngxlnb220dnym6my16cilj697r31421qynzxvd9kjbjs" }, "stable": { "version": [ @@ -47667,6 +48285,36 @@ "sha256": "1j06y77nq6q33fhvf4kq0md4xmcrvimiycjgv35cpkxvkcprfafa" } }, + { + "ename": "geiser-overlay", + "commit": "b9549e37a9b761faec734124d10db5f0328bbf5c", + "sha256": "1rgjx0hs5fn9qgx6j730zj926bjljyifxy7h1p9p0jy592c2bicx", + "fetcher": "github", + "repo": "port19x/geiser-overlay", + "unstable": { + "version": [ + 20240920, + 816 + ], + "deps": [ + "geiser" + ], + "commit": "dd02acf804d6d3c0ac4f86ed580316b19a7f5d5c", + "sha256": "08fgzn2cb1c9rzinvfi7n4pa7pdvj1xgawkzfyzwg4qic5sz5hq0" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "geiser" + ], + "commit": "6e2eaf7e10130a6d782e40bf42c97be63ba3b71f", + "sha256": "1cnib874wakmjv1l9xvb0r67yp09dli84qf9rpxqi52qym34xnp8" + } + }, { "ename": "geiser-racket", "commit": "eddf5704aa4c2373dbe7b7b89934f6db3737a769", @@ -47792,6 +48440,21 @@ "sha256": "1jillsr80l4wfbcqsxh3zbgbvmbfih2wcz518mgw9p9pwg4xwvy7" } }, + { + "ename": "genexpr-mode", + "commit": "7a9f2ab91dd2d103acbd7ab597e3502f96dbe220", + "sha256": "0ayfsrn7841frnsk2qk2yi3313silkpzmrsxxcjq2bfdk0a5xh1n", + "fetcher": "github", + "repo": "larme/genexpr-mode", + "unstable": { + "version": [ + 20240930, + 1335 + ], + "commit": "27d9d4d32aef1799698ddbf75e92cb71d0ce99bf", + "sha256": "1qwrxca7qpm3df07y8cchg3vqvgbj2nnlv942ykrkxgcvkx0j5qf" + } + }, { "ename": "genrnc", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", @@ -47893,10 +48556,10 @@ "version": [ 0, 2, - 0 + 1 ], - "commit": "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc", - "sha256": "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701" + "commit": "d7d540c229c1a8be68ee09fbda08fe3ea31b7d29", + "sha256": "1rfka83jwd68k93vn3f7llxd6z0ma5k98gws0081y8i9fc21fnsd" } }, { @@ -48224,36 +48887,36 @@ }, { "ename": "ghub", - "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", - "sha256": "0ny8yly8ighk07kiy701rlppkw2jipymwxrf3kkr3zvm9nz5wi4s", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "0114zfav9lwlypfhk9vxsr9ggnmsqx873x4qsjmmx82zklbcz4lw", "fetcher": "github", "repo": "magit/ghub", "unstable": { "version": [ - 20240818, - 1702 + 20241001, + 1025 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "3ad921bf1f5e91446f2a33004dfd51fa1b64ed59", - "sha256": "18f6p9ls4zhykbpsxi2di8d010ca4jyl3zgj4z9y7n56h7hc1i75" + "commit": "23d1cd6b089db6619d02d66957c6a274311abd60", + "sha256": "1p5lx781z603q943p73p6q9k6qz75ldjwrr9z3h6zvi80gxd7afy" }, "stable": { "version": [ 4, - 0, - 0 + 1, + 1 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "c20bc86c70eb2f43df8674097db7847e172ef2c2", - "sha256": "1dnl4idvc96jv73gdsrp377m1782i5n0cq0y4s0mp4i1vqd5drj2" + "commit": "23d1cd6b089db6619d02d66957c6a274311abd60", + "sha256": "1p5lx781z603q943p73p6q9k6qz75ldjwrr9z3h6zvi80gxd7afy" } }, { @@ -48589,15 +49252,15 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20240730, - 1912 + 20240915, + 1127 ], "deps": [ "dash", "transient" ], - "commit": "514396c9306338f7df49140e3c9d2177ad7f3567", - "sha256": "0n31v69vg0qn853pbgkxh1i6cvkas0pwivdxz4f8spg14avp7q6s" + "commit": "ca71436f8cdbdd37d07f91c94231234d3fc9c8b4", + "sha256": "09zla0cblyg4am6d5g4h6s8l24f6z94k8zp34x1yy5ygxkw2xf7r" }, "stable": { "version": [ @@ -48648,38 +49311,26 @@ }, { "ename": "git-commit", - "commit": "3126dac37def07fcaa667a325ee79349fb80d285", - "sha256": "0gikqipqd4sp6y60i09bbspxd9q9bh00wn73fgrixkir4p1cgn3c", + "commit": "301c815541da7eaa552d834bfbed3e6633bd4136", + "sha256": "1xqcj7pmlys3ml1nk5fhgqn6d4nr1aagk8z0lskgr3kxzw5n7bcq", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20240808, - 1852 + 20240831, + 2335 ], - "deps": [ - "compat", - "seq", - "transient", - "with-editor" - ], - "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", - "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" + "commit": "9be8a4ab7a7dc6f34615f1011e8da263651c8f87", + "sha256": "02i9j8hxp3v1pd805x7xxd39kqldq2kw5qyxdwsrw7lyia25wrji" }, "stable": { "version": [ 4, - 0, - 0 + 1, + 1 ], - "deps": [ - "compat", - "seq", - "transient", - "with-editor" - ], - "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", - "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" + "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276", + "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn" } }, { @@ -48726,11 +49377,11 @@ "repo": "danilshvalov/git-commit-ts-mode", "unstable": { "version": [ - 20240722, - 1815 + 20241003, + 612 ], - "commit": "ba722ba44964e87b2acf48cb7b6154ad4c99bc26", - "sha256": "1123h95cks0sk3dkmx0srazxslizdpk2wnmgz4hsgy78yn27i85b" + "commit": "6eb42a3c08c5c6a1a610d433b93590b88a71f63e", + "sha256": "1pk7za22hkbjnxfh9n3nq4qsn1vz42176vh6gd42kjw99fmqba8n" } }, { @@ -48808,19 +49459,19 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20240425, - 647 + 20240903, + 418 ], - "commit": "9afe45b41a82a332606d3e70ef85d323d27b9e4f", - "sha256": "04y6aj588068hr6xnyb15g38q9n3w01zh2r525ljmzvrry2lai7y" + "commit": "9beaed9e45f92ab0527f54dbf5fb241b84e7821d", + "sha256": "0vz6ms419kidlsfdv6w22imvl7y7zr3qv2c5xlvdxgi8kyr2k9p8" }, "stable": { "version": [ 0, - 92 + 93 ], - "commit": "a33a50c47bebd5d3f9f0ec7e71acf198e5fd4331", - "sha256": "1fkp6iyisb3g5afyjkxz4yj4ws5f8n7whklck4jdf3014vs01b3c" + "commit": "3772fdfa673f8a7f7b7894110d78b4070eccf361", + "sha256": "0qjp1gind95py0zfc3a32j7g6bmdh0pszpyiazqqzxm3rz82m7rn" } }, { @@ -48998,11 +49649,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20240809, - 300 + 20240923, + 2245 ], - "commit": "a0a2fff2d2fba516bc4c08cae10e067c3eb10529", - "sha256": "130d92jkxq22mz5b9s378nrx93a98nbmb84cjny5vmsl3c2rfzzm" + "commit": "2107af13e15fab4e42f52844af080e4485ea5470", + "sha256": "0ybfwg7d4dqzilw4ka5i1zggzq4zhnpdpa2a7mn3mq3l8rdzkr0p" }, "stable": { "version": [ @@ -49118,8 +49769,8 @@ }, { "ename": "git-time-metric", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "00xv1lg1g541y3lg6qs8l6rjbvzwhq84cr3grzns53bmrj2jz97x", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "02kbzaxjadm8xjixgnxj3d5am5d9a0p7861nj2bcxljncxndabmq", "fetcher": "github", "repo": "c301/gtm-emacs-plugin", "unstable": { @@ -49402,16 +50053,16 @@ "repo": "akirak/github-linguist.el", "unstable": { "version": [ - 20231105, - 736 + 20241014, + 601 ], "deps": [ "async", "map", "project" ], - "commit": "7e24d62266ff0c56b63dc8ca4bf6d39a88aa1d5b", - "sha256": "18wh1713zgn2p733n9psqq51ixlxacnbsfw4h8falzahn53mk0j6" + "commit": "442bc84dcdd3fe756f228b52fd027842f419e52b", + "sha256": "0wsj2r16w4dlpqw9s7pc5446fvrbw7cd6kgmy8rx3iz0a6i90vrv" }, "stable": { "version": [ @@ -49689,14 +50340,14 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20220921, - 1044 + 20241008, + 316 ], "deps": [ "ghub" ], - "commit": "8cc070c156d6e45583074ef4eb110b8d1511b0c4", - "sha256": "19j6x3hz5fgpgslhiiks5nwv9swj88sf2g290s0254mxyk5ffcn8" + "commit": "3f60765ecb1d02f08f2cb5cde45216748a738140", + "sha256": "1vggqy28ggqpcl0bkm59y0rflb1wsbbvnkb8g65qy8akvif6mm5l" }, "stable": { "version": [ @@ -49885,6 +50536,30 @@ "sha256": "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9" } }, + { + "ename": "glass-tty-theme", + "commit": "6e068f86055da66a2b43a4c11609902a4927c962", + "sha256": "15zhnky3y580f3w0ihssbgx9bkzynf55ln9xi1cmckpnfbb85l3d", + "fetcher": "github", + "repo": "irtnog/glass-tty-theme", + "unstable": { + "version": [ + 20240909, + 1259 + ], + "commit": "59126e888d9a237c6a0461e3712665d543f1320d", + "sha256": "13kyg1kcnj272yvdwhicvmz4363wrgaa4kzqr8nw63mr0sqid3fq" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "59126e888d9a237c6a0461e3712665d543f1320d", + "sha256": "13kyg1kcnj272yvdwhicvmz4363wrgaa4kzqr8nw63mr0sqid3fq" + } + }, { "ename": "gleam-ts-mode", "commit": "51b0a905d5748d4d4f2e807435e56c6c2a312edb", @@ -50151,30 +50826,30 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240818, - 2127 + 20241009, + 1607 ], "deps": [ "compat", "emacsql", "transient" ], - "commit": "4fe415d70277046f6b81a00e8e012634e4f0ac05", - "sha256": "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd" + "commit": "505ce5cff58923acec6e83351042f2b1d150f65c", + "sha256": "15x7ny693ch8bsdjlf3mg2apvkyf9r49d7kv9qz3zdg574cnh0pf" }, "stable": { "version": [ 0, 4, - 1 + 4 ], "deps": [ "compat", "emacsql", "transient" ], - "commit": "4fe415d70277046f6b81a00e8e012634e4f0ac05", - "sha256": "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd" + "commit": "4f437a3b23090d2591eb36a26c146ff3595a6256", + "sha256": "1fmfhmsfkw3rhbgrwj59p0z8jfjyplprfb7rzdg19qwv4km680iq" } }, { @@ -50238,11 +50913,11 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20230323, - 1400 + 20240914, + 1522 ], - "commit": "f99effa21f85a4c0963fec6a38e9112a8157d27e", - "sha256": "1r2hi7dg3xlz3d4bfm1a8z6v7y5xsxh5dp936hjcbgp4a41395c2" + "commit": "235ba76c358d9db5b10f177552f5f8deeef74df5", + "sha256": "0p1rw0sms5akfr9lj3qlkhkkg6s66jhggfi71wrfa5s7vg0j7gcl" }, "stable": { "version": [ @@ -51191,11 +51866,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20240216, - 1542 + 20240926, + 919 ], - "commit": "41d3669d7ae7b73bd39d298e5373ece48b656ce3", - "sha256": "1fczxygg1blfmlwswck49rllww77rc7qn91wqw1kvjwfz31sk8z4" + "commit": "142d788e16bf387608b51c8590c852940890f637", + "sha256": "0bvr5696i6zbzd160hf0fivxil3a65p22x7vagwydxrx9d2ji4iq" }, "stable": { "version": [ @@ -51709,8 +52384,8 @@ "stable": { "version": [ 0, - 42, - 0 + 44, + 1 ], "deps": [ "dash", @@ -51718,8 +52393,8 @@ "magit-popup", "s" ], - "commit": "7a7c064655147daa9d03c20c764c0dc3cd8111ff", - "sha256": "0hy96w8milg8ap7d3145ab84da9gjlwzh9f0c7ll6y6dg4jdrgaa" + "commit": "8234db495a8d1a3362d328e30c8ea084ff5bf698", + "sha256": "12a6x2cgq9p0j1s1wyf6lyqnmc396v0y6rxilkab0snkzbrqqmff" } }, { @@ -51873,28 +52548,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240814, - 1558 + 20241013, + 1957 ], "deps": [ "compat", "transient" ], - "commit": "17f39f6a8144496252eacc012ef7f1d6a2ac883a", - "sha256": "1y1jz2njx8ggagjr4dqdjhbm948knb29qk2p2qhx0sgarfzvvsz6" + "commit": "25c39a03771a8b2f71d7026fe06f0f5f21e29a9c", + "sha256": "1s23cn069j40abv6kl2qgl09zwjp72d43izkisg6zqjvzcdgqvwx" }, "stable": { "version": [ 0, 9, - 0 + 5 ], "deps": [ "compat", "transient" ], - "commit": "4c0583b2bd6557a09d66dfec84bab776242d0848", - "sha256": "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4" + "commit": "37ca1069326aefc54bdb1722fcac1e81f90b2ff3", + "sha256": "1ihcdxpwqawvrb1l8l8lnj20gn8m5z47q2fmpvzwdqbjd0nl2xnp" } }, { @@ -52368,15 +53043,15 @@ "repo": "michelangelo-rodriguez/greader", "unstable": { "version": [ - 20240806, - 1624 + 20240921, + 1919 ], "deps": [ "compat", "seq" ], - "commit": "6664c20a6a6a32e3a6c31d13a160fb8c9c8e118c", - "sha256": "09lff7j09132k62zcgxdd0jk55zpvx2nylm63j1fy7mgjc5zxr3c" + "commit": "e163aec6109ba24ec543f087d9be7bf6b6efa389", + "sha256": "054jlv1vrb7wbhr0w97xirjwp42mx0k07j7f0383jxsjn08qik5g" } }, { @@ -52525,11 +53200,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20240817, - 1013 + 20240820, + 825 ], - "commit": "378de9609614448ca29e2add91f2d0059f963d8c", - "sha256": "0valpvbklqzc48f9m1rysjh24323cykpz39dk6avx6vj3y70lnaq" + "commit": "9adac9c98902e42d73a64788b69f2c07e21f7851", + "sha256": "0918ycvbfv5ckmgvjn413v39bz7948f03sjqw6wzcha88hgdizv6" }, "stable": { "version": [ @@ -53026,11 +53701,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20240628, - 2142 + 20240902, + 2137 ], - "commit": "569ee770d022df9f6d51ff448652788a379c377c", - "sha256": "1gl0w48gpqd02zq3jh4gn2n41mr8g850fq6s10jlmkdh6q1za233" + "commit": "f84bec6057506ec3f145cd3e06b320f1e40efcdf", + "sha256": "13xp6cqblhdaah1h11gvxfz3hpi41hn1bp1pwdgpfk61p68iwpbf" } }, { @@ -53180,25 +53855,25 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20240524, - 1838 + 20240905, + 2225 ], "deps": [ "s" ], - "commit": "ccf20511f0f2ed45d00d423c703bb91ab6a8b80c", - "sha256": "0jnxys3zcmswb0z4zcd05c58cpw9qbw8hgwfqfsixyk720722b9g" + "commit": "343e45f2a616c726f20ba099f3f98a1a01cec405", + "sha256": "0yd6l86m84qdbnm6cpqrv0xlsvfbhfrgjjns5f209js8i0wysjvs" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "s" ], - "commit": "28b6d43bbd8bb81f101ea4e95be2e40260c02ae8", - "sha256": "0vcv66413i93mi1w7jszkxb47dfjw1ngdwysjlpw5wzl8xkwrcm1" + "commit": "d0f6e8dfdf6fa8cc33e3fe75f0f2de9407b98ce8", + "sha256": "193xkclq7i299c3crm6d1w17aqs7c2j1xkvnknhjb80z9xraq213" } }, { @@ -53257,11 +53932,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20240801, - 1217 + 20241007, + 1441 ], - "commit": "6b3f555cbf038cf4ad4fd296554467137892776c", - "sha256": "1l0wb1v3x3ngg3x0mv2pfa97qfxblm3ff6r2d7b5y5767ifmbn6j" + "commit": "9d5771e23140b02101b8d6c410b56143df3d7756", + "sha256": "1v2zx6mkdkpc42snqrrdh64h782kdlzarc49790m4gb7lp5a9s47" } }, { @@ -53438,15 +54113,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20240608, - 359 + 20240917, + 212 ], "deps": [ "svg-lib", "ts" ], - "commit": "d5d154060bb13e9b61d74a83b25a12238973099d", - "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi" + "commit": "5d33d41f0aa019719f9568e20b9599aed80d7db6", + "sha256": "1fv35m2lrx69c4ibfyjlfazssddw4mgy0zzr9ncyw33hirfqk9vs" }, "stable": { "version": [ @@ -53609,16 +54284,16 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20231219, - 1609 + 20240920, + 1714 ], "deps": [ "f", "hydra", "project" ], - "commit": "2c384accad8df20bcf91c13ea2d21546a2facfe1", - "sha256": "18hd465lwzkrzp0m2kbz4v168g30pjkdfi8n477pfcwnaf0mbw2b" + "commit": "631354f24c0bd56daaf8ab613d695c4f1d57949a", + "sha256": "0j9xiyllq9gm6ndks1i9m26ni44f0nzlyv19f5vbi0al5sqiax1w" } }, { @@ -53747,11 +54422,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20240527, - 853 + 20240911, + 1020 ], - "commit": "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0", - "sha256": "0r0fzvrmqg4vi4q9h3b260dppxszq4gpak5jl8kqb84s22hx4g33" + "commit": "cf387f92b160ee87ce3e247542558d1b6ed84b3c", + "sha256": "0671fxy312cx1sqgpjy6p63q0l5n3ia829xg1d6l08i4cwxjbkz6" }, "stable": { "version": [ @@ -53916,11 +54591,11 @@ "repo": "emacsorphanage/haxe-mode", "unstable": { "version": [ - 20220930, - 251 + 20240925, + 754 ], - "commit": "4d51bd4bf75aef53d1671e22ce6555e4daf883db", - "sha256": "0dfjr6k0w996ygds0d5w0msx83bincvwnmmwaq8sxhdi3rnx26r2" + "commit": "7a396e9f01f7c110dd120c6ffaea668f44991f51", + "sha256": "1mhrxri5pkqi4cmbwcf9f073vxbihxlv4vjv5vv5m33smnb3q97g" }, "stable": { "version": [ @@ -53976,8 +54651,8 @@ }, { "ename": "hc-zenburn-theme", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "14ag9y0i5ma07ja0f2n9lmnivhy11r1l9ixy41xl3wc4gjdhmyn2", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "0s2hap42cg7dbj8zc11aw35sczyld25ka55s0y6fxzk5hakvpsnz", "fetcher": "github", "repo": "edran/hc-zenburn-emacs", "unstable": { @@ -54083,34 +54758,33 @@ }, { "ename": "helm", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "01h2k8xb4r98xxyff8cg53fzv3xc4nq7gl3qhghn03vla2l9hzpq", + "commit": "c285b0a3e846bb1d40632647e17e3be2a3b8913e", + "sha256": "1rhyhv3w7k65dhyq77m8p2qjvknyk52grbbmghk0wf4m2rf5x87w", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240818, - 1231 + 20240929, + 416 ], "deps": [ "helm-core", "wfnames" ], - "commit": "eb5edc60be7294f9fa623c208bfdb681fbe2a3f1", - "sha256": "062i9i8vg83i49k2w6qis6yd1annksf54whn7mxyfs15jikl43gh" + "commit": "c0fd64b5491576853ecad9337996b38743effeee", + "sha256": "102s2gzcnrv73xa7xsj3i5caja1w6zmcazg6vv0k9ww0c6hjqihl" }, "stable": { "version": [ - 3, - 9, - 9 + 4, + 0 ], "deps": [ "helm-core", "wfnames" ], - "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592", - "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v" + "commit": "e0d028081f1f24da8e649f6ea3ecea42216d4632", + "sha256": "0il5npxw8wrpbwd8nyf9q9yxxd5plh3zl45m04w0wj4lpz9sqz7w" } }, { @@ -54190,14 +54864,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20221017, - 1528 + 20240925, + 744 ], "deps": [ "helm" ], - "commit": "2f5e41ae979394208989c25f4cdc73a0532fede9", - "sha256": "07mxpsay8an9m97g8vbvz09mgb781wh11w2v3s28gyhg8awsk4sq" + "commit": "c9d514c5c0a7283f730d237f7ae69b96736c7c9e", + "sha256": "0cf3r6bqmbgkp6a9g5nbmzv1m3l0hka1599kri23fi3s2k88c70h" }, "stable": { "version": [ @@ -54979,26 +55653,25 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240818, - 528 + 20240929, + 353 ], "deps": [ "async" ], - "commit": "36a6b50f325be94f30c6cf699ede042fa907c6b1", - "sha256": "0cf5q1lwd6ca5hi62cwvz4lfbxbs79403qs96p6bkajg4q4g186h" + "commit": "77c1663455c77f2e3a407414db37e06ea1d4cf33", + "sha256": "1lhid932hnwwnj2ahrzms6iz92sp2idg748v1z770pqh55in040q" }, "stable": { "version": [ - 3, - 9, - 9 + 4, + 0 ], "deps": [ "async" ], - "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592", - "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v" + "commit": "e0d028081f1f24da8e649f6ea3ecea42216d4632", + "sha256": "0il5npxw8wrpbwd8nyf9q9yxxd5plh3zl45m04w0wj4lpz9sqz7w" } }, { @@ -55631,14 +56304,14 @@ "repo": "emacs-helm/helm-flymake", "unstable": { "version": [ - 20240727, - 617 + 20240902, + 1133 ], "deps": [ "helm" ], - "commit": "748193359c26d466b4ef4ff59d733a5edfcd0c48", - "sha256": "1ilrw99krmn086spv0lpdqc9dcp5c3m4i3xpg42pyifmhhck050h" + "commit": "3df968f45b066bc284b0bcce718c8493104d3f3b", + "sha256": "1aiyp4jpc8y5xbfcm19g822gvbkm6rv4v28zvv5w656n5m82nfd7" } }, { @@ -56062,14 +56735,14 @@ "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20200602, - 1610 + 20240925, + 755 ], "deps": [ "helm" ], - "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", - "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" + "commit": "f51eec4a39d7a38a030fd37e40834f1ca9b61e00", + "sha256": "18iyc4klwp7zpccdhpyhvzi2lg61njdy6a6cfgx1h2kkpqxlccwv" }, "stable": { "version": [ @@ -56535,14 +57208,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20240811, - 1739 + 20240828, + 607 ], "deps": [ "helm" ], - "commit": "244b6854c1c118e41c8fac0201eff03ba034ddc6", - "sha256": "02ckp8s9649kanawl662acl4vd5d5q9cfzvfkfh07xm3x03d44az" + "commit": "9338106a4caa51ba264c75c3a70976629a4aeb7b", + "sha256": "1ahh38i1rriz28fvph2qc630bxvhm9dqygslhkrqpg4bcvck25sc" }, "stable": { "version": [ @@ -56709,16 +57382,15 @@ "repo": "emacs-jp/helm-migemo", "unstable": { "version": [ - 20151010, - 356 + 20240921, + 1551 ], "deps": [ - "cl-lib", - "helm-core", + "helm", "migemo" ], - "commit": "66c6a19d07c6a385daefd2090d0709d26b608b4e", - "sha256": "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix" + "commit": "6da30a3ee3ddcfde6068a5b05be24f888d9a7b53", + "sha256": "0x72ja6pkrq62wrac2bwfx1d0xsb5c9isx5w1g8jx5bf6s2d5l2y" }, "stable": { "version": [ @@ -56805,14 +57477,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20240726, - 608 + 20240910, + 854 ], "deps": [ "helm" ], - "commit": "4a45bb87215a47c8638034a06bf6529369779c5c", - "sha256": "0344rmwl6g9wy2vf919idm0fnrplyw112sfb39h533y0sy2244sy" + "commit": "d0bbc46338337d92b58708b906b40d0e12ae8006", + "sha256": "0l7cysci0cmg0mg64gjxismkwqc3rfwl4ixjz5a0434zc1pg502j" } }, { @@ -56938,14 +57610,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20231022, - 620 + 20240922, + 603 ], "deps": [ "helm" ], - "commit": "c80e53315ce6b096e2d0e630702df924bf00bf6a", - "sha256": "1nlqlaxxs5zk2ara3k2986jjfsj1zbknwx40jliqq39dky0ksblh" + "commit": "9b7d5d4fd18180b2009a0f2b908c84d5363e41f3", + "sha256": "0h776y4vzxg1jpgd1c4nps33ywnxpn6iw10z34amxnv9mvxmip20" }, "stable": { "version": [ @@ -57021,7 +57693,7 @@ "version": [ 0, 8, - 7 + 9 ], "deps": [ "dash", @@ -57029,14 +57701,14 @@ "org-ql", "s" ], - "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3", - "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50" + "commit": "81281350d44a3903a0866431342299f5f3c74beb", + "sha256": "1mw07y82r3b9brphx2j8gj95rbs4632fgq0b79824zqpwm8m291j" } }, { "ename": "helm-org-recent-headings", - "commit": "e6bad1e40f5598e7f910edc06592a02f3e44141f", - "sha256": "1wb2z6m63fc1491vb8265anskhs1hx5haa2gbj7mp2q7ymjvvs3d", + "commit": "d47e953b299c2cf46387568d2a4d17df5da3ba1a", + "sha256": "03lgskzrdmrcrw22d5zylac3kppf882xxsv42iz99hfmmfgklmi7", "fetcher": "github", "repo": "alphapapa/org-recent-headings", "unstable": { @@ -58416,14 +59088,14 @@ "repo": "emacsorphanage/helm-themes", "unstable": { "version": [ - 20220721, - 330 + 20240925, + 748 ], "deps": [ "helm-core" ], - "commit": "12e856c0346fa69d13d941f27bd3cddb3a3deed2", - "sha256": "19wqdf4v8cacfyg709xcmczwbaal32290cbv933wc6ridc5576i7" + "commit": "4b234d4bdf61bd7ad82c5302c6178f7fee3ee66f", + "sha256": "0qnh198q063rcrkanzid8xqm76w94m47mkqg0rj04gdkv1wqliz9" }, "stable": { "version": [ @@ -58610,14 +59282,14 @@ "repo": "emacs-helm/helm-wikipedia", "unstable": { "version": [ - 20221113, - 824 + 20240912, + 1617 ], "deps": [ "helm" ], - "commit": "ab040154f2efab9b5eea36b3bd368a66f62efbfb", - "sha256": "091xsyvdsxkvg6rszgqymd8y7yp6v37x1k1022qbf9j66m46y9pj" + "commit": "e4b9434785e2a421af6e16ba50ea51eb54c7e490", + "sha256": "1fscrc2drq0j9p1bzy1x5dh72sk8gfrnq6qqi0f8m3qpvr1vcf0k" } }, { @@ -59055,8 +59727,8 @@ }, { "ename": "hiccup-cli", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0b79709x1lj050jicwklp0bx3v0j9d5ymdzp5niqsnww5z81q0bb", + "commit": "4f026b337d36a3209293ffb734f4557c83e24db0", + "sha256": "1yhmabp9zmdxlfyb2fhsba6yipb6b855wwf6xqmpd07l1k6ghfpl", "fetcher": "github", "repo": "kwrooijen/hiccup-cli", "unstable": { @@ -59100,20 +59772,20 @@ "repo": "hlissner/emacs-hide-mode-line", "unstable": { "version": [ - 20211112, - 1400 + 20240828, + 2322 ], - "commit": "bc5d293576c5e08c29e694078b96a5ed85631942", - "sha256": "12mfhg0r3gvy59ijy44vsircn251nmisp04k9vvgd2yhykpsr1j6" + "commit": "ddd154f1e04d666cd004bf8212ead8684429350d", + "sha256": "0iwfn828fp9ma9xcn0077749a32kp5rk677hh9hc1akiii1j2591" }, "stable": { "version": [ 1, 0, - 2 + 3 ], - "commit": "88888825b5b27b300683e662fa3be88d954b1cea", - "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp" + "commit": "bc5d293576c5e08c29e694078b96a5ed85631942", + "sha256": "12mfhg0r3gvy59ijy44vsircn251nmisp04k9vvgd2yhykpsr1j6" } }, { @@ -59309,11 +59981,11 @@ "repo": "alphapapa/highlight-function-calls", "unstable": { "version": [ - 20240112, - 731 + 20240922, + 1826 ], - "commit": "dd9d78bff973bbf2dbc6bdbc3a18d5d6ebcee737", - "sha256": "0q3sdyd5x106555c6alswy2pv1hp59b894fk4ziscidppbb0nw9q" + "commit": "3037e64c740e799ecefd06419cc1ceffca6320b5", + "sha256": "1w95xxj1h6ffz5k695k9fn4qa7yd5y0lqa1740xxyl54w3m8m80j" }, "stable": { "version": [ @@ -59594,11 +60266,11 @@ "repo": "meain/hima-theme", "unstable": { "version": [ - 20240116, - 404 + 20241001, + 1341 ], - "commit": "e928d62558ffaa9b2cca6d891069858d33535d59", - "sha256": "1d5qjc8hppannv6xymmqnmi98w3jhga8hb06shbq7wcl29bcipn0" + "commit": "f136e283feb413d4bda4904edf7a5a58a3a0749b", + "sha256": "18vilb5sm3cylzm387hfg9k1304gg8rvziav5c6lb3y2f7a0dj7z" } }, { @@ -59609,11 +60281,11 @@ "repo": "dantecatalfamo/himalaya-emacs", "unstable": { "version": [ - 20240101, - 2203 + 20240321, + 1324 ], - "commit": "108e275f25ea35f2adeedbeb4af28c4a99c07fa7", - "sha256": "0i8rg5dinjkypyxgcqzaxrxs52j5x1nyalns23g20kvmfg3aivan" + "commit": "6c2c7f354a0bed95b2199e1814342620119bf13e", + "sha256": "07hih5q0n6af1cr33ilzri3y3nqdmvqgd860qa9wv5wl3s8rymnz" }, "stable": { "version": [ @@ -59632,26 +60304,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20231112, - 1536 + 20240907, + 1847 ], "deps": [ "cl-lib" ], - "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", - "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" + "commit": "3295a2f0b6d3b98255a82c11c329c5f5275a6ae1", + "sha256": "0c2z2sfr42fj35w7yw4flq34r6kd0zn7p5m44hx2mn90y0jbvql1" }, "stable": { "version": [ 6, - 1, - 1 + 2, + 0 ], "deps": [ "cl-lib" ], - "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", - "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" + "commit": "3295a2f0b6d3b98255a82c11c329c5f5275a6ae1", + "sha256": "0c2z2sfr42fj35w7yw4flq34r6kd0zn7p5m44hx2mn90y0jbvql1" } }, { @@ -59907,11 +60579,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20240422, - 211 + 20240829, + 101 ], - "commit": "f32c04519f544634bd8dedf55d8bc458d9f64766", - "sha256": "1s5qvh12fnm1ryqvdf12p2czn796yxlgjcmxqhgxx8j3qplc47y9" + "commit": "5e98b3fed32d7d126087129e3efe60dd8e501a83", + "sha256": "1q2iykx85p2lw5jd1yamr6nb1mz494kbp197nidn2z6bv7h0kavj" } }, { @@ -60226,11 +60898,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20240414, - 842 + 20240907, + 1735 ], - "commit": "864d07cadb0ecbbf6c296db6ecfbb38358436e21", - "sha256": "0r3slrzhbzgp7a48g2mg7q5yf3cx3xiz0vwjm50yq93xw4mxig8g" + "commit": "e41827ef0226de7874e60b2f6c7ceb13116cd4ee", + "sha256": "06vhls7yz7gnzvmplvla5l697bj3r9rhn4aa9h0sm2whny5vzhs5" } }, { @@ -60332,20 +61004,20 @@ }, { "ename": "howm", - "commit": "c3ca27e5f3cf3822f7351bf500a29f23aeedf461", - "sha256": "0x74kj5cgmhinwc979hl1qr56yzijcgq6i6fmyxmysyw7svhif70", + "commit": "73c0431328f840ce3319c1cf3c7202f0e96c5f0c", + "sha256": "1xyqpbi28akgcx5nbdlz9k0l6iz4zd3p0aiid84h0p6r12ynsff5", "fetcher": "github", "repo": "kaorahi/howm", "unstable": { "version": [ - 20240229, - 1231 + 20241014, + 1050 ], "deps": [ "cl-lib" ], - "commit": "11d05032af3ffb895c7b1a1845fea7ffe3be4fbf", - "sha256": "155zp3hhb8i7dp2f5vz3yca8gzrzg0psxak17rfa9j1lk0zgqyr0" + "commit": "280eead4fffdc2ef78aee4fcb522f24a3f1f4dec", + "sha256": "00w8dnszispfv1y7zqggmjfn2xhmn0fls1gdx8gx7vhkyjyzpvqr" }, "stable": { "version": [ @@ -60508,25 +61180,25 @@ }, { "ename": "htmlize", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0wmsgvqyag03qq6rqiqkg2vmzv3rql7h7k090280lp1khgs4xyhk", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0c0bfw6vixamrm04ghgmddbfw7xc9v7bb5s1v9chrwmf7994wq46", "fetcher": "github", "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20240527, - 1456 + 20240915, + 1657 ], - "commit": "ed5e5b05fd260e8f161a488d56f10e7f6e01fb75", - "sha256": "19q4m3bc7dljh04662vm4rr1kz5c11rwyyv27vp01yakwbfig772" + "commit": "8e3841c837b4b78bd72ad7f0436e919f39315a46", + "sha256": "04fvpignf0qy9ws2z90vxbyqzmc4zsqc98m9fnq167x92dp87ibw" }, "stable": { "version": [ 1, - 56 + 58 ], - "commit": "ed220b1f3be1f898e3cfd628196b16d25a65cb5f", - "sha256": "14m8si49br62lgx7asdyp9jysq0v6midrfk32sxy521ydqmqr3c1" + "commit": "5d2751c4ca101fa0884ce8662f5566736f8257fe", + "sha256": "0xkp4sscrz6mpk96vhc59xp94ynfdyalq8npr1g8f6s32xavsga4" } }, { @@ -60965,11 +61637,20 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20240819, - 504 + 20241008, + 514 ], - "commit": "8fa9e4e19880b6270c138c634855edab8779c2f8", - "sha256": "1cr09q8ihjn7fycrz0k9957g8d9isq1lgy4fa5aifm3w3wxz9x9b" + "commit": "a8d5eaae30162e61dc854c904f831a83fcd4da8a", + "sha256": "041sx0qliacn9lwa8iwsxzvb3ya9jhqjxs44f4nv65dvrjm91ll4" + }, + "stable": { + "version": [ + 9, + 0, + 1 + ], + "commit": "b36debbea873c2360a6782abcce084f78c0c9ff2", + "sha256": "1z10mzsshgcnrhrclh34fkpb9q1s99vfy9g2yw6n296mpwrd7srm" } }, { @@ -60980,8 +61661,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240818, - 2123 + 20241012, + 2253 ], "deps": [ "compat", @@ -60992,25 +61673,26 @@ "taxy-magit-section", "transient" ], - "commit": "0af765ab019912b5a0bbdd91529bc51745d48f42", - "sha256": "19yp0dyrnsh68px546rz2nxz0kmiwz690w5fvmcknicgh2w9vyl3" + "commit": "640585f58623e9e1f00f36055b7ec247aaff64e0", + "sha256": "16yzpndf8fdhljg47gs1c8037w4sw5a2p27vrbzm4j5iz3c2ivdq" }, "stable": { "version": [ 0, - 3, - 0 + 4, + 2 ], "deps": [ "compat", "map", + "org", "persist", "plz", "taxy-magit-section", "transient" ], - "commit": "38d9b17dc0eefab1c31124d8aae3728372535e70", - "sha256": "1bddakb13lb4w1ifg9ljkiwcziyb1wavxapd67774bhx1q61zsnm" + "commit": "6b70954da945664ca798bf483f1d60e9d5859409", + "sha256": "1banr2v1gp9ng7ls32w5yavsb2mks7pazp9pn27570329nl40cy7" } }, { @@ -61198,20 +61880,20 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20240531, - 2023 + 20240925, + 654 ], - "commit": "96043dff1c542d15cccf5df46b778927fcf5680d", - "sha256": "1c9qpygvs5zqrsc2q0sdm6s3yz4qgwa6qin7vax13b1f654hz6mb" + "commit": "fd1ad6bae74961e0b6bdf0bd15e6d9679186aaed", + "sha256": "0aanl83k66nbp5dpsckmj4dgkclkr208nrbl7wmjnqlkg0qzgifz" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 0 ], - "commit": "7ad88c8f7922adc616b8f060b65fa1add8952ea1", - "sha256": "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc" + "commit": "fd1ad6bae74961e0b6bdf0bd15e6d9679186aaed", + "sha256": "0aanl83k66nbp5dpsckmj4dgkclkr208nrbl7wmjnqlkg0qzgifz" } }, { @@ -62297,26 +62979,26 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20240805, - 1321 + 20241001, + 1019 ], "deps": [ "compat" ], - "commit": "f3765f893e74e63ccb15a577d6bdf5be5f0da788", - "sha256": "1ajg2vpxky8qbbfkv74as61c6g9g0bc3xry16vxk8g2fq62fm303" + "commit": "21951b7081e4b36641bf87793b064e06670943d1", + "sha256": "11dykwg2dll66n5yivhmcy7pv5hr2ai05z6phml7lw941qh7nhhb" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "compat" ], - "commit": "f3765f893e74e63ccb15a577d6bdf5be5f0da788", - "sha256": "1ajg2vpxky8qbbfkv74as61c6g9g0bc3xry16vxk8g2fq62fm303" + "commit": "21951b7081e4b36641bf87793b064e06670943d1", + "sha256": "11dykwg2dll66n5yivhmcy7pv5hr2ai05z6phml7lw941qh7nhhb" } }, { @@ -62351,11 +63033,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20240120, - 1331 + 20241003, + 1252 ], - "commit": "32be46c7a8bd759945ae34f19c0c6f09935a7e64", - "sha256": "0d5141f1cw6x0110zi5z7b1m4dzbrlr5905mi3dh0xkvc6qq1yid" + "commit": "833777daf76761997687149af688cda51c0c45f5", + "sha256": "0dlrc3pbbn33gkzj7i8rcwkxf22lw49nhajg5cyg58375h3d8039" } }, { @@ -62493,20 +63175,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20240310, - 931 + 20240908, + 821 ], - "commit": "a0a53a1fd9ca8dfd1d56fb45ab548ad900235a7a", - "sha256": "06ggjnb4dir8zrasskl44hq9r2fcw5gb26gyfh1580zyzjvfp855" + "commit": "f1c1c3c49f114dcb93b4068c034641eeaa2a23af", + "sha256": "130psdjylb36b4kjkdfp47w78ypv2n890rpn8wdggsmwcjgj18s2" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "2b2fe48234e73b447e3578fd211627ac4e78d070", - "sha256": "0r6m8jdn0lknhrivba27c7y54lysiab5nq5lm2i6bybzvc13ism5" + "commit": "f1c1c3c49f114dcb93b4068c034641eeaa2a23af", + "sha256": "130psdjylb36b4kjkdfp47w78ypv2n890rpn8wdggsmwcjgj18s2" } }, { @@ -62739,6 +63421,29 @@ "sha256": "1zwqibsdbgviv9j1zxs9j330qi357xc0i9bhh87xl4w7hd751xg9" } }, + { + "ename": "incus-tramp", + "commit": "bdc492e9b48811b5f4ca1b8fa5d1267e78f39065", + "sha256": "15dwgl80asxn5zfksyxmnp5i6m5b9wh6gr46idz05srivr43y1qv", + "fetcher": "gitlab", + "repo": "lckarssen/incus-tramp", + "unstable": { + "version": [ + 20240917, + 906 + ], + "commit": "dfeb8381bcde28209bafb45b03bb8d6795aedb61", + "sha256": "1gwqm3q3n186hbcynhfzcab5zhpl3g6rz5acaxn3js194m494dmd" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "dfeb8381bcde28209bafb45b03bb8d6795aedb61", + "sha256": "1gwqm3q3n186hbcynhfzcab5zhpl3g6rz5acaxn3js194m494dmd" + } + }, { "ename": "indent-control", "commit": "c2c3a73f54091f5347877d51a68b0e009253583b", @@ -62747,11 +63452,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20240512, - 503 + 20240925, + 2347 ], - "commit": "bf4863c9f7d1d5cadf47b78bebbafc5431361597", - "sha256": "0rkbsy5bc2kfvx4wiig5rnjw69lpi57lgcpp04810sngskima4sj" + "commit": "3c3ff2b10289cf6affc0d922908789deade3cbd2", + "sha256": "0s62551gr3rjw64r2plxk2x335dlzxb9gfk7011nphjlgvxbyb95" }, "stable": { "version": [ @@ -63056,11 +63761,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240627, - 2135 + 20240925, + 49 ], - "commit": "b234625c85a48cc71e7045f5d48f079f410d576a", - "sha256": "13x6jg89wg0s41p12srv61if9jwz1j0j0q5yfc543lx6ndk1w67g" + "commit": "6399a3668224aa48423c54e81383f73e5e39439a", + "sha256": "0x56z9gcw9yxblf7aqgcdfyahdfm4ilf47j0zmsywva1g0bcllrd" }, "stable": { "version": [ @@ -63365,14 +64070,14 @@ "repo": "chaosemer/init-dir", "unstable": { "version": [ - 20240521, - 349 + 20240924, + 150 ], "deps": [ "benchmark-init" ], - "commit": "fd3da1d7a4caf337eebf53de5cd6f5cadad00537", - "sha256": "1jpdjvkhjrnkcb12w6297hpdiw5vbnw67zby0fmsjz86rjwx08dy" + "commit": "406953deb5f29112ca02850885954f82abb1d334", + "sha256": "1gppwqb45acki4qhfmpsw8qp9yk8bi8sqcljij2pcc5cbqi1g7ll" }, "stable": { "version": [ @@ -63561,11 +64266,11 @@ "repo": "nverno/inputrc-mode", "unstable": { "version": [ - 20231203, - 2307 + 20240908, + 414 ], - "commit": "c1d5984fb30165ec72636123fc2e36389314eb62", - "sha256": "11wyicjfj281j21gnc0f0rpkfimncv8gmq656dqbn9qdn4zdahwg" + "commit": "e174b20ed043f4b0218e284b92a77bcfa1762aab", + "sha256": "1cizy2k71cyj3vyhx64h3108iziy01lq8jbl7krmzsswalbw98yg" } }, { @@ -63837,8 +64542,8 @@ }, { "ename": "inverse-acme-theme", - "commit": "1c44dbc8d3ca29d8715af755b845af7236e95406", - "sha256": "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "0vxwiw5fx14g8raaxlsbazv8lw8svv57wqdam2r9m9xcvinhmagg", "fetcher": "github", "repo": "dcjohnson/inverse-acme-theme", "unstable": { @@ -64509,11 +65214,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240524, - 1139 + 20240829, + 1723 ], - "commit": "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747", - "sha256": "1z5975q7a67z2kgnx3klr35magrcgy6idhzhi73in133cff0d21n" + "commit": "8dc02d5b725f78d1f80904807b46f5406f129674", + "sha256": "10gggaddmny3jgvppmka854cbf4ifv5gljdlhqyww6g7zlhwz48d" }, "stable": { "version": [ @@ -65426,11 +66131,11 @@ "repo": "zellio/j-mode", "unstable": { "version": [ - 20240611, - 2211 + 20240920, + 1706 ], - "commit": "3f852d1476be5625fea51dcaaad66dd57593101a", - "sha256": "05biqy3gdq3k5yldjwpnsn9jabnchmdzcfkpkmcdr3j2dsh7rciw" + "commit": "62d373b9d0926f191f42c747a2364cf8dacf0fa1", + "sha256": "09pxzk9njizgiaj1gdcwfd9yak75byvmczc6vh9xyiqd8rwkr29r" }, "stable": { "version": [ @@ -66247,14 +66952,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240724, - 917 + 20240926, + 1814 ], "deps": [ "compat" ], - "commit": "4c89699db3851c3ecfa5d007ab56c810e8e3ffeb", - "sha256": "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm" + "commit": "316e470633d9bbe365079cf237e3ddef1f37a80e", + "sha256": "0rvnpmr6hyp96i563vck53z72bhq09wvsv8wzrb9dbg0zgjgx8d0" }, "stable": { "version": [ @@ -66786,14 +67491,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20240418, - 6 + 20240908, + 1236 ], "deps": [ "cl-lib" ], - "commit": "9b90d31ed968e5c51bd3e279d4003248ea896807", - "sha256": "0rn4kwisv6mxhia8a2w2z9iqkp5h64i83sqvmlpnayswh7s88pcy" + "commit": "62d6cb169ed4cb6d7ae3ddbd8da9c995fed0ab32", + "sha256": "0yqj4dm9ky8sx0w1hwl0qskliswyqnmzr6p8lzhm3fviyn6q54x5" }, "stable": { "version": [ @@ -66924,15 +67629,15 @@ "repo": "isamert/jsdoc.el", "unstable": { "version": [ - 20230831, - 2205 + 20240917, + 1118 ], "deps": [ "dash", "s" ], - "commit": "4efdae3b94b1bedc167625d5705daed74fcbc967", - "sha256": "1dm5rysglvrwljimpcy3fm55a0slkp8fsmwl4s5h4rlfki71fb7f" + "commit": "36af204bc1e2582a7a2178249fa88f7995280192", + "sha256": "0cg74637xxlr8vz4h6sxc5v7f7p673g979bnnc5a5mlm63ahr8kh" } }, { @@ -67349,11 +68054,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20240506, - 1205 + 20240926, + 1528 ], - "commit": "d360ad5285b8a0be1818fd6c2b4307c34e468c6e", - "sha256": "0gxj3qn4jmggb2bh7bmykb62g29m24g8k11jx481pf56qn2g3rc2" + "commit": "09897a8cbab48adaacdef6f852d7cebd3945a645", + "sha256": "01lyz25i41320jlcpykvg2zdm4klwzhf1lcbqfn8shjdjm41svw0" }, "stable": { "version": [ @@ -67641,8 +68346,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20240716, - 2028 + 20241004, + 241 ], "deps": [ "cl-lib", @@ -67651,8 +68356,8 @@ "websocket", "zmq" ], - "commit": "f97f4b5d8c83e0b901020f835183dde8a2bf649e", - "sha256": "0jmhh9ncnf4ai8rr2g474n6dv9m7v983s2w0smy0h7l07sp43klq" + "commit": "674af0481a94f2ce56c62aa7668a966254ef26ef", + "sha256": "06nbmc136hb8bvrkqnpbhkd9sckk93ygsd9fdvzl59zfsvq0rgdc" }, "stable": { "version": [ @@ -67702,8 +68407,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20240701, - 1259 + 20240925, + 455 ], "deps": [ "f", @@ -67711,8 +68416,8 @@ "s", "transient" ], - "commit": "e74fef3e99c5c9e2e1a8495c539e1eca2cd0676d", - "sha256": "07gj3xfwim1df5c1dck9a3w00xg4syywmfzdayby5af79lrbcyrf" + "commit": "a46b95425c8f55d5ebfa674f09d606a6321e51e9", + "sha256": "1bcaq8w0g77q49di99ffpbspv5bjl59wp03x7k2h41sij47dzsxk" }, "stable": { "version": [ @@ -67759,6 +68464,30 @@ "sha256": "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83" } }, + { + "ename": "jwt", + "commit": "17a117686688995f59fee6ab95ac72d5faa0dabc", + "sha256": "18riv61606hsn2lm4rys73fmms1ck1j300y29yzz5g3yp6k61mj8", + "fetcher": "github", + "repo": "joshbax189/jwt-el", + "unstable": { + "version": [ + 20240923, + 1831 + ], + "commit": "98c9fb2e8a45592062b9bf84cec1be0e51f70f7b", + "sha256": "14dfwkvk7dm8hjgsnpv4an9fy2a401bcbg361b4ai0gs3m8691zh" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "98c9fb2e8a45592062b9bf84cec1be0e51f70f7b", + "sha256": "14dfwkvk7dm8hjgsnpv4an9fy2a401bcbg361b4ai0gs3m8691zh" + } + }, { "ename": "k8s-mode", "commit": "949da8f16687bad96f53714ccbde895587d439ff", @@ -67821,8 +68550,8 @@ }, { "ename": "kaesar-file", - "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", - "sha256": "0kbpvh3fbrcif4vizh6s3024a07qj82cxp7h6nbzdgjcn8whnbrl", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "03mb5wy5vhpnhgxv667dmpp585si60xhyba4gbr8gbk7j6nx0y3i", "fetcher": "github", "repo": "mhayashi1120/Emacs-kaesar", "unstable": { @@ -67851,8 +68580,8 @@ }, { "ename": "kaesar-mode", - "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", - "sha256": "18hb1rzpp3b1smn55b0wb4hwfbpmhkg6f41l251caraxnmx0cs5x", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1vqbqcj8z3kfgcjbjj1y9grwsqjh50dyn13q40rnkjjys8az6sza", "fetcher": "github", "repo": "mhayashi1120/Emacs-kaesar", "unstable": { @@ -67881,8 +68610,8 @@ }, { "ename": "kaesar-pbkdf2", - "commit": "1de54d63d9ce574c5f11041f732fe1c07a5bb1c9", - "sha256": "1hw5s8rv7cnvfmz3pk25r94svjvdz361knj05qzg8fmmdl4742iv", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0xpjwmcq6kigwdnl8izx0g5pkvcadbhb6fds99zrg2himrhvkb6k", "fetcher": "github", "repo": "mhayashi1120/Emacs-kaesar", "unstable": { @@ -68040,18 +68769,18 @@ } }, { - "ename": "kanagawa-theme", - "commit": "031d8e3e0b3caa06935005d4388c605a2b9a9e7d", - "sha256": "0bipgikp4280j46yk91zdyg53yscs93lsdzfm7w8ppfl1c4g6xxh", + "ename": "kanagawa-themes", + "commit": "c722de8c61c265cbc8e7682aecd5416858e9e903", + "sha256": "0rgvywppr66mnr9g8i2ldnf08v5dzig021fq94b1sm1qi2s90ikl", "fetcher": "github", - "repo": "Fabiokleis/emacs-kanagawa-theme", + "repo": "Fabiokleis/kanagawa-emacs", "unstable": { "version": [ - 20240721, - 1720 + 20240910, + 1649 ], - "commit": "e1cf4ddb7245031fb214baae95ebbffce27dec06", - "sha256": "107p3x02680ndfss9dfczj95yfj5j0xgqjbl6ldwmzjc8vf0j96s" + "commit": "94418acc89f789f4172c5f68b2afacd784bf176d", + "sha256": "1zihas9i1w679rir3vbvy3rjifl1y0nq5g1rx3y0ms2dy5nmy6x1" } }, { @@ -68126,15 +68855,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20240507, - 1430 + 20241012, + 1918 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "ba7a003d7aa5d4681a8464f4dec6ab4e9fb271d2", - "sha256": "1x0hrl0klfgvm7l2lcqr15apjsy9pfqzbk54idmk7yfk6mz9pr2c" + "commit": "8ce06c0ecbd366663d07c2ee04ed9c2674112335", + "sha256": "0xnry3w30zg7mxgc465q97ann7rk30srz5fszygnn8jlh3f5lkbg" }, "stable": { "version": [ @@ -68325,8 +69054,8 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20240621, - 2110 + 20240927, + 2129 ], "deps": [ "async", @@ -68338,8 +69067,8 @@ "s", "yaml" ], - "commit": "2460094aede77054f3200c61d807a445e3b79c9a", - "sha256": "1izyfhabmlqhbn0zv0vxc8c2ncxs26qw17k4772gpksvxxa29i44" + "commit": "09c465a5d34ecc5d97f958e05d8c352e6fdbd62d", + "sha256": "0309dfvbb5wwr2k8rs1rpp758kz2q52s0g8g24k9mlblqlldq447" }, "stable": { "version": [ @@ -68407,19 +69136,20 @@ "repo": "emacsorphanage/key-chord", "unstable": { "version": [ - 20240109, - 1430 + 20240910, + 1441 ], - "commit": "dbf91fefdad58b1c2f07c92e658ce81490837c60", - "sha256": "0r3zvq1z79csgcq0mgifdakx0z0li3haxk4wxvijwxllfb9kn22g" + "commit": "fc75b1451759121601110da8ddfadcf5156318af", + "sha256": "1ikg1kfyb8rgms5yvvg4117kmzw2jlq8h1wyq2l93my99c5qwm2g" }, "stable": { "version": [ 0, - 7 + 7, + 1 ], - "commit": "dbf91fefdad58b1c2f07c92e658ce81490837c60", - "sha256": "0r3zvq1z79csgcq0mgifdakx0z0li3haxk4wxvijwxllfb9kn22g" + "commit": "fc75b1451759121601110da8ddfadcf5156318af", + "sha256": "1ikg1kfyb8rgms5yvvg4117kmzw2jlq8h1wyq2l93my99c5qwm2g" } }, { @@ -68877,28 +69607,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240816, - 1432 + 20241011, + 107 ], "deps": [ "dash", "transient" ], - "commit": "2b1482d2b44efeface0aff6b7479e4c46aca72b1", - "sha256": "0lr0v08c468m4i8w80xgpqzpfj621igff5c2xr0v5nn2phmi05rn" + "commit": "0a1c3e4f411ea3657428366acdce6c64a322289a", + "sha256": "1g1brx4sqg9r2xkbvagng3zbqbzz9k3fszhx56ip75rgnlgvmf99" }, "stable": { "version": [ 1, - 20, - 4 + 25, + 0 ], "deps": [ "dash", "transient" ], - "commit": "7815e02dd421b705461df6a97033dafd61ba6419", - "sha256": "0rdnar6d85cdf5vligxxnxbsawmdmkxlq1niadk4mg6fmfb7akrz" + "commit": "0a1c3e4f411ea3657428366acdce6c64a322289a", + "sha256": "1g1brx4sqg9r2xkbvagng3zbqbzz9k3fszhx56ip75rgnlgvmf99" } }, { @@ -69334,11 +70064,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20240513, - 1429 + 20240917, + 1401 ], - "commit": "786b7eacb6c10b7a4e0c0537264264f299632679", - "sha256": "02b854m19f86l5g2j3gc7gb2w9834fm7c6rhjkrc5blwj8i3janm" + "commit": "bf1646a386408103e6267599a26e5f5479fa4635", + "sha256": "1di16q5cgjkmql5h6ah8bndh58a73rlk9gxkqmdvxh8j3lschryn" } }, { @@ -69471,8 +70201,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20240807, - 905 + 20240822, + 1507 ], "deps": [ "dash", @@ -69480,8 +70210,8 @@ "transient", "yaml-mode" ], - "commit": "68da30c647e16307dff71e1614015ba9877cd621", - "sha256": "0mzrnzr23fva3kbkinn4a5m2lms415a2c71gwicbb02kxxwl1f7h" + "commit": "e124c555d1a889055ddb1426163d24652cc281b4", + "sha256": "1i7ack3v0gm1q2lnsrs7fz6928n1mdx95c0n8sa618gr17h89p57" }, "stable": { "version": [ @@ -69762,11 +70492,12 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240724, - 2233 + 20241004, + 818 ], "deps": [ "async-await", + "auth-source", "compat", "f", "memoize", @@ -69774,8 +70505,8 @@ "request", "s" ], - "commit": "8ecca9a5200b322ffb3aef1f690689dd35764ef1", - "sha256": "11nl7r8g8vcvcwmrc07lblbzs9fn6ydyk9jc8grij7h73gia5yxd" + "commit": "193eb6b74f4c60c455cae276d3881668383b21fc", + "sha256": "04qihisw1baly5wspkafjqlw7w8k8v7lmjj6hcldc5bpjpc9f06l" }, "stable": { "version": [ @@ -70000,8 +70731,8 @@ }, { "ename": "langtool-popup", - "commit": "a3bddbf96a3bdcfb9bc32720eb371f2b4a5a570d", - "sha256": "09d73saz5wz1g8w6pzfrdwr3i6w48h8gpy6rss4ipf2lyaf0mfm4", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0742r19n49mlakyphpkrj0ivafw3nwb1nqa0k8cfvfsba74p3yp0", "fetcher": "github", "repo": "mhayashi1120/Emacs-langtool", "unstable": { @@ -70191,15 +70922,15 @@ "repo": "Malabarba/latex-extra", "unstable": { "version": [ - 20220817, - 5 + 20240909, + 2043 ], "deps": [ "auctex", "cl-lib" ], - "commit": "a81e7588448f85c5fcc3f3fc71cf957d0928a656", - "sha256": "0sajg5vmygnkcnmkrpf8r7c4b8v95hgsv1y6pz868jpznmldnxkb" + "commit": "81507c1b63eb3898b654818de047544f662c1f73", + "sha256": "108qr3w3y183sd9m5kjhmjylmqhwr34pkqvfqkszfcrrj5lq3sq5" }, "stable": { "version": [ @@ -70222,20 +70953,20 @@ "repo": "X9hRRDys/latex-labeler", "unstable": { "version": [ - 20240730, - 634 + 20240827, + 2337 ], - "commit": "9912f11ac683baa2336726d22ba1942c0c159106", - "sha256": "004bwy0hg9wrm4a2mkh511318h05v5a5dzk38pni2iy7lh1sa67j" + "commit": "6ca15d7dea4f8b2fc0878f6be19438e84061e894", + "sha256": "181r4j7rpjxwyisssdrkdbgjfyzbm2y9lnik8qzn12cy4634p6gk" }, "stable": { "version": [ - 2, - 1, - 1 + 3, + 0, + 0 ], - "commit": "9912f11ac683baa2336726d22ba1942c0c159106", - "sha256": "004bwy0hg9wrm4a2mkh511318h05v5a5dzk38pni2iy7lh1sa67j" + "commit": "6ca15d7dea4f8b2fc0878f6be19438e84061e894", + "sha256": "181r4j7rpjxwyisssdrkdbgjfyzbm2y9lnik8qzn12cy4634p6gk" } }, { @@ -70484,26 +71215,26 @@ "repo": "christophermadsen/emacs-lazy-ruff", "unstable": { "version": [ - 20240402, - 2200 + 20240911, + 1201 ], "deps": [ "org" ], - "commit": "c180bb6b0a1d9a65f8963d1b67f09086412bd95f", - "sha256": "1g22lqhp1zvikw5i9r3njsfyy4mn0n9xhiq514k9hgvn6y4rglvz" + "commit": "7bf9650e9a2df381043ba26ac8930d0a8902dc6e", + "sha256": "123l4p7wanwkdz8w5r7rxd9qvfr88kyy9a9xfpgiadagvx3kpkxw" }, "stable": { "version": [ 0, - 2, - 4 + 3, + 0 ], "deps": [ "org" ], - "commit": "114fb5a892a89b5736df5bbf59eede0bede0f800", - "sha256": "1a2sn0jjcdya9d2z2r4banybkynwcrg96khnlqixkm0q7zbdasw2" + "commit": "7bf9650e9a2df381043ba26ac8930d0a8902dc6e", + "sha256": "123l4p7wanwkdz8w5r7rxd9qvfr88kyy9a9xfpgiadagvx3kpkxw" } }, { @@ -70857,11 +71588,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20240804, - 1623 + 20241007, + 1655 ], - "commit": "a6be7a2d79281a442ce5abd3f073b6c20d7d11d8", - "sha256": "0faj0q9amfisrjzf7cb0idnsyiw1sf4ravgjlh0k24y0mx25j1xw" + "commit": "9be25db0566d495299eaa8595eb4b6dd6b7a1080", + "sha256": "0ybviqpqb2c1ai3ffizqgwjsmarxbg4qi4b6lfnfgczinslnh0fm" }, "stable": { "version": [ @@ -71235,10 +71966,10 @@ "version": [ 2, 1, - 4 + 5 ], - "commit": "f3c0f02d2776b125bad33b3935e2118504bed0a4", - "sha256": "0yyh8jmdi7c4y6vjrk3zw4iy7iyqcs5h88hx96ml9dx2im2aydlq" + "commit": "6616ce0127b564eadf05c2e8ef654668528fc675", + "sha256": "00k96ark82x63v28fa8qyc735a2v4c5q4grxf7wywrw1521fmnaz" } }, { @@ -71324,11 +72055,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20240515, - 255 + 20240927, + 141 ], - "commit": "c5839f541763f661a4d46784f3f14adad28ee2b0", - "sha256": "1h4q0nmckfwl2cmp1kaj83ac2lzpdwq7m3r8q722zd05lvnm145v" + "commit": "23c0caa1bf73f4e9ab58d52dc46cf21088dc6c54", + "sha256": "0zq39p51mnpi3gy6pwkzs7sck56w4y4rwd2cxzm7pk9rldj18ab0" }, "stable": { "version": [ @@ -71700,20 +72431,20 @@ }, { "ename": "link-hint", - "commit": "d24b48fe0bc127ae6ac4084be8059aacb8445afd", - "sha256": "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "0a47b7w8i31fdv4v7q42igszzsq5crlzrfn0aaxszp9xws1p67c6", "fetcher": "github", "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20240803, - 1223 + 20240903, + 2150 ], "deps": [ "avy" ], - "commit": "eade470b2fe35b36b2ab3cc1c5f87792954063a2", - "sha256": "1mkishny6agg02ilshl6apz80hvwibs22yhn8394jpi0iwp8y7yk" + "commit": "bf4ca2126d5c0a06df7ae26f478e94cb03ab932b", + "sha256": "0d3zi7mc4vr60haidb4p4jhfwxwygirpr7kyk8ggpbwh0r2i6k3z" } }, { @@ -72250,15 +72981,15 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20240513, - 1200 + 20240823, + 335 ], "deps": [ "dash", "s" ], - "commit": "5e8ce01ff3d85ff81f366724330026d68449bc19", - "sha256": "1jfd2d2qzk6cprwynmk6v5409hgrgl310zv5vbgapq06j49gzriq" + "commit": "4fe134d60cf725d8e2ab0cde9b9db963e70abcae", + "sha256": "1vxfdc7hdq85sy3xpqnvlhjsbsgllin5gqh4v6b073rza81mb8yi" } }, { @@ -72524,11 +73255,11 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20240817, - 1039 + 20241003, + 1906 ], - "commit": "732389e3886b510c2661d7d4fd65e01837211e8a", - "sha256": "0c5dbslbfyj6aa8pssxwkbzdgsajhrjfm5hsy1qlhb3iasapslfc" + "commit": "8fdcde4aafbd6d5768fa135d9e2a7bc1ae95b23a", + "sha256": "0rywy2awnixap2brp9p6pp6xbgpljjzl27snx92vq5znwx3iln28" }, "stable": { "version": [ @@ -72968,28 +73699,27 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20240421, - 705 + 20240924, + 2033 ], "deps": [ "datetime", "extmap" ], - "commit": "090fd9a5817ccce733d5aa496b6ebb462560a717", - "sha256": "00kwka83kr4826393wjl0skhnzay8b4bfnn7dafv6zzqc84s3bi9" + "commit": "8e020b9296b8e1adc810ebc9d36985f64d93dbc2", + "sha256": "1hkjb37kjw34611n83f384si2623wgd5kx85yw8pvhk2shmrn00h" }, "stable": { "version": [ 0, - 17, - 4 + 18 ], "deps": [ "datetime", "extmap" ], - "commit": "56591f85ea145a46fa532f4a6ec5b724922d32db", - "sha256": "1jd2179wm44f1gxh8qsrnv6nldaz4xzgp4kpamjd53n928s16q10" + "commit": "0f957d4b8766f6bd927966090d0a0a311990dc60", + "sha256": "0pfva621bgz7hgcdp6jp9fzvafxxjz1y9npjgkz7byydvy64j2vv" } }, { @@ -73125,8 +73855,8 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240818, - 245 + 20240914, + 1445 ], "deps": [ "compat", @@ -73134,8 +73864,8 @@ "seq", "stream" ], - "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", - "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" + "commit": "7d76cee0a1c05f64457466fc183bc51497bc2633", + "sha256": "1spnn8z98z15wjicdv2i9y6xxkjx31bjhnxma3dmhsklhf9fv4xa" }, "stable": { "version": [ @@ -73223,6 +73953,21 @@ "sha256": "0wwx1vs7gw8f3p63ql5mf311iydxlzar7wzbvig14k785rfzq69c" } }, + { + "ename": "lox-ts-mode", + "commit": "92cee5819fc46d2c957a0ca2e3c1b795fcd24677", + "sha256": "1zjfq363x58kakr2np2l63pf5awq0g0d9qrlm7vs2if3ih6xnx0n", + "fetcher": "github", + "repo": "nverno/lox-ts-mode", + "unstable": { + "version": [ + 20240820, + 345 + ], + "commit": "3a482f6a96318d617d35683089d5edb405cd0752", + "sha256": "1dg6dpw3zx5pai483h4vxrl76bd4av715gz62z04q5jyix4yvcv1" + } + }, { "ename": "lpy", "commit": "e0e7941d9efc303b8cd5d3e7b29606316307fd8b", @@ -73405,15 +74150,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20240729, - 1637 + 20240921, + 2345 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "85a82c9cf4a7ed4be339e80a98cf41cbf2c999d3", - "sha256": "1r4dvmhl7hq841l0iil2q2rjyzqipkk3sp9lrdb0f04p2wl3pzx4" + "commit": "d229fdcd25a2d557d9d05a74f6fb4731e1341671", + "sha256": "037y70bri8ncfw1znj75px3pywziv3sg9fcnd8d6zz1zvqj1dkn0" } }, { @@ -73600,15 +74345,15 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20240803, - 1436 + 20241006, + 800 ], "deps": [ "consult", "lsp-mode" ], - "commit": "2f45606dce911ebc45a42cbbaa01973b8caff4ec", - "sha256": "1wslncvjrcvw7xjjpiyfy8avn30xa2n7jv01lqp66s0jmg7f9pln" + "commit": "36a37a8e0a6b0edbea8e67dab89d12980d2a368f", + "sha256": "0yfmqjp1bmp8rp9vl9y5qmic3wr2f5p10gyb2rlmpgfnx5c8575g" }, "stable": { "version": [ @@ -73664,8 +74409,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20240508, - 627 + 20240821, + 1959 ], "deps": [ "dap-mode", @@ -73678,8 +74423,8 @@ "scala-mode", "treemacs" ], - "commit": "fa4072cbe7a7061cdb218b9a3619979f7facba0e", - "sha256": "0zwf5x80y54vdpvglnbk2rrwiabl82hiingig70z99a3707lxx3k" + "commit": "0dc938be1190d147e7013e3dce08ac8bff5d1662", + "sha256": "06fbmw01ax5rybkhxya5fs6ndjx3p7zn6rjhxr0124dqhmq2jlzh" }, "stable": { "version": [ @@ -73709,8 +74454,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240817, - 1400 + 20241014, + 1431 ], "deps": [ "dash", @@ -73721,8 +74466,8 @@ "markdown-mode", "spinner" ], - "commit": "12befaabe4a1bf8a548bc820faa192be8ee89533", - "sha256": "1p0sbcip9vzds2cpcq5r6zqnfn5g84gl9dmmkpgaws403cwz9fia" + "commit": "8200fa1e71f16e10f42fce95c47822c4bd756df1", + "sha256": "0iq509iiy1xpdhpxk80v74lmwby2i1nl46iszlc7d07c2wvbjdm1" }, "stable": { "version": [ @@ -73870,21 +74615,21 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20240710, - 611 + 20241011, + 1620 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "b3ed995c335e4195f35322645c2624fdd95673fb", - "sha256": "0f8rg6p81rqsglzpgkm97sixgzp76hn0j54q4krrs2gm0cs1651b" + "commit": "327edcea22b27b8ea133aad678123f6d177e247e", + "sha256": "0k2j7rskc2z1jv70qj0wjcksnpzgdaga64c0j0a7hfkk93hidqwb" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ @@ -73892,8 +74637,8 @@ "ht", "lsp-mode" ], - "commit": "3598bc7c47c2f2ff6fc94ca50b5a4e4db4c25f97", - "sha256": "020njrx0g4isjshldq4gd3f0jp6h3xgk7xs0n0a7czp5hakx9p3n" + "commit": "bf27f1959460661648ecaaee4b5701bc003e3003", + "sha256": "0hqkpn8hhpcvmc6wanh5r84j73sx3byx60indpm6dlhwhszcbx5s" } }, { @@ -74049,14 +74794,14 @@ "repo": "emacs-lsp/lsp-sourcekit", "unstable": { "version": [ - 20230815, - 717 + 20240905, + 218 ], "deps": [ "lsp-mode" ], - "commit": "1cd5e7d2699598a97bdbcd289d9a88b249db474c", - "sha256": "173xqk02k3sh0xblnj12zyj8fh79z1my4vm0yv5mdddyq15b1pqy" + "commit": "63ff1ab638b655089077d17fdd728a48f8906e02", + "sha256": "1vy7bjazsgkx01gg1qvvipphzxgn20w6lrwhqj0yhfz9ablhcd7p" } }, { @@ -74262,11 +75007,11 @@ "repo": "hawk/lux", "unstable": { "version": [ - 20230823, - 844 + 20240108, + 1004 ], - "commit": "f3b8efa86568e88c71da92fd44b1000bfe006825", - "sha256": "0z9qkdkn4mhpxv9vl3jwdmybl7507lvdiw8mp4hixrqkc1cck1hl" + "commit": "322f50143d164cd1375c9f5b432cd19095aedbad", + "sha256": "0k8sbq57njsn1visjjl9x1il4grwdp9wxhly9q3ffgsl36qfcx3b" } }, { @@ -74665,14 +75410,14 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20240814, - 914 + 20241013, + 815 ], "deps": [ "compat" ], - "commit": "e4b0ab1e97095973e7c40fed20e3acbfa1172823", - "sha256": "1mkikn2wx32c1q7dbdnrr8r2sd02k4id5803lv7lbgc4h6q0n424" + "commit": "d2bf2ae285080173d57525ee59ba48f15494c8c0", + "sha256": "1vxz8ys55krbdks081vyrvsqfycvnzfj6bf3g1mxak8jc6xsdvvp" }, "stable": { "version": [ @@ -74689,44 +75434,42 @@ }, { "ename": "magit", - "commit": "3126dac37def07fcaa667a325ee79349fb80d285", - "sha256": "1fk4h891k1w6q0v6bbwlisfb0wc0pmyh2jxdf23v7crd2fc36wcc", + "commit": "9bfbc7128c60f9439d3846520a3e3def20ca80e6", + "sha256": "15zbz1kj3f8gm88ql3hhm9bs5py696zq6g6msjlqg40dyyw0r2x1", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20240819, - 2250 + 20241010, + 1930 ], "deps": [ "compat", "dash", - "git-commit", "magit-section", "seq", "transient", "with-editor" ], - "commit": "6234c35d80e994ce93a98a958be99c367dc10171", - "sha256": "16qm1lmy0qw05nmwz7c0ymg9753wsp1yy7hwha918gy48m1j4ild" + "commit": "66731bda44f3e7810306f2910f18fefb348415ae", + "sha256": "1jmxi7h138wypm822r89qns64xxbgrpswx47gnr24k3kq9mr9s00" }, "stable": { "version": [ 4, - 0, - 0 + 1, + 1 ], "deps": [ "compat", "dash", - "git-commit", "magit-section", "seq", "transient", "with-editor" ], - "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", - "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" + "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276", + "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn" } }, { @@ -75280,36 +76023,36 @@ }, { "ename": "magit-section", - "commit": "3126dac37def07fcaa667a325ee79349fb80d285", - "sha256": "0jagkxhk7yr5hl6gfxknhk86nghyxm2wp89252r3d0mzf0p6gpsf", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "1d32glmgpn5cpkfgdb9m4h5k8vmzyg3ixcb7rwql3rmjvns9i9kk", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20240819, - 2250 + 20241001, + 2052 ], "deps": [ "compat", "dash", "seq" ], - "commit": "6234c35d80e994ce93a98a958be99c367dc10171", - "sha256": "16qm1lmy0qw05nmwz7c0ymg9753wsp1yy7hwha918gy48m1j4ild" + "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276", + "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn" }, "stable": { "version": [ 4, - 0, - 0 + 1, + 1 ], "deps": [ "compat", "dash", "seq" ], - "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", - "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" + "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276", + "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn" } }, { @@ -75335,15 +76078,15 @@ "repo": "stacked-git/magit-stgit", "unstable": { "version": [ - 20231226, - 1514 + 20241012, + 119 ], "deps": [ "magit", - "magit-popup" + "transient" ], - "commit": "59d1eb355caf4adbbdf1e351f5861de61b0b5efa", - "sha256": "0inv7xcm9nf3q5cf2l0vmi3kgwak4xbp3nk8ksna0nk8rxqwpy5v" + "commit": "51168b7438dfb5ca6b9239b8564397cc0cc6e798", + "sha256": "1z2dhc1m510iyrks5lxp3jlqg4n7qwwirbmxg4c4ll0xngfhnalc" }, "stable": { "version": [ @@ -75429,8 +76172,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20240519, - 247 + 20240927, + 52 ], "deps": [ "async", @@ -75442,14 +76185,13 @@ "s", "transient" ], - "commit": "501c8db90ab59f8b619618b9d10db2a32a113727", - "sha256": "19p54cnh105k06d63avbqwq8bbnk4hl5ff5vgq3lcx005qvmpc43" + "commit": "bd27c57eada0fda1cc0a813db04731a9bcc51b7b", + "sha256": "0q3rplkvd4ny02zpnrzkfhflg8yx7zq2brq15c603f2yjiwiy7xl" }, "stable": { "version": [ 1, - 7, - 2 + 8 ], "deps": [ "async", @@ -75461,8 +76203,8 @@ "s", "transient" ], - "commit": "a9f47dd8ad81b96be866bccd6c99358525408b4e", - "sha256": "1ygn1498ji785bkbi7ziazk1bkzinq5srpjh2yhw70v3cr5sfk8g" + "commit": "4c17b73355ad0f6537bec5776154ee7465a4c2f8", + "sha256": "0rjr5q73609bs8gx2h5lp7c7bk5nkplfqfd56ifwdrdzdfzn5khy" } }, { @@ -75878,11 +76620,11 @@ "repo": "Iacob/elmame", "unstable": { "version": [ - 20231021, - 1522 + 20240828, + 1559 ], - "commit": "04322e0b036198112417cf688ddf6b711010561e", - "sha256": "15slirx6x9rp2dfkphzrw3v09m2wbz6my8zkhf7cnlfdb9fmkhbi" + "commit": "7c727999e03932fc65cabdbe2161efbe06ff1274", + "sha256": "0j6kd6y0gm4c29mxybdi7709v1y4qndp20cdd78l5b137fyliqmr" } }, { @@ -75911,11 +76653,11 @@ "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ - 20210108, - 1832 + 20240925, + 754 ], - "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", - "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" + "commit": "6d9458e275699f7d360b703c8919d350524ee2fb", + "sha256": "02wa8n781684rjr57sn70ypib6hh53dfr5ihv3ljdhxkr3nzby50" }, "stable": { "version": [ @@ -76117,14 +76859,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20240813, - 701 + 20240926, + 918 ], "deps": [ "compat" ], - "commit": "c34fdacce64168cb20d710a87e66cc9d1f795a82", - "sha256": "11d1rf0yanknf85vrn0qp6flfrscx82zz3j0czypbgdqxcqjj08y" + "commit": "be2e57efff640880251c082ac93bd365b7202e6a", + "sha256": "1r1gyjk6f4628xhl6mj811507da2zyagn6hvrsvvvsvj5bgwxhsj" }, "stable": { "version": [ @@ -76259,11 +77001,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20240716, - 249 + 20240829, + 324 ], - "commit": "8a7773f87733866a961ea4c518a4a2f283f21970", - "sha256": "0nm6s8bw390zynwx4agc11gzqj515sxpzjqyih22lxlf4mmwmqqy" + "commit": "6102ac5b7301b4c4fc0262d9c6516693d5a33f2b", + "sha256": "0zbbbiqna372h06c3xj8abrh8nixrjig9ip09m342saa4mcr6c5j" }, "stable": { "version": [ @@ -76604,28 +77346,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240816, - 709 + 20240920, + 1839 ], "deps": [ "persist", "request" ], - "commit": "3443b49c55f65ae8e0b07e93e1e0299ce1bf8ed6", - "sha256": "0564nylzj5ysjma3vnphga6ngds2s9x4410qg3yqgy5caxkpz321" + "commit": "e593ad461ae275c641c6c4c90f67d62a920610a0", + "sha256": "1jq54rz27xabwswwas9j254r9ldymza2la288vbh2w0nfbmnr1m9" }, "stable": { "version": [ 1, 0, - 25 + 27 ], "deps": [ "persist", "request" ], - "commit": "45903de823d3c6b46c4aa694112e9f5429e1a3f9", - "sha256": "02ykj4hyddd5p0idl8gvgl9q770vni69xsza99y3rpyilc2a8r66" + "commit": "e593ad461ae275c641c6c4c90f67d62a920610a0", + "sha256": "1jq54rz27xabwswwas9j254r9ldymza2la288vbh2w0nfbmnr1m9" } }, { @@ -76763,11 +77505,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20240521, - 1748 + 20241006, + 1633 ], - "commit": "a78b368387c85437f8de187acf0a2b1cbeeacc3f", - "sha256": "1aw1xm0dawppzr8vjnry6rigvxx204h1msrxjxsvnljr4xr9i40h" + "commit": "c021c7f7c95f01bf9b0f10ee1e466658e3e65a1d", + "sha256": "14j33vr2lnxnkby5pnpzslph797rqp0dzrz0jpg3zh3n7jh0k84m" } }, { @@ -76878,11 +77620,11 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20240229, - 730 + 20240831, + 2003 ], - "commit": "13517d8bee3001d6208ad5255237880f19d4f1e5", - "sha256": "1rnrx8l91f96k719zkjxnz3hr6wasl6x5m4kkkhzk3iqgvvpsnys" + "commit": "9f94a465183974404fdfdc8b7659fc3fe00e8a71", + "sha256": "01p7w96amjs1b7b92dr5ma2ry1z5kj8xlxsx78grlryvlhmpyhd3" }, "stable": { "version": [ @@ -77349,11 +78091,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20240809, - 1843 + 20241014, + 636 ], - "commit": "0611eba87ae3e86d19e2c4f50988ff2ec935f830", - "sha256": "1my99kfidqvdnd4b2jckwsrwh7lx513zbd8g06lqy6gfqf5qxksg" + "commit": "2f6fac3410640437b4b1aaf1bc373a5c5d558a8c", + "sha256": "0yr3dh85mmk6mhs89rbm00pi3frz756qx3r41q0p1q9l67wp40am" }, "stable": { "version": [ @@ -77403,11 +78145,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20240604, - 1521 + 20240925, + 900 ], - "commit": "bd900fd6cda97cfd10f2bf520848d0a8b0fe35b7", - "sha256": "1866y962v1xpw5klwn9sx8fvfhxg9w5sdj66nms815qkrkd3gvmk" + "commit": "80e919cf32a62acdaee95a5dab9b4bc18a8b4034", + "sha256": "1lwh4pv7an9rfalk9nz2ds2ia09dm69bhsfx28795v7hal46rq80" }, "stable": { "version": [ @@ -77566,11 +78308,11 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20240123, - 1729 + 20240821, + 1750 ], - "commit": "d8bfb8c819cda9ead19c871842f6b0b8d56c56c0", - "sha256": "0vsnyn2g8525k9vgmifzix9gd1g3149h54ni6rrc1y05h91883fv" + "commit": "fc8ae220e8d7769114072493975df821b68df6b3", + "sha256": "0cgcbi6ibwkdhmslab1q0iiiyifgiinah1qv4acg3dm5xwlfpdd8" } }, { @@ -77709,16 +78451,16 @@ "repo": "seblemaguer/metal-archives.el", "unstable": { "version": [ - 20210223, - 1638 + 20240824, + 1023 ], "deps": [ "alert", "ht", "request" ], - "commit": "a218d63b990365edeef6a2394f72d1f2286aeeae", - "sha256": "1mpsc1xvgl6g3bz0dx10i3x5abivna01f1carwyz9w47zs599svk" + "commit": "c474246c0c6b688a34e69c04261d4cd993189dc3", + "sha256": "1fb4i8a7wc6akiiv8d386h4b7lrqvlq1jpy5rzj70jkb092lmnlv" } }, { @@ -77729,8 +78471,8 @@ "repo": "seblemaguer/metal-archives.el", "unstable": { "version": [ - 20240217, - 736 + 20240824, + 1026 ], "deps": [ "alert", @@ -77738,8 +78480,8 @@ "metal-archives", "org-ml" ], - "commit": "9425dc00f2f73089a3eada06fe87eba3802d090b", - "sha256": "1v74ql963mjsgpfh1f75f1a7cb9szzi5720y6p377q8njkprycjp" + "commit": "b7279dd0331cb5da4a8f0aa25378d22e0042dc40", + "sha256": "05s8rwp3qmsxadq3wbwvj0czwkp16vn2rrjpjrrjbd80yh80grwn" } }, { @@ -77861,11 +78603,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20240515, - 152 + 20240911, + 749 ], - "commit": "6eedf619d726aa11f23962e406331b7aba8ac82c", - "sha256": "0rp1zfrh6mdv107fz2d75cgayi18397k53dy40d6jxszbcq32x7v" + "commit": "c46d8ee784d098244abaf162660073d1d4787b60", + "sha256": "03xgwkciyq5yyagam48qhfd2xj4ly0qfjjv67d4adw3c1im8qq66" }, "stable": { "version": [ @@ -77899,8 +78641,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20240818, - 2247 + 20240905, + 43 ], "deps": [ "cider", @@ -77911,8 +78653,8 @@ "projectile", "s" ], - "commit": "c72e41cff7b03e263fc2b850b7e0b6ddbf2267b0", - "sha256": "13b3nvw1f7cb2cxbp94f8il7j01kkjh4jmv0hz0p26zzqabn8x8g" + "commit": "8d00ada6daa5617fa60f76e0be2cf2f5d1babcf9", + "sha256": "0ncilsn0ih01w6hjdn529jkapiv4nnkway07j2b5fndkrlgk2ry4" }, "stable": { "version": [ @@ -78152,14 +78894,14 @@ "repo": "countvajhula/mindstream", "unstable": { "version": [ - 20240803, - 126 + 20240908, + 2036 ], "deps": [ "magit" ], - "commit": "6a7d7b4fe496ff6bec27d52addd23947f81cb843", - "sha256": "05gpmaqb54xxy38lxaarh6l6i2hnyg1mh2ycsh8bxaiklslavzm6" + "commit": "cdcd2d234dec2c143c4e5a302c8ffde59a864f72", + "sha256": "0fg41gjf1hz533gbvshhrfkzk78pyvhahf4h7kp1vrzlndxhnqfm" }, "stable": { "version": [ @@ -78214,28 +78956,28 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240816, - 2131 + 20241013, + 438 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "3f97d443554a7e98b68e541e2886f8a64f54d8b2", - "sha256": "0pjpa7cf372ps680isrqpnfz0ayzp88gikgm4a8grsx6wf9qgd3s" + "commit": "83b6c6f36d318943f33b347b87f8ce6bdc0cb852", + "sha256": "1vkm5r5hbbysgp5hvjbym42d0m4v5jbanbb89z9l87rk17n90cjr" }, "stable": { "version": [ 0, - 11, - 1 + 14, + 0 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "b556c0fa68dad76a478bd3f508e0501aa6933689", - "sha256": "1n00jpr6hyv1hwx36whpim6kzrybk236fhzj6dgnm6icarfmfzfa" + "commit": "95d1abc3cb7d468dccf6b624fac574e6cffe6e5e", + "sha256": "1yvrwdni4dsqb19rqpb4sy1brx5jg13v2m4l9gqvb2v9mk9al681" } }, { @@ -78645,19 +79387,19 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20240429, - 1645 + 20241013, + 1752 ], - "commit": "bf68d5b52d9dfae68c83340cabea2681057e82ea", - "sha256": "0a95xjlhb1963cqqxcikf4k31mxkbbksnfbnnmrc5zl63b9ykpww" + "commit": "92ce320189c26b7368df5b52a8338c126eb5b7eb", + "sha256": "0byxmxaqmh8v008al2420rw3ibwyf2jwk0ylfpci2h27r2cmpx9y" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "71a027bba1763b9d58a3af30b9651bc463890911", - "sha256": "0nw6fvsl2bsqdmzdcdmq2nk3j8a3k6cyjb06b5907dmirzql41x3" + "commit": "d2e1ba09bef4d8cac31c4128c29fdd275f065988", + "sha256": "1j7ylsmly1ifq6qlx8xaxsd8cy7s47rf9zndcxg3xwj718mwdhdk" } }, { @@ -79242,20 +79984,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240811, - 502 + 20241007, + 1332 ], - "commit": "3002f6fb64e147ece4284880ffa93c6c3baa0e75", - "sha256": "15sv711y34h6w5lzbkyvvbyh5j02288p5iqj3jngl1qsdz7xb79m" + "commit": "817ff75d11599b65acf583e0f8b5d69163550299", + "sha256": "0jd9xdc5d56zdvxqgmgg2wimn3ds20vw7ss0jhakl31ndr8izbp9" }, "stable": { "version": [ 4, - 4, + 5, 0 ], - "commit": "a082d7739f627523c6d9098c869cf143fa60b014", - "sha256": "1vy6wyq8hv8fih4m8m1k9n7fdp913nmv0k5g8vppnjivmnrwfswy" + "commit": "db70c2ca923261591419de084f9e4c806b409b60", + "sha256": "04nr06w7zvvkk0m368pkp4pdlv6m91qnxizrvns2530prddb4c7i" } }, { @@ -79493,11 +80235,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20240710, - 1027 + 20240911, + 1046 ], - "commit": "9222cdf8209f0c3329f857ccb9edc1c79b06041a", - "sha256": "19zv7q9ixrvf3qbfj8xchcn7n0in6rpnkl4dd2vzbvic2lhg7nnr" + "commit": "dacd9d8a8867afea3ed76b15a6c997053ff88093", + "sha256": "106yfyj8nv2v7valy2v5l39vj001wfswa3bnmczwmpjvfcsh98qh" }, "stable": { "version": [ @@ -79731,26 +80473,26 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20240805, - 1424 + 20241001, + 1022 ], "deps": [ "compat" ], - "commit": "b75fe54906eaf70143526c3d74930c811c819aa0", - "sha256": "16hxkva618fy7kyvnkawbkfds80dd433nld18kb1m0pvzs4dv2ga" + "commit": "cd349e401fd55ce2eab21fb02474ae8aeee39252", + "sha256": "13rph6qll6r727kf8hkzmpjavr9a1svzyjz11f4apmdf6bpab2pw" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], "deps": [ "compat" ], - "commit": "b75fe54906eaf70143526c3d74930c811c819aa0", - "sha256": "16hxkva618fy7kyvnkawbkfds80dd433nld18kb1m0pvzs4dv2ga" + "commit": "cd349e401fd55ce2eab21fb02474ae8aeee39252", + "sha256": "13rph6qll6r727kf8hkzmpjavr9a1svzyjz11f4apmdf6bpab2pw" } }, { @@ -80218,26 +80960,26 @@ "repo": "sp1ff/mpdmacs", "unstable": { "version": [ - 20240210, - 1526 + 20240917, + 310 ], "deps": [ "elmpd" ], - "commit": "a401e2331300f79f9c4edc6fae46982d560c74fb", - "sha256": "16nsci7dfak6yzwiv28ld17m1f1gx14wzq3jvmxbirm97bv21pwg" + "commit": "fca8374804216fb0533b5cbe92199dc4179033db", + "sha256": "0g2fyrl2sbdf1hp09cx5waqm500q3jnyiqm90544yn8cvzzavc95" }, "stable": { "version": [ + 1, 0, - 3, 0 ], "deps": [ "elmpd" ], - "commit": "a401e2331300f79f9c4edc6fae46982d560c74fb", - "sha256": "16nsci7dfak6yzwiv28ld17m1f1gx14wzq3jvmxbirm97bv21pwg" + "commit": "fca8374804216fb0533b5cbe92199dc4179033db", + "sha256": "0g2fyrl2sbdf1hp09cx5waqm500q3jnyiqm90544yn8cvzzavc95" } }, { @@ -80436,8 +81178,8 @@ }, { "ename": "mu-cite", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "0xgianabxkic7riqsh9r5cm07b3fza8mvi82x7l87xyam9xi0pgg", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "15g09apnaja71iyy379p3ic4vxm492vdbw4i40s5cmx9mr7bjmb0", "fetcher": "github", "repo": "ksato9700/mu-cite", "unstable": { @@ -80475,16 +81217,16 @@ "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20230722, - 1746 + 20240911, + 1952 ], "deps": [ "alert", "ht", "s" ], - "commit": "6beda20fc69771f2778f507c4a9e069dbaf1b628", - "sha256": "19z6539nj7rkrhljvzg468pp7gy5vgpj3hsxhfqp0djjm34gppnc" + "commit": "d36eb0c1842dea51ee0465bb3751948c8886617c", + "sha256": "039kfpwgw0vi6fv2p4ixdh9qx9hdsahl48yl1niq00zmsp7rgg07" }, "stable": { "version": [ @@ -80655,31 +81397,29 @@ "repo": "danielfleischer/mu4easy", "unstable": { "version": [ - 20230629, - 1721 + 20241008, + 1920 ], "deps": [ - "helm-mu", "mu4e-alert", "mu4e-column-faces", "org-msg" ], - "commit": "bb9f5df374723932c848f8864c86d7b0ceacc82c", - "sha256": "0ilmrwg17pfan2v999gla180p3krbfq01r4n6df4wg1h8k8d6kr7" + "commit": "f104605240f479f14d9f3dc0d712e71561d81896", + "sha256": "1mzmdgh6lkn2ac0flhg17lxw46v0rsa34r6wmhxzw7zak5hfcbqp" }, "stable": { "version": [ 1, - 0 + 4 ], "deps": [ - "helm-mu", "mu4e-alert", "mu4e-column-faces", "org-msg" ], - "commit": "bb9f5df374723932c848f8864c86d7b0ceacc82c", - "sha256": "0ilmrwg17pfan2v999gla180p3krbfq01r4n6df4wg1h8k8d6kr7" + "commit": "c23930ce118ba498584e3b373f24c09aebdd0f45", + "sha256": "1i2ygnk9xzldqpzqjyir10n2hjv7i3xcqscafvnz89vh44d1fsrc" } }, { @@ -81858,11 +82598,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20240628, - 1901 + 20240909, + 2007 ], - "commit": "14e0a434cffa5688992b30d1b29bb21c561f8cd0", - "sha256": "14zrrvwppv12wj6rrp1agsmbpx9cmx1zr03jpc9162xz7sdq1szk" + "commit": "157bd9c23508c4b0b8636c9a6d9b6ecc6209d4f0", + "sha256": "1396il9646d4wkyc8bbl2baqq4vwaqp7la9s085g9qbk41g619lp" } }, { @@ -81954,26 +82694,26 @@ "repo": "DamienCassou/navigel", "unstable": { "version": [ - 20230903, - 835 + 20240901, + 1624 ], "deps": [ "tablist" ], - "commit": "31320a6433093ca860508beee9f0e29a794c51ca", - "sha256": "0avpclzq52lqm49f7dnmjafyw1725jy92h2w24syb50dmnb44kvh" + "commit": "5f2f2ecfbd91c35bfbe4946915462872acf58310", + "sha256": "0fszhjf6bj8frvlnim86sfv6sab3qyignxqh8x6i4bqgwnb6svkf" }, "stable": { "version": [ + 1, 0, - 7, 0 ], "deps": [ "tablist" ], - "commit": "2695f1df2260398930319095cf6b6a49ba98d6a5", - "sha256": "0v9f7wb6yghds3hjj8x5di6gfa8n5kjwhav7la1ca2zwgs2c1a9p" + "commit": "5f2f2ecfbd91c35bfbe4946915462872acf58310", + "sha256": "0fszhjf6bj8frvlnim86sfv6sab3qyignxqh8x6i4bqgwnb6svkf" } }, { @@ -82260,14 +83000,14 @@ "repo": "rainstormstudio/nerd-icons-dired", "unstable": { "version": [ - 20231214, - 2155 + 20241013, + 212 ], "deps": [ "nerd-icons" ], - "commit": "c1c73488630cc1d19ce1677359f614122ae4c1b9", - "sha256": "1ln73ii7c3chl4lvarwiwrdmx49q528wc0h6a7xbl68pc2pyyvq2" + "commit": "c0b0cda2b92f831d0f764a7e8c0c6728d6a27774", + "sha256": "1iwqzh32j6fsx0nl4y337iqkx6prbdv6j83490riraklzywv126a" } }, { @@ -82495,11 +83235,11 @@ "repo": "vekatze/neut-mode", "unstable": { "version": [ - 20240610, - 2326 + 20240929, + 553 ], - "commit": "c723e0a2e1f14b7f41d824ca354b0590399e2bc0", - "sha256": "0gcw7s3phyyidll37dm7cfrrvj7b7j5iqsbam5a0lpbi1p38rnlj" + "commit": "4c2d56fdd6295589439ffef214666452cc45c7d6", + "sha256": "0870c7wmvk1bbh1xh826qgjcnizm662db8n8i9iaqh0dslmr0qd3" } }, { @@ -82817,8 +83557,8 @@ }, { "ename": "ninja-mode", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1v6wy9qllbxl37fp9h47000lwp557qss6fdjb3a1f20msg8f70av", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0r0hjrw79bj67r79kfqikcmxnn93d324l3zlh203kvnzvrggfwra", "fetcher": "github", "repo": "ninja-build/ninja", "unstable": { @@ -82966,8 +83706,8 @@ }, { "ename": "nix-sandbox", - "commit": "66be755a6566e8c0cfb5aafa50de29b434023c7a", - "sha256": "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k", + "commit": "258a113cb0f7902ca083c931c064c093b3721b52", + "sha256": "1kiscg761zx4mnq2hksfzmdz0g9b7z7lzm8ncy0dgs40yb803ijv", "fetcher": "github", "repo": "travisbhartwell/nix-emacs", "unstable": { @@ -82991,11 +83731,11 @@ "repo": "nix-community/nix-ts-mode", "unstable": { "version": [ - 20240710, - 1039 + 20240930, + 651 ], - "commit": "59ad17690576190811e0746c12ad6809596ca3ac", - "sha256": "0c9hxvh8v1pz4ni087dw84wzr7db057fgb37rk1qhjca0yq01mhf" + "commit": "9419d014cada54d34e5004e24a31462e8597fd28", + "sha256": "192j4ypqkqnk37bsi9dv0z1mss2pmhmk9x654afyh1mgag30klwb" }, "stable": { "version": [ @@ -83286,26 +84026,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20240812, - 1522 + 20241001, + 1020 ], "deps": [ "compat" ], - "commit": "d80f442c15a1e81ce939891bbb4497a0559831b9", - "sha256": "0mxy4gz53885kz4z4irni7hjigcmw16672fwwha33lyrd3822a4g" + "commit": "7474c55122f568212103efe325f347ee05878f70", + "sha256": "04vwi1w6j80s2nlz7r1md82fxdckryncr93ixrif4xzqdwlbb0x9" }, "stable": { "version": [ 1, 7, - 1 + 3 ], "deps": [ "compat" ], - "commit": "8658ff9a6f27512218fdbf7bba328917a27d5a47", - "sha256": "1ldsyzdnc79byg07j2fckh6m48iq8ffp19y6chhhi2dci35zard7" + "commit": "7474c55122f568212103efe325f347ee05878f70", + "sha256": "04vwi1w6j80s2nlz7r1md82fxdckryncr93ixrif4xzqdwlbb0x9" } }, { @@ -83687,8 +84427,8 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20230820, - 2157 + 20241011, + 1212 ], "deps": [ "dash", @@ -83698,8 +84438,8 @@ "s", "websocket" ], - "commit": "7e8b73b621db7494a22914b16c614ef80521f7f7", - "sha256": "06aqqnzwjb0ldy2k00qvy7iv5ihsx5vwbcqvnmwv3rh5xbzdhsnw" + "commit": "d08eed8555a619a13aa99cfa2ef40e199e86114c", + "sha256": "104ds1h8pi3qdjqq1d8gsgkajq29025hg7hgs9lrg63dw591b66z" } }, { @@ -83779,28 +84519,28 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20240805, - 1915 + 20240831, + 2204 ], "deps": [ "compat", "notmuch" ], - "commit": "0d07e6fc9aff0f632a0d8aa9bd91ffccbef34e3b", - "sha256": "19bln0zyzixzibd94m3fhpjdi1yg81hhzchlb12dr4qqllq2wrb7" + "commit": "815e18e6d2a11833af616dd1915c550c26104da8", + "sha256": "0chb83flik38c9xlpxlfz50iii9cqla0ysbby5vhbw69yqc3wxnq" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "compat", "notmuch" ], - "commit": "0d07e6fc9aff0f632a0d8aa9bd91ffccbef34e3b", - "sha256": "19bln0zyzixzibd94m3fhpjdi1yg81hhzchlb12dr4qqllq2wrb7" + "commit": "815e18e6d2a11833af616dd1915c550c26104da8", + "sha256": "0chb83flik38c9xlpxlfz50iii9cqla0ysbby5vhbw69yqc3wxnq" } }, { @@ -83871,28 +84611,28 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20240805, - 1916 + 20240906, + 1343 ], "deps": [ "compat", "notmuch" ], - "commit": "f723dd29c836e1288abb99958376a086b9f6197a", - "sha256": "1pk0fwz0jbxcfal0jfa73swpdlbg4y4gc1l7na9qk3c7zi6fid4j" + "commit": "3831751156024603e0ad54a503c22f17cd21ae2a", + "sha256": "1ac78njvfgqjvq4bqk8g6bhlqv6lzyihkhydm242i1sij3psx4f8" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "compat", "notmuch" ], - "commit": "f723dd29c836e1288abb99958376a086b9f6197a", - "sha256": "1pk0fwz0jbxcfal0jfa73swpdlbg4y4gc1l7na9qk3c7zi6fid4j" + "commit": "3831751156024603e0ad54a503c22f17cd21ae2a", + "sha256": "1ac78njvfgqjvq4bqk8g6bhlqv6lzyihkhydm242i1sij3psx4f8" } }, { @@ -83937,14 +84677,14 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20240421, - 2149 + 20240825, + 1528 ], "deps": [ "esxml" ], - "commit": "66820c2c5bec54b080c9d7ed9e777611bae70776", - "sha256": "0vjpq9z7xckrgrwxzidhzy8y7kprc9x7m9fdj5gj3ygp86hhxs2c" + "commit": "bbb5c60bfd6b09cffe0406a56930105335f07887", + "sha256": "1j5yxjcp4510n0xhhrbvl426kzannrbwgck6asnnmcvly9j22pzm" }, "stable": { "version": [ @@ -83961,10 +84701,10 @@ }, { "ename": "nova-theme", - "commit": "16457166c17fb1cc074a34c61e52ebc285c0eacc", - "sha256": "1d2271qd5z48x71pxjg4lngsc5ddw5iqh496p04f63sm08cgaky4", + "commit": "658293ef8379fe0068d6f33538a3e6e9b2e0ecab", + "sha256": "04va166gnvyxsr5jsfn8244fjiqm5h99rzg1wb9vng4xkz4k94d1", "fetcher": "github", - "repo": "muirmanders/emacs-nova-theme", + "repo": "muirdm/emacs-nova-theme", "unstable": { "version": [ 20230906, @@ -84371,31 +85111,30 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20210826, - 1000 + 20240921, + 1901 ], "deps": [ "dash", "f", "s" ], - "commit": "c214762fd6f539ec3e1fd8198cefbdb4b428b19c", - "sha256": "0xcb2k98ka7lks7k0mk9inmjpyz03v8aq64a24pj635xp54x3iah" + "commit": "d33f5b9260426617e27ca79c78d83a5e00073f97", + "sha256": "0ph3ycqk2bkl9s97hx41mkai2lw6c941bxy6clw7nhsky506m9iz" }, "stable": { "version": [ + 1, 0, - 3, 0 ], "deps": [ "dash", - "dash-functional", "f", "s" ], - "commit": "e93e5216e311c665c593ac68c5456d624120ea42", - "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" + "commit": "d33f5b9260426617e27ca79c78d83a5e00073f97", + "sha256": "0ph3ycqk2bkl9s97hx41mkai2lw6c941bxy6clw7nhsky506m9iz" } }, { @@ -84724,26 +85463,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240814, - 938 + 20241011, + 805 ], "deps": [ "chatgpt-shell" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" }, "stable": { "version": [ 1, - 3, + 8, 1 ], "deps": [ "chatgpt-shell" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" } }, { @@ -84897,26 +85636,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240814, - 938 + 20241011, + 805 ], "deps": [ "dall-e-shell" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" }, "stable": { "version": [ 1, - 3, + 8, 1 ], "deps": [ "dall-e-shell" ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" } }, { @@ -85443,11 +86182,11 @@ "repo": "arnm/ob-mermaid", "unstable": { "version": [ - 20200320, - 1504 + 20240906, + 213 ], - "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9", - "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4" + "commit": "9c895330d532427522f13b1b9ca9934c7f90c135", + "sha256": "170776qhwx6nifm4nxcngf9js9x60y0d6mw6qwgxgg3rdcn2p0s0" } }, { @@ -86202,11 +86941,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20230915, - 934 + 20240924, + 756 ], - "commit": "d57fd7cfa878a6862f4dbcf80f98a30d63872ab3", - "sha256": "04hfcyi9nl5ghchv1r3bshq968xxhlkvv1jd6j35mk2jca1wdkmz" + "commit": "f8e16b3d70e5418db11a096108093d2a55012704", + "sha256": "1n0vc32kfmhqpygsqdga64hxvyyygq25g606dpqljydq425ncaq4" }, "stable": { "version": [ @@ -86417,26 +87156,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240808, - 1328 + 20240905, + 1335 ], "deps": [ "org-re-reveal" ], - "commit": "3d6e504e13002c2eea12199fdbdd976650ed20a9", - "sha256": "1hp10aayvpyirfcvc3hq2s4srcgscnh3zhb8cvwc6qymm64grsy6" + "commit": "06538b2073d51197f428f78ff60ebc0e904cc6f6", + "sha256": "1z0jl9f0nj22rqf6izj5k87zas76fxifxx818gazx81vd2xhydxi" }, "stable": { "version": [ 4, - 25, - 0 + 27, + 1 ], "deps": [ "org-re-reveal" ], - "commit": "3d6e504e13002c2eea12199fdbdd976650ed20a9", - "sha256": "1hp10aayvpyirfcvc3hq2s4srcgscnh3zhb8cvwc6qymm64grsy6" + "commit": "06538b2073d51197f428f78ff60ebc0e904cc6f6", + "sha256": "1z0jl9f0nj22rqf6izj5k87zas76fxifxx818gazx81vd2xhydxi" } }, { @@ -86840,18 +87579,33 @@ } }, { - "ename": "omtose-phellack-theme", - "commit": "65e1090cb6953e0f9036378c9357f35566836503", - "sha256": "02mih886mkfag1lxlamma7rl0lvds652gz9zm76iin68p03jslq3", + "ename": "omtose-phellack-themes", + "commit": "2c22446bff957eb07d82feb7e47832072ffafb56", + "sha256": "1sv33znr0www9w01qs9bf0scfw9ar6qyqkwg8j1793qk5a6hss6j", "fetcher": "github", - "repo": "emacsmirror/omtose-phellack-theme", + "repo": "emacsorphanage/omtose-phellack-themes", "unstable": { "version": [ - 20161111, - 2120 + 20240928, + 1241 ], - "commit": "66f99633e199e65bd28641626435e8e59246529a", - "sha256": "0imf2pcf93srm473nvaksw5pw5i4caqxb6aqfbq6xww8gdbqfazy" + "commit": "b96905deb9b2bef097e0c573100874812c1e9aa8", + "sha256": "1kyg55njj19licj4wkp5ahabnbmpjfksv89l75axcib6hj3rgk5k" + } + }, + { + "ename": "on", + "commit": "dcd541d204ff565957bc8866e8b2563064fdfa24", + "sha256": "0k8h3ky4iv2jv1fy0d0vk8fgyqp3agy8dwdjnbmc2m7yp7n5d618", + "fetcher": "gitlab", + "repo": "ajgrf/on.el", + "unstable": { + "version": [ + 20221206, + 600 + ], + "commit": "3cf623e1a4331e259ef92e49154ed0551f300436", + "sha256": "161ivhq7plx15s65dskzfdy28wmiwwjysmjsyli8bgrhjh59bm42" } }, { @@ -87076,11 +87830,19 @@ "repo": "salmanebah/opencl-mode", "unstable": { "version": [ - 20240621, - 1714 + 20240712, + 1835 ], - "commit": "d33ce29c19629e9c2f42e468d2687a475915f531", - "sha256": "085a16i7n5ph2spvvf60pg2bn42nfr017dy4zx6zzhghazmw7xzs" + "commit": "204d5d9e0f5cb2cbe810f2933230eb08fe2c7695", + "sha256": "1x3h187r7waibrx5llsk6irb5afhqsrddb1f9hm3f9saks6n1ldv" + }, + "stable": { + "version": [ + 2, + 0 + ], + "commit": "204d5d9e0f5cb2cbe810f2933230eb08fe2c7695", + "sha256": "1x3h187r7waibrx5llsk6irb5afhqsrddb1f9hm3f9saks6n1ldv" } }, { @@ -87117,8 +87879,8 @@ }, { "ename": "openfoam", - "commit": "f184e09d370d563852da2028b9c2546d6fc162c0", - "sha256": "09i02kqgw3mqvwzj4p23p66rpy30ziz4gxczs8p47l6ilw5j69rz", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1mwlx4gyyyk471vhv2nm2azfl69720p690naqc6pns2clsb429i9", "fetcher": "github", "repo": "ralph-schleicher/emacs-openfoam", "unstable": { @@ -87308,22 +88070,25 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240717, - 758 + 20240926, + 921 ], "deps": [ "compat" ], - "commit": "49d1fdfb80b55699a00b11bc916ad29c0447039b", - "sha256": "0i18n5s52c98z1gjy7hd403f5bkdykifzpvfnchh90rgi24harng" + "commit": "96b74d2450ab4ab1a175d0e86c62f6695c4709b5", + "sha256": "0iiyx105fxd0c54h36ypxcjgirj53r89pl2ivir3mw5q9icq0wr5" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "3847f311077efa17951a786d2759f2639c5f43c8", - "sha256": "1gc3ysa1yhi6pz8bafbdpj0avdhms0rfd1r3k5mrhnm8mgh6zq8q" + "deps": [ + "compat" + ], + "commit": "416c62a4a8e7199567a5df63d03cf320dc4d6ab0", + "sha256": "0yqnbcrf8ai1fivd13d8w619qwjd51rf4pqyakqp2kf02z7m4kpb" } }, { @@ -87740,14 +88505,25 @@ "repo": "zondo/org-autoexport", "unstable": { "version": [ - 20240817, - 623 + 20240902, + 2253 ], "deps": [ "org" ], - "commit": "effe8d6a90e3ab26a7da65e21593e721784b1be7", - "sha256": "16h3rlyxlh09d0j42nk1p1kklb1kgi16767j86nz9xqamfjz90kl" + "commit": "54b5e836c36d8faa9a3cc67ec1fe52f38b2c3c83", + "sha256": "1914rkjpfrmbdvcy1ac487v464bkynzi1vicp7ci2kv4fqjw4rnh" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "org" + ], + "commit": "47acc4a367c621075cfd27ddc3ad7c9282865771", + "sha256": "11a93qs86jxwvwsjvda6c51gg1db1w6zwp2disd3bnplbrsyskdr" } }, { @@ -87860,14 +88636,14 @@ "repo": "alphapapa/org-bookmark-heading", "unstable": { "version": [ - 20240622, - 947 + 20240906, + 521 ], "deps": [ "compat" ], - "commit": "b667cfdde7631c656778473e6c87bc51e46280cd", - "sha256": "06pwxlhqcvz6fb8y4mm54r851x8gcqrwj3pgfnag7ydw881rlqg3" + "commit": "bcab006ec42d7e2c92875c7170df193de2ee55f5", + "sha256": "1lm2rgh4ckvb394mgrx0s6468sc31g57sz0ps8q502lvla1a7ivy" }, "stable": { "version": [ @@ -87890,11 +88666,14 @@ "url": "https://repo.or.cz/org-bookmarks.git", "unstable": { "version": [ - 20240710, - 1738 + 20240906, + 1018 ], - "commit": "23942cd3f14f691a35bfb71e0559ed5eb5100909", - "sha256": "1l61v51hk1bs0rn7r3nw7pjmxccg9ghx1hf4y24363a70wkl45qw" + "deps": [ + "nerd-icons" + ], + "commit": "42e1100b0e99bf91b532d7e06d246a2f2660d853", + "sha256": "0kaawmf3d5smvpgyb411mp5zypznw9q715gz05kbb852y0qw31yw" }, "stable": { "version": [ @@ -88033,14 +88812,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240714, - 1732 + 20240908, + 2256 ], "deps": [ "org" ], - "commit": "9f4db50f06e787737581e9134164837216848fa6", - "sha256": "14vnnnysnqacsfpd6288s8x4g9vr90giy00vfp03gfbq5ni43v2k" + "commit": "6a2683211baa4b4efed0ca210275bf68dbbcfc4f", + "sha256": "16d5kkmclffbv00c1dmshind912gp18wmqzrsaih6qz8kffsj0q6" }, "stable": { "version": [ @@ -88158,26 +88937,26 @@ "repo": "swflint/org-cite-overlay", "unstable": { "version": [ - 20240523, - 100 + 20241014, + 238 ], "deps": [ "citeproc" ], - "commit": "dc23b55c708c6399a12dbc79281110de7681b121", - "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" + "commit": "1dc51ff85aedb1097fd4131d08cf964d2c8bdddd", + "sha256": "0ai7kf4riihph2hsxknb6cqigd3g1n5gmsm8cix1aj2z43bxf4sk" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "citeproc" ], - "commit": "dc23b55c708c6399a12dbc79281110de7681b121", - "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" + "commit": "67f375562d3bba1d31c780edcbf5a9a979c71d69", + "sha256": "0axwvzwxhyh6k4bs0arz55acbnng3p54ynzw8gwmpba61wxlw17q" } }, { @@ -88188,8 +88967,8 @@ "repo": "swflint/org-cite-overlay", "unstable": { "version": [ - 20240523, - 100 + 20241014, + 238 ], "deps": [ "citeproc", @@ -88197,13 +88976,13 @@ "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "dc23b55c708c6399a12dbc79281110de7681b121", - "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" + "commit": "1dc51ff85aedb1097fd4131d08cf964d2c8bdddd", + "sha256": "0ai7kf4riihph2hsxknb6cqigd3g1n5gmsm8cix1aj2z43bxf4sk" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ @@ -88212,8 +88991,8 @@ "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "dc23b55c708c6399a12dbc79281110de7681b121", - "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" + "commit": "67f375562d3bba1d31c780edcbf5a9a979c71d69", + "sha256": "0axwvzwxhyh6k4bs0arz55acbnng3p54ynzw8gwmpba61wxlw17q" } }, { @@ -88678,10 +89457,10 @@ }, { "ename": "org-easy-img-insert", - "commit": "512db70609fc451972405acb4b186a9b3c6944fa", - "sha256": "0gpb9f66gn8dbhwrlw7z2a5rpphbh1fv845wz8yy4v7nv2j3sf54", + "commit": "659267d025351bd8afeefafc28f7f82aa308be78", + "sha256": "1m9zh03ci0fhndwfrf5dh27djfl794m1h4b2dcyycsjjb7p1fw0s", "fetcher": "github", - "repo": "tashrifsanil/org-easy-img-insert", + "repo": "my7h3le/org-easy-img-insert", "unstable": { "version": [ 20160915, @@ -89256,30 +90035,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20240202, - 1157 + 20240923, + 1249 ], "deps": [ "dash", "org", "s" ], - "commit": "dca10e5e90a06c20515208f2d9f3a90455507fa6", - "sha256": "03y4kzn7v0cnp4mqzxmgbzcyyzp1nr70p6fv15725536vxj956fm" + "commit": "0a0da7babec429422d622095e728d9ae02c50913", + "sha256": "14y19r9q1ihi0j1d9si7np9kjdfzkpcr0l9qyk00lqfhywhzbwar" }, "stable": { "version": [ 7, 4, - 5 + 7 ], "deps": [ "dash", "org", "s" ], - "commit": "dca10e5e90a06c20515208f2d9f3a90455507fa6", - "sha256": "03y4kzn7v0cnp4mqzxmgbzcyyzp1nr70p6fv15725536vxj956fm" + "commit": "0a0da7babec429422d622095e728d9ae02c50913", + "sha256": "14y19r9q1ihi0j1d9si7np9kjdfzkpcr0l9qyk00lqfhywhzbwar" } }, { @@ -89340,6 +90119,30 @@ "sha256": "04rfv4qsyhc8w23hbzw8k5f292lafkgf1n0gbbkgc93gifx91s4f" } }, + { + "ename": "org-inline-pdfcomment", + "commit": "0f55b9cb3ea488ddb94fd6a86a5f1dc3eeb1ec22", + "sha256": "1nnvndvbgv8ki4j67ibbj965bh6qjm3sr0r4n3a6zm7sc744mn5d", + "fetcher": "sourcehut", + "repo": "swflint/org-inline-pdfcomment", + "unstable": { + "version": [ + 20241014, + 237 + ], + "commit": "a0af513b24deffcee14c27641477fef65b228696", + "sha256": "1mjadxaqbfsm19105f747syk7v7dvxjz3vn3n4a0xla7iqycjfhv" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "commit": "0ff90ae65ba2948b44b02174f29d1fa12a0675ed", + "sha256": "0vjn3n28rwnvgwfd5dcvdyphn0xrbapd45y7mgx8c4dma112r6qj" + } + }, { "ename": "org-iv", "commit": "56c38111ad4b7e9f015122ff3151e15cfefff274", @@ -89418,16 +90221,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20240712, - 2234 + 20240928, + 2340 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "bd573584a9d93b320d5adbfc09dee30e83e5120d", - "sha256": "1g48n7m1ind29vixzgyj615d484w073bkr4p0sdz8flrnlvsfdyd" + "commit": "5f591f5f4abd0ef12c64676e38d8ec3b13eba280", + "sha256": "134wgr75cjliakkh8sb5x1si01x6mpw9gs0b20j0hv75ar2mpx57" }, "stable": { "version": [ @@ -89622,16 +90425,16 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20240818, - 400 + 20240930, + 1046 ], "deps": [ "fb2-reader", "nerd-icons", "qrencode" ], - "commit": "950095639fdac279022464e1f1efc602e704d1f0", - "sha256": "18fl3l5b69ar5sgj2mds5wvy31jzl0wha10cwks1pg4zs0drw0m8" + "commit": "b232a19ed4cc45291d31c6a4ca1eb185fd0247cb", + "sha256": "0ywyjm7pq4cxvbndkz5q6hbbxwrp3lprpix16cwmc8g2pyaz8wsv" }, "stable": { "version": [ @@ -89757,8 +90560,8 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20240229, - 724 + 20240830, + 2046 ], "deps": [ "compat", @@ -89766,21 +90569,22 @@ "org", "s" ], - "commit": "3ac2024694a9f974a7d263748642182fc7e829d1", - "sha256": "1ikvvrki9aw9pmai1qi92wipbjk1vka4qpac470714l8aq41zfbc" + "commit": "5f0f39b11c091a5abf49ddf78a6f740252920f78", + "sha256": "0b3ixh8cqp9id1q1h2l6pl05n7vzk7ffp3ms5kxg8bvbn1l3c77l" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ + "compat", "dash", "org", "s" ], - "commit": "43d4a2490a048b01ca5a6f44c5b4f24a458dfc95", - "sha256": "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr" + "commit": "5f0f39b11c091a5abf49ddf78a6f740252920f78", + "sha256": "0b3ixh8cqp9id1q1h2l6pl05n7vzk7ffp3ms5kxg8bvbn1l3c77l" } }, { @@ -89791,20 +90595,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20240818, - 243 + 20241001, + 415 ], - "commit": "468604b8404d3c7d6148be83a4cf308ee95d2cfb", - "sha256": "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp" + "commit": "90aa9081ec00a1705552434cb45ff223aa9f8711", + "sha256": "12144hhiygvbx2ws01b47z4wqqd5jfbpxx4cn503mkqwcxzvpvgb" }, "stable": { "version": [ 0, 3, - 3 + 4 ], - "commit": "468604b8404d3c7d6148be83a4cf308ee95d2cfb", - "sha256": "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp" + "commit": "90aa9081ec00a1705552434cb45ff223aa9f8711", + "sha256": "12144hhiygvbx2ws01b47z4wqqd5jfbpxx4cn503mkqwcxzvpvgb" } }, { @@ -89886,14 +90690,14 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240803, - 1952 + 20240926, + 922 ], "deps": [ "compat" ], - "commit": "e306c7df4985f77e5c4e2146900259a23a76c974", - "sha256": "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m" + "commit": "5b7e8195744f9b6a14a5c72bd13ae52e86952d72", + "sha256": "0pb7sxik2mkarbs5vxn0gch23zxj93yh1aw4bl6bbp60an561fp6" }, "stable": { "version": [ @@ -89946,11 +90750,11 @@ "repo": "bpanthi977/org-mpv-notes", "unstable": { "version": [ - 20231210, - 628 + 20240926, + 138 ], - "commit": "01d6d52a1f964e7bb61f0f65ac4fb2ccfa986f34", - "sha256": "1g33yhk0fa4wm4r5xzxasz4cd45anba9pks3cjl2zzdy8yf9xib2" + "commit": "22b9ac4c0bf3144f0a8ac3fb370efe0ac074d128", + "sha256": "0rapddcqsca5w9cfvdxwabw8qxql3dd03kfix1zlskwx1iiypvjj" } }, { @@ -89985,14 +90789,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20240319, - 1947 + 20240902, + 447 ], "deps": [ "htmlize" ], - "commit": "8ce92fecae371b7cfd5ef3c0a3ac280e5664487d", - "sha256": "1jcxj3cvi2lv46sgl8mwkzfc8kvlyvcvaxyq5i9mhbv8xfgvi6gx" + "commit": "59e2042e5f23e25f31c6aef0db1e70c6f54f117d", + "sha256": "0d8y88n1d9agq5w5d4jss2dlygm6w0rkvvnmc0k6i62hzqmxxf0i" } }, { @@ -90112,6 +90916,74 @@ "sha256": "1ci8galz7cc8y2fdq1nl1wbpbid2ixvz77744yxxk43977gbpn1c" } }, + { + "ename": "org-node", + "commit": "d2a49c680f461aa0fd7c25f98bfe7bfd9e49d64b", + "sha256": "00al31md00iw9azq8liy5vhnfdva3wbifr4cjd2qgdmw2afl4iar", + "fetcher": "github", + "repo": "meedstrom/org-node", + "unstable": { + "version": [ + 20241007, + 2215 + ], + "deps": [ + "compat", + "llama" + ], + "commit": "886a0a08b8ab9c8537cc15c39af9463926d04446", + "sha256": "0ma5cn57dng5i1jmq9q7nh9a9sdnm5jlihyd4xgn465q4dqsch2p" + }, + "stable": { + "version": [ + 1, + 5, + 2 + ], + "deps": [ + "compat", + "llama" + ], + "commit": "886a0a08b8ab9c8537cc15c39af9463926d04446", + "sha256": "0ma5cn57dng5i1jmq9q7nh9a9sdnm5jlihyd4xgn465q4dqsch2p" + } + }, + { + "ename": "org-node-fakeroam", + "commit": "d2a49c680f461aa0fd7c25f98bfe7bfd9e49d64b", + "sha256": "0901141f3lydssnamdghzwjhbscwv66n53r9gww727gkayq420zx", + "fetcher": "github", + "repo": "meedstrom/org-node-fakeroam", + "unstable": { + "version": [ + 20241005, + 1718 + ], + "deps": [ + "compat", + "emacsql", + "org-node", + "org-roam" + ], + "commit": "3e84dee8641191c87cc5a9e74999b2396db92972", + "sha256": "13pkrzldbbn1n5hc967baqhd2ncdfh1fdcw8f4107mbvbfh3g3v9" + }, + "stable": { + "version": [ + 1, + 2, + 6 + ], + "deps": [ + "compat", + "emacsql", + "org-node", + "org-roam" + ], + "commit": "3e84dee8641191c87cc5a9e74999b2396db92972", + "sha256": "13pkrzldbbn1n5hc967baqhd2ncdfh1fdcw8f4107mbvbfh3g3v9" + } + }, { "ename": "org-notebook", "commit": "04149b1f158e857ea824fe120372ac52a000adcf", @@ -90139,15 +91011,28 @@ "repo": "org-noter/org-noter", "unstable": { "version": [ - 20240509, - 1756 + 20240918, + 1703 ], "deps": [ "cl-lib", "org" ], - "commit": "68646b685a0d8c02419234922a9e2d885d6419df", - "sha256": "17kgy2b89cc0v3q49pgrp6x46f2908v6vscxg4pczf6zc83rmwzp" + "commit": "691efc3ed4a2828d791a148e53851365c2eb380f", + "sha256": "1fdvl818bmg530nk779jsp0v0xa07sr6y1xzd8x5m8pch13829vc" + }, + "stable": { + "version": [ + 1, + 6, + 1 + ], + "deps": [ + "cl-lib", + "org" + ], + "commit": "284b425f7275ca04bab0f691dfe284a4e059288c", + "sha256": "14n9bq0vxz6gnd5d8nzfc327647iww7gxly43rd4lw7fza8dk380" } }, { @@ -90368,26 +91253,6 @@ "sha256": "1asq336rff0f1zh5crsj3xwyx4xiwdypzy6dlqrxzszkxx8sd4dd" } }, - { - "ename": "org-pivotal", - "commit": "c1257d38bbd3a9944135b000e962f30ab28f5464", - "sha256": "1gv4968akh2wx92d7q1i1mpl9ndygkq8ssdwg6cf19wp8mk18088", - "fetcher": "github", - "repo": "org-pivotal/org-pivotal", - "unstable": { - "version": [ - 20210705, - 408 - ], - "deps": [ - "a", - "dash", - "request" - ], - "commit": "91b675f696b83fd63d4171fa731b09c50327b008", - "sha256": "0i5wjpf1jba3m5xiwcxpvdr1njnivxx2yv0qa1r4schiwi1ra8si" - } - }, { "ename": "org-pomodoro", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", @@ -90538,8 +91403,8 @@ }, { "ename": "org-projectile", - "commit": "d7cefcb02ab49c4505228262101fc23cb1db0c79", - "sha256": "1j5cm8pynyxaar0dl9bv58xh72q2n0v68amavw22acjff4sziicd", + "commit": "6bfe415c0ca34a3afa2049603fa365685f3b79e2", + "sha256": "1zdy554hdagq53inxjp1a4hpdans69wwznljlhrjygn0mcrbir0v", "fetcher": "github", "repo": "colonelpanic8/org-project-capture", "unstable": { @@ -90638,8 +91503,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20240627, - 1432 + 20240916, + 2325 ], "deps": [ "compat", @@ -90654,14 +91519,14 @@ "transient", "ts" ], - "commit": "b7d4856f926cb71e01427a940dc948a48b0a702d", - "sha256": "07d8zq0a89qc3yrvq8qkvdqgw4rvbrrhwgj08qqdk698ny96qiwr" + "commit": "b6f8a315e966123fbfd1ac240d35da5c2b48d6ac", + "sha256": "0661v0rpiq2qa6kz8fl9h3i52idisf3azr8xmanqa3n339ib2z70" }, "stable": { "version": [ 0, 8, - 7 + 9 ], "deps": [ "compat", @@ -90676,8 +91541,8 @@ "transient", "ts" ], - "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3", - "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50" + "commit": "81281350d44a3903a0866431342299f5f3c74beb", + "sha256": "1mw07y82r3b9brphx2j8gj95rbs4632fgq0b79824zqpwm8m291j" } }, { @@ -90771,28 +91636,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240808, - 1244 + 20240831, + 1242 ], "deps": [ "htmlize", "org" ], - "commit": "99cf6fffe606a8461c2f057b67ee34408a75a072", - "sha256": "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn" + "commit": "91610ba9b010b05c52ae7ab77a7890851222db06", + "sha256": "09d0hy5nb485d3dd71a9dmjpbwvhj7zx1wwkl9hggc2gzj4f0snp" }, "stable": { "version": [ 3, - 32, + 33, 0 ], "deps": [ "htmlize", "org" ], - "commit": "99cf6fffe606a8461c2f057b67ee34408a75a072", - "sha256": "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn" + "commit": "91610ba9b010b05c52ae7ab77a7890851222db06", + "sha256": "09d0hy5nb485d3dd71a9dmjpbwvhj7zx1wwkl9hggc2gzj4f0snp" } }, { @@ -91116,8 +91981,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20240715, - 1750 + 20241007, + 1704 ], "deps": [ "dash", @@ -91125,8 +91990,8 @@ "magit-section", "org" ], - "commit": "3e186a85520f02c1672150f62eb921bcad5d2c2d", - "sha256": "1sih11zgfjvy61pgd8x8cjqkwxyarh1wpn2r5z18ii6a3fmjhpj7" + "commit": "2a630476b3d49d7106f582e7f62b515c62430714", + "sha256": "1smllgrbg5idc7cjskaxj7pzgd28bmwa1d7w5x270hbjviw5k27c" }, "stable": { "version": [ @@ -91185,8 +92050,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240721, - 306 + 20240826, + 2002 ], "deps": [ "magit-section", @@ -91195,8 +92060,8 @@ "s", "transient" ], - "commit": "f5c367fea8693491215ac61b211e98aef8dfaeec", - "sha256": "09pj272x1w3fys84xld8v7gpya5syh70irxd98sf0x2bpsrsqfry" + "commit": "9071426d97b329bb98bc54b5287a322dc3814d95", + "sha256": "1p6arv063z7vdx4x9s22xnna4iz7p599z5gp0x0mrwg9v6fvii7y" }, "stable": { "version": [ @@ -91400,11 +92265,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20240605, - 2257 + 20240831, + 1140 ], - "commit": "6c2daa0b663d01a498dca2f2f4f4b645be1c365a", - "sha256": "0i71mgmvvsfycqlqj046184k3fzrqszhfffrjxfg2ai4lp9a8aql" + "commit": "20c33b7310694742b814bf1ca3c05d3496d2a313", + "sha256": "133mww4fdlkigd5583c45sjb2g34f512h50x65iipy0qmrvj95i0" } }, { @@ -91698,8 +92563,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20240715, - 1639 + 20240916, + 1753 ], "deps": [ "compat", @@ -91709,8 +92574,8 @@ "s", "ts" ], - "commit": "05a710065af5ee4b3982f9619f864f7af12ca1d3", - "sha256": "1cy82dqamjxfr8clwk3r3pimvvmn7gkhxvzrnqdkbypzm7hpyd30" + "commit": "d0954b8e7780a4efe49ab32fc11941db21c22bfd", + "sha256": "0f1s10sh217lj2z8z79x5z7i2dp4753a1j4db2r3dpwkp5pj15ai" }, "stable": { "version": [ @@ -91887,14 +92752,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20240712, - 443 + 20241003, + 221 ], "deps": [ "nerd-icons" ], - "commit": "cda8ffcfaa2619dd40cfd4dbe93a74a0f3326aae", - "sha256": "1y581d7cpyxm1s1za1619i2adz6pp4i21qgrzgjcw8rn3rzd4vi0" + "commit": "3b3f95b41c97abc9de3075419b9b30c754f749fc", + "sha256": "03s1rjm7yhc64jwxii9hj277x975b47nx99fcrbdmrqkcfp5ngff" } }, { @@ -92546,15 +93411,15 @@ "repo": "p-snow/org-web-track", "unstable": { "version": [ - 20240720, - 904 + 20241013, + 820 ], "deps": [ "enlive", "request" ], - "commit": "bd96a755ff7c76142d27d6da319252dde9a4c7d6", - "sha256": "0f3n06s1nqw5fvms9xcq23m4s7wzwpklbh77lmbhrw6hg883lgi5" + "commit": "3e41c415e932ab50fcbfadb3ae026c346cc3b35d", + "sha256": "1brcjznpiqvs9qg4k0pq8yhl1n55rd85rzgvr8z7snpkig8i1hw9" }, "stable": { "version": [ @@ -93119,6 +93984,20 @@ ], "commit": "9e2cac9c1a67af5f0080e60022e821bf7b70312d", "sha256": "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv" + }, + "stable": { + "version": [ + 2, + 0, + 3 + ], + "deps": [ + "dash", + "helm", + "s" + ], + "commit": "9e2cac9c1a67af5f0080e60022e821bf7b70312d", + "sha256": "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv" } }, { @@ -93177,11 +94056,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20240616, - 506 + 20241002, + 2020 ], - "commit": "f343b6009d87630588d39dc3d92651008c1bad13", - "sha256": "0dig8axp5isv39nxmx1387yg9dy8cwl47qk8a1m0jv2dsybagw4s" + "commit": "fec29053dc6ed97e6b1cae60bc97cb9b8700f3cf", + "sha256": "1psjimmanmh3hp7paq86wwim9z64bhrwy0gn3fkxy1nf76p3lrjx" } }, { @@ -93222,11 +94101,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20240616, - 528 + 20241002, + 2012 ], - "commit": "441a426447965e9b4dc1b0a1fc010c07192f73b6", - "sha256": "16isqgnysbp64wvgl9skyhfqlwjxsvs4i8k5zzaxm5c7jrcwc78l" + "commit": "30cd50e2e913d41d8ee74ed3c0ca0b1fd8c2e264", + "sha256": "0rh46an7iqzyrvfd535lgy4l0kyycnlywkdnl2x0jwnha9fp4r9x" } }, { @@ -93385,14 +94264,14 @@ "repo": "minad/osm", "unstable": { "version": [ - 20240723, - 2207 + 20241006, + 13 ], "deps": [ "compat" ], - "commit": "25eede7272bb2b4c0b009add264ebb45ab2f3691", - "sha256": "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8" + "commit": "e9db7161f62459d61518888bb7d4aadea15c7b1c", + "sha256": "1kpvbd31r6rp9nikbmab2g7ksd4llx3g5wpj50m3qmq1h293wqgn" }, "stable": { "version": [ @@ -93575,11 +94454,14 @@ "repo": "DarwinAwardWinner/mac-pseudo-daemon", "unstable": { "version": [ - 20211208, - 137 + 20240922, + 2024 ], - "commit": "b95260ff605f67bce40fce6b3e35811859ce12bb", - "sha256": "00l66z1bszaw4v9203ax177frrbzzc099zvkjzhjj3q1rkfqq0bf" + "deps": [ + "mac-pseudo-daemon" + ], + "commit": "c2326fe5baf53790d51386a75f09a114e0678c5e", + "sha256": "0nzy3877s54yl39gqx9j1176sqjx28gb5q6x901jxzaqxx49cmnc" }, "stable": { "version": [ @@ -93647,6 +94529,36 @@ "sha256": "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc" } }, + { + "ename": "otpp", + "commit": "316baacd34da92d985071ec92f2da089486efffa", + "sha256": "06azfidagrd4sfy8j5yhgzvnria28inhfm93m9ald1861rb020qc", + "fetcher": "github", + "repo": "abougouffa/one-tab-per-project", + "unstable": { + "version": [ + 20240824, + 1650 + ], + "deps": [ + "compat" + ], + "commit": "f515d0636426394af9c671bf58107091f9fac072", + "sha256": "14840nzs563syrdpdn6a44x8vg6rzszr4b6qb4hrh96k4hrz2smh" + }, + "stable": { + "version": [ + 3, + 0, + 1 + ], + "deps": [ + "compat" + ], + "commit": "124de45328e2b8188d92c5221c922dd5e99756fe", + "sha256": "1m6m2jkq0bpclpbx067czzxqw0fp3r67ppq2kjwm7sn3xvh4mnvi" + } + }, { "ename": "ouroboros", "commit": "b505d4228b84bf8656dd9b20e0783be8924cbc12", @@ -93675,20 +94587,20 @@ "repo": "jamescherti/outline-indent.el", "unstable": { "version": [ - 20240817, - 1840 + 20240830, + 340 ], - "commit": "4cc2a57e1125104cd94430524d3b4e2b4701d78b", - "sha256": "17a2qgda5nv650hx9rf8zfj264aqnb1k3x80lgn7ks98pwjdgrh4" + "commit": "77345373b5a5be4596b7f8826893bb787b82fb1f", + "sha256": "1n6k3cjacb9pqhykbxl75jli6770cb0cfc2gmjx8xkhj4yrhb5nn" }, "stable": { "version": [ 1, 0, - 5 + 6 ], - "commit": "69de157db109b9af94241f6b15c67d834e944361", - "sha256": "1mnkspl01hqsb5x5z2frhvk632l63c27h8g8bdrlapf7h7r4h7kd" + "commit": "77345373b5a5be4596b7f8826893bb787b82fb1f", + "sha256": "1n6k3cjacb9pqhykbxl75jli6770cb0cfc2gmjx8xkhj4yrhb5nn" } }, { @@ -93714,26 +94626,26 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20240809, - 2322 + 20240831, + 2209 ], "deps": [ "compat" ], - "commit": "5f227d165ca002d692fa80a71e727956b59568b6", - "sha256": "05gf4wvs3q0spjb5mw0dgqy234zgfc50s4z239d35r4nkal9ckwy" + "commit": "4628613f3570b865b2c22b750ebd41443c1848c2", + "sha256": "1ky204hgkvv69gv5vmfczmhq9df05d37qssg7mx041i5xriv54nl" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], "deps": [ "compat" ], - "commit": "8884f1bc4c3f6fa4d40dd1ba728e84c8312391d6", - "sha256": "1g0l7c06gjb799h5whvh6y4wdalxs1261k7i8nhsacjjii1xzwwg" + "commit": "4628613f3570b865b2c22b750ebd41443c1848c2", + "sha256": "1ky204hgkvv69gv5vmfczmhq9df05d37qssg7mx041i5xriv54nl" } }, { @@ -94016,14 +94928,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20240316, - 1959 + 20240821, + 2247 ], "deps": [ "org" ], - "commit": "d6736852a5479c73c253d2ea8b352dcb232d02f8", - "sha256": "0sfc38p4jc6dxppmx1mxk7sni45jy6qq6220md4pnigsn8q6pr7k" + "commit": "a8d49c44cc9aa8a3f384155f0ae052dbf36df00c", + "sha256": "0i77za68sdvp4zxfa3r63vg8pl2jikz0bhvp7znirc71r6wkw3pf" } }, { @@ -94250,24 +95162,6 @@ "sha256": "054ln6x92qyicvc5l1m9yjqqzwpg3j66v0shxsypp97vfw2d3ww6" } }, - { - "ename": "ox-impress-js", - "commit": "b2fdd72363223f1433852e4cc982907a6d7dc32f", - "sha256": "0k8lhkq141rlrk6fjvy4yqvpzyjly49zdga3vyci44h0pfkpbmya", - "fetcher": "github", - "repo": "emacsattic/org-impress-js", - "unstable": { - "version": [ - 20150412, - 1716 - ], - "deps": [ - "org" - ], - "commit": "91c6d2af6af308ade352a03355c4fb551b238c6b", - "sha256": "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9" - } - }, { "ename": "ox-ioslide", "commit": "b960abca4d642c47e640300876eefee1851e6b86", @@ -94325,14 +95219,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20220423, - 1403 + 20241014, + 953 ], "deps": [ "org" ], - "commit": "00184f8fdef02a3a359a253712e8769cbfbea3ba", - "sha256": "1zyq4d0fvyawvb3w6072zl4zgbnrpzmxlz2l731wqrgnwm0l80gy" + "commit": "6c2013088f442530cbd895abcf4a290c06e2beb0", + "sha256": "1n9hsd2ydhmj4ijbc4pn7h81kx7sr6gjkvfasqjaw5bgn8yi01xa" } }, { @@ -94646,14 +95540,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20230619, - 338 + 20240901, + 1714 ], "deps": [ "org" ], - "commit": "ad1885233774e3473ea697c7240e248381a84d3e", - "sha256": "195grf46xnnfi2mcrd02c99ig40rwb6s3hmri5jwm4dd2psawc2a" + "commit": "ab66ace2f6306828c0842fdd729e018cc2395c94", + "sha256": "08rnhihskac3fjk3g2arvq461v2swf4390xa13k36jzpnb0fh3xv" } }, { @@ -94830,26 +95724,26 @@ "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20240317, - 2053 + 20240919, + 1332 ], "deps": [ "org" ], - "commit": "ebdde02e4d33c3321543d67db8f1aef80adc03bd", - "sha256": "0rdainmx0xg6rfql7rai75x0v2r2s1snjy6b61jd53caif7aigbk" + "commit": "03e6c9e5e0ee467516139ed6b3f2b4bb13f847ec", + "sha256": "0jn0f5r3yy0kcrdspkpk7hhblfd41qf8ayi7z207albvkvyisl4i" }, "stable": { "version": [ 4, 2, - 0 + 1 ], "deps": [ "org" ], - "commit": "ebdde02e4d33c3321543d67db8f1aef80adc03bd", - "sha256": "0rdainmx0xg6rfql7rai75x0v2r2s1snjy6b61jd53caif7aigbk" + "commit": "03e6c9e5e0ee467516139ed6b3f2b4bb13f847ec", + "sha256": "0jn0f5r3yy0kcrdspkpk7hhblfd41qf8ayi7z207albvkvyisl4i" } }, { @@ -95113,14 +96007,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20240718, - 1333 + 20240930, + 1924 ], "deps": [ "compat" ], - "commit": "6148407e9dfa6c92e067bcda86b25d15e3cbe8d3", - "sha256": "0zhbabja8rzqbnj9xbzg0xdvpndscxg1jd83y3gi72f85ajadys7" + "commit": "af2dc7784df675cfca7b307e77ec2084ca5432f4", + "sha256": "1n2iyyjp4im6jhhm2rvphzifmjlrx31883a6a0l4mlkvkg4ffd3b" }, "stable": { "version": [ @@ -95155,25 +96049,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240507, - 1722 + 20240923, + 1044 ], "deps": [ "let-alist" ], - "commit": "cb8b0ddaa14cafe9e4ab9a81b2ad47319fd54f27", - "sha256": "0rq1205jnm6rf1zgsccfbf649qdzrlf8rh21qszwb367q9vawfm9" + "commit": "ae5491c511cb49ddb75d6dd4cd934bf71e47a2d5", + "sha256": "17m7wvaz7pyzqivkyg6wg2g2665xmd0vacbv2n847pxa8h2ayri1" }, "stable": { "version": [ 0, - 23 + 24 ], "deps": [ "let-alist" ], - "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", - "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" + "commit": "e3d3fb254221d053c75edfd9f0ebfa58d1eb52f9", + "sha256": "0qbzhpmwsgrp6z541jc1cy7jqr7ipdindwfji210279v2w6yrj1p" } }, { @@ -95184,25 +96078,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240330, - 1458 + 20240923, + 931 ], "deps": [ "package-lint" ], - "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", - "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" + "commit": "e3d3fb254221d053c75edfd9f0ebfa58d1eb52f9", + "sha256": "0qbzhpmwsgrp6z541jc1cy7jqr7ipdindwfji210279v2w6yrj1p" }, "stable": { "version": [ 0, - 23 + 24 ], "deps": [ "package-lint" ], - "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", - "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" + "commit": "e3d3fb254221d053c75edfd9f0ebfa58d1eb52f9", + "sha256": "0qbzhpmwsgrp6z541jc1cy7jqr7ipdindwfji210279v2w6yrj1p" } }, { @@ -95317,11 +96211,11 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20240311, - 1026 + 20240911, + 1714 ], - "commit": "e33426ae7f10c60253afe4850450902919fc87fd", - "sha256": "1mczwbr7yyk79xc68kamx9wrzbk6hhq6c7m793cx3qlxy80chn90" + "commit": "4a20d4a28a1228c561b151f868611ad75de90e5e", + "sha256": "069aa64y2bvjl6wax1ik9dx05gbdddjh6b28sfm3idhx1mlpgipv" }, "stable": { "version": [ @@ -95373,38 +96267,40 @@ "repo": "r0man/paimon.el", "unstable": { "version": [ - 20230521, - 1002 + 20240904, + 1857 ], "deps": [ "aio", "closql", + "compat", "emacsql", "f", "ht", "request", "transient" ], - "commit": "4c71bea56d0cfdca8ea90c5a6d8d584647d053af", - "sha256": "0bb66rzr3hzz9xyxw80vh7vrlsb6630n401dim47qqbi5xzbgr45" + "commit": "b3a5b1ca20e221cc88e20169635076b9b1b08a51", + "sha256": "1zar5zrvhf58n56s9dbvakbq8jr1ar4r52mmfzj6095acvwmnk4x" }, "stable": { "version": [ 0, - 1, - 6 + 2, + 0 ], "deps": [ "aio", "closql", + "compat", "emacsql", "f", "ht", "request", "transient" ], - "commit": "4c71bea56d0cfdca8ea90c5a6d8d584647d053af", - "sha256": "0bb66rzr3hzz9xyxw80vh7vrlsb6630n401dim47qqbi5xzbgr45" + "commit": "91052b2af65d4459ad194bdb7776edbee89f287f", + "sha256": "1x3xqgmkba6hqsdbp71wmd9fx6lji40y1kprpg8jxxvax1m4vpi3" } }, { @@ -95538,27 +96434,27 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20240602, - 1006 + 20240920, + 2210 ], "deps": [ "dash", "hydra" ], - "commit": "18214fc2df357b50e62c79993aac4ff0cf1d9499", - "sha256": "01rpbvxpdmqrrdy6h3m86xng6vmnlavbhrl9p9ydg2x00iv8l09a" + "commit": "3068a544fc2d1e2cdfd681f931e73f74d15be9ba", + "sha256": "13hg9qf64drpz7ak0sz13gj0dblgrfypjszx8iprf6z5kvh33zpk" }, "stable": { "version": [ 2, - 32 + 33 ], "deps": [ "dash", "hydra" ], - "commit": "2a4e726a29d38e7c2379787cad619e5392ad2da0", - "sha256": "1yn9mdlxcv9d33nvgy3wp09qhynb2m50cyhsv1xf77wyzlwdlb2p" + "commit": "3068a544fc2d1e2cdfd681f931e73f74d15be9ba", + "sha256": "13hg9qf64drpz7ak0sz13gj0dblgrfypjszx8iprf6z5kvh33zpk" } }, { @@ -95845,14 +96741,14 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20240726, - 1640 + 20240912, + 2130 ], "deps": [ "track-changes" ], - "commit": "0d16bd75ad36d881194b58c572562023aa04eb58", - "sha256": "1z6ghxbib7lx1iliv3zcn85frav1aay9nn8mf7c1akz49mm295q9" + "commit": "d617b2efd64695f3174f25e7d70e73e050efbfdc", + "sha256": "0pcqiq58fqx1n4xqyyby9zrpkzlpz80xm4vqfyk79hsda9430gyq" }, "stable": { "version": [ @@ -96068,16 +96964,16 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20231206, - 736 + 20240928, + 1836 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "ed7031c5c33a384d07da2d15c9d5f854027a26a2", - "sha256": "1c58vanwflc4immfkbb17ckanqviqr3x9g8hcszzmm7kz2xh24n5" + "commit": "1a9f6100153b07ac4f4d1d332501240e94c38f1e", + "sha256": "04iggbnh69b36rqi5b549l1l5ijmfja1im1pds0cc9hbndjqsaqr" }, "stable": { "version": [ @@ -96179,6 +97075,36 @@ "sha256": "17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53" } }, + { + "ename": "password-store-menu", + "commit": "0f0bd9a4377a98579299ce8bba23d5b222e00455", + "sha256": "1s7776mcz0bx78rndbrmwff9py7na9s2iphhprblzr5pnhb03p2k", + "fetcher": "github", + "repo": "rjekker/password-store-menu", + "unstable": { + "version": [ + 20240820, + 1055 + ], + "deps": [ + "password-store" + ], + "commit": "0b181f878c47f2f06da51f5279e04382d6da6527", + "sha256": "021kjbzcxqxscy90mmdhv4ia97c5p3n7bdl178imb68k5sigkl5q" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "password-store" + ], + "commit": "0b181f878c47f2f06da51f5279e04382d6da6527", + "sha256": "021kjbzcxqxscy90mmdhv4ia97c5p3n7bdl178imb68k5sigkl5q" + } + }, { "ename": "password-store-otp", "commit": "fc89d02554a6ff150ad42634879073892f3e88be", @@ -96934,11 +97860,11 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20240731, - 1133 + 20241012, + 1900 ], - "commit": "3281c5648d854f77450c1268dbb31f5a872900a5", - "sha256": "12zgzysljlq1vrl1c0s4bab5qf3ly257scby3fs56vnr4szhwla4" + "commit": "2d70e1cab1365fcedfb16cfff38d9fd0da77514a", + "sha256": "19vagkirvmm7xgi02dwwjsvdasadwgls0969vjqh9gygq390ig5m" } }, { @@ -96983,11 +97909,11 @@ "repo": "bram85/emacs-persist-state", "unstable": { "version": [ - 20240720, - 1725 + 20240904, + 2057 ], - "commit": "99e22bd6dd7b768c617596da952a5b8e53d16ecb", - "sha256": "1lg1myxb5pqf9m19kza2iwbcdcdghkrcb7fbgk7jghn2ag0naasf" + "commit": "51b2092ac206a0d8a0f682fbc32fe089716c37cb", + "sha256": "16js69arkcccnns2bijc257lyr359f1f2ly3sx7rb6zc4dzwzwc0" }, "stable": { "version": [ @@ -97336,16 +98262,16 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20240715, - 1616 + 20240930, + 2259 ], "deps": [ "f", "map", "seq" ], - "commit": "e5e3f9f0326ea1cc6edef017f0ee34cc42754b08", - "sha256": "1xdlqsybzhjfbi8icp22438pc51ybxnxg11ixpvhbr4c8jdwiwva" + "commit": "75b371ac4638cb8c6d7190f21a9c3ff257798d61", + "sha256": "16p91zwrp004hz6qndg3jiniy01ic24wd36hjfs2ksir83lsfg59" }, "stable": { "version": [ @@ -97394,25 +98320,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240814, - 1214 + 20241012, + 1954 ], "deps": [ "peg" ], - "commit": "93e3fe31c0cd5d31a046fa7c4feb4e3371ac4a8a", - "sha256": "1pc3j0yqgiskr8hk3jagwsp8hc88qics9wh72q1iw8sjn2yalrgy" + "commit": "516f09df63d68b8bb1682e34ac8443f84ca9127d", + "sha256": "0l4z3a60s7mj3blxz26y5zfp927vx50k4i1b20hjnchn4cv6c92f" }, "stable": { "version": [ 0, - 39 + 42 ], "deps": [ "peg" ], - "commit": "69ca40a4206eff0b1c40e423ea8b815fdbcd438d", - "sha256": "1b5dg04pd5s5pq71yc3isl312y1fw88pjvnk8bgjc1f06xhjlrj4" + "commit": "c4b050c52a31aab0ca27d9c24bdb5eb71cd8764e", + "sha256": "1afyjzrb1q207as2vc9j3cjvr6f3d3zgajzisl3x3mv0kb0bk3jy" } }, { @@ -97715,32 +98641,32 @@ }, { "ename": "php-cs-fixer", - "commit": "a3631c4b81c1784995ae9e74d832e301d79214e2", - "sha256": "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf", + "commit": "f414f7293971ee66a2f37a63d72ea90a39e5bcb5", + "sha256": "16j0z6bcas14mfjrsd056jj13rynjy8vbxchvhw4lq38gx5znp9n", "fetcher": "github", - "repo": "OVYA/php-cs-fixer", + "repo": "pivaldi/php-cs-fixer", "unstable": { "version": [ - 20240814, - 2249 + 20240909, + 1856 ], "deps": [ "cl-lib" ], - "commit": "e9db0576da25f8ebbae87cb2677ab8f694e14a61", - "sha256": "0b4f232msh0b1mspl8x7m6hr3cdijhx0am33qxab7538vqiyy8lz" + "commit": "fa21b0f3b9be8604345a5fd276477dff3c77e39f", + "sha256": "02cjlc4mkmp6ih6g24fs38wwa93vlls1da8wxv563a6g5g799yd1" }, "stable": { "version": [ 2, - 0, - 1 + 1, + 0 ], "deps": [ "cl-lib" ], - "commit": "e9db0576da25f8ebbae87cb2677ab8f694e14a61", - "sha256": "0b4f232msh0b1mspl8x7m6hr3cdijhx0am33qxab7538vqiyy8lz" + "commit": "fa21b0f3b9be8604345a5fd276477dff3c77e39f", + "sha256": "02cjlc4mkmp6ih6g24fs38wwa93vlls1da8wxv563a6g5g799yd1" } }, { @@ -97766,20 +98692,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20240621, - 742 + 20240912, + 2234 ], - "commit": "4792988a120d6ac515ba16605278d04cb8be0d69", - "sha256": "0w9amslw2hpf0znfmn4cki3c6xqxjs11mayvzqiycfc6pabw4hzq" + "commit": "3e8113c72a454f0f87a1593c22578b894549c53b", + "sha256": "0b2j2jcrqmanli2307yhj7b59p3dap2190iyk09b7dygk6p1niyr" }, "stable": { "version": [ 1, - 25, + 26, 1 ], - "commit": "0c5524073c35c954a25424c914cf249a5fe05d76", - "sha256": "1pxv4c63dma1il6w8vl2485yddp0ngm3gvfdqwjjszanfdxa4fg1" + "commit": "9a2fe1c6c34f4f22f11efff0caf1d4e7c8ea233a", + "sha256": "12skkn3i5qvlfnifgyp3sm4yjikphckj98y73vhxn73zzbn2lw6m" } }, { @@ -97878,8 +98804,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20240527, - 459 + 20240916, + 1427 ], "deps": [ "async", @@ -97887,8 +98813,8 @@ "f", "php-runtime" ], - "commit": "6b5269ff82785a9bd1e648b2f91e5128353d5a67", - "sha256": "0ygnl1xpms8cnp5s7i9ng99azyzg0k3h830mazkhhpwlqhkjffyl" + "commit": "8707094ac0da0564e7a0cc6874e3087ffc7e137a", + "sha256": "1nlaqwfd1klxplh6nwv6ci60mfl1d85i0dfnvcszbkn3nfmf0mnp" }, "stable": { "version": [ @@ -98561,11 +99487,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20240531, - 1602 + 20240923, + 1652 ], - "commit": "8ef396d8fa9187b65c065a6bc2ca15dfaf3255df", - "sha256": "1p5xgq0mnyqxjmapki60xv1jns0pxszd04r0c1kdyk1bcdcpjm93" + "commit": "b333ec39d0499492e91cfc0a2a932b956b519714", + "sha256": "0qy3q3803f72cz80mrdd2j9dnjs8rjby2agz244a0wjnq0521rmq" }, "stable": { "version": [ @@ -99148,8 +100074,8 @@ "repo": "alphapapa/pocket-reader.el", "unstable": { "version": [ - 20240407, - 2303 + 20240924, + 42 ], "deps": [ "dash", @@ -99161,8 +100087,8 @@ "pocket-lib", "s" ], - "commit": "cb9f6b108ebd3a67f77fb75d85351ffb3b0bb3d4", - "sha256": "0d0mfagx43sqrfyshnwm4acvh6h06jl6l11nvppqhb2hdrrdx0ia" + "commit": "7f55668325fab3dcf1c24b10ee073f7d1df180a3", + "sha256": "08fxaffdzxr48lixzk7g9b4aaa107vyyws2ghcw0ismqrfhkq8gz" }, "stable": { "version": [ @@ -100089,11 +101015,11 @@ "repo": "emacsorphanage/popwin", "unstable": { "version": [ - 20210215, - 1849 + 20240925, + 752 ], - "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50", - "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra" + "commit": "58adcd0ca7c3dbd58626ec7019252d64cbc73042", + "sha256": "1mqwzc6fwhwq1kl8b3i1hm2ylfh8blrxrw6mzr5wyifbwpg7dq10" }, "stable": { "version": [ @@ -100190,20 +101116,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20240703, - 359 + 20240827, + 654 ], - "commit": "493b17f74ad41104d0c4d648e8c96dc495279ac8", - "sha256": "1yjpkx5h8wm5hs448hri8zvhzq44g4qgb5g1ji6yj99x8vdpf5al" + "commit": "570273bcf6c21641f02ccfcc9478607728f0a2a2", + "sha256": "1p1kfy0x8n1s2njfq70fix2jadfi6zb4m519scjmys51a7ahmy73" }, "stable": { "version": [ 1, 4, - 2 + 4 ], - "commit": "3b97dc180b03498103cfcc7f44e64150df440bf0", - "sha256": "1vcj96d6ivfh44aq12fldcncaidm3wsqzxj380ddg4p8rcqkwqc9" + "commit": "570273bcf6c21641f02ccfcc9478607728f0a2a2", + "sha256": "1p1kfy0x8n1s2njfq70fix2jadfi6zb4m519scjmys51a7ahmy73" } }, { @@ -100339,11 +101265,11 @@ "repo": "jschaf/powershell.el", "unstable": { "version": [ - 20220805, - 1712 + 20240825, + 1440 ], - "commit": "f2da15857e430206e215a3c65289b4058ae3c976", - "sha256": "00q0qdrdj1rsi6lc1mdmn0nnxklpp2wjp73q12dwav37ymv9cj4w" + "commit": "38727f1cdaf0c937a62b68ee52ec7196b8149f93", + "sha256": "19nprnwp6cly90dqa98d9h6kgbgg6idpqsjgckrvk1bn2wkx6axv" } }, { @@ -100457,8 +101383,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20240426, - 1202 + 20241014, + 454 ], "deps": [ "ghub", @@ -100466,8 +101392,8 @@ "magit-section", "markdown-mode" ], - "commit": "0a15e3616de643abd18c51da601f72ea4d88256b", - "sha256": "0dljczzvhirmwbnrpza982anfb5bsxw2g1jwi1pgxmjawvn8z7n7" + "commit": "e0488e7b1225e67a88ad5a2da5c17d524e007848", + "sha256": "1zls3bjp17fpkkird1h2v0gaz86nyxjkwj3jfzvfxyi3b9f8ciw6" } }, { @@ -100611,22 +101537,22 @@ }, { "ename": "prettier", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "1b6kmx72c19l1z74lbs3k0w4yj20xq8692mc4hnkz0hivwb6f3fy", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0k1vlwr1mgpa3mh51i7sr8jdq9ibp24q6vjfzgw7vazm3mzh0vlr", "fetcher": "github", "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20240601, - 1316 + 20240902, + 1516 ], "deps": [ "editorconfig", "iter2", "nvm" ], - "commit": "53327f039f2d4f3fd1eabece190857059b3765b5", - "sha256": "09rxd93pg9lx2gidyy1bb91hfla3df29y7hl2p1l4pwbf1rgmim1" + "commit": "9e202f129835317d70aea405e536a9f4228680c5", + "sha256": "0swwyp64fq9vp04b89f41k4fg81vk174q8j2h91mnq5b0vnnyqxy" }, "stable": { "version": [ @@ -100638,8 +101564,8 @@ "iter2", "nvm" ], - "commit": "1c0a1bd97635090a611cf6cda3ba9146c84fa41d", - "sha256": "14plfh1hqjygcpp1ijkhzkpsshqfpzmn6c44bac6rk13072sg097" + "commit": "913b6f72a062db91517dc7a0a743f7d1773a0927", + "sha256": "0w3aibjjbmrkj9phycphqbry1i7fddl36wpp5bbw4gb5p52h2yk3" } }, { @@ -100853,15 +101779,15 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20240807, - 147 + 20240915, + 1804 ], "deps": [ "compat", "dash" ], - "commit": "25df8494ee92c65bf66194e0e2663de487f9296b", - "sha256": "0xy8xpwnskk5w9wgw2qlxcqxb360qq5ilib827h480xyf6qkkcri" + "commit": "646840f74ffa7c289426b54426f147e126812070", + "sha256": "01s751khsbnlqhx1jh62laimi1fpsqljh02hw3gdgd2ka25jcq24" }, "stable": { "version": [ @@ -100918,11 +101844,11 @@ "repo": "masukomi/private-comments-mode", "unstable": { "version": [ - 20220929, - 1807 + 20240926, + 1557 ], - "commit": "b32b862e42e1f5cf26b6ca4cebea69b3f4e1aeab", - "sha256": "0q79dh1z9hgcln2maaw514dxqk1nw16wdqpw6vg2y6kz535xwmfn" + "commit": "616d63eccc5a21f1785801baf0fa3667ddfeb80f", + "sha256": "0qzx2l2hr1hlc4dknvxwz8791chfzm3djsax8bgpl9x3k292n1h5" }, "stable": { "version": [ @@ -101022,8 +101948,8 @@ }, { "ename": "processing-snippets", - "commit": "ba59561e8a2f259fde170a79844af5e1ef5ed34f", - "sha256": "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r", + "commit": "258a113cb0f7902ca083c931c064c093b3721b52", + "sha256": "0y98fwiq3ff010lc9yv9k9c0zblaq2isqarilri1r4zk1f4mrwll", "fetcher": "github", "repo": "ptrv/processing2-emacs", "unstable": { @@ -101046,7 +101972,7 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20230925, + 20240929, 1820 ], "deps": [ @@ -101054,8 +101980,8 @@ "f", "s" ], - "commit": "cc68fa9d604a0739a63247237a801b03a184aca6", - "sha256": "0g032xq19g5k29wypbk7klhkf602r3ih3ypq7h5zpd1gknkcqlbp" + "commit": "18c0a3b6de3613440679375fcb2b2163d6cf5bef", + "sha256": "01szrlahfmc0w7ymba159q0ab55smaqg1m0msdyp56jyxy0hmw2i" }, "stable": { "version": [ @@ -101369,26 +102295,26 @@ "repo": "TxGVNN/project-tasks", "unstable": { "version": [ - 20240408, - 611 + 20240903, + 343 ], "deps": [ "project" ], - "commit": "87852d5290154e21cbb07b2685fa46edc4963977", - "sha256": "0f50panks1j9yzfwwizk85al00lp46lpc1r0s18j3gx7bda588xg" + "commit": "e5cc94cb65a18ea11aae7f65ee6f603a7808d4aa", + "sha256": "1gdq96296s4glylhh1yp3j6gn8j97b8f2acbh9xq5bk2y1vd7m04" }, "stable": { "version": [ 0, - 5, - 1 + 6, + 0 ], "deps": [ "project" ], - "commit": "eab59faafc47763a7b9c4116bf8c438406f62705", - "sha256": "1k52zb6zmml5l50xkkhilml9ki06184mz2g865s4dp3vijpypqgh" + "commit": "e5cc94cb65a18ea11aae7f65ee6f603a7808d4aa", + "sha256": "1gdq96296s4glylhh1yp3j6gn8j97b8f2acbh9xq5bk2y1vd7m04" } }, { @@ -101417,11 +102343,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20240814, - 1854 + 20241009, + 1152 ], - "commit": "01fb6a5ef023bcfc52b209586dcb4fd13db00218", - "sha256": "1frg36xicvivhlp3b4m86hg7gsg5b04lkkfymb18d1yzcwc40xwk" + "commit": "41f8a8e7bdc50467256af632108989b5c980cd56", + "sha256": "18sd8vim7pib5v13hk610l1fkndydv4sfhdmvxb3pb4p536xm6ch" }, "stable": { "version": [ @@ -101682,8 +102608,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240803, - 1636 + 20241013, + 1520 ], "deps": [ "compat", @@ -101691,8 +102617,8 @@ "project", "s" ], - "commit": "1ed2ff94ffbf5b619e34e02baca324a580751723", - "sha256": "0s8vp39y8kpavx2m7b92mz8p8fsmy7rhh3zbf4k5zha7chv6wjmy" + "commit": "c2a5522e22b292c9ce94f1d5ece338c4e7117ddb", + "sha256": "1wbwkmf7fg1hamzidzf6wib2fbcjybh3ch9yr9y9l4946wxnca1h" } }, { @@ -101722,15 +102648,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240803, - 1509 + 20240919, + 2050 ], "deps": [ "compile-multi", "projection" ], - "commit": "719be9e5cda7324eed0a82ce14a92f88c8608080", - "sha256": "0jjpx3ckm99yn4izn922dcpc42zfs5p5ji2b2qaxl6mnzrg86mpg" + "commit": "c875330e69087f96ddbcb4b0f0e15b820adcc8ae", + "sha256": "13p1k2g6kciqhg4bhdxms9ifwx51vc8xh3wcm44ja3bhgi3ajlcs" } }, { @@ -101796,8 +102722,8 @@ }, { "ename": "projmake-mode", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "1hsw13lpnwxdi4h1vwd9inkv6fakx5f5s24hfqk276cnmjf53ms4", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "1bwydyjj2x7vlc1fh14505bl2pplksx46rsmqwx46zyfkrvgabp1", "fetcher": "github", "repo": "ericbmerritt/projmake-mode", "unstable": { @@ -101916,11 +102842,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240708, - 1525 + 20240912, + 1558 ], - "commit": "eca47ea8afdfcd94b4c8d88ee640f6631cfe5c5d", - "sha256": "1vr8k4s7dk5y5c7rmnparrigsih6cz9w01d8z1gmfp55adhyjvli" + "commit": "1ffca70b2fcfd1c524f9b9e5ceebae07d3b745b6", + "sha256": "1kmgih45qkgqzas09bhy0xlvjssb187b1ki7a088za2kwcyw89hn" }, "stable": { "version": [ @@ -102020,19 +102946,19 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20240222, - 1652 + 20240823, + 1417 ], - "commit": "b9483e03c7cfa854c250ad6415b4d9e6f7a9709e", - "sha256": "12gld58kyzjfrsfjp7mkh92zj5lrps029vy8211win3b0q8cjwgw" + "commit": "138451296bf4101f992faa215a1899f3b9ec29e7", + "sha256": "0s7s2zwam9xqsra56qamx7lmh5136qg7c2ls0v6p9gvjj30v6l29" }, "stable": { "version": [ - 27, - 3 + 28, + 2 ], - "commit": "7cc670c1809e704ebeba90fb430d50e009f36727", - "sha256": "14aywn2llf3vg7qp57n085183rl06d8dyg7d4xawv7n0d0s536r5" + "commit": "9fff46d7327c699ef970769d5c9fd0e44df08fc7", + "sha256": "1cd8hfszy6sqjwwwf95znvzic1nn3hd1ywij25m4hg8vddz2727s" } }, { @@ -102201,15 +103127,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20240612, - 1242 + 20240820, + 910 ], "deps": [ "async", "cl-lib" ], - "commit": "cddba290ce39440a2e00bb92130030fe0f068f2c", - "sha256": "1z1kdgr3y5wgn8xqgr5ilpbzjqm54jz2icg34p6qc8d8s12chw8c" + "commit": "75834fe016f30a72890a1c284c1bd400ad61ea9f", + "sha256": "0snfdymlgx4dg5iin5mq53b1apz6i2i233yfm0zaqqnjsxmf4hlm" }, "stable": { "version": [ @@ -102329,6 +103255,15 @@ ], "commit": "23cb9093f99b9869606f8d54fa5c45ea35fcc789", "sha256": "0vxji487f1yfffjs8vgi8f4l2ssj3n26lr2sx5xzdj70x2w5rz04" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "23cb9093f99b9869606f8d54fa5c45ea35fcc789", + "sha256": "0vxji487f1yfffjs8vgi8f4l2ssj3n26lr2sx5xzdj70x2w5rz04" } }, { @@ -102520,11 +103455,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20231231, - 1415 + 20241007, + 1609 ], - "commit": "72e091ef30e0c9299dbcd0bc4669ab9bb8fb6e47", - "sha256": "1ns2r6nwakdnzjiq84qqzn85wwahc0k738awx9kxn9p0q2prpx5j" + "commit": "f430f5b0a14c608176e3376058eb380ab0824621", + "sha256": "0kvxll2yx4lh5x04cigdizncp2kbva1iidz9fjnbi8qqfm6pq5qq" } }, { @@ -102535,11 +103470,11 @@ "url": "https://depp.brause.cc/punpun-themes.git", "unstable": { "version": [ - 20221121, - 1018 + 20240929, + 2238 ], - "commit": "6a7e04de1ad9f7ba9074b7206bffc9241c33349c", - "sha256": "0661rhlh3nbbrjdg118y9nk7kmshb5p0jzgfpnqvqmf7j6p6rpg7" + "commit": "a0b26442293e7afc6fd2ba9be199fc7b4f5138e3", + "sha256": "1bhv92kr5dmqh1v631s9lc2y0i731vmws1ysyrwrjr2alxpnlivz" }, "stable": { "version": [ @@ -102603,11 +103538,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20230309, - 1301 + 20240930, + 737 ], - "commit": "eacc61aaafe6055b5f278c9843558f220f18b153", - "sha256": "0m9xs9zh1aq8z08p0p006jsfmx9iyskq596mnmgssh7nlzr8a2ac" + "commit": "d187b3d4bbb4d9cb36a4c6c55f35d63d159a26e8", + "sha256": "1y2x1l1b1vn041q7jva6qpf4bnf84wsq19nv11wl1ka1ypzqi233" } }, { @@ -102851,6 +103786,38 @@ "sha256": "1l17ky2m9kc0xicxzf67j8m6zsczc7s4xjjfndzcrbzkf802c0ck" } }, + { + "ename": "py-vterm-interaction", + "commit": "4824b4dae274f6170ac70463a4366bfc9af4050d", + "sha256": "1qza3g88bv3fhzydhka5ncrk8rzb86mk6c3vrjk5wwviikp53w4g", + "fetcher": "github", + "repo": "vale981/py-vterm-interaction.el", + "unstable": { + "version": [ + 20240915, + 2042 + ], + "deps": [ + "python", + "vterm" + ], + "commit": "95d6842790767c5b8ed1043c1a10c437d955b436", + "sha256": "08zd641wadfwa6xm9i3k30id7542bi338pmcjvg97nmgdfv9yrxw" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "python", + "vterm" + ], + "commit": "95d6842790767c5b8ed1043c1a10c437d955b436", + "sha256": "08zd641wadfwa6xm9i3k30id7542bi338pmcjvg97nmgdfv9yrxw" + } + }, { "ename": "py-yapf", "commit": "3306c6906d4b21868b9407de27fbebdaed3d00d5", @@ -103088,11 +104055,14 @@ "repo": "tumashu/pyim-basedict", "unstable": { "version": [ - 20220614, - 1108 + 20240923, + 739 ], - "commit": "d61af27686f7a39e6c138b7261a686e7ea7a0ef7", - "sha256": "0fzyh8qmicq2vy9j1ca708ir67dpxp1cwjaw0sw469p24cvj12yy" + "deps": [ + "pyim" + ], + "commit": "55d9b324831b0fc79ff62f1c6f21aad72341a114", + "sha256": "15hd6zffc2s9rdxdjrybggf355risw60l4skqm8hc0xx0kmss9x2" }, "stable": { "version": [ @@ -103581,11 +104551,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20240804, - 1207 + 20240911, + 1346 ], - "commit": "6acfce561ed9b655c548d230eb990ad863a015ea", - "sha256": "1wyahxv1sckigwy4sd45lgpkdlhd0c90kwgffrl98xslh6ajlr3a" + "commit": "16affa2f0f1a3b918547d665235a24bd57d4b9b2", + "sha256": "19w9w7pzmsq01gzbkdcv0shdh2b44ka5ql564d23hq1ly5wk3rkd" }, "stable": { "version": [ @@ -103605,16 +104575,16 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20240810, - 809 + 20240826, + 948 ], "deps": [ "dash", "s", "transient" ], - "commit": "bfcd28829076836904fed12a39c829970bcb6bb0", - "sha256": "07rrx6x8y58kah2h0imb4100qpwlmcnhsvm3dd49mbrs0827hddk" + "commit": "9390f9fc35f98884131e5b3ec572be04d5409b73", + "sha256": "1yxrr9ia9vc6yphjalmwls04355lwvisfqr2yf0v8zlba36g85r9" }, "stable": { "version": [ @@ -103847,11 +104817,11 @@ "repo": "ruediger/qrencode-el", "unstable": { "version": [ - 20231127, - 21 + 20240922, + 1231 ], - "commit": "0ab1819ee39d15994a864db4d2dfa32e7a527f82", - "sha256": "09arkhdvbcl1g17909cpwc9cwfy2dsg6isijgm7k5qx7vj9xjmrf" + "commit": "4bbb1f331d7e394470e3fbf172329a9b70174cc8", + "sha256": "00z0jdsjbind7c0354mlmmni5hx8malclxf1ggbjklx5ibc0jna5" }, "stable": { "version": [ @@ -104157,14 +105127,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20240316, - 807 + 20240924, + 2359 ], "deps": [ "ht" ], - "commit": "4604cbd7dff6996a0d35d4eb042a5623530763bb", - "sha256": "066lvxkw0xls8a0f243ic57nr6rlpwy71pgvi3wcm8zg8ky2r599" + "commit": "bb0f7580cd95022c4f8d016700a73260687c9722", + "sha256": "0bv299q0fsddxkgh25bpkyxv7wl7ai3vhwd2ds568v9ci9lxiz81" }, "stable": { "version": [ @@ -104340,11 +105310,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240813, - 1641 + 20241001, + 1458 ], - "commit": "3cb49c513d56cc615e4b932bb08406dec93471a7", - "sha256": "0ynah71mr8b6d9fnffz5k8d33jfdw14py6i01yc88c2m925jbk0d" + "commit": "ec8b5142abaaef8335c23b98c18dee1f960b6e0b", + "sha256": "1q6vdp2rhb6r3s17vqy6qbq0kzbix8a4fd9ikxxlgj8gc4xg6dv5" } }, { @@ -105080,20 +106050,20 @@ "repo": "xenodium/ready-player", "unstable": { "version": [ - 20240818, - 1104 + 20241004, + 1537 ], - "commit": "4da641ef345bf03ad4e2bd4c6b45d134ed96d08b", - "sha256": "0m19diwp2cr4r2n93dgyfv7yq3h0drv93vypyg34jlvj0bpskzsl" + "commit": "4b11f29afbd146b07203af1128cab6012bda4057", + "sha256": "0n46j7hzwqgip51c55w75s4lx5xh3z7nwaqh9p7l77icws6h9zig" }, "stable": { "version": [ 0, - 4, - 4 + 24, + 1 ], - "commit": "9fa93956e2fbe57856081f91a3635a21c3f03e8d", - "sha256": "011ikdx8gafdgyf1mxnv599fhdda49wgrkyag1l9qgyj0a9c4xnp" + "commit": "08a360e8d4f643c7115bf29c775a1d4b846c7394", + "sha256": "00fpjkgldskf5dsk64gnpz0ijfs9fcvway2rsa31rahzkbjij3cn" } }, { @@ -105650,14 +106620,14 @@ "repo": "thierryvolpiatto/rectangle-utils", "unstable": { "version": [ - 20190411, - 1757 + 20240830, + 306 ], "deps": [ "cl-lib" ], - "commit": "46f7e73340fee40c1ab9a4e766a08ae3fce83ebe", - "sha256": "0dcga10lg2bl1p259s78jib7pd03v183hima8aksfr0c84s438yq" + "commit": "0d9c5dcef2d660cf6b67fc52f18a720d02514f01", + "sha256": "0gqw2k715idgipbdkgyyh3kakw2cblgmxcxjqr4b1ga5fzqjzvs8" }, "stable": { "version": [ @@ -105703,14 +106673,14 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20240708, - 2119 + 20240926, + 916 ], "deps": [ "compat" ], - "commit": "e0eccd3b4b7d7bb162767d4c5a028e646437555c", - "sha256": "0pzwyrsdpsrrnchxk8qihqr8blx366yw9snrcy1l1fj9hhsks7bs" + "commit": "bf7b972b11281e2951d2b8e5523fa27daa586489", + "sha256": "1h6w78qnrnzvj4w3ffgs8vfyf10imhra7ppmj0n4y8agvpxk0969" }, "stable": { "version": [ @@ -105912,8 +106882,8 @@ "repo": "Wilfred/refine", "unstable": { "version": [ - 20200507, - 731 + 20240914, + 634 ], "deps": [ "dash", @@ -105921,8 +106891,8 @@ "loop", "s" ], - "commit": "d72fa50910b86217a35bb1b7e56adea206052021", - "sha256": "02cb30ycwyqhdw54s3abb4xsdyqlpi6i8xi7rkl85avvgy2gif8y" + "commit": "07c1f3518fff4e363c68c0a110137756754641df", + "sha256": "0lhdyaak0iykvckcwfyz280g48f1nlrznzp1yz6bh41n1p7jpdw3" }, "stable": { "version": [ @@ -105947,11 +106917,11 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20231122, - 838 + 20240906, + 1405 ], - "commit": "ebea79504b40fecb150caf8c39621146164f997e", - "sha256": "1n8qxrs8103bibzxjs21mzjdmjsnb44hsb2cy7fnx2rax19r9dja" + "commit": "155b235f6c76f2f5790aa53798c7a7e36ce5aded", + "sha256": "0dmwm3pmmjbsvikxijf8sxa091jahgq6ybg7mn9bvgl8db6mkhyp" }, "stable": { "version": [ @@ -107085,15 +108055,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20231202, - 1023 + 20241002, + 2036 ], "deps": [ "transient", "wgrep" ], - "commit": "4885473a6d248a6ee508b7b7ef3705762af631d9", - "sha256": "16ahhwa24g8wgmf8p000jqmfz541dw2b39vx7zv8s9dlzlcbm9xj" + "commit": "d727fe8466502e29975067adf6f2ca3e0618279c", + "sha256": "0kznbka5ssgs9cmdjbjlk8z7zl3vb294mvymy7nsm4w11phdz0w6" }, "stable": { "version": [ @@ -107204,14 +108174,14 @@ "repo": "Malabarba/rich-minority", "unstable": { "version": [ - 20190419, - 1136 + 20240924, + 2317 ], "deps": [ "cl-lib" ], - "commit": "a03e693f6f9232cf75363aaaf1cb041f21675c19", - "sha256": "0nr5lazllp5qphllnmwrwiywkc5zd3a51ciwb8k0h8zw5axhp0v7" + "commit": "77cf5ec620aaef18385d2e1d2dad05b4f63dad95", + "sha256": "005ssb1bjayxgri4r8snndaq2bq01av9273lwwzcjnnh4p8avblp" }, "stable": { "version": [ @@ -107328,8 +108298,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20240130, - 1427 + 20241003, + 1750 ], "deps": [ "cl-lib", @@ -107337,8 +108307,8 @@ "popup", "posframe" ], - "commit": "d8c0a99b0282d3e0aca53146789f6864181228e7", - "sha256": "0bj26a989x9yav0ryijxzg4wl53gf6w6r2jvnwavsm4cify547xg" + "commit": "e5c5ffb57088aa7ec6b82a6ca3f9499294124954", + "sha256": "13n9rkwkza1n91k2n5saxyijm9qsjywj9hlx6la4z1d3lvr4r1cy" }, "stable": { "version": [ @@ -107652,6 +108622,21 @@ "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" } }, + { + "ename": "roc-ts-mode", + "commit": "62ba56bffba06f889bde3b77a22d89b1721a6370", + "sha256": "1id7f84psp1mh74yhdhwpgy81mvkqgmci46nxfgzs4srgljmj0vi", + "fetcher": "gitlab", + "repo": "tad-lispy/roc-ts-mode", + "unstable": { + "version": [ + 20240820, + 1737 + ], + "commit": "8a85436227a9fdc07bce9ad773a46ba78cb3cdd0", + "sha256": "1vrhh6xa1v4qfraw888xrz3izkk6zshbrzqdf21x9dwyd4wlr0is" + } + }, { "ename": "roguel-ike", "commit": "2db1979e039e466268ca7c264988792d3046e19a", @@ -107660,26 +108645,26 @@ "repo": "stevenremot/roguel-ike", "unstable": { "version": [ - 20160120, - 302 + 20240924, + 1706 ], "deps": [ "popup" ], - "commit": "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c", - "sha256": "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z" + "commit": "4f3fe2bce0394f7f00201410d15c72847bd35b2e", + "sha256": "19rdmx8wwkl9ivbnykbmib6qj9grrblhrsrnibynb1ih0gzs6z2s" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "popup" ], - "commit": "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c", - "sha256": "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z" + "commit": "4f3fe2bce0394f7f00201410d15c72847bd35b2e", + "sha256": "19rdmx8wwkl9ivbnykbmib6qj9grrblhrsrnibynb1ih0gzs6z2s" } }, { @@ -107690,8 +108675,8 @@ "repo": "LaurenceWarne/rom-party.el", "unstable": { "version": [ - 20240324, - 909 + 20240830, + 1225 ], "deps": [ "async", @@ -107702,8 +108687,8 @@ "ht", "s" ], - "commit": "e4e8f113b370ceaed0ea28940117bd69f3d3f935", - "sha256": "0s14ki44iwaskfa2ky61by088f7h5s9frz621fpainfhx0i7m59r" + "commit": "60da757070d23c5f33b89b787ee01a280539c4f1", + "sha256": "1z8k983ibdn4vdakjyf2nj0y4pfsshbrpkaidblp1di1hifn2ng8" }, "stable": { "version": [ @@ -107789,12 +108774,11 @@ "repo": "mbeutelspacher/ros.el", "unstable": { "version": [ - 20240328, - 855 + 20240831, + 1909 ], "deps": [ "cl-lib", - "docker-tramp", "grep", "hydra", "kv", @@ -107803,8 +108787,8 @@ "transient", "with-shell-interpreter" ], - "commit": "7ddba9077b3bc48074c8fac72159368bb612c42b", - "sha256": "0hbqnn5hwq6ssn57c248bkv1mxpx6lchfv5r4hk2xdl9v7d2aav0" + "commit": "7a1b1ff428a1b93aeb379d37849d55edfff1d9ec", + "sha256": "1h4qs79c7hsqck536xwrf4ikdid75npg8ncmma2bmpp4av7nk7b8" } }, { @@ -107944,8 +108928,8 @@ }, { "ename": "rtags-xref", - "commit": "4e6c219d38a3f3495470fbeeade3f771439e0df0", - "sha256": "15f3dcq2r4zhb1agd48k91a2d81ny4697hhyw8g6iq8y7m7nrrxx", + "commit": "258a113cb0f7902ca083c931c064c093b3721b52", + "sha256": "1hwzv2b6g05n6msxs88ylvvq4l503vsscxg0sxnyigpxgw681znh", "fetcher": "github", "repo": "Andersbakken/rtags", "unstable": { @@ -108546,20 +109530,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20240520, - 749 + 20240903, + 1233 ], - "commit": "d00d83d3a207a5b7c2994392b2781f627e3159ce", - "sha256": "08b4aj8achz3rl311m5p98sdgnh96ggfmia4qp2l147vd1a23r93" + "commit": "c87f6f82bd484fb1c15009c8a3518ebb62942605", + "sha256": "15nafhm0ssvqg1w55gpk91hsr7mq6ryswhnnhwmz007g8d6zc34q" }, "stable": { "version": [ 1, 0, - 5 + 6 ], - "commit": "7bff48894dc532caf4010be3060370d315ef75f6", - "sha256": "0sjhssxaqdd9mayfcjaf6pb0z4sv0xm5wjaqmk6wdmh543m2v1s8" + "commit": "527f8ff2b727d1c027965491ac88230bf2af24ed", + "sha256": "14al12fh707flb9aqz8b70mbb3b7ah5anal4ch60q68m0zzas56i" } }, { @@ -108593,8 +109577,8 @@ "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20240819, - 1214 + 20241012, + 1556 ], "deps": [ "dash", @@ -108608,28 +109592,28 @@ "spinner", "xterm-color" ], - "commit": "319a4ace84ae59bca44224eb93f440acfb105197", - "sha256": "0cm80y8s2qn7wsidn8jq4qv2ni5agrv5m5zqcvrismvqv4x0d6l7" + "commit": "34abafbd0ff921681d4ee6d84ce4787483f1e8d2", + "sha256": "0zh51a4gyp4hysha1phiyq9ray8s90iw9pfp1fkjnfsqx2gwaqbm" }, "stable": { "version": [ 3, - 4 + 5 ], "deps": [ "dash", "f", + "flycheck", "let-alist", "markdown-mode", "project", "rust-mode", "s", - "seq", "spinner", "xterm-color" ], - "commit": "53cacf5039f1d88cdd5cad98d1e9e0ad92da2615", - "sha256": "16vsv4fhj8zq9g4zrsmipdb1nydxgw3dhh5s3wawpvx2rcg6gx2l" + "commit": "d765680373234a6c231acf20c76b07422afcfdf9", + "sha256": "1kbhad1lc7jy7frp3lk14ch8g53zh28rwy8v7nb8fixlxbla0jml" } }, { @@ -108683,11 +109667,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20240819, - 1740 + 20240820, + 707 ], - "commit": "b47b953811b4f18f8f11f2e247d947d0c4c72785", - "sha256": "0nr513gsq5ihxiw6hrv7scdk5v8r60wrz6gnz8kmqklxaan9jrn8" + "commit": "83da38b2a816fda683d500eb4d3b10cff68c46e8", + "sha256": "0dycf7lb0rgbvij9grv437m9r8qgrynwayrd0695zyyqb90plzv0" } }, { @@ -108847,11 +109831,14 @@ "repo": "emacsfodder/emacs-theme-sakura", "unstable": { "version": [ - 20220822, - 254 + 20240921, + 1028 ], - "commit": "d78648632a94dd5354d2fed0f94fcb7aece29132", - "sha256": "0nxj6gx5virv95sfxbasvr2mh427w5srzjsfawhf58ixif8wkhd0" + "deps": [ + "autothemer" + ], + "commit": "22d36d0a9b05e4e24ec701c585145b032e42bc7a", + "sha256": "1kmjnvw4fhy5y2wlsncf4d5r9p6i2g20149pp1b41vrin0m2pj6g" }, "stable": { "version": [ @@ -109089,6 +110076,15 @@ ], "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" + }, + "stable": { + "version": [ + 1, + 0, + 7 + ], + "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", + "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" } }, { @@ -109176,14 +110172,14 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20240708, - 2120 + 20240926, + 924 ], "deps": [ "compat" ], - "commit": "17a8158cc55fed473aa87d53f3f2b42e1c249d11", - "sha256": "13h58abcpyykv136pfn7735jhx73dni91smmk52rv0p5cf8rd3qk" + "commit": "2dc2457650d56d7b495a3db1926acdfb57ad430a", + "sha256": "0skrrz57k9d9j82d1cxs7hvh3jrw2qnim6ks7bzfjwgk8lvl82rc" }, "stable": { "version": [ @@ -109262,11 +110258,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20240812, - 1639 + 20240917, + 933 ], - "commit": "3580c0c724df06af23dff986f0a7a400cbc58cb8", - "sha256": "02rm7gmlgxrpidvbj1s3gkqby5jrwvw8gfxg2i4fa9n1m00yyikg" + "commit": "a9faced661fddc76be9c8db8c2190309ec5eab3b", + "sha256": "09cypfgwia25lk2liaj5rly34kmfp95bsp9nd6jby71g5z76j5c5" } }, { @@ -109405,11 +110401,11 @@ "repo": "meain/scopeline.el", "unstable": { "version": [ - 20231027, - 1524 + 20240928, + 813 ], - "commit": "58d6ef20b6cf398c48571239311d812a2f926ecb", - "sha256": "0p10mpn9bbd6cccafw0h296xhavq8x46mn3292iks10v553b0li6" + "commit": "f9166b1df3aa3eebdac3b544da159b09eebcb3cc", + "sha256": "0yd7qxv1dcyzf2gcxnifk46rwx0h9zribc7k6mqmjdwazc5sskyl" } }, { @@ -109782,15 +110778,15 @@ "repo": "sdm-lang/emacs-sdml-mode", "unstable": { "version": [ - 20240801, - 1458 + 20240821, + 1835 ], "deps": [ "tree-sitter", "tree-sitter-indent" ], - "commit": "65e5bbd6e2e1a7c1e5795e20839a83ec9ddf48f5", - "sha256": "11avwv4nny33sdzj789ypkzgq06xangskr0s6k2zpfwpg7bq5d1y" + "commit": "86d2f30a0f49c2ca35e07382ce9620aeff7c9960", + "sha256": "1qlf1bcckw20y30iqxccscgdi1aqy3hiq5dh2ls0gg37q7ll8v8n" }, "stable": { "version": [ @@ -110066,14 +111062,14 @@ "repo": "captainflasmr/selected-window-accent-mode", "unstable": { "version": [ - 20240815, - 1934 + 20240831, + 1100 ], "deps": [ "transient" ], - "commit": "8a49af37909779cb47d53ea41922deec2d87fe29", - "sha256": "1r09mchbqdq0rc3kxynl3djaf8v2w9wgid8br4sw3x1x5m9c73ix" + "commit": "f4c2e7fed2702072cc5a73f2c56a75624ea85cc1", + "sha256": "0f9xlgl37cvpbn5vmp9kk4h0gywxp9r9cghrzgg0xnjak7b35bfx" }, "stable": { "version": [ @@ -110394,15 +111390,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20240727, - 848 + 20241012, + 125 ], "deps": [ "dash", "edit-indirect" ], - "commit": "89bfc60c9ed2a606643f9966df39998c973694ec", - "sha256": "11rzga8zbkzy0jx6w3maqian9nn7ijn0sxkq6qc5896yasg8zwbs" + "commit": "0001d2b4fcc6e5f40ebc82dd3c80ac7ce4031234", + "sha256": "14cs3vjfs077w5v1vnhddi8a7xag2x8b9vam8pdlcn48737bk7mw" }, "stable": { "version": [ @@ -111004,20 +112000,20 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240814, - 938 + 20241011, + 805 ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" }, "stable": { "version": [ 1, - 3, + 8, 1 ], - "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", - "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1", + "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi" } }, { @@ -111340,11 +112336,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20240819, - 38 + 20240827, + 234 ], - "commit": "7a669b232cbb840ef8c8a893e7ea672e7eacf3f9", - "sha256": "07hqw5w5h767kdf07wyqjgscsf1vw63l0apl13b5l69jaizrbx6i" + "commit": "5c9652141ac2eb8ad9bf68d74f760db526095ec4", + "sha256": "0dplbgq1n7mgnmn3wzfbkrpskdc71fh5bgqd9cplp0ax9ghcdynh" } }, { @@ -111545,15 +112541,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20240812, - 653 + 20240916, + 440 ], "deps": [ "language-detection", "org" ], - "commit": "71b17066edc8b49d11571ec94e339a93ab2f189c", - "sha256": "0yqwjjmzc0vv1x12vjffciwqzr1birpkr5nfihvaynwcc9z2iskp" + "commit": "2c3de9cb0c90b573f763243666e013901f472bf6", + "sha256": "027vi8gwwma6wr8n4n8n4grab821rm15a2xq639s0rglgqzy212i" }, "stable": { "version": [ @@ -111734,17 +112730,17 @@ }, { "ename": "sicp", - "commit": "1363d7b6e95375ac63f07eed2b3947f4f81bc9ba", - "sha256": "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz", + "commit": "5d0ecb90784cc61afeb9c0eb9ea86556f3c77378", + "sha256": "0d59m401nivb5mpp5nl0s83nxqlqpmzbd3szp304f32mmfgkbhyi", "fetcher": "github", "repo": "webframp/sicp-info", "unstable": { "version": [ - 20200512, - 1137 + 20240826, + 1844 ], - "commit": "4002d83083d520c6b5ede2df36cc2cee885d450a", - "sha256": "0c9lknrhwhi4v3qnnzmy0k24d8pr3d3mpxi9xzcxq97f5w1x4fsk" + "commit": "552b44fd873b5cadde4e76d10cef4d6e21a4287a", + "sha256": "0v3cwflnbqbw1k2m1yvl8xxna0ipgdqki7y9jpvqyhm6lhrkrmdi" } }, { @@ -111824,23 +112820,26 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20240627, - 47 + 20240824, + 2024 ], "deps": [ "ht" ], - "commit": "ba55945617f04763f9e93525fdf1e2826e4d667a", - "sha256": "1iizibw9aai04ni0g074a7yb5bidmwvq2ygw72gwxdg4v6h2wldy" + "commit": "0994d4d78f79385e5830563d42a41118acc5a9ef", + "sha256": "100wb249bmcc4ikj6zm0rwcyczabd994nakjb1w1kk4rxj5p2qjf" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], - "commit": "6b93ded69686fc5bd3b7ccde8334720814dc12c4", - "sha256": "1rnzyhkqbihp8j0g8nfg1wdzvyldks162wapr48lis74xjzzavdk" + "deps": [ + "ht" + ], + "commit": "795673c66bb77e6edc46e2667612924f9faaa828", + "sha256": "0nsf7zyclvh8i9lvyp3ndnlqr2f6w9n6mmpyv0dwyxnwr5crxwki" } }, { @@ -111851,15 +112850,15 @@ "repo": "emacs-sideline/sideline-blame", "unstable": { "version": [ - 20240101, - 918 + 20240906, + 1906 ], "deps": [ "sideline", "vc-msg" ], - "commit": "b597c047d2a8ef7dd155e85e43fd65530ecf0a61", - "sha256": "1w5bjrqsvi8k88giav3h7qagmwvs3n60ml9yd1avm49mb2xvd16n" + "commit": "48288bc77a90b58c7609598d0a129ba1638d0098", + "sha256": "17cnn5xga51j34z2m9c9mm6j9jgj9yqddk8g2idgli1sm9nv0mg4" }, "stable": { "version": [ @@ -112430,8 +113429,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20240713, - 1929 + 20240831, + 2304 ], "deps": [ "compat", @@ -112439,8 +113438,8 @@ "llama", "magit" ], - "commit": "3caff966ef5cdaf4ee4ecfb36d0fc87e8840ce73", - "sha256": "0v2ipikqpwfvylmix8wm82qmjkcvq0diqjcr8y0ly2zagdg6hkwp" + "commit": "9999af565f313507c8255c6c143963c9e8682c26", + "sha256": "0szk06hf60s7c0vrrmbqmh61p3685spwms4jidmi3mclrz3ychvn" }, "stable": { "version": [ @@ -112754,14 +113753,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240731, - 1518 + 20241013, + 1008 ], "deps": [ "macrostep" ], - "commit": "3fca003ac639df989af3cfbfc8112bd34ea1a042", - "sha256": "0n8lj44c5s9c1x7xydc8mfz46pzfm4kabl342ipqs53ppvhd715l" + "commit": "b37aff4842ed51b14ee583ee51d044e3aedb395d", + "sha256": "1iz1a0i30fmw54h4y5kp52l8mnclwjb3nwzw6fvzy555f262r7k9" }, "stable": { "version": [ @@ -113006,17 +114005,17 @@ "repo": "vilij/slurpbarf-elcute", "unstable": { "version": [ - 20240717, - 2213 + 20240922, + 1741 ], - "commit": "e85451da4a73e461f3ee2f62200cd241a72638ca", - "sha256": "0cjbx14f01fl0akc6xqf6cmvc8j4i4j1fy0j58avd04c3dxq62f2" + "commit": "98f0a9a124e46dd16683ff54208fee539945db46", + "sha256": "1ygi7j21hwf8j5340ciskcrkaaqcsw25c1qnjmqzgkkrrjyb4nxh" } }, { "ename": "sly", - "commit": "28d1f6bc44ef8ab731b37c3eb6bdc29b68465e50", - "sha256": "0rmglbkq3fhmaqm8gar3mn6f5r9cdb14anrnvr4n44x2d2qgrbn7", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "19zc0k6mdhwsandxbg70s85zm4qjv6zdyc94nkkpicw5aydi75ss", "fetcher": "github", "repo": "joaotavora/sly", "unstable": { @@ -113132,14 +114131,14 @@ "repo": "fosskers/sly-overlay", "unstable": { "version": [ - 20240107, - 2206 + 20240828, + 910 ], "deps": [ "sly" ], - "commit": "078c2db5390ef19d1336da067fe85b9586b261e4", - "sha256": "1svpfgfavwdbxg33wrb2phgj9sni3ilb025vpfv9v2lnwm7mdpvx" + "commit": "d62945059035f8097a6f222ed2700cfd99609d11", + "sha256": "18w1hv3xhzi6aibp5cxpb8mysx8ps89awakcg2n9kd2m98k1kyb5" } }, { @@ -113355,14 +114354,14 @@ "repo": "Malabarba/smart-mode-line", "unstable": { "version": [ - 20211005, - 233 + 20240924, + 2322 ], "deps": [ "rich-minority" ], - "commit": "abcb0ab6f7110a03d6c7428bae67cf8731496433", - "sha256": "1h5w5lrgrmhpaqwppg5msylh7z78mvwy9mm8xiiv8w4wxvncxxl2" + "commit": "bbed708eb8393697e01ab2474dfb54d7c5ea7905", + "sha256": "0jv0rcilp70xpxwjm08pgb33m7yh32gyj8jjfa4ma1xmabxqw7g8" }, "stable": { "version": [ @@ -113742,8 +114741,8 @@ "repo": "themkat/smilefjes.el", "unstable": { "version": [ - 20230129, - 2110 + 20240826, + 2107 ], "deps": [ "dash", @@ -113751,8 +114750,8 @@ "ht", "request" ], - "commit": "52ec05240efba2d5d4666aabf773a1aa63bb3f1a", - "sha256": "1s34jsj3hqjp3mfs35xcsyf8vf3k0sjiz0r5vckhzg52kcrvvksd" + "commit": "c7e4ebb06215e67e8bdd8299b4cc7405fc861f5b", + "sha256": "14avsrjs56l6x0aask97wn5i6xp5n8wsrqn7vbhl6xij40pn7gbb" } }, { @@ -113851,6 +114850,24 @@ "sha256": "18k2k213vgawxskp9m57r8qarg3pnza6nvbpyi6l03jnmf2kcw2b" } }, + { + "ename": "sml-ts-mode", + "commit": "e3f333ac675844d7efae0ad5ba005dc2aaff7edc", + "sha256": "0yddap49sq6h0fqr9r41fj871baln6qy7nqv8f5vgv83kdz6xyh7", + "fetcher": "github", + "repo": "nverno/sml-ts-mode", + "unstable": { + "version": [ + 20241009, + 528 + ], + "deps": [ + "sml-mode" + ], + "commit": "649408a823f8aef23ea1697c5f897950e9b1cd9b", + "sha256": "08xz2bjfzz4vlainkzlhj139wxxy27j7m7lxpn68pbgvn9w9vzna" + } + }, { "ename": "smlfmt", "commit": "a45339045d70e3a3f13dc2f4295c6f08fe3b5733", @@ -113919,19 +114936,19 @@ "repo": "k-talo/smooth-scroll.el", "unstable": { "version": [ - 20130322, - 414 + 20240914, + 415 ], - "commit": "02320f28abb5cae28b3a18f6b9ce93129bdbfc45", - "sha256": "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk" + "commit": "d7b276fdb906708c26dccfdb520021f9b0eb9c6b", + "sha256": "0d2qzpgh486cp0aa12ky1np1i49d0gskvldfw627v55qsm6ql9ll" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "02320f28abb5cae28b3a18f6b9ce93129bdbfc45", - "sha256": "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk" + "commit": "d7b276fdb906708c26dccfdb520021f9b0eb9c6b", + "sha256": "0d2qzpgh486cp0aa12ky1np1i49d0gskvldfw627v55qsm6ql9ll" } }, { @@ -114016,11 +115033,11 @@ "repo": "tacit7/smyx", "unstable": { "version": [ - 20141127, - 828 + 20240914, + 1200 ], - "commit": "6263f6b401bbabaed388c8efcfc0be2e58c51401", - "sha256": "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x" + "commit": "ce6dc4b1c25ff8c1d6c9b9015e0199355c46be4d", + "sha256": "1dz6ncipii5vc38r7s26s0xl3cy6ri8mr28yp108r9zq1ssm2inm" } }, { @@ -114164,8 +115181,8 @@ }, { "ename": "snitch", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0jh7cs89gwck5589mhswx52wkfs2pbmrwlivk7qzdxisdkyb0vf8", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0di3pzl3r4vr537l28drylflfm6f27qrha7h0jc8i8nkbjg0g5hp", "fetcher": "github", "repo": "mrmekon/snitch-el", "unstable": { @@ -114595,20 +115612,20 @@ "repo": "djgoku/sops", "unstable": { "version": [ - 20240621, - 1919 + 20240907, + 1739 ], - "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030", - "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi" + "commit": "46548b854b35983b2e9e5eb4276634dfc41abfa0", + "sha256": "0h2x5ngbf7pi82l5p0h6fm8jc98r3mx37rd7pj52qjyzq0x6nsqs" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030", - "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi" + "commit": "46548b854b35983b2e9e5eb4276634dfc41abfa0", + "sha256": "0h2x5ngbf7pi82l5p0h6fm8jc98r3mx37rd7pj52qjyzq0x6nsqs" } }, { @@ -114734,15 +115751,15 @@ "repo": "emacsorphanage/sound-wav", "unstable": { "version": [ - 20230929, - 721 + 20240925, + 753 ], "deps": [ "cl-lib", "deferred" ], - "commit": "b522e7fa0ef24ec669d0b02935287c2a6cc8c314", - "sha256": "1cpy916q2hf48j0wiginpsi9srqs9zkjq5m3pc4p1aj95cgaib2v" + "commit": "cf206c3b5b6e3f1531e3486aa9e214d11b638c4d", + "sha256": "1rzjjn9na4ndxmki6gdw8bdxaj1wzqili9v11c8cag9i5pgl4z8w" }, "stable": { "version": [ @@ -115041,11 +116058,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20240815, - 2134 + 20240825, + 1709 ], - "commit": "d02edec79404e807445b62d0d2fc1a6fbcc10c71", - "sha256": "15ychqqc05ajwd4nq5w360ayravbywdlm9lxbv6kchn2lm8y0fqp" + "commit": "9f3781430106adfe512790d55a9705568b58d968", + "sha256": "0q9rzih1c9r5bycvsr9iaimxz8fgh2r6z9wb4il69j3sbly81p12" }, "stable": { "version": [ @@ -115184,11 +116201,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240815, - 107 + 20241011, + 118 ], - "commit": "65f4459dc2368d037417247b380d03708f7b8fc0", - "sha256": "1pmbfmmwd2vzxswlv1984c2qxi5fjdzzmzy018n25dyfkx552nvn" + "commit": "28ccd3a7df1a417874e9c5ce05e5d372d42f24b8", + "sha256": "0jvwm217maa9qcajqkc9s8hciw5jkh8iy0dxsxf01xmr6mmqxwqh" } }, { @@ -115231,6 +116248,14 @@ ], "commit": "ac7497e394bf7d46e0b2c27570f5507f6a50a157", "sha256": "1y8r75sl28kll8r6qzqnbri18j2kgvqfh73yi9kszld5zz8d95mp" + }, + "stable": { + "version": [ + 2, + 12 + ], + "commit": "ac7497e394bf7d46e0b2c27570f5507f6a50a157", + "sha256": "1y8r75sl28kll8r6qzqnbri18j2kgvqfh73yi9kszld5zz8d95mp" } }, { @@ -115312,11 +116337,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20240616, - 2345 + 20241011, + 206 ], - "commit": "74d2701d78c1759074566f150d96a3596072359a", - "sha256": "1fg6nyfw1hwfx8gxwkqyyy4b6hhb4nhvxpzq2zv89zqwkvn0byhc" + "commit": "d465d70126d7ff8e37013ef942c292aaa1ca23f3", + "sha256": "0v9jr5z8v76d94hl2akf8db7y9gfs2hfamgb8b3dz3jhdrgs62x1" } }, { @@ -115466,11 +116491,11 @@ "repo": "jakewilliami/splunk-mode", "unstable": { "version": [ - 20240422, - 828 + 20241002, + 1040 ], - "commit": "3a9b114fdbabb6e7d6206b1863c54de438bf506b", - "sha256": "02xqingvciigy9bhl1348h0cidx09wcq6fi6rws71jsw99ppfls1" + "commit": "bc0ad3ed26e2f6d46c430a3f1ab86c93c4483403", + "sha256": "1xhi9dmsk8ahfk6a660sm1i5888z0506j93pgrlas6brcw561jhm" }, "stable": { "version": [ @@ -115951,11 +116976,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20240813, - 1909 + 20240924, + 1924 ], - "commit": "3dac6e04eb2ed797a617abf6b3288808e83d66b4", - "sha256": "1xd2dib5xhx0z3cdf0p21swialwaz4wc1vswy0mnpicvj9hrnqbz" + "commit": "1dcf802700b39a078d970c2e18fcae91f674b0ff", + "sha256": "0pdizm62plhk4j26fszb93vy1ijq5wv1g5gi9sdav52rim3pdgfp" }, "stable": { "version": [ @@ -116062,17 +117087,17 @@ }, { "ename": "ssh-config-mode", - "commit": "750b16ee631b4c2014f2ebf767609bab4b8ee421", - "sha256": "1jlaf1bipmf51552jyp2ax6n4gwg38n2348kyxlwd7d8vwsibbpq", + "commit": "d8d2cc1084e9f592792885c19d0e132c739455b6", + "sha256": "0kvdy2h0fr5klp9c3r15xys3mf9f4lmrhq7hb19gkv9yfxx56yb0", "fetcher": "github", - "repo": "jhgorrell/ssh-config-mode-el", + "repo": "peterhoeg/ssh-config-mode-el", "unstable": { "version": [ - 20211003, - 2330 + 20240901, + 2018 ], - "commit": "00822e4abd6976d1f2bfab7f423d72509b8096fc", - "sha256": "0x3kl8hn5y3f98jmcl42hqzbcxk18ik7fjwrr08mbfv421ks80gh" + "commit": "2d8e321c34a7535ae6dd0f6a1b0fd54e47aba612", + "sha256": "0l5k7g4cq4ay7c5q961562naqq55732q3b2qjgg32800qzrid3kc" } }, { @@ -116425,20 +117450,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20240817, - 2126 + 20240909, + 39 ], - "commit": "e666bf88cff0706166dd6b086414913ecc1a8f21", - "sha256": "0h14fc7whqfraspsb83c5z71cmd2hd0kjzxdb0p33yivl710qgfz" + "commit": "b691c04d4237394977b603867a063778668cbab3", + "sha256": "1ind7jprg1gb1zgw0phyxknacg4q1s3536hr0ha9c5jadrshpm3w" }, "stable": { "version": [ 2, 4, - 10 + 12 ], - "commit": "e666bf88cff0706166dd6b086414913ecc1a8f21", - "sha256": "0h14fc7whqfraspsb83c5z71cmd2hd0kjzxdb0p33yivl710qgfz" + "commit": "b691c04d4237394977b603867a063778668cbab3", + "sha256": "1ind7jprg1gb1zgw0phyxknacg4q1s3536hr0ha9c5jadrshpm3w" } }, { @@ -116458,17 +117483,17 @@ }, { "ename": "sticky-shell", - "commit": "8e0e00197932ecea0963ea4c2c450d9b60c346d4", - "sha256": "1zmksmckz320yj1hw0ng4iii8xqjhz4am7nkrqqqipd82s1whrzv", + "commit": "20d69241bf221bc4ab1b9f9ea60219e305d4aa14", + "sha256": "1yg33ld0bs8hf7304xyqq336254qc582vz14iplrhyx17gqcis64", "fetcher": "github", - "repo": "andyjda/sticky-shell", + "repo": "andrewdea/sticky-shell", "unstable": { "version": [ - 20230207, - 1454 + 20240928, + 427 ], - "commit": "030535451b7c12eea3a94dfc1a439b8baa96944b", - "sha256": "0l1kmrkhykqbsmasjrrffgwahycdpi2jdpl4hn5y3p3xv16yhcwq" + "commit": "2aec19f60539faf21f567e89701a8e28492eccd1", + "sha256": "0x3jzbnsc9dlkl2crp8fwnqwcihdrw7as5vb26v44g8wqj96z8w4" } }, { @@ -117309,11 +118334,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20211016, - 652 + 20240920, + 609 ], - "commit": "6a1d4274af7f4c0f271f77bd96678c3dd1fa68e1", - "sha256": "058mxzcrxqzsax21bs50vysr4ia3jcig83xbns0vhziqpj220yl1" + "commit": "edfef1e0abbf92e18027f6f34f7b5a6f03c1a28a", + "sha256": "12n7ys3g37gypnbll41qp8wyrs3408rawsllwclhl9xzg1cxnrla" } }, { @@ -117354,14 +118379,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20240624, - 857 + 20240828, + 820 ], "deps": [ "svg-lib" ], - "commit": "ece58da9362d34be48ac658107bd9b99ac250162", - "sha256": "0d1bkdqwawscdi1xfh54rv19sxfdagnxy1gz0xqkq8lhgs6asdsy" + "commit": "91179d9576850312b00583910a55c798ba615382", + "sha256": "17z1zkgz1phhfp1avh37wzp31n8092xjq5fw1vyg4wjyx019444q" } }, { @@ -117652,26 +118677,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20240622, - 935 + 20240921, + 444 ], "deps": [ "seq" ], - "commit": "b06c97b909418b5dca3d15351b2ce86a04df32fb", - "sha256": "03b7n4sw5q7dhl06bm9bkdzhlzn5kyvlsc149jplc4c9xxnvnki6" + "commit": "ab189d6e89ac4c0f776d691a41ddeaf9730260d1", + "sha256": "176p83c5gjm645qdvw0zcgs5l2yr68l6nyy03rs30b170yah14h6" }, "stable": { "version": [ 9, - 1, + 2, 0 ], "deps": [ "seq" ], - "commit": "e58417ec871d260fe47183ffe4b7e47ac09bc682", - "sha256": "17gcg55jajq3am3nrzlsibkdwskq1rbg3lhgxynkpky0ihci35nr" + "commit": "ab189d6e89ac4c0f776d691a41ddeaf9730260d1", + "sha256": "176p83c5gjm645qdvw0zcgs5l2yr68l6nyy03rs30b170yah14h6" } }, { @@ -117721,14 +118746,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240520, - 1202 + 20240829, + 1723 ], "deps": [ "ivy" ], - "commit": "c8808d88c633fdd00f7671fee054954f3a7598b8", - "sha256": "14f5kfs3sj699397pz6w59pyv9qhw8jbswyq0964k483570n4skp" + "commit": "8dc02d5b725f78d1f80904807b46f5406f129674", + "sha256": "10gggaddmny3jgvppmka854cbf4ifv5gljdlhqyww6g7zlhwz48d" }, "stable": { "version": [ @@ -117988,25 +119013,25 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20240311, - 1207 + 20240913, + 1624 ], "deps": [ "seq" ], - "commit": "de215fff392c916ffab01950fcb6daf6fd18be4f", - "sha256": "0n4102h319fpa2gqz6kdz9qx2r63lq9530xmg5mckkjsv8zd706d" + "commit": "6151f4279bd94b5960149596b202cdcb45cacec2", + "sha256": "0xqzn4j27xny3gmjan9phcl60zipp49p79nv57i7mpz8y0qahc59" }, "stable": { "version": [ 4, - 2 + 3 ], "deps": [ "seq" ], - "commit": "39f772b531117edba596e7a1210b3dbb87d56adb", - "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2" + "commit": "6151f4279bd94b5960149596b202cdcb45cacec2", + "sha256": "0xqzn4j27xny3gmjan9phcl60zipp49p79nv57i7mpz8y0qahc59" } }, { @@ -118073,8 +119098,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20240721, - 2333 + 20240920, + 2329 ], "deps": [ "evil", @@ -118087,8 +119112,8 @@ "tree-sitter", "tsc" ], - "commit": "fe45b0bb13a6a906cc6ac7d836a4021ee4a82421", - "sha256": "170nz5938bv3908lp6wqfh7bn1kj0f8aj45fqrlnabnwy06p6x1y" + "commit": "6e9867002919576d8ab69d14c7d6095fe42d3a16", + "sha256": "08kxgzv22x2ysqmlwhzpvh6y2rfd83vnqks42g26a120r942zpqs" }, "stable": { "version": [ @@ -118768,14 +119793,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20240713, - 2215 + 20240924, + 1414 ], "deps": [ "project" ], - "commit": "7ca3131835da6eae52af723ec8a951801b2376f5", - "sha256": "1zfk9h82hlh46gzi02wgm3alpcympzjapx8kjrma41yd0nmdpi21" + "commit": "49bd9508bade2962f72f4fab9ffc12ef31c271f7", + "sha256": "1cn0ccv65n4j6q1g17rgz3acrzg6w65x0zfrnpxbm8dfid4r6zr5" } }, { @@ -118974,11 +119999,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20240710, - 1449 + 20241007, + 837 ], - "commit": "db698431a55bb68b8d756de3be7fe4a235ccf55c", - "sha256": "1ndka7dmf5p01nwz72r4cs3npl7zv3hixz6kwyf324n9xfar79z4" + "commit": "eb3907798188f3117f24eec8f295b9490f6a0953", + "sha256": "1pkhlnykawxkv4zaghqb1ssiypg6j5pjc73f60gmjpsxwb8ki0xj" }, "stable": { "version": [ @@ -119081,8 +120106,8 @@ }, { "ename": "tc", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "1l73y78k3snx2174kz3zv5gv74f3sm4jfy14l35kgyq8ddw3zfkg", + "commit": "349b5dbbb248a812c1099b255a0e3d5c8704046c", + "sha256": "0lidvz8rrs5hjklxjm4svpw384aql5mi6vdmzy4p3bsra0bk5sk9", "fetcher": "github", "repo": "kanchoku/tc", "unstable": { @@ -119165,16 +120190,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240818, - 929 + 20240911, + 638 ], "deps": [ "rainbow-identifiers", "transient", "visual-fill-column" ], - "commit": "d86d943beca37b9270060e9acca65e8fe3f322f3", - "sha256": "0jwdv8pi7g1s44jvasq0apkmdfi2x8vk3ffznp3pm5mmrch661vn" + "commit": "aa891d2a5a6cba18ab79b42d396795f7b61f2e9f", + "sha256": "04raas24bvrjsfk8div8822cgiyqy5n9bsqxwvrjjqy54jf2m2jp" }, "stable": { "version": [ @@ -119305,14 +120330,14 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20240723, - 2206 + 20240926, + 925 ], "deps": [ "compat" ], - "commit": "317c0e41d542721db11a7a8a1c6b78762959259b", - "sha256": "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr" + "commit": "7414b13cf9986f241f89149ccd2c39f1ec1d110c", + "sha256": "15wd5gh8pni9kyflz317pdl24cr3cq7hmxy0bhckz4lmvs91vv9i" }, "stable": { "version": [ @@ -119334,14 +120359,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20240507, - 805 + 20240903, + 1136 ], "deps": [ "tempel" ], - "commit": "cf2594313a41f6a29205e378411ebb10e9d764c3", - "sha256": "1zq17avwf9mfgr5jq9fnvx4c25a2mfr2wf3ip1ix5n3700z48ry7" + "commit": "cb7367ac57e3ddec687e11d1567e8b3843e0d311", + "sha256": "18m9pxk9shwdr80h18kzy8sgr0ifa3sma6y4k5n59lcq4nkmlpg1" } }, { @@ -120102,11 +121127,14 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20230425, - 1154 + 20240921, + 824 ], - "commit": "7ae616e45005c469273dd4285cd0808885860984", - "sha256": "03ccdjrqxqr88snivs4vqk9w1wdgcm7v83fy6wjfkmf8a29jan0m" + "deps": [ + "dash" + ], + "commit": "ac1a5900c80a967572b80045b0dbc2a1cc3437f2", + "sha256": "0y0iz82hns88wj0a95zr9292q3lf2xb178a517vx34r7phr0kiq3" } }, { @@ -120481,21 +121509,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240818, - 2324 + 20241014, + 1131 ], - "commit": "a591631fe1e77459e71fab018f0c1b326a2f4c26", - "sha256": "0d9s46k0h8c7c3pcynlqyjy7bzff9884y8pi0yka6b5gvvn005xf" + "commit": "f2c4e6c61f8235d909f0af06ac0bb3043a2ce3a5", + "sha256": "07wz8di70q1cpb853rfkxa70bfqpkwidm31wmxxk8abar4zm0a3i" }, "stable": { "version": [ 2024, - 8, - 19, + 10, + 7, 0 ], - "commit": "a591631fe1e77459e71fab018f0c1b326a2f4c26", - "sha256": "0d9s46k0h8c7c3pcynlqyjy7bzff9884y8pi0yka6b5gvvn005xf" + "commit": "8d6d2cea014274c23db498400f1559e5a82995e7", + "sha256": "17nxbjab5kr2hyy34mys22k7h7wz4b8ha1yy05cvrryhiyi45gf7" } }, { @@ -120885,11 +121913,11 @@ "repo": "aimebertrand/timu-caribbean-theme", "unstable": { "version": [ - 20240224, - 2028 + 20240227, + 2103 ], - "commit": "ec83fc030ad7c098637df6f3a56d844f8526c571", - "sha256": "0pf7sdcc6gpb5k8qmig7bgxhdqxl3jgah4wcvxcv8s8cfmmhrlfx" + "commit": "9c6ea9dd33dffd939a8f4a67097329d72c381b11", + "sha256": "1z488qr0y6grq3zadyq1xwhgxcxvwdjfdn7bm9mynf84iixikff3" }, "stable": { "version": [ @@ -120931,11 +121959,11 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20240401, - 1346 + 20240404, + 1614 ], - "commit": "7734bd7287fa18cad8c146beabd52b52444e9da3", - "sha256": "0zm7wyjjwz9hlx23v1nvxnxgizb8q31bcg1fqh5gsgijka9fdzqx" + "commit": "ed50e3b01f832f60aa183643c8223ce9787c729f", + "sha256": "0c9xyg9hbrbn52y7lcpjzf2ipkd7xmp7rgswcbci4nmi7plxcwc2" }, "stable": { "version": [ @@ -120954,11 +121982,11 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20240224, - 2040 + 20241002, + 1205 ], - "commit": "2095a2bedb2682145407e149d1c2b1c0aa02a6f8", - "sha256": "0zzk4ydf245x8wz6sbmpnch614k7h0k8zyllw9x4l2paw4las5fv" + "commit": "5ad5e1c35ef9228938598aac7b0f3aef51c9d257", + "sha256": "0jm9wavq7pj6akp4q75nxa6bal8gazj8h8rp51fnp05wj5frp6pb" }, "stable": { "version": [ @@ -120977,11 +122005,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20240224, - 2010 + 20241002, + 1256 ], - "commit": "1cca501c9640a9f1d6bf717dc36df96d35deeeba", - "sha256": "13ymng05yvdx1pddnb8hwqs8drvgmkyhndqqahdcg3bd41qkijb6" + "commit": "720168572c48ec0c527db89c7bf2699b5f87d477", + "sha256": "14wx40qv4nnqmswc9qrw7vl43vwqz9bw7l4s41m0ww2liwrdx4cr" }, "stable": { "version": [ @@ -121482,20 +122510,20 @@ "repo": "jamescherti/tomorrow-night-deepblue-theme.el", "unstable": { "version": [ - 20240727, - 51 + 20240922, + 114 ], - "commit": "6e970e273ca3e4228145e968401497b38f0c9760", - "sha256": "0cpb8blskri1347csi29vicxiim5lzqdz5q8dndi111vv0i4lz9h" + "commit": "83cdd101e8ff25e1fe6addd224ab726095616304", + "sha256": "1qj3yf1izk9qlnpmq39dfdf0r5sq8csy8ynrkb6ari3xi7w68y3p" }, "stable": { "version": [ 1, - 1, - 2 + 2, + 0 ], - "commit": "5359e32f641ba4f2d596999d32a702182a1add73", - "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp" + "commit": "cebf87c7c19eff0cb7a81225dc052e21861b12ae", + "sha256": "0gmy84p30g16nhx4scwyyjg2jsisrpki577m9hyiyg7wjwq2x85b" } }, { @@ -121573,6 +122601,25 @@ "sha256": "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv" } }, + { + "ename": "torrent-mode", + "commit": "f7db042667dbf2870758d16367ba99589b0fe920", + "sha256": "0z7vc3903mg0j0v4jiphbfywjfv8qj748wzfx6vnqph6zgvwnfsn", + "fetcher": "github", + "repo": "sarg/torrent-mode.el", + "unstable": { + "version": [ + 20240923, + 503 + ], + "deps": [ + "bencoding", + "tablist" + ], + "commit": "c7ef935dcf7b999981f441794ddbd98c3216bfee", + "sha256": "06mxlsg5yqhssyr612377l0pv67xjr4g06rmmim7jh7w0z379ibv" + } + }, { "ename": "torus", "commit": "efc3b538861084cc13ff067a9258e55dc006b70d", @@ -121954,34 +123001,34 @@ }, { "ename": "transient", - "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", - "sha256": "1a7q41wn950nj3l19mrlp415svix0v1794f4dx3aja4f8shkzvb1", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "0pjj4zj3sa6mhf7fwb5b33y9b506g3bcjyzy44h5n6s79shbak60", "fetcher": "github", "repo": "magit/transient", "unstable": { "version": [ - 20240819, - 1250 + 20241008, + 1824 ], "deps": [ "compat", "seq" ], - "commit": "042291c530f71ea778b40a43552ec7263da24e8a", - "sha256": "0iddjpzw9hbhpzq81fyc5qsgbiky93acz2gm57hfr9jj54807s1w" + "commit": "8873c300b2cf8c648278210205c1d3234e387a30", + "sha256": "0q0jsvl9irhsp3blnl4yfnfwgafr13kc4i4xlxjccf2y3q75qlf5" }, "stable": { "version": [ 0, 7, - 4 + 7 ], "deps": [ "compat", "seq" ], - "commit": "b2cb4e578f2362a0354c4a31a6bd89d6c4b63d63", - "sha256": "0ad0qkcvc9w6ry8f4b6xrdy52vlxm8nrp67k2p97w6prhyfxbp7p" + "commit": "fc03c0b75826aa771b682137aa3f4e24130a9e3c", + "sha256": "0rdhjb2fcxwxpbr7lrjqqqdnag2zqs8l6g4yw59bkp4g7kxpmmar" } }, { @@ -122257,28 +123304,28 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20240811, - 29 + 20240831, + 2205 ], "deps": [ "compat", "transient" ], - "commit": "fca0ed0010473a61be135b2791426ae5463fe9ea", - "sha256": "14kasydd09aff3jn5zkyk4wp4q97741slin1389673l3l04hha1q" + "commit": "68d6fa2f2cd7d40c82af6c78b7647a585755c1d1", + "sha256": "1cp9fs2ijnjvf2f409i4wabzk062wl3hv9mc6ipkjgrka1rnvp93" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ "compat", "transient" ], - "commit": "988afc5967237ed9acfd6d9a53c631e476fccc62", - "sha256": "117ddayip71gmn62v179jkqd28d4zjrdl2pz8cnfwmlxaf7236pi" + "commit": "68d6fa2f2cd7d40c82af6c78b7647a585755c1d1", + "sha256": "1cp9fs2ijnjvf2f409i4wabzk062wl3hv9mc6ipkjgrka1rnvp93" } }, { @@ -122436,26 +123483,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240818, - 1702 + 20241006, + 953 ], "deps": [ "tree-sitter" ], - "commit": "1c3d95d018c6ab09dbe0b31530bfb1865fac2e5f", - "sha256": "0y34dvfnc1mp4z750mqk1i6f4526x430j0s6wk8cy630vj90p42n" + "commit": "62e169d3122658761581105c91d8a6aad103fed5", + "sha256": "0ssf35m6ihbrh4gnp7ikv6jzbqarcpwarb9jbniiba378czas07h" }, "stable": { "version": [ 0, 12, - 212 + 226 ], "deps": [ "tree-sitter" ], - "commit": "1c3d95d018c6ab09dbe0b31530bfb1865fac2e5f", - "sha256": "0y34dvfnc1mp4z750mqk1i6f4526x430j0s6wk8cy630vj90p42n" + "commit": "62e169d3122658761581105c91d8a6aad103fed5", + "sha256": "0ssf35m6ihbrh4gnp7ikv6jzbqarcpwarb9jbniiba378czas07h" } }, { @@ -122846,11 +123893,11 @@ "repo": "volrath/treepy.el", "unstable": { "version": [ - 20230715, - 2154 + 20240930, + 728 ], - "commit": "75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e", - "sha256": "0crj4522rakbkhffr7hm1rgczcnd8ph0fzm2sz1qkc85680zy86h" + "commit": "651e2634f01f346da9ec8a64613c51f54b444bc3", + "sha256": "0y34sb1b3sgkn3kfsw0hxv9sw4xshizyynbnbica6vdckfvxdnqn" }, "stable": { "version": [ @@ -122938,9 +123985,9 @@ }, { "ename": "trimspace-mode", - "commit": "d960195dbd955244478aaac43db4ef924efb9b58", - "sha256": "016blxasn2ghrj49dq6bn8w1p8d3vglqf9f6bz74nq5iccy18kg4", - "fetcher": "sourcehut", + "commit": "fe241c5566443a6c4edc397c2d3d0bc2696b99b3", + "sha256": "1nnvcfqp7h9ckwxzbc4385515ygr08rjv056pd3p6gwkib18q99c", + "fetcher": "github", "repo": "bkhl/trimspace-mode", "unstable": { "version": [ @@ -123521,6 +124568,25 @@ "sha256": "1s5xzi1zqvl6395ynyrlq89d8cisnwzsdj1hgyw6zzd2vz4xy65z" } }, + { + "ename": "txl", + "commit": "61bc7b44101546045ae7b1adbd48f3b5b6e048a9", + "sha256": "1rz25py5y68psh7rzpxxkpbc2qwi8l90y76k0hzl2yb1d2fiar9f", + "fetcher": "github", + "repo": "tmalsburg/txl.el", + "unstable": { + "version": [ + 20240916, + 618 + ], + "deps": [ + "guess-language", + "request" + ], + "commit": "b60b2127cd342d54cb4f54984e84f6e39da68678", + "sha256": "101kj77jvdkjlnn64h6k8x3flwi0qxmr3ydagarn8as9dvxxsf6l" + } + }, { "ename": "typescript-mode", "commit": "94455323364d5a6b00e2786d577134eb350826b4", @@ -123863,14 +124929,26 @@ "repo": "crmsnbleyd/uiua-mode", "unstable": { "version": [ - 20240711, - 852 + 20240930, + 1206 ], "deps": [ "reformatter" ], - "commit": "20344ddaa401ed172e4b3649076ae33c117918a0", - "sha256": "0qnnwkbgx013zfiihw5lfahmqbcp8ic8d03a7z1d3ic5lx439phh" + "commit": "5627ac4450d5a5d2c657befc63c7594939c5ff4c", + "sha256": "1gnrjlp0p55n02vx0p1krjil2pxv4b7hg0krazs9b3nr2ar4cfqg" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "reformatter" + ], + "commit": "5627ac4450d5a5d2c657befc63c7594939c5ff4c", + "sha256": "1gnrjlp0p55n02vx0p1krjil2pxv4b7hg0krazs9b3nr2ar4cfqg" } }, { @@ -124125,14 +125203,14 @@ "repo": "emacsorphanage/undohist", "unstable": { "version": [ - 20230508, - 1226 + 20240925, + 754 ], "deps": [ "cl-lib" ], - "commit": "76338755b8aa710a07d6bc6faa4c03d792e90d82", - "sha256": "1s1574q85lflik7w983v859qgxy1sn6i09hspa78smiawfva1855" + "commit": "fd11900663f307958dc7e1d7ea1b0004f6cdb4d0", + "sha256": "1i5xkcmnwmphylwk2xzr2b4iidz6cwh1k25nh24768l9j2yxxfd5" }, "stable": { "version": [ @@ -124475,6 +125553,24 @@ "sha256": "0pmln3z3vz3qnxbv79n8lrk28k9759czz6wllk81m1np5k6yjhnj" } }, + { + "ename": "uniline", + "commit": "402076c044028b65e4f1d0e08a7ee865b624b691", + "sha256": "00jfyvliycg0whlnwp79czjrchi2bj7c5n715xn9bk5m20kqkwb1", + "fetcher": "github", + "repo": "tbanel/uniline", + "unstable": { + "version": [ + 20241014, + 1600 + ], + "deps": [ + "hydra" + ], + "commit": "51f8096af29bc67ab6defedf3bf71e82e64e67c2", + "sha256": "04l48gaqyvsxfpvrgi412qjx95283yi30r6kcw9rldpx9hvqywwk" + } + }, { "ename": "unipoint", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -124965,20 +126061,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20240721, - 732 + 20240927, + 1611 ], - "commit": "3ef802532520c31ba7a4101748bac516325890b5", - "sha256": "1hqqibzf2nz5apj4m41hilfwwp6i34bkw9mna63c90hy191kk8yq" + "commit": "9d2b4059511979fb9d09b3287b8fc64b510adbd1", + "sha256": "115f1caaxgqfngpmpbpkx5hcjpyj3n3h5wvvk4ypaffc2m4k1b7y" }, "stable": { "version": [ 1, 3, - 6 + 11 ], - "commit": "3ef802532520c31ba7a4101748bac516325890b5", - "sha256": "1hqqibzf2nz5apj4m41hilfwwp6i34bkw9mna63c90hy191kk8yq" + "commit": "84689fb37dfb6ddbd0a22cc1dcef25203f0689a8", + "sha256": "06fabv3b4ghljg2ybriswqc71avb4mzjpwc373k643l5gj47wfnf" } }, { @@ -125086,35 +126182,6 @@ "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" } }, - { - "ename": "use-package-el-get", - "commit": "7566d3d57203ab8483d6f7a0e6a10082f106ab80", - "sha256": "11n4142zcqpx4jqwrv6s6v2nd7zvfn4h6l4y3rm3v1mxvd9wb730", - "fetcher": "github", - "repo": "edvorg/use-package-el-get", - "unstable": { - "version": [ - 20180131, - 505 - ], - "deps": [ - "use-package" - ], - "commit": "f33c448ed43ecb003b60ff601ee7ef9b08cff947", - "sha256": "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "use-package" - ], - "commit": "f33c448ed43ecb003b60ff601ee7ef9b08cff947", - "sha256": "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z" - } - }, { "ename": "use-package-ensure-system-package", "commit": "6240afa625290187785e4b7535ee7b0d7aad8969", @@ -125542,6 +126609,30 @@ "sha256": "0xhy860w17aj79mc5pz6cppbmv7ks7zcyh95qdw8kw5cm9cv1wfj" } }, + { + "ename": "varuga", + "commit": "66011b5520df38daf9ba775c3ad80ba779f8835e", + "sha256": "05vmlr5mdcy2nnj00ckw5bgvwnnkvyfpaay13i0mh195113zdiwm", + "fetcher": "git", + "url": "https://git.systemreboot.net/varuga/", + "unstable": { + "version": [ + 20241006, + 2204 + ], + "commit": "b88ea762f7f0c321176ffd0d5d47c89d6971faf7", + "sha256": "0qpybhhndrj8hd6wy7kqrc3csx3y2xiy9j7447fkfq2zxp8d26cx" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "acec08c32c4acad306ed67b57d082d9e0d0f284e", + "sha256": "01hlnhqhys8qzfwhza1ypc436zg5lhlkx5yy71bhmrbmyfzfh0fr" + } + }, { "ename": "vbasense", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", @@ -126044,11 +127135,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20240808, - 2150 + 20241012, + 1924 ], - "commit": "ae0c111ab00eb3bc2657fa0f0e1ffb455103ceb0", - "sha256": "08dp2j1mdm5gz2s652w4lca3v7pqavv5qfp2vlgp2iv0dzs0na30" + "commit": "98934fef8cd2bc339f40abb36ee4a6776e50872d", + "sha256": "12fcji7q50w174fvmdyf7fxpp2yi3g7dn8z75ril7s9c3ajgfr67" }, "stable": { "version": [ @@ -126062,8 +127153,8 @@ }, { "ename": "veri-kompass", - "commit": "18c3a69bec780e3e7456b310db6f0eec2a35c753", - "sha256": "103x4003qj0z9ki6xz4hymamyhipzfxz94x4gszk3k2qnvkjkxnj", + "commit": "f98962bf6b55a432a45f98b0a302710546d1be07", + "sha256": "10yq6yq275lawy3h58ai3g4d74135h9jv8afj13ak3ybr1phzrfh", "fetcher": "gitlab", "repo": "koral/veri-kompass", "unstable": { @@ -126105,8 +127196,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20240729, - 1502 + 20240917, + 2129 ], "deps": [ "ag", @@ -126121,14 +127212,14 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "de2f4af5ff669d2006eb84ef4bbf9f6a30cfb478", - "sha256": "0lvklhrwx66i4snr50daiadlpmp2ip798l8jap7v11z6zbmr681q" + "commit": "e8af8cfea86dd3cddacf5d069f04f2d84e6f6a71", + "sha256": "1m47cvqcyv7i2wjy3hadpma223kkr0jpnf9wp8jbcqzin30sp8cx" }, "stable": { "version": [ 0, - 5, - 0 + 6, + 1 ], "deps": [ "ag", @@ -126143,8 +127234,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "2488a25267d1e3b612f1da617d5a9506d6db8275", - "sha256": "02qgvb6rxg114picmr9v82rhk4nx848xgxddlq3hlcdvmr15szq2" + "commit": "a30077eaee6187551003c8176c42e18145fe6be4", + "sha256": "0ypyp3j40nalq9sixn3dcjxh4m0fmhaibvzb6w13r2jsgw5dr0dd" } }, { @@ -126155,20 +127246,23 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20240729, - 1918 + 20240925, + 1626 ], - "commit": "aa2dd2217006d414e4637cf69515508978fb8bc0", - "sha256": "17ff6j9a5qpccjfwvq6mz8l0jkz1pid70x8f4xmbc2zfrbpajk8g" + "deps": [ + "verilog-mode" + ], + "commit": "583bd26d05981820a8e4280278cb638cd00b4fd2", + "sha256": "1bd0hlb9fcf1zmprfp54kdmp28s2i5ipvzqi2plz5f510aif20h0" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 1 ], - "commit": "f2dda1b25a06661569e393b04902be6a8e992b90", - "sha256": "18bmp1al4wsz7pcal39qbgb0q2zmib1xvjxz78ylwimpd8x81i7l" + "commit": "460d78f524cae677e86c8bbba2ce4e3c57e47cbf", + "sha256": "1s8p1yacxx8l85kfw71q6y9hrii918h4478jvxkjkcxai0qkrfan" } }, { @@ -126239,14 +127333,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20240625, - 1023 + 20240917, + 1129 ], "deps": [ "yasnippet" ], - "commit": "4d3019e72a62dcbfede3d4812c913d5e6210c488", - "sha256": "0kxx08nl39qs35i086lxmh8kw8ljl7npi86djpr7ksl6p3sx5m7k" + "commit": "1b6f234c81aaf1b0f0e445d1ad91a7580a4c8630", + "sha256": "1rw0j11x8mq8lm9pvp35qhdl217w40i1d16d8bcm69lwrfkx39kf" } }, { @@ -126257,14 +127351,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20240726, - 2131 + 20241004, + 1350 ], "deps": [ "compat" ], - "commit": "d70fdeb67be9ecc88c438039eefa9ef0e2104005", - "sha256": "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p" + "commit": "e826dfcb14af5e2cfd88ed110d0208ddc2d37788", + "sha256": "0f029jyjca1cis6mlj5ba4xn417q7sqxjdbp86am5nfvawglybqi" }, "stable": { "version": [ @@ -126364,8 +127458,8 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20240808, - 1543 + 20240917, + 1142 ], "deps": [ "ag", @@ -126377,14 +127471,14 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "ead58dc7615b8d923aab6e72c842be336ae3cf92", - "sha256": "0b77qwkqgyf9s3zwxnyln67nf9q2k2jlymgi0rp5bfn799z4yjhb" + "commit": "ee05144a17fa319f6acc001ff990def0796d757a", + "sha256": "0qm3i1jicjjkivm46cwmqv5nl2dvnb7dass6r24d03xg624clrc9" }, "stable": { "version": [ 0, 5, - 1 + 2 ], "deps": [ "ag", @@ -126396,8 +127490,8 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "ead58dc7615b8d923aab6e72c842be336ae3cf92", - "sha256": "0b77qwkqgyf9s3zwxnyln67nf9q2k2jlymgi0rp5bfn799z4yjhb" + "commit": "dee99805f375b5fc7f4821bf8fd6563fc53bf03e", + "sha256": "1fsgfwazvhvbp06hrfm0xzlvs92d4i0x24znfavrib0s25in8pcv" } }, { @@ -126441,20 +127535,20 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20240808, - 1032 + 20240917, + 2134 ], - "commit": "807fdb43151edcf5bd91399246fc3f6da1326d27", - "sha256": "1wfsx9258j20il6b11s7lilmnk4dmriznsb6b3w29mp2xkn9hpkz" + "commit": "c7531eea98e2947f7dae0339510060a25bb34568", + "sha256": "0wxv5ryrik84wj4qzxpplgwvg2rdcrhf78z98w4wpxm6qzi1mr5x" }, "stable": { "version": [ 0, 1, - 3 + 4 ], - "commit": "807fdb43151edcf5bd91399246fc3f6da1326d27", - "sha256": "1wfsx9258j20il6b11s7lilmnk4dmriznsb6b3w29mp2xkn9hpkz" + "commit": "bfde06b42d4cb03df7fa50495adb2994bdec99d9", + "sha256": "16h0h7dwf5lhc14ldxj675dqy5paiklzbh7yqxa0v05wis1iyi4j" } }, { @@ -126555,20 +127649,20 @@ "repo": "jamescherti/vim-tab-bar.el", "unstable": { "version": [ - 20240714, - 2213 + 20240830, + 340 ], - "commit": "b0846f214602a96a0c812029b10494749eb373a2", - "sha256": "0jk5qly6l85q6k5b7y6rbxqcqqd8bhw7fs2wa91bpsy1hv0qbwir" + "commit": "4d101f14bd388ddc6264c276013eac9760559b0f", + "sha256": "0dhkzbcr2dc0pq9g15ggx3vryik8xchlw2kknznsr8x1b2jg2kmq" }, "stable": { "version": [ 1, 0, - 6 + 7 ], - "commit": "b0846f214602a96a0c812029b10494749eb373a2", - "sha256": "0jk5qly6l85q6k5b7y6rbxqcqqd8bhw7fs2wa91bpsy1hv0qbwir" + "commit": "4d101f14bd388ddc6264c276013eac9760559b0f", + "sha256": "0dhkzbcr2dc0pq9g15ggx3vryik8xchlw2kknznsr8x1b2jg2kmq" } }, { @@ -126967,19 +128061,19 @@ "repo": "k-talo/volatile-highlights.el", "unstable": { "version": [ - 20230301, - 1402 + 20240913, + 2206 ], - "commit": "fcf6e2778454ce514c189a7d1fe70e03ad81c325", - "sha256": "13ag9p2k7snzrc8qllr7hb3mlfqfhwzprlwhykk110nglba1hjrd" + "commit": "afccb5ce83848c3daa937098da83af45b50b71b4", + "sha256": "0rlqwj6whxbvzgkf78d8arjva49aphj4bd2wkpv8djykcmi8nf6m" }, "stable": { "version": [ 1, - 11 + 16 ], - "commit": "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24", - "sha256": "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf" + "commit": "afccb5ce83848c3daa937098da83af45b50b71b4", + "sha256": "0rlqwj6whxbvzgkf78d8arjva49aphj4bd2wkpv8djykcmi8nf6m" } }, { @@ -127105,11 +128199,11 @@ "repo": "hardenedapple/vsh", "unstable": { "version": [ - 20240730, - 2036 + 20240820, + 1320 ], - "commit": "0d98be666ccc59f9b31521d20dda8d0e07dd53cd", - "sha256": "0l7m8i40hfhnd4jrvkjn4n18nfbigmh4sdbc0086mgn9xn23shv5" + "commit": "40daabb4b05e1dce8bc9b68cb437d9aff3cfa7d0", + "sha256": "0bzl82dpga2nazpilrrih35mdqxp5ar360rbvk12b96xlas7lbnr" } }, { @@ -127120,11 +128214,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240705, - 1533 + 20240825, + 133 ], - "commit": "d9ea29fb10aed20512bd95dc5b8c1a01684044b1", - "sha256": "1q62yav93i3485iy7d4v1y00s0zyc0r9v06xb9r49rw70j6x4vmf" + "commit": "988279316fc89e6d78947b48513f248597ba969a", + "sha256": "1qk0fxzn3401b5kjb064bln199s6wn2abfdvfxgyswnygw1hdxav" } }, { @@ -127282,8 +128376,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20240716, - 1704 + 20240826, + 1228 ], "deps": [ "dash", @@ -127291,8 +128385,8 @@ "org-roam", "s" ], - "commit": "f10da46d16af259aba7d703551b4aea42be8bad9", - "sha256": "085cqrx7w4lcx6m1bgwkgy3g2zhwyfpwm131c6qwg07v3ryilhp7" + "commit": "f5c7a68b5308336927d24a166681a2a1903289c3", + "sha256": "17pbn74gixvzdrj4yac3kgswid8ranjm8x15f4360604wmyz7ga7" }, "stable": { "version": [ @@ -127656,22 +128750,22 @@ }, { "ename": "wanderlust", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "03lv7fzwh3s87m8sf0jj69c7nsagj0bkiysjdn8l2vgh5br0pvzs", + "commit": "112fe41123b723cda52af773ebb161e5b189f68b", + "sha256": "0d2j2nvh53563q2753kxpb0skg6qd7r0sa7swq7r8vi8s02zfhi7", "fetcher": "github", "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20240426, - 1520 + 20240913, + 818 ], "deps": [ "apel", "flim", "semi" ], - "commit": "8a0ea2146ee919a5344bb25f198d45016bc716d9", - "sha256": "1w57d6zcqxm6q7rsc6kz84idcpz15rr67jzmfbc2mfiprfvrip1j" + "commit": "8b413b33cdb5a1b715f99a3919573fde2cfb3053", + "sha256": "060mfriavciqb71c6gp3l6va7vr87r9lvn4z4h344mx287g502d8" } }, { @@ -128186,15 +129280,15 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20220524, - 1745 + 20241002, + 536 ], "deps": [ "cl-lib", "request" ], - "commit": "d96da58fe42988d5c433c71ee9f8e6fb75d595a9", - "sha256": "0h4cp334ga2vk89gmkhycqzakxsjldql98a687y57ixpq7ri8qsq" + "commit": "5653e0994a10536db13b142b074e45894959d134", + "sha256": "09z8ihykv3hcq1ja7vigrgwks5657r8706c1yb7y12fm6xzhmcvd" }, "stable": { "version": [ @@ -128381,11 +129475,11 @@ "repo": "thierryvolpiatto/wfnames", "unstable": { "version": [ - 20240418, - 1005 + 20240820, + 906 ], - "commit": "2f014c48fde0979da4ce3c0dbda81389c61a26bc", - "sha256": "15ly5cnq8bkh035mf9mvrbddqc2ajgv3fn7k3gdkivd68nk0wjb8" + "commit": "3652cbd131b23df541e306b9c20a65111f05806d", + "sha256": "0swh8s8g3d8v00rlpak0d02ar96c6iivp7f5drahggi56jp46b80" }, "stable": { "version": [ @@ -128422,8 +129516,8 @@ }, { "ename": "wgrep-ack", - "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd", - "sha256": "1lgh3zgggsssr1nsf3bk4l72m78gy59zmf4bv0wni1c9kr1x6bhl", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0mqgvdygkkfg1c45y44hd8ikqyswzlijjwkcw6ckg8w04a6q9x0y", "fetcher": "github", "repo": "mhayashi1120/Emacs-wgrep", "unstable": { @@ -128452,8 +129546,8 @@ }, { "ename": "wgrep-ag", - "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd", - "sha256": "01jdi7i1v4vnw3imh72nx74y0yz6rbq1p5abchpsfm84sx8nj7v5", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0h0l06kvxhpxhvbhslpj0qif1kqiq5bl1kbd9dd752pmrc07zpjy", "fetcher": "github", "repo": "mhayashi1120/Emacs-wgrep", "unstable": { @@ -128482,8 +129576,8 @@ }, { "ename": "wgrep-deadgrep", - "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd", - "sha256": "1xlmldjzps61ag9kcgnmxl1s2b6z5mk9p5vmh9mvjjfraic14952", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1gi58pgrqwpy9bnnzdsm18ra2wf5was0sh5539h11x5avakaha0b", "fetcher": "github", "repo": "mhayashi1120/Emacs-wgrep", "unstable": { @@ -128512,8 +129606,8 @@ }, { "ename": "wgrep-helm", - "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd", - "sha256": "02629drcz5vw08wria8qy68y5mrp8jcilag106gf1bv8ipl9rv8n", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0m1slvay2dqwwmp5yr658714mihs5hk27slcb00y3anyyvv6lxgc", "fetcher": "github", "repo": "mhayashi1120/Emacs-wgrep", "unstable": { @@ -128542,8 +129636,8 @@ }, { "ename": "wgrep-pt", - "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd", - "sha256": "1cqal3sa8x52av4hg8pi5vm00pjr5xgvidiwy47v6p2bznzj7wks", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1lpxywgkdp91gc0xnkkyqrdadhcxnd3pm60qax9qmp4xz0zclf0d", "fetcher": "github", "repo": "mhayashi1120/Emacs-wgrep", "unstable": { @@ -129341,19 +130435,19 @@ "repo": "warsaw/winring", "unstable": { "version": [ - 20180530, - 18 + 20240905, + 1634 ], - "commit": "f2d072bd446b73e93b127523f19ea82b99b9267f", - "sha256": "1j0g52panhx91hqw5glnlv5vnnpnjyx49xc8xif8mjf0m27723fv" + "commit": "83f0d5662ad48c0813b824501a36a599bdd7acf6", + "sha256": "0mlsad3mwdxzrnnglhwsifzgbcl1wvi6z1rpq115j2jfv01pn284" }, "stable": { "version": [ 5, - 1 + 2 ], - "commit": "f2d072bd446b73e93b127523f19ea82b99b9267f", - "sha256": "1j0g52panhx91hqw5glnlv5vnnpnjyx49xc8xif8mjf0m27723fv" + "commit": "5a5e496364ecdb3245e396fab6c9e2fe25dd943c", + "sha256": "1hw7z80hw3xg7a7ngw98iv16sw86cdm2d98bi98f6b1dvng1jbnz" } }, { @@ -129396,11 +130490,11 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20220529, - 1522 + 20240921, + 1758 ], - "commit": "1a01003d400db8a42838cabcb26c06d627246a17", - "sha256": "04sn6k7v8551lzxrbld59kzks55c96siwkr4v8l4havczz6yqcz7" + "commit": "61d068638c88d149a6f75619e284f8c1e9657e90", + "sha256": "13z6xy84cswimjl8r07pxn5g3b1kcimgl1jfw8ay2ckq25z8r3ab" }, "stable": { "version": [ @@ -129444,32 +130538,32 @@ }, { "ename": "with-editor", - "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", - "sha256": "10vj9b0m52k0f89mbmlgzx7y04k6g5zjp6i143vb6h3y66b0qpax", + "commit": "a74629656e9a23133219a0bd805982f1497b35d7", + "sha256": "1pgw52pn0vam3p8hh5cyivsg0i8r6pigam6xvbk46siffk16g0wk", "fetcher": "github", "repo": "magit/with-editor", "unstable": { "version": [ - 20240817, - 1959 + 20240831, + 2230 ], "deps": [ "compat" ], - "commit": "8c550d9e799a0baedb2164471e7ed19fc15d9196", - "sha256": "1k9g1hrf6bdslbj1hkc71brj4sh45n837g1a128prxb70lkf6g2m" + "commit": "77cb2403158cfea9d8bfb8adad81b84d1d6d7c6a", + "sha256": "1k86z7zjvs5mbxirxvn190ya7fj1vdzps5cm0659hh32373c1l7s" }, "stable": { "version": [ 3, 4, - 1 + 2 ], "deps": [ "compat" ], - "commit": "78c303a0181f2132e2254f965176b549044d74f2", - "sha256": "1hnc0jbjdpjr7xzh8gmhxkcbpw6mbla9vg8vy6py6mdk7ap1zqj8" + "commit": "77cb2403158cfea9d8bfb8adad81b84d1d6d7c6a", + "sha256": "1k86z7zjvs5mbxirxvn190ya7fj1vdzps5cm0659hh32373c1l7s" } }, { @@ -129695,6 +130789,21 @@ "sha256": "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4" } }, + { + "ename": "wollok-mode", + "commit": "ed93da7c6f19769ed27703ffea0a58868786e7d8", + "sha256": "06xacnh1y5yp9mw918iracp3vk70xk5h5w2sgi7fav07zmmd0i1n", + "fetcher": "github", + "repo": "tralph3/wollok-mode", + "unstable": { + "version": [ + 20241012, + 1950 + ], + "commit": "bd52ad66d7c43d7e46f7edd6693619e47aeceef9", + "sha256": "1406fdyam0bxw7i26vbwdal39wkvcvh0qfzllgxxwy82lagi9dqb" + } + }, { "ename": "wonderland", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", @@ -130132,8 +131241,8 @@ }, { "ename": "wsd-mode", - "commit": "04867a574773e8794335a2664d4f5e8b243f3ec9", - "sha256": "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "0bpzkrv9zg5w3xd1c0ki79b96m4fsj011mk1cnz6disbq3zy2fc7", "fetcher": "github", "repo": "josteink/wsd-mode", "unstable": { @@ -130192,20 +131301,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20230529, - 735 + 20240929, + 610 ], - "commit": "8a9080019d294906f8be4e0285eda970679d6ca0", - "sha256": "07z8sfvsc06ffwjvm9s5yslnj67sisdbkj9l43xr5sb22hggxh0d" + "commit": "351997d1cfa02375ce8efd3414802a3507a73b76", + "sha256": "0ivy3jaj9jml10jn020mma6x92j8q75q7wzbd23m9jl4w60bpqlq" }, "stable": { "version": [ 0, 3, - 0 + 2 ], - "commit": "7ca440a7f1bf58cf18b8e07171a53f129970306c", - "sha256": "0za3mxssx48shdaqwn8akxrshkqn92dd0s06h6abqk9mfzdd67ng" + "commit": "351997d1cfa02375ce8efd3414802a3507a73b76", + "sha256": "0ivy3jaj9jml10jn020mma6x92j8q75q7wzbd23m9jl4w60bpqlq" } }, { @@ -130301,14 +131410,14 @@ "repo": "skeeto/x86-lookup", "unstable": { "version": [ - 20210412, - 2022 + 20240823, + 1135 ], "deps": [ "cl-lib" ], - "commit": "1573d61cc4457737b94624598a891c837fb52c16", - "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m" + "commit": "0a6e4faceb3c313c3ee0ac4b086326a7553c1d8b", + "sha256": "1xjx622rs26wjjpif5l5rm59xl81vb5kwq679iimqn70pxxxz5bl" }, "stable": { "version": [ @@ -131165,11 +132274,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20240317, - 1602 + 20241003, + 153 ], - "commit": "7b5ce294fb15c2c8926fa476d7218aa415550a2a", - "sha256": "0hraswfb669iq510zdxvf642mkaylardxrj9a9lipsii26ibqrzn" + "commit": "d91f878729312a6beed77e6637c60497c5786efa", + "sha256": "0r5jx5rbgbhn5klhw76mcqmnkaxyc5y1lmp91fs0anw4qfy0f4h7" }, "stable": { "version": [ @@ -131261,11 +132370,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20220201, - 2104 + 20240926, + 2114 ], - "commit": "927e6d26956ac7219b8a69d641acf486854fba16", - "sha256": "17zz614fy7r2azgqfwiyl9gr9y3fxls65b0nahdb5dlsr9gsjiw5" + "commit": "85cfa3242abb64018eb944271460bd533588d9c1", + "sha256": "0zi3j677dg0qw4dbwh2rcq2d0x7b8fw22jp1mc15ml3xyizgaqq9" }, "stable": { "version": [ @@ -131384,11 +132493,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20220212, - 1742 + 20240925, + 750 ], - "commit": "b4669a6604a3093d3960c494874a7affc6b9c184", - "sha256": "0h8xb8wzb9mrkmv9b1i03fd0qxchb4y99riqkkdlbaqxqkgp3y65" + "commit": "9e02ac558eccb2a911640762f5df81c89230e81d", + "sha256": "1wrxd6bdfpabrk15ga5kgjgcnccch1iqndxdxg7vnw8ywz3wmydx" }, "stable": { "version": [ @@ -131408,14 +132517,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20240406, - 1314 + 20241013, + 1557 ], "deps": [ "cl-lib" ], - "commit": "eb5ba2664c3a68ae4a53bb38b85418dd131b208f", - "sha256": "1n4vrl504hiiiz44h30zr5azkzm160zrxbcxim5f6nc55lgpkvqk" + "commit": "fe1f4e0e96ce42d8668920335eb22c3c009dab3e", + "sha256": "0x0zdssbpdd49gd0h7m389jqaq0rs2slzg0nxgc2macl5j5js8in" }, "stable": { "version": [ @@ -131474,14 +132583,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20240603, - 757 + 20241014, + 949 ], "deps": [ "yasnippet" ], - "commit": "1bf034887c4048c38266842686b7f9c8384f72e7", - "sha256": "17r0p2yk0164i1sc4rl55sykpgk5f21kv958dqdhrf39r4gj0r4k" + "commit": "23bcbcd11f567a2659ae413c62c82892eb50a3f1", + "sha256": "0g1d676jq6ayisck2garlk9cwvf8m6w17ajw07mybcadq2nm03g9" }, "stable": { "version": [ @@ -131526,8 +132635,8 @@ }, { "ename": "yatex", - "commit": "9854c39fc1889891fe460d0d5ac9224de3f6c635", - "sha256": "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0", + "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", + "sha256": "1ppdmpmg7kq2v7v5dssqc1nnn0szmap232bf8972jprszn44zns4", "fetcher": "hg", "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { @@ -131667,14 +132776,14 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20240708, - 2037 + 20241012, + 758 ], "deps": [ "compat" ], - "commit": "bd5418635f3483930d267bcb44cd3744db4ea3ac", - "sha256": "0z6kdzgpri5qqxdpxdl8qb4rgv32557rc4wac8mrh5a0jf682p42" + "commit": "f73172433a944551558204554efae0e441388034", + "sha256": "0issjdi1j1cvapxjxbansbmdmfs9khxmr2k0cr6pqm0hfzak4c9s" }, "stable": { "version": [ @@ -132065,11 +133174,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20240612, - 1258 + 20240926, + 619 ], - "commit": "15f48bfc6b52d112f3c3fd98e533bda9138ffdd2", - "sha256": "1nzqj55nc9klvgxhd20z1n1c06v453hjxf7s70gspa4v1pwgvjaz" + "commit": "82112c64c5b0d3b866e82417dd730e0d0d7e1424", + "sha256": "0bvdcdk7jhwv6jqv9wlprpwn6w0j9k2yy9xm2nx8m5wn2rgf6caq" }, "stable": { "version": [ @@ -132541,6 +133650,21 @@ "sha256": "1zzi7xlhhrzaxrwy20ida561n3rdjn25k3pkjvvjl073cr35hmyw" } }, + { + "ename": "zig-ts-mode", + "commit": "b1210a74b8163487a5204443143cdf3e3416c185", + "sha256": "0mcvjs2abxg0pkf121fafb63as9j4v3hvxsaj4mdx8a3kl3wvm9r", + "fetcher": "codeberg", + "repo": "meow_king/zig-ts-mode", + "unstable": { + "version": [ + 20241012, + 627 + ], + "commit": "a1426d9f9d4d804aad452f6d902192505b061ee4", + "sha256": "0cf3njlnk5ysqpizlv2l59c80xdqgqbhmpk327lfi168rrkl9rlq" + } + }, { "ename": "zim-wiki-mode", "commit": "a10d6b0fb4d5b87d7dea1bbc4e4e0495aa51627c", @@ -132549,8 +133673,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20240613, - 8 + 20241012, + 1711 ], "deps": [ "dokuwiki-mode", @@ -132559,8 +133683,8 @@ "link-hint", "pretty-hydra" ], - "commit": "11e077afbe21f2dd33fe7eae39c2a8345bb0b806", - "sha256": "0lc1rikrd5rhjy8p7ar649kxdv5slnkmkra6f7j00sbjwhw7bc89" + "commit": "fd43e6e8355a0943714aa3a1cd4dd3ccc8e665af", + "sha256": "1bfy6dwpmi4c7radn7a4x00fr3g7vh7wp3g2pxybi5sszcc47kkp" } }, { @@ -132589,11 +133713,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240812, - 1148 + 20240926, + 1826 ], - "commit": "930e6904d8d14bff80a689ffe93c6b1dc15828ca", - "sha256": "1chrymrpl1szk6zbnfd375vj9a1c2xxapdv4ivkmz6cymsr8mbm7" + "commit": "8e361577b8cf01f20a65222ca4ce90720a3d74a6", + "sha256": "1qj560cy1ncj7czl0jbbjahxcqjn01263ahd7db78m3kgshjv6r7" }, "stable": { "version": [ @@ -132612,15 +133736,15 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240812, - 1148 + 20241006, + 1334 ], "deps": [ "zk", "zk-index" ], - "commit": "930e6904d8d14bff80a689ffe93c6b1dc15828ca", - "sha256": "1chrymrpl1szk6zbnfd375vj9a1c2xxapdv4ivkmz6cymsr8mbm7" + "commit": "297ebd0df13c957f4ba9700cafc5466dafacc5cb", + "sha256": "0r6frhdpakzjrh6qhcr913jcf95ncbs0rsfdgkrka5d5gkrdds41" }, "stable": { "version": [ @@ -132643,14 +133767,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240819, - 1355 + 20241006, + 1334 ], "deps": [ "zk" ], - "commit": "7d3ef8524d35d0e431ef91b14f1a1af5ca08e36d", - "sha256": "06cjr1nkbj667rwx3pp8cq7nd677h0v6i48b206dmpnghckj63gz" + "commit": "297ebd0df13c957f4ba9700cafc5466dafacc5cb", + "sha256": "0r6frhdpakzjrh6qhcr913jcf95ncbs0rsfdgkrka5d5gkrdds41" }, "stable": { "version": [ @@ -132672,15 +133796,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20240812, - 1143 + 20240926, + 1827 ], "deps": [ "zk", "zk-index" ], - "commit": "55eef9712984deab320fb1a952c0624af2988128", - "sha256": "11dj42pvfyqa0i6a31n2iicxrrh0psvvsiqq0pbrwk90hz7map34" + "commit": "fef5cace6ac12a86ba9a8d4abc80e87699966f8c", + "sha256": "011mg8wpgw6wzmrqbyfvxsqlm0jw91p2jpr5nw64zpb5dvaq5bxy" } }, { @@ -132706,26 +133830,26 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20240716, - 2000 + 20241006, + 1857 ], "deps": [ "cl-lib" ], - "commit": "1d9d5a3b46cfd1a90a45ff777f200eb4d5d6fd9e", - "sha256": "0brdnp5fp4gxiq2dz3szb9fdmbs88i1qfqzv03lqzr7arqwn9svk" + "commit": "fe856c43286674aa6770d95a81d915363f5df399", + "sha256": "1my9gw15xdbw7wdv6xa29lw8vfxqjsypk2465zxic2825hs0wn07" }, "stable": { "version": [ 1, 0, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "37d42dc37506234aa4b35bec6c98500e6f648363", - "sha256": "171cm487jbdqi73lk7vc9dsrzhxqic0yvy1vvxwk3b9qx1m2ab6v" + "commit": "fe856c43286674aa6770d95a81d915363f5df399", + "sha256": "1my9gw15xdbw7wdv6xa29lw8vfxqjsypk2465zxic2825hs0wn07" } }, { @@ -132926,11 +134050,11 @@ "repo": "emacsorphanage/zoom-window", "unstable": { "version": [ - 20221228, - 407 + 20240925, + 754 ], - "commit": "093dd7a5d60141812762eba40b021c76ff41f83d", - "sha256": "0i3ch9r8rnk3j6qzfnhj5svdqyas1j85aggn0way6ra3png4r40d" + "commit": "fca88b971aea55e3d3944050213c3a1243178c8b", + "sha256": "0m03vp9qybbh9i7ppr9njmcngzgzdlh3n2gdlxzmfgx54mh70lgq" }, "stable": { "version": [ @@ -133109,20 +134233,20 @@ "repo": "vonfry/zoxide.el", "unstable": { "version": [ - 20230912, - 2359 + 20241003, + 1103 ], - "commit": "c4b72681b139f40ba82f43d9c93adbd37da7b238", - "sha256": "0j08rlv5w84ff28y48l86s604r66px0g6d7wcvwj27n2p1bd025m" + "commit": "6de851de46db51253350edd67f329dbc0587b97c", + "sha256": "0ka98zkgzkrrsdascy8q9izcmhvsnkv6jaja9xfvrw1dbxyw0q2z" }, "stable": { "version": [ 1, 2, - 2 + 3 ], - "commit": "c4b72681b139f40ba82f43d9c93adbd37da7b238", - "sha256": "0j08rlv5w84ff28y48l86s604r66px0g6d7wcvwj27n2p1bd025m" + "commit": "b412457d9dc0802db6dcc304976c80aa3773597d", + "sha256": "1cqpldrdr219kdiraf6pcxizfiylnljri4ghwvblk579xvijnbgr" } }, { diff --git a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix index f527e64f0885..824567318f22 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix @@ -36,7 +36,6 @@ let in pkgs.mkShell { packages = [ pkgs.git - pkgs.nix pkgs.bash pkgs.nix-prefetch-git pkgs.nix-prefetch-hg diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e7fe2ccac658..7bae78f35e70 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -407,6 +407,7 @@ mkDerivation (finalAttrs: { passthru = { inherit withNativeCompilation; inherit withTreeSitter; + inherit withXwidgets; pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; }; }; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 2ad51433e215..521a3d83a097 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -114,10 +114,10 @@ in emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "30.0.91"; + version = "30.0.92"; variant = "mainline"; - rev = "30.0.91"; - hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; + rev = "30.0.92"; + hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix deleted file mode 100644 index 769d5c68cbf7..000000000000 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ /dev/null @@ -1,178 +0,0 @@ -{ stdenv -, lib -, ctags -, cmark -, desktop-file-utils -, editorconfig-core-c -, fetchurl -, flatpak -, gnome -, libgit2-glib -, gi-docgen -, gobject-introspection -, enchant -, icu -, gtk4 -, gtksourceview5 -, json-glib -, jsonrpc-glib -, libadwaita -, libdex -, libpanel -, libpeas2 -, libportal-gtk4 -, libsysprof-capture -, libxml2 -, meson -, ninja -, ostree -, d-spy -, pcre2 -, pkg-config -, python3 -, sysprof -, template-glib -, vala -, vte-gtk4 -, webkitgtk_6_0 -, wrapGAppsHook4 -, dbus -, xvfb-run -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnome-builder"; - version = "46.3"; - - outputs = [ "out" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-EvJ8DipKcxb59+IYWd9r8bd1cNKWb5V6QzBvaZ7FRhI="; - }; - - patches = [ - # The test environment hardcodes `GI_TYPELIB_PATH` environment variable to direct dependencies of libide & co. - # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2ce510b0ec0518c29427a29b386bb2ac1a121edf - # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2964f7c2a0729f2f456cdca29a0f5b7525baf7c1 - # - # But Nix does not have a fallback path for typelibs like /usr/lib on FHS distros and relies solely - # on `GI_TYPELIB_PATH` environment variable. So, when Ide started to depend on Vte, which - # depends on Pango, among others, GIrepository was unable to find these indirect dependencies - # and crashed with: - # - # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) - ./fix-finding-test-typelibs.patch - ]; - - nativeBuildInputs = [ - desktop-file-utils - gi-docgen - gobject-introspection - meson - ninja - pkg-config - python3 - wrapGAppsHook4 - ]; - - buildInputs = [ - ctags - cmark - editorconfig-core-c - flatpak - libgit2-glib - libpeas2 - libportal-gtk4 - vte-gtk4 - enchant - icu - gtk4 - gtksourceview5 - json-glib - jsonrpc-glib - libadwaita - libdex - libpanel - libsysprof-capture - libxml2 - ostree - d-spy - pcre2 - python3 - template-glib - vala - webkitgtk_6_0 - ]; - - nativeCheckInputs = [ - dbus - xvfb-run - ]; - - mesonFlags = [ - "-Ddocs=true" - - # Making the build system correctly detect clang header and library paths - # is difficult. Somebody should look into fixing this. - "-Dplugin_clang=false" - - # Do not try to check if appstream images exist - "-Dnetwork_tests=false" - ]; - - doCheck = true; - - postPatch = '' - patchShebangs build-aux/meson/post_install.py - substituteInPlace build-aux/meson/post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - - checkPhase = '' - GTK_A11Y=none \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs - ''; - - preFixup = '' - gappsWrapperArgs+=( - # For sysprof-agent - --prefix PATH : "${sysprof}/bin" - ) - - # Ensure that all plugins get their interpreter paths fixed up. - find $out/lib -name \*.py -type f -print0 | while read -d "" f; do - chmod a+x "$f" - done - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput share/doc/libide "$devdoc" - ''; - - passthru.updateScript = gnome.updateScript { - packageName = "gnome-builder"; - }; - - meta = with lib; { - description = "IDE for writing GNOME-based software"; - longDescription = '' - Global search, auto-completion, source code map, documentation - reference, and other features expected in an IDE, but with a focus - on streamlining GNOME-based development projects. - - This package does not pull in the dependencies needed for every - plugin. If you find that a plugin you wish to use doesn't work, we - currently recommend running gnome-builder inside a nix-shell with - appropriate dependencies loaded. - ''; - homepage = "https://apps.gnome.org/Builder/"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - mainProgram = "gnome-builder"; - }; -}) diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix deleted file mode 100644 index f89ee5a76a0a..000000000000 --- a/pkgs/applications/editors/heh/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "heh"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "ndd7xv"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - AppKit - ]); - - cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; - - meta = with lib; { - description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; - homepage = "https://github.com/ndd7xv/heh"; - changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ piturnah ]; - mainProgram = "heh"; - }; -} diff --git a/pkgs/applications/editors/jetbrains/bin/darwin.nix b/pkgs/applications/editors/jetbrains/bin/darwin.nix index 747f03f55d5e..f5edf904726b 100644 --- a/pkgs/applications/editors/jetbrains/bin/darwin.nix +++ b/pkgs/applications/editors/jetbrains/bin/darwin.nix @@ -19,8 +19,10 @@ let loname = lib.toLower productShort; in stdenvNoCC.mkDerivation { - inherit pname meta src version plugins; + inherit pname src version plugins; passthru.buildNumber = buildNumber; + passthru.product = product; + meta = meta // { mainProgram = loname; }; desktopName = product; dontFixup = true; installPhase = '' diff --git a/pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch b/pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch index 7a1a66bf062f..4ec7810a38cd 100644 --- a/pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch +++ b/pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch @@ -1,17 +1,20 @@ --- a/plugins/remote-dev-server/bin/launcher.sh +++ b/plugins/remote-dev-server/bin/launcher.sh -@@ -366,6 +366,8 @@ +@@ -322,7 +322,7 @@ fi + # --------------------------------------------------------------------- + # Configure fonts and fontconfig + # --------------------------------------------------------------------- +-if [ $IS_DARWIN -ne 1 ]; then ++if false; then + FONTS_CONFIGURATION_BASE_PATH="$REMOTE_DEV_SERVER_DIR/selfcontained/fontconfig" + if [ ! -d "$FONTS_CONFIGURATION_BASE_PATH" ]; then + echo "ERROR! Unable to locate font configuration source directory in self-contained distribution: '$FONTS_CONFIGURATION_BASE_PATH'." 1>&2 +@@ -371,6 +371,8 @@ else REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=1 fi - + +REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=0 + if [ $REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS -eq 1 ]; then SELFCONTAINED_LIBS="$REMOTE_DEV_SERVER_DIR/selfcontained/lib" if [ ! -d "$SELFCONTAINED_LIBS" ]; then -@@ -596,3 +598,5 @@ - "$LAUNCHER" "$STARTER_COMMAND" "$PROJECT_PATH" "$@" - ;; - esac -+ -+unset REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS diff --git a/pkgs/applications/editors/jetbrains/plugins/default.nix b/pkgs/applications/editors/jetbrains/plugins/default.nix index 93e6ca28608f..1fcc8a15a834 100644 --- a/pkgs/applications/editors/jetbrains/plugins/default.nix +++ b/pkgs/applications/editors/jetbrains/plugins/default.nix @@ -90,23 +90,33 @@ in { passthru.plugins = plugins ++ (ide.plugins or [ ]); newPlugins = plugins; disallowedReferences = [ ide ]; - nativeBuildInputs = [ autoPatchelfHook ] ++ (ide.nativeBuildInputs or [ ]); + nativeBuildInputs = (lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook) ++ (ide.nativeBuildInputs or [ ]); buildInputs = lib.unique ((ide.buildInputs or [ ]) ++ [ glib ]); inherit (ide) meta; - buildPhase = '' + buildPhase = + let + rootDir = if stdenv.hostPlatform.isDarwin then "Applications/${ide.product}.app/Contents" else meta.mainProgram; + in + '' cp -r ${ide} $out chmod +w -R $out - rm -f $out/${meta.mainProgram}/plugins/plugin-classpath.txt + rm -f $out/${rootDir}/plugins/plugin-classpath.txt IFS=' ' read -ra pluginArray <<< "$newPlugins" for plugin in "''${pluginArray[@]}" do - ln -s "$plugin" -t $out/${meta.mainProgram}/plugins/ + ln -s "$plugin" -t "$out/${rootDir}/plugins/" done sed "s|${ide.outPath}|$out|" \ - -i $(realpath $out/bin/${meta.mainProgram}) \ - -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server) + -i $(realpath $out/bin/${meta.mainProgram}) + + if test -f "$out/bin/${meta.mainProgram}-remote-dev-server"; then + sed "s|${ide.outPath}|$out|" \ + -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server) + fi + + '' + lib.optionalString stdenv.hostPlatform.isLinux '' autoPatchelf $out ''; }; diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index 574938eef0d3..1ba1e0f38c1f 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -4,18 +4,18 @@ { "631" = { # Python - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; }; "7322" = { # Python community edition - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; }; "8182" = { # Rust (deprecated) - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; buildPhase = '' runHook preBuild chmod +x -R bin @@ -65,8 +65,8 @@ }; "22407" = { # Rust - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; buildPhase = '' runHook preBuild chmod +x -R bin diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 5e0ca51727c1..333c96807dd4 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -2,49 +2,63 @@ #!nix-shell update-shell.nix -i python3 # format: -# $ nix run nixpkgs.python3Packages.black -c black update.py +# $ nix run nixpkgs#python3Packages.ruff -- update.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py import inspect import os import sys -from typing import List, Tuple from pathlib import Path +from typing import List, Tuple # Import plugin update library from maintainers/scripts/pluginupdate.py -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore sys.path.insert( 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") ) import pluginupdate -GET_PLUGINS = f"""(with import {{}}; +GET_PLUGINS = f"""( +with import {{ }}; let - inherit (kakouneUtils.override {{}}) buildKakounePluginFrom2Nix; + inherit (kakouneUtils.override {{ }}) buildKakounePluginFrom2Nix; generated = callPackage {ROOT}/generated.nix {{ inherit buildKakounePluginFrom2Nix; }}; - hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; - getChecksum = name: value: - if hasChecksum value then {{ - submodules = value.src.fetchSubmodules or false; - sha256 = value.src.outputHash; - rev = value.src.rev; - }} else null; + hasChecksum = + value: + lib.isAttrs value + && lib.hasAttrByPath [ + "src" + "outputHash" + ] value; + getChecksum = + name: value: + if hasChecksum value then + {{ + submodules = value.src.fetchSubmodules or false; + sha256 = value.src.outputHash; + rev = value.src.rev; + }} + else + null; checksums = lib.mapAttrs getChecksum generated; -in lib.filterAttrs (n: v: v != null) checksums)""" +in +lib.filterAttrs (n: v: v != null) checksums +)""" + +HEADER = "# This file has been @generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" -HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" class KakouneEditor(pluginupdate.Editor): - - - def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) - + def generate_nix( + self, + plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], + outfile: str, + ): with open(outfile, "w+") as f: f.write(HEADER) f.write( @@ -54,7 +68,7 @@ let packages = ( self: {""" ) - for pluginDesc, plugin in sorted_plugins: + for pluginDesc, plugin in plugins: f.write( f""" {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 68ff13a0212a..ea649595d645 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -1,28 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, rustPlatform -, cmake -, pkg-config -, perl -, python3 -, fontconfig -, glib -, gtk3 -, openssl -, libGL -, libobjc -, libxkbcommon -, Security -, CoreServices -, ApplicationServices -, Carbon -, AppKit -, wrapGAppsHook3 -, wayland -, gobject-introspection -, xorg +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + rustPlatform, + cmake, + pkg-config, + perl, + python3, + fontconfig, + glib, + gtk3, + openssl, + libGL, + libobjc, + libxkbcommon, + wrapGAppsHook3, + wayland, + gobject-introspection, + xorg, + apple-sdk_11, }: let rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -85,33 +82,37 @@ rustPlatform.buildRustPackage rec { gobject-introspection ]; - buildInputs = rpathLibs ++ [ - glib - gtk3 - openssl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - Security - CoreServices - ApplicationServices - Carbon - AppKit - ]; + buildInputs = + rpathLibs + ++ [ + glib + gtk3 + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libobjc + apple-sdk_11 + ]; - postInstall = if stdenv.hostPlatform.isLinux then '' - install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg - install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop + postInstall = + if stdenv.hostPlatform.isLinux then + '' + install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg + install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop - $STRIP -S $out/bin/lapce + $STRIP -S $out/bin/lapce - patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce - '' else '' - mkdir $out/Applications - cp -r extra/macos/Lapce.app $out/Applications - ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS - ''; + patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce + '' + else + '' + mkdir $out/Applications + cp -r extra/macos/Lapce.app $out/Applications + ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS + ''; dontPatchELF = true; @@ -124,7 +125,5 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 ]; maintainers = with maintainers; [ elliot ]; mainProgram = "lapce"; - # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL" - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index de4cd6e26dfe..d4f7a59fd60d 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.8.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-YhZSmk2n/Tg0zx1xuy0LtABNiBB3LmXYlhXoK7/b2tQ="; + sha256 = "sha256-LfeqQjzrWzqJ/iTuMOWLnxEZ+SNPVcutNPI+T3WEKnM="; }; dontBuild = true; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix deleted file mode 100644 index 121d62219db0..000000000000 --- a/pkgs/applications/editors/mg/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: - -stdenv.mkDerivation rec { - pname = "mg"; - version = "7.3-unstable-2024-06-04"; - - src = fetchFromGitHub { - owner = "ibara"; - repo = "mg"; - rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33"; - hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs="; - }; - - postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - substituteInPlace configure --replace "./conftest" "echo" - ''; - - enableParallelBuilding = true; - - makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; - - installPhase = '' - install -m 555 -Dt $out/bin mg - install -m 444 -Dt $out/share/man/man1 mg.1 - ''; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ ncurses ]; - - meta = with lib; { - description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; - license = licenses.publicDomain; - mainProgram = "mg"; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0913fa0a330f..270fdf3ce878 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -29,7 +29,7 @@ let , withNodeJs ? false , withPerl ? false - , rubyEnv ? null + , withRuby ? true # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim , vimAlias ? false @@ -127,8 +127,7 @@ let ; providerLuaRc = neovimUtils.generateProviderRc { - inherit (finalAttrs) withPython3 withNodeJs withPerl; - withRuby = rubyEnv != null; + inherit (finalAttrs) withPython3 withNodeJs withPerl withRuby; }; # If configure != {}, we can't generate the rplugin.vim file with e.g @@ -155,10 +154,9 @@ let __structuredAttrs = true; dontUnpack = true; - inherit viAlias vimAlias withNodeJs withPython3 withPerl; + inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby; inherit wrapRc providerLuaRc packpathDirs; inherit python3Env rubyEnv; - withRuby = rubyEnv != null; inherit wrapperArgs generatedWrapperArgs; luaRcContent = rcContent; # Remove the symlinks created by symlinkJoin which we need to perform @@ -171,7 +169,7 @@ let + lib.optionalString finalAttrs.withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH '' - + lib.optionalString (finalAttrs.rubyEnv != null) '' + + lib.optionalString (finalAttrs.withRuby) '' ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' + lib.optionalString finalAttrs.withNodeJs '' diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 856626bf68b0..e210787327b9 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.15"; + version = "0.26.18"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-BTNQDvcGjBJG4hj1N69yboNth4/ydeOS7T2KiqbPfGM="; + sha256 = "sha256-xAlhZtQuIRtvMaHflCr89lHH6ocqIRAECwHdRa+/imM="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix deleted file mode 100644 index c752c62f120a..000000000000 --- a/pkgs/applications/editors/ox/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: - -rustPlatform.buildRustPackage rec { - pname = "ox"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "curlpipe"; - repo = pname; - rev = version; - hash = "sha256-37o8Ak+8LPeGny7JBLc2STpRjfWBCwOrRyP3HJbD25o="; - }; - - cargoHash = "sha256-c7XhMYfhMCxyidZJemnu5f9KwQmPmbun6mrI3v2EpZ4="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - - meta = with lib; { - description = "Independent Rust text editor that runs in your terminal"; - homepage = "https://github.com/curlpipe/ox"; - changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ moni ]; - mainProgram = "ox"; - }; -} diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix deleted file mode 100644 index f6f1bf2b28b1..000000000000 --- a/pkgs/applications/editors/rehex/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, which -, zip -, libicns -, botan3 -, capstone -, jansson -, libunistring -, wxGTK32 -, lua53Packages -, perlPackages -, gtk3 -, Carbon -, Cocoa -, IOKit -}: - -stdenv.mkDerivation rec { - pname = "rehex"; - version = "0.62.1"; - - src = fetchFromGitHub { - owner = "solemnwarning"; - repo = pname; - rev = version; - hash = "sha256-RlYpg3aon1d25n8K/bbHGVLn5/iOOUSlvjT8U0fp9hA="; - }; - - nativeBuildInputs = [ pkg-config which zip ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; - - buildInputs = [ botan3 capstone jansson libunistring wxGTK32 ] - ++ (with lua53Packages; [ lua busted ]) - ++ (with perlPackages; [ perl TemplateToolkit ]) - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; - - makeFlags = [ - "prefix=${placeholder "out"}" - "BOTAN_PKG=botan-3" - "CXXSTD=-std=c++20" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Reverse Engineers' Hex Editor"; - longDescription = '' - A cross-platform (Windows, Linux, Mac) hex editor for reverse - engineering, and everything else. - ''; - homepage = "https://github.com/solemnwarning/rehex"; - changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ markus1189 wegank ]; - platforms = platforms.all; - mainProgram = "rehex"; - }; -} diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 55998bcbe3c9..ff0c468fc509 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -146,8 +146,8 @@ in --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ - --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \ + --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ --replace-fail '@pandoc@' ${pandoc} \ diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 70b5900ccde8..ff52167dd344 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libsecret glib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; in '' diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix deleted file mode 100644 index a57fc8d7de90..000000000000 --- a/pkgs/applications/editors/sublime/2/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: -let - libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ]; -in - -stdenv.mkDerivation rec { - pname = "sublimetext"; - version = "2.0.2"; - - src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - name = "sublimetext-${version}.tar.bz2"; - urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2" - ]; - sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; - } - else - fetchurl { - name = "sublimetext-${version}.tar.bz2"; - urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2" - ]; - sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; - }; - buildCommand = '' - tar xvf ${src} - mkdir -p $out/bin - mv Sublime* $out/sublime - ln -s $out/sublime/sublime_text $out/bin/sublime - ln -s $out/sublime/sublime_text $out/bin/sublime2 - - echo ${libPath} - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ - $out/sublime/sublime_text - - mkdir -p $out/share/icons - - for x in $(ls $out/sublime/Icon); do - mkdir -p $out/share/icons/hicolor/$x/apps - cp -v $out/sublime/Icon/$x/* $out/share/icons/hicolor/$x/apps - done - - ln -sv "${desktopItem}/share/applications" $out/share - ''; - - desktopItem = makeDesktopItem { - name = "sublime2"; - exec = "sublime2 %F"; - comment = meta.description; - desktopName = "Sublime Text"; - genericName = "Text Editor"; - categories = [ "TextEditor" "Development" ]; - icon = "sublime_text"; - }; - - meta = { - description = "Sophisticated text editor for code, markup and prose"; - license = lib.licenses.unfree; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 7eff7d9bf4df..7c5e9aef1ea1 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -65,7 +65,7 @@ let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -92,7 +92,7 @@ let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -101,7 +101,7 @@ let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index b594633ea3cb..8390a004b1f4 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -88,7 +88,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 64119b78709f..2005eef7b6fe 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -94,6 +94,8 @@ stdenv.mkDerivation (finalAttrs: { cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; in '' + unset DEVELOPER_DIR # Use the system Xcode not the nixpkgs SDK. + CC=/usr/bin/clang DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock deleted file mode 100644 index 571e3d9080cf..000000000000 --- a/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock +++ /dev/null @@ -1,1778 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "avante-repo-map" -version = "0.1.0" -dependencies = [ - "cc", - "minijinja", - "mlua", - "serde", - "tree-sitter", - "tree-sitter-c", - "tree-sitter-cpp", - "tree-sitter-go", - "tree-sitter-javascript", - "tree-sitter-language", - "tree-sitter-lua", - "tree-sitter-python", - "tree-sitter-ruby", - "tree-sitter-rust", - "tree-sitter-typescript", - "tree-sitter-zig", -] - -[[package]] -name = "avante-templates" -version = "0.1.0" -dependencies = [ - "minijinja", - "mlua", - "serde", -] - -[[package]] -name = "avante-tokenizers" -version = "0.1.0" -dependencies = [ - "mlua", - "tiktoken-rs", - "tokenizers", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -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 = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cc" -version = "1.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "derive_builder" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" -dependencies = [ - "derive_builder_core", - "syn", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "erased-serde" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" -dependencies = [ - "serde", - "typeid", -] - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" -dependencies = [ - "cc", -] - -[[package]] -name = "fancy-regex" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fancy-regex" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" -dependencies = [ - "bit-set", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "flate2" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[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 = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "hf-hub" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" -dependencies = [ - "dirs", - "indicatif", - "log", - "native-tls", - "rand", - "serde", - "serde_json", - "thiserror", - "ureq", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[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 = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "macro_rules_attribute" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" -dependencies = [ - "macro_rules_attribute-proc_macro", - "paste", -] - -[[package]] -name = "macro_rules_attribute-proc_macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memo-map" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d1115007560874e373613744c6fba374c17688327a71c1476d1a5954cc857b" - -[[package]] -name = "minijinja" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" -dependencies = [ - "aho-corasick", - "memo-map", - "self_cell", - "serde", - "serde_json", - "unicase", - "unicode-ident", - "v_htmlescape", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "mlua" -version = "0.10.0-beta.1" -source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" -dependencies = [ - "bstr", - "erased-serde", - "mlua-sys", - "mlua_derive", - "num-traits", - "parking_lot", - "rustc-hash 2.0.0", - "serde", - "serde-value", -] - -[[package]] -name = "mlua-sys" -version = "0.6.2" -source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" -dependencies = [ - "cc", - "cfg-if", - "pkg-config", -] - -[[package]] -name = "mlua_derive" -version = "0.9.3" -source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "monostate" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "onig" -version = "6.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" -dependencies = [ - "bitflags 1.3.2", - "libc", - "once_cell", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "portable-atomic" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-cond" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" -dependencies = [ - "either", - "itertools 0.11.0", - "rayon", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[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 = "rustix" -version = "0.38.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" -dependencies = [ - "log", - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - -[[package]] -name = "rustls-webpki" -version = "0.102.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "self_cell" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" - -[[package]] -name = "serde" -version = "1.0.209" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.209" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "spm_precompiled" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" -dependencies = [ - "base64 0.13.1", - "nom", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tiktoken-rs" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" -dependencies = [ - "anyhow", - "base64 0.21.7", - "bstr", - "fancy-regex 0.12.0", - "lazy_static", - "parking_lot", - "rustc-hash 1.1.0", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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 = "tokenizers" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a24d7f7d6be5b9d1377418b893ab1808af0074f5d1bb2c64784452ddd2aa70" -dependencies = [ - "aho-corasick", - "derive_builder", - "esaxx-rs", - "fancy-regex 0.13.0", - "getrandom", - "hf-hub", - "itertools 0.12.1", - "lazy_static", - "log", - "macro_rules_attribute", - "monostate", - "onig", - "paste", - "rand", - "rayon", - "rayon-cond", - "regex", - "regex-syntax", - "serde", - "serde_json", - "spm_precompiled", - "thiserror", - "unicode-normalization-alignments", - "unicode-segmentation", - "unicode_categories", -] - -[[package]] -name = "tree-sitter" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff" -dependencies = [ - "cc", - "regex", - "regex-syntax", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-c" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b3fb515e498e258799a31d78e6603767cd6892770d9e2290ec00af5c3ad80b" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-go" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf57626e4c9b6d6efaf8a8d5ee1241c5f178ae7bfdf693713ae6a774f01424e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e1f62f8babb640b909f30675d1addeb1f17802f2a4d2af287569753b243977" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-language" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57" - -[[package]] -name = "tree-sitter-lua" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb9adf0965fec58e7660cbb3a059dbb12ebeec9459e6dcbae3db004739641e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-python" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65661b1a3e24139e2e54207e47d910ab07e28790d78efc7d5dc3a11ce2a110eb" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-ruby" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec5ee842e27791e0adffa0b2a177614de51d2a26e5c7e84d014ed7f097e5ed0" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-typescript" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecf1585ae2a9dddc2b1d4c0e2140b2ec9876e2a25fd79de47fcf7dae0384685" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-zig" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994e37b8ef1f715b931a5ff084a1b1713b1bc56e7aaebd148cc3efe0bf29ad9" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "typeid" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-normalization-alignments" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "ureq" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" -dependencies = [ - "base64 0.22.1", - "flate2", - "log", - "native-tls", - "once_cell", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "v_htmlescape" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "webpki-roots" -version = "0.26.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -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.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "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]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix deleted file mode 100644 index d31ce3e661c8..000000000000 --- a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - openssl, - stdenv, - vimUtils, - darwin, -}: - -let - version = "2024-10-18"; - - src = fetchFromGitHub { - owner = "yetone"; - repo = "avante.nvim"; - rev = "36b23cef16c2c624c34bea213f01c06782d2ca40"; - hash = "sha256-QUFcJMbfr5BAS04ig1IHLCMLACeQhFVH9ZCH/VD8i8Y="; - }; - - meta = with lib; { - description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; - homepage = "https://github.com/yetone/avante.nvim"; - license = licenses.asl20; - maintainers = with lib.maintainers; [ - ttrei - aarnphm - ]; - }; - - avante-nvim-lib = rustPlatform.buildRustPackage { - pname = "avante-nvim-lib"; - inherit version src meta; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mlua-0.10.0-beta.1" = "sha256-ZEZFATVldwj0pmlmi0s5VT0eABA15qKhgjmganrhGBY="; - }; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - buildFeatures = [ "luajit" ]; - }; -in - -vimUtils.buildVimPlugin { - pname = "avante.nvim"; - inherit version src meta; - - postInstall = - let - ext = stdenv.hostPlatform.extensions.sharedLibrary; - in - '' - mkdir -p $out/build - ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} - ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} - ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} - ''; - - doInstallCheck = true; - nvimRequireCheck = "avante"; -} diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock b/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock index c11157761a5d..8ef1571af13d 100644 --- a/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock @@ -102,6 +102,12 @@ dependencies = [ "phf", ] +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -215,11 +221,12 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mlua" -version = "0.10.0-rc.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7928e85ce39d4ea4d11dc850fde2acb503fc114a76f53e8606dd9ed237a491e9" +checksum = "0f6ddbd668297c46be4bdea6c599dcc1f001a129586272d53170b7ac0a62961e" dependencies = [ "bstr", + "either", "mlua-sys", "mlua_derive", "num-traits", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe026d6bd1583a9cf9080e189030ddaea7e6f5f0deb366a8e26f8a26c4135b8" +checksum = "e9eebac25c35a13285456c88ee2fde93d9aee8bcfdaf03f9d6d12be3391351ec" dependencies = [ "cc", "cfg-if", @@ -240,9 +247,9 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.10.0-rc.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e110f0addea6b8d2f2378717e94f63b36a74274760b4895943b3a5650fa7513e" +checksum = "2cfc5faa2e0d044b3f5f0879be2920e0a711c97744c42cf1c295cb183668933e" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix index 957a8ab96c9b..872824fd247f 100644 --- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix @@ -6,12 +6,12 @@ vimUtils, }: let - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; rev = "refs/tags/v${version}"; - hash = "sha256-jWRXrFh83lTRsgm0gSZuRORltqo147BAg1zVcd7rIMg="; + hash = "sha256-LWA3rPvqq+zeK+8zS1kM1BaQ+uaBmlHJy4o7IaT1zsg="; }; libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; blink-fuzzy-lib = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 11f6cce9affa..9deb0dcec69f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-10-25"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "e4cb1fc27e0def7571e5329f522a79e9555a5502"; - sha256 = "1mmc77l2wn3vrchc7g0k45910krzdhp0r82sm7a0lvj8inkd96d7"; + rev = "d786775c8f246a37226731e75d8f0e497f4ba9c7"; + sha256 = "0csrh6lg77skybz80f5kka4d1zvqic6ly0wcjf2gcprcqgsfxypd"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -137,12 +137,12 @@ final: prev: Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; - version = "2024-10-26"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "e4387026585dbd98dcb5d2a007d1fa0afefa5941"; - sha256 = "03mbykgl50fqjsaca37gig3bwr6ikbkh0dlika0hj46jrxm3vsvl"; + rev = "c7e8973426431839e9d888a4aa8d6a41251ba16f"; + sha256 = "1gchcwxfaih2anl512zmm7rr7a15jj97lkps7r0r2fqpb9mpdfgv"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -185,12 +185,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-10-24"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "cb40a09538dc0c417a7ffbbacdbdec90be4a792c"; - sha256 = "13qwf1lh0ia700j2wq93y3g45pbmfm3l499hi8vw076xmzgh0pav"; + rev = "75750be1c0493659c9fbc60ff5e06dba053ef528"; + sha256 = "18ig07s94lw1yc302r3a7ppsjl9hrxv96pq48m14ixa7al6a2l1d"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -341,12 +341,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-10-27"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e8835ae8e941e940ed3418c3a77976a2bacc52e4"; - sha256 = "1zkgx4xypp9wvrg8lsidpxfvl1fk2pdggr5dhghbg74n81vvkmbn"; + rev = "22ce6adf3c866a8c3d0c55956c4b8feeb4f10c32"; + sha256 = "198yd9j7xfrbl2hgjzmmgsgj05sxj9zl07qk7av8v0vdyglmwgqn"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -413,12 +413,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-10-23"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "24ca491c539f19fee4822abeb55a23d68aaf0621"; - sha256 = "1sa11vi0k3cjw4d8r1z9bxkj5s1i41fmjsvqi3ywnb4dqcnfi6x4"; + rev = "08719ccab2073b4c12f2c6b318eba63b87e35180"; + sha256 = "0fr7vhs5gi054nn9z3hqcgf4y3w7nx00d94f7nd9g2jg7x2zzfyp"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -570,12 +570,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-10-16"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "60a784614acb1d7695bd9ae0fee8ada1bf7b0c28"; - sha256 = "0irll73fsi0y005gxvvhjga35gfl2bjyg5q9hgdczagy42xb6hvw"; + rev = "247df216704cbe3cfa68e2ae5515c3485e281364"; + sha256 = "1mbk8zl03qiid093nac8i48lfg4dsf9vvyq4jams76mwa8kj58am"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -643,12 +643,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-10-19"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "9854e19fa9f01e5d25a445893ea480f4ac172591"; - sha256 = "0nsnhp86b3y30w7r34nd1ib3m6dr3dx9xbc7hm15k7f2shjwxnss"; + rev = "4fca3824cc34f731cb5b3e51844698052c5f6c52"; + sha256 = "050fi67l15ni55q4acwnvvrw4gmas0imhdm0wz6bjfb2lrcbfa1h"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -979,12 +979,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-10-18"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "3cd531ce4d46fb156268ddedf5f3e6822ef26af7"; - sha256 = "0jjc2ziw4v6xma416mz4ixk9svsf25p58wc3wvr1v1zsc6nkzvfd"; + rev = "542d338ec5ee027638c8e076110b188a465b45d2"; + sha256 = "1v7gkbir6zm69h9annaln54i8qrpack9qxm44jz0sjjvrrqd4ni2"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1037,6 +1037,18 @@ final: prev: meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; }; + avante-nvim = buildVimPlugin { + pname = "avante.nvim"; + version = "2024-11-05"; + src = fetchFromGitHub { + owner = "yetone"; + repo = "avante.nvim"; + rev = "9fbe0256f277a940fa61dce127129c1e8a3916a0"; + sha256 = "0shpbjf3cnlw7icrabah4q077rn110gdw5bc9hif1dwf7wdffhvc"; + }; + meta.homepage = "https://github.com/yetone/avante.nvim/"; + }; + awesome-vim-colorschemes = buildVimPlugin { pname = "awesome-vim-colorschemes"; version = "2024-05-18"; @@ -1100,12 +1112,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-10-16"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "7e5bcd10ae1f1f7cd315fa88049ea21babe11815"; - sha256 = "1srrhhiy8vh4myggwsgn98a1ig26dg9p12zl27zcls1jpd59p0d6"; + rev = "57e1bff1c0df29d7ec0071baf49210c48fc4a98b"; + sha256 = "0vx1i17w9gkfsjy9svpvpv5xmaqsr6z4gr01fd6221j9kmm6n50y"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1160,12 +1172,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-10-13"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "fec9fa583025e69e0c4f902bd61990e8d13d1975"; - sha256 = "0zzkpl73cf1xd8lhmn9468ca8xpdyhbpki6yazwsdvdvn657fyy7"; + rev = "f006ffdd0e4c0a8b1a639713f5208bc282c60058"; + sha256 = "03xn81k39vj5js7q165a51w5fq96mysay7824j5ky2n0941n41cd"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1208,12 +1220,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-08-31"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "bb197e51a91a635deb88630813c3bfc284413697"; - sha256 = "12nn87w12v9b2l86x2q55kqw5nqixyz6qqpcy8vb7d1rmj5v7j2j"; + rev = "199dcc2643dec5d8dbdab4ec672cf405224dcb3b"; + sha256 = "074z27g7ac0byna12przi5sqb0ca8c4q12kb3pc7bq1vlhag9f73"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1422,6 +1434,30 @@ final: prev: meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; + catppuccin-nvim = buildVimPlugin { + pname = "catppuccin-nvim"; + version = "2024-11-03"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "nvim"; + rev = "35d8057137af463c9f41f169539e9b190d57d269"; + sha256 = "1lra18arndkpd8k9pyh3qgykihqnvm8h6v0w0kjpf36ys9xgpz3r"; + }; + meta.homepage = "https://github.com/catppuccin/nvim/"; + }; + + catppuccin-vim = buildVimPlugin { + pname = "catppuccin-vim"; + version = "2024-08-14"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "vim"; + rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; + sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; + }; + meta.homepage = "https://github.com/catppuccin/vim/"; + }; + caw-vim = buildVimPlugin { pname = "caw.vim"; version = "2023-03-16"; @@ -1460,12 +1496,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-10-27"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "bacd90ae5256ae5c1a53752f3c8f54addee68951"; - sha256 = "1il3mbkzk8w3zjkxm0dqnl44sl8h3j9fqqqbgmghy588wpa8hfli"; + rev = "d7953decafaf81d7c687505d5261ad7cff938b34"; + sha256 = "0wh0lb1phnlnvsba6hrq3xfc7brqq691rn4jv0518zssqh5j3vb9"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -2045,18 +2081,6 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; - cmp-pandoc-references = buildVimPlugin { - pname = "cmp-pandoc-references"; - version = "2022-04-20"; - src = fetchFromGitHub { - owner = "jc-doyle"; - repo = "cmp-pandoc-references"; - rev = "2c808dff631a783ddd2c554c4c6033907589baf6"; - sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw"; - }; - meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; - }; - cmp-pandoc-nvim = buildVimPlugin { pname = "cmp-pandoc.nvim"; version = "2023-03-03"; @@ -2069,6 +2093,18 @@ final: prev: meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; }; + cmp-pandoc-references = buildVimPlugin { + pname = "cmp-pandoc-references"; + version = "2022-04-20"; + src = fetchFromGitHub { + owner = "jc-doyle"; + repo = "cmp-pandoc-references"; + rev = "2c808dff631a783ddd2c554c4c6033907589baf6"; + sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw"; + }; + meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; + }; + cmp-path = buildVimPlugin { pname = "cmp-path"; version = "2022-10-03"; @@ -2189,6 +2225,18 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; }; + cmp-vimtex = buildVimPlugin { + pname = "cmp-vimtex"; + version = "2024-08-06"; + src = fetchFromGitHub { + owner = "micangl"; + repo = "cmp-vimtex"; + rev = "5283bf9108ef33d41e704027b9ef22437ce7a15b"; + sha256 = "pD2dPdpyn5A/uwonDdAxCX138yBeDqbXDdlG/IKjVTU="; + }; + meta.homepage = "https://github.com/micangl/cmp-vimtex/"; + }; + cmp-vimwiki-tags = buildVimPlugin { pname = "cmp-vimwiki-tags"; version = "2022-04-25"; @@ -2227,12 +2275,12 @@ final: prev: cmp_luasnip = buildVimPlugin { pname = "cmp_luasnip"; - version = "2023-10-09"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "05a9ab28b53f71d1aece421ef32fee2cb857a843"; - sha256 = "0gw3jz65dnxkc618j26zj37gs1yycf7wql9yqc9glazjdjbljhlx"; + rev = "98d9cb5c2c38532bd9bdb481067b20fea8f32e90"; + sha256 = "037sh4g1747wf07f9sqngiifp89hqww6m2rvizy5ra7jyd04magk"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -2321,6 +2369,18 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-neco/"; }; + coc-nvim = buildVimPlugin { + pname = "coc.nvim"; + version = "2024-10-12"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed"; + sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l"; + }; + meta.homepage = "https://github.com/neoclide/coc.nvim/"; + }; + coc-svelte = buildVimPlugin { pname = "coc-svelte"; version = "2023-10-08"; @@ -2345,18 +2405,6 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; }; - coc-nvim = buildVimPlugin { - pname = "coc.nvim"; - version = "2024-10-12"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc.nvim"; - rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed"; - sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l"; - }; - meta.homepage = "https://github.com/neoclide/coc.nvim/"; - }; - coconut-vim = buildVimPlugin { pname = "coconut.vim"; version = "2017-10-10"; @@ -2371,12 +2419,12 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-10-27"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "a7196bf9472b56ecac5c93c8b6eefba932b14492"; - sha256 = "1za7gc7m563p8a7j712hmyfvab2c46kn267jfjy4dvjb7rdvg80v"; + rev = "dddaee0d1e9a1d0bcaea66f08a8103b3cdf26604"; + sha256 = "17wrbhlm9zrskrxn78pin54qp9q8vdn6yahfdmr9763vzjf88cml"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; @@ -2503,12 +2551,12 @@ final: prev: committia-vim = buildVimPlugin { pname = "committia.vim"; - version = "2023-11-25"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "a187b8633694027ab5ef8a834527d33093282f95"; - sha256 = "1ncvpsa83g665yh3qxrwigsvpxpwm3586198zp6rlmq719d3yh3g"; + rev = "c8c0f255e8090ed90dd9d5dd2e8672994f8e3671"; + sha256 = "05hh42c5c7k4sh4jpy1ccs20vyp3malfab4v3yzgp2m6jrz93nln"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; @@ -2587,12 +2635,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-10-06"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "fd28c5e3cf9f78d9a943530ffd1b9cbd15e57ee1"; - sha256 = "0hdj464fnwii30cwmsy1p0a90gmhxcnh2nxvfycn7gm1kanly8np"; + rev = "eb7f82bb8f9e722dd194f638e67ec53c12ce5ac5"; + sha256 = "1pbd9n2338bzm665vsv5imayqa2ika2ypa5nlwx230n0zymnl8s6"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2671,12 +2719,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-10-27"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "6a28c90082a67f62a323ab90d988e000a718a8c7"; - sha256 = "0f6mn95xd1z2czvjzy3mdhkbinjb6ljp2yyz0v3sqnggk6q9x8vs"; + rev = "d28ccf945374edd9f1c34a82f6c22261dbd8ab98"; + sha256 = "1rrcqrag8xvwvddjzxab5grnwn38f78hj462w1dszk7gd922px3y"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2730,18 +2778,6 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; - copilot-lualine = buildVimPlugin { - pname = "copilot-lualine"; - version = "2024-09-03"; - src = fetchFromGitHub { - owner = "AndreM222"; - repo = "copilot-lualine"; - rev = "f40450c3e138766026327e7807877ea860618258"; - sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; - }; - meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; - }; - copilot-lua = buildVimPlugin { pname = "copilot.lua"; version = "2024-10-18"; @@ -2754,6 +2790,18 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; + copilot-lualine = buildVimPlugin { + pname = "copilot-lualine"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "AndreM222"; + repo = "copilot-lualine"; + rev = "f40450c3e138766026327e7807877ea860618258"; + sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; + }; + meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; + }; + copilot-vim = buildVimPlugin { pname = "copilot.vim"; version = "2024-10-08"; @@ -2876,12 +2924,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-10-09"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "b647e1bd1f9c0410f5ef4a1517a331cbac322d9a"; - sha256 = "0157f53l65r68dy3swx221nijzfxqq3hrhpfz8sg8fi1j9bwzqmh"; + rev = "760a2387d664e9781b1a69e5040e89e159ec56a9"; + sha256 = "0zrdy6nq1yn9xna3nj8q6nxflkmc2420n6x3vxhsl18v4p04gvg7"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; @@ -2922,18 +2970,6 @@ final: prev: meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; - ctrlp-z = buildVimPlugin { - pname = "ctrlp-z"; - version = "2015-10-17"; - src = fetchFromGitHub { - owner = "amiorin"; - repo = "ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; - }; - meta.homepage = "https://github.com/amiorin/ctrlp-z/"; - }; - ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; version = "2024-10-21"; @@ -2946,6 +2982,18 @@ final: prev: meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; + ctrlp-z = buildVimPlugin { + pname = "ctrlp-z"; + version = "2015-10-17"; + src = fetchFromGitHub { + owner = "amiorin"; + repo = "ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + meta.homepage = "https://github.com/amiorin/ctrlp-z/"; + }; + cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; version = "2024-10-19"; @@ -2996,12 +3044,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-10-14"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "d2c5a4d1341f5ca1ed2ecb4ecfcff2bc8ea18b14"; - sha256 = "1502s7mkc2z42gvh9hrs6c0rhmm7illhnhgvqks2mn2dl8431yw4"; + rev = "ae309606940d26d8c9df8b048a6e136b6bbec478"; + sha256 = "06mr3869ag542vxnj68458k9cfyw9ldj0mjahzqkpwfl5nc28bs2"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -3068,24 +3116,24 @@ final: prev: ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2024-10-27"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "70a5328ce68d1a9618c73e5a65aefd0b8707685b"; - sha256 = "1hvkhxs7gsiixl9sl0fkfb0yzqalsn6y6h8i324kalm85zvl824j"; + rev = "238c1a743f3b349e16fb3a5a4a00bb387292f436"; + sha256 = "0y46wz7zz13vq80gqh26ms1p1pm6v7r486w91sfcawba5lm7ahgf"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-10-26"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "dcd6bb1368225a9b3f091e5a67229b54c9b065ac"; - sha256 = "0205csmf9ndzszpp7bm6mbp5khyszr0jgwhsw5rmwlmap1yrjia3"; + rev = "64148dfb91c04c033cbdba7db5e3bd4d3b501bae"; + sha256 = "08vqphvffpx9hqnn15ycl6fbq8xybzn98v8ifhq8xgglvvfcv9za"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3200,12 +3248,12 @@ final: prev: deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-10-16"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "72997a29dbc1f75b5b6df71d2392abb5ef92e6dd"; - sha256 = "1w880g2g5f3p5slk7swcgbz8psk8c2wm54klmk4khmyx79b643jn"; + rev = "f4f0484cc84d11e12fa88bcc7c9f448755dbb5a6"; + sha256 = "0f9xiy8wa59mxfbq8bb5dc6sz97hdpj724ckr5k3b2g53zhvvf46"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3344,6 +3392,18 @@ final: prev: meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; }; + deoplete-nvim = buildVimPlugin { + pname = "deoplete.nvim"; + version = "2024-06-05"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "deoplete.nvim"; + rev = "e5a47d4a2f0b2b6f568e708163e2354097e611c6"; + sha256 = "1cj5y29gkm2l1c7g7bp50k522dn4yk67sywc19lcyizpwxvqq0a2"; + }; + meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; + }; + deoplete-phpactor = buildVimPlugin { pname = "deoplete-phpactor"; version = "2020-09-12"; @@ -3416,18 +3476,6 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; }; - deoplete-nvim = buildVimPlugin { - pname = "deoplete.nvim"; - version = "2024-06-05"; - src = fetchFromGitHub { - owner = "Shougo"; - repo = "deoplete.nvim"; - rev = "e5a47d4a2f0b2b6f568e708163e2354097e611c6"; - sha256 = "1cj5y29gkm2l1c7g7bp50k522dn4yk67sywc19lcyizpwxvqq0a2"; - }; - meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; - }; - devdocs-vim = buildVimPlugin { pname = "devdocs.vim"; version = "2018-08-27"; @@ -3478,12 +3526,12 @@ final: prev: diagram-nvim = buildVimPlugin { pname = "diagram.nvim"; - version = "2024-09-22"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "3rd"; repo = "diagram.nvim"; - rev = "7e86bc292982db1a77ffb2a85912199476ea2712"; - sha256 = "1axcm67ggmrvipqdwhg3vqsa7nwfhx6s1g7xfkzymxichl6n1dm4"; + rev = "69be4d5866ac9805694a31fbcd928aa6e8dd23e9"; + sha256 = "0h4ynxdvz93mm4gp30mpbaaca57b96khkxhxw24ak3m6ndz4z4dw"; }; meta.homepage = "https://github.com/3rd/diagram.nvim/"; }; @@ -3584,26 +3632,38 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; + dracula-vim = buildVimPlugin { + pname = "dracula-vim"; + version = "2024-07-26"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "vim"; + rev = "65f4225e0526516a67d56c8ac09925a209138e53"; + sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8"; + }; + meta.homepage = "https://github.com/dracula/vim/"; + }; + dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-09-17"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2"; - sha256 = "04zjfisknbdaaydv9qhfr2lw53rgb02irar13br82ji81j2dilhj"; + rev = "6ef1ca479d37d4ff66f13eed44d08912caff483a"; + sha256 = "04crajvh4mmziz2ixdir419cjrglgrxh3m8zjkrh9xbc0g49vn8p"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-10-26"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "9d8cad9548804a33c9a1968fe305e46e95c911ae"; - sha256 = "1cj5rqww6dq0jkvd6k9dhwxj6zv1373r5w72dccwwxwx2k55ximp"; + rev = "22382f44f8ce0320d38023c6a68f3ef4087c8c10"; + sha256 = "05hhxlcgs7nh8s8zj1zi0ssgq288q6j1cglhrp4l764wh4pnwlgd"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3668,6 +3728,18 @@ final: prev: meta.homepage = "https://github.com/folke/edgy.nvim/"; }; + editorconfig-nvim = buildVimPlugin { + pname = "editorconfig.nvim"; + version = "2023-01-10"; + src = fetchFromGitHub { + owner = "gpanders"; + repo = "editorconfig.nvim"; + rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; + sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; + }; + meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; + }; + editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; version = "2024-10-14"; @@ -3681,18 +3753,6 @@ final: prev: meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; - editorconfig-nvim = buildVimPlugin { - pname = "editorconfig.nvim"; - version = "2023-01-10"; - src = fetchFromGitHub { - owner = "gpanders"; - repo = "editorconfig.nvim"; - rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; - sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; - }; - meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; - }; - efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; version = "2024-10-15"; @@ -3741,6 +3801,18 @@ final: prev: meta.homepage = "https://github.com/dmix/elvish.vim/"; }; + embark-vim = buildVimPlugin { + pname = "embark-vim"; + version = "2024-09-21"; + src = fetchFromGitHub { + owner = "embark-theme"; + repo = "vim"; + rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; + sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; + }; + meta.homepage = "https://github.com/embark-theme/vim/"; + }; + emmet-vim = buildVimPlugin { pname = "emmet-vim"; version = "2024-08-10"; @@ -3792,12 +3864,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-09-30"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "87b8554b2872ef69018d4b13d288756dd4e47c0f"; - sha256 = "013dxglqhvwr6i6yp8z7wma3ja6i0qmr0wps8k3d987ji2ibixv9"; + rev = "0f6a0abebc98729ea0b45927151d47e2d4ce517c"; + sha256 = "00kjk7z87lxxfzlisrdx3g1glxlyzl7sgglsqnjw0771nrzz3qkc"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3850,6 +3922,18 @@ final: prev: meta.homepage = "https://github.com/brooth/far.vim/"; }; + fastaction-nvim = buildVimPlugin { + pname = "fastaction.nvim"; + version = "2024-10-26"; + src = fetchFromGitHub { + owner = "Chaitanyabsprip"; + repo = "fastaction.nvim"; + rev = "77ae921e6fa6a8e2705768fa89b89b0e45840b94"; + sha256 = "sha256-2UuEORFTj4+gbuEm1D2FHXrRiU3pDsS5NG50Q9I1wuk="; + }; + meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/"; + }; + faster-nvim = buildVimPlugin { pname = "faster.nvim"; version = "2024-04-11"; @@ -3924,12 +4008,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-07-13"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "d855eed8a06531a7e8fd0684889b2943f373c469"; - sha256 = "0lb8zbncdlq91f4x8jqijpqvaigjw7f8b79milxwa11wvm25sg3y"; + rev = "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f"; + sha256 = "01ilp9nidqaw9am5qdyga14gnnpsqi82f45ng273dqbrfn86n03x"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -4081,12 +4165,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-10-22"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "3d6979b900c8787906427fece1344a25c8e17eba"; - sha256 = "1w1brizgrwb3726bcfrybgcckl6mnic5l3qkyir61h5xcz7zw721"; + rev = "7e6d8611d8606efca64cb8cf1ca07550b7087d1c"; + sha256 = "07039jvs6m97knj83liv4iyd1k1wj7zmradqfhxnszcjigx05avw"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; @@ -4115,6 +4199,18 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/"; }; + follow-md-links-nvim = buildVimPlugin { + pname = "follow-md-links.nvim"; + version = "2024-09-29"; + src = fetchFromGitHub { + owner = "jghauser"; + repo = "follow-md-links.nvim"; + rev = "41a6d74636b4209571680d40f20f59a0bf30bf57"; + sha256 = "ULQTE57SRA8uTuvg5LLJzcI5hOlXDrUwrHfm9+1pbe8="; + }; + meta.homepage = "https://github.com/jghauser/follow-md-links.nvim/"; + }; + formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; version = "2024-10-22"; @@ -4273,12 +4369,12 @@ final: prev: fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-10-01"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ec75ffbfd50630bf2b8d444d89487e149bacf7f3"; - sha256 = "1rl3wr3fb828achkhl0pzkfv2dnhqf0h3hk5p03bdjmck6nahkaf"; + rev = "556f45e79ae5e3970054fee4c4373472604a1b4e"; + sha256 = "0p4ip7mqaqychxsrqk9qfa4yllfp82rqvm64v0ljk6n4yah7m328"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4295,6 +4391,18 @@ final: prev: meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; + gbprod-nord = buildVimPlugin { + pname = "gbprod-nord"; + version = "2024-10-10"; + src = fetchFromGitHub { + owner = "gbprod"; + repo = "nord.nvim"; + rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c"; + sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra"; + }; + meta.homepage = "https://github.com/gbprod/nord.nvim/"; + }; + gen_tags-vim = buildVimPlugin { pname = "gen_tags.vim"; version = "2023-03-06"; @@ -4441,12 +4549,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-10-20"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ee7634ab4f0a6606438fe13e16cbf2065589a5ed"; - sha256 = "134xgywyjcg731iya93w14p48dq4cp21q36fb4jf7c4vgnnzy7ld"; + rev = "4daf7022f1481edf1e8fb9947df13bb07c18e89a"; + sha256 = "0l3jmqcx17q76bhbww8dwhzif9jcsnk53xwqagdzkb4m6xzywz0l"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4501,24 +4609,24 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-10-21"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "12ab6ac0fdd03b1ec9ee4e5378dd204f744a55bf"; - sha256 = "0ckmvsqwms66h50xrh27rhn7f58ziqcrdzr08vf07k13ljnlsqkh"; + rev = "2153f9ee6178dfd625b1a874eab6399fd0a2d984"; + sha256 = "1pqw04hfch36pzas76rkj1s1chwip72fb2n78isfh384v0s4rfwg"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2024-07-08"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "777a454e310a6b03c498727449eff3caabd70fa1"; - sha256 = "05p22qnvhspqi2vbbg8q5can36i5fyksm5x6ra2l83nv0g42fcql"; + rev = "ffb1b98087daa1e10087a3bf06c30291a17b1310"; + sha256 = "1gg7il6bkib2f2y8r0lmr2jjva3la0kamk755kjn45mywfbz8wsz"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -4655,6 +4763,18 @@ final: prev: meta.homepage = "https://github.com/luisiacc/gruvbox-baby/"; }; + gruvbox-community = buildVimPlugin { + pname = "gruvbox-community"; + version = "2024-01-21"; + src = fetchFromGitHub { + owner = "gruvbox-community"; + repo = "gruvbox"; + rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b"; + sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351"; + }; + meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; + }; + gruvbox-flat-nvim = buildVimPlugin { pname = "gruvbox-flat.nvim"; version = "2023-05-27"; @@ -4717,12 +4837,12 @@ final: prev: guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-10-26"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "1e94ca1e2d4de3b6c435bbaa2a28913610a6ecd5"; - sha256 = "16sc7ki7m9gh90fjflmqvhc62x5svc3hzfar7pshcc4q18mmjcva"; + rev = "1f5afa0b7ca93e05e5c80371dd5fd74ee2545097"; + sha256 = "17d48dibqsf5walfkrvn0pd43gg57qilc7qkp4pjz8fazb0j3mh8"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4810,6 +4930,18 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; + harpoon2 = buildVimPlugin { + pname = "harpoon2"; + version = "2024-04-09"; + src = fetchFromGitHub { + owner = "ThePrimeagen"; + repo = "harpoon"; + rev = "0378a6c428a0bed6a2781d459d7943843f374bce"; + sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m"; + }; + meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; + }; + haskell-scope-highlighting-nvim = buildVimPlugin { pname = "haskell-scope-highlighting.nvim"; version = "2024-07-02"; @@ -5029,12 +5161,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-06-12"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "4339cbbcb572b1934c53dcb66ad4bf6a0abb7918"; - sha256 = "1nnhm8xhkdjvqal7016v22cljhpga8y0mydmvalz954cviskhna3"; + rev = "f8e162daccb2f117e19f3d5ad3647ac0cefb02e3"; + sha256 = "0wha33yba63k15cv4k7ckbsd6qszfcjb5i4km6i2r98dq59mhar0"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -5137,12 +5269,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-10-28"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "1bb91fc3a99bf599324bd32a69bf8c925269e3c8"; - sha256 = "0ijshi300g0d1z2lasx9xhw0zcml4ahvn0p281rygd9nrk6hav07"; + rev = "3e0fb47c9ea92a0ba9468c2ae533f30539505a1a"; + sha256 = "0yryrlscnlk9bqklm4yw2grg11h915spl1qbs3m8zyhsmnakpbrb"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5233,12 +5365,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-10-07"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "e7a4442e055ec953311e77791546238d1eaae507"; - sha256 = "1w02a7vz8cxmfnspgqkkp5rih01av0z7wpb78b8f7xhkp24mmarq"; + rev = "04e44b09ee3ff189c69ab082edac1ef7ae2e256c"; + sha256 = "08vf6k69p6gnciawabgy11sd5vy94i8087jxwch07plr9kfginx1"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5293,12 +5425,12 @@ final: prev: intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; - version = "2024-02-05"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "pta2002"; repo = "intellitab.nvim"; - rev = "31f914282e342c886243edb22dcfc82ffe6b7528"; - sha256 = "1gq1mvhwdmjmsc4dypigy7qaj1yyi4zn7faws8l8kvqm6k3ff057"; + rev = "698ea483eb91e314f472c9c119915c034479ea08"; + sha256 = "1z3vlbccwlq1z322yxnjgq8kvr3rkhj604ng6jlgccl06482vksa"; }; meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; }; @@ -5584,12 +5716,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2024-10-23"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "9bfa4e9ac82ca3429bd2edcc70e15623545c8d3f"; - sha256 = "1hxqhna4jby2xds11l95ygg6ifs0g5lin8yq696gv5wsl0c571vl"; + rev = "3fc84b71f250408bfc4d863f663c5e273f42180a"; + sha256 = "0jrl2522k922y5n6iycyawvq3wm7bap221ax57h9wbk582yh33jr"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5656,24 +5788,24 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-10-22"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "cf8ecc2c5e4332760431a33534240b0cbc6680ab"; - sha256 = "1zly0l298xai6a88m9vbxrqrf6cx1pvs735s51gdxnkvmn63p0ac"; + rev = "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9"; + sha256 = "0m4xh2ahybsh1jfrymdzvxa8az7pjgsn3a0z71k1hhr1lj6vbv4w"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-07-25"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "491452cf1ca6f029e90ad0d0368848fac717c6d2"; - sha256 = "1yc87wv6g19yj1gypfy4nl9irpb7zfqlw98vyaf8aqjgnpd0z60g"; + rev = "d5800897d9180cea800023f2429bce0a94ed6064"; + sha256 = "0fddfdknmvac0b1dnqq90ip6cn57dy6qgpskmy44a2k803c9n1sy"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5692,12 +5824,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-10-27"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "c70bf4d5d462ce8ee7f315250203205568827004"; - sha256 = "00j4z5kdzw3ky1yk051kql67g7qdbvcy5h4089f5x0b7fzc57l0j"; + rev = "de515ccaf139f766087b0fa38af30e1bfa448ee7"; + sha256 = "0jhp0i5yfbzkykmlyd3b1ik902db5lrwspdhya9339v6wvf6j4ff"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5752,12 +5884,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-10-25"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "8543775d5aa3a418e5e34fe6fd07e335b5df08bc"; - sha256 = "0qfrr5pc19x1v66lh04nxx1q1rx5qdnszsqy6srdycry46808q0g"; + rev = "5086c5ac463ce0288f0eea7e9d23e529edf770fd"; + sha256 = "1dgc3l9phm0pf15af3p1i4ahlkclphv2s4syngwq8bpxx702v24j"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5978,18 +6110,6 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; - litee-symboltree-nvim = buildVimPlugin { - pname = "litee-symboltree.nvim"; - version = "2022-09-28"; - src = fetchFromGitHub { - owner = "ldelossa"; - repo = "litee-symboltree.nvim"; - rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; - sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; - }; - meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; - }; - litee-nvim = buildVimPlugin { pname = "litee.nvim"; version = "2024-06-06"; @@ -6002,6 +6122,18 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; + litee-symboltree-nvim = buildVimPlugin { + pname = "litee-symboltree.nvim"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "ldelossa"; + repo = "litee-symboltree.nvim"; + rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; + sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; + }; + meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; + }; + live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; version = "2024-09-20"; @@ -6207,29 +6339,41 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-08-12"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "b431d228b7bbcdaea818bdc3e25b8cdbe861f056"; - sha256 = "1q8f0vl60hllxkmmras05cliklzqvi3yrb9rhamrr4cgvsdvnac0"; + rev = "640260d7c2d98779cab89b1e7088ab14ea354a02"; + sha256 = "0vd9n7mxzgasr8i454vg3698l25lzkci2bz0s8rwhkmq5n6sdfh4"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-10-28"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "67c0da98d807bbbcb6e43a446a01407529e1dd10"; - sha256 = "1vr2qxim8s4bzkfq7nds79dkcw8d68x8q2l8ir0b0cifc8nyxx90"; + rev = "4bf40748f6fe939bdcb69325918535b1c5edea51"; + sha256 = "1912qksj1j9rd0q3vq73nzf18yq6hazfa0l6wwkpvgxyjsbc0fsq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; + luasnip-latex-snippets-nvim = buildVimPlugin { + pname = "luasnip-latex-snippets.nvim"; + version = "2024-09-16"; + src = fetchFromGitHub { + owner = "evesdropper"; + repo = "luasnip-latex-snippets.nvim"; + rev = "c6b5b5367dd4bb8419389f5acf528acf296adcdd"; + sha256 = "calv4nF1yxJyehQC+l0p4psI+f4Kg49K6XziCkH9I1Q="; + }; + meta.homepage = "https://github.com/evesdropper/luasnip-latex-snippets.nvim/"; + }; + luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; version = "2024-07-03"; @@ -6287,7 +6431,7 @@ final: prev: rev = "ff3deba8a879806a51c005e50782130246143d06"; sha256 = "sha256-IrMR57gk9iCk73esHO24KZeep9VrlkV5sOC4PzGexyo="; }; - meta.homepage = "https://github.com/dccsillag/magma-nvim"; + meta.homepage = "https://github.com/dccsillag/magma-nvim/"; }; mark-radar-nvim = buildVimPlugin { @@ -6302,18 +6446,6 @@ final: prev: meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; }; - markdown-preview-nvim = buildVimPlugin { - pname = "markdown-preview.nvim"; - version = "2023-10-17"; - src = fetchFromGitHub { - owner = "iamcco"; - repo = "markdown-preview.nvim"; - rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; - sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; - }; - meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; - }; - markdown-nvim = buildVimPlugin { pname = "markdown.nvim"; version = "2024-06-25"; @@ -6326,6 +6458,18 @@ final: prev: meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/"; }; + markdown-preview-nvim = buildVimPlugin { + pname = "markdown-preview.nvim"; + version = "2023-10-17"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "markdown-preview.nvim"; + rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; + sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; + }; + meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; + }; + markid = buildVimPlugin { pname = "markid"; version = "2023-10-18"; @@ -6365,28 +6509,16 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-10-22"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "7446f47b3dfb7df801f31a6f6783c2ad119a6935"; - sha256 = "0v7fmnmm9rc63gfw3s3gy6ggi7jilkvhichivfm6wpc0i4sy36jv"; + rev = "4d0e5b49363cac187326998b96aa6a2884e0e89b"; + sha256 = "19nr5v086as2gfqcqdsrzzdr1wr38qa42rmdp3mgps2vkb9mxpq4"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; - mason-tool-installer-nvim = buildVimPlugin { - pname = "mason-tool-installer.nvim"; - version = "2024-06-03"; - src = fetchFromGitHub { - owner = "WhoIsSethDaniel"; - repo = "mason-tool-installer.nvim"; - rev = "c5e07b8ff54187716334d585db34282e46fa2932"; - sha256 = "1zpf9v6abg482hbpi0mg0v2g67jvvnxd25aiclyh7bb24s8ljc0y"; - }; - meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; - }; - mason-nvim = buildVimPlugin { pname = "mason.nvim"; version = "2024-07-16"; @@ -6399,6 +6531,18 @@ final: prev: meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; + mason-tool-installer-nvim = buildVimPlugin { + pname = "mason-tool-installer.nvim"; + version = "2024-06-03"; + src = fetchFromGitHub { + owner = "WhoIsSethDaniel"; + repo = "mason-tool-installer.nvim"; + rev = "c5e07b8ff54187716334d585db34282e46fa2932"; + sha256 = "1zpf9v6abg482hbpi0mg0v2g67jvvnxd25aiclyh7bb24s8ljc0y"; + }; + meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; + }; + matchit-zip = buildVimPlugin { pname = "matchit.zip"; version = "2010-10-18"; @@ -6413,12 +6557,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-09-03"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "ac8f02e97e359b7d258c0a00ec0949fe880790ad"; - sha256 = "1yjgl6rbcb90vghs3wq5rifws7n0caq12l3qfqxc7q2c8ap36ym6"; + rev = "0bcabb582c31b750428af9dbb0d146c1c2d75d4c"; + sha256 = "0hnvw4knjgsf9q8ng0l66bgyrrjr71ba4nb6dk3bjgq7fv93ph1x"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6435,6 +6579,18 @@ final: prev: meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; + mattn-calendar-vim = buildVimPlugin { + pname = "mattn-calendar-vim"; + version = "2022-02-10"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "calendar-vim"; + rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d"; + sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q"; + }; + meta.homepage = "https://github.com/mattn/calendar-vim/"; + }; + mayansmoke = buildVimPlugin { pname = "mayansmoke"; version = "2010-10-18"; @@ -6497,12 +6653,12 @@ final: prev: midnight-nvim = buildVimPlugin { pname = "midnight.nvim"; - version = "2024-02-24"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "dasupradyumna"; repo = "midnight.nvim"; - rev = "b5a1dd02a3c2ddc56de8466da45895b19981584a"; - sha256 = "1ajpkw12ff7xhzl3axl5y3q13zsrjm24mydwr166x3lba6ccqif2"; + rev = "fe062a6f2e5bd77cd8a260f61e6e12789eaf4f13"; + sha256 = "0y0ygwgnqlal4pbq58scjc0iprylk37g79w1mbv5f5ylpj4wnm2z"; }; meta.homepage = "https://github.com/dasupradyumna/midnight.nvim/"; }; @@ -6519,18 +6675,6 @@ final: prev: meta.homepage = "https://github.com/hadronized/mind.nvim/"; }; - mini-git = buildVimPlugin { - pname = "mini-git"; - version = "2024-09-07"; - src = fetchFromGitHub { - owner = "echasnovski"; - repo = "mini-git"; - rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; - sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; - }; - meta.homepage = "https://github.com/echasnovski/mini-git/"; - }; - mini-ai = buildVimPlugin { pname = "mini.ai"; version = "2024-09-28"; @@ -6569,24 +6713,24 @@ final: prev: mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2024-10-21"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.base16"; - rev = "ddf5076aad744bc5f393f8103ad798adf4ed241b"; - sha256 = "1kjka663skxvv424c10m0sz5sv2y3359hcc0gpazi3gs0sma6d4y"; + rev = "97abc91a0ef042dbb0607ac538c5fecc65302fbb"; + sha256 = "0gwi1l3swf641g1fg77vm2cx8nxbb7lrcfylrjv3bymbmgllpasw"; }; meta.homepage = "https://github.com/echasnovski/mini.base16/"; }; mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "2024-09-06"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.basics"; - rev = "7d4c6982be471e902c034bea6b3fe348058196d9"; - sha256 = "039jdbjjp713rh0yaa503khwxz6dya28h6arksyj52mfmzajnwrq"; + rev = "67c10b3436d5d3b892715137f4773e71c6753b13"; + sha256 = "1ia7wha33l6q1krlx7d90v5rw25kdiv6la8j7f0s8vr0qxlcxhs7"; }; meta.homepage = "https://github.com/echasnovski/mini.basics/"; }; @@ -6605,12 +6749,12 @@ final: prev: mini-bufremove = buildVimPlugin { pname = "mini.bufremove"; - version = "2024-07-01"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.bufremove"; - rev = "1ee294a97e091d3cf967974df622c0d887890dc2"; - sha256 = "0jhhh2f4zzbixcqbp7540bzgbzgwwipi37knqj1ykpf5py4kp0dm"; + rev = "285bdac9596ee7375db50c0f76ed04336dcd2685"; + sha256 = "0q8zm3k8hhpzbcjcd3gqz1r064fiymv9w2lfbdv5hhn2b8i9j7h8"; }; meta.homepage = "https://github.com/echasnovski/mini.bufremove/"; }; @@ -6629,12 +6773,12 @@ final: prev: mini-colors = buildVimPlugin { pname = "mini.colors"; - version = "2024-07-01"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.colors"; - rev = "9fa904dd46da5d84028478b9cc689be021732fab"; - sha256 = "1n81am3b3lphq75vs3fwwl14ajk58hqr5znjd4dbcdpr7mz94bzc"; + rev = "d64b1c0f520579d905f97208eca85329e664ab88"; + sha256 = "1yfx5zizm2m1c1064c5j5hb10xd7a8cgircs70q9cai14n25lqh7"; }; meta.homepage = "https://github.com/echasnovski/mini.colors/"; }; @@ -6689,12 +6833,12 @@ final: prev: mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "2024-09-06"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.diff"; - rev = "24d46798be8a358d38d3adc92c7ebcbb2d6f67e0"; - sha256 = "0hbr36s75aa6qhr0lhsqk6fwswd919ixd0jlrfj6paiynh00331r"; + rev = "65c59f9967fec965d8759a88c1baa43147699035"; + sha256 = "0bcyxg0yzja19cci5pr4fv1w1zdcxxn6asgqmnrnjw7vy1jgwfry"; }; meta.homepage = "https://github.com/echasnovski/mini.diff/"; }; @@ -6737,16 +6881,28 @@ final: prev: mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "2024-07-01"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.fuzzy"; - rev = "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d"; - sha256 = "10ng6rq4ig0ijvbj2bbm428dg3asf40x9b7dsvndk33ikfrlbazz"; + rev = "faa5a6c0d29c28012c90bd011162963a58715428"; + sha256 = "03v6rp0j63a7clpp6ficq6ixwr55lvyz3ygc99r1qw0gzh6y9w2y"; }; meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; }; + mini-git = buildVimPlugin { + pname = "mini-git"; + version = "2024-09-07"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini-git"; + rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; + sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; + }; + meta.homepage = "https://github.com/echasnovski/mini-git/"; + }; + mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; version = "2024-09-27"; @@ -6761,12 +6917,12 @@ final: prev: mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2024-10-21"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "98ab5fa84d67ff59d895139e331c43fa9a80a044"; - sha256 = "1jzffgvlq2d3nxmilxbcr63j30iscschah4jx5s88lgj2d2d4gbm"; + rev = "c3407f8196ede735e0efc7a6cfebc1fc8ec4dfc9"; + sha256 = "0k40q805hmgz8wq2872rd6fi27i0cs3mdh0csqhnsazqvxqbls0y"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; }; @@ -6833,12 +6989,12 @@ final: prev: mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "2024-09-09"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.misc"; - rev = "428da688126b320194a944233f9f8dfc46669307"; - sha256 = "1iiv5v3n7aynsk75bdp6b098n6ny6fg5iccdkw6psg0gyni6fq0r"; + rev = "fd74400b22f669e9b32bef144e9e8c54edf85943"; + sha256 = "194k31fhb5qszg6gn1w7hmlxrw7p7qyr3416ii0d3vw4v79kqwpv"; }; meta.homepage = "https://github.com/echasnovski/mini.misc/"; }; @@ -6869,12 +7025,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-10-26"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "919b953f044d97a2243cc2d1f0b316a199434127"; - sha256 = "0hajz2f0j07bdwckzn7hh7d9fjz4vabr53wfv24pwq030rxfhn6l"; + rev = "c8bc67a35e627908da644c5f8cd26b3f987f2627"; + sha256 = "0h1563cgd0avh9709x2aq0ynf9r2mrh69j887zkp9bdc84rza019"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -7085,12 +7241,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-10-23"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "566af300a3dfdefa64cbe7a0b205ad5bfcb4c337"; - sha256 = "1717880na8awnamdrp19bnqkibxyy0hy86l49c23ixm7s6aq99hk"; + rev = "ad9910a0e5055a00b1e14b507902b2a7a7fe449e"; + sha256 = "1mvygazsj0pvpxmcdqqp7r0khcxjqdyq124qk5r4dnlvdz8r445i"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -7109,12 +7265,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-10-12"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f"; - sha256 = "0k88b6ix8sqsnhm8z02jrphbkjzpimg1wx3jbqcmzlnm8i49nghs"; + rev = "bdc085fe991ed232cf37b4206bc47a3a98a27cad"; + sha256 = "05j42nlm3ljj07kjnzh4xv4zv1akss4anz7i5aksa7r1czssprsl"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -7167,6 +7323,18 @@ final: prev: meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; + muren-nvim = buildVimPlugin { + pname = "muren.nvim"; + version = "2023-08-26"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "muren.nvim"; + rev = "818c09097dba1322b2ca099e35f7471feccfef93"; + sha256 = "sha256-KDXytsyvUQVZoKdr6ieoUE3e0v5NT2gf3M1d15aYVFs="; + }; + meta.homepage = "https://github.com/AckslD/muren.nvim/"; + }; + nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; version = "2023-12-23"; @@ -7445,12 +7613,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-10-28"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "658710f44c13ca44b131b51938dc009511dc2063"; - sha256 = "19zw6rr0a91193j261xa3ly602xhia18hnb1jjpgpnrddyj6lxzk"; + rev = "e2528134b185e68f8c7a5584de46a3269037de6b"; + sha256 = "0h7hxg013rwmd50l8dl3qshw6577qby267cbhaylyy6p1rlpmfwk"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7517,12 +7685,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-10-28"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "b81f37ec3169153394084cd564d7dc5871f0729a"; - sha256 = "14j6qvzrfy4f4hi5isjxmckscscf898hqa8lmhkgnfhmvqjian8z"; + rev = "bae3412ea9ac31292e14e9090dde7cb118cd52c1"; + sha256 = "07pxksgwrzszidx32kwwpvd7f15bn3pj37jvy6imwvwmfvzza43x"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7674,12 +7842,12 @@ final: prev: neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2024-09-16"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "ad0fbcd0bfb45999fb78f3d14f6b6ae7ee70b88c"; - sha256 = "1431b9izn4kr5rsc06kpwizd41nkkglcy3yl7p0wls3pfr0v1rxp"; + rev = "8b4f68217e8fb072bee62544b7f834cf76cc38ca"; + sha256 = "0jzs7iq1wshk0b5096l7dn9fb6n74y7i8wc4bblfg6jdr35n33fj"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -7747,12 +7915,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-10-21"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "11db9a2c571df5d55b4b9a890159a1d15f5cb287"; - sha256 = "10hmcpvqzd7krdbrcwyhwqgxnf3wz3c4dfq9z6yj7kz4ar6s7q69"; + rev = "df6e3f34ae65f2520db798481a9d3f97581899b7"; + sha256 = "1mwk6fxvzddvxik7czj6p9zjinywlw0y69172nkfbyvqbf4hwszd"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -7784,12 +7952,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-10-27"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0c7a7f29041fcec97e99ad45b46f7f5ec27fd3f2"; - sha256 = "1y9rrc1da2cnkizlzkgl78js2wzibwjg4ax8ssib159yap0mbfck"; + rev = "899e22bd671b4aa1360821d34c4a61ec20e4a6ac"; + sha256 = "15la11nkmlkyx1daxazm2rxmhnx5ninf1km5z3lx81p9z5bmh6lj"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -8130,6 +8298,18 @@ final: prev: meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; + nightfly = buildVimPlugin { + pname = "nightfly"; + version = "2024-11-02"; + src = fetchFromGitHub { + owner = "bluz71"; + repo = "vim-nightfly-colors"; + rev = "fe3aaa329692e7a0820a65d32406ede3e3ab3c91"; + sha256 = "10rwsvzbagwrj39jzjg70wzsd21igcjvvsna4jzif5s1gc5jwbhb"; + }; + meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; + }; + nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; version = "2024-09-08"; @@ -8180,12 +8360,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-10-24"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "721ec0a31e1ccf566b5ceb9290294e4f65e4bcd7"; - sha256 = "0alq7bxqcm7jfbwhsq7isp4r2wn8m8q0bh34vz1smzmsw95nfwb9"; + rev = "bbf22be31b52106c70006807c739b3c2090f3ce0"; + sha256 = "05nmfk96jd4skc7fxg94725193r4s67japvjxvqxsvln6fvib2pz"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8204,12 +8384,12 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-10-27"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "77edaeee8b691832315b4394321031cb24205d12"; - sha256 = "04lin8yr4d26xmqkv9fh33f2gx9zpq7aj1hzf6gp6gmmrp4diwil"; + rev = "e8f3c10720d633633fb766b370582eebae8d20f5"; + sha256 = "0jfg5icmzxsj2alblpnqyg04vhhzxpkvia3lsjmmzjca1d1575a1"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; @@ -8240,12 +8420,12 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-10-02"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "df448c649ef6bc5a6a633a44f2ad0ed8d4442499"; - sha256 = "1qsnvg41wmvx9gip11lka21gq04f59ydm0x3pdri99irbqzy0azn"; + rev = "5a78b42bec5e775f2db03bf93f6d1e0f3636306c"; + sha256 = "1byavw6ibr8zjzqfs2wpavsx348n5y0pk7p3c7k81wgy4csas4wj"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -8274,6 +8454,18 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; + nord-vim = buildVimPlugin { + pname = "nord-vim"; + version = "2023-05-03"; + src = fetchFromGitHub { + owner = "nordtheme"; + repo = "vim"; + rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295"; + sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz"; + }; + meta.homepage = "https://github.com/nordtheme/vim/"; + }; + nordic-nvim = buildVimPlugin { pname = "nordic.nvim"; version = "2024-06-16"; @@ -8348,16 +8540,28 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-10-19"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "09dd13e9c6df98fe5609829a7a0fbccea2f515ae"; - sha256 = "1j3354kfgj008nl1r24n2xlvjxaz9jhs1ck0vgbqvkl9smxzf74a"; + rev = "9b04b0c22bdcb21760c04a27564a421ca4234800"; + sha256 = "0ab9j96907wmlpwg60l0ga0vkvs8rydh1ml4pl30bv6aihkpjkks"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; + nvchad-ui = buildVimPlugin { + pname = "nvchad-ui"; + version = "2024-11-04"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "ui"; + rev = "f2d4f351187439df6ba8637e06f60c308e3c12cf"; + sha256 = "1m4z6h4rk43h8yxd6qk9h6gifbk3mhhnb3qfkqpdx9c631vvrqf7"; + }; + meta.homepage = "https://github.com/nvchad/ui/"; + }; + nvcode-color-schemes-vim = buildVimPlugin { pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; @@ -8468,12 +8672,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-10-21"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "29fb4854573355792df9e156cb779f0d31308796"; - sha256 = "17jlw4am9mr4cffxlq30lklqmrx8n4fssl1fsqf07djizp31f2vl"; + rev = "f17d9b4394027ff4442b298398dfcaab97e40c4f"; + sha256 = "17jvn969a1174j2p41fiwmw1psljklgxda08n1v7ilnpbwr2ilc8"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -8504,12 +8708,12 @@ final: prev: nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2024-09-11"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "0671e0eabc6842676d3310370e8fae4e1c51d7f9"; - sha256 = "1ilxfiq76a7wzh4nvhds5b7k6q2shrnfmyb4icnfc8w0kx1vby0m"; + rev = "e614ff5c26d085a3242e26648e90e56ba5476da2"; + sha256 = "0gd90bykm2zviy4fqfn1gcvb7014byp6039sasbzvgyl89vfg251"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -8660,12 +8864,12 @@ final: prev: nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-10-04"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "52638640ae309cacdaff785fdbb854437bd1ee5c"; - sha256 = "1rq9df6dasyfdix2wr812r5cffjsqw4i6bpxr22bacw6w656rzz6"; + rev = "76d80c3d171224315b61c006502a1e30c213a9ab"; + sha256 = "0in9x0l2qq4kmcigbh77szihsn4cyz7k7gg5rmrcjpifxm2xwsk1"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -8732,24 +8936,24 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2024-10-15"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "952f0b45ac4324fc876b0c6a3f465b57a8b3f202"; - sha256 = "1v35lqfvsdxiw92llfb0y0wlm705y4xxzcdyb42s5mvysvqdw15x"; + rev = "a8a5289c4424360dc89225e15356104495736446"; + sha256 = "0l9d8bn70lingbmdlqkj1qqs06acf005c06wkswgfi4ic4h6935h"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-10-26"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "e04857f2905c07e70d366f30beb0e2765dbe9413"; - sha256 = "1nn9w0bfi6vjg316a1ag1mwxd12gd459xcpdk694qs210qbfy59f"; + rev = "310a949c05a35bc5a58c40feb71343d433efc376"; + sha256 = "16i3ppgaw3k2rhracm6zpblrf51yl95q8hvanxvvrjy6q9g06rkg"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -8828,12 +9032,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-09-26"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "efe813854432a314b472226dca813f0f2598d44a"; - sha256 = "0pz51axh4z1g5wjs2q3pprhb0r5irdk78h5mi4m65ss9f6x9pnmg"; + rev = "a9b5fc8cfda32df2bae94db91b4f111374a27807"; + sha256 = "1l0xl04fqddhgpy07pf8svny7yh8jj54m51rxg38zkrqhk3wr87g"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -8911,12 +9115,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-10-17"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "16b21a7d04d06661f92f273a0744fd81fb19e09e"; - sha256 = "1krhqq16nrz3hm9h0a5yqir75lv8nrc62ii4kxjr885b4bvr9hg2"; + rev = "36da8dd0ddc4f88e0beae234c20e75397326f143"; + sha256 = "0f51lxbwqwns60gb32g6ck1vmd6ap5f396v7im0r4v17rx2k5fxw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8947,12 +9151,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-10-28"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40"; - sha256 = "0w04mply303j4mq6myygwgr54bxv7cirnj3qrq4il798bxs71vix"; + rev = "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754"; + sha256 = "1fhxf66ypnlqbymgq4gpzi357bzdqxylmppd1ph9m0y0ygjdakpj"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9199,16 +9403,28 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2024-10-26"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "b4234eb8b83135ffa3f49d58102d9b4e2e55e1c8"; - sha256 = "00xzby5zkwc0rfl1mlgxnq3vvrlprh0y5cgvwssqrd6cz6vypjjs"; + rev = "a75086a7ba884b54a724b1942821140677739329"; + sha256 = "14a06czghhqdvmcdjhwz7l0k5clyysgh6adam5km5i4ilzcz8ndv"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; }; + nvim-scissors = buildVimPlugin { + pname = "nvim-scissors"; + version = "2024-10-30"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-scissors"; + rev = "b681497a579d4d741fc6c20dc870ef3470c19201"; + sha256 = "06d759k8j24zg2iq0l2rj537hfd993wh7br4p4m43lzdm90c99nj"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; + }; + nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; version = "2024-10-17"; @@ -9319,12 +9535,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-06-24"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f"; - sha256 = "1d5ffrsl1ryiq8nzxx7k69gpin6zs2ys4zc5pg47qcpazx7my8qc"; + rev = "dca2e998ff26681ee422b92c6ed39b3d2908d8a9"; + sha256 = "192nfbfzjfcjczkj97pxg04jx1g37pv2n86iid1djxy8rnh2yp2x"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -9367,36 +9583,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-10-28"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "8f974879a04b93fff68b4627087782e76cdf2ed0"; - sha256 = "0hvqjln23m7q90ycqyrz3qrq2k4nr5k4k465yw43f08xhn4h78v4"; + rev = "610a1c189bdb2b9b936169b2ea9d1838f971fa2b"; + sha256 = "119hr70829j7gnswamwsayillmk9m920dmfnr9p2kwrs0j7yq34k"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-10-28"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "de70388626b398e9cfbec0ec02a0fab8d0f26648"; - sha256 = "1272q3v9hrc0zlgr6ha1xkyg9d9ilrpiapcb561ww123mhn7rxaq"; + rev = "7dc8aabe86db8c2f23520e8334f7584f83e84342"; + sha256 = "1xizf90767kh3yw1nrjz3xd4lxq71x92r99hr9iq3bpb50a698s5"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-10-27"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5bd21aa75aa9e24c0680b23fc88380cd80a53641"; - sha256 = "0rjvmfcww4ixn9qic53y1nqi1i61fhrkwxd39d37hp721ff96h7l"; + rev = "a2a334900d3643de585ac5c6140b03403454124f"; + sha256 = "1dvfrnhx2mg5fz7vin574pqaa60yp265l897kf9padyz8hp7barc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -9511,12 +9727,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-10-23"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "c96bb3bb853ff6253fe74f057df03e61fafd2403"; - sha256 = "090f9ivv57sz18pkgnciybgas8kjnvsfwpw8ipml7rs8hvng2gz7"; + rev = "522d719d421fc42b95577d9624048d8348d326ea"; + sha256 = "09y5irqcwwa39xs1jz68iw9p19ysym28mln8jfjn0hihxdiw1q7v"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -9667,24 +9883,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-10-26"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "84a4f195bca82b99d0bf1c8acf64fda00eb0a118"; - sha256 = "09fal1s0xay5fjdm4y087b8hxb8s2jc6ivr27jx0zjdqb2vrqqmm"; + rev = "1f3115bb88f15a12d339568fe0f1d75bc45db989"; + sha256 = "09cpl37kr1fxvgn22402bcfz97fkwmyiwghcsd3x5m5di3b80rgm"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-10-25"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "cca1631d5ea450c09ba72f3951a9e28105a3632c"; - sha256 = "1d8xqx7mlbf92z0iiifnv2xbzbd9r1y0ldrwk396qgv3v3qgpci8"; + rev = "52cc8a1fb35ea6ce1df536143add7ce7215c63c0"; + sha256 = "01anxa0ha9h2rc0dkhxxni1hl1g0kb6xav79bng7qis11jb6sjwv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -9738,6 +9954,18 @@ final: prev: meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; + one-small-step-for-vimkind = buildVimPlugin { + pname = "one-small-step-for-vimkind"; + version = "2024-10-15"; + src = fetchFromGitHub { + owner = "jbyuki"; + repo = "one-small-step-for-vimkind"; + rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f"; + sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM="; + }; + meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; + }; + onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; version = "2024-07-05"; @@ -9776,12 +10004,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-10-22"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "b50de0e605081486bd5b9ab2d42832bacfc167e7"; - sha256 = "1kk20ia8nzzrlz7anqh62c85f4p0kpdpwi447fvf51m8n884f3b2"; + rev = "6e0016ef3e3df1a4bb30821524b814b53c1e8bf7"; + sha256 = "0qv78nvzw3fjh14ij6cb7krzx3w40gsb8gjv9cgvvs4mb6ix9mph"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -9860,12 +10088,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-10-28"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "8b1dfcdb035008adf607aa9aa94efa06beec88f8"; - sha256 = "1d6lcrxi13aj54yf77xzhi6rv4ic5dqzm5xczd9mxdx71h0krqsn"; + rev = "fafb8f14d85a68d8f0fca812444cc0fd594f0168"; + sha256 = "149fd4hyng6g3phg3d3fl3fbwkg5yv9kkzdw80jxm329x63fmps6"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -9933,12 +10161,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2024-08-12"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "268f4669fc29546726009ad665d26901dbf62c3b"; - sha256 = "16lj1x11lp1fiq9ncvcrn3r6mr3s5ailwxs4hgvyvydr4smv1giy"; + rev = "3de4f3569ce60e248707df042b72769b3ec343b8"; + sha256 = "03cf6k5wc5bypqacpv1qvbmps2wj5y21h0li987li4m1s8gvm4cq"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -10017,12 +10245,12 @@ final: prev: pear-tree = buildVimPlugin { pname = "pear-tree"; - version = "2019-12-08"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "tmsvg"; repo = "pear-tree"; - rev = "3bb209d9637d6bd7506040b2fcd158c9a7917db3"; - sha256 = "0n70rzw34lsnnprqna90ssqrka33qx3z0n2kj19ps8yp3j6lsxvk"; + rev = "52d65cf625eb6e6487a3f813ec9636868efcae9c"; + sha256 = "03vc8xf21s3lh9xq238hl3dwr54sc22x72k7s57582s1xj0k2l0c"; }; meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; @@ -10087,6 +10315,18 @@ final: prev: meta.homepage = "https://github.com/lifepillar/pgsql.vim/"; }; + phha-zenburn = buildVimPlugin { + pname = "phha-zenburn"; + version = "2024-01-31"; + src = fetchFromGitHub { + owner = "phha"; + repo = "zenburn.nvim"; + rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29"; + sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr"; + }; + meta.homepage = "https://github.com/phha/zenburn.nvim/"; + }; + pig-vim = buildVimPlugin { pname = "pig.vim"; version = "2017-06-08"; @@ -10198,12 +10438,12 @@ final: prev: precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2024-10-12"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "35c402c19a10e524d5378c9c0a5151ff5d847b06"; - sha256 = "1sq7ahnj9kj0cijr8jb4shr226rv65a3gdcnrv10glf9kisbpk6i"; + rev = "0189e8d6f96275a079b2805d68d49414871885cd"; + sha256 = "1h8i8i66phrqjha3jplrjg6zly29d5lfg6hvq5sv9h4xmw0kaxm2"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; }; @@ -10306,16 +10546,28 @@ final: prev: pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2024-10-27"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "33384573b3c38b30c69c9e88ad0a66d4e1473023"; - sha256 = "0i63m7y4rhbiy810snzmijq6xjb5drh29i13r692rvzks1mliaci"; + rev = "a1838422cde632edaceeaa1afee689044be24678"; + sha256 = "0z2bwcyj719y3i7p1pa91k6x3bj99dr4f70z1kvfg2sjgr31i652"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; }; + pure-lua = buildVimPlugin { + pname = "pure-lua"; + version = "2021-05-16"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "moonlight.nvim"; + rev = "e24e4218ec680b6396532808abf57ca0ada82e66"; + sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3"; + }; + meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; + }; + purescript-vim = buildVimPlugin { pname = "purescript-vim"; version = "2023-02-06"; @@ -10451,11 +10703,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-09-26"; + version = "2024-11-03"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "d227e6c9879bb50af35cd733461198666981d482"; - sha256 = "1mp902laz3cq4ysqpxlhyknwja39gs8yjy5ccj82a58v4r86rhmf"; + rev = "e0f9b3efe150724af2d2ed59997d5ece373840e3"; + sha256 = "0sccvcsdcr8wbw62ld9bmwf1iq2yqnzx1l19w5yxb46g6adxc8h5"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -10558,12 +10810,12 @@ final: prev: registers-nvim = buildVimPlugin { pname = "registers.nvim"; - version = "2024-07-12"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "17df665d3fd8995b69a1a434cb285a25ab22cc49"; - sha256 = "0szlfn9prqx5v36wn7bqkcasdjxfgcr0vg7k6vfm1c9h4kxbrvd0"; + rev = "c217f8f369e0886776cda6c94eab839b30a8940d"; + sha256 = "1pdfm98grlka537i1c94vi8bpbp66slkyz3by040wlfq4pgr3frk"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -10594,12 +10846,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2024-10-27"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "fc05fb7c56795f191b6800799a2ec6ea325ba715"; - sha256 = "1604id1b0m4cj36fy8r1fnkbaxs4h388970b790mg525zz8ch6j0"; + rev = "4ec7a51856e9324b2b758afe73b64dd05396a9a8"; + sha256 = "07gr2fnjr3ddrzmw9jg2gndgwx0n88f1z075k086mfhcwk3lwqi3"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; @@ -10641,6 +10893,18 @@ final: prev: meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; + restore-view-vim = buildVimPlugin { + pname = "restore-view-vim"; + version = "2014-11-21"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "restore_view.vim"; + rev = "8b933436e3ab8dec120841027183f0d72a4e2096"; + sha256 = "1kmhsbgscbij3rd2f8ahv9qmhw8jppgvfnqb45f81awmmqd9l4bn"; + }; + meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; + }; + riv-vim = buildVimPlugin { pname = "riv.vim"; version = "2024-03-19"; @@ -10689,6 +10953,18 @@ final: prev: meta.homepage = "https://github.com/ron-rs/ron.vim/"; }; + rose-pine = buildVimPlugin { + pname = "rose-pine"; + version = "2024-10-23"; + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "neovim"; + rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e"; + sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx"; + }; + meta.homepage = "https://github.com/rose-pine/neovim/"; + }; + roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; version = "2024-10-13"; @@ -10773,6 +11049,18 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; + samodostal-image-nvim = buildVimPlugin { + pname = "samodostal-image-nvim"; + version = "2024-01-07"; + src = fetchFromGitHub { + owner = "samodostal"; + repo = "image.nvim"; + rev = "acbd1d7d64ac0643021a6146eb0557e7c2e793d0"; + sha256 = "0s5fxlc7igmvgpmpry1vkrl4xav37cx94ay1sg246y7y2j4j5l56"; + }; + meta.homepage = "https://github.com/samodostal/image.nvim/"; + }; + satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; version = "2024-09-30"; @@ -11004,12 +11292,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-10-25"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "477a004122ea180b14d3e29544857d572c861668"; - sha256 = "0pknhibgvh9pfm0ziipfch8ibp64p77zl5yny4ncyyiy3jhv0j8q"; + rev = "11600d75e1b57e9fe1f3ca880a917485fc399e8c"; + sha256 = "1xhhzcywlig49av0r01b4qlk21yjd7a2qzxc9yvqymlqa7sp0phx"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11050,6 +11338,18 @@ final: prev: meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; }; + snacks-nvim = buildVimPlugin { + pname = "snacks.nvim"; + version = "2024-11-07"; + src = fetchFromGitHub { + owner = "folke"; + repo = "snacks.nvim"; + rev = "334895c5bb2ed04f65800abaeb91ccb0487b0f1f"; + sha256 = "uKAdjRLUtKi6FlE0IHGlnW0Bv2hQhoTRiarvwyU0YaE="; + }; + meta.homepage = "https://github.com/folke/snacks.nvim/"; + }; + snap = buildVimPlugin { pname = "snap"; version = "2024-06-05"; @@ -11184,12 +11484,12 @@ final: prev: sphinx-nvim = buildVimPlugin { pname = "sphinx.nvim"; - version = "2023-08-25"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "stsewd"; repo = "sphinx.nvim"; - rev = "d4eceb35975d379c6b380111627c5d4531f77d08"; - sha256 = "0j4v1ckc7p5bsh81yhcc35yv1lqkn2kicy84pbk556ksx60pgvgs"; + rev = "0dae62f4c4a747fda12b85cfed409af4e4cdef83"; + sha256 = "1zsn7xi3lcm558jgnifigr4l515a3c2ywk50v93svpw7qaggyhx9"; }; meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; @@ -11341,12 +11641,12 @@ final: prev: startup-nvim = buildVimPlugin { pname = "startup.nvim"; - version = "2024-09-06"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "max397574"; repo = "startup.nvim"; - rev = "81222a9956148eebf10363726d8bccf8793aa41f"; - sha256 = "1z5gv2qr3q82hmk8vjdxk37q4nm928j3vbq91vw4nary90va8q46"; + rev = "9ca3b9a55f2f2196ef90b39a52029b46fdde5226"; + sha256 = "0gm1nxcmrfh24ql2d7sbsny2djifqf8k9wl6axpjirjqbvk6ywh1"; }; meta.homepage = "https://github.com/max397574/startup.nvim/"; }; @@ -11655,12 +11955,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-08-05"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8"; - sha256 = "0yyscdzdh1mrgcr3w0727byqvvavd9r5a7728j717wvg139r0h9r"; + rev = "1c5a358f0bb9a24abe8ee772552f5c64f622f699"; + sha256 = "1nz0b2f30avkv39gdbr74y2ny1as3dk257nix42iig1zcdivfliz"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -11679,12 +11979,12 @@ final: prev: tailwind-tools-nvim = buildVimPlugin { pname = "tailwind-tools.nvim"; - version = "2024-10-02"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tailwind-tools.nvim"; - rev = "89e560705ecd49607c63c277935c5264bb770d57"; - sha256 = "1911agrilsnz8w94y0np3sh2l79y00k5k0w5i6gakbbzbxdbkiqp"; + rev = "cfd8275caa16749b130c0eae2f737c5f66620efc"; + sha256 = "14wd0wxq7ns358xyvkgzyld87majzr8rk2bkxl4507rw5m8vpy6b"; }; meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; }; @@ -11788,12 +12088,12 @@ final: prev: telescope-dap-nvim = buildVimPlugin { pname = "telescope-dap.nvim"; - version = "2024-01-08"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-dap.nvim"; - rev = "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe"; - sha256 = "1zgajsbvmbmysxfi4aspmf9pbzkzsfz9p2n1q5vz0im9vc3ais1z"; + rev = "783366bd6c1e7fa0a5c59c07db37f49c805a28df"; + sha256 = "1pzvvas3qwfrxdbjsf3q2pjzgg5ar0hyrbi0s1aryjszhyrkq6ri"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; @@ -11812,12 +12112,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-09-08"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "f67baca08423a6fd00167801a54db38e0b878063"; - sha256 = "197ijmyjqb27hfrxsa53x265qgfpka8997m1ndlql1wxgyz8as0g"; + rev = "8622ef42f73cf0eb76bbe049220a812ffe32354d"; + sha256 = "0vsd07fbk8f01h8sgk8qs8ncrn1sw09hcdfqljjvssyhzh1vrfy6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -11909,12 +12209,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-10-27"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "8b796ac94e87b1623844cb0d32a739a9056cdd78"; - sha256 = "00fnqh4v2zraglayr8aa4vxcx1pswxqwsq9ycy59zcw7wv8rwycm"; + rev = "fcc8cf9a87493fb7d7c2181446a3c49c6494f2f4"; + sha256 = "0lagkgnxg661ya8r1wzjfslln2ixh7r99akksjmkmv7629md4bch"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11931,6 +12231,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; }; + telescope-nvim = buildNeovimPlugin { + pname = "telescope.nvim"; + version = "2024-10-29"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope.nvim"; + rev = "85922dde3767e01d42a08e750a773effbffaea3e"; + sha256 = "0yv3v4nlh42s96r0xa4fvlil4rh4p0q6l50jk8yg0hmc8vxxzbs1"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; + }; + telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; version = "2024-09-09"; @@ -12064,18 +12376,6 @@ final: prev: meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; - telescope-nvim = buildNeovimPlugin { - pname = "telescope.nvim"; - version = "2024-10-26"; - src = fetchFromGitHub { - owner = "nvim-telescope"; - repo = "telescope.nvim"; - rev = "37dc9233a473dd6c3f54456ef9994d8f77c80211"; - sha256 = "0jbwmmf810jbhixd5sfdyfjcv9xrb1l1hliap09p1bhnvm55h9yf"; - }; - meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; - }; - telescope_hoogle = buildVimPlugin { pname = "telescope_hoogle"; version = "2023-09-20"; @@ -12270,16 +12570,28 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-10-19"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "ccb67504f93b20f36775d3aad620f9dc9ed98bd9"; - sha256 = "0rhhzf3rza5q7qhk8h320gwhbq7fwajv5gl16yybx2im58vls2l2"; + rev = "d10c9fda7b8b7b81b2c6eb4c3909adfe9812c6bf"; + sha256 = "0mnlsx00ypfly8jc4aw4df958jd035c6j33innh29xh4ywp3f7h7"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; + tinykeymap = buildVimPlugin { + pname = "tinykeymap"; + version = "2024-02-17"; + src = fetchFromGitHub { + owner = "tomtom"; + repo = "tinykeymap_vim"; + rev = "7217ce656069d82cd71872ede09152b232ecaf1b"; + sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w"; + }; + meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; + }; + tlib_vim = buildVimPlugin { pname = "tlib_vim"; version = "2022-07-22"; @@ -12355,24 +12667,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-08-08"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "137d06fb103952a0fb567882bb8527e2f92d327d"; - sha256 = "1bmmz7ypzs4yfsky0z8d9pda8r3imlxf2f0k8n3fw327f7kc8lan"; + rev = "5969229c0352ff1ed7f6e24aba9c6554e1842939"; + sha256 = "08cvs5bc9xksc2pjl7yg12l42afv82ic7hz6f8nfnzpwa6vsmg7p"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-10-24"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "2e1daa1d164ad8cc3e99b44ca68e990888a66038"; - sha256 = "118cj0bbv069m1ry9s97c929sbk46d44x9w4ww2l9xq1x5hv9jh1"; + rev = "52d67cc5d18c30f618897134620c64a11208fcae"; + sha256 = "100vw3kzgrwpi2dvf673hsbp7ab7h6s4dh8z0a9f1hwm82brcjg7"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -12451,12 +12763,12 @@ final: prev: triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-10-24"; + version = "2024-10-31"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "6f4b8ec5eaeff680aff53b1f3d97095fc4120587"; - sha256 = "1793h1s5lzmk11mi2n20wjvm0vjhrlkvzpidzwgf7w82bj9j3q7k"; + rev = "86f42b4b33071a95c714bd8c823709a2d5ae226d"; + sha256 = "08pndg4h7in4xm21dym8c8339m34dianir0xgz19kfcihr42j5da"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -12558,6 +12870,18 @@ final: prev: meta.homepage = "https://github.com/folke/twilight.nvim/"; }; + typescript-nvim = buildVimPlugin { + pname = "typescript.nvim"; + version = "2023-08-12"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "typescript.nvim"; + rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467"; + sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; + }; + typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; version = "2024-07-18"; @@ -12582,26 +12906,38 @@ final: prev: meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; - typescript-nvim = buildVimPlugin { - pname = "typescript.nvim"; - version = "2023-08-12"; + typst-conceal-vim = buildVimPlugin { + pname = "typst-conceal.vim"; + version = "2023-10-13"; src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "typescript.nvim"; - rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467"; - sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm"; + owner = "MrPicklePinosaur"; + repo = "typst-conceal.vim"; + rev = "b8862f2d5a015b838e4a0d361f30423c45e23425"; + sha256 = "UHEVhlV/1cq6jaMhNNookeGPtHvSwy1AKLvb8FR6Rro="; }; - meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; + meta.homepage = "https://github.com/MrPicklePinosaur/typst-conceal.vim/"; + }; + + typst-preview-nvim = buildVimPlugin { + pname = "typst-preview.nvim"; + version = "2024-10-24"; + src = fetchFromGitHub { + owner = "chomosuke"; + repo = "typst-preview.nvim"; + rev = "06778d1b3d4d29c34f1faf80947b586f403689ba"; + sha256 = "oBJ+G4jTQw6+MF/SMwaTkGlLQuYLbaAFqJkexf45I1g="; + }; + meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; }; typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-07-01"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "4d18ced62599ffe5b3c0e5e49566d5456121bc02"; - sha256 = "011kbs2fqg2bp8nb17ppgv92x89dlxw5sjn5y303qg13xb7f9s32"; + rev = "50e89f481102d5c9ef6990b9f8086c0c7d64bff6"; + sha256 = "150fzqjk8c95vk0a0ryxi8nr7s1r5fdqskhxys6lrl1hasbp1z3m"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -12668,12 +13004,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-10-23"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "5f3f532ce25266a0d14b89e9cae9bb5c9ea03a6d"; - sha256 = "1mwbas56d1q3rgin2wl7w61r6l73dla8106pa9z6268714ldc4ds"; + rev = "edbbcdc19074103165096352993379daeea1bae2"; + sha256 = "1d94h2q0h2qqfkbqc9frmrykff0pf2h8yxhbb39m284000h292aj"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12776,12 +13112,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-10-27"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "211776ed10a54844720c50f9bde4f65ff70489ea"; - sha256 = "16q3g3rdskz5pc8rnq857h0y22w6v5wn01fgmpnhxv0g57dn35g9"; + rev = "ee30b659004903bef13e7ec70b968542c7ddc6c1"; + sha256 = "17jqswd4gg07ifhmq72mpfv35c10g3zbw2vgp32j0z0fq90c0bbq"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -13098,6 +13434,18 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; + vim-advanced-sorters = buildVimPlugin { + pname = "vim-advanced-sorters"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-AdvancedSorters"; + rev = "f6d29af8a2291895973bf98c2630cc68a8115068"; + sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df"; + }; + meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; + }; + vim-after-object = buildVimPlugin { pname = "vim-after-object"; version = "2018-09-17"; @@ -13136,12 +13484,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-10-24"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "3ddcab16c26760d7b94ef0b1f8b62f9bc1ea8cba"; - sha256 = "0mx29fp30cn6b7w6axmq7igm0z0q6pnvvimic39c3lqc74m599c8"; + rev = "6c704f4b780e2b687dd21b24a19f598dde06dc22"; + sha256 = "1pl473x7mjak5yidqg7kh53lclgibqlrr8j4mczzadn8jxbybkqz"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -14010,6 +14358,18 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; + vim-docbk-snippets = buildVimPlugin { + pname = "vim-docbk-snippets"; + version = "2023-09-29"; + src = fetchFromGitHub { + owner = "jhradilek"; + repo = "vim-snippets"; + rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; + sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; + }; + meta.homepage = "https://github.com/jhradilek/vim-snippets/"; + }; + vim-dotenv = buildVimPlugin { pname = "vim-dotenv"; version = "2022-05-15"; @@ -14300,12 +14660,12 @@ final: prev: vim-fireplace = buildVimPlugin { pname = "vim-fireplace"; - version = "2024-07-07"; + version = "2024-11-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "fa1201dd55802e442e17e0fbd164cf546246dad1"; - sha256 = "1a9v6jmxbgxbmd4q4yf11mgdcvv1z83f0nf5zydqi310waw884fy"; + rev = "5e66509599de92550762cf2681338fc4cd1e71cf"; + sha256 = "1s2kvimhm00jfd24f6kmf0rbpib6asxp1vj4nvq9lp9n4v9z3nzy"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -14877,12 +15237,12 @@ final: prev: vim-humanoid-colorscheme = buildVimPlugin { pname = "vim-humanoid-colorscheme"; - version = "2021-11-21"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "humanoid-colors"; repo = "vim-humanoid-colorscheme"; - rev = "ce4fa890a2b8a32f4747eb951e93050100548fba"; - sha256 = "1650ymvma30zyq2hl9x5z7ql11wakjgq6jarc6vxbrpgvbz0f9c8"; + rev = "f1b442b2e154937e8127bf09376b1665265b9916"; + sha256 = "0zy9wf8bkd5i2azipp4ay5ng0dhz9zgvi35ycv9k2r0nmzr0kpc7"; }; meta.homepage = "https://github.com/humanoid-colors/vim-humanoid-colorscheme/"; }; @@ -15214,12 +15574,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-10-17"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "c11e414956e748255ee56cba9a8a10ae68dff728"; - sha256 = "05cggnd8gcbyhqvyvnq4y16imiaj2f3njr6nwmcq7qi1gbgz9x1x"; + rev = "72e33204b0626fcc1b048f6e811077eb7be1a2aa"; + sha256 = "1jbqqbs88y0w5cqjvl0myklb6hhaafgs2px21zr5nxvm71592kwg"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -15695,12 +16055,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2024-10-16"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "c3efbdefa3d43d739e61294ac39af4a68806a889"; - sha256 = "1hyvp5sf807an2s3ld08xs4p3xisd9s0rnpc0w6w1kald2ffzlq0"; + rev = "7686c9e87a910c31074ff13f4ba3a71ed85ec202"; + sha256 = "1ksh9c3dn2025n8fxs4m36ngxgqnza1fwdicr15rzw94wb5li851"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -15923,12 +16283,12 @@ final: prev: vim-obsession = buildVimPlugin { pname = "vim-obsession"; - version = "2024-10-25"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "f50baec758c4bf2702fa8f051652789a90c5bfa9"; - sha256 = "14iiqibrbsgpzv6vraf2b1d8qb6b7qn19i11smvzzzcq33hzbik2"; + rev = "ed9dfc7c2cc917ace8b24f4f9f80a91e05614b63"; + sha256 = "0d80xq2hygf84a23ygzs3klymj5vcpqljacyjw25xrgg6vcn7fgv"; }; meta.homepage = "https://github.com/tpope/vim-obsession/"; }; @@ -16055,12 +16415,12 @@ final: prev: vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; - version = "2023-12-07"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "c37c9d98e8a0aed749624fa14a7ece7913cf34de"; - sha256 = "03i2dvc8dlyxq521glyln0k4g5l6jxx23fhi88l50lblsnqn54y5"; + rev = "4b068e5b553f907c5f6d00b0ab9e1e3b98cf71bf"; + sha256 = "0y84vkz5h9acbx6bzg2c0a19visaqygaq4q5c8x19fmrzs0k30d0"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -16139,12 +16499,12 @@ final: prev: vim-paper = buildVimPlugin { pname = "vim-paper"; - version = "2024-05-19"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "vim-paper"; - rev = "01b79707c2144f9c845057da2e7d6ec024e15c76"; - sha256 = "1wqq97h25mqy4dzc8795rq6ic52lz2fhndxwhyqm765ldyxxhlwl"; + rev = "1965ff861fecc2d524aef1454abf95cacec9cfa3"; + sha256 = "1v0i0zcmwrqvzs8281xv8hgxbiv1wa69igk5nknvip9ldc8zn9xz"; }; meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; }; @@ -17232,12 +17592,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-09-16"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "c090bfd93919888bb0b86e1ab707bc6a3095097f"; - sha256 = "1qkgzazxj6f94ivnrd3cjlvfa2pn4hsbkf6v64fanck4m68x1jpb"; + rev = "b0661402277de193a374ae241f0742898cbcb319"; + sha256 = "0w47jq7k8zg0v44m91gk8wy04i79hszsnif8927dcdaz3ng2id25"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -17376,12 +17736,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2024-09-14"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "a9b52e7d36114d40350099f254b5f299a35df978"; - sha256 = "0sfsyf2jk57511pba6g31zfp0qi6v02np78sq6pzgny8qv40rj11"; + rev = "424b5caa154bff34dc258ee53cec5a8e36cf7ea8"; + sha256 = "02rgmzpgrmnq15916cvqilb1mh37g1hpjiz5ys84gnqgdl26w0k7"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -17796,12 +18156,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-09-16"; + version = "2024-10-30"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "207290f8c60ca4f31e52f53e221e1e50aee7e5d7"; - sha256 = "15y6jjmmvrkqdrc1fa0p5nzi89hw8252gf3cywd3pa0d1a8lspi0"; + rev = "6ed715da7e69148a1112943041465f9b5f7c2c63"; + sha256 = "0xb2m34x2a96rkjh1jjxn7hjgkkckw6vfcgdl5bxmyz2v6rhfs6c"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -17868,12 +18228,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-10-26"; + version = "2024-11-05"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "919562da13222cb9d3b08a176528aa2e3a6b767f"; - sha256 = "1dq8rvrq4rj24c0jilc3i46mxfl7psb6q6nax3hw79bs25gcn983"; + rev = "c6d5b01189d7fcc5f1ee022a2f20bdd8238c5428"; + sha256 = "1k2crqpxcg7h4pgzaj9a6p8f81rqqxmg4a6pdl36nc8lh9h5bw0a"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17989,12 +18349,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-10-26"; + version = "2024-11-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "0785fd98af20f308ce6856f75a70a4ece9abab29"; - sha256 = "1g040n5lh1b6cxvwk6admmz2sgr6m0qbc31r63dhcsgaqnvzg2bz"; + rev = "ded1d899afa51f42b71bed607680e21338d18c74"; + sha256 = "0dfqx9xyrq6j0rvacq91jc8f94n5g7qv9y44c9nqclmf2hfmzv2p"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -18169,12 +18529,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-10-26"; + version = "2024-11-03"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "854b1472e2867035bd15d55a0b4d523f5662e242"; - sha256 = "1sqkzjnq0hg4y6xrn0w6ks2klrwq5yivk0pl5jn4bs8h968ij5h0"; + rev = "982a54c651c5f62d944d120f533c569dbdaad671"; + sha256 = "03bvm7h8mqc4sz0w2zf4v5wdi4kxwm2lpxly265yvgwpsm7xkxq8"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -18362,12 +18722,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-10-24"; + version = "2024-11-04"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "93fd9dc5f23c7699ba50507bfe5d4136cfa487d2"; - sha256 = "1pbiamgvfnd2lcc0nlq2wz42xfx1v2qk45z3lkn03mn2rvmr6nlf"; + rev = "bdc1e5a46a00a2388460145991d1d7e12a92afdc"; + sha256 = "1v39zw4g8zys54d5zynaws7jpw5615x4yvliilp3h7vmpah5gamv"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18422,12 +18782,12 @@ final: prev: zellij-nav-nvim = buildVimPlugin { pname = "zellij-nav.nvim"; - version = "2024-09-03"; + version = "2024-10-29"; src = fetchFromGitHub { owner = "swaits"; repo = "zellij-nav.nvim"; - rev = "511e9b7bb7165ef817dbfb40169cea9b4d3c3d44"; - sha256 = "0cvdxzbz45ac46s1i811l67g1hg5wgsb8hy7rrzbw52mq8qbkliw"; + rev = "1d6657d8b8e1f6bbb275a48bc96092b248b8f522"; + sha256 = "1as9jhg57pw2gm8nv209cv1x0rqzjirb2a1v5zk35bzrhpr5rq99"; }; meta.homepage = "https://github.com/swaits/zellij-nav.nvim/"; }; @@ -18540,231 +18900,5 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - catppuccin-nvim = buildVimPlugin { - pname = "catppuccin-nvim"; - version = "2024-10-28"; - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "nvim"; - rev = "65bf0b16f57a3db70d6a93ac68882dd9a31d0565"; - sha256 = "16ngmh7psyc5499bdz4l03gqkjxj67400kj0fd8jxac57dwfq9h7"; - }; - meta.homepage = "https://github.com/catppuccin/nvim/"; - }; - catppuccin-vim = buildVimPlugin { - pname = "catppuccin-vim"; - version = "2024-08-14"; - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "vim"; - rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; - sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; - }; - meta.homepage = "https://github.com/catppuccin/vim/"; - }; - - dracula-vim = buildVimPlugin { - pname = "dracula-vim"; - version = "2024-07-26"; - src = fetchFromGitHub { - owner = "dracula"; - repo = "vim"; - rev = "65f4225e0526516a67d56c8ac09925a209138e53"; - sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8"; - }; - meta.homepage = "https://github.com/dracula/vim/"; - }; - - embark-vim = buildVimPlugin { - pname = "embark-vim"; - version = "2024-09-21"; - src = fetchFromGitHub { - owner = "embark-theme"; - repo = "vim"; - rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; - sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; - }; - meta.homepage = "https://github.com/embark-theme/vim/"; - }; - - gbprod-nord = buildVimPlugin { - pname = "gbprod-nord"; - version = "2024-10-10"; - src = fetchFromGitHub { - owner = "gbprod"; - repo = "nord.nvim"; - rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c"; - sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra"; - }; - meta.homepage = "https://github.com/gbprod/nord.nvim/"; - }; - - gruvbox-community = buildVimPlugin { - pname = "gruvbox-community"; - version = "2024-01-21"; - src = fetchFromGitHub { - owner = "gruvbox-community"; - repo = "gruvbox"; - rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b"; - sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351"; - }; - meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; - }; - - harpoon2 = buildVimPlugin { - pname = "harpoon2"; - version = "2024-04-09"; - src = fetchFromGitHub { - owner = "ThePrimeagen"; - repo = "harpoon"; - rev = "0378a6c428a0bed6a2781d459d7943843f374bce"; - sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m"; - }; - meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; - }; - - mattn-calendar-vim = buildVimPlugin { - pname = "mattn-calendar-vim"; - version = "2022-02-10"; - src = fetchFromGitHub { - owner = "mattn"; - repo = "calendar-vim"; - rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d"; - sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q"; - }; - meta.homepage = "https://github.com/mattn/calendar-vim/"; - }; - - nightfly = buildVimPlugin { - pname = "nightfly"; - version = "2024-10-27"; - src = fetchFromGitHub { - owner = "bluz71"; - repo = "vim-nightfly-colors"; - rev = "48d074b8a2557b4f88a1f5dd2b21fc479ef6fbf2"; - sha256 = "0rkrx0msg2jsgk37lzr43nsg6wn9crq1jm4adxxh22ypxsigi33z"; - }; - meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; - }; - - nord-vim = buildVimPlugin { - pname = "nord-vim"; - version = "2023-05-03"; - src = fetchFromGitHub { - owner = "nordtheme"; - repo = "vim"; - rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295"; - sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz"; - }; - meta.homepage = "https://github.com/nordtheme/vim/"; - }; - - nvchad-ui = buildVimPlugin { - pname = "nvchad-ui"; - version = "2024-10-28"; - src = fetchFromGitHub { - owner = "nvchad"; - repo = "ui"; - rev = "ba40afccc8a27236eb735cd55e2c33ced912b8b0"; - sha256 = "1ng0gvpb4yzljmxfvgv51mgizfnqx469r0rbqhypvzh56p2iwmhc"; - }; - meta.homepage = "https://github.com/nvchad/ui/"; - }; - - phha-zenburn = buildVimPlugin { - pname = "phha-zenburn"; - version = "2024-01-31"; - src = fetchFromGitHub { - owner = "phha"; - repo = "zenburn.nvim"; - rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29"; - sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr"; - }; - meta.homepage = "https://github.com/phha/zenburn.nvim/"; - }; - - pure-lua = buildVimPlugin { - pname = "pure-lua"; - version = "2021-05-16"; - src = fetchFromGitHub { - owner = "shaunsingh"; - repo = "moonlight.nvim"; - rev = "e24e4218ec680b6396532808abf57ca0ada82e66"; - sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3"; - }; - meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; - }; - - restore-view-vim = buildVimPlugin { - pname = "restore-view-vim"; - version = "2014-11-21"; - src = fetchFromGitHub { - owner = "vim-scripts"; - repo = "restore_view.vim"; - rev = "8b933436e3ab8dec120841027183f0d72a4e2096"; - sha256 = "1kmhsbgscbij3rd2f8ahv9qmhw8jppgvfnqb45f81awmmqd9l4bn"; - }; - meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; - }; - - rose-pine = buildVimPlugin { - pname = "rose-pine"; - version = "2024-10-23"; - src = fetchFromGitHub { - owner = "rose-pine"; - repo = "neovim"; - rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e"; - sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx"; - }; - meta.homepage = "https://github.com/rose-pine/neovim/"; - }; - - samodostal-image-nvim = buildVimPlugin { - pname = "samodostal-image-nvim"; - version = "2024-01-07"; - src = fetchFromGitHub { - owner = "samodostal"; - repo = "image.nvim"; - rev = "acbd1d7d64ac0643021a6146eb0557e7c2e793d0"; - sha256 = "0s5fxlc7igmvgpmpry1vkrl4xav37cx94ay1sg246y7y2j4j5l56"; - }; - meta.homepage = "https://github.com/samodostal/image.nvim/"; - }; - - tinykeymap = buildVimPlugin { - pname = "tinykeymap"; - version = "2024-02-17"; - src = fetchFromGitHub { - owner = "tomtom"; - repo = "tinykeymap_vim"; - rev = "7217ce656069d82cd71872ede09152b232ecaf1b"; - sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w"; - }; - meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; - }; - - vim-advanced-sorters = buildVimPlugin { - pname = "vim-advanced-sorters"; - version = "2024-08-16"; - src = fetchFromGitHub { - owner = "inkarkat"; - repo = "vim-AdvancedSorters"; - rev = "f6d29af8a2291895973bf98c2630cc68a8115068"; - sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df"; - }; - meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; - }; - - vim-docbk-snippets = buildVimPlugin { - pname = "vim-docbk-snippets"; - version = "2023-09-29"; - src = fetchFromGitHub { - owner = "jhradilek"; - repo = "vim-snippets"; - rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; - sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; - }; - meta.homepage = "https://github.com/jhradilek/vim-snippets/"; - }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 1785c57284d0..d0a6cb2b0d0c 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -94,12 +94,12 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=553fdc4"; + version = "0.0.0+rev=34bbdc7"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "553fdc4afb3b603332c3f4baf50c711506f4e797"; - hash = "sha256-LJ+jRomCepFH8QbHTgecaDZ3dlO1kgjs5i71kIWi1bg="; + rev = "34bbdc7cce8e803096f47b625979e34c1be38127"; + hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=01c0da2"; + version = "0.0.0+rev=9bc460a"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "01c0da29e0fc7130420a09d939ecc524e09b6ba6"; - hash = "sha256-obIGlAXe+Y1vffXTGgFRpiqof+F9bSRLq9NJGZcvhVE="; + rev = "9bc460a05b5f096d69568b5fb36105032ff4ff97"; + hash = "sha256-MSLM7Or1SZeqj0WzJ26o5cmYa5vWcSbMhDzMkqWRJgE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -193,12 +193,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=79284a1"; + version = "0.0.0+rev=6c7f459"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "79284a14a0d7e4495b095b38acdd8a27acbe870e"; - hash = "sha256-dmvh+k+G0KrR8/bQxJOA/a+uZSrMQfZrNx3ZJQt2MZ4="; + rev = "6c7f459ddc0bcf78b615d3a3f4e8fed87b8b3b1b"; + hash = "sha256-lEaHOiA4BohmxOrcBy5TlV+x5aqD7e5n5beuVpqAM0M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -379,6 +379,17 @@ }; meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; }; + cylc = buildGrammar { + language = "cylc"; + version = "0.0.0+rev=8b895c2"; + src = fetchFromGitHub { + owner = "elliotfontaine"; + repo = "tree-sitter-cylc"; + rev = "8b895c278f98d05e67997f5e3a43fb5531933023"; + hash = "sha256-+Afoxp+1hJZfRsekpz9WAEw/i/7uoXb0wl7/b6tlPro="; + }; + meta.homepage = "https://github.com/elliotfontaine/tree-sitter-cylc"; + }; d = buildGrammar { language = "d"; version = "0.0.0+rev=45e5f1e"; @@ -392,45 +403,45 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=9ac03bb"; + version = "0.0.0+rev=a7496b9"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "9ac03bb2154316624fb4c41fe0f372a5f1597b43"; - hash = "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o="; + rev = "a7496b9d562be91e6588eecd5d7045832f575cd0"; + hash = "sha256-HEeg1Jovvg65NLyjICd4Gi/+e1QapxuEF2tqhh4B0dA="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; desktop = buildGrammar { language = "desktop"; - version = "0.0.0+rev=0d8b8cf"; + version = "0.0.0+rev=de93cdb"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-desktop"; - rev = "0d8b8cf7c9311fe3f1730df8e193d836f6dd9d1b"; - hash = "sha256-tDZB6gkQyVF1wN4343Qft0tRkTDDm49AFzhbIz+LK40="; + rev = "de93cdbd1cba965c102ce8b659d79f5759b933bd"; + hash = "sha256-aBdF9s1Km5vrb+kXnwdcxuhUJyzQCpGlQ/EE0h2kT0U="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop"; }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=16c9cb9"; + version = "0.0.0+rev=16f640f"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"; - hash = "sha256-UVxLF4IKRXexz+PbSlypS/1QsWXkS/iYVbgmFCgjvZM="; + rev = "16f640f3c59117c9e749d581634afdb00e004f4c"; + hash = "sha256-0J1Q25JEWVAlBHAgWRtHAwIIDNoSLYrEdMC45/jf7Uc="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; dhall = buildGrammar { language = "dhall"; - version = "0.0.0+rev=affb6ee"; + version = "0.0.0+rev=4a6c08a"; src = fetchFromGitHub { owner = "jbellerb"; repo = "tree-sitter-dhall"; - rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8"; - hash = "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ="; + rev = "4a6c08abfb54827db4e722d6cdca81b093898988"; + hash = "sha256-EP6eL04ltnnP2ypNsq6rLrG3F4bVg7QtnK3k0KP2/MY="; }; meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall"; }; @@ -537,12 +548,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=38cf8d0"; + version = "0.0.0+rev=5eca41a"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "38cf8d0af6049025de0e5486a40881dac06285b4"; - hash = "sha256-ndZ/oGquSMkxsEHUPh5/qDEUVfhyZbI4mcQKtLHVBOU="; + rev = "5eca41a689dc03534e9c459b066d116f8befb4ef"; + hash = "sha256-bsefC7SCJvSPy83BeIYxmFe+0Zt96QNs49Tlh/Vbx5s="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -724,12 +735,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=cb4cb11"; + version = "0.0.0+rev=e9fbb3a"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "cb4cb11ca2dced205fb54005684a44e2ceb813c1"; - hash = "sha256-c15BxiXhmQeOz0G5v2R9fpBUbhmcibm15ax6hbWQOnI="; + rev = "e9fbb3acbfc62b051616e53b17ab97b9823e8617"; + hash = "sha256-G7tsnI22k7Ndur3fLnfr2xk4fUaJ4kIy3Dw0GuqHSqg="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -879,12 +890,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=57c9951"; + version = "0.0.0+rev=2702fe8"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "57c9951b290c8084d7c60b0aee7a2b30986ea031"; - hash = "sha256-ieOvtZvOUwiJwJN6AtHVK91GTh+RKge9FMo+mYCtisk="; + rev = "2702fe84b986e4403a071bcb112d48e3dcde0ca4"; + hash = "sha256-DY79MOnZqb145DtmUyhma0WZ5PksDeqVvhwGuvFXGjM="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -1066,12 +1077,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=0d88845"; + version = "0.0.0+rev=b53a8cc"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "0d8884514fe10c4fa47527d9a0284d207f38ddea"; - hash = "sha256-Dv7FxfHA+2VM60iFZGaytmDVCUEoCJY3bpOJrw5Q8ik="; + rev = "b53a8cc1075e056b8223b86f3bb392e0d57ae101"; + hash = "sha256-yLl3/4qla45tsjCd2EFutcNqVrDjyMUjnSpUUHwaIyE="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1143,12 +1154,12 @@ }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=6dd0303"; + version = "0.0.0+rev=9359017"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "6dd0303acf7138dd2b9b432a229e16539581c701"; - hash = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec="; + rev = "9359017bd0dc6b023044713aa215544885663637"; + hash = "sha256-4DEfL/RxZk7cvP5qUHNohJlfAIW+ks34rdMd/uCvsvA="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -1276,12 +1287,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=5573b29"; + version = "0.0.0+rev=9ac6fdd"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "5573b295410201ed22771776b34d636900eba368"; - hash = "sha256-Pf9Wtmza6bKQsZ54EzVhSnUFkEcHuTgPGNZuH8jh42o="; + rev = "9ac6fdd7840b5c0f271fe11b4ab656634dc2074a"; + hash = "sha256-cedxIEfqyvnVdJOqPbXnsKoajMXwejVu9BV3qLCuYR8="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1474,12 +1485,12 @@ }; koto = buildGrammar { language = "koto"; - version = "0.0.0+rev=9e5ab09"; + version = "0.0.0+rev=0017388"; src = fetchFromGitHub { owner = "koto-lang"; repo = "tree-sitter-koto"; - rev = "9e5ab09710b9f035efdcef1eecaadbf261af7ec3"; - hash = "sha256-xlU3iOjwYcoCf6kdkxTX/zASY0+n+TwAn8GBfACYr1k="; + rev = "0017388765b8b9d89febfe08b5f82805b4e173a5"; + hash = "sha256-L8IK4dvejZ1yfEkPGufkNArxm3hTStpk15HFNkSQdv0="; }; meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; }; @@ -1808,12 +1819,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=456b14a"; + version = "0.0.0+rev=1b26cb6"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3"; - hash = "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY="; + rev = "1b26cb63284287344bc3820804cea18419b3edec"; + hash = "sha256-tkGOSi0NqtKl6w473+G66mWwbXwpmRySMLH8DEEcEXQ="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1839,6 +1850,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-nqc"; }; + nu = buildGrammar { + language = "nu"; + version = "0.0.0+rev=082a7c7"; + src = fetchFromGitHub { + owner = "nushell"; + repo = "tree-sitter-nu"; + rev = "082a7c7df7db460da6b280c9f902bf2b19a2f423"; + hash = "sha256-BUOadkcQAXqMI8qpDcPN8NwNI+LScPKl/GsGvhfUmhw="; + }; + meta.homepage = "https://github.com/nushell/tree-sitter-nu"; + }; objc = buildGrammar { language = "objc"; version = "0.0.0+rev=62e61b6"; @@ -2066,12 +2088,12 @@ }; printf = buildGrammar { language = "printf"; - version = "0.0.0+rev=0e0acea"; + version = "0.0.0+rev=94b84fb"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-printf"; - rev = "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"; - hash = "sha256-y/7CDnHpT3D6hL0f+52mReCphn+lvElfQQKJwY4fr9c="; + rev = "94b84fbc4768a7cbdeadfe5e489a45a6a8af400e"; + hash = "sha256-Ax23Y2arS+8g45F1NuffTq0ZlPZ2NBz0aHuQJyEVy2Y="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf"; }; @@ -2344,12 +2366,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=58f4caf"; + version = "0.0.0+rev=b518ad4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "58f4caf9db12db3b38b81c77d274aa73c9e85aca"; - hash = "sha256-IeAp2fEdxVf8r/f8B85ex5Y5DL8Z1ZOqovjVyMBIOKM="; + rev = "b518ad4bbee3ad59672b1826ca4dc62825983533"; + hash = "sha256-gApL+F03m24ibIrLMcirk1s+uJRM0vv7J34YRHkO78U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2454,12 +2476,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=83aec5f"; + version = "0.0.0+rev=557ec01"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "83aec5f7d1659aaa79e6f24b406a9cd49b87e8e8"; - hash = "sha256-LmZ2CmsAtxVcR/FuEZXunOHbGR9w8IL5DmLINFWqBAE="; + rev = "557ec01403bd1fcfea50f1805641ca773cbaaa42"; + hash = "sha256-3MzlgYW65MSpukd8Nt9ooUC39g7ZigLjqXIaNB0sNEg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -2667,12 +2689,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=77450e8"; + version = "0.0.0+rev=dd32616"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "77450e8bce8853921512348f83c73c168c71fdfb"; - hash = "sha256-V7JI1o30+mzGA4X1oh+pyu3rSWOfHFKfCUbYaFPLOmM="; + rev = "dd32616275c6e9d7800c58f40c16a09ad1c7c238"; + hash = "sha256-BOvCOnt76f00+hqjEmJ8VLiwqSPd3p/yScTXsuNdexY="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2700,12 +2722,12 @@ }; styled = buildGrammar { language = "styled"; - version = "0.0.0+rev=764af55"; + version = "0.0.0+rev=2e0e623"; src = fetchFromGitHub { owner = "mskelton"; repo = "tree-sitter-styled"; - rev = "764af55fc6b8e5ae177eb272f5c5de6238db23e6"; - hash = "sha256-Zh35KWOYQbtsG3/F7g68dniBu5UZTA6ZuiX2GA0E2ww="; + rev = "2e0e6231348d8cb0a82406490771825b8ac80422"; + hash = "sha256-RwhHCWK1ckXdPgIVZ4NC5zCBna91NBYub2MlrIwHeGk="; }; meta.homepage = "https://github.com/mskelton/tree-sitter-styled"; }; @@ -2722,12 +2744,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=e561df3"; + version = "0.0.0+rev=7d61ccc"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "e561df3b5ce94e598a4c3d0ee4abd9635bad63b3"; - hash = "sha256-sF5uAEYV32HROnqvM3oltvpwtBydx2au8SIJCAMmpMY="; + rev = "7d61cccdb865b2028301a0597b55ac8b225af6cf"; + hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2754,6 +2776,17 @@ }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; + sway = buildGrammar { + language = "sway"; + version = "0.0.0+rev=03d97aa"; + src = fetchFromGitHub { + owner = "FuelLabs"; + repo = "tree-sitter-sway"; + rev = "03d97aad336ecc6b302f23bdd9b695ddc937160b"; + hash = "sha256-Y08vgnlxOSjvI3NURU8VUyaGjKt+q4IiCaV18C5co0s="; + }; + meta.homepage = "https://github.com/FuelLabs/tree-sitter-sway.git"; + }; swift = buildGrammar { language = "swift"; version = "0.0.0+rev=5098007"; @@ -2902,12 +2935,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=ffb6c4b"; + version = "0.0.0+rev=d711f24"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "ffb6c4b91862a03af767d6b0e627d3d20539b79a"; - hash = "sha256-eKHpiAtOYn9fFhR35m1d1jLNwLeXL1GT5cAWWoYZI/k="; + rev = "d711f24c93221cdfc9a9b4dbb0998f528fc982ac"; + hash = "sha256-CHoqOY990/30GqLkxee/xexQ9uni7VTdW0iZ+inunoc="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -3105,12 +3138,12 @@ }; vala = buildGrammar { language = "vala"; - version = "0.0.0+rev=8f690bf"; + version = "0.0.0+rev=97e6db3"; src = fetchFromGitHub { owner = "vala-lang"; repo = "tree-sitter-vala"; - rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"; - hash = "sha256-YZTE3PkBPCEkMXnLC0HSQ86v5+3/J7/ETDQp8eguFW8="; + rev = "97e6db3c8c73b15a9541a458d8e797a07f588ef4"; + hash = "sha256-hAekweZGDHVrWVd04RrN+9Jz0D2kode+DpceTlUXii0="; }; meta.homepage = "https://github.com/vala-lang/tree-sitter-vala"; }; @@ -3138,12 +3171,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=d6e8301"; + version = "0.0.0+rev=606cc72"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "d6e8301999336b47d663052d43f983c3edeb01dd"; - hash = "sha256-vQIsWcmm5szh7L8iSDDHenSJDqJrXcTDn0A/0WJYWGc="; + rev = "606cc728e7d55bbcecfa37b20d7313a609af1361"; + hash = "sha256-H8BApOAcRIFNI5Ke8DtCDZUDptKNeS8wTMHQp6xZZBM="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3271,12 +3304,12 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=630af80"; + version = "0.0.0+rev=d36d356"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "630af80f563ede09a652a808277950c36306e3a3"; - hash = "sha256-kQmswwZgevQFayhU0Q+UnLh+lnjgvr+m48FtYWUv3Bw="; + rev = "d36d356624af4b46d3fc815d0701ebf72654473c"; + hash = "sha256-h3rS89e+eZTCxCNJVJdBbgCFEMDXQ884Lkmol0Gcq5k="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; @@ -3337,24 +3370,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=42b6f5d"; + version = "0.0.0+rev=fe73bee"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "42b6f5d7320340bc5903c4c29d34065e8517a549"; - hash = "sha256-08y6Km7tO9YhJBmWXvPVjiku1QRRNcmJ2h2EbMa6Q/g="; + rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f"; + hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=42b6f5d"; + version = "0.0.0+rev=fe73bee"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "42b6f5d7320340bc5903c4c29d34065e8517a549"; - hash = "sha256-08y6Km7tO9YhJBmWXvPVjiku1QRRNcmJ2h2EbMa6Q/g="; + rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f"; + hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0e3f1d17c464..817103d35abe 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -19,6 +19,7 @@ arrow-cpp, Cocoa, coc-clangd, + coc-css, coc-diagnostic, coc-pyright, code-minimap, @@ -133,6 +134,9 @@ # must be lua51Packages luajitPackages, aider-chat, + # typst-preview dependencies + tinymist, + websocat, }: self: super: let @@ -162,14 +166,66 @@ in nvimRequireCheck = "autosave"; }; - avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs { - dependencies = with self; [ - dressing-nvim - nui-nvim - nvim-treesitter - plenary-nvim - ]; - }; + avante-nvim = super.avante-nvim.overrideAttrs ( + oldAttrs: + let + avante-nvim-lib = rustPlatform.buildRustPackage { + pname = "avante-nvim-lib"; + inherit (oldAttrs) version src; + + cargoHash = "sha256-X8JqUoPjm9emJjmwCh7+0bfdtPXLwOg6IRfQHaYlH90="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + buildFeatures = [ "luajit" ]; + + checkFlags = [ + # Disabled because they access the network. + "--skip=test_hf" + "--skip=test_public_url" + "--skip=test_roundtrip" + ]; + }; + in + { + dependencies = with self; [ + dressing-nvim + nui-nvim + nvim-treesitter + plenary-nvim + ]; + + postInstall = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + mkdir -p $out/build + ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} + ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} + ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} + ''; + + doInstallCheck = true; + nvimRequireCheck = "avante"; + + meta = { + description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; + homepage = "https://github.com/yetone/avante.nvim"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + ttrei + aarnphm + ]; + }; + } + ); barbecue-nvim = super.barbecue-nvim.overrideAttrs { dependencies = with self; [ @@ -237,7 +293,7 @@ in --replace "let g:clang_library_path = '' + "''" + '' - " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" + " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'" substituteInPlace "$out"/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" @@ -246,7 +302,7 @@ in clighter8 = super.clighter8.overrideAttrs { preFixup = '' - sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ + sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/plugin/clighter8.vim ''; }; @@ -453,6 +509,11 @@ in src = "${coc-clangd}/lib/node_modules/coc-clangd"; }; + coc-css = buildVimPlugin { + inherit (coc-css) pname version meta; + src = "${coc-css}/lib/node_modules/coc-css"; + }; + coc-diagnostic = buildVimPlugin { inherit (coc-diagnostic) pname version meta; src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; @@ -1471,6 +1532,13 @@ in dependencies = with self; [ ultisnips ]; }; + neoconf-nvim = super.neoconf-nvim.overrideAttrs { + dependencies = with self; [ nvim-lspconfig ]; + + doInstallCheck = true; + nvimRequireCheck = "neoconf"; + }; + neogit = super.neogit.overrideAttrs { dependencies = with self; [ plenary-nvim ]; nvimRequireCheck = "neogit"; @@ -1665,6 +1733,10 @@ in } ); + nvim-scissors = super.nvim-scissors.overrideAttrs { + nvimRequireCheck = "scissors"; + }; + nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { postPatch = '' substituteInPlace lua/tealmaker/init.lua \ @@ -2196,6 +2268,16 @@ in dependencies = with self; [ telescope-nvim ]; }; + quarto-nvim = super.quarto-nvim.overrideAttrs { + dependencies = with self; [ + nvim-lspconfig + otter-nvim + ]; + + nvimRequireCheck = "quarto"; + doInstallCheck = true; + }; + telescope-zoxide = super.telescope-zoxide.overrideAttrs { dependencies = with self; [ telescope-nvim ]; @@ -2719,12 +2801,21 @@ in --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; + + typst-preview-nvim = super.typst-preview-nvim.overrideAttrs { + postPatch = '' + substituteInPlace lua/typst-preview/config.lua \ + --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \ + --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}'," + ''; + + nvimRequireCheck = "typst-preview"; + }; } // ( let nodePackageNames = [ "coc-cmake" - "coc-css" "coc-docker" "coc-emmet" "coc-eslint" diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index a8525b9018b5..37c0adb6bb29 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -3,7 +3,7 @@ # run with: # $ nix run .\#vimPluginsUpdater # format: -# $ nix run nixpkgs#python3Packages.black -- update.py +# $ nix run nixpkgs#python3Packages.ruff -- update.py # type-check: # $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: @@ -19,30 +19,24 @@ # import inspect -import os -import logging -import textwrap import json +import logging +import os import subprocess -from typing import List, Tuple +import textwrap from pathlib import Path - +from typing import List, Tuple log = logging.getLogger("vim-updater") -sh = logging.StreamHandler() -formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s") -sh.setFormatter(formatter) -log.addHandler(sh) - # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -import pluginupdate import importlib -from pluginupdate import run_nix_expr, PluginDesc -treesitter = importlib.import_module('nvim-treesitter.update') +import pluginupdate +from pluginupdate import PluginDesc, run_nix_expr +treesitter = importlib.import_module("nvim-treesitter.update") HEADER = ( @@ -56,17 +50,14 @@ class VimEditor(pluginupdate.Editor): nvim_treesitter_updated = False def generate_nix( - self, - plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], - outfile: str + self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str ): log.info("Generating nix code") - sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) log.debug("Loading nvim-treesitter revision from nix...") nvim_treesitter_rev = pluginupdate.run_nix_expr( "(import { }).vimPlugins.nvim-treesitter.src.rev", self.nixpkgs, - timeout=10 + timeout=10, ) GET_PLUGINS_LUA = """ @@ -98,7 +89,7 @@ class VimEditor(pluginupdate.Editor): """ ) ) - for pdesc, plugin in sorted_plugins: + for pdesc, plugin in plugins: content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin)) f.write(content) if ( @@ -109,8 +100,9 @@ class VimEditor(pluginupdate.Editor): f.write("\n}\n") print(f"updated {outfile}") - def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool) -> str: - + def plugin2nix( + self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool + ) -> str: repo = pdesc.repo content = f" {plugin.normalized_name} = " @@ -138,19 +130,25 @@ class VimEditor(pluginupdate.Editor): if self.nvim_treesitter_updated: print("updating nvim-treesitter grammars") cmd = [ - "nix", "build", - "vimPlugins.nvim-treesitter.src", "-f", self.nixpkgs - , "--print-out-paths" + "nix", + "build", + "vimPlugins.nvim-treesitter.src", + "-f", + self.nixpkgs, + "--print-out-paths", ] log.debug("Running command: %s", " ".join(cmd)) - nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip() + nvim_treesitter_dir = subprocess.check_output( + cmd, text=True, timeout=90 + ).strip() generated = treesitter.update_grammars(nvim_treesitter_dir) treesitter_generated_nix_path = os.path.join( - NIXPKGS_NVIMTREESITTER_FOLDER, - "generated.nix" + NIXPKGS_NVIMTREESITTER_FOLDER, "generated.nix" + ) + open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write( + generated ) - open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated) if self.nixpkgs_repo: index = self.nixpkgs_repo.index diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ad4f66f1b643..bc13c7b68e96 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -85,6 +85,7 @@ https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/gaoDean/autolist.nvim/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/nullishamy/autosave.nvim/,HEAD, +https://github.com/yetone/avante.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/AhmedAbdulrahman/aylin.vim/,, https://github.com/ayu-theme/ayu-vim/,, @@ -115,9 +116,10 @@ https://github.com/AndrewRadev/bufferize.vim/,HEAD, https://github.com/akinsho/bufferline.nvim/,, https://github.com/kwkarlwang/bufjump.nvim/,HEAD, https://github.com/bullets-vim/bullets.vim/,, -https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/itchyny/calendar.vim/,, https://github.com/bkad/camelcasemotion/,, +https://github.com/catppuccin/nvim/,,catppuccin-nvim +https://github.com/catppuccin/vim/,HEAD,catppuccin-vim https://github.com/tyru/caw.vim/,, https://github.com/uga-rosa/ccc.nvim/,HEAD, https://github.com/Eandrju/cellular-automaton.nvim/,HEAD, @@ -182,6 +184,7 @@ https://github.com/andersevenrud/cmp-tmux/,, https://github.com/ray-x/cmp-treesitter/,, https://github.com/lukas-reineke/cmp-under-comparator/,, https://github.com/dmitmel/cmp-vim-lsp/,HEAD, +https://github.com/micangl/cmp-vimtex/,HEAD, https://github.com/pontusk/cmp-vimwiki-tags/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, https://github.com/tamago324/cmp-zsh/,HEAD, @@ -297,6 +300,7 @@ https://github.com/direnv/direnv.vim/,, https://github.com/chipsenkbeil/distant.nvim/,HEAD, https://github.com/doki-theme/doki-theme-vim/,, https://github.com/NTBBloodbath/doom-one.nvim/,, +https://github.com/dracula/vim/,,dracula-vim https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, @@ -311,6 +315,7 @@ https://github.com/creativenull/efmls-configs-nvim/,, https://github.com/elixir-tools/elixir-tools.nvim/,HEAD, https://github.com/elmcast/elm-vim/,, https://github.com/dmix/elvish.vim/,, +https://github.com/embark-theme/vim/,,embark-vim https://github.com/mattn/emmet-vim/,, https://github.com/vim-scripts/emodeline/,, https://github.com/vim-scripts/errormarker.vim/,, @@ -320,6 +325,7 @@ https://github.com/google/executor.nvim/,HEAD, https://github.com/jinh0/eyeliner.nvim/,HEAD, https://github.com/fenetikm/falcon/,, https://github.com/brooth/far.vim/,, +https://github.com/Chaitanyabsprip/fastaction.nvim/,HEAD, https://github.com/pteroctopus/faster.nvim/,HEAD, https://github.com/konfekt/fastfold/,, https://github.com/lilydjwg/fcitx.vim/,fcitx5, @@ -342,6 +348,7 @@ https://github.com/floobits/floobits-neovim/,, https://github.com/akinsho/flutter-tools.nvim/,HEAD, https://github.com/nvim-focus/focus.nvim/,HEAD, https://github.com/anuvyklack/fold-preview.nvim/,HEAD, +https://github.com/jghauser/follow-md-links.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, https://github.com/rubiin/fortune.nvim/,HEAD, @@ -357,6 +364,7 @@ https://github.com/gfanto/fzf-lsp.nvim/,, https://github.com/ibhagwan/fzf-lua/,HEAD, https://github.com/junegunn/fzf.vim/,, https://github.com/NTBBloodbath/galaxyline.nvim/,, +https://github.com/gbprod/nord.nvim/,,gbprod-nord https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, https://github.com/ndmitchell/ghcid/,, @@ -385,9 +393,9 @@ https://github.com/liuchengxu/graphviz.vim/,, https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, https://github.com/MagicDuck/grug-far.nvim/,, -https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, https://github.com/luisiacc/gruvbox-baby/,HEAD, +https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, https://github.com/f4z3r/gruvbox-material.nvim/,HEAD, @@ -400,8 +408,8 @@ https://github.com/junegunn/gv.vim/,, https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, https://github.com/m4xshen/hardtime.nvim/,HEAD, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, -https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 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/neovimhaskell/haskell-vim/,, @@ -430,7 +438,6 @@ https://github.com/idris-hackers/idris-vim/,, https://github.com/ShinKage/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, https://github.com/3rd/image.nvim/,HEAD, -https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim https://github.com/HakonHarnes/img-clip.nvim/,HEAD, https://github.com/lewis6991/impatient.nvim/,, https://github.com/backdround/improved-search.nvim/,HEAD, @@ -521,6 +528,7 @@ https://github.com/barreiroleo/ltex_extra.nvim/,HEAD, https://github.com/arkav/lualine-lsp-progress/,, https://github.com/nvim-lualine/lualine.nvim/,, https://github.com/l3mon4d3/luasnip/,, +https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, @@ -538,6 +546,7 @@ https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, +https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/vim-scripts/mayansmoke/,, https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/savq/melange-nvim/,, @@ -596,10 +605,10 @@ https://github.com/miikanissi/modus-themes.nvim/,HEAD, https://github.com/tomasr/molokai/,, https://github.com/benlubas/molten-nvim/,HEAD, https://github.com/loctvl842/monokai-pro.nvim/,HEAD, -https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/yegappan/mru/,, https://github.com/smoka7/multicursors.nvim/,HEAD, +https://github.com/AckslD/muren.nvim/,HEAD, https://github.com/jbyuki/nabla.nvim/,HEAD, https://github.com/ncm2/ncm2/,, https://github.com/ncm2/ncm2-bufword/,, @@ -666,7 +675,6 @@ https://github.com/stevanmilic/neotest-scala/,HEAD, https://github.com/shunsambongi/neotest-testthat/,HEAD, https://github.com/marilari88/neotest-vitest/,HEAD, https://github.com/lawrence-laz/neotest-zig/,HEAD, -https://github.com/rose-pine/neovim/,main,rose-pine https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, https://github.com/jeffkreeftmeijer/neovim-sensible/,, @@ -681,6 +689,7 @@ https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, https://github.com/chr4/nginx.vim/,, https://github.com/oxfist/night-owl.nvim/,, +https://github.com/bluz71/vim-nightfly-colors/,,nightfly https://github.com/EdenEast/nightfox.nvim/,, https://github.com/Alexis12119/nightly.nvim/,, https://github.com/zah/nim.vim/,, @@ -692,7 +701,7 @@ https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/kartikp10/noctis.nvim/,, https://github.com/folke/noice.nvim/,HEAD, https://github.com/nvimtools/none-ls.nvim/,HEAD, -https://github.com/gbprod/nord.nvim/,,gbprod-nord +https://github.com/nordtheme/vim/,,nord-vim https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,HEAD, @@ -701,8 +710,8 @@ https://github.com/MunifTanjim/nui.nvim/,main, https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,HEAD, +https://github.com/nvchad/ui/,HEAD,nvchad-ui https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, -https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, @@ -773,6 +782,7 @@ https://github.com/yorickpeterse/nvim-pqf/,HEAD, https://github.com/jamestthompson3/nvim-remote-containers/,HEAD, https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/chrisgrieser/nvim-rip-substitute/,, +https://github.com/chrisgrieser/nvim-scissors/,HEAD, https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, @@ -817,6 +827,7 @@ https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/yonlu/omni.vim/,, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, +https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, https://github.com/navarasu/onedark.nvim/,, https://github.com/joshdick/onedark.vim/,, https://github.com/LunarVim/onedarker.nvim/,, @@ -846,6 +857,7 @@ https://github.com/olimorris/persisted.nvim/,HEAD, https://github.com/folke/persistence.nvim/,, https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, +https://github.com/phha/zenburn.nvim/,,phha-zenburn https://github.com/motus/pig.vim/,, https://github.com/weirongxu/plantuml-previewer.vim/,HEAD, https://github.com/aklt/plantuml-syntax/,, @@ -865,6 +877,7 @@ https://github.com/ahmedkhalf/project.nvim/,, https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, https://github.com/Shougo/pum.vim/,HEAD, +https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, @@ -897,6 +910,7 @@ https://github.com/gu-fan/riv.vim/,, https://github.com/kevinhwang91/rnvimr/,, https://github.com/mfukar/robotframework-vim/,, https://github.com/ron-rs/ron.vim/,, +https://github.com/rose-pine/neovim/,main,rose-pine https://github.com/jmederosalvarado/roslyn.nvim/,HEAD, https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, @@ -904,6 +918,7 @@ https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, +https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim https://github.com/lewis6991/satellite.nvim/,HEAD, https://github.com/davidgranstrom/scnvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD, @@ -927,6 +942,7 @@ https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/ibhagwan/smartyank.nvim/,, +https://github.com/folke/snacks.nvim/,HEAD, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, https://github.com/shaunsingh/solarized.nvim/,HEAD, @@ -1056,8 +1072,9 @@ https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, +https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD, +https://github.com/chomosuke/typst-preview.nvim/,HEAD, https://github.com/kaarmu/typst.vim/,HEAD, -https://github.com/nvchad/ui/,HEAD,nvchad-ui https://github.com/altermo/ultimate-autopair.nvim/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, @@ -1073,11 +1090,6 @@ https://github.com/junegunn/vader.vim/,, https://github.com/jbyuki/venn.nvim/,, https://github.com/vhda/verilog_systemverilog.vim/,, https://github.com/vifm/vifm.vim/,, -https://github.com/catppuccin/vim/,HEAD,catppuccin-vim -https://github.com/dracula/vim/,,dracula-vim -https://github.com/embark-theme/vim/,,embark-vim -https://github.com/nordtheme/vim/,,nord-vim -https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters https://github.com/Konfekt/vim-CtrlXA/,, https://github.com/konfekt/vim-DetectSpellLang/,, https://github.com/dpelle/vim-LanguageTool/,, @@ -1104,6 +1116,7 @@ https://github.com/MarcWeber/vim-addon-sql/,, https://github.com/MarcWeber/vim-addon-syntax-checker/,, https://github.com/MarcWeber/vim-addon-toggle-buffer/,, https://github.com/MarcWeber/vim-addon-xdebug/,, +https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters https://github.com/junegunn/vim-after-object/,, https://github.com/danilo-augusto/vim-afterglow/,HEAD, https://github.com/msuperdock/vim-agda/,HEAD, @@ -1180,6 +1193,7 @@ https://github.com/kristijanhusak/vim-dirvish-git/,, https://github.com/tpope/vim-dispatch/,, https://github.com/radenling/vim-dispatch-neovim/,, https://github.com/jhradilek/vim-docbk/,, +https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets https://github.com/tpope/vim-dotenv/,, https://github.com/junegunn/vim-easy-align/,, https://github.com/zhou13/vim-easyescape/,, @@ -1333,7 +1347,6 @@ https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, https://github.com/nickel-lang/vim-nickel/,main, -https://github.com/bluz71/vim-nightfly-colors/,,nightfly https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, @@ -1425,7 +1438,6 @@ https://github.com/bohlender/vim-smt2/,, https://github.com/justinmk/vim-sneak/,, https://github.com/garbas/vim-snipmate/,, https://github.com/honza/vim-snippets/,, -https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets https://github.com/lifepillar/vim-solarized8/,HEAD, https://github.com/tomlion/vim-solidity/,, https://github.com/christoomey/vim-sort-motion/,, @@ -1554,7 +1566,6 @@ https://github.com/Lilja/zellij.nvim/,HEAD, https://github.com/folke/zen-mode.nvim/,, https://github.com/zenbones-theme/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, -https://github.com/phha/zenburn.nvim/,,phha-zenburn https://github.com/nvimdev/zephyr-nvim/,, https://github.com/ziglang/zig.vim/,, https://github.com/zk-org/zk-nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 02d48e6e70f7..d4a65be7953e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -298,8 +298,8 @@ let mktplcRef = { name = "openscad"; publisher = "Antyos"; - version = "1.1.1"; - sha256 = "1adcw9jj3npk3l6lnlfgji2l529c4s5xp9jl748r9naiy3w3dpjv"; + version = "1.3.1"; + hash = "sha256-J4lJgZT0HXRC2B1eFUl4MoP0YT5EZjLPl3yIY+VLBiI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Antyos.openscad/changelog"; @@ -313,8 +313,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "2.3.3"; - hash = "sha256-pxj3BM+LJPS9KxxniEtBLT3x1FERGr4yPndxOSVLgR8="; + version = "2.3.6"; + hash = "sha256-4AehjV7XO9NxS3aHpqm2sKA+kaFbYLrr3E5sUCTRW0I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.12"; - hash = "sha256-3Nmk0MFIMFYQHrRyZ7ioFk9KfHSk0CSF7FwNaEJbsyg="; + version = "1.18.14"; + hash = "sha256-Db49bLX0QLr7fS7ZUyeWOustN63LpaJ6IBTKMqAz8uc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -1049,30 +1049,30 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-X6Oszc88F0ENABwX63uwxbJ4VPQOQzZbJA87znVg5d8="; + hash = "sha256-+/0ZQkRS6AD8u5+t2hiPwQxzwhEc+n2F0GVk1s0n74U="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-NH3kGmNZpKofNplw+FRJFvV3m36HRuIqGR3zt6X5x60="; + hash = "sha256-FZbTBPn12pv9bQWqfWwPapFLTpp5nclp0RH/WZc6/r4="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-hlFAMz17cl2/1CK7/dgrLktcPZYAcccIWIpkAVdwpkI="; + hash = "sha256-e6zfflFgxVuikWwQuU6ImEuVk8xgi2HyY8uZwBoQiLU="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-oVkmdw0sHv5Y+ysT4zWW6qFDh/h4/TcgSAauh1KrE1c="; + hash = "sha256-SfA9wkvYT2Vb3GpJRjWE6lzZAXdFCnEKoKl0hjT0Llw="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.44"; + version = "0.8.54"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; @@ -1122,8 +1122,8 @@ let mktplcRef = { name = "dbclient-jdbc"; publisher = "cweijan"; - version = "1.3.4"; - hash = "sha256-qknooeedRhTvEWSuGXFoO/BczGanYCdMr7WWjthxG+k="; + version = "1.3.6"; + hash = "sha256-CETB2hLaXD7DuNmop/DHjpI8NgHfMGyMMZyfw/Bt1yc="; }; meta = { description = "JDBC Adapter For Database Client"; @@ -1349,7 +1349,7 @@ let buildInputs = [ zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; postInstall = '' @@ -1724,8 +1724,8 @@ let mktplcRef = { name = "vsc-material-theme-icons"; publisher = "Equinusocio"; - version = "3.5.0"; - hash = "sha256-XqtyZVlsPaPkKB9HdigKSXjCwqXe9wzJWeRcPpS6EVM="; + version = "3.8.8"; + hash = "sha256-el2hQaq1gZBn2PZ+f+S1fHM/g3V0sX7Chyre04sds8k="; }; meta = { description = "Material Theme Icons, the most epic icons theme for Visual Studio Code and Material Theme"; @@ -1740,8 +1740,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "10.4.0"; - hash = "sha256-8+90cZpqyH+wBgPFaX5GaU6E02yBWUoB+T9C2z2Ix8c="; + version = "11.0.0"; + hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1852,8 +1852,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.72"; - hash = "sha256-1nUpOXdteWsyFYJ2uATCcr1SUbeusmbpa09Bkw9/TZM="; + version = "0.4.74"; + hash = "sha256-35Ix6B/vkYQIky9KYsMsxgmRh1LYzBoRs9pMe8M5/rI="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -2039,8 +2039,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.236.0"; # compatible with vscode ^1.94 - hash = "sha256-ozJwByuSjROWSxfrapcyxDkI7xgcjqf/IKtUfEC+MGk="; + version = "1.243.1191"; # compatible with vscode ^1.95 + hash = "sha256-tMUFMi+lBZZQA/8UTyoqQ5s+xnWKh39V8GYErO9ZuSo="; }; meta = { @@ -2056,8 +2056,9 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.22.2024100702"; # latest compatible with vscode ^1.94 - hash = "sha256-n/ecEnxz3LiTx9MuHO8AMIWBJPNNxQb6vghlG/hPMUY="; + # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json + version = "0.23.2024102903"; # compatible with vscode ^1.95 + hash = "sha256-FGvB+b24i23bdhpJpCQDvIHqqFvCJrWAKnX6fJgkr2E="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -2261,8 +2262,8 @@ let mktplcRef = { name = "HCL"; publisher = "HashiCorp"; - version = "0.3.2"; - hash = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo="; + version = "0.6.0"; + hash = "sha256-Za2ODrsHR/y0X/FOhVEtbg6bNs439G6rlBHW84EZS60="; }; meta = { description = "HashiCorp HCL syntax"; @@ -2693,6 +2694,23 @@ let }; }; + jroesch.lean = buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "lean"; + publisher = "jroesch"; + version = "0.16.59"; + hash = "sha256-tXiAM2MBF+Axd0zB7Rlgx8b8FgwlLaZex0++H2DpBls="; + }; + meta = { + changelog = "https://github.com/leanprover/vscode-lean/blob/v${mktplcRef.version}/README.md#release-notes"; + description = "Lean 3 language support for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jroesch.lean"; + homepage = "https://github.com/leanprover/vscode-lean"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; + }; + julialang.language-julia = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-julia"; @@ -3227,7 +3245,7 @@ let // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; meta = { @@ -3609,8 +3627,14 @@ let }; }; + ms-vscode-remote.vscode-remote-extensionpack = + callPackage ./ms-vscode-remote.vscode-remote-extensionpack + { }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; + ms-windows-ai-studio.windows-ai-studio = callPackage ./ms-windows-ai-studio.windows-ai-studio { }; + mshr-h.veriloghdl = buildVscodeMarketplaceExtension { mktplcRef = { name = "veriloghdl"; @@ -3954,8 +3978,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "2.12.143"; - hash = "sha256-NEV7sVYJJvapZjk5sylkzijH8qLZ7xzmBzHI7qcj2Ok="; + version = "24.10.0"; + hash = "sha256-NDIGyVCo3Az6oncnKR9PXXnZ4ynwF7HBeIiNyiGTPko="; }; meta = { description = "Ansible language support"; @@ -4133,6 +4157,23 @@ let }; }; + sainnhe.gruvbox-material = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gruvbox-material"; + publisher = "sainnhe"; + version = "6.5.2"; + hash = "sha256-D+SZEQQwjZeuyENOYBJGn8tqS3cJiWbEkmEqhNRY/i4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/sainnhe.gruvbox-material/changelog"; + description = "Gruvbox Material theme VSCode extension with Material palette"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=sainnhe.gruvbox-material"; + homepage = "https://github.com/sainnhe/gruvbox-material-vscode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thtrf ]; + }; + }; + samuelcolvin.jinjahtml = buildVscodeMarketplaceExtension { mktplcRef = { name = "jinjahtml"; @@ -4283,8 +4324,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.14"; - hash = "sha256-vCuuPB/GTkM2xCBn1UF3CZwP49Ge/8eelHhg67EG7tQ="; + version = "0.8.15"; + hash = "sha256-aW2Ri73xIl/1q/Yoi5qg25fjx7l55QfXAn+M+JuoN+A="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; @@ -4513,8 +4554,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.7"; - hash = "sha256-y+xD8rOa/ljavAF7tdEpaOKEd4gUzfH15WBwMHyW7z4="; + version = "4.0.15"; + hash = "sha256-Zow0laXwORa3V5Hy40pWDa/+Xq7kQbgn/Ia6PrJxI6E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4546,8 +4587,8 @@ let mktplcRef = { name = "vscode-stylelint"; publisher = "stylelint"; - version = "1.3.0"; - hash = "sha256-JoCa2d0ayBEuCcQi3Z/90GJ4AIECVz8NCpd+i+9uMeA="; + version = "1.4.0"; + hash = "sha256-CsQBRoVDtNLlkHa6NLmOspkswB/JUMfMuU2dMYDlDnc="; }; meta = { description = "Official Stylelint extension for Visual Studio Code"; @@ -4958,8 +4999,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.16.0"; - hash = "sha256-Y3M/A5rYLkxQPRIZ0BUjhlkvixDae+wIRUsBn4tREFw="; + version = "3.20.0"; + hash = "sha256-0gCT+u6rfkEcWcdzqRdc4EosROllD/Q0TIOQ4k640j0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -5035,8 +5076,8 @@ let mktplcRef = { name = "intellicode-api-usage-examples"; publisher = "VisualStudioExptTeam"; - version = "0.2.8"; - hash = "sha256-aXAS3QX+mrX0kJqf1LUsvguqRxxC0o+jj1bKQteXPNA="; + version = "0.2.9"; + hash = "sha256-8xBD+WLBaxYt8v3+8lvV2SiqV89iE4jeQod2kH7LNHU="; }; meta = { description = "See relevant code examples from GitHub for over 100K different APIs right in your editor"; @@ -5051,8 +5092,8 @@ let mktplcRef = { name = "vscodeintellicode"; publisher = "VisualStudioExptTeam"; - version = "1.2.30"; - hash = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE="; + version = "1.3.2"; + hash = "sha256-2zexyX1YKD5jgtsvDx7/z3luh5We71ys+XRlVcNywfs="; }; meta = { description = "AI-assisted development"; @@ -5154,8 +5195,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.25.2023121402"; - hash = "sha256-JhVJK2gZe3R6dpynon+9wauSAWPdW4LmG9oRWylCexM="; + version = "0.29.2024091906"; + hash = "sha256-A0WHSqqYVkRN1C3WI7Gd7DZJFDJPYDVsEygDCG67GoQ="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index 8abf052323b2..bfdcf04fae9a 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "plantuml"; publisher = "jebbs"; - version = "2.17.4"; - hash = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; + version = "2.18.1"; + hash = "sha256-o4FN/vUEK53ZLz5vAniUcnKDjWaKKH0oPZMbXVarDng="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 56fffc0080cd..d53540ba0cf6 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.9.1"; - hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc="; + version = "1.9.3"; + hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 9fc9a29c1b22..664c6b791556 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.8.2"; - hash = "sha256-EwxQjCBSmJ78L06EtKB8twIz5x51Jo/DHNlpD31pIKA="; + version = "2024.10.1"; + hash = "sha256-rSgPTF7RtrR2lgp++uKfT9tYx4AKqW3qjBvPUZpw52s="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix new file mode 100644 index 000000000000..41222c7eeb5d --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-remote-extensionpack"; + publisher = "ms-vscode-remote"; + version = "0.26.0"; + hash = "sha256-YUo0QbJILa9BzWub6Wi6cDD/Zsy/H8LZ8j+9H+5pVHY="; + }; + + meta = { + description = "A Visual Studio Code extension pack that lets you open any folder in a container, on a remote machine, or in WSL and take advantage of VS Code's full feature set"; + homepage = "https://github.com/Microsoft/vscode-remote-release"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index fd3358e99f6d..e652e80fb068 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -71,7 +71,7 @@ vscode-utils.buildVscodeMarketplaceExtension { lttng-ust libkrb5 zlib - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontAutoPatchelf = isx86Linux; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix new file mode 100644 index 000000000000..cdb13b4c6020 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "windows-ai-studio"; + publisher = "ms-windows-ai-studio"; + version = "0.6.1"; + hash = "sha256-BAA7wSfyJ4y8how+NnaGdCf/BCU6aOmI8ew8qpcQCnY="; + }; + + meta = { + description = "A Visual Studio Code an extension to help developers and AI engineers to easily build AI apps through developing and testing with generative AI models locally or in the cloud"; + homepage = "https://github.com/Microsoft/windows-ai-studio"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index c6b0f26aa5c6..54179c22241f 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.23.0"; - hash = "sha256-wMky9whajltZYD3PUG+LCzuK9S5t55+3tRjTyA8kFcY="; + version = "1.24.0"; + hash = "sha256-T2AbGxBytHXWP/ZKBhglRRbvPZ6px90XnSadwZTe/BM="; }; postPatch = '' @@ -23,7 +23,7 @@ vscode-utils.buildVscodeMarketplaceExtension { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index d30107a1fb03..02e8a74f4107 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -6,28 +6,28 @@ }: let - version = "0.12.1"; + version = "0.12.3"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-Tf26s4YDyjYUrVdKu9aYMMntirZyNRgnETMzO/EfFCA="; + hash = "sha256-dpvdWE0LL4PY2bzfRLazqP+VB9SSyhwnMLoOLsMmNJw="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-2u92qFaRIirCrvtuxeqVqt6zWEobS1f5SX26SGZF4xE="; + hash = "sha256-81ahZTuIG5ukXm+gmVzg4RgryRTyOIBaQ6BvGLCXVp0="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-+NUdF/KIWhLXOGtUgmNI9JF+L+f/4o064gznpLiORVM="; + hash = "sha256-brheyxw4tHXF5Guzn8fzolQmcLQvOknPeAtGNPowcBk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-GVEOTgfSKc0YXZUF4WGl/56Jd4ucaeDm9nB+267BQoM="; + hash = "sha256-EgupFXNfKKkk3FgEmgYwsY/QdaTLlbghKIIHQcvLatY="; }; }; in diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1c12abb14780..a82c876216cc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -1,4 +1,5 @@ { stdenv +, stdenvNoCC , lib , callPackage , fetchurl @@ -30,21 +31,21 @@ let archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0w452wnzyb4wmr2qqq55dhfb1jd0zqmwf65fbmxdz7jn1jimjjrn"; - x86_64-darwin = "1b333snvrw8khryhi5scfhhkg43m3b6ds3nvs24nbvx8k7h69hmm"; - aarch64-linux = "12p5cdva14s9sfgyrzg3nylpmgdnmfavwx3xxxmblzq1gcal2g6i"; - aarch64-darwin = "1l59fcdvynkl5kyz9bn31mld6pi89nynk1zw645rczjm940pac7p"; - armv7l-linux = "07ylija6chg6jc2zcavdr9yw1laniigw57f2gilyjynv1cgjm76r"; + x86_64-linux = "1d99kbvbd17h02m85gd8dircb39jsbifdk61w1hsvhri6dbfah8f"; + x86_64-darwin = "1bay90s0asfms4cg4hng9f4bpjyg5d884ffjrqy6mdxwyqmjyzb1"; + aarch64-linux = "0g1v26qax14fghawjqb9xbkr8kwhzwh52qz30jg3pfsixw5q5kkx"; + aarch64-darwin = "0m7b6dnfwqal20iq6nwwzvd23l5alqgbc02ih2pjflzk794fj2mf"; + armv7l-linux = "04jbcqwpbp7d89van8dq5zilfcalxwbx62yzipdzsjlmfnxf65vy"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.94.2"; + version = "1.95.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "384ff7382de624fb94dbaf6da11977bba1ecd427"; + rev = "e8653663e8840adaf45af01eab5c627a5af81807"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,8 +69,9 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1mj9fg76b9x9r6ql21hbckpni179vfa9j8fiah9rd6ih7sb72048"; + sha256 = "14vfylcx3gcx5vjdp861mjr98wq2f3242ysygpa3r5xnl8941wki"; }; + stdenv = stdenvNoCC; }; tests = { inherit (nixosTests) vscode-remote-ssh; }; diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index efdc4ff0d860..f9c25f94a4ba 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,6 +1,6 @@ { stdenv, - darwin, + apple-sdk_11, lib, fetchFromGitHub, cmake, @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.libs.xpc; + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index c35700856b60..9872a1bffdc7 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -5,6 +5,7 @@ , cmake , wrapQtAppsHook , qtbase +, qtsvg , bluez , ffmpeg , libao @@ -48,13 +49,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu-primehack"; - version = "1.0.6a"; + version = "1.0.7a"; src = fetchFromGitHub { owner = "shiiion"; repo = "dolphin"; rev = version; - hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; + hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc="; fetchSubmodules = true; }; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { fmt xz qtbase + qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez udev diff --git a/pkgs/applications/emulators/libdsk/default.nix b/pkgs/applications/emulators/libdsk/default.nix deleted file mode 100644 index a0ea910adad9..000000000000 --- a/pkgs/applications/emulators/libdsk/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libdsk"; - version = "1.5.19"; - - src = fetchurl { - url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; - sha256 = "sha256-W8w5o9rK/yCipQnfn4gMOwDZ+9WeV3G53q5h2XlevkE="; - }; - - meta = with lib; { - description = "Library for accessing discs and disc image files"; - homepage = "http://www.seasip.info/Unix/LibDsk/"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 18c510b8465b..f30d55ee4395 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -8,7 +8,7 @@ , curl , fetchFromGitHub , fetchpatch -, ffmpeg +, ffmpeg_6 , fluidsynth , fmt , freetype @@ -318,7 +318,7 @@ in citra = mkLibretroCore rec { core = "citra"; - extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ]; + extraBuildInputs = [ libGLU libGL boost ffmpeg_6 nasm ]; makefile = "Makefile"; makeFlags = [ "HAVE_FFMPEG_STATIC=0" diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix deleted file mode 100644 index c00a8eef2b8e..000000000000 --- a/pkgs/applications/emulators/sameboy/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook3, glib }: - -stdenv.mkDerivation rec { - pname = "sameboy"; - version = "0.16.6"; - - src = fetchFromGitHub { - owner = "LIJI32"; - repo = "SameBoy"; - rev = "v${version}"; - sha256 = "sha256-URth/0hMfxnBJpfA1k+UU9/jJzfte2UXeLv5JnBDGUs="; - }; - - enableParallelBuilding = true; - # glib and wrapGAppsHook3 are needed to make the Open ROM menu work. - nativeBuildInputs = [ rgbds glib wrapGAppsHook3 ]; - buildInputs = [ SDL2 ]; - - makeFlags = [ - "CONF=release" - "FREEDESKTOP=true" - "PREFIX=$(out)" - ]; - - postPatch = '' - substituteInPlace OpenDialog/gtk.c \ - --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' - ''; - - meta = with lib; { - homepage = "https://sameboy.github.io"; - description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; - mainProgram = "sameboy"; - - longDescription = '' - SameBoy is a user friendly Game Boy, Game Boy Color and Super - Game Boy emulator for macOS, Windows and Unix-like platforms. - SameBoy is extremely accurate and includes a wide range of - powerful debugging features, making it ideal for both casual - players and developers. In addition to accuracy and developer - capabilities, SameBoy has all the features one would expect from - an emulator – from save states to scaling filters. - ''; - - license = licenses.mit; - maintainers = with maintainers; [ NieDzejkob ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/applications/emulators/tamatool/default.nix deleted file mode 100644 index 82cd8e9a2528..000000000000 --- a/pkgs/applications/emulators/tamatool/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, zip -, copyDesktopItems -, libpng -, SDL2 -, SDL2_image -, darwin - -# Optionally bundle a ROM file -, rom ? null -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tamatool"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "jcrona"; - repo = "tamatool"; - rev = "v${finalAttrs.version}"; - hash = "sha256-VDmpIBuMWg3TwfCf9J6/bi/DaWip6ESAQWvGh2SH+A8="; - fetchSubmodules = true; - }; - - # * Point to the installed rom and res directory - # * Tell the user to use --rom instead of telling them to place the rom in the - # program directory (it's immutable!) - postPatch = '' - substituteInPlace src/tamatool.c \ - --replace '#define RES_PATH' "#define RES_PATH \"$out/share/tamatool/res\" //" \ - --replace '#define ROM_PATH' "#define ROM_PATH \"$out/share/tamatool/rom.bin\" //" \ - --replace '#define ROM_NOT_FOUND_MSG' '#define ROM_NOT_FOUND_MSG "You need to use the --rom option!" //' - ''; - - nativeBuildInputs = [ - zip - copyDesktopItems - ]; - - buildInputs = [ - libpng - SDL2 - SDL2_image - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - - makeFlags = [ - "-Clinux" - "VERSION=${finalAttrs.version}" - "CFLAGS+=-I${SDL2.dev}/include/SDL2" - "CFLAGS+=-I${SDL2_image}/include/SDL2" - "DIST_PATH=$(out)" - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - desktopItems = [ "linux/tamatool.desktop" ]; - - installPhase = '' - runHook preInstall - install -Dm755 linux/tamatool $out/bin/tamatool - mkdir -p $out/share/tamatool - cp -r res $out/share/tamatool/res - install -Dm644 linux/tamatool.png $out/share/icons/hicolor/128x126/apps/tamatool.png - ${lib.optionalString (rom != null) "install -Dm677 ${rom} $out/share/tamatool/rom.bin"} - runHook postInstall - ''; - - meta = with lib; { - description = "Cross-platform Tamagotchi P1 explorer"; - homepage = "https://github.com/jcrona/tamatool"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - mainProgram = "tamatool"; - }; -}) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index cff069a2e75c..a5f45b2e13e7 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -6,7 +6,7 @@ wineRelease, patches, moltenvk, - buildScript ? null, configureFlags ? [], mainProgram ? "wine" + buildScript ? null, configureFlags ? [], mainProgram ? "wine", }: with import ./util.nix { inherit lib; }; @@ -23,12 +23,10 @@ let }; } ./setup-hook-darwin.sh; - darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin ( - toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ - CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security - ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon - ]) - ); + # Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin. + # It does an availability check, so older systems will still work. + darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin (toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ])); + # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures # because they will put Darwin in `meta.badPlatforms`. darwinUnsupportedFlags = [ diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 8c8ebdea5878..8f579c35184f 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -39,7 +39,7 @@ waylandSupport ? false, x11Support ? false, embedInstallers ? false, # The Mono and Gecko MSI installers - moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily + moltenvk # Allow users to override MoltenVK easily }: let wine-build = build: release: diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 9bbe32fd298e..79975b988926 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lf"; - version = "32"; + version = "33"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-rFK1M15NcshVY2vtXcMWZhB9Rd/DRC8JyKE5u4wjh2I="; + hash = "sha256-aKvTf2tqAUbB3plOemvgJJ7qYdGfQoXhsGVE7Y9wuMo="; }; - vendorHash = "sha256-r1Kq6CYGNbxTTue3sb3CKMsWZJDzX2dKX7QHQ73nZ8g="; + vendorHash = "sha256-E6uZVsQAiwy3uGXp9COvtJSlgXhXxfS7vOfhM5uBPQw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix deleted file mode 100644 index 0a6ca746caee..000000000000 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gradle_7 -, makeWrapper -, jdk -, gsettings-desktop-schemas -}: - -let - gradle = gradle_7; -in -stdenv.mkDerivation (finalAttrs: { - pname = "mucommander"; - version = "1.3.0-1"; - - src = fetchFromGitHub { - owner = "mucommander"; - repo = "mucommander"; - rev = finalAttrs.version; - sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; - }; - - postPatch = '' - # there is no .git anyway - substituteInPlace build.gradle \ - --replace "git = grgit.open(dir: project.rootDir)" "" \ - --replace "revision = git.head().id" "revision = '${finalAttrs.version}'" - ''; - - nativeBuildInputs = [ gradle makeWrapper ]; - - mitmCache = gradle.fetchDeps { - inherit (finalAttrs) pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - gradleBuildTask = "tgz"; - - installPhase = '' - mkdir -p $out/share/mucommander - tar xvf build/distributions/mucommander-*.tgz --directory=$out/share/mucommander - - makeWrapper $out/share/mucommander/mucommander.sh $out/bin/mucommander \ - --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ - --set JAVA_HOME ${jdk} - ''; - - meta = with lib; { - homepage = "https://www.mucommander.com/"; - description = "Cross-platform file manager"; - license = licenses.gpl3; - maintainers = with maintainers; [ jiegec ]; - platforms = platforms.all; - mainProgram = "mucommander"; - }; -}) diff --git a/pkgs/applications/file-managers/mucommander/deps.json b/pkgs/applications/file-managers/mucommander/deps.json deleted file mode 100644 index 264328bca01d..000000000000 --- a/pkgs/applications/file-managers/mucommander/deps.json +++ /dev/null @@ -1,1064 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { - "jediterm#jediterm-core/3.17": { - "jar": "sha256-H+W44u9O07KMjsN6RQeX4X/XrD55JPlo7x1It5dvja8=", - "pom": "sha256-Q90WihOSMfQwY4TrVl5a6t9m23kKyvs8ZdF/clKpcug=" - }, - "jediterm#jediterm-ui/3.17": { - "jar": "sha256-7NUda5rQJjnDi+xq60mXwZKHj3i2/DCoBzzQSFT2Vhw=", - "pom": "sha256-Cc/AVJs6u5eNfJiBkAk4+/reuzup4Xl1LjvOtLXf3cg=" - }, - "pty4j#purejavacomm/0.0.11.1": { - "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", - "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s=" - } - }, - "https://plugins.gradle.org/m2": { - "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": { - "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk=" - }, - "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { - "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" - }, - "edu/sc/seis/launch4j#launch4j/2.5.4": { - "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", - "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", - "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" - }, - "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": { - "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=", - "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc=" - }, - "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { - "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" - } - }, - "https://repo.maven.apache.org/maven2": { - "ant#ant/1.6.5": { - "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", - "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" - }, - "avalon-framework#avalon-framework/4.1.5": { - "jar": "sha256-gz8eUN+mKPE9SkIGs+xtj0LpYoSjXXbActiAgEt0egQ=", - "pom": "sha256-WsHHwtsp/rJWj1xxlZpsCKbEHgZZsSa/owisdCHyysg=" - }, - "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { - "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", - "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk=" - }, - "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": { - "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=", - "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ=" - }, - "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": { - "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=", - "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE=" - }, - "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": { - "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=", - "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw=" - }, - "biz/aQute/bnd#biz.aQute.repository/6.4.0": { - "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=", - "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo=" - }, - "biz/aQute/bnd#biz.aQute.resolve/6.4.0": { - "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=", - "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4=" - }, - "ch/qos/logback#logback-classic/1.2.3": { - "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=", - "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU=" - }, - "ch/qos/logback#logback-core/1.2.3": { - "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", - "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" - }, - "ch/qos/logback#logback-parent/1.2.3": { - "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" - }, - "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { - "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", - "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" - }, - "com/athaydes/osgiaas#osgiaas-cli-core/0.7": { - "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=", - "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY=" - }, - "com/athaydes/osgiaas#osgiaas-common/0.7": { - "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", - "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" - }, - "com/beust#jcommander/1.64": { - "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", - "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" - }, - "com/beust#jcommander/1.82": { - "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", - "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", - "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" - }, - "com/dropbox/core#dropbox-core-sdk/5.2.0": { - "jar": "sha256-uo+xxTATiLSzM6JgT4hlVLJ/ATFdRsRhMfoSifMMfYA=", - "module": "sha256-U7JRv2oYUiiMl7Qzr2BdyIjmOf/EgK4jkrdhMAHaA1A=", - "pom": "sha256-MirGoEbZW6GKmqjZidQ74DYgM1JPVz+b5wiQ6oop4Bc=" - }, - "com/fasterxml#oss-parent/25": { - "pom": "sha256-3EFgl7m8Tv6JbcJWewbKuGqTZ4bSNuyyhM4t2GBymkA=" - }, - "com/fasterxml#oss-parent/33": { - "pom": "sha256-xUNwlkz8ziMZvZqF9eFPUAyFGJia5WsbR13xs0i3MQg=" - }, - "com/fasterxml#oss-parent/38": { - "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" - }, - "com/fasterxml/jackson#jackson-base/2.10.0": { - "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" - }, - "com/fasterxml/jackson#jackson-base/2.9.6": { - "pom": "sha256-+81gnH4GPoOzDc5YVVsj3uPlGdwAqqx0ceUrQUCRcyk=" - }, - "com/fasterxml/jackson#jackson-bom/2.10.0": { - "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" - }, - "com/fasterxml/jackson#jackson-bom/2.9.6": { - "pom": "sha256-9BOCmOts2HKgOORiRoAxqGA6p4SC6aIjnJFy81ci8Pg=" - }, - "com/fasterxml/jackson#jackson-parent/2.10": { - "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" - }, - "com/fasterxml/jackson#jackson-parent/2.7": { - "pom": "sha256-OJQmHGTKZDJFHjNRM9UCFgwRtXwqaVqyEgmg7113+Hs=" - }, - "com/fasterxml/jackson#jackson-parent/2.9.1.1": { - "pom": "sha256-IlykrxyJWrSEXPLSn9WsUOU4s1OAXnW7K3Shs7nYa8U=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { - "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", - "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" - }, - "com/fasterxml/jackson/core#jackson-core/2.10.0": { - "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", - "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" - }, - "com/fasterxml/jackson/core#jackson-core/2.7.9": { - "jar": "sha256-vZByFCC7iZqXTtCaEH/vQsqMx8jgVXYvbIFXYTLlu8U=", - "pom": "sha256-Y5RpKyntD9jelAX/5gr0cCz0JLMkcSXqyxUxv6olHWw=" - }, - "com/fasterxml/jackson/core#jackson-core/2.9.6": { - "jar": "sha256-+rh0au3WQneI7jkOoE1DjsFBv/frNHb4vdXZEQ+ycYo=", - "pom": "sha256-fd0tyP0KY04n4wapqoVJWczEckV5dijFC8g3F3WkLjI=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.10.0": { - "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", - "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" - }, - "com/fifesoft#rsyntaxtextarea/3.3.3": { - "jar": "sha256-BtzbujMTN/g1cBWAYe9JdFMTG6yAyFbscRQs1d1WSfo=", - "module": "sha256-gyR4XKxJ1K0GLZU5wpS+WGeWO9uhkazgLqsFGiuSEQU=", - "pom": "sha256-vPdSvzOppTP6qTd0XtOOdhbbVWWV7Doqsbeny0P5e8I=" - }, - "com/formdev#flatlaf/1.0": { - "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", - "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", - "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" - }, - "com/formdev#flatlaf/2.2": { - "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=", - "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=", - "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo=" - }, - "com/formdev#flatlaf/2.6": { - "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=", - "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", - "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" - }, - "com/github/junrar#junrar/7.5.4": { - "jar": "sha256-xZRJh80HDROp+9UVJi9LomPHLm3T+Yak1/EOrhtusM4=", - "module": "sha256-dl/GX7jryzhbcCG3J95RAAypDNMKcQm9Ed8QYv94lGk=", - "pom": "sha256-puop94MBMKrQQOMFjwNC4UBybts1QtXoDn1qZcmbAc8=" - }, - "com/github/mwiede#jsch/0.2.8": { - "jar": "sha256-0vgM9unIlvl/6UgT03ofW0zcGOF9oDFGxuFGMasb6bs=", - "pom": "sha256-CyRCnDntCWozUfpmflRNcg+M559/cRcRmTqzGHsQQGA=" - }, - "com/github/pcorless/icepdf#icepdf-core/7.0.1": { - "jar": "sha256-RBAMICxzxmPzHJ7TgHg/0G0mr9HdJAX7YL49R3r7f9g=", - "pom": "sha256-MwixlyFAVBbfn1xS+cyBUywXnlaZRaMpoleRHyxSc/o=" - }, - "com/github/pcorless/icepdf#icepdf-viewer/7.0.1": { - "jar": "sha256-cUQ/NKc4sbq51CwZnZGFZQetc+Fp2UuF8Hw5HKF27Hc=", - "pom": "sha256-ZRY98Xd643d1jG63i6nddkac8zxWBjU1vnhTvXx5Ahc=" - }, - "com/google/api-client#google-api-client-parent/1.25.0": { - "pom": "sha256-NElJWTWT7Wp7YMFmdQcr4lO3PMOAxyC5yWiT/KVhzUc=" - }, - "com/google/api-client#google-api-client/1.25.0": { - "jar": "sha256-JOGmnWwE5ucuPhZ1fUbTLap91DyzLDiV+DLyU1i+FAI=", - "pom": "sha256-xyaAUSeQpZObOW/XaPC2GXWGQj4QW4962fsetrNYTZg=" - }, - "com/google/apis#google-api-services-drive/v3-rev197-1.25.0": { - "jar": "sha256-lvAOQzAcToTxHvGJZyrOxVegIUhtcoSHvakWXqPs1L8=", - "pom": "sha256-g9+53Y56ucZWRyJcIuo3eGxFPcMTvn5Kp27ZWqRw3Ak=" - }, - "com/google/code/findbugs#jsr305/1.3.9": { - "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", - "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo=" - }, - "com/google/code/findbugs#jsr305/3.0.2": { - "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", - "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" - }, - "com/google/code/gson#gson-parent/2.9.0": { - "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" - }, - "com/google/code/gson#gson/2.9.0": { - "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", - "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" - }, - "com/google/errorprone#error_prone_annotations/2.11.0": { - "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", - "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" - }, - "com/google/errorprone#error_prone_parent/2.11.0": { - "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" - }, - "com/google/guava#failureaccess/1.0.1": { - "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", - "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" - }, - "com/google/guava#guava-parent/26.0-android": { - "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" - }, - "com/google/guava#guava-parent/30.1.1-android": { - "pom": "sha256-2Oaw8PpL9r4hc03FMPdNhpbp0Kw60n+8eSi6PY9k12E=" - }, - "com/google/guava#guava-parent/31.1-android": { - "pom": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" - }, - "com/google/guava#guava-parent/31.1-jre": { - "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" - }, - "com/google/guava#guava/30.1.1-android": { - "pom": "sha256-shjebjRaeYP+/OSaBLrxn2rONZytHISXMZDNbE2gWEY=" - }, - "com/google/guava#guava/31.1-android": { - "jar": "sha256-Mqwu1wnZbSeLXS4+XOoXj6STmTnFJftkdTLwEzCNswk=", - "pom": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" - }, - "com/google/guava#guava/31.1-jre": { - "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", - "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" - }, - "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { - "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", - "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" - }, - "com/google/http-client#google-http-client-bom/1.41.8": { - "pom": "sha256-yVh1SDQDTW6bV19FDYAINuQYkW1vNIOXqwpMmzfLhKA=" - }, - "com/google/http-client#google-http-client-gson/1.41.8": { - "jar": "sha256-FRKmpkILWW8UJXXvBFDQK7XQbo9Y4RRAT1Tfg1NfO1g=", - "pom": "sha256-MytVQtfeavHdJZ4UvOGcpfVpX18apBVC/KvtqGtYRRk=" - }, - "com/google/http-client#google-http-client-jackson2/1.25.0": { - "jar": "sha256-+efg0xiGCiCS1wtWMxl2KAxOk0igZe3juZySqgMv2FM=", - "pom": "sha256-kJ9uCYAW/9nOnr83IN+2YbxKF6qTLLTCIYNpl9whWF8=" - }, - "com/google/http-client#google-http-client-parent/1.25.0": { - "pom": "sha256-BinHEZjqaXXv6PEi72pbyqcvvtbPMMO4PMPLtkcI/as=" - }, - "com/google/http-client#google-http-client-parent/1.41.8": { - "pom": "sha256-HKVBMLDXTBxWaWEdPp9+XCXtxsSKMJCcMjDi4Jld7Vw=" - }, - "com/google/http-client#google-http-client/1.41.8": { - "jar": "sha256-mfps8okNuo1yUIo/1wEhHlXaZsgSBZGXcibkTVf18Bc=", - "pom": "sha256-3tTlt+Us2xmGB+rfh6huKKmSbEC/fKao9UZ5kWyfdvI=" - }, - "com/google/j2objc#j2objc-annotations/1.3": { - "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", - "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" - }, - "com/google/oauth-client#google-oauth-client-java6/1.34.0": { - "jar": "sha256-zWbH9vnIzmFFPRL05/iComFqAyOeqTf9D86G7bUWKMU=", - "pom": "sha256-+WIvkogQedMf7W2DjC4eyR3DmOqKots9y60o6JDxYk8=" - }, - "com/google/oauth-client#google-oauth-client-jetty/1.34.0": { - "jar": "sha256-p97u4NDKLERAyRI95uV6jznV4ZglyYrscgSatE7EIs4=", - "pom": "sha256-hz/FGUgZeoSiBbUpQ/KoWYiJdJV/awRxaJYrlpobZqA=" - }, - "com/google/oauth-client#google-oauth-client-parent/1.34.0": { - "pom": "sha256-Pq1EPY3oIipV15kAq6aeIhnL7GhRmlelqmOzdMS4FqA=" - }, - "com/google/oauth-client#google-oauth-client/1.34.0": { - "jar": "sha256-QCDi9jQvFR55cYfoQzuS0ZpAs6SAHyKrg4nXBhXRcNI=", - "pom": "sha256-DJ03VEuUcRXdzOoUiV0ZpgmEEKcrDD1FGy2KWzkDGDg=" - }, - "com/googlecode/javaewah#JavaEWAH/1.1.13": { - "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", - "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" - }, - "com/googlecode/json-simple#json-simple/1.1.1": { - "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", - "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" - }, - "com/googlecode/plist#dd-plist/1.23": { - "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=", - "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM=" - }, - "com/ibm/icu#icu4j/59.2": { - "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=", - "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0=" - }, - "com/jamesmurty/utils#java-xmlbuilder/1.1": { - "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", - "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" - }, - "com/sun/activation#all/1.2.0": { - "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" - }, - "com/sun/activation#javax.activation/1.2.0": { - "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", - "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" - }, - "com/thoughtworks/xstream#xstream-parent/1.4.19": { - "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" - }, - "com/thoughtworks/xstream#xstream/1.4.19": { - "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", - "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" - }, - "com/twelvemonkeys#twelvemonkeys/3.9.4": { - "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" - }, - "com/twelvemonkeys/common#common-image/3.9.4": { - "jar": "sha256-pfQZkdJJLyjOTwS4Kr//uJ9f+p38h/TljxDVJuW6SoM=", - "pom": "sha256-8e4RuOVYMAMujk1Zi2EoHjXnZ0+N2adwFGpxOaDOPkE=" - }, - "com/twelvemonkeys/common#common-io/3.9.4": { - "jar": "sha256-zHwnlHvyGnX7w9YT55vdhhmQjme4jMfXMJGlWHbk/Tg=", - "pom": "sha256-CsHg6dQkTPzshRxVmIXUi4RZGGEQh63lSc3V1e6rsWI=" - }, - "com/twelvemonkeys/common#common-lang/3.9.4": { - "jar": "sha256-pSG3l9WPZbgPqMo2XZWRFiJAjKsiD9XYUhaYBfZArL0=", - "pom": "sha256-mS8V1Ni9Bv+g5GYY7FV5wqvSizgmDLPljY3wGJ4YjJM=" - }, - "com/twelvemonkeys/common#common/3.9.4": { - "pom": "sha256-eMLMiO9JfTKBbZrtHWZ0YYWwk4ANvICJDFJqweuwWQE=" - }, - "com/twelvemonkeys/imageio#imageio-core/3.9.4": { - "jar": "sha256-JEhDp7yOz277IKpfgX6Xet2vs/awznA5Oz5tEQlZH64=", - "pom": "sha256-bkmhULWKTlKRmufie0l2KCI1JF44gdqMTuPipOj7eBc=" - }, - "com/twelvemonkeys/imageio#imageio-metadata/3.9.4": { - "jar": "sha256-WAozT44gyZ/5En+psAIrDwKpgbRuazjg3zkwUjKaYyQ=", - "pom": "sha256-VmIGSg5hQybZFjeDeRi/kdT9MiDN7yN5N/xQojyZLtU=" - }, - "com/twelvemonkeys/imageio#imageio-psd/3.9.4": { - "jar": "sha256-LB+jMxlkYUDbQw/PNohyRIO+0Asd4Ze3ZGs29aFu1ok=", - "pom": "sha256-smU8jX25W0PnzV94pCx18xJTGHNMsofkXDMHztIu3IU=" - }, - "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { - "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", - "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" - }, - "com/twelvemonkeys/imageio#imageio/3.9.4": { - "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" - }, - "commons-beanutils#commons-beanutils/1.9.4": { - "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", - "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" - }, - "commons-cli#commons-cli/1.2": { - "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=", - "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE=" - }, - "commons-codec#commons-codec/1.11": { - "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", - "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" - }, - "commons-codec#commons-codec/1.17.0": { - "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" - }, - "commons-codec#commons-codec/1.3": { - "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", - "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY=" - }, - "commons-codec#commons-codec/1.9": { - "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", - "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" - }, - "commons-codec/commons-codec/maven-metadata": { - "xml": { - "groupId": "commons-codec", - "lastUpdated": "20240427124755", - "release": "1.17.0" - } - }, - "commons-collections#commons-collections/3.2.2": { - "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", - "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" - }, - "commons-el#commons-el/1.0": { - "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", - "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" - }, - "commons-httpclient#commons-httpclient/3.0.1": { - "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4=" - }, - "commons-httpclient#commons-httpclient/3.1": { - "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=", - "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw=" - }, - "commons-logging#commons-logging/1.2": { - "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", - "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" - }, - "commons-net#commons-net/1.4.1": { - "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", - "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" - }, - "commons-net#commons-net/3.8.0": { - "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=", - "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k=" - }, - "eu/agno3/jcifs#jcifs-ng/2.1.7": { - "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", - "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" - }, - "hsqldb#hsqldb/1.8.0.10": { - "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", - "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" - }, - "io/github/x-stream#mxparser/1.2.2": { - "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", - "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" - }, - "io/grpc#grpc-context/1.27.2": { - "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", - "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" - }, - "io/opencensus#opencensus-api/0.31.0": { - "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=", - "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk=" - }, - "io/opencensus#opencensus-contrib-http-util/0.31.0": { - "jar": "sha256-vMbNebAMLCqln8KgLUCUEIMAWFDrtS2X1jkI0253r9M=", - "pom": "sha256-fvy/lNXcYnWCw/4LjEgz5N08vF0vEvpx7yko9MOoWgg=" - }, - "javax/activation#activation/1.1.1": { - "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", - "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" - }, - "javax/jws#javax.jws-api/1.1": { - "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", - "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" - }, - "javax/xml#jaxrpc-api/1.1": { - "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", - "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" - }, - "javax/xml/bind#jaxb-api/2.2.9": { - "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=", - "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0=" - }, - "javax/xml/soap#javax.xml.soap-api/1.3.5": { - "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=", - "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU=" - }, - "javax/xml/ws#jaxws-api/2.2.12": { - "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=", - "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco=" - }, - "jline#jline/2.14.2": { - "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=", - "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c=" - }, - "junit#junit/4.10": { - "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", - "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" - }, - "junit#junit/4.12": { - "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", - "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" - }, - "junit#junit/4.5": { - "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", - "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" - }, - "log4j#log4j/1.2.17": { - "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", - "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" - }, - "net/iharder#base64/2.3.8": { - "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", - "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA=" - }, - "net/java#jvnet-parent/1": { - "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "net/java#jvnet-parent/4": { - "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" - }, - "net/java#jvnet-parent/5": { - "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" - }, - "net/java/dev/jets3t#jets3t/0.7.1": { - "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=", - "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs=" - }, - "net/java/dev/jets3t#jets3t/0.9.4": { - "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", - "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" - }, - "net/java/dev/jna#jna-platform/5.10.0": { - "jar": "sha256-H3Gv2XcFG/AQnvXjdn1OKv13e+iU2JeIzA84rWj2oW8=", - "pom": "sha256-5Kho919p2VQvw5nczcs5mxDB/8hJUlUJvoJOM7IbApU=" - }, - "net/java/dev/jna#jna-platform/5.12.1": { - "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", - "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" - }, - "net/java/dev/jna#jna-platform/5.5.0": { - "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", - "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" - }, - "net/java/dev/jna#jna/5.10.0": { - "jar": "sha256-4zXBBnn3QyB9gixfeUjpMDGYNUkldanbprlPijuW/Mg=", - "pom": "sha256-B3PdO7r1MF5MDIL+NFzF1Mjp+tYjAqVVEYAj9ePq4xY=" - }, - "net/java/dev/jna#jna/5.12.1": { - "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", - "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" - }, - "net/java/dev/jna#jna/5.5.0": { - "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", - "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" - }, - "net/sf/kosmosfs#kfs/0.3": { - "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", - "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" - }, - "net/sf/launch4j#launch4j/3.14": { - "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" - }, - "net/sf/launch4j#launch4j/3.14/core": { - "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" - }, - "net/sf/launch4j#launch4j/3.14/workdir-linux64": { - "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" - }, - "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { - "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", - "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" - }, - "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { - "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", - "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" - }, - "org/ajoberstar/grgit#grgit-core/5.0.0": { - "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=", - "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=", - "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw=" - }, - "org/ajoberstar/grgit#grgit-gradle/5.0.0": { - "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=", - "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=", - "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY=" - }, - "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { - "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache#apache/16": { - "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" - }, - "org/apache#apache/17": { - "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" - }, - "org/apache#apache/18": { - "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" - }, - "org/apache#apache/19": { - "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" - }, - "org/apache#apache/21": { - "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, - "org/apache#apache/4": { - "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" - }, - "org/apache#apache/9": { - "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" - }, - "org/apache/commons#commons-compress/1.20": { - "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", - "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" - }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" - }, - "org/apache/commons#commons-parent/11": { - "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" - }, - "org/apache/commons#commons-parent/32": { - "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" - }, - "org/apache/commons#commons-parent/34": { - "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" - }, - "org/apache/commons#commons-parent/39": { - "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" - }, - "org/apache/commons#commons-parent/42": { - "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" - }, - "org/apache/commons#commons-parent/47": { - "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" - }, - "org/apache/commons#commons-parent/48": { - "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" - }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" - }, - "org/apache/commons#commons-vfs2-project/2.3": { - "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" - }, - "org/apache/commons#commons-vfs2/2.3": { - "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=", - "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY=" - }, - "org/apache/felix#felix-parent/2.1": { - "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY=" - }, - "org/apache/felix#felix-parent/4": { - "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg=" - }, - "org/apache/felix#felix-parent/6": { - "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" - }, - "org/apache/felix#org.apache.felix.framework/7.0.5": { - "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", - "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" - }, - "org/apache/felix#org.apache.felix.main/7.0.5": { - "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=", - "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0=" - }, - "org/apache/felix#org.apache.felix.scr/2.0.12": { - "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=", - "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI=" - }, - "org/apache/felix#org.apache.felix.shell/1.4.3": { - "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=", - "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY=" - }, - "org/apache/hadoop#hadoop-core/0.20.2": { - "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=", - "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4=" - }, - "org/apache/httpcomponents#httpclient/4.5": { - "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=", - "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s=" - }, - "org/apache/httpcomponents#httpclient/4.5.13": { - "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", - "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5": { - "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5.13": { - "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" - }, - "org/apache/httpcomponents#httpcomponents-core/4.4.1": { - "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI=" - }, - "org/apache/httpcomponents#httpcomponents-core/4.4.15": { - "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" - }, - "org/apache/httpcomponents#httpcomponents-parent/11": { - "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" - }, - "org/apache/httpcomponents#httpcore/4.4.1": { - "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=", - "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM=" - }, - "org/apache/httpcomponents#httpcore/4.4.15": { - "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", - "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" - }, - "org/apache/httpcomponents#project/7": { - "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" - }, - "org/apache/pdfbox#fontbox/2.0.27": { - "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", - "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" - }, - "org/apache/pdfbox#jbig2-imageio/3.0.4": { - "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", - "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" - }, - "org/apache/pdfbox#pdfbox-parent/2.0.27": { - "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" - }, - "org/bouncycastle#bcpkix-jdk15on/1.70": { - "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", - "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" - }, - "org/bouncycastle#bcprov-ext-jdk15on/1.70": { - "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", - "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" - }, - "org/bouncycastle#bcprov-jdk15on/1.52": { - "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", - "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA=" - }, - "org/bouncycastle#bcprov-jdk15on/1.69": { - "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", - "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" - }, - "org/bouncycastle#bcprov-jdk15on/1.70": { - "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", - "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" - }, - "org/bouncycastle#bcutil-jdk15on/1.70": { - "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", - "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" - }, - "org/checkerframework#checker-qual/3.12.0": { - "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", - "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", - "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" - }, - "org/checkerframework#checker-qual/3.24.0": { - "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=", - "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", - "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" - }, - "org/codehaus#codehaus-parent/3": { - "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" - }, - "org/codehaus/jackson#jackson-core-asl/1.9.13": { - "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", - "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" - }, - "org/codehaus/jackson#jackson-mapper-asl/1.9.13": { - "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", - "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" - }, - "org/codehaus/mojo#animal-sniffer-annotations/1.9": { - "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", - "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" - }, - "org/codehaus/mojo#animal-sniffer-parent/1.9": { - "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" - }, - "org/codehaus/mojo#mojo-parent/28": { - "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" - }, - "org/eclipse/jdt#core/3.1.1": { - "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", - "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" - }, - "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { - "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" - }, - "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": { - "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", - "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" - }, - "org/exbin/bined#bined-core/0.2.0": { - "jar": "sha256-V+URrCaEsKKGtEI5NrX6Itc2UJ/MqRLLgFmvYGKktAM=", - "pom": "sha256-Jl0xEBR+SbRNns8W4cQdbQMItCvteFcuhav7DPWQiwM=" - }, - "org/exbin/bined#bined-extended/0.2.0": { - "jar": "sha256-zSqJKG0pQ09mz7/mYXWT8CG8QE7xqOUqwpF8QtBhYA8=", - "pom": "sha256-zWZRTzYvH/3JLQPSf4dL+2hmD2lx+5d79jO4LLz1MLY=" - }, - "org/exbin/bined#bined-highlight-swing/0.2.0": { - "jar": "sha256-mInT2MV+iH3NP063uXwjAb5TKumnNnqZa7lv8nutGG8=", - "pom": "sha256-yS9O78KNIZ5Z1GsxQCimeidtrHwmMHOP1YybD81FznA=" - }, - "org/exbin/bined#bined-operation-swing/0.2.0": { - "jar": "sha256-RTyGSbiv+h2dTmC7ob/Y0gKa9/IWweTZhiBH3sWFQC0=", - "pom": "sha256-VX1ftIJE/Jr4ld421jJvS0f5t6gHDUMode6l/9bdTyc=" - }, - "org/exbin/bined#bined-operation/0.2.0": { - "jar": "sha256-rFVLd5DdXoFzEoGkohFvYk902VQNs5hq/AT07EQppag=", - "pom": "sha256-o1y6AYkmzfs0pveozWSz8idrPNDHU2Nr7O8CyD2PxU0=" - }, - "org/exbin/bined#bined-swing-extended/0.2.0": { - "jar": "sha256-FslY+vbzPtW+OytscgHfI1FHIdIl1X4CubCd1yyXIys=", - "pom": "sha256-h/WxZiFbKaoAZH2uVaC8P8b8SmcLpCqlHe3Djtz5YA8=" - }, - "org/exbin/bined#bined-swing/0.2.0": { - "jar": "sha256-9az+O66PgOCt3LGWTDqdRfjk7njp+6/z+bNIvAKA8NY=", - "pom": "sha256-EcPobxsauuBDTGvaia9bDEBHyNzGYEsfN6QK4UNs+ho=" - }, - "org/glassfish#glassfish-parent/10.0-b28": { - "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" - }, - "org/glassfish#javaee-api/10.0-b28": { - "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU=" - }, - "org/glassfish#javax.xml.soap/10.0-b28": { - "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=", - "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI=" - }, - "org/glassfish#pom/2": { - "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4=" - }, - "org/hamcrest#hamcrest-core/1.1": { - "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", - "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.1": { - "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/jetbrains#annotations/20.1.0": { - "jar": "sha256-7cjj7JeWpfQcGuRLLTGFB+5qwSEvEh2T0zaZs9Cv9jg=", - "pom": "sha256-RKoM0kV47KB8dgMdQsQv+8rmHOwxMFdeIxlparBUgQQ=" - }, - "org/jetbrains#annotations/23.0.0": { - "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", - "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" - }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { - "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", - "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { - "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", - "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" - }, - "org/jetbrains/pty4j#pty4j/0.12.3": { - "jar": "sha256-j0VqkehguhKfPlwOlM6/WEmqN8pAEanXSYOaZjL6xrs=", - "module": "sha256-G7L2GjoEPAQaUDGEZOrzptK+J/JkNTeK/F1My2uZlb0=", - "pom": "sha256-GValtB7ec6dC0Tu8vBFZXaZdQJaAleM342qSi4vjbb4=" - }, - "org/jmdns#jmdns/3.5.5": { - "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", - "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" - }, - "org/junit#junit-bom/5.10.2": { - "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", - "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" - }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, - "org/mortbay/jetty#jetty-parent/7": { - "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" - }, - "org/mortbay/jetty#jetty-util/6.1.14": { - "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=", - "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ=" - }, - "org/mortbay/jetty#jetty/6.1.14": { - "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=", - "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU=" - }, - "org/mortbay/jetty#jsp-2.1/6.1.14": { - "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=", - "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y=" - }, - "org/mortbay/jetty#jsp-api-2.1/6.1.14": { - "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=", - "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk=" - }, - "org/mortbay/jetty#project/6.1.14": { - "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4=" - }, - "org/mortbay/jetty#servlet-api-2.5/6.1.14": { - "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=", - "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E=" - }, - "org/osgi#org.osgi.dto/1.0.0": { - "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", - "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" - }, - "org/osgi#org.osgi.framework/1.8.0": { - "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", - "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" - }, - "org/osgi#org.osgi.resource/1.0.0": { - "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", - "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" - }, - "org/osgi#org.osgi.service.coordinator/1.0.2": { - "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", - "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" - }, - "org/osgi#org.osgi.service.log/1.3.0": { - "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", - "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" - }, - "org/osgi#org.osgi.service.repository/1.1.0": { - "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", - "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" - }, - "org/osgi#org.osgi.service.resolver/1.1.1": { - "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", - "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" - }, - "org/osgi#org.osgi.util.function/1.2.0": { - "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", - "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" - }, - "org/osgi#org.osgi.util.promise/1.2.0": { - "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", - "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" - }, - "org/osgi#org.osgi.util.tracker/1.5.4": { - "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", - "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" - }, - "org/osgi#osgi.annotation/8.0.1": { - "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", - "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" - }, - "org/osgi#osgi.core/8.0.0": { - "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=", - "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M=" - }, - "org/ovirt/engine/api#java-sdk-parent/4.4.5": { - "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw=" - }, - "org/ovirt/engine/api#sdk/4.4.5": { - "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", - "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" - }, - "org/slf4j#slf4j-api/1.7.25": { - "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" - }, - "org/slf4j#slf4j-api/1.7.30": { - "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", - "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" - }, - "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", - "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" - }, - "org/slf4j#slf4j-parent/1.7.25": { - "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" - }, - "org/slf4j#slf4j-parent/1.7.30": { - "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" - }, - "org/slf4j#slf4j-parent/1.7.36": { - "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" - }, - "org/sonatype/oss#oss-parent/5": { - "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - }, - "org/testng#testng/6.11": { - "jar": "sha256-VdWJesCTOQEO7SBREkMJpxJ5iNgv8GNCKJJtUdo1QPY=", - "pom": "sha256-mLAN2VtnH6U7TZjnzR5+/I2CfNdrEPW0uZjk07XN9JE=" - }, - "org/tukaani#xz/1.9": { - "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", - "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" - }, - "org/unix4j#unix4j-base/0.6": { - "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=", - "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U=" - }, - "org/unix4j#unix4j-command/0.6": { - "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=", - "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko=" - }, - "org/unix4j#unix4j-core/0.6": { - "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM=" - }, - "org/unix4j#unix4j/0.6": { - "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw=" - }, - "org/violetlib#jnr/11": { - "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=", - "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4=" - }, - "org/violetlib#vappearances/3": { - "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", - "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" - }, - "org/violetlib#vaqua/10": { - "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", - "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" - }, - "org/yaml#snakeyaml/1.17": { - "jar": "sha256-Vmazb520bwbdWhnXO7/ztYjVlpwPS4hI/eD17ISUMKU=", - "pom": "sha256-2sbaZNJ6+/QXByGGcQTLB3iRGMR9YjhXLP9F1mmNMbc=" - }, - "oro#oro/2.0.8": { - "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", - "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" - }, - "tomcat#jasper-compiler/5.5.12": { - "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", - "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" - }, - "tomcat#jasper-runtime/5.5.12": { - "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=", - "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA=" - }, - "xmlenc#xmlenc/0.52": { - "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=", - "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ=" - }, - "xmlpull#xmlpull/1.1.3.1": { - "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", - "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" - } - }, - "https://repository.jboss.org/maven2/javax": { - "activation#activation/1.1.1": { - "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", - "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q=" - }, - "xml#jaxrpc-api/1.1": { - "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", - "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto=" - }, - "xml/soap#saaj-api/1.3": { - "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", - "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" - } - } -} diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix deleted file mode 100644 index 092e86edcb66..000000000000 --- a/pkgs/applications/gis/gmt/dcw.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "dcw-gmt"; - version = "2.1.2"; - src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; - sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; - }; - - installPhase = '' - mkdir -p $out/share/dcw-gmt - cp -rv ./* $out/share/dcw-gmt - ''; - - meta = with lib; { - homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; - description = "Vector basemap of the world, for use with GMT"; - longDescription = '' - DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap - of the world, available from the Princeton University Digital Map and - Geospatial Information Center. It contains more state boundaries (the - largest 8 countries are now represented) than the original data - source. Information about DCW can be found on Wikipedia - (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is - for use by GMT, the Generic Mapping Tools. - ''; - license = licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); - }; - -} diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix deleted file mode 100644 index 2f2528ff5bb9..000000000000 --- a/pkgs/applications/gis/gmt/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - curl, - Accelerate, - CoreGraphics, - CoreVideo, - fftwSinglePrec, - netcdf, - libxml2, - pcre, - gdal, - blas, - lapack, - glibc, - ghostscript, - dcw-gmt, - gshhg-gmt, -}: - -/* - The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output -*/ - -let - # Certainly not an ideal situation, See: - # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 - netcdf' = netcdf.override { - libxml2 = libxml2.override { - enableHttp = true; - }; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "gmt"; - version = "6.5.0"; - src = fetchFromGitHub { - owner = "GenericMappingTools"; - repo = "gmt"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = - [ - curl - gdal - netcdf' - pcre - dcw-gmt - gshhg-gmt - ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - Accelerate - CoreGraphics - CoreVideo - ] - else - [ - glibc - fftwSinglePrec - blas - lapack - ] - ); - - propagatedBuildInputs = [ - ghostscript - ]; - - cmakeFlags = - [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ]; - - meta = { - homepage = "https://www.generic-mapping-tools.org"; - description = "Tools for manipulating geographic and cartesian data sets"; - longDescription = '' - GMT is an open-source collection of command-line tools for manipulating - geographic and Cartesian data sets (including filtering, trend fitting, - gridding, projecting, etc.) and producing high-quality illustrations - ranging from simple x–y plots via contour maps to artificially illuminated - surfaces and 3D perspective views. It supports many map projections and - transformations and includes supporting data such as coastlines, rivers, - and political boundaries and optionally country polygons. - ''; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); - }; - -}) diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix deleted file mode 100644 index d51f1dbbcb5a..000000000000 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gshhg-gmt"; - version = "2.3.7"; - src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz"; - sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f"; - }; - - installPhase = '' - mkdir -p $out/share/gshhg-gmt - cp -rv ./* $out/share/gshhg-gmt - ''; - - meta = with lib; { - homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/"; - description = "High-resolution shoreline data set, for use with GMT"; - longDescription = '' - GSHHG is a high-resolution shoreline data set amalgamated from two - databases: Global Self-consistent Hierarchical High-resolution Shorelines - (GSHHS) and CIA World Data Bank II (WDBII). GSHHG contains vector - descriptions at five different resolutions of land outlines, lakes, - rivers, and political boundaries. This data is for use by GMT, the Generic - Mapping Tools. - ''; - license = licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); - }; - -} diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 199595a65838..1409410d07ac 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; description = "Advanced geospatial data analysis platform"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ mpickering ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ mpickering ]); }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index aa613ef09ae9..fd45ff16d257 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -24,6 +24,7 @@ , openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg , libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp , libheifSupport ? true, libheif +, fftwSupport ? true, fftw , potrace , coreutils , curl @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature libjxlSupport "jxl") (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") + (lib.withFeature fftwSupport "fftw") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM "--enable-static" "--disable-shared" @@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional lcms2Support lcms2 ++ lib.optional libX11Support libX11 ++ lib.optional libXtSupport libXt - ++ lib.optional libwebpSupport libwebp; + ++ lib.optional libwebpSupport libwebp + ++ lib.optional fftwSupport fftw; postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) @@ -146,7 +149,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; [ dotlambda rhendric ]; + maintainers = with maintainers; [ dotlambda rhendric bloxx12 ]; license = licenses.asl20; mainProgram = "magick"; }; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix deleted file mode 100644 index e9ab27660605..000000000000 --- a/pkgs/applications/graphics/avocode/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme -, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon -}: - -stdenv.mkDerivation rec { - pname = "avocode"; - version = "4.15.6"; - - src = fetchurl { - url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; - }; - - libPath = lib.makeLibraryPath (with xorg; [ - stdenv.cc.cc.lib - at-spi2-core.out - gdk-pixbuf - glib - gtk3 - atk - at-spi2-atk - pango - cairo - freetype - fontconfig - dbus - nss - nspr - alsa-lib - cups - expat - udev - libX11 - libxcb - libxshmfence - libxkbcommon - libXi - libXcursor - libXdamage - libXrandr - libXcomposite - libXext - libXfixes - libXrender - libXtst - libXScrnSaver - libuuid - libdrm - mesa - ]); - - desktopItem = makeDesktopItem { - name = "Avocode"; - exec = "avocode"; - icon = "avocode"; - desktopName = "Avocode"; - genericName = "Design Inspector"; - categories = [ "Development" ]; - comment = "The bridge between designers and developers"; - }; - - nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; - buildInputs = [ gtk3 adwaita-icon-theme ]; - - # src is producing multiple folder on unzip so we must - # override unpackCmd to extract it into newly created folder - unpackCmd = '' - mkdir out - unzip $curSrc -d out - ''; - - installPhase = '' - substituteInPlace avocode.desktop.in \ - --replace /path/to/avocode-dir/Avocode $out/bin/avocode \ - --replace /path/to/avocode-dir/avocode.png avocode - - mkdir -p share/applications share/pixmaps - mv avocode.desktop.in share/applications/avocode.desktop - mv avocode.png share/pixmaps/ - - rm resources/cjpeg - cp -av . $out - - mkdir $out/bin - ln -s $out/avocode $out/bin/avocode - ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-rpath ${libPath}:$out/ $file || true - done - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://avocode.com/"; - description = "Bridge between designers and developers"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ megheaiulian ]; - }; -} diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix deleted file mode 100644 index 3d8cf49711c8..000000000000 --- a/pkgs/applications/graphics/fiji/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, autoPatchelfHook -, jdk11 -, makeDesktopItem -, copyDesktopItems -, runtimeShell -, unzip -}: - -stdenv.mkDerivation rec { - pname = "fiji"; - version = "20240614-2117"; - - src = fetchurl { - url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; - sha256 = "sha256-OCNnN8CYniNEIfKRHRBoJ3Fo+u5AwXoPJAzUCc4P+f0="; - }; - - dontBuild = true; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; - buildInputs = [ stdenv.cc.cc.lib ]; - - desktopItems = [ - (makeDesktopItem { - name = "fiji"; - exec = "fiji %F"; - tryExec = "fiji"; - icon = "fiji"; - mimeTypes = [ "image/*" ]; - comment = "Scientific Image Analysis"; - desktopName = "Fiji Is Just ImageJ"; - genericName = "Fiji Is Just ImageJ"; - categories = [ "Education" "Science" "ImageProcessing" ]; - startupNotify = true; - startupWMClass = "fiji-Main"; - }) - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,fiji,share/pixmaps} - - cp -R * $out/fiji - rm -f $out/fiji/jars/imagej-updater-*.jar - - # Don't create a local desktop entry and avoid deprecated garbage - # collection option - cat < $out/bin/.fiji-launcher-hack - #!${runtimeShell} - exec \$($out/fiji/ImageJ-linux64 --default-gc --dry-run "\$@") - EOF - chmod +x $out/bin/.fiji-launcher-hack - - makeWrapper $out/bin/.fiji-launcher-hack $out/bin/fiji \ - --prefix PATH : ${lib.makeBinPath [ jdk11 ]} \ - --set JAVA_HOME ${jdk11.home} - - ln $out/fiji/images/icon.png $out/share/pixmaps/fiji.png - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://imagej.net/software/fiji/"; - description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; - mainProgram = "fiji"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ davisrichard437 ]; - }; -} diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix deleted file mode 100644 index d816adeb26ad..000000000000 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ stdenv -, lib -, fetchurl -, at-spi2-core -, babl -, dbus -, desktop-file-utils -, dleyna-renderer -, gdk-pixbuf -, gegl -, geocode-glib_2 -, gettext -, gexiv2 -, glib -, gnome-online-accounts -, gnome -, gobject-introspection -, gsettings-desktop-schemas -, gtk3 -, itstool -, libdazzle -, libportal-gtk3 -, libhandy -, libxml2 -, meson -, ninja -, nixosTests -, pkg-config -, python3 -, tracker -, tracker-miners -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-photos"; - version = "44.0"; - - outputs = [ "out" "installedTests" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "544hA5fTxigJxs1VIdpuzLShHd6lvyr4YypH9Npcgp4="; - }; - - patches = [ - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - gobject-introspection # for setup hook - glib # for setup hook - itstool - libxml2 - meson - ninja - pkg-config - (python3.withPackages (pkgs: with pkgs; [ - dogtail - pygobject3 - pyatspi - ])) - wrapGAppsHook3 - ]; - - buildInputs = [ - babl - dbus - dleyna-renderer - gdk-pixbuf - gegl - geocode-glib_2 - gexiv2 - glib - gnome-online-accounts - gsettings-desktop-schemas - gtk3 - libdazzle - libportal-gtk3 - libhandy - tracker - tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema - - at-spi2-core # for tests - ]; - - mesonFlags = [ - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - patchShebangs tests/basic.py - ''; - - postFixup = '' - wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - - tests = { - installed-tests = nixosTests.installed-tests.gnome-photos; - }; - }; - - meta = with lib; { - description = "Access, organize and share your photos"; - mainProgram = "gnome-photos"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-photos"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f4740c7d9d23..3e05dd0c025e 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "591"; + version = "595"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-JhCnSNmCOEJdM5aEPpYWLpKy/EQ9BoN1A/aUAaILWtQ="; + hash = "sha256-bIUtFpAMCIeLAyGXi4Rgn8FmijN5NwbkC31JoVyjNdg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix index 3aef4497e1cf..3a121a9bfde0 100644 --- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -23,14 +23,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "inkscape-silhouette"; - version = "1.28"; + version = "1.29"; format = "setuptools"; src = fetchFromGitHub { owner = "fablabnbg"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-uNVhdkZFadL7QNlCsXq51TbhzRKH9KYDPDNCFhw3cQs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0="; }; patches = [ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 131881341f79..aa12c5861f2e 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , makeDesktopItem -, fetchurl +, fetchFromGitHub , pkg-config , copyDesktopItems , cairo @@ -23,11 +23,13 @@ stdenv.mkDerivation rec { pname = "ipe"; - version = "7.2.27"; + version = "7.2.30"; - src = fetchurl { - url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz"; - sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU="; + src = fetchFromGitHub { + owner = "otfried"; + repo = "ipe"; + rev = "refs/tags/v${version}"; + hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE="; }; nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ]; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 35ec592d24cc..564be8f10593 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) alsa-lib gstreamer gst-plugins-base diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix deleted file mode 100644 index f2c7aa843dbc..000000000000 --- a/pkgs/applications/graphics/oculante/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cmake -, pkg-config -, openssl -, fontconfig -, nasm -, libX11 -, libXcursor -, libXrandr -, libXi -, libGL -, libxkbcommon -, wayland -, stdenv -, gtk3 -, darwin -, perl -, wrapGAppsHook3 -}: - -rustPlatform.buildRustPackage rec { - pname = "oculante"; - version = "0.8.23"; - - src = fetchFromGitHub { - owner = "woelper"; - repo = "oculante"; - rev = version; - hash = "sha256-Dg1FFB9WVB4SWInSyOYb1TCPAtCa9gwsFLUX+UhL4DY="; - }; - - cargoHash = "sha256-Ze3ACs9WyoxNsaeJlZWhR0g+aFsntwNLLYbw2RnmwfE="; - - nativeBuildInputs = [ - cmake - pkg-config - nasm - perl - wrapGAppsHook3 - ]; - - buildInputs = [ - openssl - fontconfig - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libGL - libX11 - libXcursor - libXi - libXrandr - gtk3 - - libxkbcommon - wayland - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; - - checkFlags = [ - "--skip=bench" - "--skip=tests::net" # requires network access - ]; - - postInstall = '' - install -Dm444 $src/res/oculante.png -t $out/share/icons/hicolor/128x128/apps/ - install -Dm444 $src/res/oculante.desktop -t $out/share/applications - wrapProgram $out/bin/oculante \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL]} - ''; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Minimalistic crossplatform image viewer written in Rust"; - homepage = "https://github.com/woelper/oculante"; - changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - mainProgram = "oculante"; - maintainers = with maintainers; [ dit7ya figsoda ]; - }; -} diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 4b7b6f9b6a47..96d9ddd0ab21 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -37,7 +37,7 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) stdenv.cc.cc ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index c034e23d4a78..a6692b350f3c 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) stdenv.cc libGL libpulseaudio @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchelf ./installer \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.cc.cc.lib}/lib + --set-rpath ${lib.getLib stdenv.cc.cc}/lib ''; dontConfigure = true; diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix deleted file mode 100644 index 3d54b41290f7..000000000000 --- a/pkgs/applications/graphics/pureref/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, appimageTools, runCommand, curl, gnugrep, cacert }: - -appimageTools.wrapType1 rec { - pname = "pureref"; - version = "2.0.3"; - - src = runCommand "PureRef-${version}_x64.Appimage" { - nativeBuildInputs = [ curl gnugrep cacert ]; - outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM="; - } '' - key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" - curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out - ''; - - meta = with lib; { - description = "Reference Image Viewer"; - homepage = "https://www.pureref.com"; - license = licenses.unfree; - maintainers = with maintainers; [ elnudev ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - }; -} diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix deleted file mode 100644 index 93e179d867d9..000000000000 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract }: - -stdenv.mkDerivation rec { - pname = "libsane-dsseries"; - version = "1.0.5-1"; - - src = fetchurl { - url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm"; - sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq"; - }; - - nativeBuildInputs = [ rpmextract ]; - - unpackCmd = '' - mkdir ${pname}-${version} && pushd ${pname}-${version} - rpmextract $curSrc - popd - ''; - - patchPhase = '' - substituteInPlace etc/udev/rules.d/50-Brother_DSScanner.rules \ - --replace 'GROUP="users"' 'GROUP="scanner", ENV{libsane_matched}="yes"' - - mkdir -p etc/sane.d/dll.d - echo "dsseries" > etc/sane.d/dll.d/dsseries.conf - ''; - - installPhase = '' - mkdir -p $out - cp -dr etc $out - cp -dr usr/lib64 $out/lib - ''; - - preFixup = '' - for f in `find $out/lib/sane/ -type f`; do - # Make it possible to find libstdc++.so.6 - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:$out/lib/sane $f - - # Horrible kludge: The driver hardcodes /usr/lib/sane/ as a dlopen path. - # We can directly modify the binary to force a relative lookup instead. - # The new path is NULL-padded to the same length as the original path. - sed -i "s|/usr/lib/sane/%s|%s\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00|g" $f - done - ''; - - meta = { - description = "Brother DSSeries SANE backend driver"; - homepage = "http://www.brother.com"; - platforms = lib.platforms.linux; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ callahad ]; - }; -} diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix deleted file mode 100644 index eb6c6839bc5b..000000000000 --- a/pkgs/applications/graphics/shotwell/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, adwaita-icon-theme -, gtk3 -, libexif -, libgphoto2 -, libwebp -, libsoup_3 -, libxml2 -, vala -, sqlite -, pkg-config -, gnome -, gst_all_1 -, libgudev -, libraw -, glib -, glib-networking -, json-glib -, gcr -, libgee -, gexiv2 -, librest -, gettext -, desktop-file-utils -, gdk-pixbuf -, librsvg -, wrapGAppsHook3 -, gobject-introspection -, itstool -, libsecret -, libportal-gtk3 -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "shotwell"; - version = "0.32.9"; - - src = fetchurl { - url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs="; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - itstool - gettext - desktop-file-utils - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - gtk3 - libexif - libgphoto2 - libwebp - libsoup_3 - libxml2 - sqlite - gst_all_1.gstreamer - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - libgee - libgudev - gexiv2 - gsettings-desktop-schemas - libraw - json-glib - glib - glib-networking - gdk-pixbuf - librsvg - librest - gcr - adwaita-icon-theme - libsecret - libportal-gtk3 - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "shotwell"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Popular photo organizer for the GNOME desktop"; - mainProgram = "shotwell"; - homepage = "https://gitlab.gnome.org/GNOME/shotwell"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ bobby285271 ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix deleted file mode 100644 index d05bfe3e349b..000000000000 --- a/pkgs/applications/graphics/snapshot/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchurl -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustc -, wrapGAppsHook4 -, glib -, gst_all_1 -, gtk4 -, libadwaita -, pipewire -, gnome -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "snapshot"; - version = "46.3"; - - src = fetchurl { - url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-RZV6BBX0VNY1MUkaoEeVzuDO1O3d1dj6DQAPXvBzW2c="; - }; - - nativeBuildInputs = [ - cargo - desktop-file-utils - meson - ninja - pkg-config - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - glib - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gstreamer - gtk4 - libadwaita - pipewire # for device provider - ]; - - preFixup = '' - gappsWrapperArgs+=( - # vp8enc preset - --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" - ) - ''; - - passthru.updateScript = gnome.updateScript { - packageName = "snapshot"; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/snapshot"; - description = "Take pictures and videos on your computer, tablet, or phone"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.unix; - mainProgram = "snapshot"; - }; -}) diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix deleted file mode 100644 index 6ed9cc102141..000000000000 --- a/pkgs/applications/graphics/structorizer/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, jdk11 -, makeDesktopItem -, makeWrapper -, copyDesktopItems -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "structorizer"; - version = "3.32-22"; - - desktopItems = [ - (makeDesktopItem { - type = "Application"; - name = "Structorizer"; - desktopName = "Structorizer"; - genericName = "Diagram creator"; - comment = meta.description; - icon = pname; - exec = pname; - terminal = false; - mimeTypes = [ "application/nsd" ]; - categories = [ - "Development" - "Graphics" - "VectorGraphics" - "RasterGraphics" - "ComputerScience" - ]; - keywords = [ "nsd" "diagrams" ]; - }) - ]; - - src = fetchFromGitHub { - owner = "fesch"; - repo = "Structorizer.Desktop"; - rev = version; - hash = "sha256-rUeb7V3l9nvmw+EuOEksHB+r6TjsLJHjRpHDQKpno1Q="; - }; - - patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; - - strictDeps = true; - - nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ]; - - buildInputs = [ jdk11 ]; - - postPatch = '' - chmod +x makeStructorizer - chmod +x makeBigJar - - patchShebangs --build makeStructorizer - patchShebangs --build makeBigJar - ''; - - buildPhase = '' - runHook preBuild - - ./makeStructorizer - ./makeBigJar - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -d $out/bin $out/share/mime/packages - - install -D ${pname}.jar -t $out/share/java/ - makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}.jar" - - cat << EOF > $out/share/mime/packages/structorizer.xml - - - - Nassi-Shneiderman diagram - Nassi-Shneiderman-Diagramm - - - - EOF - - cd src/lu/fisch/${pname}/gui - install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png - for icon_width in 24 32 48 64 128 256; do - install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png - done - - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Create Nassi-Shneiderman diagrams (NSD)"; - homepage = "https://structorizer.fisch.lu"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ annaaurora ]; - mainProgram = "structorizer"; - }; -} diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix deleted file mode 100644 index e19da3fa15fe..000000000000 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, autoreconfHook -, wrapGAppsHook3 - -, boost -, cairo -, darwin -, gettext -, glibmm -, gtk3 -, gtkmm3 -, libjack2 -, libsigcxx -, libxmlxx -, mlt -, pango -, imagemagick -, intltool -, adwaita-icon-theme -, harfbuzz -, freetype -, fribidi -, openexr -, fftw -}: - -let - version = "1.5.1"; - src = fetchFromGitHub { - owner = "synfig"; - repo = "synfig"; - rev = "v${version}"; - hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI="; - }; - - ETL = stdenv.mkDerivation { - pname = "ETL"; - inherit version src; - - sourceRoot = "${src.name}/ETL"; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - buildInputs = [ - glibmm - ]; - }; - - synfig = stdenv.mkDerivation { - pname = "synfig"; - inherit version src; - - patches = [ - # Pull upstream fix for autoconf-2.72 support: - # https://github.com/synfig/synfig/pull/2930 - (fetchpatch { - name = "autoconf-2.72.patch"; - url = "https://github.com/synfig/synfig/commit/80a3386c701049f597cf3642bb924d2ff832ae05.patch"; - stripLen = 1; - hash = "sha256-7gX8tJCR81gw8ZDyNYa8UaeZFNOx4o1Lnq0cAcaKb2I="; - }) - ]; - - sourceRoot = "${src.name}/synfig-core"; - - configureFlags = [ - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ] ++ lib.optionals stdenv.cc.isClang [ - # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that - # are removed in C++17. Setting the language version to C++14 allows it to build. - "CXXFLAGS=-std=c++14" - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - gettext - intltool - ]; - buildInputs = [ - ETL - boost - cairo - glibmm - mlt - libsigcxx - libxmlxx - pango - imagemagick - harfbuzz - freetype - fribidi - openexr - fftw - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - }; -in -stdenv.mkDerivation { - pname = "synfigstudio"; - inherit version src; - - sourceRoot = "${src.name}/synfig-studio"; - - postPatch = '' - patchShebangs images/splash_screen_development.sh - ''; - - preConfigure = '' - ./bootstrap.sh - ''; - - configureFlags = lib.optionals stdenv.cc.isClang [ - # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that - # are removed in C++17. Setting the language version to C++14 allows it to build. - "CXXFLAGS=-std=c++14" - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - gettext - intltool - wrapGAppsHook3 - ]; - buildInputs = [ - ETL - synfig - boost - cairo - glibmm - gtk3 - gtkmm3 - imagemagick - libjack2 - libsigcxx - libxmlxx - mlt - adwaita-icon-theme - openexr - fftw - ]; - - enableParallelBuilding = true; - - passthru = { - # Expose libraries and cli tools - inherit ETL synfig; - }; - - meta = with lib; { - description = "2D animation program"; - homepage = "http://www.synfig.org"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix deleted file mode 100644 index 202900983e14..000000000000 --- a/pkgs/applications/graphics/upscayl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, -}: let - pname = "upscayl"; - version = "2.11.5"; - - src = fetchurl { - url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; -in - appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ]; - - extraInstallCommands = '' - mkdir -p $out/share/{applications,pixmaps} - - cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Free and Open Source AI Image Upscaler"; - homepage = "https://upscayl.github.io/"; - maintainers = with maintainers; [icy-thought]; - license = licenses.agpl3Plus; - platforms = platforms.linux; - mainProgram = "upscayl"; - }; - } diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix deleted file mode 100644 index ee9357bc04af..000000000000 --- a/pkgs/applications/graphics/vkdt/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchurl -, vulkan-headers -, vulkan-tools -, vulkan-loader -, glslang -, glfw -, libjpeg -, pkg-config -, rsync -, cmake -, clang -, llvm -, llvmPackages -, pugixml -, freetype -, exiv2 -, ffmpeg -, libvorbis -, libmad -, testers -, vkdt -}: - -stdenv.mkDerivation rec { - pname = "vkdt"; - version = "0.7.0"; - - src = fetchurl { - url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-Sk/K+EWvJBkwwD5R1gH9ZQHetojrJTTJrKW9Dvr+lHA="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - clang - cmake - glslang - llvm - llvmPackages.openmp - pkg-config - rsync - ]; - - buildInputs = [ - exiv2 - ffmpeg - freetype - glfw - libjpeg - libmad - libvorbis - llvmPackages.openmp - pugixml - vulkan-headers - vulkan-loader - vulkan-tools - ]; - - dontUseCmakeConfigure = true; - - makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; - - passthru.tests.version = testers.testVersion { - package = vkdt; - }; - - meta = with lib; { - description = "Vulkan-powered raw image processor"; - homepage = "https://github.com/hanatos/vkdt"; - license = licenses.bsd2; - maintainers = with maintainers; [ paperdigits ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix deleted file mode 100644 index 35df09c2032c..000000000000 --- a/pkgs/applications/graphics/xpano/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, ninja -, opencv -, SDL2 -, gtk3 -, catch2_3 -, spdlog -, exiv2 -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "xpano"; - version = "0.19.2"; - - src = fetchFromGitHub { - owner = "krupkat"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-CgUiZHjWQSoAam2Itan3Zadt8+w6j9W5KGMZ5f6bHiQ="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - opencv - SDL2 - gtk3 - spdlog - exiv2 - ]; - - checkInputs = [ - catch2_3 - ]; - - doCheck = true; - - cmakeFlags = [ - "-DBUILD_TESTING=ON" - "-DXPANO_INSTALL_DESKTOP_FILES=ON" - ]; - - meta = with lib; { - description = "Panorama stitching tool"; - mainProgram = "Xpano"; - homepage = "https://krupkat.github.io/xpano/"; - changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ krupkat ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 3c7be8d6172a..f62d71726b22 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -35,7 +35,7 @@ mkDerivation rec { # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b # required as nixos seems to be unable to find CLANG_BUILTIN_DIR cmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include" + "-DCLANG_BUILTIN_DIR=${lib.getLib llvmPackages.libclang}/lib/clang/${lib.getVersion llvmPackages.clang}/include" ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 3361d4e92d9c..5b9af43cc169 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation { pango systemd ] - + ":${stdenv.cc.cc.lib}/lib64"; + + ":${lib.getLib stdenv.cc.cc}/lib64"; in '' runHook preInstall diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 372131d9f82b..7f0b0736900a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.7.5"; + version = "6.0.8.7"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-YmwbANzwpda/ZJyGZ5lqa/4AVz7QNTXqHXOJNiZcc/M="; + hash = "sha256-PnHMJtM4lWuRn+7J9NxObEOJi4pbYEChcpcAJ+EdtSI="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 58f17050c6fb..387485a5699c 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,13 +57,13 @@ (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 = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.3.0"; hash = "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc="; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.38.0"; hash = "sha256-yhO/GFoKdE/Z9SZPyGFe7DlnSd8dcAohqJNFqSqKLnk="; }) (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.Bcl.TimeProvider"; version = "8.0.1"; hash = "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24415.1"; hash = "sha256-mZISof2BEaehgkVhw/G/vb6yvnNJtfoDEdGOHqAiWAg="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.0"; hash = "sha256-XglInnx5GePUYHG7n2NLX+WfK7kJnornsWOW/5FnOXE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24454.1"; hash = "sha256-cG/5tTEFcIEC78NwZBXkJac4JoYKq4n8n/QqJcZZWIU="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.1"; hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (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="; }) @@ -79,25 +79,25 @@ (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 = "8.1.0"; hash = "sha256-BupPW6gN3p1LhIdDTcCVFmAMx3kMl7+Oq4kNWpbPsp4="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.1.0"; hash = "sha256-TzyHvyQQ/v1pr5IXOcyubLiB2l1uZLYiZyrg/QZADiM="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.1.0"; hash = "sha256-focc7oT7KbA3hDs6huy7PrPorH6EhRaVnaCkhrXPfq8="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.1.0"; hash = "sha256-wH3TDd7NcbGlMy1Z5clPcH/DjCNbDV1EJtDJcg9YcHA="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.0"; hash = "sha256-WjyA78+PG9ZloWTt9Hf1ek3VVj2FfJ9fAjqklnN+fWw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.1.2"; hash = "sha256-uS0TjGTpt6q38Xheiu93yK3u47qK/dveidZabyKu7m0="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.1.2"; hash = "sha256-ASv9e7Q2Z5bfWfzCpQe5nQh782WISceFlxGwgJ51RHI="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.1.2"; hash = "sha256-Yv1B2ETQTPm95LoNg2op4V5arrb0udDq/ZdfiZl/Sc0="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.1.2"; hash = "sha256-8fmgNOX1nyiNKrszZl3fvkxzCPuaeUbQJV45by8qRZs="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (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.4.0"; hash = "sha256-j9D+ts+CoP1xj/ZM7Eucp3Dx16NUQ7FsyALB7ArmJCw="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.4.0"; hash = "sha256-k3DIWLQe2Y8Q1lV75wNTqzvnbfhIyp/gOGLB6u8hBZs="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.4.0"; hash = "sha256-P+Sy651SvEE+4/e5jsm79xhWJ4D/qUoTYEqgLEN6hUc="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.4.0"; hash = "sha256-xTBi8jb1e8xF5n/HPYnAjNRPM/zS8gVR/51hJXx7Vkg="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.4.0"; hash = "sha256-xW9SRkROePnNMX6BQYHOFmivmPaSbJ5/YeuwcJNrzQg="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.0"; hash = "sha256-mCI3MCV6nyrGLrBat5VvK5LrXTEKlsdp9NkpZyJYwVg="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.0"; hash = "sha256-gViDLobza22kuLvB4JdlGtbANqwBHRwf1wLmIHMw9Eo="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.4.1"; hash = "sha256-oh0HFyB8AKR8nopzPk6HpmohY7TE94BLMYPGNuz3rzw="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.4.1"; hash = "sha256-XkkbSzJ1BSp1rZlR2OSPqQrl8rCTvtYKUTKtfxA/Xas="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.4.1"; hash = "sha256-ICQHHkhffLr5tEIyAYBqLsi8nQGmWngl6Jeo0RnVawc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.4.1"; hash = "sha256-EcqAc5HUXxBecqX6/Js5jimlVE0WKGp4yvVcC5e0wrM="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.4.1"; hash = "sha256-tUqqZoCqprHvWsL6zwq05jxlW19bYEmhjA6qXTXWZ90="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) - (fetchNuGet { pname = "MSTest"; version = "3.6.0"; hash = "sha256-p1w/OOAdFOy+WLV16cn2adGl5MeyDhltDllrDpPhYLE="; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.6.0"; hash = "sha256-/EdgXvk5a38DjpAcu3+13Xm9yjZUYHqBy3Q3UQxAEVo="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.6.0"; hash = "sha256-XpSVWgNU36VVUssPUc11R/StiyzzmSu7imXu7kBzLkE="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.0"; hash = "sha256-3j4Gp+BOhhKZav23gED/dtAnsoOrG+wtI9+p6IHNVMA="; }) + (fetchNuGet { pname = "MSTest"; version = "3.6.1"; hash = "sha256-GZXe2I+IngWeNRTUtUTIBwtZy3rmIpNYwHOnlPSOwxU="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.6.1"; hash = "sha256-b/VpTlHSzlO+APdTse2H0+9DK6QzcxZu9DaDVeyuTqc="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.6.1"; hash = "sha256-bi7f3+FZtCw3VKI72vnM/ZdtYSzJYK1iVoq0irUkjBU="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.1"; hash = "sha256-ECT15NPN86xU+KkK7QhF8hvOr3xLxjdVouSn757RjXE="; }) (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="; }) @@ -116,12 +116,12 @@ (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-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.8.0"; hash = "sha256-2CMwJt9QDVrQ0FCGol0TTInEbchcXItVjgwh2HeJts4="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.8.0"; hash = "sha256-ADbd0g8R79X1lQ2A5SDX3yYvNFnMiztuDd6OtNC5It0="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.8.0"; hash = "sha256-tqJRsvb4snA/1EmAh2oKzGFBC6atFCkg4+b1PMSmfoo="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.8.0"; hash = "sha256-g7D+WGZAmUccExd5IzGwNGypJKcve85YdT3kof1w/LI="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.8.0"; hash = "sha256-45+fRCATI+MKYa9/rXIylBItVXV+pJhY2y7iO3ida+o="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.5"; hash = "sha256-6AXrY3OYtF00FzP3yNWOdyFJE5jTqLegrlMh7hvDHJ8="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.9.0"; hash = "sha256-fmJjAfVHzbw/31IFPFUP31g46Y1XXIc1kr6VvYW5pCc="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.9.0"; hash = "sha256-0mbewpERdqKPLK5ULcAyHMF3nbAPCaaGPgelraLgoB4="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.9.0"; hash = "sha256-8KM21CWckFghGaqWahMa3V64+hUBrifAJnQ6P2VXlEk="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.9.0"; hash = "sha256-Ni8Z9CFs+ybTX8IgDuSKA580ISQ55w032EeqWYQXwoc="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.9.0"; hash = "sha256-V+3bEEpxSXPi9Sy1hHZEjY9qxuIpRWV5dKzaqYMSu40="; }) (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="; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 16e25dcefd9c..2e34071a0586 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "9f5672d65a1bd3b0f5d16ea6a1b5d220d670223c"; + version = "7c5eb33a79736ca57acff776af4bd88816773247"; 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-ngIPUy3iAkC5yFsH9lZlRcBlFs4sEkzfTrJ+ajB+weo="; + hash = "sha256-oOeXyhDnW2jeKGssxzgMIQElkH1uT5IALiXwxUg1ETQ="; }; - npmDepsHash = "sha256-GKkXh0FjsorllAukg6hYBSU0JEP6Bv7tvzEgRM4zAgw="; + npmDepsHash = "sha256-nofLj2PaL+A/M6F6vteh4SmONmsQ5kLPOZ/jxokubgU="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index ab5cda688562..7b4f813e8084 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -12,16 +12,17 @@ qttools, qtwayland, qtwebsockets, + gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-+hkbtxw1Bj/lMgyf3OkwmRXyZL6CS3bTHUlGH9xxe/E="; + hash = "sha256-YjnMDHXzL16XMVwewoQztE5yjwn1MA1KAiEmEjIYoPY="; }; nativeBuildInputs = [ @@ -45,9 +46,12 @@ stdenv.mkDerivation (finalAttrs: { qtwebsockets ]; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version"; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version"; + }; + updateScript = gitUpdater { }; }; meta = { diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index d8ae98e66acd..fd1ad1a5237a 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -44,7 +44,7 @@ buildDotnetModule rec { buildInputs = [ # Dependencies of nuget packages w/ native binaries - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix deleted file mode 100644 index 86d50c030e17..000000000000 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ stdenv -, lib -, fetchurl -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, alsa-lib -, at-spi2-atk -, at-spi2-core -, cairo -, cups -, curl -, dbus -, expat -, gdk-pixbuf -, glib -, gnutar -, gtk3 -, icu -, libdrm -, libunwind -, libuuid -, libxkbcommon -, mesa -, nspr -, nss -, openssl -, pango -, systemd -, xorg -, zlib -}: - -# from justinwoo/azuredatastudio-nix -# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix - -let - desktopItem = makeDesktopItem { - name = "azuredatastudio"; - desktopName = "Azure Data Studio"; - comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; - genericName = "Text Editor"; - exec = "azuredatastudio --no-sandbox --unity-launch %F"; - icon = "azuredatastudio"; - startupNotify = true; - startupWMClass = "azuredatastudio"; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "inode/directory" "application/x-azuredatastudio-workspace" ]; - keywords = [ "azuredatastudio" ]; - actions.new-empty-window = { - name = "New Empty Window"; - exec = "azuredatastudio --no-sandbox --new-window %F"; - icon = "azuredatastudio"; - }; - }; - - urlHandlerDesktopItem = makeDesktopItem { - name = "azuredatastudio-url-handler"; - desktopName = "Azure Data Studio - URL Handler"; - comment = "Azure Data Studio"; - genericName = "Text Editor"; - exec = "azuredatastudio --no-sandbox --open-url %U"; - icon = "azuredatastudio"; - startupNotify = true; - startupWMClass = "azuredatastudio"; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/azuredatastudio" ]; - keywords = [ "azuredatastudio" ]; - noDisplay = true; - }; -in -stdenv.mkDerivation rec { - - pname = "azuredatastudio"; - version = "1.49.1"; - - desktopItems = [ desktopItem urlHandlerDesktopItem ]; - - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - - # Url can be found at: https://github.com/microsoft/azuredatastudio/releases - # In the downloads table for Linux .tar.gz - # This will give a go.microsoft redirect link, I think it's better to use the direct link to which the redirect points. - # You can do so by using curl: curl -I - url = "https://download.microsoft.com/download/7/8/3/783c2037-8607-43c4-a593-0936e965d38b/azuredatastudio-linux-1.49.1.tar.gz"; - sha256 = "sha256-0LCrRUTTe8UEDgtGLvxVQL8pA5dwA6SvZEZSDILr7jo="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - buildInputs = [ - libuuid - at-spi2-core - at-spi2-atk - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/pixmaps - cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png - - runHook postInstall - ''; - - # change this to azuredatastudio-insiders for insiders releases - edition = "azuredatastudio"; - targetPath = "$out/${edition}"; - - unpackPhase = '' - mkdir -p ${targetPath} - ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} - ''; - - sqltoolsserviceRpath = lib.makeLibraryPath [ - stdenv.cc.cc - libunwind - libuuid - icu - openssl - zlib - curl - ]; - - # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/5.0.20240724.1"; - - rpath = lib.concatStringsSep ":" [ - (lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - mesa - nss - nspr - libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - libxkbcommon - xorg.libxkbfile - pango - stdenv.cc.cc.lib - systemd - ]) - targetPath - sqltoolsserviceRpath - ]; - - fixupPhase = '' - fix_sqltoolsservice() - { - mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - ${sqltoolsservicePath}/$1_old - - makeWrapper \ - ${sqltoolsservicePath}/$1_old \ - ${sqltoolsservicePath}/$1 \ - --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} - } - - fix_sqltoolsservice MicrosoftSqlToolsServiceLayer - fix_sqltoolsservice MicrosoftSqlToolsCredentials - fix_sqltoolsservice SqlToolsResourceProviderService - - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - ${targetPath}/${edition} - - mkdir -p $out/bin - makeWrapper \ - ${targetPath}/bin/${edition} \ - $out/bin/azuredatastudio \ - --set LD_LIBRARY_PATH ${rpath} - ''; - - meta = { - maintainers = with lib.maintainers; [ xavierzwirtz ]; - description = "Data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; - homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfreeRedistributable; - platforms = [ "x86_64-linux" ]; - mainProgram = "azuredatastudio"; - }; -} diff --git a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff deleted file mode 100644 index cc832bb10729..000000000000 --- a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp -index 11a36dfabc..77a44e699b 100644 ---- a/src/slic3r/Utils/Http.cpp -+++ b/src/slic3r/Utils/Http.cpp -@@ -88,9 +88,13 @@ std::mutex g_mutex; - - struct form_file - { -- fs::ifstream ifs; -+ fs::ifstream ifs; - boost::filesystem::ifstream::off_type init_offset; - size_t content_length; -+ -+ form_file(fs::path const& p, const boost::filesystem::ifstream::off_type offset, const size_t content_length) -+ : ifs(p, std::ios::in | std::ios::binary), init_offset(offset), content_length(content_length) -+ {} - }; - - struct Http::priv -@@ -314,7 +318,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha - filename = path.string().c_str(); - } - -- form_files.emplace_back(form_file{{path, std::ios::in | std::ios::binary}, offset, length}); -+ form_files.emplace_back(path, offset, length); - auto &f = form_files.back(); - size_t size = length; - if (length == 0) { -@@ -381,7 +385,7 @@ void Http::priv::set_put_body(const fs::path &path) - boost::system::error_code ec; - boost::uintmax_t filesize = file_size(path, ec); - if (!ec) { -- putFile = std::make_unique(form_file{{path, std::ios_base::binary | std::ios_base::in}, 0, 0}); -+ putFile = std::make_unique(path, 0, 0); - ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); - ::curl_easy_setopt(curl, CURLOPT_READDATA, (void *) (putFile.get())); - ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, filesize); - diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 4084734aa58e..168c3ccf72f9 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -1,15 +1,12 @@ { stdenv, lib, - openexr, - jemalloc, - c-blosc, binutils, fetchFromGitHub, cmake, pkg-config, wrapGAppsHook3, - boost179, + boost180, cereal, cgal_5, curl, @@ -22,10 +19,7 @@ glib, glib-networking, gmp, - gstreamer, - gst-plugins-base, - gst-plugins-bad, - gst-plugins-good, + gst_all_1, gtest, gtk3, hicolor-icon-theme, @@ -36,6 +30,7 @@ nlopt, opencascade-occt_7_6, openvdb, + opencv, pcre, systemd, tbb_2021_11, @@ -45,33 +40,28 @@ withSystemd ? stdenv.hostPlatform.isLinux, }: let - opencascade-occt = opencascade-occt_7_6; - wxGTK31' = wxGTK31.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ - # Disable noisy debug dialogs - "--enable-debug=no" - ]; - }); - openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: { - buildInputs = [ - openexr - boost179 - tbb_2021_11 - jemalloc - c-blosc - ilmbase - ]; - }); + wxGTK' = + (wxGTK31.override { + withCurl = true; + withPrivateFonts = true; + withWebKit = true; + }).overrideAttrs + (old: { + configureFlags = old.configureFlags ++ [ + # Disable noisy debug dialogs + "--enable-debug=no" + ]; + }); in stdenv.mkDerivation rec { pname = "bambu-studio"; - version = "01.09.00.70"; + version = "01.09.07.52"; src = fetchFromGitHub { owner = "bambulab"; repo = "BambuStudio"; rev = "v${version}"; - hash = "sha256-RBctBhKo7mjxsP7OJhGfoU1eIiGVuMiAqwwSU+gsMds="; + hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0="; }; nativeBuildInputs = [ @@ -82,7 +72,7 @@ stdenv.mkDerivation rec { buildInputs = [ binutils - boost179 + boost180 cereal cgal_5 curl @@ -95,10 +85,10 @@ stdenv.mkDerivation rec { glib glib-networking gmp - gstreamer - gst-plugins-base - gst-plugins-bad - gst-plugins-good + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good gtk3 hicolor-icon-theme ilmbase @@ -106,20 +96,23 @@ stdenv.mkDerivation rec { mesa.osmesa mpfr nlopt - opencascade-occt - openvdb_tbb_2021_8 + opencascade-occt_7_6 + openvdb pcre tbb_2021_11 webkitgtk_4_0 - wxGTK31' + wxGTK' xorg.libX11 + opencv ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; patches = [ # Fix for webkitgtk linking - ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch # Fix build with cgal-5.6.1+ - ./meshboolean-const.patch + ./patches/meshboolean-const.patch + # Fix an issue with + ./patches/dont-link-opencv-world-bambu.patch ]; doCheck = true; @@ -136,7 +129,10 @@ stdenv.mkDerivation rec { # Disable compiler warnings that clutter the build log. # It seems to be a known issue for Eigen: # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 - NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; + NIX_CFLAGS_COMPILE = toString [ + "-Wno-ignored-attributes" + "-I${opencv.out}/include/opencv4" + ]; # prusa-slicer uses dlopen on `libudev.so` at runtime NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; @@ -181,8 +177,12 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PC Software for BambuLab's 3D printers"; homepage = "https://github.com/bambulab/BambuStudio"; + changelog = "https://github.com/bambulab/BambuStudio/releases/tag/v${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ zhaofengli ]; + maintainers = with maintainers; [ + zhaofengli + dsluijk + ]; mainProgram = "bambu-studio"; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 353252dfea17..7e5c1f48ccd4 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -2,34 +2,25 @@ lib, fetchFromGitHub, bambu-studio, - opencv, }: bambu-studio.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.1.1"; + version = "2.2.0"; pname = "orca-slicer"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk="; + hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI="; }; - patches = - previousAttrs.patches - ++ [ - # FIXME: only required for 2.1.1, can be removed in the next version - ./0002-fix-build-for-gcc-13.diff + patches = [ + # Fix for webkitgtk linking + ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - ./dont-link-opencv-world.patch - ]; - - buildInputs = - previousAttrs.buildInputs - ++ [ - opencv - ]; + ./patches/dont-link-opencv-world-orca.patch + ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/applications/misc/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch similarity index 100% rename from pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch rename to pkgs/applications/misc/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch diff --git a/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch b/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch new file mode 100644 index 000000000000..cb7e212144ac --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch @@ -0,0 +1,14 @@ +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 2cdc525..44e6602 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -533,7 +533,8 @@ target_link_libraries(libslic3r + ${OCCT_LIBS} + Clipper2 + mcut +- opencv_world ++ opencv_core ++ opencv_imgproc + ) + + if(NOT WIN32) \ No newline at end of file diff --git a/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch b/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-orca.patch similarity index 100% rename from pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch rename to pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-orca.patch diff --git a/pkgs/applications/misc/bambu-studio/meshboolean-const.patch b/pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch similarity index 100% rename from pkgs/applications/misc/bambu-studio/meshboolean-const.patch rename to pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix deleted file mode 100644 index 16f4c0bd2d6f..000000000000 --- a/pkgs/applications/misc/bb/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }: - -stdenv.mkDerivation rec { - pname = "bb"; - version = "1.3rc1"; - - src = fetchurl { - url = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz"; - sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr"; - }; - - buildInputs = [ - aalib ncurses libmikmod - xorg.libXau xorg.libXdmcp xorg.libX11 - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i -e '/^#include $/d' *.c - ''; - - # error: 'regparm' is not valid on this platform - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - "-D__STRICT_ANSI__"; - - meta = with lib; { - homepage = "http://aa-project.sourceforge.net/bb"; - description = "AA-lib demo"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.rnhmjoj ]; - platforms = platforms.unix; - mainProgram = "bb"; - }; -} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7d89339da102..e2af0b3f9338 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -64,7 +64,7 @@ openjpeg, openpgl, opensubdiv, - openvdb, + openvdb_11, openxr-loader, pkg-config, potrace, @@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: { openjpeg openpgl (opensubdiv.override { inherit cudaSupport; }) - openvdb + openvdb_11 potrace pugixml python3 diff --git a/pkgs/applications/misc/blender/fix-include.patch b/pkgs/applications/misc/blender/fix-include.patch deleted file mode 100644 index 44e2147d073c..000000000000 --- a/pkgs/applications/misc/blender/fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h -index fce901b..1f73c5e 100644 ---- a/intern/smoke/intern/WAVELET_NOISE.h -+++ b/intern/smoke/intern/WAVELET_NOISE.h -@@ -43,6 +43,7 @@ - #ifndef WAVELET_NOISE_H - #define WAVELET_NOISE_H - -+#include - #include - - #ifdef WIN32 diff --git a/pkgs/applications/misc/bloodhound/default.nix b/pkgs/applications/misc/bloodhound/default.nix deleted file mode 100644 index 175b293c9d88..000000000000 --- a/pkgs/applications/misc/bloodhound/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib -, stdenv -, fetchzip -, makeWrapper -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libGL -, libappindicator-gtk3 -, libdrm -, libnotify -, libpulseaudio -, libuuid -, libxcb -, libxkbcommon -, libxshmfence -, mesa -, nspr -, nss -, pango -, systemd -, udev -, unzip -, xdg-utils -, xorg -}: -stdenv.mkDerivation (finalAttrs: { - pname = "bloodhound"; - version = "4.3.1"; - - src = fetchzip { - url = "https://github.com/BloodHoundAD/BloodHound/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip"; - hash = "sha256-gGfZ5Mj8rmz3dwKyOitRExkgOmSVDOqKpPxvGlE4izw="; - }; - - rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libGL - libappindicator-gtk3 - libdrm - libnotify - libpulseaudio - libuuid - libxcb - libxkbcommon - mesa - nspr - nss - pango - systemd - stdenv.cc.cc.lib - udev - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence - ]; - - buildInputs = [ - gtk3 # needed for GSETTINGS_SCHEMAS_PATH - ]; - - nativeBuildInputs = [ makeWrapper unzip ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/{bin,/lib/BloodHound} - mv * $out/lib/BloodHound - chmod +x $out/lib/BloodHound/BloodHound - - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - $out/lib/BloodHound/BloodHound --set-rpath ${finalAttrs.rpath}:$out/lib/BloodHound \ - --add-needed libudev.so # Needed to fix trace trap (core dump) - - makeWrapper $out/lib/BloodHound/BloodHound $out/bin/BloodHound \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ - --append-flags "--in-process-gpu" # fix for sandbox issues - - runHook postInstall - ''; - - meta = with lib; { - description = "Active Directory reconnaissance and attack path management tool"; - homepage = "https://github.com/BloodHoundAD/BloodHound"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - changelog = "https://github.com/BloodHoundAD/BloodHound/releases/tag/v${finalAttrs.version}"; - downloadPage = "https://github.com/BloodHoundAD/BloodHound/releases"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ akechishiro ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "BloodHound"; - }; -}) diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix deleted file mode 100644 index 01836f583066..000000000000 --- a/pkgs/applications/misc/comodoro/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, installShellFiles -, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -, withTcp ? true -}: - -rustPlatform.buildRustPackage rec { - pname = "comodoro"; - version = "0.0.10"; - - src = fetchFromGitHub { - owner = "soywod"; - repo = "comodoro"; - rev = "v${version}"; - hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18="; - }; - - cargoHash = "sha256-1WJIIsTzbChWqvdBSR/OpLC1iR8FgLmypJFQEtpalbw="; - - nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; - - buildNoDefaultFeatures = true; - buildFeatures = lib.optional withTcp "tcp"; - - postInstall = lib.optionalString installManPages '' - mkdir -p $out/man - $out/bin/comodoro man $out/man - installManPage $out/man/* - '' + lib.optionalString installShellCompletions '' - installShellCompletion --cmd comodoro \ - --bash <($out/bin/comodoro completion bash) \ - --fish <($out/bin/comodoro completion fish) \ - --zsh <($out/bin/comodoro completion zsh) - ''; - - meta = with lib; { - description = "CLI to manage your time"; - homepage = "https://pimalaya.org/comodoro/"; - changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ soywod ]; - mainProgram = "comodoro"; - }; -} diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix deleted file mode 100644 index eb0f2359cc29..000000000000 --- a/pkgs/applications/misc/corectrl/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, extra-cmake-modules -, botan3 -, karchive -, kauth -, libdrm -, hwdata -, mesa-demos -, polkit -, procps -, pugixml -, spdlog -, util-linux -, vulkan-tools -, qtbase -, qtcharts -, qtquickcontrols2 -, qtsvg -, qttools -, qtxmlpatterns -, quazip -, wrapQtAppsHook -} : - -stdenv.mkDerivation rec{ - pname = "corectrl"; - version = "1.4.1"; - - src = fetchFromGitLab { - owner = "corectrl"; - repo = "corectrl"; - rev = "v${version}"; - hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; - }; - patches = [ - ./polkit-dir.patch - ]; - - nativeBuildInputs = [ - extra-cmake-modules - wrapQtAppsHook - ]; - buildInputs = [ - botan3 - karchive - kauth - libdrm - mesa-demos - polkit - procps - pugixml - spdlog - util-linux - vulkan-tools - qtbase - qtcharts - qtquickcontrols2 - qtsvg - qttools - qtxmlpatterns - quazip - ]; - - cmakeFlags = [ - "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" - "-DINSTALL_DBUS_FILES_IN_PREFIX=true" - "-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions" - ]; - - runtimeDeps = [ hwdata mesa-demos vulkan-tools util-linux procps ]; - binPath = lib.makeBinPath runtimeDeps; - - dontWrapQtApps = true; - - postInstall = '' - wrapQtApp $out/bin/corectrl --prefix PATH ":" ${binPath} - ''; - - meta = with lib; { - homepage = "https://gitlab.com/corectrl/corectrl/"; - description = "Control your computer hardware via application profiles"; - longDescription = '' - CoreCtrl is a Free and Open Source GNU/Linux application that allows you - to control with ease your computer hardware using application profiles. It - aims to be flexible, comfortable and accessible to regular users. - ''; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} -# TODO: report upstream that libdrm is not detected at configure time diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index e2f5cffdfbad..bc9503d0d106 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-U5x8szvouoxJ+DZUlrn5wtXt+6vs62tzcWICQW3B21U="; + hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs="; }; - cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug="; + cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix deleted file mode 100644 index 5574b645d6ae..000000000000 --- a/pkgs/applications/misc/deckmaster/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, roboto -}: - -buildGoModule rec { - pname = "deckmaster"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "muesli"; - repo = "deckmaster"; - rev = "refs/tags/v${version}"; - hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; - }; - - vendorHash = "sha256-DFssAic2YtXNH1Jm6zCDv1yPNz3YUXaFLs7j7rNHhlE="; - - proxyVendor = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - ldflags = [ - "-s" - "-w" - ]; - - # Let the app find Roboto-*.ttf files (hard-coded file names). - postFixup = '' - wrapProgram $out/bin/deckmaster \ - --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \ - ''; - - meta = with lib; { - description = "Application to control your Elgato Stream Deck on Linux"; - mainProgram = "deckmaster"; - homepage = "https://github.com/muesli/deckmaster"; - changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ianmjones ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix deleted file mode 100644 index 929fe77cd971..000000000000 --- a/pkgs/applications/misc/dialect/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, fetchFromGitHub -, wrapGAppsHook4 -, python3 -, blueprint-compiler -, desktop-file-utils -, meson -, ninja -, pkg-config -, glib -, gtk4 -, gobject-introspection -, gst_all_1 -, libsoup_3 -, glib-networking -, libadwaita -, libsecret -, nix-update-script -}: - -python3.pkgs.buildPythonApplication rec { - pname = "dialect"; - version = "2.4.2"; - pyproject = false; # built with meson - - src = fetchFromGitHub { - owner = "dialect-app"; - repo = "dialect"; - rev = version; - fetchSubmodules = true; - hash = "sha256-DAhzvia5ut806rTc2iMuMrVKyYBSaAiMyC4rEOyU4x0="; - }; - - nativeBuildInputs = [ - blueprint-compiler - desktop-file-utils - gobject-introspection - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - gtk4 - glib - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - libsoup_3 - glib-networking - libadwaita - libsecret - ]; - - propagatedBuildInputs = with python3.pkgs; [ - dbus-python - gtts - pygobject3 - beautifulsoup4 - ]; - - # Prevent double wrapping, let the Python wrapper use the args in preFixup. - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - doCheck = false; - - # handle setup hooks better - strictDeps = false; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://github.com/dialect-app/dialect"; - description = "Translation app for GNOME"; - maintainers = with lib.maintainers; [ aleksana ]; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - mainProgram = "dialect"; - }; -} diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix deleted file mode 100644 index 0212547a75a6..000000000000 --- a/pkgs/applications/misc/diebahn/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 -, cairo -, gdk-pixbuf -, glib -, gtk4 -, libadwaita -, pango -, gettext -, darwin -}: - -stdenv.mkDerivation rec { - pname = "diebahn"; - version = "2.7.0"; - - src = fetchFromGitLab { - owner = "schmiddi-on-mobile"; - repo = "railway"; - rev = version; - hash = "sha256-ps55DiAsetmdcItZKcfyYDD0q0w1Tkf/U48UR/zQx1g="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - name = "${pname}-${src}"; - inherit src; - hash = "sha256-StJxWasUMj9kh9rLs4LFI3XaZ1Z5pvFBjEjtp79WZjg="; - }; - - nativeBuildInputs = [ - cargo - desktop-file-utils - meson - ninja - pkg-config - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - cairo - gdk-pixbuf - glib - gtk4 - libadwaita - pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation - Foundation - Security - ]); - - # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys - # because the vendored copy does not build with newer versions of clang. - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; - GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; - GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; - }; - - meta = { - changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md"; - description = "Travel with all your train information in one place. Also known as Railway"; - homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; - license = lib.licenses.gpl3Plus; - mainProgram = "diebahn"; - maintainers = with lib.maintainers; [ dotlambda lilacious ]; - }; -} diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 089a421ccc15..75ae73179cf3 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, writeText +{ lib, stdenv, fetchurl, fontconfig, libX11, libXinerama, libXft, pkg-config, zlib, writeText , conf ? null, patches ? null # update script dependencies , gitUpdater }: @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; }; - buildInputs = [ libX11 libXinerama zlib libXft ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fontconfig libX11 libXinerama zlib libXft ]; inherit patches; @@ -28,11 +29,15 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk + makeFlagsArray+=( + PREFIX="$out" + CC="$CC" + # default config.mk hardcodes dependent libraries and include paths + INCS="`$PKG_CONFIG --cflags fontconfig x11 xft xinerama`" + LIBS="`$PKG_CONFIG --libs fontconfig x11 xft xinerama`" + ) ''; - makeFlags = [ "CC:=$(CC)" ]; - passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dmenu"; }; meta = with lib; { diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix deleted file mode 100644 index 3f7e9c821a2e..000000000000 --- a/pkgs/applications/misc/dwmbar/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation { - pname = "dwmbar"; - version = "unstable-2021-12-22"; - - src = fetchFromGitHub { - owner = "thytom"; - repo = "dwmbar"; - rev = "574f5703c558a56bc9c354471543511255423dc7"; - sha256 = "sha256-IrelZpgsxq2dnsjMdh7VC5eKffEGRbDkZmZBD+tROPs="; - }; - - postPatch = '' - substituteInPlace dwmbar \ - --replace 'DEFAULT_CONFIG_DIR="/usr/share/dwmbar"' "DEFAULT_CONFIG_DIR=\"$out/share/dwmbar\"" - ''; - - installPhase = '' - install -d $out/share/dwmbar - cp -r modules $out/share/dwmbar/ - install -D -t $out/share/dwmbar/ config - install -D -t $out/share/dwmbar/ bar.sh - install -Dm755 -t $out/bin/ dwmbar - ''; - - meta = with lib; { - homepage = "https://github.com/thytom/dwmbar"; - description = "Modular Status Bar for dwm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ baitinq ]; - platforms = platforms.linux; - mainProgram = "dwmbar"; - }; -} diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/applications/misc/dwmblocks/default.nix deleted file mode 100644 index 0b7abc7e3dfc..000000000000 --- a/pkgs/applications/misc/dwmblocks/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libX11, patches ? [ ], writeText, conf ? null }: - -stdenv.mkDerivation { - pname = "dwmblocks"; - version = "unstable-2020-12-27"; - - src = fetchFromGitHub { - owner = "torrinfail"; - repo = "dwmblocks"; - rev = "96cbb453e5373c05372fd4bf3faacfa53e409067"; - sha256 = "00lxfxsrvhm60zzqlcwdv7xkqzya69mgpi2mr3ivzbc8s9h8nwqx"; - }; - - buildInputs = [ libX11 ]; - - inherit patches; - - postPatch = - let - configFile = - if lib.isDerivation conf || builtins.isPath conf - then conf else writeText "blocks.def.h" conf; - in - lib.optionalString (conf != null) "cp ${configFile} blocks.def.h"; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Modular status bar for dwm written in c"; - homepage = "https://github.com/torrinfail/dwmblocks"; - license = licenses.isc; - maintainers = with maintainers; [ sophrosyne ]; - platforms = platforms.linux; - mainProgram = "dwmblocks"; - }; -} diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 96f1db7df91b..2482ecadc04c 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.6"; + version = "5.8.7"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-oi/nEdOjhbYf9IZmppfKiEmlNGXdc907LS2x8jUck+M="; + hash = "sha256-DVY5XxAz3HPAWMNaGauUop7OWHeFuuRHuVllyJvHqFk="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ac8e15d38908..590ce86a52e7 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.6"; + version = "1.27.7"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-bxh15aZIupTaHnYM65MAYuYtKx0z2OIQl3WKEU1gO4Q="; + hash = "sha256-9YcxD7AH4U2dOhAiUnknwwGFy9pplFFQ7Rn4cOvDdEc="; }; propagatedBuildInputs = [ @@ -26,6 +26,11 @@ buildPythonApplication rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # requires network access + "test_init" + ]; + pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 0ea873da8477..5d6240e762b8 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "ganttproject-bin"; - version = "3.3.3309"; + version = "3.3.3312"; src = fetchzip { url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip"; stripRoot = false; - hash = "sha256-ysK+q9r8pbf9MBv7ck24joPR/ywyHnDCBHeOLfljYNw="; + hash = "sha256-mvup4yMfFfzL2iLMj9vlFFrJT0wLmeadNEnf2QO53H0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix deleted file mode 100644 index 9d6c9f09dc96..000000000000 --- a/pkgs/applications/misc/glom/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, autoconf -, automake -, libtool -, mm-common -, intltool -, itstool -, doxygen -, graphviz -, makeFontsConf -, freefont_ttf -, boost -, libxmlxx3 -, libxslt -, libgdamm -, libarchive -, libepc -, python3 -, ncurses -, glibmm -, gtk3 -, openssl -, gtkmm3 -, goocanvasmm2 -, evince -, isocodes -, gtksourceview -, gtksourceviewmm -, postgresql_15 -, gobject-introspection -, yelp-tools -, wrapGAppsHook3 -}: - -let - gda = libgdamm.override { - mysqlSupport = true; - postgresSupport = true; - }; - python = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); - sphinx-build = python3.pkgs.sphinx.overrideAttrs (super: { - postFixup = super.postFixup or "" + '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - }); - boost_python = boost.override { enablePython = true; inherit python; }; -in stdenv.mkDerivation rec { - pname = "glom"; - version = "1.32.0"; - - outputs = [ "out" "lib" "dev" "doc" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk"; - }; - - nativeBuildInputs = [ - pkg-config - autoconf - automake - libtool - mm-common - intltool - yelp-tools - itstool - doxygen - graphviz - sphinx-build - wrapGAppsHook3 - gobject-introspection # for setup hook - ]; - - buildInputs = [ - boost_python - glibmm - gtk3 - openssl - libxmlxx3 - libxslt - gda - libarchive - libepc - python - ncurses # for python - gtkmm3 - goocanvasmm2 - evince - isocodes - python3.pkgs.pygobject3 - gtksourceview - gtksourceviewmm - postgresql_15 # for postgresql utils - ]; - - enableParallelBuilding = true; - - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ - "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" - "--with-postgres-utils=${lib.getBin postgresql_15}/bin" - ]; - - makeFlags = [ - "libdocdir=${placeholder "doc"}/share/doc/$(book_name)" - "devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)" - ]; - - # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "${placeholder "out"}/${python3.sitePackages}" - --set PYTHONHOME "${python}" - ) - ''; - - meta = with lib; { - description = "Easy-to-use database designer and user interface"; - homepage = "http://www.glom.org/"; - license = [ licenses.lgpl2 licenses.gpl2 ]; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix deleted file mode 100644 index 16749bc2292d..000000000000 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, appstream-glib -, desktop-file-utils -, fwupd -, gettext -, glib -, gtk4 -, libadwaita -, libxmlb -, meson -, ninja -, pkg-config -, systemd -, help2man -, wrapGAppsHook4 -}: - -stdenv.mkDerivation rec { - pname = "gnome-firmware"; - version = "46.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "gnome-firmware"; - rev = version; - sha256 = "sha256-tEMSlKsqqPMZA0Gr89+u3dmAmZ7ffQm/2i1AB93y05E="; - }; - - nativeBuildInputs = [ - appstream-glib # for ITS rules - desktop-file-utils - gettext - help2man - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - fwupd - glib - gtk4 - libadwaita - libxmlb - systemd - ]; - - mesonFlags = [ - "-Dconsolekit=false" - ]; - - passthru.updateScript = gitUpdater { - ignoredVersions = "(alpha|beta|rc).*"; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/gnome-firmware"; - description = "Tool for installing firmware on devices"; - mainProgram = "gnome-firmware"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/gnome-tecla/default.nix b/pkgs/applications/misc/gnome-tecla/default.nix deleted file mode 100644 index c1a3183086be..000000000000 --- a/pkgs/applications/misc/gnome-tecla/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, glib -, gtk4 -, libadwaita -, libxkbcommon -, wayland -, gnome -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tecla"; - version = "46.0"; - - src = fetchurl { - url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-Sggeq4Z6WosJdYmRytdkWSDzI6q8qVRAgpD7b0RZGw8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - libxkbcommon - wayland - ]; - - passthru = { - updateScript = gnome.updateScript { - attrPath = "gnome-tecla"; - packageName = "tecla"; - }; - }; - - meta = with lib; { - description = "Keyboard layout viewer"; - homepage = "https://gitlab.gnome.org/GNOME/tecla"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - mainProgram = "tecla"; - }; -}) diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix deleted file mode 100644 index d53871476bd1..000000000000 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, vala -, gettext -, libxml2 -, desktop-file-utils -, wrapGAppsHook4 -, glib -, gtk4 -, libadwaita -, libgee -, libgtop -, gnome -, tracker -}: - -stdenv.mkDerivation rec { - pname = "gnome-usage"; - version = "46.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-GGrajgAYjIn4yrVPNZmO2XpG6rb9shiRAoNhvzhqybI="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - libxml2 - meson - ninja - pkg-config - vala - wrapGAppsHook4 - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - libgee - libgtop - tracker - ]; - - postPatch = '' - chmod +x build-aux/meson/postinstall.sh - patchShebangs build-aux/meson/postinstall.sh - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "Nice way to view information about use of system resources, like memory and disk space"; - mainProgram = "gnome-usage"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-usage"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 4d7c70e8bddb..d3cfb69cd1aa 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "24.09.0"; + version = "24.09.1"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - rev = "v${finalAttrs.version}-Release.316ec900"; - hash = "sha256-LriKJLjqEuD0v8yjoE35O+V6oUX2jhWGFguqlXaDlQA="; + rev = "v${finalAttrs.version}-Release.ca9dd133"; + hash = "sha256-HvXC9fNLDZAEtXNjzFmaKz9Ih3n4Au69NPMuVeCiQPk="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index eccb7df29166..9024589c297a 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.7.2"; + version = "3.7.3"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc="; + sha256 = "sha256-27S1ukq9rHncFuPBZmwIP/bKuPYm3AxdBK3PliYTGEQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/applications/misc/health/default.nix deleted file mode 100644 index 8ff79b36a515..000000000000 --- a/pkgs/applications/misc/health/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, cargo -, wrapGAppsHook4 -, blueprint-compiler -, libadwaita -, libsecret -, tracker -, darwin -}: - -stdenv.mkDerivation rec { - pname = "health"; - version = "0.95.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = pname; - rev = version; - hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - rustPlatform.cargoSetupHook - rustc - cargo - wrapGAppsHook4 - blueprint-compiler - ]; - - buildInputs = [ - libadwaita - libsecret - tracker - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.Foundation - ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-Wno-error=incompatible-function-pointer-types" - ]); - - meta = with lib; { - description = "Health tracking app for the GNOME desktop"; - homepage = "https://apps.gnome.org/app/dev.Cogitri.Health"; - license = licenses.gpl3Plus; - mainProgram = "dev.Cogitri.Health"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix deleted file mode 100644 index e642cecf69d6..000000000000 --- a/pkgs/applications/misc/hubstaff/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE -, libXext , freetype, libXrender, fontconfig, libXft, libXinerama -, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 -, curl, writeShellScript, common-updater-scripts, xmlstarlet }: - -let - url = "https://app.hubstaff.com/download/8099-standard-linux-1-6-26-release"; - version = "1.6.26-95441346"; - sha256 = "sha256:0xxw2za1hmqff5y0vyrvccgldsgyb808dql548c2xqsc1qi9gbn9"; - - rpath = lib.makeLibraryPath - [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft - libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 - curl libXfixes libXScrnSaver ]; - -in - -stdenv.mkDerivation { - pname = "hubstaff"; - inherit version; - - src = fetchurl { inherit sha256 url; }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - unpackCmd = '' - # MojoSetups have a ZIP file at the end. ZIP’s magic string is - # most often PK\x03\x04. This has worked for all past updates, - # but feel free to come up with something more reasonable. - dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text ''$'PK\x03\x04' $curSrc | cut -d: -f1) - dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null - unzip -q data.zip "data/*" - rm data.zip - ''; - - dontBuild = true; - - installPhase = '' - # remove files for 32-bit arch to skip building for this arch - # but add -f flag to not fail if files were not found (new versions dont provide 32-bit arch) - rm -rf x86 x86_64/lib64 - - opt=$out/opt/hubstaff - mkdir -p $out/bin $opt - cp -r . $opt/ - - for f in "$opt/x86_64/"*.bin.x86_64 ; do - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $f - wrapProgram $f --prefix LD_LIBRARY_PATH : ${rpath} - done - - ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient - ln -s $opt/x86_64/HubstaffCLI.bin.x86_64 $out/bin/HubstaffCLI - - # Why is this needed? SEGV otherwise. - ln -s $opt/data/resources $opt/x86_64/resources - ''; - - # to test run: - # nix-shell maintainers/scripts/update.nix --argstr package hubstaff - # nix-build -A pkgs.hubstaff - passthru.updateScript = writeShellScript "hubstaff-updater" '' - set -eu -o pipefail - - # Create a temporary file - temp_file=$(mktemp) - - # Fetch the appcast.xml and save it to the temporary file - curl --silent --output "$temp_file" https://app.hubstaff.com/appcast.xml - - # Extract the latest release URL for Linux using xmlstarlet - installation_script_url=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@url' "$temp_file") - version=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@sparkle:version' "$temp_file") - - sha256=$(nix-prefetch-url "$installation_script_url") - - ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "sha256:$sha256" "$installation_script_url" - ''; - - meta = with lib; { - description = "Time tracking software"; - homepage = "https://hubstaff.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus srghma ]; - }; -} diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 381804c2b8de..6a63e64134aa 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "huggle"; - version = "3.4.12"; + version = "3.4.13"; src = fetchFromGitHub { owner = "huggle"; repo = "huggle3-qt-lx"; rev = version; - sha256 = "scNGmMVZ6z9FTQuZCdwRYk0WP5qKfdb/M9Co8TbiMDE="; + sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 4957ce226173..130790aec641 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,22 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (7.2.1.2) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) drb (2.2.1) em-websocket (0.5.3) @@ -26,16 +27,16 @@ GEM ffi (1.17.0) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (4.27.2) + google-protobuf (4.28.3) bigdecimal rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jekyll (4.3.3) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -76,35 +77,34 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) mercenary (0.4.0) mini_portile2 (2.8.7) - minitest (5.24.0) - mutex_m (0.2.0) - nokogiri (1.16.6) + minitest (5.25.1) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (6.0.0) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.1) - strscan - rouge (4.3.0) + rexml (3.3.9) + rouge (4.4.0) safe_yaml (1.0.5) - sass-embedded (1.77.5) - google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.80.4) + google-protobuf (~> 4.28) rake (>= 13) - strscan (3.1.0) + securerandom (0.3.1) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - webrick (1.8.1) + unicode-display_width (2.6.0) + webrick (1.8.2) PLATFORMS ruby @@ -118,4 +118,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.5.11 + 2.5.9 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index f135bf6ccdef..1f1ba7ea50a7 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; type = "gem"; }; - version = "7.1.3.4"; + version = "7.2.1.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -138,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz"; + sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0"; type = "gem"; }; - version = "4.27.2"; + version = "4.28.3"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -170,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.6"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -181,10 +181,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a"; + sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264"; type = "gem"; }; - version = "4.3.3"; + version = "4.3.4"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -306,6 +306,16 @@ }; version = "3.9.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; mercenary = { groups = ["default"]; platforms = []; @@ -331,20 +341,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.24.0"; - }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; + version = "5.25.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -352,10 +352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.6"; + version = "1.16.7"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -373,20 +373,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; rake = { groups = ["default"]; @@ -420,25 +420,24 @@ version = "0.11.1"; }; rexml = { - dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.9"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; + sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs"; type = "gem"; }; - version = "4.3.0"; + version = "4.4.0"; }; safe_yaml = { groups = ["default"]; @@ -456,20 +455,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; + sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51"; type = "gem"; }; - version = "1.77.5"; + version = "1.80.4"; }; - strscan = { + securerandom = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; type = "gem"; }; - version = "3.1.0"; + version = "0.3.1"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -498,19 +497,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; } diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 263acefe7cb6..45d48bc23ae7 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -1,6 +1,10 @@ -{ lib, bundlerApp, ruby -, writeShellScriptBin, makeWrapper -, withOptionalDependencies ? false +{ + lib, + bundlerApp, + makeWrapper, + ruby, + writeShellScriptBin, + withOptionalDependencies ? false, }: let @@ -21,14 +25,13 @@ let # Else: Don't modify the arguments: exec ${ruby}/bin/ruby "$@" ''; -in bundlerApp { +in +bundlerApp { pname = "jekyll"; exes = [ "jekyll" ]; inherit ruby; - gemdir = if withOptionalDependencies - then ./full - else ./basic; + gemdir = if withOptionalDependencies then ./full else ./basic; nativeBuildInputs = [ makeWrapper ]; @@ -48,11 +51,11 @@ in bundlerApp { web server. Jekyll is the engine behind GitHub Pages, which you can use to host sites right from your GitHub repositories. ''; - homepage = "https://jekyllrb.com/"; - #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; + homepage = "https://jekyllrb.com/"; + changelog = "https://jekyllrb.com/news/releases/"; + license = licenses.mit; + maintainers = [ maintainers.anthonyroussel ]; + platforms = platforms.unix; mainProgram = "jekyll"; }; } diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 5f095debe6d6..b95198936ab3 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -21,7 +21,7 @@ gem "jekyll-redirect-from" gem "kramdown-syntax-coderay" gem "mime-types", "~> 3.0" gem "rdoc", "~> 6.0" -gem "tomlrb", "~> 1.2" +gem "tomlrb" platform :ruby, :mswin, :mingw, :x64_mingw do gem "classifier-reborn", "~> 2.2" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index de800bfeb75d..29229d1d0e35 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,16 +1,17 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (7.2.1.2) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) @@ -24,32 +25,34 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.9.1) - faraday (2.9.2) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) + execjs (2.10.0) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-net_http (3.3.0) net-http fast-stemmer (1.0.2) ffi (1.17.0) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (4.27.2) + google-protobuf (4.28.3) bigdecimal rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jekyll (4.3.3) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -84,7 +87,7 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-polyglot (1.8.0) + jekyll-polyglot (1.8.1) jekyll (>= 4.0, >= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) @@ -100,6 +103,7 @@ GEM gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) + json (2.7.4) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -113,18 +117,19 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) matrix (0.4.2) mercenary (0.4.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0604) - mini_magick (4.13.1) + mime-types-data (3.2024.1001) + mini_magick (4.13.2) mini_portile2 (2.8.7) - minitest (5.24.0) - mutex_m (0.2.0) + minitest (5.25.1) net-http (0.4.1) uri - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) @@ -134,34 +139,33 @@ GEM forwardable-extended (~> 2.6) psych (5.1.2) stringio - public_suffix (6.0.0) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) rdoc (6.7.0) psych (>= 4.0.0) - rexml (3.3.1) - strscan - rouge (4.3.0) + rexml (3.3.9) + rouge (4.4.0) safe_yaml (1.0.5) - sass-embedded (1.77.5) - google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.80.4) + google-protobuf (~> 4.28) rake (>= 13) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + securerandom (0.3.1) stringio (3.1.1) - strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - tomlrb (1.3.0) + tomlrb (2.0.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) - webrick (1.8.1) + unicode-display_width (2.6.0) + uri (0.13.1) + webrick (1.8.2) yajl-ruby (1.4.3) PLATFORMS @@ -187,8 +191,8 @@ DEPENDENCIES liquid-c (~> 4.0) mime-types (~> 3.0) rdoc (~> 6.0) - tomlrb (~> 1.2) + tomlrb yajl-ruby (~> 1.4) BUNDLED WITH - 2.5.11 + 2.5.9 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 4260c081f19c..576eee752df8 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; type = "gem"; }; - version = "7.1.3.4"; + version = "7.2.1.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -161,21 +161,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; + sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.0"; }; faraday = { - dependencies = ["faraday-net_http"]; + dependencies = ["faraday-net_http" "json" "logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1913fk7szy3bj8mf1dxs4waym5ya5fzzc5d3a8z24qs67fzfv5b5"; + sha256 = "05s5pyxh7y68jphb0lgrh0ksxbp4lmbsc6a6qg0ahj15pjqx01ni"; type = "gem"; }; - version = "2.9.2"; + version = "2.12.0"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -183,10 +183,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; type = "gem"; }; - version = "3.1.0"; + version = "3.3.0"; }; fast-stemmer = { groups = ["default"]; @@ -246,10 +246,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz"; + sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0"; type = "gem"; }; - version = "4.27.2"; + version = "4.28.3"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -278,10 +278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.6"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -289,10 +289,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a"; + sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264"; type = "gem"; }; - version = "4.3.3"; + version = "4.3.4"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -387,10 +387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbmsm30jgpbamqvbjvjgfq2w9ihdpqsbay9jrd5pljrbhvy02di"; + sha256 = "1q50kvzvc58547km41d8zp227z07jwjbc1kzqikkhqfbxb79cakd"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; jekyll-redirect-from = { dependencies = ["jekyll"]; @@ -458,6 +458,16 @@ }; version = "0.13.0"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly"; + type = "gem"; + }; + version = "2.7.4"; + }; kramdown = { dependencies = ["rexml"]; groups = ["default"]; @@ -547,6 +557,16 @@ }; version = "3.9.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; matrix = { groups = ["default"]; platforms = [{ @@ -580,35 +600,35 @@ version = "0.4.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rri45lldyk3bsg4yqpxcl1xrnxnqasnw94x03w5arq3yy7kff65"; + sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd"; type = "gem"; }; - version = "3.2024.0604"; + version = "3.2024.1001"; }; mini_magick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zbfldqc3dp9fiyz9d4hkkabkvsmx5649bs78j5008i5gzr0x6zg"; + sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; type = "gem"; }; - version = "4.13.1"; + version = "4.13.2"; }; mini_portile2 = { groups = ["default"]; @@ -625,20 +645,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.24.0"; - }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; + version = "5.25.1"; }; net-http = { dependencies = ["uri"]; @@ -657,10 +667,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.6"; + version = "1.16.7"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -700,20 +710,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; rake = { groups = ["default"]; @@ -758,25 +768,24 @@ version = "6.7.0"; }; rexml = { - dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.9"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; + sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs"; type = "gem"; }; - version = "4.3.0"; + version = "4.4.0"; }; safe_yaml = { groups = ["default"]; @@ -794,10 +803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; + sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51"; type = "gem"; }; - version = "1.77.5"; + version = "1.80.4"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -810,6 +819,16 @@ }; version = "0.9.2"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; stringio = { groups = ["default"]; platforms = []; @@ -820,16 +839,6 @@ }; version = "3.1.1"; }; - strscan = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default"]; @@ -846,10 +855,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; + sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2"; type = "gem"; }; - version = "1.3.0"; + version = "2.0.3"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -867,30 +876,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; uri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; yajl-ruby = { groups = ["default"]; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index b5b246526063..e548e2ee6b7e 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , qttools @@ -61,6 +62,12 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + + # https://github.com/keepassxreboot/keepassxc/issues/10391 + (fetchpatch { + url = "https://github.com/keepassxreboot/keepassxc/commit/6a9ed210792ac60d9ed35cc702500e5ebbb95622.patch"; + hash = "sha256-CyaVMfJ0O+5vgvmwI6rYbf0G7ryKFcLv3p4b/D6Pzw8="; + }) ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix deleted file mode 100644 index 014bc216b40b..000000000000 --- a/pkgs/applications/misc/koreader/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv -, fetchurl -, makeWrapper -, fetchFromGitHub -, dpkg -, glib -, gnutar -, gtk3-x11 -, luajit -, sdcv -, SDL2 }: -let - luajit_lua52 = luajit.override { enable52Compat = true; }; -in -stdenv.mkDerivation rec { - pname = "koreader"; - version = "2024.04"; - - - src = { - aarch64-linux = fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; - }; - armv7l-linux = fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; - hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; - }; - x86_64-linux = fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src_repo = fetchFromGitHub { - repo = "koreader"; - owner = "koreader"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc="; - }; - - sourceRoot = "."; - nativeBuildInputs = [ makeWrapper dpkg ]; - buildInputs = [ - glib - gnutar - gtk3-x11 - luajit_lua52 - sdcv - SDL2 - ]; - unpackCmd = "dpkg-deb -x ${src} ."; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out - cp -R usr/* $out/ - ln -sf ${luajit_lua52}/bin/luajit $out/lib/koreader/luajit - ln -sf ${sdcv}/bin/sdcv $out/lib/koreader/sdcv - ln -sf ${gnutar}/bin/tar $out/lib/koreader/tar - find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; - find $out -xtype l -print -delete - wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc.lib ] - } - ''; - - meta = with lib; { - homepage = "https://github.com/koreader/koreader"; - changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; - description = - "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; - mainProgram = "koreader"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; - license = licenses.agpl3Only; - maintainers = with maintainers; [ contrun neonfuz]; - }; -} diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix deleted file mode 100644 index f44a44523aa1..000000000000 --- a/pkgs/applications/misc/krabby/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: -rustPlatform.buildRustPackage rec { - pname = "krabby"; - version = "0.2.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-R4GW0e0tjLiCXQMf8iA+yYyMp43/28GeNsjs+QNQMSM="; - }; - - cargoHash = "sha256-eQyU0sMfecOjX5k1qYeetrAhk41FIMcg9QmhhTYOxWc="; - - meta = with lib; { - description = "Print pokemon sprites in your terminal"; - homepage = "https://github.com/yannjor/krabby"; - changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}"; - license = licenses.gpl3; - maintainers = with maintainers; [ ruby0b ]; - mainProgram = "krabby"; - }; -} diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix deleted file mode 100644 index 5f38d116d82e..000000000000 --- a/pkgs/applications/misc/kratos/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - fetchFromGitHub, - buildGoModule, - lib, - stdenv -}: -let - pname = "kratos"; - version = "1.2.0"; -in -buildGoModule { - inherit pname version; - - src = fetchFromGitHub { - owner = "ory"; - repo = "kratos"; - rev = "v${version}"; - hash = "sha256-KqF6DYrEsmPj2PtI2+5ztE0m9uBO1gpNlvdo+Aw6REA="; - }; - - vendorHash = "sha256-6gJf+8AKjV83MTF0rC8OxDwkwGx4CJg7SdfNgcja8QY="; - - subPackages = [ "." ]; - - tags = [ "sqlite" ]; - - # Pass versioning information via ldflags - ldflags = [ - "-X github.com/ory/kratos/driver/config.Version=${version}" - ]; - - doCheck = false; - - preBuild = '' - # Patch shebangs - files=( - test/e2e/run.sh - script/testenv.sh - script/test-envs.sh - script/debug-entrypoint.sh - ) - patchShebangs "''${files[@]}" - - # patchShebangs doesn't work for this Makefile, do it manually - substituteInPlace Makefile --replace-fail '/usr/bin/env bash' '${stdenv.shell}' - ''; - - meta = { - mainProgram = "kratos"; - description = "API-first Identity and User Management system that is built according to cloud architecture best practices"; - homepage = "https://www.ory.sh/kratos/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mrmebelman ]; - }; -} diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix deleted file mode 100644 index 82b30866f842..000000000000 --- a/pkgs/applications/misc/lunatask/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, appimageTools, fetchurl }: - -let - version = "2.0.11"; - pname = "lunatask"; - - src = fetchurl { - url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - -in -appimageTools.wrapType2 rec { - inherit pname version src; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - passthru.updateScript = ./update.py; - - meta = with lib; { - description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; - longDescription = '' - Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health. - ''; - homepage = "https://lunatask.app"; - downloadPage = "https://lunatask.app/download"; - changelog = "https://lunatask.app/releases/${version}"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ henkery ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "lunatask"; - }; -} diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index bf3c3b06dc83..0a6d4549498f 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -13,12 +13,12 @@ }: mkDerivation rec { - version = "2.4.1"; + version = "2.4.2.1"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz"; - hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U="; + hash = "sha256-HSscer45Hi+0kQneLI4Tp9/mBfJ99o9om/lH36/HpNk="; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix deleted file mode 100644 index d3e931116e77..000000000000 --- a/pkgs/applications/misc/minder/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, desktop-file-utils -, meson -, ninja -, pkg-config -, python3 -, shared-mime-info -, vala -, wrapGAppsHook3 -, cairo -, discount -, glib -, gtk3 -, gtksourceview4 -, hicolor-icon-theme # for setup-hook -, json-glib -, libarchive -, libgee -, libhandy -, libxml2 -, pantheon -}: - -stdenv.mkDerivation rec { - pname = "minder"; - version = "1.16.4"; - - src = fetchFromGitHub { - owner = "phase1geo"; - repo = pname; - rev = version; - sha256 = "sha256-1r2PbBYw4mmiScKbX9BGqe4i+emSvismJfPm3opLlOg="; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - python3 - shared-mime-info - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - cairo - discount - glib - gtk3 - gtksourceview4 - hicolor-icon-theme - json-glib - libarchive - libgee - libhandy - libxml2 - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - postFixup = '' - for x in $out/bin/*; do - ln -vrs $x "$out/bin/''${x##*.}" - done - ''; - - meta = with lib; { - description = "Mind-mapping application for elementary OS"; - homepage = "https://github.com/phase1geo/Minder"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; - mainProgram = "com.github.phase1geo.minder"; - }; -} diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix deleted file mode 100644 index 8f3cb528722d..000000000000 --- a/pkgs/applications/misc/notesnook/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv, appimageTools, fetchurl, _7zz }: - -let - pname = "notesnook"; - version = "3.0.16"; - - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - suffix = { - x86_64-linux = "linux_x86_64.AppImage"; - x86_64-darwin = "mac_x64.dmg"; - aarch64-darwin = "mac_arm64.dmg"; - }.${system} or throwSystem; - - src = fetchurl { - url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; - hash = { - x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0="; - x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc="; - aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA="; - }.${system} or throwSystem; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - - meta = with lib; { - description = "Fully open source & end-to-end encrypted note taking alternative to Evernote"; - longDescription = '' - Notesnook is a free (as in speech) & open source note taking app - focused on user privacy & ease of use. To ensure zero knowledge - principles, Notesnook encrypts everything on your device using - XChaCha20-Poly1305 & Argon2. - ''; - homepage = "https://notesnook.com"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ cig0 j0lol ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - mainProgram = "notesnook"; - }; - - linux = appimageTools.wrapType2 rec { - inherit pname version src meta; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - extraInstallCommands = '' - install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/notesnook.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' - ''; - }; - - darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ _7zz ]; - - sourceRoot = "Notesnook.app"; - - # 7zz did not unpack in setup hook for some reason, done manually here - unpackPhase = '' - 7zz x $src - ''; - - installPhase = '' - mkdir -p $out/Applications/Notesnook.app - cp -R . $out/Applications/Notesnook.app - ''; - }; -in -if stdenv.hostPlatform.isDarwin -then darwin -else linux diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix deleted file mode 100644 index 34bbf45e8ebd..000000000000 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, gtk-layer-shell -}: - -buildGoModule rec { - pname = "nwg-dock-hyprland"; - version = "0.2.2"; - - src = fetchFromGitHub { - owner = "nwg-piotr"; - repo = "nwg-dock-hyprland"; - rev = "v${version}"; - hash = "sha256-iamDOQcQJRdFVnwffWPIXHlY0J4orfrEbfLzaoeV+KM="; - }; - - vendorHash = "sha256-cZ5w7B8bi0faOVWoQ6eeW5ejCZJgnNB91DQalC75mPo="; - - ldflags = [ "-s" "-w" ]; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ gtk-layer-shell ]; - - postInstall = '' - install -d $out/share/nwg-dock-hyprland - cp -r images $out/share/nwg-dock-hyprland/images - install -Dm644 config/style.css $out/share/nwg-dock-hyprland/style.css - ''; - - meta = { - description = "GTK3-based dock for Hyprland"; - mainProgram = "nwg-dock-hyprland"; - homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ aleksana ]; - }; -} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix deleted file mode 100644 index 5052f0aef02f..000000000000 --- a/pkgs/applications/misc/octoprint/default.nix +++ /dev/null @@ -1,279 +0,0 @@ -{ - pkgs, - stdenv, - callPackage, - lib, - fetchFromGitHub, - fetchPypi, - python3, - substituteAll, - nix-update-script, - nixosTests, - # To include additional plugins, pass them here as an overlay. - packageOverrides ? self: super: { }, -}: -let - - py = python3.override { - self = py; - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - ( - # Due to flask > 2.3 the login will not work - self: super: { - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.2.3"; - format = "setuptools"; - pyproject = null; - src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; - }; - doCheck = false; - }); - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.2.5"; - format = "setuptools"; - src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; - }; - doCheck = false; - }); - flask-login = super.flask-login.overridePythonAttrs (oldAttrs: rec { - version = "0.6.3"; - src = fetchPypi { - pname = "Flask-Login"; - inherit version; - hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; - }; - build-system = [ self.setuptools ]; - doCheck = false; # DeprecationWarnings - }); - - netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { - version = "0.9.0"; - - src = fetchPypi { - pname = "netaddr"; - inherit version; - hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; - }; - }); - }) - - # Built-in dependency - (self: super: { - octoprint-filecheck = self.buildPythonPackage rec { - pname = "OctoPrint-FileCheck"; - version = "2024.3.27"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-FileCheck"; - rev = version; - sha256 = "sha256-2MK9whPpgwQC+WPbPf628Ocjz6t8HKozblP7dmjD7RQ="; - }; - doCheck = false; - }; - }) - - # Built-in dependency - (self: super: { - octoprint-firmwarecheck = self.buildPythonPackage rec { - pname = "OctoPrint-FirmwareCheck"; - version = "2021.10.11"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-FirmwareCheck"; - rev = version; - hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI="; - }; - doCheck = false; - }; - }) - - (self: super: { - octoprint-pisupport = self.buildPythonPackage rec { - pname = "OctoPrint-PiSupport"; - version = "2023.5.24"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-PiSupport"; - rev = version; - hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; - }; - - # requires octoprint itself during tests - doCheck = false; - postPatch = '' - substituteInPlace octoprint_pi_support/__init__.py \ - --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd - ''; - }; - }) - - (self: super: { - octoprint = self.buildPythonPackage rec { - pname = "OctoPrint"; - version = "1.10.2"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint"; - rev = version; - hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; - }; - - propagatedBuildInputs = - with self; - [ - argon2-cffi - blinker - cachelib - click - colorlog - emoji - feedparser - filetype - flask - flask-babel - flask-assets - flask-login - flask-limiter - frozendict - future - itsdangerous - immutabledict - jinja2 - markdown - markupsafe - netaddr - netifaces - octoprint-filecheck - octoprint-firmwarecheck - passlib - pathvalidate - pkginfo - pip - psutil - pylru - pyserial - pyyaml - regex - requests - rsa - sarge - semantic-version - sentry-sdk - setuptools - tornado - unidecode - watchdog - websocket-client - werkzeug - wrapt - zeroconf - zipstream-ng - class-doc - pydantic_1 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ py.pkgs.appdirs ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ octoprint-pisupport ]; - - nativeCheckInputs = with self; [ - ddt - mock - pytestCheckHook - ]; - - patches = [ - # substitute pip and let it find out, that it can't write anywhere - (substituteAll { - src = ./pip-path.patch; - pip = "${self.pip}/bin/pip"; - }) - - # hardcore path to ffmpeg and hide related settings - (substituteAll { - src = ./ffmpeg-path.patch; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; - }) - ]; - - postPatch = - let - ignoreVersionConstraints = [ - "cachelib" - "colorlog" - "emoji" - "immutabledict" - "PyYAML" - "sarge" - "sentry-sdk" - "watchdog" - "wrapt" - "zeroconf" - "Flask-Login" - "werkzeug" - "flask" - "Flask-Limiter" - "blinker" - ]; - in - '' - sed -r -i \ - ${ - lib.concatStringsSep "\n" (map (e: ''-e 's@${e}[<>=]+.*@${e}",@g' \'') ignoreVersionConstraints) - } - setup.py - ''; - - dontUseSetuptoolsCheck = true; - - preCheck = '' - export HOME=$(mktemp -d) - rm pytest.ini - ''; - - disabledTests = [ - "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ]; - disabledTestPaths = [ - "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12 - ]; - - passthru = { - inherit (self) python; - updateScript = nix-update-script { }; - tests = { - plugins = (callPackage ./plugins.nix { }) super self; - inherit (nixosTests) octoprint; - }; - }; - - meta = with lib; { - homepage = "https://octoprint.org/"; - description = "Snappy web interface for your 3D printer"; - mainProgram = "octoprint"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ - abbradar - gebner - WhittlesJr - gador - ]; - }; - }; - }) - (callPackage ./plugins.nix { }) - packageOverrides - ]); - }; -in -with py.pkgs; -toPythonApplication octoprint diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 68dce0ee1484..79d053fa2083 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.6"; + version = "5.2.9"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-u9ldHJkY3/VfykBFgVY8Ah/uYNpTIkLyvPY7zfLWN38="; + hash = "sha256-ZLVO2VD0XUVUG/GSot21c6nJ2N8h39vDzyzAzk1pQ6c="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index d326169e560d..43b179977301 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -80,4 +80,18 @@ in ]; jdk = jdk17; }; + + pdfstudio2024 = callPackage ./common.nix rec { + inherit desktopName longDescription pname program year; + version = "${year}.0.0"; + src = fetchurl { + url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; + sha256 = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM="; + }; + extraBuildInputs = [ + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + ]; + jdk = jdk17; + }; + }.${pname} diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 08835ba6a08a..59c732ec81d0 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ="; + sha256 = "sha256-VbAGdMeuIQLzcHwYoPbkC0UjzxXgW4BGlYfz32oHmms="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook copyDesktopItems ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index ecce3066ed5b..8d68045e94dd 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ moredread tweber tmarkus ]; + maintainers = with maintainers; [ tweber tmarkus ]; platforms = platforms.unix; } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { mainProgram = "PrusaSlicer"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index d790982b77ee..5e3bc69ebec7 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -88,7 +88,7 @@ let inherit description; homepage = "https://github.com/supermerill/SuperSlicer"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ cab404 moredread tmarkus ]; + maintainers = with maintainers; [ cab404 tmarkus ]; mainProgram = "superslicer"; }; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix deleted file mode 100644 index 5f226752ccd3..000000000000 --- a/pkgs/applications/misc/pytrainer/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, python310 -, fetchFromGitHub -, gdk-pixbuf -, adwaita-icon-theme -, gpsbabel -, glib-networking -, glibcLocales -, gobject-introspection -, gtk3 -, perl -, sqlite -, tzdata -, webkitgtk_4_0 -, wrapGAppsHook3 -, xvfb-run -}: - -let - python = python310.override { - self = python; - packageOverrides = (self: super: { - matplotlib = super.matplotlib.override { - enableGtk3 = true; - }; - }); - }; -in python.pkgs.buildPythonApplication rec { - pname = "pytrainer"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "pytrainer"; - repo = "pytrainer"; - rev = "v${version}"; - hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0="; - }; - - propagatedBuildInputs = with python.pkgs; [ - sqlalchemy - python-dateutil - matplotlib - lxml - setuptools - requests - gdal - ]; - - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook3 - ]; - - buildInputs = [ - sqlite - gtk3 - webkitgtk_4_0 - glib-networking - adwaita-icon-theme - gdk-pixbuf - ]; - - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ]) - ]; - - nativeCheckInputs = [ - glibcLocales - perl - xvfb-run - ] ++ (with python.pkgs; [ - mysqlclient - psycopg2 - ]); - - postPatch = '' - substituteInPlace pytrainer/platform.py \ - --replace 'sys.prefix' "\"$out\"" - ''; - - checkPhase = '' - env \ - HOME=$TEMPDIR \ - TZDIR=${tzdata}/share/zoneinfo \ - TZ=Europe/Kaliningrad \ - LC_TIME=C \ - xvfb-run -s '-screen 0 800x600x24' \ - ${python.interpreter} -m unittest - ''; - - meta = with lib; { - homepage = "https://github.com/pytrainer/pytrainer"; - description = "Application for logging and graphing sporting excursions"; - mainProgram = "pytrainer"; - maintainers = with maintainers; [ rycee dotlambda ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix deleted file mode 100644 index 206ca96d0100..000000000000 --- a/pkgs/applications/misc/sdcv/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, gettext, readline }: - -stdenv.mkDerivation rec { - pname = "sdcv"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "Dushistov"; - repo = "sdcv"; - rev = "v${version}"; - sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4="; - }; - - hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glib gettext readline ]; - - preInstall = '' - mkdir locale - ''; - - env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; - - meta = with lib; { - homepage = "https://dushistov.github.io/sdcv/"; - description = "Console version of StarDict"; - maintainers = with maintainers; [ lovek323 ]; - license = licenses.gpl2; - platforms = platforms.unix; - mainProgram = "sdcv"; - }; -} diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix deleted file mode 100644 index c90a7116b6df..000000000000 --- a/pkgs/applications/misc/sidequest/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ stdenv -, lib -, fetchurl -, buildFHSEnv -, makeDesktopItem -, makeWrapper -, alsa-lib -, at-spi2-atk -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, mesa -, nss -, nspr -, libdrm -, xorg -, libxkbcommon -, libxshmfence -, pango -, systemd -, icu -, openssl -, zlib -}: - let - pname = "sidequest"; - version = "0.10.33"; - - desktopItem = makeDesktopItem rec { - name = "SideQuest"; - exec = "SideQuest"; - desktopName = name; - genericName = "VR App Store"; - categories = [ "Settings" "PackageManager" ]; - }; - - sidequest = stdenv.mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995"; - }; - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/lib/SideQuest" "$out/bin" - tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 - - ln -s "$out/lib/SideQuest/sidequest" "$out/bin" - ''; - - postFixup = let - libPath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - mesa - nss - nspr - libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - libxkbcommon - xorg.libxkbfile - pango - stdenv.cc.cc.lib - systemd - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/lib/SideQuest" \ - "$out/lib/SideQuest/sidequest" - ''; - }; - in buildFHSEnv { - name = "SideQuest"; - - passthru = { - inherit pname version; - - meta = with lib; { - description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; - homepage = "https://github.com/SideQuestVR/SideQuest"; - downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ joepie91 rvolosatovs ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "SideQuest"; - }; - }; - - targetPkgs = pkgs: [ - sidequest - # Needed in the environment on runtime, to make QuestSaberPatch work - icu openssl zlib - libxkbcommon libxshmfence - ]; - - extraInstallCommands = '' - mkdir -p "$out/share/applications" - ln -s ${desktopItem}/share/applications/* "$out/share/applications" - ''; - - runScript = "sidequest"; - } diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/applications/misc/spnavcfg/default.nix deleted file mode 100644 index 921947fc1b80..000000000000 --- a/pkgs/applications/misc/spnavcfg/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, gtk2 }: - -stdenv.mkDerivation rec { - pname = "spnavcfg"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "FreeSpacenav"; - repo = pname; - rev = "v${version}"; - sha256 = "180mkdis15gxs79rr3f7hpwa1p6v81bybw37pzzdjnmqwqrc08a0"; - }; - - patches = [ - # Changes the pidfile path from /run/spnavd.pid to $XDG_RUNTIME_DIR/spnavd.pid - # to allow for a user service - ./configure-pidfile-path.patch - # Changes the config file path from /etc/spnavrc to $XDG_CONFIG_HOME/spnavrc or $HOME/.config/spnavrc - # to allow for a user service - ./configure-cfgfile-path.patch - ]; - - postPatch = '' - sed -i s/4775/775/ Makefile.in - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - meta = with lib; { - homepage = "https://spacenav.sourceforge.net/"; - description = "Interactive configuration GUI for space navigator input devices"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ gebner ]; - mainProgram = "spnavcfg"; - }; -} diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix deleted file mode 100644 index 3e0b7e50d93e..000000000000 --- a/pkgs/applications/misc/ssh-tools/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitea, installShellFiles, perl }: - -buildGoModule rec { - pname = "ssh-tools"; - version = "1.8-unstable-2024-03-18"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "vaporup"; - repo = "ssh-tools"; - rev = "69c73844b2498c46f1293b129808bfdce8822c28"; - hash = "sha256-cG75Jn331G0HZZyrE+JWC05f6DgYBz6sx8MTCxsG/vw="; - }; - - vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug="; - - subPackages = [ - "cmd/go/ssh-authorized-keys" - "cmd/go/ssh-sig" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = [ perl ]; - - postInstall = '' - install cmd/{bash,perl}/ssh-*/ssh-* -t $out/bin - installManPage man/*.1 - ''; - - meta = with lib; { - description = "Making SSH more convenient"; - homepage = "https://codeberg.org/vaporup/ssh-tools"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix deleted file mode 100644 index 496644ff4d42..000000000000 --- a/pkgs/applications/misc/toot/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, nixosTests }: - -python3Packages.buildPythonApplication rec { - pname = "toot"; - version = "0.42.0"; - - src = fetchFromGitHub { - owner = "ihabunek"; - repo = "toot"; - rev = "refs/tags/${version}"; - sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU="; - }; - - nativeCheckInputs = with python3Packages; [ pytest ]; - - propagatedBuildInputs = with python3Packages; - [ - requests beautifulsoup4 future wcwidth - urwid urwidgets psycopg2 tomlkit click - ]; - - checkPhase = '' - py.test - ''; - - passthru.tests.toot = nixosTests.pleroma; - - meta = with lib; { - description = "Mastodon CLI interface"; - mainProgram = "toot"; - homepage = "https://github.com/ihabunek/toot"; - license = licenses.gpl3; - maintainers = [ maintainers.matthiasbeyer ]; - }; - -} diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix deleted file mode 100644 index 952f79a39325..000000000000 --- a/pkgs/applications/misc/tuckr/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "tuckr"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "RaphGL"; - repo = "Tuckr"; - rev = version; - hash = "sha256-5KDBtbovs3tPuLNJqHyMM9mGV8cNgJFv3QqAtLVOhns="; - }; - - cargoHash = "sha256-LvvC60CNl/y1rx4UTKVLFeiaJBNpou5JrCdsmZvTccU="; - - doCheck = false; # test result: FAILED. 5 passed; 3 failed; - - meta = with lib; { - description = "Super powered replacement for GNU Stow"; - homepage = "https://github.com/RaphGL/Tuckr"; - changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mimame ]; - mainProgram = "tuckr"; - }; -} diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix deleted file mode 100644 index b5b15b48d7f8..000000000000 --- a/pkgs/applications/misc/upwork/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, requireFile, dpkg, wrapGAppsHook3, autoPatchelfHook -, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb -, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender -, libXScrnSaver, libXtst, mesa, nspr, nss, openssl, pango, systemd }: - -stdenv.mkDerivation rec { - pname = "upwork"; - version = "5.8.0.33"; - - src = requireFile { - name = "${pname}_${version}_amd64.deb"; - url = "https://www.upwork.com/ab/downloads/os/linux/"; - sha256 = "sha256-MU0usTAfNNMN8OYmS6dWU6Xk2o5dg5J0V7OQiv3dLug="; - }; - - nativeBuildInputs = [ - dpkg - wrapGAppsHook3 - autoPatchelfHook - ]; - - buildInputs = [ - libcxx systemd libpulseaudio - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups - dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify - libuuid libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes - libXi libXrandr libXrender libXScrnSaver libXtst mesa nspr nss pango systemd - ]; - - libPath = lib.makeLibraryPath buildInputs; - - dontWrapGApps = true; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - # Now it requires lib{ssl,crypto}.so.1.0.0. Fix based on Spotify pkg. - # https://github.com/NixOS/nixpkgs/blob/efea022d6fe0da84aa6613d4ddeafb80de713457/pkgs/applications/audio/spotify/default.nix#L129 - mkdir -p $out/lib/upwork - ln -s ${lib.getLib openssl}/lib/libssl.so $out/lib/upwork/libssl.so.1.0.0 - ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/upwork/libcrypto.so.1.0.0 - - sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop - makeWrapper $out/opt/Upwork/upwork \ - $out/bin/upwork \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix LD_LIBRARY_PATH : ${libPath} - - runHook postInstall - ''; - - meta = with lib; { - description = "Online freelancing platform desktop application for time tracking"; - homepage = "https://www.upwork.com/ab/downloads/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zakkor ]; - }; -} diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix deleted file mode 100644 index 224e105e51e7..000000000000 --- a/pkgs/applications/misc/valent/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, desktop-file-utils -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, evolution-data-server-gtk4 -, glib -, glib-networking -, gnutls -, gst_all_1 -, json-glib -, libadwaita -, libpeas2 -, libportal-gtk4 -, pipewire -, pulseaudio -, sqlite -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "valent"; - version = "1.0.0.alpha.45"; - - src = fetchFromGitHub { - owner = "andyholmes"; - repo = "valent"; - rev = "v${finalAttrs.version}"; - hash = "sha256-hOVWvk4U6VoWAvXNHK1vTm/am69EFqDmSb0NofWVQj8="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - evolution-data-server-gtk4 - glib - glib-networking - gnutls - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - json-glib - libadwaita - libpeas2 - libportal-gtk4 - pipewire - pulseaudio - sqlite - ]; - - mesonFlags = [ - "-Dplugin_bluez=true" - # FIXME: libpeas2 (and libpeas) not compiled with -Dvapi=true - "-Dvapi=false" - ]; - - meta = { - description = "Implementation of the KDE Connect protocol, built on GNOME platform libraries"; - mainProgram = "valent"; - longDescription = '' - Note that you have to open firewall ports for other devices - to connect to it. Use either: - ```nix - programs.kdeconnect = { - enable = true; - package = pkgs.valent; - } - ``` - or open corresponding firewall ports directly: - ```nix - networking.firewall = rec { - allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; - allowedUDPPortRanges = allowedTCPPortRanges; - } - ``` - ''; - homepage = "https://valent.andyholmes.ca"; - changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 2ddb36a87de8..0863756777e2 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xca"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${finalAttrs.version}"; - hash = "sha256-Ty6j0Fl2smMGxp+1nnD3Fu83bn19gqtRKSA1wDgNZes="; + hash = "sha256-2TqqHTutG+5YU2mJNTS3pvtEqV7qKVB+j/dipdmEkIk="; }; buildInputs = [ openssl qtbase ]; @@ -36,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/xca.app" "$out/Applications/xca.app" + ''; + meta = with lib; { description = "X509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; mainProgram = "xca"; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix deleted file mode 100644 index 23fa019d75dc..000000000000 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, flutter324 -, python3 -, fetchFromGitHub -, pcre2 -, libnotify -, libappindicator -, pkg-config -, gnome-screenshot -, makeWrapper -, removeReferencesTo -}: - -flutter324.buildFlutterApplication rec { - pname = "yubioath-flutter"; - version = "7.1.0"; - - src = fetchFromGitHub { - owner = "Yubico"; - repo = "yubioath-flutter"; - rev = version; - hash = "sha256-sAs/tglLt1igovtfs07+7G5/xeMcQgfR9G4b7VzyDVY="; - }; - - passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - - pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - window_manager = "sha256-mLX51nbWFccsAfcqLQIYDjYz69y9wAz4U1RZ8TIYSj0="; - }; - - postPatch = '' - rm -f pubspec.lock - - substituteInPlace linux/CMakeLists.txt \ - --replace-fail "../build/linux/helper" "${passthru.helper}/libexec/helper" - ''; - - preInstall = '' - # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere. - chmod -R +w build - ''; - - postInstall = '' - # Swap the authenticator-helper symlink with the correct symlink. - ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper" - - # Move the icon. - mkdir $out/share/icons - mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/icons - - # Cleanup. - rm -rf \ - "$out/app/$pname/README.adoc" \ - "$out/app/$pname/desktop_integration.sh" \ - "$out/app/$pname/linux_support" \ - $out/bin/* # We will repopulate this directory later. - - # Symlink binary. - ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter" - - # Set the correct path to the binary in desktop file. - substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ - --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ - --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" - ''; - - # Needed for QR scanning to work - extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} - ''; - - nativeBuildInputs = [ - makeWrapper - removeReferencesTo - pkg-config - ]; - - buildInputs = [ - pcre2 - libnotify - libappindicator - ]; - - meta = with lib; { - description = "Yubico Authenticator for Desktop"; - mainProgram = "yubioath-flutter"; - homepage = "https://github.com/Yubico/yubioath-flutter"; - license = licenses.asl20; - maintainers = with maintainers; [ lukegb ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix deleted file mode 100644 index 97bf552604d4..000000000000 --- a/pkgs/applications/networking/avalanchego/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ IOKit -, buildGoModule -, fetchFromGitHub -, lib -, stdenv -}: - -buildGoModule rec { - pname = "avalanchego"; - version = "1.11.11"; - - src = fetchFromGitHub { - owner = "ava-labs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-9NhwxB5AeGvQgZbjNu5WWHiP194ws7s1WDtCntLr//g="; - }; - - vendorHash = "sha256-A8Bf/KzTFvC/hFLU1k6M89649wjoqnIXRQ1uJaTj9YA="; - # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 - proxyVendor = true; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; - - subPackages = [ "main" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}" - ]; - - postInstall = '' - mv $out/bin/{main,${pname}} - ''; - - meta = with lib; { - description = "Go implementation of an Avalanche node"; - homepage = "https://github.com/ava-labs/avalanchego"; - changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ urandom qjoly ]; - mainProgram = "avalanchego"; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9e2a0d173ffc..86b09ef7d10f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -252,14 +252,6 @@ let # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn # flag (declare_args) so we simply hardcode it to false. ./patches/widevine-disable-auto-download-allow-bundle.patch - ] ++ lib.optionals (versionRange "125" "126") [ - # Fix building M125 with ninja 1.12. Not needed for M126+. - # https://issues.chromium.org/issues/336911498 - # https://chromium-review.googlesource.com/c/chromium/src/+/5487538 - (githubPatch { - commit = "a976cb05b4024b7a6452d1541378d718cdfe33e6"; - hash = "sha256-K2PSeJAvhGH2/Yp63/4mJ85NyqXqDDkMWY+ptrpgmOI="; - }) ] ++ lib.optionals (versionRange "127" "128") [ # Fix missing chrome/browser/ui/webui_name_variants.h dependency # and ninja 1.12 compat in M127. @@ -293,21 +285,14 @@ let # Chromium reads initial_preferences from its own executable directory # This patch modifies it to read /etc/chromium/initial_preferences ./patches/chromium-initial-prefs.patch - ] ++ lib.optionals (versionRange "120" "126") [ - # Partial revert to build M120+ with LLVM 17: # https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956 # https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29 - ./patches/chromium-120-llvm-17.patch - ] ++ lib.optionals (chromiumVersionAtLeast "126") [ - # Rebased variant of patch right above to build M126+ with LLVM 17. + # Rebased variant of patch to build M126+ with LLVM 17. # staging-next will bump LLVM to 18, so we will be able to drop this soon. ./patches/chromium-126-llvm-17.patch - ] ++ lib.optionals (versionRange "121" "126") [ - # M121 is the first version to require the new rust toolchain. + ] ++ lib.optionals (versionRange "126" "129") [ # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. - ./patches/chromium-121-rust.patch - ] ++ lib.optionals (versionRange "126" "129") [ # Rebased variant of patch right above to build M126+ with our rust and our clang. ./patches/chromium-126-rust.patch ] ++ lib.optionals (chromiumVersionAtLeast "129") [ diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-17.patch deleted file mode 100644 index 921ffe451139..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-17.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index de1cd6e..bb5700b 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -616,24 +616,6 @@ config("compiler") { - } - } - -- # TODO(crbug.com/1488374): This causes binary size growth and potentially -- # other problems. -- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version. -- if (default_toolchain != "//build/toolchain/cros:target" && -- !llvm_android_mainline) { -- cflags += [ -- "-mllvm", -- "-split-threshold-for-reg-with-hint=0", -- ] -- if (use_thin_lto && is_a_target_toolchain) { -- if (is_win) { -- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] -- } else { -- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] -- } -- } -- } -- - # TODO(crbug.com/1235145): Investigate why/if this should be needed. - if (is_win) { - cflags += [ "/clang:-ffp-contract=off" ] diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-121-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-121-rust.patch deleted file mode 100644 index b5292c80858b..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-121-rust.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -1629,16 +1629,6 @@ - configs += [ "//build/config/c++:runtime_library" ] - } - -- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We -- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins -- # library. The Rust symbols are marked as weak, so that they can be replaced by -- # the C++ symbols. This config ensures the C++ symbols exist and are strong in -- # order to cause that replacement to occur by explicitly linking in clang's -- # compiler-rt library. -- if (is_clang && toolchain_has_rust) { -- configs += [ "//build/config/clang:compiler_builtins" ] -- } -- - # TODO(crbug.com/830987): Come up with a better name for is POSIX + Fuchsia - # configuration. - if (is_posix || is_fuchsia) { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 202375b4867e..9e57f0d1c316 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI="; + hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA="; hash_darwin_aarch64 = - "sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw="; - hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo="; - version = "130.0.6723.69"; + "sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk="; + hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c="; + version = "130.0.6723.91"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-09-09"; }; }; - hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; - version = "130.0.6723.69"; + hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M="; + version = "130.0.6723.91"; }; ungoogled-chromium = { deps = { @@ -27,11 +27,11 @@ version = "2024-09-09"; }; ungoogled-patches = { - hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU="; - rev = "130.0.6723.69-1"; + hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw="; + rev = "130.0.6723.91-1"; }; }; - hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; - version = "130.0.6723.69"; + hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M="; + version = "130.0.6723.91"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 4a2464681b2c..7663ccfe4c60 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0b9"; + version = "133.0b2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ach/firefox-133.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "2bf1ccf753ee0f63de4c99dce1947add6ae443a3a7c016edcc7c2c8db2483e90"; + sha256 = "f4517d9d5d065601e50358800d0a014908c96fdba9ccf452aec3dd06a1699158"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/af/firefox-133.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7fc7eef2a27e86355628a32c341372a1c9029f25d5791e9f5a5e4a702f4efd0e"; + sha256 = "3aa85e9e1f1993dc178a9413a4b157b800cb163948fdd1bcbd03b80621a66ce0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/an/firefox-133.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "fc5bf48ed17526b860c282070bfc7475516cf8cb3dcca1f5943c239b225254d4"; + sha256 = "93c67c6918e049245aa0c87d004d0c7a6af16ff12d87f38a7b6a14efe3ad5da9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ar/firefox-133.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6e600a4d224af329f98e8898207b97d568aec7086f3dbd3aebf64756818a7bb7"; + sha256 = "5a316f72f1e2947922373bb3756dfdd32dd0c93d67b51f5f8f9959503873138b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ast/firefox-133.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d2f5adc71fe72f8d17fea11b6d9c0cb32fc787ea91320ecb63d9b47d774954f0"; + sha256 = "e3de0179c3bdf2c652364ba1312f8bdcc1c00656ec7a457ed3356bf293c256d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/az/firefox-133.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "cf7f020204382c7bdd5134aa436c77aa8c2d97a67cde6875560aced14ed6bc12"; + sha256 = "fe172d67c584f42d9c0d546599cf4c7cdc32d40eeee7e33e822d45692ecab3bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/be/firefox-133.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1dbbd2b1b36bdbeb93b4f2702b0567749903adb45161468287b4d0b267c1df5c"; + sha256 = "8231bd09703f86c09b0d859c7d8a92bcb2e742f27e09bcfa5e2d8e04176d90f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/bg/firefox-133.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "dddb31bbdd0eb21551ec2f8223cf40d30ab4436b381f9cdaf6011afd85f7464b"; + sha256 = "c738ada2e0499bff2929f18814ddcbf02465a41a61f69a3e3a6cc8b67488189e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/bn/firefox-133.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "aeb5cfe60baeecfea03c68d610b0296a76e3481d15c656413a16cb102042d50c"; + sha256 = "355d953084a114e3198b08e9f32e746176acfb89930444a93a314e3192993774"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/br/firefox-133.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "723f991b7c27a6cfdf35e9eb21a36c5b16b3ff5f89d38c31f53dcd81ab03a194"; + sha256 = "4fb2d964cbc6d59b2313b0223fca97443ca558bdd660d6c3829f6f55feec9e51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/bs/firefox-133.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1fc1a108d18a2c12413fbbeb4f5b4d3a07ae5ba7ab987087bcdea9cbe8477579"; + sha256 = "6efef1d937dc2d33fd553ca72ec7aa4538a9ad36d4841dcde01d90af44e9277b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ca-valencia/firefox-133.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "0164347e61ec42124bcd92d9cdda3cafbeff1a1bfc90f471a7a466de8ef81074"; + sha256 = "fb39ad32ada22e3c6bb6cb68b8476f3f864e57b166a8f5b9919654a36ab28f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ca/firefox-133.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c6951037e07d9c97ab3490d486c1698222ba99e3e6e61bd8d5916172d0538ce0"; + sha256 = "7606518842b85ce9820c68af5eef92b5a577cad1b2379f47e950df55b44f566b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/cak/firefox-133.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2ae7d27b0cd4066e9804fc499ded8d0493e6ef93a76a2e705c4208dbaa0748bf"; + sha256 = "9b88d37fe6b44e50dbeaab41d44abaee32bc94e3ef3099c0c49146e939dff468"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/cs/firefox-133.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d9bffc7e6f9ab2ca00716d5df6cf552034d7c5d12922b71b34d2e8aae2bff994"; + sha256 = "dbb9f9e20a18d3c5fa65b8b471cd9017de3121dc40e06e7fde07b00181e2ffe3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/cy/firefox-133.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "792862fb4834aa7b6126400059dc86ab476066683f3197f428d734cdb15dda55"; + sha256 = "03e90be7f34c00c8e3264ec0b9c19e4f8a9acbeb55cc37f73c3cabced792a712"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/da/firefox-133.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "fb08cc0f8e783ec931a2714f362b46327e031ac172613e5cae26d40be3f2b44d"; + sha256 = "00073cd58c1d89cb89b22cd271b5aef584db0eb898a00d378acbb8a83cb98679"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/de/firefox-133.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "45cb5a2905fc963269c4c5cc815d4259afaf8d8025bcfe1a19f88e52f5c42ac5"; + sha256 = "1ee7d85e4463e588f84ba32464b38f1cef2d7b93bc6b9aad80875204ad978a5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/dsb/firefox-133.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e9e85f24c36ff6b7e2fb49965a7c4c6210b75f81c42487ad4c918ace9f41c5c5"; + sha256 = "ab44d1a83edd9f1f25f4d16fbada121aaf0d6ffb9e5501e1ab3576ef1898cfbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/el/firefox-133.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ff1b1fd800fbac9e27b3af66e0d9c350d42a70256d954b502663d1f482f8cf73"; + sha256 = "17f7a4bb670fdcccd83785b9442aff58c4e48092272ba025df5108ae3aa268e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/en-CA/firefox-133.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "70fc2d9c20712adeab3307f951e78d858d936feda102a30d272eff88866c6bea"; + sha256 = "97c4dbd9480c4e61fab0437ae82b6a7f457b25b07dcc6c9295722a16051f17b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/en-GB/firefox-133.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9bb160c8a19eff6a9b53b2c5bebd1bc10c37dbc3bd15257b1e6f6cf09b71824a"; + sha256 = "ccacde7a210d6150df3eea91d137e99631ec1ab394552fc6431473ec97a0ec49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/en-US/firefox-133.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "702b2e7227e8ec775da12f293381e41a22623818a4af51040b71843c07aadf47"; + sha256 = "8f6806367d338095a0d8fc67f92f7314d2f520b4fe9455fc94cf9a417aa1ecb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/eo/firefox-133.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7c266f6fe02cd073a7811901d6d2d3f3ed86ddc552d4a06ffd179734235c012b"; + sha256 = "1d8113374895e42473adde3c741bf9deea948cb347896a23fa87edb52a374519"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/es-AR/firefox-133.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6d14f75b49a7fdac8b89283bc017191a1f8dc708223cc68641752d0f84e85835"; + sha256 = "149465fb1f2f3b96a82bd3da30e15380975e1de05de274231ad358b63b746d1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/es-CL/firefox-133.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "18d32f6a1d582d9a4e8e427d0c6269eb744296ca21fb0bd609d4f0c0361c36fa"; + sha256 = "6f7c564e6db6ca64bf885a5192929beb3cadb76fdd6bc88132bf86d6e3e83e95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/es-ES/firefox-133.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "55b77f39bbce79dfe835b1d15cc732b4079614251854db47cf6446726213ad7e"; + sha256 = "0a4d714864c6227dfbc1c28637e4ed4fd3b594af4b933f95db8dbd00d7c054bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/es-MX/firefox-133.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5a0cb2c3c93615045ad9cadac0922759958bafb0bf35cbd88155cc3b8a9eb66c"; + sha256 = "a09b7797c648ddbf192c2714982d7d6ec34d633d7b36a8904850ad3f521f61e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/et/firefox-133.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "db06ff41080c04833bf32323fb3602c727f097a05c88a48d69f901bf6be9d9ae"; + sha256 = "bb2c9231ab6da05132149b381d40d6adda01eb5b41efb5de73877220842101d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/eu/firefox-133.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "beaf66d72bd859d671647361e53ff47f4767b89521c477022387638b57693801"; + sha256 = "a36c8f9fc6770bf7b60039c5717fbaa8ec46ca8fb954a85f4af92312ba1043a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/fa/firefox-133.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "07a74c134fddad0bc3d9e248734df32be97ce099c81ae3e301288906cddf8623"; + sha256 = "ccd93836deb849b01356879ede9139747a94e1705a5cdc60281a25ab7cea18ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ff/firefox-133.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "2a4475d0e18b8817d605c76e153b97703ffdeb1c3ad887820ff16d3d41580ab8"; + sha256 = "e0bb0ff2cbce0d8270dd6f19e6c2357e3efce9262fc6e78fc163d2e26c4e78b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/fi/firefox-133.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e5c0d17e4e701d357601dc65bfdcd26bb805e10c28c9bd2ee252485cb12a175d"; + sha256 = "50326dc651d8cfbd30f90a31571bee1188de0fabc4ecabe456a152ce7664837c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/fr/firefox-133.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "489b5823e83899733ad2f94f03205518f55ca8d0fc66799af06c966b48fc528c"; + sha256 = "72e423eaf8629d66bc425de1196385de9096847053c26382ab9d7ab00910e52d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/fur/firefox-133.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "82d702031a08d80143317d816bd51a40e3affaa47d2fd30c46f05d56123c2f24"; + sha256 = "1a9f7ada2046d364adcb39227e6cf43c264209debd33bdf81163d4c733cba2c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/fy-NL/firefox-133.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "86ce2d02d6e38ae4a36ce3543be3335508ca83ea8fce3a0340519ef6fb2d3b9f"; + sha256 = "c7924f83dd06361a20f8ffd67602aacd3946ee26493aa0e0e7dc99efb1486065"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ga-IE/firefox-133.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c934c385f2b1eb801c6fe5e3a07bb98516133d070124db48d55c00e578b2840c"; + sha256 = "4598bb0d64ff10b4a6bc3fed8898aa09023f24b33756211aff11e675922694ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/gd/firefox-133.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "aee8d3793cc460f138a2bd9c9415e4e10ccdd4d0babb2ca1f9e92999f32702f2"; + sha256 = "238916d3e71db42078afe488ca993d0b35f154934831950225ca41c328011ba3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/gl/firefox-133.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9cacc88b8b11e9716e927e0710a07d1d1e380a8a0b4c8c4889a57b8bd2b000ad"; + sha256 = "96325b6e9670552723a11a01c843669572fdc4446f2c36c82877698c68dabc53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/gn/firefox-133.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a3bc5062e804d651dd6d630f9b8cc30683b40f02821f08e8ace1f0bec276ca63"; + sha256 = "3a1429229dd587ac5176a466650358e8037320d364ed7a737109f268b63981c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/gu-IN/firefox-133.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "660345a284c5f87176f6b11d3eb58c86ab793021ea0db084f408612812bb1210"; + sha256 = "8a26cbf8e313d71eeb77293748fc76246cdbbe9c6b2e5dffb282e5bc6b341556"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/he/firefox-133.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "20302195cd105b8ca8a925450a499997ebf9464ba8d0fe0067f92605f0d1ad6c"; + sha256 = "4979fbcc0ad312d59e8c35134746ebc848cb8bda57f9587390cbc89312554935"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/hi-IN/firefox-133.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fe47c61ee2f11d48d19bbe8402d0d8774ef874e777db84fec934f5224691d923"; + sha256 = "51b421a48de29a3e533507f743bd71c21bd7310fb0fefc333faf11fd5b387d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/hr/firefox-133.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b1d5cb3135a1ede6e77f613e746e06198c98542bcd652e31482426065d7cd43e"; + sha256 = "23dc4f1b38d2968b9a99008b128a509e91f215407c776d42a10f132ea5f1996c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/hsb/firefox-133.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e66f0200113dcc156301640da227e29f55dbbaf641f40ef0c261a7d4637fb640"; + sha256 = "087fd79fcdc4f93be74cdfac7da50a9521a628f22f0124897492e342089ae2c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/hu/firefox-133.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d2a9db19180b7e25a30065cf463a1dca4597d9126ffbfaee4d439579a83fd66a"; + sha256 = "b49e4f3da26449f98881d10db6425d9f24efa11c6cfaadcbe80afbe5efeec24e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/hy-AM/firefox-133.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "14c10fa0999330ade75cc7263de98af35b5f2e1717d7ab8ee7399ea2b7f50290"; + sha256 = "ad3471f4cd744d14ed0a0a2a0d01a95694bfc840862f32cc85112c96a04b830e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ia/firefox-133.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ee3ebba089bdabcbedba1f467dff81b7202c6d0dcaa606fc2969c978c1b3598b"; + sha256 = "7cb8d4c59dbd68b1d3b46ad020de56b149d2bd23af2ae3ae88b95fe00e8e7f19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/id/firefox-133.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "747d5f79b521227b64a11766e86c0691e314ebbc33ae72a3033c125db475667f"; + sha256 = "2665f478298371a1c5fc04acf015c0b9c092148a03bfdb17c3e567974359e551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/is/firefox-133.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d4f69a8199424828c31df016ee36b54f7d1eb0bb2226ba527826ef84ab5d626e"; + sha256 = "d5004c67be440dda86b13a99efacdb7c448f7d4acd563b420356e9536dc00f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/it/firefox-133.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8764267032aef6eb4353587c79e3d309581b8430c0fdbe221b55c3da0dc91e66"; + sha256 = "013a705ca2d420cad5c0da0849320be356580aaf55da025fd80cf05af40dcc78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ja/firefox-133.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "13e5b0a94146880224fc2a7287aaf82535fde1842d3da323fd515706d60e9502"; + sha256 = "7cb9b3db39a46b026ae1dc1396cd510b944b91445832a6001f42555a20e8a859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ka/firefox-133.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ae47af49caa90b98d8e400c49f1a48c4abf0186c142d3cf6b9be4d87415950b2"; + sha256 = "3ac8802e00f410bbfaa68463057f3cb89b0631a991ebdfa98bce0fdb3461794e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/kab/firefox-133.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f1b3ed5ee5271208e4bfe3c4a5a08a79e4e8f0a36b2b59d041de805381f293d6"; + sha256 = "1b6450b2872d70c8eb48e52ce2b90b285b775b90fee4f949fb9f411c31b351bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/kk/firefox-133.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "bb9e9e2c6c9d7a7a4d4a97b1553df76283a973936cb5b728b48de1593bd7f03d"; + sha256 = "9e0b58eae5c731c12db317ff08c0d95fae0d4a6aba09366577c5338680911ec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/km/firefox-133.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "b218e8b43eae13aca4c8f0756af5b1945a566eb414c40c412d7c451f32faf632"; + sha256 = "74665581be75373c5c40fd6610cb0733957aa8bc0d4296144cb338acbad78c5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/kn/firefox-133.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d17b594fcdc6b7c31b89cecc2f5ce17ef8205589cf2d04b31faead6f05f35918"; + sha256 = "28c9f9048e44c7a5bec7b3604d7e101abbbdadc38ff3aa500282711ed9e2090b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ko/firefox-133.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "07125d837dfa9934df26f6a55ab210471b24407b22905b241652ebeac4600c17"; + sha256 = "78ab36e1d0f14447f5cb017cad6fc2fd4fa46717cf119f02582bcd8dde83785c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/lij/firefox-133.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4c3494d7751926a2ee7f04dc037193cd81a3f7886f074a23315e34bd6bb63943"; + sha256 = "dd1e8f4d30feb78b83331b9c0b9b12bdeffc37f181b8a41d955338def48dbe3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/lt/firefox-133.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "3140355fe1abf44aeee01bf6ac46756580fac82a222b1443046b33af8ff16427"; + sha256 = "21215659112ace67ef207712baffa611582e6031805033dc9f4682c686dcb8cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/lv/firefox-133.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7953ceaa9abe716a52b7f5831fe50fdb7f31507ea8fa64a6e834f08562807f73"; + sha256 = "54fe60afb75e1908de012abfdb5c8aa888e1e2cb6230ac19db2cc6020908875d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/mk/firefox-133.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "570aa3350c57f763e2686784dfc0927f01e402442de11a47001d2b673e818848"; + sha256 = "84882270b3ea5b23c50cfc062a1c5734c67d5f2be89b3fb35577f7c8f5626ccf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/mr/firefox-133.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "562e69a74017ff55c0961b9e73d8d4b45f4aa10c684dacc7b3049d7f3609b1f6"; + sha256 = "1e0a5a40cc28053539e92709734acd37dbc2382d9849f863a5d9fad7947530de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ms/firefox-133.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "7982e8b10ce2003b95c037c02d8a068d0eea8627bb2c41880fe60f8c796736e3"; + sha256 = "09cddcb7d87601cc1b371897e8e42eb96f272143c94946025225b40e33d0138e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/my/firefox-133.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "b9c8a73add36261e9a557fa88b8c7f4d8c2f8c6c109c1e953aaca1b0bb88ab1a"; + sha256 = "f5b8daa0856a9ac9a47b737a86dd04e91b0608bd414c591e3818bf45ef6648bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/nb-NO/firefox-133.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "4e23ee1cce05d76b63ff3fe2013dda86159caf0bdbb9df0dc9fadd4b5b027523"; + sha256 = "76059c2a5319cc4788849a0fde74a5dd6882c5158a0b0164aa35a6dac5524998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ne-NP/firefox-133.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0c8b73bb4b93937ee720f83eaac9ef4b0830535ccc3291212196618b37d60edb"; + sha256 = "f93bc47d4746e44bb08c854d5137e50325d6130eb8424eee6762d82f6946f31e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/nl/firefox-133.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "84f219c7f0e59483f70ce45758b7a11687eaa1fc2e5359e66d01ccab2dc02ce8"; + sha256 = "05c1142ce98ea1c743ebb78881785f7cd6e7d4c32f6c91ccce83d4bb57f7f946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/nn-NO/firefox-133.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "cf923abb277ac84d493b49e3e0e82741a306291b5ccb38ec7a904c9a5d6d495c"; + sha256 = "1c28b9ad418baba30bafcc067aa70bf0fb62fbe6cc13c62e28242f009ed93657"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/oc/firefox-133.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "da9da781dee20e4b1ea5cc07473db80e64119a250e98ec36858f182c7c387ddf"; + sha256 = "39952b11e4a0c0b4223ee12816d217068b5aa45b5779460aa8c1a7636df4c6a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/pa-IN/firefox-133.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "873ed71616863ff86bb5634e452efaed4c0ac876127e36274bf8f74417c37fae"; + sha256 = "f9ae3fb529741d7a3bc3f36e3b28f353d2ae3028bc076830ba3c69201aa6ca9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/pl/firefox-133.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b33edf7736e12a74514f448caa3018c0c5b6eb6ee7c942049e3a6c8ea10968ab"; + sha256 = "90ecf89b0d8789906480d4f4aae74de11a9fde5adde440c301bfee43100af114"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/pt-BR/firefox-133.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e9ed9d73bbdffc132e8af99d347f45e6172cacdceacde990c1acae09adfbc47f"; + sha256 = "25512b2b33dce0f3575bf31aec914fd30204c600bdca77cff29261521fed7a0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/pt-PT/firefox-133.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "21dea9ab323d83353cde05d982c16266e04a3d006338b81120408612d452d03a"; + sha256 = "b1cae7629bf1cffb3b43d11eec75a52e06173bfa555e0d416fd2780f2cc65a6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/rm/firefox-133.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "bb55efb232b0991ca144c9a8b9d1c627c2ee1d52af5f02c551e5f130d5c8db33"; + sha256 = "c4cbdfcc43d441915224c09df7bc41e0613cc675f74e93103eb3484ae311c4e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ro/firefox-133.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8f98c37308f9a0e8187bd39a8f8ce2b95cdf560d66186ae593bd4f340334fd88"; + sha256 = "4329dfc4c2471100a61e5e447e1c27a230009feb9acd7596938832b2ee0346c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ru/firefox-133.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "19e2225b259e7c924355f17427e6ec0fe44b3240ffe407d7e9afd058c4392bae"; + sha256 = "67ba8c0a32b8d3f56cb79fa90b950c421b7dffa3862563b4076ccdf0466f7e04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sat/firefox-133.0b2.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "7403024526b6fac55a5fcb9b955ba263f7687905fc05c799ac7ba2238f61334b"; + sha256 = "ee56c835d5e80ad0f328aabd4b4fe7358be3607ba902614cd91c65ad915440b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sc/firefox-133.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "a5c914708663bc93198bc5f02ff69c38276f330f8361ce05693d2e1b2eff4f44"; + sha256 = "5eceaa5d46ca2622f6d92b02b3978ba721f62f74ec34e6d448d78b9e8356f1ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sco/firefox-133.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5a3fef5ec53b1a1df4945be65f276bfbc6581a8b75f7be59de5ff1f4466816b0"; + sha256 = "190356b7fb73ba7d0dafe65b88c4d85c3dc781cd58a8450cba282aa4f045a46c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/si/firefox-133.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "5910de36de93d6c882f0f09335cac6ea114552f0d71bf1a02c333d1c47ca8ca7"; + sha256 = "a5f78aa40e0a172756a563fd5a68814cc8dc90b38ff86c8da1d00c2b5c8a6faa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sk/firefox-133.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b3d3682fbe7a7bb3b3fd469ce02746522d170b82674f318b43271452e6f1f83b"; + sha256 = "0c5f8f70dbb7b5d6a5927252058e4e51aa53a715325d2eb3780ee4e8af605e6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/skr/firefox-133.0b2.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "9561167751a7a92881f9e9b165e0e1868fa42f4a148cf87c4b0d83ae750b026d"; + sha256 = "025577d81e486dafd95af47f8ea01e4b41bf09acd8c8404e357e22d1e81bf23d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sl/firefox-133.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f63dd87205f973a5c195fed943e1a8117f80239f4bb4811a6ef45be136a43426"; + sha256 = "530b9326792c8fbad8ead4a807e169ca66953e60785a9e331b407ee7ee12414e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/son/firefox-133.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "15b0ca1537a31935ac1810db22b5b8796c21928bb1e8559726831727e1ae1509"; + sha256 = "b0839fefa15fe09ca3e08bb7f7ff4500779edf04e249e103b72f8087445682ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sq/firefox-133.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "03af525e5b94adad4f490bc47948655dce0284d2334e0d8d65b06fb329318bd3"; + sha256 = "01724ec585581db13d3bc3c2756bb4d279050fa185b4333d82ce1b5c62b6e4e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sr/firefox-133.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7f90b364b0f06e31922e3bd740bd326b17afd6e9a79b483ad52ef9ea0704892b"; + sha256 = "618387c09312d7d5623339b901fb9979f727dd60bbc42b5741683a03afced62d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/sv-SE/firefox-133.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a9c31aa43d793c1e07ace4c5a1896684174e329c9cc6c8812cca71a7e9b6c1b2"; + sha256 = "42f1da6fe8a7c25cb4fb7de4a5a5c6b4e6b0d467dc63d3e7d1196077e0426ca5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/szl/firefox-133.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "edbfcd159eed4e4925b159803e9832b7d9c455aff69a2be74fb64bf04f2a34a2"; + sha256 = "4087517764482c76f3c30514f714f76ade354f81bb27346c19fd5338238c69d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ta/firefox-133.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "46f12f7b489cab1870711e73528b5fc5275c77e3a6d9c1c5a9bd93b4b8d116fd"; + sha256 = "531aa49658a442ea83e48d1921e48fa37347559268d8b03f8816f887ea7b8a88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/te/firefox-133.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dbf2a01daeb6c79902f77e17ecd120c57910cd4f9a72265ef6b5b98dd87b7f93"; + sha256 = "1c99800b5b9cca0eab6f569b2f3813ebdabb5ca90b7c4b8e28614388e3a60027"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/tg/firefox-133.0b2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "490fe02bfb5a1c07d59a6e426a47b19f9757e5cae7d571c4ee44e5883759ad18"; + sha256 = "796eb9a467755ab44de551f870af21261b039d4851534c106f30ce0bb8e16cf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/th/firefox-133.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "60c8f3e6ab1310899e71a05537b1fa58768835de80cc23b6f35bdf1ef639d0ca"; + sha256 = "baf85aaad93ef9b77ad76410ac12fc50bf7ec8cab6575466a6658b55274fb62b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/tl/firefox-133.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "71281fced8f188e9ae6ca062468c5394a1e48448962646a8c09e0227d284db01"; + sha256 = "f5d9979dfe102be6f863e9b5f41421fd44b3cadf8b69222060e024331c5c17da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/tr/firefox-133.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9929c7799792edbb2646cf09f953ae9252fcda5eccffdeb156e35e166ea68a59"; + sha256 = "d7ce4b5c7d0c1a3a427c7043cb64be79a80217af41c1018442a92b218ba83c76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/trs/firefox-133.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f5ff3492dc8fe6f7afa85fcbdd92cf8ada3adac59b72e41ebd61d666dd00cc03"; + sha256 = "b94e60c4a99bf7f6109c0313dee2503aef96ccdd9ae7bbf0bd22836bfd37c8d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/uk/firefox-133.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0701dbaddd0d9ec72680fc1104487f2635a518b6ae6fd14f2ab113ca62c8e733"; + sha256 = "95519e777d7d36d06cc807a99bfbfb64d665bf1325442d1fa010d3db8d142b45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/ur/firefox-133.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "337962a7518ac5d69c694aaff30b6d59e7597b298d60ae19a5cb14a3753d9426"; + sha256 = "05ff66e3f76a4ec77bc0cddf260c435e06ef3db7446a20b557ec2aee11d8b4e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/uz/firefox-133.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "74fa5b76b72495eb864d78cb02c06fdf2fcf92f2e73d1baf01c1ca555ebd947f"; + sha256 = "45f2ef30ca2c66636f9b3668fac51b5f7a1047ad248a3631595e4fa9f0497c08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/vi/firefox-133.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "eab1a95b5d91bdbdec164c6732be726ecc017fda3b353d4ad622a70ec9f83619"; + sha256 = "5c125c53d48e9bfbe85f02c99ffa5c60d2cb283a03170ffd4c0e2a8f9a1833f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/xh/firefox-133.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e27e70b708c64b05b6ebdb68f38a95d3e06264c56fe3d749fb603473eeb12626"; + sha256 = "d9ad7c6f74c27110aaed18bc054fd6610ff45753f490767ffcdc56ee4e4ac985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/zh-CN/firefox-133.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3976fe366481f3dce7a3f42fbd49925e7988de58a869d0d96bfe7c61cc27b4b6"; + sha256 = "659fd87724995533385e10661f0cac593916980990c700d8fdbc784e336d26d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-x86_64/zh-TW/firefox-133.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "f8cd9cae21b27fea5bd04b6a54ee1152d729bc525a565fb97083039ee1244888"; + sha256 = "4fb1b5985291a5ceb0727f8f99de877c45217da65e30db1d5e3d70797769533b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ach/firefox-133.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "189c4cf298bc5b3b21bf5ae0ee2b14d8a5bcf998fd79c27a943b6a146402c2dc"; + sha256 = "30c126dc8e7aec2001431af344f3c18fa9c9d11e76e70256f1c4a473cd594a20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/af/firefox-133.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d125ed28dc6fd22bfbfd98654f0e2dba72fe54849191ebbb6cb315ee36b68e8e"; + sha256 = "6e1f4e07622967885d4afe5a48c158f3890868275e40f28e02a691f91d88143d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/an/firefox-133.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1e9f50533c2da8db6e802b1941a2ceccf58cfb38be1b139a04ac559e0195e9b3"; + sha256 = "d6720e5886874e2eaa5f8c39640881aa62bff46ca79a67ae9dcdb6de1ed97d4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ar/firefox-133.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "62cf1879e3d009224cb9170bab531a8972aa897ac4707f6b343ec1d1e946df6c"; + sha256 = "0192054b7f58c0724d084e3470b736b22377e70d0f309691ff23445177a54859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ast/firefox-133.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c58bedfb24b1b0be407abdaba951d0d4da01213d28c16edd34a84518e25c9d0c"; + sha256 = "6190c989b0efc7ca7483624752e748cd586bd7b93ddb78633312eb77f19e8479"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/az/firefox-133.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a3a7aef57ea6292ebf8d571cfeae66b11904ce2f2da8e36d27ce0c37c5c76230"; + sha256 = "0ec8a09a8e897c382ac5fcf283f779e4337887e4907e581292e1fb3a52e259a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/be/firefox-133.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5d8ee5fe352cc927d4afb25f961beb104e1ad9877935688c963abe9e0722878d"; + sha256 = "70b622cf5d5590956fb75d2b184f1e48f5a3fec2fb57f531e1394cae80426c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/bg/firefox-133.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "148be65e21de5278a4cf1421b738f3565411a6a579814b44dc092dacf0c9535b"; + sha256 = "ce89e8f05bb68b3f94d634c527bf288ec6e46a8e2b6f726f1132480a62ba288b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/bn/firefox-133.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "b98edc55987560c4a688b15a0a069a9a7b74d06f42fd0b2d508955ec34feb256"; + sha256 = "92712eb9f71d68f232fd2f2fe33681fb6a8ad4e3e0ba396539830c65b2701f2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/br/firefox-133.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "aa16a1285b84b6fef8e82fd080ee08e40a2b388f4a09fbbd7036ce0dafb554a8"; + sha256 = "2a90a93b2fbe3f836e76ac990dd5b36f7ee017c4d7a31f85d660bc9e072c1aaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/bs/firefox-133.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "099175325b5179d10569a223bc6a35688199d0f768975fb96d6eda90be270e4a"; + sha256 = "e50b87bd27b1d2e9e8e7805f3c3e033541d17cb66651c4c4048cd3fe8454c412"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ca-valencia/firefox-133.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d00fdac2c05496cc882afb6a8de72f7a3a72b03748893d246cd46582395cc294"; + sha256 = "88407d6d2ee82a62052066166b2a8f7f0cb06fe03038034101a05399d1a3a222"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ca/firefox-133.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "012d9ae56fac6fe05d4260bc3082b7756723eb1c391cce30823641efd5cf29b7"; + sha256 = "048bb4d98f38c994c38cf74d7fb79865f66c3428b4907255f35e97ceb3b34160"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/cak/firefox-133.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "99f7572cf452dee212a016bf401fdaff745ef788351a55e98962e25bd6e6f6e6"; + sha256 = "57f3c8cace10055844307e40f26b55685c68dbd27d89469c9c939dfee34a27f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/cs/firefox-133.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e860e3d87d8973abdff51ed867b3d760a7b6308c6c0f83b117200217617e076e"; + sha256 = "363edeebaa05ae9eb9ebbf210f9366fc26508cf5034afea2524dc5e17635a60e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/cy/firefox-133.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "277685c88c1d7a07a70b09c91254b788bd2c5faf9ae1880b91e9245535c46644"; + sha256 = "3a7c3dd8b51ec4c6fd1ed7234c5f0249acec85346e1dceed5d27123111b28df6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/da/firefox-133.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "dda987d22ccd29156a66bfc72b156213f033d73e066fbb7b0f8c19d1d4ed7e93"; + sha256 = "dbd2783af216be36d4c77d9e98e9d9f8827f6255770d188fd44165ae465ddc0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/de/firefox-133.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "826de1a5bfd119b8531ca985767626ac8f2f485e71a597b4d0ba847fe335d6a3"; + sha256 = "8c308b0ef6103acba88e2f0e682ebf1c2dd1f9daba22049886e6684636ebda7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/dsb/firefox-133.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9899a41d404f19bede698ac516f4c3a43fa0b5117952c57696ff4908ede3eb5b"; + sha256 = "e0a878e29827201b52d2e804fc02af9caf8a48549ddce8c830ed23daf6808b35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/el/firefox-133.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "468a23fcb99b47e6fc6080fb8fbaf252f33d193a029f78f084522cf3a32de594"; + sha256 = "112f05f6b8efb2bbcf7ca30b59b4d9ff0b4c66afbb1b997900143f5381fef2ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/en-CA/firefox-133.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "594340e9073e059d56d659adc54a19722d563f3e63774a46cc5c3d1a194c75ca"; + sha256 = "0ee0889b3afc29328f99d275291a6611a7ae4e306ac5a24ebf9d3f094ca10e97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/en-GB/firefox-133.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4d1dc94a96f133092055fe621b839516d8f54c02ed6b47107b0459d8412fa3eb"; + sha256 = "77ad731936be92969091da930ad6432daff8c56dbf3c41735856c0805fb08504"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/en-US/firefox-133.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ffa00c617bd97ec8ecd11167084afa986eff02c1d45501e89f0a44364196acdf"; + sha256 = "4cbcb971f553e3765ba5bc231d62c61f53d8c6ec08846a2d36c4de101acfea54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/eo/firefox-133.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "9749a159e16630fcf885adb5ae54bd12a0cf03f4b628eded68636ce85690fecb"; + sha256 = "f235bfc49a93373ad05ee6a9406ac1d72e59898dce349b530c1b01dcdfffd58e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/es-AR/firefox-133.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "703bf9158f3591f4b64899e1720dc62a8b007f4c1dd3d7c79f45ddfde696ee21"; + sha256 = "e8a1ac31f2cbdb751ca18f45c9e5b50a7c742e7ee880cc4cb8c26998c1c8f43e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/es-CL/firefox-133.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "47be86544f11e1e6eb21b611e7f8517d0b7bdab6d2d36fe082c47a6e933468b5"; + sha256 = "18b7e0e040d8eacad244571ca7fca65556502fd849e8bf150f4e128e723a78ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/es-ES/firefox-133.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "362f3e884232c66d071747c3c024befafa04dc8e692540a1ea7c652145a7bce9"; + sha256 = "4cdd899cc260f6d244d690167b6f799bd91e26960d5026a0e78b55c5f7eb076d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/es-MX/firefox-133.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1c464e95bfcb23a36200d36869efb17c13af2024f4eaf6b698eec3659490579b"; + sha256 = "a16ad27b1c3ce909aa573769ee3faa8113db8a0de7eab9a100546a029e7b858c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/et/firefox-133.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "caedb1c032b56a89f96429d1f4be58abf9b70dfa0f1eb18aa2a9e3ae8d04cbcf"; + sha256 = "b2d0e190aef8745661cb59a0f24a6a79e29138ea7ba1db2120747818bc4aa6da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/eu/firefox-133.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a7c1427c61d676b4984bd6cf946125f7ea9f95150a0e44214a014c2a40e84925"; + sha256 = "9214f1c2950771bb2a790879e5eda9fec6ca7738ddeabf2e56fc73f894fede5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/fa/firefox-133.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "2aeceb6dc9b404a95dc11a36975ac8cd2d79e4ee8bdb67299a84fe102b436f74"; + sha256 = "2b5259ee2328e0b6a06fcd91f850f8a60b7b50a0882f019ee1f098cd5fefcd30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ff/firefox-133.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fb6ff671b9ad5c188e44e817d7c52407ce53f21a589b3c4a2bebe2e3a5cfc2d7"; + sha256 = "9f330098c0b2758f7db56ab689d3028befe1e53b3370e0622b3f43e694a36339"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/fi/firefox-133.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c17b7a357e2fc51b826317201c3d8e8dc7625db213e5c67baa80a4c9528d1b76"; + sha256 = "426e55d9fcd0df1b41f612d7a32bd844d415712421f38538783babaab161c61d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/fr/firefox-133.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "de91b909c0eb79f0997c6ec6a5b9c44f0bb029ca0b10dd347ce3119bea20540b"; + sha256 = "aff735d70b5ee23054744b6e668c02dc35225670fec68a977a6e1958aef3ebfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/fur/firefox-133.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "d73b50eb034ca034a2059b5e5d998c4e0358f8eaab3a7ace0f8242d3a3824493"; + sha256 = "f97addb9571b316cdc8a54d0abc922e1a9b43d6de133f5bc2921759efd270847"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/fy-NL/firefox-133.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b75dec3610e738b172202c689b7bdf11e3e71761caa765f89559679472fb91f2"; + sha256 = "6b3f10c9d867d4a3b3eb71521aed89c2adc98a2d935cd97e6616fca20282f43e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ga-IE/firefox-133.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fa95c04156d2763f213018dce25f0dafe226a1fb11a9c7b238e206f0169f6747"; + sha256 = "f3acb25e79af13665dc26f8448eaecfc796d0170dd5f149605dc7d4e02f0325e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/gd/firefox-133.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "41d7f8a03bd0d93fc8372a2688d7b797cdbb0147815a5923b0e420a65d1863f4"; + sha256 = "06e50e071e14bc386bd0644bcf457da837cd2e521d78498130b8a3d55e501cbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/gl/firefox-133.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6662d829a07d6c327c954f86b7c174398d39061e10336f217a805df4680c2b62"; + sha256 = "416fc649a7841c8e6548ba35a4b5a7221d26c3964c2582de7ede0ef956a6bba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/gn/firefox-133.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6a382d9f1aa39061b7ca1977a907791a044b9e4adb7d0058bd6602b450168348"; + sha256 = "14ccb77e85deb9fcc708c0d5c5d5942644fef37bcf2f6c8cf0e847a7a93cfa07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/gu-IN/firefox-133.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "546e832b5578beb46cbb53fad43fb15abede650370edd122952e8652fb5042f8"; + sha256 = "0e13fb17d907d2c599ad3e515a9410f155f2fc11903956803157616b6e83d9a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/he/firefox-133.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a74e231ae7f554278b74a59e58d56beb5f4cd6d9d6aec30f27c2a47f42868237"; + sha256 = "acaf6bde4d767c457912badd8a9bc7a441cc48719bf16ab9f021db2ab3e0be29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/hi-IN/firefox-133.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "cdadb68af57477315bee3015115fa550ae1f3479a5b067987f67a0d6ab7cbc10"; + sha256 = "aa96024ba622b3bfb1bc865f4a1d9da58ce9bf2332389457b21191b371a68e73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/hr/firefox-133.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "725af00249d030946d635f0c5841e947f574bacd8cd63cc51b41970424f46d65"; + sha256 = "4ed6f91429ac530901b847794c247068fb4f5ed15102bca21d1dabed424680bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/hsb/firefox-133.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "64ecb93a0d0869279b6d048f84907ed8cc97fc3460444835cfe6241ff6d4499d"; + sha256 = "e7302d593129aa8c5c0fa426dc8a9955e3955ccd285ddf084569cdcea6c52551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/hu/firefox-133.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "93d0c1b9d29c9c1f2538b9ea6f7138f9155432fef3963fe2f0a888947a956415"; + sha256 = "73c90f66d860249723792d5db5e908d4dfd7650d2c5aa70cee794176b80a222d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/hy-AM/firefox-133.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4f126a761ecb8cf90b159085afb90752f516a0fa17018364b3bd74246c13c748"; + sha256 = "f552b6740e299677298997abc3647b7231e50b204dff1d6803357f2ca253b69e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ia/firefox-133.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "36d7b19594b12622aed7a246b4478fdeae82edc387bd61c613f969e09a9c9448"; + sha256 = "3f16bb644aedc65e64af17826e3c385fc934eaa26a541cc49a3ba46f29ed6c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/id/firefox-133.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "377f87e02358e496f3f8652f7343b4d5a2b41b2a0a62a2cb4150bb87eecd2605"; + sha256 = "f89e7d60152fd36d7b7e7fbc90f93ba3aa8ee9c16199f136c7d008eac4391bd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/is/firefox-133.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "42b9973e2453635f609d08f2fa61d4201db1d0ed220d536f7b07ecd62a8e89ff"; + sha256 = "62f8baf3581d8b74feaf1afb5c9fa2ab74e1edb875ae0b77a9d76ea66173841c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/it/firefox-133.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a2a3615fe3ff217e01b0624081c2c4a331977b5bd827762db42d5dc7aa29473b"; + sha256 = "3c2464bc9d4b5770775bac91122f64435e2b8b4c2672d51231cd14a821830d86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ja/firefox-133.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "85b5013dc94f8fddd96c65d33cf358e00be0af5edc3ca7e2f5488c18f0306203"; + sha256 = "3e5a3d9fd0e2e94124bd371414b948c4502a501dab367bc0800892632b823c1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ka/firefox-133.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f93a665c7e6ca686aec843e4d2c25e88adfe44acd549923b0423851ca727203a"; + sha256 = "bc09523858a976d28682859896be781cda0b44d4ec153553e144c06939d2a6bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/kab/firefox-133.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1d614936fd91b53718a8f538bbc3728245f2ca57cfb59b476468a9181ffd5868"; + sha256 = "aee33ea41c70afee41dea1942565e1202afb72a9bca6d90ac5a15125a1d6eb69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/kk/firefox-133.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "894752608f06b01a105c480e6a884a08eb8d5519d5d4eb95c906aeb76bf3aa39"; + sha256 = "36c2fe32a88ea04cfefc56aa33ac912de65fef534a9f751a78d8455c939293c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/km/firefox-133.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "91ee3ed34cf51fe0f21533ce85c9df8af6a811a2128b27897869a8b166ecd7be"; + sha256 = "6aa39b9a5aa7bb67e99dd0ac601a9c0f217b522a8397b64cd1508013b56cc599"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/kn/firefox-133.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "a9dcc8548d786319bb0158ac8002b9afbfaeeafbbd0f727ef481d3769e11745f"; + sha256 = "98f560a448ec563b904b058739884c76e754c6c1a4b57409d3117f5528ae90d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ko/firefox-133.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "261dd39b2d29f35b517fea14ca1c1859166a9ab9350b051e61b0f87b6471f8e5"; + sha256 = "b2acadf33b32092114ccae784bcb61a9b03768a84f5d616803e67a822658a8f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/lij/firefox-133.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c3d034674c804e21e05fd3a928f237fc311bd29c741f1762e59e8f335de7587d"; + sha256 = "81b609d01a13db0192b61ef4b370f0d2d46ebd32664d7b8ae942a46a0506ed78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/lt/firefox-133.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5d4cd4689ffc4679eb6bdea0209aeb6cc74ab246e6345abe361b31a09f76a758"; + sha256 = "5e8959c603b020101c5bb3a6bae96486e9c82d52a38e4f1bda42b60a7fb48ae1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/lv/firefox-133.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4824f4f413713c4b80749c6218cc524be59fac57b96100229f9dd643f6dc6420"; + sha256 = "6ac74565b071c0a4552b74626c888be7e53cec1fa734f5e3b3693875ea26475f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/mk/firefox-133.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "2f64c8d6bb0ae6bedc35b9a6da0757708cf3588c43b74cfb699e7d066061d754"; + sha256 = "e578ed4572f92036f02e3246f10997d307ff334c1a9649302a7fdd1cc446aa4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/mr/firefox-133.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0e313fbf71be605309305e7e1417d1a5dffcb90db71448f6ae9796cd4481bb23"; + sha256 = "b3d0c09a3c044a710293fb46def9e996ec0ba7021ff3864d6d18f70f704ad7f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ms/firefox-133.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d88900829c3c56965f487d191c59880b4d8db1c2158c2a42345c8488ce9e756b"; + sha256 = "8b265256e183b59396f721cfe906c36689d59270a878ea849e52cd83db7f926c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/my/firefox-133.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "68bb81e1d0f7b28349c21b9f3ef1767c0a16f6867c25c4eb9fab92e83bb009f0"; + sha256 = "8838a820a83f092a9b0954315d9b83d386dac3c8df531a91bb175d9d01d0cd82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/nb-NO/firefox-133.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "907b2800d6c0f9d6c42afc1d39012bf08f91475225a87bf34ab399468d415430"; + sha256 = "131d5465f0f6648b1b83c5e6432fef07fd135f2f6dee29244fd6e4320fff802b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ne-NP/firefox-133.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "922f321fd5d07207b96dd7f5aa2589b9ec2f0e15a7279722a5f3955333fa9618"; + sha256 = "b05f18591226337b78f6cb9d93a0d3d75e6f7ebaad135a882c5e0b5d205be58f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/nl/firefox-133.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0366df618f6f90ba6e31f6d6765105eea4fe0a659ee7b9aba620556488dfb5d5"; + sha256 = "47332771cd7404a457e8de900cfbd6d218e676f099e9859d18e3c188ba7d139b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/nn-NO/firefox-133.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2497ba133e392efa3fdc87d7b57001161265486101fb50b516335a9c4929cd2f"; + sha256 = "ba62406e9a9d2f224ffdf8ba2c3f888b92d60417545dd46225681e7eaa907190"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/oc/firefox-133.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c31950477111b72db49542f6f4d9a29a2642c62dd6e34b3c8673b4598aac3fa3"; + sha256 = "35d2e3766b229623ae470813a91cff3d798efa8aeeaa9a5421d7d6ce2b374fd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/pa-IN/firefox-133.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bccfcb28c3041d9a729130655b60db18ca5c095e969b3f7e534a81aa512be095"; + sha256 = "b9e41eeda3abdde2bce987aa03b964223ef1d98073b1d4faf4515cab39c01626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/pl/firefox-133.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "62eb9a87d538acff99abd4fc48c67c82301e28d31cd22570f686e027889f2157"; + sha256 = "adb460c42ed13661b27a61b51bff85b2c0685b9ae87fa6c2744034bf973fbea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/pt-BR/firefox-133.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "eb2f241dfc048de3dcc3f0c78644c9a7fff3204a80328e6ff4c8ffcd5c1b8fc2"; + sha256 = "34c148de63053b78dcffb4671b5431c1d9381fd8f250d2327adca615be017f4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/pt-PT/firefox-133.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6d1cbbc5156669f6a8b2c716667c180093709bf2c9b719b10b367e1a35053a5d"; + sha256 = "772a4144786fe0521da6ecef3bda6c754c9f4dfee0d77d3937591bd66b5d5f6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/rm/firefox-133.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5d2bdfc8684cb85b738ea2cb12a5e37f111989724a64519c372d2d4c84b05ebe"; + sha256 = "f86d984b36af9ac230bd6d89953bc721c0c20274eff93eafa85447ec1ef931e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ro/firefox-133.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9aa8fa19894cce2203f703f519652e60efd643bce8e3d9e9dce4f44d4af3df90"; + sha256 = "d654654c4a186facbcdeed3a2cedc576f4ba3f03e23898f3cc682c541d3b0594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ru/firefox-133.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3edbbbce178af3b9e5583eb9b57e1c946fcfa844a9675da2dc69dca98b51c959"; + sha256 = "650cd2e41eaeed21108507c2c67a6309508837171d102d593e02735a1e0a2cc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sat/firefox-133.0b2.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "72182590b349bc1460aed8fcd262e755b8dda7b4f789af9bbf65ba3b9e0e4b21"; + sha256 = "2cb887b7c51e566724cf9489886372ed9161132991d2c260e7d69588441132d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sc/firefox-133.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "03b1675157ba9becd866825e58abb58831171f12cd724fc222285e758f093c61"; + sha256 = "041db898dfacf1a0d87506f29b5babd7a28ba6973c8b0e7d2c86d4a0fdf9be01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sco/firefox-133.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "0fd528ce2d1f4b7f87f225fa76ca29b32500a5d66d61858c238bb89a26784cf8"; + sha256 = "65ec1239b40178618588d4b0a03e475ef35932115a30a46d8953af638857a358"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/si/firefox-133.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "68b492fc89fa8b33a1db3e514feeaaa6083290b47bb6b0a6b2d24018a9dfa8f5"; + sha256 = "45acfa646287cc9050c59fecab6c638cbe0e226d919f083a2d0c9884ad2cb4ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sk/firefox-133.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c0b5c0f615220d7e746bc0a3236233430086cc120efbd1a8afca433ad1cbc63d"; + sha256 = "c862d00528bbdb35c32b8be9f1d8b62bdf5bc46a8a739610027b770aa0741b38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/skr/firefox-133.0b2.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "b3cf7e8ef07ba0d69712ad8942d4939e0242dee69602a84989b3837a3e212446"; + sha256 = "5a177b6eaa8c73a2e65dcb639f93490d0fd7f037c96c751e36d5fe5ec573f227"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sl/firefox-133.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0ebf301475b58549e3e9e696adf1508c39132236d26a1ac8eba9227de45347db"; + sha256 = "4f4a871f55d6a5425ad68cf7c0598e1c11ec6e01f76c909809cb2b6fd206d72b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/son/firefox-133.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4fcda91a507b2067e76b6ea5a3e923c6cb0d62ec8d31c657b0503a85b907cac0"; + sha256 = "a0337f72b3d035dd42989a975e9fd3f9d9ea81b99f93c06d26417a39713695ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sq/firefox-133.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3888236e063a6a724f751275ad714fd96d65b18cd1ace8242a7577c0ecd27f42"; + sha256 = "d6df68305db893478c8655a68b2a082fa0b572ede2d14ee91a039d3c6369d212"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sr/firefox-133.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "35ee32850af101c1e762e3a04ae17a6c2f33c58bd0aef0fcfcce151a6f34bbe2"; + sha256 = "87407b36f26e794f56041a2ea6428d8f0121ecc22b6a7bfb1704c409d68da8ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/sv-SE/firefox-133.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0c7c5bb2edbb8f0ff72eccf07c01ac078e1d9b92da8ea6789a2c8abe4e78e93b"; + sha256 = "0852cb4fb56302a3eff2d7b6432fd02ce329d9e17167045e63315088f152063f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/szl/firefox-133.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "2924c50d23472134428b699bcb4fc3714a90ff54820fd58fbd46ea55fbefde79"; + sha256 = "844871827b55ddc4491c69ffe08cf80b613ff9162a0292a43ed72d375dc58b2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ta/firefox-133.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "454b7dc139d407e95b94d4fc5fcb0d298501dddfd6d8d78416668e4d3e606eb5"; + sha256 = "1800c04d244595fb7a26e082b21b501164b18f5f4c5550a7a96670054a0663a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/te/firefox-133.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e0bc922e34eeedc64e11da87308982a79645d0df10f9bbabbe5ae256123d8b57"; + sha256 = "8ed94bfab760a2ee04a122a8588b87db99b8512d88fed19e57ccc9e038b283d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/tg/firefox-133.0b2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "475559c6e4c119f9aecfa92d44323d22e986704565bdc6e929536a025ab026fb"; + sha256 = "c6b53362ebe59ded21c4e57886359899d8969525022423a0e05cd9d65463709c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/th/firefox-133.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c6c0a5073220c1b93a869ff5abdef09fb87b234842c13940c233e3ae73233057"; + sha256 = "ac9e2d172e3c8526262d83d93cd0475229af5c0004a7e03b4863f5b283e7f0e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/tl/firefox-133.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c328c8f053ed31da91384eedd0f7f8d16fa182adf15ed92941b0cfeceb7b610e"; + sha256 = "b3ea503c94a4263a8c539fde23f7b9d58b4085e1785a83d697f79af5e1cdaf59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/tr/firefox-133.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "40509f9119928a59d273e34c2e090f916ca8ce48cd0c07d49305235487b924ff"; + sha256 = "31a5595c6baa06652e10a4e7b7d01d65eb0ff31c8104fd0b06562af520177a95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/trs/firefox-133.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b7521924ade0a2e62ebc0a3d22b84f69dcfb9c217d65ce289de800bd258c8c0b"; + sha256 = "1abf2d47b26d7034d321d5de6ca26c0a72321bd4aeee2c37a77d35925ea66413"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/uk/firefox-133.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f15d5c4a631aa0b76fa43790105caa5cf7fcbcc501dcd11e7160b9ac4d68519a"; + sha256 = "2e265909a8f742c79dbaa8857e4e68897d6d9054c44eae6b7c54a7098698c0a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/ur/firefox-133.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a429006b7f8112425e959f26ec1d80a0e9583b33fde9201eb7ac34af108d4a6a"; + sha256 = "44123f29d3c3457fe90ed82b90e9a4a9bca4fce0766751f57b8f518f28c25633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/uz/firefox-133.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "73371c4d0d2a90e9e7eb7fb6a8b678ae5403babc04b48c783dc755d22aa2692f"; + sha256 = "850e944116a2af20a7aa90bba3e6c5373ab61ce822871054b5781b040eca3919"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/vi/firefox-133.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d6b483d269de8b29c8531a2180203765b06d8327bf4fc03a1b4f1388e6e090bf"; + sha256 = "fca3b3ec60297a124d4ba4731b2e06c342b12d466f7d8612a1e88e07dad6836b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/xh/firefox-133.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "a3356b334119bcb5510ae065def9639dc5edc70691e6418f4bb54dbd14f369ad"; + sha256 = "fbdf1d7bf2ef4846c31e0c1a1cc20ffb1b79e149f5eb2df4bd6df024b9d088c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/zh-CN/firefox-133.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "76efdf2ece93286022cbeed82d2a0ea871c000c43175c7e2b1f4ea2d424ac72c"; + sha256 = "f64aa4de15054054aa95e0210c6274b251d6ad42cdb04b46a78adc871c1e8e7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b2/linux-i686/zh-TW/firefox-133.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "bc3db9fd0958bf3497c3955ece9c82972429112a6f497dfa6587bf0d33c7e0ed"; + sha256 = "d5023d56de84e3bb34296865f909865f19f53535ad73597020c9ed9537b4dce2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 45ad155ce351..156ab2725eaa 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0b9"; + version = "133.0b1"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ach/firefox-133.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1f39caa65b32ee1cc42747e1fdd6e0bfdc7a306c5ab4e067d6170522eda281d3"; + sha256 = "5c42ebef65493ca583a7f00d22bc1b7f62cc9bd91ae96c08dbd74d7126df38ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/af/firefox-133.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "87720c01424b68f0c1c6f200c4550fb8ee7aea8fec8f3bc54f1dea9d97d9a443"; + sha256 = "6d1ff31eaf8fe786b9de349314175a1b542b7fbed9510d30795cd7898260580d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/an/firefox-133.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "210408dd6c738553ed32f1bda08b7ebc2534358905d4c5900af24f81b73fea02"; + sha256 = "9e4aee3ae27ce32ef25865d23dd00e62c627e4e1cea5cc71a456aa514b41f8fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ar/firefox-133.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "072f4f032af9998c6b495c9517c6b008188be71171db4a4610a99e28a64ff212"; + sha256 = "173b9c75fa988e17f85ebaedc81d7f01a47e1cebe9b5705c21b6ebd9b68f870c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ast/firefox-133.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5918a67ff82170cd46dc384eb6558f096fe269111997fcf0815a057943e2b84c"; + sha256 = "82322cc9db2fb89267b28b869cc1d3abd9a99f53967bd588e1debd8c7c3d2a44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/az/firefox-133.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9ec5f80f4a2f779e6cac79c51664afd8f8fd52615fe0f275108955c43869e76b"; + sha256 = "8eded83bc34d39495ae67333f96efc00e71d3152d842ea8b70ad09303b479af9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/be/firefox-133.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "841e1b0e7d8b57fe4652df1dd6df75bdd92e08facdee5dac3d19018086541257"; + sha256 = "240be57831e1981cbb6fb803e7c269d3e4f880aafefc4a94eb848d8296e511a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/bg/firefox-133.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d188f99f3cc7d434f83b4f6c2cc061ce5ccce34e5d0f5417ff598f818402e3c9"; + sha256 = "75181bb251f3a0ed3ee54a59d8336cc5ae1b9275b513c6a251e8f7b61acca0bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/bn/firefox-133.0b1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "88aad5c943bdf59f84231b3cdef43ed58cd7bf4657e4cac4d7e17ea826277709"; + sha256 = "b98e1240f7a254de8d11a20081b9b78977ca5fb457a554a59a9898f6a02aa2fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/br/firefox-133.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1165d36af18c63adbebd849f8f7e5f60904eb4a12720a64294dfc7ed8ae949f5"; + sha256 = "f9ba2badd98674e657d6cc11a8bb0a9dc40a987fdd9feb6c5c09cc724b15a1c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/bs/firefox-133.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d76e76da3c393a98189cb91d03e946a0a75b47d9a071e645321d2cd003dc6dd8"; + sha256 = "7b2bc6c540c69db95777ca8237408bb0c7d9722edbce25a1b0ff768ce401e759"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ca-valencia/firefox-133.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1bf2fbffa615caaf148413ddab98ba33bcfcbdc1c4977a79e74bea306c48ce8c"; + sha256 = "48f589c0ae08b84600897683d8cc88fa8e0b6b7feb9803a9ac7d0f6eff57e39d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ca/firefox-133.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6f88889713b16a5efaf5c4cab1f4c18d44f847939d535115e5532f52af04d130"; + sha256 = "dc9b36d6d4fffd577d793edb4a15e115ca623e7160c3ba122ed5b7b91e6213b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/cak/firefox-133.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "193548816c4d771513e85aa5922d19b17b9b11409f5f2e619802f57992bbbf5c"; + sha256 = "d23edc8e857bd65bddd142c9f8d324951e1d8c47ec5457aa5c17db1c1f8abad0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/cs/firefox-133.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d4174d7cfb015cd4d50efe60abfab4d94311f1c063f28b4791a483c07933ca10"; + sha256 = "aff33a070bde117bc895a9341db21a66e22b81834c4035a7d8d490f276778027"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/cy/firefox-133.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ffc4d3f186e40e0cabc1950e60c61500491838d26a17dbc254c264112f77b69c"; + sha256 = "75bcfe33c4d161a64e259112032ade36fb8d02284b3882c948c62e04082caa0b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/da/firefox-133.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d2fa4c6f2ece1ca73a9b8dec8d3fe8b5bdfe9e43a57390a20114b2af24ac1729"; + sha256 = "797573e69ac32c81011e8f627ec2cbf621a5bf189ced7514e3fc125ecc889f7d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/de/firefox-133.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "fc6ae3275ab21a0903d958b31df8ccb016f109ebad3ab4856d43dd9cf4a5295e"; + sha256 = "414afe0dc658893cce23a21ddd4f879e8402a1eea60d62ce591e483da657b48b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/dsb/firefox-133.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5fac9d445c67e19aad732f3e8ee65bbfab452b40585bf3df04a7448914cac59d"; + sha256 = "4ca0de6888fdf03640b2d25eb46a88ed8b43eef26a71e2aceadd8c22341ce1fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/el/firefox-133.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b11a214087f8c73a973c88241616f3eb4e1eec1276476dd2b8a7d3677a386b5e"; + sha256 = "9eb42c8323ac9f05f157a36265b3cffc3b8c20f9730018912db76e9bb511a023"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/en-CA/firefox-133.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "564f4a4d8fba9aa26e36ee8a9d01f1dd8ccbfbd4af4e1f465704a70f44ea65c7"; + sha256 = "54a05bcd08463251bd62b5e1b43e2a063d6a757f66855cac981c19482c171205"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/en-GB/firefox-133.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ce6c0c613868cfabf505edee1b7fd6835e1d8aedbafbbe0e4628ca74679db7ff"; + sha256 = "8d6070c9e4d20aa11aec0b1b89963c103c665035f6a315adf5c1321a8f84c03d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/en-US/firefox-133.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ad1415d623d08acf32a6a891f4c161a576eda25fca64443ac84b366769b4fec1"; + sha256 = "bd60365443d1063aaabf555df4fb11411fd29ea31ac2aa1c80c9ada0e363e087"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/eo/firefox-133.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9ba1d43f5899c4eaf9c01da2032cf77bf21918d93c6cd9e89721a84ec20c497d"; + sha256 = "c145076111c58985e25d4ca937ca51a92e1359b8b87d117c1ccdd8aeda58bb83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-AR/firefox-133.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0c1ecef4dd5c824e766c715f9112b7f848341193dbb26548459ea9816878c6bd"; + sha256 = "aadd10fa5e2c58b77caef30e59d4ba6f6d0c7502387bc6e96921b3308383f065"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-CL/firefox-133.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "70f07e829e31228793a36cdd71324b8d1e4e7a6da9830338c6d2520af2fe1864"; + sha256 = "5635b30ca049a62e7ae2bd2ddb5a5d0bd3a89ddc4fbaebb9aa8069d55c28b6ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-ES/firefox-133.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "65b78e48e9aa307e8e9d77640ad1a3332393ceec40422bd7da104200deea61ab"; + sha256 = "cb65652cc54501185be04b33c2f89d29ae118f84d30149f747270551fb1a1b9b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-MX/firefox-133.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3a42bfb73b33f0eb5a05b166dfa4032d34c4ac0a7470d85bff6c3a02474d702f"; + sha256 = "2a9ed3f17448c7c2158bb13c757fa42a473bab4208e17879f7be7f45d2b3e532"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/et/firefox-133.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5c11d5679515a2c459ef9e2092cb1a7272a2592f61e082c9da2b856bc6455392"; + sha256 = "edaef66989d1641d2854dc2766d99ed46764b2d769093094b3dfe15a31f52d4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/eu/firefox-133.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e5dd46e8f7acadb4b2167b9f123bf8415d97943ccbf837ba62b0ecc19775df62"; + sha256 = "92f713be50d333f4a09eacf4ae63d3031fef13893ec96d4e5fc1f6a8085cfc7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fa/firefox-133.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "732a5a1d28e388393109ca1395f5ac0214a51d736f778e769b6f1c81b63ea800"; + sha256 = "d67cb179bb6ab763867a0c3e37f4a60c0374343a5c3832ebd515bc22e10db74b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ff/firefox-133.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b3cbf42d087663b1c9f81eb42b1ddc649995fe212208e752d6c346638693392d"; + sha256 = "a3a2453735601d5ff84214061bd0a13c34d0c77c186fb224565573bddf27fff6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fi/firefox-133.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "06f02bbbc6f3799c7473a2113076f949704ec30025235d76416cd228b18dd4bd"; + sha256 = "0be6d6b66280b352783a276eda0bd4895f05d27b0012528c1d1c73ab15326585"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fr/firefox-133.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "09d3fd010b55e7732624beacd56b5bb5bb4b7b7cbcaf99078b31477e0c042edb"; + sha256 = "2ebeaab8ca0e53240e8ba2858b7a161a7725336be452c8deb643f36b4398e619"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fur/firefox-133.0b1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "da4fda907872e126ead94f96b1dd57f106855eb7ad394a265ffeeaabe04dfc2f"; + sha256 = "a5bf8c850244ac685fcdc21e988398bfe740b4b7cf8bb871e9966b12f73cd1f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fy-NL/firefox-133.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0794e5be4c6e3b12f0a60d90faeee861093f46030fced53dedd1c0edb1ccc28b"; + sha256 = "09db11c5eda2a8b3b0f456fb5dcd35dc794d0793d5b48c33cb3c045ff6ac7ab3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ga-IE/firefox-133.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f0590e9a1f22b8b801c9f302f2c02bea6214ab679300eb3961b4f965c8db55b5"; + sha256 = "9f3b087ad1193a637173b912139750acc0c06a52e11326fcebdc8371b74602e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gd/firefox-133.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "dfd233907dc1d4a67a9e6b93183b570f759adfee4903f1b44d010dd0a689afef"; + sha256 = "8989162bb822f5a9a9f51eda496022066e232e93f97fc0a4c3a533c37f688090"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gl/firefox-133.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "6934b32cafd86716039827eacf5509f7d3a59657ade55fa342684c197b95fd0d"; + sha256 = "84a82790c373b0b70410fa06df2e63d776ac709345eb11a6464143371c9e7dd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gn/firefox-133.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "f04e6d704828a86227a81e5e830570ace80ef1534a646e90c89aab068ad8fa45"; + sha256 = "409c4d33cd7120e9e6b81c245f6b704052644c262b7417316d02c965e3127ab2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gu-IN/firefox-133.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "98976288478afbad1df8f9b230e6008b07e93e5c895cf78f3e5d95919998b123"; + sha256 = "dda2b37db9e0913d4bff59671eca21479e6e64b41f41ea9879c98d42864eb4fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/he/firefox-133.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8863e64f00c277ab35e04d364e784f844ee4bf524ebbafa472e70b16aca123b2"; + sha256 = "1b7b0eda7e646daff52964f619fe9c463127aba76a4dcc472c75af25ce412927"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hi-IN/firefox-133.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "97fbade4177031acaa3f2db7f3674aba5a4c523872606295e2b178242460cdad"; + sha256 = "8a0858bdfb74aeb3fb5dc7f6f58de97ba72b1a7280f23a7261c838cdc3f3b4c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hr/firefox-133.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5cd45fc25e4c9f6dfb85e0ad6fc9cc4b61ea76dc4ac3ab2c81e1628c7cb6d901"; + sha256 = "666c22ef6c63393fcfadc106e5d9e45f9045871d7320084bb27bea2bc940a4dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hsb/firefox-133.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "31588cd5fda9eb3016e65ea2373dc1ca8d8bc1ab76a39e3ec805b24d017e4f11"; + sha256 = "3687f58291699a0998156e17384da66cafab51834d7c5dbe8a4b6a106173b32c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hu/firefox-133.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "222b21e3d732de1133fee305c46b62b3234efcdcae3798cbc0a74aced1922067"; + sha256 = "96809520bad15744ac0882acadcce7b5bcf5fa0bc4b352a0d4ed2577ff625750"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hy-AM/firefox-133.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "80980c0db12255f09e755210f8ec71c7e9439ef1745fbe8d281b8b0ce5c65444"; + sha256 = "c8ceac8c1d97cb6526b4d5010762afe6a4259f02e7e0bb7e237f811ebdf73eab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ia/firefox-133.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "fcca230e6285991a8b469540e6a819cda8b9b769d9d98f3ec40241b377dc6953"; + sha256 = "114b0c25121b47a83b6614e7e1c7d4f267b38033b4d9ba1da0299cc2e64c9388"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/id/firefox-133.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "63350866ecc7ad6f902f22945d8de6c5b2b5b73a1c90ceceb16221ee0e1d2864"; + sha256 = "67aac95105b980657b01eddd19fe36febb3bbd085be505695a1addb7681d0e4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/is/firefox-133.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b25a150e4de973c77a935635e2b45d34c476c766cda415d3cfc059265b4714fe"; + sha256 = "6e712498fdab6993e70245a81a3dd34ef28743d08222637963028efff80ce076"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/it/firefox-133.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "74e94928ef4e49c5dc5ad49e56adf5fd958b362192c711c8405b63cde43138b7"; + sha256 = "b17a924b15c6fa4f2b894557d596d7e9e44829fbd1aee36ad8923bbb183dd2f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ja/firefox-133.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0f26bef2bc97755c82b4ff38480c5763fab1764cad82f398ed8accc4a755aa71"; + sha256 = "fba05f5aed261d17be91fd8b244decbd376d9a99d845c14d9a233a6e480cf7ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ka/firefox-133.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "efa10add7c6198d2709e0943ec52675cbd98931c8ba6a2b03240210e367bbc26"; + sha256 = "7d6ec78930a4d530f4dbdb471e870c0b9ec4b908d83100edaf1eec5a4c1a69fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/kab/firefox-133.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c6189ae86a6c502c0e6ec5a1110cae5fb49377eaa3a3d72740661090731d900d"; + sha256 = "f819c92656b1d7a11e73ed35d5bfc443ef5af0468935dbd783788e48cb07ae40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/kk/firefox-133.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "91a9ea6a270bcf43f05eee0d45c7b1247dc6bb1ceb5390726f9b582cca91e0f8"; + sha256 = "616dab450ca82656646018e5718a83b4689e3e51f82a10211c543e39fcbba3a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/km/firefox-133.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3ae6ad9c2a34deba6067fadde0afcaac784030c839729ed2449784350a713223"; + sha256 = "946d66dac62726147ffae686410a761b7187c1230a740bee61937fc5acfd3b68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/kn/firefox-133.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "e3b221495a989ffeb3dd6352c29519764554f8e06591b2cebf70039c2f4c7fa0"; + sha256 = "57aa68e667431152b26dce17f52d381daea3bbbd51d20d2d41c282b71506b4d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ko/firefox-133.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "13302a48b65fcd0feb9719199f5f997737e7458c06cad6d098c1838fbab2904b"; + sha256 = "8a8b38085990d15443e819ea087b1b241af99ed843351308d7cd49962e434fb5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/lij/firefox-133.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2c94a010840d08035a7f11e40d7f1a92e805aa70e6348b1802b7e1dac3d78307"; + sha256 = "5d88633bc0cc1badd60c32ae3ca597ecbd6f82c8ba17c363ba35504451aa0966"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/lt/firefox-133.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e0e38869b9d299624623b0fcaadd5562b0a1c5f9ecd897348a495b48a969ceec"; + sha256 = "c70d3e92bd3f9027c69589fb17996a8085bb4c74f447f0cd32610988851817ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/lv/firefox-133.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "964f17d9129fa6eb3a3ed6b30392aa5f4fa19708bdf0dc4f0c1a0db32df0310b"; + sha256 = "066ac178e2e6076f9d15f731e71b0346e30b54be2d896cf00cd78eb6601083db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/mk/firefox-133.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9c95ddcf7099e8d88932d94431610b21ed24d33efddabdec47778f5e67351836"; + sha256 = "31c8eff29a9ebe3b29c683533cad12aa48b3afd5ee7845f3033f70b6c0bc6241"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/mr/firefox-133.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e4e4a887b1c2cba684ba2528c6cc471af3bb82d8d9a2fd1833930d915a2e16bf"; + sha256 = "078da76e4f7b8764593f1701cef1f06d9e77fd607c68be7481948ee2fb4a791a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ms/firefox-133.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c73b6f01896873de4388f73e92fdcd0d04d7dd7816e7827b7a6aba5284aaa03f"; + sha256 = "94229a433c2487ac653c82b2daad6503cdf80602b4ded2fb7072c7d0a64afb3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/my/firefox-133.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "aaf0343a3e3c8cd9ba4b9e61b412381ddedc124a14646379904aeaf11ed4dd79"; + sha256 = "317294bf218a0d19f205b908a48a90fbe06cf5c0fa114e8e831d033ddb3e32b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/nb-NO/firefox-133.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "4420332b3105bbc53dbbe1185a554e208e39ded5541eb7452add0f8b49e6655f"; + sha256 = "64014f27b7cd516da9f76bea26a2e37729a535740b5c52e1556932fa8e357c82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ne-NP/firefox-133.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2936ac1de8e97ba8e393f687efd5bb3b358ee3c919b6fab7f20d04e46d11ac23"; + sha256 = "d5c3cd9524e069953305c1a52b8e6a9967f0eb947baedeeff8736ef6a6ac83ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/nl/firefox-133.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b3e46bd840beeae40cd3594626b86a849d31e30b416ec477fcd99ae98cbfd87e"; + sha256 = "a575e4899c81ac773d0a40a1a9f89af0c3ad77b8776634abed33fc9fe7511fca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/nn-NO/firefox-133.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "19ebb27df8cd258410d953ed54a02281f33bdeb892060db9fc43bff81cb8d3fb"; + sha256 = "36ad31e105bf6edb37fac55bfd58e50afe32b4a705c74e5c2b6e9db27a869d54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/oc/firefox-133.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d4b24f8468891079e86136ad2ac99240faebf843672bb839cccf42203fb82a69"; + sha256 = "e3fb3a792cb7afc025ce3b4d19f089c80a542a9b91ea0cf8945e69a229ccfe6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pa-IN/firefox-133.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c534e8a87cec2f0e9ee0915bf74f3a3a268112ba2eae9907e2850a7e6e294fae"; + sha256 = "0c5a828f6c7d42026cf896fba8423d04e094de396bf26dde94621fcff363e975"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pl/firefox-133.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ee475ed9aa8c00d6dcf02f817cff43f689334d1c9f16f42ebf2b45e5f0812c0e"; + sha256 = "4b122397e9ccdabccdf7f0f5ddbfc734c5675170d8e32a1059ff42da08fe11e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pt-BR/firefox-133.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "326df9dedadca13f46ae26b8bef8fe9127e0588f84d839214bf52ef013dc45ba"; + sha256 = "076a75a158bea4023bd38e4f5a534187ba329b0ddfcf3ab0b97657bf21dccc66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pt-PT/firefox-133.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c222ff822a6433b216ad164a5d5985cbe046e220a5dd7f4f1e043531e07ef457"; + sha256 = "6c254118ee767d71a0203487512ab2411dacea0903074def934581c92d5b5fb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/rm/firefox-133.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ec93394cefc1c458349a5b91527e4159e6958614b96d626e15c751bcf31dd780"; + sha256 = "313917e95e615d934308b127f56a35a69bb516a5e4d6ef5f63fe4a2f7a5fcf2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ro/firefox-133.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ffe3ea9129d2aa1d998391965f5f7c58867226e750fe79282718550983d994ab"; + sha256 = "8ad52f9cd80a2bb1df257f7a3b5c09ebc6abff52eaa5d504a9a45819e2329a85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ru/firefox-133.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c3c68bf3cb48854238ea83e95db04006f099e378f5f073f93a460b61a3ca8298"; + sha256 = "ad91ca54f0b7cde1de770bb57078ba8d891300ea5554aac6e7b1e8fbd750e097"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sat/firefox-133.0b1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "f348f5400fd8f9f7272193824bf873b171cb01b3416e30d7697a0206439ad0e1"; + sha256 = "f8e310b7fde9ba123fdf478038dd9597979dc710491a1fe4316a0759b756e5e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sc/firefox-133.0b1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "8cb3ca91aebaf60ba754bc2f3f9ef004a4b1fe2f96aa9699a651793929548fb0"; + sha256 = "15b761a6fbb95c47ba6fe2d7bb1d2cedfd522ce43645f070e1403ba6fef74e08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sco/firefox-133.0b1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "7caa1d9b5167056e64407c87126796e9b2c3595fab890ccc8f600cf2d6ba3b82"; + sha256 = "bb56b3741ddcfd7d1d3751a364985cd94a59b4b26f18c4502a57687cc269ae1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/si/firefox-133.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0596297cc39de0580f5eff0e6bf11ad9eef58714964277df24afbf2266f78169"; + sha256 = "4f6011912dd99fbc23e3d764874c1e6e532957c561e79b30252f6dfcccd400f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sk/firefox-133.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c232615c60808666cf7eb42390c957ace79fc2964539dc9d78337db2c82a8df8"; + sha256 = "82af3e4d39dfa2f5c8f399af21c0f167941a46bd7ad4ca512c652909b45d034a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/skr/firefox-133.0b1.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "ef5cd9a9677377fe3cacfc7234e3180c016fd0ae8809663966ca3f735b996efb"; + sha256 = "3fd67475eb317ea3f83c0787cac862d8b8725aedfd3f6dc8d0274f368dd1a36a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sl/firefox-133.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "968357070418cb7175b438e0192f8eefb42e3fb7604df9bd08e1f060e7cd6ac3"; + sha256 = "5c8991a89e795de0d8c5c6b2a08e1029d7ddbfd25045951b33a0b04223a41bad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/son/firefox-133.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "44828102302c416f2cdc2858aecf843d72e0015a743a4a33a6e1256449c686b8"; + sha256 = "d9a96931cfeb04cc23bc03954c69934d21bf4c5a5810c94ac961a6088e39054e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sq/firefox-133.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b1d849e2af49f7c9bf7c05870fb79ff6e0f9ee0fb58513987632847300235e53"; + sha256 = "8d27d21903f512004900cdc7198de4991f22218ce948d5242cda649cc30ccf68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sr/firefox-133.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "99cf9f0f9c853849a18d0dc05c2f8416c42884bbf92d8e046e835ae09b800f97"; + sha256 = "b78db319c021661d41824f2267ae462695745e19345364495c40827e0a5247ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sv-SE/firefox-133.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "664c2231fdde88b8d2e438429a699cf98c878f41625b89d6a5b14d2270e96fa0"; + sha256 = "1215e48cacd11570a2f3a8914328a472c6167d7810f94953699e5c6f44d2bac3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/szl/firefox-133.0b1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "038477815c83f2566bf4c00cffd37ba0ed60383c90badeb685ac95bcd302d0bb"; + sha256 = "2828965807f5b8ec7718cc58eb9ef38452acd6018a89987fb1e07faca47c1c9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ta/firefox-133.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "3be063a9199cfcbb08a59e448c41b6382d5d13e998d6a3d4198f3bdfc389ceb8"; + sha256 = "ea30035871e66630a9057c54ca67fa49b94f0c75772a4fc2f1aad486481ed385"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/te/firefox-133.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3a80f9b8916d2827e0ed0a7d6c4e968aba80c97e2d1a595b8a0c10f226849d16"; + sha256 = "e878689ad558db568f50baf0803978f2c6fde36fa8020cdcd7706b2f223d4e05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/tg/firefox-133.0b1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "cb171a6f21afe5df09f41b11e68c6cb93bfe8c64f1c32e75ed248d8eb7fcc055"; + sha256 = "4611925af4e593b82f4fbd7517bcb48ba3757093c819af3c5c5b69e0b45672bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/th/firefox-133.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "60bf0863d527971f35fb903c2801c7b607d43d882ba4ff8be7d1da3ba7ef9cd1"; + sha256 = "fb6240f394ff58a04557117ed281d28c28abcbb7a37223281e42cba3aba58a8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/tl/firefox-133.0b1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "16eb05f365b447a7535d12388d27e2d439d6dbffc44ffa1dab2319ad922738f6"; + sha256 = "e6233f5f26b5b22aec20cab3c0fa434ca8cdbd301c671650e8a4385f2785517d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/tr/firefox-133.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b008823c635128eb3f25e0594999cd25a7264355be82b7c30b3fb8ae7a2ede0f"; + sha256 = "de2e4b9ebbec7428044df32206338318a77625c70bef63b86a87df7880f899e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/trs/firefox-133.0b1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "218fae2f2f4a6e0f2c217ae35d6f7b62d955ef60d1de0d923de05dd6f839c58a"; + sha256 = "e23e749741ae2afdf3cbe580221753c90a5dc115327f1dc1b17a840cd05b93d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/uk/firefox-133.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ad28b1873e2c7781dfb14e8f692c08f549496fc8afbb4eb4ccd49ff403e221d2"; + sha256 = "7641ff9a44fed05133ec2a7876f7a70b7fc701efb98a99c9099f0263cf100701"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ur/firefox-133.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "9d8ac480fd55cb749c6cf8166d681b619310dc25f352d109004a61655d0bb779"; + sha256 = "76b84dea317b8d096626636e4317df7a0de33f045824494dc1076fbf9a11c3ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/uz/firefox-133.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7c19126e32881e496e538028dc2a336cfafcfa5ae8e53d5ae1f76415829adc7a"; + sha256 = "ea3bbd715f93ac09524258ef039f97b67ae04163f9ba490217e3448a50ea69db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/vi/firefox-133.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4fed1d825342d963e45b81b9931f152c4600494866f54795f353ae1c84c94e40"; + sha256 = "d26f876dc7458fec133133cb4bc25350f96a0a7b4b6ffcfe26483fa62c03985f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/xh/firefox-133.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6cf56b2c6a0cbb6fe4161e126595f61cc0b099b526c2cbb44f5024cdc428fb86"; + sha256 = "69e8a971f8925945c0323320f45a843d98d7ab73b80f9428f47e83626651b6ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/zh-CN/firefox-133.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bacdc8db6802246ff6293f80027eb690f02e41eef04ceb1155a3ef35c99d27d5"; + sha256 = "1eaa3adc05330db6849d01314a7bb8afea8dd69b7ad1dde5c0b373d84341eeb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/zh-TW/firefox-133.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1c41f550ba2c67d8dbbecac783642e2b21b04e4d3a6fc1bef7d9bba0dc35638a"; + sha256 = "22d501328e4728fdd2e8e22c44b164ea3435b5905f57adfcaa97843abf3d1d2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ach/firefox-133.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "3a2eb5827dce67f9f5ffef0d68ae8b0a38bcb8635c77e3662426c6068c340836"; + sha256 = "5235e26e6100a1216b7e814f4885cb70f18544926cd5717bd10ce0f921a5dfa7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/af/firefox-133.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "daa0df7174e377c6ed64759460d0a7a98881a1afe1e366c5047b1dea23c7afae"; + sha256 = "ecd5f7edcf44f0bc6c8f9cb2e959d64652477c0a91138186a47d049090333967"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/an/firefox-133.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "636e32c6b2cf823895ba1fc21c49a93d845285f1c0bb4d4edde05c88337f273b"; + sha256 = "62080977a6f277a02982a1ca4f95226539d896cbcab49be5ada9419fbb35c2a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ar/firefox-133.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "cbc5a4a80bedfc115aa3d8450b809ef39ef80a6a5ca7446b233a11045d78da1c"; + sha256 = "d159f1146a116f128fd93468f9a52b264bb97c8f98cd615b4c22fd0f4bb54369"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ast/firefox-133.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "11a799ebbc18f489ed0043718c7091d352d21e8f5669b841eec17c3b930e15be"; + sha256 = "c7786d6134922c00a7add9d55b36aa277f791c57e7ae1370a57ad2293c279a58"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/az/firefox-133.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e491a0d636a602d8881080f237c55583270d0ca62b3350905deb8c26d092b190"; + sha256 = "37a7f70e459ce17ba506dcf57a2d0a918b1d34f6d65d71a65cacdded1d36cbec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/be/firefox-133.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ed3a53f09502548054476ae26475de0068c33c1dbe2080b68dc88da2c6c07f86"; + sha256 = "f35bfd4c67e2e16241bf5d18058d01da003b6db98ef20a5c5ff80866dee2a3a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/bg/firefox-133.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7e19ca96797de41c55f2d81e17418f4912e286099193c4d23356432d937dd467"; + sha256 = "6e591047810cdeb9fb455146a6d7fc40e2bc07be8ba80b9000956c958bc4590a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/bn/firefox-133.0b1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "23e1ad144a6564e91420ff1616ed81b577e15bb2c48803dd73a408788a791e8d"; + sha256 = "94018749fd939955bda8911d44ebfa1336e1ed6b0deb78cfcf51c978ca21c586"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/br/firefox-133.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "32b8631482a1a27aceac69aec87d4094f7e7a8dbfe04310cda692241bb1d51b2"; + sha256 = "dc9a5b38938dc4ee51a1774b57ea9b8ed178908d5c792b5c8d6072f964a8ce2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/bs/firefox-133.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "575ac3d86f62665a4c496e634778e3d1a7258dc73f6c2ce6727e2a96e9d2ac03"; + sha256 = "4dfecd9c6b843636df4a952769d30779ca167968c204556ca21be822f2c6488b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ca-valencia/firefox-133.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "5e5c1f70fda621f566064248bfef9fc1629c81acc31fd3e21b23d2b122754470"; + sha256 = "d95465f69ff0a31c5c5fab725a0c8bfc9564a896993f5eaef9f1a46badef9d16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ca/firefox-133.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1f622038735474932239888d00c47eb8a8c719854340a838cf580ecc28a8c1cb"; + sha256 = "f60d2f04ef97c94604a38c9065fbc4d7762a0e97cb7a951963d977f599574fb4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/cak/firefox-133.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f4fa8cc59a44bcefbcfc9d41ca67f1872f29073b1ead1e4da576091605721d86"; + sha256 = "8fc8cee299c1eb3a7bff416cb749eca7a26840d7b4934f31bc36cf6b9ac0a40e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/cs/firefox-133.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "fa764b4dae4384442f1e2c4424b8b82678a3910a5873dc068b605795ab803673"; + sha256 = "6a1adadeb5516c35fe30874c3805f31276aae3638213a3b14a491e2b091aacef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/cy/firefox-133.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c16333d4334148e77f4c36a1dbdeebbad52964af903f4913cc12a76997651585"; + sha256 = "9eb63eded5bdb7199b26bc621fca862df9aa7aab1886b79e1c1d3e230742976e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/da/firefox-133.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "49f5bbe32fd51898fea03249af04cf922891fa57b5d03afd49b92a7eb6305fa2"; + sha256 = "e4e33e4319a9072892ef395aaf6c1175223e802bfc1f7dc474ad1ef9f91c5883"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/de/firefox-133.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4b5b5a07a09fb47451ce79aa9b4331d12e64222e7bddc950db4e8c4f660e682a"; + sha256 = "ec69257df5cfe9a37c3a69726f2281a3d0e6a9a85a501f19e46535eae80a5e2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/dsb/firefox-133.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9ecc41b2fd42e3595bff98aacbb670081340175c1594b2e5e863d49be9747575"; + sha256 = "e7244987df4e971dedd31de64586863f5d2888382d3da68d1386b406f2405200"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/el/firefox-133.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c14cb71af1fa07286df672db42140528807015e4c633862f145d311ee67d211f"; + sha256 = "5b3c989407a6ed42f095cf8b5656aa2a49dca17adb117458828424812881183d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/en-CA/firefox-133.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "de205306cdcabc1f8764e048b0189f31dd59265282a0d48804dd5e01d65eb4b7"; + sha256 = "2377969cb6f7e2f169932c7f20581bcd1bf740db9f1e2f464896666a3fc38987"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/en-GB/firefox-133.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "87337c3c036f2dacce295ce3044f313266910f7911037c1d1eddb7c633c79703"; + sha256 = "039ceea2c9ebc264d01bfefed9bf8fbc16434698d5c4d4cfe457794d92a92a1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/en-US/firefox-133.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8bc2cbabfe34d0bf8eb72f3ae9a5db6b4da83b659385c80059ff468f436e122c"; + sha256 = "32ce9d0bbb2080ce8afa73ae5d1bf166105b6dfe8bf26ccce3721d42815f0581"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/eo/firefox-133.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ae1ad3d5c365a96e4ec862eb59cabed185e0f5ed0ea1c196a726db8307d56722"; + sha256 = "90a50460c92718c62a0c0f0c3e58348ef5cb4757db8fd05aca4c251bf23ab3d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-AR/firefox-133.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c7f7c52b27a98a6ec5620178e0d7d9989cc80ff33d8a8bb8c9901d14d470ecd1"; + sha256 = "4ae7d1644197612b266b8844e27c6ea7b5e3df079e0ef1b44f8b885b93e1f18f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-CL/firefox-133.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5c40f644cdcc273a7c5296758c903386bdf72c928d71c598ab1cc524791bd12f"; + sha256 = "e547ecb14f8bd32c91f4025022029bb79af4b065e71c234940306949b5c5e462"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-ES/firefox-133.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "66cf9339ae8c7703b23ac94fbe4d641b3dd2d4201011a49c3d98859874481fe8"; + sha256 = "e5a6d7dc34190992814995a0b57b4d9188c3ed6c8746a045750a56bd079713e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-MX/firefox-133.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6424538eb209875fa42391bf4457b1160d066ff94cbcb35cacb4698a6c87a158"; + sha256 = "53ad3eaa0f7b969350ae43c023586d42fb18044926bde5c1f5d8337c8d83f7f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/et/firefox-133.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2d24a51753787c300fdee4a837d360706a206d81063ba90e45b0a39dfec19704"; + sha256 = "c647317e95f41ea684e38d3aace7055d920f3b119a82759b335012446f1b5724"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/eu/firefox-133.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e071a830171829fd0ae7407a0e36e2cd4d732d0bdc5d95f308ae645b15e43352"; + sha256 = "873e4d999c8a96c8aafcbffea4c18cfce5166c395309ccbeec638ea26a80dfa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fa/firefox-133.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "28f1e8e0e4c663d1f4651b598f0981f02170fb70f566b56ecb4fa695ad43b062"; + sha256 = "fa443519be951c02b12dd2cf8a5c163deb8408ce3142d499484078d8f7040f9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ff/firefox-133.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "8538d13b4036fa20eb9f05588ceb58615e47a91f40e52b80fe8bacb0815d2280"; + sha256 = "dd025f7616a71ff7fc71162acbfef86ae1a6905c039ec2749c7742982dc89a4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fi/firefox-133.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5db06424e691bb8a38752f8b4479682b211b944054b624c6fb2b0517d6dbe8a7"; + sha256 = "bed429db1a03783615ddcd1ecd1383f3f4c52e1295bc7cff0af450718d079db7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fr/firefox-133.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0d239d9d7f6e7072d44faa571ed47c1943c6593532e8f5d13adcfb3c6270858c"; + sha256 = "7d577bd3cad1e960424aceffcea266d1e0f26757e5942dcb473a1657c3290ba0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fur/firefox-133.0b1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "0cf201905007894685d3e2f2a5555ba478385e576546112912ad51304aa0fcb9"; + sha256 = "5fa36efcefbb0626419b9a8beae643ef1e6f0c386a2f507e72247c565e1e8998"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fy-NL/firefox-133.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4390d196894b898724dc31ccd30d85795a6094641839ea3b688253fd7fa59925"; + sha256 = "02997236f0488ce1b9fa1ec40648154bda3c445c0130d7a08982abc25ea2ebf1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ga-IE/firefox-133.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "07f04a17bea08570c902a7588b770a0b32763a792de46b2c6ebf4c6323d8e72a"; + sha256 = "41bbc0b9583e97acb6c52751974e602345e1ed593673574a9c6d6ae4fc185990"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gd/firefox-133.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ab87018a5cf04c903a41bee02528796d5537533688d50e21f66dc7c5210e2197"; + sha256 = "a6831f8632128c1b2d02935f63000b1bf7d0e88b6bea0b2d814a8e8774aa24fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gl/firefox-133.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d2b36736a16b6673d9051cad9df7bf503903c09b0bd4c0492c3445a55ee11f9f"; + sha256 = "54b7785440073d33262667bfa6c2867a8f623741274dc55ac70b3053ff17032b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gn/firefox-133.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "587333196ad1a404bafca6bc72a9fa76601454a1510143d8ac1aa3a21b2ac0ce"; + sha256 = "e2542e3c1d1fa72bfaa601bc6db5c327cf3d992efeb0d40dda79c8c2a91e57e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gu-IN/firefox-133.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5fd1e4959895c253186feedcf64abe577452c7099778067046438f6409c0f4a"; + sha256 = "e67053a7ab1a8549de586a38271239188aa77572514945781d34d3c56b61259d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/he/firefox-133.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f5d3701b4ea8715e8ce3d8870ca2ef103804b529006c264d35df5174048cac7a"; + sha256 = "a0d06ad4015f912dbf8f12b97a7193ffbba48afe63b53bf24242f4eec44b21ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hi-IN/firefox-133.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "cc3f712afd9b6866798158be07855cb49a30764a03c64463c458774bf6303af3"; + sha256 = "74d9298bf2219c3fd8e9ee0783b90d2fdeec7dc11ef48d7dd388a20b9e99079b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hr/firefox-133.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3833d16b4b9c98547f9f405fee4d150763529d4c87e09d2ae1e9c62bdf09ebe1"; + sha256 = "067f27467dced6d01362b396802cd33dd9c80d45c849a579b49f3c5c07ebd182"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hsb/firefox-133.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f9f6802195c74368f4306470bff9352644f592f84334104ec2df829118cd0889"; + sha256 = "46581a547587e8469d171192d7f45c029c6868addc0df73ae52ce86eec5b555d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hu/firefox-133.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "da459abb9b9b55626c11b4ec09e3de6b4ce64928e1af8c1c7edc6937d9df2fff"; + sha256 = "7401a0dd3ea993a1b35252e383258b03ea3b66bb5f8760b06556b1141598f740"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hy-AM/firefox-133.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "34277bb22941f8a3e5a71646fc6a1304660a6087f66fbd6e1066ecc3efd952d9"; + sha256 = "2aa425086ff2ceefca72afb084992225b33383492379e91b85441c33140f34d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ia/firefox-133.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "c3f2695c4a3f15a60a83f6f1561e451a75ddfa25db6827541be3d948ee3cd5e4"; + sha256 = "0aa4009346092ad02ec4242f5748c087ca3a1f0f49c753101b70a03ec8e07a42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/id/firefox-133.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b44069f8b898d751dd42825ed55a216b7cb2b78dbc187894ae886cbb0ce1303f"; + sha256 = "be998daeebbf20dbd12976f33c75edd7dd1db838c439ae16120ad96e887f5e7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/is/firefox-133.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d566b05d2de587f8f377f0552b8611f3232a1b2ce71270a956690b04edeaa8a2"; + sha256 = "89c5a3329217c033b12a706b1dfd239a31b9b6c25bcc44fc250cde6cae9a7a5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/it/firefox-133.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5b79674af83be412e986376807a04ae59f5b96c4a59c905c951b7b29baf76cf0"; + sha256 = "b2eb6281f75c734ff2d8190bbefe360e239a384161fbd61eb61dca837be6df3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ja/firefox-133.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1324e8ca99b2e7a9e7d671c0dd066553dd2a60f5f0535103d372aad287e36281"; + sha256 = "cfb7a0c45fc51a75c888f27c119e841e4afbf59a68af79ed81fd054a8fab3292"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ka/firefox-133.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "97cfc20dd249d8934d1e92f0edc9b4db9fac00e1ae3f6e256b4cc8e960bcbc66"; + sha256 = "134cc6680cd261624677b68c41330e7283cbf940e3c5cadc89cce10fcbcff4f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/kab/firefox-133.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "746186d77f3bfac4ea34dddc6d5bc0fe1a1a2fdc1beaae6946bd58a5415bb732"; + sha256 = "e9eef562d65a06f595cf620b96fd796c76cde9c9ebafe017bac7ee01abb09d85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/kk/firefox-133.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "48e2283eddc4f2eec476a7b847997705686985956ac2bcf0677b06600d2cccea"; + sha256 = "844b7b7c2737bf8ab1beface6fb3ab66bb9447d90c7e284c0db5977f193ca608"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/km/firefox-133.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8255888fa2771c50a7cbacca023dd2218908b46bb52a4a070073b89af86ed9f8"; + sha256 = "3153a0d951761133902853591b8dc324f51b7937afef7f876d42cef9819de7e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/kn/firefox-133.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "17ac76150b550f26af69b7cf36dae1441602d3bedf7cc8398f102b6a41b00775"; + sha256 = "3b15251296773062dd58666feb4e4d1d069069035f7f29d0c30d89a8aa8ede52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ko/firefox-133.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "794c3566a5ec2751dcde9b0038b0d11f64d5443972fba058d8c1d66e2a768d7e"; + sha256 = "26d3ec847cb4f4a63dc65e5f85b71a83c0000b3a2245242aeb0c85717f638c05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/lij/firefox-133.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "5dcad09ef1e16c8c8fbdfa76b180f66df354dd3a3184a95a9ee219619d623126"; + sha256 = "821cebf1615b8d6ccc886f1ba6f71b7c96d1f905f25656c06202aa9823b9fd7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/lt/firefox-133.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "67ea002179152fd697c2b7cc6028f67eb8d1809233127ad3a79e48937874e479"; + sha256 = "67f446c2dc13ab0f5e807c359f58b6629237b84b270119e1a07b4783c0f32f8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/lv/firefox-133.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ee90670d050beb555b8375903397cf55cc9f4a54d806a32c9383150799b67a9e"; + sha256 = "3610f2928483acf76391b76d6daa7163dd2f67fafc9f52fd24741cb9fceb6c27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/mk/firefox-133.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "b47befd2ad2eaf66842e159601bb312dad71b665d8c8af9eec5d2ba646e26fc8"; + sha256 = "59952564993c98da66d5b88672fd9c40911601cb7845d64587f88636ac724310"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/mr/firefox-133.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "33dfca6116afcbc1edf83d4e30c32c3e52a320a1b447521a017502a2cf2abc33"; + sha256 = "a28a7e3bc05f3053d35a2f7ec1e6f6e9a23b09039d129986fdda4f8e827b85ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ms/firefox-133.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "310f06f2ccbb321da8b2f7ea1b302f0c90fa6d0d19aa4cac40e08710adb42c49"; + sha256 = "7ffaa99af8244ab466607bccefded8b0e6e714fd40243160a9c4bc8778faa1bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/my/firefox-133.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4e8b59a810144fc8407ffcee81bae69f3b3b8458920eb8c30affb59e432ca49f"; + sha256 = "c709c5f9dc3626a3bc9bc68d833ee1c4f1d31fe316f5b764d40f73540e0a38f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/nb-NO/firefox-133.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "3fc8c97733acab28b7b59142e8acd6438251c83cdc7b37ced2a74c7ad5de9af2"; + sha256 = "a97b29ebe0a76915cc4faedea6c448300ab8c7e8767c9f3244f1b339c8ebed5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ne-NP/firefox-133.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "939a528486c9e9a7d5692c9c248aa8f2c9ba9d86bd6508fc1eaf84f8a21c8731"; + sha256 = "3214b27b65fbd84ebb8f409a6d05e2afe76f838432e4c35865ff3bd3fbc5b5b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/nl/firefox-133.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "01a5fcf60e9599128f7d5663d83428825db59d5a49139348c3b3a5fe48ce5d25"; + sha256 = "fe1de7ebf13cf5fd0d9460a331d66d490b00fca1c1f5f36877297f65b34acb9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/nn-NO/firefox-133.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "4e8fe32b83d51a01c1a718fdbdf21eff87f3388995426dca460a583b63a8c3c6"; + sha256 = "131754185d4b0bdbdd8e5456ae54051a7e974fe65c92e5e68cebbc09ad77c3cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/oc/firefox-133.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2cfcab5226ce8901cff407c9175a712ade1bae871be9c37f044e88babdfdc68e"; + sha256 = "a83510b6064cada58cb3e69faa54081f63e118cc6a3ee82fae6b85041f4e9d7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pa-IN/firefox-133.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2bab73df49224bdb79f6d0db857d181e8a0153631eebe4b54c40302dbf664ca5"; + sha256 = "7ff6673e6851a9c7885803d4410534fbef1e383b24f5675dc0cd4536278bd6a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pl/firefox-133.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "022130cd8d3a4f13a2734b09eafada4cb3582f0a04771a2b38e2e8782a077eb7"; + sha256 = "21958228263df676dd210810523848a25875f45897b2c777a23c0b41e57aceb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pt-BR/firefox-133.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d4804bb273803d762711416831ed6fadfed28e09a92cae166b47d436fee3ce2a"; + sha256 = "e5b6e65b2e94fd4c083405ff9402d8b8121578e429403413969e973217d8edec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pt-PT/firefox-133.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e7e0bb5138aae26ceb12aa014a4a365d69141a3f6d0d437e5d9112a1e1d9222e"; + sha256 = "bce05639655230d8fddae84489f89505517dcdf7d2270635de952f02a1dfb0f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/rm/firefox-133.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "09e93cde46ee4d590c233a5a1731657722d7d68772867a9601b9d561e166c8c0"; + sha256 = "fad7e57b866dd5484a3c2987cfa7092d3b1505b9ff1bbe8b4abae01cb2862893"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ro/firefox-133.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cdc004090e30db5bba10906550ed9532e7053a3cdbd6525280978d06fa87aa44"; + sha256 = "91680a58a8178c48f22ca36a7d86bb09bed0ae26b223b8d3ee4b1401aae56f29"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ru/firefox-133.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "be2bc2843148d4241f5a59c8cf840552eacff056906f4712172047186d7e1ca5"; + sha256 = "9071420c5ad59bbf55c86c6b399d664547cc3f0e061985ddafc084c7ecb20996"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sat/firefox-133.0b1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "c326732c2ac6b12ebc2fadb464bff49d24b193e229f32be7c17ce30b8c8584e8"; + sha256 = "ebdb74ac24cd8844efcdb33eaecf2e3e6638708e87c720c81b7f2c5e968c068a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sc/firefox-133.0b1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "f7c6823d9196245f2f6ecf4cbdd9b82397cbb39bd2be7c3866a6bf592b055a22"; + sha256 = "caa20cc0c17491356bb4e1a5bbaa00278145773ede483f8aafdc42be39afd438"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sco/firefox-133.0b1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3533e52edd9ee565119adb2eb04048e7f03442a59d0342cf63ba0e515edd544b"; + sha256 = "09c69b7988f004b8a8ead03ecc784d11a3360d73dad12360692252660472f3b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/si/firefox-133.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "94a37d1d5dc04726f2b10831db8fc21ca48ad22eb08d4bd64641f849ef395d0f"; + sha256 = "c087b6c581e769ae4d66761ff8826fb329d7f0bf6420b73368d2ceb538bf3d9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sk/firefox-133.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "53bdf98c1b6f21c8134d3f68241dcf64bc351f5926ee23ef1435d5e1fd7469df"; + sha256 = "1b1226826371a1ebe2fcff4b8c874f0e0bbc854f8a3d6ea38aff82ff859b5eb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/skr/firefox-133.0b1.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "780e110da1c6e8c50a406cb20c5dcb25b3ea9be9701b2136372fb3f08226269b"; + sha256 = "3a40bee963b81c94eac34b0da4163751f04dd97f9e18e22a408ea2e055c34a46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sl/firefox-133.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2cd694302448ba68635b672597428a605f3f8d2cdbb22df86c57e28d75d1aec7"; + sha256 = "7b34537382118ab1fd811d81a7ffb2a7292d447d3e5c922412676ddcca2c94dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/son/firefox-133.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "f73388326340bae37206eb1fbbf92660f6e8c0a9aab266624d71a3e7b6ab3f81"; + sha256 = "fa1660e07117c736a2d7c4249b3b34da98c70061dafcb7971ebaddf88c8fff18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sq/firefox-133.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2468e0434793844579dcee985ba36920d637e4adf4fdaeb4b7c1613567d9704c"; + sha256 = "e4fb5bfb39bac51113b585daca8d60734a551252d7ae1196fb96023b2ba57c72"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sr/firefox-133.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5771c8dc7555725d5579095f5dd50ed6e23d92361bfbfed4e553bc358549fa6b"; + sha256 = "62594ac892147e1a21bd7bb7b0d8609e779f18fab6c45cf9910b79bc6a7eae03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sv-SE/firefox-133.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "dcd1c02909989a1638dffff4ee1fb75c37e870741dbfd1cd32a3c0b514d6043e"; + sha256 = "dd1e6823bfbd0063912258e0da87df33d770fef2847643fda0a9b806d196e049"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/szl/firefox-133.0b1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d988fdfc0e57fe822e2e41f6e21b3aec3a6469008498f8a974fdcafe2e042f54"; + sha256 = "28329d3165c3a0f629b71450df71ef264d0b962e0a19969c7fb1dce35c88b290"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ta/firefox-133.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a98e68d852422275c0529050248402ea9e6729e824cb9792df3c55e326c876b6"; + sha256 = "8ab0bd1542f5484edeb1c8d4290a33ccbac6702bf732e9a57e34e28218605f7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/te/firefox-133.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a8050a4a065eb9d6cf78e61dce4ae006c7b6d10dc404b1ae4d201c9403852c03"; + sha256 = "6e73c1550ea59e9177b13daefc84f9cd024c285865aba024af84ccea87e7ed30"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/tg/firefox-133.0b1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "d81e3d9420a988f584564f56293ce4989cb99a9e68beff0bb591ed131baf1d41"; + sha256 = "956a5816c8d32a9d513fb36889f1910c2d2e61b2e19ef4244572d993bd768611"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/th/firefox-133.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e020cffc3cc7617bae35ed7675d1b264d77e6f0f76800197790941fe4584fae9"; + sha256 = "685abae351da387a88ab5810c63fc7aba98f2c6329ef278e14666c1528be2554"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/tl/firefox-133.0b1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "dddabf60e22b6e394e6b1f8353dbed640ef5726c795ea5eee75f5b0256fbd12d"; + sha256 = "596044bebf8631c25f0025ed4b48a3ace63e854a6c35f7e5703780c5df2d814b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/tr/firefox-133.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "72098506c6015d0d9a419ff59c5271a592118fbcf43417375b6a405ff431243a"; + sha256 = "a8de705710efc4bba5cd91dccb82d609cb05c218225cd93149c945a1c514d4ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/trs/firefox-133.0b1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "0977603a758eb53309b77743d6596fc7a3cb060d0114c20327ebd86277f11b59"; + sha256 = "2c147a19c1c09ae9ff74f885ba2e37808303d9ad78bc5f20354fcad59d345f42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/uk/firefox-133.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "196e7aeb323c62e50fb653ce035ebe325c94eeaa8420d5d9980dd46bd4f34f4c"; + sha256 = "a408f1aff785082a163590575999837aa6ccaf681893266c2a3d497a32a50e8c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ur/firefox-133.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c651eddc5c4e80d6e64b3287e83b7d5dfc6b1966d4737c8cf701b4ecdf076d78"; + sha256 = "91ccc6797e9db30917880159356d4a79edf966ad55b000bddfaa73d46afab7ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/uz/firefox-133.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e67a0a7ef1a21ae11fc17714fa9c689f863da60c7a200a5c6918c3ac9ec31dc8"; + sha256 = "58c625b07d58c5d10ac4d445d0f2c7f04ddddbd52089ad276ee831d8af1982df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/vi/firefox-133.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "878b37478ab82baea6842eccd38ee9edd4062d22344a9d7529368a9a64106132"; + sha256 = "eddc3be87d3e8f496dbdc1cc722f60d61daf32bdefa13ae3988309e672e9f2ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/xh/firefox-133.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "69bcb64b013ed2287608eaafead61bde447627d29f237a380918065cd5887a75"; + sha256 = "2e78558a4e9861230f145896f3f1d5ea36aa5dcfca8f95dc671f992510f8a062"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/zh-CN/firefox-133.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9b3cfa6371c0ddf1269d6476833b069bdc974c2c383dbec2ec493784dcf325e9"; + sha256 = "c4746b06cf2ebdba66d84c4a2e0cd62ff41cb5320f91542c98a315a1c0800492"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/zh-TW/firefox-133.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "dea871f11810dacb3c8a443d85266357a164df36f8e8ce9aa50617d4e09fd307"; + sha256 = "ce7e0872a09c86c1da689d68bc7eb4adcbdbfdc7d0a9e76ca48dafdb8ba6124f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2fe02ca0dd27..5bd03d6ee752 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1035 +1,1035 @@ { - version = "131.0.3"; + version = "132.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ach/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ach/firefox-132.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ce47276828a6095998329ce540a2782ef05f528d8bb8b0734a996750c4f74297"; + sha256 = "47b84223ff9a935cd43385a91f8966550459b119c04a21920c5b30c0e389aada"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/af/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/af/firefox-132.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0cd67c3385ba09f779020f5beb173a75b90fe8203555bc311e5ccf4b5e45c582"; + sha256 = "114bc2d0b6ea8b3aecfdb5c3cc2018d9d459e4aab297d03f971b73abc39dda04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/an/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/an/firefox-132.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0e03aae4398859378d4dc590f7df6085e82162ea3ce514e4b90660d452d8a9cb"; + sha256 = "5a022acb822c8d2890a96a0066c07e7b0302f1271e804ad6ac078dd6c119d83d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ar/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ar/firefox-132.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "de9566430fdc3a7a9de14d302abbb8d55a693bc5ffdb33c9078cb844578701c9"; + sha256 = "ffd6d05fb7f5a4f6b5b18005b9d93b463461113f5ad355a0485ede9c86fdc3a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ast/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ast/firefox-132.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "56ff77e155ffc8e7ba9123d36aa45bd88e05128a360e7820a6531b5d80af3be6"; + sha256 = "8e923498967ce623ca89a76ff11d9d46da0fa401a557c0fbb5b1dde5c07c895d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/az/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/az/firefox-132.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c3c5f15c91011b7ff3fde9f19345a7594e4dcc600df8191e26ee4480219c5a0f"; + sha256 = "5b7402b3f71966dfdd2142b1fb4926f03a27c7065b6a82271c218e24ec85d4b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/be/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/be/firefox-132.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d552d1f041fd36e2d6f46e947dfb35e4aaa2a8d64a5512a6c071e4c4c971fdf3"; + sha256 = "5fd0f8f2d7307bc20586a85b46f762fbc98232264f3d9f3d50dfb6675540cc56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bg/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/bg/firefox-132.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2f13001eb0b1ff4d7b29daee49d1705770b30e7e45c40a5bd900ad4f20c04d28"; + sha256 = "4c5e925f17d872d294015b589805d19fadb84336bc4497fbca96754332fc0b98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bn/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/bn/firefox-132.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "4f221f904faa65eaffd6b904aca950985fb78909fdbe7408571e7db255aea7f1"; + sha256 = "3b82cd68b340d110b555108f90aa7b816d150a4f8ef537bf723e6a36f3aa3025"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/br/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/br/firefox-132.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9adb4e21ce0a260bb5330a2c4aa7444218267d161ecc2afb900e01a2f50d0e45"; + sha256 = "87c1f982953abf12b52673db37019c3934d90bc7d700f00d29c88b94fb2b21eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bs/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/bs/firefox-132.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "457fa7666193592bb67586997d48a345276b34ad2003885676412daa89cb8ccd"; + sha256 = "651f43d35eef5960570c189d4405e3c37b134af3e52bb0adbee6a587c92ee86c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ca-valencia/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ca-valencia/firefox-132.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2a3a87879e638b7fca61abc8759fac4ac52c36d4eca3e70a65be9927e70f62f0"; + sha256 = "fd7643a7d660044e67cc78d83a684e2c16c48af5c405d84543cd177141e25b5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ca/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ca/firefox-132.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b758cc28757d5140f35b5587d49f2c90f4af06a5afaedc8dd3fb8883194bad23"; + sha256 = "9b4d7fdb976fead278dc2c02bdf98d9e203443d3cfc0aa532a53c0e1e4fb4990"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cak/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/cak/firefox-132.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d16368cdf360e08a6588be9ca9b69622f946296850e34126ff8ba529b1090b6d"; + sha256 = "836bc334d065becf93cb41f7770c381ba7a086bac85eccb11cd2fd6205c95c15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cs/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/cs/firefox-132.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "23e36436b0fa5a7ae52cbc4f1ae28e94827f59a29af22203fd18adde7e31122f"; + sha256 = "cc4cd32169b8d9bf53a2c3641cd9aa0a82781c5a52b75ab8efabf7c8434d6c35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cy/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/cy/firefox-132.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "79a0d2f132e43dec9bb9f800614977befdb7b3f9b3d727dd28f5cf61699e3e53"; + sha256 = "4ad8cc5b6ec8393b2205aa36d0e4150819aec2850062ea6a766fd90bd37e6232"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/da/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/da/firefox-132.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "292198bfb3f0cc0ce72fdb6612537771f2d273793736f8fb00003d864eb658ae"; + sha256 = "7fb6abe531f1a8eba83aa3af01c4f10476af48c435f41c0ff0cce1171797ad27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/de/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/de/firefox-132.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "16d96676a2716ee32077334e505a751ef7de435f2e9f7d2755d8a52eff3351f8"; + sha256 = "cb10b158628410262d776b26426009c918ac6f334699942bd767b6a6cee3c9f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/dsb/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/dsb/firefox-132.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0685c4ec44d825d9441342a40f88b77242fdca6458d499d7fdb94b94a01f8431"; + sha256 = "67d6ace053d277c976cbe8ab221c6b879491b59c3de9cc3c83cf7a40d65fcd5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/el/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/el/firefox-132.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "561b9796b0064aed074662f301020cd2b918b77b014ecdb329e784c1750eb2fd"; + sha256 = "b0f575e5ae740dc57e27dfaf6523da4588696122412ba4d0d3151c5282d6c69f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-CA/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-CA/firefox-132.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "75e591078f3130b441bc6bbc22a428b3f46e4544bfdc0432deb176f5e50f66d2"; + sha256 = "9379b3d8f77a893d76a0ea60bfe2bba9ecd0fb9f4ba3577a09f4ad4ee4fdbb58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-GB/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-GB/firefox-132.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7e4909f44680700334ab9e68b7ee676b5c803ada15acb150aa4cc5f28b62d94f"; + sha256 = "7ce4f3ad198bf08d05cc20de71367082539504cd161dd9b989638be563f8838c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-US/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-US/firefox-132.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "fcd1e93221074a7b44445a99d81ea26e95fdc4c7e67000e748dab93cb12c2a13"; + sha256 = "ecdcb4787263cacd31aa3a1b62c14f1d3b69af44a0b40f9eb040852f401097c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/eo/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/eo/firefox-132.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "43e2ccaa45495ca3d2ac88975aa026eaa5ff3ad26c7fc7f0b345e08e7a2bce57"; + sha256 = "b0f6abe885db37f87e4ab94e74cd0379069473c2a24222dd91e881f6d1dfe881"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-AR/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-AR/firefox-132.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9b54bbd5562423f4cd35dbafcb87eed33cd390bae464aa8a933a10970c7718ef"; + sha256 = "ba1a7572a12a9699811cd87ddfdaaf5896bafa26c1b85e534b3571cc003d05fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-CL/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-CL/firefox-132.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e05306d953a51676de4c1eadba4ef1ddf5d39f7b951e29bd67f21d125b1a8016"; + sha256 = "319c9544dc8afc0b4654eac94c04d2eac4a4eb32282b0e58baa3be2c3e3b0f0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-ES/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-ES/firefox-132.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7f3cf35aeb310ee49517d8d8a805d70680dd82fddd6feff89eb8ef6c00095362"; + sha256 = "28141f043e4d693eb5a8fdd96d0df5a2f8c0c55e93f91b3af61fb285c020d9a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-MX/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-MX/firefox-132.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c6321e405ae767190defe1951e3c8dc638beb4d6ba3d5ed864a906f60c72cf2f"; + sha256 = "f1ce02fd9502a55ce1dc6814bde81172ea7f87f9726c6768602eee1b5e005e43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/et/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/et/firefox-132.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9445741ba8f6b4d143850dd83c179e5de81f6227cea223d661a2f4f3b0a24c11"; + sha256 = "9c2f778b8ed8e02e89f6f2a02b0466f2a843a3a540a64253f7f4586d473de1ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/eu/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/eu/firefox-132.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ede769225205b61fa4e374c94a4e2696df8bab7561a0676a20d87cb3b617fa6c"; + sha256 = "971baaa0d303deccc66aa36f104476756d52fcd6bcec19bb6968935ebb0048a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fa/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fa/firefox-132.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4ca3c41a73193e08c48cc26db5dfbaba240cbca27ad0febccde5b7aafe4af2aa"; + sha256 = "64aa0f1e578546b16f7a0fe5a0681b109b75c36298297213330b34de35be7042"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ff/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ff/firefox-132.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "4513378ad48bac6b5a2f0f7d0dd25ce8747fdc045f31ea38334b6056ef0de7ce"; + sha256 = "8cb3d0e913a635722c0e925205c3a743a5117f166b95d6d5cebf49443aadbd87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fi/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fi/firefox-132.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a52e910c49225b7d9ecb3744490877e60099a83cbfce34c8ed95671940612d95"; + sha256 = "031dfa6336c32b957c95a5b1ed4de085320a365921d49ce36f2afeb9b6c11c26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fr/firefox-132.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ff1e7a923e40804c167fa7266a7fff3cc35399cf102235c3d7ce7255f8eaf931"; + sha256 = "e651ef0a1fb63933b02d4ce5733e1843586cbcd44747ca99584491cf1a094cc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fur/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fur/firefox-132.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e48a78c85cee91b8d6ef932b9358fb8e4b4a9dea77290c86eeb3bae6ea38cfbd"; + sha256 = "b045c7ef875bedb66e4c89ccce008004dc893d73b139259f5b8b30ebc4d30bd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fy-NL/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fy-NL/firefox-132.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "77084f712f7bd549219407a5c9ebd29a3795b259316718be43d6b84e32e7afd0"; + sha256 = "e64eb98eb45157d55523ab99c34b5d642739a55aba9b9e3bc77d717de0471841"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ga-IE/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ga-IE/firefox-132.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9c5db3b47b35fdbaf7a6e76e66d6ab3d1c378754d3ff0690a2d4ced6ede034cd"; + sha256 = "39c27bb01af27a436500d13977b0a79f4f6fb2c3ed38bf02477ace5de9bc446e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gd/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gd/firefox-132.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1a490c57b83596340a15ba02c0dbec5c949ab918cb734a475e65b1c0272473d3"; + sha256 = "3cf7babe7ed87ebd722ea48498b762dd272fd81df83d2694c38708a749b8a87a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gl/firefox-132.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3765483fb85e810b3aacca4850c34142d714fe8245e2037fc814c27249f99be4"; + sha256 = "7d01435f588c9682d885ca450557a93ed798701f9f25507458501400b00ebc40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gn/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gn/firefox-132.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ef7319be7e1c911153102f92221b0058eeb0467b76e419fef401cf436ba3ffbd"; + sha256 = "50f1b786b8690ddcaaf69b6faac6b0fd04cdbe3cbbf44ce67a650b57b67267ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gu-IN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gu-IN/firefox-132.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "408d8b9a40fa7f1de3b3641e5f2bec55ed32442291b947cf4c0d8959155b22ee"; + sha256 = "d4ee862005c5f839eee0d2a00c4504f492a6f8a87c32fd881750caa80b04ba27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/he/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/he/firefox-132.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a44352de8e38088aa63900d5da91e572304eded71194dfd4f12038e3a0b58957"; + sha256 = "c7af8bcdc184029c73dc6731c6f89d341d7f127ca8185affe16827ead0217eb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hi-IN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hi-IN/firefox-132.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1c020f0c472e47076c45b7da8cd8611099b028bac85cd5c1bda05c34128044f4"; + sha256 = "56845aeae594f1f30e1a489585c49b4beedc43bdc39ea2259185092ce8894f17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hr/firefox-132.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1e078593bb28423916759ac9e1ac42a16b2d0506cdbb6166ededd7900bdfda8c"; + sha256 = "c59bdf5e83b7bb247304a25aa78b3ba838b72c27e8d766a390a30f13810a432f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hsb/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hsb/firefox-132.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a451016738f59f58564f32352870dac276f3f5be3d271403a7cc170f20cd810b"; + sha256 = "20644637c58cd030e6a2c1737746d9f040aadd4992f491ee93faa264c463a1ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hu/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hu/firefox-132.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0effc6e589bb208bd6cf255be743a2e3f87ab9667b5da79c61dad3552123cd2f"; + sha256 = "ac7ebf57f4ad56c74ce0cf0689fd7ec487009b97ad1eeec53313eba7b01418b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hy-AM/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hy-AM/firefox-132.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c72d175478ed98b98d301c66aff8973166d6d5144232c1e357cd219990aec28c"; + sha256 = "ece495c6d2b37c68015d72f144102a86881b164b34a137ff2ca4f86c58b197aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ia/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ia/firefox-132.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "0b71dfc7db95af38b851bd078bb208acdc11a3463e96b8e980a1a72f2876d2c4"; + sha256 = "0e3abe6b6dd819f8a1074928510386f3bf62604ddd5c283576273881674b4d6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/id/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/id/firefox-132.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ba7c1ae12520986d0ad2f80c2d302f6b0ef7b9251e0af91ef7077bed616ddef0"; + sha256 = "ca0969a72d8b663a6ab421147d0240936c98dd98cfb36ca4d59efb56b816e069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/is/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/is/firefox-132.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "108359593d08c9151f5f126499f726887082f1ee6c2876e5c55a13e68b9f7cc4"; + sha256 = "a7ed3a77731410a38f946feddd0e8d56080e99a6fd3ad605808fdeee0d8b607c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/it/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/it/firefox-132.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c525529e385a8b125cb2486c6fb8ba616a8dd454d0f5bfb1baf7ff8c375e2792"; + sha256 = "bded4a3c8398d1efa37eccf2b67f6e2e6c70dc407016879a314f749ae512aa20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ja/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ja/firefox-132.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1772ae1f653aea9113e770e9c33845d2905d440b6d2bc677247f05c414ad2736"; + sha256 = "33124d63d6e5ffed051dc210e59be728f7c0cdb8c10440c193b0c3407a232b08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ka/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ka/firefox-132.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8ca958603d9b94a68e54b94802de130f65c717378e19905199452a35f27890cb"; + sha256 = "7318127470dff1429ec32dee34b87fa48684c55a3eefe82058e4b7e88bbaa221"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kab/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/kab/firefox-132.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "6da53a8845754dccc1889b8b888c4ab0a7bb62c679d2edfce2d83cbcc622bfc9"; + sha256 = "16ca5425d0d7a270aa0c4a26461db8207042c030fd175821c51d529adf458de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/kk/firefox-132.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "24eb87af3979ac820658205df96bf5b175c1023fbe662fcc3bbe25f27ce4c3a5"; + sha256 = "c8666a61f1d8c2936fd5eb160c1e600047395bfe111dc74df8e6a8cd42041e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/km/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/km/firefox-132.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "b979e2f00f65372d13a2c95de9e0bf4af2040ad32f9042f1289d09cf3acebef7"; + sha256 = "80396bb4dc0e5c8738aae21864d6a749b86d36b8ac72aafa611401461f864e9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kn/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/kn/firefox-132.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "2d32546b2fb266ce46abd45e1f82707377cf8de6fa2579e47848a508d4f2c22f"; + sha256 = "c01f99a70977bcc79f41aab992d7b635918f202b5b8004c75adb3f3a29677e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ko/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ko/firefox-132.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "5bc37161aae629f8b80cb558b29f3284015987cf4233ea3808b45243e9c683c9"; + sha256 = "256f388cc35fdf16a5a2580e032141d8bf017bb0e06833882a76fb7821313e54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lij/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/lij/firefox-132.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a732f7208e985c38209d4798f6a3a74a2dfffa9465ad40125bb03d14502a9b46"; + sha256 = "15a8f74b24bf17c5def54376a07fb23835a4401dbd330c98992247f8dfe059b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lt/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/lt/firefox-132.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7a5419e60f4a9723b04fa71ad3ba9c255517f76441acf1b8059dced796aca4fb"; + sha256 = "63708543ac979967d1251f12080e20a398be24a2b77954750a7bda330793f4a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lv/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/lv/firefox-132.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3636dfc8d55ae6945ad81b33a39696693ff510ddcd8ac1a4bc75d49228f1acd7"; + sha256 = "6d94313b47e95ece58f7aaddf58cebc676ab0e84eb4ac970a7336541fa22eb6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/mk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/mk/firefox-132.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3506d91692a3dd74ca545b7f6e6ca8626f05e50896377933e222dd74a3c58870"; + sha256 = "ba90a2d3d217ae797a8cd9a8abcc87111cf572d3a71e816b0d0d29860d9ed322"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/mr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/mr/firefox-132.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "817032106f3daabeef95c050f788a625979481167c21a86ff95ef0a63d574bcd"; + sha256 = "4849c0edd39401752bdf8c5b38d36cad9f2ad1db9313d9aefa4c85f5d4e12413"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ms/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ms/firefox-132.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "140980a0255f64839f726dc93ad05035946871917bd2fa5ec4bd747046d2e93f"; + sha256 = "79a680ca26c7030180accbe6eb22915e37aed05c87165d67c9e3f434769f16d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/my/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/my/firefox-132.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c9d18fa0c9db1d079a8bfe6ce693c5bbf50bec76d8a9615626ac07032e9b35a7"; + sha256 = "412deba2701601a6a2f0625e1c5ab88576fda77f4ae046f1bf4cce9476bc96f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nb-NO/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/nb-NO/firefox-132.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "11ba3290b7c01c66cfcdcd1d474a979aa81e15da5e5cca91cd0919e8de18a2d1"; + sha256 = "a523ec4d4f6b169b09d8568d96abce9cac0dad0859910ec56dbff844e5f1d9f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ne-NP/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ne-NP/firefox-132.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "cebd7f73b3e8f834f54e699b534ab441affa881d77004639cf6f31b6e7d322a8"; + sha256 = "5f45fb24422620270000e0186a5266c91ed84ce95159cd23ad92b77ce6616780"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/nl/firefox-132.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d96d5950779cb4c807eba5ff0538ac0ea97dd4296eecb69169033c8c8de2096a"; + sha256 = "6c4fda05ea425efba6e125685ca40d947cf9b5144fa555bdbecb8c71740e639f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nn-NO/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/nn-NO/firefox-132.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b7af3b8c3639a71111aa40ba9fd25596152ec55cf9ce0956ed1b00af86d60a66"; + sha256 = "818fe6724adf8bb06f288ef03a254648fa10f2e2cb0539e7f4bbdea66d8c6d66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/oc/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/oc/firefox-132.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6c7cbae9fa6f1917a30716168052f7192bef3f430b6b001425e8d0e003642d27"; + sha256 = "9d9fc1e6ea70b6f103a7e1404280ee7ab55254395575f0009454d815db83a93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pa-IN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pa-IN/firefox-132.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a83758abfb8ebd43b4c13a1d30c1b28d1cccd933c78ae05b756f1550e36cadbb"; + sha256 = "964419c29d54d7695812148fca0a57beb886b0cd48f6129afad48237d20879af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pl/firefox-132.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "8b16c40fe31f2032fa7f74284bc6e21c86be0499f992a003ba9aa883ee79fb2c"; + sha256 = "db7442e4357b2e24234e7ee398529ffc4a136ffa375c90f3aa94873c6ccfbb46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pt-BR/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pt-BR/firefox-132.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "01eed64b8533fb5c3c00c9603ad874d490786b48ae8d7234605c0166e1bdfa0a"; + sha256 = "270748ab2a741a74f37072f8138b4943713a198661647ce813ecef243beaaaca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pt-PT/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pt-PT/firefox-132.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "619c4565a70b666264b8e23edd44e1656e9565b441435c6aa2590c675b3a2dfa"; + sha256 = "983562e080a1e60a8024e88d0cb4ccdd65e8d506bd55bee04fbaf850afeb7331"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/rm/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/rm/firefox-132.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "86e5d4bdf323258279a2a776ade8b135d2cbc2f7ae29fbb13348a1ac4281c04f"; + sha256 = "b9772ec2269b8317b71791f2f1acc51fd1ed00e66d69b4f5437ff4e06c1b3e28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ro/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ro/firefox-132.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "55cd7161953e23474edc3f1a1d0e708e38eeff17b5fe5fa8a37216effb6a8942"; + sha256 = "52ebf5b2732bb8a634e461ad251be0868904de35f6c42e1e3c500f90bf72252c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ru/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ru/firefox-132.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "44a82191b04e93e4f537a35753e6b7134f8031af402cd1c4902ba5d714751af5"; + sha256 = "f55f2a0b14d0bc37108aa94ac59a5051a5fa82099c20646e4a1e967114facd0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sat/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sat/firefox-132.0.1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "7211d7b59d22dd3e5f2ca5fdc13329d69ec0ded8bf3ee4d9d99dc61c316435df"; + sha256 = "fcf53650f6681db0bbe2af0d3b76201be6cf42a8142bec8356bca09c73ff3b3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sc/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sc/firefox-132.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "bc58f74be8f159a6c982a133e83e46f5ca0390d8d3469df89daec6894ba9b022"; + sha256 = "152775bd7024df45e0b89cceb5045c4c7b7dc7ec3b76ab50978e6ebe821cc03e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sco/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sco/firefox-132.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "018f10b910c1402f5f03617e57715dc52d86595024593fa75855bcb955fbbaa2"; + sha256 = "502423aa6aedd0f934c543a9017999a201b32c4f4bfa9f717d8bf7aa275614b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/si/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/si/firefox-132.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "cac0646f559ac272ffb1f6d722ac12e4af8d29c754a87fe2a3efd4165b7857fd"; + sha256 = "f3aaec008abc3c552301c467719d736646733c78fe04622da886a5da00a2c51b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sk/firefox-132.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a4be0c45b86fd09d81ae2f28b273f8fccf2c5fc64f6d1361a6b58c289cba25f1"; + sha256 = "f07f14d01cac61d2acf875deb0a190c766c2849830fba82139cc189bc0dd2422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/skr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/skr/firefox-132.0.1.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "dca803c585ae209ad97bf193990b5072dc02b145e57a576ac24208ccb6081ab5"; + sha256 = "012b4f34a4e27a1555be4c0cf1e014a122edb1d9c080f25e899dacd407fe2b4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sl/firefox-132.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2c6d810fb8e75f8f7e58f5bb44cbe4ee699aec06384249afebac93667990c4ec"; + sha256 = "d8edcc77afe822492735f85e05b891b29f15afae083b8d7fa37abea0e4eb92fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/son/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/son/firefox-132.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "8ec6a4d9bf19ff26caa7235aab596a0a4668aa53d38dcefdb40061ad27b04c0c"; + sha256 = "843157a5938ae6e0355fae687d23443e0d08c392ca75d997331211884e335a8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sq/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sq/firefox-132.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1495883fcd77635e68b77157213a089841a4eca0bcac68944813c6311ce516cb"; + sha256 = "df0e6d44e4a07ed2b951ed803acf82be466f125dc00cb891f0d421e6b0cc08fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sr/firefox-132.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "54d80555fb0a66de7e936b7b561f1a897d90b062ed87942d11b557cc75de6c25"; + sha256 = "4385481d260f535fa76458340c1ad789ee63b5e1ff10d89d5dce9879c470e761"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sv-SE/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sv-SE/firefox-132.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a12623662b0a36f64f382f3c193deeb19d8d0efec77d33e5c13e72db54e9f417"; + sha256 = "a665164ef48862988b5ce86a61f7166415c616264c2ebf2ec4725f53d1fef17c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/szl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/szl/firefox-132.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8e49f5c4616bc918726f592c42fcb66eae00899169a3b0397221088743387018"; + sha256 = "ae5704848629f0987c088da4bfc7371f883677ac6a6b490e756b19c26d814776"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ta/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ta/firefox-132.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ca004eb05ce3a76c210eb2d8d6f5cecca1bf2156a335af733e9f74d1e9c65a48"; + sha256 = "c294c9f524d053c37056d8515c9d17bf70d50243f24c888ec0a5987499e7a126"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/te/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/te/firefox-132.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "12ecd877be831b33f46887fd44cf4def9a48e7b0b33505e22d457edb7cacfeeb"; + sha256 = "80f04a99022b19c780ad689fa6bd7fb8e986fffeddc8b61ad2da6d9816b5a043"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tg/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/tg/firefox-132.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "395d06d3ea004b1ff93a22f0d51f7737cf96abc6efe3eafcb5cf04a56e229517"; + sha256 = "f69eee5f1a25e2c217a615c9d06f0c98631bf771fb4e83963d54441f80ee773e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/th/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/th/firefox-132.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "432272367757339ec6bd3546580667167ed803ef63fe35ea0653e48ad4186c4b"; + sha256 = "d8109b4d48f5b9ee483627b5460ba81bd512eb5c43c41e308332a41837576e92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/tl/firefox-132.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7bbb560f67061703a64173ada96de177f0f72c82b3b762aaa48f91156c47553a"; + sha256 = "2dacb535f2bf3343afcefe320d4ca4e24a7b1f608a19c6480d025bded1c53a28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/tr/firefox-132.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a909002c7c65a46685b13120ecdb51f0e4258c9642b8b397aef7e3d076347d8e"; + sha256 = "a04aab371b072d576a96395e19c7e820805c95d901d35bb6cd27e725ea7fcfce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/trs/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/trs/firefox-132.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "cf864d59c1770f66b72350410de5f399474cadbfb002c5f5bc260c8fd7663e3b"; + sha256 = "c4083094538a5fecaad941b5f7e1feed74c828abdf2a5940a38718b54e623cca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/uk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/uk/firefox-132.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7e532caeca1b7ed4bb5e504b3bc8e0debc4e6662701dc4a848bde17a5d8ad99c"; + sha256 = "078a675fea5733463ed8fcd4f170f46f08e6ec4758a40f2bfe4b56b6c3e9add9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ur/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ur/firefox-132.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5ef435a27a1895f40a0650a7dd844a57f81f1d2ff4ee10690ca14b0b609307e3"; + sha256 = "0476c85a4a655a2e1b0cf00fa8c32457479e820801460d7860981a2fde7be1a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/uz/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/uz/firefox-132.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "478711e217df79f2748823d1ec87087a314418741ba94a10c1027400be7ec3f6"; + sha256 = "9621022d22709e3a0b5664bbd7f32910a283644384baee0c3fd1ebdbec9a4c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/vi/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/vi/firefox-132.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "de9fb8a496929c4aef13a439c97fd46e209a39c1c5a293f954c92339597b41d4"; + sha256 = "3d924162a9e89e296aabcbf7eac55c2ba6366261d4e636596be20ec1a357f4ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/xh/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/xh/firefox-132.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b562f7c49bed4df61b2d70688b1288eb6b49c45e9c12012156826fee17f641ea"; + sha256 = "a357a7b377882ccefd0d055c0cf868a26e64d70e252232ff1f3a4d022348cf10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/zh-CN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/zh-CN/firefox-132.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "21ff6050e4f0f246571441a56bec153c3889d3b97c06cbb3fce02437b8af6c78"; + sha256 = "e6dbe2988665dacfcf259f8abd97f355a06eafce514c5d75d6f7182e29e547b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/zh-TW/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/zh-TW/firefox-132.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "409b4210d26bbfeebcaa430827453342b37d4a0350fe71f38ca5df92566921c3"; + sha256 = "5f89bc5e888e1b0ebb73ba70f8596dc8368f17b03167b908337c20745742d525"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ach/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ach/firefox-132.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f1c7fbb1c80ecaf8538ba11082480093384ec412425ac631a8e0d26dba97e3c6"; + sha256 = "94687ff3ba1781e321a8152464f7fba7ed061f33c18c73495e3498ce99cc450c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/af/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/af/firefox-132.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d949151dbabb4d604b15bd10122ece59238fb750d553943ed65026be0aff002d"; + sha256 = "23642db5c3a0b6761d63f3add669f52b26e5243197ab2da0376dc872c56a4696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/an/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/an/firefox-132.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "179e5dc0a40e699a62ba5ae7bba054fff4591cca4f007d264c00367128dddc04"; + sha256 = "9d882d117fb730cd7f3be06fe67e15cae77f163f32158b36293517db2bc123eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ar/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ar/firefox-132.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a7fd2ec3a42ab565e6700887fd41dbdf722fe0ca060946ebc30ac1413d2a6b4a"; + sha256 = "7ced0486b90a21492700cc96d2851d67e08dc77ce689c5612ddbaa13d11182c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ast/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ast/firefox-132.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "cabed080c18c7196702d7efe58fee86765eded008d97e387b9e16dd316c3242e"; + sha256 = "baf75a0119dcc3e84935a86e43b53fb9129b10f4b13bde3489e663179ab9bbf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/az/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/az/firefox-132.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "2d99bc14687696e1a1e78c430ba3f76459afe38a78a8a43fd7d5409495fb6d1d"; + sha256 = "edb5750eac5563b652df26347396f0ebdf0b99a8ceb8cd31c46b79a8a43a09b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/be/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/be/firefox-132.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2ee2c35577ef44732dcead0bd28706d41052160472073d317bc52659af93e68a"; + sha256 = "5efd2ad80269b115038c227fa8c8d741a8add0b0520e9dc5dcf530c98547436e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bg/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/bg/firefox-132.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ddcaa48d6af6d2140e8b2da203d5b019580803945f6df54635d04dffd748294f"; + sha256 = "946dd18b5fd5f5315271c571cdd74924ca1979908ebb106b46f8822c3ecb115a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bn/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/bn/firefox-132.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "65de4ff251d795abb204e4f912fc0aa1a6f161702f0747558edfc29187443744"; + sha256 = "92d3fe743f4619a4567218decf45050485ce0ddbbffd9342d62065ffd663c1dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/br/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/br/firefox-132.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3df79435c6c9c4a40c99456b6687843802cf97f1c339cb99edcda564586cbf89"; + sha256 = "cc4436d4f70fa1de17f7b628f0b12082f329ef293c7d069bf89b23d1f45cc2c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bs/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/bs/firefox-132.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9b6f1d25d31aa3a45ca857c2f58e68c70ebc122dde7d373905e28ef7c1ebdd95"; + sha256 = "506ef2e4e128c17f874fbb5fd03581418bb651262fd5234de23e019063a9e32a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ca-valencia/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ca-valencia/firefox-132.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "26356054a5b8b9b8b03a9d6686be12468c535b5395d9a6f35b719a823d0e3cc5"; + sha256 = "b66250866db88ceb57dc8405a76a5ef9e41f6ef02447656bdd537c954da3705c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ca/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ca/firefox-132.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "a01df01cc831468ef5cd3abb90063bff6233877deccfba4811d20fa9f964ea45"; + sha256 = "c59d6a5eed8b812f8e5d57d1af5c265b3e0a8770b8f95a7c570a04247edd7e73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cak/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/cak/firefox-132.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "3287515bc6a6e31f6b6fcb7f86f5adde8772671150b6cc07b8e4d0527f945646"; + sha256 = "5f0c49d2673e4835745c19b81abc2c0d659609c3b2fbfd0c43dc5bd7931bf4c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cs/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/cs/firefox-132.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a6b8cecf6a04df386250cd5e05cd6842afc7d1b5572d6f44a0762f32feee35f9"; + sha256 = "5ca703ae292af5619a6411c2c800c3e9ef3062a69cd8970cabc0426bd123d3b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cy/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/cy/firefox-132.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3a5310e276c8fd32f01ef894faffcbc2f209ae9fc74d2fd0ff59acb92604a0c4"; + sha256 = "f14fe9b479319d8924773d021da63b4f2047a3aee237464a74c1a6a2781330e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/da/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/da/firefox-132.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "54b09e0364c2e77783e458c4f88fef07fd99d6871a5ad0b808640c0f717f5fef"; + sha256 = "20ea1a9e22966b23649be9521384ed18161dd8e7933e3ef9b07371dfc3c95112"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/de/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/de/firefox-132.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "687c2a7feb76d6fcfc7da35dedea8ae658547a3a420c2d5f5e0cf6d3f9d1e8e1"; + sha256 = "89559594d491410beb0322aa3717ba6b4da2c2d83fc8c54d0dc207a696994422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/dsb/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/dsb/firefox-132.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "87d2724c10312666cf64871356a062b8394f6f30a986849f1d8279f378f9bbe4"; + sha256 = "8732c03c200e4a4c1eb6fbf89ffba698f79f9934c61db62a6404c4efb38a0620"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/el/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/el/firefox-132.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0e23fadf9196ba7691e016ed6ab8a19d7327f338364ff59893ba0150ef127130"; + sha256 = "68a9d94de2c7f35a8a94632ef277b9544871c1dcd3e5ce9632a464fcc85fe581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-CA/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/en-CA/firefox-132.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "ebc16fd234ed1bcce9405302f516322edef094d6cfc9f72970a3630bae791059"; + sha256 = "ed84543704573b00c8a2fbbe448f7d87544b205c7738c9b8e4a38cb0d96c1b45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-GB/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/en-GB/firefox-132.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "74600884c3549e3aa7b66e48c790366ba94b531bd2fc78949ac38ee8027173a8"; + sha256 = "0b3c164810bc509aa0d6f9c77fc55fc6ca3b543f3115499761ed65cb83f3083f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-US/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/en-US/firefox-132.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "84cb77484bf65fda35e2743553990ab67c9395722082c087e884ee7b62e406d9"; + sha256 = "f110d84bd70501264612a229210a6e52f1279e7349a32665200f60be685aaf27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/eo/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/eo/firefox-132.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8d0c73401acfe280857988dc5b3859c0fbc07d0dfe1b50e1fcbe397af01d44c9"; + sha256 = "41f619245cba46a0dc112f94ef8e02d9f81fa0977ff9de920566d67c0fa621a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-AR/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-AR/firefox-132.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "66720c6d506236f1ad64b678aba9da2803c452195a5b6c1514b637ad7b2a6187"; + sha256 = "e739c4bf84fe7608ad74c62328d34b3781f65adb81572cff745dd87f05386bf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-CL/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-CL/firefox-132.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "df09892e9cba07d1ffc0619aafa8d97a27d3b223f0fdc7f14925a53342fb8dcd"; + sha256 = "c56b23545229975963b063deef16140079d69487a03e6eadf4b4477786cf4f05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-ES/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-ES/firefox-132.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2392955a532eb935fdf3cc98323673106ba9d25f26492c629fe47cd17f3c9c2f"; + sha256 = "4d2c3f0d945b9f557303e4166646e98c837b9c5c9647e694a324cd7b4b5e83d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-MX/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-MX/firefox-132.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9b47a1bf83dda68adfe59e6133c25f5664fb3777f582871ca1ad5576a8ec35ce"; + sha256 = "37015a38e3736a634e22c1e429db1106b71c8c31438d60e4cce99c0de8e94fd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/et/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/et/firefox-132.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b4023d8f19a099e6a9069f03f5c9ea8a21a9dbf26de4b9564a854c3749126b26"; + sha256 = "e54423d2c59850c7daef105786c8ed95804e4f91b0958f2b20e0e452e7adcf3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/eu/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/eu/firefox-132.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2831dac7e375e8d5fed4747ed9f0044b05e8bc4a0f405fda9256bf53a711bba0"; + sha256 = "c3c9794312401a3a012911eceaec3bd998a08a57a8278d7f1b121a5e0982783c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fa/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fa/firefox-132.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1e38b9868f4bf4556d3a6fa0ca8e6a0458eb33935419e0966230b3dcd60e61a6"; + sha256 = "63049a1cbb3ef6d90a81f835bee3539417f1394613324e06da2a4e3f54270689"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ff/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ff/firefox-132.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e6c44ce503c278a6f367b6839d04372aa94544422bf192b0b0f92aa64adb8422"; + sha256 = "1488cd36b7ab218acb0ba3156d4caf66ae0e761bf81218d357fdd8c6c71fdb54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fi/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fi/firefox-132.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0110d3b07f41a6ed5c0279cc77a939709b1f3978371e4c70d82ae4f8bec11b60"; + sha256 = "bc3bdf5f7b669be68cb885b7c8c35ba5cd8d7f8f409a5f0f4df0e3c401ed1d7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fr/firefox-132.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f96bb3d14c5f674e64205e97cfb131ddb94bcdcb32f7005a36eaf5227c52c43c"; + sha256 = "778b3f07de8bb19a624b964fe5f4b5e8604d4eb6d601eda68ea186534f9fbbc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fur/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fur/firefox-132.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "e7e6d0e7d65b374968009dd23ba907e9d03004f0ecdfc3b30951616c80148ebc"; + sha256 = "43b60741b30738625d4de4c3bb08d45d78099e023be695205746957bba59b83d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fy-NL/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fy-NL/firefox-132.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "02f2a24542b6a18c18c98a8576ad33284255cf49d2c8aba7a85ac948829f8ca2"; + sha256 = "99c3aef86b7d75cace0a3065674c530e1bbbdd06ba4240e4f0bf66308a2741b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ga-IE/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ga-IE/firefox-132.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "28a7511af154a282418073c1b99c9f0130ec0334ce0089bc951147321e1753c5"; + sha256 = "d159147ba16014a544e0fef7a0770e3bd4d1a0c829a7209e9bef2a43e950e115"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gd/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gd/firefox-132.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7fe2e7ef2361c3bb4de236d972800aae9125f34bc5925c36a74a3e38f10396d8"; + sha256 = "6a615ad74bef45a874d0bfa8844470e2f2666853fedfd74d81e8f224ace5bb88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gl/firefox-132.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "f032980c12d189cad067b2cf395dafeefe72676fb5c2f7dee1fdd2bddd9aa8fe"; + sha256 = "3ca182f613f60182a3e30faffd478af6beb64ca21b309c64ab54fa2a826f6aa1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gn/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gn/firefox-132.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "43b542e8871c301e1e9f6bac209cfb92c0e053a4a79ac359cdfd482ab90aabcf"; + sha256 = "48c042083355b53ddc653d5afaf73ea2a655d477c3cccf09551096dab7386781"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gu-IN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gu-IN/firefox-132.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "ff4e68b57bba86ef4dff88c1b337618fc4c9c77d3842a7a2fb51f534c36b0074"; + sha256 = "eb58b994ee858f80780dcdc8b13f681308987ec26374389081d00db561cdf064"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/he/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/he/firefox-132.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2b39ddb9fe23e564bc263e7235babea6049365d86c841692ac7d4cbdca2dad9b"; + sha256 = "4150c460f13ed67dc0600b641207411354f1931d478535d88a445b92c6c87fe8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hi-IN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hi-IN/firefox-132.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "c516d1fd5a7e5b8fac01b882e3b5368c0f6f1bfd8b6ace9fed8fc10bf06b5294"; + sha256 = "88d388df325d366d46e926557f62dc54928fe83477b7a828d132d1d19b1d9f6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hr/firefox-132.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "d4759609bef88620183e12d98b3658b3c386875a862761412e1e98e4187c536c"; + sha256 = "2176af6a8c181dabb4fb3312caa4de13faef1e39c87e26efa93ee7e2b1eaccfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hsb/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hsb/firefox-132.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "234e003429cd33afb353b2de9b1ce70fe3920bd9fc50ab5810ab0b22acf6e4d7"; + sha256 = "7646d7839a85a809c893687b7938f6699d62a198a625bb09765e61d1fc602b33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hu/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hu/firefox-132.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a8dbcdda6ba791eb3d0ced43d0250725af9c7bdc4fdc0a72efdc065651802794"; + sha256 = "c1645f1a49b2c402f91565b8330e3d41adf9b55e58191a64e3a72f71acd4b0b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hy-AM/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hy-AM/firefox-132.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b54d0f12985748c3eba269974b7b6892ac727e98ba750bd0535530ea3fafc218"; + sha256 = "afa56f6090ffd56f117dc35faae126cfdf3f20b3bd566eb566a5a1011700ab18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ia/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ia/firefox-132.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "8a415be412858202396d63e773535f790dda10a722ee5e584471e2a93cce8171"; + sha256 = "427c8046e9ecbc45238832ee6c24cf97dc9f827ff5fdfca5895226089e7ce598"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/id/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/id/firefox-132.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "0796b4c2b21ea3a68bbb35171a316d2bb2ca9ec985b239290f59e3299fad1e4e"; + sha256 = "14c1eb9502d3dcf2ac6d630de8300979625851ccf154d5b6de369f5490892550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/is/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/is/firefox-132.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f3851164668890ce243f4f449f04670e212184750c4a94c425162c7ccdb1ead3"; + sha256 = "33ad79abf3615c97f0657250da90a64cd5fe56afc0cfa3a0c33f4801f43d48ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/it/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/it/firefox-132.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c92f4a741e8676a8606c5cd001665cced335133cb921a736da96239c870c5846"; + sha256 = "255bc03c94e84e572edbb922f16097603281650c1ac3c0a971256f73c90521b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ja/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ja/firefox-132.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "f88f77beee0ac54e7f8e94db9d657372ea4514c95d7d7a18ada46021e50aa230"; + sha256 = "4cf08aed1a456394d61e44f1dee3140146efb25337a6048fcbc1ac8a2c83d7e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ka/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ka/firefox-132.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "31e00edb58baa39e39d3b74c14ba7333c07b1d0d4ca81695d8a7ea1c80e8b0a5"; + sha256 = "9fd4258e64c0a26faf3e33763ef30848118e38a8512358e26e104355dae5230d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kab/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/kab/firefox-132.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7c1eebd4183ec7d63dabc17a51a7c68864eccee29916158d6fe7ba066e4697ab"; + sha256 = "9351e18b482c7303d84832d817e658ee213be9722c43fdc690fe1b511128749a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/kk/firefox-132.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "5f77e4a0928dfdd8d66778471d1bea98e3902a08d5c38f904102142962fc08ad"; + sha256 = "c4c3eb6114f2164474cf79a50a2d05a9fd1ca73a8568431e6a88055b70978768"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/km/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/km/firefox-132.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "61a248d441d36bad22b0041e8e9b34e192dda345e245fc6e637f861abfa2999e"; + sha256 = "e1f608b0ce6886109f64ba3fea8ec187f1b90eb05e8d1adc59f12ad5357048ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kn/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/kn/firefox-132.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7c6b5530798f88a16ce70a7749317793d1caf8c58bb0bc859dde8fb9eeca6a75"; + sha256 = "7d93828ea972156589e4f1d1dc431fdcca4c72de89ea64022b1b6357a57c7e42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ko/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ko/firefox-132.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6f99bbb48f3f1fecf712521f484fc3b4125660bdc927a5d004c4bd09fa75d2ab"; + sha256 = "011f47255992976e652bccaf1a96bebbe72c2e403d09cc9507ce09338cd5c8e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lij/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/lij/firefox-132.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "362e9a31916be41a3176f88be4f34614bdfcaaf1278667edee14b881691f2c22"; + sha256 = "6e7fb11809a0aca94d5273bdd3af1c20d2f1735e18b6ef895ee3df88ebcba418"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lt/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/lt/firefox-132.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ed7cff096f744bb1aa45c4442ed4306b1601fe09cbc5e30a82b88dadb5c0acd1"; + sha256 = "a229ea0a76db79f527024dd9b7b9607f657cceb69bcea5e135c27f485fcaa527"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lv/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/lv/firefox-132.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "f42c2238db9238fe53841a54f974de22bc85319a5ccc6a68d1a3b1b89b8ddb1d"; + sha256 = "9f6983e5f1c04f9f2b6a0d2fe917471f0b284b38b325b1628cb37cf933437859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/mk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/mk/firefox-132.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8700bc64b622c6fdc292f868447c6e3a5f23027e8130100c8362361fddec6284"; + sha256 = "aeaaa35d2d32458c773e9476a339db83e1a12dc0f7a917d864cf8ff5f55e5c08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/mr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/mr/firefox-132.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "05bc096b8bc39ca8a40bcba39ffa44ded8d4d08c9165f68ae2f89baf8d6da4c0"; + sha256 = "95f5260f023711231dcdf95b0188e30182854b0571cc73acec1bd0a0d4b26691"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ms/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ms/firefox-132.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ca9d85228b6dfd98a39f28dba22793dbc9f311b776663ee62e89a026ffddc184"; + sha256 = "4303f6b28ed6b8f5d28675f1673ff7f5ba3d780aac824bb6a65ec63d6b8fb069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/my/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/my/firefox-132.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b365d353b42ccf4b452a092edb61dcc2a6a47cc4396adae97c1bfc1761f618a6"; + sha256 = "bb1cc65918876315c6f74f7a7c11391abdf4d1295606c3f7e15fec12404f8332"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nb-NO/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/nb-NO/firefox-132.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "56c1589098256b9d848fba171d6c69a37c942ddb3260854071d48b273f32adb2"; + sha256 = "2302bc25508284dcf30fc06fc89b905c72e9320bb41ffa6569fbe376d6278079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ne-NP/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ne-NP/firefox-132.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "123af06456c3c452d6f6d8169ed288c8c16074c7e3f149b30056ecdb94db7976"; + sha256 = "d00e26c8eada6c77b961e7cd65b1d16a43ffae23e3f054c9b33dc92d191aa682"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/nl/firefox-132.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1070796e4361c8091231507a8000125b724b9f4495f23385beed3c1343f32200"; + sha256 = "33171180256652ab96a71029a92af5740084567d93720ca033b688a0c03643f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nn-NO/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/nn-NO/firefox-132.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7710c9b14b7f76da97b3767fc34db53ff29f9758949de1e7f7dbfbcb352ebdb3"; + sha256 = "471eb07e8312c80dd8ab7d02a7f5850452f704e59219b071c7bae11447b4e677"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/oc/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/oc/firefox-132.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "968df78a007ebd60503e326a8130d6e05dc99d2f0267f1a707efb4611aeb1672"; + sha256 = "cb43f9507849ba82eb1b0b0d6906abcbae361144ce3e1f8e4d5c99a8c9581e07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pa-IN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pa-IN/firefox-132.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2bb2d2606d426746a76b9f701ee04cb5e348a196c7c772525bb7aac7c50b0067"; + sha256 = "46c26c8d9f92b8c52e7417e4d846c71da96bafcff19ef866d6f0f2e1c20f9a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pl/firefox-132.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5c87cc2e226d32cbdebe0f31b536028ca78d997e0ffb34582752abd5d26880f5"; + sha256 = "556971bf7658027a77554ce35b2b5b0bc3c71fc1ae6335dca36abfef6af04ab5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pt-BR/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pt-BR/firefox-132.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "92ee925cb9cc44f999a22eb4792a1b6c6b64f4a7533966ca21565c7b987868e8"; + sha256 = "39afba412d650fbf08b093e109582d3375537cc38763d0eb64cb0453be8a4925"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pt-PT/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pt-PT/firefox-132.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "58a7ece588ed7fb7cdc007a3acb20dff966f16d1cedbd47f6aff730e94b7c5e0"; + sha256 = "46e319b3527070b308a8ae5fd63b62a68a5c1beaba0cf0e51dea574b7f7375fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/rm/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/rm/firefox-132.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "73a36134064c4c3f9f74f49dc8d01de0ab7c771a63f9d96faea0a3d5239f2401"; + sha256 = "3de69cefca0c904c90445eca5e2ddd2ed3579948dbfbcc550ae6cfd1d382e151"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ro/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ro/firefox-132.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "bd885e43b0383301caa072eb9f3c7103da1ed0ebbd14df02eb13c111e908c550"; + sha256 = "c887a74f84688c82de334dbe175f290750c3c7c499b1f3dddadef72ff0663cf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ru/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ru/firefox-132.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f161f63d6e9061513e547abb4c5fa0ecf2d6d10cd7064bf1c24f2a5cbd44e798"; + sha256 = "1ac581656facc08d573b7ac821226ae65c76278e914ab54f63fc2b5c92bc84d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sat/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sat/firefox-132.0.1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "9b81f886807acc18c0ec02e66404c7428d664d4cbe0e5c1b61ba683f45127e2a"; + sha256 = "ab857b37630d2bbe326c20a859246958afae06473899471eb8115e2a5776c3b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sc/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sc/firefox-132.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "05b6a4036d727c77d4f3dfc2d39f10111cfdd5d00e9c409b0ce08f3ea0ea3c70"; + sha256 = "e7d7b5987fb06153e1670d2b575e0b9e7e9192d43ae18cbcfbc7b27add5206bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sco/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sco/firefox-132.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "e88b1a122270460a4caf5bea4f4dc8d9fe584b8ab8c16a01c8899088e75121e4"; + sha256 = "a765f1ebcf07ed0f0aa450d063f0022f04bc1739b4cac3ad1dfe65549b9a35e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/si/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/si/firefox-132.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b2d4b3b80f633336bee1d9a5b582e8596e2bae87467c247fbddfcdc36b8f1d6c"; + sha256 = "72690ed181c0147495ea3959bedb75af33da853c6bf29d44d6a67d9da641f940"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sk/firefox-132.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3773d4862ce1834567991430d915680a97e4cbe8ebd44d2dd37dcdea1e076d94"; + sha256 = "3f95ed090abdb1e9162cee8a9f02b282a947465484716a3a89ddee49daf9527e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/skr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/skr/firefox-132.0.1.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "c25afab9ff4614fa87681d6bcbdc5f10d4439220467f2b2a3859838d546b96d0"; + sha256 = "d163fe4fd1f0fa221a68b5ab12617d5aad44efa3ef9c673db68dfd2ed55bc3ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sl/firefox-132.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "539292a2f243b2a6e03bda2510d24e555d58156583e6feedf8b7dde60224b155"; + sha256 = "bb60a789c62f829f67413e18f3f6380757a0eaa35c87309572ea2eda3d7b987d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/son/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/son/firefox-132.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "bdb94090a7ac0a9eb22049d50dc2f330057c065375236a137cb098348efe9eb7"; + sha256 = "278a45ed39b9904de0e564681f9b05a3692e4241f7f2d97e482e941d33aedaa7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sq/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sq/firefox-132.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "90467f841b2de7b0479ccdfadde6ef7645644b770d18885a9d76049c6a43de54"; + sha256 = "9292b727d7249633213c05567910b48c7f640d26a9ee3f6fb124949899765bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sr/firefox-132.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1c02f6fe4302977cf7ab0b57b3a4f88764c21ee686a22b9604f0f15db38aa21f"; + sha256 = "7a006d7dc8c45821411968825db9ff6791a784d4b448943e106d520dc88bf963"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sv-SE/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sv-SE/firefox-132.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "009240e251650fbc7f8aade7025f44fd1798e1b76a8f411c3aa261dd12b68a0d"; + sha256 = "cdb4cce92b117f8715570df94789aaf233e00f6ba85ba7f110175dd901c35d5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/szl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/szl/firefox-132.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "fd11d167840bf204f895dc7104a3bd2779e29065ae109901d0c23ceb942de9db"; + sha256 = "298e0afe56c372bab56e372bdb66d4ddb98b20af2fbe6f06d683ff9009d45dd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ta/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ta/firefox-132.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f83722089b0a1a5caf5d4b1bd541e2fa84fdfffc04638f22bf5c372cba9d3d66"; + sha256 = "8adec58d7627afeef18b9bfc260c915bca1e47e332f5c14de9153391d444a0ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/te/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/te/firefox-132.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9b8728d6fac9e02819f969a7009f2246a72cc9dd0dc7da324fd255867548b242"; + sha256 = "8602b05ef62faa0fb8c1527604421fc7508c0d991f463302599c053d99b663b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tg/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/tg/firefox-132.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "08f4bc21bb07a46e5e845bd5132835fcfc6d92a77807dd25f9b3119795b48800"; + sha256 = "f375673d67968da3d7a6635ca39472afa2bc665c1cfaa4448a497532b75a1b13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/th/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/th/firefox-132.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6eab1ebc3fdac9f2423720cbc9ca1834c0b60432ed44249fc97b4e61578e3b2c"; + sha256 = "8019c3c56f90321da3db22d50f34a74a1b9216d960d82fabe35bda10d2770c06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tl/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/tl/firefox-132.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1210863fbc4e94a48f051214ad27596d1cd20b6ee546ec7dfdbefb17f03b32ce"; + sha256 = "57644392b534f616cffd66cdd3529e8285f312a615f150870abc622755d1099a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tr/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/tr/firefox-132.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "7209a9fb8cda175dd44abf5af5f2a852a20834e954578f324e30df807eae4b56"; + sha256 = "d5057fae21f2e02b39f08c5a3153a25e84b21395d83c9ce298e5f66c7557ed41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/trs/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/trs/firefox-132.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "0ab1a3fe03acd33f1ea0f6546992ab47e4d8649b043ec6fa1237063e6876a12f"; + sha256 = "3d380217a51ab4ab14bdfa44e23bd64acee3613ecbe4b2a27bef068496e1a740"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/uk/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/uk/firefox-132.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7fe939edfc4ddefb2da97ad93d180958de0a8816d036aef1c7165a1169e8b85e"; + sha256 = "2aee72e5e298d4d193641e63746726b270de9207f1fa9250f867d8a8ef604f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ur/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ur/firefox-132.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d8131acaa6c87b448be1e4a5076248b10956b9bc9f03db93c649e21c270b0782"; + sha256 = "d83ba021597807390c850ab7a8eae73327daf291cd3781d865865f67fdf1497f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/uz/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/uz/firefox-132.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "15767a498cdbb582028295b3f7d8f160601707f2ef112c9ad5a1b42e70185c98"; + sha256 = "529ad02be2b27d07d38bfd0998667076e720d01cd08cdef622324e91befa2098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/vi/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/vi/firefox-132.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "05c0455bfc5744d4adcb005f538e287197402fdd983aa7af2e4852fece20b079"; + sha256 = "c31bc8e3839cf7a0c7b29ac807429d09e11388ea144348c2540b4f502497c0f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/xh/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/xh/firefox-132.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "977d6a65cbfaa6cef11005a8c646dad48f63dca0da899e359951940d88c458ba"; + sha256 = "429b9d994550994126581cc2c23906a69dcb0c724f3fdd3ffcaf3f88fa56ee12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/zh-CN/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/zh-CN/firefox-132.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ed242a8d527e66c1f5e6b0a4e898cca723430ac8cb1290796ad271b367e808b4"; + sha256 = "a0d7c9a402e85064b851df041d256296eb6735a89356162aeb81386f9ef34301"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/zh-TW/firefox-131.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/zh-TW/firefox-132.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6e4457920addfe64bb04934b1e646c197d91a7e100553e72c8632375bb06fd15"; + sha256 = "fbb13bb185a4a8c8619038e32aa3797d7762d7d95854c5c1014c9a557e2c1f0a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 3b4e6cdba26e..dc52606f24b7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -234,7 +234,8 @@ buildStdenv.mkDerivation { "profilingPhase" ]; - patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ] + patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ] + ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ] ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ] ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ] ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [ @@ -383,7 +384,7 @@ buildStdenv.mkDerivation { "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" "--enable-system-pixman" "--with-distribution-id=org.nixos" - "--with-libclang-path=${llvmPackagesBuildBuild.libclang.lib}/lib" + "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib" "--with-system-ffi" "--with-system-icu" "--with-system-jpeg" diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch new file mode 100644 index 000000000000..f35569c5909f --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch @@ -0,0 +1,22 @@ +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 6db876975187..5882c5d7f1d6 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -11,6 +11,7 @@ + + #include "jsapi.h" + #include "xpcpublic.h" ++#include "prenv.h" + #include "prprf.h" + + #include "nsIAppStartup.h" +@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { + "/usr/lib/mozilla"_ns + # endif + ; +- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir)); ++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); ++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), getter_AddRefs(localDir)); + # endif + + if (NS_SUCCEEDED(rv)) { diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 5f766127de3e..ab496ff9a60a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "131.0.3"; + version = "132.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce"; + sha512 = "10d5b05f61628deb9a69cb34b2cf3c75bb6b8768f5a718cef2157d5feb1671ede0d583439562e1c1221914eb6ed37fdf415dd651b1465c056be174136cd80b9d"; }; extraPatches = [ @@ -35,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "132.0b9"; + version = "133.0b1"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985"; + sha512 = "c4a85a72b2891c5b6c6e200cd7ef13abe0f5ad090f8ef1d8243a489791f3542b2cd390c141118c4745c4ca677d1e9bf1e564e4a45e066d27ed53e6bd92844727"; }; meta = { @@ -64,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "132.0b9"; + version = "133.0b1"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b"; + sha512 = "dced4aba71b07b68ee31c283945e7d62a7032f08f5cf71aa261fc7ba32f58277acbe9fdbdd28777d7f4b824e411815b069cab0ce791438088c9ad19c3d2de62e"; }; meta = { @@ -96,10 +96,10 @@ firefox-esr-128 = buildMozillaMach rec { pname = "firefox"; - version = "128.3.1esr"; + version = "128.4.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "c5c1a2e951e0dbb1259a0f77a26b8678bfa4a4c7e909f8fcd5c6d0f807625926824ed235e114d9bab5e289232efaaf4c6691764db64860161ebc9bece9200f0c"; + sha512 = "e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/rust-1.78.patch b/pkgs/applications/networking/browsers/firefox/rust-1.78.patch deleted file mode 100644 index 8484109d5b08..000000000000 --- a/pkgs/applications/networking/browsers/firefox/rust-1.78.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001 -From: Jeff Muizelaar -Date: Tue, 5 Mar 2024 04:12:28 +0100 -Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on - rust >=1.78. r=glandium - -We only need this on ARM32 because the ARM64 intrinsics are stable. - -stdarch_arm_neon_intrinsics was split out from stdsimd here: -https://github.com/rust-lang/stdarch/pull/1486 - -Differential Revision: https://phabricator.services.mozilla.com/D203039 ---- - Cargo.lock | 1 + - gfx/qcms/Cargo.toml | 3 +++ - gfx/qcms/build.rs | 7 +++++++ - gfx/qcms/src/lib.rs | 6 ++++-- - 4 files changed, 15 insertions(+), 2 deletions(-) - create mode 100644 gfx/qcms/build.rs - -diff --git a/Cargo.lock b/Cargo.lock -index aba397832e..8f0a879a87 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4276,6 +4276,7 @@ name = "qcms" - version = "0.2.0" - dependencies = [ - "libc", -+ "version_check", - ] - - [[package]] -diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml -index e976054a7b..f50d6623a1 100644 ---- a/gfx/qcms/Cargo.toml -+++ b/gfx/qcms/Cargo.toml -@@ -20,3 +20,6 @@ cmyk = [] - - [dependencies] - libc = {version = "0.2", optional = true } -+ -+[build-dependencies] -+version_check = "0.9" -diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs -new file mode 100644 -index 0000000000..6810a8828e ---- /dev/null -+++ b/gfx/qcms/build.rs -@@ -0,0 +1,7 @@ -+extern crate version_check as rustc; -+ -+fn main() { -+ if rustc::is_min_version("1.78.0").unwrap_or(false) { -+ println!("cargo:rustc-cfg=stdsimd_split"); -+ } -+} -diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs -index c311964ee3..fc496816a8 100644 ---- a/gfx/qcms/src/lib.rs -+++ b/gfx/qcms/src/lib.rs -@@ -7,9 +7,11 @@ - #![allow(non_upper_case_globals)] - // These are needed for the neon SIMD code and can be removed once the MSRV supports the - // instrinsics we use --#![cfg_attr(feature = "neon", feature(stdsimd))] -+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] -+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] -+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] - #![cfg_attr( -- feature = "neon", -+ all(target_arch = "arm", feature = "neon"), - feature(arm_target_feature, raw_ref_op) - - )] --- -2.44.0 - diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 1ac055213e1b..56dc4af350ab 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.19.1"; + packageVersion = "11.20.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.4.0"; + version = "128.5.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-RFJ3aRbLwCf0qaluqImcF9+6frvJbw8QE3jBpxNxFjE="; + hash = "sha256-+FVnG8CKEQdFN9bO8rUZadp+d8keCB98T7qt9OBfLDA="; }; extraConfigureFlags = [ diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 6e311c3b6535..1a61d7cf77a3 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -26,6 +26,7 @@ , Cocoa , Foundation , OpenGL +, unstableGitUpdater }: let @@ -48,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-10-22"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "648fac7215e1841e3714d4c72c7aee75152da522"; - hash = "sha256-OB9dV+dNr5eA4h1+telYitrI62m+XSK/SYc9UPs7D4M="; + rev = "ad1ba30b27ff2802b6e743c6b8970e4bd1309dfc"; + hash = "sha256-vrRkUTWHm+2GTJ3axO2oPJ0gKyMSH8Reh3TjYYze/Io="; }; postPatch = '' @@ -64,18 +65,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Meta/CMake/lagom_install_options.cmake \ --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib" - - # libwebp is not built with cmake support yet - # https://github.com/NixOS/nixpkgs/issues/334148 - cat > Meta/CMake/FindWebP.cmake <<'EOF' - find_package(PkgConfig) - pkg_check_modules(WEBP libwebp REQUIRED) - include_directories(''${WEBP_INCLUDE_DIRS}) - link_directories(''${WEBP_LIBRARY_DIRS}) - EOF - substituteInPlace Userland/Libraries/LibGfx/CMakeLists.txt \ - --replace-fail 'WebP::' "" \ - --replace-fail libwebpmux webpmux ''; preConfigure = '' @@ -160,6 +149,8 @@ stdenv.mkDerivation (finalAttrs: { nixosTest = nixosTests.ladybird; }; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI"; homepage = "https://ladybird.org"; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 32941d8d58a2..ebb27eaba0c4 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "131.0.3-1", + "packageVersion": "132.0.1", "source": { - "rev": "131.0.3-1", - "sha256": "0ayl43nq3h9a3b4nl7sfmil43v0k3x1bmxl7c7ws8710dj2674rc" + "rev": "132.0.1", + "sha256": "hjtzX6jMJh1pnnO6WsLiOqwfpVYmCTZcEEXAmdBm180=" }, "firefox": { - "version": "131.0.3", - "sha512": "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce" + "version": "132.0", + "sha512": "JU/7oW1ubGHP+qgTH4Gpp4iA5XI7fueKw2JRon2C5v8IgjiuKJ0HRpujpRtbWWmgjs0fwC3LTZMyWgj6wc/JFg==" } } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix deleted file mode 100644 index 71791ac71180..000000000000 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ /dev/null @@ -1,197 +0,0 @@ -{ channel, version, revision, hash }: - -{ stdenv -, fetchurl -, lib -, makeWrapper - -, binutils-unwrapped -, xz -, gnutar -, file - -, glibc -, glib -, nss -, nspr -, atk -, at-spi2-atk -, xorg -, cups -, dbus -, expat -, libdrm -, libxkbcommon -, pipewire -, gtk3 -, pango -, cairo -, gdk-pixbuf -, mesa -, alsa-lib -, at-spi2-core -, libuuid -, systemd -, wayland -, libGL - -# command line arguments which are always set e.g "--disable-gpu" -, commandLineArgs ? "" -}: - -let - - baseName = "microsoft-edge"; - - shortName = if channel == "stable" - then "msedge" - else "msedge-" + channel; - - longName = if channel == "stable" - then baseName - else baseName + "-" + channel; - - iconSuffix = lib.optionalString (channel != "stable") "_${channel}"; - - desktopSuffix = lib.optionalString (channel != "stable") "-${channel}"; -in - -stdenv.mkDerivation rec { - pname="${baseName}-${channel}"; - inherit version; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; - inherit hash; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -"; - sourceRoot = "."; - - dontPatch = true; - dontConfigure = true; - dontPatchELF = true; - - buildPhase = let - libPath = { - msedge = lib.makeLibraryPath [ - glibc glib nss nspr atk at-spi2-atk xorg.libX11 - xorg.libxcb cups.lib dbus.lib expat libdrm - xorg.libXcomposite xorg.libXdamage xorg.libXext - xorg.libXfixes xorg.libXrandr libxkbcommon - pipewire gtk3 pango cairo gdk-pixbuf mesa - alsa-lib at-spi2-core xorg.libxshmfence systemd wayland - ]; - naclHelper = lib.makeLibraryPath [ - glib nspr atk libdrm xorg.libxcb mesa xorg.libX11 - xorg.libXext dbus.lib libxkbcommon - ]; - libwidevinecdm = lib.makeLibraryPath [ - glib nss nspr - ]; - libGLESv2 = lib.makeLibraryPath [ - xorg.libX11 xorg.libXext xorg.libxcb wayland libGL - ]; - liboneauth = lib.makeLibraryPath [ - libuuid xorg.libX11 - ]; - }; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath.msedge}" \ - opt/microsoft/${shortName}/msedge - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - opt/microsoft/${shortName}/msedge-sandbox - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - opt/microsoft/${shortName}/msedge_crashpad_handler - - patchelf \ - --set-rpath "${libPath.libwidevinecdm}" \ - opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - - patchelf \ - --set-rpath "${libPath.libGLESv2}" \ - opt/microsoft/${shortName}/libGLESv2.so - - patchelf \ - --set-rpath "${libPath.liboneauth}" \ - opt/microsoft/${shortName}/liboneauth.so - '' + lib.optionalString (lib.versionOlder version "121") '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath.naclHelper}" \ - opt/microsoft/${shortName}/nacl_helper - ''; - - installPhase = '' - mkdir -p $out - cp -R opt usr/bin usr/share $out - - ${if channel == "stable" - then "ln -sf $out/bin/${longName} $out/bin/${baseName}-${channel}" - else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"} - - ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName} - - rm -rf $out/share/doc - rm -rf $out/opt/microsoft/${shortName}/cron - - for icon in '16' '24' '32' '48' '64' '128' '256' - do - ${ "icon_source=$out/opt/microsoft/${shortName}/product_logo_\${icon}${iconSuffix}.png" } - ${ "icon_target=$out/share/icons/hicolor/\${icon}x\${icon}/apps" } - mkdir -p $icon_target - cp $icon_source $icon_target/microsoft-edge${desktopSuffix}.png - done - - substituteInPlace $out/share/applications/${longName}.desktop \ - --replace /usr/bin/${baseName}-${channel} $out/bin/${longName} - - substituteInPlace $out/share/gnome-control-center/default-apps/${longName}.xml \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/share/menu/${longName}.menu \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \ - --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \ - --replace /usr/bin/file ${file}/bin/file - - substituteInPlace $out/opt/microsoft/${shortName}/default-app-block \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \ - --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}" - ''; - - postFixup = '' - wrapProgram "$out/bin/${longName}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - ''; - - # We only want automatic updates for stable, beta and dev will get updated by the same script - # and are only used for testing. - passthru = lib.optionalAttrs (channel == "stable") { updateScript = ./update.py; }; - - meta = with lib; { - homepage = "https://www.microsoft.com/en-us/edge"; - description = "Web browser from Microsoft"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; - }; -} diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix deleted file mode 100644 index 5721c6e616b9..000000000000 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - beta = import ./browser.nix { - channel = "beta"; - version = "130.0.2849.5"; - revision = "1"; - hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM="; - }; - dev = import ./browser.nix { - channel = "dev"; - version = "130.0.2849.1"; - revision = "1"; - hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s="; - }; - stable = import ./browser.nix { - channel = "stable"; - version = "129.0.2792.65"; - revision = "1"; - hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; - }; -} diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py deleted file mode 100755 index 724a83d09d54..000000000000 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ /dev/null @@ -1,70 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian - -import base64 -import textwrap -from urllib import request - -from collections import OrderedDict -from debian.deb822 import Packages -from debian.debian_support import Version -from os.path import abspath, dirname - -PIN_PATH = dirname(abspath(__file__)) + '/default.nix' - -def packages(): - packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' - handle = request.urlopen(packages_url) - return handle - - -def latest_packages(packages: bytes): - latest_packages: OrderedDict[str, Packages] = {} - for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): - name: str = package['Package'] - if not name.startswith('microsoft-edge-'): - continue - channel = name.replace('microsoft-edge-', '') - if channel not in latest_packages: - latest_packages[channel] = package - else: - old_package = latest_packages[channel] - if old_package.get_version() < package.get_version(): # type: ignore - latest_packages[channel] = package - return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0])) - - -def nix_expressions(latest: dict[str, Packages]): - channel_strs: list[str] = [] - for channel, package in latest.items(): - print(f"Processing {channel} {package['Version']}") - match = Version.re_valid_version.match(package['Version']) - assert match is not None - - version = match.group('upstream_version') - revision = match.group('debian_revision') - sri = 'sha256-' + \ - base64.b64encode(bytes.fromhex(package['SHA256'])).decode('ascii') - - channel_str = textwrap.dedent( - f'''\ - {channel} = import ./browser.nix {{ - channel = "{channel}"; - version = "{version}"; - revision = "{revision}"; - hash = "{sri}"; - }};''' - ) - channel_strs.append(channel_str) - return channel_strs - - -def write_expression(): - latest = latest_packages(packages()) - channel_strs = nix_expressions(latest) - nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n' - with open(PIN_PATH, 'w') as f: - f.write(nix_expr) - - -write_expression() diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix index 0c8d8fb24edd..ce68502c57c9 100644 --- a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "widevine-cdm"; - version = "4.10.2710.0"; + version = "4.10.2830.0"; src = fetchzip { url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - hash = "sha256-lGTrSzUk5FluH1o4E/9atLIabEpco3C3gZw+y6H6LJo="; + hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 0fb67d46bc09..6ff4976f00c8 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -39,14 +39,6 @@ stdenv.mkDerivation (finalAttrs: { stripRoot = false; }; - # for sbcl 2.4.3 - postPatch = '' - substituteInPlace _build/cl-gobject-introspection/src/init.lisp \ - --replace-warn sb-ext::set-floating-point-modes sb-int:set-floating-point-modes - substituteInPlace _build/fset/Code/port.lisp \ - --replace-warn sb-ext::once-only sb-int:once-only - ''; - nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix deleted file mode 100644 index 73dc8ccc6913..000000000000 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ alsa-lib -, atk -, cairo -, cups -, curl -, dbus -, dpkg -, expat -, fetchurl -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, gtk4 -, lib -, libX11 -, libxcb -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libnotify -, libpulseaudio -, libuuid -, libxshmfence -, mesa -, nspr -, nss -, pango -, stdenv -, systemd -, at-spi2-atk -, at-spi2-core -, autoPatchelfHook -, wrapGAppsHook3 -, qt6 -, proprietaryCodecs ? false -, vivaldi-ffmpeg-codecs -}: - -let - mirror = "https://get.geo.opera.com/pub/opera/desktop"; -in -stdenv.mkDerivation rec { - pname = "opera"; - version = "114.0.5282.102"; - - src = fetchurl { - url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8="; - }; - - unpackPhase = "dpkg-deb -x $src ."; - - nativeBuildInputs = [ - dpkg - autoPatchelfHook - wrapGAppsHook3 - qt6.wrapQtAppsHook - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig.lib - freetype - gdk-pixbuf - glib - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libdrm - libnotify - libuuid - libxcb - libxshmfence - mesa - nspr - nss - pango - stdenv.cc.cc.lib - qt6.qtbase - ]; - - runtimeDependencies = [ - # Works fine without this except there is no sound. - libpulseaudio.out - - # This is a little tricky. Without it the app starts then crashes. Then it - # brings up the crash report, which also crashes. `strace -f` hints at a - # missing libudev.so.0. - (lib.getLib systemd) - - # Error at startup: - # "Illegal instruction (core dumped)" - gtk3 - gtk4 - ] ++ lib.optionals proprietaryCodecs [ - vivaldi-ffmpeg-codecs - ]; - - dontWrapQtApps = true; - - installPhase = '' - mkdir -p $out/bin - cp -r usr $out - cp -r usr/share $out/share - - # we already using QT6, autopatchelf wants to patch this as well - rm $out/usr/lib/x86_64-linux-gnu/opera/libqt5_shim.so - ln -s $out/usr/bin/opera $out/bin/opera - ''; - - meta = with lib; { - homepage = "https://www.opera.com"; - description = "Faster, safer and smarter web browser"; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ kindrowboat ]; - }; -} diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 7f70a49e1a06..4fa6b759929d 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.4.0.1"; + version = "33.4.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { dbus-glib gtk2-x11 libXt - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ] ++ lib.optionals withGTK3 [ gtk3 ]; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-34x9L0L42KO7mUDaW41I71ln5xyHGAKBoAJ6HcDC//g="; + hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-TRIgfqKsJxueZ/Oazw7kTLjVyxdh+IUiR+XDaemow9A="; + hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA="; }; }; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix deleted file mode 100644 index 693b1e8f0f50..000000000000 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "polypane"; - version = "21.1.0"; - - src = fetchurl { - url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - name = "${pname}-${version}.AppImage"; - sha256 = "sha256-MVBxKJeqIFAkSOajo1q/062BGBF6Fm2sUA6GYZIBoKQ="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname src version; - }; -in appimageTools.wrapType2 { - inherit pname src version; - - extraPkgs = pkgs: [ pkgs.bash ]; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - ''; - - meta = with lib; { - description = "Browser with unified devtools targeting responsability and accessibility"; - longDescription = '' - The stand-alone browser for ambitious developers that want to build responsive, - accessible and performant websites in a fraction of the time it takes with other browsers. - ''; - homepage = "https://polypane.app/"; - maintainers = with maintainers; [ zoedsoupe ]; - platforms = [ "x86_64-linux" ]; - changelog = "https://polypane.app/docs/changelog/"; - license = licenses.unfree; - }; -} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 7e020a0acf67..81a1da428913 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/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.9.3447.51"; + version = "7.0.3495.6"; 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-p+MihnvnVBVcsYE/7vp9b6T2bxp7cAiCq9ME+NHqi38="; - x86_64-linux = "sha256-/izigAT9eqhgxgYosMoDoPIA0rOCeYOotEjaigBTazk="; + aarch64-linux = "sha256-6jr1TFhwBTaAc/UpG5yBj6A09kytmtuKVbgPgvXMpoI="; + x86_64-linux = "sha256-dbBdmqoY4x6+zwiWe+eRjrd0jeww3ANZNDDYH79uxaU="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix deleted file mode 100644 index 06d4251b9faa..000000000000 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook3 -, flac -, gnome2 -, harfbuzzFull -, nss -, snappy -, xdg-utils -, xorg -, alsa-lib -, atk -, cairo -, cups -, curl -, dbus -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libxcb -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libnotify -, libopus -, libpulseaudio -, libuuid -, libxshmfence -, mesa -, nspr -, pango -, systemd -, at-spi2-atk -, at-spi2-core -, libqt5pas -, qt6 -, vivaldi-ffmpeg-codecs -, edition ? "stable" -}: - -let - version = { - corporate = "24.7.1.1195-1"; - beta = "24.7.1.1124-1"; - stable = "24.7.1.1120-1"; - }.${edition}; - - hash = { - corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4="; - beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ="; - stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U="; - }.${edition}; - - app = { - corporate = ""; - beta = "-beta"; - stable = ""; - }.${edition}; - -in stdenv.mkDerivation rec { - pname = "yandex-browser-${edition}"; - inherit version; - - src = fetchurl { - url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb"; - inherit hash; - }; - - nativeBuildInputs = [ - autoPatchelfHook - qt6.wrapQtAppsHook - wrapGAppsHook3 - ]; - - buildInputs = [ - flac - harfbuzzFull - nss - snappy - xdg-utils - xorg.libxkbfile - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig.lib - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libdrm - libnotify - libopus - libuuid - libxcb - libxshmfence - mesa - nspr - nss - pango - stdenv.cc.cc.lib - libqt5pas - qt6.qtbase - ]; - - unpackPhase = '' - mkdir $TMP/ya/ $out/bin/ -p - ar vx $src - tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ - ''; - - installPhase = '' - cp $TMP/ya/{usr/share,opt} $out/ -R - cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true - rm -f $out/share/applications/yandex-browser.desktop - substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/ - substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/ - substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/ - ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so - ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname} - ''; - - runtimeDependencies = map lib.getLib [ - libpulseaudio - curl - systemd - vivaldi-ffmpeg-codecs - ] ++ buildInputs; - - meta = with lib; { - description = "Yandex Web Browser"; - homepage = "https://browser.yandex.ru/"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ dan4ik605743 ionutnechita ]; - platforms = [ "x86_64-linux" ]; - - knownVulnerabilities = [ - '' - Trusts a Russian government issued CA certificate for some websites. - See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. - '' - ]; - }; -} diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix deleted file mode 100644 index ac1d51ecee3a..000000000000 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "aiac"; - version = "5.2.1"; - excludedPackages = [".ci"]; - - src = fetchFromGitHub { - owner = "gofireflyio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw="; - }; - - vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE="; - ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ]; - - meta = with lib; { - description = ''Artificial Intelligence Infrastructure-as-Code Generator.''; - mainProgram = "aiac"; - homepage = "https://github.com/gofireflyio/aiac/"; - license = licenses.asl20; - maintainers = with maintainers; [ qjoly ]; - }; -} diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix deleted file mode 100644 index 815ac16a8573..000000000000 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, pkgsBuildBuild -}: - -let - # Argo can package a static server in the CLI using the `staticfiles` go module. - # We build the CLI without the static server for simplicity, but the tool is still required for - # compilation to succeed. - # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 - staticfiles = pkgsBuildBuild.buildGoModule rec { - name = "staticfiles"; - - src = fetchFromGitHub { - owner = "bouk"; - repo = "staticfiles"; - rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd"; - hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; - }; - - vendorHash = null; - - excludedPackages = [ "./example" ]; - - preBuild = '' - cp ${./staticfiles.go.mod} go.mod - ''; - - ldflags = [ "-s" "-w" ]; - }; -in -buildGoModule rec { - pname = "argo"; - version = "3.5.11"; - - src = fetchFromGitHub { - owner = "argoproj"; - repo = "argo"; - rev = "refs/tags/v${version}"; - hash = "sha256-Yw61BCcMLl/zkmPm79SI0AdT6Nj2bxQkt6IKRBu0FmQ="; - }; - - vendorHash = "sha256-QwQasJMSEnHvBxyxCjLuinPt47XAhERch3j60KXGxa4="; - - doCheck = false; - - subPackages = [ - "cmd/argo" - ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - preBuild = '' - mkdir -p ui/dist/app - echo "Built without static files" > ui/dist/app/index.html - - ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app - ''; - - ldflags = [ - "-s" - "-w" - "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" - "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" - "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" - "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean" - "-X github.com/argoproj/argo-workflows/v3.version=${version}" - ]; - - postInstall = '' - for shell in bash zsh; do - ${if (stdenv.buildPlatform == stdenv.hostPlatform) - then "$out/bin/argo" - else "${pkgsBuildBuild.argo}/bin/argo" - } completion $shell > argo.$shell - installShellCompletion argo.$shell - done - ''; - - meta = with lib; { - description = "Container native workflow engine for Kubernetes"; - mainProgram = "argo"; - homepage = "https://github.com/argoproj/argo"; - changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ groodt ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix deleted file mode 100644 index 2d9e23b7cc99..000000000000 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "arkade"; - version = "0.11.27"; - - src = fetchFromGitHub { - owner = "alexellis"; - repo = "arkade"; - rev = version; - hash = "sha256-5/QAtaAAiIzpvOl43A4OqnIcKlfdxehGjmCREFRKXTs="; - }; - - CGO_ENABLED = 0; - - nativeBuildInputs = [ installShellFiles ]; - - vendorHash = null; - - # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true - subPackages = [ - "." - "cmd" - "pkg/apps" - "pkg/archive" - "pkg/config" - "pkg/env" - "pkg/helm" - "pkg/k8s" - "pkg/types" - ]; - - ldflags = [ - "-s" "-w" - "-X github.com/alexellis/arkade/pkg.GitCommit=ref/tags/${version}" - "-X github.com/alexellis/arkade/pkg.Version=${version}" - ]; - - postInstall = '' - installShellCompletion --cmd arkade \ - --bash <($out/bin/arkade completion bash) \ - --zsh <($out/bin/arkade completion zsh) \ - --fish <($out/bin/arkade completion fish) - ''; - - meta = with lib; { - homepage = "https://github.com/alexellis/arkade"; - description = "Open Source Kubernetes Marketplace"; - mainProgram = "arkade"; - license = licenses.mit; - maintainers = with maintainers; [ welteki techknowlogick qjoly ]; - }; -} diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix deleted file mode 100644 index 82bbd7b202bb..000000000000 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "atmos"; - version = "1.86.0"; - - src = fetchFromGitHub { - owner = "cloudposse"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-IlvIZMfsANw6+BrVObn0pBcoEcSKXVcN1V3B0f4BDno="; - }; - - vendorHash = "sha256-87C3MPKlYVnpNJvPJY9eCrSy8qfP8Kj36a9vi+kiP44="; - - ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; - - preCheck = '' - # Remove tests that depend on a network connection. - rm -f \ - pkg/vender/component_vendor_test.go \ - pkg/atlantis/atlantis_generate_repo_config_test.go \ - pkg/describe/describe_affected_test.go - ''; - - doCheck = true; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/atmos version | grep "v${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://atmos.tools"; - changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}"; - description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; - mainProgram = "atmos"; - license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.cloudposse.members; - }; -} diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix deleted file mode 100644 index d4788c80bafc..000000000000 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, makeWrapper -, openssh -}: - -buildGoModule rec { - pname = "bosh-cli"; - - version = "7.7.2"; - - src = fetchFromGitHub { - owner = "cloudfoundry"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-orn1pxHefYCp0vPsZ4TI5Y76tpR8dOcEmxA3cHwfYQU="; - }; - vendorHash = null; - - postPatch = '' - substituteInPlace cmd/version.go --replace '[DEV BUILD]' '${version}' - ''; - - nativeBuildInputs = [ makeWrapper ]; - - subPackages = [ "." ]; - - doCheck = false; - - postInstall = '' - mv $out/bin/bosh-cli $out/bin/bosh - wrapProgram $out/bin/bosh --prefix PATH : '${lib.makeBinPath [ openssh ]}' - ''; - - meta = with lib; { - description = "Command line interface to CloudFoundry BOSH"; - homepage = "https://bosh.io"; - changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ris ]; - mainProgram = "bosh"; - }; -} diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 509a0385c850..e776c537eccd 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.28.2"; + version = "3.29.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-ZENlUmSLI+aY33a69LNsfer/TLz8gmzxEv8Gddz6faU="; + hash = "sha256-bgcY/unCLAtPOeEwRJGl8u1dHYdO3tSzMTg47DHOsJM="; }; - vendorHash = "sha256-6ZHb4SUa22/KfN4B2hg710FOSpg69rlT9FbZ/wCjpDc="; + vendorHash = "sha256-9Kap6qHIttgMRSnSnTUvWj72jp5u2vIMy5l2sJRfKlU="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 02acad93a315..1fdcbd5e5649 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -45,7 +45,7 @@ let nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix deleted file mode 100644 index 7c7fdbf248a4..000000000000 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, testers -, k0sctl -}: - -buildGoModule rec { - pname = "k0sctl"; - version = "0.19.1"; - - src = fetchFromGitHub { - owner = "k0sproject"; - repo = "k0sctl"; - rev = "refs/tags/v${version}"; - hash = "sha256-6mvSVbSTPFiAIDxNQUmgFmS+3v3RUh10Y552u9bHOn0="; - }; - - vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I="; - - ldflags = [ - "-s" - "-w" - "-X=github.com/k0sproject/k0sctl/version.Environment=production" - "-X=github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12 - "-X=github.com/carlmjohnson/versioninfo.Revision=v${version}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - for shell in bash zsh fish; do - installShellCompletion --cmd ${pname} \ - --$shell <($out/bin/${pname} completion --shell $shell) - done - ''; - - passthru.tests.version = testers.testVersion { - package = k0sctl; - command = "k0sctl version"; - # See https://github.com/carlmjohnson/versioninfo/discussions/12 - version = "version: (devel)\ncommit: v${version}\n"; - }; - - meta = with lib; { - description = "Bootstrapping and management tool for k0s clusters"; - homepage = "https://k0sproject.io/"; - changelog = "https://github.com/k0sproject/k0sctl/releases/tag/v${version}"; - license = licenses.asl20; - mainProgram = "k0sctl"; - maintainers = with maintainers; [ nickcao qjoly ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix deleted file mode 100644 index f8b42bb0fae3..000000000000 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, kube-score -}: - -buildGoModule rec { - pname = "kube-score"; - version = "1.18.0"; - - src = fetchFromGitHub { - owner = "zegl"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3OdcYqSUy0WH5CrrRMXDs1HGxvToXx/3iPytYBdDncg="; - }; - - vendorHash = "sha256-4yd/N57O3avD8KaGU9lZAEDasPx1pRx37rqQpuGeRiY="; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - "-X=main.commit=${src.rev}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = kube-score; - command = "kube-score version"; - }; - }; - - meta = with lib; { - description = "Kubernetes object analysis with recommendations for improved reliability and security"; - mainProgram = "kube-score"; - homepage = "https://github.com/zegl/kube-score"; - changelog = "https://github.com/zegl/kube-score/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ j4m3s ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix deleted file mode 100644 index 3ec9e7f79113..000000000000 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, git -, go -, gnumake -, installShellFiles -, testers -, kubebuilder -}: - -buildGoModule rec { - pname = "kubebuilder"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "kubernetes-sigs"; - repo = "kubebuilder"; - rev = "v${version}"; - hash = "sha256-iWu3HnfjT9hiDyl9Ni0xJa/e+E9fbh3bnfrdE1ChaWc="; - }; - - vendorHash = "sha256-dMzDKYjPBAiNFwzaBML76tMylHtBs9Tb2Ulj/WovVJ4="; - - subPackages = ["cmd"]; - - allowGoReference = true; - - ldflags = [ - "-X main.kubeBuilderVersion=v${version}" - "-X main.goos=${go.GOOS}" - "-X main.goarch=${go.GOARCH}" - "-X main.gitCommit=unknown" - "-X main.buildDate=unknown" - ]; - - nativeBuildInputs = [ - makeWrapper - git - installShellFiles - ]; - - postInstall = '' - mv $out/bin/cmd $out/bin/kubebuilder - wrapProgram $out/bin/kubebuilder \ - --prefix PATH : ${lib.makeBinPath [ go gnumake ]} - - installShellCompletion --cmd kubebuilder \ - --bash <($out/bin/kubebuilder completion bash) \ - --fish <($out/bin/kubebuilder completion fish) \ - --zsh <($out/bin/kubebuilder completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - command = "${kubebuilder}/bin/kubebuilder version"; - package = kubebuilder; - version = "v${version}"; - }; - - meta = { - description = "SDK for building Kubernetes APIs using CRDs"; - mainProgram = "kubebuilder"; - homepage = "https://github.com/kubernetes-sigs/kubebuilder"; - changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cmars ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix deleted file mode 100644 index 494d5e5e1b2e..000000000000 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubecm"; - version = "0.31.0"; - - src = fetchFromGitHub { - owner = "sunny0826"; - repo = "kubecm"; - rev = "v${version}"; - hash = "sha256-Go2lroa8lq1XjIzvdA5ZL/lOjTAyDKopBepqgWzsUII="; - }; - - vendorHash = "sha256-BrSYfxftrnNOcPgG/rsTF3OukDd+VlOvE7OJcos7vW4="; - ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; - - doCheck = false; - - meta = with lib; { - description = "Manage your kubeconfig more easily"; - homepage = "https://github.com/sunny0826/kubecm/"; - license = licenses.asl20; - maintainers = with maintainers; [ qjoly ]; - mainProgram = "kubecm"; - }; -} diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix deleted file mode 100644 index 54d7adb9bfb7..000000000000 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "kubefirst"; - version = "2.5.11"; - - src = fetchFromGitHub { - owner = "konstructio"; - repo = "kubefirst"; - rev = "refs/tags/v${version}"; - hash = "sha256-paGb/Ifslj2XsXhY99ETXs72s3vSXAUqTeGPg+Nviho="; - }; - - vendorHash = "sha256-tOCVDp9oClfeBsyZ6gv6HoGPjZByoxxAceV/wxQeBSA="; - - ldflags = [ - "-s" - "-w" - "-X=github.com/konstructio/kubefirst-api/configs.K1Version=v${version}" - ]; - - doCheck = false; - - meta = with lib; { - description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch"; - mainProgram = "kubefirst"; - homepage = "https://github.com/konstructio/kubefirst/"; - changelog = "https://github.com/konstructio/kubefirst/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ qjoly ]; - }; -} diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 18ae3d825628..3c6c220be770 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.10.3"; - sha256 = "1xsimk3kjniy59sw56q52cmnpg1vb1l1zbaj6nrj44pl57vkp9cp"; - vendorHash = "sha256-JVXhZjUdU1CrWzrh7INhAd3kRP/tcdsYzlre9SB9gOQ="; + version = "24.10.4"; + sha256 = "0n1fcl2mi3q3g44bd5x7wgnx91769051dwaxmvc4yapkbsbwnr6g"; + vendorHash = "sha256-AGFuNFwZjWnu+FcXGpTxDQysgSGmYbfEtERaGjCOnUA="; } diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix deleted file mode 100644 index e30d89a9a34c..000000000000 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, systemd }: - -buildGoModule rec { - pname = "node-problem-detector"; - version = "0.8.19"; - - src = fetchFromGitHub { - owner = "kubernetes"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-foVMmRgxy0A62EzmDiGUd2/x5zOpMAMUzXitpxuSIU0="; - }; - - vendorHash = null; - - doCheck = false; - - # Optionally, a log counter binary can be created to parse journald logs. - # The binary is dynamically linked against systemd libraries, making it a - # Linux-only feature. See 'ENABLE_JOURNALD' upstream: - # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile - subPackages = [ "cmd/nodeproblemdetector" ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ]; - - preBuild = '' - export CGO_ENABLED=${if stdenv.hostPlatform.isLinux then "1" else "0"} - ''; - - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; - - tags = lib.optionals stdenv.hostPlatform.isLinux [ "journald" ]; - - ldflags = [ - "-X k8s.io/${pname}/pkg/version.version=v${version}" - ]; - - meta = with lib; { - description = "Various problem detectors running on the Kubernetes nodes"; - homepage = "https://github.com/kubernetes/node-problem-detector"; - changelog = "https://github.com/kubernetes/node-problem-detector/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ lbpdt ]; - }; -} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index fae25a6ec623..e8b9fe8df1a4 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , buildGo122Module +, buildGo123Module , fetchFromGitHub , nixosTests , installShellFiles @@ -26,6 +27,12 @@ let nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-X github.com/hashicorp/nomad/version.Version=${version}" + "-X github.com/hashicorp/nomad/version.VersionPrerelease=" + "-X github.com/hashicorp/nomad/version.BuildDate=1970-01-01T00:00:00Z" + ]; + # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. @@ -54,7 +61,7 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_7; + nomad = nomad_1_8; nomad_1_4 = throwUnsupportaed "nomad_1_4"; @@ -85,4 +92,16 @@ rec { export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; + + nomad_1_9 = generic { + buildGoModule = buildGo123Module; + version = "1.9.2"; + sha256 = "sha256-HIyRzujAGwhB2anbxidhq5UpWYHkigyyHfxIUwMF5X8="; + vendorHash = "sha256-YIOTdD+oRDdEHkBzQCUuKCz7Wbj4mFjrZY0J3Cte400="; + license = lib.licenses.bsl11; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + }; } diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix deleted file mode 100644 index 29a0082d2314..000000000000 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, coreutils -, runCommand -, runtimeShell -, writeText -, terraform-providers -, installShellFiles -}: - -let - package = buildGoModule rec { - pname = "opentofu"; - version = "1.8.4"; - - src = fetchFromGitHub { - owner = "opentofu"; - repo = "opentofu"; - rev = "v${version}"; - hash = "sha256-YUN+JBYn8Bq4glZNBdlr++WJgGpGSKK1PjWqaduF8bg="; - }; - - vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o="; - ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; - - postConfigure = '' - # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 - substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ - --replace-fail "/bin/stty" "${coreutils}/bin/stty" - ''; - - nativeBuildInputs = [ installShellFiles ]; - patches = [ ./provider-path-0_15.patch ]; - - passthru = { - inherit full plugins withPlugins; - tests = { inherit opentofu_plugins_test; }; - }; - - # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8 - postInstall = '' - installShellCompletion --bash --name tofu <(echo complete -C tofu tofu) - ''; - - preCheck = '' - export HOME=$TMPDIR - export TF_SKIP_REMOTE_TESTS=1 - ''; - - subPackages = [ "./cmd/..." ]; - - meta = with lib; { - description = "Tool for building, changing, and versioning infrastructure"; - homepage = "https://opentofu.org/"; - changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ - nickcao - zowoq - ]; - mainProgram = "tofu"; - }; - }; - - full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders)); - - opentofu_plugins_test = let - mainTf = writeText "main.tf" '' - terraform { - required_providers { - random = { - source = "registry.terraform.io/hashicorp/random" - } - } - } - - resource "random_id" "test" {} - ''; - opentofu = package.withPlugins (p: [ p.random ]); - test = runCommand "opentofu-plugin-test" { - buildInputs = [ opentofu ]; - } '' - # make it fail outside of sandbox - export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 - cp ${mainTf} main.tf - tofu init - touch $out - ''; - in - test; - - plugins = removeAttrs terraform-providers [ - "override" - "overrideDerivation" - "recurseForDerivations" - ]; - - withPlugins = plugins: - let - actualPlugins = plugins package.plugins; - - # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries - wrapperInputs = lib.unique (lib.flatten - (lib.catAttrs "propagatedBuildInputs" - (builtins.filter (x: x != null) actualPlugins))); - - passthru = { - withPlugins = newplugins: - withPlugins (x: newplugins x ++ actualPlugins); - - # Expose wrappers around the override* functions of the terraform - # derivation. - # - # Note that this does not behave as anyone would expect if plugins - # are specified. The overrides are not on the user-visible wrapper - # derivation but instead on the function application that eventually - # generates the wrapper. This means: - # - # 1. When using overrideAttrs, only `passthru` attributes will - # become visible on the wrapper derivation. Other overrides that - # modify the derivation *may* still have an effect, but it can be - # difficult to follow. - # - # 2. Other overrides may work if they modify the terraform - # derivation, or they may have no effect, depending on what - # exactly is being changed. - # - # 3. Specifying overrides on the wrapper is unsupported. - # - # See nixpkgs#158620 for details. - overrideDerivation = f: - (package.overrideDerivation f).withPlugins plugins; - overrideAttrs = f: - (package.overrideAttrs f).withPlugins plugins; - override = x: - (package.override x).withPlugins plugins; - }; - # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading - # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. - in - if actualPlugins == [ ] then - package.overrideAttrs - (orig: { passthru = orig.passthru // passthru; }) - else - lib.appendToName "with-plugins" (stdenv.mkDerivation { - inherit (package) meta pname version; - nativeBuildInputs = [ makeWrapper ]; - - # Expose the passthru set with the override functions - # defined above, as well as any passthru values already - # set on `terraform` at this point (relevant in case a - # user overrides attributes). - passthru = package.passthru // passthru; - - buildCommand = '' - # Create wrappers for terraform plugins because Terraform only - # walks inside of a tree of files. - for providerDir in ${toString actualPlugins} - do - for file in $(find $providerDir/libexec/terraform-providers -type f) - do - relFile=''${file#$providerDir/} - mkdir -p $out/$(dirname $relFile) - cat < $out/$relFile - #!${runtimeShell} - exec "$file" "$@" - WRAPPER - chmod +x $out/$relFile - done - done - - # Create a wrapper for opentofu to point it to the plugins dir. - mkdir -p $out/bin/ - makeWrapper "${package}/bin/tofu" "$out/bin/tofu" \ - --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ - --prefix PATH : "${lib.makeBinPath wrapperInputs}" - ''; - }); -in -package diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix deleted file mode 100644 index 6b9bf60d4530..000000000000 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "popeye"; - version = "0.21.3"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "derailed"; - repo = "popeye"; - sha256 = "sha256-2+AV2gt67zLa7bRIfsxQIeB82iJba8Y4P0fq9273r7Q="; - }; - - ldflags = [ - "-s" "-w" - "-X github.com/derailed/popeye/cmd.version=${version}" - "-X github.com/derailed/popeye/cmd.commit=${version}" - ]; - - vendorHash = "sha256-qrw/7fauMVb3Ai5E5MXL84yXHcReJZZ1oioB/Cv32Is="; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd popeye \ - --bash <($out/bin/popeye completion bash) \ - --fish <($out/bin/popeye completion fish) \ - --zsh <($out/bin/popeye completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/popeye version | grep ${version} > /dev/null - ''; - - meta = with lib; { - description = "Kubernetes cluster resource sanitizer"; - mainProgram = "popeye"; - homepage = "https://github.com/derailed/popeye"; - changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.bryanasdev000 ]; - }; -} diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index ddabe261bfba..8fbec3c36e78 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "4.5.3"; + version = "4.5.4"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-TWmbpU27ZGG8L66TW3yWoxUO8M4N6mMOmLv2VVXM+Q4="; + sha256 = "sha256-Da3KFGdhDSvdcMBbYmhgft7Sj+PPgUMsEoXAtx9Mhm8="; }; vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s="; diff --git a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/pkgs/applications/networking/cluster/terraform-backend-git/default.nix deleted file mode 100644 index a78b339c087a..000000000000 --- a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "terraform-backend-git"; - version = "0.1.6"; - - src = fetchFromGitHub { - owner = "plumber-cd"; - repo = "terraform-backend-git"; - rev = "v${version}"; - hash = "sha256-ZbQfL7uKCFD98HcoeqscZaIsWFvWH0Ytzlqr6fMmXUs="; - }; - - vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0="; - - nativeBuildInputs = [ - installShellFiles - ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/plumber-cd/terraform-backend-git/cmd.Version=${version}" - ]; - - postInstall = '' - installShellCompletion --cmd terraform-backend-git \ - --bash <($out/bin/terraform-backend-git completion bash) \ - --fish <($out/bin/terraform-backend-git completion fish) \ - --zsh <($out/bin/terraform-backend-git completion zsh) - ''; - - meta = with lib; { - description = "Terraform HTTP Backend implementation that uses Git repository as storage"; - mainProgram = "terraform-backend-git"; - homepage = "https://github.com/plumber-cd/terraform-backend-git"; - changelog = "https://github.com/plumber-cd/terraform-backend-git/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ blaggacao ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b346f768f32..e7616f511744 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -206,6 +206,15 @@ "spdx": "MIT", "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, + "ccloud": { + "hash": "sha256-bGyVfB9eenE6QZZw0bAxnve0KW0ZQ54slTaaWZXDBOc=", + "homepage": "https://registry.terraform.io/providers/sapcc/ccloud", + "owner": "sapcc", + "repo": "terraform-provider-ccloud", + "rev": "v1.6.6", + "spdx": "MPL-2.0", + "vendorHash": "sha256-uftDCqDU0HeDj7rjAevulsFCVFFQt3eg8vcFM9YJrow=" + }, "checkly": { "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", @@ -498,13 +507,13 @@ "vendorHash": "sha256-iJSo5zrJWRpm7kPHxEBBovsn1ICQCNe1fjsp4CdJgBU=" }, "google-beta": { - "hash": "sha256-9KaTzEbl4kUpl9ttC7VOvstVXcf6R5zNqAUpr/om8nA=", + "hash": "sha256-vYMyLjb2OQAVPmc9wSxTCWG1lLUOH/cxayCJPZIF2Bo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.7.0", + "rev": "v6.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3cwpIOVynJj9G/sWWXmVbosqlggb5TqMCtMg1pgIGic=" + "vendorHash": "sha256-N7qOuK/RbmXvpalUQEtop8L99R9Q6cYWVFmPxG4+9T4=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 965a5a5c9a75..26be204a06f3 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-g0B5UbveQ6KYqfXGF5bsGJfUuZ3q1TNEaC1GwtNAig8="; + hash = "sha256-bztaG+agcByiIFR4vp0QCDzL9AvLJoZRyMjwSggtwio="; }; - vendorHash = "sha256-XeqHETKWw74edsWCOKC+bhIt0NZz5mgrTShoQk1hb5Y="; + vendorHash = "sha256-VHR5eQWC5e45ZcpCunrUPdvFKMETRZxHLZnl7FbyFcI="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix deleted file mode 100644 index e7c41c56254a..000000000000 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchurl -, appimageTools -}: - -let - pname = "cozydrive"; - version = "3.39.0"; - - src = fetchurl { - url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "sha256-mTRg8KQm7BJil81TClyzCrXSHTbn+G9pRYMIaeXojzc="; - }; - appimageContents = appimageTools.extract { inherit pname version src; }; - -in -appimageTools.wrapType2 { - inherit pname version src; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/cozydrive.desktop -t $out/share/applications - substituteInPlace $out/share/applications/cozydrive.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud"; - homepage = "https://cozy.io"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ simarra ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "cozydrive"; - }; -} diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix deleted file mode 100644 index 356f8f622c35..000000000000 --- a/pkgs/applications/networking/diswall/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: - -let - inherit (darwin.apple_sdk.frameworks) Security; -in -rustPlatform.buildRustPackage rec { - pname = "diswall"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "dis-works"; - repo = "diswall-rs"; - rev = "v${version}"; - sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - - cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U="; - - doCheck = false; - - meta = with lib; { - description = "Distributed firewall"; - longDescription = '' - Diswall (distributed firewall) - a client of distributed firewall - working on many servers and using NATS for the transport level. - Its purpose - blocking IPs with a blink of the eye on all servers - in any infrastructure when some IP checks any of the closed ports - of anyone of these servers. Therefore, diswall provides good - protection of whole infrastructure (as anti-shodan) preventing - intruder to get any system information. - ''; - homepage = "https://www.diswall.stream"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ izorkin ]; - mainProgram = "diswall"; - }; -} diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix deleted file mode 100644 index dca5a0a98852..000000000000 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, dnscontrol }: - -buildGoModule rec { - pname = "dnscontrol"; - version = "4.14.0"; - - src = fetchFromGitHub { - owner = "StackExchange"; - repo = "dnscontrol"; - rev = "v${version}"; - hash = "sha256-XKsP6ZJCY196wYsp54d0OgF4zj0b9H8820wBAOjrDbg="; - }; - - vendorHash = "sha256-6ePEgHVFPtkW+C57+cPLj5yc9YaCRKrnBFo2Y1pcglM="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; - - postInstall = '' - installShellCompletion --cmd dnscontrol \ - --bash <($out/bin/dnscontrol shell-completion bash) \ - --zsh <($out/bin/dnscontrol shell-completion zsh) - ''; - - preCheck = '' - # requires network - rm pkg/spflib/flatten_test.go pkg/spflib/parse_test.go - ''; - - passthru.tests = { - version = testers.testVersion { - command = "${lib.getExe dnscontrol} version"; - package = dnscontrol; - }; - }; - - meta = with lib; { - description = "Synchronize your DNS to multiple providers from a simple DSL"; - homepage = "https://dnscontrol.org/"; - changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - mainProgram = "dnscontrol"; - }; -} diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/applications/networking/expressvpn/default.nix deleted file mode 100644 index 5334fc01ffc4..000000000000 --- a/pkgs/applications/networking/expressvpn/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ autoPatchelfHook -, buildFHSEnv -, dpkg -, fetchurl -, inotify-tools -, lib -, stdenvNoCC -, sysctl -, writeScript -}: - -let - pname = "expressvpn"; - clientVersion = "3.52.0"; - clientBuild = "2"; - version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ]; - - expressvpnBase = stdenvNoCC.mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb"; - hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew="; - }; - - nativeBuildInputs = [ dpkg autoPatchelfHook ]; - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - runHook preUnpack - dpkg --fsys-tarfile $src | tar --extract - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - mv usr/ $out/ - runHook postInstall - ''; - }; - - expressvpndFHS = buildFHSEnv { - name = "expressvpnd"; - - # When connected, it directly creates/deletes resolv.conf to change the DNS entries. - # Since it's running in an FHS environment, it has no effect on actual resolv.conf. - # Hence, place a watcher that updates host resolv.conf when FHS resolv.conf changes. - runScript = writeScript "${pname}-wrapper" '' - cp /host/etc/resolv.conf /etc/resolv.conf; - while inotifywait /etc 2>/dev/null; - do - cp /etc/resolv.conf /host/etc/resolv.conf; - done & - expressvpnd --client-version ${clientVersion} --client-build ${clientBuild} - ''; - - # expressvpnd binary has hard-coded the path /sbin/sysctl hence below workaround. - extraBuildCommands = '' - chmod +w sbin - ln -s ${sysctl}/bin/sysctl sbin/sysctl - ''; - - # The expressvpnd binary also uses hard-coded paths to the other binaries and files - # it ships with, hence the FHS environment. - - targetPkgs = pkgs: with pkgs; [ - expressvpnBase - inotify-tools - iproute2 - ]; - }; -in -stdenvNoCC.mkDerivation { - inherit pname version; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/share - ln -s ${expressvpnBase}/bin/expressvpn $out/bin - ln -s ${expressvpndFHS}/bin/expressvpnd $out/bin - ln -s ${expressvpnBase}/share/{bash-completion,doc,man} $out/share/ - runHook postInstall - ''; - - meta = with lib; { - description = "CLI client for ExpressVPN"; - homepage = "https://www.expressvpn.com"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ yureien ]; - }; -} diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix deleted file mode 100644 index cecad11a4f63..000000000000 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }: - -stdenv.mkDerivation { - pname = "rsstail"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "folkertvanheusden"; - repo = "rsstail"; - rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; - sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; - }; - - buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - - postPatch = '' - substituteInPlace Makefile --replace -liconv_hook "" - ''; - - makeFlags = [ "prefix=$(out)" ]; - enableParallelBuilding = true; - - # just runs cppcheck linter - doCheck = false; - - meta = with lib; { - description = "Monitor RSS feeds for new entries"; - mainProgram = "rsstail"; - longDescription = '' - RSSTail is more or less an RSS reader: it monitors an RSS feed and if it - detects a new entry it'll emit only that new entry. - ''; - homepage = "https://www.vanheusden.com/rsstail/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.Necior ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix deleted file mode 100644 index dfa28d8417d0..000000000000 --- a/pkgs/applications/networking/gnmic/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, buildPackages -}: - -buildGoModule rec { - pname = "gnmic"; - version = "0.38.2"; - - src = fetchFromGitHub { - owner = "openconfig"; - repo = pname; - rev = "v${version}"; - hash = "sha256-TSRexhhYny1L7znhjqPLudIMUYhyMQUmLClyXzsZxcY="; - }; - - vendorHash = "sha256-pJz613QFdA+8HcV+U0aG+A+WDZtSZIgaLVqCnu4WQWo="; - - ldflags = [ - "-s" "-w" - "-X" "github.com/openconfig/gnmic/app.version=${version}" - "-X" "github.com/openconfig/gnmic/app.commit=${src.rev}" - "-X" "github.com/openconfig/gnmic/app.date=1970-01-01T00:00:00Z" - ]; - subPackages = [ "." ]; - - nativeBuildInputs = [ installShellFiles ]; - postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' - installShellCompletion --cmd gnmic \ - --bash <(${emulator} $out/bin/gnmic completion bash) \ - --fish <(${emulator} $out/bin/gnmic completion fish) \ - --zsh <(${emulator} $out/bin/gnmic completion zsh) - ''; - - meta = with lib; { - description = "gNMI CLI client and collector"; - homepage = "https://gnmic.openconfig.net/"; - changelog = "https://github.com/openconfig/gnmic/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ vincentbernat ]; - mainProgram = "gnmic"; - }; -} diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index f654a96cb75d..f346b1148a30 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40="; + hash = "sha256-JtCjYZTVMID8iwm5mbK1qDxASfQK0H72rmnHIlpyi4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix deleted file mode 100644 index 4e1230e614e9..000000000000 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook3 -, alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL -, libinput, libpulseaudio, libsecret, libtiff, libxkbcommon -, mesa, openssl, systemd, xorg }: - -stdenv.mkDerivation rec { - pname = "alfaview"; - version = "9.14.0"; - - src = fetchurl { - url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-YBC6zjcxSnOOY3RSo0X1ixTY1to2vEEkj1/9rItLzNA="; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - autoPatchelfHook - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - dbus - fontconfig - freetype - glib - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-base - libGL - libinput - libpulseaudio - libsecret - libtiff - libxkbcommon - mesa - openssl - stdenv.cc.cc - systemd - xorg.libX11 - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - ]; - - libPath = lib.makeLibraryPath buildInputs; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - substituteInPlace $out/share/applications/alfaview.desktop \ - --replace "/opt/alfaview" "$out/bin" \ - --replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production - - makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \ - --prefix LD_LIBRARY_PATH : ${libPath} - - runHook postInstall - ''; - - meta = with lib; { - description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; - homepage = "https://alfaview.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = [ ]; - mainProgram = "alfaview"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 732f121f9dfa..62655ada43a9 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { freetype nspr glib - stdenv.cc.cc.lib + stdenv.cc.cc nss libX11 libXrandr diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ac97f0d52ffc..67b80ef18649 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,54 +9,54 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.72"; - ptb = "0.0.112"; - canary = "0.0.508"; - development = "0.0.32"; + stable = "0.0.73"; + ptb = "0.0.114"; + canary = "0.0.511"; + development = "0.0.42"; } else { - stable = "0.0.323"; - ptb = "0.0.142"; - canary = "0.0.617"; - development = "0.0.55"; + stable = "0.0.324"; + ptb = "0.0.144"; + canary = "0.0.620"; + development = "0.0.63"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-IAvlxs6oEdO//qVWwH0cBJEbDxyPLG6HHwmOgqMzRRU="; + hash = "sha256-LZ3IgtGr94NWbykYS5Xllkl4OOHLG66+ZqQ+OrpnVzs="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-wJIVKrP+F6IKeE7rT8vAmWRTtvWj9h3vKJDsPu8x2kQ="; + hash = "sha256-fdpG9V4EJaARSJA9XmW+Zq6exPaFMJ/FWhzwgarDIpI="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-zvjIVXZtYl9GdDCvKyuU+9+rNhRX4fGLpw9jPKEpFCs="; + hash = "sha256-srjYJFVM1UVpkB+koqrZfwgRAWpa7s8Arq2DnAFuaKs="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-Ec2kdoVA5NImT4afXi4GZ9GQF8NjT+h7qM7K3w3qrjU="; + hash = "sha256-HZdodWwczgxaGgal5gfr6NQlquf4ZO//QMVcebxQG7s="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-9ySE75TjVDLdPSWAawsVpOgCtL/Di+J3fKUEDH5/Oog="; + hash = "sha256-Q/PWTBTnmdNeZV+InLQ3nSpETYF3rzTq9nxEh9HEOWY="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-69ioQKRoQ1RTO39BdVppOuwQb/6ylnSy1luMAX5TCeQ="; + hash = "sha256-Xv8TPzfK1gOLG57F9gtt4PvwkCqjDQjYJmKfyNIkEZY="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-L/nnwHNPni93axBvXS4MH/NuoQbl7Ugva2sozVg6GEk="; + hash = "sha256-6rBDZPVYxS3q328d2T9LOs0DUirPbMg2GKDacCSsOG4="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-tZbFrb6OFEa3/IrjzHCcQultFgrMIvaNTmzNj3RHUgQ="; + hash = "sha256-E1qQUnwemS6SIHeO1BBifrCu706ldZH18isR7+nGNRU="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index c482ff0313b1..ebaac79e619b 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.82"; + "version" = "1.11.84"; "hashes" = { - "desktopSrcHash" = "sha256-XG8q37N4PehYKPyoedgsIIBp2jrSHtoSJKaGrsxaIM8="; - "desktopYarnHash" = "11130y915pa356fikk3i96w81ms41284x11d4xm1xw8385smjbgq"; - "webSrcHash" = "sha256-2W3noZfVnxpxwihimH6mlTxFpBpAdvXtLLfVHRiToxE="; - "webYarnHash" = "1rmimxkd70ynrf29s67336vv43g2i6ry8bibc06zb8qyicg6ld83"; + "desktopSrcHash" = "sha256-XpXyLMYaxXTnDeJJio729TFMLn5BpUQnSb4/Rn434uo="; + "desktopYarnHash" = "1wh867yw7ic3nx623c5dknn9wk4zgq9b000p9mdf79spfp57lqlw"; + "webSrcHash" = "sha256-va3r2Gk1zaP2fK/RGmU7wj52jVYo4PI5Gm/rRQGpuvo="; + "webYarnHash" = "0w48744ick4ji1vwh9ma6ywsb4j5hfq4knw86zqqh0ciflylcywc"; }; } diff --git a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock deleted file mode 100644 index 9be63cae42a0..000000000000 --- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ /dev/null @@ -1,6143 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "accessory" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87537f9ae7cfa78d5b8ebd1a1db25959f5e737126be4d8eb44a5452fc4b63cde" -dependencies = [ - "macroific", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "annotate-snippets" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - -[[package]] -name = "aquamarine" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" -dependencies = [ - "include_dir", - "itertools 0.10.5", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[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.71", -] - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] - -[[package]] -name = "as_variant" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" - -[[package]] -name = "ashpd" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "pipewire", - "rand", - "serde", - "serde_repr", - "tokio", - "tracing", - "url", - "zbus", -] - -[[package]] -name = "assign" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-once-cell" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" - -[[package]] -name = "async-process" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" -dependencies = [ - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "async-rx" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30de4e5329a0947e389f738a6ca0d0b938fea5cb7baaeae7d72e243614468a2" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-signal" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "async_cell" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atomic_refcell" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "axum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" -dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom", - "instant", - "pin-project-lite", - "rand", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "annotate-snippets", - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.71", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "bitmaps" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" - -[[package]] -name = "bitstream-io" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" - -[[package]] -name = "blake3" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - -[[package]] -name = "bs58" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "built" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" - -[[package]] -name = "bytesize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" - -[[package]] -name = "cairo-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" -dependencies = [ - "bitflags 2.6.0", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" -dependencies = [ - "glib-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cc" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -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" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", - "zeroize", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "const_panic" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cookie-factory" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" -dependencies = [ - "futures", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "rustc_version", - "serde", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.71", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "date_header" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" - -[[package]] -name = "deadpool" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" -dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "tokio", -] - -[[package]] -name = "deadpool-runtime" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" -dependencies = [ - "tokio", -] - -[[package]] -name = "deadpool-sqlite" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8010e36e12f3be22543a5e478b4af20aeead9a700dd69581a5e050a070fc22c" -dependencies = [ - "deadpool", - "deadpool-sync", - "rusqlite", -] - -[[package]] -name = "deadpool-sync" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" -dependencies = [ - "deadpool-runtime", -] - -[[package]] -name = "delegate-display" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a85201f233142ac819bbf6226e36d0b5e129a47bd325084674261c82d4cd66" -dependencies = [ - "macroific", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "der_derive", - "flagset", - "zeroize", -] - -[[package]] -name = "der_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core", - "syn 2.0.71", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "djb_hash" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" - -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "serde", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "subtle", - "zeroize", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener", - "pin-project-lite", -] - -[[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 = "eyeball" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" -dependencies = [ - "futures-core", - "readlock", - "tracing", -] - -[[package]] -name = "eyeball-im" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae8c5165c9770f3ec7cccce12f4c5d70f01fa8bf84cf30cfbfd5a1c6f8901d5" -dependencies = [ - "futures-core", - "imbl", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "eyeball-im-util" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b6b037e2cdce928a432ecc2880c944e5436d8a38c827974b882ad373f60037" -dependencies = [ - "arrayvec", - "eyeball-im", - "futures-core", - "imbl", - "pin-project-lite", - "smallvec", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fancy_constructor" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71f317e4af73b2f8f608fac190c52eac4b1879d2145df1db2fe48881ca69435" -dependencies = [ - "macroific", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "flagset" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[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 = "fractal" -version = "8.0.0" -dependencies = [ - "ashpd", - "djb_hash", - "futures-channel", - "futures-util", - "geo-uri", - "gettext-rs", - "gst-plugin-gtk4", - "gstreamer", - "gstreamer-base", - "gstreamer-pbutils", - "gstreamer-play", - "gstreamer-video", - "gtk4", - "image", - "indexmap", - "libadwaita", - "libshumate", - "linkify", - "matrix-sdk", - "matrix-sdk-ui", - "mime", - "mime_guess", - "once_cell", - "oo7", - "pulldown-cmark", - "qrcode", - "rand", - "regex", - "rmp-serde", - "rqrr", - "ruma", - "secular", - "serde", - "serde_json", - "sourceview5", - "strum", - "thiserror", - "tld", - "tokio", - "tokio-stream", - "tracing", - "tracing-subscriber", - "url", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "g2gen" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2c7625b2fc250dd90b63f7887a6bb0f7ec1d714c8278415bea2669ef20820e" -dependencies = [ - "g2poly", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "g2p" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc36d9bdc3d2da057775a9f4fa7d7b09edab3e0eda7a92cc353358fa63b8519e" -dependencies = [ - "g2gen", - "g2poly", -] - -[[package]] -name = "g2poly" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" - -[[package]] -name = "gdk-pixbuf" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gdk4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 7.0.1", -] - -[[package]] -name = "gdk4-win32" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afbcc8165b10f9143d2c4e4a589fce3a5071c6b20d75dd40704266d6eb4bb4" -dependencies = [ - "gdk4", - "gdk4-win32-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk4-win32-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198c0604ceb45732c76b1fdb696d92b99400ea3a1c549fc5e40f4d79f8033205" -dependencies = [ - "gdk4-sys", - "glib-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "geo-uri" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba35eb77ce72d7eefe4058c11cc816c6f9eb4f62ecc11c154b1d77d4d75399ce" -dependencies = [ - "derive_builder", - "thiserror", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "gio" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "glib" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" -dependencies = [ - "bitflags 2.6.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "glib-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" -dependencies = [ - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gobject-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "graphene-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps 7.0.1", -] - -[[package]] -name = "growable-bloom-filter" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "xxhash-rust", -] - -[[package]] -name = "gsk4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps 7.0.1", -] - -[[package]] -name = "gst-plugin-gtk4" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b98aeb531b6cf9c3a6eb36742cedc0168054e2f040b76ddc61260c10dec589" -dependencies = [ - "async-channel", - "gdk4-win32", - "gst-plugin-version-helper", - "gstreamer", - "gstreamer-base", - "gstreamer-gl", - "gstreamer-video", - "gtk4", - "once_cell", - "windows-sys 0.52.0", -] - -[[package]] -name = "gst-plugin-version-helper" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" -dependencies = [ - "chrono", - "toml_edit 0.22.16", -] - -[[package]] -name = "gstreamer" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e95b1d1153239a621ec143501fdcca6c1ad3efb87d268597285f85c4136f73" -dependencies = [ - "cfg-if", - "futures-channel", - "futures-core", - "futures-util", - "glib", - "gstreamer-sys", - "itertools 0.13.0", - "libc", - "muldiv", - "num-integer", - "num-rational", - "once_cell", - "option-operations", - "paste", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gstreamer-audio" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c434cbdde750d82853a978a59eb96e270c238d721a41bee0f37bfdc771f997" -dependencies = [ - "cfg-if", - "glib", - "gstreamer", - "gstreamer-audio-sys", - "gstreamer-base", - "libc", - "once_cell", - "smallvec", -] - -[[package]] -name = "gstreamer-audio-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb0542026fb062c2880d15e712c0814336e3209a054da43a64c14f7570da02f" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gstreamer-base" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3faa0b3cf361bf538dcb25b5cb7f6e73bd872ed031d85f3997b42d3fbd66409" -dependencies = [ - "atomic_refcell", - "cfg-if", - "glib", - "gstreamer", - "gstreamer-base-sys", - "libc", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gstreamer-gl" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe28e4b7c72022958add8a3d86e7293ff227a5086c426731b5ec5a15ffbc759" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-gl-sys", - "gstreamer-video", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-gl-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc2ff7c20ae47c4a80f42a67d85d6889a5fad3bc2385aec6dc9b58795920c5b" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gstreamer-pbutils" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05155dded8d67ecae23d22b9e8cad67e16b46f9f9fec161cabfda804716bba4c" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-audio", - "gstreamer-pbutils-sys", - "gstreamer-video", - "libc", - "thiserror", -] - -[[package]] -name = "gstreamer-pbutils-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a1711616229f46a5767b79eb3bf15cb5ab9be9a721dc00b857f1cd6454387ac" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-audio-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gstreamer-play" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc9fac3926d08f882d5a7b98fc7780b2ea812cbebc0c56c56c7186bde34fcdd" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-play-sys", - "gstreamer-video", - "libc", -] - -[[package]] -name = "gstreamer-play-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ffb862566a025cb5477089bbcdb15cc871e317ad451169835a2c06efaa7097" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gstreamer-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gstreamer-video" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57332bca1ae7825a53fe57d993b63389f132d335aed691ac76f0ffe4304548e3" -dependencies = [ - "cfg-if", - "futures-channel", - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-video-sys", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5c334d143384e8dc714af948c2e5d7d12cb588fdcfb56f3bf37c24daf350ef" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "gtk4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "gtk4-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps 7.0.1", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "html5ever" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[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", - "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 = "imbl" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb" -dependencies = [ - "bitmaps", - "imbl-sized-chunks", - "rand_core", - "rand_xoshiro", - "serde", - "version_check", -] - -[[package]] -name = "imbl-sized-chunks" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" -dependencies = [ - "bitmaps", -] - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indexed_db_futures" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cc2083760572ee02385ab8b7c02c20925d2dd1f97a1a25a8737a238608f1152" -dependencies = [ - "accessory", - "cfg-if", - "delegate-display", - "fancy_constructor", - "js-sys", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", - "serde", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[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.71", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "js_int" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" -dependencies = [ - "serde", -] - -[[package]] -name = "js_option" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" -dependencies = [ - "serde", -] - -[[package]] -name = "konst" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" -dependencies = [ - "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" -dependencies = [ - "typewit", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libadwaita" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" -dependencies = [ - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps 7.0.1", -] - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "libloading" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libshumate" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc9921cc829fb2d546bd6a3a158a4134002098887e0bb01ceb4535521af610ec" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libc", - "libshumate-sys", -] - -[[package]] -name = "libshumate-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b238767323bdd28dc72471fa8a512ad0ae99a18d9668deb626c55f373f7aff81" -dependencies = [ - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "libspa" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" -dependencies = [ - "bitflags 2.6.0", - "cc", - "convert_case", - "cookie-factory", - "libc", - "libspa-sys", - "nix 0.27.1", - "nom", - "system-deps 6.2.2", -] - -[[package]] -name = "libspa-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" -dependencies = [ - "bindgen", - "cc", - "system-deps 6.2.2", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linkify" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" -dependencies = [ - "memchr", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "macroific" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05c00ac596022625d01047c421a0d97d7f09a18e429187b341c201cb631b9dd" -dependencies = [ - "macroific_attr_parse", - "macroific_core", - "macroific_macro", -] - -[[package]] -name = "macroific_attr_parse" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd94d5da95b30ae6e10621ad02340909346ad91661f3f8c0f2b62345e46a2f67" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "macroific_core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "macroific_macro" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c9853143cbed7f1e41dc39fee95f9b361bec65c8dc2a01bf609be01b61f5ae" -dependencies = [ - "macroific_attr_parse", - "macroific_core", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" -dependencies = [ - "log", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "matrix-pickle" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" -dependencies = [ - "matrix-pickle-derive", - "thiserror", -] - -[[package]] -name = "matrix-pickle-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" -dependencies = [ - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "matrix-sdk" -version = "0.7.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "anymap2", - "aquamarine", - "as_variant", - "async-channel", - "async-stream", - "async-trait", - "axum", - "backoff", - "bytes", - "bytesize", - "event-listener", - "eyeball", - "eyeball-im", - "futures-core", - "futures-util", - "gloo-timers", - "http", - "image", - "imbl", - "indexmap", - "js_int", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-indexeddb", - "matrix-sdk-sqlite", - "mime", - "mime2ext", - "rand", - "reqwest", - "ruma", - "serde", - "serde_html_form", - "serde_json", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tracing", - "url", - "urlencoding", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-base" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "as_variant", - "async-trait", - "bitflags 2.6.0", - "eyeball", - "eyeball-im", - "futures-util", - "growable-bloom-filter", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "once_cell", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "matrix-sdk-common" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "async-trait", - "futures-core", - "futures-util", - "gloo-timers", - "instant", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "matrix-sdk-crypto" -version = "0.7.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "aes", - "as_variant", - "async-trait", - "bs58", - "byteorder", - "cbc", - "cfg-if", - "ctr", - "eyeball", - "futures-core", - "futures-util", - "hkdf", - "hmac", - "itertools 0.12.1", - "js_option", - "matrix-sdk-common", - "matrix-sdk-qrcode", - "pbkdf2", - "rand", - "rmp-serde", - "ruma", - "serde", - "serde_json", - "sha2", - "subtle", - "thiserror", - "time", - "tokio", - "tokio-stream", - "tracing", - "ulid", - "url", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-indexeddb" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "anyhow", - "async-trait", - "base64", - "getrandom", - "gloo-utils", - "hkdf", - "indexed_db_futures", - "js-sys", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "ruma", - "serde", - "serde-wasm-bindgen", - "serde_json", - "sha2", - "thiserror", - "tokio", - "tracing", - "wasm-bindgen", - "web-sys", - "zeroize", -] - -[[package]] -name = "matrix-sdk-qrcode" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "byteorder", - "qrcode", - "ruma-common", - "thiserror", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-sqlite" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "async-trait", - "deadpool-sqlite", - "itertools 0.12.1", - "matrix-sdk-base", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "rmp-serde", - "ruma", - "rusqlite", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-store-encryption" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "base64", - "blake3", - "chacha20poly1305", - "hmac", - "pbkdf2", - "rand", - "rmp-serde", - "serde", - "serde_json", - "sha2", - "thiserror", - "zeroize", -] - -[[package]] -name = "matrix-sdk-ui" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" -dependencies = [ - "as_variant", - "async-once-cell", - "async-rx", - "async-stream", - "async-trait", - "async_cell", - "chrono", - "eyeball", - "eyeball-im", - "eyeball-im-util", - "futures-core", - "futures-util", - "fuzzy-matcher", - "growable-bloom-filter", - "imbl", - "indexmap", - "itertools 0.12.1", - "matrix-sdk", - "matrix-sdk-base", - "mime", - "once_cell", - "pin-project-lite", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "unicode-normalization", -] - -[[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 = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime2ext" -version = "0.1.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "muldiv" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[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.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "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 = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -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-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[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.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oo7" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" -dependencies = [ - "endi", - "futures-util", - "num", - "num-bigint-dig", - "openssl", - "rand", - "serde", - "tokio", - "tracing", - "zbus", - "zeroize", - "zvariant", -] - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-operations" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" -dependencies = [ - "paste", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.1", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] -name = "pipewire" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" -dependencies = [ - "anyhow", - "bitflags 2.6.0", - "libc", - "libspa", - "libspa-sys", - "nix 0.27.1", - "once_cell", - "pipewire-sys", - "thiserror", -] - -[[package]] -name = "pipewire-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" -dependencies = [ - "bindgen", - "libspa-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "pkcs7" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79178be066405e0602bf3035946edef6b11b3f9dde46dfe5f8bfd7dea4b77e7" -dependencies = [ - "der", - "spki", - "x509-cert", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "3.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.71", -] - -[[package]] -name = "prost" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" -dependencies = [ - "anyhow", - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "pulldown-cmark" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" -dependencies = [ - "bitflags 2.6.0", - "getopts", - "memchr", - "pulldown-cmark-escape", - "unicase", -] - -[[package]] -name = "pulldown-cmark-escape" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "qrcode" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" -dependencies = [ - "image", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -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 6.2.2", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rayon", - "rgb", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "readlock" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072cfe5b1d2dcd38d20e18f85e9c9978b6cc08f0b373e9f1fff1541335622974" - -[[package]] -name = "redox_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "async-compression", - "base64", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tokio-native-tls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg", -] - -[[package]] -name = "rgb" -version = "0.8.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rqrr" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0cd0432e6beb2f86aa4c8af1bb5edcf3c9bcb9d4836facc048664205458575" -dependencies = [ - "g2p", - "image", - "lru", -] - -[[package]] -name = "ruma" -version = "0.10.1" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "assign", - "js_int", - "js_option", - "ruma-client-api", - "ruma-common", - "ruma-events", - "ruma-federation-api", - "ruma-html", - "ruma-push-gateway-api", - "web-time", -] - -[[package]] -name = "ruma-client-api" -version = "0.18.0" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "as_variant", - "assign", - "bytes", - "date_header", - "http", - "js_int", - "js_option", - "maplit", - "ruma-common", - "ruma-events", - "serde", - "serde_html_form", - "serde_json", - "thiserror", - "url", - "web-time", -] - -[[package]] -name = "ruma-common" -version = "0.13.0" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "as_variant", - "base64", - "bytes", - "form_urlencoded", - "getrandom", - "http", - "indexmap", - "js-sys", - "js_int", - "konst", - "percent-encoding", - "rand", - "regex", - "ruma-identifiers-validation", - "ruma-macros", - "serde", - "serde_html_form", - "serde_json", - "thiserror", - "time", - "tracing", - "url", - "uuid", - "web-time", - "wildmatch", -] - -[[package]] -name = "ruma-events" -version = "0.28.1" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "as_variant", - "indexmap", - "js_int", - "js_option", - "percent-encoding", - "pulldown-cmark", - "regex", - "ruma-common", - "ruma-html", - "ruma-identifiers-validation", - "ruma-macros", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "web-time", - "wildmatch", -] - -[[package]] -name = "ruma-federation-api" -version = "0.9.0" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "js_int", - "ruma-common", - "ruma-events", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-html" -version = "0.2.0" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "as_variant", - "html5ever", - "phf", - "ruma-common", - "tracing", - "wildmatch", -] - -[[package]] -name = "ruma-identifiers-validation" -version = "0.9.5" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "js_int", - "thiserror", -] - -[[package]] -name = "ruma-macros" -version = "0.13.0" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "ruma-identifiers-validation", - "serde", - "syn 2.0.71", - "toml", -] - -[[package]] -name = "ruma-push-gateway-api" -version = "0.9.0" -source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" -dependencies = [ - "js_int", - "ruma-common", - "ruma-events", - "serde", - "serde_json", -] - -[[package]] -name = "rusqlite" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" -dependencies = [ - "bitflags 2.6.0", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "secular" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3dc3eccdf599b53eba8a34a1190bd47394948258d1c43dca9cceb2426e25bb5" -dependencies = [ - "unicode-normalization", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -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.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "serde_html_form" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" -dependencies = [ - "form_urlencoded", - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_json" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "rand_core", -] - -[[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 = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "sourceview5" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" -dependencies = [ - "futures-channel", - "futures-core", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libc", - "pango", - "sourceview5-sys", -] - -[[package]] -name = "sourceview5-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" -dependencies = [ - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps 7.0.1", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.71", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "system-deps" -version = "7.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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 = "tld" -version = "2.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ca5fc340fcb4f52570c502cf443fc22d5521e9ef2bb03528e3634254016cf7" -dependencies = [ - "phf", - "phf_codegen", -] - -[[package]] -name = "tokio" -version = "1.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.16", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.13", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "typewit" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" -dependencies = [ - "typewit_proc_macros", -] - -[[package]] -name = "typewit_proc_macros" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset", - "tempfile", - "winapi", -] - -[[package]] -name = "ulid" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" -dependencies = [ - "getrandom", - "rand", - "web-time", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "uuid" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" -dependencies = [ - "getrandom", - "wasm-bindgen", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vodozemac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d4af70b53b42adf2aac459a305851b8d754f210aaf11ab509e1065beff422" -dependencies = [ - "aes", - "arrayvec", - "base64", - "base64ct", - "cbc", - "chacha20poly1305", - "curve25519-dalek", - "ed25519-dalek", - "getrandom", - "hkdf", - "hmac", - "matrix-pickle", - "pkcs7", - "prost", - "rand", - "serde", - "serde_bytes", - "serde_json", - "sha2", - "subtle", - "thiserror", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.71", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wildmatch" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -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.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "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]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[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", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "x509-cert" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" -dependencies = [ - "const-oid", - "der", - "spki", -] - -[[package]] -name = "xdg-home" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "xxhash-rust" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" - -[[package]] -name = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] - -[[package]] -name = "zbus" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" -dependencies = [ - "async-broadcast", - "async-process", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.71", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[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.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "url", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.71", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix deleted file mode 100644 index d5f1f4fae8f2..000000000000 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, nix-update-script -, cargo -, meson -, ninja -, rustPlatform -, rustc -, pkg-config -, glib -, gtk4 -, gtksourceview5 -, libadwaita -, gst_all_1 -, desktop-file-utils -, appstream-glib -, openssl -, pipewire -, libshumate -, wrapGAppsHook4 -, sqlite -, xdg-desktop-portal -}: - -stdenv.mkDerivation rec { - pname = "fractal"; - version = "8"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "fractal"; - rev = "refs/tags/${version}"; - hash = "sha256-a77+lPH2eqWTLFrYfcBXSvbyyYC52zSo+Rh/diqKYx4="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "matrix-sdk-0.7.1" = "sha256-ZlkxGXGrmZ8VQV7UY7A7BBfcqFCAB9Ep7l65irx4Dy8="; - "ruma-0.10.1" = "sha256-C/GJ0hDWJ9/grfjMuPSatJq2SrVkV0jxQlAAASkUWqg="; - }; - }; - - nativeBuildInputs = [ - glib - gtk4 - meson - ninja - pkg-config - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - cargo - rustc - desktop-file-utils - appstream-glib - wrapGAppsHook4 - ]; - - buildInputs = [ - glib - gtk4 - gtksourceview5 - libadwaita - openssl - pipewire - libshumate - sqlite - xdg-desktop-portal - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-bad - gst-plugins-good - ]); - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Matrix group messaging app"; - homepage = "https://gitlab.gnome.org/GNOME/fractal"; - changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - mainProgram = "fractal"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index dcbb29e61afc..5009ab5af0df 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation (rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ libglvnd stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; + runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix deleted file mode 100644 index b1c2c9cc100d..000000000000 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, openjdk21_headless, libmatthew_java, dbus, dbus_java }: - -stdenv.mkDerivation rec { - pname = "signal-cli"; - version = "0.13.7"; - - # 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-KeSKupExFIaLKdkXJw+UTclNaiMfrIomCec6GUV0E7M="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ]; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -r lib $out/lib - cp bin/signal-cli $out/bin/signal-cli - '' + (if stdenv.hostPlatform.isLinux then '' - makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${openjdk21_headless}" \ - --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ - --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ - --add-flags "org.asamk.signal.Main" - '' else '' - wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \ - --set JAVA_HOME ${openjdk21_headless} - ''); - - # Execution in the macOS (10.13) sandbox fails with - # dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa - # Referenced from: /nix/store/5ghc2l65p8jcjh0bsmhahd5m9k5p8kx0-zulu1.8.0_121-8.20.0.5/bin/java - # Reason: no suitable image found. Did find: - # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() - # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() - # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version - doInstallCheck = stdenv.hostPlatform.isLinux; - - installCheckPhase = '' - export PATH=$PATH:$out/bin - # --help returns non-0 exit code even when working - signal-cli --version - ''; - - meta = with lib; { - homepage = "https://github.com/AsamK/signal-cli"; - description = "Command-line and dbus interface for communicating with the Signal messaging service"; - mainProgram = "signal-cli"; - changelog = "https://github.com/AsamK/signal-cli/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3; - maintainers = with maintainers; [ ivan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 85e9b9c9f667..77754a0122e1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -157,6 +157,7 @@ stdenv.mkDerivation rec { libXrender libXtst libappindicator-gtk3 + libpulseaudio libnotify libuuid mesa # for libgbm @@ -236,7 +237,7 @@ stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace-fail "/opt/${dir}/${pname}" $out/bin/${pname} \ --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" # Note: The following path contains bundled libraries: diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 0cf36580bd08..fa07e2d1e477 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.30.0-beta.2"; + version = "7.33.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0="; + hash = "sha256-17ZSdfGS28OqXb0UBbel+tR8UTh07pPQNIoKmuUtzZ0="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 27a7a0156468..f1fc184a8b12 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.29.0"; + version = "7.32.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-TftTt9pN4EjgZs3N94TlCzXK64g1g+oGPx1ZLVX02VA="; + hash = "sha256-3D1Pou+x8mJBzWAKRq8YDcFOJXKKnA8ksMJ3SR8C+SU="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix deleted file mode 100644 index 9c28a80aa497..000000000000 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - - cmake, - pkg-config, - - darwin, - dbus, - openssl, - sqlite, -}: - -stdenv.mkDerivation rec { - pname = "signalbackup-tools"; - version = "20241025"; - - src = fetchFromGitHub { - owner = "bepaald"; - repo = "signalbackup-tools"; - rev = version; - hash = "sha256-ivk7sqTP5kLXrTn+XDrat0VxiK0atA5xI3TzKXvxaV0="; - }; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = [ - openssl - sqlite - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - dbus - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp signalbackup-tools $out/bin/ - runHook postInstall - ''; - - meta = with lib; { - description = "Tool to work with Signal Backup files"; - mainProgram = "signalbackup-tools"; - homepage = "https://github.com/bepaald/signalbackup-tools"; - license = licenses.gpl3Only; - maintainers = [ maintainers.malo ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix deleted file mode 100644 index 6131e64e9152..000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, -gradle, git, makeWrapper, jre_minimal -}: - -let - pname = "signald"; - version = "0.23.2"; - - src = fetchFromGitLab { - owner = pname; - repo = pname; - rev = version; - hash = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; - }; - - jre' = jre_minimal.override { - jdk = jdk17_headless; - # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 - modules = [ - "java.base" - "java.management" - "java.naming" - "java.sql" - "java.xml" - "jdk.crypto.ec" - "jdk.httpserver" - - # for java/beans/PropertyChangeEvent - "java.desktop" - # for sun/misc/Unsafe - "jdk.unsupported" - ]; - }; - -in stdenv.mkDerivation { - inherit pname src version; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; - - gradleBuildTask = "distTar"; - - installPhase = '' - runHook preInstall - - mkdir -p $out - tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ - wrapProgram $out/bin/signald \ - --prefix PATH : ${lib.makeBinPath [ coreutils findutils gnused ]} \ - --set JAVA_HOME "${jre'}" - - runHook postInstall - ''; - - nativeBuildInputs = [ git gradle makeWrapper ]; - - doCheck = true; - - gradleUpdateScript = '' - runHook preBuild - - SIGNALD_TARGET=x86_64-unknown-linux-gnu gradle nixDownloadDeps - SIGNALD_TARGET=aarch64-unknown-linux-gnu gradle nixDownloadDeps - SIGNALD_TARGET=x86_64-apple-darwin gradle nixDownloadDeps - SIGNALD_TARGET=aarch64-apple-darwin gradle nixDownloadDeps - ''; - - meta = with lib; { - description = "Unofficial daemon for interacting with Signal"; - longDescription = '' - Signald is a daemon that facilitates communication over Signal. It is - unofficial, unapproved, and not nearly as secure as the real Signal - clients. - ''; - homepage = "https://signald.org"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 14fef76ef438..7640d72c670d 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -138,7 +138,7 @@ let xorg.libXtst xorg.libxkbfile xorg.libxshmfence - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${lib.getLib stdenv.cc.cc}/lib64"; buildInputs = [ gtk3 # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix deleted file mode 100644 index 6aa7e45ac117..000000000000 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchzip, - makeWrapper, - makeDesktopItem, - zlib, - glib, - libpng, - freetype, - openssl, - xorg, - fontconfig, - qtbase, - qtwebengine, - qtwebchannel, - qtsvg, - qtwebsockets, - xkeyboard_config, - alsa-lib, - libpulseaudio ? null, - libredirect, - quazip, - which, - perl, - llvmPackages, -}: - -let - - arch = "amd64"; - - libDir = "lib64"; - - deps = [ - zlib - glib - libpng - freetype - xorg.libSM - xorg.libICE - xorg.libXrender - openssl - xorg.libXrandr - xorg.libXfixes - xorg.libXcursor - xorg.libXinerama - xorg.libxcb - fontconfig - xorg.libXext - xorg.libX11 - alsa-lib - qtbase - qtwebengine - qtwebchannel - qtsvg - qtwebsockets - libpulseaudio - quazip - llvmPackages.libcxx - ]; - - desktopItem = makeDesktopItem { - name = "teamspeak"; - exec = "ts3client"; - icon = "teamspeak"; - comment = "The TeamSpeak voice communication tool"; - desktopName = "TeamSpeak"; - genericName = "TeamSpeak"; - categories = [ "Network" ]; - }; -in - -stdenv.mkDerivation rec { - pname = "teamspeak-client"; - - version = "3.6.2"; - - src = fetchurl { - url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; - hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI="; - }; - - # grab the plugin sdk for the desktop icon - pluginsdk = fetchzip { - url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip"; - hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ="; - }; - - nativeBuildInputs = [ - makeWrapper - which - perl # Installer script needs `shasum` - ]; - - # This just runs the installer script. If it gets stuck at something like - # ++ exec - # + PAGER_PATH= - # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs. - unpackPhase = '' - echo -e '\ny' | PAGER=cat sh -xe $src - cd TeamSpeak* - ''; - - buildPhase = '' - mv ts3client_linux_${arch} ts3client - echo "patching ts3client..." - patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ - --force-rpath \ - ts3client - ''; - - installPhase = - '' - # Delete unecessary libraries - these are provided by nixos. - rm *.so.* *.so - rm QtWebEngineProcess - rm qt.conf - rm -r platforms # contains libqxcb.so - - # Install files. - mkdir -p $out/lib/teamspeak - mv * $out/lib/teamspeak/ - - # Make a desktop item - mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/ - cp ${pluginsdk}/doc/_static/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png - cp ${desktopItem}/share/applications/* $out/share/applications/ - - # Make a symlink to the binary from bin. - mkdir -p $out/bin/ - ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client - - wrapProgram $out/bin/ts3client \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ - '' # wayland is currently broken, remove when TS3 fixes that - + '' - --set QT_QPA_PLATFORM xcb \ - --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb - ''; - - dontStrip = true; - dontPatchELF = true; - - meta = with lib; { - description = "TeamSpeak voice communication tool"; - homepage = "https://teamspeak.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = { - # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak. - fullName = "Teamspeak client license"; - url = "https://www.teamspeak.com/en/privacy-and-terms/"; - free = false; - }; - maintainers = with maintainers; [ - lhvwb - lukegb - atemu - ]; - mainProgram = "ts3client"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0c3b4e98721..36b350daf944 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,196 +1,78 @@ -{ lib -, stdenv -, fetchFromGitHub -, callPackage -, pkg-config -, cmake -, ninja -, clang -, lld -, python3 -, wrapQtAppsHook -, removeReferencesTo -, qtbase -, qtimageformats -, qtsvg -, qtwayland -, kcoreaddons -, lz4 -, xxHash -, ffmpeg -, openalSoft -, minizip -, libopus -, alsa-lib -, libpulseaudio -, range-v3 -, tl-expected -, hunspell -, gobject-introspection -, jemalloc -, rnnoise -, microsoft-gsl -, boost -, libicns -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + libsForQt5, + yasm, + withWebkit ? true, }: let - tg_owt = callPackage ./tg_owt.nix { - # tg_owt should use the same compiler - inherit stdenv; - }; + telegram-desktop = libsForQt5.callPackage ../telegram-desktop { inherit stdenv; }; + version = "1.4.9"; + tg_owt = telegram-desktop.tg_owt.overrideAttrs (oldAttrs: { + version = "0-unstable-2024-06-15"; - mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + fetchSubmodules = true; + }; + + patches = (oldAttrs.patches or [ ]) ++ [ + (fetchpatch { + url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "src/"; + hash = "sha256-goxnuRRbwcdfIk1jFaKGiKCTCYn2saEj7En1Iyglzko="; + }) + ]; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; + }); in -stdenv.mkDerivation rec { +telegram-desktop.override { pname = "kotatogram-desktop"; - version = "1.4.9-unstable-2024-09-27"; + inherit withWebkit; + unwrapped = (telegram-desktop.unwrapped.override { inherit tg_owt; }).overrideAttrs { + pname = "kotatogram-desktop-unwrapped"; + version = "${version}-unstable-2024-09-27"; - src = fetchFromGitHub { - owner = "kotatogram"; - repo = "kotatogram-desktop"; - rev = "0581eb6219343b3cfcbb81124b372df1039b7568"; - hash = "sha256-rvn8GZmHdMkVutLUe/LmUNIawlb9VgU3sYhPwZ2MWsI="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "kotatogram"; + repo = "kotatogram-desktop"; + rev = "0581eb6219343b3cfcbb81124b372df1039b7568"; + hash = "sha256-rvn8GZmHdMkVutLUe/LmUNIawlb9VgU3sYhPwZ2MWsI="; + fetchSubmodules = true; + }; - patches = [ - ./macos.patch - ./macos-opengl.patch - ./macos-qt5.patch - ]; + patches = [ + ./macos-qt5.patch + (fetchpatch { + url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; + stripLen = 1; + extraPrefix = "cmake/external/glib/cppgir/"; + hash = "sha256-8B4h3BTG8dIlt3+uVgBI569E9eCebcor9uohtsrZpnI="; + }) + ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ - --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster - ''; + meta = with lib; { + description = "Kotatogram – experimental Telegram Desktop fork"; + longDescription = '' + Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. - # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - nativeBuildInputs = [ - pkg-config - cmake - ninja - python3 - wrapQtAppsHook - removeReferencesTo - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # to build bundled libdispatch - clang - gobject-introspection - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld - ]; - - buildInputs = [ - qtbase - qtimageformats - qtsvg - lz4 - xxHash - ffmpeg - openalSoft - minizip - libopus - range-v3 - tl-expected - rnnoise - tg_owt - microsoft-gsl - boost - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - kcoreaddons - alsa-lib - libpulseaudio - hunspell - jemalloc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - libicns - ]); - - enableParallelBuilding = true; - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - - cmakeFlags = [ - "-DTDESKTOP_API_TEST=ON" - ]; - - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} - ''; - - preFixup = '' - remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram} - remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram} - remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} - ''; - - passthru = { - inherit tg_owt; - }; - - meta = with lib; { - inherit mainProgram; - description = "Kotatogram – experimental Telegram Desktop fork"; - longDescription = '' - Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. - - It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes - ''; - license = licenses.gpl3; - platforms = platforms.all; - homepage = "https://kotatogram.github.io"; - changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; - maintainers = with maintainers; [ ilya-fedin ]; + It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes + ''; + license = licenses.gpl3Only; + platforms = platforms.all; + homepage = "https://kotatogram.github.io"; + changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k${version}"; + maintainers = with maintainers; [ ilya-fedin ]; + mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; + }; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch deleted file mode 100644 index e81bd53b440c..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp -index 655e7cf410..c356acbffe 100644 ---- a/Telegram/SourceFiles/media/view/media_view_pip.cpp -+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp -@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { - Ui::GL::ChosenRenderer Pip::chooseRenderer( - Ui::GL::Capabilities capabilities) { - const auto use = Platform::IsMac() -- ? true -+ ? false - : capabilities.transparency; - LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); - if (use) { -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp -index 150eb8b..c7ce9f9 100644 ---- a/Telegram/lib_ui/ui/gl/gl_detection.cpp -+++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp -@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { - - Backend ChooseBackendDefault(Capabilities capabilities) { - const auto use = ::Platform::IsMac() -- ? true -+ ? false - : ::Platform::IsWindows() - ? capabilities.supported - : capabilities.transparency; -diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -index 7b29363..22c4fb3 100644 ---- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -+++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - #include - - @interface WindowObserver : NSObject { -@@ -138,7 +137,6 @@ public: - - private: - void init(); -- void initOpenGL(); - void resolveWeakPointers(); - void revalidateWeakPointers() const; - void initCustomTitle(); -@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { - } - } - --void WindowHelper::Private::initOpenGL() { -- auto forceOpenGL = std::make_unique(_owner->window()); --} -- - void WindowHelper::Private::resolveWeakPointers() { - if (!_owner->window()->winId()) { - _owner->window()->createWinId(); -@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { - } - - void WindowHelper::Private::init() { -- initOpenGL(); - resolveWeakPointers(); - initCustomTitle(); - } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch deleted file mode 100644 index 941e5f80526b..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index e7808fc..34020f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -334,6 +334,7 @@ Instance::Instance(Config config) { - _handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest]; - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; -+#if 0 - if (@available(macOS 14, *)) { - if (config.userDataToken != LegacyStorageIdToken().toStdString()) { - NSUUID *uuid = UuidFromToken(config.userDataToken); -@@ -341,10 +342,13 @@ Instance::Instance(Config config) { - [uuid release]; - } - } -+#endif - _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; -+#if 0 - if (@available(macOS 13.3, *)) { - _webview.inspectable = config.debug ? YES : NO; - } -+#endif - [_manager addScriptMessageHandler:_handler name:@"external"]; - [_webview setNavigationDelegate:_handler]; - [_webview setUIDelegate:_handler]; -@@ -700,10 +704,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { -@@ -739,6 +745,7 @@ std::string GenerateStorageToken() { - } - - void ClearStorageDataByToken(const std::string &token) { -+#if 0 - if (@available(macOS 14, *)) { - if (!token.empty() && token != LegacyStorageIdToken().toStdString()) { - if (NSUUID *uuid = UuidFromToken(token)) { -@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) { - } - } - } -+#endif - } - - } // namespace Webview diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix deleted file mode 100644 index 922efe2d7bf0..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, cmake -, ninja -, yasm -, libjpeg -, openssl -, libopus -, ffmpeg -, protobuf -, openh264 -, crc32c -, libvpx -, libX11 -, libXtst -, libXcomposite -, libXdamage -, libXext -, libXrender -, libXrandr -, libXi -, glib -, abseil-cpp -, pipewire -, mesa -, libdrm -, libGL -, darwin -}: - -stdenv.mkDerivation { - pname = "tg_owt"; - version = "0-unstable-2024-06-15"; - - src = fetchFromGitHub { - owner = "desktop-app"; - repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; - fetchSubmodules = true; - }; - - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ - --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ - --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ - --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ - --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - - propagatedBuildInputs = [ - libjpeg - openssl - libopus - ffmpeg - protobuf - openh264 - crc32c - libvpx - abseil-cpp - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXtst - libXcomposite - libXdamage - libXext - libXrender - libXrandr - libXi - glib - pipewire - mesa - libdrm - libGL - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ]); - - enableParallelBuilding = true; - - meta.license = lib.licenses.bsd3; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix deleted file mode 100644 index f41713389679..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }: - -stdenv.mkDerivation { - pname = "${kotatogram-desktop.pname}-with-webkit"; - version = kotatogram-desktop.version; - nativeBuildInputs = [ makeWrapper ]; - dontUnpack = true; - installPhase = '' - mkdir -p $out - cp -r ${kotatogram-desktop}/share $out - ''; - postFixup = '' - mkdir -p $out/bin - makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ - --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]} - ''; - meta = kotatogram-desktop.meta // { - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 6f6246702894..aec348dfa91c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,236 +1,73 @@ -{ lib -, fetchFromGitHub -, callPackage -, pkg-config -, cmake -, ninja -, python3 -, gobject-introspection -, wrapGAppsHook3 -, wrapQtAppsHook -, extra-cmake-modules -, qtbase -, qtwayland -, qtsvg -, qtimageformats -, gtk3 -, glib-networking -, boost -, fmt -, libdbusmenu -, lz4 -, xxHash -, ffmpeg -, openalSoft -, minizip -, libopus -, alsa-lib -, libpulseaudio -, pipewire -, range-v3 -, tl-expected -, hunspell -, webkitgtk_6_0 -, jemalloc -, rnnoise -, protobuf -, abseil-cpp -, xdg-utils -, microsoft-gsl -, rlottie -, ada -, stdenv -, darwin -, lld -, libicns -, nix-update-script +{ + callPackage, + lib, + stdenv, + pname ? "telegram-desktop", + unwrapped ? callPackage ./unwrapped.nix { inherit stdenv; }, + qtbase, + qtimageformats, + qtsvg, + qtwayland, + wrapGAppsHook3, + wrapQtAppsHook, + glib-networking, + webkitgtk_4_1, + withWebkit ? true, }: - -# Main reference: -# - This package was originally based on the Arch package but all patches are now upstreamed: -# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop -# Other references that could be useful: -# - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD -# - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template - -let - tg_owt = callPackage ./tg_owt.nix { - inherit stdenv; - abseil-cpp = abseil-cpp.override { - cxxStandard = "20"; - }; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "telegram-desktop"; - version = "5.6.3"; + inherit pname; + inherit (unwrapped) version meta passthru; - src = fetchFromGitHub { - owner = "telegramdesktop"; - repo = "tdesktop"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y="; - }; + inherit unwrapped; - patches = [ - ./macos.patch - # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling - # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary - # see https://github.com/NixOS/nixpkgs/issues/218370 - ./scheme.patch + nativeBuildInputs = + [ + wrapQtAppsHook + ] + ++ lib.optionals withWebkit [ + wrapGAppsHook3 + ]; + + buildInputs = + [ + qtbase + qtimageformats + qtsvg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + ] + ++ lib.optionals withWebkit [ + glib-networking + ]; + + qtWrapperArgs = lib.optionals (stdenv.hostPlatform.isLinux && withWebkit) [ + "--prefix" + "LD_LIBRARY_PATH" + ":" + (lib.makeLibraryPath [ webkitgtk_4_1 ]) ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ - --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ - --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster - ''; - - # We want to run wrapProgram manually (with additional parameters) + dontUnpack = true; dontWrapGApps = true; - dontWrapQtApps = true; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; - nativeBuildInputs = [ - pkg-config - cmake - ninja - python3 - wrapQtAppsHook - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - gobject-introspection - wrapGAppsHook3 - extra-cmake-modules - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld - ]; - - buildInputs = [ - qtbase - qtsvg - qtimageformats - boost - lz4 - xxHash - ffmpeg - openalSoft - minizip - libopus - range-v3 - tl-expected - rnnoise - protobuf - tg_owt - microsoft-gsl - rlottie - ada - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - gtk3 - glib-networking - fmt - libdbusmenu - alsa-lib - libpulseaudio - pipewire - hunspell - webkitgtk_6_0 - jemalloc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - LocalAuthentication - libicns - ]); - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - - cmakeFlags = [ - (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) - # We're allowed to used the API ID of the Snap package: - (lib.cmakeFeature "TDESKTOP_API_ID" "611335") - (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") - # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 - (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false) - ]; - - preBuild = '' - # for cppgir to locate gir files - export GI_GIR_PATH="$XDG_DATA_DIRS" + installPhase = '' + runHook preInstall + cp -r "$unwrapped" "$out" + runHook postInstall ''; - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications - ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withWebkit) '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - # This is necessary to run Telegram in a pure environment. - # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} - ''; - - passthru = { - inherit tg_owt; - updateScript = nix-update-script { }; - }; - - meta = { - description = "Telegram Desktop messaging app"; - longDescription = '' - Desktop client for the Telegram messenger, based on the Telegram API and - the MTProto secure protocol. + postFixup = + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapQtApp "$out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram}" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace $out/share/dbus-1/services/* \ + --replace-fail "$unwrapped" "$out" ''; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.all; - homepage = "https://desktop.telegram.org/"; - changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ nickcao ]; - mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; - }; }) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch deleted file mode 100644 index 37b13b6844f3..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index 738e574..80ff5f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -314,9 +314,11 @@ Instance::Instance(Config config) { - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; - _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; -+#if 0 - if (@available(macOS 13.3, *)) { - _webview.inspectable = config.debug ? YES : NO; - } -+#endif - [_manager addScriptMessageHandler:_handler name:@"external"]; - [_webview setNavigationDelegate:_handler]; - [_webview setUIDelegate:_handler]; -@@ -658,10 +660,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch deleted file mode 100644 index 58aaa8a7fcb5..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp -index e3e0de6c6..d5851bd6e 100644 ---- a/Telegram/SourceFiles/core/application.cpp -+++ b/Telegram/SourceFiles/core/application.cpp -@@ -421,7 +421,6 @@ void Application::run() { - - void Application::autoRegisterUrlScheme() { - if (!OptionSkipUrlSchemeRegister.value()) { -- InvokeQueued(this, [] { RegisterUrlScheme(); }); - } - } - diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 425b82f15d9b..a0cf6de02363 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -2,57 +2,54 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, pkg-config, cmake, - crc32c, + ninja, python3, libjpeg, openssl, libopus, - ffmpeg, + ffmpeg_6, openh264, + crc32c, libvpx, - libXi, - libXfixes, + libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, + libXi, glib, abseil-cpp, pipewire, mesa, + libdrm, libGL, + apple-sdk_15, unstableGitUpdater, - darwin, }: stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-08-04"; + version = "0-unstable-2024-10-28"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; - sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; + rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79"; + hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA="; fetchSubmodules = true; }; - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ + --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ + --replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \ + --replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \ + --replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"' + ''; outputs = [ "out" @@ -60,63 +57,41 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - cmake pkg-config + cmake + ninja python3 ]; - buildInputs = + propagatedBuildInputs = [ - openssl libjpeg + openssl libopus - ffmpeg + ffmpeg_6 + openh264 + crc32c + libvpx + abseil-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib - libXi + libX11 + libXtst libXcomposite libXdamage libXext - libXfixes libXrender libXrandr - libXtst + libXi + glib pipewire mesa + libdrm libGL ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - Metal - MetalKit - CoreFoundation - ApplicationServices - ] - ); - - propagatedBuildInputs = [ - abseil-cpp - crc32c - openh264 - libvpx - ]; - - cmakeFlags = [ - # Building as a shared library isn't officially supported and may break at any time. - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix new file mode 100644 index 000000000000..33b9573b9720 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -0,0 +1,150 @@ +{ + lib, + stdenv, + fetchFromGitHub, + callPackage, + pkg-config, + cmake, + ninja, + clang, + python3, + tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; }, + qtbase, + qtimageformats, + qtsvg, + qtwayland, + kcoreaddons, + lz4, + xxHash, + ffmpeg_6, + protobuf, + openalSoft, + minizip, + libopus, + alsa-lib, + libpulseaudio, + range-v3, + tl-expected, + hunspell, + gobject-introspection, + jemalloc, + rnnoise, + microsoft-gsl, + boost, + ada, + libicns, + apple-sdk_15, + nix-update-script, +}: + +# Main reference: +# - This package was originally based on the Arch package but all patches are now upstreamed: +# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop +# Other references that could be useful: +# - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD +# - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template + +stdenv.mkDerivation (finalAttrs: { + pname = "telegram-desktop-unwrapped"; + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "telegramdesktop"; + repo = "tdesktop"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-MPVm9WfAjF11sy0hyhDTI/mM2OsENSMavnVrOwXTGUk="; + }; + + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ + --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ + --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ + --replace-fail '"libpulse.so.0"' '"${lib.getLib libpulseaudio}/lib/libpulse.so.0"' + ''; + + nativeBuildInputs = + [ + pkg-config + cmake + ninja + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # to build bundled libdispatch + clang + gobject-introspection + ]; + + buildInputs = + [ + qtbase + qtimageformats + qtsvg + lz4 + xxHash + ffmpeg_6 + openalSoft + minizip + libopus + range-v3 + tl-expected + rnnoise + tg_owt + microsoft-gsl + boost + ada + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + protobuf + qtwayland + kcoreaddons + alsa-lib + libpulseaudio + hunspell + jemalloc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + libicns + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + # We're allowed to used the API ID of the Snap package: + (lib.cmakeFeature "TDESKTOP_API_ID" "611335") + (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") + ]; + + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + + mkdir -p $out/Applications + cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications + ln -sr $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} + + runHook postInstall + ''; + + passthru = { + inherit tg_owt; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Telegram Desktop messaging app"; + longDescription = '' + Desktop client for the Telegram messenger, based on the Telegram API and + the MTProto secure protocol. + ''; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + homepage = "https://desktop.telegram.org/"; + changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ nickcao ]; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix deleted file mode 100644 index 89688c3ecadf..000000000000 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ /dev/null @@ -1,247 +0,0 @@ -{ - lib, - stdenv, - patchelf, - makeWrapper, - fetchurl, - writeScript, - - # Libraries - glib, - fontconfig, - freetype, - pango, - cairo, - libX11, - libXi, - atk, - nss, - nspr, - libXcursor, - libXext, - libXfixes, - libXrender, - libXScrnSaver, - libXcomposite, - libxcb, - alsa-lib, - libXdamage, - libXtst, - libXrandr, - libxshmfence, - expat, - cups, - dbus, - gtk3, - gtk4, - gdk-pixbuf, - gcc-unwrapped, - at-spi2-atk, - at-spi2-core, - libkrb5, - libdrm, - libglvnd, - mesa, - libxkbcommon, - pipewire, - wayland, - - coreutils, - - # command line arguments which are always set e.g "--disable-gpu" - commandLineArgs ? "", - - systemd, - - # Loaded at runtime. - libexif, - pciutils, - - liberation_ttf, - curl, - util-linux, - xdg-utils, - wget, - flac, - harfbuzz, - icu, - libpng, - libopus, - snappy, - speechd, - bzip2, - libcap, - - # Necessary for USB audio devices. - pulseSupport ? true, - libpulseaudio, - - gsettings-desktop-schemas, - - # Allow video acceleration via VA-API to be disabled on systems where is doesn't - # work reliably (--enable-features=VaapiVideoDecoder) - libvaSupport ? true, - libva, - - # For Vulkan support (--enable-features=Vulkan) - addDriverRunpath, -}: - -let - opusWithCustomModes = libopus.override { withCustomModes = true; }; - - deps = - [ - glib - fontconfig - freetype - pango - cairo - libX11 - libXi - atk - nss - nspr - libXcursor - libXext - libXfixes - libXrender - libXScrnSaver - libXcomposite - libxcb - alsa-lib - libXdamage - libXtst - libXrandr - libxshmfence - expat - cups - dbus - gdk-pixbuf - gcc-unwrapped.lib - systemd - libexif - pciutils - liberation_ttf - curl - util-linux - wget - flac - harfbuzz - icu - libpng - opusWithCustomModes - snappy - speechd - bzip2 - libcap - at-spi2-atk - at-spi2-core - libkrb5 - libdrm - libglvnd - mesa - coreutils - libxkbcommon - pipewire - wayland - ] - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional libvaSupport libva - ++ [ - gtk3 - gtk4 - ]; - -in -stdenv.mkDerivation (finalAttrs: { - pname = "wavebox"; - version = "10.129.29-2"; - - src = fetchurl { - url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-HGzBvCv6ASW2wXMd0BrA6NNGAEsuN2yHwS+0WbABfWM="; - }; - - nativeBuildInputs = [ - patchelf - makeWrapper - ]; - buildInputs = [ - gsettings-desktop-schemas # needed for GSETTINGS_SCHEMAS_PATH - glib - gtk3 - ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.xz - ''; - - rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; - - installPhase = '' - runHook preInstall - - exe=$out/bin/wavebox - - mkdir -p $out/bin $out/share - - cp -a opt/* $out/share - cp -a usr/share/* $out/share - - - substituteInPlace $out/share/wavebox.io/wavebox/wavebox-launcher \ - --replace-fail 'CHROME_WRAPPER' 'WRAPPER' - substituteInPlace $out/share/applications/wavebox.desktop \ - --replace-fail /opt/wavebox.io/wavebox/wavebox-launcher $exe - substituteInPlace $out/share/menu/wavebox.menu \ - --replace-fail /opt $out/share \ - --replace-fail $out/share/wavebox.io/wavebox/wavebox $exe - - for icon_file in $out/share/wavebox.io/wavebox/product_logo_[0-9]*.png; do - num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" - logo_output_prefix="$out/share/icons/hicolor" - logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" - mkdir -p "$logo_output_path" - mv "$icon_file" "$logo_output_path/wavebox.png" - done - - makeWrapper "$out/share/wavebox.io/wavebox/wavebox" "$exe" \ - --prefix LD_LIBRARY_PATH : "$rpath" \ - --prefix PATH : "${lib.makeBinPath deps}" \ - --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ - --set CHROME_WRAPPER "wavebox" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - - for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do - patchelf --set-rpath $rpath $elf - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf - done - - runHook postInstall - ''; - - passthru = { - updateScript = writeScript "update-wavebox.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p nix-update curl jq - - version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["deb"] | match("https://download.wavebox.app/stable/linux/deb/amd64/wavebox_(.+)_amd64.deb").captures[0]["string"]') - nix-update wavebox --version "$version" - ''; - }; - - meta = { - description = "Wavebox Productivity Browser"; - homepage = "https://wavebox.io"; - license = lib.licenses.unfree; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ flexiondotorg ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "wavebox"; - }; -}) diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix deleted file mode 100644 index c083c1a8048a..000000000000 --- a/pkgs/applications/networking/irc/srain/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, gtk3 -, libconfig -, libsoup_3 -, libsecret -, libayatana-appindicator -, openssl -, gettext -, glib -, glib-networking -, appstream-glib -, dbus-glib -, python3Packages -, meson -, ninja -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "srain"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "SrainApp"; - repo = "srain"; - rev = version; - hash = "sha256-mhnlHnF23+VZvSPNuTYYUVcA6Md4y2AGqEuJphY1/IY="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - appstream-glib - wrapGAppsHook3 - python3Packages.sphinx - ]; - - buildInputs = [ - gtk3 - glib - glib-networking - dbus-glib - libconfig - libsoup_3 - libsecret - libayatana-appindicator - openssl - ]; - - meta = with lib; { - description = "Modern IRC client written in GTK"; - mainProgram = "srain"; - homepage = "https://srain.silverrainz.me"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ rewine ]; - }; -} diff --git a/pkgs/applications/networking/irc/tiny/Cargo.lock.patch b/pkgs/applications/networking/irc/tiny/Cargo.lock.patch deleted file mode 100644 index 775a7b717869..000000000000 --- a/pkgs/applications/networking/irc/tiny/Cargo.lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - - [[package]] - name = "tiny" --version = "0.10.0" -+version = "0.11.0" - dependencies = [ - "clap", - "dirs", diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 8ac356b9183b..513c257c9b9f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.4.2"; + version = "4.4.3"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-1N8ompxbygOm1PrgBuUgNwZO8Dutb76VnFOPMZdDTew="; + hash = "sha256-KVYS+NwkryjJGCV9MBTrUzQqXQd9Xj2aPq3zA72P6/o="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 5c3752046be3..d705536ea7df 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.4a"; + version = "4.3.5"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; + hash = "sha256-QNrsR6VarZ2favvTZ9pMhVafwF2fOjYLKcyNqZyUl6s="; }; nativeBuildInputs = [ automake diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix deleted file mode 100644 index 38ff368ad5fd..000000000000 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ lib -, buildMozillaMach -, cacert -, fetchFromGitHub -, fetchurl -, git -, libdbusmenu-gtk3 -, runtimeShell -, thunderbirdPackages -}: - -let - thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - - version = "115.14.0"; - majVer = lib.versions.major version; - - betterbird-patches = fetchFromGitHub { - owner = "Betterbird"; - repo = "thunderbird-patches"; - rev = "${version}-bb31"; - postFetch = '' - echo "Retrieving external patches" - - echo "#!${runtimeShell}" > external.sh - # if no external patches need to be downloaded, don't fail - { grep " # " $out/${majVer}/series-M-C || true ; } >> external.sh - { grep " # " $out/${majVer}/series || true ; } >> external.sh - sed -i -e '/^#/d' external.sh - sed -i -e 's/\/rev\//\/raw-rev\//' external.sh - sed -i -e 's|\(.*\) # \(.*\)|curl \2 -o $out/${majVer}/external/\1|' external.sh - chmod 700 external.sh - - mkdir $out/${majVer}/external - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - . ./external.sh - rm external.sh - ''; - hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c="; - }; -in ((buildMozillaMach { - pname = "betterbird"; - inherit version; - - applicationName = "Betterbird"; - binaryName = "betterbird"; - branding = "comm/mail/branding/betterbird"; - inherit (thunderbird-unwrapped) application extraPatches; - - src = fetchurl { - # https://download.cdn.mozilla.net/pub/thunderbird/releases/ - url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A="; - }; - - extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' - PATH=$PATH:${lib.makeBinPath [ git ]} - patches=$(mktemp -d) - for dir in branding bugs external features misc; do - cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/ - done - cp ${betterbird-patches}/${majVer}/series* $patches/ - chmod -R +w $patches - - cd $patches - # fix FHS paths to libdbusmenu - substituteInPlace 12-feature-linux-systray.patch \ - --replace-fail "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \ - --replace-fail "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/" - cd - - - chmod -R +w dom/base/test/gtest/ - - while read patch; do - patch="''${patch%%#*}" - patch="''${patch% }" - if [[ $patch == "" ]]; then - continue - fi - - # requires vendored icu, fails to link with our icu - # feature-506064 depends on those icu patches - if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then - continue - fi - - echo Applying patch $patch. - if [[ $patch == *-m-c.patch ]]; then - git apply -p1 -v < $patches/$patch - else - cd comm - git apply -p1 -v < $patches/$patch - cd .. - fi - done < <(cat $patches/series $patches/series-M-C) - ''; - - extraBuildInputs = [ - libdbusmenu-gtk3 - ]; - - meta = with lib; { - description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will"; - homepage = "https://www.betterbird.eu/"; - mainProgram = "betterbird"; - maintainers = with maintainers; [ SuperSandro2000 ]; - inherit (thunderbird-unwrapped.meta) platforms badPlatforms broken license; - }; -}).override { - crashreporterSupport = false; # not supported - geolocationSupport = false; - webrtcSupport = false; - - pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - - inherit (thunderbird-unwrapped.passthru) icu73; -}).overrideAttrs (oldAttrs: { - postInstall = oldAttrs.postInstall or "" + '' - mv $out/lib/thunderbird/* $out/lib/betterbird - rmdir $out/lib/thunderbird/ - rm $out/bin/thunderbird - ln -srf $out/lib/betterbird/betterbird $out/bin/betterbird - ''; - - doInstallCheck = false; - - passthru = oldAttrs.passthru // { - inherit betterbird-patches; - }; -}) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3ad8b21567b0..ccdef5cb3df9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.52.4"; + version = "3.54.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o="; + hash = "sha256-oeM9aED4GLdLv+iafb2jcpXdgUWn30JlrS2yQUU4kDo="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index b8dae30a997a..2e1611cc942b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -1,28 +1,3 @@ -diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c -index 87b02c6..3fabca6 100644 ---- a/src/EWS/calendar/e-cal-backend-ews-utils.c -+++ b/src/EWS/calendar/e-cal-backend-ews-utils.c -@@ -2484,7 +2484,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) - if (schema) { - GSettings *settings; - -- settings = g_settings_new ("org.gnome.evolution.calendar"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@evo@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.calendar", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, -+ NULL); -+ } - - if (g_settings_get_boolean (settings, "use-system-timezone")) - location = e_cal_util_get_system_timezone_location (); diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c index 44a20d6..90d5729 100644 --- a/src/EWS/camel/camel-ews-utils.c @@ -47,30 +22,6 @@ index 44a20d6..90d5729 100644 strv = g_settings_get_strv (settings, "labels"); for (ii = 0; strv && strv[ii]; ii++) { -diff --git a/src/EWS/common/e-ews-calendar-utils.c b/src/EWS/common/e-ews-calendar-utils.c -index 6deda60..9b44cc7 100644 ---- a/src/EWS/common/e-ews-calendar-utils.c -+++ b/src/EWS/common/e-ews-calendar-utils.c -@@ -413,7 +413,18 @@ ews_get_configured_icaltimezone (void) - gchar *location; - ICalTimezone *zone = NULL; - -- settings = g_settings_new ("org.gnome.evolution.calendar"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@evo@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.calendar", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ } - location = g_settings_get_string (settings, "timezone"); - if (location) { - zone = i_cal_timezone_get_builtin_timezone (location); diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c index 3db3564..a233d4d 100644 --- a/src/Microsoft365/camel/camel-m365-store.c @@ -119,3 +70,28 @@ index 7a1d7f4..3c0d5e1 100644 if (g_settings_get_boolean (settings, "use-system-timezone")) location = e_cal_util_get_system_timezone_location (); +diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c +index 5017d40..34547e3 100644 +--- a/src/common/e-ews-common-utils.c ++++ b/src/common/e-ews-common-utils.c +@@ -218,7 +218,19 @@ e_ews_common_utils_get_configured_icaltimezone (void) + if (schema) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, ++ NULL); ++ } + + if (g_settings_get_boolean (settings, "use-system-timezone")) + location = e_cal_util_get_system_timezone_location (); diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index fd8d214d5ea6..7b948ccdddf0 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.52.4"; + version = "3.54.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-9XkpgB1uQBphHWUh71kiTYGzBQA1ekuePkYkXslGGBk="; + hash = "sha256-qEQzdJd6AcY70Dr9tcY+c6SOZ0XX1Fm08mgj3Vz5lxs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 716f7bd019d7..3ab9759324f5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "128.3.2esr"; + version = "128.4.0esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/af/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/af/thunderbird-128.4.0esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "68e754e3280b0e47e2160d2538dbe959edde3b987a62f05c42bee02e554fbeeb"; + sha256 = "f4b5c0c67baf17bcd36c395f4e2a103680899f4b5b5134c0772725a5cc2edcfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ar/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ar/thunderbird-128.4.0esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "06eb5688aeab9fd9c544c45079a5a711bef6bf0710d0abfc508e33d072827ee0"; + sha256 = "b7097cb173e15e8a1ebd8d07d9695de046c950d8d363af06ab9a131597300208"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ast/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ast/thunderbird-128.4.0esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "434d20e1d20acb0aefbce5d15fb3d015eee1dc474a5b5afae90b7575308c27b6"; + sha256 = "98567596e05ff39ecfaefc77b03589dd77874e292943f665f4c31463eff0113a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/be/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/be/thunderbird-128.4.0esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a4def49f05a1a479c3ac0f1267d4ab65de84d7acbcc79e1c52e55e814bad8342"; + sha256 = "9672515b79fa7db20b77b032c21b5a43816aa405b6d712cdea1b779a701b9e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/bg/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/bg/thunderbird-128.4.0esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d6d4770f6707dc8a246eafaa0c3a360fb49117eb2adbb12e99a02b4de2cf1805"; + sha256 = "929517a24e94364187bfe6f4f4df25c61cdcab4a06302981a7de17c094b50eab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/br/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/br/thunderbird-128.4.0esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e2352aacca362ce56571b1f50009304355e5c2575e0aea3e84f81d386f7e5553"; + sha256 = "23779556660e301737025a15c13554a149fa4d1414b882bad7f3d943a2189d66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ca/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ca/thunderbird-128.4.0esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "67c31bb9599c181bbaf250c2479188d7fc2e208322aa51737aed83ed9f91299a"; + sha256 = "2e375548e9b79bf4d0227bcaae413f898c42c12e6fe45c3a8cdd3dfd66ef63c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cak/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/cak/thunderbird-128.4.0esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b7b44e214374a526264522345e5907b76d080603b0fc6b2c4bae9621b78279a5"; + sha256 = "7247868660c51b6a3fbe916e2203b12116ae4daf54099088d059c5f40c7ae28b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cs/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/cs/thunderbird-128.4.0esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "72149f69323530b8e369fb2689a8baad097f23fe3a6039bfe56b24c0a3290744"; + sha256 = "65918f24eab7e390e0b4ce74a2b8651702f05d3517f5ef94ecd99b5459250c8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cy/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/cy/thunderbird-128.4.0esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "207ee0a8bd84e9e8b1c759a1c9987207f701d0da2dd6c036d759475896a0f2c0"; + sha256 = "b5b042bdcb95d1229d2d832a7e137999119321a8312c0bc672ce35d330d0b8e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/da/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/da/thunderbird-128.4.0esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b69247826491468475cae337ed62c0314ce8ca4de33ed3d8630114fddcaec41a"; + sha256 = "1da0e908f24e3efe0e4dd43a10bb4ce620059bf6ceee3fa5f9d2a5d8d32ff31e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/de/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/de/thunderbird-128.4.0esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a0ef4564aa205006fd448ddd8d03f398a1fd525c156bbcbcba297a6a2c932cb7"; + sha256 = "4a8751d1268ce303fcba4dcdb1cf93252338908a302f3532d2adb6276fe6eac8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/dsb/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/dsb/thunderbird-128.4.0esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "58eb03368703f0fdd760f04102fd3f1dddf525147fb7e5e4f1919e080935d6ea"; + sha256 = "bc9b9d26d827794f61b046788e9f965e9275b4ce15017c3115fec2c1eda5de3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/el/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/el/thunderbird-128.4.0esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1a1c48242ab368a8039edb04093c64cc41aa1885cbe67567340f324ce429dbe8"; + sha256 = "a2a44db9099395350baad249ad252d8002cc990613b82d77b84e6f49ca60f54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-CA/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/en-CA/thunderbird-128.4.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f13a13039d3006320a71a01a6ffdcfebdfa446abd0aadc6858b4296dbbd01106"; + sha256 = "a85f302f53ab25362dd9f60f926c7909cdb3df90587b2b930defe8b71e039adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-GB/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/en-GB/thunderbird-128.4.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "10d698906140a7b104484a3e90875b1f0fc2d1d7abe3bfcc2c82ab793a8c7992"; + sha256 = "76781c1c4e617995d79c22bf3b5aa0f0cf706ad2cb0ac59ab0ae736db2aa89f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-US/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/en-US/thunderbird-128.4.0esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "72c185256191a6f1f8b4e497b65dde1fedd919a2251261ccad6da06c62dd627b"; + sha256 = "e6aae02f5f9e01768b850b2df18404f19ac4f0f0e9aa176683d0152d8731876f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-AR/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/es-AR/thunderbird-128.4.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "211d5fbe5d72d5365c74153817fc95eb376d7eb2f1fba9aea1522491fe718afc"; + sha256 = "7fb83af57053b258b63dec7327a814feee2550a7aef6db38ce55f1dda53eb40c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-ES/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/es-ES/thunderbird-128.4.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6fcf5a499accf6882dae1c1f1a69da600a8b8ba28a902a6c7a3b4d8de51d17e1"; + sha256 = "fe16a9eddc488c8318ada85130bc7720b4aff243e6ee02c702c1e167d6831358"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-MX/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/es-MX/thunderbird-128.4.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "aeba0e0b1637ce57d8ef11e73efbc39e5843c03d1efaf2e9519e60a03d6f50de"; + sha256 = "80d23de928a1f23f9b53c593a2c39f8ec316c0b8c2614e66b77864917445b9d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/et/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/et/thunderbird-128.4.0esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "04b7e75de0df9fb9ca09ea2910a618d9c6ed60d9b71c2505ec8850b183ee98a3"; + sha256 = "066cdae27bdfcf37c8f06bee52c1b2c6dd08a87ac9046d16272958508b2164d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/eu/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/eu/thunderbird-128.4.0esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5499fac8f11acc67b1590ca43dad0c136e9c0a00134ff14469265845154b791d"; + sha256 = "a86df82e8c15ff6f30ee30227bf3ae85c9d0c8df8264b63542f5a64fda9b2a00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fi/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/fi/thunderbird-128.4.0esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3254378b2ee27f7462129428176a92277315c0089915c0f3a80dfa435bd2205e"; + sha256 = "ad266dd4c903c53c48e62c62288e210c5b98ef653ef03196b9a261ce1f6e8415"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/fr/thunderbird-128.4.0esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "56861692b1c421d7f5a90657397b86e678cb6c162853362e69aaa7db4f28925f"; + sha256 = "54e6aaa6fc5b976f62930ec44a8069cda5edb0780fa342673daa0421e2eb9f6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fy-NL/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/fy-NL/thunderbird-128.4.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "63dca4a0a7c71b4d717f92213d8b7524b1eca29ad50e4540edaac148badf0586"; + sha256 = "2c0e5b5f3ada77823a3812ed342dca95171b05f151bf43beac62c7ca4d37fcca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ga-IE/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ga-IE/thunderbird-128.4.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "70ded506c128d9e7962dcf8621b772840834f44d59ab1a6a8c8c543175242858"; + sha256 = "29a77f6d2ebf8b1aec6942a212f0a524c5d4faa804e344cd31eae1fd2e4c2e9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gd/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/gd/thunderbird-128.4.0esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e65b6d02421f5b37d19c6b65cba400d12f64418b80410ffebafdc83b11758eeb"; + sha256 = "f0b3cc12e081308572eea9a122ebf53a33f042fdaa77962dd2b11c52ce964ebc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/gl/thunderbird-128.4.0esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a92eb0bfd1efba1f5b5efe794b915050d3a67c116e78b84b0abce563553efbd1"; + sha256 = "10c148f76d49a2bb17fd990fedfd6940ddcadde772f0026255263e6381690743"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/he/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/he/thunderbird-128.4.0esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5fe6d0a4b259ddb0e85d192659e205610a11c5f1d32498dc84ff4956ce0ecc52"; + sha256 = "00d5e80ad49c9839fea580648b02636ad3a284eefee89fceaceff1cfcfca2761"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hr/thunderbird-128.4.0esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "05d9d2a86ae030b7c036292ebbdccd5095efb26c32bb9ceb618f1e049514aa94"; + sha256 = "b02ed6adeb246c263436f3d4f23b40ec830487b88f30585cdfe58e4ead140c9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hsb/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hsb/thunderbird-128.4.0esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e9a807e8ac2ee94d2ff214e92e1b69cba5f00c3b9c6cbc0244fea2e9ac2386aa"; + sha256 = "c2c3ff348f1ee9af50c9ca068cd3970f151a679621b94f3aafef817966f50fa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hu/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hu/thunderbird-128.4.0esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0347ccb486557e961ef46979f4a221b8fed55307379d9eb3e77afafc4d07d736"; + sha256 = "093059f5e6e7f9b8fd653719ed21bd7988ffe180890c9bc8a1e086ce8ec61aa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hy-AM/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hy-AM/thunderbird-128.4.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "636762093f4697a778696bd56864aa8eaae04e48c7f4a4129b116247cd78b998"; + sha256 = "a632e051dc232c36aec69531eb64d98483899f9128042c90ad0b238b498b3415"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/id/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/id/thunderbird-128.4.0esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "291f1bddffcc0dc308a7532455e232d6e587bc8e0a803b4f6dd85f6f80346135"; + sha256 = "d44ca9526e7444ac56ee0edb8a29c709093a463e193cd9752b7cb00c51fbea17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/is/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/is/thunderbird-128.4.0esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "01ace7af5465472c958e3e3ff1784c6b3978a46f3b008fe1a0a556e825d8b327"; + sha256 = "6bc92c2f7eb0d7577687fe8f987798edf694944214c6fa53b02b7d2c13858f2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/it/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/it/thunderbird-128.4.0esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1ba69fa4e8baaf106a3006dd651c92be6b3ba19701ca8c553fd0c3fc7e34425f"; + sha256 = "9751063446cce37f9d166d5d3685b9dc4c75e2dcb870acc536b99aaad809ecf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ja/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ja/thunderbird-128.4.0esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "98c79c493f9c23a698bf2a6627975cf918bead4e2e7ae9bdf8b132e8e5e205ec"; + sha256 = "7606009ff008abc3919d93ef61c7ae2a23f8ed78b878f22bda83be211ece04a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ka/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ka/thunderbird-128.4.0esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e4e9a739ead52440b1bf0b9dc535d530c812b4d2a91bf6828cbc635f8273a8d1"; + sha256 = "72fe8b5150caeedbda2084ac6b09cc9793c840fd0964c8326c6ce030b62448b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kab/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/kab/thunderbird-128.4.0esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e36858baf702c8402fa72ac4f1805852dd5d371766e47482f1bc7cb1a73c59fb"; + sha256 = "be4a52751123bc92470f03200a5875964ff6105e31d9e4ae0f1aa6d52223dab1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kk/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/kk/thunderbird-128.4.0esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "53e88b687cc6db2abeb3e1f90f861df946c06c6026f4a5cc05a598b3f98ea2ab"; + sha256 = "159c2554fe613cb4abc157debe9b301c028f9b982b5ae8c4f2117a135cd4954e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ko/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ko/thunderbird-128.4.0esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6a18161a3977fe91e5c878dbf28f9de76c919f753dc1e29211168ecd0bb76ea4"; + sha256 = "d8f8096f503c12429c94c42c119e21957a6cf3924d14f0030da9e46ae3b9326e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lt/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/lt/thunderbird-128.4.0esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6cf21bbaf1fee99a86f036e49c56a6c789795375db7b7c2b2d66c9cf4db2009d"; + sha256 = "1d0ab203ef07760d3808aa92acfa734219f0fcfc2ba23f1a0d7ca8011e0a58f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lv/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/lv/thunderbird-128.4.0esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ee6207c449bfaf50acbb8d666a87439080ddc6c151324064c6114ddbacfc03bc"; + sha256 = "89e2eb6f61846e69e67f9e10360b2a3e88f0b21a75996f1167f6c169b6870c9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ms/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ms/thunderbird-128.4.0esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6f73ddde1f47f484819c14e80e9f91be095b6229a69b7ea584b670acfe88af74"; + sha256 = "f4b11168bbaaaf519f16b8d637a635a405729f68d34b8844224a5782ea6b5afb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nb-NO/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/nb-NO/thunderbird-128.4.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "64f324a7d0c3cfce88383ca8cb844e29df33f9b740bc6d02c718e8e436a555bf"; + sha256 = "ca8661ecbf45808aac86b4d40acf129d04d71551f8cce206dc913ac63946c80b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/nl/thunderbird-128.4.0esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d7a982d8ba02c6ddad2c1891ae09f5cff5aa80b19e6d2fc26848f8df593fd1a4"; + sha256 = "2b852d095844fc93f8e326adfc18572461046db0f40abb3bfa16cbf80ddfccdb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nn-NO/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/nn-NO/thunderbird-128.4.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0d572d3d4f79958083603e2238b3cfe1a5c7d333a1de5a55f0c320ae8415b4fe"; + sha256 = "387aa2d3bd17236082257f049bbc1bd0ceb8bebfcfa073197fc7f906f1cc13c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pa-IN/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pa-IN/thunderbird-128.4.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ded2cd04fec68d5639c5ebf93a9f50ebd7855cd316b8135c4be36d15dc03d6e5"; + sha256 = "baff051c11778958a6c52e4127760987d323bf0b100fb6c205f0ec3f8925ba86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pl/thunderbird-128.4.0esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a7b4c48be5aaa11b836069862bf471d19f7297575b579411938cd9a1b5f19886"; + sha256 = "08bd02a1e671c88f7ae9689b6cfca9b138c3923071e8278e529790deaee4272b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-BR/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pt-BR/thunderbird-128.4.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "32a1c309b143c5b2c9d9993c65f3f475ddc279c683d5c6434c1fa92176908e49"; + sha256 = "7b55c074e0342876e5cfe2c069724e673742069fce307576021407edf9ae87c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-PT/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pt-PT/thunderbird-128.4.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9f3b43fef1200627869eeef5d0814a7831ef6be2b9893cef94f6060ac579f4f9"; + sha256 = "8f81ab9e58d69f751aed4dfe16a23b667196a520115e2d0cc930295a8fa8189f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/rm/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/rm/thunderbird-128.4.0esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "900a77024280148075888fc3dfadeaa7944b7fbe96cbcf359e3cc4cd421ef71d"; + sha256 = "0c07d0faea7d8795ad2389960bd5b8c47e2000fdfea14b93ff8f6c7e6c3db730"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ro/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ro/thunderbird-128.4.0esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7d556f80f1fa9b60f93ec0a9bfdcc02cb063569515ff5e285aec2b8d6ef3b0f6"; + sha256 = "7beeb1f9c6a3159c351596caae91609a7247de3eef2df775703fd8ac71d1f858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ru/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ru/thunderbird-128.4.0esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bbbf234d7b1e8c7cdd71f582f1c4cf1b14ae2e9e695e9edfd56e7358ffcf9daa"; + sha256 = "c52a4a86626b025dd5b421f9033cd9ca8b13b7278946fc061b60706364541147"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sk/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sk/thunderbird-128.4.0esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "665f506a18615247a57c7b936d3b4f0fef7240967c2e64e206ca44fe8842f65f"; + sha256 = "3b5e3d688b6168b42cb8142c095749e6339618fb56f77fbf43bb4abf1ee49e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sl/thunderbird-128.4.0esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6cb65f62b5759336d08cf4735cd4eb4a4dfa3664786e06988dc5db3fa74267b9"; + sha256 = "b8301c1136e9145a1b45c9eaabaee5daec9eac84a883978cac91b4eecfb1a13d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sq/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sq/thunderbird-128.4.0esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "578d0542d3e0b4615653832d4474d5253ab7f11aafecc4a4bfb370ff14d09c85"; + sha256 = "21ce583b646bdb0451f6cf2b0178ab7d56b80fce5bdba38cb3b65598cd91e3e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sr/thunderbird-128.4.0esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "69f922567c45c44c2902255c6abc58312f625d2be421cbf986a488addc96af92"; + sha256 = "95b476e61cc72787642c9ceec7d26b652cc5d1ec8f756e62a89e4d45022f3d66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sv-SE/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sv-SE/thunderbird-128.4.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "338f53c983182a93febd49671b73e519da023e6d9653d16dcb1e96d62589d095"; + sha256 = "36f24520dfaea9a3090812b326ca29434f93fdad055793f6aeff85aad6f47599"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/th/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/th/thunderbird-128.4.0esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "89498e7b762e95e27d5a5cb7b33cfdcb04057f7c25bbec594f02b5ba11049cd3"; + sha256 = "c63e0b7c645a0dc60fdf74c98f3e429fd2ce7f0e460e3eaaad51bbb8a3c753e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/tr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/tr/thunderbird-128.4.0esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "e08daa81402551cada7b056d40ddcd77f19d19584552349895cb6d206fc3e3b2"; + sha256 = "8713083de4a756194e48038923d5584722ec49368a33a2b08157a51963ff658b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uk/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/uk/thunderbird-128.4.0esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d008cdb485bfa80654acbda091761f31cea620b5fda06cea86df9920f807da90"; + sha256 = "fd83a6354ccdedb72a41a74755a637ca8fc3f44424306abcab5f8af7efefecef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uz/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/uz/thunderbird-128.4.0esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6d73e85cc68bc9dbe519a46e217f2c62d4b002757cac6f3eee73142642259575"; + sha256 = "fa5bb891a80deca794b190e52c8496e43ea0b610f85451c31eb5d6851a1181a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/vi/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/vi/thunderbird-128.4.0esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6f7b1aa7b314f9f7a23bea9f7e5dcf654891f14eadf543603e057a62e56eb1c3"; + sha256 = "f6b09e305770da8cd27702c0024e5b237b3e7c0a7d237324188e569eaaafdba9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-CN/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/zh-CN/thunderbird-128.4.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4b63f9cc7e02e1048273de888df5238c4e308a5b62caa97b9177ac9daddfaef1"; + sha256 = "0f4d8444c65d57294ab5a2eb110386d90164da2f40959b6ccbd2f959515c1f7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-TW/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/zh-TW/thunderbird-128.4.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c3697d78a62dd49b6c9c264809fa3a208edee853fd6f2371a90a3180d88e3ec8"; + sha256 = "d87055f5fbd0970c3123d3b3dc5d3e5ac30a056af4ba0b5030e14a995691f543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/af/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/af/thunderbird-128.4.0esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d396f5bd5a22cf7e7edff3ea71cc05922c4b0326859f7460f363eb31df09ddcd"; + sha256 = "40b8316fb40a81f674a1ab8b070f36a0250006d815ebaef338b429ec2c477a9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ar/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ar/thunderbird-128.4.0esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c095953766c3aa7f1308a8931017b202ef63783562404344efbab9a9367f38b6"; + sha256 = "ba6316f8d639b21b29c0400dcd5004c55250dde52eefb290c406b52764fae625"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ast/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ast/thunderbird-128.4.0esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1039b107a3adcadc4d1e329416792fe668c0588a4a1e1283caed89789b2c49e8"; + sha256 = "0a3be4e77102a994a61280615cefdee894611c94c0902bb446c5bc7dd19e0780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/be/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/be/thunderbird-128.4.0esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "43a3da378465f4e3b7a6adcd55dfbb9a100392d06dd96e49a3d50ae756a3ca02"; + sha256 = "12299b04da9ba5dbf0ac3d6ee6d11a0e0f7dda07c90f6b5f874b29702acd6f7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/bg/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/bg/thunderbird-128.4.0esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "03be328293a1039ea0c4d05fc8ea091c073d95c4b72dfb4f348f5982647ac5db"; + sha256 = "f668f2dae9b4f3071af1a3a0e87d019ed3ad044f20f45153e62603a2e90edeb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/br/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/br/thunderbird-128.4.0esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "11e5309a82b6ae36906d2285aefca39db32247501cf60a582bfe69a879646a9e"; + sha256 = "aab0c30d08a1687389c53b14170839828b7ee5c85be1e77b30db72135119804a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ca/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ca/thunderbird-128.4.0esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9a17b59732a651b3247f7af810bd633f07e608ba66c1e7d00b341baac9f0ec69"; + sha256 = "bbfbb488667237a4cde6e73948df78f2a8ebf4fd78e40227c2000eb15155ef9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cak/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/cak/thunderbird-128.4.0esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2796ae01d6fa7b48d22837d0c6f10ba6bf00ffbd35794bb1f38e3a136c8cccb2"; + sha256 = "64c28f5a4b123ce00884c90fbf246e34bce6453ce30e3bfea6b2574496d46052"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cs/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/cs/thunderbird-128.4.0esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f2e65539e93222d4a7e552b7f670be776853b65aeb2f7fb144d68072b3bdd50d"; + sha256 = "e86a6704f92a5a0b8bdffca1ea066310818690e0dec2a5ddd2029504f677258c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cy/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/cy/thunderbird-128.4.0esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a59825b1692b9dffeb39bf30ea8b5f36cc30445dcd5ea184cc8487fc01fdff75"; + sha256 = "2dc05b825b3f1d58eea7042fd502da562999391d1e889f267916a2bef0fe008e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/da/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/da/thunderbird-128.4.0esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d0c8b043c86e83ccc86a728743489a48cb0cc4e46d6976bd3595752a306c0774"; + sha256 = "5cbccb42d58dd622e1f7d165523597f1be5d527dc532400919e5b0e84e9cd95b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/de/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/de/thunderbird-128.4.0esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "917ce52fc4d81ebbe5276240b41565fbce6bdfc53ffa7753db97e7e640a2f90a"; + sha256 = "25c6cefa9eae00bb8983d071a8bb7c2175d69386b96236c8c75389901919392e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/dsb/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/dsb/thunderbird-128.4.0esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2c6ffd2c7e140d7710e5d702008f85892761e834e81ee1dd80f561e1aa56ddf6"; + sha256 = "ff2a8ad07dbf6ea8c0860c984b438c94f01fd37861b16805a0f50e8bc9401cf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/el/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/el/thunderbird-128.4.0esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9213a7c441951f9a07766ccff191da85cab2a24fd7fbce1f19bae077387e5c08"; + sha256 = "ee6eeb93e95a960b2e6b43566896d2c3ce9eb24ed477c9600148ccc533809bed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-CA/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/en-CA/thunderbird-128.4.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "77895c740967e60406ca466afbcf294be052a6ee81d5c4b2cd531750d23fa661"; + sha256 = "6c6f11aa8f46bb49e07105c8a4a7391663cdfda166285b326ff35c1a40a38abd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-GB/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/en-GB/thunderbird-128.4.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4c547974c874a4ce973b02a890fd12ac917d89c8ebf0a9d332262092ef8b9be9"; + sha256 = "6fc49aed294f7bdce470834596ba3ba7f65c938105d0d747daa425cdc182401f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-US/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/en-US/thunderbird-128.4.0esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "161b7ea35c5d4c1ecdb8cf0229fbcf3ea152c09c22543e0762eece4b7d6bb6eb"; + sha256 = "c4edd030485a935fdba3ec4faac0aa8a78de047af8e0d5e47ca95bc879a17621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-AR/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/es-AR/thunderbird-128.4.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bb83137654be3e90cd5c0836342f00b85b065663f5318f562b09bcd2714084e9"; + sha256 = "f0c29400917af1bce184b994f65892115c69ed492c16e7180b83905f29bd03d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-ES/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/es-ES/thunderbird-128.4.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4744ecee5a3e72560aa25efd25c793b8786764aa7d9f8ac33cf1a33ccbe28a76"; + sha256 = "1dd664e361a4163ec516f4526e5f60c565645cd892d61ea3c72a5ca8f0454f1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-MX/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/es-MX/thunderbird-128.4.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6a63c009191b205ced9f8147cfe36a801e9a02d5d74a9a57f66960c78a9b3671"; + sha256 = "819e064ab10fa975d8a483f1f1b648f7ccd41d8e1cda59d6cdf26db34a74f457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/et/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/et/thunderbird-128.4.0esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aa2cc826ecbe7397b21a7c5b603026105a5db5ae3d8046ca806749b2133e38b5"; + sha256 = "5f07c0e0b9dca3ce883dc3382141f7c38e1b042bc5609b4ae85d7d792231f58b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/eu/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/eu/thunderbird-128.4.0esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "28762f614cc70ebbd3d4863a671257cbbccb5d60258d7d07f7d1e42ca3c1b2ee"; + sha256 = "b9ac89ba8815d30a527f27f3d01dec0548be1cedf9449acba17b7948d44b92d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fi/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/fi/thunderbird-128.4.0esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f5b844a279088b43538b4e3f96cfa1c8614710398022d3cf0d4c3c4fbacea456"; + sha256 = "313dd6d2f2bbf36395b826f7e04c69fae434c7fc9a2ad886d4af536b0b2ac098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/fr/thunderbird-128.4.0esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4e75cc4efc0bef081cf6e0b74ac7dd74f450dd87a1a0bfbabdc8cdcc383be3c9"; + sha256 = "8883f2c417ecc6336155d5f05c9de82409d035894726936923bb96f4d70b37f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fy-NL/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/fy-NL/thunderbird-128.4.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "11ec4e4be64feac976e21dadcca77145dc4fea225c0d00c9dceaa509ec61cabc"; + sha256 = "ae4875e8dac4729546770a24dba35b904a0f34342dc2f56c3dca5870b8f3fabc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ga-IE/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ga-IE/thunderbird-128.4.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b4eaace12a57f7b24f56f476fbaa9e9606f25d1f82b34e67cb1a0e10d191e3d6"; + sha256 = "72bf9ee607ab87f9d6975eecaf3e2104cf98a32ace843178aa156bd167db9359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gd/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/gd/thunderbird-128.4.0esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1f669d83cc4caf91bfdd61b9e63e282f90f0d7cbb96c1100c0f904d003f9e076"; + sha256 = "9364706897f6505d4b6c8eaa315fd9c9ee85880ee58924c8d118fcd5ef551193"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/gl/thunderbird-128.4.0esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "5eb51acfb2955bc0038e299d77ed8491648b4d7293d31d8a01648b67dc1e575e"; + sha256 = "5de972bf2fc002fba0d1e5afc4e6b2f83bb6c740c7f6ef4958734fc18984f94c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/he/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/he/thunderbird-128.4.0esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "87f4fb6eaf8f32e9b041a8d5e5da6072b1106492a9da75a4cac4255ccb818121"; + sha256 = "a4414c6642a7aeb4e754ae75f583dc0582e98b0e4555130590b2abf68b29cf13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hr/thunderbird-128.4.0esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "d93a01b31369d687865d1bafca101b349c697bc7e7b48ff470831849b0444814"; + sha256 = "d2312db3e884a4575ab3c2d0e3fedbfc85f6ace385895451c15a27f06a746a06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hsb/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hsb/thunderbird-128.4.0esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "78d421c94906c39d64013679d786579ae60a574adebdb4b4729a2861e392b5ad"; + sha256 = "972a1f9391fd1b32bd9eec5341483d01b1b91ed04e8febe05a9dfea9dea42300"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hu/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hu/thunderbird-128.4.0esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "cb6a581fb55422aedb80ad1cf2b67dc07a82f0e3817612454bd0894522a77051"; + sha256 = "5ad67c2c7b215be82dcd223519b8750a68dc2a8947e6f1f2e2af1808126a2fe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hy-AM/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hy-AM/thunderbird-128.4.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b7f29b312f7c26fd5f876d864006eea66977e14e5ff6c761d25b00dedb520272"; + sha256 = "58460cfd499f75be278fc810834188247ddf26e4909c4685d6571822d4199497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/id/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/id/thunderbird-128.4.0esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b8942767658f68d76c071a3d4c22bde09e09886a036f3b1e5fb46af18ca76434"; + sha256 = "2c9b914b683af7434d0af1a44b1fcca0cd80ba87815aec9d0013f86a012b98a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/is/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/is/thunderbird-128.4.0esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7023c95b4036be5a1f6d8924e746b92aef9e76e8e82726a221473bd540dc3bf7"; + sha256 = "8d0e365474bcffb29adefc95346aa39653106347130ac2168d625b251a6cc3c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/it/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/it/thunderbird-128.4.0esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "cd594a8bf3e316e9598007ede696e785013f5a11bd68b14ce742d97abb7cef8d"; + sha256 = "cb49c2dde4e8190cfe59639456940f3e96474f9cb19c72e9952107ed3806e8d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ja/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ja/thunderbird-128.4.0esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c17eca728cf0a861f25fb9cb419ed2c20f979c19c15582b6a17a99544881d723"; + sha256 = "e28ee17dfd116b8bdd0aca4e988df23b9ffd8a56ddd62166a4eceaa3c3224e7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ka/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ka/thunderbird-128.4.0esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "495c8d23f24dd7660e9d4836d4cb18ca48c7f3b0edb255cf18daa627ad78d6ee"; + sha256 = "14a457fa40ee1f684663ecfc2bfdf7c812efa6822496fa68afebb15e789b9660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kab/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/kab/thunderbird-128.4.0esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "6fd780bbecad88ab558c76938599a54677e93689d0d451e96beddc886569e3a6"; + sha256 = "32d538f85c9f77907126c7f67376b45186f583542ab3ca0df15d9feeb6c99950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kk/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/kk/thunderbird-128.4.0esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "92d2e2e9e80f75285aabb3ac62edc6db028b15b752a6cbcbb3795566cbeb744f"; + sha256 = "16ddc3622e4c2d456aa98328f55a6bf93e0c0462b0ca72382be6f3e0edc6811f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ko/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ko/thunderbird-128.4.0esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4ea9a6c97b458928a66341d86ed0fd274b27b1e3a2259971b8bf795ab36656c7"; + sha256 = "874447583a9c7685c48cfcfdd663d8234540e088ad6336b3281837a355ba5df3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lt/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/lt/thunderbird-128.4.0esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5037fd5bff06a053331b2ad6312f35af1dd881b2b017fb92ac4c433bf7c10a20"; + sha256 = "dd57c0e4c96e9ddde9e49f8db763246a4f65c451be62d4f74989993d72edff11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lv/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/lv/thunderbird-128.4.0esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0498e5ae2815fcb979230f3166cfeed89d02bddc9c7ed73646600fca2eb44aec"; + sha256 = "e1b0fdb30d1d4129fd3e9cb1a72040f6a0cbc906e7a8f09b70bc06a742062afa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ms/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ms/thunderbird-128.4.0esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "bfbb9fa1a5c1d4aa4c9c73c7e02628c1f01c314fc252370fc6a96896a666db57"; + sha256 = "4ef54e071c9ca46a39aec1a965cd7a0a2509ceff6643279b0655bcdacebc9adf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nb-NO/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/nb-NO/thunderbird-128.4.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "da6ce60429e87f38ff66ce975f4a63e1f2e6f8b2a7ba4f895a32760c09fa02da"; + sha256 = "92d48bf7e3bab1f3e56affeedf7942616b99c7702254f2e88ceacdd0bfe4ce27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/nl/thunderbird-128.4.0esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "514646876e7654bc5a7141d919cce98eff22e07180a37d6765f87629fc48724b"; + sha256 = "08060766e951a2c45304dc16a0ab3eb25b8b5b6e0dbcf9ec3b6bf42813287e5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nn-NO/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/nn-NO/thunderbird-128.4.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "dda61d6545277b5d8f53100712796e2ebbf3c8b759c4bee0f5c467bf8419d9ed"; + sha256 = "8722da03e9accc9d746ea4bbee2e54a402bb727e3e7dec89f707a3a893542aa9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pa-IN/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pa-IN/thunderbird-128.4.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "02b524802db090431e2c1888b1fee5148d22ae7ae7a6d4a22c18afda11bf5c84"; + sha256 = "afa7ff5f443879b6423c5d68b320aa4783fce66a400000b87d5ab8141538ea65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pl/thunderbird-128.4.0esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "43991a49c7e68753599b4b7b6e5b0d23f199d57b85824ccc56b9b4bfa2c4f7e5"; + sha256 = "c464f3af685089e44b95b6d328465f84b8b9052e05d8cf6650eba704500789d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-BR/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pt-BR/thunderbird-128.4.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d9af07aadc66ce20772407de1a458756545775b95b70c8c56c71a6b3ca48cd94"; + sha256 = "fb0067b077d68e8d5b11b70a72ac7fccbaf8b0a235b1a0f4b32b7ed0d21a94cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-PT/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pt-PT/thunderbird-128.4.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "523bcc1b478dcc9e54a1f4c6743fc546ea0b18956d907149641d34598ffccc6e"; + sha256 = "446e8b19db276e988f1d25f057e4343f467d82f6a1ca33fe96e19f51c6d9a2e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/rm/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/rm/thunderbird-128.4.0esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5a6fef50c1acfb0cd2e91d9e03aad4afd688436dcca5280bdb49ba144e97a439"; + sha256 = "7ea76c1352591cc5c2e612c150ad51b57d0fa18f75b667ac24551ede81f0c3fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ro/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ro/thunderbird-128.4.0esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "298aeaa7ae0afaa6531a566e2e8ce072adcc62f7646cf33bfbd3acc450335881"; + sha256 = "8cbce1993c005a231e47a034affe17f1bcdfdba8d6a157320c997353ab63efeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ru/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ru/thunderbird-128.4.0esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c017f418996a8cc7fb7bd2c4062df1ba1dcf4c2b8df7d23a44fe7e0aebd00b2c"; + sha256 = "79f4ca2a069d07ab2888061e53c360b992e95fa74129924abaf74e00158f73c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sk/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sk/thunderbird-128.4.0esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "84079eedbd6c2a5cf4733f256a583b302209dc84a30d2305b859bd10efa87c1f"; + sha256 = "57a42e9106f6c51b0f1fe4f6c573d9efa1e5ac5f39e0573902243a1518164de7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sl/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sl/thunderbird-128.4.0esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "99651a3c3c28cfc1d664066bf0c197951622e55b21ba4be8f157606d63c2dafb"; + sha256 = "6a3ed3e7c8371cb367fda41db743a2dadf54ddd7095239c1a9ab1dd37cbbdc17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sq/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sq/thunderbird-128.4.0esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "47953845a4f03c67148bb183a629a349f3e90bb4c425fc148b1b2cab9f0631e2"; + sha256 = "47c1e95035dcb5aae2ec736766019a5395299748d68ef1c8171f080dab50c48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sr/thunderbird-128.4.0esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "266e2d380f3607a3da4e68b9567d936a47552bd49173d1a44ecce572cc7338ee"; + sha256 = "29eb0d3cbaec91f01af604328ee441822f1292cff73118dc62d9ff5c76c860ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sv-SE/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sv-SE/thunderbird-128.4.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0e97466c633f662293b53e7e61b15034d1f88718232e8cfeb32797d4110dd3af"; + sha256 = "f8b063eaae59e4401424e3e5b0a063bfbc18aabe9de850bdde21f60dfb680f6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/th/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/th/thunderbird-128.4.0esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "18bb3e26ed34c2896a2b5e57d2f740e3870354785e762b7aa827a17b9b8d5708"; + sha256 = "60121b78803375589bbfc8b0a4e5a7027d066fde61766c43245761c50fce88a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/tr/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/tr/thunderbird-128.4.0esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6c1d1f511ee94247f02e4b26d7125ef7e4cd839a508c1be7018127378e80915f"; + sha256 = "eb20b61417b001a8d9a307d2fd83f5f5811d2fed4298fcfb5cf2b51426eea5a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uk/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/uk/thunderbird-128.4.0esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "5b36b7f5efe32bf58d14d74d773cb4cdf092fe3e89e1f2facf63183699967d48"; + sha256 = "77a58bc92ea8f6f8b0d7c2a6875c557a4dff5e364e45409631a5ba81c28f903c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uz/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/uz/thunderbird-128.4.0esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ade3f2442dcc5b6dcce7a8114209bc7bdd3730f7e1ffd9b63b71a452fd9f657a"; + sha256 = "eec9257fa45715942dcef7caf5e60bd257c07bd6156fffaf28df11d362ead079"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/vi/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/vi/thunderbird-128.4.0esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "9224b6c394daeddb695b7ccc30c21e5cbf6356db2bd1f7a6746a292a9f077b6b"; + sha256 = "d115628a1e082a740caa3170eb7ef1f446c7c7df30589e51b22684dab8c6b00c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-CN/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/zh-CN/thunderbird-128.4.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fe17248658dd5ebcbe3f5d3dd82fa3c20f6b2a82b49e037369d8d8fa9a331083"; + sha256 = "14bfcc00a480027136a71367183ca874ed6baa14cb81027f90b3dcc126b5a0f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-TW/thunderbird-128.3.2esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/zh-TW/thunderbird-128.4.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "057c904f9c5e37a9b43d8410f422bf5838f18c63135add2b3f3270e2c900ea09"; + sha256 = "2e413d73f33586ed87eb8a736ef12b62593158bc67a3f57bec3e04b77513717a"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 09783123a30a..6a4ef2badb1d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -53,22 +53,24 @@ let }; in rec { - thunderbird = thunderbird-128; + # Upstream claims -latest is "for testing purposes only". Stick to -esr until this changes. + thunderbird = thunderbird-esr; - thunderbird-115 = common { - version = "115.16.0esr"; - sha512 = "1c70050a773c92593dca2a34b25e9e6edcef6fbb9b081024e4dba024450219e06aace52d9fb90ccc2e8069b7bba0396258c86cc19848a7ac705b42641f6e36a5"; + thunderbird-latest = common { + version = "132.0"; + sha512 = "71206606d691e3b257b4b163e56604eaff221a43f88015fcbdbbbb3bbd708a7459f61b0470f7534ce9adafd41561e11b3487484fbfe3e95a06674785cae97029"; updateScript = callPackage ./update.nix { - attrPath = "thunderbirdPackages.thunderbird-115"; - versionPrefix = "115"; - versionSuffix = "esr"; + attrPath = "thunderbirdPackages.thunderbird-latest"; }; }; + # Eventually, switch to an updateScript without versionPrefix hardcoded... + thunderbird-esr = thunderbird-128; + thunderbird-128 = common { - version = "128.3.1esr"; - sha512 = "9fef04a0c498eb16688c141cb7d45e803ecc75ea6fc6117ff8ad1e6b049716f49b435f3e5a1baa703fa937e25483137e22256e58572eeacf317de264b961ba6a"; + version = "128.4.2esr"; + sha512 = "4e37b77eb4652bc36585656bd3fe5416053f6a1a96ed1ca64c17d8d73031c746cb3832fd275d25f1283d20e18aa3e7b1df6d67864ced21b5f73042a42767cb45"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; @@ -79,5 +81,6 @@ in rec { } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; + thunderbird-115 = throw "Thunderbird 115 support ended in October 2024"; } diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix deleted file mode 100644 index 55b19785e448..000000000000 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, appimageTools -, fetchurl -}: - -appimageTools.wrapType2 rec { - pname = "tutanota-desktop"; - version = "235.240718.0"; - - src = fetchurl { - url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-Pycz05cwse2SUvJlaCXMA1/Trdt6ZGOJK3NRSPb6/VM="; - }; - - extraPkgs = pkgs: [ pkgs.libsecret ]; - - extraInstallCommands = - let appimageContents = appimageTools.extract { inherit pname version src; }; - in '' - install -Dm 444 ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications - install -Dm 444 ${appimageContents}/tutanota-desktop.png -t $out/share/pixmaps - - substituteInPlace $out/share/applications/tutanota-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Tuta official desktop client"; - homepage = "https://tuta.com/"; - changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; - license = licenses.gpl3Only; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ ]; - mainProgram = "tutanota-desktop"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 249960029771..098051c72fb1 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2024.4"; + version = "2024.6"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-bsXlOzqGr37AZhEij68Fy2/3Lk50J7A3jHV0re5U6j0="; - aarch64-linux = "sha256-6OBCqOnSkXBntFGxXicPU7GSb9+a5WN4rYExgDa08/I="; + x86_64-linux = "sha256-paP9W23AbA9O4MiTdF5r7N50GgT4xu2vb9ktfBdPqDM="; + aarch64-linux = "sha256-5FRPjiLyWDe7RNlhkiF4NUaCxVkfXZbxeoQxNAAls/I="; }; in diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock index 1df9eeb250f0..305345ff2067 100644 --- a/pkgs/applications/networking/mullvad/Cargo.lock +++ b/pkgs/applications/networking/mullvad/Cargo.lock @@ -376,9 +376,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "camellia" @@ -432,6 +432,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[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" @@ -466,7 +472,7 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -499,7 +505,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -681,15 +687,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -708,9 +713,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.10.2" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -718,27 +723,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.10.2" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.9.3", - "syn 1.0.109", + "strsim", + "syn 2.0.60", ] [[package]] name = "darling_macro" -version = "0.10.2" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -809,27 +814,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.9.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "darling", - "derive_builder_core", - "proc-macro2", - "quote", - "syn 1.0.109", + "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.9.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.60", ] [[package]] @@ -864,6 +875,17 @@ 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.60", +] + [[package]] name = "duct" version = "0.13.7" @@ -979,7 +1001,7 @@ dependencies = [ "quote", "rustversion", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -1013,16 +1035,6 @@ dependencies = [ "libc", ] -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - [[package]] name = "fastrand" version = "2.0.2" @@ -1512,9 +1524,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" @@ -1554,9 +1566,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1608,6 +1620,124 @@ 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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +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", + "quote", + "syn 2.0.60", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1634,6 +1764,18 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -1717,6 +1859,12 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c429fffa658f288669529fc26565f728489a2e39bc7b24a428aaaf51355182e" +[[package]] +name = "ioctl-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c" + [[package]] name = "ipconfig" version = "0.3.2" @@ -1737,9 +1885,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" -version = "0.16.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" dependencies = [ "serde", ] @@ -1889,9 +2037,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libdbus-sys" @@ -1933,7 +2081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1964,6 +2112,12 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[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" @@ -2027,20 +2181,29 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybenot" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed977e86fc65a7ffae967a6a973e6f7a90b5d747ebd755703d5718804f7c16" +checksum = "e308ea251c8fe965732a020db1aa182a1df0cfb551da0d422bf83016d0f10153" dependencies = [ "byteorder", "hex", "libflate", "rand 0.8.5", "rand_distr", - "ring 0.16.20", + "ring", "serde", "simple-error", ] +[[package]] +name = "maybenot-ffi" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12a95dd874046b87f98b3a54e6beed8a63db6354088efd0ae7dc23c0f23931ce" +dependencies = [ + "maybenot", +] + [[package]] name = "md-5" version = "0.10.6" @@ -2102,6 +2265,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + [[package]] name = "mnl" version = "0.2.2" @@ -2137,7 +2312,6 @@ dependencies = [ "log", "mullvad-fs", "mullvad-types", - "once_cell", "rustls-pemfile", "serde", "serde_json", @@ -2165,6 +2339,8 @@ dependencies = [ "mullvad-types", "mullvad-version", "natord", + "serde", + "serde_json", "talpid-types", "thiserror", "tokio", @@ -2181,6 +2357,7 @@ dependencies = [ "clap", "ctrlc", "dirs", + "either", "fern", "futures", "libc", @@ -2195,7 +2372,6 @@ dependencies = [ "mullvad-version", "nix 0.23.2", "objc", - "once_cell", "regex", "serde", "serde_json", @@ -2235,6 +2411,23 @@ dependencies = [ "uuid", ] +[[package]] +name = "mullvad-ios" +version = "0.0.0" +dependencies = [ + "cbindgen", + "libc", + "log", + "oslog", + "shadowsocks-service", + "talpid-tunnel-config-client", + "talpid-types", + "tokio", + "tonic", + "tower", + "tunnel-obfuscation", +] + [[package]] name = "mullvad-jni" version = "0.0.0" @@ -2253,6 +2446,7 @@ dependencies = [ "talpid-tunnel", "talpid-types", "thiserror", + "tokio", ] [[package]] @@ -2265,7 +2459,6 @@ dependencies = [ "mullvad-paths", "mullvad-types", "nix 0.23.2", - "once_cell", "parity-tokio-ipc", "prost", "prost-types", @@ -2309,7 +2502,6 @@ dependencies = [ "mullvad-api", "mullvad-paths", "mullvad-version", - "once_cell", "regex", "talpid-platform-metadata", "talpid-types", @@ -2330,7 +2522,6 @@ dependencies = [ "itertools 0.12.1", "log", "mullvad-types", - "once_cell", "proptest", "rand 0.8.5", "serde_json", @@ -2350,7 +2541,6 @@ dependencies = [ "mullvad-paths", "mullvad-types", "mullvad-version", - "once_cell", "talpid-core", "talpid-future", "talpid-types", @@ -2364,10 +2554,10 @@ version = "0.0.0" dependencies = [ "chrono", "clap", + "either", "intersection-derive", "ipnetwork", "log", - "once_cell", "regex", "serde", "talpid-types", @@ -2515,11 +2705,23 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "memoffset 0.9.1", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + [[package]] name = "no-std-net" version = "0.6.0" @@ -2540,7 +2742,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -2561,16 +2763,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -2715,9 +2907,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pcap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f1686828a29fd8002fbf9c01506b4b2dd575c2305e1b884da3731abae8b9e0" +checksum = "fe4d339439e5e7f8ce32d58c2b58d5e304790e66f3aa0bd391dd6a9dc676e054" dependencies = [ "bitflags 1.3.2", "errno 0.2.8", @@ -2793,14 +2985,12 @@ dependencies = [ [[package]] name = "pfctl" -version = "0.4.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27590368dee28aa01e3024b639818a6bf0ad31635d9eca000aad63021a59284d" +checksum = "a44e65c0d3523afa79a600a3964c3ac0fabdabe2d7c68da624b2bb0b441b9d61" dependencies = [ "derive_builder", - "errno 0.2.8", - "error-chain", - "ioctl-sys", + "ioctl-sys 0.8.0", "ipnetwork", "libc", ] @@ -2891,12 +3081,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 = "pnet_base" version = "0.34.0" @@ -3283,21 +3467,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -3308,8 +3477,8 @@ dependencies = [ "cfg-if", "getrandom 0.2.14", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] @@ -3328,7 +3497,7 @@ dependencies = [ "p384", "pkcs8", "rand_core 0.6.4", - "ring 0.17.8", + "ring", "signature", ] @@ -3394,7 +3563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki", "sct", ] @@ -3414,8 +3583,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -3463,8 +3632,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -3498,18 +3667,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -3518,11 +3687,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3573,9 +3743,9 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.18.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5edddeff89d9874fa59366cfc506b53525410f129bbf13064ab36de15374e6" +checksum = "fb6a87d691a190af90706a2846b6d53ab16afbbb582eed8b9e6b9dca2d0a633a" dependencies = [ "arc-swap", "async-trait", @@ -3598,12 +3768,12 @@ dependencies = [ "serde_urlencoded", "shadowsocks-crypto", "socket2", - "spin 0.9.8", + "spin", "thiserror", "tokio", "tokio-tfo", "url", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3626,22 +3796,11 @@ dependencies = [ "sha1", ] -[[package]] -name = "shadowsocks-proxy" -version = "0.0.0" -dependencies = [ - "cbindgen", - "log", - "oslog", - "shadowsocks-service", - "tokio", -] - [[package]] name = "shadowsocks-service" -version = "1.18.3" +version = "1.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be0ae9c02adf5fb2a91cdee6b3d6e3610d88411114080280e816d817fe437c8" +checksum = "c0c0ce5a3a15e2688b7014c37ed3db33dc296d8b8fda36643c053882bf1d5f44" dependencies = [ "arc-swap", "async-trait", @@ -3651,15 +3810,16 @@ dependencies = [ "cfg-if", "futures", "http-body-util", - "hyper 1.3.1", - "idna 0.5.0", + "httparse", + "hyper 1.4.1", + "idna 1.0.2", "ipnet", "iprange", "json5", "libc", "log", "lru_time_cache", - "nix 0.28.0", + "nix 0.29.0", "once_cell", "pin-project", "rand 0.8.5", @@ -3667,10 +3827,10 @@ dependencies = [ "serde", "shadowsocks", "socket2", - "spin 0.9.8", + "spin", "thiserror", "tokio", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3754,12 +3914,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[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" @@ -3780,10 +3934,10 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.9.3" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" @@ -3862,6 +4016,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -3916,6 +4081,8 @@ dependencies = [ "subslice", "system-configuration", "talpid-dbus", + "talpid-macos", + "talpid-net", "talpid-openvpn", "talpid-platform-metadata", "talpid-routing", @@ -3943,7 +4110,6 @@ dependencies = [ "dbus", "libc", "log", - "once_cell", "thiserror", "tokio", ] @@ -3958,6 +4124,24 @@ dependencies = [ "tokio", ] +[[package]] +name = "talpid-macos" +version = "0.0.0" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "talpid-net" +version = "0.0.0" +dependencies = [ + "libc", + "log", + "socket2", + "talpid-types", +] + [[package]] name = "talpid-openvpn" version = "0.0.0" @@ -4001,6 +4185,7 @@ dependencies = [ "tonic", "tonic-build", "tower", + "winapi", "windows-sys 0.52.0", "winres", ] @@ -4026,7 +4211,6 @@ dependencies = [ "netlink-packet-route", "netlink-sys", "nix 0.28.0", - "once_cell", "rtnetlink", "system-configuration", "talpid-types", @@ -4069,7 +4253,6 @@ dependencies = [ name = "talpid-tunnel-config-client" version = "0.0.0" dependencies = [ - "cbindgen", "classic-mceliece-rust", "libc", "log", @@ -4139,6 +4322,7 @@ dependencies = [ "socket2", "surge-ping", "talpid-dbus", + "talpid-net", "talpid-routing", "talpid-tunnel", "talpid-tunnel-config-client", @@ -4150,6 +4334,7 @@ dependencies = [ "tunnel-obfuscation", "widestring", "windows-sys 0.52.0", + "wireguard-go-rs", "zeroize", ] @@ -4213,6 +4398,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -4230,21 +4425,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4259,9 +4453,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -4303,9 +4497,9 @@ dependencies = [ [[package]] name = "tokio-tfo" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b433f102de6c9b0546dc73398ba3d38d8a556f29f731268451e0b1b3aab9e" +checksum = "3fb4382c6371e29365853d2b71e915d5398df46312a2158097d8bb3f54d0f1b4" dependencies = [ "cfg-if", "futures", @@ -4315,7 +4509,7 @@ dependencies = [ "pin-project", "socket2", "tokio", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4464,7 +4658,6 @@ name = "translations-converter" version = "0.0.0" dependencies = [ "htmlize", - "once_cell", "quick-xml", "regex", "serde", @@ -4492,7 +4685,7 @@ dependencies = [ "byteorder", "bytes", "futures-core", - "ioctl-sys", + "ioctl-sys 0.6.0", "libc", "thiserror", "tokio", @@ -4504,22 +4697,14 @@ name = "tunnel-obfuscation" version = "0.0.0" dependencies = [ "async-trait", + "log", + "nix 0.23.2", + "shadowsocks", "thiserror", "tokio", "udp-over-tcp", ] -[[package]] -name = "tunnel-obfuscator-proxy" -version = "0.0.0" -dependencies = [ - "cbindgen", - "log", - "oslog", - "tokio", - "tunnel-obfuscation", -] - [[package]] name = "typenum" version = "1.17.0" @@ -4588,12 +4773,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -4612,6 +4791,18 @@ dependencies = [ "serde", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[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" @@ -4728,16 +4919,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "which" version = "4.4.2" @@ -4793,7 +4974,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4844,7 +5025,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4879,18 +5069,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -4907,9 +5097,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4931,9 +5121,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4955,15 +5145,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4985,9 +5175,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5009,9 +5199,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5027,9 +5217,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5051,9 +5241,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" @@ -5084,6 +5274,29 @@ dependencies = [ "toml", ] +[[package]] +name = "wireguard-go-rs" +version = "0.0.0" +dependencies = [ + "anyhow", + "log", + "maybenot-ffi", + "thiserror", + "zeroize", +] + +[[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 = "x25519-dalek" version = "2.0.1" @@ -5096,6 +5309,30 @@ dependencies = [ "zeroize", ] +[[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", + "quote", + "syn 2.0.60", + "synstructure 0.13.1", +] + [[package]] name = "zerocopy" version = "0.7.32" @@ -5117,10 +5354,31 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.7.0" +name = "zerofrom" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +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", + "quote", + "syn 2.0.60", + "synstructure 0.13.1", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -5135,3 +5393,25 @@ dependencies = [ "quote", "syn 2.0.60", ] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 88d0ae1b6f51..12e6c1deccc3 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -10,19 +10,19 @@ buildGoModule { src ; - sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - - vendorHash = "sha256-gaU3na3sjzM6lvmsGRkuGtV2AHvkl6IgzmyGx3R5ZpM="; + modRoot = "wireguard-go-rs/libwg"; + proxyVendor = true; + vendorHash = "sha256-uyAzY1hoCtS7da3wtjxTGx5wBb9c9m749TzihVr94rc="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work # (this doesn't get communicated everywhere in the chain, apparently, so # `go` complains that it can't find an `a.out` file). GOBIN = "${placeholder "out"}/lib"; - ldflags = [ "-s" "-w" "-buildmode=c-archive" ]; - patches = [ - ]; + subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-buildmode=c-archive" ]; + tags = [ "daita" ]; postInstall = '' mv $out/lib/libwg{,.a} @@ -30,7 +30,7 @@ buildGoModule { meta = with lib; { description = "Tiny wrapper around wireguard-go"; - homepage = "https://github.com/mullvad/mullvadvpn-app/tree/main/wireguard/libwg"; + homepage = "https://github.com/mullvad/mullvadvpn-app/tree/main/wireguard-go-rs/libwg"; license = licenses.gpl3Only; maintainers = with maintainers; [ cole-h ]; }; diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index b43881123a90..478c66282133 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -14,16 +14,27 @@ , openvpn-mullvad , shadowsocks-rust , installShellFiles +, writeShellScriptBin }: +let + # NOTE(cole-h): This is necessary because wireguard-go-rs executes go in its build.rs (whose goal + # is to produce $OUT_DIR/libwg.a), and a mixed Rust-Go build is non-trivial (read: I didn't want + # to attempt it). So, we just fake the "go" binary and do what it would have done: put libwg.a + # under $OUT_DIR so that it can be linked against. + fakeGoCopyLibwg = writeShellScriptBin "go" '' + [ ! -e "$OUT_DIR"/libwg.a ] && cp ${libwg}/lib/libwg.a "$OUT_DIR"/libwg.a + ''; +in rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2024.4"; + version = "2024.7"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-d7poR1NnvqaPutXLFizpQnyipl+38N1Qe2zVXeV7v1Q="; + fetchSubmodules = true; + hash = "sha256-me0e8Cb1dRrnAeiCmsXiclcDMruVLV3t0eGAM3RU1es="; }; cargoLock = { @@ -41,6 +52,7 @@ rustPlatform.buildRustPackage rec { makeWrapper git installShellFiles + fakeGoCopyLibwg ]; buildInputs = [ @@ -49,13 +61,6 @@ rustPlatform.buildRustPackage rec { libmnl ]; - # talpid-core wants libwg.a in build/lib/{triple} - preBuild = '' - dest=build/lib/${stdenv.hostPlatform.config} - mkdir -p $dest - ln -s ${libwg}/lib/libwg.a $dest - ''; - postInstall = '' compdir=$(mktemp -d) for shell in bash zsh fish; do diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index ba77425b5ef8..e61a6d107440 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -38,7 +38,6 @@ let meta = with lib; { description = "Low-latency, high quality voice chat software"; - mainProgram = "mumble-server"; homepage = "https://mumble.info"; license = licenses.bsd3; maintainers = with maintainers; [ felixsinger lilacious ]; @@ -117,6 +116,6 @@ let ]; }; in { - mumble = client source; - murmur = server source; + mumble = lib.recursiveUpdate (client source) {meta.mainProgram = "mumble";}; + murmur = lib.recursiveUpdate (server source) {meta.mainProgram = "mumble-server";}; } diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 8c09422a11ff..d2ed2c084015 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.14.2"; + version = "3.14.3"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; rev = "refs/tags/v${version}"; - hash = "sha256-vxCt/FNfQZ7rWME2zLGESgW/+FNoENZeCr8FFcGwoFQ="; + hash = "sha256-nYoBs5EnWiqYRsqc5CPxCIs0NAxSprI9PV0lO/c8khw="; }; patches = [ diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 9e7152393a4d..e0b6a80c1749 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -82,6 +82,7 @@ rec { pysocks qrcode requests + setuptools stem unidecode waitress diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 767897dbd04a..891a4214fe78 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.21.2"; + version = "0.22.1"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz"; - hash = "sha256-jCNRJo6bi6KtKIuLM3zjmfecGOP/2WCAP07V3n3an6E="; + hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index e6cd3a31adf5..ffda991b0c37 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -29,13 +29,13 @@ in stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-iwqJaRfwJTL6SimWTNqqqFPXxSKrgo6whYY70llZyGs"; + hash = "sha256-BmfTQGftQIkRrlSpJy0yHTh0r3D2CWLIo+tnL0+OeA4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix deleted file mode 100644 index e39bbee5cd88..000000000000 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip -, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl -, unstableGitUpdater }: - -stdenv.mkDerivation rec { - pname = "transgui"; - version = "5.18.0-unstable-2024-02-26"; - - src = fetchFromGitHub { - owner = "transmission-remote-gui"; - repo = "transgui"; - rev = "25df397d92fbd53b970ef72a6ffd9f644458f935"; - hash = "sha256-jQIe2vTDeJM/lhl6alNhEPOqXjyd18x+Kg29+le/dks="; - }; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf - pango atk cairo openssl - ]; - - NIX_LDFLAGS = '' - -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 - -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo - -lc -lcrypto - ''; - - postPatch = '' - substituteInPlace restranslator.pas --replace /usr/ $out/ - ''; - - preBuild = '' - FPCDIR=${fpc}/lib/fpc/${fpc.version} fpcmake -w - lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus - ''; - - makeFlags = [ "FPC=fpc" "PP=fpc" "INSTALL_PREFIX=$(out)" ]; - - LCL_PLATFORM = "gtk2"; - - desktopItem = makeDesktopItem { - name = pname; - exec = "${pname} %U"; - icon = pname; - type = "Application"; - comment = meta.description; - desktopName = "Transmission Remote GUI"; - genericName = "BitTorrent Client"; - categories = [ "Network" "FileTransfer" "P2P" "GTK" ]; - startupNotify = true; - mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; - }; - - postInstall = '' - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* $out/share/applications - mkdir -p "$out/share/icons/hicolor/48x48/apps" - cp transgui.png "$out/share/icons/hicolor/48x48/apps" - mkdir -p "$out/share/transgui" - cp -r "./lang" "$out/share/transgui" - ''; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = { - description = "A cross platform front-end for the Transmission BitTorrent client"; - homepage = "https://sourceforge.net/p/transgui"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ramkromberg ]; - mainProgram = "transgui"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 25296efe6926..900fd4a3974b 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -113,6 +113,10 @@ stdenv.mkDerivation (finalAttrs: { cmake/FindUtfCpp.cmake # Upstream uses different config file name. substituteInPlace CMakeLists.txt --replace 'find_package(UtfCpp)' 'find_package(utf8cpp)' + + # Use gettext even on Darwin + substituteInPlace libtransmission/utils.h \ + --replace-fail '#if defined(HAVE_GETTEXT) && !defined(__APPLE__)' '#if defined(HAVE_GETTEXT)' ''; nativeBuildInputs = [ @@ -145,8 +149,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ] - ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; postInstall = '' mkdir $apparmor diff --git a/pkgs/applications/networking/peroxide/default.nix b/pkgs/applications/networking/peroxide/default.nix deleted file mode 100644 index 6e8537275f05..000000000000 --- a/pkgs/applications/networking/peroxide/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nixosTests -}: - -buildGoModule rec { - pname = "peroxide"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "ljanyst"; - repo = "peroxide"; - rev = "v${version}"; - sha256 = "sha256-6Jb1i4aNjeemiQp9FF/KGyZ+Evom9PPBvARbJWyrhok="; - }; - - vendorHash = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY="; - - postPatch = '' - # These tests connect to the internet, which does not work in sandboxed - # builds, so skip these. - rm pkg/pmapi/dialer_pinning_test.go \ - pkg/pmapi/dialer_proxy_provider_test.go \ - pkg/pmapi/dialer_proxy_test.go - ''; - - passthru.tests.peroxide = nixosTests.peroxide; - - meta = with lib; { - homepage = "https://github.com/ljanyst/peroxide"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aidalgol ]; - description = "Unofficial ProtonMail bridge"; - longDescription = '' - Peroxide is a fork of the official ProtonMail bridge that aims to be - similar to Hydroxide while reusing as much code from the official bridge - as possible. - ''; - }; -} diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix deleted file mode 100644 index 942cad0d42fe..000000000000 --- a/pkgs/applications/networking/scaleft/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, patchelf, testers, scaleft }: - -stdenv.mkDerivation rec { - pname = "scaleft"; - version = "1.80.1"; - - src = - fetchurl { - url = "https://dist.scaleft.com/repos/rpm/stable/centos/9/x86_64/1.80.1/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "sha256-QrkqAgkplFF6Tp6FWKb2TJaqeOw8ec4zd9pymDP2IyY="; - }; - - nativeBuildInputs = [ patchelf rpmextract ]; - - libPath = - lib.makeLibraryPath - [ stdenv.cc stdenv.cc.cc.lib ]; - - buildCommand = '' - mkdir -p $out/bin/ - cd $out - rpmextract $src - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - usr/bin/sft - patchelf \ - --set-rpath ${libPath} \ - usr/bin/sft - ln -s $out/usr/bin/sft $out/bin/sft - chmod +x $out/bin/sft - patchShebangs $out - ''; - - passthru.tests.version = testers.testVersion { - package = scaleft; - command = "sft -v"; - version = "sft version ${version}"; - }; - - meta = with lib; { - description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; - homepage = "https://www.scaleft.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ jloyet ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "sft"; - }; -} diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 2575d3b4e480..35cb5d54c18f 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "seafile-client"; - version = "9.0.8"; + version = "9.0.9"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-1E/PgQEg8lQntKpafCubPNUIF/L3kjA/rp1xAL8vFfs="; + sha256 = "sha256-dy5EXDEyxtV88Fgbao/J3fNwO5AO/ES0IJLIeRenO8I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix deleted file mode 100644 index 18ae42d244e9..000000000000 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, testers -, seaweedfs -}: - -buildGoModule rec { - pname = "seaweedfs"; - version = "3.75"; - - src = fetchFromGitHub { - owner = "seaweedfs"; - repo = "seaweedfs"; - rev = version; - hash = "sha256-f4ddm9+A3Km0aKlKFeoFMKxm94u0pbNvHaozesmQCH4="; - }; - - vendorHash = "sha256-hdvlz3KbB6wPva3o5suEApgZ6w98R8TPYrPlmqYJbvo="; - - subPackages = [ "weed" ]; - - ldflags = [ - "-w" - "-s" - "-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=N/A" - ]; - - tags = [ - "elastic" - "gocdk" - "sqlite" - "ydb" - "tikv" - ]; - - preBuild = '' - export GODEBUG=http2client=0 - ''; - - preCheck = '' - # Test all targets. - unset subPackages - - # Remove unmaintained tests ahd those that require additional services. - rm -rf unmaintained test/s3 - ''; - - passthru.tests.version = testers.testVersion { - package = seaweedfs; - command = "weed version"; - }; - - meta = with lib; { - description = "Simple and highly scalable distributed file system"; - homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ azahi cmacrae wozeparrot ]; - mainProgram = "weed"; - license = licenses.asl20; - }; -} diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index fd7c37e58962..78453da19d16 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests requests-toolbelt setuptools sqlalchemy ]; - makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; + makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${lib.getLib fuse}/lib/libfuse.so" ]; postFixup = '' function lnOverBin() { diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 66fa5665ccaf..8468749b7eaa 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, lua, pkg-config, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }: +asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, apple-sdk_11 }: +let + xnu = apple-sdk_11.sourceRelease "xnu"; +in stdenv.mkDerivation rec { pname = "lsyncd"; version = "2.3.1"; @@ -19,7 +22,11 @@ stdenv.mkDerivation rec { # Special flags needed on Darwin: # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "-DWITH_INOTIFY=OFF" + "-DWITH_FSEVENTS=ON" + "-DXNU_DIR=${xnu}" + ]; dontUseCmakeBuildDir = true; @@ -28,7 +35,7 @@ stdenv.mkDerivation rec { rsync lua asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; meta = with lib; { homepage = "https://github.com/axkibe/lsyncd"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b87752f0412b..10c5fda3c15c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,26 +3,26 @@ , buildGoModule , stdenv , lib -, procps , fetchFromGitHub , nixosTests , autoSignDarwinBinariesHook +, nix-update-script }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.12"; + version = "1.28.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; - rev = "v${version}"; - hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI="; }; - vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4="; + vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when @@ -43,7 +43,7 @@ let ( export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD go build build.go - go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto ) ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} runHook postBuild @@ -57,8 +57,11 @@ let inherit postInstall; - passthru.tests = { - inherit (nixosTests) syncthing syncthing-init syncthing-relay; + passthru = { + tests = { + inherit (nixosTests) syncthing syncthing-init syncthing-relay; + }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix deleted file mode 100644 index 7e8648c3bb0e..000000000000 --- a/pkgs/applications/networking/trayscale/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, wrapGAppsHook4 -, tailscale -, gtk4 -, gobject-introspection -, libadwaita -}: - -buildGoModule rec { - pname = "trayscale"; - version = "0.13.1"; - - src = fetchFromGitHub { - owner = "DeedleFake"; - repo = "trayscale"; - rev = "v${version}"; - hash = "sha256-uOPTF6AD70POD1y0R5aXo7t9WtyFGbRrgL8U++nTRl0="; - }; - - vendorHash = "sha256-8lrszfxTKLA3KRuuQ312s+1GfK63DwQEK8xDwb1JdrI="; - - subPackages = [ "cmd/trayscale" ]; - - ldflags = [ - "-s" - "-w" - "-X=deedles.dev/trayscale/internal/version.version=${version}" - ]; - - nativeBuildInputs = [ pkg-config gobject-introspection wrapGAppsHook4 ]; - buildInputs = [ gtk4 libadwaita ]; - - # there are no actual tests, and it takes 20 minutes to rebuild - doCheck = false; - - postInstall = '' - sh ./dist.sh install $out - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${tailscale}/bin") - ''; - - meta = with lib; { - changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}"; - description = "Unofficial GUI wrapper around the Tailscale CLI client"; - homepage = "https://github.com/DeedleFake/trayscale"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "trayscale"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index df7b95573783..f07a1e9b561d 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, fetchpatch, rustPlatform, @@ -83,6 +84,7 @@ rec { homepage = "https://github.com/ActivityWatch/aw-watcher-window"; maintainers = with maintainers; [ huantian ]; license = licenses.mpl20; + badPlatforms = lib.platforms.darwin; # requires pyobjc-framework }; }; @@ -140,6 +142,7 @@ rec { homepage = "https://github.com/ActivityWatch/aw-qt"; maintainers = with maintainers; [ huantian ]; license = licenses.mpl20; + badPlatforms = lib.platforms.darwin; # requires pyobjc-framework }; }; diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix deleted file mode 100644 index 8afc96eaf88c..000000000000 --- a/pkgs/applications/office/banana-accounting/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ autoPatchelfHook -, cairo -, e2fsprogs -, fetchurl -, gmp -, gtk3 -, libGL -, libX11 -, lib -, stdenv -, libgcrypt -, wrapGAppsHook3 -}: - -stdenv.mkDerivation { - pname = "banana-accounting"; - version = "10.0.12"; - - srcs = fetchurl { - url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; - hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw="; - }; - - sourceRoot = "."; - - dontConfigure = true; - dontBuild = true; - - buildInputs = [ - cairo - e2fsprogs - gmp - gtk3 - stdenv.cc.cc.lib - libGL - libX11 - libgcrypt - ]; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mv ./* $out - ln -s $out/usr/bin/bananaplus $out/bin/ - runHook postInstall - ''; - - meta = with lib; { - description = "Accounting Software for small companies, associations and individuals"; - homepage = "https://www.banana.ch/"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jacg ]; - }; -} diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix deleted file mode 100644 index 3f0544d56f6e..000000000000 --- a/pkgs/applications/office/docear/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{lib, stdenv, fetchurl, runtimeShell, makeWrapper -, oraclejre -, antialiasFont ? true -}: - -stdenv.mkDerivation { - pname = "docear"; - version = "1.2"; - - src = fetchurl { - url = "http://docear.org/downloads/docear_linux.tar.gz"; - sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ oraclejre ]; - - buildPhase = ""; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - cp -R * $out/share - chmod 0755 $out/share/ -R - - # The wrapper ensures oraclejre is used - makeWrapper ${runtimeShell} $out/bin/docear \ - --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \ - --set JAVA_HOME ${oraclejre.home} \ - --add-flags "$out/share/docear.sh" - - chmod 0755 $out/bin/docear - ''; - - meta = with lib; { - description = "Unique solution to academic literature management"; - homepage = "http://www.docear.org/"; - # Licenses at: http://www.docear.org/software/download/ - license = with licenses; [ - gpl2 # for the main software and some dependencies - bsd3 # for one of its dependencies - ]; - maintainers = with maintainers; [ unode ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix deleted file mode 100644 index 5679c44ca2dc..000000000000 --- a/pkgs/applications/office/espanso/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ lib -, coreutils -, fetchFromGitHub -, rustPlatform -, pkg-config -, extra-cmake-modules -, dbus -, libX11 -, libXi -, libXtst -, libnotify -, libxkbcommon -, openssl -, xclip -, xdotool -, setxkbmap -, wl-clipboard -, wxGTK32 -, makeWrapper -, stdenv -, AppKit -, Cocoa -, Foundation -, IOKit -, Kernel -, AVFoundation -, Carbon -, QTKit -, AVKit -, WebKit -, System -, waylandSupport ? false -, x11Support ? stdenv.hostPlatform.isLinux -, testers -, espanso -}: -# espanso does not support building with both X11 and Wayland support at the same time -assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport; -assert stdenv.hostPlatform.isDarwin -> !x11Support; -assert stdenv.hostPlatform.isDarwin -> !waylandSupport; -rustPlatform.buildRustPackage rec { - pname = "espanso"; - version = "2.2-unstable-2024-05-14"; - - src = fetchFromGitHub { - owner = "espanso"; - repo = "espanso"; - rev = "8daadcc949c35a7b7aa20b7f544fdcff83e2c5f7"; - hash = "sha256-4MArENBmX6tDVLZE1O8cuJe7A0R+sLZoxBkDvIwIVZ4="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU="; - }; - }; - - nativeBuildInputs = [ - extra-cmake-modules - pkg-config - makeWrapper - wxGTK32 - ]; - - # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4 - buildNoDefaultFeatures = true; - buildFeatures = [ - "modulo" - ] ++ lib.optionals waylandSupport [ - "wayland" - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "vendored-tls" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "native-tls" - ]; - - buildInputs = [ - wxGTK32 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - openssl - dbus - libnotify - libxkbcommon - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - IOKit - Kernel - AVFoundation - Carbon - QTKit - AVKit - WebKit - System - ] ++ lib.optionals waylandSupport [ - wl-clipboard - ] ++ lib.optionals x11Support [ - libXi - libXtst - libX11 - xclip - xdotool - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace scripts/create_bundle.sh \ - --replace-fail target/mac/ $out/Applications/ \ - --replace-fail /bin/echo ${coreutils}/bin/echo - patchShebangs scripts/create_bundle.sh - substituteInPlace espanso/src/res/macos/Info.plist \ - --replace-fail "espanso" "${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso" - substituteInPlace espanso/src/path/macos.rs espanso/src/path/linux.rs \ - --replace-fail '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' - ''; - - # Some tests require networking - doCheck = false; - - postInstall = - if stdenv.hostPlatform.isDarwin then '' - EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh - '' else '' - wrapProgram $out/bin/espanso \ - --prefix PATH : ${lib.makeBinPath ( - lib.optionals stdenv.hostPlatform.isLinux [ - libnotify - setxkbmap - ] ++ lib.optionals waylandSupport [ - wl-clipboard - ] ++ lib.optionals x11Support [ - xclip - ] - )} - ''; - - passthru.tests.version = testers.testVersion { - package = espanso; - # remove when updating to a release version - version = "2.2.1"; - }; - - meta = with lib; { - description = "Cross-platform Text Expander written in Rust"; - mainProgram = "espanso"; - homepage = "https://espanso.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kimat pyrox0 n8henrie ]; - platforms = platforms.unix; - # With apple_sdk_10_12, - # kCFURLVolumeAvailableCapacityForImportantUsageKey - # is undefined. - # With apple_sdk_11_0, there is an issue with - # kColorSyncGenericGrayProfile. - broken = stdenv.hostPlatform.system == "x86_64-darwin"; - - - longDescription = '' - Espanso detects when you type a keyword and replaces it while you're typing. - ''; - }; -} diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 32cbcf088c51..3f9e20d7a042 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -24,6 +24,7 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64" else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" + else if stdenv.hostPlatform.system == "aarch64-darwin" then "macos-aarch64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; desktopItem = makeDesktopItem { @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { # and is not able to build the application itself buildPhase = '' runHook preBuild - ant -f build -Dsystem.version=${version} init compile jar + ant -f build -Dsystem.version=${version} init compile jar ${lib.optionalString stdenv.hostPlatform.isDarwin "zip lib"} runHook postBuild ''; @@ -75,6 +76,13 @@ stdenv.mkDerivation rec { install -Dm644 plugin.xml $out/share/java/ install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png cp ${desktopItem}/share/applications/* $out/share/applications/ + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + + # Create .app bundle for macOS + mkdir -p $out/Applications + chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh + cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app + '' + '' runHook postInstall ''; @@ -101,7 +109,7 @@ stdenv.mkDerivation rec { binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ flokli r3dl3g ]; mainProgram = "jameica"; }; diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix deleted file mode 100644 index db3e5c6876d9..000000000000 --- a/pkgs/applications/office/karlender/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitLab -, pkg-config -, gtk4 -, libadwaita -, wrapGAppsHook4 -, glib -, tzdata -}: - -rustPlatform.buildRustPackage rec { - pname = "karlender"; - version = "0.9.2"; - - src = fetchFromGitLab { - owner = "floers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-txPMOWwxgs9PH1Scnwr/X4cuMIUa+eoLW3K2aqmqRMQ="; - }; - - cargoHash = "sha256-OyyzzkoYBed2XFCesj3QBodT9e/BaapGl/z0f6+cDZA="; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook4 - glib - ]; - - buildInputs = [ - gtk4 - libadwaita - ]; - - postPatch = '' - substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - substituteInPlace build.rs --replace "// gra::build" "gra::build" - ''; - - postInstall = '' - substituteInPlace target/gra-gen/data/codes.loers.Karlender.desktop \ - --replace "Exec=codes.loers.Karlender" "Exec=karlender" - substituteInPlace target/gra-gen/data/codes.loers.Karlender.appdata.xml \ - --replace "codes.loers.Karlender" "karlender" - install -Dm444 target/gra-gen/codes.loers.Karlender.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas/ - glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ - install -Dm444 target/gra-gen/data/codes.loers.Karlender.svg -t $out/share/icons/hicolor/scalable/apps/ - install -Dm444 target/gra-gen/data/codes.loers.Karlender.64.png -T $out/share/icons/hicolor/64x64/apps/codes.loers.Karlender.png - install -Dm444 target/gra-gen/data/codes.loers.Karlender.128.png -T $out/share/icons/hicolor/128x128/apps/codes.loers.Karlender.png - install -Dm444 target/gra-gen/data/codes.loers.Karlender.desktop -t $out/share/applications/ - install -Dm444 target/gra-gen/data/codes.loers.Karlender.appdata.xml -t $out/share/metainfo/ - ''; - - meta = with lib; { - description = "Mobile-friendly GTK calendar application"; - mainProgram = "karlender"; - homepage = "https://gitlab.com/floers/karlender"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix deleted file mode 100644 index 9821cdd2f2f8..000000000000 --- a/pkgs/applications/office/kitsas/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: - -stdenv.mkDerivation rec { - pname = "kitsas"; - version = "4.0.5"; - - src = fetchFromGitHub { - owner = "artoh"; - repo = "kitupiikki"; - rev = "v${version}"; - hash = "sha256-ODl1yrtrCVhuBWbA1AvHl22d+JSdySG/Gi2hlpVW3jg="; - }; - - postPatch = '' - substituteInPlace kitsas/kitsas.pro \ - --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5" - ''; - - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - - buildInputs = [ qtsvg poppler libzip ]; - - # We use a separate build-dir as otherwise ld seems to get confused between - # directory and executable name on buildPhase. - preConfigure = '' - mkdir build && cd build - ''; - - qmakeFlags = [ "../kitsas/kitsas.pro" ]; - - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv kitsas.app $out/Applications - '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - install -Dm755 kitsas -t $out/bin - install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps - install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps - install -Dm644 ../kitsas.desktop -t $out/share/applications - ''; - - meta = with lib; { - homepage = "https://github.com/artoh/kitupiikki"; - description = "Accounting tool suitable for Finnish associations and small business"; - mainProgram = "kitsas"; - maintainers = with maintainers; [ gspia ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f0ffec6d9275..e9a97025455c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -99,7 +99,7 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" "zh-TW" ] , withFonts ? false , withHelp ? true , kdeIntegration ? false @@ -548,7 +548,9 @@ in stdenv.mkDerivation (finalAttrs: { buildTargets = [ "build-nocheck" ]; - doCheck = true; + # Disable tests for the Qt5 build, as they seem even more flaky + # than usual, and we will drop the Qt5 build after 24.11 anyway. + doCheck = !(kdeIntegration && qtMajor == "5"); preCheck = '' export HOME=$(pwd) diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index 38354245ba1e..a2876c9cd294 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.9.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.9.0.tar.xz"; - sha256 = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412"; + name = "curl-8.10.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz"; + sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee"; md5 = ""; - md5name = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412-curl-8.9.0.tar.xz"; + md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -147,11 +147,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.6.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz"; - sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364"; + name = "expat-2.6.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz"; + sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc"; md5 = ""; - md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz"; + md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -658,11 +658,11 @@ md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.8-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz"; - sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8"; + name = "mariadb-connector-c-3.3.11-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; + sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; md5 = ""; - md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz"; + md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -742,11 +742,11 @@ md5name = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e-openldap-2.6.8.tgz"; } { - name = "openssl-3.0.14.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; - sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; + name = "openssl-3.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz"; + sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533"; md5 = ""; - md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; + md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -777,25 +777,25 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.43.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz"; - sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"; + name = "libpng-1.6.44.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; + sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; md5 = ""; - md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz"; + md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; } { - name = "tiff-4.6.0t.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.6.0t.tar.xz"; - sha256 = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b"; + name = "tiff-4.7.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; + sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; md5 = ""; - md5name = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b-tiff-4.6.0t.tar.xz"; + md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-24.06.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-24.06.0.tar.xz"; - sha256 = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76"; + name = "poppler-24.08.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz"; + sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"; md5 = ""; - md5name = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76-poppler-24.06.0.tar.xz"; + md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +805,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.15.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.15.tar.bz2"; - sha256 = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925"; + name = "postgresql-13.16.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; + sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; md5 = ""; - md5name = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925-postgresql-13.15.tar.bz2"; + md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; } { - name = "Python-3.9.19.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.19.tar.xz"; - sha256 = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e"; + name = "Python-3.9.20.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.9.20.tar.xz"; + sha256 = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c"; md5 = ""; - md5name = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e-Python-3.9.19.tar.xz"; + md5name = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c-Python-3.9.20.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 2a807c361595..2544928cdde9 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1vbi2qbap3ccychc0sfn32z46klyzjh0hhk4in0sd7qkl97y6lvn"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-help-24.8.0.3.tar.xz"; + sha256 = "1xlfs1380h9axqx37kp9nwq4bwlg08rm136ayzglaz57vx87vxsg"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 2bbbb6b3b0c2..6bda045c5779 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1hbqgpgih3j9ic1dljxz3mz0rsjf0iyws7qm7g1hb35ns664c4av"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-24.8.0.3.tar.xz"; + sha256 = "1ky4ph9g7x9k68px6x4dgfnf5wqbxqabkp75pjhsj521nsp1nc5b"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-24.8.2.1.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index d5890a86e2cb..488ee5acfe1c 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0p75xijrmp44kcda33xg5dr06xl1fcxwhxgvlcj396rkn2k0c9sy"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-translations-24.8.0.3.tar.xz"; + sha256 = "1yvfcwj9dr2216b9fyi89849jy4lw3jg2yqrx4dm30qdn07jqf3j"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index e6bf645f8082..7e7df1e016ec 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"24.8.0.3" +"24.8.2.1" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index d9ef29364fc8..5f406733814a 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz"; - sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"; + name = "curl-8.10.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz"; + sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee"; md5 = ""; - md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz"; + md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -147,11 +147,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.6.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz"; - sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364"; + name = "expat-2.6.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz"; + sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc"; md5 = ""; - md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz"; + md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -630,11 +630,11 @@ md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; } { - name = "libxml2-2.12.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz"; - sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93"; + name = "libxml2-2.12.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; + sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; md5 = ""; - md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz"; + md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; } { name = "libxslt-1.1.39.tar.xz"; @@ -658,11 +658,11 @@ md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; } { - name = "mariadb-connector-c-3.3.8-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz"; - sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8"; + name = "mariadb-connector-c-3.3.11-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; + sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; md5 = ""; - md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz"; + md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -700,11 +700,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.99-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz"; - sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31"; + name = "nss-3.101.2-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz"; + sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa"; md5 = ""; - md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz"; + md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -742,11 +742,11 @@ md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; } { - name = "openssl-3.0.14.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; - sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; + name = "openssl-3.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz"; + sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533"; md5 = ""; - md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; + md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -777,25 +777,25 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.43.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz"; - sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"; + name = "libpng-1.6.44.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; + sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; md5 = ""; - md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz"; + md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; } { - name = "tiff-4.6.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz"; - sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"; + name = "tiff-4.7.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; + sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; md5 = ""; - md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz"; + md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-23.09.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz"; - sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55"; + name = "poppler-24.08.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz"; + sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"; md5 = ""; - md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz"; + md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +805,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2"; - sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed"; + name = "postgresql-13.16.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; + sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; md5 = ""; - md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2"; + md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; } { - name = "Python-3.8.19.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz"; - sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076"; + name = "Python-3.8.20.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.20.tar.xz"; + sha256 = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4"; md5 = ""; - md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz"; + md5name = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4-Python-3.8.20.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index 0f9f54905270..b61ff5be0e7b 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "090pi8dnj5izpvng94hgmjid14n7xvy3rlqqvang3pqdn35xnpsl"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz"; + sha256 = "0g31xfmmxjd5c1xg203gflzvq2d2jlgfi9gmg1wxl18l9gjk4hds"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-help-24.2.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index 69376e497a11..2bb8d53a4de6 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "03halzc9w4z8pfs8krpswp2qzrqq9rhnmms8v8ny88am87vy85lw"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz"; + sha256 = "1r8h8g5fs7z0fvf7f6fq44rw90q4v2z23kkwzdh1s8gaxlnb3sgm"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-24.2.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index b96943060182..fd248167fbc2 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0fri41y59zhm8lq0kh6hvf5rpdjdqx0lg1sl40mhh1d6lf1izc1w"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz"; + sha256 = "0g2wp8s3gxhy3l685jv3h63gzaljfclgcah437922dl60kpm9yjq"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-translations-24.2.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index ede95eca68ce..351ceee22bf4 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.2.5.2" +"24.2.7.2" diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 73dff5c7c5b6..ebf251849ed1 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.120.0"; + version = "2.122.1"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-yKHrTcIiNhsLMfwNQNSLE2mAQLsDFxhTYdper3a8oM8="; + hash = "sha256-9/QGBUcMjZaV/R9Ox0RaNsLChICoMG9qdFRXM9XCF2w="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index b88f70225873..53cc19e5f1d3 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,7 +1,9 @@ { lib , stdenv , fetchFromGitHub +, appstream , cmake +, fetchpatch , gettext , git , makeWrapper @@ -17,16 +19,24 @@ stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; + hash = "sha256-jV1jW0aFx95JpwzywEVajstnMKVcEtBdvyL7y6OLl+k="; }; + patches = [ + (fetchpatch { # https://github.com/moneymanagerex/moneymanagerex/pull/6716 + name = "workaround-appstream-1.0.3.patch"; + url = "https://github.com/moneymanagerex/moneymanagerex/commit/bb98eab92d95b7315d27f4e59ae59b50587106d8.patch"; + hash = "sha256-98OyFO2nnGBRTIirxZ3jX1NPvsw5kVT8nsCSSmyfabo="; + }) + ]; + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" @@ -36,12 +46,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + appstream # for appstreamcli cmake gettext git makeWrapper pkg-config wrapGAppsHook3 + wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release ]; @@ -55,6 +67,8 @@ stdenv.mkDerivation rec { darwin.libobjc ]; + strictDeps = true; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-Wno-deprecated-copy" "-Wno-old-style-cast" diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix deleted file mode 100644 index b0e51f5a8e54..000000000000 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ /dev/null @@ -1,278 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildNpmPackage -, nixosTests -, gettext -, python3 -, giflib -, darwin -, ghostscript_headless -, imagemagickBig -, jbig2enc -, optipng -, pngquant -, qpdf -, tesseract5 -, unpaper -, poppler_utils -, liberation_ttf -, xcbuild -, pango -, pkg-config -, nltk-data -, xorg -}: - -let - version = "2.12.1"; - - src = fetchFromGitHub { - owner = "paperless-ngx"; - repo = "paperless-ngx"; - rev = "refs/tags/v${version}"; - hash = "sha256-txqwVGLUel74ObCqwMWSqa4Nd2eDRf0SqAIes5tlMDg="; - }; - - # subpath installation is broken with uvicorn >= 0.26 - # https://github.com/NixOS/nixpkgs/issues/298719 - # https://github.com/paperless-ngx/paperless-ngx/issues/5494 - python = python3.override { - self = python; - packageOverrides = final: prev: { - # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective - ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; }; - - uvicorn = prev.uvicorn.overridePythonAttrs (_: { - version = "0.25.0"; - src = fetchFromGitHub { - owner = "encode"; - repo = "uvicorn"; - rev = "0.25.0"; - hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk="; - }; - }); - }; - }; - - - path = lib.makeBinPath [ - ghostscript_headless - imagemagickBig - jbig2enc - optipng - pngquant - qpdf - tesseract5 - unpaper - poppler_utils - ]; - - frontend = buildNpmPackage { - pname = "paperless-ngx-frontend"; - inherit version src; - - postPatch = '' - cd src-ui - ''; - - npmDepsHash = "sha256-hb2z2cPMTN5bHtUldTR5Mvgo4nZL8/S+Uhfis37gF44="; - - nativeBuildInputs = [ - pkg-config - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild - ]; - - buildInputs = [ - pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - giflib - darwin.apple_sdk.frameworks.CoreText - ]; - - CYPRESS_INSTALL_BINARY = "0"; - NG_CLI_ANALYTICS = "false"; - - npmBuildFlags = [ - "--" "--configuration" "production" - ]; - - doCheck = true; - checkPhase = '' - runHook preCheck - npm run test - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib/paperless-ui - mv ../src/documents/static/frontend $out/lib/paperless-ui/ - runHook postInstall - ''; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "paperless-ngx"; - pyproject = false; - - inherit version src; - - postPatch = '' - # pytest-xdist makes the tests flaky - substituteInPlace src/setup.cfg \ - --replace-fail "--numprocesses auto --maxprocesses=16" "" - ''; - - nativeBuildInputs = [ - gettext - xorg.lndir - ]; - - dependencies = with python.pkgs; [ - bleach - channels - channels-redis - concurrent-log-handler - dateparser - django - django-allauth - django-auditlog - django-celery-results - django-compression-middleware - django-cors-headers - django-extensions - django-filter - django-guardian - django-multiselectfield - django-soft-delete - djangorestframework - djangorestframework-guardian2 - drf-writable-nested - filelock - flower - gotenberg-client - gunicorn - imap-tools - inotifyrecursive - langdetect - mysqlclient - nltk - ocrmypdf - pathvalidate - pdf2image - psycopg - python-dateutil - python-dotenv - python-gnupg - python-ipware - python-magic - pyzbar - rapidfuzz - redis - scikit-learn - setproctitle - tika-client - tqdm - uvicorn - watchdog - whitenoise - whoosh - zxing-cpp - ] - ++ redis.optional-dependencies.hiredis - ++ uvicorn.optional-dependencies.standard; - - postBuild = '' - # Compile manually because `pythonRecompileBytecodeHook` only works - # for files in `python.sitePackages` - ${python.pythonOnBuildForHost.interpreter} -OO -m compileall src - - # Collect static files - ${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input - - # Compile string translations using gettext - ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages - ''; - - installPhase = let - pythonPath = python.pkgs.makePythonPath dependencies; - in '' - runHook preInstall - - mkdir -p $out/lib/paperless-ngx/static/frontend - cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx - lndir -silent ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/frontend - chmod +x $out/lib/paperless-ngx/src/manage.py - makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ - --prefix PYTHONPATH : "${pythonPath}" \ - --prefix PATH : "${path}" - makeWrapper ${lib.getExe python.pkgs.celery} $out/bin/celery \ - --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \ - --prefix PATH : "${path}" - - runHook postInstall - ''; - - postFixup = '' - # Remove tests with samples (~14M) - find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} + - ''; - - nativeCheckInputs = with python.pkgs; [ - daphne - factory-boy - imagehash - pytest-cov-stub - pytest-django - pytest-env - pytest-httpx - pytest-mock - pytest-rerunfailures - pytestCheckHook - ]; - - pytestFlagsArray = [ - "src" - ]; - - # The tests require: - # - PATH with runtime binaries - # - A temporary HOME directory for gnupg - # - XDG_DATA_DIRS with test-specific fonts - preCheck = '' - export PATH="${path}:$PATH" - export HOME=$(mktemp -d) - export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" - ''; - - disabledTests = [ - # FileNotFoundError(2, 'No such file or directory'): /build/tmp... - "test_script_with_output" - "test_script_exit_non_zero" - # AssertionError: 10 != 4 (timezone/time issue) - # Due to getting local time from modification date in test_consumer.py - "testNormalOperation" - # Something broken with new Tesseract and inline RTL/LTR overrides? - "test_rtl_language_detection" - ]; - - doCheck = !stdenv.hostPlatform.isDarwin; - - passthru = { - inherit python path frontend tesseract5; - nltkData = with nltk-data; [ punkt_tab snowball_data stopwords ]; - tests = { inherit (nixosTests) paperless; }; - }; - - meta = with lib; { - description = "Tool to scan, index, and archive all of your physical documents"; - homepage = "https://docs.paperless-ngx.com/"; - changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ]; - }; -} diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7757357ec869..d2f38c8f83cb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -20,14 +20,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.9.8"; + version = "24.11.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-G5PLz1GzjfPM5tj3rtwJt4hR3v+oSq2bVr/llTSFbNk="; + hash = "sha256-OQ6p5VCdQZ2P1UFiCPtK+HogIgaoBQKdKO1tEDCA/5I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 0cdbe16e1133..ab47d26f9862 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { libXmu libXrandr libXrender - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; dontBuild = true; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix deleted file mode 100644 index 4883af59286a..000000000000 --- a/pkgs/applications/office/super-productivity/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron }: - -stdenv.mkDerivation rec { - pname = "super-productivity"; - version = "9.0.5"; - - src = fetchurl { - url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-eNAoLcQWnsTDA7sG8i0Ur9BZ+pNt4AK1GOppFCD1ZGg="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} $out/share/applications - - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/superproductivity.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar - ''; - - meta = with lib; { - description = "To Do List / Time Tracker with Jira Integration"; - homepage = "https://super-productivity.com"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ offline ]; - mainProgram = "super-productivity"; - }; -} diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix deleted file mode 100644 index 6d1876082917..000000000000 --- a/pkgs/applications/office/ticktick/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, fetchurl -, stdenv -, wrapGAppsHook3 -, dpkg -, autoPatchelfHook -, glibc -, gcc-unwrapped -, nss -, libdrm -, mesa -, alsa-lib -, xdg-utils -, systemd -}: -stdenv.mkDerivation (finalAttrs: { - pname = "ticktick"; - version = "6.0.0"; - - src = fetchurl { - url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb"; - hash = "sha256-yoskJ7v0RgRZ16gs9UY1xf/PunLoFkNGKmVMkPJDPmM="; - }; - - nativeBuildInputs = [ - wrapGAppsHook3 - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - nss - glibc - libdrm - gcc-unwrapped - mesa - alsa-lib - xdg-utils - ]; - - # Needed to make the process get past zygote_linux fork()'ing - runtimeDependencies = [ - systemd - ]; - - unpackPhase = '' - runHook preUnpack - - mkdir -p "$out/share" "$out/opt/${finalAttrs.pname}" "$out/bin" - dpkg-deb --fsys-tarfile "$src" | tar --extract --directory="$out" - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - cp -av $out/opt/TickTick/* $out/opt/${finalAttrs.pname} - cp -av $out/usr/share/* $out/share - rm -rf $out/usr $out/opt/TickTick - ln -sf "$out/opt/${finalAttrs.pname}/${finalAttrs.pname}" "$out/bin/${finalAttrs.pname}" - - substituteInPlace "$out/share/applications/${finalAttrs.pname}.desktop" \ - --replace "Exec=/opt/TickTick/ticktick" "Exec=$out/bin/${finalAttrs.pname}" - - runHook postInstall - ''; - - meta = with lib; { - description = "Powerful to-do & task management app with seamless cloud synchronization across all your devices"; - homepage = "https://ticktick.com/home/"; - license = licenses.unfree; - maintainers = with maintainers; [ hbjydev ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix deleted file mode 100644 index d3aa67a47a04..000000000000 --- a/pkgs/applications/office/timeular/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, fetchurl -, appimageTools -}: - -let - version = "6.8.1"; - pname = "timeular"; - - src = fetchurl { - url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-9t21aIEhLNIY7kSJkcvUVZ8R9/CuW0ZEu8kWkvMMQrM="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; -in appimageTools.wrapType2 rec { - inherit pname version src; - - extraPkgs = pkgs: [ pkgs.libsecret ]; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop - install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png - substituteInPlace $out/share/applications/timeular.desktop \ - --replace "Exec=AppRun --no-sandbox %U" "Exec=$out/bin/${pname}" - ''; - - meta = with lib; { - description = "Timetracking by flipping 8-sided dice"; - longDescription = '' - The Timeular Tracker is an 8-sided dice that sits on your desk. - Assign an activity to each side and flip to start tracking your time. - The desktop app tell you where every minute of your day is spent. - ''; - homepage = "https://timeular.com"; - license = licenses.unfree; - maintainers = with maintainers; [ ktor ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "timeular"; - }; -} diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 4d6dbaa0f7cf..125c23050d74 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -1,4 +1,4 @@ -{ stdenv, autoPatchelfHook, fetchurl, nixosTests +{ lib, stdenv, autoPatchelfHook, fetchurl, nixosTests , metaCommon }: let @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = [ diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix deleted file mode 100644 index bc66a8b458a6..000000000000 --- a/pkgs/applications/office/tryton/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -, pkg-config -, librsvg -, gobject-introspection -, atk -, gtk3 -, gtkspell3 -, adwaita-icon-theme -, glib -, goocanvas2 -, gdk-pixbuf -, pango -, fontconfig -, freetype -, wrapGAppsHook3 -}: - -python3Packages.buildPythonApplication rec { - pname = "tryton"; - version = "7.2.5"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-U6hA6TuIMDTFAZUic60A5IKr/LKxKZEgiTIhkLlTJSw="; - }; - - build-system = [ python3Packages.setuptools ]; - - nativeBuildInputs = [ - pkg-config - gobject-introspection - wrapGAppsHook3 - ]; - - dependencies = with python3Packages; [ - python-dateutil - pygobject3 - goocalendar - pycairo - ]; - - buildInputs = [ - atk - gdk-pixbuf - glib - adwaita-icon-theme - goocanvas2 - fontconfig - freetype - gtk3 - gtkspell3 - librsvg - pango - ]; - - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - strictDeps = false; - - pythonImportsCheck = [ "tryton" ]; - - doCheck = false; - - meta = with lib; { - description = "Client of the Tryton application platform"; - mainProgram = "tryton"; - longDescription = '' - The client for Tryton, a three-tier high-level general purpose - application platform under the license GPL-3 written in Python and using - PostgreSQL as database engine. - - It is the core base of a complete business solution providing - modularity, scalability and security. - ''; - homepage = "http://www.tryton.org/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ johbo udono ]; - }; -} diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix deleted file mode 100644 index 01d6fe74c502..000000000000 --- a/pkgs/applications/office/zotero/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib -, stdenv -, fetchurl -, wrapGAppsHook3 -, makeDesktopItem -, alsa-lib -, atk -, cairo -, dbus-glib -, gdk-pixbuf -, glib -, gtk3 -, libGL -, libva -, xorg -, mesa -, pango -, pciutils -}: - -stdenv.mkDerivation rec { - pname = "zotero"; - version = "7.0.8"; - - src = fetchurl { - url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk="; - }; - - dontPatchELF = true; - nativeBuildInputs = [ wrapGAppsHook3 ]; - - libPath = lib.makeLibraryPath [ - alsa-lib - atk - cairo - dbus-glib - gdk-pixbuf - glib - gtk3 - libGL - libva - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXtst - xorg.libxcb - mesa - pango - pciutils - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; - - desktopItem = makeDesktopItem { - name = "zotero"; - exec = "zotero -url %U"; - icon = "zotero"; - comment = meta.description; - desktopName = "Zotero"; - genericName = "Reference Management"; - categories = [ "Office" "Database" ]; - startupNotify = true; - mimeTypes = [ "x-scheme-handler/zotero" "text/plain" ]; - }; - - installPhase = '' - runHook preInstall - - # Copy package contents to the output directory - mkdir -p "$prefix/usr/lib/zotero-bin-${version}" - cp -r * "$prefix/usr/lib/zotero-bin-${version}" - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" - - # Install desktop file and icons - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 32 64 128; do - install -Dm444 icons/icon''${size}.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done - install -Dm444 icons/symbolic.svg \ - $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg - - runHook postInstall - ''; - - postFixup = '' - for executable in \ - zotero-bin plugin-container updater vaapitest \ - minidump-analyzer glxtest - do - if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/zotero-bin-${version}/$executable" - fi - done - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/zotero-bin-${version}/{}" \; - ''; - - meta = with lib; { - homepage = "https://www.zotero.org"; - description = "Collect, organize, cite, and share your research sources"; - mainProgram = "zotero"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Only; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ atila justanotherariel ]; - }; -} diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix deleted file mode 100644 index faede7f8d7f6..000000000000 --- a/pkgs/applications/radio/abracadabra/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - wrapQtAppsHook, - qtbase, - qtmultimedia, - qttools, - qtpositioning, - qtlocation, - faad2, - mpg123, - portaudio, - libusb1, - rtl-sdr, - airspy, - soapysdr-with-plugins, -}: - -stdenv.mkDerivation rec { - pname = "abracadabra"; - version = "2.6.0"; - - src = fetchFromGitHub { - owner = "KejPi"; - repo = "AbracaDABra"; - rev = "v${version}"; - hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8="; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - qttools - ]; - - buildInputs = [ - qtbase - qtmultimedia - qtlocation - qtpositioning - faad2 - mpg123 - portaudio - libusb1 - rtl-sdr - airspy - soapysdr-with-plugins - ]; - - cmakeFlags = [ - "-DAIRSPY=ON" - "-DSOAPYSDR=ON" - ]; - - meta = with lib; { - description = "DAB/DAB+ radio application"; - homepage = "https://github.com/KejPi/AbracaDABra"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = [ maintainers.markuskowa ]; - mainProgram = "AbracaDABra"; - }; -} diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/applications/radio/flamp/default.nix deleted file mode 100644 index b0a70b40898f..000000000000 --- a/pkgs/applications/radio/flamp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchgit -, autoreconfHook -, pkg-config -, fltk13 -, gettext -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "flamp"; - version = "2.2.12"; - - src = fetchgit { - url = "https://git.code.sf.net/p/fldigi/flamp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Rw75mz3gPQDBl1iECHZAMBxY8iDr/hqSJscJhdboaRw="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - gettext - ]; - - buildInputs = [ - fltk13 - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Digital modem program"; - homepage = "https://sourceforge.net/projects/fldigi/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ stteague ]; - platforms = platforms.unix; - broken = stdenv.system == "x86_64-darwin"; - mainProgram = "flamp"; - }; -}) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 0a7edb7aed6a..28662cdc7b15 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.2.05"; + version = "4.2.06"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-rBGJ+63Szhy37LQw0LpE2/lLyP5lwK7hsz/uq453iHY="; + hash = "sha256-Q2DeIl1vjP65u2pb5qxJLlJwLI9wT4dgnEUtO8sbbAg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index b611ef66b825..3379ba4c1df9 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -7,7 +7,7 @@ , pkg-config , volk , cppunit -, swig +, swig3 , orc , boost , log4cpp @@ -83,7 +83,7 @@ let python-support = { pythonRuntime = [ python.pkgs.six ]; native = [ - swig + swig3 python ]; cmakeEnableFlag = "PYTHON"; @@ -98,7 +98,7 @@ let gr-ctrlport = { cmakeEnableFlag = "GR_CTRLPORT"; native = [ - swig + swig3 ]; runtime = [ thrift @@ -159,7 +159,7 @@ let cmakeEnableFlag = "GR_CHANNELS"; }; gr-qtgui = { - runtime = [ qt5.qtbase libsForQt5.qwt ]; + runtime = [ qt5.qtbase libsForQt5.qwt6_1 ]; pythonRuntime = [ python.pkgs.pyqt5 ]; cmakeEnableFlag = "GR_QTGUI"; }; @@ -231,22 +231,9 @@ stdenv.mkDerivation (finalAttrs: (shared // { # Will still evaluate correctly if not used here. It only helps nix-update # find the right file in which version is defined. inherit (shared) src; - # Remove failing tests - preConfigure = (shared.preConfigure or "") + '' - # https://github.com/gnuradio/gnuradio/issues/3801 - rm gr-blocks/python/blocks/qa_cpp_py_binding.py - rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py - rm gr-blocks/python/blocks/qa_ctrlport_probes.py - # Tests that fail due to numpy deprecations upstream hasn't accomodated to yet. - rm gr-fec/python/fec/qa_polar_decoder_sc.py - rm gr-fec/python/fec/qa_polar_decoder_sc_list.py - rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py - rm gr-fec/python/fec/qa_polar_encoder.py - rm gr-fec/python/fec/qa_polar_encoder_systematic.py - rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py - # Failed with libstdc++ from GCC 13 - rm gr-filter/python/filter/qa_filterbank.py - ''; + # Some of the tests we know why they fail, but others simply hang-out and + # timeout... + doCheck = false; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.3_8.patch @@ -268,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { - inherit (libsForQt5) qwt; + qwt = libsForQt5.qwt6_1; }; cmakeFlags = shared.cmakeFlags # From some reason, if these are not set, libcodec2 and gsm are not diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index f9113b0a23c3..05d4e4cdc279 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -9,6 +9,7 @@ , orc , boost , spdlog +, swig , mpir , doxygen , python diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index dacdfcbb2704..f6a224378f21 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-C9kXntcCUaEl/S1ypZrU0ZPfaJbzg6/aXJSC+TREmhc="; + hash = "sha256-W+Ftc97/lI49rUItVhCb9W9mxcCElED/oZxefgIDqyM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix deleted file mode 100644 index 46b9a9ed2ea3..000000000000 --- a/pkgs/applications/radio/rtl_433/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libusb1, rtl-sdr, soapysdr-with-plugins -}: - -stdenv.mkDerivation rec { - version = "23.11"; - pname = "rtl_433"; - - src = fetchFromGitHub { - owner = "merbanan"; - repo = "rtl_433"; - rev = version; - hash = "sha256-qCfPweJeYHIuM1DfDmeDilkV/RLzbzlIe1sIpSx/EYc="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; - - doCheck = true; - - meta = with lib; { - description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz"; - homepage = "https://github.com/merbanan/rtl_433"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ earldouglas markuskowa ]; - platforms = platforms.all; - mainProgram = "rtl_433"; - }; -} diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix deleted file mode 100644 index d19ed4b02794..000000000000 --- a/pkgs/applications/radio/sdrplay/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }: -let - arch = - if stdenv.hostPlatform.isx86_64 then "x86_64" - else if stdenv.hostPlatform.isi686 then "i686" - else if stdenv.hostPlatform.isAarch64 then "aarch64" - else throw "unsupported architecture"; - - version = "3.07.1"; - - srcs = rec { - aarch64 = { - url = "https://www.sdrplay.com/software/SDRplay_RSP_API-ARM64-${version}.run"; - hash = "sha256-GJPFW6W8Ke4mnczcSLFYfioOMGCfFn2/EIA07VnmVGY="; - }; - - x86_64 = { - url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run"; - sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf"; - }; - - i686 = x86_64; - }; -in -stdenv.mkDerivation rec { - pname = "sdrplay"; - inherit version; - - src = fetchurl srcs."${arch}"; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ libusb1 udev stdenv.cc.cc.lib ]; - - unpackPhase = '' - sh "$src" --noexec --target source - ''; - - sourceRoot = "source"; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/{bin,lib,include,lib/udev/rules.d} - majorVersion="${lib.concatStringsSep "." (lib.take 1 (builtins.splitVersion version))}" - majorMinorVersion="${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}" - libName="libsdrplay_api" - cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/ - ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion" - ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so" - cp "${arch}/sdrplay_apiService" $out/bin/ - cp -r inc/* $out/include/ - cp 66-mirics.rules $out/lib/udev/rules.d/ - ''; - - meta = with lib; { - description = "SDRplay API"; - longDescription = '' - Proprietary library and api service for working with SDRplay devices. For documentation and licensing details see - https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf - ''; - homepage = "https://www.sdrplay.com/downloads/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ pmenke zaninime ]; - platforms = platforms.linux; - mainProgram = "sdrplay_apiService"; - }; -} diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index ce668c45300f..22e734e0dac8 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { # # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true # - version = "4.6.0.0"; + version = "4.7.0.0"; outputs = [ "out" "dev" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; # The updateScript relies on the `src` using `hash`, and not `sha256. To # update the correct hash for the `src` vs the `uhdImagesSrc` - hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc="; + hash = "sha256-TX1iLs941z8sZY0yQEXuy9jGgsn6HU4uqIdxJmNNahU="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/applications/radio/uhd/no-adapter-tests.patch index 38865f418101..af426dcc4d57 100644 --- a/pkgs/applications/radio/uhd/no-adapter-tests.patch +++ b/pkgs/applications/radio/uhd/no-adapter-tests.patch @@ -1,17 +1,17 @@ diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt -index f40c252ad..b8a07d341 100644 ---- i/host/tests/CMakeLists.txt -+++ w/host/tests/CMakeLists.txt -@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST( +index bac599811..267f8e602 100644 +--- a/host/tests/CMakeLists.txt ++++ b/host/tests/CMakeLists.txt +@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST( ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp ) - + -UHD_ADD_NONAPI_TEST( - TARGET "xport_adapter_ctrl_test.cpp" - EXTRA_SOURCES - ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp -) - - ######################################################################## - # demo of a loadable module - ######################################################################## + UHD_ADD_NONAPI_TEST( + TARGET "custom_reg_test.cpp" + EXTRA_SOURCES diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix deleted file mode 100644 index 2f572350bae0..000000000000 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, cmake -, git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib -, fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook3 -, curl -}: - -stdenv.mkDerivation rec { - pname = "siril"; - version = "1.2.3"; - - src = fetchFromGitLab { - owner = "free-astro"; - repo = "siril"; - rev = version; - hash = "sha256-JUMk2XHMOeocSpeeI+k3s9TsEQCdqz3oigTzuwRHbT4="; - }; - - nativeBuildInputs = [ - meson ninja cmake pkg-config git criterion wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib - libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib - curl - ]; - - # Necessary because project uses default build dir for flatpaks/snaps - dontUseMesonConfigure = true; - dontUseCmakeConfigure = true; - - # Meson fails to find libcurl unless the option is specifically enabled - configureScript = '' - ${meson}/bin/meson setup -Denable-libcurl=yes --buildtype release nixbld . - ''; - - postConfigure = '' - cd nixbld - ''; - - meta = with lib; { - homepage = "https://www.siril.org/"; - description = "Astrophotographic image processing tool"; - license = licenses.gpl3Plus; - changelog = "https://gitlab.com/free-astro/siril/-/blob/HEAD/ChangeLog"; - maintainers = with maintainers; [ hjones2199 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix deleted file mode 100644 index 0495da0e3c3d..000000000000 --- a/pkgs/applications/science/biology/fastp/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, zlib -, libdeflate -, isa-l -}: - -stdenv.mkDerivation rec { - pname = "fastp"; - version = "0.23.4"; - - src = fetchFromGitHub { - owner = "OpenGene"; - repo = "fastp"; - rev = "v${version}"; - sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8="; - }; - - buildInputs = [ zlib libdeflate isa-l ]; - - installPhase = '' - install -D fastp $out/bin/fastp - ''; - - meta = with lib; { - description = "Ultra-fast all-in-one FASTQ preprocessor"; - mainProgram = "fastp"; - license = licenses.mit; - homepage = "https://github.com/OpenGene/fastp"; - maintainers = with maintainers; [ jbedo ]; - platforms = platforms.x86_64; - }; -} diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix deleted file mode 100644 index 50dc0613c743..000000000000 --- a/pkgs/applications/science/biology/gatk/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper, python3 }: - -stdenv.mkDerivation rec { - pname = "gatk"; - version = "4.6.0.0"; - src = fetchzip { - url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/ - install -m755 -D $src/gatk-package-${version}-spark.jar $out/bin/ - install -m755 -D $src/gatk $out/bin/ - ''; - postFixup = '' - wrapProgram $out/bin/gatk --prefix PATH : ${lib.makeBinPath [ jre ]} - ''; - - meta = with lib; { - homepage = "https://gatk.broadinstitute.org/hc/en-us"; - description = "Wide variety of tools with a primary focus on variant discovery and genotyping." ; - license = licenses.asl20; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ] ; - maintainers = with maintainers; [ apraga ]; - longDescription = '' - The GATK is the industry standard for identifying SNPs and indels in germline - DNA and RNAseq data. Its scope is now expanding to include somatic short variant - calling, and to tackle copy number (CNV) and structural variation (SV). In - addition to the variant callers themselves, the GATK also includes many - utilities to perform related tasks such as processing and quality control of - high-throughput sequencing data, and bundles the popular Picard toolkit. - - These tools were primarily designed to process exomes and whole genomes - generated with Illumina sequencing technology, but they can be adapted to handle - a variety of other technologies and experimental designs. And although it was - originally developed for human genetics, the GATK has since evolved to handle - genome data from any organism, with any level of ploidy. - ''; - }; -} diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix deleted file mode 100644 index 97c89adf8e73..000000000000 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "jbrowse"; - version = "2.15.4"; - - src = fetchurl { - url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-ojIvC93dx9BSnUw7zBpDMBD0xPCMG4GUH1e5ZRGd9pk="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - -in -appimageTools.wrapType2 { - inherit pname version src; - unshareIpc = false; - - extraInstallCommands = '' - mv $out/bin/jbrowse $out/bin/jbrowse-desktop - install -m 444 -D ${appimageContents}/jbrowse-desktop.desktop $out/share/applications/jbrowse-desktop.desktop - install -m 444 -D ${appimageContents}/jbrowse-desktop.png \ - $out/share/icons/hicolor/512x512/apps/jbrowse-desktop.png - substituteInPlace $out/share/applications/jbrowse-desktop.desktop \ - --replace 'Exec=AppRun --no-sandbox' 'Exec=jbrowse-desktop' - ''; - - meta = with lib; { - description = "Next-generation genome browser"; - mainProgram = "jbrowse-desktop"; - homepage = "https://jbrowse.org/jb2/"; - license = licenses.asl20; - maintainers = with maintainers; [ benwbooth ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix deleted file mode 100644 index f280f81fae84..000000000000 --- a/pkgs/applications/science/biology/quast/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, python3Packages, zlib, bash }: - -let - pythonPackages = python3Packages; - inherit (pythonPackages) python; -in - -pythonPackages.buildPythonApplication rec { - pname = "quast"; - version = "5.0.2"; - - src = fetchurl { - url = "https://github.com/ablab/quast/releases/download/${pname}_${version}/${pname}-${version}.tar.gz"; - sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d"; - }; - - pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; - - buildInputs = [ zlib ] ++ pythonPath; - - dontConfigure = true; - - dontBuild = true; - - installPhase = '' - substituteInPlace quast_libs/bedtools/Makefile \ - --replace "/bin/bash" "${bash}/bin/bash" - mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.pythonOnBuildForHost.interpreter} setup.py install \ - --install-lib=$out/${python.sitePackages} \ - --prefix="$out" - ''; - - postFixup = '' - for file in $(find $out -type f -type f -perm /0111); do - old_rpath=$(patchelf --print-rpath $file) && \ - patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true - done - # Link to the master program - ln -s $out/bin/quast.py $out/bin/quast - ''; - - dontPatchELF = true; - - # Tests need to download data files, so manual run after packaging is needed - doCheck = false; - - meta = with lib ; { - description = "Evaluates genome assemblies by computing various metrics"; - homepage = "https://github.com/ablab/quast"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryNativeCode # source bundles binary dependencies - ]; - license = licenses.gpl2; - maintainers = [ maintainers.bzizou ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix deleted file mode 100644 index 0fbda84ccea7..000000000000 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - pname = "seqkit"; - version = "2.8.2"; - - src = fetchFromGitHub { - owner = "shenwei356"; - repo = "seqkit"; - rev = "v${version}"; - sha256 = "sha256-jCzd36ds9YVBpnyR3gDJSX3CCVXzC9WkQWmkcDiDWfM="; - }; - - vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0="; - - meta = with lib; { - description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; - homepage = "https://github.com/shenwei356/seqkit"; - license = licenses.mit; - maintainers = with maintainers; [ bzizou ]; - }; -} diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix deleted file mode 100644 index 766e4dcbd557..000000000000 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, blas -, superlu -, suitesparse -, python3 -, libintl -, libiconv -}: -let - # this is a fork version of fetk (http://www.fetk.org/) - # which is maintained by apbs team - fetk = stdenv.mkDerivation (finalAttrs: { - pname = "fetk"; - version = "1.9.3"; - - src = fetchFromGitHub { - owner = "Electrostatics"; - repo = "fetk"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-uFA1JRR05cNcUGaJj9IyGNONB2hU9IOBPzOj/HucNH4="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DBLAS_LIBRARIES=${blas}/lib" - "-DBLA_STATIC=OFF" - "-DBUILD_SUPERLU=OFF" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; - }; - - buildInputs = [ - blas - superlu - suitesparse - ]; - - meta = with lib; { - description = "Fork of the Finite Element ToolKit from fetk.org"; - homepage = "https://github.com/Electrostatics/FETK"; - changelog = "https://github.com/Electrostatics/FETK/releases/tag/${finalAttrs.version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "apbs"; - version = "3.4.1"; - - src = fetchFromGitHub { - owner = "Electrostatics"; - repo = "apbs"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-2DnHU9hMDl4OJBaTtcRiB+6R7gAeFcuOUy7aI63A3gQ="; - }; - - postPatch = '' - # ImportFETK.cmake downloads source and builds fetk - substituteInPlace CMakeLists.txt \ - --replace "include(ImportFETK)" "" \ - --replace 'import_fetk(''${FETK_VERSION})' "" - - # U was removed in python 3.11 because it had no effect - substituteInPlace tools/manip/inputgen.py \ - --replace '"rU"' '"r"' - ''; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - fetk - suitesparse - blas - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libintl - libiconv - ]; - - cmakeFlags = [ - "-DPYTHON_VERSION=${python3.version}" - "-DAPBS_LIBS=mc;maloc" - "-DCMAKE_MODULE_PATH=${fetk}/share/fetk/cmake;" - "-DENABLE_TESTS=1" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; - }; - - doCheck = true; - - meta = with lib; { - description = "Software for biomolecular electrostatics and solvation calculations"; - mainProgram = "apbs"; - homepage = "https://www.poissonboltzmann.org/"; - changelog = "https://github.com/Electrostatics/apbs/releases/tag/v${finalAttrs.version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix deleted file mode 100644 index 76192e4d4de9..000000000000 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, cmake -, gfortran -, perl -, blas-ilp64 -, hdf5-cpp -, python3 -, texliveMinimal -, armadillo -, libxc -, makeWrapper -, gsl -, boost180 -, autoPatchelfHook -, enableQcmaquis ? false - # Note that the CASPT2 module is broken with MPI - # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 -, enableMpi ? false -, mpi -, globalarrays -}: - -assert blas-ilp64.isILP64; -assert lib.elem blas-ilp64.passthru.implementation [ "openblas" "mkl" ]; -assert enableQcmaquis -> lib.elem blas-ilp64.passthru.implementation "mkl"; - -let - python = python3.withPackages (ps: with ps; [ six pyparsing numpy h5py ]); - qcmaquisSrc = fetchFromGitHub { - owner = "qcscine"; - repo = "qcmaquis"; - rev = "release-3.1.4"; # Must match tag in cmake/custom/qcmaquis.cmake - hash = "sha256-vhC5k+91IPFxdCi5oYt1NtF9W08RxonJjPpA0ls4I+o="; - }; - nevtp2Src = fetchFromGitHub { - owner = "qcscine"; - repo = "nevpt2"; - rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake - hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; - }; - -in -stdenv.mkDerivation rec { - pname = "openmolcas"; - version = "24.10"; - - src = fetchFromGitLab { - owner = "Molcas"; - repo = "OpenMolcas"; - rev = "v${version}"; - hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic="; - }; - - patches = [ - # Required to handle openblas multiple outputs - ./openblasPath.patch - - # Required for a local QCMaquis build - ./qcmaquis.patch - ]; - - postPatch = '' - # Using env fails in the sandbox - substituteInPlace Tools/pymolcas/export.py --replace \ - "/usr/bin/env','python3" "python3" - - # Pointing CMake to local QCMaquis and NEVPT2 archives - substituteInPlace cmake/custom/qcmaquis.cmake \ - --subst-var-by "qcmaquis_src_url" "file://${qcmaquisSrc}" - - substituteInPlace cmake/custom/nevpt2.cmake \ - --subst-var-by "nevpt2_src_url" "file://${nevtp2Src}" - ''; - - nativeBuildInputs = [ - perl - gfortran - cmake - texliveMinimal - makeWrapper - autoPatchelfHook - ]; - - buildInputs = [ - blas-ilp64.passthru.provider - hdf5-cpp - python - armadillo - libxc - gsl.dev - boost180 - ] ++ lib.optionals enableMpi [ - mpi - globalarrays - ]; - - passthru = lib.optionalAttrs enableMpi { inherit mpi; }; - - cmakeFlags = [ - "-DOPENMP=ON" - "-DLINALG=OpenBLAS" - "-DTOOLS=ON" - "-DHDF5=ON" - "-DFDE=ON" - "-DEXTERNAL_LIBXC=${lib.getDev libxc}" - (lib.strings.cmakeBool "DMRG" enableQcmaquis) - (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ - "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" - "-DLINALG=OpenBLAS" - ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ - "-DMKLROOT=${blas-ilp64.passthru.provider}" - "-DLINALG=MKL" - ] ++ lib.optionals enableMpi [ - "-DGA=ON" - "-DMPI=ON" - ]; - - preConfigure = lib.optionalString enableMpi '' - export GAROOT=${globalarrays}; - ''; - - postConfigure = '' - # The Makefile will install pymolcas during the build grrr. - mkdir -p $out/bin - export PATH=$PATH:$out/bin - ''; - - postInstall = '' - mv $out/pymolcas $out/bin - find $out/Tools -type f -exec mv \{} $out/bin \; - rm -r $out/Tools - ''; - - # DMRG executables contain references to /build, however, they are properly - # removed by autopatchelf - noAuditTmpdir = true; - - postFixup = '' - # Wrong store path in shebang (no Python pkgs), force re-patching - sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas - patchShebangs $out/bin - - wrapProgram $out/bin/pymolcas --set MOLCAS $out - ''; - - meta = with lib; { - description = "Advanced quantum chemistry software package"; - homepage = "https://gitlab.com/Molcas/OpenMolcas"; - maintainers = [ maintainers.markuskowa ]; - license = with licenses; [ lgpl21Only bsd3 ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; - mainProgram = "pymolcas"; - }; -} - diff --git a/pkgs/applications/science/electronics/caneda/gcc6.patch b/pkgs/applications/science/electronics/caneda/gcc6.patch deleted file mode 100644 index 04c8f4502b2d..000000000000 --- a/pkgs/applications/science/electronics/caneda/gcc6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git c/src/cgraphicsscene.cpp i/src/cgraphicsscene.cpp -index ac2929a..c399706 100644 ---- c/src/cgraphicsscene.cpp -+++ i/src/cgraphicsscene.cpp -@@ -1436,7 +1436,7 @@ namespace Caneda - QPointF newPos = m_currentWiringWire->mapFromScene(pos); - QPointF refPos = m_currentWiringWire->port1()->pos(); - -- if( abs(refPos.x()-newPos.x()) > abs(refPos.y()-newPos.y()) ) { -+ if( (refPos.x()-newPos.x()) > (refPos.y()-newPos.y()) ) { - m_currentWiringWire->movePort2(QPointF(newPos.x(), refPos.y())); - } - else { diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 6302c2dbfa38..a8da40bd070b 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -47,7 +47,7 @@ let patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/eagle-${version}/lib:${stdenv.cc.cc.lib}/lib" \ + --set-rpath "${libPath}:$out/eagle-${version}/lib:${lib.getLib stdenv.cc.cc}/lib" \ "$out"/eagle-${version}/eagle mkdir -p "$out"/bin diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix deleted file mode 100644 index e3984dba77d8..000000000000 --- a/pkgs/applications/science/electronics/fped/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchgit -, flex, bison, fig2dev, imagemagick, netpbm, gtk2 -, pkg-config -}: - -stdenv.mkDerivation { - pname = "fped"; - version = "unstable-2017-05-11"; - - src = fetchgit { - url = "git://projects.qi-hardware.com/fped.git"; - rev = "fa98e58157b6f68396d302c32421e882ac87f45b"; - sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; - }; - - # Workaround build failure on -fno-common toolchains: - # ld: postscript.o:postscript.h:29: multiple definition of - # `postscript_params'; fped.o:postscript.h:29: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - # This uses '/bin/bash', '/usr/local' and 'lex' by default - makeFlags = [ - "PREFIX=${placeholder "out"}" - "LEX=flex" - "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt" - ]; - - nativeBuildInputs = [ - flex - bison - pkg-config - imagemagick - fig2dev - netpbm - ]; - - buildInputs = [ - gtk2 - ]; - - meta = with lib; { - description = "Editor that allows the interactive creation of footprints electronic components"; - mainProgram = "fped"; - homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; - license = licenses.gpl2; - maintainers = with maintainers; [ expipiplus1 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix deleted file mode 100644 index 5649b6bb5a77..000000000000 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ bzip2 -, fetchurl -, glib -, gperf -, gtk3 -, gtk-mac-integration -, judy -, lib -, pkg-config -, stdenv -, tcl -, tk -, wrapGAppsHook3 -, xz -}: - -stdenv.mkDerivation rec { - pname = "gtkwave"; - version = "3.3.120"; - - src = fetchurl { - url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-XalIY/suXYjMAZ4r/cZ2AiOYETiUtYXYZOEcqDQbJNg="; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] - ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; - - # fix compilation under Darwin - # remove these patches upon next release - # https://github.com/gtkwave/gtkwave/pull/136 - patches = [ - ./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch - ./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch - ]; - - configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - "--enable-judy" - "--enable-gtk3" - ]; - - meta = { - description = "VCD/Waveform viewer for Unix and Win32"; - homepage = "https://gtkwave.sourceforge.net"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ thoughtpolice jiegec jleightcap ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch new file mode 100644 index 000000000000..016e74415644 --- /dev/null +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch @@ -0,0 +1,28 @@ +compatibility with newer spdlog/fmt versions + +diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp +index 808875e8a68..3cf3cf1fb8b 100644 +--- a/plugins/module_identification/src/api/module_identification.cpp ++++ b/plugins/module_identification/src/api/module_identification.cpp +@@ -406,7 +406,7 @@ namespace hal + + const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1); + +- log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority); ++ log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority)); + + auto stats = Statistics(); + +diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp +index d64cab665f2..561fa7f1a23 100644 +--- a/plugins/z3_utils/src/simplification.cpp ++++ b/plugins/z3_utils/src/simplification.cpp +@@ -617,7 +617,7 @@ namespace hal + return false; + + default: { +- log_error("z3_utils", "commutative check not implemeted for type {}!", t); ++ log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t)); + return false; + } + } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index acf52931c7ed..e8c15c35f2f9 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -8,6 +8,7 @@ , igraph , llvmPackages , ninja +, nlohmann_json , pkg-config , python3Packages , qtbase @@ -15,75 +16,36 @@ , quazip , rapidjson , spdlog -, suitesparse +, verilator , wrapQtAppsHook , z3 }: -let - # hal doesn't work with igraph 0.10.x yet https://github.com/emsec/hal/pull/487 - igraph' = igraph.overrideAttrs (final: prev: { - version = "0.9.10"; - src = fetchFromGitHub { - owner = "igraph"; - repo = final.pname; - rev = final.version; - hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; - }; - patches = (prev.patches or []) ++ [ - # needed by clang - (fetchpatch { - name = "libxml2-2.11-compat.patch"; - url = "https://github.com/igraph/igraph/commit/5ad464be5ae2f6ebb69c97cb0140c800cc8d97d6.patch"; - hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; - }) - ]; - postPatch = prev.postPatch + lib.optionalString stdenv.hostPlatform.isAarch64 '' - # https://github.com/igraph/igraph/issues/1694 - substituteInPlace tests/CMakeLists.txt \ - --replace "igraph_scg_grouping3" "" \ - --replace "igraph_scg_semiprojectors2" "" - ''; - NIX_CFLAGS_COMPILE = (prev.NIX_CFLAGS_COMPILE or []) ++ lib.optionals stdenv.cc.isClang [ - "-Wno-strict-prototypes" - "-Wno-unused-but-set-parameter" - "-Wno-unused-but-set-variable" - ]; - # general options brought back from the old 0.9.x package - buildInputs = prev.buildInputs ++ [ suitesparse ]; - cmakeFlags = prev.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; - }); - -in stdenv.mkDerivation rec { - version = "4.2.0"; +stdenv.mkDerivation rec { + version = "4.4.1"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "sha256-Yl86AClE3vWygqj1omCOXX8koJK2SjTkMZFReRThez0="; + sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A="; }; patches = [ (fetchpatch { - name = "cmake-add-no-vendored-options.patch"; - # https://github.com/emsec/hal/pull/529 - url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch"; - hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY="; + name = "de-vendor-nlohmann-json.patch"; + # https://github.com/emsec/hal/pull/596 + url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch"; + hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ="; }) (fetchpatch { - name = "hal-fix-fmt-10.1-compat.patch"; - # https://github.com/emsec/hal/pull/530 - url = "https://github.com/emsec/hal/commit/b639a56b303141afbf6731b70b7cc7452551f024.patch"; - hash = "sha256-a7AyDEKkqdbiHpa4OHTRuP9Yewb3Nxs/j6bwez5m0yU="; - }) - (fetchpatch { - name = "fix-gcc-13-build.patch"; - # https://github.com/emsec/hal/pull/557 - url = "https://github.com/emsec/hal/commit/831b1a7866aa9aabd55ff288c084862dc6a138d8.patch"; - hash = "sha256-kB/sJJtLGl5PUv+mmWVpee/okkJzp5HF0BCiCRCcTKw="; + name = "fix-vendored-igraph-regression.patch"; + # https://github.com/emsec/hal/pull/596 + url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch"; + hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E="; }) + ./4.4.1-newer-spdlog-fmt-compat.patch ]; # make sure bundled dependencies don't get in the way - install also otherwise @@ -105,9 +67,11 @@ in stdenv.mkDerivation rec { qtsvg boost rapidjson - igraph' + igraph + nlohmann_json spdlog graphviz + verilator z3 quazip ] @@ -129,12 +93,16 @@ in stdenv.mkDerivation rec { "-DUSE_VENDORED_SPDLOG=off" "-DUSE_VENDORED_QUAZIP=off" "-DUSE_VENDORED_IGRAPH=off" + "-DUSE_VENDORED_NLOHMANN_JSON=off" "-DBUILD_ALL_PLUGINS=on" ]; # needed for macos build - this is why we use wrapQtAppsHook instead of # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; + # https://github.com/emsec/hal/issues/598 + NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-flax-vector-conversions"; + # some plugins depend on other plugins and need to be able to load them postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index cae21d7bba4b..05e9e6eb64f1 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -128,5 +128,6 @@ mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ trepetti ]; platforms = platforms.linux; + broken = true; # last successful build 2024-06-30 }; } diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix deleted file mode 100644 index 27e527a01d87..000000000000 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0 -, glib, libusb1 , zlib, gtk3-x11, callPackage, writeTextDir -, scopes ? [ - "picocv" - "ps2000" - "ps2000a" - "ps3000" - "ps3000a" - "ps4000" - "ps4000a" - "ps5000" - "ps5000a" - "ps6000" - "ps6000a" -] }: - -let - shared_meta = lib: { - homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; - platforms = [ "x86_64-linux" ]; - license = lib.licenses.unfree; - }; - - libpicoipp = callPackage ({ stdenv, lib, fetchurl, autoPatchelfHook, dpkg }: - stdenv.mkDerivation rec { - pname = "libpicoipp"; - inherit (sources.libpicoipp) version; - src = fetchurl { inherit (sources.libpicoipp) url sha256; }; - nativeBuildInputs = [ dpkg autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; - sourceRoot = "."; - unpackCmd = "dpkg-deb -x $src ."; - installPhase = '' - runHook preInstall - mkdir -p $out/lib - cp -d opt/picoscope/lib/* $out/lib - install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright - runHook postInstall - ''; - meta = shared_meta lib // { - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - description = "library for picotech oscilloscope software"; - }; - }) { }; - - # If we don't have a platform available, put a dummy version here, so at - # least evaluation succeeds. - sources = - (lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}"); - - scopePkg = name: - { url, version, sha256 }: - stdenv.mkDerivation rec { - pname = "lib${name}"; - inherit version; - src = fetchurl { inherit url sha256; }; - # picoscope does a signature check, so we can't patchelf these - nativeBuildInputs = [ dpkg ]; - sourceRoot = "."; - unpackCmd = "dpkg-deb -x $src ."; - installPhase = '' - runHook preInstall - mkdir -p $out/lib - cp -d opt/picoscope/lib/* $out/lib - runHook postInstall - ''; - meta = with lib; - shared_meta lib // { - description = "library for picotech oscilloscope ${name} series"; - }; - }; - - scopePkgs = lib.mapAttrs scopePkg sources; - -in stdenv.mkDerivation rec { - pname = "picoscope"; - inherit (sources.picoscope) version; - - src = fetchurl { inherit (sources.picoscope) url sha256; }; - - nativeBuildInputs = [ dpkg makeWrapper ]; - buildInputs = [ gtk-sharp-3_0 mono glib libusb1 zlib ]; - - unpackCmd = "dpkg-deb -x $src ."; - sourceRoot = "."; - scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs; - MONO_PATH = "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" + (lib.makeLibraryPath - ([ - glib - gtk3-x11 - gtk-sharp-3_0 - libusb1 - zlib - libpicoipp - ] ++ scopeLibs)); - - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -dr usr/share $out/share - cp -dr opt/picoscope/* $out/ - makeWrapper "$(command -v mono)" $out/bin/picoscope \ - --add-flags $out/lib/PicoScope.GTK.exe \ - --prefix MONO_PATH : "$MONO_PATH" \ - --prefix LD_LIBRARY_PATH : "$MONO_PATH" \ - --set LANG C - runHook postInstall - ''; - - # usage: - # services.udev.packages = [ pkgs.picoscope.rules ]; - # users.groups.pico = {}; - # users.users.you.extraGroups = [ "pico" ]; - passthru.rules = writeTextDir "lib/udev/rules.d/95-pico.rules" '' - SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" - ''; - - meta = with lib; - shared_meta lib // { - description = - "Oscilloscope application that works with all PicoScope models"; - longDescription = '' - PicoScope for Linux is a powerful oscilloscope application that works - with all PicoScope models. The most important features from PicoScope - for Windows are included—scope, spectrum analyzer, advanced triggers, - automated measurements, interactive zoom, persistence modes and signal - generator control. More features are being added all the time. - - Waveform captures can be saved for off-line analysis, and shared with - PicoScope for Linux, PicoScope for macOS and PicoScope for Windows - users, or exported in text, CSV and MathWorks MATLAB 4 formats. - ''; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - }; -} - diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/applications/science/electronics/sv-lang/default.nix deleted file mode 100644 index 928cf3059385..000000000000 --- a/pkgs/applications/science/electronics/sv-lang/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, boost182 -, catch2_3 -, cmake -, ninja -, fmt_9 -, python3 -}: - -let - # dependency for this library has been removed in master (i.e. next release) - unordered_dense = stdenv.mkDerivation rec { - version = "2.0.1"; - pname = "unordered_dense"; - src = fetchFromGitHub { - owner = "martinus"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-9zlWYAY4lOQsL9+MYukqavBi5k96FvglRgznLIwwRyw="; - }; - nativeBuildInputs = [ - cmake - ]; - }; - -in -stdenv.mkDerivation rec { - pname = "sv-lang"; - version = "3.0"; - - src = fetchFromGitHub { - owner = "MikePopoloski"; - repo = "slang"; - rev = "v${version}"; - sha256 = "sha256-v2sStvukLFMRXGeATxvizmnwEPDE4kwnS06n+37OrJA="; - }; - - cmakeFlags = [ - # fix for https://github.com/NixOS/nixpkgs/issues/144170 - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - - "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}" - ]; - - nativeBuildInputs = [ - cmake - python3 - ninja - - # though only used in tests, cmake will complain its absence when configuring - catch2_3 - ]; - - buildInputs = [ - unordered_dense - boost182 - fmt_9 - ]; - - # TODO: a mysterious linker error occurs when building the unittests on darwin. - # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "SystemVerilog compiler and language services"; - homepage = "https://github.com/MikePopoloski/slang"; - license = licenses.mit; - maintainers = with maintainers; [ sharzy ]; - mainProgram = "slang"; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/applications/science/electronics/systemc/default.nix deleted file mode 100644 index 089ccd85c033..000000000000 --- a/pkgs/applications/science/electronics/systemc/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "systemc"; - version = "3.0.0"; - - src = fetchFromGitHub { - owner = "accellera-official"; - repo = pname; - rev = version; - sha256 = "sha256-qeQUrPhD+Gb1lResM7NZzO/vEgJd3NE6lbnM380VVa0="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - # Undefined reference to the sc_core::sc_api_version_2_3_4_XXX - # https://github.com/accellera-official/systemc/issues/21 - "-DCMAKE_CXX_STANDARD=17" - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - meta = with lib; { - description = "Language for System-level design, modeling and verification"; - homepage = "https://systemc.org/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ amiloradovsky ]; - }; -} diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix deleted file mode 100644 index c18a61046747..000000000000 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, python3 -, osi -, cplex -}: - -stdenv.mkDerivation rec { - pname = "fast-downward"; - version = "23.06.0"; - - src = fetchFromGitHub { - owner = "aibasel"; - repo = "downward"; - rev = "release-${version}"; - sha256 = "sha256-yNaMyS47yxc/p5Rs/kHwD/pgjGXnHBdybYdo1GIEmA4="; - }; - - nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; - buildInputs = [ python3 osi ]; - - cmakeFlags = lib.optionals osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; - - configurePhase = '' - python build.py release - ''; - - postPatch = '' - # Needed because the package tries to be too smart. - export CC="$(which $CC)" - export CXX="$(which $CXX)" - ''; - - installPhase = '' - install -Dm755 builds/release/bin/downward $out/libexec/fast-downward/downward - cp -r builds/release/bin/translate $out/libexec/fast-downward/ - install -Dm755 fast-downward.py $out/bin/fast-downward - mkdir -p $out/${python3.sitePackages} - cp -r driver $out/${python3.sitePackages} - - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath" - # Because fast-downward calls `python translate.py` we need to return wrapped scripts back. - for i in $out/libexec/fast-downward/translate/.*-wrapped; do - name="$(basename "$i")" - name1="''${name#.}" - name2="''${name1%-wrapped}" - dir="$(dirname "$i")" - dest="$dir/$name2" - echo "Moving $i to $dest" - mv "$i" "$dest" - done - - substituteInPlace $out/${python3.sitePackages}/driver/arguments.py \ - --replace 'args.build = "release"' "args.build = \"$out/libexec/fast-downward\"" - ''; - - meta = with lib; { - description = "Domain-independent planning system"; - mainProgram = "fast-downward"; - homepage = "https://www.fast-downward.org/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix deleted file mode 100644 index d97eb42b4027..000000000000 --- a/pkgs/applications/science/logic/key/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib, stdenv -, fetchurl -, jdk -, gradle_7 -, jre -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, testers -, key -}: - -let - gradle = gradle_7; - -in stdenv.mkDerivation rec { - pname = "key"; - version = "2.10.0"; - src = fetchurl { - url = "https://www.key-project.org/dist/${version}/key-${version}-sources.tgz"; - sha256 = "1f201cbcflqd1z6ysrkh3mff5agspw3v74ybdc3s2lfdyz3b858w"; - }; - sourceRoot = "key-${version}/key"; - - nativeBuildInputs = [ - jdk - gradle_7 - makeWrapper - copyDesktopItems - ]; - - executable-name = "KeY"; - - desktopItems = [ - (makeDesktopItem { - name = "KeY"; - exec = executable-name; - icon = "key"; - comment = meta.description; - desktopName = "KeY"; - genericName = "KeY"; - categories = [ "Science" ]; - }) - ]; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - # tests are broken on darwin - doCheck = !stdenv.hostPlatform.isDarwin; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp key.ui/build/libs/key-*-exe.jar $out/share/java/KeY.jar - mkdir -p $out/bin - mkdir -p $out/share/icons/hicolor/256x256/apps - cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png - makeWrapper ${jre}/bin/java $out/bin/KeY \ - --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" - - runHook postInstall - ''; - - passthru.tests.version = - testers.testVersion { - package = key; - command = "KeY --help"; - }; - - meta = with lib; { - description = "Java formal verification tool"; - homepage = "https://www.key-project.org"; # also https://formal.iti.kit.edu/key/ - longDescription = '' - The KeY System is a formal software development tool that aims to - integrate design, implementation, formal specification, and formal - verification of object-oriented software as seamlessly as possible. - At the core of the system is a novel theorem prover for the first-order - Dynamic Logic for Java with a user-friendly graphical interface. - ''; - license = licenses.gpl2; - maintainers = with maintainers; [ fgaz ]; - mainProgram = executable-name; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/logic/key/deps.json b/pkgs/applications/science/logic/key/deps.json deleted file mode 100644 index 4d6dee8060f9..000000000000 --- a/pkgs/applications/science/logic/key/deps.json +++ /dev/null @@ -1,387 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://plugins.gradle.org/m2": { - "ca/coglinc#javacc-gradle-plugin/2.4.0": { - "jar": "sha256-RsMHTru+ENUOzWkQpiYxCkE5FlZ5Ct0JF+kBp9afidw=", - "pom": "sha256-NTSsuHwtwH2hAqOP1wn1oANHgSkM+gcjPZTLXMOiyrA=" - }, - "ca/coglinc/javacc#ca.coglinc.javacc.gradle.plugin/2.4.0": { - "pom": "sha256-zmWjvt7VamHG21s6/cHApVuH6mvAewTxamaqn8DP2jw=" - }, - "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.15.0": { - "pom": "sha256-jWmQF6e7GyViPR4EGOKapRwtUYEHkgNaR8PG+hgMSXU=" - }, - "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.15.0": { - "pom": "sha256-OIRMJK0goaid41C254nDEz3FeeD51kZSyQi9uCgwAxM=" - }, - "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.0": { - "pom": "sha256-mh4hygODDXleq/uKbALOM4QuvCPGd+xqqZ50W1FPKt4=" - }, - "com/google/guava#guava-jdk5/17.0": { - "jar": "sha256-Wb9FZUe23aPO2WjLVvfy0+FEdOLeKWCjLEfjHB5FbGE=", - "pom": "sha256-+MFSYngT1FvE58wXrW7WpkmgIxroGf+44F0ZsgWj22Y=" - }, - "com/google/guava#guava-parent-jdk5/17.0": { - "pom": "sha256-WpYGvCdjKVazwR34h+mz54WFQGiqpOCAjtVmD2Cx+28=" - }, - "com/mycila#license-maven-plugin-parent/3.0": { - "pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o=" - }, - "com/mycila#license-maven-plugin/3.0": { - "jar": "sha256-Ul/o866FI9Be7ac2ZFxB6cMw8CV4K1s95u8Lqs8teMw=", - "pom": "sha256-kmJwjckIctcrvmfLFVITU6feJkgJzh6zLflfvqR2/IM=" - }, - "com/mycila#mycila-pom/3": { - "pom": "sha256-QCd6OyVlPuZDPEaFLacOlzbBmNlLyvbSw0cIqHOjGyY=" - }, - "com/mycila#mycila-xmltool/4.4.ga": { - "jar": "sha256-ddeyvpOBpl9vrDLzEIIhEvgFVm6fipekXY8Tz1UEnOA=", - "pom": "sha256-wMaee7roquvUQOFnjOn1AotD07ToHNQ26Y+BOkvDIrI=" - }, - "com/mycila/xmltool#xmltool/3.3": { - "jar": "sha256-hw+TlnieL0inuPso38BwwvjnSyAHJ0ziPmm2WBEP0pQ=", - "pom": "sha256-64P2FpRcjH37TYDm+QnnKG9SO7EQd4ArzSFr1w6ccXo=" - }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" - }, - "commons-io#commons-io/2.4": { - "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", - "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" - }, - "commons-logging#commons-logging/1.1.1": { - "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", - "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" - }, - "gradle/plugin/com/github/johnrengelman#shadow/7.1.0": { - "jar": "sha256-Bar4oiGwbGeS7hmZYZPolH7zv3Il6nWOUYsywoNxCJA=", - "pom": "sha256-q7tz6sHPSyR/wBbmyohafaFjNk/vyYDICvjTy+jRSQI=" - }, - "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.15.0": { - "jar": "sha256-gpLVOVy+k7lGe/p64JgC70z9316oNexy6jxKahfw9ZY=", - "pom": "sha256-IAmy13nhNo/tPGzHVwS58EVRv+3tFpk4F0ltrbtDyiw=" - }, - "org/apache#apache/10": { - "pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache#apache/16": { - "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/4": { - "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" - }, - "org/apache#apache/9": { - "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" - }, - "org/apache/ant#ant-launcher/1.10.11": { - "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", - "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" - }, - "org/apache/ant#ant-parent/1.10.11": { - "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" - }, - "org/apache/ant#ant/1.10.11": { - "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", - "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" - }, - "org/apache/commons#commons-collections4/4.1": { - "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", - "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" - }, - "org/apache/commons#commons-lang3/3.4": { - "jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=", - "pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E=" - }, - "org/apache/commons#commons-parent/25": { - "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" - }, - "org/apache/commons#commons-parent/33": { - "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" - }, - "org/apache/commons#commons-parent/37": { - "pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs=" - }, - "org/apache/commons#commons-parent/38": { - "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" - }, - "org/apache/commons#commons-parent/5": { - "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" - }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, - "org/apache/commons#commons-pool2/2.2": { - "jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=", - "pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM=" - }, - "org/apache/logging#logging-parent/3": { - "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" - }, - "org/apache/logging/log4j#log4j-api/2.17.1": { - "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", - "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" - }, - "org/apache/logging/log4j#log4j-core/2.17.1": { - "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", - "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" - }, - "org/apache/logging/log4j#log4j/2.17.1": { - "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" - }, - "org/apache/maven#maven-parent/21": { - "pom": "sha256-/EWviRHqMH0bV1ZO7x94tpgB6cEaVhnn61jV0Arp244=" - }, - "org/apache/maven#maven-settings-builder/3.0.4": { - "jar": "sha256-o4pU7B5pow3fwUQ04K7Cdk/CaGaKvMDhMthmkqXc4+Q=", - "pom": "sha256-Pgs/YCZ7YHCnQbFdtbQPvYJMYdsSofTxZu1li59i7OA=" - }, - "org/apache/maven#maven-settings/3.0.4": { - "jar": "sha256-Pj3xf1315M4ee38gEcV9YdMo5lZ4VCreIEjw0PopXwk=", - "pom": "sha256-vu3/18fkmtNe+UXDQT8YGfBOQ+opSjGARxTIy7DzcrM=" - }, - "org/apache/maven#maven/3.0.4": { - "pom": "sha256-TSI+AaZWnWZVwfT86Elp1FFCzbq9sRjqCMXIwz7GMvY=" - }, - "org/codehaus/plexus#plexus-component-annotations/1.5.5": { - "jar": "sha256-Tfemp75ks1u8z2C1wRVpf56jQh0iZ0rmcTXd43X8yh8=", - "pom": "sha256-gV8+wxa4xfpwE4X99ACb+1HgfXgOj2puKv5yDFLX4pI=" - }, - "org/codehaus/plexus#plexus-components/1.1.18": { - "pom": "sha256-7128f6kYttu6cdJ+Wz16AN9iS8+iVJpyl/Nv4nX2NNc=" - }, - "org/codehaus/plexus#plexus-containers/1.5.5": { - "pom": "sha256-G8Jkgk7IdrDKb09YOBdcVBxjjLxDMmomi5rufUd4te8=" - }, - "org/codehaus/plexus#plexus-interpolation/1.14": { - "jar": "sha256-f8YzeNPoRmNhm5vtrOn5/niydsK+PGLKIkVEkpTIQXY=", - "pom": "sha256-0IFVxJffN7LD2bWw39sC7AUlsgcLW+Nzn//elC/Kya8=" - }, - "org/codehaus/plexus#plexus-utils/2.0.5": { - "pom": "sha256-Nbx9EhNhYjZXEHKyxW2hj3pXZY3otKQQBkW3BUorJzs=" - }, - "org/codehaus/plexus#plexus-utils/2.0.6": { - "jar": "sha256-i5CfTKl4hkeUL4g9TlWbzGQhI/fGvNOEaYOi5GVGnDM=", - "pom": "sha256-/drU+mLIIxCuxDUl5RnNWfJ9BMdWn+IbGwPKIQiHgQw=" - }, - "org/codehaus/plexus#plexus-utils/3.4.1": { - "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", - "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" - }, - "org/codehaus/plexus#plexus/2.0.6": { - "pom": "sha256-vqEudHcI0l5zQQyhxzHr36EC6L227H2BvUUiWDsjS8w=" - }, - "org/codehaus/plexus#plexus/2.0.7": { - "pom": "sha256-K1kGIDCrChXF0Jd7oiQhcGNokmSIc5pl8leT5xXMinQ=" - }, - "org/codehaus/plexus#plexus/8": { - "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" - }, - "org/jdom#jdom2/2.0.6": { - "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", - "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" - }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" - }, - "org/ow2#ow2/1.5": { - "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" - }, - "org/ow2/asm#asm-analysis/9.2": { - "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", - "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" - }, - "org/ow2/asm#asm-commons/9.2": { - "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", - "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" - }, - "org/ow2/asm#asm-tree/9.2": { - "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", - "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" - }, - "org/ow2/asm#asm/9.2": { - "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", - "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" - }, - "org/sonarqube#org.sonarqube.gradle.plugin/3.0": { - "pom": "sha256-1Pg7ynlN6ZPv/gtqt/HO572zNJgWc4BVkHgvv6Mj420=" - }, - "org/sonarsource/parent#parent/54": { - "pom": "sha256-QVl5Y/x9ObDgJArLTYT1dbQCQtbhR9xQsCbUzvwFMV8=" - }, - "org/sonarsource/scanner/api#sonar-scanner-api-parent/2.15.0.2182": { - "pom": "sha256-JcR02YT0wD5P147u53D0Pqks+5Xrixf3+qyFVpNgFoY=" - }, - "org/sonarsource/scanner/api#sonar-scanner-api/2.15.0.2182": { - "jar": "sha256-h+foNKu97912pce/pM7ztxUhsfVQ/Iu+qLCphVPjNeg=", - "pom": "sha256-H+gEKIHd2qgREtNNv0k30OM+TQFYYIJ7/R/fb0YLH9U=" - }, - "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/3.0": { - "jar": "sha256-KLTNnuKtiAHAxeXJhPNtLizGDRkhwC61jujORTpejb8=", - "pom": "sha256-2jJNuKvT65d8B0lY/9E4vdVTWwYojfN7WiRv53Uad7Y=" - }, - "org/sonatype/forge#forge-parent/4": { - "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/plexus#plexus-cipher/1.4": { - "jar": "sha256-WhX9uiJmng/dBuENzOYyCHnh9zmPvJEM0Gd7UGcqeMQ=", - "pom": "sha256-pjouI5iMyn+sbJOIbW8FBv0m2I1+jMDLibnG4NbJlK0=" - }, - "org/sonatype/plexus#plexus-sec-dispatcher/1.3": { - "jar": "sha256-OwVZu4Qy8ok37+bKGT71SoUG0Addc/10BrmxFsahEGM=", - "pom": "sha256-1eZQxQ72lYwCjtAktZrwTPPTjhRTp31UK2tIS8D0ygs=" - }, - "org/sonatype/spice#spice-parent/12": { - "pom": "sha256-IaGbJtvlw43bURTPTq2/XMtBG8axKP3VlJscyxLzaD4=" - }, - "org/springframework#spring-asm/3.1.3.RELEASE": { - "jar": "sha256-za8dBwQOdREzok+Zesp9mOrL/mfhsoddzoynOCUngTA=", - "pom": "sha256-f7b7uYdEDEjGc9sVsIdwqcLWySBSBEIZl5z0j0ZvcSM=" - }, - "org/springframework#spring-core/3.1.3.RELEASE": { - "jar": "sha256-AUp7IdtoD9iGfgJrGMO/idME3sWyEJCotqezy1z8d9I=", - "pom": "sha256-8xqLb1m2oBgOOMnBKboGB7rnoNShC5U3V3DIFKtMx1M=" - }, - "org/springframework#spring-parent/3.1.3.RELEASE": { - "pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8=" - }, - "org/vafer#jdependency/2.7.0": { - "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", - "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" - } - }, - "https://repo.maven.apache.org/maven2": { - "antlr#antlr/2.7.7": { - "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", - "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" - }, - "com/atlassian/commonmark#commonmark-ext-gfm-tables/0.15.2": { - "jar": "sha256-Wn3BAWFAwPHGnFV21kvjcYJcWlStc1sMaZuWLMTgpPo=", - "pom": "sha256-rRZxS5MgMZDpRiSFMrWCkDdBQkg7RhdrsD3CrijycN0=" - }, - "com/atlassian/commonmark#commonmark-parent/0.15.2": { - "pom": "sha256-PhTratCeeq+Uow5I3kexFm+QCz6Ncm+UfMWkD3HkfCU=" - }, - "com/atlassian/commonmark#commonmark/0.15.2": { - "jar": "sha256-/UmFBUzWYXaB9smSH/yTq2uGQraeV3T48InZc9HGbmo=", - "pom": "sha256-3ZVTaHcyCDS90YRnvtbgKE7UhXKdU8LcLfWEE2vmGaI=" - }, - "com/atlassian/pom#base-pom/5.0.13": { - "pom": "sha256-CN0hBF/fYQSL7zj/7FbiHuslxuLYRPwJ9rlW4JNzdUM=" - }, - "com/atlassian/pom#central-pom/5.0.13": { - "pom": "sha256-zihFbTZlB8oPkQIpQqBeOI/Zj4YqbY2zEFxcRJenTOU=" - }, - "com/google/code/findbugs#jsr305/3.0.2": { - "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", - "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" - }, - "com/ibm/icu#icu4j/58.2": { - "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=", - "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo=" - }, - "com/miglayout#miglayout-core/5.2": { - "jar": "sha256-Zp8NqP12vlPXX1lA9IFibym1RM2ZJbfaJhEYfSaEvHo=", - "pom": "sha256-scvva6qqt3IaCLKlAZtpajfV4+wKfQzXmRo4MOJrfGA=" - }, - "com/miglayout#miglayout-parent/5.2": { - "pom": "sha256-+STS0Cl2vIQu0u/4sx4Hp2Zb/NJUY9TXmtvkEFis6Zs=" - }, - "com/miglayout#miglayout-swing/5.2": { - "jar": "sha256-g2n2guoVPvtoGj9YKsxIjoKpfub0fSU1LwgOl38TjIY=", - "pom": "sha256-52Q1kq9JpxIUc+OUOzdO3Xw/u5zJBdDGq5DOcCvkQqE=" - }, - "com/sun/activation#all/1.2.0": { - "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" - }, - "javax/activation#javax.activation-api/1.2.0": { - "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", - "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" - }, - "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": { - "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg=" - }, - "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": { - "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=", - "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc=" - }, - "junit#junit/4.12": { - "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", - "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" - }, - "net/java#jvnet-parent/1": { - "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "net/java#jvnet-parent/5": { - "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" - }, - "net/java/dev/javacc#javacc/4.0": { - "jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=", - "pom": "sha256-EBLeGTH+yhXhvQEomKaJBOXTO7TD6IhY+oagD7ePUDg=" - }, - "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { - "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", - "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" - }, - "org/antlr#ST4/4.0.8": { - "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", - "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" - }, - "org/antlr#antlr-master/3.5.2": { - "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" - }, - "org/antlr#antlr-runtime/3.5.2": { - "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", - "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" - }, - "org/antlr#antlr/3.5.2": { - "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", - "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" - }, - "org/antlr#antlr4-master/4.7.1": { - "pom": "sha256-QSb2e/QT9si8wbGdh7mnJWdCz6ccJQxKmVMNrt6ghow=" - }, - "org/antlr#antlr4-runtime/4.7.1": { - "jar": "sha256-Q1FtGb6uNZCeBNBq9sDFjBe8lOAHDIXo3JkpymQNyR0=", - "pom": "sha256-zhOGobkOUSy3oli1Ih1C8RJh/9qaElkBzdhs3ypZ/5E=" - }, - "org/antlr#antlr4/4.7.1": { - "jar": "sha256-os3C8vjriTcogyVo3FTQgOtaFJXts7ZuUblxIqYKDYc=", - "pom": "sha256-k+AkX5wHQx6tBunpyPmO7IJUQb9PbtZr3aboypxoR5Y=" - }, - "org/glassfish#javax.json/1.0.4": { - "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", - "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" - }, - "org/glassfish#json/1.0.4": { - "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - } -} diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix deleted file mode 100644 index b6291bfae369..000000000000 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchurl, gmp4, ncurses, zlib, clang }: - -let - libPath = lib.makeLibraryPath - [ stdenv.cc.libc - stdenv.cc.cc - gmp4 - ncurses - zlib - ] + ":${stdenv.cc.cc.lib}/lib64"; - - url = "https://github.com/GaloisInc/saw-script/releases/download"; - - saw-bin = - if stdenv.hostPlatform.system == "i686-linux" - then fetchurl { - url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; - sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; - } - else fetchurl { - url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz"; - sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; - }; -in -stdenv.mkDerivation { - pname = "saw-tools"; - version = "0.1.1-20150731"; - - src = saw-bin; - - installPhase = '' - mkdir -p $out/lib $out/share - - mv bin $out/bin - mv doc $out/share - - ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 - ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 - - # Add a clang symlink for easy building with a suitable compiler. - ln -s ${clang}/bin/clang $out/bin/saw-clang - ''; - - fixupPhase = '' - for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" $out/$x; - done - ''; - - meta = { - description = "Tools for software verification and analysis"; - homepage = "https://saw.galois.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix deleted file mode 100644 index 0d795611b95a..000000000000 --- a/pkgs/applications/science/logic/surelog/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, python3 -, pkg-config -, libuuid -, openjdk -, gperftools -, gtest -, uhdm -, antlr4 -, capnproto -, nlohmann_json -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "surelog"; - version = "1.83"; - - src = fetchFromGitHub { - owner = "chipsalliance"; - repo = "surelog"; - rev = "v${finalAttrs.version}"; - hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag="; - fetchSubmodules = false; # we use all dependencies from nix - }; - - nativeBuildInputs = [ - cmake - pkg-config - openjdk - (python3.withPackages (p: with p; [ - psutil - orderedmultidict - ])) - gtest - antlr4 - ]; - - buildInputs = [ - libuuid - gperftools - uhdm - capnproto - antlr4.runtime.cpp - nlohmann_json - ]; - - cmakeFlags = [ - "-DSURELOG_USE_HOST_CAPNP=On" - "-DSURELOG_USE_HOST_UHDM=On" - "-DSURELOG_USE_HOST_GTEST=On" - "-DSURELOG_USE_HOST_ANTLR=On" - "-DSURELOG_USE_HOST_JSON=On" - "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}" - ]; - - doCheck = true; - checkPhase = '' - runHook preCheck - make -j $NIX_BUILD_CORES UnitTests - ctest --output-on-failure - runHook postCheck - ''; - - meta = { - description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler"; - homepage = "https://github.com/chipsalliance/Surelog"; - license = lib.licenses.asl20; - mainProgram = "surelog"; - maintainers = with lib.maintainers; [ matthuszagh ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index e621b36a773b..698b4ddc47da 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,20 +1,15 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, applyPatches, lib, stdenv +{ haskellPackages, mkDerivation, fetchFromGitHub, lib, stdenv # the following are non-haskell dependencies , makeWrapper, which, maude, graphviz, glibcLocales }: let - version = "1.8.0"; - src = applyPatches { - src = fetchFromGitHub { - owner = "tamarin-prover"; - repo = "tamarin-prover"; - rev = version; - sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; - }; - patches = [ - ./tamarin-prover-1.8.0-ghc-9.6.patch - ]; + version = "1.10.0"; + src = fetchFromGitHub { + owner = "tamarin-prover"; + repo = "tamarin-prover"; + rev = version; + hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI="; }; @@ -41,7 +36,7 @@ let postPatch = replaceSymlinks; libraryHaskellDepends = with haskellPackages; [ base64-bytestring blaze-builder list-t - dlist exceptions fclabels safe SHA syb + dlist exceptions fclabels haskellPackages.graphviz safe SHA split syb ]; }); @@ -84,9 +79,7 @@ let tamarin-prover-export = mkDerivation (common "tamarin-prover-export" (src + "/lib/export") // { postPatch = "cp --remove-destination ${src}/LICENSE ."; doHaddock = false; # broken - libraryHaskellDepends = (with haskellPackages; [ - HStringTemplate - ]) ++ [ + libraryHaskellDepends = [ tamarin-prover-utils tamarin-prover-term tamarin-prover-theory @@ -125,7 +118,7 @@ mkDerivation (common "tamarin-prover" src // { executableHaskellDepends = (with haskellPackages; [ binary-instances binary-orphans blaze-html conduit file-embed - gitrev http-types lifted-base monad-control + gitrev http-types resourcet shakespeare threads wai warp yesod-core yesod-static ]) ++ [ tamarin-prover-utils tamarin-prover-sapic diff --git a/pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch b/pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch deleted file mode 100644 index f6a07f3646ca..000000000000 --- a/pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch +++ /dev/null @@ -1,237 +0,0 @@ -commit 084bd5474d9ac687656c2a3a6b2e1d507febaa98 -Author: Artur Cygan -Date: Mon Feb 26 10:04:48 2024 +0100 - - Update to GHC 9.6 (#618) - - Cherry-picked from b3e18f61e45d701d42d794bc91ccbb4c0e3834ec. - - Removing Control.Monad.List - -diff --git a/lib/sapic/src/Sapic/Exceptions.hs b/lib/sapic/src/Sapic/Exceptions.hs -index 146b721e..b9962478 100644 ---- a/lib/sapic/src/Sapic/Exceptions.hs -+++ b/lib/sapic/src/Sapic/Exceptions.hs -@@ -23,7 +23,6 @@ import Theory.Sapic - import Data.Label - import qualified Data.Maybe - import Theory.Text.Pretty --import Sapic.Annotation --toAnProcess - import Theory.Sapic.Print (prettySapic) - import qualified Theory.Text.Pretty as Pretty - -@@ -67,14 +66,14 @@ data ExportException = UnsupportedBuiltinMS - | UnsupportedTypes [String] - - instance Show ExportException where -- -+ - show (UnsupportedTypes incorrectFunctionUsages) = do - let functionsString = List.intercalate ", " incorrectFunctionUsages - (case length functionsString of - 1 -> "The function " ++ functionsString ++ ", which is declared with a user-defined type, appears in a rewrite rule. " - _ -> "The functions " ++ functionsString ++ ", which are declared with a user-defined type, appear in a rewrite rule. ") - ++ "However, the translation of rules only works with bitstrings at the moment." -- show unsuppBuiltin = -+ show unsuppBuiltin = - "The builtins bilinear-pairing and multiset are not supported for export. However, your model uses " ++ - (case unsuppBuiltin of - UnsupportedBuiltinBP -> "bilinear-pairing." -@@ -93,7 +92,7 @@ instance Show (SapicException an) where - show (InvalidPosition p) = "Invalid position:" ++ prettyPosition p - show (NotImplementedError s) = "This feature is not implemented yet. Sorry! " ++ s - show (ImplementationError s) = "You've encountered an error in the implementation: " ++ s -- show a@(ProcessNotWellformed e p) = "Process not well-formed: " ++ Pretty.render (text (show e) $-$ nest 2 (maybe emptyDoc prettySapic p)) -+ show (ProcessNotWellformed e p) = "Process not well-formed: " ++ Pretty.render (text (show e) $-$ nest 2 (maybe emptyDoc prettySapic p)) - show ReliableTransmissionButNoProcess = "The builtin support for reliable channels currently only affects the process calculus, but you have not specified a top-level process. Please remove \"builtins: reliable-channel\" to proceed." - show (CannotExpandPredicate facttag rstr) = "Undefined predicate " - ++ showFactTagArity facttag -@@ -135,7 +134,7 @@ instance Show WFerror where - ++ prettySapicFunType t2 - ++ "." - show (FunctionNotDefined sym ) = "Function not defined " ++ show sym -- -+ - - instance Exception WFerror - instance (Typeable an) => Exception (SapicException an) -diff --git a/lib/term/src/Term/Narrowing/Narrow.hs b/lib/term/src/Term/Narrowing/Narrow.hs -index 56f145d9..88f89aa1 100644 ---- a/lib/term/src/Term/Narrowing/Narrow.hs -+++ b/lib/term/src/Term/Narrowing/Narrow.hs -@@ -12,6 +12,7 @@ module Term.Narrowing.Narrow ( - import Term.Unification - import Term.Positions - -+import Control.Monad - import Control.Monad.Reader - - import Extension.Prelude -diff --git a/lib/term/src/Term/Unification.hs b/lib/term/src/Term/Unification.hs -index b5c107cd..fcf52128 100644 ---- a/lib/term/src/Term/Unification.hs -+++ b/lib/term/src/Term/Unification.hs -@@ -61,7 +61,7 @@ module Term.Unification ( - , pairDestMaudeSig - , symEncDestMaudeSig - , asymEncDestMaudeSig -- , signatureDestMaudeSig -+ , signatureDestMaudeSig - , locationReportMaudeSig - , revealSignatureMaudeSig - , hashMaudeSig -@@ -80,7 +80,7 @@ module Term.Unification ( - , module Term.Rewriting.Definitions - ) where - ---- import Control.Applicative -+import Control.Monad - import Control.Monad.RWS - import Control.Monad.Except - import Control.Monad.State -diff --git a/lib/theory/src/Theory/Constraint/System/Guarded.hs b/lib/theory/src/Theory/Constraint/System/Guarded.hs -index 99f985a8..3f0cd8d8 100644 ---- a/lib/theory/src/Theory/Constraint/System/Guarded.hs -+++ b/lib/theory/src/Theory/Constraint/System/Guarded.hs -@@ -88,6 +88,7 @@ module Theory.Constraint.System.Guarded ( - - import Control.Arrow - import Control.DeepSeq -+import Control.Monad - import Control.Monad.Except - import Control.Monad.Fresh (MonadFresh, scopeFreshness) - import qualified Control.Monad.Trans.PreciseFresh as Precise (Fresh, evalFresh, evalFreshT) -diff --git a/lib/utils/src/Control/Monad/Trans/Disj.hs b/lib/utils/src/Control/Monad/Trans/Disj.hs -index 96dae742..b3b63825 100644 ---- a/lib/utils/src/Control/Monad/Trans/Disj.hs -+++ b/lib/utils/src/Control/Monad/Trans/Disj.hs -@@ -18,10 +18,10 @@ module Control.Monad.Trans.Disj ( - , runDisjT - ) where - ---- import Control.Applicative --import Control.Monad.List --import Control.Monad.Reader -+import Control.Monad - import Control.Monad.Disj.Class -+import Control.Monad.Reader -+import ListT - - - ------------------------------------------------------------------------------ -@@ -33,12 +33,12 @@ newtype DisjT m a = DisjT { unDisjT :: ListT m a } - deriving (Functor, Applicative, MonadTrans ) - - -- | Construct a 'DisjT' action. --disjT :: m [a] -> DisjT m a --disjT = DisjT . ListT -+disjT :: (Monad m, Foldable m) => m a -> DisjT m a -+disjT = DisjT . fromFoldable - - -- | Run a 'DisjT' action. --runDisjT :: DisjT m a -> m [a] --runDisjT = runListT . unDisjT -+runDisjT :: Monad m => DisjT m a -> m [a] -+runDisjT = toList . unDisjT - - - -@@ -47,8 +47,6 @@ runDisjT = runListT . unDisjT - ------------ - - instance Monad m => Monad (DisjT m) where -- {-# INLINE return #-} -- return = DisjT . return - {-# INLINE (>>=) #-} - m >>= f = DisjT $ (unDisjT . f) =<< unDisjT m - -diff --git a/lib/utils/tamarin-prover-utils.cabal b/lib/utils/tamarin-prover-utils.cabal -index 75ed2b46..bb54d1e5 100644 ---- a/lib/utils/tamarin-prover-utils.cabal -+++ b/lib/utils/tamarin-prover-utils.cabal -@@ -47,6 +47,7 @@ library - , deepseq - , dlist - , fclabels -+ , list-t - , mtl - , pretty - , safe -diff --git a/src/Main/Mode/Batch.hs b/src/Main/Mode/Batch.hs -index e7710682..d370da85 100644 ---- a/src/Main/Mode/Batch.hs -+++ b/src/Main/Mode/Batch.hs -@@ -32,7 +32,8 @@ import Main.TheoryLoader - import Main.Utils - - import Theory.Module --import Control.Monad.Except (MonadIO(liftIO), runExceptT) -+import Control.Monad.Except (runExceptT) -+import Control.Monad.IO.Class (MonadIO(liftIO)) - import System.Exit (die) - import Theory.Tools.Wellformedness (prettyWfErrorReport) - import Text.Printf (printf) -diff --git a/src/Main/TheoryLoader.hs b/src/Main/TheoryLoader.hs -index 7fffb85b..71fba2b9 100644 ---- a/src/Main/TheoryLoader.hs -+++ b/src/Main/TheoryLoader.hs -@@ -42,8 +42,6 @@ module Main.TheoryLoader ( - - ) where - ---- import Debug.Trace -- - import Prelude hiding (id, (.)) - - import Data.Char (toLower) -@@ -58,8 +56,10 @@ import Data.Bifunctor (Bifunctor(bimap)) - import Data.Bitraversable (Bitraversable(bitraverse)) - - import Control.Category --import Control.Exception (evaluate) - import Control.DeepSeq (force) -+import Control.Exception (evaluate) -+import Control.Monad -+import Control.Monad.IO.Class (MonadIO(liftIO)) - - import System.Console.CmdArgs.Explicit - import System.Timeout (timeout) -@@ -387,10 +387,10 @@ closeTheory version thyOpts sign srcThy = do - deducThy <- bitraverse (return . addMessageDeductionRuleVariants) - (return . addMessageDeductionRuleVariantsDiff) transThy - -- derivCheckSignature <- Control.Monad.Except.liftIO $ toSignatureWithMaude (get oMaudePath thyOpts) $ maudePublicSig (toSignaturePure sign) -+ derivCheckSignature <- liftIO $ toSignatureWithMaude (get oMaudePath thyOpts) $ maudePublicSig (toSignaturePure sign) - variableReport <- case compare derivChecks 0 of - EQ -> pure $ Just [] -- _ -> Control.Monad.Except.liftIO $ timeout (1000000 * derivChecks) $ evaluate . force $ (either (\t -> checkVariableDeducability t derivCheckSignature autoSources defaultProver) -+ _ -> liftIO $ timeout (1000000 * derivChecks) $ evaluate . force $ (either (\t -> checkVariableDeducability t derivCheckSignature autoSources defaultProver) - (\t-> diffCheckVariableDeducability t derivCheckSignature autoSources defaultProver defaultDiffProver) deducThy) - - let report = wellformednessReport ++ (fromMaybe [(underlineTopic "Derivation Checks", Pretty.text "Derivation checks timed out. Use --derivcheck-timeout=INT to configure timeout, 0 to deactivate.")] variableReport) -diff --git a/stack.yaml b/stack.yaml -index 7267ba17..b53f6ff8 100644 ---- a/stack.yaml -+++ b/stack.yaml -@@ -7,7 +7,7 @@ packages: - - lib/sapic/ - - lib/export/ - - lib/accountability/ --resolver: lts-20.26 -+resolver: lts-22.11 - ghc-options: - "$everything": -Wall - nix: -diff --git a/tamarin-prover.cabal b/tamarin-prover.cabal -index 89a7e3a8..986274ea 100644 ---- a/tamarin-prover.cabal -+++ b/tamarin-prover.cabal -@@ -106,7 +106,7 @@ executable tamarin-prover - default-language: Haskell2010 - - if flag(threaded) -- ghc-options: -threaded -eventlog -+ ghc-options: -threaded - - -- -XFlexibleInstances - diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix deleted file mode 100644 index 72b55ffbcd7a..000000000000 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, python3 -, capnproto -, gtest -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "UHDM"; - # When updating this package, also consider updating science/logic/surelog - version = "1.83"; - - src = fetchFromGitHub { - owner = "chipsalliance"; - repo = "UHDM"; - rev = "v${finalAttrs.version}"; - hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok="; - fetchSubmodules = false; # we use all dependencies from nix - }; - - nativeBuildInputs = [ - cmake - (python3.withPackages (p: with p; [ orderedmultidict ])) - gtest - ]; - - buildInputs = [ - capnproto - ]; - - cmakeFlags = [ - "-DUHDM_USE_HOST_GTEST=On" - "-DUHDM_USE_HOST_CAPNP=On" - ]; - - doCheck = true; - checkPhase = "make test"; - - meta = { - description = "Universal Hardware Data Model"; - homepage = "https://github.com/chipsalliance/UHDM"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ matthuszagh ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix deleted file mode 100644 index 9515bda467cf..000000000000 --- a/pkgs/applications/science/logic/verifast/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype -, fontconfig, libxml2, gnome2 }: - -let - - libPath = lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo - freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; - - patchExe = x: '' - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath} ${x} - ''; - - patchLib = x: '' - patchelf --set-rpath ${libPath} ${x} - ''; - -in -stdenv.mkDerivation rec { - pname = "verifast"; - version = "24.08.30"; - - src = fetchurl { - url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-hIS5e+zVlxSOqr1/ZDy0PangyWjB9uLCvN8Qr688msg="; - }; - - dontConfigure = true; - dontStrip = true; - installPhase = '' - mkdir -p $out/bin - cp -R bin $out/libexec - - ${patchExe "$out/libexec/verifast"} - ${patchExe "$out/libexec/vfide"} - ${patchLib "$out/libexec/libz3.so"} - ln -s $out/libexec/verifast $out/bin/verifast - ln -s $out/libexec/vfide $out/bin/vfide - ''; - - meta = { - description = "Verification for C and Java programs via separation logic"; - homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/applications/science/math/adolc/default.nix b/pkgs/applications/science/math/adolc/default.nix deleted file mode 100644 index 636c3ea177a0..000000000000 --- a/pkgs/applications/science/math/adolc/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "adolc"; - version = "2.7.2"; - - src = fetchFromGitHub { - owner = "coin-or"; - repo = "ADOL-C"; - sha256 = "1w0x0p32r1amfmh2lyx33j4cb5bpkwjr5z0ll43zi5wf5gsvckd1"; - rev = "releases/${version}"; - }; - - configureFlags = [ "--with-openmp-flag=-fopenmp" ]; - - meta = with lib; { - description = "Automatic Differentiation of C/C++"; - homepage = "https://github.com/coin-or/ADOL-C"; - maintainers = [ maintainers.bzizou ]; - license = licenses.gpl2Plus; - }; -} - diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index 547b57b312db..e1fa87c4bd3a 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/gui/qt/"; + patches = [ + # This is resolved upstream, but I can't apply the patch because the + # sourceRoot isn't set to the base of the Git repo. + ./resolve-ambiguous-constexpr.patch + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch b/pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch new file mode 100644 index 000000000000..572fffc062e0 --- /dev/null +++ b/pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch @@ -0,0 +1,13 @@ +diff --git a/mainwindow.cpp b/mainwindow.cpp +index f03a743e..70c29a45 100644 +--- a/mainwindow.cpp ++++ b/mainwindow.cpp +@@ -970,7 +970,7 @@ void MainWindow::showEvent(QShowEvent *e) { + DockWidget *MainWindow::redistributeFindDock(const QPoint &pos) { + QWidget *child = childAt(pos); + if (QTabBar *tabBar = findSelfOrParent(child)) { +- child = childAt({pos.x(), tabBar->mapTo(this, QPoint{}).y() - 1}); ++ child = childAt(QPoint({pos.x(), tabBar->mapTo(this, QPoint{}).y() - 1})); + } + return findSelfOrParent(child); + } diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix deleted file mode 100644 index f1c2c53638ad..000000000000 --- a/pkgs/applications/science/math/clp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }: - -stdenv.mkDerivation rec { - version = "1.17.9"; - pname = "clp"; - src = fetchFromGitHub { - owner = "coin-or"; - repo = "Clp"; - rev = "releases/${version}"; - hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY="; - }; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ zlib coin-utils osi ]; - - doCheck = true; - - meta = with lib; { - license = licenses.epl20; - homepage = "https://github.com/coin-or/Clp"; - description = "Open-source linear programming solver written in C++"; - mainProgram = "clp"; - platforms = platforms.darwin ++ platforms.linux; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index c99c2fed2bd1..37a671e75cd5 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gp2c"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; - hash = "sha256-JhN07Kc+vXbBEqlZPcootkgSqnYlYf2lpLLCzXmmnTY="; + hash = "sha256-r2ESzAKUBFfiOdpEM9Gg2Npg7u8p98xyL2TNSsALezA="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch b/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch deleted file mode 100644 index 89f0613589d4..000000000000 --- a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py -index 2deb533f7f..663ff2cd13 100644 ---- a/src/sage/graphs/generic_graph.py -+++ b/src/sage/graphs/generic_graph.py -@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx): - sage: G = DiGraph(d6, format='dig6') - sage: G.edge_connectivity() - 5 -- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip -- [Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices] - - Small cases:: - diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index c7a1b585379a..5eff7513953c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ncurses opencv4 openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) unixODBC xkeyboard_config libxml2 @@ -113,15 +113,15 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/${dirName}/Executables for path in MathKernel math mcc wolfram; do - makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done for path in WolframKernel wolframscript; do - makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done wrapQtApp "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer" \ - --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ + --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \ diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix deleted file mode 100644 index 1c616866a173..000000000000 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, fetchFromGitHub -, git -, nodejs -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "cwltool"; - version = "3.1.20240708091337"; - pyproject = true; - - src = fetchFromGitHub { - owner = "common-workflow-language"; - repo = "cwltool"; - rev = "refs/tags/${version}"; - hash = "sha256-Umxh8sRBy7fC6+GrcN1q4iO0KVpmUhGPtnqZZK/6c9M="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \ - --replace "prov == 1.5.1" "prov" \ - --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \ - --replace "PYTEST_RUNNER + " "" - substituteInPlace pyproject.toml \ - --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \ - --replace "mypy==1.10.0" "mypy==1.10.*" - ''; - - nativeBuildInputs = [ - git - ] ++ (with python3.pkgs; [ - setuptools - setuptools-scm - ]); - - propagatedBuildInputs = with python3.pkgs; [ - argcomplete - bagit - coloredlogs - cwl-utils - mypy - mypy-extensions - prov - psutil - pydot - rdflib - requests - ruamel-yaml - schema-salad - shellescape - spython - toml - types-psutil - types-requests - typing-extensions - ]; - - nativeCheckInputs = with python3.pkgs; [ - mock - nodejs - pytest-mock - pytest-httpserver - pytest-xdist - pytestCheckHook - ]; - - disabledTests = [ - "test_content_types" - "test_env_filtering" - "test_http_path_mapping" - "test_modification_date" - ]; - - disabledTestPaths = [ - "tests/test_udocker.py" - "tests/test_provenance.py" - ]; - - pythonImportsCheck = [ - "cwltool" - ]; - - meta = with lib; { - description = "Common Workflow Language reference implementation"; - mainProgram = "cwltool"; - homepage = "https://www.commonwl.org"; - changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 60615b6f0926..78d312c4011e 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.8.2"; + version = "3.8.5"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE="; + hash = "sha256-8QAnZCvSUMuRj/Rd85j79GXDQxl8HlEaiU4StsXDdpU="; }; npmPkg = buildNpmPackage { @@ -53,7 +53,7 @@ in maven.buildMavenPackage { mvnJdk = jdk; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ="; + mvnHash = "sha256-SrEsJfiZrPy2zZ0Vzl7+d+8XUHGd2DOOs+PHBOZrbIU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix deleted file mode 100644 index 40202b8dbacc..000000000000 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ stdenv, lib, fetchFromGitLab, cmake, perl, python3, boost -, fortranSupport ? false, gfortran -, buildDocumentation ? false, fig2dev, ghostscript, doxygen -, buildJavaBindings ? false, openjdk -, buildPythonBindings ? true, python3Packages -, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw -, bmfSupport ? true, eigen -, minimalBindings ? false -, debug ? false -, optimize ? (!debug) -, moreTests ? false -, withoutBin ? false -}: - -stdenv.mkDerivation rec { - pname = "simgrid"; - version = "3.35"; - - src = fetchFromGitLab { - domain = "framagit.org"; - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WaFANZiPfiN/utfNZbwyH5mxgJNWafPMCcL863V8w0g="; - }; - - propagatedBuildInputs = [ boost ]; - nativeBuildInputs = [ cmake perl python3 ] - ++ lib.optionals fortranSupport [ gfortran ] - ++ lib.optionals buildJavaBindings [ openjdk ] - ++ lib.optionals buildPythonBindings [ python3Packages.pybind11 ] - ++ lib.optionals buildDocumentation [ fig2dev ghostscript doxygen ] - ++ lib.optionals bmfSupport [ eigen ] - ++ lib.optionals modelCheckingSupport [ libunwind libevent elfutils ]; - - outputs = [ "out" ] - ++ lib.optionals buildPythonBindings [ "python" ]; - - # "Release" does not work. non-debug mode is Debug compiled with optimization - cmakeBuildType = "Debug"; - - cmakeFlags = [ - (lib.cmakeBool "enable_documentation" buildDocumentation) - (lib.cmakeBool "enable_java" buildJavaBindings) - (lib.cmakeBool "enable_python" buildPythonBindings) - (lib.cmakeFeature "SIMGRID_PYTHON_LIBDIR" "./") # prevents CMake to install in ${python3} dir - (lib.cmakeBool "enable_msg" buildJavaBindings) - (lib.cmakeBool "enable_fortran" fortranSupport) - (lib.cmakeBool "enable_model-checking" modelCheckingSupport) - (lib.cmakeBool "enable_ns3" false) - (lib.cmakeBool "enable_lua" false) - (lib.cmakeBool "enable_lib_in_jar" false) - (lib.cmakeBool "enable_maintainer_mode" false) - (lib.cmakeBool "enable_mallocators" true) - (lib.cmakeBool "enable_debug" true) - (lib.cmakeBool "enable_smpi" true) - (lib.cmakeBool "minimal-bindings" minimalBindings) - (lib.cmakeBool "enable_smpi_ISP_testsuite" moreTests) - (lib.cmakeBool "enable_smpi_MPICH3_testsuite" moreTests) - (lib.cmakeBool "enable_compile_warnings" false) - (lib.cmakeBool "enable_compile_optimizations" optimize) - (lib.cmakeBool "enable_lto" optimize) - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" optimize) - ]; - - makeFlags = lib.optional debug "VERBOSE=1"; - - # needed to run tests and to ensure correct shabangs in output scripts - preBuild = '' - patchShebangs .. - ''; - - # needed by tests (so libsimgrid.so is found) - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/build/lib" - ''; - - doCheck = true; - preCheck = '' - # prevent the execution of tests known to fail - cat <CTestCustom.cmake - SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) - EOW - - # make sure tests are built in parallel (this can be long otherwise) - make tests -j $NIX_BUILD_CORES - ''; - - postInstall = lib.optionalString withoutBin '' - # remove bin from output if requested. - # having a specific bin output would be cleaner but it does not work currently (circular references) - rm -rf $out/bin - '' + lib.optionalString buildPythonBindings '' - # manually install the python binding if requested. - mkdir -p $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/ - cp ./lib/simgrid.cpython*.so $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/ - ''; - - # improve debuggability if requested - hardeningDisable = lib.optionals debug [ "fortify" ]; - dontStrip = debug; - - meta = with lib; { - description = "Framework for the simulation of distributed applications"; - longDescription = '' - SimGrid is a toolkit that provides core functionalities for the - simulation of distributed applications in heterogeneous distributed - environments. The specific goal of the project is to facilitate - research in the area of distributed and parallel application - scheduling on distributed computing platforms ranging from simple - network of workstations to Computational Grids. - ''; - homepage = "https://simgrid.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ mickours mpoquet ]; - platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 713238cc3f85..747231e738bc 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew -, qtbase, wrapQtAppsHook, autoPatchelfHook, python3 -, cmake, libjpeg, llvmPackages }: +{ + lib, + stdenv, + fetchurl, + libxml2, + freetype, + libGLU, + libGL, + glew, + qtbase, + wrapQtAppsHook, + autoPatchelfHook, + python3, + cmake, + libjpeg, + llvmPackages, +}: stdenv.mkDerivation rec { pname = "tulip"; @@ -11,21 +25,37 @@ stdenv.mkDerivation rec { hash = "sha256-7z21WkPi1v2AGishDmXZPAedMjgXPRnpUiHTzEnc5LY="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ] + buildInputs = + [ + libxml2 + freetype + glew + libjpeg + qtbase + python3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libGLU + libGL + ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - # fatal error: 'Python.h' file not found - "-I${python3}/include/${python3.libPrefix}" - # error: format string is not a string literal (potentially insecure) - "-Wno-format-security" - ]); + env.NIX_CFLAGS_COMPILE = + # error: invalid conversion from 'unsigned char*' to 'char*' + "-fpermissive " + + (lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + # fatal error: 'Python.h' file not found + "-I${python3}/include/${python3.libPrefix}" + # error: format string is not a string literal (potentially insecure) + "-Wno-format-security" + ])); # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 1eed4ff7c3d6..0c582199a6af 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024.3"; - hash = "sha256-u9oFbuWTkL59WNhME6nsDU42NWF63y63RwNJIsuh8Ck="; + version = "2024.4"; + hash = "sha256-rGGOzi5Yr6hrU2xaLE/Lk38HYDGPEtGPEDRra969hqg="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix deleted file mode 100644 index 88127f6db4fc..000000000000 --- a/pkgs/applications/science/networking/sumo/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, - git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, - libpng, libtiff, libxcrypt, openscenegraph , proj, python3, - python3Packages, stdenv, swig, xercesc, xorg, zlib }: - -stdenv.mkDerivation rec { - pname = "sumo"; - version = "1.20.0"; - - src = fetchFromGitHub { - owner = "eclipse"; - repo = "sumo"; - rev = "v${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - git - swig - ]; - - buildInputs = [ - bzip2 - eigen - ffmpeg - fox_1_6 - gdal - gl2ps - gpp - gtest - jdk - libGL - libGLU - libjpeg - libpng - libtiff - libxcrypt - openscenegraph - proj - python3Packages.setuptools - xercesc - zlib - python3 - ] ++ (with xorg; [ - libX11 - libXcursor - libXext - libXfixes - libXft - libXrandr - libXrender - ]); - - meta = with lib; { - description = "SUMO traffic simulator"; - longDescription = '' - Eclipse SUMO is an open source, highly - portable, microscopic and continuous traffic simulation package - designed to handle large networks. It allows for intermodal - simulation including pedestrians and comes with a large set of - tools for scenario creation. - ''; - homepage = "https://github.com/eclipse/sumo"; - license = licenses.epl20; - maintainers = with maintainers; [ mtreca ]; - }; -} diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 86afe4e5ffdb..bae3f747ba1a 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -5,7 +5,7 @@ , lxml , matplotlib , numpy -, opencv4 +, opencv-python , pymavlink , pyserial , setuptools @@ -25,16 +25,11 @@ buildPythonApplication rec { hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "opencv-python" "" - ''; - propagatedBuildInputs = [ lxml matplotlib numpy - opencv4 + opencv-python pymavlink pyserial setuptools diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/applications/search/xlsxgrep/default.nix deleted file mode 100644 index 5c6ea6c54d60..000000000000 --- a/pkgs/applications/search/xlsxgrep/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - pname = "xlsxgrep"; - version = "0.0.29"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-vgHNu7MVDjULoBiTkk74W8ZLJ02eds60XshTX3iLJGI="; - }; - - pythonPath = with python3Packages; [ xlrd ]; - - meta = with lib; { - maintainers = with maintainers; [ felixscheinost ]; - description = "CLI tool to search text in XLSX and XLS files. It works similarly to Unix/GNU Linux grep"; - mainProgram = "xlsxgrep"; - homepage = "https://github.com/zazuum/xlsxgrep"; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index ff8b4c310662..1438e9729af4 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -5,20 +5,15 @@ isPyPy, lib, defusedxml, - future, - ujson, packaging, psutil, setuptools, - pydantic, # Optional dependencies: fastapi, jinja2, - orjson, pysnmp, hddtemp, netifaces, # IP module - py-cpuinfo, uvicorn, requests, prometheus-client, @@ -26,16 +21,20 @@ buildPythonApplication rec { pname = "glances"; - version = "4.1.2.1"; + version = "4.2.0"; + pyproject = true; + disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - hash = "sha256-SlKt+wjzI9QRmMVvbIERuhQuCCaOh7L89WuNUXNhkuI="; + hash = "sha256-liyrMaqBgK7UZjWIKIgIFbskTGaWfyrK8L74DKmaDmY="; }; + build-system = [ setuptools ]; + # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted # scripts a workaround below is still required. @@ -46,27 +45,27 @@ buildPythonApplication rec { "/System/Library/Frameworks" ]; - doCheck = true; - preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks + # some tests fail in darwin sandbox + doCheck = !stdenv.hostPlatform.isDarwin; + + checkPhase = '' + runHook preCheck + + python unittest-core.py + + runHook postCheck ''; - propagatedBuildInputs = [ + dependencies = [ defusedxml - future - ujson netifaces packaging psutil pysnmp - setuptools - py-cpuinfo - pydantic fastapi uvicorn requests jinja2 - orjson prometheus-client ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix deleted file mode 100644 index 2dfee198c06e..000000000000 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform -, nixosTests - -, cmake -, installShellFiles -, makeWrapper -, ncurses -, pkg-config -, python3 -, scdoc - -, expat -, fontconfig -, freetype -, libGL -, xorg -, libxkbcommon -, wayland -, xdg-utils - - # Darwin Frameworks -, AppKit -, CoreGraphics -, CoreServices -, CoreText -, Foundation -, libiconv -, OpenGL -}: -let - rpathLibs = [ - expat - fontconfig - freetype - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libGL - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libXxf86vm - xorg.libxcb - libxkbcommon - wayland - ]; -in -rustPlatform.buildRustPackage rec { - pname = "alacritty"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "alacritty"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; - }; - - cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck="; - - nativeBuildInputs = [ - cmake - installShellFiles - makeWrapper - ncurses - pkg-config - python3 - scdoc - ]; - - buildInputs = rpathLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - libiconv - OpenGL - ]; - - outputs = [ "out" "terminfo" ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace alacritty/src/config/ui_config.rs \ - --replace xdg-open ${xdg-utils}/bin/xdg-open - ''; - - checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64 - - postInstall = ( - if stdenv.hostPlatform.isDarwin then '' - mkdir $out/Applications - cp -r extra/osx/Alacritty.app $out/Applications - ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS - '' else '' - install -D extra/linux/Alacritty.desktop -t $out/share/applications/ - install -D extra/linux/org.alacritty.Alacritty.appdata.xml -t $out/share/appdata/ - install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg - - # patchelf generates an ELF that binutils' "strip" doesn't like: - # strip: not enough room for program headers, try linking with -N - # As a workaround, strip manually before running patchelf. - $STRIP -S $out/bin/alacritty - - patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty - '' - ) + '' - installShellCompletion --zsh extra/completions/_alacritty - installShellCompletion --bash extra/completions/alacritty.bash - installShellCompletion --fish extra/completions/alacritty.fish - - install -dm 755 "$out/share/man/man1" - install -dm 755 "$out/share/man/man5" - - scdoc < extra/man/alacritty.1.scd | gzip -c > $out/share/man/man1/alacritty.1.gz - scdoc < extra/man/alacritty-msg.1.scd | gzip -c > $out/share/man/man1/alacritty-msg.1.gz - scdoc < extra/man/alacritty.5.scd | gzip -c > $out/share/man/man5/alacritty.5.gz - scdoc < extra/man/alacritty-bindings.5.scd | gzip -c > $out/share/man/man5/alacritty-bindings.5.gz - - install -dm 755 "$terminfo/share/terminfo/a/" - tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; - - dontPatchELF = true; - - passthru.tests.test = nixosTests.terminal-emulators.alacritty; - - meta = with lib; { - description = "Cross-platform, GPU-accelerated terminal emulator"; - homepage = "https://github.com/alacritty/alacritty"; - license = licenses.asl20; - mainProgram = "alacritty"; - maintainers = with maintainers; [ Br1ght0ne mic92 ]; - platforms = platforms.unix; - changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; - }; -} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix deleted file mode 100644 index f71a9dce894f..000000000000 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, meson -, ninja -, pkg-config -, vala -, gtk4 -, vte-gtk4 -, json-glib -, sassc -, libadwaita -, pcre2 -, libsixel -, libxml2 -, librsvg -, libgee -, callPackage -, python3 -, desktop-file-utils -, wrapGAppsHook4 -, sixelSupport ? false -}: - -let - marble = callPackage ./marble.nix { }; -in -stdenv.mkDerivation rec { - pname = "blackbox"; - version = "0.14.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "raggesilver"; - repo = "blackbox"; - rev = "v${version}"; - hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw="; - }; - - patches = [ - # Fix closing confirmation dialogs not showing - (fetchpatch { - url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch"; - hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A="; - }) - ]; - - postPatch = '' - substituteInPlace build-aux/meson/postinstall.py \ - --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' - patchShebangs build-aux/meson/postinstall.py - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - sassc - wrapGAppsHook4 - python3 - desktop-file-utils # For update-desktop-database - ]; - buildInputs = [ - gtk4 - (vte-gtk4.overrideAttrs (old: { - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "vte"; - rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; - hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; - }; - postPatch = (old.postPatch or "") + '' - patchShebangs src/box_drawing_generate.sh - ''; - } // lib.optionalAttrs sixelSupport { - buildInputs = old.buildInputs ++ [ libsixel ]; - mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; - })) - json-glib - marble - libadwaita - pcre2 - libxml2 - librsvg - libgee - ]; - - mesonFlags = [ "-Dblackbox_is_flatpak=false" ]; - - meta = with lib; { - description = "Beautiful GTK 4 terminal"; - mainProgram = "blackbox"; - homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; - changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu linsui ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix deleted file mode 100644 index 5884f65c61ed..000000000000 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gettext -, gnome -, libgtop -, gtk4 -, libadwaita -, pcre2 -, vte-gtk4 -, desktop-file-utils -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "gnome-console"; - version = "46.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-FhnOcBdzssDJA3GPVHaMGS6lB0UU1VoXdKkslyMdbD4="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - libgtop - gtk4 - libadwaita - pcre2 - vte-gtk4 - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-console"; - }; - }; - - passthru.tests.test = nixosTests.terminal-emulators.kgx; - - meta = with lib; { - description = "Simple user-friendly terminal emulator for the GNOME desktop"; - homepage = "https://gitlab.gnome.org/GNOME/console"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); - platforms = platforms.unix; - mainProgram = "kgx"; - }; -} diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 508741039297..cab3a2103a54 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -33,20 +33,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.36.4"; + version = "0.37.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-nN0y2VKK5UNaozpHQNPN7AYkto9z6rJNpYRJhvLPtVQ="; + hash = "sha256-xxM5nqEr7avtJUlcsrA/KXOTxSajIg7kDQM6Q4V+6WM="; }; goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-8hsQH7OdsxeVG6pomuxdmTXNmQYBROoUUxoC10LeLFo="; + vendorHash = "sha256-d5jRhOm53HDGnsU5Lg5tVGU/9z8RGqORzS53hOyIKBk="; }).goModules; buildInputs = [ @@ -55,6 +55,7 @@ buildPythonApplication rec { simde lcms2 librsync + matplotlib openssl.dev xxHash ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix deleted file mode 100644 index a59ec5dcc6e9..000000000000 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ lib -, stdenv -, darwin -, fetchFromGitHub -, rustPlatform -, nixosTests -, nix-update-script - -, autoPatchelfHook -, cmake -, ncurses -, pkg-config - -, gcc-unwrapped -, fontconfig -, libGL -, vulkan-loader -, libxkbcommon - -, withX11 ? !stdenv.hostPlatform.isDarwin -, libX11 -, libXcursor -, libXi -, libXrandr -, libxcb - -, withWayland ? !stdenv.hostPlatform.isDarwin -, wayland - -, testers -, rio -}: -let - rlinkLibs = if stdenv.hostPlatform.isDarwin then [ - darwin.libobjc - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.AVFoundation - darwin.apple_sdk_11_0.frameworks.MetalKit - darwin.apple_sdk_11_0.frameworks.Vision - ] else [ - (lib.getLib gcc-unwrapped) - fontconfig - libGL - libxkbcommon - vulkan-loader - ] ++ lib.optionals withX11 [ - libX11 - libXcursor - libXi - libXrandr - libxcb - ] ++ lib.optionals withWayland [ - wayland - ]; -in -rustPlatform.buildRustPackage rec { - pname = "rio"; - version = "0.1.17"; - - src = fetchFromGitHub { - owner = "raphamorim"; - repo = "rio"; - rev = "v${version}"; - hash = "sha256-10E7tIuix0BGKFbADLhcReRC01FXV/dBivJjfSe/X/c="; - }; - - cargoHash = "sha256-yGOvY5+ThSey/k8ilTTC0CzaOIJtc4hDYmdrHJC3HyE="; - - nativeBuildInputs = [ - ncurses - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - cmake - pkg-config - autoPatchelfHook - ]; - - runtimeDependencies = rlinkLibs; - - buildInputs = rlinkLibs; - - outputs = [ "out" "terminfo" ]; - - buildNoDefaultFeatures = true; - buildFeatures = [ ] - ++ lib.optional withX11 "x11" - ++ lib.optional withWayland "wayland"; - - checkFlags = [ - # Fail to run in sandbox environment. - "--skip=sys::unix::eventedfd::EventedFd" - ]; - - postInstall = '' - install -D -m 644 misc/rio.desktop -t $out/share/applications - install -D -m 644 misc/logo.svg \ - $out/share/icons/hicolor/scalable/apps/rio.svg - - install -dm 755 "$terminfo/share/terminfo/r/" - tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications/ - mv misc/osx/Rio.app/ $out/Applications/ - mkdir $out/Applications/Rio.app/Contents/MacOS/ - ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/ - ''; - - passthru = { - updateScript = nix-update-script { - extraArgs = [ "--version-regex" "v([0-9.]+)" ]; - }; - - tests = { - version = testers.testVersion { package = rio; }; - } // lib.optionalAttrs stdenv.buildPlatform.isLinux { - # FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg - # 'passthru.tests' nixosTests are failing on Darwin architectures. - # - # Ref: https://github.com/NixOS/nixpkgs/issues/345825 - test = nixosTests.terminal-emulators.rio; - }; - }; - - meta = { - description = "Hardware-accelerated GPU terminal emulator powered by WebGPU"; - homepage = "https://raphamorim.io/rio"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ tornax otavio oluceps ]; - platforms = lib.platforms.unix; - changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md"; - mainProgram = "rio"; - }; -} diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 5a60f9a1d546..6b1be920833e 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -51,7 +51,7 @@ let nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) gtk2 pango cairo diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix deleted file mode 100644 index 76ace5026e68..000000000000 --- a/pkgs/applications/version-management/delta/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, pkg-config -, oniguruma -, stdenv -, darwin -, git -}: - -rustPlatform.buildRustPackage rec { - pname = "delta"; - version = "0.18.2"; - - src = fetchFromGitHub { - owner = "dandavison"; - repo = "delta"; - rev = "refs/tags/${version}"; - hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; - }; - - cargoHash = "sha256-DIWzRVTADfAZdFckhh2lIfOD13h7GP3KIOQHf/oBHgc="; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - - buildInputs = [ - oniguruma - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Foundation - ]; - - nativeCheckInputs = [ git ]; - - env = { - RUSTONIG_SYSTEM_LIBONIG = true; - }; - - postInstall = '' - installShellCompletion --cmd delta \ - etc/completion/completion.{bash,fish,zsh} - ''; - - # test_env_parsing_with_pager_set_to_bat sets environment variables, - # which can be flaky with multiple threads: - # https://github.com/dandavison/delta/issues/1660 - dontUseCargoParallelTests = true; - - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - # This test tries to read /etc/passwd, which fails with the sandbox - # enabled on Darwin - "--skip=test_diff_real_files" - ]; - - meta = with lib; { - homepage = "https://github.com/dandavison/delta"; - description = "Syntax-highlighting pager for git"; - changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ zowoq SuperSandro2000 figsoda ]; - mainProgram = "delta"; - }; -} diff --git a/pkgs/applications/version-management/fast-export/default.nix b/pkgs/applications/version-management/fast-export/default.nix deleted file mode 100644 index a4d9c030c9b4..000000000000 --- a/pkgs/applications/version-management/fast-export/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{lib, stdenv, fetchFromGitHub, git, mercurial, makeWrapper}: - -stdenv.mkDerivation rec { - pname = "fast-export"; - version = "221024"; - - src = fetchFromGitHub { - owner = "frej"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [mercurial.python mercurial]; - - installPhase = '' - binPath=$out/bin - libexecPath=$out/libexec/${pname} - sitepackagesPath=$out/${mercurial.python.sitePackages} - mkdir -p $binPath $libexecPath $sitepackagesPath - - # Patch shell scripts so they can execute the Python scripts - sed -i "s|ROOT=.*|ROOT=$libexecPath|" *.sh - - mv hg-fast-export.sh hg-reset.sh $binPath - mv hg-fast-export.py hg-reset.py $libexecPath - mv hg2git.py pluginloader plugins $sitepackagesPath - - for script in $out/bin/*.sh; do - wrapProgram $script \ - --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \ - --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath - done - ''; - - doInstallCheck = true; - # deliberately not adding git or hg into nativeInstallCheckInputs - package should - # be able to work without them in runtime env - installCheckPhase = '' - mkdir repo-hg - pushd repo-hg - ${mercurial}/bin/hg init - echo foo > bar - ${mercurial}/bin/hg add bar - ${mercurial}/bin/hg commit --message "baz" - popd - - mkdir repo-git - pushd repo-git - ${git}/bin/git init - ${git}/bin/git config core.ignoreCase false # for darwin - $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash - for s in "foo" "bar" "baz" ; do - (${git}/bin/git show | grep $s > /dev/null) && echo $s found - done - popd - ''; - - meta = with lib; { - description = "Import mercurial into git"; - homepage = "https://repo.or.cz/w/fast-export.git"; - license = licenses.gpl2; - maintainers = [ maintainers.koral ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index b0bae95ba9d1..293fb563af60 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, darwin }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; @@ -9,7 +9,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; - buildInputs = [ libiconv ncurses zlib ]; + buildInputs = [ libiconv ncurses zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil + ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix deleted file mode 100644 index 83781ea1cfcf..000000000000 --- a/pkgs/applications/version-management/gh/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - installShellFiles, - stdenv, - testers, - gh, -}: - -buildGoModule rec { - pname = "gh"; - version = "2.60.0"; - - src = fetchFromGitHub { - owner = "cli"; - repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-Tvyf58f/9bOUiUAG6R9nhOerZh5Yt3LyKx88oF3s0jI="; - }; - - vendorHash = "sha256-nwGmYFWyAr34F4rmqFC3cK+fbUq6LRaqXhekx4Ab5sE="; - - nativeBuildInputs = [ installShellFiles ]; - - buildPhase = '' - runHook preBuild - make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} - runHook postBuild - ''; - - installPhase = - '' - runHook preInstall - install -Dm755 bin/gh -t $out/bin - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installManPage share/man/*/*.[1-9] - - installShellCompletion --cmd gh \ - --bash <($out/bin/gh completion -s bash) \ - --fish <($out/bin/gh completion -s fish) \ - --zsh <($out/bin/gh completion -s zsh) - '' - + '' - runHook postInstall - ''; - - # most tests require network access - doCheck = false; - - passthru.tests.version = testers.testVersion { - package = gh; - }; - - meta = with lib; { - description = "GitHub CLI tool"; - homepage = "https://cli.github.com/"; - changelog = "https://github.com/cli/cli/releases/tag/v${version}"; - license = licenses.mit; - mainProgram = "gh"; - maintainers = with maintainers; [ zowoq ]; - }; -} diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix deleted file mode 100644 index 3ad36969f94d..000000000000 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "git-credential-oauth"; - version = "0.13.2"; - - src = fetchFromGitHub { - owner = "hickford"; - repo = pname; - rev = "v${version}"; - hash = "sha256-pJ1Snq79bQvhE+D7U8pMmK4YyvoZIwv29kr5640jpns="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - vendorHash = "sha256-ujsfEmDOOGCNErtBW5EyefQ+jXhfnAiwteYm8F7RLVE="; - - postInstall = '' - installManPage $src/git-credential-oauth.1 - ''; - - meta = { - description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth"; - homepage = "https://github.com/hickford/git-credential-oauth"; - changelog = "https://github.com/hickford/git-credential-oauth/releases/tag/${src.rev}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ shyim ]; - mainProgram = "git-credential-oauth"; - }; -} diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix index d69988eca012..54af934bde8b 100644 --- a/pkgs/applications/version-management/git-fame/default.nix +++ b/pkgs/applications/version-management/git-fame/default.nix @@ -15,7 +15,7 @@ bundlerEnv { ''; homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; mainProgram = "git-fame"; }; diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix deleted file mode 100644 index 835b6ddf8514..000000000000 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "git-interactive-rebase-tool"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "MitMaro"; - repo = pname; - rev = version; - hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; - }; - - cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; - - # Compilation during tests fails if this env var is not set. - preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; - postCheck = "unset GIRT_BUILD_GIT_HASH"; - - meta = with lib; { - homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; - description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; - changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 zowoq ma27 ]; - mainProgram = "interactive-rebase-tool"; - }; -} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index f53586e75705..8021e165e6c6 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs }: +{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs, stdenv }: buildGoModule rec { pname = "git-lfs"; @@ -39,6 +39,7 @@ buildGoModule rec { postInstall = '' installManPage man/man*/* + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd git-lfs \ --bash <($out/bin/git-lfs completion bash) \ --fish <($out/bin/git-lfs completion fish) \ diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix deleted file mode 100644 index 566a032f9b20..000000000000 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: - -rustPlatform.buildRustPackage rec { - pname = "git-nomad"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "rraval"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA="; - }; - - cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - nativeCheckInputs = [ - git - ]; - - meta = with lib; { - description = "Synchronize work-in-progress git branches in a light weight fashion"; - homepage = "https://github.com/rraval/git-nomad"; - changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ rraval ]; - mainProgram = "git-nomad"; - }; -} diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix deleted file mode 100644 index 01ac29cf8c56..000000000000 --- a/pkgs/applications/version-management/git-sync/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: - -stdenv.mkDerivation rec { - pname = "git-sync"; - version = "unstable-2022-03-20"; - - src = fetchFromGitHub { - owner = "simonthum"; - repo = "git-sync"; - rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415"; - sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp -a git-* $out/bin/ - cp -a contrib/git-* $out/bin/ - ''; - - wrapperPath = lib.makeBinPath ([ - coreutils - git - gnugrep - gnused - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); - - postFixup = '' - wrap_path="${wrapperPath}":$out/bin - - wrapProgram $out/bin/git-sync \ - --prefix PATH : $wrap_path - - wrapProgram $out/bin/git-sync-on-inotify \ - --prefix PATH : $wrap_path - ''; - - meta = { - description = "Script to automatically synchronize a git repository"; - homepage = "https://github.com/simonthum/git-sync"; - maintainers = with lib.maintainers; [ imalison ]; - license = lib.licenses.cc0; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index ddbb5b803f5b..2e2bad280684 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "git-up"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; src = fetchPypi { pname = "git_up"; inherit version; - hash = "sha256-GTX2IWLQ48yWfPnmtEa9HJ5umQLttqgTlgZQlaWgeE4="; + hash = "sha256-SncbnK6LxsleKRa/sSCm/8dsgPw/XJGvYfkcIeWYDy4="; }; nativeBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 9e9130fce6ad..1b4f736ed63f 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -20,6 +20,7 @@ , gzip # needed at runtime by gitweb.cgi , withSsh ? false , sysctl +, deterministic-host-uname # trick Makefile into targeting the host platform when cross-compiling , doInstallCheck ? !stdenv.hostPlatform.isDarwin # extremely slow on darwin , tests }: @@ -29,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.46.1"; + version = "2.47.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-iIyvuL1qtMu+vBaAQKiFDrCI+B3DrCYXGVz8CHfw9UM="; + hash = "sha256-HOEU2ohwQnG0PgJ8UeBNk5n4yI6e91Qtrnrrrn2HvE4="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] + nativeBuildInputs = [ deterministic-host-uname gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ] @@ -130,8 +131,7 @@ stdenv.mkDerivation (finalAttrs: { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent" - ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD"; + ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ stdenv.shellPackage diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix deleted file mode 100644 index 2ebe3c4d2305..000000000000 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ /dev/null @@ -1,254 +0,0 @@ -{ - lib, - stdenv, - libXcomposite, - libgnome-keyring, - makeWrapper, - udev, - curlWithGnuTls, - alsa-lib, - libXfixes, - atk, - gtk3, - libXrender, - pango, - adwaita-icon-theme, - cairo, - freetype, - fontconfig, - libX11, - libXi, - libxcb, - libXext, - libXcursor, - glib, - libXScrnSaver, - libxkbfile, - libXtst, - nss, - nspr, - cups, - fetchzip, - expat, - gdk-pixbuf, - libXdamage, - libXrandr, - dbus, - makeDesktopItem, - openssl, - wrapGAppsHook3, - buildPackages, - at-spi2-atk, - at-spi2-core, - libuuid, - e2fsprogs, - krb5, - libdrm, - mesa, - unzip, - copyDesktopItems, - libxshmfence, - libxkbcommon, - git, - libGL, - zlib, - cacert, -}: - -let - pname = "gitkraken"; - version = "10.4.1"; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - srcs = { - x86_64-linux = fetchzip { - url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-ZvLDGhBnWjjWqzwqJOz91X8hr94jkXtMA8CL2hh9mlI="; - }; - - x86_64-darwin = fetchzip { - url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-21VwDFw2dyySoc4NC/RR3k/VtksqaZ5vkdx0z5MKqLc="; - }; - - aarch64-darwin = fetchzip { - url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-N8WMbJFC74tIeJ6Yyk58nT+sIBYN/7PNLdYNxGSB2yM="; - }; - }; - - src = srcs.${stdenv.hostPlatform.system} or throwSystem; - - meta = with lib; { - homepage = "https://www.gitkraken.com/git-client"; - description = "Simplifying Git for any OS"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ - xnwdd - evanjs - arkivm - nicolas-goudry - ]; - mainProgram = "gitkraken"; - }; - - linux = stdenv.mkDerivation rec { - inherit - pname - version - src - meta - ; - - dontBuild = true; - dontConfigure = true; - - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib - curlWithGnuTls - udev - libX11 - libXext - libXcursor - libXi - libxcb - glib - libXScrnSaver - libxkbfile - libXtst - nss - nspr - cups - alsa-lib - expat - gdk-pixbuf - dbus - libXdamage - libXrandr - atk - pango - cairo - freetype - fontconfig - libXcomposite - libXfixes - libXrender - gtk3 - libgnome-keyring - openssl - at-spi2-atk - at-spi2-core - libuuid - e2fsprogs - krb5 - libdrm - mesa - libxshmfence - libxkbcommon - libGL - zlib - ]; - - desktopItems = [ - (makeDesktopItem { - name = "GitKraken Desktop"; - exec = "gitkraken"; - icon = "gitkraken"; - desktopName = "GitKraken Desktop"; - genericName = "Git Client"; - categories = [ "Development" ]; - comment = "Unleash your repo"; - }) - ]; - - nativeBuildInputs = [ - copyDesktopItems - # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. - (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) - ]; - buildInputs = [ - gtk3 - adwaita-icon-theme - ]; - - # avoid double-wrapping - dontWrapGApps = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/${pname}/ - cp -R $src/* $out/share/${pname} - - mkdir -p $out/share/pixmaps - cp gitkraken.png $out/share/pixmaps/ - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") - ''; - - postFixup = '' - pushd $out/share/${pname} - for file in gitkraken chrome-sandbox chrome_crashpad_handler; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file - done - - for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name git -o -name git-\* -o -name scalar -o -name \*.so\* \) ); do - patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true - done - popd - - # SSL and permissions fix for bundled nodegit - pushd $out/share/${pname}/resources/app.asar.unpacked/node_modules/@axosoft/nodegit/build/Release - mv nodegit-ubuntu-18.node nodegit-ubuntu-18-ssl-1.1.1.node - mv nodegit-ubuntu-18-ssl-static.node nodegit-ubuntu-18.node - chmod 755 nodegit-ubuntu-18.node - popd - - # Devendor bundled git - rm -rf $out/share/${pname}/resources/app.asar.unpacked/git - ln -s ${git} $out/share/${pname}/resources/app.asar.unpacked/git - - # GitKraken expects the CA bundle to be located in the bundled git directory. Since we replace it with - # the one from nixpkgs, which doesn't provide a CA bundle, we need to explicitly set its location at runtime - makeWrapper $out/share/${pname}/gitkraken $out/bin/gitkraken \ - --set GIT_SSL_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ - "''${gappsWrapperArgs[@]}" - ''; - }; - - darwin = stdenv.mkDerivation { - inherit - pname - version - src - meta - ; - - nativeBuildInputs = [ - unzip - makeWrapper - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications/GitKraken.app $out/bin - cp -R . $out/Applications/GitKraken.app - - makeWrapper $out/Applications/GitKraken.app/Contents/MacOS/GitKraken $out/bin/gitkraken - - runHook postInstall - ''; - - dontFixup = true; - }; -in -if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix deleted file mode 100644 index f0fb34deeb91..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildGoModule, lib, fetchFromGitLab }: - -buildGoModule rec { - pname = "gitlab-pages"; - version = "17.3.6"; - - # nixpkgs-update: no auto update - src = fetchFromGitLab { - owner = "gitlab-org"; - repo = "gitlab-pages"; - rev = "v${version}"; - hash = "sha256-yieOM9QQuQQ4RkfjASpcEvIKwbYMT9LkkJPHAYhY7uY="; - }; - - vendorHash = "sha256-O8kWiOpgVCUD6DdM95F1b+j4Gv9LTLRdBjByqXWV7Pk="; - subPackages = [ "." ]; - - meta = with lib; { - description = "Daemon used to serve static websites for GitLab users"; - mainProgram = "gitlab-pages"; - homepage = "https://gitlab.com/gitlab-org/gitlab-pages"; - changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = teams.helsinki-systems.members ++ teams.gitlab.members; - }; -} diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix deleted file mode 100644 index 2170526c4ec5..000000000000 --- a/pkgs/applications/version-management/gitstatus/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ - callPackage, - lib, - stdenv, - fetchFromGitHub, - git, - zsh, - runtimeShell, -}: -stdenv.mkDerivation rec { - pname = "gitstatus"; - version = "1.5.5"; - - src = fetchFromGitHub { - owner = "romkatv"; - repo = "gitstatus"; - rev = "v${version}"; - sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc="; - }; - - buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; - - postPatch = '' - sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh - sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh - sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install - ''; - - installPhase = '' - install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd - install -Dm444 gitstatus.plugin.sh -t $out/share/gitstatus/ - install -Dm444 gitstatus.plugin.zsh -t $out/share/gitstatus/ - install -Dm444 gitstatus.prompt.sh -t $out/share/gitstatus/ - install -Dm444 gitstatus.prompt.zsh -t $out/share/gitstatus/ - install -Dm555 install -t $out/share/gitstatus/ - install -Dm444 build.info -t $out/share/gitstatus/ - - # the fallback path is wrong in the case of home-manager - # because the FHS directories don't start at / - substituteInPlace install \ - --replace "_gitstatus_install_main ." "_gitstatus_install_main $out" - - cat < $out/bin/gitstatus-share - #!${runtimeShell} - # Run this script to find the gitstatus shared folder where all the shell - # integration scripts are living. - echo $out/share/gitstatus - EOF - chmod +x $out/bin/gitstatus-share - ''; - - # Don't install the "install" and "build.info" files, which the end user - # should not need to worry about. - pathsToLink = [ - "/bin/gitstatusd" - "/share/gitstatus/gitstatus.plugin.sh" - "/share/gitstatus/gitstatus.plugin.zsh" - "/share/gitstatus/gitstatus.prompt.sh" - "/share/gitstatus/gitstatus.prompt.zsh" - ]; - - # The install check sets up an empty Git repository and a minimal zshrc that - # invokes gitstatus.plugin.zsh. It runs zsh against this zshrc and verifies - # that the script was sourced successfully and that the "gitstatus_query" - # command ran successfully. This tests the binary itself and the zsh - # integration. - nativeInstallCheckInputs = [ - git - zsh - ]; - doInstallCheck = true; - installCheckPhase = '' - TEMP=$(mktemp -d) - cd "$TEMP" - - git init - - echo ' - GITSTATUS_LOG_LEVEL=DEBUG - . $out/share/gitstatus/gitstatus.plugin.zsh || exit 1 - - gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST - gitstatus_query NIX_TEST - if [[ $? -ne 0 ]]; then - print -- "Something went wrong with gitstatus" - exit 1 - elif [[ $VCS_STATUS_RESULT != "ok-sync" ]]; then - print -- "Not in a Git repo" - exit 1 - else - print -- "OK" - exit 0 - fi - ' > .zshrc - - # If we try to run zsh like "zsh -i -c true" or "zsh -i > output" then job - # control will be disabled in the shell and the gitstatus plugin script - # will fail when it tries to set the MONITOR option. As a workaround, we - # run zsh as a full-fledged independent process and then wait for it to - # exit. (The "exit" statements in the zshrc ensure that zsh will exit - # almost immediately after starting.) - ZDOTDIR=. zsh -i & - wait $! - ''; - - meta = with lib; { - description = "10x faster implementation of `git status` command"; - longDescription = '' - To enable the included gitstatus prompt, add the appropriate line to your NixOS configuration: - `programs.bash.promptInit = "source $(gitstatus-share)/gitstatus.prompt.sh";` - `programs.zsh.promptInit = "source $(gitstatus-share)/gitstatus.prompt.zsh";` - - See the project homepage for details on customization. - ''; - homepage = "https://github.com/romkatv/gitstatus"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - mmlb - hexa - SuperSandro2000 - ]; - platforms = platforms.all; - mainProgram = "gitstatusd"; - }; -} diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix deleted file mode 100644 index 4e8cfbfd43fc..000000000000 --- a/pkgs/applications/version-management/gql/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, zlib -, cmake -}: - -rustPlatform.buildRustPackage rec { - pname = "gql"; - version = "0.28.0"; - - src = fetchFromGitHub { - owner = "AmrDeveloper"; - repo = "GQL"; - rev = version; - hash = "sha256-BA94Q8nRf4NptVBHSMYLMEklB9vHaXRU1+o7shXhkZQ="; - }; - - cargoHash = "sha256-L+o0ZhTI7x01DpGuhWrvzvSZDYHc++31svWTJ41qx90="; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - - buildInputs = [ - libgit2 - zlib - ]; - - meta = with lib; { - description = "SQL like query language to perform queries on .git files"; - homepage = "https://github.com/AmrDeveloper/GQL"; - changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "gitql"; - }; -} diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix deleted file mode 100644 index ee95e9726ae5..000000000000 --- a/pkgs/applications/version-management/josh/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, libgit2 -, openssl -, pkg-config -, makeWrapper -, git -, darwin -}: - -let - # josh-ui requires javascript dependencies, haven't tried to figure it out yet - cargoFlags = [ "--workspace" "--exclude" "josh-ui" ]; - version = "24.08.14"; -in - -rustPlatform.buildRustPackage { - pname = "josh"; - inherit version; - - src = fetchFromGitHub { - owner = "esrlabs"; - repo = "josh"; - rev = "v${version}"; - hash = "sha256-6U1nhERpPQAVgQm6xwRlHIhslYBLd65DomuGn5yRiSs="; - }; - - cargoHash = "sha256-s6+Bd4ucwUinrcbjNvlDsf9LhWc/U9SAvBRW7JAmxVA="; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - buildInputs = [ - libgit2 - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Security - ]; - - cargoBuildFlags = cargoFlags; - cargoTestFlags = cargoFlags; - - # used to teach josh itself about its version number - env.JOSH_VERSION = "r${version}"; - - postInstall = '' - wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin" - ''; - - meta = { - description = "Just One Single History"; - homepage = "https://josh-project.github.io/josh/"; - downloadPage = "https://github.com/josh-project/josh"; - changelog = "https://github.com/josh-project/josh/releases/tag/${version}"; - license = lib.licenses.mit; - maintainers = [ - lib.maintainers.sternenseemann - lib.maintainers.tazjin - ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 84f41e6e26c6..3c6edb20297f 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -85,7 +85,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index eac6a917895c..1287d5e6ad3b 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -5,9 +5,9 @@ let in { sublime-merge = common { - buildVersion = "2096"; - aarch64sha256 = "IHPJJ/oQ3SLemRyey5syTL0sf5GEeHSylDX+EQNNQGU="; - x64sha256 = "41I6p5wNx2pF56np7gHqp396RHpXtQu5ruksUywF/Ug="; + buildVersion = "2102"; + aarch64sha256 = "E//XrWlfvMeRWYfBXVTSSUPlDFY/rzSynJ4aP1WyZ0Y="; + x64sha256 = "Odb3ZvJCo4HTvJ7z31J/5wlyhSUpZRFBXP3f/Wkb7tU="; } { }; sublime-merge-dev = common { diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix deleted file mode 100644 index a195c51358ef..000000000000 --- a/pkgs/applications/version-management/tailor/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, python3 -, fetchurl -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tailor"; - version = "0.9.37"; - - src = fetchurl { - url = "https://gitlab.com/ports1/tailor/-/archive/0.937/tailor-0.937.tar.gz"; - hash = "sha256-Bdf8ZCRsbCsFz1GRxyQxxndXSsm8oOL2738m9UxOTVc="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - future - ]; - - # AssertionError: Tailor Darcs repository not found! - doCheck = false; - - meta = with lib; { - description = "Tool to migrate changesets between various kinds of version control system"; - longDescription = '' - With its ability to "translate the history" from one VCS kind to another, - this tool makes it easier to keep the upstream changes merged in - a own branch of a product. - - Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs, Monotone, - Perforce or Subversion and rewrite it over Aegis, Bazaar, CVS, Darcs, Git, - Mercurial, Monotone and Subversion. - ''; - homepage = "https://gitlab.com/ports1/tailor"; - license = licenses.gpl1Plus; - platforms = platforms.unix; - mainProgram = "tailor"; - }; -} diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index e0ebccac96b8..0b87b5e7624a 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "bino"; - version = "2.2"; + version = "2.3"; src = fetchgit { url = "https://git.marlam.de/git/bino.git"; rev = "bino-${finalAttrs.version}"; - hash = "sha256-t7bkpYOswGEjUg+k2gjUkWwZJjj44KIVrEQs5P4DoSI="; + hash = "sha256-3DnEVde7LzaQUMhPi/RosRIW9j8bbkPVkihO5swCbws="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix deleted file mode 100644 index 054bb04aee72..000000000000 --- a/pkgs/applications/video/deface/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, python3 -, fetchFromGitHub -, pkgs -}: - -python3.pkgs.buildPythonApplication rec { - pname = "deface"; - version = "1.5.0"; - pyproject = true; - - disabled = python3.pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "ORB-HD"; - repo = "deface"; - rev = "refs/tags/v${version}"; - hash = "sha256-/mXWeL6OSgW4BMXtAZD/3UxQUGt7UE5ZvH8CXNCueJo="; - }; - - build-system = with python3.pkgs; [ - setuptools-scm - ]; - - dependencies = with python3.pkgs; [ - imageio - imageio-ffmpeg - numpy - onnx - onnxruntime # Nixpkgs onnxruntime is missing CUDA support - opencv4 - scikit-image - tqdm - ]; - - # Native onnxruntime lib used by Python module onnxruntime can't find its other libs without this - makeWrapperArgs = [ - ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"'' - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "opencv-python" "opencv" - ''; - - pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ]; - - meta = { - description = "Video anonymization by face detection"; - homepage = "https://github.com/ORB-HD/deface"; - changelog = "https://github.com/ORB-HD/deface/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lurkki ]; - mainProgram = "deface"; - # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' - broken = stdenv.hostPlatform.system == "aarch64-linux"; - }; -} diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix deleted file mode 100644 index 5127dba204fc..000000000000 --- a/pkgs/applications/video/dmlive/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, makeWrapper -, openssl -, configd -, Security -, mpv -, ffmpeg -, nodejs -}: - -rustPlatform.buildRustPackage rec { - pname = "dmlive"; - version = "5.5.4"; - - src = fetchFromGitHub { - owner = "THMonster"; - repo = pname; - rev = "688ddda12ed70a7ad25ede63e948e1cba143a307"; # no tag - hash = "sha256-M7IZ2UzusWovyhigyUXasmSEz4J79gnFyivHVUqfUKg="; - }; - - cargoHash = "sha256-d3vI2iv2Db1XZQc3uaNfkUpDyNKPvHkb/0zEwRTOWZ0="; - - OPENSSL_NO_VENDOR = true; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; - - postInstall = '' - wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" - ''; - - meta = with lib; { - description = "Tool to play and record videos or live streams with danmaku"; - homepage = "https://github.com/THMonster/dmlive"; - license = licenses.mit; - mainProgram = "dmlive"; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix deleted file mode 100644 index cade6f0c7484..000000000000 --- a/pkgs/applications/video/go-chromecast/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-chromecast"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "vishen"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI="; - }; - - vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; - - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; - - meta = with lib; { - homepage = "https://github.com/vishen/go-chromecast"; - description = "CLI for Google Chromecast, Home devices and Cast Groups"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "go-chromecast"; - }; -} diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1a82cd1c19b9..2e407ba094bf 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -28,7 +28,7 @@ buildKodiBinaryAddon rec { extraBuildInputs = [ pugixml rapidjson ]; - extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + extraRuntimeDependencies = [ glib nspr nss (lib.getLib stdenv.cc.cc) ]; extraInstallPhase = let n = namespace; in '' ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index faa623f37e29..f9e37e80d509 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.1.0"; + version = "7.1.0.1"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-I3dSGcPQVVhn4RO8CHtn3FG2dheSv4XiDO7w+MtTjRU="; + hash = "sha256-5tctuY2vYEfkkNVjprnUPJ/crwmMGCEdcRxUQR5EQxw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix deleted file mode 100644 index bdf361cec9fc..000000000000 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ mkDerivation, lib, fetchgit, pkg-config, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: - -mkDerivation rec { - version = "0.8.5"; - pname = "linuxstopmotion"; - - src = fetchgit { - url = "https://git.code.sf.net/p/linuxstopmotion/code"; - rev = version; - sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069"; - }; - - nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ]; - - postPatch = '' - substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin' - ''; - - meta = with lib; { - description = "Create stop-motion animation movies"; - homepage = "http://linuxstopmotion.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - mainProgram = "stopmotion"; - }; -} diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix deleted file mode 100644 index 6db16f1aec06..000000000000 --- a/pkgs/applications/video/mediathekview/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: - -stdenv.mkDerivation rec { - version = "14.0.0"; - pname = "mediathekview"; - src = fetchurl { - url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "sha256-vr0yqKVRodtXalHEIsm5gdEp9wPU9U5nnYhMk7IiPF4="; - }; - - - nativeBuildInputs = [ makeWrapper zip ]; - - installPhase = - let - libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; - in - '' - runHook preInstall - - mkdir -p $out/{bin,lib} - - install -m644 MediathekView.jar $out/lib - - makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-jar $out/lib/MediathekView.jar" \ - --suffix LD_LIBRARY_PATH : "${libraryPath}" - - makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-jar $out/lib/MediathekView.jar" \ - --suffix LD_LIBRARY_PATH : "${libraryPath}" - - makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ - --suffix LD_LIBRARY_PATH : "${libraryPath}" - - runHook postInstall - ''; - - meta = with lib; { - description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; - homepage = "https://mediathekview.de/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3Plus; - mainProgram = "mediathek"; - maintainers = with maintainers; [ moredread ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch index affd85d2b732..4d26bfdd39d0 100644 --- a/pkgs/applications/video/mlv-app/aarch64-flags.patch +++ b/pkgs/applications/video/mlv-app/aarch64-flags.patch @@ -2,12 +2,12 @@ diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro index ebdc552..3e37573 100644 --- a/platform/qt/MLVApp.pro +++ b/platform/qt/MLVApp.pro -@@ -84,7 +84,7 @@ win32{ +@@ -120,7 +120,7 @@ win32{ # Linux linux-g++*{ -- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 - QMAKE_CXXFLAGS += -fopenmp +- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize ++ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize + QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize LIBS += -lgomp } diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index da9f4d5807e1..c4f0f984518e 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,10 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; + patches = lib.optionals stdenv.hostPlatform.isAarch64 [ + # remove optimization flags with x86 only instruction sets + ./aarch64-flags.patch + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch deleted file mode 100644 index 2b6085ed3c9f..000000000000 --- a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift -index 0acec6bd40..0ec5837864 100644 ---- a/osdep/mac/input_helper.swift -+++ b/osdep/mac/input_helper.swift -@@ -18,6 +18,14 @@ - import Cocoa - import Carbon.HIToolbox - -+extension NSCondition { -+ fileprivate func withLock(_ body: () throws -> T) rethrows -> T { -+ self.lock() -+ defer { self.unlock() } -+ return try body() -+ } -+} -+ - class InputHelper: NSObject { - var option: OptionHelper? - var lock = NSCondition() diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d1f44b09b16d..8624506e52e4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -7,7 +7,6 @@ buildPackages, callPackage, config, - darwin, docutils, fetchFromGitHub, ffmpeg, @@ -15,15 +14,11 @@ freetype, lcms2, libGL, - libGLU, libX11, libXScrnSaver, libXext, - libXinerama, libXpresent, libXrandr, - libXv, - libXxf86vm, libarchive, libass, libbluray, @@ -33,19 +28,17 @@ libcdio-paranoia, libdrm, libdvdnav, - libiconv, libjack2, libplacebo, - libpng, libpthreadstubs, libpulseaudio, libsixel, - libtheora, libuchardet, libva, libvdpau, libxkbcommon, lua, + makeWrapper, mesa, meson, mujs, @@ -58,7 +51,6 @@ python3, rubberband, shaderc, # instead of spirv-cross - speex, stdenv, swift, testers, @@ -68,7 +60,6 @@ wayland, wayland-protocols, wayland-scanner, - xcbuild, zimg, # Boolean @@ -81,59 +72,28 @@ cmsSupport ? true, drmSupport ? stdenv.hostPlatform.isLinux, dvbinSupport ? stdenv.hostPlatform.isLinux, - dvdnavSupport ? stdenv.hostPlatform.isLinux, + dvdnavSupport ? true, jackaudioSupport ? false, javascriptSupport ? true, - libpngSupport ? true, openalSupport ? true, - pipewireSupport ? stdenv.hostPlatform.isLinux, - pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + pipewireSupport ? !stdenv.hostPlatform.isDarwin, + pulseSupport ? config.pulseaudio or (!stdenv.hostPlatform.isDarwin), rubberbandSupport ? true, - screenSaverSupport ? true, - sdl2Support ? !stdenv.hostPlatform.isDarwin, + sdl2Support ? false, sixelSupport ? false, - speexSupport ? true, - swiftSupport ? stdenv.hostPlatform.isDarwin, - theoraSupport ? true, - vaapiSupport ? x11Support || waylandSupport, + vaapiSupport ? !stdenv.hostPlatform.isDarwin && (x11Support || waylandSupport), vapoursynthSupport ? false, vdpauSupport ? true, - vulkanSupport ? stdenv.hostPlatform.isLinux, - waylandSupport ? stdenv.hostPlatform.isLinux, - x11Support ? stdenv.hostPlatform.isLinux, - xineramaSupport ? stdenv.hostPlatform.isLinux, - xvSupport ? stdenv.hostPlatform.isLinux, + vulkanSupport ? true, + waylandSupport ? !stdenv.hostPlatform.isDarwin, + x11Support ? !stdenv.hostPlatform.isDarwin, zimgSupport ? true, }: let - inherit (darwin.apple_sdk_11_0.frameworks) - AVFoundation - Accelerate - Cocoa - CoreAudio - CoreFoundation - CoreMedia - MediaPlayer - VideoToolbox - ; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); - - overrideSDK = - platform: version: - platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; }; - - stdenv' = - if swiftSupport && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - stdenv.override (old: { - buildPlatform = overrideSDK old.buildPlatform "11.0"; - hostPlatform = overrideSDK old.hostPlatform "11.0"; - targetPlatform = overrideSDK old.targetPlatform "11.0"; - }) - else - stdenv; in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "mpv"; version = "0.39.0"; @@ -151,18 +111,13 @@ stdenv'.mkDerivation (finalAttrs: { hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM="; }; - patches = [ - # Fix build with Darwin SDK 11 - ./0001-fix-darwin-build.patch - ]; - postPatch = lib.concatStringsSep "\n" [ # Don't reference compile time dependencies or create a build outputs cycle # between out and dev '' substituteInPlace meson.build \ --replace-fail "conf_data.set_quoted('CONFIGURATION', configuration)" \ - "conf_data.set_quoted('CONFIGURATION', '')" + "conf_data.set_quoted('CONFIGURATION', '')" '' # A trick to patchShebang everything except mpv_identify.sh '' @@ -174,30 +129,16 @@ stdenv'.mkDerivation (finalAttrs: { '' ]; - # Ensure we reference 'lib' (not 'out') of Swift. - preConfigure = lib.optionalString swiftSupport '' - export SWIFT_LIB_DYNAMIC="${lib.getLib swift.swift}/lib/swift/macosx" - ''; - - mesonFlags = - [ - (lib.mesonOption "default_library" "shared") - (lib.mesonBool "libmpv" true) - (lib.mesonEnable "libarchive" archiveSupport) - (lib.mesonEnable "manpage-build" true) - (lib.mesonEnable "cdda" cddaSupport) - (lib.mesonEnable "dvbin" dvbinSupport) - (lib.mesonEnable "dvdnav" dvdnavSupport) - (lib.mesonEnable "openal" openalSupport) - (lib.mesonEnable "sdl2" sdl2Support) - # Disable whilst Swift isn't supported - (lib.mesonEnable "swift-build" swiftSupport) - (lib.mesonEnable "macos-cocoa-cb" swiftSupport) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Toggle explicitly because it fails on darwin - (lib.mesonEnable "videotoolbox-pl" vulkanSupport) - ]; + mesonFlags = [ + (lib.mesonOption "default_library" "shared") + (lib.mesonBool "libmpv" true) + (lib.mesonEnable "manpage-build" true) + (lib.mesonEnable "cdda" cddaSupport) + (lib.mesonEnable "dvbin" dvbinSupport) + (lib.mesonEnable "dvdnav" dvdnavSupport) + (lib.mesonEnable "openal" openalSupport) + (lib.mesonEnable "sdl2" sdl2Support) + ]; mesonAutoFeatures = "auto"; @@ -211,9 +152,9 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ buildPackages.darwin.sigtool - xcbuild.xcrun + swift + makeWrapper ] - ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = @@ -248,16 +189,12 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals jackaudioSupport [ libjack2 ] ++ lib.optionals javascriptSupport [ mujs ] - ++ lib.optionals libpngSupport [ libpng ] ++ lib.optionals openalSupport [ openalSoft ] ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseSupport [ libpulseaudio ] ++ lib.optionals rubberbandSupport [ rubberband ] - ++ lib.optionals screenSaverSupport [ libXScrnSaver ] ++ lib.optionals sdl2Support [ SDL2 ] ++ lib.optionals sixelSupport [ libsixel ] - ++ lib.optionals speexSupport [ speex ] - ++ lib.optionals theoraSupport [ libtheora ] ++ lib.optionals vaapiSupport [ libva ] ++ lib.optionals vapoursynthSupport [ vapoursynth ] ++ lib.optionals vdpauSupport [ libvdpau ] @@ -274,29 +211,13 @@ stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals x11Support [ libX11 libXext - libGLU libGL - libXxf86vm libXrandr libXpresent + libXScrnSaver ] - ++ lib.optionals xineramaSupport [ libXinerama ] - ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreFoundation - Cocoa - CoreAudio - MediaPlayer - VideoToolbox - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && swiftSupport) [ - AVFoundation - CoreMedia - ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ]; postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths @@ -325,6 +246,13 @@ stdenv'.mkDerivation (finalAttrs: { + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r mpv.app $out/Applications + + # On macOS, many things won’t work properly unless `mpv(1)` is + # executed from the app bundle, such as spatial audio with + # `--ao=avfoundation`. This wrapper ensures that those features + # work reliably and also avoids shipping two copies of the entire + # `mpv` executable. + makeWrapper $out/Applications/mpv.app/Contents/MacOS/mpv $out/bin/mpv ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 30bfdcc8cb8e..a65a1c86078a 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,14 +9,14 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.5.0"; + version = "5.6.0"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-WFsqA5kGefQmvihLUuQBfMmKoUHiO7ofxpwISRygRm4="; + hash = "sha256-oEU1mPDzaW5j6zMpnSn1baQ+qlr/MtErxRfiyVBWMHU="; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 4ca4f675bbd7..ebe293597606 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -171,6 +171,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" "-Wno-error=sign-compare" # https://github.com/obsproject/obs-studio/issues/10200 "-Wno-error=stringop-overflow=" ]; diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 9037ccd0ac67..1c07eff5e7d2 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nix-update-script, cmake, ninja, @@ -15,33 +16,48 @@ procps, qtbase, stdenv, - tesseract, websocketpp, libXScrnSaver, + libusb1, + pkg-config, + fetchpatch, +# #FIXME: Could not get cmake to pick up on these dependencies +# Prevents cmake from building the OCR video capabilities +# Everything else should work just missing this on plugin +# tesseract, +# leptonica, }: - let httplib-src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; - rev = "v0.17.3"; - hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk="; + rev = "v0.13.3"; + hash = "sha256-ESaH0+n7ycpOKM+Mnv/UgT16UEx86eFMQDHB3RVmgBw="; }; in stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.27.2"; + version = "1.28.1"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-7IciHCe2KemKNJpD9QcYK4AtxHlYuWaPsBCcVuPVvgA="; + hash = "sha256-1U5quhfdhEBcCbEzW0uEpimYgvdbsIwaL2EdQ4cLF/M="; }; nativeBuildInputs = [ cmake ninja + pkg-config + ]; + + patches = [ + # https://github.com/WarmUpTill/SceneSwitcher/pull/1244 + (fetchpatch { + url = "https://github.com/WarmUpTill/SceneSwitcher/commit/e0c650574f9f7f6cae5626afa9abf8a838dc0858.diff"; + hash = "sha256-eXO8LdGYf60sd/kyxWVDSEpwyzp4Uu9TpPADg5ED4yU="; + }) ]; buildInputs = [ @@ -52,11 +68,13 @@ stdenv.mkDerivation rec { nlohmann_json obs-studio opencv + # tesseract + # leptonica procps qtbase - tesseract websocketpp libXScrnSaver + libusb1 ]; dontWrapQtApps = true; @@ -68,13 +86,14 @@ stdenv.mkDerivation rec { chmod -R +w $sourceRoot/deps/libremidi ''; - env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow -Wno-error=deprecated-declarations"; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Automated scene switcher for OBS Studio"; homepage = "https://github.com/WarmUpTill/SceneSwitcher"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ patrickdag ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 9dc1c4f04835..e7a09a69a5ee 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-ZmxopTv6YuAZ/GykvMRcP2PQwQk08ObmqZ9kBcR0UH4="; + sha256 = "sha256-kCiRgfpcFdxoK6e8jtrtzkBD4w5B/ilO1YyBHCG13gg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix index cbe565fe73c8..4f19af793880 100644 --- a/pkgs/applications/video/qctools/default.nix +++ b/pkgs/applications/video/qctools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg, qtmultimedia, qwt }: +{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg_6, qtmultimedia, qwt }: stdenv.mkDerivation rec { pname = "qctools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake wrapQtAppsHook ]; - buildInputs = [ ffmpeg qtmultimedia qwt ]; + buildInputs = [ ffmpeg_6 qtmultimedia qwt ]; installPhase = '' runHook preInstall @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Audiovisual analytics and filtering of video files"; homepage = "https://mediaarea.net/QCTools"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/vdr/epgsearch/default.nix b/pkgs/applications/video/vdr/epgsearch/default.nix new file mode 100644 index 000000000000..208ce7fb953f --- /dev/null +++ b/pkgs/applications/video/vdr/epgsearch/default.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + vdr, + util-linux, + groff, + perl, + pcre, +}: +stdenv.mkDerivation rec { + pname = "vdr-epgsearch"; + version = "2.4.3"; + + src = fetchFromGitHub { + repo = "vdr-plugin-epgsearch"; + owner = "vdr-projects"; + sha256 = "sha256-hOMISobeEt/jB4/18t5ZeN+EcPHhm8Jz8Kar72KYS3E="; + rev = "v${version}"; + }; + + postPatch = '' + for f in *.sh; do + patchShebangs "$f" + done + ''; + + nativeBuildInputs = [ + perl # for pod2man and pos2html + util-linux + groff + ]; + + buildInputs = [ + vdr + pcre + ]; + + buildFlags = [ + "SENDMAIL=" + "REGEXLIB=pcre" + ]; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + outputs = [ + "out" + "man" + ]; + + meta = { + inherit (src.meta) homepage; + description = "Searchtimer and replacement of the VDR program menu"; + mainProgram = "createcats"; + maintainers = [ lib.maintainers.ck3d ]; + license = lib.licenses.gpl2; + inherit (vdr.meta) platforms; + }; +} diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index c86a8ff29643..96375c04a5aa 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -1,21 +1,25 @@ -{ lib -, stdenv -, vdr -, fetchFromGitHub -, ffmpeg +{ + lib, + stdenv, + vdr, + fetchFromGitHub, + ffmpeg, }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.6.0"; + version = "4.2.5"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-O958GNQI6Z+m4sIJfGQzLaCrzyrdpn+ZY8COx7RoUZs="; + hash = "sha256-zN52wyER1PuMr0oAj/BWaiX7kHqq5qW8JZqGXrVPtbU="; rev = "V${version}"; }; - buildInputs = [ vdr ffmpeg ]; + buildInputs = [ + vdr + ffmpeg + ]; postPatch = '' substituteInPlace command/Makefile --replace '/usr' "" @@ -35,13 +39,11 @@ stdenv.mkDerivation rec { installFlags = buildFlags; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Plugin for VDR that marks advertisements"; mainProgram = "markad"; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; + maintainers = [ lib.maintainers.ck3d ]; + inherit (vdr.meta) platforms license; }; - } diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix index c413206b8257..6c04f49fb49a 100644 --- a/pkgs/applications/video/vdr/nopacity/default.nix +++ b/pkgs/applications/video/vdr/nopacity/default.nix @@ -1,16 +1,25 @@ -{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }: +{ + stdenv, + lib, + fetchFromGitLab, + vdr, + graphicsmagick, +}: stdenv.mkDerivation rec { pname = "vdr-skin-nopacity"; - version = "1.1.17"; + version = "1.1.18"; src = fetchFromGitLab { repo = "SkinNopacity"; owner = "kamel5"; - hash = "sha256-QJKlh5my7e+H5R4E0fCWB/PtwIAXCXw4drQEQzhzfag="; + hash = "sha256-Aq5PtD6JV8jdBURADl9KkdVQvfmeQD/Zh62g5ansuC4="; rev = version; }; - buildInputs = [ vdr graphicsmagick ]; + buildInputs = [ + vdr + graphicsmagick + ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index a0d12156f774..ef497d5a8c9e 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { lib, stdenv, vdr, fetchFromGitHub -, graphicsmagick, pcre -, boost, libgcrypt, perl, util-linux, groff, ncurses +, graphicsmagick +, boost, libgcrypt, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -12,6 +12,8 @@ }; in { + epgsearch = callPackage ./epgsearch {}; + markad = callPackage ./markad {}; nopacity = callPackage ./nopacity {}; @@ -57,56 +59,6 @@ in { }; - epgsearch = stdenv.mkDerivation rec { - pname = "vdr-epgsearch"; - version = "2.4.2"; - - src = fetchFromGitHub { - repo = "vdr-plugin-epgsearch"; - owner = "vdr-projects"; - sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y="; - rev = "v${version}"; - }; - - postPatch = '' - for f in *.sh; do - patchShebangs "$f" - done - ''; - - nativeBuildInputs = [ - perl # for pod2man and pos2html - util-linux - groff - ]; - - buildInputs = [ - vdr - pcre - ]; - - buildFlags = [ - "SENDMAIL=" - "REGEXLIB=pcre" - ]; - - installFlags = [ - "DESTDIR=$(out)" - ]; - - outputs = [ "out" "man" ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Searchtimer and replacement of the VDR program menu"; - mainProgram = "createcats"; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; - }; - - }; - vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; version = "1.8.3"; diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix deleted file mode 100644 index b2f848773c8a..000000000000 --- a/pkgs/applications/video/wf-recorder/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - scdoc, - wayland-scanner, - wayland, - wayland-protocols, - ffmpeg, - x264, - libpulseaudio, - pipewire, - mesa, # for libgbm -}: - -stdenv.mkDerivation rec { - pname = "wf-recorder"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "ammen99"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wayland-scanner - scdoc - ]; - buildInputs = [ - wayland - wayland-protocols - ffmpeg - x264 - libpulseaudio - pipewire - mesa - ]; - - meta = with lib; { - description = "Utility program for screen recording of wlroots-based compositors"; - inherit (src.meta) homepage; - changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux; - mainProgram = "wf-recorder"; - }; -} diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix deleted file mode 100644 index 448254db0ccf..000000000000 --- a/pkgs/applications/virtualization/cntr/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, nixosTests }: - -rustPlatform.buildRustPackage rec { - pname = "cntr"; - version = "1.5.3"; - - src = fetchFromGitHub { - owner = "Mic92"; - repo = "cntr"; - rev = version; - sha256 = "sha256-spa4qPEhpNSZIk16jeH9YEr4g9JcVmpetHz72A/ZAPY="; - }; - - cargoHash = "sha256-YN8EtUXKtT8Xc0RnW7QqL+awyWy5xFKWhYMxgYG28I4="; - - passthru.tests = nixosTests.cntr; - - meta = with lib; { - description = "Container debugging tool based on FUSE"; - homepage = "https://github.com/Mic92/cntr"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.mic92 ]; - mainProgram = "cntr"; - }; -} diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix deleted file mode 100644 index 290186a59e3e..000000000000 --- a/pkgs/applications/virtualization/colima/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, darwin -, buildGoModule -, fetchFromGitHub -, installShellFiles -, lima -, lima-bin -, makeWrapper -, qemu -, testers -, colima - # use lima-bin on darwin to support native macOS virtualization - # https://github.com/NixOS/nixpkgs/pull/209171 -, lima-drv ? if stdenv.hostPlatform.isDarwin then lima-bin else lima -}: - -buildGoModule rec { - pname = "colima"; - version = "0.7.5"; - - src = fetchFromGitHub { - owner = "abiosoft"; - repo = pname; - rev = "v${version}"; - hash = "sha256-WInmoTUaEm2kQ7esZgPj3YIHmHbBrlBTWcLPC9/2MdY="; - # We need the git revision - leaveDotGit = true; - postFetch = '' - git -C $out rev-parse --short HEAD > $out/.git-revision - rm -rf $out/.git - ''; - }; - - nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - - vendorHash = "sha256-niuBo2YUUYKH0eSApOByNLrcHqr9m5VKGoiGp1fKklg="; - - # disable flaky Test_extractZones - # https://hydra.nixos.org/build/212378003/log - excludedPackages = "gvproxy"; - - CGO_ENABLED = 1; - - preConfigure = '' - ldflags="-s -w -X github.com/abiosoft/colima/config.appVersion=${version} \ - -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" - ''; - - postInstall = '' - wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} - - installShellCompletion --cmd colima \ - --bash <($out/bin/colima completion bash) \ - --fish <($out/bin/colima completion fish) \ - --zsh <($out/bin/colima completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = colima; - command = "HOME=$(mktemp -d) colima version"; - }; - - meta = with lib; { - description = "Container runtimes with minimal setup"; - homepage = "https://github.com/abiosoft/colima"; - license = licenses.mit; - maintainers = with maintainers; [ aaschmid tricktron ]; - mainProgram = "colima"; - }; -} diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 47b574d415dc..9461b311c8da 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.31.1"; + version = "1.31.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-0IPQsCLiL0Q15pq89qToMfw6mDwmMZroNBkTCfgqx6s="; + hash = "sha256-xTMQ7YVZ4tKQxaAsH9EVa7W2rTcxP//P3NUgYHojdmw="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix deleted file mode 100644 index 815330b136f3..000000000000 --- a/pkgs/applications/virtualization/crun/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, go-md2man -, pkg-config -, libcap -, libseccomp -, python3 -, systemd -, yajl -, nixosTests -, criu -}: - -let - # these tests require additional permissions - disabledTests = [ - "test_capabilities.py" - "test_cwd.py" - "test_delete.py" - "test_detach.py" - "test_exec.py" - "test_hooks.py" - "test_hostname.py" - "test_oci_features" - "test_paths.py" - "test_pid.py" - "test_pid_file.py" - "test_preserve_fds.py" - "test_resources" - "test_seccomp" - "test_start.py" - "test_uid_gid.py" - "test_update.py" - "tests_libcrun_utils" - ]; - -in -stdenv.mkDerivation rec { - pname = "crun"; - version = "1.18"; - - src = fetchFromGitHub { - owner = "containers"; - repo = pname; - rev = version; - hash = "sha256-t04jmLfkxZhvlfW79s8G7cc4W9ptFUQsD2a4/VODAC8="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; - - buildInputs = [ criu libcap libseccomp systemd yajl ]; - - enableParallelBuilding = true; - strictDeps = true; - - NIX_LDFLAGS = "-lcriu"; - - # we need this before autoreconfHook does its thing in order to initialize - # config.h with the correct values - postPatch = '' - echo ${version} > .tarball-version - echo '#define GIT_VERSION "${src.rev}"' > git-version.h - - ${lib.concatMapStringsSep "\n" (e: - "substituteInPlace Makefile.am --replace 'tests/${e}' ''" - ) disabledTests} - ''; - - doCheck = true; - - passthru.tests = { inherit (nixosTests) podman; }; - - meta = with lib; { - changelog = "https://github.com/containers/crun/releases/tag/${version}"; - description = "Fast and lightweight fully featured OCI runtime and C library for running containers"; - homepage = "https://github.com/containers/crun"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.podman.members; - mainProgram = "crun"; - }; -} diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix deleted file mode 100644 index 567a1b4db6eb..000000000000 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, wget }: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "distrobox"; - version = "1.7.2.1"; - - src = fetchFromGitHub { - owner = "89luca89"; - repo = "distrobox"; - rev = finalAttrs.version; - hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA="; - }; - - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - # https://github.com/89luca89/distrobox/issues/408 - substituteInPlace ./distrobox-generate-entry \ - --replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out" - ./install -P $out - - runHook postInstall - ''; - - # https://github.com/89luca89/distrobox/issues/407 - postFixup = '' - wrapProgram "$out/bin/distrobox-generate-entry" \ - --prefix PATH ":" ${lib.makeBinPath [ wget ]} - - mkdir -p $out/share/distrobox - echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf - ''; - - meta = with lib; { - description = "Wrapper around podman or docker to create and start containers"; - longDescription = '' - Use any linux distribution inside your terminal. Enable both backward and - forward compatibility with software and freedom to use whatever distribution - you’re more comfortable with - ''; - homepage = "https://distrobox.it/"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ atila ]; - }; -}) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 57ce036eb495..562a6b87922e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-+d0yaosNoOOuo/A7aC6pfy2xGJU718nBBNMMok2Ofv0="; + hash = "sha256-mw66AF+JwavuB8r2qzo50rguqZaUfzCVmyYI6yk7ig8="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1ffa016159aa..36afd5bedcdf 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -24,6 +24,16 @@ rec { , knownVulnerabilities ? [] }: let + docker-meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + offline + vdemeester + periklis + teutat3s + ]; + }; + docker-runc = runc.overrideAttrs { pname = "docker-runc"; inherit version; @@ -160,6 +170,11 @@ rec { ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs" ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper" ++ lib.optional withSeccomp "seccomp"; + + meta = docker-meta // { + homepage = "https://mobyproject.org/"; + description = "A collaborative project for the container ecosystem to assemble container-based systems."; + }; }); plugins = lib.optional buildxSupport docker-buildx @@ -254,10 +269,10 @@ rec { passthru = { # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) inherit moby-src; - tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; + tests = lib.optionalAttrs (!clientOnly) { inherit (nixosTests) docker; }; }; - meta = with lib; { + meta = docker-meta // { homepage = "https://www.docker.com/"; description = "Open source project to pack, ship and run any application as a lightweight container"; longDescription = '' @@ -265,8 +280,6 @@ rec { To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`. ''; - license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester periklis teutat3s ]; mainProgram = "docker"; inherit knownVulnerabilities; }; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index c6cbdc8e2c76..525013bf86e0 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,14 +9,14 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.3.4"; + version = "1.3.5"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-eByF0OpL1OKGq0wY7kw8Sv9sZuVE0K3TGIm4Chk9PC4="; + hash = "sha256-yBUCUHc9vgyKFqAOHXQjAYQnmN0yXSIvkpR/s3LNAmk="; }; # Update by running diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix deleted file mode 100644 index f233dc4f82ca..000000000000 --- a/pkgs/applications/virtualization/tart/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeWrapper -# Softnet support ("--net-softnet") is disabled by default as it requires -# passwordless-sudo when installed through nix. Alternatively users may install -# softnet through other means with "setuid"-bit enabled. -# See https://github.com/cirruslabs/softnet#installing -, enableSoftnet ? false, softnet -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "tart"; - version = "2.18.5"; - - src = fetchurl { - url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-3mbO6HlJxEl9NZzJ8IaZWESqPzS7OTw+I+t0XH25D/Q="; - }; - sourceRoot = "."; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - # ./tart.app/Contents/MacOS/tart binary is required to be used in order to - # trick macOS to pick tart.app/Contents/embedded.provision profile for elevated - # privileges that Tart needs - mkdir -p $out/bin $out/Applications - cp -r tart.app $out/Applications/tart.app - makeWrapper $out/Applications/tart.app/Contents/MacOS/tart $out/bin/tart \ - --prefix PATH : ${lib.makeBinPath (lib.optional enableSoftnet softnet)} - install -Dm444 LICENSE $out/share/tart/LICENSE - - runHook postInstall - ''; - - meta = with lib; { - description = "macOS VMs on Apple Silicon to use in CI and other automations"; - homepage = "https://tart.run"; - license = licenses.fairsource09; - maintainers = with maintainers; [ emilytrau aduh95 ]; - mainProgram = finalAttrs.pname; - platforms = [ "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 8546f64a55b0..d7e07ed311a3 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { "test_misc_nonpredicatble_generate" "test_disk_dir_searchable" # does something strange with permissions "testCLI0001virt_install_many_devices" # expects /var to exist + "testCLI0263virt_xml" # depends on a specific libvirt version ]; preCheck = '' diff --git a/pkgs/applications/virtualization/virter/default.nix b/pkgs/applications/virtualization/virter/default.nix deleted file mode 100644 index 18fd9ad2f35a..000000000000 --- a/pkgs/applications/virtualization/virter/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "virter"; - version = "0.27.0"; - - src = fetchFromGitHub { - owner = "LINBIT"; - repo = "virter"; - rev = "v${version}"; - hash = "sha256-sfO704nZnsSpSokJUwc3ucPBlKIi3cbZUG1dwbKDnFw="; - }; - - vendorHash = "sha256-NmA1rLWSX03zurGZWvXv61TSB9hecEfi7Hx9yi7QL/c="; - - ldflags = [ - "-s" - "-w" - "-X github.com/LINBIT/virter/cmd.version=${version}" - "-X github.com/LINBIT/virter/cmd.builddate=builtByNix" - "-X github.com/LINBIT/virter/cmd.githash=builtByNix" - ]; - - # requires network access - doCheck = false; - - meta = { - description = "Command line tool for simple creation and cloning of virtual machines based on libvirt"; - homepage = "https://github.com/LINBIT/virter"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dit7ya ]; - mainProgram = "virter"; - }; -} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 23e93e8fdf2f..a7b091013ae7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -233,11 +233,18 @@ stdenv.mkDerivation (finalAttrs: { }) # While the KVM patch should not break any other behavior if --with-kvm is not specified, # we don't take any chances and only apply it if people actually want to use KVM support. - ++ optional enableKvm (fetchpatch { - name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; - url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; - hash = finalAttrs.kvmPatchHash; - }) + ++ optional enableKvm ( + let + patchVboxVersion = + # There is no updated patch for 7.0.22 yet, but the older one still applies. + if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion; + in + fetchpatch { + name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; + url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${patchVboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; + hash = finalAttrs.kvmPatchHash; + } + ) ++ [ ./qt-dependency-paths.patch # https://github.com/NixOS/nixpkgs/issues/123851 diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 5810070d2ff4..d5567ce15e8f 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -89,7 +89,7 @@ in memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; mocp.propagatedBuildInputs = [ pkgs.moc ]; - mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; + mpd.propagatedBuildInputs = [ pkgs.mpc ]; network.propagatedBuildInputs = [ py.netifaces pkgs.iw ]; network_traffic.propagatedBuildInputs = [ py.netifaces ]; nic.propagatedBuildInputs = [ py.netifaces pkgs.iw ]; diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 75d9484846a8..0a2961bbe46e 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -79,3 +79,19 @@ if [ ! "$havePlatformVersionFlag" ]; then extraBefore+=(-@darwinPlatform@_version_min "${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@}") fi fi + +mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} + +# Allow wrapped bintools to do something useful when no `DEVELOPER_DIR` is set, which can happen when +# the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. +DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} + +# Darwin looks for frameworks in the SDK located at `DEVELOPER_DIR`. +extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") +extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") + +# While the Swift wrapper should take care of this, anything that needs to link Swift auto-linked frameworks +# also needs these paths. Note: Test and conditionally add it because the path may not exist in older SDKs. +if [ -d "$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift" ]; then + extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift") +fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6d8b9a0a7593..a2a0736c2221 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -10,6 +10,7 @@ , stdenvNoCC , runtimeShell , bintools ? null, libc ? null, coreutils ? null, gnugrep ? null +, apple-sdk ? null , netbsd ? null , sharedLibraryLoader ? if libc == null then @@ -106,7 +107,8 @@ let coreutils_bin = optionalString (!nativeTools) (getBin coreutils); # See description in cc-wrapper. - suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config + + lib.optionalString (targetPlatform.isDarwin && targetPlatform.isStatic) "_static"; # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. @@ -405,6 +407,9 @@ stdenvNoCC.mkDerivation { inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; inherit bintools_bin libc_bin libc_dev libc_lib; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + } // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { + # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. + fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; }; meta = diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index f80807cc1e41..dc8ee68e8783 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -33,18 +33,15 @@ # follows: # /lib32 will include 32bit libraries from multiPkgs # /lib64 will include 64bit libraries from multiPkgs and targetPkgs -# /lib will link to /lib32 +# /lib will link to /lib64 let - inherit (stdenv.hostPlatform) is64bit; - name = if (args ? pname && args ? version) then "${args.pname}-${args.version}" else args.name; # "use of glibc_multi is only supported on x86_64-linux" isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; - isTargetBuild = !isMultiBuild; # list of packages (usually programs) which match the host's architecture # (which includes stuff from multiPkgs) @@ -60,7 +57,7 @@ let baseTargetPaths = with pkgs; [ glibcLocales (if isMultiBuild then glibc_multi else glibc) - (toString gcc.cc.lib) + gcc.cc.lib bashInteractiveFHS coreutils less @@ -77,7 +74,7 @@ let xz ]; baseMultiPaths = with pkgsi686Linux; [ - (toString gcc.cc.lib) + gcc.cc.lib ]; ldconfig = writeShellScriptBin "ldconfig" '' @@ -85,190 +82,139 @@ let exec ${if isMultiBuild then pkgsi686Linux.glibc.bin else pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" ''; - etcProfile = writeText "profile" '' - export PS1='${name}-fhsenv:\u@\h:\w\$ ' - export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" - export TZDIR='/etc/zoneinfo' + etcProfile = pkgs.writeTextFile { + name = "${name}-fhsenv-profile"; + destination = "/etc/profile"; + text = '' + export PS1='${name}-fhsenv:\u@\h:\w\$ ' + export LOCALE_ARCHIVE="''${LOCALE_ARCHIVE:-/usr/lib/locale/locale-archive}" + export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" + export TZDIR='/etc/zoneinfo' - # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share + # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share - # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". - # In nix, it is commonly set without containing these values, so we add them as fallback. - # - # [1] - case ":$XDG_DATA_DIRS:" in - *:/usr/local/share:*) ;; - *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; - esac - case ":$XDG_DATA_DIRS:" in - *:/usr/share:*) ;; - *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;; - esac + # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". + # In nix, it is commonly set without containing these values, so we add them as fallback. + # + # [1] + case ":$XDG_DATA_DIRS:" in + *:/usr/local/share:*) ;; + *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; + esac + case ":$XDG_DATA_DIRS:" in + *:/usr/share:*) ;; + *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;; + esac - # Force compilers and other tools to look in default search paths - unset NIX_ENFORCE_PURITY - export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 - export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 - export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' - export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' - export PKG_CONFIG_PATH=/usr/lib/pkgconfig - export ACLOCAL_PATH=/usr/share/aclocal + # Force compilers and other tools to look in default search paths + unset NIX_ENFORCE_PURITY + export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 + export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 + export NIX_CFLAGS_COMPILE='-idirafter /usr/include' + export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' + export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' + export PKG_CONFIG_PATH=/usr/lib/pkgconfig + export ACLOCAL_PATH=/usr/share/aclocal - # GStreamer searches for plugins relative to its real binary's location - # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bd97973ce0f2c5495bcda5cccd4f7ef7dcb7febc - export GST_PLUGIN_SYSTEM_PATH_1_0=/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0 + # GStreamer searches for plugins relative to its real binary's location + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bd97973ce0f2c5495bcda5cccd4f7ef7dcb7febc + export GST_PLUGIN_SYSTEM_PATH_1_0=/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0 - ${profile} + ${profile} + ''; + }; + + ensureGsettingsSchemasIsDirectory = runCommandLocal "fhsenv-ensure-gsettings-schemas-directory" {} '' + mkdir -p $out/share/glib-2.0/schemas + touch $out/share/glib-2.0/schemas/.keep ''; - # Compose /etc for the fhs environment - etcPkg = runCommandLocal "${name}-fhs-etc" { } '' - mkdir -p $out/etc - pushd $out/etc + # Shamelessly stolen (and cleaned up) from original buildEnv. + # Should be semantically equivalent, except we also take + # a list of default extra outputs that will be installed + # for derivations that don't explicitly specify one. + # Note that this is not the same as `extraOutputsToInstall`, + # as that will apply even to derivations with an output + # explicitly specified, so this does change the behavior + # very slightly for that particular edge case. + pickOutputs = let + pickOutputsOne = outputs: drv: + let + isSpecifiedOutput = drv.outputSpecified or false; + outputsToInstall = drv.meta.outputsToInstall or null; + pickedOutputs = if isSpecifiedOutput || outputsToInstall == null + then [ drv ] + else map (out: drv.${out} or null) (outputsToInstall ++ outputs); + extraOutputs = map (out: drv.${out} or null) extraOutputsToInstall; + cleanOutputs = lib.filter (o: o != null) (pickedOutputs ++ extraOutputs); + in { + paths = cleanOutputs; + priority = drv.meta.priority or lib.meta.defaultPriority; + }; + in paths: outputs: map (pickOutputsOne outputs) paths; - # environment variables - ln -s ${etcProfile} profile + paths = let + basePaths = [ + etcProfile + # ldconfig wrapper must come first so it overrides the original ldconfig + ldconfig + # magic package that just creates a directory, to ensure that + # the entire directory can't be a symlink, as we will write + # compiled schemas to it + ensureGsettingsSchemasIsDirectory + ] ++ baseTargetPaths ++ targetPaths; + in pickOutputs basePaths ["out" "lib" "bin"]; + + paths32 = lib.optionals isMultiBuild ( + let + basePaths = baseMultiPaths ++ multiPaths; + in pickOutputs basePaths ["out" "lib"] + ); + + allPaths = paths ++ paths32; + + rootfs-builder = pkgs.rustPlatform.buildRustPackage { + name = "fhs-rootfs-bulder"; + src = ./rootfs-builder; + cargoLock.lockFile = ./rootfs-builder/Cargo.lock; + doCheck = false; + }; + + rootfs = pkgs.runCommand "${name}-fhsenv-rootfs" { + __structuredAttrs = true; + exportReferencesGraph.graph = lib.concatMap (p: p.paths) allPaths; + inherit paths paths32 isMultiBuild includeClosures; + nativeBuildInputs = [ pkgs.jq ]; + } '' + ${rootfs-builder}/bin/rootfs-builder + + # create a bunch of symlinks for usrmerge + ln -s /usr/bin $out/bin + ln -s /usr/sbin $out/sbin + ln -s /usr/lib $out/lib + ln -s /usr/lib32 $out/lib32 + ln -s /usr/lib64 $out/lib64 + ln -s /usr/lib64 $out/usr/lib + + # symlink 32-bit ld-linux so it's visible in /lib + if [ -e $out/usr/lib32/ld-linux.so.2 ]; then + ln -s /usr/lib32/ld-linux.so.2 $out/usr/lib64/ld-linux.so.2 + fi # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) - ln -s /proc/mounts mtab - ''; + ln -s /proc/mounts $out/etc/mtab - # Composes a /usr-like directory structure - staticUsrProfileTarget = buildEnv { - name = "${name}-usr-target"; - # ldconfig wrapper must come first so it overrides the original ldconfig - paths = [ etcPkg ldconfig ] ++ baseTargetPaths ++ targetPaths; - extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; - ignoreCollisions = true; - postBuild = '' - if [[ -d $out/share/gsettings-schemas/ ]]; then - # Recreate the standard schemas directory if its a symlink to make it writable - if [[ -L $out/share/glib-2.0 ]]; then - target=$(readlink $out/share/glib-2.0) - rm $out/share/glib-2.0 - mkdir $out/share/glib-2.0 - ln -fsr $target/* $out/share/glib-2.0 - fi - - if [[ -L $out/share/glib-2.0/schemas ]]; then - target=$(readlink $out/share/glib-2.0/schemas) - rm $out/share/glib-2.0/schemas - mkdir $out/share/glib-2.0/schemas - ln -fsr $target/* $out/share/glib-2.0/schemas - fi - - mkdir -p $out/share/glib-2.0/schemas - - for d in $out/share/gsettings-schemas/*; do - # Force symlink, in case there are duplicates - ln -fsr $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas - ln -fsr $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas - done - - # and compile them - ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - fi - ''; - inherit includeClosures; - }; - - staticUsrProfileMulti = buildEnv { - name = "${name}-usr-multi"; - paths = baseMultiPaths ++ multiPaths; - extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall; - ignoreCollisions = true; - inherit includeClosures; - }; - - # setup library paths only for the targeted architecture - setupLibDirsTarget = '' - # link content of targetPaths - cp -rsHf ${staticUsrProfileTarget}/lib lib - ln -s lib lib${if is64bit then "64" else "32"} - ''; - - # setup /lib, /lib32 and /lib64 - setupLibDirsMulti = '' - mkdir -m0755 lib32 - mkdir -m0755 lib64 - ln -s lib64 lib - - # copy glibc stuff - cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ - chmod u+w -R lib32/ - - # copy content of multiPaths (32bit libs) - if [ -d ${staticUsrProfileMulti}/lib ]; then - cp -rsHf ${staticUsrProfileMulti}/lib/* lib32/ - chmod u+w -R lib32/ + if [[ -d $out/usr/share/gsettings-schemas/ ]]; then + for d in $out/usr/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fsr $d/glib-2.0/schemas/*.xml $out/usr/share/glib-2.0/schemas + ln -fsr $d/glib-2.0/schemas/*.gschema.override $out/usr/share/glib-2.0/schemas + done + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/usr/share/glib-2.0/schemas fi - # copy content of targetPaths (64bit libs) - cp -rsHf ${staticUsrProfileTarget}/lib/* lib64/ - chmod u+w -R lib64/ - - # symlink 32-bit ld-linux.so - ln -Lsf ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ + ${extraBuildCommands} + ${lib.optionalString isMultiBuild extraBuildCommandsMulti} ''; - - setupLibDirs = if isTargetBuild - then setupLibDirsTarget - else setupLibDirsMulti; - - # the target profile is the actual profile that will be used for the fhs - setupTargetProfile = '' - mkdir -m0755 usr - pushd usr - - ${setupLibDirs} - - '' + lib.optionalString isMultiBuild '' - if [ -d "${staticUsrProfileMulti}/share" ]; then - cp -rLf ${staticUsrProfileMulti}/share share - fi - '' + '' - if [ -d "${staticUsrProfileTarget}/share" ]; then - if [ -d share ]; then - chmod -R 755 share - cp -rLTf ${staticUsrProfileTarget}/share share - else - cp -rsHf ${staticUsrProfileTarget}/share share - fi - fi - for i in bin sbin include; do - if [ -d "${staticUsrProfileTarget}/$i" ]; then - cp -rsHf "${staticUsrProfileTarget}/$i" "$i" - fi - done - cd .. - - for i in etc opt; do - if [ -d "${staticUsrProfileTarget}/$i" ]; then - cp -rsHf "${staticUsrProfileTarget}/$i" "$i" - fi - done - for i in usr/{bin,sbin,lib,lib32,lib64}; do - if [ -d "$i" ]; then - ln -s "$i" - fi - done - - popd - ''; - -in runCommandLocal "${name}-fhs" { - inherit nativeBuildInputs; - passthru = { - inherit args baseTargetPaths targetPaths baseMultiPaths ldconfig isMultiBuild; - }; -} '' - mkdir -p $out - pushd $out - - ${setupTargetProfile} - ${extraBuildCommands} - ${lib.optionalString isMultiBuild extraBuildCommandsMulti} -'' +in rootfs diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/Cargo.lock b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/Cargo.lock new file mode 100644 index 000000000000..7f9606804dc9 --- /dev/null +++ b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/Cargo.lock @@ -0,0 +1,249 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" + +[[package]] +name = "goblin" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ab3f32d1d77146981dea5d6b1e8fe31eedcb7013e5e00d6ccd1259a4b4d923" +dependencies = [ + "log", + "plain", + "scroll", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "proc-macro2" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rootfs-builder" +version = "0.1.0" +dependencies = [ + "anyhow", + "goblin", + "serde", + "serde_json", + "walkdir", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scroll" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde" +version = "1.0.213" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.213" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "syn" +version = "2.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/Cargo.toml b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/Cargo.toml new file mode 100644 index 000000000000..a6bfc71603fd --- /dev/null +++ b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "rootfs-builder" +version = "0.1.0" +edition = "2021" + +[dependencies] +anyhow = "*" +serde = { version = "*", features = ["derive"] } +serde_json = "*" +walkdir = "*" +goblin = "*" diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs new file mode 100644 index 000000000000..f765a96d3e08 --- /dev/null +++ b/pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs @@ -0,0 +1,293 @@ +#![deny(clippy::pedantic)] + +use std::{ + collections::{hash_map::Entry, HashMap}, + env, + fs::{self, File}, + io::{BufReader, Read}, + os::unix::fs as ufs, + path::{Path, PathBuf}, +}; + +use anyhow::{anyhow, Context}; +use goblin::{Hint, Object}; +use serde::Deserialize; +use walkdir::WalkDir; + +#[derive(Debug, Deserialize)] +struct RefGraphNode { + path: PathBuf, + references: Vec, +} + +#[derive(Debug, Deserialize)] +struct InputDrv { + paths: Vec, + priority: i64, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct StructuredAttrsRoot { + graph: Vec, + paths: Vec, + paths32: Vec, + include_closures: bool, +} + +#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] +struct PriorityKey { + implicit: bool, + group_priority: i64, + priority: i64, + root_index: usize, +} + +fn build_reference_map(refs: Vec) -> HashMap> { + refs.into_iter() + .map(|mut gn| { + gn.references.retain_mut(|x| x != &gn.path); + (gn.path, gn.references) + }) + .collect() +} + +fn build_priority_keys(roots: &[InputDrv], group_priority: i64) -> HashMap { + let mut roots_map = HashMap::new(); + + for (idx, path) in roots.iter().enumerate() { + for subpath in &path.paths { + let priority = PriorityKey { + group_priority, + priority: path.priority, + root_index: idx, + implicit: false, + }; + + roots_map.entry(subpath.clone()).or_insert(priority); + } + } + + roots_map +} + +fn extend_to_closure( + roots: HashMap, + refs: &HashMap>, +) -> anyhow::Result> { + let mut path_map = HashMap::new(); + + for (root, priority) in roots { + path_map.insert(root.clone(), priority); + + let mut priority = priority; + priority.implicit = true; + + let mut stack = vec![root.clone()]; + + while let Some(next) = stack.pop() { + match path_map.entry(next.clone()) { + Entry::Occupied(mut occupied_entry) => { + let old_priority: &PriorityKey = occupied_entry.get(); + if old_priority > &priority { + occupied_entry.insert(priority); + } + } + Entry::Vacant(vacant_entry) => { + vacant_entry.insert(priority); + } + } + + stack.extend_from_slice(refs.get(&next).ok_or(anyhow!("encountered unknown path"))?); + } + } + + Ok(path_map) +} + +#[derive(Clone, Debug)] +struct CandidatePath { + root: PathBuf, + relative: PathBuf, + priority: PriorityKey, +} + +fn collect_candidate_paths( + paths: HashMap, + mapper: impl Fn(&Path, &Path) -> Option, +) -> anyhow::Result>> { + let mut candidates: HashMap<_, Vec<_>> = HashMap::new(); + + for (path, priority) in paths { + for entry in WalkDir::new(&path).follow_links(true) { + let entry: PathBuf = match entry { + Ok(ent) => { + // we don't care about directory structure + if ent.file_type().is_dir() { + continue; + } + + ent.path().into() + } + Err(e) => { + match e.io_error() { + // could be a broken symlink, that's fine, we still want to handle those + Some(_) => e + .path() + .ok_or_else(|| anyhow!("I/O error when walking {path:?}"))? + .into(), + None => { + // symlink loop + continue; + } + } + } + }; + + let relative = entry.strip_prefix(&path)?.to_owned(); + if let Some(mapped) = mapper(&path, &relative) { + candidates.entry(mapped).or_default().push(CandidatePath { + root: path.clone(), + relative, + priority, + }); + } + } + } + + Ok(candidates) +} + +fn remap_native_path(root: &Path, p: &Path) -> Option { + if p.starts_with("bin/") || p.starts_with("sbin/") { + return Some(PathBuf::from("usr/").join(p)); + } + + // glibc-multilib special case + if let Ok(no_lib32) = p.strip_prefix("lib/32/") { + return Some(PathBuf::from("usr/lib32/").join(no_lib32)); + } + + remap_multilib_path(root, p) +} + +fn is_32_bit(path: &Path) -> bool { + // Be as pessimistic as possible, at least for now. + let Ok(mut f) = File::open(path) else { + return false; + }; + + let Ok(Hint::Elf(hint)) = goblin::peek(&mut f) else { + return false; + }; + + if let Some(is64) = hint.is_64 { + return !is64; + } + + let mut buf = vec![]; + let Ok(_) = f.read_to_end(&mut buf) else { + return false; + }; + + let Ok(Object::Elf(e)) = goblin::Object::parse(&buf) else { + return false; + }; + + !e.is_64 +} + +fn remap_multilib_path(root: &Path, p: &Path) -> Option { + if let Ok(no_lib) = p.strip_prefix("lib/") { + let full = root.join(p); + + let libdir = if is_32_bit(&full) { "lib32" } else { "lib64" }; + + return Some(PathBuf::from("usr/").join(libdir).join(no_lib)); + } + + if p.starts_with("etc/") || p.starts_with("opt/") { + return Some(p.into()); + } + + if p.starts_with("share/") || p.starts_with("include/") { + return Some(PathBuf::from("usr/").join(p)); + } + + None +} + +fn build_plan( + paths: HashMap, + paths32: HashMap, +) -> anyhow::Result> { + let candidates_native = collect_candidate_paths(paths, remap_native_path)?; + let candidates_32 = collect_candidate_paths(paths32, remap_multilib_path)?; + + let mut all_candidates: HashMap<_, Vec<_>> = HashMap::new(); + + for map in [candidates_native, candidates_32] { + for (path, candidates) in map { + all_candidates + .entry(path) + .or_default() + .extend_from_slice(&candidates); + } + } + + let mut final_plan: HashMap = HashMap::new(); + for (path, candidates) in all_candidates { + let best = candidates + .into_iter() + .min_by_key(|&CandidatePath { priority, .. }| priority) + .ok_or(anyhow!("candidate list empty"))?; + final_plan.insert(path, best.root.join(best.relative)); + } + + Ok(final_plan) +} + +fn build_env(out: &Path, plan: HashMap) -> anyhow::Result<()> { + fs::create_dir_all(out)?; + + for (dest, src) in plan { + let full_dest = out.join(&dest); + let dest_dir = full_dest + .parent() + .ok_or(anyhow!("destination directory is root")) + .with_context(|| { + format!("When trying to determine destination directory for {full_dest:?}") + })?; + fs::create_dir_all(dest_dir) + .with_context(|| format!("When trying to create directory {dest_dir:?}"))?; + ufs::symlink(&src, &full_dest) + .with_context(|| format!("When symlinking {src:?} to {full_dest:?}"))?; + } + + Ok(()) +} + +fn main() -> anyhow::Result<()> { + let filename = env::var("NIX_ATTRS_JSON_FILE")?; + + let reader = File::open(filename)?; + let buf_reader = BufReader::new(reader); + + let attrs: StructuredAttrsRoot = serde_json::from_reader(buf_reader)?; + + let mut paths = build_priority_keys(&attrs.paths, 1); + let mut paths32 = build_priority_keys(&attrs.paths32, 2); + + if attrs.include_closures { + let refs = build_reference_map(attrs.graph); + + paths = extend_to_closure(paths, &refs)?; + paths32 = extend_to_closure(paths32, &refs)?; + }; + + let plan = build_plan(paths, paths32)?; + + let out_dir = env::var("out")?; + + build_env(&PathBuf::from(out_dir), plan) +} diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index 105e2975f433..9f8bc07a94ad 100644 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -67,7 +67,7 @@ let # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # - # [1] + # [1] case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 2c3dc8884023..cd5396f45f8b 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -78,12 +78,28 @@ if [ -e @out@/nix-support/cc-cflags-before ]; then NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" fi -# Only add darwin min version flag if a default darwin min version is set, +# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set, # which is a signal that we're targetting darwin. if [ "@darwinMinVersion@" ]; then mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" + + # `DEVELOPER_DIR` is used to dynamically locate libSystem (and the SDK frameworks) based on the SDK at that path. + mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} + + # Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when + # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. + DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} + + # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, + # but compilers expect it to point to the absolute path. + SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + + # Set up various library paths since compilers may not support (or may have disabled) finding them in the sysroot. + NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@+=" -isysroot $SDKROOT" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks" fi # That way forked processes will not extend these environment variables again. diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 01f91b408e38..085f64d37dd4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -10,6 +10,7 @@ , stdenvNoCC , runtimeShell , cc ? null, libc ? null, bintools, coreutils ? null +, apple-sdk ? null , zlib ? null , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? cc != null && cc ? man @@ -114,7 +115,8 @@ let # without interfering. For the moment, it is defined as the target triple, # adjusted to be a valid bash identifier. This should be considered an # unstable implementation detail, however. - suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config + + lib.optionalString (targetPlatform.isDarwin && targetPlatform.isStatic) "_static"; useGccForLibs = useCcForLibs && libcxx == null @@ -737,7 +739,7 @@ stdenvNoCC.mkDerivation { # for substitution in utils.bash # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + expandResponseParams = lib.optionalString (expand-response-params != "") (lib.getExe expand-response-params); # TODO(@sternenseemann): rename env var via stdenv rebuild shell = getBin runtimeShell + runtimeShell.shellPath or ""; gnugrep_bin = optionalString (!nativeTools) gnugrep; @@ -749,6 +751,9 @@ stdenvNoCC.mkDerivation { inherit libc_bin libc_dev libc_lib; inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + } // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { + # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. + fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; }; meta = diff --git a/pkgs/build-support/deterministic-uname/default.nix b/pkgs/build-support/deterministic-uname/default.nix deleted file mode 100644 index 9efaa2558bfb..000000000000 --- a/pkgs/build-support/deterministic-uname/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -# expr and script based on our lsb_release -{ stdenv -, lib -, substituteAll -, coreutils -, getopt -, modDirVersion ? "" -, forPlatform ? stdenv.buildPlatform -}: - -substituteAll { - name = "uname"; - - src = ./deterministic-uname.sh; - - dir = "bin"; - isExecutable = true; - - inherit coreutils getopt; - - uSystem = if forPlatform.uname.system != null then forPlatform.uname.system else "unknown"; - inherit (forPlatform.uname) processor; - - # uname -o - # maybe add to lib/systems/default.nix uname attrset - # https://github.com/coreutils/coreutils/blob/7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c/src/uname.c#L373-L374 - # https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from - # https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4 - operatingSystem = - if forPlatform.isLinux - then "GNU/Linux" - else if forPlatform.isDarwin - then "Darwin" # darwin isn't in host-os.m4 so where does this come from? - else if stdenv.buildPlatform.isFreeBSD - then "FreeBSD" - else "unknown"; - - # in os-specific/linux module packages - # --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ - # is a common thing to do. - modDirVersion = if modDirVersion != "" then modDirVersion else "unknown"; - - meta = with lib; { - description = "Print certain system information (hardcoded with lib/system values)"; - mainProgram = "uname"; - longDescription = '' - This package provides a replacement for `uname` whose output depends only - on `stdenv.buildPlatform`, or a configurable `forPlatform`. It is meant - to be used from within derivations. Many packages' build processes run - `uname` at compile time and embed its output into the result of the build. - Since `uname` calls into the kernel, and the Nix sandbox currently does - not intercept these calls, builds made on different kernels will produce - different results. - ''; - license = [ licenses.mit ]; - maintainers = with maintainers; [ artturin ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 377f027910bc..98a52aee2fe6 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -17,7 +17,7 @@ substitutions = { dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc stdenv.cc.libc dotnet-sdk.passthru.icu zlib diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 4ce3c6e84d76..d27a3df7d3df 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -4,6 +4,7 @@ lib.makeOverridable ( { owner, repo, rev, name ? "source" , fetchSubmodules ? false, leaveDotGit ? null , deepClone ? false, private ? false, forceFetchGit ? false +, fetchLFS ? false , sparseCheckout ? [] , githubBase ? "github.com", varPrefix ? null , meta ? { } @@ -25,7 +26,7 @@ let }; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_"; - useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []); + useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || fetchLFS || (sparseCheckout != []); # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. fetcher = @@ -52,7 +53,7 @@ let fetcherArgs = (if useFetchGit then { - inherit rev deepClone fetchSubmodules sparseCheckout; url = gitRepoUrl; + inherit rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl; } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else { url = "${baseUrl}/archive/${rev}.tar.gz"; diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix index e75e25fc1e70..0849323d582c 100644 --- a/pkgs/build-support/fetchsavannah/default.nix +++ b/pkgs/build-support/fetchsavannah/default.nix @@ -8,5 +8,6 @@ lib.makeOverridable ( inherit name; url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/"; + passthru.gitRepoUrl = "https://git.savannah.gnu.org/git/${repo}.git"; } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; } ) diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index b0b0143c5ca9..a7542610a72d 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -8,7 +8,7 @@ let # compression type and filename extension. compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1; in -{ stdenvNoCC, libarchive, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand +{ stdenvNoCC, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand # Name of the derivation (not of the resulting file!) , name ? "initrd" @@ -74,7 +74,7 @@ in passAsFile = ["contents"]; contents = builtins.toJSON contents; - nativeBuildInputs = [makeInitrdNGTool libarchive] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; + nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null; }) '' @@ -85,7 +85,7 @@ in for PREP in $prepend; do cat $PREP >> $out/initrd done - (cd root && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd") + (cd root && find . -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") if [ -n "$makeUInitrd" ]; then mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 5f8d1eee8ce4..e996094d1f8a 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -18,7 +18,7 @@ let # compression type and filename extension. compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1; in -{ stdenvNoCC, perl, libarchive, ubootTools, lib, pkgsBuildHost +{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost # Name of the derivation (not of the resulting file!) , name ? "initrd" @@ -80,7 +80,7 @@ in stdenvNoCC.mkDerivation (rec { builder = ./make-initrd.sh; - nativeBuildInputs = [ perl libarchive ] + nativeBuildInputs = [ perl cpio ] ++ lib.optional makeUInitrd ubootTools; compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 8f64114d54c3..0149c5d487ac 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -40,7 +40,7 @@ for PREP in $prepend; do cat $PREP >> $out/initrd done (cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +) -(cd root && find * .[^.*] -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd") +(cd root && find * .[^.*] -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") if [ -n "$makeUInitrd" ]; then mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix deleted file mode 100644 index 1b8ebcaeacdd..000000000000 --- a/pkgs/build-support/libredirect/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib, stdenv, bintools-unwrapped, llvmPackages, coreutils }: - -if stdenv.hostPlatform.isStatic -then throw '' - libredirect is not available on static builds. - - Please fix your derivation to not depend on libredirect on static - builds, using something like following: - - nativeBuildInputs = - lib.optional (!stdenv.buildPlatform.isStatic) libredirect; - - and disable tests as necessary, although fixing tests to work without - libredirect is even better. - - libredirect uses LD_PRELOAD feature of dynamic loader and does not - work on static builds where dynamic loader is not used. - '' -else stdenv.mkDerivation rec { - pname = "libredirect"; - version = "0"; - - unpackPhase = '' - cp ${./libredirect.c} libredirect.c - cp ${./test.c} test.c - ''; - - outputs = ["out" "hook"]; - - libName = "libredirect" + stdenv.hostPlatform.extensions.sharedLibrary; - - buildPhase = '' - runHook preBuild - - ${if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then '' - # We need the unwrapped binutils and clang: - # We also want to build a fat library with x86_64, arm64, arm64e in there. - # Because we use the unwrapped tools, we need to provide -isystem for headers - # 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:${llvmPackages.clang-unwrapped}/bin:$PATH \ - clang -arch x86_64 -arch arm64 -arch arm64e \ - -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" - '' else if stdenv.hostPlatform.isDarwin then '' - $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ - -Wl,-install_name,$out/lib/$libName \ - -shared -o "$libName" - '' else '' - $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ - -shared -o "$libName" - ''} - - if [ -n "$doInstallCheck" ]; then - $CC -Wall -std=c99 \ - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "-D_GNU_SOURCE"} \ - -O3 test.c -o test - fi - - runHook postBuild - ''; - - # We want to retain debugging info to be able to use GDB on libredirect.so - # to more easily investigate which function overrides are missing or why - # existing ones do not have the intended effect. - dontStrip = true; - - installPhase = '' - runHook preInstall - - install -vD "$libName" "$out/lib/$libName" - - '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' - # dylib will be rejected unless dylib rpath gets explictly set - install_name_tool \ - -change $libName $out/lib/$libName \ - $out/lib/$libName - '' + '' - # Provide a setup hook that injects our library into every process. - mkdir -p "$hook/nix-support" - cat < "$hook/nix-support/setup-hook" - ${if stdenv.hostPlatform.isDarwin then '' - export DYLD_INSERT_LIBRARIES="$out/lib/$libName" - '' else '' - export LD_PRELOAD="$out/lib/$libName" - ''} - SETUP_HOOK - - runHook postInstall - ''; - - doInstallCheck = true; - - installCheckPhase = '' - ( - source "$hook/nix-support/setup-hook" - NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test - ) - ''; - - meta = with lib; { - platforms = platforms.unix; - description = "LD_PRELOAD library to intercept and rewrite the paths in glibc calls"; - longDescription = '' - libredirect is an LD_PRELOAD library to intercept and rewrite the paths in - glibc calls based on the value of $NIX_REDIRECTS, a colon-separated list - of path prefixes to be rewritten, e.g. "/src=/dst:/usr/=/nix/store/". - ''; - }; -} diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 9cae8204c6a8..10caac3a935a 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -3,7 +3,7 @@ # All possible values as defined by the spec, version 1.4. # Please keep in spec order for easier maintenance. # When adding a new value, don't forget to update the Version field below! -# See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html +# See https://specifications.freedesktop.org/desktop-entry-spec/latest lib.makeOverridable ({ name # The name of the desktop file , type ? "Application" # version is hardcoded diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 52b4f5a30e2a..372124829b09 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -13,6 +13,7 @@ , prePatch ? "" , patches ? [ ] , postPatch ? "" +, patchFlags ? [] , nativeBuildInputs ? [ ] , buildInputs ? [ ] # The output hash of the dependencies for this project. @@ -45,7 +46,7 @@ , npmWorkspace ? null , nodejs ? topLevelArgs.nodejs , npmDeps ? fetchNpmDeps { - inherit forceGitDeps forceEmptyCache src srcs sourceRoot prePatch patches postPatch; + inherit forceGitDeps forceEmptyCache src srcs sourceRoot prePatch patches postPatch patchFlags; name = "${name}-npm-deps"; hash = npmDepsHash; } diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 21ca75357fbb..407f7e652c38 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -232,7 +232,7 @@ in nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; openssl = attrs: { diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 07eae85d13ee..965e2b451447 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -38,7 +38,7 @@ cargoCheckHook() { concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" - cargo test "${flagsArray[@]}" + @setEnv@ cargo test "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 7703ff4abad4..37d1b6686255 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -31,7 +31,7 @@ name = "cargo-check-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec setEnv; }; } ./cargo-check-hook.sh) {}; @@ -92,7 +92,7 @@ bindgenHook = callPackage ({}: makeSetupHook { name = "rust-bindgen-hook"; substitutions = { - libclang = clang.cc.lib; + libclang = (lib.getLib clang.cc); inherit clang; }; } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 392163646aa8..541b7fc694d0 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -71,7 +71,7 @@ autoPatchelf() { fi done - @pythonInterpreter@ @autoPatchelfScript@ \ + auto-patchelf \ ${norecurse:+--no-recurse} \ --ignore-missing "${ignoreMissingDepsArray[@]}" \ --paths "$@" \ diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5b38f4376070..d7cab0e81a60 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -37,7 +37,7 @@ convertIconTheme() { local -ra scales=([1]="" [2]="@2") # Based loosely on the algorithm at: - # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#icon_lookup + # https://specifications.freedesktop.org/icon-theme-spec/latest/#icon_lookup # Assumes threshold = 2 for ease of implementation. function findIcon() { local -r iconSize=$1 diff --git a/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix b/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix new file mode 100644 index 000000000000..74bbf5673292 --- /dev/null +++ b/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix @@ -0,0 +1,2 @@ +{ makeSetupHook }: +makeSetupHook { name = "flatten-include-hack-hook"; } ./flatten-include-hack-hook.sh diff --git a/pkgs/build-support/setup-hooks/flatten-include-hack/flatten-include-hack-hook.sh b/pkgs/build-support/setup-hooks/flatten-include-hack/flatten-include-hack-hook.sh new file mode 100644 index 000000000000..b860d4755648 --- /dev/null +++ b/pkgs/build-support/setup-hooks/flatten-include-hack/flatten-include-hack-hook.sh @@ -0,0 +1,16 @@ +# shellcheck shell=bash + +# This is a horrible hack. You should not use this. + +flattenIncludes() { + ( + cd "${!outputInclude}/include" || exit + for file in */*; do + target=$(basename "$file") + echo "[HACK] Symlinking include $file to flattened path $target..." + ln -s "$file" "$target" + done + ) +} + +preFixupHooks+=(flattenIncludes) diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index cd8572629cad..d43bada43794 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -1,22 +1,64 @@ -{ stdenv }: -# srcOnly is a utility builder that only fetches and unpacks the given `src`, -# and optionally patching with `patches` or adding build inputs. -# -# It can be invoked directly, or be used to wrap an existing derivation. Eg: -# -# > srcOnly pkgs.hello -# +{ lib, stdenvNoCC }: + +/** + A utility builder to get the source code of the input derivation, with any patches applied. + + # Examples + + ```nix + srcOnly pkgs.hello + => «derivation /nix/store/gyfk2jg9079ga5g5gfms5i4h0k9jhf0f-hello-2.12.1-source.drv» + + srcOnly { + inherit (pkgs.hello) name version src stdenv; + } + => «derivation /nix/store/vf9hdhz38z7rfhzhrk0vi70h755fnsw7-hello-2.12.1-source.drv» + ``` + + # Type + + ``` + srcOnly :: (Derivation | AttrSet) -> Derivation + ``` + + # Input + + `attrs` + + : One of the following: + + - A derivation with (at minimum) an unpackPhase and a patchPhase. + - A set of attributes that would be passed to a `stdenv.mkDerivation` or `stdenvNoCC.mkDerivation` call. + + # Output + + A derivation that runs a derivation's `unpackPhase` and `patchPhase`, and then copies the result to the output path. +*/ + attrs: let - args = if builtins.hasAttr "drvAttrs" attrs then attrs.drvAttrs else attrs; - name = if builtins.hasAttr "name" args then args.name else "${args.pname}-${args.version}"; + args = attrs.drvAttrs or attrs; + name = args.name or "${args.pname}-${args.version}"; + stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC); + drv = stdenv.mkDerivation ( + args + // { + name = "${name}-source"; + + outputs = [ "out" ]; + + phases = [ + "unpackPhase" + "patchPhase" + "installPhase" + ]; + separateDebugInfo = false; + + dontUnpack = false; + + dontInstall = false; + installPhase = "cp -pr --reflink=auto -- . $out"; + } + ); in -stdenv.mkDerivation (args // { - name = "${name}-source"; - installPhase = "cp -pr --reflink=auto -- . $out"; - outputs = [ "out" ]; - separateDebugInfo = false; - dontUnpack = false; - dontInstall = false; - phases = ["unpackPhase" "patchPhase" "installPhase"]; -}) +lib.warnIf (args.dontUnpack or false) "srcOnly: derivation has dontUnpack set, overriding" drv diff --git a/pkgs/build-support/src-only/tests.nix b/pkgs/build-support/src-only/tests.nix new file mode 100644 index 000000000000..7ea7c23621be --- /dev/null +++ b/pkgs/build-support/src-only/tests.nix @@ -0,0 +1,28 @@ +{ + runCommand, + srcOnly, + emptyDirectory, + glibc, +}: + +let + emptySrc = srcOnly emptyDirectory; + glibcSrc = srcOnly glibc; +in + +runCommand "srcOnly-tests" { } '' + # Test that emptySrc is empty + if [ -n "$(ls -A ${emptySrc})" ]; then + echo "emptySrc is not empty" + exit 1 + fi + + # Test that glibcSrc is not empty + if [ -z "$(ls -A ${glibcSrc})" ]; then + echo "glibcSrc is empty" + exit 1 + fi + + # Make $out exist to avoid build failure + mkdir -p $out +'' diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index b0c9f93649c9..c5b27e85e5bb 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -82,6 +82,7 @@ rec { , destination ? "" , checkPhase ? "" , meta ? { } + , passthru ? { } , allowSubstitutes ? false , preferLocalBuild ? true , derivationArgs ? { } @@ -105,7 +106,8 @@ rec { { mainProgram = lib.head matches; } // meta // derivationArgs.meta or {}; - } // removeAttrs derivationArgs [ "passAsFile" "meta" ]) + passthru = passthru // derivationArgs.passthru or {}; + } // removeAttrs derivationArgs [ "passAsFile" "meta" "passthru" ]) '' target=$out${lib.escapeShellArg destination} mkdir -p "$(dirname "$target")" @@ -220,6 +222,12 @@ rec { Type: AttrSet */ meta ? { }, + /* + `stdenv.mkDerivation`'s `passthru` argument. + + Type: AttrSet + */ + passthru ? { }, /* The `checkPhase` to run. Defaults to `shellcheck` on supported platforms and `bash -n`. @@ -263,7 +271,7 @@ rec { derivationArgs ? { }, }: writeTextFile { - inherit name meta derivationArgs; + inherit name meta passthru derivationArgs; executable = true; destination = "/bin/${name}"; allowSubstitutes = true; @@ -366,9 +374,10 @@ rec { , destination ? "" # relative path appended to $out eg "/bin/foo" , checkPhase ? "" # syntax checks, e.g. for scripts , meta ? { } + , passthru ? { } }: runCommandLocal name - { inherit files executable checkPhase meta destination; } + { inherit files executable checkPhase meta passthru destination; } '' file=$out$destination mkdir -p "$(dirname "$file")" diff --git a/pkgs/data/fonts/0xproto/default.nix b/pkgs/by-name/_0/_0xproto/package.nix similarity index 100% rename from pkgs/data/fonts/0xproto/default.nix rename to pkgs/by-name/_0/_0xproto/package.nix diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix index a8ec077491ce..197a12a90747 100644 --- a/pkgs/by-name/_1/_1fps/package.nix +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -3,6 +3,8 @@ fetchFromGitHub, buildGoModule, xorg, + stdenv, + apple-sdk_14, }: buildGoModule rec { pname = "1fps"; @@ -23,7 +25,7 @@ buildGoModule rec { xorg.libX11 xorg.libXtst xorg.libXi - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14; meta = { description = "Encrypted Screen Sharing"; diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 085013667620..6bc67fb04d6a 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -23,13 +23,13 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.30.0"; + version = "2.30.3"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-KNduqspTzLEHmymSefLnnhIBcIQWx2tshvOc0NwDek0=" "zip"; - i686-linux = fetch "linux_386" "sha256-StdWtD3tz6bKqSem/GFqeRHzkbv4aP7d7dKKtgNhuY8=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-bzhRkpR3te1bcBEfP2BR6SECTC9sRFDshl7B+/278Kg=" "zip"; + aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip"; + i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip"; aarch64-darwin = - fetch "apple_universal" "sha256-L1SZWQWjAJDZydlAttbWLS7igZNAvOmIyaUUdVbvEa8=" + fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4=" "pkg"; x86_64-darwin = aarch64-darwin; }; diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/by-name/_2/_2048-in-terminal/package.nix similarity index 100% rename from pkgs/games/2048-in-terminal/default.nix rename to pkgs/by-name/_2/_2048-in-terminal/package.nix diff --git a/pkgs/games/20kly/default.nix b/pkgs/by-name/_2/_20kly/package.nix similarity index 100% rename from pkgs/games/20kly/default.nix rename to pkgs/by-name/_2/_20kly/package.nix diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/by-name/_3/_3270font/package.nix similarity index 100% rename from pkgs/data/fonts/3270font/default.nix rename to pkgs/by-name/_3/_3270font/package.nix diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix new file mode 100644 index 000000000000..062714febed1 --- /dev/null +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -0,0 +1,156 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + cargo, + libtool, + pkg-config, + cracklib, + lmdb, + json_c, + linux-pam, + libevent, + libxcrypt, + nspr, + nss, + openldap, + withOpenldap ? true, + db, + withBdb ? true, + cyrus_sasl, + icu, + net-snmp, + withNetSnmp ? true, + krb5, + pcre2, + python3, + rustPlatform, + rustc, + openssl, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + systemd, + zlib, + rsync, + withCockpit ? true, + withAsan ? false, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "389-ds-base"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "389ds"; + repo = "389-ds-base"; + rev = "389-ds-base-${finalAttrs.version}"; + hash = "sha256-ouWJB5DbAtcLKyFngmxBRObXC6RFA+GXfvOEFk88Zu0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/src"; + name = "389-ds-base-${finalAttrs.version}"; + hash = "sha256-nBYuVijF50K3JlEo2py0ephDwlnAhbxeNA4vvC9rEV0="; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + python3 + cargo + rustc + ] ++ lib.optional withCockpit rsync; + + buildInputs = + [ + cracklib + lmdb + json_c + linux-pam + libevent + libxcrypt + nspr + nss + cyrus_sasl + icu + krb5 + pcre2 + openssl + zlib + ] + ++ lib.optional withSystemd systemd + ++ lib.optional withOpenldap openldap + ++ lib.optional withBdb db + ++ lib.optional withNetSnmp net-snmp; + + postPatch = '' + patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py + ''; + + preConfigure = '' + ./autogen.sh --prefix="$out" + ''; + + preBuild = '' + mkdir -p ./vendor + tar -xzf ${finalAttrs.cargoDeps} -C ./vendor --strip-components=1 + ''; + + configureFlags = + [ + "--enable-rust-offline" + "--enable-autobind" + ] + ++ lib.optionals withSystemd [ + "--with-systemd" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + ] + ++ lib.optionals withOpenldap [ + "--with-openldap" + ] + ++ lib.optionals withBdb [ + "--with-db-inc=${lib.getDev db}/include" + "--with-db-lib=${lib.getLib db}/lib" + ] + ++ lib.optionals withNetSnmp [ + "--with-netsnmp-inc=${lib.getDev net-snmp}/include" + "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" + ] + ++ lib.optionals (!withCockpit) [ + "--disable-cockpit" + ] + ++ lib.optionals withAsan [ + "--enable-asan" + "--enable-debug" + ]; + + enableParallelBuilding = true; + # Disable parallel builds as those lack some dependencies: + # ld: cannot find -lslapd: No such file or directory + # https://hydra.nixos.org/log/h38bj77gav0r6jbi4bgzy1lfjq22k2wy-389-ds-base-2.3.1.drv + enableParallelInstalling = false; + + doCheck = true; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + "localstatedir=${placeholder "TMPDIR"}" + ]; + + passthru.version = finalAttrs.version; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://www.port389.org/"; + description = "Enterprise-class Open Source LDAP server for Linux"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ners ]; + }; +}) diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/by-name/_3/_3mux/package.nix similarity index 100% rename from pkgs/tools/misc/3mux/default.nix rename to pkgs/by-name/_3/_3mux/package.nix diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/by-name/_3/_3proxy/package.nix similarity index 100% rename from pkgs/applications/networking/3proxy/default.nix rename to pkgs/by-name/_3/_3proxy/package.nix diff --git a/pkgs/servers/web-apps/5etools/default.nix b/pkgs/by-name/_5/_5etools/package.nix similarity index 100% rename from pkgs/servers/web-apps/5etools/default.nix rename to pkgs/by-name/_5/_5etools/package.nix diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 65ba3347eb48..422c6a3d57b9 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -1,46 +1,48 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, telegram-desktop -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + telegram-desktop, + withWebkit ? true, }: -telegram-desktop.overrideAttrs (old: rec { +telegram-desktop.override { pname = "64gram"; - version = "1.1.39"; + inherit withWebkit; + unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { + pname = "64gram-unwrapped"; + version = "1.1.45"; - src = fetchFromGitHub { - owner = "TDesktop-x64"; - repo = "tdesktop"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "TDesktop-x64"; + repo = "tdesktop"; + rev = "v${version}"; + hash = "sha256-bDe4tmJRWnussa5QrBh2oStvIF7R5/nbPfljb3us3nk="; + fetchSubmodules = true; + }; - fetchSubmodules = true; - hash = "sha256-+slLW177PhNvMb4ARY3X95eKVZiZTxJIPuSurTiGTls="; - }; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "https://github.com/TDesktop-x64/tdesktop/commit/c996ccc1561aed089c8b596f6ab3844335bbf1df.patch"; + revert = true; + hash = "sha256-Hz7BXl5z4owe31l9Je3QOXT8FAyKcbsXsKjGfCmXhzE="; + }) + ]; - patches = (old.patches or []) ++ [ - (fetchpatch { - url = "https://github.com/TDesktop-x64/tdesktop/commit/c996ccc1561aed089c8b596f6ab3844335bbf1df.patch"; - revert = true; - hash = "sha256-Hz7BXl5z4owe31l9Je3QOXT8FAyKcbsXsKjGfCmXhzE="; - }) - ]; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) + (lib.cmakeBool "disable_autoupdate" true) + ]; - cmakeFlags = (old.cmakeFlags or []) ++ [ - (lib.cmakeBool "disable_autoupdate" true) - ]; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "Unofficial Telegram Desktop providing Windows 64bit build and extra features"; - license = licenses.gpl3Only; - platforms = platforms.all; - homepage = "https://github.com/TDesktop-x64/tdesktop"; - changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ clot27 ]; - mainProgram = "telegram-desktop"; - broken = stdenv.hostPlatform.isDarwin; - }; -}) + meta = { + description = "Unofficial Telegram Desktop providing Windows 64bit build and extra features"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + homepage = "https://github.com/TDesktop-x64/tdesktop"; + changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ clot27 ]; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; + }; + }); +} diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/by-name/_6/_6tunnel/package.nix similarity index 100% rename from pkgs/tools/networking/6tunnel/default.nix rename to pkgs/by-name/_6/_6tunnel/package.nix diff --git a/pkgs/games/7kaa/default.nix b/pkgs/by-name/_7/_7kaa/package.nix similarity index 100% rename from pkgs/games/7kaa/default.nix rename to pkgs/by-name/_7/_7kaa/package.nix diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/by-name/_9/_915resolution/package.nix similarity index 100% rename from pkgs/os-specific/linux/915resolution/default.nix rename to pkgs/by-name/_9/_915resolution/package.nix diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/by-name/_9/_9pfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/9pfs/default.nix rename to pkgs/by-name/_9/_9pfs/package.nix diff --git a/pkgs/os-specific/linux/9ptls/default.nix b/pkgs/by-name/_9/_9ptls/package.nix similarity index 100% rename from pkgs/os-specific/linux/9ptls/default.nix rename to pkgs/by-name/_9/_9ptls/package.nix diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/by-name/a2/a2jmidid/package.nix similarity index 100% rename from pkgs/applications/audio/a2jmidid/default.nix rename to pkgs/by-name/a2/a2jmidid/package.nix diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/by-name/a2/a2ps/package.nix similarity index 100% rename from pkgs/tools/text/a2ps/default.nix rename to pkgs/by-name/a2/a2ps/package.nix diff --git a/pkgs/tools/misc/aaa/default.nix b/pkgs/by-name/aa/aaa/package.nix similarity index 100% rename from pkgs/tools/misc/aaa/default.nix rename to pkgs/by-name/aa/aaa/package.nix diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/by-name/aa/aacgain/package.nix similarity index 100% rename from pkgs/applications/audio/aacgain/default.nix rename to pkgs/by-name/aa/aacgain/package.nix diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/by-name/aa/aalib/clang.patch similarity index 100% rename from pkgs/development/libraries/aalib/clang.patch rename to pkgs/by-name/aa/aalib/clang.patch diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/by-name/aa/aalib/darwin.patch similarity index 100% rename from pkgs/development/libraries/aalib/darwin.patch rename to pkgs/by-name/aa/aalib/darwin.patch diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/by-name/aa/aalib/package.nix similarity index 100% rename from pkgs/development/libraries/aalib/default.nix rename to pkgs/by-name/aa/aalib/package.nix diff --git a/pkgs/development/tools/aapt/default.nix b/pkgs/by-name/aa/aapt/package.nix similarity index 100% rename from pkgs/development/tools/aapt/default.nix rename to pkgs/by-name/aa/aapt/package.nix diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix new file mode 100644 index 000000000000..2adbb0a73932 --- /dev/null +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nixosTests +}: + +rustPlatform.buildRustPackage rec { + pname = "aardvark-dns"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1I0YcnHGxblfSWlx5bbR4v3UXxKPnYQ90AKnUny2vDg="; + }; + + cargoHash = "sha256-vZHFZL3dwFVyLfifpUq4uaqaUac7Itimf2pJGZ4qWMM="; + + passthru.tests = { inherit (nixosTests) podman; }; + + meta = with lib; { + changelog = "https://github.com/containers/aardvark-dns/releases/tag/${src.rev}"; + description = "Authoritative dns server for A/AAAA container records"; + homepage = "https://github.com/containers/aardvark-dns"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + platforms = platforms.linux; + mainProgram = "aardvark-dns"; + }; +} diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/by-name/aa/aaxtomp3/package.nix similarity index 100% rename from pkgs/applications/audio/aaxtomp3/default.nix rename to pkgs/by-name/aa/aaxtomp3/package.nix diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 5c2a5f8f43e6..d31a67f36409 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.7.18"; + version = "0.7.19"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-n8yclhjeEkkge9xHuM4ZW+7aubIiLWwxCmmGTI1bE9I="; + hash = "sha256-5gDPbljvy5Kp3s+oo5LkI0rUR2zSVK2wDh4k2HrsLFc="; }; - cargoHash = "sha256-Rn+y1W2Cimt5JrD2dLmvLmZshxyLO7N+oIALwGjxhvM="; + cargoHash = "sha256-MIZGAlcBeQ03ScleOcM0WxgQEfjpFbRq1dK1/PjZbCQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/by-name/ab/abaddon/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/abaddon/default.nix rename to pkgs/by-name/ab/abaddon/package.nix diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/by-name/ab/abbaye-des-morts/package.nix similarity index 100% rename from pkgs/games/abbaye-des-morts/default.nix rename to pkgs/by-name/ab/abbaye-des-morts/package.nix diff --git a/pkgs/tools/text/abbreviate/default.nix b/pkgs/by-name/ab/abbreviate/package.nix similarity index 100% rename from pkgs/tools/text/abbreviate/default.nix rename to pkgs/by-name/ab/abbreviate/package.nix diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/by-name/ab/abc-verifier/package.nix similarity index 100% rename from pkgs/applications/science/logic/abc/default.nix rename to pkgs/by-name/ab/abc-verifier/package.nix diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/by-name/ab/abcm2ps/package.nix similarity index 100% rename from pkgs/tools/audio/abcm2ps/default.nix rename to pkgs/by-name/ab/abcm2ps/package.nix diff --git a/pkgs/by-name/ab/abduco/package.nix b/pkgs/by-name/ab/abduco/package.nix new file mode 100644 index 000000000000..1f454d40bc85 --- /dev/null +++ b/pkgs/by-name/ab/abduco/package.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchpatch, fetchzip, writeText, darwin, conf ? null }: + +let + rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; +in +stdenv.mkDerivation { + pname = "abduco"; + version = "unstable-2020-04-30"; + + src = fetchzip { + urls = [ + "https://github.com/martanne/abduco/archive/${rev}.tar.gz" + "https://git.sr.ht/~martanne/abduco/archive/${rev}.tar.gz" + ]; + hash = "sha256-o7SPK/G31cW/rrLwV3UJOTq6EBHl6AEE/GdeKGlHdyg="; + }; + + preBuild = lib.optionalString (conf != null) + "cp ${writeText "config.def.h" conf} config.def.h"; + + installFlags = [ "install-completion" ]; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil + ]; + + patches = [ + # https://github.com/martanne/abduco/pull/22 + (fetchpatch { + name = "use-XDG-directory-scheme-by-default"; + url = "https://github.com/martanne/abduco/commit/0e9a00312ac9777edcb169122144762e3611287b.patch"; + sha256 = "sha256-4NkIflbRkUpS5XTM/fxBaELpvlZ4S5lecRa8jk0XC9g="; + }) + + # “fix bug where attaching to dead session won't give underlying exit code” + # https://github.com/martanne/abduco/pull/45 + (fetchpatch { + name = "exit-code-when-attaching-to-dead-session"; + url = "https://github.com/martanne/abduco/commit/972ca8ab949ee342569dbd66b47cc4a17b28247b.patch"; + sha256 = "sha256-8hios0iKYDOmt6Bi5NNM9elTflGudnG2xgPF1pSkHI0="; + }) + + # “report pixel sizes to child processes that use ioctl(0, TIOCGWINSZ, ...)” + # used for kitty & other terminals that display images + # https://github.com/martanne/abduco/pull/62 + (fetchpatch { + name = "report-pixel-sizes-to-child-processes"; + url = "https://github.com/martanne/abduco/commit/a1e222308119b3251f00b42e1ddff74a385d4249.patch"; + sha256 = "sha256-eiF0A4IqJrrvXxjBYtltuVNpxQDv/iQPO+K7Y8hWBGg="; + }) + ]; + + meta = with lib; { + homepage = "http://brain-dump.org/projects/abduco"; + license = licenses.isc; + description = "Allows programs to be run independently from its controlling terminal"; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; + mainProgram = "abduco"; + }; +} diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix similarity index 100% rename from pkgs/development/tools/misc/abi-compliance-checker/default.nix rename to pkgs/by-name/ab/abi-compliance-checker/package.nix diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/by-name/ab/abi-dumper/package.nix similarity index 100% rename from pkgs/development/tools/misc/abi-dumper/default.nix rename to pkgs/by-name/ab/abi-dumper/package.nix diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/by-name/ab/abiword/package.nix similarity index 100% rename from pkgs/applications/office/abiword/default.nix rename to pkgs/by-name/ab/abiword/package.nix diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/by-name/ab/abook/package.nix similarity index 100% rename from pkgs/applications/misc/abook/default.nix rename to pkgs/by-name/ab/abook/package.nix diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/by-name/ab/abootimg/package.nix similarity index 100% rename from pkgs/development/mobile/abootimg/default.nix rename to pkgs/by-name/ab/abootimg/package.nix diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix new file mode 100644 index 000000000000..498a10e24807 --- /dev/null +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + faad2, + mpg123, + portaudio, + libusb1, + rtl-sdr, + airspy, + soapysdr-with-plugins, +}: + +stdenv.mkDerivation rec { + pname = "abracadabra"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "KejPi"; + repo = "AbracaDABra"; + rev = "v${version}"; + hash = "sha256-iHa41VmCrNGsj+6LeYIigwiBahQuTVr+bAo0kFmQ6dw="; + }; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + qt6.qttools + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtmultimedia + qt6.qtlocation + qt6.qtpositioning + faad2 + mpg123 + portaudio + libusb1 + rtl-sdr + airspy + soapysdr-with-plugins + ]; + + cmakeFlags = [ + "-DAIRSPY=ON" + "-DSOAPYSDR=ON" + ]; + + meta = with lib; { + description = "DAB/DAB+ radio application"; + homepage = "https://github.com/KejPi/AbracaDABra"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.markuskowa ]; + mainProgram = "AbracaDABra"; + }; +} diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/by-name/ab/abuild/package.nix similarity index 100% rename from pkgs/development/tools/abuild/default.nix rename to pkgs/by-name/ab/abuild/package.nix diff --git a/pkgs/games/abuse/abuse.sh b/pkgs/by-name/ab/abuse/abuse.sh similarity index 100% rename from pkgs/games/abuse/abuse.sh rename to pkgs/by-name/ab/abuse/abuse.sh diff --git a/pkgs/games/abuse/default.nix b/pkgs/by-name/ab/abuse/package.nix similarity index 100% rename from pkgs/games/abuse/default.nix rename to pkgs/by-name/ab/abuse/package.nix diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/by-name/ac/accelergy/package.nix similarity index 100% rename from pkgs/applications/science/computer-architecture/accelergy/default.nix rename to pkgs/by-name/ac/accelergy/package.nix diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix index 3d5cf0f5885b..9aa630085097 100644 --- a/pkgs/by-name/ac/accerciser/package.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -1,44 +1,44 @@ { lib , fetchurl +, desktop-file-utils +, meson +, ninja , pkg-config , gnome , gtk3 , wrapGAppsHook3 , gobject-introspection , itstool -, libxml2 , python3 , at-spi2-core -, dbus , gettext , libwnck -, adwaita-icon-theme , librsvg }: python3.pkgs.buildPythonApplication rec { pname = "accerciser"; - version = "3.42.0"; + version = "3.44.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-d2m9T09j3ImhQ+hs3ET+rr1/jJab6lwfWoaskxGQL0g="; + hash = "sha256-tJz7DTIY+/Vf+kPH96N9a4URn+2VahBjCYBO2+mDkAM="; }; nativeBuildInputs = [ + desktop-file-utils gettext gobject-introspection # For setup hook itstool - libxml2 + meson + ninja pkg-config - dbus wrapGAppsHook3 ]; buildInputs = [ - adwaita-icon-theme at-spi2-core gtk3 libwnck @@ -46,11 +46,13 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ + dbus-python ipython pyatspi pycairo pygobject3 - setuptools + pyxdg + setuptools # for pkg_resources ]; dontWrapGApps = true; diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/pkgs/by-name/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch rename to pkgs/by-name/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/pkgs/by-name/ac/accountsservice/drop-prefix-check-extensions.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch rename to pkgs/by-name/ac/accountsservice/drop-prefix-check-extensions.patch diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/fix-paths.patch rename to pkgs/by-name/ac/accountsservice/fix-paths.patch diff --git a/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch b/pkgs/by-name/ac/accountsservice/get-dm-type-from-config.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch rename to pkgs/by-name/ac/accountsservice/get-dm-type-from-config.patch diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/by-name/ac/accountsservice/no-create-dirs.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/no-create-dirs.patch rename to pkgs/by-name/ac/accountsservice/no-create-dirs.patch diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/by-name/ac/accountsservice/package.nix similarity index 100% rename from pkgs/development/libraries/accountsservice/default.nix rename to pkgs/by-name/ac/accountsservice/package.nix diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/by-name/ac/acct/package.nix similarity index 100% rename from pkgs/tools/system/acct/default.nix rename to pkgs/by-name/ac/acct/package.nix diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/by-name/ac/accuraterip-checksum/package.nix similarity index 100% rename from pkgs/tools/audio/accuraterip-checksum/default.nix rename to pkgs/by-name/ac/accuraterip-checksum/package.nix diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/by-name/ac/ace/package.nix similarity index 100% rename from pkgs/development/libraries/ace/default.nix rename to pkgs/by-name/ac/ace/package.nix diff --git a/pkgs/by-name/ac/aces-container/package.nix b/pkgs/by-name/ac/aces-container/package.nix index 0d55b2e74a30..64274f660acf 100644 --- a/pkgs/by-name/ac/aces-container/package.nix +++ b/pkgs/by-name/ac/aces-container/package.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++11-narrowing"; + meta = { description = "Reference Implementation of SMPTE ST2065-4"; homepage = "https://github.com/ampas/aces_container"; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/by-name/ac/acgtk/package.nix similarity index 100% rename from pkgs/applications/science/logic/acgtk/default.nix rename to pkgs/by-name/ac/acgtk/package.nix diff --git a/pkgs/tools/security/acltoolkit/default.nix b/pkgs/by-name/ac/acltoolkit/package.nix similarity index 100% rename from pkgs/tools/security/acltoolkit/default.nix rename to pkgs/by-name/ac/acltoolkit/package.nix diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/by-name/ac/acme-sh/package.nix similarity index 100% rename from pkgs/tools/admin/acme-sh/default.nix rename to pkgs/by-name/ac/acme-sh/package.nix diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/by-name/ac/acme/package.nix similarity index 100% rename from pkgs/development/compilers/acme/default.nix rename to pkgs/by-name/ac/acme/package.nix diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/by-name/ac/acpi/package.nix similarity index 100% rename from pkgs/os-specific/linux/acpi/default.nix rename to pkgs/by-name/ac/acpi/package.nix diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/by-name/ac/acpid/package.nix similarity index 100% rename from pkgs/os-specific/linux/acpid/default.nix rename to pkgs/by-name/ac/acpid/package.nix diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/by-name/ac/acpilight/package.nix similarity index 100% rename from pkgs/misc/acpilight/default.nix rename to pkgs/by-name/ac/acpilight/package.nix diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/by-name/ac/acpitool/package.nix similarity index 100% rename from pkgs/os-specific/linux/acpitool/default.nix rename to pkgs/by-name/ac/acpitool/package.nix diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/by-name/ac/acsccid/package.nix similarity index 100% rename from pkgs/tools/security/acsccid/default.nix rename to pkgs/by-name/ac/acsccid/package.nix diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index 4619367ddf7e..48ee5e601395 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -10,7 +10,7 @@ }: let - version = "1.7.3"; + version = "1.7.4"; in buildGoModule { pname = "actionlint"; @@ -22,10 +22,10 @@ buildGoModule { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-IwkTiuQ3eTZMn1y0NG1jo9UrX7AmEUBRSGQ/vq/0YL8="; + hash = "sha256-NPlDD74vrVXsVgdoMHD0F3SYebH1p/RH9h1qVgLQMRw="; }; - vendorHash = "sha256-SIY79SjYYXW2slUQr2Bm9dLH8K2wE3l/TL3QP0m8GLs="; + vendorHash = "sha256-pKmN5duaSp5EuQ8L2SWduh3g1gbQq2jrUaKsQuEuy98="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/by-name/ac/activate-linux/package.nix similarity index 100% rename from pkgs/applications/misc/activate-linux/default.nix rename to pkgs/by-name/ac/activate-linux/package.nix diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/by-name/ac/actkbd/package.nix similarity index 100% rename from pkgs/tools/system/actkbd/default.nix rename to pkgs/by-name/ac/actkbd/package.nix diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/by-name/ad/adafruit-ampy/package.nix similarity index 100% rename from pkgs/tools/misc/adafruit-ampy/default.nix rename to pkgs/by-name/ad/adafruit-ampy/package.nix diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/by-name/ad/adapta-backgrounds/package.nix similarity index 100% rename from pkgs/data/misc/adapta-backgrounds/default.nix rename to pkgs/by-name/ad/adapta-backgrounds/package.nix diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/by-name/ad/adapta-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/adapta/default.nix rename to pkgs/by-name/ad/adapta-gtk-theme/package.nix diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/by-name/ad/adapta-kde-theme/package.nix similarity index 100% rename from pkgs/data/themes/adapta-kde/default.nix rename to pkgs/by-name/ad/adapta-kde-theme/package.nix diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/by-name/ad/adbfs-rootless/package.nix similarity index 100% rename from pkgs/development/mobile/adbfs-rootless/default.nix rename to pkgs/by-name/ad/adbfs-rootless/package.nix diff --git a/pkgs/build-support/add-driver-runpath/default.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix similarity index 100% rename from pkgs/build-support/add-driver-runpath/default.nix rename to pkgs/by-name/ad/addDriverRunpath/package.nix diff --git a/pkgs/build-support/add-driver-runpath/setup-hook.sh b/pkgs/by-name/ad/addDriverRunpath/setup-hook.sh similarity index 100% rename from pkgs/build-support/add-driver-runpath/setup-hook.sh rename to pkgs/by-name/ad/addDriverRunpath/setup-hook.sh diff --git a/pkgs/tools/misc/addic7ed-cli/default.nix b/pkgs/by-name/ad/addic7ed-cli/package.nix similarity index 100% rename from pkgs/tools/misc/addic7ed-cli/default.nix rename to pkgs/by-name/ad/addic7ed-cli/package.nix diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/by-name/ad/addlicense/package.nix similarity index 100% rename from pkgs/tools/misc/addlicense/default.nix rename to pkgs/by-name/ad/addlicense/package.nix diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/by-name/ad/adementary-theme/package.nix similarity index 100% rename from pkgs/data/themes/adementary/default.nix rename to pkgs/by-name/ad/adementary-theme/package.nix diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/by-name/ad/adenum/package.nix similarity index 100% rename from pkgs/tools/security/adenum/default.nix rename to pkgs/by-name/ad/adenum/package.nix diff --git a/pkgs/applications/networking/adguardian/default.nix b/pkgs/by-name/ad/adguardian/package.nix similarity index 100% rename from pkgs/applications/networking/adguardian/default.nix rename to pkgs/by-name/ad/adguardian/package.nix diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix similarity index 100% rename from pkgs/data/themes/adi1090x-plymouth-themes/default.nix rename to pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/pkgs/by-name/ad/adi1090x-plymouth-themes/shas.nix similarity index 100% rename from pkgs/data/themes/adi1090x-plymouth-themes/shas.nix rename to pkgs/by-name/ad/adi1090x-plymouth-themes/shas.nix diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/pkgs/by-name/ad/adi1090x-plymouth-themes/update.sh similarity index 100% rename from pkgs/data/themes/adi1090x-plymouth-themes/update.sh rename to pkgs/by-name/ad/adi1090x-plymouth-themes/update.sh diff --git a/pkgs/applications/video/adl/default.nix b/pkgs/by-name/ad/adl/package.nix similarity index 100% rename from pkgs/applications/video/adl/default.nix rename to pkgs/by-name/ad/adl/package.nix diff --git a/pkgs/servers/adminer/default.nix b/pkgs/by-name/ad/adminer/package.nix similarity index 100% rename from pkgs/servers/adminer/default.nix rename to pkgs/by-name/ad/adminer/package.nix diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/by-name/ad/adms/package.nix similarity index 100% rename from pkgs/applications/science/electronics/adms/default.nix rename to pkgs/by-name/ad/adms/package.nix diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/by-name/ad/adns/package.nix similarity index 100% rename from pkgs/development/libraries/adns/default.nix rename to pkgs/by-name/ad/adns/package.nix diff --git a/pkgs/by-name/ad/adolc/package.nix b/pkgs/by-name/ad/adolc/package.nix new file mode 100644 index 000000000000..31955562a767 --- /dev/null +++ b/pkgs/by-name/ad/adolc/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + fetchFromGitHub, + llvmPackages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "adolc"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "ADOL-C"; + rev = "refs/tags/releases/${finalAttrs.version}"; + hash = "sha256-oU229SuOl/gHoRT8kiWfd5XFiByjeypgdVWFLMYFHfA="; + }; + + configureFlags = [ "--with-openmp-flag=-fopenmp" ]; + + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; + + meta = with lib; { + description = "Automatic Differentiation of C/C++"; + homepage = "https://github.com/coin-or/ADOL-C"; + maintainers = [ maintainers.bzizou ]; + license = licenses.gpl2Plus; + }; +}) diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/by-name/ad/adreaper/package.nix similarity index 100% rename from pkgs/tools/security/adreaper/default.nix rename to pkgs/by-name/ad/adreaper/package.nix diff --git a/pkgs/tools/misc/adrgen/default.nix b/pkgs/by-name/ad/adrgen/package.nix similarity index 100% rename from pkgs/tools/misc/adrgen/default.nix rename to pkgs/by-name/ad/adrgen/package.nix diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/by-name/ad/adriconf/package.nix similarity index 100% rename from pkgs/tools/graphics/adriconf/default.nix rename to pkgs/by-name/ad/adriconf/package.nix diff --git a/pkgs/development/libraries/adslib/default.nix b/pkgs/by-name/ad/adslib/package.nix similarity index 100% rename from pkgs/development/libraries/adslib/default.nix rename to pkgs/by-name/ad/adslib/package.nix diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/by-name/ad/advancecomp/package.nix similarity index 100% rename from pkgs/tools/compression/advancecomp/default.nix rename to pkgs/by-name/ad/advancecomp/package.nix diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix new file mode 100644 index 000000000000..339ca0dc2b07 --- /dev/null +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + lib, + fetchFromGitHub, + nix-update-script, + meson, + ninja, + sassc, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "adw-gtk3"; + version = "5.5"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = "adw-gtk3"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-WW6lJmGNn+e0jXu319SSX6e6POWfdgsIeg/U1vmwy1U="; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + ]; + + postPatch = '' + chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Theme from libadwaita ported to GTK-3"; + homepage = "https://github.com/lassekongo83/adw-gtk3"; + license = lib.licenses.lgpl21Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ciferkey ]; + }; +}) diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 14d6b869e75d..f4bf4257c4a3 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; - hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4="; + hash = "sha256-rQiKIpWMuEaeQdnxu6Dvsn5YaiECITzYnMJtsuACvf4="; }; nativeBuildInputs = [ @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + postPatch = '' + # Postpone these changes for now, please discuss in https://github.com/NixOS/nixpkgs/pull/316416 + substituteInPlace index.theme \ + --replace-fail "Hidden=true" "" \ + --replace-fail "Inherits=AdwaitaLegacy,hicolor" "Inherits=hicolor" + ''; + dontDropIconThemeCache = true; passthru = { diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/by-name/ae/aefs/package.nix similarity index 100% rename from pkgs/tools/filesystems/aefs/default.nix rename to pkgs/by-name/ae/aefs/package.nix diff --git a/pkgs/development/libraries/aemu/LFS64.patch b/pkgs/by-name/ae/aemu/LFS64.patch similarity index 100% rename from pkgs/development/libraries/aemu/LFS64.patch rename to pkgs/by-name/ae/aemu/LFS64.patch diff --git a/pkgs/development/libraries/aemu/default.nix b/pkgs/by-name/ae/aemu/package.nix similarity index 100% rename from pkgs/development/libraries/aemu/default.nix rename to pkgs/by-name/ae/aemu/package.nix diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix index 49379db4a2c6..a8643ba1b6cf 100644 --- a/pkgs/by-name/ae/aerogramme/package.nix +++ b/pkgs/by-name/ae/aerogramme/package.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ supinie ]; mainProgram = "aerogramme"; platforms = lib.platforms.linux; + broken = true; # https://github.com/rust-lang/rust/issues/129811 }; } diff --git a/pkgs/servers/aeron/default.nix b/pkgs/by-name/ae/aeron/package.nix similarity index 100% rename from pkgs/servers/aeron/default.nix rename to pkgs/by-name/ae/aeron/package.nix diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/by-name/ae/aerospike/package.nix similarity index 100% rename from pkgs/servers/nosql/aerospike/default.nix rename to pkgs/by-name/ae/aerospike/package.nix diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/by-name/ae/aescrypt/package.nix similarity index 100% rename from pkgs/tools/misc/aescrypt/default.nix rename to pkgs/by-name/ae/aescrypt/package.nix diff --git a/pkgs/tools/security/aesfix/default.nix b/pkgs/by-name/ae/aesfix/package.nix similarity index 100% rename from pkgs/tools/security/aesfix/default.nix rename to pkgs/by-name/ae/aesfix/package.nix diff --git a/pkgs/tools/security/aeskeyfind/default.nix b/pkgs/by-name/ae/aeskeyfind/package.nix similarity index 100% rename from pkgs/tools/security/aeskeyfind/default.nix rename to pkgs/by-name/ae/aeskeyfind/package.nix diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/by-name/ae/aespipe/package.nix similarity index 100% rename from pkgs/tools/security/aespipe/default.nix rename to pkgs/by-name/ae/aespipe/package.nix diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/by-name/ae/aether-lv2/package.nix similarity index 100% rename from pkgs/applications/audio/aether-lv2/default.nix rename to pkgs/by-name/ae/aether-lv2/package.nix diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/by-name/ae/aewan/package.nix similarity index 100% rename from pkgs/applications/editors/aewan/default.nix rename to pkgs/by-name/ae/aewan/package.nix diff --git a/pkgs/tools/misc/afetch/default.nix b/pkgs/by-name/af/afetch/package.nix similarity index 100% rename from pkgs/tools/misc/afetch/default.nix rename to pkgs/by-name/af/afetch/package.nix diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/by-name/af/afew/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/afew/default.nix rename to pkgs/by-name/af/afew/package.nix diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 9573e53f3e6b..0dec9b5835b2 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -1,67 +1,75 @@ -{ lib -, fetchurl -, stdenvNoCC -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, unzip -, electron -, commandLineArgs ? "" +{ + lib, + fetchurl, + stdenvNoCC, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + unzip, + electron, + commandLineArgs ? "", }: -stdenvNoCC.mkDerivation (finalAttrs: let - icon = fetchurl { - url = "https://raw.githubusercontent.com/toeverything/AFFiNE/v${finalAttrs.version}/packages/frontend/core/public/favicon-192.png"; - hash = "sha256-smZ5W7fy3TK3bvjwV4i71j2lVmKSZcyhMhcWfPxNnN4="; - }; -in { - pname = "affine"; - version = "0.17.0"; - src = fetchurl { - url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs="; - }; - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - unzip - ]; - postInstall = '' - mkdir -p $out/lib - cp -r ./resources/* -t $out/lib/ - mkdir -p $out/share/doc/affine/ - cp LICENSE* $out/share/doc/affine/ - install -Dm644 ${icon} $out/share/pixmaps/affine.png - makeWrapper "${electron}/bin/electron" $out/bin/affine \ - --inherit-argv0 \ - --add-flags $out/lib/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - ''; - desktopItems = [ - (makeDesktopItem { - name = "affine"; - desktopName = "AFFiNE"; - exec = "affine %U"; - terminal = false; - icon = "affine"; - startupWMClass = "affine"; - categories = ["Utility"]; - }) - ]; - meta = with lib; { - description = "Workspace with fully merged docs, whiteboards and databases"; - longDescription = '' - AFFiNE is an open-source, all-in-one workspace and an operating - system for all the building blocks that assemble your knowledge - base and much more -- wiki, knowledge management, presentation - and digital assets +stdenvNoCC.mkDerivation ( + finalAttrs: + let + icon = fetchurl { + url = "https://raw.githubusercontent.com/toeverything/AFFiNE/v${finalAttrs.version}/packages/frontend/core/public/favicon-192.png"; + hash = "sha256-smZ5W7fy3TK3bvjwV4i71j2lVmKSZcyhMhcWfPxNnN4="; + }; + in + { + pname = "affine"; + version = "0.17.5"; + src = fetchurl { + url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; + hash = "sha256-lK5DDI9CKRneY4AwMI4r1qlGyYtQG4Xi8Ys4I3jawTk="; + }; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + unzip + ]; + postInstall = '' + mkdir -p $out/lib + cp -r ./resources/* -t $out/lib/ + mkdir -p $out/share/doc/affine/ + cp LICENSE* $out/share/doc/affine/ + install -Dm644 ${icon} $out/share/pixmaps/affine.png + makeWrapper "${electron}/bin/electron" $out/bin/affine \ + --inherit-argv0 \ + --add-flags $out/lib/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} ''; - homepage = "https://affine.pro/"; - downloadPage = "https://affine.pro/download"; - license = licenses.mit; - maintainers = with maintainers; [richar redyf]; - mainProgram = "affine"; - platforms = ["x86_64-linux"]; - }; -}) + desktopItems = [ + (makeDesktopItem { + name = "affine"; + desktopName = "AFFiNE"; + exec = "affine %U"; + terminal = false; + icon = "affine"; + startupWMClass = "affine"; + categories = [ "Utility" ]; + }) + ]; + meta = { + description = "Workspace with fully merged docs, whiteboards and databases"; + longDescription = '' + AFFiNE is an open-source, all-in-one workspace and an operating + system for all the building blocks that assemble your knowledge + base and much more -- wiki, knowledge management, presentation + and digital assets + ''; + homepage = "https://affine.pro/"; + downloadPage = "https://affine.pro/download"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + richar + redyf + ]; + mainProgram = "affine"; + platforms = [ "x86_64-linux" ]; + }; + } +) diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/by-name/af/afflib/package.nix similarity index 100% rename from pkgs/development/libraries/afflib/default.nix rename to pkgs/by-name/af/afflib/package.nix diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/by-name/af/afio/0001-makefile-fix-installation.patch similarity index 100% rename from pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch rename to pkgs/by-name/af/afio/0001-makefile-fix-installation.patch diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/by-name/af/afio/package.nix similarity index 100% rename from pkgs/tools/archivers/afio/default.nix rename to pkgs/by-name/af/afio/package.nix diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/by-name/af/afpfs-ng/package.nix similarity index 100% rename from pkgs/tools/filesystems/afpfs-ng/default.nix rename to pkgs/by-name/af/afpfs-ng/package.nix diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/by-name/af/aften/package.nix similarity index 100% rename from pkgs/development/libraries/aften/default.nix rename to pkgs/by-name/af/aften/package.nix diff --git a/pkgs/development/libraries/aften/simd-fallback.patch b/pkgs/by-name/af/aften/simd-fallback.patch similarity index 100% rename from pkgs/development/libraries/aften/simd-fallback.patch rename to pkgs/by-name/af/aften/simd-fallback.patch diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/by-name/af/afterburn/package.nix similarity index 100% rename from pkgs/tools/admin/afterburn/default.nix rename to pkgs/by-name/af/afterburn/package.nix diff --git a/pkgs/by-name/af/afuse/001-darwin-fdatasync.patch b/pkgs/by-name/af/afuse/001-darwin-fdatasync.patch new file mode 100644 index 000000000000..6a576c3a01a3 --- /dev/null +++ b/pkgs/by-name/af/afuse/001-darwin-fdatasync.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index ef07d70..2da26aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,9 +27,9 @@ if test "$have_fuse_opt_parse" = no; then + fi + AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no) + + +-AC_CHECK_FUNCS([setxattr fdatasync getline fgetln]) ++AC_CHECK_FUNCS([setxattr getline fgetln]) + + AC_CONFIG_FILES([Makefile + src/Makefile + compat/Makefile]) diff --git a/pkgs/by-name/af/afuse/package.nix b/pkgs/by-name/af/afuse/package.nix new file mode 100644 index 000000000000..81b168a4712e --- /dev/null +++ b/pkgs/by-name/af/afuse/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + fuse, +}: + +stdenv.mkDerivation rec { + pname = "afuse"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "pcarrier"; + repo = "afuse"; + rev = "v${version}"; + sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ fuse ]; + + patches = [ ./001-darwin-fdatasync.patch ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Fix the build on macOS with macFUSE installed + substituteInPlace configure.ac --replace-fail \ + 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \ + "" + ''; + + meta = { + description = "Automounter in userspace"; + homepage = "https://github.com/pcarrier/afuse"; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 1d2763dd324a..e49028e8969d 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -4,8 +4,6 @@ nixosTests, fetchFromGitHub, rustPlatform, - libiconv, - darwin, openssl, pkg-config, nix-update-script, @@ -13,25 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.9"; + version = "3.3.10"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-u+v9RydB6OIsq2zOSmTDuejneb2uNFhRXsVNlGcPABs="; + hash = "sha256-uuMOe5yi0DSD7mTPnI0m/lpkv6Lb669vndwPE01oSUU="; }; - cargoHash = "sha256-oNI+UsxDdHSQGtl6vhxNWSiYVc8TV/vG8UoQX2w4ZoM="; + cargoHash = "sha256-6iEpOUhpWClgfAry8xIHJUPaAVKdPVaq3cTrSql9roo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/by-name/ag/agave/package.nix similarity index 100% rename from pkgs/data/fonts/agave/default.nix rename to pkgs/by-name/ag/agave/package.nix diff --git a/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/pkgs/by-name/ag/agdsn-zsh-config/package.nix similarity index 100% rename from pkgs/shells/zsh/agdsn-zsh-config/default.nix rename to pkgs/by-name/ag/agdsn-zsh-config/package.nix diff --git a/pkgs/tools/security/age-plugin-tpm/default.nix b/pkgs/by-name/ag/age-plugin-tpm/package.nix similarity index 100% rename from pkgs/tools/security/age-plugin-tpm/default.nix rename to pkgs/by-name/ag/age-plugin-tpm/package.nix diff --git a/pkgs/by-name/ag/age-plugin-yubikey/Cargo.lock b/pkgs/by-name/ag/age-plugin-yubikey/Cargo.lock new file mode 100644 index 000000000000..58c668896a7b --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-yubikey/Cargo.lock @@ -0,0 +1,3064 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "age-core" +version = "0.10.0" +source = "git+https://github.com/str4d/rage.git?rev=baf277a749c839e49f93bffb58d36734ac94be83#baf277a749c839e49f93bffb58d36734ac94be83" +dependencies = [ + "base64 0.21.7", + "chacha20poly1305", + "cookie-factory", + "hkdf", + "io_tee", + "nom", + "rand", + "secrecy", + "sha2", + "tempfile", +] + +[[package]] +name = "age-plugin" +version = "0.5.0" +source = "git+https://github.com/str4d/rage.git?rev=baf277a749c839e49f93bffb58d36734ac94be83#baf277a749c839e49f93bffb58d36734ac94be83" +dependencies = [ + "age-core", + "base64 0.21.7", + "bech32", + "chrono", +] + +[[package]] +name = "age-plugin-yubikey" +version = "0.5.0" +dependencies = [ + "age-core", + "age-plugin", + "base64 0.21.7", + "bech32", + "console", + "dialoguer", + "env_logger", + "flate2", + "gumdrop", + "hex", + "i18n-embed", + "i18n-embed-fl", + "lazy_static", + "log", + "man", + "p256", + "pcsc", + "rand", + "rust-embed", + "sha2", + "sysinfo", + "tempfile", + "test-with", + "which", + "x509", + "x509-parser", + "yubikey", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-unit" +version = "4.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +dependencies = [ + "serde", + "utf8-width", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" + +[[package]] +name = "cc" +version = "1.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "cookie-factory" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "des" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" +dependencies = [ + "cipher", +] + +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "shell-words", + "thiserror", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[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.86", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml", +] + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fluent" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" +dependencies = [ + "thiserror", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[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.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "gumdrop" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc700f989d2f6f0248546222d9b4258f5b02a171a431f8285a81c08142629e3" +dependencies = [ + "gumdrop_derive", +] + +[[package]] +name = "gumdrop_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "hermit-abi" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "i18n-config" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" +dependencies = [ + "basic-toml", + "log", + "serde", + "serde_derive", + "thiserror", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7839d8c7bb8da7bd58c1112d3a1aeb7f178ff3df4ae87783e758ca3bfb750b7" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e9571c3cba9eba538eaa5ee40031b26debe76f0c7e17bafc97ea57a76cd82e" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error2", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.86", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2cc0e0523d1fe6fc2c6f66e5038624ea8091b3e7748b5e8e0c84b1698db6c2" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[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 = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io_tee" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304" + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "libc" +version = "0.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "libm" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "man" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf5fa795187a80147b1ac10aaedcf5ffd3bbeb1838bda61801a1c9ad700a1c9" +dependencies = [ + "roff", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pcsc" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ed9d7f816b7d9ce9ddb0062dd2f393b3af31411a95a35411809b4b9116ea08" +dependencies = [ + "bitflags 1.3.2", + "pcsc-sys", +] + +[[package]] +name = "pcsc-sys" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09e9ba80f2c4d167f936d27594f7248bca3295921ffbfa44a24b339b6cb7403" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ping" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122ee1f5a6843bec84fcbd5c6ba3622115337a6b8965b93a61aad347648f4e8d" +dependencies = [ + "rand", + "socket2 0.4.10", + "thiserror", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[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-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "proc-macro2" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "roff" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33e4fb37ba46888052c763e4ec2acfedd8f00f62897b630cadb6298b833675e" + +[[package]] +name = "rsa" +version = "0.9.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7bc1d34159d63536b4d89944e9ab5bb952f45db6fa0b8b03c2f8c09fb5b7171" +dependencies = [ + "byteorder", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "subtle", + "zeroize", +] + +[[package]] +name = "rust-embed" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.86", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.4", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "serde" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test-with" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490ec7704fc7c1d1b922e0ad7843c5b9b37fc2b8c4114292f006de3735d85d45" +dependencies = [ + "byte-unit", + "num_cpus", + "ping", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "reqwest", + "syn 2.0.86", + "sysinfo", + "users", + "which", +] + +[[package]] +name = "thiserror" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2 0.5.7", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unic-langid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "users" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "getrandom", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.86", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[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 = "x509" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3cec94c3999f31341553f358ef55f65fc031291a022cd42ec0ce7219560c76" +dependencies = [ + "chrono", + "cookie-factory", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs", + "base64 0.13.1", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "yubikey" +version = "0.8.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71240be97248417e072ab49076573dbf96e886478453497e02b49968c0273790" +dependencies = [ + "base16ct", + "chrono", + "cookie-factory", + "der-parser", + "des", + "elliptic-curve", + "hmac", + "log", + "nom", + "num-bigint-dig", + "num-integer", + "num-traits", + "p256", + "p384", + "pbkdf2", + "pcsc", + "rand_core", + "rsa", + "secrecy", + "sha1", + "sha2", + "subtle", + "uuid", + "x509", + "x509-parser", + "zeroize", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix new file mode 100644 index 000000000000..c45e9b9772a6 --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, pcsclite +}: + +rustPlatform.buildRustPackage rec { + pname = "age-plugin-yubikey"; + version = "0.5.0-unstable-2024-11-02"; + + src = fetchFromGitHub { + owner = "str4d"; + repo = pname; + rev = "36290c74ebd2723832aae684d43b927c9104f744"; + hash = "sha256-vfemYGQnn3IzG7Y6iVKHZlYN+55/+A+N/GMG3TLs1h0="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "age-core-0.10.0" = "sha256-Iw1KPYhUwfAvLGpYAGuSRhynrRJhD3EqOIS4UY6qC6c="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; + + meta = with lib; { + description = "YubiKey plugin for age"; + mainProgram = "age-plugin-yubikey"; + homepage = "https://github.com/str4d/age-plugin-yubikey"; + changelog = "https://github.com/str4d/age-plugin-yubikey/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ kranzes vtuan10 adamcstephens ]; + }; +} diff --git a/pkgs/tools/security/age/default.nix b/pkgs/by-name/ag/age/package.nix similarity index 100% rename from pkgs/tools/security/age/default.nix rename to pkgs/by-name/ag/age/package.nix diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/by-name/ag/agedu/package.nix similarity index 100% rename from pkgs/tools/misc/agedu/default.nix rename to pkgs/by-name/ag/agedu/package.nix diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/by-name/ag/agenda/package.nix similarity index 100% rename from pkgs/applications/office/agenda/default.nix rename to pkgs/by-name/ag/agenda/package.nix diff --git a/pkgs/by-name/ag/aggregate6/package.nix b/pkgs/by-name/ag/aggregate6/package.nix new file mode 100644 index 000000000000..c9a5c83e78bf --- /dev/null +++ b/pkgs/by-name/ag/aggregate6/package.nix @@ -0,0 +1,4 @@ +{ python3Packages }: + +with python3Packages; +toPythonApplication aggregate6 diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/by-name/ag/agi/package.nix similarity index 100% rename from pkgs/tools/graphics/agi/default.nix rename to pkgs/by-name/ag/agi/package.nix diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix similarity index 100% rename from pkgs/shells/zsh/agkozak-zsh-prompt/default.nix rename to pkgs/by-name/ag/agkozak-zsh-prompt/package.nix diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/by-name/ag/agola/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/agola/default.nix rename to pkgs/by-name/ag/agola/package.nix diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/by-name/ag/agrep/package.nix similarity index 100% rename from pkgs/tools/text/agrep/default.nix rename to pkgs/by-name/ag/agrep/package.nix diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/by-name/ah/aha/package.nix similarity index 100% rename from pkgs/tools/text/aha/default.nix rename to pkgs/by-name/ah/aha/package.nix diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/by-name/ah/ahcpd/package.nix similarity index 100% rename from pkgs/tools/networking/ahcpd/default.nix rename to pkgs/by-name/ah/ahcpd/package.nix diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/by-name/ah/ahoviewer/package.nix similarity index 100% rename from pkgs/applications/graphics/ahoviewer/default.nix rename to pkgs/by-name/ah/ahoviewer/package.nix diff --git a/pkgs/by-name/ai/aiac/package.nix b/pkgs/by-name/ai/aiac/package.nix new file mode 100644 index 000000000000..ab03b5dac0c6 --- /dev/null +++ b/pkgs/by-name/ai/aiac/package.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aiac"; + version = "5.3.0"; + excludedPackages = [".ci"]; + + src = fetchFromGitHub { + owner = "gofireflyio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Lk3Bmzg1owkIWzz7jgq1YpdPyRzyZ7aNoWPIU5aWzu0="; + }; + + vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE="; + ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ]; + + meta = with lib; { + description = ''Artificial Intelligence Infrastructure-as-Code Generator.''; + mainProgram = "aiac"; + homepage = "https://github.com/gofireflyio/aiac/"; + license = licenses.asl20; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix new file mode 100644 index 000000000000..0520e371fcd0 --- /dev/null +++ b/pkgs/by-name/ai/aichat/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, darwin +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "aichat"; + version = "0.23.0"; + + src = fetchFromGitHub { + owner = "sigoden"; + repo = "aichat"; + rev = "v${version}"; + hash = "sha256-75KL1ODA+HyG/YRQIDs3++RgxQHyxKj6zh/2f6zQbdY="; + }; + + cargoHash = "sha256-pLQ3P+0SdM3QMqO3AdwYOJKFH3Jqz6ID/J1V5dBGG6s="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + installShellCompletion ./scripts/completions/aichat.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Use GPT-4(V), Gemini, LocalAI, Ollama and other LLMs in the terminal"; + homepage = "https://github.com/sigoden/aichat"; + license = licenses.mit; + maintainers = with maintainers; [ mwdomino ]; + mainProgram = "aichat"; + }; +} diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/by-name/ai/aide/package.nix similarity index 100% rename from pkgs/tools/security/aide/default.nix rename to pkgs/by-name/ai/aide/package.nix diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index 2b2e9cc9dbbe..ab55239d814e 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,151 +12,177 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.60.0"; -in -python3.pkgs.buildPythonApplication { - pname = "aider-chat"; - inherit version; - pyproject = true; + version = "0.62.0"; + aider-chat = python3.pkgs.buildPythonApplication { + pname = "aider-chat"; + inherit version; + pyproject = true; - src = fetchFromGitHub { - owner = "Aider-AI"; - repo = "aider"; - rev = "refs/tags/v${version}"; - hash = "sha256-0jAdUcGGJzxvTKY/56an0oLEghZHz6fdNLg8cPer1Qc="; - }; + src = fetchFromGitHub { + owner = "Aider-AI"; + repo = "aider"; + rev = "refs/tags/v${version}"; + hash = "sha256-o5vyOaJSUcdwuHBbzgpo5RDpZLnIur5dM+b7Y7PVBXA="; + }; - pythonRelaxDeps = true; + pythonRelaxDeps = true; - build-system = with python3.pkgs; [ setuptools-scm ]; + build-system = with python3.pkgs; [ setuptools-scm ]; - dependencies = with python3.pkgs; [ - aiohappyeyeballs - aiohttp - aiosignal - annotated-types - anyio - attrs - backoff - beautifulsoup4 - certifi - cffi - charset-normalizer - click - configargparse - diff-match-patch - diskcache - distro - filelock - flake8 - frozenlist - fsspec - gitdb - gitpython - grep-ast - h11 - httpcore - httpx - huggingface-hub - idna - importlib-resources - jinja2 - jiter - json5 - jsonschema - jsonschema-specifications - litellm - markdown-it-py - markupsafe - mccabe - mdurl - multidict - networkx - numpy - openai - packaging - pathspec - pexpect - pillow - prompt-toolkit - psutil - ptyprocess - pycodestyle - pycparser - pydantic - pydantic-core - pydub - pyflakes - pygments - pypandoc - pyperclip - python-dotenv - pyyaml - referencing - regex - requests - rich - rpds-py - scipy - smmap - sniffio - sounddevice - soundfile - soupsieve - tiktoken - tokenizers - tqdm - tree-sitter - tree-sitter-languages - typing-extensions - urllib3 - wcwidth - yarl - zipp - ]; + dependencies = with python3.pkgs; [ + aiohappyeyeballs + aiohttp + aiosignal + annotated-types + anyio + attrs + backoff + beautifulsoup4 + certifi + cffi + charset-normalizer + click + configargparse + diff-match-patch + diskcache + distro + filelock + flake8 + frozenlist + fsspec + gitdb + gitpython + grep-ast + h11 + httpcore + httpx + huggingface-hub + idna + importlib-resources + jinja2 + jiter + json5 + jsonschema + jsonschema-specifications + litellm + markdown-it-py + markupsafe + mccabe + mdurl + multidict + networkx + numpy + openai + packaging + pathspec + pexpect + pillow + prompt-toolkit + psutil + ptyprocess + pycodestyle + pycparser + pydantic + pydantic-core + pydub + pyflakes + pygments + pypandoc + pyperclip + python-dotenv + pyyaml + referencing + regex + requests + rich + rpds-py + scipy + smmap + sniffio + sounddevice + soundfile + soupsieve + tiktoken + tokenizers + tqdm + tree-sitter + tree-sitter-languages + typing-extensions + urllib3 + wcwidth + yarl + zipp - buildInputs = [ portaudio ]; - - nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ]; - - disabledTestPaths = [ - # Tests require network access - "tests/scrape/test_scrape.py" - # Expected 'mock' to have been called once - "tests/help/test_help.py" - ]; - - disabledTests = - [ - # Tests require network - "test_urls" - "test_get_commit_message_with_custom_prompt" - # FileNotFoundError - "test_get_commit_message" - # Expected 'launch_gui' to have been called once - "test_browser_flag_imports_streamlit" - # AttributeError - "test_simple_send_with_retries" - # Expected 'check_version' to have been called once - "test_main_exit_calls_version_check" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Tests fails on darwin - "test_dark_mode_sets_code_theme" - "test_default_env_file_sets_automatic_variable" + # Not listed in requirements + mixpanel + monotonic + posthog + propcache + python-dateutil ]; - preCheck = '' - export HOME=$(mktemp -d) - export AIDER_CHECK_UPDATE=false - ''; + buildInputs = [ portaudio ]; - meta = { - description = "AI pair programming in your terminal"; - homepage = "https://github.com/paul-gauthier/aider"; - changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ taha-yassine ]; - mainProgram = "aider"; + nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ]; + + disabledTestPaths = [ + # Tests require network access + "tests/scrape/test_scrape.py" + # Expected 'mock' to have been called once + "tests/help/test_help.py" + ]; + + disabledTests = + [ + # Tests require network + "test_urls" + "test_get_commit_message_with_custom_prompt" + # FileNotFoundError + "test_get_commit_message" + # Expected 'launch_gui' to have been called once + "test_browser_flag_imports_streamlit" + # AttributeError + "test_simple_send_with_retries" + # Expected 'check_version' to have been called once + "test_main_exit_calls_version_check" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Tests fails on darwin + "test_dark_mode_sets_code_theme" + "test_default_env_file_sets_automatic_variable" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export AIDER_CHECK_UPDATE=false + ''; + + optional-dependencies = with python3.pkgs; { + playwright = [ + greenlet + playwright + pyee + typing-extensions + ]; + }; + + passthru = { + withPlaywright = aider-chat.overridePythonAttrs ( + { dependencies, ... }: + { + dependencies = dependencies ++ aider-chat.optional-dependencies.playwright; + } + ); + }; + + meta = { + description = "AI pair programming in your terminal"; + homepage = "https://github.com/paul-gauthier/aider"; + changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ taha-yassine ]; + mainProgram = "aider"; + }; }; -} +in +aider-chat diff --git a/pkgs/applications/science/logic/aiger/fix-missing-header.patch b/pkgs/by-name/ai/aiger/fix-missing-header.patch similarity index 100% rename from pkgs/applications/science/logic/aiger/fix-missing-header.patch rename to pkgs/by-name/ai/aiger/fix-missing-header.patch diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/by-name/ai/aiger/package.nix similarity index 100% rename from pkgs/applications/science/logic/aiger/default.nix rename to pkgs/by-name/ai/aiger/package.nix diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 272adcfb401e..34ffc4a35ada 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-PTC7qn8Z1PGcBTNK5MtMvThIEhmAqTj23B/cHHhiDFE="; + hash = "sha256-cspIIuH+0LJItTz9wk6mChwEMFP3GDpI+KKg0FWM9bQ="; }; - cargoHash = "sha256-p//1TZJ6sJUUDPPpxRBKL7w7MBTUQppbQedj2x4T17w="; + cargoHash = "sha256-aylmZFb+UaK3OEpJLOf4NuT4uMLRhdUg+cSjzxRo7t8="; buildInputs = [ openssl ] diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/by-name/ai/aileron/package.nix similarity index 100% rename from pkgs/data/fonts/aileron/default.nix rename to pkgs/by-name/ai/aileron/package.nix diff --git a/pkgs/tools/networking/ain/default.nix b/pkgs/by-name/ai/ain/package.nix similarity index 100% rename from pkgs/tools/networking/ain/default.nix rename to pkgs/by-name/ai/ain/package.nix diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix similarity index 100% rename from pkgs/tools/security/aiodnsbrute/default.nix rename to pkgs/by-name/ai/aiodnsbrute/package.nix diff --git a/pkgs/development/tools/air/default.nix b/pkgs/by-name/ai/air/package.nix similarity index 100% rename from pkgs/development/tools/air/default.nix rename to pkgs/by-name/ai/air/package.nix diff --git a/pkgs/os-specific/darwin/airbuddy/default.nix b/pkgs/by-name/ai/airbuddy/package.nix similarity index 100% rename from pkgs/os-specific/darwin/airbuddy/default.nix rename to pkgs/by-name/ai/airbuddy/package.nix diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/by-name/ai/aircrack-ng/package.nix similarity index 100% rename from pkgs/tools/networking/aircrack-ng/default.nix rename to pkgs/by-name/ai/aircrack-ng/package.nix diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/by-name/ai/airgeddon/package.nix similarity index 100% rename from pkgs/tools/networking/airgeddon/default.nix rename to pkgs/by-name/ai/airgeddon/package.nix diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix new file mode 100644 index 000000000000..bf66cbbfa81b --- /dev/null +++ b/pkgs/by-name/ai/airshipper/package.nix @@ -0,0 +1,124 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, openssl +, libGL +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libX11 +, libXrandr +, libXi +, libXcursor +, udev +, alsa-lib +, stdenv +, libxcb +, bzip2 +, cmake +, fontconfig +, freetype +, pkg-config +, makeWrapper +, writeShellScript +, patchelf +}: +let + version = "0.14.0"; + # Patch for airshipper to install veloren + patch = let + runtimeLibs = [ + udev + alsa-lib + (lib.getLib stdenv.cc.cc) + libxkbcommon + libxcb + libX11 + libXcursor + libXrandr + libXi + vulkan-loader + libGL + ]; + in + writeShellScript "patch" '' + echo "making binaries executable" + chmod +x {veloren-voxygen,veloren-server-cli} + echo "patching dynamic linkers" + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + veloren-server-cli + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + --set-rpath "${lib.makeLibraryPath runtimeLibs}" \ + veloren-voxygen + ''; +in +rustPlatform.buildRustPackage { + pname = "airshipper"; + inherit version; + + src = fetchFromGitLab { + owner = "Veloren"; + repo = "airshipper"; + rev = "v${version}"; + hash = "sha256-+ZU3WAjmPDAFAevebePcIlYcgSYSJJ3LyvwbTBKGUH4="; + }; + + cargoHash = "sha256-mwfYCVcOH2zFr76W9ZC4t/LmEwO5P2eGYXRVkwn6Fm4="; + + buildInputs = [ + fontconfig + openssl + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + + RUSTC_BOOTSTRAP = 1; # We need rust unstable features + + postInstall = '' + install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" + install -Dm444 "client/assets/net.veloren.airshipper.png" "$out/share/icons/net.veloren.airshipper.png" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + libGL + vulkan-loader + wayland + wayland-protocols + bzip2 + fontconfig + freetype + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + in + '' + patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + wrapProgram "$out/bin/airshipper" --set VELOREN_PATCHER "${patch}" + ''; + + doCheck = false; + cargoBuildFlags = [ "--package" "airshipper" ]; + cargoTestFlags = [ "--package" "airshipper" ]; + + meta = with lib; { + description = "Provides automatic updates for the voxel RPG Veloren"; + mainProgram = "airshipper"; + homepage = "https://www.veloren.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ yusdacra ]; + }; +} diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/by-name/ai/airsonic/package.nix similarity index 100% rename from pkgs/servers/misc/airsonic/default.nix rename to pkgs/by-name/ai/airsonic/package.nix diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/by-name/ai/airspy/package.nix similarity index 100% rename from pkgs/applications/radio/airspy/default.nix rename to pkgs/by-name/ai/airspy/package.nix diff --git a/pkgs/applications/radio/airspyhf/default.nix b/pkgs/by-name/ai/airspyhf/package.nix similarity index 100% rename from pkgs/applications/radio/airspyhf/default.nix rename to pkgs/by-name/ai/airspyhf/package.nix diff --git a/pkgs/games/airstrike/default.nix b/pkgs/by-name/ai/airstrike/package.nix similarity index 100% rename from pkgs/games/airstrike/default.nix rename to pkgs/by-name/ai/airstrike/package.nix diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/by-name/ai/airwindows-lv2/package.nix similarity index 100% rename from pkgs/applications/audio/airwindows-lv2/default.nix rename to pkgs/by-name/ai/airwindows-lv2/package.nix diff --git a/pkgs/development/libraries/aixlog/default.nix b/pkgs/by-name/ai/aixlog/package.nix similarity index 100% rename from pkgs/development/libraries/aixlog/default.nix rename to pkgs/by-name/ai/aixlog/package.nix diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/by-name/aj/aj-snapshot/package.nix similarity index 100% rename from pkgs/applications/audio/aj-snapshot/default.nix rename to pkgs/by-name/aj/aj-snapshot/package.nix diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/by-name/ak/akira-unstable/package.nix similarity index 100% rename from pkgs/applications/graphics/akira/default.nix rename to pkgs/by-name/ak/akira-unstable/package.nix diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/by-name/al/alacritty-theme/package.nix similarity index 100% rename from pkgs/data/themes/alacritty-theme/default.nix rename to pkgs/by-name/al/alacritty-theme/package.nix diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix new file mode 100644 index 000000000000..c511619c276c --- /dev/null +++ b/pkgs/by-name/al/alacritty/package.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, nixosTests + +, cmake +, installShellFiles +, makeWrapper +, ncurses +, pkg-config +, python3 +, scdoc + +, expat +, fontconfig +, freetype +, libGL +, xorg +, libxkbcommon +, wayland +, xdg-utils + +, apple-sdk_11 +}: +let + rpathLibs = [ + expat + fontconfig + freetype + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libGL + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libXxf86vm + xorg.libxcb + libxkbcommon + wayland + ]; +in +rustPlatform.buildRustPackage rec { + pname = "alacritty"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "alacritty"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; + }; + + cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck="; + + nativeBuildInputs = [ + cmake + installShellFiles + makeWrapper + ncurses + pkg-config + python3 + scdoc + ]; + + buildInputs = rpathLibs + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + ]; + + outputs = [ "out" "terminfo" ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace alacritty/src/config/ui_config.rs \ + --replace xdg-open ${xdg-utils}/bin/xdg-open + ''; + + checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64 + + postInstall = ( + if stdenv.hostPlatform.isDarwin then '' + mkdir $out/Applications + cp -r extra/osx/Alacritty.app $out/Applications + ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS + '' else '' + install -D extra/linux/Alacritty.desktop -t $out/share/applications/ + install -D extra/linux/org.alacritty.Alacritty.appdata.xml -t $out/share/appdata/ + install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg + + # patchelf generates an ELF that binutils' "strip" doesn't like: + # strip: not enough room for program headers, try linking with -N + # As a workaround, strip manually before running patchelf. + $STRIP -S $out/bin/alacritty + + patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + '' + ) + '' + installShellCompletion --zsh extra/completions/_alacritty + installShellCompletion --bash extra/completions/alacritty.bash + installShellCompletion --fish extra/completions/alacritty.fish + + install -dm 755 "$out/share/man/man1" + install -dm 755 "$out/share/man/man5" + + scdoc < extra/man/alacritty.1.scd | gzip -c > $out/share/man/man1/alacritty.1.gz + scdoc < extra/man/alacritty-msg.1.scd | gzip -c > $out/share/man/man1/alacritty-msg.1.gz + scdoc < extra/man/alacritty.5.scd | gzip -c > $out/share/man/man5/alacritty.5.gz + scdoc < extra/man/alacritty-bindings.5.scd | gzip -c > $out/share/man/man5/alacritty-bindings.5.gz + + install -dm 755 "$terminfo/share/terminfo/a/" + tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + + dontPatchELF = true; + + passthru.tests.test = nixosTests.terminal-emulators.alacritty; + + meta = with lib; { + description = "Cross-platform, GPU-accelerated terminal emulator"; + homepage = "https://github.com/alacritty/alacritty"; + license = licenses.asl20; + mainProgram = "alacritty"; + maintainers = with maintainers; [ Br1ght0ne mic92 ]; + platforms = platforms.unix; + changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; + }; +} diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/by-name/al/alarm-clock-applet/package.nix similarity index 100% rename from pkgs/tools/misc/alarm-clock-applet/default.nix rename to pkgs/by-name/al/alarm-clock-applet/package.nix diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/by-name/al/alass/package.nix similarity index 100% rename from pkgs/applications/video/alass/default.nix rename to pkgs/by-name/al/alass/package.nix diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/by-name/al/albatross/package.nix similarity index 100% rename from pkgs/data/themes/albatross/default.nix rename to pkgs/by-name/al/albatross/package.nix diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/by-name/al/alchemy/package.nix similarity index 100% rename from pkgs/applications/graphics/alchemy/default.nix rename to pkgs/by-name/al/alchemy/package.nix diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/by-name/al/alda/package.nix similarity index 100% rename from pkgs/development/interpreters/alda/default.nix rename to pkgs/by-name/al/alda/package.nix diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 6d1806f65d20..56196cfbff95 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.28.5"; + version = "1.28.6"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-N+0bNgD80LLzwRAvYwxcLC0WnMgpvS4DnX/dZx0nIvE="; + hash = "sha256-g52XHx1jK0VEgLQJL+vX16bFd8eMu0dw8Fqp4hOtVtE="; }; dontBuild = true; diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/by-name/al/aldo/package.nix similarity index 100% rename from pkgs/applications/radio/aldo/default.nix rename to pkgs/by-name/al/aldo/package.nix diff --git a/pkgs/data/fonts/alegreya-sans/default.nix b/pkgs/by-name/al/alegreya-sans/package.nix similarity index 100% rename from pkgs/data/fonts/alegreya-sans/default.nix rename to pkgs/by-name/al/alegreya-sans/package.nix diff --git a/pkgs/data/fonts/alegreya/default.nix b/pkgs/by-name/al/alegreya/package.nix similarity index 100% rename from pkgs/data/fonts/alegreya/default.nix rename to pkgs/by-name/al/alegreya/package.nix diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/by-name/al/alejandra/package.nix similarity index 100% rename from pkgs/tools/nix/alejandra/default.nix rename to pkgs/by-name/al/alejandra/package.nix diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/by-name/al/alertmanager-irc-relay/package.nix similarity index 100% rename from pkgs/servers/monitoring/alertmanager-irc-relay/default.nix rename to pkgs/by-name/al/alertmanager-irc-relay/package.nix diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix new file mode 100644 index 000000000000..14fa1a9a2a06 --- /dev/null +++ b/pkgs/by-name/al/alfaview/package.nix @@ -0,0 +1,82 @@ +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook3 +, alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL +, libinput, libpulseaudio, libsecret, libtiff, libxkbcommon +, mesa, openssl, systemd, xorg }: + +stdenv.mkDerivation rec { + pname = "alfaview"; + version = "9.17.0"; + + src = fetchurl { + url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; + hash = "sha256-Rq/5QByaqGd5Cfr4r+Ojv8OC8PvFQ4a+TT8CgeevF28="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + wrapGAppsHook3 + ]; + + buildInputs = [ + alsa-lib + dbus + fontconfig + freetype + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base + libGL + libinput + libpulseaudio + libsecret + libtiff + libxkbcommon + mesa + openssl + stdenv.cc.cc + systemd + xorg.libX11 + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + substituteInPlace $out/share/applications/alfaview.desktop \ + --replace "/opt/alfaview" "$out/bin" \ + --replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production + + makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \ + --prefix LD_LIBRARY_PATH : ${libPath} + + runHook postInstall + ''; + + meta = with lib; { + description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; + homepage = "https://alfaview.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = [ ]; + mainProgram = "alfaview"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/by-name/al/alglib/package.nix similarity index 100% rename from pkgs/development/libraries/alglib/default.nix rename to pkgs/by-name/al/alglib/package.nix diff --git a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/pkgs/by-name/al/alglib/patch-alglib-CMakeLists.patch similarity index 100% rename from pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch rename to pkgs/by-name/al/alglib/patch-alglib-CMakeLists.patch diff --git a/pkgs/by-name/al/ali/package.nix b/pkgs/by-name/al/ali/package.nix new file mode 100644 index 000000000000..44d80f1b7e19 --- /dev/null +++ b/pkgs/by-name/al/ali/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGo122Module +, fetchFromGitHub +}: + +buildGo122Module rec { + pname = "ali"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "nakabonne"; + repo = "ali"; + rev = "refs/tags/v${version}"; + hash = "sha256-/pdHlI20IzSTX2pnsbxPiJiWmOCbp13eJWLi0Tcsueg="; + }; + + vendorHash = "sha256-YWx9K04kTMaI0FXebwRQVCt0nxIwZ6xlbtI2lk3qp0M="; + + meta = with lib; { + description = "Generate HTTP load and plot the results in real-time"; + homepage = "https://github.com/nakabonne/ali"; + changelog = "https://github.com/nakabonne/ali/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ farcaller ]; + mainProgram = "ali"; + }; +} diff --git a/pkgs/by-name/al/alice-lg/package.nix b/pkgs/by-name/al/alice-lg/package.nix new file mode 100644 index 000000000000..500f41f39082 --- /dev/null +++ b/pkgs/by-name/al/alice-lg/package.nix @@ -0,0 +1,97 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + fetchYarnDeps, + stdenv, + gitUpdater, + yarn, + nodejs, + nixosTests, + fixup-yarn-lock, +}: + +buildGoModule rec { + pname = "alice-lg"; + version = "6.1.0"; + + src = fetchFromGitHub { + owner = "alice-lg"; + repo = "alice-lg"; + rev = version; + hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU="; + }; + + vendorHash = "sha256-8N5E1CW5Z7HujwXRsZLv7y4uNOJkjj155kmX9PCjajQ="; + + passthru.ui = stdenv.mkDerivation { + pname = "alice-lg-ui"; + src = "${src}/ui"; + inherit version; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/ui/yarn.lock"; + hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY="; + }; + + nativeBuildInputs = [ + nodejs + yarn + fixup-yarn-lock + ]; + + configurePhase = '' + runHook preConfigure + + # Yarn and bundler wants a real home directory to write cache, config, etc to + export HOME=$NIX_BUILD_TOP/fake_home + + # Make yarn install packages from our offline cache, not the registry + yarn config --offline set yarn-offline-mirror $yarnOfflineCache + + # Fixup "resolved"-entries in yarn.lock to match our offline cache + fixup-yarn-lock yarn.lock + + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + ./node_modules/.bin/react-scripts build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mv build $out + + runHook postInstall + ''; + }; + + preBuild = '' + cp -R ${passthru.ui}/ ui/build/ + ''; + + subPackages = [ "cmd/alice-lg" ]; + doCheck = false; + + passthru = { + tests = nixosTests.alice-lg; + updateScript = gitUpdater { }; + }; + + meta = { + homepage = "https://github.com/alice-lg/alice-lg"; + description = "Looking-glass for BGP sessions"; + changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ stv0g ]; + mainProgram = "alice-lg"; + }; +} diff --git a/pkgs/data/fonts/alice/default.nix b/pkgs/by-name/al/alice/package.nix similarity index 100% rename from pkgs/data/fonts/alice/default.nix rename to pkgs/by-name/al/alice/package.nix diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix new file mode 100644 index 000000000000..1788d68221a5 --- /dev/null +++ b/pkgs/by-name/al/alienarena/package.nix @@ -0,0 +1,66 @@ +{ curl +, fetchFromGitHub +, freetype +, lib +, libGL +, libjpeg +, libogg +, libvorbis +, libX11 +, libXxf86vm +, openal +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "alienarena"; + version = "7.71.7"; + + src = fetchFromGitHub { + owner = "alienarena"; + repo = "alienarena"; + rev = version; + hash = "sha256-ri0p/0onI5DU7kDxwdFxRyT1LQLVe89VNEYPXPgilOs="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + curl + freetype + libGL + libjpeg + libogg + libvorbis + libX11 + libXxf86vm + openal + ]; + + patchPhase = '' + substituteInPlace ./configure \ + --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 \ + --replace libGL.so.1 ${libGL}/lib/libGL.so.1 + ''; + + meta = with lib; { + changelog = "https://github.com/alienarena/alienarena/releases/tag/${version}"; + description = "Free, stand-alone first-person shooter computer game"; + longDescription = '' + Do you like old school deathmatch with modern features? How + about rich, colorful, arcade-like atmospheres? How about retro + Sci-Fi? Then you're going to love what Alien Arena has in store + for you! This game combines some of the very best aspects of + such games as Quake III and Unreal Tournament and wraps them up + with a retro alien theme, while adding tons of original ideas to + make the game quite unique. + ''; + homepage = "https://alienarena.org"; + # Engine is under GPLv2, everything else is under + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux; + hydraPlatforms = []; + }; +} diff --git a/pkgs/tools/text/align/default.nix b/pkgs/by-name/al/align/package.nix similarity index 100% rename from pkgs/tools/text/align/default.nix rename to pkgs/by-name/al/align/package.nix diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index 02bb4f39924a..30fd5d09df9d 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -6,19 +6,19 @@ rustPlatform.buildRustPackage rec { pname = "alioth"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "alioth"; rev = "refs/tags/v${version}"; - hash = "sha256-K0Hx6EJYyPJZA+FLIj44BtUuZZOqWW2DUJt1QbeZyu0="; + hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU="; }; # Checks use `debug_assert_eq!` checkType = "debug"; - cargoHash = "sha256-J+1SXHQJJxT0qN/ELAvwQFnKCo13ZrQClpbfleM4PkA="; + cargoHash = "sha256-xxe+WZIXkEG7B+CX3WNGhPw4AmUQOY9w3DS+QP9hMX0="; separateDebugInfo = true; diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/by-name/al/alire/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/alire/default.nix rename to pkgs/by-name/al/alire/package.nix diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/by-name/al/aliyun-cli/package.nix similarity index 100% rename from pkgs/tools/admin/aliyun-cli/default.nix rename to pkgs/by-name/al/aliyun-cli/package.nix diff --git a/pkgs/data/fonts/alkalami/default.nix b/pkgs/by-name/al/alkalami/package.nix similarity index 100% rename from pkgs/data/fonts/alkalami/default.nix rename to pkgs/by-name/al/alkalami/package.nix diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/by-name/al/alliance/package.nix similarity index 100% rename from pkgs/applications/science/electronics/alliance/default.nix rename to pkgs/by-name/al/alliance/package.nix diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/by-name/al/allure/package.nix similarity index 100% rename from pkgs/development/tools/allure/default.nix rename to pkgs/by-name/al/allure/package.nix diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/by-name/al/almanah/package.nix similarity index 100% rename from pkgs/applications/misc/almanah/default.nix rename to pkgs/by-name/al/almanah/package.nix diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/by-name/al/almonds/package.nix similarity index 100% rename from pkgs/applications/science/math/almonds/default.nix rename to pkgs/by-name/al/almonds/package.nix diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/by-name/al/alock/package.nix similarity index 100% rename from pkgs/misc/screensavers/alock/default.nix rename to pkgs/by-name/al/alock/package.nix diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/by-name/al/alot/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/alot/default.nix rename to pkgs/by-name/al/alot/package.nix diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index eb025a0a969d..09974003d4cc 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.6.5"; + version = "2.7.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = "refs/tags/${version}"; - hash = "sha256-tXUM2XxYXUTXsycfq0hmkzc4quHKh7+0qit1YuKdCeQ="; + hash = "sha256-gEQUVSNf8u92qIg0+5fsLIOPgIASdYdlTRDpzl61P+Q="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ python3Packages.buildPythonApplication rec { pypdf pytube html2text + youtube-transcript-api ]; dontWrapGApps = true; diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/by-name/al/alpine-make-vm-image/package.nix similarity index 100% rename from pkgs/tools/virtualization/alpine-make-vm-image/default.nix rename to pkgs/by-name/al/alpine-make-vm-image/package.nix diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/by-name/al/alpine/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/alpine/default.nix rename to pkgs/by-name/al/alpine/package.nix diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/by-name/al/alpnpass/package.nix similarity index 100% rename from pkgs/applications/networking/alpnpass/default.nix rename to pkgs/by-name/al/alpnpass/package.nix diff --git a/pkgs/servers/alps/default.nix b/pkgs/by-name/al/alps/package.nix similarity index 100% rename from pkgs/servers/alps/default.nix rename to pkgs/by-name/al/alps/package.nix diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix index 2d123e460a06..faf21f02f1e7 100644 --- a/pkgs/by-name/al/alsa-plugins/package.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchurl, lib, pkg-config, alsa-lib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ + stdenv, + fetchurl, + lib, + pkg-config, + alsa-lib, + ffmpeg, + libjack2, + libogg, + libpulseaudio, + speexdsp, +}: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -11,11 +22,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - # ToDo: a52, etc.? - buildInputs = - [ alsa-lib libogg ] - ++ lib.optional (libpulseaudio != null) libpulseaudio - ++ lib.optional (libjack2 != null) libjack2; + buildInputs = [ + alsa-lib + ffmpeg + libjack2 + libogg + libpulseaudio + speexdsp + ]; meta = with lib; { description = "Various plugins for ALSA"; diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix similarity index 100% rename from pkgs/applications/audio/alsa-scarlett-gui/default.nix rename to pkgs/by-name/al/alsa-scarlett-gui/package.nix diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 6224bafc6c54..462f9d3eea16 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -1,29 +1,19 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ + directoryListingUpdater, + fetchurl, + lib, + stdenv, +}: stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2"; - hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE="; + hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU="; }; - patches = [ - (fetchpatch { - # TODO: Remove this patch in the next package upgrade - name = "rt1318-fix-one.patch"; - url = "https://github.com/alsa-project/alsa-ucm-conf/commit/7e22b7c214d346bd156131f3e6c6a5900bbf116d.patch"; - hash = "sha256-5X0ANXTSRnC9jkvMLl7lA5TBV3d1nwWE57DP6TwliII="; - }) - (fetchpatch { - # TODO: Remove this patch in the next package upgrade - name = "rt1318-fix-two.patch"; - url = "https://github.com/alsa-project/alsa-ucm-conf/commit/4e0fcc79b7d517a957e12f02ecae5f3c69fa94dc.patch"; - hash = "sha256-cuZPEEqb8+d1Ak2tA+LVEh6gtGt1X+LiAnfFYMIDCXY="; - }) - ]; - dontBuild = true; installPhase = '' @@ -35,6 +25,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = directoryListingUpdater { + url = "https://www.alsa-project.org/files/pub/lib/"; + }; + meta = with lib; { homepage = "https://www.alsa-project.org/"; description = "ALSA Use Case Manager configuration"; diff --git a/pkgs/by-name/al/alsaequal/makefile.patch b/pkgs/by-name/al/alsaequal/makefile.patch new file mode 100644 index 000000000000..2dc46a4c8d2b --- /dev/null +++ b/pkgs/by-name/al/alsaequal/makefile.patch @@ -0,0 +1,15 @@ +--- ./Makefile ++++ ./Makefile +@@ -45,8 +45,8 @@ + + install: all + @echo Installing... +- $(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/ +- $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/ +- $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/ ++ $(Q)mkdir -p ${DESTDIR}/$(LIBDIR)/alsa-lib/ ++ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/ ++ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/ + + uninstall: + @echo Un-installing... diff --git a/pkgs/by-name/al/alsaequal/package.nix b/pkgs/by-name/al/alsaequal/package.nix new file mode 100644 index 000000000000..d35facd6c3d9 --- /dev/null +++ b/pkgs/by-name/al/alsaequal/package.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub +, alsa-lib, caps, + ladspaH +}: + +stdenv.mkDerivation rec { + pname = "alsaequal"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "bassdr"; + repo = "alsaequal"; + rev = "refs/tags/v${version}"; + hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g="; + }; + + buildInputs = [ + alsa-lib + ladspaH + ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + # Borrowed from Arch Linux's AUR + patches = [ + # Adds executable permissions to resulting libraries + # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy. + ./makefile.patch + ]; + + postPatch = '' + sed -i 's#/usr/lib/ladspa/caps\.so#${caps}/lib/ladspa/caps\.so#g' ctl_equal.c pcm_equal.c + ''; + + preInstall = '' + mkdir -p "$out/lib/alsa-lib" + ''; + + meta = with lib; { + description = "Real-time adjustable equalizer plugin for ALSA"; + homepage = "https://github.com/bassdr/alsaequal"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ymeister ]; + }; +} diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/by-name/al/alt-ergo/package.nix similarity index 100% rename from pkgs/applications/science/logic/alt-ergo/default.nix rename to pkgs/by-name/al/alt-ergo/package.nix diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 72dbd13b7dd1..a226fd9c5004 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "6.73.0"; + version = "7.2.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-l/Nuyr5jYBR6LtScgM2LP0mq1NEMkRNVGWZDhiZkAa8="; + hash = "sha256-70ODYDPcE5UT6bVY3H2J7RvqB3sDpPoeOpkqhwVkxJ0="; }; sourceRoot = "."; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/by-name/al/altair/package.nix similarity index 100% rename from pkgs/development/tools/altair-graphql-client/default.nix rename to pkgs/by-name/al/altair/package.nix diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/by-name/al/altermime/package.nix similarity index 100% rename from pkgs/tools/networking/altermime/default.nix rename to pkgs/by-name/al/altermime/package.nix diff --git a/pkgs/tools/security/alterx/default.nix b/pkgs/by-name/al/alterx/package.nix similarity index 100% rename from pkgs/tools/security/alterx/default.nix rename to pkgs/by-name/al/alterx/package.nix diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/by-name/al/althttpd/package.nix similarity index 100% rename from pkgs/servers/althttpd/default.nix rename to pkgs/by-name/al/althttpd/package.nix diff --git a/pkgs/tools/misc/altserver-linux/default.nix b/pkgs/by-name/al/altserver-linux/package.nix similarity index 100% rename from pkgs/tools/misc/altserver-linux/default.nix rename to pkgs/by-name/al/altserver-linux/package.nix diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/by-name/al/alttab/package.nix similarity index 100% rename from pkgs/tools/X11/alttab/default.nix rename to pkgs/by-name/al/alttab/package.nix diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/by-name/al/alttpr-opentracker/deps.nix similarity index 100% rename from pkgs/tools/games/opentracker/deps.nix rename to pkgs/by-name/al/alttpr-opentracker/deps.nix diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix new file mode 100644 index 000000000000..2946ff08b2f0 --- /dev/null +++ b/pkgs/by-name/al/alttpr-opentracker/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + autoPatchelfHook, + wrapGAppsHook3, + dotnetCorePackages, + fontconfig, + gtk3, + icu, + libkrb5, + libunwind, + openssl, + xinput, + xorg, +}: +buildDotnetModule rec { + pname = "opentracker"; + version = "1.8.5"; + + src = fetchFromGitHub { + owner = "trippsc2"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg=="; + }; + + patches = [./remove-project.patch]; + + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + nugetDeps = ./deps.nix; + + projectFile = "OpenTracker.sln"; + executables = ["OpenTracker"]; + + doCheck = true; + disabledTests = [ + "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue" + "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected" + ]; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + ]; + + buildInputs = [ + (lib.getLib stdenv.cc.cc) + fontconfig + gtk3 + icu + libkrb5 + libunwind + openssl + ]; + + runtimeDeps = + [ + gtk3 + openssl + xinput + ] + ++ (with xorg; [ + libICE + libSM + libX11 + libXi + ]); + + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + "libintl.so.8" + ]; + + meta = with lib; { + description = "Tracking application for A Link to the Past Randomizer"; + homepage = "https://github.com/trippsc2/OpenTracker"; + sourceProvenance = with sourceTypes; [ + fromSource + # deps + binaryBytecode + binaryNativeCode + ]; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "OpenTracker"; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/tools/games/opentracker/remove-project.patch b/pkgs/by-name/al/alttpr-opentracker/remove-project.patch similarity index 100% rename from pkgs/tools/games/opentracker/remove-project.patch rename to pkgs/by-name/al/alttpr-opentracker/remove-project.patch diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/by-name/al/alure/package.nix similarity index 100% rename from pkgs/development/libraries/alure/default.nix rename to pkgs/by-name/al/alure/package.nix diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/by-name/al/alure2/package.nix similarity index 100% rename from pkgs/development/libraries/alure2/default.nix rename to pkgs/by-name/al/alure2/package.nix diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/by-name/am/AMB-plugins/package.nix similarity index 100% rename from pkgs/applications/audio/AMB-plugins/default.nix rename to pkgs/by-name/am/AMB-plugins/package.nix diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index cf2f5ebc7167..02a97b5ad008 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -26,7 +26,7 @@ let multiArch = true; multiPkgs = pkgs: with pkgs; [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libXext xorg.libXrandr diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/by-name/am/amass/package.nix similarity index 100% rename from pkgs/tools/networking/amass/default.nix rename to pkgs/by-name/am/amass/package.nix diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix similarity index 100% rename from pkgs/tools/admin/amazon-ecr-credential-helper/default.nix rename to pkgs/by-name/am/amazon-ecr-credential-helper/package.nix diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/by-name/am/amazon-ecs-cli/package.nix similarity index 100% rename from pkgs/tools/virtualization/amazon-ecs-cli/default.nix rename to pkgs/by-name/am/amazon-ecs-cli/package.nix diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 19fc0673355b..6d12e6e55701 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -41,13 +41,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.3.859.0"; + version = "3.3.987.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-Qxzq91GXOrssBO9VaQTkLZjVqdpUYoYq3N/rakwewJs="; + hash = "sha256-uwAMDFSIeM3tE+F/QLUxXVItnfsqyGhAPybaG5JxhZM="; }; vendorHash = null; diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/by-name/am/amber-theme/package.nix similarity index 100% rename from pkgs/data/themes/amber/default.nix rename to pkgs/by-name/am/amber-theme/package.nix diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/by-name/am/amd-blis/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/amd-blis/default.nix rename to pkgs/by-name/am/amd-blis/package.nix diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/by-name/am/amd-libflame/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/amd-libflame/default.nix rename to pkgs/by-name/am/amd-libflame/package.nix diff --git a/pkgs/os-specific/linux/amdctl/default.nix b/pkgs/by-name/am/amdctl/package.nix similarity index 100% rename from pkgs/os-specific/linux/amdctl/default.nix rename to pkgs/by-name/am/amdctl/package.nix diff --git a/pkgs/by-name/am/amdenc/package.nix b/pkgs/by-name/am/amdenc/package.nix index 4887dc53000d..3953ac7beb69 100644 --- a/pkgs/by-name/am/amdenc/package.nix +++ b/pkgs/by-name/am/amdenc/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/am/amdgpu_top/Cargo.lock b/pkgs/by-name/am/amdgpu_top/Cargo.lock new file mode 100644 index 000000000000..7361220b89a2 --- /dev/null +++ b/pkgs/by-name/am/amdgpu_top/Cargo.lock @@ -0,0 +1,4163 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" +dependencies = [ + "enumn", + "serde", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "amdgpu_top" +version = "0.9.2" +dependencies = [ + "amdgpu_top_gui", + "amdgpu_top_json", + "amdgpu_top_tui", + "gix", + "libamdgpu_top", + "libc", +] + +[[package]] +name = "amdgpu_top_gui" +version = "0.9.2" +dependencies = [ + "eframe", + "egui_plot", + "i18n-embed", + "i18n-embed-fl", + "libamdgpu_top", + "once_cell", + "rust-embed", +] + +[[package]] +name = "amdgpu_top_json" +version = "0.9.2" +dependencies = [ + "libamdgpu_top", + "serde_json", +] + +[[package]] +name = "amdgpu_top_tui" +version = "0.9.2" +dependencies = [ + "cursive", + "libamdgpu_top", +] + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.6.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" + +[[package]] +name = "arboard" +version = "3.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" +dependencies = [ + "clipboard-win", + "log", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "x11rb", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "clru" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cursive" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +dependencies = [ + "ahash", + "cfg-if", + "crossbeam-channel", + "crossterm", + "cursive_core", + "lazy_static", + "libc", + "log", + "signal-hook", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "cursive_core" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" +dependencies = [ + "ahash", + "crossbeam-channel", + "enum-map", + "enumset", + "lazy_static", + "log", + "num", + "owning_ref", + "time", + "unicode-segmentation", + "unicode-width", + "xi-unicode", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[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.77", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.5", +] + +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "ecolor" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" +dependencies = [ + "bytemuck", + "emath", + "serde", +] + +[[package]] +name = "eframe" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6490ef800b2e41ee129b1f32f9ac15f713233fe3bc18e241a1afe1e4fb6811e0" +dependencies = [ + "ahash", + "bytemuck", + "directories", + "document-features", + "egui", + "egui-wgpu", + "egui-winit", + "egui_glow", + "glow", + "glutin", + "glutin-winit", + "image", + "js-sys", + "log", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "percent-encoding", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.2", + "ron", + "serde", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time", + "winapi", + "winit", +] + +[[package]] +name = "egui" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" +dependencies = [ + "accesskit", + "ahash", + "emath", + "epaint", + "log", + "nohash-hasher", + "ron", + "serde", +] + +[[package]] +name = "egui-wgpu" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c7a7c707877c3362a321ebb4f32be811c0b91f7aebf345fb162405c0218b4c" +dependencies = [ + "ahash", + "bytemuck", + "document-features", + "egui", + "epaint", + "log", + "thiserror", + "type-map", + "web-time", + "wgpu", + "winit", +] + +[[package]] +name = "egui-winit" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926" +dependencies = [ + "ahash", + "arboard", + "egui", + "log", + "raw-window-handle 0.6.2", + "serde", + "smithay-clipboard", + "web-time", + "webbrowser", + "winit", +] + +[[package]] +name = "egui_glow" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103" +dependencies = [ + "ahash", + "bytemuck", + "egui", + "glow", + "log", + "memoffset", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "egui_plot" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7acc4fe778c41b91d57e04c1a2cf5765b3dc977f9f8384d2bb2eb4254855365" +dependencies = [ + "ahash", + "egui", + "emath", +] + +[[package]] +name = "emath" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "enumn" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "enumset" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "epaint" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "log", + "nohash-hasher", + "parking_lot", + "serde", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" + +[[package]] +name = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml", +] + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "fluent" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" +dependencies = [ + "thiserror", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.77", +] + +[[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 = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gix" +version = "0.64.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78414d29fcc82329080166077e0f7689f4016551fdb334d787c3d040fe2634f" +dependencies = [ + "gix-actor", + "gix-commitgraph", + "gix-config", + "gix-date", + "gix-diff", + "gix-discover", + "gix-features", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-hashtable", + "gix-lock", + "gix-macros", + "gix-object", + "gix-odb", + "gix-pack", + "gix-path", + "gix-ref", + "gix-refspec", + "gix-revision", + "gix-revwalk", + "gix-sec", + "gix-tempfile", + "gix-trace", + "gix-traverse", + "gix-url", + "gix-utils", + "gix-validate", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-actor" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2" +dependencies = [ + "bstr", + "gix-date", + "gix-utils", + "itoa", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-chunk" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" +dependencies = [ + "thiserror", +] + +[[package]] +name = "gix-commitgraph" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78" +dependencies = [ + "bstr", + "gix-chunk", + "gix-features", + "gix-hash", + "memmap2", + "thiserror", +] + +[[package]] +name = "gix-config" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28f53fd03d1bf09ebcc2c8654f08969439c4556e644ca925f27cf033bc43e658" +dependencies = [ + "bstr", + "gix-config-value", + "gix-features", + "gix-glob", + "gix-path", + "gix-ref", + "gix-sec", + "memchr", + "once_cell", + "smallvec", + "thiserror", + "unicode-bom", + "winnow", +] + +[[package]] +name = "gix-config-value" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03f76169faa0dec598eac60f83d7fcdd739ec16596eca8fb144c88973dbe6f8c" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "gix-path", + "libc", + "thiserror", +] + +[[package]] +name = "gix-date" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" +dependencies = [ + "bstr", + "itoa", + "thiserror", + "time", +] + +[[package]] +name = "gix-diff" +version = "0.44.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d" +dependencies = [ + "bstr", + "gix-hash", + "gix-object", + "thiserror", +] + +[[package]] +name = "gix-discover" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67662731cec3cb31ba3ed2463809493f76d8e5d6c6d245de8b0560438c13450e" +dependencies = [ + "bstr", + "dunce", + "gix-fs", + "gix-hash", + "gix-path", + "gix-ref", + "gix-sec", + "thiserror", +] + +[[package]] +name = "gix-features" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" +dependencies = [ + "crc32fast", + "flate2", + "gix-hash", + "gix-trace", + "gix-utils", + "libc", + "once_cell", + "prodash", + "sha1_smol", + "thiserror", + "walkdir", +] + +[[package]] +name = "gix-fs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575" +dependencies = [ + "fastrand", + "gix-features", + "gix-utils", +] + +[[package]] +name = "gix-glob" +version = "0.16.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "gix-features", + "gix-path", +] + +[[package]] +name = "gix-hash" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" +dependencies = [ + "faster-hex", + "thiserror", +] + +[[package]] +name = "gix-hashtable" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" +dependencies = [ + "gix-hash", + "hashbrown", + "parking_lot", +] + +[[package]] +name = "gix-lock" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" +dependencies = [ + "gix-tempfile", + "gix-utils", + "thiserror", +] + +[[package]] +name = "gix-macros" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "gix-object" +version = "0.42.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386" +dependencies = [ + "bstr", + "gix-actor", + "gix-date", + "gix-features", + "gix-hash", + "gix-utils", + "gix-validate", + "itoa", + "smallvec", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-odb" +version = "0.61.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b" +dependencies = [ + "arc-swap", + "gix-date", + "gix-features", + "gix-fs", + "gix-hash", + "gix-object", + "gix-pack", + "gix-path", + "gix-quote", + "parking_lot", + "tempfile", + "thiserror", +] + +[[package]] +name = "gix-pack" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229" +dependencies = [ + "clru", + "gix-chunk", + "gix-features", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-path", + "memmap2", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-path" +version = "0.10.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebfc4febd088abdcbc9f1246896e57e37b7a34f6909840045a1767c6dafac7af" +dependencies = [ + "bstr", + "gix-trace", + "home", + "once_cell", + "thiserror", +] + +[[package]] +name = "gix-quote" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" +dependencies = [ + "bstr", + "gix-utils", + "thiserror", +] + +[[package]] +name = "gix-ref" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "636e96a0a5562715153fee098c217110c33a6f8218f08f4687ff99afde159bb5" +dependencies = [ + "gix-actor", + "gix-features", + "gix-fs", + "gix-hash", + "gix-lock", + "gix-object", + "gix-path", + "gix-tempfile", + "gix-utils", + "gix-validate", + "memmap2", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-refspec" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868f8cd2e62555d1f7c78b784bece43ace40dd2a462daf3b588d5416e603f37" +dependencies = [ + "bstr", + "gix-hash", + "gix-revision", + "gix-validate", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-revision" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b13e43c2118c4b0537ddac7d0821ae0dfa90b7b8dbf20c711e153fb749adce" +dependencies = [ + "bstr", + "gix-date", + "gix-hash", + "gix-object", + "gix-revwalk", + "thiserror", +] + +[[package]] +name = "gix-revwalk" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0" +dependencies = [ + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-sec" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fe4d52f30a737bbece5276fab5d3a8b276dc2650df963e293d0673be34e7a5f" +dependencies = [ + "bitflags 2.6.0", + "gix-path", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "gix-tempfile" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa" +dependencies = [ + "gix-fs", + "libc", + "once_cell", + "parking_lot", + "tempfile", +] + +[[package]] +name = "gix-trace" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cae0e8661c3ff92688ce1c8b8058b3efb312aba9492bbe93661a21705ab431b" + +[[package]] +name = "gix-traverse" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840" +dependencies = [ + "bitflags 2.6.0", + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-revwalk", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-url" +version = "0.27.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd280c5e84fb22e128ed2a053a0daeacb6379469be6a85e3d518a0636e160c89" +dependencies = [ + "bstr", + "gix-features", + "gix-path", + "home", + "thiserror", + "url", +] + +[[package]] +name = "gix-utils" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" +dependencies = [ + "fastrand", + "unicode-normalization", +] + +[[package]] +name = "gix-validate" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" +dependencies = [ + "bstr", + "thiserror", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +dependencies = [ + "bitflags 2.6.0", + "cfg_aliases", + "cgl", + "core-foundation", + "dispatch", + "glutin_egl_sys", + "glutin_glx_sys", + "glutin_wgl_sys", + "icrate", + "libloading 0.8.5", + "objc2 0.4.1", + "once_cell", + "raw-window-handle 0.5.2", + "wayland-sys", + "windows-sys 0.48.0", + "x11-dl", +] + +[[package]] +name = "glutin-winit" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +dependencies = [ + "cfg_aliases", + "glutin", + "raw-window-handle 0.5.2", + "winit", +] + +[[package]] +name = "glutin_egl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +dependencies = [ + "gl_generator", + "windows-sys 0.48.0", +] + +[[package]] +name = "glutin_glx_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +dependencies = [ + "gl_generator", + "x11-dl", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.6.0", + "com", + "libc", + "libloading 0.8.5", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[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 = "i18n-config" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" +dependencies = [ + "basic-toml", + "log", + "serde", + "serde_derive", + "thiserror", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.77", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.5", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libamdgpu_top" +version = "0.9.2" +dependencies = [ + "anyhow", + "libdrm_amdgpu_sys", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdrm_amdgpu_sys" +version = "0.7.5" +source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#c10593dd00ad822d71e284424455023a3ad6a20c" +dependencies = [ + "libc", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "naga" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.2", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "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", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "owning_ref" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.4", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[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.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prodash" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "quick-xml" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rust-embed" +version = "8.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.77", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.4", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" +dependencies = [ + "libc", + "smithay-client-toolkit 0.19.2", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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 = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unic-langid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bom" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.77", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wayland-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.4", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webbrowser" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" +dependencies = [ + "block2 0.5.1", + "core-foundation", + "home", + "jni", + "log", + "ndk-context", + "objc2 0.5.2", + "objc2-foundation", + "url", + "web-sys", +] + +[[package]] +name = "wgpu" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases", + "document-features", + "js-sys", + "log", + "parking_lot", + "profiling", + "raw-window-handle 0.6.2", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases", + "codespan-reporting", + "document-features", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle 0.6.2", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bitflags 2.6.0", + "cfg_aliases", + "core-graphics-types", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.5", + "log", + "metal", + "naga", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle 0.6.2", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.6.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2", + "ndk", + "ndk-sys", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.2", + "redox_syscall 0.3.5", + "rustix", + "smithay-client-toolkit 0.18.1", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.5", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml-rs" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix new file mode 100644 index 000000000000..939280d11a9b --- /dev/null +++ b/pkgs/by-name/am/amdgpu_top/package.nix @@ -0,0 +1,66 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + libdrm, + libX11, + libGL, + wayland, + wayland-protocols, + libxkbcommon, + libXrandr, + libXi, + libXcursor, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "amdgpu_top"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "Umio-Yasuno"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eXUeXBFW2ejkOeMUujMwY0gidzdaX9yWWOfx1ZwA3lk="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "libdrm_amdgpu_sys-0.7.5" = "sha256-IkA1kJggkaSWzdDBHpNjU8WZr6wpSQWohERiHWQS2UY="; + }; + }; + + buildInputs = [ + libdrm + libX11 + libGL + wayland + wayland-protocols + libxkbcommon + libXrandr + libXi + libXcursor + ]; + + postInstall = '' + install -D ./assets/${pname}.desktop -t $out/share/applications/ + ''; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to display AMDGPU usage"; + homepage = "https://github.com/Umio-Yasuno/amdgpu_top"; + changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ geri1701 ]; + platforms = lib.platforms.linux; + mainProgram = "amdgpu_top"; + }; +} diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index c4362b99e164..f0d60c42a33a 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; - version = "2024.Q3.2"; + version = "2024.Q3.3"; src = fetchRepoProject { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - hash = "sha256-1Svdr93ShjhaWJUTLn5y1kBM4hHey1dUVDiHqFIKgrU="; + hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0="; }; buildInputs = @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { [ libdrm openssl - stdenv.cc.cc.lib + stdenv.cc.cc zlib ] ++ (with xorg; [ diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/by-name/am/ameba/package.nix similarity index 100% rename from pkgs/development/tools/ameba/default.nix rename to pkgs/by-name/am/ameba/package.nix diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix new file mode 100644 index 000000000000..f6cb9aafbb10 --- /dev/null +++ b/pkgs/by-name/am/amf-headers/package.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "amf-headers"; + version = "1.4.35"; + + src = fetchFromGitHub { + owner = "GPUOpen-LibrariesAndSDKs"; + repo = "AMF"; + rev = "v${version}"; + sha256 = "sha256-QhiM9JMEVbkTiY03hOWj0hYjHbf5lEZUz597+d3zY5E="; + }; + + installPhase = '' + mkdir -p $out/include/AMF + cp -r amf/public/include/* $out/include/AMF + ''; + + meta = with lib; { + description = "Headers for The Advanced Media Framework (AMF)"; + homepage = "https://github.com/GPUOpen-LibrariesAndSDKs/AMF"; + license = licenses.mit; + maintainers = with maintainers; [ devusb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/games/minecraft/amidst/default.nix b/pkgs/by-name/am/amidst/package.nix similarity index 100% rename from pkgs/tools/games/minecraft/amidst/default.nix rename to pkgs/by-name/am/amidst/package.nix diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/by-name/am/amiri/package.nix similarity index 100% rename from pkgs/data/fonts/amiri/default.nix rename to pkgs/by-name/am/amiri/package.nix diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/by-name/am/aml/package.nix similarity index 100% rename from pkgs/development/libraries/aml/default.nix rename to pkgs/by-name/am/aml/package.nix diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix new file mode 100644 index 000000000000..fa5f47cffa81 --- /dev/null +++ b/pkgs/by-name/am/amneziawg-go/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "amneziawg-go"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "amnezia-vpn"; + repo = "amneziawg-go"; + rev = "v${version}"; + hash = "sha256-Xw2maGmNnx0+GO3OWS1Gu77oB9wh2dv+WobypQotUMA="; + }; + + postPatch = '' + # Skip formatting tests + rm -f format_test.go + ''; + + vendorHash = "sha256-zXd9PK3fpOx/YjCNs2auZWhbLUk2fO6tyLV5FxAH0us="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Userspace Go implementation of AmneziaWG"; + homepage = "https://github.com/amnezia-vpn/amneziawg-go"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ averyanalex ]; + mainProgram = "amneziawg-go"; + }; +} diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/by-name/am/amoco/package.nix similarity index 100% rename from pkgs/tools/security/amoco/default.nix rename to pkgs/by-name/am/amoco/package.nix diff --git a/pkgs/games/among-sus/default.nix b/pkgs/by-name/am/among-sus/package.nix similarity index 100% rename from pkgs/games/among-sus/default.nix rename to pkgs/by-name/am/among-sus/package.nix diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/by-name/am/amrnb/package.nix similarity index 100% rename from pkgs/development/libraries/amrnb/default.nix rename to pkgs/by-name/am/amrnb/package.nix diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/by-name/am/amrwb/package.nix similarity index 100% rename from pkgs/development/libraries/amrwb/default.nix rename to pkgs/by-name/am/amrwb/package.nix diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/by-name/am/ams-lv2/package.nix similarity index 100% rename from pkgs/applications/audio/ams-lv2/default.nix rename to pkgs/by-name/am/ams-lv2/package.nix diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/by-name/am/ams/package.nix similarity index 100% rename from pkgs/applications/audio/ams/default.nix rename to pkgs/by-name/am/ams/package.nix diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/by-name/am/amtterm/package.nix similarity index 100% rename from pkgs/tools/system/amtterm/default.nix rename to pkgs/by-name/am/amtterm/package.nix diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/by-name/am/amule/package.nix similarity index 100% rename from pkgs/tools/networking/p2p/amule/default.nix rename to pkgs/by-name/am/amule/package.nix diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/by-name/an/analog/package.nix similarity index 100% rename from pkgs/tools/admin/analog/default.nix rename to pkgs/by-name/an/analog/package.nix diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/by-name/an/ananicy/package.nix similarity index 100% rename from pkgs/misc/ananicy/default.nix rename to pkgs/by-name/an/ananicy/package.nix diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/by-name/an/anarchism/package.nix similarity index 100% rename from pkgs/data/documentation/anarchism/default.nix rename to pkgs/by-name/an/anarchism/package.nix diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index c2abce641531..1acd8246a1d8 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,9 +16,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoPatches = [ - ./0001-update-time-rs.patch - ]; + cargoPatches = [ ./0001-update-time-rs.patch ]; cargoLock = { lockFile = ./Cargo.lock; @@ -29,11 +25,6 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - checkFlags = [ # the following test cases try to access network, skip them "--skip=tests::test_check_and_get_full_commit_when_full_commit" diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/by-name/an/andagii/package.nix similarity index 100% rename from pkgs/data/fonts/andagii/default.nix rename to pkgs/by-name/an/andagii/package.nix diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/by-name/an/anders/package.nix similarity index 100% rename from pkgs/applications/science/logic/anders/default.nix rename to pkgs/by-name/an/anders/package.nix diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/by-name/an/andika/package.nix similarity index 100% rename from pkgs/data/fonts/andika/default.nix rename to pkgs/by-name/an/andika/package.nix diff --git a/pkgs/tools/backup/android-backup-extractor/default.nix b/pkgs/by-name/an/android-backup-extractor/package.nix similarity index 100% rename from pkgs/tools/backup/android-backup-extractor/default.nix rename to pkgs/by-name/an/android-backup-extractor/package.nix diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/by-name/an/android-udev-rules/package.nix similarity index 100% rename from pkgs/os-specific/linux/android-udev-rules/default.nix rename to pkgs/by-name/an/android-udev-rules/package.nix diff --git a/pkgs/by-name/an/andyetitmoves/package.nix b/pkgs/by-name/an/andyetitmoves/package.nix new file mode 100644 index 000000000000..c9e8a0695ba2 --- /dev/null +++ b/pkgs/by-name/an/andyetitmoves/package.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: + +stdenv.mkDerivation rec { + pname = "andyetitmoves"; + version = "1.2.2"; + + src = + if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" + then + let + postfix = if stdenv.hostPlatform.system == "i686-linux" then "i386" else "x86_64"; + commercialName = "${pname}-${version}_${postfix}.tar.gz"; + demoUrl = "http://www.andyetitmoves.net/demo/${pname}Demo-${version}_${postfix}.tar.gz"; + in + if commercialVersion + then + requireFile + { + message = '' + We cannot download the commercial version automatically, as you require a license. + Once you bought a license, you need to add your downloaded version to the nix store. + You can do this by using "nix-prefetch-url file:///\$PWD/${commercialName}" in the + directory where yousaved it. + ''; + name = commercialName; + sha256 = + if stdenv.hostPlatform.system == "i686-linux" + then "15wvzmmidvykwjrbnq70h5jrvnjx1hcrm0357qj85q4aqbzavh01" + else "1v8z16qa9ka8sf7qq45knsxj87s6sipvv3a7xq11pb5xk08fb2ql"; + } + else + fetchurl { + url = demoUrl; + sha256 = + if stdenv.hostPlatform.system == "i686-linux" + then "0f14vrrbq05hsbdajrb5y9za65fpng1lc8f0adb4aaz27x7sh525" + else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4"; + } + else + throw "And Yet It Moves nix package only supports linux and intel cpu's."; + + installPhase = '' + mkdir -p $out/{opt/andyetitmoves,bin} + cp -r * $out/opt/andyetitmoves/ + + fullPath=${lib.getLib stdenv.cc.cc}/lib64 + for i in $nativeBuildInputs; do + fullPath=$fullPath''${fullPath:+:}$i/lib + done + + binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"} + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName + cat > $out/bin/$binName << EOF + #!${runtimeShell} + cd $out/opt/andyetitmoves + exec ./lib/$binName + EOF + chmod +x $out/bin/$binName + ''; + + buildInputs = [ libvorbis libogg libtheora SDL libXft SDL_image zlib libX11 libpng openal ]; + + meta = with lib; { + description = "Physics/Gravity Platform game"; + longDescription = '' + And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards. + ''; + homepage = "http://www.andyetitmoves.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ bluescreen303 ]; + }; +} diff --git a/pkgs/tools/text/anew/default.nix b/pkgs/by-name/an/anew/package.nix similarity index 100% rename from pkgs/tools/text/anew/default.nix rename to pkgs/by-name/an/anew/package.nix diff --git a/pkgs/tools/text/anewer/default.nix b/pkgs/by-name/an/anewer/package.nix similarity index 100% rename from pkgs/tools/text/anewer/default.nix rename to pkgs/by-name/an/anewer/package.nix diff --git a/pkgs/games/angband/default.nix b/pkgs/by-name/an/angband/package.nix similarity index 100% rename from pkgs/games/angband/default.nix rename to pkgs/by-name/an/angband/package.nix diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/by-name/an/angelscript/package.nix similarity index 100% rename from pkgs/development/interpreters/angelscript/default.nix rename to pkgs/by-name/an/angelscript/package.nix diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/by-name/an/angle-grinder/package.nix similarity index 100% rename from pkgs/tools/text/angle-grinder/default.nix rename to pkgs/by-name/an/angle-grinder/package.nix diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/by-name/an/angsd/package.nix similarity index 100% rename from pkgs/applications/science/biology/angsd/default.nix rename to pkgs/by-name/an/angsd/package.nix diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix new file mode 100644 index 000000000000..8c360e0ecb68 --- /dev/null +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nodejs, + makeBinaryWrapper, + runCommand, + angular-language-server, + writeShellApplication, + curl, + common-updater-scripts, + unzip, +}: + +let + owner = "angular"; + repo = "vscode-ng-language-service"; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "angular-language-server"; + version = "18.2.0"; + src = fetchurl { + name = "${finalAttrs.pname}-${finalAttrs.version}.zip"; + url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/ng-template.vsix"; + hash = "sha256-rl04nqSSBMjZfPW8Y+UtFLFLDFd5FSxJs3S937mhDWE="; + }; + + nativeBuildInputs = [ + unzip + makeBinaryWrapper + ]; + + buildInputs = [ nodejs ]; + + installPhase = '' + runHook preInstall + install -Dm755 server/bin/ngserver $out/lib/bin/ngserver + install -Dm755 server/index.js $out/lib/index.js + cp -r node_modules $out/lib/node_modules + runHook postInstall + ''; + + postFixup = '' + patchShebangs $out/lib/bin/ngserver $out/lib/index.js $out/lib/node_modules + makeWrapper $out/lib/bin/ngserver $out/bin/ngserver \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} \ + --add-flags "--tsProbeLocations $out/lib/node_modules --ngProbeLocations $out/lib/node_modules" + ''; + + passthru = { + tests = { + start-ok = runCommand "${finalAttrs.pname}-test" { } '' + ${lib.getExe angular-language-server} --stdio --help &> $out + cat $out | grep "Angular Language Service that implements the Language Server Protocol (LSP)" + ''; + }; + + updateScript = lib.getExe (writeShellApplication { + name = "update-${finalAttrs.pname}"; + runtimeInputs = [ + curl + common-updater-scripts + ]; + text = '' + if [ -z "''${GITHUB_TOKEN:-}" ]; then + echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2 + fi + + LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" \ + ''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \ + -Lsf https://api.github.com/repos/${owner}/${repo}/releases/latest | \ + jq -r .tag_name | cut -c 2-) + update-source-version ${finalAttrs.pname} "$LATEST_VERSION" + ''; + }); + }; + + meta = { + description = "LSP for angular completions, AOT diagnostic, quick info and go to definitions"; + homepage = "https://github.com/angular/vscode-ng-language-service"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + changelog = "https://github.com/angular/vscode-ng-language-service/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + mainProgram = "ngserver"; + maintainers = with lib.maintainers; [ tricktron ]; + }; +}) diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/by-name/an/ani-cli/package.nix similarity index 100% rename from pkgs/applications/video/ani-cli/default.nix rename to pkgs/by-name/an/ani-cli/package.nix diff --git a/pkgs/games/animatch/default.nix b/pkgs/by-name/an/animatch/package.nix similarity index 100% rename from pkgs/games/animatch/default.nix rename to pkgs/by-name/an/animatch/package.nix diff --git a/pkgs/development/interpreters/anko/default.nix b/pkgs/by-name/an/anko/package.nix similarity index 100% rename from pkgs/development/interpreters/anko/default.nix rename to pkgs/by-name/an/anko/package.nix diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/by-name/an/annapurna-sil/package.nix similarity index 100% rename from pkgs/data/fonts/annapurna-sil/default.nix rename to pkgs/by-name/an/annapurna-sil/package.nix diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/by-name/an/anonymousPro/package.nix similarity index 100% rename from pkgs/data/fonts/anonymous-pro/default.nix rename to pkgs/by-name/an/anonymousPro/package.nix diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index a7e19dec98a1..67ee8d878706 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-08-13"; + version = "0-unstable-2024-09-29"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "85f2b8b15fe2081634c6f2c3f96b5d430e045bf0"; - hash = "sha256-w2DziVBoCy1NpH4AoIFmKdjqufopqUeYjAwqkOhxHBc="; + rev = "0e942648c4f9b1fd89fee8ca91d6e9bd5e06344c"; + hash = "sha256-gzIZwbTdGE0+uLScV/JfGW0ZxXIbnnSrYO1OxPS5Xz0="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/ansi/default.nix b/pkgs/by-name/an/ansi/package.nix similarity index 100% rename from pkgs/development/tools/ansi/default.nix rename to pkgs/by-name/an/ansi/package.nix diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/by-name/an/ansible-language-server/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/ansible-language-server/default.nix rename to pkgs/by-name/an/ansible-language-server/package.nix diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix new file mode 100644 index 000000000000..b770af8c4e4b --- /dev/null +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -0,0 +1,37 @@ +{ fetchurl, lib, stdenv, pkg-config, boost, lua }: + +stdenv.mkDerivation rec { + pname = "ansifilter"; + version = "2.21"; + + src = fetchurl { + url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; + hash = "sha256-XqfP39B1LVoWklnaAFwYuQN2KANv2J2LgmJLrOycE5A="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ boost lua ]; + + postPatch = '' + # avoid timestamp non-determinism with '-n' + substituteInPlace makefile --replace 'gzip -9f' 'gzip -9nf' + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "conf_dir=/etc/ansifilter" + ]; + + meta = with lib; { + description = "Tool to convert ANSI to other formats"; + mainProgram = "ansifilter"; + longDescription = '' + Tool to remove ANSI or convert them to another format + (HTML, TeX, LaTeX, RTF, Pango or BBCode) + ''; + homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; + license = licenses.gpl3; + maintainers = [ maintainers.Adjective-Object ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/ante/Cargo.lock b/pkgs/by-name/an/ante/Cargo.lock similarity index 100% rename from pkgs/development/compilers/ante/Cargo.lock rename to pkgs/by-name/an/ante/Cargo.lock diff --git a/pkgs/development/compilers/ante/default.nix b/pkgs/by-name/an/ante/package.nix similarity index 100% rename from pkgs/development/compilers/ante/default.nix rename to pkgs/by-name/an/ante/package.nix diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/by-name/an/antfs-cli/package.nix similarity index 100% rename from pkgs/applications/misc/antfs-cli/default.nix rename to pkgs/by-name/an/antfs-cli/package.nix diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/by-name/an/anthy/package.nix similarity index 100% rename from pkgs/tools/inputmethods/anthy/default.nix rename to pkgs/by-name/an/anthy/package.nix diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/by-name/an/antibody/package.nix similarity index 100% rename from pkgs/shells/zsh/antibody/default.nix rename to pkgs/by-name/an/antibody/package.nix diff --git a/pkgs/development/libraries/antic/default.nix b/pkgs/by-name/an/antic/package.nix similarity index 100% rename from pkgs/development/libraries/antic/default.nix rename to pkgs/by-name/an/antic/package.nix diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/by-name/an/antidote/package.nix similarity index 100% rename from pkgs/shells/zsh/antidote/default.nix rename to pkgs/by-name/an/antidote/package.nix diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/by-name/an/antigen/package.nix similarity index 100% rename from pkgs/shells/zsh/antigen/default.nix rename to pkgs/by-name/an/antigen/package.nix diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix index 9d4c6fc6a409..63a0993084e2 100644 --- a/pkgs/by-name/an/antiprism/package.nix +++ b/pkgs/by-name/an/antiprism/package.nix @@ -1,24 +1,33 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, libX11 -, libGL -, libGLU -, libglut }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libX11, + libGL, + libGLU, + libglut, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "antiprism"; - version = "0.30"; + version = "0.32"; src = fetchFromGitHub { owner = "antiprism"; - repo = pname; - rev = version; - sha256 = "sha256-dD3MH+KectuuKOYF7bqWtGsBo5zz+UMyY/io1tgXbgU="; + repo = "antiprism"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-0FkaIsZixYHP45H0gytnzlpRvNd8mMYjW22w15z3RH8="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libGLU libGL libglut ]; + + buildInputs = [ + libX11 + libGLU + libGL + libglut + ]; meta = with lib; { homepage = "https://www.antiprism.com"; @@ -26,4 +35,4 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ AndersonTorres ]; }; -} +}) diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch b/pkgs/by-name/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch similarity index 100% rename from pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch rename to pkgs/by-name/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/by-name/an/antiword/package.nix similarity index 100% rename from pkgs/applications/office/antiword/default.nix rename to pkgs/by-name/an/antiword/package.nix diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix new file mode 100644 index 000000000000..c4eb14a9996f --- /dev/null +++ b/pkgs/by-name/an/antora-lunr-extension/package.nix @@ -0,0 +1,63 @@ +{ + antora, + buildNpmPackage, + fetchFromGitLab, + lib, + nix-update-script, +}: +buildNpmPackage rec { + pname = "antora-lunr-extension"; + version = "1.0.0-alpha.8"; + + src = fetchFromGitLab { + hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4="; + owner = "antora"; + repo = pname; + rev = "v${version}"; + }; + + npmDepsHash = "sha256-EtjZL6U/uSGSYSqtuatCkdWP0NHxRuht13D9OaM4x00="; + + # Prevent tests from failing because they are fetching data at runtime. + postPatch = '' + substituteInPlace package.json --replace '"_mocha"' '""' + ''; + + # Pointing $out to $out/lib/node_modules/@antora/lunr-extension simplifies + # Antora's extension option usage from + # + # --extension ${pkgs.antora-lunr-extension}/lib/node_modules/@antora/lunr-extension + # + # to + # + # --extension ${pkgs.antora-lunr-extension} + postInstall = '' + directory="$(mktemp --directory)" + + mv "$out/"{.,}* "$directory" + mv "$directory/lib/node_modules/@antora/lunr-extension/"{.,}* "$out" + ''; + + passthru = { + tests.run = antora.tests.run.override { + antora-lunr-extension-test = true; + }; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Antora extension adding offline, full-text search powered by Lunr"; + homepage = "https://gitlab.com/antora/antora-lunr-extension"; + license = lib.licenses.mpl20; + + longDescription = '' + This Antora extension is intended to be passed to `antora`'s `--extension` + flag or injected into the [`antora.extensions` + key](https://docs.antora.org/antora/3.1/extend/enable-extension). + ''; + + maintainers = [ lib.maintainers.naho ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix new file mode 100644 index 000000000000..5c7781488fe4 --- /dev/null +++ b/pkgs/by-name/an/antora-ui-default/package.nix @@ -0,0 +1,79 @@ +{ + fetchFromGitLab, + lib, + stdenvNoCC, +}: +let + srcFetchFromGitLab = { + hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM="; + owner = "trueNAHO"; + repo = "antora-ui-default"; + rev = "83bf9bf5f22a6dee397f8b089eb0315c14a278b5"; + }; +in +stdenvNoCC.mkDerivation { + pname = "antora-ui-default"; + version = "0"; + + # The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork + # for the following reasons: + # + # > The UI bundle is currently unpackaged [1] [2], and only accessible by + # > fetching the latest GitLab artifact or building from source. Neither + # > method is reliably reproducible, as artifacts are deleted over time and + # > building from source requires insecure Node 10. + # > + # > The solution is to version control the UI bundle. + # > + # > [...] + # > + # > [1]: https://gitlab.com/antora/antora-ui-default/-/issues/135 + # > [2]: https://gitlab.com/antora/antora-ui-default/-/issues/211 + # > + # > -- [3] + # + # To avoid bloating the repository archive size, the UI bundle is not stored + # in Nixpkgs. + # + # For reference, the UI bundle from [3] is 300K large. + # + # [3]: https://gitlab.com/trueNAHO/antora-ui-default/-/commit/83bf9bf5f22a6dee397f8b089eb0315c14a278b5 + src = fetchFromGitLab srcFetchFromGitLab; + + phases = [ "installPhase" ]; + + # Install '$src/ui-bundle.zip' to '$out/ui-bundle.zip' instead of '$out' to + # prevent the ZIP from being misidentified as a binary [1]. + # + # [1]: https://github.com/NixOS/nixpkgs/blob/8885a1e21ad43f8031c738a08029cd1d4dcbc2f7/pkgs/stdenv/generic/setup.sh#L792-L795 + installPhase = '' + mkdir --parents "$out" + cp "$src/ui-bundle.zip" "$out" + ''; + + meta = { + description = "Antora default UI bundle"; + homepage = "https://gitlab.com/antora/antora-ui-default"; + license = lib.licenses.mpl20; + + longDescription = '' + > A UI bundle is a [ZIP + > archive](https://en.wikipedia.org/wiki/Zip_(file_format)) or directory + > that contains one or more UIs for a site. + > + > -- Antora + > https://docs.antora.org/antora/3.1/playbook/ui-bundle-url + + This UI bundle is available under `$out/ui-bundle.zip` and intended to be + passed to `antora`'s `--ui-bundle-url` flag or injected into the + [`ui.bundle.url` + key](https://docs.antora.org/antora/3.1/playbook/ui-bundle-url/#url-key) + to avoid irreproducible + [`https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable`](https://gitlab.com/${srcFetchFromGitLab.owner}/${srcFetchFromGitLab.repo}/-/blob/${srcFetchFromGitLab.rev}/README.adoc#user-content-use-the-default-ui) + references. + ''; + + maintainers = [ lib.maintainers.naho ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/an/antora/package.nix b/pkgs/by-name/an/antora/package.nix new file mode 100644 index 000000000000..87653e0cf330 --- /dev/null +++ b/pkgs/by-name/an/antora/package.nix @@ -0,0 +1,51 @@ +{ + buildNpmPackage, + callPackage, + fetchFromGitLab, + lib, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "antora"; + version = "3.1.9"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8="; + }; + + npmDepsHash = "sha256-ngreuitwUcIDVF6vW7fZA1OaVxr9fv7s0IjCErXlcxg="; + + # This is to stop tests from being ran, as some of them fail due to trying to query remote repositories + postPatch = '' + substituteInPlace package.json --replace \ + '"_mocha"' '""' + ''; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/lib/node_modules/antora-build/packages/cli/bin/antora $out/bin/antora + ''; + + passthru = { + tests.run = callPackage ./test { }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Modular documentation site generator. Designed for users of Asciidoctor"; + homepage = "https://antora.org"; + license = licenses.mpl20; + mainProgram = "antora"; + + maintainers = with maintainers; [ + ehllie + naho + ]; + + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/an/antora/test/default.nix b/pkgs/by-name/an/antora/test/default.nix new file mode 100644 index 000000000000..ce5e0d5f50bb --- /dev/null +++ b/pkgs/by-name/an/antora/test/default.nix @@ -0,0 +1,66 @@ +{ + antora, + antora-lunr-extension, + antora-lunr-extension-test ? false, + antora-ui-default, + gitMinimal, + lib, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation { + name = "${antora.pname}${lib.optionalString antora-lunr-extension-test "-${antora-lunr-extension.pname}"}-test"; + src = ./minimal_working_example; + + postPatch = + let + date = lib.escapeShellArg "1/1/1970 00:00:00 +0000"; + in + '' + # > In order to use a local content repository with Antora, even when using + # > the worktree (HEAD), the repository must have at least one commit. + # > + # > -- https://docs.antora.org/antora/3.1/playbook/content-source-url + git init && + GIT_AUTHOR_DATE=${date} \ + GIT_AUTHOR_EMAIL= \ + GIT_AUTHOR_NAME=Nixpkgs \ + GIT_COMMITTER_DATE=${date} \ + GIT_COMMITTER_EMAIL= \ + GIT_COMMITTER_NAME=Nixpkgs \ + git commit --allow-empty --allow-empty-message --message "" + ''; + + buildPhase = + let + playbook = builtins.toFile "antora-playbook.json" ( + builtins.toJSON { + content.sources = [ { url = "~+"; } ]; + runtime.log.failure_level = "warn"; + } + ); + in + '' + # The --to-dir and --ui-bundle-url options are not included in the + # playbook due to Antora and Nix limitations. + antora ${ + lib.cli.toGNUCommandLineShell { } { + cache-dir = "$(mktemp --directory)"; + extension = if antora-lunr-extension-test then antora-lunr-extension else false; + to-dir = placeholder "out"; + ui-bundle-url = "${antora-ui-default}/ui-bundle.zip"; + } + } "${playbook}" + ''; + + nativeBuildInputs = [ + antora + gitMinimal + ]; + + meta = { + description = "Reproducible Antora test framework"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.naho ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml b/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml new file mode 100644 index 000000000000..27c21228abaa --- /dev/null +++ b/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml @@ -0,0 +1,7 @@ +--- +name: Antora + +nav: + - modules/ROOT/nav.adoc + +version: ~ diff --git a/pkgs/by-name/an/antora/test/minimal_working_example/modules/ROOT/nav.adoc b/pkgs/by-name/an/antora/test/minimal_working_example/modules/ROOT/nav.adoc new file mode 100644 index 000000000000..31f850eebfdb --- /dev/null +++ b/pkgs/by-name/an/antora/test/minimal_working_example/modules/ROOT/nav.adoc @@ -0,0 +1 @@ +* xref:index.adoc[] diff --git a/pkgs/by-name/an/antora/test/minimal_working_example/modules/ROOT/pages/index.adoc b/pkgs/by-name/an/antora/test/minimal_working_example/modules/ROOT/pages/index.adoc new file mode 100644 index 000000000000..67318787446c --- /dev/null +++ b/pkgs/by-name/an/antora/test/minimal_working_example/modules/ROOT/pages/index.adoc @@ -0,0 +1,3 @@ += Antora + +== Minimal Working Example diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/by-name/an/antsimulator/package.nix similarity index 100% rename from pkgs/games/antsimulator/default.nix rename to pkgs/by-name/an/antsimulator/package.nix diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/by-name/an/anttweakbar/package.nix similarity index 100% rename from pkgs/development/libraries/AntTweakBar/default.nix rename to pkgs/by-name/an/anttweakbar/package.nix diff --git a/pkgs/servers/web-apps/anuko-time-tracker/default.nix b/pkgs/by-name/an/anuko-time-tracker/package.nix similarity index 100% rename from pkgs/servers/web-apps/anuko-time-tracker/default.nix rename to pkgs/by-name/an/anuko-time-tracker/package.nix diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/by-name/an/anydesk/package.nix similarity index 100% rename from pkgs/applications/networking/remote/anydesk/default.nix rename to pkgs/by-name/an/anydesk/package.nix diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix index 0bb63de00028..445b461759cf 100644 --- a/pkgs/by-name/an/anyk/package.nix +++ b/pkgs/by-name/an/anyk/package.nix @@ -28,7 +28,7 @@ let # ÁNYK needs JavaFX for the Ügyfélkapu login webview. jdkWithFX = openjdk.override { enableJavaFX = true; - openjfx = openjfx.override { withWebKit = true; }; + openjfx_jdk = openjfx.override { withWebKit = true; }; }; extraClasspath = [ diff --git a/pkgs/applications/radio/anytone-emu/Cargo.lock b/pkgs/by-name/an/anytone-emu/Cargo.lock similarity index 100% rename from pkgs/applications/radio/anytone-emu/Cargo.lock rename to pkgs/by-name/an/anytone-emu/Cargo.lock diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/by-name/an/anytone-emu/package.nix similarity index 100% rename from pkgs/applications/radio/anytone-emu/default.nix rename to pkgs/by-name/an/anytone-emu/package.nix diff --git a/pkgs/servers/apache-airflow/package.json b/pkgs/by-name/ap/apache-airflow/package.json similarity index 100% rename from pkgs/servers/apache-airflow/package.json rename to pkgs/by-name/ap/apache-airflow/package.json diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/by-name/ap/apache-airflow/package.nix similarity index 100% rename from pkgs/servers/apache-airflow/default.nix rename to pkgs/by-name/ap/apache-airflow/package.nix diff --git a/pkgs/servers/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix similarity index 100% rename from pkgs/servers/apache-airflow/providers.nix rename to pkgs/by-name/ap/apache-airflow/providers.nix diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix similarity index 100% rename from pkgs/servers/apache-airflow/python-package.nix rename to pkgs/by-name/ap/apache-airflow/python-package.nix diff --git a/pkgs/servers/apache-airflow/update-providers.py b/pkgs/by-name/ap/apache-airflow/update-providers.py similarity index 100% rename from pkgs/servers/apache-airflow/update-providers.py rename to pkgs/by-name/ap/apache-airflow/update-providers.py diff --git a/pkgs/servers/ldap/apache-directory-server/default.nix b/pkgs/by-name/ap/apache-directory-server/package.nix similarity index 100% rename from pkgs/servers/ldap/apache-directory-server/default.nix rename to pkgs/by-name/ap/apache-directory-server/package.nix diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/by-name/ap/apache-directory-studio/package.nix similarity index 100% rename from pkgs/applications/networking/apache-directory-studio/default.nix rename to pkgs/by-name/ap/apache-directory-studio/package.nix diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix similarity index 100% rename from pkgs/development/compilers/apache-flex-sdk/default.nix rename to pkgs/by-name/ap/apache-flex-sdk/package.nix diff --git a/pkgs/by-name/ap/apacheAnt/package.nix b/pkgs/by-name/ap/apacheAnt/package.nix new file mode 100644 index 000000000000..883163d00c42 --- /dev/null +++ b/pkgs/by-name/ap/apacheAnt/package.nix @@ -0,0 +1,112 @@ +{ fetchurl, lib, stdenv, coreutils, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "ant"; + version = "1.10.11"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchurl { + url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz"; + }; + + contrib = fetchurl { + url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; + sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; + }; + + installPhase = + '' + mkdir -p $out/bin $out/lib/ant + mv * $out/lib/ant/ + + # Get rid of the manual (35 MiB). Maybe we should put this in a + # separate output. Keep the antRun script since it's vanilla sh + # and needed for the task (but since we set ANT_HOME to + # a weird value, we have to move antRun to a weird location). + # Get rid of the other Ant scripts since we provide our own. + mv $out/lib/ant/bin/antRun $out/bin/ + rm -rf $out/lib/ant/{manual,bin,WHATSNEW} + mkdir $out/lib/ant/bin + mv $out/bin/antRun $out/lib/ant/bin/ + + # Install ant-contrib. + unpackFile $contrib + cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ + + cat >> $out/bin/ant <&2 + exit 1 + fi + fi + + if [ -z \$NIX_JVM ]; then + if [ -e \$JAVA_HOME/bin/java ]; then + NIX_JVM=\$JAVA_HOME/bin/java + elif [ -e \$JAVA_HOME/bin/gij ]; then + NIX_JVM=\$JAVA_HOME/bin/gij + else + NIX_JVM=java + fi + fi + + LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" + + exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ + -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ + org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ + -cp "\$CLASSPATH" "\$@" + EOF + + chmod +x $out/bin/ant + ''; # */ + + meta = { + homepage = "https://ant.apache.org/"; + description = "Java-based build tool"; + mainProgram = "ant"; + + longDescription = '' + Apache Ant is a Java-based build tool. In theory, it is kind of like + Make, but without Make's wrinkles. + + Why another build tool when there is already make, gnumake, nmake, jam, + and others? Because all those tools have limitations that Ant's + original author couldn't live with when developing software across + multiple platforms. Make-like tools are inherently shell-based -- they + evaluate a set of dependencies, then execute commands not unlike what + you would issue in a shell. This means that you can easily extend + these tools by using or writing any program for the OS that you are + working on. However, this also means that you limit yourself to the + OS, or at least the OS type such as Unix, that you are working on. + + Ant is different. Instead of a model where it is extended with + shell-based commands, Ant is extended using Java classes. Instead of + writing shell commands, the configuration files are XML-based, calling + out a target tree where various tasks get executed. Each task is run + by an object that implements a particular Task interface. + ''; + + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = [ ] ++ lib.teams.java.members; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ap/apachetomcatscanner/package.nix b/pkgs/by-name/ap/apachetomcatscanner/package.nix new file mode 100644 index 000000000000..31e5546fd02b --- /dev/null +++ b/pkgs/by-name/ap/apachetomcatscanner/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "apachetomcatscanner"; + version = "3.7.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "p0dalirius"; + repo = "ApacheTomcatScanner"; + rev = "refs/tags/${version}"; + hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8="; + }; + + # Posted a PR for discussion upstream that can be followed: + # https://github.com/p0dalirius/ApacheTomcatScanner/pull/32 + postPatch = '' + sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py + ''; + + pythonRelaxDeps = [ + "requests" + "urllib3" + ]; + + build-system = with python3.pkgs; [ setuptools ]; + + propagatedBuildInputs = with python3.pkgs; [ + requests + sectools + urllib3 + xlsxwriter + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ "apachetomcatscanner" ]; + + meta = with lib; { + description = "Tool to scan for Apache Tomcat server vulnerabilities"; + homepage = "https://github.com/p0dalirius/ApacheTomcatScanner"; + changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "ApacheTomcatScanner"; + }; +} diff --git a/pkgs/by-name/ap/apbs/package.nix b/pkgs/by-name/ap/apbs/package.nix new file mode 100644 index 000000000000..87cd5fed1373 --- /dev/null +++ b/pkgs/by-name/ap/apbs/package.nix @@ -0,0 +1,116 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, blas +, superlu +, suitesparse +, python3 +, libintl +, libiconv +, darwin +}: +let + # this is a fork version of fetk (http://www.fetk.org/) + # which is maintained by apbs team + fetk = stdenv.mkDerivation (finalAttrs: { + pname = "fetk"; + version = "1.9.3"; + + src = fetchFromGitHub { + owner = "Electrostatics"; + repo = "fetk"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-uFA1JRR05cNcUGaJj9IyGNONB2hU9IOBPzOj/HucNH4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DBLAS_LIBRARIES=${blas}/lib" + "-DBLA_STATIC=OFF" + "-DBUILD_SUPERLU=OFF" + ]; + + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + }; + + buildInputs = [ + blas + superlu + suitesparse + ]; + + meta = with lib; { + description = "Fork of the Finite Element ToolKit from fetk.org"; + homepage = "https://github.com/Electrostatics/FETK"; + changelog = "https://github.com/Electrostatics/FETK/releases/tag/${finalAttrs.version}"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "apbs"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "Electrostatics"; + repo = "apbs"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-2DnHU9hMDl4OJBaTtcRiB+6R7gAeFcuOUy7aI63A3gQ="; + }; + + postPatch = '' + # ImportFETK.cmake downloads source and builds fetk + substituteInPlace CMakeLists.txt \ + --replace "include(ImportFETK)" "" \ + --replace 'import_fetk(''${FETK_VERSION})' "" + + # U was removed in python 3.11 because it had no effect + substituteInPlace tools/manip/inputgen.py \ + --replace '"rU"' '"r"' + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + fetk + suitesparse + blas + python3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libintl + libiconv + darwin.libutil + ]; + + cmakeFlags = [ + "-DPYTHON_VERSION=${python3.version}" + "-DAPBS_LIBS=mc;maloc" + "-DCMAKE_MODULE_PATH=${fetk}/share/fetk/cmake;" + "-DENABLE_TESTS=1" + ]; + + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + + doCheck = true; + + meta = with lib; { + description = "Software for biomolecular electrostatics and solvation calculations"; + mainProgram = "apbs"; + homepage = "https://www.poissonboltzmann.org/"; + changelog = "https://github.com/Electrostatics/apbs/releases/tag/v${finalAttrs.version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/by-name/ap/apcupsd/package.nix similarity index 100% rename from pkgs/servers/apcupsd/default.nix rename to pkgs/by-name/ap/apcupsd/package.nix diff --git a/pkgs/applications/blockchains/aperture/default.nix b/pkgs/by-name/ap/aperture/package.nix similarity index 100% rename from pkgs/applications/blockchains/aperture/default.nix rename to pkgs/by-name/ap/aperture/package.nix diff --git a/pkgs/development/libraries/physics/apfel/cmake.patch b/pkgs/by-name/ap/apfel/cmake.patch similarity index 100% rename from pkgs/development/libraries/physics/apfel/cmake.patch rename to pkgs/by-name/ap/apfel/cmake.patch diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/by-name/ap/apfel/package.nix similarity index 100% rename from pkgs/development/libraries/physics/apfel/default.nix rename to pkgs/by-name/ap/apfel/package.nix diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/by-name/ap/apfelgrid/package.nix similarity index 100% rename from pkgs/development/libraries/physics/apfelgrid/default.nix rename to pkgs/by-name/ap/apfelgrid/package.nix diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/by-name/ap/apfs-fuse/package.nix similarity index 100% rename from pkgs/tools/filesystems/apfs-fuse/default.nix rename to pkgs/by-name/ap/apfs-fuse/package.nix diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/by-name/ap/apg/package.nix similarity index 100% rename from pkgs/tools/security/apg/default.nix rename to pkgs/by-name/ap/apg/package.nix diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/by-name/ap/apgdiff/package.nix similarity index 100% rename from pkgs/development/tools/database/apgdiff/default.nix rename to pkgs/by-name/ap/apgdiff/package.nix diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 153de3c7b74c..37b06b0f0d64 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # No tests exist doCheck = false; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; runtimeDependencies = [ diff --git a/pkgs/by-name/ap/apkeditor/arsclib/default.nix b/pkgs/by-name/ap/apkeditor/arsclib/default.nix new file mode 100644 index 000000000000..37e9d0d9ec59 --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/arsclib/default.nix @@ -0,0 +1,33 @@ +{ + fetchFromGitHub, + gradle, + lib, + REAndroidLibrary, +}: + +let + self = REAndroidLibrary { + pname = "arsclib"; + # 1.3.5 is not new enough for APKEditor because of API changes + version = "1.3.5-unstable-2024-10-21"; + projectName = "ARSCLib"; + + src = fetchFromGitHub { + owner = "REAndroid"; + repo = "ARSCLib"; + # This is the latest commit at the time of packaging. + # It can be changed to a stable release ("V${version}") + # if it is compatible with APKEditor. + rev = "ed6ccf00e56d7cce13e8648ad46a2678a6093248"; + hash = "sha256-jzd7xkc4O+P9hlGsFGGl2P3pqVvV5+mDyKTRUuGfFSA="; + }; + + mitmCache = gradle.fetchDeps { + pkg = self; + data = ./deps.json; + }; + + meta.license = lib.licenses.asl20; + }; +in +self diff --git a/pkgs/by-name/ap/apkeditor/arsclib/deps.json b/pkgs/by-name/ap/apkeditor/arsclib/deps.json new file mode 100644 index 000000000000..de1ed4d2da3c --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/arsclib/deps.json @@ -0,0 +1,17 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + } + } +} diff --git a/pkgs/by-name/ap/apkeditor/fix-gradle.patch b/pkgs/by-name/ap/apkeditor/fix-gradle.patch new file mode 100644 index 000000000000..1860f48ad93f --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/fix-gradle.patch @@ -0,0 +1,41 @@ +diff --git a/build.gradle b/build.gradle +index 97fd54f..128a269 100755 +--- a/build.gradle ++++ b/build.gradle +@@ -5,8 +5,8 @@ group 'com.reandroid.apkeditor' + version '1.4.1' + + java { +- sourceCompatibility JavaVersion.VERSION_1_8 +- targetCompatibility JavaVersion.VERSION_1_8 ++ sourceCompatibility JavaVersion.VERSION_17 ++ targetCompatibility JavaVersion.VERSION_17 + } + + if (JavaVersion.current().isJava8Compatible()) { +@@ -22,13 +22,13 @@ repositories { + + dependencies { + //implementation("io.github.reandroid:ARSCLib:+") +- compile(files("$rootProject.projectDir/libs/ARSCLib.jar")) ++ implementation(files("$rootProject.projectDir/libs/ARSCLib.jar")) + + // built from: https://github.com/REAndroid/smali-lib +- compile(files("$rootProject.projectDir/libs/smali.jar")) ++ implementation(files("$rootProject.projectDir/libs/smali.jar")) + + // built from: https://github.com/REAndroid/JCommand +- compile(files("$rootProject.projectDir/libs/JCommand.jar")) ++ implementation(files("$rootProject.projectDir/libs/JCommand.jar")) + } + + processResources { +@@ -52,7 +52,7 @@ task fatJar(type: Jar) { + 'Main-Class': 'com.reandroid.apkeditor.Main' + ) + } +- from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } ++ from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + with jar + } + diff --git a/pkgs/by-name/ap/apkeditor/jcommand/default.nix b/pkgs/by-name/ap/apkeditor/jcommand/default.nix new file mode 100644 index 000000000000..43b6ce8cae4c --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/jcommand/default.nix @@ -0,0 +1,33 @@ +{ + fetchFromGitHub, + gradle, + lib, + REAndroidLibrary, +}: + +let + self = REAndroidLibrary { + pname = "jcommand"; + version = "0-unstable-2024-09-20"; + projectName = "JCommand"; + + src = fetchFromGitHub { + owner = "REAndroid"; + repo = "JCommand"; + # No tagged releases, and + # it is hard to determine the actual commit that APKEditor is intended to use, + # so I think we should use the latest commit that doesn't break compilation or basic functionality. + # Currently this is the latest commit at the time of packaging. + rev = "714b6263c28dabb34adc858951cf4bc60d6c3fed"; + hash = "sha256-6Em+1ddUkZBCYWs88qtfeGnxISZchFrHgDL8fsgZoQg="; + }; + + mitmCache = gradle.fetchDeps { + pkg = self; + data = ./deps.json; + }; + + meta.license = lib.licenses.asl20; + }; +in +self diff --git a/pkgs/by-name/ap/apkeditor/jcommand/deps.json b/pkgs/by-name/ap/apkeditor/jcommand/deps.json new file mode 100644 index 000000000000..de1ed4d2da3c --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/jcommand/deps.json @@ -0,0 +1,17 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + } + } +} diff --git a/pkgs/by-name/ap/apkeditor/package.nix b/pkgs/by-name/ap/apkeditor/package.nix new file mode 100644 index 000000000000..37802a4901fa --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchFromGitHub, + callPackage, + + jre, + gradle, + makeWrapper, +}: + +let + REAndroidLibrary = + args: + let + inherit (args) pname version projectName; + outJar = "share/${projectName}/${projectName}.jar"; + self = stdenv.mkDerivation ( + { + __darwinAllowLocalNetworking = true; + + buildInputs = [ jre ]; + nativeBuildInputs = [ gradle ]; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + gradleBuildTask = "jar"; + doCheck = true; + + inherit outJar; + installPhase = '' + runHook preInstall + install -Dm644 build/libs/*.jar $out/${outJar} + runHook postInstall + ''; + } + // args + // { + meta = { + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + } // args.meta; + } + ); + in + self; + + arsclib = callPackage ./arsclib { inherit REAndroidLibrary; }; + smali = callPackage ./smali { inherit REAndroidLibrary; }; + jcommand = callPackage ./jcommand { inherit REAndroidLibrary; }; + + apkeditor = + let + pname = "apkeditor"; + version = "1.4.1"; + projectName = "APKEditor"; + in + REAndroidLibrary { + inherit pname version projectName; + + # When you need to update **/deps.json for the dependencies (e.g. for smali), + # run `nix build apkeditor.passthru.deps.smali.mitmCache.updateScript`. + passthru.deps = { + inherit arsclib smali jcommand; + }; + + src = fetchFromGitHub { + owner = "REAndroid"; + repo = "APKEditor"; + rev = "V${version}"; + hash = "sha256-a72j9qGjJXnTFeqLez2rhBSArFVYCX+Xs7NQd8CY5Yk="; + }; + + patches = [ + # Remove this patch after REAndroid/APKEditor#144 is merged + ./fix-gradle.patch + ]; + + nativeBuildInputs = [ + gradle + makeWrapper + ]; + + gradleBuildTask = "fatJar"; + + # The paths libs/*.jar are hardcoded in build.gradle of APKEditor: + # https://github.com/REAndroid/APKEditor/blob/V1.4.1/build.gradle#L24-L31 + preConfigure = '' + ln -sf ${arsclib}/${arsclib.outJar} libs/ARSCLib.jar + ln -sf ${smali}/${smali.outJar} libs/smali.jar + ln -sf ${jcommand}/${jcommand.outJar} libs/JCommand.jar + ''; + + postInstall = '' + mkdir -p $out/bin + makeWrapper ${lib.getExe jre} $out/bin/APKEditor \ + --add-flags "-jar $out/${apkeditor.outJar}" + ''; + + meta = { + description = "Powerful android apk resources editor"; + maintainers = with lib.maintainers; [ ulysseszhan ]; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + mainProgram = "APKEditor"; + }; + }; +in +apkeditor diff --git a/pkgs/by-name/ap/apkeditor/smali/default.nix b/pkgs/by-name/ap/apkeditor/smali/default.nix new file mode 100644 index 000000000000..de6b87c8e82e --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/smali/default.nix @@ -0,0 +1,57 @@ +{ + fetchFromGitHub, + gradle, + lib, + REAndroidLibrary, +}: + +let + self = REAndroidLibrary { + pname = "smali"; + version = "0-unstable-2024-10-15"; + projectName = "smali"; + + src = fetchFromGitHub { + owner = "REAndroid"; + repo = "smali-lib"; + # No tagged releases, and + # it is hard to determine the actual commit that APKEditor is intended to use, + # so I think we should use the latest commit that doesn't break compilation or basic functionality. + # Currently this is the latest commit at the time of packaging. + rev = "c781eafb31f526abce9fdf406ce2c925fec20d28"; + hash = "sha256-6tkvikgWMUcKwzsgbfpxlB6NZBAlZtTE34M3qPQw7Y4="; + }; + + patches = [ + # Remove this patch after REAndroid/smali-lib#1 is merged + ./fix-gradle.patch + ]; + + mitmCache = gradle.fetchDeps { + pkg = self; + data = ./deps.json; + }; + gradleBuildTask = "build"; + + installPhase = '' + runHook preInstall + install -Dm644 smali/build/libs/*-fat.jar $out/${self.outJar} + runHook postInstall + ''; + + # This fork deleted the NOTICE file from the original repo: + # https://github.com/REAndroid/smali-lib/commit/40c075a1ff5fa8e29f339f4e71f45c028789c86c#diff-dfb14fbb9e7d095209ec4cfd621069437bf9c442ff9de9d4ce889781bd0fefcf + # Here is the gist of the original NOTICE file: + # Various portions of the code are from AOSP and is licensed under Apache 2.0. + # Other parts are copyrighted by JesusFreke and Google, + # permitting redistribution (with or without modification) of source and binary + # as long as the copyright notice is present. + # For full details, see: + # https://github.com/JesusFreke/smali/blob/master/NOTICE + meta.license = with lib.licenses; [ + asl20 + free + ]; + }; +in +self diff --git a/pkgs/by-name/ap/apkeditor/smali/deps.json b/pkgs/by-name/ap/apkeditor/smali/deps.json new file mode 100644 index 000000000000..ffaa427db4c1 --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/smali/deps.json @@ -0,0 +1,86 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "com/beust#jcommander/1.48": { + "jar": "sha256-pzE/z94HCTDkDsee3zxZSM805PDSXLOgn5lj2L3YQRM=", + "pom": "sha256-EH4aAn6KszS4H7KJYGDba68y430uME5glCNtPn6ymQM=" + }, + "de/jflex#jflex-parent/1.6.1": { + "pom": "sha256-zgOPd5P3f7eO+hFMMyjlx37OF9MzRfB7TsCm4U4WB1k=" + }, + "de/jflex#jflex/1.6.1": { + "jar": "sha256-EsuEWC3TPm3O2yTaSwwf6AdfxjkWx8xt8UCHDPHpKbY=", + "pom": "sha256-MXynvUMHgykKCEHUwxEvcbyY1aR+6cyIaZXEFChcnes=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/antlr#stringtemplate/3.2.1": { + "jar": "sha256-9mznLpZeUwHLDwIOVNK6atdv65Gzy/ww278AwGpt9tc=", + "pom": "sha256-tF6CZVqlpI8z0TpD5DRUJrFWM1s14kta6hLbWCPBahY=" + }, + "org/apache/ant#ant-launcher/1.7.0": { + "jar": "sha256-crPQPg19hqVlE+w43UzWq+PaZiAYm+IiqyVTUstuuko=", + "pom": "sha256-0p0myykG6cOYOBvUhz7KuwTWMO9hNDXssUmoWirvyvQ=" + }, + "org/apache/ant#ant-parent/1.7.0": { + "pom": "sha256-GlLYNxpsvG4F7b8CZGcXEX3SNERZvulnAU8EH9zzCJM=" + }, + "org/apache/ant#ant/1.7.0": { + "jar": "sha256-kvcjB+dEDx41LJFvJDjSu6s//Sz3MMcTFhF60Eq63qg=", + "pom": "sha256-fAIXQD9XogDLgNSJiSzgTqdi8qEzq+PdOEcGUUNM+vI=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/mockito#mockito-core/1.10.19": { + "jar": "sha256-1YMe5PcQVYAIIaNKMFHPHtWzcC8pX/69UPZftdgacbg=", + "pom": "sha256-cVJo2AC6zQcjbuHm9EB2UOYc+XlzO8Ji5N4V+9E7kg0=" + }, + "org/objenesis#objenesis-parent/2.1": { + "pom": "sha256-NDsaMJNBDj+ybGaZhCOrOJw6dEHNGohZvTJ90VtHmqQ=" + }, + "org/objenesis#objenesis/2.1": { + "jar": "sha256-x0MwzGuAbIBP0350SHtP5dfCdQxeFfvG76E73uG974A=", + "pom": "sha256-QFTxhhN+O4SafCPJ6EbNV9ii/jLBfUxivUIFEtdMPT8=" + }, + "org/sonatype/oss#oss-parent/3": { + "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/xbib/gradle/plugin#gradle-plugin-jflex/1.1.0": { + "jar": "sha256-nfON5Bsazk30I3o2pAw8k0qzVWBomj9b6DiwfQ3jn3g=", + "pom": "sha256-Ikxjj1TL8LCYxDw6GylqmsF/dfYC9m65szjnkqr6C5g=" + } + } +} diff --git a/pkgs/by-name/ap/apkeditor/smali/fix-gradle.patch b/pkgs/by-name/ap/apkeditor/smali/fix-gradle.patch new file mode 100644 index 000000000000..075f66133002 --- /dev/null +++ b/pkgs/by-name/ap/apkeditor/smali/fix-gradle.patch @@ -0,0 +1,87 @@ +diff --git a/baksmali/build.gradle b/baksmali/build.gradle +index d346970e..eaddfa27 100644 +--- a/baksmali/build.gradle ++++ b/baksmali/build.gradle +@@ -25,7 +25,7 @@ task fatJar(type: Jar) { + from sourceSets.main.output + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + +- classifier = 'fat' ++ archiveClassifier = 'fat' + + manifest { + attributes('Main-Class': 'org.jf.baksmali.Main') +@@ -36,6 +36,10 @@ task fatJar(type: Jar) { + ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archivePath, overwrite: true) + } + } ++ ++ // Necessary on Gradle 7 to eplicitly set dependency ++ dependsOn project(':util').jar ++ dependsOn project(':dexlib2').jar + } + tasks.getByPath('build').dependsOn(fatJar) + +diff --git a/build.gradle b/build.gradle +index 5656b634..e519c53e 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -30,8 +30,8 @@ subprojects { + version = parent.version + + java { +- sourceCompatibility JavaVersion.VERSION_1_8 +- targetCompatibility JavaVersion.VERSION_1_8 ++ sourceCompatibility JavaVersion.VERSION_17 ++ targetCompatibility JavaVersion.VERSION_17 + } + + ext { +diff --git a/dexlib2/build.gradle b/dexlib2/build.gradle +index e1c39897..fc45707c 100644 +--- a/dexlib2/build.gradle ++++ b/dexlib2/build.gradle +@@ -18,4 +18,7 @@ task ragel(type:Exec) { + 'SyntheticAccessorFSM.rl' + } + +- ++test { ++ // Since Java 9, this is needed. See https://stackoverflow.com/a/41265267 ++ jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' ++} +diff --git a/smali/build.gradle b/smali/build.gradle +index 6ec5f483..2b3bb771 100644 +--- a/smali/build.gradle ++++ b/smali/build.gradle +@@ -57,13 +57,17 @@ dependencies { + + processResources.inputs.property('version', version) + processResources.expand('version': version) ++processResources.configure { ++ // Necessary on Gradle 7 to eplicitly set dependency ++ dependsOn generateGrammarSource ++} + + // Build a separate jar that contains all dependencies + task fatJar(type: Jar, dependsOn: jar) { + from sourceSets.main.output + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + +- classifier = 'fat' ++ archiveClassifier = 'fat' + + manifest { + attributes('Main-Class': 'org.jf.smali.Main') +@@ -74,6 +78,11 @@ task fatJar(type: Jar, dependsOn: jar) { + ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archivePath, overwrite: true) + } + } ++ ++ // Necessary on Gradle 7 to eplicitly set dependency ++ dependsOn project(':util').jar ++ dependsOn project(':dexlib2').jar ++ dependsOn project(':baksmali').jar + } + tasks.getByPath('build').dependsOn(fatJar) + diff --git a/pkgs/tools/package-management/apkg/default.nix b/pkgs/by-name/ap/apkg/package.nix similarity index 100% rename from pkgs/tools/package-management/apkg/default.nix rename to pkgs/by-name/ap/apkg/package.nix diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/by-name/ap/apkid/package.nix similarity index 100% rename from pkgs/development/tools/apkid/default.nix rename to pkgs/by-name/ap/apkid/package.nix diff --git a/pkgs/tools/security/apkleaks/default.nix b/pkgs/by-name/ap/apkleaks/package.nix similarity index 100% rename from pkgs/tools/security/apkleaks/default.nix rename to pkgs/by-name/ap/apkleaks/package.nix diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/by-name/ap/apksigcopier/package.nix similarity index 100% rename from pkgs/development/tools/apksigcopier/default.nix rename to pkgs/by-name/ap/apksigcopier/package.nix diff --git a/pkgs/development/tools/apksigner/deps.json b/pkgs/by-name/ap/apksigner/deps.json similarity index 100% rename from pkgs/development/tools/apksigner/deps.json rename to pkgs/by-name/ap/apksigner/deps.json diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/by-name/ap/apksigner/package.nix similarity index 100% rename from pkgs/development/tools/apksigner/default.nix rename to pkgs/by-name/ap/apksigner/package.nix diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/by-name/ap/apktool/package.nix similarity index 100% rename from pkgs/development/tools/apktool/default.nix rename to pkgs/by-name/ap/apktool/package.nix diff --git a/pkgs/tools/graphics/apng2gif/default.nix b/pkgs/by-name/ap/apng2gif/package.nix similarity index 100% rename from pkgs/tools/graphics/apng2gif/default.nix rename to pkgs/by-name/ap/apng2gif/package.nix diff --git a/pkgs/tools/graphics/apngopt/default.nix b/pkgs/by-name/ap/apngopt/package.nix similarity index 100% rename from pkgs/tools/graphics/apngopt/default.nix rename to pkgs/by-name/ap/apngopt/package.nix diff --git a/pkgs/tools/graphics/apngopt/remove-7z.patch b/pkgs/by-name/ap/apngopt/remove-7z.patch similarity index 100% rename from pkgs/tools/graphics/apngopt/remove-7z.patch rename to pkgs/by-name/ap/apngopt/remove-7z.patch diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 3f39ac124453..bf7e31ded51c 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -19,36 +19,24 @@ }: let - version = "3.1"; + version = "3.2"; src = fetchFromGitLab { owner = "World"; repo = "apostrophe"; domain = "gitlab.gnome.org"; - rev = "v${version}"; - hash = "sha256-rXaz0EtLuKOBJLF81K/4qoTZtG6B8Wn+KwSiqYvxAVc="; + rev = "refs/tags/v${version}"; + hash = "sha256-NPpBu6Wmd8z99vzVQ394CyHRV2RQBtkbuqcaFqKqlkQ="; }; - # Patches are required by upstream. Without the patches - # typing `- aaa`, newline, `- bbb` the program crashes - gtksourceview5-patched = gtksourceview5.overrideAttrs (prev: { - patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/sourceview_text_commits.patch" ]; - }); - - libspelling-patched = - (libspelling.override { gtksourceview5 = gtksourceview5-patched; }).overrideAttrs - (prev: { - patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/libspelling_text_commits.patch" ]; - }); - reveal-js = fetchFromGitHub { owner = "hakimel"; repo = "reveal.js"; # keep in sync with upstream shipped version # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json - rev = "4.6.0"; - hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; + rev = "refs/tags/5.1.0"; + hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0="; }; in python3Packages.buildPythonApplication { @@ -67,13 +55,14 @@ python3Packages.buildPythonApplication { + '' substituteInPlace apostrophe/preview_converter.py \ --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js" - '' - # Should be done in postInstall, but meson checks this eagerly before build - + '' - install -d $out/share/apostrophe/libs - cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js ''; + # Should be done in postInstall, but meson checks this eagerly before build + preConfigure = '' + install -d $out/share/apostrophe/libs + cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js + ''; + nativeBuildInputs = [ meson ninja @@ -85,8 +74,8 @@ python3Packages.buildPythonApplication { buildInputs = [ libadwaita - gtksourceview5-patched - libspelling-patched + gtksourceview5 + libspelling webkitgtk_6_0 ]; @@ -94,6 +83,7 @@ python3Packages.buildPythonApplication { pygobject3 pypandoc chardet + levenshtein ]; dontWrapGApps = true; @@ -107,7 +97,7 @@ python3Packages.buildPythonApplication { ''; passthru = { - inherit gtksourceview5-patched libspelling-patched reveal-js; + inherit reveal-js; }; meta = { diff --git a/pkgs/os-specific/darwin/apparency/default.nix b/pkgs/by-name/ap/apparency/package.nix similarity index 100% rename from pkgs/os-specific/darwin/apparency/default.nix rename to pkgs/by-name/ap/apparency/package.nix diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/by-name/ap/apparix/package.nix similarity index 100% rename from pkgs/tools/misc/apparix/default.nix rename to pkgs/by-name/ap/apparix/package.nix diff --git a/pkgs/applications/misc/appcleaner/default.nix b/pkgs/by-name/ap/appcleaner/package.nix similarity index 100% rename from pkgs/applications/misc/appcleaner/default.nix rename to pkgs/by-name/ap/appcleaner/package.nix diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/by-name/ap/appeditor/package.nix similarity index 100% rename from pkgs/applications/misc/appeditor/default.nix rename to pkgs/by-name/ap/appeditor/package.nix diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/by-name/ap/appflowy/package.nix similarity index 100% rename from pkgs/applications/office/appflowy/default.nix rename to pkgs/by-name/ap/appflowy/package.nix diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/by-name/ap/appgate-sdp/package.nix similarity index 100% rename from pkgs/applications/networking/appgate-sdp/default.nix rename to pkgs/by-name/ap/appgate-sdp/package.nix diff --git a/pkgs/tools/package-management/appimagekit/nix.patch b/pkgs/by-name/ap/appimagekit/nix.patch similarity index 100% rename from pkgs/tools/package-management/appimagekit/nix.patch rename to pkgs/by-name/ap/appimagekit/nix.patch diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/by-name/ap/appimagekit/package.nix similarity index 100% rename from pkgs/tools/package-management/appimagekit/default.nix rename to pkgs/by-name/ap/appimagekit/package.nix diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix similarity index 100% rename from pkgs/development/libraries/appindicator-sharp/default.nix rename to pkgs/by-name/ap/appindicator-sharp/package.nix diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/by-name/ap/apple-cursor/package.nix similarity index 100% rename from pkgs/data/icons/apple-cursor/default.nix rename to pkgs/by-name/ap/apple-cursor/package.nix diff --git a/pkgs/by-name/ap/apple-sdk/README.md b/pkgs/by-name/ap/apple-sdk/README.md new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix new file mode 100644 index 000000000000..7bb655a1863b --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, +}: + +let + CoreSymbolication = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "CoreSymbolication"; + version = "0-unstable-2018-06-17"; + + src = fetchFromGitHub { + repo = "CoreSymbolication"; + owner = "matthewbauer"; + rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4"; + hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; + }; + + patches = [ + # Add missing symbol definitions needed to build `zlog` in system_cmds. + # https://github.com/matthewbauer/CoreSymbolication/pull/2 + ../patches/0001-Add-function-definitions-needed-to-build-zlog-in-sys.patch + ../patches/0002-Add-CF_EXPORT-To-const-symbols.patch + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out/include" + cp *.h "$out/include" + ''; + + meta = { + description = "Reverse engineered headers for Apple's CoreSymbolication framework"; + homepage = "https://github.com/matthewbauer/CoreSymbolication"; + license = lib.licenses.mit; + maintainers = lib.teams.darwin.members; + platforms = lib.platforms.darwin; + }; + }); +in +self: super: { + buildPhase = + super.buildPhase or "" + + '' + mkdir -p System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers + ln -s A System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/Current + ln -s Versions/Current/Headers System/Library/PrivateFrameworks/CoreSymbolication.framework/Headers + cp '${CoreSymbolication}/include/'*.h System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix b/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix new file mode 100644 index 000000000000..361e8df0f8d1 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix @@ -0,0 +1,17 @@ +{ lib, config }: + +self: super: { + preBuild = + super.preBuild or "" + + '' + platformPath=$out/Platforms/MacOSX.platform + sdkpath=$platformPath/Developer/SDKs + ''; + + preInstall = + super.preInstall or "" + + '' + platformPath=$out/Platforms/MacOSX.platform + sdkpath=$platformPath/Developer/SDKs + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/fetch-sdk.nix b/pkgs/by-name/ap/apple-sdk/common/fetch-sdk.nix new file mode 100644 index 000000000000..d96c27509dda --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/fetch-sdk.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchurl, + cpio, + pbzx, +}: + +{ + url, + version, + hash, +}: + +fetchurl { + pname = "macOS-SDK"; + inherit version url hash; + + recursiveHash = true; + + nativeBuildInputs = [ + cpio + pbzx + ]; + + postFetch = '' + renamed=$(mktemp -d)/sdk.xar + mv "$downloadedFile" "$renamed" + pbzx "$renamed" | cpio -idm + + # SDKs are inconsistent about whether MacOSX.sdk or MacOSX.sdk is a symlink. + src=Library/Developer/CommandLineTools/SDKs/MacOSX${lib.versions.majorMinor version}.sdk + if [ ! -d $src ]; then + src=Library/Developer/CommandLineTools/SDKs/MacOSX.sdk + fi + + # Remove unwanted binaries, man pages, and folders from the SDK. + rm -rf $src/usr/bin $src/usr/share $src/System/Library/Perl + + mkdir -p "$out" + cp -rd $src/* "$out" + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix b/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix new file mode 100644 index 000000000000..7d3897dc1dcc --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix @@ -0,0 +1,9 @@ +{ makeSetupHook, sdkVersion }: + +self: super: { + passthru = super.passthru or { } // { + privateFrameworksHook = makeSetupHook { + name = "apple-sdk-private-frameworks-hook"; + } ../setup-hooks/add-private-frameworks.sh; + }; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/passthru-source-release-files.nix b/pkgs/by-name/ap/apple-sdk/common/passthru-source-release-files.nix new file mode 100644 index 000000000000..cf23ea7214bc --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/passthru-source-release-files.nix @@ -0,0 +1,37 @@ +let + lockfile = builtins.fromJSON (builtins.readFile ../metadata/apple-oss-lockfile.json); +in + +{ + lib, + fetchFromGitHub, + stdenvNoCC, + sdkVersion, +}: + +let + sdkinfo = lockfile.${sdkVersion}; +in +self: super: { + passthru = super.passthru or { } // { + # Returns the raw source from apple-oss-distributions repo. + # This is mostly useful for copying private headers needed to build other source releases. + # + # Note: The source releases are mostly not used to build the SDK. Unless they can be used to build binaries, + # they’re not used. + sourceRelease = + name: + let + lockinfo = sdkinfo.${name}; + in + fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = name; + rev = lockinfo.rev or "${name}-${lockinfo.version}"; + inherit (lockinfo) hash; + } + // { + inherit (lockinfo) version; + }; + }; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/plists.nix b/pkgs/by-name/ap/apple-sdk/common/plists.nix new file mode 100644 index 000000000000..581635694a76 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/plists.nix @@ -0,0 +1,307 @@ +{ + lib, + stdenvNoCC, + xcodePlatform, +}: + +let + inherit (lib.generators) toPlist; + + Info = { + CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}"; + Type = "Platform"; + Name = lib.toLower xcodePlatform; + }; + + # These files are all based off of Xcode spec files found in + # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/PrivatePlugIns/IDEOSXSupportCore.ideplugin/Contents/Resources. + + # Based off of the "MacOSX Architectures.xcspec" file. All i386 stuff + # is removed because NixPkgs only supports darwin-x86_64 and darwin-arm64. + Architectures = [ + { + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (Apple Silicon, 64-bit Intel)"; + RealArchitectures = [ + "arm64" + "x86_64" + ]; + ArchitectureSetting = "ARCHS_STANDARD"; + } + { + Identifier = "Universal"; + Type = "Architecture"; + Name = "Universal (Apple Silicon, 64-bit Intel)"; + RealArchitectures = [ + "arm64" + "x86_64" + ]; + ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; + } + { + Identifier = "Native"; + Type = "Architecture"; + Name = "Native Architecture of Build Machine"; + ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; + } + { + Identifier = "Standard64bit"; + Type = "Architecture"; + Name = "Apple Silicon, 64-bit Intel"; + RealArchitectures = [ + "arm64" + "x86_64" + ]; + ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; + } + { + Identifier = stdenvNoCC.hostPlatform.darwinArch; + Type = "Architecture"; + Name = "Apple Silicon or Intel 64-bit"; + } + { + Identifier = "Standard_Including_64_bit"; + Type = "Architecture"; + Name = "Standard Architectures (including 64-bit)"; + RealArchitectures = [ + "arm64" + "x86_64" + ]; + ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; + } + ]; + + # Based off of the "MacOSX Package Types.xcspec" file. Only keep the + # bare minimum needed. + PackageTypes = [ + { + Identifier = "com.apple.package-type.mach-o-executable"; + Type = "PackageType"; + Name = "Mach-O Executable"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-objfile"; + Type = "PackageType"; + Name = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-dylib"; + Type = "PackageType"; + Name = "Mach-O Dynamic Library"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.static-library"; + Type = "PackageType"; + Name = "Mach-O Static Library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".a"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "archive.ar"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Identifier = "com.apple.package-type.wrapper"; + Type = "PackageType"; + Name = "Wrapper"; + DefaultBuildSettings = { + WRAPPER_SUFFIX = ".bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; + INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; + FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Identifier = "com.apple.package-type.wrapper.application"; + Type = "PackageType"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Application Wrapper"; + DefaultBuildSettings = { + GENERATE_PKGINFO_FILE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } + ]; + + # Based off of the "MacOSX Product Types.xcspec" file. All + # bundles/wrapper are removed, because we prefer dynamic products in + # NixPkgs. + ProductTypes = [ + { + Identifier = "com.apple.product-type.tool"; + Type = "ProductType"; + Name = "Command-line Tool"; + PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; + } + { + Identifier = "com.apple.product-type.objfile"; + Type = "ProductType"; + Name = "Object File"; + PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; + } + { + Identifier = "com.apple.product-type.library.dynamic"; + Type = "ProductType"; + Name = "Dynamic Library"; + PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_dylib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "dylib"; + DYLIB_COMPATIBILITY_VERSION = "1"; + DYLIB_CURRENT_VERSION = "1"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + CODE_SIGNING_REQUIRED = "NO"; + }; + } + { + Identifier = "com.apple.product-type.library.static"; + Type = "ProductType"; + Name = "Static Library"; + PackageTypes = [ "com.apple.package-type.static-library" ]; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "staticlib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "a"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + SEPARATE_STRIP = "YES"; + CLANG_ENABLE_MODULE_DEBUGGING = "NO"; + }; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + { + Identifier = "com.apple.product-type.application"; + Type = "ProductType"; + BasedOn = "com.apple.product-type.bundle"; + Name = "Application"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_execute"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "app"; + }; + PackageTypes = [ "com.apple.package-type.wrapper.application" ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + ]; + + ToolchainInfo = { + Identifier = "com.apple.dt.toolchain.XcodeDefault"; + }; +in +{ + "Info.plist" = builtins.toFile "Info.plist" (toPlist { } Info); + "ToolchainInfo.plist" = builtins.toFile "ToolchainInfo.plist" (toPlist { } ToolchainInfo); + "Architectures.xcspec" = builtins.toFile "Architectures.xcspec" (toPlist { } Architectures); + "PackageTypes.xcspec" = builtins.toFile "PackageTypes.xcspec" (toPlist { } PackageTypes); + "ProductTypes.xcspec" = builtins.toFile "ProductTypes.xcspec" (toPlist { } ProductTypes); +} diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix new file mode 100644 index 000000000000..840415d2e3b1 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix @@ -0,0 +1,46 @@ +let + removedDylibs = [ + # corecrypto is available under a very restrictive license (effectively: non-free, can’t use). + # Without the headers and not being able to use corecrypto due to its license, it’s not very useful. + # Stubs are included in the SDK for all dylibs, including corecrypto. They should be removed. + "/usr/lib/system/libcorecrypto.dylib" + ]; +in + +{ + lib, + jq, + libtapi, +}: + +self: super: { + nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [ + jq + libtapi + ]; + + buildPhase = + super.buildPhase or "" + + '' + echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}" + for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do + test ! -e usr/lib/$libSystem && continue # TODO: remove once the minimum SDK is 10.14 or newer. + tapi stubify --filetype=tbd-v5 usr/lib/$libSystem -o usr/lib/$libSystem # tbd-v5 is a JSON-based format. + jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} ' + if .libraries then + .libraries[] |= select(.install_names[] | any([.] | inside($libs)) | not) + else + . + end + | .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not) + ' usr/lib/$libSystem > usr/lib/$libSystem~ + mv usr/lib/$libSystem~ usr/lib/$libSystem + done + + # Rewrite the text-based stubs to v4 using `tapi`. This ensures a consistent format between SDK versions. + # tbd-v4 also drops certain elements that are no longer necessary (such as GUID lists). + find . -name '*.tbd' -type f \ + -exec echo "Converting {} to tbd-v4" \; \ + -exec tapi stubify --filetype=tbd-v4 {} -o {} \; + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix new file mode 100644 index 000000000000..f4d80eed0b49 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix @@ -0,0 +1,71 @@ +{ + lib, + cups, + darwin, + db, + libiconv, + ncurses, + stdenv, + stdenvNoCC, + xcbuild, +}: + +let + # CUPS has too many dependencies to build as part of the Darwin bootstrap. It’s also typically taken as an explicit + # dependency by other packages, so building only the headers (to satisfy other SDK headers) should be okay. + cupsHeaders = darwin.bootstrapStdenv.mkDerivation { + pname = "${lib.getName cups}-headers"; + version = lib.getVersion cups; + + inherit (cups) src; + + patches = cups.patches or [ ]; + + strictDeps = true; + + dontBuild = true; + + buildInputs = [ darwin.libresolv ]; # The `configure` script requires libresolv headers. + + # CUPS’s configure script fails to find `ar` when cross-compiling. + configureFlags = [ "ac_cv_path_AR=${stdenv.cc.targetPrefix}ar" ]; + + installTargets = [ "install-headers" ]; + + __structuredAttrs = true; + + meta = { + inherit (cups.meta) + homepage + description + license + maintainers + platforms + ; + }; + }; +in +self: super: { + # These packages are propagated only because other platforms include them in their libc (or otherwise by default). + # Reducing the number of special cases required to support Darwin makes supporting it easier for package authors. + propagatedBuildInputs = + super.propagatedBuildInputs or [ ] + ++ [ + libiconv + darwin.libresolv + darwin.libsbuf + # Required by some SDK headers + cupsHeaders + ] + # x86_64-darwin links the object files from Csu when targeting very old releases + ++ lib.optionals stdenvNoCC.hostPlatform.isx86_64 [ darwin.Csu ]; + + # The Darwin module for Swift requires certain headers to be included in the SDK (and not just be propagated). + buildPhase = + super.buildPhase or "" + + '' + for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'*; do + ln -s "$header" "usr/include/$(basename "$header")" + done + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix new file mode 100644 index 000000000000..441b36698688 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix @@ -0,0 +1,50 @@ +{ + lib, + pkgsBuildHost, + stdenv, + stdenvNoCC, +}: + +let + plists = import ./plists.nix { + inherit lib stdenvNoCC; + xcodePlatform = if stdenvNoCC.hostPlatform.isMacOS then "MacOSX" else "iPhoneOS"; + }; + inherit (pkgsBuildHost) darwin cctools xcbuild; +in +self: super: { + propagatedNativeBuildInputs = super.propagatedNativeBuildInputs or [ ] ++ [ xcbuild.xcrun ]; + + postInstall = + super.postInstall or "" + + '' + specspath=$out/Library/Xcode/Specifications + toolchainsPath=$out/Toolchains/XcodeDefault.xctoolchain + mkdir -p "$specspath" "$toolchainsPath" + + # xcbuild expects to find things relative to the plist locations. If these are linked instead of copied, + # it won’t find any platforms or SDKs. + cp '${plists."Info.plist"}' "$platformPath/Info.plist" + cp '${plists."ToolchainInfo.plist"}' "$toolchainsPath/ToolchainInfo.plist" + + for spec in '${xcbuild}/Library/Xcode/Specifications/'*; do + ln -s "$spec" "$specspath/$(basename "$spec")" + done + cp '${plists."Architectures.xcspec"}' "$specspath/Architectures.xcspec" + cp '${plists."PackageTypes.xcspec"}' "$specspath/PackageTypes.xcspec" + cp '${plists."ProductTypes.xcspec"}' "$specspath/ProductTypes.xcspec" + + mkdir -p "$out/usr/bin" + ln -s '${xcbuild.xcrun}/bin/xcrun' "$out/usr/bin/xcrun" + + # Include `libtool` in the toolchain, so `xcrun -find libtool` can find it without requiring `cctools.libtool` + # as a `nativeBuildInput`. + mkdir -p "$toolchainsPath/usr/bin" + ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool" + + # Include additional binutils required by some packages (such as Chromium). + for tool in lipo nm otool size strip; do + ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool" + done + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix b/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix new file mode 100644 index 000000000000..c771b2ccb9f5 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix @@ -0,0 +1,35 @@ +let + # This can be made unconditional once jq is available in the bootstrap tools. If corecrypto is not removed from + # the umbrella framework, linking will fail in stage 1 because it can’t find the tbd. + disallowedPackages' = builtins.fromJSON (builtins.readFile ../metadata/disallowed-packages.json); +in + +{ + lib, + jq, + stdenv, +}: + +let + disallowedPackages = + if jq == null then + lib.filter (p: p.package != "corecrypto") disallowedPackages' + else + disallowedPackages'; +in +self: super: { + # Remove headers and stubs for packages that are available in nixpkgs. + buildPhase = + super.buildPhase or "" + + '' + ${lib.concatMapStringsSep "\n" ( + pkg: + lib.concatLines ( + [ ''echo "Removing headers and libraries from ${pkg.package}"'' ] + ++ (map (header: "rm -rf -- usr/include/${header}") pkg.headers or [ ]) + ++ (map (framework: "rm -rf -- System/Library/Frameworks/${framework}") pkg.frameworks or [ ]) + ++ (map (library: "rm -rf -- usr/lib/${library}") pkg.libraries or [ ]) + ) + ) disallowedPackages} + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/rewrite-sdk-paths.nix b/pkgs/by-name/ap/apple-sdk/common/rewrite-sdk-paths.nix new file mode 100644 index 000000000000..0eca6b8836b3 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/rewrite-sdk-paths.nix @@ -0,0 +1,18 @@ +{ lib, sdkVersion }: + +let + name = "MacOSX${lib.versions.majorMinor sdkVersion}.sdk"; +in +self: super: { + # Rewrite the stubs to point to dylibs in the SDK instead of at system locations. This is needed for umbrella + # frameworks in older SDKs, which don’t also embed their stubs. + buildPhase = + super.buildPhase or "" + + '' + echo "Rewriting stubs to reference the SDK location in the store" + find . -name '*.tbd' -type f -exec sed -E \ + -e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/usr/|\1$sdkpath/${name}/usr/|g" \ + -e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/System/|\1$sdkpath/${name}/System/|g" \ + -i {} \; + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/common/run-build-phase-hooks.nix b/pkgs/by-name/ap/apple-sdk/common/run-build-phase-hooks.nix new file mode 100644 index 000000000000..9ab00665675d --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/common/run-build-phase-hooks.nix @@ -0,0 +1,9 @@ +{ }: + +self: super: { + buildPhase = '' + runHook preBuild + ${super.buildPhase or ""} + runHook postBuild + ''; +} diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json new file mode 100644 index 000000000000..66700bbc07ad --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -0,0 +1,1604 @@ +{ + "10.12.2": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-1mCJjZLBMIftcsKC7Ihhzi6LRS3u7kJzh9/dy6MY1Hg=", + "version": "60092.30.2" + }, + "IOAudioFamily": { + "hash": "sha256-5t3D44H/h0cUZqAjMi56BTbJD4o+R0xVdHJ1sZLYgNM=", + "version": "205.11" + }, + "IOBDStorageFamily": { + "hash": "sha256-4NpWcqfkp3UxhKKAwomDK3zxQ9DagyYFUVoUcrHo1Rg=", + "version": "18" + }, + "IOCDStorageFamily": { + "hash": "sha256-XOwdBFunLbwyasnTKQC6MRlXxGns07JvcAQc6AQ1Zt4=", + "version": "56" + }, + "IODVDStorageFamily": { + "hash": "sha256-bbGzqJnenEL9hRyKMBif/381/ETO+yNYHhlnXXWLne0=", + "version": "41.1" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-rhZdjNoZ3OuHVLClhe9tMQU6qJs3IOHEqJ5TaNRJRnM=", + "version": "424" + }, + "IOFireWireFamily": { + "hash": "sha256-adOI5uhd6QL4zpo4MK4ttmS1lcKseqmr68C1D/juGo0=", + "version": "465" + }, + "IOFireWireSBP2": { + "hash": "sha256-5UWldDuSyAnRYjgIKllY4VNbxtAUawrlRS46+8FnbPs=", + "version": "427" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-a/xnnR2dUSWVMyTlkxJPa7cWk20RHl0Zh2Ot2pSEkF0=", + "version": "252" + }, + "IOGraphics": { + "hash": "sha256-63XDVmEHu+KUdr06S7+RPi1BgLcAl4GZZRy+K96CvA0=", + "version": "513.1" + }, + "IOHIDFamily": { + "hash": "sha256-BUDj89w4DrnsIxJZNIx3ZJ85c22HMchIVhJI7xREWTM=", + "version": "870.31.1" + }, + "IOKitUser": { + "hash": "sha256-XJnOp5AtStXUim19GLev8MSM8iS5U8rRSnm7cNp/B80=", + "version": "1324.30.13" + }, + "IONetworkingFamily": { + "hash": "sha256-dL1wSu72uzAAoMdgSjitXgHviioVIGdkDXqwY6HT5/g=", + "version": "116.1.1" + }, + "IOSerialFamily": { + "hash": "sha256-ZcZ5F+a4u2AHThO5WyLn3/o42DR+YDBZKTy4P2EhHhk=", + "version": "91" + }, + "IOStorageFamily": { + "hash": "sha256-IjsG/lgdtW04WH/5rb1QAT563Oy4O5fUrTGuA1kBrkY=", + "version": "210.30.1" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-wyt5CJnNzk0MPC6pg2JAdiwIPxWFJsO9Yqa83vY+hLc=", + "version": "1158.30.7" + }, + "Libinfo": { + "hash": "sha256-3Mu9lOkaQx5gmNPXzr67FnZvKWmQhryIPsN6k95TU18=", + "version": "503.30.1" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-msGtbR53SHXjYN8i74gmkYWGkmqg+TcRO7TY/23XSFQ=", + "version": "165.20.1" + }, + "Librpcsvc": { + "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", + "version": "26" + }, + "Libsystem": { + "hash": "sha256-FwI2aD3wSwES/sKkr014BdFLfsKeEefgS0Pne1FGOp0=", + "version": "1238" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-Ya+ZO3bHNhQ+vZZx/lE7x+uMROHYWYKvm2ZZ1vClu3Q=", + "version": "57740.31.2" + }, + "architecture": { + "hash": "sha256-gHUfKWc1uahI/IATafY1ppPAWnYUghOEXWK2lknAfrQ=", + "version": "268" + }, + "configd": { + "hash": "sha256-i1UjnU7xBh7jCrGZxWMGrldzDrk2dDvjpthp/kq9OKo=", + "version": "888.30.2" + }, + "copyfile": { + "hash": "sha256-pth+37uTfuFY94HuA4b/5GleDjidAuXVsBEQBUa3xCE=", + "version": "138" + }, + "dtrace": { + "hash": "sha256-dK0N3l02241A5S1uvxZhqArHrTxd5Sd4JoAl6RBa8/8=", + "version": "209.20.4" + }, + "dyld": { + "hash": "sha256-wyVsmqYgKLdMKZsLOHzOLag+mBnH0kNS6XAv4zuNTT4=", + "version": "421.2" + }, + "eap8021x": { + "hash": "sha256-XSbzuNXyDJAADcnZed4Akmg1SK8P1IGrZitmhV3wzlo=", + "version": "246.30.1" + }, + "hfs": { + "hash": "sha256-7ByUP59FXmmrxC5yJYUQxrkgt/vY7vZMl5JPQ0HfoS8=", + "version": "366.30.3" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-hfXKQDRdgEDVyT+3v/EuQZyXNd0abD2tICYdQNfhtwY=", + "version": "67" + }, + "libdispatch": { + "hash": "sha256-tj4+6V4FL/XVON13UH71schElTm4/IKtPJH/yoUgRY0=", + "version": "703.30.5" + }, + "libmalloc": { + "hash": "sha256-q9zcUy8YTsRds6RYJMIUIY/MULQ19uKiNduMXP3D7hA=", + "version": "116.30.3" + }, + "libplatform": { + "hash": "sha256-k9Pd+TJCrNS7K100og+6bLAZjV/0VUTy8SIOsc+SE6Q=", + "version": "126.1.2" + }, + "libpthread": { + "hash": "sha256-FJaJO4lXIMAIwEmVF6mHE4ZZZoPI8ZIVuMKLojEsESE=", + "version": "218.30.1" + }, + "mDNSResponder": { + "hash": "sha256-LYDkkmgyfWKK6AMINXyrXo5kw7+lxUcz+4Ckq9175vA=", + "version": "765.30.11" + }, + "objc4": { + "hash": "sha256-WfhJo+/KPGr3/OuV5Kg2no48UR7VVVarh9TB3VFSCQ4=", + "version": "706" + }, + "ppp": { + "hash": "sha256-eW62wL8C1GZ2+5aN0dTPsdoEu6FWf+6XEYv8OiEeMfY=", + "version": "838" + }, + "removefile": { + "hash": "sha256-EJYU6eHggyRsezClEWkGJmgePIdtyF4rpFD4kSK5Czw=", + "version": "45" + }, + "xnu": { + "hash": "sha256-pkELzbsWPtm9H31LaRkaVjkQpPDxG9E93TNS+K9nqhE=", + "version": "3789.31.2" + } + }, + "10.13.2": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-3vx4HPlHP8PNi1GodeRh2iOEhyRBct3vX0Guc8060+I=", + "version": "60118.30.2" + }, + "IOAudioFamily": { + "hash": "sha256-UG09Dc+up5cJKDHPpCmo11IsBchqZ72hVBPx8y+1klw=", + "version": "206.5" + }, + "IOBDStorageFamily": { + "hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=", + "version": "19" + }, + "IOCDStorageFamily": { + "hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=", + "version": "58" + }, + "IODVDStorageFamily": { + "hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=", + "version": "42" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-4JS+oezknezxud2E2ojYdSx7A8Z9Q4rddetAoUMU1es=", + "version": "425" + }, + "IOFireWireFamily": { + "hash": "sha256-+FPlhMN2h1iCg1GAqH8+MwHG3GIs4DvvE3QGABX+3Rg=", + "version": "468" + }, + "IOFireWireSBP2": { + "hash": "sha256-5UWldDuSyAnRYjgIKllY4VNbxtAUawrlRS46+8FnbPs=", + "version": "427" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-a/xnnR2dUSWVMyTlkxJPa7cWk20RHl0Zh2Ot2pSEkF0=", + "version": "252" + }, + "IOGraphics": { + "hash": "sha256-E0wDkVmSeEcyO6L6OeWEQuZ0Ggh7MUkfqeQ9uLUEK/g=", + "version": "517.22" + }, + "IOHIDFamily": { + "hash": "sha256-9FhH53LyP1Yv2/afmr/lpNhl/GNFb/Yg+VpG5Ycg300=", + "version": "1035.30.15" + }, + "IOKitUser": { + "hash": "sha256-LebulFJ4KJ5Vbcjj6SC70cmed/0vhCVYo5qDxCw85SE=", + "version": "1445.31.1" + }, + "IONetworkingFamily": { + "hash": "sha256-gXGFCSn6JnHOVaRKhGXFYdvJBo/AGBMDrUdIcw/CwqI=", + "version": "124.30.1" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-Jo+0XlNi82KGksyrvUGyVPfmPMlTrDmZ75DT2lH66TY=", + "version": "218.30.1" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-js2xU5dMF5j209F9Cufuq5WzqcyNusbJDyuPpMgYEZU=", + "version": "1244.30.3" + }, + "Libinfo": { + "hash": "sha256-pVVLb8eOuLVc4HHGcgpl7dqT+Tg2xqKQIQroyLj5OEg=", + "version": "517.30.1" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-nsWWqelTEP4nPJI3vG897zpSOxYOgpm8TUVJ04MrWU4=", + "version": "172" + }, + "Librpcsvc": { + "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", + "version": "26" + }, + "Libsystem": { + "hash": "sha256-+VFJoiqEtXUcP8ERUxtrKwTWZmgdppr+0oPUxSgIF+c=", + "version": "1252" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-W3bSTDCjj2ftq0wbDp+Z8QfD6TpF4p0fLrVjx2AmvfY=", + "version": "58286.31.2" + }, + "architecture": { + "hash": "sha256-gHUfKWc1uahI/IATafY1ppPAWnYUghOEXWK2lknAfrQ=", + "version": "268" + }, + "configd": { + "hash": "sha256-1YGIbAES4OONFtC2xxXWbM7Htlz2kKtFUULWqBB6fz0=", + "version": "963.30.1" + }, + "copyfile": { + "hash": "sha256-CYTZwieSu1Fm9TLaaevfxDngAPRkEfewY+TgJrREed8=", + "version": "146.30.2" + }, + "dtrace": { + "hash": "sha256-sgLSbCp9tYZ7ws2jgxB3NaAk+ijsIbmybsi0gkbZjFQ=", + "version": "262" + }, + "dyld": { + "hash": "sha256-b1hM+iQl7ihRjHRL4Rcg5AHv5HSyKErVkTb+5KFF2P4=", + "version": "519.2.2" + }, + "eap8021x": { + "hash": "sha256-KZsnzH5JiLfzY3zjMAlJRPCGY5EioW6aDJnMAemZJUY=", + "version": "264.30.3" + }, + "hfs": { + "hash": "sha256-Ine8EFpW1kuNDn/r66abGyvYm+NSGI5TV3v/OlgyIME=", + "version": "407.30.1" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-hfXKQDRdgEDVyT+3v/EuQZyXNd0abD2tICYdQNfhtwY=", + "version": "67" + }, + "libdispatch": { + "hash": "sha256-rvsvtv9VncLxQHoURBBczrTaSgbw5827Qf2TxAPopqA=", + "version": "913.30.4" + }, + "libmalloc": { + "hash": "sha256-VM5jHQYqDkoGmrQ2UugTu+XOLjd1YPqdfddzQkKfhiY=", + "version": "140.1.1" + }, + "libplatform": { + "hash": "sha256-zQ3MYqQoMCsfgG6frwnG3LfKWwauTzgwhoADXVUiGR0=", + "version": "161.20.1" + }, + "libpthread": { + "hash": "sha256-6NLKbnBXikSfqz0ZWF6MOIq/bQK/CmfQNvkNXCU6lcw=", + "version": "301.30.1" + }, + "mDNSResponder": { + "hash": "sha256-anzilyXeGh8LL3cYvuLRdqGzhHUvSp9eILJWAltL18M=", + "version": "878.30.4" + }, + "objc4": { + "hash": "sha256-+4o+EzD0YQhgfTg/W9SbVDol7wWUIFxVAVTGg4OVfHQ=", + "version": "723" + }, + "ppp": { + "hash": "sha256-eUIFlYHsAPRrBS0TpTP1/TacaK8h/5QM2Xl1T46MdWc=", + "version": "847" + }, + "removefile": { + "hash": "sha256-EJYU6eHggyRsezClEWkGJmgePIdtyF4rpFD4kSK5Czw=", + "version": "45" + }, + "xnu": { + "hash": "sha256-x2k0KyNk4mIodXfYDHjaCKR1CsiE3HYBNN6p5SfGIMU=", + "version": "4570.31.3" + } + }, + "10.14.6": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-hqsLaS7LEPu8t/bNuV4VUUbMteCetf3/o8e2X0iQvOo=", + "version": "60118.250.2" + }, + "IOAudioFamily": { + "hash": "sha256-UG09Dc+up5cJKDHPpCmo11IsBchqZ72hVBPx8y+1klw=", + "version": "206.5" + }, + "IOBDStorageFamily": { + "hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=", + "version": "19" + }, + "IOCDStorageFamily": { + "hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=", + "version": "58" + }, + "IODVDStorageFamily": { + "hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=", + "version": "42" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-EXGpObJVC0b9X3xxEXJScDlM6xygmK3MoCbng21XCmg=", + "version": "426" + }, + "IOFireWireFamily": { + "hash": "sha256-a8zEWhwQTzgGKg75RBmDXb1pgJr602IxnPBTFkKEqSM=", + "version": "473" + }, + "IOFireWireSBP2": { + "hash": "sha256-lpYBTL9TzreyxJn4J3vfuXoWMH/4y8FnNKk5YiuDgHI=", + "version": "433" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-4Y+5+5cJtolSrM3AUnnhSBS3RrKXbg9Kh1ynmllOA2E=", + "version": "252.250.2" + }, + "IOGraphics": { + "hash": "sha256-QFT+h0gtc7SUf0HNciknG0aMOQXnsWCR25C04dgK1/A=", + "version": "530.66" + }, + "IOHIDFamily": { + "hash": "sha256-DpYcxGLvk10iz5TG2SO8R+5obEJv+zLK56RzA/pH0KA=", + "version": "1090.270.6" + }, + "IOKitUser": { + "hash": "sha256-QH2m6BCYtO2JDksH0TebrEldjjZdC4U9otVu/uUoyWY=", + "version": "1483.260.4" + }, + "IONetworkingFamily": { + "hash": "sha256-M01+Bhf7CTJMA7StjSRFW6ffq7Qf/IOh7aM+JI3ONe8=", + "version": "129.200.1" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-X6s/IyApMQ7zo1wO7IpIk1e94tSsmvvT+fZHThMWv5Y=", + "version": "218.260.1" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-mhhs8U/oZku9o2kqzLW4K8Xv9QbnKNBbBr+Q6NqC1vQ=", + "version": "1272.250.1" + }, + "Libinfo": { + "hash": "sha256-DUbyWZI+n3WvftlI7aj60CoEHb9y18H1+FYiYQroVEE=", + "version": "517.200.9" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-q0ns85I9Zwo5bZPN5JqjrJofY8/XLl+mbsRhyF1kx+o=", + "version": "172.200.21" + }, + "Librpcsvc": { + "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", + "version": "26" + }, + "Libsystem": { + "hash": "sha256-Lo4S7fsepuYlRtXGcVvNTAlx/soabjvKEUuiO09htNs=", + "version": "1252.250.1" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-uqSRU4Ft7+zMQ59FBS+Mu2JcWdbbuWP9/dFfo+Vkr5s=", + "version": "58286.270.3.0.1" + }, + "architecture": { + "hash": "sha256-WGUNtFSBu9AuefHVEO3uB/JpKEGAgGFX/zRaaW4eYbI=", + "version": "272.230.1" + }, + "configd": { + "hash": "sha256-Pg58INpZfdKXn1EPut2Kzghfjwxaz1Ex+u5KACA2O7g=", + "version": "963.270.3" + }, + "copyfile": { + "hash": "sha256-gbxGQ8Wjt20++Bf+BkZT/R5dpsCnRo8+qUcerv5m7V8=", + "version": "146.250.1" + }, + "dtrace": { + "hash": "sha256-ZbAaH2wmYlgLKtq0bpDoEInZiHMe5Bx84iUQC67ia0E=", + "version": "284.250.4" + }, + "dyld": { + "hash": "sha256-5wtx+4pSAcNEwcE024XwIRorS3ZW/qmvfkY7UGe75ho=", + "version": "655.1.1" + }, + "eap8021x": { + "hash": "sha256-9j+6Hw7w9wdLZxjdRwTACws2obg2/VCgl9ed4+Y4pPg=", + "version": "264.250.6" + }, + "hfs": { + "hash": "sha256-/yf6z0VJkw2pPnVst2qgnSZfO6x9ot/cWT7Aewo3IZ4=", + "version": "407.200.4" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-NHK+yc7M/wc6Sbk24LDejNjBrbcWIg9zrYHlnPXC/Yc=", + "version": "73" + }, + "libdispatch": { + "hash": "sha256-b0WqX3qX/qhUi2l63BrNvaVq167SuIgYGPid92MJ32U=", + "version": "1008.270.1" + }, + "libmalloc": { + "hash": "sha256-1ZvO0LGV4AkDSdtwqfPFgCUbpAVzfKS0msa58tL2WLA=", + "version": "166.251.2" + }, + "libplatform": { + "hash": "sha256-xQqCf+/DpHu/JMbmOpy6jl3np0H7/m1NKWZ21YWaerE=", + "version": "177.270.1" + }, + "libpthread": { + "hash": "sha256-+AuYgLTM5RO3+MbxeE86rPh9WbiTiAl2gHZOAaQRkec=", + "version": "330.250.2" + }, + "mDNSResponder": { + "hash": "sha256-SlrC3LIOndY1DVJ26bnuYQwpLhkV1PHAMJeaE3bMDI4=", + "version": "878.270.2" + }, + "objc4": { + "hash": "sha256-rzDiOE//rUnRyCHM/XUQs9IImKGIFN/0D0IZ7SeGp2s=", + "version": "756.2" + }, + "ppp": { + "hash": "sha256-a0zTwevtC+AAyLV/0+rX9VN5BXc2vaZGArz83VZtiWs=", + "version": "847.200.5" + }, + "removefile": { + "hash": "sha256-23+ivRTPKId9Is5NAwYmVgN7TX2+7v9NONs9u7DrGH4=", + "version": "45.200.2" + }, + "xnu": { + "hash": "sha256-ZRgj214Mmvvcji4OdzRjK/7Xtpz7r69SFmzSvtZNhNU=", + "version": "4903.270.47" + } + }, + "10.15.6": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-HKSRtTnJ6dH5j6Y+PRDQUcPyjwR70PEbRQu3hTM4G0A=", + "version": "60165.120.1" + }, + "IOAudioFamily": { + "hash": "sha256-5lcK8nyjayLBw9j4PPVs8TWwOWcpggKkSXefVGl2rfA=", + "version": "300.2" + }, + "IOBDStorageFamily": { + "hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=", + "version": "19" + }, + "IOCDStorageFamily": { + "hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=", + "version": "58" + }, + "IODVDStorageFamily": { + "hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=", + "version": "42" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=", + "version": "428" + }, + "IOFireWireFamily": { + "hash": "sha256-hLtd3d5qOsYdnGpMaTSipu9bOIYEHz2rKzNAoJai4dI=", + "version": "475" + }, + "IOFireWireSBP2": { + "hash": "sha256-pHY6okHHotfFjdNsLwRjQX7dWGolBelpD7MEDz4lafY=", + "version": "434" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-Jb70fanuJTNV4IVoKMtMA66oVDR0I/h3JSIymhlKTQU=", + "version": "257" + }, + "IOGraphics": { + "hash": "sha256-sKnJ0MOhT+dFfmMD2gqYmySufh0I9vBI/swjqoCbSHc=", + "version": "576.1" + }, + "IOHIDFamily": { + "hash": "sha256-esiEGEiggFMR7rha6+dYaqiwGM+TlZtLBe8LF/PF0D8=", + "version": "1446.140.2" + }, + "IOKitUser": { + "hash": "sha256-rB5zfJwoBPMpqW5PDM6ppWW07Y2AGS3f0UzXdfPGYYE=", + "version": "1726.140.1" + }, + "IONetworkingFamily": { + "hash": "sha256-T+aDA++nubTHdPpfdAEm6077eJuzsQXHUDEbdlthVBQ=", + "version": "139.140.2" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-vyIN7oru2PN7C4a6RBJomlYs4NaYzmCTBEuWiSXG41M=", + "version": "238.120.1" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-FAifkHs2Kls2ym9/M56o4u2UZfdTKCnqxRbTXOIHyz8=", + "version": "1353.100.2" + }, + "Libinfo": { + "hash": "sha256-syTH8dhWkSPgqRG7p528L7Xx1+ymmqHrCyhUykGhK9s=", + "version": "538" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-7o4GNZde3MkCks2NJdNIXvvtMAOqGEA05M7S8o7j0XQ=", + "version": "241.100.2" + }, + "Librpcsvc": { + "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", + "version": "26" + }, + "Libsystem": { + "hash": "sha256-RNkaoaRl6akbrgjagLd+ncZ2EAdjegIdy7Z/MINoTpc=", + "version": "1281.100.1" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-dlNTEVkgTl3po7ty2wjatGTANBwegpZxBX1ByneqKRU=", + "version": "59306.140.5" + }, + "architecture": { + "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=", + "version": "279" + }, + "configd": { + "hash": "sha256-nKFDfyH1gQtFyda6HBq3E7Tp5EI4O5n/9GYQEFhMIdE=", + "version": "1061.141.1" + }, + "copyfile": { + "hash": "sha256-nEfD/KUk7e32tw9buQYrsy/BAdAfgE9IObdV4nCm37M=", + "version": "166.40.1" + }, + "dtrace": { + "hash": "sha256-dgJ7om5efUQyc9tP6cBeSpahORqV5bzEDcxcVu4TaDg=", + "version": "338.100.1" + }, + "dyld": { + "hash": "sha256-YkFazM/cviJMwPVXHXP2irfgHtOueI2RNrMedWvkH0A=", + "version": "750.6" + }, + "eap8021x": { + "hash": "sha256-/FsmD4mk/kwsocK8x8Gsk3yOBW3pZLcGHxnNcogqjhY=", + "version": "292.40.2" + }, + "hfs": { + "hash": "sha256-vNo2Wd0n6tjG+xtA3OrwB/TOXvLxaLehEY/l9ZBS5Sw=", + "version": "522.100.5" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-A3QTD6bqUy8ahH/XlMuidYNvT92ufeVpwPsZh4ZzQdk=", + "version": "74" + }, + "libdispatch": { + "hash": "sha256-gd56s0C2dKbZoaGNXt3LBfXaEl5A744djFq3G9uoWws=", + "version": "1173.100.2" + }, + "libmalloc": { + "hash": "sha256-1VhkXY8m6vVQ4aaxICtHVQtXDHNV2CsY9UUst0AioMY=", + "version": "283.100.6" + }, + "libplatform": { + "hash": "sha256-Z4Lj9efT1bt6HMAMQvgMc33QdYzrBvieBjmw4W6H9YI=", + "version": "220.100.1" + }, + "libpthread": { + "hash": "sha256-ZHxqq1qVRXPL0psAX+5bcuA5D/FjJnIcm+ctTkTGBJA=", + "version": "416.100.3" + }, + "mDNSResponder": { + "hash": "sha256-CV3GBeO4Ly8/PbZ7Fq55diRzB00VsB2uTvjGo/tqf10=", + "version": "1096.100.3" + }, + "objc4": { + "hash": "sha256-AJwPTnjJMBbSFDppvKyx92RdfmbmwQOvPnU0E0mU+jU=", + "version": "787.1" + }, + "ppp": { + "hash": "sha256-DNmDigQqDKR1ghcn6GaKeDldp6thH2C6+uZKjC3EfkU=", + "version": "862.140.2" + }, + "removefile": { + "hash": "sha256-bkxiq7OEFtEFPwSBi4OxmpRyKWYgeMhnokFfS7RPUnU=", + "version": "48" + }, + "xnu": { + "hash": "sha256-Y/DTtpnT8JQZO5Ijr+tW0IrIOuECcJ+ZvFLCgwrFt2M=", + "version": "6153.141.1" + } + }, + "11.3": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-92v9tuNLqvalwYV4AqQllA8yN9fqGjSpc4MNAmFPrbk=", + "version": "60178.100.1" + }, + "IOAudioFamily": { + "hash": "sha256-dSSbt9ZoL/Tq2xXwvvXsDmD3Xru7igzdK1MxGL1K+Aw=", + "version": "300.6.1" + }, + "IOBDStorageFamily": { + "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", + "version": "20.100.1" + }, + "IOCDStorageFamily": { + "hash": "sha256-w0YhZ38RBfnxSc74Q8r5UdK+WiWOSAX46r5hahHLnSg=", + "version": "59" + }, + "IODVDStorageFamily": { + "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", + "version": "43" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=", + "version": "428" + }, + "IOFireWireFamily": { + "hash": "sha256-2xppN8RJ9cxrHWjPQ4bUIjtupPbzfmrm3rXnT/9QVfc=", + "version": "483" + }, + "IOFireWireSBP2": { + "hash": "sha256-kfhmZy8veqI3/XHDtOTKmKj6P7s+j0B+BiAbcjhGq0M=", + "version": "442" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-WDq2Ak72Jw6gYNIKgZkiexA6LzccrPn1kpSbW5U50ek=", + "version": "257.40.1" + }, + "IOGraphics": { + "hash": "sha256-kEP4RWIZwu3ZPIq9IAPUKM0gIXHr8xD50SnGNFCQRcI=", + "version": "585.1" + }, + "IOHIDFamily": { + "hash": "sha256-QASfvttke+AUx55In4DD4vsQGzC3nbe+MugQQ4ddXGU=", + "version": "1633.100.36" + }, + "IOKitUser": { + "hash": "sha256-NQCRrufElx00B7CqqslBi5BTxf5Zs4lcMcJig4Eab0k=", + "version": "1845.100.19" + }, + "IONetworkingFamily": { + "hash": "sha256-HqTKzrX75mMFYYbxNKwPdXmI7h7t/QWuO3W1Qo//zIo=", + "version": "151.40.1" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-dy6CYz/z6SwPw0YfC6GLZO2u62Xy8otMDUNrZ5JhTDY=", + "version": "260.100.1" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-v01g/EtMW/STZQ1neKDMyUGL7sgaCzlwXN0VDaj/Mf0=", + "version": "1439.100.3" + }, + "Libinfo": { + "hash": "sha256-T7KO6zfswjyTIKSdZJCbvfsdqQfPMLj5nheX9iSIl9o=", + "version": "542.40.3" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-vcDjdwB5OiTEUdl8ISezzpoHeFttkdvkulY/YbUOZjk=", + "version": "279.40.4" + }, + "Librpcsvc": { + "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", + "version": "26" + }, + "Libsystem": { + "hash": "sha256-24T9aD4W71prcpr3MnnaU3pfxIzIwkOz39OyhCwPO/E=", + "version": "1292.100.5" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-o5MyyqDpERvNPvbEfXNgqMIq0YpQV0+ju72C9g/9OdI=", + "version": "59754.100.106" + }, + "architecture": { + "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=", + "version": "279" + }, + "configd": { + "hash": "sha256-WEorIW5Vl8E9/aB0RBTY2bhkfVOF3tckjNztGDOOueA=", + "version": "1109.101.1" + }, + "copyfile": { + "hash": "sha256-3BHFM67dvwUpinzF0pSX3QiUbIsqtLo77WzB3tMbTW4=", + "version": "173.40.2" + }, + "dtrace": { + "hash": "sha256-FfyaYjEMDeL9wGdUyZ4eJdkbkp/WpdTGyBvaorwKSi8=", + "version": "370.40.1" + }, + "dyld": { + "hash": "sha256-dtDTh6YqubBI4Z+QeytwGgUmU6tutvonIWHqzw6zuxo=", + "version": "851.27" + }, + "eap8021x": { + "hash": "sha256-Ap7qumn/oKYe424n2NW6QkuivgDyLoJgDfl30Q5O7Jo=", + "version": "304.100.1" + }, + "hfs": { + "hash": "sha256-MSnc1pB8DcB+mn308snTD1uRQ7Ro4aWyFuLdWjHtAG4=", + "version": "556.100.11" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-UgmMnDUosaC2yI7IyQ7mkNwZ6/oft77ay+SmGSoycIw=", + "version": "79" + }, + "libdispatch": { + "hash": "sha256-K8QL9NfjGsj8c0jbocKegmKBqydimpKu8yRXnQQqdH8=", + "version": "1271.100.5" + }, + "libmalloc": { + "hash": "sha256-k3dJk7S0Lom3B28vRI9QxIuo0AOkd9OHzWO7MandfUw=", + "version": "317.100.9" + }, + "libplatform": { + "hash": "sha256-BSIGgKj5B6Dr0KQiIl2LSA3+ZEhzk/snQeCauErcq6k=", + "version": "254.80.2" + }, + "libpthread": { + "hash": "sha256-cGaDXLTztUYppbMvv41qj5RqONXfhfdHpt9dqY6+5Lc=", + "version": "454.100.8" + }, + "mDNSResponder": { + "hash": "sha256-eqcv174vIwWYXrIhzph+KO1zG8TdK5jRFVgsaAlV9es=", + "version": "1310.100.10" + }, + "objc4": { + "hash": "sha256-rqOPyN9S4KbMhCCVvtyEmGxTWzy+tsh0kfu3k47szXo=", + "version": "818.2" + }, + "ppp": { + "hash": "sha256-pSOlu/yXQhopCHDLnmhUnQeU89MkXhkQB0ZrN9r3qyk=", + "version": "877.40.2" + }, + "removefile": { + "hash": "sha256-B79A9AQ1/cB+zlmVKWcEXVOJHW6rOrX40S/hrMuWqXU=", + "version": "49.101.1" + }, + "xnu": { + "hash": "sha256-M1XWippH55VUJu4aosRFX8j9aOm/PONYVjPZOPufD80=", + "version": "7195.101.1" + } + }, + "12.3": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-HTGBUE6vHjS80CFTiIQ8F17m8Yd2ZRHccvFu2CA2P9U=", + "version": "60191.100.1" + }, + "IOAudioFamily": { + "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=", + "version": "340.2" + }, + "IOBDStorageFamily": { + "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", + "version": "22" + }, + "IOCDStorageFamily": { + "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", + "version": "61" + }, + "IODVDStorageFamily": { + "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", + "version": "43" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-ruAomp5Lv7zuPu9vHsNKoPtDvD1AIrRARsPMpcx/fh0=", + "version": "430" + }, + "IOFireWireFamily": { + "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", + "version": "487" + }, + "IOFireWireSBP2": { + "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", + "version": "445" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", + "version": "260" + }, + "IOGraphics": { + "hash": "sha256-lzxBrPLlF01+2jFKRJtSnwpf0r05C0H3tM7Q0N1RUPA=", + "version": "594" + }, + "IOHIDFamily": { + "hash": "sha256-EQQHAS8WKUoTxZscixylc2ZMoD4UYBlHRUj2O7Ikgac=", + "version": "1787.100.13" + }, + "IOKitUser": { + "hash": "sha256-Cdfa/YXM0W4O15femcU0G1Xcpbm+iADWIBWIdzoeuTE=", + "version": "1955.100.5" + }, + "IONetworkingFamily": { + "hash": "sha256-odUZJQq8lb3UYk7F8dBi1Hds00M+kwdlyGwZkVkSwTg=", + "version": "160.100.2" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-2b32qe1z7Z+Od1dVlAGdM142DdF8cBaRC+ElysSuAQ4=", + "version": "290.100.6" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-obalDxsbE+7gm7YwznUbfxL7MCriamQFP3DrXleNwU4=", + "version": "1507.100.9" + }, + "Libinfo": { + "hash": "sha256-OjnnSHEcifcWarVyXiHvYg/9jbCQy5/lzaq6fJRriy0=", + "version": "554" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-JXG0kHEdoIs6krVZ4+KsRVES4AuNjnQi8qF+XKSp5jE=", + "version": "301" + }, + "Librpcsvc": { + "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", + "version": "26" + }, + "Libsystem": { + "hash": "sha256-mPPAxo67wWLtemO+PuKg1Ui0zKEfjnYVj/qX1/0kNBs=", + "version": "1311.100.3" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-cIqfXcfQOZonxaKndH80xC5YmmveHw+TxHOxqvc9u8I=", + "version": "60158.100.133" + }, + "architecture": { + "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", + "version": "280.100.2" + }, + "configd": { + "hash": "sha256-X34mjXdil4HeBLyqY4tyBWdmpjsOFTJDdDE81UQf708=", + "version": "1163.100.19.0.2" + }, + "copyfile": { + "hash": "sha256-3/zI3j/m9b13hebjCsOLry3Mf8ADdWJgrtQOdD0huG0=", + "version": "180.100.3" + }, + "dtrace": { + "hash": "sha256-q8H6slCN4RwJ5TxC5s3og6cIbjALySP5ODfVw6a/a+M=", + "version": "375" + }, + "dyld": { + "hash": "sha256-v1kk/Z3eI2sufNm2rx3FRbA/f9BeKJ3t9i9W7tTksXg=", + "version": "955" + }, + "eap8021x": { + "hash": "sha256-SayP1d2KWoRShykBA/NrQCuRnPoxlTiaLwifoqm0Gkg=", + "version": "315.100.2" + }, + "hfs": { + "hash": "sha256-q1yOIei98oudGAoBMNPRTV5EOYpXFL7iYmlCYsKsG0o=", + "version": "583.100.10" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-Ez75a0m+fJas7mGqFeDjjpc7sFDnyirRbtLMTYQDVxw=", + "version": "79.1" + }, + "libdispatch": { + "hash": "sha256-/VbSUtnWyToWOUyAAg/3wImbJ2w5k1tbJkt827x2lIE=", + "version": "1325.100.36" + }, + "libmalloc": { + "hash": "sha256-tyYce5nk0N923MbzoGzkGqunoKwArbTiZl8PCppYpso=", + "version": "374.100.5" + }, + "libplatform": { + "hash": "sha256-JUD2NdS310OhZ0F8gnOvoD8AgEtWRtPahKDw5iE2QJU=", + "version": "273.100.5" + }, + "libpthread": { + "hash": "sha256-al8QumtH7/D04oJ4LUSYW+6OdX0Ko3S3rwYU53n9/54=", + "version": "486.100.11" + }, + "mDNSResponder": { + "hash": "sha256-hsV0VYTPoO5YpaxrUXpXFy97LxlERzrQT0FRfCMOwic=", + "version": "1557.101.2" + }, + "objc4": { + "hash": "sha256-MKXnfZL46VtmAQMolqd7ATF9fYjCNstapGQfcH4uVwo=", + "version": "841.13" + }, + "ppp": { + "hash": "sha256-YyCE19T3rcM1G5jdXuYXuBXblJgR/nelvjpq+9maMhw=", + "version": "884" + }, + "removefile": { + "hash": "sha256-xF1VtTUhoiGsFQsvuFnFYemwiCdsKeriFJv51vRLqmw=", + "version": "60" + }, + "xnu": { + "hash": "sha256-bfFmDfRBSvoWMdQYVstsJRbcq+15lDjVFqk+0XYWpy8=", + "version": "8020.101.4" + } + }, + "13.3": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-tftAQbs5xIOc5VZLVAKXAUvle9WO/i33/pQ3D64l/yI=", + "version": "600016.100.4" + }, + "IOAudioFamily": { + "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=", + "version": "440.2" + }, + "IOBDStorageFamily": { + "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", + "version": "22" + }, + "IOCDStorageFamily": { + "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", + "version": "61" + }, + "IODVDStorageFamily": { + "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", + "version": "43" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=", + "version": "431" + }, + "IOFireWireFamily": { + "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", + "version": "487" + }, + "IOFireWireSBP2": { + "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", + "version": "445" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", + "version": "260" + }, + "IOGraphics": { + "hash": "sha256-KubCz8DNwf1WuF7LrtARM2VJugFDP0wfHoUhnIz/faQ=", + "version": "596.1" + }, + "IOHIDFamily": { + "hash": "sha256-7UFMBdF5k9aVFVuoL2riozzKmn8uOt87Aitt8j6XkN8=", + "version": "1915.100.21" + }, + "IOKitUser": { + "hash": "sha256-hgFRHPAuoqSf6aRUBUyfU2y2+dBUA34DKwLHLwhPNms=", + "version": "2022.100.19" + }, + "IONetworkingFamily": { + "hash": "sha256-SwZvXLSB9cMHssZU4dCogGVoV64qYdGN1CGYV3FZ6tk=", + "version": "170" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-g4oCrxM5VtHm8h1M+zM81Ar1LsaaiJZLej5fT8EHPG4=", + "version": "302.100.1" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-dqbdWtBuaRq3IHnSUPH2aj8h/X4zCwUNSOeSdwfKvN8=", + "version": "1534.100.14" + }, + "Libinfo": { + "hash": "sha256-iUyndeUXx7FFZ/jgJ6jRwda3IChOaMs4dZW/ISuAJ1E=", + "version": "564.101.1" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-7AwTfogvCUMdoabxf413ENWXtFTOM6AUldccoPQ89sU=", + "version": "312" + }, + "Librpcsvc": { + "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", + "version": "31" + }, + "Libsystem": { + "hash": "sha256-IIksf0yCg3GdME3HofYzD1MRC+ofsPhHcxddmNd7V2M=", + "version": "1319.100.3" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-lPq58QIx+H9DouTXAUJSMf1X7dj9V6xu3c8VWr2R1IY=", + "version": "60420.101.4" + }, + "architecture": { + "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", + "version": "282" + }, + "configd": { + "hash": "sha256-M/fRAnUw2wObhCQp9a6zQbCGhACCQHpju4/1+KGlkjg=", + "version": "1241.100.11" + }, + "copyfile": { + "hash": "sha256-te3WcQudrXPqnTM1s/AtsTdu7VIXf5dIASy+IGnIxv0=", + "version": "191.100.3" + }, + "dtrace": { + "hash": "sha256-7jAG66hG9qmqpRbECazMD1Pyi53CWTOGNnZca1NpcxE=", + "version": "397" + }, + "dyld": { + "hash": "sha256-OkDOTV86EB44LxsqwTD4ZncMcr7iqSHXxw+6U+AP7oU=", + "version": "1066.8" + }, + "eap8021x": { + "hash": "sha256-FMG+IGVPpcwrRe2/OKpFycrY/EFPZkge2vX61NgorGg=", + "version": "336.100.6" + }, + "hfs": { + "hash": "sha256-Au5VDrYRBerI1I6rjC0lVDwB5IBwGARrAdcTI4M+Fx0=", + "version": "627.100.6" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-V1tpp/XG6baETunJt029rI6wp6moYSnFprt+bNGaQ40=", + "version": "87" + }, + "libdispatch": { + "hash": "sha256-d1VObN11bNdtNJlZQqp2y8yP4lit5Wbj+4/aN3StsPc=", + "version": "1415.100.11" + }, + "libmalloc": { + "hash": "sha256-jcR1AO/chcZzfAvELkC+U3q9tzxqPdwgLcHrnkQmN4M=", + "version": "425.100.7" + }, + "libplatform": { + "hash": "sha256-+BB23YGGT0hA326Dh+3k2UvAqBdEJ84A6yGA/ccrihg=", + "version": "292.100.1" + }, + "libpthread": { + "hash": "sha256-/l17vMWhfAs0YhIHi+l84vGVxpGFOzocvxxii7B+WUk=", + "version": "514.100.2" + }, + "mDNSResponder": { + "hash": "sha256-M4yfQsdlKwes5M2QOEEfjv7ldSVZw7oGXLISaDcObjs=", + "version": "1807.101.2" + }, + "objc4": { + "hash": "sha256-qOV9YfP59WP8Izp+IvM/aiYTW8fCoq21uxU64OcIHk8=", + "version": "876" + }, + "ppp": { + "hash": "sha256-Sg5c5qOSk5TaS4pgXZ+eAy/iuGBa1oFML0dkj463DcE=", + "version": "1010" + }, + "removefile": { + "hash": "sha256-oQorWHlJ0ctekCTUsLXHko8k1aCKBJ00A2FHkRd4B3E=", + "version": "68" + }, + "xnu": { + "hash": "sha256-w9/lDZ/E54YzYQkOWptNpX5GomgI/fvZLAy7NY3O+IQ=", + "version": "8796.101.5" + } + }, + "14.4": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-/VoOR9wJuKnmGE1CWGGXxX8SpmALHnEooNTa3QM+ITc=", + "version": "600028.100.1" + }, + "IOAudioFamily": { + "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=", + "version": "540.3" + }, + "IOBDStorageFamily": { + "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", + "version": "22" + }, + "IOCDStorageFamily": { + "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", + "version": "61" + }, + "IODVDStorageFamily": { + "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", + "version": "45" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=", + "version": "431" + }, + "IOFireWireFamily": { + "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", + "version": "487" + }, + "IOFireWireSBP2": { + "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", + "version": "445" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", + "version": "260" + }, + "IOGraphics": { + "hash": "sha256-Ag37fd3tZJLXLVq1yzHOCWGOYYfwwTkC8hnvNaTEaWg=", + "version": "598" + }, + "IOHIDFamily": { + "hash": "sha256-fmYTJsquAOBwzsgRmqPyjSJJi1hGcfnMmqLIcTe8W1s=", + "version": "2031.100.16" + }, + "IOKitUser": { + "hash": "sha256-1bqRiLvyr2GQfbWwhXHXXIOtIka9YDw5GbKV6bd2k4k=", + "version": "100076.101.1" + }, + "IONetworkingFamily": { + "hash": "sha256-J3cLeWKrQ8ypIaqgwRH9eU5JbjEDBVoezj3a2Lvwu5k=", + "version": "177" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-cllpJX11c3CX8zEYdOT2TC63sx7NUAHh33yRHhrG2Ro=", + "version": "315" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-fxBM4KbPwQNVEJl7PCKP+1nUk9Oce/O2+0lVBxyngew=", + "version": "1592.100.35" + }, + "Libinfo": { + "hash": "sha256-zZr6Mmou8Q+G6/wS+k0k7R+XirB94TNCUGS5dhi96ZE=", + "version": "583.0.1" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-7X+6S3C7ZOTXJUeDXOOg5EmoZyLZvtE06x3Is0TGgSU=", + "version": "317.100.2" + }, + "Librpcsvc": { + "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", + "version": "31" + }, + "Libsystem": { + "hash": "sha256-HsItciWrwyXujQ2hwqzv0JKOkkuynXYIqejLAEPJbMc=", + "version": "1345.100.2" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-NgTGbaw5JkpboDQpt1fSgUr9NYGS+bIOrEMQX7mLAME=", + "version": "61123.100.169" + }, + "architecture": { + "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", + "version": "282" + }, + "configd": { + "hash": "sha256-+3xesYxqfsNjWCW3T87OA7+Z1hBqmGEh/I8kP8Ajbso=", + "version": "1300.100.9" + }, + "copyfile": { + "hash": "sha256-rSCTgzdHr7QmnPk9rJ9P4fOAolnEQv8PHfgAY+qA0s4=", + "version": "196.100.4" + }, + "dtrace": { + "hash": "sha256-04Q35rCKnM5Csv5poFJKpK0VplWq4hvy251/Cb2Kl80=", + "version": "401.100.3" + }, + "dyld": { + "hash": "sha256-6P/Da6xP19vmaCROoYv9pl7DaW3/U+qZBJT8PD33bn0=", + "version": "1160.6" + }, + "eap8021x": { + "hash": "sha256-Ky6KSlJhyX1NRufGhVBcp+ZFmqYrAxwC/5QvJhC2PhU=", + "version": "354.100.3" + }, + "hfs": { + "hash": "sha256-+YUVOttZU7C8I14CC6t3ZH2KxAjjTA2nB0y5bPgLxZM=", + "version": "650.0.2" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-M/jnIHzKYvdFCO0tJ1JXiD/UcZtJhLIoulaCQQUbn30=", + "version": "90" + }, + "libdispatch": { + "hash": "sha256-igqIA5DMVHjG30WMHZZpYY7LRM9hZyMWItD+UxeTehY=", + "version": "1477.100.9" + }, + "libmalloc": { + "hash": "sha256-Sh4/z7lGWRMldOPURkP5vLOAb5Ou6AUsVJEWz9wk9hI=", + "version": "521.100.59" + }, + "libplatform": { + "hash": "sha256-gojt3sWOr7XO2yYI/B1CmNLTPFieSfoNtlOgQahOCok=", + "version": "316.100.10" + }, + "libpthread": { + "hash": "sha256-phjfN8+IU8ibPsflR6LktnSi3giy89ghI+cFyrhiQNo=", + "version": "519.101.1" + }, + "mDNSResponder": { + "hash": "sha256-0ECbWeMnIRTsi03BeBEe5boyR/84JJPbxzPQze8hHSA=", + "version": "2200.100.94.0.2" + }, + "objc4": { + "hash": "sha256-eUVSpbyTEOMEdHoxSv6lZIZwB+cW/YWIaTZTcHgGOjo=", + "version": "912.3" + }, + "ppp": { + "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=", + "version": "1016" + }, + "removefile": { + "hash": "sha256-L6I0u8S3h3uV1veKA5HvkSebbBCd78ymlf//KWbebZo=", + "version": "70.100.4" + }, + "xnu": { + "hash": "sha256-j5Ep1RX5DTJqTGszrF4d/JtzUqZ6nA6XoExqcIQ0RVQ=", + "version": "10063.101.15" + } + }, + "15.0": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-qwQEFoycAw+YLwqpZgJB1Ppg8mrWFnRPDj4I5f2Ggns=", + "version": "600032" + }, + "IOAudioFamily": { + "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=", + "version": "600.2" + }, + "IOBDStorageFamily": { + "hash": "sha256-s8hTwX0jq2iPULfBLUwpzqtszWuvJrrLGbmrKa/fY4U=", + "version": "24" + }, + "IOCDStorageFamily": { + "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", + "version": "62" + }, + "IODVDStorageFamily": { + "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", + "version": "46" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-qR9lSTa7PN5Z9Nis4tfuXlcZGMIU48dete/NPD0UBbE=", + "version": "434" + }, + "IOFireWireFamily": { + "hash": "sha256-hmErAXjLWIelqJaCrB8J4IiIxyB7S6EHFY+AY9YhmKQ=", + "version": "490" + }, + "IOFireWireSBP2": { + "hash": "sha256-Xk+PDnUaO9q46nQwHwTKf/QXtGclfs0wTWiUbcV7e4s=", + "version": "452" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", + "version": "261" + }, + "IOGraphics": { + "hash": "sha256-Ag37fd3tZJLXLVq1yzHOCWGOYYfwwTkC8hnvNaTEaWg=", + "version": "598" + }, + "IOHIDFamily": { + "hash": "sha256-4hIztdbKpoC0VrRVwZkoCZuByyTGw02lrrcFDBAXyko=", + "version": "2102.0.6" + }, + "IOKitUser": { + "hash": "sha256-ytMma1ft1fKjCvP0SKdwnVonPEixzthoCR7ML94/pLE=", + "version": "100140.0.6" + }, + "IONetworkingFamily": { + "hash": "sha256-gZ7Dkk4Iu7AV9K2ioqSeJ1W7bTNxv77bmT18iv3ljLg=", + "version": "185" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-W9H3jzaXLvAb0cziHBpNo5Iom7c7H5bg4MxQIhIsefc=", + "version": "317" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-1t+e8DQUmsrmr1f6QUU4uUm/el3G7EOL+vUO28srPAM=", + "version": "1669.0.4" + }, + "Libinfo": { + "hash": "sha256-D7JMCakQVCQ9j2zUHQSGB8zZcHD6azwYY3bsJU0JfEE=", + "version": "592" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-qYox9iQUnU0AGVfPK2p61/2zlNAJmixCE5K7WojMQ3I=", + "version": "327.0.5" + }, + "Librpcsvc": { + "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", + "version": "31" + }, + "Libsystem": { + "hash": "sha256-nawWJiu2IJ34ek5iOX6CrlqMzev7TuJpUkvDp30ZQ/U=", + "version": "1351" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-ptS/IESkJmbcO3H+v6mmN2jvH2mfLXi+fMQfGCLSt7M=", + "version": "61439.1.1" + }, + "architecture": { + "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", + "version": "282" + }, + "configd": { + "hash": "sha256-Wks7d0Kere6YYPJar593ZSC5bbkyKcaTxrHK6Ah6u0c=", + "version": "1345" + }, + "copyfile": { + "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", + "version": "213" + }, + "dtrace": { + "hash": "sha256-S0gI+9eTcuZkh0FWmTmZ+AhZ4qoSdnUb5GTp1melk9A=", + "version": "409" + }, + "dyld": { + "hash": "sha256-q0GN5+4mW8Yxer0XxhlLK7JRM4JDoxeSFDRzbZ738lw=", + "version": "1231.3" + }, + "eap8021x": { + "hash": "sha256-2FdEb76KBbCAl2iwly4c1Xstar53O8qgGdN/3WXO23U=", + "version": "364" + }, + "hfs": { + "hash": "sha256-utmIFAW7Gdbbj71oZnHSaTUse9cIN3ZSfXyFTmuxnc4=", + "version": "672" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-21OuQearKTN75OgHN+RPLR1VGdf3ZffPYpV51Kj6LYE=", + "version": "94" + }, + "libdispatch": { + "hash": "sha256-q2oyaEdt8clVLjLwBjAAvLKodpuYThscK3VcQotCmIM=", + "version": "1502.0.1" + }, + "libmalloc": { + "hash": "sha256-tFaYSvebk4uIIPu/46eMp6QnwiO/SmShjUoFnJjnmsc=", + "version": "646.0.13" + }, + "libplatform": { + "hash": "sha256-U3TRUGBxuspEPfzdsd+53Kh8E9GmceMhsxxXuQbcdcc=", + "version": "340" + }, + "libpthread": { + "hash": "sha256-eYHDAt2wNk7hJZJxsC7Y9w4ASKdexidu613kPo7TAKs=", + "version": "535" + }, + "mDNSResponder": { + "hash": "sha256-w+Pw/VsHl8hkDiS7EEEYKp9P2NVwu8NSVPSn2U15vHM=", + "version": "2559.1.1" + }, + "objc4": { + "hash": "sha256-Z9UAm/hjjO2K0c7ag/ws4e/Y2nKOWnObPgp4HUZe+W4=", + "version": "928.2" + }, + "ppp": { + "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=", + "version": "1016" + }, + "removefile": { + "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=", + "version": "75" + }, + "xnu": { + "hash": "sha256-9cFPrWtTpCb02YrvKX1KWoExoH2VjPdOBU4dscmKL4A=", + "version": "11215.1.10" + } + } +} diff --git a/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json b/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json new file mode 100644 index 000000000000..2b31160e0073 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json @@ -0,0 +1,545 @@ +[ + { + "package": "apache", + "headers": [ + "apache2" + ] + }, + { + "package": "apr", + "headers": [ + "apr-1" + ], + "libraries": [ + "libapr-1.*", + "libaprutil-1.*" + ] + }, + { + "package": "boringssl", + "libraries": [ + "libboringssl.*" + ] + }, + { + "package": "bzip2", + "headers": [ + "bzlib.h" + ], + "libraries": [ + "libbz2.*" + ] + }, + { + "package": "corecrypto", + "libraries": [ + "system/libcorecrypto*" + ] + }, + { + "package": "Csu", + "libraries": [ + "*.o" + ] + }, + { + "package": "cups", + "headers": [ + "cups" + ], + "libraries": [ + "libcups*" + ] + }, + { + "package": "curl", + "headers": [ + "curl" + ], + "libraries": [ + "libcurl.*" + ] + }, + { + "package": "cyrus_sasl", + "headers": [ + "sasl" + ], + "libraries": [ + "libsasl*" + ] + }, + { + "package": "editline", + "headers": [ + "editline.h", + "editline" + ], + "libraries": [ + "libedit.*", + "libeditline.*" + ] + }, + { + "package": "html-tidy", + "headers": [ + "tidy*" + ], + "libraries": [ + "libtidy.*" + ] + }, + { + "package": "hunspell", + "headers": [ + "hunspell" + ], + "libraries": [ + "libhunspell*" + ] + }, + { + "package": "icu", + "headers": [ + "unicode" + ], + "libraries": [ + "libicucore.*" + ] + }, + { + "package": "libarchive", + "headers": [ + "archive.h", + "archive_entry.h" + ], + "libraries": [ + "libarchive.*" + ] + }, + { + "package": "libc++", + "headers": [ + "c++", + "cxxabi.h", + "__cxxabi_config.h" + ], + "libraries": [ + "libc++*" + ] + }, + { + "package": "ld64", + "libraries": [ + "libcodedirectory.*", + "libcodedirectory_static.*" + ] + }, + { + "package": "expat", + "headers": [ + "expat.h", + "expat_config.h", + "expat_external.h" + ], + "libraries": [ + "libexpat.*" + ] + }, + { + "package": "libffi", + "headers": [ + "ffi*" + ], + "libraries": [ + "libffi*" + ] + }, + { + "package": "libgcc", + "libraries": [ + "libgcc*" + ] + }, + { + "package": "libiconv", + "headers": [ + "iconv.h", + "libcharset.h", + "localcharset.h" + ], + "libraries": [ + "libcharset.*", + "libiconv.*", + "i18n" + ] + }, + { + "package": "libiodbc", + "libraries": [ + "libiodbc*" + ] + }, + { + "package": "libkrb4", + "libraries": [ + "libkrb4.*" + ] + }, + { + "package": "libkrb5", + "headers": [ + "com_err.h", + "gssapi", + "gssapi.h", + "gssrpc", + "kadm5", + "kdb.h", + "krad.h", + "krb5", + "krb5.h", + "profile.h", + "verto-module.h", + "verto.h" + ], + "libraries": [ + "krb5", + "libcom_err.*", + "libgssapi_krb5.*", + "libgssrpc.*", + "libk5crypto.*", + "libkadm5clnt.*", + "libkadm5clnt_mit.*", + "libkadm5srv.*", + "libkadm5srv_mit.*", + "libkdb5.*", + "libkrad.*", + "libkrb5*", + "libkrb5support.*", + "libverto.*" + ] + }, + { + "package": "libpcap", + "headers": [ + "pcap*" + ], + "libraries": [ + "libpcap.*" + ] + }, + { + "package": "libresolv", + "headers": [ + "arpa/nameser.h", + "arpa/nameser_compat.h", + "dns.h", + "dns_util.h", + "nameser.h", + "resolv.h" + ], + "libraries": [ + "libresolv.*" + ] + }, + { + "package": "libstdc++", + "libraries": [ + "libstdc++.*" + ] + }, + { + "package": "libsbuf", + "headers": [ + "usbuf.h" + ], + "libraries": [ + "libsbuf.*" + ] + }, + { + "package": "libtermcap", + "headers": [ + "termcap.h" + ], + "libraries": [ + "libtermcap.*" + ] + }, + { + "package": "libutil", + "headers": [ + "libutil.h" + ], + "libraries": [ + "libutil.*", + "libutil1.*" + ] + }, + { + "package": "libxml2", + "headers": [ + "libxml", + "libxml2" + ], + "libraries": [ + "libxml2.*" + ] + }, + { + "package": "libxo", + "headers": [ + "libxo" + ], + "libraries": [ + "libxo.*" + ] + }, + { + "package": "libxslt", + "headers": [ + "libexslt", + "libxslt" + ], + "libraries": [ + "libexslt.*", + "libxslt.*" + ] + }, + { + "package": "liby", + "libraries": [ + "liby.a" + ] + }, + { + "package": "marisa-trie", + "libraries": [ + "libmarisa.*" + ] + }, + { + "package": "ncurses", + "headers": [ + "curses*", + "cursslk.h", + "eti.h", + "etip.h", + "form.h", + "menu.h", + "nc_tparm.h", + "ncurses*", + "panel.h", + "term.h", + "term_entry.h", + "termcap.h", + "tic.h", + "unctrl.h" + ], + "libraries": [ + "libcurses.*", + "libform.*", + "libformw.*", + "libmenu.*", + "libmenuw.*", + "libncurses.*", + "libncursesw.*", + "libpanel.*", + "libpanelw.*", + "libtinfo.*" + ] + }, + { + "package": "net-snmp", + "headers": [ + "net-snmp" + ], + "libraries": [ + "libnetsnmp*" + ] + }, + { + "package": "nghttp", + "libraries": [ + "lib*nghttp2.*" + ] + }, + { + "package": "openblas", + "headers": [ + "cblas.h", + "f77blas.h", + "lapack.h", + "lapacke.h", + "lapacke_config.h", + "lapacke_mangling.h", + "lapacke_utils.h", + "openblas_config.h" + ], + "libraries": [ + "libblas.*", + "libcblas.*", + "libclapack.*", + "libf77lapack.*", + "liblapack.*", + "liblapacke.*", + "libopenblas.*", + "libopenblas.*", + "libopenblasp*" + ] + }, + { + "package": "openldap", + "headers": [ + "lber.h", + "lber_types.h", + "ldap.h", + "ldap_cdefs.h", + "ldap_features.h", + "ldap_schema.h", + "ldap_utf8.h", + "ldif.h", + "openldap.h", + "slapi-plugin.h" + ], + "libraries": [ + "liblber.*", + "liblber_r.*", + "libldap.*", + "libldap_r.*" + ] + }, + { + "package": "openpam", + "headers": [ + "security" + ], + "libraries": [ + "libpam.*", + "pam_*" + ] + }, + { + "package": "pcre", + "headers": [ + "pcre.h", + "pcreposix.h" + ], + "libraries": [ + "libpcre.*", + "libpcre2*", + "libpcreposix.*" + ] + }, + { + "package": "php", + "headers": [ + "php" + ], + "libraries": [ + "php" + ] + }, + { + "package": "postgresql", + "libraries": [ + "libecpg*", + "libpg*", + "libpq*" + ] + }, + { + "package": "python", + "headers": [ + "python*" + ], + "frameworks": [ + "Python.framework" + ], + "libraries": [ + "libpython*", + "python*" + ] + }, + { + "package": "readline", + "headers": [ + "readline" + ], + "libraries": [ + "libhistory.*", + "libreadline.*" + ] + }, + { + "package": "ruby", + "frameworks": [ + "Ruby.framework" + ], + "libraries": [ + "libruby.*", + "ruby" + ] + }, + { + "package": "sqlite3", + "headers": [ + "sqlite3.h", + "sqlite3ext.h" + ], + "libraries": [ + "libsqlite3.*" + ] + }, + { + "package": "swift", + "libraries": [ + "swift/shims" + ] + }, + { + "package": "tcl", + "headers": [ + "tcl*", + "tk*" + ], + "frameworks": [ + "Tcl.framework", + "Tk.framework" + ], + "libraries": [ + "libtcl*", + "libtk*", + "tclConfig.sh", + "tkConfig.sh" + ] + }, + { + "package": "xar", + "headers": [ + "xar" + ], + "libraries": [ + "libxar.*" + ] + }, + { + "package": "xz", + "headers": [ + "lzma*" + ], + "libraries": [ + "liblzma.*" + ] + }, + { + "package": "zlib", + "headers": [ + "zconf.h", + "zlib.h" + ], + "libraries": [ + "libz.*" + ] + } +] diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json new file mode 100644 index 000000000000..608990bddd46 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -0,0 +1,47 @@ +{ + "10.12": { + "url": "http://swcdn.apple.com/content/downloads/22/62/041-88607/wg8avdk0jo75k9a13gentz9stwqgrqmcv6/CLTools_SDK_OSX1012.pkg", + "version": "10.12.2", + "hash": "sha256-Jf2WIB9bY/rPwe0AOW3YWJY/6EqVe41yhezdTGOO3M8=" + }, + "10.13": { + "url": "http://swcdn.apple.com/content/downloads/33/36/041-90419-A_7JJ4H9ZHO2/xs88ob5wjz6riz7g6764twblnvksusg4ps/CLTools_SDK_macOS1013.pkg", + "version": "10.13.2", + "hash": "sha256-8nd55fiJLfRWABAbMaHXjp6i20RqupmKedwmhb3S0/A=" + }, + "10.14": { + "url": "http://swcdn.apple.com/content/downloads/41/57/061-26573-A_JMOA8GZGDR/lj8yrtu8dgs40fw9k8f5fkoviwkp0og6vs/CLTools_SDK_macOS1014.pkg", + "version": "10.14.6", + "hash": "sha256-NMNkycIl3AVZCw0ZpHNkaeYVS9LAZVSddHw5loL9dhk=" + }, + "10.15": { + "url": "https://swcdn.apple.com/content/downloads/50/51/071-29699-A_YC8SX0OHH3/7479xojqghsvgtnt3dxjpnxuz9sjpmbmds/CLTools_macOSLMOS_SDK.pkg", + "version": "10.15.6", + "hash": "sha256-mPJQC+v4yNiOCKLQfhidB2WH2MMclSCP1odvOoGdVPw=" + }, + "11": { + "url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", + "version": "11.3", + "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg=" + }, + "12": { + "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", + "version": "12.3", + "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8=" + }, + "13": { + "url": "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", + "version": "13.3", + "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4=" + }, + "14": { + "url": "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", + "version": "14.4", + "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" + }, + "15": { + "url": "https://swcdn.apple.com/content/downloads/33/46/042-32691-A_3MH7S3118O/3dblccqo9ws17dc5lk3hojfbt3s74q0ql6/CLTools_macOSNMOS_SDK.pkg", + "version": "15.0", + "hash": "sha256-JhaAPyfX46D+9sematdAYAORw40JP3xvleWRz7Hj/1s=" + } +} diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix new file mode 100644 index 000000000000..2fb57182001c --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -0,0 +1,120 @@ +let + sdkVersions = builtins.fromJSON (builtins.readFile ./metadata/versions.json); +in + +{ + lib, + stdenv, + stdenvNoCC, + substitute, + + # Specifies the major version used for the SDK. Uses `hostPlatform.darwinSdkVersion` by default. + darwinSdkMajorVersion ? ( + if lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11" then + lib.versions.majorMinor stdenv.hostPlatform.darwinSdkVersion + else + lib.versions.major stdenv.hostPlatform.darwinSdkVersion + ), + # Enabling bootstrap disables propagation. Defaults to `false` (meaning to propagate certain packages and `xcrun`) + # except in stage0 of the Darwin stdenv bootstrap. + enableBootstrap ? stdenv.name == "bootstrap-stage0-stdenv-darwin", + + # Required by various phases + callPackage, + jq, +}: + +let + sdkInfo = + sdkVersions.${darwinSdkMajorVersion} + or (lib.throw "Unsupported SDK major version: ${darwinSdkMajorVersion}"); + sdkVersion = sdkInfo.version; + + fetchSDK = callPackage ./common/fetch-sdk.nix { }; + + phases = lib.composeManyExtensions ( + [ + (callPackage ./common/add-core-symbolication.nix { }) + (callPackage ./common/derivation-options.nix { }) + (callPackage ./common/passthru-private-frameworks.nix { inherit sdkVersion; }) + (callPackage ./common/passthru-source-release-files.nix { inherit sdkVersion; }) + (callPackage ./common/remove-disallowed-packages.nix { }) + ] + # Only process stubs and convert them to tbd-v4 if jq is available. This can be made unconditional once + # the bootstrap tools have jq and libtapi. + ++ lib.optional (jq != null) (callPackage ./common/process-stubs.nix { }) + # Avoid infinite recursions by not propagating certain packages, so they can themselves build with the SDK. + ++ lib.optionals (!enableBootstrap) [ + (callPackage ./common/propagate-inputs.nix { }) + (callPackage ./common/propagate-xcrun.nix { }) + ] + ++ [ + # These have to happen last. + (callPackage ./common/rewrite-sdk-paths.nix { inherit sdkVersion; }) + (callPackage ./common/run-build-phase-hooks.nix { }) + ] + ); +in +stdenvNoCC.mkDerivation ( + lib.extends phases (finalAttrs: { + pname = "apple-sdk"; + inherit (sdkInfo) version; + + src = fetchSDK sdkInfo; + + dontConfigure = true; + + strictDeps = true; + + setupHooks = [ + # `role.bash` is copied from `../build-support/setup-hooks/role.bash` due to the requirements not to reference + # paths outside the package when it is in `by-name`. It needs to be kept in sync, but it fortunately does not + # change often. Once `build-support` is available as a package (or some other mechanism), it should be changed + # to whatever that replacement is. + ./setup-hooks/role.bash + (substitute { + src = ./setup-hooks/sdk-hook.sh; + substitutions = [ + "--subst-var-by" + "sdkVersion" + (lib.escapeShellArgs (lib.splitVersion sdkVersion)) + ]; + }) + ]; + + installPhase = + let + sdkName = "MacOSX${lib.versions.majorMinor sdkVersion}.sdk"; + sdkMajor = lib.versions.major sdkVersion; + in + '' + runHook preInstall + + mkdir -p "$sdkpath" + + cp -rd . "$sdkpath/${sdkName}" + ${lib.optionalString (lib.versionAtLeast finalAttrs.version "11.0") '' + ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk" + ''} + ln -s "${sdkName}" "$sdkpath/MacOSX.sdk" + + runHook postInstall + ''; + + passthru = { + sdkroot = finalAttrs.finalPackage + "/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"; + }; + + __structuredAttrs = true; + + meta = { + description = "Frameworks and libraries required for building packages on Darwin"; + homepage = "https://developer.apple.com"; + maintainers = lib.teams.darwin.members; + platforms = lib.platforms.darwin; + badPlatforms = + lib.optionals (lib.versionAtLeast sdkVersion "10.15") [ lib.systems.inspect.patterns.is32bit ] + ++ lib.optionals (lib.versionOlder sdkVersion "11.0") [ lib.systems.inspect.patterns.isAarch ]; + }; + }) +) diff --git a/pkgs/by-name/ap/apple-sdk/patches/0001-Add-function-definitions-needed-to-build-zlog-in-sys.patch b/pkgs/by-name/ap/apple-sdk/patches/0001-Add-function-definitions-needed-to-build-zlog-in-sys.patch new file mode 100644 index 000000000000..681970cb2f71 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/patches/0001-Add-function-definitions-needed-to-build-zlog-in-sys.patch @@ -0,0 +1,48 @@ +From 6531da946949a94643e6d8424236174ae64fe0ca Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sat, 30 Sep 2023 18:02:39 -0400 +Subject: [PATCH 1/2] Add function definitions needed to build zlog in + system_cmds + +--- + CoreSymbolication.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/CoreSymbolication.h b/CoreSymbolication.h +index a413860..f3cf63f 100644 +--- a/CoreSymbolication.h ++++ b/CoreSymbolication.h +@@ -324,7 +324,9 @@ CSSymbolOwnerEditRelocations + CSSymbolOwnerForeachRegion + CSSymbolOwnerForeachRegionWithName + CSSymbolOwnerForeachSection +-CSSymbolOwnerForeachSegment ++*/ ++void CSSymbolOwnerForeachSegment(CSSymbolOwnerRef owner, void (^block)(CSSegmentRef)); ++/* + CSSymbolOwnerForeachSourceInfo + CSSymbolOwnerForeachSymbol + */ +@@ -333,7 +335,9 @@ void CSSymbolOwnerForeachSymbolWithName(CSSymbolOwnerRef owner, const char *sna + /* + CSSymbolOwnerGetArchitecture + CSSymbolOwnerGetBaseAddress +-CSSymbolOwnerGetCFUUIDBytes ++*/ ++const CFUUIDBytes* CSSymbolOwnerGetCFUUIDBytes(CSSymbolOwnerRef owner); ++/* + CSSymbolOwnerGetCompatibilityVersion + CSSymbolOwnerGetCurrentVersion + CSSymbolOwnerGetDataFlags +@@ -390,7 +394,7 @@ CSSymbolOwnerSetLoadTimestamp + CSSymbolOwnerSetPath + CSSymbolOwnerSetRelocationCount + */ +-CSSymbolOwnerSetTransientUserData(CSSymbolOwnerRef owner, uint32_t gen); ++void CSSymbolOwnerSetTransientUserData(CSSymbolOwnerRef owner, uint32_t gen); + /* + CSSymbolOwnerSetUnloadTimestamp + */ +-- +2.44.1 + diff --git a/pkgs/by-name/ap/apple-sdk/patches/0002-Add-CF_EXPORT-To-const-symbols.patch b/pkgs/by-name/ap/apple-sdk/patches/0002-Add-CF_EXPORT-To-const-symbols.patch new file mode 100644 index 000000000000..01f934be6ef4 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/patches/0002-Add-CF_EXPORT-To-const-symbols.patch @@ -0,0 +1,45 @@ +From ae7ac6a7043dbae8e63d6ce5e63dfaf02b5977fe Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sat, 30 Sep 2023 18:37:18 -0400 +Subject: [PATCH 2/2] Add CF_EXPORT To const symbols + +--- + CoreSymbolication.h | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/CoreSymbolication.h b/CoreSymbolication.h +index f3cf63f..4124a54 100644 +--- a/CoreSymbolication.h ++++ b/CoreSymbolication.h +@@ -49,6 +49,7 @@ + + + #include ++#include + #include + + +@@ -139,13 +140,13 @@ typedef void (^CSSegmentIterator)(CSSegmentRef segment); + * External symbols + */ + +-const char* kCSRegionMachHeaderName; +-const CSDictionaryKeyCallBacks kCSTypeDictionaryKeyCallBacks; +-const CSDictionaryValueCallBacks kCSTypeDictionaryValueCallBacks; +-const CSDictionaryKeyCallBacks kCSTypeDictionaryWeakKeyCallBacks; +-const CSDictionaryValueCallBacks kCSTypeDictionaryWeakValueCallBacks; +-const CSSetCallBacks kCSTypeSetCallBacks; +-const CSSetCallBacks kCSTypeSetWeakCallBacks; ++CF_EXPORT const char* kCSRegionMachHeaderName; ++CF_EXPORT const CSDictionaryKeyCallBacks kCSTypeDictionaryKeyCallBacks; ++CF_EXPORT const CSDictionaryValueCallBacks kCSTypeDictionaryValueCallBacks; ++CF_EXPORT const CSDictionaryKeyCallBacks kCSTypeDictionaryWeakKeyCallBacks; ++CF_EXPORT const CSDictionaryValueCallBacks kCSTypeDictionaryWeakValueCallBacks; ++CF_EXPORT const CSSetCallBacks kCSTypeSetCallBacks; ++CF_EXPORT const CSSetCallBacks kCSTypeSetWeakCallBacks; + + + /* +-- +2.44.1 + diff --git a/pkgs/by-name/ap/apple-sdk/scripts/get-sdks-from-catalog.sh b/pkgs/by-name/ap/apple-sdk/scripts/get-sdks-from-catalog.sh new file mode 100755 index 000000000000..1293fab11cc9 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/scripts/get-sdks-from-catalog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl file gzip jq xcbuild yq + +set -eu -o pipefail + +catalog=${1-} + +if [ -z "$catalog" ]; then + echo "usage: get-sdks-from-catalog.sh " + echo " Apple software update catalog (may be gzipped)" >&2 + exit 1 +fi + +scratch=$(mktemp) +trap 'rm -f -- "$scratch"' EXIT + +if [[ "$(file "$catalog")" =~ gzip ]]; then + gzcat "$catalog" > "$scratch" +else + cp --reflink=auto "$catalog" "$scratch" +fi + +# Grab all SDK packages from the catalog +filter='.Products[].Packages[] | select(.URL | test(".*CLTools_macOSNMOS_SDK.pkg")) | "\(.URL)|\(.MetadataURL)"' + +declare -A package_list +for package in $(plutil -convert json -o - "$scratch" | jq -r "$filter"); do + package_list[${package%%|*}]=${package#*|} +done + +truncate --size 0 "$scratch" +for pkg in "${!package_list[@]}"; do + ver=$(curl --silent "${package_list[$pkg]}" | xq -r '."pkg-info"."@version"') + echo "{\"url\": \"$pkg\", \"version\": \"$(cut -d. -f1-3 <<< "$ver")\", \"long_version\": \"$ver\"}" >> "$scratch" +done + +jq -r --slurp ' + group_by(.version | split(".")[0]) + | map(max_by(.version)) + | sort_by(.version)[] + | "Package URL: \(.url)\n Xcode Ver: \(.version) (\(.long_version))\n"' "$scratch" diff --git a/pkgs/by-name/ap/apple-sdk/scripts/lock-sdk-deps.sh b/pkgs/by-name/ap/apple-sdk/scripts/lock-sdk-deps.sh new file mode 100755 index 000000000000..6acff1be02de --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/scripts/lock-sdk-deps.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl git gnutar jq moreutils nix + +set -eu -o pipefail + +if [ ! -v 2 ]; then + echo "usage: lock-sdk-deps.sh " >&2 + echo " Decimal-separated version number." >&2 + echo " Must correspond to a tag in https://github.com/apple-oss-distributions/distribution-macOS" >&2 + echo " List of packages from the distributions-macOS repository." >&2 + echo " Packages not in the repository at the tag for will be ignored." + exit 1 +fi + +pkgdir=$(dirname "$(dirname "$(realpath "$0")")") + +lockfile=$pkgdir/metadata/apple-oss-lockfile.json +if [ ! -e "$lockfile" ]; then + touch "$lockfile" +fi + +workdir=$(mktemp -d) +trap 'rm -rf -- "$workdir"' EXIT + +sdkVersion=$1; shift +tag="macos-${sdkVersion//.}" + +declare -a packages=("$@") + +echo "Locking versions for macOS $sdkVersion using tag '$tag'..." + +pushd "$workdir" > /dev/null + +git clone --branch "$tag" https://github.com/apple-oss-distributions/distribution-macOS.git &> /dev/null +cd distribution-macOS + +for package in "${packages[@]}"; do + # If the tag exists in `release.json`, use that as an optimization to avoid downloading unnecessarily from Github. + packageTag=$(jq -r --arg package "$package" '.projects[] | select(.project == $package) | .tag' release.json) + packageCommit=$(git ls-tree -d HEAD "$package" | awk '{print $3}') + + if [ ! -d "$package" ]; then + packageCommit=HEAD + fi + + # However, sometimes it doesn’t exist. In that case, fall back to cloning the repo and check manually + # which tag corresponds to the commit from the submodule. + if [ -z "$packageTag" ]; then + git clone --no-checkout "https://github.com/apple-oss-distributions/$package.git" ../source &> /dev/null + pushd ../source > /dev/null + packageTag=$(git tag --points-at "$packageCommit") + popd > /dev/null + rm -rf ../source + fi + + packageVersion=${packageTag##"$package"-} + + curl -OL "https://github.com/apple-oss-distributions/$package/archive/$packageTag.tar.gz" &> /dev/null + tar axf "$packageTag.tar.gz" + + packageHash=$(nix --extra-experimental-features nix-command hash path "$package-$packageTag") + + pkgsjson="{\"$sdkVersion\": {\"$package\": {\"version\": \"$packageVersion\", \"hash\": \"$packageHash\"}}}" + + echo " - Locking $package to version $packageVersion with hash '$packageHash'" + jq --argjson pkg "$pkgsjson" -S '. * $pkg' "$lockfile" | sponge "$lockfile" +done + +popd > /dev/null diff --git a/pkgs/by-name/ap/apple-sdk/scripts/regenerate-lockfile.sh b/pkgs/by-name/ap/apple-sdk/scripts/regenerate-lockfile.sh new file mode 100755 index 000000000000..3922916e6135 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/scripts/regenerate-lockfile.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils jq + +set -eu -o pipefail + +pkgdir=$(dirname "$(dirname "$(realpath "$0")")") + +echo '{}' > "$pkgdir/metadata/apple-oss-lockfile.json" + +declare -a versions +readarray -t versions < <(jq -r '.[].version' "$pkgdir/metadata/versions.json") + +declare -a packages=( + CarbonHeaders + CommonCrypto + IOAudioFamily + IOFireWireFamily + IOFWDVComponents + IOFireWireAVC + IOFireWireSBP2 + IOFireWireSerialBusProtocolTransport + IOGraphics + IOHIDFamily + IONetworkingFamily + IOSerialFamily + IOStorageFamily + IOBDStorageFamily + IOCDStorageFamily + IODVDStorageFamily + IOUSBFamily + IOKitUser + Libc + Libinfo + Libm + Libnotify + Librpcsvc + Libsystem + OpenDirectory + Security + architecture + configd + copyfile + dtrace + dyld + eap8021x + hfs + launchd + libclosure + libdispatch + libmalloc + libplatform + libpthread + mDNSResponder + objc4 + ppp + removefile + xnu +) + +for version in "${versions[@]}"; do + "$pkgdir/scripts/lock-sdk-deps.sh" "$version" "${packages[@]}" +done diff --git a/pkgs/by-name/ap/apple-sdk/setup-hooks/add-private-frameworks.sh b/pkgs/by-name/ap/apple-sdk/setup-hooks/add-private-frameworks.sh new file mode 100644 index 000000000000..d5c48e3dd879 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/setup-hooks/add-private-frameworks.sh @@ -0,0 +1,6 @@ +function enablePrivateFrameworks() { + export NIX_CFLAGS_COMPILE+=" -iframework $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/PrivateFrameworks" + export NIX_LDFLAGS+=" -F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/PrivateFrameworks" +} + +preConfigureHooks+=(enablePrivateFrameworks) diff --git a/pkgs/by-name/ap/apple-sdk/setup-hooks/role.bash b/pkgs/by-name/ap/apple-sdk/setup-hooks/role.bash new file mode 100644 index 000000000000..bfd6b61f0aed --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/setup-hooks/role.bash @@ -0,0 +1,71 @@ +# Since the same derivation can be depended on in multiple ways, we need to +# accumulate *each* role (i.e. host and target platforms relative the depending +# derivation) in which the derivation is used. +# +# The role is intended to be used as part of other variables names like +# - $NIX_SOMETHING${role_post} + +function getRole() { + case $1 in + -1) + role_post='_FOR_BUILD' + ;; + 0) + role_post='' + ;; + 1) + role_post='_FOR_TARGET' + ;; + *) + echo "@name@: used as improper sort of dependency" >&2 + return 1 + ;; + esac +} + +# `hostOffset` describes how the host platform of the package is slid relative +# to the depending package. `targetOffset` likewise describes the target +# platform of the package. Both are brought into scope of the setup hook defined +# for dependency whose setup hook is being processed relative to the package +# being built. + +function getHostRole() { + getRole "$hostOffset" +} +function getTargetRole() { + getRole "$targetOffset" +} + +# `depHostOffset` describes how the host platform of the dependencies are slid +# relative to the depending package. `depTargetOffset` likewise describes the +# target platform of dependenices. Both are brought into scope of the +# environment hook defined for the dependency being applied relative to the +# package being built. + +function getHostRoleEnvHook() { + getRole "$depHostOffset" +} +function getTargetRoleEnvHook() { + getRole "$depTargetOffset" +} + +# This variant is intended specifically for code-producing tool wrapper scripts +# `NIX_@wrapperName@_TARGET_*_@suffixSalt@` tracks this (needs to be an exported +# env var so can't use fancier data structures). +function getTargetRoleWrapper() { + case $targetOffset in + -1) + export NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@=1 + ;; + 0) + export NIX_@wrapperName@_TARGET_HOST_@suffixSalt@=1 + ;; + 1) + export NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@=1 + ;; + *) + echo "@name@: used as improper sort of dependency" >&2 + return 1 + ;; + esac +} diff --git a/pkgs/by-name/ap/apple-sdk/setup-hooks/sdk-hook.sh b/pkgs/by-name/ap/apple-sdk/setup-hooks/sdk-hook.sh new file mode 100644 index 000000000000..62fa8b339a71 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk/setup-hooks/sdk-hook.sh @@ -0,0 +1,17 @@ +local role_post +getHostRole + +local sdkVersionVar=NIX_APPLE_SDK_VERSION${role_post} +local developerDirVar=DEVELOPER_DIR${role_post} + +local sdkVersionArr=(@sdkVersion@) +local sdkVersion +sdkVersion=$(printf "%02d%02d%02d" "${sdkVersionArr[0]-0}" "${sdkVersionArr[1]-0}" "${sdkVersionArr[2]-0}") + +if [ "$sdkVersion" -gt "${!sdkVersionVar-000000}" ]; then + export "$developerDirVar"='@out@' + export "$sdkVersionVar"="$sdkVersion" + export "SDKROOT${role_post}"="${!developerDirVar}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" +fi + +unset -v role_post developerDirVar sdkVersion sdkVersionArr sdkVersionVar diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/by-name/ap/appstream-glib/package.nix similarity index 100% rename from pkgs/development/libraries/appstream-glib/default.nix rename to pkgs/by-name/ap/appstream-glib/package.nix diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/pkgs/by-name/ap/appstream-glib/paths.patch similarity index 100% rename from pkgs/development/libraries/appstream-glib/paths.patch rename to pkgs/by-name/ap/appstream-glib/paths.patch diff --git a/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/pkgs/by-name/ap/appvm/0001-Remove-menu-bar.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch rename to pkgs/by-name/ap/appvm/0001-Remove-menu-bar.patch diff --git a/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch b/pkgs/by-name/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch rename to pkgs/by-name/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch diff --git a/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch b/pkgs/by-name/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch rename to pkgs/by-name/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch diff --git a/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch b/pkgs/by-name/ap/appvm/0004-Use-title-application-name-as-subtitle.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch rename to pkgs/by-name/ap/appvm/0004-Use-title-application-name-as-subtitle.patch diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/by-name/ap/appvm/package.nix similarity index 100% rename from pkgs/applications/virtualization/appvm/default.nix rename to pkgs/by-name/ap/appvm/package.nix diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/by-name/ap/aprutil/clang-bdb.patch similarity index 100% rename from pkgs/development/libraries/apr-util/clang-bdb.patch rename to pkgs/by-name/ap/aprutil/clang-bdb.patch diff --git a/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch b/pkgs/by-name/ap/aprutil/fix-libxcrypt-build.patch similarity index 100% rename from pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch rename to pkgs/by-name/ap/aprutil/fix-libxcrypt-build.patch diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/by-name/ap/aprutil/include-static-dependencies.patch similarity index 100% rename from pkgs/development/libraries/apr-util/include-static-dependencies.patch rename to pkgs/by-name/ap/aprutil/include-static-dependencies.patch diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/by-name/ap/aprutil/package.nix similarity index 100% rename from pkgs/development/libraries/apr-util/default.nix rename to pkgs/by-name/ap/aprutil/package.nix diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/by-name/ap/apt-cacher-ng/package.nix similarity index 100% rename from pkgs/servers/http/apt-cacher-ng/default.nix rename to pkgs/by-name/ap/apt-cacher-ng/package.nix diff --git a/pkgs/by-name/ap/apt-mirror/package.nix b/pkgs/by-name/ap/apt-mirror/package.nix index 3fbc22451ec6..0735293986de 100644 --- a/pkgs/by-name/ap/apt-mirror/package.nix +++ b/pkgs/by-name/ap/apt-mirror/package.nix @@ -18,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GNsyXP/O56Y+8QhoSfMm+ig5lK/K3Cm085jxRt9ZRmI="; }; - nativeBuildInputs = [ makeWrapper ]; + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + perl # pod2man + ]; buildInputs = [ perl ]; diff --git a/pkgs/development/libraries/aptdec/default.nix b/pkgs/by-name/ap/aptdec/package.nix similarity index 100% rename from pkgs/development/libraries/aptdec/default.nix rename to pkgs/by-name/ap/aptdec/package.nix diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/by-name/ap/aptly/package.nix similarity index 100% rename from pkgs/tools/misc/aptly/default.nix rename to pkgs/by-name/ap/aptly/package.nix diff --git a/pkgs/by-name/ap/apx-gui/package.nix b/pkgs/by-name/ap/apx-gui/package.nix index 0034181cc9da..36494e074b14 100644 --- a/pkgs/by-name/ap/apx-gui/package.nix +++ b/pkgs/by-name/ap/apx-gui/package.nix @@ -1,29 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, appstream-glib -, desktop-file-utils -, gobject-introspection -, libadwaita -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook4 -, apx -, gnome-console -, vte-gtk4 +{ + lib, + stdenv, + fetchFromGitHub, + appstream-glib, + desktop-file-utils, + gobject-introspection, + libadwaita, + meson, + ninja, + pkg-config, + python3, + wrapGAppsHook4, + apx, + gnome-console, + vte-gtk4, }: stdenv.mkDerivation (finalAttrs: { pname = "apx-gui"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { - owner = "Vanilla-OS"; - repo = "apx-gui"; - rev = "v${finalAttrs.version}"; - hash = "sha256-UgDBDk4ChgWFUoz5BAXbn0b4Bngs9/hTmcu1Y4FXLU0="; + owner = "Vanilla-OS"; + repo = "apx-gui"; + rev = "v${finalAttrs.version}"; + hash = "sha256-nZMbVXeWEgfBsVgX2iESRzDgu0tjiqC1dTCaTlW0iWA="; }; strictDeps = true; @@ -35,7 +36,11 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - (python3.withPackages (ps: [ ps.pygobject3 ps.requests ])) + (python3.withPackages (ps: [ + ps.pygobject3 + ps.pyyaml + ps.requests + ])) wrapGAppsHook4 ]; @@ -46,15 +51,20 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ apx gnome-console ]}" + --prefix PATH : "${ + lib.makeBinPath [ + apx + gnome-console + ] + }" ) ''; meta = { description = "GUI frontend for Apx in GTK 4 and Libadwaita"; - homepage = "https://github.com/Vanilla-OS/apx-gui"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; + homepage = "https://github.com/Vanilla-OS/apx-gui"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ chewblacka ]; mainProgram = "apx-gui"; }; diff --git a/pkgs/tools/misc/aquosctl/default.nix b/pkgs/by-name/aq/aquosctl/package.nix similarity index 100% rename from pkgs/tools/misc/aquosctl/default.nix rename to pkgs/by-name/aq/aquosctl/package.nix diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/by-name/ar/arachne-pnr/package.nix similarity index 100% rename from pkgs/development/compilers/arachne-pnr/default.nix rename to pkgs/by-name/ar/arachne-pnr/package.nix diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/by-name/ar/aragorn/package.nix similarity index 100% rename from pkgs/applications/science/biology/aragorn/default.nix rename to pkgs/by-name/ar/aragorn/package.nix diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/by-name/ar/arandr/package.nix similarity index 100% rename from pkgs/tools/X11/arandr/default.nix rename to pkgs/by-name/ar/arandr/package.nix diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/by-name/ar/arangodb/package.nix similarity index 100% rename from pkgs/servers/nosql/arangodb/default.nix rename to pkgs/by-name/ar/arangodb/package.nix diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/by-name/ar/aravis/package.nix similarity index 100% rename from pkgs/development/libraries/aravis/default.nix rename to pkgs/by-name/ar/aravis/package.nix diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/by-name/ar/arb/package.nix similarity index 100% rename from pkgs/development/libraries/arb/default.nix rename to pkgs/by-name/ar/arb/package.nix diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 8a45049cbf09..126880fae046 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.66.0-55166"; + version = "1.67.0-55463"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-up+ScCjFgxlATUbCeWZcVF2jZGfCw018MfT6kAqAHO4="; + hash = "sha256-up3H6Ke3tlL0/WbOv4qgbLxBaG8o5dibAPxtEnSad6g="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/by-name/ar/arc-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/arc-icon-theme/default.nix rename to pkgs/by-name/ar/arc-icon-theme/package.nix diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/by-name/ar/arc-kde-theme/package.nix similarity index 100% rename from pkgs/data/themes/arc-kde/default.nix rename to pkgs/by-name/ar/arc-kde-theme/package.nix diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/by-name/ar/arc-theme/package.nix similarity index 100% rename from pkgs/data/themes/arc/default.nix rename to pkgs/by-name/ar/arc-theme/package.nix diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/by-name/ar/arc_unpacker/package.nix similarity index 100% rename from pkgs/tools/archivers/arc_unpacker/default.nix rename to pkgs/by-name/ar/arc_unpacker/package.nix diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/by-name/ar/arch-install-scripts/package.nix similarity index 100% rename from pkgs/tools/misc/arch-install-scripts/default.nix rename to pkgs/by-name/ar/arch-install-scripts/package.nix diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/by-name/ar/archimedes/package.nix similarity index 100% rename from pkgs/applications/science/electronics/archimedes/default.nix rename to pkgs/by-name/ar/archimedes/package.nix diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/by-name/ar/archivebox/package.nix similarity index 100% rename from pkgs/applications/misc/archivebox/default.nix rename to pkgs/by-name/ar/archivebox/package.nix diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/by-name/ar/archiver/package.nix similarity index 100% rename from pkgs/applications/misc/archiver/default.nix rename to pkgs/by-name/ar/archiver/package.nix diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/by-name/ar/archivy/package.nix similarity index 100% rename from pkgs/applications/misc/archivy/default.nix rename to pkgs/by-name/ar/archivy/package.nix diff --git a/pkgs/development/embedded/arduino/arduino-ci/default.nix b/pkgs/by-name/ar/arduino-ci/package.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-ci/default.nix rename to pkgs/by-name/ar/arduino-ci/package.nix diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/by-name/ar/arduino-language-server/package.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-language-server/default.nix rename to pkgs/by-name/ar/arduino-language-server/package.nix diff --git a/pkgs/development/embedded/arduino/arduino-mk/default.nix b/pkgs/by-name/ar/arduino-mk/package.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-mk/default.nix rename to pkgs/by-name/ar/arduino-mk/package.nix diff --git a/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/pkgs/by-name/ar/arduinoOTA/package.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduinoOTA/default.nix rename to pkgs/by-name/ar/arduinoOTA/package.nix diff --git a/pkgs/by-name/ar/arena/package.nix b/pkgs/by-name/ar/arena/package.nix new file mode 100644 index 000000000000..c0bbc364617e --- /dev/null +++ b/pkgs/by-name/ar/arena/package.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }: + +# Arena is free software in the sense of "free beer" but not as in "free +# speech". We can install it as we please, but we cannot re-distribute it in +# any way other than the original release tarball, so we cannot include its NAR +# into the Nixpkgs channel. + +let + + inherit (lib) makeLibraryPath; + libDir = "lib64"; + +in +stdenv.mkDerivation rec { + pname = "arena"; + version = "3.10-beta"; + + src = fetchurl { + url = "http://www.playwitharena.de/downloads/arenalinux_64bit_${lib.replaceStrings ["-"] [""] version}.tar.gz"; + sha256 = "1pzb9sg4lzbbi4gbldvlb85p8xyl9xnplxwyb9pkk2mwzvvxkf0d"; + }; + + # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way? + buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 (lib.getLib stdenv.cc.cc)]; + + unpackPhase = '' + # This is is a tar bomb, i.e. it extract a dozen files and directories to + # the top-level, so we must create a sub-directory first. + mkdir -p $out/lib/${pname}-${version} + tar -C $out/lib/${pname}-${version} -xf ${src} + + # Remove executable bits from data files. This matters for the find command + # we'll use below to find all bundled engines. + chmod -x $out/lib/${pname}-${version}/Engines/*/*.{txt,bin,bmp,zip} + ''; + + buildPhase = '' + # Arena has (at least) two executables plus a couple of bundled chess + # engines that we need to patch. + exes=( $(find $out -name '*x86_64_linux') + $(find $out/lib/${pname}-${version}/Engines -type f -perm /u+x) + ) + for i in "''${exes[@]}"; do + # Arminius is statically linked. + if [[ $i =~ "Arminius_2017-01-01" ]]; then echo yo $i; continue; fi + echo Fixing interpreter and rpath paths in $i ... + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${makeLibraryPath buildInputs}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ + $i + done + ''; + + installPhase = '' + mkdir -p $out/bin + ln -s $out/lib/${pname}-${version}/Arena_x86_64_linux $out/bin/arena + ''; + + dontStrip = true; + + meta = { + description = "Chess GUI for analyzing with and playing against various engines"; + longDescription = '' + A free Graphical User Interface (GUI) for chess. Arena assists you in + analyzing and playing games as well as in testing chess engines. It runs + on Linux or Windows. Arena is compatible to Winboard protocol I, II and + UCI protocol I, II. Furthermore, compatible to Chess960, DGT electronic + chess board & DGT clocks and much more. + ''; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + homepage = "http://www.playwitharena.de"; + platforms = ["x86_64-linux"]; + }; + +} diff --git a/pkgs/tools/security/ares-rs/default.nix b/pkgs/by-name/ar/ares-rs/package.nix similarity index 100% rename from pkgs/tools/security/ares-rs/default.nix rename to pkgs/by-name/ar/ares-rs/package.nix diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index df9b4f6780e1..883670f227a8 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "argc"; rev = "v${version}"; - hash = "sha256-pOkZmk7boFPqHHBDet/on6Y8V2Ik+hpqN0cUtY0BiR0="; + hash = "sha256-DTE78+POQXPOAXt16WWheyfO+WHvBKAmdCXKvRApyk8="; }; - cargoHash = "sha256-FxhDnTy/KAeN0Zd5I12EUgXRc0VhHN0lRm5DQyCinyw="; + cargoHash = "sha256-xy8Vdy66Hb7NK2EEKj1Mn6HCVb7oxKkv/ffh+JS0Ync="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; diff --git a/pkgs/by-name/ar/argo-expr/package.nix b/pkgs/by-name/ar/argo-expr/package.nix new file mode 100644 index 000000000000..9048d604a6b2 --- /dev/null +++ b/pkgs/by-name/ar/argo-expr/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "argo-expr"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "blacha"; + repo = "argo-expr"; + rev = "v${version}"; + hash = "sha256-XQnPFzT3PRmKeAQXLzBE5R2VvXotzxmsq+u9u5iE1QA="; + }; + + vendorHash = "sha256-HGmJVxmAj9ijsWX+qJ7J9l3uO7WvXtRU2gvx2G7N7/M="; + + ldflags = [ "-X main.Version=v${version}" ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + meta = { + description = "Argo expression tester"; + homepage = "https://github.com/blacha/argo-expr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ l0b0 ]; + mainProgram = "argo-expr"; + }; +} diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/by-name/ar/argo-rollouts/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/argo-rollouts/default.nix rename to pkgs/by-name/ar/argo-rollouts/package.nix diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo/package.nix new file mode 100644 index 000000000000..adc658f61cd6 --- /dev/null +++ b/pkgs/by-name/ar/argo/package.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, pkgsBuildBuild +}: + +let + # Argo can package a static server in the CLI using the `staticfiles` go module. + # We build the CLI without the static server for simplicity, but the tool is still required for + # compilation to succeed. + # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 + staticfiles = pkgsBuildBuild.buildGoModule rec { + name = "staticfiles"; + + src = fetchFromGitHub { + owner = "bouk"; + repo = "staticfiles"; + rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd"; + hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; + }; + + vendorHash = null; + + excludedPackages = [ "./example" ]; + + preBuild = '' + cp ${./staticfiles.go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; + }; +in +buildGoModule rec { + pname = "argo"; + version = "3.5.12"; + + src = fetchFromGitHub { + owner = "argoproj"; + repo = "argo"; + rev = "refs/tags/v${version}"; + hash = "sha256-WJh6YP5WICgqJMPug3AIqxgrzH5Pp+rVtt5RfMjS9IU="; + }; + + vendorHash = "sha256-QwQasJMSEnHvBxyxCjLuinPt47XAhERch3j60KXGxa4="; + + doCheck = false; + + subPackages = [ + "cmd/argo" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + preBuild = '' + mkdir -p ui/dist/app + echo "Built without static files" > ui/dist/app/index.html + + ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" + "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean" + "-X github.com/argoproj/argo-workflows/v3.version=${version}" + ]; + + postInstall = '' + for shell in bash zsh; do + ${if (stdenv.buildPlatform == stdenv.hostPlatform) + then "$out/bin/argo" + else "${pkgsBuildBuild.argo}/bin/argo" + } completion $shell > argo.$shell + installShellCompletion argo.$shell + done + ''; + + meta = with lib; { + description = "Container native workflow engine for Kubernetes"; + mainProgram = "argo"; + homepage = "https://github.com/argoproj/argo"; + changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ groodt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/argo/staticfiles.go.mod b/pkgs/by-name/ar/argo/staticfiles.go.mod similarity index 100% rename from pkgs/applications/networking/cluster/argo/staticfiles.go.mod rename to pkgs/by-name/ar/argo/staticfiles.go.mod diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/argocd-autopilot/default.nix rename to pkgs/by-name/ar/argocd-autopilot/package.nix diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/by-name/ar/argocd-vault-plugin/package.nix similarity index 100% rename from pkgs/tools/security/argocd-vault-plugin/default.nix rename to pkgs/by-name/ar/argocd-vault-plugin/package.nix diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/by-name/ar/argocd/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/argocd/default.nix rename to pkgs/by-name/ar/argocd/package.nix diff --git a/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch b/pkgs/by-name/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch similarity index 100% rename from pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch rename to pkgs/by-name/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/by-name/ar/argononed/package.nix similarity index 100% rename from pkgs/misc/drivers/argononed/default.nix rename to pkgs/by-name/ar/argononed/package.nix diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/by-name/ar/argp-standalone/package.nix similarity index 100% rename from pkgs/development/libraries/argp-standalone/default.nix rename to pkgs/by-name/ar/argp-standalone/package.nix diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/by-name/ar/argparse/package.nix similarity index 100% rename from pkgs/development/libraries/argparse/default.nix rename to pkgs/by-name/ar/argparse/package.nix diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/by-name/ar/arguments/package.nix similarity index 100% rename from pkgs/development/libraries/arguments/default.nix rename to pkgs/by-name/ar/arguments/package.nix diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/by-name/ar/argus-clients/package.nix similarity index 100% rename from pkgs/tools/networking/argus-clients/default.nix rename to pkgs/by-name/ar/argus-clients/package.nix diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/by-name/ar/argus/package.nix similarity index 100% rename from pkgs/tools/networking/argus/default.nix rename to pkgs/by-name/ar/argus/package.nix diff --git a/pkgs/tools/graphics/argyllcms/jam-cross.patch b/pkgs/by-name/ar/argyllcms/jam-cross.patch similarity index 100% rename from pkgs/tools/graphics/argyllcms/jam-cross.patch rename to pkgs/by-name/ar/argyllcms/jam-cross.patch diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/by-name/ar/argyllcms/package.nix similarity index 100% rename from pkgs/tools/graphics/argyllcms/default.nix rename to pkgs/by-name/ar/argyllcms/package.nix diff --git a/pkgs/servers/ariang/default.nix b/pkgs/by-name/ar/ariang/package.nix similarity index 100% rename from pkgs/servers/ariang/default.nix rename to pkgs/by-name/ar/ariang/package.nix diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/by-name/ar/ario/package.nix similarity index 100% rename from pkgs/applications/audio/ario/default.nix rename to pkgs/by-name/ar/ario/package.nix diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/by-name/ar/arion/package.nix similarity index 100% rename from pkgs/applications/virtualization/arion/default.nix rename to pkgs/by-name/ar/arion/package.nix diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index e93cccf68420..7da2639a8e21 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -1,9 +1,21 @@ -{ lib -, python312Packages -, fetchFromGitHub -, nix-update-script +{ + lib, + python312Packages, + fetchFromGitHub, + nix-update-script, + fetchPypi, }: +let + pixel-font-builder-compat = python312Packages.pixel-font-builder.overrideAttrs rec { + version = "0.0.26"; + src = fetchPypi { + inherit version; + pname = "pixel_font_builder"; + hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8="; + }; + }; +in python312Packages.buildPythonPackage rec { pname = "ark-pixel-font"; version = "2024.05.12"; @@ -18,7 +30,7 @@ python312Packages.buildPythonPackage rec { format = "other"; nativeBuildInputs = with python312Packages; [ - pixel-font-builder + pixel-font-builder-compat unidata-blocks character-encoding-utils pypng diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix new file mode 100644 index 000000000000..639dca88f966 --- /dev/null +++ b/pkgs/by-name/ar/arkade/package.nix @@ -0,0 +1,57 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "arkade"; + version = "0.11.29"; + + src = fetchFromGitHub { + owner = "alexellis"; + repo = "arkade"; + rev = version; + hash = "sha256-B5MgBX8GPjBsfOCa1OoZRhQAUQxKH7GXYKMaH6TsUV4="; + }; + + CGO_ENABLED = 0; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = null; + + # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true + subPackages = [ + "." + "cmd" + "pkg/apps" + "pkg/archive" + "pkg/config" + "pkg/env" + "pkg/helm" + "pkg/k8s" + "pkg/types" + ]; + + ldflags = [ + "-s" "-w" + "-X github.com/alexellis/arkade/pkg.GitCommit=ref/tags/${version}" + "-X github.com/alexellis/arkade/pkg.Version=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd arkade \ + --bash <($out/bin/arkade completion bash) \ + --zsh <($out/bin/arkade completion zsh) \ + --fish <($out/bin/arkade completion fish) + ''; + + meta = with lib; { + homepage = "https://github.com/alexellis/arkade"; + description = "Open Source Kubernetes Marketplace"; + mainProgram = "arkade"; + license = licenses.mit; + maintainers = with maintainers; [ welteki techknowlogick qjoly ]; + }; +} diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/by-name/ar/arkpandora_ttf/package.nix similarity index 100% rename from pkgs/data/fonts/arkpandora/default.nix rename to pkgs/by-name/ar/arkpandora_ttf/package.nix diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/by-name/ar/armadillo/package.nix similarity index 100% rename from pkgs/development/libraries/armadillo/default.nix rename to pkgs/by-name/ar/armadillo/package.nix diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/pkgs/by-name/ar/armadillo/use-unix-config-on-OS-X.patch similarity index 100% rename from pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch rename to pkgs/by-name/ar/armadillo/use-unix-config-on-OS-X.patch diff --git a/pkgs/by-name/ar/armitage/gradle-8.patch b/pkgs/by-name/ar/armitage/gradle-8.patch new file mode 100644 index 000000000000..43dcc358f9a9 --- /dev/null +++ b/pkgs/by-name/ar/armitage/gradle-8.patch @@ -0,0 +1,28 @@ +Upstream PR: https://github.com/r00t0v3rr1d3/armitage/pull/1 +diff --git a/armitage/build.gradle b/armitage/build.gradle +index 43a5d08..50ae084 100644 +--- a/armitage/build.gradle ++++ b/armitage/build.gradle +@@ -19,7 +19,7 @@ jar { + from { + configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) } + } +- archiveName 'armitage.jar' ++ archiveFileName.set 'armitage.jar' + } + + dependencies { +diff --git a/cortana/build.gradle b/cortana/build.gradle +index c7d08bb..aa54635 100644 +--- a/cortana/build.gradle ++++ b/cortana/build.gradle +@@ -19,7 +19,8 @@ jar { + from { + configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) } + } +- archiveName 'cortana.jar' ++ duplicatesStrategy DuplicatesStrategy.INCLUDE ++ archiveFileName.set 'cortana.jar' + } + + dependencies { diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index 7d704633a360..0fc8455b4f87 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -3,7 +3,7 @@ , fetchurl , fetchFromGitHub , jdk11 -, gradle_6 +, gradle , metasploit , makeWrapper , makeDesktopItem @@ -15,8 +15,6 @@ let pname = "armitage"; version = "unstable-2022-12-05"; - gradle = gradle_6; - src = fetchFromGitHub { owner = "r00t0v3rr1d3"; repo = "armitage"; @@ -45,6 +43,8 @@ let url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/fix-meterpreter.patch"; hash = "sha256-p4fs5xFdC2apW0U8x8u9S4p5gq3Eiv+0E4CGccQZYKY="; }) + # Update for Gradle 8 (https://github.com/r00t0v3rr1d3/armitage/pull/1) + ./gradle-8.patch ]; in diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix new file mode 100644 index 000000000000..99c976e8ec71 --- /dev/null +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -0,0 +1,59 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + bgpq4, +}: + +python3Packages.buildPythonPackage rec { + pname = "arouteserver"; + version = "1.23.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pierky"; + repo = "arouteserver"; + rev = "v${version}"; + hash = "sha256-EZOBMDBsxbuVzzjQWU8V4n3gcLkRQxCq2eVK/Tyko4E="; + }; + + postPatch = '' + substituteInPlace tests/static/test_irr_queries_failover.py --replace-fail 'bgpq4 -h' '${lib.getExe bgpq4} -h' + + substituteInPlace pierky/arouteserver/builder.py pierky/arouteserver/config/program.py tests/static/test_cfg_program.py \ + --replace-fail '"bgpq4"' '"${lib.getExe bgpq4}"' + ''; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + aggregate6 + jinja2 + pyyaml + requests + packaging + urllib3 + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "pierky" + "pierky.arouteserver" + ]; + + pytestFlagsArray = [ "tests/static" ]; + + meta = { + description = "Automatically build (and test) feature-rich configurations for BGP route servers"; + mainProgram = "arouteserver"; + homepage = "https://github.com/pierky/arouteserver"; + changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst"; + license = with lib.licenses; [ gpl3Only ]; + maintainers = lib.teams.wdz.members ++ (with lib.maintainers; [ marcel ]); + }; +} diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/by-name/ar/arp-scan/package.nix similarity index 100% rename from pkgs/tools/misc/arp-scan/default.nix rename to pkgs/by-name/ar/arp-scan/package.nix diff --git a/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch b/pkgs/by-name/ar/arp-scan/remove-install-exec-hook.patch similarity index 100% rename from pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch rename to pkgs/by-name/ar/arp-scan/remove-install-exec-hook.patch diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/by-name/ar/arpa2cm/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/arpa2cm/default.nix rename to pkgs/by-name/ar/arpa2cm/package.nix diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/by-name/ar/arpa2common/package.nix similarity index 100% rename from pkgs/development/libraries/arpa2common/default.nix rename to pkgs/by-name/ar/arpa2common/package.nix diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/by-name/ar/arpack/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/arpack/default.nix rename to pkgs/by-name/ar/arpack/package.nix diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/by-name/ar/arping/package.nix similarity index 100% rename from pkgs/tools/networking/arping/default.nix rename to pkgs/by-name/ar/arping/package.nix diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/by-name/ar/arpoison/package.nix similarity index 100% rename from pkgs/tools/networking/arpoison/default.nix rename to pkgs/by-name/ar/arpoison/package.nix diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 04a5678f38f1..81b230d09179 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -35,6 +35,7 @@ nlohmann_json, openssl, perl, + pkg-config, protobuf, python3, rapidjson, @@ -49,8 +50,8 @@ zstd, testers, enableShared ? !stdenv.hostPlatform.isStatic, - enableFlight ? true, - enableJemalloc ? !stdenv.hostPlatform.isDarwin, + enableFlight ? stdenv.buildPlatform == stdenv.hostPlatform, + enableJemalloc ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64, enableS3 ? true, enableGcs ? !stdenv.hostPlatform.isDarwin, }: @@ -65,28 +66,29 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "735ae7128d571398dd798d7ff004adebeb342883"; - hash = "sha256-67KwnSt+EeEDvk+9kxR51tErL2wJqEPRITKb/dN+HMQ="; + rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; + hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "74278bc4a1122d74945969e6dec405abd1533ec3"; - hash = "sha256-WbpndtAviph6+I/F2bevuMI9DkfSv4SMPgMaP98k6Qo="; + rev = "a7f1d288e693dbb08e3199851c4eb2140ff8dff2"; + hash = "sha256-zLWJOWcW7OYL32OwBm9VFtHbmG+ibhteRfHlKr9G3CQ="; }; + version = "18.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; - version = "17.0.0"; + inherit version; src = fetchFromGitHub { owner = "apache"; repo = "arrow"; - rev = "apache-arrow-17.0.0"; - hash = "sha256-ZQqi1RFb4Ey0A0UVCThuIxM7DoFfkLwaeRAc2z8u9so="; + rev = "apache-arrow-${version}"; + hash = "sha256-V2lOYOUJwXSvPPk2G17uc1eZO88EATHKwwDnEroBrPw="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -125,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ninja autoconf # for vendored jemalloc flatbuffers @@ -171,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' patchShebangs build-support/ substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \ - --replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' + --replace-fail 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' ''; cmakeFlags = @@ -179,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" - "-DARROW_BUILD_TESTS=ON" + "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_INTEGRATION=ON" "-DARROW_BUILD_UTILITIES=ON" "-DARROW_EXTRA_ERROR_CONTEXT=ON" diff --git a/pkgs/tools/security/arsenal/default.nix b/pkgs/by-name/ar/arsenal/package.nix similarity index 100% rename from pkgs/tools/security/arsenal/default.nix rename to pkgs/by-name/ar/arsenal/package.nix diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/by-name/ar/artem/package.nix similarity index 100% rename from pkgs/applications/graphics/artem/default.nix rename to pkgs/by-name/ar/artem/package.nix diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/by-name/ar/artha/package.nix similarity index 100% rename from pkgs/applications/misc/artha/default.nix rename to pkgs/by-name/ar/artha/package.nix diff --git a/pkgs/data/themes/artim-dark/default.nix b/pkgs/by-name/ar/artim-dark/package.nix similarity index 100% rename from pkgs/data/themes/artim-dark/default.nix rename to pkgs/by-name/ar/artim-dark/package.nix diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/by-name/ar/artyFX/package.nix similarity index 100% rename from pkgs/applications/audio/artyFX/default.nix rename to pkgs/by-name/ar/artyFX/package.nix diff --git a/pkgs/tools/security/arubaotp-seed-extractor/default.nix b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix similarity index 100% rename from pkgs/tools/security/arubaotp-seed-extractor/default.nix rename to pkgs/by-name/ar/arubaotp-seed-extractor/package.nix diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/by-name/as/as-tree/package.nix similarity index 100% rename from pkgs/tools/misc/as-tree/default.nix rename to pkgs/by-name/as/as-tree/package.nix diff --git a/pkgs/tools/audio/asap/default.nix b/pkgs/by-name/as/asap/package.nix similarity index 100% rename from pkgs/tools/audio/asap/default.nix rename to pkgs/by-name/as/asap/package.nix diff --git a/pkgs/tools/compression/asar/package.json b/pkgs/by-name/as/asar/package.json similarity index 100% rename from pkgs/tools/compression/asar/package.json rename to pkgs/by-name/as/asar/package.json diff --git a/pkgs/tools/compression/asar/default.nix b/pkgs/by-name/as/asar/package.nix similarity index 100% rename from pkgs/tools/compression/asar/default.nix rename to pkgs/by-name/as/asar/package.nix diff --git a/pkgs/by-name/as/ascii-draw/package.nix b/pkgs/by-name/as/ascii-draw/package.nix index 6a845e2e2717..178952dc9f5f 100644 --- a/pkgs/by-name/as/ascii-draw/package.nix +++ b/pkgs/by-name/as/ascii-draw/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "ascii-draw"; - version = "0.4.0"; + version = "1.0.0"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "ascii-draw"; rev = "refs/tags/v${version}"; - hash = "sha256-lBlIZrjzJo9R6KnzUSbqz5c/6UbuTv/pQu5Sans37Hc="; + hash = "sha256-+K9th1LbESVzAiJqIplWpj2QHt7zDidENs7jHOuJ2S0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/by-name/as/ascii-image-converter/package.nix similarity index 100% rename from pkgs/applications/graphics/ascii-image-converter/default.nix rename to pkgs/by-name/as/ascii-image-converter/package.nix diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/by-name/as/ascii/package.nix similarity index 100% rename from pkgs/tools/text/ascii/default.nix rename to pkgs/by-name/as/ascii/package.nix diff --git a/pkgs/applications/video/asciicam/default.nix b/pkgs/by-name/as/asciicam/package.nix similarity index 100% rename from pkgs/applications/video/asciicam/default.nix rename to pkgs/by-name/as/asciicam/package.nix diff --git a/pkgs/by-name/as/asciidoctorj/package.nix b/pkgs/by-name/as/asciidoctorj/package.nix new file mode 100644 index 000000000000..4fe4878faae8 --- /dev/null +++ b/pkgs/by-name/as/asciidoctorj/package.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchzip, jdk, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "asciidoctorj"; + version = "3.0.0"; + + src = fetchzip { + url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; + sha256 = "sha256-F4tmpdNS0PIoLpqV9gifJf2iQ/kX+cp3EssRyhzyOUw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + rm bin/asciidoctorj.bat + cp -r . $out + wrapProgram $out/bin/asciidoctorj \ + --prefix JAVA_HOME : ${jdk} + ''; + + meta = with lib; { + description = "Official library for running Asciidoctor on the JVM"; + longDescription = '' + AsciidoctorJ is the official library for running Asciidoctor on the JVM. + Using AsciidoctorJ, you can convert AsciiDoc content or analyze the + structure of a parsed AsciiDoc document from Java and other JVM + languages. + ''; + homepage = "https://asciidoctor.org/docs/asciidoctorj/"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + mainProgram = "asciidoctorj"; + }; +} diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/by-name/as/asciigraph/package.nix similarity index 100% rename from pkgs/tools/text/asciigraph/default.nix rename to pkgs/by-name/as/asciigraph/package.nix diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/by-name/as/asciinema-scenario/package.nix similarity index 100% rename from pkgs/tools/misc/asciinema-scenario/default.nix rename to pkgs/by-name/as/asciinema-scenario/package.nix diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/by-name/as/asciinema/package.nix similarity index 100% rename from pkgs/tools/misc/asciinema/default.nix rename to pkgs/by-name/as/asciinema/package.nix diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/by-name/as/asciiquarium/package.nix similarity index 100% rename from pkgs/applications/misc/asciiquarium/default.nix rename to pkgs/by-name/as/asciiquarium/package.nix diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/by-name/as/asdf-vm/package.nix similarity index 100% rename from pkgs/tools/misc/asdf-vm/default.nix rename to pkgs/by-name/as/asdf-vm/package.nix diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/by-name/as/aseq2json/package.nix similarity index 100% rename from pkgs/os-specific/linux/aseq2json/default.nix rename to pkgs/by-name/as/aseq2json/package.nix diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix index e9be2526dd72..4d60c0b1d5e8 100644 --- a/pkgs/by-name/as/asfa/package.nix +++ b/pkgs/by-name/as/asfa/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, help2man, openssl, pkg-config, @@ -29,9 +28,7 @@ rustPlatform.buildRustPackage { "man" ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ help2man diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/by-name/as/ashpd-demo/package.nix similarity index 100% rename from pkgs/development/tools/ashpd-demo/default.nix rename to pkgs/by-name/as/ashpd-demo/package.nix diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix new file mode 100644 index 000000000000..3fe5e6716bd3 --- /dev/null +++ b/pkgs/by-name/as/ashuffle/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, meson +, ninja +, libmpdclient +, yaml-cpp +}: + +stdenv.mkDerivation rec { + pname = "ashuffle"; + version = "3.14.8"; + + src = fetchFromGitHub { + owner = "joshkunz"; + repo = "ashuffle"; + rev = "v${version}"; + hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E="; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake pkg-config meson ninja ]; + buildInputs = [ libmpdclient yaml-cpp ]; + + mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-framework CoreFoundation"; + }; + + meta = with lib; { + homepage = "https://github.com/joshkunz/ashuffle"; + description = "Automatic library-wide shuffle for mpd"; + maintainers = [ maintainers.tcbravo ]; + platforms = platforms.unix; + license = licenses.mit; + mainProgram = "ashuffle"; + }; +} diff --git a/pkgs/tools/misc/askalono/default.nix b/pkgs/by-name/as/askalono/package.nix similarity index 100% rename from pkgs/tools/misc/askalono/default.nix rename to pkgs/by-name/as/askalono/package.nix diff --git a/pkgs/by-name/as/asleap/package.nix b/pkgs/by-name/as/asleap/package.nix new file mode 100644 index 000000000000..d488537665b6 --- /dev/null +++ b/pkgs/by-name/as/asleap/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + libpcap, + libxcrypt, +}: + +stdenv.mkDerivation { + pname = "asleap"; + version = "unstable-2021-06-20"; + + src = fetchFromGitHub { + owner = "zackw"; + repo = "asleap"; + rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f"; + sha256 = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8="; + }; + + buildInputs = [ + openssl + libpcap + libxcrypt + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 asleap $out/bin/asleap + install -Dm755 genkeys $out/bin/genkeys + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/zackw/asleap"; + description = "Recovers weak LEAP and PPTP passwords"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ pyrox0 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 08da3009f6bb..28b97237e0f9 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -5,8 +5,6 @@ fetchFromGitHub, pkg-config, openssl, - darwin, - libiconv, }: let pname = "asm-lsp"; @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.buildPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - libiconv - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/by-name/as/asmfmt/package.nix similarity index 100% rename from pkgs/development/tools/asmfmt/default.nix rename to pkgs/by-name/as/asmfmt/package.nix diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/by-name/as/asmjit/package.nix similarity index 100% rename from pkgs/development/libraries/asmjit/default.nix rename to pkgs/by-name/as/asmjit/package.nix diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/by-name/as/asn1c/package.nix similarity index 100% rename from pkgs/development/compilers/asn1c/default.nix rename to pkgs/by-name/as/asn1c/package.nix diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/by-name/as/asnmap/package.nix similarity index 100% rename from pkgs/tools/security/asnmap/default.nix rename to pkgs/by-name/as/asnmap/package.nix diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/by-name/as/aspcud/package.nix similarity index 100% rename from pkgs/tools/misc/aspcud/default.nix rename to pkgs/by-name/as/aspcud/package.nix diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/by-name/as/aspectj/package.nix similarity index 100% rename from pkgs/development/compilers/aspectj/default.nix rename to pkgs/by-name/as/aspectj/package.nix diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/by-name/as/aspino/package.nix similarity index 100% rename from pkgs/applications/science/logic/aspino/default.nix rename to pkgs/by-name/as/aspino/package.nix diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/by-name/as/assaultcube/package.nix similarity index 100% rename from pkgs/games/assaultcube/default.nix rename to pkgs/by-name/as/assaultcube/package.nix diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/by-name/as/assh/package.nix similarity index 100% rename from pkgs/tools/networking/assh/default.nix rename to pkgs/by-name/as/assh/package.nix diff --git a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/pkgs/by-name/as/assign-lb-ip/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/assign-lb-ip/default.nix rename to pkgs/by-name/as/assign-lb-ip/package.nix diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/by-name/as/assimp/package.nix similarity index 100% rename from pkgs/development/libraries/assimp/default.nix rename to pkgs/by-name/as/assimp/package.nix diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix new file mode 100644 index 000000000000..1ac601f67ff9 --- /dev/null +++ b/pkgs/by-name/as/astc-encoder/package.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, simdExtensions ? null +}: + +let + inherit (lib) + head + licenses + maintainers + platforms + replaceStrings + toList + ; + + # SIMD instruction sets to compile for. If none are specified by the user, + # an appropriate one is selected based on the detected host system + isas = with stdenv.hostPlatform; + if simdExtensions != null then toList simdExtensions + else if avx2Support then [ "AVX2" ] + else if sse4_1Support then [ "SSE41" ] + else if isx86_64 then [ "SSE2" ] + else if isAarch64 then [ "NEON" ] + else [ "NONE" ]; + + # CMake Build flags for the selected ISAs. For a list of flags, see + # https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md + isaFlags = map ( isa: "-DASTCENC_ISA_${isa}=ON" ) isas; + + # The suffix of the binary to link as 'astcenc' + mainBinary = replaceStrings + [ "AVX2" "SSE41" "SSE2" "NEON" "NONE" "NATIVE" ] + [ "avx2" "sse4.1" "sse2" "neon" "none" "native" ] + ( head isas ); +in + +stdenv.mkDerivation rec { + pname = "astc-encoder"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "ARM-software"; + repo = "astc-encoder"; + rev = version; + sha256 = "sha256-ngorPKDBRk4u4EUoJHAz5jrUiNUGffJKdEf9fiWbi/g="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeBuildType = "RelWithDebInfo"; + + cmakeFlags = isaFlags ++ [ + "-DASTCENC_UNIVERSAL_BUILD=OFF" + ]; + + # Set a fixed build year to display within help output (otherwise, it would be 1980) + postPatch = '' + substituteInPlace Source/cmake_core.cmake \ + --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2023")' + ''; + + # Provide 'astcenc' link to main executable + postInstall = '' + ln -s $out/bin/astcenc-${mainBinary} $out/bin/astcenc + ''; + + meta = { + homepage = "https://github.com/ARM-software/astc-encoder"; + description = "Encoder for the ASTC texture compression format"; + longDescription = '' + The Adaptive Scalable Texture Compression (ASTC) format is + widely supported by mobile and desktop graphics hardware and + provides better quality at a given bitrate compared to ETC2. + + This program supports both compression and decompression in LDR + and HDR mode and can read various image formats. Run `astcenc + -help` to see all the options. + ''; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ dasisdormax ]; + broken = !stdenv.hostPlatform.is64bit; + }; +} diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix similarity index 100% rename from pkgs/servers/asterisk/sccp/default.nix rename to pkgs/by-name/as/asterisk-module-sccp/package.nix diff --git a/pkgs/applications/science/biology/astral/make-deterministic.patch b/pkgs/by-name/as/astral/make-deterministic.patch similarity index 100% rename from pkgs/applications/science/biology/astral/make-deterministic.patch rename to pkgs/by-name/as/astral/make-deterministic.patch diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/by-name/as/astral/package.nix similarity index 100% rename from pkgs/applications/science/biology/astral/default.nix rename to pkgs/by-name/as/astral/package.nix diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/by-name/as/astrolabe-generator/package.nix similarity index 100% rename from pkgs/applications/science/astronomy/astrolabe-generator/default.nix rename to pkgs/by-name/as/astrolabe-generator/package.nix diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/by-name/as/astrolog/package.nix similarity index 100% rename from pkgs/applications/science/astronomy/astrolog/default.nix rename to pkgs/by-name/as/astrolog/package.nix diff --git a/pkgs/games/astromenace/default.nix b/pkgs/by-name/as/astromenace/package.nix similarity index 100% rename from pkgs/games/astromenace/default.nix rename to pkgs/by-name/as/astromenace/package.nix diff --git a/pkgs/tools/misc/astronomer/default.nix b/pkgs/by-name/as/astronomer/package.nix similarity index 100% rename from pkgs/tools/misc/astronomer/default.nix rename to pkgs/by-name/as/astronomer/package.nix diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/by-name/as/astyle/package.nix similarity index 100% rename from pkgs/development/tools/misc/astyle/default.nix rename to pkgs/by-name/as/astyle/package.nix diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/by-name/as/asunder/package.nix similarity index 100% rename from pkgs/applications/audio/asunder/default.nix rename to pkgs/by-name/as/asunder/package.nix diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/by-name/as/asusctl/Cargo.lock similarity index 100% rename from pkgs/applications/system/asusctl/Cargo.lock rename to pkgs/by-name/as/asusctl/Cargo.lock diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/by-name/as/asusctl/package.nix similarity index 100% rename from pkgs/applications/system/asusctl/default.nix rename to pkgs/by-name/as/asusctl/package.nix diff --git a/pkgs/development/tools/async/default.nix b/pkgs/by-name/as/async/package.nix similarity index 100% rename from pkgs/development/tools/async/default.nix rename to pkgs/by-name/as/async/package.nix diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix new file mode 100644 index 000000000000..709ea738e46b --- /dev/null +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, gsettings-desktop-schemas +, makeWrapper +, dbus +, glib +, dconf +, libX11 +, libxml2 +, libXtst +, libXi +, libXext +, gnome +, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +}: + +stdenv.mkDerivation rec { + pname = "at-spi2-core"; + version = "2.54.0"; + + outputs = [ "out" "dev" ]; + separateDebugInfo = true; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-1+7n51vt3MJyztwrYFNWAPOq5uSBWJ68Znr8Q3wKYHk="; + }; + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + makeWrapper + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ]; + + buildInputs = [ + libX11 + libxml2 + # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case + libXtst + libXi + # libXext is a transitive dependency of libXi + libXext + ] ++ lib.optionals systemdSupport [ + # libsystemd is a needed for dbus-broker support + systemd + ]; + + # In atspi-2.pc dbus-1 glib-2.0 + # In atk.pc gobject-2.0 + propagatedBuildInputs = [ + dbus + glib + ]; + + # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + doCheck = false; + + mesonFlags = [ + # Provide dbus-daemon fallback when it is not already running when + # at-spi2-bus-launcher is executed. This allows us to avoid + # including the entire dbus closure in libraries linked with + # the at-spi2-core libraries. + "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" + ] ++ lib.optionals systemdSupport [ + # Same as the above, but for dbus-broker + "-Ddbus_broker=/run/current-system/sw/bin/dbus-broker-launch" + ] ++ lib.optionals (!systemdSupport) [ + "-Duse_systemd=false" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + postFixup = '' + # Cannot use wrapGAppsHook'due to a dependency cycle + wrapProgram $out/libexec/at-spi-bus-launcher \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} + ''; + + meta = with lib; { + description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; + homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/at/default.nix b/pkgs/by-name/at/at/package.nix similarity index 100% rename from pkgs/tools/system/at/default.nix rename to pkgs/by-name/at/at/package.nix diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 000b41b1b904..2ed394ee20ae 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, oniguruma, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "atac"; @@ -20,19 +18,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ oniguruma ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; @@ -42,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "Simple API client (postman like) in your terminal"; homepage = "https://github.com/Julien-cpsn/ATAC"; license = licenses.mit; - maintainers = with maintainers; [vinnymeller]; + maintainers = with maintainers; [ vinnymeller ]; mainProgram = "atac"; }; } diff --git a/pkgs/games/atanks/default.nix b/pkgs/by-name/at/atanks/package.nix similarity index 100% rename from pkgs/games/atanks/default.nix rename to pkgs/by-name/at/atanks/package.nix diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/by-name/at/atftp/package.nix similarity index 100% rename from pkgs/tools/networking/atftp/default.nix rename to pkgs/by-name/at/atftp/package.nix diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/by-name/at/atheme/package.nix similarity index 100% rename from pkgs/servers/irc/atheme/default.nix rename to pkgs/by-name/at/atheme/package.nix diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 4b4958c643b7..21acfc9f37d6 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "athens"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0="; + hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU="; }; - vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A="; + vendorHash = "sha256-W65lQYGrRg8LwFERj5MBOPFAn2j+FE7ep4ANuAGmfgM="; CGO_ENABLED = "0"; ldflags = [ diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/by-name/at/atinout/package.nix similarity index 100% rename from pkgs/tools/networking/atinout/default.nix rename to pkgs/by-name/at/atinout/package.nix diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/by-name/at/atkinson-hyperlegible/package.nix similarity index 100% rename from pkgs/data/fonts/atkinson-hyperlegible/default.nix rename to pkgs/by-name/at/atkinson-hyperlegible/package.nix diff --git a/pkgs/by-name/at/atkinson-monolegible/package.nix b/pkgs/by-name/at/atkinson-monolegible/package.nix new file mode 100644 index 000000000000..0673152d2aba --- /dev/null +++ b/pkgs/by-name/at/atkinson-monolegible/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation { + pname = "atkinson-monolegible"; + version = "0-unstable-2023-02-27"; + + src = fetchFromGitHub { + owner = "Hylian"; + repo = "atkinson-monolegible"; + rev = "4d0e404118dece699ca926c310588316bfcd5ac2"; + hash = "sha256-U09ysphpDjXG/OwPxQDUiLHAYHGfiY+lL4+QIQLPj74="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 AtkinsonMonolegible.ttf -t $out/share/fonts/truetype + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/Hylian/atkinson-monolegible"; + description = "Mono variant of the Atkinson Hyperlegible typeface"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ Gliczy ]; + }; +} diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/by-name/at/atlantis/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/atlantis/default.nix rename to pkgs/by-name/at/atlantis/package.nix diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/by-name/at/atlassian-cli/package.nix similarity index 100% rename from pkgs/applications/office/atlassian-cli/default.nix rename to pkgs/by-name/at/atlassian-cli/package.nix diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/by-name/at/atlassian-cli/wrapper.sh similarity index 100% rename from pkgs/applications/office/atlassian-cli/wrapper.sh rename to pkgs/by-name/at/atlassian-cli/wrapper.sh diff --git a/pkgs/by-name/at/atlauncher/deps.json b/pkgs/by-name/at/atlauncher/deps.json index bd7ab048a99b..f63cf02eb6b1 100644 --- a/pkgs/by-name/at/atlauncher/deps.json +++ b/pkgs/by-name/at/atlauncher/deps.json @@ -475,6 +475,39 @@ "jar": "sha256-X08MQDHkuDyzae8A9JCc229isR49JT+DphhNgMXrMVc=", "pom": "sha256-jcFqM2Rg2Fc4wPw+JKyUwGNwmwHZFYOOBV/PaAFgXV0=" }, + "com/twelvemonkeys#twelvemonkeys/3.12.0": { + "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA=" + }, + "com/twelvemonkeys/common#common-image/3.12.0": { + "jar": "sha256-YqOCHHJPrf2jRsHi2DsMUGoMQHS+JppSv04xksfdkrw=", + "pom": "sha256-Mvxj0YSlsUAz7Z6uKPTH91cL6IUMZ+80q1DIpb3qlX8=" + }, + "com/twelvemonkeys/common#common-io/3.12.0": { + "jar": "sha256-v6z+sCrKxH2/0fqwAC6uymVUfQQklJi2VDIMng/fZkc=", + "pom": "sha256-X7G3pgrtAmv+FsK7u0MDlUfe3Q1OYT6AEnuTtKLFY1k=" + }, + "com/twelvemonkeys/common#common-lang/3.12.0": { + "jar": "sha256-XGXlBLW2TYBoPg+nCh3RVN2D1N59o38h6VD1qcA7xm0=", + "pom": "sha256-nFFSKc9KTl73IdpjR/+hm5wCetXeEHmQWUBdf6MtjVI=" + }, + "com/twelvemonkeys/common#common/3.12.0": { + "pom": "sha256-2prJlYu3TvpH0EAuhjHAw4djh0qVMDcP9X8HMTLJVv8=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.12.0": { + "jar": "sha256-NMb5G/OyF+0BFbzoKDI4+9AmRWKqaCtCJqOWDQ7emBU=", + "pom": "sha256-N9att80pHm9n9inza8bpGiV6VFjj7lgf7BJ/aZIYG3g=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.12.0": { + "jar": "sha256-eX0Ca2fQfm1esAoatTpVrKq2+Apxxe4yVXIJPrkMDKo=", + "pom": "sha256-kIUqjzz4kZBqjShwC8/EQ/EZd1iEbm7lZR1pHBNCrpw=" + }, + "com/twelvemonkeys/imageio#imageio-webp/3.12.0": { + "jar": "sha256-Q9xEfM/jTFxcb10xGQJw4fm/ZfYDddaXriqP9DNGhSY=", + "pom": "sha256-YciGwb7ZmY5w46JD9w11sWV7CIAgf+FdOgbEh7LhQfg=" + }, + "com/twelvemonkeys/imageio#imageio/3.12.0": { + "pom": "sha256-ZI62q9rpluXh0kjqy1Gk3LYD4uwnHK6Mjh8PnLpK+Pk=" + }, "commons-beanutils#commons-beanutils/1.9.4": { "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index a276dff1c787..46bb07d4131d 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -21,13 +21,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.37.3"; + version = "3.4.37.4"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-XdTbrM7FPR0o0d+p4ko48UonMsY+nLfiXj5fP2a3/zI="; + hash = "sha256-3Rs6XtqhD9PKz8ekF0STaANvPQ73KSUS8GIPvn9DmbQ="; }; postPatch = '' diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix new file mode 100644 index 000000000000..54d7c4fd6824 --- /dev/null +++ b/pkgs/by-name/at/atmos/package.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "atmos"; + version = "1.95.0"; + + src = fetchFromGitHub { + owner = "cloudposse"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas="; + }; + + vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo="; + + ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; + + preCheck = '' + # Remove tests that depend on a network connection. + rm -f \ + pkg/vender/component_vendor_test.go \ + pkg/atlantis/atlantis_generate_repo_config_test.go \ + pkg/describe/describe_affected_test.go + ''; + + doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/atmos version | grep "v${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://atmos.tools"; + changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}"; + description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; + mainProgram = "atmos"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.cloudposse.members; + }; +} diff --git a/pkgs/tools/security/atomic-operator/default.nix b/pkgs/by-name/at/atomic-operator/package.nix similarity index 100% rename from pkgs/tools/security/atomic-operator/default.nix rename to pkgs/by-name/at/atomic-operator/package.nix diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/by-name/at/atomic-swap/package.nix similarity index 100% rename from pkgs/applications/blockchains/atomic-swap/default.nix rename to pkgs/by-name/at/atomic-swap/package.nix diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/by-name/at/atool/package.nix similarity index 100% rename from pkgs/tools/archivers/atool/default.nix rename to pkgs/by-name/at/atool/package.nix diff --git a/pkgs/os-specific/linux/atop/atop.service.patch b/pkgs/by-name/at/atop/atop.service.patch similarity index 100% rename from pkgs/os-specific/linux/atop/atop.service.patch rename to pkgs/by-name/at/atop/atop.service.patch diff --git a/pkgs/os-specific/linux/atop/fix-paths.patch b/pkgs/by-name/at/atop/fix-paths.patch similarity index 100% rename from pkgs/os-specific/linux/atop/fix-paths.patch rename to pkgs/by-name/at/atop/fix-paths.patch diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/by-name/at/atop/package.nix similarity index 100% rename from pkgs/os-specific/linux/atop/default.nix rename to pkgs/by-name/at/atop/package.nix diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix new file mode 100644 index 000000000000..b2ba3474d212 --- /dev/null +++ b/pkgs/by-name/at/atproto-goat/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + unstableGitUpdater, +}: + +buildGoModule rec { + pname = "atproto-goat"; + version = "0-unstable-2024-10-29"; + + src = fetchFromGitHub { + owner = "bluesky-social"; + repo = "indigo"; + rev = "983ce4a481a32a3eb2944c4c76e885d0f6006f83"; + hash = "sha256-Jo3pI4uRyKh3yV03ijOcg+Uyu75Spmy/VS116MVgleU="; + }; + + postPatch = '' + substituteInPlace cmd/goat/main.go \ + --replace-fail "versioninfo.Short()" '"${version}"' \ + --replace-fail '"github.com/carlmjohnson/versioninfo"' "" + ''; + + vendorHash = "sha256-T+jtxubVKskrLGTUa4RI24o/WTSFCBk60HhyCFujPOI="; + + subPackages = [ "cmd/goat" ]; + + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + meta = { + description = "Go AT protocol CLI tool"; + homepage = "https://github.com/bluesky-social/indigo/blob/main/cmd/goat/README.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "goat"; + }; +} diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/by-name/at/ats-acc/package.nix similarity index 100% rename from pkgs/development/tools/ats-acc/default.nix rename to pkgs/by-name/at/ats-acc/package.nix diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch similarity index 100% rename from pkgs/development/compilers/ats/install-atsdoc-hats-files.patch rename to pkgs/by-name/at/ats/install-atsdoc-hats-files.patch diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/by-name/at/ats/package.nix similarity index 100% rename from pkgs/development/compilers/ats/default.nix rename to pkgs/by-name/at/ats/package.nix diff --git a/pkgs/by-name/at/ats2/package.nix b/pkgs/by-name/at/ats2/package.nix new file mode 100644 index 000000000000..339d9e6b7e31 --- /dev/null +++ b/pkgs/by-name/at/ats2/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchurl, + gmp, + withEmacsSupport ? true, + withContrib ? true, +}: + +let + versionPkg = "0.4.2"; + + contrib = fetchurl { + url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; + hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; + }; + + postInstallContrib = lib.optionalString withContrib '' + local contribDir=$out/lib/ats2-postiats-*/ ; + mkdir -p $contribDir ; + tar -xzf "${contrib}" --strip-components 1 -C $contribDir ; + ''; + + postInstallEmacs = lib.optionalString withEmacsSupport '' + local siteLispDir=$out/share/emacs/site-lisp/ats2 ; + mkdir -p $siteLispDir ; + install -m 0644 -v ./utils/emacs/*.el $siteLispDir ; + ''; +in + +stdenv.mkDerivation rec { + pname = "ats2"; + version = versionPkg; + + src = fetchurl { + url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; + hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; + }; + + postPatch = lib.optionalString stdenv.cc.isClang '' + sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats + ''; + + buildInputs = [ gmp ]; + + # Disable parallel build, errors: + # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. + enableParallelBuilding = false; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CCOMP=${stdenv.cc.targetPrefix}cc" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + + setupHook = + let + hookFiles = [ ./setup-hook.sh ] ++ lib.optional withContrib ./setup-contrib-hook.sh; + in + builtins.toFile "setupHook.sh" (lib.concatMapStringsSep "\n" builtins.readFile hookFiles); + + postInstall = postInstallContrib + postInstallEmacs; + + meta = with lib; { + description = "Functional programming language with dependent types"; + homepage = "http://www.ats-lang.org"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ + thoughtpolice + ttuegel + bbarker + ]; + }; +} diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/by-name/at/ats2/setup-contrib-hook.sh similarity index 100% rename from pkgs/development/compilers/ats2/setup-contrib-hook.sh rename to pkgs/by-name/at/ats2/setup-contrib-hook.sh diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/by-name/at/ats2/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/ats2/setup-hook.sh rename to pkgs/by-name/at/ats2/setup-hook.sh diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index 1a488894e8dd..2e3117b04db8 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -13,7 +13,6 @@ zlib, openal, fontconfig, - darwin, }: stdenv.mkDerivation { @@ -43,13 +42,6 @@ stdenv.mkDerivation { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openal fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.CoreVideo - darwin.apple_sdk.frameworks.OpenAL ]; makeFlags = [ diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index e50cdde161ef..f863e578a076 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -3,9 +3,8 @@ , fetchFromGitHub , installShellFiles , rustPlatform -, libiconv , buildPackages -, darwin +, apple-sdk_11 , nixosTests }: @@ -36,10 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration + apple-sdk_11 ]; preBuild = '' diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/by-name/au/aubio/package.nix similarity index 100% rename from pkgs/development/libraries/aubio/default.nix rename to pkgs/by-name/au/aubio/package.nix diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/by-name/au/aucatctl/package.nix similarity index 100% rename from pkgs/applications/audio/aucatctl/default.nix rename to pkgs/by-name/au/aucatctl/package.nix diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/by-name/au/auctex/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/auctex/default.nix rename to pkgs/by-name/au/auctex/package.nix diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index cbd16b123405..050ace8c708a 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -52,9 +52,9 @@ wavpack, wxGTK32, gtk3, + apple-sdk_11, libpng, libjpeg, - darwin, }: # TODO @@ -62,31 +62,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "audacity"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${finalAttrs.version}"; - hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; + hash = "sha256-jwsn/L9e1ViWLOh8Xc4lTS9FhanD4GK0BllCwtPamZc="; }; postPatch = '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ - --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" + --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ - --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' - + - lib.optionalString - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") - '' - sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm - ''; + --replace-fail /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + ''; nativeBuildInputs = [ @@ -150,8 +144,7 @@ stdenv.mkDerivation (finalAttrs: { util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreAudioKit # for portaudio + apple-sdk_11 libpng libjpeg ]; diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/by-name/au/audiality2/package.nix similarity index 100% rename from pkgs/development/libraries/audiality2/default.nix rename to pkgs/by-name/au/audiality2/package.nix diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix index b0026fef4641..682be8b6c270 100644 --- a/pkgs/by-name/au/audible-cli/package.nix +++ b/pkgs/by-name/au/audible-cli/package.nix @@ -51,7 +51,9 @@ python3Packages.buildPythonApplication rec { "audible_cli" ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "[0-9.]+" ]; + }; meta = with lib; { description = "Command line interface for audible package. With the cli you can download your Audible books, cover, chapter files"; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/by-name/au/audio-recorder/package.nix similarity index 100% rename from pkgs/applications/audio/audio-recorder/default.nix rename to pkgs/by-name/au/audio-recorder/package.nix diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index c478742a9876..9fd9317d4640 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "fba9cce82ec1a94e002d34a6b012eadf34c759a0", - "hash": "sha256-BoNveMooYfRPKUJK5aqzeKVmY4MNyH9FwO0/EON2cZY=", - "version": "2.16.0", - "depsHash": "sha256-yr5k151jGGT3O2CfDfdKfN7s2e8tUdrS8PWA5tX1BMA=", - "clientDepsHash": "sha256-LJk+cbW3JTzUl6M0PqWj3tLWx29bGYgG+HohCiFoaME=" + "rev": "50fd659749128a321ecc3284e128d014433145a9", + "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=", + "version": "2.16.1", + "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=", + "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc=" } diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/by-name/au/audiowaveform/package.nix similarity index 100% rename from pkgs/tools/audio/audiowaveform/default.nix rename to pkgs/by-name/au/audiowaveform/package.nix diff --git a/pkgs/tools/system/augeas/bootstrap.diff b/pkgs/by-name/au/augeas/bootstrap.diff similarity index 100% rename from pkgs/tools/system/augeas/bootstrap.diff rename to pkgs/by-name/au/augeas/bootstrap.diff diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/by-name/au/augeas/package.nix similarity index 100% rename from pkgs/tools/system/augeas/default.nix rename to pkgs/by-name/au/augeas/package.nix diff --git a/pkgs/development/compilers/august/default.nix b/pkgs/by-name/au/august/package.nix similarity index 100% rename from pkgs/development/compilers/august/default.nix rename to pkgs/by-name/au/august/package.nix diff --git a/pkgs/games/augustus/darwin-fixes.patch b/pkgs/by-name/au/augustus/darwin-fixes.patch similarity index 100% rename from pkgs/games/augustus/darwin-fixes.patch rename to pkgs/by-name/au/augustus/darwin-fixes.patch diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix new file mode 100644 index 000000000000..c2b116f269f2 --- /dev/null +++ b/pkgs/by-name/au/augustus/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + SDL2, + SDL2_mixer, + libpng, + darwin, + apple-sdk_11, + libicns, + imagemagick, +}: + +stdenv.mkDerivation rec { + pname = "augustus"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "Keriew"; + repo = "augustus"; + rev = "v${version}"; + sha256 = "sha256-UWJmxirRJJqvL4ZSjBvFepeKVvL77+WMp4YdZuFNEkg="; + }; + + patches = [ ./darwin-fixes.patch ]; + + nativeBuildInputs = + [ cmake ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.sigtool + libicns + imagemagick + ]; + + buildInputs = [ + SDL2 + SDL2_mixer + libpng + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + mkdir -p $out/Applications + cp -r augustus.app $out/Applications/ + runHook postInstall + ''; + + meta = with lib; { + description = "Open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes"; + mainProgram = "augustus"; + homepage = "https://github.com/Keriew/augustus"; + license = licenses.agpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ + Thra11 + matteopacini + ]; + }; +} diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/by-name/au/aurulent-sans/package.nix similarity index 100% rename from pkgs/data/fonts/aurulent-sans/default.nix rename to pkgs/by-name/au/aurulent-sans/package.nix diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/by-name/au/auth0-cli/package.nix similarity index 100% rename from pkgs/tools/admin/auth0-cli/default.nix rename to pkgs/by-name/au/auth0-cli/package.nix diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/by-name/au/authenticator/package.nix similarity index 100% rename from pkgs/applications/misc/authenticator/default.nix rename to pkgs/by-name/au/authenticator/package.nix diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 82a0144e1a58..ed1da779fb23 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -110,75 +110,15 @@ let python = python312.override { self = python; packageOverrides = final: prev: { - django-tenants = prev.buildPythonPackage rec { - pname = "django-tenants"; - version = "unstable-2024-01-11"; + django-tenants = prev.django-tenants.overrideAttrs { + version = "3.6.1-unstable-2024-01-11"; src = fetchFromGitHub { owner = "rissson"; - repo = pname; + repo = "django-tenants"; rev = "a7f37c53f62f355a00142473ff1e3451bb794eca"; hash = "sha256-YBT0kcCfETXZe0j7/f1YipNIuRrcppRVh1ecFS3cvNo="; }; - format = "setuptools"; - doCheck = false; # Tests require postgres - - propagatedBuildInputs = with final; [ - django - psycopg - gunicorn - ]; }; - - django-cte = prev.buildPythonPackage rec { - pname = "django-cte"; - version = "1.3.3"; - src = fetchFromGitHub { - owner = "dimagi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE="; - }; - doCheck = false; # Tests require postgres - format = "setuptools"; - }; - - django-pgactivity = prev.buildPythonPackage rec { - pname = "django-pgactivity"; - version = "1.4.1"; - src = fetchFromGitHub { - owner = "Opus10"; - repo = pname; - rev = version; - hash = "sha256-VwH7fwLcoH2Z9D/OY9iieM0cRhyDKOpAzqQ+4YVE3vU="; - }; - nativeBuildInputs = with prev; [ - poetry-core - ]; - propagatedBuildInputs = with final; [ - django - ]; - pyproject = true; - }; - - django-pglock = prev.buildPythonPackage rec { - pname = "django-pglock"; - version = "1.5.1"; - src = fetchFromGitHub { - owner = "Opus10"; - repo = pname; - rev = version; - hash = "sha256-ZoEHDkGmrcNiMe/rbwXsEPZo3LD93cZp6zjftMKjLeg="; - }; - nativeBuildInputs = with prev; [ - poetry-core - ]; - propagatedBuildInputs = with final; [ - django - django-pgactivity - ]; - pyproject = true; - }; - # Use 3.14.0 until https://github.com/encode/django-rest-framework/issues/9358 is fixed. # Otherwise applying blueprints/default/default-brand.yaml fails with: # authentik.flows.models.RelatedObjectDoesNotExist: FlowStageBinding has no target. @@ -213,48 +153,6 @@ let pythonImportsCheck = [ "rest_framework" ]; }; - tenant-schemas-celery = prev.buildPythonPackage rec { - pname = "tenant-schemas-celery"; - version = "3.0.0"; - src = fetchFromGitHub { - owner = "maciej-gol"; - repo = pname; - rev = version; - hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; - }; - format = "setuptools"; - doCheck = false; - - propagatedBuildInputs = with final; [ - freezegun - more-itertools - psycopg2 - ]; - }; - - scim2-filter-parser = prev.buildPythonPackage rec { - pname = "scim2-filter-parser"; - version = "0.5.1"; - # For some reason the normal fetchPypi does not work - src = fetchzip { - url = "https://files.pythonhosted.org/packages/54/df/ad9718acce76e81a93c57327356eecd23701625f240fbe03d305250399e6/scim2_filter_parser-0.5.1.tar.gz"; - hash = "sha256-DZAdRj6qyySggsvJZC47vdvXbHrB1ra3qiYBEUiceJ4="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'poetry>=0.12' 'poetry-core>=1.0.0' \ - --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' - ''; - - nativeBuildInputs = [ prev.poetry-core ]; - pyproject = true; - - propagatedBuildInputs = with final; [ - sly - ]; - }; - authentik-django = prev.buildPythonPackage { pname = "authentik-django"; inherit version src meta; diff --git a/pkgs/tools/security/authz0/default.nix b/pkgs/by-name/au/authz0/package.nix similarity index 100% rename from pkgs/tools/security/authz0/default.nix rename to pkgs/by-name/au/authz0/package.nix diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix similarity index 100% rename from pkgs/applications/misc/auto-multiple-choice/default.nix rename to pkgs/by-name/au/auto-multiple-choice/package.nix diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix new file mode 100644 index 000000000000..5096c4fcf56a --- /dev/null +++ b/pkgs/by-name/au/auto-patchelf/package.nix @@ -0,0 +1,36 @@ +{ + lib, + python3Packages, +}: + +python3Packages.buildPythonApplication { + pname = "auto-patchelf"; + version = "0-unstable-2024-08-14"; + pyproject = false; + + src = ./source; + + dependencies = with python3Packages; [ + pyelftools + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 auto-patchelf.py $out/bin/auto-patchelf + + runHook postInstall + ''; + + makeWrapperArgs = [ + "--set DEFAULT_BINTOOLS $NIX_BINTOOLS" + ]; + + meta = { + description = "Automatically patch ELF binaries using patchelf"; + mainProgram = "auto-patchelf"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Scrumplex ]; + }; +} diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py similarity index 99% rename from pkgs/build-support/setup-hooks/auto-patchelf.py rename to pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index eca3007514de..938ea6310118 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -425,7 +425,7 @@ interpreter_arch: str = None # type: ignore libc_lib: Path = None # type: ignore if __name__ == "__main__": - nix_support = Path(os.environ['NIX_BINTOOLS']) / 'nix-support' + nix_support = Path(os.environ.get('NIX_BINTOOLS', os.environ['DEFAULT_BINTOOLS'])) / 'nix-support' interpreter_path = Path((nix_support / 'dynamic-linker').read_text().strip()) libc_lib = Path((nix_support / 'orig-libc').read_text().strip()) / 'lib' diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/by-name/au/autoadb/package.nix similarity index 100% rename from pkgs/misc/autoadb/default.nix rename to pkgs/by-name/au/autoadb/package.nix diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/by-name/au/autobuild/package.nix similarity index 100% rename from pkgs/development/tools/misc/autobuild/default.nix rename to pkgs/by-name/au/autobuild/package.nix diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/by-name/au/autoconf-archive/package.nix similarity index 100% rename from pkgs/development/tools/misc/autoconf-archive/default.nix rename to pkgs/by-name/au/autoconf-archive/package.nix diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/by-name/au/autocutsel/package.nix similarity index 100% rename from pkgs/tools/X11/autocutsel/default.nix rename to pkgs/by-name/au/autocutsel/package.nix diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/by-name/au/autofs5/package.nix similarity index 100% rename from pkgs/os-specific/linux/autofs/default.nix rename to pkgs/by-name/au/autofs5/package.nix diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/by-name/au/autogen/package.nix similarity index 100% rename from pkgs/development/tools/misc/autogen/default.nix rename to pkgs/by-name/au/autogen/package.nix diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/by-name/au/autojump/package.nix similarity index 100% rename from pkgs/tools/misc/autojump/default.nix rename to pkgs/by-name/au/autojump/package.nix diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/by-name/au/autokey/package.nix similarity index 100% rename from pkgs/applications/office/autokey/default.nix rename to pkgs/by-name/au/autokey/package.nix diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/by-name/au/automatic-timezoned/package.nix similarity index 100% rename from pkgs/tools/system/automatic-timezoned/default.nix rename to pkgs/by-name/au/automatic-timezoned/package.nix diff --git a/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix similarity index 100% rename from pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix rename to pkgs/by-name/au/automaticcomponenttoolkit/package.nix diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/by-name/au/automirror/package.nix similarity index 100% rename from pkgs/tools/misc/automirror/default.nix rename to pkgs/by-name/au/automirror/package.nix diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/by-name/au/automysqlbackup/package.nix similarity index 100% rename from pkgs/tools/backup/automysqlbackup/default.nix rename to pkgs/by-name/au/automysqlbackup/package.nix diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/by-name/au/autopanosiftc/package.nix similarity index 100% rename from pkgs/applications/graphics/autopanosiftc/default.nix rename to pkgs/by-name/au/autopanosiftc/package.nix diff --git a/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch b/pkgs/by-name/au/autorandr/0001-don-t-use-sys.executable.patch similarity index 100% rename from pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch rename to pkgs/by-name/au/autorandr/0001-don-t-use-sys.executable.patch diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/by-name/au/autorandr/package.nix similarity index 100% rename from pkgs/tools/misc/autorandr/default.nix rename to pkgs/by-name/au/autorandr/package.nix diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/by-name/au/autorestic/package.nix similarity index 100% rename from pkgs/tools/backup/autorestic/default.nix rename to pkgs/by-name/au/autorestic/package.nix diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/by-name/au/autorevision/package.nix similarity index 100% rename from pkgs/tools/misc/autorevision/default.nix rename to pkgs/by-name/au/autorevision/package.nix diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/by-name/au/autospotting/package.nix similarity index 100% rename from pkgs/applications/misc/autospotting/default.nix rename to pkgs/by-name/au/autospotting/package.nix diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/by-name/au/autossh/package.nix similarity index 100% rename from pkgs/tools/networking/autossh/default.nix rename to pkgs/by-name/au/autossh/package.nix diff --git a/pkgs/applications/audio/autotalent/default.nix b/pkgs/by-name/au/autotalent/package.nix similarity index 100% rename from pkgs/applications/audio/autotalent/default.nix rename to pkgs/by-name/au/autotalent/package.nix diff --git a/pkgs/misc/autotiling-rs/default.nix b/pkgs/by-name/au/autotiling-rs/package.nix similarity index 100% rename from pkgs/misc/autotiling-rs/default.nix rename to pkgs/by-name/au/autotiling-rs/package.nix diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/by-name/au/autotrace/package.nix similarity index 100% rename from pkgs/applications/graphics/autotrace/default.nix rename to pkgs/by-name/au/autotrace/package.nix diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix new file mode 100644 index 000000000000..c80180fc5621 --- /dev/null +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -0,0 +1,51 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, + stdenv, +}: + +buildGoModule rec { + pname = "avalanchego"; + version = "1.12.0-initial-poc.6"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = "avalanchego"; + rev = "refs/tags/v${version}"; + hash = "sha256-LBwmoegsBWC2xlTc3BJDxyYX58b+X7g5xl9vnThVHW0="; + }; + + # https://github.com/golang/go/issues/57529 + proxyVendor = true; + + vendorHash = "sha256-slu0f0Y33aGuVpN5pZcRp9RJAXcLnZyUNO7pFdm+HrY="; + + + subPackages = [ "main" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}" + ]; + + postInstall = '' + mv $out/bin/{main,${pname}} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Go implementation of an Avalanche node"; + homepage = "https://github.com/ava-labs/avalanchego"; + changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + urandom + qjoly + ]; + mainProgram = "avalanchego"; + }; +} diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 249ed14233ee..9b245baf8418 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -6,7 +6,6 @@ protobuf, bzip2, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,9 +32,7 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = [ - bzip2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ bzip2 ]; meta = { description = "Sign (and root) Android A/B OTAs with custom keys while preserving Android Verified Boot"; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/by-name/av/avfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/avfs/default.nix rename to pkgs/by-name/av/avfs/package.nix diff --git a/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch b/pkgs/by-name/av/aviator/bump-golang-x-sys.patch similarity index 100% rename from pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch rename to pkgs/by-name/av/aviator/bump-golang-x-sys.patch diff --git a/pkgs/development/tools/misc/aviator/default.nix b/pkgs/by-name/av/aviator/package.nix similarity index 100% rename from pkgs/development/tools/misc/aviator/default.nix rename to pkgs/by-name/av/aviator/package.nix diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/by-name/av/avizo/package.nix similarity index 100% rename from pkgs/applications/misc/avizo/default.nix rename to pkgs/by-name/av/avizo/package.nix diff --git a/pkgs/by-name/av/avocode/package.nix b/pkgs/by-name/av/avocode/package.nix new file mode 100644 index 000000000000..0878d91bba8a --- /dev/null +++ b/pkgs/by-name/av/avocode/package.nix @@ -0,0 +1,107 @@ +{ lib, stdenv, makeDesktopItem, fetchurl, unzip +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme +, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "avocode"; + version = "4.15.6"; + + src = fetchurl { + url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; + sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; + }; + + libPath = lib.makeLibraryPath (with xorg; [ + stdenv.cc.cc + at-spi2-core.out + gdk-pixbuf + glib + gtk3 + atk + at-spi2-atk + pango + cairo + freetype + fontconfig + dbus + nss + nspr + alsa-lib + cups + expat + udev + libX11 + libxcb + libxshmfence + libxkbcommon + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libXtst + libXScrnSaver + libuuid + libdrm + mesa + ]); + + desktopItem = makeDesktopItem { + name = "Avocode"; + exec = "avocode"; + icon = "avocode"; + desktopName = "Avocode"; + genericName = "Design Inspector"; + categories = [ "Development" ]; + comment = "The bridge between designers and developers"; + }; + + nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; + buildInputs = [ gtk3 adwaita-icon-theme ]; + + # src is producing multiple folder on unzip so we must + # override unpackCmd to extract it into newly created folder + unpackCmd = '' + mkdir out + unzip $curSrc -d out + ''; + + installPhase = '' + substituteInPlace avocode.desktop.in \ + --replace /path/to/avocode-dir/Avocode $out/bin/avocode \ + --replace /path/to/avocode-dir/avocode.png avocode + + mkdir -p share/applications share/pixmaps + mv avocode.desktop.in share/applications/avocode.desktop + mv avocode.png share/pixmaps/ + + rm resources/cjpeg + cp -av . $out + + mkdir $out/bin + ln -s $out/avocode $out/bin/avocode + ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg + ''; + + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-rpath ${libPath}:$out/ $file || true + done + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://avocode.com/"; + description = "Bridge between designers and developers"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ megheaiulian ]; + }; +} diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/by-name/av/avr8burnomat/package.nix similarity index 100% rename from pkgs/development/misc/avr8-burn-omat/default.nix rename to pkgs/by-name/av/avr8burnomat/package.nix diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/by-name/av/avra/package.nix similarity index 100% rename from pkgs/development/compilers/avra/default.nix rename to pkgs/by-name/av/avra/package.nix diff --git a/pkgs/development/embedded/avrdude/libelf.nix b/pkgs/by-name/av/avrdude/libelf.nix similarity index 100% rename from pkgs/development/embedded/avrdude/libelf.nix rename to pkgs/by-name/av/avrdude/libelf.nix diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/by-name/av/avrdude/package.nix similarity index 100% rename from pkgs/development/embedded/avrdude/default.nix rename to pkgs/by-name/av/avrdude/package.nix diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/by-name/av/avrdudess/package.nix similarity index 100% rename from pkgs/applications/misc/avrdudess/default.nix rename to pkgs/by-name/av/avrdudess/package.nix diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/by-name/av/avro-c/package.nix similarity index 100% rename from pkgs/development/libraries/avro-c/default.nix rename to pkgs/by-name/av/avro-c/package.nix diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/by-name/av/avro-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/avro-c++/default.nix rename to pkgs/by-name/av/avro-cpp/package.nix diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix index 730a05a259e8..b4d831af3bf4 100644 --- a/pkgs/by-name/av/avro-tools/package.nix +++ b/pkgs/by-name/av/avro-tools/package.nix @@ -7,14 +7,14 @@ }: let pname = "avro-tools"; - version = "1.11.3"; + version = "1.12.0"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI="; + sha256 = "sha256-+OTQ2UWFLcL5HDv4j33LjKvADg/ClbuS6JPlSUXggIU="; }; dontUnpack = true; diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock b/pkgs/by-name/aw/aw-watcher-window-wayland/Cargo.lock similarity index 100% rename from pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock rename to pkgs/by-name/aw/aw-watcher-window-wayland/Cargo.lock diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix similarity index 100% rename from pkgs/tools/wayland/aw-watcher-window-wayland/default.nix rename to pkgs/by-name/aw/aw-watcher-window-wayland/package.nix diff --git a/pkgs/applications/misc/hmm/rustc-serialize-fix.patch b/pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch similarity index 100% rename from pkgs/applications/misc/hmm/rustc-serialize-fix.patch rename to pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/by-name/aw/awf/package.nix similarity index 100% rename from pkgs/development/tools/misc/awf/default.nix rename to pkgs/by-name/aw/awf/package.nix diff --git a/pkgs/by-name/aw/aws-assume-role/0001-add-go.mod-go.sum.patch b/pkgs/by-name/aw/aws-assume-role/0001-add-go.mod-go.sum.patch new file mode 100644 index 000000000000..861a37fa9fbb --- /dev/null +++ b/pkgs/by-name/aw/aws-assume-role/0001-add-go.mod-go.sum.patch @@ -0,0 +1,53 @@ +From 7eff498538c201cabae769e20715282a1aab2266 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 4 Nov 2024 21:25:33 +0800 +Subject: [PATCH] add go.mod & go.sum + +--- + go.mod | 10 ++++++++++ + go.sum | 16 ++++++++++++++++ + 2 files changed, 26 insertions(+) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..5d3a1fa +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,10 @@ ++module github.com/remind101/assume-role ++ ++go 1.23.2 ++ ++require ( ++ github.com/aws/aws-sdk-go v1.55.5 ++ gopkg.in/yaml.v2 v2.4.0 ++) ++ ++require github.com/jmespath/go-jmespath v0.4.0 // indirect +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..b35ff93 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,16 @@ ++github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= ++github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= ++github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= ++github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= ++github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= ++github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= ++gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +-- +2.46.1 + diff --git a/pkgs/by-name/aw/aws-assume-role/package.nix b/pkgs/by-name/aw/aws-assume-role/package.nix new file mode 100644 index 000000000000..f7785c457a32 --- /dev/null +++ b/pkgs/by-name/aw/aws-assume-role/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "aws-assume-role"; + version = "0.3.2"; + + outputs = [ + "out" + "doc" + ]; + + src = fetchFromGitHub { + owner = "remind101"; + repo = "assume-role"; + rev = "refs/tags/${version}"; + sha256 = "sha256-7+9qi9lYzv1YCFhUyla+5Gqs5nBUiiazhFwiqHzMFd4="; + }; + + deleteVendor = true; + + vendorHash = "sha256-NIY6w/hQQ357KHEDEHUYVLbkQKsm8FLtRf3/AbbgukA="; + + patches = [ + # Generate with go mod init github.com/remind101/assume-role && go mod tidy + ./0001-add-go.mod-go.sum.patch + ]; + + postInstall = '' + install -Dm444 -t $out/share/doc/aws-assume-role README.md + ''; + + meta = with lib; { + description = "Easily assume AWS roles in your terminal"; + homepage = "https://github.com/remind101/assume-role"; + license = licenses.bsd2; + mainProgram = "assume-role"; + maintainers = with lib.maintainers; [ williamvds ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/by-name/aw/aws-c-auth/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-auth/default.nix rename to pkgs/by-name/aw/aws-c-auth/package.nix diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/by-name/aw/aws-c-common/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-common/default.nix rename to pkgs/by-name/aw/aws-c-common/package.nix diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/by-name/aw/aws-c-common/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/aws-c-common/setup-hook.sh rename to pkgs/by-name/aw/aws-c-common/setup-hook.sh diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/by-name/aw/aws-c-compression/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-compression/default.nix rename to pkgs/by-name/aw/aws-c-compression/package.nix diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-event-stream/default.nix rename to pkgs/by-name/aw/aws-c-event-stream/package.nix diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/by-name/aw/aws-c-http/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-http/default.nix rename to pkgs/by-name/aw/aws-c-http/package.nix diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-mqtt/default.nix rename to pkgs/by-name/aw/aws-c-mqtt/package.nix diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/by-name/aw/aws-c-s3/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-s3/default.nix rename to pkgs/by-name/aw/aws-c-s3/package.nix diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix similarity index 100% rename from pkgs/development/libraries/aws-c-sdkutils/default.nix rename to pkgs/by-name/aw/aws-c-sdkutils/package.nix diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/by-name/aw/aws-checksums/package.nix similarity index 100% rename from pkgs/development/libraries/aws-checksums/default.nix rename to pkgs/by-name/aw/aws-checksums/package.nix diff --git a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch similarity index 100% rename from pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch rename to pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/aws-crt-cpp/default.nix rename to pkgs/by-name/aw/aws-crt-cpp/package.nix diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix similarity index 100% rename from pkgs/tools/security/aws-iam-authenticator/default.nix rename to pkgs/by-name/aw/aws-iam-authenticator/package.nix diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix similarity index 100% rename from pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix rename to pkgs/by-name/aw/aws-lambda-rie/package.nix diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/by-name/aw/aws-nuke/package.nix similarity index 100% rename from pkgs/tools/admin/aws-nuke/default.nix rename to pkgs/by-name/aw/aws-nuke/package.nix diff --git a/pkgs/by-name/aw/aws-rotate-key/package.nix b/pkgs/by-name/aw/aws-rotate-key/package.nix new file mode 100644 index 000000000000..b2f3a85e439e --- /dev/null +++ b/pkgs/by-name/aw/aws-rotate-key/package.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, aws-rotate-key }: + +buildGoModule rec { + pname = "aws-rotate-key"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Fullscreen"; + repo = "aws-rotate-key"; + rev = "v${version}"; + sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU="; + }; + + vendorHash = "sha256-gXtTd7lU9m9rO1w7Fx8o/s45j63h6GtUZrjOzFI4Q/o="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = aws-rotate-key; + command = "AWS_SHARED_CREDENTIALS_FILE=/dev/null aws-rotate-key --version"; + }; + + meta = with lib; { + description = "Easily rotate your AWS key"; + homepage = "https://github.com/Fullscreen/aws-rotate-key"; + license = licenses.mit; + maintainers = [ maintainers.mbode ]; + mainProgram = "aws-rotate-key"; + }; +} diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix new file mode 100644 index 000000000000..a65a16fdbf8f --- /dev/null +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -0,0 +1,165 @@ +{ + lib, + python3, + fetchFromGitHub, + git, + testers, + aws-sam-cli, + nix-update-script, + enableTelemetry ? false, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "aws-sam-cli"; + version = "1.127.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-sam-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-5/zXvO5xrNkhPCei4O/nMXA/e18VNrED2lpBbflaJLQ="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + pythonRelaxDeps = [ + "aws-lambda-builders" + "aws-sam-translator" + "boto3-stubs" + "cfn-lint" + "cookiecutter" + "docker" + "jsonschema" + "pyopenssl" + "requests" + "rich" + "ruamel-yaml" + "tomlkit" + "tzlocal" + "watchdog" + ]; + + dependencies = + with python3.pkgs; + [ + aws-lambda-builders + aws-sam-translator + boto3 + boto3-stubs + cfn-lint + chevron + click + cookiecutter + dateparser + docker + flask + jsonschema + pyopenssl + pyyaml + requests + rich + ruamel-yaml + tomlkit + typing-extensions + tzlocal + watchdog + ] + ++ (with python3.pkgs.boto3-stubs.optional-dependencies; [ + apigateway + cloudformation + ecr + iam + kinesis + lambda + s3 + schemas + secretsmanager + signer + sqs + stepfunctions + sts + xray + ]); + + postFixup = '' + # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272 + wrapProgram $out/bin/sam \ + --set SAM_CLI_TELEMETRY ${if enableTelemetry then "1" else "0"} \ + --prefix PATH : $out/bin:${lib.makeBinPath [ git ]} + ''; + + nativeCheckInputs = with python3.pkgs; [ + filelock + flaky + jaraco-text + parameterized + psutil + pytest-timeout + pytest-xdist + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export PATH="$PATH:$out/bin:${lib.makeBinPath [ git ]}" + ''; + + pytestFlagsArray = [ + "tests" + # Disable warnings + "-W" + "ignore::DeprecationWarning" + ]; + + disabledTestPaths = [ + # Disable tests that requires networking or complex setup + "tests/end_to_end" + "tests/integration" + "tests/regression" + "tests/smoke" + "tests/unit/lib/telemetry" + "tests/unit/hook_packages/terraform/hooks/prepare/" + "tests/unit/lib/observability/cw_logs/" + "tests/unit/lib/build_module/" + # Disable flaky tests + "tests/unit/lib/samconfig/test_samconfig.py" + ]; + + disabledTests = [ + # Disable flaky tests + "test_update_stage" + "test_delete_deployment" + "test_request_with_no_data" + "test_import_should_succeed_for_a_defined_hidden_package_540_pkg_resources_py2_warn" + ]; + + pythonImportsCheck = [ "samcli" ]; + + passthru = { + tests.version = testers.testVersion { + package = aws-sam-cli; + command = "sam --version"; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; + }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "CLI tool for local development and testing of Serverless applications"; + homepage = "https://github.com/aws/aws-sam-cli"; + changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "sam"; + maintainers = with maintainers; [ + lo1tuma + anthonyroussel + ]; + }; +} diff --git a/pkgs/tools/admin/aws-sso-creds/default.nix b/pkgs/by-name/aw/aws-sso-creds/package.nix similarity index 100% rename from pkgs/tools/admin/aws-sso-creds/default.nix rename to pkgs/by-name/aw/aws-sso-creds/package.nix diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index fad93e74d47f..9598f6118cb1 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libkrb5 curl lttng-ust diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/by-name/aw/aws_mturk_clt/package.nix similarity index 100% rename from pkgs/tools/misc/aws-mturk-clt/default.nix rename to pkgs/by-name/aw/aws_mturk_clt/package.nix diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix new file mode 100644 index 000000000000..e9b5af2c1b9d --- /dev/null +++ b/pkgs/by-name/aw/awscli/package.nix @@ -0,0 +1,90 @@ +{ lib +, python3 +, fetchPypi +, groff +, less +, nix-update-script +, testers +, awscli +}: + +let + self = python3.pkgs.buildPythonApplication rec { + pname = "awscli"; + # N.B: if you change this, change botocore and boto3 to a matching version too + # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py + version = "1.34.30"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-7RdAqXdCnS7dzkGQHJHclR2KuBbSbd+epGMQDbDlYxY="; + }; + + pythonRelaxDeps = [ + # botocore must not be relaxed + "colorama" + "docutils" + "rsa" + ]; + + build-system = [ + python3.pkgs.setuptools + ]; + + dependencies = with python3.pkgs; [ + botocore + s3transfer + colorama + docutils + rsa + pyyaml + groff + less + ]; + + postInstall = '' + mkdir -p $out/share/bash-completion/completions + echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli + + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + + rm $out/bin/aws.cmd + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" + $out/bin/aws --version | grep "${version}" + + runHook postInstallCheck + ''; + + passthru = { + python = python3; # for aws_shell + updateScript = nix-update-script { + extraArgs = [ "--version=skip" ]; + }; + tests.version = testers.testVersion { + package = awscli; + command = "aws --version"; + inherit version; + }; + }; + + meta = { + homepage = "https://aws.amazon.com/cli/"; + changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; + description = "Unified tool to manage your AWS services"; + license = lib.licenses.asl20; + mainProgram = "aws"; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; + }; +in +assert self ? pythonRelaxDeps -> !(lib.elem "botocore" self.pythonRelaxDeps); +self diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 0a9958e92d2f..e669d112a340 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -62,22 +62,20 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.17.64"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.19.0"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-Hq86KhAIATSz3dF1zO6aSdZQAfLs4EcRqWglAOJUVGk="; + hash = "sha256-kHJXdqGRVA4C3EB1T9gQYoM6M8E/UYTTma1RqLZqH58="; }; - patches = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \ - --replace-fail 'cryptography>=40.0.0,<40.0.2' 'cryptography>=43.0.0' \ + --replace-fail 'awscrt>=0.19.18,<=0.22.0' 'awscrt>=0.22.0' \ + --replace-fail 'cryptography>=40.0.0,<43.0.2' 'cryptography>=43.0.0' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/by-name/aw/awslimitchecker/package.nix similarity index 100% rename from pkgs/tools/admin/awslimitchecker/default.nix rename to pkgs/by-name/aw/awslimitchecker/package.nix diff --git a/pkgs/tools/admin/awslimitchecker/version.patch b/pkgs/by-name/aw/awslimitchecker/version.patch similarity index 100% rename from pkgs/tools/admin/awslimitchecker/version.patch rename to pkgs/by-name/aw/awslimitchecker/version.patch diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/by-name/aw/awslogs/package.nix similarity index 100% rename from pkgs/tools/admin/awslogs/default.nix rename to pkgs/by-name/aw/awslogs/package.nix diff --git a/pkgs/tools/admin/awsls/default.nix b/pkgs/by-name/aw/awsls/package.nix similarity index 100% rename from pkgs/tools/admin/awsls/default.nix rename to pkgs/by-name/aw/awsls/package.nix diff --git a/pkgs/tools/admin/awsrm/default.nix b/pkgs/by-name/aw/awsrm/package.nix similarity index 100% rename from pkgs/tools/admin/awsrm/default.nix rename to pkgs/by-name/aw/awsrm/package.nix diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/by-name/aw/awstats/package.nix similarity index 100% rename from pkgs/tools/system/awstats/default.nix rename to pkgs/by-name/aw/awstats/package.nix diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/by-name/aw/awsweeper/package.nix similarity index 100% rename from pkgs/tools/admin/awsweeper/default.nix rename to pkgs/by-name/aw/awsweeper/package.nix diff --git a/pkgs/applications/radio/ax25-apps/default.nix b/pkgs/by-name/ax/ax25-apps/package.nix similarity index 100% rename from pkgs/applications/radio/ax25-apps/default.nix rename to pkgs/by-name/ax/ax25-apps/package.nix diff --git a/pkgs/applications/radio/ax25-tools/default.nix b/pkgs/by-name/ax/ax25-tools/package.nix similarity index 100% rename from pkgs/applications/radio/ax25-tools/default.nix rename to pkgs/by-name/ax/ax25-tools/package.nix diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix rename to pkgs/by-name/ay/ayatana-webmail/package.nix diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/by-name/ay/ayu-theme-gtk/package.nix similarity index 100% rename from pkgs/data/themes/ayu-theme-gtk/default.nix rename to pkgs/by-name/ay/ayu-theme-gtk/package.nix diff --git a/pkgs/data/fonts/azeret-mono/default.nix b/pkgs/by-name/az/azeret-mono/package.nix similarity index 100% rename from pkgs/data/fonts/azeret-mono/default.nix rename to pkgs/by-name/az/azeret-mono/package.nix diff --git a/pkgs/games/azimuth/default.nix b/pkgs/by-name/az/azimuth/package.nix similarity index 100% rename from pkgs/games/azimuth/default.nix rename to pkgs/by-name/az/azimuth/package.nix diff --git a/pkgs/development/libraries/azmq/default.nix b/pkgs/by-name/az/azmq/package.nix similarity index 100% rename from pkgs/development/libraries/azmq/default.nix rename to pkgs/by-name/az/azmq/package.nix diff --git a/pkgs/by-name/az/azure-cli/commit-update-hunks.sh b/pkgs/by-name/az/azure-cli/commit-update-hunks.sh deleted file mode 100755 index 7a9d913e260e..000000000000 --- a/pkgs/by-name/az/azure-cli/commit-update-hunks.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Just a tiny imperfect helper script to commit generated updates. -# -# First, ensure that that `git add -p extensions-generated.nix` only -# returns a series of clean update hunks, where each hunk updates a -# single package version. All additions/removals must be committed -# by hand. -# The script will then commit the remaining hunks with fitting commit messages. - -while true; do - echo -e "y\nq" | git add -p extensions-generated.nix || break - pname=$(git diff --no-ext-diff --cached | grep "pname =" | cut -d'"' -f2 | head -n1) || break - versions=$(git diff --no-ext-diff --cached | grep "version =" | cut -d'"' -f2) || break - oldver=$(echo "$versions" | head -n1) || break - newver=$(echo "$versions" | tail -n1) || break - commitmsg="azure-cli-extensions.${pname}: ${oldver} -> ${newver}" - git commit -m "$commitmsg" -done diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json new file mode 100644 index 000000000000..25a7c78dee85 --- /dev/null +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -0,0 +1,1108 @@ +{ + "acat": { + "pname": "acat", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acat-1.0.0b1-py3-none-any.whl", + "hash": "sha256-nCKOk/3aUxE3um5autK0hXfPWFEuS+De5RzvERJnMno=", + "description": "Microsoft Azure Command-Line Tools Acat Extension" + }, + "account": { + "pname": "account", + "version": "0.2.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/account-0.2.5-py3-none-any.whl", + "hash": "sha256-C5TfMjrPxI6jFBkEZJEGu4VpUYfb9jqjuESOwSvADCM=", + "description": "Microsoft Azure Command-Line Tools SubscriptionClient Extension" + }, + "acrquery": { + "pname": "acrquery", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrquery-1.0.1-py3-none-any.whl", + "hash": "sha256-kJQTek0I8u3ntmLJnfBmXzOKrnvK9Jdr7V1C33VFcfE=", + "description": "Microsoft Azure Command-Line Tools AcrQuery Extension" + }, + "acrtransfer": { + "pname": "acrtransfer", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-1.1.0-py3-none-any.whl", + "hash": "sha256-ZouU0DQbZjphAhLzGLiZpTvmCuDrWcR+Fi9dq9NINVE=", + "description": "Microsoft Azure Command-Line Tools Acrtransfer Extension" + }, + "ad": { + "pname": "ad", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/ad-0.1.0-py3-none-any.whl", + "hash": "sha256-Yd8jThB1npkWwdRHqwK4JjfeEP2XwxoXJS4fUYOFOIM=", + "description": "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension" + }, + "aem": { + "pname": "aem", + "version": "0.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aem-0.3.0-py2.py3-none-any.whl", + "hash": "sha256-Jar5AGqx0RXXxITP2hya0ONhevbSFA24dJmq6oG2f/g=", + "description": "Manage Azure Enhanced Monitoring Extensions for SAP" + }, + "ai-examples": { + "pname": "ai-examples", + "version": "0.2.5", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/ai_examples-0.2.5-py2.py3-none-any.whl", + "hash": "sha256-utvfX8LgtKhcQSTT/JKFm1gq348w9XJ0QM6BlCFACZo=", + "description": "Add AI powered examples to help content" + }, + "aks-preview": { + "pname": "aks-preview", + "version": "9.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-CYRK4Cug1Y+TaK43OPPUMR9cpyHtzBz3CIb8+KgMv7g=", + "description": "Provides a preview for upcoming AKS features" + }, + "akshybrid": { + "pname": "akshybrid", + "version": "0.1.2", + "url": "https://hybridaksstorage.z13.web.core.windows.net/HybridAKS/CLI/akshybrid-0.1.2-py3-none-any.whl", + "hash": "sha256-l2fNpETEIVc7wiDgHNWKZ8MKNhdc7bposEVKPG6YOo4=", + "description": "Microsoft Azure Command-Line Tools HybridContainerService Extension" + }, + "alb": { + "pname": "alb", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-1.0.0-py3-none-any.whl", + "hash": "sha256-sCDNjNPaYpncl4SZ2uRSdot2UcPtjgXy8LMhvZuDVNQ=", + "description": "Microsoft Azure Command-Line Tools ALB Extension" + }, + "alertsmanagement": { + "pname": "alertsmanagement", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-1.0.0b1-py3-none-any.whl", + "hash": "sha256-4eFa7/GrmyX7gguRTmAs6Ep9AOU4LrB9QT8UktkLCdE=", + "description": "Microsoft Azure Command-Line Tools AlertsManagementClient Extension" + }, + "amg": { + "pname": "amg", + "version": "2.5.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.0-py3-none-any.whl", + "hash": "sha256-yQAtjGU/VqixCGvzPpGPO6bzJ8yEAGvnWUB4QhiH9B0=", + "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" + }, + "amlfs": { + "pname": "amlfs", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amlfs-1.0.0-py3-none-any.whl", + "hash": "sha256-IbWhKUPnJzFSiKoMocSaJYA6ZWt/OIw8Y3WWz99nvR0=", + "description": "Microsoft Azure Command-Line Tools Amlfs Extension" + }, + "apic-extension": { + "pname": "apic-extension", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.1.0-py3-none-any.whl", + "hash": "sha256-AeXrQi6EJoOW3bAlEjC907nUdfRj6BM/BBX7Dw4DJAs=", + "description": "Microsoft Azure Command-Line Tools ApicExtension Extension" + }, + "appservice-kube": { + "pname": "appservice-kube", + "version": "0.1.10", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-0.1.10-py2.py3-none-any.whl", + "hash": "sha256-f9ctJ+Sw7O2jsrTzAcegwwaP6ouW1w+fyq0UIkDefQ0=", + "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" + }, + "arcgateway": { + "pname": "arcgateway", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/arcgateway-1.0.0b1-py3-none-any.whl", + "hash": "sha256-Mw/R8ZdL7OFtySTjU3MbHw9EA6WONuM0dwXwHb2/A9E=", + "description": "Microsoft Azure Command-Line Tools Arcgateway Extension" + }, + "astronomer": { + "pname": "astronomer", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-1.0.0-py3-none-any.whl", + "hash": "sha256-tMpBtdnLd67StGLe1KOSrjzols6NnLlKCGcdDLaBds0=", + "description": "Microsoft Azure Command-Line Tools Astronomer Extension" + }, + "authV2": { + "pname": "authV2", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-0.1.3-py3-none-any.whl", + "hash": "sha256-6wVjb4x44vg7f0Uv5W9amuSW1pCdw2kkrl+YovtbzkE=", + "description": "Microsoft Azure Command-Line Tools Authv2 Extension" + }, + "automanage": { + "pname": "automanage", + "version": "0.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/automanage-0.1.2-py3-none-any.whl", + "hash": "sha256-QjQabP2ss68EM7ELPpvLUibUx/tZcwN4QIqVdmImZVE=", + "description": "Microsoft Azure Command-Line Tools Automanage Extension" + }, + "automation": { + "pname": "automation", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/automation-1.0.0b1-py3-none-any.whl", + "hash": "sha256-0x/gQz+jCm4An3ub7mxBemhu2HUC3Zh7msitETODkVs=", + "description": "Microsoft Azure Command-Line Tools AutomationClient Extension" + }, + "azure-firewall": { + "pname": "azure-firewall", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.0-py2.py3-none-any.whl", + "hash": "sha256-VGjMCbjqeRgXa16Vqjwkx62bfRtoxH0Wv1IqBT/YEeg=", + "description": "Manage Azure Firewall resources" + }, + "azurelargeinstance": { + "pname": "azurelargeinstance", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-1.0.0b4-py3-none-any.whl", + "hash": "sha256-b+5Hi9kZkioFMlc/3qO1Qikl03S6ZknqAV1NM5QegZo=", + "description": "Microsoft Azure Command-Line Tools Azurelargeinstance Extension" + }, + "azurestackhci": { + "pname": "azurestackhci", + "version": "0.2.9", + "url": "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/azurestackhci-0.2.9-py3-none-any.whl", + "hash": "sha256-JVey/j+i+VGieUupZ1VbpUwuk+t1U4FS8hqy+1aP7xY=", + "description": "Microsoft Azure Command-Line Tools AzureStackHCI Extension" + }, + "baremetal-infrastructure": { + "pname": "baremetal-infrastructure", + "version": "3.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-3.0.0b2-py3-none-any.whl", + "hash": "sha256-DlhD4pWicFgmLpRf68Qxec4XOsJ+vP5EVrRmt6y5wiA=", + "description": "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension" + }, + "bastion": { + "pname": "bastion", + "version": "1.3.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl", + "hash": "sha256-DMqkBnT8Mp/p+SV/hpwxnGTWyJwChmSm/1NOuu4dxek=", + "description": "Microsoft Azure Command-Line Tools Bastion Extension" + }, + "billing-benefits": { + "pname": "billing-benefits", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/billing_benefits-0.1.0-py3-none-any.whl", + "hash": "sha256-9xJQ0cJmkMwOF1zVybzVnnbHtwG7OkfIJz5M+LzKh44=", + "description": "Microsoft Azure Command-Line Tools BillingBenefits Extension" + }, + "blueprint": { + "pname": "blueprint", + "version": "0.3.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-0.3.2-py3-none-any.whl", + "hash": "sha256-WNODVEbdk+WFsPa1IKLbZVG4qSfjXiXaR0fUz4pMAJs=", + "description": "Microsoft Azure Command-Line Tools Blueprint Extension" + }, + "change-analysis": { + "pname": "change-analysis", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/change_analysis-0.1.0-py3-none-any.whl", + "hash": "sha256-SfF2Ghsa0pFpry7NV5PhDd7Hl+uyYQ58cOGxqyt1Emo=", + "description": "Microsoft Azure Command-Line Tools ChangeAnalysis Extension" + }, + "cli-translator": { + "pname": "cli-translator", + "version": "0.3.0", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/cli_translator-0.3.0-py3-none-any.whl", + "hash": "sha256-nqYWLTf8M5C+Tc5kywXFxYgHAQTz6SpwGrR1RzVlqKk=", + "description": "Translate ARM template to executable Azure CLI scripts" + }, + "compute-diagnostic-rp": { + "pname": "compute-diagnostic-rp", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-1.0.0b1-py3-none-any.whl", + "hash": "sha256-gQ6TzgDH0D322poPr1e5ZvttpYIxH5yudLK34ePEFCM=", + "description": "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension" + }, + "confidentialledger": { + "pname": "confidentialledger", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confidentialledger-1.0.0-py3-none-any.whl", + "hash": "sha256-Ovv0nxDN3dlnVWI2TOInX29w61MY+oW2WNcRseJNyU4=", + "description": "Microsoft Azure Command-Line Tools ConfidentialLedger Extension" + }, + "confluent": { + "pname": "confluent", + "version": "0.6.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-0.6.0-py3-none-any.whl", + "hash": "sha256-eYfSLg6craKAh6kAv6U0hlUxlB8rv+ln60bJCy4KEr4=", + "description": "Microsoft Azure Command-Line Tools ConfluentManagementClient Extension" + }, + "connectedmachine": { + "pname": "connectedmachine", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0-py3-none-any.whl", + "hash": "sha256-FJ7q1J0MBG93jqTZnXhEjzgVe4bqWR0e6lRfiJZZZRE=", + "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" + }, + "connectedvmware": { + "pname": "connectedvmware", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-1.2.0-py2.py3-none-any.whl", + "hash": "sha256-tzGoIcYJqui/q34EcLNCuReefgxlSC9KQypg2HpMOV8=", + "description": "Microsoft Azure Command-Line Tools Connectedvmware Extension" + }, + "cosmosdb-preview": { + "pname": "cosmosdb-preview", + "version": "1.1.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.1.0b1-py2.py3-none-any.whl", + "hash": "sha256-D8EbL83XXEhoz8Q+xL4ZwhKP0de2FrYeM2TDwaDEwdo=", + "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" + }, + "costmanagement": { + "pname": "costmanagement", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/costmanagement-1.0.0-py3-none-any.whl", + "hash": "sha256-bl4FPQW61q1jBb0CT1HjVeYP3ou2oDNQ39gcJUN9LkU=", + "description": "Microsoft Azure Command-Line Tools CostManagementClient Extension" + }, + "csvmware": { + "pname": "csvmware", + "version": "0.3.0", + "url": "https://github.com/Azure/az-csvmware-cli/releases/download/0.3.0/csvmware-0.3.0-py2.py3-none-any.whl", + "hash": "sha256-37l2fwWsE8di6p3EMnFp5jpcEYeRI1RLIA7bmiyaikI=", + "description": "Manage Azure VMware Solution by CloudSimple" + }, + "custom-providers": { + "pname": "custom-providers", + "version": "0.2.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/custom_providers-0.2.1-py2.py3-none-any.whl", + "hash": "sha256-qZOPCchvpFdePIhyBpCMrBWSCvUoxTfAuZg2KhxD2vc=", + "description": "Microsoft Azure Command-Line Tools Custom Providers Extension" + }, + "customlocation": { + "pname": "customlocation", + "version": "0.1.3", + "url": "https://arcplatformcliextprod.blob.core.windows.net/customlocation/customlocation-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-XjZDWxqB3iXnTnDEXCrJ+YBlE4w1BQ8pIQrkDBhITig=", + "description": "Microsoft Azure Command-Line Tools Customlocation Extension" + }, + "databox": { + "pname": "databox", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-1.1.0-py3-none-any.whl", + "hash": "sha256-e0GmBSHXz2UtTNygUvydLsY3Hz14hOwKdLqafVAB17s=", + "description": "Microsoft Azure Command-Line Tools Databox Extension" + }, + "databricks": { + "pname": "databricks", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.0.1-py3-none-any.whl", + "hash": "sha256-VRZddDXNeg3IdYfoL8IC15Kl8oycRDmGVbCkdw0DjDA=", + "description": "Microsoft Azure Command-Line Tools DatabricksClient Extension" + }, + "datadog": { + "pname": "datadog", + "version": "0.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-0.1.1-py3-none-any.whl", + "hash": "sha256-mjj9XW0BZG8pnue19o6CrXCIicfQvXLgtraxPlRV6Tc=", + "description": "Microsoft Azure Command-Line Tools MicrosoftDatadogClient Extension" + }, + "datafactory": { + "pname": "datafactory", + "version": "1.0.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.2-py3-none-any.whl", + "hash": "sha256-6hNOKWO3zfK8vVAkSm8aQR2ne9TbfkLIyPllFjjIKsc=", + "description": "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension" + }, + "datamigration": { + "pname": "datamigration", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b2-py3-none-any.whl", + "hash": "sha256-iQG1ZkqV5mV4Fpi8Au6UtCl8gqyf36uZ3U8TusHAkj4=", + "description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension" + }, + "dataprotection": { + "pname": "dataprotection", + "version": "1.5.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.4-py3-none-any.whl", + "hash": "sha256-vAyVrv0dte1KioEwriEF8oNqrEwN3WSKDC/hyTudQtg=", + "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" + }, + "datashare": { + "pname": "datashare", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datashare-0.2.0-py3-none-any.whl", + "hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=", + "description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension" + }, + "deidservice": { + "pname": "deidservice", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/deidservice-1.0.0b1-py3-none-any.whl", + "hash": "sha256-FJw581LzrLlcttM70PuWJwMs8BoaoyCsud1xJ0RZfNA=", + "description": "Microsoft Azure Command-Line Tools Deidservice Extension" + }, + "deploy-to-azure": { + "pname": "deploy-to-azure", + "version": "0.2.0", + "url": "https://github.com/Azure/deploy-to-azure-cli-extension/releases/download/20200318.1/deploy_to_azure-0.2.0-py2.py3-none-any.whl", + "hash": "sha256-+SUIDuerw673M9TGMTFwve2qlWmvG5VCc4O8PFnkzrg=", + "description": "Deploy to Azure using Github Actions" + }, + "desktopvirtualization": { + "pname": "desktopvirtualization", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/desktopvirtualization-1.0.0-py3-none-any.whl", + "hash": "sha256-Oh56jw5Xn6If7XcIWbIcI77IuEidg0phQRaVqakMfNQ=", + "description": "Microsoft Azure Command-Line Tools Desktopvirtualization Extension" + }, + "dev-spaces": { + "pname": "dev-spaces", + "version": "1.0.6", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/dev_spaces-1.0.6-py2.py3-none-any.whl", + "hash": "sha256-cQQYCLJ82dM/2QXFCAyX9hKRgW8t3dbc2y5muftuv1k=", + "description": "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams" + }, + "devcenter": { + "pname": "devcenter", + "version": "6.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.0.1-py3-none-any.whl", + "hash": "sha256-JePc3Jy4MkPOsu1qbe3CJ5U8BsthC6lchN3sD3UDIk8=", + "description": "Microsoft Azure Command-Line Tools DevCenter Extension" + }, + "diskpool": { + "pname": "diskpool", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/diskpool-0.2.0-py3-none-any.whl", + "hash": "sha256-muaq6oWhdSnaKk5RwroqulW0smgW1WGOr9D5/cQ7Z7c=", + "description": "Microsoft Azure Command-Line Tools StoragePoolManagement Extension" + }, + "dms-preview": { + "pname": "dms-preview", + "version": "0.15.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dms_preview-0.15.0-py2.py3-none-any.whl", + "hash": "sha256-VWwUXAO41SnY5397NXAvuN44KJFjXoWPkoEX8zaI7pw=", + "description": "Support for new Database Migration Service scenarios" + }, + "dnc": { + "pname": "dnc", + "version": "0.2.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dnc-0.2.1-py3-none-any.whl", + "hash": "sha256-44R0ypsovtXd44jPc9/541BIJQMrA8W/iTDCXK8pICY=", + "description": "Microsoft Azure Command-Line Tools Dnc Extension" + }, + "dns-resolver": { + "pname": "dns-resolver", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-0.2.0-py3-none-any.whl", + "hash": "sha256-HEu4IW5QnC8I+nXEWTDsN3doMm8wy5qxJYQqqTUsbi4=", + "description": "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension" + }, + "durabletask": { + "pname": "durabletask", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b1-py3-none-any.whl", + "hash": "sha256-16kpspSSjfedgxL79q9yxdko4wTEp7N9rz/3cmZ9+yU=", + "description": "Microsoft Azure Command-Line Tools Durabletask Extension" + }, + "dynatrace": { + "pname": "dynatrace", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.0-py3-none-any.whl", + "hash": "sha256-CR9A2HZCRby5Zn5CLU3TchFMnwCnKggPnI75K0PFGNY=", + "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" + }, + "edgeorder": { + "pname": "edgeorder", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/edgeorder-0.1.0-py3-none-any.whl", + "hash": "sha256-GGoG0PhgP34Pru1SluzHO/EJbg1oGs6kLV68zBZwNXs=", + "description": "Microsoft Azure Command-Line Tools EdgeOrderManagementClient Extension" + }, + "edgezones": { + "pname": "edgezones", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/edgezones-1.0.0b1-py3-none-any.whl", + "hash": "sha256-mPG5Yty7B4z7jNEtQKWNAbzDfbRBVw+E4pO6C6UsbAg=", + "description": "Microsoft Azure Command-Line Tools Edgezones Extension" + }, + "elastic": { + "pname": "elastic", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-1.0.0b3-py3-none-any.whl", + "hash": "sha256-LzrkMNPDTdQAfIxag3SWNWjMI1WIckZCQoEcxaJuLec=", + "description": "Microsoft Azure Command-Line Tools MicrosoftElastic Extension" + }, + "elastic-san": { + "pname": "elastic-san", + "version": "1.2.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.2.0b1-py3-none-any.whl", + "hash": "sha256-UvtysdxQsTTOlkSI7exVTH2ESfhB5H2LNV2fGscQzmA=", + "description": "Microsoft Azure Command-Line Tools ElasticSan Extension" + }, + "eventgrid": { + "pname": "eventgrid", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/eventgrid-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-Ziyio4Hvz4IaFmSP87ie2+IfTpiH4Y/6fuDbuvAzLt4=", + "description": "Microsoft Azure Command-Line Tools EventGrid Command Module" + }, + "express-route-cross-connection": { + "pname": "express-route-cross-connection", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-1.0.0-py3-none-any.whl", + "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=", + "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension" + }, + "firmwareanalysis": { + "pname": "firmwareanalysis", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-1.0.0-py3-none-any.whl", + "hash": "sha256-HD3xRB3nbtsIvtBawnndKwK9b6tooLmkld/X7M4+kss=", + "description": "Microsoft Azure Command-Line Tools Firmwareanalysis Extension" + }, + "fleet": { + "pname": "fleet", + "version": "1.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.4.0-py3-none-any.whl", + "hash": "sha256-HYOpAAyHn/Gpor/y6iMYOrYeNCcT3+22YjRVk7FlhDg=", + "description": "Microsoft Azure Command-Line Tools Fleet Extension" + }, + "fluid-relay": { + "pname": "fluid-relay", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fluid_relay-0.1.0-py3-none-any.whl", + "hash": "sha256-khdmb4E0o44JrtqQXnzIOZQzKlq1Y+yJNbn/bJFWPow=", + "description": "Microsoft Azure Command-Line Tools FluidRelay Extension" + }, + "footprint": { + "pname": "footprint", + "version": "1.0.0", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/footprint-1.0.0-py3-none-any.whl", + "hash": "sha256-SqWSiL9Gz9aFGfH39j0+M68W2AYyuEwoPMcVISkmCyw=", + "description": "Microsoft Azure Command-Line Tools FootprintMonitoringManagementClient Extension" + }, + "front-door": { + "pname": "front-door", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-1.2.0-py3-none-any.whl", + "hash": "sha256-Iyunss0kJA1Ohtgg5fp4oRFDs6Yk7ZU6NFEhBQDt++A=", + "description": "Manage networking Front Doors" + }, + "fzf": { + "pname": "fzf", + "version": "1.0.2", + "url": "https://pahealyfzf.blob.core.windows.net/fzf/fzf-1.0.2-py2.py3-none-any.whl", + "hash": "sha256-hKvu0DtLv6e4wL4I2TZv8wQOIWDfT1pTnw4cngocNZw=", + "description": "Microsoft Azure Command-Line Tools fzf Extension" + }, + "gallery-service-artifact": { + "pname": "gallery-service-artifact", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/gallery_service_artifact-1.0.0b1-py3-none-any.whl", + "hash": "sha256-PzDj6OfmeP2auRsiYfuRijA804JiZQnT8A6G8ZZ3UMY=", + "description": "Microsoft Azure Command-Line Tools GalleryServiceArtifact Extension" + }, + "graphservices": { + "pname": "graphservices", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/graphservices-1.0.0b1-py3-none-any.whl", + "hash": "sha256-iu2jkB6USwOPToErC3CZeY0r2C1V4D54UBelBMFFg+U=", + "description": "Microsoft Azure Command-Line Tools Graphservices Extension" + }, + "guestconfig": { + "pname": "guestconfig", + "version": "0.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/guestconfig-0.1.1-py3-none-any.whl", + "hash": "sha256-lINqXSHuEHHNQLFj0sgMMqaoG53IXZE3H35Ps1FB4nM=", + "description": "Microsoft Azure Command-Line Tools GuestConfigurationClient Extension" + }, + "hack": { + "pname": "hack", + "version": "0.4.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hack-0.4.3-py2.py3-none-any.whl", + "hash": "sha256-+eYARX46n//DI1p7MBdtnwp/TTmsAeo+Jmi8ve5jmKY=", + "description": "Microsoft Azure Command-Line Tools Hack Extension" + }, + "hardware-security-modules": { + "pname": "hardware-security-modules", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hardware_security_modules-0.2.0-py3-none-any.whl", + "hash": "sha256-rEoQ4sxkpNCBjkj/vN3+tDB91WuIdbwBwCaH1HPJ/ps=", + "description": "Microsoft Azure Command-Line Tools AzureDedicatedHSMResourceProvider Extension" + }, + "hdinsightonaks": { + "pname": "hdinsightonaks", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-1.0.0b3-py3-none-any.whl", + "hash": "sha256-9Um4UQe3uD/2T8+lyQpdfpAKXqLv527smx+BaJ5Yw2U=", + "description": "Microsoft Azure Command-Line Tools Hdinsightonaks Extension" + }, + "healthbot": { + "pname": "healthbot", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-0.1.0-py3-none-any.whl", + "hash": "sha256-kTT60lEVFucUpds0bWOGWvC63wWZrePxwV+soAVVhaM=", + "description": "Microsoft Azure Command-Line Tools HealthbotClient Extension" + }, + "healthcareapis": { + "pname": "healthcareapis", + "version": "0.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-0.4.0-py3-none-any.whl", + "hash": "sha256-ol19V9T9OtzDdYHQrMHWxqRtzQNRkz7TfPup0avWCXg=", + "description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension" + }, + "hpc-cache": { + "pname": "hpc-cache", + "version": "0.1.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-0.1.5-py2.py3-none-any.whl", + "hash": "sha256-hSy0F6rfCtB+PFFBOFjEE79x6my0m6WCidlXL5o1BQc=", + "description": "Microsoft Azure Command-Line Tools StorageCache Extension" + }, + "image-copy-extension": { + "pname": "image-copy-extension", + "version": "0.2.13", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-0.2.13-py2.py3-none-any.whl", + "hash": "sha256-sNEr88dFAHkNWNmabDJWJUhxLLhyt5QuitSB4nBSGxk=", + "description": "Support for copying managed vm images between regions" + }, + "image-gallery": { + "pname": "image-gallery", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-YmDB9L+1idK6BWkxc1ihScqru9SaBI5pMo5EhxaUqs0=", + "description": "Support for Azure Image Gallery" + }, + "import-export": { + "pname": "import-export", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/import_export-1.0.0b1-py3-none-any.whl", + "hash": "sha256-xONvEAMDGmdhWkXNElkr9cEcVLe9lX9sKvkO/LXFF7I=", + "description": "Microsoft Azure Command-Line Tools StorageImportExport Extension" + }, + "informatica": { + "pname": "informatica", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-1.0.0b1-py3-none-any.whl", + "hash": "sha256-YWaukceOdMAa870erS1igycH4XbqD31dMKXdSF9IJGI=", + "description": "Microsoft Azure Command-Line Tools Informatica Extension" + }, + "init": { + "pname": "init", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/init-0.1.0-py3-none-any.whl", + "hash": "sha256-EXf8KT3BGLRJt2HsLHKNOXVfw5Od6NS/2JzOG/shjoY=", + "description": "Microsoft Azure Command-Line Tools Init Extension" + }, + "internet-analyzer": { + "pname": "internet-analyzer", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-RWSIGnyQus/YgcYppBgjmAB8iG0JnqiNuX4f8QBTpcQ=", + "description": "Microsoft Azure Command-Line Tools Internet Analyzer Extension" + }, + "ip-group": { + "pname": "ip-group", + "version": "0.1.2", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/ip_group-0.1.2-py2.py3-none-any.whl", + "hash": "sha256-r7otiophKGO2P1BNbP9tVZYQuWHkx33C/Um5/gPsZ6I=", + "description": "Microsoft Azure Command-Line Tools IpGroup Extension" + }, + "k8s-extension": { + "pname": "k8s-extension", + "version": "1.6.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.2-py3-none-any.whl", + "hash": "sha256-hS2nusfLVQF8yEPgX1pw6juS6V3eJZLP6JL+1R41Co8=", + "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" + }, + "k8s-runtime": { + "pname": "k8s-runtime", + "version": "1.0.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-1.0.4-py3-none-any.whl", + "hash": "sha256-ruLTAI2BjXg0IUnm8dLHkiq7vkPzI9UebNWMc7HGezo=", + "description": "Microsoft Azure Command-Line Tools K8sRuntime Extension" + }, + "kusto": { + "pname": "kusto", + "version": "0.5.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/kusto-0.5.0-py3-none-any.whl", + "hash": "sha256-z1cp6dAgKaGJGCUjVDKFyXN9UV9BxhDIM41D+HL58B0=", + "description": "Microsoft Azure Command-Line Tools KustoManagementClient Extension" + }, + "log-analytics": { + "pname": "log-analytics", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-zNNqjKaXnFSdt9f9eACZB+nnvCsJQ3iF292LEHyxW2Y=", + "description": "Support for Azure Log Analytics query capabilities" + }, + "log-analytics-solution": { + "pname": "log-analytics-solution", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics_solution-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-fhBEPehizQwZCQsKDa5emULotIwg46nDMFd42qdW6pY=", + "description": "Support for Azure Log Analytics Solution" + }, + "logic": { + "pname": "logic", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/logic-1.1.0-py3-none-any.whl", + "hash": "sha256-FMGHaMAu6cNwrH7tDyMgbu59NEoQOCowg7F7XhhIz80=", + "description": "Microsoft Azure Command-Line Tools Logic Extension" + }, + "logz": { + "pname": "logz", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/logz-0.1.0-py3-none-any.whl", + "hash": "sha256-apN9u4xadYspr9Rez8EBdDpb8kkfL7pg6OpRLVt2WEA=", + "description": "Microsoft Azure Command-Line Tools MicrosoftLogz Extension" + }, + "maintenance": { + "pname": "maintenance", + "version": "1.7.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b1-py3-none-any.whl", + "hash": "sha256-cZmLfV3nIjxeKuehwARFtBHROaAjh2+EeI9R8fUQsts=", + "description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension" + }, + "managedccfs": { + "pname": "managedccfs", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managedccfs-0.2.0-py3-none-any.whl", + "hash": "sha256-N49CXzVCA3PpcDpdyMDwXKgXb7hASzhhDU3oKPfCPTc=", + "description": "Microsoft Azure Command-Line Tools Managedccfs Extension" + }, + "managednetworkfabric": { + "pname": "managednetworkfabric", + "version": "6.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-6.4.0-py3-none-any.whl", + "hash": "sha256-nUEHjgZUqq42pfDyg/Ud6YzENgWCkgU2VCVG7TTKC8Q=", + "description": "Support for managednetworkfabric commands based on 2023-06-15 API version" + }, + "managementpartner": { + "pname": "managementpartner", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managementpartner-1.0.0-py2.py3-none-any.whl", + "hash": "sha256-pdSiZGR4GLShnNw1arXm+N0bCPpnE8AKFSl9LFoFlJQ=", + "description": "Support for Management Partner preview" + }, + "mcc": { + "pname": "mcc", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mcc-1.0.0b1-py3-none-any.whl", + "hash": "sha256-anNMf7Gdca1dIQFGSyR8e//doeWcJlHphUf/eesZ7U0=", + "description": "Microsoft Connected Cache CLI Commands" + }, + "mdp": { + "pname": "mdp", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0-py3-none-any.whl", + "hash": "sha256-wKSuGBcQO1SPHZHX4chVKEFdoBaoPUgxVIWXI7+3jYE=", + "description": "Microsoft Azure Command-Line Tools Mdp Extension" + }, + "microsoft-fabric": { + "pname": "microsoft-fabric", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/microsoft_fabric-1.0.0b1-py3-none-any.whl", + "hash": "sha256-i6RQpaPar6i5trbp7oIk9Gj9lyMy6QUADyrMf/AM2bs=", + "description": "Microsoft Azure Command-Line Tools Microsoft Fabric Extension" + }, + "mixed-reality": { + "pname": "mixed-reality", + "version": "0.0.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mixed_reality-0.0.5-py2.py3-none-any.whl", + "hash": "sha256-AmqvWPmtAtdIN9IaH1wSImSlmBTgt8OVwm5f3BKTGH4=", + "description": "Mixed Reality Azure CLI Extension" + }, + "mobile-network": { + "pname": "mobile-network", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mobile_network-1.0.0-py3-none-any.whl", + "hash": "sha256-LZVypO1wbfj2JsYgNq0i9GoVsRMnP4/5sGMTo4Cif1Y=", + "description": "Microsoft Azure Command-Line Tools MobileNetwork Extension" + }, + "monitor-control-service": { + "pname": "monitor-control-service", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_control_service-1.2.0-py3-none-any.whl", + "hash": "sha256-MVGjQYRdBTpL5F2bfATh4VuIUDq2sRAWOhK5rub9PNk=", + "description": "Microsoft Azure Command-Line Tools MonitorClient Extension" + }, + "monitor-pipeline-group": { + "pname": "monitor-pipeline-group", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b2-py3-none-any.whl", + "hash": "sha256-skfHQJ7vGnKZtaDmAGmjPLtuxNfyHE44pxi1Usl9X9s=", + "description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension" + }, + "multicloud-connector": { + "pname": "multicloud-connector", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0-py3-none-any.whl", + "hash": "sha256-8Gb946+K7DwMm5s5GROUciYRkvYvxgB7rB5Y3MRn5t8=", + "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" + }, + "neon": { + "pname": "neon", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b1-py3-none-any.whl", + "hash": "sha256-JA3DOHznnpjq0nt30tAWLHSUyUv6ihfRt4Qa4l5Dajs=", + "description": "Microsoft Azure Command-Line Tools Neon Extension" + }, + "network-analytics": { + "pname": "network-analytics", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/network_analytics-1.0.0b1-py3-none-any.whl", + "hash": "sha256-yNfhlfkTKYrAPvjrH41/sJUmlW0+t1CozUR66PYdQxc=", + "description": "Microsoft Azure Command-Line Tools NetworkAnalytics Extension" + }, + "networkcloud": { + "pname": "networkcloud", + "version": "2.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b5-py3-none-any.whl", + "hash": "sha256-rHLPxU7TWDTKbNXHJ6D91x5JQ7zWbmXND/YH6K5JXHo=", + "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" + }, + "new-relic": { + "pname": "new-relic", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0-py3-none-any.whl", + "hash": "sha256-MQUxCuwjIdQp8GjnTf4WsLZMcQCqUervLBF2WXHqb1o=", + "description": "Microsoft Azure Command-Line Tools NewRelic Extension" + }, + "next": { + "pname": "next", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/next-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-g8TgNCfxkCA+CUwU5PfnnOyYnxJ34WuSVruf5oiqXgc=", + "description": "Microsoft Azure Command-Line Tools Next Extension" + }, + "nginx": { + "pname": "nginx", + "version": "2.0.0b6", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b6-py2.py3-none-any.whl", + "hash": "sha256-2U93wSzmlFyCP376hCOOOYta7IeBVrvfMRLw3vHriWA=", + "description": "Microsoft Azure Command-Line Tools Nginx Extension" + }, + "notification-hub": { + "pname": "notification-hub", + "version": "1.0.0a1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/notification_hub-1.0.0a1-py3-none-any.whl", + "hash": "sha256-oDdRtxVwDg0Yo46Ai/7tFkM1AkyWCMS/1TrqzHMdEJk=", + "description": "Microsoft Azure Command-Line Tools Notification Hub Extension" + }, + "nsp": { + "pname": "nsp", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b2-py3-none-any.whl", + "hash": "sha256-/r/OOPxEnapnx62EEOf6JQ9/Oa+1+HBJbOBFu3STW80=", + "description": "Microsoft Azure Command-Line Tools Nsp Extension" + }, + "offazure": { + "pname": "offazure", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/offazure-0.1.0-py3-none-any.whl", + "hash": "sha256-GRiBcHCungzu9XuTNm0Ytui/V3/WMufamZ4eKru1NlY=", + "description": "Microsoft Azure Command-Line Tools AzureMigrateV2 Extension" + }, + "oracle-database": { + "pname": "oracle-database", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0-py3-none-any.whl", + "hash": "sha256-CtcW4Rc1noFCf4yRSC8lkgMYd5ZMaVLnaLZhSNtU284=", + "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" + }, + "orbital": { + "pname": "orbital", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/orbital-0.1.0-py3-none-any.whl", + "hash": "sha256-Qln7j/VgRA1jJRzJchuz8ig0UvI5kTRRRhH4hvo1Dzc=", + "description": "Microsoft Azure Command-Line Tools Orbital Extension" + }, + "palo-alto-networks": { + "pname": "palo-alto-networks", + "version": "1.1.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-1.1.1b1-py3-none-any.whl", + "hash": "sha256-jU9qS3I2a9V3gL0VjWwls2OZnhoT6oXUkYCcyaTSlgg=", + "description": "Microsoft Azure Command-Line Tools PaloAltoNetworks Extension" + }, + "peering": { + "pname": "peering", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/peering-1.0.0-py3-none-any.whl", + "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=", + "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension" + }, + "portal": { + "pname": "portal", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/portal-0.1.3-py3-none-any.whl", + "hash": "sha256-PD6+I/WdtfLShspSz4z7vFmDzoBzYi3hGjXauVgAqZY=", + "description": "Microsoft Azure Command-Line Tools Portal Extension" + }, + "powerbidedicated": { + "pname": "powerbidedicated", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/powerbidedicated-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-4eWLtvV+3eR5P0xmoMEKJ3b4QhcoeBYjhfKx0hU53m4=", + "description": "Microsoft Azure Command-Line Tools PowerBIDedicated Extension" + }, + "providerhub": { + "pname": "providerhub", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/providerhub-1.0.0b1-py3-none-any.whl", + "hash": "sha256-e5PLfssfo6UgkJ1F5uZZfIun2qxPvBomw95mBDZ43Q0=", + "description": "Microsoft Azure Command-Line Tools ProviderHub Extension" + }, + "purview": { + "pname": "purview", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/purview-0.1.0-py3-none-any.whl", + "hash": "sha256-cGzCVQ+9B7i2djRcLybFumZVCQW8jsIkxsTlY3xJcmY=", + "description": "Microsoft Azure Command-Line Tools PurviewManagementClient Extension" + }, + "quantum": { + "pname": "quantum", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b4-py3-none-any.whl", + "hash": "sha256-c8KlBVlkh2jxI95wOayCiMJlzuTYjpTDzthc7LzmtVI=", + "description": "Microsoft Azure Command-Line Tools Quantum Extension" + }, + "qumulo": { + "pname": "qumulo", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-1.0.0-py3-none-any.whl", + "hash": "sha256-mXP1gKP8IMwv5VWKHP3BDd/GVnmC0S83AIu/7Hqvz5s=", + "description": "Microsoft Azure Command-Line Tools Qumulo Extension" + }, + "quota": { + "pname": "quota", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quota-1.0.0-py3-none-any.whl", + "hash": "sha256-i0w0dd8MNUTbzCjkh161sWPXK0Cv9CUKr9rZQYDD+ZU=", + "description": "Microsoft Azure Command-Line Tools AzureQuotaExtensionAPI Extension" + }, + "redisenterprise": { + "pname": "redisenterprise", + "version": "1.2.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1b1-py3-none-any.whl", + "hash": "sha256-mBboVxqGiYZJczJ7YzHSQ3A9oxtAwFOe2JE2udv2yeA=", + "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" + }, + "reservation": { + "pname": "reservation", + "version": "0.3.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/reservation-0.3.1-py3-none-any.whl", + "hash": "sha256-ZJ8IawIwXRQvLwjqlvUqMioWWm8qlY8yh/U1UJOKuRI=", + "description": "Microsoft Azure Command-Line Tools Reservation Extension" + }, + "resource-graph": { + "pname": "resource-graph", + "version": "2.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-2.1.0-py2.py3-none-any.whl", + "hash": "sha256-YsgePWLOYMWgpIWCnQC9sMczFF7pP7YJjBTjsn7ifEA=", + "description": "Support for querying Azure resources with Resource Graph" + }, + "resource-mover": { + "pname": "resource-mover", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_mover-1.0.0b1-py3-none-any.whl", + "hash": "sha256-O8n0GqMMT2vAT/eA3DDo3wW/yIfyrb356J1Z+DieVfM=", + "description": "Microsoft Azure Command-Line Tools ResourceMoverServiceAPI Extension" + }, + "sap-hana": { + "pname": "sap-hana", + "version": "0.6.5", + "url": "https://github.com/Azure/azure-hanaonazure-cli-extension/releases/download/0.6.5/sap_hana-0.6.5-py2.py3-none-any.whl", + "hash": "sha256-tFVMEl86DrXIkc7DludwX26R1NgXiazvIOPE0XL6RUM=", + "description": "Additional commands for working with SAP HanaOnAzure instances" + }, + "scenario-guide": { + "pname": "scenario-guide", + "version": "0.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scenario_guide-0.1.1-py3-none-any.whl", + "hash": "sha256-QmS0i0uYAzRIij/bO8QyQegoonQsNc5ImF876/AZ6Pg=", + "description": "Microsoft Azure Command-Line Tools Scenario Guidance Extension" + }, + "scheduled-query": { + "pname": "scheduled-query", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-/V5p0EOLgInb4ZfVukxBd2rtkGlBysN0dVpMkETErwQ=", + "description": "Microsoft Azure Command-Line Tools Scheduled_query Extension" + }, + "scvmm": { + "pname": "scvmm", + "version": "1.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.2-py2.py3-none-any.whl", + "hash": "sha256-sbLmbA/wV5dtSPGKQ5YPT/WAK1UC6ebS1aXY8bTotvI=", + "description": "Microsoft Azure Command-Line Tools SCVMM Extension" + }, + "self-help": { + "pname": "self-help", + "version": "0.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/self_help-0.4.0-py3-none-any.whl", + "hash": "sha256-jJA6rxDWy2HmRV9gEN7utJbR4j1odmYgiSZqSUA1hrY=", + "description": "Microsoft Azure Command-Line Tools SelfHelp Extension" + }, + "sentinel": { + "pname": "sentinel", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/sentinel-0.2.0-py3-none-any.whl", + "hash": "sha256-VRFUS040KwOkpCY2F8YD2HRCrVF5zp2MDR/RCRX5O3o=", + "description": "Microsoft Azure Command-Line Tools Sentinel Extension" + }, + "site-recovery": { + "pname": "site-recovery", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site_recovery-1.0.0-py3-none-any.whl", + "hash": "sha256-qxkULJouBhkLbawnLYzynhecnig/ll+OOk0pJ1uEfOU=", + "description": "Microsoft Azure Command-Line Tools SiteRecovery Extension" + }, + "spring": { + "pname": "spring", + "version": "1.26.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.0-py3-none-any.whl", + "hash": "sha256-6CxqOuyIoHNsdhR3B7ZOZM/ZuFRQM12eD6zHkOHnYbQ=", + "description": "Microsoft Azure Command-Line Tools spring Extension" + }, + "spring-cloud": { + "pname": "spring-cloud", + "version": "3.1.8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring_cloud-3.1.8-py3-none-any.whl", + "hash": "sha256-FJk6vjUkwopCsum6DwqKcIMWK6kXSXXgnYzqg0uYKe4=", + "description": "Microsoft Azure Command-Line Tools spring-cloud Extension" + }, + "stack-hci": { + "pname": "stack-hci", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci-1.1.0-py3-none-any.whl", + "hash": "sha256-m7A1D2worCBopaSiC7z3SuNLOS0F6xSMQDxhhSXLre8=", + "description": "Microsoft Azure Command-Line Tools AzureStackHCIClient Extension" + }, + "stack-hci-vm": { + "pname": "stack-hci-vm", + "version": "1.4.3", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl", + "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=", + "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" + }, + "standbypool": { + "pname": "standbypool", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0-py3-none-any.whl", + "hash": "sha256-WlY5U30m/7sG845ovWyTntkJBdmssYwHFhgjcy+yfPk=", + "description": "Microsoft Azure Command-Line Tools Standbypool Extension" + }, + "staticwebapp": { + "pname": "staticwebapp", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/staticwebapp-1.0.0-py3-none-any.whl", + "hash": "sha256-+x3Nh2/C2CnMehzFRelEU2TUM1fYiLs97rNqcWuAVxc=", + "description": "Microsoft Azure Command-Line Tools Staticwebapp Extension" + }, + "storage-actions": { + "pname": "storage-actions", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-1.0.0b1-py3-none-any.whl", + "hash": "sha256-B8W+JW7bviyB2DnkxtPZF6Vrk5IVFQKM+WI5PhF2Mxs=", + "description": "Microsoft Azure Command-Line Tools StorageActions Extension" + }, + "storage-blob-preview": { + "pname": "storage-blob-preview", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-H/5FHkFlfI8ooiq+44c3HRHO3YDS5Sz8vtCtrAqRe0E=", + "description": "Microsoft Azure Command-Line Tools Storage-blob-preview Extension" + }, + "storage-mover": { + "pname": "storage-mover", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.1.0-py3-none-any.whl", + "hash": "sha256-fXaKylCqmJeKDZKcRs/+YL9IilJ2ZUhdpjGzNETK4kw=", + "description": "Microsoft Azure Command-Line Tools StorageMover Extension" + }, + "storagesync": { + "pname": "storagesync", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storagesync-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-fyupGnpEdB9DhLRLp86nOooDtdOFtDQEy0lR3S6l3Fo=", + "description": "Microsoft Azure Command-Line Tools MicrosoftStorageSync Extension" + }, + "stream-analytics": { + "pname": "stream-analytics", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.0-py3-none-any.whl", + "hash": "sha256-FUQ/2Kc9MZpcn7xYbJcn0c4aMeEf0/PH5Py8l60Haqo=", + "description": "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension" + }, + "subscription": { + "pname": "subscription", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-Pzu0+7dhF00ToPhjNit084i8ZI9/KW+bbiGRs1UHrk8=", + "description": "Microsoft Azure Command-Line Tools Subscription Extension" + }, + "support": { + "pname": "support", + "version": "2.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.1-py2.py3-none-any.whl", + "hash": "sha256-PwcBVPg5RkqiS1SZDYfS26mdbaYOw+8xSnS6IsJo/sQ=", + "description": "Microsoft Azure Command-Line Tools Support Extension" + }, + "terraform": { + "pname": "terraform", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/terraform-1.0.0b1-py3-none-any.whl", + "hash": "sha256-gP3iuJa3B/2D+DghgJaCB5vTuwMqqcsEug0llbNnPyc=", + "description": "Microsoft Azure Command-Line Tools Terraform Extension" + }, + "timeseriesinsights": { + "pname": "timeseriesinsights", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/timeseriesinsights-1.0.0b1-py3-none-any.whl", + "hash": "sha256-xXiASmz7tO+KuR3iEwu6j2E58vrepO0eOLBepix6qV0=", + "description": "Microsoft Azure Command-Line Tools TimeSeriesInsightsClient Extension" + }, + "traffic-collector": { + "pname": "traffic-collector", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-1.0.0-py3-none-any.whl", + "hash": "sha256-RpWrtTcj6lCfD3oLxtT0vlzAOC/om3ZnHuB4WgUVffw=", + "description": "Microsoft Azure Command-Line Tools TrafficCollector Extension" + }, + "trustedsigning": { + "pname": "trustedsigning", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/trustedsigning-1.0.0b2-py3-none-any.whl", + "hash": "sha256-w66GnBNxSTGAue1x2wvcOEK61UyIMr62AHEY0mvtceg=", + "description": "Microsoft Azure Command-Line Tools Trustedsigning Extension" + }, + "virtual-network-manager": { + "pname": "virtual-network-manager", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.0-py3-none-any.whl", + "hash": "sha256-8W+ZL5j9A8AdzvikD5uE3iNn/56IULSGY6m7HLVbe9Q=", + "description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension" + }, + "virtual-network-tap": { + "pname": "virtual-network-tap", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-7l9tz8CfwJ4MO704a007xswfij3ejtVQgE9D7Uw8t7o=", + "description": "Manage virtual network taps (VTAP)" + }, + "virtual-wan": { + "pname": "virtual-wan", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_wan-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-LbbCU9Q4YtBqRSUHPWe2Hx00t8iDIWK9Owv//SS5raY=", + "description": "Manage virtual WAN, hubs, VPN gateways and VPN sites" + }, + "vmware": { + "pname": "vmware", + "version": "7.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-7.1.0-py2.py3-none-any.whl", + "hash": "sha256-U9yLHYA814TmaMTU1jDewgOQQGr0YmbfCGD1SKXCH50=", + "description": "Azure VMware Solution commands" + }, + "webapp": { + "pname": "webapp", + "version": "0.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/webapp-0.4.0-py2.py3-none-any.whl", + "hash": "sha256-kIsN8HzvZSF2oPK/D9z1i10W+0kD7jwG9z8Ls5E6XA8=", + "description": "Additional commands for Azure AppService" + }, + "workloads": { + "pname": "workloads", + "version": "1.1.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-1.1.0b3-py3-none-any.whl", + "hash": "sha256-pzc7LTdmxDs8rq/A7du0kkKXULYsePdndgubC0I2MgY=", + "description": "Microsoft Azure Command-Line Tools Workloads Extension" + } +} diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix deleted file mode 100644 index 9f80146842de..000000000000 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ /dev/null @@ -1,1055 +0,0 @@ -# This file is automatically generated. DO NOT EDIT! Read README.md -{ mkAzExtension }: -{ - acat = mkAzExtension rec { - pname = "acat"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/acat-${version}-py3-none-any.whl"; - sha256 = "9c228e93fdda531137ba6e5abad2b48577cf58512e4be0dee51cef111267327a"; - description = "Microsoft Azure Command-Line Tools Acat Extension"; - }; - account = mkAzExtension rec { - pname = "account"; - version = "0.2.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/account-${version}-py3-none-any.whl"; - sha256 = "0b94df323acfc48ea3141904649106bb85695187dbf63aa3b8448ec12bc00c23"; - description = "Microsoft Azure Command-Line Tools SubscriptionClient Extension"; - }; - acrquery = mkAzExtension rec { - pname = "acrquery"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/acrquery-${version}-py3-none-any.whl"; - sha256 = "9094137a4d08f2ede7b662c99df0665f338aae7bcaf4976bed5d42df754571f1"; - description = "Microsoft Azure Command-Line Tools AcrQuery Extension"; - }; - acrtransfer = mkAzExtension rec { - pname = "acrtransfer"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-${version}-py3-none-any.whl"; - sha256 = "668b94d0341b663a610212f318b899a53be60ae0eb59c47e162f5dabd3483551"; - description = "Microsoft Azure Command-Line Tools Acrtransfer Extension"; - }; - ad = mkAzExtension rec { - pname = "ad"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/ad-${version}-py3-none-any.whl"; - sha256 = "61df234e10759e9916c1d447ab02b82637de10fd97c31a17252e1f5183853883"; - description = "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension"; - }; - adp = mkAzExtension rec { - pname = "adp"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/adp-${version}-py3-none-any.whl"; - sha256 = "fd64519832f4fd314431f87176507e10249b8d165537f81d05c9ea5185ae84ec"; - description = "Microsoft Azure Command-Line Tools Adp Extension"; - }; - aem = mkAzExtension rec { - pname = "aem"; - version = "0.3.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/aem-${version}-py2.py3-none-any.whl"; - sha256 = "25aaf9006ab1d115d7c484cfda1c9ad0e3617af6d2140db87499aaea81b67ff8"; - description = "Manage Azure Enhanced Monitoring Extensions for SAP"; - }; - ai-examples = mkAzExtension rec { - pname = "ai-examples"; - version = "0.2.5"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/ai_examples-${version}-py2.py3-none-any.whl"; - sha256 = "badbdf5fc2e0b4a85c4124d3fc92859b582adf8f30f5727440ce81942140099a"; - description = "Add AI powered examples to help content"; - }; - aks-preview = mkAzExtension rec { - pname = "aks-preview"; - version = "8.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "500a670e0f4cd8ef9399a0928fbcef6440a68cdc2978c62db911d1585f351b75"; - description = "Provides a preview for upcoming AKS features"; - }; - akshybrid = mkAzExtension rec { - pname = "akshybrid"; - version = "0.1.2"; - url = "https://hybridaksstorage.z13.web.core.windows.net/HybridAKS/CLI/akshybrid-${version}-py3-none-any.whl"; - sha256 = "9767cda444c421573bc220e01cd58a67c30a36175cedba68b0454a3c6e983a8e"; - description = "Microsoft Azure Command-Line Tools HybridContainerService Extension"; - }; - alb = mkAzExtension rec { - pname = "alb"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/alb-${version}-py3-none-any.whl"; - sha256 = "b020cd8cd3da6299dc978499dae452768b7651c3ed8e05f2f0b321bd9b8354d4"; - description = "Microsoft Azure Command-Line Tools ALB Extension"; - }; - alertsmanagement = mkAzExtension rec { - pname = "alertsmanagement"; - version = "0.2.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-${version}-py3-none-any.whl"; - sha256 = "b45a5752924ab1205ff5862f03a4a465eccb4dd8e79900023498d674aa68665b"; - description = "Microsoft Azure Command-Line Tools AlertsManagementClient Extension"; - }; - amg = mkAzExtension rec { - pname = "amg"; - version = "2.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl"; - sha256 = "8d832463a35329e61840bce5fe2c3ba214f8e800cc38140fe58dc2bf13ffeb90"; - description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"; - }; - amlfs = mkAzExtension rec { - pname = "amlfs"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/amlfs-${version}-py3-none-any.whl"; - sha256 = "21b5a12943e727315288aa0ca1c49a25803a656b7f388c3c637596cfdf67bd1d"; - description = "Microsoft Azure Command-Line Tools Amlfs Extension"; - }; - apic-extension = mkAzExtension rec { - pname = "apic-extension"; - version = "1.0.0b5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-${version}-py3-none-any.whl"; - sha256 = "fbca1f8446013142d676159b8292fd7c2d3175f39e1baeb5c4d13f9637003254"; - description = "Microsoft Azure Command-Line Tools ApicExtension Extension"; - }; - appservice-kube = mkAzExtension rec { - pname = "appservice-kube"; - version = "0.1.10"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-${version}-py2.py3-none-any.whl"; - sha256 = "7fd72d27e4b0eceda3b2b4f301c7a0c3068fea8b96d70f9fcaad142240de7d0d"; - description = "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension"; - }; - astronomer = mkAzExtension rec { - pname = "astronomer"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-${version}-py3-none-any.whl"; - sha256 = "b4ca41b5d9cb77aed2b462ded4a392ae3ce896ce8d9cb94a08671d0cb68176cd"; - description = "Microsoft Azure Command-Line Tools Astronomer Extension"; - }; - authV2 = mkAzExtension rec { - pname = "authV2"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-${version}-py3-none-any.whl"; - sha256 = "eb05636f8c78e2f83b7f452fe56f5a9ae496d6909dc36924ae5f98a2fb5bce41"; - description = "Microsoft Azure Command-Line Tools Authv2 Extension"; - }; - automanage = mkAzExtension rec { - pname = "automanage"; - version = "0.1.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/automanage-${version}-py3-none-any.whl"; - sha256 = "42341a6cfdacb3af0433b10b3e9bcb5226d4c7fb59730378408a957662266551"; - description = "Microsoft Azure Command-Line Tools Automanage Extension"; - }; - automation = mkAzExtension rec { - pname = "automation"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/automation-${version}-py3-none-any.whl"; - sha256 = "d31fe0433fa30a6e009f7b9bee6c417a686ed87502dd987b9ac8ad113383915b"; - description = "Microsoft Azure Command-Line Tools AutomationClient Extension"; - }; - azure-firewall = mkAzExtension rec { - pname = "azure-firewall"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-${version}-py2.py3-none-any.whl"; - sha256 = "5468cc09b8ea7918176b5e95aa3c24c7ad9b7d1b68c47d16bf522a053fd811e8"; - description = "Manage Azure Firewall resources"; - }; - azurelargeinstance = mkAzExtension rec { - pname = "azurelargeinstance"; - version = "1.0.0b3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-${version}-py3-none-any.whl"; - sha256 = "093a2fa900e3df53f8bf15b335156058333efe0eff9584a11db4bac0bccc7b1d"; - description = "Microsoft Azure Command-Line Tools Azurelargeinstance Extension"; - }; - azurestackhci = mkAzExtension rec { - pname = "azurestackhci"; - version = "0.2.9"; - url = "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/azurestackhci-${version}-py3-none-any.whl"; - sha256 = "2557b2fe3fa2f951a2794ba967555ba54c2e93eb75538152f21ab2fb568fef16"; - description = "Microsoft Azure Command-Line Tools AzureStackHCI Extension"; - }; - baremetal-infrastructure = mkAzExtension rec { - pname = "baremetal-infrastructure"; - version = "3.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-${version}-py3-none-any.whl"; - sha256 = "83ff3e4540f522a5f3578a923155715160e90a15a8d919a2e5569c08f1295a2f"; - description = "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension"; - }; - bastion = mkAzExtension rec { - pname = "bastion"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-${version}-py3-none-any.whl"; - sha256 = "d90bc404d2f9d22435a2bd34bd1fd6094d71d6f1719763c72ee6e4835ec8a99d"; - description = "Microsoft Azure Command-Line Tools Bastion Extension"; - }; - billing-benefits = mkAzExtension rec { - pname = "billing-benefits"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/billing_benefits-${version}-py3-none-any.whl"; - sha256 = "f71250d1c26690cc0e175cd5c9bcd59e76c7b701bb3a47c8273e4cf8bcca878e"; - description = "Microsoft Azure Command-Line Tools BillingBenefits Extension"; - }; - blueprint = mkAzExtension rec { - pname = "blueprint"; - version = "0.3.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-${version}-py3-none-any.whl"; - sha256 = "58d3835446dd93e585b0f6b520a2db6551b8a927e35e25da4747d4cf8a4c009b"; - description = "Microsoft Azure Command-Line Tools Blueprint Extension"; - }; - change-analysis = mkAzExtension rec { - pname = "change-analysis"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/change_analysis-${version}-py3-none-any.whl"; - sha256 = "49f1761a1b1ad29169af2ecd5793e10ddec797ebb2610e7c70e1b1ab2b75126a"; - description = "Microsoft Azure Command-Line Tools ChangeAnalysis Extension"; - }; - cli-translator = mkAzExtension rec { - pname = "cli-translator"; - version = "0.3.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/cli_translator-${version}-py3-none-any.whl"; - sha256 = "9ea6162d37fc3390be4dce64cb05c5c588070104f3e92a701ab475473565a8a9"; - description = "Translate ARM template to executable Azure CLI scripts"; - }; - compute-diagnostic-rp = mkAzExtension rec { - pname = "compute-diagnostic-rp"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-${version}-py3-none-any.whl"; - sha256 = "810e93ce00c7d03df6da9a0faf57b966fb6da582311f9cae74b2b7e1e3c41423"; - description = "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension"; - }; - confidentialledger = mkAzExtension rec { - pname = "confidentialledger"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/confidentialledger-${version}-py3-none-any.whl"; - sha256 = "3afbf49f10cdddd9675562364ce2275f6f70eb5318fa85b658d711b1e24dc94e"; - description = "Microsoft Azure Command-Line Tools ConfidentialLedger Extension"; - }; - confluent = mkAzExtension rec { - pname = "confluent"; - version = "0.6.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-${version}-py3-none-any.whl"; - sha256 = "7987d22e0e9cada28087a900bfa534865531941f2bbfe967eb46c90b2e0a12be"; - description = "Microsoft Azure Command-Line Tools ConfluentManagementClient Extension"; - }; - connectedmachine = mkAzExtension rec { - pname = "connectedmachine"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-${version}-py3-none-any.whl"; - sha256 = "8b8c4340c4c6552e3826220ffb95bf619447675b0469304b71fa80e2e4e31c81"; - description = "Microsoft Azure Command-Line Tools ConnectedMachine Extension"; - }; - connectedvmware = mkAzExtension rec { - pname = "connectedvmware"; - version = "1.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-${version}-py2.py3-none-any.whl"; - sha256 = "28ef4a31c805d52aa16e749ec1382591b3089e970d8741deaf401a86c4e5e6ad"; - description = "Microsoft Azure Command-Line Tools Connectedvmware Extension"; - }; - connection-monitor-preview = mkAzExtension rec { - pname = "connection-monitor-preview"; - version = "0.1.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/connection_monitor_preview-${version}-py2.py3-none-any.whl"; - sha256 = "9a796d5187571990d27feb9efeedde38c194f13ea21cbf9ec06131196bfd821d"; - description = "Microsoft Azure Command-Line Connection Monitor V2 Extension"; - }; - cosmosdb-preview = mkAzExtension rec { - pname = "cosmosdb-preview"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-${version}-py2.py3-none-any.whl"; - sha256 = "c540018bc5da1252ec3e3e564552650d6af08f349f3ff339be398a7983caf2a9"; - description = "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"; - }; - costmanagement = mkAzExtension rec { - pname = "costmanagement"; - version = "0.3.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/costmanagement-${version}-py3-none-any.whl"; - sha256 = "5661a2082ecca000b0c764dc92585e2aa601ccd5eeeb296397533cf4da814cf6"; - description = "Microsoft Azure Command-Line Tools CostManagementClient Extension"; - }; - csvmware = mkAzExtension rec { - pname = "csvmware"; - version = "0.3.0"; - url = "https://github.com/Azure/az-csvmware-cli/releases/download/${version}/csvmware-0.3.0-py2.py3-none-any.whl"; - sha256 = "dfb9767f05ac13c762ea9dc4327169e63a5c11879123544b200edb9a2c9a8a42"; - description = "Manage Azure VMware Solution by CloudSimple"; - }; - custom-providers = mkAzExtension rec { - pname = "custom-providers"; - version = "0.2.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/custom_providers-${version}-py2.py3-none-any.whl"; - sha256 = "a9938f09c86fa4575e3c887206908cac15920af528c537c0b998362a1c43daf7"; - description = "Microsoft Azure Command-Line Tools Custom Providers Extension"; - }; - customlocation = mkAzExtension rec { - pname = "customlocation"; - version = "0.1.3"; - url = "https://arcplatformcliextprod.blob.core.windows.net/customlocation/customlocation-${version}-py2.py3-none-any.whl"; - sha256 = "5e36435b1a81de25e74e70c45c2ac9f98065138c35050f29210ae40c18484e28"; - description = "Microsoft Azure Command-Line Tools Customlocation Extension"; - }; - databox = mkAzExtension rec { - pname = "databox"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/databox-${version}-py3-none-any.whl"; - sha256 = "7b41a60521d7cf652d4cdca052fc9d2ec6371f3d7884ec0a74ba9a7d5001d7bb"; - description = "Microsoft Azure Command-Line Tools Databox Extension"; - }; - databricks = mkAzExtension rec { - pname = "databricks"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-${version}-py3-none-any.whl"; - sha256 = "a23ded367e80240eea828a3234801d4d989539ae4a5ecf246bfc6acb054a2544"; - description = "Microsoft Azure Command-Line Tools DatabricksClient Extension"; - }; - datadog = mkAzExtension rec { - pname = "datadog"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-${version}-py3-none-any.whl"; - sha256 = "9a38fd5d6d01646f299ee7b5f68e82ad708889c7d0bd72e0b6b6b13e5455e937"; - description = "Microsoft Azure Command-Line Tools MicrosoftDatadogClient Extension"; - }; - datafactory = mkAzExtension rec { - pname = "datafactory"; - version = "1.0.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-${version}-py3-none-any.whl"; - sha256 = "ea134e2963b7cdf2bcbd50244a6f1a411da77bd4db7e42c8c8f9651638c82ac7"; - description = "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension"; - }; - datamigration = mkAzExtension rec { - pname = "datamigration"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-${version}-py3-none-any.whl"; - sha256 = "9d1ac8c7046e23387696561747be2e8f62e879a4a305f8b20ccd19460a29db0d"; - description = "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"; - }; - dataprotection = mkAzExtension rec { - pname = "dataprotection"; - version = "1.5.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-${version}-py3-none-any.whl"; - sha256 = "4671ce89e39065695f21626350dfcad5438bdbefc714cf35e85ee5eab0f96661"; - description = "Microsoft Azure Command-Line Tools DataProtectionClient Extension"; - }; - datashare = mkAzExtension rec { - pname = "datashare"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datashare-${version}-py3-none-any.whl"; - sha256 = "f1a801bd0c38eb2ebf9c2fb4e0b43a98470ae7b40bbcd05eb2aa596d69579c9e"; - description = "Microsoft Azure Command-Line Tools DataShareManagementClient Extension"; - }; - deploy-to-azure = mkAzExtension rec { - pname = "deploy-to-azure"; - version = "0.2.0"; - url = "https://github.com/Azure/deploy-to-azure-cli-extension/releases/download/20200318.1/deploy_to_azure-${version}-py2.py3-none-any.whl"; - sha256 = "f925080ee7abc3aef733d4c6313170bdedaa9569af1b95427383bc3c59e4ceb8"; - description = "Deploy to Azure using Github Actions"; - }; - desktopvirtualization = mkAzExtension rec { - pname = "desktopvirtualization"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/desktopvirtualization-${version}-py3-none-any.whl"; - sha256 = "3a1e7a8f0e579fa21fed770859b21c23bec8b8489d834a61411695a9a90c7cd4"; - description = "Microsoft Azure Command-Line Tools Desktopvirtualization Extension"; - }; - dev-spaces = mkAzExtension rec { - pname = "dev-spaces"; - version = "1.0.6"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/dev_spaces-${version}-py2.py3-none-any.whl"; - sha256 = "71041808b27cd9d33fd905c5080c97f61291816f2dddd6dcdb2e66b9fb6ebf59"; - description = "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams"; - }; - devcenter = mkAzExtension rec { - pname = "devcenter"; - version = "6.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-${version}-py3-none-any.whl"; - sha256 = "25e3dcdc9cb83243ceb2ed6a6dedc227953c06cb610ba95c84ddec0f7503224f"; - description = "Microsoft Azure Command-Line Tools DevCenter Extension"; - }; - diskpool = mkAzExtension rec { - pname = "diskpool"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/diskpool-${version}-py3-none-any.whl"; - sha256 = "9ae6aaea85a17529da2a4e51c2ba2aba55b4b26816d5618eafd0f9fdc43b67b7"; - description = "Microsoft Azure Command-Line Tools StoragePoolManagement Extension"; - }; - dms-preview = mkAzExtension rec { - pname = "dms-preview"; - version = "0.15.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dms_preview-${version}-py2.py3-none-any.whl"; - sha256 = "556c145c03b8d529d8e77f7b35702fb8de382891635e858f928117f33688ee9c"; - description = "Support for new Database Migration Service scenarios"; - }; - dnc = mkAzExtension rec { - pname = "dnc"; - version = "0.2.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dnc-${version}-py3-none-any.whl"; - sha256 = "e38474ca9b28bed5dde388cf73dff9e3504825032b03c5bf8930c25caf292026"; - description = "Microsoft Azure Command-Line Tools Dnc Extension"; - }; - dns-resolver = mkAzExtension rec { - pname = "dns-resolver"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-${version}-py3-none-any.whl"; - sha256 = "1c4bb8216e509c2f08fa75c45930ec377768326f30cb9ab125842aa9352c6e2e"; - description = "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension"; - }; - dynatrace = mkAzExtension rec { - pname = "dynatrace"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-${version}-py3-none-any.whl"; - sha256 = "112a7e423461d1b6f7c385fe8b73b4f2b850e2570c35a54a4bbcc2e87afec661"; - description = "Microsoft Azure Command-Line Tools Dynatrace Extension"; - }; - edgeorder = mkAzExtension rec { - pname = "edgeorder"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/edgeorder-${version}-py3-none-any.whl"; - sha256 = "186a06d0f8603f7e0faeed5296ecc73bf1096e0d681acea42d5ebccc1670357b"; - description = "Microsoft Azure Command-Line Tools EdgeOrderManagementClient Extension"; - }; - edgezones = mkAzExtension rec { - pname = "edgezones"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/edgezones-${version}-py3-none-any.whl"; - sha256 = "98f1b962dcbb078cfb8cd12d40a58d01bcc37db441570f84e293ba0ba52c6c08"; - description = "Microsoft Azure Command-Line Tools Edgezones Extension"; - }; - elastic = mkAzExtension rec { - pname = "elastic"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-${version}-py3-none-any.whl"; - sha256 = "1d99dbcc10b99185b4cd9b64a8835d80b424226e5cf5d40b3e3ae1d435532657"; - description = "Microsoft Azure Command-Line Tools MicrosoftElastic Extension"; - }; - elastic-san = mkAzExtension rec { - pname = "elastic-san"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-${version}-py3-none-any.whl"; - sha256 = "6d2f1247ae78e431d4834989df581cd21241d16b97071bf672fb8b71ee3ad702"; - description = "Microsoft Azure Command-Line Tools ElasticSan Extension"; - }; - eventgrid = mkAzExtension rec { - pname = "eventgrid"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/eventgrid-${version}-py2.py3-none-any.whl"; - sha256 = "662ca2a381efcf821a16648ff3b89edbe21f4e9887e18ffa7ee0dbbaf0332ede"; - description = "Microsoft Azure Command-Line Tools EventGrid Command Module"; - }; - express-route-cross-connection = mkAzExtension rec { - pname = "express-route-cross-connection"; - version = "0.1.1"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-${version}-py2.py3-none-any.whl"; - sha256 = "b83f723baae0ea04557a87f358fa2131baf15d45cd3aba7a9ab42d14ec80df38"; - description = "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection"; - }; - firmwareanalysis = mkAzExtension rec { - pname = "firmwareanalysis"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-${version}-py3-none-any.whl"; - sha256 = "1c3df1441de76edb08bed05ac279dd2b02bd6fab68a0b9a495dfd7ecce3e92cb"; - description = "Microsoft Azure Command-Line Tools Firmwareanalysis Extension"; - }; - fleet = mkAzExtension rec { - pname = "fleet"; - version = "1.2.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-${version}-py3-none-any.whl"; - sha256 = "d7e3525249c0c4e5ae0988500e36847b4363d734f7b16e7a0f9a9e54623081ae"; - description = "Microsoft Azure Command-Line Tools Fleet Extension"; - }; - fluid-relay = mkAzExtension rec { - pname = "fluid-relay"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/fluid_relay-${version}-py3-none-any.whl"; - sha256 = "9217666f8134a38e09aeda905e7cc83994332a5ab563ec8935b9ff6c91563e8c"; - description = "Microsoft Azure Command-Line Tools FluidRelay Extension"; - }; - footprint = mkAzExtension rec { - pname = "footprint"; - version = "1.0.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/footprint-${version}-py3-none-any.whl"; - sha256 = "4aa59288bf46cfd68519f1f7f63d3e33af16d80632b84c283cc7152129260b2c"; - description = "Microsoft Azure Command-Line Tools FootprintMonitoringManagementClient Extension"; - }; - front-door = mkAzExtension rec { - pname = "front-door"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-${version}-py3-none-any.whl"; - sha256 = "232ba7b2cd24240d4e86d820e5fa78a11143b3a624ed953a3451210500edfbe0"; - description = "Manage networking Front Doors"; - }; - fzf = mkAzExtension rec { - pname = "fzf"; - version = "1.0.2"; - url = "https://pahealyfzf.blob.core.windows.net/fzf/fzf-${version}-py2.py3-none-any.whl"; - sha256 = "84abeed03b4bbfa7b8c0be08d9366ff3040e2160df4f5a539f0e1c9e0a1c359c"; - description = "Microsoft Azure Command-Line Tools fzf Extension"; - }; - gallery-service-artifact = mkAzExtension rec { - pname = "gallery-service-artifact"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/gallery_service_artifact-${version}-py3-none-any.whl"; - sha256 = "3f30e3e8e7e678fd9ab91b2261fb918a303cd382626509d3f00e86f1967750c6"; - description = "Microsoft Azure Command-Line Tools GalleryServiceArtifact Extension"; - }; - graphservices = mkAzExtension rec { - pname = "graphservices"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/graphservices-${version}-py3-none-any.whl"; - sha256 = "8aeda3901e944b038f4e812b0b7099798d2bd82d55e03e785017a504c14583e5"; - description = "Microsoft Azure Command-Line Tools Graphservices Extension"; - }; - guestconfig = mkAzExtension rec { - pname = "guestconfig"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/guestconfig-${version}-py3-none-any.whl"; - sha256 = "94836a5d21ee1071cd40b163d2c80c32a6a81b9dc85d91371f7e4fb35141e273"; - description = "Microsoft Azure Command-Line Tools GuestConfigurationClient Extension"; - }; - hack = mkAzExtension rec { - pname = "hack"; - version = "0.4.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hack-${version}-py2.py3-none-any.whl"; - sha256 = "f9e600457e3a9fffc3235a7b30176d9f0a7f4d39ac01ea3e2668bcbdee6398a6"; - description = "Microsoft Azure Command-Line Tools Hack Extension"; - }; - hardware-security-modules = mkAzExtension rec { - pname = "hardware-security-modules"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hardware_security_modules-${version}-py3-none-any.whl"; - sha256 = "ac4a10e2cc64a4d0818e48ffbcddfeb4307dd56b8875bc01c02687d473c9fe9b"; - description = "Microsoft Azure Command-Line Tools AzureDedicatedHSMResourceProvider Extension"; - }; - hdinsightonaks = mkAzExtension rec { - pname = "hdinsightonaks"; - version = "1.0.0b3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-${version}-py3-none-any.whl"; - sha256 = "f549b85107b7b83ff64fcfa5c90a5d7e900a5ea2efe76eec9b1f81689e58c365"; - description = "Microsoft Azure Command-Line Tools Hdinsightonaks Extension"; - }; - healthbot = mkAzExtension rec { - pname = "healthbot"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-${version}-py3-none-any.whl"; - sha256 = "9134fad2511516e714a5db346d63865af0badf0599ade3f1c15faca0055585a3"; - description = "Microsoft Azure Command-Line Tools HealthbotClient Extension"; - }; - healthcareapis = mkAzExtension rec { - pname = "healthcareapis"; - version = "0.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-${version}-py3-none-any.whl"; - sha256 = "a25d7d57d4fd3adcc37581d0acc1d6c6a46dcd0351933ed37cfba9d1abd60978"; - description = "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension"; - }; - hpc-cache = mkAzExtension rec { - pname = "hpc-cache"; - version = "0.1.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-${version}-py2.py3-none-any.whl"; - sha256 = "852cb417aadf0ad07e3c51413858c413bf71ea6cb49ba58289d9572f9a350507"; - description = "Microsoft Azure Command-Line Tools StorageCache Extension"; - }; - image-copy-extension = mkAzExtension rec { - pname = "image-copy-extension"; - version = "0.2.13"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-${version}-py2.py3-none-any.whl"; - sha256 = "b0d12bf3c74500790d58d99a6c32562548712cb872b7942e8ad481e270521b19"; - description = "Support for copying managed vm images between regions"; - }; - image-gallery = mkAzExtension rec { - pname = "image-gallery"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-${version}-py2.py3-none-any.whl"; - sha256 = "6260c1f4bfb589d2ba0569317358a149caabbbd49a048e69328e44871694aacd"; - description = "Support for Azure Image Gallery"; - }; - import-export = mkAzExtension rec { - pname = "import-export"; - version = "0.1.1"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/import_export-${version}-py3-none-any.whl"; - sha256 = "0680948362e12138c9582e68e471533482749bd660bfe3c8c2a4d856e90927b0"; - description = "Microsoft Azure Command-Line Tools StorageImportExport Extension"; - }; - informatica = mkAzExtension rec { - pname = "informatica"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-${version}-py3-none-any.whl"; - sha256 = "6166ae91c78e74c01af3bd1ead2d62832707e176ea0f7d5d30a5dd485f482462"; - description = "Microsoft Azure Command-Line Tools Informatica Extension"; - }; - init = mkAzExtension rec { - pname = "init"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/init-${version}-py3-none-any.whl"; - sha256 = "1177fc293dc118b449b761ec2c728d39755fc3939de8d4bfd89cce1bfb218e86"; - description = "Microsoft Azure Command-Line Tools Init Extension"; - }; - internet-analyzer = mkAzExtension rec { - pname = "internet-analyzer"; - version = "0.1.0rc6"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-${version}-py2.py3-none-any.whl"; - sha256 = "0708d9f598d1618d138eebcf18354d97c7b3a2c90570959df077e04d419d32c3"; - description = "Microsoft Azure Command-Line Tools Internet Analyzer Extension"; - }; - ip-group = mkAzExtension rec { - pname = "ip-group"; - version = "0.1.2"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/ip_group-${version}-py2.py3-none-any.whl"; - sha256 = "afba2d8a8a612863b63f504d6cff6d559610b961e4c77dc2fd49b9fe03ec67a2"; - description = "Microsoft Azure Command-Line Tools IpGroup Extension"; - }; - k8s-extension = mkAzExtension rec { - pname = "k8s-extension"; - version = "1.6.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-${version}-py3-none-any.whl"; - sha256 = "41861d65b9d86e0b622986a4984ce7a611f87b92da578db8c0527ec74334f32c"; - description = "Microsoft Azure Command-Line Tools K8s-extension Extension"; - }; - k8s-runtime = mkAzExtension rec { - pname = "k8s-runtime"; - version = "1.0.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-${version}-py3-none-any.whl"; - sha256 = "133dd153979c74d37aa25956ed8a9aa741c334929848cd67c26f268332759d40"; - description = "Microsoft Azure Command-Line Tools K8sRuntime Extension"; - }; - kusto = mkAzExtension rec { - pname = "kusto"; - version = "0.5.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/kusto-${version}-py3-none-any.whl"; - sha256 = "cf5729e9d02029a189182523543285c9737d515f41c610c8338d43f872f9f01d"; - description = "Microsoft Azure Command-Line Tools KustoManagementClient Extension"; - }; - log-analytics = mkAzExtension rec { - pname = "log-analytics"; - version = "0.2.2"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/log_analytics-${version}-py2.py3-none-any.whl"; - sha256 = "c04c42a26d50db82d14f76e209184b18d4cce17b458817ac607e3ff975641eb2"; - description = "Support for Azure Log Analytics query capabilities"; - }; - log-analytics-solution = mkAzExtension rec { - pname = "log-analytics-solution"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics_solution-${version}-py2.py3-none-any.whl"; - sha256 = "c0a4252da4c29032c4e956b768860529509e88a1ecef7f3a3189cb701a305c6b"; - description = "Support for Azure Log Analytics Solution"; - }; - logic = mkAzExtension rec { - pname = "logic"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/logic-${version}-py3-none-any.whl"; - sha256 = "14c18768c02ee9c370ac7eed0f23206eee7d344a10382a3083b17b5e1848cfcd"; - description = "Microsoft Azure Command-Line Tools Logic Extension"; - }; - logz = mkAzExtension rec { - pname = "logz"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/logz-${version}-py3-none-any.whl"; - sha256 = "6a937dbb8c5a758b29afd45ecfc101743a5bf2491f2fba60e8ea512d5b765840"; - description = "Microsoft Azure Command-Line Tools MicrosoftLogz Extension"; - }; - maintenance = mkAzExtension rec { - pname = "maintenance"; - version = "1.6.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-${version}-py3-none-any.whl"; - sha256 = "3ab6a2dac48ba71b28bc8ee05d254daa72b62f84dda953749fa621a80ca39ae5"; - description = "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension"; - }; - managedccfs = mkAzExtension rec { - pname = "managedccfs"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/managedccfs-${version}-py3-none-any.whl"; - sha256 = "378f425f35420373e9703a5dc8c0f05ca8176fb8404b38610d4de828f7c23d37"; - description = "Microsoft Azure Command-Line Tools Managedccfs Extension"; - }; - managednetworkfabric = mkAzExtension rec { - pname = "managednetworkfabric"; - version = "6.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-${version}-py3-none-any.whl"; - sha256 = "9d41078e0654aaae36a5f0f283f51de98cc4360582920536542546ed34ca0bc4"; - description = "Support for managednetworkfabric commands based on 2023-06-15 API version"; - }; - managementpartner = mkAzExtension rec { - pname = "managementpartner"; - version = "0.1.3"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/managementpartner-${version}-py2.py3-none-any.whl"; - sha256 = "22ddf4b1cdc77e99262cb6089c4d96040065828a1d38a2709fdb945d3c851839"; - description = "Support for Management Partner preview"; - }; - mdp = mkAzExtension rec { - pname = "mdp"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-${version}-py3-none-any.whl"; - sha256 = "062ad026d9eaf791b5928c4fb793148d40c6c297cee32f175cd3a155eb24d93f"; - description = "Microsoft Azure Command-Line Tools Mdp Extension"; - }; - mixed-reality = mkAzExtension rec { - pname = "mixed-reality"; - version = "0.0.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/mixed_reality-${version}-py2.py3-none-any.whl"; - sha256 = "026aaf58f9ad02d74837d21a1f5c122264a59814e0b7c395c26e5fdc1293187e"; - description = "Mixed Reality Azure CLI Extension"; - }; - mobile-network = mkAzExtension rec { - pname = "mobile-network"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/mobile_network-${version}-py3-none-any.whl"; - sha256 = "2d9572a4ed706df8f626c62036ad22f46a15b113273f8ff9b06313a380a27f56"; - description = "Microsoft Azure Command-Line Tools MobileNetwork Extension"; - }; - monitor-control-service = mkAzExtension rec { - pname = "monitor-control-service"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_control_service-${version}-py3-none-any.whl"; - sha256 = "3151a341845d053a4be45d9b7c04e1e15b88503ab6b110163a12b9aee6fd3cd9"; - description = "Microsoft Azure Command-Line Tools MonitorClient Extension"; - }; - network-analytics = mkAzExtension rec { - pname = "network-analytics"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/network_analytics-${version}-py3-none-any.whl"; - sha256 = "c8d7e195f913298ac03ef8eb1f8d7fb09526956d3eb750a8cd447ae8f61d4317"; - description = "Microsoft Azure Command-Line Tools NetworkAnalytics Extension"; - }; - networkcloud = mkAzExtension rec { - pname = "networkcloud"; - version = "2.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-${version}-py3-none-any.whl"; - sha256 = "28c43560516e254ab60708c0ac8cf868795ce76e4aa9da1548584b22331af467"; - description = "Support for Azure Operator Nexus network cloud commands based on 2023-10-01-preview API version"; - }; - new-relic = mkAzExtension rec { - pname = "new-relic"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-${version}-py3-none-any.whl"; - sha256 = "9ce69f1684cea14acba0f2fdb473e47e0a06745e383bb5144954c5e85e416199"; - description = "Microsoft Azure Command-Line Tools NewRelic Extension"; - }; - next = mkAzExtension rec { - pname = "next"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/next-${version}-py2.py3-none-any.whl"; - sha256 = "83c4e03427f190203e094c14e4f7e79cec989f1277e16b9256bb9fe688aa5e07"; - description = "Microsoft Azure Command-Line Tools Next Extension"; - }; - nginx = mkAzExtension rec { - pname = "nginx"; - version = "2.0.0b5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-${version}-py2.py3-none-any.whl"; - sha256 = "92e0b817bb863173da129abd3c326e058df3afce0fbb9851e6ff8ccea3c04773"; - description = "Microsoft Azure Command-Line Tools Nginx Extension"; - }; - notification-hub = mkAzExtension rec { - pname = "notification-hub"; - version = "1.0.0a1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/notification_hub-${version}-py3-none-any.whl"; - sha256 = "a03751b715700e0d18a38e808bfeed164335024c9608c4bfd53aeacc731d1099"; - description = "Microsoft Azure Command-Line Tools Notification Hub Extension"; - }; - nsp = mkAzExtension rec { - pname = "nsp"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-${version}-py3-none-any.whl"; - sha256 = "febfce38fc449daa67c7ad8410e7fa250f7f39afb5f870496ce045bb74935bcd"; - description = "Microsoft Azure Command-Line Tools Nsp Extension"; - }; - offazure = mkAzExtension rec { - pname = "offazure"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/offazure-${version}-py3-none-any.whl"; - 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"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/orbital-${version}-py3-none-any.whl"; - sha256 = "4259fb8ff560440d63251cc9721bb3f2283452f2399134514611f886fa350f37"; - description = "Microsoft Azure Command-Line Tools Orbital Extension"; - }; - palo-alto-networks = mkAzExtension rec { - pname = "palo-alto-networks"; - version = "1.1.1b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-${version}-py3-none-any.whl"; - sha256 = "8d4f6a4b72366bd57780bd158d6c25b363999e1a13ea85d491809cc9a4d29608"; - description = "Microsoft Azure Command-Line Tools PaloAltoNetworks Extension"; - }; - peering = mkAzExtension rec { - pname = "peering"; - version = "0.2.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/peering-${version}-py3-none-any.whl"; - sha256 = "b068c12b47f17304af51431a2ae975339b7d4601a180e83916efae73d7c42600"; - description = "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"; - }; - portal = mkAzExtension rec { - pname = "portal"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/portal-${version}-py3-none-any.whl"; - sha256 = "3c3ebe23f59db5f2d286ca52cf8cfbbc5983ce8073622de11a35dab95800a996"; - description = "Microsoft Azure Command-Line Tools Portal Extension"; - }; - powerbidedicated = mkAzExtension rec { - pname = "powerbidedicated"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/powerbidedicated-${version}-py2.py3-none-any.whl"; - sha256 = "e1e58bb6f57edde4793f4c66a0c10a2776f842172878162385f2b1d21539de6e"; - description = "Microsoft Azure Command-Line Tools PowerBIDedicated Extension"; - }; - providerhub = mkAzExtension rec { - pname = "providerhub"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/providerhub-${version}-py3-none-any.whl"; - sha256 = "7b93cb7ecb1fa3a520909d45e6e6597c8ba7daac4fbc1a26c3de66043678dd0d"; - description = "Microsoft Azure Command-Line Tools ProviderHub Extension"; - }; - purview = mkAzExtension rec { - pname = "purview"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/purview-${version}-py3-none-any.whl"; - sha256 = "706cc2550fbd07b8b676345c2f26c5ba66550905bc8ec224c6c4e5637c497266"; - description = "Microsoft Azure Command-Line Tools PurviewManagementClient Extension"; - }; - qumulo = mkAzExtension rec { - pname = "qumulo"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-${version}-py3-none-any.whl"; - sha256 = "9973f580a3fc20cc2fe5558a1cfdc10ddfc6567982d12f37008bbfec7aafcf9b"; - description = "Microsoft Azure Command-Line Tools Qumulo Extension"; - }; - quota = mkAzExtension rec { - pname = "quota"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/quota-${version}-py3-none-any.whl"; - sha256 = "8b4c3475df0c3544dbcc28e4875eb5b163d72b40aff4250aafdad94180c3f995"; - description = "Microsoft Azure Command-Line Tools AzureQuotaExtensionAPI Extension"; - }; - redisenterprise = mkAzExtension rec { - pname = "redisenterprise"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-${version}-py3-none-any.whl"; - sha256 = "e43737fefbb1205970254f369b0f0c33fbfd5b82d64eb2025228eb3a07bed3e7"; - description = "Microsoft Azure Command-Line Tools RedisEnterprise Extension"; - }; - reservation = mkAzExtension rec { - pname = "reservation"; - version = "0.3.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/reservation-${version}-py3-none-any.whl"; - sha256 = "649f086b02305d142f2f08ea96f52a322a165a6f2a958f3287f53550938ab912"; - description = "Microsoft Azure Command-Line Tools Reservation Extension"; - }; - resource-graph = mkAzExtension rec { - pname = "resource-graph"; - version = "2.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-${version}-py2.py3-none-any.whl"; - sha256 = "62c81e3d62ce60c5a0a485829d00bdb0c733145ee93fb6098c14e3b27ee27c40"; - description = "Support for querying Azure resources with Resource Graph"; - }; - resource-mover = mkAzExtension rec { - pname = "resource-mover"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/resource_mover-${version}-py3-none-any.whl"; - sha256 = "3bc9f41aa30c4f6bc04ff780dc30e8df05bfc887f2adbdf9e89d59f8389e55f3"; - description = "Microsoft Azure Command-Line Tools ResourceMoverServiceAPI Extension"; - }; - sap-hana = mkAzExtension rec { - pname = "sap-hana"; - version = "0.6.5"; - url = "https://github.com/Azure/azure-hanaonazure-cli-extension/releases/download/${version}/sap_hana-0.6.5-py2.py3-none-any.whl"; - sha256 = "b4554c125f3a0eb5c891cec396e7705f6e91d4d81789acef20e3c4d172fa4543"; - description = "Additional commands for working with SAP HanaOnAzure instances"; - }; - scenario-guide = mkAzExtension rec { - pname = "scenario-guide"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/scenario_guide-${version}-py3-none-any.whl"; - sha256 = "4264b48b4b980334488a3fdb3bc43241e828a2742c35ce48985f3bebf019e8f8"; - description = "Microsoft Azure Command-Line Tools Scenario Guidance Extension"; - }; - scheduled-query = mkAzExtension rec { - pname = "scheduled-query"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-${version}-py2.py3-none-any.whl"; - sha256 = "fd5e69d0438b8089dbe197d5ba4c41776aed906941cac374755a4c9044c4af04"; - description = "Microsoft Azure Command-Line Tools Scheduled_query Extension"; - }; - scvmm = mkAzExtension rec { - pname = "scvmm"; - version = "1.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-${version}-py2.py3-none-any.whl"; - sha256 = "7d704578bc5eb60b8105de0b4a924176581a4cf2fd162b0896d81246f7f73a68"; - description = "Microsoft Azure Command-Line Tools SCVMM Extension"; - }; - self-help = mkAzExtension rec { - pname = "self-help"; - version = "0.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/self_help-${version}-py3-none-any.whl"; - sha256 = "8c903aaf10d6cb61e6455f6010deeeb496d1e23d6876662089266a49403586b6"; - description = "Microsoft Azure Command-Line Tools SelfHelp Extension"; - }; - sentinel = mkAzExtension rec { - pname = "sentinel"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/sentinel-${version}-py3-none-any.whl"; - sha256 = "5511544b4e342b03a4a4263617c603d87442ad5179ce9d8c0d1fd10915f93b7a"; - description = "Microsoft Azure Command-Line Tools Sentinel Extension"; - }; - site-recovery = mkAzExtension rec { - pname = "site-recovery"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/site_recovery-${version}-py3-none-any.whl"; - sha256 = "ab19142c9a2e06190b6dac272d8cf29e179c9e283f965f8e3a4d29275b847ce5"; - description = "Microsoft Azure Command-Line Tools SiteRecovery Extension"; - }; - spring = mkAzExtension rec { - pname = "spring"; - version = "1.25.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring-${version}-py3-none-any.whl"; - sha256 = "2b9cf4ae2fd52b5f644bfefba69ed5e574404597e3cab0e3a9b8e44e7b03363f"; - description = "Microsoft Azure Command-Line Tools spring Extension"; - }; - spring-cloud = mkAzExtension rec { - pname = "spring-cloud"; - version = "3.1.8"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring_cloud-${version}-py3-none-any.whl"; - sha256 = "14993abe3524c28a42b2e9ba0f0a8a7083162ba9174975e09d8cea834b9829ee"; - description = "Microsoft Azure Command-Line Tools spring-cloud Extension"; - }; - stack-hci = mkAzExtension rec { - pname = "stack-hci"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci-${version}-py3-none-any.whl"; - sha256 = "9bb0350f6c28ac2068a5a4a20bbcf74ae34b392d05eb148c403c618525cbadef"; - description = "Microsoft Azure Command-Line Tools AzureStackHCIClient Extension"; - }; - stack-hci-vm = mkAzExtension rec { - pname = "stack-hci-vm"; - version = "1.1.20"; - url = "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-${version}-py3-none-any.whl"; - sha256 = "7de544b8058ab11d9713b551db65aeaec6b8e5832cdadbbf26ccb7a4a282db6b"; - description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"; - }; - standbypool = mkAzExtension rec { - pname = "standbypool"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-${version}-py3-none-any.whl"; - sha256 = "44c03e320c8b49f52390e3c11d61b25a67afeffc18d62baa522c373142de0e15"; - description = "Microsoft Azure Command-Line Tools Standbypool Extension"; - }; - staticwebapp = mkAzExtension rec { - pname = "staticwebapp"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/staticwebapp-${version}-py3-none-any.whl"; - sha256 = "fb1dcd876fc2d829cc7a1cc545e9445364d43357d888bb3deeb36a716b805717"; - description = "Microsoft Azure Command-Line Tools Staticwebapp Extension"; - }; - storage-actions = mkAzExtension rec { - pname = "storage-actions"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-${version}-py3-none-any.whl"; - sha256 = "07c5be256edbbe2c81d839e4c6d3d917a56b93921515028cf962393e1176331b"; - description = "Microsoft Azure Command-Line Tools StorageActions Extension"; - }; - storage-blob-preview = mkAzExtension rec { - pname = "storage-blob-preview"; - version = "0.7.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-${version}-py2.py3-none-any.whl"; - sha256 = "002b7779f4c6531fdb714f77bcea5d3d96007a7ff5b86869f8e56aad98298b23"; - description = "Microsoft Azure Command-Line Tools Storage-blob-preview Extension"; - }; - storage-mover = mkAzExtension rec { - pname = "storage-mover"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-${version}-py3-none-any.whl"; - sha256 = "7d768aca50aa98978a0d929c46cffe60bf488a527665485da631b33444cae24c"; - description = "Microsoft Azure Command-Line Tools StorageMover Extension"; - }; - storagesync = mkAzExtension rec { - pname = "storagesync"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storagesync-${version}-py2.py3-none-any.whl"; - sha256 = "1f6997e186199058e60d8fdc020c407d4f92d8e78286189c1887e57a371b43c1"; - description = "Microsoft Azure Command-Line Tools MicrosoftStorageSync Extension"; - }; - stream-analytics = mkAzExtension rec { - pname = "stream-analytics"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-${version}-py3-none-any.whl"; - sha256 = "15443fd8a73d319a5c9fbc586c9727d1ce1a31e11fd3f3c7e4fcbc97ad076aaa"; - description = "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension"; - }; - subscription = mkAzExtension rec { - pname = "subscription"; - version = "0.1.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-${version}-py2.py3-none-any.whl"; - sha256 = "ff7896aebc46862a6d30ac5f4cf64bdd40cb50e5437cea299590896d75f1013e"; - description = "Support for subscription management preview"; - }; - support = mkAzExtension rec { - pname = "support"; - version = "2.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/support-${version}-py2.py3-none-any.whl"; - sha256 = "5dde97f8fb12eaa258530f68ec2cae00a957f30479835e9f5ed057940312741a"; - description = "Microsoft Azure Command-Line Tools Support Extension"; - }; - timeseriesinsights = mkAzExtension rec { - pname = "timeseriesinsights"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/timeseriesinsights-${version}-py3-none-any.whl"; - sha256 = "c578804a6cfbb4ef8ab91de2130bba8f6139f2fadea4ed1e38b05ea62c7aa95d"; - description = "Microsoft Azure Command-Line Tools TimeSeriesInsightsClient Extension"; - }; - traffic-collector = mkAzExtension rec { - pname = "traffic-collector"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-${version}-py3-none-any.whl"; - sha256 = "a144a4fda3bce84db22277bd8611084ae1ae39e0bb8c7b50619ec378711f57ba"; - description = "Microsoft Azure Command-Line Tools TrafficCollector Extension"; - }; - trustedsigning = mkAzExtension rec { - pname = "trustedsigning"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/trustedsigning-${version}-py3-none-any.whl"; - sha256 = "c3ae869c1371493180b9ed71db0bdc3842bad54c8832beb6007118d26bed71e8"; - description = "Microsoft Azure Command-Line Tools Trustedsigning Extension"; - }; - virtual-network-manager = mkAzExtension rec { - pname = "virtual-network-manager"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-${version}-py3-none-any.whl"; - sha256 = "7f9f239fd7904645beacc2b738dd4660fb36779966e9b2331c43826e37564793"; - description = "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"; - }; - virtual-network-tap = mkAzExtension rec { - pname = "virtual-network-tap"; - version = "0.1.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-${version}-py2.py3-none-any.whl"; - sha256 = "7e3f634f8eb701cf6fef504159785bc90e6f5bd2482e459469dd9ab30601aa35"; - description = "Manage virtual network taps (VTAP)"; - }; - virtual-wan = mkAzExtension rec { - pname = "virtual-wan"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_wan-${version}-py2.py3-none-any.whl"; - sha256 = "0ef7b4bf9ffd0aa1ad5c50e15a343276636bcfe0296e52d2ee5f0b75ce70633d"; - description = "Manage virtual WAN, hubs, VPN gateways and VPN sites"; - }; - vmware = mkAzExtension rec { - pname = "vmware"; - version = "7.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-${version}-py2.py3-none-any.whl"; - sha256 = "e0fadce4fc02996443a8e1673d19ebd24383c584ca89bd396ce963e85865ac0d"; - description = "Azure VMware Solution commands"; - }; - webapp = mkAzExtension rec { - pname = "webapp"; - version = "0.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/webapp-${version}-py2.py3-none-any.whl"; - sha256 = "908b0df07cef652176a0f2bf0fdcf58b5d16fb4903ee3c06f73f0bb3913a5c0f"; - description = "Additional commands for Azure AppService"; - }; - workloads = mkAzExtension rec { - pname = "workloads"; - version = "1.1.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-${version}-py3-none-any.whl"; - sha256 = "716ec3db6d1d637da3d0255e83406aed3acd26b83405bbcadc4d30e1110beea3"; - description = "Microsoft Azure Command-Line Tools Workloads Extension"; - }; - -} diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index d6f65b53cd69..758f8c4de86f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -18,7 +18,7 @@ pname = "application-insights"; version = "1.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl"; - sha256 = "e1fa824eb587e2bec7f4cb4d1c4ce1033ab3d3fac65af42dd6218f673b019cee"; + hash = "sha256-4fqCTrWH4r7H9MtNHEzhAzqz0/rGWvQt1iGPZzsBnO4="; description = "Support for managing Application Insights components and querying metrics, events, and logs from such components"; propagatedBuildInputs = with python3Packages; [ isodate ]; meta.maintainers = with lib.maintainers; [ andreasvoss ]; @@ -28,7 +28,7 @@ pname = "azure-devops"; version = "1.0.1"; url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; - sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + hash = "sha256-ZYooVNjID4dPk4LUIfpFq/ajjQAzRzfdoAb43sZM9wo="; description = "Tools for managing Azure DevOps"; propagatedBuildInputs = with python3Packages; [ distro ]; meta.maintainers = with lib.maintainers; [ katexochen ]; @@ -39,7 +39,7 @@ description = "The Azure IoT extension for Azure CLI."; version = "0.25.0"; url = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v${version}/azure_iot-${version}-py3-none-any.whl"; - sha256 = "7db4bc07667efa8472513d9e121fb2551fcaeae68255c7bc0768ad4177c1b1c6"; + hash = "sha256-fbS8B2Z++oRyUT2eEh+yVR/K6uaCVce8B2itQXfBscY="; propagatedBuildInputs = ( with python3Packages; [ @@ -65,7 +65,7 @@ pname = "confcom"; version = "1.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - sha256 = "73823e10958a114b4aca84c330b4debcc650c4635e74c568679b6c32c356411d"; + hash = "sha256-c4I+EJWKEUtKyoTDMLTevMZQxGNedMVoZ5tsMsNWQR0="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ openssl_1_1 ]; @@ -85,7 +85,7 @@ pname = "containerapp"; version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - sha256 = "d80b83b0e22770925c24bca150c84182376b7b0aff9b6f28498d769dc8618b45"; + hash = "sha256-2AuDsOIncJJcJLyhUMhBgjdrewr/m28oSY12nchhi0U="; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker @@ -98,7 +98,7 @@ pname = "rdbms-connect"; version = "1.0.6"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl"; - sha256 = "49cbe8d9b7ea07a8974a29ad90247e864ed798bed5f28d0e3a57a4b37f5939e7"; + hash = "sha256-Scvo2bfqB6iXSimtkCR+hk7XmL7V8o0OOleks39ZOec="; description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers"; propagatedBuildInputs = (with python3Packages; [ @@ -115,7 +115,7 @@ pname = "ssh"; version = "2.0.5"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl"; - sha256 = "80c98b10d7bf1ce4005b7694aedd05c47355456775ba6125308be65fb0fefc93"; + hash = "sha256-gMmLENe/HOQAW3aUrt0FxHNVRWd1umElMIvmX7D+/JM="; description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates"; propagatedBuildInputs = with python3Packages; [ oras @@ -128,14 +128,25 @@ pname = "storage-preview"; version = "1.0.0b2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_preview-${version}-py2.py3-none-any.whl"; - sha256 = "2de8fa421622928a308bb70048c3fdf40400bad3b34afd601d0b3afcd8b82764"; + hash = "sha256-Lej6QhYikoowi7cASMP99AQAutOzSv1gHQs6/Ni4J2Q="; description = "Provides a preview for upcoming storage features"; propagatedBuildInputs = with python3Packages; [ azure-core ]; meta.maintainers = with lib.maintainers; [ katexochen ]; }; + + vm-repair = mkAzExtension rec { + pname = "vm-repair"; + version = "2.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; + hash = "sha256-mBa0SgKyGdxrTtrSVDp78Z0yXUMywL/9o0osKeUbhdU="; + description = "Support for repairing Azure Virtual Machines"; + propagatedBuildInputs = with python3Packages; [ opencensus ]; + meta.maintainers = with lib.maintainers; [ ]; + }; } // lib.optionalAttrs config.allowAliases { # Removed extensions - blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 - vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 + adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 + blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370 + connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 } diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py new file mode 100644 index 000000000000..74e58723a099 --- /dev/null +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -0,0 +1,324 @@ +#!/usr/bin/env python + +import argparse +import base64 +import datetime +import json +import logging +import os +import sys +from dataclasses import asdict, dataclass, replace +from pathlib import Path +from typing import Any, Dict, Iterable, List, Optional, Set, Tuple +from urllib.request import Request, urlopen + +import git +from packaging.version import Version, parse + +INDEX_URL = "https://azcliextensionsync.blob.core.windows.net/index1/index.json" + +logger = logging.getLogger(__name__) + + +@dataclass(frozen=True) +class Ext: + pname: str + version: Version + url: str + hash: str + description: str + + +def _read_cached_index(path: Path) -> Tuple[datetime.datetime, Any]: + with open(path, "r") as f: + data = f.read() + + j = json.loads(data) + cache_date_str = j["cache_date"] + if cache_date_str: + cache_date = datetime.datetime.fromisoformat(cache_date_str) + else: + cache_date = datetime.datetime.min + return cache_date, data + + +def _write_index_to_cache(data: Any, path: Path): + j = json.loads(data) + j["cache_date"] = datetime.datetime.now().isoformat() + with open(path, "w") as f: + json.dump(j, f, indent=2) + + +def _fetch_remote_index(): + r = Request(INDEX_URL) + with urlopen(r) as resp: + return resp.read() + + +def get_extension_index(cache_dir: Path) -> Set[Ext]: + index_file = cache_dir / "index.json" + os.makedirs(cache_dir, exist_ok=True) + + try: + index_cache_date, index_data = _read_cached_index(index_file) + except FileNotFoundError: + logger.info("index has not been cached, downloading from source") + logger.info("creating index cache in %s", index_file) + _write_index_to_cache(_fetch_remote_index(), index_file) + return get_extension_index(cache_dir) + + if ( + index_cache_date + and datetime.datetime.now() - index_cache_date > datetime.timedelta(days=1) + ): + logger.info( + "cache is outdated (%s), refreshing", + datetime.datetime.now() - index_cache_date, + ) + _write_index_to_cache(_fetch_remote_index(), index_file) + return get_extension_index(cache_dir) + + logger.info("using index cache from %s", index_file) + return json.loads(index_data) + + +def _read_extension_set(extensions_generated: Path) -> Set[Ext]: + with open(extensions_generated, "r") as f: + data = f.read() + + parsed_exts = {Ext(**json_ext) for _pname, json_ext in json.loads(data).items()} + parsed_exts_with_ver = set() + for ext in parsed_exts: + ext2 = replace(ext, version=parse(ext.version)) + parsed_exts_with_ver.add(ext2) + + return parsed_exts_with_ver + + +def _write_extension_set(extensions_generated: Path, extensions: Set[Ext]) -> None: + set_without_ver = {replace(ext, version=str(ext.version)) for ext in extensions} + ls = list(set_without_ver) + ls.sort(key=lambda e: e.pname) + with open(extensions_generated, "w") as f: + json.dump({ext.pname: asdict(ext) for ext in ls}, f, indent=2) + f.write("\n") + + +def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: + try: + b = bytes.fromhex(s) + except ValueError as err: + logger.error("not a hex value: %s", str(err)) + raise err + + return f"sha256-{base64.b64encode(b).decode('utf-8')}" + + +def _commit(repo: git.Repo, message: str, files: List[Path], actor: git.Actor) -> None: + repo.index.add([str(f.resolve()) for f in files]) + if repo.index.diff("HEAD"): + logger.info(f'committing to nixpkgs "{message}"') + repo.index.commit(message, author=actor, committer=actor) + else: + logger.warning("no changes in working tree to commit") + + +def _filter_invalid(o: Dict[str, Any]) -> bool: + if "metadata" not in o: + logger.warning("extension without metadata") + return False + metadata = o["metadata"] + if "name" not in metadata: + logger.warning("extension without name") + return False + if "version" not in metadata: + logger.warning(f"{metadata['name']} without version") + return False + if "azext.minCliCoreVersion" not in metadata: + logger.warning( + f"{metadata['name']} {metadata['version']} does not have azext.minCliCoreVersion" + ) + return False + if "summary" not in metadata: + logger.info(f"{metadata['name']} {metadata['version']} without summary") + return False + if "downloadUrl" not in o: + logger.warning(f"{metadata['name']} {metadata['version']} without downloadUrl") + return False + if "sha256Digest" not in o: + logger.warning(f"{metadata['name']} {metadata['version']} without sha256Digest") + return False + + return True + + +def _filter_compatible(o: Dict[str, Any], cli_version: Version) -> bool: + minCliVersion = parse(o["metadata"]["azext.minCliCoreVersion"]) + return cli_version >= minCliVersion + + +def _transform_dict_to_obj(o: Dict[str, Any]) -> Ext: + m = o["metadata"] + return Ext( + pname=m["name"], + version=parse(m["version"]), + url=o["downloadUrl"], + hash=_convert_hash_digest_from_hex_to_b64_sri(o["sha256Digest"]), + description=m["summary"].rstrip("."), + ) + + +def _get_latest_version(versions: dict) -> dict: + return max(versions, key=lambda e: parse(e["metadata"]["version"]), default=None) + + +def processExtension( + extVersions: dict, + cli_version: Version, + ext_name: Optional[str] = None, + requirements: bool = False, +) -> Optional[Ext]: + versions = filter(_filter_invalid, extVersions) + versions = filter(lambda v: _filter_compatible(v, cli_version), versions) + latest = _get_latest_version(versions) + if not latest: + return None + if ext_name and latest["metadata"]["name"] != ext_name: + return None + if not requirements and "run_requires" in latest["metadata"]: + return None + + return _transform_dict_to_obj(latest) + + +def _diff_sets( + set_local: Set[Ext], set_remote: Set[Ext] +) -> Tuple[Set[Ext], Set[Ext], Set[Tuple[Ext, Ext]]]: + local_exts = {ext.pname: ext for ext in set_local} + remote_exts = {ext.pname: ext for ext in set_remote} + only_local = local_exts.keys() - remote_exts.keys() + only_remote = remote_exts.keys() - local_exts.keys() + both = remote_exts.keys() & local_exts.keys() + return ( + {local_exts[pname] for pname in only_local}, + {remote_exts[pname] for pname in only_remote}, + {(local_exts[pname], remote_exts[pname]) for pname in both}, + ) + + +def _filter_updated(e: Tuple[Ext, Ext]) -> bool: + prev, new = e + return prev != new + + +def main() -> None: + sh = logging.StreamHandler(sys.stderr) + sh.setFormatter( + logging.Formatter( + "[%(asctime)s] [%(levelname)8s] --- %(message)s (%(filename)s:%(lineno)s)", + "%Y-%m-%d %H:%M:%S", + ) + ) + logging.basicConfig(level=logging.INFO, handlers=[sh]) + + parser = argparse.ArgumentParser( + prog="azure-cli.extensions-tool", + description="Script to handle Azure CLI extension updates", + ) + parser.add_argument( + "--cli-version", type=str, help="version of azure-cli (required)" + ) + parser.add_argument("--extension", type=str, help="name of extension to query") + parser.add_argument( + "--cache-dir", + type=Path, + help="path where to cache the extension index", + default=Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) + / "azure-cli-extensions-tool", + ) + parser.add_argument( + "--requirements", + action=argparse.BooleanOptionalAction, + help="whether to list extensions that have requirements", + ) + parser.add_argument( + "--commit", + action=argparse.BooleanOptionalAction, + help="whether to commit changes to git", + ) + args = parser.parse_args() + + repo = git.Repo(Path(".").resolve(), search_parent_directories=True) + # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923 + author = repo.config_reader().get_value("user", "name").lstrip('"').rstrip('"') + email = repo.config_reader().get_value("user", "email").lstrip('"').rstrip('"') + actor = git.Actor(author, email) + + index = get_extension_index(args.cache_dir) + assert index["formatVersion"] == "1" # only support formatVersion 1 + extensions_remote = index["extensions"] + + cli_version = parse(args.cli_version) + + extensions_remote_filtered = set() + for _ext_name, extension in extensions_remote.items(): + extension = processExtension(extension, cli_version, args.extension) + if extension: + extensions_remote_filtered.add(extension) + + extension_file = ( + Path(repo.working_dir) / "pkgs/by-name/az/azure-cli/extensions-generated.json" + ) + extensions_local = _read_extension_set(extension_file) + extensions_local_filtered = set() + if args.extension: + extensions_local_filtered = filter( + lambda ext: args.extension == ext.pname, extensions_local + ) + else: + extensions_local_filtered = extensions_local + + removed, init, updated = _diff_sets( + extensions_local_filtered, extensions_remote_filtered + ) + updated = set(filter(_filter_updated, updated)) + + logger.info("initialized extensions:") + for ext in init: + logger.info(f" {ext.pname} {ext.version}") + logger.info("removed extensions:") + for ext in removed: + logger.info(f" {ext.pname} {ext.version}") + logger.info("updated extensions:") + for prev, new in updated: + logger.info(f" {prev.pname} {prev.version} -> {new.version}") + + for ext in init: + extensions_local.add(ext) + commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file], actor) + + for prev, new in updated: + extensions_local.remove(prev) + extensions_local.add(new) + commit_msg = ( + f"azure-cli-extensions.{prev.pname}: {prev.version} -> {new.version}" + ) + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file], actor) + + for ext in removed: + extensions_local.remove(ext) + # TODO: Add additional check why this is removed + # TODO: Add an alias to extensions manual? + commit_msg = f"azure-cli-extensions.{ext.pname}: remove" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file], actor) + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 5a4c2363c788..4744b7d109ee 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -10,6 +10,11 @@ python3, writeScriptBin, + black, + isort, + mypy, + makeWrapper, + # Whether to include patches that enable placing certain behavior-defining # configuration files in the Nix store. withImmutableConfig ? true, @@ -21,14 +26,14 @@ }: let - version = "2.64.0"; + version = "2.65.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-1FnrUvRpAkZ0nAxen3seam2S49tBkK5N37ZD99OkvB0="; + hash = "sha256-IeiAB0AI6KNpXwx2Iv55LBARcwemakbblFlbfLheuGE="; }; # put packages that needs to be overridden in the py package scope @@ -41,14 +46,14 @@ let pname, version, url, - sha256, + hash, description, ... }@args: python3.pkgs.buildPythonPackage ( { format = "wheel"; - src = fetchurl { inherit url sha256; }; + src = fetchurl { inherit url hash; }; meta = { inherit description; inherit (azure-cli.meta) platforms maintainers; @@ -60,18 +65,20 @@ let } // (removeAttrs args [ "url" - "sha256" + "hash" "description" "meta" ]) ); - extensions = - callPackages ./extensions-generated.nix { inherit mkAzExtension; } - // callPackages ./extensions-manual.nix { - inherit mkAzExtension; - python3Packages = python3.pkgs; - }; + extensions-generated = lib.mapAttrs (name: ext: mkAzExtension ext) ( + builtins.fromJSON (builtins.readFile ./extensions-generated.json) + ); + extensions-manual = callPackages ./extensions-manual.nix { + inherit mkAzExtension; + python3Packages = python3.pkgs; + }; + extensions = extensions-generated // extensions-manual; extensionDir = stdenvNoCC.mkDerivation { name = "azure-cli-extensions"; @@ -373,20 +380,48 @@ py.pkgs.toPythonApplication ( ${lib.getExe az} --version || exit 1 touch $out ''; + + # Ensure the extensions-tool builds. + inherit (azure-cli) extensions-tool; }; generate-extensions = writeScriptBin "${pname}-update-extensions" '' - export FILE=extensions-generated.nix - echo "# This file is automatically generated. DO NOT EDIT! Read README.md" > $FILE - echo "{ mkAzExtension }:" >> $FILE - echo "{" >> $FILE - ${./query-extension-index.sh} --requirements=false --download --nix --cli-version=${version} \ - | xargs -n1 -d '\n' echo " " >> $FILE - echo "" >> $FILE - echo "}" >> $FILE - echo "Extension was saved to \"extensions-generated.nix\" file." - echo "Move it to \"{nixpkgs}/pkgs/by-name/az/azure-cli/extensions-generated.nix\"." + ${lib.getExe azure-cli.extensions-tool} --cli-version ${azure-cli.version} --commit ''; + + extensions-tool = + runCommand "azure-cli-extensions-tool" + { + src = ./extensions-tool.py; + nativeBuildInputs = [ + black + isort + makeWrapper + mypy + python3 + ]; + meta.mainProgram = "extensions-tool"; + } + '' + black --check --diff $src + # mypy --strict $src + isort --profile=black --check --diff $src + + install -Dm755 $src $out/bin/extensions-tool + + patchShebangs --build $out + wrapProgram $out/bin/extensions-tool \ + --set PYTHONPATH "${ + python3.pkgs.makePythonPath ( + with python3.pkgs; + [ + packaging + semver + gitpython + ] + ) + }" + ''; }; meta = { diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 0b09811647bc..68d452e58046 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -54,6 +54,7 @@ let humanfriendly jmespath knack + microsoft-security-utilities-secret-masker msal-extensions msal msrestazure diff --git a/pkgs/by-name/az/azure-cli/query-extension-index.sh b/pkgs/by-name/az/azure-cli/query-extension-index.sh deleted file mode 100755 index 8dbd45ce937e..000000000000 --- a/pkgs/by-name/az/azure-cli/query-extension-index.sh +++ /dev/null @@ -1,163 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -function usage() { - { - echo "${0} - query Azure CLI extension index" - echo - echo "The Azure CLI extension index contains all versions of all extensions. This" - echo "script queries the index for the latest version of an extensions that is" - echo "compatible with the specified version of the Azure CLI. Data for that extension" - echo "is filtered for fields relevant to package the extension in Nix." - echo - echo "Usage:" - echo " --cli-version= version of azure-cli (required)" - echo " --extension= name of extension to query" - echo " --file= path to extension index file" - echo " --download download extension index file" - echo " --nix output Nix expression" - echo " --requirements= filter for extensions with/without requirements" - } >&2 -} - -for arg in "$@"; do - case "$arg" in - --cli-version=*) - cliVer="${arg#*=}" - shift - ;; - --extension=*) - extName="${arg#*=}" - shift - ;; - --file=*) - extensionFile="${arg#*=}" - shift - ;; - --download) - download=true - shift - ;; - --nix) - nix=true - shift - ;; - --requirements=*) - requirements="${arg#*=}" - shift - ;; - --help) - usage - exit 0 - ;; - *) - echo "Unknown argument: $arg" >&2 - exit 1 - ;; - esac -done - -if [[ -z "${cliVer:-}" ]]; then - echo "Missing --cli-version argument" >&2 - exit 1 -fi -if [[ -z "${extensionFile:-}" && -z "${download:-}" ]]; then - echo "Either --file or --download must be specified" >&2 - exit 1 -fi -if [[ -n "${extName:-}" && -n "${requirements:-}" ]]; then - echo "--requirements can only be used when listing all extensions" >&2 - exit 1 -fi - -if [[ "${download:-}" == true ]]; then - extensionFile="$(mktemp)" - echo "Downloading extensions index to ${extensionFile}" >&2 - curl -fsSL "https://azcliextensionsync.blob.core.windows.net/index1/index.json" > "${extensionFile}" -fi - -# shellcheck disable=SC2016 -jqProgram=' - def opt(f): - . as $in | try f catch $in - ; - - def version_to_array: - sub("\\+.*$"; "") - | capture("^(?[^a-z-]+)(?:(?

.*))?") | [.v, .p // empty] - | map(split(".") - | map(opt(tonumber))) - | flatten - ; - - def version_le($contstraint): - version_to_array as $v - | $contstraint | version_to_array as $c - | $v[0] < $c[0] or - ($v[0] == $c[0] and $v[1] < $c[1]) or - ($v[0] == $c[0] and $v[1] == $c[1] and $v[2] < $c[2]) or - ($v[0] == $c[0] and $v[1] == $c[1] and $v[2] == $c[2] and $v[3] <= $c[3]) - ; - - def max_constrained_version($constraint): - [ - .[] | select(.metadata."azext.minCliCoreVersion" // "0.0.0" | version_le($cliVer)) - ] - | sort_by(.metadata.version | version_to_array) - | last - ; - - def translate_struct: - { - pname : .metadata.name, - description: .metadata.summary, - version: .metadata.version, - url: .downloadUrl, - sha256: .sha256Digest, - license: .metadata.license, - requires: .metadata.run_requires.[0].requires - } - ; - - def to_nix: - [.].[] as $in - | .version as $version - | .description as $description - | .url | sub($version;"${version}") as $url - | $description |rtrimstr(".") as $description - | $in.pname + " = mkAzExtension rec {\n" + - " pname = \"" + $in.pname + "\";\n" + - " version = \"" + $in.version + "\";\n" + - " url = \"" + $url + "\";\n" + - " sha256 = \"" + $in.sha256 + "\";\n" + - " description = \"" + $description + "\";\n" + - "};" - ; - - def main: - .extensions - | map(max_constrained_version($cliVer)) - | .[] - | translate_struct - | if $extName != "" then - select(.pname == $extName) - elif $requirements == "false" then - select(.requires == null) - elif $requirements == "true" then - select(.requires != null) - end - | if $nix == "true" then - to_nix - end - ; - - main -' - -jq -r \ - --arg cliVer "${cliVer}" \ - --arg extName "${extName:-}" \ - --arg nix "${nix:-}" \ - --arg requirements "${requirements:-}" \ - "$jqProgram" "${extensionFile}" diff --git a/pkgs/development/tools/azure-functions-core-tools/deps.nix b/pkgs/by-name/az/azure-functions-core-tools/deps.nix similarity index 100% rename from pkgs/development/tools/azure-functions-core-tools/deps.nix rename to pkgs/by-name/az/azure-functions-core-tools/deps.nix diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix similarity index 100% rename from pkgs/development/tools/azure-functions-core-tools/default.nix rename to pkgs/by-name/az/azure-functions-core-tools/package.nix diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix similarity index 100% rename from pkgs/development/tools/azcopy/default.nix rename to pkgs/by-name/az/azure-storage-azcopy/package.nix diff --git a/pkgs/by-name/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix new file mode 100644 index 000000000000..62ddf238f703 --- /dev/null +++ b/pkgs/by-name/az/azuredatastudio/package.nix @@ -0,0 +1,203 @@ +{ stdenv +, lib +, fetchurl +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, cairo +, cups +, curl +, dbus +, expat +, gdk-pixbuf +, glib +, gnutar +, gtk3 +, icu +, libdrm +, libunwind +, libuuid +, libxkbcommon +, mesa +, nspr +, nss +, openssl +, pango +, systemd +, xorg +, zlib +}: + +# from justinwoo/azuredatastudio-nix +# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix + +let + desktopItem = makeDesktopItem { + name = "azuredatastudio"; + desktopName = "Azure Data Studio"; + comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --unity-launch %F"; + icon = "azuredatastudio"; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" "application/x-azuredatastudio-workspace" ]; + keywords = [ "azuredatastudio" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "azuredatastudio --no-sandbox --new-window %F"; + icon = "azuredatastudio"; + }; + }; + + urlHandlerDesktopItem = makeDesktopItem { + name = "azuredatastudio-url-handler"; + desktopName = "Azure Data Studio - URL Handler"; + comment = "Azure Data Studio"; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --open-url %U"; + icon = "azuredatastudio"; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/azuredatastudio" ]; + keywords = [ "azuredatastudio" ]; + noDisplay = true; + }; +in +stdenv.mkDerivation rec { + + pname = "azuredatastudio"; + version = "1.49.1"; + + desktopItems = [ desktopItem urlHandlerDesktopItem ]; + + src = fetchurl { + name = "${pname}-${version}.tar.gz"; + + # Url can be found at: https://github.com/microsoft/azuredatastudio/releases + # In the downloads table for Linux .tar.gz + # This will give a go.microsoft redirect link, I think it's better to use the direct link to which the redirect points. + # You can do so by using curl: curl -I + url = "https://download.microsoft.com/download/7/8/3/783c2037-8607-43c4-a593-0936e965d38b/azuredatastudio-linux-1.49.1.tar.gz"; + sha256 = "sha256-0LCrRUTTe8UEDgtGLvxVQL8pA5dwA6SvZEZSDILr7jo="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + libuuid + at-spi2-core + at-spi2-atk + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png + + runHook postInstall + ''; + + # change this to azuredatastudio-insiders for insiders releases + edition = "azuredatastudio"; + targetPath = "$out/${edition}"; + + unpackPhase = '' + mkdir -p ${targetPath} + ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} + ''; + + sqltoolsserviceRpath = lib.makeLibraryPath [ + stdenv.cc.cc + libunwind + libuuid + icu + openssl + zlib + curl + ]; + + # this will most likely need to be updated when azuredatastudio's version changes + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/5.0.20240724.1"; + + rpath = lib.concatStringsSep ":" [ + (lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc + systemd + ]) + targetPath + sqltoolsserviceRpath + ]; + + fixupPhase = '' + fix_sqltoolsservice() + { + mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${sqltoolsservicePath}/$1_old + + makeWrapper \ + ${sqltoolsservicePath}/$1_old \ + ${sqltoolsservicePath}/$1 \ + --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} + } + + fix_sqltoolsservice MicrosoftSqlToolsServiceLayer + fix_sqltoolsservice MicrosoftSqlToolsCredentials + fix_sqltoolsservice SqlToolsResourceProviderService + + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${targetPath}/${edition} + + mkdir -p $out/bin + makeWrapper \ + ${targetPath}/bin/${edition} \ + $out/bin/azuredatastudio \ + --set LD_LIBRARY_PATH ${rpath} + ''; + + meta = { + maintainers = with lib.maintainers; [ xavierzwirtz ]; + description = "Data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; + homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + mainProgram = "azuredatastudio"; + }; +} diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/by-name/b4/b4/package.nix similarity index 100% rename from pkgs/development/tools/b4/default.nix rename to pkgs/by-name/b4/b4/package.nix diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch rename to pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/by-name/b4/b43FirmwareCutter/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix rename to pkgs/by-name/b4/b43FirmwareCutter/package.nix diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/by-name/b6/b612/package.nix similarity index 100% rename from pkgs/data/fonts/b612/default.nix rename to pkgs/by-name/b6/b612/package.nix diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/by-name/ba/babeld/package.nix similarity index 100% rename from pkgs/tools/networking/babeld/default.nix rename to pkgs/by-name/ba/babeld/package.nix diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/by-name/ba/babelstone-han/package.nix similarity index 100% rename from pkgs/data/fonts/babelstone-han/default.nix rename to pkgs/by-name/ba/babelstone-han/package.nix diff --git a/pkgs/development/libraries/babl/dev-prefix.patch b/pkgs/by-name/ba/babl/dev-prefix.patch similarity index 100% rename from pkgs/development/libraries/babl/dev-prefix.patch rename to pkgs/by-name/ba/babl/dev-prefix.patch diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix new file mode 100644 index 000000000000..5322cb029de9 --- /dev/null +++ b/pkgs/by-name/ba/babl/package.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gi-docgen +, gobject-introspection +, lcms2 +, vala +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "babl"; + version = "0.1.110"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; + hash = "sha256-v0e+dUDWJ1OJ9mQx7wMGTfU3YxXiQ9C6tEjGqnE/V0M="; + }; + + patches = [ + # Allow overriding path to dev output that will be hardcoded e.g. in pkg-config file. + ./dev-prefix.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gi-docgen + gobject-introspection + vala + ]; + + buildInputs = [ + lcms2 + ]; + + mesonFlags = [ + "-Dprefix-dev=${placeholder "dev"}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # Docs are opt-out in native but opt-in in cross builds. + "-Dwith-docs=true" + "-Denable-gir=true" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + meta = with lib; { + description = "Image pixel format conversion library"; + mainProgram = "babl"; + homepage = "https://gegl.org/babl/"; + changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${replaceStrings [ "." ] [ "_" ] finalAttrs.version}/NEWS"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/ba/baboossh/package.nix b/pkgs/by-name/ba/baboossh/package.nix new file mode 100644 index 000000000000..1cec997ff3af --- /dev/null +++ b/pkgs/by-name/ba/baboossh/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "baboossh"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cybiere"; + repo = "baboossh"; + rev = "refs/tags/v${version}"; + hash = "sha256-E/a6dL6BpQ6D8v010d8/qav/fkxpCYNvSvoPAZsm0Hk="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + cmd2 + paramiko + python-libnmap + tabulate + ]; + + # No tests available + doCheck = false; + + pythonImportsCheck = [ "baboossh" ]; + + meta = with lib; { + description = "Tool to do SSH spreading"; + homepage = "https://github.com/cybiere/baboossh"; + changelog = "https://github.com/cybiere/baboossh/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "baboossh"; + }; +} diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/by-name/ba/backblaze-b2/package.nix similarity index 100% rename from pkgs/development/tools/backblaze-b2/default.nix rename to pkgs/by-name/ba/backblaze-b2/package.nix diff --git a/pkgs/tools/misc/backdown/default.nix b/pkgs/by-name/ba/backdown/package.nix similarity index 100% rename from pkgs/tools/misc/backdown/default.nix rename to pkgs/by-name/ba/backdown/package.nix diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/by-name/ba/backward-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/backward-cpp/default.nix rename to pkgs/by-name/ba/backward-cpp/package.nix diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/by-name/ba/bacnet-stack/package.nix similarity index 100% rename from pkgs/tools/networking/bacnet-stack/default.nix rename to pkgs/by-name/ba/bacnet-stack/package.nix diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index adc286ffd7da..b5dd84fdbea4 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -3,31 +3,24 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; rev = "refs/tags/v${version}"; - hash = "sha256-fSlakjZbY8jrFkCqVxPr3UKwf1Oq4yPhLmVbzsksSeg="; + hash = "sha256-WbTxy8ijXez1x2G7NGGVMcyjgE7J7MDsGgGRpb4jKXQ="; }; - cargoHash = "sha256-WT0uXmchhapss3AU4+e2wA3nBVjzikfRNRyAvQnpJfY="; + cargoHash = "sha256-rlWNrkzUDs3rbQ5ZV4fKU/EKEy4fVbxEP0+wNwXi7Ag="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/by-name/ba/bada-bib/package.nix similarity index 100% rename from pkgs/applications/science/misc/bada-bib/default.nix rename to pkgs/by-name/ba/bada-bib/package.nix diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix index 77003ba502e2..a2a03370fe81 100644 --- a/pkgs/by-name/ba/baddns/package.nix +++ b/pkgs/by-name/ba/baddns/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "baddns"; - version = "1.1.869"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "blacklanternsecurity"; repo = "baddns"; rev = "refs/tags/v${version}"; - hash = "sha256-BoRR7duvkXjI8vVP59IOACuIV7NmQe1loMEUgPfsdNw="; + hash = "sha256-pF7HYl1l+TSahJHuyVBZtYeET6wPCiSi+Yi7Rg46T44="; }; pythonRelaxDeps = true; @@ -48,7 +48,13 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access + "test_cli_cname_http" + "test_cli_direct" "test_cli_validation_customnameservers_valid" + "test_cname_http_bigcartel_match" + "test_cname_whois_unregistered_baddata" + "test_cname_whois_unregistered_match" + "test_cname_whois_unregistered_missingdata" "test_modules_customnameservers" "test_references_cname_css" "test_references_cname_js" @@ -57,6 +63,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to check subdomains for subdomain takeovers and other DNS issues"; homepage = "https://github.com/blacklanternsecurity/baddns/"; + changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "baddns"; diff --git a/pkgs/games/badlion-client/default.nix b/pkgs/by-name/ba/badlion-client/package.nix similarity index 100% rename from pkgs/games/badlion-client/default.nix rename to pkgs/by-name/ba/badlion-client/package.nix diff --git a/pkgs/tools/security/badrobot/default.nix b/pkgs/by-name/ba/badrobot/package.nix similarity index 100% rename from pkgs/tools/security/badrobot/default.nix rename to pkgs/by-name/ba/badrobot/package.nix diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/by-name/ba/badvpn/package.nix similarity index 100% rename from pkgs/tools/networking/badvpn/default.nix rename to pkgs/by-name/ba/badvpn/package.nix diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/by-name/ba/badwolf/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/badwolf/default.nix rename to pkgs/by-name/ba/badwolf/package.nix diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/by-name/ba/baekmuk-ttf/package.nix similarity index 100% rename from pkgs/data/fonts/baekmuk-ttf/default.nix rename to pkgs/by-name/ba/baekmuk-ttf/package.nix diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix new file mode 100644 index 000000000000..bc02fbf83729 --- /dev/null +++ b/pkgs/by-name/ba/baidupcs-go/package.nix @@ -0,0 +1,33 @@ +{ + buildGo122Module, + lib, + fetchFromGitHub, + versionCheckHook, +}: +buildGo122Module rec { + pname = "baidupcs-go"; + version = "3.9.5"; + src = fetchFromGitHub { + owner = "qjfoidnh"; + repo = "BaiduPCS-Go"; + rev = "v${version}"; + hash = "sha256-zNodRQzflOOB3hAeq4KbjRFlHQwknVy+4ucipUcoufY="; + }; + + vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc="; + doCheck = false; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + meta = { + maintainers = with lib.maintainers; [ xddxdd ]; + description = "Baidu Netdisk commandline client, mimicking Linux shell file handling commands"; + homepage = "https://github.com/qjfoidnh/BaiduPCS-Go"; + license = lib.licenses.asl20; + mainProgram = "BaiduPCS-Go"; + }; +} diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/by-name/ba/bakoma_ttf/package.nix similarity index 100% rename from pkgs/data/fonts/bakoma-ttf/default.nix rename to pkgs/by-name/ba/bakoma_ttf/package.nix diff --git a/pkgs/tools/misc/balanceofsatoshis/default.nix b/pkgs/by-name/ba/balanceofsatoshis/package.nix similarity index 100% rename from pkgs/tools/misc/balanceofsatoshis/default.nix rename to pkgs/by-name/ba/balanceofsatoshis/package.nix diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix new file mode 100644 index 000000000000..ee9eb2e640ae --- /dev/null +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + testers, + balena-cli, + node-gyp, + python3, + udev, + cctools, + apple-sdk_12, + darwinMinVersionHook, +}: + +buildNpmPackage rec { + pname = "balena-cli"; + version = "19.0.13"; + + src = fetchFromGitHub { + owner = "balena-io"; + repo = "balena-cli"; + rev = "v${version}"; + hash = "sha256-2U+P3LsxaRpktNbDn8iNhHQVjokiWZADYVDpJsDosZU="; + }; + + npmDepsHash = "sha256-CA6qs9Gk19dEK2yCFMVVKmJSoZVLdpnf4V6P5fv2Bcc="; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + makeCacheWritable = true; + + nativeBuildInputs = + [ + node-gyp + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + udev + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + ]; + + passthru.tests.version = testers.testVersion { + package = balena-cli; + command = '' + # Override default cache directory so Balena CLI's unavoidable update check does not fail due to write permissions + BALENARC_DATA_DIRECTORY=./ balena --version + ''; + inherit version; + }; + + meta = with lib; { + description = "Command line interface for balenaCloud or openBalena"; + longDescription = '' + The balena CLI is a Command Line Interface for balenaCloud or openBalena. It is a software + tool available for Windows, macOS and Linux, used through a command prompt / terminal window. + It can be used interactively or invoked in scripts. The balena CLI builds on the balena API + and the balena SDK, and can also be directly imported in Node.js applications. + ''; + homepage = "https://github.com/balena-io/balena-cli"; + changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = [ + maintainers.kalebpace + maintainers.doronbehar + ]; + mainProgram = "balena"; + }; +} diff --git a/pkgs/games/ballerburg/default.nix b/pkgs/by-name/ba/ballerburg/package.nix similarity index 100% rename from pkgs/games/ballerburg/default.nix rename to pkgs/by-name/ba/ballerburg/package.nix diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/by-name/ba/balsa/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/balsa/default.nix rename to pkgs/by-name/ba/balsa/package.nix diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/by-name/ba/bam/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/bam/default.nix rename to pkgs/by-name/ba/bam/package.nix diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/by-name/ba/bamf/package.nix similarity index 100% rename from pkgs/development/libraries/bamf/default.nix rename to pkgs/by-name/ba/bamf/package.nix diff --git a/pkgs/applications/science/biology/bamtools/default.nix b/pkgs/by-name/ba/bamtools/package.nix similarity index 100% rename from pkgs/applications/science/biology/bamtools/default.nix rename to pkgs/by-name/ba/bamtools/package.nix diff --git a/pkgs/by-name/ba/banana-accounting/package.nix b/pkgs/by-name/ba/banana-accounting/package.nix new file mode 100644 index 000000000000..cd00995f13d9 --- /dev/null +++ b/pkgs/by-name/ba/banana-accounting/package.nix @@ -0,0 +1,60 @@ +{ autoPatchelfHook +, cairo +, e2fsprogs +, fetchurl +, gmp +, gtk3 +, libGL +, libX11 +, lib +, stdenv +, libgcrypt +, wrapGAppsHook3 +}: + +stdenv.mkDerivation { + pname = "banana-accounting"; + version = "10.0.12"; + + srcs = fetchurl { + url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; + hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw="; + }; + + sourceRoot = "."; + + dontConfigure = true; + dontBuild = true; + + buildInputs = [ + cairo + e2fsprogs + gmp + gtk3 + (lib.getLib stdenv.cc.cc) + libGL + libX11 + libgcrypt + ]; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv ./* $out + ln -s $out/usr/bin/bananaplus $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + description = "Accounting Software for small companies, associations and individuals"; + homepage = "https://www.banana.ch/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jacg ]; + }; +} diff --git a/pkgs/development/tools/analysis/banana-vera/default.nix b/pkgs/by-name/ba/banana-vera/package.nix similarity index 100% rename from pkgs/development/tools/analysis/banana-vera/default.nix rename to pkgs/by-name/ba/banana-vera/package.nix diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/by-name/ba/bandwidth/package.nix similarity index 100% rename from pkgs/tools/misc/bandwidth/default.nix rename to pkgs/by-name/ba/bandwidth/package.nix diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/by-name/ba/banking/package.nix similarity index 100% rename from pkgs/applications/office/banking/default.nix rename to pkgs/by-name/ba/banking/package.nix diff --git a/pkgs/games/banner/default.nix b/pkgs/by-name/ba/banner/package.nix similarity index 100% rename from pkgs/games/banner/default.nix rename to pkgs/by-name/ba/banner/package.nix diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index c0f181dd41db..ad68c24b389c 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, bazel_6, jdk, + nix-update-script, }: let @@ -18,13 +19,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-QbxPosjlrpxbz6gQKUKccF2Gu/i5xvqh2gwfABYE8kE="; + hash = "sha256-CMqh2v6Y/jvrDC2M4Q+pC0FkNJ95gbGTR1UC6zviwV4="; }; bazelFlags = [ @@ -39,8 +40,8 @@ buildBazelPackage rec { fetchAttrs = { hash = { - aarch64-linux = "sha256-LNca4h4yceSgve9GYUoXqlODKPjLAa71kh1BWXqRYtk="; - x86_64-linux = "sha256-bRFIfaVbsU2WroXR/i0E7J4rWeaNEoum93r8qOMXXvc="; + aarch64-linux = "sha256-K+uGH3ox49taSPZ1aLYPrOLNRO3aLQeOSdrkmTC444U="; + x86_64-linux = "sha256-yNwD3n7exyG5LbhR2GuKIvoul6UQnyk3+8pLpnDzjFw="; } .${system} or (throw "No hash for system: ${system}"); }; @@ -60,14 +61,16 @@ buildBazelPackage rec { ''; }; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Bazel/Build Analysis and Navigation Tool"; homepage = "http://bant.build/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ hzeller lromor ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix new file mode 100644 index 000000000000..c36a1f34e96d --- /dev/null +++ b/pkgs/by-name/ba/bao/package.nix @@ -0,0 +1,30 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "bao"; + version = "0.12.1"; + + src = fetchCrate { + inherit version; + pname = "${pname}_bin"; + hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; + }; + + cargoPatches = [ + # https://github.com/oconnor663/bao/pull/55 + ./test-exe.patch + ]; + + cargoHash = "sha256-mmhTG3WXVjIKtaz2xP9aYI9GQNTbx4l3c6UgKSMgQJU="; + + meta = { + description = "Implementation of BLAKE3 verified streaming"; + homepage = "https://github.com/oconnor663/bao"; + maintainers = with lib.maintainers; [ amarshall ]; + license = with lib.licenses; [ cc0 asl20 ]; + mainProgram = "bao"; + }; +} diff --git a/pkgs/by-name/ba/bao/test-exe.patch b/pkgs/by-name/ba/bao/test-exe.patch new file mode 100644 index 000000000000..0dd08724b53a --- /dev/null +++ b/pkgs/by-name/ba/bao/test-exe.patch @@ -0,0 +1,40 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 2f66e42..34240e8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -26,6 +26,9 @@ path = "src/main.rs" + [dependencies.arrayref] + version = "0.3.5" + ++[dependencies.assert_cmd] ++version = "2.0.16" ++ + [dependencies.bao] + version = "0.12" + +diff --git a/tests/test.rs b/tests/test.rs +index f9427bd..48aabca 100644 +--- a/tests/test.rs ++++ b/tests/test.rs +@@ -1,8 +1,7 @@ + use duct::cmd; + use rand::prelude::*; +-use std::env::consts::EXE_EXTENSION; + use std::fs; +-use std::path::{Path, PathBuf}; ++use std::path::PathBuf; + use std::sync::Once; + use tempfile::tempdir; + +@@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf { + .expect("build failed"); + }); + +- Path::new("target") +- .join("debug") +- .join("bao") +- .with_extension(EXE_EXTENSION) ++ assert_cmd::cargo::cargo_bin("bao") + } + + #[test] diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index c57ea6c12942..c5aa44bbb5b7 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz"; - hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w="; + hash = "sha256-uI90+cBS08I4j3Bi0ijPXpJ1Raz3QIxWhB34DM0fnDc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/by-name/ba/bar/package.nix similarity index 100% rename from pkgs/tools/system/bar/default.nix rename to pkgs/by-name/ba/bar/package.nix diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/by-name/ba/barcode/package.nix similarity index 100% rename from pkgs/tools/graphics/barcode/default.nix rename to pkgs/by-name/ba/barcode/package.nix diff --git a/pkgs/tools/audio/bark/default.nix b/pkgs/by-name/ba/bark/package.nix similarity index 100% rename from pkgs/tools/audio/bark/default.nix rename to pkgs/by-name/ba/bark/package.nix diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/by-name/ba/barlow/package.nix similarity index 100% rename from pkgs/data/fonts/barlow/default.nix rename to pkgs/by-name/ba/barlow/package.nix diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/by-name/ba/barman/package.nix similarity index 100% rename from pkgs/tools/misc/barman/default.nix rename to pkgs/by-name/ba/barman/package.nix diff --git a/pkgs/tools/misc/barman/unwrap-subprocess.patch b/pkgs/by-name/ba/barman/unwrap-subprocess.patch similarity index 100% rename from pkgs/tools/misc/barman/unwrap-subprocess.patch rename to pkgs/by-name/ba/barman/unwrap-subprocess.patch diff --git a/pkgs/os-specific/darwin/bartender/default.nix b/pkgs/by-name/ba/bartender/package.nix similarity index 100% rename from pkgs/os-specific/darwin/bartender/default.nix rename to pkgs/by-name/ba/bartender/package.nix diff --git a/pkgs/tools/misc/bartib/default.nix b/pkgs/by-name/ba/bartib/package.nix similarity index 100% rename from pkgs/tools/misc/bartib/default.nix rename to pkgs/by-name/ba/bartib/package.nix diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/by-name/ba/base16-schemes/package.nix similarity index 100% rename from pkgs/data/themes/base16-schemes/default.nix rename to pkgs/by-name/ba/base16-schemes/package.nix diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/by-name/ba/base16-universal-manager/package.nix similarity index 100% rename from pkgs/applications/misc/base16-universal-manager/default.nix rename to pkgs/by-name/ba/base16-universal-manager/package.nix diff --git a/pkgs/tools/text/base16384/default.nix b/pkgs/by-name/ba/base16384/package.nix similarity index 100% rename from pkgs/tools/text/base16384/default.nix rename to pkgs/by-name/ba/base16384/package.nix diff --git a/pkgs/by-name/ba/basedpyright/package-lock.json b/pkgs/by-name/ba/basedpyright/package-lock.json deleted file mode 100644 index 8c8593a7ab2b..000000000000 --- a/pkgs/by-name/ba/basedpyright/package-lock.json +++ /dev/null @@ -1,12120 +0,0 @@ -{ - "name": "pyright-root", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "pyright-root", - "hasInstallScript": true, - "devDependencies": { - "@detachhead/ts-helpers": "^16.2.0", - "@types/glob": "^7.2.0", - "@types/node": "^20", - "@types/yargs": "^16.0.9", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", - "cross-env": "^7.0.3", - "eslint": "^8.56.0", - "eslint-config-prettier": "^8.10.0", - "eslint-plugin-simple-import-sort": "^10.0.0", - "glob": "^7.2.3", - "jsonc-parser": "^3.2.1", - "lerna": "^7.4.2", - "npm-check-updates": "^16.14.14", - "p-queue": "^6.6.2", - "prettier": "2.8.8", - "syncpack": "~10.9.3", - "throw-expression": "^2.0.1", - "typescript": "~5.5.4", - "word-wrap": "1.2.5", - "yargs": "^16.2.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/highlight": "^7.24.7", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@detachhead/ts-helpers": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@detachhead/ts-helpers/-/ts-helpers-16.2.0.tgz", - "integrity": "sha512-1kwJ1AgXWK9goECjtyRh6SMVf7YYkMt0yvUccxqo7qpDRYs3uDC0ot5MhIbDTbhyoQQio3wTTmA2m5ijdUehdA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@types/lodash": "4.14.195", - "date-fns": "2.21.1", - "is-ci": "2.0.0", - "lodash": "^4.17.21", - "ordinal": "1.0.3", - "throw-expression": "1.0.2", - "ts-is-present": "1.2.1", - "ts-toolbelt": "9.6.0", - "tsdef": "0.0.14", - "utility-types": "3.10.0" - }, - "engines": { - "node": ">=16.6.0" - } - }, - "node_modules/@detachhead/ts-helpers/node_modules/throw-expression": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/throw-expression/-/throw-expression-1.0.2.tgz", - "integrity": "sha512-y8cHYZgp0Vj8bRMQSWAA7pfHj1JPift81tZM9i/rHQuJoYEv9kewjEpRu2wRRuXRaClFWWzWQFTG3Q9rDysyNQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@effect/data": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/@effect/data/-/data-0.17.1.tgz", - "integrity": "sha512-QCYkLE5Y5Dm5Yax5R3GmW4ZIgTx7W+kSZ7yq5eqQ/mFWa8i4yxbLuu8cudqzdeZtRtTGZKlhDxfFfgVtMywXJg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@effect/io": { - "version": "0.37.1", - "resolved": "https://registry.npmjs.org/@effect/io/-/io-0.37.1.tgz", - "integrity": "sha512-Ez3GfcG+gDDfAiBXtSjJpSrPU5Guiyw69LsYkMtIukFwyNwpHWLhYaVgfVbVjoQasil8KiFSQJSd5DbJL6nqPg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@effect/data": "^0.17.0" - } - }, - "node_modules/@effect/match": { - "version": "0.31.0", - "resolved": "https://registry.npmjs.org/@effect/match/-/match-0.31.0.tgz", - "integrity": "sha512-QT0HSh19Y6iHAghc51Yt/rYDU9/jhs7O+2kSEQiJqj4xqCLjfJONWsK19xBCNbuV5bt3ZO1NGFqvsWeNR7ZhDg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@effect/data": "^0.17.1", - "@effect/schema": "^0.32.0" - } - }, - "node_modules/@effect/schema": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@effect/schema/-/schema-0.32.0.tgz", - "integrity": "sha512-4HJK/cFkVPdIjYICy0eRsL7JuuLJ6mE3aJC5rX9OuUIei/qfctFEEX2NaARjtGX7hACBrRcuJCNwiq+54TTjFw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@effect/data": "^0.17.1", - "@effect/io": "^0.37.0", - "fast-check": "^3.12.0" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz", - "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@hutson/parse-repository-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", - "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@lerna/child-process": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.4.2.tgz", - "integrity": "sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "execa": "^5.0.0", - "strong-log-transformer": "^2.1.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@lerna/create": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/@lerna/create/-/create-7.4.2.tgz", - "integrity": "sha512-1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/child-process": "7.4.2", - "@npmcli/run-script": "6.0.2", - "@nx/devkit": ">=16.5.1 < 17", - "@octokit/plugin-enterprise-rest": "6.0.1", - "@octokit/rest": "19.0.11", - "byte-size": "8.1.1", - "chalk": "4.1.0", - "clone-deep": "4.0.1", - "cmd-shim": "6.0.1", - "columnify": "1.6.0", - "conventional-changelog-core": "5.0.1", - "conventional-recommended-bump": "7.0.1", - "cosmiconfig": "^8.2.0", - "dedent": "0.7.0", - "execa": "5.0.0", - "fs-extra": "^11.1.1", - "get-stream": "6.0.0", - "git-url-parse": "13.1.0", - "glob-parent": "5.1.2", - "globby": "11.1.0", - "graceful-fs": "4.2.11", - "has-unicode": "2.0.1", - "ini": "^1.3.8", - "init-package-json": "5.0.0", - "inquirer": "^8.2.4", - "is-ci": "3.0.1", - "is-stream": "2.0.0", - "js-yaml": "4.1.0", - "libnpmpublish": "7.3.0", - "load-json-file": "6.2.0", - "lodash": "^4.17.21", - "make-dir": "4.0.0", - "minimatch": "3.0.5", - "multimatch": "5.0.0", - "node-fetch": "2.6.7", - "npm-package-arg": "8.1.1", - "npm-packlist": "5.1.1", - "npm-registry-fetch": "^14.0.5", - "npmlog": "^6.0.2", - "nx": ">=16.5.1 < 17", - "p-map": "4.0.0", - "p-map-series": "2.1.0", - "p-queue": "6.6.2", - "p-reduce": "^2.1.0", - "pacote": "^15.2.0", - "pify": "5.0.0", - "read-cmd-shim": "4.0.0", - "read-package-json": "6.0.4", - "resolve-from": "5.0.0", - "rimraf": "^4.4.1", - "semver": "^7.3.4", - "signal-exit": "3.0.7", - "slash": "^3.0.0", - "ssri": "^9.0.1", - "strong-log-transformer": "2.1.0", - "tar": "6.1.11", - "temp-dir": "1.0.0", - "upath": "2.0.1", - "uuid": "^9.0.0", - "validate-npm-package-license": "^3.0.4", - "validate-npm-package-name": "5.0.0", - "write-file-atomic": "5.0.1", - "write-pkg": "4.0.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@lerna/create/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@lerna/create/node_modules/chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@lerna/create/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lerna/create/node_modules/glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@lerna/create/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/create/node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@lerna/create/node_modules/glob/node_modules/minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@lerna/create/node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/@lerna/create/node_modules/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@lerna/create/node_modules/minipass": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", - "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lerna/create/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lerna/create/node_modules/rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^9.2.0" - }, - "bin": { - "rimraf": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/git": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", - "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/git/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/installed-package-contents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "bin": { - "installed-package-contents": "bin/index.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/installed-package-contents/node_modules/npm-bundled": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "license": "MIT", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "license": "ISC", - "dependencies": { - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/run-script": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", - "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@nrwl/devkit": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.10.0.tgz", - "integrity": "sha512-fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/devkit": "16.10.0" - } - }, - "node_modules/@nrwl/tao": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.10.0.tgz", - "integrity": "sha512-QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "nx": "16.10.0", - "tslib": "^2.3.0" - }, - "bin": { - "tao": "index.js" - } - }, - "node_modules/@nx/devkit": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.10.0.tgz", - "integrity": "sha512-IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nrwl/devkit": "16.10.0", - "ejs": "^3.1.7", - "enquirer": "~2.3.6", - "ignore": "^5.0.4", - "semver": "7.5.3", - "tmp": "~0.2.1", - "tslib": "^2.3.0" - }, - "peerDependencies": { - "nx": ">= 15 <= 17" - } - }, - "node_modules/@nx/devkit/node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@nx/nx-darwin-arm64": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz", - "integrity": "sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-darwin-x64": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.10.0.tgz", - "integrity": "sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-freebsd-x64": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.10.0.tgz", - "integrity": "sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.10.0.tgz", - "integrity": "sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.10.0.tgz", - "integrity": "sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-linux-arm64-musl": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.10.0.tgz", - "integrity": "sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-linux-x64-gnu": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz", - "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-linux-x64-musl": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.10.0.tgz", - "integrity": "sha512-q8sINYLdIJxK/iUx9vRk5jWAWb/2O0PAbOJFwv4qkxBv4rLoN7y+otgCZ5v0xfx/zztFgk/oNY4lg5xYjIso2Q==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.10.0.tgz", - "integrity": "sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/nx-win32-x64-msvc": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz", - "integrity": "sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@octokit/auth-token": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz", - "integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/core": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz", - "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/auth-token": "^3.0.0", - "@octokit/graphql": "^5.0.0", - "@octokit/request": "^6.0.0", - "@octokit/request-error": "^3.0.0", - "@octokit/types": "^9.0.0", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/endpoint": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz", - "integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/types": "^9.0.0", - "is-plain-object": "^5.0.0", - "universal-user-agent": "^6.0.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/graphql": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz", - "integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/request": "^6.0.0", - "@octokit/types": "^9.0.0", - "universal-user-agent": "^6.0.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/openapi-types": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz", - "integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@octokit/plugin-enterprise-rest": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz", - "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@octokit/plugin-paginate-rest": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz", - "integrity": "sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/tsconfig": "^1.0.2", - "@octokit/types": "^9.2.3" - }, - "engines": { - "node": ">= 14" - }, - "peerDependencies": { - "@octokit/core": ">=4" - } - }, - "node_modules/@octokit/plugin-request-log": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", - "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@octokit/core": ">=3" - } - }, - "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz", - "integrity": "sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/types": "^10.0.0" - }, - "engines": { - "node": ">= 14" - }, - "peerDependencies": { - "@octokit/core": ">=3" - } - }, - "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-10.0.0.tgz", - "integrity": "sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/openapi-types": "^18.0.0" - } - }, - "node_modules/@octokit/request": { - "version": "6.2.8", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz", - "integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/endpoint": "^7.0.0", - "@octokit/request-error": "^3.0.0", - "@octokit/types": "^9.0.0", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.7", - "universal-user-agent": "^6.0.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/request-error": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz", - "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/types": "^9.0.0", - "deprecation": "^2.0.0", - "once": "^1.4.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/rest": { - "version": "19.0.11", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.11.tgz", - "integrity": "sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/core": "^4.2.1", - "@octokit/plugin-paginate-rest": "^6.1.2", - "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^7.1.2" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/tsconfig": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@octokit/tsconfig/-/tsconfig-1.0.2.tgz", - "integrity": "sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@octokit/types": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz", - "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/openapi-types": "^18.0.0" - } - }, - "node_modules/@parcel/watcher": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", - "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "node-addon-api": "^3.2.1", - "node-gyp-build": "^4.3.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@pnpm/config.env-replace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", - "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "4.2.10" - }, - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true, - "license": "ISC" - }, - "node_modules/@pnpm/npm-conf": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", - "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@pnpm/config.env-replace": "^1.1.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@sigstore/bundle": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", - "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/protobuf-specs": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", - "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", - "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "make-fetch-happen": "^11.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/cacache/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/@sigstore/sign/node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/@sigstore/sign/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@sigstore/sign/node_modules/glob/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/@sigstore/sign/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@sigstore/sign/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/@sigstore/sign/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/@sigstore/sign/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/ssri/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/@sigstore/sign/node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign/node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/tuf": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", - "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0", - "tuf-js": "^1.1.7" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@sindresorhus/is": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", - "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", - "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", - "dev": true, - "license": "MIT", - "dependencies": { - "defer-to-connect": "^2.0.1" - }, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tufjs/canonical-json": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", - "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@tufjs/models": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", - "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tufjs/canonical-json": "1.0.0", - "minimatch": "^9.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/lodash": { - "version": "4.14.195", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz", - "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/node": { - "version": "20.16.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.8.tgz", - "integrity": "sha512-sbo5JmfbZNkyDv+2HCccr9Y9ZkKJBMTru7UdAsCojMGjKNjdaOV73bqEW242QrHEZL8R4LbHMrW+FHB5lZ5/bw==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.19.2" - } - }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", - "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/semver-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz", - "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/yargs": { - "version": "16.0.9", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", - "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", - "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.21.0", - "@typescript-eslint/type-utils": "6.21.0", - "@typescript-eslint/utils": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.4", - "natural-compare": "^1.4.0", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", - "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/scope-manager": "6.21.0", - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/typescript-estree": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", - "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", - "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/typescript-estree": "6.21.0", - "@typescript-eslint/utils": "6.21.0", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", - "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", - "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", - "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.21.0", - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/typescript-estree": "6.21.0", - "semver": "^7.5.4" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", - "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "6.21.0", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/@yarnpkg/parsers": { - "version": "3.0.0-rc.46", - "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", - "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "js-yaml": "^3.10.0", - "tslib": "^2.4.0" - }, - "engines": { - "node": ">=14.15.0" - } - }, - "node_modules/@yarnpkg/parsers/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/@yarnpkg/parsers/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@zkochan/js-yaml": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", - "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/add-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", - "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/agentkeepalive": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", - "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", - "dev": true, - "license": "MIT", - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.1.0" - } - }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, - "node_modules/array-differ": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", - "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/array-ify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", - "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", - "dev": true, - "license": "MIT" - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, - "license": "MIT" - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/before-after-hook": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", - "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/boxen": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz", - "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-align": "^3.0.1", - "camelcase": "^7.0.1", - "chalk": "^5.2.0", - "cli-boxes": "^3.0.0", - "string-width": "^5.1.2", - "type-fest": "^2.13.0", - "widest-line": "^4.0.1", - "wrap-ansi": "^8.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/boxen/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/boxen/node_modules/camelcase": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", - "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/boxen/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/boxen/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/boxen/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/builtins": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", - "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.0.0" - } - }, - "node_modules/byte-size": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz", - "integrity": "sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.17" - } - }, - "node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cacheable-lookup": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", - "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request": { - "version": "10.2.14", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz", - "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/http-cache-semantics": "^4.0.2", - "get-stream": "^6.0.1", - "http-cache-semantics": "^4.1.1", - "keyv": "^4.5.3", - "mimic-response": "^4.0.0", - "normalize-url": "^8.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase-keys": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", - "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "camelcase": "^5.3.1", - "map-obj": "^4.0.0", - "quick-lru": "^4.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true, - "license": "MIT" - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-boxes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", - "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-table3": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", - "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "string-width": "^4.2.0" - }, - "engines": { - "node": "10.* || >= 12.*" - }, - "optionalDependencies": { - "@colors/colors": "1.5.0" - } - }, - "node_modules/cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 10" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/clone-deep/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cmd-shim": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz", - "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "license": "ISC", - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/columnify": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz", - "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "strip-ansi": "^6.0.1", - "wcwidth": "^1.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14" - } - }, - "node_modules/compare-func": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", - "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-ify": "^1.0.0", - "dot-prop": "^5.1.0" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "dev": true, - "engines": [ - "node >= 6.0" - ], - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/configstore": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz", - "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dot-prop": "^6.0.1", - "graceful-fs": "^4.2.6", - "unique-string": "^3.0.0", - "write-file-atomic": "^3.0.3", - "xdg-basedir": "^5.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/yeoman/configstore?sponsor=1" - } - }, - "node_modules/configstore/node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/configstore/node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/conventional-changelog-angular": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", - "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "compare-func": "^2.0.0" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/conventional-changelog-core": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz", - "integrity": "sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==", - "dev": true, - "license": "MIT", - "dependencies": { - "add-stream": "^1.0.0", - "conventional-changelog-writer": "^6.0.0", - "conventional-commits-parser": "^4.0.0", - "dateformat": "^3.0.3", - "get-pkg-repo": "^4.2.1", - "git-raw-commits": "^3.0.0", - "git-remote-origin-url": "^2.0.0", - "git-semver-tags": "^5.0.0", - "normalize-package-data": "^3.0.3", - "read-pkg": "^3.0.0", - "read-pkg-up": "^3.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/conventional-changelog-preset-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz", - "integrity": "sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14" - } - }, - "node_modules/conventional-changelog-writer": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz", - "integrity": "sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "conventional-commits-filter": "^3.0.0", - "dateformat": "^3.0.3", - "handlebars": "^4.7.7", - "json-stringify-safe": "^5.0.1", - "meow": "^8.1.2", - "semver": "^7.0.0", - "split": "^1.0.1" - }, - "bin": { - "conventional-changelog-writer": "cli.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/conventional-commits-filter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz", - "integrity": "sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash.ismatch": "^4.4.0", - "modify-values": "^1.0.1" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/conventional-commits-parser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz", - "integrity": "sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-text-path": "^1.0.1", - "JSONStream": "^1.3.5", - "meow": "^8.1.2", - "split2": "^3.2.2" - }, - "bin": { - "conventional-commits-parser": "cli.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/conventional-recommended-bump": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz", - "integrity": "sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==", - "dev": true, - "license": "MIT", - "dependencies": { - "concat-stream": "^2.0.0", - "conventional-changelog-preset-loader": "^3.0.0", - "conventional-commits-filter": "^3.0.0", - "conventional-commits-parser": "^4.0.0", - "git-raw-commits": "^3.0.0", - "git-semver-tags": "^5.0.0", - "meow": "^8.1.2" - }, - "bin": { - "conventional-recommended-bump": "cli.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/cosmiconfig": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", - "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", - "parse-json": "^5.2.0", - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - }, - "peerDependencies": { - "typescript": ">=4.9.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/cross-env": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "bin": { - "cross-env": "src/bin/cross-env.js", - "cross-env-shell": "src/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=10.14", - "npm": ">=6", - "yarn": ">=1" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crypto-random-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/crypto-random-string/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/dargs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", - "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/date-fns": { - "version": "2.21.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz", - "integrity": "sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.11" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" - } - }, - "node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", - "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", - "dev": true, - "license": "MIT", - "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decamelize-keys/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true, - "license": "MIT" - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/detect-indent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", - "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dotenv": { - "version": "16.3.2", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz", - "integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" - } - }, - "node_modules/dotenv-expand": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", - "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - } - }, - "node_modules/duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true, - "license": "MIT" - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT" - }, - "node_modules/ejs": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", - "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "jake": "^10.8.5" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", - "dev": true, - "license": "MIT", - "bin": { - "envinfo": "dist/cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "license": "MIT" - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-goat": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", - "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-config-prettier": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", - "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true, - "license": "MIT", - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-plugin-simple-import-sort": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", - "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "eslint": ">=5.0.0" - } - }, - "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "license": "BSD-2-Clause", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true, - "license": "MIT" - }, - "node_modules/execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/fast-check": { - "version": "3.22.0", - "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-3.22.0.tgz", - "integrity": "sha512-8HKz3qXqnHYp/VCNn2qfjHdAdcI8zcSqOyX64GOMukp7SL2bfzfeDKjSd+UyECtejccaZv3LcvZTm9YDD22iCQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/dubzzz" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fast-check" - } - ], - "license": "MIT", - "dependencies": { - "pure-rand": "^6.1.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-memoize": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", - "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/figures/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "license": "BSD-3-Clause", - "bin": { - "flat": "cli.js" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true, - "license": "ISC" - }, - "node_modules/follow-redirects": { - "version": "1.15.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", - "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "license": "MIT", - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.17" - } - }, - "node_modules/fp-and-or": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz", - "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true, - "license": "MIT" - }, - "node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-pkg-repo": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", - "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@hutson/parse-repository-url": "^3.0.0", - "hosted-git-info": "^4.0.0", - "through2": "^2.0.0", - "yargs": "^16.2.0" - }, - "bin": { - "get-pkg-repo": "src/cli.js" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-port": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", - "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stream": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", - "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/git-raw-commits": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz", - "integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "dargs": "^7.0.0", - "meow": "^8.1.2", - "split2": "^3.2.2" - }, - "bin": { - "git-raw-commits": "cli.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/git-remote-origin-url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", - "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "gitconfiglocal": "^1.0.0", - "pify": "^2.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/git-remote-origin-url/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/git-semver-tags": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz", - "integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==", - "dev": true, - "license": "MIT", - "dependencies": { - "meow": "^8.1.2", - "semver": "^7.0.0" - }, - "bin": { - "git-semver-tags": "cli.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/git-up": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz", - "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-ssh": "^1.4.0", - "parse-url": "^8.1.0" - } - }, - "node_modules/git-url-parse": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz", - "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==", - "dev": true, - "license": "MIT", - "dependencies": { - "git-up": "^7.0.0" - } - }, - "node_modules/gitconfiglocal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", - "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==", - "dev": true, - "license": "BSD", - "dependencies": { - "ini": "^1.3.2" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/global-dirs/node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/got": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", - "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/got/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, - "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, - "node_modules/hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/has-yarn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz", - "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http2-wrapper": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", - "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.2.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/http2-wrapper/node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.0.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/ignore-walk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz", - "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minimatch": "^5.0.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/ignore-walk/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true, - "license": "ISC" - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true, - "license": "ISC" - }, - "node_modules/init-package-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz", - "integrity": "sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-package-arg": "^10.0.0", - "promzard": "^1.0.0", - "read": "^2.0.0", - "read-package-json": "^6.0.0", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/init-package-json/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/inquirer": { - "version": "8.2.6", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", - "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^6.0.1" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/ip-address": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", - "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsbn": "1.1.0", - "sprintf-js": "^1.1.3" - }, - "engines": { - "node": ">= 12" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-core-module": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", - "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-npm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz", - "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-ssh": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz", - "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "protocols": "^2.0.1" - } - }, - "node_modules/is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-text-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", - "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "text-extensions": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-yarn-global": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz", - "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - } - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jake": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", - "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "async": "^3.2.3", - "chalk": "^4.0.2", - "filelist": "^1.0.4", - "minimatch": "^3.1.2" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jake/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jake/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", - "dev": true, - "license": "MIT" - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-parse-helpfulerror": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", - "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "jju": "^1.1.0" - } - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, - "license": "ISC" - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/jsonlines": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz", - "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==", - "dev": true, - "license": "MIT" - }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true, - "engines": [ - "node >= 0.2.0" - ], - "license": "MIT" - }, - "node_modules/JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "license": "(MIT OR Apache-2.0)", - "dependencies": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - }, - "bin": { - "JSONStream": "bin.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/latest-version": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", - "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==", - "dev": true, - "license": "MIT", - "dependencies": { - "package-json": "^8.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lerna": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/lerna/-/lerna-7.4.2.tgz", - "integrity": "sha512-gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/child-process": "7.4.2", - "@lerna/create": "7.4.2", - "@npmcli/run-script": "6.0.2", - "@nx/devkit": ">=16.5.1 < 17", - "@octokit/plugin-enterprise-rest": "6.0.1", - "@octokit/rest": "19.0.11", - "byte-size": "8.1.1", - "chalk": "4.1.0", - "clone-deep": "4.0.1", - "cmd-shim": "6.0.1", - "columnify": "1.6.0", - "conventional-changelog-angular": "7.0.0", - "conventional-changelog-core": "5.0.1", - "conventional-recommended-bump": "7.0.1", - "cosmiconfig": "^8.2.0", - "dedent": "0.7.0", - "envinfo": "7.8.1", - "execa": "5.0.0", - "fs-extra": "^11.1.1", - "get-port": "5.1.1", - "get-stream": "6.0.0", - "git-url-parse": "13.1.0", - "glob-parent": "5.1.2", - "globby": "11.1.0", - "graceful-fs": "4.2.11", - "has-unicode": "2.0.1", - "import-local": "3.1.0", - "ini": "^1.3.8", - "init-package-json": "5.0.0", - "inquirer": "^8.2.4", - "is-ci": "3.0.1", - "is-stream": "2.0.0", - "jest-diff": ">=29.4.3 < 30", - "js-yaml": "4.1.0", - "libnpmaccess": "7.0.2", - "libnpmpublish": "7.3.0", - "load-json-file": "6.2.0", - "lodash": "^4.17.21", - "make-dir": "4.0.0", - "minimatch": "3.0.5", - "multimatch": "5.0.0", - "node-fetch": "2.6.7", - "npm-package-arg": "8.1.1", - "npm-packlist": "5.1.1", - "npm-registry-fetch": "^14.0.5", - "npmlog": "^6.0.2", - "nx": ">=16.5.1 < 17", - "p-map": "4.0.0", - "p-map-series": "2.1.0", - "p-pipe": "3.1.0", - "p-queue": "6.6.2", - "p-reduce": "2.1.0", - "p-waterfall": "2.1.1", - "pacote": "^15.2.0", - "pify": "5.0.0", - "read-cmd-shim": "4.0.0", - "read-package-json": "6.0.4", - "resolve-from": "5.0.0", - "rimraf": "^4.4.1", - "semver": "^7.3.8", - "signal-exit": "3.0.7", - "slash": "3.0.0", - "ssri": "^9.0.1", - "strong-log-transformer": "2.1.0", - "tar": "6.1.11", - "temp-dir": "1.0.0", - "typescript": ">=3 < 6", - "upath": "2.0.1", - "uuid": "^9.0.0", - "validate-npm-package-license": "3.0.4", - "validate-npm-package-name": "5.0.0", - "write-file-atomic": "5.0.1", - "write-pkg": "4.0.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4" - }, - "bin": { - "lerna": "dist/cli.js" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/lerna/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/lerna/node_modules/chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/lerna/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/lerna/node_modules/glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/lerna/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/lerna/node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/lerna/node_modules/glob/node_modules/minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/lerna/node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/lerna/node_modules/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/lerna/node_modules/minipass": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", - "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/lerna/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/lerna/node_modules/rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^9.2.0" - }, - "bin": { - "rimraf": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/libnpmaccess": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-7.0.2.tgz", - "integrity": "sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-package-arg": "^10.1.0", - "npm-registry-fetch": "^14.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmaccess/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmaccess/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/libnpmaccess/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmpublish": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.3.0.tgz", - "integrity": "sha512-fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg==", - "dev": true, - "license": "ISC", - "dependencies": { - "ci-info": "^3.6.1", - "normalize-package-data": "^5.0.0", - "npm-package-arg": "^10.1.0", - "npm-registry-fetch": "^14.0.3", - "proc-log": "^3.0.0", - "semver": "^7.3.7", - "sigstore": "^1.4.0", - "ssri": "^10.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmpublish/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/libnpmpublish/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmpublish/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/libnpmpublish/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/libnpmpublish/node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmpublish/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/libnpmpublish/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/lines-and-columns": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", - "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, - "node_modules/load-json-file": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", - "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.15", - "parse-json": "^5.0.0", - "strip-bom": "^4.0.0", - "type-fest": "^0.6.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/load-json-file/node_modules/type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=8" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.ismatch": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", - "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lowercase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", - "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", - "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.18.0", - "yargs-parser": "^20.2.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true, - "license": "ISC" - }, - "node_modules/meow/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/meow/node_modules/type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "license": "MIT" - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/mimic-response": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", - "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "license": "MIT", - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-json-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", - "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/modify-values": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", - "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/multimatch": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", - "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimatch": "^3.0.3", - "array-differ": "^3.0.0", - "array-union": "^2.1.0", - "arrify": "^2.0.1", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/multimatch/node_modules/@types/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/multimatch/node_modules/arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/multimatch/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/multimatch/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true, - "license": "ISC" - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp-build": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", - "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", - "dev": true, - "license": "MIT", - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" - } - }, - "node_modules/node-machine-id": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", - "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-url": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", - "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-bundled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", - "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "node_modules/npm-check-updates": { - "version": "16.14.20", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.20.tgz", - "integrity": "sha512-sYbIhun4DrjO7NFOTdvs11nCar0etEhZTsEjL47eM0TuiGMhmYughRCxG2SpGRmGAQ7AkwN7bw2lWzoE7q6yOQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@types/semver-utils": "^1.1.1", - "chalk": "^5.3.0", - "cli-table3": "^0.6.3", - "commander": "^10.0.1", - "fast-memoize": "^2.5.2", - "find-up": "5.0.0", - "fp-and-or": "^0.1.4", - "get-stdin": "^8.0.0", - "globby": "^11.0.4", - "hosted-git-info": "^5.1.0", - "ini": "^4.1.1", - "js-yaml": "^4.1.0", - "json-parse-helpfulerror": "^1.0.3", - "jsonlines": "^0.1.1", - "lodash": "^4.17.21", - "make-fetch-happen": "^11.1.1", - "minimatch": "^9.0.3", - "p-map": "^4.0.0", - "pacote": "15.2.0", - "parse-github-url": "^1.0.2", - "progress": "^2.0.3", - "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.3", - "remote-git-tags": "^3.0.0", - "rimraf": "^5.0.5", - "semver": "^7.5.4", - "semver-utils": "^1.1.4", - "source-map-support": "^0.5.21", - "spawn-please": "^2.0.2", - "strip-ansi": "^7.1.0", - "strip-json-comments": "^5.0.1", - "untildify": "^4.0.0", - "update-notifier": "^6.0.2" - }, - "bin": { - "ncu": "build/src/bin/cli.js", - "npm-check-updates": "build/src/bin/cli.js" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/npm-check-updates/node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/npm-check-updates/node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/cacache/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-check-updates/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/npm-check-updates/node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-check-updates/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-check-updates/node_modules/glob/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-check-updates/node_modules/hosted-git-info": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", - "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/ini": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", - "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-check-updates/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-check-updates/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm-check-updates/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/npm-check-updates/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-check-updates/node_modules/rimraf": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", - "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-check-updates/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/ssri/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-check-updates/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/npm-check-updates/node_modules/strip-json-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", - "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-check-updates/node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-normalize-package-bin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "dev": true, - "license": "ISC" - }, - "node_modules/npm-package-arg": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz", - "integrity": "sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^3.0.6", - "semver": "^7.0.0", - "validate-npm-package-name": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/npm-package-arg/node_modules/builtins": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/npm-package-arg/node_modules/hosted-git-info": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", - "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/npm-package-arg/node_modules/validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", - "dev": true, - "license": "ISC", - "dependencies": { - "builtins": "^1.0.3" - } - }, - "node_modules/npm-packlist": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz", - "integrity": "sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^8.0.1", - "ignore-walk": "^5.0.1", - "npm-bundled": "^1.1.2", - "npm-normalize-package-bin": "^1.0.1" - }, - "bin": { - "npm-packlist": "bin/index.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/npm-packlist/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-packlist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/npm-pick-manifest": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", - "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-pick-manifest/node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", - "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", - "dev": true, - "license": "ISC", - "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/cacache/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-registry-fetch/node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-registry-fetch/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-registry-fetch/node_modules/glob/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-registry-fetch/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-registry-fetch/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/ssri/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-registry-fetch/node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/nx": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/nx/-/nx-16.10.0.tgz", - "integrity": "sha512-gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@nrwl/tao": "16.10.0", - "@parcel/watcher": "2.0.4", - "@yarnpkg/lockfile": "^1.1.0", - "@yarnpkg/parsers": "3.0.0-rc.46", - "@zkochan/js-yaml": "0.0.6", - "axios": "^1.0.0", - "chalk": "^4.1.0", - "cli-cursor": "3.1.0", - "cli-spinners": "2.6.1", - "cliui": "^8.0.1", - "dotenv": "~16.3.1", - "dotenv-expand": "~10.0.0", - "enquirer": "~2.3.6", - "figures": "3.2.0", - "flat": "^5.0.2", - "fs-extra": "^11.1.0", - "glob": "7.1.4", - "ignore": "^5.0.4", - "jest-diff": "^29.4.1", - "js-yaml": "4.1.0", - "jsonc-parser": "3.2.0", - "lines-and-columns": "~2.0.3", - "minimatch": "3.0.5", - "node-machine-id": "1.1.12", - "npm-run-path": "^4.0.1", - "open": "^8.4.0", - "semver": "7.5.3", - "string-width": "^4.2.3", - "strong-log-transformer": "^2.1.0", - "tar-stream": "~2.2.0", - "tmp": "~0.2.1", - "tsconfig-paths": "^4.1.2", - "tslib": "^2.3.0", - "v8-compile-cache": "2.3.0", - "yargs": "^17.6.2", - "yargs-parser": "21.1.1" - }, - "bin": { - "nx": "bin/nx.js" - }, - "optionalDependencies": { - "@nx/nx-darwin-arm64": "16.10.0", - "@nx/nx-darwin-x64": "16.10.0", - "@nx/nx-freebsd-x64": "16.10.0", - "@nx/nx-linux-arm-gnueabihf": "16.10.0", - "@nx/nx-linux-arm64-gnu": "16.10.0", - "@nx/nx-linux-arm64-musl": "16.10.0", - "@nx/nx-linux-x64-gnu": "16.10.0", - "@nx/nx-linux-x64-musl": "16.10.0", - "@nx/nx-win32-arm64-msvc": "16.10.0", - "@nx/nx-win32-x64-msvc": "16.10.0" - }, - "peerDependencies": { - "@swc-node/register": "^1.6.7", - "@swc/core": "^1.3.85" - }, - "peerDependenciesMeta": { - "@swc-node/register": { - "optional": true - }, - "@swc/core": { - "optional": true - } - } - }, - "node_modules/nx/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/nx/node_modules/glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/nx/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true, - "license": "MIT" - }, - "node_modules/nx/node_modules/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/nx/node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/nx/node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/nx/node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/open": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", - "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ordinal": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ordinal/-/ordinal-1.0.3.tgz", - "integrity": "sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.20" - } - }, - "node_modules/p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map-series": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz", - "integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-pipe": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz", - "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-queue": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz", - "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "eventemitter3": "^4.0.4", - "p-timeout": "^3.2.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-reduce": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz", - "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-timeout": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", - "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-finally": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/p-waterfall": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz", - "integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-reduce": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", - "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==", - "dev": true, - "license": "MIT", - "dependencies": { - "got": "^12.1.0", - "registry-auth-token": "^5.0.1", - "registry-url": "^6.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, - "node_modules/pacote": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", - "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^5.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "sigstore": "^1.3.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/cacache/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/pacote/node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/pacote/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/pacote/node_modules/glob/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/pacote/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/ignore-walk": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", - "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", - "dev": true, - "license": "ISC", - "dependencies": { - "minimatch": "^9.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/pacote/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/pacote/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/pacote/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "ignore-walk": "^6.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/ssri/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/pacote/node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-github-url": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.3.tgz", - "integrity": "sha512-tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww==", - "dev": true, - "license": "MIT", - "bin": { - "parse-github-url": "cli.js" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/parse-json/node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, - "license": "MIT" - }, - "node_modules/parse-path": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz", - "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==", - "dev": true, - "license": "MIT", - "dependencies": { - "protocols": "^2.0.0" - } - }, - "node_modules/parse-url": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz", - "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==", - "dev": true, - "license": "MIT", - "dependencies": { - "parse-path": "^7.0.0" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", - "dev": true, - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", - "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/prompts-ncu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz", - "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==", - "dev": true, - "license": "MIT", - "dependencies": { - "kleur": "^4.0.1", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/prompts/node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/promzard": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz", - "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "read": "^3.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/promzard/node_modules/mute-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", - "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/promzard/node_modules/read": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz", - "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==", - "dev": true, - "license": "ISC", - "dependencies": { - "mute-stream": "^1.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "dev": true, - "license": "ISC" - }, - "node_modules/protocols": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz", - "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true, - "license": "MIT" - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/pupa": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", - "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-goat": "^4.0.0" - }, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pure-rand": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", - "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/dubzzz" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fast-check" - } - ], - "license": "MIT" - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/quick-lru": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", - "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc-config-loader": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz", - "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.4", - "js-yaml": "^4.1.0", - "json5": "^2.2.2", - "require-from-string": "^2.0.2" - } - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" - }, - "node_modules/read": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/read/-/read-2.1.0.tgz", - "integrity": "sha512-bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "mute-stream": "~1.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-cmd-shim": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz", - "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", - "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", - "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^10.2.2", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast/node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/read-package-json/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/read-package-json/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/read-package-json/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/read-package-json/node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json/node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg/node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true, - "license": "ISC" - }, - "node_modules/read-pkg/node_modules/load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg/node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/read-pkg/node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", - "dev": true, - "license": "MIT", - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg/node_modules/path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "license": "MIT", - "dependencies": { - "pify": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg/node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/read-pkg/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/read-yaml-file": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-2.1.0.tgz", - "integrity": "sha512-UkRNRIwnhG+y7hpqnycCL/xbTk7+ia9VuVTC0S+zVbwd65DI9eUpRMfsWIGrCWxTU/mi+JW8cHQCrv+zfCbEPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "js-yaml": "^4.0.0", - "strip-bom": "^4.0.0" - }, - "engines": { - "node": ">=10.13" - } - }, - "node_modules/read/node_modules/mute-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", - "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/redent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", - "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/registry-auth-token": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", - "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@pnpm/npm-conf": "^2.1.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/registry-url": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", - "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "rc": "1.2.8" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/remote-git-tags": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", - "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-cwd/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/responselike": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", - "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", - "dev": true, - "license": "MIT", - "dependencies": { - "lowercase-keys": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", - "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/semver-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz", - "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==", - "dev": true, - "license": "APACHEv2" - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true, - "license": "ISC" - }, - "node_modules/shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "license": "MIT", - "dependencies": { - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/sigstore": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", - "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "@sigstore/sign": "^1.0.0", - "@sigstore/tuf": "^1.0.3", - "make-fetch-happen": "^11.0.1" - }, - "bin": { - "sigstore": "bin/sigstore.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/cacache/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/sigstore/node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/sigstore/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sigstore/node_modules/glob/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/sigstore/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/sigstore/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sigstore/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/sigstore/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/ssri/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/sigstore/node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", - "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ip-address": "^9.0.5", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/sort-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", - "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-plain-obj": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/spawn-please": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz", - "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.3" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true, - "license": "CC-BY-3.0" - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", - "dev": true, - "license": "CC0-1.0" - }, - "node_modules/split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "dev": true, - "license": "MIT", - "dependencies": { - "through": "2" - }, - "engines": { - "node": "*" - } - }, - "node_modules/split2": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", - "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", - "dev": true, - "license": "ISC", - "dependencies": { - "readable-stream": "^3.0.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strong-log-transformer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", - "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "duplexer": "^0.1.1", - "minimist": "^1.2.0", - "through": "^2.3.4" - }, - "bin": { - "sl-log-transformer": "bin/sl-log-transformer.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/syncpack": { - "version": "10.9.3", - "resolved": "https://registry.npmjs.org/syncpack/-/syncpack-10.9.3.tgz", - "integrity": "sha512-urdxuqkvO2/4tB1GaZGbCTzOgdi1XJzHjpiG4DTunOMH4oChSg54hczzzybfFQhqUl0ZY8A6LJNziKsf3J6E7g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@effect/data": "0.17.1", - "@effect/io": "0.37.1", - "@effect/match": "0.31.0", - "@effect/schema": "0.32.0", - "chalk": "4.1.2", - "commander": "11.0.0", - "cosmiconfig": "8.2.0", - "enquirer": "2.4.1", - "fs-extra": "11.1.1", - "globby": "11.1.0", - "minimatch": "9.0.3", - "npm-package-arg": "10.1.0", - "ora": "5.4.1", - "prompts": "2.4.2", - "read-yaml-file": "2.1.0", - "semver": "7.5.4", - "tightrope": "0.1.0", - "ts-toolbelt": "9.6.0" - }, - "bin": { - "syncpack": "dist/bin.js", - "syncpack-fix-mismatches": "dist/bin-fix-mismatches/index.js", - "syncpack-format": "dist/bin-format/index.js", - "syncpack-lint": "dist/bin-lint/index.js", - "syncpack-lint-semver-ranges": "dist/bin-lint-semver-ranges/index.js", - "syncpack-list": "dist/bin-list/index.js", - "syncpack-list-mismatches": "dist/bin-list-mismatches/index.js", - "syncpack-prompt": "dist/bin-prompt/index.js", - "syncpack-set-semver-ranges": "dist/bin-set-semver-ranges/index.js", - "syncpack-update": "dist/bin-update/index.js" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/syncpack/node_modules/commander": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", - "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - } - }, - "node_modules/syncpack/node_modules/cosmiconfig": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", - "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - } - }, - "node_modules/syncpack/node_modules/enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/syncpack/node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/syncpack/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/syncpack/node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/syncpack/node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/syncpack/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", - "dev": true, - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/temp-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", - "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/text-extensions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", - "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/through2/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/through2/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/through2/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/throw-expression": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/throw-expression/-/throw-expression-2.1.0.tgz", - "integrity": "sha512-ZVP9rT4wC596AkWEyYprufvUV+ppfz0xK7H9Ka3WeTKufn5pnfESxicIDnaJyf88pGHaIx2GkwNC4Qjh0OdEwA==", - "dev": true, - "license": "MIT" - }, - "node_modules/tightrope": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tightrope/-/tightrope-0.1.0.tgz", - "integrity": "sha512-HHHNYdCAIYwl1jOslQBT455zQpdeSo8/A346xpIb/uuqhSg+tCvYNsP5f11QW+z9VZ3vSX8YIfzTApjjuGH63w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14" - } - }, - "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.14" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true, - "license": "MIT" - }, - "node_modules/trim-newlines": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", - "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-api-utils": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", - "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - }, - "peerDependencies": { - "typescript": ">=4.2.0" - } - }, - "node_modules/ts-is-present": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ts-is-present/-/ts-is-present-1.2.1.tgz", - "integrity": "sha512-EYHn58qVRd/VHGkHSNGQJAxPXhF9wRiphYXl04VznngqqKjcT2jfHvAMPuzh8sRKdvifXw+dq6/Q3hG+nr3DRA==", - "dev": true, - "license": "MIT" - }, - "node_modules/ts-toolbelt": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz", - "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tsconfig-paths/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/tsdef": { - "version": "0.0.14", - "resolved": "https://registry.npmjs.org/tsdef/-/tsdef-0.0.14.tgz", - "integrity": "sha512-UjMD4XKRWWFlFBfwKVQmGFT5YzW/ZaF8x6KpCDf92u9wgKeha/go3FU0e5WqDjXsCOdfiavCkfwfVHNDxRDGMA==", - "dev": true, - "license": "MIT" - }, - "node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", - "dev": true, - "license": "0BSD" - }, - "node_modules/tuf-js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", - "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tufjs/models": "1.0.4", - "debug": "^4.3.4", - "make-fetch-happen": "^11.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/cacache/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tuf-js/node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tuf-js/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tuf-js/node_modules/glob/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tuf-js/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/tuf-js/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tuf-js/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/tuf-js/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tuf-js/node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/ssri/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tuf-js/node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/uglify-js": { - "version": "3.19.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", - "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", - "dev": true, - "license": "BSD-2-Clause", - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true, - "license": "MIT" - }, - "node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/unique-string": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "crypto-random-string": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/universal-user-agent": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", - "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/upath": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz", - "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4", - "yarn": "*" - } - }, - "node_modules/update-notifier": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz", - "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "boxen": "^7.0.0", - "chalk": "^5.0.1", - "configstore": "^6.0.0", - "has-yarn": "^3.0.0", - "import-lazy": "^4.0.0", - "is-ci": "^3.0.1", - "is-installed-globally": "^0.4.0", - "is-npm": "^6.0.0", - "is-yarn-global": "^0.4.0", - "latest-version": "^7.0.0", - "pupa": "^3.1.0", - "semver": "^7.3.7", - "semver-diff": "^4.0.0", - "xdg-basedir": "^5.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/yeoman/update-notifier?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/update-notifier/node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/utility-types": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz", - "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "dev": true, - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true, - "license": "MIT" - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "builtins": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "license": "MIT", - "dependencies": { - "defaults": "^1.0.3" - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/widest-line": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz", - "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==", - "dev": true, - "license": "MIT", - "dependencies": { - "string-width": "^5.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/widest-line/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/widest-line/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/widest-line/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/widest-line/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/write-json-file": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz", - "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "detect-indent": "^5.0.0", - "graceful-fs": "^4.1.15", - "make-dir": "^2.1.0", - "pify": "^4.0.1", - "sort-keys": "^2.0.0", - "write-file-atomic": "^2.4.2" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/write-json-file/node_modules/make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/write-json-file/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/write-json-file/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/write-json-file/node_modules/write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "node_modules/write-pkg": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz", - "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==", - "dev": true, - "license": "MIT", - "dependencies": { - "sort-keys": "^2.0.0", - "type-fest": "^0.4.1", - "write-json-file": "^3.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/write-pkg/node_modules/type-fest": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz", - "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=6" - } - }, - "node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, - "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/yargs/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 0c058fa73705..6ebee6cfe498 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -3,112 +3,62 @@ fetchFromGitHub, runCommand, buildNpmPackage, - stdenvNoCC, docify, testers, writeText, jq, - python3, basedpyright, + pkg-config, + libsecret, + nix-update-script, + versionCheckHook, }: -let - version = "1.19.0"; +buildNpmPackage rec { + pname = "basedpyright"; + version = "1.21.0"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-R8QEINTlO84YrnfRsZU5vNEwYcy5uZEKmmTPJ4qxYk8="; + hash = "sha256-OQXqwpvYIitWGWshEv1/j2hAphFnGXDuvbRav5TilI4="; }; - # To regenerate the patched package-lock.json, copy the patched package.json - # and run `nix-shell -p nodejs --command 'npm update --package-lock'` - patchedPackageJSON = runCommand "package.json" { } '' - ${jq}/bin/jq ' - .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser" or .key == "@detachhead/ts-helpers")) - | .scripts = { } - ' ${src}/package.json > $out + npmDepsHash = "sha256-hCZ68sLpQs/7SYVf3pMAHfstRm1C/d80j8fESIFdhnw="; + npmWorkspace = "packages/pyright"; + + preBuild = '' + # Build the docstubs + cp -r packages/pyright-internal/typeshed-fallback docstubs + docify docstubs/stdlib --builtins-only --in-place ''; - pyright-root = buildNpmPackage { - pname = "pyright-root"; - inherit version src; - npmDepsHash = "sha256-vxfoaShk3ihmhr/5/2GSOuMqeo6rxebO6aiD3DybjW4="; - dontNpmBuild = true; - postPatch = '' - cp ${patchedPackageJSON} ./package.json - cp ${./package-lock.json} ./package-lock.json - ''; - installPhase = '' - runHook preInstall - cp -r . "$out" - runHook postInstall - ''; - }; + nativeBuildInputs = [ + docify + pkg-config + ]; - pyright-internal = buildNpmPackage { - pname = "pyright-internal"; - inherit version src; - sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-Xswt1kH9Iet6DSAlZctEV3qCpn+IWwceQgldyFzsaRk="; - dontNpmBuild = true; - # Uncomment this flag when using unreleased peer dependencies - # npmFlags = [ "--legacy-peer-deps" ]; - installPhase = '' - runHook preInstall - cp -r . "$out" - runHook postInstall - ''; - }; - - docstubs = stdenvNoCC.mkDerivation { - name = "docstubs"; - inherit src; - nativeBuildInputs = [ docify ]; - - installPhase = '' - runHook preInstall - cp -r packages/pyright-internal/typeshed-fallback docstubs - docify docstubs/stdlib --builtins-only --in-place - cp -rv docstubs "$out" - runHook postInstall - ''; - }; -in -buildNpmPackage rec { - pname = "basedpyright"; - inherit version src; - - sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-YhXVoh5sAnUkuc4iDMd/N15y92vMhUwT7PlLn2pzb20="; - - postPatch = '' - chmod +w ../../ - ln -s ${docstubs} ../../docstubs - ln -s ${pyright-root}/node_modules ../../node_modules - chmod +w ../pyright-internal - ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules - ''; + buildInputs = [ libsecret ]; postInstall = '' mv "$out/bin/pyright" "$out/bin/basedpyright" mv "$out/bin/pyright-langserver" "$out/bin/basedpyright-langserver" ''; - dontNpmBuild = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; passthru = { - updateScript = ./update.sh; + updateScript = nix-update-script { }; tests = { - version = testers.testVersion { package = basedpyright; }; - - # We are expecting 3 errors. Any other amount would indicate, not working + # We are expecting 4 errors. Any other amount would indicate not working # stub files, for instance. simple = testers.testEqualContents { assertion = "simple type checking"; expected = writeText "expected" '' - 3 + 4 ''; actual = runCommand "actual" @@ -117,16 +67,24 @@ buildNpmPackage rec { jq basedpyright ]; - base = writeText "base" '' + base = writeText "test.py" '' import sys + from time import tzset + + def print_string(a_string: str): + a_string += 42 + print(a_string) if sys.platform == "win32": - a = "a" + 1 - - print(3) - nonexistentfunction(3) + print_string(69) + this_function_does_not_exist("nice!") + else: + result_of_tzset_is_None: str = tzset() + ''; + configFile = writeText "pyproject.toml" '' + [tool.pyright] + typeCheckingMode = "strict" ''; - } '' (basedpyright --outputjson $base || true) | jq -r .summary.errorCount > $out diff --git a/pkgs/by-name/ba/basedpyright/update.sh b/pkgs/by-name/ba/basedpyright/update.sh deleted file mode 100755 index 64e00f242aa1..000000000000 --- a/pkgs/by-name/ba/basedpyright/update.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps -set -euo pipefail - -version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -v -s https://api.github.com/repos/detachhead/basedpyright/releases/latest | jq -r '.tag_name | sub("^v"; "")') - -update-source-version basedpyright "$version" - -root="$(dirname "$(readlink -f "$0")")" -FILE_PATH="$root/package.nix" -REPO_URL_PREFIX="https://github.com/detachhead/basedpyright/raw" -TEMP_DIR=$(mktemp -d) - -trap 'rm -rf "$TEMP_DIR"' EXIT - -# Function to download `package-lock.json` for a given source path and update hash -update_hash() { - local source_root_path="$1" - local existing_hash="$2" - - # Formulate download URL - local download_url="${REPO_URL_PREFIX}/v${version}${source_root_path}/package-lock.json" - - # Download package-lock.json to temporary directory - curl -fsSL -v -o "${TEMP_DIR}/package-lock.json" "$download_url" - - # Calculate the new hash - local new_hash - new_hash=$(prefetch-npm-deps "${TEMP_DIR}/package-lock.json") - - # Update npmDepsHash in the original file - sed -i "s|$existing_hash|${new_hash}|" "$FILE_PATH" -} - -while IFS= read -r source_root_line; do - [[ "$source_root_line" =~ sourceRoot ]] || continue - source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/') - - # Extract the current npmDepsHash for this sourceRoot - existing_hash=$(grep -A1 "$source_root_line" "$FILE_PATH" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/') - - # Call the function to download and update the hash - update_hash "$source_root_path" "$existing_hash" -done < "$FILE_PATH" diff --git a/pkgs/servers/baserow/default.nix b/pkgs/by-name/ba/baserow/package.nix similarity index 100% rename from pkgs/servers/baserow/default.nix rename to pkgs/by-name/ba/baserow/package.nix diff --git a/pkgs/tools/text/xml/basex/basex.svg b/pkgs/by-name/ba/basex/basex.svg similarity index 100% rename from pkgs/tools/text/xml/basex/basex.svg rename to pkgs/by-name/ba/basex/basex.svg diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/by-name/ba/basex/package.nix similarity index 100% rename from pkgs/tools/text/xml/basex/default.nix rename to pkgs/by-name/ba/basex/package.nix diff --git a/pkgs/tools/misc/basez/default.nix b/pkgs/by-name/ba/basez/package.nix similarity index 100% rename from pkgs/tools/misc/basez/default.nix rename to pkgs/by-name/ba/basez/package.nix diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/by-name/ba/bash-completion/package.nix similarity index 100% rename from pkgs/shells/bash/bash-completion/default.nix rename to pkgs/by-name/ba/bash-completion/package.nix diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/by-name/ba/bash-my-aws/package.nix similarity index 100% rename from pkgs/tools/admin/bash-my-aws/default.nix rename to pkgs/by-name/ba/bash-my-aws/package.nix diff --git a/pkgs/development/libraries/bash/bash-preexec/default.nix b/pkgs/by-name/ba/bash-preexec/package.nix similarity index 100% rename from pkgs/development/libraries/bash/bash-preexec/default.nix rename to pkgs/by-name/ba/bash-preexec/package.nix diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/by-name/ba/bash-supergenpass/package.nix similarity index 100% rename from pkgs/tools/security/bash-supergenpass/default.nix rename to pkgs/by-name/ba/bash-supergenpass/package.nix diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/by-name/ba/bashSnippets/package.nix similarity index 100% rename from pkgs/applications/misc/bashSnippets/default.nix rename to pkgs/by-name/ba/bashSnippets/package.nix diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/by-name/ba/bash_unit/package.nix similarity index 100% rename from pkgs/tools/misc/bash_unit/default.nix rename to pkgs/by-name/ba/bash_unit/package.nix diff --git a/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch b/pkgs/by-name/ba/bashblog/0001-Setting-markdown_bin.patch similarity index 100% rename from pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch rename to pkgs/by-name/ba/bashblog/0001-Setting-markdown_bin.patch diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/by-name/ba/bashblog/package.nix similarity index 100% rename from pkgs/tools/text/bashblog/default.nix rename to pkgs/by-name/ba/bashblog/package.nix diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/by-name/ba/bashcards/package.nix similarity index 100% rename from pkgs/tools/misc/bashcards/default.nix rename to pkgs/by-name/ba/bashcards/package.nix diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/by-name/ba/bashdb/package.nix similarity index 100% rename from pkgs/development/tools/misc/bashdb/default.nix rename to pkgs/by-name/ba/bashdb/package.nix diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/by-name/ba/bashmount/package.nix similarity index 100% rename from pkgs/tools/filesystems/bashmount/default.nix rename to pkgs/by-name/ba/bashmount/package.nix diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/by-name/ba/bashplotlib/package.nix similarity index 100% rename from pkgs/tools/misc/bashplotlib/default.nix rename to pkgs/by-name/ba/bashplotlib/package.nix diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/by-name/ba/basiliskii/package.nix similarity index 100% rename from pkgs/applications/emulators/basiliskii/default.nix rename to pkgs/by-name/ba/basiliskii/package.nix diff --git a/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch b/pkgs/by-name/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch similarity index 100% rename from pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch rename to pkgs/by-name/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch diff --git a/pkgs/games/bastet/default.nix b/pkgs/by-name/ba/bastet/package.nix similarity index 100% rename from pkgs/games/bastet/default.nix rename to pkgs/by-name/ba/bastet/package.nix diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 716ad80de725..747566e8c19c 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -7,7 +7,7 @@ , libiconv , installShellFiles , makeWrapper -, darwin +, apple-sdk_11 }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv apple-sdk_11 ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/by-name/ba/bats/libraries.nix similarity index 100% rename from pkgs/development/interpreters/bats/libraries.nix rename to pkgs/by-name/ba/bats/libraries.nix diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/by-name/ba/bats/package.nix similarity index 100% rename from pkgs/development/interpreters/bats/default.nix rename to pkgs/by-name/ba/bats/package.nix diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/by-name/ba/batsignal/package.nix similarity index 100% rename from pkgs/applications/misc/batsignal/default.nix rename to pkgs/by-name/ba/batsignal/package.nix diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/by-name/ba/baudline/package.nix similarity index 100% rename from pkgs/applications/audio/baudline/default.nix rename to pkgs/by-name/ba/baudline/package.nix diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/by-name/ba/bayescan/package.nix similarity index 100% rename from pkgs/applications/science/biology/bayescan/default.nix rename to pkgs/by-name/ba/bayescan/package.nix diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix new file mode 100644 index 000000000000..86541b67996a --- /dev/null +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -0,0 +1,64 @@ +{ stdenv, lib, fetchzip, makeWrapper, python3, unar, ffmpeg, nixosTests }: + +let + runtimeProgDeps = [ + ffmpeg + unar + ]; +in +stdenv.mkDerivation rec { + pname = "bazarr"; + version = "1.4.5"; + + src = fetchzip { + url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; + hash = "sha256-BV+ON+SavPc0ZUlIk6tlsvmWub8TiYSSJSRutZb1q+g="; + stripRoot = false; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + (python3.withPackages (ps: [ + ps.lxml + ps.numpy + ps.gevent + ps.gevent-websocket + ps.pillow + ps.setuptools + ps.psycopg2 + ])) + ] ++ runtimeProgDeps; + + installPhase = '' + runHook preInstall + + mkdir -p "$out"/{bin,share/${pname}} + cp -r * "$out/share/${pname}" + + # Add missing shebang and execute perms so that patchShebangs can do its + # thing. + sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py" + chmod +x "$out/share/${pname}/bazarr.py" + + makeWrapper "$out/share/${pname}/bazarr.py" \ + "$out/bin/bazarr" \ + --suffix PATH : ${lib.makeBinPath runtimeProgDeps} + + runHook postInstall + ''; + + passthru.tests = { + smoke-test = nixosTests.bazarr; + }; + + meta = with lib; { + description = "Subtitle manager for Sonarr and Radarr"; + homepage = "https://www.bazarr.media/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ d-xo ]; + mainProgram = "bazarr"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 343aa8da9163..8465b19b4b1f 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.2"; + version = "1.5.3"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-Eq66tuRP/+TPLNDQRox8/dMT/7fGGrxmUUML8wJ3v+M="; + hash = "sha256-96BHIOt9vA9sLpR8+XRKi8+h953VWMyAeE04A+4GR2Q="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/bazel/buildtools/default.nix rename to pkgs/by-name/ba/bazel-buildtools/package.nix diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix new file mode 100644 index 000000000000..487e71225679 --- /dev/null +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -0,0 +1,34 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "bazel-gazelle"; + version = "0.39.1"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Y+k8ObfMwN6fLR2+Lwn64xHljDf3kxw2xp0YpJKbrDM="; + }; + + vendorHash = null; + + doCheck = false; + + subPackages = [ "cmd/gazelle" ]; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel-gazelle"; + description = '' + Gazelle is a Bazel build file generator for Bazel projects. It natively + supports Go and protobuf, and it may be extended to support new languages + and custom rule sets. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + mainProgram = "gazelle"; + }; +} diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/by-name/ba/bazel-kazel/package.nix similarity index 100% rename from pkgs/development/tools/bazel-kazel/default.nix rename to pkgs/by-name/ba/bazel-kazel/package.nix diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/by-name/ba/bazel-remote/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix rename to pkgs/by-name/ba/bazel-remote/package.nix diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix new file mode 100644 index 000000000000..eb875a4bb220 --- /dev/null +++ b/pkgs/by-name/ba/bazel-watcher/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + bazel-watcher, + stdenv, +}: + +buildGoModule rec { + pname = "bazel-watcher"; + version = "0.25.3"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel-watcher"; + rev = "v${version}"; + hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM="; + }; + + vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU="; + + # The dependency github.com/fsnotify/fsevents requires CGO + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0"; + ldflags = [ + "-s" + "-X main.Version=${version}" + ]; + + subPackages = [ "cmd/ibazel" ]; + + passthru = { + tests.version = testers.testVersion { + package = bazel-watcher; + command = "ibazel version"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel-watcher"; + description = "Tools for building Bazel targets when source files change"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + mainProgram = "ibazel"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix new file mode 100644 index 000000000000..2afb45ce8ea2 --- /dev/null +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "bazelisk"; + version = "1.22.1"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C5kCCSvIcjZPRXS8ckoHusYCZ4IfsaHeyQC7jLdjZQY="; + }; + + vendorHash = "sha256-q8W+WSOxR/VC0uU8c2PVZwIer2CDUdDQ64AA2K6KghM="; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ]; + + meta = with lib; { + description = "User-friendly launcher for Bazel"; + mainProgram = "bazelisk"; + longDescription = '' + BEWARE: This package does not work on NixOS. + ''; + homepage = "https://github.com/bazelbuild/bazelisk"; + changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ elasticdog ]; + }; +} diff --git a/pkgs/by-name/bb/bb/included-files-updates.diff b/pkgs/by-name/bb/bb/included-files-updates.diff new file mode 100644 index 000000000000..07fa331a96c0 --- /dev/null +++ b/pkgs/by-name/bb/bb/included-files-updates.diff @@ -0,0 +1,145 @@ +diff --git a/bb.c b/bb.c +index 95850ef..6a7cc78 100644 +--- a/bb.c ++++ b/bb.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + #include + #include "bb.h" +diff --git a/credits.c b/credits.c +index 8514579..b304d8c 100644 +--- a/credits.c ++++ b/credits.c +@@ -24,7 +24,6 @@ + #include + #include + #include +-#include + #include + #include "bb.h" + #define STAR 1 +diff --git a/credits2.c b/credits2.c +index 65d2431..9dcdf2d 100644 +--- a/credits2.c ++++ b/credits2.c +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + #include + #include "bb.h" + #define STATE (TIME-starttime) +diff --git a/main.c b/main.c +index ae852a7..c0648b4 100644 +--- a/main.c ++++ b/main.c +@@ -21,6 +21,8 @@ + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include ++#include + #include + #include "timers.h" + #include "bb.h" +diff --git a/messager.c b/messager.c +index 95cc410..5164577 100644 +--- a/messager.c ++++ b/messager.c +@@ -22,7 +22,7 @@ + */ + + #include +-#include ++#include + #include "bb.h" + + static int cursor_x, cursor_y; +diff --git a/scene5.c b/scene5.c +index 8d3c798..4a79258 100644 +--- a/scene5.c ++++ b/scene5.c +@@ -22,7 +22,7 @@ + */ + + #include +-#include ++#include + #include + #include "bb.h" + #include "tex.h" +diff --git a/scene8.c b/scene8.c +index 2bcba1e..72ea231 100644 +--- a/scene8.c ++++ b/scene8.c +@@ -22,7 +22,7 @@ + */ + + #include +-#include ++#include + #include "bb.h" + #define STATE1 (TIME-starttime1) + #define STATE (time-starttime) +diff --git a/textform.c b/textform.c +index 859d367..eb9d1cb 100644 +--- a/textform.c ++++ b/textform.c +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include + #include "bb.h" + #define MAXLINES 10000 +diff --git a/timers.c b/timers.c +index ac822f7..6342c1b 100644 +--- a/timers.c ++++ b/timers.c +@@ -45,12 +45,9 @@ + #include + #endif + /*HAVE_TIME_H*/ +-#include ++#include + #include + #include +-#ifndef _MAC +-#include +-#endif + #ifdef __BEOS__ + #include + #endif +diff --git a/uncompfn.c b/uncompfn.c +index d8eaaea..bc707f8 100644 +--- a/uncompfn.c ++++ b/uncompfn.c +@@ -21,7 +21,7 @@ + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include ++#include + #include + #include "bb.h" + +diff --git a/zoom.c b/zoom.c +index 7450095..4b37b2d 100644 +--- a/zoom.c ++++ b/zoom.c +@@ -31,9 +31,6 @@ + #else + #include + #include +-#ifndef _MAC +-#include +-#endif + #ifdef __DJGPP__ + #include "aconfig.dos" + #else diff --git a/pkgs/by-name/bb/bb/package.nix b/pkgs/by-name/bb/bb/package.nix new file mode 100644 index 000000000000..1c7eedc56570 --- /dev/null +++ b/pkgs/by-name/bb/bb/package.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchurl, autoreconfHook, aalib, ncurses, xorg, libmikmod }: + +stdenv.mkDerivation rec { + pname = "bb"; + version = "1.3rc1"; + + src = fetchurl { + url = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz"; + sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr"; + }; + + patches = [ + # add / update include files to get function prototypes + ./included-files-updates.diff + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ + aalib ncurses libmikmod + xorg.libXau xorg.libXdmcp xorg.libX11 + ]; + + # regparm attribute is not supported by clang + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace config.h \ + --replace-fail "__attribute__ ((regparm(n)))" "" + ''; + + meta = with lib; { + homepage = "http://aa-project.sourceforge.net/bb"; + description = "AA-lib demo"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rnhmjoj ]; + platforms = platforms.unix; + mainProgram = "bb"; + }; +} diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/by-name/bb/bbe/package.nix similarity index 100% rename from pkgs/tools/misc/bbe/default.nix rename to pkgs/by-name/bb/bbe/package.nix diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/by-name/bb/bbin/package.nix similarity index 100% rename from pkgs/development/tools/bbin/default.nix rename to pkgs/by-name/bb/bbin/package.nix diff --git a/pkgs/development/libraries/bc-decaf/default.nix b/pkgs/by-name/bc/bc-decaf/package.nix similarity index 100% rename from pkgs/development/libraries/bc-decaf/default.nix rename to pkgs/by-name/bc/bc-decaf/package.nix diff --git a/pkgs/tools/misc/bc/cross-bc.patch b/pkgs/by-name/bc/bc/cross-bc.patch similarity index 100% rename from pkgs/tools/misc/bc/cross-bc.patch rename to pkgs/by-name/bc/bc/cross-bc.patch diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/by-name/bc/bc/package.nix similarity index 100% rename from pkgs/tools/misc/bc/default.nix rename to pkgs/by-name/bc/bc/package.nix diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/pkgs/by-name/bc/bcache-tools/bcache-udev-modern.patch similarity index 100% rename from pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch rename to pkgs/by-name/bc/bcache-tools/bcache-udev-modern.patch diff --git a/pkgs/tools/filesystems/bcache-tools/fix-static.patch b/pkgs/by-name/bc/bcache-tools/fix-static.patch similarity index 100% rename from pkgs/tools/filesystems/bcache-tools/fix-static.patch rename to pkgs/by-name/bc/bcache-tools/fix-static.patch diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/by-name/bc/bcache-tools/package.nix similarity index 100% rename from pkgs/tools/filesystems/bcache-tools/default.nix rename to pkgs/by-name/bc/bcache-tools/package.nix diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/by-name/bc/bcal/package.nix similarity index 100% rename from pkgs/applications/science/math/bcal/default.nix rename to pkgs/by-name/bc/bcal/package.nix diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/by-name/bc/bcftools/package.nix similarity index 100% rename from pkgs/applications/science/biology/bcftools/default.nix rename to pkgs/by-name/bc/bcftools/package.nix diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/by-name/bc/bcg729/package.nix similarity index 100% rename from pkgs/development/libraries/bcg729/default.nix rename to pkgs/by-name/bc/bcg729/package.nix diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/by-name/bc/bchoppr/package.nix similarity index 100% rename from pkgs/applications/audio/bchoppr/default.nix rename to pkgs/by-name/bc/bchoppr/package.nix diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/by-name/bc/bchunk/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/bchunk/default.nix rename to pkgs/by-name/bc/bchunk/package.nix diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/by-name/bc/bctoolbox/package.nix similarity index 100% rename from pkgs/development/libraries/bctoolbox/default.nix rename to pkgs/by-name/bc/bctoolbox/package.nix diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/by-name/bc/bcunit/package.nix similarity index 100% rename from pkgs/tools/misc/bcunit/default.nix rename to pkgs/by-name/bc/bcunit/package.nix diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/by-name/bd/bdf2psf/package.nix similarity index 100% rename from pkgs/tools/misc/bdf2psf/default.nix rename to pkgs/by-name/bd/bdf2psf/package.nix diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/by-name/bd/bdf2sfd/package.nix similarity index 100% rename from pkgs/tools/misc/bdf2sfd/default.nix rename to pkgs/by-name/bd/bdf2sfd/package.nix diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/by-name/bd/bdfresize/package.nix similarity index 100% rename from pkgs/tools/misc/bdfresize/default.nix rename to pkgs/by-name/bd/bdfresize/package.nix diff --git a/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/pkgs/by-name/bd/bdfresize/remove-malloc-declaration.patch similarity index 100% rename from pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch rename to pkgs/by-name/bd/bdfresize/remove-malloc-declaration.patch diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/by-name/bd/bdsync/package.nix similarity index 100% rename from pkgs/tools/backup/bdsync/default.nix rename to pkgs/by-name/bd/bdsync/package.nix diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix new file mode 100644 index 000000000000..ed65cd8ee86e --- /dev/null +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "beancount-language-server"; + version = "1.3.6"; + + src = fetchFromGitHub { + owner = "polarmutex"; + repo = "beancount-language-server"; + rev = "v${version}"; + hash = "sha256-U23e32Xfa0j+U/CrCZzKjipaA0Yv5szbtTHJWWL52K4="; + }; + + cargoHash = "sha256-OvhG+O+uHHf7e9p3vibrPt9fuGzEqG+l3GGfNwoqXBU="; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/beancount-language-server --help > /dev/null + ''; + + meta = with lib; { + description = "Language Server Protocol (LSP) for beancount files"; + mainProgram = "beancount-language-server"; + homepage = "https://github.com/polarmutex/beancount-language-server"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ polarmutex ]; + }; +} diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/by-name/be/bearer/package.nix similarity index 100% rename from pkgs/development/tools/bearer/default.nix rename to pkgs/by-name/be/bearer/package.nix diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/by-name/be/bearssl/package.nix similarity index 100% rename from pkgs/development/libraries/bearssl/default.nix rename to pkgs/by-name/be/bearssl/package.nix diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/by-name/be/beats/package.nix similarity index 100% rename from pkgs/tools/misc/beats/default.nix rename to pkgs/by-name/be/beats/package.nix diff --git a/pkgs/applications/science/biology/bedops/default.nix b/pkgs/by-name/be/bedops/package.nix similarity index 100% rename from pkgs/applications/science/biology/bedops/default.nix rename to pkgs/by-name/be/bedops/package.nix diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/by-name/be/bedtools/package.nix similarity index 100% rename from pkgs/applications/science/biology/bedtools/default.nix rename to pkgs/by-name/be/bedtools/package.nix diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/by-name/be/beecrypt/package.nix similarity index 100% rename from pkgs/development/libraries/beecrypt/default.nix rename to pkgs/by-name/be/beecrypt/package.nix diff --git a/pkgs/os-specific/linux/beefi/default.nix b/pkgs/by-name/be/beefi/package.nix similarity index 100% rename from pkgs/os-specific/linux/beefi/default.nix rename to pkgs/by-name/be/beefi/package.nix diff --git a/pkgs/misc/beep/default.nix b/pkgs/by-name/be/beep/package.nix similarity index 100% rename from pkgs/misc/beep/default.nix rename to pkgs/by-name/be/beep/package.nix diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/by-name/be/beeper/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/beeper/default.nix rename to pkgs/by-name/be/beeper/package.nix diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/by-name/be/bees/bees-service-wrapper similarity index 100% rename from pkgs/tools/filesystems/bees/bees-service-wrapper rename to pkgs/by-name/be/bees/bees-service-wrapper diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/by-name/be/bees/package.nix similarity index 100% rename from pkgs/tools/filesystems/bees/default.nix rename to pkgs/by-name/be/bees/package.nix diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/by-name/be/behdad-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/behdad-fonts/default.nix rename to pkgs/by-name/be/behdad-fonts/package.nix diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/by-name/be/belcard/package.nix similarity index 100% rename from pkgs/development/libraries/belcard/default.nix rename to pkgs/by-name/be/belcard/package.nix diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/by-name/be/belle-sip/package.nix similarity index 100% rename from pkgs/development/libraries/belle-sip/default.nix rename to pkgs/by-name/be/belle-sip/package.nix diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/by-name/be/below/package.nix similarity index 100% rename from pkgs/os-specific/linux/below/default.nix rename to pkgs/by-name/be/below/package.nix diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/by-name/be/belr/package.nix similarity index 100% rename from pkgs/development/libraries/belr/default.nix rename to pkgs/by-name/be/belr/package.nix diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/by-name/be/beluga/package.nix similarity index 100% rename from pkgs/applications/science/logic/beluga/default.nix rename to pkgs/by-name/be/beluga/package.nix diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/by-name/be/bemenu/package.nix similarity index 100% rename from pkgs/applications/misc/bemenu/default.nix rename to pkgs/by-name/be/bemenu/package.nix diff --git a/pkgs/development/libraries/bencode/default.nix b/pkgs/by-name/be/bencode/package.nix similarity index 100% rename from pkgs/development/libraries/bencode/default.nix rename to pkgs/by-name/be/bencode/package.nix diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/by-name/be/bencodetools/package.nix similarity index 100% rename from pkgs/development/libraries/bencodetools/default.nix rename to pkgs/by-name/be/bencodetools/package.nix diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/by-name/be/benthos/package.nix similarity index 100% rename from pkgs/development/tools/benthos/default.nix rename to pkgs/by-name/be/benthos/package.nix diff --git a/pkgs/tools/video/bento4/libap4.patch b/pkgs/by-name/be/bento4/libap4.patch similarity index 100% rename from pkgs/tools/video/bento4/libap4.patch rename to pkgs/by-name/be/bento4/libap4.patch diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/by-name/be/bento4/package.nix similarity index 100% rename from pkgs/tools/video/bento4/default.nix rename to pkgs/by-name/be/bento4/package.nix diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/by-name/be/bepasty/package.nix similarity index 100% rename from pkgs/tools/misc/bepasty/default.nix rename to pkgs/by-name/be/bepasty/package.nix diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix new file mode 100644 index 000000000000..b541c7fb7f17 --- /dev/null +++ b/pkgs/by-name/be/berglas/package.nix @@ -0,0 +1,61 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, berglas }: + +let + skipTests = { + access = "Access"; + create = "Create"; + delete = "Delete"; + list = "List"; + read = "Read"; + replace = "Replace"; + resolver = "Resolve"; + revoke = "Revoke"; + update = "Update"; + }; + + skipTestsCommand = + builtins.foldl' (acc: goFileName: + let testName = builtins.getAttr goFileName skipTests; in + '' + ${acc} + substituteInPlace pkg/berglas/${goFileName}_test.go \ + --replace "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \ + --replace "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager" + '' + ) "" (builtins.attrNames skipTests); +in + +buildGoModule rec { + pname = "berglas"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aTUMEn/QkPzvAyUvMxyqLl6KWFHs+dQK0VDqYv36AGM="; + }; + + vendorHash = "sha256-n/NOAmOOoZMFZGreUGNgrZ3XGbhmI52KtgakcJ/SJIc="; + + ldflags = [ + "-s" + "-w" + "-X github.com/GoogleCloudPlatform/berglas/v2/internal/version.version=${version}" + ]; + + postPatch = skipTestsCommand; + + passthru.tests = { + version = testers.testVersion { + package = berglas; + }; + }; + + meta = with lib; { + description = "Tool for managing secrets on Google Cloud"; + homepage = "https://github.com/GoogleCloudPlatform/berglas"; + license = licenses.asl20; + mainProgram = "berglas"; + }; +} diff --git a/pkgs/by-name/be/berry/package.nix b/pkgs/by-name/be/berry/package.nix index 9a4e3f64272f..fa12be670cdc 100644 --- a/pkgs/by-name/be/berry/package.nix +++ b/pkgs/by-name/be/berry/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, copyDesktopItems -, fontconfig -, freetype -, libX11 -, libXext -, libXft -, libXinerama -, makeDesktopItem -, pkg-config -, which +{ + lib, + stdenv, + fetchFromGitHub, + copyDesktopItems, + fontconfig, + freetype, + libX11, + libXext, + libXft, + libXinerama, + makeDesktopItem, + pkg-config, + which, }: stdenv.mkDerivation (finalAttrs: { @@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { which ]; - buildInputs =[ + buildInputs = [ libX11 libXext libXft @@ -39,7 +40,10 @@ stdenv.mkDerivation (finalAttrs: { freetype ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; strictDeps = true; @@ -51,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs configure ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_C99_SOURCE"; + desktopItems = [ (makeDesktopItem { name = "berry"; diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/by-name/be/besu/package.nix similarity index 100% rename from pkgs/applications/blockchains/besu/default.nix rename to pkgs/by-name/be/besu/package.nix diff --git a/pkgs/by-name/be/beszel/0001-fix-build.patch b/pkgs/by-name/be/beszel/0001-fix-build.patch new file mode 100644 index 000000000000..ae120cac4fa1 --- /dev/null +++ b/pkgs/by-name/be/beszel/0001-fix-build.patch @@ -0,0 +1,405 @@ +From 402b2d72ad3bcc4a8cdb0115220888154bdb3c39 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 29 Oct 2024 19:32:07 +0800 +Subject: [PATCH] fix build + +--- + package-lock.json | 368 ++++++++++++++++++++++++++++++++++ + 1 file changed, 368 insertions(+) + +diff --git a/package-lock.json b/package-lock.json +index 8e4532e..d3b3605 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -679,6 +679,262 @@ + "node": ">=6.9.0" + } + }, ++ "node_modules/@esbuild/aix-ppc64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", ++ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", ++ "cpu": [ ++ "ppc64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "aix" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/android-arm": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", ++ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", ++ "cpu": [ ++ "arm" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "android" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/android-arm64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", ++ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "android" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/android-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", ++ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "android" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/darwin-arm64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", ++ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/darwin-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", ++ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/freebsd-arm64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", ++ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "freebsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/freebsd-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", ++ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "freebsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-arm": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", ++ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", ++ "cpu": [ ++ "arm" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-arm64": { ++ "version": "0.24.0", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", ++ "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=18" ++ } ++ }, ++ "node_modules/@esbuild/linux-ia32": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", ++ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", ++ "cpu": [ ++ "ia32" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-loong64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", ++ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", ++ "cpu": [ ++ "loong64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-mips64el": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", ++ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", ++ "cpu": [ ++ "mips64el" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-ppc64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", ++ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", ++ "cpu": [ ++ "ppc64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-riscv64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", ++ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", ++ "cpu": [ ++ "riscv64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/linux-s390x": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", ++ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", ++ "cpu": [ ++ "s390x" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, + "node_modules/@esbuild/linux-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", +@@ -695,6 +951,102 @@ + "node": ">=12" + } + }, ++ "node_modules/@esbuild/netbsd-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", ++ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "netbsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/openbsd-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", ++ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "openbsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/sunos-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", ++ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "sunos" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/win32-arm64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", ++ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/win32-ia32": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", ++ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", ++ "cpu": [ ++ "ia32" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/@esbuild/win32-x64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", ++ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, + "node_modules/@floating-ui/core": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.4.tgz", +@@ -3545,6 +3897,22 @@ + "@esbuild/win32-x64": "0.21.5" + } + }, ++ "node_modules/esbuild/node_modules/@esbuild/linux-arm64": { ++ "version": "0.21.5", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", ++ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", +-- +2.46.1 + diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix new file mode 100644 index 000000000000..6a8aa389dabd --- /dev/null +++ b/pkgs/by-name/be/beszel/package.nix @@ -0,0 +1,84 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, + nix-update-script, + buildNpmPackage, + fetchpatch, +}: + +buildGoModule rec { + pname = "beszel"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "henrygd"; + repo = "beszel"; + rev = "refs/tags/v${version}"; + hash = "sha256-x9HU+sDjxRthC4ROJaKbuKHPHgxFSpyn/dywyGWE/v8="; + }; + + webui = buildNpmPackage { + inherit + pname + version + src + meta + ; + + npmFlags = [ "--legacy-peer-deps" ]; + + patches = [ + # add missing @esbuild for multi platform + # https://github.com/henrygd/beszel/pull/235 + # add missing @esbuild for multi platform + # https://github.com/henrygd/beszel/pull/235 + ./0001-fix-build.patch + ]; + + buildPhase = '' + runHook preBuild + + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r dist/* $out + + runHook postInstall + ''; + + sourceRoot = "${src.name}/beszel/site"; + + npmDepsHash = "sha256-t7Qcuvqbt0sPHAu3vcZaU8/Ij2yY5/g1TguozlKu0mU="; + }; + + sourceRoot = "${src.name}/beszel"; + + vendorHash = "sha256-/FePQkqoeuH63mV81v1NxpFw9osMUCcZ1bP+0yN1Qlo="; + + preBuild = '' + mkdir -p site/dist + cp -r ${webui}/* site/dist + ''; + + postInstall = '' + mv $out/bin/agent $out/bin/beszel-agent + mv $out/bin/hub $out/bin/beszel-hub + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/henrygd/beszel"; + changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}"; + description = "Lightweight server monitoring hub with historical data, docker stats, and alerts"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/by-name/be/betaflight-configurator/package.nix similarity index 100% rename from pkgs/applications/science/robotics/betaflight-configurator/default.nix rename to pkgs/by-name/be/betaflight-configurator/package.nix diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix new file mode 100644 index 000000000000..ebd49d4a12cb --- /dev/null +++ b/pkgs/by-name/be/bettercap/package.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, buildGo122Module +, fetchFromGitHub +, pkg-config +, libpcap +, libnfnetlink +, libnetfilter_queue +, libusb1 +}: + +buildGo122Module rec { + pname = "bettercap"; + version = "2.32.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OND8WPqU/95rKykqMAPWmDsJ+AjsjGjrncZ2/m3mpt0="; + }; + + vendorHash = "sha256-QKv8F9QLRi+1Bqj9KywJsTErjs7o6gFM4tJLA8y52MY="; + + doCheck = false; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpcap libusb1 ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnfnetlink libnetfilter_queue ]; + + meta = with lib; { + description = "Man in the middle tool"; + longDescription = '' + BetterCAP is a powerful, flexible and portable tool created to perform various + types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic + in realtime, sniff for credentials and much more. + ''; + homepage = "https://www.bettercap.org/"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ y0no ]; + mainProgram = "bettercap"; + }; +} diff --git a/pkgs/tools/misc/betterdiscord-installer/default.nix b/pkgs/by-name/be/betterdiscord-installer/package.nix similarity index 100% rename from pkgs/tools/misc/betterdiscord-installer/default.nix rename to pkgs/by-name/be/betterdiscord-installer/package.nix diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/by-name/be/betterlockscreen/package.nix similarity index 100% rename from pkgs/misc/screensavers/betterlockscreen/default.nix rename to pkgs/by-name/be/betterlockscreen/package.nix diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/by-name/be/beyond-identity/package.nix similarity index 100% rename from pkgs/tools/security/beyond-identity/default.nix rename to pkgs/by-name/be/beyond-identity/package.nix diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/by-name/bf/bfc/package.nix similarity index 100% rename from pkgs/development/compilers/bfc/default.nix rename to pkgs/by-name/bf/bfc/package.nix diff --git a/pkgs/tools/misc/bfetch/default.nix b/pkgs/by-name/bf/bfetch/package.nix similarity index 100% rename from pkgs/tools/misc/bfetch/default.nix rename to pkgs/by-name/bf/bfetch/package.nix diff --git a/pkgs/applications/version-management/bfg-repo-cleaner/default.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix similarity index 100% rename from pkgs/applications/version-management/bfg-repo-cleaner/default.nix rename to pkgs/by-name/bf/bfg-repo-cleaner/package.nix diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/by-name/bf/bfr/package.nix similarity index 100% rename from pkgs/tools/misc/bfr/default.nix rename to pkgs/by-name/bf/bfr/package.nix diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/by-name/bf/bfs/package.nix similarity index 100% rename from pkgs/tools/system/bfs/default.nix rename to pkgs/by-name/bf/bfs/package.nix diff --git a/pkgs/tools/misc/bfscripts/default.nix b/pkgs/by-name/bf/bfscripts/package.nix similarity index 100% rename from pkgs/tools/misc/bfscripts/default.nix rename to pkgs/by-name/bf/bfscripts/package.nix diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/by-name/bf/bftools/package.nix similarity index 100% rename from pkgs/applications/science/biology/bftools/default.nix rename to pkgs/by-name/bf/bftools/package.nix diff --git a/pkgs/by-name/bf/bftpd/package.nix b/pkgs/by-name/bf/bftpd/package.nix new file mode 100644 index 000000000000..b244bec5fddc --- /dev/null +++ b/pkgs/by-name/bf/bftpd/package.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchurl, libxcrypt }: + +stdenv.mkDerivation rec { + pname = "bftpd"; + version = "6.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI="; + }; + + # utmp has been replaced by utmpx since Mac OS X 10.6 (Snow Leopard): + # + # https://stackoverflow.com/a/37913019 + # + # bftpd does not have support for this, so disable it. + # + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + for file in login.*; do + substituteInPlace $file --replace-fail "#ifdef HAVE_UTMP_H" "#if 0" + done + ''; + + buildInputs = [ libxcrypt ]; + + CFLAGS = "-std=gnu89"; + + preConfigure = '' + sed -re 's/-[og] 0//g' -i Makefile* + ''; + + postInstall = '' + mkdir -p $out/share/doc/${pname} + mv $out/etc/*.conf $out/share/doc/${pname} + rm -rf $out/{etc,var} + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Minimal ftp server"; + mainProgram = "bftpd"; + downloadPage = "http://bftpd.sf.net/download.html"; + homepage = "http://bftpd.sf.net/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/by-name/bg/bgnet/package.nix similarity index 100% rename from pkgs/data/documentation/bgnet/default.nix rename to pkgs/by-name/bg/bgnet/package.nix diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/by-name/bg/bgpdump/package.nix similarity index 100% rename from pkgs/tools/networking/bgpdump/default.nix rename to pkgs/by-name/bg/bgpdump/package.nix diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/by-name/bg/bgpq3/package.nix similarity index 100% rename from pkgs/tools/networking/bgpq3/default.nix rename to pkgs/by-name/bg/bgpq3/package.nix diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/by-name/bg/bgpq4/package.nix similarity index 100% rename from pkgs/tools/networking/bgpq4/default.nix rename to pkgs/by-name/bg/bgpq4/package.nix diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/by-name/bg/bgs/package.nix similarity index 100% rename from pkgs/tools/X11/bgs/default.nix rename to pkgs/by-name/bg/bgs/package.nix diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/by-name/bi/bibclean/package.nix similarity index 100% rename from pkgs/tools/typesetting/bibclean/default.nix rename to pkgs/by-name/bi/bibclean/package.nix diff --git a/pkgs/tools/typesetting/biber-ms/default.nix b/pkgs/by-name/bi/biber-ms/package.nix similarity index 100% rename from pkgs/tools/typesetting/biber-ms/default.nix rename to pkgs/by-name/bi/biber-ms/package.nix diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/by-name/bi/biber/package.nix similarity index 100% rename from pkgs/tools/typesetting/biber/default.nix rename to pkgs/by-name/bi/biber/package.nix diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/by-name/bi/biblatex-check/package.nix similarity index 100% rename from pkgs/tools/typesetting/biblatex-check/default.nix rename to pkgs/by-name/bi/biblatex-check/package.nix diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/pkgs/by-name/bi/biboumi/catch.patch similarity index 100% rename from pkgs/servers/xmpp/biboumi/catch.patch rename to pkgs/by-name/bi/biboumi/catch.patch diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/by-name/bi/biboumi/package.nix similarity index 100% rename from pkgs/servers/xmpp/biboumi/default.nix rename to pkgs/by-name/bi/biboumi/package.nix diff --git a/pkgs/tools/typesetting/bibtex-tidy/default.nix b/pkgs/by-name/bi/bibtex-tidy/package.nix similarity index 100% rename from pkgs/tools/typesetting/bibtex-tidy/default.nix rename to pkgs/by-name/bi/bibtex-tidy/package.nix diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/by-name/bi/bibtex2html/package.nix similarity index 100% rename from pkgs/tools/misc/bibtex2html/default.nix rename to pkgs/by-name/bi/bibtex2html/package.nix diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/by-name/bi/bibtool/package.nix similarity index 100% rename from pkgs/tools/misc/bibtool/default.nix rename to pkgs/by-name/bi/bibtool/package.nix diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/by-name/bi/bibutils/package.nix similarity index 100% rename from pkgs/tools/misc/bibutils/default.nix rename to pkgs/by-name/bi/bibutils/package.nix diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/by-name/bi/bic/package.nix similarity index 100% rename from pkgs/development/interpreters/bic/default.nix rename to pkgs/by-name/bi/bic/package.nix diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/by-name/bi/bicgl/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bicgl/default.nix rename to pkgs/by-name/bi/bicgl/package.nix diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/by-name/bi/bicon/package.nix similarity index 100% rename from pkgs/applications/misc/bicon/default.nix rename to pkgs/by-name/bi/bicon/package.nix diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/by-name/bi/bicpl/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bicpl/default.nix rename to pkgs/by-name/bi/bicpl/package.nix diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/by-name/bi/bigloo/package.nix similarity index 100% rename from pkgs/development/compilers/bigloo/default.nix rename to pkgs/by-name/bi/bigloo/package.nix diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/by-name/bi/bililiverecorder/package.nix similarity index 100% rename from pkgs/servers/bililiverecorder/default.nix rename to pkgs/by-name/bi/bililiverecorder/package.nix diff --git a/pkgs/development/tools/bin2c/default.nix b/pkgs/by-name/bi/bin2c/package.nix similarity index 100% rename from pkgs/development/tools/bin2c/default.nix rename to pkgs/by-name/bi/bin2c/package.nix diff --git a/pkgs/tools/security/binbloom/default.nix b/pkgs/by-name/bi/binbloom/package.nix similarity index 100% rename from pkgs/tools/security/binbloom/default.nix rename to pkgs/by-name/bi/binbloom/package.nix diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/by-name/bi/bind/dont-keep-configure-flags.patch similarity index 100% rename from pkgs/servers/dns/bind/dont-keep-configure-flags.patch rename to pkgs/by-name/bi/bind/dont-keep-configure-flags.patch diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/by-name/bi/bind/package.nix similarity index 100% rename from pkgs/servers/dns/bind/default.nix rename to pkgs/by-name/bi/bind/package.nix diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/by-name/bi/bindfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/bindfs/default.nix rename to pkgs/by-name/bi/bindfs/package.nix diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/by-name/bi/bingrep/package.nix similarity index 100% rename from pkgs/development/tools/analysis/bingrep/default.nix rename to pkgs/by-name/bi/bingrep/package.nix diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index 02d29d61ee6d..74b5b0e38e42 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "binsider"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "orhun"; repo = "binsider"; rev = "v${version}"; - hash = "sha256-VnWLslelEAXuSy7XnxrdgSkXqTrd+Ni7lQFsB2P+ILs="; + hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs="; }; - cargoHash = "sha256-eBZ7zUOucarzdxTjHecUxGqUsKTQPaaotOfs/v0MxHk="; + cargoHash = "sha256-EGqoHMkBPIhKV/PozArQ62bH/Gqc92S6ZabTjmIbQeE="; buildNoDefaultFeatures = !stdenv.isLinux; diff --git a/pkgs/applications/science/biology/bioawk/default.nix b/pkgs/by-name/bi/bioawk/package.nix similarity index 100% rename from pkgs/applications/science/biology/bioawk/default.nix rename to pkgs/by-name/bi/bioawk/package.nix diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/by-name/bi/biodiff/package.nix similarity index 100% rename from pkgs/development/tools/biodiff/default.nix rename to pkgs/by-name/bi/biodiff/package.nix diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 6fe531b2df0d..993e087d6dec 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -6,8 +6,6 @@ libgit2, rust-jemalloc-sys, zlib, - stdenv, - darwin, git, }: rustPlatform.buildRustPackage rec { @@ -23,23 +21,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4vITbsXfgNFoeWMHz7a9Rk7FrsEZRe75nHiyHSMujEQ="; - nativeBuildInputs = [ - pkg-config + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libgit2 + rust-jemalloc-sys + zlib ]; - buildInputs = - [ - libgit2 - rust-jemalloc-sys - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ - git - ]; + nativeCheckInputs = [ git ]; cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = diff --git a/pkgs/tools/networking/biosdevname/makefile.patch b/pkgs/by-name/bi/biosdevname/makefile.patch similarity index 100% rename from pkgs/tools/networking/biosdevname/makefile.patch rename to pkgs/by-name/bi/biosdevname/makefile.patch diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/by-name/bi/biosdevname/package.nix similarity index 100% rename from pkgs/tools/networking/biosdevname/default.nix rename to pkgs/by-name/bi/biosdevname/package.nix diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/by-name/bi/bip/package.nix similarity index 100% rename from pkgs/applications/networking/irc/bip/default.nix rename to pkgs/by-name/bi/bip/package.nix diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/by-name/bi/bird-lg/package.nix similarity index 100% rename from pkgs/servers/bird-lg/default.nix rename to pkgs/by-name/bi/bird-lg/package.nix diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/by-name/bi/bird/dont-create-sysconfdir-2.patch similarity index 100% rename from pkgs/servers/bird/dont-create-sysconfdir-2.patch rename to pkgs/by-name/bi/bird/dont-create-sysconfdir-2.patch diff --git a/pkgs/servers/bird/default.nix b/pkgs/by-name/bi/bird/package.nix similarity index 100% rename from pkgs/servers/bird/default.nix rename to pkgs/by-name/bi/bird/package.nix diff --git a/pkgs/by-name/bi/birdwatcher/package.nix b/pkgs/by-name/bi/birdwatcher/package.nix new file mode 100644 index 000000000000..9e2d04f2f7e1 --- /dev/null +++ b/pkgs/by-name/bi/birdwatcher/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + nixosTests, + gitUpdater, +}: + +buildGoModule rec { + pname = "birdwatcher"; + version = "2.2.5"; + + vendorHash = "sha256-NTD2pnA/GeTn4tXtIFJ227qjRtvBFCjWYZv59Rumc74="; + + src = fetchFromGitHub { + owner = "alice-lg"; + repo = "birdwatcher"; + rev = version; + hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw="; + }; + + deleteVendor = true; + + passthru = { + tests = { + inherit (nixosTests) birdwatcher; + }; + + updateScript = gitUpdater { }; + }; + + meta = { + homepage = "https://github.com/alice-lg/birdwatcher"; + 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 = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ stv0g ]; + mainProgram = "birdwatcher"; + }; +} diff --git a/pkgs/tools/security/biscuit-cli/default.nix b/pkgs/by-name/bi/biscuit-cli/package.nix similarity index 100% rename from pkgs/tools/security/biscuit-cli/default.nix rename to pkgs/by-name/bi/biscuit-cli/package.nix diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/by-name/bi/bison/package.nix similarity index 100% rename from pkgs/development/tools/parsing/bison/default.nix rename to pkgs/by-name/bi/bison/package.nix diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/by-name/bi/bisoncpp/package.nix similarity index 100% rename from pkgs/development/tools/parsing/bisonc++/default.nix rename to pkgs/by-name/bi/bisoncpp/package.nix diff --git a/pkgs/applications/version-management/bit/default.nix b/pkgs/by-name/bi/bit/package.nix similarity index 100% rename from pkgs/applications/version-management/bit/default.nix rename to pkgs/by-name/bi/bit/package.nix diff --git a/pkgs/by-name/bi/bitbake-language-server/package.nix b/pkgs/by-name/bi/bitbake-language-server/package.nix index 3789d3bd9ba2..fe19310ab29d 100644 --- a/pkgs/by-name/bi/bitbake-language-server/package.nix +++ b/pkgs/by-name/bi/bitbake-language-server/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "bitbake-language-server"; - version = "0.0.14"; + version = "0.0.15"; format = "pyproject"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = pname; rev = version; - hash = "sha256-aGj9lW420A+iTQWSCdIITAJj3p89VUkPvdhQ/0M6uXo="; + hash = "sha256-NLDQ2P5peweugkoNYskpCyCEgBwVFA7RTs8+NvH8fj8="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/by-name/bi/bitlbee-discord/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix rename to pkgs/by-name/bi/bitlbee-discord/package.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/by-name/bi/bitlbee-facebook/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix rename to pkgs/by-name/bi/bitlbee-facebook/package.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/by-name/bi/bitlbee-mastodon/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix rename to pkgs/by-name/bi/bitlbee-mastodon/package.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/by-name/bi/bitlbee-steam/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix rename to pkgs/by-name/bi/bitlbee-steam/package.nix diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/by-name/bi/bitmeter/package.nix similarity index 100% rename from pkgs/applications/audio/bitmeter/default.nix rename to pkgs/by-name/bi/bitmeter/package.nix diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index bd023bcb76c8..ce31c0fdd96c 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -127,7 +127,7 @@ in buildNpmPackage rec { postBuild = '' pushd apps/desktop - # desktop_native/index.js loads a file of that name regarldess of the libc being used + # desktop_native/index.js loads a file of that name regardless of the libc being used mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-${bitwardenDesktopNativeArch}-musl.node npm exec electron-builder -- \ @@ -148,17 +148,14 @@ in buildNpmPackage rec { "--skip=password::password::tests::test" ]; - checkPhase = '' - runHook preCheck + preCheck = '' + pushd ${cargoRoot} + cargoCheckType=release + HOME=$(mktemp -d) + ''; - ( - cd ${cargoRoot} - HOME=$(mktemp -d) - cargoCheckType=release - cargoCheckHook - ) - - runHook postCheck + postCheck = '' + popd ''; installPhase = '' diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/by-name/bi/bitwise/package.nix similarity index 100% rename from pkgs/tools/misc/bitwise/default.nix rename to pkgs/by-name/bi/bitwise/package.nix diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/by-name/bi/bitwuzla/package.nix similarity index 100% rename from pkgs/applications/science/logic/bitwuzla/default.nix rename to pkgs/by-name/bi/bitwuzla/package.nix diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/by-name/bj/bjumblr/package.nix similarity index 100% rename from pkgs/applications/audio/bjumblr/default.nix rename to pkgs/by-name/bj/bjumblr/package.nix diff --git a/pkgs/tools/security/bkcrack/default.nix b/pkgs/by-name/bk/bkcrack/package.nix similarity index 100% rename from pkgs/tools/security/bkcrack/default.nix rename to pkgs/by-name/bk/bkcrack/package.nix diff --git a/pkgs/applications/misc/bklk/default.nix b/pkgs/by-name/bk/bklk/package.nix similarity index 100% rename from pkgs/applications/misc/bklk/default.nix rename to pkgs/by-name/bk/bklk/package.nix diff --git a/pkgs/tools/misc/bkt/default.nix b/pkgs/by-name/bk/bkt/package.nix similarity index 100% rename from pkgs/tools/misc/bkt/default.nix rename to pkgs/by-name/bk/bkt/package.nix diff --git a/pkgs/tools/misc/bkyml/default.nix b/pkgs/by-name/bk/bkyml/package.nix similarity index 100% rename from pkgs/tools/misc/bkyml/default.nix rename to pkgs/by-name/bk/bkyml/package.nix diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/by-name/bl/blackbird/package.nix similarity index 100% rename from pkgs/data/themes/blackbird/default.nix rename to pkgs/by-name/bl/blackbird/package.nix diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/by-name/bl/blackbox-terminal/marble.nix similarity index 100% rename from pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix rename to pkgs/by-name/bl/blackbox-terminal/marble.nix diff --git a/pkgs/by-name/bl/blackbox-terminal/package.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix new file mode 100644 index 000000000000..2aa523987623 --- /dev/null +++ b/pkgs/by-name/bl/blackbox-terminal/package.nix @@ -0,0 +1,103 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, meson +, ninja +, pkg-config +, vala +, gtk4 +, vte-gtk4 +, json-glib +, sassc +, libadwaita +, pcre2 +, libsixel +, libxml2 +, librsvg +, libgee +, callPackage +, python3 +, desktop-file-utils +, wrapGAppsHook4 +, sixelSupport ? false +}: + +let + marble = callPackage ./marble.nix { }; +in +stdenv.mkDerivation rec { + pname = "blackbox"; + version = "0.14.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "blackbox"; + rev = "v${version}"; + hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw="; + }; + + patches = [ + # Fix closing confirmation dialogs not showing + (fetchpatch { + url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch"; + hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A="; + }) + ]; + + postPatch = '' + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + sassc + wrapGAppsHook4 + python3 + desktop-file-utils # For update-desktop-database + ]; + buildInputs = [ + gtk4 + (vte-gtk4.overrideAttrs (old: { + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "vte"; + rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; + hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; + }; + patches = lib.optional (old ? patches) (lib.head old.patches); + postPatch = (old.postPatch or "") + '' + patchShebangs src/box_drawing_generate.sh + ''; + } // lib.optionalAttrs sixelSupport { + buildInputs = old.buildInputs ++ [ libsixel ]; + mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; + })) + json-glib + marble + libadwaita + pcre2 + libxml2 + librsvg + libgee + ]; + + mesonFlags = [ "-Dblackbox_is_flatpak=false" ]; + + meta = with lib; { + description = "Beautiful GTK 4 terminal"; + mainProgram = "blackbox"; + homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; + changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu linsui ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/embedded/blackmagic/helper.sh b/pkgs/by-name/bl/blackmagic/helper.sh similarity index 100% rename from pkgs/development/embedded/blackmagic/helper.sh rename to pkgs/by-name/bl/blackmagic/helper.sh diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/by-name/bl/blackmagic/package.nix similarity index 100% rename from pkgs/development/embedded/blackmagic/default.nix rename to pkgs/by-name/bl/blackmagic/package.nix diff --git a/pkgs/data/fonts/blackout/default.nix b/pkgs/by-name/bl/blackout/package.nix similarity index 100% rename from pkgs/data/fonts/blackout/default.nix rename to pkgs/by-name/bl/blackout/package.nix diff --git a/pkgs/games/blackshades/default.nix b/pkgs/by-name/bl/blackshades/package.nix similarity index 100% rename from pkgs/games/blackshades/default.nix rename to pkgs/by-name/bl/blackshades/package.nix diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/by-name/bl/blahaj/package.nix similarity index 100% rename from pkgs/tools/misc/blahaj/default.nix rename to pkgs/by-name/bl/blahaj/package.nix diff --git a/pkgs/tools/typesetting/tex/blahtexml/default.nix b/pkgs/by-name/bl/blahtexml/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/blahtexml/default.nix rename to pkgs/by-name/bl/blahtexml/package.nix diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/by-name/bl/blas-reference/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/blas/default.nix rename to pkgs/by-name/bl/blas-reference/package.nix diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/by-name/bl/blas/package.nix similarity index 100% rename from pkgs/build-support/alternatives/blas/default.nix rename to pkgs/by-name/bl/blas/package.nix diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/by-name/bl/blaze/package.nix similarity index 100% rename from pkgs/development/libraries/blaze/default.nix rename to pkgs/by-name/bl/blaze/package.nix diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/by-name/bl/bleachbit/package.nix similarity index 100% rename from pkgs/applications/misc/bleachbit/default.nix rename to pkgs/by-name/bl/bleachbit/package.nix diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index 4eeabc18efaf..26b00115c2a2 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -64,7 +64,7 @@ buildDotnetModule rec { ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) fontconfig openssl libkrb5 diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/by-name/bl/blesh/package.nix similarity index 100% rename from pkgs/shells/bash/blesh/default.nix rename to pkgs/by-name/bl/blesh/package.nix diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/by-name/bl/blflash/package.nix similarity index 100% rename from pkgs/tools/misc/blflash/default.nix rename to pkgs/by-name/bl/blflash/package.nix diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/by-name/bl/blink1-tool/package.nix similarity index 100% rename from pkgs/tools/misc/blink1-tool/default.nix rename to pkgs/by-name/bl/blink1-tool/package.nix diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/by-name/bl/blis/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/blis/default.nix rename to pkgs/by-name/bl/blis/package.nix diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/by-name/bl/bliss/package.nix similarity index 100% rename from pkgs/applications/science/math/bliss/default.nix rename to pkgs/by-name/bl/bliss/package.nix diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/by-name/bl/blitz/package.nix similarity index 100% rename from pkgs/development/libraries/blitz/default.nix rename to pkgs/by-name/bl/blitz/package.nix diff --git a/pkgs/by-name/bl/blivet-gui/package.nix b/pkgs/by-name/bl/blivet-gui/package.nix new file mode 100644 index 000000000000..efe4fe2de785 --- /dev/null +++ b/pkgs/by-name/bl/blivet-gui/package.nix @@ -0,0 +1,73 @@ +# Notes for using this package outside of NixOS: +# 1. --pure cannot be used (as pkexec will be used from the path, +# and we can't use nixpkgs polkit due to lack of setuid bit) +# 2. You must prefix the blivet-gui command with "SHELL=/bin/bash" +# (otherwise your system polkit will reject the SHEL Lfrom nixpkgs). + +{ + lib, + python3, + fetchFromGitHub, + gtk3, + util-linux, + gobject-introspection, + adwaita-icon-theme, + hicolor-icon-theme, + wrapGAppsHook3, + pkexecPath ? "pkexec", + testers, + blivet-gui, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "blivet-gui"; + version = "2.5.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet-gui"; + rev = version; + hash = "sha256-fKd2Vj8clZ6Q7bZipfN5umyMW2rBXMUnpAuDE70p67U="; + }; + + postPatch = '' + substituteInPlace blivetgui/gui_utils.py --replace-fail /usr/share $out/share + substituteInPlace blivet-gui --replace-fail "pkexec blivet-gui-daemon" "pkexec $out/bin/blivet-gui-daemon" + substituteInPlace blivet-gui --replace-fail "pkexec" "${pkexecPath}" + ''; + + nativeBuildInputs = [ + util-linux + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ gtk3 ]; + + dependencies = [ + python3.pkgs.blivet + python3.pkgs.pyparted + python3.pkgs.pid + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share + ) + ''; + + passthru.tests.version = testers.testVersion { package = blivet-gui; }; + + meta = { + description = "GUI tool for storage configuration using blivet library"; + homepage = "https://fedoraproject.org/wiki/Blivet"; + license = lib.licenses.gpl2Plus; + mainProgram = "blivet-gui"; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/by-name/bl/blktrace/package.nix similarity index 100% rename from pkgs/os-specific/linux/blktrace/default.nix rename to pkgs/by-name/bl/blktrace/package.nix diff --git a/pkgs/servers/bloat/default.nix b/pkgs/by-name/bl/bloat/package.nix similarity index 100% rename from pkgs/servers/bloat/default.nix rename to pkgs/by-name/bl/bloat/package.nix diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/by-name/bl/blobby/blobby.sh similarity index 100% rename from pkgs/games/blobby/blobby.sh rename to pkgs/by-name/bl/blobby/blobby.sh diff --git a/pkgs/games/blobby/default.nix b/pkgs/by-name/bl/blobby/package.nix similarity index 100% rename from pkgs/games/blobby/default.nix rename to pkgs/by-name/bl/blobby/package.nix diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/by-name/bl/blobfuse/package.nix similarity index 100% rename from pkgs/tools/filesystems/blobfuse/default.nix rename to pkgs/by-name/bl/blobfuse/package.nix diff --git a/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch b/pkgs/by-name/bl/blobwars/blobwars-2.00-glibc-2.38.patch similarity index 100% rename from pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch rename to pkgs/by-name/bl/blobwars/blobwars-2.00-glibc-2.38.patch diff --git a/pkgs/games/blobwars/default.nix b/pkgs/by-name/bl/blobwars/package.nix similarity index 100% rename from pkgs/games/blobwars/default.nix rename to pkgs/by-name/bl/blobwars/package.nix diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix new file mode 100644 index 000000000000..2dfde248b9b9 --- /dev/null +++ b/pkgs/by-name/bl/blockbook/package.nix @@ -0,0 +1,81 @@ +{ lib +, buildGoModule +, bzip2 +, fetchFromGitHub +, lz4 +, nixosTests +, pkg-config +, rocksdb_7_10 +, snappy +, stdenv +, zeromq +, zlib +}: + +let + rocksdb = rocksdb_7_10; +in +buildGoModule rec { + pname = "blockbook"; + version = "0.4.0"; + commit = "b227dfe"; + + src = fetchFromGitHub { + owner = "trezor"; + repo = "blockbook"; + rev = "v${version}"; + hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE="; + }; + + proxyVendor = true; + + vendorHash = "sha256-n03eWWy+58KAbYnKxI3/ulWIpmR+ivtImQSqbe2kpYU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; + + ldflags = [ + "-X github.com/trezor/blockbook/common.version=${version}" + "-X github.com/trezor/blockbook/common.gitcommit=${commit}" + "-X github.com/trezor/blockbook/common.buildDate=unknown" + ]; + + tags = [ "rocksdb_7_10" ]; + + CGO_LDFLAGS = [ + "-L${lib.getLib stdenv.cc.cc}/lib" + "-lrocksdb" + "-lz" + "-lbz2" + "-lsnappy" + "-llz4" + "-lm" + "-lstdc++" + ]; + + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + ulimit -n 8192 + ''; + + subPackages = [ "." ]; + + postInstall = '' + mkdir -p $out/share/ + cp -r $src/static/templates/ $out/share/ + cp -r $src/static/css/ $out/share/ + ''; + + passthru.tests = { + smoke-test = nixosTests.blockbook-frontend; + }; + + meta = with lib; { + description = "Trezor address/account balance backend"; + homepage = "https://github.com/trezor/blockbook"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ mmahut _1000101 ]; + platforms = platforms.unix; + mainProgram = "blockbook"; + }; +} diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/by-name/bl/blockhash/package.nix similarity index 100% rename from pkgs/tools/graphics/blockhash/default.nix rename to pkgs/by-name/bl/blockhash/package.nix diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/by-name/bl/blocky/package.nix similarity index 100% rename from pkgs/applications/networking/blocky/default.nix rename to pkgs/by-name/bl/blocky/package.nix diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/by-name/bl/blogc/package.nix similarity index 100% rename from pkgs/applications/misc/blogc/default.nix rename to pkgs/by-name/bl/blogc/package.nix diff --git a/pkgs/by-name/bl/bloodhound/package.nix b/pkgs/by-name/bl/bloodhound/package.nix new file mode 100644 index 000000000000..f4e67ecacf12 --- /dev/null +++ b/pkgs/by-name/bl/bloodhound/package.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, fetchzip +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libGL +, libappindicator-gtk3 +, libdrm +, libnotify +, libpulseaudio +, libuuid +, libxcb +, libxkbcommon +, libxshmfence +, mesa +, nspr +, nss +, pango +, systemd +, udev +, unzip +, xdg-utils +, xorg +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bloodhound"; + version = "4.3.1"; + + src = fetchzip { + url = "https://github.com/BloodHoundAD/BloodHound/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip"; + hash = "sha256-gGfZ5Mj8rmz3dwKyOitRExkgOmSVDOqKpPxvGlE4izw="; + }; + + rpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libGL + libappindicator-gtk3 + libdrm + libnotify + libpulseaudio + libuuid + libxcb + libxkbcommon + mesa + nspr + nss + pango + systemd + (lib.getLib stdenv.cc.cc) + udev + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + xorg.libxshmfence + ]; + + buildInputs = [ + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ makeWrapper unzip ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,/lib/BloodHound} + mv * $out/lib/BloodHound + chmod +x $out/lib/BloodHound/BloodHound + + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/lib/BloodHound/BloodHound --set-rpath ${finalAttrs.rpath}:$out/lib/BloodHound \ + --add-needed libudev.so # Needed to fix trace trap (core dump) + + makeWrapper $out/lib/BloodHound/BloodHound $out/bin/BloodHound \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ + --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ + --append-flags "--in-process-gpu" # fix for sandbox issues + + runHook postInstall + ''; + + meta = with lib; { + description = "Active Directory reconnaissance and attack path management tool"; + homepage = "https://github.com/BloodHoundAD/BloodHound"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + changelog = "https://github.com/BloodHoundAD/BloodHound/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://github.com/BloodHoundAD/BloodHound/releases"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ akechishiro ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "BloodHound"; + }; +}) diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/by-name/bl/bloomrpc/package.nix similarity index 100% rename from pkgs/development/web/bloomrpc/default.nix rename to pkgs/by-name/bl/bloomrpc/package.nix diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix new file mode 100644 index 000000000000..fd634380491a --- /dev/null +++ b/pkgs/by-name/bl/bloop/package.nix @@ -0,0 +1,75 @@ +{ stdenv +, fetchurl +, autoPatchelfHook +, installShellFiles +, makeWrapper +, jre +, lib +, zlib +}: + +stdenv.mkDerivation rec { + pname = "bloop"; + version = "2.0.5"; + + platform = + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "x86_64-pc-linux" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "x86_64-apple-darwin" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "aarch64-apple-darwin" + else throw "unsupported platform"; + + bloop-bash = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; + sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; + }; + + bloop-fish = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; + sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; + }; + + bloop-zsh = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; + sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; + }; + + bloop-binary = fetchurl rec { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; + sha256 = + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-COsGPMCsl3hTcw9JOZ6/LnQAhsNCXMvC0sDLqhHrY1o=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-oXfdHIvmEtjh+Ohpu8R2VbrR+YbEQKI6l2cYiG/kQnk=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-+C8uY1TsqCy0Ml7GBovjGN4rAzkTqRSv5M0EI0l2tds=" + else throw "unsupported platform"; + }; + + dontUnpack = true; + nativeBuildInputs = [ installShellFiles makeWrapper ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + buildInputs = [ (lib.getLib stdenv.cc.cc) zlib ]; + propagatedBuildInputs = [ jre ]; + + installPhase = '' + runHook preInstall + + install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped + + makeWrapper $out/.bloop-wrapped $out/bin/bloop + + #Install completions + installShellCompletion --name bloop --bash ${bloop-bash} + installShellCompletion --name _bloop --zsh ${bloop-zsh} + installShellCompletion --name bloop.fish --fish ${bloop-fish} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://scalacenter.github.io/bloop/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.asl20; + description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; + mainProgram = "bloop"; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + maintainers = with maintainers; [ agilesteel kubukoz tomahna ]; + }; +} diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/by-name/bl/blst/package.nix similarity index 100% rename from pkgs/development/libraries/blst/default.nix rename to pkgs/by-name/bl/blst/package.nix diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/by-name/bl/blueberry/package.nix similarity index 100% rename from pkgs/tools/bluetooth/blueberry/default.nix rename to pkgs/by-name/bl/blueberry/package.nix diff --git a/pkgs/applications/networking/mailreaders/bluemail/default.nix b/pkgs/by-name/bl/bluemail/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/bluemail/default.nix rename to pkgs/by-name/bl/bluemail/package.nix diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/by-name/bl/blueman/package.nix similarity index 100% rename from pkgs/tools/bluetooth/blueman/default.nix rename to pkgs/by-name/bl/blueman/package.nix diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/by-name/bl/bluemix-cli/package.nix similarity index 100% rename from pkgs/tools/admin/bluemix-cli/default.nix rename to pkgs/by-name/bl/bluemix-cli/package.nix diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix index 9e3be68154b7..ac149c1ce743 100644 --- a/pkgs/by-name/bl/blueutil/package.nix +++ b/pkgs/by-name/bl/blueutil/package.nix @@ -2,14 +2,10 @@ lib, stdenv, fetchFromGitHub, - darwin, testers, nix-update-script, }: -let - inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; -in stdenv.mkDerivation (finalAttrs: { pname = "blueutil"; version = "2.10.0"; @@ -21,11 +17,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-x2khx8Y0PolpMiyrBatT2aHHyacrQVU/02Z4Dz9fBtI="; }; - buildInputs = [ - Foundation - IOBluetooth - ]; - env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth"; installPhase = '' diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/by-name/bl/bluewalker/package.nix similarity index 100% rename from pkgs/tools/bluetooth/bluewalker/default.nix rename to pkgs/by-name/bl/bluewalker/package.nix diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/by-name/bl/blugon/package.nix similarity index 100% rename from pkgs/applications/misc/blugon/default.nix rename to pkgs/by-name/bl/blugon/package.nix diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/by-name/bl/blur-effect/package.nix similarity index 100% rename from pkgs/tools/graphics/blur-effect/default.nix rename to pkgs/by-name/bl/blur-effect/package.nix diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/by-name/bm/bmon/package.nix similarity index 100% rename from pkgs/tools/misc/bmon/default.nix rename to pkgs/by-name/bm/bmon/package.nix diff --git a/pkgs/development/web/boa/default.nix b/pkgs/by-name/bo/boa/package.nix similarity index 100% rename from pkgs/development/web/boa/default.nix rename to pkgs/by-name/bo/boa/package.nix diff --git a/pkgs/applications/misc/boatswain/default.nix b/pkgs/by-name/bo/boatswain/package.nix similarity index 100% rename from pkgs/applications/misc/boatswain/default.nix rename to pkgs/by-name/bo/boatswain/package.nix diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/by-name/bo/bob/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/bob/default.nix rename to pkgs/by-name/bo/bob/package.nix diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/by-name/bo/boca/package.nix similarity index 100% rename from pkgs/development/libraries/boca/default.nix rename to pkgs/by-name/bo/boca/package.nix diff --git a/pkgs/development/tools/bodyclose/default.nix b/pkgs/by-name/bo/bodyclose/package.nix similarity index 100% rename from pkgs/development/tools/bodyclose/default.nix rename to pkgs/by-name/bo/bodyclose/package.nix diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/by-name/bo/bogofilter/package.nix similarity index 100% rename from pkgs/tools/misc/bogofilter/default.nix rename to pkgs/by-name/bo/bogofilter/package.nix diff --git a/pkgs/applications/audio/bolliedelayxt.lv2/default.nix b/pkgs/by-name/bo/bolliedelayxt-lv2/package.nix similarity index 100% rename from pkgs/applications/audio/bolliedelayxt.lv2/default.nix rename to pkgs/by-name/bo/bolliedelayxt-lv2/package.nix diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch similarity index 100% rename from pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch rename to pkgs/by-name/bo/bolt/0001-skip-mkdir.patch diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/by-name/bo/bolt/package.nix similarity index 100% rename from pkgs/os-specific/linux/bolt/default.nix rename to pkgs/by-name/bo/bolt/package.nix diff --git a/pkgs/tools/misc/boltbrowser/default.nix b/pkgs/by-name/bo/boltbrowser/package.nix similarity index 100% rename from pkgs/tools/misc/boltbrowser/default.nix rename to pkgs/by-name/bo/boltbrowser/package.nix diff --git a/pkgs/tools/admin/bom/default.nix b/pkgs/by-name/bo/bom/package.nix similarity index 100% rename from pkgs/tools/admin/bom/default.nix rename to pkgs/by-name/bo/bom/package.nix diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/by-name/bo/bombadillo/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/bombadillo/default.nix rename to pkgs/by-name/bo/bombadillo/package.nix diff --git a/pkgs/tools/networking/bombardier/default.nix b/pkgs/by-name/bo/bombardier/package.nix similarity index 100% rename from pkgs/tools/networking/bombardier/default.nix rename to pkgs/by-name/bo/bombardier/package.nix diff --git a/pkgs/development/tools/bomber-go/default.nix b/pkgs/by-name/bo/bomber-go/package.nix similarity index 100% rename from pkgs/development/tools/bomber-go/default.nix rename to pkgs/by-name/bo/bomber-go/package.nix diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/by-name/bo/bombono/package.nix similarity index 100% rename from pkgs/applications/video/bombono/default.nix rename to pkgs/by-name/bo/bombono/package.nix diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/by-name/bo/bomutils/package.nix similarity index 100% rename from pkgs/tools/archivers/bomutils/default.nix rename to pkgs/by-name/bo/bomutils/package.nix diff --git a/pkgs/tools/misc/bonk/default.nix b/pkgs/by-name/bo/bonk/package.nix similarity index 100% rename from pkgs/tools/misc/bonk/default.nix rename to pkgs/by-name/bo/bonk/package.nix diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/by-name/bo/bonmin/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/bonmin/default.nix rename to pkgs/by-name/bo/bonmin/package.nix diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/by-name/bo/bonnie/package.nix similarity index 100% rename from pkgs/tools/filesystems/bonnie/default.nix rename to pkgs/by-name/bo/bonnie/package.nix diff --git a/pkgs/development/tools/misc/bonnmotion/install.patch b/pkgs/by-name/bo/bonnmotion/install.patch similarity index 100% rename from pkgs/development/tools/misc/bonnmotion/install.patch rename to pkgs/by-name/bo/bonnmotion/install.patch diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/by-name/bo/bonnmotion/package.nix similarity index 100% rename from pkgs/development/tools/misc/bonnmotion/default.nix rename to pkgs/by-name/bo/bonnmotion/package.nix diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/by-name/bo/bonzomatic/package.nix similarity index 100% rename from pkgs/applications/editors/bonzomatic/default.nix rename to pkgs/by-name/bo/bonzomatic/package.nix diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/by-name/bo/boofuzz/package.nix similarity index 100% rename from pkgs/tools/security/boofuzz/default.nix rename to pkgs/by-name/bo/boofuzz/package.nix diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 75d089c0aab2..c018581cecf7 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - hash = "sha256-wpMENrhfD8+bt66gd29xkfLANcMbPpkzDacj0KPuXT4="; + hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/pkgs/games/boohu/default.nix b/pkgs/by-name/bo/boohu/package.nix similarity index 100% rename from pkgs/games/boohu/default.nix rename to pkgs/by-name/bo/boohu/package.nix diff --git a/pkgs/tools/text/book-summary/default.nix b/pkgs/by-name/bo/book-summary/package.nix similarity index 100% rename from pkgs/tools/text/book-summary/default.nix rename to pkgs/by-name/bo/book-summary/package.nix diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/by-name/bo/bookworm/package.nix similarity index 100% rename from pkgs/applications/office/bookworm/default.nix rename to pkgs/by-name/bo/bookworm/package.nix diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/by-name/bo/boolector/package.nix similarity index 100% rename from pkgs/applications/science/logic/boolector/default.nix rename to pkgs/by-name/bo/boolector/package.nix diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/by-name/bo/boolstuff/package.nix similarity index 100% rename from pkgs/development/libraries/boolstuff/default.nix rename to pkgs/by-name/bo/boolstuff/package.nix diff --git a/pkgs/applications/audio/boops/default.nix b/pkgs/by-name/bo/boops/package.nix similarity index 100% rename from pkgs/applications/audio/boops/default.nix rename to pkgs/by-name/bo/boops/package.nix diff --git a/pkgs/development/tools/boost-build/fix-clang-target.patch b/pkgs/by-name/bo/boost-build/fix-clang-target.patch similarity index 100% rename from pkgs/development/tools/boost-build/fix-clang-target.patch rename to pkgs/by-name/bo/boost-build/fix-clang-target.patch diff --git a/pkgs/by-name/bo/boost-build/package.nix b/pkgs/by-name/bo/boost-build/package.nix new file mode 100644 index 000000000000..25911809695e --- /dev/null +++ b/pkgs/by-name/bo/boost-build/package.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, fetchFromGitHub +, bison +# boost derivation to use for the src and version. +# This is used by the boost derivation to build +# a b2 matching their version (by overriding this +# argument). Infinite recursion is not an issue +# since we only look at src and version of boost. +, useBoost ? {} +}: + +let + defaultVersion = "4.4.1"; +in + +stdenv.mkDerivation { + pname = "boost-build"; + version = + if useBoost ? version + then "boost-${useBoost.version}" + else defaultVersion; + + src = useBoost.src or (fetchFromGitHub { + owner = "boostorg"; + repo = "build"; + rev = defaultVersion; + sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; + }); + + # b2 is in a subdirectory of boost source tarballs + postUnpack = lib.optionalString (useBoost ? src) '' + sourceRoot="$sourceRoot/tools/build" + ''; + + patches = useBoost.boostBuildPatches or [] + ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch; + + postPatch = lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.80") '' + # Upstream uses arm64, but nixpkgs uses aarch64. + substituteInPlace src/tools/clang.jam \ + --replace-fail 'arch = arm64' 'arch = aarch64' + '' + lib.optionalString (useBoost ? version && lib.versionOlder useBoost.version "1.77") '' + substituteInPlace src/build-system.jam \ + --replace-fail "default-toolset = darwin" "default-toolset = clang-darwin" + '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") '' + patchShebangs --build src/engine/build.sh + ''; + + nativeBuildInputs = [ + bison + ]; + + buildPhase = '' + runHook preBuild + ./bootstrap.sh + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ./b2 ${lib.optionalString (stdenv.cc.isClang) "toolset=clang "}install --prefix="$out" + + # older versions of b2 created this symlink, + # which we want to support building via useBoost. + test -e "$out/bin/bjam" || ln -s b2 "$out/bin/bjam" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.boost.org/build/"; + license = lib.licenses.boost; + platforms = platforms.unix; + maintainers = with maintainers; [ ivan-tkatchev ]; + }; +} diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/by-name/bo/boost-sml/package.nix similarity index 100% rename from pkgs/development/libraries/boost-ext/boost-sml/default.nix rename to pkgs/by-name/bo/boost-sml/package.nix diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/by-name/bo/booster/package.nix similarity index 100% rename from pkgs/applications/system/booster/default.nix rename to pkgs/by-name/bo/booster/package.nix diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/by-name/bo/boot/builder.sh similarity index 100% rename from pkgs/development/tools/build-managers/boot/builder.sh rename to pkgs/by-name/bo/boot/builder.sh diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/by-name/bo/boot/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/boot/default.nix rename to pkgs/by-name/bo/boot/package.nix diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix new file mode 100644 index 000000000000..164f428b4830 --- /dev/null +++ b/pkgs/by-name/bo/bootc/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + libz, + zstd, + pkg-config, + openssl, + glib, + ostree, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "bootc"; + version = "1.1.2"; + cargoHash = "sha256-i8eYypTgm43Ib1HZ2e9WBLUyDAGCZPpvpzmjTS8d9e0="; + doInstallCheck = true; + + src = fetchFromGitHub { + owner = "containers"; + repo = "bootc"; + rev = "v${version}"; + hash = "sha256-p1+j62MllmPcvWnijieSZmlgwYy76X17fv12Haetz78="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libz + zstd + openssl + glib + ostree + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "Boot and upgrade via container images"; + homepage = "https://containers.github.io/bootc"; + license = lib.licenses.mit; + mainProgram = "bootc"; + maintainers = with lib.maintainers; [ thesola10 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/by-name/bo/bootil/package.nix similarity index 100% rename from pkgs/development/libraries/bootil/default.nix rename to pkgs/by-name/bo/bootil/package.nix diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/by-name/bo/bootiso/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/bootiso/default.nix rename to pkgs/by-name/bo/bootiso/package.nix diff --git a/pkgs/tools/misc/bootspec/default.nix b/pkgs/by-name/bo/bootspec/package.nix similarity index 100% rename from pkgs/tools/misc/bootspec/default.nix rename to pkgs/by-name/bo/bootspec/package.nix diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/by-name/bo/bootstrap-studio/package.nix similarity index 100% rename from pkgs/development/web/bootstrap-studio/default.nix rename to pkgs/by-name/bo/bootstrap-studio/package.nix diff --git a/pkgs/by-name/bo/bootterm/package.nix b/pkgs/by-name/bo/bootterm/package.nix new file mode 100644 index 000000000000..d5eab948805e --- /dev/null +++ b/pkgs/by-name/bo/bootterm/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bootterm"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "wtarreau"; + repo = "bootterm"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AYpO2Xcd51B2qVUWoyI190BV0pIdA3HfuQJPzJ4yT/U="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "${finalAttrs.meta.mainProgram} -V"; + }; + }; + + meta = { + description = "Simple, reliable and powerful terminal to ease connection to serial ports"; + longDescription = '' + BootTerm is a simple, reliable and powerful terminal designed to + ease connection to ephemeral serial ports as found on various SBCs, + and typically USB-based ones. + ''; + homepage = "https://github.com/wtarreau/bootterm"; + license = lib.licenses.mit; + mainProgram = "bt"; + maintainers = with lib.maintainers; [ deadbaed ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/by-name/bo/borg-sans-mono/package.nix similarity index 100% rename from pkgs/data/fonts/borg-sans-mono/default.nix rename to pkgs/by-name/bo/borg-sans-mono/package.nix diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/by-name/bo/borgbackup/package.nix similarity index 100% rename from pkgs/tools/backup/borgbackup/default.nix rename to pkgs/by-name/bo/borgbackup/package.nix diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/by-name/bo/borgmatic/package.nix similarity index 100% rename from pkgs/tools/backup/borgmatic/default.nix rename to pkgs/by-name/bo/borgmatic/package.nix diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/by-name/bo/boringssl/package.nix similarity index 100% rename from pkgs/development/libraries/boringssl/default.nix rename to pkgs/by-name/bo/boringssl/package.nix diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/by-name/bo/boringtun/package.nix similarity index 100% rename from pkgs/tools/networking/boringtun/default.nix rename to pkgs/by-name/bo/boringtun/package.nix diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/by-name/bo/boron/package.nix similarity index 100% rename from pkgs/development/interpreters/boron/default.nix rename to pkgs/by-name/bo/boron/package.nix diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix new file mode 100644 index 000000000000..12c97c83d775 --- /dev/null +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, openssh +}: + +buildGoModule rec { + pname = "bosh-cli"; + + version = "7.8.0"; + + src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-DiW7Vq1rfkOqMM3133mIRmRyFDjFITRkXqY34HMdZtc="; + }; + vendorHash = null; + + postPatch = '' + substituteInPlace cmd/version.go --replace '[DEV BUILD]' '${version}' + ''; + + nativeBuildInputs = [ makeWrapper ]; + + subPackages = [ "." ]; + + doCheck = false; + + postInstall = '' + mv $out/bin/bosh-cli $out/bin/bosh + wrapProgram $out/bin/bosh --prefix PATH : '${lib.makeBinPath [ openssh ]}' + ''; + + meta = with lib; { + description = "Command line interface to CloudFoundry BOSH"; + homepage = "https://bosh.io"; + changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ris ]; + mainProgram = "bosh"; + }; +} diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/by-name/bo/bosun/package.nix similarity index 100% rename from pkgs/servers/monitoring/bosun/default.nix rename to pkgs/by-name/bo/bosun/package.nix diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/by-name/bo/bottom-rs/package.nix similarity index 100% rename from pkgs/tools/misc/bottom-rs/default.nix rename to pkgs/by-name/bo/bottom-rs/package.nix diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/by-name/bo/boulder/package.nix similarity index 100% rename from pkgs/tools/admin/boulder/default.nix rename to pkgs/by-name/bo/boulder/package.nix diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/by-name/bo/bowtie/package.nix similarity index 100% rename from pkgs/applications/science/biology/bowtie/default.nix rename to pkgs/by-name/bo/bowtie/package.nix diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/by-name/bo/bowtie2/package.nix similarity index 100% rename from pkgs/applications/science/biology/bowtie2/default.nix rename to pkgs/by-name/bo/bowtie2/package.nix diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 34c3cd1911ac..eb0682542036 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.13"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-47LOwBm7ql3Nvx6PZ2+x5aR9LSpzc8xuixdvKGdNS94="; + hash = "sha256-s0StSMpLNRwiI+T78ySfW2DQ3s5A9kuclC9f32UDkiI="; }; - cargoHash = "sha256-W4W2tnnNgBcGD0/t5pobj4ca/YrRkHE1l5dIVe21KPU="; + cargoHash = "sha256-WJ35lxo4h91xtcfUuevLsWNBvulxq5ZaAVE3u9BbtzI="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/by-name/bo/boxes/package.nix similarity index 100% rename from pkgs/tools/text/boxes/default.nix rename to pkgs/by-name/bo/boxes/package.nix diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/by-name/bo/boxfort/package.nix similarity index 100% rename from pkgs/development/libraries/boxfort/default.nix rename to pkgs/by-name/bo/boxfort/package.nix diff --git a/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff b/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff similarity index 100% rename from pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff rename to pkgs/by-name/bo/boxfs/libapp-include-ctype.diff diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/by-name/bo/boxfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/boxfs/default.nix rename to pkgs/by-name/bo/boxfs/package.nix diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch similarity index 100% rename from pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch rename to pkgs/by-name/bo/boxfs/work-around-API-borkage.patch diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/by-name/bo/boxxy/package.nix similarity index 100% rename from pkgs/tools/misc/boxxy/default.nix rename to pkgs/by-name/bo/boxxy/package.nix diff --git a/pkgs/development/tools/bpf-linker/Cargo.lock b/pkgs/by-name/bp/bpf-linker/Cargo.lock similarity index 100% rename from pkgs/development/tools/bpf-linker/Cargo.lock rename to pkgs/by-name/bp/bpf-linker/Cargo.lock diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/by-name/bp/bpf-linker/package.nix similarity index 100% rename from pkgs/development/tools/bpf-linker/default.nix rename to pkgs/by-name/bp/bpf-linker/package.nix diff --git a/pkgs/by-name/bp/bpfmon/package.nix b/pkgs/by-name/bp/bpfmon/package.nix new file mode 100644 index 000000000000..f502bfab45ce --- /dev/null +++ b/pkgs/by-name/bp/bpfmon/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, yascreen +}: + +stdenv.mkDerivation rec { + pname = "bpfmon"; + version = "2.53"; + + src = fetchFromGitHub { + owner = "bbonev"; + repo = "bpfmon"; + rev = "refs/tags/v${version}"; + hash = "sha256-+W+3RLvgXXtUImzLkJr9mSWExvAUgjMp+lR9sg14VaY="; + }; + + buildInputs = [ + libpcap + yascreen + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "BPF based visual packet rate monitor"; + mainProgram = "bpfmon"; + homepage = "https://github.com/bbonev/bpfmon"; + changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${version}"; + maintainers = with maintainers; [ arezvov ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch similarity index 100% rename from pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch rename to pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/by-name/bp/bpftools/package.nix similarity index 100% rename from pkgs/os-specific/linux/bpftools/default.nix rename to pkgs/by-name/bp/bpftools/package.nix diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/by-name/bp/bpftune/package.nix similarity index 100% rename from pkgs/os-specific/linux/bpftune/default.nix rename to pkgs/by-name/bp/bpftune/package.nix diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/by-name/bp/bpm-tools/package.nix similarity index 100% rename from pkgs/tools/audio/bpm-tools/default.nix rename to pkgs/by-name/bp/bpm-tools/package.nix diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/by-name/bp/bpp-core/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bpp-core/default.nix rename to pkgs/by-name/bp/bpp-core/package.nix diff --git a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/pkgs/by-name/bp/bpp-phyl/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bpp-phyl/default.nix rename to pkgs/by-name/bp/bpp-phyl/package.nix diff --git a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/pkgs/by-name/bp/bpp-popgen/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bpp-popgen/default.nix rename to pkgs/by-name/bp/bpp-popgen/package.nix diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/by-name/bp/bpp-seq/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bpp-seq/default.nix rename to pkgs/by-name/bp/bpp-seq/package.nix diff --git a/pkgs/applications/science/biology/bppsuite/default.nix b/pkgs/by-name/bp/bppsuite/package.nix similarity index 100% rename from pkgs/applications/science/biology/bppsuite/default.nix rename to pkgs/by-name/bp/bppsuite/package.nix diff --git a/pkgs/data/fonts/bqn386/default.nix b/pkgs/by-name/bq/bqn386/package.nix similarity index 100% rename from pkgs/data/fonts/bqn386/default.nix rename to pkgs/by-name/bq/bqn386/package.nix diff --git a/pkgs/games/braincurses/default.nix b/pkgs/by-name/br/braincurses/package.nix similarity index 100% rename from pkgs/games/braincurses/default.nix rename to pkgs/by-name/br/braincurses/package.nix diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 2ea95693a9ae..d0fe9afde4dc 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -1,102 +1,155 @@ -{ lib, stdenv, fetchurl, buildPackages -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, dpkg -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, adwaita-icon-theme -, gsettings-desktop-schemas -, gtk3 -, gtk4 -, libX11 -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libkrb5 -, libuuid -, libxkbcommon -, libxshmfence -, mesa -, nspr -, nss -, pango -, pipewire -, snappy -, udev -, wayland -, xdg-utils -, coreutils -, xorg -, zlib +{ + lib, + stdenv, + fetchurl, + buildPackages, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + dpkg, + expat, + fontconfig, + freetype, + gdk-pixbuf, + glib, + adwaita-icon-theme, + gsettings-desktop-schemas, + gtk3, + gtk4, + qt6, + libX11, + libXScrnSaver, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXtst, + libdrm, + libkrb5, + libuuid, + libxkbcommon, + libxshmfence, + mesa, + nspr, + nss, + pango, + pipewire, + snappy, + udev, + wayland, + xdg-utils, + coreutils, + xorg, + zlib, -# command line arguments which are always set e.g "--disable-gpu" -, commandLineArgs ? "" + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", -# Necessary for USB audio devices. -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio + # Necessary for USB audio devices. + pulseSupport ? stdenv.hostPlatform.isLinux, + libpulseaudio, -# For GPU acceleration support on Wayland (without the lib it doesn't seem to work) -, libGL + # For GPU acceleration support on Wayland (without the lib it doesn't seem to work) + libGL, -# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) -, libvaSupport ? stdenv.hostPlatform.isLinux -, libva -, enableVideoAcceleration ? libvaSupport + # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) + libvaSupport ? stdenv.hostPlatform.isLinux, + libva, + enableVideoAcceleration ? libvaSupport, -# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API -, vulkanSupport ? false -, addDriverRunpath -, enableVulkan ? vulkanSupport + # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API + vulkanSupport ? false, + addDriverRunpath, + enableVulkan ? vulkanSupport, }: -{ pname -, version -, hash -, url -, platform +{ + pname, + version, + hash, + url, + platform, }: let - inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath - optionalString strings escapeShellArg; + inherit (lib) + optional + optionals + makeLibraryPath + makeSearchPathOutput + makeBinPath + optionalString + strings + escapeShellArg + ; deps = [ - alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat - fontconfig freetype gdk-pixbuf glib gtk3 gtk4 libdrm libX11 libGL - libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage - libXext libXfixes libXi libXrandr libXrender libxshmfence - libXtst libuuid mesa nspr nss pango pipewire udev wayland - xorg.libxcb zlib snappy libkrb5 - ] - ++ optional pulseSupport libpulseaudio - ++ optional libvaSupport libva; + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + gtk4 + libdrm + libX11 + libGL + libxkbcommon + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libxshmfence + libXtst + libuuid + mesa + nspr + nss + pango + pipewire + udev + wayland + xorg.libxcb + zlib + snappy + libkrb5 + qt6.qtbase + ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva; rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; binpath = makeBinPath deps; - enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] + enableFeatures = + optionals enableVideoAcceleration [ + "VaapiVideoDecoder" + "VaapiVideoEncoder" + ] ++ optional enableVulkan "Vulkan"; - disableFeatures = [ "OutdatedBuildDetector" ] # disable automatic updates + disableFeatures = + [ "OutdatedBuildDetector" ] # disable automatic updates # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 - ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; + ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; in stdenv.mkDerivation { inherit pname version; @@ -119,7 +172,10 @@ stdenv.mkDerivation { buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH - glib gsettings-desktop-schemas gtk3 gtk4 + glib + gsettings-desktop-schemas + gtk3 + gtk4 # needed for XDG_ICON_DIRS adwaita-icon-theme @@ -128,51 +184,51 @@ stdenv.mkDerivation { unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; installPhase = '' - runHook preInstall + runHook preInstall - mkdir -p $out $out/bin + mkdir -p $out $out/bin - cp -R usr/share $out - cp -R opt/ $out/opt + cp -R usr/share $out + cp -R opt/ $out/opt - export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser + export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser - # Fix path to bash in $BINARYWRAPPER - substituteInPlace $BINARYWRAPPER \ - --replace /bin/bash ${stdenv.shell} + # Fix path to bash in $BINARYWRAPPER + substituteInPlace $BINARYWRAPPER \ + --replace /bin/bash ${stdenv.shell} - ln -sf $BINARYWRAPPER $out/bin/brave + ln -sf $BINARYWRAPPER $out/bin/brave - for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $exe - done + for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe + done - # Fix paths - substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser-stable $out/bin/brave - substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/share/menu/brave-browser.menu \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/opt/brave.com/brave/default-app-block \ - --replace /opt/brave.com $out/opt/brave.com + # Fix paths + substituteInPlace $out/share/applications/brave-browser.desktop \ + --replace /usr/bin/brave-browser-stable $out/bin/brave + substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/share/menu/brave-browser.menu \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/opt/brave.com/brave/default-app-block \ + --replace /opt/brave.com $out/opt/brave.com - # Correct icons location - icon_sizes=("16" "24" "32" "48" "64" "128" "256") + # Correct icons location + icon_sizes=("16" "24" "32" "48" "64" "128" "256") - for icon in ''${icon_sizes[*]} - do - mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps - ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png - done + for icon in ''${icon_sizes[*]} + do + mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps + ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png + done - # Replace xdg-settings and xdg-mime - ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + # Replace xdg-settings and xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime - runHook postInstall + runHook postInstall ''; preFixup = '' @@ -180,16 +236,25 @@ stdenv.mkDerivation { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${rpath} --prefix PATH : ${binpath} - --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]} - ${optionalString (enableFeatures != []) '' - --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}" - ''} - ${optionalString (disableFeatures != []) '' - --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" - ''} + --suffix PATH : ${ + lib.makeBinPath [ + xdg-utils + coreutils + ] + } + ${ + optionalString (enableFeatures != [ ]) '' + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}" + '' + } + ${ + optionalString (disableFeatures != [ ]) '' + --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" + '' + } --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" ${optionalString vulkanSupport '' - --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share" + --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share" ''} --add-flags ${escapeShellArg commandLineArgs} ) @@ -205,7 +270,9 @@ stdenv.mkDerivation { meta = { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version; + changelog = + "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + + lib.replaceStrings [ "." ] [ "" ] version; longDescription = '' Brave browser blocks the ads and trackers that slow you down, chew up your bandwidth, and invade your privacy. Brave lets you @@ -213,8 +280,17 @@ stdenv.mkDerivation { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ uskudnik rht jefflabonte nasirhm buckley310 ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + uskudnik + rht + jefflabonte + nasirhm + buckley310 + ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; mainProgram = "brave"; }; } diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 50a33da09848..79bc50213e4d 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -1,24 +1,32 @@ # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) - ( - if stdenv.hostPlatform.isAarch64 then - rec { - pname = "brave"; - version = "1.71.118"; - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-6ERUWUb4GL+kuI0j8VI3vERR3HFfb1gYL4d+hBTcw5w="; - platform = "aarch64-linux"; - } - else if stdenv.hostPlatform.isx86_64 then - rec { - pname = "brave"; - version = "1.71.118"; - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-SnpYAJmqBRfECQrlOvgxwQI1k7j0tfctJG7Tt93afe8="; - platform = "x86_64-linux"; - } +let + pname = "brave"; + version = "1.71.123"; + + allArchives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-u3fme771Q5F00fYiLez9mhGQR2mORYdSabXovr0+OYE="; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ="; + }; + }; + + archive = + if builtins.hasAttr stdenv.system allArchives then + allArchives.${stdenv.system} else - throw "Unsupported platform." - ) + throw "Unsupported platform."; + +in +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( + archive + // { + inherit pname version; + platform = stdenv.system; + } +) diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index aff0dd552102..306f4d12e53b 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -1,17 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix +#!nix-shell -i bash -p curl gnused nix jq SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -latestVersionAarch64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ - | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" + hashAarch64="$(nix hash to-sri --type sha256 \ $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) )" -latestVersionAmd64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ - | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" hashAmd64="$(nix hash to-sri --type sha256 \ $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) @@ -21,25 +19,33 @@ cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) - ( - if stdenv.hostPlatform.isAarch64 then - rec { - pname = "brave"; - version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; - hash = "${hashAarch64}"; - platform = "aarch64-linux"; - } - else if stdenv.hostPlatform.isx86_64 then - rec { - pname = "brave"; - version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; - hash = "${hashAmd64}"; - platform = "x86_64-linux"; - } +let + pname = "brave"; + version = "${latestVersion}"; + + allArchives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; + hash = "${hashAarch64}"; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; + hash = "${hashAmd64}"; + }; + }; + + archive = + if builtins.hasAttr stdenv.system allArchives then + allArchives.\${stdenv.system} else - throw "Unsupported platform." - ) + throw "Unsupported platform."; + +in +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( + archive + // { + inherit pname version; + platform = stdenv.system; + } +) EOF diff --git a/pkgs/applications/misc/break-time/Cargo.lock b/pkgs/by-name/br/break-time/Cargo.lock similarity index 100% rename from pkgs/applications/misc/break-time/Cargo.lock rename to pkgs/by-name/br/break-time/Cargo.lock diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/by-name/br/break-time/package.nix similarity index 100% rename from pkgs/applications/misc/break-time/default.nix rename to pkgs/by-name/br/break-time/package.nix diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/by-name/br/breakpad/package.nix similarity index 100% rename from pkgs/development/misc/breakpad/default.nix rename to pkgs/by-name/br/breakpad/package.nix diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/by-name/br/brev-cli/package.nix similarity index 100% rename from pkgs/development/misc/brev-cli/default.nix rename to pkgs/by-name/br/brev-cli/package.nix diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/by-name/br/brgenml1cupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix rename to pkgs/by-name/br/brgenml1cupswrapper/package.nix diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/by-name/br/brial/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/brial/default.nix rename to pkgs/by-name/br/brial/package.nix diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/by-name/br/briar-desktop/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/briar-desktop/default.nix rename to pkgs/by-name/br/briar-desktop/package.nix diff --git a/pkgs/servers/brickd/default.nix b/pkgs/by-name/br/brickd/package.nix similarity index 100% rename from pkgs/servers/brickd/default.nix rename to pkgs/by-name/br/brickd/package.nix diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/by-name/br/bridge-utils/autoconf-ar.patch similarity index 100% rename from pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch rename to pkgs/by-name/br/bridge-utils/autoconf-ar.patch diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/by-name/br/bridge-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/bridge-utils/default.nix rename to pkgs/by-name/br/bridge-utils/package.nix diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/by-name/br/brig/package.nix similarity index 100% rename from pkgs/applications/networking/brig/default.nix rename to pkgs/by-name/br/brig/package.nix diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/by-name/br/brigand/package.nix similarity index 100% rename from pkgs/development/libraries/brigand/default.nix rename to pkgs/by-name/br/brigand/package.nix diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/by-name/br/brightnessctl/package.nix similarity index 100% rename from pkgs/misc/brightnessctl/default.nix rename to pkgs/by-name/br/brightnessctl/package.nix diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/by-name/br/brillo/package.nix similarity index 100% rename from pkgs/os-specific/linux/brillo/default.nix rename to pkgs/by-name/br/brillo/package.nix diff --git a/pkgs/os-specific/linux/brillo/udev-rule.patch b/pkgs/by-name/br/brillo/udev-rule.patch similarity index 100% rename from pkgs/os-specific/linux/brillo/udev-rule.patch rename to pkgs/by-name/br/brillo/udev-rule.patch diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/pkgs/by-name/br/brise/fetchPackages.nix similarity index 100% rename from pkgs/data/misc/brise/fetchPackages.nix rename to pkgs/by-name/br/brise/fetchPackages.nix diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/by-name/br/brise/package.nix similarity index 100% rename from pkgs/data/misc/brise/default.nix rename to pkgs/by-name/br/brise/package.nix diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/by-name/br/briss/package.nix similarity index 100% rename from pkgs/tools/graphics/briss/default.nix rename to pkgs/by-name/br/briss/package.nix diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/by-name/br/bristol/package.nix similarity index 100% rename from pkgs/applications/audio/bristol/default.nix rename to pkgs/by-name/br/bristol/package.nix diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/by-name/br/brlaser/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/brlaser/default.nix rename to pkgs/by-name/br/brlaser/package.nix diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/by-name/br/brlcad/package.nix similarity index 100% rename from pkgs/applications/graphics/brlcad/default.nix rename to pkgs/by-name/br/brlcad/package.nix diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/by-name/br/brltty/package.nix similarity index 100% rename from pkgs/tools/misc/brltty/default.nix rename to pkgs/by-name/br/brltty/package.nix diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/by-name/br/brmodelo/package.nix similarity index 100% rename from pkgs/applications/science/engineering/brmodelo/default.nix rename to pkgs/by-name/br/brmodelo/package.nix diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/by-name/br/broadcom-bt-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix rename to pkgs/by-name/br/broadcom-bt-firmware/package.nix diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/by-name/br/broadlink-cli/package.nix similarity index 100% rename from pkgs/tools/misc/broadlink-cli/default.nix rename to pkgs/by-name/br/broadlink-cli/package.nix diff --git a/pkgs/data/fonts/bront/default.nix b/pkgs/by-name/br/bront_fonts/package.nix similarity index 100% rename from pkgs/data/fonts/bront/default.nix rename to pkgs/by-name/br/bront_fonts/package.nix diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/by-name/br/brook/package.nix similarity index 100% rename from pkgs/tools/networking/brook/default.nix rename to pkgs/by-name/br/brook/package.nix diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/by-name/br/brotli/package.nix similarity index 100% rename from pkgs/tools/compression/brotli/default.nix rename to pkgs/by-name/br/brotli/package.nix diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/by-name/br/browserpass/package.nix similarity index 100% rename from pkgs/tools/security/browserpass/default.nix rename to pkgs/by-name/br/browserpass/package.nix diff --git a/pkgs/by-name/br/browsers/Cargo.lock b/pkgs/by-name/br/browsers/Cargo.lock index be32d3d604d1..1091ee9db34c 100644 --- a/pkgs/by-name/br/browsers/Cargo.lock +++ b/pkgs/by-name/br/browsers/Cargo.lock @@ -8,6 +8,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.7.8" @@ -79,15 +85,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "associative-cache" @@ -121,9 +127,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", @@ -175,9 +181,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.4" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", "async-io", @@ -190,7 +196,6 @@ dependencies = [ "futures-lite", "rustix", "tracing", - "windows-sys 0.59.0", ] [[package]] @@ -201,7 +206,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -230,13 +235,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -317,7 +322,7 @@ dependencies = [ [[package]] name = "browsers" -version = "0.5.8" +version = "0.6.0" dependencies = [ "clap", "cocoa-foundation 0.2.0", @@ -371,9 +376,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -408,9 +413,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.12" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "shlex", ] @@ -439,18 +444,18 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "clap" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -640,9 +645,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -804,7 +809,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -899,9 +904,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dwrote" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" dependencies = [ "lazy_static", "libc", @@ -933,7 +938,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -975,9 +980,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1000,12 +1005,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1074,9 +1079,9 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.7.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714dc75515835140c365a1f199143577afe4650ef1277f2fba50032c8c20bbc2" +checksum = "d83c9c25bc7e0ff18c6fee324db310497622be235fd45c0f7347ab81981a941e" dependencies = [ "dirs 5.0.1", "gettext-rs", @@ -1154,7 +1159,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1268,9 +1273,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" dependencies = [ "gettext-sys", "locale_config", @@ -1278,9 +1283,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" dependencies = [ "cc", "temp-dir", @@ -1374,9 +1379,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -1516,9 +1521,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1621,9 +1626,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.156" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libredox" @@ -1721,6 +1726,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "naive-cityhash" version = "0.2.0" @@ -1929,9 +1943,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "percent-encoding" @@ -2051,9 +2065,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" @@ -2065,7 +2079,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -2110,11 +2124,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.21", ] [[package]] @@ -2152,9 +2166,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2197,9 +2211,9 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2268,18 +2282,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -2323,29 +2337,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2361,7 +2375,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2479,9 +2493,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -2528,28 +2542,28 @@ dependencies = [ [[package]] name = "textdistance" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" +checksum = "7f1835c76a9d443834c04539860f3ce46b9d93ef8c260057f939e967ca81180a" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2646,7 +2660,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit 0.22.21", ] [[package]] @@ -2671,20 +2685,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", @@ -2724,7 +2727,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2886,24 +2889,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "url" @@ -2974,7 +2977,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -2996,7 +2999,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3339,10 +3342,10 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "zvariant_utils", ] @@ -3375,7 +3378,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -3397,10 +3400,10 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "zvariant_utils", ] @@ -3412,5 +3415,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix index f09aa4b56082..74a3f85694ef 100644 --- a/pkgs/by-name/br/browsers/package.nix +++ b/pkgs/by-name/br/browsers/package.nix @@ -10,17 +10,19 @@ glib, gtk3, pango, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { pname = "browsers"; - version = "0.5.8"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Browsers-software"; repo = "browsers"; rev = "refs/tags/${version}"; - hash = "sha256-o9vyrHQsZQ3qywA4bviM+W4xx64IZL24VHErMFAEMFE="; + hash = "sha256-qLqyv5XXG7cpW+/eNCWguqemT3G2BhnolntHi2zZJ0o="; }; cargoLock = { @@ -36,14 +38,21 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk3 - pango - ]; + buildInputs = + [ + atk + cairo + gdk-pixbuf + glib + gtk3 + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.CoreText + darwin.apple_sdk.frameworks.Foundation + ]; postInstall = '' install -m 444 \ @@ -67,7 +76,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Browsers-software/browsers/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ravenz46 ]; - platforms = lib.platforms.linux; mainProgram = "browsers"; }; } diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/by-name/br/browsh/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/browsh/default.nix rename to pkgs/by-name/br/browsh/package.nix diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/by-name/br/browsr/package.nix similarity index 100% rename from pkgs/applications/file-managers/browsr/default.nix rename to pkgs/by-name/br/browsr/package.nix diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/by-name/br/brscan4/package.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan4/default.nix rename to pkgs/by-name/br/brscan4/package.nix diff --git a/pkgs/applications/graphics/sane/backends/brscan4/preload.c b/pkgs/by-name/br/brscan4/preload.c similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan4/preload.c rename to pkgs/by-name/br/brscan4/preload.c diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/by-name/br/brscan4/udev_rules_type1.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix rename to pkgs/by-name/br/brscan4/udev_rules_type1.nix diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/by-name/br/brscan5/package.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan5/default.nix rename to pkgs/by-name/br/brscan5/package.nix diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 5fab6f71d493..07e8516e308d 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -5,7 +5,6 @@ buildNpmPackage, nix-update-script, electron, - writeShellScriptBin, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -14,37 +13,29 @@ cairo, pango, npm-lockfile-fix, - overrideSDK, - darwin, + apple-sdk_11, }: -let - # fix for: https://github.com/NixOS/nixpkgs/issues/272156 - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "bruno"; - version = "1.34.0"; + version = "1.34.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA="; + hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw="; + npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ - (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -59,7 +50,8 @@ buildNpmPackage' rec { pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreText + # fix for: https://github.com/NixOS/nixpkgs/issues/272156 + apple-sdk_11 ]; desktopItems = [ @@ -86,8 +78,17 @@ buildNpmPackage' rec { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - dontNpmBuild = true; - postBuild = '' + # remove giflib dependency + npmRebuildFlags = [ "--ignore-scripts" ]; + preBuild = '' + substituteInPlace node_modules/canvas/binding.gyp \ + --replace-fail "'with_gif%': '=3.5.0 <4.0.0", + "flutter": ">=3.24.3" + } +} diff --git a/pkgs/applications/audio/buzztrax/default.nix b/pkgs/by-name/bu/buzztrax/package.nix similarity index 100% rename from pkgs/applications/audio/buzztrax/default.nix rename to pkgs/by-name/bu/buzztrax/package.nix diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/by-name/bv/bvi/package.nix similarity index 100% rename from pkgs/applications/editors/bvi/default.nix rename to pkgs/by-name/bv/bvi/package.nix diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/by-name/bv/bviplus/package.nix similarity index 100% rename from pkgs/applications/editors/bviplus/default.nix rename to pkgs/by-name/bv/bviplus/package.nix diff --git a/pkgs/applications/science/biology/bwa-mem2/default.nix b/pkgs/by-name/bw/bwa-mem2/package.nix similarity index 100% rename from pkgs/applications/science/biology/bwa-mem2/default.nix rename to pkgs/by-name/bw/bwa-mem2/package.nix diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/by-name/bw/bwa/package.nix similarity index 100% rename from pkgs/applications/science/biology/bwa/default.nix rename to pkgs/by-name/bw/bwa/package.nix diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/by-name/bw/bwbasic/package.nix similarity index 100% rename from pkgs/development/interpreters/bwbasic/default.nix rename to pkgs/by-name/bw/bwbasic/package.nix diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/by-name/bw/bwm_ng/package.nix similarity index 100% rename from pkgs/tools/networking/bwm-ng/default.nix rename to pkgs/by-name/bw/bwm_ng/package.nix diff --git a/pkgs/tools/security/bws/Cargo.lock b/pkgs/by-name/bw/bws/Cargo.lock similarity index 100% rename from pkgs/tools/security/bws/Cargo.lock rename to pkgs/by-name/bw/bws/Cargo.lock diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/by-name/bw/bws/package.nix similarity index 100% rename from pkgs/tools/security/bws/default.nix rename to pkgs/by-name/bw/bws/package.nix diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index bf8a27e8e2d3..9be662becdd7 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.14.1"; + version = "0.15"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-JdL+3ETNxaEtOLUhgLSABL9C8w/EM4Ay37OXU5jLCFA="; + hash = "sha256-jsQFfIvWvpJRBewUSS5bhDGocfPTvtG6LiejUxdqk28="; }; installPhase = '' diff --git a/pkgs/applications/video/byzanz/add-amflags.patch b/pkgs/by-name/by/byzanz/add-amflags.patch similarity index 100% rename from pkgs/applications/video/byzanz/add-amflags.patch rename to pkgs/by-name/by/byzanz/add-amflags.patch diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/by-name/by/byzanz/package.nix similarity index 100% rename from pkgs/applications/video/byzanz/default.nix rename to pkgs/by-name/by/byzanz/package.nix diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/by-name/bz/bzrtp/package.nix similarity index 100% rename from pkgs/development/libraries/bzrtp/default.nix rename to pkgs/by-name/bz/bzrtp/package.nix diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix new file mode 100644 index 000000000000..b1b212e1c765 --- /dev/null +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromSavannah, + texinfo, + texliveBasic, + ghostscript, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "c-intro-and-ref"; + version = "0.0-unstable-2024-08-31"; + + src = fetchFromSavannah { + repo = "c-intro-and-ref"; + rev = "62962013107481127176ef04d69826e41f51313c"; + hash = "sha256-Fmli3x8zvPntvCvV/wbEkxWzW9uDMZgCElPkKo9TS6Y="; + }; + + nativeBuildInputs = [ + texinfo + ghostscript + texliveBasic + ]; + + buildFlags = [ + "c.info" + "c.dvi" + "c.pdf" + # FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm + # "c.doc" + "c.html" + "c.html.d" + "c.txt" + ]; + + installPhase = '' + runHook preInstall + dst_info=$out/share/info + dst_doc=$out/share/doc/c-intro-and-ref + mkdir -p $dst_info + mkdir -p $dst_doc + + cp -prv -t $dst_info \ + c.info c.info-* + cp -prv -t $dst_doc \ + c.dvi \ + c.pdf \ + c.html \ + c.html.d \ + c.txt + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "GNU C Language Intro and Reference Manual"; + longDescription = '' + This manual explains the C language for use with the GNU Compiler + Collection (GCC) on the GNU/Linux operating system and other systems. We + refer to this dialect as GNU C. If you already know C, you can use this as + a reference manual. + ''; + homepage = "https://www.gnu.org/software/c-intro-and-ref/"; + changelog = "https://git.savannah.nongnu.org/cgit/c-intro-and-ref.git/plain/ChangeLog?id=${finalAttrs.src.rev}"; + license = lib.licenses.fdl13Plus; + maintainers = with lib.maintainers; [ rc-zb ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/by-name/c2/c2ffi/package.nix similarity index 100% rename from pkgs/development/tools/misc/c2ffi/default.nix rename to pkgs/by-name/c2/c2ffi/package.nix diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/by-name/c3/c3c/package.nix similarity index 100% rename from pkgs/development/compilers/c3c/default.nix rename to pkgs/by-name/c3/c3c/package.nix diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/by-name/c6/c64-debugger/package.nix similarity index 100% rename from pkgs/applications/emulators/c64-debugger/default.nix rename to pkgs/by-name/c6/c64-debugger/package.nix diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/by-name/ca/cabextract/package.nix similarity index 100% rename from pkgs/tools/archivers/cabextract/default.nix rename to pkgs/by-name/ca/cabextract/package.nix diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/by-name/ca/cabin/package.nix similarity index 100% rename from pkgs/data/fonts/cabin/default.nix rename to pkgs/by-name/ca/cabin/package.nix diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/by-name/ca/cachefilesd/package.nix similarity index 100% rename from pkgs/os-specific/linux/cachefilesd/default.nix rename to pkgs/by-name/ca/cachefilesd/package.nix diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/by-name/ca/cadaver/package.nix similarity index 100% rename from pkgs/tools/networking/cadaver/default.nix rename to pkgs/by-name/ca/cadaver/package.nix diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/by-name/ca/cadical/package.nix similarity index 100% rename from pkgs/applications/science/logic/cadical/default.nix rename to pkgs/by-name/ca/cadical/package.nix diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/by-name/ca/cadvisor/package.nix similarity index 100% rename from pkgs/servers/monitoring/cadvisor/default.nix rename to pkgs/by-name/ca/cadvisor/package.nix diff --git a/pkgs/applications/networking/mailreaders/caeml/default.nix b/pkgs/by-name/ca/caeml/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/caeml/default.nix rename to pkgs/by-name/ca/caeml/package.nix diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/by-name/ca/caerbannog/package.nix similarity index 100% rename from pkgs/applications/misc/caerbannog/default.nix rename to pkgs/by-name/ca/caerbannog/package.nix diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix new file mode 100644 index 000000000000..b9b067cd684e --- /dev/null +++ b/pkgs/by-name/ca/caf/package.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: + +stdenv.mkDerivation rec { + pname = "actor-framework"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "actor-framework"; + repo = "actor-framework"; + rev = version; + hash = "sha256-1DJ8VYBTC4Kd6IQZoj4AjP3CoHhb+bmtBEozc5T0R/0="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + cmakeFlags = [ + "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; + + doCheck = !stdenv.hostPlatform.isDarwin; + checkTarget = "test"; + + meta = with lib; { + description = "Open source implementation of the actor model in C++"; + homepage = "http://actor-framework.org/"; + license = licenses.bsd3; + platforms = platforms.unix; + changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bobakker tobim ]; + }; +} diff --git a/pkgs/tools/X11/caffeine-ng/fix-build.patch b/pkgs/by-name/ca/caffeine-ng/fix-build.patch similarity index 100% rename from pkgs/tools/X11/caffeine-ng/fix-build.patch rename to pkgs/by-name/ca/caffeine-ng/fix-build.patch diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/by-name/ca/caffeine-ng/package.nix similarity index 100% rename from pkgs/tools/X11/caffeine-ng/default.nix rename to pkgs/by-name/ca/caffeine-ng/package.nix diff --git a/pkgs/tools/misc/caffeine/default.nix b/pkgs/by-name/ca/caffeine/package.nix similarity index 100% rename from pkgs/tools/misc/caffeine/default.nix rename to pkgs/by-name/ca/caffeine/package.nix diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 2a3ecc3374b8..6925ba116eea 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.42.0"; + version = "0.43.1"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-Y0ygbdL9IKvTRLwR0oW1LjFQZfPxKOoZnSDV2zgtJjM="; + hash = "sha256-6thdJf6UCzeKOgjPTkK4FsgbQ2u6Eu+tnHihXJPMEUQ="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-zS/lbcXK1iN2tuUMWc6Us0q2eUypD8mXsw0C+QKE3+w="; + hash = "sha256-HEx+RFWF+qfFut5n1ZxKQHjSTGq5EbXAupPJ+5H5LQ0="; }; appimageContents = appimageTools.extractType2 { inherit pname version; diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/by-name/ca/cairo-lang/package.nix similarity index 100% rename from pkgs/development/compilers/cairo/default.nix rename to pkgs/by-name/ca/cairo-lang/package.nix diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix new file mode 100644 index 000000000000..8ed46ae3efb5 --- /dev/null +++ b/pkgs/by-name/ca/cairo/package.nix @@ -0,0 +1,116 @@ +{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 +, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib +, x11Support? !stdenv.hostPlatform.isDarwin || true, libXext, libXrender +, gobjectSupport ? true, glib +, xcbSupport ? x11Support, libxcb +, darwin +, testers +}: + +let + inherit (lib) optional optionals; +in stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) pname version; +in { + pname = "cairo"; + version = "1.18.2"; + + src = fetchurl { + url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; + hash = "sha256-piubtCQl6ETMPW3d4EP/Odur7dFULrpXout5+FiJ1Fo="; + }; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; # very small + separateDebugInfo = true; + + nativeBuildInputs = [ + gtk-doc + meson + ninja + pkg-config + python3 + ]; + + buildInputs = [ + docbook_xsl + ] ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreGraphics + CoreText + ApplicationServices + Carbon + ]); + + propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] + ++ optionals x11Support [ libXext libXrender ] + ++ optionals xcbSupport [ libxcb ] + ++ optional gobjectSupport glib + ; # TODO: maybe liblzo but what would it be for here? + + mesonFlags = [ + "-Dgtk_doc=true" + + # error: #error config.h must be included before this header + "-Dsymbol-lookup=disabled" + + # Only used in tests, causes a dependency cycle + "-Dspectre=disabled" + + (lib.mesonEnable "glib" gobjectSupport) + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonEnable "xlib" x11Support) + (lib.mesonEnable "xcb" xcbSupport) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--cross-file=${builtins.toFile "cross-file.conf" '' + [properties] + ipc_rmid_deferred_release = ${ + { + linux = "true"; + freebsd = "true"; + netbsd = "false"; + }.${stdenv.hostPlatform.parsed.kernel.name} or + (throw "Unknown value for ipc_rmid_deferred_release") + } + ''}" + ]; + + preConfigure = '' + patchShebangs version.py + ''; + + enableParallelBuilding = true; + + doCheck = false; # fails + + postInstall = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "$out/lib/pkgconfig/cairo.pc" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' + ''; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "2D graphics library with support for multiple output devices"; + mainProgram = "cairo-trace"; + longDescription = '' + Cairo is a 2D graphics library with support for multiple output + devices. Currently supported output targets include the X + Window System, XCB, Quartz, Win32, image buffers, PostScript, + PDF, and SVG file output. + + Cairo is designed to produce consistent output on all output + media while taking advantage of display hardware acceleration + when available (e.g., through the X Render Extension). + ''; + homepage = "http://cairographics.org/"; + license = with licenses; [ lgpl2Plus mpl10 ]; + pkgConfigModules = [ + "cairo-pdf" + "cairo-ps" + "cairo-svg" + ] ++ lib.optional gobjectSupport "cairo-gobject"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/by-name/ca/cakelisp/package.nix similarity index 100% rename from pkgs/development/compilers/cakelisp/default.nix rename to pkgs/by-name/ca/cakelisp/package.nix diff --git a/pkgs/data/fonts/caladea/cambria-alias.conf b/pkgs/by-name/ca/caladea/cambria-alias.conf similarity index 100% rename from pkgs/data/fonts/caladea/cambria-alias.conf rename to pkgs/by-name/ca/caladea/cambria-alias.conf diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/by-name/ca/caladea/package.nix similarity index 100% rename from pkgs/data/fonts/caladea/default.nix rename to pkgs/by-name/ca/caladea/package.nix diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix new file mode 100644 index 000000000000..5a01ac7defd4 --- /dev/null +++ b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation (finalAttrs: { + pname = "calamares-nixos-extensions"; + version = "0.3.19"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "calamares-nixos-extensions"; + rev = finalAttrs.version; + hash = "sha256-/WdSMqtF8DKplsDx00l8HYijYvOUBb55Opv3Z8+T6QU="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/{lib,share}/calamares + cp -r modules $out/lib/calamares/ + cp -r config/* $out/share/calamares/ + cp -r branding $out/share/calamares/ + runHook postInstall + ''; + + meta = with lib; { + description = "Calamares modules for NixOS"; + homepage = "https://github.com/NixOS/calamares-nixos-extensions"; + license = with licenses; [ gpl3Plus bsd2 cc-by-40 cc-by-sa-40 cc0 ]; + maintainers = with maintainers; [ vlinkz ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/by-name/ca/calc/package.nix similarity index 100% rename from pkgs/applications/science/math/calc/default.nix rename to pkgs/by-name/ca/calc/package.nix diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/by-name/ca/calcium/package.nix similarity index 100% rename from pkgs/development/libraries/calcium/default.nix rename to pkgs/by-name/ca/calcium/package.nix diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/by-name/ca/calculix/calculix.patch similarity index 100% rename from pkgs/applications/science/math/calculix/calculix.patch rename to pkgs/by-name/ca/calculix/calculix.patch diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/by-name/ca/calculix/package.nix similarity index 100% rename from pkgs/applications/science/math/calculix/default.nix rename to pkgs/by-name/ca/calculix/package.nix diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/by-name/ca/calcure/package.nix similarity index 100% rename from pkgs/applications/misc/calcure/default.nix rename to pkgs/by-name/ca/calcure/package.nix diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/by-name/ca/calcurse/package.nix similarity index 100% rename from pkgs/applications/misc/calcurse/default.nix rename to pkgs/by-name/ca/calcurse/package.nix diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/by-name/ca/calendar-cli/package.nix similarity index 100% rename from pkgs/tools/networking/calendar-cli/default.nix rename to pkgs/by-name/ca/calendar-cli/package.nix diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index d957b2c79a92..b423fa01beca 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8="; env = { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; }; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/by-name/ca/callaudiod/package.nix similarity index 100% rename from pkgs/applications/audio/callaudiod/default.nix rename to pkgs/by-name/ca/callaudiod/package.nix diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/by-name/ca/calls/package.nix similarity index 100% rename from pkgs/applications/networking/calls/default.nix rename to pkgs/by-name/ca/calls/package.nix diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/by-name/ca/cambalache/package.nix similarity index 100% rename from pkgs/development/tools/cambalache/default.nix rename to pkgs/by-name/ca/cambalache/package.nix diff --git a/pkgs/tools/security/cameradar/default.nix b/pkgs/by-name/ca/cameradar/package.nix similarity index 100% rename from pkgs/tools/security/cameradar/default.nix rename to pkgs/by-name/ca/cameradar/package.nix diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/by-name/ca/camingo-code/package.nix similarity index 100% rename from pkgs/data/fonts/camingo-code/default.nix rename to pkgs/by-name/ca/camingo-code/package.nix diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/by-name/ca/camunda-modeler/package.nix similarity index 100% rename from pkgs/applications/misc/camunda-modeler/default.nix rename to pkgs/by-name/ca/camunda-modeler/package.nix diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/by-name/ca/can-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/can-utils/default.nix rename to pkgs/by-name/ca/can-utils/package.nix diff --git a/pkgs/os-specific/linux/cannelloni/default.nix b/pkgs/by-name/ca/cannelloni/package.nix similarity index 100% rename from pkgs/os-specific/linux/cannelloni/default.nix rename to pkgs/by-name/ca/cannelloni/package.nix diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix new file mode 100644 index 000000000000..e39bcf05e427 --- /dev/null +++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix @@ -0,0 +1,199 @@ +{ lib +, stdenv +, fetchurl +, unzip +, autoconf +, automake +, libtool_1_5 +, makeWrapper +, cups +, jbigkit +, glib +, gtk3 +, gdk-pixbuf +, pango +, cairo +, atk +, pkg-config +, libxml2 +, libredirect +, ghostscript +, pkgs +, zlib +}: + +let + system = + if stdenv.hostPlatform.system == "x86_64-linux" then "intel" + else if stdenv.hostPlatform.system == "aarch64-linux" then "arm" + else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}"; + ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; + libs = pkgs: lib.makeLibraryPath buildInputs; + + version = "5.90"; + dl = "8/0100007658/40"; + suffix1 = "m17n"; + suffix2 = "03"; + + versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version; + src_canon = fetchurl { + url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-${suffix1}-${suffix2}.tar.gz"; + hash = "sha256-HvuRQYqkHRCwfajSJPridDcADq7VkYwBEo4qr9W5mqA="; + }; + + buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ]; +in +stdenv.mkDerivation rec { + pname = "canon-cups-ufr2"; + inherit version; + src = src_canon; + + postUnpack = '' + ( + cd $sourceRoot + tar -xf Sources/cnrdrvcups-lb-${version}-1.${suffix2}.tar.xz + sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h} + sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am + sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am + patchShebangs cnrdrvcups-common-${version} + + sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am + sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile + patchShebangs cnrdrvcups-lb-${version} + ) + ''; + + nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 pkg-config ]; + + inherit buildInputs; + + installPhase = '' + runHook preInstall + + ( + cd cnrdrvcups-common-${version} + ./allgen.sh + make install + ) + ( + cd cnrdrvcups-common-${version}/Rule + mkdir -p $out/share/cups/usb + install -m 644 *.usb-quirks $out/share/cups/usb + ) + ( + cd cnrdrvcups-lb-${version} + ./allgen.sh + make install + + mkdir -p $out/share/cups/model + install -m 644 ppd/*.ppd $out/share/cups/model/ + ) + + ( + cd lib + mkdir -p $out/lib + install -m 755 libs64/${system}/libColorGearCufr2.so.2.0.0 $out/lib + install -m 755 libs64/${system}/libcaepcmufr2.so.1.0 $out/lib + install -m 755 libs64/${system}/libcaiocnpkbidir.so.1.0.0 $out/lib + install -m 755 libs64/${system}/libcaiousb.so.1.0.0 $out/lib + install -m 755 libs64/${system}/libcaiowrapufr2.so.1.0.0 $out/lib + install -m 755 libs64/${system}/libcanon_slimufr2.so.1.0.0 $out/lib + install -m 755 libs64/${system}/libcanonufr2r.so.1.0.0 $out/lib + install -m 755 libs64/${system}/libcnaccm.so.1.0 $out/lib + install -m 755 libs64/${system}/libcnlbcmr.so.1.0 $out/lib + install -m 755 libs64/${system}/libcnncapcmr.so.1.0 $out/lib + install -m 755 libs64/${system}/libufr2filterr.so.1.0.0 $out/lib + + install -m 755 libs64/${system}/cnpdfdrv $out/bin + install -m 755 libs64/${system}/cnpkbidir $out/bin + install -m 755 libs64/${system}/cnpkmoduleufr2r $out/bin + install -m 755 libs64/${system}/cnrsdrvufr2 $out/bin + install -m 755 libs64/${system}/cnsetuputil2 $out/bin/cnsetuputil2 + + mkdir -p $out/share/cnpkbidir + install -m 644 libs64/${system}/cnpkbidir_info* $out/share/cnpkbidir + + mkdir -p $out/share/ufr2filter + install -m 644 libs64/${system}/ThLB* $out/share/ufr2filter + ) + + ( + cd $out/lib + + ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so + ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so.2 + ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so + ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so.1 + ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so + ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so.1 + ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so + ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so.1 + ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so + ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so.1 + ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so + ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so.1 + ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so + ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so.1 + ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so + ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1 + ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so + ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1 + + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 + ) + + ( + cd $out/bin + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 + + wrapProgram $out/bin/cnrsdrvufr2 \ + --prefix LD_LIBRARY_PATH ":" "$out/lib" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /usr/bin/cnpkmoduleufr2r=$out/bin/cnpkmoduleufr2r:/usr/bin/cnjbigufr2=$out/bin/cnjbigufr2 + + wrapProgram $out/bin/cnsetuputil2 \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /usr/share/cnsetuputil2=$out/usr/share/cnsetuputil2 + ) + + ( + cd lib/data/ufr2 + mkdir -p $out/share/caepcm + install -m 644 *.ICC $out/share/caepcm + install -m 644 *.icc $out/share/caepcm + install -m 644 *.PRF $out/share/caepcm + install -m 644 CnLB* $out/share/caepcm + ) + + ( + cd cnrdrvcups-utility-${version}/data + mkdir -p $out/usr/share/cnsetuputil2 + install -m 644 cnsetuputil* $out/usr/share/cnsetuputil2 + ) + + makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \ + --prefix LD_LIBRARY_PATH ":" "$out/lib" \ + --prefix PATH ":" "$out/bin" + + runHook postInstall + ''; + + meta = with lib; { + description = "CUPS Linux drivers for Canon printers"; + homepage = "http://www.canon.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ lluchs ]; + }; +} diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/by-name/ca/canta-theme/package.nix similarity index 100% rename from pkgs/data/themes/canta/default.nix rename to pkgs/by-name/ca/canta-theme/package.nix diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/by-name/ca/cantarell-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/cantarell-fonts/default.nix rename to pkgs/by-name/ca/cantarell-fonts/package.nix diff --git a/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff b/pkgs/by-name/ca/cantata/dont-check-for-perl-in-PATH.diff similarity index 100% rename from pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff rename to pkgs/by-name/ca/cantata/dont-check-for-perl-in-PATH.diff diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix new file mode 100644 index 000000000000..7bb809dae7ee --- /dev/null +++ b/pkgs/by-name/ca/cantata/package.nix @@ -0,0 +1,202 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qt5, + perl, + + # Cantata doesn't build with cdparanoia enabled so we disable that + # default for now until I (or someone else) figure it out. + withCdda ? false, + cdparanoia, + withCddb ? false, + libcddb, + withLame ? false, + lame, + withMusicbrainz ? false, + libmusicbrainz5, + + withTaglib ? true, + taglib, + taglib_extras, + withHttpStream ? true, + withReplaygain ? true, + ffmpeg, + speex, + mpg123, + withMtp ? true, + libmtp, + withOnlineServices ? true, + withDevices ? true, + udisks2, + withDynamic ? true, + withHttpServer ? true, + withLibVlc ? false, + libvlc, + withStreams ? true, +}: + +# Inter-dependencies. +assert withCddb -> withCdda && withTaglib; +assert withCdda -> withCddb && withMusicbrainz; +assert withLame -> withCdda && withTaglib; +assert withMtp -> withTaglib; +assert withMusicbrainz -> withCdda && withTaglib; +assert withOnlineServices -> withTaglib; +assert withReplaygain -> withTaglib; +assert withLibVlc -> withHttpStream; + +let + fstat = x: fn: "-DENABLE_${fn}=${if x then "ON" else "OFF"}"; + + withUdisks = (withTaglib && withDevices && stdenv.hostPlatform.isLinux); + + options = [ + { + names = [ "CDDB" ]; + enable = withCddb; + pkgs = [ libcddb ]; + } + { + names = [ "CDPARANOIA" ]; + enable = withCdda; + pkgs = [ cdparanoia ]; + } + { + names = [ "DEVICES_SUPPORT" ]; + enable = withDevices; + pkgs = [ ]; + } + { + names = [ "DYNAMIC" ]; + enable = withDynamic; + pkgs = [ ]; + } + { + names = [ + "FFMPEG" + "MPG123" + "SPEEXDSP" + ]; + enable = withReplaygain; + pkgs = [ + ffmpeg + speex + mpg123 + ]; + } + { + names = [ "HTTPS_SUPPORT" ]; + enable = true; + pkgs = [ ]; + } + { + names = [ "HTTP_SERVER" ]; + enable = withHttpServer; + pkgs = [ ]; + } + { + names = [ "HTTP_STREAM_PLAYBACK" ]; + enable = withHttpStream; + pkgs = [ qt5.qtmultimedia ]; + } + { + names = [ "LAME" ]; + enable = withLame; + pkgs = [ lame ]; + } + { + names = [ "LIBVLC" ]; + enable = withLibVlc; + pkgs = [ libvlc ]; + } + { + names = [ "MTP" ]; + enable = withMtp; + pkgs = [ libmtp ]; + } + { + names = [ "MUSICBRAINZ" ]; + enable = withMusicbrainz; + pkgs = [ libmusicbrainz5 ]; + } + { + names = [ "ONLINE_SERVICES" ]; + enable = withOnlineServices; + pkgs = [ ]; + } + { + names = [ "STREAMS" ]; + enable = withStreams; + pkgs = [ ]; + } + { + names = [ + "TAGLIB" + "TAGLIB_EXTRAS" + ]; + enable = withTaglib; + pkgs = [ + taglib + taglib_extras + ]; + } + { + names = [ "UDISKS2" ]; + enable = withUdisks; + pkgs = [ udisks2 ]; + } + ]; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "cantata"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "CDrummond"; + repo = "cantata"; + rev = "v${finalAttrs.version}"; + hash = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw="; + }; + + patches = [ + # Cantata wants to check if perl is in the PATH at runtime, but we + # patchShebangs the playlists scripts, making that unnecessary (perl will + # always be available because it's a dependency) + ./dont-check-for-perl-in-PATH.diff + ]; + + postPatch = '' + patchShebangs playlists + ''; + + buildInputs = [ + qt5.qtbase + qt5.qtsvg + (perl.withPackages (ppkgs: with ppkgs; [ URI ])) + ] ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options)); + + nativeBuildInputs = [ + cmake + pkg-config + qt5.qttools + qt5.wrapQtAppsHook + ]; + + cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options); + + meta = { + description = "Graphical client for MPD"; + mainProgram = "cantata"; + homepage = "https://github.com/cdrummond/cantata"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ peterhoeg ]; + # Technically, Cantata should run on Darwin/Windows so if someone wants to + # bother figuring that one out, be my guest. + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/by-name/ca/canto-curses/package.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/canto-curses/default.nix rename to pkgs/by-name/ca/canto-curses/package.nix diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/by-name/ca/canto-daemon/package.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/canto-daemon/default.nix rename to pkgs/by-name/ca/canto-daemon/package.nix diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/by-name/ca/cantoolz/package.nix similarity index 100% rename from pkgs/tools/networking/cantoolz/default.nix rename to pkgs/by-name/ca/cantoolz/package.nix diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/by-name/ca/capitaine-cursors-themed/package.nix similarity index 100% rename from pkgs/data/icons/capitaine-cursors-themed/default.nix rename to pkgs/by-name/ca/capitaine-cursors-themed/package.nix diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/by-name/ca/capitaine-cursors/package.nix similarity index 100% rename from pkgs/data/icons/capitaine-cursors/default.nix rename to pkgs/by-name/ca/capitaine-cursors/package.nix diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/by-name/ca/capnproto-java/package.nix similarity index 100% rename from pkgs/development/tools/capnproto-java/default.nix rename to pkgs/by-name/ca/capnproto-java/package.nix diff --git a/pkgs/development/tools/capnproto-rust/default.nix b/pkgs/by-name/ca/capnproto-rust/package.nix similarity index 100% rename from pkgs/development/tools/capnproto-rust/default.nix rename to pkgs/by-name/ca/capnproto-rust/package.nix diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/by-name/ca/capnproto/package.nix similarity index 100% rename from pkgs/development/libraries/capnproto/default.nix rename to pkgs/by-name/ca/capnproto/package.nix diff --git a/pkgs/applications/emulators/caprice32/default.nix b/pkgs/by-name/ca/caprice32/package.nix similarity index 100% rename from pkgs/applications/emulators/caprice32/default.nix rename to pkgs/by-name/ca/caprice32/package.nix diff --git a/pkgs/applications/emulators/caprice32/string.patch b/pkgs/by-name/ca/caprice32/string.patch similarity index 100% rename from pkgs/applications/emulators/caprice32/string.patch rename to pkgs/by-name/ca/caprice32/string.patch diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix rename to pkgs/by-name/ca/caprine-bin/build-from-appimage.nix diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/pkgs/by-name/ca/caprine-bin/build-from-dmg.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix rename to pkgs/by-name/ca/caprine-bin/build-from-dmg.nix diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/by-name/ca/caprine-bin/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/caprine-bin/default.nix rename to pkgs/by-name/ca/caprine-bin/package.nix diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/by-name/ca/caps/package.nix similarity index 100% rename from pkgs/applications/audio/caps/default.nix rename to pkgs/by-name/ca/caps/package.nix diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/by-name/ca/captive-browser/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/captive-browser/default.nix rename to pkgs/by-name/ca/captive-browser/package.nix diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/by-name/ca/capture/package.nix similarity index 100% rename from pkgs/tools/misc/capture/default.nix rename to pkgs/by-name/ca/capture/package.nix diff --git a/pkgs/tools/typesetting/carbon-now-cli/default.nix b/pkgs/by-name/ca/carbon-now-cli/package.nix similarity index 100% rename from pkgs/tools/typesetting/carbon-now-cli/default.nix rename to pkgs/by-name/ca/carbon-now-cli/package.nix diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/by-name/ca/carddav-util/package.nix similarity index 100% rename from pkgs/tools/networking/carddav-util/default.nix rename to pkgs/by-name/ca/carddav-util/package.nix diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/by-name/ca/cardinal/package.nix similarity index 100% rename from pkgs/applications/audio/cardinal/default.nix rename to pkgs/by-name/ca/cardinal/package.nix diff --git a/pkgs/data/fonts/cardo/default.nix b/pkgs/by-name/ca/cardo/package.nix similarity index 100% rename from pkgs/data/fonts/cardo/default.nix rename to pkgs/by-name/ca/cardo/package.nix diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/by-name/ca/cargo-about/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-about/default.nix rename to pkgs/by-name/ca/cargo-about/package.nix diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/by-name/ca/cargo-all-features/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-all-features/default.nix rename to pkgs/by-name/ca/cargo-all-features/package.nix diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/by-name/ca/cargo-apk/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-apk/default.nix rename to pkgs/by-name/ca/cargo-apk/package.nix diff --git a/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch b/pkgs/by-name/ca/cargo-benchcmp/fix-test-binary-path.patch similarity index 100% rename from pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch rename to pkgs/by-name/ca/cargo-benchcmp/fix-test-binary-path.patch diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-benchcmp/default.nix rename to pkgs/by-name/ca/cargo-benchcmp/package.nix diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/by-name/ca/cargo-binstall/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-binstall/default.nix rename to pkgs/by-name/ca/cargo-binstall/package.nix diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/by-name/ca/cargo-binutils/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-binutils/default.nix rename to pkgs/by-name/ca/cargo-binutils/package.nix diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/ca/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch similarity index 100% rename from pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch rename to pkgs/by-name/ca/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bisect-rustc/default.nix rename to pkgs/by-name/ca/cargo-bisect-rustc/package.nix diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bitbake/default.nix rename to pkgs/by-name/ca/cargo-bitbake/package.nix diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/by-name/ca/cargo-bolero/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bolero/default.nix rename to pkgs/by-name/ca/cargo-bolero/package.nix diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix similarity index 100% rename from pkgs/development/tools/rust/bootimage/default.nix rename to pkgs/by-name/ca/cargo-bootimage/package.nix diff --git a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bundle-licenses/default.nix rename to pkgs/by-name/ca/cargo-bundle-licenses/package.nix diff --git a/pkgs/development/tools/rust/cargo-bundle/default.nix b/pkgs/by-name/ca/cargo-bundle/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bundle/default.nix rename to pkgs/by-name/ca/cargo-bundle/package.nix diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/by-name/ca/cargo-careful/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-careful/default.nix rename to pkgs/by-name/ca/cargo-careful/package.nix diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/by-name/ca/cargo-chef/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-chef/default.nix rename to pkgs/by-name/ca/cargo-chef/package.nix diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/by-name/ca/cargo-component/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-component/default.nix rename to pkgs/by-name/ca/cargo-component/package.nix diff --git a/pkgs/development/tools/rust/cargo-cranky/default.nix b/pkgs/by-name/ca/cargo-cranky/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-cranky/default.nix rename to pkgs/by-name/ca/cargo-cranky/package.nix diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/by-name/ca/cargo-criterion/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-criterion/default.nix rename to pkgs/by-name/ca/cargo-criterion/package.nix diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix new file mode 100644 index 000000000000..6e0d246f6146 --- /dev/null +++ b/pkgs/by-name/ca/cargo-cross/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cross"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "cross-rs"; + repo = "cross"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; + }; + + cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; + + checkFlags = [ + "--skip=docker::shared::tests::directories::test_host" + + # The following tests require empty CARGO_BUILD_TARGET env variable, but we + # set it ever since https://github.com/NixOS/nixpkgs/pull/298108. + "--skip=config::tests::test_config::no_env_and_no_toml_default_target_then_none" + "--skip=config::tests::test_config::no_env_but_toml_default_target_then_use_toml" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Zero setup cross compilation and cross testing"; + homepage = "https://github.com/cross-rs/cross"; + changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ otavio ]; + mainProgram = "cross"; + }; +} diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/by-name/ca/cargo-deb/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-deb/default.nix rename to pkgs/by-name/ca/cargo-deb/package.nix diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/by-name/ca/cargo-deny/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-deny/default.nix rename to pkgs/by-name/ca/cargo-deny/package.nix diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-depgraph/default.nix rename to pkgs/by-name/ca/cargo-depgraph/package.nix diff --git a/pkgs/development/tools/rust/cargo-dephell/Cargo.lock b/pkgs/by-name/ca/cargo-dephell/Cargo.lock similarity index 100% rename from pkgs/development/tools/rust/cargo-dephell/Cargo.lock rename to pkgs/by-name/ca/cargo-dephell/Cargo.lock diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/by-name/ca/cargo-dephell/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-dephell/default.nix rename to pkgs/by-name/ca/cargo-dephell/package.nix diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/by-name/ca/cargo-diet/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-diet/default.nix rename to pkgs/by-name/ca/cargo-diet/package.nix diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/by-name/ca/cargo-dist/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-dist/default.nix rename to pkgs/by-name/ca/cargo-dist/package.nix diff --git a/pkgs/development/tools/rust/cargo-docset/default.nix b/pkgs/by-name/ca/cargo-docset/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-docset/default.nix rename to pkgs/by-name/ca/cargo-docset/package.nix diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-duplicates/default.nix rename to pkgs/by-name/ca/cargo-duplicates/package.nix diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-espmonitor/default.nix rename to pkgs/by-name/ca/cargo-espmonitor/package.nix diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/by-name/ca/cargo-feature/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-feature/default.nix rename to pkgs/by-name/ca/cargo-feature/package.nix diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-fuzz/default.nix rename to pkgs/by-name/ca/cargo-fuzz/package.nix diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/by-name/ca/cargo-generate/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-generate/default.nix rename to pkgs/by-name/ca/cargo-generate/package.nix diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix new file mode 100644 index 000000000000..88e5646e5d61 --- /dev/null +++ b/pkgs/by-name/ca/cargo-gra/package.nix @@ -0,0 +1,25 @@ +{ + rustPlatform, + fetchCrate, + lib, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-gra"; + version = "0.6.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-cli7qaIVYvoZpDml/QAxm2vjvh/g28zlDSpU9IIUBfw="; + }; + + cargoHash = "sha256-xsaavcpDaiDDbL3Dl+7NLcfB5U6vuYsVPoIuA/KXCvI="; + + meta = { + license = lib.licenses.gpl3Plus; + homepage = "https://gitlab.com/floers/gtk-stuff/cargo-gra/"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + description = "gtk-rust-app cli for building flatpak apps with ease"; + }; +} diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/by-name/ca/cargo-guppy/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-guppy/default.nix rename to pkgs/by-name/ca/cargo-guppy/package.nix diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/by-name/ca/cargo-hack/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-hack/default.nix rename to pkgs/by-name/ca/cargo-hack/package.nix diff --git a/pkgs/development/tools/rust/cargo-info/default.nix b/pkgs/by-name/ca/cargo-info/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-info/default.nix rename to pkgs/by-name/ca/cargo-info/package.nix diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/by-name/ca/cargo-insta/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-insta/default.nix rename to pkgs/by-name/ca/cargo-insta/package.nix diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/by-name/ca/cargo-kcov/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-kcov/default.nix rename to pkgs/by-name/ca/cargo-kcov/package.nix diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix new file mode 100644 index 000000000000..9bf841fe3ffa --- /dev/null +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -0,0 +1,46 @@ +{ darwin +, fetchFromGitHub +, lib +, rustPlatform +, stdenv +}: +let + inherit (darwin.apple_sdk.frameworks) + CoreServices + SystemConfiguration + Security; + inherit (lib) optionals; + inherit (stdenv.hostPlatform) isDarwin; +in +rustPlatform.buildRustPackage rec { + pname = "cargo-leptos"; + version = "0.2.21"; + + src = fetchFromGitHub { + owner = "leptos-rs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Oe65m9io7ihymUjylaWHQM/x7r0y/xXqD313H3oyjN8="; + }; + + cargoHash = "sha256-wZNtEr6IAy+OABpTm93rOhKAP1NEEYUvokjaVdoaSG4="; + + buildInputs = optionals isDarwin [ + SystemConfiguration + Security + CoreServices + ]; + + # https://github.com/leptos-rs/cargo-leptos#dependencies + buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise + doCheck = false; # Check phase tries to query crates.io + + meta = with lib; { + description = "Build tool for the Leptos web framework"; + mainProgram = "cargo-leptos"; + homepage = "https://github.com/leptos-rs/cargo-leptos"; + changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ benwis ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/by-name/ca/cargo-license/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-license/default.nix rename to pkgs/by-name/ca/cargo-license/package.nix diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/by-name/ca/cargo-limit/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-limit/default.nix rename to pkgs/by-name/ca/cargo-limit/package.nix diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-llvm-cov/default.nix rename to pkgs/by-name/ca/cargo-llvm-cov/package.nix diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix new file mode 100644 index 000000000000..ab50c9c54a39 --- /dev/null +++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-llvm-lines"; + version = "0.4.41"; + + src = fetchFromGitHub { + owner = "dtolnay"; + repo = pname; + rev = version; + hash = "sha256-ewxdjvo9WFVX4484uuEkerzcJ4fOy2Sm90tiPGNbrV0="; + }; + + cargoHash = "sha256-9jG5VgIlHYv1IFSjPy34dNk8RHjhgXi6daI+R0jgxMc="; + + meta = with lib; { + description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; + mainProgram = "cargo-llvm-lines"; + homepage = "https://github.com/dtolnay/cargo-llvm-lines"; + changelog = "https://github.com/dtolnay/cargo-llvm-lines/releases/tag/${src.rev}"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-local-registry/default.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-local-registry/default.nix rename to pkgs/by-name/ca/cargo-local-registry/package.nix diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/by-name/ca/cargo-lock/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-lock/default.nix rename to pkgs/by-name/ca/cargo-lock/package.nix diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/by-name/ca/cargo-machete/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-machete/default.nix rename to pkgs/by-name/ca/cargo-machete/package.nix diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 7136085fa82d..ad3a30c98d8f 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.20"; + version = "0.37.23"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-PmCpm+ZOqnJdGrQtOciU6hEKV2lfoUT8bGtWzRpBXxQ="; + hash = "sha256-yYZasrnfxpLf0z6GndLYhkIFfVNjTkx4zdfHYX6WyXk="; }; - cargoHash = "sha256-RjsYrFbS/OiMQKTiPshGcBI9KF75Z5stn2HaB6mniZE="; + cargoHash = "sha256-X4FhUqhf58wbl3A8nlXAqnYkkaXajxxqRyJn5K7BVqM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix new file mode 100644 index 000000000000..efce68a52978 --- /dev/null +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, git +, darwin +, makeWrapper +}: + +let + inherit (darwin.apple_sdk.frameworks) CoreServices; + pname = "cargo-mobile2"; + version = "0.17.4"; +in +rustPlatform.buildRustPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "tauri-apps"; + repo = pname; + rev = "cargo-mobile2-v${version}"; + hash = "sha256-1lrimBdJwur5b4wB8hZVUtJEbgXoib0ytzjzhkqNE6c="; + }; + + # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at + # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 + # sourceRoot = "${src.name}/tooling/cli"; + + cargoHash = "sha256-vmoR5pA8CNf4eZpQgj0Wn1/FmId4hmpSi7FYxBY5O9M="; + + preBuild = '' + mkdir -p $out/share/ + # during the install process tauri-mobile puts templates and commit information in CARGO_HOME + export CARGO_HOME=$out/share/ + ''; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + nativeBuildInputs = [ pkg-config git makeWrapper ]; + + preFixup = '' + for bin in $out/bin/cargo-*; do + wrapProgram $bin \ + --set CARGO_HOME "$out/share" + done + ''; + + meta = with lib; { + description = "Rust on mobile made easy!"; + homepage = "https://tauri.app/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix new file mode 100644 index 000000000000..13625dae781d --- /dev/null +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -0,0 +1,62 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-modules"; + version = "0.19.1"; + + src = fetchFromGitHub { + owner = "regexident"; + repo = "cargo-modules"; + rev = "refs/tags/v${version}"; + hash = "sha256-2wA34rQHHAvx+5NhmtugnGTMZ2Sj8MNpdkkIJhDK1HM="; + }; + + cargoHash = "sha256-3R7rFkA2tObJZk5ypWPpMojEZvrDgKZsc1dN1wBJ63A="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + checkFlags = [ + "--skip=cfg_test::with_tests::smoke" + "--skip=cfg_test::without_tests::smoke" + "--skip=colors::ansi::smoke" + "--skip=colors::plain::smoke" + "--skip=colors::truecolor::smoke" + "--skip=fields::enum_fields" + "--skip=fields::struct_fields" + "--skip=fields::tuple_fields" + "--skip=fields::union_fields" + "--skip=focus_on::glob_path::smoke" + "--skip=focus_on::self_path::smoke" + "--skip=focus_on::simple_path::smoke" + "--skip=focus_on::use_tree::smoke" + "--skip=functions::function_body" + "--skip=functions::function_inputs" + "--skip=functions::function_outputs" + "--skip=max_depth::depth_2::smoke" + "--skip=selection::no_fns::smoke" + "--skip=selection::no_modules::smoke" + "--skip=selection::no_traits::smoke" + "--skip=selection::no_types::smoke" + ]; + + meta = { + description = "Cargo plugin for showing a tree-like overview of a crate's modules"; + homepage = "https://github.com/regexident/cargo-modules"; + changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + figsoda + rvarago + matthiasbeyer + ]; + mainProgram = "cargo-modules"; + }; +} diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/by-name/ca/cargo-mommy/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-mommy/default.nix rename to pkgs/by-name/ca/cargo-mommy/package.nix diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/by-name/ca/cargo-mutants/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-mutants/default.nix rename to pkgs/by-name/ca/cargo-mutants/package.nix diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/by-name/ca/cargo-nextest/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-nextest/default.nix rename to pkgs/by-name/ca/cargo-nextest/package.nix diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/by-name/ca/cargo-play/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-play/default.nix rename to pkgs/by-name/ca/cargo-play/package.nix diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/by-name/ca/cargo-public-api/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-public-api/default.nix rename to pkgs/by-name/ca/cargo-public-api/package.nix diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/by-name/ca/cargo-readme/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-readme/default.nix rename to pkgs/by-name/ca/cargo-readme/package.nix diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/by-name/ca/cargo-release/Cargo.lock similarity index 100% rename from pkgs/development/tools/rust/cargo-release/Cargo.lock rename to pkgs/by-name/ca/cargo-release/Cargo.lock diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/by-name/ca/cargo-release/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-release/default.nix rename to pkgs/by-name/ca/cargo-release/package.nix diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix new file mode 100644 index 000000000000..38f4d6c5d4fc --- /dev/null +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchCrate, + fetchurl, + rustPlatform, + pkg-config, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-risczero"; + version = "1.1.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-YZ3yhj1VLxl3Fg/yWhqrZXxIQ7oK6Gdo0NU39oDvoo8="; + }; + + src-recursion-hash = "28e4eeff7a8f73d27408d99a1e3e8842c79a5f4353e5117ec0b7ffaa7c193612"; # That is from cargoDeps/risc0-circuit-recursion/build.rs + + src-recursion = fetchurl { + url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip"; + hash = "sha256-KOTu/3qPc9J0CNmaHj6IQseaX0NT5RF+wLf/qnwZNhI="; # This hash should be the same as src-recuresion-hash + }; + + env = { + RECURSION_SRC_PATH = src-recursion; + }; + + cargoHash = "sha256-pNgnUtKn2w5rWbgDi0MHZCm9nYPgESL3g7EMaYwoSq4="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + # The tests require network access which is not available in sandboxed Nix builds. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cargo extension to help create, manage, and test RISC Zero projects"; + mainProgram = "cargo-risczero"; + homepage = "https://risczero.com"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ cameronfyfe ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/by-name/ca/cargo-rr/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-rr/default.nix rename to pkgs/by-name/ca/cargo-rr/package.nix diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-run-bin/default.nix rename to pkgs/by-name/ca/cargo-run-bin/package.nix diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-semver-checks/default.nix rename to pkgs/by-name/ca/cargo-semver-checks/package.nix diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-show-asm/default.nix rename to pkgs/by-name/ca/cargo-show-asm/package.nix diff --git a/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix b/pkgs/by-name/ca/cargo-show-asm/test-basic-x86_64.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix rename to pkgs/by-name/ca/cargo-show-asm/test-basic-x86_64.nix diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/by-name/ca/cargo-shuttle/Cargo.lock similarity index 100% rename from pkgs/development/tools/rust/cargo-shuttle/Cargo.lock rename to pkgs/by-name/ca/cargo-shuttle/Cargo.lock diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-shuttle/default.nix rename to pkgs/by-name/ca/cargo-shuttle/package.nix diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/by-name/ca/cargo-sort/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-sort/default.nix rename to pkgs/by-name/ca/cargo-sort/package.nix diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-supply-chain/default.nix rename to pkgs/by-name/ca/cargo-supply-chain/package.nix diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix new file mode 100644 index 000000000000..98b23c9d0e70 --- /dev/null +++ b/pkgs/by-name/ca/cargo-sweep/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sweep"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "holmgr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; + }; + + cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; + + checkFlags = [ + # Requires a rustup toolchain to be installed. + "--skip check_toolchain_listing_on_multiple_projects" + # Does not work with a `--target` build in the environment + "--skip empty_project_output" + ]; + + meta = with lib; { + description = "Cargo subcommand for cleaning up unused build files generated by Cargo"; + mainProgram = "cargo-sweep"; + homepage = "https://github.com/holmgr/cargo-sweep"; + license = licenses.mit; + maintainers = with maintainers; [ + xrelkd + matthiasbeyer + ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-sync-readme/default.nix rename to pkgs/by-name/ca/cargo-sync-readme/package.nix diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix new file mode 100644 index 000000000000..92127031c8a5 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchCrate, stdenv, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-tally"; + version = "1.0.50"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-kU2SmD51enAyRzzpPJunMKloKS1m7zwEqk2kMX94s7U="; + }; + + cargoHash = "sha256-tWMiAb50znyZS77Qcp5dUjPr7qnODjiEFunIyDOde8s="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + DiskArbitration + Foundation + IOKit + ]); + + meta = with lib; { + description = "Graph the number of crates that depend on your crate over time"; + mainProgram = "cargo-tally"; + homepage = "https://github.com/dtolnay/cargo-tally"; + changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/by-name/ca/cargo-temp/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-temp/default.nix rename to pkgs/by-name/ca/cargo-temp/package.nix diff --git a/pkgs/development/tools/rust/cargo-toml-lint/default.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-toml-lint/default.nix rename to pkgs/by-name/ca/cargo-toml-lint/package.nix diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/by-name/ca/cargo-ui/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-ui/default.nix rename to pkgs/by-name/ca/cargo-ui/package.nix diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-unused-features/default.nix rename to pkgs/by-name/ca/cargo-unused-features/package.nix diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix new file mode 100644 index 000000000000..2a41ee0cfae6 --- /dev/null +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -0,0 +1,69 @@ +{ lib +, rustPlatform +, fetchCrate +, cmake +, installShellFiles +, pkg-config +, ronn +, stdenv +, curl +, libgit2 +, libssh2 +, openssl +, zlib +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-update"; + version = "16.0.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-jLv/9Fvg+1HNIhfm0D/vvMR9J+Enztj9rXQE1kZITGI="; + }; + + cargoHash = "sha256-rwXpQkL6ysMBraLIMk2zQe0vmb9uuePWufBjRVzaBOA="; + + nativeBuildInputs = [ + cmake + installShellFiles + pkg-config + ronn + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; + + buildInputs = [ + libgit2 + libssh2 + openssl + zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + ]; + + postBuild = '' + # Man pages contain non-ASCII, so explicitly set encoding to UTF-8. + HOME=$TMPDIR \ + RUBYOPT="-E utf-8:utf-8" \ + ronn -r --organization="cargo-update developers" man/*.md + ''; + + postInstall = '' + installManPage man/*.1 + ''; + + env = { + LIBGIT2_NO_VENDOR = 1; + }; + + meta = with lib; { + description = "Cargo subcommand for checking and applying updates to installed executables"; + homepage = "https://github.com/nabijaczleweli/cargo-update"; + changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor matthiasbeyer ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-v5/package.nix b/pkgs/by-name/ca/cargo-v5/package.nix new file mode 100644 index 000000000000..59f5b3003e9b --- /dev/null +++ b/pkgs/by-name/ca/cargo-v5/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + dbus, + udev, + openssl, +}: + +rustPlatform.buildRustPackage { + pname = "cargo-v5"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "vexide"; + repo = "cargo-v5"; + rev = "9d5f6e014c80838ff2b0cca401bcbd518c1e9274"; + hash = "sha256-bXzJvlhG/IJOu+D1iluJD3wDoiJXWzXYJ+ZUG6xMCeA="; + }; + + cargoHash = "sha256-OQ3XY8RzmjGZWFyTY3HY9AYb8qDHHeEAuWa+3WNOtRM="; + + buildFeatures = [ "full" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + dbus + udev + openssl + ]; + + meta = { + description = "Cargo tool for working with VEX V5 Rust projects"; + mainProgram = "cargo-v5"; + homepage = "https://github.com/vexide/cargo-v5"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ max-niederman ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-valgrind/default.nix rename to pkgs/by-name/ca/cargo-valgrind/package.nix diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/by-name/ca/cargo-wipe/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-wipe/default.nix rename to pkgs/by-name/ca/cargo-wipe/package.nix diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-workspaces/default.nix rename to pkgs/by-name/ca/cargo-workspaces/package.nix diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-xbuild/default.nix rename to pkgs/by-name/ca/cargo-xbuild/package.nix diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/by-name/ca/cariddi/package.nix similarity index 100% rename from pkgs/tools/security/cariddi/default.nix rename to pkgs/by-name/ca/cariddi/package.nix diff --git a/pkgs/data/fonts/carlito/calibri-alias.conf b/pkgs/by-name/ca/carlito/calibri-alias.conf similarity index 100% rename from pkgs/data/fonts/carlito/calibri-alias.conf rename to pkgs/by-name/ca/carlito/calibri-alias.conf diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/by-name/ca/carlito/package.nix similarity index 100% rename from pkgs/data/fonts/carlito/default.nix rename to pkgs/by-name/ca/carlito/package.nix diff --git a/pkgs/development/libraries/caroline/default.nix b/pkgs/by-name/ca/caroline/package.nix similarity index 100% rename from pkgs/development/libraries/caroline/default.nix rename to pkgs/by-name/ca/caroline/package.nix diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/by-name/ca/carp/package.nix similarity index 100% rename from pkgs/development/compilers/carp/default.nix rename to pkgs/by-name/ca/carp/package.nix diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/by-name/ca/carps-cups/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/carps-cups/default.nix rename to pkgs/by-name/ca/carps-cups/package.nix diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix new file mode 100644 index 000000000000..6d2bcb7700ee --- /dev/null +++ b/pkgs/by-name/ca/cartero/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + meson, + ninja, + pkg-config, + cargo, + rustc, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libxml2, + libadwaita, + gtksourceview5, + openssl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cartero"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "danirod"; + repo = "cartero"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-hbByC2r48+Zm/On99m9VWj4TJi6aeM/km2vcfvMMz38="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + cargo + rustc + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + libxml2 # xmllint + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + openssl + ]; + + meta = { + description = "Make HTTP requests and test APIs"; + longDescription = '' + Cartero is a graphical HTTP client that can be used + as a developer tool to test web APIs and perform all + kind of HTTP requests to web servers. It is compatible + with any REST, SOAP or XML-RPC API and it supports + multiple request methods as well as attaching body + payloads to compatible requests. + ''; + homepage = "https://cartero.danirod.es"; + license = lib.licenses.gpl3Plus; + mainProgram = "cartero"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/tools/carto/default.nix b/pkgs/by-name/ca/carto/package.nix similarity index 100% rename from pkgs/development/tools/carto/default.nix rename to pkgs/by-name/ca/carto/package.nix diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 53f13d323262..dcf191f9cc7b 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -1,34 +1,41 @@ { lib, - fetchFromGitHub, - python3Packages, appstream, blueprint-compiler, desktop-file-utils, - gobject-introspection, + fetchFromGitHub, + glib, glib-networking, + gobject-introspection, + gtk4, libadwaita, meson, ninja, pkg-config, + python3Packages, wrapGAppsHook4, }: + python3Packages.buildPythonApplication rec { pname = "cartridges"; - version = "2.9.3"; + version = "2.10.1"; pyproject = false; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "refs/tags/v${version}"; - hash = "sha256-37i8p6KaS/G7ybw850XYaPiG83/Lffn/+21xVk5xva0="; + hash = "sha256-uwU0jW5+33hiqpuG83r0GVfANl6ltDLa3s4s0IJHRoQ="; }; + strictDeps = true; + nativeBuildInputs = [ appstream blueprint-compiler - desktop-file-utils + desktop-file-utils # for `desktop-file-validate` + glib # for `glib-compile-schemas` + gtk4 # for `gtk-update-icon-cache` gobject-introspection meson ninja @@ -49,12 +56,19 @@ python3Packages.buildPythonApplication rec { ]; dontWrapGApps = true; - makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ]; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; postFixup = '' wrapPythonProgramsIn $out/libexec $out $pythonPath ''; + # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase + # is skipped by `buildPythonApplication` + # https://github.com/NixOS/nixpkgs/blob/9d4343b7b27a3e6f08fc22ead568233ff24bbbde/pkgs/development/interpreters/python/mk-python-derivation.nix#L296 + postInstallCheck = '' + mesonCheckPhase + ''; + meta = { description = "GTK4 + Libadwaita game launcher"; longDescription = '' @@ -64,7 +78,7 @@ python3Packages.buildPythonApplication rec { You can sort and hide games or download cover art from SteamGridDB. ''; homepage = "https://apps.gnome.org/Cartridges/"; - changelog = "https://github.com/kra-mo/cartridges/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + changelog = "https://github.com/kra-mo/cartridges/releases/tag/${version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "cartridges"; diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 5cd35b064342..37bd4b1f567e 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -10,6 +10,7 @@ cplex, fatrop, fetchFromGitHub, + fetchpatch, gurobi, highs, hpipm, @@ -45,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ="; }; + patches = [ + (fetchpatch { + name = "fix-FindMUMPS.cmake.patch"; + url = "https://github.com/casadi/casadi/pull/3899/commits/274f4b23f73e60c5302bec0479fe1e92682b63d2.patch"; + hash = "sha256-3GWEWlN8dKLD6htpnOQLChldcT3hE09JWLeuCfAhY+4="; + }) + ]; + postPatch = '' # fix case of hpipmConfig.cmake @@ -55,12 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # nix provide lib/clang headers in libclang, not in llvm. substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \ '$'{CLANG_LLVM_LIB_DIR} \ - ${llvmPackages_17.libclang.lib}/lib - - # fix mumps lib name. No idea where this comes from. - substituteInPlace cmake/FindMUMPS.cmake --replace-fail \ - "mumps_seq" \ - "mumps" + ${lib.getLib llvmPackages_17.libclang}/lib # help casadi find its own libs substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/by-name/ca/cascadia-code/package.nix similarity index 100% rename from pkgs/data/fonts/cascadia-code/default.nix rename to pkgs/by-name/ca/cascadia-code/package.nix diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/by-name/ca/cassowary/package.nix similarity index 100% rename from pkgs/tools/networking/cassowary/default.nix rename to pkgs/by-name/ca/cassowary/package.nix diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/by-name/ca/castget/package.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/castget/default.nix rename to pkgs/by-name/ca/castget/package.nix diff --git a/pkgs/tools/networking/castnow/default.nix b/pkgs/by-name/ca/castnow/package.nix similarity index 100% rename from pkgs/tools/networking/castnow/default.nix rename to pkgs/by-name/ca/castnow/package.nix diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/by-name/ca/castor/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/castor/default.nix rename to pkgs/by-name/ca/castor/package.nix diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/by-name/ca/castty/package.nix similarity index 100% rename from pkgs/tools/misc/castty/default.nix rename to pkgs/by-name/ca/castty/package.nix diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index fc8eccd1dcca..03a984741211 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -52,6 +52,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # darwin clang adds `-isysroot` when $SDKROOT is set. this confuses the + # regular expressions for the disabled tests below. + checkPhase = '' + runHook preCheck + ctest -E 'cmd.cc-gnu-(src-cxx|c-src-c)-cmd' -j $NIX_BUILD_CORES + runHook postCheck + ''; + passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/by-name/ca/catatonit/package.nix similarity index 100% rename from pkgs/applications/virtualization/catatonit/default.nix rename to pkgs/by-name/ca/catatonit/package.nix diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/by-name/ca/catch/package.nix similarity index 100% rename from pkgs/development/libraries/catch/default.nix rename to pkgs/by-name/ca/catch/package.nix diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/by-name/ca/catclock/package.nix similarity index 100% rename from pkgs/applications/misc/catclock/default.nix rename to pkgs/by-name/ca/catclock/package.nix diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/by-name/ca/catdoc/package.nix similarity index 100% rename from pkgs/tools/text/catdoc/default.nix rename to pkgs/by-name/ca/catdoc/package.nix diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/by-name/ca/catdocx/package.nix similarity index 100% rename from pkgs/tools/text/catdocx/default.nix rename to pkgs/by-name/ca/catdocx/package.nix diff --git a/pkgs/tools/typesetting/tex/catdvi/default.nix b/pkgs/by-name/ca/catdvi/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/catdvi/default.nix rename to pkgs/by-name/ca/catdvi/package.nix diff --git a/pkgs/os-specific/linux/catfs/Cargo.lock b/pkgs/by-name/ca/catfs/Cargo.lock similarity index 100% rename from pkgs/os-specific/linux/catfs/Cargo.lock rename to pkgs/by-name/ca/catfs/Cargo.lock diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/by-name/ca/catfs/package.nix similarity index 100% rename from pkgs/os-specific/linux/catfs/default.nix rename to pkgs/by-name/ca/catfs/package.nix diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/by-name/ca/catgirl/package.nix similarity index 100% rename from pkgs/applications/networking/irc/catgirl/default.nix rename to pkgs/by-name/ca/catgirl/package.nix diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/by-name/ca/catimg/package.nix similarity index 100% rename from pkgs/tools/misc/catimg/default.nix rename to pkgs/by-name/ca/catimg/package.nix diff --git a/pkgs/tools/audio/catnip-gtk4/default.nix b/pkgs/by-name/ca/catnip-gtk4/package.nix similarity index 100% rename from pkgs/tools/audio/catnip-gtk4/default.nix rename to pkgs/by-name/ca/catnip-gtk4/package.nix diff --git a/pkgs/tools/audio/catnip/default.nix b/pkgs/by-name/ca/catnip/package.nix similarity index 100% rename from pkgs/tools/audio/catnip/default.nix rename to pkgs/by-name/ca/catnip/package.nix diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 57357ea47c2b..bc85007b0c67 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -40,7 +40,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "1.0.0"; + version = "1.0.1"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo="; + hash = "sha256-l01L0UiE9bgUOMHhs74Bndarw2b6TaJGW/xU/8rfoAk="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/catppuccin-kde/color.sh b/pkgs/by-name/ca/catppuccin-kde/color.sh similarity index 100% rename from pkgs/data/themes/catppuccin-kde/color.sh rename to pkgs/by-name/ca/catppuccin-kde/color.sh diff --git a/pkgs/data/themes/catppuccin-kde/default.nix b/pkgs/by-name/ca/catppuccin-kde/package.nix similarity index 100% rename from pkgs/data/themes/catppuccin-kde/default.nix rename to pkgs/by-name/ca/catppuccin-kde/package.nix diff --git a/pkgs/data/themes/catppuccin-kvantum/default.nix b/pkgs/by-name/ca/catppuccin-kvantum/package.nix similarity index 100% rename from pkgs/data/themes/catppuccin-kvantum/default.nix rename to pkgs/by-name/ca/catppuccin-kvantum/package.nix diff --git a/pkgs/data/icons/catppuccin-papirus-folders/default.nix b/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix similarity index 100% rename from pkgs/data/icons/catppuccin-papirus-folders/default.nix rename to pkgs/by-name/ca/catppuccin-papirus-folders/package.nix diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/by-name/ca/catt/package.nix similarity index 100% rename from pkgs/applications/video/catt/default.nix rename to pkgs/by-name/ca/catt/package.nix diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/by-name/ca/caudec/package.nix similarity index 100% rename from pkgs/applications/audio/caudec/default.nix rename to pkgs/by-name/ca/caudec/package.nix diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/by-name/ca/cauwugo/package.nix similarity index 100% rename from pkgs/development/tools/rust/cauwugo/default.nix rename to pkgs/by-name/ca/cauwugo/package.nix diff --git a/pkgs/servers/cayley/default.nix b/pkgs/by-name/ca/cayley/package.nix similarity index 100% rename from pkgs/servers/cayley/default.nix rename to pkgs/by-name/ca/cayley/package.nix diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/by-name/cb/cbatticon/package.nix similarity index 100% rename from pkgs/applications/misc/cbatticon/default.nix rename to pkgs/by-name/cb/cbatticon/package.nix diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/by-name/cb/cbc/package.nix similarity index 100% rename from pkgs/applications/science/math/cbc/default.nix rename to pkgs/by-name/cb/cbc/package.nix diff --git a/pkgs/by-name/cb/cbconvert/gui.nix b/pkgs/by-name/cb/cbconvert/gui.nix new file mode 100644 index 000000000000..a5721401d31e --- /dev/null +++ b/pkgs/by-name/cb/cbconvert/gui.nix @@ -0,0 +1,48 @@ +{ + buildGoModule, + cbconvert, + gtk3, + wrapGAppsHook3, +}: + +buildGoModule rec { + pname = "cbconvert-gui"; + + inherit (cbconvert) + patches + proxyVendor + src + tags + version + ; + + nativeBuildInputs = cbconvert.nativeBuildInputs ++ [ + wrapGAppsHook3 + ]; + buildInputs = cbconvert.buildInputs ++ [ gtk3 ]; + + vendorHash = "sha256-vvCvKecPszhNCQdgm3mQMb5+486BGZ9sz3R0b70eLeQ="; + modRoot = "cmd/cbconvert-gui"; + + ldflags = [ + "-s" + "-w" + "-X main.appVersion=${version}" + ]; + + postInstall = '' + install -D --mode=0644 --target-directory=$out/share/applications/ dist/linux/cbconvert.desktop + install -D --mode=0644 --target-directory=$out/icons/hicolor/256x256/apps dist/linux/cbconvert.png + install -D --mode=0644 --target-directory=$out/share/thumbnailers dist/linux/cbconvert.thumbnailer + install -D --mode=0644 dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml $out/share/metainfo/cbconvert.metainfo.xml + ''; + + postFixup = '' + substituteInPlace $out/share/metainfo/cbconvert.metainfo.xml \ + --replace-fail "io.github.gen2brain.cbconvert" "cbconvert" + ''; + + meta = cbconvert.meta // { + mainProgram = "cbconvert-gui"; + }; +} diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix new file mode 100644 index 000000000000..9ab25d493c07 --- /dev/null +++ b/pkgs/by-name/cb/cbconvert/package.nix @@ -0,0 +1,87 @@ +{ + buildGoModule, + bzip2, + callPackage, + cbconvert, + fetchFromGitHub, + fetchpatch2, + imagemagick, + lib, + libunarr, + mupdf-headless, + nix-update-script, + pkg-config, + testers, + zlib, +}: + +buildGoModule rec { + pname = "cbconvert"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "gen2brain"; + repo = "cbconvert"; + rev = "v${version}"; + hash = "sha256-9x7RXyiQoV2nIVFnG1XHcYfTQiMZ88Ck7uuY7NLK8CA="; + }; + + # Update dependencies in order to use the extlib tag. + patches = [ + (fetchpatch2 { + name = "update-dependencies-1.patch"; + url = "https://github.com/gen2brain/cbconvert/commit/1a36ec17b2c012f278492d60d469b8e8457a6110.patch"; + hash = "sha256-E+HWYPz9FtU3JAktzIRflF/pHdLfoaciBmjb7UOQYLo="; + }) + (fetchpatch2 { + name = "update-dependencies-2.patch"; + url = "https://github.com/gen2brain/cbconvert/commit/74c5de699413e95133f97666b64a1866f88fedd5.patch"; + hash = "sha256-rrJsYJHcfNWF90vwUAT3J/gqg22e1gk6I48LsTrYbmU="; + }) + ]; + + vendorHash = "sha256-aVInsWvygNH+/h7uQs4hAPOO2gsSkBx+tI+TK77M/hg="; + modRoot = "cmd/cbconvert"; + + proxyVendor = true; + + # The extlib tag forces the github.com/gen2brain/go-unarr module to use external libraries instead of bundled ones. + tags = [ "extlib" ]; + + ldflags = [ + "-s" + "-w" + "-X main.appVersion=${version}" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + imagemagick + libunarr + mupdf-headless + zlib + ]; + + passthru = { + gui = callPackage ./gui.nix { }; + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = cbconvert; + command = "cbconvert version"; + }; + }; + + meta = { + description = "Comic Book converter"; + homepage = "https://github.com/gen2brain/cbconvert"; + changelog = "https://github.com/gen2brain/cbconvert/releases/tag/v${version}"; + license = with lib.licenses; [ gpl3Only ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jwillikers ]; + mainProgram = "cbconvert"; + }; +} diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/by-name/cb/cbfmt/package.nix similarity index 100% rename from pkgs/development/tools/cbfmt/default.nix rename to pkgs/by-name/cb/cbfmt/package.nix diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch similarity index 100% rename from pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch rename to pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/by-name/cb/cbmc/package.nix similarity index 100% rename from pkgs/applications/science/logic/cbmc/default.nix rename to pkgs/by-name/cb/cbmc/package.nix diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/by-name/cb/cbonsai/package.nix similarity index 100% rename from pkgs/games/cbonsai/default.nix rename to pkgs/by-name/cb/cbonsai/package.nix diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/by-name/cb/cbrowser/backslashes-quotes.diff similarity index 100% rename from pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff rename to pkgs/by-name/cb/cbrowser/backslashes-quotes.diff diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/by-name/cb/cbrowser/package.nix similarity index 100% rename from pkgs/development/tools/misc/cbrowser/default.nix rename to pkgs/by-name/cb/cbrowser/package.nix diff --git a/pkgs/development/embedded/cc-tool/default.nix b/pkgs/by-name/cc/cc-tool/package.nix similarity index 100% rename from pkgs/development/embedded/cc-tool/default.nix rename to pkgs/by-name/cc/cc-tool/package.nix diff --git a/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/by-name/cc/cc2538-bsl/package.nix similarity index 100% rename from pkgs/tools/misc/cc2538-bsl/default.nix rename to pkgs/by-name/cc/cc2538-bsl/package.nix diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index c30543cdbdd1..25753bd55557 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { isGNU = unwrappedCC.isGNU or false; isCcache = true; }; - inherit (unwrappedCC) lib; + lib = lib.getLib unwrappedCC; nativeBuildInputs = [ makeWrapper ]; # Unwrapped clang does not have a targetPrefix because it is multi-target # target is decided with argv0. diff --git a/pkgs/tools/misc/ccal/default.nix b/pkgs/by-name/cc/ccal/package.nix similarity index 100% rename from pkgs/tools/misc/ccal/default.nix rename to pkgs/by-name/cc/ccal/package.nix diff --git a/pkgs/development/tools/analysis/cccc/cccc.patch b/pkgs/by-name/cc/cccc/cccc.patch similarity index 100% rename from pkgs/development/tools/analysis/cccc/cccc.patch rename to pkgs/by-name/cc/cccc/cccc.patch diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/by-name/cc/cccc/package.nix similarity index 100% rename from pkgs/development/tools/analysis/cccc/default.nix rename to pkgs/by-name/cc/cccc/package.nix diff --git a/pkgs/tools/cd-dvd/ccd2iso/include.patch b/pkgs/by-name/cc/ccd2iso/include.patch similarity index 100% rename from pkgs/tools/cd-dvd/ccd2iso/include.patch rename to pkgs/by-name/cc/ccd2iso/include.patch diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/by-name/cc/ccd2iso/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/ccd2iso/default.nix rename to pkgs/by-name/cc/ccd2iso/package.nix diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/by-name/cc/ccemux/package.nix similarity index 100% rename from pkgs/applications/emulators/ccemux/default.nix rename to pkgs/by-name/cc/ccemux/package.nix diff --git a/pkgs/by-name/cc/cconv/package.nix b/pkgs/by-name/cc/cconv/package.nix new file mode 100644 index 000000000000..c47b6371d345 --- /dev/null +++ b/pkgs/by-name/cc/cconv/package.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }: + +stdenv.mkDerivation rec { + pname = "cconv"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "xiaoyjy"; + repo = "cconv"; + rev = "v${version}"; + sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libiconv ]; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-liconv"; + + meta = with lib; { + description = "Iconv based simplified-traditional chinese conversion tool"; + mainProgram = "cconv"; + homepage = "https://github.com/xiaoyjy/cconv"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.redfish64 ]; + }; +} diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/by-name/cc/ccrtp/package.nix similarity index 100% rename from pkgs/development/libraries/ccrtp/default.nix rename to pkgs/by-name/cc/ccrtp/package.nix diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/by-name/cc/ccrypt/package.nix similarity index 100% rename from pkgs/tools/security/ccrypt/default.nix rename to pkgs/by-name/cc/ccrypt/package.nix diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/by-name/cc/ccsymbols/package.nix similarity index 100% rename from pkgs/data/fonts/ccsymbols/default.nix rename to pkgs/by-name/cc/ccsymbols/package.nix diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix index c56f79b69e47..0368a3c4a985 100644 --- a/pkgs/by-name/cc/cctools/package.nix +++ b/pkgs/by-name/cc/cctools/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, buildPackages, - darwin, ld64, llvm, memstreamHook, @@ -38,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { "dev" "man" "gas" + "libtool" ]; src = fetchFromGitHub { @@ -127,13 +127,10 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - buildInputs = - [ - ld64 - llvm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.objc4 ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; + buildInputs = [ + ld64 + llvm + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; mesonBuildType = "release"; @@ -153,6 +150,10 @@ stdenv.mkDerivation (finalAttrs: { for arch in arm i386 x86_64; do mv "$gas/libexec/as/$arch/as-$arch" "$gas/libexec/as/$arch/as" done + + # Move libtool to its own output to allow packages to add it without pulling in all of cctools + moveToOutput bin/${targetPrefix}libtool "$libtool" + ln -s "$libtool/bin/${targetPrefix}libtool" "$out/bin/${targetPrefix}libtool" ''; __structuredAttrs = true; @@ -169,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { apple-psl20 gpl2 # GNU as ]; - maintainers = with lib.maintainers; [ reckenrode ]; + maintainers = lib.teams.darwin.members; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/by-name/cc/ccze/package.nix similarity index 100% rename from pkgs/tools/misc/ccze/default.nix rename to pkgs/by-name/cc/ccze/package.nix diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/by-name/cd/cddlib/package.nix similarity index 100% rename from pkgs/development/libraries/cddlib/default.nix rename to pkgs/by-name/cd/cddlib/package.nix diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/by-name/cd/cde/package.nix similarity index 100% rename from pkgs/tools/package-management/cde/default.nix rename to pkgs/by-name/cd/cde/package.nix diff --git a/pkgs/development/tools/cdecrypt/default.nix b/pkgs/by-name/cd/cdecrypt/package.nix similarity index 100% rename from pkgs/development/tools/cdecrypt/default.nix rename to pkgs/by-name/cd/cdecrypt/package.nix diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/by-name/cd/cdesktopenv/package.nix similarity index 100% rename from pkgs/desktops/cdesktopenv/default.nix rename to pkgs/by-name/cd/cdesktopenv/package.nix diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/by-name/cd/cdi2iso/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/cdi2iso/default.nix rename to pkgs/by-name/cd/cdi2iso/package.nix diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/pkgs/by-name/cd/cdimgtools/nrgtool_fix_my.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch rename to pkgs/by-name/cd/cdimgtools/nrgtool_fix_my.patch diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/by-name/cd/cdimgtools/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/cdimgtools/default.nix rename to pkgs/by-name/cd/cdimgtools/package.nix diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/pkgs/by-name/cd/cdimgtools/removed_dvdcss_interface_2.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch rename to pkgs/by-name/cd/cdimgtools/removed_dvdcss_interface_2.patch diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/by-name/cd/cdk-go/package.nix similarity index 100% rename from pkgs/tools/security/cdk-go/default.nix rename to pkgs/by-name/cd/cdk-go/package.nix diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/by-name/cd/cdo/package.nix similarity index 100% rename from pkgs/development/libraries/cdo/default.nix rename to pkgs/by-name/cd/cdo/package.nix diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix similarity index 100% rename from pkgs/games/cdogs-sdl/default.nix rename to pkgs/by-name/cd/cdogs-sdl/package.nix diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/by-name/cd/cdpr/package.nix similarity index 100% rename from pkgs/tools/networking/cdpr/default.nix rename to pkgs/by-name/cd/cdpr/package.nix diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch b/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch rename to pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch rename to pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch diff --git a/pkgs/tools/cd-dvd/cdrkit/include-path.patch b/pkgs/by-name/cd/cdrkit/include-path.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/include-path.patch rename to pkgs/by-name/cd/cdrkit/include-path.patch diff --git a/pkgs/by-name/cd/cdrkit/package.nix b/pkgs/by-name/cd/cdrkit/package.nix new file mode 100644 index 000000000000..7aa400e51f07 --- /dev/null +++ b/pkgs/by-name/cd/cdrkit/package.nix @@ -0,0 +1,78 @@ +{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: + +stdenv.mkDerivation rec { + pname = "cdrkit"; + version = "1.1.11"; + + src = fetchurl { + url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz"; + sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib bzip2 perl ] ++ + lib.optionals stdenv.hostPlatform.isLinux [ libcap ]; + + hardeningDisable = [ "format" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [ + "-D__THROW=" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + ]); + + # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 + patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace libusal/scsi-mac-iokit.c \ + --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h" + substituteInPlace genisoimage/sha256.c \ + --replace "" "" + substituteInPlace genisoimage/sha512.c \ + --replace "" "" + substituteInPlace genisoimage/sha256.h \ + --replace "__THROW" "" + substituteInPlace genisoimage/sha512.h \ + --replace "__THROW" "" + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace include/xconfig.h.in \ + --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD" + ''; + + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace */CMakeFiles/*.dir/link.txt \ + --replace-warn "-lrt" "-framework IOKit -framework CoreFoundation" + ''; + + postInstall = '' + # file name compatibility with the old cdrecord (growisofs wants this name) + ln -s $out/bin/genisoimage $out/bin/mkisofs + ln -s $out/bin/wodim $out/bin/cdrecord + ''; + + cmakeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DBITFIELDS_HTOL=0" ]; + + makeFlags = [ "PREFIX=\$(out)" ]; + + meta = { + description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools"; + + longDescription = '' + Cdrkit is a suite of programs for recording CDs and DVDs, + blanking CD-RW media, creating ISO-9660 filesystem images, + extracting audio CD data, and more. The programs included in + the cdrkit package were originally derived from several sources, + most notably mkisofs by Eric Youngdale and others, cdda2wav by + Heiko Eissfeldt, and cdrecord by Jörg Schilling. However, + cdrkit is not affiliated with any of these authors; it is now an + independent project. + ''; + + homepage = "http://cdrkit.org/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/by-name/cd/cdxgen/package.nix similarity index 100% rename from pkgs/tools/security/cdxgen/default.nix rename to pkgs/by-name/cd/cdxgen/package.nix diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/by-name/ce/cegui/package.nix similarity index 100% rename from pkgs/development/libraries/cegui/default.nix rename to pkgs/by-name/ce/cegui/package.nix diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/by-name/ce/cel-go/package.nix similarity index 100% rename from pkgs/development/interpreters/cel-go/default.nix rename to pkgs/by-name/ce/cel-go/package.nix diff --git a/pkgs/applications/networking/sync/celeste/librclone-path.patch b/pkgs/by-name/ce/celeste/librclone-path.patch similarity index 100% rename from pkgs/applications/networking/sync/celeste/librclone-path.patch rename to pkgs/by-name/ce/celeste/librclone-path.patch diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/by-name/ce/celeste/package.nix similarity index 100% rename from pkgs/applications/networking/sync/celeste/default.nix rename to pkgs/by-name/ce/celeste/package.nix diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/by-name/ce/celf/package.nix similarity index 100% rename from pkgs/applications/science/logic/celf/default.nix rename to pkgs/by-name/ce/celf/package.nix diff --git a/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch b/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch index a337484277ef..755d16cd8c7f 100644 --- a/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch +++ b/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b2b789..48d9be0 100644 +index 54e2012..a9b6b0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -92,6 +92,7 @@ find_package(pugixml REQUIRED) +@@ -149,6 +149,7 @@ find_package(pugixml REQUIRED) find_package(RapidJSON REQUIRED) find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED) find_package(libzip REQUIRED) diff --git a/pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch b/pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch new file mode 100644 index 000000000000..af0426bf7d60 --- /dev/null +++ b/pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch @@ -0,0 +1,13 @@ +diff --git a/src/Cafe/CMakeLists.txt.orig b/src/Cafe/CMakeLists.txt +index 91d257b..cff779a 100644 +--- a/src/Cafe/CMakeLists.txt ++++ b/src/Cafe/CMakeLists.txt +@@ -545,7 +545,7 @@ target_link_libraries(CemuCafe PRIVATE + Boost::nowide + CURL::libcurl + fmt::fmt +- glslang::SPIRV ++ glslang::glslang + ih264d + OpenSSL::Crypto + OpenSSL::SSL diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index bc99ee2eeb64..061ff28069c9 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -47,15 +47,16 @@ let hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; }; }; -in stdenv.mkDerivation (finalAttrs: { +in +stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.0-92"; + version = "2.2"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-bjt+2RzmG8iKcdyka4HsHM5NEzCwGah4s9eiywSHXbw="; + hash = "sha256-d4FMAj99SPj5S1p5nAUFNo386ZJvWxOKD9iGxHJYVBI="; }; patches = [ @@ -63,6 +64,7 @@ in stdenv.mkDerivation (finalAttrs: { # > The following imported targets are referenced, but are missing: # > SPIRV-Tools-opt ./0000-spirv-tools-opt-cmakelists.patch + ./0001-glslang-cmake-target.patch ]; nativeBuildInputs = [ @@ -113,15 +115,20 @@ in stdenv.mkDerivation (finalAttrs: { strictDeps = true; - preConfigure = let - tag = lib.last (lib.splitString "-" finalAttrs.version); - in '' - rm -rf dependencies/imgui - # cemu expects imgui source code, not just header files - ln -s ${imgui'.src} dependencies/imgui - substituteInPlace src/Common/version.h --replace-fail " (experimental)" "-${tag} (experimental)" - substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace-fail "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" - ''; + preConfigure = + let + tag = lib.splitString "." (lib.last (lib.splitString "-" finalAttrs.version)); + majorv = builtins.elemAt tag 0; + minorv = builtins.elemAt tag 1; + in + '' + rm -rf dependencies/imgui + # cemu expects imgui source code, not just header files + ln -s ${imgui'.src} dependencies/imgui + substituteInPlace CMakeLists.txt --replace-fail "EMULATOR_VERSION_MAJOR \"0\"" "EMULATOR_VERSION_MAJOR \"${majorv}\"" + substituteInPlace CMakeLists.txt --replace-fail "EMULATOR_VERSION_MINOR \"0\"" "EMULATOR_VERSION_MINOR \"${minorv}\"" + substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace-fail "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" + ''; installPhase = '' runHook preInstall @@ -139,13 +146,15 @@ in stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - preFixup = let - libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs; - in '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" - ) - ''; + preFixup = + let + libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs; + in + '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" + ) + ''; passthru = { updateScript = nix-update-script { }; @@ -161,7 +170,11 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://cemu.info"; license = lib.licenses.mpl20; mainProgram = "cemu"; - maintainers = with lib.maintainers; [ zhaofengli baduhai AndersonTorres ]; + maintainers = with lib.maintainers; [ + zhaofengli + baduhai + AndersonTorres + ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/applications/emulators/cen64/default.nix b/pkgs/by-name/ce/cen64/package.nix similarity index 100% rename from pkgs/applications/emulators/cen64/default.nix rename to pkgs/by-name/ce/cen64/package.nix diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/by-name/ce/centerim/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/centerim/default.nix rename to pkgs/by-name/ce/centerim/package.nix diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/by-name/ce/ceptre/package.nix similarity index 100% rename from pkgs/development/interpreters/ceptre/default.nix rename to pkgs/by-name/ce/ceptre/package.nix diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/by-name/ce/cernlib/package.nix similarity index 100% rename from pkgs/development/libraries/physics/cernlib/default.nix rename to pkgs/by-name/ce/cernlib/package.nix diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/by-name/ce/cernlib/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/physics/cernlib/setup-hook.sh rename to pkgs/by-name/ce/cernlib/setup-hook.sh diff --git a/pkgs/by-name/ce/certdump/deps.nix b/pkgs/by-name/ce/certdump/deps.nix new file mode 100644 index 000000000000..491646ec2925 --- /dev/null +++ b/pkgs/by-name/ce/certdump/deps.nix @@ -0,0 +1,126 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "CommandLineParser"; + version = "2.9.1"; + hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "5.0.0"; + hash = "sha256-z22ZDldoIlDUYeF9Rje0aVPlYAGKIpdj5wDzn1CW+jQ="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; + version = "5.0.17"; + hash = "sha256-ELWBHK+1ijGTvq1BsK/vJx/MNqKS8daZgrQ0Tj9+faA="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "5.0.17"; + hash = "sha256-iHn2yGpaL5EM8L7nJJ2aRCIZ+kE98NS+KWUvrWnjzhg="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "5.0.17"; + hash = "sha256-TdhOyPN+WA27WFd3PLKdsC+bbyNidOiOOuz/WpHDe+M="; + }) + (fetchNuGet { + pname = "Microsoft.DotNet.ILCompiler"; + version = "8.0.0"; + hash = "sha256-GquIuTqNcQfciyhmtzWUgyedHSm+Bhultnt/ai7ODt0="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-arm64"; + version = "5.0.17"; + hash = "sha256-a8FLTWaNL6TknXDx+YFwLzcDn7nuq3l9yN2UUrHfZx8="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "5.0.17"; + hash = "sha256-exMpVamk8ZzfCQDQcDmQDYJplDcOOU99ic7NSDKUgtE="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "5.0.17"; + hash = "sha256-bDgVacWuwDTJqEL/RbZ2gS9EGexx0OGZsYPnHQPh5Qk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Ref"; + version = "5.0.0"; + hash = "sha256-kQ8wpR4crWoqy/jrskat34Y3Nr3nbxoSpEPMnxycwtw="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; + version = "5.0.17"; + hash = "sha256-2KU5RRHGbkCA+lCEH5QaBHma1AZqVLWBws7IKxBWkJs="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "5.0.17"; + hash = "sha256-2NpVvrbqct3M1fKiSe/zyt41mf1aV6WUdxIlJod27Ek="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "5.0.17"; + hash = "sha256-V1arT33a215ZP+Jo/vkrhko78FsA8X8XujZ6jUKfBd4="; + }) + (fetchNuGet { + pname = "PeNet"; + version = "4.0.4"; + hash = "sha256-gB2UeQG98bPThdkRbCFvsUCZ5sV1nttekzwRncH8LzY="; + }) + (fetchNuGet { + pname = "PeNet.Asn1"; + version = "2.0.1"; + hash = "sha256-ypIptb5VOAa4GHvVdd1no1CoyiOKOegFs52tZHj435I="; + }) + (fetchNuGet { + pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; + version = "8.0.0"; + hash = "sha256-FAUyhIBscbLUBl4cjSOwRg1hjkCv2BnzuHo0mMx6gWw="; + }) + (fetchNuGet { + pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; + version = "8.0.0"; + hash = "sha256-U8eg1gToprOmFmZ+Gqb+nTgnKpMjxMDFnokuRDISp0k="; + }) + (fetchNuGet { + pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; + version = "8.0.0"; + hash = "sha256-QWWThct6kebcbzaOKbeIULJ6CnWTf6fupPGSFYDU760="; + }) + (fetchNuGet { + pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; + version = "8.0.0"; + hash = "sha256-eeKWNQpYFc261S7mS34JXvHY+XOhhhl793XkUdFUUpo="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; + }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "8.0.0"; + hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.5"; + hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "5.0.0"; + hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "8.0.0"; + hash = "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="; + }) +] diff --git a/pkgs/by-name/ce/certdump/package.nix b/pkgs/by-name/ce/certdump/package.nix new file mode 100644 index 000000000000..8ca524a684fe --- /dev/null +++ b/pkgs/by-name/ce/certdump/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + stdenv, +}: + +buildDotnetModule rec { + pname = "certdump"; + version = "0-unstable-2023-12-25"; + + src = fetchFromGitHub { + owner = "secana"; + repo = "CertDump"; + rev = "a834da24ee18503109631d836540a2b0cb481517"; + hash = "sha256-86s6KLP0DliKOr0fVId7SGN333b7HkiL5p/q0vazwMc="; + }; + + projectFile = [ "CertDump.sln" ]; + nugetDeps = ./deps.nix; + + selfContainedBuild = true; + executables = [ "CertDump" ]; + + dotnetFlags = [ + "-property:ImportByWildcardBeforeSolution=false" + ]; + + meta = { + description = "Dump certificates from PE files in different formats"; + mainProgram = "CertDump"; + homepage = "https://github.com/secana/CertDump"; + longDescription = '' + Cross-Platform tool to dump the signing certificate from a Portable Executable (PE) file. + ''; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.baloo ]; + }; +} diff --git a/pkgs/tools/security/certgraph/default.nix b/pkgs/by-name/ce/certgraph/package.nix similarity index 100% rename from pkgs/tools/security/certgraph/default.nix rename to pkgs/by-name/ce/certgraph/package.nix diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/by-name/ce/certigo/package.nix similarity index 100% rename from pkgs/tools/admin/certigo/default.nix rename to pkgs/by-name/ce/certigo/package.nix diff --git a/pkgs/tools/security/certinfo/default.nix b/pkgs/by-name/ce/certinfo/package.nix similarity index 100% rename from pkgs/tools/security/certinfo/default.nix rename to pkgs/by-name/ce/certinfo/package.nix diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/by-name/ce/certstrap/package.nix similarity index 100% rename from pkgs/tools/security/certstrap/default.nix rename to pkgs/by-name/ce/certstrap/package.nix diff --git a/pkgs/tools/security/certsync/default.nix b/pkgs/by-name/ce/certsync/package.nix similarity index 100% rename from pkgs/tools/security/certsync/default.nix rename to pkgs/by-name/ce/certsync/package.nix diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/by-name/cf/cf-terraforming/package.nix similarity index 100% rename from pkgs/tools/misc/cf-terraforming/default.nix rename to pkgs/by-name/cf/cf-terraforming/package.nix diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/by-name/cf/cf-vault/package.nix similarity index 100% rename from pkgs/tools/admin/cf-vault/default.nix rename to pkgs/by-name/cf/cf-vault/package.nix diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/by-name/cf/cfdg/package.nix similarity index 100% rename from pkgs/tools/graphics/cfdg/default.nix rename to pkgs/by-name/cf/cfdg/package.nix diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/by-name/cf/cfdg/src-info-for-default.nix similarity index 100% rename from pkgs/tools/graphics/cfdg/src-info-for-default.nix rename to pkgs/by-name/cf/cfdg/src-info-for-default.nix diff --git a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/pkgs/by-name/cf/cfdyndns/Cargo.lock similarity index 100% rename from pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock rename to pkgs/by-name/cf/cfdyndns/Cargo.lock diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/by-name/cf/cfdyndns/package.nix similarity index 100% rename from pkgs/applications/networking/dyndns/cfdyndns/default.nix rename to pkgs/by-name/cf/cfdyndns/package.nix diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch b/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch similarity index 100% rename from pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch rename to pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/by-name/cf/cfitsio/package.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/cfitsio/default.nix rename to pkgs/by-name/cf/cfitsio/package.nix diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/by-name/cf/cflow/package.nix similarity index 100% rename from pkgs/development/tools/misc/cflow/default.nix rename to pkgs/by-name/cf/cflow/package.nix diff --git a/pkgs/applications/file-managers/cfm/default.nix b/pkgs/by-name/cf/cfm/package.nix similarity index 100% rename from pkgs/applications/file-managers/cfm/default.nix rename to pkgs/by-name/cf/cfm/package.nix diff --git a/pkgs/by-name/cf/cfn-nag/Gemfile b/pkgs/by-name/cf/cfn-nag/Gemfile index 7f4f5e950d15..233f201bc4f0 100644 --- a/pkgs/by-name/cf/cfn-nag/Gemfile +++ b/pkgs/by-name/cf/cfn-nag/Gemfile @@ -1,5 +1,5 @@ -# frozen_string_literal: true - source 'https://rubygems.org' - -gemspec +gem 'cfn-nag' +gem 'logger' +gem 'ostruct' +gem 'syslog' diff --git a/pkgs/by-name/cf/cfn-nag/Gemfile.lock b/pkgs/by-name/cf/cfn-nag/Gemfile.lock index 7892e62b052c..7c00936be206 100644 --- a/pkgs/by-name/cf/cfn-nag/Gemfile.lock +++ b/pkgs/by-name/cf/cfn-nag/Gemfile.lock @@ -1,6 +1,25 @@ -PATH - remote: . +GEM + remote: https://rubygems.org/ specs: + aws-eventstream (1.3.0) + aws-partitions (1.1001.0) + aws-sdk-core (3.211.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.169.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + cfn-model (0.6.6) + kwalify (= 0.7.2) + psych (~> 3) cfn-nag (0.8.10) aws-sdk-s3 (~> 1.76) cfn-model (= 0.6.6) @@ -9,98 +28,30 @@ PATH netaddr (~> 2.0.4) optimist (~> 3.0.0) rexml - -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.2) - aws-eventstream (1.3.0) - aws-partitions (1.982.0) - aws-sdk-core (3.209.1) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.9) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.94.0) - aws-sdk-core (~> 3, >= 3.207.0) - aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.166.0) - aws-sdk-core (~> 3, >= 3.207.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.0) - aws-eventstream (~> 1, >= 1.0.2) - cfn-model (0.6.6) - kwalify (= 0.7.2) - psych (~> 3) - diff-lcs (1.5.1) - docile (1.4.1) jmespath (1.6.2) - json (2.7.2) kwalify (0.7.2) - language_server-protocol (3.17.0.3) lightly (0.3.3) little-plugger (1.1.4) + logger (1.6.1) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) multi_json (1.15.0) netaddr (2.0.6) optimist (3.0.1) - parallel (1.26.3) - parser (3.3.5.0) - ast (~> 2.4.1) - racc + ostruct (0.6.0) psych (3.3.4) - racc (1.8.1) - rainbow (3.1.1) - rake (13.2.1) - regexp_parser (2.9.2) - rexml (3.3.8) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.1) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.1) - rubocop (1.66.1) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.3.0.2) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) - parser (>= 3.3.1.0) - ruby-progressbar (1.13.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.13.1) - simplecov_json_formatter (0.1.4) - unicode-display_width (2.6.0) + rexml (3.3.9) + syslog (0.1.2) PLATFORMS - arm64-darwin-23 ruby DEPENDENCIES - cfn-nag! - rake - rspec (~> 3.4) - rubocop - simplecov (~> 0.21) + cfn-nag + logger + ostruct + syslog BUNDLED WITH - 2.5.11 + 2.3.27 diff --git a/pkgs/by-name/cf/cfn-nag/gemset.nix b/pkgs/by-name/cf/cfn-nag/gemset.nix index c8d2cd75d6cf..621a733e5555 100644 --- a/pkgs/by-name/cf/cfn-nag/gemset.nix +++ b/pkgs/by-name/cf/cfn-nag/gemset.nix @@ -1,17 +1,4 @@ { - ast = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; aws-eventstream = { groups = [ "default" ]; platforms = [ ]; @@ -27,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "075y2zwfqwg7qb7w34bfvp8dkjcmiz6hx5a3rbhpqglnlkav7ir4"; + sha256 = "01w3b84d129q9b6bg2cm8p4cn8pl74l343sxsc47ax9sglqz6y99"; type = "gem"; }; - version = "1.982.0"; + version = "1.1001.0"; }; aws-sdk-core = { dependencies = [ @@ -43,10 +30,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq"; + sha256 = "16mvscjhxdyhlvk2rpbxdzqmyikcf64xavb35grk4dkh0pg390rk"; type = "gem"; }; - version = "3.209.1"; + version = "3.211.0"; }; aws-sdk-kms = { dependencies = [ @@ -57,10 +44,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh"; + sha256 = "0ppxhw2qyj69achpmksp1sh2y6k0x44928ln2am9pifx8b30ir9a"; type = "gem"; }; - version = "1.94.0"; + version = "1.95.0"; }; aws-sdk-s3 = { dependencies = [ @@ -72,10 +59,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zpww3lxpjg8smmznz2nbx5hrpnkzflbasllxjwprkqr56rrrjap"; + sha256 = "1jnf9k9d91ki3yvy12q4kph5wvd8l3ziwwh0qsmar5xhyb7zbwrz"; type = "gem"; }; - version = "1.166.0"; + version = "1.169.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -83,10 +70,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm"; + sha256 = "1fq3lbvkgm1vk5wa8l7vdnq3vjnlmsnyf4bbd0jq3qadyd9hf54a"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cfn-model = { dependencies = [ @@ -115,37 +102,12 @@ groups = [ "default" ]; platforms = [ ]; source = { - path = ./.; - type = "path"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0cyk4pimz1g5lqf4vw2p9kf8ji3v53zfi8jix8sgz4ndy81ylah5"; + type = "gem"; }; version = "0.8.10"; }; - diff-lcs = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; - type = "gem"; - }; - version = "1.5.1"; - }; - docile = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn"; - type = "gem"; - }; - version = "1.4.1"; - }; jmespath = { groups = [ "default" ]; platforms = [ ]; @@ -156,19 +118,6 @@ }; version = "1.6.2"; }; - json = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; - type = "gem"; - }; - version = "2.7.2"; - }; kwalify = { groups = [ "default" ]; platforms = [ ]; @@ -179,19 +128,6 @@ }; version = "0.7.2"; }; - language_server-protocol = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; - type = "gem"; - }; - version = "3.17.0.3"; - }; lightly = { groups = [ "default" ]; platforms = [ ]; @@ -212,6 +148,16 @@ }; version = "1.1.4"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; logging = { dependencies = [ "little-plugger" @@ -256,35 +202,15 @@ }; version = "3.0.1"; }; - parallel = { - groups = [ - "default" - "development" - ]; + ostruct = { + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + sha256 = "11dsv71gfbhy92yzj3xkckjzdai2bsz5a4fydgimv62dkz4kc5rv"; type = "gem"; }; - version = "1.26.3"; - }; - parser = { - dependencies = [ - "ast" - "racc" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk"; - type = "gem"; - }; - version = "3.3.5.0"; + version = "0.6.0"; }; psych = { groups = [ "default" ]; @@ -296,241 +222,24 @@ }; version = "3.3.4"; }; - racc = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; - type = "gem"; - }; - version = "1.8.1"; - }; - rainbow = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - rake = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; - type = "gem"; - }; - version = "13.2.1"; - }; - regexp_parser = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; - type = "gem"; - }; - version = "2.9.2"; - }; rexml = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.3.8"; + version = "3.3.9"; }; - rspec = { - dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; - groups = [ "development" ]; + syslog = { + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + sha256 = "12xqgjrnjpc1c7shajyz2h96bw2nlgb4lkaypj58dp6rch7s36sr"; type = "gem"; }; - version = "3.13.0"; - }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; - type = "gem"; - }; - version = "3.13.1"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; - type = "gem"; - }; - version = "3.13.3"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; - type = "gem"; - }; - version = "3.13.1"; - }; - rspec-support = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; - type = "gem"; - }; - version = "3.13.1"; - }; - rubocop = { - dependencies = [ - "json" - "language_server-protocol" - "parallel" - "parser" - "rainbow" - "regexp_parser" - "rubocop-ast" - "ruby-progressbar" - "unicode-display_width" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86"; - type = "gem"; - }; - version = "1.66.1"; - }; - rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; - type = "gem"; - }; - version = "1.32.3"; - }; - ruby-progressbar = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; - type = "gem"; - }; - version = "1.13.0"; - }; - simplecov = { - dependencies = [ - "docile" - "simplecov-html" - "simplecov_json_formatter" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; - type = "gem"; - }; - version = "0.22.0"; - }; - simplecov-html = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx"; - type = "gem"; - }; - version = "0.13.1"; - }; - simplecov_json_formatter = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; - type = "gem"; - }; - version = "0.1.4"; - }; - unicode-display_width = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; - type = "gem"; - }; - version = "2.6.0"; + version = "0.1.2"; }; } diff --git a/pkgs/by-name/cf/cfn-nag/package.nix b/pkgs/by-name/cf/cfn-nag/package.nix index 4ec8f7848cbc..71c198c9a9b7 100644 --- a/pkgs/by-name/cf/cfn-nag/package.nix +++ b/pkgs/by-name/cf/cfn-nag/package.nix @@ -17,8 +17,12 @@ bundlerEnv { meta = { description = "Linting tool for CloudFormation templates"; homepage = "https://github.com/stelligent/cfn_nag"; + mainProgram = "cfn_nag"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = with lib.maintainers; [ + momeemt + mathstlouis + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/cfonts/default.nix b/pkgs/by-name/cf/cfonts/package.nix similarity index 100% rename from pkgs/tools/misc/cfonts/default.nix rename to pkgs/by-name/cf/cfonts/package.nix diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/by-name/cf/cfr/package.nix similarity index 100% rename from pkgs/development/tools/java/cfr/default.nix rename to pkgs/by-name/cf/cfr/package.nix diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/by-name/cf/cfripper/package.nix similarity index 100% rename from pkgs/tools/security/cfripper/default.nix rename to pkgs/by-name/cf/cfripper/package.nix diff --git a/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix b/pkgs/by-name/cf/cfs-zen-tweaks/package.nix similarity index 100% rename from pkgs/os-specific/linux/cfs-zen-tweaks/default.nix rename to pkgs/by-name/cf/cfs-zen-tweaks/package.nix diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/by-name/cf/cfspeedtest/package.nix similarity index 100% rename from pkgs/tools/networking/cfspeedtest/default.nix rename to pkgs/by-name/cf/cfspeedtest/package.nix diff --git a/pkgs/by-name/cf/cfssl/package.nix b/pkgs/by-name/cf/cfssl/package.nix new file mode 100644 index 000000000000..df13c004b1a7 --- /dev/null +++ b/pkgs/by-name/cf/cfssl/package.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "cfssl"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cfssl"; + rev = "v${version}"; + sha256 = "sha256-Xczpv6tLJiy2dXoGJ0QUmXwOn0p6S+lm2oz61oytQec="; + }; + + subPackages = [ + "cmd/cfssl" + "cmd/cfssljson" + "cmd/cfssl-bundle" + "cmd/cfssl-certinfo" + "cmd/cfssl-newkey" + "cmd/cfssl-scan" + "cmd/multirootca" + "cmd/mkbundle" + ]; + + vendorHash = null; + + doCheck = false; + + ldflags = [ + "-s" "-w" + "-X github.com/cloudflare/cfssl/cli/version.version=v${version}" + ]; + + passthru.tests = { inherit (nixosTests) cfssl; }; + + meta = with lib; { + homepage = "https://cfssl.org/"; + description = "Cloudflare's PKI and TLS toolkit"; + license = licenses.bsd2; + maintainers = with maintainers; [ mbrgm ]; + mainProgram = "cfssl"; + }; +} diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/by-name/cg/cg3/package.nix similarity index 100% rename from pkgs/development/interpreters/cg3/default.nix rename to pkgs/by-name/cg/cg3/package.nix diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/by-name/cg/cgdb/package.nix similarity index 100% rename from pkgs/development/tools/misc/cgdb/default.nix rename to pkgs/by-name/cg/cgdb/package.nix diff --git a/pkgs/tools/graphics/cgif/default.nix b/pkgs/by-name/cg/cgif/package.nix similarity index 100% rename from pkgs/tools/graphics/cgif/default.nix rename to pkgs/by-name/cg/cgif/package.nix diff --git a/pkgs/servers/http/cgiserver/default.nix b/pkgs/by-name/cg/cgiserver/package.nix similarity index 100% rename from pkgs/servers/http/cgiserver/default.nix rename to pkgs/by-name/cg/cgiserver/package.nix diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/by-name/cg/cglm/package.nix similarity index 100% rename from pkgs/development/libraries/cglm/default.nix rename to pkgs/by-name/cg/cglm/package.nix diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/by-name/cg/cgminer/package.nix similarity index 100% rename from pkgs/applications/blockchains/cgminer/default.nix rename to pkgs/by-name/cg/cgminer/package.nix diff --git a/pkgs/games/cgoban/default.nix b/pkgs/by-name/cg/cgoban/package.nix similarity index 100% rename from pkgs/games/cgoban/default.nix rename to pkgs/by-name/cg/cgoban/package.nix diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/by-name/cg/cgui/package.nix similarity index 100% rename from pkgs/development/libraries/cgui/default.nix rename to pkgs/by-name/cg/cgui/package.nix diff --git a/pkgs/tools/security/chain-bench/default.nix b/pkgs/by-name/ch/chain-bench/package.nix similarity index 100% rename from pkgs/tools/security/chain-bench/default.nix rename to pkgs/by-name/ch/chain-bench/package.nix diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/by-name/ch/chainsaw/package.nix similarity index 100% rename from pkgs/tools/security/chainsaw/default.nix rename to pkgs/by-name/ch/chainsaw/package.nix diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/by-name/ch/chamber/package.nix similarity index 100% rename from pkgs/tools/admin/chamber/default.nix rename to pkgs/by-name/ch/chamber/package.nix diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/by-name/ch/changedetection-io/package.nix similarity index 100% rename from pkgs/servers/web-apps/changedetection-io/default.nix rename to pkgs/by-name/ch/changedetection-io/package.nix diff --git a/pkgs/tools/misc/changelogger/default.nix b/pkgs/by-name/ch/changelogger/package.nix similarity index 100% rename from pkgs/tools/misc/changelogger/default.nix rename to pkgs/by-name/ch/changelogger/package.nix diff --git a/pkgs/tools/networking/changetower/default.nix b/pkgs/by-name/ch/changetower/package.nix similarity index 100% rename from pkgs/tools/networking/changetower/default.nix rename to pkgs/by-name/ch/changetower/package.nix diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/by-name/ch/changie/package.nix similarity index 100% rename from pkgs/development/tools/changie/default.nix rename to pkgs/by-name/ch/changie/package.nix diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/by-name/ch/chaos/package.nix similarity index 100% rename from pkgs/tools/networking/chaos/default.nix rename to pkgs/by-name/ch/chaos/package.nix diff --git a/pkgs/tools/misc/charasay/default.nix b/pkgs/by-name/ch/charasay/package.nix similarity index 100% rename from pkgs/tools/misc/charasay/default.nix rename to pkgs/by-name/ch/charasay/package.nix diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/by-name/ch/charis-sil/package.nix similarity index 100% rename from pkgs/data/fonts/charis-sil/default.nix rename to pkgs/by-name/ch/charis-sil/package.nix diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/by-name/ch/charliecloud/package.nix similarity index 100% rename from pkgs/applications/virtualization/charliecloud/default.nix rename to pkgs/by-name/ch/charliecloud/package.nix diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/by-name/ch/charls/package.nix similarity index 100% rename from pkgs/development/libraries/charls/default.nix rename to pkgs/by-name/ch/charls/package.nix diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/by-name/ch/charm/package.nix similarity index 100% rename from pkgs/applications/misc/charm/default.nix rename to pkgs/by-name/ch/charm/package.nix diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/by-name/ch/chart-testing/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm/chart-testing/default.nix rename to pkgs/by-name/ch/chart-testing/package.nix diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/by-name/ch/chase/package.nix similarity index 100% rename from pkgs/tools/system/chase/default.nix rename to pkgs/by-name/ch/chase/package.nix diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/by-name/ch/chatblade/package.nix similarity index 100% rename from pkgs/applications/misc/chatblade/default.nix rename to pkgs/by-name/ch/chatblade/package.nix diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 59e36a2f298c..28a3f6d5cf3e 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -37,7 +37,7 @@ buildNpmPackage rec { ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs buildInputs = [ - stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime + (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime vips # or it will try to download from the Internet ]; diff --git a/pkgs/tools/misc/chatgpt-cli/default.nix b/pkgs/by-name/ch/chatgpt-cli/package.nix similarity index 100% rename from pkgs/tools/misc/chatgpt-cli/default.nix rename to pkgs/by-name/ch/chatgpt-cli/package.nix diff --git a/pkgs/servers/chatgpt-retrieval-plugin/default.nix b/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix similarity index 100% rename from pkgs/servers/chatgpt-retrieval-plugin/default.nix rename to pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/by-name/ch/chatty/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/chatty/default.nix rename to pkgs/by-name/ch/chatty/package.nix diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index d6ffc1d3dcd2..35808fae2388 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "chawan"; - version = "0-unstable-2024-09-03"; + version = "0-unstable-2024-10-25"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "298684d174be90be57967f15c2f1bf0d24ba2446"; - hash = "sha256-R/+qLoyewqoOfi264GvZUvpZbN5FX8LtGikQ3FxJEvw="; + rev = "28bf2922a33dd987a0a3095bc461589ef23ad37d"; + hash = "sha256-Bxt9uovo69whyAtrpCDz3DyAYjCYaZfMZknnFW0WDao="; fetchSubmodules = true; }; diff --git a/pkgs/tools/wayland/chayang/default.nix b/pkgs/by-name/ch/chayang/package.nix similarity index 100% rename from pkgs/tools/wayland/chayang/default.nix rename to pkgs/by-name/ch/chayang/package.nix diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/by-name/ch/cheat/package.nix similarity index 100% rename from pkgs/applications/misc/cheat/default.nix rename to pkgs/by-name/ch/cheat/package.nix diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/by-name/ch/check-jsonschema/package.nix similarity index 100% rename from pkgs/development/tools/check-jsonschema/default.nix rename to pkgs/by-name/ch/check-jsonschema/package.nix diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/by-name/ch/checkbashisms/package.nix similarity index 100% rename from pkgs/development/tools/misc/checkbashisms/default.nix rename to pkgs/by-name/ch/checkbashisms/package.nix diff --git a/pkgs/tools/package-management/checkinstall/empty-dirs.patch b/pkgs/by-name/ch/checkinstall/empty-dirs.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/empty-dirs.patch rename to pkgs/by-name/ch/checkinstall/empty-dirs.patch diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/pkgs/by-name/ch/checkinstall/etc-dirs.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/etc-dirs.patch rename to pkgs/by-name/ch/checkinstall/etc-dirs.patch diff --git a/pkgs/tools/package-management/checkinstall/glibc-check.patch b/pkgs/by-name/ch/checkinstall/glibc-check.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/glibc-check.patch rename to pkgs/by-name/ch/checkinstall/glibc-check.patch diff --git a/pkgs/tools/package-management/checkinstall/missing-functions.patch b/pkgs/by-name/ch/checkinstall/missing-functions.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/missing-functions.patch rename to pkgs/by-name/ch/checkinstall/missing-functions.patch diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/by-name/ch/checkinstall/package.nix similarity index 100% rename from pkgs/tools/package-management/checkinstall/default.nix rename to pkgs/by-name/ch/checkinstall/package.nix diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/pkgs/by-name/ch/checkinstall/readlink-types.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/readlink-types.patch rename to pkgs/by-name/ch/checkinstall/readlink-types.patch diff --git a/pkgs/tools/package-management/checkinstall/scandir.patch b/pkgs/by-name/ch/checkinstall/scandir.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/scandir.patch rename to pkgs/by-name/ch/checkinstall/scandir.patch diff --git a/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/pkgs/by-name/ch/checkinstall/set-buildroot.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/set-buildroot.patch rename to pkgs/by-name/ch/checkinstall/set-buildroot.patch diff --git a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/pkgs/by-name/ch/checkinstall/use-old-memcpy.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/use-old-memcpy.patch rename to pkgs/by-name/ch/checkinstall/use-old-memcpy.patch diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/by-name/ch/checkip/package.nix similarity index 100% rename from pkgs/tools/networking/checkip/default.nix rename to pkgs/by-name/ch/checkip/package.nix diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/by-name/ch/checkmake/package.nix similarity index 100% rename from pkgs/development/tools/checkmake/default.nix rename to pkgs/by-name/ch/checkmake/package.nix diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/by-name/ch/checkmate/package.nix similarity index 100% rename from pkgs/development/tools/checkmate/default.nix rename to pkgs/by-name/ch/checkmate/package.nix diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/by-name/ch/checkpolicy/package.nix similarity index 100% rename from pkgs/os-specific/linux/checkpolicy/default.nix rename to pkgs/by-name/ch/checkpolicy/package.nix diff --git a/pkgs/tools/misc/checkpwn/default.nix b/pkgs/by-name/ch/checkpwn/package.nix similarity index 100% rename from pkgs/tools/misc/checkpwn/default.nix rename to pkgs/by-name/ch/checkpwn/package.nix diff --git a/pkgs/development/mobile/checkra1n/default.nix b/pkgs/by-name/ch/checkra1n/package.nix similarity index 100% rename from pkgs/development/mobile/checkra1n/default.nix rename to pkgs/by-name/ch/checkra1n/package.nix diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch similarity index 100% rename from pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch rename to pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch diff --git a/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch b/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch similarity index 100% rename from pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch rename to pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/by-name/ch/checksec/package.nix similarity index 100% rename from pkgs/os-specific/linux/checksec/default.nix rename to pkgs/by-name/ch/checksec/package.nix diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix new file mode 100644 index 000000000000..92c5de3836ff --- /dev/null +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -0,0 +1,40 @@ +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: + +stdenvNoCC.mkDerivation rec { + version = "10.20.0"; + pname = "checkstyle"; + + src = fetchurl { + url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; + sha256 = "sha256-WvC5UyLxW1WHlVRs0Ll2kGwXM/9Z98qdYtjKaG2w5is="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + buildInputs = [ jre ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -D $src $out/checkstyle/checkstyle-all.jar + makeWrapper ${jre}/bin/java $out/bin/checkstyle \ + --add-flags "-jar $out/checkstyle/checkstyle-all.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "Checks Java source against a coding standard"; + mainProgram = "checkstyle"; + longDescription = '' + checkstyle is a development tool to help programmers write Java code that + adheres to a coding standard. By default it supports the Sun Code + Conventions, but is highly configurable. + ''; + homepage = "https://checkstyle.org/"; + changelog = "https://checkstyle.org/releasenotes.html#Release_${version}"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.lgpl21; + maintainers = with maintainers; [ pSub ]; + platforms = jre.meta.platforms; + }; +} diff --git a/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch b/pkgs/by-name/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch similarity index 100% rename from pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch rename to pkgs/by-name/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch diff --git a/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch b/pkgs/by-name/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch similarity index 100% rename from pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch rename to pkgs/by-name/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/by-name/ch/cheesecutter/package.nix similarity index 100% rename from pkgs/applications/audio/cheesecutter/default.nix rename to pkgs/by-name/ch/cheesecutter/package.nix diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/by-name/ch/chelf/package.nix similarity index 100% rename from pkgs/tools/misc/chelf/default.nix rename to pkgs/by-name/ch/chelf/package.nix diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/by-name/ch/cherry/package.nix similarity index 100% rename from pkgs/data/fonts/cherry/default.nix rename to pkgs/by-name/ch/cherry/package.nix diff --git a/pkgs/tools/security/cherrybomb/default.nix b/pkgs/by-name/ch/cherrybomb/package.nix similarity index 100% rename from pkgs/tools/security/cherrybomb/default.nix rename to pkgs/by-name/ch/cherrybomb/package.nix diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/by-name/ch/cherrytree/package.nix similarity index 100% rename from pkgs/applications/misc/cherrytree/default.nix rename to pkgs/by-name/ch/cherrytree/package.nix diff --git a/pkgs/games/chessdb/default.nix b/pkgs/by-name/ch/chessdb/package.nix similarity index 100% rename from pkgs/games/chessdb/default.nix rename to pkgs/by-name/ch/chessdb/package.nix diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/by-name/ch/chez-matchable/package.nix similarity index 100% rename from pkgs/development/chez-modules/chez-matchable/default.nix rename to pkgs/by-name/ch/chez-matchable/package.nix diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/by-name/ch/chez-mit/package.nix similarity index 100% rename from pkgs/development/chez-modules/chez-mit/default.nix rename to pkgs/by-name/ch/chez-mit/package.nix diff --git a/pkgs/development/compilers/chez-racket/default.nix b/pkgs/by-name/ch/chez-racket/package.nix similarity index 100% rename from pkgs/development/compilers/chez-racket/default.nix rename to pkgs/by-name/ch/chez-racket/package.nix diff --git a/pkgs/development/compilers/chez-racket/setup-hook.sh b/pkgs/by-name/ch/chez-racket/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/chez-racket/setup-hook.sh rename to pkgs/by-name/ch/chez-racket/setup-hook.sh diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix similarity index 100% rename from pkgs/development/compilers/chez-racket/shared.nix rename to pkgs/by-name/ch/chez-racket/shared.nix diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/by-name/ch/chez-scmutils/package.nix similarity index 100% rename from pkgs/development/chez-modules/chez-scmutils/default.nix rename to pkgs/by-name/ch/chez-scmutils/package.nix diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/by-name/ch/chez-srfi/package.nix similarity index 100% rename from pkgs/development/chez-modules/chez-srfi/default.nix rename to pkgs/by-name/ch/chez-srfi/package.nix diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/by-name/ch/chez/package.nix similarity index 100% rename from pkgs/development/compilers/chez/default.nix rename to pkgs/by-name/ch/chez/package.nix diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/by-name/ch/chez/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/chez/setup-hook.sh rename to pkgs/by-name/ch/chez/setup-hook.sh diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index ffae0dd265ec..af04bdfc1413 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.52.3"; + version = "2.53.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-OoVf0Gxyd+hTlM4VOei1atNEZYL2ZF3eKAHyUqRkRzs="; + hash = "sha256-E7kr2fKBabbFVmtVRjgYy5TWhvQYb/RjhiNEcXYXL0E="; }; - vendorHash = "sha256-QJkTscj3MvmscanEqA9Md2OZPYoNtxIJsAd2J6E9zHk="; + vendorHash = "sha256-wOdDG/J/JYGNUGSUCPVCNtO+5TFkt5O5kFYniQgcN7A="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix new file mode 100644 index 000000000000..09ffa3ca2128 --- /dev/null +++ b/pkgs/by-name/ch/chibi/package.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, darwin }: + +stdenv.mkDerivation rec { + version = "0.11"; + pname = "chibi-scheme"; + + src = fetchFromGitHub { + owner = "ashinn"; + repo = "chibi-scheme"; + rev = version; + sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.libutil; + + installPhase = '' + make install PREFIX="$out" + ''; + + fixupPhase = '' + wrapProgram "$out/bin/chibi-scheme" \ + --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} + + for f in chibi-doc chibi-ffi snow-chibi; do + substituteInPlace "$out/bin/$f" \ + --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme" + done + ''; + + meta = { + homepage = "https://github.com/ashinn/chibi-scheme"; + description = "Small Footprint Scheme for use as a C Extension Language"; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; + }; +} diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/by-name/ch/chipmunk/package.nix similarity index 100% rename from pkgs/development/libraries/chipmunk/default.nix rename to pkgs/by-name/ch/chipmunk/package.nix diff --git a/pkgs/by-name/ch/chiptrack/Cargo.lock b/pkgs/by-name/ch/chiptrack/Cargo.lock new file mode 100644 index 000000000000..3febb7cab924 --- /dev/null +++ b/pkgs/by-name/ch/chiptrack/Cargo.lock @@ -0,0 +1,5112 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +dependencies = [ + "cfg-if 1.0.0", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.23.2", +] + +[[package]] +name = "alsa" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.24.3", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.4.2", + "cc", + "cesu8", + "jni 0.21.1", + "jni-sys", + "libc", + "log", + "ndk 0.8.0", + "ndk-context", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ascii" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "auto_enums" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" +dependencies = [ + "derive_utils", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bindgen" +version = "0.62.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6720a8b7b2d39dd533285ed438d458f65b31b5c257e6ac7bb3d7e82844dd722" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", + "which", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.48", + "which", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitfrob" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a96c7c818dc8807bb1982dd2cba4c7de0ed6eba4ffb5fc24321d1b38676a120" + +[[package]] +name = "blip_buf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c136cf50e8d0c47fe415008a6be8b50a9a56a6741fffbe2e580e007eda417d" +dependencies = [ + "blip_buf-sys", + "libc", +] + +[[package]] +name = "blip_buf-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b84654178cd24117082f5cb10dbc0580425fc06aa02ae209171fe070cd4522e" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "bracer" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6559b8c3065745016f5cc2d1095273fe8a175e953c976426947ad828d6ba6fda" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "by_address" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8dba2868114ed769a1f2590fc9ae5eb331175b44313b6c9b922f8f7ca813d0" + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.4.2", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chiptrack" +version = "0.2.0" +dependencies = [ + "cpal 0.15.2", + "critical-section", + "ehttp", + "embedded-alloc", + "gba", + "i-slint-core", + "libm", + "midir", + "midly", + "native-dialog", + "notify", + "once_cell", + "postcard", + "pulldown-cmark", + "rboy", + "regex", + "serde", + "serde_json", + "slint", + "slint-build", + "url", + "voladdress", + "wamr-sys", + "wat", +] + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading 0.8.1", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags 1.3.2", + "textwrap", + "unicode-width", +] + +[[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 0.3.9", +] + +[[package]] +name = "clru" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.1", + "foreign-types 0.5.0", + "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 = "codemap" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24" + +[[package]] +name = "codemap-diagnostic" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc20770be05b566a963bf91505e60412c4a2d016d1ef95c5512823bb085a8122" +dependencies = [ + "codemap", + "termcolor", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-field-offset" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6304465f16f463cddc572b737c3df93576edd3a6b53f057bd8beeb29f4ef8dfd" +dependencies = [ + "const-field-offset-macro", + "field-offset", +] + +[[package]] +name = "const-field-offset-macro" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57aaaad9185d3bcb3afe63549d8ba60b2fb0ea8dc2da83f62dd56805edf56fd1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "copypasta" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" +dependencies = [ + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "smithay-clipboard", + "x11-clipboard", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "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 = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics 0.23.1", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +dependencies = [ + "bitflags 1.3.2", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen 0.69.4", +] + +[[package]] +name = "coremidi" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a7847ca018a67204508b77cb9e6de670125075f7464fff5f673023378fa34f5" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "coremidi-sys", +] + +[[package]] +name = "coremidi-sys" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a6deed0c97b2d40abbab77e4c97f81d71e162600423382c277dd640019116c" +dependencies = [ + "core-foundation-sys", +] + +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" + +[[package]] +name = "cpal" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa 0.6.0", + "core-foundation-sys", + "coreaudio-rs 0.10.0", + "jni 0.19.0", + "js-sys", + "lazy_static", + "libc", + "mach", + "ndk 0.6.0", + "ndk-glue", + "nix 0.23.2", + "oboe 0.4.6", + "parking_lot 0.11.2", + "stdweb", + "thiserror", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "cpal" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +dependencies = [ + "alsa 0.7.1", + "core-foundation-sys", + "coreaudio-rs 0.11.3", + "dasp_sample", + "jni 0.19.0", + "js-sys", + "libc", + "mach2", + "ndk 0.7.0", + "ndk-context", + "oboe 0.5.0", + "once_cell", + "parking_lot 0.12.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.46.0", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "css-color-parser2" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8ed1639f4b56ec6f31d007ff66ce4a13099dce5a9995d48368a30d62bf04bd" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "derive_utils" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "drm-ffi 0.5.0", + "drm-fourcc", + "nix 0.26.4", +] + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "drm-ffi 0.7.1", + "drm-fourcc", + "rustix", +] + +[[package]] +name = "drm-ffi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" +dependencies = [ + "drm-sys 0.4.0", + "nix 0.26.4", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys 0.6.1", + "rustix", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" +dependencies = [ + "libc", +] + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi 0.3.9", + "wio", +] + +[[package]] +name = "ehttp" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80b69a6f9168b96c0ae04763bec27a8b06b34343c334dd2703a4ec21f0f5e110" +dependencies = [ + "js-sys", + "ureq", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "embedded-alloc" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddae17915accbac2cfbc64ea0ae6e3b330e6ea124ba108dada63646fd3c6f815" +dependencies = [ + "critical-section", + "linked_list_allocator", +] + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[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 = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "femtovg" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18ab822e58e8bc2b89840dc5dde49afe39302e129c60d39c8520200c085404a7" +dependencies = [ + "bitflags 2.4.2", + "fnv", + "generational-arena", + "glow", + "image", + "imgref", + "log", + "lru", + "rgb", + "rustybuzz 0.11.0", + "unicode-bidi", + "unicode-segmentation", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.0", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3890d0893c8253d3eb98337af18b3e1a10a9b2958f2a164b53a93fb3a3049e72" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser", +] + +[[package]] +name = "fontdue" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9099a2f86b8e674b75d03ff154b3fe4c5208ed249ced8d69cc313a9fa40bb488" +dependencies = [ + "hashbrown", + "ttf-parser", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[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.48", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[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 = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags 1.3.2", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "gba" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cda2172378c6cfb7f95b64ffef6dc608d87bf83ee7c5ea63edc1631a8edd9a1" +dependencies = [ + "bitfrob", + "bracer", + "voladdress", +] + +[[package]] +name = "gbm" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" +dependencies = [ + "bitflags 1.3.2", + "drm 0.9.0", + "drm-fourcc", + "gbm-sys", + "libc", +] + +[[package]] +name = "gbm-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +dependencies = [ + "libc", +] + +[[package]] +name = "generational-arena" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "gethostname" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if 1.0.0", + "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 = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +dependencies = [ + "bitflags 2.4.2", + "cfg_aliases 0.1.1", + "cgl", + "core-foundation", + "dispatch", + "glutin_egl_sys", + "glutin_glx_sys", + "glutin_wgl_sys", + "icrate", + "libloading 0.8.1", + "objc2", + "once_cell", + "raw-window-handle 0.5.2", + "wayland-sys", + "windows-sys 0.48.0", + "x11-dl", +] + +[[package]] +name = "glutin-winit" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +dependencies = [ + "cfg_aliases 0.1.1", + "glutin", + "raw-window-handle 0.5.2", + "winit", +] + +[[package]] +name = "glutin_egl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +dependencies = [ + "gl_generator", + "windows-sys 0.48.0", +] + +[[package]] +name = "glutin_glx_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +dependencies = [ + "gl_generator", + "x11-dl", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "bytemuck", + "cfg-if 1.0.0", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + +[[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 = "hoot" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df22a4d90f1b0e65fe3e0d6ee6a4608cc4d81f4b2eb3e670f44bb6bde711e452" +dependencies = [ + "httparse", + "log", +] + +[[package]] +name = "hootbin" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "354e60868e49ea1a39c44b9562ad207c4259dc6eabf9863bf3b0f058c55cfdb2" +dependencies = [ + "fastrand", + "hoot", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "i-slint-backend-linuxkms" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fff24de728432445a94f890093bd852a7c3fd01ae282e40ae0eab6ea629a66d" +dependencies = [ + "calloop", + "drm 0.9.0", + "gbm", + "glutin", + "i-slint-common", + "i-slint-core", + "i-slint-renderer-femtovg", + "i-slint-renderer-skia", + "input", + "nix 0.27.1", + "raw-window-handle 0.5.2", + "vulkano", + "xkbcommon", +] + +[[package]] +name = "i-slint-backend-selector" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1953f792a394a7ad26932b4989646719fb126910029006f7cef40ffd189633d0" +dependencies = [ + "cfg-if 1.0.0", + "i-slint-backend-linuxkms", + "i-slint-backend-winit", + "i-slint-common", + "i-slint-core", +] + +[[package]] +name = "i-slint-backend-winit" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138c36c5c9e12f22fe07f280200cedb5d31e07641e40e3b45376fe2112ead303" +dependencies = [ + "bytemuck", + "cfg-if 1.0.0", + "cfg_aliases 0.2.0", + "cocoa 0.25.0", + "const-field-offset", + "copypasta", + "derive_more", + "glutin", + "glutin-winit", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "i-slint-renderer-femtovg", + "i-slint-renderer-skia", + "imgref", + "lyon_path", + "once_cell", + "pin-weak", + "raw-window-handle 0.5.2", + "rgb", + "scoped-tls-hkt", + "scopeguard", + "softbuffer", + "vtable", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "i-slint-common" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "550e9282fda488b76ce057a728168d1aef947c758f3221b92ae904b167ab008c" +dependencies = [ + "cfg-if 1.0.0", + "derive_more", + "fontdb", + "libloading 0.8.1", +] + +[[package]] +name = "i-slint-compiler" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25aa2c3525ea761b3e9251f7869e64dce5f483f7ea1a5e04fe7b9a3fb5780dd6" +dependencies = [ + "by_address", + "codemap", + "codemap-diagnostic", + "css-color-parser2", + "derive_more", + "fontdue", + "i-slint-common", + "image", + "itertools", + "linked_hash_set", + "lyon_extra", + "lyon_path", + "num_enum 0.7.2", + "once_cell", + "proc-macro2", + "quote", + "resvg", + "rowan", + "smol_str", + "strum", + "thiserror", + "url", +] + +[[package]] +name = "i-slint-core" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d40990f7ed42c76799edc0e8cae9a8ffcc77569506a94e86eef81626c7387a7" +dependencies = [ + "auto_enums", + "bytemuck", + "cfg-if 1.0.0", + "clru", + "const-field-offset", + "derive_more", + "euclid", + "fontdue", + "i-slint-common", + "i-slint-core-macros", + "image", + "integer-sqrt", + "lyon_algorithms", + "lyon_extra", + "lyon_geom", + "lyon_path", + "num-traits", + "once_cell", + "pin-project", + "pin-weak", + "portable-atomic", + "resvg", + "rgb", + "rustybuzz 0.12.1", + "scoped-tls-hkt", + "scopeguard", + "slab", + "static_assertions", + "strum", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", + "vtable", + "wasm-bindgen", + "web-sys", + "web-time 1.0.0", +] + +[[package]] +name = "i-slint-core-macros" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2a4e4c21ed660181abe101b6f141d920e838fec4bc1ff20f7440dc03fb5ad8" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "i-slint-renderer-femtovg" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "337e6ec928bde01baa27d3fdeddd5a33665952aead4d0d9be9818f573a41344c" +dependencies = [ + "cfg-if 1.0.0", + "const-field-offset", + "core-foundation", + "core-text", + "derive_more", + "dwrote", + "femtovg", + "glow", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "imgref", + "lyon_path", + "once_cell", + "pin-weak", + "raw-window-handle 0.5.2", + "rgb", + "scoped-tls-hkt", + "ttf-parser", + "unicode-script", + "unicode-segmentation", + "vtable", + "wasm-bindgen", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "i-slint-renderer-skia" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1189ac65d7e31129407e2cfef4009cdea500040a73d8f87505949f82af0939db" +dependencies = [ + "ash", + "bytemuck", + "cfg-if 1.0.0", + "cfg_aliases 0.2.0", + "cocoa 0.25.0", + "const-field-offset", + "core-foundation", + "core-graphics-types", + "derive_more", + "foreign-types 0.5.0", + "glow", + "glutin", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "lyon_path", + "metal", + "objc", + "once_cell", + "pin-weak", + "raw-window-handle 0.5.2", + "scoped-tls-hkt", + "skia-safe", + "softbuffer", + "unicode-segmentation", + "vtable", + "vulkano", + "windows 0.52.0", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +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 = "indexmap" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes", + "libc", + "log", + "udev", +] + +[[package]] +name = "input-sys" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "integer-sqrt" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" +dependencies = [ + "num-traits", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if 1.0.0", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leb128" +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 = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "linked_list_allocator" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_extra" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ce2ae38f2480094ec1f0d5df51a75581fa84f0e8f32a0edb1d264630c99f3b" +dependencies = [ + "lyon_path", +] + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.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" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.2", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "midir" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a456444d83e7ead06ae6a5c0a215ed70282947ff3897fb45fcb052b757284731" +dependencies = [ + "alsa 0.7.1", + "bitflags 1.3.2", + "coremidi", + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows 0.43.0", +] + +[[package]] +name = "midly" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "207d755f4cb882d20c4da58d707ca9130a0c9bc5061f657a4f299b8e36362b7a" +dependencies = [ + "rayon", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "native-dialog" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b" +dependencies = [ + "ascii", + "block", + "cocoa 0.24.1", + "dirs-next", + "objc", + "objc-foundation", + "objc_id", + "once_cell", + "raw-window-handle 0.4.3", + "thiserror", + "wfd", + "which", + "winapi 0.3.9", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.3.0", + "num_enum 0.5.11", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.2", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-glue" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.6.0", + "ndk-context", + "ndk-macro", + "ndk-sys 0.3.0", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags 1.3.2", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "oboe" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni 0.19.0", + "ndk 0.6.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys 0.4.5", +] + +[[package]] +name = "oboe" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +dependencies = [ + "jni 0.20.0", + "ndk 0.7.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys 0.5.0", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] + +[[package]] +name = "oboe-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +dependencies = [ + "cc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +dependencies = [ + "critical-section", + "portable-atomic", +] + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pin-weak" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b330c9d1b92dfe68442ca20b009c717d5f0b1e3cf4965e62f704c3c6e95a1305" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +dependencies = [ + "critical-section", +] + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "prettyplease" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +dependencies = [ + "proc-macro2", + "syn 2.0.48", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.4.2", + "getopts", + "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-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "raw-window-handle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" +dependencies = [ + "cty", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rboy" +version = "0.1.0" +source = "git+https://github.com/jturcotte/rboy.git?rev=8f886fee45395b1ed093c978ad070321dd81ea6b#8f886fee45395b1ed093c978ad070321dd81ea6b" +dependencies = [ + "blip_buf", + "clap", + "cpal 0.13.5", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox 0.0.1", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "resvg" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" +dependencies = [ + "log", + "pico-args", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rowan" +version = "0.15.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" +dependencies = [ + "countme", + "hashbrown", + "memoffset 0.9.0", + "rustc-hash", + "text-size", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scoped-tls-hkt" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ddc765d3410d9f6c6ca071bf0b67f6b01e3ec4595dc3892f02677e75819dddc" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.4", + "smithay-client-toolkit", + "tiny-skia", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "serde" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.113" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skia-bindings" +version = "0.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bc61a106126a429bb4775ce5fbe23b2bcaa74d1a9c484997f4700de31480b44" +dependencies = [ + "bindgen 0.69.4", + "cc", + "flate2", + "heck", + "lazy_static", + "regex", + "serde_json", + "tar", + "toml", +] + +[[package]] +name = "skia-safe" +version = "0.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3201eba92bca1f83864f5c3a48309bcfee7e0590bebd7826e7ab0a49aa24a750" +dependencies = [ + "bitflags 2.4.2", + "lazy_static", + "skia-bindings", + "windows 0.52.0", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slint" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d51a972e5c6f22793f9b334eeb537121337fbf66ed73e978475fca031fd367a" +dependencies = [ + "const-field-offset", + "i-slint-backend-selector", + "i-slint-core", + "i-slint-renderer-femtovg", + "num-traits", + "once_cell", + "pin-weak", + "slint-macros", + "vtable", +] + +[[package]] +name = "slint-build" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf98969a520e19ec675435b8c21b883d4a06489947e137bbd30859b50ad0c36" +dependencies = [ + "i-slint-compiler", + "spin_on", + "thiserror", + "toml_edit 0.21.1", +] + +[[package]] +name = "slint-macros" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "564b2a25cc34007aa9cd73630394efa972b956fee86538caa5d09808b3ba0c05" +dependencies = [ + "i-slint-compiler", + "proc-macro2", + "quote", + "spin_on", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.4.2", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6" +dependencies = [ + "libc", + "smithay-client-toolkit", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +dependencies = [ + "serde", +] + +[[package]] +name = "softbuffer" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f266ce2aa23eaaaa4e758ed44495d505d00fb79f359d46f6c1900cb053123b62" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.1.1", + "cocoa 0.25.0", + "core-graphics 0.23.1", + "drm 0.11.1", + "fastrand", + "foreign-types 0.5.0", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle 0.5.2", + "redox_syscall 0.4.1", + "rustix", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.48.0", + "x11rb 0.12.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spin_on" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076e103ed41b9864aa838287efe5f4e3a7a0362dd00671ae62a212e5e4612da2" +dependencies = [ + "pin-utils", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stdweb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "text-size" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if 1.0.0", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +dependencies = [ + "as-raw-xcb-connection", + "ctor", + "libloading 0.8.1", + "tracing", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +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 = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.5", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.1", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ident" +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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b52731d03d6bb2fd18289d4028aee361d6c28d44977846793b994b13cdcc64d" +dependencies = [ + "base64", + "flate2", + "hootbin", + "log", + "once_cell", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "usvg" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.12.1", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" +dependencies = [ + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vk-parse" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81086c28be67a8759cd80cbb3c8f7b520e0874605fc5eb74d5a1c9c2d1878e79" +dependencies = [ + "xml-rs", +] + +[[package]] +name = "voladdress" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbf3fef7bc995d3f8350936bdd07966c7a1f96183d52e3f28c29d099d0b5ecc" + +[[package]] +name = "vtable" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4c7506238561777a1861d3dc3c0001877c475187e7bc4392ea87ebf631fd9c" +dependencies = [ + "const-field-offset", + "portable-atomic", + "stable_deref_trait", + "vtable-macro", +] + +[[package]] +name = "vtable-macro" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2b8eecdb8e4284adf5546fc518f048f6dc33e7203dbe36fa93a4add39b31f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "vulkano" +version = "0.34.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f4278f76307b3c388679234b397b4f90de29cdba53873c26b624ed82653d75" +dependencies = [ + "ahash", + "ash", + "bytemuck", + "core-graphics-types", + "crossbeam-queue", + "half", + "heck", + "indexmap", + "libloading 0.8.1", + "objc", + "once_cell", + "parking_lot 0.12.1", + "proc-macro2", + "quote", + "raw-window-handle 0.5.2", + "regex", + "serde", + "serde_json", + "smallvec", + "thread_local", + "vk-parse", +] + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wamr-sys" +version = "1.2.0" +source = "git+https://github.com/jturcotte/wamr-sys.git?rev=e85c0a32f02b1907bf77530830e56628b496bb32#e85c0a32f02b1907bf77530830e56628b496bb32" +dependencies = [ + "bindgen 0.62.0", + "cc", + "cmake", + "libc", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wasm-encoder" +version = "0.41.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" +dependencies = [ + "leb128", +] + +[[package]] +name = "wast" +version = "71.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647c3ac4354da32688537e8fc4d2fe6c578df51896298cb64727d98088a1fd26" +dependencies = [ + "bumpalo", + "leb128", + "memchr", + "unicode-width", + "wasm-encoder", +] + +[[package]] +name = "wat" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69c36f634411568a2c6d24828b674961e37ea03340fe1d605c337ed8162d901" +dependencies = [ + "wast", +] + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.4.2", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.2", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee269d72cc29bf77a2c4bc689cc750fb39f5cbd493d2205bbb3f5c7779cf7b0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wfd" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[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.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +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", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winit" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.4.2", + "bytemuck", + "calloop", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics 0.23.1", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.5.2", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time 0.2.4", + "windows-sys 0.48.0", + "x11-dl", + "x11rb 0.13.0", + "xkbcommon-dl", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +dependencies = [ + "memchr", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "x11-clipboard" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613c2be3e772af2bbb57c5a94413675f5ec668bac00a71ada2ced28c420ef087" +dependencies = [ + "libc", + "x11rb 0.13.0", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname 0.3.0", + "libc", + "libloading 0.7.4", + "nix 0.26.4", + "once_cell", + "winapi 0.3.9", + "winapi-wsapoll", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname 0.4.3", + "libc", + "libloading 0.8.1", + "once_cell", + "rustix", + "x11rb-protocol 0.13.0", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.13", + "rustix", +] + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.4.2", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix new file mode 100644 index 000000000000..a57f713673b9 --- /dev/null +++ b/pkgs/by-name/ch/chiptrack/package.nix @@ -0,0 +1,146 @@ +{ + clangStdenv, + rustPlatform, + lib, + linkFarm, + fetchgit, + fetchFromGitHub, + runCommand, + alsa-lib, + brotli, + cmake, + expat, + fontconfig, + freetype, + gn, + harfbuzz, + icu, + libglvnd, + libjpeg, + libxkbcommon, + libX11, + libXcursor, + libXext, + libXi, + libXrandr, + makeWrapper, + ninja, + pkg-config, + python3, + removeReferencesTo, + wayland, + zlib, +}: + +rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { + pname = "chiptrack"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "jturcotte"; + repo = "chiptrack"; + rev = "refs/tags/v${version}"; + hash = "sha256-Iehe4dD7nWoBB6RaYLvPvV6bBKEc3Kdkwrhb8Ry+s9s="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + cmake + makeWrapper + pkg-config + python3 + removeReferencesTo + ]; + + buildInputs = [ + expat + fontconfig + freetype + harfbuzz + icu + libjpeg + ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ]; + + # Has git dependencies + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rboy-0.1.0" = "sha256-2Acgg5phDAVTJht3XIXO7/TV5FxEXyLQJtC5n7cd9Ek="; + "wamr-sys-1.2.0" = "sha256-lNpJjHqdaYi/cyoAb8RlsKuLQ9WhuGwlzcSpDM68Kco="; + }; + }; + + env = { + SKIA_SOURCE_DIR = + let + repo = fetchFromGitHub { + owner = "rust-skia"; + repo = "skia"; + # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia + rev = "refs/tags/m121-0.69.1"; + hash = "sha256-OviOIiw3RvQx1dvtQ9kWIc/mGVPOOsLVCIRoBJrC72M="; + }; + # The externals for skia are taken from skia/DEPS + # Reduced to only what's necessary + externals = linkFarm "skia-externals" ( + lib.mapAttrsToList (name: value: { + inherit name; + path = fetchgit value; + }) (lib.importJSON ./skia-externals.json) + ); + in + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + ln -s ${externals} $out/third_party/externals + ''; + SKIA_GN_COMMAND = lib.getExe gn; + SKIA_NINJA_COMMAND = lib.getExe ninja; + SKIA_USE_SYSTEM_LIBRARIES = "1"; + + NIX_CFLAGS_COMPILE = "-I${lib.getDev harfbuzz}/include/harfbuzz"; + }; + + # library skia embeds the path to its sources + postFixup = '' + remove-references-to -t "$SKIA_SOURCE_DIR" \ + $out/bin/chiptrack + + wrapProgram $out/bin/chiptrack \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath ( + [ + brotli + zlib + ] + ++ lib.optionals clangStdenv.hostPlatform.isLinux [ + libglvnd + libxkbcommon + libX11 + libXcursor + libXext + libXrandr + libXi + wayland + ] + ) + } + ''; + + disallowedReferences = [ env.SKIA_SOURCE_DIR ]; + + meta = { + description = "Programmable cross-platform sequencer for the Game Boy Advance sound chip"; + homepage = "https://github.com/jturcotte/chiptrack"; + license = with lib.licenses; [ + mit # main + gpl3Only # GPL dependencies + ]; + mainProgram = "chiptrack"; + maintainers = with lib.maintainers; [ OPNA2608 ]; + # Various issues with wrong max macOS version & misparsed target conditional checks, can't figure out the magic combination for this + broken = clangStdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/ch/chiptrack/skia-externals.json b/pkgs/by-name/ch/chiptrack/skia-externals.json new file mode 100644 index 000000000000..53c0a2ad42c4 --- /dev/null +++ b/pkgs/by-name/ch/chiptrack/skia-externals.json @@ -0,0 +1,7 @@ +{ + "wuffs": { + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=" + } +} diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/by-name/ch/chisel/package.nix similarity index 100% rename from pkgs/tools/networking/chisel/default.nix rename to pkgs/by-name/ch/chisel/package.nix diff --git a/pkgs/development/tools/chit/Cargo.lock b/pkgs/by-name/ch/chit/Cargo.lock similarity index 100% rename from pkgs/development/tools/chit/Cargo.lock rename to pkgs/by-name/ch/chit/Cargo.lock diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/by-name/ch/chit/package.nix similarity index 100% rename from pkgs/development/tools/chit/default.nix rename to pkgs/by-name/ch/chit/package.nix diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/by-name/ch/chkcrontab/package.nix similarity index 100% rename from pkgs/tools/admin/chkcrontab/default.nix rename to pkgs/by-name/ch/chkcrontab/package.nix diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/by-name/ch/chkrootkit/package.nix similarity index 100% rename from pkgs/tools/security/chkrootkit/default.nix rename to pkgs/by-name/ch/chkrootkit/package.nix diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/by-name/ch/chmlib/package.nix similarity index 100% rename from pkgs/development/libraries/chmlib/default.nix rename to pkgs/by-name/ch/chmlib/package.nix diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/pkgs/by-name/ch/chntpw/00-chntpw-build-arch-autodetect.patch similarity index 100% rename from pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch rename to pkgs/by-name/ch/chntpw/00-chntpw-build-arch-autodetect.patch diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/pkgs/by-name/ch/chntpw/01-chntpw-install-target.patch similarity index 100% rename from pkgs/tools/security/chntpw/01-chntpw-install-target.patch rename to pkgs/by-name/ch/chntpw/01-chntpw-install-target.patch diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/by-name/ch/chntpw/package.nix similarity index 100% rename from pkgs/tools/security/chntpw/default.nix rename to pkgs/by-name/ch/chntpw/package.nix diff --git a/pkgs/games/doom-ports/chocolate-doom/default.nix b/pkgs/by-name/ch/chocolate-doom/package.nix similarity index 100% rename from pkgs/games/doom-ports/chocolate-doom/default.nix rename to pkgs/by-name/ch/chocolate-doom/package.nix diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/by-name/ch/cholmod-extra/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/cholmod-extra/default.nix rename to pkgs/by-name/ch/cholmod-extra/package.nix diff --git a/pkgs/data/fonts/chonburi/default.nix b/pkgs/by-name/ch/chonburi-font/package.nix similarity index 100% rename from pkgs/data/fonts/chonburi/default.nix rename to pkgs/by-name/ch/chonburi-font/package.nix diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/by-name/ch/choose/package.nix similarity index 100% rename from pkgs/tools/text/choose/default.nix rename to pkgs/by-name/ch/choose/package.nix diff --git a/pkgs/tools/security/chopchop/default.nix b/pkgs/by-name/ch/chopchop/package.nix similarity index 100% rename from pkgs/tools/security/chopchop/default.nix rename to pkgs/by-name/ch/chopchop/package.nix diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/by-name/ch/chroma/package.nix similarity index 100% rename from pkgs/tools/text/chroma/default.nix rename to pkgs/by-name/ch/chroma/package.nix diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/by-name/ch/chroma/src.json similarity index 100% rename from pkgs/tools/text/chroma/src.json rename to pkgs/by-name/ch/chroma/src.json diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/by-name/ch/chromaprint/package.nix similarity index 100% rename from pkgs/development/libraries/chromaprint/default.nix rename to pkgs/by-name/ch/chromaprint/package.nix diff --git a/pkgs/tools/misc/chrome-export/default.nix b/pkgs/by-name/ch/chrome-export/package.nix similarity index 100% rename from pkgs/tools/misc/chrome-export/default.nix rename to pkgs/by-name/ch/chrome-export/package.nix diff --git a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/pkgs/by-name/ch/chromium-xorg-conf/package.nix similarity index 100% rename from pkgs/os-specific/linux/chromium-xorg-conf/default.nix rename to pkgs/by-name/ch/chromium-xorg-conf/package.nix diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix index 9cfdfd020c2e..22eaf9a13bc5 100644 --- a/pkgs/by-name/ch/chrony/package.nix +++ b/pkgs/by-name/ch/chrony/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, fetchurl, pkg-config, gnutls, @@ -11,19 +10,11 @@ libseccomp, pps-tools, nixosTests, + apple-sdk_11, + darwinMinVersionHook, }: -let - stdenv' = - if stdenv.hostPlatform.isDarwin then - overrideSDK stdenv { - darwinSdkVersion = "11.0"; - darwinMinVersion = "10.13"; - } - else - stdenv; -in -stdenv'.mkDerivation rec { +stdenv.mkDerivation rec { pname = "chrony"; version = "4.6.1"; @@ -49,6 +40,10 @@ stdenv'.mkDerivation rec { libcap libseccomp pps-tools + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + (darwinMinVersionHook "10.13") ]; configureFlags = [ diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/by-name/ch/chrpath/package.nix similarity index 100% rename from pkgs/development/tools/misc/chrpath/default.nix rename to pkgs/by-name/ch/chrpath/package.nix diff --git a/pkgs/development/tools/misc/chruby-fish/default.nix b/pkgs/by-name/ch/chruby-fish/package.nix similarity index 100% rename from pkgs/development/tools/misc/chruby-fish/default.nix rename to pkgs/by-name/ch/chruby-fish/package.nix diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/by-name/ch/cht-sh/package.nix similarity index 100% rename from pkgs/tools/misc/cht.sh/default.nix rename to pkgs/by-name/ch/cht-sh/package.nix diff --git a/pkgs/data/fonts/chunk/default.nix b/pkgs/by-name/ch/chunk/package.nix similarity index 100% rename from pkgs/data/fonts/chunk/default.nix rename to pkgs/by-name/ch/chunk/package.nix diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/by-name/ch/chunkfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/chunkfs/default.nix rename to pkgs/by-name/ch/chunkfs/package.nix diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/by-name/ch/chunksync/package.nix similarity index 100% rename from pkgs/tools/backup/chunksync/default.nix rename to pkgs/by-name/ch/chunksync/package.nix diff --git a/pkgs/by-name/ci/ciao/package.nix b/pkgs/by-name/ci/ciao/package.nix new file mode 100644 index 000000000000..d7c215de005f --- /dev/null +++ b/pkgs/by-name/ci/ciao/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ciao"; + version = "1.24.0-m1"; + src = fetchFromGitHub { + owner = "ciao-lang"; + repo = "ciao"; + rev = "v${version}"; + sha256 = "sha256-vjDiYL6yVfLo7NrVKdYRxMUrg7aqQHTezqNoDJcsEuI="; + }; + + configurePhase = '' + ./ciao-boot.sh configure --instype=global --prefix=$prefix + ''; + + buildPhase = '' + ./ciao-boot.sh build + ''; + + installPhase = '' + ./ciao-boot.sh install + ''; + + meta = with lib; { + homepage = "https://ciao-lang.org/"; + description = "General purpose, multi-paradigm programming language in the Prolog family"; + license = licenses.lgpl21; + maintainers = with maintainers; [ suhr ]; + platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin + }; +} diff --git a/pkgs/tools/misc/cicero-tui/Cargo.lock b/pkgs/by-name/ci/cicero-tui/Cargo.lock similarity index 100% rename from pkgs/tools/misc/cicero-tui/Cargo.lock rename to pkgs/by-name/ci/cicero-tui/Cargo.lock diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/by-name/ci/cicero-tui/package.nix similarity index 100% rename from pkgs/tools/misc/cicero-tui/default.nix rename to pkgs/by-name/ci/cicero-tui/package.nix diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix new file mode 100644 index 000000000000..8cffc3a34ef9 --- /dev/null +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -0,0 +1,47 @@ +{ + appimageTools, + lib, + requireFile, + makeWrapper, +}: + +appimageTools.wrapType2 rec { + pname = "cider-2"; + version = "2.5.0"; + + src = requireFile { + name = "Cider-linux-appimage-x64.AppImage"; + url = "https://cidercollective.itch.io/cider"; + sha256 = "1nm35psq9ddii2c15kb03ifcn43fimvc4yzb4cpm1gqsiz4w21qz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + extraInstallCommands = + let + contents = appimageTools.extract { + inherit version src; + # HACK: this looks for a ${pname}.desktop, where `cider-2.desktop` doesn't exist + pname = "cider"; + }; + in + '' + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "--no-sandbox --disable-gpu-sandbox" # Cider 2 does not start up properly without these from my preliminary testing + + install -m 444 -D ${contents}/cider.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace-warn 'Exec=AppRun --no-sandbox' 'Exec=${pname}' + cp -r ${contents}/usr/share/icons $out/share + ''; + + meta = { + description = "Powerful music player that allows you listen to your favorite tracks with style"; + homepage = "https://cider.sh"; + license = lib.licenses.unfree; + mainProgram = "cider-2"; + maintainers = with lib.maintainers; [ itsvic-dev ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/by-name/ci/cider/package.nix similarity index 100% rename from pkgs/applications/audio/cider/default.nix rename to pkgs/by-name/ci/cider/package.nix diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/by-name/ci/cidrgrep/package.nix similarity index 100% rename from pkgs/tools/text/cidrgrep/default.nix rename to pkgs/by-name/ci/cidrgrep/package.nix diff --git a/pkgs/tools/security/cie-middleware-linux/deps.json b/pkgs/by-name/ci/cie-middleware-linux/deps.json similarity index 100% rename from pkgs/tools/security/cie-middleware-linux/deps.json rename to pkgs/by-name/ci/cie-middleware-linux/deps.json diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix similarity index 100% rename from pkgs/tools/security/cie-middleware-linux/default.nix rename to pkgs/by-name/ci/cie-middleware-linux/package.nix diff --git a/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch b/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch similarity index 100% rename from pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch rename to pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch diff --git a/pkgs/tools/package-management/ciel/Cargo.lock b/pkgs/by-name/ci/ciel/Cargo.lock similarity index 100% rename from pkgs/tools/package-management/ciel/Cargo.lock rename to pkgs/by-name/ci/ciel/Cargo.lock diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/by-name/ci/ciel/package.nix similarity index 100% rename from pkgs/tools/package-management/ciel/default.nix rename to pkgs/by-name/ci/ciel/package.nix diff --git a/pkgs/by-name/ci/cifs-utils/package.nix b/pkgs/by-name/ci/cifs-utils/package.nix new file mode 100644 index 000000000000..b96298aa2cd9 --- /dev/null +++ b/pkgs/by-name/ci/cifs-utils/package.nix @@ -0,0 +1,56 @@ +{ + stdenv, + lib, + fetchurl, + autoreconfHook, + docutils, + pkg-config, + libcap, + libkrb5, + keyutils, + pam, + samba, + talloc, + python3, +}: + +stdenv.mkDerivation rec { + pname = "cifs-utils"; + version = "7.1"; + + src = fetchurl { + url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; + sha256 = "sha256-ohEj92pKajbJZTGJukkY6988/NP5CScwpH/zRQtbWyo="; + }; + + nativeBuildInputs = [ + autoreconfHook + docutils + pkg-config + ]; + + buildInputs = [ + keyutils + libcap + libkrb5 + pam + python3 + samba + talloc + ]; + + configureFlags = + [ "ROOTSBINDIR=$(out)/sbin" ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + + meta = with lib; { + homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils"; + description = "Tools for managing Linux CIFS client filesystems"; + platforms = platforms.linux; + license = licenses.lgpl3; + }; +} diff --git a/pkgs/development/libraries/science/biology/ciftilib/default.nix b/pkgs/by-name/ci/ciftilib/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/ciftilib/default.nix rename to pkgs/by-name/ci/ciftilib/package.nix diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/by-name/ci/cilium-cli/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/cilium/default.nix rename to pkgs/by-name/ci/cilium-cli/package.nix diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/by-name/ci/cinelerra/package.nix similarity index 100% rename from pkgs/applications/video/cinelerra/default.nix rename to pkgs/by-name/ci/cinelerra/package.nix diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/by-name/ci/ciopfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/ciopfs/default.nix rename to pkgs/by-name/ci/ciopfs/package.nix diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/by-name/ci/cipher/package.nix similarity index 100% rename from pkgs/applications/misc/cipher/default.nix rename to pkgs/by-name/ci/cipher/package.nix diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/by-name/ci/circleci-cli/package.nix similarity index 100% rename from pkgs/development/tools/misc/circleci-cli/default.nix rename to pkgs/by-name/ci/circleci-cli/package.nix diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/by-name/ci/circt/circt-llvm.nix similarity index 93% rename from pkgs/development/compilers/circt/circt-llvm.nix rename to pkgs/by-name/ci/circt/circt-llvm.nix index 8375ccc22f8f..6c9ec00564dd 100644 --- a/pkgs/development/compilers/circt/circt-llvm.nix +++ b/pkgs/by-name/ci/circt/circt-llvm.nix @@ -1,17 +1,23 @@ -{ lib -, stdenv -, cmake -, ninja -, circt -, llvm -, python3 -}: stdenv.mkDerivation { +{ + lib, + stdenv, + cmake, + ninja, + circt, + llvm, + python3, +}: +stdenv.mkDerivation { pname = circt.pname + "-llvm"; inherit (circt) version src; requiredSystemFeatures = [ "big-parallel" ]; - nativeBuildInputs = [ cmake ninja python3 ]; + nativeBuildInputs = [ + cmake + ninja + python3 + ]; preConfigure = '' cd llvm/llvm @@ -30,7 +36,11 @@ "-DLLVM_INSTALL_UTILS=ON" ]; - outputs = [ "out" "lib" "dev" ]; + outputs = [ + "out" + "lib" + "dev" + ]; # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev # in circt) so that we only have to remove the one fixed rpath. @@ -70,7 +80,7 @@ # # Inspired by fixDarwinDylibNames. postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - local flags=(-delete_rpath @loader_path/../lib) + local flags for file in "$lib"/lib/*.dylib; do flags+=(-change @rpath/"$(basename "$file")" "$file") done diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix new file mode 100644 index 000000000000..6042e95d5c34 --- /dev/null +++ b/pkgs/by-name/ci/circt/package.nix @@ -0,0 +1,136 @@ +{ + stdenv, + lib, + cmake, + coreutils, + python3, + git, + fetchFromGitHub, + ninja, + lit, + z3, + gitUpdater, + callPackage, +}: + +let + pythonEnv = python3.withPackages (ps: [ ps.psutil ]); + circt-llvm = callPackage ./circt-llvm.nix { }; +in +stdenv.mkDerivation rec { + pname = "circt"; + version = "1.87.0"; + src = fetchFromGitHub { + owner = "llvm"; + repo = "circt"; + rev = "firtool-${version}"; + hash = "sha256-buWpoym57YxyHJySYaektAUmuSRXMS+YBwtjWpoV1Vg="; + fetchSubmodules = true; + }; + + requiredSystemFeatures = [ "big-parallel" ]; + + nativeBuildInputs = [ + cmake + ninja + git + pythonEnv + z3 + ]; + buildInputs = [ circt-llvm ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DMLIR_DIR=${circt-llvm.dev}/lib/cmake/mlir" + + # LLVM_EXTERNAL_LIT is executed by python3, the wrapped bash script will not work + "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" + "-DCIRCT_LLHD_SIM_ENABLED=OFF" + ]; + + # cannot use lib.optionalString as it creates an empty string, disabling all tests + LIT_FILTER_OUT = + let + lit-filters = + # There are some tests depending on `clang-tools` to work. They are activated only when detected + # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these + # tests work. Because + # + # 1. The absolute paths of binaries used in tests are resolved in configure phase. + # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, + # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in + # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. + # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. + # + # As a temporary fix, we disabled these tests when using clang stdenv + lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\.mlir" ] + # Disable some tests on x86_64-darwin + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines + "CIRCT :: Target/ExportSMTLIB/attributes.mlir" + "CIRCT :: Target/ExportSMTLIB/basic.mlir" + "CIRCT :: circt-bmc/comb-errors.mlir" + "CIRCT :: circt-bmc/seq-errors.mlir" + # This test was having issues with rosetta + "CIRCT :: Dialect/SMT/basic.mlir" + ]; + in + if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null; + + preConfigure = '' + find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; + # circt uses git to check its version, but when cloned on nix it can't access git. + # So this hard codes the version. + substituteInPlace cmake/modules/GenVersionFile.cmake \ + --replace-fail "unknown git version" "${src.rev}" + # Increase timeout on tests because some were failing on hydra. + # Using `replace-warn` so it doesn't break when upstream changes the timeout. + substituteInPlace integration_test/CMakeLists.txt \ + --replace-warn 'set(CIRCT_INTEGRATION_TIMEOUT 60)' 'set(CIRCT_INTEGRATION_TIMEOUT 300)' + ''; + + doCheck = true; + checkTarget = "check-circt check-circt-integration"; + + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path + mkdir -pv $lib/lib + cp -v ./lib/libarc-jit-env.dylib $lib/lib + ''; + + outputs = [ + "out" + "lib" + "dev" + ]; + + # Copy circt-llvm's postFixup stage so that it can make all our dylib references + # absolute as well. + # + # We don't need `postPatch` because circt seems to be automatically inheriting + # the config somehow, presumably via. `-DMLIR_DIR`. + postFixup = circt-llvm.postFixup; + + postInstall = '' + moveToOutput lib "$lib" + ''; + + passthru = { + updateScript = gitUpdater { + rev-prefix = "firtool-"; + }; + llvm = circt-llvm; + }; + + meta = { + description = "Circuit IR compilers and tools"; + homepage = "https://circt.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + sharzy + pineapplehunter + sequencer + ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/by-name/ci/circumflex/package.nix similarity index 100% rename from pkgs/applications/networking/circumflex/default.nix rename to pkgs/by-name/ci/circumflex/package.nix diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/by-name/ci/circup/package.nix similarity index 100% rename from pkgs/development/tools/circup/default.nix rename to pkgs/by-name/ci/circup/package.nix diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 5c97b1d82619..cf6a6ea031ca 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.130.2"; + version = "0.131.2"; src = fetchFromGitHub { owner = "cirruslabs"; - repo = pname; + repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-OnB7e0KYXxHGcG8ilTZ3/Na/g9Ai8/QM8x6wAOa6glE="; + hash = "sha256-PxJYKn97gsqozofeU2IzOk0sMupt+fNpggQ00tZ12pk="; }; vendorHash = "sha256-rYg0cmW63IolYQ79R9pFiFXD6UfESv4jq9kn1EGJmgw="; diff --git a/pkgs/tools/security/cirrusgo/default.nix b/pkgs/by-name/ci/cirrusgo/package.nix similarity index 100% rename from pkgs/tools/security/cirrusgo/default.nix rename to pkgs/by-name/ci/cirrusgo/package.nix diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/by-name/ci/cista/package.nix similarity index 100% rename from pkgs/development/libraries/cista/default.nix rename to pkgs/by-name/ci/cista/package.nix diff --git a/pkgs/tools/misc/citron/default.nix b/pkgs/by-name/ci/citron/package.nix similarity index 100% rename from pkgs/tools/misc/citron/default.nix rename to pkgs/by-name/ci/citron/package.nix diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/by-name/ci/civetweb/package.nix similarity index 100% rename from pkgs/development/libraries/civetweb/default.nix rename to pkgs/by-name/ci/civetweb/package.nix diff --git a/pkgs/tools/admin/cjdns-tools/default.nix b/pkgs/by-name/cj/cjdns-tools/package.nix similarity index 100% rename from pkgs/tools/admin/cjdns-tools/default.nix rename to pkgs/by-name/cj/cjdns-tools/package.nix diff --git a/pkgs/tools/admin/cjdns-tools/wrapper.sh b/pkgs/by-name/cj/cjdns-tools/wrapper.sh similarity index 100% rename from pkgs/tools/admin/cjdns-tools/wrapper.sh rename to pkgs/by-name/cj/cjdns-tools/wrapper.sh diff --git a/pkgs/tools/networking/cjdns/Cargo.lock b/pkgs/by-name/cj/cjdns/Cargo.lock similarity index 100% rename from pkgs/tools/networking/cjdns/Cargo.lock rename to pkgs/by-name/cj/cjdns/Cargo.lock diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/by-name/cj/cjdns/package.nix similarity index 100% rename from pkgs/tools/networking/cjdns/default.nix rename to pkgs/by-name/cj/cjdns/package.nix diff --git a/pkgs/tools/networking/cjdns/system-libsodium.patch b/pkgs/by-name/cj/cjdns/system-libsodium.patch similarity index 100% rename from pkgs/tools/networking/cjdns/system-libsodium.patch rename to pkgs/by-name/cj/cjdns/system-libsodium.patch diff --git a/pkgs/development/libraries/cjose/default.nix b/pkgs/by-name/cj/cjose/package.nix similarity index 100% rename from pkgs/development/libraries/cjose/default.nix rename to pkgs/by-name/cj/cjose/package.nix diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index 867b6941d5ae..57cfe2796740 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs --build build/choose-tests-locale.sh + + # https://github.com/linuxmint/cjs/issues/123 + substituteInPlace meson.build --replace-fail "extra_args: '--warn-error'," "" ''; meta = with lib; { diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/by-name/cj/cjson/package.nix similarity index 100% rename from pkgs/development/libraries/cjson/default.nix rename to pkgs/by-name/cj/cjson/package.nix diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix new file mode 100644 index 000000000000..84f89ad4eced --- /dev/null +++ b/pkgs/by-name/ck/ckan/package.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, makeWrapper, mono, gtk2, curl }: + +stdenv.mkDerivation rec { + pname = "ckan"; + version = "1.35.0"; + + src = fetchurl { + url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; + sha256 = "sha256-VeuvaxdA+l+jKg4bUv79hNnOXgLXKJdiMYsmpTvX4og="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mono ]; + + libraries = lib.makeLibraryPath [ gtk2 curl ]; + + dontBuild = true; + + installPhase = '' + install -m 644 -D $src $out/bin/ckan.exe + makeWrapper ${mono}/bin/mono $out/bin/ckan \ + --add-flags $out/bin/ckan.exe \ + --set LD_LIBRARY_PATH $libraries + ''; + + meta = with lib; { + description = "Mod manager for Kerbal Space Program"; + mainProgram = "ckan"; + homepage = "https://github.com/KSP-CKAN/CKAN"; + license = licenses.mit; + maintainers = with maintainers; [ Baughn ymarkus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ck/ckbcomp/package.nix b/pkgs/by-name/ck/ckbcomp/package.nix new file mode 100644 index 000000000000..69388ebf72a7 --- /dev/null +++ b/pkgs/by-name/ck/ckbcomp/package.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitLab, perl, xkeyboard_config }: + +stdenv.mkDerivation rec { + pname = "ckbcomp"; + version = "1.231"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "installer-team"; + repo = "console-setup"; + rev = version; + sha256 = "sha256-3GoQL3ydbghSjBin05oxE8J84uwDVQU75UGrvg280es="; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + substituteInPlace Keyboard/ckbcomp --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + substituteInPlace Keyboard/ckbcomp --replace "rules = 'xorg'" "rules = 'base'" + ''; + + dontBuild = true; + + installPhase = '' + install -Dm0555 -t $out/bin Keyboard/ckbcomp + install -Dm0444 -t $out/share/man/man1 man/ckbcomp.1 + ''; + + meta = with lib; { + description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; + homepage = "https://salsa.debian.org/installer-team/console-setup"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ dezgeg ]; + platforms = platforms.unix; + mainProgram = "ckbcomp"; + }; +} diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/by-name/ck/cksfv/package.nix similarity index 100% rename from pkgs/tools/networking/cksfv/default.nix rename to pkgs/by-name/ck/cksfv/package.nix diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/by-name/cl/cl-launch/package.nix similarity index 100% rename from pkgs/development/tools/misc/cl-launch/default.nix rename to pkgs/by-name/cl/cl-launch/package.nix diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/by-name/cl/cl-wordle/package.nix similarity index 100% rename from pkgs/games/cl-wordle/default.nix rename to pkgs/by-name/cl/cl-wordle/package.nix diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/by-name/cl/cl/package.nix similarity index 100% rename from pkgs/development/libraries/cl/default.nix rename to pkgs/by-name/cl/cl/package.nix diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/by-name/cl/clac/package.nix similarity index 100% rename from pkgs/tools/misc/clac/default.nix rename to pkgs/by-name/cl/clac/package.nix diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/by-name/cl/clair/package.nix similarity index 100% rename from pkgs/tools/admin/clair/default.nix rename to pkgs/by-name/cl/clair/package.nix diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/by-name/cl/clairvoyance/package.nix similarity index 100% rename from pkgs/tools/security/clairvoyance/default.nix rename to pkgs/by-name/cl/clairvoyance/package.nix diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix index 21db94bec6a9..80ca50a0934f 100644 --- a/pkgs/by-name/cl/clairvoyant/package.nix +++ b/pkgs/by-name/cl/clairvoyant/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clairvoyant"; - version = "3.1.7"; + version = "3.1.8"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "clairvoyant"; rev = finalAttrs.version; - hash = "sha256-p9Lgs5z5oRuMQYRKzWp+aQDi0FnxvbQGLZpBigolHUw="; + hash = "sha256-SksJ0hOt2CJwrQj4dz63D53GM/PYx7Q/g+OgCo76dIE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/pkgs/by-name/cl/clamsmtp/header-order.patch similarity index 100% rename from pkgs/servers/mail/clamsmtp/header-order.patch rename to pkgs/by-name/cl/clamsmtp/header-order.patch diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/by-name/cl/clamsmtp/package.nix similarity index 100% rename from pkgs/servers/mail/clamsmtp/default.nix rename to pkgs/by-name/cl/clamsmtp/package.nix diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/by-name/cl/clanlib/package.nix similarity index 100% rename from pkgs/development/libraries/clanlib/default.nix rename to pkgs/by-name/cl/clanlib/package.nix diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/by-name/cl/clap/package.nix similarity index 100% rename from pkgs/development/libraries/clap/default.nix rename to pkgs/by-name/cl/clap/package.nix diff --git a/pkgs/tools/wayland/clapboard/default.nix b/pkgs/by-name/cl/clapboard/package.nix similarity index 100% rename from pkgs/tools/wayland/clapboard/default.nix rename to pkgs/by-name/cl/clapboard/package.nix diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/by-name/cl/clapper/package.nix similarity index 100% rename from pkgs/applications/video/clapper/default.nix rename to pkgs/by-name/cl/clapper/package.nix diff --git a/pkgs/by-name/cl/clash-rs/Cargo.lock b/pkgs/by-name/cl/clash-rs/Cargo.lock new file mode 100644 index 000000000000..462b341cfdd7 --- /dev/null +++ b/pkgs/by-name/cl/clash-rs/Cargo.lock @@ -0,0 +1,7343 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "amplify" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7147b742325842988dd6c793d55f58df3ae36bccf7d9b6e07db10ab035be343d" +dependencies = [ + "amplify_derive", + "amplify_num", + "ascii", + "wasm-bindgen", +] + +[[package]] +name = "amplify_derive" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a6309e6b8d89b36b9f959b7a8fa093583b94922a0f6438a24fb08936de4d428" +dependencies = [ + "amplify_syn", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "amplify_num" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99bcb75a2982047f733547042fc3968c0f460dfcf7d90b90dea3b2744580e9ad" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "amplify_syn" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7736fb8d473c0d83098b5bac44df6a561e20470375cd8bcae30516dc889fd62a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "arti-client" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c6c58e0fe132049f6c79c256c8f181df9556cca7fd7e6a5a24f1665151624dd" +dependencies = [ + "async-trait", + "cfg-if", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "educe", + "fs-mistrust", + "futures", + "hostname-validator", + "humantime", + "humantime-serde", + "libc", + "postage", + "rand", + "safelog", + "serde", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-chanmgr", + "tor-circmgr", + "tor-config", + "tor-dirmgr", + "tor-error", + "tor-guardmgr", + "tor-hsclient", + "tor-hscrypto", + "tor-keymgr", + "tor-linkspec", + "tor-llcrypto", + "tor-netdir", + "tor-netdoc", + "tor-persist", + "tor-proto", + "tor-rtcompat", + "tracing", + "void", +] + +[[package]] +name = "ascii" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" + +[[package]] +name = "async-compression" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e" +dependencies = [ + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "async_executors" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a982d2f86de6137cc05c9db9a915a19886c97911f9790d04f174cede74be01a5" +dependencies = [ + "blanket", + "futures-core", + "futures-task", + "futures-util", + "pin-project", + "rustc_version", + "tokio", +] + +[[package]] +name = "asynchronous-codec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" +dependencies = [ + "bytes", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "axum" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.22.1", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper 1.0.1", + "tokio", + "tokio-tungstenite", + "tower 0.5.1", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +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 = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.79", + "which", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.79", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[package]] +name = "blanket" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bollard" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a" +dependencies = [ + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "http", + "http-body-util", + "hyper", + "hyper-named-pipe", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "serde_urlencoded", + "thiserror", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", +] + +[[package]] +name = "bollard-stubs" +version = "1.45.0-rc.26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" +dependencies = [ + "serde", + "serde_repr", + "serde_with", +] + +[[package]] +name = "boringtun" +version = "0.6.0" +source = "git+https://github.com/cloudflare/boringtun.git?rev=f672bb6c1e1e371240a8d151f15854687eb740bb#f672bb6c1e1e371240a8d151f15854687eb740bb" +dependencies = [ + "aead", + "base64 0.13.1", + "blake2", + "chacha20poly1305", + "hex", + "hmac", + "ip_network", + "ip_network_table", + "libc", + "nix", + "parking_lot", + "rand_core", + "ring 0.17.8", + "tracing", + "untrusted 0.9.0", + "x25519-dalek", +] + +[[package]] +name = "bounded-vec-deque" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2225b558afc76c596898f5f1b3fc35cfce0eb1b13635cbd7d1b2a7177dc10ccd" + +[[package]] +name = "brotli" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[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 = "byte_string" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11aade7a05aa8c3a351cedc44c3fc45806430543382fcc4743a9b757a2a0b4ed" + +[[package]] +name = "bytemuck" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "c2rust-bitfields" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b43c3f07ab0ef604fa6f595aa46ec2f8a22172c975e186f6f5bf9829a3b72c41" +dependencies = [ + "c2rust-bitfields-derive", +] + +[[package]] +name = "c2rust-bitfields-derive" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3cbc102e2597c9744c8bd8c15915d554300601c91a079430d309816b0912545" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "camellia" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" +dependencies = [ + "byteorder", + "cipher", +] + +[[package]] +name = "caret" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c979a125c4d00f63d49b648530a952c6cc42e3387cc96f41f9a4687ee6b9273" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +dependencies = [ + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfb-mode" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" +dependencies = [ + "cipher", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clash-rs" +version = "0.7.0" +dependencies = [ + "clap", + "clash_lib", + "dhat", +] + +[[package]] +name = "clash_doc" +version = "0.7.0" +dependencies = [ + "clash_lib", +] + +[[package]] +name = "clash_lib" +version = "0.7.0" +dependencies = [ + "aead", + "aes", + "aes-gcm", + "anyhow", + "arti-client", + "async-recursion", + "async-trait", + "axum", + "axum-macros", + "base64 0.22.1", + "blake2", + "bollard", + "boringtun", + "brotli", + "byteorder", + "bytes", + "cfb-mode", + "chacha20poly1305", + "chrono", + "console-subscriber", + "const-fnv1a-hash", + "crc32fast", + "criterion", + "dhcproto", + "digest", + "env_logger", + "erased-serde", + "filetime", + "foreign-types-shared", + "futures", + "h2", + "h3 0.0.6", + "h3-quinn 0.0.7", + "hickory-client", + "hickory-proto 0.25.0-alpha.2", + "hickory-resolver 0.25.0-alpha.2", + "hmac", + "http", + "http-body-util", + "httparse", + "hyper", + "hyper-rustls", + "hyper-util", + "ip_network_table-deps-treebitmap", + "ipnet", + "libc", + "lru_time_cache", + "maxminddb", + "md-5", + "memory-stats", + "mockall", + "murmur3", + "netstack-lwip", + "network-interface", + "once_cell", + "opentelemetry", + "opentelemetry-jaeger-propagator", + "opentelemetry-otlp", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "prost", + "prost-build", + "public-suffix", + "quinn", + "quinn-proto", + "rand", + "regex", + "register-count", + "ring-compat", + "rustls", + "rustls-pemfile", + "security-framework", + "serde", + "serde_json", + "serde_yaml", + "serial_test", + "sha1", + "sha2", + "shadowsocks", + "smoltcp", + "socket2 0.5.7", + "tempfile", + "thiserror", + "tokio", + "tokio-rustls", + "tokio-test", + "tokio-tungstenite", + "tokio-util", + "tor-rtcompat", + "tower 0.5.1", + "tower-http", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-oslog", + "tracing-subscriber", + "tracing-timing", + "tuic", + "tuic-quinn", + "tun", + "unix-udp-sock", + "url", + "uuid", + "watfaq-dns", + "webpki-roots", + "windows 0.58.0", +] + +[[package]] +name = "coarsetime" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d" +dependencies = [ + "libc", + "wasix", + "wasm-bindgen", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console-api" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "hyper-util", + "prost", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "const-fnv1a-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.79", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "defmt" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0" +dependencies = [ + "bitflags 1.3.2", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9f309eff1f79b3ebdf252954d90ae440599c26c2c553fe87a2d17195f2dcb" +dependencies = [ + "defmt-parser", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "defmt-parser" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive-adhoc" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5283ac2881753c76c0892406705553f0d9ab30649f81e18964d3408f4501edb8" +dependencies = [ + "derive-adhoc-macros", + "heck 0.4.1", +] + +[[package]] +name = "derive-adhoc-macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c21b673a9b8c78c34908e6fcb42b922e11c4df2de5237f1c3f58d3285904a84b" +dependencies = [ + "heck 0.4.1", + "itertools 0.11.0", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "sha3", + "strum 0.25.0", + "syn 1.0.109", + "void", +] + +[[package]] +name = "derive-deftly" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f9bc3564f74be6c35d49a7efee54380d7946ccc631323067f33fabb9246027" +dependencies = [ + "derive-deftly-macros", + "heck 0.5.0", +] + +[[package]] +name = "derive-deftly-macros" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b84d32b18d9a256d81e4fec2e4cfd0ab6dde5e5ff49be1713ae0adbd0060c2" +dependencies = [ + "heck 0.5.0", + "indexmap 2.6.0", + "itertools 0.13.0", + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "sha3", + "strum 0.26.3", + "syn 2.0.79", + "void", +] + +[[package]] +name = "derive_builder_core_fork_arti" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24c1b715c79be6328caa9a5e1a387a196ea503740f0722ec3dd8f67a9e72314d" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_fork_arti" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3eae24d595f4d0ecc90a9a5a6d11c2bd8dafe2375ec4a1ec63250e5ade7d228" +dependencies = [ + "derive_builder_macro_fork_arti", +] + +[[package]] +name = "derive_builder_macro_fork_arti" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69887769a2489cd946bf782eb2b1bb2cb7bc88551440c94a765d4f040c08ebf3" +dependencies = [ + "derive_builder_core_fork_arti", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.79", +] + +[[package]] +name = "dhat" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cd11d84628e233de0ce467de10b8633f4ddaecafadefc86e13b84b8739b827" +dependencies = [ + "backtrace", + "lazy_static", + "mintex", + "parking_lot", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "thousands", +] + +[[package]] +name = "dhcproto" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6794294f2c4665aae452e950c2803a1e487c5672dc8448f0bfa3f52ff67e270" +dependencies = [ + "dhcproto-macros", + "hex", + "ipnet", + "rand", + "thiserror", + "trust-dns-proto", + "url", +] + +[[package]] +name = "dhcproto-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7993efb860416547839c115490d4951c6d0f8ec04a3594d9dd99d50ed7ec170" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "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.79", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "merlin", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "educe" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "enum-ordinalize" +version = "3.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic 0.6.0", + "serde", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fluid-let" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749cff877dc1af878a0b31a41dd221a753634401ea0ef2f87b62d3171522485a" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[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 = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + +[[package]] +name = "fs-mistrust" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43de34e45ddb3fc314aeae5c5b078b8e3549980cd45836f8364d7cca8d85aead" +dependencies = [ + "derive_builder_fork_arti", + "dirs", + "libc", + "once_cell", + "pwd-grp", + "serde", + "thiserror", + "walkdir", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "futures-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" +dependencies = [ + "futures-io", + "rustls", + "rustls-pki-types", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glob-match" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h3" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5069de1c2ac82d9e361b07f2b8a2c582ec071750e063530fc7f3b5197e24805" +dependencies = [ + "bytes", + "fastrand", + "futures-util", + "http", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "h3" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e7675a0963b47a6d12fe44c279918b4ffb19baee838ac37f48d2722ad5bc6ab" +dependencies = [ + "bytes", + "fastrand", + "futures-util", + "http", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "h3-quinn" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8c01d99d7cf812fd34ddf135e6c940df9e24f2e759dbc7179fb0e54d4bd6551" +dependencies = [ + "bytes", + "futures", + "h3 0.0.5", + "quinn", + "tokio", + "tokio-util", +] + +[[package]] +name = "h3-quinn" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c799f413fceeea505236c4d8132f084ff4b55a652288d91439ee93dc24d855" +dependencies = [ + "bytes", + "futures", + "h3 0.0.6", + "quinn", + "tokio", + "tokio-util", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64 0.21.7", + "byteorder", + "crossbeam-channel", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hickory-client" +version = "0.25.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90078f18923f3a7663f62fbd43c4030de758d16efae0071cdf3ef9c6358cbf49" +dependencies = [ + "cfg-if", + "data-encoding", + "futures-channel", + "futures-util", + "hickory-proto 0.25.0-alpha.2", + "once_cell", + "radix_trie", + "rand", + "thiserror", + "tokio", + "tracing", +] + +[[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 0.6.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-proto" +version = "0.25.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8270a1857fb962b9914aafd46a89a187a4e63d0eb4190c327e7c7b8256a2d055" +dependencies = [ + "async-recursion", + "async-trait", + "bitflags 2.6.0", + "bytes", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.1", + "futures-channel", + "futures-io", + "futures-util", + "h2", + "h3 0.0.5", + "h3-quinn 0.0.6", + "http", + "idna 0.5.0", + "ipnet", + "once_cell", + "pin-project-lite", + "quinn", + "rand", + "ring 0.17.8", + "rustls", + "rustls-pemfile", + "serde", + "thiserror", + "time", + "tinyvec", + "tokio", + "tokio-rustls", + "tracing", + "url", +] + +[[package]] +name = "hickory-recursor" +version = "0.25.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d2b7bc3b967b53b1b9879e319c8cc4ec037bb5d25bc7a88edd2e6de15d1a70" +dependencies = [ + "async-recursion", + "async-trait", + "bytes", + "cfg-if", + "enum-as-inner 0.6.1", + "futures-util", + "hickory-proto 0.25.0-alpha.2", + "hickory-resolver 0.25.0-alpha.2", + "lru-cache", + "parking_lot", + "serde", + "thiserror", + "tokio", + "tracing", +] + +[[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 0.24.1", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "hickory-resolver" +version = "0.25.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c110355b5703070d9e29c344d79818a7cde3de9c27fc35750defea6074b0ad" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto 0.25.0-alpha.2", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "quinn", + "rand", + "resolv-conf", + "rustls", + "serde", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls", + "tracing", +] + +[[package]] +name = "hickory-server" +version = "0.25.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee9bc516413439e322999f9c3263361b0454969cd53f20d26297ed8aa1e77c1" +dependencies = [ + "async-trait", + "bytes", + "cfg-if", + "enum-as-inner 0.6.1", + "futures-util", + "h2", + "h3 0.0.5", + "h3-quinn 0.0.6", + "hickory-proto 0.25.0-alpha.2", + "hickory-recursor", + "hickory-resolver 0.25.0-alpha.2", + "http", + "ipnet", + "prefix-trie", + "rustls", + "serde", + "thiserror", + "time", + "tokio", + "tokio-rustls", + "tokio-util", + "tracing", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +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 = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "hostname-validator" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "humantime-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" +dependencies = [ + "humantime", + "serde", +] + +[[package]] +name = "hyper" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", + "serde", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[package]] +name = "ioctl-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c" + +[[package]] +name = "ip_network" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" + +[[package]] +name = "ip_network_table" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4099b7cfc5c5e2fe8c5edf3f6f7adf7a714c9cc697534f63a5a5da30397cb2c0" +dependencies = [ + "ip_network", + "ip_network_table-deps-treebitmap", +] + +[[package]] +name = "ip_network_table-deps-treebitmap" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.7", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +dependencies = [ + "serde", +] + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "serde", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin 0.9.8", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "managed" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "maxminddb" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6087e5d8ea14861bb7c7f573afbc7be3798d3ef0fae87ec4fd9a4de9a127c3c" +dependencies = [ + "ipnetwork", + "log", + "memchr", + "serde", +] + +[[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 = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + +[[package]] +name = "memory-stats" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c73f5c649995a115e1a0220b35e4df0a1294500477f97a91d0660fb5abeb574a" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core", + "zeroize", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mintex" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07" + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "mockall" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "murmur3" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252111cf132ba0929b6f8e030cac2a24b507f3a4d6db6fb2896f27b354c714b" + +[[package]] +name = "netstack-lwip" +version = "0.3.4" +source = "git+https://github.com/Watfaq/netstack-lwip.git?rev=2817bf82740e04bbee6b7bf1165f55657a6ed163#2817bf82740e04bbee6b7bf1165f55657a6ed163" +dependencies = [ + "anyhow", + "bindgen 0.69.5", + "bytes", + "cc", + "futures", + "log", + "thiserror", + "tokio", +] + +[[package]] +name = "network-interface" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433419f898328beca4f2c6c73a1b52540658d92b0a99f0269330457e0fd998d5" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio 0.8.11", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oneshot-fused-workaround" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f7728ac6298f91a8a364fc9b33b3cfb8bb58c4ef134193dad6e5240739ffe26" +dependencies = [ + "futures", +] + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "opentelemetry" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570074cc999d1a58184080966e5bd3bf3a9a4af650c3b05047c2621e7405cd17" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry-jaeger-propagator" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7673897c81631b7d4fb7a6901f045cc3010fea5eec5aee511192a6b8e5afe6" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e1f9c8b032d4f635c730c0efcf731d5e2530ea13fa8bef7939ddc8420696bd" +dependencies = [ + "async-trait", + "futures-core", + "http", + "opentelemetry", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost", + "thiserror", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d3968ce3aefdcca5c27e3c4ea4391b37547726a70893aab52d3de95d5f8b34" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost", + "tonic", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db945c1eaea8ac6a9677185357480d215bb6999faa9f691d0c4d4d641eab7a09" + +[[package]] +name = "opentelemetry_sdk" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct", + "ecdsa", + "elliptic-curve", + "primeorder", + "rand_core", + "sha2", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.6.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "postage" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1" +dependencies = [ + "atomic 0.5.3", + "crossbeam-queue", + "futures", + "parking_lot", + "pin-project", + "static_assertions", + "thiserror", +] + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prefix-trie" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cb065e4407d69a5a5265221262cceeafff7f1aabc545d01ed955cce92ee78b" +dependencies = [ + "ipnet", + "num-traits", +] + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn 2.0.79", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "priority-queue" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" +dependencies = [ + "autocfg", + "equivalent", + "indexmap 2.6.0", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit 0.22.22", +] + +[[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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.13.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.79", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "prost-types" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" +dependencies = [ + "prost", +] + +[[package]] +name = "public-suffix" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a59553bc595dc1514e7d713e6167cf1c4d68ef6fcc2d10ad834a97a1ca9bc4" + +[[package]] +name = "pwd-grp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6955c41fd7e4283bdf6ff3e7218b7e3f8ef24c4236b31d22be050f4cfd5e2a2c" +dependencies = [ + "derive-adhoc", + "libc", + "paste", + "thiserror", +] + +[[package]] +name = "quanta" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +dependencies = [ + "crossbeam-utils", + "libc", + "mach", + "once_cell", + "raw-cpuid", + "wasi 0.10.2+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "futures-io", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring 0.17.8", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[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 = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "register-count" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d8b2af7d3e6675306d6757f10b4cf0b218a9fa6a0b44d668f2132684ae4893" + +[[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 = "retry-error" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb501c6079c6e2a1c9761b76ddb12ecb6818b8773748f5e0394b95f838e4a38" + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "ring-compat" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccce7bae150b815f0811db41b8312fcb74bffa4cab9cee5429ee00f356dd5bd4" +dependencies = [ + "aead", + "digest", + "ecdsa", + "ed25519", + "generic-array", + "p256", + "p384", + "pkcs8", + "rand_core", + "ring 0.17.8", + "signature", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "sha2", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", + "time", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "git+https://github.com/Watfaq/rustls.git?rev=f84c0f8020b252978e9b157179e9a99233cd33aa#f84c0f8020b252978e9b157179e9a99233cd33aa" +dependencies = [ + "log", + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "safelog" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cabd7492c13678058e680f161cf94ba34d9d9e48419d1fbc6c21a32926c23764" +dependencies = [ + "derive_more", + "educe", + "either", + "fluid-let", + "thiserror", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "sanitize-filename" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "scc" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c1f7fc6deb21665a9060dfc7d271be784669295a31babdcd4dd2c79ae8cbfb" +dependencies = [ + "sdd", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sdd" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95" + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +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 = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "serde_ignored" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8e319a36d1b52126a0d608f24e93b2d81297091818cd70625fcf50a15d84ddf" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.6.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.6.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + +[[package]] +name = "shadowsocks" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecb3780dfbc654de9383758015b9bb95c6e32fecace36ebded09d67e854d130" +dependencies = [ + "aes", + "arc-swap", + "async-trait", + "base64 0.22.1", + "blake3", + "byte_string", + "bytes", + "cfg-if", + "futures", + "hickory-resolver 0.24.1", + "libc", + "log", + "lru_time_cache", + "notify", + "once_cell", + "percent-encoding", + "pin-project", + "rand", + "sendfd", + "serde", + "serde_json", + "serde_urlencoded", + "shadowsocks-crypto", + "socket2 0.5.7", + "spin 0.9.8", + "thiserror", + "tokio", + "tokio-tfo", + "url", + "windows-sys 0.59.0", +] + +[[package]] +name = "shadowsocks-crypto" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e49ecfad8b27f3df28848af11f08aa10df0c6b74b45748131753913be23373" +dependencies = [ + "aes", + "aes-gcm", + "blake3", + "bytes", + "camellia", + "cfg-if", + "chacha20", + "chacha20poly1305", + "ctr", + "hkdf", + "md-5", + "rand", + "ring-compat", + "sha1", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smoltcp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a1a996951e50b5971a2c8c0fa05a381480d70a933064245c4a223ddc87ccc97" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "cfg-if", + "defmt", + "heapless", + "log", + "managed", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "ssh-cipher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f" +dependencies = [ + "cipher", + "ssh-encoding", +] + +[[package]] +name = "ssh-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" +dependencies = [ + "base64ct", + "pem-rfc7468", + "sha2", +] + +[[package]] +name = "ssh-key" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3" +dependencies = [ + "p256", + "p384", + "p521", + "rand_core", + "rsa", + "sec1", + "sha2", + "signature", + "ssh-cipher", + "ssh-encoding", + "subtle", + "zeroize", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.79", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.79", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio 1.0.2", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "git+https://github.com/Watfaq/tokio-rustls.git?rev=6b9af8ac7bb5abc159d9a67e9ddbf84127559a4a#6b9af8ac7bb5abc159d9a67e9ddbf84127559a4a" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-tfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb4382c6371e29365853d2b71e915d5398df46312a2158097d8bb3f54d0f1b4" +dependencies = [ + "cfg-if", + "futures", + "libc", + "log", + "once_cell", + "pin-project", + "socket2 0.5.7", + "tokio", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.22", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.6.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.6.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.20", +] + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2 0.5.7", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tor-async-utils" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c008067156c51d6485b621d92e46ed8db544a6ad59b984b25e3686b73f086ea" +dependencies = [ + "educe", + "futures", + "oneshot-fused-workaround", + "pin-project", + "postage", + "void", +] + +[[package]] +name = "tor-basic-utils" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79d747dd7d631495c45e074250fad13cd83f9c751bc25fc3be5c9ca9b820a63" +dependencies = [ + "derive_more", + "hex", + "itertools 0.13.0", + "libc", + "paste", + "rand", + "rand_chacha", + "slab", + "thiserror", +] + +[[package]] +name = "tor-bytes" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9716213e8c95f8db1ae09bf73c8a36770a557eedd7cace5cd02d38af641b06a4" +dependencies = [ + "bytes", + "digest", + "educe", + "getrandom", + "thiserror", + "tor-error", + "tor-llcrypto", + "zeroize", +] + +[[package]] +name = "tor-cell" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31a0ef0674d08e4ec1e7a6a8e0129784379463c72406aca987e82fdea9f4f0fd" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "caret", + "derive_more", + "educe", + "paste", + "rand", + "smallvec", + "thiserror", + "tor-basic-utils", + "tor-bytes", + "tor-cert", + "tor-error", + "tor-hscrypto", + "tor-linkspec", + "tor-llcrypto", + "tor-units", +] + +[[package]] +name = "tor-cert" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb3afa49a44e1610c03b6142337ba0c4de1a6d70aea59849878de8876099930" +dependencies = [ + "caret", + "derive_more", + "digest", + "thiserror", + "tor-bytes", + "tor-checkable", + "tor-llcrypto", +] + +[[package]] +name = "tor-chanmgr" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fe321a802b53627477ca6f07c4660390d1f62c116a1aeb7ab943666bbbb1e6" +dependencies = [ + "async-trait", + "derive_builder_fork_arti", + "derive_more", + "educe", + "futures", + "oneshot-fused-workaround", + "postage", + "rand", + "safelog", + "serde", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-cell", + "tor-config", + "tor-error", + "tor-linkspec", + "tor-llcrypto", + "tor-netdir", + "tor-proto", + "tor-rtcompat", + "tor-socksproto", + "tor-units", + "tracing", + "void", +] + +[[package]] +name = "tor-checkable" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d875e93e91977a7c2a1d6ba662d7a3f7d47fcfbad9b93c3a97c2ceb9acf7d29f" +dependencies = [ + "humantime", + "signature", + "thiserror", + "tor-llcrypto", +] + +[[package]] +name = "tor-circmgr" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae5bc3db0f5ce25b183fc6832b9dcdaf50a2a7cef75651150743a51785f6071" +dependencies = [ + "amplify", + "async-trait", + "bounded-vec-deque", + "cfg-if", + "derive_builder_fork_arti", + "derive_more", + "downcast-rs", + "dyn-clone", + "educe", + "futures", + "humantime-serde", + "itertools 0.13.0", + "once_cell", + "oneshot-fused-workaround", + "pin-project", + "rand", + "retry-error", + "safelog", + "serde", + "static_assertions", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-chanmgr", + "tor-config", + "tor-error", + "tor-guardmgr", + "tor-linkspec", + "tor-netdir", + "tor-netdoc", + "tor-persist", + "tor-proto", + "tor-protover", + "tor-relay-selection", + "tor-rtcompat", + "tracing", + "void", + "weak-table", +] + +[[package]] +name = "tor-config" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47196b7671f195fba0145822455957aa6ad5005e8ed5e3599314842972908232" +dependencies = [ + "amplify", + "derive-deftly", + "derive_builder_fork_arti", + "directories", + "educe", + "either", + "figment", + "fs-mistrust", + "futures", + "itertools 0.13.0", + "notify", + "once_cell", + "paste", + "postage", + "regex", + "serde", + "serde-value", + "serde_ignored", + "shellexpand", + "strum 0.26.3", + "thiserror", + "toml", + "tor-basic-utils", + "tor-error", + "tor-rtcompat", + "tracing", + "void", +] + +[[package]] +name = "tor-consdiff" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aac77a0ec434b8ffeb1d67618e4dd0aeb1abd723ed5a34542575482b3dec1fc" +dependencies = [ + "digest", + "hex", + "thiserror", + "tor-llcrypto", +] + +[[package]] +name = "tor-dirclient" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c13767a064e9f0d17f6aaa307218d04abd5b770f042d167df39d6dd96311960" +dependencies = [ + "async-compression", + "base64ct", + "derive_more", + "futures", + "hex", + "http", + "httparse", + "httpdate", + "itertools 0.13.0", + "memchr", + "thiserror", + "tor-circmgr", + "tor-error", + "tor-hscrypto", + "tor-linkspec", + "tor-llcrypto", + "tor-netdoc", + "tor-proto", + "tor-rtcompat", + "tracing", +] + +[[package]] +name = "tor-dirmgr" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10788702ecc5ef2dc02292e36182732703bd2d3b497168a30bd29a19647f7f3c" +dependencies = [ + "async-trait", + "base64ct", + "derive_builder_fork_arti", + "derive_more", + "digest", + "educe", + "event-listener", + "fs-mistrust", + "fslock", + "futures", + "hex", + "humantime", + "humantime-serde", + "itertools 0.13.0", + "memmap2", + "once_cell", + "oneshot-fused-workaround", + "paste", + "postage", + "rand", + "rusqlite", + "safelog", + "scopeguard", + "serde", + "signature", + "strum 0.26.3", + "thiserror", + "time", + "tor-async-utils", + "tor-basic-utils", + "tor-checkable", + "tor-circmgr", + "tor-config", + "tor-consdiff", + "tor-dirclient", + "tor-error", + "tor-guardmgr", + "tor-llcrypto", + "tor-netdir", + "tor-netdoc", + "tor-persist", + "tor-proto", + "tor-rtcompat", + "tracing", +] + +[[package]] +name = "tor-error" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b3edc77493f64b7876a234e6d259ab209ec8d57e57ee9ed789b5e6047e2265e" +dependencies = [ + "derive_more", + "futures", + "once_cell", + "paste", + "retry-error", + "static_assertions", + "strum 0.26.3", + "thiserror", + "tracing", + "void", +] + +[[package]] +name = "tor-guardmgr" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da216f2d9b279ba65c27f7d5153a01bc002afaa5a7dea3cbd634a4af692736e3" +dependencies = [ + "amplify", + "base64ct", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "dyn-clone", + "educe", + "futures", + "humantime", + "humantime-serde", + "itertools 0.13.0", + "num_enum", + "oneshot-fused-workaround", + "pin-project", + "postage", + "rand", + "safelog", + "serde", + "strum 0.26.3", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-config", + "tor-error", + "tor-linkspec", + "tor-llcrypto", + "tor-netdir", + "tor-netdoc", + "tor-persist", + "tor-proto", + "tor-relay-selection", + "tor-rtcompat", + "tor-units", + "tracing", +] + +[[package]] +name = "tor-hsclient" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec233600388692f5b0c86304e446c1c5928d5389a4c1e9a458b9b3c9d2b0f1" +dependencies = [ + "async-trait", + "derive-deftly", + "derive_more", + "educe", + "either", + "futures", + "itertools 0.13.0", + "oneshot-fused-workaround", + "postage", + "rand", + "retry-error", + "safelog", + "slotmap", + "strum 0.26.3", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-bytes", + "tor-cell", + "tor-checkable", + "tor-circmgr", + "tor-config", + "tor-dirclient", + "tor-error", + "tor-hscrypto", + "tor-keymgr", + "tor-linkspec", + "tor-llcrypto", + "tor-netdir", + "tor-netdoc", + "tor-persist", + "tor-proto", + "tor-rtcompat", + "tracing", +] + +[[package]] +name = "tor-hscrypto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db824b336c082804882221188097f73bcd8f551da2f56144c7b560c971f44f9" +dependencies = [ + "data-encoding", + "derive_more", + "digest", + "itertools 0.13.0", + "paste", + "rand", + "safelog", + "signature", + "subtle", + "thiserror", + "tor-basic-utils", + "tor-bytes", + "tor-error", + "tor-llcrypto", + "tor-units", +] + +[[package]] +name = "tor-keymgr" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96e3442c4b1b9373eca3e95e27cd7ac81f5c63e9a5d6a1d7f756f9af53200640" +dependencies = [ + "amplify", + "arrayvec", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "downcast-rs", + "dyn-clone", + "fs-mistrust", + "glob-match", + "humantime", + "inventory", + "itertools 0.13.0", + "rand", + "serde", + "ssh-key", + "thiserror", + "tor-basic-utils", + "tor-config", + "tor-error", + "tor-hscrypto", + "tor-llcrypto", + "tor-persist", + "walkdir", + "zeroize", +] + +[[package]] +name = "tor-linkspec" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79554ce76d519f909a5bba8beea6b2187c4ba131a717944258dce7fcec235a8f" +dependencies = [ + "base64ct", + "by_address", + "caret", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "hex", + "itertools 0.13.0", + "safelog", + "serde", + "serde_with", + "strum 0.26.3", + "thiserror", + "tor-basic-utils", + "tor-bytes", + "tor-config", + "tor-llcrypto", + "tor-protover", +] + +[[package]] +name = "tor-llcrypto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d2fe75fd5713ca4012a4047fcbd3d529c1db9f5ce7c9ab6f4630b503eab55a9" +dependencies = [ + "aes", + "base64ct", + "ctr", + "curve25519-dalek", + "derive_more", + "digest", + "ed25519-dalek", + "educe", + "getrandom", + "hex", + "rand_core", + "rsa", + "safelog", + "serde", + "sha1", + "sha2", + "sha3", + "signature", + "simple_asn1", + "subtle", + "thiserror", + "visibility", + "x25519-dalek", + "zeroize", +] + +[[package]] +name = "tor-log-ratelim" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8a5d8547bcbdd92d40267b863ff3482846972b1cfdbec4841c668a6539b4c0" +dependencies = [ + "futures", + "humantime", + "once_cell", + "thiserror", + "tor-error", + "tor-rtcompat", + "tracing", + "weak-table", +] + +[[package]] +name = "tor-netdir" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f493e5c390efa9625d5f44d0f33743fede0ff47bc1e4fada640a44e13004c963" +dependencies = [ + "bitflags 2.6.0", + "derive_more", + "digest", + "futures", + "hex", + "humantime", + "itertools 0.13.0", + "num_enum", + "rand", + "serde", + "static_assertions", + "strum 0.26.3", + "thiserror", + "time", + "tor-basic-utils", + "tor-error", + "tor-hscrypto", + "tor-linkspec", + "tor-llcrypto", + "tor-netdoc", + "tor-protover", + "tor-units", + "tracing", + "typed-index-collections", +] + +[[package]] +name = "tor-netdoc" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdce7a98b0d30652ca59c1e7c3595b2bc064eb805be56bc9b67a306a60d6592" +dependencies = [ + "amplify", + "base64ct", + "bitflags 2.6.0", + "cipher", + "derive_builder_fork_arti", + "derive_more", + "digest", + "educe", + "hex", + "humantime", + "itertools 0.13.0", + "once_cell", + "phf", + "rand", + "serde", + "serde_with", + "signature", + "smallvec", + "subtle", + "thiserror", + "time", + "tinystr", + "tor-basic-utils", + "tor-bytes", + "tor-cell", + "tor-cert", + "tor-checkable", + "tor-error", + "tor-hscrypto", + "tor-linkspec", + "tor-llcrypto", + "tor-protover", + "tor-units", + "void", + "weak-table", + "zeroize", +] + +[[package]] +name = "tor-persist" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b7942bb43a51129ae4e84124e82e48f96e453a6fb8381c5c2b23899116d411" +dependencies = [ + "derive-deftly", + "derive_more", + "filetime", + "fs-mistrust", + "fslock", + "futures", + "itertools 0.13.0", + "oneshot-fused-workaround", + "paste", + "sanitize-filename", + "serde", + "serde_json", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-error", + "tracing", + "void", +] + +[[package]] +name = "tor-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec37cab7389f53751a02a01a0324aaf09a854b7a8ac56d0ebd44593fadde0b0" +dependencies = [ + "asynchronous-codec", + "bitvec", + "bytes", + "cipher", + "coarsetime", + "derive_builder_fork_arti", + "derive_more", + "digest", + "educe", + "futures", + "hkdf", + "hmac", + "oneshot-fused-workaround", + "pin-project", + "rand", + "rand_core", + "safelog", + "subtle", + "thiserror", + "tokio", + "tokio-util", + "tor-async-utils", + "tor-basic-utils", + "tor-bytes", + "tor-cell", + "tor-cert", + "tor-checkable", + "tor-config", + "tor-error", + "tor-hscrypto", + "tor-linkspec", + "tor-llcrypto", + "tor-log-ratelim", + "tor-rtcompat", + "tor-rtmock", + "tor-units", + "tracing", + "typenum", + "visibility", + "void", + "zeroize", +] + +[[package]] +name = "tor-protover" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cf099c5c91216c7d0a6b2d4c67bb18f0786ad8c8273063d6a45c51b49b40c2" +dependencies = [ + "caret", + "thiserror", +] + +[[package]] +name = "tor-relay-selection" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c8aa5505d8e938ac9e75b819d803396fe69fb483c991b4495fe4b28d374a89c" +dependencies = [ + "rand", + "serde", + "tor-basic-utils", + "tor-linkspec", + "tor-netdir", + "tor-netdoc", +] + +[[package]] +name = "tor-rtcompat" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff8a108d6a5e8ae0a97cd1fa41c00360d86bce5e5d7bd0ee1566bcb25b44e44" +dependencies = [ + "async-trait", + "async_executors", + "coarsetime", + "derive_more", + "educe", + "futures", + "futures-rustls", + "paste", + "pin-project", + "rustls-pki-types", + "thiserror", + "tokio", + "tokio-util", + "tor-error", + "tracing", + "x509-signature", +] + +[[package]] +name = "tor-rtmock" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71824b2341740bc2338e554cd4832b692afa44e0eb11519b19ebbcd0179f0799" +dependencies = [ + "amplify", + "async-trait", + "derive-deftly", + "derive_more", + "educe", + "futures", + "humantime", + "itertools 0.13.0", + "oneshot-fused-workaround", + "pin-project", + "priority-queue", + "slotmap", + "strum 0.26.3", + "thiserror", + "tor-error", + "tor-rtcompat", + "tracing", + "tracing-test", + "void", +] + +[[package]] +name = "tor-socksproto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ea008c29b34604d49f25540e4d72b3bdce0d1021aa82f85e790262280804f0" +dependencies = [ + "caret", + "subtle", + "thiserror", + "tor-bytes", + "tor-error", +] + +[[package]] +name = "tor-units" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c549e18390341623fb8ee988b2622d9b8fa11727d66717c9331156f84e54b09d" +dependencies = [ + "derive_more", + "thiserror", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc58af5d3f6c5811462cabb3289aec0093f7338e367e5a33d28c0433b3c7360b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-oslog" +version = "0.2.0" +source = "git+https://github.com/Absolucy/tracing-oslog.git?branch=main#b44d62871464e332249ae79e000dad9ebeb06434" +dependencies = [ + "bindgen 0.70.1", + "cc", + "cfg-if", + "once_cell", + "parking_lot", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-test" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68" +dependencies = [ + "tracing-core", + "tracing-subscriber", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" +dependencies = [ + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tracing-timing" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbe4966d7b6ae25201de6ff9fa822afb0c9e933809187d5b82ad846ec108771b" +dependencies = [ + "crossbeam", + "doc-comment", + "fxhash", + "hdrhistogram", + "indexmap 1.9.3", + "quanta", + "slab", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.5.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tracing", + "url", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tuic" +version = "1.3.1" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.1#ac5664fe2d02007adcd8e9605a2141f15764fe41" +dependencies = [ + "bytes", + "futures-util", + "parking_lot", + "register-count", + "thiserror", + "uuid", +] + +[[package]] +name = "tuic-quinn" +version = "1.3.1" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.1#ac5664fe2d02007adcd8e9605a2141f15764fe41" +dependencies = [ + "bytes", + "futures-util", + "quinn", + "thiserror", + "tuic", + "uuid", +] + +[[package]] +name = "tun" +version = "0.6.1" +source = "git+https://github.com/Watfaq/rust-tun.git?rev=8f7568190f1200d3e272ca534baf8d1578147e18#8f7568190f1200d3e272ca534baf8d1578147e18" +dependencies = [ + "byteorder", + "bytes", + "futures-core", + "ioctl-sys", + "libc", + "log", + "thiserror", + "tokio", + "tokio-util", + "wintun", +] + +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typed-index-collections" +version = "3.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d844b11f547a6fb9dee7ed073d9860174917a072aabe05df6ee60dbe79e7afa" +dependencies = [ + "serde", +] + +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "unix-udp-sock" +version = "0.7.0" +source = "git+https://github.com/Watfaq/unix-udp-sock.git?rev=cd3e4eca43e6f3be82a2703c3d711b7e18fbfd18#cd3e4eca43e6f3be82a2703c3d711b7e18fbfd18" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "libc", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +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", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "getrandom", + "rand", + "serde", + "uuid-macro-internal", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "visibility" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasix" +version = "0.12.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" +dependencies = [ + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "watfaq-dns" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4caff90e06dd6f6fdcefbce28fe42ce7d9ab7741639d0db49dca897defe405" +dependencies = [ + "async-trait", + "futures", + "hickory-client", + "hickory-proto 0.25.0-alpha.2", + "hickory-resolver 0.25.0-alpha.2", + "hickory-server", + "rustls", + "rustls-pemfile", + "serde", + "thiserror", + "tokio", + "tracing", + "webpki-roots", +] + +[[package]] +name = "weak-table" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" + +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + +[[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 = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[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 = "wintun" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29b83b0eca06dd125dbcd48a45327c708a6da8aada3d95a3f06db0ce4b17e0d4" +dependencies = [ + "c2rust-bitfields", + "libloading", + "log", + "thiserror", + "windows 0.51.1", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-signature" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb2bc2a902d992cd5f471ee3ab0ffd6603047a4207384562755b9d6de977518" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix new file mode 100644 index 000000000000..565a24aa22a2 --- /dev/null +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -0,0 +1,61 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + protobuf, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "clash-rs"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "Watfaq"; + repo = "clash-rs"; + rev = "v${version}"; + hash = "sha256-0deMVI51XHTCrnLTycqDsaY5Lq+wx14uMUlkG5OViNA="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "boringtun-0.6.0" = "sha256-HBNo53b+CpCGmTXZYH4NBBvNmekyaBKAk1pSRzZdavg="; + "netstack-lwip-0.3.4" = "sha256-lcauDyaw5gAaECRcGNXQDHbWmnyxil18qWFkZ/p/C50="; + "rustls-0.23.12" = "sha256-grt94JG44MljRQRooVZbXL4h4XLI1/KoIdwGv03MoIU="; + "tokio-rustls-0.26.0" = "sha256-Bmi36j8hbR4kkY/xnHbluaInk+YH5/eTln0VYfHulGA="; + "tracing-oslog-0.2.0" = "sha256-JYaCslbVOgsyBhjeBkplPWcjSgFccjr4s6OAGIUu5kg="; + "tuic-1.3.1" = "sha256-WMd+O2UEu0AEI+gNeQtdBhEgIB8LPanoIpMcDAUUWrM="; + "tun-0.6.1" = "sha256-j4yQSu4Mw7DBFak8vJGQomYq81+pfaeEDdN4NNBve+E="; + "unix-udp-sock-0.7.0" = "sha256-TekBfaxecFPpOfq7PVjLHwc0uIp3yJGV/Cgav5VfKaA="; + }; + }; + + env = { + PROTOC = "${protobuf}/bin/protoc"; + # requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip + RUSTC_BOOTSTRAP = 1; + }; + + doInstallCheck = true; + + dontCargoCheck = true; # test failed + + versionCheckProgramArg = "--version"; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + buildFeatures = [ + "shadowsocks" + "tuic" + "onion" + ]; + + meta = { + description = "Custom protocol, rule based network proxy software"; + homepage = "https://github.com/Watfaq/clash-rs"; + mainProgram = "clash-rs"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/by-name/cl/classads/package.nix similarity index 100% rename from pkgs/development/libraries/classads/default.nix rename to pkgs/by-name/cl/classads/package.nix diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/by-name/cl/classicube/fix-linking.patch similarity index 100% rename from pkgs/games/classicube/fix-linking.patch rename to pkgs/by-name/cl/classicube/fix-linking.patch diff --git a/pkgs/games/classicube/font-location.patch b/pkgs/by-name/cl/classicube/font-location.patch similarity index 100% rename from pkgs/games/classicube/font-location.patch rename to pkgs/by-name/cl/classicube/font-location.patch diff --git a/pkgs/games/classicube/default.nix b/pkgs/by-name/cl/classicube/package.nix similarity index 100% rename from pkgs/games/classicube/default.nix rename to pkgs/by-name/cl/classicube/package.nix diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/by-name/cl/claws-mail/mime.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/claws-mail/mime.patch rename to pkgs/by-name/cl/claws-mail/mime.patch diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/by-name/cl/claws-mail/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/claws-mail/default.nix rename to pkgs/by-name/cl/claws-mail/package.nix diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/by-name/cl/claws/package.nix similarity index 100% rename from pkgs/tools/misc/claws/default.nix rename to pkgs/by-name/cl/claws/package.nix diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/by-name/cl/clblast/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/clblast/default.nix rename to pkgs/by-name/cl/clblast/package.nix diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/by-name/cl/clboss/package.nix similarity index 100% rename from pkgs/applications/blockchains/clboss/default.nix rename to pkgs/by-name/cl/clboss/package.nix diff --git a/pkgs/by-name/cl/cldr-annotations/package.nix b/pkgs/by-name/cl/cldr-annotations/package.nix new file mode 100644 index 000000000000..64c9a0793787 --- /dev/null +++ b/pkgs/by-name/cl/cldr-annotations/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "cldr-annotations"; + version = "46.0"; + + src = fetchzip { + url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; + stripRoot = false; + hash = "sha256-dXfbJTBlIg/+JXSrjdf8/iS4vHo7bt5YUwh+5dlsSiw="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/unicode/cldr/common + mv common/annotations{,Derived} -t $out/share/unicode/cldr/common + + runHook postInstall + ''; + + meta = with lib; { + description = "Names and keywords for Unicode characters from the Common Locale Data Repository"; + homepage = "https://cldr.unicode.org"; + license = licenses.unicode-30; + platforms = platforms.all; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch similarity index 100% rename from pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch rename to pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/by-name/cl/clean/package.nix similarity index 100% rename from pkgs/development/compilers/clean/default.nix rename to pkgs/by-name/cl/clean/package.nix diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/pkgs/by-name/cl/clearlooks-phenix/package.nix similarity index 100% rename from pkgs/data/themes/clearlooks-phenix/default.nix rename to pkgs/by-name/cl/clearlooks-phenix/package.nix diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/by-name/cl/clearlyU/package.nix similarity index 100% rename from pkgs/data/fonts/clearlyU/default.nix rename to pkgs/by-name/cl/clearlyU/package.nix diff --git a/pkgs/tools/misc/clematis/default.nix b/pkgs/by-name/cl/clematis/package.nix similarity index 100% rename from pkgs/tools/misc/clematis/default.nix rename to pkgs/by-name/cl/clematis/package.nix diff --git a/pkgs/by-name/cl/clerk/package.nix b/pkgs/by-name/cl/clerk/package.nix new file mode 100644 index 000000000000..9ff0290a2379 --- /dev/null +++ b/pkgs/by-name/cl/clerk/package.nix @@ -0,0 +1,103 @@ +{ + lib, + fetchFromGitHub, + fzf, + installShellFiles, + libnotify, + makeWrapper, + mpc, + perlPackages, + rofi, + stdenv, + tmux, + unstableGitUpdater, + util-linux, +}: + +stdenv.mkDerivation { + pname = "clerk"; + version = "0-unstable-2024-02-20"; + + src = fetchFromGitHub { + owner = "carnager"; + repo = "clerk"; + rev = "a3c4a0b88597e8194a5b29a20bc9eab1a12f4de9"; + hash = "sha256-UlACMlH4iYj1l/GIpBf6Pb7MuRHWlgxLPgAqzc+Zol8="; + }; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + buildInputs = with perlPackages; [ + perl + DataMessagePack + DataSectionSimple + ConfigSimple + TryTiny + IPCRun + HTTPDate + FileSlurper + ArrayUtils + NetMPD + ]; + + dontBuild = true; + + strictDeps = true; + + postPatch = '' + substituteInPlace clerk_rating_client.service \ + --replace "/usr" "$out" + ''; + + installPhase = '' + runHook preInstall + + mv clerk.pl clerk + installBin clerk clerk_rating_client + install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service + + runHook postInstall + ''; + + postFixup = + let + binPath = lib.makeBinPath [ + fzf + libnotify + mpc + rofi + tmux + util-linux + ]; + in + '' + pushd $out/bin + for f in clerk clerk_rating_client; do + wrapProgram $f \ + --prefix PATH : "${binPath}" \ + --set PERL5LIB $PERL5LIB + done + popd + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/carnager/clerk.git"; + hardcodeZeroVersion = true; + }; + + meta = { + homepage = "https://github.com/carnager/clerk"; + description = "MPD client based on rofi/fzf"; + license = lib.licenses.mit; + mainProgram = "clerk"; + maintainers = with lib.maintainers; [ + anderspapitto + rewine + AndersonTorres + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index ddea9886a888..ca7b6fa5c617 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, nodejs_18, installShellFiles, + makeWrapper, stdenv, }: buildNpmPackage rec { pname = "clever-tools"; - version = "3.8.3"; + version = "3.9.0"; nodejs = nodejs_18; @@ -18,27 +19,32 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50="; + hash = "sha256-nSTcJIZO/CMliAYFUGu/oA+VdtONDPwyj6vCr5Ry6ac="; }; - npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE="; + npmDepsHash = "sha256-+3/zSsO5+s1MUome3CQ1p1tN3OtWp+XE9Z6GSdDiRh8="; - dontNpmBuild = true; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; - nativeBuildInputs = [ installShellFiles ]; + installPhase = '' + mkdir -p $out/bin $out/lib/clever-tools + cp build/clever.cjs $out/lib/clever-tools/clever.cjs - makeWrapperArgs = [ "--set NO_UPDATE_NOTIFIER true" ]; + makeWrapper ${nodejs}/bin/node $out/bin/clever \ + --add-flags "$out/lib/clever-tools/clever.cjs" \ + --set NO_UPDATE_NOTIFIER true - postInstall = - lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd clever \ - --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ - --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) - '' - + '' - rm $out/bin/install-clever-completion - rm $out/bin/uninstall-clever-completion - ''; + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd clever \ + --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ + --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) + ''; meta = with lib; { homepage = "https://github.com/CleverCloud/clever-tools"; diff --git a/pkgs/applications/file-managers/clex/default.nix b/pkgs/by-name/cl/clex/package.nix similarity index 100% rename from pkgs/applications/file-managers/clex/default.nix rename to pkgs/by-name/cl/clex/package.nix diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/by-name/cl/clfft/package.nix similarity index 100% rename from pkgs/development/libraries/clfft/default.nix rename to pkgs/by-name/cl/clfft/package.nix diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/by-name/cl/clhep/package.nix similarity index 100% rename from pkgs/development/libraries/physics/clhep/default.nix rename to pkgs/by-name/cl/clhep/package.nix diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/by-name/cl/cli-visualizer/package.nix similarity index 100% rename from pkgs/applications/misc/cli-visualizer/default.nix rename to pkgs/by-name/cl/cli-visualizer/package.nix diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/by-name/cl/cli53/package.nix similarity index 100% rename from pkgs/tools/admin/cli53/default.nix rename to pkgs/by-name/cl/cli53/package.nix diff --git a/pkgs/tools/security/cliam/default.nix b/pkgs/by-name/cl/cliam/package.nix similarity index 100% rename from pkgs/tools/security/cliam/default.nix rename to pkgs/by-name/cl/cliam/package.nix diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/by-name/cl/clib/package.nix similarity index 100% rename from pkgs/tools/package-management/clib/default.nix rename to pkgs/by-name/cl/clib/package.nix diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/by-name/cl/click/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/click/default.nix rename to pkgs/by-name/cl/click/package.nix diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/by-name/cl/clickclack/package.nix similarity index 100% rename from pkgs/tools/misc/clickclack/default.nix rename to pkgs/by-name/cl/clickclack/package.nix diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix new file mode 100644 index 000000000000..f61093c2e1fa --- /dev/null +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -0,0 +1,40 @@ +{ buildGoModule +, clickhouse-backup +, fetchFromGitHub +, lib +, testers +}: + +buildGoModule rec { + pname = "clickhouse-backup"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "Altinity"; + repo = "clickhouse-backup"; + rev = "v${version}"; + hash = "sha256-431bdyE2MEWwgl9xDVsRHKpjrv/cIjaOQpg25qDlvPk="; + }; + + vendorHash = "sha256-D1sjizuyHnfNplZtuw3zqRjFl/r1h478N+iGyF2OAyc="; + + ldflags = [ + "-X main.version=${version}" + ]; + + postConfigure = '' + export CGO_ENABLED=0 + ''; + + passthru.tests.version = testers.testVersion { + package = clickhouse-backup; + }; + + meta = with lib; { + description = "Tool for easy ClickHouse backup and restore using object storage for backup files"; + mainProgram = "clickhouse-backup"; + homepage = "https://github.com/Altinity/clickhouse-backup"; + license = licenses.mit; + maintainers = with maintainers; [ devusb ]; + }; +} diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix similarity index 100% rename from pkgs/servers/misc/client-ip-echo/client-ip-echo.nix rename to pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix diff --git a/pkgs/servers/misc/client-ip-echo/default.nix b/pkgs/by-name/cl/client-ip-echo/package.nix similarity index 100% rename from pkgs/servers/misc/client-ip-echo/default.nix rename to pkgs/by-name/cl/client-ip-echo/package.nix diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/by-name/cl/clifm/package.nix similarity index 100% rename from pkgs/applications/file-managers/clifm/default.nix rename to pkgs/by-name/cl/clifm/package.nix diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/by-name/cl/clightning/package.nix similarity index 100% rename from pkgs/applications/blockchains/clightning/default.nix rename to pkgs/by-name/cl/clightning/package.nix diff --git a/pkgs/tools/text/clima/default.nix b/pkgs/by-name/cl/clima/package.nix similarity index 100% rename from pkgs/tools/text/clima/default.nix rename to pkgs/by-name/cl/clima/package.nix diff --git a/pkgs/development/interpreters/cling/no-clang-cpp.patch b/pkgs/by-name/cl/cling/no-clang-cpp.patch similarity index 100% rename from pkgs/development/interpreters/cling/no-clang-cpp.patch rename to pkgs/by-name/cl/cling/no-clang-cpp.patch diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/by-name/cl/cling/package.nix similarity index 100% rename from pkgs/development/interpreters/cling/default.nix rename to pkgs/by-name/cl/cling/package.nix diff --git a/pkgs/tools/misc/clini/default.nix b/pkgs/by-name/cl/clini/package.nix similarity index 100% rename from pkgs/tools/misc/clini/default.nix rename to pkgs/by-name/cl/clini/package.nix diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/by-name/cl/clipboard-jh/package.nix similarity index 100% rename from pkgs/tools/misc/clipboard-jh/default.nix rename to pkgs/by-name/cl/clipboard-jh/package.nix diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/by-name/cl/clipit/package.nix similarity index 100% rename from pkgs/applications/misc/clipit/default.nix rename to pkgs/by-name/cl/clipit/package.nix diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/by-name/cl/clipman/package.nix similarity index 100% rename from pkgs/tools/wayland/clipman/default.nix rename to pkgs/by-name/cl/clipman/package.nix diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/by-name/cl/clipmenu/package.nix similarity index 100% rename from pkgs/applications/misc/clipmenu/default.nix rename to pkgs/by-name/cl/clipmenu/package.nix diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/by-name/cl/clipnotify/package.nix similarity index 100% rename from pkgs/tools/misc/clipnotify/default.nix rename to pkgs/by-name/cl/clipnotify/package.nix diff --git a/pkgs/development/libraries/clipp/clipp.pc b/pkgs/by-name/cl/clipp/clipp.pc similarity index 100% rename from pkgs/development/libraries/clipp/clipp.pc rename to pkgs/by-name/cl/clipp/clipp.pc diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/by-name/cl/clipp/package.nix similarity index 100% rename from pkgs/development/libraries/clipp/default.nix rename to pkgs/by-name/cl/clipp/package.nix diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/by-name/cl/clipper/package.nix similarity index 100% rename from pkgs/development/libraries/clipper/default.nix rename to pkgs/by-name/cl/clipper/package.nix diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/by-name/cl/clipqr/package.nix similarity index 100% rename from pkgs/applications/misc/clipqr/default.nix rename to pkgs/by-name/cl/clipqr/package.nix diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/by-name/cl/clips/package.nix similarity index 100% rename from pkgs/development/interpreters/clips/default.nix rename to pkgs/by-name/cl/clips/package.nix diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/by-name/cl/clipster/package.nix similarity index 100% rename from pkgs/tools/misc/clipster/default.nix rename to pkgs/by-name/cl/clipster/package.nix diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/by-name/cl/cliquer/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/cliquer/default.nix rename to pkgs/by-name/cl/cliquer/package.nix diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/by-name/cl/clj-kondo/package.nix similarity index 100% rename from pkgs/development/tools/clj-kondo/default.nix rename to pkgs/by-name/cl/clj-kondo/package.nix diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/by-name/cl/clmagma/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/clmagma/default.nix rename to pkgs/by-name/cl/clmagma/package.nix diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/by-name/cl/cln/package.nix similarity index 100% rename from pkgs/development/libraries/cln/default.nix rename to pkgs/by-name/cl/cln/package.nix diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/by-name/cl/cloc/package.nix similarity index 100% rename from pkgs/tools/misc/cloc/default.nix rename to pkgs/by-name/cl/cloc/package.nix diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/by-name/cl/clockify/package.nix similarity index 100% rename from pkgs/applications/office/clockify/default.nix rename to pkgs/by-name/cl/clockify/package.nix diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/by-name/cl/clog-cli/package.nix similarity index 100% rename from pkgs/development/tools/clog-cli/default.nix rename to pkgs/by-name/cl/clog-cli/package.nix diff --git a/pkgs/tools/misc/clolcat/default.nix b/pkgs/by-name/cl/clolcat/package.nix similarity index 100% rename from pkgs/tools/misc/clolcat/default.nix rename to pkgs/by-name/cl/clolcat/package.nix diff --git a/pkgs/by-name/cl/clonehero/package.nix b/pkgs/by-name/cl/clonehero/package.nix new file mode 100644 index 000000000000..7af6a21199f2 --- /dev/null +++ b/pkgs/by-name/cl/clonehero/package.nix @@ -0,0 +1,123 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, gtk3 +, zlib +, alsa-lib +, dbus +, libGL +, libXcursor +, libXext +, libXi +, libXinerama +, libxkbcommon +, libXrandr +, libXScrnSaver +, libXxf86vm +, udev +, vulkan-loader # (not used by default, enable in settings menu) +, wayland # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI) +, makeDesktopItem +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clonehero"; + version = "1.0.0.4080"; + + src = fetchurl { + url = "https://github.com/clonehero-game/releases/releases/download/V${finalAttrs.version}/CloneHero-linux.tar.xz"; + hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI="; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + # Load-time libraries (loaded from DT_NEEDED section in ELF binary) + alsa-lib + gtk3 + (lib.getLib stdenv.cc.cc) + zlib + + # Run-time libraries (loaded with dlopen) + dbus + libGL + libXcursor + libXext + libXi + libXinerama + libxkbcommon + libXrandr + libXScrnSaver + libXxf86vm + udev + vulkan-loader + wayland + ]; + + desktopItem = makeDesktopItem { + name = "clonehero"; + desktopName = "Clone Hero"; + comment = finalAttrs.meta.description; + icon = "clonehero"; + exec = "clonehero"; + categories = [ "Game" ]; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 clonehero "$out/bin/clonehero" + install -Dm644 UnityPlayer.so "$out/libexec/clonehero/UnityPlayer.so" + + mkdir -p "$out/share/pixmaps" + cp -r clonehero_Data "$out/share/clonehero" + ln -s "$out/share/clonehero" "$out/bin/clonehero_Data" + ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/pixmaps/clonehero.png" + install -Dm644 "$desktopItem/share/applications/clonehero.desktop" "$out/share/applications/clonehero.desktop" + + mkdir -p "$doc/share/doc/clonehero" + cp -r CLONE_HERO_MANUAL.{pdf,txt} Custom EULA.txt THIRDPARTY.txt "$doc/share/doc/clonehero" + + runHook postInstall + ''; + + # Patch required run-time libraries as load-time libraries + # + # Libraries found with: + # > strings UnityPlayer.so | grep '\.so' + # and: + # > LD_DEBUG=libs clonehero + postFixup = '' + patchelf \ + --add-needed libasound.so.2 \ + --add-needed libdbus-1.so.3 \ + --add-needed libGL.so.1 \ + --add-needed libpthread.so.0 \ + --add-needed libudev.so.1 \ + --add-needed libvulkan.so.1 \ + --add-needed libwayland-client.so.0 \ + --add-needed libwayland-cursor.so.0 \ + --add-needed libwayland-egl.so.1 \ + --add-needed libX11.so.6 \ + --add-needed libXcursor.so.1 \ + --add-needed libXext.so.6 \ + --add-needed libXi.so.6 \ + --add-needed libXinerama.so.1 \ + --add-needed libxkbcommon.so.0 \ + --add-needed libXrandr.so.2 \ + --add-needed libXss.so.1 \ + --add-needed libXxf86vm.so.1 \ + "$out/libexec/clonehero/UnityPlayer.so" + ''; + + meta = with lib; { + description = "Clone of Guitar Hero and Rockband-style games"; + homepage = "https://clonehero.net"; + license = licenses.unfree; + maintainers = with maintainers; [ kira-bruneau syboxez ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/cl/cloneit/package.nix b/pkgs/by-name/cl/cloneit/package.nix new file mode 100644 index 000000000000..844bbd22eff8 --- /dev/null +++ b/pkgs/by-name/cl/cloneit/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + unstableGitUpdater, +}: +rustPlatform.buildRustPackage { + pname = "cloneit"; + version = "0-unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "alok8bb"; + repo = "cloneit"; + rev = "6198556e810d964cc5938c446ef42fc21b55fe0b"; + sha256 = "sha256-RP0/kquAlSwRMeB6cjvS5JB9qfdkT8IKLVxaxrmzJ+0="; + }; + + cargoHash = "sha256-XXcqmDPEQUm4YBqY5+06X55ym3o3RqE7fNSiR4n+iyc="; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "CLI tool to download specific GitHub directories or files"; + homepage = "https://github.com/alok8bb/cloneit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NotAShelf ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/by-name/cl/closurecompiler/package.nix similarity index 100% rename from pkgs/development/compilers/closure/default.nix rename to pkgs/by-name/cl/closurecompiler/package.nix diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/by-name/cl/cloud-custodian/package.nix similarity index 100% rename from pkgs/tools/networking/cloud-custodian/default.nix rename to pkgs/by-name/cl/cloud-custodian/package.nix diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/by-name/cl/cloud-hypervisor/Cargo.lock similarity index 100% rename from pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock rename to pkgs/by-name/cl/cloud-hypervisor/Cargo.lock diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix similarity index 100% rename from pkgs/applications/virtualization/cloud-hypervisor/default.nix rename to pkgs/by-name/cl/cloud-hypervisor/package.nix diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/by-name/cl/cloud-nuke/package.nix similarity index 100% rename from pkgs/development/tools/cloud-nuke/default.nix rename to pkgs/by-name/cl/cloud-nuke/package.nix diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/by-name/cl/cloud-utils/package.nix similarity index 100% rename from pkgs/tools/misc/cloud-utils/default.nix rename to pkgs/by-name/cl/cloud-utils/package.nix diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/by-name/cl/cloudbrute/package.nix similarity index 100% rename from pkgs/tools/security/cloudbrute/default.nix rename to pkgs/by-name/cl/cloudbrute/package.nix diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index c15a390b2a3a..b68af648c6ee 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.7.21"; + version = "0.8.3"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-U8th7cEAFDBg+CV6DEX0YnqaM2+NJNKmyA/IRtnWESo="; - aarch64-linux = "sha256-LaAVO4p0sSfsGmFPSzly1Hzo+t4oY6mgaTdnHrhu0vI="; - x86_64-darwin = "sha256-/cyLcX7A+WpuS6yciqAz3jvDIJvXEoyQyX+xe6+eRmE="; - aarch64-darwin = "sha256-Y5cKIHVzX0TjMNZGW3YvU8MNpuGsIjp4qNlB+b2BRJM="; + x86_64-linux = "sha256-5vyWMoDASzRa9m2UueoyMbmK8JPUpplqk0/uv8fHPAU="; + aarch64-linux = "sha256-zfar/dZkSVSrnrRpfF4RnwvkPVzmdLJa4W9Ds8NNNaI="; + x86_64-darwin = "sha256-3jab0NxGH+cac2Ughq/l2ZAQLISD7z+WBtFFyiFc+5A="; + aarch64-darwin = "sha256-SO5L9aBMN5pYloBeVH1uQO0QeiHzDK+6kHVEg8uYnTo="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix similarity index 100% rename from pkgs/applications/networking/cloudflare-dyndns/default.nix rename to pkgs/by-name/cl/cloudflare-dyndns/package.nix diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix new file mode 100644 index 000000000000..e91b97fca737 --- /dev/null +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -0,0 +1,105 @@ +{ stdenv +, lib +, autoPatchelfHook +, copyDesktopItems +, dbus +, dpkg +, fetchurl +, gtk3 +, libpcap +, makeDesktopItem +, makeWrapper +, nftables +, nss +, openssl +}: + +stdenv.mkDerivation rec { + pname = "cloudflare-warp"; + version = "2024.9.346"; + + suffix = { + aarch64-linux = "arm64"; + x86_64-linux = "amd64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_${suffix}.deb"; + hash = { + aarch64-linux = "sha256-dgu/OiQPT7bkPnhrDArQg2lDAcOyhzZ5nJrjS2dqpFo="; + x86_64-linux = "sha256-KwxLF7LWB49M+kZPJ9M4OcDSF1f3MX4S0dTtTkzQVRQ="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + dbus + gtk3 + libpcap + openssl + nss + (lib.getLib stdenv.cc.cc) + ]; + + desktopItems = [ + (makeDesktopItem { + name = "com.cloudflare.WarpCli"; + desktopName = "Cloudflare Zero Trust Team Enrollment"; + categories = [ "Utility" "Security" "ConsoleOnly" ]; + noDisplay = true; + mimeTypes = [ "x-scheme-handler/com.cloudflare.warp" ]; + exec = "warp-cli --accept-tos registration token %u"; + startupNotify = false; + terminal = true; + }) + ]; + + autoPatchelfIgnoreMissingDeps = [ + "libpcap.so.0.8" + ]; + + installPhase = '' + runHook preInstall + + mv usr $out + mv bin $out + mv etc $out + patchelf --replace-needed libpcap.so.0.8 ${libpcap}/lib/libpcap.so $out/bin/warp-dex + mv lib/systemd/system $out/lib/systemd/ + substituteInPlace $out/lib/systemd/system/warp-svc.service \ + --replace "ExecStart=" "ExecStart=$out" + substituteInPlace $out/lib/systemd/user/warp-taskbar.service \ + --replace "ExecStart=" "ExecStart=$out" + + cat >>$out/lib/systemd/user/warp-taskbar.service < ListValues = GetSetValueFromTarget(Target, commands[i].ID, listSets); +- if (commands[i].Data[j].StartsWith('+') || commands[i].Data[j].StartsWith(',')) ++ if (commands[i].Data[j].StartsWith("+") || commands[i].Data[j].StartsWith(",")) + { + ListValues[0] = commands[i].Data[j][0] + ListValues[0]; + } + + for (int k = 1; k < ListValues.Count; k++) + { +- if (ListValues[k].StartsWith('+') || ListValues[k].StartsWith(',')) ++ if (ListValues[k].StartsWith("+") || ListValues[k].StartsWith(",")) + { + ListValues[k] = ListValues[k][0] + ListValues[k].Substring(1).TrimStart(); + } +@@ -1834,7 +1834,7 @@ namespace CLPS2C_Compiler + continue; + } + +- if (commands[i].Data[j].StartsWith('+') || commands[i].Data[j].StartsWith(',')) ++ if (commands[i].Data[j].StartsWith("+") || commands[i].Data[j].StartsWith(",")) + { + commands[i].Data[j] = commands[i].Data[j][0] + Target; + } +@@ -1912,7 +1912,7 @@ namespace CLPS2C_Compiler + + for (i = i + 1; i < command.Data.Count; i++) + { +- if (!command.Data[i].StartsWith('+')) ++ if (!command.Data[i].StartsWith("+")) + { + break; + } +@@ -1940,12 +1940,12 @@ namespace CLPS2C_Compiler + + for (i = i + 1; i < command.Data.Count; i++) + { +- if (command.Data[i].StartsWith(',')) ++ if (command.Data[i].StartsWith(",")) + { + ListOffs.Add(TmpAddress.ToString("X8")); + TmpAddress = 0; + } +- else if (!command.Data[i].StartsWith('+')) ++ else if (!command.Data[i].StartsWith("+")) + { + ListOffs.Add(TmpAddress.ToString("X8")); + TmpAddress = 0; +@@ -1980,7 +1980,7 @@ namespace CLPS2C_Compiler + + for (i = i + 1; i < command.Data.Count; i++) + { +- if (!command.Data[i].StartsWith('+')) ++ if (!command.Data[i].StartsWith("+")) + { + break; + } +@@ -2008,7 +2008,7 @@ namespace CLPS2C_Compiler + + for (i = i + 1; i < command.Data.Count; i++) + { +- if (!command.Data[i].StartsWith('+')) ++ if (!command.Data[i].StartsWith("+")) + { + break; + } +@@ -2040,7 +2040,7 @@ namespace CLPS2C_Compiler + { + string Value = ""; + uint Sum = 0; +- if (command.Data[i].StartsWith('"')) ++ if (command.Data[i].StartsWith("\"")) + { + // string + Value = command.Data[i]; +@@ -2059,7 +2059,7 @@ namespace CLPS2C_Compiler + for (i = i + 1; i < command.Data.Count; i++) + { + string Element = command.Data[i]; +- if (!Element.StartsWith('+') || Element == "+") ++ if (!Element.StartsWith("+") || Element == "+") + { + // without +, or just '+' + SetError(ERROR.WRONG_SYNTAX, command); +@@ -2072,7 +2072,7 @@ namespace CLPS2C_Compiler + // string + if (Sum > 0) + { +- if (Value.EndsWith('"')) ++ if (Value.EndsWith("\"")) + { + Value = Value.TrimEnd('"') + Sum.ToString() + '"'; + } +@@ -2089,7 +2089,7 @@ namespace CLPS2C_Compiler + return ""; + } + string Tmp = GetSubstringInQuotes(Element, false); +- if (Value.EndsWith('"')) ++ if (Value.EndsWith("\"")) + { + Value = Value.TrimEnd('"') + Tmp + '"'; + } +@@ -2112,7 +2112,7 @@ namespace CLPS2C_Compiler + + if (Sum > 0) + { +- if (Value.EndsWith('"')) ++ if (Value.EndsWith("\"")) + { + Value = Value.TrimEnd('"') + Sum.ToString() + '"'; + } +diff --git a/CLPS2C-Compiler/Util.cs b/CLPS2C-Compiler/Util.cs +index 4560c73..7f82ae6 100644 +--- a/CLPS2C-Compiler/CLPS2C-Compiler/Util.cs ++++ b/CLPS2C-Compiler/CLPS2C-Compiler/Util.cs +@@ -48,7 +48,7 @@ namespace CLPS2C_Compiler + // ([^ \t\n\r\f\v(+,]+) - Any other word. This is \S, and '(', '+', ',' + MatchCollection Matches = Regex.Matches(line, @"(\(.*\))|(""(?:\\.|[^""])*""?)|(\+\s*((""(?:\\.|[^""])*""?)|([^+""]+?))?(?=\+|$| |,))|(,(""?)([^,""]+?)\8(?=,|$| |\+))|([^ \t\n\r\f\v(+,]+)"); + Type = Matches[0].Value.ToUpper(); +- Data = Matches.Skip(1).Take(Matches.Count - 1).Select(item => item.Value).ToList(); // Data has every word except first ++ Data = Matches.Cast().Skip(1).Take(Matches.Count - 1).Select(item => item.Value).ToList(); // Data has every word except first + } + + public void AppendToTraceback(string file, string fullLine, int lineIdx) +@@ -165,7 +165,7 @@ namespace CLPS2C_Compiler + else + { + // It's a comment, count new lines +- int newLinesCount = match.Value.Split(Program._newLine).Length - 1; ++ int newLinesCount = match.Value.Split(new string[] { Program._newLine }, StringSplitOptions.None).Length - 1; + return string.Concat(Enumerable.Repeat(Program._newLine, newLinesCount)); + } + }); +@@ -486,7 +486,7 @@ namespace CLPS2C_Compiler + for (int i = 0; i < Output.Count; i++) + { + string Element = Output[i]; +- if (Element.StartsWith('+')) ++ if (Element.StartsWith("+")) + { + Element = Element.Substring(1).TrimStart(); + } +@@ -496,7 +496,7 @@ namespace CLPS2C_Compiler + List RecursiveValues = GetSetValueFromTarget(Element, SetID, listSets); + if (RecursiveValues.Count != 0) + { +- if (Output[i].StartsWith('+')) ++ if (Output[i].StartsWith("+")) + { + RecursiveValues[0] = "+" + RecursiveValues[0]; + } diff --git a/pkgs/by-name/cl/clps2c-compiler/patches/dont_trim_leading_newline.patch b/pkgs/by-name/cl/clps2c-compiler/patches/dont_trim_leading_newline.patch new file mode 100644 index 000000000000..bce6826db7fd --- /dev/null +++ b/pkgs/by-name/cl/clps2c-compiler/patches/dont_trim_leading_newline.patch @@ -0,0 +1,15 @@ +diff --git a/CLPS2C-Compiler/Program.cs b/CLPS2C-Compiler/Program.cs +index 6991896..fe8cd5f 100644 +--- a/CLPS2C-Compiler/CLPS2C-Compiler/Program.cs ++++ b/CLPS2C-Compiler/CLPS2C-Compiler/Program.cs +@@ -90,10 +90,6 @@ namespace CLPS2C_Compiler + } + else if (OutputLines.Count != 0) + { +- if (OutputLines[0].StartsWith(_newLine)) +- { +- OutputLines[0] = OutputLines[0].Substring(2); +- } + Output += string.Join("", OutputLines); + + // Convert to PNACH Format diff --git a/pkgs/by-name/cl/clps2c-compiler/patches/keystone_set_targetframework.patch b/pkgs/by-name/cl/clps2c-compiler/patches/keystone_set_targetframework.patch new file mode 100644 index 000000000000..150da411af27 --- /dev/null +++ b/pkgs/by-name/cl/clps2c-compiler/patches/keystone_set_targetframework.patch @@ -0,0 +1,13 @@ +diff --git a/bindings/csharp/Keystone.Net/Keystone.Net.csproj b/bindings/csharp/Keystone.Net/Keystone.Net.csproj +index 04801b4..4c6fe15 100644 +--- a/keystone/bindings/csharp/Keystone.Net/Keystone.Net.csproj ++++ b/keystone/bindings/csharp/Keystone.Net/Keystone.Net.csproj +@@ -1,7 +1,7 @@ + + + +- netstandard2.0 ++ net8.0 + Keystone + + 1.1.0 diff --git a/pkgs/by-name/cl/clps2c-compiler/patches/remove_platformtarget.patch b/pkgs/by-name/cl/clps2c-compiler/patches/remove_platformtarget.patch new file mode 100644 index 000000000000..82b8708231bd --- /dev/null +++ b/pkgs/by-name/cl/clps2c-compiler/patches/remove_platformtarget.patch @@ -0,0 +1,12 @@ +diff --git a/CLPS2C-Compiler/CLPS2C-Compiler.csproj b/CLPS2C-Compiler/CLPS2C-Compiler.csproj +index 867533e..80f7923 100644 +--- a/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj ++++ b/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj +@@ -6,7 +6,6 @@ + CLPS2C_Compiler + enable + enable +- x86 + 256x256.ico + 1.0.1 + diff --git a/pkgs/by-name/cl/clps2c-compiler/patches/set_langversion.patch b/pkgs/by-name/cl/clps2c-compiler/patches/set_langversion.patch new file mode 100644 index 000000000000..3814118d11b7 --- /dev/null +++ b/pkgs/by-name/cl/clps2c-compiler/patches/set_langversion.patch @@ -0,0 +1,12 @@ +diff --git a/CLPS2C-Compiler/CLPS2C-Compiler.csproj b/CLPS2C-Compiler/CLPS2C-Compiler.csproj +index 867533e..34b30a4 100644 +--- a/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj ++++ b/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj +@@ -5,6 +5,7 @@ + net8.0 + CLPS2C_Compiler + enable ++ 10.0 + enable + x86 + 256x256.ico diff --git a/pkgs/by-name/cl/clps2c-compiler/patches/set_runtimeidentifiers.patch b/pkgs/by-name/cl/clps2c-compiler/patches/set_runtimeidentifiers.patch new file mode 100644 index 000000000000..8d1bfeec616b --- /dev/null +++ b/pkgs/by-name/cl/clps2c-compiler/patches/set_runtimeidentifiers.patch @@ -0,0 +1,12 @@ +diff --git a/CLPS2C-Compiler/CLPS2C-Compiler.csproj b/CLPS2C-Compiler/CLPS2C-Compiler.csproj +index 867533e..ab44095 100644 +--- a/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj ++++ b/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj +@@ -3,6 +3,7 @@ + + Exe + net8.0 ++ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 + CLPS2C_Compiler + enable + enable diff --git a/pkgs/by-name/cl/clps2c-compiler/patches/use_compiled_keystone.patch b/pkgs/by-name/cl/clps2c-compiler/patches/use_compiled_keystone.patch new file mode 100644 index 000000000000..809281993cd5 --- /dev/null +++ b/pkgs/by-name/cl/clps2c-compiler/patches/use_compiled_keystone.patch @@ -0,0 +1,20 @@ +diff --git a/CLPS2C-Compiler/CLPS2C-Compiler.csproj b/CLPS2C-Compiler/CLPS2C-Compiler.csproj +index 867533e..17a3aca 100644 +--- a/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj ++++ b/CLPS2C-Compiler/CLPS2C-Compiler/CLPS2C-Compiler.csproj +@@ -28,16 +29,7 @@ + + + +- +- Keystone.Net.dll +- True +- +- +- +- +- +- PreserveNewest +- ++ + diff --git a/pkgs/tools/misc/clubhouse-cli/default.nix b/pkgs/by-name/cl/clubhouse-cli/package.nix similarity index 100% rename from pkgs/tools/misc/clubhouse-cli/default.nix rename to pkgs/by-name/cl/clubhouse-cli/package.nix diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/by-name/cl/clustal-omega/package.nix similarity index 100% rename from pkgs/applications/science/biology/clustal-omega/default.nix rename to pkgs/by-name/cl/clustal-omega/package.nix diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/by-name/cl/clusterctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/clusterctl/default.nix rename to pkgs/by-name/cl/clusterctl/package.nix diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/by-name/cl/clutter-gtk/package.nix similarity index 100% rename from pkgs/development/libraries/clutter-gtk/default.nix rename to pkgs/by-name/cl/clutter-gtk/package.nix diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/by-name/cl/clutter/package.nix similarity index 100% rename from pkgs/development/libraries/clutter/default.nix rename to pkgs/by-name/cl/clutter/package.nix diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/by-name/cm/cm256cc/package.nix similarity index 100% rename from pkgs/development/libraries/cm256cc/default.nix rename to pkgs/by-name/cm/cm256cc/package.nix diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/by-name/cm/cm_unicode/package.nix similarity index 100% rename from pkgs/data/fonts/cm-unicode/default.nix rename to pkgs/by-name/cm/cm_unicode/package.nix diff --git a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index 16bcbbd02fda..742b80c4f9d1 100644 --- a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff +++ b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,7 +1,8 @@ -diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt ---- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 23:01:32.000000000 +0300 -+++ cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt 2024-02-16 13:09:40.805479195 +0300 -@@ -470,13 +470,6 @@ +diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt +index b766aee425..ad50e64ce6 100644 +--- a/Utilities/cmcurl/CMakeLists.txt ++++ b/Utilities/cmcurl/CMakeLists.txt +@@ -466,13 +466,6 @@ if(ENABLE_IPV6 AND NOT WIN32) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) set(use_core_foundation_and_core_services ON) @@ -14,18 +15,19 @@ diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utiliti - list(APPEND CURL_LIBS "-framework SystemConfiguration") endif() endif() - -diff -Naur cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h ---- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 23:01:32.000000000 +0300 -+++ cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h 2024-02-16 13:10:38.822445566 +0300 -@@ -255,12 +255,6 @@ + if(ENABLE_IPV6) +diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h +index f7ba7e92a5..e4663cbf36 100644 +--- a/Utilities/cmcurl/lib/curl_setup.h ++++ b/Utilities/cmcurl/lib/curl_setup.h +@@ -316,12 +316,6 @@ * performing this task will result in a synthesized IPv6 address. */ #if defined(__APPLE__) && !defined(USE_ARES) -#include -#define USE_RESOLVE_ON_IPS 1 -# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ -- defined(ENABLE_IPV6) +- defined(USE_IPV6) -# define CURL_MACOS_CALL_COPYPROXIES 1 -# endif #endif diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 82563e56c2b0..4ccac7799541 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.29.6"; + version = "3.30.4"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-E5ExMAO4PUjiqxFai1JaVX942MFURhi0jR2QGEoQ8K8="; + hash = "sha256-x1nJcnTx56qq/LHw0mH53pvzpdbst+LfYWMkpG/nBLI="; }; patches = [ @@ -181,6 +181,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; + # Undo some of `fixCmakeFiles` for Darwin to make sure that checks for libraries in the SDK find them + # (e.g., `find_library(MATH_LIBRARY m)` should find `$SDKROOT/usr/lib/libm.tbd`). + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace "$out/share/cmake-${lib.versions.majorMinor finalAttrs.version}/Modules/Platform/Darwin.cmake" \ + --replace-fail '/var/empty/include' '/usr/include' \ + --replace-fail '/var/empty/lib' '/usr/lib' + ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 0bb0426bca82..3df8b9bd986b 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -57,9 +57,6 @@ cmakeConfigurePhase() { # because we usually do not package the framework prependToVar cmakeFlags "-DCMAKE_FIND_FRAMEWORK=LAST" - # we never want to use the global macOS SDK - prependToVar cmakeFlags "-DCMAKE_OSX_SYSROOT=" - # correctly detect our clang compiler prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/by-name/cm/cmark-gfm/package.nix similarity index 100% rename from pkgs/development/libraries/cmark-gfm/default.nix rename to pkgs/by-name/cm/cmark-gfm/package.nix diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/by-name/cm/cmark/package.nix similarity index 100% rename from pkgs/development/libraries/cmark/default.nix rename to pkgs/by-name/cm/cmark/package.nix diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/by-name/cm/cmctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/cmctl/default.nix rename to pkgs/by-name/cm/cmctl/package.nix diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/by-name/cm/cmdstan/package.nix similarity index 100% rename from pkgs/development/compilers/cmdstan/default.nix rename to pkgs/by-name/cm/cmdstan/package.nix diff --git a/pkgs/tools/text/cmigemo/no-http-tool-check.patch b/pkgs/by-name/cm/cmigemo/no-http-tool-check.patch similarity index 100% rename from pkgs/tools/text/cmigemo/no-http-tool-check.patch rename to pkgs/by-name/cm/cmigemo/no-http-tool-check.patch diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/by-name/cm/cmigemo/package.nix similarity index 100% rename from pkgs/tools/text/cmigemo/default.nix rename to pkgs/by-name/cm/cmigemo/package.nix diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/by-name/cm/cminpack/package.nix similarity index 100% rename from pkgs/development/libraries/cminpack/default.nix rename to pkgs/by-name/cm/cminpack/package.nix diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/by-name/cm/cmocka/package.nix similarity index 100% rename from pkgs/development/libraries/cmocka/default.nix rename to pkgs/by-name/cm/cmocka/package.nix diff --git a/pkgs/development/libraries/cmocka/uintptr_t.patch b/pkgs/by-name/cm/cmocka/uintptr_t.patch similarity index 100% rename from pkgs/development/libraries/cmocka/uintptr_t.patch rename to pkgs/by-name/cm/cmocka/uintptr_t.patch diff --git a/pkgs/tools/security/cmospwd/default.nix b/pkgs/by-name/cm/cmospwd/package.nix similarity index 100% rename from pkgs/tools/security/cmospwd/default.nix rename to pkgs/by-name/cm/cmospwd/package.nix diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/by-name/cm/cmrt/package.nix similarity index 100% rename from pkgs/development/libraries/cmrt/default.nix rename to pkgs/by-name/cm/cmrt/package.nix diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/by-name/cm/cmt/package.nix similarity index 100% rename from pkgs/applications/audio/cmt/default.nix rename to pkgs/by-name/cm/cmt/package.nix diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/by-name/cm/cmtk/package.nix similarity index 100% rename from pkgs/applications/science/biology/cmtk/default.nix rename to pkgs/by-name/cm/cmtk/package.nix diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/by-name/cm/cmusfm/package.nix similarity index 100% rename from pkgs/applications/audio/cmusfm/default.nix rename to pkgs/by-name/cm/cmusfm/package.nix diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/by-name/cn/cnijfilter2/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter2/default.nix rename to pkgs/by-name/cn/cnijfilter2/package.nix diff --git a/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch b/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch rename to pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/by-name/cn/cnijfilter_4_00/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix rename to pkgs/by-name/cn/cnijfilter_4_00/package.nix diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/by-name/cn/cnping/package.nix similarity index 100% rename from pkgs/tools/networking/cnping/default.nix rename to pkgs/by-name/cn/cnping/package.nix diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/by-name/cn/cnquery/package.nix similarity index 100% rename from pkgs/tools/security/cnquery/default.nix rename to pkgs/by-name/cn/cnquery/package.nix diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix similarity index 100% rename from pkgs/data/fonts/cnstrokeorder/default.nix rename to pkgs/by-name/cn/cnstrokeorder/package.nix diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/by-name/cn/cntlm/package.nix similarity index 100% rename from pkgs/tools/networking/cntlm/default.nix rename to pkgs/by-name/cn/cntlm/package.nix diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix new file mode 100644 index 000000000000..188032d2b966 --- /dev/null +++ b/pkgs/by-name/cn/cntr/package.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, nixosTests }: + +rustPlatform.buildRustPackage rec { + pname = "cntr"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "cntr"; + rev = version; + sha256 = "sha256-ErGratd1RCynE+iS+qn9feJi5o9f94lUNJZfy4XAjkc="; + }; + + cargoHash = "sha256-4EDAQ0MG0BTN0L3W4Jm0IdVY8vj5U3faO+ruUjLMBMY="; + + passthru.tests = nixosTests.cntr; + + meta = with lib; { + description = "Container debugging tool based on FUSE"; + homepage = "https://github.com/Mic92/cntr"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.mic92 ]; + mainProgram = "cntr"; + }; +} diff --git a/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff b/pkgs/by-name/co/coan/fix-big-endian-config-check.diff similarity index 100% rename from pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff rename to pkgs/by-name/co/coan/fix-big-endian-config-check.diff diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/by-name/co/coan/package.nix similarity index 100% rename from pkgs/development/tools/analysis/coan/default.nix rename to pkgs/by-name/co/coan/package.nix diff --git a/pkgs/by-name/co/coc-css/package.nix b/pkgs/by-name/co/coc-css/package.nix new file mode 100644 index 000000000000..bf595960b7e8 --- /dev/null +++ b/pkgs/by-name/co/coc-css/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "coc-css"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-css"; + rev = finalAttrs.version; + hash = "sha256-ASFg5LM1NbpK+Df1TPs+O13WmZktw+BtfsCJagF5nUc="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-JJXpsccO9MZ0D15JUZtTebX1zUMgwGEzSOm7auw5pQo="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + yarnInstallHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Css language server extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-css"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 9ff956d3c6f0..48e8282d0fbb 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -36,21 +36,15 @@ , xmlto }: -let - pythonWithGobject = python3Packages.python.withPackages (p: with p; [ - pygobject3 - ]); -in - stdenv.mkDerivation rec { pname = "cockpit"; - version = "318"; + version = "328"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-1SpSzC5wOsv4Ha0ShtuyPsKLm0fVuPt8KFejJHFU8MY="; + hash = "sha256-0iCFMwnPtbrCXZMQQB0C7xtvGHFLMPk8otgMrJmVxXw="; fetchSubmodules = true; }; @@ -67,7 +61,6 @@ stdenv.mkDerivation rec { openssl pam pkg-config - pythonWithGobject.python python3Packages.setuptools systemd xmlto @@ -82,6 +75,8 @@ stdenv.mkDerivation rec { libssh polkit udev + python3Packages.pygobject3 + python3Packages.pip ]; postPatch = '' @@ -165,8 +160,6 @@ stdenv.mkDerivation rec { src/tls/cockpit-certificate-helper \ src/ws/cockpit-desktop - PATH=${pythonWithGobject}/bin patchShebangs src/client/cockpit-client - substituteInPlace src/ws/cockpit-desktop \ --replace ' /bin/bash' ' ${runtimeShell}' ''; @@ -181,8 +174,14 @@ stdenv.mkDerivation rec { wrapProgram $out/share/cockpit/motd/update-motd \ --prefix PATH : ${lib.makeBinPath [ gnused ]} + wrapProgram $out/bin/cockpit-bridge \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + + substituteInPlace $out/${python3Packages.python.sitePackages}/cockpit/_vendor/systemd_ctypes/libsystemd.py \ + --replace-fail libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 + substituteInPlace $out/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ - --replace /usr $out + --replace-fail /usr $out runHook postFixup ''; @@ -202,7 +201,6 @@ stdenv.mkDerivation rec { export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge export PATH=$PATH:$(pwd) - cockpit-bridge --version make pytest -j$NIX_BUILD_CORES || true make check -j$NIX_BUILD_CORES || true test/static-code diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/by-name/co/cockroachdb/package.nix similarity index 100% rename from pkgs/servers/sql/cockroachdb/default.nix rename to pkgs/by-name/co/cockroachdb/package.nix diff --git a/pkgs/os-specific/darwin/coconutbattery/default.nix b/pkgs/by-name/co/coconutbattery/package.nix similarity index 100% rename from pkgs/os-specific/darwin/coconutbattery/default.nix rename to pkgs/by-name/co/coconutbattery/package.nix diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/by-name/co/cod/package.nix similarity index 100% rename from pkgs/tools/misc/cod/default.nix rename to pkgs/by-name/co/cod/package.nix diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index c3e879be8e4a..8f6c753577b2 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -8,11 +8,11 @@ }: let pname = "cursor"; - version = "0.42.3"; + version = "0.42.4"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.3-build-241016kxu9umuir-x86_64.AppImage"; - hash = "sha256-GWkilBlpXube//jbxRjmKJjYcmB42nhMY8K0OgkvtwA="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.4-build-2410291z3bdg1dy-x86_64.AppImage"; + hash = "sha256-CD6bQ4T8DhJidiOxNRgRDL4obfEZx7hnO0VotVb6lDc="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in diff --git a/pkgs/development/tools/code-maat/default.nix b/pkgs/by-name/co/code-maat/package.nix similarity index 100% rename from pkgs/development/tools/code-maat/default.nix rename to pkgs/by-name/co/code-maat/package.nix diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/by-name/co/code-minimap/package.nix similarity index 100% rename from pkgs/tools/misc/code-minimap/default.nix rename to pkgs/by-name/co/code-minimap/package.nix diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/by-name/co/codeberg-pages/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/codeberg-pages/default.nix rename to pkgs/by-name/co/codeberg-pages/package.nix diff --git a/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch b/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch similarity index 100% rename from pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch rename to pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/by-name/co/codeblocks/package.nix similarity index 100% rename from pkgs/applications/editors/codeblocks/default.nix rename to pkgs/by-name/co/codeblocks/package.nix diff --git a/pkgs/applications/editors/codeblocks/writable-projects.patch b/pkgs/by-name/co/codeblocks/writable-projects.patch similarity index 100% rename from pkgs/applications/editors/codeblocks/writable-projects.patch rename to pkgs/by-name/co/codeblocks/writable-projects.patch diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/by-name/co/codebraid/package.nix similarity index 100% rename from pkgs/tools/misc/codebraid/default.nix rename to pkgs/by-name/co/codebraid/package.nix diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/by-name/co/codec2/package.nix similarity index 100% rename from pkgs/development/libraries/codec2/default.nix rename to pkgs/by-name/co/codec2/package.nix diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index dc8c9c2eea68..0338be017d7f 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-CQQ2GFy8eEaZkbnuCvBgSRMlwrEfqvM+dF1jlr6b7hk="; - aarch64-linux = "sha256-LGGZZmVVO1ZhKXfU1F9SC2pGEZOqbf/hxmBMex4ll1o="; - x86_64-darwin = "sha256-+pReEaZyi3o/ftaglOUNHoal9PShfj0gSJ2B3cg2Pa0="; - aarch64-darwin = "sha256-0l6YlL9CSypRCzbxTOpC9fx2blgu5uelYCo85koJUdA="; + x86_64-linux = "sha256-fxwFomtgkOCtZCmXjxlCqa+9hxBiVNbM2IFdAGQ8Nlw="; + aarch64-linux = "sha256-hTxpszPXVU2FpB690tfZzrV9tUH/EqfjyEZQ8gPFmas="; + x86_64-darwin = "sha256-RiSCz4xNMFDdsAttovjXys7MeXRQgmi6YOi2LwvRoGE="; + aarch64-darwin = "sha256-G3j3Ds5ycGs0n5+KcaRa2MG86/1LdcZhgNdgeRIyfa4="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.20.4"; + version = "1.24.2"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch b/pkgs/by-name/co/codemov/fix-build-with-rust-1.80.patch similarity index 100% rename from pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch rename to pkgs/by-name/co/codemov/fix-build-with-rust-1.80.patch diff --git a/pkgs/tools/misc/codemov/default.nix b/pkgs/by-name/co/codemov/package.nix similarity index 100% rename from pkgs/tools/misc/codemov/default.nix rename to pkgs/by-name/co/codemov/package.nix diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/by-name/co/codeowners/package.nix similarity index 100% rename from pkgs/development/tools/codeowners/default.nix rename to pkgs/by-name/co/codeowners/package.nix diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix new file mode 100644 index 000000000000..c981487935c5 --- /dev/null +++ b/pkgs/by-name/co/codeql/package.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk17, curl }: + +stdenv.mkDerivation rec { + pname = "codeql"; + version = "2.19.1"; + + dontConfigure = true; + dontBuild = true; + dontStrip = true; + + src = fetchzip { + url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; + hash = "sha256-OUfNlaGNJDRkg5OGVPakB2TfEP4GFNVVFpXKW8SBpfM="; + }; + + nativeBuildInputs = [ + zlib + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXtst + xorg.libXrender + freetype + jdk17 + (lib.getLib stdenv.cc.cc) + curl + ]; + + installPhase = '' + # codeql directory should not be top-level, otherwise, + # it'll include /nix/store to resolve extractors. + mkdir -p $out/{codeql,bin} + cp -R * $out/codeql/ + + ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so + + # many of the codeql extractors use CODEQL_DIST + CODEQL_PLATFORM to + # resolve java home, so to be able to create databases, we want to make + # sure that they point somewhere sane/usable since we can not autopatch + # the codeql packaged java dist, but we DO want to patch the extractors + # as well as the builders which are ELF binaries for the most part + rm -rf $out/codeql/tools/linux64/java + ln -s ${jdk17} $out/codeql/tools/linux64/java + + ln -s $out/codeql/codeql $out/bin/ + ''; + + meta = with lib; { + description = "Semantic code analysis engine"; + homepage = "https://codeql.github.com"; + maintainers = [ maintainers.dump_stack ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = licenses.unfree; + }; +} diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/by-name/co/codesearch/package.nix similarity index 100% rename from pkgs/tools/text/codesearch/default.nix rename to pkgs/by-name/co/codesearch/package.nix diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/by-name/co/codespell/package.nix similarity index 100% rename from pkgs/development/tools/codespell/default.nix rename to pkgs/by-name/co/codespell/package.nix diff --git a/pkgs/tools/misc/codevis/default.nix b/pkgs/by-name/co/codevis/package.nix similarity index 100% rename from pkgs/tools/misc/codevis/default.nix rename to pkgs/by-name/co/codevis/package.nix diff --git a/pkgs/tools/security/coercer/default.nix b/pkgs/by-name/co/coercer/package.nix similarity index 100% rename from pkgs/tools/security/coercer/default.nix rename to pkgs/by-name/co/coercer/package.nix diff --git a/pkgs/development/compilers/coffeescript/default.nix b/pkgs/by-name/co/coffeescript/package.nix similarity index 100% rename from pkgs/development/compilers/coffeescript/default.nix rename to pkgs/by-name/co/coffeescript/package.nix diff --git a/pkgs/development/web/cog/default.nix b/pkgs/by-name/co/cog/package.nix similarity index 100% rename from pkgs/development/web/cog/default.nix rename to pkgs/by-name/co/cog/package.nix diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/by-name/co/coin-utils/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/coin-utils/default.nix rename to pkgs/by-name/co/coin-utils/package.nix diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/by-name/co/coin3d/package.nix similarity index 100% rename from pkgs/development/libraries/coin3d/default.nix rename to pkgs/by-name/co/coin3d/package.nix diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/by-name/co/cointop/package.nix similarity index 100% rename from pkgs/applications/misc/cointop/default.nix rename to pkgs/by-name/co/cointop/package.nix diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/by-name/co/colemak-dh/package.nix similarity index 100% rename from pkgs/data/misc/colemak-dh/default.nix rename to pkgs/by-name/co/colemak-dh/package.nix diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix new file mode 100644 index 000000000000..1d82b405c7ab --- /dev/null +++ b/pkgs/by-name/co/colima/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, darwin +, buildGoModule +, fetchFromGitHub +, installShellFiles +, lima +, lima-bin +, makeWrapper +, qemu +, testers +, colima + # use lima-bin on darwin to support native macOS virtualization + # https://github.com/NixOS/nixpkgs/pull/209171 +, lima-drv ? if stdenv.hostPlatform.isDarwin then lima-bin else lima +}: + +buildGoModule rec { + pname = "colima"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "abiosoft"; + repo = pname; + rev = "v${version}"; + hash = "sha256-S8KmwUN5ZU21P/i6X9uSmQ25nMHZxYKd6XtawrwP6yU="; + # We need the git revision + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse --short HEAD > $out/.git-revision + rm -rf $out/.git + ''; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; + + vendorHash = "sha256-caqQA+vDtC5s9qehMIMAcl8JD3Ls2wCSfOpUFPFQ9zY="; + + # disable flaky Test_extractZones + # https://hydra.nixos.org/build/212378003/log + excludedPackages = "gvproxy"; + + CGO_ENABLED = 1; + + preConfigure = '' + ldflags="-s -w -X github.com/abiosoft/colima/config.appVersion=${version} \ + -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" + ''; + + postInstall = '' + wrapProgram $out/bin/colima \ + --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} + + installShellCompletion --cmd colima \ + --bash <($out/bin/colima completion bash) \ + --fish <($out/bin/colima completion fish) \ + --zsh <($out/bin/colima completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = colima; + command = "HOME=$(mktemp -d) colima version"; + }; + + meta = with lib; { + description = "Container runtimes with minimal setup"; + homepage = "https://github.com/abiosoft/colima"; + license = licenses.mit; + maintainers = with maintainers; [ aaschmid tricktron ]; + mainProgram = "colima"; + }; +} diff --git a/pkgs/applications/emulators/collapseos-cvm/default.nix b/pkgs/by-name/co/collapseos-cvm/package.nix similarity index 100% rename from pkgs/applications/emulators/collapseos-cvm/default.nix rename to pkgs/by-name/co/collapseos-cvm/package.nix diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/colloid-gtk-theme/default.nix rename to pkgs/by-name/co/colloid-gtk-theme/package.nix diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix new file mode 100644 index 000000000000..25ffaf87b493 --- /dev/null +++ b/pkgs/by-name/co/colloid-icon-theme/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gtk3 +, hicolor-icon-theme +, jdupes +, schemeVariants ? [] +, colorVariants ? [] # default is blue +}: + +let + pname = "colloid-icon-theme"; + +in +lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ] schemeVariants +lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2024-10-18"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-xpRgOt/FqZSbtOlZKlZS1ILQn6OAwqKAXX3hj41Wo+0="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install almost 400 000 small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= ./install.sh \ + ${lib.optionalString (schemeVariants != []) ("--scheme " + builtins.toString schemeVariants)} \ + ${lib.optionalString (colorVariants != []) ("--theme " + builtins.toString colorVariants)} \ + --dest $out/share/icons + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Colloid icon theme"; + homepage = "https://github.com/vinceliuice/colloid-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/by-name/co/colm/cross-compile.patch similarity index 100% rename from pkgs/development/compilers/colm/cross-compile.patch rename to pkgs/by-name/co/colm/cross-compile.patch diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/by-name/co/colm/package.nix similarity index 100% rename from pkgs/development/compilers/colm/default.nix rename to pkgs/by-name/co/colm/package.nix diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix new file mode 100644 index 000000000000..bffb3f256465 --- /dev/null +++ b/pkgs/by-name/co/colmena/package.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchpatch, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nix +, colmena, testers }: + +rustPlatform.buildRustPackage rec { + pname = "colmena"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "zhaofengli"; + repo = "colmena"; + rev = "v${version}"; + sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; + }; + + cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8="; + + nativeBuildInputs = [ installShellFiles makeBinaryWrapper ]; + + buildInputs = [ nix-eval-jobs ]; + + NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; + + patches = [ + # Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/236 + (fetchpatch { + url = "https://github.com/zhaofengli/colmena/commit/36382ee2bef95983848435065f7422500c7923a8.patch"; + sha256 = "sha256-5cQ2u3eTzhzjPN+rc6xWIskHNtheVXXvlSeJ1G/lz+E="; + }) + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd colmena \ + --bash <($out/bin/colmena gen-completions bash) \ + --zsh <($out/bin/colmena gen-completions zsh) \ + --fish <($out/bin/colmena gen-completions fish) + + wrapProgram $out/bin/colmena \ + --prefix PATH ":" "${lib.makeBinPath [ nix ]}" + ''; + + # Recursive Nix is not stable yet + doCheck = false; + + passthru = { + # We guarantee CLI and Nix API stability for the same minor version + apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + + tests.version = testers.testVersion { package = colmena; }; + }; + + meta = with lib; { + description = "Simple, stateless NixOS deployment tool"; + homepage = "https://colmena.cli.rs/${passthru.apiVersion}"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + platforms = platforms.linux ++ platforms.darwin; + mainProgram = "colmena"; + }; +} diff --git a/pkgs/games/colobot/data.nix b/pkgs/by-name/co/colobot/data.nix similarity index 100% rename from pkgs/games/colobot/data.nix rename to pkgs/by-name/co/colobot/data.nix diff --git a/pkgs/games/colobot/default.nix b/pkgs/by-name/co/colobot/package.nix similarity index 100% rename from pkgs/games/colobot/default.nix rename to pkgs/by-name/co/colobot/package.nix diff --git a/pkgs/development/libraries/science/electronics/coloquinte/default.nix b/pkgs/by-name/co/coloquinte/package.nix similarity index 100% rename from pkgs/development/libraries/science/electronics/coloquinte/default.nix rename to pkgs/by-name/co/coloquinte/package.nix diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/by-name/co/colord-gtk/package.nix similarity index 100% rename from pkgs/tools/misc/colord-gtk/default.nix rename to pkgs/by-name/co/colord-gtk/package.nix diff --git a/pkgs/tools/misc/colord/installed-tests-path.patch b/pkgs/by-name/co/colord/installed-tests-path.patch similarity index 100% rename from pkgs/tools/misc/colord/installed-tests-path.patch rename to pkgs/by-name/co/colord/installed-tests-path.patch diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/by-name/co/colord/package.nix similarity index 100% rename from pkgs/tools/misc/colord/default.nix rename to pkgs/by-name/co/colord/package.nix diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/by-name/co/colordiff/package.nix similarity index 100% rename from pkgs/tools/text/colordiff/default.nix rename to pkgs/by-name/co/colordiff/package.nix diff --git a/pkgs/tools/misc/colorless/default.nix b/pkgs/by-name/co/colorless/package.nix similarity index 100% rename from pkgs/tools/misc/colorless/default.nix rename to pkgs/by-name/co/colorless/package.nix diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/by-name/co/colormake/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/colormake/default.nix rename to pkgs/by-name/co/colormake/package.nix diff --git a/pkgs/tools/misc/colorpanes/default.nix b/pkgs/by-name/co/colorpanes/package.nix similarity index 100% rename from pkgs/tools/misc/colorpanes/default.nix rename to pkgs/by-name/co/colorpanes/package.nix diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/by-name/co/colorstorm/package.nix similarity index 100% rename from pkgs/applications/misc/colorstorm/default.nix rename to pkgs/by-name/co/colorstorm/package.nix diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/by-name/co/colort/package.nix similarity index 100% rename from pkgs/applications/misc/colort/default.nix rename to pkgs/by-name/co/colort/package.nix diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/by-name/co/colorz/package.nix similarity index 100% rename from pkgs/tools/misc/colorz/default.nix rename to pkgs/by-name/co/colorz/package.nix diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/by-name/co/colpack/package.nix similarity index 100% rename from pkgs/applications/science/math/colpack/default.nix rename to pkgs/by-name/co/colpack/package.nix diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/by-name/co/combinatorial_designs/package.nix similarity index 100% rename from pkgs/data/misc/combinatorial_designs/default.nix rename to pkgs/by-name/co/combinatorial_designs/package.nix diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/by-name/co/comedilib/package.nix similarity index 100% rename from pkgs/development/libraries/comedilib/default.nix rename to pkgs/by-name/co/comedilib/package.nix diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index f60193005705..2424baab474a 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -1,15 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, protobuf, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "comet-gog"; version = "0.1.2"; @@ -31,11 +26,6 @@ rustPlatform.buildRustPackage rec { env.PROTOC = lib.getExe' protobuf "protoc"; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - SystemConfiguration - ]; - meta = { changelog = "https://github.com/imLinguin/comet/releases/tag/v${version}"; description = "Open Source implementation of GOG Galaxy's Communication Service"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/by-name/co/comfortaa/package.nix similarity index 100% rename from pkgs/data/fonts/comfortaa/default.nix rename to pkgs/by-name/co/comfortaa/package.nix diff --git a/pkgs/data/fonts/comic-mono/comic-mono-weight.conf b/pkgs/by-name/co/comic-mono/comic-mono-weight.conf similarity index 100% rename from pkgs/data/fonts/comic-mono/comic-mono-weight.conf rename to pkgs/by-name/co/comic-mono/comic-mono-weight.conf diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/by-name/co/comic-mono/package.nix similarity index 100% rename from pkgs/data/fonts/comic-mono/default.nix rename to pkgs/by-name/co/comic-mono/package.nix diff --git a/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/pkgs/by-name/co/comic-relief/comic-sans-ms-alias.conf similarity index 100% rename from pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf rename to pkgs/by-name/co/comic-relief/comic-sans-ms-alias.conf diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/by-name/co/comic-relief/package.nix similarity index 100% rename from pkgs/data/fonts/comic-relief/default.nix rename to pkgs/by-name/co/comic-relief/package.nix diff --git a/pkgs/data/icons/comixcursors/makefile-shell-var.patch b/pkgs/by-name/co/comixcursors/makefile-shell-var.patch similarity index 100% rename from pkgs/data/icons/comixcursors/makefile-shell-var.patch rename to pkgs/by-name/co/comixcursors/makefile-shell-var.patch diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/by-name/co/comixcursors/package.nix similarity index 100% rename from pkgs/data/icons/comixcursors/default.nix rename to pkgs/by-name/co/comixcursors/package.nix diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/by-name/co/comma/package.nix similarity index 100% rename from pkgs/tools/package-management/comma/default.nix rename to pkgs/by-name/co/comma/package.nix diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/by-name/co/commandergenius/package.nix similarity index 100% rename from pkgs/games/commandergenius/default.nix rename to pkgs/by-name/co/commandergenius/package.nix diff --git a/pkgs/applications/version-management/commit-formatter/default.nix b/pkgs/by-name/co/commit-formatter/package.nix similarity index 100% rename from pkgs/applications/version-management/commit-formatter/default.nix rename to pkgs/by-name/co/commit-formatter/package.nix diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/by-name/co/commit-mono/package.nix similarity index 100% rename from pkgs/data/fonts/commit-mono/default.nix rename to pkgs/by-name/co/commit-mono/package.nix diff --git a/pkgs/tools/security/commix/default.nix b/pkgs/by-name/co/commix/package.nix similarity index 100% rename from pkgs/tools/security/commix/default.nix rename to pkgs/by-name/co/commix/package.nix diff --git a/pkgs/data/misc/common-licenses/default.nix b/pkgs/by-name/co/common-licenses/package.nix similarity index 100% rename from pkgs/data/misc/common-licenses/default.nix rename to pkgs/by-name/co/common-licenses/package.nix diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/by-name/co/commonsBcel/package.nix similarity index 100% rename from pkgs/development/libraries/java/commons/bcel/default.nix rename to pkgs/by-name/co/commonsBcel/package.nix diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/by-name/co/commonsBsf/package.nix similarity index 100% rename from pkgs/development/libraries/java/commons/bsf/default.nix rename to pkgs/by-name/co/commonsBsf/package.nix diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/by-name/co/commonsCompress/package.nix similarity index 100% rename from pkgs/development/libraries/java/commons/compress/default.nix rename to pkgs/by-name/co/commonsCompress/package.nix diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/by-name/co/commonsDaemon/package.nix similarity index 100% rename from pkgs/development/libraries/java/commons/daemon/default.nix rename to pkgs/by-name/co/commonsDaemon/package.nix diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/by-name/co/commonsFileUpload/package.nix similarity index 100% rename from pkgs/development/libraries/java/commons/fileupload/default.nix rename to pkgs/by-name/co/commonsFileUpload/package.nix diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix new file mode 100644 index 000000000000..ae0ed04b0e42 --- /dev/null +++ b/pkgs/by-name/co/commonsIo/package.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "2.17.0"; + pname = "commons-io"; + + src = fetchurl { + url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; + sha256 = "sha256-4CM53Ujdtt0E9zAg9ytOa7UIw5bGNz/zrZqKJOQM9bg="; + }; + + installPhase = '' + tar xf ${src} + mkdir -p $out/share/java + cp *.jar $out/share/java/ + ''; + + meta = { + homepage = "https://commons.apache.org/proper/commons-io"; + description = "Library of utilities to assist with developing IO functionality"; + maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix new file mode 100644 index 000000000000..cea5958100a6 --- /dev/null +++ b/pkgs/by-name/co/commonsLang/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + version = "3.17.0"; + pname = "commons-lang"; + + src = fetchurl { + url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-CLk3Er7X9Icl2TxE1wxx5+ZhrzkPIvDz5rph46886jY="; + }; + + installPhase = '' + runHook preInstall + tar xf ${finalAttrs.src} + mkdir -p $out/share/java + cp *.jar $out/share/java/ + runHook postInstall + ''; + + meta = { + description = "Provides additional methods to manipulate standard Java library classes"; + homepage = "https://commons.apache.org/proper/commons-lang"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ copumpkin ]; + platforms = with lib.platforms; unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) diff --git a/pkgs/by-name/co/commonsLogging/package.nix b/pkgs/by-name/co/commonsLogging/package.nix new file mode 100644 index 000000000000..fbd622927aaa --- /dev/null +++ b/pkgs/by-name/co/commonsLogging/package.nix @@ -0,0 +1,25 @@ +{lib, stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "commons-logging"; + version = "1.3.4"; + + src = fetchurl { + url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz"; + sha256 = "sha256-asHQ0i4bBICkRK2Hzfo7+/EmT9gX5jcv8KmFMz1qCGI="; + }; + + installPhase = '' + mkdir -p $out/share/java + cp commons-logging-*.jar $out/share/java/ + ''; + + meta = { + description = "Wrapper around a variety of logging API implementations"; + homepage = "https://commons.apache.org/proper/commons-logging"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + }; +} + diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/by-name/co/commonsMath/package.nix similarity index 100% rename from pkgs/development/libraries/java/commons/math/default.nix rename to pkgs/by-name/co/commonsMath/package.nix diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix new file mode 100644 index 000000000000..79022f724005 --- /dev/null +++ b/pkgs/by-name/co/comodoro/package.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, installShellFiles +, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, withTcp ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "comodoro"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "soywod"; + repo = "comodoro"; + rev = "v${version}"; + hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18="; + }; + + cargoHash = "sha256-1WJIIsTzbChWqvdBSR/OpLC1iR8FgLmypJFQEtpalbw="; + + nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; + + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withTcp "tcp"; + + postInstall = lib.optionalString installManPages '' + mkdir -p $out/man + $out/bin/comodoro man $out/man + installManPage $out/man/* + '' + lib.optionalString installShellCompletions '' + installShellCompletion --cmd comodoro \ + --bash <($out/bin/comodoro completion bash) \ + --fish <($out/bin/comodoro completion fish) \ + --zsh <($out/bin/comodoro completion zsh) + ''; + + meta = with lib; { + description = "CLI to manage your time"; + homepage = "https://github.com/pimalaya/comodoro"; + changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ soywod ]; + mainProgram = "comodoro"; + }; +} diff --git a/pkgs/tools/misc/compdb/default.nix b/pkgs/by-name/co/compdb/package.nix similarity index 100% rename from pkgs/tools/misc/compdb/default.nix rename to pkgs/by-name/co/compdb/package.nix diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/by-name/co/compile-daemon/package.nix similarity index 100% rename from pkgs/development/tools/compile-daemon/default.nix rename to pkgs/by-name/co/compile-daemon/package.nix diff --git a/pkgs/tools/misc/complete-alias/default.nix b/pkgs/by-name/co/complete-alias/package.nix similarity index 100% rename from pkgs/tools/misc/complete-alias/default.nix rename to pkgs/by-name/co/complete-alias/package.nix diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/by-name/co/complexity/package.nix similarity index 100% rename from pkgs/development/tools/misc/complexity/default.nix rename to pkgs/by-name/co/complexity/package.nix diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/by-name/co/complgen/package.nix similarity index 100% rename from pkgs/development/tools/misc/complgen/default.nix rename to pkgs/by-name/co/complgen/package.nix diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix index af02f0d7c6da..550eb49b1271 100644 --- a/pkgs/by-name/co/compose2nix/package.nix +++ b/pkgs/by-name/co/compose2nix/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "compose2nix"; - version = "0.2.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "aksiksi"; repo = "compose2nix"; rev = "v${version}"; - hash = "sha256-qN7MFw6JKBbzwiqURkZ3or/8hT29mRpfITovSHdzDEY="; + hash = "sha256-rFnnbRVVv/N5021Al3vmjFAui1cTp8NBZDBNQo8CsXM="; }; - vendorHash = "sha256-yGBdsej6DjRMWzS13WyqCLaY5M/N9BrMARAM3oHsc+s="; + vendorHash = "sha256-kiUXgbXJg4x89k2SXf/1e1DLB04ETS+Qp2gx8uJA2DU="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/by-name/co/compsize/package.nix similarity index 100% rename from pkgs/os-specific/linux/compsize/default.nix rename to pkgs/by-name/co/compsize/package.nix diff --git a/pkgs/by-name/co/computecpp-unwrapped/package.nix b/pkgs/by-name/co/computecpp-unwrapped/package.nix new file mode 100644 index 000000000000..d6835ba05f78 --- /dev/null +++ b/pkgs/by-name/co/computecpp-unwrapped/package.nix @@ -0,0 +1,49 @@ +{ lib, stdenv +, fetchzip +, pkg-config +, autoPatchelfHook +, installShellFiles +, ocl-icd +, zlib +}: + +stdenv.mkDerivation rec { + pname = "computecpp"; + version = "2.11.0"; + + src = fetchzip { + url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; + hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY="; + stripRoot = true; + }; + + dontStrip = true; + + buildInputs = [ (lib.getLib stdenv.cc.cc) ocl-icd zlib ]; + nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; + + installPhase = '' + runHook preInstall + + find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \; + find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \; + find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \; + find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \; + find ./include -type f -exec install -D -m 0644 {} -t $out/include \; + + runHook postInstall + ''; + + passthru = { + isClang = true; + }; + + meta = with lib; { + description = + "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; + homepage = "https://www.codeplay.com/products/computesuite/computecpp"; + license = licenses.unfree; + maintainers = with maintainers; [ davidtwco ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/by-name/co/comrak/package.nix similarity index 100% rename from pkgs/tools/text/comrak/default.nix rename to pkgs/by-name/co/comrak/package.nix diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix new file mode 100644 index 000000000000..386e59d985b0 --- /dev/null +++ b/pkgs/by-name/co/conan/package.nix @@ -0,0 +1,118 @@ +{ lib +, stdenv +, fetchFromGitHub +, git +, pkg-config +, xcbuild +, python3 +, zlib +}: + +python3.pkgs.buildPythonApplication rec { + pname = "conan"; + version = "2.9.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "conan-io"; + repo = "conan"; + rev = "refs/tags/${version}"; + hash = "sha256-1KKXOvoSAemzafWvBoYFtxqgSObHcXe3GVPgG25VNm0="; + }; + + nativeBuildInputs = with python3.pkgs; [ + ]; + + propagatedBuildInputs = with python3.pkgs; [ + bottle + colorama + python-dateutil + distro + fasteners + jinja2 + patch-ng + pluginbase + pygments + pyjwt + pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152 + pyyaml + requests + tqdm + urllib3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + idna + cryptography + pyopenssl + ]; + + nativeCheckInputs = [ + git + pkg-config + zlib + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + xcbuild.xcrun + ] ++ (with python3.pkgs; [ + mock + parameterized + pytest-xdist + pytestCheckHook + webtest + ]); + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ + "conan" + ]; + + pytestFlagsArray = [ + "-n" + "$NIX_BUILD_CORES" + ]; + + disabledTests = [ + # Tests require network access + "TestFTP" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Rejects paths containing nix + "test_conditional_os" + # Requires Apple Clang + "test_detect_default_compilers" + "test_detect_default_in_mac_os_using_gcc_as_default" + # Incompatible with darwin.xattr and xcbuild from nixpkgs + "test_dot_files" + "test_xcrun" + "test_xcrun_in_required_by_tool_requires" + "test_xcrun_in_tool_requires" + ]; + + disabledTestPaths = [ + # Requires cmake, meson, autotools, apt-get, etc. + "test/functional/command/runner_test.py" + "test/functional/command/test_install_deploy.py" + "test/functional/layout/test_editable_cmake.py" + "test/functional/layout/test_editable_cmake_components.py" + "test/functional/layout/test_in_subfolder.py" + "test/functional/layout/test_source_folder.py" + "test/functional/test_local_recipes_index.py" + "test/functional/test_profile_detect_api.py" + "test/functional/toolchains/" + "test/functional/tools/scm/test_git.py" + "test/functional/tools/system/package_manager_test.py" + "test/functional/tools_versions_test.py" + "test/functional/util/test_cmd_args_to_string.py" + "test/integration/command/user_test.py" + "test/integration/command_v2/list_test.py" + "test/performance/test_large_graph.py" + "test/unittests/tools/env/test_env_files.py" + ]; + + meta = with lib; { + description = "Decentralized and portable C/C++ package manager"; + mainProgram = "conan"; + homepage = "https://conan.io"; + changelog = "https://github.com/conan-io/conan/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ HaoZeke ]; + }; +} diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/by-name/co/conceal/package.nix similarity index 100% rename from pkgs/applications/misc/conceal/default.nix rename to pkgs/by-name/co/conceal/package.nix diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/by-name/co/conda/package.nix similarity index 100% rename from pkgs/tools/package-management/conda/default.nix rename to pkgs/by-name/co/conda/package.nix diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/by-name/co/conduktor/package.nix similarity index 100% rename from pkgs/applications/misc/conduktor/default.nix rename to pkgs/by-name/co/conduktor/package.nix diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix index 733b502246a0..f0ff83fe73b6 100644 --- a/pkgs/by-name/co/conduwuit/package.nix +++ b/pkgs/by-name/co/conduwuit/package.nix @@ -6,7 +6,8 @@ bzip2, zstd, stdenv, - darwin, + apple-sdk_15, + darwinMinVersionHook, rocksdb, nix-update-script, testers, @@ -63,7 +64,9 @@ rustPlatform.buildRustPackage rec { ++ lib.optional enableJemalloc rust-jemalloc-sys' ++ lib.optional enableLiburing liburing ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security + apple-sdk_15 + # aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+ + (darwinMinVersionHook "10.15") ]; env = { diff --git a/pkgs/applications/misc/confetty/default.nix b/pkgs/by-name/co/confetty/package.nix similarity index 100% rename from pkgs/applications/misc/confetty/default.nix rename to pkgs/by-name/co/confetty/package.nix diff --git a/pkgs/tools/networking/configurable-http-proxy/default.nix b/pkgs/by-name/co/configurable-http-proxy/package.nix similarity index 100% rename from pkgs/tools/networking/configurable-http-proxy/default.nix rename to pkgs/by-name/co/configurable-http-proxy/package.nix diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/by-name/co/confluencepot/package.nix similarity index 100% rename from pkgs/servers/confluencepot/default.nix rename to pkgs/by-name/co/confluencepot/package.nix diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/by-name/co/confluent-cli/package.nix similarity index 100% rename from pkgs/development/tools/confluent-cli/default.nix rename to pkgs/by-name/co/confluent-cli/package.nix diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/by-name/co/confluent-platform/package.nix similarity index 100% rename from pkgs/servers/confluent-platform/default.nix rename to pkgs/by-name/co/confluent-platform/package.nix diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/by-name/co/conform/package.nix similarity index 100% rename from pkgs/applications/version-management/conform/default.nix rename to pkgs/by-name/co/conform/package.nix diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix new file mode 100644 index 000000000000..2fc0e95d75ee --- /dev/null +++ b/pkgs/by-name/co/conftest/package.nix @@ -0,0 +1,65 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "conftest"; + version = "0.56.0"; + + src = fetchFromGitHub { + owner = "open-policy-agent"; + repo = "conftest"; + rev = "refs/tags/v${version}"; + hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk="; + }; + vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc="; + + ldflags = [ + "-s" + "-w" + "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + postInstall = '' + installShellCompletion --cmd conftest \ + --bash <($out/bin/conftest completion bash) \ + --fish <($out/bin/conftest completion fish) \ + --zsh <($out/bin/conftest completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + export HOME="$(mktemp -d)" + $out/bin/conftest --version | grep ${version} > /dev/null + ''; + + meta = with lib; { + description = "Write tests against structured configuration data"; + mainProgram = "conftest"; + downloadPage = "https://github.com/open-policy-agent/conftest"; + homepage = "https://www.conftest.dev"; + changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${version}"; + license = licenses.asl20; + longDescription = '' + Conftest helps you write tests against structured configuration data. + Using Conftest you can write tests for your Kubernetes configuration, + Tekton pipeline definitions, Terraform code, Serverless configs or any + other config files. + + Conftest uses the Rego language from Open Policy Agent for writing the + assertions. You can read more about Rego in 'How do I write policies' in + the Open Policy Agent documentation. + ''; + maintainers = with maintainers; [ jk yurrriq ]; + }; +} diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/by-name/co/confy/package.nix similarity index 100% rename from pkgs/applications/misc/confy/default.nix rename to pkgs/by-name/co/confy/package.nix diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/by-name/co/conglomerate/package.nix similarity index 100% rename from pkgs/applications/science/biology/conglomerate/default.nix rename to pkgs/by-name/co/conglomerate/package.nix diff --git a/pkgs/applications/graphics/conjure/default.nix b/pkgs/by-name/co/conjure/package.nix similarity index 100% rename from pkgs/applications/graphics/conjure/default.nix rename to pkgs/by-name/co/conjure/package.nix diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/by-name/co/conmon-rs/package.nix similarity index 100% rename from pkgs/applications/virtualization/conmon-rs/default.nix rename to pkgs/by-name/co/conmon-rs/package.nix diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/by-name/co/conmon/package.nix similarity index 100% rename from pkgs/applications/virtualization/conmon/default.nix rename to pkgs/by-name/co/conmon/package.nix diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/by-name/co/connect/package.nix similarity index 100% rename from pkgs/tools/networking/connect/default.nix rename to pkgs/by-name/co/connect/package.nix diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix index bb1cd5c880a1..bcffc4161cc3 100644 --- a/pkgs/by-name/co/connectome-workbench/package.nix +++ b/pkgs/by-name/co/connectome-workbench/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "connectome-workbench"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Washington-University"; repo = "workbench"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-d0J5bXp6mJlUQBmInxPXPkd5P5H+3F6fE9fc8pD1fUc="; + hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg="; }; sourceRoot = "${finalAttrs.src.name}/src"; @@ -40,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: { # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv' # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line + env.NIX_CFLAGS_COMPILE = "-fpermissive"; + nativeBuildInputs = [ cmake libsForQt5.wrapQtAppsHook diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/by-name/co/conntrack-tools/package.nix similarity index 100% rename from pkgs/os-specific/linux/conntrack-tools/default.nix rename to pkgs/by-name/co/conntrack-tools/package.nix diff --git a/pkgs/tools/backup/conserve/default.nix b/pkgs/by-name/co/conserve/package.nix similarity index 100% rename from pkgs/tools/backup/conserve/default.nix rename to pkgs/by-name/co/conserve/package.nix diff --git a/pkgs/by-name/co/conserver/package.nix b/pkgs/by-name/co/conserver/package.nix new file mode 100644 index 000000000000..1c550033c3ea --- /dev/null +++ b/pkgs/by-name/co/conserver/package.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, libxcrypt +, gssapiSupport ? false +, libkrb5 +, freeipmiSupport ? false +, freeipmi +, ipv6Support ? true +, opensslSupport ? true +, openssl +, trustUdsCredSupport ? false +, udsSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "conserver"; + version = "8.2.7"; + + src = fetchFromGitHub { + owner = "bstansell"; + repo = "conserver"; + rev = "v${version}"; + sha256 = "sha256-LiCknqitBoa8E8rNMVgp1004CwkW8G4O5XGKe4NfZI8="; + }; + + # Remove upon next release since upstream is fixed + # https://github.com/bstansell/conserver/pull/82 + patches = [ + (fetchpatch { + url = "https://github.com/bstansell/conserver/commit/84fc79a459e00dbc87b8cfc943c5045bfcc7aeeb.patch"; + sha256 = "sha256:1dy8r9z7rv8512fl0rk5gi1vl02hnh7x0i6flvpcc13h6r6fhxyc"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ libxcrypt ] + ++ lib.optionals freeipmiSupport [ freeipmi ] + ++ lib.optionals gssapiSupport [ libkrb5 ] + ++ lib.optionals opensslSupport [ openssl ]; + + configureFlags = [ "--with-ccffile=/dev/null" "--with-cffile=/dev/null" ] + ++ lib.optionals freeipmiSupport [ "--with-freeipmi=${freeipmi}/include" ] + ++ lib.optionals gssapiSupport [ "--with-gssapi=${libkrb5.dev}/include" ] + ++ lib.optionals ipv6Support [ "--with-ipv6" ] + ++ lib.optionals opensslSupport [ "--with-openssl=${openssl.dev}/include" ] + ++ lib.optionals trustUdsCredSupport [ "--with-trust-uds-cred" ] + ++ lib.optionals udsSupport [ "--with-uds" ]; + + # Disabled due to exist upstream cases failing 8/15 tests + doCheck = false; + + postPatch = '' + # install -s calls the wrong strip program when cross compiling + substituteInPlace \ + console/Makefile.in conserver/Makefile.in autologin/Makefile.in contrib/chat/Makefile.in \ + --replace-fail "@INSTALL_PROGRAM@ -s" "@INSTALL_PROGRAM@" + ''; + + meta = with lib; { + homepage = "https://www.conserver.com/"; + description = "Application that allows multiple users to watch a serial console at the same time"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sarcasticadmin ]; + }; +} diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/by-name/co/console-bridge/package.nix similarity index 100% rename from pkgs/development/libraries/console-bridge/default.nix rename to pkgs/by-name/co/console-bridge/package.nix diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/by-name/co/conspy/package.nix similarity index 100% rename from pkgs/os-specific/linux/conspy/default.nix rename to pkgs/by-name/co/conspy/package.nix diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/by-name/co/consul-alerts/package.nix similarity index 100% rename from pkgs/servers/monitoring/consul-alerts/default.nix rename to pkgs/by-name/co/consul-alerts/package.nix diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/by-name/co/consul-template/package.nix similarity index 100% rename from pkgs/tools/system/consul-template/default.nix rename to pkgs/by-name/co/consul-template/package.nix diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 882b16248adb..b3e36fda0517 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.20.0"; + version = "1.20.1"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yHhaaZZ/KxQk8RVkqNfyfWTPS5K+BhckcxqdC5gN+ko="; + hash = "sha256-nYWrJB98S2zPSBu8ZIHejnLP5OQyPxpJGLdLenGHzHM="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-7Nw2zuTyAR7mzxFkeOuhbh9OAlshZA0JKOVQdckIF90="; + vendorHash = "sha256-SkDvac2mZOB6RMETv/qhjHyaCjjIYmlON42+ZZ6FTlI="; doCheck = false; diff --git a/pkgs/development/tools/container2wasm/default.nix b/pkgs/by-name/co/container2wasm/package.nix similarity index 100% rename from pkgs/development/tools/container2wasm/default.nix rename to pkgs/by-name/co/container2wasm/package.nix diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/by-name/co/containerd/package.nix similarity index 100% rename from pkgs/applications/virtualization/containerd/default.nix rename to pkgs/by-name/co/containerd/package.nix diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index 47f1cfb73e95..ab1980449c29 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-yToqJnL2T9qTGCl1MgUkg/JSWV/kEibF59lk85tAX44="; + hash = "sha256-4YSnAoQkjDpSRBMqYW8D3TzipE5Co892y5PXkcz+8xA="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-Qg6mFd5+Crsn2Xx4yg930Iueo0vfxkzrIHO4vrNFTNc="; + vendorHash = "sha256-PJQrQn7QPtUSzdlf2BYY8ARcmH6pzZgpl1oQbc98M4Y="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/by-name/co/convbin/package.nix similarity index 100% rename from pkgs/tools/misc/convbin/default.nix rename to pkgs/by-name/co/convbin/package.nix diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/by-name/co/convchain/package.nix similarity index 100% rename from pkgs/tools/graphics/convchain/default.nix rename to pkgs/by-name/co/convchain/package.nix diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/by-name/co/convertlit/package.nix similarity index 100% rename from pkgs/tools/text/convertlit/default.nix rename to pkgs/by-name/co/convertlit/package.nix diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/by-name/co/convfont/package.nix similarity index 100% rename from pkgs/tools/misc/convfont/default.nix rename to pkgs/by-name/co/convfont/package.nix diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/by-name/co/convimg/package.nix similarity index 100% rename from pkgs/tools/misc/convimg/default.nix rename to pkgs/by-name/co/convimg/package.nix diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/by-name/co/convos/package.nix similarity index 100% rename from pkgs/applications/networking/irc/convos/default.nix rename to pkgs/by-name/co/convos/package.nix diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/by-name/co/cooper-hewitt/package.nix similarity index 100% rename from pkgs/data/fonts/cooper-hewitt/default.nix rename to pkgs/by-name/co/cooper-hewitt/package.nix diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/by-name/co/coordgenlibs/package.nix similarity index 100% rename from pkgs/development/libraries/coordgenlibs/default.nix rename to pkgs/by-name/co/coordgenlibs/package.nix diff --git a/pkgs/tools/misc/copier/default.nix b/pkgs/by-name/co/copier/package.nix similarity index 100% rename from pkgs/tools/misc/copier/default.nix rename to pkgs/by-name/co/copier/package.nix diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/by-name/co/copilot-cli/package.nix similarity index 100% rename from pkgs/tools/admin/copilot-cli/default.nix rename to pkgs/by-name/co/copilot-cli/package.nix diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/by-name/co/copper/package.nix similarity index 100% rename from pkgs/development/compilers/copper/default.nix rename to pkgs/by-name/co/copper/package.nix diff --git a/pkgs/by-name/co/coppwr/Cargo.lock b/pkgs/by-name/co/coppwr/Cargo.lock index c1be56da8ccb..d27a2999b322 100644 --- a/pkgs/by-name/co/coppwr/Cargo.lock +++ b/pkgs/by-name/co/coppwr/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.25" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,84 +20,103 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.3" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" +checksum = "99b76d84ee70e30a4a7e39ab9018e2b17a6a09e31084176cc7c0b2dec036ba45" dependencies = [ "enumn", "serde", ] [[package]] -name = "accesskit_consumer" -version = "0.16.1" +name = "accesskit_atspi_common" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" +checksum = "f5393c75d4666f580f4cac0a968bc97c36076bb536a129f28210dac54ee127ed" dependencies = [ "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant", +] + +[[package]] +name = "accesskit_consumer" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a12dc159d52233c43d9fe5415969433cbdd52c3d6e0df51bda7d447427b9986" +dependencies = [ + "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.10.1" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" +checksum = "bfc6c1ecd82053d127961ad80a8beaa6004fb851a3a5b96506d7a6bd462403f6" dependencies = [ "accesskit", "accesskit_consumer", - "objc2 0.3.0-beta.3.patch-leaks.3", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.6.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f46c18d99ba61ad7123dd13eeb0c104436ab6af1df6a1cd8c11054ed394a08" +checksum = "be7f5cf6165be10a54b2655fa2e0e12b2509f38ed6fc43e11c31fdb7ee6230bb" dependencies = [ "accesskit", - "accesskit_consumer", + "accesskit_atspi_common", "async-channel", - "async-once-cell", + "async-executor", + "async-task", "atspi", - "futures-lite 1.13.0", - "once_cell", + "futures-lite", + "futures-util", "serde", "zbus", ] [[package]] name = "accesskit_windows" -version = "0.15.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" +checksum = "974e96c347384d9133427167fb8a58c340cb0496988dacceebdc1ed27071023b" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] name = "accesskit_winit" -version = "0.16.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284218aca17d9e150164428a0ebc7b955f70e3a9a78b4c20894513aabf98a67" +checksum = "aea3522719f1c44564d03e9469a8e2f3a98b3a8a880bd66d0789c6b9c4a669dd" dependencies = [ "accesskit", "accesskit_macos", "accesskit_unix", "accesskit_windows", + "raw-window-handle", "winit", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -130,12 +149,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -144,7 +163,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -176,19 +195,19 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arboard" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win", "log", - "objc2 0.5.1", + "objc2", "objc2-app-kit", "objc2-foundation", "parking_lot", @@ -197,15 +216,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -215,20 +234,20 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] name = "ashpd" -version = "0.7.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -242,119 +261,79 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", + "fastrand", + "futures-lite", "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 3.3.0", + "async-lock", "blocking", - "futures-lite 2.3.0", + "futures-lite", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[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", ] @@ -364,32 +343,28 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.2", + "async-io", "blocking", - "futures-lite 2.3.0", + "futures-lite", ] -[[package]] -name = "async-once-cell" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" - [[package]] name = "async-process" -version = "1.8.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", ] [[package]] @@ -400,25 +375,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -429,13 +404,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -446,9 +421,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atspi" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +checksum = "be534b16650e35237bb1ed189ba2aab86ce65e88cc84c66f4935ba38575cecbf" dependencies = [ "atspi-common", "atspi-connection", @@ -457,46 +432,49 @@ dependencies = [ [[package]] name = "atspi-common" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +checksum = "1909ed2dc01d0a17505d89311d192518507e8a056a48148e3598fef5e7bb6ba7" dependencies = [ "enumflags2", "serde", "static_assertions", "zbus", + "zbus-lockstep", + "zbus-lockstep-macros", "zbus_names", "zvariant", ] [[package]] name = "atspi-connection" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +checksum = "430c5960624a4baaa511c9c0fcc2218e3b58f5dbcc47e6190cafee344b873333" dependencies = [ "atspi-common", "atspi-proxies", - "futures-lite 1.13.0", + "futures-lite", "zbus", ] [[package]] name = "atspi-proxies" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +checksum = "a5e6c5de3e524cf967569722446bcd458d5032348554d9a17d7d72b041ab7496" dependencies = [ "atspi-common", "serde", "zbus", + "zvariant", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "base64" @@ -506,12 +484,12 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "annotate-snippets", - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -522,23 +500,23 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -548,9 +526,9 @@ 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" dependencies = [ "serde", ] @@ -570,64 +548,25 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys 0.3.3", -] - [[package]] name = "block2" -version = "0.2.0-alpha.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys 0.1.0-beta.1", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys 0.2.1", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" -dependencies = [ - "objc2 0.5.1", + "objc2", ] [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", ] @@ -639,22 +578,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -664,46 +603,52 @@ 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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", - "polling 3.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", "thiserror", ] [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", - "rustix 0.38.34", + "rustix", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.0.96" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -743,6 +688,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "cgl" version = "0.3.2" @@ -754,54 +705,24 @@ dependencies = [ [[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", - "libloading 0.8.3", + "libloading", ] [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "codespan-reporting" version = "0.11.1" @@ -812,12 +733,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "com" version = "0.6.0" @@ -888,7 +803,7 @@ dependencies = [ [[package]] name = "coppwr" -version = "1.6.0" +version = "1.6.1" dependencies = [ "ashpd", "eframe", @@ -912,10 +827,20 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "core-foundation" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -924,7 +849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "core-graphics-types", "foreign-types", "libc", @@ -937,24 +862,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[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", ] @@ -980,9 +905,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 = "crypto-common" @@ -1000,17 +925,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "digest" version = "0.10.7" @@ -1021,27 +935,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "directories-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dispatch" version = "0.2.0" @@ -1054,14 +947,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -1073,70 +966,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] -name = "duplicate" -version = "1.0.0" +name = "dpi" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] +name = "duplicate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97af9b5f014e228b33e77d75ee0e6e87960124f0f4b16337b586a6bec91867b1" dependencies = [ - "heck 0.4.1", - "proc-macro-error", + "heck", + "proc-macro2", + "proc-macro2-diagnostics", ] [[package]] name = "ecolor" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" +checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b" dependencies = [ "bytemuck", + "emath", "serde", ] [[package]] name = "eframe" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e2ccef6bbcec71dbc542f7eed64a5846fc3076727f5746da8fd307c91bab2" +checksum = "8ac2645a9bf4826eb4e91488b1f17b8eaddeef09396706b2f14066461338e24f" dependencies = [ + "ahash", "bytemuck", - "cocoa", - "directories-next", "document-features", "egui", "egui-wgpu", "egui-winit", "egui_glow", - "glow", + "glow 0.14.2", "glutin", "glutin-winit", + "home", "image", "js-sys", "log", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.1", + "raw-window-handle", "ron", "serde", "static_assertions", - "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "web-time", "winapi", + "windows-sys 0.52.0", "winit", ] [[package]] name = "egui" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" +checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974" dependencies = [ "accesskit", "ahash", + "emath", "epaint", "log", "nohash-hasher", @@ -1146,10 +1049,11 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" +checksum = "d00fd5d06d8405397e64a928fa0ef3934b3c30273ea7603e3dc4627b1f7a1a82" dependencies = [ + "ahash", "bytemuck", "document-features", "egui", @@ -1164,15 +1068,16 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609" +checksum = "0a9c430f4f816340e8e8c1b20eec274186b1be6bc4c7dfc467ed50d57abc36c6" dependencies = [ "accesskit_winit", + "ahash", "arboard", "egui", "log", - "raw-window-handle 0.6.1", + "raw-window-handle", "serde", "smithay-clipboard", "web-time", @@ -1182,9 +1087,9 @@ dependencies = [ [[package]] name = "egui_dock" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b8d9a54c0ed60f2670ad387c269663b4771431f090fa586906cf5f0bc586f4" +checksum = "2fe4e3414481dea5ed59fdfa88f2e00b6ea60fbe758ca7a8636d0dbed93ab9cf" dependencies = [ "duplicate", "egui", @@ -1194,15 +1099,16 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e5d975f3c86edc3d35b1db88bb27c15dde7c55d3b5af164968ab5ede3f44ca" +checksum = "0e39bccc683cd43adab530d8f21a13eb91e80de10bcc38c3f1c16601b6f62b26" dependencies = [ + "ahash", "bytemuck", "egui", - "glow", + "glow 0.14.2", "log", - "memoffset 0.9.1", + "memoffset", "wasm-bindgen", "web-sys", "winit", @@ -1211,7 +1117,7 @@ dependencies = [ [[package]] name = "egui_node_graph" version = "0.4.0" -source = "git+https://github.com/dimtpap/egui_node_graph.git?rev=3e99a2af2025e72365a4ec5048011041a85002e5#3e99a2af2025e72365a4ec5048011041a85002e5" +source = "git+https://github.com/dimtpap/egui_node_graph.git?rev=87b3f084c1cf70ac9ad489ae1f2e2a8234efdde4#87b3f084c1cf70ac9ad489ae1f2e2a8234efdde4" dependencies = [ "egui", "slotmap", @@ -1221,34 +1127,42 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7854b86dc1c2d352c5270db3d600011daa913d6b554141a03939761323288a1" +checksum = "d8dca4871c15d51aadb79534dcf51a8189e5de3426ee7b465eb7db9a0a81ea67" dependencies = [ + "ahash", "egui", + "emath", ] [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" +checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3" dependencies = [ "bytemuck", "serde", ] [[package]] -name = "enumflags2" -version = "0.7.9" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1256,37 +1170,38 @@ 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.60", + "syn 2.0.82", ] [[package]] name = "enumn" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] name = "epaint" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" +checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f" dependencies = [ "ab_glyph", "ahash", "bytemuck", "ecolor", "emath", + "epaint_default_fonts", "log", "nohash-hasher", "parking_lot", @@ -1294,6 +1209,12 @@ dependencies = [ "serde", ] +[[package]] +name = "epaint_default_fonts" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea" + [[package]] name = "equivalent" version = "1.0.1" @@ -1302,9 +1223,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", @@ -1312,98 +1233,51 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[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 = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[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" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1427,7 +1301,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -1447,9 +1321,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1462,9 +1336,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1472,15 +1346,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1489,24 +1363,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1514,7 +1373,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand", "futures-core", "futures-io", "parking", @@ -1523,32 +1382,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1584,9 +1443,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1623,56 +1482,69 @@ dependencies = [ ] [[package]] -name = "glutin" -version = "0.31.3" +name = "glow" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" dependencies = [ - "bitflags 2.5.0", - "cfg_aliases", + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec69412a0bf07ea7607e638b415447857a808846c2b685a43c8aa18bc6d5e499" +dependencies = [ + "bitflags 2.6.0", + "cfg_aliases 0.2.1", "cgl", - "core-foundation", + "core-foundation 0.9.4", "dispatch", "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "icrate", - "libloading 0.8.3", - "objc2 0.4.1", + "libloading", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "raw-window-handle 0.5.2", + "raw-window-handle", "wayland-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", ] [[package]] name = "glutin-winit" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" dependencies = [ - "cfg_aliases", + "cfg_aliases 0.2.1", "glutin", - "raw-window-handle 0.5.2", + "raw-window-handle", "winit", ] [[package]] name = "glutin_egl_sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +checksum = "cae99fff4d2850dbe6fb8c1fa8e4fead5525bab715beaacfccf3fb994e01c827" dependencies = [ "gl_generator", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "glutin_glx_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63" dependencies = [ "gl_generator", "x11-dl", @@ -1680,9 +1552,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -1693,7 +1565,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -1703,14 +1575,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -1721,22 +1593,22 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1749,27 +1621,27 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hassle-rs" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading", "thiserror", "widestring", "winapi", ] -[[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" @@ -1778,9 +1650,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1803,17 +1675,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - [[package]] name = "idna" version = "0.5.0" @@ -1826,45 +1687,33 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", - "byteorder", - "color_quant", + "byteorder-lite", "num-traits", "png", ] [[package]] -name = "indexmap" -version = "2.2.6" +name = "immutable-chunkmap" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", + "hashbrown 0.15.0", ] [[package]] @@ -1900,18 +1749,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1923,7 +1772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading", "pkg-config", ] @@ -1935,9 +1784,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[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" @@ -1947,39 +1796,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.5", -] - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.5.0", - "libc", - "redox_syscall 0.4.1", + "windows-targets 0.52.6", ] [[package]] @@ -1988,8 +1816,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] @@ -1997,7 +1826,7 @@ name = "libspa" version = "0.8.0" source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "convert_case", "cookie-factory", @@ -2020,15 +1849,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litrs" @@ -2048,9 +1871,9 @@ 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 = "malloc_buf" @@ -2063,28 +1886,19 @@ 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" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2096,11 +1910,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -2117,27 +1931,28 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", "simd-adler32", ] [[package]] name = "naga" -version = "0.19.2" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", "rustc-hash", "spirv", "termcolor", @@ -2147,17 +1962,16 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.1", + "raw-window-handle", "thiserror", ] @@ -2177,15 +1991,12 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.26.4" +name = "ndk-sys" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", + "jni-sys", ] [[package]] @@ -2194,11 +2005,24 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", + "memoffset", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -2217,32 +2041,32 @@ 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", ] [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -2252,128 +2076,224 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] name = "objc-sys" -version = "0.2.0-beta.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - -[[package]] -name = "objc-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "block2 0.2.0-alpha.6", - "objc-sys 0.2.0-beta.2", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys 0.3.3", - "objc2-encode 3.0.0", -] - -[[package]] -name = "objc2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" -dependencies = [ - "objc-sys 0.3.3", - "objc2-encode 4.0.1", + "objc-sys", + "objc2-encode", ] [[package]] name = "objc2-app-kit" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "block2 0.5.0", - "objc2 0.5.1", + "bitflags 2.6.0", + "block2", + "libc", + "objc2", "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", "objc2-foundation", ] [[package]] name = "objc2-core-data" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "block2 0.5.0", - "objc2 0.5.1", + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", "objc2-foundation", ] [[package]] name = "objc2-encode" -version = "2.0.0-pre.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - -[[package]] -name = "objc2-encode" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] name = "objc2-foundation" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "block2 0.5.0", - "objc2 0.5.1", + "bitflags 2.6.0", + "block2", + "dispatch", + "libc", + "objc2", ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "cc", + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "orbclient" -version = "0.3.47" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" dependencies = [ - "libredox 0.0.2", + "libredox", ] [[package]] @@ -2388,24 +2308,24 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ "ttf-parser", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2419,16 +2339,16 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.7", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[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 = "percent-encoding" @@ -2436,6 +2356,26 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pin-project" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.82", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2450,12 +2390,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand", "futures-io", ] @@ -2465,7 +2405,7 @@ version = "0.8.0" source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libspa", "libspa-sys", @@ -2487,15 +2427,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2506,33 +2446,17 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.34", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2543,9 +2467,12 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -2555,76 +2482,65 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -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", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.15" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.82", + "version_check", + "yansi", +] + +[[package]] +name = "profiling" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2661,15 +2577,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -2691,15 +2601,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2711,29 +2612,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox 0.1.3", - "thiserror", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -2743,9 +2633,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -2754,9 +2644,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -2771,7 +2661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -2784,28 +2674,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -2832,9 +2708,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", @@ -2845,22 +2721,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.211" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "1ac55e59090389fb9f0dd9e0f3c09615afed1d19094284d0b200441f13550793" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.211" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "54be4f245ce16bc58d57ef2716271d0d4519e0f6defa147f6e081005bcb278ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -2871,14 +2747,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2941,18 +2817,18 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2", - "rustix 0.38.34", + "rustix", "thiserror", "wayland-backend", "wayland-client", @@ -2966,9 +2842,9 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", "smithay-client-toolkit", @@ -2977,30 +2853,20 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3028,9 +2894,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -3044,7 +2910,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", @@ -3052,20 +2918,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -3079,22 +2946,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -3124,9 +2991,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", ] @@ -3139,58 +3006,36 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.7", + "winnow", ] [[package]] @@ -3212,7 +3057,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", ] [[package]] @@ -3226,9 +3071,9 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "type-map" @@ -3251,55 +3096,55 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[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", @@ -3315,15 +3160,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" - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3343,34 +3182,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3380,9 +3220,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3390,32 +3230,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.82", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -3423,12 +3263,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", + "bitflags 2.6.0", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -3439,29 +3279,29 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -3469,11 +3309,11 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -3482,11 +3322,11 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -3495,20 +3335,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.36.2", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -3518,9 +3358,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -3528,9 +3368,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -3538,35 +3378,36 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.15" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923" dependencies = [ - "core-foundation", + "block2", + "core-foundation 0.10.0", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2", + "objc2-foundation", "url", "web-sys", ] [[package]] name = "wgpu" -version = "0.19.4" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "parking_lot", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -3579,43 +3420,42 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.4" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", - "cfg_aliases", - "codespan-reporting", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", "indexmap", "log", "naga", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bitflags 2.5.0", - "cfg_aliases", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "core-graphics-types", - "glow", + "glow 0.13.1", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", @@ -3624,16 +3464,16 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading", "log", "metal", "naga", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -3646,11 +3486,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -3679,11 +3519,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3692,25 +3532,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", - "windows-targets 0.52.5", + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -3719,29 +3558,61 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.82", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.82", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3753,22 +3624,22 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -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", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3803,18 +3674,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -3831,9 +3702,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3849,9 +3720,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3867,15 +3738,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3891,9 +3762,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3909,9 +3780,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3927,9 +3798,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3945,44 +3816,47 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2", "bytemuck", "calloop", - "cfg_aliases", - "core-foundation", + "cfg_aliases 0.2.1", + "concurrent-queue", + "core-foundation 0.9.4", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.1", - "redox_syscall 0.3.5", - "rustix 0.38.34", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -3992,7 +3866,7 @@ dependencies = [ "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4000,18 +3874,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -4036,9 +3901,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", - "rustix 0.38.34", + "rustix", "x11rb-protocol", ] @@ -4050,18 +3915,18 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4070,7 +3935,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -4079,15 +3944,21 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yansi-term" @@ -4100,30 +3971,27 @@ dependencies = [ [[package]] name = "zbus" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-fs", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -4132,7 +4000,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4140,24 +4008,47 @@ dependencies = [ ] [[package]] -name = "zbus_macros" -version = "3.15.2" +name = "zbus-lockstep" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "4ca2c5dceb099bddaade154055c926bb8ae507a18756ba1d8963fd7b51d8ed1d" +dependencies = [ + "zbus_xml", + "zvariant", +] + +[[package]] +name = "zbus-lockstep-macros" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709ab20fc57cb22af85be7b360239563209258430bccf38d8b979c5a2ae3ecce" dependencies = [ - "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.82", + "zbus-lockstep", + "zbus_xml", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.82", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -4165,34 +4056,47 @@ dependencies = [ ] [[package]] -name = "zerocopy" -version = "0.7.32" +name = "zbus_xml" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ab3f374552b954f6abb4bd6ce979e6c9b38fb9d0cd7cc68a7d796e70c9f3a233" dependencies = [ + "quick-xml 0.30.0", + "serde", + "static_assertions", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", "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.60", + "syn 2.0.82", ] [[package]] name = "zvariant" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -4201,24 +4105,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.82", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.82", ] diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 78c692181f4e..47e99a96f202 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -1,30 +1,31 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libxkbcommon -, pipewire -, libGL -, wayland -, xorg -, vulkan-loader +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libxkbcommon, + pipewire, + vulkan-loader, + wayland, + libGL, + xorg, }: rustPlatform.buildRustPackage rec { pname = "coppwr"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "dimtpap"; repo = "coppwr"; rev = version; - hash = "sha256-7z1b++itHoqVX5KB9gv6dMAzq1j7VDGYzuJArUDPlD4="; + hash = "sha256-5TgK/0UN05P3WENch4sBo/Sy9FaMmyH/gZ+6qUyM1z0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "egui_node_graph-0.4.0" = "sha256-VtHgKWh+bHSFltNgYaFmYhZW9tqwiWJjiCCspeKgSXQ="; + "egui_node_graph-0.4.0" = "sha256-OajIef0tSuZ5bFauAeHtN/LQlo+k7k9g0azHDk3HOQc="; "libspa-0.8.0" = "sha256-X8mwLtuPuMxZY71GNPAgiJGJ9JNMj7AbCliXiBxJ4vQ="; }; }; @@ -37,13 +38,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libxkbcommon pipewire - libGL + vulkan-loader wayland + libGL xorg.libXcursor xorg.libXi xorg.libXrandr xorg.libX11 - vulkan-loader ]; preBuild = '' @@ -64,15 +65,21 @@ rustPlatform.buildRustPackage rec { postFixup = '' patchelf $out/bin/coppwr \ - --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]} + --add-rpath ${ + lib.makeLibraryPath [ + libGL + libxkbcommon + wayland + ] + } ''; - meta = with lib; { + meta = { description = "Low level control GUI for the PipeWire multimedia server"; homepage = "https://github.com/dimtpap/coppwr"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ravenz46 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ravenz46 ]; mainProgram = "coppwr"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/by-name/co/copyright-update/package.nix similarity index 100% rename from pkgs/tools/text/copyright-update/default.nix rename to pkgs/by-name/co/copyright-update/package.nix diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/by-name/co/coq2html/package.nix similarity index 100% rename from pkgs/tools/typesetting/coq2html/default.nix rename to pkgs/by-name/co/coq2html/package.nix diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/by-name/co/cordless/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/cordless/default.nix rename to pkgs/by-name/co/cordless/package.nix diff --git a/pkgs/development/mobile/cordova/default.nix b/pkgs/by-name/co/cordova/package.nix similarity index 100% rename from pkgs/development/mobile/cordova/default.nix rename to pkgs/by-name/co/cordova/package.nix diff --git a/pkgs/by-name/co/corectrl/package.nix b/pkgs/by-name/co/corectrl/package.nix new file mode 100644 index 000000000000..eb8437ae5a05 --- /dev/null +++ b/pkgs/by-name/co/corectrl/package.nix @@ -0,0 +1,90 @@ +{ + botan3, + extra-cmake-modules, + fetchFromGitLab, + hwdata, + lib, + libdrm, + libsForQt5, + mesa-demos, + polkit, + procps, + pugixml, + spdlog, + stdenv, + util-linux, + vulkan-tools, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "corectrl"; + version = "1.4.2"; + + src = fetchFromGitLab { + owner = "corectrl"; + repo = "corectrl"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4="; + }; + + nativeBuildInputs = [ + extra-cmake-modules + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + botan3 + libdrm # TODO: report upstream that libdrm is not detected at configure time + libsForQt5.karchive + libsForQt5.kauth + libsForQt5.qtbase + libsForQt5.qtcharts + libsForQt5.qtquickcontrols2 + libsForQt5.qtsvg + libsForQt5.qttools + libsForQt5.qtxmlpatterns + libsForQt5.quazip + mesa-demos + polkit + procps + pugixml + spdlog + util-linux + vulkan-tools + ]; + + patches = [ + ./polkit-dir.patch + ]; + + cmakeFlags = [ + "-DINSTALL_DBUS_FILES_IN_PREFIX=true" + "-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions" + "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" + ]; + + runtimeInputs = [ + hwdata + mesa-demos + procps + util-linux + vulkan-tools + ]; + + qrWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs}" + ]; + + meta = { + homepage = "https://gitlab.com/corectrl/corectrl/"; + description = "Control your computer hardware via application profiles"; + longDescription = '' + CoreCtrl is a Free and Open Source GNU/Linux application that allows you + to control with ease your computer hardware using application profiles. It + aims to be flexible, comfortable and accessible to regular users. + ''; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Scrumplex ]; + }; +}) diff --git a/pkgs/applications/misc/corectrl/polkit-dir.patch b/pkgs/by-name/co/corectrl/polkit-dir.patch similarity index 100% rename from pkgs/applications/misc/corectrl/polkit-dir.patch rename to pkgs/by-name/co/corectrl/polkit-dir.patch diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/by-name/co/coredns/package.nix similarity index 100% rename from pkgs/servers/dns/coredns/default.nix rename to pkgs/by-name/co/coredns/package.nix diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/by-name/co/coreth/package.nix similarity index 100% rename from pkgs/applications/networking/coreth/default.nix rename to pkgs/by-name/co/coreth/package.nix diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/by-name/co/corkscrew/package.nix similarity index 100% rename from pkgs/tools/networking/corkscrew/default.nix rename to pkgs/by-name/co/corkscrew/package.nix diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 7d1b6d502d17..fb7755e36416 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, fetchNpmDeps, - fetchpatch, pkg-config, nodejs, npmHooks, @@ -12,24 +11,16 @@ buildGoModule rec { pname = "coroot"; - version = "1.5.9"; + version = "1.5.11"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-z6eD+qAdwu7DoyKTlAQqucdWRtT+h4qCPt0eTQceYXw="; + hash = "sha256-lHzTKmD3HCwosvs1x6XxmRdiW/ENNGQiR0hzWzdU8EM="; }; - # github.com/grafana/pyroscope-go/godeltaprof 0.1.6 is broken on go 1.23 - # use patch from https://github.com/coroot/coroot/pull/357 until it gets fixed - patches = [ - (fetchpatch { - url = "https://github.com/coroot/coroot/commit/9bf6ac0ad4dfaa7f13e6d9b5ce5e331d1478aafc.patch"; - hash = "sha256-5otqdYyQ57sNjF84CRgx0wcztsRdTdsNuhEkvGyw7UE="; - }) - ]; - vendorHash = "sha256-W0UNw8FEIHDKQDCjBryDSJB/UhNyAtMxC6A/9lr79sg="; + vendorHash = "sha256-YqZHhoaAgubI2+O2CTULXeQocLaz9WGpWRhETIzU7MU="; npmDeps = fetchNpmDeps { src = "${src}/front"; hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ="; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/by-name/co/corosync/package.nix similarity index 100% rename from pkgs/servers/corosync/default.nix rename to pkgs/by-name/co/corosync/package.nix diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/by-name/co/corrosion/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/corrosion/default.nix rename to pkgs/by-name/co/corrosion/package.nix diff --git a/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch b/pkgs/by-name/co/corsix-th/darwin-cmake-no-fixup-bundle.patch similarity index 100% rename from pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch rename to pkgs/by-name/co/corsix-th/darwin-cmake-no-fixup-bundle.patch diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix new file mode 100644 index 000000000000..fd5260679ce7 --- /dev/null +++ b/pkgs/by-name/co/corsix-th/package.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, curl +, doxygen +, ffmpeg +, freetype +, lua +, makeWrapper +, SDL2 +, SDL2_mixer +, timidity +# Darwin dependencies +, libiconv +, apple-sdk_11 +# Update +, nix-update-script +}: + +stdenv.mkDerivation(finalAttrs: { + pname = "corsix-th"; + version = "0.68.0"; + + src = fetchFromGitHub { + owner = "CorsixTH"; + repo = "CorsixTH"; + rev = "v${finalAttrs.version}"; + hash = "sha256-D8ks+fiFJxwClqW1aNtGGa5UxAFvuH2f2guwPxOEQwI="; + }; + + patches = [ + ./darwin-cmake-no-fixup-bundle.patch + ]; + + nativeBuildInputs = [ cmake doxygen makeWrapper ]; + + buildInputs = let + luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]); + in [ + curl + ffmpeg + freetype + lua + luaEnv + SDL2 + SDL2_mixer + timidity + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + + cmakeFlags = [ "-Wno-dev" ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/corsix-th \ + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/CorsixTH.app $out/Applications + wrapProgram $out/Applications/CorsixTH.app/Contents/MacOS/CorsixTH \ + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Reimplementation of the 1997 Bullfrog business sim Theme Hospital"; + mainProgram = "corsix-th"; + homepage = "https://corsixth.com/"; + license = licenses.mit; + maintainers = with maintainers; [ hughobrien matteopacini ]; + platforms = platforms.linux ++ platforms.darwin; + }; +}) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 09e457dc8557..d90047e3be51 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -83,8 +83,7 @@ rustPlatform.buildRustPackage rec { "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - # Use default stdenv installPhase, not the buildRustPackage one. - installPhase = "installPhase"; + dontCargoInstall = true; # These libraries are only used by the X11 backend, which will not # be the common case, so just make them available, don't link them. diff --git a/pkgs/by-name/co/cosmic-edit/Cargo.lock b/pkgs/by-name/co/cosmic-edit/Cargo.lock index 908e65e54c1b..cc3a91847999 100644 --- a/pkgs/by-name/co/cosmic-edit/Cargo.lock +++ b/pkgs/by-name/co/cosmic-edit/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.28" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,43 +20,53 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" + +[[package]] +name = "accesskit_atspi_common" +version = "0.9.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant 3.15.2", +] [[package]] name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.24.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.2", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.12.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", + "accesskit_atspi_common", "atspi", "futures-lite 1.13.0", - "futures-util", - "once_cell", "serde", "tokio", "tokio-stream", @@ -65,21 +75,20 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_macos", @@ -91,9 +100,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -163,9 +172,9 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.6.0", @@ -177,7 +186,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -205,9 +214,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -220,43 +229,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "apply" @@ -314,11 +323,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -327,7 +336,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -342,9 +351,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "enumflags2", "futures-channel", @@ -404,18 +413,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" @@ -460,7 +457,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "tracing", "windows-sys 0.59.0", @@ -510,7 +507,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.48.0", ] @@ -529,7 +526,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", ] @@ -541,7 +538,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -556,7 +553,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.38", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -570,13 +567,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -590,7 +587,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "tempfile", "windows-sys 0.48.0", ] @@ -645,9 +642,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -696,18 +693,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -745,42 +742,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.2", -] - [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2", ] [[package]] @@ -827,22 +795,22 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -853,9 +821,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -878,20 +846,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.37", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -901,40 +855,28 @@ dependencies = [ "bitflags 2.6.0", "log", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix 0.38.37", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", - "rustix 0.38.37", + "calloop", + "rustix 0.38.38", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.21" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1013,7 +955,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "objc", "objc-foundation", @@ -1023,7 +965,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "dnd", "mime 0.1.0", @@ -1033,7 +975,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "thiserror", "x11rb", @@ -1087,9 +1029,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "com" @@ -1210,7 +1152,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1229,7 +1171,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "quote", "syn 1.0.109", @@ -1259,7 +1201,6 @@ dependencies = [ "regex", "rust-embed", "serde", - "smol_str", "syntect", "tokio", "two-face", @@ -1269,7 +1210,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#774ccf955f59f24cf9493f9249d20788ad394d48" +source = "git+https://github.com/pop-os/cosmic-files.git#20f9292e7925da20086c7f1f3c8e3a8d03d63b99" dependencies = [ "chrono", "dirs", @@ -1293,15 +1234,14 @@ dependencies = [ "once_cell", "open", "paste", - "rayon", "recently-used-xbel", "regex", "rust-embed", "serde", "shlex", "slotmap", - "smol_str", "tar", + "tempfile", "tokio", "trash", "unix_permissions_ext", @@ -1330,13 +1270,13 @@ source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768 dependencies = [ "bitflags 2.6.0", "cosmic_undo_2", - "fontdb", + "fontdb 0.16.2", "log", "modit", "rangemap", "rayon", - "rustc-hash", - "rustybuzz 0.14.1", + "rustc-hash 1.1.0", + "rustybuzz", "self_cell 1.0.4", "smol_str", "swash", @@ -1352,7 +1292,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "almost", "cosmic-config", @@ -1490,11 +1430,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading", "winapi", ] @@ -1519,7 +1460,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1530,7 +1471,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1540,7 +1481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.10", @@ -1586,7 +1527,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1598,7 +1539,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1668,7 +1609,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1677,7 +1618,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading", ] [[package]] @@ -1692,21 +1633,35 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" + [[package]] name = "drm" version = "0.11.1" @@ -1717,7 +1672,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1727,7 +1682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1754,9 +1709,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1776,17 +1731,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-repr" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enumflags2" version = "0.7.10" @@ -1805,7 +1749,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1962,30 +1906,31 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" dependencies = [ "simd-adler32", ] [[package]] name = "file-id" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" +checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "filetime" -version = "0.2.24" -source = "git+https://github.com/jackpot51/filetime#186e19d3190ead16b05329400cb5b2350d8f44cf" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "libredox 0.1.3", + "libredox", "windows-sys 0.59.0", ] @@ -2000,9 +1945,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -2013,9 +1958,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -2043,7 +1985,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -2069,9 +2011,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "spin", ] @@ -2084,9 +2026,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" dependencies = [ "bytemuck", ] @@ -2097,7 +2039,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.20.0", + "roxmltree", ] [[package]] @@ -2114,6 +2056,20 @@ dependencies = [ "ttf-parser 0.20.0", ] +[[package]] +name = "fontdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.5", + "slotmap", + "tinyvec", + "ttf-parser 0.21.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -2132,7 +2088,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2208,9 +2164,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2223,9 +2179,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2233,15 +2189,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2251,9 +2207,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2285,32 +2241,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2355,16 +2311,6 @@ dependencies = [ "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 = "gif" version = "0.13.1" @@ -2377,9 +2323,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gl_generator" @@ -2394,9 +2340,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glob" @@ -2431,24 +2377,13 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2470,9 +2405,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2483,20 +2418,20 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ "bitflags 2.6.0", ] @@ -2630,6 +2565,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hassle-rs" version = "0.11.0" @@ -2639,7 +2580,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading", "thiserror", "widestring", "winapi", @@ -2743,21 +2684,21 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.77", + "syn 2.0.85", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +checksum = "0f2cc0e0523d1fe6fc2c6f66e5038624ea8091b3e7748b5e8e0c84b1698db6c2" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2785,15 +2726,14 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", "iced_renderer", - "iced_sctk", "iced_widget", "iced_winit", "image", @@ -2805,57 +2745,70 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "accesskit", - "accesskit_unix", "accesskit_winit", ] [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", + "bytes", "dnd", + "glam", "iced_accessibility", "log", "mime 0.1.0", "num-traits", + "once_cell", "palette", "raw-window-handle", + "rustc-hash 2.0.0", "serde", - "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", "window_clipboard", - "xxhash-rust", ] [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "futures", "iced_core", "log", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", ] +[[package]] +name = "iced_glyphon" +version = "0.6.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -2865,16 +2818,15 @@ dependencies = [ "lyon_path", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", - "xxhash-rust", ] [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2885,96 +2837,61 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ + "bytes", "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.2", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_sctk" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "enum-repr", - "float-cmp", - "futures", - "iced_accessibility", - "iced_futures", - "iced_graphics", - "iced_runtime", - "iced_style", - "itertools", - "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.2", "thiserror", - "tracing", - "wayland-backend", - "wayland-protocols 0.32.4", "window_clipboard", - "xkbcommon", - "xkbcommon-dl", - "xkeysym", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "iced_core", - "once_cell", - "palette", ] [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", - "kurbo", + "kurbo 0.10.4", "log", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", - "xxhash-rust", ] [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.37", - "smithay-client-toolkit 0.19.2", + "rustc-hash 2.0.0", + "rustix 0.38.38", + "smithay-client-toolkit", + "thiserror", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-sys", "wgpu", "x11rb", @@ -2982,16 +2899,17 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_renderer", "iced_runtime", - "iced_style", "num-traits", + "once_cell", "ouroboros", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", "window_clipboard", @@ -2999,44 +2917,25 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", + "iced_futures", "iced_graphics", "iced_runtime", - "iced_style", "log", + "rustc-hash 2.0.0", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.2", -] - [[package]] name = "icu_collator" version = "1.5.0" @@ -3177,7 +3076,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3222,7 +3121,7 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.13.1", + "gif", "jpeg-decoder", "num-traits", "png", @@ -3237,13 +3136,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] -name = "indexmap" -version = "2.5.0" +name = "immutable-chunkmap" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec 0.7.6", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -3416,9 +3324,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3439,7 +3347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.5", + "libloading", "pkg-config", ] @@ -3480,11 +3388,22 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec 0.7.6", + "smallvec", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec 0.7.6", + "smallvec", ] [[package]] @@ -3514,17 +3433,17 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "apply", - "ashpd 0.9.1", + "ashpd 0.9.2", "chrono", "cosmic-config", "cosmic-theme", @@ -3538,8 +3457,6 @@ dependencies = [ "iced_futures", "iced_renderer", "iced_runtime", - "iced_sctk", - "iced_style", "iced_tiny_skia", "iced_wgpu", "iced_widget", @@ -3555,19 +3472,10 @@ dependencies = [ "tracing", "unicode-segmentation", "url", + "ustr", "zbus 4.4.0", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.5" @@ -3580,20 +3488,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -3603,7 +3500,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -3636,6 +3533,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" @@ -3673,12 +3576,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" -dependencies = [ - "hashbrown", -] +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" [[package]] name = "lyon" @@ -3702,9 +3602,9 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570" dependencies = [ "arrayvec 0.7.6", "euclid", @@ -3713,9 +3613,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" +checksum = "8e0b8aec2f58586f6eef237985b9a9b7cb3a3aff4417c575075cf95bf925252e" dependencies = [ "lyon_geom", "num-traits", @@ -3795,9 +3695,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -3811,7 +3711,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "smithay-clipboard", ] @@ -3845,7 +3745,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -3855,6 +3754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -3883,9 +3783,9 @@ dependencies = [ [[package]] name = "modit" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa21838a18a88208e85015452ef542b4fb5ce0be3dc635331df56874af16c13c" +checksum = "7dfa19a1eabc3418aab2e905785d347386cb0f1ed3fbb34957460b2f685ef359" dependencies = [ "log", ] @@ -3898,18 +3798,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec 0.7.6", "bit-set", "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3918,14 +3819,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -3946,6 +3847,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.26.4" @@ -4024,9 +3934,9 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" dependencies = [ "crossbeam-channel", "file-id", @@ -4144,7 +4054,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4163,7 +4073,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -4183,16 +4092,6 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode 3.0.0", -] - [[package]] name = "objc2" version = "0.5.2" @@ -4200,14 +4099,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 4.0.3", + "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" @@ -4222,18 +4191,102 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", + "block2", + "dispatch", "libc", - "objc2 0.5.2", + "objc2", ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "cc", + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -4247,18 +4300,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -4301,11 +4354,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.47" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" dependencies = [ - "libredox 0.0.2", + "libredox", ] [[package]] @@ -4315,7 +4368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -4330,9 +4383,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -4341,24 +4394,25 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "owned_ttf_parser" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ - "ttf-parser 0.24.1", + "ttf-parser 0.25.0", ] [[package]] @@ -4383,7 +4437,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4435,7 +4489,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -4459,9 +4513,9 @@ dependencies = [ [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pbkdf2" @@ -4481,9 +4535,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -4492,9 +4546,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -4502,22 +4556,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "pest_meta" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -4554,7 +4608,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4563,7 +4617,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4573,10 +4627,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pin-project-lite" -version = "0.2.14" +name = "pin-project" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -4616,15 +4690,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] @@ -4653,7 +4727,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", "windows-sys 0.59.0", ] @@ -4701,7 +4775,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -4730,18 +4804,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.15" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", + "version_check", + "yansi", +] + +[[package]] +name = "profiling" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" [[package]] name = "pure-rust-locales" @@ -4854,17 +4941,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "read-fonts" -version = "0.20.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229" dependencies = [ "bytemuck", "font-types", @@ -4895,15 +4976,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4915,9 +4987,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4929,15 +5001,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "libredox 0.1.3", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4947,9 +5019,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4958,9 +5030,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -4970,15 +5042,14 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "resvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ - "gif 0.12.0", + "gif", "jpeg-decoder", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", @@ -5029,12 +5100,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - [[package]] name = "roxmltree" version = "0.20.0" @@ -5061,7 +5126,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.85", "walkdir", ] @@ -5097,6 +5162,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.2.3" @@ -5122,9 +5193,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -5135,25 +5206,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-properties", - "unicode-script", -] +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustybuzz" @@ -5166,8 +5221,8 @@ dependencies = [ "libm", "smallvec", "ttf-parser 0.21.1", - "unicode-bidi-mirroring 0.2.0", - "unicode-ccc 0.2.0", + "unicode-bidi-mirroring", + "unicode-ccc", "unicode-properties", "unicode-script", ] @@ -5201,14 +5256,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2 0.9.5", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -5244,29 +5299,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap", "itoa", @@ -5283,14 +5338,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5354,10 +5409,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "skrifa" -version = "0.20.0" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skrifa" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" dependencies = [ "bytemuck", "read-fonts", @@ -5387,31 +5448,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.5", - "rustix 0.38.37", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -5420,21 +5456,21 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.5", "pkg-config", - "rustix 0.38.37", + "rustix 0.38.38", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.4", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5447,7 +5483,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5499,7 +5535,7 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.37", + "rustix 0.38.38", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5575,19 +5611,19 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.11.1", + "siphasher 1.0.1", ] [[package]] name = "swash" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" +checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" dependencies = [ "skrifa", "yazi", @@ -5607,9 +5643,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -5624,7 +5660,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5671,9 +5707,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5682,14 +5718,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.59.0", ] @@ -5704,22 +5740,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5809,7 +5845,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.5", + "libloading", "pkg-config", "tracing", ] @@ -5841,9 +5877,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -5865,7 +5901,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5897,7 +5933,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -5922,15 +5958,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.20", ] [[package]] @@ -5952,7 +5988,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5972,7 +6008,7 @@ dependencies = [ "chrono", "libc", "log", - "objc2 0.5.2", + "objc2", "objc2-foundation", "once_cell", "scopeguard", @@ -5994,9 +6030,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "two-face" @@ -6015,7 +6051,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -6026,9 +6062,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uds_windows" @@ -6062,24 +6098,15 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -6087,12 +6114,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ccc" version = "0.2.0" @@ -6122,9 +6143,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" @@ -6181,64 +6202,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "usvg" -version = "0.37.0" +name = "ustr" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +checksum = "18b19e258aa08450f93369cf56dd78063586adf19e92a75b338a800f799a0208" dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", + "ahash", + "byteorder", + "lazy_static", + "parking_lot 0.12.3", + "serde", ] [[package]] -name = "usvg-parser" -version = "0.37.0" +name = "usvg" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ + "base64 0.22.1", "data-url", "flate2", + "fontdb 0.18.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", - "roxmltree 0.19.0", + "pico-args", + "roxmltree", + "rustybuzz", "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz 0.12.1", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -6261,9 +6261,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uzers" @@ -6317,9 +6317,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -6328,24 +6328,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6355,9 +6355,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6365,22 +6365,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-timer" @@ -6405,7 +6405,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.37", + "rustix 0.38.38", "scoped-tls", "smallvec", "wayland-sys", @@ -6413,12 +6413,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.37", + "rustix 0.38.38", "wayland-backend", "wayland-scanner", ] @@ -6436,32 +6436,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6471,40 +6459,27 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -6533,9 +6508,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6543,9 +6518,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6559,12 +6534,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec 0.7.6", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6583,14 +6559,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec 0.7.6", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6598,18 +6575,18 @@ dependencies = [ "parking_lot 0.12.3", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec 0.7.6", @@ -6629,10 +6606,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.3", @@ -6640,7 +6618,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6651,8 +6629,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -6699,7 +6678,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6711,17 +6690,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement 0.48.0", - "windows-interface 0.48.0", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -6732,6 +6700,18 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.56.0" @@ -6751,6 +6731,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.56.0" @@ -6765,13 +6755,13 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6782,18 +6772,18 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6804,7 +6794,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7032,46 +7022,50 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +version = "0.30.5" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.6.0", + "block2", "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.5", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.37", + "redox_syscall 0.4.1", + "rustix 0.38.38", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -7088,9 +7082,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -7127,9 +7121,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.5", + "libloading", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "x11rb-protocol", ] @@ -7147,7 +7141,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -7230,12 +7224,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" -[[package]] -name = "xxhash-rust" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" - [[package]] name = "yaml-rust" version = "0.4.5" @@ -7245,6 +7233,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yazi" version = "0.1.6" @@ -7271,7 +7265,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7282,15 +7276,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process 1.8.1", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", @@ -7325,7 +7313,7 @@ checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", - "async-fs 2.1.2", + "async-fs", "async-io 2.3.4", "async-lock 3.4.0", "async-process 2.3.0", @@ -7379,7 +7367,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7429,7 +7417,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7449,7 +7437,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7470,7 +7458,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7492,7 +7480,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7625,7 +7613,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7648,5 +7636,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 72eded832bca..54f87b464600 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -20,40 +20,38 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-edit"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.3"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; rev = "epoch-${version}"; - hash = "sha256-3goolnDRGQkQ3zN08WKzN6Dxt+Sh1lR+tFxeWjO3VKY="; + hash = "sha256-GCy/JyicPeCA7y9bfbVlyYiofRp0c82INPZi0zbnnxE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk="; - "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg="; + "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; + "cosmic-config-0.1.0" = "sha256-u/qzhRvP+HsfCfxl3aM/L4ZwmZ/Zorrlq5l9UemfoRg="; + "cosmic-files-0.1.0" = "sha256-XNUeDj5Dl8jXJRERP2F4Yx2BPV2b4bwzMNCbIH3FJdA="; "cosmic-syntax-theme-0.1.0" = "sha256-BNb9wrryD5FJImboD3TTdPRIfiBqPpItqwGdT1ZiNng="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98="; + "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2024-09-24"; + env.VERGEN_GIT_COMMIT_DATE = "2024-10-31"; env.VERGEN_GIT_SHA = src.rev; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 5a613ac3104b..842d182b278c 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,13 +9,13 @@ }: stdenvNoCC.mkDerivation { pname = "cosmic-icons"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.3"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; - rev = "341c84467fd863f0319cadf49b3d4bac1bf3029a"; - hash = "sha256-VA2QKuzTQBgubfjPXdpejFtZxqOZUXds/fZrfN6/8Nk="; + rev = "epoch-1.0.0-alpha.3"; + hash = "sha256-7gWCRBiE+XJX1JSjopyPN4bIIgZih6ZKGVSA7wBq3i0="; }; nativeBuildInputs = [ just ]; diff --git a/pkgs/by-name/co/cosmic-term/Cargo.lock b/pkgs/by-name/co/cosmic-term/Cargo.lock index b1b9d48cb57d..7a9a99439ae6 100644 --- a/pkgs/by-name/co/cosmic-term/Cargo.lock +++ b/pkgs/by-name/co/cosmic-term/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.28" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,43 +20,53 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" + +[[package]] +name = "accesskit_atspi_common" +version = "0.9.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant 3.15.2", +] [[package]] name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.24.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.2", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.12.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", + "accesskit_atspi_common", "atspi", "futures-lite 1.13.0", - "futures-util", - "once_cell", "serde", "tokio", "tokio-stream", @@ -65,21 +75,20 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_macos", @@ -91,9 +100,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -186,9 +195,9 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.6.0", @@ -200,7 +209,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -228,9 +237,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -243,43 +252,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "apply" @@ -337,11 +346,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -350,7 +359,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -365,9 +374,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "enumflags2", "futures-channel", @@ -427,18 +436,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" @@ -483,7 +480,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "tracing", "windows-sys 0.59.0", @@ -533,7 +530,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.48.0", ] @@ -552,7 +549,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", ] @@ -564,7 +561,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -579,7 +576,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.38", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -593,13 +590,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -613,7 +610,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "tempfile", "windows-sys 0.48.0", ] @@ -668,9 +665,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -710,18 +707,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -759,42 +756,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.2", -] - [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2", ] [[package]] @@ -834,22 +802,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -860,9 +828,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -885,20 +853,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.37", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -908,40 +862,28 @@ dependencies = [ "bitflags 2.6.0", "log", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix 0.38.37", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", - "rustix 0.38.37", + "calloop", + "rustix 0.38.38", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.21" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1020,7 +962,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "objc", "objc-foundation", @@ -1030,7 +972,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "dnd", "mime 0.1.0", @@ -1040,7 +982,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "thiserror", "x11rb", @@ -1094,9 +1036,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "com" @@ -1217,7 +1159,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1236,7 +1178,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "quote", "syn 1.0.109", @@ -1245,7 +1187,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#774ccf955f59f24cf9493f9249d20788ad394d48" +source = "git+https://github.com/pop-os/cosmic-files.git#20f9292e7925da20086c7f1f3c8e3a8d03d63b99" dependencies = [ "chrono", "dirs", @@ -1269,15 +1211,14 @@ dependencies = [ "once_cell", "open", "paste", - "rayon", "recently-used-xbel", "regex", "rust-embed", "serde", "shlex", "slotmap", - "smol_str", "tar", + "tempfile", "tokio", "trash", "unix_permissions_ext", @@ -1314,7 +1255,6 @@ dependencies = [ "rust-embed", "serde", "shlex", - "smol_str", "tokio", "url", "vergen", @@ -1326,12 +1266,12 @@ version = "0.12.1" source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e" dependencies = [ "bitflags 2.6.0", - "fontdb", + "fontdb 0.16.2", "log", "rangemap", "rayon", - "rustc-hash", - "rustybuzz 0.14.1", + "rustc-hash 1.1.0", + "rustybuzz", "self_cell 1.0.4", "smol_str", "swash", @@ -1346,7 +1286,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "almost", "cosmic-config", @@ -1473,11 +1413,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading", "winapi", ] @@ -1502,7 +1443,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1513,7 +1454,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1523,7 +1464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.10", @@ -1569,7 +1510,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1581,7 +1522,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1651,7 +1592,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1660,7 +1601,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading", ] [[package]] @@ -1675,21 +1616,35 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" + [[package]] name = "drm" version = "0.11.1" @@ -1700,7 +1655,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1710,7 +1665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1741,17 +1696,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-repr" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enumflags2" version = "0.7.10" @@ -1770,7 +1714,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1927,30 +1871,31 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" dependencies = [ "simd-adler32", ] [[package]] name = "file-id" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" +checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "filetime" -version = "0.2.24" -source = "git+https://github.com/jackpot51/filetime#186e19d3190ead16b05329400cb5b2350d8f44cf" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "libredox 0.1.3", + "libredox", "windows-sys 0.59.0", ] @@ -1965,9 +1910,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -1978,9 +1923,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -2008,7 +1950,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -2034,9 +1976,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "spin", ] @@ -2049,9 +1991,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" dependencies = [ "bytemuck", ] @@ -2062,7 +2004,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.20.0", + "roxmltree", ] [[package]] @@ -2079,6 +2021,20 @@ dependencies = [ "ttf-parser 0.20.0", ] +[[package]] +name = "fontdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.5", + "slotmap", + "tinyvec", + "ttf-parser 0.21.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -2097,7 +2053,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2173,9 +2129,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2188,9 +2144,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2198,15 +2154,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2216,9 +2172,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2250,32 +2206,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2320,16 +2276,6 @@ dependencies = [ "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 = "gif" version = "0.13.1" @@ -2342,9 +2288,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gl_generator" @@ -2359,9 +2305,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glob" @@ -2396,24 +2342,13 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2435,9 +2370,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2448,20 +2383,20 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ "bitflags 2.6.0", ] @@ -2502,6 +2437,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hassle-rs" version = "0.11.0" @@ -2511,7 +2452,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading", "thiserror", "widestring", "winapi", @@ -2635,21 +2576,21 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.77", + "syn 2.0.85", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +checksum = "0f2cc0e0523d1fe6fc2c6f66e5038624ea8091b3e7748b5e8e0c84b1698db6c2" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2677,15 +2618,14 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", "iced_renderer", - "iced_sctk", "iced_widget", "iced_winit", "image", @@ -2697,57 +2637,70 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "accesskit", - "accesskit_unix", "accesskit_winit", ] [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", + "bytes", "dnd", + "glam", "iced_accessibility", "log", "mime 0.1.0", "num-traits", + "once_cell", "palette", "raw-window-handle", + "rustc-hash 2.0.0", "serde", - "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", "window_clipboard", - "xxhash-rust", ] [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "futures", "iced_core", "log", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", ] +[[package]] +name = "iced_glyphon" +version = "0.6.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -2757,16 +2710,15 @@ dependencies = [ "lyon_path", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", - "xxhash-rust", ] [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2777,96 +2729,61 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ + "bytes", "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.2", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_sctk" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "enum-repr", - "float-cmp", - "futures", - "iced_accessibility", - "iced_futures", - "iced_graphics", - "iced_runtime", - "iced_style", - "itertools", - "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.2", "thiserror", - "tracing", - "wayland-backend", - "wayland-protocols 0.32.4", "window_clipboard", - "xkbcommon", - "xkbcommon-dl", - "xkeysym", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "iced_core", - "once_cell", - "palette", ] [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", - "kurbo", + "kurbo 0.10.4", "log", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", - "xxhash-rust", ] [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.37", - "smithay-client-toolkit 0.19.2", + "rustc-hash 2.0.0", + "rustix 0.38.38", + "smithay-client-toolkit", + "thiserror", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-sys", "wgpu", "x11rb", @@ -2874,16 +2791,17 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_renderer", "iced_runtime", - "iced_style", "num-traits", + "once_cell", "ouroboros", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", "window_clipboard", @@ -2891,44 +2809,25 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", + "iced_futures", "iced_graphics", "iced_runtime", - "iced_style", "log", + "rustc-hash 2.0.0", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.2", -] - [[package]] name = "icu_collator" version = "1.5.0" @@ -3069,7 +2968,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3114,7 +3013,7 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.13.1", + "gif", "jpeg-decoder", "num-traits", "png", @@ -3129,13 +3028,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] -name = "indexmap" -version = "2.5.0" +name = "immutable-chunkmap" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec 0.7.6", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -3308,9 +3216,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3331,7 +3239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.5", + "libloading", "pkg-config", ] @@ -3372,11 +3280,22 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec 0.7.6", + "smallvec", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec 0.7.6", + "smallvec", ] [[package]] @@ -3406,17 +3325,17 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "apply", - "ashpd 0.9.1", + "ashpd 0.9.2", "chrono", "cosmic-config", "cosmic-theme", @@ -3430,8 +3349,6 @@ dependencies = [ "iced_futures", "iced_renderer", "iced_runtime", - "iced_sctk", - "iced_style", "iced_tiny_skia", "iced_wgpu", "iced_widget", @@ -3447,19 +3364,10 @@ dependencies = [ "tracing", "unicode-segmentation", "url", + "ustr", "zbus 4.4.0", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.5" @@ -3472,20 +3380,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -3495,7 +3392,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -3522,6 +3419,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" @@ -3559,12 +3462,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" -dependencies = [ - "hashbrown", -] +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" [[package]] name = "lyon" @@ -3588,9 +3488,9 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570" dependencies = [ "arrayvec 0.7.6", "euclid", @@ -3599,9 +3499,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" +checksum = "8e0b8aec2f58586f6eef237985b9a9b7cb3a3aff4417c575075cf95bf925252e" dependencies = [ "lyon_geom", "num-traits", @@ -3681,9 +3581,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -3697,7 +3597,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "smithay-clipboard", ] @@ -3731,7 +3631,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -3741,6 +3640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -3784,18 +3684,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec 0.7.6", "bit-set", "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3804,14 +3705,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -3832,6 +3733,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.26.4" @@ -3899,9 +3809,9 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" dependencies = [ "crossbeam-channel", "file-id", @@ -4019,7 +3929,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4038,7 +3948,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -4058,16 +3967,6 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode 3.0.0", -] - [[package]] name = "objc2" version = "0.5.2" @@ -4075,14 +3974,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 4.0.3", + "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" @@ -4097,18 +4066,102 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", + "block2", + "dispatch", "libc", - "objc2 0.5.2", + "objc2", ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "cc", + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -4122,18 +4175,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "open" @@ -4154,11 +4207,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.47" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" dependencies = [ - "libredox 0.0.2", + "libredox", ] [[package]] @@ -4168,7 +4221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -4183,9 +4236,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -4194,24 +4247,25 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "owned_ttf_parser" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ - "ttf-parser 0.24.1", + "ttf-parser 0.25.0", ] [[package]] @@ -4236,7 +4290,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4288,7 +4342,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -4301,9 +4355,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pbkdf2" @@ -4351,7 +4405,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4360,7 +4414,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4370,10 +4424,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pin-project-lite" -version = "0.2.14" +name = "pin-project" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -4400,15 +4474,15 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] @@ -4437,7 +4511,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", "windows-sys 0.59.0", ] @@ -4485,7 +4559,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -4514,18 +4588,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.15" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", + "version_check", + "yansi", +] + +[[package]] +name = "profiling" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" [[package]] name = "pure-rust-locales" @@ -4629,17 +4716,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "read-fonts" -version = "0.20.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229" dependencies = [ "bytemuck", "font-types", @@ -4670,15 +4751,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4690,9 +4762,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4704,15 +4776,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "libredox 0.1.3", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4722,9 +4794,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4733,9 +4805,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -4745,15 +4817,14 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "resvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ - "gif 0.12.0", + "gif", "jpeg-decoder", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", @@ -4804,12 +4875,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - [[package]] name = "roxmltree" version = "0.20.0" @@ -4836,7 +4901,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.85", "walkdir", ] @@ -4872,6 +4937,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 = "rustix" version = "0.37.27" @@ -4888,9 +4959,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -4908,30 +4979,14 @@ checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12" dependencies = [ "errno", "libc", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-properties", - "unicode-script", -] +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustybuzz" @@ -4944,8 +4999,8 @@ dependencies = [ "libm", "smallvec", "ttf-parser 0.21.1", - "unicode-bidi-mirroring 0.2.0", - "unicode-ccc 0.2.0", + "unicode-bidi-mirroring", + "unicode-ccc", "unicode-properties", "unicode-script", ] @@ -4979,14 +5034,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2 0.9.5", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -5007,29 +5062,29 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap", "itoa", @@ -5046,7 +5101,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5118,10 +5173,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "skrifa" -version = "0.20.0" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skrifa" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" dependencies = [ "bytemuck", "read-fonts", @@ -5151,31 +5212,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.5", - "rustix 0.38.37", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -5184,21 +5220,21 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.5", "pkg-config", - "rustix 0.38.37", + "rustix 0.38.38", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.4", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5211,7 +5247,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5263,7 +5299,7 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.37", + "rustix 0.38.38", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5339,19 +5375,19 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.11.1", + "siphasher 1.0.1", ] [[package]] name = "swash" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" +checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" dependencies = [ "skrifa", "yazi", @@ -5371,9 +5407,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -5388,7 +5424,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5413,9 +5449,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5424,14 +5460,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.59.0", ] @@ -5446,22 +5482,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5551,7 +5587,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.5", + "libloading", "pkg-config", "tracing", ] @@ -5583,9 +5619,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -5607,7 +5643,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5649,13 +5685,13 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.20", ] [[package]] @@ -5677,7 +5713,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5697,7 +5733,7 @@ dependencies = [ "chrono", "libc", "log", - "objc2 0.5.2", + "objc2", "objc2-foundation", "once_cell", "scopeguard", @@ -5719,9 +5755,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "type-map" @@ -5729,7 +5765,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5770,24 +5806,15 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -5795,12 +5822,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ccc" version = "0.2.0" @@ -5830,9 +5851,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" @@ -5889,64 +5910,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "usvg" -version = "0.37.0" +name = "ustr" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +checksum = "18b19e258aa08450f93369cf56dd78063586adf19e92a75b338a800f799a0208" dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", + "ahash", + "byteorder", + "lazy_static", + "parking_lot 0.12.3", + "serde", ] [[package]] -name = "usvg-parser" -version = "0.37.0" +name = "usvg" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ + "base64 0.22.1", "data-url", "flate2", + "fontdb 0.18.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", - "roxmltree 0.19.0", + "pico-args", + "roxmltree", + "rustybuzz", "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz 0.12.1", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -5969,9 +5969,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uzers" @@ -6049,9 +6049,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -6060,24 +6060,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6087,9 +6087,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6097,22 +6097,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-timer" @@ -6137,7 +6137,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.37", + "rustix 0.38.38", "scoped-tls", "smallvec", "wayland-sys", @@ -6145,12 +6145,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.37", + "rustix 0.38.38", "wayland-backend", "wayland-scanner", ] @@ -6168,32 +6168,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6203,40 +6191,27 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -6265,9 +6240,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6275,9 +6250,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6291,12 +6266,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec 0.7.6", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6315,14 +6291,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec 0.7.6", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6330,18 +6307,18 @@ dependencies = [ "parking_lot 0.12.3", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec 0.7.6", @@ -6361,10 +6338,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.3", @@ -6372,7 +6350,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6383,8 +6361,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -6431,7 +6410,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6443,17 +6422,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement 0.48.0", - "windows-interface 0.48.0", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -6464,6 +6432,18 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.56.0" @@ -6483,6 +6463,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.56.0" @@ -6497,13 +6487,13 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6514,18 +6504,18 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6536,7 +6526,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -6764,46 +6754,50 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +version = "0.30.5" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.6.0", + "block2", "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.5", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.37", + "redox_syscall 0.4.1", + "rustix 0.38.38", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6820,9 +6814,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -6859,9 +6853,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.5", + "libloading", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "x11rb-protocol", ] @@ -6879,7 +6873,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -6963,10 +6957,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] -name = "xxhash-rust" -version = "0.8.12" +name = "yansi" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yazi" @@ -6994,7 +6988,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7005,15 +6999,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process 1.8.1", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", @@ -7048,7 +7036,7 @@ checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", - "async-fs 2.1.2", + "async-fs", "async-io 2.3.4", "async-lock 3.4.0", "async-process 2.3.0", @@ -7102,7 +7090,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7152,7 +7140,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7172,7 +7160,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7193,7 +7181,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7215,7 +7203,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7348,7 +7336,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7371,5 +7359,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index a68f25af43aa..cfe98f4288fd 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -18,34 +18,32 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-term"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.3"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; rev = "epoch-${version}"; - hash = "sha256-rMaHWtT5bhjdji3dAnfyCm7lMXDWjIBVh4ZUwApZphU="; + hash = "sha256-4++wCyRVIodWdlrvK2vMcHGoY4BctnrkopWC6dZvhMk="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk="; - "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg="; + "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; + "cosmic-config-0.1.0" = "sha256-u/qzhRvP+HsfCfxl3aM/L4ZwmZ/Zorrlq5l9UemfoRg="; + "cosmic-files-0.1.0" = "sha256-XNUeDj5Dl8jXJRERP2F4Yx2BPV2b4bwzMNCbIH3FJdA="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98="; + "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index d98223acbb1f..50b7a15ba526 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.3"; src = fetchFromGitHub { owner = "pop-os"; @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { rev = "epoch-${finalAttrs.version}"; forceFetchGit = true; fetchLFS = true; - hash = "sha256-9abkb9dECE7qVq547DkpIUvaYLXLGfkRlTgLCbQtSPw="; + hash = "sha256-Exrps3DicL/G/g0kbSsCvoFhiJn1k3v8I09GhW7EwNM="; }; patches = [ @@ -39,9 +39,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Wallpapers for the COSMIC Desktop Environment"; homepage = "https://system76.com/cosmic"; license = with lib.licenses; [ - unfree # https://github.com/pop-os/cosmic-wallpapers/issues/1 https://github.com/pop-os/cosmic-wallpapers/issues/3 - cc-by-40 # https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery (A_stormy_stellar_nursery_esa_379309.jpg) - publicDomain # https://earthobservatory.nasa.gov/image-use-policy (otherworldly_earth_nasa_ISS064-E-29444.jpg, phytoplankton_bloom_nasa_oli2_20240121.jpg); https://hubblesite.org/copyright (orion_nebula_nasa_heic0601a.jpg); https://webbtelescope.org/copyright (tarantula_nebula_nasa_PIA23646.jpg); https://www.planetary.org/space-images/the-solar-systems-round-moons (round_moons_nasa.jpg) + # A_stormy_stellar_nursery_esa_379309.jpg: https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery + # webb-inspired-wallpaper-system76.jpg + cc-by-40 + + # otherworldly_earth_nasa_ISS064-E-29444.jpg: https://earthobservatory.nasa.gov/image-use-policy + # phytoplankton_bloom_nasa_oli2_20240121.jpg: https://earthobservatory.nasa.gov/image-use-policy + # orion_nebula_nasa_heic0601a.jpg: https://hubblesite.org/copyright + # tarantula_nebula_nasa_PIA23646.jpg: https://webbtelescope.org/copyright + # round_moons_nasa.jpg: https://www.planetary.org/space-images/the-solar-systems-round-moons + publicDomain ]; maintainers = with lib.maintainers; [ pandapip1 ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch b/pkgs/by-name/co/coturn/dont-call-setgroups-unconditionally.patch similarity index 100% rename from pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch rename to pkgs/by-name/co/coturn/dont-call-setgroups-unconditionally.patch diff --git a/pkgs/servers/coturn/default.nix b/pkgs/by-name/co/coturn/package.nix similarity index 100% rename from pkgs/servers/coturn/default.nix rename to pkgs/by-name/co/coturn/package.nix diff --git a/pkgs/servers/coturn/pure-configure.patch b/pkgs/by-name/co/coturn/pure-configure.patch similarity index 100% rename from pkgs/servers/coturn/pure-configure.patch rename to pkgs/by-name/co/coturn/pure-configure.patch diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/by-name/co/courier-prime/package.nix similarity index 100% rename from pkgs/data/fonts/courier-prime/default.nix rename to pkgs/by-name/co/courier-prime/package.nix diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/by-name/co/coursera-dl/package.nix similarity index 100% rename from pkgs/applications/misc/coursera-dl/default.nix rename to pkgs/by-name/co/coursera-dl/package.nix diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/by-name/co/coursier/package.nix similarity index 100% rename from pkgs/development/tools/coursier/default.nix rename to pkgs/by-name/co/coursier/package.nix diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/by-name/co/cov-build/package.nix similarity index 100% rename from pkgs/development/tools/analysis/cov-build/default.nix rename to pkgs/by-name/co/cov-build/package.nix diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/by-name/co/cowpatty/package.nix similarity index 100% rename from pkgs/tools/security/cowpatty/default.nix rename to pkgs/by-name/co/cowpatty/package.nix diff --git a/pkgs/tools/security/coze/default.nix b/pkgs/by-name/co/coze/package.nix similarity index 100% rename from pkgs/tools/security/coze/default.nix rename to pkgs/by-name/co/coze/package.nix diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/by-name/co/cozette/package.nix similarity index 100% rename from pkgs/data/fonts/cozette/default.nix rename to pkgs/by-name/co/cozette/package.nix diff --git a/pkgs/by-name/co/cozy-drive/package.nix b/pkgs/by-name/co/cozy-drive/package.nix new file mode 100644 index 000000000000..5f7c5b0fb2f2 --- /dev/null +++ b/pkgs/by-name/co/cozy-drive/package.nix @@ -0,0 +1,34 @@ +{ lib +, fetchurl +, appimageTools +}: + +let + pname = "cozydrive"; + version = "3.40.0"; + + src = fetchurl { + url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; + sha256 = "sha256-bKYtuFgKmZj8fFEh/O9HXGm+GQTEbjpe+KsMW5nX1ek="; + }; + appimageContents = appimageTools.extract { inherit pname version src; }; + +in +appimageTools.wrapType2 { + inherit pname version src; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/cozydrive.desktop -t $out/share/applications + substituteInPlace $out/share/applications/cozydrive.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud"; + homepage = "https://cozy.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ simarra ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "cozydrive"; + }; +} diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/by-name/co/cozy/package.nix similarity index 100% rename from pkgs/applications/audio/cozy/default.nix rename to pkgs/by-name/co/cozy/package.nix diff --git a/pkgs/tools/misc/cp210x-program/default.nix b/pkgs/by-name/cp/cp210x-program/package.nix similarity index 100% rename from pkgs/tools/misc/cp210x-program/default.nix rename to pkgs/by-name/cp/cp210x-program/package.nix diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix index 95c7f0461032..646e9d5aba78 100644 --- a/pkgs/by-name/cp/cp2k/package.nix +++ b/pkgs/by-name/cp/cp2k/package.nix @@ -18,7 +18,6 @@ mpi, gsl, scalapack, - openssh, makeWrapper, libxsmm, spglib, @@ -83,7 +82,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 which - openssh makeWrapper pkg-config ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; @@ -225,7 +223,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; checkPhase = '' diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/by-name/cp/cp437/package.nix similarity index 100% rename from pkgs/tools/misc/cp437/default.nix rename to pkgs/by-name/cp/cp437/package.nix diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/by-name/cp/cpcfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/cpcfs/default.nix rename to pkgs/by-name/cp/cpcfs/package.nix diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/by-name/cp/cpio/package.nix similarity index 100% rename from pkgs/tools/archivers/cpio/default.nix rename to pkgs/by-name/cp/cpio/package.nix diff --git a/pkgs/applications/audio/cplay-ng/default.nix b/pkgs/by-name/cp/cplay-ng/package.nix similarity index 100% rename from pkgs/applications/audio/cplay-ng/default.nix rename to pkgs/by-name/cp/cplay-ng/package.nix diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/by-name/cp/cpm-cmake/package.nix similarity index 100% rename from pkgs/development/tools/cpm-cmake/default.nix rename to pkgs/by-name/cp/cpm-cmake/package.nix diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/by-name/cp/cpp-hocon/package.nix similarity index 100% rename from pkgs/development/libraries/cpp-hocon/default.nix rename to pkgs/by-name/cp/cpp-hocon/package.nix diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix similarity index 100% rename from pkgs/development/libraries/cpp-ipfs-http-client/default.nix rename to pkgs/by-name/cp/cpp-ipfs-http-client/package.nix diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/pkgs/by-name/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch similarity index 100% rename from pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch rename to pkgs/by-name/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch diff --git a/pkgs/development/libraries/cpp-jwt/fix-version.patch b/pkgs/by-name/cp/cpp-jwt/fix-version.patch similarity index 100% rename from pkgs/development/libraries/cpp-jwt/fix-version.patch rename to pkgs/by-name/cp/cpp-jwt/fix-version.patch diff --git a/pkgs/development/libraries/cpp-jwt/default.nix b/pkgs/by-name/cp/cpp-jwt/package.nix similarity index 100% rename from pkgs/development/libraries/cpp-jwt/default.nix rename to pkgs/by-name/cp/cpp-jwt/package.nix diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/by-name/cp/cpp-netlib/package.nix similarity index 100% rename from pkgs/development/libraries/cpp-netlib/default.nix rename to pkgs/by-name/cp/cpp-netlib/package.nix diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/by-name/cp/cpp-utilities/package.nix similarity index 100% rename from pkgs/development/libraries/cpp-utilities/default.nix rename to pkgs/by-name/cp/cpp-utilities/package.nix diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/by-name/cp/cppclean/package.nix similarity index 100% rename from pkgs/development/tools/cppclean/default.nix rename to pkgs/by-name/cp/cppclean/package.nix diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/by-name/cp/cppcms/package.nix similarity index 100% rename from pkgs/development/libraries/cppcms/default.nix rename to pkgs/by-name/cp/cppcms/package.nix diff --git a/pkgs/development/libraries/cppcodec/default.nix b/pkgs/by-name/cp/cppcodec/package.nix similarity index 100% rename from pkgs/development/libraries/cppcodec/default.nix rename to pkgs/by-name/cp/cppcodec/package.nix diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/by-name/cp/cppdb/package.nix similarity index 100% rename from pkgs/development/libraries/cppdb/default.nix rename to pkgs/by-name/cp/cppdb/package.nix diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/by-name/cp/cppe/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/cppe/default.nix rename to pkgs/by-name/cp/cppe/package.nix diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/by-name/cp/cppi/package.nix similarity index 100% rename from pkgs/development/tools/misc/cppi/default.nix rename to pkgs/by-name/cp/cppi/package.nix diff --git a/pkgs/development/misc/cppreference-doc/default.nix b/pkgs/by-name/cp/cppreference-doc/package.nix similarity index 100% rename from pkgs/development/misc/cppreference-doc/default.nix rename to pkgs/by-name/cp/cppreference-doc/package.nix diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/by-name/cp/cpptest/package.nix similarity index 100% rename from pkgs/development/libraries/cpptest/default.nix rename to pkgs/by-name/cp/cpptest/package.nix diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/by-name/cp/cpptoml/package.nix similarity index 100% rename from pkgs/development/libraries/cpptoml/default.nix rename to pkgs/by-name/cp/cpptoml/package.nix diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/by-name/cp/cppunit/package.nix similarity index 100% rename from pkgs/development/libraries/cppunit/default.nix rename to pkgs/by-name/cp/cppunit/package.nix diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/by-name/cp/cpputest/package.nix similarity index 100% rename from pkgs/development/libraries/cpputest/default.nix rename to pkgs/by-name/cp/cpputest/package.nix diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/by-name/cp/cppzmq/package.nix similarity index 100% rename from pkgs/development/libraries/cppzmq/default.nix rename to pkgs/by-name/cp/cppzmq/package.nix diff --git a/pkgs/development/tools/misc/cproto/cproto.patch b/pkgs/by-name/cp/cproto/cproto.patch similarity index 100% rename from pkgs/development/tools/misc/cproto/cproto.patch rename to pkgs/by-name/cp/cproto/cproto.patch diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/by-name/cp/cproto/package.nix similarity index 100% rename from pkgs/development/tools/misc/cproto/default.nix rename to pkgs/by-name/cp/cproto/package.nix diff --git a/pkgs/tools/misc/cpufetch/default.nix b/pkgs/by-name/cp/cpufetch/package.nix similarity index 100% rename from pkgs/tools/misc/cpufetch/default.nix rename to pkgs/by-name/cp/cpufetch/package.nix diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/by-name/cp/cpufrequtils/package.nix similarity index 100% rename from pkgs/os-specific/linux/cpufrequtils/default.nix rename to pkgs/by-name/cp/cpufrequtils/package.nix diff --git a/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch b/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch similarity index 100% rename from pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch rename to pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/by-name/cp/cpuid/package.nix similarity index 100% rename from pkgs/os-specific/linux/cpuid/default.nix rename to pkgs/by-name/cp/cpuid/package.nix diff --git a/pkgs/tools/misc/cpulimit/get-missing-basename.patch b/pkgs/by-name/cp/cpulimit/get-missing-basename.patch similarity index 100% rename from pkgs/tools/misc/cpulimit/get-missing-basename.patch rename to pkgs/by-name/cp/cpulimit/get-missing-basename.patch diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/by-name/cp/cpulimit/package.nix similarity index 100% rename from pkgs/tools/misc/cpulimit/default.nix rename to pkgs/by-name/cp/cpulimit/package.nix diff --git a/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch b/pkgs/by-name/cp/cpulimit/remove-sys-sysctl.h.patch similarity index 100% rename from pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch rename to pkgs/by-name/cp/cpulimit/remove-sys-sysctl.h.patch diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/by-name/cp/cpuminer/package.nix similarity index 100% rename from pkgs/tools/misc/cpuminer/default.nix rename to pkgs/by-name/cp/cpuminer/package.nix diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/by-name/cp/cpustat/package.nix similarity index 100% rename from pkgs/os-specific/linux/cpustat/default.nix rename to pkgs/by-name/cp/cpustat/package.nix diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/by-name/cr/crabz/package.nix similarity index 100% rename from pkgs/tools/compression/crabz/default.nix rename to pkgs/by-name/cr/crabz/package.nix diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch similarity index 100% rename from pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch rename to pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch similarity index 100% rename from pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch rename to pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/by-name/cr/crack_attack/package.nix similarity index 100% rename from pkgs/games/crack-attack/default.nix rename to pkgs/by-name/cr/crack_attack/package.nix diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/by-name/cr/crackle/package.nix similarity index 100% rename from pkgs/tools/networking/crackle/default.nix rename to pkgs/by-name/cr/crackle/package.nix diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/by-name/cr/cracklib/package.nix similarity index 100% rename from pkgs/development/libraries/cracklib/default.nix rename to pkgs/by-name/cr/cracklib/package.nix diff --git a/pkgs/tools/security/crackql/default.nix b/pkgs/by-name/cr/crackql/package.nix similarity index 100% rename from pkgs/tools/security/crackql/default.nix rename to pkgs/by-name/cr/crackql/package.nix diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/by-name/cr/crackxls/package.nix similarity index 100% rename from pkgs/tools/security/crackxls/default.nix rename to pkgs/by-name/cr/crackxls/package.nix diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/by-name/cr/craftos-pc/package.nix similarity index 100% rename from pkgs/applications/emulators/craftos-pc/default.nix rename to pkgs/by-name/cr/craftos-pc/package.nix diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix b/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/default.nix similarity index 100% rename from pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix rename to pkgs/by-name/cr/craftos-pc/test-eval-hello-world/default.nix diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua b/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/init.lua similarity index 100% rename from pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua rename to pkgs/by-name/cr/craftos-pc/test-eval-hello-world/init.lua diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix b/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/default.nix similarity index 100% rename from pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix rename to pkgs/by-name/cr/craftos-pc/test-eval-periphemu/default.nix diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua b/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/init.lua similarity index 100% rename from pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua rename to pkgs/by-name/cr/craftos-pc/test-eval-periphemu/init.lua diff --git a/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch b/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch similarity index 100% rename from pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch rename to pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/by-name/cr/cramfsprogs/package.nix similarity index 100% rename from pkgs/os-specific/linux/cramfsprogs/default.nix rename to pkgs/by-name/cr/cramfsprogs/package.nix diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/by-name/cr/cramfsswap/package.nix similarity index 100% rename from pkgs/os-specific/linux/cramfsswap/default.nix rename to pkgs/by-name/cr/cramfsswap/package.nix diff --git a/pkgs/os-specific/linux/cramfsswap/parallel-make.patch b/pkgs/by-name/cr/cramfsswap/parallel-make.patch similarity index 100% rename from pkgs/os-specific/linux/cramfsswap/parallel-make.patch rename to pkgs/by-name/cr/cramfsswap/parallel-make.patch diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix new file mode 100644 index 000000000000..8c3af939719b --- /dev/null +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: +let + version = "0.1.20"; +in +rustPlatform.buildRustPackage { + pname = "crates-tui"; + inherit version; + + src = fetchFromGitHub { + owner = "ratatui"; + repo = "crates-tui"; + rev = "refs/tags/v${version}"; + hash = "sha256-K3ttXoSS4GZyHnqS95op8kmbAi4/KjKa0P6Nzqqpjyw="; + }; + + cargoHash = "sha256-ztLBM6CR2WMKR9cfBY95BvSaD05C+AEa6C/nOdDxqf0="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI for exploring crates.io using Ratatui"; + homepage = "https://github.com/ratatui/crates-tui"; + license = with lib.licenses; [ mit ]; + # See Cargo.toml: workspaces.metadata.dist.targets + # Other platforms may work but YMMV + platforms = [ + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + "x86_64-windows" + ]; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "crates-tui"; + }; +} diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/by-name/cr/crc32c/package.nix similarity index 100% rename from pkgs/development/libraries/crc32c/default.nix rename to pkgs/by-name/cr/crc32c/package.nix diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/by-name/cr/crcpp/package.nix similarity index 100% rename from pkgs/development/libraries/crcpp/default.nix rename to pkgs/by-name/cr/crcpp/package.nix diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/by-name/cr/crd2pulumi/package.nix similarity index 100% rename from pkgs/development/tools/crd2pulumi/default.nix rename to pkgs/by-name/cr/crd2pulumi/package.nix diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/by-name/cr/cre2/package.nix similarity index 100% rename from pkgs/development/libraries/cre2/default.nix rename to pkgs/by-name/cr/cre2/package.nix diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/by-name/cr/createrepo_c/fix-bash-completion-path.patch similarity index 100% rename from pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch rename to pkgs/by-name/cr/createrepo_c/fix-bash-completion-path.patch diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/by-name/cr/createrepo_c/fix-python-install-path.patch similarity index 100% rename from pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch rename to pkgs/by-name/cr/createrepo_c/fix-python-install-path.patch diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/by-name/cr/createrepo_c/package.nix similarity index 100% rename from pkgs/tools/package-management/createrepo_c/default.nix rename to pkgs/by-name/cr/createrepo_c/package.nix diff --git a/pkgs/tools/security/credential-detector/default.nix b/pkgs/by-name/cr/credential-detector/package.nix similarity index 100% rename from pkgs/tools/security/credential-detector/default.nix rename to pkgs/by-name/cr/credential-detector/package.nix diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/by-name/cr/credhub-cli/package.nix similarity index 100% rename from pkgs/tools/admin/credhub-cli/default.nix rename to pkgs/by-name/cr/credhub-cli/package.nix diff --git a/pkgs/tools/security/creds/default.nix b/pkgs/by-name/cr/creds/package.nix similarity index 100% rename from pkgs/tools/security/creds/default.nix rename to pkgs/by-name/cr/creds/package.nix diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/by-name/cr/credslayer/package.nix similarity index 100% rename from pkgs/tools/security/credslayer/default.nix rename to pkgs/by-name/cr/credslayer/package.nix diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/by-name/cr/creep/package.nix similarity index 100% rename from pkgs/data/fonts/creep/default.nix rename to pkgs/by-name/cr/creep/package.nix diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/by-name/cr/crex/package.nix similarity index 100% rename from pkgs/tools/misc/crex/default.nix rename to pkgs/by-name/cr/crex/package.nix diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/by-name/cr/cri-tools/package.nix similarity index 100% rename from pkgs/tools/virtualization/cri-tools/default.nix rename to pkgs/by-name/cr/cri-tools/package.nix diff --git a/pkgs/data/fonts/crimson-pro/default.nix b/pkgs/by-name/cr/crimson-pro/package.nix similarity index 100% rename from pkgs/data/fonts/crimson-pro/default.nix rename to pkgs/by-name/cr/crimson-pro/package.nix diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/by-name/cr/crimson/package.nix similarity index 100% rename from pkgs/data/fonts/crimson/default.nix rename to pkgs/by-name/cr/crimson/package.nix diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/by-name/cr/crip/package.nix similarity index 100% rename from pkgs/applications/audio/crip/default.nix rename to pkgs/by-name/cr/crip/package.nix diff --git a/pkgs/games/doom-ports/crispy-doom/default.nix b/pkgs/by-name/cr/crispy-doom/package.nix similarity index 100% rename from pkgs/games/doom-ports/crispy-doom/default.nix rename to pkgs/by-name/cr/crispy-doom/package.nix diff --git a/pkgs/development/tools/rust/critcmp/default.nix b/pkgs/by-name/cr/critcmp/package.nix similarity index 100% rename from pkgs/development/tools/rust/critcmp/default.nix rename to pkgs/by-name/cr/critcmp/package.nix diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/by-name/cr/criu/package.nix similarity index 100% rename from pkgs/os-specific/linux/criu/default.nix rename to pkgs/by-name/cr/criu/package.nix diff --git a/pkgs/tools/security/crlfsuite/default.nix b/pkgs/by-name/cr/crlfsuite/package.nix similarity index 100% rename from pkgs/tools/security/crlfsuite/default.nix rename to pkgs/by-name/cr/crlfsuite/package.nix diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/by-name/cr/crlfuzz/package.nix similarity index 100% rename from pkgs/tools/security/crlfuzz/default.nix rename to pkgs/by-name/cr/crlfuzz/package.nix diff --git a/pkgs/development/libraries/croaring/fix-pkg-config.patch b/pkgs/by-name/cr/croaring/fix-pkg-config.patch similarity index 100% rename from pkgs/development/libraries/croaring/fix-pkg-config.patch rename to pkgs/by-name/cr/croaring/fix-pkg-config.patch diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/by-name/cr/croaring/package.nix similarity index 100% rename from pkgs/development/libraries/croaring/default.nix rename to pkgs/by-name/cr/croaring/package.nix diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/by-name/cr/croc/package.nix similarity index 100% rename from pkgs/tools/networking/croc/default.nix rename to pkgs/by-name/cr/croc/package.nix diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/by-name/cr/croc/test-local-relay.nix similarity index 100% rename from pkgs/tools/networking/croc/test-local-relay.nix rename to pkgs/by-name/cr/croc/test-local-relay.nix diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/by-name/cr/cromfs/package.nix similarity index 100% rename from pkgs/tools/archivers/cromfs/default.nix rename to pkgs/by-name/cr/cromfs/package.nix diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/by-name/cr/crossguid/package.nix similarity index 100% rename from pkgs/development/libraries/crossguid/default.nix rename to pkgs/by-name/cr/crossguid/package.nix diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/by-name/cr/crowbar/package.nix similarity index 100% rename from pkgs/tools/security/crowbar/default.nix rename to pkgs/by-name/cr/crowbar/package.nix diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/by-name/cr/crowdin-cli/package.nix similarity index 100% rename from pkgs/tools/text/crowdin-cli/default.nix rename to pkgs/by-name/cr/crowdin-cli/package.nix diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/by-name/cr/crowdsec/package.nix similarity index 100% rename from pkgs/tools/security/crowdsec/default.nix rename to pkgs/by-name/cr/crowdsec/package.nix diff --git a/pkgs/games/crrcsim/gcc6.patch b/pkgs/by-name/cr/crrcsim/gcc6.patch similarity index 100% rename from pkgs/games/crrcsim/gcc6.patch rename to pkgs/by-name/cr/crrcsim/gcc6.patch diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/by-name/cr/crrcsim/package.nix similarity index 100% rename from pkgs/games/crrcsim/default.nix rename to pkgs/by-name/cr/crrcsim/package.nix diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/by-name/cr/crudini/package.nix similarity index 100% rename from pkgs/tools/misc/crudini/default.nix rename to pkgs/by-name/cr/crudini/package.nix diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/by-name/cr/crumbs/package.nix similarity index 100% rename from pkgs/applications/misc/crumbs/default.nix rename to pkgs/by-name/cr/crumbs/package.nix diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix new file mode 100644 index 000000000000..5a043ed89553 --- /dev/null +++ b/pkgs/by-name/cr/crun/package.nix @@ -0,0 +1,85 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, go-md2man +, pkg-config +, libcap +, libseccomp +, python3 +, systemd +, yajl +, nixosTests +, criu +}: + +let + # these tests require additional permissions + disabledTests = [ + "test_capabilities.py" + "test_cwd.py" + "test_delete.py" + "test_detach.py" + "test_exec.py" + "test_hooks.py" + "test_hostname.py" + "test_oci_features" + "test_paths.py" + "test_pid.py" + "test_pid_file.py" + "test_preserve_fds.py" + "test_resources" + "test_seccomp" + "test_start.py" + "test_uid_gid.py" + "test_update.py" + "tests_libcrun_utils" + ]; + +in +stdenv.mkDerivation rec { + pname = "crun"; + version = "1.18.2"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = version; + hash = "sha256-v/ZYy4aPsE7couVHSM4VFXPhn48cZK1odDK3r9yYprc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; + + buildInputs = [ criu libcap libseccomp systemd yajl ]; + + enableParallelBuilding = true; + strictDeps = true; + + NIX_LDFLAGS = "-lcriu"; + + # we need this before autoreconfHook does its thing in order to initialize + # config.h with the correct values + postPatch = '' + echo ${version} > .tarball-version + echo '#define GIT_VERSION "${src.rev}"' > git-version.h + + ${lib.concatMapStringsSep "\n" (e: + "substituteInPlace Makefile.am --replace 'tests/${e}' ''" + ) disabledTests} + ''; + + doCheck = true; + + passthru.tests = { inherit (nixosTests) podman; }; + + meta = with lib; { + changelog = "https://github.com/containers/crun/releases/tag/${version}"; + description = "Fast and lightweight fully featured OCI runtime and C library for running containers"; + homepage = "https://github.com/containers/crun"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ] ++ teams.podman.members; + mainProgram = "crun"; + }; +} diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/by-name/cr/crunch/package.nix similarity index 100% rename from pkgs/tools/security/crunch/default.nix rename to pkgs/by-name/cr/crunch/package.nix diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/by-name/cr/cryfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/cryfs/default.nix rename to pkgs/by-name/cr/cryfs/package.nix diff --git a/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/pkgs/by-name/cr/crypto-org-wallet/package.nix similarity index 100% rename from pkgs/applications/blockchains/crypto-org-wallet/default.nix rename to pkgs/by-name/cr/crypto-org-wallet/package.nix diff --git a/pkgs/tools/misc/crypto-tracker/default.nix b/pkgs/by-name/cr/crypto-tracker/package.nix similarity index 100% rename from pkgs/tools/misc/crypto-tracker/default.nix rename to pkgs/by-name/cr/crypto-tracker/package.nix diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/by-name/cr/cryptominisat/package.nix similarity index 100% rename from pkgs/applications/science/logic/cryptominisat/default.nix rename to pkgs/by-name/cr/cryptominisat/package.nix diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/by-name/cr/cryptopp/package.nix similarity index 100% rename from pkgs/development/libraries/crypto++/default.nix rename to pkgs/by-name/cr/cryptopp/package.nix diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/by-name/cr/cryptoverif/package.nix similarity index 100% rename from pkgs/applications/science/logic/cryptoverif/default.nix rename to pkgs/by-name/cr/cryptoverif/package.nix diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix new file mode 100644 index 000000000000..8713325b00bc --- /dev/null +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -0,0 +1,88 @@ +{ lib, stdenv, fetchurl, lvm2, json_c, asciidoctor +, openssl, libuuid, pkg-config, popt, nixosTests +, libargon2, withInternalArgon2 ? false + + # Programs enabled by default upstream are implicitly enabled unless + # manually set to false. +, programs ? {} + # The release tarballs contain precomputed manpage files, so we don't need + # to run asciidoctor on the man sources. By avoiding asciidoctor, we make + # the bare NixOS build hash independent of changes to the ruby ecosystem, + # saving mass-rebuilds. +, rebuildMan ? false +}: + +stdenv.mkDerivation rec { + pname = "cryptsetup"; + version = "2.7.5"; + + outputs = [ "bin" "out" "dev" "man" ]; + separateDebugInfo = true; + + src = fetchurl { + url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-0r5Dlbj1A7Dr9LLYHbkMNalwUKNY7iH+YqDftm5dVSI="; + }; + + patches = [ + # Allow reading tokens from a relative path, see #167994 + ./relative-token-path.patch + ]; + + postPatch = '' + patchShebangs tests + + # O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs) + # and on several filesystem types (btrfs, zfs) without sandboxing. + # Remove it, see discussion in #46151 + substituteInPlace tests/unit-utils-io.c --replace "| O_DIRECT" "" + ''; + + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + + configureFlags = [ + "--with-crypto_backend=openssl" + "--disable-ssh-token" + ] ++ lib.optionals (!rebuildMan) [ + "--disable-asciidoc" + ] ++ lib.optionals (!withInternalArgon2) [ + "--enable-libargon2" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "--disable-external-tokens" + # We have to override this even though we're removing token + # support, because the path still gets included in the binary even + # though it isn't used. + "--with-luks2-external-tokens-path=/" + ] ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ]; + buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ lib.optional (!withInternalArgon2) libargon2; + + # The test [7] header backup in compat-test fails with a mysterious + # "out of memory" error, even though tons of memory is available. + # Issue filed upstream: https://gitlab.com/cryptsetup/cryptsetup/-/issues/763 + doCheck = !stdenv.hostPlatform.isMusl; + + passthru = { + tests = { + nixos = + lib.optionalAttrs stdenv.hostPlatform.isLinux ( + lib.recurseIntoAttrs ( + lib.filterAttrs + (name: _value: lib.hasPrefix "luks" name) + nixosTests.installer + ) + ); + }; + }; + + meta = { + homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; + description = "LUKS for dm-crypt"; + changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; + license = lib.licenses.gpl2Plus; + mainProgram = "cryptsetup"; + maintainers = with lib.maintainers; [ raitobezarius ]; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch b/pkgs/by-name/cr/cryptsetup/relative-token-path.patch similarity index 100% rename from pkgs/os-specific/linux/cryptsetup/relative-token-path.patch rename to pkgs/by-name/cr/cryptsetup/relative-token-path.patch diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/by-name/cr/crystal2nix/package.nix similarity index 100% rename from pkgs/development/compilers/crystal2nix/default.nix rename to pkgs/by-name/cr/crystal2nix/package.nix diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/by-name/cr/crystal2nix/shards.nix similarity index 100% rename from pkgs/development/compilers/crystal2nix/shards.nix rename to pkgs/by-name/cr/crystal2nix/shards.nix diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/by-name/cs/csa/package.nix similarity index 100% rename from pkgs/applications/audio/csa/default.nix rename to pkgs/by-name/cs/csa/package.nix diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/by-name/cs/cscope/package.nix similarity index 100% rename from pkgs/development/tools/misc/cscope/default.nix rename to pkgs/by-name/cs/cscope/package.nix diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/by-name/cs/csdp/package.nix similarity index 100% rename from pkgs/applications/science/math/csdp/default.nix rename to pkgs/by-name/cs/csdp/package.nix diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/by-name/cs/csdr/package.nix similarity index 100% rename from pkgs/applications/radio/csdr/default.nix rename to pkgs/by-name/cs/csdr/package.nix diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/by-name/cs/csfml/package.nix similarity index 100% rename from pkgs/development/libraries/csfml/default.nix rename to pkgs/by-name/cs/csfml/package.nix diff --git a/pkgs/os-specific/linux/cshatag/default.nix b/pkgs/by-name/cs/cshatag/package.nix similarity index 100% rename from pkgs/os-specific/linux/cshatag/default.nix rename to pkgs/by-name/cs/cshatag/package.nix diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/by-name/cs/csmith/package.nix similarity index 100% rename from pkgs/development/tools/misc/csmith/default.nix rename to pkgs/by-name/cs/csmith/package.nix diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/by-name/cs/csound-manual/package.nix similarity index 100% rename from pkgs/applications/audio/csound/csound-manual/default.nix rename to pkgs/by-name/cs/csound-manual/package.nix diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/by-name/cs/csv2latex/package.nix similarity index 100% rename from pkgs/tools/misc/csv2latex/default.nix rename to pkgs/by-name/cs/csv2latex/package.nix diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/by-name/cs/csv2odf/package.nix similarity index 100% rename from pkgs/applications/office/csv2odf/default.nix rename to pkgs/by-name/cs/csv2odf/package.nix diff --git a/pkgs/tools/misc/csv2parquet/default.nix b/pkgs/by-name/cs/csv2parquet/package.nix similarity index 100% rename from pkgs/tools/misc/csv2parquet/default.nix rename to pkgs/by-name/cs/csv2parquet/package.nix diff --git a/pkgs/tools/graphics/csv2svg/default.nix b/pkgs/by-name/cs/csv2svg/package.nix similarity index 100% rename from pkgs/tools/graphics/csv2svg/default.nix rename to pkgs/by-name/cs/csv2svg/package.nix diff --git a/pkgs/tools/text/csvdiff/default.nix b/pkgs/by-name/cs/csvdiff/package.nix similarity index 100% rename from pkgs/tools/text/csvdiff/default.nix rename to pkgs/by-name/cs/csvdiff/package.nix diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/by-name/cs/csview/package.nix similarity index 100% rename from pkgs/tools/text/csview/default.nix rename to pkgs/by-name/cs/csview/package.nix diff --git a/pkgs/tools/text/csvquote/csvquote-path.patch b/pkgs/by-name/cs/csvquote/csvquote-path.patch similarity index 100% rename from pkgs/tools/text/csvquote/csvquote-path.patch rename to pkgs/by-name/cs/csvquote/csvquote-path.patch diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/by-name/cs/csvquote/package.nix similarity index 100% rename from pkgs/tools/text/csvquote/default.nix rename to pkgs/by-name/cs/csvquote/package.nix diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/by-name/cs/csvs-to-sqlite/package.nix similarity index 100% rename from pkgs/tools/misc/csvs-to-sqlite/default.nix rename to pkgs/by-name/cs/csvs-to-sqlite/package.nix diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix index 4079b55f9835..9686b5fae891 100644 --- a/pkgs/by-name/cs/csvtk/package.nix +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -1,10 +1,13 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, + buildPackages, }: let - version = "0.30.0"; + version = "0.31.0"; in buildGoModule { pname = "csvtk"; @@ -14,10 +17,27 @@ buildGoModule { owner = "shenwei356"; repo = "csvtk"; rev = "refs/tags/v${version}"; - hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ="; + hash = "sha256-RfW7SiRcsN0F/+2bixLMNsqJCOSD1BQwlm4Zm2kogXM="; }; - vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM="; + vendorHash = "sha256-5RqAtnGioasbQxLltglCWitzb7mQgNYIE9IFkE0AOME="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + let + csvtkBin = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "$out" + else + lib.getBin buildPackages.csvtk; + in + '' + for shell in bash zsh fish; do + ${csvtkBin}/bin/csvtk genautocomplete --shell $shell --file csvtk.$shell + installShellCompletion csvtk.$shell + done + ''; meta = { description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang"; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/by-name/cs/csxcad/package.nix similarity index 100% rename from pkgs/applications/science/electronics/csxcad/default.nix rename to pkgs/by-name/cs/csxcad/package.nix diff --git a/pkgs/applications/science/electronics/csxcad/searchPath.patch b/pkgs/by-name/cs/csxcad/searchPath.patch similarity index 100% rename from pkgs/applications/science/electronics/csxcad/searchPath.patch rename to pkgs/by-name/cs/csxcad/searchPath.patch diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix new file mode 100644 index 000000000000..d75c57300204 --- /dev/null +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -0,0 +1,39 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "ctlptl"; + version = "0.8.35"; + + src = fetchFromGitHub { + owner = "tilt-dev"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JFHPwda1p3xIfbQqnl3tI7Z/LhAB1U2VtLvT2DlyQMo="; + }; + + vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "cmd/ctlptl" ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd ctlptl \ + --bash <($out/bin/ctlptl completion bash) \ + --fish <($out/bin/ctlptl completion fish) \ + --zsh <($out/bin/ctlptl completion zsh) + ''; + + meta = with lib; { + description = "CLI for declaratively setting up local Kubernetes clusters"; + homepage = "https://github.com/tilt-dev/ctlptl"; + license = licenses.asl20; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/by-name/ct/ctmg/package.nix similarity index 100% rename from pkgs/tools/security/ctmg/default.nix rename to pkgs/by-name/ct/ctmg/package.nix diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/by-name/ct/ctodo/package.nix similarity index 100% rename from pkgs/applications/misc/ctodo/default.nix rename to pkgs/by-name/ct/ctodo/package.nix diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/by-name/ct/ctop/package.nix similarity index 100% rename from pkgs/tools/system/ctop/default.nix rename to pkgs/by-name/ct/ctop/package.nix diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/by-name/ct/ctpl/package.nix similarity index 100% rename from pkgs/development/libraries/ctpl/default.nix rename to pkgs/by-name/ct/ctpl/package.nix diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/by-name/ct/ctpp2/package.nix similarity index 100% rename from pkgs/development/libraries/ctpp2/default.nix rename to pkgs/by-name/ct/ctpp2/package.nix diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/by-name/ct/ctre/package.nix similarity index 100% rename from pkgs/development/libraries/ctre/default.nix rename to pkgs/by-name/ct/ctre/package.nix diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/by-name/ct/ctrtool/package.nix similarity index 100% rename from pkgs/tools/archivers/ctrtool/default.nix rename to pkgs/by-name/ct/ctrtool/package.nix diff --git a/pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch b/pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch new file mode 100644 index 000000000000..2aafd621c278 --- /dev/null +++ b/pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1a30d61..bea8d7c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,13 +50,6 @@ include(FetchContent) + + set(CMAKE_VERBOSE_MAKEFILE ON) + +-#========================================== PRE-CHECKS ============================================# +-include(FindGit) +-find_package(Git) +- +-if (NOT Git_FOUND) +- message(FATAL_ERROR "Required package 'Git' not found on system.") +-endif () + + #======================================== LIB IMPORTS =============================================# + # ======= # +@@ -68,28 +61,9 @@ include_directories(${OPENSSL_INCLUDE_DIR}) + # ============== # + # JSON-C library # + # ============== # +-set(JSONC_DOWNLOAD_PATH "${TEMP_DIR_PATH}/libjsonc") +-set(JSONC_INSTALL_PATH "${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}") +- +-add_custom_target(make-jsonc-install-dir ALL +- COMMAND ${CMAKE_COMMAND} -E make_directory ${JSONC_INSTALL_PATH} +-) +- +-ExternalProject_Add(libjsonc +- PREFIX "${JSONC_DOWNLOAD_PATH}" +- SOURCE_DIR "${JSONC_DOWNLOAD_PATH}/src/libjsonc-build" +- GIT_REPOSITORY "https://github.com/json-c/json-c.git" +- CMAKE_ARGS "-DBUILD_STATIC_LIBS=ON" +- "-DBUILD_SHARED_LIBS=OFF" +- "-DCMAKE_INSTALL_PREFIX:PATH=${JSONC_INSTALL_PATH}" +- "-DHAVE_ARC4RANDOM=OFF" +- "-DCMAKE_BUILD_TYPE=release" +-) +- +-set(JSONC_LIBRARIES +- ${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/lib/libjson-c.a +- bsd +-) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(JSONC REQUIRED json-c) ++include_directories(${JSONC_INCLUDE_DIRS}) + + # ============ # + # Curl library # +@@ -408,7 +382,7 @@ add_subdirectory(docs) + #endforeach() + + add_executable(ctune ${SOURCE_FILES}) +-add_dependencies(ctune ctune_logger libjsonc) ++add_dependencies(ctune ctune_logger) + include_directories(${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/include) + + add_dependencies(ctune ${CTUNE_PLUGIN_LIST_AUDIO_PLAYER}) diff --git a/pkgs/by-name/ct/ctune/package.nix b/pkgs/by-name/ct/ctune/package.nix new file mode 100644 index 000000000000..c9e38fba90ab --- /dev/null +++ b/pkgs/by-name/ct/ctune/package.nix @@ -0,0 +1,66 @@ +{ + stdenv, + lib, + fetchFromGitHub, + openssl, + curl, + ffmpeg, + vlc, + SDL2, + lame, + json_c, + cmake, + pkg-config, + ncurses, + libuuid, + pandoc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ctune"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "An7ar35"; + repo = "ctune"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fy7Wb4R6HDa+cLxI5YWq67gxw1XS/iDDN4M3Rn7GYeI="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + pandoc + ]; + + buildInputs = [ + openssl + curl + ffmpeg + vlc + SDL2 + lame + json_c + ncurses + libuuid + ]; + + strictDeps = true; + + cmakeFlags = [ + # Avoid a wrong nested install path location + # Set to "$out" instead of "$out/$out" + "-DCMAKE_INSTALL_PREFIX=''" + ]; + + patches = [ ./cmake_disable_git_clone.patch ]; + + meta = { + description = "A nice terminal nCurses (tui) internet radio player for Linux, browse and search from api.radio-browser.info"; + homepage = " https://github.com/An7ar35/ctune"; + changelog = "https://github.com/An7ar35/ctune/blob/master/CHANGELOG.md"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "ctune"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/by-name/ct/ctypes_sh/package.nix similarity index 100% rename from pkgs/development/libraries/ctypes_sh/default.nix rename to pkgs/by-name/ct/ctypes_sh/package.nix diff --git a/pkgs/development/libraries/cudd/cudd.patch b/pkgs/by-name/cu/cudd/cudd.patch similarity index 100% rename from pkgs/development/libraries/cudd/cudd.patch rename to pkgs/by-name/cu/cudd/cudd.patch diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/by-name/cu/cudd/package.nix similarity index 100% rename from pkgs/development/libraries/cudd/default.nix rename to pkgs/by-name/cu/cudd/package.nix diff --git a/pkgs/development/tools/cuelsp/default.nix b/pkgs/by-name/cu/cuelsp/package.nix similarity index 100% rename from pkgs/development/tools/cuelsp/default.nix rename to pkgs/by-name/cu/cuelsp/package.nix diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/by-name/cu/cuetools/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/cuetools/default.nix rename to pkgs/by-name/cu/cuetools/package.nix diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/by-name/cu/culmus/package.nix similarity index 100% rename from pkgs/data/fonts/culmus/default.nix rename to pkgs/by-name/cu/culmus/package.nix diff --git a/pkgs/by-name/cu/culvert/package.nix b/pkgs/by-name/cu/culvert/package.nix new file mode 100644 index 000000000000..a2c69e5df2c5 --- /dev/null +++ b/pkgs/by-name/cu/culvert/package.nix @@ -0,0 +1,46 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + meson, + ninja, + pkg-config, + dtc, +}: + +stdenv.mkDerivation rec { + pname = "culvert"; + version = "0.4.0.unstable-2024-10-17"; + + src = fetchFromGitHub { + owner = "amboar"; + repo = "culvert"; + rev = "770a6ed4badec1c6e3079cd9b354d0996d55b326"; + hash = "sha256-Lj72uYItTxTVYcSEbr/XezeyFvrcqqMTu74tOE+DwJE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + dtc # The dtc binary to compile device trees + ]; + + buildInputs = [ + dtc # provides libfdt + ]; + + mesonFlags = [ + "-Db_lto=false" + ]; + + meta = with lib; { + homepage = "https://github.com/amboar/culvert"; + description = "A Test and Debug Tool for BMC AHB Interfaces "; + mainProgram = "culvert"; + license = licenses.asl20; + maintainers = [ maintainers.baloo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/by-name/cu/cum/package.nix similarity index 100% rename from pkgs/applications/misc/cum/default.nix rename to pkgs/by-name/cu/cum/package.nix diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/by-name/cu/cuneiform/package.nix similarity index 100% rename from pkgs/tools/graphics/cuneiform/default.nix rename to pkgs/by-name/cu/cuneiform/package.nix diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/by-name/cu/cunit/package.nix similarity index 100% rename from pkgs/tools/misc/cunit/default.nix rename to pkgs/by-name/cu/cunit/package.nix diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/by-name/cu/cups-bjnp/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/cups-bjnp/default.nix rename to pkgs/by-name/cu/cups-bjnp/package.nix diff --git a/pkgs/misc/cups/drivers/hll2350dw/default.nix b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/hll2350dw/default.nix rename to pkgs/by-name/cu/cups-brother-hll2350dw/package.nix diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch b/pkgs/by-name/cu/cups-brother-hll2375dw/fix-perm.patch similarity index 100% rename from pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch rename to pkgs/by-name/cu/cups-brother-hll2375dw/fix-perm.patch diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/brother/hll2375dw/default.nix rename to pkgs/by-name/cu/cups-brother-hll2375dw/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2750dw/default.nix rename to pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix diff --git a/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix b/pkgs/by-name/cu/cups-drv-rastertosag-gdi/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix rename to pkgs/by-name/cu/cups-drv-rastertosag-gdi/package.nix diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/by-name/cu/cups-dymo/fix-includes.patch similarity index 100% rename from pkgs/misc/cups/drivers/dymo/fix-includes.patch rename to pkgs/by-name/cu/cups-dymo/fix-includes.patch diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/by-name/cu/cups-dymo/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/dymo/default.nix rename to pkgs/by-name/cu/cups-dymo/package.nix diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix b/pkgs/by-name/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix rename to pkgs/by-name/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/package.nix diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix b/pkgs/by-name/cu/cups-kyocera-ecosys-m552x-p502x/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix rename to pkgs/by-name/cu/cups-kyocera-ecosys-m552x-p502x/package.nix diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/by-name/cu/cups-kyocera/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyocera/default.nix rename to pkgs/by-name/cu/cups-kyocera/package.nix diff --git a/pkgs/misc/cups/drivers/kyodialog/default.nix b/pkgs/by-name/cu/cups-kyodialog/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyodialog/default.nix rename to pkgs/by-name/cu/cups-kyodialog/package.nix diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix rename to pkgs/by-name/cu/cups-pdf-to-pdf/package.nix diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/by-name/cu/cups-toshiba-estudio/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/estudio/default.nix rename to pkgs/by-name/cu/cups-toshiba-estudio/package.nix diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/by-name/cu/cups-zj-58/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/zj-58/default.nix rename to pkgs/by-name/cu/cups-zj-58/package.nix diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/by-name/cu/curie/package.nix similarity index 100% rename from pkgs/data/fonts/curie/default.nix rename to pkgs/by-name/cu/curie/package.nix diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix new file mode 100644 index 000000000000..e64f0007c1cb --- /dev/null +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -0,0 +1,227 @@ +{ lib, stdenv, fetchurl, darwin, pkg-config, perl, nixosTests +, brotliSupport ? false, brotli +, c-aresSupport ? false, c-aresMinimal +, gnutlsSupport ? false, gnutls +, gsaslSupport ? false, gsasl +, gssSupport ? with stdenv.hostPlatform; ( + !isWindows && + # disable gss because of: undefined reference to `k5_bcmp' + # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 + !isStatic && + # the "mig" tool does not configure its compiler correctly. This could be + # fixed in mig, but losing gss support on cross compilation to darwin is + # not worth the effort. + !(isDarwin && (stdenv.buildPlatform != stdenv.hostPlatform)) + ), libkrb5 +, http2Support ? true, nghttp2 +, http3Support ? false, nghttp3, ngtcp2 +, websocketSupport ? false +, idnSupport ? false, libidn2 +, ldapSupport ? false, openldap +, opensslSupport ? zlibSupport, openssl +, pslSupport ? false, libpsl +, rtmpSupport ? false, rtmpdump +, scpSupport ? zlibSupport && !stdenv.hostPlatform.isSunOS && !stdenv.hostPlatform.isCygwin, libssh2 +, wolfsslSupport ? false, wolfssl +, rustlsSupport ? false, rustls-ffi +, zlibSupport ? true, zlib +, zstdSupport ? false, zstd + +# for passthru.tests +, coeurl +, curlpp +, haskellPackages +, ocamlPackages +, phpExtensions +, pkgsStatic +, python3 +, tests +, testers +, fetchpatch +}: + +# 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. + +assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsSupport ]) > 1); + +stdenv.mkDerivation (finalAttrs: { + pname = "curl"; + version = "8.10.1"; + + src = fetchurl { + urls = [ + "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" + "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" + ]; + hash = "sha256-c6Sw6ZWWoJ+lkkpPt+S5lahf2g0YosAquc8TS+vOBO4="; + }; + + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname + patchShebangs scripts + ''; + + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + separateDebugInfo = stdenv.hostPlatform.isLinux; + + enableParallelBuilding = true; + + strictDeps = true; + + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) { + # Not having this causes curl’s `configure` script to fail with static builds on Darwin because + # some of curl’s propagated inputs need libiconv. + NIX_LDFLAGS = "-liconv"; + }; + + nativeBuildInputs = [ pkg-config perl ]; + + # Zlib and OpenSSL must be propagated because `libcurl.la' contains + # "-lz -lssl", which aren't necessary direct build inputs of + # applications that use Curl. + propagatedBuildInputs = + lib.optional brotliSupport brotli ++ + lib.optional c-aresSupport c-aresMinimal ++ + lib.optional gnutlsSupport gnutls ++ + lib.optional gsaslSupport gsasl ++ + lib.optional gssSupport libkrb5 ++ + lib.optional http2Support nghttp2 ++ + lib.optionals http3Support [ nghttp3 ngtcp2 ] ++ + lib.optional idnSupport libidn2 ++ + lib.optional ldapSupport openldap ++ + lib.optional opensslSupport openssl ++ + lib.optional pslSupport libpsl ++ + lib.optional rtmpSupport rtmpdump ++ + lib.optional scpSupport libssh2 ++ + lib.optional wolfsslSupport wolfssl ++ + lib.optional rustlsSupport rustls-ffi ++ + lib.optional zlibSupport zlib ++ + lib.optional zstdSupport zstd ++ + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + CoreServices + SystemConfiguration + ]); + + # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html + preConfigure = '' + sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure + rm src/tool_hugehelp.c + '' + lib.optionalString (pslSupport && stdenv.hostPlatform.isStatic) '' + # curl doesn't understand that libpsl2 has deps because it doesn't use + # pkg-config. + # https://github.com/curl/curl/pull/12919 + configureFlagsArray+=("LIBS=-lidn2 -lunistring") + ''; + + configureFlags = [ + "--enable-versioned-symbols" + # Build without manual + "--disable-manual" + (lib.enableFeature c-aresSupport "ares") + (lib.enableFeature ldapSupport "ldap") + (lib.enableFeature ldapSupport "ldaps") + (lib.enableFeature websocketSupport "websockets") + # --with-ca-fallback is only supported for openssl and gnutls https://github.com/curl/curl/blame/curl-8_0_1/acinclude.m4#L1640 + (lib.withFeature (opensslSupport || gnutlsSupport) "ca-fallback") + (lib.withFeature http3Support "nghttp3") + (lib.withFeature http3Support "ngtcp2") + (lib.withFeature rtmpSupport "librtmp") + (lib.withFeature rustlsSupport "rustls") + (lib.withFeature zstdSupport "zstd") + (lib.withFeature pslSupport "libpsl") + (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli)) + (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) + (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2)) + (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl)) + (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2)) + (lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl)) + ] + ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}" + # For the 'urandom', maybe it should be a cross-system option + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--with-random=/dev/urandom" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. + # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. + "--without-ca-bundle" + "--without-ca-path" + ] ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [ + "--without-ssl" + ] ++ lib.optionals (rustlsSupport && !stdenv.hostPlatform.isDarwin) [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + ] ++ lib.optionals (gnutlsSupport && !stdenv.hostPlatform.isDarwin) [ + "--with-ca-path=/etc/ssl/certs" + ]; + + CXX = "${stdenv.cc.targetPrefix}c++"; + CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; + + # takes 14 minutes on a 24 core and because many other packages depend on curl + # they cannot be run concurrently and are a bottleneck + # tests are available in passthru.tests.withCheck + doCheck = false; + preCheck = '' + patchShebangs tests/ + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # bad interaction with sandbox if enabled? + rm tests/data/test1453 + rm tests/data/test1086 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # different resolving behaviour? + rm tests/data/test1592 + ''; + + postInstall = '' + moveToOutput bin/curl-config "$dev" + + # Install completions + make -C scripts install + '' + lib.optionalString scpSupport '' + sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la + '' + lib.optionalString gnutlsSupport '' + ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary} + ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4 + ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0 + ''; + + passthru = let + useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; }; + in { + inherit opensslSupport openssl; + tests = { + withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; + curlpp = useThisCurl curlpp; + coeurl = useThisCurl coeurl; + haskell-curl = useThisCurl haskellPackages.curl; + ocaml-curly = useThisCurl ocamlPackages.curly; + pycurl = useThisCurl python3.pkgs.pycurl; + php-curl = useThisCurl phpExtensions.curl; + # error: attribute 'override' missing + # Additional checking with support http3 protocol. + # nginx-http3 = useThisCurl nixosTests.nginx-http3; + nginx-http3 = nixosTests.nginx-http3; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + static = pkgsStatic.curl; + }; + }; + + meta = { + changelog = "https://curl.se/ch/${finalAttrs.version}.html"; + description = "Command line tool for transferring files with URL syntax"; + homepage = "https://curl.se/"; + license = lib.licenses.curl; + maintainers = with lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.all; + # Fails to link against static brotli or gss + broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); + pkgConfigModules = [ "libcurl" ]; + mainProgram = "curl"; + }; +}) diff --git a/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch b/pkgs/by-name/cu/curlftpfs/fix-rpl_malloc.patch similarity index 100% rename from pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch rename to pkgs/by-name/cu/curlftpfs/fix-rpl_malloc.patch diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/by-name/cu/curlftpfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/curlftpfs/default.nix rename to pkgs/by-name/cu/curlftpfs/package.nix diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch b/pkgs/by-name/cu/curlftpfs/suse-bug-580609.patch similarity index 100% rename from pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch rename to pkgs/by-name/cu/curlftpfs/suse-bug-580609.patch diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch b/pkgs/by-name/cu/curlftpfs/suse-bug-955687.patch similarity index 100% rename from pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch rename to pkgs/by-name/cu/curlftpfs/suse-bug-955687.patch diff --git a/pkgs/tools/networking/curlie/bump-golang-x-sys.patch b/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch similarity index 100% rename from pkgs/tools/networking/curlie/bump-golang-x-sys.patch rename to pkgs/by-name/cu/curlie/bump-golang-x-sys.patch diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/by-name/cu/curlie/package.nix similarity index 100% rename from pkgs/tools/networking/curlie/default.nix rename to pkgs/by-name/cu/curlie/package.nix diff --git a/pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch b/pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch new file mode 100644 index 000000000000..c90dd96b6e7c --- /dev/null +++ b/pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch @@ -0,0 +1,25 @@ +diff --git a/doc/guide.tex b/doc/guide.tex +index 12165e7..76b5c59 100644 +--- a/doc/guide.tex ++++ b/doc/guide.tex +@@ -623,8 +623,6 @@ see the ``how to enhance cURLpp'' section. + cURL::CURLOPT_LOW_SPEED_TIME > LowSpeedTime; + typedef cURLpp::OptionTrait< long, + cURL::CURLOPT_MAXCONNECTS > MaxConnects; +- typedef cURLpp::OptionTrait< cURL::curl_closepolicy, +- cURL::CURLOPT_CLOSEPOLICY > ClosePolicy; + typedef cURLpp::OptionTrait< bool, + cURL::CURLOPT_FRESH_CONNECT > FreshConnect; + typedef cURLpp::OptionTrait< bool, +diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp +index c705c9d..ca6fec6 100644 +--- a/include/curlpp/Options.hpp ++++ b/include/curlpp/Options.hpp +@@ -278,7 +278,6 @@ namespace options + typedef curlpp::OptionTrait LowSpeedLimit; + typedef curlpp::OptionTrait LowSpeedTime; + typedef curlpp::OptionTrait MaxConnects; +- typedef curlpp::OptionTrait ClosePolicy; + typedef curlpp::OptionTrait FreshConnect; + typedef curlpp::OptionTrait ForbidReuse; + typedef curlpp::OptionTrait ConnectTimeout; diff --git a/pkgs/by-name/cu/curlpp/package.nix b/pkgs/by-name/cu/curlpp/package.nix new file mode 100644 index 000000000000..26f52d9dbaed --- /dev/null +++ b/pkgs/by-name/cu/curlpp/package.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl }: + +stdenv.mkDerivation rec { + pname = "curlpp"; + version = "0.8.1"; + src = fetchFromGitHub { + owner = "jpbarrette"; + repo = "curlpp"; + rev = "v${version}"; + sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk"; + }; + + patches = [ + # https://github.com/jpbarrette/curlpp/pull/171 + ./curl_8_10_build_failure.patch + ]; + + buildInputs = [ curl ]; + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://www.curlpp.org/"; + description = "C++ wrapper around libcURL"; + mainProgram = "curlpp-config"; + license = licenses.mit; + maintainers = with maintainers; [ CrazedProgrammer ]; + }; +} diff --git a/pkgs/applications/audio/curseradio/mpv.patch b/pkgs/by-name/cu/curseradio/mpv.patch similarity index 100% rename from pkgs/applications/audio/curseradio/mpv.patch rename to pkgs/by-name/cu/curseradio/mpv.patch diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/by-name/cu/curseradio/package.nix similarity index 100% rename from pkgs/applications/audio/curseradio/default.nix rename to pkgs/by-name/cu/curseradio/package.nix diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/by-name/cu/curtail/package.nix similarity index 100% rename from pkgs/applications/graphics/curtail/default.nix rename to pkgs/by-name/cu/curtail/package.nix diff --git a/pkgs/applications/graphics/curv/default.nix b/pkgs/by-name/cu/curv/package.nix similarity index 100% rename from pkgs/applications/graphics/curv/default.nix rename to pkgs/by-name/cu/curv/package.nix diff --git a/pkgs/applications/video/cutecapture/default.nix b/pkgs/by-name/cu/cutecapture/package.nix similarity index 100% rename from pkgs/applications/video/cutecapture/default.nix rename to pkgs/by-name/cu/cutecapture/package.nix diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/by-name/cu/cutee/package.nix similarity index 100% rename from pkgs/development/libraries/cutee/default.nix rename to pkgs/by-name/cu/cutee/package.nix diff --git a/pkgs/games/cuyo/default.nix b/pkgs/by-name/cu/cuyo/package.nix similarity index 100% rename from pkgs/games/cuyo/default.nix rename to pkgs/by-name/cu/cuyo/package.nix diff --git a/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch b/pkgs/by-name/cv/cvc4/cvc4-bash-patsub-replacement.patch similarity index 100% rename from pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch rename to pkgs/by-name/cv/cvc4/cvc4-bash-patsub-replacement.patch diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/pkgs/by-name/cv/cvc4/minisat-fenv.patch similarity index 100% rename from pkgs/applications/science/logic/cvc4/minisat-fenv.patch rename to pkgs/by-name/cv/cvc4/minisat-fenv.patch diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/by-name/cv/cvc4/package.nix similarity index 100% rename from pkgs/applications/science/logic/cvc4/default.nix rename to pkgs/by-name/cv/cvc4/package.nix diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/by-name/cv/cvehound/package.nix similarity index 100% rename from pkgs/development/tools/analysis/cvehound/default.nix rename to pkgs/by-name/cv/cvehound/package.nix diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/by-name/cv/cvs-fast-export/package.nix similarity index 100% rename from pkgs/applications/version-management/cvs-fast-export/default.nix rename to pkgs/by-name/cv/cvs-fast-export/package.nix diff --git a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/pkgs/by-name/cv/cvs/CVE-2012-0804.patch similarity index 100% rename from pkgs/applications/version-management/cvs/CVE-2012-0804.patch rename to pkgs/by-name/cv/cvs/CVE-2012-0804.patch diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/pkgs/by-name/cv/cvs/CVE-2017-12836.patch similarity index 100% rename from pkgs/applications/version-management/cvs/CVE-2017-12836.patch rename to pkgs/by-name/cv/cvs/CVE-2017-12836.patch diff --git a/pkgs/applications/version-management/cvs/getcwd-chroot.patch b/pkgs/by-name/cv/cvs/getcwd-chroot.patch similarity index 100% rename from pkgs/applications/version-management/cvs/getcwd-chroot.patch rename to pkgs/by-name/cv/cvs/getcwd-chroot.patch diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/by-name/cv/cvs/package.nix similarity index 100% rename from pkgs/applications/version-management/cvs/default.nix rename to pkgs/by-name/cv/cvs/package.nix diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/by-name/cv/cvs2svn/package.nix similarity index 100% rename from pkgs/applications/version-management/cvs2svn/default.nix rename to pkgs/by-name/cv/cvs2svn/package.nix diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/by-name/cv/cvsps/package.nix similarity index 100% rename from pkgs/applications/version-management/cvsps/default.nix rename to pkgs/by-name/cv/cvsps/package.nix diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/by-name/cv/cvsq/package.nix similarity index 100% rename from pkgs/applications/version-management/cvsq/default.nix rename to pkgs/by-name/cv/cvsq/package.nix diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/by-name/cw/cw/package.nix similarity index 100% rename from pkgs/tools/admin/cw/default.nix rename to pkgs/by-name/cw/cw/package.nix diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/by-name/cw/cwebbin/package.nix similarity index 100% rename from pkgs/development/tools/misc/cwebbin/default.nix rename to pkgs/by-name/cw/cwebbin/package.nix diff --git a/pkgs/development/libraries/cwiid/fix-ar.diff b/pkgs/by-name/cw/cwiid/fix-ar.diff similarity index 100% rename from pkgs/development/libraries/cwiid/fix-ar.diff rename to pkgs/by-name/cw/cwiid/fix-ar.diff diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/by-name/cw/cwiid/package.nix similarity index 100% rename from pkgs/development/libraries/cwiid/default.nix rename to pkgs/by-name/cw/cwiid/package.nix diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix new file mode 100644 index 000000000000..3557406e52b0 --- /dev/null +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -0,0 +1,96 @@ +{ + lib, + fetchFromGitHub, + git, + nodejs, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cwltool"; + version = "3.1.20241024121129"; + pyproject = true; + + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = "cwltool"; + rev = "refs/tags/${version}"; + hash = "sha256-MocgfELgis9b+byeDU7mDQcXnLhaWBtvGbqm7MtRdf8="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \ + --replace-fail "prov == 1.5.1" "prov" \ + --replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \ + --replace-fail "PYTEST_RUNNER + " "" + substituteInPlace pyproject.toml \ + --replace-fail "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \ + --replace-fail "mypy==1.13.0" "mypy" + ''; + + nativeBuildInputs = + [ + git + ] + ++ (with python3.pkgs; [ + setuptools + setuptools-scm + ]); + + dependencies = with python3.pkgs; [ + argcomplete + bagit + coloredlogs + cwl-utils + mypy + mypy-extensions + prov + psutil + pydot + rdflib + requests + ruamel-yaml + schema-salad + shellescape + spython + toml + types-psutil + types-requests + typing-extensions + ]; + + nativeCheckInputs = with python3.pkgs; [ + mock + nodejs + pytest-mock + pytest-httpserver + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + "test_content_types" + "test_env_filtering" + "test_http_path_mapping" + "test_modification_date" + ]; + + disabledTestPaths = [ + "tests/test_udocker.py" + "tests/test_provenance.py" + ]; + + pythonImportsCheck = [ + "cwltool" + ]; + + meta = with lib; { + description = "Common Workflow Language reference implementation"; + homepage = "https://www.commonwl.org"; + changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ veprbl ]; + mainProgram = "cwltool"; + }; +} diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/by-name/cw/cwm/package.nix similarity index 100% rename from pkgs/applications/window-managers/cwm/default.nix rename to pkgs/by-name/cw/cwm/package.nix diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/by-name/cx/cxx-prettyprint/package.nix similarity index 100% rename from pkgs/development/libraries/cxx-prettyprint/default.nix rename to pkgs/by-name/cx/cxx-prettyprint/package.nix diff --git a/pkgs/development/libraries/cxx-rs/Cargo.lock b/pkgs/by-name/cx/cxx-rs/Cargo.lock similarity index 100% rename from pkgs/development/libraries/cxx-rs/Cargo.lock rename to pkgs/by-name/cx/cxx-rs/Cargo.lock diff --git a/pkgs/development/libraries/cxx-rs/default.nix b/pkgs/by-name/cx/cxx-rs/package.nix similarity index 100% rename from pkgs/development/libraries/cxx-rs/default.nix rename to pkgs/by-name/cx/cxx-rs/package.nix diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/by-name/cx/cxxopts/package.nix similarity index 100% rename from pkgs/development/libraries/cxxopts/default.nix rename to pkgs/by-name/cx/cxxopts/package.nix diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/by-name/cx/cxxtools/package.nix similarity index 100% rename from pkgs/development/libraries/cxxtools/default.nix rename to pkgs/by-name/cx/cxxtools/package.nix diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/by-name/cy/cyan/package.nix similarity index 100% rename from pkgs/applications/graphics/cyan/default.nix rename to pkgs/by-name/cy/cyan/package.nix diff --git a/pkgs/development/interpreters/cyber/default.nix b/pkgs/by-name/cy/cyber/package.nix similarity index 100% rename from pkgs/development/interpreters/cyber/default.nix rename to pkgs/by-name/cy/cyber/package.nix diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/by-name/cy/cyberchef/package.nix similarity index 100% rename from pkgs/tools/misc/cyberchef/default.nix rename to pkgs/by-name/cy/cyberchef/package.nix diff --git a/pkgs/applications/networking/cyberduck/default.nix b/pkgs/by-name/cy/cyberduck/package.nix similarity index 100% rename from pkgs/applications/networking/cyberduck/default.nix rename to pkgs/by-name/cy/cyberduck/package.nix diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/by-name/cy/cyclone-scheme/package.nix similarity index 100% rename from pkgs/development/interpreters/cyclone/default.nix rename to pkgs/by-name/cy/cyclone-scheme/package.nix diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/by-name/cy/cyclone/package.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/cyclone/default.nix rename to pkgs/by-name/cy/cyclone/package.nix diff --git a/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/by-name/cy/cyclonedds/0001-Use-full-path-in-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch rename to pkgs/by-name/cy/cyclonedds/0001-Use-full-path-in-pkgconfig.patch diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/by-name/cy/cyclonedds/package.nix similarity index 100% rename from pkgs/development/libraries/cyclonedds/default.nix rename to pkgs/by-name/cy/cyclonedds/package.nix diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix similarity index 100% rename from pkgs/tools/misc/cyclonedx-python/default.nix rename to pkgs/by-name/cy/cyclonedx-python/package.nix diff --git a/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix similarity index 100% rename from pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix rename to pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/pkgs/by-name/cy/cyrus_sasl/cyrus-sasl-ac-try-run-fix.patch similarity index 100% rename from pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch rename to pkgs/by-name/cy/cyrus_sasl/cyrus-sasl-ac-try-run-fix.patch diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix similarity index 100% rename from pkgs/development/libraries/cyrus-sasl/default.nix rename to pkgs/by-name/cy/cyrus_sasl/package.nix diff --git a/pkgs/applications/version-management/cz-cli/default.nix b/pkgs/by-name/cz/cz-cli/package.nix similarity index 100% rename from pkgs/applications/version-management/cz-cli/default.nix rename to pkgs/by-name/cz/cz-cli/package.nix diff --git a/pkgs/by-name/cz/czkawka/0000-time.diff b/pkgs/by-name/cz/czkawka/0000-time.diff deleted file mode 100644 index 0fac8030127e..000000000000 --- a/pkgs/by-name/cz/czkawka/0000-time.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 5ae2bd6..e4c6f18 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -5676,9 +5676,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -5699,9 +5699,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/by-name/cz/czmq/package.nix similarity index 100% rename from pkgs/development/libraries/czmq/default.nix rename to pkgs/by-name/cz/czmq/package.nix diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/by-name/d-/d-seams/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/d-seams/default.nix rename to pkgs/by-name/d-/d-seams/package.nix diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix new file mode 100644 index 000000000000..7ed2a9890f96 --- /dev/null +++ b/pkgs/by-name/d-/d-spy/package.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, desktop-file-utils +, fetchurl +, glib +, gettext +, gtk4 +, libadwaita +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, gnome +}: + +stdenv.mkDerivation rec { + pname = "d-spy"; + version = "47.0"; + + outputs = [ "out" "lib" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/d-spy/${lib.versions.major version}/d-spy-${version}.tar.xz"; + hash = "sha256-7/sw1DKtXkPmxEm9+OMX2il+VuAnQW5z4ulsTPGPaeg="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + desktop-file-utils + wrapGAppsHook4 + gettext + glib + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "d-spy"; + }; + }; + + meta = with lib; { + description = "D-Bus exploration tool"; + mainProgram = "d-spy"; + homepage = "https://gitlab.gnome.org/GNOME/d-spy"; + license = with licenses; [ + lgpl3Plus # library + gpl3Plus # app + ]; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix new file mode 100644 index 000000000000..dcfac802de43 --- /dev/null +++ b/pkgs/by-name/d2/d2/package.nix @@ -0,0 +1,57 @@ +{ lib +, buildGo123Module +, fetchFromGitHub +, installShellFiles +, git +, testers +, d2 +}: + +buildGo123Module rec { + pname = "d2"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "terrastruct"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Sd4AkXKQVRJIgQTb7BbDNb8DbULyoWX8TuFtiu+Km5Y="; + }; + + vendorHash = "sha256-PMqN/6kzXR0d1y1PigBE0KJ8uP14n+qQziFqGai5zLE="; + + excludedPackages = [ "./e2etests" ]; + + ldflags = [ + "-s" + "-w" + "-X oss.terrastruct.com/d2/lib/version.Version=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ci/release/template/man/d2.1 + ''; + + nativeCheckInputs = [ git ]; + + preCheck = '' + # See https://github.com/terrastruct/d2/blob/master/docs/CONTRIBUTING.md#running-tests. + export TESTDATA_ACCEPT=1 + ''; + + passthru.tests.version = testers.testVersion { + package = d2; + version = "v${version}"; + }; + + meta = with lib; { + description = "Modern diagram scripting language that turns text to diagrams"; + mainProgram = "d2"; + homepage = "https://d2lang.com"; + changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ dit7ya kashw2 ]; + }; +} diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/by-name/d2/d2coding/package.nix similarity index 100% rename from pkgs/data/fonts/d2coding/default.nix rename to pkgs/by-name/d2/d2coding/package.nix diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/by-name/da/dab_lib/package.nix similarity index 100% rename from pkgs/development/libraries/dab_lib/default.nix rename to pkgs/by-name/da/dab_lib/package.nix diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/by-name/da/dabet/package.nix similarity index 100% rename from pkgs/tools/misc/dabet/default.nix rename to pkgs/by-name/da/dabet/package.nix diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/by-name/da/dabtools/package.nix similarity index 100% rename from pkgs/applications/radio/dabtools/default.nix rename to pkgs/by-name/da/dabtools/package.nix diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/by-name/da/dadadodo/package.nix similarity index 100% rename from pkgs/tools/text/dadadodo/default.nix rename to pkgs/by-name/da/dadadodo/package.nix diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/by-name/da/dae/package.nix similarity index 100% rename from pkgs/tools/networking/dae/default.nix rename to pkgs/by-name/da/dae/package.nix diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/by-name/da/daemon/package.nix similarity index 100% rename from pkgs/tools/system/daemon/default.nix rename to pkgs/by-name/da/daemon/package.nix diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/by-name/da/daemonize/package.nix similarity index 100% rename from pkgs/tools/system/daemonize/default.nix rename to pkgs/by-name/da/daemonize/package.nix diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/by-name/da/daemontools/fix-nix-usernamespace-build.patch similarity index 100% rename from pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch rename to pkgs/by-name/da/daemontools/fix-nix-usernamespace-build.patch diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/by-name/da/daemontools/package.nix similarity index 100% rename from pkgs/tools/admin/daemontools/default.nix rename to pkgs/by-name/da/daemontools/package.nix diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/by-name/da/dafny/deps.nix similarity index 100% rename from pkgs/applications/science/logic/dafny/deps.nix rename to pkgs/by-name/da/dafny/deps.nix diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/by-name/da/dafny/package.nix similarity index 100% rename from pkgs/applications/science/logic/dafny/default.nix rename to pkgs/by-name/da/dafny/package.nix diff --git a/pkgs/tools/misc/daktilo/default.nix b/pkgs/by-name/da/daktilo/package.nix similarity index 100% rename from pkgs/tools/misc/daktilo/default.nix rename to pkgs/by-name/da/daktilo/package.nix diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/by-name/da/dale/package.nix similarity index 100% rename from pkgs/development/compilers/dale/default.nix rename to pkgs/by-name/da/dale/package.nix diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/by-name/da/dalfox/package.nix similarity index 100% rename from pkgs/tools/security/dalfox/default.nix rename to pkgs/by-name/da/dalfox/package.nix diff --git a/pkgs/tools/admin/damon/default.nix b/pkgs/by-name/da/damon/package.nix similarity index 100% rename from pkgs/tools/admin/damon/default.nix rename to pkgs/by-name/da/damon/package.nix diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/by-name/da/dancing-script/package.nix similarity index 100% rename from pkgs/data/fonts/dancing-script/default.nix rename to pkgs/by-name/da/dancing-script/package.nix diff --git a/pkgs/servers/dante/clang-osint-m4.patch b/pkgs/by-name/da/dante/clang-osint-m4.patch similarity index 100% rename from pkgs/servers/dante/clang-osint-m4.patch rename to pkgs/by-name/da/dante/clang-osint-m4.patch diff --git a/pkgs/servers/dante/dante-1.4.3-miniupnpc-2.2.8.patch b/pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch similarity index 100% rename from pkgs/servers/dante/dante-1.4.3-miniupnpc-2.2.8.patch rename to pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch diff --git a/pkgs/servers/dante/default.nix b/pkgs/by-name/da/dante/package.nix similarity index 100% rename from pkgs/servers/dante/default.nix rename to pkgs/by-name/da/dante/package.nix diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/by-name/da/dapper/package.nix similarity index 100% rename from pkgs/development/tools/dapper/default.nix rename to pkgs/by-name/da/dapper/package.nix diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/by-name/da/daq/package.nix similarity index 100% rename from pkgs/applications/networking/ids/daq/default.nix rename to pkgs/by-name/da/daq/package.nix diff --git a/pkgs/applications/emulators/darcnes/label.patch b/pkgs/by-name/da/darcnes/label.patch similarity index 100% rename from pkgs/applications/emulators/darcnes/label.patch rename to pkgs/by-name/da/darcnes/label.patch diff --git a/pkgs/applications/emulators/darcnes/default.nix b/pkgs/by-name/da/darcnes/package.nix similarity index 100% rename from pkgs/applications/emulators/darcnes/default.nix rename to pkgs/by-name/da/darcnes/package.nix diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/by-name/da/darkhttpd/package.nix similarity index 100% rename from pkgs/servers/http/darkhttpd/default.nix rename to pkgs/by-name/da/darkhttpd/package.nix diff --git a/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch b/pkgs/by-name/da/darkice/fix-undeclared-memmove.patch similarity index 100% rename from pkgs/tools/audio/darkice/fix-undeclared-memmove.patch rename to pkgs/by-name/da/darkice/fix-undeclared-memmove.patch diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/by-name/da/darkice/package.nix similarity index 100% rename from pkgs/tools/audio/darkice/default.nix rename to pkgs/by-name/da/darkice/package.nix diff --git a/pkgs/applications/misc/darkman/go-mod.patch b/pkgs/by-name/da/darkman/go-mod.patch similarity index 100% rename from pkgs/applications/misc/darkman/go-mod.patch rename to pkgs/by-name/da/darkman/go-mod.patch diff --git a/pkgs/applications/misc/darkman/makefile.patch b/pkgs/by-name/da/darkman/makefile.patch similarity index 100% rename from pkgs/applications/misc/darkman/makefile.patch rename to pkgs/by-name/da/darkman/makefile.patch diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/by-name/da/darkman/package.nix similarity index 100% rename from pkgs/applications/misc/darkman/default.nix rename to pkgs/by-name/da/darkman/package.nix diff --git a/pkgs/games/darkplaces/default.nix b/pkgs/by-name/da/darkplaces/package.nix similarity index 100% rename from pkgs/games/darkplaces/default.nix rename to pkgs/by-name/da/darkplaces/package.nix diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/by-name/da/darkstat/package.nix similarity index 100% rename from pkgs/tools/networking/darkstat/default.nix rename to pkgs/by-name/da/darkstat/package.nix diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/by-name/da/darktile/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/darktile/default.nix rename to pkgs/by-name/da/darktile/package.nix diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/by-name/da/darling/package.nix similarity index 100% rename from pkgs/applications/emulators/darling/default.nix rename to pkgs/by-name/da/darling/package.nix diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 579f96ce9b0f..4e3b1dd9165d 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -11,24 +11,24 @@ }: let - embedded-protocol-version = "2.7.1"; + embedded-protocol-version = "3.1.0"; embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-6bGH/klCYxuq7CrOJVF8ySafhLJwet5ppBcpI8dzeCQ="; + hash = "sha256-DBoGACNhc9JMT8D+dO50aKUitY8xx/3IGj/XntFts1w="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.77.6"; + version = "1.80.5"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-GiZbx60HtyFTsargh0UVhjzOwlw3VWkhUEaX0s2ehos="; + hash = "sha256-A9e3GxOg1xkmOXjNyhg2ihnxKiMb2vORpwvAy+JWFZY="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index 8c3f3c83dce3..d22c50acf15f 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -4,21 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.8.0" }, "archive": { "dependency": "direct dev", @@ -34,31 +40,31 @@ "dependency": "direct main", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.0" }, "async": { "dependency": "direct main", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "charcode": { "dependency": "direct main", @@ -104,121 +110,121 @@ "dependency": "direct dev", "description": { "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.1" + "version": "0.4.2" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "sha256": "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.0" + "version": "1.10.0" }, "crypto": { "dependency": "direct dev", "description": { "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.6" }, "csslib": { "dependency": "transitive", "description": { "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.0.2" }, "dart_mappable": { "dependency": "transitive", "description": { "name": "dart_mappable", - "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", + "sha256": "f69a961ae8589724ebb542e588f228ae844c5f78028899cbe2cc718977c1b382", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.2" + "version": "4.3.0" }, "dart_style": { "dependency": "direct dev", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7" }, "dartdoc": { "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "76de402781a647e55f356f1ae4446a400a573421f84c95da13dda4754cdbcceb", + "sha256": "818bf58bd0325cb574df31e5c08969f0e690a9cb13826eaac2efc02c7e41655a", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.8" + "version": "8.1.0" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "frontend_server_client": { "dependency": "transitive", @@ -254,21 +260,21 @@ "dependency": "transitive", "description": { "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.4" + "version": "0.15.5" }, "http": { "dependency": "direct main", "description": { "name": "http", - "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "http_multi_server": { "dependency": "transitive", @@ -284,11 +290,11 @@ "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.1" }, "io": { "dependency": "transitive", @@ -334,11 +340,21 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" }, "markdown": { "dependency": "transitive", @@ -364,21 +380,21 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "2.0.0" }, "native_stack_traces": { "dependency": "transitive", @@ -394,11 +410,11 @@ "dependency": "direct main", "description": { "name": "native_synchronization", - "sha256": "ff200fe0a64d733ff7d4dde2005271c297db81007604c8cd21037959858133ab", + "sha256": "047fa3665d611e178edc167e56166714f125750f064d20216892f1cca69d9d1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.3.1" }, "node_interop": { "dependency": "direct main", @@ -424,11 +440,11 @@ "dependency": "transitive", "description": { "name": "oauth2", - "sha256": "c4013ef62be37744efdc0861878fd9e9285f34db1f9e331cc34100d7674feb42", + "sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "2.0.3" }, "package_config": { "dependency": "direct main", @@ -444,11 +460,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "petitparser": { "dependency": "transitive", @@ -494,11 +510,11 @@ "dependency": "direct dev", "description": { "name": "pub_api_client", - "sha256": "cc3d2c93df3823553de6a3e7d3ac09a3f43f8c271af4f43c2795266090ac9625", + "sha256": "06321793e558b2dfac3a11098a530b816a8f752a5cf9208a382be9a418e3f5fc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "2.7.1" }, "pub_semver": { "dependency": "direct main", @@ -534,11 +550,11 @@ "dependency": "transitive", "description": { "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "retry": { "dependency": "transitive", @@ -554,11 +570,11 @@ "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -574,11 +590,11 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", @@ -594,11 +610,11 @@ "dependency": "transitive", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "source_maps": { "dependency": "direct main", @@ -624,11 +640,11 @@ "dependency": "direct main", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "direct main", @@ -654,11 +670,11 @@ "dependency": "direct main", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.0" }, "term_glyph": { "dependency": "direct main", @@ -674,31 +690,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.7" + "version": "1.25.8" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.4" + "version": "0.6.5" }, "test_descriptor": { "dependency": "direct dev", @@ -734,11 +750,11 @@ "dependency": "direct main", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "uri": { "dependency": "transitive", @@ -754,11 +770,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.4" + "version": "14.3.1" }, "watcher": { "dependency": "direct main", @@ -774,31 +790,31 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.0" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.5" + "version": "0.1.6" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.0.1" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -832,6 +848,6 @@ } }, "sdks": { - "dart": ">=3.3.0 <4.0.0" + "dart": ">=3.5.0 <4.0.0" } } diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/by-name/da/das_watchdog/package.nix similarity index 100% rename from pkgs/tools/system/das_watchdog/default.nix rename to pkgs/by-name/da/das_watchdog/package.nix diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/by-name/da/dasel/package.nix similarity index 100% rename from pkgs/applications/misc/dasel/default.nix rename to pkgs/by-name/da/dasel/package.nix diff --git a/pkgs/shells/dash/default.nix b/pkgs/by-name/da/dash/package.nix similarity index 100% rename from pkgs/shells/dash/default.nix rename to pkgs/by-name/da/dash/package.nix diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/by-name/da/dasher/package.nix similarity index 100% rename from pkgs/applications/accessibility/dasher/default.nix rename to pkgs/by-name/da/dasher/package.nix diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/by-name/da/dashing/package.nix similarity index 100% rename from pkgs/tools/misc/dashing/default.nix rename to pkgs/by-name/da/dashing/package.nix diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/by-name/da/dasht/package.nix similarity index 100% rename from pkgs/tools/misc/dasht/default.nix rename to pkgs/by-name/da/dasht/package.nix diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix new file mode 100644 index 000000000000..dafb76a7c8ef --- /dev/null +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + yq-go, + settings ? { }, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "dashy-ui"; + # This is like 3.1.1 but the latest working yarn.lock. + # All other changes are for docs with the exception of 768d746cbfcf365c58ad1194c5ccc74c14f3ed3a, which simply adds no-referrer meta tag + version = "3.1.1-unstable-2024-07-14"; + src = fetchFromGitHub { + owner = "lissy93"; + repo = "dashy"; + rev = "0b1af9db483f80323e782e7834da2a337393e111"; + hash = "sha256-lRJ3lI9UUIaw9GWPEy81Dbf4cu6rClA4VjdWejVQN+g="; + }; + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-KVAZIBM47yp1NWYc2esvTwfoAev4q7Wgi0c73PUZRNw="; + }; + # - If no settings are passed, use the default config provided by upstream + # - Despite JSON being valid YAML (and the JSON passing the config validator), + # there seem to be some issues with JSON in the final build - potentially due to + # the way the client parses things + # - Instead, we use `yq-go` to convert it to yaml + # Config validation needs to happen after yarnConfigHook, since it's what sets the yarn offline cache + postYarnConfigHook = lib.optional (settings != { }) '' + echo "Writing settings override..." + yq --output-format yml '${builtins.toFile "conf.json" ''${builtins.toJSON settings}''}' > user-data/conf.yml + yarn validate-config --offline + ''; + installPhase = '' + mkdir $out + cp -R dist/* $out + ''; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + # For yaml parsing + yq-go + ]; + doDist = false; + meta = { + description = "dashy"; + homepage = "https://dashy.to"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therealgramdalf ]; + }; +}) diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/by-name/da/dasm/package.nix similarity index 100% rename from pkgs/development/compilers/dasm/default.nix rename to pkgs/by-name/da/dasm/package.nix diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/by-name/da/datafusion-cli/package.nix similarity index 100% rename from pkgs/development/misc/datafusion/default.nix rename to pkgs/by-name/da/datafusion-cli/package.nix diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/by-name/da/datamash/package.nix similarity index 100% rename from pkgs/tools/misc/datamash/default.nix rename to pkgs/by-name/da/datamash/package.nix diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/by-name/da/datefmt/package.nix similarity index 100% rename from pkgs/tools/misc/datefmt/default.nix rename to pkgs/by-name/da/datefmt/package.nix diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/by-name/da/datefudge/package.nix similarity index 100% rename from pkgs/tools/system/datefudge/default.nix rename to pkgs/by-name/da/datefudge/package.nix diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/by-name/da/dateutils/package.nix similarity index 100% rename from pkgs/tools/misc/dateutils/default.nix rename to pkgs/by-name/da/dateutils/package.nix diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/by-name/da/datree/package.nix similarity index 100% rename from pkgs/development/tools/datree/default.nix rename to pkgs/by-name/da/datree/package.nix diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/by-name/da/dav1d/package.nix similarity index 100% rename from pkgs/development/libraries/dav1d/default.nix rename to pkgs/by-name/da/dav1d/package.nix diff --git a/pkgs/servers/http/dave/go-modules.patch b/pkgs/by-name/da/dave/go-modules.patch similarity index 100% rename from pkgs/servers/http/dave/go-modules.patch rename to pkgs/by-name/da/dave/go-modules.patch diff --git a/pkgs/servers/http/dave/default.nix b/pkgs/by-name/da/dave/package.nix similarity index 100% rename from pkgs/servers/http/dave/default.nix rename to pkgs/by-name/da/dave/package.nix diff --git a/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch b/pkgs/by-name/da/davfs2/0001-umount_davfs-substitute-ps-command.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch rename to pkgs/by-name/da/davfs2/0001-umount_davfs-substitute-ps-command.patch diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/by-name/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch rename to pkgs/by-name/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch diff --git a/pkgs/tools/filesystems/davfs2/disable-suid.patch b/pkgs/by-name/da/davfs2/disable-suid.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/disable-suid.patch rename to pkgs/by-name/da/davfs2/disable-suid.patch diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/pkgs/by-name/da/davfs2/fix-sysconfdir.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch rename to pkgs/by-name/da/davfs2/fix-sysconfdir.patch diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/by-name/da/davfs2/package.nix similarity index 100% rename from pkgs/tools/filesystems/davfs2/default.nix rename to pkgs/by-name/da/davfs2/package.nix diff --git a/pkgs/tools/security/davtest/default.nix b/pkgs/by-name/da/davtest/package.nix similarity index 100% rename from pkgs/tools/security/davtest/default.nix rename to pkgs/by-name/da/davtest/package.nix diff --git a/pkgs/applications/science/physics/dawn/default.nix b/pkgs/by-name/da/dawn/package.nix similarity index 100% rename from pkgs/applications/science/physics/dawn/default.nix rename to pkgs/by-name/da/dawn/package.nix diff --git a/pkgs/applications/science/physics/dawncut/default.nix b/pkgs/by-name/da/dawncut/package.nix similarity index 100% rename from pkgs/applications/science/physics/dawncut/default.nix rename to pkgs/by-name/da/dawncut/package.nix diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/by-name/da/dayon/package.nix similarity index 100% rename from pkgs/applications/networking/remote/dayon/default.nix rename to pkgs/by-name/da/dayon/package.nix diff --git a/pkgs/servers/db-rest/default.nix b/pkgs/by-name/db/db-rest/package.nix similarity index 100% rename from pkgs/servers/db-rest/default.nix rename to pkgs/by-name/db/db-rest/package.nix diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/by-name/db/dbacl/package.nix similarity index 100% rename from pkgs/tools/misc/dbacl/default.nix rename to pkgs/by-name/db/dbacl/package.nix diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix new file mode 100644 index 000000000000..e758e1c8fcc2 --- /dev/null +++ b/pkgs/by-name/db/dbcsr/package.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, mpiCheckPhaseHook +, pkg-config +, fypp +, gfortran +, blas +, lapack +, python3 +, libxsmm +, mpi +}: + +stdenv.mkDerivation rec { + pname = "dbcsr"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "cp2k"; + repo = "dbcsr"; + rev = "v${version}"; + hash = "sha256-QEO7f27DLsCvKXgFJnneHs1kO+5V9xiURpbQuGg1P0M="; + }; + + postPatch = '' + patchShebangs . + + # Force build of shared library, otherwise just static. + substituteInPlace src/CMakeLists.txt \ + --replace 'add_library(dbcsr ''${DBCSR_SRCS})' 'add_library(dbcsr SHARED ''${DBCSR_SRCS})' \ + --replace 'add_library(dbcsr_c ''${DBCSR_C_SRCS})' 'add_library(dbcsr_c SHARED ''${DBCSR_C_SRCS})' + + # Avoid calling the fypp wrapper script with python again. The nix wrapper took care of that. + substituteInPlace cmake/fypp-sources.cmake \ + --replace 'COMMAND ''${Python_EXECUTABLE} ''${FYPP_EXECUTABLE}' 'COMMAND ''${FYPP_EXECUTABLE}' + ''; + + nativeBuildInputs = [ + gfortran + python3 + cmake + pkg-config + fypp + ]; + + buildInputs = [ blas lapack libxsmm ]; + + propagatedBuildInputs = [ mpi ]; + + cmakeFlags = [ + "-DUSE_OPENMP=ON" + "-DUSE_SMM=libxsmm" + "-DWITH_C_API=ON" + "-DBUILD_TESTING=ON" + "-DTEST_OMP_THREADS=2" + "-DTEST_MPI_RANKS=2" + "-DENABLE_SHARED=ON" + "-DUSE_MPI=ON" + ]; + + checkInputs = [ + mpiCheckPhaseHook + ]; + + doCheck = true; + + meta = with lib; { + description = "Distributed Block Compressed Sparse Row matrix library"; + license = licenses.gpl2Only; + homepage = "https://github.com/cp2k/dbcsr"; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 8e62a026ba00..c9cc55579986 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -12,6 +12,7 @@ glib, webkitgtk_4_0, glib-networking, + override_xmx ? "1024m", }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -40,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit hash; }; - sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "dbeaver.app"; + sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "DBeaver.app"; nativeBuildInputs = [ makeWrapper ] @@ -54,6 +55,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; + prePatch = '' + substituteInPlace ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}dbeaver.ini \ + --replace-fail '-Xmx1024m' '-Xmx${override_xmx}' + ''; + installPhase = if !stdenvNoCC.hostPlatform.isDarwin then '' diff --git a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch b/pkgs/by-name/db/dbench/fix-missing-stdint.patch similarity index 100% rename from pkgs/development/tools/misc/dbench/fix-missing-stdint.patch rename to pkgs/by-name/db/dbench/fix-missing-stdint.patch diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/by-name/db/dbench/package.nix similarity index 100% rename from pkgs/development/tools/misc/dbench/default.nix rename to pkgs/by-name/db/dbench/package.nix diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 8d844d3972d4..2f260a639d7c 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2024-10"; + version = "2024-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-zfBRxZ6xwIrOC6MrmtbfKrIK7jxMD/1EMOgQDON6nPw="; + hash = "sha256-uqtn3Dy8GYjRHX3LNky0DUAc+MxEph41AKShxsPdJJM="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index b0e3e4260cbe..c957eb0bc510 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2024-10"; + version = "2024-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-sPjtO0WRdMxGiTySFO3vA1mL3RHxDnhLFzQ1fq2LNUw="; + hash = "sha256-w/Dl89AdhIfsfNu4IvVMEVKqZtQcqg0UAjB7HJxq/OE="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index 74f9ce977067..c02bdee10547 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-10"; + version = "2024-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-MeAhfDY2jdX2WDsNGNjvH/JeCo9C1hx3PWyk8am9Ut0="; + hash = "sha256-Ua4hm0duKHAD/cgtOaDqAYT/4lWsuoIdPnM7K0Lqecw="; }; dontUnpack = true; diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/by-name/db/dblab/package.nix similarity index 100% rename from pkgs/development/tools/database/dblab/default.nix rename to pkgs/by-name/db/dblab/package.nix diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/by-name/db/dblatex/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/dblatex/default.nix rename to pkgs/by-name/db/dblatex/package.nix diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix new file mode 100644 index 000000000000..ef549a34884c --- /dev/null +++ b/pkgs/by-name/db/dbmate/package.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dbmate"; + version = "2.22.0"; + + src = fetchFromGitHub { + owner = "amacneil"; + repo = "dbmate"; + rev = "refs/tags/v${version}"; + hash = "sha256-stemIBwUYW1TsDUBrgQLq858kPBiaHaXaRIr65lnWQo="; + }; + + vendorHash = "sha256-xJIY0vaN7gw/EhqeepKQPhaKISXNNPnaAMbowmHSUz4="; + + doCheck = false; + + meta = with lib; { + description = "Database migration tool"; + mainProgram = "dbmate"; + homepage = "https://github.com/amacneil/dbmate"; + changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ manveru ]; + }; +} diff --git a/pkgs/tools/security/dbmonster/default.nix b/pkgs/by-name/db/dbmonster/package.nix similarity index 100% rename from pkgs/tools/security/dbmonster/default.nix rename to pkgs/by-name/db/dbmonster/package.nix diff --git a/pkgs/os-specific/linux/dbus-broker/disable-test.patch b/pkgs/by-name/db/dbus-broker/disable-test.patch similarity index 100% rename from pkgs/os-specific/linux/dbus-broker/disable-test.patch rename to pkgs/by-name/db/dbus-broker/disable-test.patch diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix new file mode 100644 index 000000000000..9414f4fb33fe --- /dev/null +++ b/pkgs/by-name/db/dbus-broker/package.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchFromGitHub +, docutils +, meson +, ninja +, pkg-config +, dbus +, linuxHeaders +, systemd +}: + +let + meta = { + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.linux; + }; + + dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }: + stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "c-util"; + repo = pname; + inherit hash rev; + }; + nativeBuildInputs = [ meson ninja pkg-config ]; + inherit buildInputs; + meta = meta // { + description = "The C-Util Project is a collection of utility libraries for the C11 language."; + homepage = "https://c-util.github.io/"; + license = [ + lib.licenses.asl20 + lib.licenses.lgpl21Plus + ]; + }; + }; + + # These libraries are not used outside of dbus-broker. + # + # If that changes, we can always break them out, but they are essentially + # part of the dbus-broker project, just in separate repositories. + c-dvar = dep { pname = "c-dvar"; version = "1.1.0"; hash = "sha256-p/C+BktclVseCtZJ1Q/YK03vP2ClnYRLB1Vmj2OQJD4="; buildInputs = [ c-stdaux c-utf8 ]; }; + c-ini = dep { pname = "c-ini"; version = "1.1.0"; hash = "sha256-wa7aNl20hkb/83c4AkQ/0YFDdmBs4XGW+WLUtBWIC98="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; + c-list = dep { pname = "c-list"; version = "3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; }; + c-rbtree = dep { pname = "c-rbtree"; version = "3.2.0"; hash = "sha256-dTMeawhPLRtHvMXfXCrT5iCdoh7qS3v+raC6c+t+X38="; buildInputs = [ c-stdaux ]; }; + c-shquote = dep { pname = "c-shquote"; version = "1.1.0"; hash = "sha256-z6hpQ/kpCYAngMNfxLkfsxaGtvP4yBMigX1lGpIIzMQ="; buildInputs = [ c-stdaux ]; }; + c-stdaux = dep { pname = "c-stdaux"; version = "1.5.0"; hash = "sha256-MsnuEyVCmOIr/q6I1qyPsNXp48jxIEcXoYLHbOAZtW0="; }; + c-utf8 = dep { pname = "c-utf8"; version = "1.1.0"; hash = "sha256-9vBYylbt1ypJwIAQJd/oiAueh+4VYcn/KzofQuhUea0="; buildInputs = [ c-stdaux ]; }; + +in + +stdenv.mkDerivation (finalAttrs: { + pname = "dbus-broker"; + version = "36"; + + src = fetchFromGitHub { + owner = "bus1"; + repo = "dbus-broker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5dAMKjybqrHG57vArbtWEPR/svSj2ION75JrjvnnpVM="; + }; + + patches = [ + ./paths.patch + ./disable-test.patch + ]; + + nativeBuildInputs = [ docutils meson ninja pkg-config ]; + + buildInputs = [ + c-dvar + c-ini + c-list + c-rbtree + c-shquote + c-stdaux + c-utf8 + dbus + linuxHeaders + systemd + ]; + + mesonFlags = [ + # while we technically support 4.9 and 4.14, the NixOS module will throw an + # error when using a kernel that's too old + "-D=linux-4-17=true" + "-D=system-console-users=gdm,sddm,lightdm" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; + + postInstall = '' + install -Dm444 $src/README.md $out/share/doc/dbus-broker/README + + sed -i $out/lib/systemd/{system,user}/dbus-broker.service \ + -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' + ''; + + doCheck = true; + + meta = meta // { + description = "Linux D-Bus Message Broker"; + homepage = "https://github.com/bus1/dbus-broker/wiki"; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/os-specific/linux/dbus-broker/paths.patch b/pkgs/by-name/db/dbus-broker/paths.patch similarity index 100% rename from pkgs/os-specific/linux/dbus-broker/paths.patch rename to pkgs/by-name/db/dbus-broker/paths.patch diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/by-name/db/dbus-glib/package.nix similarity index 100% rename from pkgs/development/libraries/dbus-glib/default.nix rename to pkgs/by-name/db/dbus-glib/package.nix diff --git a/pkgs/development/tools/dbus-test-runner/default.nix b/pkgs/by-name/db/dbus-test-runner/package.nix similarity index 100% rename from pkgs/development/tools/dbus-test-runner/default.nix rename to pkgs/by-name/db/dbus-test-runner/package.nix diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/by-name/db/dbus_cplusplus/package.nix similarity index 100% rename from pkgs/development/libraries/dbus-cplusplus/default.nix rename to pkgs/by-name/db/dbus_cplusplus/package.nix diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/by-name/db/dbus_java/package.nix similarity index 100% rename from pkgs/development/libraries/java/dbus-java/default.nix rename to pkgs/by-name/db/dbus_java/package.nix diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/by-name/db/dbx/package.nix similarity index 100% rename from pkgs/applications/misc/dbx/default.nix rename to pkgs/by-name/db/dbx/package.nix diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/by-name/db/dbxml/cxx11.patch similarity index 100% rename from pkgs/development/libraries/dbxml/cxx11.patch rename to pkgs/by-name/db/dbxml/cxx11.patch diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/pkgs/by-name/db/dbxml/incorrect-optimization.patch similarity index 100% rename from pkgs/development/libraries/dbxml/incorrect-optimization.patch rename to pkgs/by-name/db/dbxml/incorrect-optimization.patch diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/by-name/db/dbxml/package.nix similarity index 100% rename from pkgs/development/libraries/dbxml/default.nix rename to pkgs/by-name/db/dbxml/package.nix diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/by-name/dc/dcadec/package.nix similarity index 100% rename from pkgs/development/tools/dcadec/default.nix rename to pkgs/by-name/dc/dcadec/package.nix diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/by-name/dc/dcap/package.nix similarity index 100% rename from pkgs/tools/networking/dcap/default.nix rename to pkgs/by-name/dc/dcap/package.nix diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/by-name/dc/dcfldd/package.nix similarity index 100% rename from pkgs/tools/system/dcfldd/default.nix rename to pkgs/by-name/dc/dcfldd/package.nix diff --git a/pkgs/os-specific/linux/dcgm/default.nix b/pkgs/by-name/dc/dcgm/package.nix similarity index 100% rename from pkgs/os-specific/linux/dcgm/default.nix rename to pkgs/by-name/dc/dcgm/package.nix diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/by-name/dc/dclib/package.nix similarity index 100% rename from pkgs/development/libraries/dclib/default.nix rename to pkgs/by-name/dc/dclib/package.nix diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/by-name/dc/dclxvi/package.nix similarity index 100% rename from pkgs/development/libraries/dclxvi/default.nix rename to pkgs/by-name/dc/dclxvi/package.nix diff --git a/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch b/pkgs/by-name/dc/dcm2niix/dont-fetch-external-libs.patch similarity index 100% rename from pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch rename to pkgs/by-name/dc/dcm2niix/dont-fetch-external-libs.patch diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/by-name/dc/dcm2niix/package.nix similarity index 100% rename from pkgs/applications/science/biology/dcm2niix/default.nix rename to pkgs/by-name/dc/dcm2niix/package.nix diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/by-name/dc/dcmtk/package.nix similarity index 100% rename from pkgs/applications/science/medicine/dcmtk/default.nix rename to pkgs/by-name/dc/dcmtk/package.nix diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/by-name/dc/dconf/package.nix similarity index 100% rename from pkgs/development/libraries/dconf/default.nix rename to pkgs/by-name/dc/dconf/package.nix diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/by-name/dc/dcraw/package.nix similarity index 100% rename from pkgs/tools/graphics/dcraw/default.nix rename to pkgs/by-name/dc/dcraw/package.nix diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/by-name/dc/dcrctl/package.nix similarity index 100% rename from pkgs/applications/blockchains/dcrctl/default.nix rename to pkgs/by-name/dc/dcrctl/package.nix diff --git a/pkgs/applications/blockchains/dcrd/default.nix b/pkgs/by-name/dc/dcrd/package.nix similarity index 100% rename from pkgs/applications/blockchains/dcrd/default.nix rename to pkgs/by-name/dc/dcrd/package.nix diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/by-name/dc/dcrwallet/package.nix similarity index 100% rename from pkgs/applications/blockchains/dcrwallet/default.nix rename to pkgs/by-name/dc/dcrwallet/package.nix diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/by-name/dc/dcs/package.nix similarity index 100% rename from pkgs/tools/text/dcs/default.nix rename to pkgs/by-name/dc/dcs/package.nix diff --git a/pkgs/by-name/dc/dcw-gmt/package.nix b/pkgs/by-name/dc/dcw-gmt/package.nix new file mode 100644 index 000000000000..efa697b2926a --- /dev/null +++ b/pkgs/by-name/dc/dcw-gmt/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchurl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dcw-gmt"; + version = "2.1.2"; + src = fetchurl { + url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; + }; + + installPhase = '' + mkdir -p $out/share/dcw-gmt + cp -rv ./* $out/share/dcw-gmt + ''; + + meta = with lib; { + homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; + description = "Vector basemap of the world, for use with GMT"; + longDescription = '' + DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap + of the world, available from the Princeton University Digital Map and + Geospatial Information Center. It contains more state boundaries (the + largest 8 countries are now represented) than the original data + source. Information about DCW can be found on Wikipedia + (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is + for use by GMT, the Generic Mapping Tools. + ''; + license = licenses.lgpl3Plus; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); + }; + +}) diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/by-name/dd/dd_rescue/package.nix similarity index 100% rename from pkgs/tools/system/dd_rescue/default.nix rename to pkgs/by-name/dd/dd_rescue/package.nix diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/by-name/dd/ddate/package.nix similarity index 100% rename from pkgs/tools/misc/ddate/default.nix rename to pkgs/by-name/dd/ddate/package.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix similarity index 100% rename from pkgs/data/misc/ddccontrol-db/default.nix rename to pkgs/by-name/dd/ddccontrol-db/package.nix diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/by-name/dd/ddccontrol/package.nix similarity index 100% rename from pkgs/tools/misc/ddccontrol/default.nix rename to pkgs/by-name/dd/ddccontrol/package.nix diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/by-name/dd/ddclient/package.nix similarity index 100% rename from pkgs/tools/networking/ddclient/default.nix rename to pkgs/by-name/dd/ddclient/package.nix diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/by-name/dd/ddcutil/package.nix similarity index 100% rename from pkgs/tools/misc/ddcutil/default.nix rename to pkgs/by-name/dd/ddcutil/package.nix diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/by-name/dd/ddd/package.nix similarity index 100% rename from pkgs/development/tools/misc/ddd/default.nix rename to pkgs/by-name/dd/ddd/package.nix diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/by-name/dd/ddev/package.nix similarity index 100% rename from pkgs/applications/virtualization/ddev/default.nix rename to pkgs/by-name/dd/ddev/package.nix diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/by-name/dd/ddgr/package.nix similarity index 100% rename from pkgs/applications/misc/ddgr/default.nix rename to pkgs/by-name/dd/ddgr/package.nix diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/by-name/dd/ddh/package.nix similarity index 100% rename from pkgs/tools/system/ddh/default.nix rename to pkgs/by-name/dd/ddh/package.nix diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/by-name/dd/ddns-go/package.nix similarity index 100% rename from pkgs/tools/networking/ddns-go/default.nix rename to pkgs/by-name/dd/ddns-go/package.nix diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/by-name/dd/ddosify/package.nix similarity index 100% rename from pkgs/development/tools/ddosify/default.nix rename to pkgs/by-name/dd/ddosify/package.nix diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/by-name/dd/ddrescue/package.nix similarity index 100% rename from pkgs/tools/system/ddrescue/default.nix rename to pkgs/by-name/dd/ddrescue/package.nix diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/by-name/dd/ddrescueview/package.nix similarity index 100% rename from pkgs/tools/system/ddrescueview/default.nix rename to pkgs/by-name/dd/ddrescueview/package.nix diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/by-name/dd/ddrutility/package.nix similarity index 100% rename from pkgs/tools/system/ddrutility/default.nix rename to pkgs/by-name/dd/ddrutility/package.nix diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/by-name/dd/dduper/package.nix similarity index 100% rename from pkgs/tools/filesystems/dduper/default.nix rename to pkgs/by-name/dd/dduper/package.nix diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/by-name/de/deadnix/package.nix similarity index 100% rename from pkgs/development/tools/deadnix/default.nix rename to pkgs/by-name/de/deadnix/package.nix diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix similarity index 100% rename from pkgs/applications/editors/deadpixi-sam/default.nix rename to pkgs/by-name/de/deadpixi-sam-unstable/package.nix diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/by-name/de/debian-devscripts/package.nix similarity index 100% rename from pkgs/tools/misc/debian-devscripts/default.nix rename to pkgs/by-name/de/debian-devscripts/package.nix diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/by-name/de/debian-goodies/package.nix similarity index 100% rename from pkgs/applications/misc/debian-goodies/default.nix rename to pkgs/by-name/de/debian-goodies/package.nix diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/by-name/de/debootstrap/package.nix similarity index 100% rename from pkgs/tools/misc/debootstrap/default.nix rename to pkgs/by-name/de/debootstrap/package.nix diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/by-name/de/debugedit/package.nix similarity index 100% rename from pkgs/development/tools/misc/debugedit/default.nix rename to pkgs/by-name/de/debugedit/package.nix diff --git a/pkgs/development/tools/dec-decode/default.nix b/pkgs/by-name/de/dec-decode/package.nix similarity index 100% rename from pkgs/development/tools/dec-decode/default.nix rename to pkgs/by-name/de/dec-decode/package.nix diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 617642488a00..e9a667bd7958 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "decker"; - version = "1.47"; + version = "1.50"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${version}"; - hash = "sha256-r0vBg9/IT9RQBea+XQSc270Q0+D3HzxbzdZV9oIh5vA="; + hash = "sha256-2va11qci/BEN6clw3aDjZA2EVaW1WF93bU44wPYyKrA="; }; buildInputs = [ diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix new file mode 100644 index 000000000000..eb913847221d --- /dev/null +++ b/pkgs/by-name/de/deckmaster/package.nix @@ -0,0 +1,47 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, roboto +}: + +buildGoModule rec { + pname = "deckmaster"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "deckmaster"; + rev = "refs/tags/v${version}"; + hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; + }; + + vendorHash = "sha256-DFssAic2YtXNH1Jm6zCDv1yPNz3YUXaFLs7j7rNHhlE="; + + proxyVendor = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # Let the app find Roboto-*.ttf files (hard-coded file names). + postFixup = '' + wrapProgram $out/bin/deckmaster \ + --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \ + ''; + + meta = with lib; { + description = "Application to control your Elgato Stream Deck on Linux"; + mainProgram = "deckmaster"; + homepage = "https://github.com/muesli/deckmaster"; + changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/by-name/de/deco/package.nix similarity index 100% rename from pkgs/applications/misc/deco/default.nix rename to pkgs/by-name/de/deco/package.nix diff --git a/pkgs/tools/networking/decode-spam-headers/default.nix b/pkgs/by-name/de/decode-spam-headers/package.nix similarity index 100% rename from pkgs/tools/networking/decode-spam-headers/default.nix rename to pkgs/by-name/de/decode-spam-headers/package.nix diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/by-name/de/decoder/package.nix similarity index 100% rename from pkgs/tools/security/decoder/default.nix rename to pkgs/by-name/de/decoder/package.nix diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/by-name/de/dedup/package.nix similarity index 100% rename from pkgs/tools/backup/dedup/default.nix rename to pkgs/by-name/de/dedup/package.nix diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/by-name/de/deepgit/package.nix similarity index 100% rename from pkgs/applications/version-management/deepgit/default.nix rename to pkgs/by-name/de/deepgit/package.nix diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/by-name/de/deepsea/package.nix similarity index 100% rename from pkgs/tools/security/deepsea/default.nix rename to pkgs/by-name/de/deepsea/package.nix diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix new file mode 100644 index 000000000000..10d48b0fc4ce --- /dev/null +++ b/pkgs/by-name/de/deepsource/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + installShellFiles, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "deepsource"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "DeepSourceCorp"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = true; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestReportKeyValueWorkflow" + "TestReportAnalyzerTypeWorkflow" + "TestReportKeyValueFileWorkflow" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + vendorHash = "sha256-SsMq4ngq3sSOL28ysHTxTF4CT9sIcCIW7yIhBxIPrNs="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd deepsource \ + --bash <($out/bin/deepsource completion bash) \ + --fish <($out/bin/deepsource completion fish) \ + --zsh <($out/bin/deepsource completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "Command line interface to DeepSource, the code health platform"; + mainProgram = "deepsource"; + homepage = "https://github.com/DeepSourceCorp/cli"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nipeharefa ]; + }; +} diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/by-name/de/deeptools/package.nix similarity index 100% rename from pkgs/applications/science/biology/deeptools/default.nix rename to pkgs/by-name/de/deeptools/package.nix diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/by-name/de/deer/package.nix similarity index 100% rename from pkgs/shells/zsh/zsh-deer/default.nix rename to pkgs/by-name/de/deer/package.nix diff --git a/pkgs/shells/zsh/zsh-deer/realpath.patch b/pkgs/by-name/de/deer/realpath.patch similarity index 100% rename from pkgs/shells/zsh/zsh-deer/realpath.patch rename to pkgs/by-name/de/deer/realpath.patch diff --git a/pkgs/by-name/de/deface/package.nix b/pkgs/by-name/de/deface/package.nix new file mode 100644 index 000000000000..5b80ed6e2528 --- /dev/null +++ b/pkgs/by-name/de/deface/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, python3 +, fetchFromGitHub +, pkgs +}: + +python3.pkgs.buildPythonApplication rec { + pname = "deface"; + version = "1.5.0"; + pyproject = true; + + disabled = python3.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ORB-HD"; + repo = "deface"; + rev = "refs/tags/v${version}"; + hash = "sha256-/mXWeL6OSgW4BMXtAZD/3UxQUGt7UE5ZvH8CXNCueJo="; + }; + + build-system = with python3.pkgs; [ + setuptools-scm + ]; + + dependencies = with python3.pkgs; [ + imageio + imageio-ffmpeg + numpy + onnx + onnxruntime # Nixpkgs onnxruntime is missing CUDA support + opencv-python + scikit-image + tqdm + ]; + + # Native onnxruntime lib used by Python module onnxruntime can't find its other libs without this + makeWrapperArgs = [ + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"'' + ]; + + pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ]; + + meta = { + description = "Video anonymization by face detection"; + homepage = "https://github.com/ORB-HD/deface"; + changelog = "https://github.com/ORB-HD/deface/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lurkki ]; + mainProgram = "deface"; + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + broken = stdenv.hostPlatform.system == "aarch64-linux"; + }; +} diff --git a/pkgs/applications/version-management/degit/default.nix b/pkgs/by-name/de/degit/package.nix similarity index 100% rename from pkgs/applications/version-management/degit/default.nix rename to pkgs/by-name/de/degit/package.nix diff --git a/pkgs/by-name/de/deheader/package.nix b/pkgs/by-name/de/deheader/package.nix new file mode 100644 index 000000000000..23325c2a02e5 --- /dev/null +++ b/pkgs/by-name/de/deheader/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, python3 +, xmlto +, docbook-xsl-nons +, fetchFromGitLab +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "deheader"; + version = "1.11"; + outputs = [ "out" "man" ]; + + src = fetchFromGitLab { + owner = "esr"; + repo = "deheader"; + rev = version; + hash = "sha256-RaWU6075PvgxbsH1+Lt/CEDAcl9Vx6kxcZAA/A/Af4o="; + }; + + buildInputs = [ python3 ]; + + nativeBuildInputs = [ xmlto docbook-xsl-nons installShellFiles ]; + + # With upstream Makefile, xmlto is called without "--skip-validation". It + # makes it require a lot of dependencies, yet ultimately it fails + # nevertheless in attempt to fetch something from SourceForge. + # + # Need to set "foundMakefile" so "make check" tests are run. + buildPhase = '' + runHook preBuild + + xmlto man --skip-validation deheader.xml + patchShebangs ./deheader + foundMakefile=1 + + runHook postBuild + ''; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dm755 ./deheader -t $out/bin + installManPage ./deheader.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to find and optionally remove unneeded includes in C or C++ source files"; + mainProgram = "deheader"; + longDescription = '' + This tool takes a list of C or C++ sourcefiles and generates a report + on which #includes can be omitted from them -- the test, for each foo.c + or foo.cc or foo.cpp, is simply whether 'rm foo.o; make foo.o' returns a + zero status. Optionally, with the -r option, the unneeded headers are removed. + The tool also reports on headers required for strict portability. + ''; + homepage = "http://catb.org/~esr/deheader"; + changelog = "https://gitlab.com/esr/deheader/-/blob/master/NEWS.adoc"; + license = licenses.bsd2; + maintainers = with maintainers; [ kaction ]; + + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/by-name/de/dehydrated/package.nix similarity index 100% rename from pkgs/tools/admin/dehydrated/default.nix rename to pkgs/by-name/de/dehydrated/package.nix diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/by-name/de/deja-dup/fix-paths.patch similarity index 100% rename from pkgs/applications/backup/deja-dup/fix-paths.patch rename to pkgs/by-name/de/deja-dup/fix-paths.patch diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/by-name/de/deja-dup/package.nix similarity index 100% rename from pkgs/applications/backup/deja-dup/default.nix rename to pkgs/by-name/de/deja-dup/package.nix diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/by-name/de/dejagnu/package.nix similarity index 100% rename from pkgs/development/tools/misc/dejagnu/default.nix rename to pkgs/by-name/de/dejagnu/package.nix diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/by-name/de/dejsonlz4/package.nix similarity index 100% rename from pkgs/tools/compression/dejsonlz4/default.nix rename to pkgs/by-name/de/dejsonlz4/package.nix diff --git a/pkgs/applications/audio/delayarchitect/default.nix b/pkgs/by-name/de/delayarchitect/package.nix similarity index 100% rename from pkgs/applications/audio/delayarchitect/default.nix rename to pkgs/by-name/de/delayarchitect/package.nix diff --git a/pkgs/misc/drivers/dell-530cdn/default.nix b/pkgs/by-name/de/dell-530cdn/package.nix similarity index 100% rename from pkgs/misc/drivers/dell-530cdn/default.nix rename to pkgs/by-name/de/dell-530cdn/package.nix diff --git a/pkgs/by-name/de/dell-command-configure/package.nix b/pkgs/by-name/de/dell-command-configure/package.nix new file mode 100644 index 000000000000..c69bc0d63f90 --- /dev/null +++ b/pkgs/by-name/de/dell-command-configure/package.nix @@ -0,0 +1,111 @@ +{ + stdenv, + lib, + fetchurl, + dpkg, + autoPatchelfHook, + patchelfUnstable, + openssl, +}: + +# Use techniques described in https://web.archive.org/web/20220904051329/https://tapesoftware.net/replace-symbol/ + +# Adapted from https://github.com/KenMacD/etc-nixos/blob/d3d28085586358a62b2bb4b427eb21aad05b5b23/dcc/default.nix + +# Used https://github.com/NixOS/nixpkgs/pull/84926 as a template +# then converted to use autoPatchelfHook instead, and link with +# the dependencies from other pkgs. + +let + version = "4.11.0-6"; + + unpacked = stdenv.mkDerivation rec { + inherit version; + pname = "dell-command-configure-unpacked"; + + src = fetchurl { + urls = [ + "https://dl.dell.com/FOLDER10469726M/1/command-configure_${version}.ubuntu22_amd64.tar.gz" + "https://web.archive.org/web/20240228233129/https://dl.dell.com/FOLDER10469726M/1/command-configure_4.11.0-6.ubuntu22_amd64.tar.gz" + ]; + # The CDN blocks the Curl user-agent, so set to blank instead. + curlOpts = ''-A=""''; + hash = "sha256-Bwa4sYguYwEBKEJSP3wzHhzjuDeaGQN8fKeooWHX18E="; + }; + + dontBuild = true; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + tar -xzf ${src} + dpkg-deb -x command-configure_${version}.ubuntu22_amd64.deb command-configure + dpkg-deb -x srvadmin-hapi_9.5.0_amd64.deb srvadmin-hapi + ''; + + installPhase = '' + mkdir $out + cp -r . $out + ''; + }; + + # Contains a fopen() wrapper for finding the firmware package + wrapperLibName = "wrapper-lib.so"; + wrapperLib = stdenv.mkDerivation { + pname = "dell-command-configure-unpacked-wrapper-lib"; + inherit version; + + unpackPhase = '' + cp ${./wrapper-lib.c} wrapper-lib.c + ''; + + postPatch = '' + substitute wrapper-lib.c lib.c \ + --subst-var-by to "${unpacked}/srvadmin-hapi/opt/dell/srvadmin/etc/omreg.d/omreg-hapi.cfg" + cc -fPIC -shared lib.c -o ${wrapperLibName} + ''; + installPhase = '' + install -D ${wrapperLibName} -t $out/lib + ''; + }; + +in stdenv.mkDerivation rec { + inherit version; + pname = "dell-command-configure"; + + buildInputs = [ openssl (lib.getLib stdenv.cc.cc) ]; + nativeBuildInputs = [ autoPatchelfHook ]; + dontConfigure = true; + + src = unpacked; + + installPhase = '' + install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libhapiintf.so + install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libsmbios_c.so.2 + install -D -t $out/bin -m755 -v command-configure/opt/dell/dcc/cctk + install -D -t $out/bin -m755 -v srvadmin-hapi/opt/dell/srvadmin/sbin/dchcfg + for lib in $(find srvadmin-hapi/opt/dell/srvadmin/lib64 -type l); do + install -D -t $out/lib -m644 -v $lib + done + ''; + + postFixup = '' + echo fopen fopen_wrapper > fopen_name_map + echo access access_wrapper > access_name_map + ${patchelfUnstable}/bin/patchelf \ + --rename-dynamic-symbols fopen_name_map \ + --rename-dynamic-symbols access_name_map \ + --add-needed ${wrapperLibName} \ + --set-rpath ${lib.makeLibraryPath [ wrapperLib ]} \ + $out/lib/* + ''; + + meta = with lib; { + description = "Configure BIOS settings on Dell laptops"; + homepage = + "https://www.dell.com/support/article/us/en/19/sln311302/dell-command-configure"; + license = licenses.unfree; + maintainers = with maintainers; [ ryangibb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/system/dell-command-configure/wrapper-lib.c b/pkgs/by-name/de/dell-command-configure/wrapper-lib.c similarity index 100% rename from pkgs/tools/system/dell-command-configure/wrapper-lib.c rename to pkgs/by-name/de/dell-command-configure/wrapper-lib.c diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/by-name/de/delly/package.nix similarity index 100% rename from pkgs/applications/science/biology/delly/default.nix rename to pkgs/by-name/de/delly/package.nix diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix new file mode 100644 index 000000000000..fbeed74f7b59 --- /dev/null +++ b/pkgs/by-name/de/delta/package.nix @@ -0,0 +1,66 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, oniguruma +, stdenv +, apple-sdk_11 +, git +}: + +rustPlatform.buildRustPackage rec { + pname = "delta"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "dandavison"; + repo = "delta"; + rev = "refs/tags/${version}"; + hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; + }; + + cargoHash = "sha256-DIWzRVTADfAZdFckhh2lIfOD13h7GP3KIOQHf/oBHgc="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + oniguruma + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + ]; + + nativeCheckInputs = [ git ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + + postInstall = '' + installShellCompletion --cmd delta \ + etc/completion/completion.{bash,fish,zsh} + ''; + + # test_env_parsing_with_pager_set_to_bat sets environment variables, + # which can be flaky with multiple threads: + # https://github.com/dandavison/delta/issues/1660 + dontUseCargoParallelTests = true; + + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # This test tries to read /etc/passwd, which fails with the sandbox + # enabled on Darwin + "--skip=test_diff_real_files" + ]; + + meta = with lib; { + homepage = "https://github.com/dandavison/delta"; + description = "Syntax-highlighting pager for git"; + changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq SuperSandro2000 figsoda ]; + mainProgram = "delta"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/by-name/de/deltachat-cursed/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix rename to pkgs/by-name/de/deltachat-cursed/package.nix diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/by-name/de/delve/package.nix similarity index 100% rename from pkgs/development/tools/delve/default.nix rename to pkgs/by-name/de/delve/package.nix diff --git a/pkgs/servers/demoit/default.nix b/pkgs/by-name/de/demoit/package.nix similarity index 100% rename from pkgs/servers/demoit/default.nix rename to pkgs/by-name/de/demoit/package.nix diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/by-name/de/dendrite/package.nix similarity index 100% rename from pkgs/servers/dendrite/default.nix rename to pkgs/by-name/de/dendrite/package.nix diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/by-name/de/denemo/package.nix similarity index 100% rename from pkgs/applications/audio/denemo/default.nix rename to pkgs/by-name/de/denemo/package.nix diff --git a/pkgs/by-name/de/deno/1/librusty_v8.nix b/pkgs/by-name/de/deno/1/librusty_v8.nix deleted file mode 100644 index f36371830ebf..000000000000 --- a/pkgs/by-name/de/deno/1/librusty_v8.nix +++ /dev/null @@ -1,12 +0,0 @@ -# auto-generated file -- DO NOT EDIT! -{ fetchLibrustyV8 }: - -fetchLibrustyV8 { - version = "0.105.0"; - shas = { - x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs="; - aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY="; - x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g="; - aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A="; - }; -} diff --git a/pkgs/by-name/de/deno/1/package.nix b/pkgs/by-name/de/deno/1/package.nix deleted file mode 100644 index 3b2774153171..000000000000 --- a/pkgs/by-name/de/deno/1/package.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - stdenv, - lib, - callPackage, - fetchFromGitHub, - rustPlatform, - cmake, - protobuf, - installShellFiles, - libiconv, - darwin, - librusty_v8 ? callPackage ./librusty_v8.nix { - inherit (callPackage ../fetchers.nix { }) fetchLibrustyV8; - }, -}: -rustPlatform.buildRustPackage rec { - pname = "deno"; - version = "1.46.3"; - - src = fetchFromGitHub { - owner = "denoland"; - repo = "deno"; - rev = "refs/tags/v${version}"; - hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA="; - }; - - cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8="; - - postPatch = '' - # upstream uses lld on aarch64-darwin for faster builds - # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails - substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " "" - ''; - - # uses zlib-ng but can't dynamically link yet - # https://github.com/rust-lang/libz-sys/issues/158 - nativeBuildInputs = [ - # required by libz-ng-sys crate - cmake - # required by deno_kv crate - protobuf - installShellFiles - ]; - buildInputs = lib.optionals stdenv.isDarwin ( - [ - libiconv - darwin.libobjc - ] - ++ (with darwin.apple_sdk_11_0.frameworks; [ - Security - CoreServices - Metal - MetalPerformanceShaders - Foundation - QuartzCore - ]) - ); - - buildAndTestSubdir = "cli"; - - # work around "error: unknown warning group '-Wunused-but-set-parameter'" - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; - # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem - # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - env.RUSTY_V8_ARCHIVE = librusty_v8; - - # Tests have some inconsistencies between runs with output integration tests - # Skipping until resolved - doCheck = false; - - preInstall = '' - find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd deno \ - --bash <($out/bin/deno completions bash) \ - --fish <($out/bin/deno completions fish) \ - --zsh <($out/bin/deno completions zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/deno --help - $out/bin/deno --version | grep "deno ${version}" - runHook postInstallCheck - ''; - - passthru.tests = callPackage ./tests { }; - - meta = with lib; { - homepage = "https://deno.land/"; - changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; - description = "Secure runtime for JavaScript and TypeScript"; - longDescription = '' - Deno aims to be a productive and secure scripting environment for the modern programmer. - Deno will always be distributed as a single executable. - Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. - Deno explicitly takes on the role of both runtime and package manager. - It uses a standard browser-compatible protocol for loading modules: URLs. - Among other things, Deno is a great replacement for utility scripts that may have been historically written with - bash or python. - ''; - license = licenses.mit; - mainProgram = "deno"; - maintainers = with maintainers; [ jk ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. - # Should be fixed with darwin SDK refactor and can be revisited. - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/by-name/de/deno/1/tests/basic.ts b/pkgs/by-name/de/deno/1/tests/basic.ts deleted file mode 100644 index 5959aa217b3c..000000000000 --- a/pkgs/by-name/de/deno/1/tests/basic.ts +++ /dev/null @@ -1 +0,0 @@ -console.log(1 + 1) diff --git a/pkgs/by-name/de/deno/1/tests/default.nix b/pkgs/by-name/de/deno/1/tests/default.nix deleted file mode 100644 index c28490ee0d00..000000000000 --- a/pkgs/by-name/de/deno/1/tests/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - deno, - runCommand, - lib, - testers, -}: -let - testDenoRun = - name: - { - args ? "", - dir ? ./. + "/${name}", - file ? "index.ts", - expected ? "", - expectFailure ? false, - }: - let - command = "deno run ${args} ${dir}/${file}"; - in - runCommand "deno-test-${name}" - { - nativeBuildInputs = [ deno ]; - meta.timeout = 60; - } - '' - HOME=$(mktemp -d) - if output=$(${command} 2>&1); then - if [[ $output =~ '${expected}' ]]; then - echo "Test '${name}' passed" - touch $out - else - echo -n ${lib.escapeShellArg command} >&2 - echo " output did not match what was expected." >&2 - echo "The expected was:" >&2 - echo '${expected}' >&2 - echo "The output was:" >&2 - echo "$output" >&2 - exit 1 - fi - else - if [[ "${toString expectFailure}" == "1" ]]; then - echo "Test '${name}' failed as expected" - touch $out - exit 0 - fi - echo -n ${lib.escapeShellArg command} >&2 - echo " returned a non-zero exit code." >&2 - echo "$output" >&2 - exit 1 - fi - ''; -in -(lib.mapAttrs testDenoRun { - basic = { - dir = ./.; - file = "basic.ts"; - expected = "2"; - }; - import-json = { - expected = "hello from JSON"; - }; - import-ts = { - expected = "hello from ts"; - }; - read-file = { - args = "--allow-read"; - expected = "hello from a file"; - }; - fail-read-file = { - expectFailure = true; - dir = ./read-file; - }; -}) -// { - version = testers.testVersion { - package = deno; - command = "deno --version"; - }; -} diff --git a/pkgs/by-name/de/deno/1/tests/import-json/data.json b/pkgs/by-name/de/deno/1/tests/import-json/data.json deleted file mode 100644 index 7f0de9ebe0b9..000000000000 --- a/pkgs/by-name/de/deno/1/tests/import-json/data.json +++ /dev/null @@ -1 +0,0 @@ -{ "msg": "hello from JSON" } diff --git a/pkgs/by-name/de/deno/1/tests/import-json/index.ts b/pkgs/by-name/de/deno/1/tests/import-json/index.ts deleted file mode 100644 index 525f25f74da2..000000000000 --- a/pkgs/by-name/de/deno/1/tests/import-json/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -import file from "./data.json" assert { type: "json" }; -console.log(file.msg); diff --git a/pkgs/by-name/de/deno/1/tests/import-ts/index.ts b/pkgs/by-name/de/deno/1/tests/import-ts/index.ts deleted file mode 100644 index 34fec283a169..000000000000 --- a/pkgs/by-name/de/deno/1/tests/import-ts/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { sayHello } from "./lib.ts" - -sayHello("ts") diff --git a/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts b/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts deleted file mode 100644 index 3b5e05aaaaf3..000000000000 --- a/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function sayHello(thing: string) { - console.log(`hello from ${thing}`); -} diff --git a/pkgs/by-name/de/deno/1/tests/read-file/data.txt b/pkgs/by-name/de/deno/1/tests/read-file/data.txt deleted file mode 100644 index 7eee1b0c107c..000000000000 --- a/pkgs/by-name/de/deno/1/tests/read-file/data.txt +++ /dev/null @@ -1 +0,0 @@ -hello from a file diff --git a/pkgs/by-name/de/deno/1/tests/read-file/index.ts b/pkgs/by-name/de/deno/1/tests/read-file/index.ts deleted file mode 100644 index be792a3d6628..000000000000 --- a/pkgs/by-name/de/deno/1/tests/read-file/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -// trim 'file://' prefix -const thisDir = Deno.mainModule.substring(7, Deno.mainModule.length); -const getParent = (path: string) => path.substring(0, path.lastIndexOf("/")) -const text = await Deno.readTextFile(getParent(thisDir) + "/data.txt"); -console.log(text); diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index a69da614b6c3..bc2cdb54d862 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -7,8 +7,8 @@ cmake, protobuf, installShellFiles, - libiconv, - darwin, + apple-sdk_11, + darwinMinVersionHook, librusty_v8 ? callPackage ./librusty_v8.nix { inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; rev = "refs/tags/v${version}"; - hash = "sha256-nbwLkkO1ucRmlgGDRCJLHPpu4lk0xLQvz3wWpq7rics="; + hash = "sha256-JTNLxUT1C9Q8XiP3BYn6NhytbvilQ20DzWwLjNXjlCI="; }; - cargoHash = "sha256-y/hAEu8c/CFS4mfp4f/pvPJRz4cxGoi39uIUbn5J+Pw="; + cargoHash = "sha256-EDphp03j6HpTxgBgsaGHuO+hQX57QXkTz6fHN0+or48="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -45,20 +45,12 @@ rustPlatform.buildRustPackage rec { protobuf installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin ( - [ - libiconv - darwin.libobjc - ] - ++ (with darwin.apple_sdk_11_0.frameworks; [ - Security - CoreServices - Metal - MetalPerformanceShaders - Foundation - QuartzCore - ]) - ); + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + # V8 supports 10.15+; binary references `aligned_alloc` directly + (darwinMinVersionHook "10.15") + ]; buildAndTestSubdir = "cli"; @@ -116,8 +108,5 @@ rustPlatform.buildRustPackage rec { "x86_64-darwin" "aarch64-darwin" ]; - # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. - # Should be fixed with darwin SDK refactor and can be revisited. - badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 1aac043fcf83..561d97debfa1 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -7,10 +7,10 @@ let appthreat-vulnerability-db = ( python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec { - version = "5.7.3"; + version = "5.7.8"; src = oldAttrs.src.override { rev = "refs/tags/v${version}"; - hash = "sha256-MrlgBUx3T2G46Pnah3obe5b4yKDzsAFVC/B7AHM0kZY="; + hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo="; }; }) ); @@ -18,16 +18,18 @@ let in python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.4.3"; + version = "5.4.8"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-m0vDsCetOSfScu1eprrGaDJ1VuXxuNFBitK8N5GtfSQ="; + hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI="; }; + pythonRelaxDeps = [ "oras" ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/de/departure-mono/package.nix b/pkgs/by-name/de/departure-mono/package.nix index 09b1af57d28a..4da0fb495d77 100644 --- a/pkgs/by-name/de/departure-mono/package.nix +++ b/pkgs/by-name/de/departure-mono/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "departure-mono"; - version = "1.350"; + version = "1.422"; src = fetchzip { url = "https://github.com/rektdeckard/departure-mono/releases/download/v${finalAttrs.version}/DepartureMono-${finalAttrs.version}.zip"; stripRoot = false; - hash = "sha256-MMmS1yjhy50fgMK5h0526YKRfQJuOcEAHqxn9rhUwCc="; + hash = "sha256-9CcXd7PLxkzQt0oT/asZO9mowtXtjPBfuKphfGgM/y8="; }; installPhase = '' diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 98bcbf46e663..c83fdb474c9e 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -1,13 +1,42 @@ -{ buildGoModule -, dependabot-cli -, fetchFromGitHub -, installShellFiles -, lib -, testers +{ + buildGoModule, + dependabot-cli, + dockerTools, + fetchFromGitHub, + installShellFiles, + lib, + makeWrapper, + symlinkJoin, + testers, }: let pname = "dependabot-cli"; - version = "1.41.0"; + version = "1.57.0"; + + # vv Also update this vv + tag = "nixpkgs-dependabot-cli-${version}"; + updateJobProxy = dockerTools.pullImage { + imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy"; + # Get these hashes from + # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} + imageDigest = "sha256:cc4a9b7db8ddf3924b6c25cc8a74d9937bf803e64733035809862a1c0a6df984"; + sha256 = "0wkr0rac7dp1080s4zik5yzi5967gkfylly2148ipgw50sp0sq8s"; + + # Don't update this, it's used to refer to the imported image later + finalImageName = "dependabot-update-job-proxy"; + finalImageTag = tag; + }; + updaterGitHubActions = dockerTools.pullImage { + imageName = "ghcr.io/dependabot/dependabot-updater-github-actions"; + # Get these hashes from + # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} + imageDigest = "sha256:6665b3e26ef97577e83f2dfd0007a73c02b003126e72c0b4b196fe570088ed93"; + sha256 = "0q7w3yp49wb70gkjjl2syvs75hm1jkva2qslzckwxh73z0kq2z0q"; + + # Don't update this, it's used to refer to the imported image later + finalImageName = "dependabot-updater-github-actions"; + finalImageTag = tag; + }; in buildGoModule { inherit pname version; @@ -16,10 +45,10 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-CnSDvLcLupWKBp1Wr6E9BScA8VsBlfmmfPwh8cyERZg="; + hash = "sha256-ZT1fwDT19uUjp5iG0NLSrc/6PLW/sukAd0w66mLdFVg="; }; - vendorHash = "sha256-vN5r1OtHT16LeJ6iPmHmXTx9Oo+WALhV4PWqzMiUwSA="; + vendorHash = "sha256-jSINiETadd0ixzFBilgphi1vJNsRYeDkbaVNk5stTp4="; ldflags = [ "-s" @@ -27,7 +56,10 @@ buildGoModule { "-X github.com/dependabot/cli/cmd/dependabot/internal/cmd.version=v${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; postInstall = '' installShellCompletion --cmd dependabot \ @@ -37,7 +69,7 @@ buildGoModule { ''; checkFlags = [ - "-skip=TestIntegration|TestNewProxy_customCert|TestRun" + "-skip=TestDependabot" ]; doInstallCheck = true; @@ -45,6 +77,20 @@ buildGoModule { $out/bin/dependabot --help ''; + passthru.withDockerImages = symlinkJoin { + name = "dependabot-cli-with-docker-images"; + paths = [ dependabot-cli ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + # Create a wrapper that pins the docker images that are depended upon + wrapProgram $out/bin/dependabot \ + --run "docker load --input ${updateJobProxy} >&2" \ + --add-flags "--proxy-image=dependabot-update-job-proxy:${tag}" \ + --run "docker load --input ${updaterGitHubActions} >&2" \ + --add-flags "--updater-image=dependabot-updater-github-actions:${tag}" + ''; + }; + passthru.tests.version = testers.testVersion { package = dependabot-cli; command = "dependabot --version"; @@ -57,6 +103,9 @@ buildGoModule { mainProgram = "dependabot"; homepage = "https://github.com/dependabot/cli"; license = licenses.mit; - maintainers = with maintainers; [ l0b0 ]; + maintainers = with maintainers; [ + l0b0 + infinisil + ]; }; } diff --git a/pkgs/tools/graphics/deqp-runner/default.nix b/pkgs/by-name/de/deqp-runner/package.nix similarity index 100% rename from pkgs/tools/graphics/deqp-runner/default.nix rename to pkgs/by-name/de/deqp-runner/package.nix diff --git a/pkgs/tools/security/der-ascii/default.nix b/pkgs/by-name/de/der-ascii/package.nix similarity index 100% rename from pkgs/tools/security/der-ascii/default.nix rename to pkgs/by-name/de/der-ascii/package.nix diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/by-name/de/deskew/package.nix similarity index 100% rename from pkgs/applications/graphics/deskew/default.nix rename to pkgs/by-name/de/deskew/package.nix diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/by-name/de/desktop-file-utils/package.nix similarity index 100% rename from pkgs/tools/misc/desktop-file-utils/default.nix rename to pkgs/by-name/de/desktop-file-utils/package.nix diff --git a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh similarity index 100% rename from pkgs/tools/misc/desktop-file-utils/setup-hook.sh rename to pkgs/by-name/de/desktop-file-utils/setup-hook.sh diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/by-name/de/desync/package.nix similarity index 100% rename from pkgs/applications/networking/sync/desync/default.nix rename to pkgs/by-name/de/desync/package.nix diff --git a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch b/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch index 4d4744d4d31b..02ca8649949e 100644 --- a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch +++ b/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch @@ -1,14 +1,14 @@ diff --git a/XOptions/xoptions.cpp b/XOptions/xoptions.cpp -index ca5723e..30574a5 100755 +index 8c887c3..36cdbc3 100755 --- a/XOptions/xoptions.cpp +++ b/XOptions/xoptions.cpp -@@ -1531,14 +1531,7 @@ bool XOptions::checkNative(const QString &sIniFileName) +@@ -1754,14 +1754,7 @@ bool XOptions::checkNative(const QString &sIniFileName) #if defined(Q_OS_MAC) bResult = true; #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - QString sApplicationDirPath = qApp->applicationDirPath(); - -- if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || +- if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || (sApplicationDirPath == "/app/bin") || - (sApplicationDirPath.contains("/usr/local/bin$")) || isAppImage()) { - bResult = true; - } else { @@ -18,7 +18,7 @@ index ca5723e..30574a5 100755 #elif defined(Q_OS_WIN) QString sApplicationDirPath = qApp->applicationDirPath(); -@@ -1565,22 +1558,7 @@ QString XOptions::getApplicationDataPath() +@@ -1788,22 +1781,7 @@ QString XOptions::getApplicationDataPath() #ifdef Q_OS_MAC sResult = sApplicationDirPath + "/../Resources"; #elif defined(Q_OS_LINUX) diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix index 855095c3f448..105529041352 100644 --- a/pkgs/by-name/de/detect-it-easy/package.nix +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "detect-it-easy"; - version = "3.09"; + version = "3.10"; src = fetchFromGitHub { owner = "horsicq"; repo = "DIE-engine"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-A9YZBlGf3j+uSefPiDhrS1Qtu6vaLm4Yodt7BioGD2Q="; + hash = "sha256-yHgxYig5myY2nExweUk2muKbJTKN3SiwOLgQcMIY/BQ="; }; patches = [ ./0001-remove-hard-coded-paths-in-xoptions.patch ]; @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { # clean up wrongly created dirs in `install.sh` and broken .desktop file postInstall = '' - rm -r $out/lib/{bin,share} grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop ''; @@ -61,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Program for determining types of files for Windows, Linux and MacOS."; mainProgram = "die"; homepage = "https://github.com/horsicq/Detect-It-Easy"; + changelog = "https://github.com/horsicq/Detect-It-Easy/blob/master/changelog.txt"; maintainers = with lib.maintainers; [ ivyfanchiang ]; platforms = [ "x86_64-linux" ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/by-name/de/detekt/package.nix similarity index 100% rename from pkgs/development/tools/detekt/default.nix rename to pkgs/by-name/de/detekt/package.nix diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh similarity index 100% rename from pkgs/build-support/deterministic-uname/deterministic-uname.sh rename to pkgs/by-name/de/deterministic-uname/deterministic-uname.sh diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix new file mode 100644 index 000000000000..1a4e0a0f089b --- /dev/null +++ b/pkgs/by-name/de/deterministic-uname/package.nix @@ -0,0 +1,59 @@ +# expr and script based on our lsb_release +{ stdenv +, lib +, substituteAll +, coreutils +, getopt +, modDirVersion ? "" +, forPlatform ? stdenv.buildPlatform +}: + +substituteAll { + name = "uname"; + + src = ./deterministic-uname.sh; + + dir = "bin"; + isExecutable = true; + + inherit coreutils getopt; + + uSystem = if forPlatform.uname.system != null then forPlatform.uname.system else "unknown"; + inherit (forPlatform.uname) processor; + + # uname -o + # maybe add to lib/systems/default.nix uname attrset + # https://github.com/coreutils/coreutils/blob/7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c/src/uname.c#L373-L374 + # https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from + # https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4 + operatingSystem = + if forPlatform.isLinux + then "GNU/Linux" + else if forPlatform.isDarwin + then "Darwin" # darwin isn't in host-os.m4 so where does this come from? + else if forPlatform.isFreeBSD + then "FreeBSD" + else "unknown"; + + # in os-specific/linux module packages + # --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + # is a common thing to do. + modDirVersion = if modDirVersion != "" then modDirVersion else "unknown"; + + meta = with lib; { + description = "Print certain system information (hardcoded with lib/system values)"; + mainProgram = "uname"; + longDescription = '' + This package provides a replacement for `uname` whose output depends only + on `stdenv.buildPlatform`, or a configurable `forPlatform`. It is meant + to be used from within derivations. Many packages' build processes run + `uname` at compile time and embed its output into the result of the build. + Since `uname` calls into the kernel, and the Nix sandbox currently does + not intercept these calls, builds made on different kernels will produce + different results. + ''; + license = [ licenses.mit ]; + maintainers = with maintainers; [ artturin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/by-name/de/detox/package.nix similarity index 100% rename from pkgs/tools/misc/detox/default.nix rename to pkgs/by-name/de/detox/package.nix diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/by-name/de/devd/package.nix similarity index 100% rename from pkgs/development/tools/devd/default.nix rename to pkgs/by-name/de/devd/package.nix diff --git a/pkgs/by-name/de/devdash/package.nix b/pkgs/by-name/de/devdash/package.nix index 210a016277f6..a694da0c8029 100644 --- a/pkgs/by-name/de/devdash/package.nix +++ b/pkgs/by-name/de/devdash/package.nix @@ -1,12 +1,12 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , nix-update-script , coreutils }: -buildGoModule rec { +buildGo122Module rec { pname = "devdash"; version = "0.5.0"; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/by-name/de/devdocs-desktop/package.nix similarity index 100% rename from pkgs/applications/misc/devdocs-desktop/default.nix rename to pkgs/by-name/de/devdocs-desktop/package.nix diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/by-name/de/devede/package.nix similarity index 100% rename from pkgs/applications/video/devede/default.nix rename to pkgs/by-name/de/devede/package.nix diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/by-name/de/devmem2/package.nix similarity index 100% rename from pkgs/os-specific/linux/devmem2/default.nix rename to pkgs/by-name/de/devmem2/package.nix diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/by-name/de/devour/package.nix similarity index 100% rename from pkgs/tools/X11/devour/default.nix rename to pkgs/by-name/de/devour/package.nix diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/by-name/de/devspace/package.nix similarity index 100% rename from pkgs/development/tools/misc/devspace/default.nix rename to pkgs/by-name/de/devspace/package.nix diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/by-name/de/devtodo/package.nix similarity index 100% rename from pkgs/development/tools/devtodo/default.nix rename to pkgs/by-name/de/devtodo/package.nix diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix new file mode 100644 index 000000000000..c058aa36e3ec --- /dev/null +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -0,0 +1,118 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, + webkitgtk_6_0, + gcr_4, + gdk-pixbuf, +}: +python3Packages.buildPythonApplication rec { + pname = "devtoolbox"; + version = "1.2"; + pyproject = false; # uses meson + + src = fetchFromGitHub { + owner = "aleiepure"; + repo = "devtoolbox"; + rev = "v${version}"; + hash = "sha256-tSH7H2Y/+8EpuM4+Fa0iL/pSJSVtFDXlO2w/xwpzps0="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + webkitgtk_6_0 + gcr_4 + gdk-pixbuf + ]; + + dependencies = with python3Packages; [ + pygobject3 + ruamel-yaml + lxml + python-crontab + jwt + jsonschema + pytz + tzlocal + python-lorem + uuid6 + textstat + markdown2 + daltonlens + asn1crypto + qrcode + sqlparse + jsbeautifier + cssbeautifier + humanize + croniter + python-dateutil + rcssmin + rjsmin + ]; + + dontWrapGApps = true; + + # Contains an unusable devtoolbox-run-script + postInstall = '' + rm -r $out/devtoolbox + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Development tools at your fingertips"; + longDescription = '' + If you're tired of endlessly looking online for the right + tool, or to find again that website of which you don't + recall the name to do a quick conversion, this is the + right app for you. This is a collection of powerful yet + simple-to-use tools and utilities to solve the most common + daily development problems: + - JSON to YAML converter and vice-versa + - CRON expressions parser + - Formatters for common languages + - Hash generators + - Regex tester + - Markdown Previewer + - Image converters + - Much more... + ''; + homepage = "https://github.com/aleiepure/devtoolbox"; + license = with lib.licenses; [ + gpl3Plus + cc0 + lgpl3Only + mit + unlicense + ]; + mainProgram = "devtoolbox"; + maintainers = with lib.maintainers; [ + aleksana + aucub + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/servers/dex/default.nix b/pkgs/by-name/de/dex-oidc/package.nix similarity index 100% rename from pkgs/servers/dex/default.nix rename to pkgs/by-name/de/dex-oidc/package.nix diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/by-name/de/dex/package.nix similarity index 100% rename from pkgs/tools/X11/dex/default.nix rename to pkgs/by-name/de/dex/package.nix diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/by-name/de/dex2jar/package.nix similarity index 100% rename from pkgs/development/tools/java/dex2jar/default.nix rename to pkgs/by-name/de/dex2jar/package.nix diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/by-name/df/dfc/package.nix similarity index 100% rename from pkgs/tools/system/dfc/default.nix rename to pkgs/by-name/df/dfc/package.nix diff --git a/pkgs/tools/text/dfmt/default.nix b/pkgs/by-name/df/dfmt/package.nix similarity index 100% rename from pkgs/tools/text/dfmt/default.nix rename to pkgs/by-name/df/dfmt/package.nix diff --git a/pkgs/tools/system/dfrs/default.nix b/pkgs/by-name/df/dfrs/package.nix similarity index 100% rename from pkgs/tools/system/dfrs/default.nix rename to pkgs/by-name/df/dfrs/package.nix diff --git a/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch b/pkgs/by-name/df/dftd4/fortran-module-dir.patch similarity index 100% rename from pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch rename to pkgs/by-name/df/dftd4/fortran-module-dir.patch diff --git a/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/pkgs/by-name/df/dftd4/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/dftd4/default.nix rename to pkgs/by-name/df/dftd4/package.nix diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/by-name/df/dfu-programmer/package.nix similarity index 100% rename from pkgs/development/tools/misc/dfu-programmer/default.nix rename to pkgs/by-name/df/dfu-programmer/package.nix diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/by-name/df/dfu-util/package.nix similarity index 100% rename from pkgs/development/tools/misc/dfu-util/default.nix rename to pkgs/by-name/df/dfu-util/package.nix diff --git a/pkgs/by-name/dg/dgen-sdl/package.nix b/pkgs/by-name/dg/dgen-sdl/package.nix index a501139ff47b..172fb5677533 100644 --- a/pkgs/by-name/dg/dgen-sdl/package.nix +++ b/pkgs/by-name/dg/dgen-sdl/package.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") "--enable-debug-vdp" "--enable-debugger" "--enable-joystick" @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { "--with-star=no" # Needs ASM support ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-reserved-user-defined-literal"; + meta = with lib; { homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix new file mode 100644 index 000000000000..ca8142e5930b --- /dev/null +++ b/pkgs/by-name/dg/dgraph/package.nix @@ -0,0 +1,49 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, jemalloc, nodejs }: + +buildGoModule rec { + pname = "dgraph"; + version = "24.0.4"; + + src = fetchFromGitHub { + owner = "dgraph-io"; + repo = "dgraph"; + rev = "v${version}"; + sha256 = "sha256-VtOa+MfhNMbzqiDJY5KYwo2OCgu+4sn18M+dujzwi0g="; + }; + + vendorHash = "sha256-pX5jRVh4cSuPK3cpDVyvt/gTHcFgG9hE3H96TuMYxKk="; + + doCheck = false; + + ldflags = [ + "-X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}-oss" + ]; + + tags = [ + "oss" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + # todo those dependencies are required in the makefile, but verify how they are used + # actually + buildInputs = [ jemalloc nodejs ]; + + subPackages = [ "dgraph" ]; + + postInstall = '' + for shell in bash zsh; do + $out/bin/dgraph completion $shell > dgraph.$shell + installShellCompletion dgraph.$shell + done + ''; + + meta = with lib; { + homepage = "https://dgraph.io/"; + description = "Fast, Distributed Graph DB"; + maintainers = with maintainers; [ sigma ]; + # Apache 2.0 because we use only build "oss" + license = licenses.asl20; + mainProgram = "dgraph"; + }; +} diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/by-name/dh/dhcpcd/package.nix similarity index 100% rename from pkgs/tools/networking/dhcpcd/default.nix rename to pkgs/by-name/dh/dhcpcd/package.nix diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/by-name/dh/dhcpdump/package.nix similarity index 100% rename from pkgs/tools/networking/dhcpdump/default.nix rename to pkgs/by-name/dh/dhcpdump/package.nix diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/by-name/dh/dhcping/package.nix similarity index 100% rename from pkgs/tools/networking/dhcping/default.nix rename to pkgs/by-name/dh/dhcping/package.nix diff --git a/pkgs/games/doom-ports/dhewm3/default.nix b/pkgs/by-name/dh/dhewm3/package.nix similarity index 100% rename from pkgs/games/doom-ports/dhewm3/default.nix rename to pkgs/by-name/dh/dhewm3/package.nix diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/by-name/dh/dhex/package.nix similarity index 100% rename from pkgs/applications/editors/dhex/default.nix rename to pkgs/by-name/dh/dhex/package.nix diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/by-name/dh/dht/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/dht/default.nix rename to pkgs/by-name/dh/dht/package.nix diff --git a/pkgs/by-name/di/di/package.nix b/pkgs/by-name/di/di/package.nix new file mode 100644 index 000000000000..2aa69399b575 --- /dev/null +++ b/pkgs/by-name/di/di/package.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchurl, +}: + +stdenv.mkDerivation rec { + pname = "di"; + version = "4.54"; + + src = fetchurl { + url = "mirror://sourceforge/diskinfo-di/${pname}-${version}.tar.gz"; + sha256 = "sha256-9QD8H+J1hnOOEtdz2rya8Qj+RpDWu8giCpw8P3dPh0g="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Disk information utility; displays everything 'df' does and more"; + homepage = "https://diskinfo-di.sourceforge.io/"; + license = licenses.zlib; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/by-name/di/dia/package.nix similarity index 100% rename from pkgs/applications/graphics/dia/default.nix rename to pkgs/by-name/di/dia/package.nix diff --git a/pkgs/by-name/di/dialect/package.nix b/pkgs/by-name/di/dialect/package.nix new file mode 100644 index 000000000000..0feb5836c6a1 --- /dev/null +++ b/pkgs/by-name/di/dialect/package.nix @@ -0,0 +1,86 @@ +{ + lib, + fetchFromGitHub, + wrapGAppsHook4, + python3, + blueprint-compiler, + desktop-file-utils, + meson, + ninja, + pkg-config, + glib, + gtk4, + gobject-introspection, + gst_all_1, + libsoup_3, + glib-networking, + libadwaita, + libsecret, + nix-update-script, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dialect"; + version = "2.5.0"; + pyproject = false; # built with meson + + src = fetchFromGitHub { + owner = "dialect-app"; + repo = "dialect"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + hash = "sha256-TWXJlzuSBy+Ij3s0KS02bh8vdXP10hQpgdz4QMTLf/Q="; + }; + + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + glib + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + libsoup_3 + glib-networking + libadwaita + libsecret + ]; + + dependencies = with python3.pkgs; [ + dbus-python + gtts + pygobject3 + beautifulsoup4 + ]; + + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + doCheck = false; + + # handle setup hooks better + strictDeps = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/dialect-app/dialect"; + description = "Translation app for GNOME"; + maintainers = with lib.maintainers; [ aleksana ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "dialect"; + }; +} diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/by-name/di/diamond/package.nix similarity index 100% rename from pkgs/applications/science/biology/diamond/default.nix rename to pkgs/by-name/di/diamond/package.nix diff --git a/pkgs/servers/dico/default.nix b/pkgs/by-name/di/dico/package.nix similarity index 100% rename from pkgs/servers/dico/default.nix rename to pkgs/by-name/di/dico/package.nix diff --git a/pkgs/applications/misc/dict-cc-py/default.nix b/pkgs/by-name/di/dict-cc-py/package.nix similarity index 100% rename from pkgs/applications/misc/dict-cc-py/default.nix rename to pkgs/by-name/di/dict-cc-py/package.nix diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/by-name/di/diction/package.nix similarity index 100% rename from pkgs/tools/text/diction/default.nix rename to pkgs/by-name/di/diction/package.nix diff --git a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/pkgs/by-name/di/dictu/0001-force-sqlite-to-be-found.patch similarity index 100% rename from pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch rename to pkgs/by-name/di/dictu/0001-force-sqlite-to-be-found.patch diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/by-name/di/dictu/package.nix similarity index 100% rename from pkgs/development/compilers/dictu/default.nix rename to pkgs/by-name/di/dictu/package.nix diff --git a/pkgs/tools/misc/didu/default.nix b/pkgs/by-name/di/didu/package.nix similarity index 100% rename from pkgs/tools/misc/didu/default.nix rename to pkgs/by-name/di/didu/package.nix diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix new file mode 100644 index 000000000000..22cc9374df3b --- /dev/null +++ b/pkgs/by-name/di/diebahn/package.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, fetchFromGitLab +, cargo +, desktop-file-utils +, meson +, ninja +, pkg-config +, rustPlatform +, rustc +, wrapGAppsHook4 +, cairo +, gdk-pixbuf +, glib +, gtk4 +, libadwaita +, pango +, gettext +, darwin +, blueprint-compiler +}: + +stdenv.mkDerivation rec { + pname = "diebahn"; + version = "2.7.1"; + + src = fetchFromGitLab { + owner = "schmiddi-on-mobile"; + repo = "railway"; + rev = version; + hash = "sha256-SLZJiCkHUS2p7cNk3i3yO2c3tWR4T4ch+zJ1iYEkS6E="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${src}"; + inherit src; + hash = "sha256-XYlRm8yqQr9ZNV7jQeuR8kvqFNudUjJlzE6h9X0zq0Y="; + }; + + nativeBuildInputs = [ + cargo + desktop-file-utils + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + blueprint-compiler + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Foundation + Security + ]); + + # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys + # because the vendored copy does not build with newer versions of clang. + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; + + meta = { + changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md"; + description = "Travel with all your train information in one place. Also known as Railway"; + homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; + license = lib.licenses.gpl3Plus; + mainProgram = "diebahn"; + maintainers = with lib.maintainers; [ dotlambda lilacious ]; + }; +} diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/by-name/di/dieharder/package.nix similarity index 100% rename from pkgs/tools/security/dieharder/default.nix rename to pkgs/by-name/di/dieharder/package.nix diff --git a/pkgs/tools/security/dieharder/stdint.patch b/pkgs/by-name/di/dieharder/stdint.patch similarity index 100% rename from pkgs/tools/security/dieharder/stdint.patch rename to pkgs/by-name/di/dieharder/stdint.patch diff --git a/pkgs/applications/version-management/diff-so-fancy/default.nix b/pkgs/by-name/di/diff-so-fancy/package.nix similarity index 100% rename from pkgs/applications/version-management/diff-so-fancy/default.nix rename to pkgs/by-name/di/diff-so-fancy/package.nix diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix new file mode 100644 index 000000000000..807dffc8486b --- /dev/null +++ b/pkgs/by-name/di/diffnav/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + makeBinaryWrapper, + delta, +}: + +buildGoModule rec { + pname = "diffnav"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "dlvhdr"; + repo = "diffnav"; + rev = "refs/tags/v${version}"; + hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4="; + }; + + vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + postInstall = '' + wrapProgram $out/bin/diffnav \ + --prefix PATH : ${lib.makeBinPath [ delta ]} + ''; + + meta = { + changelog = "https://github.com/dlvhdr/diffnav/releases/tag/${src.rev}"; + description = "Git diff pager based on delta but with a file tree, à la GitHub"; + homepage = "https://github.com/dlvhdr/diffnav"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + mainProgram = "diffnav"; + }; +} diff --git a/pkgs/tools/misc/diffoci/default.nix b/pkgs/by-name/di/diffoci/package.nix similarity index 100% rename from pkgs/tools/misc/diffoci/default.nix rename to pkgs/by-name/di/diffoci/package.nix diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/by-name/di/diffsitter/package.nix similarity index 100% rename from pkgs/tools/text/diffsitter/default.nix rename to pkgs/by-name/di/diffsitter/package.nix diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/by-name/di/diffstat/package.nix similarity index 100% rename from pkgs/tools/text/diffstat/default.nix rename to pkgs/by-name/di/diffstat/package.nix diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/by-name/di/difftastic/Cargo.lock similarity index 100% rename from pkgs/tools/text/difftastic/Cargo.lock rename to pkgs/by-name/di/difftastic/Cargo.lock diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/by-name/di/difftastic/package.nix similarity index 100% rename from pkgs/tools/text/difftastic/default.nix rename to pkgs/by-name/di/difftastic/package.nix diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/by-name/di/diffuse/package.nix similarity index 100% rename from pkgs/applications/misc/diffuse/default.nix rename to pkgs/by-name/di/diffuse/package.nix diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/by-name/di/digiham/package.nix similarity index 100% rename from pkgs/applications/radio/digiham/default.nix rename to pkgs/by-name/di/digiham/package.nix diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/by-name/di/digital/package.nix similarity index 100% rename from pkgs/applications/science/electronics/digital/default.nix rename to pkgs/by-name/di/digital/package.nix diff --git a/pkgs/tools/misc/digitemp/default.nix b/pkgs/by-name/di/digitemp/package.nix similarity index 100% rename from pkgs/tools/misc/digitemp/default.nix rename to pkgs/by-name/di/digitemp/package.nix diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/by-name/di/dina-font/package.nix similarity index 100% rename from pkgs/data/fonts/dina/default.nix rename to pkgs/by-name/di/dina-font/package.nix diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/by-name/di/ding-libs/package.nix similarity index 100% rename from pkgs/tools/misc/ding-libs/default.nix rename to pkgs/by-name/di/ding-libs/package.nix diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/by-name/di/diopser/package.nix similarity index 100% rename from pkgs/applications/audio/diopser/default.nix rename to pkgs/by-name/di/diopser/package.nix diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/by-name/di/dioxus-cli/package.nix similarity index 100% rename from pkgs/development/tools/rust/dioxus-cli/default.nix rename to pkgs/by-name/di/dioxus-cli/package.nix diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/by-name/di/dirb/package.nix similarity index 100% rename from pkgs/tools/networking/dirb/default.nix rename to pkgs/by-name/di/dirb/package.nix diff --git a/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch b/pkgs/by-name/di/dirdiff/dirdiff-2.1-vars.patch similarity index 100% rename from pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch rename to pkgs/by-name/di/dirdiff/dirdiff-2.1-vars.patch diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/by-name/di/dirdiff/package.nix similarity index 100% rename from pkgs/tools/text/dirdiff/default.nix rename to pkgs/by-name/di/dirdiff/package.nix diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/by-name/di/directfb/package.nix similarity index 100% rename from pkgs/development/libraries/directfb/default.nix rename to pkgs/by-name/di/directfb/package.nix diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/by-name/di/directvnc/package.nix similarity index 100% rename from pkgs/os-specific/linux/directvnc/default.nix rename to pkgs/by-name/di/directvnc/package.nix diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/by-name/di/directx-headers/package.nix similarity index 100% rename from pkgs/development/libraries/directx-headers/default.nix rename to pkgs/by-name/di/directx-headers/package.nix diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/by-name/di/direvent/package.nix similarity index 100% rename from pkgs/development/tools/misc/direvent/default.nix rename to pkgs/by-name/di/direvent/package.nix diff --git a/pkgs/tools/security/dirstalk/default.nix b/pkgs/by-name/di/dirstalk/package.nix similarity index 100% rename from pkgs/tools/security/dirstalk/default.nix rename to pkgs/by-name/di/dirstalk/package.nix diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/by-name/di/dirt/package.nix similarity index 100% rename from pkgs/applications/audio/dirt/default.nix rename to pkgs/by-name/di/dirt/package.nix diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/by-name/di/dirvish/package.nix similarity index 100% rename from pkgs/tools/backup/dirvish/default.nix rename to pkgs/by-name/di/dirvish/package.nix diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/by-name/di/discocss/package.nix similarity index 100% rename from pkgs/tools/misc/discocss/default.nix rename to pkgs/by-name/di/discocss/package.nix diff --git a/pkgs/tools/networking/discord-sh/default.nix b/pkgs/by-name/di/discord-sh/package.nix similarity index 100% rename from pkgs/tools/networking/discord-sh/default.nix rename to pkgs/by-name/di/discord-sh/package.nix diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/by-name/di/discount/fix-configure-path.patch similarity index 100% rename from pkgs/tools/text/discount/fix-configure-path.patch rename to pkgs/by-name/di/discount/fix-configure-path.patch diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/by-name/di/discount/package.nix similarity index 100% rename from pkgs/tools/text/discount/default.nix rename to pkgs/by-name/di/discount/package.nix diff --git a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/pkgs/by-name/di/discourse-mail-receiver/package.nix similarity index 100% rename from pkgs/servers/web-apps/discourse/mail_receiver/default.nix rename to pkgs/by-name/di/discourse-mail-receiver/package.nix diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/by-name/di/disfetch/package.nix similarity index 100% rename from pkgs/tools/misc/disfetch/default.nix rename to pkgs/by-name/di/disfetch/package.nix diff --git a/pkgs/tools/filesystems/disk-inventory-x/default.nix b/pkgs/by-name/di/disk-inventory-x/package.nix similarity index 100% rename from pkgs/tools/filesystems/disk-inventory-x/default.nix rename to pkgs/by-name/di/disk-inventory-x/package.nix diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/by-name/di/disk_indicator/package.nix similarity index 100% rename from pkgs/os-specific/linux/disk-indicator/default.nix rename to pkgs/by-name/di/disk_indicator/package.nix diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/by-name/di/diskonaut/package.nix similarity index 100% rename from pkgs/tools/misc/diskonaut/default.nix rename to pkgs/by-name/di/diskonaut/package.nix diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/by-name/di/diskrsync/package.nix similarity index 100% rename from pkgs/tools/backup/diskrsync/default.nix rename to pkgs/by-name/di/diskrsync/package.nix diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/by-name/di/diskscan/package.nix similarity index 100% rename from pkgs/tools/misc/diskscan/default.nix rename to pkgs/by-name/di/diskscan/package.nix diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/by-name/di/dislocker/package.nix similarity index 100% rename from pkgs/tools/filesystems/dislocker/default.nix rename to pkgs/by-name/di/dislocker/package.nix diff --git a/pkgs/tools/security/dismap/default.nix b/pkgs/by-name/di/dismap/package.nix similarity index 100% rename from pkgs/tools/security/dismap/default.nix rename to pkgs/by-name/di/dismap/package.nix diff --git a/pkgs/tools/security/dismember/default.nix b/pkgs/by-name/di/dismember/package.nix similarity index 100% rename from pkgs/tools/security/dismember/default.nix rename to pkgs/by-name/di/dismember/package.nix diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/by-name/di/disnixos/package.nix similarity index 100% rename from pkgs/tools/package-management/disnix/disnixos/default.nix rename to pkgs/by-name/di/disnixos/package.nix diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index 36708fb39215..ee344119bb3b 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -1,4 +1,5 @@ { buildGoModule +, fetchFromGitLab , fetchFromGitHub , gobject-introspection , gst_all_1 @@ -12,6 +13,19 @@ , wrapGAppsHook4 }: +let + libspelling_2_1 = libspelling.overrideAttrs { + version = "0.2.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libspelling"; + rev = "refs/tags/0.2.1"; + hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ="; + }; + }; +in buildGoModule rec { pname = "dissent"; version = "0.0.30"; @@ -39,7 +53,9 @@ buildGoModule rec { libadwaita libcanberra-gtk3 sound-theme-freedesktop - libspelling + # gotk4-spelling fails to build with libspelling >= 0.3.0 + # https://github.com/diamondburned/gotk4-spelling/issues/1 + libspelling_2_1 gtksourceview5 ]; diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/by-name/di/distgen/package.nix similarity index 100% rename from pkgs/development/tools/distgen/default.nix rename to pkgs/by-name/di/distgen/package.nix diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix new file mode 100644 index 000000000000..dcee3bbadd74 --- /dev/null +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenv, + alsa-lib, + fetchFromGitHub, + fftwFloat, + freetype, + libGL, + libX11, + libXcursor, + libXext, + libXrender, + meson, + ninja, + pkg-config, +}: + +let + rpathLibs = [ + fftwFloat + ]; +in +stdenv.mkDerivation { + pname = "distrho-ports"; + version = "2021-03-15-unstable-2024-05-01"; + + src = fetchFromGitHub { + owner = "DISTRHO"; + repo = "DISTRHO-Ports"; + rev = "b3596e6a690eb0556e69e8b6d943fee2dfbb04fb"; + sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = rpathLibs ++ [ + alsa-lib + freetype + libGL + libX11 + libXcursor + libXext + libXrender + ]; + + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; + + postFixup = '' + for file in \ + $out/lib/lv2/vitalium.lv2/vitalium.so \ + $out/lib/vst/vitalium.so \ + $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so + do + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file + done + ''; + + meta = { + homepage = "http://distrho.sourceforge.net/ports"; + description = "Linux audio plugins and LV2 ports"; + longDescription = '' + Includes: + - arctican-function + - arctican-pilgrim + - dexed + - drowaudio-distortion + - drowaudio-distortionshaper + - drowaudio-flanger + - drowaudio-reverb + - drowaudio-tremolo + - drumsynth + - easySSP + - eqinox + - HiReSam + - juce-opl + - klangfalter + - LUFSMeter + - LUFSMeter-Multi + - luftikus + - obxd + - pitchedDelay + - refine + - stereosourceseparation + - swankyamp + - tal-dub-3 + - tal-filter + - tal-filter-2 + - tal-noisemaker + - tal-reverb + - tal-reverb-2 + - tal-reverb-3 + - tal-vocoder-2 + - temper + - vex + - vitalium + - wolpertinger + ''; + license = with lib.licenses; [ + gpl2Only + gpl3Only + gpl2Plus + lgpl2Plus + lgpl3Only + mit + ]; + maintainers = [ ]; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86; + }; +} diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix new file mode 100644 index 000000000000..ce3c4e075a95 --- /dev/null +++ b/pkgs/by-name/di/distrobox/package.nix @@ -0,0 +1,53 @@ +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, wget }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "distrobox"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "89luca89"; + repo = "distrobox"; + rev = finalAttrs.version; + hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ + # https://github.com/89luca89/distrobox/issues/408 + ./relative-default-icon.patch + ]; + + installPhase = '' + runHook preInstall + + ./install -P $out + + runHook postInstall + ''; + + # https://github.com/89luca89/distrobox/issues/407 + postFixup = '' + wrapProgram "$out/bin/distrobox-generate-entry" \ + --prefix PATH ":" ${lib.makeBinPath [ wget ]} + + mkdir -p $out/share/distrobox + echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf + ''; + + meta = with lib; { + description = "Wrapper around podman or docker to create and start containers"; + longDescription = '' + Use any linux distribution inside your terminal. Enable both backward and + forward compatibility with software and freedom to use whatever distribution + you’re more comfortable with + ''; + homepage = "https://distrobox.it/"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ atila ]; + }; +}) diff --git a/pkgs/by-name/di/distrobox/relative-default-icon.patch b/pkgs/by-name/di/distrobox/relative-default-icon.patch new file mode 100644 index 000000000000..069c2d40d618 --- /dev/null +++ b/pkgs/by-name/di/distrobox/relative-default-icon.patch @@ -0,0 +1,26 @@ +diff --git a/distrobox-generate-entry b/distrobox-generate-entry +index 65fcea0..8d57e4e 100755 +--- a/distrobox-generate-entry ++++ b/distrobox-generate-entry +@@ -51,7 +51,7 @@ container_manager="autodetect" + container_name_default="my-distrobox" + delete=0 + icon="auto" +-icon_default="${XDG_DATA_HOME:-${HOME}/.local/share}/icons/terminal-distrobox-icon.svg" ++icon_default="terminal-distrobox-icon" + verbose=0 + online=0 + version="1.8.0" +@@ -335,12 +335,6 @@ if [ "${icon}" = "auto" ]; then + + icon_url="$(echo "${DISTRO_ICON_MAP}" | grep "${container_distro}:" | cut -d':' -f2-)" + +- # Distro not found in our map, fallback to generic icon +- if [ -z "${icon_url}" ]; then +- icon_url="https://raw.githubusercontent.com/89luca89/distrobox/main/icons/terminal-distrobox-icon.svg" +- container_distro="terminal-distrobox-icon" +- fi +- + if [ -n "${icon_url}" ] && [ "${download}" != "null" ]; then + icon_extension="${icon_url##*.}" + diff --git a/pkgs/tools/virtualization/distrobuilder/generator.nix b/pkgs/by-name/di/distrobuilder/generator.nix similarity index 100% rename from pkgs/tools/virtualization/distrobuilder/generator.nix rename to pkgs/by-name/di/distrobuilder/generator.nix diff --git a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/pkgs/by-name/di/distrobuilder/nixos-generator.patch similarity index 100% rename from pkgs/tools/virtualization/distrobuilder/nixos-generator.patch rename to pkgs/by-name/di/distrobuilder/nixos-generator.patch diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/by-name/di/distrobuilder/package.nix similarity index 100% rename from pkgs/tools/virtualization/distrobuilder/default.nix rename to pkgs/by-name/di/distrobuilder/package.nix diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix new file mode 100644 index 000000000000..a0250eee1581 --- /dev/null +++ b/pkgs/by-name/di/diswall/package.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: + +let + inherit (darwin.apple_sdk.frameworks) Security; +in +rustPlatform.buildRustPackage rec { + pname = "diswall"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "dis-works"; + repo = "diswall-rs"; + rev = "v${version}"; + sha256 = "sha256-jrifO6LRxVhgPoUOAm+7RT+LIhjsw/mEDFBZSJYMv/w="; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + Security + ]; + + cargoHash = "sha256-1HxuVZ4J/Ds1aOIIcNa/XGi7PhKgB+iAESMa1muTL48="; + + doCheck = false; + + meta = with lib; { + description = "Distributed firewall"; + longDescription = '' + Diswall (distributed firewall) - a client of distributed firewall + working on many servers and using NATS for the transport level. + Its purpose - blocking IPs with a blink of the eye on all servers + in any infrastructure when some IP checks any of the closed ports + of anyone of these servers. Therefore, diswall provides good + protection of whole infrastructure (as anti-shodan) preventing + intruder to get any system information. + ''; + homepage = "https://www.diswall.stream"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ izorkin ]; + mainProgram = "diswall"; + }; +} diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/by-name/di/dit/package.nix similarity index 100% rename from pkgs/applications/editors/dit/default.nix rename to pkgs/by-name/di/dit/package.nix diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/by-name/di/ditaa/package.nix similarity index 100% rename from pkgs/tools/graphics/ditaa/default.nix rename to pkgs/by-name/di/ditaa/package.nix diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/by-name/di/dive/package.nix similarity index 100% rename from pkgs/development/tools/dive/default.nix rename to pkgs/by-name/di/dive/package.nix diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/by-name/di/diylc/package.nix similarity index 100% rename from pkgs/applications/science/electronics/diylc/default.nix rename to pkgs/by-name/di/diylc/package.nix diff --git a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/pkgs/by-name/dj/djbdns/fix-nix-usernamespace-build.patch similarity index 100% rename from pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch rename to pkgs/by-name/dj/djbdns/fix-nix-usernamespace-build.patch diff --git a/pkgs/tools/networking/djbdns/hier.patch b/pkgs/by-name/dj/djbdns/hier.patch similarity index 100% rename from pkgs/tools/networking/djbdns/hier.patch rename to pkgs/by-name/dj/djbdns/hier.patch diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/by-name/dj/djbdns/package.nix similarity index 100% rename from pkgs/tools/networking/djbdns/default.nix rename to pkgs/by-name/dj/djbdns/package.nix diff --git a/pkgs/tools/networking/djbdns/softlimit.patch b/pkgs/by-name/dj/djbdns/softlimit.patch similarity index 100% rename from pkgs/tools/networking/djbdns/softlimit.patch rename to pkgs/by-name/dj/djbdns/softlimit.patch diff --git a/pkgs/tools/misc/djenrandom/default.nix b/pkgs/by-name/dj/djenrandom/package.nix similarity index 100% rename from pkgs/tools/misc/djenrandom/default.nix rename to pkgs/by-name/dj/djenrandom/package.nix diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/by-name/dj/djlint/package.nix similarity index 100% rename from pkgs/development/tools/djlint/default.nix rename to pkgs/by-name/dj/djlint/package.nix diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/by-name/dj/djmount/package.nix similarity index 100% rename from pkgs/tools/filesystems/djmount/default.nix rename to pkgs/by-name/dj/djmount/package.nix diff --git a/pkgs/tools/text/djot-js/default.nix b/pkgs/by-name/dj/djot-js/package.nix similarity index 100% rename from pkgs/tools/text/djot-js/default.nix rename to pkgs/by-name/dj/djot-js/package.nix diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/by-name/dj/djv/package.nix similarity index 100% rename from pkgs/applications/graphics/djv/default.nix rename to pkgs/by-name/dj/djv/package.nix diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/by-name/dj/djvu2pdf/package.nix similarity index 100% rename from pkgs/tools/typesetting/djvu2pdf/default.nix rename to pkgs/by-name/dj/djvu2pdf/package.nix diff --git a/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch similarity index 100% rename from pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch rename to pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch diff --git a/pkgs/applications/misc/djvulibre/c++17-register-class.patch b/pkgs/by-name/dj/djvulibre/c++17-register-class.patch similarity index 100% rename from pkgs/applications/misc/djvulibre/c++17-register-class.patch rename to pkgs/by-name/dj/djvulibre/c++17-register-class.patch diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/by-name/dj/djvulibre/package.nix similarity index 100% rename from pkgs/applications/misc/djvulibre/default.nix rename to pkgs/by-name/dj/djvulibre/package.nix diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/by-name/dk/dk/package.nix similarity index 100% rename from pkgs/applications/window-managers/dk/default.nix rename to pkgs/by-name/dk/dk/package.nix diff --git a/pkgs/applications/science/chemistry/dkh/default.nix b/pkgs/by-name/dk/dkh/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/dkh/default.nix rename to pkgs/by-name/dk/dkh/package.nix diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/by-name/dk/dkimproxy/package.nix similarity index 100% rename from pkgs/servers/mail/dkimproxy/default.nix rename to pkgs/by-name/dk/dkimproxy/package.nix diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/by-name/dl/dl-librescore/package.nix similarity index 100% rename from pkgs/tools/audio/dl-librescore/default.nix rename to pkgs/by-name/dl/dl-librescore/package.nix diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix similarity index 100% rename from pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix rename to pkgs/by-name/dl/dl-poly-classic-mpi/package.nix diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix similarity index 100% rename from pkgs/development/libraries/dleyna-connector-dbus/default.nix rename to pkgs/by-name/dl/dleyna-connector-dbus/package.nix diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/by-name/dl/dleyna-core/package.nix similarity index 100% rename from pkgs/development/libraries/dleyna-core/default.nix rename to pkgs/by-name/dl/dleyna-core/package.nix diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/by-name/dl/dleyna-core/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/dleyna-core/setup-hook.sh rename to pkgs/by-name/dl/dleyna-core/setup-hook.sh diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix similarity index 100% rename from pkgs/development/libraries/dleyna-renderer/default.nix rename to pkgs/by-name/dl/dleyna-renderer/package.nix diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/by-name/dl/dleyna-server/package.nix similarity index 100% rename from pkgs/development/libraries/dleyna-server/default.nix rename to pkgs/by-name/dl/dleyna-server/package.nix diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/by-name/dl/dlib/package.nix similarity index 100% rename from pkgs/development/libraries/dlib/default.nix rename to pkgs/by-name/dl/dlib/package.nix diff --git a/pkgs/applications/emulators/dlx/default.nix b/pkgs/by-name/dl/dlx/package.nix similarity index 100% rename from pkgs/applications/emulators/dlx/default.nix rename to pkgs/by-name/dl/dlx/package.nix diff --git a/pkgs/data/fonts/dm-sans/default.nix b/pkgs/by-name/dm/dm-sans/package.nix similarity index 100% rename from pkgs/data/fonts/dm-sans/default.nix rename to pkgs/by-name/dm/dm-sans/package.nix diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix rename to pkgs/by-name/dm/dmarc-metrics-exporter/package.nix diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/by-name/dm/dmg2img/package.nix similarity index 100% rename from pkgs/tools/misc/dmg2img/default.nix rename to pkgs/by-name/dm/dmg2img/package.nix diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/by-name/dm/dmidecode/package.nix similarity index 100% rename from pkgs/os-specific/linux/dmidecode/default.nix rename to pkgs/by-name/dm/dmidecode/package.nix diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix new file mode 100644 index 000000000000..1f6714afff20 --- /dev/null +++ b/pkgs/by-name/dm/dmlive/package.nix @@ -0,0 +1,54 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + openssl, + mpv, + ffmpeg, + nodejs, +}: + +rustPlatform.buildRustPackage rec { + pname = "dmlive"; + version = "5.5.4"; + + src = fetchFromGitHub { + owner = "THMonster"; + repo = pname; + rev = "688ddda12ed70a7ad25ede63e948e1cba143a307"; # no tag + hash = "sha256-M7IZ2UzusWovyhigyUXasmSEz4J79gnFyivHVUqfUKg="; + }; + + cargoHash = "sha256-d3vI2iv2Db1XZQc3uaNfkUpDyNKPvHkb/0zEwRTOWZ0="; + + OPENSSL_NO_VENDOR = true; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + openssl + ]; + + postInstall = '' + wrapProgram "$out/bin/dmlive" --prefix PATH : "${ + lib.makeBinPath [ + mpv + ffmpeg + nodejs + ] + }" + ''; + + meta = { + description = "Tool to play and record videos or live streams with danmaku"; + homepage = "https://github.com/THMonster/dmlive"; + license = lib.licenses.mit; + mainProgram = "dmlive"; + maintainers = with lib.maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/by-name/dm/dmrconfig/package.nix similarity index 100% rename from pkgs/applications/radio/dmrconfig/default.nix rename to pkgs/by-name/dm/dmrconfig/package.nix diff --git a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/pkgs/by-name/dm/dmtcp/ld-linux-so-buffer-size.patch similarity index 100% rename from pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch rename to pkgs/by-name/dm/dmtcp/ld-linux-so-buffer-size.patch diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/by-name/dm/dmtcp/package.nix similarity index 100% rename from pkgs/os-specific/linux/dmtcp/default.nix rename to pkgs/by-name/dm/dmtcp/package.nix diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/by-name/dn/dnadd/package.nix similarity index 100% rename from pkgs/tools/nix/dnadd/default.nix rename to pkgs/by-name/dn/dnadd/package.nix diff --git a/pkgs/applications/misc/dnd-tools/default.nix b/pkgs/by-name/dn/dnd-tools/package.nix similarity index 100% rename from pkgs/applications/misc/dnd-tools/default.nix rename to pkgs/by-name/dn/dnd-tools/package.nix diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/by-name/dn/dnf5/package.nix similarity index 100% rename from pkgs/tools/package-management/dnf5/default.nix rename to pkgs/by-name/dn/dnf5/package.nix diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/by-name/dn/dnglab/package.nix similarity index 100% rename from pkgs/tools/graphics/dnglab/default.nix rename to pkgs/by-name/dn/dnglab/package.nix diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/by-name/dn/dns-root-data/package.nix similarity index 100% rename from pkgs/data/misc/dns-root-data/default.nix rename to pkgs/by-name/dn/dns-root-data/package.nix diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/by-name/dn/dns-root-data/root.ds similarity index 100% rename from pkgs/data/misc/dns-root-data/root.ds rename to pkgs/by-name/dn/dns-root-data/root.ds diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/by-name/dn/dns-root-data/root.key similarity index 100% rename from pkgs/data/misc/dns-root-data/root.key rename to pkgs/by-name/dn/dns-root-data/root.key diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/by-name/dn/dns-root-data/update-root-key.sh similarity index 100% rename from pkgs/data/misc/dns-root-data/update-root-key.sh rename to pkgs/by-name/dn/dns-root-data/update-root-key.sh diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix new file mode 100644 index 000000000000..d865e1adaee0 --- /dev/null +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -0,0 +1,48 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, dnscontrol }: + +buildGoModule rec { + pname = "dnscontrol"; + version = "4.14.3"; + + src = fetchFromGitHub { + owner = "StackExchange"; + repo = "dnscontrol"; + rev = "v${version}"; + hash = "sha256-FDxNJ6pOigasulxtAAnvHfWHQ3Ji459IQScA4dld9KQ="; + }; + + vendorHash = "sha256-aqS5esDroGg83NJygX8tW8P0U4YCkll98KmAfya6lKM="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; + + postInstall = '' + installShellCompletion --cmd dnscontrol \ + --bash <($out/bin/dnscontrol shell-completion bash) \ + --zsh <($out/bin/dnscontrol shell-completion zsh) + ''; + + preCheck = '' + # requires network + rm pkg/spflib/flatten_test.go pkg/spflib/parse_test.go + ''; + + passthru.tests = { + version = testers.testVersion { + command = "${lib.getExe dnscontrol} version"; + package = dnscontrol; + }; + }; + + meta = with lib; { + description = "Synchronize your DNS to multiple providers from a simple DSL"; + homepage = "https://dnscontrol.org/"; + changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "dnscontrol"; + }; +} diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix similarity index 100% rename from pkgs/tools/networking/dnscrypt-proxy/default.nix rename to pkgs/by-name/dn/dnscrypt-proxy/package.nix diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix index 013d7a75259f..a64f1a32dafb 100644 --- a/pkgs/by-name/dn/dnsdiag/package.nix +++ b/pkgs/by-name/dn/dnsdiag/package.nix @@ -6,19 +6,20 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsdiag"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "farrokhi"; repo = "dnsdiag"; rev = "refs/tags/v${version}"; - hash = "sha256-qUbHwbLPDyy24GNu3dDJQKV3B71q1ODNMyRFIWwyRuo="; + hash = "sha256-6TDs+ncbVa7LWtGLlqEXJb9zzXZ+nAhbi4QGyCSu3ho="; }; build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ + aioquic cryptography cymruwhois dnspython diff --git a/pkgs/servers/dns/dnsdist/disable-network-tests.patch b/pkgs/by-name/dn/dnsdist/disable-network-tests.patch similarity index 100% rename from pkgs/servers/dns/dnsdist/disable-network-tests.patch rename to pkgs/by-name/dn/dnsdist/disable-network-tests.patch diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/by-name/dn/dnsdist/package.nix similarity index 100% rename from pkgs/servers/dns/dnsdist/default.nix rename to pkgs/by-name/dn/dnsdist/package.nix diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/by-name/dn/dnsenum/package.nix similarity index 100% rename from pkgs/tools/security/dnsenum/default.nix rename to pkgs/by-name/dn/dnsenum/package.nix diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/by-name/dn/dnsmasq/package.nix similarity index 100% rename from pkgs/tools/networking/dnsmasq/default.nix rename to pkgs/by-name/dn/dnsmasq/package.nix diff --git a/pkgs/tools/networking/dnsmon-go/default.nix b/pkgs/by-name/dn/dnsmon-go/package.nix similarity index 100% rename from pkgs/tools/networking/dnsmon-go/default.nix rename to pkgs/by-name/dn/dnsmon-go/package.nix diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/by-name/dn/dnsmonster/package.nix similarity index 100% rename from pkgs/tools/networking/dnsmonster/default.nix rename to pkgs/by-name/dn/dnsmonster/package.nix diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/by-name/dn/dnsname-cni/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/dnsname-cni/default.nix rename to pkgs/by-name/dn/dnsname-cni/package.nix diff --git a/pkgs/tools/security/dnspeep/Cargo.lock b/pkgs/by-name/dn/dnspeep/Cargo.lock similarity index 100% rename from pkgs/tools/security/dnspeep/Cargo.lock rename to pkgs/by-name/dn/dnspeep/Cargo.lock diff --git a/pkgs/tools/security/dnspeep/default.nix b/pkgs/by-name/dn/dnspeep/package.nix similarity index 100% rename from pkgs/tools/security/dnspeep/default.nix rename to pkgs/by-name/dn/dnspeep/package.nix diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/by-name/dn/dnsperf/package.nix similarity index 100% rename from pkgs/tools/networking/dnsperf/default.nix rename to pkgs/by-name/dn/dnsperf/package.nix diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/by-name/dn/dnsproxy/package.nix similarity index 100% rename from pkgs/tools/networking/dnsproxy/default.nix rename to pkgs/by-name/dn/dnsproxy/package.nix diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/by-name/dn/dnsrecon/package.nix similarity index 100% rename from pkgs/tools/security/dnsrecon/default.nix rename to pkgs/by-name/dn/dnsrecon/package.nix diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/by-name/dn/dnstake/package.nix similarity index 100% rename from pkgs/tools/networking/dnstake/default.nix rename to pkgs/by-name/dn/dnstake/package.nix diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/by-name/dn/dnstop/package.nix similarity index 100% rename from pkgs/tools/networking/dnstop/default.nix rename to pkgs/by-name/dn/dnstop/package.nix diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/by-name/dn/dnstwist/package.nix similarity index 100% rename from pkgs/tools/networking/dnstwist/default.nix rename to pkgs/by-name/dn/dnstwist/package.nix diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/by-name/dn/dnsx/package.nix similarity index 100% rename from pkgs/tools/security/dnsx/default.nix rename to pkgs/by-name/dn/dnsx/package.nix diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/by-name/do/do-agent/package.nix similarity index 100% rename from pkgs/servers/monitoring/do-agent/default.nix rename to pkgs/by-name/do/do-agent/package.nix diff --git a/pkgs/tools/security/doas-sudo-shim/default.nix b/pkgs/by-name/do/doas-sudo-shim/package.nix similarity index 100% rename from pkgs/tools/security/doas-sudo-shim/default.nix rename to pkgs/by-name/do/doas-sudo-shim/package.nix diff --git a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/pkgs/by-name/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch similarity index 100% rename from pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch rename to pkgs/by-name/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/by-name/do/doas/package.nix similarity index 100% rename from pkgs/tools/security/doas/default.nix rename to pkgs/by-name/do/doas/package.nix diff --git a/pkgs/development/tools/doc2go/default.nix b/pkgs/by-name/do/doc2go/package.nix similarity index 100% rename from pkgs/development/tools/doc2go/default.nix rename to pkgs/by-name/do/doc2go/package.nix diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/by-name/do/docbook2mdoc/package.nix similarity index 100% rename from pkgs/tools/misc/docbook2mdoc/default.nix rename to pkgs/by-name/do/docbook2mdoc/package.nix diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/by-name/do/docbook2odf/package.nix similarity index 100% rename from pkgs/tools/typesetting/docbook2odf/default.nix rename to pkgs/by-name/do/docbook2odf/package.nix diff --git a/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch b/pkgs/by-name/do/docbook2x/db2x_texixml-to-stdout.patch similarity index 100% rename from pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch rename to pkgs/by-name/do/docbook2x/db2x_texixml-to-stdout.patch diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/by-name/do/docbook2x/package.nix similarity index 100% rename from pkgs/tools/typesetting/docbook2x/default.nix rename to pkgs/by-name/do/docbook2x/package.nix diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/by-name/do/docbook5/package.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix rename to pkgs/by-name/do/docbook5/package.nix diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat b/pkgs/by-name/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat similarity index 100% rename from pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat rename to pkgs/by-name/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix rename to pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/by-name/do/dockbarx/package.nix similarity index 100% rename from pkgs/applications/misc/dockbarx/default.nix rename to pkgs/by-name/do/dockbarx/package.nix diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/by-name/do/docker-compose-language-service/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/docker-compose-language-service/default.nix rename to pkgs/by-name/do/docker-compose-language-service/package.nix diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix similarity index 100% rename from pkgs/tools/admin/docker-credential-helpers/default.nix rename to pkgs/by-name/do/docker-credential-helpers/package.nix diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/by-name/do/docker-ls/package.nix similarity index 100% rename from pkgs/tools/misc/docker-ls/default.nix rename to pkgs/by-name/do/docker-ls/package.nix diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/by-name/do/docker-slim/package.nix similarity index 100% rename from pkgs/applications/virtualization/docker-slim/default.nix rename to pkgs/by-name/do/docker-slim/package.nix diff --git a/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix rename to pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/by-name/do/dockfmt/package.nix similarity index 100% rename from pkgs/development/tools/dockfmt/default.nix rename to pkgs/by-name/do/dockfmt/package.nix diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/by-name/do/dockle/package.nix similarity index 100% rename from pkgs/development/tools/dockle/default.nix rename to pkgs/by-name/do/dockle/package.nix diff --git a/pkgs/tools/virtualization/dockstarter/default.nix b/pkgs/by-name/do/dockstarter/package.nix similarity index 100% rename from pkgs/tools/virtualization/dockstarter/default.nix rename to pkgs/by-name/do/dockstarter/package.nix diff --git a/pkgs/os-specific/darwin/dockutil/generated/default.nix b/pkgs/by-name/do/dockutil/generated/default.nix similarity index 100% rename from pkgs/os-specific/darwin/dockutil/generated/default.nix rename to pkgs/by-name/do/dockutil/generated/default.nix diff --git a/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json b/pkgs/by-name/do/dockutil/generated/workspace-state.json similarity index 100% rename from pkgs/os-specific/darwin/dockutil/generated/workspace-state.json rename to pkgs/by-name/do/dockutil/generated/workspace-state.json diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/by-name/do/dockutil/package.nix similarity index 100% rename from pkgs/os-specific/darwin/dockutil/default.nix rename to pkgs/by-name/do/dockutil/package.nix diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/by-name/do/doclifter/package.nix similarity index 100% rename from pkgs/development/tools/misc/doclifter/default.nix rename to pkgs/by-name/do/doclifter/package.nix diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/by-name/do/docopt_cpp/package.nix similarity index 100% rename from pkgs/development/libraries/docopt_cpp/default.nix rename to pkgs/by-name/do/docopt_cpp/package.nix diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/by-name/do/doctest/package.nix similarity index 100% rename from pkgs/development/libraries/doctest/default.nix rename to pkgs/by-name/do/doctest/package.nix diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/by-name/do/doctl/package.nix similarity index 100% rename from pkgs/development/tools/doctl/default.nix rename to pkgs/by-name/do/doctl/package.nix diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/by-name/do/docui/package.nix similarity index 100% rename from pkgs/tools/misc/docui/default.nix rename to pkgs/by-name/do/docui/package.nix diff --git a/pkgs/applications/office/documenso/default.nix b/pkgs/by-name/do/documenso/package.nix similarity index 100% rename from pkgs/applications/office/documenso/default.nix rename to pkgs/by-name/do/documenso/package.nix diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/by-name/do/documize-community/package.nix similarity index 100% rename from pkgs/servers/documize-community/default.nix rename to pkgs/by-name/do/documize-community/package.nix diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/by-name/do/dog/package.nix similarity index 100% rename from pkgs/tools/system/dog/default.nix rename to pkgs/by-name/do/dog/package.nix diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/by-name/do/doitlive/package.nix similarity index 100% rename from pkgs/tools/misc/doitlive/default.nix rename to pkgs/by-name/do/doitlive/package.nix diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/by-name/do/dokuwiki/package.nix similarity index 100% rename from pkgs/servers/web-apps/dokuwiki/default.nix rename to pkgs/by-name/do/dokuwiki/package.nix diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/by-name/do/dolbybcsoftwaredecode/package.nix similarity index 100% rename from pkgs/applications/audio/dolbybcsoftwaredecode/default.nix rename to pkgs/by-name/do/dolbybcsoftwaredecode/package.nix diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix new file mode 100644 index 000000000000..763180a516b4 --- /dev/null +++ b/pkgs/by-name/do/dolibarr/package.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchFromGitHub, nixosTests, stateDir ? "/var/lib/dolibarr" }: + +stdenv.mkDerivation rec { + pname = "dolibarr"; + version = "20.0.0"; + + src = fetchFromGitHub { + owner = "Dolibarr"; + repo = "dolibarr"; + rev = version; + hash = "sha256-nxytzUEpEo1qeIlpbPQ4mETl5DAAP+d1bqUcYxEW26E="; + }; + + dontBuild = true; + + postPatch = '' + find . -type f -name "*.php" -print0 | xargs -0 sed -i 's|/etc/dolibarr|${stateDir}|g' + + substituteInPlace htdocs/filefunc.inc.php \ + --replace '//$conffile = ' '$conffile = ' \ + --replace '//$conffiletoshow = ' '$conffiletoshow = ' + + substituteInPlace htdocs/install/inc.php \ + --replace '//$conffile = ' '$conffile = ' \ + --replace '//$conffiletoshow = ' '$conffiletoshow = ' + ''; + + installPhase = '' + mkdir -p "$out" + cp -r * $out + ''; + + passthru.tests = { inherit (nixosTests) dolibarr; }; + + meta = with lib; { + description = "Enterprise resource planning (ERP) and customer relationship manager (CRM) server"; + homepage = "https://dolibarr.org/"; + license = licenses.gpl3Plus; + maintainers = [ ]; + }; +} diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/by-name/do/dolt/package.nix similarity index 100% rename from pkgs/servers/sql/dolt/default.nix rename to pkgs/by-name/do/dolt/package.nix diff --git a/pkgs/games/domination/default.nix b/pkgs/by-name/do/domination/package.nix similarity index 100% rename from pkgs/games/domination/default.nix rename to pkgs/by-name/do/domination/package.nix diff --git a/pkgs/tools/misc/domine/default.nix b/pkgs/by-name/do/domine/package.nix similarity index 100% rename from pkgs/tools/misc/domine/default.nix rename to pkgs/by-name/do/domine/package.nix diff --git a/pkgs/tools/misc/domine/pubspec.lock.json b/pkgs/by-name/do/domine/pubspec.lock.json similarity index 100% rename from pkgs/tools/misc/domine/pubspec.lock.json rename to pkgs/by-name/do/domine/pubspec.lock.json diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/by-name/do/domoticz/package.nix similarity index 100% rename from pkgs/servers/domoticz/default.nix rename to pkgs/by-name/do/domoticz/package.nix diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/by-name/do/done/package.nix similarity index 100% rename from pkgs/applications/misc/done/default.nix rename to pkgs/by-name/do/done/package.nix diff --git a/pkgs/tools/security/donkey/default.nix b/pkgs/by-name/do/donkey/package.nix similarity index 100% rename from pkgs/tools/security/donkey/default.nix rename to pkgs/by-name/do/donkey/package.nix diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/by-name/do/dontgo403/package.nix similarity index 100% rename from pkgs/tools/security/dontgo403/default.nix rename to pkgs/by-name/do/dontgo403/package.nix diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/by-name/do/doodle/package.nix similarity index 100% rename from pkgs/applications/search/doodle/default.nix rename to pkgs/by-name/do/doodle/package.nix diff --git a/pkgs/tools/system/dool/default.nix b/pkgs/by-name/do/dool/package.nix similarity index 100% rename from pkgs/tools/system/dool/default.nix rename to pkgs/by-name/do/dool/package.nix diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/by-name/do/doona/package.nix similarity index 100% rename from pkgs/tools/security/doona/default.nix rename to pkgs/by-name/do/doona/package.nix diff --git a/pkgs/development/tools/misc/doq/default.nix b/pkgs/by-name/do/doq/package.nix similarity index 100% rename from pkgs/development/tools/misc/doq/default.nix rename to pkgs/by-name/do/doq/package.nix diff --git a/pkgs/tools/security/dorkscout/default.nix b/pkgs/by-name/do/dorkscout/package.nix similarity index 100% rename from pkgs/tools/security/dorkscout/default.nix rename to pkgs/by-name/do/dorkscout/package.nix diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/by-name/do/dos2unix/package.nix similarity index 100% rename from pkgs/tools/text/dos2unix/default.nix rename to pkgs/by-name/do/dos2unix/package.nix diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/by-name/do/dosage/package.nix similarity index 100% rename from pkgs/applications/graphics/dosage/default.nix rename to pkgs/by-name/do/dosage/package.nix diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index d23466447ecc..43d4377d614a 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -4,7 +4,6 @@ SDL2_image, SDL2_net, alsa-lib, - darwin, fetchFromGitHub, fetchpatch, fluidsynth, @@ -30,6 +29,8 @@ stdenv, testers, zlib-ng, + apple-sdk_15, + darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -81,14 +82,10 @@ stdenv.mkDerivation (finalAttrs: { zlib-ng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AudioUnit - Carbon - Cocoa - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + (darwinMinVersionHook "10.15") # from https://www.dosbox-staging.org/releases/macos/ + ]; outputs = [ "out" "man" ]; diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/by-name/do/dosemu_fonts/package.nix similarity index 100% rename from pkgs/data/fonts/dosemu-fonts/default.nix rename to pkgs/by-name/do/dosemu_fonts/package.nix diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/by-name/do/dosfstools/package.nix similarity index 100% rename from pkgs/tools/filesystems/dosfstools/default.nix rename to pkgs/by-name/do/dosfstools/package.nix diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/by-name/do/dosis/package.nix similarity index 100% rename from pkgs/data/fonts/dosis/default.nix rename to pkgs/by-name/do/dosis/package.nix diff --git a/pkgs/development/tools/language-servers/dot-language-server/default.nix b/pkgs/by-name/do/dot-language-server/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/dot-language-server/default.nix rename to pkgs/by-name/do/dot-language-server/package.nix diff --git a/pkgs/tools/misc/dotacat/default.nix b/pkgs/by-name/do/dotacat/package.nix similarity index 100% rename from pkgs/tools/misc/dotacat/default.nix rename to pkgs/by-name/do/dotacat/package.nix diff --git a/pkgs/by-name/do/dotbot/0001-fix-build.patch b/pkgs/by-name/do/dotbot/0001-fix-build.patch new file mode 100644 index 000000000000..d960db1a5846 --- /dev/null +++ b/pkgs/by-name/do/dotbot/0001-fix-build.patch @@ -0,0 +1,30 @@ +From c82a6e988594e6bb703df1f39d31451ea5be6967 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sun, 3 Nov 2024 16:23:50 +0800 +Subject: [PATCH] fix build + +--- + tests/conftest.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 162781b..d13808d 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -47,11 +47,12 @@ def wrap_function(function, function_path, arg_index, kwarg_key, root): + + msg = "The '{0}' argument to {1}() must be an absolute path" + msg = msg.format(kwarg_key, function_path) ++ value = os.path.join(value) + assert value == os.path.abspath(value), msg + + msg = "The '{0}' argument to {1}() must be rooted in {2}" + msg = msg.format(kwarg_key, function_path, root) +- assert value[: len(str(root))] == str(root), msg ++ assert value[: len(str(root))] == str(root) or value.find("pytest-cache")!=-1, msg + + return function(*args, **kwargs) + +-- +2.46.1 + diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix index 9ae2368f530e..bdf9ecd8eeaf 100644 --- a/pkgs/by-name/do/dotbot/package.nix +++ b/pkgs/by-name/do/dotbot/package.nix @@ -1,6 +1,7 @@ -{ lib -, python3Packages -, fetchFromGitHub +{ + lib, + python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { @@ -19,13 +20,18 @@ python3Packages.buildPythonApplication rec { patchShebangs bin/dotbot ''; + patches = [ + # ignore pytest-cache because it was not at /tmp/nix-shell and it was used by pytest itself not our program + ./0001-fix-build.patch + ]; + nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = with python3Packages; [ pyyaml ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Tool that bootstraps your dotfiles"; mainProgram = "dotbot"; longDescription = '' @@ -36,9 +42,8 @@ python3Packages.buildPythonApplication rec { dotfiles. ''; homepage = "https://github.com/anishathalye/dotbot"; - changelog = - "https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ludat ]; + changelog = "https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ludat ]; }; } diff --git a/pkgs/data/fonts/dotcolon-fonts/default.nix b/pkgs/by-name/do/dotcolon-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/dotcolon-fonts/default.nix rename to pkgs/by-name/do/dotcolon-fonts/package.nix diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/by-name/do/dotconf/package.nix similarity index 100% rename from pkgs/development/libraries/dotconf/default.nix rename to pkgs/by-name/do/dotconf/package.nix diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 2871a5f52bd2..3c71830afed8 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.14.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; rev = "refs/tags/v${version}"; - hash = "sha256-SlZ18ToGbC+c5ffuYFGeOy30w90ukBO0qKxD+HNVt3E="; + hash = "sha256-i6181Ot40t2IlAGpj0pES9nPFB1dZrcypgs4qLQ05hE="; }; - npmDepsHash = "sha256-KaqSCtraMmQHe7Tcs/2CVaQcmazgHkV5K4T64lHEVP4="; + npmDepsHash = "sha256-wo+Gtq2gdcIWY0yDzf5vrxEHfFzMfpgIjG+/MBdvz1U="; dontNpmBuild = true; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/by-name/do/dotfiles/package.nix similarity index 100% rename from pkgs/applications/misc/dotfiles/default.nix rename to pkgs/by-name/do/dotfiles/package.nix diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/by-name/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh rename to pkgs/by-name/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix b/pkgs/by-name/do/dotnetbuildhelpers/package.nix similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix rename to pkgs/by-name/do/dotnetbuildhelpers/package.nix diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/by-name/do/dotnetbuildhelpers/patch-fsharp-targets.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh rename to pkgs/by-name/do/dotnetbuildhelpers/patch-fsharp-targets.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh b/pkgs/by-name/do/dotnetbuildhelpers/placate-nuget.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh rename to pkgs/by-name/do/dotnetbuildhelpers/placate-nuget.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh b/pkgs/by-name/do/dotnetbuildhelpers/placate-paket.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh rename to pkgs/by-name/do/dotnetbuildhelpers/placate-paket.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/by-name/do/dotnetbuildhelpers/remove-duplicated-dlls.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh rename to pkgs/by-name/do/dotnetbuildhelpers/remove-duplicated-dlls.sh diff --git a/pkgs/tools/dotool/fix-paths.patch b/pkgs/by-name/do/dotool/fix-paths.patch similarity index 100% rename from pkgs/tools/dotool/fix-paths.patch rename to pkgs/by-name/do/dotool/fix-paths.patch diff --git a/pkgs/tools/dotool/default.nix b/pkgs/by-name/do/dotool/package.nix similarity index 100% rename from pkgs/tools/dotool/default.nix rename to pkgs/by-name/do/dotool/package.nix diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/by-name/do/double-conversion/package.nix similarity index 100% rename from pkgs/development/libraries/double-conversion/default.nix rename to pkgs/by-name/do/double-conversion/package.nix diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/by-name/do/doulos-sil/package.nix similarity index 100% rename from pkgs/data/fonts/doulos-sil/default.nix rename to pkgs/by-name/do/doulos-sil/package.nix diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/by-name/do/dovecot_fts_xapian/package.nix similarity index 100% rename from pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix rename to pkgs/by-name/do/dovecot_fts_xapian/package.nix diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix new file mode 100644 index 000000000000..5ed0d4be3ed1 --- /dev/null +++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, dovecot, openssl }: +let + dovecotMajorMinor = lib.versions.majorMinor dovecot.version; +in stdenv.mkDerivation rec { + pname = "dovecot-pigeonhole"; + version = "0.5.21.1"; + + src = fetchurl { + url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; + hash = "sha256-A3fbKEtiByPeBgQxEV+y53keHfQyFBGvcYIB1pJcRpI="; + }; + + buildInputs = [ dovecot openssl ]; + + preConfigure = '' + substituteInPlace src/managesieve/managesieve-settings.c --replace \ + ".executable = \"managesieve\"" \ + ".executable = \"$out/libexec/dovecot/managesieve\"" + substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \ + ".executable = \"managesieve-login\"" \ + ".executable = \"$out/libexec/dovecot/managesieve-login\"" + ''; + + configureFlags = [ + "--with-dovecot=${dovecot}/lib/dovecot" + "--without-dovecot-install-dirs" + "--with-moduledir=$(out)/lib/dovecot" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://pigeonhole.dovecot.org/"; + description = "Sieve plugin for the Dovecot IMAP server"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ globin ] ++ teams.helsinki-systems.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/pkgs/by-name/do/dozenal/lua-header.patch similarity index 100% rename from pkgs/applications/misc/dozenal/lua-header.patch rename to pkgs/by-name/do/dozenal/lua-header.patch diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/by-name/do/dozenal/package.nix similarity index 100% rename from pkgs/applications/misc/dozenal/default.nix rename to pkgs/by-name/do/dozenal/package.nix diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/by-name/dp/dpdk/package.nix similarity index 100% rename from pkgs/os-specific/linux/dpdk/default.nix rename to pkgs/by-name/dp/dpdk/package.nix diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/by-name/dp/dpic/package.nix similarity index 100% rename from pkgs/tools/graphics/dpic/default.nix rename to pkgs/by-name/dp/dpic/package.nix diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/by-name/dp/dpkg/package.nix similarity index 100% rename from pkgs/tools/package-management/dpkg/default.nix rename to pkgs/by-name/dp/dpkg/package.nix diff --git a/pkgs/tools/package-management/dpkg/setup-hook.sh b/pkgs/by-name/dp/dpkg/setup-hook.sh similarity index 100% rename from pkgs/tools/package-management/dpkg/setup-hook.sh rename to pkgs/by-name/dp/dpkg/setup-hook.sh diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix similarity index 100% rename from pkgs/tools/misc/dpt-rp1-py/default.nix rename to pkgs/by-name/dp/dpt-rp1-py/package.nix diff --git a/pkgs/by-name/dq/dq/package.nix b/pkgs/by-name/dq/dq/package.nix new file mode 100644 index 000000000000..93a260c1d90a --- /dev/null +++ b/pkgs/by-name/dq/dq/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "dq"; + version = "20241027"; + + src = fetchFromGitHub { + owner = "janmojzis"; + repo = "dq"; + rev = "refs/tags/${version}"; + hash = "sha256-aXNj2JsSCxp3+zTF2/7SAffrzwQH+3NCppxpnPCLT4o="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + install -Dm755 dq dqcache dqcache-makekey dqcache-start -t $out/bin + installManPage man/* + + runHook postInstall + ''; + + meta = with lib; { + description = "Recursive DNS/DNSCurve server and comandline tool"; + homepage = "https://github.com/janmojzis/dq"; + changelog = "https://github.com/janmojzis/dq/releases/tag/${version}"; + license = licenses.cc0; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/by-name/dq/dqlite/package.nix similarity index 100% rename from pkgs/development/libraries/dqlite/default.nix rename to pkgs/by-name/dq/dqlite/package.nix diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/by-name/dr/dr14_tmeter/package.nix similarity index 100% rename from pkgs/applications/audio/dr14_tmeter/default.nix rename to pkgs/by-name/dr/dr14_tmeter/package.nix diff --git a/pkgs/applications/video/dra-cla/default.nix b/pkgs/by-name/dr/dra-cla/package.nix similarity index 100% rename from pkgs/applications/video/dra-cla/default.nix rename to pkgs/by-name/dr/dra-cla/package.nix diff --git a/pkgs/data/icons/dracula-icon-theme/default.nix b/pkgs/by-name/dr/dracula-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/dracula-icon-theme/default.nix rename to pkgs/by-name/dr/dracula-icon-theme/package.nix diff --git a/pkgs/data/themes/dracula-qt5-theme/default.nix b/pkgs/by-name/dr/dracula-qt5-theme/package.nix similarity index 100% rename from pkgs/data/themes/dracula-qt5-theme/default.nix rename to pkgs/by-name/dr/dracula-qt5-theme/package.nix diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/by-name/dr/dracula-theme/package.nix similarity index 100% rename from pkgs/data/themes/dracula-theme/default.nix rename to pkgs/by-name/dr/dracula-theme/package.nix diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/by-name/dr/dracut/package.nix similarity index 100% rename from pkgs/os-specific/linux/dracut/default.nix rename to pkgs/by-name/dr/dracut/package.nix diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix similarity index 100% rename from pkgs/applications/audio/dragonfly-reverb/default.nix rename to pkgs/by-name/dr/dragonfly-reverb/package.nix diff --git a/pkgs/servers/nosql/dragonflydb/fixes.patch b/pkgs/by-name/dr/dragonflydb/fixes.patch similarity index 100% rename from pkgs/servers/nosql/dragonflydb/fixes.patch rename to pkgs/by-name/dr/dragonflydb/fixes.patch diff --git a/pkgs/servers/nosql/dragonflydb/glog.patch b/pkgs/by-name/dr/dragonflydb/glog.patch similarity index 100% rename from pkgs/servers/nosql/dragonflydb/glog.patch rename to pkgs/by-name/dr/dragonflydb/glog.patch diff --git a/pkgs/servers/nosql/dragonflydb/default.nix b/pkgs/by-name/dr/dragonflydb/package.nix similarity index 100% rename from pkgs/servers/nosql/dragonflydb/default.nix rename to pkgs/by-name/dr/dragonflydb/package.nix diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/by-name/dr/drat-trim/package.nix similarity index 100% rename from pkgs/applications/science/logic/drat-trim/default.nix rename to pkgs/by-name/dr/drat-trim/package.nix diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/by-name/dr/drawing/package.nix similarity index 100% rename from pkgs/applications/graphics/drawing/default.nix rename to pkgs/by-name/dr/drawing/package.nix diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/by-name/dr/driftctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/driftctl/default.nix rename to pkgs/by-name/dr/driftctl/package.nix diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/by-name/dr/driftnet/package.nix similarity index 100% rename from pkgs/tools/networking/driftnet/default.nix rename to pkgs/by-name/dr/driftnet/package.nix diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/by-name/dr/drip/package.nix similarity index 100% rename from pkgs/development/tools/drip/default.nix rename to pkgs/by-name/dr/drip/package.nix diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/by-name/dr/drive/package.nix similarity index 100% rename from pkgs/applications/networking/drive/default.nix rename to pkgs/by-name/dr/drive/package.nix diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/by-name/dr/drm_info/package.nix similarity index 100% rename from pkgs/development/tools/drm_info/default.nix rename to pkgs/by-name/dr/drm_info/package.nix diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/by-name/dr/drogon/fix_find_package.patch similarity index 100% rename from pkgs/development/libraries/drogon/fix_find_package.patch rename to pkgs/by-name/dr/drogon/fix_find_package.patch diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/by-name/dr/drogon/package.nix similarity index 100% rename from pkgs/development/libraries/drogon/default.nix rename to pkgs/by-name/dr/drogon/package.nix diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/by-name/dr/droidcam/package.nix similarity index 100% rename from pkgs/applications/video/droidcam/default.nix rename to pkgs/by-name/dr/droidcam/package.nix diff --git a/pkgs/tools/inputmethods/droidmote/default.nix b/pkgs/by-name/dr/droidmote/package.nix similarity index 100% rename from pkgs/tools/inputmethods/droidmote/default.nix rename to pkgs/by-name/dr/droidmote/package.nix diff --git a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch b/pkgs/by-name/dr/drone-cli/0001-use-builtin-go-syscerts.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch rename to pkgs/by-name/dr/drone-cli/0001-use-builtin-go-syscerts.patch diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/by-name/dr/drone-cli/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-cli/default.nix rename to pkgs/by-name/dr/drone-cli/package.nix diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/by-name/dr/drone-runner-docker/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix rename to pkgs/by-name/dr/drone-runner-docker/package.nix diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/by-name/dr/drone-runner-exec/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix rename to pkgs/by-name/dr/drone-runner-exec/package.nix diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/by-name/dr/drone-runner-ssh/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix rename to pkgs/by-name/dr/drone-runner-ssh/package.nix diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/by-name/dr/dropbear/package.nix similarity index 100% rename from pkgs/tools/networking/dropbear/default.nix rename to pkgs/by-name/dr/dropbear/package.nix diff --git a/pkgs/tools/networking/dropbear/pass-path.patch b/pkgs/by-name/dr/dropbear/pass-path.patch similarity index 100% rename from pkgs/tools/networking/dropbear/pass-path.patch rename to pkgs/by-name/dr/dropbear/pass-path.patch diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/by-name/dr/dropwatch/package.nix similarity index 100% rename from pkgs/os-specific/linux/dropwatch/default.nix rename to pkgs/by-name/dr/dropwatch/package.nix diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/by-name/dr/drumgizmo/package.nix similarity index 100% rename from pkgs/applications/audio/drumgizmo/default.nix rename to pkgs/by-name/dr/drumgizmo/package.nix diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/by-name/ds/dsd/package.nix similarity index 100% rename from pkgs/applications/radio/dsd/default.nix rename to pkgs/by-name/ds/dsd/package.nix diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index a4f7384637fe..1adb934969a2 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -14,17 +14,18 @@ libGLU, libzip, alsa-lib, + nix-update-script, }: stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; rev = "v${version}"; - hash = "sha256-X2v9eKiIYX4Zi3C1hbUoW4mceRVa6sxpBsP4Npyo4hM="; + hash = "sha256-TuDiClIq8GLY/3qGildlPpwUUHmpFNATRz5CNTLpfeM="; }; sourceRoot = "${src.name}/prboom2"; @@ -45,8 +46,11 @@ stdenv.mkDerivation rec { SDL2_mixer ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/kraflab/dsda-doom"; + changelog = "https://github.com/kraflab/dsda-doom/releases/tag/v${version}"; description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+"; mainProgram = "dsda-doom"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/by-name/ds/dsdcc/package.nix similarity index 100% rename from pkgs/development/libraries/dsdcc/default.nix rename to pkgs/by-name/ds/dsdcc/package.nix diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/by-name/ds/dsf2flac/package.nix similarity index 100% rename from pkgs/applications/audio/dsf2flac/default.nix rename to pkgs/by-name/ds/dsf2flac/package.nix diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/by-name/ds/dsniff/package.nix similarity index 100% rename from pkgs/tools/networking/dsniff/default.nix rename to pkgs/by-name/ds/dsniff/package.nix diff --git a/pkgs/servers/mail/dspam/mariadb.patch b/pkgs/by-name/ds/dspam/mariadb.patch similarity index 100% rename from pkgs/servers/mail/dspam/mariadb.patch rename to pkgs/by-name/ds/dspam/mariadb.patch diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/by-name/ds/dspam/package.nix similarity index 100% rename from pkgs/servers/mail/dspam/default.nix rename to pkgs/by-name/ds/dspam/package.nix diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/by-name/ds/dsq/package.nix similarity index 100% rename from pkgs/tools/misc/dsq/default.nix rename to pkgs/by-name/ds/dsq/package.nix diff --git a/pkgs/by-name/ds/dsseries/package.nix b/pkgs/by-name/ds/dsseries/package.nix new file mode 100644 index 000000000000..941db899721c --- /dev/null +++ b/pkgs/by-name/ds/dsseries/package.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchurl, rpmextract }: + +stdenv.mkDerivation rec { + pname = "libsane-dsseries"; + version = "1.0.5-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm"; + sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq"; + }; + + nativeBuildInputs = [ rpmextract ]; + + unpackCmd = '' + mkdir ${pname}-${version} && pushd ${pname}-${version} + rpmextract $curSrc + popd + ''; + + patchPhase = '' + substituteInPlace etc/udev/rules.d/50-Brother_DSScanner.rules \ + --replace 'GROUP="users"' 'GROUP="scanner", ENV{libsane_matched}="yes"' + + mkdir -p etc/sane.d/dll.d + echo "dsseries" > etc/sane.d/dll.d/dsseries.conf + ''; + + installPhase = '' + mkdir -p $out + cp -dr etc $out + cp -dr usr/lib64 $out/lib + ''; + + preFixup = '' + for f in `find $out/lib/sane/ -type f`; do + # Make it possible to find libstdc++.so.6 + patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib:$out/lib/sane $f + + # Horrible kludge: The driver hardcodes /usr/lib/sane/ as a dlopen path. + # We can directly modify the binary to force a relative lookup instead. + # The new path is NULL-padded to the same length as the original path. + sed -i "s|/usr/lib/sane/%s|%s\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00|g" $f + done + ''; + + meta = { + description = "Brother DSSeries SANE backend driver"; + homepage = "http://www.brother.com"; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ callahad ]; + }; +} diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/by-name/ds/dssi/package.nix similarity index 100% rename from pkgs/development/libraries/dssi/default.nix rename to pkgs/by-name/ds/dssi/package.nix diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/by-name/ds/dssp/package.nix similarity index 100% rename from pkgs/applications/science/biology/dssp/default.nix rename to pkgs/by-name/ds/dssp/package.nix diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/by-name/ds/dstask/package.nix similarity index 100% rename from pkgs/applications/misc/dstask/default.nix rename to pkgs/by-name/ds/dstask/package.nix diff --git a/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/pkgs/by-name/ds/dstat/fix_pluginpath.patch similarity index 100% rename from pkgs/os-specific/linux/dstat/fix_pluginpath.patch rename to pkgs/by-name/ds/dstat/fix_pluginpath.patch diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/by-name/ds/dstat/package.nix similarity index 100% rename from pkgs/os-specific/linux/dstat/default.nix rename to pkgs/by-name/ds/dstat/package.nix diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/by-name/ds/dstp/package.nix similarity index 100% rename from pkgs/development/tools/dstp/default.nix rename to pkgs/by-name/ds/dstp/package.nix diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/by-name/ds/dsvpn/package.nix similarity index 100% rename from pkgs/applications/networking/dsvpn/default.nix rename to pkgs/by-name/ds/dsvpn/package.nix diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/by-name/dt/dt-schema/package.nix similarity index 100% rename from pkgs/development/tools/dt-schema/default.nix rename to pkgs/by-name/dt/dt-schema/package.nix diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/by-name/dt/dt/package.nix similarity index 100% rename from pkgs/tools/text/dt/default.nix rename to pkgs/by-name/dt/dt/package.nix diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/by-name/dt/dtach/package.nix similarity index 100% rename from pkgs/tools/misc/dtach/default.nix rename to pkgs/by-name/dt/dtach/package.nix diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix new file mode 100644 index 000000000000..5a8bd2a85086 --- /dev/null +++ b/pkgs/by-name/dt/dtc/package.nix @@ -0,0 +1,78 @@ +{ stdenv +, lib +, fetchzip +, meson +, ninja +, flex +, bison +, pkg-config +, which +, pythonSupport ? false +, python ? null +, swig +, libyaml +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtc"; + version = "1.7.2"; + + src = fetchzip { + url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz"; + hash = "sha256-KZCzrvdWd6zfQHppjyp4XzqNCfH2UnuRneu+BNIRVAY="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; + + nativeBuildInputs = [ + meson + ninja + flex + bison + pkg-config + which + ] ++ lib.optionals pythonSupport [ + python + python.pkgs.setuptools-scm + swig + ]; + + buildInputs = [ libyaml ]; + + postPatch = '' + patchShebangs setup.py + ''; + + # Required for installation of Python library and is innocuous otherwise. + env.DESTDIR = "/"; + + mesonAutoFeatures = "auto"; + mesonFlags = [ + (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = + # Checks are broken on aarch64 darwin + # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 + !stdenv.hostPlatform.isDarwin && + # Checks are broken when building statically on x86_64 linux with musl + # One of the test tries to build a shared library and this causes the linker: + # x86_64-unknown-linux-musl-ld: /nix/store/h9gcvnp90mpniyx2v0d0p3s06hkx1v2p-x86_64-unknown-linux-musl-gcc-13.3.0/lib/gcc/x86_64-unknown-linux-musl/13.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object + # x86_64-unknown-linux-musl-ld: failed to set dynamic section sizes: bad value + !stdenv.hostPlatform.isStatic && + + # we must explicitly disable this here so that mesonFlags receives + # `-Dtests=disabled`; without it meson will attempt to run + # hostPlatform binaries during the configurePhase. + (with stdenv; buildPlatform.canExecute hostPlatform); + + meta = with lib; { + description = "Device Tree Compiler"; + homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; + license = licenses.gpl2Plus; # dtc itself is GPLv2, libfdt is dual GPL/BSD + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.unix; + mainProgram = "dtc"; + }; +}) diff --git a/pkgs/applications/terminal-emulators/dterm/default.nix b/pkgs/by-name/dt/dterm/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/dterm/default.nix rename to pkgs/by-name/dt/dterm/package.nix diff --git a/pkgs/tools/misc/dtool/default.nix b/pkgs/by-name/dt/dtool/package.nix similarity index 100% rename from pkgs/tools/misc/dtool/default.nix rename to pkgs/by-name/dt/dtool/package.nix diff --git a/pkgs/tools/misc/dtool/rustc-serialize-fix.patch b/pkgs/by-name/dt/dtool/rustc-serialize-fix.patch similarity index 100% rename from pkgs/tools/misc/dtool/rustc-serialize-fix.patch rename to pkgs/by-name/dt/dtool/rustc-serialize-fix.patch diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/by-name/dt/dtrx/package.nix similarity index 100% rename from pkgs/tools/compression/dtrx/default.nix rename to pkgs/by-name/dt/dtrx/package.nix diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix new file mode 100644 index 000000000000..01ef5d8f9203 --- /dev/null +++ b/pkgs/by-name/du/dua/package.nix @@ -0,0 +1,54 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "dua"; + version = "2.29.4"; + + src = fetchFromGitHub { + owner = "Byron"; + repo = "dua-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4="; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -r $out/tests/fixtures + ''; + }; + + cargoHash = "sha256-h4Z0Gb4lf/KXrBxU6gEGcRvuhqjUABsggcv/A+AFclo="; + + checkFlags = [ + # Skip interactive tests + "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only" + "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion" + "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels" + "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to conveniently learn about the disk usage of directories"; + homepage = "https://github.com/Byron/dua-cli"; + changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + figsoda + killercup + ]; + mainProgram = "dua"; + }; +} diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/by-name/du/duc/package.nix similarity index 100% rename from pkgs/tools/misc/duc/default.nix rename to pkgs/by-name/du/duc/package.nix diff --git a/pkgs/servers/duckling-proxy/default.nix b/pkgs/by-name/du/duckling-proxy/package.nix similarity index 100% rename from pkgs/servers/duckling-proxy/default.nix rename to pkgs/by-name/du/duckling-proxy/package.nix diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix new file mode 100644 index 000000000000..8349b98ef84f --- /dev/null +++ b/pkgs/by-name/du/duckstation-bin/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "duckstation-bin"; + version = "0.1-7371"; + + src = fetchurl { + url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip"; + hash = "sha256-ukORbTG0lZIsUInkEnyPB9+PwFxxK5hbgj9D6tjOEAY="; + }; + + nativeBuildInputs = [ unzip ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r DuckStation.app $out/Applications/DuckStation.app + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + }; + + meta = { + homepage = "https://github.com/stenzek/duckstation"; + description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; + changelog = "https://github.com/stenzek/duckstation/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matteopacini ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/du/duckstation-bin/update.sh b/pkgs/by-name/du/duckstation-bin/update.sh new file mode 100755 index 000000000000..50d6017f7ccc --- /dev/null +++ b/pkgs/by-name/du/duckstation-bin/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnused + +set -euo pipefail + +cd "$(dirname "$0")" || exit 1 + +# Grab latest version, ignoring "latest" and "preview" tags +LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/stenzek/duckstation/releases" | jq -r '.[].tag_name' | grep '^v' | head -n 1 | sed 's/^v//')" +CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" + +if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then + echo "duckstation-bin is up-to-date" + exit 0 +fi + +HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/v${LATEST_VER}/duckstation-mac-release.zip")")" + +sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix +sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/by-name/du/duf/package.nix similarity index 100% rename from pkgs/tools/misc/duf/default.nix rename to pkgs/by-name/du/duf/package.nix diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/by-name/du/dufs/package.nix similarity index 100% rename from pkgs/servers/http/dufs/default.nix rename to pkgs/by-name/du/dufs/package.nix diff --git a/pkgs/development/interpreters/duktape/duktape.pc.in b/pkgs/by-name/du/duktape/duktape.pc.in similarity index 100% rename from pkgs/development/interpreters/duktape/duktape.pc.in rename to pkgs/by-name/du/duktape/duktape.pc.in diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/by-name/du/duktape/package.nix similarity index 100% rename from pkgs/development/interpreters/duktape/default.nix rename to pkgs/by-name/du/duktape/package.nix diff --git a/pkgs/development/tools/dum/default.nix b/pkgs/by-name/du/dum/package.nix similarity index 100% rename from pkgs/development/tools/dum/default.nix rename to pkgs/by-name/du/dum/package.nix diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/by-name/du/dumb-init/package.nix similarity index 100% rename from pkgs/applications/virtualization/dumb-init/default.nix rename to pkgs/by-name/du/dumb-init/package.nix diff --git a/pkgs/misc/dumb/default.nix b/pkgs/by-name/du/dumb/package.nix similarity index 100% rename from pkgs/misc/dumb/default.nix rename to pkgs/by-name/du/dumb/package.nix diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/by-name/du/dump/package.nix similarity index 100% rename from pkgs/tools/backup/dump/default.nix rename to pkgs/by-name/du/dump/package.nix diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/by-name/du/dump1090/package.nix similarity index 100% rename from pkgs/applications/radio/dump1090/default.nix rename to pkgs/by-name/du/dump1090/package.nix diff --git a/pkgs/tools/security/dumpasn1/configpath.patch b/pkgs/by-name/du/dumpasn1/configpath.patch similarity index 100% rename from pkgs/tools/security/dumpasn1/configpath.patch rename to pkgs/by-name/du/dumpasn1/configpath.patch diff --git a/pkgs/tools/security/dumpasn1/default.nix b/pkgs/by-name/du/dumpasn1/package.nix similarity index 100% rename from pkgs/tools/security/dumpasn1/default.nix rename to pkgs/by-name/du/dumpasn1/package.nix diff --git a/pkgs/tools/archivers/dumpnar/default.nix b/pkgs/by-name/du/dumpnar/package.nix similarity index 100% rename from pkgs/tools/archivers/dumpnar/default.nix rename to pkgs/by-name/du/dumpnar/package.nix diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/by-name/du/dumptorrent/package.nix similarity index 100% rename from pkgs/tools/misc/dumptorrent/default.nix rename to pkgs/by-name/du/dumptorrent/package.nix diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/by-name/du/duo-unix/package.nix similarity index 100% rename from pkgs/tools/security/duo-unix/default.nix rename to pkgs/by-name/du/duo-unix/package.nix diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/by-name/du/dupd/package.nix similarity index 100% rename from pkgs/tools/misc/dupd/default.nix rename to pkgs/by-name/du/dupd/package.nix diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/by-name/du/dupe-krill/package.nix similarity index 100% rename from pkgs/tools/filesystems/dupe-krill/default.nix rename to pkgs/by-name/du/dupe-krill/package.nix diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/by-name/du/duperemove/package.nix similarity index 100% rename from pkgs/tools/filesystems/duperemove/default.nix rename to pkgs/by-name/du/duperemove/package.nix diff --git a/pkgs/by-name/du/duplicacy/package.nix b/pkgs/by-name/du/duplicacy/package.nix new file mode 100644 index 000000000000..a8503ac84b6f --- /dev/null +++ b/pkgs/by-name/du/duplicacy/package.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "duplicacy"; + version = "3.2.4"; + + src = fetchFromGitHub { + owner = "gilbertchen"; + repo = "duplicacy"; + rev = "v${version}"; + hash = "sha256-JxBS40g97GPTzKXW+k0RrwLBuK4ItLvnVHzBZRSOEIM="; + }; + + vendorHash = "sha256-4M/V4vP9XwHBkZ6UwsAxZ81YAzP4inuNC5yI+5ygQsA="; + + doCheck = false; + + meta = with lib; { + homepage = "https://duplicacy.com"; + description = "New generation cloud backup tool"; + platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.unfree; + maintainers = with maintainers; [ ffinkdevs devusb ]; + }; +} diff --git a/pkgs/tools/backup/duplicity/keep-pythonpath-in-testing.patch b/pkgs/by-name/du/duplicity/keep-pythonpath-in-testing.patch similarity index 100% rename from pkgs/tools/backup/duplicity/keep-pythonpath-in-testing.patch rename to pkgs/by-name/du/duplicity/keep-pythonpath-in-testing.patch diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/by-name/du/duplicity/package.nix similarity index 100% rename from pkgs/tools/backup/duplicity/default.nix rename to pkgs/by-name/du/duplicity/package.nix diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/by-name/du/duply/package.nix similarity index 100% rename from pkgs/tools/backup/duply/default.nix rename to pkgs/by-name/du/duply/package.nix diff --git a/pkgs/tools/misc/dutree/default.nix b/pkgs/by-name/du/dutree/package.nix similarity index 100% rename from pkgs/tools/misc/dutree/default.nix rename to pkgs/by-name/du/dutree/package.nix diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/by-name/dv/dvd-slideshow/package.nix similarity index 100% rename from pkgs/applications/video/dvd-slideshow/default.nix rename to pkgs/by-name/dv/dvd-slideshow/package.nix diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/by-name/dv/dvd-vr/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/dvd-vr/default.nix rename to pkgs/by-name/dv/dvd-vr/package.nix diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/by-name/dv/dvdauthor/package.nix similarity index 100% rename from pkgs/applications/video/dvdauthor/default.nix rename to pkgs/by-name/dv/dvdauthor/package.nix diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/by-name/dv/dvdbackup/package.nix similarity index 100% rename from pkgs/applications/video/dvdbackup/default.nix rename to pkgs/by-name/dv/dvdbackup/package.nix diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/pkgs/by-name/dv/dvdisaster/dvdrom.patch similarity index 100% rename from pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch rename to pkgs/by-name/dv/dvdisaster/dvdrom.patch diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/by-name/dv/dvdisaster/encryption.patch similarity index 100% rename from pkgs/tools/cd-dvd/dvdisaster/encryption.patch rename to pkgs/by-name/dv/dvdisaster/encryption.patch diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/by-name/dv/dvdisaster/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/dvdisaster/default.nix rename to pkgs/by-name/dv/dvdisaster/package.nix diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch b/pkgs/by-name/dv/dvdplusrwtools/darwin.patch similarity index 100% rename from pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch rename to pkgs/by-name/dv/dvdplusrwtools/darwin.patch diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/dvd+rw-tools/default.nix rename to pkgs/by-name/dv/dvdplusrwtools/package.nix diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/by-name/dv/dvgrab/package.nix similarity index 100% rename from pkgs/tools/video/dvgrab/default.nix rename to pkgs/by-name/dv/dvgrab/package.nix diff --git a/pkgs/tools/misc/dwarf2json/default.nix b/pkgs/by-name/dw/dwarf2json/package.nix similarity index 100% rename from pkgs/tools/misc/dwarf2json/default.nix rename to pkgs/by-name/dw/dwarf2json/package.nix diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/by-name/dw/dwarfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/dwarfs/default.nix rename to pkgs/by-name/dw/dwarfs/package.nix diff --git a/pkgs/applications/misc/dwdiff/default.nix b/pkgs/by-name/dw/dwdiff/package.nix similarity index 100% rename from pkgs/applications/misc/dwdiff/default.nix rename to pkgs/by-name/dw/dwdiff/package.nix diff --git a/pkgs/by-name/dw/dwmbar/package.nix b/pkgs/by-name/dw/dwmbar/package.nix new file mode 100644 index 000000000000..e2fa8155edd7 --- /dev/null +++ b/pkgs/by-name/dw/dwmbar/package.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation { + pname = "dwmbar"; + version = "0-unstable-2021-12-22"; + + src = fetchFromGitHub { + owner = "thytom"; + repo = "dwmbar"; + rev = "574f5703c558a56bc9c354471543511255423dc7"; + sha256 = "sha256-IrelZpgsxq2dnsjMdh7VC5eKffEGRbDkZmZBD+tROPs="; + }; + + postPatch = '' + substituteInPlace dwmbar \ + --replace 'DEFAULT_CONFIG_DIR="/usr/share/dwmbar"' "DEFAULT_CONFIG_DIR=\"$out/share/dwmbar\"" + ''; + + installPhase = '' + install -d $out/share/dwmbar + cp -r modules $out/share/dwmbar/ + install -D -t $out/share/dwmbar/ config + install -D -t $out/share/dwmbar/ bar.sh + install -Dm755 -t $out/bin/ dwmbar + ''; + + meta = with lib; { + homepage = "https://github.com/thytom/dwmbar"; + description = "Modular Status Bar for dwm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ baitinq ]; + platforms = platforms.linux; + mainProgram = "dwmbar"; + }; +} diff --git a/pkgs/by-name/dw/dwmblocks/package.nix b/pkgs/by-name/dw/dwmblocks/package.nix new file mode 100644 index 000000000000..91e08995c9af --- /dev/null +++ b/pkgs/by-name/dw/dwmblocks/package.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, libX11, patches ? [ ], writeText, conf ? null }: + +stdenv.mkDerivation { + pname = "dwmblocks"; + version = "0-unstable-2024-08-24"; + + src = fetchFromGitHub { + owner = "torrinfail"; + repo = "dwmblocks"; + rev = "8cedd220684064f1433749ed2a19a6184c22cf07"; + hash = "sha256-QtYQB2mvw1k2LA8D+/cVnA8+GRDWjhIM6rxfi/IGjEw="; + }; + + buildInputs = [ libX11 ]; + + inherit patches; + + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "blocks.def.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} blocks.def.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Modular status bar for dwm written in c"; + homepage = "https://github.com/torrinfail/dwmblocks"; + license = licenses.isc; + maintainers = with maintainers; [ sophrosyne ]; + platforms = platforms.linux; + mainProgram = "dwmblocks"; + }; +} diff --git a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix similarity index 100% rename from pkgs/tools/misc/dwt1-shell-color-scripts/default.nix rename to pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix diff --git a/pkgs/development/tools/misc/dwz/default.nix b/pkgs/by-name/dw/dwz/package.nix similarity index 100% rename from pkgs/development/tools/misc/dwz/default.nix rename to pkgs/by-name/dw/dwz/package.nix diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 1833320dd13e..b983a88b5656 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - stdenv.cc.cc.lib # Used by Conga and .NET Bridge + (lib.getLib stdenv.cc.cc) # Used by Conga and .NET Bridge ncurses5 # Used by the dyalog binary to correctly display in the terminal ] ++ lib.optionals htmlRendererSupport [ diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/by-name/dy/dydisnix/package.nix similarity index 100% rename from pkgs/tools/package-management/disnix/dydisnix/default.nix rename to pkgs/by-name/dy/dydisnix/package.nix diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/by-name/dy/dyff/package.nix similarity index 100% rename from pkgs/development/tools/dyff/default.nix rename to pkgs/by-name/dy/dyff/package.nix diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/by-name/dy/dynamic-colors/package.nix similarity index 100% rename from pkgs/tools/misc/dynamic-colors/default.nix rename to pkgs/by-name/dy/dynamic-colors/package.nix diff --git a/pkgs/tools/graphics/dynamic-wallpaper/default.nix b/pkgs/by-name/dy/dynamic-wallpaper/package.nix similarity index 100% rename from pkgs/tools/graphics/dynamic-wallpaper/default.nix rename to pkgs/by-name/dy/dynamic-wallpaper/package.nix diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/by-name/dy/dyncall/package.nix similarity index 100% rename from pkgs/development/libraries/dyncall/default.nix rename to pkgs/by-name/dy/dyncall/package.nix diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/by-name/dy/dyndnsc/package.nix similarity index 100% rename from pkgs/applications/networking/dyndns/dyndnsc/default.nix rename to pkgs/by-name/dy/dyndnsc/package.nix diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/by-name/dy/dysk/package.nix similarity index 100% rename from pkgs/tools/filesystems/dysk/default.nix rename to pkgs/by-name/dy/dysk/package.nix diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/by-name/dz/dzen2/package.nix similarity index 100% rename from pkgs/applications/window-managers/dzen2/default.nix rename to pkgs/by-name/dz/dzen2/package.nix diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/by-name/e1/e16/package.nix similarity index 100% rename from pkgs/applications/window-managers/e16/default.nix rename to pkgs/by-name/e1/e16/package.nix diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/by-name/e1/e17gtk/package.nix similarity index 100% rename from pkgs/data/themes/e17gtk/default.nix rename to pkgs/by-name/e1/e17gtk/package.nix diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/by-name/e2/e2fsprogs/package.nix similarity index 100% rename from pkgs/tools/filesystems/e2fsprogs/default.nix rename to pkgs/by-name/e2/e2fsprogs/package.nix diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/by-name/e2/e2tools/package.nix similarity index 100% rename from pkgs/tools/filesystems/e2tools/default.nix rename to pkgs/by-name/e2/e2tools/package.nix diff --git a/pkgs/tools/misc/ea/default.nix b/pkgs/by-name/ea/ea/package.nix similarity index 100% rename from pkgs/tools/misc/ea/default.nix rename to pkgs/by-name/ea/ea/package.nix diff --git a/pkgs/tools/text/each/default.nix b/pkgs/by-name/ea/each/package.nix similarity index 100% rename from pkgs/tools/text/each/default.nix rename to pkgs/by-name/ea/each/package.nix diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/by-name/ea/eaglemode/package.nix similarity index 100% rename from pkgs/applications/misc/eaglemode/default.nix rename to pkgs/by-name/ea/eaglemode/package.nix diff --git a/pkgs/by-name/ea/earbuds/Cargo.lock b/pkgs/by-name/ea/earbuds/Cargo.lock new file mode 100644 index 000000000000..8069e07ec078 --- /dev/null +++ b/pkgs/by-name/ea/earbuds/Cargo.lock @@ -0,0 +1,2534 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io 2.3.3", + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel 2.3.1", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if 1.0.0", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-attributes", + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "bluetooth-serial-port-async" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60c2ea2fbe8638ca6c8d456000df6d77d856b18d43c2c96bdd0e338d99b599e8" +dependencies = [ + "async-std", + "enum_primitive", + "libc", + "mio", + "nix 0.19.1", +] + +[[package]] +name = "blurz" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1bc2df4d0f1d373b324672d9966aca3f5ba1f03d69edad6240144774539ea59" +dependencies = [ + "dbus 0.6.5", + "hex 0.3.2", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "cc" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "clap" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_complete" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d598e88f6874d4b888ed40c71efbcbf4076f1dfbae128a08a8c9e45f710605d" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote 1.0.36", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "dbus" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi 0.3.9", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_is_enum_variant" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ac8859845146979953797f03cc5b282fb4396891807cdb3d04929a88418197" +dependencies = [ + "heck", + "quote 0.3.15", + "syn 0.11.11", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "earbuds" +version = "0.1.9" +dependencies = [ + "async-std", + "bluetooth-serial-port-async", + "blurz", + "clap", + "clap_complete", + "galaxy_buds_rs", + "human-panic", + "log", + "mpris", + "nix 0.29.0", + "notify-rust", + "ofiles", + "pretty_env_logger", + "rust-pulsectl-fork", + "serde", + "serde_json", + "toml", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-kinds" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ + "num-traits 0.1.43", +] + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "from_variants" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e859c8f2057687618905dbe99fc76e836e0a69738865ef90e46fc214a41bbf2" +dependencies = [ + "from_variants_impl", +] + +[[package]] +name = "from_variants_impl" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a5e644a80e6d96b2b4910fa7993301d7b7926c045b475b62202b20a36ce69e" +dependencies = [ + "darling", + "proc-macro2", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "galaxy_buds_rs" +version = "0.2.10" +source = "git+https://github.com/JojiiOfficial/GalaxyBuds-rs#a463fadd83580dedab0e72a7f7b0eb9b53191cd3" +dependencies = [ + "async-std", + "bluetooth-serial-port-async", + "serde", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +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.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "human-panic" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" +dependencies = [ + "anstream", + "anstyle", + "backtrace", + "os_info", + "serde", + "serde_derive", + "toml", + "uuid", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[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_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libpulse-binding" +version = "2.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libpulse-sys", + "num-derive", + "num-traits 0.2.19", + "winapi 0.3.9", +] + +[[package]] +name = "libpulse-sys" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" +dependencies = [ + "libc", + "num-derive", + "num-traits 0.2.19", + "pkg-config", + "winapi 0.3.9", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "mpris" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cef955a7826b1e00e901a3652e7a895abd221fb4ab61547e7d0e4c235d7feb" +dependencies = [ + "dbus 0.9.7", + "derive_is_enum_variant", + "enum-kinds", + "from_variants", + "thiserror", +] + +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nix" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 0.1.10", + "libc", + "void", +] + +[[package]] +name = "nix" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.1.1", + "libc", + "memoffset", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.19", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +dependencies = [ + "memchr", +] + +[[package]] +name = "ofiles" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6d996a29712d694df329d19f0e18632466a42c9de4aab73dca087a1a4c1bd7d" +dependencies = [ + "error-chain", + "glob", + "log", + "nix 0.17.0", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if 1.0.0", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[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", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rust-pulsectl-fork" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbc90699dd6a642a98b11320c10751a834bda66f0038993578e6afdf514e81e" +dependencies = [ + "libpulse-binding", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 1.0.36", + "syn 2.0.68", +] + +[[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 = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ + "quote 0.3.15", + "synom", + "unicode-xid", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "unicode-ident", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml", + "windows", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if 1.0.0", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[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 = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom", +] + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote 1.0.36", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "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]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[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", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex 0.4.3", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.68", +] diff --git a/pkgs/by-name/ea/earbuds/fix-daemon.patch b/pkgs/by-name/ea/earbuds/fix-daemon.patch new file mode 100644 index 000000000000..bb0ba90c4949 --- /dev/null +++ b/pkgs/by-name/ea/earbuds/fix-daemon.patch @@ -0,0 +1,26 @@ +From 6f52bee7f71e253b0504164fc268750116945108 Mon Sep 17 00:00:00 2001 +From: griffi-gh +Date: Mon, 4 Nov 2024 00:43:49 +0100 +Subject: [PATCH] fix daemon autostart + +--- + src/daemon_utils.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/daemon_utils.rs b/src/daemon_utils.rs +index cd8f49b..f56e100 100644 +--- a/src/daemon_utils.rs ++++ b/src/daemon_utils.rs +@@ -13,7 +13,11 @@ use nix::{ + pub fn start() -> bool { + let curr_exe = env::current_exe().expect("Couldn't get current executable!"); + let mut cmd = Command::new("nohup"); +- let cmd = cmd.arg(curr_exe).arg("-d").arg("--no-fork").arg("-q"); ++ let cmd = cmd ++ .arg(curr_exe) ++ .arg("--daemon").arg("true") ++ .arg("--no-fork").arg("true") ++ .arg("--quiet").arg("true"); + cmd.stdout(Stdio::null()); + cmd.stderr(Stdio::null()); + let status = cmd.spawn(); diff --git a/pkgs/by-name/ea/earbuds/package.nix b/pkgs/by-name/ea/earbuds/package.nix new file mode 100644 index 000000000000..bbb2ff1cff11 --- /dev/null +++ b/pkgs/by-name/ea/earbuds/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + nix-update-script, + pkg-config, + dbus, + libpulseaudio, + bluez, +}: +rustPlatform.buildRustPackage { + pname = "earbuds"; + version = "0.1.9-unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "JojiiOfficial"; + repo = "LiveBudsCli"; + rev = "df46706e44fa9e7de355b11eab4cc850efe968a3"; + hash = "sha256-IEor7aZnwCA6Rg2gXIYSQ65hV/jJOKehujOSZnVzVis="; + }; + + # fix daemon autostart not working + patches = [ + ./fix-daemon.patch + ]; + + # git dependencies are currently not supported in the fixed-output derivation fetcher. + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "galaxy_buds_rs-0.2.10" = "sha256-95PBmGwHJiXi72Rir8KK7as+i9yjs5nf45SaBhj1geg="; + }; + }; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + dbus + libpulseaudio + bluez + ]; + + # package does not contain any tests + doCheck = false; + + # nativeInstallCheckInputs = [ + # versionCheckHook + # ]; + # versionCheckProgramArg = [ "--version" ]; + # doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd earbuds \ + --bash <($out/bin/earbuds --generate bash) \ + --fish <($out/bin/earbuds --generate fish) \ + --zsh <($out/bin/earbuds --generate zsh) + ''; + + meta = { + description = "Free CLI tool to control your Galaxy Buds"; + homepage = "https://github.com/JojiiOfficial/LiveBudsCli"; + changelog = "https://github.com/JojiiOfficial/LiveBudsCli/releases"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ griffi-gh ]; + mainProgram = "earbuds"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/by-name/ea/earlybird/package.nix similarity index 100% rename from pkgs/tools/security/earlybird/default.nix rename to pkgs/by-name/ea/earlybird/package.nix diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index 9452bbfabf79..fead6ff586e0 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "earlyoom"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/by-name/ea/eartag/package.nix similarity index 100% rename from pkgs/applications/audio/eartag/default.nix rename to pkgs/by-name/ea/eartag/package.nix diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/by-name/ea/earthly/package.nix similarity index 100% rename from pkgs/development/tools/earthly/default.nix rename to pkgs/by-name/ea/earthly/package.nix diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix new file mode 100644 index 000000000000..07bb178a341e --- /dev/null +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + + earthlyls, + nix-update-script, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "earthlyls"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "glehmann"; + repo = "earthlyls"; + rev = version; + hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA="; + }; + + cargoHash = "sha256-eKBNZiFvIBuNPqDzMOa6J0UR4CIgi9OUowRaFSgi7Fg="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = earthlyls; }; + }; + + meta = { + description = "Earthly language server"; + homepage = "https://github.com/glehmann/earthlyls"; + changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}"; + license = lib.licenses.mit; + mainProgram = "earthlyls"; + maintainers = with lib.maintainers; [ paveloom ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/by-name/ea/easeprobe/package.nix similarity index 100% rename from pkgs/tools/misc/easeprobe/default.nix rename to pkgs/by-name/ea/easeprobe/package.nix diff --git a/pkgs/by-name/ea/easyeda2kicad/package.nix b/pkgs/by-name/ea/easyeda2kicad/package.nix new file mode 100644 index 000000000000..9cfbe3b116cc --- /dev/null +++ b/pkgs/by-name/ea/easyeda2kicad/package.nix @@ -0,0 +1,29 @@ +{ + python3Packages, + lib, + fetchPypi, +}: + +python3Packages.buildPythonPackage rec { + pname = "easyeda2kicad"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-p4G+bRB29uBohqQpI3PrkwyZId5McJ1t2Ru26hBPSks="; + }; + + dependencies = with python3Packages; [ + setuptools + pydantic + requests + ]; + + meta = with lib; { + description = "Convert any LCSC components (including EasyEDA) to KiCad library"; + homepage = "https://github.com/uPesy/easyeda2kicad.py"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ChocolateLoverRaj ]; + mainProgram = "easyeda2kicad"; + }; +} diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/by-name/ea/easyjson/package.nix similarity index 100% rename from pkgs/development/tools/easyjson/default.nix rename to pkgs/by-name/ea/easyjson/package.nix diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/by-name/ea/easyloggingpp/package.nix similarity index 100% rename from pkgs/development/libraries/easyloggingpp/default.nix rename to pkgs/by-name/ea/easyloggingpp/package.nix diff --git a/pkgs/development/embedded/easypdkprog/default.nix b/pkgs/by-name/ea/easypdkprog/package.nix similarity index 100% rename from pkgs/development/embedded/easypdkprog/default.nix rename to pkgs/by-name/ea/easypdkprog/package.nix diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/by-name/ea/easyrsa/package.nix similarity index 100% rename from pkgs/tools/networking/easyrsa/default.nix rename to pkgs/by-name/ea/easyrsa/package.nix diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/by-name/ea/easysnap/package.nix similarity index 100% rename from pkgs/tools/backup/easysnap/default.nix rename to pkgs/by-name/ea/easysnap/package.nix diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/by-name/ea/easytag/package.nix similarity index 100% rename from pkgs/applications/audio/easytag/default.nix rename to pkgs/by-name/ea/easytag/package.nix diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/by-name/eb/eb-garamond/package.nix similarity index 100% rename from pkgs/data/fonts/eb-garamond/default.nix rename to pkgs/by-name/eb/eb-garamond/package.nix diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/by-name/eb/ebook2cw/package.nix similarity index 100% rename from pkgs/applications/radio/ebook2cw/default.nix rename to pkgs/by-name/eb/ebook2cw/package.nix diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/by-name/eb/ebook_tools/package.nix similarity index 100% rename from pkgs/tools/text/ebook-tools/default.nix rename to pkgs/by-name/eb/ebook_tools/package.nix diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/by-name/eb/ebtables/package.nix similarity index 100% rename from pkgs/os-specific/linux/ebtables/default.nix rename to pkgs/by-name/eb/ebtables/package.nix diff --git a/pkgs/applications/audio/ebumeter/default.nix b/pkgs/by-name/eb/ebumeter/package.nix similarity index 100% rename from pkgs/applications/audio/ebumeter/default.nix rename to pkgs/by-name/eb/ebumeter/package.nix diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/by-name/eb/ebusd/package.nix similarity index 100% rename from pkgs/servers/ebusd/default.nix rename to pkgs/by-name/eb/ebusd/package.nix diff --git a/pkgs/servers/ebusd/patches/ebusd-cmake.patch b/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch similarity index 100% rename from pkgs/servers/ebusd/patches/ebusd-cmake.patch rename to pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/by-name/ec/ec2-ami-tools/package.nix similarity index 100% rename from pkgs/tools/virtualization/ec2-ami-tools/default.nix rename to pkgs/by-name/ec/ec2-ami-tools/package.nix diff --git a/pkgs/tools/virtualization/ec2-ami-tools/writable.patch b/pkgs/by-name/ec/ec2-ami-tools/writable.patch similarity index 100% rename from pkgs/tools/virtualization/ec2-ami-tools/writable.patch rename to pkgs/by-name/ec/ec2-ami-tools/writable.patch diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/by-name/ec/ec2-api-tools/package.nix similarity index 100% rename from pkgs/tools/virtualization/ec2-api-tools/default.nix rename to pkgs/by-name/ec/ec2-api-tools/package.nix diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix similarity index 100% rename from pkgs/development/tools/ec2-metadata-mock/default.nix rename to pkgs/by-name/ec/ec2-metadata-mock/package.nix diff --git a/pkgs/tools/security/ec2stepshell/default.nix b/pkgs/by-name/ec/ec2stepshell/package.nix similarity index 100% rename from pkgs/tools/security/ec2stepshell/default.nix rename to pkgs/by-name/ec/ec2stepshell/package.nix diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index c2a10feb55ac..379a7d5061d8 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "ecapture"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; rev = "refs/tags/v${version}"; - hash = "sha256-pw/qlYVw1ofYDrTWTQVdx/N9U2JjkB05c7IUXURd4B8="; + hash = "sha256-snq6ypEEyIVxD19pdc2qw/j6FPgmRS9l6lmdDcUljKw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/by-name/ec/ecasound/package.nix similarity index 100% rename from pkgs/applications/audio/ecasound/default.nix rename to pkgs/by-name/ec/ecasound/package.nix diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index cf91d52875cc..df4c9f4c4e59 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram $out/bin/ecc-rs \ - --prefix LIBCLANG_PATH : ${llvmPackages.libclang.lib}/lib \ + --prefix LIBCLANG_PATH : ${lib.getLib llvmPackages.libclang}/lib \ --prefix PATH : ${lib.makeBinPath (with llvmPackages; [clang bintools-unwrapped])} ''; diff --git a/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch b/pkgs/by-name/ec/ecdsatool/ctype-header-c99-implicit-function-declaration.patch similarity index 100% rename from pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch rename to pkgs/by-name/ec/ecdsatool/ctype-header-c99-implicit-function-declaration.patch diff --git a/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch b/pkgs/by-name/ec/ecdsatool/openssl-header-c99-implicit-function-declaration.patch similarity index 100% rename from pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch rename to pkgs/by-name/ec/ecdsatool/openssl-header-c99-implicit-function-declaration.patch diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/by-name/ec/ecdsatool/package.nix similarity index 100% rename from pkgs/tools/security/ecdsatool/default.nix rename to pkgs/by-name/ec/ecdsatool/package.nix diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/by-name/ec/ecdsautils/package.nix similarity index 100% rename from pkgs/tools/security/ecdsautils/default.nix rename to pkgs/by-name/ec/ecdsautils/package.nix diff --git a/pkgs/servers/echoip/default.nix b/pkgs/by-name/ec/echoip/package.nix similarity index 100% rename from pkgs/servers/echoip/default.nix rename to pkgs/by-name/ec/echoip/package.nix diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/by-name/ec/eclair/package.nix similarity index 100% rename from pkgs/applications/blockchains/eclair/default.nix rename to pkgs/by-name/ec/eclair/package.nix diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/by-name/ec/eclib/package.nix similarity index 100% rename from pkgs/development/libraries/eclib/default.nix rename to pkgs/by-name/ec/eclib/package.nix diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/by-name/ec/eclipse-mat/package.nix similarity index 100% rename from pkgs/development/tools/eclipse-mat/default.nix rename to pkgs/by-name/ec/eclipse-mat/package.nix diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/by-name/ec/ecm/package.nix similarity index 100% rename from pkgs/applications/science/math/ecm/default.nix rename to pkgs/by-name/ec/ecm/package.nix diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/by-name/ec/ecopcr/package.nix similarity index 100% rename from pkgs/applications/science/biology/ecopcr/default.nix rename to pkgs/by-name/ec/ecopcr/package.nix diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/by-name/ec/ecos/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/ecos/default.nix rename to pkgs/by-name/ec/ecos/package.nix diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/by-name/ec/ecs-agent/package.nix similarity index 100% rename from pkgs/applications/virtualization/ecs-agent/default.nix rename to pkgs/by-name/ec/ecs-agent/package.nix diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix new file mode 100644 index 000000000000..bc9c216e7adc --- /dev/null +++ b/pkgs/by-name/ec/ecwolf/package.nix @@ -0,0 +1,81 @@ +{ stdenv +, lib +, fetchFromBitbucket +, cmake +, pkg-config +, makeWrapper +, zlib +, bzip2 +, libjpeg +, SDL2 +, SDL2_net +, SDL2_mixer +, gtk3 +, writers +, python3Packages +, nix-update +}: + +stdenv.mkDerivation rec { + pname = "ecwolf"; + version = "1.4.1"; + + src = fetchFromBitbucket { + owner = pname; + repo = pname; + rev = version; + sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g="; + }; + + nativeBuildInputs = [ cmake pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; + buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; + + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; + + # ECWolf installs its binary to the games/ directory, but Nix only adds bin/ + # directories to the PATH. + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + mv "$out/games" "$out/bin" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -R ecwolf.app $out/Applications + makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf + ''; + + passthru.updateScript = let + updateScriptPkg = writers.writePython3 "ecwolf_update_script" { + libraries = with python3Packages; [ debian-inspector requests ]; + } '' + from os import execl + from sys import argv + + from debian_inspector.debcon import get_paragraphs_data + from requests import get + + # The debian.drdteam.org repo is a primary source of information. It’s + # run by Blzut3, the creator and primary developer of ECWolf. It’s also + # listed on ECWolf’s download page: + # . + url = 'https://debian.drdteam.org/dists/stable/multiverse/binary-amd64/Packages' # noqa: E501 + response = get(url) + packages = get_paragraphs_data(response.text) + for package in packages: + if package['package'] == 'ecwolf': + latest_version = package['version'] + break + nix_update_path = argv[1] + + execl(nix_update_path, nix_update_path, '--version', latest_version) + ''; + in [ updateScriptPkg (lib.getExe nix-update) ]; + + meta = with lib; { + description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; + mainProgram = "ecwolf"; + homepage = "https://maniacsvault.net/ecwolf/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jayman2000 sander ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/by-name/ed/edac-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/edac-utils/default.nix rename to pkgs/by-name/ed/edac-utils/package.nix diff --git a/pkgs/by-name/ed/edge-runtime/Cargo.lock b/pkgs/by-name/ed/edge-runtime/Cargo.lock new file mode 100644 index 000000000000..81cc2d19a003 --- /dev/null +++ b/pkgs/by-name/ed/edge-runtime/Cargo.lock @@ -0,0 +1,7571 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aead-gcm-stream" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a09ecb526d53de2842cc876ee5c9b51161ee60399edeca4cf74892a01b48177" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-kw" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" +dependencies = [ + "aes", +] + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ast_node" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "brotli 3.4.0", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async-tungstenite" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "tungstenite", +] + +[[package]] +name = "auto_impl" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "async-tungstenite", + "base_mem_check", + "base_rt", + "bytes", + "cooked-waker", + "cpu_timer", + "ctor", + "deno_ast", + "deno_broadcast_channel", + "deno_canvas", + "deno_config", + "deno_console", + "deno_core", + "deno_crypto", + "deno_fetch", + "deno_fs", + "deno_http", + "deno_io", + "deno_net", + "deno_npm", + "deno_semver", + "deno_tls", + "deno_url", + "deno_web", + "deno_webgpu", + "deno_webidl", + "deno_websocket", + "enum-as-inner", + "eszip", + "event_worker", + "fastwebsockets", + "flume", + "futures-util", + "http 0.2.11", + "http 1.0.0", + "http-body-util", + "http_utils", + "httparse", + "hyper 0.14.28", + "hyper 1.4.0", + "hyper-util", + "import_map", + "log", + "monch", + "notify", + "once_cell", + "pin-project", + "reqwest 0.11.27", + "rustls-pemfile 2.1.0", + "sb_ai", + "sb_core", + "sb_env", + "sb_fs", + "sb_graph", + "sb_module_loader", + "sb_node", + "sb_npm", + "sb_os", + "sb_workers", + "scopeguard", + "serde", + "serial_test", + "thiserror", + "tls-listener", + "tokio", + "tokio-rustls", + "tokio-util", + "tracing", + "tracing-subscriber", + "tungstenite", + "url", + "urlencoding", + "uuid", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +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 = "base64-simd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +dependencies = [ + "simd-abstraction", +] + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref 0.5.1", + "vsimd", +] + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "base_mem_check" +version = "0.1.0" +dependencies = [ + "deno_core", + "serde", +] + +[[package]] +name = "base_rt" +version = "0.1.0" +dependencies = [ + "cpu_timer", + "deno_core", + "once_cell", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "better_scoped_tls" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" +dependencies = [ + "scoped-tls", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.48", + "which 4.4.2", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor 2.5.1", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor 4.0.1", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +dependencies = [ + "allocator-api2", +] + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" + +[[package]] +name = "cache_control" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" + +[[package]] +name = "cauchy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff11ddd2af3b5e80dd0297fee6e56ac038d9bdc549573cdb51bd6d2efe7f05e" +dependencies = [ + "num-complex", + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cblas-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6feecd82cce51b0204cf063f0041d69f24ce83f680d87514b004248e7b0fa65" +dependencies = [ + "libc", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.1", +] + +[[package]] +name = "clap" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.0", +] + +[[package]] +name = "clap_derive" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "cli" +version = "0.1.0" +dependencies = [ + "anyhow", + "base", + "clap", + "deno_core", + "deno_manifest", + "env_logger", + "glob", + "log", + "once_cell", + "sb_graph", + "tokio", + "tracing-subscriber", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cooked-waker" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[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 = "cpu_timer" +version = "0.1.0" +dependencies = [ + "anyhow", + "ctor", + "futures", + "libc", + "log", + "nix", + "once_cell", + "signal-hook", + "signal-hook-tokio", + "tokio", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "rustc_version 0.4.0", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "d3d12" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" +dependencies = [ + "bitflags 2.5.0", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "data-url" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "deno_ast" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d08372522975cce97fe0efbe42fea508c76eea4421619de6d63baae32792f7d" +dependencies = [ + "anyhow", + "base64 0.21.7", + "deno_media_type", + "deno_terminal", + "dprint-swc-ext", + "once_cell", + "percent-encoding", + "serde", + "swc_atoms", + "swc_bundler", + "swc_common", + "swc_config", + "swc_config_macro", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_codegen_macros", + "swc_ecma_loader", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_transforms_optimization", + "swc_ecma_transforms_proposal", + "swc_ecma_transforms_react", + "swc_ecma_transforms_typescript", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_eq_ignore_macros", + "swc_graph_analyzer", + "swc_macros_common", + "swc_visit", + "swc_visit_macros", + "text_lines", + "thiserror", + "unicode-width", + "url", +] + +[[package]] +name = "deno_broadcast_channel" +version = "0.155.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a8223f6388db2c68b230ea086fee749aa952d307715c5944cfc0cb11cedd5c4" +dependencies = [ + "async-trait", + "deno_core", + "tokio", + "uuid", +] + +[[package]] +name = "deno_cache_dir" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4036ac8ce97244e2a66df7b97412592acaf14671900460d28415703ad790cd70" +dependencies = [ + "deno_media_type", + "indexmap", + "log", + "once_cell", + "parking_lot", + "serde", + "serde_json", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "deno_canvas" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34f71b024dd1f4a0eacfea9d4d3188b428917ae1631065e5514edb36ae06470b" +dependencies = [ + "deno_core", + "deno_webgpu", + "image", + "serde", +] + +[[package]] +name = "deno_config" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83df0c14d89f4e6e7ff91bfea0b4d5a0a33b4385c517ff4d8b4236d9834561e3" +dependencies = [ + "anyhow", + "deno_semver", + "glob", + "ignore", + "import_map", + "indexmap", + "jsonc-parser", + "log", + "percent-encoding", + "serde", + "serde_json", + "thiserror", + "url", +] + +[[package]] +name = "deno_console" +version = "0.161.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0b421bb2eec447386a4fe42991c041cf33524af78e1921dc29d7bc0fba47cd" +dependencies = [ + "deno_core", +] + +[[package]] +name = "deno_core" +version = "0.293.0" +source = "git+https://github.com/supabase/deno_core?branch=293-supabase#d73dc1e1845d00cc2e8d2a32caf5859cc300386b" +dependencies = [ + "anyhow", + "bincode", + "bit-set", + "bit-vec", + "bytes", + "cooked-waker", + "deno_core_icudata", + "deno_ops", + "deno_unsync", + "futures", + "libc", + "memoffset 0.9.0", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "serde_v8", + "smallvec", + "sourcemap", + "static_assertions", + "tokio", + "url", + "v8", +] + +[[package]] +name = "deno_core_icudata" +version = "0.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" + +[[package]] +name = "deno_crypto" +version = "0.175.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc07536a030d5cb18c500bc9790cc4676c94fbc71f30daabdc91f68569292b33" +dependencies = [ + "aes", + "aes-gcm", + "aes-kw", + "base64 0.21.7", + "cbc", + "const-oid", + "ctr", + "curve25519-dalek", + "deno_core", + "deno_web", + "elliptic-curve", + "num-traits", + "once_cell", + "p256", + "p384", + "p521", + "rand", + "ring", + "rsa", + "serde", + "serde_bytes", + "sha1", + "sha2", + "signature", + "spki", + "uuid", + "x25519-dalek", +] + +[[package]] +name = "deno_fetch" +version = "0.185.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15df0ad954f034a92af85b55f4a643d965a07781a11fa88b4565d00c59da862" +dependencies = [ + "bytes", + "data-url", + "deno_core", + "deno_permissions", + "deno_tls", + "dyn-clone", + "http 1.0.0", + "reqwest 0.12.4", + "serde", + "serde_json", + "tokio", + "tokio-util", +] + +[[package]] +name = "deno_fs" +version = "0.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "036f6e2e83b9aa49a67c05b028db53fd4a9f4cc441e8bf68cf97361158c393d2" +dependencies = [ + "async-trait", + "base32", + "deno_config", + "deno_core", + "deno_io", + "deno_permissions", + "filetime", + "junction", + "libc", + "nix", + "rand", + "rayon", + "serde", + "winapi", +] + +[[package]] +name = "deno_graph" +version = "0.80.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a71a3f1575d0309ac18ca2e7af88d64c15acd2c55d06fef0fbdfd7c69cecb09d" +dependencies = [ + "anyhow", + "async-trait", + "data-url", + "deno_ast", + "deno_semver", + "deno_unsync", + "encoding_rs", + "futures", + "import_map", + "indexmap", + "log", + "monch", + "once_cell", + "parking_lot", + "regex", + "serde", + "serde_json", + "sha2", + "thiserror", + "twox-hash", + "url", +] + +[[package]] +name = "deno_http" +version = "0.159.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caba6f6797da2610899b4b6061eabea3b3444f763e3933d3b15e0efc43c2bf09" +dependencies = [ + "async-compression", + "async-trait", + "base64 0.21.7", + "brotli 6.0.0", + "bytes", + "cache_control", + "deno_core", + "deno_net", + "deno_websocket", + "flate2", + "http 0.2.11", + "http 1.0.0", + "httparse", + "hyper 0.14.28", + "hyper 1.4.0", + "hyper-util", + "itertools 0.10.5", + "memmem", + "mime", + "once_cell", + "percent-encoding", + "phf", + "pin-project", + "ring", + "scopeguard", + "serde", + "smallvec", + "thiserror", + "tokio", + "tokio-util", +] + +[[package]] +name = "deno_io" +version = "0.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db6afcfc02687c9020b2e69e0a5df445cb88e564af1932ab8b988cd1326622b0" +dependencies = [ + "async-trait", + "deno_core", + "filetime", + "fs3", + "log", + "once_cell", + "os_pipe", + "parking_lot", + "rand", + "tokio", + "winapi", +] + +[[package]] +name = "deno_lockfile" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23120f905aec2deed858820113e089551025b74e261c5c404812cd8e61421379" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "deno_manifest" +version = "1.45.2" + +[[package]] +name = "deno_media_type" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8978229b82552bf8457a0125aa20863f023619cfc21ebb007b1e571d68fd85b" +dependencies = [ + "data-url", + "serde", + "url", +] + +[[package]] +name = "deno_native_certs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c867603d2a5dfea31f55cecebb572554caa395437786d058faa9a2814c8d6eb9" +dependencies = [ + "dlopen2", + "dlopen2_derive", + "once_cell", + "rustls-native-certs", + "rustls-pemfile 2.1.0", +] + +[[package]] +name = "deno_net" +version = "0.153.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb0cacb064d3f0d1437849f69e637168a67a82686c698a14cb3bb6bccc4b3acc" +dependencies = [ + "deno_core", + "deno_permissions", + "deno_tls", + "pin-project", + "rustls-tokio-stream", + "serde", + "socket2", + "tokio", + "trust-dns-proto", + "trust-dns-resolver", +] + +[[package]] +name = "deno_npm" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9812c781ff6b2e0e45c32ccba9983bce84ecccf6f6a7006b750f8c5c9ac15e30" +dependencies = [ + "anyhow", + "async-trait", + "deno_lockfile", + "deno_semver", + "futures", + "log", + "monch", + "serde", + "serde_json", + "thiserror", + "url", +] + +[[package]] +name = "deno_ops" +version = "0.169.0" +source = "git+https://github.com/supabase/deno_core?branch=293-supabase#d73dc1e1845d00cc2e8d2a32caf5859cc300386b" +dependencies = [ + "proc-macro-rules", + "proc-macro2", + "quote", + "strum", + "strum_macros", + "syn 2.0.48", + "thiserror", +] + +[[package]] +name = "deno_permissions" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc3b97920e075fdeb4417257dbe31c1a325fbc25d096efc64ecc2aecde60ebc5" +dependencies = [ + "deno_core", + "deno_terminal", + "fqdn", + "libc", + "log", + "once_cell", + "serde", + "which 4.4.2", + "winapi", +] + +[[package]] +name = "deno_semver" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389b5a8c2dd48cc1aad25396c92d7461ddb0fcfae1faf8e00205837c53e34d3e" +dependencies = [ + "monch", + "once_cell", + "serde", + "thiserror", + "url", +] + +[[package]] +name = "deno_terminal" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e6337d4e7f375f8b986409a76fbeecfa4bd8a1343e63355729ae4befa058eaf" +dependencies = [ + "once_cell", + "termcolor", +] + +[[package]] +name = "deno_tls" +version = "0.148.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e626f980b723bc74a0eb3a22f18413558acb8c51696e547d2d5298dcd737e37" +dependencies = [ + "deno_core", + "deno_native_certs", + "rustls", + "rustls-pemfile 2.1.0", + "rustls-tokio-stream", + "rustls-webpki", + "serde", + "tokio", + "webpki-roots", +] + +[[package]] +name = "deno_unsync" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c8b95582c2023dbb66fccc37421b374026f5915fa507d437cb566904db9a3a" +dependencies = [ + "parking_lot", + "tokio", +] + +[[package]] +name = "deno_url" +version = "0.161.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74828afdcfe1187b461b6252fc39755b39bbbb42807a1e6b8389ca25dc141e7" +dependencies = [ + "deno_core", + "urlpattern", +] + +[[package]] +name = "deno_web" +version = "0.192.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55843318b0acd067c19163ca7b2bb664c0dc589feb864163c40411f58939163b" +dependencies = [ + "async-trait", + "base64-simd 0.8.0", + "bytes", + "deno_core", + "deno_permissions", + "encoding_rs", + "flate2", + "futures", + "serde", + "tokio", + "uuid", +] + +[[package]] +name = "deno_webgpu" +version = "0.128.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f1def3eb60c9dbcf332004b0355ed52b58eb5339281d4a8f6331092f474a91" +dependencies = [ + "deno_core", + "raw-window-handle", + "serde", + "tokio", + "wgpu-core", + "wgpu-types", +] + +[[package]] +name = "deno_webidl" +version = "0.161.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641de0ee315e2c3b6772c38db90a3620bef50a135d968be226a6bfd2c4606b92" +dependencies = [ + "deno_core", +] + +[[package]] +name = "deno_websocket" +version = "0.166.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f263597b92019c6e5af4022df2ebb7dfb42fdd7e559692b5db871d43b62f8648" +dependencies = [ + "bytes", + "deno_core", + "deno_net", + "deno_permissions", + "deno_tls", + "fastwebsockets", + "h2 0.4.4", + "http 1.0.0", + "http-body-util", + "hyper 1.4.0", + "hyper-util", + "once_cell", + "rustls-tokio-stream", + "serde", + "tokio", +] + +[[package]] +name = "deno_webstorage" +version = "0.156.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62c013c656fa1cbc648061bfadea5a86515980af01cd34105b855d42b8cdd93f" +dependencies = [ + "deno_core", + "deno_web", + "rusqlite", +] + +[[package]] +name = "deno_whoami" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75e4caa92b98a27f09c671d1399aee0f5970aa491b9a598523aac000a2192e3" +dependencies = [ + "libc", + "whoami", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "dlopen2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] +name = "dprint-swc-ext" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a0d5b63e52434314e3d767c463b1f68c467c31e61d279bc019227016c44e535" +dependencies = [ + "allocator-api2", + "bumpalo", + "num-bigint", + "rustc-hash", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "text_lines", +] + +[[package]] +name = "dsa" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" +dependencies = [ + "digest", + "num-bigint-dig", + "num-traits", + "pkcs8", + "rfc6979", + "sha2", + "signature", + "zeroize", +] + +[[package]] +name = "dyn-clone" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "ecb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" +dependencies = [ + "cipher", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[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.48", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "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.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" + +[[package]] +name = "eszip" +version = "0.72.2" +source = "git+https://github.com/supabase/eszip?branch=fix-pub-vis-0-72-2#9d2464034288048fabe7a681e7961fcc63799273" +dependencies = [ + "anyhow", + "base64 0.21.7", + "deno_ast", + "deno_graph", + "deno_npm", + "deno_semver", + "futures", + "hashlink", + "serde", + "serde_json", + "sha2", + "thiserror", + "url", + "xxhash-rust", +] + +[[package]] +name = "event_worker" +version = "0.1.0" +dependencies = [ + "anyhow", + "base_mem_check", + "deno_core", + "log", + "serde", + "tokio", + "uuid", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +dependencies = [ + "serde", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fastwebsockets" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" +dependencies = [ + "base64 0.21.7", + "http-body-util", + "hyper 1.4.0", + "hyper-util", + "pin-project", + "rand", + "sha1", + "simdutf8", + "thiserror", + "tokio", + "utf-8", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "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 = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[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.48", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[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 = "fqdn" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08b1eaa7dfddeab6036292995620bf0435712e619db6d7690605897e76975eb0" + +[[package]] +name = "from_variant" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" +dependencies = [ + "proc-macro2", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "fs3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90" +dependencies = [ + "libc", + "rustc_version 0.2.3", + "winapi", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", +] + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.5.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types", + "hashbrown 0.14.3", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "gzip-header" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" +dependencies = [ + "crc32fast", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.11", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "halfbrown" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" +dependencies = [ + "hashbrown 0.13.2", + "serde", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash 0.8.8", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +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 = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "hstr" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96274be293b8877e61974a607105d09c84caebe9620b47774aa8a6b942042dd4" +dependencies = [ + "hashbrown 0.14.3", + "new_debug_unreachable", + "once_cell", + "phf", + "rustc-hash", + "triomphe", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + +[[package]] +name = "http_utils" +version = "0.1.0" +dependencies = [ + "bytes", + "futures-util", + "http 0.2.11", + "hyper 0.14.28", + "tokio", + "tokio-util", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.0.0", + "hyper 1.4.0", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.28", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.4.0", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.5", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + +[[package]] +name = "import_map" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373b8288ad259df0d1314e3e8b2fff0e5e63f22e01bc54ecd2c3c7ad77b9200c" +dependencies = [ + "indexmap", + "log", + "percent-encoding", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "indexmap" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg 0.50.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "serde", +] + +[[package]] +name = "is-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonc-parser" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7725c320caac8c21d8228c1d055af27a995d371f78cc763073d3e068323641b5" +dependencies = [ + "serde_json", +] + +[[package]] +name = "junction" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be39922b087cecaba4e2d5592dedfc8bda5d4a5a1231f143337cca207950b61d" +dependencies = [ + "scopeguard", + "winapi", +] + +[[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lapack" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a7f0050af10913bc5e4f6091df38870cb5d4e45094d3dd551c1aff9d1d59b26" +dependencies = [ + "lapack-sys", + "libc", + "num-complex", +] + +[[package]] +name = "lapack-sys" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1d3a8a9f07310243de6c6226f039f14bce8d2f4c96b5d30ddbcfa31eb4e94ad" +dependencies = [ + "libc", +] + +[[package]] +name = "lax" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd3ec1cacffe7a44aee66f9e85d87e3ac69b472b546449884bd1fc1ca8ab359" +dependencies = [ + "cauchy", + "lapack", + "num-traits", + "thiserror", +] + +[[package]] +name = "lazy-regex" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.48", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lexical-core" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0885f6cdfe75c96e45bbf1c4e49511f128201391ce3b56e60e29f5a1fadbc1c1" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924f7ec090cd4f60bd873f160b0fb69a0c80bb3a98f2e778a1893ae0e5c4b0b9" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8feab1da84a2ab0ddbbad2fb1830b755f71a9a8d996c7a1f2a553faf72aa3686" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591ce1a12ecd3b26d4121ab360a6a4483a67f05a5372add6acbfd0b65c9285d9" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b0f3f9ddada5942b54e97654d535df37c9340ad66c24b50360a90619779f41" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c6d47254ddb292771dce7697ae2be9619f8e369d01a9ccda15ef2ff50443fc" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[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 = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[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 = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + +[[package]] +name = "memoffset" +version = "0.7.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" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "monch" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" + +[[package]] +name = "monostate" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878c2a1f1c70e5724fa28f101ca787b6a7e8ad5c5e4ae4ca3b0fa4a419fa9075" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f686d68a09079e63b1d2c64aa305095887ce50565f00a922ebfaeeee0d9ba6ce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "naga" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndarray" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "approx", + "cblas-sys", + "libc", + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", +] + +[[package]] +name = "ndarray-linalg" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f87ff36428f228c6056204d0f5cb8c5165f0db0a065429faace3edbc2718f1f" +dependencies = [ + "cauchy", + "lax", + "ndarray", + "num-complex", + "num-traits", + "rand", + "thiserror", +] + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[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.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a" +dependencies = [ + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "winapi", +] + +[[package]] +name = "npm_cache" +version = "0.1.0" +dependencies = [ + "anyhow", + "deno_ast", + "deno_cache_dir", + "deno_core", + "deno_graph", + "deno_web", + "log", + "sb_core", + "sb_npm", + "tokio", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +dependencies = [ + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ort" +version = "2.0.0-rc.2" +source = "git+https://github.com/pykeio/ort#467d127c5877b099e1d0f605d38b74d221b6121c" +dependencies = [ + "half", + "js-sys", + "libloading 0.8.1", + "ndarray", + "ort-sys", + "thiserror", + "tracing", + "web-sys", +] + +[[package]] +name = "ort-sys" +version = "2.0.0-rc.2" +source = "git+https://github.com/pykeio/ort#467d127c5877b099e1d0f605d38b74d221b6121c" + +[[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "outref" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p224" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct", + "ecdsa", + "elliptic-curve", + "primeorder", + "rand_core", + "sha2", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-clean" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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.48", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-rules" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" +dependencies = [ + "proc-macro-rules-macros", + "proc-macro2", + "syn 2.0.48", +] + +[[package]] +name = "proc-macro-rules-macros" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_fmt" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "ref-cast" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "relative-path" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "async-compression", + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.0", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile 2.1.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg 0.52.0", +] + +[[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 = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest", +] + +[[package]] +name = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.5.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +dependencies = [ + "bitflags 2.5.0", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "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_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.21", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.5.0", + "errno 0.3.8", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] +name = "rustls-tokio-stream" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c478c030dfd68498e6c59168d9eec4f8bead33152a5f3095ad4bdbdcea09d466" +dependencies = [ + "futures", + "rustls", + "socket2", + "tokio", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "ryu-js" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "sb_ai" +version = "0.1.0" +dependencies = [ + "anyhow", + "base_rt", + "clap", + "convert_case 0.6.0", + "ctor", + "deno_core", + "faster-hex", + "futures", + "futures-util", + "fxhash", + "log", + "ndarray", + "ndarray-linalg", + "once_cell", + "ort", + "rand", + "reqwest 0.12.4", + "scopeguard", + "serde", + "tokenizers", + "tokio", + "tokio-util", + "tracing", + "tracing-subscriber", + "xxhash-rust", +] + +[[package]] +name = "sb_core" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.21.7", + "base_mem_check", + "base_rt", + "bytes", + "cache_control", + "chrono", + "data-url", + "deno_ast", + "deno_cache_dir", + "deno_core", + "deno_crypto", + "deno_fetch", + "deno_fs", + "deno_graph", + "deno_http", + "deno_io", + "deno_manifest", + "deno_net", + "deno_npm", + "deno_permissions", + "deno_tls", + "deno_web", + "deno_websocket", + "deno_webstorage", + "encoding_rs", + "enum-as-inner", + "faster-hex", + "fs3", + "futures", + "http 1.0.0", + "httparse", + "hyper 0.14.28", + "hyper 1.4.0", + "import_map", + "indexmap", + "libc", + "log", + "memmem", + "once_cell", + "percent-encoding", + "rand", + "ring", + "sb_node", + "scopeguard", + "serde", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "twox-hash", +] + +[[package]] +name = "sb_env" +version = "0.1.0" +dependencies = [ + "deno_core", + "sb_core", + "sb_node", +] + +[[package]] +name = "sb_eszip_shared" +version = "0.1.0" +dependencies = [ + "eszip", +] + +[[package]] +name = "sb_fs" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "deno_ast", + "deno_core", + "deno_fs", + "deno_io", + "deno_npm", + "deno_semver", + "eszip", + "futures", + "import_map", + "indexmap", + "log", + "once_cell", + "rkyv", + "sb_core", + "sb_eszip_shared", + "sb_node", + "sb_npm", + "serde", + "thiserror", + "tokio", + "url", +] + +[[package]] +name = "sb_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dashmap", + "deno_ast", + "deno_cache_dir", + "deno_config", + "deno_core", + "deno_fs", + "deno_graph", + "deno_lockfile", + "deno_npm", + "deno_semver", + "deno_web", + "enum-as-inner", + "eszip", + "futures", + "glob", + "hashlink", + "import_map", + "log", + "npm_cache", + "once_cell", + "pathdiff", + "rkyv", + "sb_core", + "sb_eszip_shared", + "sb_fs", + "sb_node", + "sb_npm", + "scopeguard", + "serde", + "tempfile", + "thiserror", + "tokio", + "urlencoding", +] + +[[package]] +name = "sb_module_loader" +version = "0.1.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "deno_ast", + "deno_config", + "deno_core", + "deno_fs", + "deno_npm", + "deno_semver", + "deno_tls", + "eszip", + "futures-util", + "import_map", + "log", + "monch", + "once_cell", + "rkyv", + "sb_core", + "sb_eszip_shared", + "sb_fs", + "sb_graph", + "sb_node", + "sb_npm", + "serde", + "tokio", + "tracing", +] + +[[package]] +name = "sb_node" +version = "0.1.0" +dependencies = [ + "aead-gcm-stream", + "aes", + "async-trait", + "blake2", + "brotli 6.0.0", + "bytes", + "cbc", + "const-oid", + "data-encoding", + "deno_config", + "deno_core", + "deno_fetch", + "deno_fs", + "deno_media_type", + "deno_net", + "deno_whoami", + "digest", + "dsa", + "ecb", + "elliptic-curve", + "errno 0.2.8", + "faster-hex", + "h2 0.4.4", + "hkdf", + "http 0.2.11", + "http 1.0.0", + "idna 0.3.0", + "indexmap", + "ipnetwork", + "k256", + "lazy-regex", + "libc", + "libz-sys", + "md-5", + "md4", + "nix", + "num-bigint", + "num-bigint-dig", + "num-integer", + "num-traits", + "once_cell", + "p224", + "p256", + "p384", + "path-clean", + "pbkdf2", + "pin-project-lite", + "rand", + "regex", + "reqwest 0.12.4", + "ring", + "ripemd", + "rsa", + "scrypt", + "sec1", + "serde", + "sha1", + "sha2", + "sha3", + "signature", + "simd-json", + "sm3", + "spki", + "thiserror", + "tokio", + "url", + "winapi", + "windows-sys 0.48.0", + "x25519-dalek", + "x509-parser", +] + +[[package]] +name = "sb_npm" +version = "0.1.0" +dependencies = [ + "async-trait", + "base32", + "base64 0.21.7", + "bincode", + "deno_ast", + "deno_config", + "deno_core", + "deno_fs", + "deno_graph", + "deno_lockfile", + "deno_npm", + "deno_semver", + "faster-hex", + "flate2", + "hex", + "indexmap", + "log", + "once_cell", + "percent-encoding", + "reqwest 0.12.4", + "ring", + "sb_core", + "sb_node", + "serde", + "tar", + "thiserror", +] + +[[package]] +name = "sb_os" +version = "0.1.0" +dependencies = [ + "deno_core", + "libc", + "sb_core", + "serde", +] + +[[package]] +name = "sb_workers" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "deno_config", + "deno_core", + "deno_http", + "enum-as-inner", + "event_worker", + "futures-util", + "http_utils", + "hyper 0.14.28", + "log", + "sb_core", + "sb_graph", + "scopeguard", + "serde", + "thiserror", + "tokio", + "tokio-util", + "uuid", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "password-hash", + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.201" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.201" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_v8" +version = "0.202.0" +source = "git+https://github.com/supabase/deno_core?branch=293-supabase#d73dc1e1845d00cc2e8d2a32caf5859cc300386b" +dependencies = [ + "num-bigint", + "serde", + "smallvec", + "thiserror", + "v8", +] + +[[package]] +name = "serial_test" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signal-hook-tokio" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" +dependencies = [ + "futures-core", + "libc", + "signal-hook", + "tokio", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-abstraction" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +dependencies = [ + "outref 0.1.0", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0228a564470f81724e30996bbc2b171713b37b15254a6440c7e2d5449b95691" +dependencies = [ + "getrandom", + "halfbrown", + "lexical-core", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "sm3" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" +dependencies = [ + "digest", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sourcemap" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" +dependencies = [ + "base64-simd 0.7.0", + "bitvec", + "data-encoding", + "debugid", + "if_chain", + "rustc-hash", + "rustc_version 0.2.3", + "serde", + "serde_json", + "unicode-id-start", + "url", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_enum" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "swc_atoms" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" +dependencies = [ + "hstr", + "once_cell", + "rustc-hash", + "serde", +] + +[[package]] +name = "swc_bundler" +version = "0.230.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c506ddddebb846f8e68780464e2fe1fdc0add4bc265659f713a71015ffcdb13" +dependencies = [ + "anyhow", + "crc", + "indexmap", + "is-macro", + "once_cell", + "parking_lot", + "petgraph", + "radix_fmt", + "relative-path", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_loader", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_optimization", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_fast_graph", + "swc_graph_analyzer", + "tracing", +] + +[[package]] +name = "swc_cached" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" +dependencies = [ + "ahash 0.8.8", + "anyhow", + "dashmap", + "once_cell", + "regex", + "serde", +] + +[[package]] +name = "swc_common" +version = "0.34.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9087befec6b63911f9d2f239e4f91c9b21589c169b86ed2d616944d23cf4a243" +dependencies = [ + "ast_node", + "better_scoped_tls", + "cfg-if", + "either", + "from_variant", + "new_debug_unreachable", + "num-bigint", + "once_cell", + "rustc-hash", + "serde", + "siphasher", + "sourcemap", + "swc_atoms", + "swc_eq_ignore_macros", + "swc_visit", + "tracing", + "unicode-width", + "url", +] + +[[package]] +name = "swc_config" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94" +dependencies = [ + "anyhow", + "indexmap", + "serde", + "serde_json", + "swc_cached", + "swc_config_macro", +] + +[[package]] +name = "swc_config_macro" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "swc_ecma_ast" +version = "0.115.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be1306930c235435a892104c00c2b5e16231043c085d5a10bd3e7537b15659b" +dependencies = [ + "bitflags 2.5.0", + "is-macro", + "num-bigint", + "phf", + "scoped-tls", + "serde", + "string_enum", + "swc_atoms", + "swc_common", + "unicode-id-start", +] + +[[package]] +name = "swc_ecma_codegen" +version = "0.151.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5141a8cb4eb69e090e6aea5d49061b46919be5210f3d084f9d9ad63d30f5cff" +dependencies = [ + "memchr", + "num-bigint", + "once_cell", + "rustc-hash", + "serde", + "sourcemap", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_codegen_macros", + "tracing", +] + +[[package]] +name = "swc_ecma_codegen_macros" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "swc_ecma_loader" +version = "0.46.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9febebf047d1286e7b723fa2758f3229da2c103834f3eaee69833f46692612" +dependencies = [ + "anyhow", + "pathdiff", + "serde", + "swc_atoms", + "swc_common", + "tracing", +] + +[[package]] +name = "swc_ecma_parser" +version = "0.146.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e0c2e85f12c63b85c805e923079b04d1fb3e25edd069d638eed5f2098de74" +dependencies = [ + "either", + "new_debug_unreachable", + "num-bigint", + "num-traits", + "phf", + "serde", + "smallvec", + "smartstring", + "stacker", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "tracing", + "typed-arena", +] + +[[package]] +name = "swc_ecma_transforms_base" +version = "0.140.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37dc505c92af56d0f77cf6f31a6ccd37ac40cad1e01ff77277e0b1c70e8f8ff" +dependencies = [ + "better_scoped_tls", + "bitflags 2.5.0", + "indexmap", + "once_cell", + "phf", + "rustc-hash", + "serde", + "smallvec", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_utils", + "swc_ecma_visit", + "tracing", +] + +[[package]] +name = "swc_ecma_transforms_classes" +version = "0.129.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3eab5f8179e5b0aedf385eacc2c033691c6d211a7babd1bbbff12cf794a824e" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_macros" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "swc_ecma_transforms_optimization" +version = "0.201.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "724a8306e98c1b1f9640fc44c1acc0c971f6daa17651919e06b64f905d4a4564" +dependencies = [ + "dashmap", + "indexmap", + "once_cell", + "petgraph", + "rustc-hash", + "serde_json", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_fast_graph", + "tracing", +] + +[[package]] +name = "swc_ecma_transforms_proposal" +version = "0.174.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6df8aa6752cc2fcf3d78ac67827542fb666e52283f2b26802aa058906bb750d3" +dependencies = [ + "either", + "rustc-hash", + "serde", + "smallvec", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_react" +version = "0.186.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446da32cac8299973aaf1d37496562bfd0c1e4f3c3ab5d0af6f07f42e8184102" +dependencies = [ + "base64 0.21.7", + "dashmap", + "indexmap", + "once_cell", + "serde", + "sha1", + "string_enum", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_typescript" +version = "0.191.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1ce8af2865449e714ae56dacb6b54b3f6dc4cc25074da4e39b878bd93c5e39c" +dependencies = [ + "ryu-js", + "serde", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_react", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_utils" +version = "0.130.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e62b199454a576c5fdbd7e1bef8ab88a395427456d8a713d994b7d469833aa" +dependencies = [ + "indexmap", + "num_cpus", + "once_cell", + "rustc-hash", + "ryu-js", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_visit", + "tracing", + "unicode-id", +] + +[[package]] +name = "swc_ecma_visit" +version = "0.101.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce0d997f0c9b4e181225f603d161f6757c2a97022258170982cfe005ec69ec92" +dependencies = [ + "num-bigint", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_visit", + "tracing", +] + +[[package]] +name = "swc_eq_ignore_macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "swc_fast_graph" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf5c1687e9858fb9de1ffa90a3e21369095406e97ace870a389320d105b0a" +dependencies = [ + "indexmap", + "petgraph", + "rustc-hash", + "swc_common", +] + +[[package]] +name = "swc_graph_analyzer" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a928a2ad8897fb78c38898ba342960863e9937b7a3de2d010d3204d85ce1b72a" +dependencies = [ + "auto_impl", + "petgraph", + "swc_common", + "swc_fast_graph", + "tracing", +] + +[[package]] +name = "swc_macros_common" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "swc_visit" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" +dependencies = [ + "either", + "swc_visit_macros", +] + +[[package]] +name = "swc_visit_macros" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "text_lines" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" +dependencies = [ + "serde", +] + +[[package]] +name = "thiserror" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +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 = "tls-listener" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce110c38c3c9b6e5cc4fe72e60feb5b327750388a10a276e3d5d7d431e3dc76c" +dependencies = [ + "futures-util", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "tokenizers" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd47962b0ba36e7fd33518fbf1754d136fd1474000162bbf2a8b5fcb2d3654d" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.8.2", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "hashbrown 0.14.3", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "triomphe" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "serde", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "serde", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-id" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" + +[[package]] +name = "unicode-id-start" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "urlpattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "v8" +version = "0.97.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb417c2cd20684f18b185085c876d379318893461c17d319948a0a5f221f0b50" +dependencies = [ + "bindgen", + "bitflags 2.5.0", + "fslock", + "gzip-header", + "home", + "miniz_oxide", + "once_cell", + "paste", + "which 6.0.1", +] + +[[package]] +name = "valuable" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "wgpu-core" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases", + "codespan-reporting", + "document-features", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.5.0", + "block", + "cfg_aliases", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.7.4", + "log", + "metal", + "naga", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "serde", + "web-sys", +] + +[[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 = "which" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall", + "wasite", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +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", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[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 = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] diff --git a/pkgs/by-name/ed/edge-runtime/librusty_v8.nix b/pkgs/by-name/ed/edge-runtime/librusty_v8.nix new file mode 100644 index 000000000000..b29dc10d8d6e --- /dev/null +++ b/pkgs/by-name/ed/edge-runtime/librusty_v8.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchurl, +}: + +let + fetch_librusty_v8 = + args: + fetchurl { + name = "librusty_v8-${args.version}"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; + hash = args.shas.${stdenv.hostPlatform.system}; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + }; +in +fetch_librusty_v8 { + version = "0.97.1"; + shas = { + x86_64-linux = "sha256-wQBEi2Vs5ruhSkq0n3z8WWjls6V3th2cm+O6s4LDB8k="; + aarch64-linux = "sha256-U0PCUNcshm7AaBuUgwQQ1Qn9dr1iL2Okodl6BI/nZR8="; + x86_64-darwin = "sha256-cGXOstCOdqaOpU2LcOT5A0JfnkoDvUHhOcCJ9vsS7CM="; + aarch64-darwin = "sha256-9TmAON0KUVRQISTudyryIhf4VC/Dc4caq69iquDdrTU="; + }; +} diff --git a/pkgs/by-name/ed/edge-runtime/package.nix b/pkgs/by-name/ed/edge-runtime/package.nix new file mode 100644 index 000000000000..e6133bf1389e --- /dev/null +++ b/pkgs/by-name/ed/edge-runtime/package.nix @@ -0,0 +1,78 @@ +{ + stdenv, + lib, + callPackage, + fetchFromGitHub, + rustPlatform, + nix-update-script, + darwin, + openssl, + pkg-config, +}: + +let + pname = "edge-runtime"; + version = "1.60.1"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "supabase"; + repo = pname; + rev = "v${version}"; + hash = "sha256-w0iSKHT6aIixKh1bHg1lOQNEw/emKK7R2iLzWjb2Pnk="; + fetchSubmodules = true; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "deno_core-0.293.0" = "sha256-5WBORHokzWPdro9rmBijcsx/j81YFaEfMIK276bfI1o="; + "eszip-0.72.2" = "sha256-lzJeapA5NTWBnBaQY8i82OeYN2DIukJZKoRAXFG4qVA="; + "ort-2.0.0-rc.2" = "sha256-jOKeulnW/m+q1xf77jaNzLT+In/AFcSDDbz7xF23x5g="; + }; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + CoreFoundation + SystemConfiguration + ] + ); + + # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem + # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE + RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; + + # For version tag + GIT_V_TAG = version; + + passthru.updateScript = nix-update-script { }; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/edge-runtime --help + runHook postInstallCheck + ''; + + doCheck = false; + + meta = with lib; { + description = "Server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services"; + mainProgram = "edge-runtime"; + homepage = "https://github.com/supabase/edge-runtime"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/pkgs/by-name/ed/edgetpu-compiler/package.nix similarity index 100% rename from pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix rename to pkgs/by-name/ed/edgetpu-compiler/package.nix diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/by-name/ed/edid-decode/package.nix similarity index 100% rename from pkgs/tools/misc/edid-decode/default.nix rename to pkgs/by-name/ed/edid-decode/package.nix diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/by-name/ed/edid-generator/package.nix similarity index 100% rename from pkgs/tools/misc/edid-generator/default.nix rename to pkgs/by-name/ed/edid-generator/package.nix diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/by-name/ed/edir/package.nix similarity index 100% rename from pkgs/tools/misc/edir/default.nix rename to pkgs/by-name/ed/edir/package.nix diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/by-name/ed/editline/package.nix similarity index 100% rename from pkgs/development/libraries/editline/default.nix rename to pkgs/by-name/ed/editline/package.nix diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix similarity index 100% rename from pkgs/development/tools/misc/editorconfig-checker/default.nix rename to pkgs/by-name/ed/editorconfig-checker/package.nix diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/by-name/ed/editorconfig-core-c/package.nix similarity index 100% rename from pkgs/development/tools/misc/editorconfig-core-c/default.nix rename to pkgs/by-name/ed/editorconfig-core-c/package.nix diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/by-name/ed/editres/package.nix similarity index 100% rename from pkgs/tools/graphics/editres/default.nix rename to pkgs/by-name/ed/editres/package.nix diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/by-name/ed/edk2-uefi-shell/package.nix similarity index 100% rename from pkgs/tools/misc/edk2-uefi-shell/default.nix rename to pkgs/by-name/ed/edk2-uefi-shell/package.nix diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index e986e42bd47a..20cd4c84ba33 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -35,14 +35,14 @@ buildType = if stdenv.hostPlatform.isDarwin then edk2 = stdenv.mkDerivation { pname = "edk2"; - version = "202408"; + version = "202408.01"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-2odaTqiAZD5xduT0dwIYWj3gY/aFPVsTFbblIsEhBiA="; + hash = "sha256-tome7S8k2vgEFg7CsXnrg9yxCx1kCypc5BkQzDPyFBc="; }; src = applyPatches { diff --git a/pkgs/development/embedded/edl/default.nix b/pkgs/by-name/ed/edl/package.nix similarity index 100% rename from pkgs/development/embedded/edl/default.nix rename to pkgs/by-name/ed/edl/package.nix diff --git a/pkgs/development/libraries/science/biology/edlib/default.nix b/pkgs/by-name/ed/edlib/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/edlib/default.nix rename to pkgs/by-name/ed/edlib/package.nix diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix index 6ca795ffab29..e45c21c0f662 100644 --- a/pkgs/by-name/ed/edopro/deps.nix +++ b/pkgs/by-name/ed/edopro/deps.nix @@ -4,11 +4,8 @@ assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k="; edopro-version = "40.1.4"; edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b"; - edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo="; + edopro-hash = "sha256-mj0xEJsFcnY//za0uJosAPOPbU/jlduNX0YSNmvduLE="; irrlicht-version = "1.9.0-unstable-2023-02-18"; irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22"; irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA="; - ocgcore-version = "0-unstable-2022-09-15"; - ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4"; - ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78="; } diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch deleted file mode 100644 index 253051ebf0f7..000000000000 --- a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 21 Oct 2024 17:42:24 +0200 -Subject: [PATCH] Mark Lua symbols as C symbols - -Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. ---- - interpreter.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/interpreter.h b/interpreter.h -index 6c405a1..c471ecb 100644 ---- a/interpreter.h -+++ b/interpreter.h -@@ -9,9 +9,11 @@ - #define INTERPRETER_H_ - - // Due to longjmp behaviour, we must build Lua as C++ to avoid UB -+extern "C" { - #include - #include - #include -+} - - #include "common.h" - #include --- -2.44.1 - diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index 89dd0acf3d86..adf1c896b0d3 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -15,6 +15,7 @@ # Use fmt 10+ after release 40.1.4+ fmt_9, freetype, + irrlicht, libevent, libgit2, libGL, @@ -25,7 +26,6 @@ libX11, libxkbcommon, libXxf86vm, - lua5_3, mono, nlohmann_json, openal, @@ -50,6 +50,11 @@ let .${stdenv.hostPlatform.system} or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro"); + maintainers = with lib.maintainers; [ + OPNA2608 + redhawk + ]; + deps = import ./deps.nix; in let @@ -78,9 +83,7 @@ let ]; enableParallelBuilding = true; - buildFlags = [ - "NDEBUG=1" - ]; + buildFlags = [ "NDEBUG=1" ]; makeFlags = [ "-C" "source/Irrlicht" @@ -89,57 +92,18 @@ let installPhase = '' runHook preInstall - mkdir -p $out/{bin,include} - cp lib/Linux/libIrrlicht.a $out/bin - cp -r include/* $out/include + install -Dm644 -t $out/lib lib/Linux/libIrrlicht.a + cp -r include $out/include runHook postInstall ''; - }; - ocgcore = stdenv.mkDerivation { - pname = "ygopro-core"; - version = deps.ocgcore-version; - - src = fetchFromGitHub { - owner = "edo9300"; - repo = "ygopro-core"; - rev = deps.ocgcore-rev; - hash = deps.ocgcore-hash; - fetchSubmodules = true; + meta = { + inherit (irrlicht.meta) description platforms; + homepage = "https://github.com/edo9300/irrlicht1-8-4"; + license = lib.licenses.agpl3Plus; + inherit maintainers; }; - - patches = [ - ./ocgcore-lua-symbols.patch - ]; - - nativeBuildInputs = [ premake5 ]; - - buildInputs = [ lua5_3 ]; - - preBuild = '' - premake5 gmake2 \ - --lua-path="${lua5_3}" - ''; - - enableParallelBuilding = true; - buildFlags = [ - "verbose=true" - "config=release" - "ocgcoreshared" - ]; - makeFlags = [ - "-C" - "build" - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary} - - runHook postInstall - ''; }; edopro = stdenv.mkDerivation { @@ -151,7 +115,6 @@ let repo = "edopro"; rev = deps.edopro-rev; hash = deps.edopro-hash; - fetchSubmodules = true; }; nativeBuildInputs = [ @@ -171,9 +134,7 @@ let libjpeg libpng libvorbis - lua5_3 nlohmann_json - ocgcore openal SDL2 sqlite @@ -183,6 +144,8 @@ let postPatch = '' substituteInPlace premake5.lua \ --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"' + + touch ocgcore/premake5.lua ''; preBuild = '' @@ -191,7 +154,7 @@ let --covers=\"${covers_url}\" \ --fields=\"${fields_url}\" \ --pics=\"${pics_url}\" \ - --prebuilt-core="${lib.getLib ocgcore}/lib" \ + --no-core \ --sound=sfml ''; @@ -205,7 +168,7 @@ let buildFlags = [ "verbose=true" "config=release_${archLabel}" - "ygopro" + "ygoprodll" ]; makeFlags = [ "-C" @@ -216,8 +179,8 @@ let runHook preInstall mkdir -p $out/bin - cp bin/${archLabel}/release/ygopro $out/bin - wrapProgram $out/bin/ygopro \ + cp bin/${archLabel}/release/ygoprodll $out/bin + wrapProgram $out/bin/ygoprodll \ --prefix PATH : ${lib.makeBinPath [ mono ]} \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ @@ -233,12 +196,30 @@ let runHook postInstall ''; + + meta = { + description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; + homepage = "https://projectignis.github.io"; + changelog = "https://github.com/edo9300/edopro/releases"; + license = lib.licenses.agpl3Plus; + mainProgram = "ygoprodll"; + # This is likely a very easy app to port if you're interested. + # We just have no way to test on other platforms. + platforms = [ + "x86_64-linux" + # Currently offline mode does not work, the problem is that the core is updated whenever it is needed. + # So in our method we would have to update the client if it's statically linked as well. + # It is possible but we have decided against it for now. In theory if we added more logic to the update script it could work. + "aarch64-linux" + ]; + inherit maintainers; + }; }; edopro-script = let assetsToCopy = lib.concatStringsSep "," [ - # Needed if we download files from ProjectIgnis' website or any https only website. + # Needed if we download files from ProjectIgnis' website or any https-only website. "cacert.pem" "config" "deck" @@ -267,17 +248,18 @@ let rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in fi - exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@ + exec ${lib.getExe edopro} -C $EDOPRO_DIR $@ ''; edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } '' - cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template + mkdir -p $out/share/applications - sed '/Path=/d' -i desktop-template - sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template - sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template - - install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop + sed ${assets}/config/io.github.edo9300.EDOPro.desktop.in \ + -e '/Path=/d' \ + -e 's/Exec=.*/Exec=edopro/' \ + -e 's/Icon=.*/Icon=edopro/' \ + -e 's/StartupWMClass=.*/StartupWMClass=edopro/' \ + >$out/share/applications/io.github.edo9300.EDOPro.desktop ''; in symlinkJoin { @@ -289,30 +271,28 @@ symlinkJoin { ]; postBuild = '' - mkdir -p $out/share/icons/hicolor/256x256/apps/ - ${imagemagick}/bin/magick \ - ${assets}/textures/AppIcon.png \ - -resize 256x256 \ - $out/share/icons/hicolor/256x256/apps/EDOPro.png + for size in 16 32 48 64 128 256 512 1024; do + res="$size"x"$size" + mkdir -p $out/share/icons/hicolor/"$res"/apps/ + ${imagemagick}/bin/magick \ + ${assets}/textures/AppIcon.png \ + -resize "$res" \ + $out/share/icons/hicolor/"$res"/apps/edopro.png + done ''; passthru.updateScript = ./update.py; meta = { - description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; - homepage = "https://projectignis.github.io"; - changelog = "https://github.com/edo9300/edopro/releases"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ - OPNA2608 - redhawk - ]; + inherit (edopro.meta) + description + homepage + changelog + license + platforms + maintainers + ; + # To differenciate it from the original YGOPro mainProgram = "edopro"; - # This is likely a very easy app to port if you're interested. - # We just have no way to test on other platforms. - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; }; } diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py index 05976976773d..c7594b758d21 100755 --- a/pkgs/by-name/ed/edopro/update.py +++ b/pkgs/by-name/ed/edopro/update.py @@ -15,14 +15,6 @@ DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix" with GitHub(UnauthAuthStrategy()) as github: edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0] - ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content( - "edo9300", "edopro", "ocgcore" - ).parsed_data - - ocgcore: Commit = github.rest.repos.get_commit( - "edo9300", "ygopro-core", ocgcore_submodule.sha - ).parsed_data - # This dep is not versioned in anyway and is why we check below to see if this is a new version. irrlicht: Commit = github.rest.repos.list_commits( "edo9300", "irrlicht1-8-4" @@ -64,8 +56,7 @@ def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str: return out_json["hash"] -edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True) -ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha) +edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha) irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha) asset_legacy_hash: str = ( @@ -110,9 +101,6 @@ with open(DEPS_PATH, "w") as file: irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}"; irrlicht-rev = "{irrlicht.sha}"; irrlicht-hash = "{irrlicht_hash}"; - ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}"; - ocgcore-rev = "{ocgcore.sha}"; - ocgcore-hash = "{ocgcore_hash}"; }} """ diff --git a/pkgs/data/fonts/edukai/default.nix b/pkgs/by-name/ed/edukai/package.nix similarity index 100% rename from pkgs/data/fonts/edukai/default.nix rename to pkgs/by-name/ed/edukai/package.nix diff --git a/pkgs/data/fonts/eduli/default.nix b/pkgs/by-name/ed/eduli/package.nix similarity index 100% rename from pkgs/data/fonts/eduli/default.nix rename to pkgs/by-name/ed/eduli/package.nix diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/by-name/ed/edusong/package.nix similarity index 100% rename from pkgs/data/fonts/edusong/default.nix rename to pkgs/by-name/ed/edusong/package.nix diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/by-name/ed/edwin/package.nix similarity index 100% rename from pkgs/data/fonts/edwin/default.nix rename to pkgs/by-name/ed/edwin/package.nix diff --git a/pkgs/applications/editors/edwood/default.nix b/pkgs/by-name/ed/edwood/package.nix similarity index 100% rename from pkgs/applications/editors/edwood/default.nix rename to pkgs/by-name/ed/edwood/package.nix diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/by-name/ef/eff/package.nix similarity index 100% rename from pkgs/development/interpreters/eff/default.nix rename to pkgs/by-name/ef/eff/package.nix diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix similarity index 100% rename from pkgs/tools/compression/efficient-compression-tool/default.nix rename to pkgs/by-name/ef/efficient-compression-tool/package.nix diff --git a/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch similarity index 100% rename from pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch rename to pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/by-name/ef/effitask/package.nix similarity index 100% rename from pkgs/applications/misc/effitask/default.nix rename to pkgs/by-name/ef/effitask/package.nix diff --git a/pkgs/tools/security/efitools/aarch64.patch b/pkgs/by-name/ef/efitools/aarch64.patch similarity index 100% rename from pkgs/tools/security/efitools/aarch64.patch rename to pkgs/by-name/ef/efitools/aarch64.patch diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/by-name/ef/efitools/package.nix similarity index 100% rename from pkgs/tools/security/efitools/default.nix rename to pkgs/by-name/ef/efitools/package.nix diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/by-name/ef/efivar/package.nix similarity index 100% rename from pkgs/tools/system/efivar/default.nix rename to pkgs/by-name/ef/efivar/package.nix diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/by-name/ef/efm-langserver/package.nix similarity index 100% rename from pkgs/development/tools/efm-langserver/default.nix rename to pkgs/by-name/ef/efm-langserver/package.nix diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix new file mode 100644 index 000000000000..61d7edeffb5b --- /dev/null +++ b/pkgs/by-name/ef/efmt/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "efmt"; + version = "0.18.3"; + + src = fetchFromGitHub { + owner = "sile"; + repo = "efmt"; + rev = version; + hash = "sha256-3CL9NcwDsAs6fHUWA/ibkwqOW0Ur4glpHVZTrfLQUXs="; + }; + + cargoHash = "sha256-hEJb1SOQ3daY2otroCds8zitoodSjRyRTyR7GwF8dgk="; + + meta = { + description = "Erlang code formatter"; + homepage = "https://github.com/sile/efmt"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ haruki7049 ]; + mainProgram = "efmt"; + }; +} diff --git a/pkgs/data/fonts/efont-unicode/default.nix b/pkgs/by-name/ef/efont-unicode/package.nix similarity index 100% rename from pkgs/data/fonts/efont-unicode/default.nix rename to pkgs/by-name/ef/efont-unicode/package.nix diff --git a/pkgs/by-name/eg/eg25-manager/package.nix b/pkgs/by-name/eg/eg25-manager/package.nix index 35514cf558eb..f76b07173fc9 100644 --- a/pkgs/by-name/eg/eg25-manager/package.nix +++ b/pkgs/by-name/eg/eg25-manager/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eg25-manager"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mobian1"; repo = "eg25-manager"; rev = finalAttrs.version; - hash = "sha256-hOOYrEM+W7nHc6AQMYg6XQj4dgkLoBQe9S1F65TWPUI="; + hash = "sha256-Zna+JplmYrxPYsXToJ3vKOPzPMZYB3bEdfT8GIAHATs="; }; postPatch = '' diff --git a/pkgs/tools/misc/eget/default.nix b/pkgs/by-name/eg/eget/package.nix similarity index 100% rename from pkgs/tools/misc/eget/default.nix rename to pkgs/by-name/eg/eget/package.nix diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/by-name/eg/eggdbus/package.nix similarity index 100% rename from pkgs/development/tools/misc/eggdbus/default.nix rename to pkgs/by-name/eg/eggdbus/package.nix diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/by-name/eg/eggdrop/package.nix similarity index 100% rename from pkgs/tools/networking/eggdrop/default.nix rename to pkgs/by-name/eg/eggdrop/package.nix diff --git a/pkgs/applications/science/logic/egglog/Cargo.lock b/pkgs/by-name/eg/egglog/Cargo.lock similarity index 100% rename from pkgs/applications/science/logic/egglog/Cargo.lock rename to pkgs/by-name/eg/egglog/Cargo.lock diff --git a/pkgs/applications/science/logic/egglog/default.nix b/pkgs/by-name/eg/egglog/package.nix similarity index 100% rename from pkgs/applications/science/logic/egglog/default.nix rename to pkgs/by-name/eg/egglog/package.nix diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix similarity index 100% rename from pkgs/applications/science/biology/eggnog-mapper/default.nix rename to pkgs/by-name/eg/eggnog-mapper/package.nix diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/by-name/eg/egl-wayland/package.nix similarity index 100% rename from pkgs/development/libraries/egl-wayland/default.nix rename to pkgs/by-name/eg/egl-wayland/package.nix diff --git a/pkgs/by-name/eg/eglexternalplatform/package.nix b/pkgs/by-name/eg/eglexternalplatform/package.nix new file mode 100644 index 000000000000..cd545f69f048 --- /dev/null +++ b/pkgs/by-name/eg/eglexternalplatform/package.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "eglexternalplatform"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "Nvidia"; + repo = "eglexternalplatform"; + rev = version; + hash = "sha256-t0dka5aUv5hB4G8PbSGiIY74XIFAsmo5a7dfWb2QCLM="; + }; + + nativeBuildInputs = [ meson ninja ]; + + meta = with lib; { + description = "EGL External Platform interface"; + homepage = "https://github.com/NVIDIA/eglexternalplatform"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ hedning ]; + }; +} diff --git a/pkgs/tools/misc/ego/default.nix b/pkgs/by-name/eg/ego/package.nix similarity index 100% rename from pkgs/tools/misc/ego/default.nix rename to pkgs/by-name/eg/ego/package.nix diff --git a/pkgs/games/egoboo/default.nix b/pkgs/by-name/eg/egoboo/package.nix similarity index 100% rename from pkgs/games/egoboo/default.nix rename to pkgs/by-name/eg/egoboo/package.nix diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/by-name/eg/egypt/package.nix similarity index 100% rename from pkgs/development/tools/analysis/egypt/default.nix rename to pkgs/by-name/eg/egypt/package.nix diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/by-name/ei/eiciel/package.nix similarity index 100% rename from pkgs/tools/filesystems/eiciel/default.nix rename to pkgs/by-name/ei/eiciel/package.nix diff --git a/pkgs/games/eidolon/Cargo.lock b/pkgs/by-name/ei/eidolon/Cargo.lock similarity index 100% rename from pkgs/games/eidolon/Cargo.lock rename to pkgs/by-name/ei/eidolon/Cargo.lock diff --git a/pkgs/games/eidolon/default.nix b/pkgs/by-name/ei/eidolon/package.nix similarity index 100% rename from pkgs/games/eidolon/default.nix rename to pkgs/by-name/ei/eidolon/package.nix diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/by-name/ei/eigenmath/package.nix similarity index 100% rename from pkgs/applications/science/math/eigenmath/default.nix rename to pkgs/by-name/ei/eigenmath/package.nix diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index cee3ef9d13fc..106a46d6c145 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -73,7 +73,6 @@ let }; allBeamDeps = import ./rebar-deps.nix { - # TODO(@chuangzhu) add updateScript inherit fetchHex fetchgit fetchFromGitHub; builder = lib.makeOverridable beamPackages.buildRebar3; @@ -115,7 +114,7 @@ let buildInputs = [ sqlite ]; buildPlugins = [ beamPackages.pc ]; }; - p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + p1_mysql = prev.p1_mysql.override { buildPlugins = [ beamPackages.pc ]; }; epam = prev.epam.override { buildInputs = [ pam ]; buildPlugins = [ beamPackages.pc ]; @@ -142,7 +141,7 @@ let in stdenv.mkDerivation (finalAttrs:{ pname = "ejabberd"; - version = "24.07"; + version = "24.10"; nativeBuildInputs = [ makeWrapper @@ -171,7 +170,7 @@ stdenv.mkDerivation (finalAttrs:{ owner = "processone"; repo = "ejabberd"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-4wEQBumWrHqN2uNrDxAJhgv2ok7pgQlAEPpL96ZOsTQ="; + hash = "sha256-WQCFwhyaTVAX1bQURJkiCupgr3zc5yKrhQBiGyYsWZk="; }; passthru.tests = { @@ -211,6 +210,8 @@ stdenv.mkDerivation (finalAttrs:{ }"''} ''; + passthru.updateScript = ./update.sh; + meta = { description = "Open-source XMPP application server written in Erlang"; mainProgram = "ejabberdctl"; diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index 423dd5592639..56ab5997a7c3 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -54,11 +54,11 @@ let }; xmpp = builder { name = "xmpp"; - version = "1.8.3"; + version = "1.9.0"; src = fetchHex { pkg = "xmpp"; - version = "1.8.3"; - sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE="; + version = "1.9.0"; + sha256 = "sha256-wbkb50qalQOvpnZvdWR3UWkg/7/uoMJgwvoXE1X1PCc="; }; beamDeps = [ ezlib @@ -71,11 +71,11 @@ let }; stun = builder { name = "stun"; - version = "1.2.14"; + version = "1.2.15"; src = fetchHex { pkg = "stun"; - version = "1.2.14"; - sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM="; + version = "1.2.15"; + sha256 = "sha256-9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8="; }; beamDeps = [ fast_tls @@ -124,11 +124,11 @@ let }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.27"; + version = "1.1.28"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.27"; - sha256 = "sha256-jk0adgLLaHgOVdidxamy4arKP08e49GiXy+MPSNk/7k="; + version = "1.1.28"; + sha256 = "sha256-ZVu3XfA2rOVd3OF8p0EUPELgZnxiBqwnpNy8Zfcaye8="; }; beamDeps = [ xmpp ]; }; @@ -144,21 +144,21 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.24"; + version = "1.0.25"; src = fetchHex { pkg = "p1_mysql"; - version = "1.0.24"; - sha256 = "sha256-8FiGX2Qlf1B6LGpa/zabE3XbyzCz1CWNrU8bPq/7ZV8="; + version = "1.0.25"; + sha256 = "sha256-5hh/+ulbcmCY6I8+5vI0SsJZziwm4O5AOwX+7zQa5DQ="; }; beamDeps = [ ]; }; p1_acme = builder { name = "p1_acme"; - version = "1.0.23"; + version = "1.0.24"; src = fetchHex { pkg = "p1_acme"; - version = "1.0.23"; - sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk="; + version = "1.0.24"; + sha256 = "sha256-8UUdcGWV75l6scoXFi3axY+HSsl+MVpfrb48+iYUgAI="; }; beamDeps = [ base64url @@ -220,21 +220,21 @@ let }; fast_xml = builder { name = "fast_xml"; - version = "1.1.52"; + version = "1.1.53"; src = fetchHex { pkg = "fast_xml"; - version = "1.1.52"; - sha256 = "sha256-eVGSOQ4G0rZQFqaZC7+lcn9KJtKRSAixw8mjLu3NG/0="; + version = "1.1.53"; + sha256 = "sha256-UGQzbW82Pu5Ql6pdxc7Ztn8FFS8ua4Ug/VDSaMKrg5w="; }; beamDeps = [ p1_utils ]; }; fast_tls = builder { name = "fast_tls"; - version = "1.1.21"; + version = "1.1.22"; src = fetchHex { pkg = "fast_tls"; - version = "1.1.21"; - sha256 = "sha256-ExVCkTk3Al5IzYCqgfADWWhtVQG3ViHnICaoe1IpUFs="; + version = "1.1.22"; + sha256 = "sha256-5ld5rvt6sVxHVSMP74B35ofSDMWjmEpZdPn2V+jiSFs="; }; beamDeps = [ p1_utils ]; }; @@ -250,11 +250,11 @@ let }; esip = builder { name = "esip"; - version = "1.0.54"; + version = "1.0.56"; src = fetchHex { pkg = "esip"; - version = "1.0.54"; - sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4="; + version = "1.0.56"; + sha256 = "sha256-nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8="; }; beamDeps = [ fast_tls diff --git a/pkgs/by-name/ej/ejabberd/update.sh b/pkgs/by-name/ej/ejabberd/update.sh new file mode 100755 index 000000000000..af29359a58b3 --- /dev/null +++ b/pkgs/by-name/ej/ejabberd/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake nixfmt-rfc-style +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/processone/ejabberd/releases/latest | jq -e -r .tag_name) +old_version=$(nix-instantiate --eval -A ejabberd.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version ejabberd "$version" + +sqlite=$(nix-build . -A sqlite.dev --no-link) +rebardeps=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")/rebar-deps.nix +tmpdir=$(mktemp -d) +cp -r $(nix-build . --no-out-link -A ejabberd.src)/. "$tmpdir" +cd "$tmpdir" + +./autogen.sh +./configure --enable-all --disable-elixir --with-sqlite3=$sqlite +HOME=. rebar3 nix lock -o "$rebardeps" +nixfmt "$rebardeps" diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/by-name/ej/ejson/package.nix similarity index 100% rename from pkgs/development/tools/ejson/default.nix rename to pkgs/by-name/ej/ejson/package.nix diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/by-name/ej/ejson2env/package.nix similarity index 100% rename from pkgs/tools/admin/ejson2env/default.nix rename to pkgs/by-name/ej/ejson2env/package.nix diff --git a/pkgs/tools/admin/ejson2env/test-decryption.nix b/pkgs/by-name/ej/ejson2env/test-decryption.nix similarity index 100% rename from pkgs/tools/admin/ejson2env/test-decryption.nix rename to pkgs/by-name/ej/ejson2env/test-decryption.nix diff --git a/pkgs/development/tools/build-managers/ekam/default.nix b/pkgs/by-name/ek/ekam/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/ekam/default.nix rename to pkgs/by-name/ek/ekam/package.nix diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/el/elan/0001-dynamically-patchelf-binaries.patch similarity index 100% rename from pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch rename to pkgs/by-name/el/elan/0001-dynamically-patchelf-binaries.patch diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/by-name/el/elan/package.nix similarity index 100% rename from pkgs/applications/science/logic/elan/default.nix rename to pkgs/by-name/el/elan/package.nix diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/by-name/el/elastic/package.nix similarity index 100% rename from pkgs/applications/misc/elastic/default.nix rename to pkgs/by-name/el/elastic/package.nix diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/by-name/el/electricsheep/package.nix similarity index 100% rename from pkgs/misc/screensavers/electricsheep/default.nix rename to pkgs/by-name/el/electricsheep/package.nix diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/by-name/el/electron-fiddle/package.nix similarity index 100% rename from pkgs/development/tools/electron-fiddle/default.nix rename to pkgs/by-name/el/electron-fiddle/package.nix diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/by-name/el/electron-mail/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/electron-mail/default.nix rename to pkgs/by-name/el/electron-mail/package.nix diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/by-name/el/element/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/element/default.nix rename to pkgs/by-name/el/element/package.nix diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/elementary-xfce-icon-theme/default.nix rename to pkgs/by-name/el/elementary-xfce-icon-theme/package.nix diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/by-name/el/elf-header-real/package.nix similarity index 100% rename from pkgs/development/libraries/elf-header/default.nix rename to pkgs/by-name/el/elf-header-real/package.nix diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/by-name/el/elfcat/package.nix similarity index 100% rename from pkgs/tools/misc/elfcat/default.nix rename to pkgs/by-name/el/elfcat/package.nix diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/by-name/el/elfinfo/package.nix similarity index 100% rename from pkgs/development/tools/misc/elfinfo/default.nix rename to pkgs/by-name/el/elfinfo/package.nix diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/by-name/el/elfio/package.nix similarity index 100% rename from pkgs/development/libraries/elfio/default.nix rename to pkgs/by-name/el/elfio/package.nix diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/by-name/el/elfkickers/package.nix similarity index 100% rename from pkgs/development/tools/misc/elfkickers/default.nix rename to pkgs/by-name/el/elfkickers/package.nix diff --git a/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch b/pkgs/by-name/el/elfutils/cxx-header-collision.patch similarity index 100% rename from pkgs/development/tools/misc/elfutils/cxx-header-collision.patch rename to pkgs/by-name/el/elfutils/cxx-header-collision.patch diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/pkgs/by-name/el/elfutils/debug-info-from-env.patch similarity index 100% rename from pkgs/development/tools/misc/elfutils/debug-info-from-env.patch rename to pkgs/by-name/el/elfutils/debug-info-from-env.patch diff --git a/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/pkgs/by-name/el/elfutils/musl-error_h.patch similarity index 100% rename from pkgs/development/tools/misc/elfutils/musl-error_h.patch rename to pkgs/by-name/el/elfutils/musl-error_h.patch diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/by-name/el/elfutils/package.nix similarity index 100% rename from pkgs/development/tools/misc/elfutils/default.nix rename to pkgs/by-name/el/elfutils/package.nix diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/by-name/el/elfx86exts/package.nix similarity index 100% rename from pkgs/applications/misc/elfx86exts/default.nix rename to pkgs/by-name/el/elfx86exts/package.nix diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/by-name/el/eli/package.nix similarity index 100% rename from pkgs/development/compilers/eli/default.nix rename to pkgs/by-name/el/eli/package.nix diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/by-name/el/eliot-tree/package.nix similarity index 100% rename from pkgs/development/tools/eliot-tree/default.nix rename to pkgs/by-name/el/eliot-tree/package.nix diff --git a/pkgs/development/tools/elkhound/default.nix b/pkgs/by-name/el/elkhound/package.nix similarity index 100% rename from pkgs/development/tools/elkhound/default.nix rename to pkgs/by-name/el/elkhound/package.nix diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix new file mode 100644 index 000000000000..495c858c93a2 --- /dev/null +++ b/pkgs/by-name/el/ell/package.nix @@ -0,0 +1,59 @@ +{ lib, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, dbus +, sysctl +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "ell"; + version = "0.69"; + + outputs = [ "out" "dev" ]; + separateDebugInfo = true; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; + rev = version; + hash = "sha256-FOEVnpndbIufb8i6egBIoG1PC01WxtAlf3I47YqM+hk="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + nativeCheckInputs = [ + dbus + # required as the sysctl test works on some machines + sysctl + ]; + + enableParallelBuilding = true; + + # Runs multiple dbus instances on the same port failing the bind. + enableParallelChecking = false; + + # tests sporadically fail on musl + doCheck = !stdenv.hostPlatform.isMusl; + + passthru = { + updateScript = gitUpdater { + url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; + }; + }; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; + description = "Embedded Linux Library"; + longDescription = '' + The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems. + ''; + changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 dtzWill ]; + }; +} diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/by-name/el/elliptic_curves/package.nix similarity index 100% rename from pkgs/data/misc/elliptic_curves/default.nix rename to pkgs/by-name/el/elliptic_curves/package.nix diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/by-name/el/elmerfem/package.nix similarity index 100% rename from pkgs/applications/science/physics/elmerfem/default.nix rename to pkgs/by-name/el/elmerfem/package.nix diff --git a/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch b/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch similarity index 100% rename from pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch rename to pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch diff --git a/pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch similarity index 100% rename from pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch rename to pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/by-name/el/elogind/package.nix similarity index 100% rename from pkgs/applications/misc/elogind/default.nix rename to pkgs/by-name/el/elogind/package.nix diff --git a/pkgs/by-name/el/elpa/package.nix b/pkgs/by-name/el/elpa/package.nix new file mode 100644 index 000000000000..03e6595d1239 --- /dev/null +++ b/pkgs/by-name/el/elpa/package.nix @@ -0,0 +1,105 @@ +{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook +, perl, mpi, blas, lapack, scalapack +# CPU optimizations +, avxSupport ? stdenv.hostPlatform.avxSupport +, avx2Support ? stdenv.hostPlatform.avx2Support +, avx512Support ? stdenv.hostPlatform.avx512Support +, config +# Enable NIVIA GPU support +# Note, that this needs to be built on a system with a GPU +# present for the tests to succeed. +, enableCuda ? config.cudaSupport +# type of GPU architecture +, nvidiaArch ? "sm_60" +, cudaPackages +} : + +assert blas.isILP64 == lapack.isILP64; +assert blas.isILP64 == scalapack.isILP64; + +stdenv.mkDerivation rec { + pname = "elpa"; + version = "2024.05.001"; + + passthru = { inherit (blas) isILP64; }; + + src = fetchurl { + url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; + sha256 = "sha256-nK9Bo+YA4vb0zhkxvVQYUXna3pwXFVbQybQbvGlA8vY="; + }; + + patches = [ + # Use a plain name for the pkg-config file + ./pkg-config.patch + ]; + + postPatch = '' + patchShebangs ./fdep/fortran_dependencies.pl + patchShebangs ./test-driver + + # Fix the test script generator + substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' + ''; + + outputs = [ "out" "doc" "man" "dev" ]; + + nativeBuildInputs = [ autoreconfHook perl ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; + + buildInputs = [ mpi blas lapack scalapack ] + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + ]; + + preConfigure = '' + export FC="mpifort" + export CC="mpicc" + export CXX="mpicxx" + export CPP="cpp" + + # These need to be set for configure to succeed + export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 " + + lib.optionalString avxSupport "-mavx " + + lib.optionalString avx2Support "-mavx2 -mfma " + + lib.optionalString avx512Support "-mavx512"}" + + export CFLAGS=$FCFLAGS + ''; + + configureFlags = [ + "--with-mpi" + "--enable-openmp" + "--without-threading-support-check-during-build" + ] ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support" + ++ lib.optional (!avxSupport) "--disable-avx" + ++ lib.optional (!avx2Support) "--disable-avx2" + ++ lib.optional (!avx512Support) "--disable-avx512" + ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse" + ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse-assembly" + ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly" + ++ lib.optionals enableCuda [ "--enable-nvidia-gpu" "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}" ]; + + enableParallelBuilding = true; + + doCheck = !enableCuda; + + nativeCheckInputs = [ mpiCheckPhaseHook ]; + preCheck = '' + #patchShebangs ./ + + # Run dual threaded + export OMP_NUM_THREADS=2 + + # Reduce test problem sizes + export TEST_FLAGS="1500 50 16" + ''; + + meta = with lib; { + description = "Eigenvalue Solvers for Petaflop-Applications"; + homepage = "https://elpa.mpcdf.mpg.de/"; + license = licenses.lgpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/elpa/pkg-config.patch b/pkgs/by-name/el/elpa/pkg-config.patch similarity index 100% rename from pkgs/development/libraries/elpa/pkg-config.patch rename to pkgs/by-name/el/elpa/pkg-config.patch diff --git a/pkgs/development/tools/eltclsh/default.nix b/pkgs/by-name/el/eltclsh/package.nix similarity index 100% rename from pkgs/development/tools/eltclsh/default.nix rename to pkgs/by-name/el/eltclsh/package.nix diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/by-name/em/emacs-all-the-icons-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix rename to pkgs/by-name/em/emacs-all-the-icons-fonts/package.nix diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/by-name/em/email/package.nix similarity index 100% rename from pkgs/tools/networking/email/default.nix rename to pkgs/by-name/em/email/package.nix diff --git a/pkgs/by-name/em/ember-cli/package.json b/pkgs/by-name/em/ember-cli/package.json deleted file mode 100644 index 48cd3aa8543b..000000000000 --- a/pkgs/by-name/em/ember-cli/package.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "name": "ember-cli", - "version": "5.3.0", - "description": "Command line tool for developing ambitious ember.js apps", - "keywords": [ - "app", - "app-kit", - "blockchain", - "cli", - "ember", - "ember-app-kit", - "ember.js", - "kit" - ], - "homepage": "https://cli.emberjs.com/release/", - "bugs": { - "url": "https://github.com/ember-cli/ember-cli/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/ember-cli/ember-cli.git" - }, - "license": "MIT", - "author": "Stefan Penner, Robert Jackson and ember-cli contributors", - "main": "lib/cli/index.js", - "bin": { - "ember": "./bin/ember" - }, - "scripts": { - "docs": "yuidoc", - "lint": "eslint . --cache", - "prepack": "yarn docs", - "test": "node --unhandled-rejections=strict tests/runner", - "test:all": "node --unhandled-rejections=strict tests/runner all", - "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all", - "test:debug": "node --unhandled-rejections=strict debug tests/runner", - "test:slow": "node --unhandled-rejections=strict tests/runner slow" - }, - "dependencies": { - "@babel/core": "^7.22.10", - "@pnpm/find-workspace-dir": "^6.0.2", - "broccoli": "^3.5.2", - "broccoli-builder": "^0.18.14", - "broccoli-concat": "^4.2.5", - "broccoli-config-loader": "^1.0.1", - "broccoli-config-replace": "^1.1.2", - "broccoli-debug": "^0.6.5", - "broccoli-funnel": "^3.0.8", - "broccoli-funnel-reducer": "^1.0.0", - "broccoli-merge-trees": "^4.2.0", - "broccoli-middleware": "^2.1.1", - "broccoli-slow-trees": "^3.1.0", - "broccoli-source": "^3.0.1", - "broccoli-stew": "^3.0.0", - "calculate-cache-key-for-tree": "^2.0.0", - "capture-exit": "^2.0.0", - "chalk": "^4.1.2", - "ci-info": "^3.8.0", - "clean-base-url": "^1.0.0", - "compression": "^1.7.4", - "configstore": "^5.0.1", - "console-ui": "^3.1.2", - "core-object": "^3.1.5", - "dag-map": "^2.0.2", - "diff": "^5.1.0", - "ember-cli-is-package-missing": "^1.0.0", - "ember-cli-lodash-subset": "^2.0.1", - "ember-cli-normalize-entity-name": "^1.0.0", - "ember-cli-preprocess-registry": "^5.0.1", - "ember-cli-string-utils": "^1.1.0", - "ensure-posix-path": "^1.1.1", - "execa": "^5.1.1", - "exit": "^0.1.2", - "express": "^4.18.1", - "filesize": "^10.0.8", - "find-up": "^5.0.0", - "find-yarn-workspace-root": "^2.0.0", - "fixturify-project": "^2.1.1", - "fs-extra": "^11.1.1", - "fs-tree-diff": "^2.0.1", - "get-caller-file": "^2.0.5", - "git-repo-info": "^2.1.1", - "glob": "^8.1.0", - "heimdalljs": "^0.2.6", - "heimdalljs-fs-monitor": "^1.1.1", - "heimdalljs-graph": "^1.0.0", - "heimdalljs-logger": "^0.1.10", - "http-proxy": "^1.18.1", - "inflection": "^2.0.1", - "inquirer": "^9.1.5", - "is-git-url": "^1.0.0", - "is-language-code": "^3.1.0", - "isbinaryfile": "^5.0.0", - "leek": "0.0.24", - "lodash.template": "^4.5.0", - "markdown-it": "^13.0.1", - "markdown-it-terminal": "^0.4.0", - "minimatch": "^7.4.3", - "morgan": "^1.10.0", - "nopt": "^3.0.6", - "npm-package-arg": "^10.1.0", - "os-locale": "^5.0.0", - "p-defer": "^3.0.0", - "portfinder": "^1.0.32", - "promise-map-series": "^0.3.0", - "promise.hash.helper": "^1.0.8", - "quick-temp": "^0.1.8", - "remove-types": "^1.0.0", - "resolve": "^1.22.1", - "resolve-package-path": "^4.0.3", - "safe-stable-stringify": "^2.4.3", - "sane": "^5.0.1", - "semver": "^7.3.5", - "silent-error": "^1.1.1", - "sort-package-json": "^1.57.0", - "symlink-or-copy": "^1.3.1", - "temp": "0.9.4", - "testem": "^3.10.1", - "tiny-lr": "^2.0.0", - "tree-sync": "^2.1.0", - "uuid": "^9.0.0", - "walk-sync": "^3.0.0", - "watch-detector": "^1.0.2", - "workerpool": "^6.4.0", - "yam": "^1.0.0" - }, - "devDependencies": { - "@octokit/rest": "^19.0.7", - "broccoli-plugin": "^4.0.3", - "broccoli-test-helper": "^2.0.0", - "chai": "^4.3.7", - "chai-as-promised": "^7.1.1", - "chai-files": "^1.4.0", - "chai-jest-snapshot": "^2.0.0", - "ember-cli-blueprint-test-helpers": "^0.19.2", - "ember-cli-internal-test-helpers": "^0.9.1", - "eslint": "^8.44.0", - "eslint-config-prettier": "^8.9.0", - "eslint-plugin-chai-expect": "^3.0.0", - "eslint-plugin-mocha": "^10.1.0", - "eslint-plugin-n": "^16.0.1", - "eslint-plugin-prettier": "^4.2.1", - "fixturify": "^3.0.0", - "jsdom": "^21.1.1", - "latest-version": "^5.1.0", - "mocha": "^10.0.0", - "nock": "^13.3.0", - "nyc": "^15.1.0", - "prettier": "2.8.7", - "release-it": "^15.10.0", - "rimraf": "^3.0.2", - "strip-ansi": "^6.0.0", - "supertest": "^6.3.1", - "testdouble": "^3.18.0", - "tmp": "^0.2.1", - "websocket": "^1.0.32", - "which": "3.0.1", - "yuidoc-ember-cli-theme": "^1.0.4", - "yuidocjs": "0.10.2" - }, - "engines": { - "node": ">= 16" - }, - "publishConfig": { - "registry": "https://registry.npmjs.org" - }, - "release-it": { - "git": { - "tagName": "v${version}" - }, - "github": { - "draft": true, - "release": true, - "tokenRef": "GITHUB_AUTH" - } - }, - "trackingCode": "UA-49225444-1", - "volta": { - "node": "16.19.1", - "yarn": "1.22.19" - } -} diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix index 86f627be950e..a80a6e56ae78 100644 --- a/pkgs/by-name/em/ember-cli/package.nix +++ b/pkgs/by-name/em/ember-cli/package.nix @@ -1,28 +1,36 @@ -{ lib -, mkYarnPackage -, fetchFromGitHub -, fetchYarnDeps +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, }: -let +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ember-cli"; version = "5.3.0"; + src = fetchFromGitHub { owner = "ember-cli"; repo = "ember-cli"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ="; }; -in -mkYarnPackage { - inherit pname version src; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-QgT2JFvMupJo+pJc13n2lmHMZkROJRJWoozCho3E6+c="; }; - packageJSON = ./package.json; + strictDeps = true; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; meta = with lib; { homepage = "https://github.com/ember-cli/ember-cli"; @@ -32,4 +40,4 @@ mkYarnPackage { platforms = platforms.all; mainProgram = "ember"; }; -} +}) diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/by-name/em/emblem/package.nix similarity index 100% rename from pkgs/applications/graphics/emblem/default.nix rename to pkgs/by-name/em/emblem/package.nix diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/by-name/em/emboss/package.nix similarity index 100% rename from pkgs/applications/science/biology/emboss/default.nix rename to pkgs/by-name/em/emboss/package.nix diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/by-name/em/emem/package.nix similarity index 100% rename from pkgs/applications/misc/emem/default.nix rename to pkgs/by-name/em/emem/package.nix diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/by-name/em/emma/package.nix similarity index 100% rename from pkgs/development/tools/analysis/emma/default.nix rename to pkgs/by-name/em/emma/package.nix diff --git a/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json b/pkgs/by-name/em/emmet-language-server/package-lock.json similarity index 100% rename from pkgs/development/tools/language-servers/emmet-language-server/package-lock.json rename to pkgs/by-name/em/emmet-language-server/package-lock.json diff --git a/pkgs/development/tools/language-servers/emmet-language-server/default.nix b/pkgs/by-name/em/emmet-language-server/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/emmet-language-server/default.nix rename to pkgs/by-name/em/emmet-language-server/package.nix diff --git a/pkgs/development/tools/language-servers/emmet-ls/default.nix b/pkgs/by-name/em/emmet-ls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/emmet-ls/default.nix rename to pkgs/by-name/em/emmet-ls/package.nix diff --git a/pkgs/applications/misc/emoji-picker/default.nix b/pkgs/by-name/em/emoji-picker/package.nix similarity index 100% rename from pkgs/applications/misc/emoji-picker/default.nix rename to pkgs/by-name/em/emoji-picker/package.nix diff --git a/pkgs/applications/misc/emoji-picker/xsys.patch b/pkgs/by-name/em/emoji-picker/xsys.patch similarity index 100% rename from pkgs/applications/misc/emoji-picker/xsys.patch rename to pkgs/by-name/em/emoji-picker/xsys.patch diff --git a/pkgs/applications/misc/emojipick/default.nix b/pkgs/by-name/em/emojipick/package.nix similarity index 100% rename from pkgs/applications/misc/emojipick/default.nix rename to pkgs/by-name/em/emojipick/package.nix diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/by-name/em/emptty/package.nix similarity index 100% rename from pkgs/applications/display-managers/emptty/default.nix rename to pkgs/by-name/em/emptty/package.nix diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index 3a9a38992f9e..5408d1f340d9 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -2,8 +2,8 @@ let version = { - seriousproton = "2024.06.20"; - emptyepsilon = "2024.06.20"; + seriousproton = "2024.08.09"; + emptyepsilon = "2024.08.09"; basis-universal = "v1_15_update2"; }; @@ -22,7 +22,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version.seriousproton}"; - hash = "sha256-byLk4ukpj+s74+3K+1wzRTXhe4pKkH0pOSYeVs94muc="; + hash = "sha256-B7BUe5rtN/eABJwkuSyn+h1lIHuV/tZUNcGXTyaWIr4="; }; nativeBuildInputs = [ cmake ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version.emptyepsilon}"; - hash = "sha256-YTZliu1o3LFab43DqmSk/cifxRWZMPxdV4gNoNy8LEk="; + hash = "sha256-DxaasUyJa8n0ha8RqAfEnqCVELs5Or0zvIOgcK75TnU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/empty/0.6-Makefile.patch b/pkgs/by-name/em/empty/0.6-Makefile.patch similarity index 100% rename from pkgs/tools/misc/empty/0.6-Makefile.patch rename to pkgs/by-name/em/empty/0.6-Makefile.patch diff --git a/pkgs/tools/misc/empty/default.nix b/pkgs/by-name/em/empty/package.nix similarity index 100% rename from pkgs/tools/misc/empty/default.nix rename to pkgs/by-name/em/empty/package.nix diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/by-name/em/emuflight-configurator/package.nix similarity index 100% rename from pkgs/applications/science/robotics/emuflight-configurator/default.nix rename to pkgs/by-name/em/emuflight-configurator/package.nix diff --git a/pkgs/applications/graphics/emulsion-palette/default.nix b/pkgs/by-name/em/emulsion-palette/package.nix similarity index 100% rename from pkgs/applications/graphics/emulsion-palette/default.nix rename to pkgs/by-name/em/emulsion-palette/package.nix diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/by-name/em/emv/package.nix similarity index 100% rename from pkgs/tools/misc/emv/default.nix rename to pkgs/by-name/em/emv/package.nix diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 31bd99b51b8f..e29246d2a5d5 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, rustPlatform, fetchFromGitHub, @@ -16,15 +15,10 @@ libsoup, webkitgtk_4_0, gst_all_1, - darwin, + apple-sdk_11, }: -let - buildRustPackage = rustPlatform.buildRustPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "en-croissant"; version = "0.11.1"; @@ -72,10 +66,7 @@ buildRustPackage rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.WebKit - ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; doCheck = false; # many scoring tests fail diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/by-name/en/enblend-enfuse/package.nix similarity index 100% rename from pkgs/tools/graphics/enblend-enfuse/default.nix rename to pkgs/by-name/en/enblend-enfuse/package.nix diff --git a/pkgs/tools/security/enc/default.nix b/pkgs/by-name/en/enc/package.nix similarity index 100% rename from pkgs/tools/security/enc/default.nix rename to pkgs/by-name/en/enc/package.nix diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/by-name/en/enca/package.nix similarity index 100% rename from pkgs/tools/text/enca/default.nix rename to pkgs/by-name/en/enca/package.nix diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/by-name/en/enchive/package.nix similarity index 100% rename from pkgs/tools/security/enchive/default.nix rename to pkgs/by-name/en/enchive/package.nix diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/by-name/en/encode-sans/package.nix similarity index 100% rename from pkgs/data/fonts/encode-sans/default.nix rename to pkgs/by-name/en/encode-sans/package.nix diff --git a/pkgs/tools/misc/encpipe/default.nix b/pkgs/by-name/en/encpipe/package.nix similarity index 100% rename from pkgs/tools/misc/encpipe/default.nix rename to pkgs/by-name/en/encpipe/package.nix diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/by-name/en/endeavour/package.nix similarity index 100% rename from pkgs/applications/office/endeavour/default.nix rename to pkgs/by-name/en/endeavour/package.nix diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/by-name/en/endgame-singularity/package.nix similarity index 100% rename from pkgs/games/endgame-singularity/default.nix rename to pkgs/by-name/en/endgame-singularity/package.nix diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/by-name/en/endless-sky/fixes.patch similarity index 100% rename from pkgs/games/endless-sky/fixes.patch rename to pkgs/by-name/en/endless-sky/fixes.patch diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/by-name/en/endless-sky/package.nix similarity index 100% rename from pkgs/games/endless-sky/default.nix rename to pkgs/by-name/en/endless-sky/package.nix diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/by-name/en/endlessh/package.nix similarity index 100% rename from pkgs/servers/endlessh/default.nix rename to pkgs/by-name/en/endlessh/package.nix diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/by-name/en/enet/package.nix similarity index 100% rename from pkgs/development/libraries/enet/default.nix rename to pkgs/by-name/en/enet/package.nix diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/by-name/en/engelsystem/package.nix similarity index 100% rename from pkgs/servers/web-apps/engelsystem/default.nix rename to pkgs/by-name/en/engelsystem/package.nix diff --git a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/pkgs/by-name/en/enhanced-ctorrent/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix rename to pkgs/by-name/en/enhanced-ctorrent/package.nix diff --git a/pkgs/games/enigma/default.nix b/pkgs/by-name/en/enigma/package.nix similarity index 100% rename from pkgs/games/enigma/default.nix rename to pkgs/by-name/en/enigma/package.nix diff --git a/pkgs/tools/misc/enjarify/default.nix b/pkgs/by-name/en/enjarify/package.nix similarity index 100% rename from pkgs/tools/misc/enjarify/default.nix rename to pkgs/by-name/en/enjarify/package.nix diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/by-name/en/enpass/data.json similarity index 100% rename from pkgs/tools/security/enpass/data.json rename to pkgs/by-name/en/enpass/data.json diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/by-name/en/enpass/package.nix similarity index 100% rename from pkgs/tools/security/enpass/default.nix rename to pkgs/by-name/en/enpass/package.nix diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/by-name/en/enpass/update_script.py similarity index 100% rename from pkgs/tools/security/enpass/update_script.py rename to pkgs/by-name/en/enpass/update_script.py diff --git a/pkgs/tools/text/enscript/0001-use-system-getopt.patch b/pkgs/by-name/en/enscript/0001-use-system-getopt.patch similarity index 100% rename from pkgs/tools/text/enscript/0001-use-system-getopt.patch rename to pkgs/by-name/en/enscript/0001-use-system-getopt.patch diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/by-name/en/enscript/package.nix similarity index 100% rename from pkgs/tools/text/enscript/default.nix rename to pkgs/by-name/en/enscript/package.nix diff --git a/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff b/pkgs/by-name/en/ensemble-chorus/juice-cxx-packing-fix.diff similarity index 100% rename from pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff rename to pkgs/by-name/en/ensemble-chorus/juice-cxx-packing-fix.diff diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/by-name/en/ensemble-chorus/package.nix similarity index 100% rename from pkgs/applications/audio/ensemble-chorus/default.nix rename to pkgs/by-name/en/ensemble-chorus/package.nix diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/by-name/en/ent-go/package.nix similarity index 100% rename from pkgs/development/tools/ent/default.nix rename to pkgs/by-name/en/ent-go/package.nix diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/by-name/en/ent/package.nix similarity index 100% rename from pkgs/tools/misc/ent/default.nix rename to pkgs/by-name/en/ent/package.nix diff --git a/pkgs/by-name/en/entangle/0001-build-Add-missing-gio-unix-2.0-dependency.patch b/pkgs/by-name/en/entangle/0001-build-Add-missing-gio-unix-2.0-dependency.patch new file mode 100644 index 000000000000..91f09a4a8c8b --- /dev/null +++ b/pkgs/by-name/en/entangle/0001-build-Add-missing-gio-unix-2.0-dependency.patch @@ -0,0 +1,48 @@ +From 7f51ec77e1a35bbfb8ced3b7340818a72d859c0e Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Mon, 14 Oct 2024 00:57:57 +0200 +Subject: [PATCH] build: Add missing gio-unix-2.0 dependency +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On Nix, we try to isolate dependencies more than usual and have an alternative interpretation of pkg-config’s `Requires.private` field. +In this environment, Entangle fails to build because it has implicit dependency on gio-unix: + +../src/frontend/entangle-camera-manager.c:28:10: fatal error: gio/gunixoutputstream.h: No such file or directory + 28 | #include + | ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Let’s add it explicitly. +--- + meson.build | 1 + + src/frontend/meson.build | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/meson.build b/meson.build +index 1510962..90873ef 100644 +--- a/meson.build ++++ b/meson.build +@@ -33,6 +33,7 @@ add_global_arguments('-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38', language : + + glib_dep = dependency('glib-2.0', version: glib_min_version) + gio_dep = dependency('gio-2.0', version: glib_min_version) ++gio_unix_dep = dependency('gio-unix-2.0', version: glib_min_version) + gthread_dep = dependency('gthread-2.0', version: glib_min_version) + gmodule_dep = dependency('gmodule-2.0', version: glib_min_version) + gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_min_version) +diff --git a/src/frontend/meson.build b/src/frontend/meson.build +index 1ed9d75..81310c8 100644 +--- a/src/frontend/meson.build ++++ b/src/frontend/meson.build +@@ -90,6 +90,7 @@ entangle_frontend_sources += entangle_frontend_enum_sources + entangle_frontend_deps = [ + gthread_dep, + gmodule_dep, ++ gio_unix_dep, + gtk_dep, + gst_dep, + pango_dep, +-- +2.46.0 + diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix index 95db3a526845..fd5f3873df78 100644 --- a/pkgs/by-name/en/entangle/package.nix +++ b/pkgs/by-name/en/entangle/package.nix @@ -9,7 +9,7 @@ ninja, perl, python3, - pkgconf, + pkg-config, wrapGAppsHook3, at-spi2-core, dbus, @@ -33,13 +33,10 @@ libunwind, libxkbcommon, orc, - pcre, - pcre2, udev, util-linux, xorg, zstd, - cmake, }: stdenv.mkDerivation (finalAttrs: { @@ -60,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch"; sha256 = "iEgqGjKa0xwSdctwvNdEV361l9nx+bz53xn3fuDgtzY="; }) + + # Fix implicit dependency + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.com/entangle/entangle/-/merge_requests/61 + ./0001-build-Add-missing-gio-unix-2.0-dependency.patch ]; nativeBuildInputs = [ @@ -70,10 +72,9 @@ stdenv.mkDerivation (finalAttrs: { ninja perl # for pod2man and build scripts python3 # for build scripts - pkgconf + pkg-config wrapGAppsHook3 gobject-introspection - cmake ]; buildInputs = @@ -100,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: { libunwind libxkbcommon orc - pcre # required by libselinux before we USE_PCRE2 - pcre2 # required by glib-2.0 udev util-linux zstd diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 268ffdf2b507..f0c21d7aad87 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -78,7 +78,7 @@ flutter324.buildFlutterApplication rec { ]; postInstall = '' - FAV=$out/app/data/flutter_assets/assets/icons/auth-icon.png + FAV=$out/app/ente-auth/data/flutter_assets/assets/icons/auth-icon.png ICO=$out/share/icons install -D $FAV $ICO/ente-auth.png diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix new file mode 100644 index 000000000000..b35152a3daaa --- /dev/null +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -0,0 +1,97 @@ +{ + lib, + buildGoModule, + ente-cli, + fetchFromGitHub, + installShellFiles, + nix-update-script, + stdenv, + testers, +}: +let + version = "0.2.2"; + + canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; +in +buildGoModule { + pname = "ente-cli"; + inherit version; + + src = fetchFromGitHub { + owner = "ente-io"; + repo = "ente"; + rev = "refs/tags/cli-v${version}"; + hash = "sha256-ynbljYl73XwCnt3RUNmOYdrN8FX3sJ+3qDhWa8m2YJs="; + sparseCheckout = [ "cli" ]; + }; + + modRoot = "./cli"; + + vendorHash = "sha256-Gg1mifMVt6Ma8yQ/t0R5nf6NXbzLZBpuZrYsW48p0mw="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X main.AppVersion=cli-v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + '' + mv $out/bin/{cli,ente} + '' + # running ente results in the following errors: + # > mkdir /homeless-shelter: permission denied + # > error getting password from keyring: exec: "dbus-launch": executable file not found in $PATH + # fix by setting ENTE_CLI_CONFIG_PATH to $TMP and ENTE_CLI_SECRETS_PATH to a non existing path + # also guarding with `isLinux` because ENTE_CLI_SECRETS_PATH doesn't help on darwin: + # > error setting password in keyring: exit status 195 + # + + lib.optionalString (stdenv.buildPlatform.isLinux && canExecute) '' + export ENTE_CLI_CONFIG_PATH=$TMP + export ENTE_CLI_SECRETS_PATH=$TMP/secrets + + installShellCompletion --cmd ente \ + --bash <($out/bin/ente completion bash) \ + --fish <($out/bin/ente completion fish) \ + --zsh <($out/bin/ente completion zsh) + ''; + + passthru = { + # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin + tests.version = lib.optionalAttrs stdenv.isLinux ( + testers.testVersion { + package = ente-cli; + command = '' + env ENTE_CLI_CONFIG_PATH=$TMP \ + ENTE_CLI_SECRETS_PATH=$TMP/secrets \ + ente version + ''; + version = "Version cli-v${ente-cli.version}"; + } + ); + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "cli-(.+)" + ]; + }; + }; + + meta = { + description = "CLI client for downloading your data from Ente"; + longDescription = '' + The Ente CLI is a Command Line Utility for exporting data from Ente. It also does a few more things, for example, you can use it to decrypting the export from Ente Auth. + ''; + homepage = "https://github.com/ente-io/ente/tree/main/cli#readme"; + changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${version}"; + license = lib.licenses.agpl3Only; + maintainers = [ + lib.maintainers.zi3m5f + ]; + mainProgram = "ente"; + }; +} diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/by-name/en/entr/package.nix similarity index 100% rename from pkgs/tools/misc/entr/default.nix rename to pkgs/by-name/en/entr/package.nix diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/by-name/en/entt/package.nix similarity index 100% rename from pkgs/development/libraries/entt/default.nix rename to pkgs/by-name/en/entt/package.nix diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/by-name/en/entwine/package.nix similarity index 100% rename from pkgs/applications/graphics/entwine/default.nix rename to pkgs/by-name/en/entwine/package.nix diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/by-name/en/enum4linux-ng/package.nix similarity index 100% rename from pkgs/tools/security/enum4linux-ng/default.nix rename to pkgs/by-name/en/enum4linux-ng/package.nix diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/by-name/en/enum4linux/package.nix similarity index 100% rename from pkgs/tools/security/enum4linux/default.nix rename to pkgs/by-name/en/enum4linux/package.nix diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/by-name/en/enumer/package.nix similarity index 100% rename from pkgs/tools/misc/enumer/default.nix rename to pkgs/by-name/en/enumer/package.nix diff --git a/pkgs/tools/security/enumerepo/default.nix b/pkgs/by-name/en/enumerepo/package.nix similarity index 100% rename from pkgs/tools/security/enumerepo/default.nix rename to pkgs/by-name/en/enumerepo/package.nix diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/by-name/en/envconsul/package.nix similarity index 100% rename from pkgs/tools/system/envconsul/default.nix rename to pkgs/by-name/en/envconsul/package.nix diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/by-name/en/envfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/envfs/default.nix rename to pkgs/by-name/en/envfs/package.nix diff --git a/pkgs/by-name/en/envision-unwrapped/Cargo.lock b/pkgs/by-name/en/envision-unwrapped/Cargo.lock deleted file mode 100644 index 06e4c6ebff42..000000000000 --- a/pkgs/by-name/en/envision-unwrapped/Cargo.lock +++ /dev/null @@ -1,2712 +0,0 @@ -# This file is automatically @generated by Cargo. -# 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading 0.8.5", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", - "which", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cairo-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" -dependencies = [ - "bitflags 2.6.0", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -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 = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading 0.7.4", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dlopen2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "envision" -version = "0.1.0" -dependencies = [ - "anyhow", - "ash", - "gettext-rs", - "git2", - "gtk4", - "lazy_static", - "libadwaita", - "libmonado-rs", - "nix", - "openxr", - "relm4", - "relm4-components", - "reqwest", - "rusb", - "serde", - "serde_json", - "sha2", - "tokio", - "tracker", - "uuid", - "vte4", - "xdg", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "flagset" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "gio" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys 0.52.0", -] - -[[package]] -name = "git2" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "glib" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" -dependencies = [ - "bitflags 2.6.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "gtk4-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "io-lifetimes" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libadwaita" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" -dependencies = [ - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[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.17.0+1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.5", -] - -[[package]] -name = "libmonado-rs" -version = "0.1.0" -source = "git+https://github.com/technobaboo/libmonado-rs?rev=6edb1163627d87db9904c57d7ed9dd4dcc7228b7#6edb1163627d87db9904c57d7ed9dd4dcc7228b7" -dependencies = [ - "bindgen", - "cmake", - "convert_case", - "dlopen2", - "flagset", - "mint", - "semver", - "serde", - "serde_json", - "xdg", -] - -[[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 = "libusb1-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mint" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "openxr" -version = "0.18.0" -source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" -dependencies = [ - "libc", - "libloading 0.8.5", - "ndk-context", - "openxr-sys", -] - -[[package]] -name = "openxr-sys" -version = "0.10.0" -source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" -dependencies = [ - "libc", -] - -[[package]] -name = "pango" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "prettyplease" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "relm4" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0363f92b6a7eefd985b47f27b7ae168dd2fd5cd4013a338c9b111c33744d1f" -dependencies = [ - "flume", - "fragile", - "futures", - "gtk4", - "libadwaita", - "once_cell", - "relm4-css", - "relm4-macros", - "tokio", - "tracing", -] - -[[package]] -name = "relm4-components" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3d67f2982131c5e6047af4278d8fe750266767e57b58bc15f2e11e190eef36" -dependencies = [ - "once_cell", - "relm4", - "tracker", -] - -[[package]] -name = "relm4-css" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3b924557df1cddc687b60b313c4b76620fdbf0e463afa4b29f67193ccf37f9" - -[[package]] -name = "relm4-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5885640821d60062497737dd42fd04248d13c7ecccee620caaa4b210fe9905" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rusb" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" -dependencies = [ - "libc", - "libusb1-sys", -] - -[[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_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.23.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" -dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" - -[[package]] -name = "rustls-webpki" -version = "0.102.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" - -[[package]] -name = "serde" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "2.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "7.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - -[[package]] -name = "temp-dir" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -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.39.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.16", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.15", -] - -[[package]] -name = "toml_edit" -version = "0.22.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.16", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tracker" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5c98457ff700aaeefcd4a4a492096e78a2af1dd8523c66e94a3adb0fdbd415" -dependencies = [ - "tracker-macros", -] - -[[package]] -name = "tracker-macros" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc19eb2373ccf3d1999967c26c3d44534ff71ae5d8b9dacf78f4b13132229e48" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom", - "rand", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vte4" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7759016227e58e3239b8dca9c4a70086345844872b1f27cba0dba990fef5cb44" -dependencies = [ - "cairo-rs", - "gdk4", - "gio", - "glib", - "gtk4", - "io-lifetimes", - "libc", - "pango", - "vte4-sys", -] - -[[package]] -name = "vte4-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1aa57d29283c6eeac2e34c16791436275d254ac02b8590b02698feef197234" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "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]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 732af75ddd01..67182b638849 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -31,23 +31,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "envision-unwrapped"; - version = "0-unstable-2024-09-28"; + version = "0-unstable-2024-10-20"; src = fetchFromGitLab { owner = "gabmus"; repo = "envision"; - rev = "56d500a9f914ce2ddad038223711192e4d1dcbe1"; - hash = "sha256-8wU2sjhH026l6a11XZ5Qdu5x/EbI+ZqwE7AixsYMCFk="; + rev = "c40a4ad05a8e6ea99eed4a7d7d2098a08686e065"; + hash = "sha256-C/m5Hx52fFyuVI87EmHpe5YqjwDWoyveiXA0sJTt2NQ="; }; strictDeps = true; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "libmonado-rs-0.1.0" = "sha256-xztevBUaYBm5G3A0ZTb+3GV3g1IAU3SzfSS5BBqfp1Y="; - "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk="; - }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-I9UDCKrqU6TWcmHsSFwt1elplPwU+XTgyXiN2wtw5y0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 223d81992b7e..665206d44740 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -15,7 +15,7 @@ buildFHSEnv { pkgs: [ pkgs.envision-unwrapped ] ++ (with pkgs; [ - glibc + stdenv.cc.libc gcc ]) ++ ( @@ -24,7 +24,7 @@ buildFHSEnv { ) ++ ( # OpenComposite dependencies - pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost186 ] + pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ) ++ ( # Monado dependencies @@ -59,27 +59,12 @@ buildFHSEnv { [ pkgs.zlib ]) ++ ( # WiVRn dependencies - # TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged - (with pkgs; [ - avahi - cmake - cli11 - ffmpeg - git - gst_all_1.gstreamer - gst_all_1.gst-plugins-base + pkgs.wivrn.buildInputs + ++ pkgs.wivrn.nativeBuildInputs + ++ (with pkgs; [ + glib libmd - libdrm - libpulseaudio - libva ninja - nlohmann_json - openxr-loader - pipewire - systemdLibs # udev - vulkan-loader - vulkan-headers - x264 ]) ++ (with pkgs; [ android-tools # For adb installing WiVRn APKs @@ -93,11 +78,7 @@ buildFHSEnv { ''; extraInstallCommands = '' - mkdir -p $out/share/applications $out/share/metainfo - ln -s ${envision-unwrapped}/share/envision $out/share - ln -s ${envision-unwrapped}/share/icons $out/share - ln -s ${envision-unwrapped}/share/applications/org.gabmus.envision.desktop $out/share/applications - ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo + ln -s ${envision-unwrapped}/share $out/share ''; runScript = "envision"; diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/by-name/en/envsubst/package.nix similarity index 100% rename from pkgs/tools/misc/envsubst/default.nix rename to pkgs/by-name/en/envsubst/package.nix diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/by-name/en/envypn-font/package.nix similarity index 100% rename from pkgs/data/fonts/envypn-font/default.nix rename to pkgs/by-name/en/envypn-font/package.nix diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 43973562e986..527b8a6d72cd 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "45.4"; + version = "47.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz"; - hash = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4="; + hash = "sha256-217b9SJNdRJqe32O5OknKi8wqVMzHVuvbT88DODL3mY="; }; patches = [ diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/by-name/eo/eolie/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/eolie/default.nix rename to pkgs/by-name/eo/eolie/package.nix diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/by-name/eo/eos-installer/package.nix similarity index 100% rename from pkgs/applications/misc/eos-installer/default.nix rename to pkgs/by-name/eo/eos-installer/package.nix diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/by-name/eo/eot_utilities/package.nix similarity index 100% rename from pkgs/tools/misc/eot-utilities/default.nix rename to pkgs/by-name/eo/eot_utilities/package.nix diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/by-name/ep/epeg/package.nix similarity index 100% rename from pkgs/applications/graphics/epeg/default.nix rename to pkgs/by-name/ep/epeg/package.nix diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/by-name/ep/epgstation/epgstation.1 similarity index 100% rename from pkgs/applications/video/epgstation/epgstation.1 rename to pkgs/by-name/ep/epgstation/epgstation.1 diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/by-name/ep/epgstation/package.nix similarity index 100% rename from pkgs/applications/video/epgstation/default.nix rename to pkgs/by-name/ep/epgstation/package.nix diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/by-name/ep/epgstation/use-mysql-over-domain-socket.patch similarity index 100% rename from pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch rename to pkgs/by-name/ep/epgstation/use-mysql-over-domain-socket.patch diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/by-name/ep/ephemeral/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/ephemeral/default.nix rename to pkgs/by-name/ep/ephemeral/package.nix diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/by-name/ep/ephemeralpg/package.nix similarity index 100% rename from pkgs/development/tools/database/ephemeralpg/default.nix rename to pkgs/by-name/ep/ephemeralpg/package.nix diff --git a/pkgs/tools/system/epilys-bb/default.nix b/pkgs/by-name/ep/epilys-bb/package.nix similarity index 100% rename from pkgs/tools/system/epilys-bb/default.nix rename to pkgs/by-name/ep/epilys-bb/package.nix diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index 71fb93d8c0cf..435e81e065c4 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "46.3"; + version = "47.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-qeGtIGRJEX/F6+TQF3wdei/1A9a1UBkHKgaP8qsnhlY="; + hash = "sha256-NNr9g2OgmLRNR24umCO0y+puZq+tM7uhDtehP/GpZPE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/by-name/ep/eplot/package.nix similarity index 100% rename from pkgs/tools/graphics/eplot/default.nix rename to pkgs/by-name/ep/eplot/package.nix diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/by-name/ep/epm/package.nix similarity index 100% rename from pkgs/development/tools/misc/epm/default.nix rename to pkgs/by-name/ep/epm/package.nix diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/by-name/ep/epr/package.nix similarity index 100% rename from pkgs/applications/misc/epr/default.nix rename to pkgs/by-name/ep/epr/package.nix diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/by-name/ep/epson-201106w/package.nix similarity index 100% rename from pkgs/misc/drivers/epson-201106w/default.nix rename to pkgs/by-name/ep/epson-201106w/package.nix diff --git a/pkgs/misc/drivers/epson-201401w/fixbuild.patch b/pkgs/by-name/ep/epson-201401w/fixbuild.patch similarity index 100% rename from pkgs/misc/drivers/epson-201401w/fixbuild.patch rename to pkgs/by-name/ep/epson-201401w/fixbuild.patch diff --git a/pkgs/misc/drivers/epson-201401w/default.nix b/pkgs/by-name/ep/epson-201401w/package.nix similarity index 100% rename from pkgs/misc/drivers/epson-201401w/default.nix rename to pkgs/by-name/ep/epson-201401w/package.nix diff --git a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/pkgs/by-name/ep/epson-alc1100/cups-data-dir.patch similarity index 100% rename from pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch rename to pkgs/by-name/ep/epson-alc1100/cups-data-dir.patch diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/by-name/ep/epson-alc1100/package.nix similarity index 100% rename from pkgs/misc/drivers/epson-alc1100/default.nix rename to pkgs/by-name/ep/epson-alc1100/package.nix diff --git a/pkgs/misc/drivers/epson-alc1100/ppd.patch b/pkgs/by-name/ep/epson-alc1100/ppd.patch similarity index 100% rename from pkgs/misc/drivers/epson-alc1100/ppd.patch rename to pkgs/by-name/ep/epson-alc1100/ppd.patch diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/by-name/ep/epson-escpr/cups-filter-ppd-dirs.patch similarity index 100% rename from pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch rename to pkgs/by-name/ep/epson-escpr/cups-filter-ppd-dirs.patch diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/by-name/ep/epson-escpr/package.nix similarity index 100% rename from pkgs/misc/drivers/epson-escpr/default.nix rename to pkgs/by-name/ep/epson-escpr/package.nix diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix new file mode 100644 index 000000000000..75dd729f86db --- /dev/null +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + cups, + rpm, + cpio, +}: + +stdenv.mkDerivation rec { + pname = "epson-inkjet-printer-escpr2"; + version = "1.2.20"; + + src = fetchurl { + # To find the most recent version go to + # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php + # and retreive the download link for source package for x86 CPU + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/35/74/81cbf34af8c0fa4c59b4c1f4600173dfda822ee4/epson-inkjet-printer-escpr2-1.2.20-1.src.rpm"; + sha256 = "sha256-HBKAcHVOV+xO6IpFS1EyYyn4Ri4e5btBp/e50f3RoTA="; + }; + + unpackPhase = '' + runHook preUnpack + + rpm2cpio $src | cpio -idmv + tar xvf ${pname}-${version}-1.tar.gz + cd ${pname}-${version} + + runHook postUnpack + ''; + + buildInputs = [ cups ]; + nativeBuildInputs = [ + autoreconfHook + rpm + cpio + ]; + + configureFlags = [ + "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter" + "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model" + ]; + + meta = with lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "ESC/P-R 2 Driver (generic driver)"; + longDescription = '' + Epson Inkjet Printer Driver 2 (ESC/P-R 2) for Linux and the + corresponding PPD files. + + Refer to the description of epson-escpr for usage. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + ma9e + ma27 + shawn8901 + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix similarity index 100% rename from pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix rename to pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/by-name/ep/epson_201207w/package.nix similarity index 100% rename from pkgs/misc/drivers/epson_201207w/default.nix rename to pkgs/by-name/ep/epson_201207w/package.nix diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/by-name/ep/epstool/package.nix similarity index 100% rename from pkgs/tools/graphics/epstool/default.nix rename to pkgs/by-name/ep/epstool/package.nix diff --git a/pkgs/tools/text/epub2txt2/default.nix b/pkgs/by-name/ep/epub2txt2/package.nix similarity index 100% rename from pkgs/tools/text/epub2txt2/default.nix rename to pkgs/by-name/ep/epub2txt2/package.nix diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/by-name/ep/epubcheck/package.nix similarity index 100% rename from pkgs/tools/text/epubcheck/default.nix rename to pkgs/by-name/ep/epubcheck/package.nix diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/by-name/eq/eq10q/package.nix similarity index 100% rename from pkgs/applications/audio/eq10q/default.nix rename to pkgs/by-name/eq/eq10q/package.nix diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index dd5688115b09..27658012b324 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; patches = @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Custom Discord App aiming to give you better performance and improve linux support"; homepage = "https://github.com/Equicord/Equibop"; - changelog = "https://github.com/Equicord/Equibop/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/Equicord/Equibop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.NotAShelf diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/by-name/eq/equilux-theme/package.nix similarity index 100% rename from pkgs/data/themes/equilux-theme/default.nix rename to pkgs/by-name/eq/equilux-theme/package.nix diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/by-name/er/er-patcher/package.nix similarity index 100% rename from pkgs/tools/games/er-patcher/default.nix rename to pkgs/by-name/er/er-patcher/package.nix diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/by-name/er/erdtree/package.nix similarity index 100% rename from pkgs/tools/system/erdtree/default.nix rename to pkgs/by-name/er/erdtree/package.nix diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/by-name/er/eresi/package.nix similarity index 100% rename from pkgs/development/tools/analysis/eresi/default.nix rename to pkgs/by-name/er/eresi/package.nix diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix new file mode 100644 index 000000000000..853451f18c2e --- /dev/null +++ b/pkgs/by-name/er/erg/package.nix @@ -0,0 +1,66 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, python3 +, which +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "erg"; + version = "0.6.47"; + + src = fetchFromGitHub { + owner = "erg-lang"; + repo = "erg"; + rev = "v${version}"; + hash = "sha256-DcoADVQGiCjPgawMLSvH5tCnOCHmykazsRoF1UXbPNs="; + }; + + cargoHash = "sha256-Uzv+hSarIAXRXDZ3sa3zd3Xdo8ZVrDCP+72cAlJOyvw="; + + nativeBuildInputs = [ + makeWrapper + python3 + which + ]; + + buildFeatures = [ "full" ]; + + env = { + BUILD_DATE = "1970/01/01 00:00:00"; + CASE_SENSITIVE = lib.boolToString (!stdenv.hostPlatform.isDarwin); + GIT_HASH_SHORT = src.rev; + }; + + # TODO(figsoda): fix tests + doCheck = false; + + # the build script is impure and also assumes we are in a git repository + postPatch = '' + rm crates/erg_common/build.rs + ''; + + preBuild = '' + export HOME=$(mktemp -d) + export CARGO_ERG_PATH=$HOME/.erg + ''; + + postInstall = '' + mkdir -p $out/share + mv "$CARGO_ERG_PATH" $out/share/erg + + wrapProgram $out/bin/erg \ + --set-default ERG_PATH $out/share/erg + ''; + + meta = with lib; { + description = "Statically typed language that can deeply improve the Python ecosystem"; + mainProgram = "erg"; + homepage = "https://github.com/erg-lang/erg"; + changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/by-name/er/ergo/package.nix similarity index 100% rename from pkgs/applications/blockchains/ergo/default.nix rename to pkgs/by-name/er/ergo/package.nix diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/by-name/er/ergochat/package.nix similarity index 100% rename from pkgs/servers/irc/ergochat/default.nix rename to pkgs/by-name/er/ergochat/package.nix diff --git a/pkgs/applications/science/chemistry/ergoscf/math-constants.patch b/pkgs/by-name/er/ergoscf/math-constants.patch similarity index 100% rename from pkgs/applications/science/chemistry/ergoscf/math-constants.patch rename to pkgs/by-name/er/ergoscf/math-constants.patch diff --git a/pkgs/applications/science/chemistry/ergoscf/default.nix b/pkgs/by-name/er/ergoscf/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/ergoscf/default.nix rename to pkgs/by-name/er/ergoscf/package.nix diff --git a/pkgs/applications/misc/ericw-tools/default.nix b/pkgs/by-name/er/ericw-tools/package.nix similarity index 100% rename from pkgs/applications/misc/ericw-tools/default.nix rename to pkgs/by-name/er/ericw-tools/package.nix diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/by-name/er/erigon/package.nix similarity index 100% rename from pkgs/applications/blockchains/erigon/default.nix rename to pkgs/by-name/er/erigon/package.nix diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix new file mode 100644 index 000000000000..33a8f8a7d1be --- /dev/null +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + fetchurl, + autoPatchelfHook, +}: +let + arch = if stdenv.isAarch64 then "aarch64" else "x86_64"; + release = + if stdenv.isDarwin then "macos-${arch}-apple-darwin" else "linux-${arch}-unknown-linux-gnu"; + + hashes = { + linux-aarch64-unknown-linux-gnu = "sha256-vWMrq/uFU/uyuDnsxZK0ZyvtraVCZwvGjzO1a5QjR8g="; + linux-x86_64-unknown-linux-gnu = "sha256-iE/zH6M51C6sFZrsUMwZTQ0+hzfpRFJtiKh3MS9bDto="; + macos-aarch64-apple-darwin = "sha256-55LSChvO0wRHGL0H29MLy/JW8V52GFr3z/qoxdIPun0="; + macos-x86_64-apple-darwin = "sha256-l9bzQ5z9hQ/N2dOkAjPAU4OfRbLCUoRt1eQB6EZE0NI="; + }; +in +stdenv.mkDerivation rec { + pname = "erlang-language-platform"; + version = "2024-07-16"; + + src = fetchurl { + url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz"; + hash = hashes.${release}; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + install -m755 -D elp $out/bin/elp + runHook postInstall + ''; + + meta = { + description = "An IDE-first library for the semantic analysis of Erlang code, including LSP server, linting and refactoring tools."; + homepage = "https://github.com/WhatsApp/erlang-language-platform/"; + license = with lib.licenses; [ + mit + asl20 + ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + maintainers = with lib.maintainers; [ offsetcyan ]; + }; +} diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/by-name/er/erofs-utils/package.nix similarity index 100% rename from pkgs/tools/filesystems/erofs-utils/default.nix rename to pkgs/by-name/er/erofs-utils/package.nix diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/by-name/er/erosmb/package.nix similarity index 100% rename from pkgs/tools/security/erosmb/default.nix rename to pkgs/by-name/er/erosmb/package.nix diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/by-name/er/errbot/package.nix similarity index 100% rename from pkgs/applications/networking/errbot/default.nix rename to pkgs/by-name/er/errbot/package.nix diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/by-name/er/errcheck/package.nix similarity index 100% rename from pkgs/development/tools/errcheck/default.nix rename to pkgs/by-name/er/errcheck/package.nix diff --git a/pkgs/shells/es/default.nix b/pkgs/by-name/es/es/package.nix similarity index 100% rename from pkgs/shells/es/default.nix rename to pkgs/by-name/es/es/package.nix diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/by-name/es/eschalot/package.nix similarity index 100% rename from pkgs/tools/security/eschalot/default.nix rename to pkgs/by-name/es/eschalot/package.nix diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/by-name/es/escrotum/package.nix similarity index 100% rename from pkgs/tools/graphics/escrotum/default.nix rename to pkgs/by-name/es/escrotum/package.nix diff --git a/pkgs/os-specific/linux/esdm/default.nix b/pkgs/by-name/es/esdm/package.nix similarity index 100% rename from pkgs/os-specific/linux/esdm/default.nix rename to pkgs/by-name/es/esdm/package.nix diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/by-name/es/esh/package.nix similarity index 100% rename from pkgs/tools/text/esh/default.nix rename to pkgs/by-name/es/esh/package.nix diff --git a/pkgs/applications/office/espanso/Cargo.lock b/pkgs/by-name/es/espanso/Cargo.lock similarity index 100% rename from pkgs/applications/office/espanso/Cargo.lock rename to pkgs/by-name/es/espanso/Cargo.lock diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix new file mode 100644 index 000000000000..4e4e27f749fc --- /dev/null +++ b/pkgs/by-name/es/espanso/package.nix @@ -0,0 +1,138 @@ +{ lib +, coreutils +, fetchFromGitHub +, rustPlatform +, pkg-config +, extra-cmake-modules +, dbus +, libX11 +, libXi +, libXtst +, libnotify +, libxkbcommon +, openssl +, xclip +, xdotool +, setxkbmap +, wl-clipboard +, wxGTK32 +, makeWrapper +, stdenv +, apple-sdk_11 +, darwinMinVersionHook +, waylandSupport ? false +, x11Support ? stdenv.hostPlatform.isLinux +, testers +, espanso +}: +# espanso does not support building with both X11 and Wayland support at the same time +assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport; +assert stdenv.hostPlatform.isDarwin -> !x11Support; +assert stdenv.hostPlatform.isDarwin -> !waylandSupport; +rustPlatform.buildRustPackage rec { + pname = "espanso"; + version = "2.2-unstable-2024-05-14"; + + src = fetchFromGitHub { + owner = "espanso"; + repo = "espanso"; + rev = "8daadcc949c35a7b7aa20b7f544fdcff83e2c5f7"; + hash = "sha256-4MArENBmX6tDVLZE1O8cuJe7A0R+sLZoxBkDvIwIVZ4="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU="; + }; + }; + + nativeBuildInputs = [ + extra-cmake-modules + pkg-config + makeWrapper + wxGTK32 + ]; + + # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4 + buildNoDefaultFeatures = true; + buildFeatures = [ + "modulo" + ] ++ lib.optionals waylandSupport [ + "wayland" + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + "vendored-tls" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "native-tls" + ]; + + buildInputs = [ + wxGTK32 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + openssl + dbus + libnotify + libxkbcommon + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + (darwinMinVersionHook "10.13") + ] ++ lib.optionals waylandSupport [ + wl-clipboard + ] ++ lib.optionals x11Support [ + libXi + libXtst + libX11 + xclip + xdotool + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace scripts/create_bundle.sh \ + --replace-fail target/mac/ $out/Applications/ \ + --replace-fail /bin/echo ${coreutils}/bin/echo + patchShebangs scripts/create_bundle.sh + substituteInPlace espanso/src/res/macos/Info.plist \ + --replace-fail "espanso" "${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso" + substituteInPlace espanso/src/path/macos.rs espanso/src/path/linux.rs \ + --replace-fail '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' + ''; + + # Some tests require networking + doCheck = false; + + postInstall = + if stdenv.hostPlatform.isDarwin then '' + EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh + '' else '' + wrapProgram $out/bin/espanso \ + --prefix PATH : ${lib.makeBinPath ( + lib.optionals stdenv.hostPlatform.isLinux [ + libnotify + setxkbmap + ] ++ lib.optionals waylandSupport [ + wl-clipboard + ] ++ lib.optionals x11Support [ + xclip + ] + )} + ''; + + passthru.tests.version = testers.testVersion { + package = espanso; + # remove when updating to a release version + version = "2.2.1"; + }; + + meta = with lib; { + description = "Cross-platform Text Expander written in Rust"; + mainProgram = "espanso"; + homepage = "https://espanso.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kimat pyrox0 n8henrie ]; + platforms = platforms.unix; + + longDescription = '' + Espanso detects when you type a keyword and replaces it while you're typing. + ''; + }; +} diff --git a/pkgs/applications/accessibility/espeakup/default.nix b/pkgs/by-name/es/espeakup/package.nix similarity index 100% rename from pkgs/applications/accessibility/espeakup/default.nix rename to pkgs/by-name/es/espeakup/package.nix diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/by-name/es/esptool-ck/package.nix similarity index 100% rename from pkgs/tools/misc/esptool-ck/default.nix rename to pkgs/by-name/es/esptool-ck/package.nix diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/by-name/es/esptool/package.nix similarity index 100% rename from pkgs/tools/misc/esptool/default.nix rename to pkgs/by-name/es/esptool/package.nix diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix new file mode 100644 index 000000000000..f584e3486e4f --- /dev/null +++ b/pkgs/by-name/es/espup/package.nix @@ -0,0 +1,77 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, bzip2 +, openssl +, xz +, zstd +, stdenv +, darwin +, testers +, espup +}: + +rustPlatform.buildRustPackage rec { + pname = "espup"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "esp-rs"; + repo = "espup"; + rev = "v${version}"; + hash = "sha256-okB8K0ly3MvnkVve41eT0SNr5dPn5E5QXewqLHGL/Tc="; + }; + + cargoHash = "sha256-n2tLG3logtc73Ut/R1UGuLSm7MpZ4Bxp/08SOhGL+80="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + bzip2 + openssl + xz + zstd + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkFlags = [ + # makes network calls + "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd espup \ + --bash <($out/bin/espup completions bash) \ + --fish <($out/bin/espup completions fish) \ + --zsh <($out/bin/espup completions zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = espup; + }; + + meta = with lib; { + description = "Tool for installing and maintaining Espressif Rust ecosystem"; + homepage = "https://github.com/esp-rs/espup/"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ knightpp beeb ]; + mainProgram = "espup"; + }; +} diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/by-name/es/essentia-extractor/package.nix similarity index 100% rename from pkgs/tools/audio/essentia-extractor/default.nix rename to pkgs/by-name/es/essentia-extractor/package.nix diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/by-name/es/esshader/package.nix similarity index 100% rename from pkgs/tools/graphics/esshader/default.nix rename to pkgs/by-name/es/esshader/package.nix diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/by-name/es/est-sfs/package.nix similarity index 100% rename from pkgs/applications/science/biology/est-sfs/default.nix rename to pkgs/by-name/es/est-sfs/package.nix diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/by-name/et/et/package.nix similarity index 100% rename from pkgs/applications/misc/et/default.nix rename to pkgs/by-name/et/et/package.nix diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/by-name/et/etBook/package.nix similarity index 100% rename from pkgs/data/fonts/et-book/default.nix rename to pkgs/by-name/et/etBook/package.nix diff --git a/pkgs/servers/etebase/default.nix b/pkgs/by-name/et/etebase-server/package.nix similarity index 100% rename from pkgs/servers/etebase/default.nix rename to pkgs/by-name/et/etebase-server/package.nix diff --git a/pkgs/servers/etebase/secret.patch b/pkgs/by-name/et/etebase-server/secret.patch similarity index 100% rename from pkgs/servers/etebase/secret.patch rename to pkgs/by-name/et/etebase-server/secret.patch diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix new file mode 100644 index 000000000000..c580d02a794f --- /dev/null +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gflags +, libsodium +, openssl +, protobuf +, zlib +, catch2 +, darwin +}: + +stdenv.mkDerivation rec { + pname = "eternal-terminal"; + version = "6.2.9"; + + src = fetchFromGitHub { + owner = "MisterTea"; + repo = "EternalTerminal"; + rev = "refs/tags/et-v${version}"; + hash = "sha256-vukh3a6SxHaVCT4hmoVt4hEGB8Sqylu53Nz8fgBWkTM"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gflags + libsodium + openssl + protobuf + zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil + ]; + + preBuild = '' + mkdir -p ../external_imported/Catch2/single_include/catch2 + cp ${catch2}/include/catch2/catch.hpp ../external_imported/Catch2/single_include/catch2/catch.hpp + ''; + + cmakeFlags = [ + "-DDISABLE_VCPKG=TRUE" + "-DDISABLE_SENTRY=TRUE" + "-DDISABLE_CRASH_LOG=TRUE" + ]; + + CXXFLAGS = lib.optionals stdenv.cc.isClang [ + "-std=c++17" + ]; + + doCheck = true; + + meta = with lib; { + description = "Remote shell that automatically reconnects without interrupting the session"; + homepage = "https://eternalterminal.dev/"; + changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ dezgeg jshort ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/games/doom-ports/eternity-engine/default.nix b/pkgs/by-name/et/eternity/package.nix similarity index 100% rename from pkgs/games/doom-ports/eternity-engine/default.nix rename to pkgs/by-name/et/eternity/package.nix diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/by-name/et/etesync-dav/package.nix similarity index 100% rename from pkgs/applications/misc/etesync-dav/default.nix rename to pkgs/by-name/et/etesync-dav/package.nix diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/by-name/et/ethash/package.nix similarity index 100% rename from pkgs/development/libraries/ethash/default.nix rename to pkgs/by-name/et/ethash/package.nix diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/by-name/et/etherape/package.nix similarity index 100% rename from pkgs/applications/networking/sniffers/etherape/default.nix rename to pkgs/by-name/et/etherape/package.nix diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/by-name/et/ethq/package.nix similarity index 100% rename from pkgs/os-specific/linux/ethq/default.nix rename to pkgs/by-name/et/ethq/package.nix diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/by-name/et/ethtool/package.nix similarity index 100% rename from pkgs/tools/misc/ethtool/default.nix rename to pkgs/by-name/et/ethtool/package.nix diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/by-name/et/ets/package.nix similarity index 100% rename from pkgs/tools/misc/ets/default.nix rename to pkgs/by-name/et/ets/package.nix diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/by-name/et/ettercap/package.nix similarity index 100% rename from pkgs/applications/networking/sniffers/ettercap/default.nix rename to pkgs/by-name/et/ettercap/package.nix diff --git a/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/pkgs/by-name/eu/eukleides/gs-allowpstransparency.patch similarity index 100% rename from pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch rename to pkgs/by-name/eu/eukleides/gs-allowpstransparency.patch diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/by-name/eu/eukleides/package.nix similarity index 100% rename from pkgs/applications/science/math/eukleides/default.nix rename to pkgs/by-name/eu/eukleides/package.nix diff --git a/pkgs/applications/science/math/eukleides/use-CC.patch b/pkgs/by-name/eu/eukleides/use-CC.patch similarity index 100% rename from pkgs/applications/science/math/eukleides/use-CC.patch rename to pkgs/by-name/eu/eukleides/use-CC.patch diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/by-name/eu/eunomia/package.nix similarity index 100% rename from pkgs/data/fonts/eunomia/default.nix rename to pkgs/by-name/eu/eunomia/package.nix diff --git a/pkgs/games/doom-ports/eureka-editor/default.nix b/pkgs/by-name/eu/eureka-editor/package.nix similarity index 100% rename from pkgs/games/doom-ports/eureka-editor/default.nix rename to pkgs/by-name/eu/eureka-editor/package.nix diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/by-name/ev/eva/package.nix similarity index 100% rename from pkgs/tools/misc/eva/default.nix rename to pkgs/by-name/ev/eva/package.nix diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/by-name/ev/evans/package.nix similarity index 100% rename from pkgs/development/tools/evans/default.nix rename to pkgs/by-name/ev/evans/package.nix diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix new file mode 100644 index 000000000000..11809da781a6 --- /dev/null +++ b/pkgs/by-name/ev/evcc/package.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchNpmDeps +, cacert +, git +, go +, enumer +, mockgen +, nodejs +, npmHooks +, nix-update-script +, nixosTests +}: + +buildGoModule rec { + pname = "evcc"; + version = "0.131.4"; + + src = fetchFromGitHub { + owner = "evcc-io"; + repo = "evcc"; + rev = version; + hash = "sha256-sU5h29sXz1am44iFGNrVfMzrI1aAc/m355Aevm81sQc="; + }; + + vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ="; + + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-4PBlN2pbr7dzZNQzh/P0kBlsg6ut2XPwsfFB132hWO0="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + overrideModAttrs = _: { + nativeBuildInputs = [ + enumer + go + git + cacert + mockgen + ]; + + preBuild = '' + make assets + ''; + }; + + tags = [ + "release" + "test" + ]; + + ldflags = [ + "-X github.com/evcc-io/evcc/server.Version=${version}" + "-X github.com/evcc-io/evcc/server.Commit=${src.rev}" + "-s" + "-w" + ]; + + preBuild = '' + make ui + ''; + + doCheck = !stdenv.hostPlatform.isDarwin; # darwin sandbox limitations around network access, access to /etc/protocols and likely more + + checkFlags = let + skippedTests = [ + # network access + "TestOctopusConfigParse" + "TestTemplates" + "TestOcpp" + ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; + + passthru = { + tests = { + inherit (nixosTests) evcc; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "EV Charge Controller"; + homepage = "https://evcc.io"; + changelog = "https://github.com/evcc-io/evcc/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/by-name/ev/evdev-proto/package.nix similarity index 100% rename from pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix rename to pkgs/by-name/ev/evdev-proto/package.nix diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/by-name/ev/evdevremapkeys/package.nix similarity index 100% rename from pkgs/tools/inputmethods/evdevremapkeys/default.nix rename to pkgs/by-name/ev/evdevremapkeys/package.nix diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/by-name/ev/evemu/package.nix similarity index 100% rename from pkgs/tools/system/evemu/default.nix rename to pkgs/by-name/ev/evemu/package.nix diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/by-name/ev/eventlog/package.nix similarity index 100% rename from pkgs/development/libraries/eventlog/default.nix rename to pkgs/by-name/ev/eventlog/package.nix diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/by-name/ev/eventstat/package.nix similarity index 100% rename from pkgs/os-specific/linux/eventstat/default.nix rename to pkgs/by-name/ev/eventstat/package.nix diff --git a/pkgs/by-name/ev/everspace/package.nix b/pkgs/by-name/ev/everspace/package.nix new file mode 100644 index 000000000000..3d5ddad7b8c6 --- /dev/null +++ b/pkgs/by-name/ev/everspace/package.nix @@ -0,0 +1,118 @@ +{ + # Packaging Dependencies + lib, stdenv, requireFile, autoPatchelfHook, unzip, copyDesktopItems, makeDesktopItem, + + # Everspace Dependencies + cairo, gdk-pixbuf, pango, gtk2-x11, libGL, openal, + + # Unreal Engine 4 Dependencies + xorg +}: + +# Known issues: +# - Video playback (upon starting a new game) does not work (screen is black) +stdenv.mkDerivation rec { + pname = "everspace"; + version = "1.3.5.3655"; + + src = requireFile { + name = "everspace_1_3_5_3655_32896.sh"; + url = "https://www.gog.com/"; + sha256 = "0jlvxq14k1pxmbr08y8kar0ijlqxcnkfqlvw883j96v9zr34ynj3"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + unzip + ]; + + buildInputs = [ + cairo + gdk-pixbuf + pango + gtk2-x11 + openal + (lib.getLib stdenv.cc.cc) + ]; + + runtimeDependencies = [ + libGL + + # ue4 + xorg.libX11 + xorg.libXScrnSaver + xorg.libXau + xorg.libXcursor + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXxf86vm + xorg.libxcb + ]; + + unpackPhase = '' + runHook preUnpack + + # The shell script contains a zip file. Unzipping it works but will result + # in some error output and an error exit code. + unzip "$src" || true + + runHook postUnpack + ''; + + postPatch = '' + ## Remove Bundled Libs ## + + # vlc libs + # + # TODO: This is probably what breaks video playback. It would be cleaner + # to remove the bundled libs and replace them with system libs but there + # are so many. Copy-pasting the list from the vlc package is a good start + # but still leaves us with many unresolved dependencies. + rm -rf ./data/noarch/game/RSG/Plugins/VlcMedia + + # openal + rm -rf ./data/noarch/game/Engine/Binaries/ThirdParty/OpenAL + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/opt" + cp -r "./data/noarch" "$out/opt/everspace" + + mkdir -p "$out/bin" + ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace" + + mkdir -p "$out/share/pixmaps" + ln -s "$out/opt/everspace/support/icon.png" "$out/share/pixmaps/everspace-gog.png" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "everspace-gog"; + desktopName = "EVERSPACE™"; + comment = meta.description; + exec = "everspace"; + icon = "everspace-gog"; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + description = "Action-focused single-player space shooter with roguelike elements"; + homepage = "https://classic.everspace-game.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ jtrees ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/evhz/default.nix b/pkgs/by-name/ev/evhz/package.nix similarity index 100% rename from pkgs/tools/misc/evhz/default.nix rename to pkgs/by-name/ev/evhz/package.nix diff --git a/pkgs/tools/security/evil-winrm/Gemfile b/pkgs/by-name/ev/evil-winrm/Gemfile similarity index 100% rename from pkgs/tools/security/evil-winrm/Gemfile rename to pkgs/by-name/ev/evil-winrm/Gemfile diff --git a/pkgs/tools/security/evil-winrm/Gemfile.lock b/pkgs/by-name/ev/evil-winrm/Gemfile.lock similarity index 100% rename from pkgs/tools/security/evil-winrm/Gemfile.lock rename to pkgs/by-name/ev/evil-winrm/Gemfile.lock diff --git a/pkgs/tools/security/evil-winrm/gemset.nix b/pkgs/by-name/ev/evil-winrm/gemset.nix similarity index 100% rename from pkgs/tools/security/evil-winrm/gemset.nix rename to pkgs/by-name/ev/evil-winrm/gemset.nix diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/by-name/ev/evil-winrm/package.nix similarity index 100% rename from pkgs/tools/security/evil-winrm/default.nix rename to pkgs/by-name/ev/evil-winrm/package.nix diff --git a/pkgs/by-name/ev/evillimiter/package.nix b/pkgs/by-name/ev/evillimiter/package.nix new file mode 100644 index 000000000000..9f4fb0bfc2f4 --- /dev/null +++ b/pkgs/by-name/ev/evillimiter/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + iproute2, + iptables, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "evillimiter"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bitbrute"; + repo = "evillimiter"; + rev = "refs/tags/v${version}"; + hash = "sha256-h6BReZcDW2UYaYYVQVgV0T91/+CsGuZf+J+boUhjCtA="; + }; + + build-system = with python3Packages; [ setuptools-scm ]; + + dependencies = with python3Packages; [ + colorama + iproute2 + iptables + netaddr + netifaces + scapy + terminaltables + tqdm + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Tool that monitors, analyzes and limits the bandwidth"; + longDescription = '' + A tool to monitor, analyze and limit the bandwidth (upload/download) of + devices on your local network without physical or administrative access. + evillimiter employs ARP spoofing and traffic shaping to throttle the + bandwidth of hosts on the network. + ''; + homepage = "https://github.com/bitbrute/evillimiter"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "evillimiter"; + }; +} diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/by-name/ev/evmdis/package.nix similarity index 100% rename from pkgs/development/tools/analysis/evmdis/default.nix rename to pkgs/by-name/ev/evmdis/package.nix diff --git a/pkgs/by-name/ev/evolution-data-server/fix-paths.patch b/pkgs/by-name/ev/evolution-data-server/fix-paths.patch deleted file mode 100644 index 334235516591..000000000000 --- a/pkgs/by-name/ev/evolution-data-server/fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/calendar/libecal/e-cal-system-timezone.c -+++ b/src/calendar/libecal/e-cal-system-timezone.c -@@ -26,7 +26,7 @@ - #ifdef HAVE_SOLARIS - #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" - #else --#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" -+#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo" - #endif - - #define ETC_TIMEZONE "/etc/timezone" diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index a98612382f1f..6ef66f2c3cb6 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -128,10 +128,10 @@ index e85a56b..59d3fe2 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 5b4debf..77c8d9c 100644 +index 3ab8908..6c4b210 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void) +@@ -146,7 +146,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -242,10 +242,10 @@ index a83d3d3..dc7acac 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index e0e9169..a44f52c 100644 +index f19ab22..abd3263 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void) +@@ -158,7 +158,18 @@ ecmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -265,7 +265,7 @@ index e0e9169..a44f52c 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2627,7 +2638,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2629,7 +2640,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -312,10 +312,10 @@ index d5a0823..2ae03f8 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index cceba4a..d3c4da6 100644 +index 4c10de7..6c0ab5e 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void) +@@ -744,7 +744,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -361,7 +361,7 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 56429a9..a9cc62c 100644 +index 396cf39..e31dc1a 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) @@ -385,10 +385,10 @@ index 56429a9..a9cc62c 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index 6556f1e..90f0a5e 100644 +index 38bedb6..f799c29 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c -@@ -1471,7 +1471,18 @@ smtp_helo (CamelSmtpTransport *transport, +@@ -1472,7 +1472,18 @@ smtp_helo (CamelSmtpTransport *transport, transport->authtypes = NULL; } @@ -433,7 +433,7 @@ index 188f276..939f89b 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index 1453410..a3f06b0 100644 +index 9624d86..6baa019 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c @@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service, @@ -457,7 +457,7 @@ index 1453410..a3f06b0 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 734f194..5b05077 100644 +index 7342577..915d8bd 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c @@ -75,7 +75,18 @@ eos_outlook_read_settings (EOAuth2Service *service, @@ -481,7 +481,7 @@ index 734f194..5b05077 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 3a9ce9c..f96b840 100644 +index 3738359..f9ce2d9 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, @@ -505,7 +505,7 @@ index 3a9ce9c..f96b840 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index af59b0b..0c7e75e 100644 +index 29c1dd2..84d42b7 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c @@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service, diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 8dc34e210948..1bddb3481aab 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, substituteAll , pkg-config , gnome , _experimental-update-script-combinators @@ -13,7 +12,6 @@ , libsecret , icu , sqlite -, tzdata , libcanberra-gtk3 , p11-kit , db @@ -40,6 +38,7 @@ , withGtk3 ? true , withGtk4 ? false , libphonenumber +, libuuid , gnome-online-accounts , libgweather , boost @@ -50,21 +49,16 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.52.4"; + version = "3.54.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc="; + hash = "sha256-JbM2xIprq8NjIdiAlLOCrq8Yq8urSpQ4s//5DCnhBa4="; }; patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - # Avoid using wrapper function, which the hardcode gsettings # patch generator cannot handle. ./drop-tentative-settings-constructor.patch @@ -104,6 +98,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 pcre libphonenumber + libuuid boost protobuf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -184,6 +179,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.unix; + platforms = platforms.linux; # requires libuuid }; } diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/by-name/ev/evscript/package.nix similarity index 100% rename from pkgs/tools/inputmethods/evscript/default.nix rename to pkgs/by-name/ev/evscript/package.nix diff --git a/pkgs/tools/inputmethods/evsieve/default.nix b/pkgs/by-name/ev/evsieve/package.nix similarity index 100% rename from pkgs/tools/inputmethods/evsieve/default.nix rename to pkgs/by-name/ev/evsieve/package.nix diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/by-name/ev/evtest/package.nix similarity index 100% rename from pkgs/applications/misc/evtest/default.nix rename to pkgs/by-name/ev/evtest/package.nix diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix new file mode 100644 index 000000000000..25a9d5ff1cca --- /dev/null +++ b/pkgs/by-name/ev/evtx/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "evtx"; + version = "0.8.4"; + + src = fetchFromGitHub { + owner = "omerbenamram"; + repo = "evtx"; + rev = "refs/tags/v${version}"; + hash = "sha256-ljEuFsLOwydLbx1DprJdBTL3cjFkhmuwr34da8LzG88="; + }; + + cargoHash = "sha256-PZTB53DbUlyACS2wWmgVUQVz6EXb02GUogO3ClY678I="; + + postPatch = '' + # CLI tests will fail in the sandbox + rm tests/test_cli_interactive.rs + ''; + + meta = with lib; { + description = "Parser for the Windows XML Event Log (EVTX) format"; + homepage = "https://github.com/omerbenamram/evtx"; + changelog = "https://github.com/omerbenamram/evtx/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ fab ]; + mainProgram = "evtx_dump"; + }; +} diff --git a/pkgs/servers/networking/exabgp/default.nix b/pkgs/by-name/ex/exabgp/package.nix similarity index 100% rename from pkgs/servers/networking/exabgp/default.nix rename to pkgs/by-name/ex/exabgp/package.nix diff --git a/pkgs/applications/audio/exact-audio-copy/default.nix b/pkgs/by-name/ex/exactaudiocopy/package.nix similarity index 100% rename from pkgs/applications/audio/exact-audio-copy/default.nix rename to pkgs/by-name/ex/exactaudiocopy/package.nix diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/by-name/ex/exaile/package.nix similarity index 100% rename from pkgs/applications/audio/exaile/default.nix rename to pkgs/by-name/ex/exaile/package.nix diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/by-name/ex/exempi/package.nix similarity index 100% rename from pkgs/development/libraries/exempi/default.nix rename to pkgs/by-name/ex/exempi/package.nix diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/by-name/ex/exercism/package.nix similarity index 100% rename from pkgs/applications/misc/exercism/default.nix rename to pkgs/by-name/ex/exercism/package.nix diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/by-name/ex/exfat/package.nix similarity index 100% rename from pkgs/tools/filesystems/exfat/default.nix rename to pkgs/by-name/ex/exfat/package.nix diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/by-name/ex/exfatprogs/package.nix similarity index 100% rename from pkgs/tools/filesystems/exfatprogs/default.nix rename to pkgs/by-name/ex/exfatprogs/package.nix diff --git a/pkgs/development/tools/exhaustive/default.nix b/pkgs/by-name/ex/exhaustive/package.nix similarity index 100% rename from pkgs/development/tools/exhaustive/default.nix rename to pkgs/by-name/ex/exhaustive/package.nix diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/by-name/ex/exif/package.nix similarity index 100% rename from pkgs/tools/graphics/exif/default.nix rename to pkgs/by-name/ex/exif/package.nix diff --git a/pkgs/tools/graphics/exifprobe/default.nix b/pkgs/by-name/ex/exifprobe/package.nix similarity index 100% rename from pkgs/tools/graphics/exifprobe/default.nix rename to pkgs/by-name/ex/exifprobe/package.nix diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/by-name/ex/exiftags/package.nix similarity index 100% rename from pkgs/tools/graphics/exiftags/default.nix rename to pkgs/by-name/ex/exiftags/package.nix diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/by-name/ex/exim/package.nix similarity index 100% rename from pkgs/servers/mail/exim/default.nix rename to pkgs/by-name/ex/exim/package.nix diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/by-name/ex/exiv2/package.nix similarity index 100% rename from pkgs/development/libraries/exiv2/default.nix rename to pkgs/by-name/ex/exiv2/package.nix diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index a346ef87102f..c1e03405b4fa 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2024-10-29"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "82a708f974b9a720e127c38a383f22e129be6373"; - hash = "sha256-BhhcYOipdLAviTzWRdNLMMPiND4mYv9Mkn8/yxo0vXY="; + rev = "50a1b171f64a75594793147aa39db933ef38aed9"; + hash = "sha256-hzguPEQDTKBWe8Um+pwJpsctPbQqA6QW5LGknKWFaKo="; }; build-system = with python3Packages; [ setuptools ]; @@ -29,8 +29,6 @@ python3Packages.buildPythonApplication { blobfile grpcio grpcio-tools - hf-transfer - huggingface-hub jinja2 netifaces numpy @@ -39,13 +37,11 @@ python3Packages.buildPythonApplication { prometheus-client protobuf psutil + pydantic requests rich safetensors - tailscale tenacity - tiktoken - tokenizers tqdm transformers tinygrad diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix index b301e4e26cd8..09759bb7e5ff 100644 --- a/pkgs/by-name/ex/exodus/package.nix +++ b/pkgs/by-name/ex/exodus/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "exodus"; - version = "24.19.4"; + version = "24.41.3"; src = requireFile { name = "exodus-linux-x64-${finalAttrs.version}.zip"; url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip"; - hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw="; + hash = "sha256-cq8vHE/wAGRu20F3N3q9F+JXLV8VgGbo5JE9Q2OFuMw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/by-name/ex/exonerate/package.nix similarity index 100% rename from pkgs/applications/science/biology/exonerate/default.nix rename to pkgs/by-name/ex/exonerate/package.nix diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/by-name/ex/exoscale-cli/package.nix similarity index 100% rename from pkgs/tools/admin/exoscale-cli/default.nix rename to pkgs/by-name/ex/exoscale-cli/package.nix diff --git a/pkgs/build-support/expand-response-params/expand-response-params.c b/pkgs/by-name/ex/expand-response-params/expand-response-params.c similarity index 100% rename from pkgs/build-support/expand-response-params/expand-response-params.c rename to pkgs/by-name/ex/expand-response-params/expand-response-params.c diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/by-name/ex/expand-response-params/package.nix similarity index 100% rename from pkgs/build-support/expand-response-params/default.nix rename to pkgs/by-name/ex/expand-response-params/package.nix diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/by-name/ex/expat/package.nix similarity index 100% rename from pkgs/development/libraries/expat/default.nix rename to pkgs/by-name/ex/expat/package.nix diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/by-name/ex/expected-lite/package.nix similarity index 100% rename from pkgs/development/libraries/expected-lite/default.nix rename to pkgs/by-name/ex/expected-lite/package.nix diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/by-name/ex/expenses/package.nix similarity index 100% rename from pkgs/applications/misc/expenses/default.nix rename to pkgs/by-name/ex/expenses/package.nix diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/by-name/ex/explain/package.nix similarity index 100% rename from pkgs/development/tools/explain/default.nix rename to pkgs/by-name/ex/explain/package.nix diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/by-name/ex/expliot/package.nix similarity index 100% rename from pkgs/tools/security/expliot/default.nix rename to pkgs/by-name/ex/expliot/package.nix diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/by-name/ex/exploitdb/package.nix similarity index 100% rename from pkgs/tools/security/exploitdb/default.nix rename to pkgs/by-name/ex/exploitdb/package.nix diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/by-name/ex/exportarr/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/exportarr/default.nix rename to pkgs/by-name/ex/exportarr/package.nix diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/by-name/ex/expr/package.nix similarity index 100% rename from pkgs/development/interpreters/expr/default.nix rename to pkgs/by-name/ex/expr/package.nix diff --git a/pkgs/by-name/ex/expressvpn/package.nix b/pkgs/by-name/ex/expressvpn/package.nix new file mode 100644 index 000000000000..b1b925075a7e --- /dev/null +++ b/pkgs/by-name/ex/expressvpn/package.nix @@ -0,0 +1,99 @@ +{ autoPatchelfHook +, buildFHSEnv +, dpkg +, fetchurl +, inotify-tools +, lib +, stdenvNoCC +, sysctl +, writeScript +}: + +let + pname = "expressvpn"; + clientVersion = "3.52.0"; + clientBuild = "2"; + version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ]; + + expressvpnBase = stdenvNoCC.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb"; + hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew="; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = '' + runHook preUnpack + dpkg --fsys-tarfile $src | tar --extract + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + mv usr/ $out/ + runHook postInstall + ''; + }; + + expressvpndFHS = buildFHSEnv { + name = "expressvpnd"; + + # When connected, it directly creates/deletes resolv.conf to change the DNS entries. + # Since it's running in an FHS environment, it has no effect on actual resolv.conf. + # Hence, place a watcher that updates host resolv.conf when FHS resolv.conf changes. + runScript = writeScript "${pname}-wrapper" '' + cp /host/etc/resolv.conf /etc/resolv.conf; + while inotifywait /etc 2>/dev/null; + do + cp /etc/resolv.conf /host/etc/resolv.conf; + done & + expressvpnd --client-version ${clientVersion} --client-build ${clientBuild} + ''; + + # expressvpnd binary has hard-coded the path /sbin/sysctl hence below workaround. + extraBuildCommands = '' + mkdir -p sbin + chmod +w sbin + ln -s ${sysctl}/bin/sysctl sbin/sysctl + ''; + + # The expressvpnd binary also uses hard-coded paths to the other binaries and files + # it ships with, hence the FHS environment. + + targetPkgs = pkgs: with pkgs; [ + expressvpnBase + inotify-tools + iproute2 + ]; + }; +in +stdenvNoCC.mkDerivation { + inherit pname version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share + ln -s ${expressvpnBase}/bin/expressvpn $out/bin + ln -s ${expressvpndFHS}/bin/expressvpnd $out/bin + ln -s ${expressvpnBase}/share/{bash-completion,doc,man} $out/share/ + runHook postInstall + ''; + + meta = with lib; { + description = "CLI client for ExpressVPN"; + homepage = "https://www.expressvpn.com"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ yureien ]; + }; +} diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/by-name/ex/exprtk/package.nix similarity index 100% rename from pkgs/development/libraries/exprtk/default.nix rename to pkgs/by-name/ex/exprtk/package.nix diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/by-name/ex/exrtools/package.nix similarity index 100% rename from pkgs/applications/graphics/exrtools/default.nix rename to pkgs/by-name/ex/exrtools/package.nix diff --git a/pkgs/tools/filesystems/ext4magic/glibc-fix.patch b/pkgs/by-name/ex/ext4magic/glibc-fix.patch similarity index 100% rename from pkgs/tools/filesystems/ext4magic/glibc-fix.patch rename to pkgs/by-name/ex/ext4magic/glibc-fix.patch diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/by-name/ex/ext4magic/package.nix similarity index 100% rename from pkgs/tools/filesystems/ext4magic/default.nix rename to pkgs/by-name/ex/ext4magic/package.nix diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/by-name/ex/extism-cli/package.nix similarity index 100% rename from pkgs/development/tools/extism-cli/default.nix rename to pkgs/by-name/ex/extism-cli/package.nix diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/by-name/ex/extra-container/package.nix similarity index 100% rename from pkgs/tools/virtualization/extra-container/default.nix rename to pkgs/by-name/ex/extra-container/package.nix diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/by-name/ex/extrace/package.nix similarity index 100% rename from pkgs/os-specific/linux/extrace/default.nix rename to pkgs/by-name/ex/extrace/package.nix diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/by-name/ex/extract_url/package.nix similarity index 100% rename from pkgs/applications/misc/extract_url/default.nix rename to pkgs/by-name/ex/extract_url/package.nix diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/by-name/ex/extremetuxracer/package.nix similarity index 100% rename from pkgs/games/extremetuxracer/default.nix rename to pkgs/by-name/ex/extremetuxracer/package.nix diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/by-name/ex/extrude/package.nix similarity index 100% rename from pkgs/tools/security/extrude/default.nix rename to pkgs/by-name/ex/extrude/package.nix diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/by-name/ex/extundelete/package.nix similarity index 100% rename from pkgs/tools/filesystems/extundelete/default.nix rename to pkgs/by-name/ex/extundelete/package.nix diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/by-name/ey/eyedropper/package.nix similarity index 100% rename from pkgs/applications/graphics/eyedropper/default.nix rename to pkgs/by-name/ey/eyedropper/package.nix diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 61034c59f6d4..9925e54a85b2 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.5"; + version = "0.20.7"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-cxgEeYazhWO1V2Tf+70u6wlc9oME5ws3Da+OYf7UprQ="; + hash = "sha256-1yObVsCUGh2TwZesNNOseFR86oPh+w1q2knQkQ2vjLE="; }; - cargoHash = "sha256-trO/NGNC5Kz76ua1RxBqfjNoXaQqikgPNyGnD7f/FXM="; + cargoHash = "sha256-k9zSchHFF2t30ca15eadEhnO0aFH5KIc1i0uuBKZZtc="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/by-name/ez/ezminc/package.nix similarity index 100% rename from pkgs/applications/science/biology/EZminc/default.nix rename to pkgs/by-name/ez/ezminc/package.nix diff --git a/pkgs/development/tools/misc/ezno/default.nix b/pkgs/by-name/ez/ezno/package.nix similarity index 100% rename from pkgs/development/tools/misc/ezno/default.nix rename to pkgs/by-name/ez/ezno/package.nix diff --git a/pkgs/games/ezquake/default.nix b/pkgs/by-name/ez/ezquake/package.nix similarity index 100% rename from pkgs/games/ezquake/default.nix rename to pkgs/by-name/ez/ezquake/package.nix diff --git a/pkgs/data/fonts/ezra-sil/default.nix b/pkgs/by-name/ez/ezra-sil/package.nix similarity index 100% rename from pkgs/data/fonts/ezra-sil/default.nix rename to pkgs/by-name/ez/ezra-sil/package.nix diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/by-name/ez/ezstream/package.nix similarity index 100% rename from pkgs/tools/audio/ezstream/default.nix rename to pkgs/by-name/ez/ezstream/package.nix diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/by-name/ez/eztrace/package.nix similarity index 100% rename from pkgs/development/tools/profiling/EZTrace/default.nix rename to pkgs/by-name/ez/eztrace/package.nix diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/by-name/f1/f1_8/package.nix similarity index 100% rename from pkgs/data/fonts/f1_8/default.nix rename to pkgs/by-name/f1/f1_8/package.nix diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/by-name/f1/f1viewer/package.nix similarity index 100% rename from pkgs/applications/video/f1viewer/default.nix rename to pkgs/by-name/f1/f1viewer/package.nix diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/by-name/f2/f2/package.nix similarity index 100% rename from pkgs/tools/misc/f2/default.nix rename to pkgs/by-name/f2/f2/package.nix diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/by-name/f2/f2c/package.nix similarity index 100% rename from pkgs/development/tools/f2c/default.nix rename to pkgs/by-name/f2/f2c/package.nix diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/by-name/f3/f3/package.nix similarity index 100% rename from pkgs/tools/filesystems/f3/default.nix rename to pkgs/by-name/f3/f3/package.nix diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/by-name/f5/f5_6/package.nix similarity index 100% rename from pkgs/data/fonts/f5_6/default.nix rename to pkgs/by-name/f5/f5_6/package.nix diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/by-name/fa/fa_1/package.nix similarity index 100% rename from pkgs/data/fonts/fa_1/default.nix rename to pkgs/by-name/fa/fa_1/package.nix diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/by-name/fa/faac/package.nix similarity index 100% rename from pkgs/development/libraries/faac/default.nix rename to pkgs/by-name/fa/faac/package.nix diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/by-name/fa/faad2/package.nix similarity index 100% rename from pkgs/development/libraries/faad2/default.nix rename to pkgs/by-name/fa/faad2/package.nix diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/by-name/fa/faas-cli/package.nix similarity index 100% rename from pkgs/development/tools/faas-cli/default.nix rename to pkgs/by-name/fa/faas-cli/package.nix diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/by-name/fa/faba-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/faba-icon-theme/default.nix rename to pkgs/by-name/fa/faba-icon-theme/package.nix diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/by-name/fa/faba-mono-icons/package.nix similarity index 100% rename from pkgs/data/icons/faba-mono-icons/default.nix rename to pkgs/by-name/fa/faba-mono-icons/package.nix diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/by-name/fa/fabric-installer/package.nix similarity index 100% rename from pkgs/tools/games/minecraft/fabric-installer/default.nix rename to pkgs/by-name/fa/fabric-installer/package.nix diff --git a/pkgs/tools/backup/fabs/default.nix b/pkgs/by-name/fa/fabs/package.nix similarity index 100% rename from pkgs/tools/backup/fabs/default.nix rename to pkgs/by-name/fa/fabs/package.nix diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/by-name/fa/facedetect/package.nix similarity index 100% rename from pkgs/tools/graphics/facedetect/default.nix rename to pkgs/by-name/fa/facedetect/package.nix diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/by-name/fa/facetimehd-calibration/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix rename to pkgs/by-name/fa/facetimehd-calibration/package.nix diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/by-name/fa/facetimehd-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix rename to pkgs/by-name/fa/facetimehd-firmware/package.nix diff --git a/pkgs/by-name/fa/facter/Gemfile.lock b/pkgs/by-name/fa/facter/Gemfile.lock index 2e80bd9192b4..1af6d837a747 100644 --- a/pkgs/by-name/fa/facter/Gemfile.lock +++ b/pkgs/by-name/fa/facter/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - facter (4.8.0) + facter (4.10.0) hocon (~> 1.3) thor (>= 1.0.1, < 1.3) hocon (1.4.0) diff --git a/pkgs/by-name/fa/facter/gemset.nix b/pkgs/by-name/fa/facter/gemset.nix index 2f70d6047e01..92a024a62211 100644 --- a/pkgs/by-name/fa/facter/gemset.nix +++ b/pkgs/by-name/fa/facter/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1130mzk90pi0y9fnraqqak7gcfg61dhx92axwnhchbpw09akfl09"; + sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp"; type = "gem"; }; - version = "4.8.0"; + version = "4.10.0"; }; hocon = { groups = ["default"]; diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index c9b30b31b461..ebeb71d4e245 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -70,6 +70,15 @@ let nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz Note the ultimate "_" is replaced with "-" in the --name arg! + + If you go this route you might want to tell Nix to explicitly hold on to the + source tarball. Otherwise it could get GC'd from the Nix store and you'd + have to redownload it next time the package wants to rebuild to use a newer + dependency. E.g. if you're using NixOS: + + system.extraDependencies = [ + factorio.src + ]; ''; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 182570993845..2cc76cc16697 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,25 +3,25 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.11.tar.xz" + "factorio_linux_2.0.16.tar.xz" ], - "name": "factorio_alpha_x64-2.0.11.tar.xz", + "name": "factorio_alpha_x64-2.0.16.tar.xz", "needsAuth": true, - "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e", + "sha256": "9828ae257a3b2f95de2dae2f262e9d8d6b85f356911449166ceef1472d231e6d", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/alpha/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.16/alpha/linux64", + "version": "2.0.16" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.11.tar.xz" + "factorio_linux_2.0.15.tar.xz" ], - "name": "factorio_alpha_x64-2.0.11.tar.xz", + "name": "factorio_alpha_x64-2.0.15.tar.xz", "needsAuth": true, - "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e", + "sha256": "39df353fe8f14394d2618b9627659f3c0c16922362708e681f006083a8f5163e", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/alpha/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.15/alpha/linux64", + "version": "2.0.15" } }, "demo": { @@ -51,51 +51,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.11.tar.xz" + "factorio-space-age_linux_2.0.16.tar.xz" ], - "name": "factorio_expansion_x64-2.0.11.tar.xz", + "name": "factorio_expansion_x64-2.0.16.tar.xz", "needsAuth": true, - "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179", + "sha256": "32ae1b8f525148b3bb1f68e41b398543c2b0da29734f9f3b4f9509a86c64ecf4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/expansion/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.16/expansion/linux64", + "version": "2.0.16" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.11.tar.xz" + "factorio-space-age_linux_2.0.15.tar.xz" ], - "name": "factorio_expansion_x64-2.0.11.tar.xz", + "name": "factorio_expansion_x64-2.0.15.tar.xz", "needsAuth": true, - "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179", + "sha256": "09de33402fee3dbae9d0207409f05a19e2fa8019b53d3de96557d2ec904e10f3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/expansion/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.15/expansion/linux64", + "version": "2.0.15" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.11.tar.xz", - "factorio_headless_x64_2.0.11.tar.xz" + "factorio-headless_linux_2.0.16.tar.xz", + "factorio_headless_x64_2.0.16.tar.xz" ], - "name": "factorio_headless_x64-2.0.11.tar.xz", + "name": "factorio_headless_x64-2.0.16.tar.xz", "needsAuth": false, - "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6", + "sha256": "f2069b4b746500d945eeb67ef7eda5e7aebe7fd0294c2af4e117af22a3bbaea3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/headless/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.16/headless/linux64", + "version": "2.0.16" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.11.tar.xz", - "factorio_headless_x64_2.0.11.tar.xz" + "factorio-headless_linux_2.0.15.tar.xz", + "factorio_headless_x64_2.0.15.tar.xz" ], - "name": "factorio_headless_x64-2.0.11.tar.xz", + "name": "factorio_headless_x64-2.0.15.tar.xz", "needsAuth": false, - "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6", + "sha256": "70b441cb807811a60586c01107248c1d8d7ae043bd1f23675fc924fbaaa538d8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/headless/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.15/headless/linux64", + "version": "2.0.15" } } } diff --git a/pkgs/by-name/fa/fahrplan/package.nix b/pkgs/by-name/fa/fahrplan/package.nix new file mode 100644 index 000000000000..dc0d74b441d0 --- /dev/null +++ b/pkgs/by-name/fa/fahrplan/package.nix @@ -0,0 +1,36 @@ +{ + lib, + python3, + fetchFromGitHub, +}: +python3.pkgs.buildPythonApplication rec { + pname = "fahrplan"; + version = "1.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dbrgn"; + repo = "fahrplan"; + rev = "refs/tags/v${version}"; + hash = "sha256-2QVaA2zqqFuxjkKbDXo+SNzkrDCxXiSYMUOftQ++wO4="; + }; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ + python-dateutil + requests + texttable + ]; + + meta = { + description = "Command line access to the SBB/CFF/FFS timetable with human readable argument parsing"; + homepage = "https://github.com/dbrgn/fahrplan"; + changelog = "https://github.com/dbrgn/fahrplan/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ p-h ]; + mainProgram = "fahrplan"; + }; +} diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/by-name/fa/faircamp/Cargo.lock similarity index 100% rename from pkgs/applications/misc/faircamp/Cargo.lock rename to pkgs/by-name/fa/faircamp/Cargo.lock diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/by-name/fa/faircamp/package.nix similarity index 100% rename from pkgs/applications/misc/faircamp/default.nix rename to pkgs/by-name/fa/faircamp/package.nix diff --git a/pkgs/applications/misc/faircamp/test-wav.nix b/pkgs/by-name/fa/faircamp/test-wav.nix similarity index 100% rename from pkgs/applications/misc/faircamp/test-wav.nix rename to pkgs/by-name/fa/faircamp/test-wav.nix diff --git a/pkgs/games/fairymax/default.nix b/pkgs/by-name/fa/fairymax/package.nix similarity index 100% rename from pkgs/games/fairymax/default.nix rename to pkgs/by-name/fa/fairymax/package.nix diff --git a/pkgs/build-support/fake-nss/default.nix b/pkgs/by-name/fa/fakeNss/package.nix similarity index 100% rename from pkgs/build-support/fake-nss/default.nix rename to pkgs/by-name/fa/fakeNss/package.nix diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/by-name/fa/fakechroot/package.nix similarity index 100% rename from pkgs/tools/system/fakechroot/default.nix rename to pkgs/by-name/fa/fakechroot/package.nix diff --git a/pkgs/tools/system/fakeroot/einval.patch b/pkgs/by-name/fa/fakeroot/einval.patch similarity index 100% rename from pkgs/tools/system/fakeroot/einval.patch rename to pkgs/by-name/fa/fakeroot/einval.patch diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/by-name/fa/fakeroot/package.nix similarity index 100% rename from pkgs/tools/system/fakeroot/default.nix rename to pkgs/by-name/fa/fakeroot/package.nix diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/by-name/fa/fakeroute/package.nix similarity index 100% rename from pkgs/tools/networking/fakeroute/default.nix rename to pkgs/by-name/fa/fakeroute/package.nix diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/by-name/fa/faketty/package.nix similarity index 100% rename from pkgs/tools/misc/faketty/default.nix rename to pkgs/by-name/fa/faketty/package.nix diff --git a/pkgs/applications/networking/cluster/falcoctl/default.nix b/pkgs/by-name/fa/falcoctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/falcoctl/default.nix rename to pkgs/by-name/fa/falcoctl/package.nix diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/by-name/fa/fan2go/package.nix similarity index 100% rename from pkgs/os-specific/linux/fan2go/default.nix rename to pkgs/by-name/fa/fan2go/package.nix diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/by-name/fa/fanctl/package.nix similarity index 100% rename from pkgs/os-specific/linux/fanctl/default.nix rename to pkgs/by-name/fa/fanctl/package.nix diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/by-name/fa/fancy-motd/package.nix similarity index 100% rename from pkgs/tools/system/fancy-motd/default.nix rename to pkgs/by-name/fa/fancy-motd/package.nix diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/by-name/fa/fanficfare/package.nix similarity index 100% rename from pkgs/tools/text/fanficfare/default.nix rename to pkgs/by-name/fa/fanficfare/package.nix diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/by-name/fa/fantasque-sans-mono/package.nix similarity index 100% rename from pkgs/data/fonts/fantasque-sans-mono/default.nix rename to pkgs/by-name/fa/fantasque-sans-mono/package.nix diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 49536d8e39ae..050330f49fac 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.15"; + version = "6.3.16"; - nugetHash = "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8="; + nugetHash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/data/fonts/fanwood/default.nix b/pkgs/by-name/fa/fanwood/package.nix similarity index 100% rename from pkgs/data/fonts/fanwood/default.nix rename to pkgs/by-name/fa/fanwood/package.nix diff --git a/pkgs/development/tools/faq/default.nix b/pkgs/by-name/fa/faq/package.nix similarity index 100% rename from pkgs/development/tools/faq/default.nix rename to pkgs/by-name/fa/faq/package.nix diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix similarity index 100% rename from pkgs/tools/security/faraday-agent-dispatcher/default.nix rename to pkgs/by-name/fa/faraday-agent-dispatcher/package.nix diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/by-name/fa/faraday-cli/package.nix similarity index 100% rename from pkgs/tools/security/faraday-cli/default.nix rename to pkgs/by-name/fa/faraday-cli/package.nix diff --git a/pkgs/applications/blockchains/faraday/default.nix b/pkgs/by-name/fa/faraday/package.nix similarity index 100% rename from pkgs/applications/blockchains/faraday/default.nix rename to pkgs/by-name/fa/faraday/package.nix diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/by-name/fa/farbfeld/package.nix similarity index 100% rename from pkgs/development/libraries/farbfeld/default.nix rename to pkgs/by-name/fa/farbfeld/package.nix diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/by-name/fa/fasd/package.nix similarity index 100% rename from pkgs/tools/misc/fasd/default.nix rename to pkgs/by-name/fa/fasd/package.nix diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/by-name/fa/fasmg/package.nix similarity index 100% rename from pkgs/development/compilers/fasmg/default.nix rename to pkgs/by-name/fa/fasmg/package.nix diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/by-name/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in similarity index 100% rename from pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in rename to pkgs/by-name/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix similarity index 100% rename from pkgs/development/libraries/fast-cpp-csv-parser/default.nix rename to pkgs/by-name/fa/fast-cpp-csv-parser/package.nix diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix new file mode 100644 index 000000000000..790f619c6faf --- /dev/null +++ b/pkgs/by-name/fa/fast-downward/package.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, python3 +, osi +, cplex +}: + +stdenv.mkDerivation rec { + pname = "fast-downward"; + version = "24.06.0"; + + src = fetchFromGitHub { + owner = "aibasel"; + repo = "downward"; + rev = "release-${version}"; + sha256 = "sha256-iIBoJZCFd05bKUeftvl2YBTmSQuFvATIQAYMITDywWA="; + }; + + nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; + buildInputs = [ python3 osi ]; + + cmakeFlags = lib.optionals osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; + + configurePhase = '' + python build.py release + ''; + + postPatch = '' + # Needed because the package tries to be too smart. + export CC="$(which $CC)" + export CXX="$(which $CXX)" + ''; + + installPhase = '' + install -Dm755 builds/release/bin/downward $out/libexec/fast-downward/downward + cp -r builds/release/bin/translate $out/libexec/fast-downward/ + install -Dm755 fast-downward.py $out/bin/fast-downward + mkdir -p $out/${python3.sitePackages} + cp -r driver $out/${python3.sitePackages} + + wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath" + # Because fast-downward calls `python translate.py` we need to return wrapped scripts back. + for i in $out/libexec/fast-downward/translate/.*-wrapped; do + name="$(basename "$i")" + name1="''${name#.}" + name2="''${name1%-wrapped}" + dir="$(dirname "$i")" + dest="$dir/$name2" + echo "Moving $i to $dest" + mv "$i" "$dest" + done + + substituteInPlace $out/${python3.sitePackages}/driver/arguments.py \ + --replace 'args.build = "release"' "args.build = \"$out/libexec/fast-downward\"" + ''; + + meta = with lib; { + description = "Domain-independent planning system"; + mainProgram = "fast-downward"; + homepage = "https://www.fast-downward.org/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/by-name/fa/fastJson/package.nix similarity index 100% rename from pkgs/development/libraries/fastjson/default.nix rename to pkgs/by-name/fa/fastJson/package.nix diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/by-name/fa/fastd/package.nix similarity index 100% rename from pkgs/tools/networking/fastd/default.nix rename to pkgs/by-name/fa/fastd/package.nix diff --git a/pkgs/development/tools/fastddsgen/deps.json b/pkgs/by-name/fa/fastddsgen/deps.json similarity index 100% rename from pkgs/development/tools/fastddsgen/deps.json rename to pkgs/by-name/fa/fastddsgen/deps.json diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/by-name/fa/fastddsgen/package.nix similarity index 100% rename from pkgs/development/tools/fastddsgen/default.nix rename to pkgs/by-name/fa/fastddsgen/package.nix diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index e5ec0ed52a09..8713f1908602 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -2,9 +2,9 @@ lib, stdenv, fetchFromGitHub, + apple-sdk_15, chafa, cmake, - darwin, dbus, dconf, ddcutil, @@ -19,18 +19,18 @@ libsepol, libxcb, makeBinaryWrapper, + moltenvk, nix-update-script, ocl-icd, opencl-headers, - overrideSDK, pcre, pcre2, pkg-config, python3, rpm, sqlite, - testers, util-linux, + versionCheckHook, vulkan-loader, wayland, xfce, @@ -42,18 +42,15 @@ waylandSupport ? true, x11Support ? true, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-fkAtBO9POd3JKNNt0jV1ufIN1s8HaFW7P2+32cRycWs="; + hash = "sha256-qXzE2v2BS1CgPVPIj+mct9zoJ4hpNCsTZ12keQThRZI="; }; outputs = [ @@ -104,24 +101,10 @@ stdenv'.mkDerivation (finalAttrs: { xorg.libXext ] ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Apple80211 - AppKit - AVFoundation - Cocoa - CoreDisplay - CoreVideo - CoreWLAN - DisplayServices - IOBluetooth - MediaRemote - OpenCL - SystemConfiguration - darwin.moltenvk - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ + apple-sdk_15 + moltenvk + ]); cmakeFlags = [ @@ -157,14 +140,11 @@ stdenv'.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ''; - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "fastfetch -v | cut -d '(' -f 1"; - version = "fastfetch ${finalAttrs.version}"; - }; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool"; diff --git a/pkgs/development/tools/fastgron/default.nix b/pkgs/by-name/fa/fastgron/package.nix similarity index 100% rename from pkgs/development/tools/fastgron/default.nix rename to pkgs/by-name/fa/fastgron/package.nix diff --git a/pkgs/applications/science/physics/fasthenry/default.nix b/pkgs/by-name/fa/fasthenry/package.nix similarity index 100% rename from pkgs/applications/science/physics/fasthenry/default.nix rename to pkgs/by-name/fa/fasthenry/package.nix diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix similarity index 100% rename from pkgs/development/libraries/physics/fastjet-contrib/default.nix rename to pkgs/by-name/fa/fastjet-contrib/package.nix diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/by-name/fa/fastjet/package.nix similarity index 100% rename from pkgs/development/libraries/physics/fastjet/default.nix rename to pkgs/by-name/fa/fastjet/package.nix diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix new file mode 100644 index 000000000000..a20a14bed3b5 --- /dev/null +++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, bzip2 +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "fastnetmon-advanced"; + version = "2.0.367"; + + src = fetchurl { + url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; + hash = "sha256-D/4kkT6ehEmlfRUeP1uLuO/hd9ZrMBJSKF5DKYXOPxs="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + bzip2 + ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + + # unused libraries, which have additional dependencies + rm opt/fastnetmon/libraries/gcc1210/lib/libgccjit.so.0.0.1 + ''; + + installPhase = '' + mkdir -p $out/libexec/fastnetmon + cp -r opt/fastnetmon/app/bin $out/bin + cp -r opt/fastnetmon/libraries $out/libexec/fastnetmon + + readlink usr/sbin/gobgpd + readlink usr/bin/gobgp + + ln -s $(readlink usr/sbin/gobgpd | sed "s:/opt/fastnetmon:$out/libexec/fastnetmon:") $out/bin/fnm-gobgpd + ln -s $(readlink usr/bin/gobgp | sed "s:/opt/fastnetmon:$out/libexec/fastnetmon:") $out/bin/fnm-gobgp + + addAutoPatchelfSearchPath $out/libexec/fastnetmon/libraries + ''; + + doInstallCheck = true; + installCheckPhase = '' + set +o pipefail + $out/bin/fastnetmon 2>&1 | grep "Can't open log file" + $out/bin/fcli 2>&1 | grep "Please run this tool with root rights" + $out/bin/fnm-gobgp --help 2>&1 | grep "Available Commands" + $out/bin/fnm-gobgpd --help 2>&1 | grep "Application Options" + ''; + + passthru.tests = { inherit (nixosTests) fastnetmon-advanced; }; + + meta = with lib; { + description = "High performance DDoS detector / sensor - commercial edition"; + homepage = "https://fastnetmon.com"; + changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = teams.wdz.members; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix similarity index 100% rename from pkgs/development/libraries/physics/fastnlo-toolkit/default.nix rename to pkgs/by-name/fa/fastnlo-toolkit/package.nix diff --git a/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch b/pkgs/by-name/fa/fastnlo-toolkit/yoda2_support.patch similarity index 100% rename from pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch rename to pkgs/by-name/fa/fastnlo-toolkit/yoda2_support.patch diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix new file mode 100644 index 000000000000..91f6c9d22047 --- /dev/null +++ b/pkgs/by-name/fa/fastp/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, zlib +, libdeflate +, isa-l +}: + +stdenv.mkDerivation rec { + pname = "fastp"; + version = "0.24.0"; + + src = fetchFromGitHub { + owner = "OpenGene"; + repo = "fastp"; + rev = "v${version}"; + sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0="; + }; + + buildInputs = [ zlib libdeflate isa-l ]; + + installPhase = '' + install -D fastp $out/bin/fastp + ''; + + meta = with lib; { + description = "Ultra-fast all-in-one FASTQ preprocessor"; + mainProgram = "fastp"; + license = licenses.mit; + homepage = "https://github.com/OpenGene/fastp"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/by-name/fa/fastpbkdf2/package.nix similarity index 100% rename from pkgs/development/libraries/fastpbkdf2/default.nix rename to pkgs/by-name/fa/fastpbkdf2/package.nix diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/by-name/fa/fasttext/package.nix similarity index 100% rename from pkgs/applications/science/machine-learning/fasttext/default.nix rename to pkgs/by-name/fa/fasttext/package.nix diff --git a/pkgs/development/tools/fatcat/default.nix b/pkgs/by-name/fa/fatcat/package.nix similarity index 100% rename from pkgs/development/tools/fatcat/default.nix rename to pkgs/by-name/fa/fatcat/package.nix diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/by-name/fa/fatrace/package.nix similarity index 100% rename from pkgs/os-specific/linux/fatrace/default.nix rename to pkgs/by-name/fa/fatrace/package.nix diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/by-name/fa/fatresize/package.nix similarity index 100% rename from pkgs/tools/filesystems/fatresize/default.nix rename to pkgs/by-name/fa/fatresize/package.nix diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/by-name/fa/fatsort/package.nix similarity index 100% rename from pkgs/tools/filesystems/fatsort/default.nix rename to pkgs/by-name/fa/fatsort/package.nix diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix new file mode 100644 index 000000000000..b0cf041a07b8 --- /dev/null +++ b/pkgs/by-name/fa/faudio/package.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, SDL2}: + +#TODO: tests + +stdenv.mkDerivation rec { + pname = "faudio"; + version = "24.11"; + + src = fetchFromGitHub { + owner = "FNA-XNA"; + repo = "FAudio"; + rev = version; + sha256 = "sha256-fmJh2DZNAjqqTDFt5b2HZ5oeS7VkvPy1a8gr59OQSUo="; + }; + + nativeBuildInputs = [cmake]; + + buildInputs = [ SDL2 ]; + + meta = with lib; { + description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; + homepage = "https://github.com/FNA-XNA/FAudio"; + changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}"; + license = licenses.zlib; + platforms = platforms.unix; + maintainers = [ maintainers.marius851000 ]; + }; +} diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix similarity index 100% rename from pkgs/applications/audio/faustPhysicalModeling/default.nix rename to pkgs/by-name/fa/faustPhysicalModeling/package.nix diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/by-name/fb/fbcat/package.nix similarity index 100% rename from pkgs/tools/misc/fbcat/default.nix rename to pkgs/by-name/fb/fbcat/package.nix diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/by-name/fb/fbida/package.nix similarity index 100% rename from pkgs/applications/graphics/fbida/default.nix rename to pkgs/by-name/fb/fbida/package.nix diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/by-name/fb/fbjni/package.nix similarity index 100% rename from pkgs/development/libraries/fbjni/default.nix rename to pkgs/by-name/fb/fbjni/package.nix diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/by-name/fb/fblog/package.nix similarity index 100% rename from pkgs/development/tools/fblog/default.nix rename to pkgs/by-name/fb/fblog/package.nix diff --git a/pkgs/tools/misc/fbmark/default.nix b/pkgs/by-name/fb/fbmark/package.nix similarity index 100% rename from pkgs/tools/misc/fbmark/default.nix rename to pkgs/by-name/fb/fbmark/package.nix diff --git a/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/pkgs/by-name/fb/fbmenugen/0001-Fix-paths.patch similarity index 100% rename from pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch rename to pkgs/by-name/fb/fbmenugen/0001-Fix-paths.patch diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/by-name/fb/fbmenugen/package.nix similarity index 100% rename from pkgs/applications/misc/fbmenugen/default.nix rename to pkgs/by-name/fb/fbmenugen/package.nix diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/by-name/fb/fbpanel/package.nix similarity index 100% rename from pkgs/applications/window-managers/fbpanel/default.nix rename to pkgs/by-name/fb/fbpanel/package.nix diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/by-name/fb/fbterm/package.nix similarity index 100% rename from pkgs/os-specific/linux/fbterm/default.nix rename to pkgs/by-name/fb/fbterm/package.nix diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/pkgs/by-name/fb/fbterm/select.patch similarity index 100% rename from pkgs/os-specific/linux/fbterm/select.patch rename to pkgs/by-name/fb/fbterm/select.patch diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/by-name/fb/fbv/package.nix similarity index 100% rename from pkgs/tools/graphics/fbv/default.nix rename to pkgs/by-name/fb/fbv/package.nix diff --git a/pkgs/tools/admin/fbvnc/default.nix b/pkgs/by-name/fb/fbvnc/package.nix similarity index 100% rename from pkgs/tools/admin/fbvnc/default.nix rename to pkgs/by-name/fb/fbvnc/package.nix diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/by-name/fc/fcft/package.nix similarity index 100% rename from pkgs/development/libraries/fcft/default.nix rename to pkgs/by-name/fc/fcft/package.nix diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/by-name/fc/fcgiwrap/package.nix similarity index 100% rename from pkgs/servers/fcgiwrap/default.nix rename to pkgs/by-name/fc/fcgiwrap/package.nix diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/by-name/fc/fcl/package.nix similarity index 100% rename from pkgs/development/libraries/fcl/default.nix rename to pkgs/by-name/fc/fcl/package.nix diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/by-name/fc/fcppt/package.nix similarity index 100% rename from pkgs/development/libraries/fcppt/default.nix rename to pkgs/by-name/fc/fcppt/package.nix diff --git a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/pkgs/by-name/fc/fcrackzip/fcrackzip_forkexec.patch similarity index 100% rename from pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch rename to pkgs/by-name/fc/fcrackzip/fcrackzip_forkexec.patch diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/by-name/fc/fcrackzip/package.nix similarity index 100% rename from pkgs/tools/security/fcrackzip/default.nix rename to pkgs/by-name/fc/fcrackzip/package.nix diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/by-name/fc/fcron/package.nix similarity index 100% rename from pkgs/tools/system/fcron/default.nix rename to pkgs/by-name/fc/fcron/package.nix diff --git a/pkgs/tools/system/fcron/relative-fcronsighup.patch b/pkgs/by-name/fc/fcron/relative-fcronsighup.patch similarity index 100% rename from pkgs/tools/system/fcron/relative-fcronsighup.patch rename to pkgs/by-name/fc/fcron/relative-fcronsighup.patch diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/by-name/fd/fd/package.nix similarity index 100% rename from pkgs/tools/misc/fd/default.nix rename to pkgs/by-name/fd/fd/package.nix diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/by-name/fd/fdk-aac-encoder/package.nix similarity index 100% rename from pkgs/applications/audio/fdkaac/default.nix rename to pkgs/by-name/fd/fdk-aac-encoder/package.nix diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/by-name/fd/fdk_aac/package.nix similarity index 100% rename from pkgs/development/libraries/fdk-aac/default.nix rename to pkgs/by-name/fd/fdk_aac/package.nix diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/by-name/fd/fdm/package.nix similarity index 100% rename from pkgs/tools/networking/fdm/default.nix rename to pkgs/by-name/fd/fdm/package.nix diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index d8699f481089..494dcb78a905 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -60,6 +60,7 @@ python3Packages.buildPythonApplication { defusedxml gitpython libcloud + libvirt mwclient oscrypto paramiko diff --git a/pkgs/tools/misc/fdtools/new-skalibs.patch b/pkgs/by-name/fd/fdtools/new-skalibs.patch similarity index 100% rename from pkgs/tools/misc/fdtools/new-skalibs.patch rename to pkgs/by-name/fd/fdtools/new-skalibs.patch diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/by-name/fd/fdtools/package.nix similarity index 100% rename from pkgs/tools/misc/fdtools/default.nix rename to pkgs/by-name/fd/fdtools/package.nix diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/by-name/fd/fdupes/package.nix similarity index 100% rename from pkgs/tools/misc/fdupes/default.nix rename to pkgs/by-name/fd/fdupes/package.nix diff --git a/pkgs/applications/misc/fead/default.nix b/pkgs/by-name/fe/fead/package.nix similarity index 100% rename from pkgs/applications/misc/fead/default.nix rename to pkgs/by-name/fe/fead/package.nix diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/by-name/fe/fedifetcher/package.nix similarity index 100% rename from pkgs/tools/misc/fedifetcher/default.nix rename to pkgs/by-name/fe/fedifetcher/package.nix diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index f55bbbf14763..a3d2d5c7f97a 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -39,7 +39,7 @@ buildRustPackage rec { protobuf pkg-config clang - libclang.lib + (lib.getLib libclang) ]; buildInputs = [ @@ -79,7 +79,7 @@ buildRustPackage rec { PROTOC = "${buildPackages.protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; OPENSSL_DIR = openssl.dev; - LIBCLANG_PATH = "${libclang.lib}/lib"; + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000"; diff --git a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/pkgs/by-name/fe/feed2imap-go/package.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/feed2imap-go/default.nix rename to pkgs/by-name/fe/feed2imap-go/package.nix diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/by-name/fe/feedbackd/package.nix similarity index 100% rename from pkgs/applications/misc/feedbackd/default.nix rename to pkgs/by-name/fe/feedbackd/package.nix diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/by-name/fe/feedgnuplot/package.nix similarity index 100% rename from pkgs/tools/graphics/feedgnuplot/default.nix rename to pkgs/by-name/fe/feedgnuplot/package.nix diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/by-name/fe/fehlstart/package.nix similarity index 100% rename from pkgs/applications/misc/fehlstart/default.nix rename to pkgs/by-name/fe/fehlstart/package.nix diff --git a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch similarity index 100% rename from pkgs/applications/misc/fehlstart/use-nix-profiles.patch rename to pkgs/by-name/fe/fehlstart/use-nix-profiles.patch diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/by-name/fe/feishu/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/feishu/default.nix rename to pkgs/by-name/fe/feishu/package.nix diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/by-name/fe/femtolisp/package.nix similarity index 100% rename from pkgs/development/interpreters/femtolisp/default.nix rename to pkgs/by-name/fe/femtolisp/package.nix diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/by-name/fe/fend/package.nix similarity index 100% rename from pkgs/tools/misc/fend/default.nix rename to pkgs/by-name/fe/fend/package.nix diff --git a/pkgs/tools/networking/ferm/import-ferm-wrapped.patch b/pkgs/by-name/fe/ferm/import-ferm-wrapped.patch similarity index 100% rename from pkgs/tools/networking/ferm/import-ferm-wrapped.patch rename to pkgs/by-name/fe/ferm/import-ferm-wrapped.patch diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/by-name/fe/ferm/package.nix similarity index 100% rename from pkgs/tools/networking/ferm/default.nix rename to pkgs/by-name/fe/ferm/package.nix diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/by-name/fe/fermyon-spin/package.nix similarity index 100% rename from pkgs/development/tools/fermyon-spin/default.nix rename to pkgs/by-name/fe/fermyon-spin/package.nix diff --git a/pkgs/development/tools/fermyon-spin/update.sh b/pkgs/by-name/fe/fermyon-spin/update.sh similarity index 100% rename from pkgs/development/tools/fermyon-spin/update.sh rename to pkgs/by-name/fe/fermyon-spin/update.sh diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/by-name/fe/ferretdb/package.nix similarity index 100% rename from pkgs/servers/nosql/ferretdb/default.nix rename to pkgs/by-name/fe/ferretdb/package.nix diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/by-name/fe/ferrum/package.nix similarity index 100% rename from pkgs/data/fonts/ferrum/default.nix rename to pkgs/by-name/fe/ferrum/package.nix diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/by-name/fe/fet-sh/package.nix similarity index 100% rename from pkgs/tools/misc/fet-sh/default.nix rename to pkgs/by-name/fe/fet-sh/package.nix diff --git a/pkgs/tools/misc/fetch-scm/default.nix b/pkgs/by-name/fe/fetch-scm/package.nix similarity index 100% rename from pkgs/tools/misc/fetch-scm/default.nix rename to pkgs/by-name/fe/fetch-scm/package.nix diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/by-name/fe/fetchit/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/fetchit/default.nix rename to pkgs/by-name/fe/fetchit/package.nix diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/by-name/fe/fetchutils/package.nix similarity index 100% rename from pkgs/tools/misc/fetchutils/default.nix rename to pkgs/by-name/fe/fetchutils/package.nix diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/by-name/ff/ff2mpv/package.nix similarity index 100% rename from pkgs/applications/misc/ff2mpv/default.nix rename to pkgs/by-name/ff/ff2mpv/package.nix diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/by-name/ff/ffcast/package.nix similarity index 100% rename from pkgs/tools/X11/ffcast/default.nix rename to pkgs/by-name/ff/ffcast/package.nix diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/by-name/ff/fff/package.nix similarity index 100% rename from pkgs/applications/misc/fff/default.nix rename to pkgs/by-name/ff/fff/package.nix diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/by-name/ff/fflas-ffpack/package.nix similarity index 100% rename from pkgs/development/libraries/fflas-ffpack/default.nix rename to pkgs/by-name/ff/fflas-ffpack/package.nix diff --git a/pkgs/misc/cups/drivers/fflinuxprint/default.nix b/pkgs/by-name/ff/fflinuxprint/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/fflinuxprint/default.nix rename to pkgs/by-name/ff/fflinuxprint/package.nix diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix similarity index 100% rename from pkgs/development/libraries/ffmpegthumbnailer/default.nix rename to pkgs/by-name/ff/ffmpegthumbnailer/package.nix diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/by-name/ff/ffms/package.nix similarity index 100% rename from pkgs/development/libraries/ffms/default.nix rename to pkgs/by-name/ff/ffms/package.nix diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/by-name/ff/fftw/package.nix similarity index 100% rename from pkgs/development/libraries/fftw/default.nix rename to pkgs/by-name/ff/fftw/package.nix diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/by-name/ff/ffuf/package.nix similarity index 100% rename from pkgs/tools/security/ffuf/default.nix rename to pkgs/by-name/ff/ffuf/package.nix diff --git a/pkgs/data/fonts/fg-virgil/default.nix b/pkgs/by-name/fg/fg-virgil/package.nix similarity index 100% rename from pkgs/data/fonts/fg-virgil/default.nix rename to pkgs/by-name/fg/fg-virgil/package.nix diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/by-name/fg/fgallery/package.nix similarity index 100% rename from pkgs/tools/graphics/fgallery/default.nix rename to pkgs/by-name/fg/fgallery/package.nix diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/by-name/fh/fh/package.nix similarity index 100% rename from pkgs/tools/nix/fh/default.nix rename to pkgs/by-name/fh/fh/package.nix diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/by-name/fh/fheroes2/package.nix similarity index 100% rename from pkgs/games/fheroes2/default.nix rename to pkgs/by-name/fh/fheroes2/package.nix diff --git a/pkgs/tools/misc/fiano/default.nix b/pkgs/by-name/fi/fiano/package.nix similarity index 100% rename from pkgs/tools/misc/fiano/default.nix rename to pkgs/by-name/fi/fiano/package.nix diff --git a/pkgs/servers/fiche/default.nix b/pkgs/by-name/fi/fiche/package.nix similarity index 100% rename from pkgs/servers/fiche/default.nix rename to pkgs/by-name/fi/fiche/package.nix diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/by-name/fi/fierce/package.nix similarity index 100% rename from pkgs/tools/security/fierce/default.nix rename to pkgs/by-name/fi/fierce/package.nix diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/by-name/fi/fig2dev/package.nix similarity index 100% rename from pkgs/applications/graphics/fig2dev/default.nix rename to pkgs/by-name/fi/fig2dev/package.nix diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/by-name/fi/figlet/package.nix similarity index 100% rename from pkgs/tools/misc/figlet/default.nix rename to pkgs/by-name/fi/figlet/package.nix diff --git a/pkgs/by-name/fi/fiji/package.nix b/pkgs/by-name/fi/fiji/package.nix new file mode 100644 index 000000000000..18a2ebb15d21 --- /dev/null +++ b/pkgs/by-name/fi/fiji/package.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, autoPatchelfHook +, jdk11 +, makeDesktopItem +, copyDesktopItems +, runtimeShell +, unzip +}: + +stdenv.mkDerivation rec { + pname = "fiji"; + version = "20240614-2117"; + + src = fetchurl { + url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; + sha256 = "sha256-OCNnN8CYniNEIfKRHRBoJ3Fo+u5AwXoPJAzUCc4P+f0="; + }; + + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + + desktopItems = [ + (makeDesktopItem { + name = "fiji"; + exec = "fiji %F"; + tryExec = "fiji"; + icon = "fiji"; + mimeTypes = [ "image/*" ]; + comment = "Scientific Image Analysis"; + desktopName = "Fiji Is Just ImageJ"; + genericName = "Fiji Is Just ImageJ"; + categories = [ "Education" "Science" "ImageProcessing" ]; + startupNotify = true; + startupWMClass = "fiji-Main"; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,fiji,share/pixmaps} + + cp -R * $out/fiji + rm -f $out/fiji/jars/imagej-updater-*.jar + + # Don't create a local desktop entry and avoid deprecated garbage + # collection option + cat < $out/bin/.fiji-launcher-hack + #!${runtimeShell} + exec \$($out/fiji/ImageJ-linux64 --default-gc --dry-run "\$@") + EOF + chmod +x $out/bin/.fiji-launcher-hack + + makeWrapper $out/bin/.fiji-launcher-hack $out/bin/fiji \ + --prefix PATH : ${lib.makeBinPath [ jdk11 ]} \ + --set JAVA_HOME ${jdk11.home} + + ln $out/fiji/images/icon.png $out/share/pixmaps/fiji.png + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://imagej.net/software/fiji/"; + description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; + mainProgram = "fiji"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; + maintainers = with maintainers; [ davisrichard437 ]; + }; +} diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/by-name/fi/file-rename/package.nix similarity index 100% rename from pkgs/tools/filesystems/file-rename/default.nix rename to pkgs/by-name/fi/file-rename/package.nix diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/by-name/fi/filebench/package.nix similarity index 100% rename from pkgs/tools/misc/filebench/default.nix rename to pkgs/by-name/fi/filebench/package.nix diff --git a/pkgs/applications/networking/filebrowser/default.nix b/pkgs/by-name/fi/filebrowser/package.nix similarity index 100% rename from pkgs/applications/networking/filebrowser/default.nix rename to pkgs/by-name/fi/filebrowser/package.nix diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/by-name/fi/filegive/package.nix similarity index 100% rename from pkgs/tools/networking/filegive/default.nix rename to pkgs/by-name/fi/filegive/package.nix diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/by-name/fi/fileshare/package.nix similarity index 100% rename from pkgs/servers/fileshare/default.nix rename to pkgs/by-name/fi/fileshare/package.nix diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/by-name/fi/fileshelter/package.nix similarity index 100% rename from pkgs/servers/web-apps/fileshelter/default.nix rename to pkgs/by-name/fi/fileshelter/package.nix diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/by-name/fi/filet/package.nix similarity index 100% rename from pkgs/applications/misc/filet/default.nix rename to pkgs/by-name/fi/filet/package.nix diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/by-name/fi/filter-audio/package.nix similarity index 100% rename from pkgs/development/libraries/filter-audio/default.nix rename to pkgs/by-name/fi/filter-audio/package.nix diff --git a/pkgs/servers/filtron/default.nix b/pkgs/by-name/fi/filtron/package.nix similarity index 100% rename from pkgs/servers/filtron/default.nix rename to pkgs/by-name/fi/filtron/package.nix diff --git a/pkgs/by-name/fi/fim/package.nix b/pkgs/by-name/fi/fim/package.nix new file mode 100644 index 000000000000..79d3052a84a1 --- /dev/null +++ b/pkgs/by-name/fi/fim/package.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, autoconf, automake, pkg-config, lib +, perl, flex, bison, readline, libexif +, x11Support ? true, SDL +, svgSupport ? true, inkscape +, asciiArtSupport ? true, aalib +, gifSupport ? true, giflib +, tiffSupport ? true, libtiff +, jpegSupport ? true, libjpeg +, pngSupport ? true, libpng +}: + +stdenv.mkDerivation rec { + pname = "fim"; + version = "0.7"; + + src = fetchurl { + url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz"; + sha256 = "sha256-/p7bjeZM46DJOQ9sgtebhkNpBPj2RJYY3dMXhzHnNmg="; + }; + + postPatch = '' + substituteInPlace doc/vim2html.pl \ + --replace /usr/bin/perl ${perl}/bin/perl + ''; + + nativeBuildInputs = [ autoconf automake pkg-config ]; + + buildInputs = + [ perl flex bison readline libexif ] + ++ lib.optional x11Support SDL + ++ lib.optional svgSupport inkscape + ++ lib.optional asciiArtSupport aalib + ++ lib.optional gifSupport giflib + ++ lib.optional tiffSupport libtiff + ++ lib.optional jpegSupport libjpeg + ++ lib.optional pngSupport libpng; + + env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; + + meta = with lib; { + description = "Lightweight, highly customizable and scriptable image viewer"; + longDescription = '' + FIM (Fbi IMproved) is a lightweight, console based image viewer that aims + to be a highly customizable and scriptable for users who are comfortable + with software like the VIM text editor or the Mutt mail user agent. + ''; + homepage = "https://www.nongnu.org/fbi-improved/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/by-name/fi/find-cursor/package.nix similarity index 100% rename from pkgs/tools/X11/find-cursor/default.nix rename to pkgs/by-name/fi/find-cursor/package.nix diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/by-name/fi/findbugs/package.nix similarity index 100% rename from pkgs/development/tools/analysis/findbugs/default.nix rename to pkgs/by-name/fi/findbugs/package.nix diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/by-name/fi/findex/package.nix similarity index 100% rename from pkgs/applications/misc/findex/default.nix rename to pkgs/by-name/fi/findex/package.nix diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/by-name/fi/findnewest/package.nix similarity index 100% rename from pkgs/development/tools/misc/findnewest/default.nix rename to pkgs/by-name/fi/findnewest/package.nix diff --git a/pkgs/tools/networking/findomain/Cargo.lock b/pkgs/by-name/fi/findomain/Cargo.lock similarity index 100% rename from pkgs/tools/networking/findomain/Cargo.lock rename to pkgs/by-name/fi/findomain/Cargo.lock diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/by-name/fi/findomain/package.nix similarity index 100% rename from pkgs/tools/networking/findomain/default.nix rename to pkgs/by-name/fi/findomain/package.nix diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/by-name/fi/findup/package.nix similarity index 100% rename from pkgs/tools/misc/findup/default.nix rename to pkgs/by-name/fi/findup/package.nix diff --git a/pkgs/tools/security/fingerprintx/default.nix b/pkgs/by-name/fi/fingerprintx/package.nix similarity index 100% rename from pkgs/tools/security/fingerprintx/default.nix rename to pkgs/by-name/fi/fingerprintx/package.nix diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/by-name/fi/fio/package.nix similarity index 100% rename from pkgs/tools/system/fio/default.nix rename to pkgs/by-name/fi/fio/package.nix diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/by-name/fi/fioctl/package.nix similarity index 100% rename from pkgs/tools/admin/fioctl/default.nix rename to pkgs/by-name/fi/fioctl/package.nix diff --git a/pkgs/data/fonts/fira-go/default.nix b/pkgs/by-name/fi/fira-go/package.nix similarity index 100% rename from pkgs/data/fonts/fira-go/default.nix rename to pkgs/by-name/fi/fira-go/package.nix diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/by-name/fi/firectl/package.nix similarity index 100% rename from pkgs/applications/virtualization/firectl/default.nix rename to pkgs/by-name/fi/firectl/package.nix diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/by-name/fi/firefly-desktop/package.nix similarity index 100% rename from pkgs/applications/misc/firefly-desktop/default.nix rename to pkgs/by-name/fi/firefly-desktop/package.nix diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/by-name/fi/firejail/fbuilder-call-firejail-on-path.patch similarity index 100% rename from pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch rename to pkgs/by-name/fi/firejail/fbuilder-call-firejail-on-path.patch diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch similarity index 100% rename from pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch rename to pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/by-name/fi/firejail/package.nix similarity index 100% rename from pkgs/os-specific/linux/firejail/default.nix rename to pkgs/by-name/fi/firejail/package.nix diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/by-name/fi/firestarter/package.nix similarity index 100% rename from pkgs/applications/misc/firestarter/default.nix rename to pkgs/by-name/fi/firestarter/package.nix diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/by-name/fi/firewalld/package.nix similarity index 100% rename from pkgs/applications/networking/firewalld/default.nix rename to pkgs/by-name/fi/firewalld/package.nix diff --git a/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/pkgs/by-name/fi/firewalld/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch rename to pkgs/by-name/fi/firewalld/respect-xml-catalog-files-var.patch diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock b/pkgs/by-name/fi/firmware-manager/Cargo.lock similarity index 100% rename from pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock rename to pkgs/by-name/fi/firmware-manager/Cargo.lock diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/by-name/fi/firmware-manager/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/firmware-manager/default.nix rename to pkgs/by-name/fi/firmware-manager/package.nix diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/by-name/fi/firmware-updater/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/firmware-updater/default.nix rename to pkgs/by-name/fi/firmware-updater/package.nix diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json b/pkgs/by-name/fi/firmware-updater/pubspec.lock.json similarity index 100% rename from pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json rename to pkgs/by-name/fi/firmware-updater/pubspec.lock.json diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/by-name/fi/firrtl/package.nix similarity index 100% rename from pkgs/development/compilers/firrtl/default.nix rename to pkgs/by-name/fi/firrtl/package.nix diff --git a/pkgs/games/fish-fillets-ng/icon.xpm b/pkgs/by-name/fi/fish-fillets-ng/icon.xpm similarity index 100% rename from pkgs/games/fish-fillets-ng/icon.xpm rename to pkgs/by-name/fi/fish-fillets-ng/icon.xpm diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix similarity index 100% rename from pkgs/games/fish-fillets-ng/default.nix rename to pkgs/by-name/fi/fish-fillets-ng/package.nix diff --git a/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/pkgs/by-name/fi/fish-irssi/irssi-include-dir.patch similarity index 100% rename from pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch rename to pkgs/by-name/fi/fish-irssi/irssi-include-dir.patch diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/by-name/fi/fish-irssi/package.nix similarity index 100% rename from pkgs/applications/networking/irc/irssi/fish/default.nix rename to pkgs/by-name/fi/fish-irssi/package.nix diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix new file mode 100644 index 000000000000..b891bda1447e --- /dev/null +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -0,0 +1,83 @@ +{ + fetchFromGitHub, + fetchYarnDeps, + fish, + installShellFiles, + lib, + makeWrapper, + nix-update-script, + nodejs, + npmHooks, + stdenv, + which, + yarnBuildHook, + yarnConfigHook, +}: +stdenv.mkDerivation rec { + pname = "fish-lsp"; + version = "1.0.8-1"; + + src = fetchFromGitHub { + owner = "ndonfris"; + repo = "fish-lsp"; + rev = "refs/tags/v${version}"; + hash = "sha256-u125EZXQEouVbmJuoW3KNDNqLB5cS/TzblXraClcw6Q="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-hHw7DbeqaCapqx4dK5Y3sPut94ist9JOU8g9dd6gBdo="; + }; + + nativeBuildInputs = [ + yarnBuildHook + yarnConfigHook + npmHooks.npmInstallHook + nodejs + installShellFiles + makeWrapper + fish + ]; + + yarnBuildScript = "setup"; + + postBuild = '' + yarn --offline compile + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fish-lsp + cp -r . $out/share/fish-lsp + + makeWrapper ${lib.getExe nodejs} "$out/bin/fish-lsp" \ + --add-flags "$out/share/fish-lsp/out/cli.js" \ + --prefix PATH : "${ + lib.makeBinPath [ + fish + which + ] + }" + + ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd fish-lsp \ + --fish <($out/bin/fish-lsp complete --fish) + ''} + + runHook postInstall + ''; + + doDist = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "LSP implementation for the fish shell language"; + homepage = "https://github.com/ndonfris/fish-lsp"; + license = lib.licenses.mit; + mainProgram = "fish-lsp"; + maintainers = with lib.maintainers; [ petertriho ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/by-name/fi/fishnet/package.nix similarity index 100% rename from pkgs/servers/fishnet/default.nix rename to pkgs/by-name/fi/fishnet/package.nix diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/by-name/fi/fission/package.nix similarity index 100% rename from pkgs/development/tools/fission/default.nix rename to pkgs/by-name/fi/fission/package.nix diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/by-name/fi/fits-cloudctl/package.nix similarity index 100% rename from pkgs/tools/admin/fits-cloudctl/default.nix rename to pkgs/by-name/fi/fits-cloudctl/package.nix diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index e12db808ac2d..b197539cc421 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -28,14 +28,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "fittrackee"; - version = "0.8.9"; + version = "0.8.10"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "refs/tags/v${version}"; - hash = "sha256-raN6Ef/Z/JbdJDMKBIaBL8nmvFwvuZFX4rfC0ZgWgKI="; + hash = "sha256-K110H5Y8vQrRx2/O+2ezhpGp4G5sJUlzE+1cSYu7+4I="; }; build-system = [ diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/by-name/fi/fityk/package.nix similarity index 100% rename from pkgs/applications/science/misc/fityk/default.nix rename to pkgs/by-name/fi/fityk/package.nix diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/by-name/fi/fixedsys-excelsior/package.nix similarity index 100% rename from pkgs/data/fonts/fixedsys-excelsior/default.nix rename to pkgs/by-name/fi/fixedsys-excelsior/package.nix diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/by-name/fl/flac/package.nix similarity index 100% rename from pkgs/applications/audio/flac/default.nix rename to pkgs/by-name/fl/flac/package.nix diff --git a/pkgs/applications/audio/flac2all/default.nix b/pkgs/by-name/fl/flac2all/package.nix similarity index 100% rename from pkgs/applications/audio/flac2all/default.nix rename to pkgs/by-name/fl/flac2all/package.nix diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/by-name/fl/flamegraph/package.nix similarity index 100% rename from pkgs/development/tools/flamegraph/default.nix rename to pkgs/by-name/fl/flamegraph/package.nix diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/by-name/fl/flamerobin/package.nix similarity index 100% rename from pkgs/applications/misc/flamerobin/default.nix rename to pkgs/by-name/fl/flamerobin/package.nix diff --git a/pkgs/by-name/fl/flamp/package.nix b/pkgs/by-name/fl/flamp/package.nix new file mode 100644 index 000000000000..6dc8c81c1f95 --- /dev/null +++ b/pkgs/by-name/fl/flamp/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, fltk13 +, gettext +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flamp"; + version = "2.2.14"; + + src = fetchgit { + url = "https://git.code.sf.net/p/fldigi/flamp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-y8x/0rLJSHL1B61ODtjmf2S6W7ChZasBfFE9lc66FSI="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + gettext + ]; + + buildInputs = [ + fltk13 + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Digital modem program"; + homepage = "https://sourceforge.net/projects/fldigi/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ stteague ]; + platforms = platforms.unix; + broken = stdenv.system == "x86_64-darwin"; + mainProgram = "flamp"; + }; +}) diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/by-name/fl/flann/package.nix similarity index 100% rename from pkgs/development/libraries/flann/default.nix rename to pkgs/by-name/fl/flann/package.nix diff --git a/pkgs/by-name/fl/flare-floss/package.nix b/pkgs/by-name/fl/flare-floss/package.nix new file mode 100644 index 000000000000..020793273066 --- /dev/null +++ b/pkgs/by-name/fl/flare-floss/package.nix @@ -0,0 +1,72 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonPackage rec { + pname = "flare-floss"; + version = "3.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mandiant"; + repo = "flare-floss"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; # for tests + hash = "sha256-ciyF1Pt5KdUsmpTgvfgE81hhTHBM5zMBcZpom99R5GY="; + }; + + postPatch = '' + substituteInPlace floss/main.py \ + --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' + ''; + + pythonRelaxDeps = [ "networkx" ]; + + build-system = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + dependencies = + with python3.pkgs; + [ + binary2strings + dncil + halo + networkx + pefile + pydantic + rich + tabulate + tqdm + viv-utils + vivisect + ] + ++ viv-utils.optional-dependencies.flirt; + + nativeCheckInputs = with python3.pkgs; [ + pytest-sugar + pytestCheckHook + pyyaml + ]; + + postInstall = '' + mkdir -p $out/share/flare-floss/ + cp -r floss/sigs $out/share/flare-floss/ + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Automatically extract obfuscated strings from malware"; + homepage = "https://github.com/mandiant/flare-floss"; + changelog = "https://github.com/mandiant/flare-floss/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "floss"; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/by-name/fl/flare-signal/Cargo.lock similarity index 100% rename from pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock rename to pkgs/by-name/fl/flare-signal/Cargo.lock diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/by-name/fl/flare-signal/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/flare-signal/default.nix rename to pkgs/by-name/fl/flare-signal/package.nix diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/by-name/fl/flashbench/package.nix similarity index 100% rename from pkgs/os-specific/linux/flashbench/default.nix rename to pkgs/by-name/fl/flashbench/package.nix diff --git a/pkgs/by-name/fl/flashfocus/package.nix b/pkgs/by-name/fl/flashfocus/package.nix new file mode 100644 index 000000000000..f49c7936f60e --- /dev/null +++ b/pkgs/by-name/fl/flashfocus/package.nix @@ -0,0 +1,59 @@ +{ lib, python3Packages, fetchPypi, netcat-openbsd, procps, bash, nix-update-script }: + +python3Packages.buildPythonApplication rec { + pname = "flashfocus"; + version = "2.4.1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; + }; + + postPatch = '' + substituteInPlace bin/nc_flash_window \ + --replace-fail "nc" "${lib.getExe netcat-openbsd}" + + substituteInPlace src/flashfocus/util.py \ + --replace-fail "pidof" "${lib.getExe' procps "pidof"}" + ''; + + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + buildInputs = [ + bash + ]; + + pythonRelaxDeps = [ + "pyyaml" + "xcffib" + ]; + + propagatedBuildInputs = with python3Packages; [ + i3ipc + xcffib + click + cffi + xpybutil + marshmallow + pyyaml + ]; + + # Tests require access to a X session + doCheck = false; + + pythonImportsCheck = [ "flashfocus" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/fennerm/flashfocus"; + description = "Simple focus animations for tiling window managers"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index d282c2f02483..f405ef99e9a5 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.17.1"; + version = "1.17.3"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA="; + hash = "sha256-AL3jkmz+LLg8apyMkemQugFrZpn5f1sJEskjEiZ5/PQ="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/fl/flashrom/package.nix b/pkgs/by-name/fl/flashrom/package.nix new file mode 100644 index 000000000000..4eb39970e84f --- /dev/null +++ b/pkgs/by-name/fl/flashrom/package.nix @@ -0,0 +1,48 @@ +{ fetchurl +, stdenv +, installShellFiles +, lib +, libftdi1 +, libjaylink +, libusb1 +, pciutils +, pkg-config +, jlinkSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "flashrom"; + version = "1.3.0"; + + src = fetchurl { + url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; + hash = "sha256-oFMjRFPM0BLnnzRDvcxhYlz5e3/Xy0zdi/v/vosUliM="; + }; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ libftdi1 libusb1 ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ] + ++ lib.optional jlinkSupport libjaylink; + + postPatch = '' + substituteInPlace util/flashrom_udev.rules \ + --replace 'GROUP="plugdev"' 'TAG+="uaccess", TAG+="udev-acl"' + ''; + + makeFlags = [ "PREFIX=$(out)" "libinstall" ] + ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes" + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; + + postInstall = '' + install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules + ''; + + meta = with lib; { + homepage = "https://www.flashrom.org"; + description = "Utility for reading, writing, erasing and verifying flash ROM chips"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + mainProgram = "flashrom"; + }; +} diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/by-name/fl/flasm/package.nix similarity index 100% rename from pkgs/development/compilers/flasm/default.nix rename to pkgs/by-name/fl/flasm/package.nix diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix similarity index 100% rename from pkgs/data/themes/flat-remix-gnome/default.nix rename to pkgs/by-name/fl/flat-remix-gnome/package.nix diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/by-name/fl/flat-remix-gtk/package.nix similarity index 100% rename from pkgs/data/themes/flat-remix-gtk/default.nix rename to pkgs/by-name/fl/flat-remix-gtk/package.nix diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/by-name/fl/flatcc/package.nix similarity index 100% rename from pkgs/development/libraries/flatcc/default.nix rename to pkgs/by-name/fl/flatcc/package.nix diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/by-name/fl/flavours/package.nix similarity index 100% rename from pkgs/applications/misc/flavours/default.nix rename to pkgs/by-name/fl/flavours/package.nix diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/by-name/fl/flawfinder/package.nix similarity index 100% rename from pkgs/development/tools/flawfinder/default.nix rename to pkgs/by-name/fl/flawfinder/package.nix diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix index 317005c1414f..db579a6b0f76 100644 --- a/pkgs/by-name/fl/flawz/package.nix +++ b/pkgs/by-name/fl/flawz/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "flawz"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "orhun"; repo = "flawz"; rev = "v${version}"; - hash = "sha256-/gNHi7ZENy0cgnEgDBW82ACUUsuMLYD9eUrSxwO9k1U="; + hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI="; }; - cargoHash = "sha256-kMiKlZj+G1vfjaEiB3rtPoJl0K3W9xRVwgVz8q2pn1s="; + cargoHash = "sha256-jVAMnU2NnL/2Hri6NxSUkIfQ/bJ5wMZ+oFOTMPrFE0M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/by-name/fl/flex-ncat/package.nix similarity index 100% rename from pkgs/applications/radio/flex-ncat/default.nix rename to pkgs/by-name/fl/flex-ncat/package.nix diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/by-name/fl/flex-ndax/package.nix similarity index 100% rename from pkgs/applications/radio/flex-ndax/default.nix rename to pkgs/by-name/fl/flex-ndax/package.nix diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/by-name/fl/flexcpp/package.nix similarity index 100% rename from pkgs/development/tools/parsing/flexc++/default.nix rename to pkgs/by-name/fl/flexcpp/package.nix diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/by-name/fl/flexibee/package.nix similarity index 100% rename from pkgs/applications/office/flexibee/default.nix rename to pkgs/by-name/fl/flexibee/package.nix diff --git a/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch b/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch similarity index 100% rename from pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch rename to pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/by-name/fl/flexoptix-app/package.nix similarity index 100% rename from pkgs/tools/misc/flexoptix-app/default.nix rename to pkgs/by-name/fl/flexoptix-app/package.nix diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/by-name/fl/flink/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/flink/default.nix rename to pkgs/by-name/fl/flink/package.nix diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/by-name/fl/flintlock/package.nix similarity index 100% rename from pkgs/applications/virtualization/flintlock/default.nix rename to pkgs/by-name/fl/flintlock/package.nix diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/by-name/fl/flips/package.nix similarity index 100% rename from pkgs/tools/compression/flips/default.nix rename to pkgs/by-name/fl/flips/package.nix diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/by-name/fl/flips/use-system-libdivsufsort.patch similarity index 100% rename from pkgs/tools/compression/flips/use-system-libdivsufsort.patch rename to pkgs/by-name/fl/flips/use-system-libdivsufsort.patch diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/by-name/fl/flitter/package.nix similarity index 100% rename from pkgs/tools/misc/flitter/default.nix rename to pkgs/by-name/fl/flitter/package.nix diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/by-name/fl/flix/package.nix similarity index 100% rename from pkgs/development/compilers/flix/default.nix rename to pkgs/by-name/fl/flix/package.nix diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/by-name/fl/fllog/package.nix similarity index 100% rename from pkgs/applications/radio/fllog/default.nix rename to pkgs/by-name/fl/fllog/package.nix diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/by-name/fl/flmsg/package.nix similarity index 100% rename from pkgs/applications/radio/flmsg/default.nix rename to pkgs/by-name/fl/flmsg/package.nix diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/by-name/fl/flock/package.nix similarity index 100% rename from pkgs/development/tools/flock/default.nix rename to pkgs/by-name/fl/flock/package.nix diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/by-name/fl/flockit/package.nix similarity index 100% rename from pkgs/tools/backup/flockit/default.nix rename to pkgs/by-name/fl/flockit/package.nix diff --git a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix b/pkgs/by-name/fl/flood-for-transmission/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/flood-for-transmission/default.nix rename to pkgs/by-name/fl/flood-for-transmission/package.nix diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/by-name/fl/flood/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/flood/default.nix rename to pkgs/by-name/fl/flood/package.nix diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/by-name/fl/flootty/package.nix similarity index 100% rename from pkgs/development/tools/flootty/default.nix rename to pkgs/by-name/fl/flootty/package.nix diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/by-name/fl/flopoco/package.nix similarity index 100% rename from pkgs/applications/science/electronics/flopoco/default.nix rename to pkgs/by-name/fl/flopoco/package.nix diff --git a/pkgs/by-name/fl/florist/package.nix b/pkgs/by-name/fl/florist/package.nix new file mode 100644 index 000000000000..b04148b63da7 --- /dev/null +++ b/pkgs/by-name/fl/florist/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + gnat13, + gnat13Packages, + fetchFromGitHub, + lib, +}: + +stdenv.mkDerivation rec { + name = "florist"; + version = "24.2"; + + src = fetchFromGitHub { + owner = "adacore"; + repo = "florist"; + rev = "refs/heads/${version}"; + hash = "sha256-EFGmcQfWpxEWfsAoQrHegTlizl6siE8obKx+fCpVwUQ="; + }; + + configureFlags = [ "--enable-shared" ]; + + nativeBuildInputs = [ + gnat13 + gnat13Packages.gprbuild + ]; + + meta = { + description = "Posix Ada Bindings"; + homepage = "https://github.com/adacore/florist"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lutzberger ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/by-name/fl/flowblade/package.nix similarity index 100% rename from pkgs/applications/video/flowblade/default.nix rename to pkgs/by-name/fl/flowblade/package.nix diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/by-name/fl/flpsed/package.nix similarity index 100% rename from pkgs/applications/editors/flpsed/default.nix rename to pkgs/by-name/fl/flpsed/package.nix diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/by-name/fl/flrig/package.nix similarity index 100% rename from pkgs/applications/radio/flrig/default.nix rename to pkgs/by-name/fl/flrig/package.nix diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 6d0aff14b531..8c6c762e66c3 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-SIBdiKgg444sZ8RUQscnOg8XzuAZcLvU4++0HY0G/ss="; + hash = "sha256-/YKXWYaDqkJ8fWgcYktXWJPcjDJTupgRTSQVp0cWruY="; }; # optional only to avoid linux rebuild diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/by-name/fl/fluent-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/fluent-icon-theme/default.nix rename to pkgs/by-name/fl/fluent-icon-theme/package.nix diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/by-name/fl/fluent-reader/package.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/fluent-reader/default.nix rename to pkgs/by-name/fl/fluent-reader/package.nix diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/by-name/fl/fluffychat/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/fluffychat/default.nix rename to pkgs/by-name/fl/fluffychat/package.nix diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json similarity index 100% rename from pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json rename to pkgs/by-name/fl/fluffychat/pubspec.lock.json diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/by-name/fl/fluidd/package.nix similarity index 100% rename from pkgs/applications/misc/fluidd/default.nix rename to pkgs/by-name/fl/fluidd/package.nix diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/by-name/fl/flux/package.nix similarity index 100% rename from pkgs/development/compilers/flux/default.nix rename to pkgs/by-name/fl/flux/package.nix diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/by-name/fl/fluxboxlauncher/package.nix similarity index 100% rename from pkgs/applications/misc/fluxboxlauncher/default.nix rename to pkgs/by-name/fl/fluxboxlauncher/package.nix diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/by-name/fl/fluxctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/fluxctl/default.nix rename to pkgs/by-name/fl/fluxctl/package.nix diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/by-name/fl/fluxus/fix-build.patch similarity index 100% rename from pkgs/applications/graphics/fluxus/fix-build.patch rename to pkgs/by-name/fl/fluxus/fix-build.patch diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/by-name/fl/fluxus/package.nix similarity index 100% rename from pkgs/applications/graphics/fluxus/default.nix rename to pkgs/by-name/fl/fluxus/package.nix diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/by-name/fl/flvstreamer/package.nix similarity index 100% rename from pkgs/tools/networking/flvstreamer/default.nix rename to pkgs/by-name/fl/flvstreamer/package.nix diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/by-name/fl/flwrap/package.nix similarity index 100% rename from pkgs/applications/radio/flwrap/default.nix rename to pkgs/by-name/fl/flwrap/package.nix diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/by-name/fl/fly/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/fly/default.nix rename to pkgs/by-name/fl/fly/package.nix diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/by-name/fl/flycast/package.nix similarity index 100% rename from pkgs/applications/emulators/flycast/default.nix rename to pkgs/by-name/fl/flycast/package.nix diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/by-name/fl/flyway/package.nix similarity index 100% rename from pkgs/development/tools/flyway/default.nix rename to pkgs/by-name/fl/flyway/package.nix diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/by-name/fl/flywheel-cli/package.nix similarity index 100% rename from pkgs/applications/science/biology/flywheel-cli/default.nix rename to pkgs/by-name/fl/flywheel-cli/package.nix diff --git a/pkgs/applications/file-managers/fm/default.nix b/pkgs/by-name/fm/fm/package.nix similarity index 100% rename from pkgs/applications/file-managers/fm/default.nix rename to pkgs/by-name/fm/fm/package.nix diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/by-name/fm/fmsynth/package.nix similarity index 100% rename from pkgs/applications/audio/fmsynth/default.nix rename to pkgs/by-name/fm/fmsynth/package.nix diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/by-name/fn/fn-cli/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/fn-cli/default.nix rename to pkgs/by-name/fn/fn-cli/package.nix diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix new file mode 100644 index 000000000000..84e7920a0bd1 --- /dev/null +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + SDL2, +}: +stdenv.mkDerivation rec { + pname = "fna3d"; + version = "24.11"; + + src = fetchFromGitHub { + owner = "FNA-XNA"; + repo = "FNA3D"; + rev = version; + fetchSubmodules = true; + hash = "sha256-NTVaPY39acSRibGQjLuh5ZBGC1Zep/rybVcOU0WrNIw="; + }; + + buildInputs = [ SDL2 ]; + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + install -Dm755 libFNA3D.so $out/lib/libFNA3D.so + ln -s libFNA3D.so $out/lib/libFNA3D.so.0 + ln -s libFNA3D.so $out/lib/libFNA3D.so.0.${version} + runHook postInstall + ''; + + meta = { + description = "Accuracy-focused XNA4 reimplementation for open platforms"; + homepage = "https://fna-xna.github.io/"; + license = lib.licenses.mspl; + platforms = lib.platforms.linux; + mainProgram = pname; + maintainers = with lib.maintainers; [ mrtnvgr ]; + }; +} diff --git a/pkgs/by-name/fn/fnlfmt/package.nix b/pkgs/by-name/fn/fnlfmt/package.nix new file mode 100644 index 000000000000..052068710cf3 --- /dev/null +++ b/pkgs/by-name/fn/fnlfmt/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromSourcehut, + lua, + luaPackages, +}: + +stdenv.mkDerivation rec { + pname = "fnlfmt"; + version = "0.3.2"; + + src = fetchFromSourcehut { + owner = "~technomancy"; + repo = "fnlfmt"; + rev = "refs/tags/${version}"; + hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk="; + }; + + nativeBuildInputs = [ luaPackages.fennel ]; + + buildInputs = [ lua ]; + + makeFlags = [ + "PREFIX=$(out)" + "FENNEL=${luaPackages.fennel}/bin/fennel" + ]; + sourceRoot = [ "${src.name}/tags/${version}" ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/fnlfmt --help > /dev/null + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "Formatter for Fennel"; + homepage = src.meta.homepage; + changelog = "${src.meta.homepage}/tree/${version}/changelog.md"; + license = licenses.mit; + platforms = lua.meta.platforms; + maintainers = with maintainers; [ chiroptical ]; + mainProgram = "fnlfmt"; + }; +} diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/by-name/fn/fnotifystat/package.nix similarity index 100% rename from pkgs/os-specific/linux/fnotifystat/default.nix rename to pkgs/by-name/fn/fnotifystat/package.nix diff --git a/pkgs/tools/misc/fntsample/default.nix b/pkgs/by-name/fn/fntsample/package.nix similarity index 100% rename from pkgs/tools/misc/fntsample/default.nix rename to pkgs/by-name/fn/fntsample/package.nix diff --git a/pkgs/applications/graphics/focus-stack/default.nix b/pkgs/by-name/fo/focus-stack/package.nix similarity index 100% rename from pkgs/applications/graphics/focus-stack/default.nix rename to pkgs/by-name/fo/focus-stack/package.nix diff --git a/pkgs/tools/X11/focus/default.nix b/pkgs/by-name/fo/focus/package.nix similarity index 100% rename from pkgs/tools/X11/focus/default.nix rename to pkgs/by-name/fo/focus/package.nix diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/by-name/fo/foliate/package.nix similarity index 100% rename from pkgs/applications/office/foliate/default.nix rename to pkgs/by-name/fo/foliate/package.nix diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/by-name/fo/folks/package.nix similarity index 100% rename from pkgs/development/libraries/folks/default.nix rename to pkgs/by-name/fo/folks/package.nix diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/by-name/fo/foma/package.nix similarity index 100% rename from pkgs/tools/misc/foma/default.nix rename to pkgs/by-name/fo/foma/package.nix diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/by-name/fo/fomp/package.nix similarity index 100% rename from pkgs/applications/audio/fomp/default.nix rename to pkgs/by-name/fo/fomp/package.nix diff --git a/pkgs/tools/misc/font-config-info/default.nix b/pkgs/by-name/fo/font-config-info/package.nix similarity index 100% rename from pkgs/tools/misc/font-config-info/default.nix rename to pkgs/by-name/fo/font-config-info/package.nix diff --git a/pkgs/applications/misc/fontfinder/default.nix b/pkgs/by-name/fo/fontfinder/package.nix similarity index 100% rename from pkgs/applications/misc/fontfinder/default.nix rename to pkgs/by-name/fo/fontfinder/package.nix diff --git a/pkgs/applications/misc/fontpreview/default.nix b/pkgs/by-name/fo/fontpreview/package.nix similarity index 100% rename from pkgs/applications/misc/fontpreview/default.nix rename to pkgs/by-name/fo/fontpreview/package.nix diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/by-name/fo/foo2zjs/dell1250c-color-fix.patch similarity index 100% rename from pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch rename to pkgs/by-name/fo/foo2zjs/dell1250c-color-fix.patch diff --git a/pkgs/misc/drivers/foo2zjs/hbpl1.patch b/pkgs/by-name/fo/foo2zjs/hbpl1.patch similarity index 100% rename from pkgs/misc/drivers/foo2zjs/hbpl1.patch rename to pkgs/by-name/fo/foo2zjs/hbpl1.patch diff --git a/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff b/pkgs/by-name/fo/foo2zjs/no-hardcode-fw.diff similarity index 100% rename from pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff rename to pkgs/by-name/fo/foo2zjs/no-hardcode-fw.diff diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/by-name/fo/foo2zjs/package.nix similarity index 100% rename from pkgs/misc/drivers/foo2zjs/default.nix rename to pkgs/by-name/fo/foo2zjs/package.nix diff --git a/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch b/pkgs/by-name/fo/foo2zjs/papercode-format-fix.patch similarity index 100% rename from pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch rename to pkgs/by-name/fo/foo2zjs/papercode-format-fix.patch diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/by-name/fo/foomatic-filters/package.nix similarity index 100% rename from pkgs/misc/drivers/foomatic-filters/default.nix rename to pkgs/by-name/fo/foomatic-filters/package.nix diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/by-name/fo/foot/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/foot/default.nix rename to pkgs/by-name/fo/foot/package.nix diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/by-name/fo/fop/package.nix similarity index 100% rename from pkgs/tools/typesetting/fop/default.nix rename to pkgs/by-name/fo/fop/package.nix diff --git a/pkgs/tools/system/foremost/makefile.patch b/pkgs/by-name/fo/foremost/makefile.patch similarity index 100% rename from pkgs/tools/system/foremost/makefile.patch rename to pkgs/by-name/fo/foremost/makefile.patch diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/by-name/fo/foremost/package.nix similarity index 100% rename from pkgs/tools/system/foremost/default.nix rename to pkgs/by-name/fo/foremost/package.nix diff --git a/pkgs/games/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch similarity index 100% rename from pkgs/games/forge-mtg/no-launch4j.patch rename to pkgs/by-name/fo/forge-mtg/no-launch4j.patch diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/by-name/fo/forge-mtg/package.nix similarity index 100% rename from pkgs/games/forge-mtg/default.nix rename to pkgs/by-name/fo/forge-mtg/package.nix diff --git a/pkgs/development/libraries/forge/no-download-glad.patch b/pkgs/by-name/fo/forge/no-download-glad.patch similarity index 100% rename from pkgs/development/libraries/forge/no-download-glad.patch rename to pkgs/by-name/fo/forge/no-download-glad.patch diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/by-name/fo/forge/package.nix similarity index 100% rename from pkgs/development/libraries/forge/default.nix rename to pkgs/by-name/fo/forge/package.nix diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 39f0aefd7a35..27a497470468 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "forgejo-runner"; - version = "3.5.1"; + version = "4.0.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-LRMkwSrBU5/IPXMhRT05pE487nmSffXvmfbwBiqpyj8="; + hash = "sha256-hG8gCohf+U8T9A9Abqey9upErJklbCp8HuzHQKFcu3E="; }; - vendorHash = "sha256-XLDtWYFHwBqbkzj4yRyr3uC1FnpS0bn1ia8i6m+CTBM="; + vendorHash = "sha256-yRXI9/LVj4f7qFdScqfpL5WCsK+lJXa6yQmdbUhfrKY="; ldflags = [ "-s" diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index daef0e418e49..756843b7d2af 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -155,7 +155,7 @@ buildGoModule rec { meta = { description = "Self-hosted lightweight software forge"; homepage = "https://forgejo.org"; - changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; + changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit; maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens marie ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/by-name/fo/forkstat/package.nix similarity index 100% rename from pkgs/os-specific/linux/forkstat/default.nix rename to pkgs/by-name/fo/forkstat/package.nix diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/by-name/fo/forktty/package.nix similarity index 100% rename from pkgs/os-specific/linux/forktty/default.nix rename to pkgs/by-name/fo/forktty/package.nix diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/by-name/fo/form/package.nix similarity index 100% rename from pkgs/applications/science/math/form/default.nix rename to pkgs/by-name/fo/form/package.nix diff --git a/pkgs/applications/misc/formatter/fix-paths.patch b/pkgs/by-name/fo/formatter/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/formatter/fix-paths.patch rename to pkgs/by-name/fo/formatter/fix-paths.patch diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/by-name/fo/formatter/package.nix similarity index 100% rename from pkgs/applications/misc/formatter/default.nix rename to pkgs/by-name/fo/formatter/package.nix diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/by-name/fo/formula/nuget.nix similarity index 100% rename from pkgs/applications/science/logic/formula/nuget.nix rename to pkgs/by-name/fo/formula/nuget.nix diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/by-name/fo/formula/package.nix similarity index 100% rename from pkgs/applications/science/logic/formula/default.nix rename to pkgs/by-name/fo/formula/package.nix diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/by-name/fo/fornalder/package.nix similarity index 100% rename from pkgs/applications/version-management/fornalder/default.nix rename to pkgs/by-name/fo/fornalder/package.nix diff --git a/pkgs/development/libraries/fortify-headers/default.nix b/pkgs/by-name/fo/fortify-headers/package.nix similarity index 100% rename from pkgs/development/libraries/fortify-headers/default.nix rename to pkgs/by-name/fo/fortify-headers/package.nix diff --git a/pkgs/development/libraries/fortify-headers/restore-macros.patch b/pkgs/by-name/fo/fortify-headers/restore-macros.patch similarity index 100% rename from pkgs/development/libraries/fortify-headers/restore-macros.patch rename to pkgs/by-name/fo/fortify-headers/restore-macros.patch diff --git a/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch b/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch similarity index 100% rename from pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch rename to pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch diff --git a/pkgs/tools/package-management/fortran-fpm/default.nix b/pkgs/by-name/fo/fortran-fpm/package.nix similarity index 100% rename from pkgs/tools/package-management/fortran-fpm/default.nix rename to pkgs/by-name/fo/fortran-fpm/package.nix diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/by-name/fo/fortune/package.nix similarity index 100% rename from pkgs/tools/misc/fortune/default.nix rename to pkgs/by-name/fo/fortune/package.nix diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/by-name/fo/foxtrotgps/package.nix similarity index 100% rename from pkgs/applications/misc/foxtrotgps/default.nix rename to pkgs/by-name/fo/foxtrotgps/package.nix diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/by-name/fp/fparser/package.nix similarity index 100% rename from pkgs/applications/science/electronics/fparser/default.nix rename to pkgs/by-name/fp/fparser/package.nix diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/by-name/fp/fpart/package.nix similarity index 100% rename from pkgs/tools/misc/fpart/default.nix rename to pkgs/by-name/fp/fpart/package.nix diff --git a/pkgs/development/libraries/fpattern/default.nix b/pkgs/by-name/fp/fpattern/package.nix similarity index 100% rename from pkgs/development/libraries/fpattern/default.nix rename to pkgs/by-name/fp/fpattern/package.nix diff --git a/pkgs/by-name/fp/fped/package.nix b/pkgs/by-name/fp/fped/package.nix new file mode 100644 index 000000000000..dbfeb69c6bfa --- /dev/null +++ b/pkgs/by-name/fp/fped/package.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchgit +, flex, bison, fig2dev, imagemagick, netpbm, gtk2 +, pkg-config +}: + +stdenv.mkDerivation { + pname = "fped"; + version = "unstable-2017-05-11"; + + src = fetchgit { + url = "git://projects.qi-hardware.com/fped.git"; + rev = "fa98e58157b6f68396d302c32421e882ac87f45b"; + sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; + }; + + # Workaround build failure on -fno-common toolchains: + # ld: postscript.o:postscript.h:29: multiple definition of + # `postscript_params'; fped.o:postscript.h:29: first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + # This uses '/bin/bash', '/usr/local' and 'lex' by default + makeFlags = [ + "PREFIX=${placeholder "out"}" + "LEX=flex" + "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt" + ]; + + nativeBuildInputs = [ + flex + bison + pkg-config + imagemagick + fig2dev + netpbm + ]; + + buildInputs = [ + gtk2 + ]; + + meta = with lib; { + description = "Editor that allows the interactive creation of footprints electronic components"; + mainProgram = "fped"; + homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; + license = licenses.gpl2; + maintainers = []; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/by-name/fp/fping/package.nix similarity index 100% rename from pkgs/tools/networking/fping/default.nix rename to pkgs/by-name/fp/fping/package.nix diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/by-name/fp/fpm2/package.nix similarity index 100% rename from pkgs/tools/security/fpm2/default.nix rename to pkgs/by-name/fp/fpm2/package.nix diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/by-name/fp/fpp/package.nix similarity index 100% rename from pkgs/tools/misc/fpp/default.nix rename to pkgs/by-name/fp/fpp/package.nix diff --git a/pkgs/development/tools/fprettify/default.nix b/pkgs/by-name/fp/fprettify/package.nix similarity index 100% rename from pkgs/development/tools/fprettify/default.nix rename to pkgs/by-name/fp/fprettify/package.nix diff --git a/pkgs/by-name/fp/fprintd-tod/package.nix b/pkgs/by-name/fp/fprintd-tod/package.nix new file mode 100644 index 000000000000..bb34e1b88de2 --- /dev/null +++ b/pkgs/by-name/fp/fprintd-tod/package.nix @@ -0,0 +1,79 @@ +{ + lib, + fetchFromGitLab, + fetchpatch, + libxml2, + fprintd, + libfprint-tod, + python3Packages, + libpam-wrapper, + gusb, + gobject-introspection, +}: + +(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs ( + finalAttrs: previousAttrs: { + pname = "fprintd-tod"; + version = "1.90.9"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "fprintd"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; + }; + + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ + libpam-wrapper + python3Packages.python + python3Packages.pycairo + python3Packages.dbus-python + python3Packages.python-dbusmock + python3Packages.pygobject3 + gusb + python3Packages.pypamtest + gobject-introspection + libxml2 # for xmllint + ]; + + patches = previousAttrs.patches or [ ] ++ [ + (fetchpatch { + name = "use-more-idiomatic-correct-embedded-shell-scripting"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; + sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek="; + }) + (fetchpatch { + name = "remove-pointless-copying-of-files-into-build-directory"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch"; + sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4="; + }) + (fetchpatch { + name = "build-Do-not-use-positional-arguments-in-i18n.merge_file"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; + sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; + }) + (fetchpatch { + name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; + sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; + }) + ]; + + postPatch = + previousAttrs.postPatch or "" + + '' + # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming + mv src/device.xml src/net.reactivated.Fprint.Device.xml + mv src/manager.xml src/net.reactivated.Fprint.Manager.xml + ''; + + meta = { + homepage = "https://fprint.freedesktop.org/"; + description = "fprintd built with libfprint-tod to support Touch OEM Drivers"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke ]; + }; + } +) diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix new file mode 100644 index 000000000000..aeddeebba167 --- /dev/null +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -0,0 +1,122 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + gobject-introspection, + meson, + ninja, + perl, + gettext, + gtk-doc, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_412, + glib, + gusb, + dbus, + polkit, + nss, + pam, + systemd, + libfprint, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fprintd"; + version = "1.94.4"; + outputs = [ + "out" + "devdoc" + ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "fprintd"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + perl # for pod2man + gettext + gtk-doc + python3 + libxslt + dbus + docbook-xsl-nons + docbook_xml_dtd_412 + ]; + + buildInputs = [ + glib + polkit + nss + pam + systemd + libfprint + ]; + + nativeCheckInputs = with python3.pkgs; [ + gobject-introspection # for setup hook + python-dbusmock + dbus-python + pygobject3 + pycairo + pypamtest + gusb # Required by libfprint’s typelib + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dpam_modules_dir=${placeholder "out"}/lib/security" + "-Dsysconfdir=${placeholder "out"}/etc" + "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services" + "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" + ]; + + PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; + + # FIXME: Ugly hack for tests to find libpam_wrapper.so + LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + + mesonCheckFlags = [ + # PAM related checks are timing out + "--no-suite" + "fprintd:TestPamFprintd" + ]; + + patches = [ + # Skip flaky test "test_removal_during_enroll" + # https://gitlab.freedesktop.org/libfprint/fprintd/-/issues/129 + ./skip-test-test_removal_during_enroll.patch + ]; + + postPatch = '' + patchShebangs \ + po/check-translations.sh \ + tests/unittest_inspector.py + + # Stop tests from failing due to unhandled GTasks uncovered by GLib 2.76 bump. + # https://gitlab.freedesktop.org/libfprint/fprintd/-/issues/151 + substituteInPlace tests/fprintd.py \ + --replace "env['G_DEBUG'] = 'fatal-criticals'" "" + substituteInPlace tests/meson.build \ + --replace "'G_DEBUG=fatal-criticals'," "" + ''; + + meta = { + homepage = "https://fprint.freedesktop.org/"; + description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; + }; +}) diff --git a/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch b/pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch similarity index 100% rename from pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch rename to pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/by-name/fq/fq/package.nix similarity index 100% rename from pkgs/development/tools/fq/default.nix rename to pkgs/by-name/fq/fq/package.nix diff --git a/pkgs/by-name/fr/fractal/Cargo.lock b/pkgs/by-name/fr/fractal/Cargo.lock new file mode 100644 index 000000000000..62f36b4452b2 --- /dev/null +++ b/pkgs/by-name/fr/fractal/Cargo.lock @@ -0,0 +1,5908 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accessory" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87537f9ae7cfa78d5b8ebd1a1db25959f5e737126be4d8eb44a5452fc4b63cde" +dependencies = [ + "macroific", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + +[[package]] +name = "aquamarine" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + +[[package]] +name = "ashpd" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "pipewire", + "rand", + "serde", + "serde_repr", + "tokio", + "tracing", + "url", + "zbus", +] + +[[package]] +name = "assign" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-once-cell" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" + +[[package]] +name = "async-process" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "tracing", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-rx" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a30de4e5329a0947e389f738a6ca0d0b938fea5cb7baaeae7d72e243614468a2" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async_cell" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "annotate-snippets", + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "bitmaps" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" + +[[package]] +name = "cairo-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" +dependencies = [ + "bitflags 2.6.0", + "cairo-sys-rs", + "glib", + "libc", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" +dependencies = [ + "glib-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +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-expr" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const_panic" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie-factory" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "date_header" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" + +[[package]] +name = "deadpool" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6541a3916932fe57768d4be0b1ffb5ec7cbf74ca8c903fdfd5c0fe8aa958f0ed" +dependencies = [ + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" +dependencies = [ + "tokio", +] + +[[package]] +name = "deadpool-sqlite" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f9cc6210316f8b7ced394e2a5d2833ce7097fb28afb5881299c61bc18e8e0e9" +dependencies = [ + "deadpool", + "deadpool-sync", + "rusqlite", +] + +[[package]] +name = "deadpool-sync" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" +dependencies = [ + "deadpool-runtime", +] + +[[package]] +name = "delegate-display" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98a85201f233142ac819bbf6226e36d0b5e129a47bd325084674261c82d4cd66" +dependencies = [ + "macroific", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "djb_hash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "serde", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "env_filter", + "humantime", + "log", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "eyeball" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" +dependencies = [ + "futures-core", + "readlock", + "tracing", +] + +[[package]] +name = "eyeball-im" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae8c5165c9770f3ec7cccce12f4c5d70f01fa8bf84cf30cfbfd5a1c6f8901d5" +dependencies = [ + "futures-core", + "imbl", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "eyeball-im-util" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b6b037e2cdce928a432ecc2880c944e5436d8a38c827974b882ad373f60037" +dependencies = [ + "arrayvec", + "eyeball-im", + "futures-core", + "imbl", + "pin-project-lite", + "smallvec", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fancy_constructor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07b19d0e43eae2bfbafe4931b5e79c73fb1a849ca15cd41a761a7b8587f9a1a2" +dependencies = [ + "macroific", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[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", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[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 = "fractal" +version = "9.0.0" +dependencies = [ + "ashpd", + "djb_hash", + "futures-channel", + "futures-util", + "geo-uri", + "gettext-rs", + "glycin", + "gst-plugin-gtk4", + "gstreamer", + "gstreamer-app", + "gstreamer-base", + "gstreamer-pbutils", + "gstreamer-play", + "gstreamer-video", + "gtk4", + "image", + "indexmap", + "libadwaita", + "libshumate", + "linkify", + "matrix-sdk", + "matrix-sdk-ui", + "mime", + "mime_guess", + "once_cell", + "oo7", + "pulldown-cmark", + "qrcode", + "rand", + "regex", + "rmp-serde", + "rqrr", + "ruma", + "secular", + "serde", + "serde_json", + "sourceview5", + "strum", + "thiserror", + "tld", + "tokio", + "tokio-stream", + "tracing", + "tracing-subscriber", + "url", + "webp", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "g2gen" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc3e32f911a41e073b8492473c3595a043e1369ab319a2dbf8c89b1fea06457c" +dependencies = [ + "g2poly", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "g2p" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9afa6efed9af3a5a68ba066429c1497c299d4eafbd948fe630df47a8f2d29f" +dependencies = [ + "g2gen", + "g2poly", +] + +[[package]] +name = "g2poly" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd8b261ccf00df8c5cc60c082bb7d7aa64c33a433cfcc091ca244326c924b2c" + +[[package]] +name = "gdk-pixbuf" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gdk4" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c121aeeb0cf7545877ae615dac6bfd088b739d8abee4d55e7143b06927d16a31" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3c03d1ea9d5199f14f060890fde68a3b5ec5699144773d1fa6abf337bfbc9c" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 7.0.3", +] + +[[package]] +name = "gdk4-win32" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "275e0a5470f8da4ec00cf1856d4ebae4cd022b9abbb5eb2dbd57f511ca35fd22" +dependencies = [ + "gdk4", + "gdk4-win32-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk4-win32-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e8c93bb66b07216f516a94c997b13c41b26fc0fda1866542e3894e508c120a" +dependencies = [ + "gdk4-sys", + "glib-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "geo-uri" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba35eb77ce72d7eefe4058c11cc816c6f9eb4f62ecc11c154b1d77d4d75399ce" +dependencies = [ + "derive_builder", + "thiserror", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gettext-rs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "gio" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", +] + +[[package]] +name = "gio-sys" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.3", + "windows-sys 0.52.0", +] + +[[package]] +name = "glib" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", +] + +[[package]] +name = "glib-macros" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b" +dependencies = [ + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glycin" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99ceb553ed23c012e4e16ba9212b495eb458ad831eb5f892b6b44406f0966286" +dependencies = [ + "futures-channel", + "futures-util", + "gdk4", + "gio", + "glycin-utils", + "gufo-common", + "gufo-exif", + "lcms2", + "lcms2-sys", + "libc", + "libseccomp", + "memfd", + "memmap2", + "nix 0.29.0", + "static_assertions", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "yeslogic-fontconfig-sys", + "zbus", +] + +[[package]] +name = "glycin-utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c6132ef2817b05110f3b1f98c53dbddaac74ea8366472354ab486d02442f08f" +dependencies = [ + "env_logger", + "gufo-common", + "libc", + "libseccomp", + "log", + "memmap2", + "nix 0.29.0", + "paste", + "rmp-serde", + "serde", + "thiserror", + "tokio", + "zbus", +] + +[[package]] +name = "gobject-sys" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" +dependencies = [ + "glib-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "graphene-rs" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps 7.0.3", +] + +[[package]] +name = "growable-bloom-filter" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d174ccb4ba660d431329e7f0797870d0a4281e36353ec4b4a3c5eab6c2cfb6f1" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", +] + +[[package]] +name = "gsk4" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa21a2f7c51ee1c6cc1242c2faf3aae2b7566138f182696759987bde8219e922" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9fb607554f9f4e8829eb7ea301b0fde051e1dbfd5d16b143a8a9c2fac6c01b" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps 7.0.3", +] + +[[package]] +name = "gst-plugin-gtk4" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b3fe6a92ebf2e62366d9f2d8633cc634187bb7c40fe4db05edfb809e928197" +dependencies = [ + "async-channel", + "gdk4-win32", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-gl", + "gstreamer-video", + "gtk4", + "once_cell", + "windows-sys 0.52.0", +] + +[[package]] +name = "gst-plugin-version-helper" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" +dependencies = [ + "chrono", + "toml_edit", +] + +[[package]] +name = "gstreamer" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49ecf3bcfc2ceb82ce02437f53ff2fcaee5e7d45ae697ab64a018408749779b9" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools 0.13.0", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-app" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a4ec9f0d2037349c82f589c1cbfe788a62f4941851924bb7c3929a6a790007" +dependencies = [ + "futures-core", + "futures-sink", + "glib", + "gstreamer", + "gstreamer-app-sys", + "gstreamer-base", + "libc", +] + +[[package]] +name = "gstreamer-app-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d5cac633c1ab7030c777c8c58c682a0c763bbc4127bccc370dabe39c01a12d" +dependencies = [ + "glib-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-audio" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36d39b07213f83055fc705a384fa32ad581776b8e5b04c86f3a419ec5dfc0f81" +dependencies = [ + "cfg-if", + "glib", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", + "once_cell", + "smallvec", +] + +[[package]] +name = "gstreamer-audio-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d84744e7ac8f8bc0cf76b7be40f2d5be12e6cf197e4c6ca9d3438109c21e2f51" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-base" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46ce7330d2995138a77192ea20961422ddee1578e1a47480acb820c43ceb0e2d" +dependencies = [ + "atomic_refcell", + "cfg-if", + "glib", + "gstreamer", + "gstreamer-base-sys", + "libc", +] + +[[package]] +name = "gstreamer-base-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7796e694c21c215447811c9cff694dce1fc6e02b0bbafb75cd8583b6aefe9e5f" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-gl" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee43a7573ace4dc3dd2256a4285d814452c29f6824ea286be8e5c8934ecd124f" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-gl-sys", + "gstreamer-video", + "libc", + "once_cell", +] + +[[package]] +name = "gstreamer-gl-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e17ab40526ed24a769342b3ebbd5a2c17d34944399b59e8b1a254e40356e11" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-pbutils" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc96a1ef43542ba68159e440adc7211e1f03824d91fd8f4e05b84f84002d33c" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-audio", + "gstreamer-pbutils-sys", + "gstreamer-video", + "libc", + "thiserror", +] + +[[package]] +name = "gstreamer-pbutils-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba8e30cb601e11aa8b61d40bef1891ba51744d108406807932d0afc58992205" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-audio-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-play" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397e46fee36e6bbdc56a54c84bec03a47b9955b4f8b03ffa37b3975090b7a37f" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-play-sys", + "gstreamer-video", + "libc", +] + +[[package]] +name = "gstreamer-play-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f485669dfdb4bca2bb1b0d7f6a1e290a4d481c5f67270f1eae9cdf37ca40e426" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3859929db32f26a35818d0d9ed82f0887c9221ca402ddefaea2bb99833d535" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gstreamer-video" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "696ac49ef4c635230b4e4bdebb72cdc31b7a3e8f4fd3f2c1b5009bb10d4ec922" +dependencies = [ + "cfg-if", + "futures-channel", + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-video-sys", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gstreamer-video-sys" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "303620a75f22015110ead435c08577bfb7f7425a13b0165e1d03628725742f14" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "gtk4" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e2d105ce672f5cdcb5af2602e91c2901e91c72da15ab76f613ad57ecf04c6d" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbe4325908b1c1642dbb48e9f49c07a73185babf43e8b2065b0f881a589f55b8" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.3", +] + +[[package]] +name = "gufo-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269bc5c70016d1e90449d71263a72dd2035a2ecbf9cda6305774fa44844bd662" +dependencies = [ + "once_cell", + "paste", + "serde", +] + +[[package]] +name = "gufo-exif" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4066b9e0375d2b44da9e7f0282c2bd65136fe5e7d033259b2181f499e312e1b" +dependencies = [ + "gufo-common", + "thiserror", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "html5ever" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e15626aaf9c351bc696217cbe29cb9b5e86c43f8a46b5e2f5c6c5cf7cb904ce" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", + "rayon", +] + +[[package]] +name = "imbl" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb" +dependencies = [ + "bitmaps", + "imbl-sized-chunks", + "rand_core", + "rand_xoshiro", + "serde", + "version_check", +] + +[[package]] +name = "imbl-sized-chunks" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" +dependencies = [ + "bitmaps", +] + +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "indexed_db_futures" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43315957678a70eb21fb0d2384fe86dde0d6c859a01e24ce127eb65a0143d28c" +dependencies = [ + "accessory", + "cfg-if", + "delegate-display", + "fancy_constructor", + "js-sys", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", + "serde", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "js_int" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +dependencies = [ + "serde", +] + +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + +[[package]] +name = "konst" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" +dependencies = [ + "const_panic", + "konst_kernel", + "typewit", +] + +[[package]] +name = "konst_kernel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" +dependencies = [ + "typewit", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lcms2" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "680ec3fa42c36e0af9ca02f20a3742a82229c7f1ee0e6754294de46a80be6f74" +dependencies = [ + "bytemuck", + "foreign-types 0.5.0", + "lcms2-sys", +] + +[[package]] +name = "lcms2-sys" +version = "4.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "593265f9a3172180024fb62580ee31348f31be924b19416da174ebb7fb623d2e" +dependencies = [ + "cc", + "dunce", + "libc", + "pkg-config", +] + +[[package]] +name = "libadwaita" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" +dependencies = [ + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.3", +] + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libseccomp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21c57fd8981a80019807b7b68118618d29a87177c63d704fc96e6ecd003ae5b3" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libseccomp-sys", + "pkg-config", +] + +[[package]] +name = "libseccomp-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a7cbbd4ad467251987c6e5b47d53b11a5a05add08f2447a9e2d70aef1e0d138" + +[[package]] +name = "libshumate" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc9921cc829fb2d546bd6a3a158a4134002098887e0bb01ceb4535521af610ec" +dependencies = [ + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "libshumate-sys", +] + +[[package]] +name = "libshumate-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b238767323bdd28dc72471fa8a512ad0ae99a18d9668deb626c55f373f7aff81" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "libspa" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" +dependencies = [ + "bitflags 2.6.0", + "cc", + "convert_case", + "cookie-factory", + "libc", + "libspa-sys", + "nix 0.27.1", + "nom", + "system-deps 6.2.2", +] + +[[package]] +name = "libspa-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" +dependencies = [ + "bindgen", + "cc", + "system-deps 6.2.2", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libwebp-sys" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54cd30df7c7165ce74a456e4ca9732c603e8dc5e60784558c1c6dc047f876733" +dependencies = [ + "cc", + "glob", +] + +[[package]] +name = "linkify" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" +dependencies = [ + "memchr", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.0", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "macroific" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05c00ac596022625d01047c421a0d97d7f09a18e429187b341c201cb631b9dd" +dependencies = [ + "macroific_attr_parse", + "macroific_core", + "macroific_macro", +] + +[[package]] +name = "macroific_attr_parse" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94d5da95b30ae6e10621ad02340909346ad91661f3f8c0f2b62345e46a2f67" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "macroific_core" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "macroific_macro" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c9853143cbed7f1e41dc39fee95f9b361bec65c8dc2a01bf609be01b61f5ae" +dependencies = [ + "macroific_attr_parse", + "macroific_core", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markup5ever" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5" +dependencies = [ + "log", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "matrix-pickle" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2551de3bba2cc65b52dc6b268df6114011fe118ac24870fbcf1b35537bd721" +dependencies = [ + "matrix-pickle-derive", + "thiserror", +] + +[[package]] +name = "matrix-pickle-derive" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f75de44c3120d78e978adbcf6d453b20ba011f3c46363e52d1dbbc72f545e9fb" +dependencies = [ + "proc-macro-crate", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "matrix-sdk" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "anymap2", + "aquamarine", + "as_variant", + "async-channel", + "async-stream", + "async-trait", + "axum", + "backoff", + "bytes", + "bytesize", + "event-listener", + "eyeball", + "eyeball-im", + "futures-core", + "futures-util", + "gloo-timers", + "http", + "imbl", + "indexmap", + "js_int", + "matrix-sdk-base", + "matrix-sdk-common", + "matrix-sdk-indexeddb", + "matrix-sdk-sqlite", + "mime", + "mime2ext", + "rand", + "reqwest", + "ruma", + "serde", + "serde_html_form", + "serde_json", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", + "url", + "urlencoding", + "vodozemac", + "zeroize", +] + +[[package]] +name = "matrix-sdk-base" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "as_variant", + "async-trait", + "bitflags 2.6.0", + "eyeball", + "eyeball-im", + "futures-util", + "growable-bloom-filter", + "matrix-sdk-common", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "once_cell", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "matrix-sdk-common" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "async-trait", + "futures-core", + "futures-util", + "gloo-timers", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "matrix-sdk-crypto" +version = "0.7.2" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "aes", + "as_variant", + "async-trait", + "bs58", + "byteorder", + "cfg-if", + "ctr", + "eyeball", + "futures-core", + "futures-util", + "hkdf", + "hmac", + "itertools 0.12.1", + "js_option", + "matrix-sdk-common", + "matrix-sdk-qrcode", + "pbkdf2", + "rand", + "rmp-serde", + "ruma", + "serde", + "serde_json", + "sha2", + "subtle", + "thiserror", + "time", + "tokio", + "tokio-stream", + "tracing", + "ulid", + "url", + "vodozemac", + "zeroize", +] + +[[package]] +name = "matrix-sdk-indexeddb" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "anyhow", + "async-trait", + "base64", + "getrandom", + "gloo-utils", + "hkdf", + "indexed_db_futures", + "js-sys", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "ruma", + "serde", + "serde-wasm-bindgen", + "serde_json", + "sha2", + "thiserror", + "tokio", + "tracing", + "wasm-bindgen", + "web-sys", + "zeroize", +] + +[[package]] +name = "matrix-sdk-qrcode" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "byteorder", + "qrcode", + "ruma-common", + "thiserror", + "vodozemac", +] + +[[package]] +name = "matrix-sdk-sqlite" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "async-trait", + "deadpool-sqlite", + "itertools 0.12.1", + "matrix-sdk-base", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "rmp-serde", + "ruma", + "rusqlite", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "vodozemac", +] + +[[package]] +name = "matrix-sdk-store-encryption" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "base64", + "blake3", + "chacha20poly1305", + "hmac", + "pbkdf2", + "rand", + "rmp-serde", + "serde", + "serde_json", + "sha2", + "thiserror", + "zeroize", +] + +[[package]] +name = "matrix-sdk-ui" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd" +dependencies = [ + "as_variant", + "async-once-cell", + "async-rx", + "async-stream", + "async_cell", + "chrono", + "eyeball", + "eyeball-im", + "eyeball-im-util", + "futures-core", + "futures-util", + "fuzzy-matcher", + "growable-bloom-filter", + "imbl", + "indexmap", + "itertools 0.12.1", + "matrix-sdk", + "matrix-sdk-base", + "mime", + "once_cell", + "pin-project-lite", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "unicode-normalization", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix", +] + +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime2ext" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "515a63dc9666c865e848b043ab52fe9a5c713ae89cde4b5fbaae67cfd614b93a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[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.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +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-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oo7" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" +dependencies = [ + "endi", + "futures-util", + "num", + "num-bigint-dig", + "openssl", + "rand", + "serde", + "tokio", + "tracing", + "zbus", + "zeroize", + "zvariant", +] + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.3", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pipewire" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" +dependencies = [ + "anyhow", + "bitflags 2.6.0", + "libc", + "libspa", + "libspa-sys", + "nix 0.27.1", + "once_cell", + "pipewire-sys", + "thiserror", +] + +[[package]] +name = "pipewire-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" +dependencies = [ + "bindgen", + "libspa-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro2" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pulldown-cmark" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666f0f59e259aea2d72e6012290c09877a780935cc3c18b1ceded41f3890d59c" +dependencies = [ + "bitflags 2.6.0", + "getopts", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + +[[package]] +name = "qrcode" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" +dependencies = [ + "image", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "readlock" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "072cfe5b1d2dcd38d20e18f85e9c9978b6cc08f0b373e9f1fff1541335622974" + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +dependencies = [ + "async-compression", + "base64", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry", +] + +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rqrr" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48eaf9c75f2a8f231b09036c115a45a9845313f7faa6a39fa45a2a2bd06a27c7" +dependencies = [ + "g2p", + "image", + "lru", +] + +[[package]] +name = "ruma" +version = "0.10.1" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-client-api", + "ruma-common", + "ruma-events", + "ruma-federation-api", + "ruma-html", + "ruma-push-gateway-api", + "web-time", +] + +[[package]] +name = "ruma-client-api" +version = "0.18.0" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "as_variant", + "assign", + "bytes", + "date_header", + "http", + "js_int", + "js_option", + "maplit", + "ruma-common", + "ruma-events", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "url", + "web-time", +] + +[[package]] +name = "ruma-common" +version = "0.13.0" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "as_variant", + "base64", + "bytes", + "form_urlencoded", + "getrandom", + "http", + "indexmap", + "js-sys", + "js_int", + "konst", + "percent-encoding", + "rand", + "regex", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "time", + "tracing", + "url", + "uuid", + "web-time", + "wildmatch", +] + +[[package]] +name = "ruma-events" +version = "0.28.1" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "as_variant", + "indexmap", + "js_int", + "js_option", + "percent-encoding", + "pulldown-cmark", + "regex", + "ruma-common", + "ruma-html", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "web-time", + "wildmatch", +] + +[[package]] +name = "ruma-federation-api" +version = "0.9.0" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "http", + "js_int", + "mime", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-html" +version = "0.2.0" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "as_variant", + "html5ever", + "phf", + "ruma-common", + "tracing", + "wildmatch", +] + +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.5" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-macros" +version = "0.13.0" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "cfg-if", + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "ruma-identifiers-validation", + "serde", + "syn", + "toml", +] + +[[package]] +name = "ruma-push-gateway-api" +version = "0.9.0" +source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a" +dependencies = [ + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "secular" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3dc3eccdf599b53eba8a34a1190bd47394948258d1c43dca9cceb2426e25bb5" +dependencies = [ + "unicode-normalization", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +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.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_html_form" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" +dependencies = [ + "form_urlencoded", + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sourceview5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0e07d99b15f12767aa1c84870c45667f42bf24fd6a989dc70088e32854ef56e" +dependencies = [ + "futures-channel", + "futures-core", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "pango", + "sourceview5-sys", +] + +[[package]] +name = "sourceview5-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.3", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" +dependencies = [ + "cfg-expr 0.17.0", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "temp-dir" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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 = "tld" +version = "2.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6672b01e3831c99e7e65d2617dbbc4cdf603e60dfc7120a3b6df7fc97ebe3096" +dependencies = [ + "phf", + "phf_codegen", +] + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typewit" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[package]] +name = "ulid" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" +dependencies = [ + "getrandom", + "rand", + "web-time", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vodozemac" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4b56780b7827dd72c3c6398c3048752bebf8d1d84ec19b606b15dbc3c850b8" +dependencies = [ + "aes", + "arrayvec", + "base64", + "base64ct", + "cbc", + "chacha20poly1305", + "curve25519-dalek", + "ed25519-dalek", + "getrandom", + "hkdf", + "hmac", + "matrix-pickle", + "prost", + "rand", + "serde", + "serde_bytes", + "serde_json", + "sha2", + "subtle", + "thiserror", + "x25519-dalek", + "zeroize", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "wasm-streams" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f53152f51fb5af0c08484c33d16cca96175881d1f3dec068c23b31a158c2d99" +dependencies = [ + "image", + "libwebp-sys", +] + +[[package]] +name = "wildmatch" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "xdg-home" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] + +[[package]] +name = "zbus" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +dependencies = [ + "async-broadcast", + "async-process", + "async-recursion", + "async-trait", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix new file mode 100644 index 000000000000..ba81763a8e47 --- /dev/null +++ b/pkgs/by-name/fr/fractal/package.nix @@ -0,0 +1,108 @@ +{ stdenv +, lib +, fetchFromGitLab +, nix-update-script +, cargo +, meson +, ninja +, rustPlatform +, rustc +, pkg-config +, glib +, gtk4 +, gtksourceview5 +, libadwaita +, gst_all_1 +, desktop-file-utils +, appstream-glib +, openssl +, pipewire +, libshumate +, wrapGAppsHook4 +, sqlite +, xdg-desktop-portal +, libseccomp +, glycin-loaders +}: + +stdenv.mkDerivation rec { + pname = "fractal"; + version = "9"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "fractal"; + rev = "refs/tags/${version}"; + hash = "sha256-3UI727LUYw7wUKbGRCtgpkF9NNw4XuZ3tl3KV3Ku9r4="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "matrix-sdk-0.7.1" = "sha256-AmODDuNLpI6gXuu+oPl3MqcOnywqR8lqJ0bVOIiz02E="; + "ruma-0.10.1" = "sha256-6U2LKMYyY7SLOh2jJcVuDBsfcidNoia1XU+JsmhMHGY="; + }; + }; + + # Dirty approach to add patches after cargoSetupPostUnpackHook + # We should eventually use a cargo vendor patch hook instead + preConfigure = '' + pushd ../$(stripHash $cargoDeps)/glycin-2.* + patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + popd + ''; + + nativeBuildInputs = [ + glib + gtk4 + meson + ninja + pkg-config + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + cargo + rustc + desktop-file-utils + appstream-glib + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + gtksourceview5 + libadwaita + openssl + pipewire + libshumate + sqlite + xdg-desktop-portal + libseccomp + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-plugins-good + ]); + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Matrix group messaging app"; + homepage = "https://gitlab.gnome.org/GNOME/fractal"; + changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + mainProgram = "fractal"; + }; +} diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/by-name/fr/framac/package.nix similarity index 100% rename from pkgs/development/tools/analysis/frama-c/default.nix rename to pkgs/by-name/fr/framac/package.nix diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/by-name/fr/frame/package.nix similarity index 100% rename from pkgs/development/libraries/frame/default.nix rename to pkgs/by-name/fr/frame/package.nix diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/by-name/fr/framesh/package.nix similarity index 100% rename from pkgs/applications/blockchains/framesh/default.nix rename to pkgs/by-name/fr/framesh/package.nix diff --git a/pkgs/tools/text/frangipanni/default.nix b/pkgs/by-name/fr/frangipanni/package.nix similarity index 100% rename from pkgs/tools/text/frangipanni/default.nix rename to pkgs/by-name/fr/frangipanni/package.nix diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/by-name/fr/fraunces/package.nix similarity index 100% rename from pkgs/data/fonts/fraunces/default.nix rename to pkgs/by-name/fr/fraunces/package.nix diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/by-name/fr/frawk/package.nix similarity index 100% rename from pkgs/tools/text/frawk/default.nix rename to pkgs/by-name/fr/frawk/package.nix diff --git a/pkgs/tools/misc/fre/default.nix b/pkgs/by-name/fr/fre/package.nix similarity index 100% rename from pkgs/tools/misc/fre/default.nix rename to pkgs/by-name/fr/fre/package.nix diff --git a/pkgs/applications/audio/freac/default.nix b/pkgs/by-name/fr/freac/package.nix similarity index 100% rename from pkgs/applications/audio/freac/default.nix rename to pkgs/by-name/fr/freac/package.nix diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/by-name/fr/frece/package.nix similarity index 100% rename from pkgs/development/tools/frece/default.nix rename to pkgs/by-name/fr/frece/package.nix diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/by-name/fr/freealut/package.nix similarity index 100% rename from pkgs/development/libraries/freealut/default.nix rename to pkgs/by-name/fr/freealut/package.nix diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/by-name/fr/freebayes/package.nix similarity index 100% rename from pkgs/applications/science/biology/freebayes/default.nix rename to pkgs/by-name/fr/freebayes/package.nix diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/by-name/fr/freebind/package.nix similarity index 100% rename from pkgs/tools/networking/freebind/default.nix rename to pkgs/by-name/fr/freebind/package.nix diff --git a/pkgs/games/freedink/default.nix b/pkgs/by-name/fr/freedink/package.nix similarity index 100% rename from pkgs/games/freedink/default.nix rename to pkgs/by-name/fr/freedink/package.nix diff --git a/pkgs/games/freedroid/default.nix b/pkgs/by-name/fr/freedroid/package.nix similarity index 100% rename from pkgs/games/freedroid/default.nix rename to pkgs/by-name/fr/freedroid/package.nix diff --git a/pkgs/games/freedroidrpg/drop-build-deps.patch b/pkgs/by-name/fr/freedroidrpg/drop-build-deps.patch similarity index 100% rename from pkgs/games/freedroidrpg/drop-build-deps.patch rename to pkgs/by-name/fr/freedroidrpg/drop-build-deps.patch diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/by-name/fr/freedroidrpg/package.nix similarity index 100% rename from pkgs/games/freedroidrpg/default.nix rename to pkgs/by-name/fr/freedroidrpg/package.nix diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/by-name/fr/freefont_ttf/package.nix similarity index 100% rename from pkgs/data/fonts/freefont-ttf/default.nix rename to pkgs/by-name/fr/freefont_ttf/package.nix diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/by-name/fr/freeglut/package.nix similarity index 100% rename from pkgs/development/libraries/freeglut/default.nix rename to pkgs/by-name/fr/freeglut/package.nix diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/by-name/fr/freeipmi/package.nix similarity index 100% rename from pkgs/tools/system/freeipmi/default.nix rename to pkgs/by-name/fr/freeipmi/package.nix diff --git a/pkgs/games/freenukum/default.nix b/pkgs/by-name/fr/freenukum/package.nix similarity index 100% rename from pkgs/games/freenukum/default.nix rename to pkgs/by-name/fr/freenukum/package.nix diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/by-name/fr/freeorion/fix-paths.sh similarity index 100% rename from pkgs/games/freeorion/fix-paths.sh rename to pkgs/by-name/fr/freeorion/fix-paths.sh diff --git a/pkgs/games/freeorion/fix-paths.xslt b/pkgs/by-name/fr/freeorion/fix-paths.xslt similarity index 100% rename from pkgs/games/freeorion/fix-paths.xslt rename to pkgs/by-name/fr/freeorion/fix-paths.xslt diff --git a/pkgs/games/freeorion/default.nix b/pkgs/by-name/fr/freeorion/package.nix similarity index 100% rename from pkgs/games/freeorion/default.nix rename to pkgs/by-name/fr/freeorion/package.nix diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/by-name/fr/freepats/package.nix similarity index 100% rename from pkgs/data/misc/freepats/default.nix rename to pkgs/by-name/fr/freepats/package.nix diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/by-name/fr/freepv/package.nix similarity index 100% rename from pkgs/applications/graphics/freepv/default.nix rename to pkgs/by-name/fr/freepv/package.nix diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/by-name/fr/freeradius/package.nix similarity index 100% rename from pkgs/servers/freeradius/default.nix rename to pkgs/by-name/fr/freeradius/package.nix diff --git a/pkgs/games/freesweep/default.nix b/pkgs/by-name/fr/freesweep/package.nix similarity index 100% rename from pkgs/games/freesweep/default.nix rename to pkgs/by-name/fr/freesweep/package.nix diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/by-name/fr/freetalk/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/freetalk/default.nix rename to pkgs/by-name/fr/freetalk/package.nix diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix new file mode 100644 index 000000000000..c1d8fd62497f --- /dev/null +++ b/pkgs/by-name/fr/freetds/package.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config +, openssl +, odbcSupport ? true, unixODBC ? null }: + +assert odbcSupport -> unixODBC != null; + +# Work is in progress to move to cmake so revisit that later + +stdenv.mkDerivation rec { + pname = "freetds"; + version = "1.4.23"; + + src = fetchurl { + url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; + hash = "sha256-k6PxhrgsYEKmahlwvUeNeRTtscVmm2QtgLTqrPKi0X4="; + }; + + buildInputs = [ + openssl + ] ++ lib.optional odbcSupport unixODBC; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; + homepage = "https://www.freetds.org"; + changelog = "https://github.com/FreeTDS/freetds/releases/tag/v${version}"; + license = licenses.lgpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/by-name/fr/freetts/package.nix similarity index 100% rename from pkgs/development/libraries/freetts/default.nix rename to pkgs/by-name/fr/freetts/package.nix diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/by-name/fr/freetube/package.nix similarity index 100% rename from pkgs/applications/video/freetube/default.nix rename to pkgs/by-name/fr/freetube/package.nix diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/by-name/fr/freetype/enable-subpixel-rendering.patch similarity index 100% rename from pkgs/development/libraries/freetype/enable-subpixel-rendering.patch rename to pkgs/by-name/fr/freetype/enable-subpixel-rendering.patch diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/by-name/fr/freetype/enable-table-validation.patch similarity index 100% rename from pkgs/development/libraries/freetype/enable-table-validation.patch rename to pkgs/by-name/fr/freetype/enable-table-validation.patch diff --git a/pkgs/by-name/fr/freetype/package.nix b/pkgs/by-name/fr/freetype/package.nix new file mode 100644 index 000000000000..034ba4c33839 --- /dev/null +++ b/pkgs/by-name/fr/freetype/package.nix @@ -0,0 +1,122 @@ +{ lib +, stdenv +, fetchurl +, buildPackages +, pkgsHostHost +, pkg-config +, which +, makeWrapper +, zlib +, bzip2 +, brotli +, libpng +, gnumake +, glib + +, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). + # LCD filtering is also known as ClearType and covered by several Microsoft patents. + # This option allows it to be disabled. See http://www.freetype.org/patents.html. + useEncumberedCode ? true + + # for passthru.tests +, cairo +, fontforge +, ghostscript +, graphicsmagick +, gtk3 +, harfbuzz +, imagemagick +, pango +, poppler +, python3 +, qt5 +, texmacs +, ttfautohint +, testers +, __flattenIncludeHackHook +}: + + +stdenv.mkDerivation (finalAttrs: { + pname = "freetype"; + version = "2.13.3"; + + src = let inherit (finalAttrs) pname version; in fetchurl { + url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-BVA1BmbUJ8dNrrhdWse7NTrLpfdpVjlZlTEanG8GMok="; + }; + + propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype + + # dependence on harfbuzz is looser than the reverse dependence + nativeBuildInputs = [ pkg-config which __flattenIncludeHackHook ] + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper + # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. + ++ lib.optional (!stdenv.hostPlatform.isLinux) gnumake; + + patches = [ + ./enable-table-validation.patch + ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch; + + outputs = [ "out" "dev" ]; + + configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; + + # native compiler to generate building tool + CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; + + # The asm for armel is written with the 'asm' keyword. + CFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-std=gnu99" + + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64"; + + enableParallelBuilding = true; + + doCheck = true; + + # pkgsCross.mingwW64.pkg-config doesn't build + # makeWrapper doesn't cross-compile to windows #120726 + postInstall = '' + substituteInPlace $dev/bin/freetype-config \ + --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} + '' + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' + + wrapProgram "$dev/bin/freetype-config" \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" + ''; + + passthru.tests = { + inherit + cairo + fontforge + ghostscript + graphicsmagick + gtk3 + harfbuzz + imagemagick + pango + poppler + texmacs + ttfautohint; + inherit (python3.pkgs) freetype-py; + inherit (qt5) qtbase; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "Font rendering engine"; + mainProgram = "freetype-config"; + longDescription = '' + FreeType is a portable and efficient library for rendering fonts. It + supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR + fonts. It has a bytecode interpreter and has an automatic hinter called + autofit which can be used instead of hinting instructions included in + fonts. + ''; + homepage = "https://www.freetype.org/"; + changelog = "https://gitlab.freedesktop.org/freetype/freetype/-/raw/VER-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}/docs/CHANGES"; + license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) + platforms = platforms.all; + pkgConfigModules = [ "freetype2" ]; + maintainers = with maintainers; [ ttuegel ]; + }; +}) diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/by-name/fr/freewheeling/package.nix similarity index 100% rename from pkgs/applications/audio/freewheeling/default.nix rename to pkgs/by-name/fr/freewheeling/package.nix diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/by-name/fr/freexl/package.nix similarity index 100% rename from pkgs/development/libraries/freexl/default.nix rename to pkgs/by-name/fr/freexl/package.nix diff --git a/pkgs/tools/security/freeze/default.nix b/pkgs/by-name/fr/freeze/package.nix similarity index 100% rename from pkgs/tools/security/freeze/default.nix rename to pkgs/by-name/fr/freeze/package.nix diff --git a/pkgs/tools/misc/frei/default.nix b/pkgs/by-name/fr/frei/package.nix similarity index 100% rename from pkgs/tools/misc/frei/default.nix rename to pkgs/by-name/fr/frei/package.nix diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/by-name/fr/frei0r/package.nix similarity index 100% rename from pkgs/development/libraries/frei0r/default.nix rename to pkgs/by-name/fr/frei0r/package.nix diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/by-name/fr/frescobaldi/package.nix similarity index 100% rename from pkgs/misc/frescobaldi/default.nix rename to pkgs/by-name/fr/frescobaldi/package.nix diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index 57d8de7846e1..8cd365e463a8 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -18,19 +18,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "fretboard"; - version = "7.1"; + version = "8.0"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "fretboard"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZBDsG59WLsTYdayqGMBAh9+gDtoaqlAuSdObcjAk6DA="; + hash = "sha256-8xINlVhWgg73DrRi8S5rhNc1sbG4DbWOsiEBjU8NSXo="; }; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-W0gvSPVG0q1928uDky4Ad4VowuWcj6DyyWF2C2Y573c="; + hash = "sha256-LSL7VvRgA8MaFXn/vi5Zf1sY4cqv0a9PNnZ3JlDNIaE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix new file mode 100644 index 000000000000..fe122067464e --- /dev/null +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, buildPackages +, fetchurl +, meson +, ninja +, pkg-config +, fixDarwinDylibNames +, python3 +, testers +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fribidi"; + version = "1.0.16"; + + outputs = [ "out" "dev" "devdoc" ]; + + # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. + src = fetchurl { + url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-GxzeWyNdQEeekb4vDoijCeMhTIq0cOyKJ0TYKlqeoFw="; + }; + + postPatch = '' + patchShebangs test + ''; + + nativeBuildInputs = [ meson ninja pkg-config ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + doCheck = true; + nativeCheckInputs = [ python3 ]; + + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = with lib; { + homepage = "https://github.com/fribidi/fribidi"; + description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; + mainProgram = "fribidi"; + license = licenses.lgpl21; + platforms = platforms.unix; + pkgConfigModules = [ "fribidi" ]; + }; +}) diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/by-name/fr/fricas/package.nix similarity index 100% rename from pkgs/applications/science/math/fricas/default.nix rename to pkgs/by-name/fr/fricas/package.nix diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/by-name/fr/frida-tools/package.nix similarity index 100% rename from pkgs/tools/security/frida-tools/default.nix rename to pkgs/by-name/fr/frida-tools/package.nix diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/by-name/fr/frigate/package.nix similarity index 100% rename from pkgs/applications/video/frigate/default.nix rename to pkgs/by-name/fr/frigate/package.nix diff --git a/pkgs/applications/video/frigate/web.nix b/pkgs/by-name/fr/frigate/web.nix similarity index 100% rename from pkgs/applications/video/frigate/web.nix rename to pkgs/by-name/fr/frigate/web.nix diff --git a/pkgs/development/tools/frink/default.nix b/pkgs/by-name/fr/frink/package.nix similarity index 100% rename from pkgs/development/tools/frink/default.nix rename to pkgs/by-name/fr/frink/package.nix diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index ee4099d207fc..92a01180bdf1 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "defusedxml" + "attrs" ]; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/games/frogatto/data.nix b/pkgs/by-name/fr/frogatto/data.nix similarity index 100% rename from pkgs/games/frogatto/data.nix rename to pkgs/by-name/fr/frogatto/data.nix diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/by-name/fr/frogatto/engine.nix similarity index 100% rename from pkgs/games/frogatto/engine.nix rename to pkgs/by-name/fr/frogatto/engine.nix diff --git a/pkgs/games/frogatto/default.nix b/pkgs/by-name/fr/frogatto/package.nix similarity index 100% rename from pkgs/games/frogatto/default.nix rename to pkgs/by-name/fr/frogatto/package.nix diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/by-name/fr/frogmouth/package.nix similarity index 100% rename from pkgs/tools/text/frogmouth/default.nix rename to pkgs/by-name/fr/frogmouth/package.nix diff --git a/pkgs/games/frotz/default.nix b/pkgs/by-name/fr/frotz/package.nix similarity index 100% rename from pkgs/games/frotz/default.nix rename to pkgs/by-name/fr/frotz/package.nix diff --git a/pkgs/games/frozen-bubble/fix-compilation.patch b/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch similarity index 100% rename from pkgs/games/frozen-bubble/fix-compilation.patch rename to pkgs/by-name/fr/frozen-bubble/fix-compilation.patch diff --git a/pkgs/by-name/fr/frozen-bubble/package.nix b/pkgs/by-name/fr/frozen-bubble/package.nix new file mode 100644 index 000000000000..40610b9c1ddb --- /dev/null +++ b/pkgs/by-name/fr/frozen-bubble/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchurl, + perlPackages, + pkg-config, + SDL, + SDL_mixer, + SDL_Pango, + glib, + copyDesktopItems, + makeDesktopItem, + fetchpatch, +}: + +perlPackages.buildPerlModule { + pname = "frozen-bubble"; + version = "2.212"; + + src = fetchurl { + url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; + hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU="; + }; + + patches = [ + ./fix-compilation.patch + (fetchpatch { + # https://github.com/kthakore/frozen-bubble/pull/82 + url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1"; + hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY="; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + + buildInputs = [ + glib + SDL + SDL_mixer + SDL_Pango + perlPackages.SDL + perlPackages.FileSlurp + ]; + + propagatedBuildInputs = with perlPackages; [ + AlienSDL + CompressBzip2 + FileShareDir + FileWhich + IPCSystemSimple + LocaleMaketextLexicon + ]; + + perlPreHook = "export LD=$CC"; + + desktopItems = [ + (makeDesktopItem { + name = "frozen-bubble"; + exec = "frozen-bubble"; + desktopName = "Frozen Bubble"; + genericName = "Frozen Bubble"; + comment = "Arcade/reflex colour matching game"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "Puzzle with Bubbles"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ puckipedia ]; + }; +} diff --git a/pkgs/development/libraries/frozen/meson.build b/pkgs/by-name/fr/frozen/meson.build similarity index 100% rename from pkgs/development/libraries/frozen/meson.build rename to pkgs/by-name/fr/frozen/meson.build diff --git a/pkgs/development/libraries/frozen/default.nix b/pkgs/by-name/fr/frozen/package.nix similarity index 100% rename from pkgs/development/libraries/frozen/default.nix rename to pkgs/by-name/fr/frozen/package.nix diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/by-name/fr/frp/package.nix similarity index 100% rename from pkgs/tools/networking/frp/default.nix rename to pkgs/by-name/fr/frp/package.nix diff --git a/pkgs/servers/frr/clippy-helper.nix b/pkgs/by-name/fr/frr/clippy-helper.nix similarity index 100% rename from pkgs/servers/frr/clippy-helper.nix rename to pkgs/by-name/fr/frr/clippy-helper.nix diff --git a/pkgs/servers/frr/default.nix b/pkgs/by-name/fr/frr/package.nix similarity index 100% rename from pkgs/servers/frr/default.nix rename to pkgs/by-name/fr/frr/package.nix diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/by-name/fr/frugal/package.nix similarity index 100% rename from pkgs/development/tools/frugal/default.nix rename to pkgs/by-name/fr/frugal/package.nix diff --git a/pkgs/development/libraries/frugally-deep/default.nix b/pkgs/by-name/fr/frugally-deep/package.nix similarity index 100% rename from pkgs/development/libraries/frugally-deep/default.nix rename to pkgs/by-name/fr/frugally-deep/package.nix diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/by-name/fs/fsarchiver/package.nix similarity index 100% rename from pkgs/tools/archivers/fsarchiver/default.nix rename to pkgs/by-name/fs/fsarchiver/package.nix diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/by-name/fs/fsatrace/package.nix similarity index 100% rename from pkgs/development/tools/misc/fsatrace/default.nix rename to pkgs/by-name/fs/fsatrace/package.nix diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/by-name/fs/fsautocomplete/deps.nix similarity index 100% rename from pkgs/development/tools/fsautocomplete/deps.nix rename to pkgs/by-name/fs/fsautocomplete/deps.nix diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/by-name/fs/fsautocomplete/package.nix similarity index 100% rename from pkgs/development/tools/fsautocomplete/default.nix rename to pkgs/by-name/fs/fsautocomplete/package.nix diff --git a/pkgs/tools/security/fscan/default.nix b/pkgs/by-name/fs/fscan/package.nix similarity index 100% rename from pkgs/tools/security/fscan/default.nix rename to pkgs/by-name/fs/fscan/package.nix diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix similarity index 100% rename from pkgs/os-specific/linux/fscrypt/default.nix rename to pkgs/by-name/fs/fscrypt-experimental/package.nix diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/by-name/fs/fsearch/package.nix similarity index 100% rename from pkgs/tools/misc/fsearch/default.nix rename to pkgs/by-name/fs/fsearch/package.nix diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/by-name/fs/fselect/package.nix similarity index 100% rename from pkgs/tools/misc/fselect/default.nix rename to pkgs/by-name/fs/fselect/package.nix diff --git a/pkgs/games/fsg/default.nix b/pkgs/by-name/fs/fsg/package.nix similarity index 100% rename from pkgs/games/fsg/default.nix rename to pkgs/by-name/fs/fsg/package.nix diff --git a/pkgs/games/fsg/wxgtk-3.2.patch b/pkgs/by-name/fs/fsg/wxgtk-3.2.patch similarity index 100% rename from pkgs/games/fsg/wxgtk-3.2.patch rename to pkgs/by-name/fs/fsg/wxgtk-3.2.patch diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/by-name/fs/fsharp/package.nix similarity index 100% rename from pkgs/development/compilers/fsharp/default.nix rename to pkgs/by-name/fs/fsharp/package.nix diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/by-name/fs/fsmark/package.nix similarity index 100% rename from pkgs/tools/misc/fsmark/default.nix rename to pkgs/by-name/fs/fsmark/package.nix diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/by-name/fs/fsmon/package.nix similarity index 100% rename from pkgs/tools/misc/fsmon/default.nix rename to pkgs/by-name/fs/fsmon/package.nix diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/by-name/fs/fspy/package.nix similarity index 100% rename from pkgs/applications/misc/fspy/default.nix rename to pkgs/by-name/fs/fspy/package.nix diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/by-name/fs/fsql/package.nix similarity index 100% rename from pkgs/tools/misc/fsql/default.nix rename to pkgs/by-name/fs/fsql/package.nix diff --git a/pkgs/tools/misc/fsrx/default.nix b/pkgs/by-name/fs/fsrx/package.nix similarity index 100% rename from pkgs/tools/misc/fsrx/default.nix rename to pkgs/by-name/fs/fsrx/package.nix diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/by-name/fs/fst/package.nix similarity index 100% rename from pkgs/tools/text/fst/default.nix rename to pkgs/by-name/fs/fst/package.nix diff --git a/pkgs/development/libraries/fstrcmp/cross.patch b/pkgs/by-name/fs/fstrcmp/cross.patch similarity index 100% rename from pkgs/development/libraries/fstrcmp/cross.patch rename to pkgs/by-name/fs/fstrcmp/cross.patch diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/by-name/fs/fstrcmp/package.nix similarity index 100% rename from pkgs/development/libraries/fstrcmp/default.nix rename to pkgs/by-name/fs/fstrcmp/package.nix diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/by-name/fs/fstrm/package.nix similarity index 100% rename from pkgs/development/libraries/fstrm/default.nix rename to pkgs/by-name/fs/fstrm/package.nix diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/by-name/fs/fsv/package.nix similarity index 100% rename from pkgs/applications/misc/fsv/default.nix rename to pkgs/by-name/fs/fsv/package.nix diff --git a/pkgs/os-specific/linux/fsverity-utils/default.nix b/pkgs/by-name/fs/fsverity-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/fsverity-utils/default.nix rename to pkgs/by-name/fs/fsverity-utils/package.nix diff --git a/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch b/pkgs/by-name/fs/fsverity-utils/remove-dynamic-libs.patch similarity index 100% rename from pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch rename to pkgs/by-name/fs/fsverity-utils/remove-dynamic-libs.patch diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/by-name/fs/fswebcam/package.nix similarity index 100% rename from pkgs/os-specific/linux/fswebcam/default.nix rename to pkgs/by-name/fs/fswebcam/package.nix diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/pkgs/by-name/ft/ftop/ftop-fix_buffer_overflow.patch similarity index 100% rename from pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch rename to pkgs/by-name/ft/ftop/ftop-fix_buffer_overflow.patch diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/pkgs/by-name/ft/ftop/ftop-fix_printf_format.patch similarity index 100% rename from pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch rename to pkgs/by-name/ft/ftop/ftop-fix_printf_format.patch diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/by-name/ft/ftop/package.nix similarity index 100% rename from pkgs/os-specific/linux/ftop/default.nix rename to pkgs/by-name/ft/ftop/package.nix diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/by-name/ft/ftxui/package.nix similarity index 100% rename from pkgs/development/libraries/ftxui/default.nix rename to pkgs/by-name/ft/ftxui/package.nix diff --git a/pkgs/tools/misc/fuc/default.nix b/pkgs/by-name/fu/fuc/package.nix similarity index 100% rename from pkgs/tools/misc/fuc/default.nix rename to pkgs/by-name/fu/fuc/package.nix diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix new file mode 100644 index 000000000000..91479e062755 --- /dev/null +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -0,0 +1,106 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + + # required for completion and cross-complilation + installShellFiles, + buildPackages, + stdenv, + + # required for testing + testers, + fulcio, +}: + +buildGoModule rec { + pname = "fulcio"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TCWZrTqNXTcTsLqTnwnJPXN+kMYVVwLm2J3Y6gd2CV8="; + # 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; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + # 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + vendorHash = "sha256-3E2Y0UlJMjTiM4ILEiaNqVmt4fWMvCRAqzm//CvRIl4="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + + preCheck = '' + # test all paths + unset subPackages + ''; + + checkFlags = [ + "-skip=TestLoad" + ]; + + postInstall = + let + fulcio = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + placeholder "out" + else + buildPackages.fulcio; + in + '' + installShellCompletion --cmd fulcio \ + --bash <(${fulcio}/bin/fulcio completion bash) \ + --fish <(${fulcio}/bin/fulcio completion fish) \ + --zsh <(${fulcio}/bin/fulcio completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = fulcio; + command = "fulcio version"; + version = "v${version}"; + }; + + meta = with lib; { + homepage = "https://github.com/sigstore/fulcio"; + changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}"; + description = "Root-CA for code signing certs - issuing certificates based on an OIDC email address"; + mainProgram = "fulcio"; + longDescription = '' + Fulcio is a free code signing Certificate Authority, built to make + short-lived certificates available to anyone. Based on an Open ID Connect + email address, Fulcio signs x509 certificates valid for under 20 minutes. + + Fulcio was designed to run as a centralized, public-good instance backed + up by other transparency logs. Development is now underway to support + different delegation models, and to deploy and run Fulcio as a + disconnected instance. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ + lesuisse + jk + ]; + }; +} diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/by-name/fu/funambol/package.nix similarity index 100% rename from pkgs/development/libraries/funambol/default.nix rename to pkgs/by-name/fu/funambol/package.nix diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/by-name/fu/func/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/func/default.nix rename to pkgs/by-name/fu/func/package.nix diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/by-name/fu/function-runner/package.nix similarity index 100% rename from pkgs/development/web/function-runner/default.nix rename to pkgs/by-name/fu/function-runner/package.nix diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/by-name/fu/functionalplus/package.nix similarity index 100% rename from pkgs/development/libraries/functionalplus/default.nix rename to pkgs/by-name/fu/functionalplus/package.nix diff --git a/pkgs/development/tools/functiontrace-server/default.nix b/pkgs/by-name/fu/functiontrace-server/package.nix similarity index 100% rename from pkgs/development/tools/functiontrace-server/default.nix rename to pkgs/by-name/fu/functiontrace-server/package.nix diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/by-name/fu/fundoc/package.nix similarity index 100% rename from pkgs/development/tools/fundoc/default.nix rename to pkgs/by-name/fu/fundoc/package.nix diff --git a/pkgs/development/tools/misc/funzzy/default.nix b/pkgs/by-name/fu/funzzy/package.nix similarity index 100% rename from pkgs/development/tools/misc/funzzy/default.nix rename to pkgs/by-name/fu/funzzy/package.nix diff --git a/pkgs/applications/misc/furtherance/default.nix b/pkgs/by-name/fu/furtherance/package.nix similarity index 100% rename from pkgs/applications/misc/furtherance/default.nix rename to pkgs/by-name/fu/furtherance/package.nix diff --git a/pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch b/pkgs/by-name/fu/fuse-7z-ng/no-pthread.patch similarity index 100% rename from pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch rename to pkgs/by-name/fu/fuse-7z-ng/no-pthread.patch diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/by-name/fu/fuse-7z-ng/package.nix similarity index 100% rename from pkgs/tools/filesystems/fuse-7z-ng/default.nix rename to pkgs/by-name/fu/fuse-7z-ng/package.nix diff --git a/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch b/pkgs/by-name/fu/fuse-7z-ng/zero-init-fuse-operations.patch similarity index 100% rename from pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch rename to pkgs/by-name/fu/fuse-7z-ng/zero-init-fuse-operations.patch diff --git a/pkgs/tools/filesystems/fuse-archive/default.nix b/pkgs/by-name/fu/fuse-archive/package.nix similarity index 100% rename from pkgs/tools/filesystems/fuse-archive/default.nix rename to pkgs/by-name/fu/fuse-archive/package.nix diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/by-name/fu/fuse-emulator/package.nix similarity index 100% rename from pkgs/applications/emulators/fuse-emulator/default.nix rename to pkgs/by-name/fu/fuse-emulator/package.nix diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/by-name/fu/fuse-overlayfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/fuse-overlayfs/default.nix rename to pkgs/by-name/fu/fuse-overlayfs/package.nix diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/by-name/fu/fusee-interfacee-tk/package.nix similarity index 100% rename from pkgs/applications/misc/fusee-interfacee-tk/default.nix rename to pkgs/by-name/fu/fusee-interfacee-tk/package.nix diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/by-name/fu/fusee-launcher/package.nix similarity index 100% rename from pkgs/development/tools/fusee-launcher/default.nix rename to pkgs/by-name/fu/fusee-launcher/package.nix diff --git a/pkgs/development/tools/fusee-nano/default.nix b/pkgs/by-name/fu/fusee-nano/package.nix similarity index 100% rename from pkgs/development/tools/fusee-nano/default.nix rename to pkgs/by-name/fu/fusee-nano/package.nix diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/by-name/fu/fuseiso/package.nix similarity index 100% rename from pkgs/tools/filesystems/fuseiso/default.nix rename to pkgs/by-name/fu/fuseiso/package.nix diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/by-name/fu/fusionInventory/package.nix similarity index 100% rename from pkgs/servers/monitoring/fusion-inventory/default.nix rename to pkgs/by-name/fu/fusionInventory/package.nix diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/by-name/fu/fuzzel/package.nix similarity index 100% rename from pkgs/applications/misc/fuzzel/default.nix rename to pkgs/by-name/fu/fuzzel/package.nix diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/by-name/fu/fuzzylite/package.nix similarity index 100% rename from pkgs/development/libraries/fuzzylite/default.nix rename to pkgs/by-name/fu/fuzzylite/package.nix diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/by-name/fv/fverb/package.nix similarity index 100% rename from pkgs/applications/audio/fverb/default.nix rename to pkgs/by-name/fv/fverb/package.nix diff --git a/pkgs/os-specific/linux/fw-ectool/default.nix b/pkgs/by-name/fw/fw-ectool/package.nix similarity index 100% rename from pkgs/os-specific/linux/fw-ectool/default.nix rename to pkgs/by-name/fw/fw-ectool/package.nix diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/by-name/fw/fw/package.nix similarity index 100% rename from pkgs/tools/misc/fw/default.nix rename to pkgs/by-name/fw/fw/package.nix diff --git a/pkgs/tools/filesystems/fwanalyzer/default.nix b/pkgs/by-name/fw/fwanalyzer/package.nix similarity index 100% rename from pkgs/tools/filesystems/fwanalyzer/default.nix rename to pkgs/by-name/fw/fwanalyzer/package.nix diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/by-name/fw/fwupd-efi/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd-efi/default.nix rename to pkgs/by-name/fw/fwupd-efi/package.nix diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix similarity index 100% rename from pkgs/tools/misc/fx-cast-bridge/default.nix rename to pkgs/by-name/fx/fx-cast-bridge/package.nix diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/by-name/fx/fxlinuxprint/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/fxlinuxprint/default.nix rename to pkgs/by-name/fx/fxlinuxprint/package.nix diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch b/pkgs/by-name/fx/fxlinuxprintutil/fxlocalechk.tcl.patch similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch rename to pkgs/by-name/fx/fxlinuxprintutil/fxlocalechk.tcl.patch diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch b/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.patch similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch rename to pkgs/by-name/fx/fxlinuxprintutil/fxlputil.patch diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch b/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.tcl.patch similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch rename to pkgs/by-name/fx/fxlinuxprintutil/fxlputil.tcl.patch diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/by-name/fx/fxlinuxprintutil/package.nix similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/default.nix rename to pkgs/by-name/fx/fxlinuxprintutil/package.nix diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/by-name/fx/fxload/package.nix similarity index 100% rename from pkgs/os-specific/linux/fxload/default.nix rename to pkgs/by-name/fx/fxload/package.nix diff --git a/pkgs/shells/fzf-git-sh/default.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix similarity index 100% rename from pkgs/shells/fzf-git-sh/default.nix rename to pkgs/by-name/fz/fzf-git-sh/package.nix diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 0dd3feaa7caf..4e0bd6de84a2 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE="; + hash = "sha256-msSiVlz6Aey8Q+NjtKl58TOkYtPIzw3733kVGs9/8UQ="; }; - cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI="; + cargoHash = "sha256-q67UAAVvc070eArfMo4r/UcUUjODuR/vMukiA4ylQ5w="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/shells/bash/fzf-obc/default.nix b/pkgs/by-name/fz/fzf-obc/package.nix similarity index 100% rename from pkgs/shells/bash/fzf-obc/default.nix rename to pkgs/by-name/fz/fzf-obc/package.nix diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/by-name/fz/fzf-zsh/package.nix similarity index 100% rename from pkgs/shells/zsh/fzf-zsh/default.nix rename to pkgs/by-name/fz/fzf-zsh/package.nix diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/by-name/fz/fzy/package.nix similarity index 100% rename from pkgs/tools/misc/fzy/default.nix rename to pkgs/by-name/fz/fzy/package.nix diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/by-name/g1/g15daemon/package.nix similarity index 100% rename from pkgs/os-specific/linux/g15daemon/default.nix rename to pkgs/by-name/g1/g15daemon/package.nix diff --git a/pkgs/os-specific/linux/g15daemon/pid_location.patch b/pkgs/by-name/g1/g15daemon/pid_location.patch similarity index 100% rename from pkgs/os-specific/linux/g15daemon/pid_location.patch rename to pkgs/by-name/g1/g15daemon/pid_location.patch diff --git a/pkgs/tools/misc/g203-led/default.nix b/pkgs/by-name/g2/g203-led/package.nix similarity index 100% rename from pkgs/tools/misc/g203-led/default.nix rename to pkgs/by-name/g2/g203-led/package.nix diff --git a/pkgs/misc/g810-led/default.nix b/pkgs/by-name/g8/g810-led/package.nix similarity index 100% rename from pkgs/misc/g810-led/default.nix rename to pkgs/by-name/g8/g810-led/package.nix diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/by-name/g9/g933-utils/package.nix similarity index 100% rename from pkgs/tools/misc/g933-utils/default.nix rename to pkgs/by-name/g9/g933-utils/package.nix diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/by-name/ga/galario/package.nix similarity index 100% rename from pkgs/development/libraries/galario/default.nix rename to pkgs/by-name/ga/galario/package.nix diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/by-name/ga/galatia-sil/package.nix similarity index 100% rename from pkgs/data/fonts/galatia-sil/default.nix rename to pkgs/by-name/ga/galatia-sil/package.nix diff --git a/pkgs/by-name/ga/galaxy-buds-client/deps.nix b/pkgs/by-name/ga/galaxy-buds-client/deps.nix new file mode 100644 index 000000000000..ba4c76504890 --- /dev/null +++ b/pkgs/by-name/ga/galaxy-buds-client/deps.nix @@ -0,0 +1,294 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AsyncErrorHandler.Fody"; version = "1.3.0"; hash = "sha256-/H/QOyOTJnnvjU5Ikq+jj1K7fK66uzGIlLBwqtaOc58="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.0-beta2"; hash = "sha256-iia9Ks8JoHWT/Drl9zJecOQsQPxVYLA/Qp/iFCXj4/Y="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.0-rc1"; hash = "sha256-NjSOKJKWcrKcqEP/FAs14Y+ZzeitSyd7FvQaWpTUqhA="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.0-beta1"; hash = "sha256-pLB+PCR9sQ9DHiIWg65BzxhIypZP2F+a+c9FbQePAlg="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.0-rc1"; hash = "sha256-u8CAZJIRbuXGxRivaGPlaXfxPQf7OCKUAU6jisYdaZs="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.0-rc1"; hash = "sha256-0iiNKBQCmnO5rZUzGcsju5O81e0URM35FEz1FTZUHls="; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0"; hash = "sha256-OPgzdVAgHxn3Hv76cKF2yer3c+8H9iiBnsSCrUwCvOM="; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.1.0-beta1"; hash = "sha256-098qNJzqnGRz77vmdzA84EVen6eTPeJoyxs1GKRjHeo="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.0-rc1"; hash = "sha256-8j1qWibl5JUqAaS893TEzBQoWzsVqgAVMX4xVxWmKWo="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.0-rc1"; hash = "sha256-UD0djXIpzVKxeWw5B99AGsibUy5hGF70mI9vZny6vOk="; }) + (fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.1.0-rc1"; hash = "sha256-kvGlKhBjDB8A5tTe0HPhVqVKy0eVjz6SE/qMQOzDyZ4="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.0-rc1"; hash = "sha256-Oh9QqPL/O3a0kUsv/IHAg3/lDzQLRl5v4L5mGoqasbQ="; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.1.0-rc1"; hash = "sha256-fQM6vr+GHbwARROYFrEkOU9ZqBBCPCmwfa17eXeNqHA="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.0-rc1"; hash = "sha256-BHdL5g1rYx7hOYXE60dmzlZ1N+7NFl8SD/SeM9nqEKA="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.0-rc1"; hash = "sha256-RaSbdi+TtAeNR3NggoM4TsmMMhwGE/uJyrxBF6ubM94="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0-beta1"; hash = "sha256-bW0r+R0PXffG86ucWU+yBP85Ann3YkWpvVt856aj+cA="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0-beta2"; hash = "sha256-17FrZr4pmGST+aV/8Lg1iYGl42r3UhyTIJ61ltXxRu8="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0-rc1"; hash = "sha256-fawaToCwZWwvRJQKYVJYZeMWQEW8XPrNBJEZ3lXLOe8="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.2"; hash = "sha256-cBwSBL5uajG2+o8YIMZWwHQ0VJGma+d5AEwI56mDxQw="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0-beta1"; hash = "sha256-AWnV0Y32VpC4w9HVyfhla1vM28vZa8LaxGX/XRZ7rGA="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0-rc1"; hash = "sha256-F06oKB97Se3JxGZRAsQCGklu5wS64agGCSUT9IBQcVU="; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0-rc1"; hash = "sha256-prRC6GZ+dtVdYFjlGU20xHrkNHB69jegEjKFv+GK7Vw="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.0-rc1"; hash = "sha256-Yy3gHV9SoZAVFHuAABjBqfdRNEVfFprAdx38e7tNucU="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.0-rc1"; hash = "sha256-QfNeSeCbwQlVRCFYa8BjJlYnkSk3TC7ACenG3RAUFWU="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.0-rc1"; hash = "sha256-kScofxDFq4+fAogQcSTu7axKBF2cqUjwH4c9ZbKx7s4="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.0-rc1"; hash = "sha256-m0MTISz3KlQrccEIkSR+XEoiXY/iUGnQuH8NFPV6Y/Y="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "11.1.0-rc1"; hash = "sha256-/Gy7rv7nV4WYc0RCs+VpZq+qVDp61QQ3ibmhr8ligy4="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "11.1.0-rc1"; hash = "sha256-xtOd6O+NVklPrKVui+J2bTyp7IBxMp8e7shtTzMNaH4="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Custom"; version = "11.1.0-rc1"; hash = "sha256-DHYhji8JXSzpKov6Gmj51ldoppcjwpGGlrkqgOHPYug="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.DragAndDrop"; version = "11.1.0-rc1"; hash = "sha256-e9Z90XkZ2i83ziUwJLHI+Ut7sW85MC4XgtY5QlFapSM="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Draggable"; version = "11.1.0-rc1"; hash = "sha256-z6w5o5Mc9J8l8tr7oREEdMb5iOGlBm6Rq/tM+OrX334="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Events"; version = "11.1.0-rc1"; hash = "sha256-k7BPbdS5muS1VfNYBybjMmwPHfaJIYasgx14tq6pNKU="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Responsive"; version = "11.1.0-rc1"; hash = "sha256-jz/CUHWhc2TBlVyLiEZx4krwLMv2dSI9di70GIWZ/VE="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "11.1.0-rc1"; hash = "sha256-1JQR0Xgb1q7/XXx0fN8u3OvQwo64b630Cou3Gr6C8jg="; }) + (fetchNuGet { pname = "AvaloniaHex"; version = "0.1.0"; hash = "sha256-wMOcP+oSfe+Zhue5XbjI0w44ZOL4LuBbIgguH55C+ik="; }) + (fetchNuGet { pname = "BouncyCastle.Cryptography"; version = "2.4.0"; hash = "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA="; }) + (fetchNuGet { pname = "Castle.Core"; version = "5.0.0"; hash = "sha256-o0dLsy0RfVOIggymFbUJMhfR3XDp6uFI3G1o4j9o2Lg="; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.2-ci-210"; hash = "sha256-54WTB8oSSaw118jWMxrJ29ZY9+bAE9IKmvUSY/c6JGs="; }) + (fetchNuGet { pname = "Config.Net"; version = "5.2.0"; hash = "sha256-UjHxmvrCDHj3rGVvkr0rvOp4BRxbleuajoeLmElmJmk="; }) + (fetchNuGet { pname = "CS-Script"; version = "4.8.16"; hash = "sha256-Z5B7ZklGSZMovqkJ4IV1J2IwA2f6W944Fx8xL0c+Z90="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) + (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; hash = "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="; }) + (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) + (fetchNuGet { pname = "FluentAvalonia.BreadcrumbBar"; version = "2.0.2"; hash = "sha256-JB1GiTESry2ZbH5q0vy32QqTr+DNJdaLSTxTBvQcAOs="; }) + (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.1.0-preview2"; hash = "sha256-Chm1WLDsm/sHdCaf4Q3UXn5m8PMPzq9Explz6a/lZAg="; }) + (fetchNuGet { pname = "FluentIcons.Avalonia.Fluent"; version = "1.1.234-exp"; hash = "sha256-/WczZLRjG7Jv4TQb/3E5GlMJWOpJCBEEeJdbtVkJ3To="; }) + (fetchNuGet { pname = "FluentIcons.Common"; version = "1.1.234"; hash = "sha256-UwKPJIoqjzp/fv6RWJ9lhIj+xmeA9Bqo05txX80VE4E="; }) + (fetchNuGet { pname = "Fody"; version = "6.0.0"; hash = "sha256-Jxvu8eKtzw4bTrZkRvT+uiqCCP/V3PyqPypOcMrHPZQ="; }) + (fetchNuGet { pname = "Fody"; version = "6.8.0"; hash = "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "6.0.0"; hash = "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; hash = "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; hash = "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.8.0"; hash = "sha256-DoD3XoBW2PzLKcag4h1VKhkj+PqcVwZoSZv0HL+AOdQ="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.8.0"; hash = "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.8.0"; hash = "sha256-7fT/Mu/zXo+OVBoWH2OQJIiU38u9F8Xej1IxV8pJquQ="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.8.0"; hash = "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-mWNq7lREpUW6Qd2u2YrGGC0KUiDNzYopDgxE6pKCXrM="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-yGALVD3xPYQ8t4Tc13JpZjYsiPaU4HfM6iVSs+qRs/E="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-getJ8DrcDupHzqe9pEJcYyT9bFcaxNdQh57+1LPZb/w="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-YHLlACYnsJM2lIbTZAoKuPFJbx/LErf/oSlkoj6yKpU="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-PYSomyyF6YV6luKtrRcXum5CclCVHPWoCEutNBiEVrA="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-st1K8fquS/0ky1lrgMi2D4/ycDMAsjtOQiSblN16dJU="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-lb8u8LUxiLqTIYISjRKxRkgH5Gnl8/DdrDWIU+fUgMo="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-5J8yGB9L2cmqvexSL1YSu896tHHM7dYtz3wB5wsnr6E="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-Qg/VqFXF6+bjpktiuph5xifHHr5kes87YmD4Je5f5FM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-cU6PKi88d0HBAPtCI+UiOOR4sWFitPZnu3CaprtRoL4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-KlQ7Ft5LC97brV+rHcZMCqQYI2Y54wlAsp9oILGwwh0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-GuUYI2tn4tqmXll76Hk8xQIemxS0xjuaA9VU7Zios7c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-Dw+1jgtPe+NoAUgN68ydMmKin1c3u7UbCM5N786Nh3Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-QsU85j3JmTbWQIn5Jf6pv83rHTTbmmTRNh9OBbl7eVY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-WeOxx/V2d7MehPtp4W+BMV7PM/N6XtSRj+olyAOrxsA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-pTkw8eW0166fiDUz9bptG3xKVR0PB8y7Vam4PyhnVPs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-0jaZbZab1G48ydHzzNDl/DAEZsnlgTMkzUlxrtGjRAQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-zdUgl4vLTLcTeu48/fZj58SUbrHogkpCTn+DpWWNNvs="; }) + (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.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (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 = "Mono.TextTemplating"; version = "3.0.0-preview-0052-g5d0f76c785"; hash = "sha256-nv3ynCt5ZVRuzIDMoy8pEi54SYC+UycMT86/VRBP9Cg="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "19.5.41"; hash = "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "19.5.41"; hash = "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "ScottPlot"; version = "5.0.35"; hash = "sha256-MLwAa/8nGHcBSoS8uz+NEP/9qrAZMe8DatQynuHrkQc="; }) + (fetchNuGet { pname = "ScottPlot.Avalonia"; version = "5.0.35"; hash = "sha256-qO2aEh/Eq9ItbSjObyzl58UwIh4ME7zdd7nsQ1JnHw4="; }) + (fetchNuGet { pname = "Sentry"; version = "4.2.1"; hash = "sha256-ubjnryPu0PswEdZZtgWfetjMcsv08PLNmpTD70hf/kI="; }) + (fetchNuGet { pname = "Sentry.Serilog"; version = "4.2.1"; hash = "sha256-+1f+FP+BlqY3FiUyzKm3GPjsOUxSVj5TJdLMODyPd8s="; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; hash = "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; hash = "sha256-Gy+OUznHm1LGiq749GDyeYaQKyaCu28rHYEBLWCVfoE="; }) + (fetchNuGet { pname = "SharpHook"; version = "5.3.7"; hash = "sha256-G9JIGPPuVBDM1hUmDAdX0UlTCIjJ+Ct3C7i2VaYWqlc="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0-rc1"; hash = "sha256-rzSatpDash9fSNZTo1pp6ghQyGPsoOmi2pwhj1vOuN8="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux.NoDependencies"; version = "2.88.8"; hash = "sha256-1A00g0D1BhXU6l1iDHlaC30iWJpiGh9Z5JRpFtfohUY="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.8.12"; hash = "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.7"; hash = "sha256-+jzuEf2tAdo12vOKDlYAb/p+j50PeHsxyyDy4/+tKd4="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.7"; hash = "sha256-pm3FgRoFLp9VcoXJLZf+1WRc+nZWHK37CFE8cxihcvg="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.7"; hash = "sha256-Rigu45bRIwCSIV5MyiybZtXuUxn1oPoGDo5NZN1wfM0="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.7"; hash = "sha256-Kz01LuseCvkJBMIe+XACzFjUj0/ug9GDDpMNezSwi00="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0-rc1"; hash = "sha256-9GbCNRjVodohzjqJkuHZV1sNuwO8rA2nYSSdd48YAHk="; }) + (fetchNuGet { pname = "Svg.Model"; version = "2.0.0-rc1"; hash = "sha256-msdN/k77sF2EitKy5hufHZ5DK/fjKWXV+CM8U9T543k="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0-rc1"; hash = "sha256-iKQOenzOfAGwmt8Tteb19L/WjY0c6aVQWJfW2DFAF9g="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (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"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; hash = "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; hash = "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; hash = "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; hash = "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; hash = "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; hash = "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (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.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (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.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (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.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-UQzDJ7IEJze+rnUP/yjSpE4EwN3Ozyw/dRHuwLvt3Vg="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-X2yE5HVcrC4oqaheGM5yzy6hfpPFn7S284y5ssM8M+I="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.16.0"; hash = "sha256-TYiw2k6FxKMsUqJ7LOjAC/xy0jpwkQ9D58+H3Ws+ijk="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) +] diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix new file mode 100644 index 000000000000..4d62d74aec09 --- /dev/null +++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, fontconfig +, glib +, libglvnd +, xorg +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +buildDotnetModule rec { + pname = "galaxy-buds-client"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "ThePBone"; + repo = "GalaxyBudsClient"; + rev = version; + hash = "sha256-9m9H0T4rD6HIvb15h7+Q7SgLk0PkISkN8ojjh7nsiwA="; + }; + + projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; + nugetDeps = ./deps.nix; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; + + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig ]; + + runtimeDeps = [ + libglvnd + xorg.libSM + xorg.libICE + xorg.libX11 + ]; + + postFixup = '' + wrapProgram "$out/bin/GalaxyBudsClient" \ + --prefix PATH : ${glib.bin}/bin + + mkdir -p $out/share/icons/hicolor/256x256/apps/ + cp -r $src/GalaxyBudsClient/Resources/icon.png $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = meta.mainProgram; + exec = meta.mainProgram; + icon = meta.mainProgram; + desktopName = meta.mainProgram; + genericName = "Galaxy Buds Client"; + comment = meta.description; + type = "Application"; + categories = [ "Settings" ]; + startupNotify = true; + }) + ]; + + meta = with lib; { + mainProgram = "GalaxyBudsClient"; + description = "Unofficial Galaxy Buds Manager for Windows and Linux"; + homepage = "https://github.com/ThePBone/GalaxyBudsClient"; + license = licenses.gpl3; + maintainers = [ maintainers.icy-thought ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/by-name/ga/galen/package.nix similarity index 100% rename from pkgs/development/tools/galen/default.nix rename to pkgs/by-name/ga/galen/package.nix diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/by-name/ga/galene/package.nix similarity index 100% rename from pkgs/servers/web-apps/galene/default.nix rename to pkgs/by-name/ga/galene/package.nix diff --git a/pkgs/tools/security/galer/default.nix b/pkgs/by-name/ga/galer/package.nix similarity index 100% rename from pkgs/tools/security/galer/default.nix rename to pkgs/by-name/ga/galer/package.nix diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/by-name/ga/gallia/package.nix similarity index 100% rename from pkgs/tools/security/gallia/default.nix rename to pkgs/by-name/ga/gallia/package.nix diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/by-name/ga/gam/package.nix similarity index 100% rename from pkgs/tools/admin/gam/default.nix rename to pkgs/by-name/ga/gam/package.nix diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/by-name/ga/gama/package.nix similarity index 100% rename from pkgs/applications/science/geometry/gama/default.nix rename to pkgs/by-name/ga/gama/package.nix diff --git a/pkgs/games/gambit/default.nix b/pkgs/by-name/ga/gambit-chess/package.nix similarity index 100% rename from pkgs/games/gambit/default.nix rename to pkgs/by-name/ga/gambit-chess/package.nix diff --git a/pkgs/os-specific/linux/game-devices-udev-rules/default.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix similarity index 100% rename from pkgs/os-specific/linux/game-devices-udev-rules/default.nix rename to pkgs/by-name/ga/game-devices-udev-rules/package.nix diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/by-name/ga/game-music-emu/package.nix similarity index 100% rename from pkgs/development/libraries/audio/game-music-emu/default.nix rename to pkgs/by-name/ga/game-music-emu/package.nix diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/by-name/ga/gamecube-tools/package.nix similarity index 100% rename from pkgs/development/tools/gamecube-tools/default.nix rename to pkgs/by-name/ga/gamecube-tools/package.nix diff --git a/pkgs/games/gamehub/default.nix b/pkgs/by-name/ga/gamehub/package.nix similarity index 100% rename from pkgs/games/gamehub/default.nix rename to pkgs/by-name/ga/gamehub/package.nix diff --git a/pkgs/games/gamepad-tool/default.nix b/pkgs/by-name/ga/gamepad-tool/package.nix similarity index 100% rename from pkgs/games/gamepad-tool/default.nix rename to pkgs/by-name/ga/gamepad-tool/package.nix diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/by-name/ga/gammu/bashcomp-dir.patch similarity index 100% rename from pkgs/applications/misc/gammu/bashcomp-dir.patch rename to pkgs/by-name/ga/gammu/bashcomp-dir.patch diff --git a/pkgs/applications/misc/gammu/gammu-config-dialog.patch b/pkgs/by-name/ga/gammu/gammu-config-dialog.patch similarity index 100% rename from pkgs/applications/misc/gammu/gammu-config-dialog.patch rename to pkgs/by-name/ga/gammu/gammu-config-dialog.patch diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/by-name/ga/gammu/package.nix similarity index 100% rename from pkgs/applications/misc/gammu/default.nix rename to pkgs/by-name/ga/gammu/package.nix diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/by-name/ga/gammu/systemd.patch similarity index 100% rename from pkgs/applications/misc/gammu/systemd.patch rename to pkgs/by-name/ga/gammu/systemd.patch diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/by-name/ga/gandom-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/gandom-fonts/default.nix rename to pkgs/by-name/ga/gandom-fonts/package.nix diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/by-name/ga/ganv/package.nix similarity index 100% rename from pkgs/development/libraries/ganv/default.nix rename to pkgs/by-name/ga/ganv/package.nix diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/by-name/ga/gap/package.nix similarity index 100% rename from pkgs/applications/science/math/gap/default.nix rename to pkgs/by-name/ga/gap/package.nix diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/by-name/ga/gappa/package.nix similarity index 100% rename from pkgs/applications/science/logic/gappa/default.nix rename to pkgs/by-name/ga/gappa/package.nix diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/by-name/ga/garamond-libre/package.nix similarity index 100% rename from pkgs/data/fonts/garamond-libre/default.nix rename to pkgs/by-name/ga/garamond-libre/package.nix diff --git a/pkgs/by-name/ga/garble/0001-Add-version-info.patch b/pkgs/by-name/ga/garble/0001-Add-version-info.patch new file mode 100644 index 000000000000..153ab8f4bf6d --- /dev/null +++ b/pkgs/by-name/ga/garble/0001-Add-version-info.patch @@ -0,0 +1,38 @@ +From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sun, 3 Nov 2024 15:11:49 +0800 +Subject: [PATCH] Add version info + +--- + main.go | 1 + + testdata/script/help.txtar | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/main.go b/main.go +index 0de5a2f..1c830b1 100644 +--- a/main.go ++++ b/main.go +@@ -362,6 +362,7 @@ func mainErr(args []string) error { + // manually construct something like a pseudo-version. + // TODO: remove when this code is dead, hopefully in Go 1.22. + if mod.Version == "(devel)" { ++ mod.Version = "@version@" + var vcsTime time.Time + var vcsRevision string + for _, setting := range info.Settings { +diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar +index 8f25260..859f492 100644 +--- a/testdata/script/help.txtar ++++ b/testdata/script/help.txtar +@@ -91,7 +91,7 @@ stderr 'directory not found' + # and to be able to use static VCS info, use an environment variable. + # First, test without the information, and then with it. + exec garble version +-stdout -count=1 'mvdan.cc/garble \(devel\)' ++stdout -count=1 'mvdan.cc/garble @version@' + stdout -count=1 'Build settings' + stdout -count=3 '-compiler|GOOS|GOARCH' + ! stdout 'vcs' +-- +2.46.1 + diff --git a/pkgs/by-name/ga/garble/package.nix b/pkgs/by-name/ga/garble/package.nix new file mode 100644 index 000000000000..a9f2c711cb66 --- /dev/null +++ b/pkgs/by-name/ga/garble/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + diffoscope, + git, + versionCheckHook, + replaceVars, + nix-update-script, +}: + +buildGoModule rec { + pname = "garble"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "burrowers"; + repo = "garble"; + rev = "refs/tags/v${version}"; + hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY="; + }; + + __darwinAllowLocalNetworking = true; + + ldflags = [ + "-buildid=00000000000000000000" # length=20 + ]; + + patches = [ + (replaceVars ./0001-Add-version-info.patch { + inherit version; + }) + ]; + + checkFlags = [ + "-skip" + "TestScript/gogarble" + ]; + + vendorHash = "sha256-mSdajYiMEg2ik0ocfmHK+XddEss1qLu6rDwzjocaaW0="; + + # Used for some of the tests. + nativeCheckInputs = [ + diffoscope + git + versionCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export WORK=$(mktemp -d) + ''; + + # Several tests fail with + # FAIL: testdata/script/goenv.txtar:27: "$WORK/.temp 'quotes' and spaces" matches "garble|importcfg|cache\\.gob|\\.go" + doCheck = !stdenv.hostPlatform.isDarwin; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "version" ]; + doInstallCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Obfuscate Go code by wrapping the Go toolchain"; + homepage = "https://github.com/burrowers/garble/"; + maintainers = with lib.maintainers; [ + davhau + bot-wxt1221 + ]; + license = lib.licenses.bsd3; + mainProgram = "garble"; + }; +} diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/by-name/ga/gargoyle/darwin.sh similarity index 100% rename from pkgs/games/gargoyle/darwin.sh rename to pkgs/by-name/ga/gargoyle/darwin.sh diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/by-name/ga/gargoyle/package.nix similarity index 100% rename from pkgs/games/gargoyle/default.nix rename to pkgs/by-name/ga/gargoyle/package.nix diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/by-name/ga/garmintools/package.nix similarity index 100% rename from pkgs/development/libraries/garmintools/default.nix rename to pkgs/by-name/ga/garmintools/package.nix diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/by-name/ga/gatekeeper/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/gatekeeper/default.nix rename to pkgs/by-name/ga/gatekeeper/package.nix diff --git a/pkgs/by-name/ga/gatk/package.nix b/pkgs/by-name/ga/gatk/package.nix new file mode 100644 index 000000000000..711e9e94010a --- /dev/null +++ b/pkgs/by-name/ga/gatk/package.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchzip, jre, makeWrapper, python3 }: + +stdenv.mkDerivation rec { + pname = "gatk"; + version = "4.6.1.0"; + src = fetchzip { + url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; + sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/ + install -m755 -D $src/gatk-package-${version}-spark.jar $out/bin/ + install -m755 -D $src/gatk $out/bin/ + ''; + postFixup = '' + wrapProgram $out/bin/gatk --prefix PATH : ${lib.makeBinPath [ jre ]} + ''; + + meta = with lib; { + homepage = "https://gatk.broadinstitute.org/hc/en-us"; + description = "Wide variety of tools with a primary focus on variant discovery and genotyping." ; + license = licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ] ; + maintainers = with maintainers; [ apraga ]; + longDescription = '' + The GATK is the industry standard for identifying SNPs and indels in germline + DNA and RNAseq data. Its scope is now expanding to include somatic short variant + calling, and to tackle copy number (CNV) and structural variation (SV). In + addition to the variant callers themselves, the GATK also includes many + utilities to perform related tasks such as processing and quality control of + high-throughput sequencing data, and bundles the popular Picard toolkit. + + These tools were primarily designed to process exomes and whole genomes + generated with Illumina sequencing technology, but they can be adapted to handle + a variety of other technologies and experimental designs. And although it was + originally developed for human genetics, the GATK has since evolved to handle + genome data from any organism, with any level of ploidy. + ''; + }; +} diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/by-name/ga/gatling/package.nix similarity index 100% rename from pkgs/servers/http/gatling/default.nix rename to pkgs/by-name/ga/gatling/package.nix diff --git a/pkgs/by-name/ga/gau/package.nix b/pkgs/by-name/ga/gau/package.nix new file mode 100644 index 000000000000..fca2c6963c69 --- /dev/null +++ b/pkgs/by-name/ga/gau/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "gau"; + version = "2.2.4"; + + src = fetchFromGitHub { + owner = "lc"; + repo = "gau"; + rev = "refs/tags/v${version}"; + hash = "sha256-B2l5joHeFDjYmdb3F1FFDKjIKENZu92O2sMlkf3Sf6Y="; + }; + + vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs="; + + ldflags = [ + "-w" + "-s" + ]; + + meta = with lib; { + description = "Tool to fetch known URLs"; + longDescription = '' + getallurls (gau) fetches known URLs from various sources for any + given domain. + ''; + homepage = "https://github.com/lc/gau"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "gau"; + }; +} diff --git a/pkgs/games/gav/gcc.patch b/pkgs/by-name/ga/gav/gcc.patch similarity index 100% rename from pkgs/games/gav/gcc.patch rename to pkgs/by-name/ga/gav/gcc.patch diff --git a/pkgs/games/gav/default.nix b/pkgs/by-name/ga/gav/package.nix similarity index 100% rename from pkgs/games/gav/default.nix rename to pkgs/by-name/ga/gav/package.nix diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/by-name/ga/gavrasm/package.nix similarity index 100% rename from pkgs/development/compilers/gavrasm/default.nix rename to pkgs/by-name/ga/gavrasm/package.nix diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/by-name/ga/gaw/package.nix similarity index 100% rename from pkgs/applications/science/electronics/gaw/default.nix rename to pkgs/by-name/ga/gaw/package.nix diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/by-name/gb/gb-backup/package.nix similarity index 100% rename from pkgs/tools/backup/gamerbackup/default.nix rename to pkgs/by-name/gb/gb-backup/package.nix diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/by-name/gb/gbenchmark/package.nix similarity index 100% rename from pkgs/development/libraries/gbenchmark/default.nix rename to pkgs/by-name/gb/gbenchmark/package.nix diff --git a/pkgs/development/compilers/gbforth/default.nix b/pkgs/by-name/gb/gbforth/package.nix similarity index 100% rename from pkgs/development/compilers/gbforth/default.nix rename to pkgs/by-name/gb/gbforth/package.nix diff --git a/pkgs/development/libraries/gcab/installed-tests-path.patch b/pkgs/by-name/gc/gcab/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/gcab/installed-tests-path.patch rename to pkgs/by-name/gc/gcab/installed-tests-path.patch diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/by-name/gc/gcab/package.nix similarity index 100% rename from pkgs/development/libraries/gcab/default.nix rename to pkgs/by-name/gc/gcab/package.nix diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/by-name/gc/gcal/package.nix similarity index 100% rename from pkgs/applications/misc/gcal/default.nix rename to pkgs/by-name/gc/gcal/package.nix diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/by-name/gc/gcalcli/package.nix similarity index 100% rename from pkgs/applications/misc/gcalcli/default.nix rename to pkgs/by-name/gc/gcalcli/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/10/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-10/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/11/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-11/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/12/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-12/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/13/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-13/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/6/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-6/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/7/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-7/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/8/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-8/package.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/9/default.nix rename to pkgs/by-name/gc/gcc-arm-embedded-9/package.nix diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/by-name/gc/gcfflasher/package.nix similarity index 100% rename from pkgs/applications/misc/gcfflasher/default.nix rename to pkgs/by-name/gc/gcfflasher/package.nix diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/by-name/gc/gci/package.nix similarity index 100% rename from pkgs/development/tools/gci/default.nix rename to pkgs/by-name/gc/gci/package.nix diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/by-name/gc/gcolor3/package.nix similarity index 100% rename from pkgs/applications/graphics/gcolor3/default.nix rename to pkgs/by-name/gc/gcolor3/package.nix diff --git a/pkgs/development/tools/gcov2lcov/default.nix b/pkgs/by-name/gc/gcov2lcov/package.nix similarity index 100% rename from pkgs/development/tools/gcov2lcov/default.nix rename to pkgs/by-name/gc/gcov2lcov/package.nix diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 20c52faeb4e6..3aab48bd4896 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, buildNpmPackage, fetchFromGitHub, @@ -16,8 +17,7 @@ mupdf, fontconfig, freetype, - stdenv, - darwin, + apple-sdk_11, }: buildGoModule rec { @@ -76,6 +76,9 @@ buildGoModule rec { buildInputs = [ + mupdf + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXcursor @@ -83,14 +86,11 @@ buildGoModule rec { libXinerama libXi libXxf86vm - mupdf fontconfig freetype ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Carbon - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.Kernel + apple-sdk_11 ]; # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/by-name/gc/gcsfuse/package.nix similarity index 100% rename from pkgs/tools/filesystems/gcsfuse/default.nix rename to pkgs/by-name/gc/gcsfuse/package.nix diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/by-name/gc/gcstar/package.nix similarity index 100% rename from pkgs/applications/misc/gcstar/default.nix rename to pkgs/by-name/gc/gcstar/package.nix diff --git a/pkgs/by-name/gd/gdbuspp/package.nix b/pkgs/by-name/gd/gdbuspp/package.nix new file mode 100644 index 000000000000..7dca39208964 --- /dev/null +++ b/pkgs/by-name/gd/gdbuspp/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + glib, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "gdbuspp"; + version = "2"; + src = fetchFromGitHub { + owner = "OpenVPN"; + repo = "gdbuspp"; + rev = "refs/tags/v${version}"; + hash = "sha256-A0sl4zZa17zMec/jJASE8lDVNohzJzEGZbWjjsorB2Y="; + }; + + postPatch = '' + patchShebangs --build ./scripts/get-git-ref + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ glib ]; + + meta = { + description = "GDBus++ - a glib2 D-Bus wrapper for C++"; + longDescription = '' + This library provides a simpler C++ based interface to implement D-Bus + into applications in a more C++ approach, based on the C++17 standard. + ''; + homepage = "https://codeberg.org/OpenVPN/gdbuspp"; + changelog = "https://codeberg.org/OpenVPN/gdbuspp/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/by-name/gd/gdl/package.nix similarity index 100% rename from pkgs/development/libraries/gdl/default.nix rename to pkgs/by-name/gd/gdl/package.nix diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch index 4ad417285f27..93763ce5ff09 100644 --- a/pkgs/by-name/gd/gdm/fix-paths.patch +++ b/pkgs/by-name/gd/gdm/fix-paths.patch @@ -1,5 +1,4 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index f2d8e155b..54b998826 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration { @@ -9,11 +8,12 @@ index f2d8e155b..54b998826 100644 - { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, + { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" }, #endif + #ifdef ENABLE_X11_SUPPORT - { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, + { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" }, + #endif { NULL, NULL, NULL }, }; - diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index fc5aef6ac..c61e0046b 100644 --- a/daemon/gdm-manager.c diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index ab29a466ad3a..cdf66774135a 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -10,14 +10,14 @@ glib, json-glib, itstool, - xorg, accountsservice, libX11, + libXdmcp, + libxcb, gnome, systemd, dconf, gtk3, - libcanberra-gtk3, pam, libgudev, libselinux, @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "46.2"; + version = "47.0"; outputs = [ "out" @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-TuNFQioWU3FQzYQkUM2lKyyoaYS8Ue4gzcAl3PS9Jos="; + hash = "sha256-xYWDJr+8yKzlgTUuK+RGItwOnlwoAchpD9Lu1QJgf4Q="; }; mesonFlags = [ @@ -85,13 +85,13 @@ stdenv.mkDerivation (finalAttrs: { gtk3 keyutils libX11 - libcanberra-gtk3 + libXdmcp + libxcb libgudev libselinux pam plymouth systemd - xorg.libXdmcp ]; patches = [ @@ -136,8 +136,14 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Upstream checks some common paths to find an `X` binary. We already know it. echo #!/bin/sh > build-aux/find-x-server.sh - echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh + echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh patchShebangs build-aux/find-x-server.sh + + # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7 + # The gdm-auth-config tool is probably not too useful for NixOS, but we still want the dconf profile + # installed (mostly just because .passthru.tests can make use of it). + substituteInPlace meson.build \ + --replace-fail "dconf_prefix = dconf_dep.get_variable(pkgconfig: 'prefix')" "dconf_prefix = gdm_prefix" ''; preInstall = '' @@ -156,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { # Ensure we did not forget to install anything. rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" - ! test -e "$DESTDIR" + [ ! -e "$DESTDIR" ] || (echo "Some files are still left in a temporary DESTDIR and aren't properly installed."; exit 1) # We are setting DESTDIR so the post-install script does not compile the schemas. glib-compile-schemas "$out/share/glib-2.0/schemas" diff --git a/pkgs/tools/system/gdmap/get_sensitive.patch b/pkgs/by-name/gd/gdmap/get_sensitive.patch similarity index 100% rename from pkgs/tools/system/gdmap/get_sensitive.patch rename to pkgs/by-name/gd/gdmap/get_sensitive.patch diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/by-name/gd/gdmap/package.nix similarity index 100% rename from pkgs/tools/system/gdmap/default.nix rename to pkgs/by-name/gd/gdmap/package.nix diff --git a/pkgs/tools/system/gdmap/set_flags.patch b/pkgs/by-name/gd/gdmap/set_flags.patch similarity index 100% rename from pkgs/tools/system/gdmap/set_flags.patch rename to pkgs/by-name/gd/gdmap/set_flags.patch diff --git a/pkgs/development/libraries/gdome2/fno-common.patch b/pkgs/by-name/gd/gdome2/fno-common.patch similarity index 100% rename from pkgs/development/libraries/gdome2/fno-common.patch rename to pkgs/by-name/gd/gdome2/fno-common.patch diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/by-name/gd/gdome2/package.nix similarity index 100% rename from pkgs/development/libraries/gdome2/default.nix rename to pkgs/by-name/gd/gdome2/package.nix diff --git a/pkgs/development/libraries/gdome2/xml-document.patch b/pkgs/by-name/gd/gdome2/xml-document.patch similarity index 100% rename from pkgs/development/libraries/gdome2/xml-document.patch rename to pkgs/by-name/gd/gdome2/xml-document.patch diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/by-name/gd/gdrive/package.nix similarity index 100% rename from pkgs/applications/networking/gdrive/default.nix rename to pkgs/by-name/gd/gdrive/package.nix diff --git a/pkgs/applications/networking/gdrive3/Cargo.lock b/pkgs/by-name/gd/gdrive3/Cargo.lock similarity index 100% rename from pkgs/applications/networking/gdrive3/Cargo.lock rename to pkgs/by-name/gd/gdrive3/Cargo.lock diff --git a/pkgs/applications/networking/gdrive3/default.nix b/pkgs/by-name/gd/gdrive3/package.nix similarity index 100% rename from pkgs/applications/networking/gdrive3/default.nix rename to pkgs/by-name/gd/gdrive3/package.nix diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/by-name/gd/gdu/package.nix similarity index 100% rename from pkgs/tools/system/gdu/default.nix rename to pkgs/by-name/gd/gdu/package.nix diff --git a/pkgs/tools/inputmethods/gebaar-libinput/default.nix b/pkgs/by-name/ge/gebaar-libinput/package.nix similarity index 100% rename from pkgs/tools/inputmethods/gebaar-libinput/default.nix rename to pkgs/by-name/ge/gebaar-libinput/package.nix diff --git a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch b/pkgs/by-name/ge/gedit/correct-gir-lib-path.patch similarity index 100% rename from pkgs/applications/editors/gedit/correct-gir-lib-path.patch rename to pkgs/by-name/ge/gedit/correct-gir-lib-path.patch diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/by-name/ge/gedit/package.nix similarity index 100% rename from pkgs/applications/editors/gedit/default.nix rename to pkgs/by-name/ge/gedit/package.nix diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/by-name/ge/geek-life/package.nix similarity index 100% rename from pkgs/applications/misc/geek-life/default.nix rename to pkgs/by-name/ge/geek-life/package.nix diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/by-name/ge/geeqie/package.nix similarity index 100% rename from pkgs/applications/graphics/geeqie/default.nix rename to pkgs/by-name/ge/geeqie/package.nix diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/by-name/ge/gef/package.nix similarity index 100% rename from pkgs/development/tools/misc/gef/default.nix rename to pkgs/by-name/ge/gef/package.nix diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix new file mode 100644 index 000000000000..8446cb446a17 --- /dev/null +++ b/pkgs/by-name/ge/geis/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + python3Packages, + wrapGAppsHook3, + atk, + dbus, + evemu, + frame, + gdk-pixbuf, + gobject-introspection, + grail, + gtk3, + xorg, + pango, + xorgserver, + testers, + validatePkgConfig, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geis"; + version = "2.2.17"; + + src = fetchurl { + url = "https://launchpad.net/geis/trunk/${finalAttrs.version}/+download/geis-${finalAttrs.version}.tar.xz"; + hash = "sha256-imD1aDhSCUA4kE5pDSPMWpCpgPxS2mfw8oiQuqJccOs="; + }; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare"; + + hardeningDisable = [ "format" ]; + + pythonPath = with python3Packages; [ pygobject3 ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + python3Packages.wrapPython + gobject-introspection + validatePkgConfig + ]; + + buildInputs = [ + atk + dbus + evemu + frame + gdk-pixbuf + grail + gtk3 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXtst + pango + python3Packages.python + xorgserver + ]; + + prePatch = '' + substituteInPlace python/geis/geis_v2.py --replace-fail \ + "ctypes.util.find_library(\"geis\")" "'$out/lib/libgeis.so'" + substituteInPlace config.aux/py-compile \ + --replace-fail "import sys, os, py_compile, imp" "import sys, os, py_compile, importlib" \ + --replace-fail "imp." "importlib." \ + --replace-fail "hasattr(imp" "hasattr(importlib" + ''; + + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") + ''; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + description = "Library for input gesture recognition"; + homepage = "https://launchpad.net/geis"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + pkgConfigModules = [ "libgeis" ]; + }; +}) diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/by-name/ge/gelasio/package.nix similarity index 100% rename from pkgs/data/fonts/gelasio/default.nix rename to pkgs/by-name/ge/gelasio/package.nix diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/by-name/ge/gem/package.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/gem/default.nix rename to pkgs/by-name/ge/gem/package.nix diff --git a/pkgs/tools/networking/gemget/default.nix b/pkgs/by-name/ge/gemget/package.nix similarity index 100% rename from pkgs/tools/networking/gemget/default.nix rename to pkgs/by-name/ge/gemget/package.nix diff --git a/pkgs/games/gemrb/default.nix b/pkgs/by-name/ge/gemrb/package.nix similarity index 100% rename from pkgs/games/gemrb/default.nix rename to pkgs/by-name/ge/gemrb/package.nix diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/by-name/ge/gen-oath-safe/package.nix similarity index 100% rename from pkgs/tools/security/gen-oath-safe/default.nix rename to pkgs/by-name/ge/gen-oath-safe/package.nix diff --git a/pkgs/tools/networking/gen6dns/default.nix b/pkgs/by-name/ge/gen6dns/package.nix similarity index 100% rename from pkgs/tools/networking/gen6dns/default.nix rename to pkgs/by-name/ge/gen6dns/package.nix diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/by-name/ge/genact/package.nix similarity index 100% rename from pkgs/applications/misc/genact/default.nix rename to pkgs/by-name/ge/genact/package.nix diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/by-name/ge/genann/package.nix similarity index 100% rename from pkgs/development/libraries/genann/default.nix rename to pkgs/by-name/ge/genann/package.nix diff --git a/pkgs/tools/security/gencfsm/makefile-mkdir.patch b/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch similarity index 100% rename from pkgs/tools/security/gencfsm/makefile-mkdir.patch rename to pkgs/by-name/ge/gencfsm/makefile-mkdir.patch diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/by-name/ge/gencfsm/package.nix similarity index 100% rename from pkgs/tools/security/gencfsm/default.nix rename to pkgs/by-name/ge/gencfsm/package.nix diff --git a/pkgs/development/tools/gendef/default.nix b/pkgs/by-name/ge/gendef/package.nix similarity index 100% rename from pkgs/development/tools/gendef/default.nix rename to pkgs/by-name/ge/gendef/package.nix diff --git a/pkgs/development/tools/rust/genemichaels/Cargo.lock b/pkgs/by-name/ge/genemichaels/Cargo.lock similarity index 100% rename from pkgs/development/tools/rust/genemichaels/Cargo.lock rename to pkgs/by-name/ge/genemichaels/Cargo.lock diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/by-name/ge/genemichaels/package.nix similarity index 100% rename from pkgs/development/tools/rust/genemichaels/default.nix rename to pkgs/by-name/ge/genemichaels/package.nix diff --git a/pkgs/applications/misc/genesys/default.nix b/pkgs/by-name/ge/genesys/package.nix similarity index 100% rename from pkgs/applications/misc/genesys/default.nix rename to pkgs/by-name/ge/genesys/package.nix diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/by-name/ge/genext2fs/package.nix similarity index 100% rename from pkgs/tools/filesystems/genext2fs/default.nix rename to pkgs/by-name/ge/genext2fs/package.nix diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/by-name/ge/gengetopt/package.nix similarity index 100% rename from pkgs/development/tools/misc/gengetopt/default.nix rename to pkgs/by-name/ge/gengetopt/package.nix diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/by-name/ge/genimage/package.nix similarity index 100% rename from pkgs/tools/filesystems/genimage/default.nix rename to pkgs/by-name/ge/genimage/package.nix diff --git a/pkgs/applications/science/biology/genmap/gtest.patch b/pkgs/by-name/ge/genmap/gtest.patch similarity index 100% rename from pkgs/applications/science/biology/genmap/gtest.patch rename to pkgs/by-name/ge/genmap/gtest.patch diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/by-name/ge/genmap/package.nix similarity index 100% rename from pkgs/applications/science/biology/genmap/default.nix rename to pkgs/by-name/ge/genmap/package.nix diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/by-name/ge/genromfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/genromfs/default.nix rename to pkgs/by-name/ge/genromfs/package.nix diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/by-name/ge/gentium-book-basic/package.nix similarity index 100% rename from pkgs/data/fonts/gentium-book-basic/default.nix rename to pkgs/by-name/ge/gentium-book-basic/package.nix diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/by-name/ge/gentium/package.nix similarity index 100% rename from pkgs/data/fonts/gentium/default.nix rename to pkgs/by-name/ge/gentium/package.nix diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/by-name/ge/genxword/package.nix similarity index 100% rename from pkgs/applications/misc/genxword/default.nix rename to pkgs/by-name/ge/genxword/package.nix diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/by-name/ge/genymotion/package.nix similarity index 100% rename from pkgs/development/mobile/genymotion/default.nix rename to pkgs/by-name/ge/genymotion/package.nix diff --git a/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch new file mode 100644 index 000000000000..11bd6f561c8b --- /dev/null +++ b/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch @@ -0,0 +1,73 @@ +diff --git a/data/meson.build b/data/meson.build +index b22ff55..01c5910 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + if get_option('enable-backend') + conf = configuration_data() +- conf.set('sysconfdir', sysconfdir) ++ conf.set('sysconfdir', sysconfdir_install) + + if get_option('demo-agent') + conf.set('demo_agent', 'geoclue-demo-agent;') +@@ -14,7 +14,7 @@ if get_option('enable-backend') + conf.set('default_wifi_enable', 'false') + endif + +- conf_dir = join_paths(sysconfdir, 'geoclue') ++ conf_dir = join_paths(sysconfdir_install, 'geoclue') + configure_file(output: 'geoclue.conf', + input: 'geoclue.conf.in', + configuration: conf, +@@ -23,7 +23,7 @@ if get_option('enable-backend') + conf = configuration_data() + conf.set('libexecdir', libexecdir) + conf.set('dbus_srv_user', get_option('dbus-srv-user')) +- conf.set('sysconfdir', sysconfdir) ++ conf.set('sysconfdir', sysconfdir_install) + + confd_dir = join_paths(conf_dir, 'conf.d') + install_emptydir(confd_dir) +diff --git a/demo/meson.build b/demo/meson.build +index 1427fbe..2623f16 100644 +--- a/demo/meson.build ++++ b/demo/meson.build +@@ -54,7 +54,7 @@ if get_option('demo-agent') + install_dir: desktop_dir) + + # Also install in the autostart directory. +- autostart_dir = join_paths(sysconfdir, 'xdg', 'autostart') ++ autostart_dir = join_paths(sysconfdir_install, 'xdg', 'autostart') + meson.add_install_script('install-file.py', + desktop_file.full_path(), + autostart_dir) +diff --git a/meson.build b/meson.build +index c561572..bca0cb3 100644 +--- a/meson.build ++++ b/meson.build +@@ -13,6 +13,11 @@ datadir = join_paths(get_option('prefix'), get_option('datadir')) + includedir = join_paths(get_option('prefix'), get_option('includedir')) + libexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) + sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) ++if get_option('sysconfdir_install') != '' ++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) ++else ++ sysconfdir_install = sysconfdir ++endif + localedir = join_paths(datadir, 'locale') + + header_dir = 'libgeoclue-' + gclue_api_version +diff --git a/meson_options.txt b/meson_options.txt +index 4d55a63..682b39c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -31,6 +31,9 @@ option('enable-backend', + option('demo-agent', + type: 'boolean', value: true, + description: 'Build demo agent') ++option('sysconfdir_install', ++ type: 'string', value: '', ++ description: 'sysconfdir to use during installation') + option('dbus-sys-dir', + type: 'string', + description: 'where D-BUS system.d directory is') diff --git a/pkgs/by-name/ge/geoclue2/package.nix b/pkgs/by-name/ge/geoclue2/package.nix new file mode 100644 index 000000000000..2b1e203c7808 --- /dev/null +++ b/pkgs/by-name/ge/geoclue2/package.nix @@ -0,0 +1,108 @@ +{ lib +, stdenv +, fetchFromGitLab +, intltool +, meson +, mesonEmulatorHook +, ninja +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 +, glib +, json-glib +, libsoup_3 +, libnotify +, gdk-pixbuf +, modemmanager +, avahi +, glib-networking +, python3 +, wrapGAppsHook3 +, gobject-introspection +, vala +, withDemoAgent ? false +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geoclue"; + version = "2.7.2"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "geoclue"; + repo = "geoclue"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs="; + }; + + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + + nativeBuildInputs = [ + pkg-config + intltool + meson + ninja + wrapGAppsHook3 + python3 + vala + gobject-introspection + # devdoc + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + glib + json-glib + libsoup_3 + avahi + ] ++ lib.optionals withDemoAgent [ + libnotify gdk-pixbuf + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + modemmanager + ]; + + propagatedBuildInputs = [ + glib + glib-networking + ]; + + mesonFlags = [ + "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" + "-Ddemo-agent=${lib.boolToString withDemoAgent}" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" + "-Ddbus-srv-user=geoclue" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-D3g-source=false" + "-Dcdma-source=false" + "-Dmodem-gps-source=false" + "-Dnmea-source=false" + ]; + + postPatch = '' + chmod +x demo/install-file.py + patchShebangs demo/install-file.py + ''; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + broken = stdenv.hostPlatform.isDarwin && withDemoAgent; + description = "Geolocation framework and some data providers"; + homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; + changelog = "https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/${finalAttrs.version}/NEWS"; + maintainers = with maintainers; [ raskin mimame ]; + platforms = with platforms; linux ++ darwin; + license = licenses.lgpl2Plus; + }; +}) diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/geocode-glib/installed-tests-path.patch rename to pkgs/by-name/ge/geocode-glib/installed-tests-path.patch diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/by-name/ge/geocode-glib/package.nix similarity index 100% rename from pkgs/development/libraries/geocode-glib/default.nix rename to pkgs/by-name/ge/geocode-glib/package.nix diff --git a/pkgs/development/libraries/geogram/default.nix b/pkgs/by-name/ge/geogram/package.nix similarity index 100% rename from pkgs/development/libraries/geogram/default.nix rename to pkgs/by-name/ge/geogram/package.nix diff --git a/pkgs/development/libraries/geogram/replace-bundled-zlib.patch b/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch similarity index 100% rename from pkgs/development/libraries/geogram/replace-bundled-zlib.patch rename to pkgs/by-name/ge/geogram/replace-bundled-zlib.patch diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/by-name/ge/geoipjava/package.nix similarity index 100% rename from pkgs/development/libraries/java/geoipjava/default.nix rename to pkgs/by-name/ge/geoipjava/package.nix diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/by-name/ge/geoipupdate/package.nix similarity index 100% rename from pkgs/applications/misc/geoipupdate/default.nix rename to pkgs/by-name/ge/geoipupdate/package.nix diff --git a/pkgs/by-name/ge/geolite-legacy/package.nix b/pkgs/by-name/ge/geolite-legacy/package.nix new file mode 100644 index 000000000000..6cbf620388d9 --- /dev/null +++ b/pkgs/by-name/ge/geolite-legacy/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchzip, + zstd, +}: + +stdenv.mkDerivation rec { + pname = "geolite-legacy"; + version = "20240720"; + + # We use Arch Linux package as a snapshot, because upstream database is updated in-place. + geoip = fetchzip { + url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-${version}-1-any.pkg.tar.zst"; + hash = "sha256-9rPp1Lu6Q4+Cb4N4e/ezHacpLuUwbGQefEPuSrH8O6o="; + nativeBuildInputs = [ zstd ]; + stripRoot = false; + }; + + extra = fetchzip { + url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-${version}-1-any.pkg.tar.zst"; + hash = "sha256-sb06yszstKalc+b9rSuStRuY3YRebAL1Q4jEJkbGiMI="; + nativeBuildInputs = [ zstd ]; + stripRoot = false; + }; + + buildCommand = '' + mkdir -p $out/share/GeoIP + cp ${geoip}/usr/share/GeoIP/*.dat $out/share/GeoIP + cp ${extra}/usr/share/GeoIP/*.dat $out/share/GeoIP + ''; + + meta = { + description = "GeoLite Legacy IP geolocation databases"; + homepage = "https://mailfud.org/geoip-legacy/"; + license = lib.licenses.cc-by-sa-40; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/by-name/ge/geomyidae/package.nix similarity index 100% rename from pkgs/applications/networking/gopher/geomyidae/default.nix rename to pkgs/by-name/ge/geomyidae/package.nix diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/by-name/ge/geonkick/package.nix similarity index 100% rename from pkgs/applications/audio/geonkick/default.nix rename to pkgs/by-name/ge/geonkick/package.nix diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 5fbecd9da070..1cc81f0f137c 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -29,325 +29,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.25.3"; # app-schema - hash = "sha256-IvcJAu62wXAh5OQkG3cTUB/X7dc/2q6Le7GSwfJL/sA="; # app-schema + version = "2.26.0"; # app-schema + hash = "sha256-HOjhM9WI7lsqUNrozLB2oI6szqm+Cb7VqC0Hy9NlNMU="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.25.3"; # authkey - hash = "sha256-4tEu9JOomMN/ntDHLqEwrn9lPrJ4LjTM/VuMsjARbF0="; # authkey + version = "2.26.0"; # authkey + hash = "sha256-34U3zq/SKm21fZV80+04N/0ygqShdYVMeQNuqtMSXgQ="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.25.3"; # cas - hash = "sha256-Am8tgF5APKuTa7XI7aI9Oq9jAiDPfJhGCXErtyPpDS8="; # cas + version = "2.26.0"; # cas + hash = "sha256-mosawsZkCKOm03CFg9poJ+XwbbGhvNt8AsxnegW59H4="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.25.3"; # charts - hash = "sha256-0Vu9ldBYWe4vFQ6ftEO/WsmNz3Sf3W8iPS7t9W/+5fY="; # charts + version = "2.26.0"; # charts + hash = "sha256-rPnY9zYgdRoud2I2hcxnODDE/2gsBTMgTPrGAwDdrbM="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.25.3"; # control-flow - hash = "sha256-zH+Hz7SySKRdrrmMBukXkaCziszIwOqzSmGYXWZGxs4="; # control-flow + version = "2.26.0"; # control-flow + hash = "sha256-4Kl0SgKW8MifMVY1+Aa9Ve0WufjHFQejobhQfnwGwbw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.25.3"; # css - hash = "sha256-c3VDxTGZebGCPfYhwUyENoGiDmVa1zttJEi/879RPsc="; # css + version = "2.26.0"; # css + hash = "sha256-CUG5cBxW/PyP/M2I5/1wC1UndzWSIg8aKeETtUnrH5A="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.25.3"; # csw - hash = "sha256-8G7GY5n0bV/xvwUkTijHLnsXBD4MczIastdeGmFcfSc="; # csw + version = "2.26.0"; # csw + hash = "sha256-ABNFf6grpU97nd81H/s8Gfd1G9mxMwVdUduubLWrsRE="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.25.3"; # csw-iso - hash = "sha256-cSY981K9QiY3YJJR1zBCQArJESZO+80oIa/uj+qTsTM="; # csw-iso + version = "2.26.0"; # csw-iso + hash = "sha256-dKyVP5FuJ0Tl2z4veMeIJO66dBucfZo6qH+WvSBQ1Es="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.25.3"; # db2 - hash = "sha256-0eRiLoPIWv5Bddi9RxRkxAVMSolZCpv1kKEK7FkQrXs="; # db2 + version = "2.26.0"; # db2 + hash = "sha256-L0Xrc0MuSiezKk7l4P4lm3phRou79neQds4Yu2VG5DY="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.25.3"; # dxf - hash = "sha256-0i2F9343IhN6LZMdTj/dSP5k5QXd7Si/8ZWbxmkcdD4="; # dxf + version = "2.26.0"; # dxf + hash = "sha256-OtpYej/MxqeoMBw17Ltr9l5iOGUa91L30hgBz6ZbD+Y="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.25.3"; # excel - hash = "sha256-N7OCXq1HRwV1poPImct7T9ZWdbWWYprSBMarGXx33OI="; # excel + version = "2.26.0"; # excel + hash = "sha256-UHIVJnUJnzPDJWsrQw9YasUedpLujKr9s3VJtSgESHY="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.25.3"; # feature-pregeneralized - hash = "sha256-R1jv7GPT3f7D18gQoWcLXqhtULtUvA3wEeXC2Q0+eQg="; # feature-pregeneralized + version = "2.26.0"; # feature-pregeneralized + hash = "sha256-WT1TsHcYoxJK0LWsF4h8VdUGxIecx9SuIqWoA9JjZfA="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.25.3"; # gdal + version = "2.26.0"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-n6B/FHpul29MTYuBsg0XNfTTANBXw/cSEolzIabhHA8="; # gdal + hash = "sha256-lGyBxRCz5DvDQUNQmsk1+DfArwx3kcMoSgQq+O/DqZc="; # 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.3"; # geofence - # hash = "sha256-298rEz0JmFhXxfv0tpdsDOrFLyS7GcuFwp/tX/m+SyI="; # geofence + # version = "2.26.0"; # geofence + # hash = "sha256-Io71mNpUu15klMWFHCaFfRmxPUGGTASZE7MZWyv2TDQ="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.25.3"; # geofence-server - # hash = "sha256-PHP6OmulBbUJ1Q7qliYXX6fAA2C8q4h4i7qCXJpVUCQ="; # geofence-server + # version = "2.26.0"; # geofence-server + # hash = "sha256-UPRupgj9La/JWAneGeM+UdCvnkcW3ZTe7c1bYZRURGI="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.25.3"; # geofence-wps - # hash = "sha256-vH7gQsjfAEcpcM+JVRfbw5sH4eJz+051FBrmoS7MyYo="; # geofence-wps + # version = "2.26.0"; # geofence-wps + # hash = "sha256-SA7nWTyawzDZVsOATRLW/MQQfyXWhHQif3/4MdVogBM="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.25.3"; # geopkg-output - hash = "sha256-frcNjS+phsyuRo4PlmcSUu2Ylp3kHA8OYm+WCBAU/UI="; # geopkg-output + version = "2.26.0"; # geopkg-output + hash = "sha256-SKIInEC9TI2FBtduGHi3apZip5ubA4/ip58+w0O1a38="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.25.3"; # grib - hash = "sha256-uQ7xe3sokrE89QTfTLynHSHE0W6LmiICO3XKkWKEJBU="; # grib + version = "2.26.0"; # grib + hash = "sha256-5Hn6LUxsCP5YvVsMgh6m/oMBJuIo2Y9XdbSRQAJm+vI="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.25.3"; # gwc-s3 - hash = "sha256-1cc3JywXaCCQUojnTVYmkq9Gz5Y1atBJmd0GDhyGAIE="; # gwc-s3 + version = "2.26.0"; # gwc-s3 + hash = "sha256-www+MTFlkmJ6GeGd3v8uGTYV7PYVg5pIS9/2s1D6YeU="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.25.3"; # h2 - hash = "sha256-Cp/3qrjNSKztAaMrxPoZo2YfGBEezLQp6/ZGOehkixM="; # h2 + version = "2.26.0"; # h2 + hash = "sha256-+Y7pILmnz51c5eO+OdqHGLD05fEqaM3vkFU7s0UiA2g="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.25.3"; # iau - hash = "sha256-MV/XYF61rQjuOJSU6n0ADauFYJGF0cZk4lMSoHs9drg="; # iau + version = "2.26.0"; # iau + hash = "sha256-5oM3JxD6HKVhq1/IxXWck1MtQ8KwsLtf+LQACpvdKMA="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.25.3"; # importer - hash = "sha256-T6PGv3zfiwA8DE2XZ2CusaQ0vRGZ75mO4nxONsCQU+g="; # importer + version = "2.26.0"; # importer + hash = "sha256-HFBIEB8pgVaCMF34Z0Clp3+nk2h4Va0xV2ptSZUSx9I="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.25.3"; # inspire - hash = "sha256-A4BBd0Q8NVjPLI6e8HTCg5zd4QOLQ6Ho3/2hnRXCeTM="; # inspire + version = "2.26.0"; # inspire + hash = "sha256-uIryr4WQbWdAMjqATGf0txp1sZWWABSMv8o2xiKaWiI="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.25.3"; # jp2k - # hash = "sha256-0df5vPLYqxPAxqINwdWZ5RRJQVm/79sUcj8fB4RwMKY="; # jp2k + # version = "2.26.0"; # jp2k + # hash = "sha256-gPipm6hnkIyEU3a8NbSCm5QUSF+IKNHgt5DNFsvC++c="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.25.3"; # libjpeg-turbo - hash = "sha256-vQjeYuB6JY+bMlxRXZ7HqgS2hEtmEJJvowfwhWmYkY4="; # libjpeg-turbo + version = "2.26.0"; # libjpeg-turbo + hash = "sha256-I1Ojsgd+gRjSJJkx9wSfzJfVq5z3vgxA4zynZvVd4jU="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.25.3"; # mapml - hash = "sha256-3BMCWeAFn52Uiob53eer5OqBLOgQaMTmHPFTLs51mEg="; # mapml + version = "2.26.0"; # mapml + hash = "sha256-VGg/3cB+KUwZtbKQUoU4NURDjcANzQpPv4ZWeCzwkq0="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.25.3"; # mbstyle - hash = "sha256-SJAI4ssMZZL75gx1h7gwf+4YwXP/CNEm9BTtA/JNRW4="; # mbstyle + version = "2.26.0"; # mbstyle + hash = "sha256-Z5CNKP2fqMcw6prP/b84tOAPYwlLiFsbV26VdVnqFns="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.25.3"; # metadata - hash = "sha256-Gst1cctv/oKTS+jD0y8fHFrEBJyn77fEafV+QzspQVc="; # metadata + version = "2.26.0"; # metadata + hash = "sha256-6E9Z6WqCQxlDL3w1FiI+gOzjQ4ZyS5oucj1/02W4k4Y="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.25.3"; # mongodb - hash = "sha256-LVejtipIRZy3g5GKs8RkOqKHNRskf8YSD11fiFvBF3w="; # mongodb + version = "2.26.0"; # mongodb + hash = "sha256-thfgMeDrDb2rPh9h9R2AgYYWPBHcEG/sI4UhNBb/DfQ="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.25.3"; # monitor - hash = "sha256-+FlKgoESE0j6JXM0yozYMyz6U2TshYNd6WHsKg9frAs="; # monitor + version = "2.26.0"; # monitor + hash = "sha256-vgeqZXzb8nz7daAeur1JMLS0Rospgyx+v9n687000EE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.25.3"; # mysql - hash = "sha256-gfU67lID2YSNbi1aB8m1b+zGqtVnChi56HrtcBE6Aqw="; # mysql + version = "2.26.0"; # mysql + hash = "sha256-PCNCyqJwOK6P6sDWVMdV6gGXgHJOPw97cqkjaixZxwQ="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.25.3"; # netcdf - hash = "sha256-aMykYIBMwH46apDudKnApNba454Yep5HZeYPqEXoqcI="; # netcdf + version = "2.26.0"; # netcdf + hash = "sha256-0i/zmiIE+xjec6dOd237MdIBrCspZEL+8h1c/g0h7oU="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.25.3"; # netcdf-out - hash = "sha256-3gGzgC7IbwpettwSf4+b8HeJRuvkUfDu0xre9wyVap4="; # netcdf-out + version = "2.26.0"; # netcdf-out + hash = "sha256-xl2mY9QYSVeC2k43H2GFz2D56rajCT9FlpP47Q8aOe8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.25.3"; # ogr-wfs + version = "2.26.0"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-4rcUvN1py62JMQy51rxvNfV2AQIptXuRen7tvbrno6s="; # ogr-wfs + hash = "sha256-LiB+BE2Q3a2US7HJkBWT0Z9AMZ3A3M584qbEV1uhhEM="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.25.3"; # ogr-wps + version = "2.26.0"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-RA1dxzjhOt7lQCu6SVSM8HiXYwtFbUfj0hdk831QE5g="; # ogr-wps + hash = "sha256-0o4cD8wv1Km5pljxAlokVRVEfMbklXgkYhxFZqPdROk="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.25.3"; # oracle - hash = "sha256-fKJwLh4T445da1AWPzFpp++LGWiiKhN339VWt1N0s5Q="; # oracle + version = "2.26.0"; # oracle + hash = "sha256-mxc46ctIh7imjQgTI2zZ9gwtgDF6GkE/b5IogUktF9Y="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.25.3"; # params-extractor - hash = "sha256-zO9OwH7NCUILnxRqz1z/QJdfgsx9gfpf2R7rIsgTIr8="; # params-extractor + version = "2.26.0"; # params-extractor + hash = "sha256-dLzEdnNy+Nrxkc4aBCGTESuReW6mkgXEpXDo9rDzsBU="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.25.3"; # printing - hash = "sha256-QAy53/p+/mjCTXreKsVSRcpYgfAs7W9f+ZwE4Z6Gnx8="; # printing + version = "2.26.0"; # printing + hash = "sha256-31T/tizxkmzYbxR1eLiY3DanwlFVdeZvFOESgBnuG1A="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.25.3"; # pyramid - hash = "sha256-kFTNQrxibatVZzPSC6Rv/SzU3FUJYQJ3dHZ5AfR3kD8="; # pyramid + version = "2.26.0"; # pyramid + hash = "sha256-lpDexw5nd1jm9cDFsQ/qXdwbX5vTD0RXKIAOg6dKQqE="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.25.3"; # querylayer - hash = "sha256-TgQiroYcnVCe5QVIcEa8gsgYELqM2jS7RveGyetWokU="; # querylayer + version = "2.26.0"; # querylayer + hash = "sha256-ajrNJ0eG0pp+v/f4N5kxcUzYOyXuLhMRzvdfdiJh0Vk="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.25.3"; # sldservice - hash = "sha256-5E410iNaZVEBKzRGSBcW3JNISap2NrcFtXAuP1+cVt0="; # sldservice + version = "2.26.0"; # sldservice + hash = "sha256-xxpKSDghK+Xz8buPU5lzEa7eiG5A0rPgzCaIO9GKCMY="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.25.3"; # sqlserver - hash = "sha256-TNeyegWOz/a7uFsn1hBhOgpV0vnFncwQ+U9VqyY62+g="; # sqlserver + version = "2.26.0"; # sqlserver + hash = "sha256-UwZ4ho+HG+ocwri+N4ebTATGcT4tukAxwvx84rP0VWk="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.25.3"; # vectortiles - hash = "sha256-RQGeGhfixKrwRuzgmkZ/JDWaPZyDy8fAfGe0iXZfKdY="; # vectortiles + version = "2.26.0"; # vectortiles + hash = "sha256-rlQcWLEPvaKDT6JZ0RuZtaHz1bgtsblFOybKOVqDSVM="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.25.3"; # wcs2_0-eo - hash = "sha256-+li0zBzyHaq0an7qHAdSXKDpvpOZProHnCoHXjyVY7Y="; # wcs2_0-eo + version = "2.26.0"; # wcs2_0-eo + hash = "sha256-Ky+unKH+WBMvo/rlNPv2Uca3X610yXZvCy0/5KEN6wk="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.25.3"; # web-resource - hash = "sha256-m9+t3Q2yD+xqvuBvkc5jYWwtGqJit00xiHyDSLX8euE="; # web-resource + version = "2.26.0"; # web-resource + hash = "sha256-S7Wu4wGo2j8PcBC8VS7EECBlr7NN1hALC1VOM5b6Wk0="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.25.3"; # wmts-multi-dimensional - hash = "sha256-b/16463iotuADA/bIwTutYCiRZYusMf/yB1xEMPZe9U="; # wmts-multi-dimensional + version = "2.26.0"; # wmts-multi-dimensional + hash = "sha256-BNigZB16d1BKRTl/UJs1oWYFKn/cFk5WX1fBwvC046I="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.25.3"; # wps - hash = "sha256-4WqZqfc80Qy3AACOb3MhDjocM02vKUEk9x8YfX5onyg="; # wps + version = "2.26.0"; # wps + hash = "sha256-HVTDMqG23Ign7qottKRo1PtQNr6606nV34SRopAMO1Q="; # 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.3"; # wps-cluster-hazelcast - # hash = "sha256-EDSSNVCZdcmv8ZfB3Gj80xm/ghlWNZwpTYhEwIoegM0="; # wps-cluster-hazelcast + # version = "2.26.0"; # wps-cluster-hazelcast + # hash = "sha256-R0Btbf6BNwGKC2TQ6BmSte612Sel7NspOX9KU+zsHBc="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.25.3"; # wps-download - hash = "sha256-70vw5PHh1hLLAocFKlzPKDZWMjQmwUbv/L4yCJGrDQ4="; # wps-download + version = "2.26.0"; # wps-download + hash = "sha256-sVbAi0y8n2shox6TX0Y4Hg5GhYakv5+tgloMix6Wbfg="; # 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.3"; # wps-jdbc - hash = "sha256-5d+txy1gw36G7hXfOf5qH+bSPIRw3XeLeMCTw6yHp/M="; # wps-jdbc + version = "2.26.0"; # wps-jdbc + hash = "sha256-iJk24m4UDwK1PrU0PiCDPGj0eK7EEQajUFyl+9aIGpE="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.25.3"; # ysld - hash = "sha256-lbjfJPv9v4HUV31Hp5ZAEOe7IceRCxN7xtUxvOi2CYU="; # ysld + version = "2.26.0"; # ysld + hash = "sha256-/qbtfaIE/4haGeS6U+FML1JI/AyXWFyKOd8tGaYFCmw="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 76a68eea8c3a..15567ea5ca4e 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.25.3"; + version = "2.26.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8="; + hash = "sha256-WeItL0j50xWYXIFmH4EFhHjxv9Xr6rG0YO8re1jUnNM="; }; patches = [ diff --git a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix index 1760bea79abb..258762c2ad5d 100644 --- a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix @@ -14,14 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer-corba"; - version = "5.8.0"; - pyproject = false; # CMake + version = "5.8.1"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer-corba"; rev = "v${finalAttrs.version}"; - hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w="; + hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4="; }; outputs = [ @@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \ - --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES} - ''; - buildInputs = [ libsForQt5.qtbase ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index 8e87bb3b1891..9abddf1ac581 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -4,7 +4,6 @@ darwin, doxygen, fetchFromGitHub, - fetchpatch, fontconfig, lib, jrl-cmakemodules, @@ -21,28 +20,15 @@ let gepetto-viewer = stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer"; rev = "v${finalAttrs.version}"; - hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8="; + hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM="; }; - patches = [ - # fix use of CMAKE_INSTALL_BINDIR for $bin output - (fetchpatch { - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch"; - hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs="; - }) - # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output - (fetchpatch { - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch"; - hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc="; - }) - ]; - cmakeFlags = [ (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin)) (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin)) diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/by-name/ge/gephi/package.nix similarity index 100% rename from pkgs/applications/science/misc/gephi/default.nix rename to pkgs/by-name/ge/gephi/package.nix diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/by-name/ge/gerbera/package.nix similarity index 100% rename from pkgs/servers/gerbera/default.nix rename to pkgs/by-name/ge/gerbera/package.nix diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/by-name/ge/get_iplayer/package.nix similarity index 100% rename from pkgs/applications/misc/get_iplayer/default.nix rename to pkgs/by-name/ge/get_iplayer/package.nix diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/by-name/ge/getdata/package.nix similarity index 100% rename from pkgs/development/libraries/getdata/default.nix rename to pkgs/by-name/ge/getdata/package.nix diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/by-name/ge/getdp/package.nix similarity index 100% rename from pkgs/applications/science/math/getdp/default.nix rename to pkgs/by-name/ge/getdp/package.nix diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/by-name/ge/geteltorito/package.nix similarity index 100% rename from pkgs/tools/misc/geteltorito/default.nix rename to pkgs/by-name/ge/geteltorito/package.nix diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/by-name/ge/getopt/package.nix similarity index 100% rename from pkgs/tools/misc/getopt/default.nix rename to pkgs/by-name/ge/getopt/package.nix diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/by-name/ge/getoptions/package.nix similarity index 100% rename from pkgs/tools/misc/getoptions/default.nix rename to pkgs/by-name/ge/getoptions/package.nix diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/by-name/ge/getxbook/package.nix similarity index 100% rename from pkgs/applications/misc/getxbook/default.nix rename to pkgs/by-name/ge/getxbook/package.nix diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/by-name/ge/gexiv2/package.nix similarity index 100% rename from pkgs/development/libraries/gexiv2/default.nix rename to pkgs/by-name/ge/gexiv2/package.nix diff --git a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/pkgs/by-name/gf/gf/build-use-optional-freetype-with-pkg-config.patch similarity index 100% rename from pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch rename to pkgs/by-name/gf/gf/build-use-optional-freetype-with-pkg-config.patch diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/by-name/gf/gf/package.nix similarity index 100% rename from pkgs/development/tools/misc/gf/default.nix rename to pkgs/by-name/gf/gf/package.nix diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/by-name/gf/gf2x/package.nix similarity index 100% rename from pkgs/development/libraries/gf2x/default.nix rename to pkgs/by-name/gf/gf2x/package.nix diff --git a/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch b/pkgs/by-name/gf/gfan/gfan-0.6.2-cddlib-prefix.patch similarity index 100% rename from pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch rename to pkgs/by-name/gf/gfan/gfan-0.6.2-cddlib-prefix.patch diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/by-name/gf/gfan/package.nix similarity index 100% rename from pkgs/applications/science/math/gfan/default.nix rename to pkgs/by-name/gf/gfan/package.nix diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/by-name/gf/gfbgraph/package.nix similarity index 100% rename from pkgs/development/libraries/gfbgraph/default.nix rename to pkgs/by-name/gf/gfbgraph/package.nix diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/by-name/gf/gflags/package.nix similarity index 100% rename from pkgs/development/libraries/gflags/default.nix rename to pkgs/by-name/gf/gflags/package.nix diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/by-name/gf/gforth/boot-forth.nix similarity index 100% rename from pkgs/development/compilers/gforth/boot-forth.nix rename to pkgs/by-name/gf/gforth/boot-forth.nix diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/by-name/gf/gforth/package.nix similarity index 100% rename from pkgs/development/compilers/gforth/default.nix rename to pkgs/by-name/gf/gforth/package.nix diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/by-name/gf/gforth/swig.nix similarity index 100% rename from pkgs/development/compilers/gforth/swig.nix rename to pkgs/by-name/gf/gforth/swig.nix diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/by-name/gf/gfs2-utils/package.nix similarity index 100% rename from pkgs/tools/filesystems/gfs2-utils/default.nix rename to pkgs/by-name/gf/gfs2-utils/package.nix diff --git a/pkgs/tools/security/gfshare/default.nix b/pkgs/by-name/gf/gfshare/package.nix similarity index 100% rename from pkgs/tools/security/gfshare/default.nix rename to pkgs/by-name/gf/gfshare/package.nix diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix similarity index 100% rename from pkgs/tools/graphics/gfxreconstruct/default.nix rename to pkgs/by-name/gf/gfxreconstruct/package.nix diff --git a/pkgs/development/libraries/gfxstream/default.nix b/pkgs/by-name/gf/gfxstream/package.nix similarity index 100% rename from pkgs/development/libraries/gfxstream/default.nix rename to pkgs/by-name/gf/gfxstream/package.nix diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/by-name/gf/gfxtablet/package.nix similarity index 100% rename from pkgs/os-specific/linux/gfxtablet/default.nix rename to pkgs/by-name/gf/gfxtablet/package.nix diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/by-name/gg/gg-scm/package.nix similarity index 100% rename from pkgs/applications/version-management/gg/default.nix rename to pkgs/by-name/gg/gg-scm/package.nix diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/by-name/gg/ggobi/package.nix similarity index 100% rename from pkgs/tools/graphics/ggobi/default.nix rename to pkgs/by-name/gg/ggobi/package.nix diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/by-name/gg/ggz_base_libs/package.nix similarity index 100% rename from pkgs/development/libraries/ggz_base_libs/default.nix rename to pkgs/by-name/gg/ggz_base_libs/package.nix diff --git a/pkgs/by-name/gh/gh-contribs/package.nix b/pkgs/by-name/gh/gh-contribs/package.nix new file mode 100644 index 000000000000..d3f769ea1b87 --- /dev/null +++ b/pkgs/by-name/gh/gh-contribs/package.nix @@ -0,0 +1,49 @@ +{ + coreutils, + fetchFromGitHub, + gh, + lib, + makeWrapper, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation rec { + pname = "gh-contribs"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "MintArchit"; + repo = "gh-contribs"; + rev = "v${version}"; + hash = "sha256-yPJ9pmnbqR+fXH02Q5VMn0v2MuDQbPUpNzKw1awmKVE="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + install -D -m755 "gh-contribs" "$out/bin/gh-contribs" + ''; + + postFixup = '' + wrapProgram "$out/bin/gh-contribs" \ + --prefix PATH : "${ + lib.makeBinPath [ + coreutils + gh + ] + }" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/MintArchit/gh-contribs"; + description = "GitHub Contribution Graph CLI"; + maintainers = [ lib.maintainers.vinnymeller ]; + license = lib.licenses.unlicense; + mainProgram = "gh-contribs"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 674fa06bd62b..281cbe0c2c36 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-+tUG+ReP8y6wI4XZsR2Look4LAwK79CZf9fWUgkx4O0="; + hash = "sha256-q/p7WDbJU27+m/4HVQJ7zRo0r1A0FkV21gJqHJYHHBE="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/by-name/gh/gh-ost/package.nix similarity index 100% rename from pkgs/tools/misc/gh-ost/default.nix rename to pkgs/by-name/gh/gh-ost/package.nix diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix index b1a72b88516b..f2fa0e9f5157 100644 --- a/pkgs/by-name/gh/gh-poi/package.nix +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gh-poi"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${version}"; - hash = "sha256-ZQkXXaa4n88bJdgP2FSXtgBrUi39teO98SzZq+I5doM="; + hash = "sha256-xLeIqTGwizvBmOgwisqoCrFY4KdWoWrA0YYgPWtQT/M="; }; ldflags = [ "-s" "-w" ]; @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.10.1/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.11.0/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = with lib; { diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix new file mode 100644 index 000000000000..dbfbf72ccd5e --- /dev/null +++ b/pkgs/by-name/gh/gh/package.nix @@ -0,0 +1,64 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, + stdenv, + testers, + gh, +}: + +buildGoModule rec { + pname = "gh"; + version = "2.61.0"; + + src = fetchFromGitHub { + owner = "cli"; + repo = "cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-zzcptg2hTQDRWFbC99q/Qy+Nk2vrhekYc5dMr3fjFD0="; + }; + + vendorHash = "sha256-b8HO4mevQcfX/VpJv1ZefXWAeXyhsy6074fvVNoH/8Y="; + + nativeBuildInputs = [ installShellFiles ]; + + buildPhase = '' + runHook preBuild + make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} + runHook postBuild + ''; + + installPhase = + '' + runHook preInstall + install -Dm755 bin/gh -t $out/bin + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installManPage share/man/*/*.[1-9] + + installShellCompletion --cmd gh \ + --bash <($out/bin/gh completion -s bash) \ + --fish <($out/bin/gh completion -s fish) \ + --zsh <($out/bin/gh completion -s zsh) + '' + + '' + runHook postInstall + ''; + + # most tests require network access + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = gh; + }; + + meta = with lib; { + description = "GitHub CLI tool"; + homepage = "https://cli.github.com/"; + changelog = "https://github.com/cli/cli/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "gh"; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/backup/gh2md/default.nix b/pkgs/by-name/gh/gh2md/package.nix similarity index 100% rename from pkgs/tools/backup/gh2md/default.nix rename to pkgs/by-name/gh/gh2md/package.nix diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/by-name/gh/ghauri/package.nix similarity index 100% rename from pkgs/tools/security/ghauri/default.nix rename to pkgs/by-name/gh/ghauri/package.nix diff --git a/pkgs/by-name/gh/ghbackup/package.nix b/pkgs/by-name/gh/ghbackup/package.nix new file mode 100644 index 000000000000..4bdacd3044eb --- /dev/null +++ b/pkgs/by-name/gh/ghbackup/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + makeWrapper, +}: + +buildGoModule rec { + pname = "ghbackup"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "qvl"; + repo = "ghbackup"; + rev = "v${version}"; + hash = "sha256-3LSe805VrbUGjqjnhTJD2KBVZ4rq+4Z3l4d0I1MrBMA="; + }; + + patches = [ ./patches/fix-next-page-logic.patch ]; + + postPatch = '' + go mod init qvl.io/ghbackup + ''; + + nativeBuildInputs = [ makeWrapper ]; + + vendorHash = null; + + postFixup = '' + wrapProgram $out/bin/${meta.mainProgram} \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + ''; + + doCheck = false; # tests want to actually download from github + + meta = with lib; { + description = "Backup your GitHub repositories with a simple command-line application written in Go."; + homepage = "https://github.com/qvl/ghbackup"; + license = licenses.mit; + mainProgram = "ghbackup"; + maintainers = with maintainers; [ lenny ]; + }; +} diff --git a/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch new file mode 100644 index 000000000000..346807a3a6d0 --- /dev/null +++ b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch @@ -0,0 +1,66 @@ +From 9825efc51387fef14fdb184e7061b313a54fcb86 Mon Sep 17 00:00:00 2001 +From: Ronan Barrett +Date: Mon, 8 May 2023 15:54:39 +0200 +Subject: [PATCH 1/2] fix next page logic + +--- + ghbackup/fetch.go | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go +index 93cce1c..bcef8ad 100644 +--- a/ghbackup/fetch.go ++++ b/ghbackup/fetch.go +@@ -126,11 +126,17 @@ func getNextURL(header http.Header) string { + if len(parts) == 0 { + return "" + } +- firstLink := parts[0] +- if !strings.Contains(firstLink, "rel=\"next\"") { ++ var nextLink string ++ for _, v := range parts { ++ if strings.Contains(v, "rel=\"next\"") { ++ nextLink = strings.TrimSpace(v) ++ } ++ } ++ if nextLink == "" { + return "" + } +- parts = strings.Split(firstLink, ";") ++ ++ parts = strings.Split(nextLink, ";") + if len(parts) == 0 { + return "" + } +@@ -140,3 +146,4 @@ func getNextURL(header http.Header) string { + } + return urlInBrackets[1 : len(urlInBrackets)-1] + } ++ + +From 5f696939f668cd88c59c05fd8e0d6ad9f236dea5 Mon Sep 17 00:00:00 2001 +From: Ronan Barrett +Date: Mon, 8 May 2023 16:44:47 +0200 +Subject: [PATCH 2/2] add break + +--- + ghbackup/fetch.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go +index bcef8ad..b045c38 100644 +--- a/ghbackup/fetch.go ++++ b/ghbackup/fetch.go +@@ -130,6 +130,7 @@ func getNextURL(header http.Header) string { + for _, v := range parts { + if strings.Contains(v, "rel=\"next\"") { + nextLink = strings.TrimSpace(v) ++ break + } + } + if nextLink == "" { +@@ -146,4 +147,3 @@ func getNextURL(header http.Header) string { + } + return urlInBrackets[1 : len(urlInBrackets)-1] + } +- diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix similarity index 100% rename from pkgs/development/libraries/ghc_filesystem/default.nix rename to pkgs/by-name/gh/ghc_filesystem/package.nix diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/by-name/gh/ghdorker/package.nix similarity index 100% rename from pkgs/tools/security/ghdorker/default.nix rename to pkgs/by-name/gh/ghdorker/package.nix diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/by-name/gh/ghorg/package.nix similarity index 100% rename from pkgs/applications/version-management/ghorg/default.nix rename to pkgs/by-name/gh/ghorg/package.nix diff --git a/pkgs/tools/security/ghost/default.nix b/pkgs/by-name/gh/ghost/package.nix similarity index 100% rename from pkgs/tools/security/ghost/default.nix rename to pkgs/by-name/gh/ghost/package.nix diff --git a/pkgs/tools/misc/ghostie/Cargo.lock b/pkgs/by-name/gh/ghostie/Cargo.lock similarity index 100% rename from pkgs/tools/misc/ghostie/Cargo.lock rename to pkgs/by-name/gh/ghostie/Cargo.lock diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/by-name/gh/ghostie/package.nix similarity index 100% rename from pkgs/tools/misc/ghostie/default.nix rename to pkgs/by-name/gh/ghostie/package.nix diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/pkgs/by-name/gh/ghostscript/doc-no-ref.diff similarity index 100% rename from pkgs/misc/ghostscript/doc-no-ref.diff rename to pkgs/by-name/gh/ghostscript/doc-no-ref.diff diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/by-name/gh/ghostscript/package.nix similarity index 100% rename from pkgs/misc/ghostscript/default.nix rename to pkgs/by-name/gh/ghostscript/package.nix diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/by-name/gh/ghostscript/test-corpus-render.nix similarity index 100% rename from pkgs/misc/ghostscript/test-corpus-render.nix rename to pkgs/by-name/gh/ghostscript/test-corpus-render.nix diff --git a/pkgs/misc/ghostscript/urw-font-files.patch b/pkgs/by-name/gh/ghostscript/urw-font-files.patch similarity index 100% rename from pkgs/misc/ghostscript/urw-font-files.patch rename to pkgs/by-name/gh/ghostscript/urw-font-files.patch diff --git a/pkgs/applications/misc/ghosttohugo/default.nix b/pkgs/by-name/gh/ghosttohugo/package.nix similarity index 100% rename from pkgs/applications/misc/ghosttohugo/default.nix rename to pkgs/by-name/gh/ghosttohugo/package.nix diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/by-name/gh/ghostunnel/package.nix similarity index 100% rename from pkgs/tools/networking/ghostunnel/default.nix rename to pkgs/by-name/gh/ghostunnel/package.nix diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/by-name/gh/ghq/package.nix similarity index 100% rename from pkgs/applications/version-management/ghq/default.nix rename to pkgs/by-name/gh/ghq/package.nix diff --git a/pkgs/applications/version-management/ghr/default.nix b/pkgs/by-name/gh/ghr/package.nix similarity index 100% rename from pkgs/applications/version-management/ghr/default.nix rename to pkgs/by-name/gh/ghr/package.nix diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/by-name/gh/ghz/package.nix similarity index 100% rename from pkgs/tools/networking/ghz/default.nix rename to pkgs/by-name/gh/ghz/package.nix diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/by-name/gi/gImageReader/package.nix similarity index 100% rename from pkgs/applications/misc/gImageReader/default.nix rename to pkgs/by-name/gi/gImageReader/package.nix diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/by-name/gi/gi-crystal/package.nix similarity index 100% rename from pkgs/development/tools/gi-crystal/default.nix rename to pkgs/by-name/gi/gi-crystal/package.nix diff --git a/pkgs/development/tools/gi-crystal/src.patch b/pkgs/by-name/gi/gi-crystal/src.patch similarity index 100% rename from pkgs/development/tools/gi-crystal/src.patch rename to pkgs/by-name/gi/gi-crystal/src.patch diff --git a/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch b/pkgs/by-name/gi/gi-crystal/store-friendly-library-name.patch similarity index 100% rename from pkgs/development/tools/gi-crystal/store-friendly-library-name.patch rename to pkgs/by-name/gi/gi-crystal/store-friendly-library-name.patch diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/by-name/gi/gi-docgen/package.nix similarity index 100% rename from pkgs/development/tools/documentation/gi-docgen/default.nix rename to pkgs/by-name/gi/gi-docgen/package.nix diff --git a/pkgs/applications/science/math/giac/fix-fltk-guard.patch b/pkgs/by-name/gi/giac/fix-fltk-guard.patch similarity index 100% rename from pkgs/applications/science/math/giac/fix-fltk-guard.patch rename to pkgs/by-name/gi/giac/fix-fltk-guard.patch diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/by-name/gi/giac/package.nix similarity index 100% rename from pkgs/applications/science/math/giac/default.nix rename to pkgs/by-name/gi/giac/package.nix diff --git a/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch b/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch similarity index 100% rename from pkgs/applications/science/math/giac/remove-old-functional-patterns.patch rename to pkgs/by-name/gi/giac/remove-old-functional-patterns.patch diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/by-name/gi/giada/package.nix similarity index 100% rename from pkgs/applications/audio/giada/default.nix rename to pkgs/by-name/gi/giada/package.nix diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/by-name/gi/giara/package.nix similarity index 100% rename from pkgs/applications/networking/giara/default.nix rename to pkgs/by-name/gi/giara/package.nix diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/by-name/gi/gibo/package.nix similarity index 100% rename from pkgs/tools/misc/gibo/default.nix rename to pkgs/by-name/gi/gibo/package.nix diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/by-name/gi/gif-for-cli/package.nix similarity index 100% rename from pkgs/tools/misc/gif-for-cli/default.nix rename to pkgs/by-name/gi/gif-for-cli/package.nix diff --git a/pkgs/tools/graphics/gif2apng/default.nix b/pkgs/by-name/gi/gif2apng/package.nix similarity index 100% rename from pkgs/tools/graphics/gif2apng/default.nix rename to pkgs/by-name/gi/gif2apng/package.nix diff --git a/pkgs/development/libraries/giflib/CVE-2021-40633.patch b/pkgs/by-name/gi/giflib/CVE-2021-40633.patch similarity index 100% rename from pkgs/development/libraries/giflib/CVE-2021-40633.patch rename to pkgs/by-name/gi/giflib/CVE-2021-40633.patch diff --git a/pkgs/development/libraries/giflib/mingw-install-exes.patch b/pkgs/by-name/gi/giflib/mingw-install-exes.patch similarity index 100% rename from pkgs/development/libraries/giflib/mingw-install-exes.patch rename to pkgs/by-name/gi/giflib/mingw-install-exes.patch diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/by-name/gi/giflib/package.nix similarity index 100% rename from pkgs/development/libraries/giflib/default.nix rename to pkgs/by-name/gi/giflib/package.nix diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/by-name/gi/gifticlib/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/gifticlib/default.nix rename to pkgs/by-name/gi/gifticlib/package.nix diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/by-name/gi/gigalixir/package.nix similarity index 100% rename from pkgs/tools/misc/gigalixir/default.nix rename to pkgs/by-name/gi/gigalixir/package.nix diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/by-name/gi/gigedit/package.nix similarity index 100% rename from pkgs/applications/audio/gigedit/default.nix rename to pkgs/by-name/gi/gigedit/package.nix diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/by-name/gi/gildas/clang.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/clang.patch rename to pkgs/by-name/gi/gildas/clang.patch diff --git a/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch b/pkgs/by-name/gi/gildas/cpp-darwin.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/cpp-darwin.patch rename to pkgs/by-name/gi/gildas/cpp-darwin.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/by-name/gi/gildas/package.nix similarity index 100% rename from pkgs/applications/science/astronomy/gildas/default.nix rename to pkgs/by-name/gi/gildas/package.nix diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/by-name/gi/gildas/wrapper.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/wrapper.patch rename to pkgs/by-name/gi/gildas/wrapper.patch diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/by-name/gi/gimme-aws-creds/package.nix similarity index 100% rename from pkgs/tools/admin/gimme-aws-creds/default.nix rename to pkgs/by-name/gi/gimme-aws-creds/package.nix diff --git a/pkgs/games/gimx/conf.patch b/pkgs/by-name/gi/gimx/conf.patch similarity index 100% rename from pkgs/games/gimx/conf.patch rename to pkgs/by-name/gi/gimx/conf.patch diff --git a/pkgs/games/gimx/gcc14.patch b/pkgs/by-name/gi/gimx/gcc14.patch similarity index 100% rename from pkgs/games/gimx/gcc14.patch rename to pkgs/by-name/gi/gimx/gcc14.patch diff --git a/pkgs/games/gimx/default.nix b/pkgs/by-name/gi/gimx/package.nix similarity index 100% rename from pkgs/games/gimx/default.nix rename to pkgs/by-name/gi/gimx/package.nix diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/by-name/gi/ginac/package.nix similarity index 100% rename from pkgs/applications/science/math/ginac/default.nix rename to pkgs/by-name/gi/ginac/package.nix diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix new file mode 100644 index 000000000000..06a4c36a7d9f --- /dev/null +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -0,0 +1,45 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, ginkgo }: + +buildGoModule rec { + pname = "ginkgo"; + version = "2.21.0"; + + src = fetchFromGitHub { + owner = "onsi"; + repo = "ginkgo"; + rev = "v${version}"; + sha256 = "sha256-9WvBdcl65WTwzFKTPYTg6ufhIBuqx+T99ng7UePSNHU="; + }; + vendorHash = "sha256-tjHBnkFlkP7n0/c9bz/nUzWerPzVQ+12cKijG1Jzti8="; + + # integration tests expect more file changes + # types tests are missing CodeLocation + excludedPackages = [ "integration" "types" ]; + + __darwinAllowLocalNetworking = true; + + passthru.tests.version = testers.testVersion { + package = ginkgo; + command = "ginkgo version"; + }; + + meta = with lib; { + homepage = "https://onsi.github.io/ginkgo/"; + changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; + description = "Modern Testing Framework for Go"; + mainProgram = "ginkgo"; + longDescription = '' + Ginkgo is a testing framework for Go designed to help you write expressive + tests. It is best paired with the Gomega matcher library. When combined, + Ginkgo and Gomega provide a rich and expressive DSL + (Domain-specific Language) for writing tests. + + Ginkgo is sometimes described as a "Behavior Driven Development" (BDD) + framework. In reality, Ginkgo is a general purpose testing framework in + active use across a wide variety of testing contexts: unit tests, + integration tests, acceptance test, performance tests, etc. + ''; + license = licenses.mit; + maintainers = with maintainers; [ saschagrunert jk ]; + }; +} diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/by-name/gi/gio-sharp/package.nix similarity index 100% rename from pkgs/development/libraries/gio-sharp/default.nix rename to pkgs/by-name/gi/gio-sharp/package.nix diff --git a/pkgs/applications/video/giph/default.nix b/pkgs/by-name/gi/giph/package.nix similarity index 100% rename from pkgs/applications/video/giph/default.nix rename to pkgs/by-name/gi/giph/package.nix diff --git a/pkgs/development/tools/gir/Cargo.lock b/pkgs/by-name/gi/gir-rs/Cargo.lock similarity index 100% rename from pkgs/development/tools/gir/Cargo.lock rename to pkgs/by-name/gi/gir-rs/Cargo.lock diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/by-name/gi/gir-rs/package.nix similarity index 100% rename from pkgs/development/tools/gir/default.nix rename to pkgs/by-name/gi/gir-rs/package.nix diff --git a/pkgs/tools/networking/girsh/default.nix b/pkgs/by-name/gi/girsh/package.nix similarity index 100% rename from pkgs/tools/networking/girsh/default.nix rename to pkgs/by-name/gi/girsh/package.nix diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/by-name/gi/git-aggregator/package.nix similarity index 100% rename from pkgs/applications/version-management/git-aggregator/default.nix rename to pkgs/by-name/gi/git-aggregator/package.nix diff --git a/pkgs/applications/version-management/git-annex-remote-rclone/default.nix b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix similarity index 100% rename from pkgs/applications/version-management/git-annex-remote-rclone/default.nix rename to pkgs/by-name/gi/git-annex-remote-rclone/package.nix diff --git a/pkgs/applications/version-management/git-annex-utils/default.nix b/pkgs/by-name/gi/git-annex-utils/package.nix similarity index 100% rename from pkgs/applications/version-management/git-annex-utils/default.nix rename to pkgs/by-name/gi/git-annex-utils/package.nix diff --git a/pkgs/applications/version-management/git-appraise/default.nix b/pkgs/by-name/gi/git-appraise/package.nix similarity index 100% rename from pkgs/applications/version-management/git-appraise/default.nix rename to pkgs/by-name/gi/git-appraise/package.nix diff --git a/pkgs/applications/version-management/git-backdate/default.nix b/pkgs/by-name/gi/git-backdate/package.nix similarity index 100% rename from pkgs/applications/version-management/git-backdate/default.nix rename to pkgs/by-name/gi/git-backdate/package.nix diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix index 761912e118c3..41fa743ccc5d 100644 --- a/pkgs/by-name/gi/git-backup-go/package.nix +++ b/pkgs/by-name/gi/git-backup-go/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "git-backup-go"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ChappIO"; repo = "git-backup"; rev = "v${version}"; - hash = "sha256-C/ha/GuRvqxmgrbOgkhup1tNoDT3pDIbE+nO5eMZGlY="; + hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks="; }; - vendorHash = "sha256-wzivnTe9Rx3YLz6lvrzsLiJIbxX7QE059Kzb4rUfD+s="; + vendorHash = "sha256-BLnnwwCrJJd8ihpgfdWel7l8aAIVVJBIpE+97J9ojPo="; ldflags = [ "-X main.Version=${version}" ]; diff --git a/pkgs/applications/version-management/git-bars/default.nix b/pkgs/by-name/gi/git-bars/package.nix similarity index 100% rename from pkgs/applications/version-management/git-bars/default.nix rename to pkgs/by-name/gi/git-bars/package.nix diff --git a/pkgs/applications/version-management/git-big-picture/default.nix b/pkgs/by-name/gi/git-big-picture/package.nix similarity index 100% rename from pkgs/applications/version-management/git-big-picture/default.nix rename to pkgs/by-name/gi/git-big-picture/package.nix diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/by-name/gi/git-bug-migration/package.nix similarity index 100% rename from pkgs/applications/version-management/git-bug-migration/default.nix rename to pkgs/by-name/gi/git-bug-migration/package.nix diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/by-name/gi/git-bug/package.nix similarity index 100% rename from pkgs/applications/version-management/git-bug/default.nix rename to pkgs/by-name/gi/git-bug/package.nix diff --git a/pkgs/applications/version-management/git-cache/default.nix b/pkgs/by-name/gi/git-cache/package.nix similarity index 100% rename from pkgs/applications/version-management/git-cache/default.nix rename to pkgs/by-name/gi/git-cache/package.nix diff --git a/pkgs/applications/version-management/git-chglog/default.nix b/pkgs/by-name/gi/git-chglog/package.nix similarity index 100% rename from pkgs/applications/version-management/git-chglog/default.nix rename to pkgs/by-name/gi/git-chglog/package.nix diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/by-name/gi/git-codereview/package.nix similarity index 100% rename from pkgs/applications/version-management/git-codereview/default.nix rename to pkgs/by-name/gi/git-codereview/package.nix diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/by-name/gi/git-cola/package.nix similarity index 100% rename from pkgs/applications/version-management/git-cola/default.nix rename to pkgs/by-name/gi/git-cola/package.nix diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/by-name/gi/git-crecord/package.nix similarity index 100% rename from pkgs/applications/version-management/git-crecord/default.nix rename to pkgs/by-name/gi/git-crecord/package.nix diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix new file mode 100644 index 000000000000..209a3e8f7d08 --- /dev/null +++ b/pkgs/by-name/gi/git-credential-oauth/package.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "git-credential-oauth"; + version = "0.13.3"; + + src = fetchFromGitHub { + owner = "hickford"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vs+PRFyvzn25nM6oO4VybXkTr1frmSspA2isSXLJFQo="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + vendorHash = "sha256-muK8UZW+8bhC6K0FvN6B7evTMeZnMeYlrIMJdJprPLM="; + + postInstall = '' + installManPage $src/git-credential-oauth.1 + ''; + + meta = { + description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth"; + homepage = "https://github.com/hickford/git-credential-oauth"; + changelog = "https://github.com/hickford/git-credential-oauth/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ shyim ]; + mainProgram = "git-credential-oauth"; + }; +} diff --git a/pkgs/applications/version-management/git-crypt/default.nix b/pkgs/by-name/gi/git-crypt/package.nix similarity index 100% rename from pkgs/applications/version-management/git-crypt/default.nix rename to pkgs/by-name/gi/git-crypt/package.nix diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/by-name/gi/git-delete-merged-branches/package.nix similarity index 100% rename from pkgs/applications/version-management/git-delete-merged-branches/default.nix rename to pkgs/by-name/gi/git-delete-merged-branches/package.nix diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/by-name/gi/git-dive/package.nix similarity index 100% rename from pkgs/applications/version-management/git-dive/default.nix rename to pkgs/by-name/gi/git-dive/package.nix diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/by-name/gi/git-extras/package.nix similarity index 100% rename from pkgs/applications/version-management/git-extras/default.nix rename to pkgs/by-name/gi/git-extras/package.nix diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix new file mode 100644 index 000000000000..f94bf3a3e580 --- /dev/null +++ b/pkgs/by-name/gi/git-fast-export/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitHub, + git, + mercurial, + makeWrapper, + nix-update-script, + fetchpatch, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fast-export"; + version = "231118"; + + src = fetchFromGitHub { + owner = "frej"; + repo = "fast-export"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JUy0t2yzd4bI7WPGG1E8L1topLfR5leV/WTU+u0bCyM="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/frej/fast-export/commit/a3d0562737e1e711659e03264e45cb47a5a2f46d.patch?full_index=1"; + hash = "sha256-vZOHnb5lXO22ElCK4oWQKCcPIqRyZV5axWfZqa84V1Y="; + }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + mercurial.python + mercurial + ]; + + installPhase = '' + binPath=$out/bin + libexecPath=$out/libexec/fast-export + sitepackagesPath=$out/${mercurial.python.sitePackages} + mkdir -p $binPath $libexecPath $sitepackagesPath + + # Patch shell scripts so they can execute the Python scripts + sed -i "s|ROOT=.*|ROOT=$libexecPath|" *.sh + + mv hg-fast-export.sh hg-reset.sh $binPath + mv hg-fast-export.py hg-reset.py $libexecPath + mv hg2git.py pluginloader plugins $sitepackagesPath + + for script in $out/bin/*.sh; do + wrapProgram $script \ + --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \ + --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath + done + ''; + + doInstallCheck = true; + # deliberately not adding git or hg into nativeInstallCheckInputs - package should + # be able to work without them in runtime env + installCheckPhase = '' + mkdir repo-hg + pushd repo-hg + ${mercurial}/bin/hg init + echo foo > bar + ${mercurial}/bin/hg add bar + ${mercurial}/bin/hg commit --message "baz" + popd + + mkdir repo-git + pushd repo-git + ${git}/bin/git init + ${git}/bin/git config core.ignoreCase false # for darwin + $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash + for s in "foo" "bar" "baz" ; do + (${git}/bin/git show | grep $s > /dev/null) && echo $s found + done + popd + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Import mercurial into git"; + homepage = "https://repo.or.cz/w/fast-export.git"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.koral ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/applications/version-management/git-fire/default.nix b/pkgs/by-name/gi/git-fire/package.nix similarity index 100% rename from pkgs/applications/version-management/git-fire/default.nix rename to pkgs/by-name/gi/git-fire/package.nix diff --git a/pkgs/applications/version-management/git-ftp/default.nix b/pkgs/by-name/gi/git-ftp/package.nix similarity index 100% rename from pkgs/applications/version-management/git-ftp/default.nix rename to pkgs/by-name/gi/git-ftp/package.nix diff --git a/pkgs/applications/version-management/git-graph/default.nix b/pkgs/by-name/gi/git-graph/package.nix similarity index 100% rename from pkgs/applications/version-management/git-graph/default.nix rename to pkgs/by-name/gi/git-graph/package.nix diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/by-name/gi/git-hound/package.nix similarity index 100% rename from pkgs/applications/version-management/git-hound/default.nix rename to pkgs/by-name/gi/git-hound/package.nix diff --git a/pkgs/applications/version-management/git-hub/default.nix b/pkgs/by-name/gi/git-hub/package.nix similarity index 100% rename from pkgs/applications/version-management/git-hub/default.nix rename to pkgs/by-name/gi/git-hub/package.nix diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/by-name/gi/git-ignore/package.nix similarity index 100% rename from pkgs/applications/version-management/git-ignore/default.nix rename to pkgs/by-name/gi/git-ignore/package.nix diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix new file mode 100644 index 000000000000..fef465d9446e --- /dev/null +++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, apple-sdk_11 }: + +rustPlatform.buildRustPackage rec { + pname = "git-interactive-rebase-tool"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "MitMaro"; + repo = pname; + rev = version; + hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; + }; + + cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv apple-sdk_11 ]; + + # Compilation during tests fails if this env var is not set. + preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; + postCheck = "unset GIRT_BUILD_GIT_HASH"; + + meta = with lib; { + homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; + description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; + changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 zowoq ma27 ]; + mainProgram = "interactive-rebase-tool"; + }; +} diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/by-name/gi/git-latexdiff/package.nix similarity index 100% rename from pkgs/tools/typesetting/git-latexdiff/default.nix rename to pkgs/by-name/gi/git-latexdiff/package.nix diff --git a/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/pkgs/by-name/gi/git-latexdiff/version-test.patch similarity index 100% rename from pkgs/tools/typesetting/git-latexdiff/version-test.patch rename to pkgs/by-name/gi/git-latexdiff/version-test.patch diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/by-name/gi/git-mit/package.nix similarity index 100% rename from pkgs/applications/version-management/git-mit/default.nix rename to pkgs/by-name/gi/git-mit/package.nix diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix new file mode 100644 index 000000000000..659a342247c9 --- /dev/null +++ b/pkgs/by-name/gi/git-nomad/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + git, +}: + +rustPlatform.buildRustPackage rec { + pname = "git-nomad"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "rraval"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA="; + }; + + cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; + + nativeCheckInputs = [ git ]; + + meta = with lib; { + description = "Synchronize work-in-progress git branches in a light weight fashion"; + homepage = "https://github.com/rraval/git-nomad"; + changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ rraval ]; + mainProgram = "git-nomad"; + }; +} diff --git a/pkgs/applications/version-management/git-octopus/default.nix b/pkgs/by-name/gi/git-octopus/package.nix similarity index 100% rename from pkgs/applications/version-management/git-octopus/default.nix rename to pkgs/by-name/gi/git-octopus/package.nix diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/by-name/gi/git-open/package.nix similarity index 100% rename from pkgs/applications/version-management/git-open/default.nix rename to pkgs/by-name/gi/git-open/package.nix diff --git a/pkgs/applications/version-management/git-privacy/default.nix b/pkgs/by-name/gi/git-privacy/package.nix similarity index 100% rename from pkgs/applications/version-management/git-privacy/default.nix rename to pkgs/by-name/gi/git-privacy/package.nix diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/by-name/gi/git-quick-stats/package.nix similarity index 100% rename from pkgs/applications/version-management/git-quick-stats/default.nix rename to pkgs/by-name/gi/git-quick-stats/package.nix diff --git a/pkgs/applications/version-management/git-radar/default.nix b/pkgs/by-name/gi/git-radar/package.nix similarity index 100% rename from pkgs/applications/version-management/git-radar/default.nix rename to pkgs/by-name/gi/git-radar/package.nix diff --git a/pkgs/applications/version-management/git-relevant-history/default.nix b/pkgs/by-name/gi/git-relevant-history/package.nix similarity index 100% rename from pkgs/applications/version-management/git-relevant-history/default.nix rename to pkgs/by-name/gi/git-relevant-history/package.nix diff --git a/pkgs/applications/version-management/git-remote-gcrypt/default.nix b/pkgs/by-name/gi/git-remote-gcrypt/package.nix similarity index 100% rename from pkgs/applications/version-management/git-remote-gcrypt/default.nix rename to pkgs/by-name/gi/git-remote-gcrypt/package.nix diff --git a/pkgs/applications/version-management/git-remote-hg/default.nix b/pkgs/by-name/gi/git-remote-hg/package.nix similarity index 100% rename from pkgs/applications/version-management/git-remote-hg/default.nix rename to pkgs/by-name/gi/git-remote-hg/package.nix diff --git a/pkgs/applications/version-management/git-reparent/default.nix b/pkgs/by-name/gi/git-reparent/package.nix similarity index 100% rename from pkgs/applications/version-management/git-reparent/default.nix rename to pkgs/by-name/gi/git-reparent/package.nix diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/by-name/gi/git-repo/import-ssl-module.patch similarity index 100% rename from pkgs/applications/version-management/git-repo/import-ssl-module.patch rename to pkgs/by-name/gi/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/by-name/gi/git-repo/package.nix similarity index 100% rename from pkgs/applications/version-management/git-repo/default.nix rename to pkgs/by-name/gi/git-repo/package.nix diff --git a/pkgs/applications/version-management/git-secret/default.nix b/pkgs/by-name/gi/git-secret/package.nix similarity index 100% rename from pkgs/applications/version-management/git-secret/default.nix rename to pkgs/by-name/gi/git-secret/package.nix diff --git a/pkgs/applications/version-management/git-secrets/default.nix b/pkgs/by-name/gi/git-secrets/package.nix similarity index 100% rename from pkgs/applications/version-management/git-secrets/default.nix rename to pkgs/by-name/gi/git-secrets/package.nix diff --git a/pkgs/applications/version-management/git-series/default.nix b/pkgs/by-name/gi/git-series/package.nix similarity index 100% rename from pkgs/applications/version-management/git-series/default.nix rename to pkgs/by-name/gi/git-series/package.nix diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix new file mode 100644 index 000000000000..2cae12371b63 --- /dev/null +++ b/pkgs/by-name/gi/git-sim/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + python3Packages, +}: +let + inherit (python3Packages) + buildPythonApplication + gitpython + manim + opencv4 + typer + pydantic + fonttools + git-dummy + pytestCheckHook + ; + + version = "0.3.5"; +in + +buildPythonApplication { + pname = "git-sim"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "initialcommit-com"; + repo = "git-sim"; + rev = "v${version}"; + hash = "sha256-4jHkAlF2SAzHjBi8pmAJ0TKkcLxw+6EdGsXnHZUMILw="; + }; + + patches = [ ./tests.patch ]; + + build-system = [ ]; + + pythonRemoveDeps = [ "opencv-python-headless" ]; + + dependencies = [ + gitpython + manim + opencv4 + typer + pydantic + fonttools + git-dummy + ]; + + # https://github.com/NixOS/nixpkgs/commit/8033561015355dd3c3cf419d81ead31e534d2138 + makeWrapperArgs = [ "--prefix PYTHONWARNINGS , ignore:::pydub.utils:" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + # https://github.com/NixOS/nixpkgs/issues/308283 + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd git-sim \ + --bash <($out/bin/git-sim --show-completion bash) \ + --fish <($out/bin/git-sim --show-completion fish) \ + --zsh <($out/bin/git-sim --show-completion zsh) + '' + + "ln -s ${git-dummy}/bin/git-dummy $out/bin/"; + + preCheck = '' + PATH=$PATH:$out/bin + ''; + + nativeCheckInputs = [ + pytestCheckHook + git-dummy + ]; + + doCheck = false; + + meta = { + description = "Visually simulate Git operations in your own repos with a single terminal command"; + homepage = "https://initialcommit.com/tools/git-sim"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mathiassven ]; + }; +} diff --git a/pkgs/by-name/gi/git-sim/tests.patch b/pkgs/by-name/gi/git-sim/tests.patch new file mode 100644 index 000000000000..525ce6b25252 --- /dev/null +++ b/pkgs/by-name/gi/git-sim/tests.patch @@ -0,0 +1,33 @@ +diff --git a/tests/e2e_tests/conftest.py b/tests/e2e_tests/conftest.py +index 310197a..9e82a1e 100644 +--- a/tests/e2e_tests/conftest.py ++++ b/tests/e2e_tests/conftest.py +@@ -22,9 +22,7 @@ def tmp_repo(tmp_path_factory): + # Create the sample repo for testing. + os.chdir(tmp_repo_dir) + +- # When defining cmd, as_posix() is required for Windows compatibility. +- git_dummy_path = utils.get_venv_path() / "git-dummy" +- cmd = f"{git_dummy_path.as_posix()} --commits=10 --branches=4 --merge=1 --constant-sha --name=sample_repo --diverge-at=2" ++ cmd = "git-dummy --commits=10 --branches=4 --merge=1 --constant-sha --name=sample_repo --diverge-at=2" + cmd_parts = split(cmd) + subprocess.run(cmd_parts) + +diff --git a/tests/e2e_tests/utils.py b/tests/e2e_tests/utils.py +index 8dfc623..41a4cf6 100644 +--- a/tests/e2e_tests/utils.py ++++ b/tests/e2e_tests/utils.py +@@ -69,13 +69,6 @@ def get_cmd_parts(raw_command): + f"git-sim -d --output-only-path --img-format=png --font='{font_path}'", + ) + +- # Replace `git-sim` with the full path to the binary. +- # as_posix() is needed for Windows compatibility. +- # The space is included in "git-sim " to avoid replacing any occurrences +- # of git-sim in a font path. +- git_sim_path = get_venv_path() / "git-sim" +- cmd = cmd.replace("git-sim ", f"{git_sim_path.as_posix()} ") +- + # Show full test command when run in diagnostic mode. + print(f" Test command: {cmd}") + diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/by-name/gi/git-sizer/package.nix similarity index 100% rename from pkgs/applications/version-management/git-sizer/default.nix rename to pkgs/by-name/gi/git-sizer/package.nix diff --git a/pkgs/applications/version-management/git-stree/default.nix b/pkgs/by-name/gi/git-stree/package.nix similarity index 100% rename from pkgs/applications/version-management/git-stree/default.nix rename to pkgs/by-name/gi/git-stree/package.nix diff --git a/pkgs/applications/version-management/git-subrepo/default.nix b/pkgs/by-name/gi/git-subrepo/package.nix similarity index 100% rename from pkgs/applications/version-management/git-subrepo/default.nix rename to pkgs/by-name/gi/git-subrepo/package.nix diff --git a/pkgs/applications/version-management/git-subtrac/default.nix b/pkgs/by-name/gi/git-subtrac/package.nix similarity index 100% rename from pkgs/applications/version-management/git-subtrac/default.nix rename to pkgs/by-name/gi/git-subtrac/package.nix diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix new file mode 100644 index 000000000000..1534cfb81c1e --- /dev/null +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: + +stdenv.mkDerivation rec { + pname = "git-sync"; + version = "0-unstable-2024-02-15"; + + src = fetchFromGitHub { + owner = "simonthum"; + repo = "git-sync"; + rev = "493b0155fb974b477b6ea623d6e41e13ddad8500"; + hash = "sha256-hsq+kpB+akjbFKBeHMsP8ibrtygEG2Yf2QW9vFFIano="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a git-* $out/bin/ + cp -a contrib/git-* $out/bin/ + ''; + + wrapperPath = lib.makeBinPath ([ + coreutils + git + gnugrep + gnused + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); + + postFixup = '' + wrap_path="${wrapperPath}":$out/bin + + wrapProgram $out/bin/git-sync \ + --prefix PATH : $wrap_path + + wrapProgram $out/bin/git-sync-on-inotify \ + --prefix PATH : $wrap_path + ''; + + meta = { + description = "Script to automatically synchronize a git repository"; + homepage = "https://github.com/simonthum/git-sync"; + maintainers = with lib.maintainers; [ imalison ]; + license = lib.licenses.cc0; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/applications/version-management/git-team/default.nix b/pkgs/by-name/gi/git-team/package.nix similarity index 100% rename from pkgs/applications/version-management/git-team/default.nix rename to pkgs/by-name/gi/git-team/package.nix diff --git a/pkgs/applications/version-management/git-test/default.nix b/pkgs/by-name/gi/git-test/package.nix similarity index 100% rename from pkgs/applications/version-management/git-test/default.nix rename to pkgs/by-name/gi/git-test/package.nix diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/by-name/gi/git-town/package.nix similarity index 100% rename from pkgs/applications/version-management/git-town/default.nix rename to pkgs/by-name/gi/git-town/package.nix diff --git a/pkgs/applications/version-management/git-vanity-hash/default.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix similarity index 100% rename from pkgs/applications/version-management/git-vanity-hash/default.nix rename to pkgs/by-name/gi/git-vanity-hash/package.nix diff --git a/pkgs/applications/version-management/git-vendor/default.nix b/pkgs/by-name/gi/git-vendor/package.nix similarity index 100% rename from pkgs/applications/version-management/git-vendor/default.nix rename to pkgs/by-name/gi/git-vendor/package.nix diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix new file mode 100644 index 000000000000..02b58f2cf703 --- /dev/null +++ b/pkgs/by-name/gi/git-warp-time/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchurl, + + # nativeBuildInputs + zstd, + pkg-config, + jq, + cargo, + rustc, + rustPlatform, + + # buildInputs + libgit2, + typos, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "git-warp-time"; + version = "0.8.4"; + + src = fetchurl { + url = "https://github.com/alerque/git-warp-time/releases/download/v${finalAttrs.version}/git-warp-time-${finalAttrs.version}.tar.zst"; + sha256 = "sha256-Xh30nA77cJ7+UfKlIslnyD+93AtnQ+8P3sCFsG0DAUk="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + nativeBuildInputs = [ zstd ]; + dontConfigure = true; + hash = "sha256-ozy8Mfl5fTJL2Sr22tCSnK30SOKaC9cL+g4lX6ivi9Q="; + }; + + nativeBuildInputs = [ + zstd + pkg-config + jq + cargo + rustc + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + libgit2 + typos + ]; + + env = { + LIBGIT2_NO_VENDOR = "1"; + }; + + outputs = [ + "out" + "doc" + "man" + "dev" + ]; + + enableParallelBuilding = true; + + meta = { + description = "Utility to reset filesystem timestamps based on Git history"; + longDescription = '' + A CLI utility that resets the timestamps of files in a Git repository + working directory to the exact timestamp of the last commit which + modified each file. + ''; + homepage = "https://github.com/alerque/git-warp-time"; + changelog = "https://github.com/alerque/git-warp-time/raw/v${finalAttrs.version}/CHANGELOG.md"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + alerque + ]; + license = lib.licenses.gpl3Only; + mainProgram = "git-warp-time"; + }; +}) diff --git a/pkgs/applications/version-management/git-when-merged/default.nix b/pkgs/by-name/gi/git-when-merged/package.nix similarity index 100% rename from pkgs/applications/version-management/git-when-merged/default.nix rename to pkgs/by-name/gi/git-when-merged/package.nix diff --git a/pkgs/development/libraries/git2-cpp/default.nix b/pkgs/by-name/gi/git2-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/git2-cpp/default.nix rename to pkgs/by-name/gi/git2-cpp/package.nix diff --git a/pkgs/applications/version-management/git2cl/default.nix b/pkgs/by-name/gi/git2cl/package.nix similarity index 100% rename from pkgs/applications/version-management/git2cl/default.nix rename to pkgs/by-name/gi/git2cl/package.nix diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitaly/git.nix rename to pkgs/by-name/gi/gitaly/git.nix diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/by-name/gi/gitaly/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitaly/default.nix rename to pkgs/by-name/gi/gitaly/package.nix diff --git a/pkgs/applications/version-management/gitbatch/default.nix b/pkgs/by-name/gi/gitbatch/package.nix similarity index 100% rename from pkgs/applications/version-management/gitbatch/default.nix rename to pkgs/by-name/gi/gitbatch/package.nix diff --git a/pkgs/applications/version-management/gitflow/default.nix b/pkgs/by-name/gi/gitflow/package.nix similarity index 100% rename from pkgs/applications/version-management/gitflow/default.nix rename to pkgs/by-name/gi/gitflow/package.nix diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/by-name/gi/gitfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/gitfs/default.nix rename to pkgs/by-name/gi/gitfs/package.nix diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/by-name/gi/github-backup/package.nix similarity index 100% rename from pkgs/tools/misc/github-backup/default.nix rename to pkgs/by-name/gi/github-backup/package.nix diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/by-name/gi/github-commenter/package.nix similarity index 100% rename from pkgs/development/tools/github-commenter/default.nix rename to pkgs/by-name/gi/github-commenter/package.nix diff --git a/pkgs/tools/misc/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json similarity index 100% rename from pkgs/tools/misc/github-copilot-cli/package-lock.json rename to pkgs/by-name/gi/github-copilot-cli/package-lock.json diff --git a/pkgs/tools/misc/github-copilot-cli/default.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix similarity index 100% rename from pkgs/tools/misc/github-copilot-cli/default.nix rename to pkgs/by-name/gi/github-copilot-cli/package.nix diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix similarity index 100% rename from pkgs/development/tools/github-copilot-intellij-agent/default.nix rename to pkgs/by-name/gi/github-copilot-intellij-agent/package.nix diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/by-name/gi/github-release/package.nix similarity index 100% rename from pkgs/development/tools/github/github-release/default.nix rename to pkgs/by-name/gi/github-release/package.nix diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 93997cb01d62..392edeb7abfe 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -119,7 +119,7 @@ buildDotnetModule rec { darwin.autoSignDarwinBinariesHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/by-name/gi/gitit/package.nix similarity index 100% rename from pkgs/applications/misc/gitit/default.nix rename to pkgs/by-name/gi/gitit/package.nix diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/by-name/gi/gitjacker/package.nix similarity index 100% rename from pkgs/tools/security/gitjacker/default.nix rename to pkgs/by-name/gi/gitjacker/package.nix diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix new file mode 100644 index 000000000000..3347a8cebbbb --- /dev/null +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -0,0 +1,254 @@ +{ + lib, + stdenv, + libXcomposite, + libgnome-keyring, + makeWrapper, + udev, + curlWithGnuTls, + alsa-lib, + libXfixes, + atk, + gtk3, + libXrender, + pango, + adwaita-icon-theme, + cairo, + freetype, + fontconfig, + libX11, + libXi, + libxcb, + libXext, + libXcursor, + glib, + libXScrnSaver, + libxkbfile, + libXtst, + nss, + nspr, + cups, + fetchzip, + expat, + gdk-pixbuf, + libXdamage, + libXrandr, + dbus, + makeDesktopItem, + openssl, + wrapGAppsHook3, + buildPackages, + at-spi2-atk, + at-spi2-core, + libuuid, + e2fsprogs, + krb5, + libdrm, + mesa, + unzip, + copyDesktopItems, + libxshmfence, + libxkbcommon, + git, + libGL, + zlib, + cacert, +}: + +let + pname = "gitkraken"; + version = "10.4.1"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + srcs = { + x86_64-linux = fetchzip { + url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; + hash = "sha256-ZvLDGhBnWjjWqzwqJOz91X8hr94jkXtMA8CL2hh9mlI="; + }; + + x86_64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; + hash = "sha256-fPvEItavxFwUbk3WsTBvzRMu7fjnm5HxybEueHn//Q4="; + }; + + aarch64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; + hash = "sha256-N8WMbJFC74tIeJ6Yyk58nT+sIBYN/7PNLdYNxGSB2yM="; + }; + }; + + src = srcs.${stdenv.hostPlatform.system} or throwSystem; + + meta = with lib; { + homepage = "https://www.gitkraken.com/git-client"; + description = "Simplifying Git for any OS"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = builtins.attrNames srcs; + maintainers = with maintainers; [ + xnwdd + evanjs + arkivm + nicolas-goudry + ]; + mainProgram = "gitkraken"; + }; + + linux = stdenv.mkDerivation rec { + inherit + pname + version + src + meta + ; + + dontBuild = true; + dontConfigure = true; + + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + curlWithGnuTls + udev + libX11 + libXext + libXcursor + libXi + libxcb + glib + libXScrnSaver + libxkbfile + libXtst + nss + nspr + cups + alsa-lib + expat + gdk-pixbuf + dbus + libXdamage + libXrandr + atk + pango + cairo + freetype + fontconfig + libXcomposite + libXfixes + libXrender + gtk3 + libgnome-keyring + openssl + at-spi2-atk + at-spi2-core + libuuid + e2fsprogs + krb5 + libdrm + mesa + libxshmfence + libxkbcommon + libGL + zlib + ]; + + desktopItems = [ + (makeDesktopItem { + name = "GitKraken Desktop"; + exec = "gitkraken"; + icon = "gitkraken"; + desktopName = "GitKraken Desktop"; + genericName = "Git Client"; + categories = [ "Development" ]; + comment = "Unleash your repo"; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + ]; + buildInputs = [ + gtk3 + adwaita-icon-theme + ]; + + # avoid double-wrapping + dontWrapGApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname}/ + cp -R $src/* $out/share/${pname} + + mkdir -p $out/share/pixmaps + cp gitkraken.png $out/share/pixmaps/ + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") + ''; + + postFixup = '' + pushd $out/share/${pname} + for file in gitkraken chrome-sandbox chrome_crashpad_handler; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file + done + + for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name git -o -name git-\* -o -name scalar -o -name \*.so\* \) ); do + patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true + done + popd + + # SSL and permissions fix for bundled nodegit + pushd $out/share/${pname}/resources/app.asar.unpacked/node_modules/@axosoft/nodegit/build/Release + mv nodegit-ubuntu-18.node nodegit-ubuntu-18-ssl-1.1.1.node + mv nodegit-ubuntu-18-ssl-static.node nodegit-ubuntu-18.node + chmod 755 nodegit-ubuntu-18.node + popd + + # Devendor bundled git + rm -rf $out/share/${pname}/resources/app.asar.unpacked/git + ln -s ${git} $out/share/${pname}/resources/app.asar.unpacked/git + + # GitKraken expects the CA bundle to be located in the bundled git directory. Since we replace it with + # the one from nixpkgs, which doesn't provide a CA bundle, we need to explicitly set its location at runtime + makeWrapper $out/share/${pname}/gitkraken $out/bin/gitkraken \ + --set GIT_SSL_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + "''${gappsWrapperArgs[@]}" + ''; + }; + + darwin = stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + + nativeBuildInputs = [ + unzip + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/GitKraken.app $out/bin + cp -R . $out/Applications/GitKraken.app + + makeWrapper $out/Applications/GitKraken.app/Contents/MacOS/GitKraken $out/bin/gitkraken + + runHook postInstall + ''; + + dontFixup = true; + }; +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix similarity index 100% rename from pkgs/development/tools/rust/gitlab-clippy/default.nix rename to pkgs/by-name/gi/gitlab-clippy/package.nix diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix rename to pkgs/by-name/gi/gitlab-container-registry/package.nix diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix rename to pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix new file mode 100644 index 000000000000..9846ae52cee2 --- /dev/null +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -0,0 +1,26 @@ +{ buildGoModule, lib, fetchFromGitLab }: + +buildGoModule rec { + pname = "gitlab-pages"; + version = "17.3.6"; + + # nixpkgs-update: no auto update + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitlab-pages"; + rev = "v${version}"; + hash = "sha256-yieOM9QQuQQ4RkfjASpcEvIKwbYMT9LkkJPHAYhY7uY="; + }; + + vendorHash = "sha256-O8kWiOpgVCUD6DdM95F1b+j4Gv9LTLRdBjByqXWV7Pk="; + subPackages = [ "." ]; + + meta = with lib; { + description = "Daemon used to serve static websites for GitLab users"; + mainProgram = "gitlab-pages"; + homepage = "https://gitlab.com/gitlab-org/gitlab-pages"; + changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = teams.gitlab.members; + }; +} diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/by-name/gi/gitlab-shell/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-shell/default.nix rename to pkgs/by-name/gi/gitlab-shell/package.nix diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/by-name/gi/gitlab-shell/remove-hardcoded-locations.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch rename to pkgs/by-name/gi/gitlab-shell/remove-hardcoded-locations.patch diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/by-name/gi/gitleaks/package.nix similarity index 100% rename from pkgs/tools/security/gitleaks/default.nix rename to pkgs/by-name/gi/gitleaks/package.nix diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/by-name/gi/gitless/package.nix similarity index 100% rename from pkgs/applications/version-management/gitless/default.nix rename to pkgs/by-name/gi/gitless/package.nix diff --git a/pkgs/applications/version-management/gitls/default.nix b/pkgs/by-name/gi/gitls/package.nix similarity index 100% rename from pkgs/applications/version-management/gitls/default.nix rename to pkgs/by-name/gi/gitls/package.nix diff --git a/pkgs/applications/version-management/gitnr/default.nix b/pkgs/by-name/gi/gitnr/package.nix similarity index 100% rename from pkgs/applications/version-management/gitnr/default.nix rename to pkgs/by-name/gi/gitnr/package.nix diff --git a/pkgs/applications/version-management/gitnuro/default.nix b/pkgs/by-name/gi/gitnuro/package.nix similarity index 100% rename from pkgs/applications/version-management/gitnuro/default.nix rename to pkgs/by-name/gi/gitnuro/package.nix diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/by-name/gi/gitolite/package.nix similarity index 100% rename from pkgs/applications/version-management/gitolite/default.nix rename to pkgs/by-name/gi/gitolite/package.nix diff --git a/pkgs/by-name/gi/gitopper/package.nix b/pkgs/by-name/gi/gitopper/package.nix new file mode 100644 index 000000000000..442a706ad7f9 --- /dev/null +++ b/pkgs/by-name/gi/gitopper/package.nix @@ -0,0 +1,54 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + makeWrapper, +}: +let + pname = "gitopper"; + version = "0.0.16"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "miekg"; + repo = "gitopper"; + rev = "v${version}"; + hash = "sha256-EAOC54VtGx6axfty5m8JOebcayINTy4cP4NBo5+ioLk="; + }; + + ldflags = [ "-X main.Version=${version}" ]; + + vendorHash = "sha256-sxeN7nbNTGfD8ZgNQiEQdYl11rhOvPP8UrnYXs9Ljhc="; + + nativeCheckInputs = [ + makeWrapper + git + ]; + + checkFlags = + let + # Skip tests that does not works well inside an isolated environment + skippedTests = [ + "TestInitialGitCheckout" + "TestHash" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + postInstall = '' + wrapProgram $out/bin/gitopper \ + --suffix PATH : ${lib.makeBinPath [ git ]} + ''; + + meta = { + description = "Gitops for non-Kubernetes folks"; + homepage = "https://github.com/miekg/gitopper/"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "gitopper"; + }; +} diff --git a/pkgs/tools/misc/gitrs/default.nix b/pkgs/by-name/gi/gitrs/package.nix similarity index 100% rename from pkgs/tools/misc/gitrs/default.nix rename to pkgs/by-name/gi/gitrs/package.nix diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/by-name/gi/gitsign/package.nix similarity index 100% rename from pkgs/applications/version-management/gitsign/default.nix rename to pkgs/by-name/gi/gitsign/package.nix diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/by-name/gi/gitstats/package.nix similarity index 100% rename from pkgs/applications/version-management/gitstats/default.nix rename to pkgs/by-name/gi/gitstats/package.nix diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix new file mode 100644 index 000000000000..cc6037d16c21 --- /dev/null +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -0,0 +1,129 @@ +{ + callPackage, + lib, + stdenv, + fetchFromGitHub, + git, + zsh, + runtimeShell, +}: +stdenv.mkDerivation rec { + pname = "gitstatus"; + version = "1.5.5"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "gitstatus"; + rev = "v${version}"; + sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc="; + }; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-liconv"; + }; + + buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; + + postPatch = '' + sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh + sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh + sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install + ''; + + installPhase = '' + install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd + install -Dm444 gitstatus.plugin.sh -t $out/share/gitstatus/ + install -Dm444 gitstatus.plugin.zsh -t $out/share/gitstatus/ + install -Dm444 gitstatus.prompt.sh -t $out/share/gitstatus/ + install -Dm444 gitstatus.prompt.zsh -t $out/share/gitstatus/ + install -Dm555 install -t $out/share/gitstatus/ + install -Dm444 build.info -t $out/share/gitstatus/ + + # the fallback path is wrong in the case of home-manager + # because the FHS directories don't start at / + substituteInPlace install \ + --replace "_gitstatus_install_main ." "_gitstatus_install_main $out" + + cat < $out/bin/gitstatus-share + #!${runtimeShell} + # Run this script to find the gitstatus shared folder where all the shell + # integration scripts are living. + echo $out/share/gitstatus + EOF + chmod +x $out/bin/gitstatus-share + ''; + + # Don't install the "install" and "build.info" files, which the end user + # should not need to worry about. + pathsToLink = [ + "/bin/gitstatusd" + "/share/gitstatus/gitstatus.plugin.sh" + "/share/gitstatus/gitstatus.plugin.zsh" + "/share/gitstatus/gitstatus.prompt.sh" + "/share/gitstatus/gitstatus.prompt.zsh" + ]; + + # The install check sets up an empty Git repository and a minimal zshrc that + # invokes gitstatus.plugin.zsh. It runs zsh against this zshrc and verifies + # that the script was sourced successfully and that the "gitstatus_query" + # command ran successfully. This tests the binary itself and the zsh + # integration. + nativeInstallCheckInputs = [ + git + zsh + ]; + doInstallCheck = true; + installCheckPhase = '' + TEMP=$(mktemp -d) + cd "$TEMP" + + git init + + echo ' + GITSTATUS_LOG_LEVEL=DEBUG + . $out/share/gitstatus/gitstatus.plugin.zsh || exit 1 + + gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST + gitstatus_query NIX_TEST + if [[ $? -ne 0 ]]; then + print -- "Something went wrong with gitstatus" + exit 1 + elif [[ $VCS_STATUS_RESULT != "ok-sync" ]]; then + print -- "Not in a Git repo" + exit 1 + else + print -- "OK" + exit 0 + fi + ' > .zshrc + + # If we try to run zsh like "zsh -i -c true" or "zsh -i > output" then job + # control will be disabled in the shell and the gitstatus plugin script + # will fail when it tries to set the MONITOR option. As a workaround, we + # run zsh as a full-fledged independent process and then wait for it to + # exit. (The "exit" statements in the zshrc ensure that zsh will exit + # almost immediately after starting.) + ZDOTDIR=. zsh -i & + wait $! + ''; + + meta = with lib; { + description = "10x faster implementation of `git status` command"; + longDescription = '' + To enable the included gitstatus prompt, add the appropriate line to your NixOS configuration: + `programs.bash.promptInit = "source $(gitstatus-share)/gitstatus.prompt.sh";` + `programs.zsh.promptInit = "source $(gitstatus-share)/gitstatus.prompt.zsh";` + + See the project homepage for details on customization. + ''; + homepage = "https://github.com/romkatv/gitstatus"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + mmlb + hexa + SuperSandro2000 + ]; + platforms = platforms.all; + mainProgram = "gitstatusd"; + }; +} diff --git a/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix similarity index 100% rename from pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix rename to pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix diff --git a/pkgs/applications/version-management/gitty/default.nix b/pkgs/by-name/gi/gitty/package.nix similarity index 100% rename from pkgs/applications/version-management/gitty/default.nix rename to pkgs/by-name/gi/gitty/package.nix diff --git a/pkgs/applications/version-management/gitweb/default.nix b/pkgs/by-name/gi/gitweb/package.nix similarity index 100% rename from pkgs/applications/version-management/gitweb/default.nix rename to pkgs/by-name/gi/gitweb/package.nix diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/by-name/gi/gixy/package.nix similarity index 100% rename from pkgs/tools/admin/gixy/default.nix rename to pkgs/by-name/gi/gixy/package.nix diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/by-name/gj/gjay/package.nix similarity index 100% rename from pkgs/applications/audio/gjay/default.nix rename to pkgs/by-name/gj/gjay/package.nix diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/by-name/gj/gjo/package.nix similarity index 100% rename from pkgs/tools/text/gjo/default.nix rename to pkgs/by-name/gj/gjo/package.nix diff --git a/pkgs/development/libraries/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch similarity index 100% rename from pkgs/development/libraries/gjs/disable-introspection-test.patch rename to pkgs/by-name/gj/gjs/disable-introspection-test.patch diff --git a/pkgs/development/libraries/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/gjs/fix-paths.patch rename to pkgs/by-name/gj/gjs/fix-paths.patch diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch new file mode 100644 index 000000000000..aa1510f5807b --- /dev/null +++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch @@ -0,0 +1,110 @@ +diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build +index 98475f7d..942d9eca 100644 +--- a/installed-tests/js/meson.build ++++ b/installed-tests/js/meson.build +@@ -10,7 +10,7 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources', + minijasmine = executable('minijasmine', '../minijasmine.cpp', + jsunit_resources_files, dependencies: libgjs_dep, + cpp_args: [ +- '-DINSTTESTDIR="@0@"'.format(prefix / installed_tests_execdir), ++ '-DINSTTESTDIR="@0@"'.format(installed_tests_execdir), + ], + include_directories: top_include, + install: get_option('installed_tests'), install_dir: installed_tests_execdir) +@@ -82,7 +82,7 @@ foreach test : jasmine_tests + + test_description_subst = { + 'name': 'test@0@.js'.format(test), +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file(configuration: test_description_subst, + input: '../minijasmine.test.in', +@@ -125,7 +125,7 @@ foreach test : dbus_tests + + dbus_test_description_subst = { + 'name': 'test@0@.js'.format(test), +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file( + configuration: dbus_test_description_subst, +@@ -163,7 +163,7 @@ foreach test : modules_tests + + esm_test_description_subst = { + 'name': 'test@0@.js'.format(test), +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file(configuration: esm_test_description_subst, + input: '../minijasmine-module.test.in', +diff --git a/installed-tests/meson.build b/installed-tests/meson.build +index 7a7c48ab..52508c2c 100644 +--- a/installed-tests/meson.build ++++ b/installed-tests/meson.build +@@ -30,7 +30,7 @@ foreach test : simple_tests + + test_description_subst = { + 'name': 'test@0@.sh'.format(test), +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file(configuration: test_description_subst, + input: 'script.test.in', output: 'test@0@.sh.test'.format(test), +@@ -85,7 +85,7 @@ foreach test : debugger_tests + + test_description_subst = { + 'name': '@0@.debugger'.format(test), +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file(configuration: test_description_subst, + input: 'debugger.test.in', +diff --git a/installed-tests/script.test.in b/installed-tests/script.test.in +index debefc4c..96a91b88 100644 +--- a/installed-tests/script.test.in ++++ b/installed-tests/script.test.in +@@ -3,5 +3,5 @@ + + [Test] + Type=session +-Exec=sh @prefix@/@installed_tests_execdir@/scripts/@name@ ++Exec=sh @installed_tests_execdir@/scripts/@name@ + Output=TAP +diff --git a/meson.build b/meson.build +index bbfe8bc8..e6f87dc3 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,8 +25,8 @@ datadir = get_option('datadir') + libexecdir = get_option('libexecdir') + gjsjsdir = datadir / api_name + pkglibdir = libdir / meson.project_name() +-installed_tests_execdir = libexecdir / 'installed-tests' / meson.project_name() +-installed_tests_metadir = datadir / 'installed-tests' / meson.project_name() ++installed_tests_execdir = get_option('installed_test_prefix') / libexecdir / 'installed-tests' / meson.project_name() ++installed_tests_metadir = get_option('installed_test_prefix') / datadir / 'installed-tests' / meson.project_name() + + ### Check for conflicting build options ######################################## + +@@ -577,9 +577,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind + install_data('installed-tests/extra/lsan.supp', install_dir: gjsjsdir / 'lsan') + + if get_option('installed_tests') +- schemadir = datadir / 'glib-2.0' / 'schemas' ++ schemadir = get_option('installed_test_prefix') / datadir / 'glib-2.0' / 'schemas' + install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir) +- meson.add_install_script(glib_compile_schemas, prefix / schemadir, skip_if_destdir: true) ++ meson.add_install_script(glib_compile_schemas, schemadir, skip_if_destdir: true) + endif + + ### Generate pkg-config file ################################################### +diff --git a/meson_options.txt b/meson_options.txt +index fe425efd..29325756 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -24,3 +24,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, + description: 'Skip tests that need a display connection') + option('verbose_logs', type: 'boolean', value: false, + description: 'Enable extra log messages that may decrease performance (not allowed in release builds)') ++option('installed_test_prefix', type: 'string', value: '', ++ description: 'Prefix for installed tests') diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix new file mode 100644 index 000000000000..b3a9f606d17f --- /dev/null +++ b/pkgs/by-name/gj/gjs/package.nix @@ -0,0 +1,153 @@ +{ fetchurl +, lib +, stdenv +, meson +, mesonEmulatorHook +, ninja +, pkg-config +, gnome +, gtk3 +, atk +, gobject-introspection +, spidermonkey_128 +, pango +, cairo +, readline +, libsysprof-capture +, glib +, libxml2 +, dbus +, gdk-pixbuf +, harfbuzz +, makeWrapper +, which +, xvfb-run +, nixosTests +, installTests ? true +}: + +let + testDeps = [ + gtk3 atk pango.out gdk-pixbuf harfbuzz glib.out + ]; +in stdenv.mkDerivation (finalAttrs: { + pname = "gjs"; + version = "1.82.0"; + + outputs = [ "out" "dev" "installedTests" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; + hash = "sha256-FEkCNoaNC/gi96p884/NMz52IHYP3PUOkyQjYR9iZiM="; + }; + + patches = [ + # Hard-code various paths + ./fix-paths.patch + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # Disable introspection test in installed tests + # (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1) + ./disable-introspection-test.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + makeWrapper + which # for locale detection + libxml2 # for xml-stripblanks + dbus # for dbus-run-session + gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + cairo + readline + libsysprof-capture + spidermonkey_128 + ]; + + nativeCheckInputs = [ + xvfb-run + ] ++ testDeps; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [ + "-Dprofiler=disabled" + ]; + + doCheck = !stdenv.hostPlatform.isDarwin; + + postPatch = '' + patchShebangs build/choose-tests-locale.sh + substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace installed-tests/js/meson.build \ + --replace "'Encoding'," "#'Encoding'," + ''; + + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs + ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 + ln -s $PWD/subprojects/gobject-introspection-tests/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so + ln -s $PWD/subprojects/gobject-introspection-tests/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so + ln -s $PWD/subprojects/gobject-introspection-tests/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so + ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so + ''; + + postInstall = '' + # TODO: make the glib setup hook handle moving the schemas in other outputs. + installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/gjs-${finalAttrs.version}" + mkdir -p "$installedTestsSchemaDatadir" + mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" + ''; + + postFixup = lib.optionalString installTests '' + wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ + --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}" + ''; + + checkPhase = '' + runHook preCheck + xvfb-run -s '-screen 0 800x600x24' \ + meson test --print-errorlogs + runHook postCheck + ''; + + separateDebugInfo = stdenv.hostPlatform.isLinux; + + passthru = { + tests = { + installed-tests = nixosTests.installed-tests.gjs; + }; + + updateScript = gnome.updateScript { + packageName = "gjs"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "JavaScript bindings for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/by-name/gk/gkraken/package.nix similarity index 100% rename from pkgs/tools/system/gkraken/default.nix rename to pkgs/by-name/gk/gkraken/package.nix diff --git a/pkgs/games/gl-117/default.nix b/pkgs/by-name/gl/gl117/package.nix similarity index 100% rename from pkgs/games/gl-117/default.nix rename to pkgs/by-name/gl/gl117/package.nix diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/by-name/gl/gl2ps/package.nix similarity index 100% rename from pkgs/development/libraries/gl2ps/default.nix rename to pkgs/by-name/gl/gl2ps/package.nix diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/by-name/gl/gl3w/package.nix similarity index 100% rename from pkgs/development/libraries/gl3w/default.nix rename to pkgs/by-name/gl/gl3w/package.nix diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 444f916bb7be..a24543e2cfc1 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -1,17 +1,23 @@ -{ lib, buildGo123Module, fetchFromGitLab, installShellFiles, stdenv }: +{ + lib, + buildGo123Module, + fetchFromGitLab, + installShellFiles, + stdenv, +}: buildGo123Module rec { pname = "glab"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-mAM11nQ6YJJWNFOR9xQbgma7Plvo4MdcW2Syniw7o60="; + hash = "sha256-cddXgjJR8SD/mggDzbyxp/hdffE5ZqmT9oEPaEd8ZCo="; }; - vendorHash = "sha256-uwSVdebZtIpSol553gJC0ItkEqa6qXXOAVFvzjsHSSI="; + vendorHash = "sha256-quQqQRXMByUgXlnPpR2mCPhxw5AbFdHN5sBsawuHc18="; ldflags = [ "-s" @@ -37,12 +43,15 @@ buildGo123Module rec { --zsh <($out/bin/glab completion -s zsh) ''; - meta = with lib; { + meta = { description = "GitLab CLI tool bringing GitLab to your command line"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://gitlab.com/gitlab-org/cli"; changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}"; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with lib.maintainers; [ + freezeboy + luftmensch-luftmensch + ]; mainProgram = "glab"; }; } diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/by-name/gl/glabels/package.nix similarity index 100% rename from pkgs/applications/graphics/glabels/default.nix rename to pkgs/by-name/gl/glabels/package.nix diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/by-name/gl/glade/package.nix similarity index 100% rename from pkgs/development/tools/glade/default.nix rename to pkgs/by-name/gl/glade/package.nix diff --git a/pkgs/tools/typesetting/tex/gladtex/default.nix b/pkgs/by-name/gl/gladtex/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/gladtex/default.nix rename to pkgs/by-name/gl/gladtex/package.nix diff --git a/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage b/pkgs/by-name/gl/glamoroustoolkit/GlamorousToolkit-GetImage similarity index 100% rename from pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage rename to pkgs/by-name/gl/glamoroustoolkit/GlamorousToolkit-GetImage diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix new file mode 100644 index 000000000000..cd55899e6c9f --- /dev/null +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -0,0 +1,126 @@ +{ lib +, stdenv +, fetchzip +, fetchurl +, patchelf +, wrapGAppsHook3 +, cairo +, dbus +, fontconfig +, freetype +, glib +, gtk3 +, libX11 +, libXcursor +, libXext +, libXi +, libXrandr +, libXrender +, libgit2 +, libglvnd +, libuuid +, libxcb +, harfbuzz +, libsoup_3 +, webkitgtk_4_1 +, zenity +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "glamoroustoolkit"; + version = "1.1.4"; + + src = fetchzip { + url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; + stripRoot = false; + hash = "sha256-/p/oCE1fmlPjy1Xg36rsczZ74L0M7qWsdcFm6cHPVVY="; + }; + + nativeBuildInputs = [ + wrapGAppsHook3 + ]; + + sourceRoot = "."; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/lib + cp -r $src/bin $src/lib $out/ + cp ${./GlamorousToolkit-GetImage} $out/bin/GlamorousToolkit-GetImage + + runHook postInstall + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + cairo + dbus + fontconfig + freetype + glib + gtk3 + libX11 + libXcursor + libXext + libXi + libXrandr + libXrender + libglvnd + libuuid + libxcb + harfbuzz # libWebView.so + libsoup_3 # libWebView.so + webkitgtk_4_1 # libWebView.so + (lib.getLib stdenv.cc.cc) + ]; + binPath = lib.makeBinPath [ + zenity # File selection dialog + ]; + in '' + chmod +x $out/lib/*.so + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/lib" \ + $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli + patchelf --shrink-rpath \ + $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli + patchelf \ + --set-rpath "${libPath}:$out/lib" \ + $out/lib/*.so + patchelf --shrink-rpath $out/lib/*.so + # + # shrink-rpath gets it wrong for the following libraries, + # restore the full rpath. + # + patchelf \ + --set-rpath "${libPath}:$out/lib" \ + $out/lib/libPharoVMCore.so \ + $out/lib/libWinit.so \ + $out/lib/libPixels.so + patchelf --set-rpath $out/lib $out/lib/libssl.so + + ln -s $out/lib/libcrypto.so $out/lib/libcrypto.so.1.1 + ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2 + rm $out/lib/libgit2.so + ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1 + + gappsWrapperArgs+=( + --prefix PATH : ${binPath} + ) + ''; + + meta = { + homepage = "https://gtoolkit.com"; + description = "GlamorousToolkit Development Environment"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.akgrant43 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix new file mode 100644 index 000000000000..a2e72db0f57a --- /dev/null +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -0,0 +1,97 @@ +{ lib +, python3 +, fetchFromGitHub +, sdcc +, yosys +, icestorm +, nextpnr +, unstableGitUpdater +}: + +python3.pkgs.buildPythonApplication rec { + pname = "glasgow"; + version = "0-unstable-2024-10-24"; + # from `pdm show` + realVersion = let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in "${tag}.1.dev2085+g${rev}"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "GlasgowEmbedded"; + repo = "glasgow"; + rev = "3d7a14165f9f5179bcd2a2a119ab4bbf9d81326c"; + sha256 = "sha256-fhT5xRq4VE8lOTJI470E2PPTSPSUHh90S17MdilFWAA="; + }; + + nativeBuildInputs = [ + python3.pkgs.pdm-backend + sdcc + ]; + + propagatedBuildInputs = with python3.pkgs; [ + typing-extensions + amaranth + packaging + platformdirs + fx2 + libusb1 + pyvcd + aiohttp + ]; + + nativeCheckInputs = [ + python3.pkgs.unittestCheckHook + yosys + icestorm + nextpnr + ]; + + enableParallelBuilding = true; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2 + cp firmware/glasgow.ihex software/glasgow + cd software + export PDM_BUILD_SCM_VERSION="${realVersion}" + ''; + + # installCheck tries to build_ext again + doInstallCheck = false; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp $src/config/*.rules $out/etc/udev/rules.d + ''; + + preCheck = '' + export PYTHONWARNINGS="ignore::DeprecationWarning" + # tests attempt to cache bitstreams + # for linux: + export XDG_CACHE_HOME=$TMPDIR + # for darwin: + export HOME=$TMPDIR + ''; + + makeWrapperArgs = [ + "--set" "YOSYS" "${yosys}/bin/yosys" + "--set" "ICEPACK" "${icestorm}/bin/icepack" + "--set" "NEXTPNR_ICE40" "${nextpnr}/bin/nextpnr-ice40" + ]; + + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + meta = with lib; { + description = "Software for Glasgow, a digital interface multitool"; + homepage = "https://github.com/GlasgowEmbedded/Glasgow"; + license = licenses.bsd0; + maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "glasgow"; + }; +} diff --git a/pkgs/data/fonts/glasstty-ttf/default.nix b/pkgs/by-name/gl/glasstty-ttf/package.nix similarity index 100% rename from pkgs/data/fonts/glasstty-ttf/default.nix rename to pkgs/by-name/gl/glasstty-ttf/package.nix diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/by-name/gl/glava/package.nix similarity index 100% rename from pkgs/applications/misc/glava/default.nix rename to pkgs/by-name/gl/glava/package.nix diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/by-name/gl/glbinding/package.nix similarity index 100% rename from pkgs/development/libraries/glbinding/default.nix rename to pkgs/by-name/gl/glbinding/package.nix diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/by-name/gl/gle/package.nix similarity index 100% rename from pkgs/development/libraries/gle/default.nix rename to pkgs/by-name/gl/gle/package.nix diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/by-name/gl/glee/package.nix similarity index 100% rename from pkgs/tools/graphics/glee/default.nix rename to pkgs/by-name/gl/glee/package.nix diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix index ba77795b05c8..08a7aef50665 100644 --- a/pkgs/by-name/gl/glfw3/package.nix +++ b/pkgs/by-name/gl/glfw3/package.nix @@ -1,8 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, darwin, fixDarwinDylibNames +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libGL +, vulkan-loader +, libXrandr +, libXinerama +, libXcursor +, libX11 +, libXi +, libXext +, darwin +, fixDarwinDylibNames , wayland -, wayland-scanner, wayland-protocols, libxkbcommon, libdecor +, wayland-scanner +, wayland-protocols +, libxkbcommon +, libdecor , withMinecraftPatch ? false }: let @@ -51,6 +66,7 @@ stdenv.mkDerivation { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" + "-DCMAKE_C_FLAGS=-D_GLFW_VULKAN_LIBRARY='\"${lib.getLib vulkan-loader}/lib/libvulkan.so.1\"'" ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch b/pkgs/by-name/gl/glib-networking/disable-pkcs11-tests.patch similarity index 100% rename from pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch rename to pkgs/by-name/gl/glib-networking/disable-pkcs11-tests.patch diff --git a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/pkgs/by-name/gl/glib-networking/hardcode-gsettings.patch similarity index 100% rename from pkgs/development/libraries/glib-networking/hardcode-gsettings.patch rename to pkgs/by-name/gl/glib-networking/hardcode-gsettings.patch diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/by-name/gl/glib-networking/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/glib-networking/installed-tests-path.patch rename to pkgs/by-name/gl/glib-networking/installed-tests-path.patch diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/by-name/gl/glib-networking/package.nix similarity index 100% rename from pkgs/development/libraries/glib-networking/default.nix rename to pkgs/by-name/gl/glib-networking/package.nix diff --git a/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/pkgs/by-name/gl/glib-testing/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/glib-testing/installed-tests-path.patch rename to pkgs/by-name/gl/glib-testing/installed-tests-path.patch diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/by-name/gl/glib-testing/package.nix similarity index 100% rename from pkgs/development/libraries/glib-testing/default.nix rename to pkgs/by-name/gl/glib-testing/package.nix diff --git a/pkgs/applications/audio/glicol-cli/default.nix b/pkgs/by-name/gl/glicol-cli/package.nix similarity index 100% rename from pkgs/applications/audio/glicol-cli/default.nix rename to pkgs/by-name/gl/glicol-cli/package.nix diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/by-name/gl/glitter/package.nix similarity index 100% rename from pkgs/applications/version-management/glitter/default.nix rename to pkgs/by-name/gl/glitter/package.nix diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/by-name/gl/gllvm/package.nix similarity index 100% rename from pkgs/development/tools/gllvm/default.nix rename to pkgs/by-name/gl/gllvm/package.nix diff --git a/pkgs/development/libraries/glm/glm.pc.in b/pkgs/by-name/gl/glm/glm.pc.in similarity index 100% rename from pkgs/development/libraries/glm/glm.pc.in rename to pkgs/by-name/gl/glm/glm.pc.in diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/by-name/gl/glm/package.nix similarity index 100% rename from pkgs/development/libraries/glm/default.nix rename to pkgs/by-name/gl/glm/package.nix diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/by-name/gl/glmark2/package.nix similarity index 100% rename from pkgs/tools/graphics/glmark2/default.nix rename to pkgs/by-name/gl/glmark2/package.nix diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/by-name/gl/global-platform-pro/package.nix similarity index 100% rename from pkgs/development/tools/global-platform-pro/default.nix rename to pkgs/by-name/gl/global-platform-pro/package.nix diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/by-name/gl/global/package.nix similarity index 100% rename from pkgs/development/tools/misc/global/default.nix rename to pkgs/by-name/gl/global/package.nix diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/by-name/gl/globalarrays/package.nix similarity index 100% rename from pkgs/development/libraries/globalarrays/default.nix rename to pkgs/by-name/gl/globalarrays/package.nix diff --git a/pkgs/tools/networking/globalping-cli/default.nix b/pkgs/by-name/gl/globalping-cli/package.nix similarity index 100% rename from pkgs/tools/networking/globalping-cli/default.nix rename to pkgs/by-name/gl/globalping-cli/package.nix diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/by-name/gl/globe-cli/package.nix similarity index 100% rename from pkgs/applications/misc/globe-cli/default.nix rename to pkgs/by-name/gl/globe-cli/package.nix diff --git a/pkgs/games/globulation/header-order.patch b/pkgs/by-name/gl/globulation2/header-order.patch similarity index 100% rename from pkgs/games/globulation/header-order.patch rename to pkgs/by-name/gl/globulation2/header-order.patch diff --git a/pkgs/games/globulation/default.nix b/pkgs/by-name/gl/globulation2/package.nix similarity index 100% rename from pkgs/games/globulation/default.nix rename to pkgs/by-name/gl/globulation2/package.nix diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/by-name/gl/globulation2/public-buildproject.patch similarity index 100% rename from pkgs/games/globulation/public-buildproject.patch rename to pkgs/by-name/gl/globulation2/public-buildproject.patch diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/by-name/gl/glog/package.nix similarity index 100% rename from pkgs/development/libraries/glog/default.nix rename to pkgs/by-name/gl/glog/package.nix diff --git a/pkgs/by-name/gl/glom/package.nix b/pkgs/by-name/gl/glom/package.nix new file mode 100644 index 000000000000..6e617032bedf --- /dev/null +++ b/pkgs/by-name/gl/glom/package.nix @@ -0,0 +1,165 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + autoconf, + automake, + libtool, + mm-common, + intltool, + itstool, + doxygen, + graphviz, + makeFontsConf, + freefont_ttf, + boost, + libxmlxx3, + libxslt, + libgdamm, + libarchive, + libepc, + python311, + python3, + ncurses, + glibmm, + gtk3, + openssl, + gtkmm3, + goocanvasmm2, + evince, + isocodes, + gtksourceview, + gtksourceviewmm, + postgresql_15, + gobject-introspection, + yelp-tools, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "glom"; + version = "1.32.0"; + + outputs = [ + "out" + "lib" + "dev" + "doc" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/glom/${lib.versions.majorMinor finalAttrs.version}/glom-${finalAttrs.version}.tar.xz"; + hash = "sha256-U78gfryoLFY7nme86XdFmhfn/ZTjXCfBlphnNtokjfE="; + }; + + gda = libgdamm.override { + mysqlSupport = true; + postgresSupport = true; + }; + + python = python311.withPackages ( + pkgs: with pkgs; [ + pygobject3 + distutils + ] + ); + + python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]); + + sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: { + postFixup = + super.postFixup or "" + + '' + # Do not propagate Python + rm $out/nix-support/propagated-build-inputs + ''; + }); + + boost_python = boost.override { + enablePython = true; + python = finalAttrs.python_boost; + }; + + nativeBuildInputs = [ + pkg-config + autoconf + automake + libtool + mm-common + intltool + (yelp-tools.override { + python3 = python311; + }) + itstool + doxygen + graphviz + finalAttrs.sphinx-build + wrapGAppsHook3 + gobject-introspection # for setup hook + ]; + + buildInputs = [ + finalAttrs.boost_python + glibmm + gtk3 + openssl + libxmlxx3 + libxslt + python311.pkgs.pygobject3 + finalAttrs.gda + libarchive + libepc + finalAttrs.python + ncurses # for python + gtkmm3 + goocanvasmm2 + evince + isocodes + gtksourceview + gtksourceviewmm + postgresql_15 # for postgresql utils + ]; + + enableParallelBuilding = true; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--with-boost-python=boost_python${lib.versions.major python311.version}${lib.versions.minor python311.version}" + "--with-postgres-utils=${lib.getBin postgresql_15}/bin" + ]; + + makeFlags = [ + "libdocdir=${placeholder "doc"}/share/doc/$(book_name)" + "devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)" + ]; + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "${placeholder "out"}/${python311.sitePackages}" + --set PYTHONHOME "${finalAttrs.python}" + ) + ''; + + meta = { + description = "Easy-to-use database designer and user interface"; + license = with lib.licenses; [ + lgpl2 + gpl2 + ]; + homepage = "https://gitlab.gnome.org/Archive/glom"; + maintainers = + lib.teams.gnome.members + ++ (with lib.maintainers; [ + bot-wxt1221 + ]); + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/by-name/gl/glooctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/glooctl/default.nix rename to pkgs/by-name/gl/glooctl/package.nix diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/by-name/gl/gloox/package.nix similarity index 100% rename from pkgs/development/libraries/gloox/default.nix rename to pkgs/by-name/gl/gloox/package.nix diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/by-name/gl/glow/package.nix similarity index 100% rename from pkgs/applications/editors/glow/default.nix rename to pkgs/by-name/gl/glow/package.nix diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/by-name/gl/glowing-bear/package.nix similarity index 100% rename from pkgs/applications/networking/irc/glowing-bear/default.nix rename to pkgs/by-name/gl/glowing-bear/package.nix diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/by-name/gl/glpaper/package.nix similarity index 100% rename from pkgs/development/tools/glpaper/default.nix rename to pkgs/by-name/gl/glpaper/package.nix diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/by-name/gl/glpk/package.nix similarity index 100% rename from pkgs/development/libraries/glpk/default.nix rename to pkgs/by-name/gl/glpk/package.nix diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix new file mode 100644 index 000000000000..e54d8711e65b --- /dev/null +++ b/pkgs/by-name/gl/glslang/package.nix @@ -0,0 +1,62 @@ +{ lib, stdenv +, fetchFromGitHub +, bison +, cmake +, jq +, python3 +, spirv-headers +, spirv-tools +}: +stdenv.mkDerivation rec { + pname = "glslang"; + version = "15.0.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = version; + hash = "sha256-QXNecJ6SDeWpRjzHRTdPJHob1H3q2HZmWuL2zBt2Tlw="; + }; + + outputs = [ "bin" "out" "dev" ]; + + # These get set at all-packages, keep onto them for child drvs + passthru = { + spirv-tools = spirv-tools; + spirv-headers = spirv-headers; + }; + + nativeBuildInputs = [ cmake python3 bison jq ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + postPatch = '' + cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools + ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers + ''; + + # This is a dirty fix for lib/cmake/SPIRVTargets.cmake:51 which includes this directory + postInstall = '' + mkdir -p $dev/include/External + moveToOutput lib/pkgconfig "''${!outputDev}" + moveToOutput lib/cmake "''${!outputDev}" + ''; + + # Fix the paths in .pc, even though it's unclear if these .pc are really useful. + postFixup = '' + substituteInPlace $dev/lib/pkgconfig/*.pc \ + --replace-fail '=''${prefix}//' '=/' \ + --replace-fail "includedir=$dev/$dev" "includedir=$dev" + + # add a symlink for backwards compatibility + ln -s $bin/bin/glslang $bin/bin/glslangValidator + ''; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Khronos reference front-end for GLSL and ESSL"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/development/tools/language-servers/glslls/default.nix b/pkgs/by-name/gl/glslls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/glslls/default.nix rename to pkgs/by-name/gl/glslls/package.nix diff --git a/pkgs/games/gltron/gentoo-prototypes.patch b/pkgs/by-name/gl/gltron/gentoo-prototypes.patch similarity index 100% rename from pkgs/games/gltron/gentoo-prototypes.patch rename to pkgs/by-name/gl/gltron/gentoo-prototypes.patch diff --git a/pkgs/games/gltron/default.nix b/pkgs/by-name/gl/gltron/package.nix similarity index 100% rename from pkgs/games/gltron/default.nix rename to pkgs/by-name/gl/gltron/package.nix diff --git a/pkgs/servers/sql/gluesql/default.nix b/pkgs/by-name/gl/gluesql/package.nix similarity index 100% rename from pkgs/servers/sql/gluesql/default.nix rename to pkgs/by-name/gl/gluesql/package.nix diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/by-name/gl/glui/package.nix similarity index 100% rename from pkgs/development/libraries/glui/default.nix rename to pkgs/by-name/gl/glui/package.nix diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/by-name/gl/glusterfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/glusterfs/default.nix rename to pkgs/by-name/gl/glusterfs/package.nix diff --git a/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch b/pkgs/by-name/gl/glusterfs/ssl_cert_path.patch similarity index 100% rename from pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch rename to pkgs/by-name/gl/glusterfs/ssl_cert_path.patch diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/by-name/gl/glyr/package.nix similarity index 100% rename from pkgs/tools/audio/glyr/default.nix rename to pkgs/by-name/gl/glyr/package.nix diff --git a/pkgs/games/gmad/default.nix b/pkgs/by-name/gm/gmad/package.nix similarity index 100% rename from pkgs/games/gmad/default.nix rename to pkgs/by-name/gm/gmad/package.nix diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/by-name/gm/gmailctl/package.nix similarity index 100% rename from pkgs/applications/networking/gmailctl/default.nix rename to pkgs/by-name/gm/gmailctl/package.nix diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 38f3f8ba2261..21ebebd8f677 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.4.2"; + version = "3.4.3"; outputs = [ "out" "lib" "dev" "man" ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-oyhwdX/eWbb5i7j/Aw7ocJk3KrGdxfKJx+P4Hzemlw8="; + hash = "sha256-dYHADdt9PboUgIRU6wu5uCs2KQ88z5/FZPXvvyYct00="; }; # TODO: build this from source @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { gmic_stdlib = fetchurl { name = "gmic_stdlib_community.h"; url = "https://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; - hash = "sha256-quzQ0g6kmbJFygUOlKdTn9Fe9J7jhlLOiNal1kX3iHY="; + hash = "sha256-M/AL1w9KGi+dIGVQ+vdWY8PSCHi+s/aZef08AxeQMJE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/by-name/gm/gmm/package.nix similarity index 100% rename from pkgs/development/libraries/gmm/default.nix rename to pkgs/by-name/gm/gmm/package.nix diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/by-name/gm/gmni/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/gmni/default.nix rename to pkgs/by-name/gm/gmni/package.nix diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/by-name/gm/gmnisrv/package.nix similarity index 100% rename from pkgs/servers/gemini/gmnisrv/default.nix rename to pkgs/by-name/gm/gmnisrv/package.nix diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/by-name/gm/gmnitohtml/package.nix similarity index 100% rename from pkgs/applications/misc/gmnitohtml/default.nix rename to pkgs/by-name/gm/gmnitohtml/package.nix diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/by-name/gm/gmqcc/package.nix similarity index 100% rename from pkgs/development/compilers/gmqcc/default.nix rename to pkgs/by-name/gm/gmqcc/package.nix diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/by-name/gm/gmsh/fix-python.patch similarity index 100% rename from pkgs/applications/science/math/gmsh/fix-python.patch rename to pkgs/by-name/gm/gmsh/fix-python.patch diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/by-name/gm/gmsh/package.nix similarity index 100% rename from pkgs/applications/science/math/gmsh/default.nix rename to pkgs/by-name/gm/gmsh/package.nix diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix new file mode 100644 index 000000000000..381fd67aa4f1 --- /dev/null +++ b/pkgs/by-name/gm/gmt/package.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + darwin, + fftwSinglePrec, + netcdf, + pcre, + gdal, + blas, + lapack, + ghostscript, + dcw-gmt, + gshhg-gmt, + libxml2, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gmt"; + version = "6.5.0"; + + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; + }; + + nativeBuildInputs = [ cmake ]; + + env = { + NIX_LDFLAGS = "-lxml2 -L${lib.getLib (libxml2.override { enableHttp = true; })}/lib"; + NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration " + + lib.optionalString ( + stdenv.isDarwin + && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3" + ) "-D__LAPACK_int=int"; + }; + + buildInputs = + [ + curl + gdal + netcdf + pcre + dcw-gmt + gshhg-gmt + ] + ++ ( + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreGraphics + CoreVideo + ] + else + [ + fftwSinglePrec + blas + lapack + ] + ); + + propagatedBuildInputs = [ ghostscript ]; + + cmakeFlags = + [ + (lib.cmakeFeature "GMT_DOCDIR" "share/doc/gmt") + (lib.cmakeFeature "GMT_MANDIR" "share/man") + (lib.cmakeFeature "GMT_LIBDIR" "lib") + (lib.cmakeBool "COPY_GSHHG" false) + (lib.cmakeFeature "GSHHG_ROOT" "${gshhg-gmt.out}/share/gshhg-gmt") + (lib.cmakeBool "COPY_DCW" false) + (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt") + (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}") + (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}") + (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}") + (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false) + (lib.cmakeBool "GMT_ENABLE_OPENMP" true) + (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false) + (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL") + ] + ++ (lib.optionals (!stdenv.isDarwin) [ + (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}") + (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so") + (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so") + ]); + + meta = { + homepage = "https://www.generic-mapping-tools.org"; + description = "Tools for manipulating geographic and cartesian data sets"; + longDescription = '' + GMT is an open-source collection of command-line tools for manipulating + geographic and Cartesian data sets (including filtering, trend fitting, + gridding, projecting, etc.) and producing high-quality illustrations + ranging from simple x–y plots via contour maps to artificially illuminated + surfaces and 3D perspective views. It supports many map projections and + transformations and includes supporting data such as coastlines, rivers, + and political boundaries and optionally country polygons. + ''; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; + }; +}) diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/by-name/gm/gmu/package.nix similarity index 100% rename from pkgs/applications/audio/gmu/default.nix rename to pkgs/by-name/gm/gmu/package.nix diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix new file mode 100644 index 000000000000..218a46d3fb98 --- /dev/null +++ b/pkgs/by-name/gn/gn/generic.nix @@ -0,0 +1,97 @@ +{ + stdenv, + lib, + fetchgit, + fetchpatch, + cctools, + darwin, + writeText, + ninja, + python3, + ... +}: + +{ + rev, + revNum, + version, + sha256, +}: + +let + revShort = builtins.substring 0 7 rev; + lastCommitPosition = writeText "last_commit_position.h" '' + #ifndef OUT_LAST_COMMIT_POSITION_H_ + #define OUT_LAST_COMMIT_POSITION_H_ + + #define LAST_COMMIT_POSITION_NUM ${revNum} + #define LAST_COMMIT_POSITION "${revNum} (${revShort})" + + #endif // OUT_LAST_COMMIT_POSITION_H_ + ''; + +in +stdenv.mkDerivation { + pname = "gn-unstable"; + inherit version; + + src = fetchgit { + # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic! + url = "https://gn.googlesource.com/gn"; + inherit rev sha256; + }; + + patches = [ + (fetchpatch { + name = "LFS64.patch"; + url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-/kh8t/Ip1EG2OIhydS//st/C80KJ4P31vGx7j8QpFh0="; + }) + ]; + + nativeBuildInputs = [ + ninja + python3 + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin; + with apple_sdk.frameworks; + [ + libobjc + cctools + + # frameworks + ApplicationServices + Foundation + AppKit + ] + ); + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + buildPhase = '' + python build/gen.py --no-last-commit-position + ln -s ${lastCommitPosition} out/last_commit_position.h + ninja -j $NIX_BUILD_CORES -C out gn + ''; + + installPhase = '' + install -vD out/gn "$out/bin/gn" + ''; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + description = "Meta-build system that generates build files for Ninja"; + mainProgram = "gn"; + homepage = "https://gn.googlesource.com/gn"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ + stesie + matthewbauer + primeos + ]; + }; +} diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix new file mode 100644 index 000000000000..33386b79dc0a --- /dev/null +++ b/pkgs/by-name/gn/gn/package.nix @@ -0,0 +1,10 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix args { + # Note: Please use the recommended version for Chromium stabe, i.e. from + # /pkgs/applications/networking/browsers/chromium/upstream-info.nix + rev = "df98b86690c83b81aedc909ded18857296406159"; + revNum = "2168"; # git describe $rev --match initial-commit | cut -d- -f3 + version = "2024-05-13"; + sha256 = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; +} diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/by-name/gn/gn/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/gn/setup-hook.sh rename to pkgs/by-name/gn/gn/setup-hook.sh diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/by-name/gn/gnaural/package.nix similarity index 100% rename from pkgs/applications/audio/gnaural/default.nix rename to pkgs/by-name/gn/gnaural/package.nix diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/by-name/gn/gnet/package.nix similarity index 100% rename from pkgs/development/libraries/gnet/default.nix rename to pkgs/by-name/gn/gnet/package.nix diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/by-name/gn/gnirehtet/package.nix similarity index 100% rename from pkgs/tools/networking/gnirehtet/default.nix rename to pkgs/by-name/gn/gnirehtet/package.nix diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix new file mode 100644 index 000000000000..145f094aaaf8 --- /dev/null +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, buildPackages +}: + +buildGoModule rec { + pname = "gnmic"; + version = "0.39.0"; + + src = fetchFromGitHub { + owner = "openconfig"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xS2TLYA/9Xb4UJ8yCpqDBQbHTE1p2OlBpp8R2BTXwyk="; + }; + + vendorHash = "sha256-9A/ZcamCMUpNxG3taHrqI4JChjpSjSuwx0ZUyGAuGXo="; + + ldflags = [ + "-s" "-w" + "-X" "github.com/openconfig/gnmic/app.version=${version}" + "-X" "github.com/openconfig/gnmic/app.commit=${src.rev}" + "-X" "github.com/openconfig/gnmic/app.date=1970-01-01T00:00:00Z" + ]; + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' + installShellCompletion --cmd gnmic \ + --bash <(${emulator} $out/bin/gnmic completion bash) \ + --fish <(${emulator} $out/bin/gnmic completion fish) \ + --zsh <(${emulator} $out/bin/gnmic completion zsh) + ''; + + meta = with lib; { + description = "gNMI CLI client and collector"; + homepage = "https://gnmic.openconfig.net/"; + changelog = "https://github.com/openconfig/gnmic/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ vincentbernat ]; + mainProgram = "gnmic"; + }; +} diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 739475b78082..8cb706941ea3 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -18,18 +18,18 @@ adwaita-icon-theme, libgweather, gucharmap, - tracker, + tinysparql, polkit, gnome, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-applets"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz"; - hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; + hash = "sha256-FASM8amK2U4U715E/f6IVvo/KDZAHHkr/83mi4db2vk="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { adwaita-icon-theme libgweather gucharmap - tracker + tinysparql polkit wirelesstools linuxPackages.cpupower diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index 3fd81f68de46..94c69fcf03d6 100644 --- a/pkgs/by-name/gn/gnome-autoar/package.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.4.4"; + version = "0.4.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz"; - hash = "sha256-wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I="; + hash = "sha256-g4xTBvw4v6ovI6viQmL0vxV3HjMD+13LdPW5x6YV2r4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 3feadbad989c..442d48659037 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; - hash = "sha256-Td06xDmkoGeHaAWSG7dfTTyLhaIY1Hwnbd3eiShEPC4="; + hash = "sha256-h0pKOcQmFzb2qFRyKDNAC2EkQcRoGqWYLZCxWryckf0="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-bluetooth/package.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix index 715a2d6c453a..ca5d61a3c3f4 100644 --- a/pkgs/by-name/gn/gnome-bluetooth/package.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-bluetooth"; - version = "46.1"; + version = "47.1"; # TODO: split out "lib" outputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; - hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; + hash = "sha256-A+PnQDoVEI/8FJYhCh2lwpYbKDSlwH7Mx6P0kxldq6M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix similarity index 100% rename from pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix rename to pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index 2333fc247eb1..70c1f03eb141 100644 --- a/pkgs/by-name/gn/gnome-boxes/package.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "46.1"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; - hash = "sha256-kAwXf2diZANwpmNM+efTzYIH5Jg2eopmemtzGwQRYDY="; + hash = "sha256-Zb9sLeG/TVFpXJGSxbHmKFyzLJihiqlIo3bqMgOLx48="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/by-name/gn/gnome-browser-connector/package.nix similarity index 100% rename from pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix rename to pkgs/by-name/gn/gnome-browser-connector/package.nix diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/by-name/gn/gnome-builder/fix-finding-test-typelibs.patch similarity index 100% rename from pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch rename to pkgs/by-name/gn/gnome-builder/fix-finding-test-typelibs.patch diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix new file mode 100644 index 000000000000..8a3c7ac09d7a --- /dev/null +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -0,0 +1,176 @@ +{ stdenv +, lib +, ctags +, cmark +, desktop-file-utils +, editorconfig-core-c +, fetchurl +, flatpak +, gnome +, libgit2-glib +, gi-docgen +, gobject-introspection +, gom +, gtk4 +, gtksourceview5 +, json-glib +, jsonrpc-glib +, libadwaita +, libdex +, libpanel +, libpeas2 +, libportal-gtk4 +, libspelling +, libsysprof-capture +, libxml2 +, meson +, ninja +, ostree +, pcre2 +, pkg-config +, python3 +, sysprof +, template-glib +, vala +, vte-gtk4 +, webkitgtk_6_0 +, wrapGAppsHook4 +, dbus +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-builder"; + version = "47.2"; + + outputs = [ "out" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; + hash = "sha256-Roe5PEfNHjNmWi3FA3kLYhPugnhy/ABNl40UvL+ptJU="; + }; + + patches = [ + # The test environment hardcodes `GI_TYPELIB_PATH` environment variable to direct dependencies of libide & co. + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2ce510b0ec0518c29427a29b386bb2ac1a121edf + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2964f7c2a0729f2f456cdca29a0f5b7525baf7c1 + # + # But Nix does not have a fallback path for typelibs like /usr/lib on FHS distros and relies solely + # on `GI_TYPELIB_PATH` environment variable. So, when Ide started to depend on Vte, which + # depends on Pango, among others, GIrepository was unable to find these indirect dependencies + # and crashed with: + # + # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) + ./fix-finding-test-typelibs.patch + ]; + + nativeBuildInputs = [ + desktop-file-utils + gi-docgen + gobject-introspection + meson + ninja + pkg-config + python3 + wrapGAppsHook4 + ]; + + buildInputs = [ + ctags + cmark + editorconfig-core-c + flatpak + libgit2-glib + libpeas2 + libportal-gtk4 + vte-gtk4 + gom + gtk4 + gtksourceview5 + json-glib + jsonrpc-glib + libadwaita + libdex + libpanel + libspelling + libsysprof-capture + libxml2 + ostree + pcre2 + python3 + template-glib + vala + webkitgtk_6_0 + ]; + + nativeCheckInputs = [ + dbus + xvfb-run + ]; + + mesonFlags = [ + "-Ddocs=true" + + # Making the build system correctly detect clang header and library paths + # is difficult. Somebody should look into fixing this. + "-Dplugin_clang=false" + + # Do not try to check if appstream images exist + "-Dnetwork_tests=false" + ]; + + doCheck = true; + + postPatch = '' + patchShebangs build-aux/meson/post_install.py + substituteInPlace build-aux/meson/post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + checkPhase = '' + GTK_A11Y=none \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + + preFixup = '' + gappsWrapperArgs+=( + # For sysprof-agent + --prefix PATH : "${sysprof}/bin" + ) + + # Ensure that all plugins get their interpreter paths fixed up. + find $out/lib -name \*.py -type f -print0 | while read -d "" f; do + chmod a+x "$f" + done + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libide "$devdoc" + ''; + + passthru.updateScript = gnome.updateScript { + packageName = "gnome-builder"; + }; + + meta = with lib; { + description = "IDE for writing GNOME-based software"; + longDescription = '' + Global search, auto-completion, source code map, documentation + reference, and other features expected in an IDE, but with a focus + on streamlining GNOME-based development projects. + + This package does not pull in the dependencies needed for every + plugin. If you find that a plugin you wish to use doesn't work, we + currently recommend running gnome-builder inside a nix-shell with + appropriate dependencies loaded. + ''; + homepage = "https://apps.gnome.org/Builder/"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + mainProgram = "gnome-builder"; + }; +}) diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index d1008f4867b7..2f2d5ff94e7a 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "46.1"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; - hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc="; + hash = "sha256-3s2yMoO12+70CVG2nq99S4DAw4gN2wGGP58PFVT4mYs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index 15108e40856e..d3cbf403df28 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "46.1"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; - hash = "sha256-mGH/e4q9W3sgaQulXrdULH7FNLVmJp4ptbHoWMFhCJc="; + hash = "sha256-OwMxPxxNEtyCHgfiCdFZbVPq+iVdSS0s5av5LtG1HnY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index 04a5dac98cd4..f827feae8bd6 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; - hash = "sha256-pOjixRC/SCBLmZSk581TeEQkbnTIqYb52+BOIj9dgnw="; + hash = "sha256-a88Foi8w8THYqANbD2PYapVnAHpfbfXOhVa6Bnd7dXQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index 99acc2afb326..25f54ad45c96 100644 --- a/pkgs/by-name/gn/gnome-chess/package.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; - hash = "sha256-oryQ4KdUMSxXibkZi0knMDd1tiWDqOlnbSxqlztG/ec="; + hash = "sha256-OkQ6LHiA5q0TG3Wt2AdO2+WYK3aruEKQT+PfnCxQ6H4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix index 5828a26a149a..e99e6bcdb580 100644 --- a/pkgs/by-name/gn/gnome-clocks/package.nix +++ b/pkgs/by-name/gn/gnome-clocks/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-clocks"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz"; - hash = "sha256-6qPFeM3O+XVOZotWJnCbc/NSZxAjX0tyB20v9JpPmcc="; + hash = "sha256-QovfS9F+Jt5s7wFM16fuvYkUPD8nMrJLfaaYErqlITE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 5f684618b910..f5107d43db55 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-connections/${lib.versions.major version}/gnome-connections-${version}.tar.xz"; - hash = "sha256-+xzqaOeTC73B2yi3zQqaN80xDUtOeHL+gU9QoWqNJdM="; + hash = "sha256-lT4jQ8C9SRawLtE6Ce8Rhv6WmSSSct/tuKI9ibQ3Lm0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix new file mode 100644 index 000000000000..5cf70be5355b --- /dev/null +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, gettext +, gnome +, libgtop +, gtk4 +, libadwaita +, pango +, pcre2 +, vte-gtk4 +, desktop-file-utils +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "gnome-console"; + version = "47.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-0/YAtFtRcWaRrukocDMunJqMqJ1VNWXzEx2eKAdHJdA="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libgtop + gtk4 + libadwaita + pango + pcre2 + vte-gtk4 + ]; + + preFixup = '' + # FIXME: properly address https://github.com/NixOS/nixpkgs/pull/333911#issuecomment-2362710334 + # and https://gitlab.gnome.org/GNOME/console/-/commit/c81801c82f186f20 + gappsWrapperArgs+=(--set "TERM" "xterm-256color") + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-console"; + }; + }; + + passthru.tests.test = nixosTests.terminal-emulators.kgx; + + meta = with lib; { + description = "Simple user-friendly terminal emulator for the GNOME desktop"; + homepage = "https://gitlab.gnome.org/GNOME/console"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); + platforms = platforms.unix; + mainProgram = "kgx"; + }; +} diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index 8adb73248323..c3d05a378f42 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -23,15 +23,17 @@ ninja, libadwaita, gsettings-desktop-schemas, + gst_all_1, + pipewire, }: stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; - hash = "sha256-cK606DWhx3+bzH5XotzCN22TvbYXVxYYJXRF9WxjcN8="; + hash = "sha256-JePG95coGIr6XwzV0L6F3EZ9EttqLZi1SvPfDctCkNA="; }; nativeBuildInputs = [ @@ -48,6 +50,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-rs # GTK4 sink & paintable + pipewire # pipewiresrc gtk4 glib libportal-gtk4 diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index d5b1dd84c925..6d10ce16a8db 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -60,8 +60,8 @@ shadow, shared-mime-info, sound-theme-freedesktop, - tracker, - tracker-miners, + tinysparql, + localsearch, tzdata, udisks2, upower, @@ -74,11 +74,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "46.4"; + version = "47.1.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-Wb0wWDl3v6KOVCJ+7iEeqG9If81tORXtIfWTJCZxAeA="; + hash = "sha256-BR/UBXFX9LIzcBP778luPRKWVOP8lg1ISdNUJSQAvnc="; }; patches = [ @@ -144,13 +144,16 @@ stdenv.mkDerivation (finalAttrs: { networkmanager polkit samba - tracker - tracker-miners # for search locations dialog + tinysparql + localsearch # for search locations dialog udisks2 upower # For animations in Mouse panel. gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + # vp9alphadecodebin, observed from GST_DEBUG="*:3" warnings. + # https://github.com/NixOS/nixpkgs/pull/333911#issuecomment-2409233470 + gst_all_1.gst-plugins-bad ]; nativeCheckInputs = [ diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/by-name/gn/gnome-desktop-testing/package.nix similarity index 100% rename from pkgs/development/tools/gnome-desktop-testing/default.nix rename to pkgs/by-name/gn/gnome-desktop-testing/package.nix diff --git a/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch b/pkgs/by-name/gn/gnome-desktop/bubblewrap-paths.patch similarity index 100% rename from pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch rename to pkgs/by-name/gn/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix new file mode 100644 index 000000000000..eb6dbbf13843 --- /dev/null +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -0,0 +1,105 @@ +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, libxslt +, ninja +, gnome +, gtk3 +, gtk4 +, glib +, gettext +, libxml2 +, xkeyboard_config +, libxkbcommon +, isocodes +, meson +, wayland +, libseccomp +, systemd +, udev +, bubblewrap +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, gsettings-desktop-schemas +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +}: + +stdenv.mkDerivation rec { + pname = "gnome-desktop"; + version = "44.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-rnylXcngiRSZl0FSOhfSnOIjkVYmvSRioSC/lvR6eas="; + }; + + patches = lib.optionals stdenv.hostPlatform.isLinux [ + (substituteAll { + src = ./bubblewrap-paths.patch; + bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + libxslt + libxml2 + gobject-introspection + gtk-doc + docbook-xsl-nons + glib + ]; + + buildInputs = [ + xkeyboard_config + libxkbcommon # for xkbregistry + isocodes + gtk3 + gtk4 + glib + ] ++ lib.optionals withSystemd [ + systemd + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + bubblewrap + wayland + libseccomp + udev + ]; + + propagatedBuildInputs = [ + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Ddesktop_docs=false" + (lib.mesonEnable "systemd" withSystemd) + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + "-Dudev=disabled" + ]; + + separateDebugInfo = stdenv.hostPlatform.isLinux; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-desktop"; + }; + }; + + meta = with lib; { + description = "Library with common API for various GNOME modules"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index f93a877bc018..5a61d18f1e20 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "46.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/gnome-disk-utility-${version}.tar.xz"; - hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0="; + hash = "sha256-wk6UOaBNcLz640nKE0xwBUNf4rb0UhFN+Hi/8Libv/4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/by-name/gn/gnome-doc-utils/package.nix similarity index 100% rename from pkgs/development/tools/documentation/gnome-doc-utils/default.nix rename to pkgs/by-name/gn/gnome-doc-utils/package.nix diff --git a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-epub-thumbnailer/default.nix rename to pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-extension-manager/default.nix rename to pkgs/by-name/gn/gnome-extension-manager/package.nix diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix new file mode 100644 index 000000000000..dc736a30ef2e --- /dev/null +++ b/pkgs/by-name/gn/gnome-firmware/package.nix @@ -0,0 +1,70 @@ +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + appstream-glib, + desktop-file-utils, + fwupd, + gettext, + glib, + gtk4, + libadwaita, + libxmlb, + meson, + ninja, + pkg-config, + systemd, + help2man, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-firmware"; + version = "47.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "gnome-firmware"; + rev = finalAttrs.version; + sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ="; + }; + + nativeBuildInputs = [ + appstream-glib # for ITS rules + desktop-file-utils + gettext + help2man + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + fwupd + glib + gtk4 + libadwaita + libxmlb + systemd + ]; + + mesonFlags = [ + "-Dconsolekit=false" + ]; + + passthru.updateScript = gitUpdater { + ignoredVersions = "(alpha|beta|rc).*"; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/World/gnome-firmware"; + description = "Tool for installing firmware on devices"; + mainProgram = "gnome-firmware"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index cd7f73765189..afc747c3a3e8 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -34,7 +34,8 @@ let # From data/sessions/Makefile.am - requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel"; + requiredComponentsCommon = + enableGnomePanel: [ "gnome-flashback" ] ++ lib.optional enableGnomePanel "gnome-panel"; requiredComponentsGsd = [ "org.gnome.SettingsDaemon.A11ySettings" "org.gnome.SettingsDaemon.Color" @@ -63,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-flashback"; - version = "3.52.1"; + version = "3.54.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz"; - hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo="; + hash = "sha256-gkNa4wLNZK6xG25M0YTaj/+qzSSFFf+gIidZXDzPne4="; }; # make .desktop Execs absolute diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 070f9f903845..a55cc20e32b6 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch2 , meson , ninja , gettext @@ -9,7 +8,6 @@ , gtk4 , glib , libxml2 -, gnome-desktop , libadwaita , fribidi , wrapGAppsHook4 @@ -19,21 +17,13 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; - hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w="; + hash = "sha256-uOWgQuCyQbDHyuQ/dNoNX4jmQjAXqR/rhudhfttAgO0="; }; - patches = lib.optionals stdenv.cc.isClang [ - # Fixes an incompatible function pointer error when building with clang 16 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/565d795731471c27542bb9ee60820a2d0d15534e.diff"; - hash = "sha256-8dgOVTx6ZbvXROlIWTZU2xNWJ11LlJykRs699cgZqow="; - }) - ]; - doCheck = true; nativeBuildInputs = [ @@ -49,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 glib - gnome-desktop harfbuzz libadwaita fribidi diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/by-name/gn/gnome-frog/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-frog/default.nix rename to pkgs/by-name/gn/gnome-frog/package.nix diff --git a/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/pkgs/by-name/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch similarity index 100% rename from pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch rename to pkgs/by-name/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/by-name/gn/gnome-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/gnome-icon-theme/default.nix rename to pkgs/by-name/gn/gnome-icon-theme/package.nix diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/by-name/gn/gnome-inform7/package.nix similarity index 100% rename from pkgs/applications/editors/gnome-inform7/default.nix rename to pkgs/by-name/gn/gnome-inform7/package.nix diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index fb1a34e57c6c..5f3b90677679 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-initial-setup"; - version = "46.3"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-o/AQgp9NTI1J+Dqxz6uCG2GyeA6eC15Wicfv8/hE7T4="; + hash = "sha256-KTeKVkQG7Lzn8IzzklqA3TCCWoQ/kfzwWF45mecDUw0="; }; patches = [ diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/by-name/gn/gnome-keysign/package.nix similarity index 100% rename from pkgs/tools/security/gnome-keysign/default.nix rename to pkgs/by-name/gn/gnome-keysign/package.nix diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix index 168e9a796290..9e6a47b2342e 100644 --- a/pkgs/by-name/gn/gnome-mahjongg/package.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.40.1"; + version = "47.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/gnome-mahjongg-${version}.tar.xz"; - hash = "sha256-jtVO7K3jawgzaQb9jmyQKg1ve7u7Z2U8I5Vqa2MSI/Y="; + url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major version}/gnome-mahjongg-${version}.tar.xz"; + hash = "sha256-WPFX8Lxexxq42jXc5+c8ougZLFsvIZFnqSaTC5cdpJs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 789e0c4d9bc0..233c0f2296ee 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -5,7 +5,6 @@ meson, ninja, gettext, - python3, pkg-config, gnome, glib, @@ -30,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "46.11"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-lAtBuXQLCBMyXjkWdYcWz4+g7k4MkZHyYM7AbZITWDU="; + hash = "sha256-TwLtLo44GeWdptm0rIgA6GY1349GpHzyqv2ThsgwEwM="; }; doCheck = !stdenv.hostPlatform.isDarwin; @@ -75,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { # entry point to the wrapped binary we get back to a wrapped # binary. substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/@app-id@" \ - "Exec=$out/bin/gnome-maps" + --replace-fail "Exec=@pkgdatadir@/@app-id@" \ + "Exec=$out/bin/gnome-maps" ''; preCheck = '' @@ -97,6 +96,12 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/gnome-maps/libgnome-maps.so.0 ''; + preFixup = '' + substituteInPlace "$out/share/applications/org.gnome.Maps.desktop" \ + --replace-fail "Exec=gapplication launch org.gnome.Maps" \ + "Exec=gnome-maps" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-maps"; }; }; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/by-name/gn/gnome-menus/package.nix similarity index 100% rename from pkgs/development/libraries/gnome-menus/default.nix rename to pkgs/by-name/gn/gnome-menus/package.nix diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/by-name/gn/gnome-multi-writer/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-multi-writer/default.nix rename to pkgs/by-name/gn/gnome-multi-writer/package.nix diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 4452a9cc8ada..9c57ec1dbfd0 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -5,7 +5,7 @@ gettext, fetchurl, gdk-pixbuf, - tracker, + tinysparql, libxml2, python3, libnotify, @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "46.1"; + version = "47.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; - hash = "sha256-Eb4tbCib5NxDOwxPtZo9rDvtAcf1oorualRBl6NTv/0="; + hash = "sha256-o1Qjz1IgX9cDfLCpprVw9uwvHjQubiDtfn2A2NyGpyY="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { libsoup_3 libadwaita gsettings-desktop-schemas - tracker + tinysparql ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix similarity index 100% rename from pkgs/applications/networking/gnome-network-displays/default.nix rename to pkgs/by-name/gn/gnome-network-displays/package.nix diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index e6d018028da1..975ed4693427 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -12,6 +12,7 @@ itstool, vala, libxml2, + libadwaita, libgee, libgnome-games-support_2_0, meson, @@ -21,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-1xKkxpQ78ylWrfuSIvHxQ2mRHlTs67DNYffCWr16Wdo="; + hash = "sha256-YyQb2KFfWRgKYYEgQeLo85hiJn3J5lLz0XNULFUNkpI="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 librsvg gsound + libadwaita libgee libgnome-games-support_2_0 ]; diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 888f5285938e..6dba58e31292 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -24,7 +24,7 @@ adwaita-icon-theme, libxml2, gsettings-desktop-schemas, - tracker, + tinysparql, }: stdenv.mkDerivation rec { @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { curl libhandy webkitgtk_4_0 - tracker + tinysparql gnome-online-accounts gsettings-desktop-schemas evolution-data-server diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix new file mode 100644 index 000000000000..bf622966ed99 --- /dev/null +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -0,0 +1,103 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, vala +, glib +, meson +, ninja +, libxslt +, gtk4 +, enableBackend ? stdenv.hostPlatform.isLinux +, json-glib +, keyutils +, libadwaita +, librest_1_0 +, libxml2 +, libsecret +, gobject-introspection +, gettext +, gi-docgen +, glib-networking +, libsoup_3 +, docbook-xsl-nons +, gnome +, gcr_4 +, libkrb5 +, gvfs +, dbus +, wrapGAppsHook4 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-online-accounts"; + version = "3.52.1"; + + outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; + hash = "sha256-N8dSL/lFT4NxtahyW7p27XQwyVsfnvx/66YmjwUtHrc="; + }; + + mesonFlags = [ + "-Dfedora=false" # not useful in NixOS or for NixOS users. + "-Dgoabackend=${lib.boolToString enableBackend}" + "-Ddocumentation=${lib.boolToString enableBackend}" + "-Dman=${lib.boolToString enableBackend}" + "-Dwebdav=true" + ]; + + nativeBuildInputs = [ + dbus # used for checks and pkg-config to install dbus service/s + docbook-xsl-nons # for goa-daemon.xml + gettext + gi-docgen + gobject-introspection + libxslt + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + gcr_4 + glib + glib-networking + gtk4 + libadwaita + gvfs # OwnCloud, Google Drive + json-glib + libkrb5 + librest_1_0 + libxml2 + libsecret + libsoup_3 + ] ++ lib.optionals enableBackend [ + keyutils + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + separateDebugInfo = true; + + passthru = { + updateScript = gnome.updateScript { + versionPolicy = "odd-unstable"; + packageName = "gnome-online-accounts"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-online-accounts"; + description = "Single sign-on framework for GNOME"; + platforms = platforms.unix; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members; + }; +}) diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix index 46a9fe58898d..5ec2383c826b 100644 --- a/pkgs/by-name/gn/gnome-panel/package.nix +++ b/pkgs/by-name/gn/gnome-panel/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-panel"; - version = "3.52.0"; + version = "3.54.0"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz"; - hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ="; + hash = "sha256-lLnNUcpQ/zKiic1QWRNuexYMHxJrXWZp4QbcqIUEXCg="; }; patches = [ diff --git a/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch b/pkgs/by-name/gn/gnome-photos/installed-tests-path.patch similarity index 100% rename from pkgs/applications/graphics/gnome-photos/installed-tests-path.patch rename to pkgs/by-name/gn/gnome-photos/installed-tests-path.patch diff --git a/pkgs/by-name/gn/gnome-photos/package.nix b/pkgs/by-name/gn/gnome-photos/package.nix new file mode 100644 index 000000000000..6aad3a4b51ff --- /dev/null +++ b/pkgs/by-name/gn/gnome-photos/package.nix @@ -0,0 +1,122 @@ +{ stdenv +, lib +, fetchurl +, at-spi2-core +, babl +, dbus +, desktop-file-utils +, dleyna-renderer +, gdk-pixbuf +, gegl +, geocode-glib_2 +, gettext +, gexiv2 +, glib +, gnome-online-accounts +, gnome +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, itstool +, libdazzle +, libportal-gtk3 +, libhandy +, libxml2 +, meson +, ninja +, nixosTests +, pkg-config +, python3 +, tinysparql +, localsearch +, wrapGAppsHook3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-photos"; + version = "44.0"; + + outputs = [ "out" "installedTests" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "544hA5fTxigJxs1VIdpuzLShHd6lvyr4YypH9Npcgp4="; + }; + + patches = [ + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + gobject-introspection # for setup hook + glib # for setup hook + itstool + libxml2 + meson + ninja + pkg-config + (python3.withPackages (pkgs: with pkgs; [ + dogtail + pygobject3 + pyatspi + ])) + wrapGAppsHook3 + ]; + + buildInputs = [ + babl + dbus + dleyna-renderer + gdk-pixbuf + gegl + geocode-glib_2 + gexiv2 + glib + gnome-online-accounts + gsettings-desktop-schemas + gtk3 + libdazzle + libportal-gtk3 + libhandy + tinysparql + localsearch # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema + + at-spi2-core # for tests + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + patchShebangs tests/basic.py + ''; + + postFixup = '' + wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + + tests = { + installed-tests = nixosTests.installed-tests.gnome-photos; + }; + }; + + meta = with lib; { + description = "Access, organize and share your photos"; + mainProgram = "gnome-photos"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-photos"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix similarity index 100% rename from pkgs/applications/audio/gnome-podcasts/default.nix rename to pkgs/by-name/gn/gnome-podcasts/package.nix diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/by-name/gn/gnome-randr/package.nix similarity index 100% rename from pkgs/tools/wayland/gnome-randr/default.nix rename to pkgs/by-name/gn/gnome-randr/package.nix diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/by-name/gn/gnome-recipes/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-recipes/default.nix rename to pkgs/by-name/gn/gnome-recipes/package.nix diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 3c3e319767a3..106f67a0ae9f 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "46.4"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-KLwH6W2qFJy45NCldN8KLObsbOZHutyGFUzmEoIsxR4="; + hash = "sha256-BG0Py4m4jQskaczTUGPbW0KkUfkHEbU/H6OrFJGsGN4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/by-name/gn/gnome-secrets/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-secrets/default.nix rename to pkgs/by-name/gn/gnome-secrets/package.nix diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index fbdad96f9236..10eae3e97d68 100644 --- a/pkgs/by-name/gn/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "42.0"; + version = "47.0.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = version; - hash = "sha256-XGJVmlxqbJ/1frbzn2TI7BJm449xeLk43xMMqFsLYko="; + hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 9b3dcd14718d..4b4967c263ee 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "46.0"; + version = "47.0.1"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ="; + hash = "sha256-Vq6caOSZlXk+sglrzcRTOxEWaeHlTItuCx2VL2peinA="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 7466859ec72e..3d242a245b67 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -3,7 +3,6 @@ lib, substituteAll, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -43,11 +42,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "46.0"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; + hash = "sha256-8qrL5V+jjocIWD7sCmZRBJ5TfrUFo+0s4Lqk6bZCRtE="; }; patches = [ @@ -58,18 +57,6 @@ stdenv.mkDerivation (finalAttrs: { src = ./fix-paths.patch; inherit tzdata; }) - - (fetchpatch { - name = "backport-no-systemd-fix-1.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/46f998d7308cb18832666bc34ee54b1d9c27739f.patch"; - includes = [ "plugins/sharing/gsd-sharing-manager.c" ]; - hash = "sha256-P5FJUY50Pg3MuwHwGUz28/TMZkT7j+fmGPozWb9rVYo="; - }) - (fetchpatch { - name = "backport-no-systemd-fix-2.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/1a4d50f4ee611bdede6072c0bfd2a1b2e327c5fc.patch"; - hash = "sha256-pROhnE9GziS9h0nMWZBsd8YtW6RxMrwmaSOe0UtkUJU="; - }) ]; nativeBuildInputs = [ @@ -126,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do + for f in plugins/power/gsd-power-constants-update.pl; do chmod +x $f patchShebangs $f done diff --git a/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon43/fix-paths.patch similarity index 100% rename from pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch rename to pkgs/by-name/gn/gnome-settings-daemon43/fix-paths.patch diff --git a/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix b/pkgs/by-name/gn/gnome-settings-daemon43/package.nix similarity index 100% rename from pkgs/by-name/gn/gnome-settings-daemon/43/default.nix rename to pkgs/by-name/gn/gnome-settings-daemon43/package.nix diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index f0a7bf588822..3997815c28a8 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "46.2"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-1ELp0mklEl/yFaXBNCkElWVTgHQdqvuzejqZ1vDH2G8="; + hash = "sha256-6UOMxdOfmHXf0E6gq7UeWWLqrVwgJ0EjJDsWEgmLOoU="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index c2f2a1bb42f3..fca04ba81d4c 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -4,6 +4,7 @@ substituteAll, lib, stdenv, + docutils, meson, ninja, pkg-config, @@ -56,7 +57,6 @@ gnome-settings-daemon, gnome-autoar, gnome-tecla, - asciidoc, bash-completion, mesa, libGL, @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "46.4"; + version = "47.1"; outputs = [ "out" @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-GIRo/nLpCsSyNOnU0HB9YH/q85oT0lvTqj63XlWj4FI="; + hash = "sha256-tGdXX4wVnSBVclhRfw3Wjf0BR9EbSNl6uOH3CbxSKmM="; }; patches = [ @@ -112,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + docutils # for rst2man meson ninja pkg-config @@ -122,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { sassc desktop-file-utils libxslt.bin - asciidoc gobject-introspection ]; diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index 8636bb0d3b36..0d0569ed6b38 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -20,6 +20,7 @@ gspell, libxslt, gobject-introspection, + itstool, flatpak, fwupd, gtk4, @@ -47,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "46.4"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZVTR3gfnxjUtqLBjhP6hPaZJnXHAW1rQANjiHLFT9a8="; + hash = "sha256-k8pQA2YxZ0VZTvBfytHAXPQ/Au+PZggMF/fruMo/NL8="; }; patches = [ @@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc desktop-file-utils gobject-introspection + itstool ]; buildInputs = [ diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/by-name/gn/gnome-solanum/package.nix similarity index 100% rename from pkgs/applications/misc/gnome-solanum/default.nix rename to pkgs/by-name/gn/gnome-solanum/package.nix diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index be14eb6d74a0..62aba7d70d4c 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.4"; + version = "47.1.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-SmsMRQbolRIlOxyZO3P2QOjv2awfHrUqAkgZCHYjpKI="; + hash = "sha256-RyW0KDZGaysqzF5RZrU9jrEczd4lh9tofK+MjUc+uIk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index 4ce32f874b19..8d04c0e1c8b8 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/gnome-system-monitor-${version}.tar.xz"; - hash = "sha256-U3YkgVjGhsMIJVRy6MKp5MFyVWQsFJ/HGYxtA05UdZk="; + hash = "sha256-7ee5JetxTYs8K/v3QFobcUSU/kfgLwrwj1g3s+JWVH8="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix new file mode 100644 index 000000000000..467956204a54 --- /dev/null +++ b/pkgs/by-name/gn/gnome-tecla/package.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, glib +, gtk4 +, libadwaita +, libxkbcommon +, wayland +, gnome +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tecla"; + version = "47.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; + hash = "sha256-B5C5nsKRN6VLVGxRBmGpmqbwOcjXXxDAjpKGgsCAT+U="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + libxkbcommon + wayland + ]; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gnome-tecla"; + packageName = "tecla"; + }; + }; + + meta = with lib; { + description = "Keyboard layout viewer"; + homepage = "https://gitlab.gnome.org/GNOME/tecla"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + mainProgram = "tecla"; + }; +}) diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index 7cfde6e911ae..755df84ffd30 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.52.2"; + version = "3.54.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = finalAttrs.version; - hash = "sha256-c6xMUyhQnJiIrFnnUEx6vGVvFghGvLjTxiAFq+nSj2A="; + hash = "sha256-1Lu/qaeMUL8QvZGIxq2iuI7lfZSB+jMjkI2Jg6qULI0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 2edd058907b0..2baf665c08b1 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -13,10 +13,10 @@ ninja, gnome, cairo, - enchant, icu, itstool, libadwaita, + libspelling, editorconfig-core-c, libxml2, desktop-file-utils, @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "46.3"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0="; + hash = "sha256-3pVkLitA/yZf7s2GuTng/QGOTrK6SZNQ8rrSv8xUAQw="; }; nativeBuildInputs = [ @@ -44,13 +44,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - enchant icu glib gsettings-desktop-schemas gtk4 gtksourceview5 libadwaita + libspelling editorconfig-core-c ]; diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix index db5fd2e68c10..a900bfd3cde4 100644 --- a/pkgs/by-name/gn/gnome-tour/package.nix +++ b/pkgs/by-name/gn/gnome-tour/package.nix @@ -9,7 +9,6 @@ pkg-config, gtk4, glib, - gdk-pixbuf, desktop-file-utils, appstream-glib, wrapGAppsHook4, @@ -23,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-tour"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz"; - hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo="; + hash = "sha256-cvqvieAGyJMkp+FXIEaRaWGziuujj21tTMQePT1GaUQ="; }; cargoVendorDir = "vendor"; @@ -52,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gdk-pixbuf glib gtk4 libadwaita diff --git a/pkgs/by-name/gn/gnome-usage/package.nix b/pkgs/by-name/gn/gnome-usage/package.nix new file mode 100644 index 000000000000..3b4f550c64ba --- /dev/null +++ b/pkgs/by-name/gn/gnome-usage/package.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, vala +, gettext +, libxml2 +, desktop-file-utils +, wrapGAppsHook4 +, glib +, gtk4 +, libadwaita +, libgee +, libgtop +, gnome +, tinysparql +}: + +stdenv.mkDerivation rec { + pname = "gnome-usage"; + version = "46.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-GGrajgAYjIn4yrVPNZmO2XpG6rb9shiRAoNhvzhqybI="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + libxml2 + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + libgee + libgtop + tinysparql + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.sh + patchShebangs build-aux/meson/postinstall.sh + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Nice way to view information about use of system resources, like memory and disk space"; + mainProgram = "gnome-usage"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-usage"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix new file mode 100644 index 000000000000..274ff5704933 --- /dev/null +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -0,0 +1,41 @@ +{ lib, stdenv +, fetchurl +, gettext +, gnome +, itstool +, libxml2 +, yelp-tools +}: + +stdenv.mkDerivation rec { + pname = "gnome-user-docs"; + version = "47.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-0G2H/NcmqQ7QOhcMq0XUcIlJkeMSkS/FCL3g37yDz9o="; + }; + + nativeBuildInputs = [ + gettext + itstool + libxml2 + yelp-tools + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "User and system administration help for the GNOME desktop"; + homepage = "https://help.gnome.org/users/gnome-help/"; + license = licenses.cc-by-30; + maintainers = teams.gnome.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 1f7f8a0a3aaa..578e83b89816 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-share"; - version = "43.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - hash = "sha256-DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4="; + hash = "sha256-yELzUv5/Dw6hj/kYa6lIK2yQ0vazZau1sR1oyQbbpJA="; }; preConfigure = '' diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/by-name/gn/gnome-video-effects/package.nix similarity index 100% rename from pkgs/development/libraries/gnome-video-effects/default.nix rename to pkgs/by-name/gn/gnome-video-effects/package.nix diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix index d593124ab7ed..99a475963d3f 100644 --- a/pkgs/by-name/gn/gnome-weather/package.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz"; - hash = "sha256-FTgmcFzPZy4U8v5N/Hgvjom3xMvkqv6VpVMvveej1J0="; + hash = "sha256-UV9YYjdN00bLyFqd3wMGstMnZXhQu2C2ycmGD86WIOY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/by-name/gn/gnomecast/package.nix similarity index 100% rename from pkgs/applications/video/gnomecast/default.nix rename to pkgs/by-name/gn/gnomecast/package.nix diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/by-name/gn/gnonograms/package.nix similarity index 100% rename from pkgs/games/gnonograms/default.nix rename to pkgs/by-name/gn/gnonograms/package.nix diff --git a/pkgs/development/compilers/gnostic/default.nix b/pkgs/by-name/gn/gnostic/package.nix similarity index 100% rename from pkgs/development/compilers/gnostic/default.nix rename to pkgs/by-name/gn/gnostic/package.nix diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/by-name/gn/gnote/package.nix similarity index 100% rename from pkgs/applications/office/gnote/default.nix rename to pkgs/by-name/gn/gnote/package.nix diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch similarity index 100% rename from pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch rename to pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/by-name/gn/gnss-sdr/package.nix similarity index 100% rename from pkgs/applications/radio/gnss-sdr/default.nix rename to pkgs/by-name/gn/gnss-sdr/package.nix diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/by-name/gn/gnss-share/package.nix similarity index 100% rename from pkgs/servers/gnss-share/default.nix rename to pkgs/by-name/gn/gnss-share/package.nix diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/by-name/gn/gnu-cim/package.nix similarity index 100% rename from pkgs/development/compilers/gnu-cim/default.nix rename to pkgs/by-name/gn/gnu-cim/package.nix diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/by-name/gn/gnu-config/package.nix similarity index 100% rename from pkgs/development/libraries/gnu-config/default.nix rename to pkgs/by-name/gn/gnu-config/package.nix diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/by-name/gn/gnu-pw-mgr/package.nix similarity index 100% rename from pkgs/tools/security/gnu-pw-mgr/default.nix rename to pkgs/by-name/gn/gnu-pw-mgr/package.nix diff --git a/pkgs/misc/gnu-shepherd/default.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix similarity index 100% rename from pkgs/misc/gnu-shepherd/default.nix rename to pkgs/by-name/gn/gnu-shepherd/package.nix diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/by-name/gn/gnuapl/package.nix similarity index 100% rename from pkgs/development/interpreters/gnu-apl/default.nix rename to pkgs/by-name/gn/gnuapl/package.nix diff --git a/pkgs/games/gnubg/default.nix b/pkgs/by-name/gn/gnubg/package.nix similarity index 100% rename from pkgs/games/gnubg/default.nix rename to pkgs/by-name/gn/gnubg/package.nix diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/by-name/gn/gnuchess/package.nix similarity index 100% rename from pkgs/games/gnuchess/default.nix rename to pkgs/by-name/gn/gnuchess/package.nix diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/by-name/gn/gnuclad/package.nix similarity index 100% rename from pkgs/applications/graphics/gnuclad/default.nix rename to pkgs/by-name/gn/gnuclad/package.nix diff --git a/pkgs/games/gnugo/default.nix b/pkgs/by-name/gn/gnugo/package.nix similarity index 100% rename from pkgs/games/gnugo/default.nix rename to pkgs/by-name/gn/gnugo/package.nix diff --git a/pkgs/games/gnujump/gnujump.xpm b/pkgs/by-name/gn/gnujump/gnujump.xpm similarity index 100% rename from pkgs/games/gnujump/gnujump.xpm rename to pkgs/by-name/gn/gnujump/gnujump.xpm diff --git a/pkgs/games/gnujump/default.nix b/pkgs/by-name/gn/gnujump/package.nix similarity index 100% rename from pkgs/games/gnujump/default.nix rename to pkgs/by-name/gn/gnujump/package.nix diff --git a/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch b/pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch similarity index 100% rename from pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch rename to pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/by-name/gn/gnulib/package.nix similarity index 100% rename from pkgs/development/tools/gnulib/default.nix rename to pkgs/by-name/gn/gnulib/package.nix diff --git a/pkgs/development/tools/misc/gnum4/loong-fix-build.patch b/pkgs/by-name/gn/gnum4/loong-fix-build.patch similarity index 100% rename from pkgs/development/tools/misc/gnum4/loong-fix-build.patch rename to pkgs/by-name/gn/gnum4/loong-fix-build.patch diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/by-name/gn/gnum4/package.nix similarity index 100% rename from pkgs/development/tools/misc/gnum4/default.nix rename to pkgs/by-name/gn/gnum4/package.nix diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/by-name/gn/gnumake42/glibc-2.27-glob.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch rename to pkgs/by-name/gn/gnumake42/glibc-2.27-glob.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/by-name/gn/gnumake42/glibc-2.33-glob.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch rename to pkgs/by-name/gn/gnumake42/glibc-2.33-glob.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/pkgs/by-name/gn/gnumake42/impure-dirs.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch rename to pkgs/by-name/gn/gnumake42/impure-dirs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/by-name/gn/gnumake42/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/default.nix rename to pkgs/by-name/gn/gnumake42/package.nix diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/by-name/gn/gnumake42/pselect.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch rename to pkgs/by-name/gn/gnumake42/pselect.patch diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/by-name/gn/gnumeric/package.nix similarity index 100% rename from pkgs/applications/office/gnumeric/default.nix rename to pkgs/by-name/gn/gnumeric/package.nix diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix similarity index 100% rename from pkgs/tools/security/gnupg-pkcs11-scd/default.nix rename to pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/by-name/gn/gnupth/package.nix similarity index 100% rename from pkgs/development/libraries/pth/default.nix rename to pkgs/by-name/gn/gnupth/package.nix diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/by-name/gn/gnushogi/package.nix similarity index 100% rename from pkgs/games/gnushogi/default.nix rename to pkgs/by-name/gn/gnushogi/package.nix diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/by-name/go/go-2fa/package.nix similarity index 100% rename from pkgs/tools/security/2fa/default.nix rename to pkgs/by-name/go/go-2fa/package.nix diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/by-name/go/go-audit/package.nix similarity index 100% rename from pkgs/tools/system/go-audit/default.nix rename to pkgs/by-name/go/go-audit/package.nix diff --git a/pkgs/servers/go-autoconfig/default.nix b/pkgs/by-name/go/go-autoconfig/package.nix similarity index 100% rename from pkgs/servers/go-autoconfig/default.nix rename to pkgs/by-name/go/go-autoconfig/package.nix diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/by-name/go/go-bindata-assetfs/package.nix similarity index 100% rename from pkgs/development/tools/go-bindata-assetfs/default.nix rename to pkgs/by-name/go/go-bindata-assetfs/package.nix diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/by-name/go/go-bindata/package.nix similarity index 100% rename from pkgs/development/tools/go-bindata/default.nix rename to pkgs/by-name/go/go-bindata/package.nix diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix new file mode 100644 index 000000000000..54908b491a11 --- /dev/null +++ b/pkgs/by-name/go/go-blueprint/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + stdenv, +}: + +buildGoModule rec { + pname = "go-blueprint"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "Melkeydev"; + repo = "go-blueprint"; + rev = "v${version}"; + hash = "sha256-4KEshM6y27CD+PiyYoz4IWKkfLWRXOTA7bMFfxVYfaI="; + }; + + ldflags = [ + "-s -w -X github.com/melkeydev/go-blueprint/cmd.GoBlueprintVersion=v${version}" + ]; + + vendorHash = "sha256-WBzToupC1/O70OYHbKk7S73OEe7XRLAAbY5NoLL7xvw="; + + nativeBuildInputs = [ installShellFiles ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd go-blueprint \ + --bash <($out/bin/go-blueprint completion bash) \ + --fish <($out/bin/go-blueprint completion fish) \ + --zsh <($out/bin/go-blueprint completion zsh) + ''; + + meta = { + description = "Initialize Go projects using popular frameworks"; + homepage = "https://github.com/Melkeydev/go-blueprint"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tobifroe ]; + mainProgram = "go-blueprint"; + }; +} diff --git a/pkgs/development/tools/go-callvis/default.nix b/pkgs/by-name/go/go-callvis/package.nix similarity index 100% rename from pkgs/development/tools/go-callvis/default.nix rename to pkgs/by-name/go/go-callvis/package.nix diff --git a/pkgs/development/tools/check/default.nix b/pkgs/by-name/go/go-check/package.nix similarity index 100% rename from pkgs/development/tools/check/default.nix rename to pkgs/by-name/go/go-check/package.nix diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix new file mode 100644 index 000000000000..8dda0c17d6bb --- /dev/null +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenvNoCC, + versionCheckHook, +}: + +buildGoModule rec { + pname = "go-chromecast"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "vishen"; + repo = "go-chromecast"; + rev = "refs/tags/v${version}"; + hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg="; + }; + + vendorHash = "sha256-EI37KPdNxPXdgmxvawTiRQ516dLxt5o0iYvGcAHXdUw="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=unknown" + ]; + + doInstallCheck = true; + + nativeBuildInputs = [ installShellFiles ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "--version"; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd go-chromecast \ + --bash <($out/bin/go-chromecast completion bash) \ + --fish <($out/bin/go-chromecast completion fish) \ + --zsh <($out/bin/go-chromecast completion zsh) + ''; + + meta = { + homepage = "https://github.com/vishen/go-chromecast"; + description = "CLI for Google Chromecast, Home devices and Cast Groups"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.zi3m5f ]; + mainProgram = "go-chromecast"; + }; +} diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/by-name/go/go-containerregistry/package.nix similarity index 100% rename from pkgs/development/tools/go-containerregistry/default.nix rename to pkgs/by-name/go/go-containerregistry/package.nix diff --git a/pkgs/servers/go-cqhttp/default.nix b/pkgs/by-name/go/go-cqhttp/package.nix similarity index 100% rename from pkgs/servers/go-cqhttp/default.nix rename to pkgs/by-name/go/go-cqhttp/package.nix diff --git a/pkgs/tools/security/go-cve-search/default.nix b/pkgs/by-name/go/go-cve-search/package.nix similarity index 100% rename from pkgs/tools/security/go-cve-search/default.nix rename to pkgs/by-name/go/go-cve-search/package.nix diff --git a/pkgs/tools/security/go-dork/default.nix b/pkgs/by-name/go/go-dork/package.nix similarity index 100% rename from pkgs/tools/security/go-dork/default.nix rename to pkgs/by-name/go/go-dork/package.nix diff --git a/pkgs/by-name/go/go-exploitdb/package.nix b/pkgs/by-name/go/go-exploitdb/package.nix new file mode 100644 index 000000000000..de2fd3426fe3 --- /dev/null +++ b/pkgs/by-name/go/go-exploitdb/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-exploitdb"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "vulsio"; + repo = "go-exploitdb"; + rev = "refs/tags/v${version}"; + hash = "sha256-7S6DuPCsT3mP4/W5Lsyg4RS7Km8dmYkrUhvSjlRhahc="; + }; + + vendorHash = "sha256-uqXNRfWWNvpDC3q+eDX3NOQIHz0di4/Vjh7r8OMsTr4="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/vulsio/go-exploitdb/config.Version=${version}" + ]; + + meta = with lib; { + description = "Tool for searching Exploits from Exploit Databases, etc"; + mainProgram = "go-exploitdb"; + homepage = "https://github.com/vulsio/go-exploitdb"; + changelog = "https://github.com/vulsio/go-exploitdb/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/by-name/go/go-font/package.nix similarity index 100% rename from pkgs/data/fonts/go-font/default.nix rename to pkgs/by-name/go/go-font/package.nix diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/by-name/go/go-graft/package.nix similarity index 100% rename from pkgs/applications/networking/go-graft/default.nix rename to pkgs/by-name/go/go-graft/package.nix diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix new file mode 100644 index 000000000000..e91033eefacf --- /dev/null +++ b/pkgs/by-name/go/go-ios/package.nix @@ -0,0 +1,59 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, pkg-config +, libusb1 +}: + +buildGoModule rec { + pname = "go-ios"; + version = "1.0.150"; + + src = fetchFromGitHub { + owner = "danielpaulus"; + repo = "go-ios"; + rev = "v${version}"; + sha256 = "sha256-xa2/qshZ4k+Df5l817BXlotR6L/CX6Lw2+tWDYnr96I="; + }; + + proxyVendor = true; + vendorHash = "sha256-/aVaTC9lfoXQvhDVQm31HmXBnDYYOv6RH69Nm3I/K7s="; + + excludedPackages = [ + "restapi" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libusb1 + ]; + + postInstall = '' + # aligns the binary with what is expected from go-ios + mv $out/bin/go-ios $out/bin/ios + ''; + + # skips all the integration tests (requires iOS device) (`-tags=fast`) + # as well as tests that requires networking + checkFlags = let + skippedTests = [ + "TestWorksWithoutProxy" + "TestUsesProxy" + ]; + in [ "-tags=fast" ] + ++ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Operating system independent implementation of iOS device features"; + homepage = "https://github.com/danielpaulus/go-ios"; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + mainProgram = "ios"; + }; +} diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix new file mode 100644 index 000000000000..b2a2aec97a9c --- /dev/null +++ b/pkgs/by-name/go/go-jet/package.nix @@ -0,0 +1,53 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-jet"; + version = "2.12.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "jet"; + rev = "v${version}"; + sha256 = "sha256-lS/oo0jD/kYKVDJly96Y/iRupPXueoOOYJsEYu1+Jdk="; + }; + + vendorHash = "sha256-f2oeGERwnqMPPwV+ZUJ+Mss9ZmlQRg/xllofDR9aa4M="; + + subPackages = [ "cmd/jet" ]; + + tags = [ + "mysql" + "golang" + "postgres" + "sql" + "database" + "code-generator" + "sqlite" + "postgresql" + "mariadb" + "sql-query" + "codegenerator" + "typesafe" + "sql-builder" + "datamapper" + "code-completion" + "sql-queries" + "cockroachdb" + "sql-query-builder" + "sqlbuilder" + "typesafety" + ]; + + postPatch = '' + # removing the tests which depend on external data + rm -rf tests/{sqlite,postgres,mysql} + ''; + + meta = with lib; { + homepage = "https://github.com/go-jet/jet"; + description = "Type safe SQL builder with code generation and automatic query result data mapping"; + maintainers = with maintainers; [ mrityunjaygr8 ]; + license = licenses.asl20; + mainProgram = "jet"; + }; +} diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/by-name/go/go-jira/package.nix similarity index 100% rename from pkgs/applications/misc/go-jira/default.nix rename to pkgs/by-name/go/go-jira/package.nix diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/by-name/go/go-junit-report/package.nix similarity index 100% rename from pkgs/development/tools/go-junit-report/default.nix rename to pkgs/by-name/go/go-junit-report/package.nix diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/by-name/go/go-libp2p-daemon/package.nix similarity index 100% rename from pkgs/servers/go-libp2p-daemon/default.nix rename to pkgs/by-name/go/go-libp2p-daemon/package.nix diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/by-name/go/go-license-detector/package.nix similarity index 100% rename from pkgs/development/tools/misc/go-license-detector/default.nix rename to pkgs/by-name/go/go-license-detector/package.nix diff --git a/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch b/pkgs/by-name/go/go-licenses/fix-go-version-error.patch similarity index 100% rename from pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch rename to pkgs/by-name/go/go-licenses/fix-go-version-error.patch diff --git a/pkgs/development/tools/misc/go-licenses/default.nix b/pkgs/by-name/go/go-licenses/package.nix similarity index 100% rename from pkgs/development/tools/misc/go-licenses/default.nix rename to pkgs/by-name/go/go-licenses/package.nix diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/by-name/go/go-md2man/package.nix similarity index 100% rename from pkgs/development/tools/misc/go-md2man/default.nix rename to pkgs/by-name/go/go-md2man/package.nix diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/by-name/go/go-migrate/package.nix similarity index 100% rename from pkgs/development/tools/go-migrate/default.nix rename to pkgs/by-name/go/go-migrate/package.nix diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/by-name/go/go-minimock/package.nix similarity index 100% rename from pkgs/development/tools/go-minimock/default.nix rename to pkgs/by-name/go/go-minimock/package.nix diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix new file mode 100644 index 000000000000..394a16b7e023 --- /dev/null +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -0,0 +1,69 @@ +{ lib, buildGoModule, fetchFromGitHub, go-mockery, runCommand, go }: + +buildGoModule rec { + pname = "go-mockery"; + version = "2.46.3"; + + src = fetchFromGitHub { + owner = "vektra"; + repo = "mockery"; + rev = "v${version}"; + sha256 = "sha256-KgQ5EV7tnIZGmM8vrP7Sed2jm7ghgORCgkFR9TOXx6Y="; + }; + + preCheck = '' + substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} + substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} + ''; + + ldflags = [ + "-s" "-w" + "-X" "github.com/vektra/mockery/v2/pkg/logging.SemVer=v${version}" + ]; + + CGO_ENABLED = false; + + proxyVendor = true; + vendorHash = "sha256-fxh0WaopHKHuOjXXYNmO30/jB1zwtf5HhhtRGnCl7fM="; + + subPackages = [ "." ]; + + passthru.tests = { + generateMock = runCommand "${pname}-test" { + nativeBuildInputs = [ go-mockery ]; + buildInputs = [ go ]; + } '' + if [[ $(mockery --version) != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi + + export HOME=$TMPDIR + + cat < foo.go + package main + + type Foo interface { + Bark() string + } + EOF + + mockery --name Foo --dir . + + if [[ ! -f "mocks/Foo.go" ]]; then + echo "Error: mocks/Foo.go was not generated by ${pname}" + exit 1 + fi + + touch $out + ''; + }; + + meta = with lib; { + homepage = "https://github.com/vektra/mockery"; + description = "Mock code autogenerator for Golang"; + maintainers = with maintainers; [ fbrs ]; + mainProgram = "mockery"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/go-mod-graph-chart/default.nix b/pkgs/by-name/go/go-mod-graph-chart/package.nix similarity index 100% rename from pkgs/development/tools/go-mod-graph-chart/default.nix rename to pkgs/by-name/go/go-mod-graph-chart/package.nix diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/by-name/go/go-motion/package.nix similarity index 100% rename from pkgs/development/tools/go-motion/default.nix rename to pkgs/by-name/go/go-motion/package.nix diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/by-name/go/go-mtpfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/go-mtpfs/default.nix rename to pkgs/by-name/go/go-mtpfs/package.nix diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/by-name/go/go-musicfox/package.nix similarity index 100% rename from pkgs/applications/audio/go-musicfox/default.nix rename to pkgs/by-name/go/go-musicfox/package.nix diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/by-name/go/go-neb/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/go-neb/default.nix rename to pkgs/by-name/go/go-neb/package.nix diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/by-name/go/go-org/package.nix similarity index 100% rename from pkgs/applications/misc/go-org/default.nix rename to pkgs/by-name/go/go-org/package.nix diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/by-name/go/go-outline/package.nix similarity index 100% rename from pkgs/development/tools/go-outline/default.nix rename to pkgs/by-name/go/go-outline/package.nix diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/by-name/go/go-protobuf/package.nix similarity index 100% rename from pkgs/development/tools/go-protobuf/default.nix rename to pkgs/by-name/go/go-protobuf/package.nix diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/by-name/go/go-rice/package.nix similarity index 100% rename from pkgs/tools/misc/go.rice/default.nix rename to pkgs/by-name/go/go-rice/package.nix diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/by-name/go/go-sct/package.nix similarity index 100% rename from pkgs/tools/X11/go-sct/default.nix rename to pkgs/by-name/go/go-sct/package.nix diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/by-name/go/go-shadowsocks2/package.nix similarity index 100% rename from pkgs/tools/networking/go-shadowsocks2/default.nix rename to pkgs/by-name/go/go-shadowsocks2/package.nix diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/by-name/go/go-swag/package.nix similarity index 100% rename from pkgs/development/tools/go-swag/default.nix rename to pkgs/by-name/go/go-swag/package.nix diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/by-name/go/go-swagger/package.nix similarity index 100% rename from pkgs/development/tools/go-swagger/default.nix rename to pkgs/by-name/go/go-swagger/package.nix diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/by-name/go/go-task/package.nix similarity index 100% rename from pkgs/development/tools/go-task/default.nix rename to pkgs/by-name/go/go-task/package.nix diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/by-name/go/go-toml/package.nix similarity index 100% rename from pkgs/development/tools/go-toml/default.nix rename to pkgs/by-name/go/go-toml/package.nix diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/by-name/go/go-tools/package.nix similarity index 100% rename from pkgs/development/tools/go-tools/default.nix rename to pkgs/by-name/go/go-tools/package.nix diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix new file mode 100644 index 000000000000..6c672837b1ad --- /dev/null +++ b/pkgs/by-name/go/go2rtc/package.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go2rtc"; + version = "1.9.6"; + + src = fetchFromGitHub { + owner = "AlexxIT"; + repo = "go2rtc"; + rev = "refs/tags/v${version}"; + hash = "sha256-Vq0w3JldUVUh4soULyWQI9D2yknkx529n4aAwhpdfdU="; + }; + + vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; + + doCheck = false; # tests fail + + meta = with lib; { + description = "Ultimate camera streaming application with support RTSP, RTMP, HTTP-FLV, WebRTC, MSE, HLS, MJPEG, HomeKit, FFmpeg, etc"; + homepage = "https://github.com/AlexxIT/go2rtc"; + changelog = "https://github.com/AlexxIT/go2rtc/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "go2rtc"; + }; +} diff --git a/pkgs/tools/security/go365/default.nix b/pkgs/by-name/go/go365/package.nix similarity index 100% rename from pkgs/tools/security/go365/default.nix rename to pkgs/by-name/go/go365/package.nix diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/by-name/go/goa/package.nix similarity index 100% rename from pkgs/development/tools/goa/default.nix rename to pkgs/by-name/go/goa/package.nix diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/by-name/go/goaccess/package.nix similarity index 100% rename from pkgs/tools/misc/goaccess/default.nix rename to pkgs/by-name/go/goaccess/package.nix diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/by-name/go/goawk/package.nix similarity index 100% rename from pkgs/tools/text/goawk/default.nix rename to pkgs/by-name/go/goawk/package.nix diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/by-name/go/gob2/package.nix similarity index 100% rename from pkgs/development/tools/misc/gob2/default.nix rename to pkgs/by-name/go/gob2/package.nix diff --git a/pkgs/tools/X11/gobble/default.nix b/pkgs/by-name/go/gobble/package.nix similarity index 100% rename from pkgs/tools/X11/gobble/default.nix rename to pkgs/by-name/go/gobble/package.nix diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/by-name/go/gobby/package.nix similarity index 100% rename from pkgs/applications/editors/gobby/default.nix rename to pkgs/by-name/go/gobby/package.nix diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/by-name/go/gobetween/gomod.patch similarity index 100% rename from pkgs/servers/gobetween/gomod.patch rename to pkgs/by-name/go/gobetween/gomod.patch diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/by-name/go/gobetween/package.nix similarity index 100% rename from pkgs/servers/gobetween/default.nix rename to pkgs/by-name/go/gobetween/package.nix diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/by-name/go/gobgp/package.nix similarity index 100% rename from pkgs/tools/networking/gobgp/default.nix rename to pkgs/by-name/go/gobgp/package.nix diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/by-name/go/gobgpd/package.nix similarity index 100% rename from pkgs/servers/misc/gobgpd/default.nix rename to pkgs/by-name/go/gobgpd/package.nix diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/by-name/go/gobi_loader/package.nix similarity index 100% rename from pkgs/os-specific/linux/gobi_loader/default.nix rename to pkgs/by-name/go/gobi_loader/package.nix diff --git a/pkgs/tools/security/goblob/default.nix b/pkgs/by-name/go/goblob/package.nix similarity index 100% rename from pkgs/tools/security/goblob/default.nix rename to pkgs/by-name/go/goblob/package.nix diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/by-name/go/gobuster/package.nix similarity index 100% rename from pkgs/tools/security/gobuster/default.nix rename to pkgs/by-name/go/gobuster/package.nix diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/by-name/go/gocd-agent/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gocd-agent/default.nix rename to pkgs/by-name/go/gocd-agent/package.nix diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/by-name/go/gocd-server/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gocd-server/default.nix rename to pkgs/by-name/go/gocd-server/package.nix diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/by-name/go/gocode-gomod/package.nix similarity index 100% rename from pkgs/development/tools/gocode-gomod/default.nix rename to pkgs/by-name/go/gocode-gomod/package.nix diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/by-name/go/goconst/package.nix similarity index 100% rename from pkgs/development/tools/goconst/default.nix rename to pkgs/by-name/go/goconst/package.nix diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/by-name/go/goconvey/package.nix similarity index 100% rename from pkgs/development/tools/goconvey/default.nix rename to pkgs/by-name/go/goconvey/package.nix diff --git a/pkgs/development/tools/gocover-cobertura/default.nix b/pkgs/by-name/go/gocover-cobertura/package.nix similarity index 100% rename from pkgs/development/tools/gocover-cobertura/default.nix rename to pkgs/by-name/go/gocover-cobertura/package.nix diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/by-name/go/gocr/package.nix similarity index 100% rename from pkgs/applications/graphics/gocr/default.nix rename to pkgs/by-name/go/gocr/package.nix diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/by-name/go/gocryptfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/gocryptfs/default.nix rename to pkgs/by-name/go/gocryptfs/package.nix diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/by-name/go/gocyclo/package.nix similarity index 100% rename from pkgs/development/tools/gocyclo/default.nix rename to pkgs/by-name/go/gocyclo/package.nix diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/by-name/go/godef/package.nix similarity index 100% rename from pkgs/development/tools/godef/default.nix rename to pkgs/by-name/go/godef/package.nix diff --git a/pkgs/by-name/go/godot_4-mono/package.nix b/pkgs/by-name/go/godot_4-mono/package.nix new file mode 100644 index 000000000000..825b6ab67ead --- /dev/null +++ b/pkgs/by-name/go/godot_4-mono/package.nix @@ -0,0 +1,6 @@ +{ + godot_4, +}: +godot_4.override { + withMono = true; +} diff --git a/pkgs/by-name/go/godot_4/deps.nix b/pkgs/by-name/go/godot_4/deps.nix new file mode 100644 index 000000000000..bdb10abd4f8e --- /dev/null +++ b/pkgs/by-name/go/godot_4/deps.nix @@ -0,0 +1,269 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "coverlet.collector"; version = "3.2.0"; hash = "sha256-2aM3pKX5toQQRLKpH5ArzND2Rgq1fSpMsLxcEDbat+M="; }) + (fetchNuGet { pname = "DiffPlex"; version = "1.5.0"; hash = "sha256-6HwA6ZyCn++NAXy6ep9ywSF/Ss+e/nmMhjyeIft9fQw="; }) + (fetchNuGet { pname = "envdte"; version = "17.8.37221"; hash = "sha256-jKSZceeB+/IwrOqZ3USX6HeSQtxKCPs9VzA733NHEEU="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; hash = "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2019.1.3"; hash = "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E="; }) + (fetchNuGet { pname = "JetBrains.Rider.PathLocator"; version = "1.0.9"; hash = "sha256-7c5TRZ594tr1Fj5fNiXtPI0pcBuyX/3eU4x+it6Yzew="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.35"; hash = "sha256-BxvIeZIaBdC0wyDQqKW0E5axSRSrtQk3oEPsT287014="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "15.1.548"; hash = "sha256-v6rTGfytT6QwXkp97T6vQurVi8oDzZmIOn3/cHYuC6s="; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "15.1.548"; hash = "sha256-0U6XANGftKOS9Owx1x8hOe5GOdqx2uwQwuAsVHw297g="; }) + (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.2.6"; hash = "sha256-Z5wzSnsGbbJe3nvj6kAAv6KhYMK1H3Mktn4ugflpzuY="; }) + (fetchNuGet { pname = "Microsoft.Build.NoTargets"; version = "2.0.1"; hash = "sha256-5Gqi/OQayuQiQNEcoaFue0glNvcF4nmGneW07Hs9prg="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzer.Testing"; version = "1.1.1"; hash = "sha256-3w7g0KhG16ZH8rYK9FxP15qbd+hTgwRDpDJEKpDMHu8="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.6.1"; hash = "sha256-1+FV3KvwerZsknecHZhdDACsPKaWrbQQeN27BAcZk94="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; hash = "sha256-pDeaMqX7a01Hp1Qd9P/y/B2rEGAv2eIY0Ld/klBZW5g="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CodeFix.Testing"; version = "1.1.1"; hash = "sha256-NXEGr/+rzt4ENdTWPlgW7upyjofPP841xzwU78lReio="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "1.0.1"; hash = "sha256-jjWtdrHSISgBF1m94P0DsVbQa4YxKnf2CWRWYHQLTG8="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.10.0"; hash = "sha256-AXmLVmjWuDXmV/P0aeeioA5NzthnCWepT4hHWgjmR4k="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.11.0"; hash = "sha256-lOW5q1kAAk+Wpweb9TaZ1LztWzAODt9yZKe6SN5rkV8="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; hash = "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.10.0"; hash = "sha256-09QIyQUkYBg8ltgWtDrCg8f6wnN/sLhduDG3BGvcl14="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.11.0"; hash = "sha256-AVFv1c6eMi5Jc6GXyL2P3WSs9YTOs3hPO7iGq9tZJsA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; hash = "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Analyzer.Testing"; version = "1.1.1"; hash = "sha256-uZf99S701CcUoR8XHn+PusRXdDeeWylFiqdMjR9R6TY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit"; version = "1.1.1"; hash = "sha256-Fs+ygXsCxoJGcaatBc1v8ZXTVSsid+Y60O4/JLiMD18="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.CodeFix.Testing"; version = "1.1.1"; hash = "sha256-g1AkqFBndpl4ySk1w5IMAN+EibO9OsLiWCLjMggImDo="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit"; version = "1.1.1"; hash = "sha256-3z6ELEBETjKlCyGQ5PzyQWS6Ud982BQMNvLdJnOdlWw="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing"; version = "1.1.1"; hash = "sha256-nX4GSfovb8K4cD9xFEKXcRXVDNmXyWOaAAVQ/XfvAFk="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit"; version = "1.1.1"; hash = "sha256-QAQ87pM9sr+8uqwDSXR39x3wtx82jVGcdTJPmwDSB2Y="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.11.0"; hash = "sha256-4WQgwOdmKbCMfT2c4K+5ZkErU3zkRboJO0ORHhnUvpo="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.8.0"; hash = "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.SourceGenerators.Testing"; version = "1.1.1"; hash = "sha256-d4zoBTjX9DAwIZfGAa9as5vE/BIshKIov4GepT9l1vg="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Testing.Verifiers.XUnit"; version = "1.1.1"; hash = "sha256-WOo0pITkG6CZwJ9MiLaCMSbjbBOxn7+tlpjJGn//gnc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "1.0.1"; hash = "sha256-/SYPkq5LhOoEWi+rcBZDyQL2U0cQk2YrykNJODrRLVs="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.11.0"; hash = "sha256-mkJ/pkf7x7kQ2NngYl8yOlEwJIEjphL84KyUC5vEKh4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.8.0"; hash = "sha256-3D7xV3V1WsUU9OMMEOj+z9GouCDKXSBC4Z/Szs/OcWE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.8.0"; hash = "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.1"; hash = "sha256-MePYLGy7Y4DuPZccxIbRTjq4GB554jBwT4noLiAZJKs="; }) + (fetchNuGet { pname = "Microsoft.Composition"; version = "1.0.27"; hash = "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.1"; hash = "sha256-ySyNpRodd6R6qKnGrgwLYaiHZga2GL0fQARrYGIFa6k="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.35"; hash = "sha256-ckJ2xR4qf8OQdk/KhCjVmV91lX8pj19qjlsJ+i5bkMI="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.35"; hash = "sha256-IcpSbsSHgYBbNVvbcXfmRRM9bdx3pogLncO4RuXEab0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; hash = "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k="; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; hash = "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; hash = "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.1"; hash = "sha256-MMrdBDByByYDpO/xaRCl9Cb27zIfcjPJqld/649e8Mw="; }) + (fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; hash = "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; hash = "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; hash = "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Interop"; version = "17.8.37221"; hash = "sha256-n4gHogs2T+RxO7OCuFiITu90KTychqZycQMqPbukNuE="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.0.82"; hash = "sha256-7JFaA/HZHVjsEtTh/iHDRLi5RcuA39KKvvCkuI4JQFc="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.0.0"; hash = "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; hash = "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "NuGet.Common"; version = "5.6.0"; hash = "sha256-uc/gCpcfugMjulqDVpS0ryfcaVBtmKyho07g3M8o//g="; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "5.6.0"; hash = "sha256-K5A66u9WPz8PZYIl+DDyCAodYGUJfLdNNix6f5F7adI="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.6.0"; hash = "sha256-iMacMTcuvemRQ4p3gv/3MioC/OEDOju8rnmZioWq9bc="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "5.6.0"; hash = "sha256-bl/A1QbIJAu/GpzKOKjGwe7NrTXlYH5s3ppJ6mYAoQk="; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "5.6.0"; hash = "sha256-faY3xEk4g9xQFRT7DspGmlVLRGH1r4Vvr5VLT9sLUf8="; }) + (fetchNuGet { pname = "NuGet.Resolver"; version = "5.6.0"; hash = "sha256-wAiARlBJtCjP482a0jnZKpZBbHRl3voXYMTz3WEox04="; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "5.6.0"; hash = "sha256-3HKwW3hhTuwkZM5n02VFe8yDZbCLgqNE8gI+pqFTToI="; }) + (fetchNuGet { pname = "ReflectionAnalyzers"; version = "0.1.22-dev"; hash = "sha256-NA/pyCCzzIewVr6IfZtFQjR5lOBnBdSzYj5SzgsBFvw="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; hash = "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.1.36"; hash = "sha256-x/UyLEyveCYI+JAWo9xallSPbl78dIVuW2pGqgTY/C0="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; hash = "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU="; }) + (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "4.5.0"; hash = "sha256-xxeZs1zIkhl2ZXU8CaOtCkMX1N290IK7bbHYeEKD0aQ="; }) + (fetchNuGet { pname = "System.Composition"; version = "1.0.31"; hash = "sha256-wcQEG6MCRa1S03s3Yb3E3tfsIBZid99M7WDhcb48Qik="; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; hash = "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "1.0.31"; hash = "sha256-u+XnXfj6LQ3OXwrb9KqHRW4a/a9yHzLrJOXwDQ1a/sY="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; hash = "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "1.0.31"; hash = "sha256-GQWo1YDyQ3r2OMcKW+GbR3BbZNIAdwK79XAfinNj+AE="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; hash = "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "1.0.31"; hash = "sha256-fg9BIY+zWtiEBIJefYP2lKHDYa4r/vtPTr3ZI8e0K7g="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; hash = "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "1.0.31"; hash = "sha256-mqfxjAnVyE1YCgXMOcV34IWhYFnvXVKjMo9Y/d3yDuo="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; hash = "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "1.0.31"; hash = "sha256-w9ApcUJr7jYP4Vf5+efIIqoWmr5v9R56W4uC0n8KktQ="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; hash = "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="; }) + (fetchNuGet { pname = "System.Console"; version = "4.0.0"; hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Contracts"; version = "4.0.1"; hash = "sha256-Mq2MU+80m+zqhe92JazEIDi4rsgk8MHg3yjNYlObzXg="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.0.0"; hash = "sha256-Yy94jPhDXF2QHOF7qTmqKkn1048K9xkKryuBeDzsu+g="; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; hash = "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; hash = "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; hash = "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; hash = "sha256-2zT5uBiyYm+jLIoJppIKJttTtpcMNKxd7Li0QEVjbv8="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.IO.Pipes"; version = "4.0.0"; hash = "sha256-6qMAD6DCZ5c1wswLWi1msqwu8GwI8un1RzjpUhzbrjs="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Linq.Parallel"; version = "4.0.1"; hash = "sha256-TV1F3KYFipPmPnWFjX6hOZQNFsG2m729EdgPSFzqY0Q="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; hash = "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; hash = "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.0.21"; hash = "sha256-0yqDWxwaw57YQ5dl8qdo+2o6VvG8qKp4il093uWWAUs="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; hash = "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (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.Runtime.Loader"; version = "4.0.0"; hash = "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; hash = "sha256-CbfRZFmnJZCAsx9cx9UehCtzsbnVo+ce+n4pXDsx4s0="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; hash = "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.0.1"; hash = "sha256-9wBgPnJfFOtrhKZ7wDXZ4q12GklQ49Ka02/9v7Frf9k="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) + (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.0.1"; hash = "sha256-CAWZlavcuBQHs+kaSX9CmkpHF7wC8rFrug3XPb5KJzo="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.6.0"; hash = "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; hash = "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.0.10"; hash = "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; hash = "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.0.1"; hash = "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo="; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.0.1"; hash = "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA="; }) + (fetchNuGet { pname = "xunit"; version = "2.4.2"; hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.0.0"; hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.3.0"; hash = "sha256-lN+NiUEQoHWmoamUjvsNt2PVhHXYeHJHjHRk1BTs6R8="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.2"; hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.2"; hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.5"; hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk="; }) +] diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 829ece63d51e..64267cd63218 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -3,6 +3,8 @@ autoPatchelfHook, buildPackages, dbus, + dotnet-sdk_8, + dotnetCorePackages, fetchFromGitHub, fontconfig, installShellFiles, @@ -19,6 +21,7 @@ libxkbcommon, libXrandr, libXrender, + makeWrapper, pkg-config, scons, speechd-minimal, @@ -29,6 +32,7 @@ wayland-scanner, withDbus ? true, withFontconfig ? true, + withMono ? false, withPlatform ? "linuxbsd", withPrecision ? "single", withPulseaudio ? true, @@ -49,148 +53,204 @@ let mkSconsFlagsFromAttrSet = lib.mapAttrsToList ( k: v: if builtins.isString v then "${k}=${v}" else "${k}=${builtins.toJSON v}" ); + + suffix = if withMono then "-mono" else ""; + + attrs = rec { + pname = "godot4${suffix}"; + version = "4.3-stable"; + commitHash = "77dcf97d82cbfe4e4615475fa52ca03da645dbd8"; + + src = fetchFromGitHub { + owner = "godotengine"; + repo = "godot"; + rev = commitHash; + hash = "sha256-v2lBD3GEL8CoIwBl3UoLam0dJxkLGX0oneH6DiWkEsM="; + }; + + outputs = [ + "out" + "man" + ]; + separateDebugInfo = true; + + # Set the build name which is part of the version. In official downloads, this + # is set to 'official'. When not specified explicitly, it is set to + # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack + # etc.) usually set this to their name as well. + # + # See also 'methods.py' in the Godot repo and 'build' in + # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info + BUILD_NAME = "nixpkgs"; + + # Required for the commit hash to be included in the version number. + # + # `methods.py` reads the commit hash from `.git/HEAD` and manually follows + # refs. Since we just write the hash directly, there is no need to emulate any + # other parts of the .git directory. + # + # See also 'hash' in + # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info + preConfigure = + '' + mkdir -p .git + echo ${commitHash} > .git/HEAD + '' + + lib.optionalString withMono '' + dotnet restore modules/mono/glue/GodotSharp/GodotSharp.sln + dotnet restore modules/mono/editor/GodotTools/GodotTools.sln + dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln + ''; + + # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct + sconsFlags = mkSconsFlagsFromAttrSet { + # Options from 'SConstruct' + precision = withPrecision; # Floating-point precision level + production = true; # Set defaults to build Godot for use in production + platform = withPlatform; + target = withTarget; + debug_symbols = true; + + # Options from 'platform/linuxbsd/detect.py' + dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings + fontconfig = withFontconfig; # Use fontconfig for system fonts support + pulseaudio = withPulseaudio; # Use PulseAudio + speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support + touch = withTouch; # Enable touch events + udev = withUdev; # Use udev for gamepad connection callbacks + wayland = withWayland; # Compile with Wayland support + x11 = withX11; # Compile with X11 support + + module_mono_enabled = withMono; + }; + + enableParallelBuilding = true; + + strictDeps = true; + + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.stdenv.cc + pkg-config + ]; + + nativeBuildInputs = + [ + autoPatchelfHook + installShellFiles + pkg-config + scons + ] + ++ lib.optionals withWayland [ wayland-scanner ] + ++ lib.optionals withMono [ + dotnet-sdk_8 + makeWrapper + ]; + + postBuild = lib.optionalString withMono '' + echo "Generating Glue" + if [[ ${withPrecision} == *double* ]]; then + bin/godot.${withPlatform}.${withTarget}.${withPrecision}.x86_64.mono --headless --generate-mono-glue modules/mono/glue + else + bin/godot.${withPlatform}.${withTarget}.x86_64.mono --headless --generate-mono-glue modules/mono/glue + fi + echo "Building C#/.NET Assemblies" + python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision} + ''; + + runtimeDependencies = + [ + alsa-lib + libGL + vulkan-loader + ] + ++ lib.optionals withX11 [ + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libxkbcommon + libXrandr + libXrender + ] + ++ lib.optionals withWayland [ + libdecor + wayland + ] + ++ lib.optionals withDbus [ + dbus + dbus.lib + ] + ++ lib.optionals withFontconfig [ + fontconfig + fontconfig.lib + ] + ++ lib.optionals withPulseaudio [ libpulseaudio ] + ++ lib.optionals withSpeechd [ speechd-minimal ] + ++ lib.optionals withUdev [ udev ]; + + installPhase = + '' + runHook preInstall + + mkdir -p "$out/bin" + cp bin/godot.* $out/bin/godot4${suffix} + + installManPage misc/dist/linux/godot.6 + + mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps} + cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot4${suffix}.desktop" + substituteInPlace "$out/share/applications/org.godotengine.Godot4${suffix}.desktop" \ + --replace "Exec=godot" "Exec=$out/bin/godot4${suffix}" \ + --replace "Godot Engine" "Godot Engine 4" + cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" + cp icon.png "$out/share/icons/godot.png" + '' + + lib.optionalString withMono '' + cp -r bin/GodotSharp/ $out/bin/ + wrapProgram $out/bin/godot4${suffix} \ + --set DOTNET_ROOT ${dotnet-sdk_8} \ + --prefix PATH : "${ + lib.makeBinPath [ + dotnet-sdk_8 + ] + }" + '' + + '' + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/godotengine/godot/releases/tag/${version}"; + description = "Free and Open Source 2D and 3D game engine"; + homepage = "https://godotengine.org"; + license = lib.licenses.mit; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ] ++ lib.optional (!withMono) "i686-linux"; + maintainers = with lib.maintainers; [ + shiryel + corngood + ]; + mainProgram = "godot4${suffix}"; + }; + }; + in -stdenv.mkDerivation rec { - pname = "godot4"; - version = "4.3-stable"; - commitHash = "77dcf97d82cbfe4e4615475fa52ca03da645dbd8"; - - src = fetchFromGitHub { - owner = "godotengine"; - repo = "godot"; - rev = commitHash; - hash = "sha256-v2lBD3GEL8CoIwBl3UoLam0dJxkLGX0oneH6DiWkEsM="; - }; - - outputs = [ - "out" - "man" - ]; - separateDebugInfo = true; - - # Set the build name which is part of the version. In official downloads, this - # is set to 'official'. When not specified explicitly, it is set to - # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack - # etc.) usually set this to their name as well. - # - # See also 'methods.py' in the Godot repo and 'build' in - # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info - BUILD_NAME = "nixpkgs"; - - # Required for the commit hash to be included in the version number. - # - # `methods.py` reads the commit hash from `.git/HEAD` and manually follows - # refs. Since we just write the hash directly, there is no need to emulate any - # other parts of the .git directory. - # - # See also 'hash' in - # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info - preConfigure = '' - mkdir -p .git - echo ${commitHash} > .git/HEAD - ''; - - # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct - sconsFlags = mkSconsFlagsFromAttrSet { - # Options from 'SConstruct' - precision = withPrecision; # Floating-point precision level - production = true; # Set defaults to build Godot for use in production - platform = withPlatform; - target = withTarget; - debug_symbols = true; - - # Options from 'platform/linuxbsd/detect.py' - dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings - fontconfig = withFontconfig; # Use fontconfig for system fonts support - pulseaudio = withPulseaudio; # Use PulseAudio - speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support - touch = withTouch; # Enable touch events - udev = withUdev; # Use udev for gamepad connection callbacks - wayland = withWayland; # Compile with Wayland support - x11 = withX11; # Compile with X11 support - }; - - enableParallelBuilding = true; - - strictDeps = true; - - depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.stdenv.cc - pkg-config - ]; - - nativeBuildInputs = [ - autoPatchelfHook - installShellFiles - pkg-config - scons - ] ++ lib.optionals withWayland [ wayland-scanner ]; - - runtimeDependencies = - [ - alsa-lib - libGL - vulkan-loader - ] - ++ lib.optionals withX11 [ - libX11 - libXcursor - libXext - libXfixes - libXi - libXinerama - libxkbcommon - libXrandr - libXrender - ] - ++ lib.optionals withWayland [ - libdecor - wayland - ] - ++ lib.optionals withDbus [ - dbus - dbus.lib - ] - ++ lib.optionals withFontconfig [ - fontconfig - fontconfig.lib - ] - ++ lib.optionals withPulseaudio [ libpulseaudio ] - ++ lib.optionals withSpeechd [ speechd-minimal ] - ++ lib.optionals withUdev [ udev ]; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - cp bin/godot.* $out/bin/godot4 - - installManPage misc/dist/linux/godot.6 - - mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps} - cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot4.desktop" - substituteInPlace "$out/share/applications/org.godotengine.Godot4.desktop" \ - --replace "Exec=godot" "Exec=$out/bin/godot4" \ - --replace "Godot Engine" "Godot Engine 4" - cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" - cp icon.png "$out/share/icons/godot.png" - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/godotengine/godot/releases/tag/${version}"; - description = "Free and Open Source 2D and 3D game engine"; - homepage = "https://godotengine.org"; - license = lib.licenses.mit; - platforms = [ - "i686-linux" - "x86_64-linux" - "aarch64-linux" - ]; - maintainers = with lib.maintainers; [ - shiryel - ]; - mainProgram = "godot4"; - }; -} +stdenv.mkDerivation ( + finalAttrs: + if withMono then + dotnetCorePackages.addNuGetDeps { + nugetDeps = ./deps.nix; + overrideFetchAttrs = old: rec { + runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms; + buildInputs = + old.buildInputs + ++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk_8.targetPackages)); + }; + } attrs finalAttrs + else + attrs +) diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/by-name/go/godspeed/package.nix similarity index 100% rename from pkgs/tools/networking/godspeed/default.nix rename to pkgs/by-name/go/godspeed/package.nix diff --git a/pkgs/tools/misc/godu/default.nix b/pkgs/by-name/go/godu/package.nix similarity index 100% rename from pkgs/tools/misc/godu/default.nix rename to pkgs/by-name/go/godu/package.nix diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/by-name/go/goeland/package.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/goeland/default.nix rename to pkgs/by-name/go/goeland/package.nix diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/by-name/go/gof5/package.nix similarity index 100% rename from pkgs/tools/networking/gof5/default.nix rename to pkgs/by-name/go/gof5/package.nix diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/by-name/go/goffice/package.nix similarity index 100% rename from pkgs/development/libraries/goffice/default.nix rename to pkgs/by-name/go/goffice/package.nix diff --git a/pkgs/tools/networking/goflow/default.nix b/pkgs/by-name/go/goflow/package.nix similarity index 100% rename from pkgs/tools/networking/goflow/default.nix rename to pkgs/by-name/go/goflow/package.nix diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/by-name/go/gofu/package.nix similarity index 100% rename from pkgs/applications/misc/gofu/default.nix rename to pkgs/by-name/go/gofu/package.nix diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/by-name/go/gogetdoc/package.nix similarity index 100% rename from pkgs/development/tools/gogetdoc/default.nix rename to pkgs/by-name/go/gogetdoc/package.nix diff --git a/pkgs/games/gogui/default.nix b/pkgs/by-name/go/gogui/package.nix similarity index 100% rename from pkgs/games/gogui/default.nix rename to pkgs/by-name/go/gogui/package.nix diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/by-name/go/gohai/package.nix similarity index 100% rename from pkgs/tools/system/gohai/default.nix rename to pkgs/by-name/go/gohai/package.nix diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/by-name/go/gohufont/package.nix similarity index 100% rename from pkgs/data/fonts/gohufont/default.nix rename to pkgs/by-name/go/gohufont/package.nix diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/by-name/go/goimapnotify/package.nix similarity index 100% rename from pkgs/tools/networking/goimapnotify/default.nix rename to pkgs/by-name/go/goimapnotify/package.nix diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/by-name/go/goimports-reviser/package.nix similarity index 100% rename from pkgs/development/tools/goimports-reviser/default.nix rename to pkgs/by-name/go/goimports-reviser/package.nix diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/by-name/go/gojsontoyaml/package.nix similarity index 100% rename from pkgs/development/tools/gojsontoyaml/default.nix rename to pkgs/by-name/go/gojsontoyaml/package.nix diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/by-name/go/gokart/package.nix similarity index 100% rename from pkgs/development/tools/gokart/default.nix rename to pkgs/by-name/go/gokart/package.nix diff --git a/pkgs/development/misc/gokrazy/default.nix b/pkgs/by-name/go/gokrazy/package.nix similarity index 100% rename from pkgs/development/misc/gokrazy/default.nix rename to pkgs/by-name/go/gokrazy/package.nix diff --git a/pkgs/by-name/go/goku/package.nix b/pkgs/by-name/go/goku/package.nix new file mode 100644 index 000000000000..70f76836709d --- /dev/null +++ b/pkgs/by-name/go/goku/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenvNoCC, + fetchurl, + unzip, + joker, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "goku"; + version = "0.7.2"; + + src = + if stdenvNoCC.hostPlatform.isAarch64 then + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; + hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM="; + } + else + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku.zip"; + hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; + }; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ joker ]; + + sourceRoot = if stdenvNoCC.hostPlatform.isAarch64 then "goku" else "."; + + passthru.updateScript = nix-update-script { }; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + chmod +x {goku,gokuw} + cp {goku,gokuw} "$out/bin" + runHook postInstall + ''; + + meta = { + description = "Karabiner configurator"; + homepage = "https://github.com/yqrashawn/GokuRakuJoudo"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nikitavoloboev ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/by-name/go/golangci-lint-langserver/package.nix similarity index 100% rename from pkgs/development/tools/golangci-lint-langserver/default.nix rename to pkgs/by-name/go/golangci-lint-langserver/package.nix diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/by-name/go/golangci-lint/package.nix similarity index 100% rename from pkgs/development/tools/golangci-lint/default.nix rename to pkgs/by-name/go/golangci-lint/package.nix diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix similarity index 100% rename from pkgs/applications/misc/golden-cheetah-bin/default.nix rename to pkgs/by-name/go/golden-cheetah-bin/package.nix diff --git a/pkgs/development/tools/golines/default.nix b/pkgs/by-name/go/golines/package.nix similarity index 100% rename from pkgs/development/tools/golines/default.nix rename to pkgs/by-name/go/golines/package.nix diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/by-name/go/golint/package.nix similarity index 100% rename from pkgs/development/tools/golint/default.nix rename to pkgs/by-name/go/golint/package.nix diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/pkgs/by-name/go/gom/longer-stress-timeout.patch similarity index 100% rename from pkgs/development/libraries/gom/longer-stress-timeout.patch rename to pkgs/by-name/go/gom/longer-stress-timeout.patch diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/by-name/go/gom/package.nix similarity index 100% rename from pkgs/development/libraries/gom/default.nix rename to pkgs/by-name/go/gom/package.nix diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/by-name/go/gomacro/package.nix similarity index 100% rename from pkgs/development/tools/gomacro/default.nix rename to pkgs/by-name/go/gomacro/package.nix diff --git a/pkgs/tools/security/gomapenum/default.nix b/pkgs/by-name/go/gomapenum/package.nix similarity index 100% rename from pkgs/tools/security/gomapenum/default.nix rename to pkgs/by-name/go/gomapenum/package.nix diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/by-name/go/gomatrix/package.nix similarity index 100% rename from pkgs/applications/misc/gomatrix/default.nix rename to pkgs/by-name/go/gomatrix/package.nix diff --git a/pkgs/tools/misc/gomi/default.nix b/pkgs/by-name/go/gomi/package.nix similarity index 100% rename from pkgs/tools/misc/gomi/default.nix rename to pkgs/by-name/go/gomi/package.nix diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/by-name/go/gomodifytags/package.nix similarity index 100% rename from pkgs/development/tools/gomodifytags/default.nix rename to pkgs/by-name/go/gomodifytags/package.nix diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/by-name/go/gomp/package.nix similarity index 100% rename from pkgs/applications/version-management/gomp/default.nix rename to pkgs/by-name/go/gomp/package.nix diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/by-name/go/gomplate/package.nix similarity index 100% rename from pkgs/development/tools/gomplate/default.nix rename to pkgs/by-name/go/gomplate/package.nix diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/by-name/go/gomuks/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/gomuks/default.nix rename to pkgs/by-name/go/gomuks/package.nix diff --git a/pkgs/servers/gonic/default.nix b/pkgs/by-name/go/gonic/package.nix similarity index 100% rename from pkgs/servers/gonic/default.nix rename to pkgs/by-name/go/gonic/package.nix diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/by-name/go/goocanvasmm2/package.nix similarity index 100% rename from pkgs/development/libraries/goocanvasmm/default.nix rename to pkgs/by-name/go/goocanvasmm2/package.nix diff --git a/pkgs/tools/networking/goodhosts/default.nix b/pkgs/by-name/go/goodhosts/package.nix similarity index 100% rename from pkgs/tools/networking/goodhosts/default.nix rename to pkgs/by-name/go/goodhosts/package.nix diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/by-name/go/goodvibes/package.nix similarity index 100% rename from pkgs/applications/audio/goodvibes/default.nix rename to pkgs/by-name/go/goodvibes/package.nix diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 92d46adbd7d6..65160701b52a 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; pnpmDeps = pnpm'.fetchDeps { diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/by-name/go/goofys/package.nix similarity index 100% rename from pkgs/tools/filesystems/goofys/default.nix rename to pkgs/by-name/go/goofys/package.nix diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/by-name/go/google-amber/package.nix similarity index 100% rename from pkgs/tools/graphics/amber/default.nix rename to pkgs/by-name/go/google-amber/package.nix diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix similarity index 100% rename from pkgs/development/tools/google-app-engine-go-sdk/default.nix rename to pkgs/by-name/go/google-app-engine-go-sdk/package.nix diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/by-name/go/google-authenticator/package.nix similarity index 100% rename from pkgs/os-specific/linux/google-authenticator/default.nix rename to pkgs/by-name/go/google-authenticator/package.nix diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index d491ef1ce7ac..28890bccec41 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "130.0.6723.69"; + version = "130.0.6723.91"; 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-MhLaPV2Ht4ZYsmrs4HWYtv/IFqD/mQVZwA/IVnZfND8="; + hash = "sha256-30RwtLlU4GhqDhbHTZMqrih77d2yOFeIBiOG3CugvLo="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "130.0.6723.70"; + version = "130.0.6723.92"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acl5a2wdujowx65sbvjgokb6thqq_130.0.6723.70/GoogleChrome-130.0.6723.70.dmg"; - hash = "sha256-Ft+kBhYnnMpsRsCmmXp9rgyGuwCAb9WW6u5z6UJzh7o="; + url = "http://dl.google.com/release2/chrome/adlhlvvxwq7oxwh4d3ghghzdnhaq_130.0.6723.92/GoogleChrome-130.0.6723.92.dmg"; + hash = "sha256-R1YCj0Ou+pyGUCxh6ATTTPIb5qUTnGROZypuAh8SlAg="; }; dontPatch = true; diff --git a/pkgs/development/tools/google-clasp/default.nix b/pkgs/by-name/go/google-clasp/package.nix similarity index 100% rename from pkgs/development/tools/google-clasp/default.nix rename to pkgs/by-name/go/google-clasp/package.nix diff --git a/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix b/pkgs/by-name/go/google-cloud-bigtable-tool/package.nix similarity index 100% rename from pkgs/tools/misc/google-cloud-bigtable-tool/default.nix rename to pkgs/by-name/go/google-cloud-bigtable-tool/package.nix diff --git a/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch b/pkgs/by-name/go/google-cloud-cpp/hardcode-googleapis-path.patch similarity index 100% rename from pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch rename to pkgs/by-name/go/google-cloud-cpp/hardcode-googleapis-path.patch diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/google-cloud-cpp/default.nix rename to pkgs/by-name/go/google-cloud-cpp/package.nix diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix new file mode 100644 index 000000000000..c7a4f328fa0d --- /dev/null +++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "google-cloud-sql-proxy"; + version = "2.14.0"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "cloud-sql-proxy"; + rev = "v${version}"; + hash = "sha256-SM74Z9+oo472BIM/moSj9zyZh2HefkAkqoC4L1tu+X8="; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-Ao/kSC4gcsZpRaSu7FhqJs1ulUbfrzOpO4CMropCywo="; + + checkFlags = [ + "-short" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Utility for ensuring secure connections to Google Cloud SQL instances"; + longDescription = '' + The Cloud SQL Auth Proxy is a utility for ensuring secure connections to your Cloud SQL instances. + It provides IAM authorization, allowing you to control who can connect to your instance through IAM permissions, + and TLS 1.3 encryption, without having to manage certificates. + See the [Connecting Overview](https://cloud.google.com/sql/docs/mysql/connect-overview) page for more information + on connecting to a Cloud SQL instance, or the [About the Proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy) + page for details on how the Cloud SQL Proxy works. + ''; + homepage = "https://github.com/GoogleCloudPlatform/cloud-sql-proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ nicknovitski totoroot ]; + mainProgram = "cloud-sql-proxy"; + }; +} diff --git a/pkgs/data/icons/google-cursor/default.nix b/pkgs/by-name/go/google-cursor/package.nix similarity index 100% rename from pkgs/data/icons/google-cursor/default.nix rename to pkgs/by-name/go/google-cursor/package.nix diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/by-name/go/google-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/google-fonts/default.nix rename to pkgs/by-name/go/google-fonts/package.nix diff --git a/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch b/pkgs/by-name/go/google-guest-agent/disable-etc-mutation.patch similarity index 100% rename from pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch rename to pkgs/by-name/go/google-guest-agent/disable-etc-mutation.patch diff --git a/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch b/pkgs/by-name/go/google-guest-agent/fix-paths.patch similarity index 100% rename from pkgs/tools/virtualization/google-guest-agent/fix-paths.patch rename to pkgs/by-name/go/google-guest-agent/fix-paths.patch diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/by-name/go/google-guest-agent/package.nix similarity index 100% rename from pkgs/tools/virtualization/google-guest-agent/default.nix rename to pkgs/by-name/go/google-guest-agent/package.nix diff --git a/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch b/pkgs/by-name/go/google-guest-configs/fix-paths.patch similarity index 100% rename from pkgs/tools/virtualization/google-guest-configs/fix-paths.patch rename to pkgs/by-name/go/google-guest-configs/fix-paths.patch diff --git a/pkgs/tools/virtualization/google-guest-configs/default.nix b/pkgs/by-name/go/google-guest-configs/package.nix similarity index 100% rename from pkgs/tools/virtualization/google-guest-configs/default.nix rename to pkgs/by-name/go/google-guest-configs/package.nix diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix similarity index 100% rename from pkgs/tools/virtualization/google-guest-oslogin/default.nix rename to pkgs/by-name/go/google-guest-oslogin/package.nix diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/by-name/go/google-java-format/package.nix similarity index 100% rename from pkgs/development/tools/google-java-format/default.nix rename to pkgs/by-name/go/google-java-format/package.nix diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/by-name/go/goose/package.nix similarity index 100% rename from pkgs/tools/misc/goose/default.nix rename to pkgs/by-name/go/goose/package.nix diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/by-name/go/gopacked/package.nix similarity index 100% rename from pkgs/applications/misc/gopacked/default.nix rename to pkgs/by-name/go/gopacked/package.nix diff --git a/pkgs/development/tools/misc/gopatch/default.nix b/pkgs/by-name/go/gopatch/package.nix similarity index 100% rename from pkgs/development/tools/misc/gopatch/default.nix rename to pkgs/by-name/go/gopatch/package.nix diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/by-name/go/goperf/package.nix similarity index 100% rename from pkgs/development/tools/goperf/default.nix rename to pkgs/by-name/go/goperf/package.nix diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/by-name/go/gopher/package.nix similarity index 100% rename from pkgs/applications/networking/gopher/gopher/default.nix rename to pkgs/by-name/go/gopher/package.nix diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/by-name/go/gophernotes/package.nix similarity index 100% rename from pkgs/applications/editors/gophernotes/default.nix rename to pkgs/by-name/go/gophernotes/package.nix diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/by-name/go/gopkgs/package.nix similarity index 100% rename from pkgs/development/tools/gopkgs/default.nix rename to pkgs/by-name/go/gopkgs/package.nix diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/by-name/go/gopro/package.nix similarity index 100% rename from pkgs/tools/video/gopro/default.nix rename to pkgs/by-name/go/gopro/package.nix diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/by-name/go/gops/package.nix similarity index 100% rename from pkgs/development/tools/gops/default.nix rename to pkgs/by-name/go/gops/package.nix diff --git a/pkgs/tools/system/gopsuinfo/no_bin_install.patch b/pkgs/by-name/go/gopsuinfo/no_bin_install.patch similarity index 100% rename from pkgs/tools/system/gopsuinfo/no_bin_install.patch rename to pkgs/by-name/go/gopsuinfo/no_bin_install.patch diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/by-name/go/gopsuinfo/package.nix similarity index 100% rename from pkgs/tools/system/gopsuinfo/default.nix rename to pkgs/by-name/go/gopsuinfo/package.nix diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/by-name/go/gore/package.nix similarity index 100% rename from pkgs/development/tools/gore/default.nix rename to pkgs/by-name/go/gore/package.nix diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index 13742e1b8c4b..31fea1ab46e7 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.3.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "goreleaser"; - repo = pname; + repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-YKcduPxcXU1Ixexr/DxeVRfLxYdHNFcGNLbBiH6cIUU="; + hash = "sha256-c9fdv+lvUPMVzWzliT/ss8X/OD8s1UX22ee2bo77YwY="; }; - vendorHash = "sha256-3gC2wZz3t6ObqAJ2g80kTrW2OEAyBptdqmN7cQKqZ/w="; + vendorHash = "sha256-pU64v3qQUX0T0X+AOdE/1McKMA4uOiTmGfZ87FUYl7c="; ldflags = [ "-s" @@ -28,6 +28,10 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; + subPackages = [ + "." + ]; + # tests expect the source files to be a build repo doCheck = false; @@ -56,10 +60,8 @@ buildGoModule rec { description = "Deliver Go binaries as fast and easily as possible"; homepage = "https://goreleaser.com"; maintainers = with maintainers; [ - c0deaddict sarcasticadmin techknowlogick - developer-guy caarlos0 ]; license = licenses.mit; diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/by-name/go/goreplay/package.nix similarity index 100% rename from pkgs/tools/networking/goreplay/default.nix rename to pkgs/by-name/go/goreplay/package.nix diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/by-name/go/goresym/package.nix similarity index 100% rename from pkgs/development/tools/goresym/default.nix rename to pkgs/by-name/go/goresym/package.nix diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/by-name/go/gorilla-bin/package.nix similarity index 100% rename from pkgs/tools/security/gorilla-bin/default.nix rename to pkgs/by-name/go/gorilla-bin/package.nix diff --git a/pkgs/tools/llm/gorilla-cli/default.nix b/pkgs/by-name/go/gorilla-cli/package.nix similarity index 100% rename from pkgs/tools/llm/gorilla-cli/default.nix rename to pkgs/by-name/go/gorilla-cli/package.nix diff --git a/pkgs/by-name/go/gortr/package.nix b/pkgs/by-name/go/gortr/package.nix new file mode 100644 index 000000000000..4adada533575 --- /dev/null +++ b/pkgs/by-name/go/gortr/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "gortr"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "v${version}"; + hash = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + meta = { + description = "RPKI-to-Router server used at Cloudflare"; + homepage = "https://github.com/cloudflare/gortr/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ stv0g ]; + }; +} diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/by-name/go/gosec/package.nix similarity index 100% rename from pkgs/development/tools/gosec/default.nix rename to pkgs/by-name/go/gosec/package.nix diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/by-name/go/gosh/package.nix similarity index 100% rename from pkgs/tools/security/gosh/default.nix rename to pkgs/by-name/go/gosh/package.nix diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/by-name/go/gospider/package.nix similarity index 100% rename from pkgs/tools/security/gospider/default.nix rename to pkgs/by-name/go/gospider/package.nix diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/by-name/go/gossa/package.nix similarity index 100% rename from pkgs/applications/networking/gossa/default.nix rename to pkgs/by-name/go/gossa/package.nix diff --git a/pkgs/by-name/go/gossip/Cargo.lock b/pkgs/by-name/go/gossip/Cargo.lock index 872badcb4fd2..b2b5029a6766 100644 --- a/pkgs/by-name/go/gossip/Cargo.lock +++ b/pkgs/by-name/go/gossip/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.25" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -95,9 +95,9 @@ dependencies = [ [[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", ] @@ -135,7 +135,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -148,7 +148,7 @@ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "serde", "version_check", @@ -164,6 +164,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 = "alloc-no-stdlib" version = "2.0.4" @@ -192,7 +198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -229,31 +235,47 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", "x11rb", ] [[package]] -name = "arrayref" -version = "0.3.7" +name = "arg_enum_proc_macro" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -288,22 +310,21 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +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-compression" -version = "0.4.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "flate2", @@ -315,13 +336,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -360,17 +381,17 @@ dependencies = [ [[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 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.3", "rustix 0.38.34", "slab", "tracing", @@ -388,12 +409,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -428,17 +449,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -451,19 +472,19 @@ dependencies = [ [[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.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -522,15 +543,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 = "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", @@ -555,9 +599,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[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 = "base64ct" @@ -592,18 +636,18 @@ 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", + "itertools 0.12.1", "lazy_static", "lazycell", "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -661,7 +705,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ - "hex-conservative 0.2.0", + "hex-conservative 0.2.1", ] [[package]] @@ -672,13 +716,19 @@ 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" dependencies = [ "serde", ] +[[package]] +name = "bitstream-io" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" + [[package]] name = "block" version = "0.1.6" @@ -718,7 +768,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" dependencies = [ - "objc-sys 0.3.3", + "objc-sys 0.3.5", ] [[package]] @@ -742,26 +792,32 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.5.1" +name = "block2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "brotli" -version = "4.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -770,14 +826,20 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "3.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] +[[package]] +name = "built" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" + [[package]] name = "bumpalo" version = "3.16.0" @@ -786,22 +848,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -811,10 +873,16 @@ 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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "calloop" @@ -822,9 +890,23 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", - "polling 3.7.0", + "polling 3.7.3", + "rustix 0.38.34", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling 3.7.3", "rustix 0.38.34", "slab", "thiserror", @@ -836,7 +918,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "calloop", + "calloop 0.12.4", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", "rustix 0.38.34", "wayland-backend", "wayland-client", @@ -853,13 +947,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -877,6 +970,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" @@ -922,12 +1025,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - [[package]] name = "chrono" version = "0.4.38" @@ -939,7 +1036,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -955,20 +1052,20 @@ dependencies = [ [[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", - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -982,36 +1079,6 @@ dependencies = [ "cc", ] -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "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 = "codespan-reporting" version = "0.11.1" @@ -1071,9 +1138,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", ] @@ -1093,7 +1160,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "tiny-keccak", ] @@ -1156,6 +1223,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40b0cbe828edee956fb81da4df1c5c515b86401b0720740977a952fec794b5e3" +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -1167,9 +1243,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", ] @@ -1204,9 +1280,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" @@ -1233,12 +1309,13 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1246,9 +1323,9 @@ dependencies = [ [[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 = "data-url" @@ -1256,6 +1333,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + [[package]] name = "deranged" version = "0.3.11" @@ -1278,15 +1361,15 @@ 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 = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -1301,13 +1384,12 @@ dependencies = [ ] [[package]] -name = "directories-next" -version = "2.0.0" +name = "directories" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", ] [[package]] @@ -1331,17 +1413,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dispatch" version = "0.2.0" @@ -1354,14 +1425,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.5", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -1383,21 +1454,22 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ "bytemuck", + "emath", "serde", ] [[package]] name = "eframe" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ + "ahash 0.8.11", "bytemuck", - "cocoa", - "directories-next", + "directories", "document-features", "egui", "egui-wgpu", @@ -1409,16 +1481,17 @@ dependencies = [ "image", "js-sys", "log", - "objc", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", "percent-encoding", "pollster", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "ron", "serde", "static_assertions", - "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1430,11 +1503,12 @@ dependencies = [ [[package]] name = "egui" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ "accesskit", "ahash 0.8.11", + "emath", "epaint", "log", "nohash-hasher", @@ -1445,13 +1519,13 @@ dependencies = [ [[package]] name = "egui-video" version = "0.1.0" -source = "git+https://github.com/mikedilger/egui-video?rev=97f58f88dfe912697393567830d0751676492a89#97f58f88dfe912697393567830d0751676492a89" +source = "git+https://github.com/mikedilger/egui-video?rev=2485b2b09372a1e254a4f2c51edab3fc62d79c3a#2485b2b09372a1e254a4f2c51edab3fc62d79c3a" dependencies = [ "anyhow", "chrono", "egui", "ffmpeg-next", - "itertools", + "itertools 0.10.5", "parking_lot", "ringbuf", "sdl2", @@ -1461,9 +1535,10 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ + "ahash 0.8.11", "bytemuck", "document-features", "egui", @@ -1478,14 +1553,15 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ "accesskit_winit", + "ahash 0.8.11", "arboard", "egui", "log", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "serde", "smithay-clipboard", "web-time", @@ -1495,9 +1571,10 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ + "ahash 0.8.11", "egui", "enum-map", "log", @@ -1508,9 +1585,10 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ + "ahash 0.8.11", "bytemuck", "egui", "glow", @@ -1523,14 +1601,14 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ "bytemuck", "serde", @@ -1563,14 +1641,14 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[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", @@ -1578,30 +1656,30 @@ 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.60", + "syn 2.0.72", ] [[package]] name = "enumn" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "epaint" -version = "0.26.2" -source = "git+https://github.com/bu5hm4nn/egui?rev=63dde4c9b311da0cae0cb9f9465bf7273227be6c#63dde4c9b311da0cae0cb9f9465bf7273227be6c" +version = "0.28.1" +source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" dependencies = [ "ab_glyph", "ahash 0.8.11", @@ -1622,9 +1700,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", @@ -1655,20 +1733,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" 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", @@ -1677,21 +1744,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 5.3.1", "pin-project-lite", ] @@ -1711,12 +1768,6 @@ dependencies = [ "zune-inflate", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fancy-regex" version = "0.11.0" @@ -1738,9 +1789,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" @@ -1753,19 +1804,19 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "7.0.2" -source = "git+https://github.com/mikedilger/rust-ffmpeg.git?rev=6c51d6d6cdf7ca13a5600ba7eb9c6f4876b84344#6c51d6d6cdf7ca13a5600ba7eb9c6f4876b84344" +version = "7.0.4" +source = "git+https://github.com/mikedilger/rust-ffmpeg.git?rev=8974928ecf53e69777f85ee5c8780c907b7aa0a4#8974928ecf53e69777f85ee5c8780c907b7aa0a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "ffmpeg-sys-next", "libc", ] [[package]] name = "ffmpeg-sys-next" -version = "7.0.0" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972a460dd8e901b737ce0482bf71a837e1751e3dd7c8f8b0a4ead808e7f174a5" +checksum = "db1b7546e70609ead8c06b2b4c618a1ba352364675f81608f431dd4f321fe3f1" dependencies = [ "bindgen", "cc", @@ -1777,21 +1828,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -1820,11 +1871,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.19.0", + "roxmltree 0.20.0", ] [[package]] @@ -1841,6 +1892,20 @@ dependencies = [ "ttf-parser 0.19.2", ] +[[package]] +name = "fontdb" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.24.1", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -1868,7 +1933,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -1892,6 +1957,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + [[package]] name = "futures" version = "0.3.30" @@ -1961,7 +2032,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1976,7 +2047,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -2042,9 +2113,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -2073,9 +2144,9 @@ 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 = "gl_generator" @@ -2112,7 +2183,7 @@ version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases", "cgl", "core-foundation", @@ -2121,7 +2192,7 @@ dependencies = [ "glutin_glx_sys", "glutin_wgl_sys", "icrate", - "libloading 0.8.3", + "libloading 0.8.5", "objc2 0.4.1", "once_cell", "raw-window-handle 0.5.2", @@ -2173,7 +2244,7 @@ dependencies = [ [[package]] name = "gossip" -version = "0.11.3" +version = "0.12.0" dependencies = [ "bech32 0.11.0", "chrono", @@ -2182,7 +2253,6 @@ dependencies = [ "egui-winit", "egui_extras", "gossip-lib", - "gossip-relay-picker", "humansize", "image", "lazy_static", @@ -2190,7 +2260,7 @@ dependencies = [ "nostr-types", "paste", "qrcode", - "resvg", + "resvg 0.35.0", "rpassword", "sdl2", "serde", @@ -2201,29 +2271,25 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "usvg", + "usvg 0.35.0", "zeroize", ] [[package]] name = "gossip-lib" -version = "0.11.3" +version = "0.12.0" dependencies = [ - "async-recursion", - "async-trait", - "base64 0.22.0", + "base64 0.22.1", "bech32 0.11.0", "dashmap", "dirs", "encoding_rs", - "fallible-iterator", "filetime", "futures", "futures-util", - "gossip-relay-picker", "heed", "hex", - "http 1.1.0", + "http", "image", "kamadak-exif", "lazy_static", @@ -2236,44 +2302,33 @@ dependencies = [ "rand 0.8.5", "regex", "reqwest", - "resvg", + "resvg 0.43.0", "rhai", "sdl2", "serde", "serde_json", "sha2", "speedy", + "tempdir", "textnonce", - "tiny-skia 0.10.0", + "tiny-skia 0.11.4", "tokio", "tokio-tungstenite", "tracing", "tungstenite", "url", - "usvg", + "usvg 0.43.0", + "watcher", "zeroize", ] -[[package]] -name = "gossip-relay-picker" -version = "0.2.0-unstable" -source = "git+https://github.com/mikedilger/gossip-relay-picker?rev=425eff2cc99d2f816b641306a28d3ae7f3756535#425eff2cc99d2f816b641306a28d3ae7f3756535" -dependencies = [ - "async-trait", - "dashmap", - "nostr-types", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "gpu-alloc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2283,7 +2338,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2301,41 +2356,22 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", + "bitflags 2.6.0", ] [[package]] @@ -2359,9 +2395,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" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -2373,22 +2409,28 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.7.4", + "libloading 0.8.5", "thiserror", "widestring", "winapi", ] [[package]] -name = "heed" -version = "0.20.0" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a300b0deeb2957162d7752b0f063b3be1c88333af5bb4e7a57d8fb3716f50b" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "heed" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "heed-traits", "heed-types", @@ -2409,9 +2451,9 @@ checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" [[package]] name = "heed-types" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3" +checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114" dependencies = [ "bincode", "byteorder", @@ -2426,6 +2468,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" @@ -2434,15 +2482,15 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" +checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" [[package]] name = "hex-conservative" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1aa273bf451e37ed35ced41c71a5e2a4e29064afb104158f2514bcd71c2c986" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" dependencies = [ "arrayvec", ] @@ -2486,17 +2534,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -2510,26 +2547,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 0.2.12", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humansize" @@ -2542,53 +2585,76 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http 0.2.12", + "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 0.2.12", + "http", "hyper", - "rustls 0.21.11", + "hyper-util", + "rustls", + "rustls-native-certs", + "rustls-pki-types", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", + "tower-service", + "webpki-roots", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2637,20 +2703,35 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif 0.13.1", - "jpeg-decoder", + "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]] @@ -2660,13 +2741,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] -name = "indexmap" -version = "2.2.6" +name = "imagesize" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indexmap" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2681,20 +2774,31 @@ 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 = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -2714,6 +2818,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2744,9 +2857,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2756,9 +2869,6 @@ name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -2785,7 +2895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", ] @@ -2805,10 +2915,20 @@ dependencies = [ ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "kurbo" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" +dependencies = [ + "arrayvec", + "smallvec", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2824,9 +2944,20 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[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" @@ -2840,12 +2971,12 @@ dependencies = [ [[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.5", + "windows-targets 0.48.5", ] [[package]] @@ -2860,7 +2991,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -2871,8 +3002,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -2881,7 +3013,7 @@ version = "0.0.123-beta" source = "git+https://github.com/mikedilger/rust-lightning?rev=7a62cb4106d449bc4d1724920b73918d501bb3a9#7a62cb4106d449bc4d1724920b73918d501bb3a9" dependencies = [ "bitcoin", - "hex-conservative 0.1.1", + "hex-conservative 0.1.2", "musig2", ] @@ -2896,12 +3028,6 @@ dependencies = [ "secp256k1 0.27.0", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2925,9 +3051,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[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 = "litrs" @@ -2937,9 +3063,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lmdb-master-sys" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9048db3a58c0732d7236abc4909058f9d2708cfb6d7d047eb895fddec6419a" +checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24" dependencies = [ "cc", "doxygen-rs", @@ -2958,9 +3084,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" @@ -2990,10 +3125,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" @@ -3056,11 +3200,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3093,9 +3237,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", @@ -3103,13 +3247,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3128,18 +3273,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", "indexmap", "log", "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3148,11 +3294,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3170,13 +3315,13 @@ 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", "num_enum", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "thiserror", ] @@ -3195,12 +3340,18 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + [[package]] name = "nip44" version = "0.1.0" source = "git+https://github.com/mikedilger/nip44?rev=a55cd3850634d7e462c107a37a068f829670d6a2#a55cd3850634d7e462c107a37a068f829670d6a2" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "chacha20", "constant_time_eq", "hkdf", @@ -3240,21 +3391,27 @@ dependencies = [ ] [[package]] -name = "normpath" -version = "1.2.0" +name = "noop_proc_macro" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "nostr-types" version = "0.8.0-unstable" -source = "git+https://github.com/mikedilger/nostr-types?rev=d580f42cb978f44388b85638230e0becfe212e7a#d580f42cb978f44388b85638230e0becfe212e7a" +source = "git+https://github.com/mikedilger/nostr-types?rev=013a1657258d786196cc0b63bf7af8a0a588d004#013a1657258d786196cc0b63bf7af8a0a588d004" dependencies = [ "aes", - "base64 0.22.0", + "base64 0.22.1", "bech32 0.11.0", "cbc", "chacha20", @@ -3295,6 +3452,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -3302,10 +3469,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] -name = "num-traits" -version = "0.2.18" +name = "num-derive" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -3316,29 +3514,29 @@ 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", ] [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -3348,18 +3546,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", ] [[package]] @@ -3370,9 +3556,9 @@ checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -3391,10 +3577,60 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ - "objc-sys 0.3.3", + "objc-sys 0.3.5", "objc2-encode 3.0.0", ] +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc2-encode" version = "2.0.0-pre.2" @@ -3411,28 +3647,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-encode" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc2-metal" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "objc", + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -3451,11 +3712,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[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.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3472,7 +3733,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -3483,9 +3744,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -3526,11 +3787,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.20.0", + "ttf-parser 0.24.1", ] [[package]] @@ -3551,9 +3812,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3567,9 +3828,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3585,9 +3846,9 @@ dependencies = [ [[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 = "pbkdf2" @@ -3637,7 +3898,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -3646,7 +3907,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3655,6 +3916,26 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -3669,12 +3950,12 @@ 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 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -3686,14 +3967,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap", - "line-wrap", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -3729,17 +4009,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3767,9 +4047,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -3798,9 +4081,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3810,6 +4093,19 @@ 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" @@ -3822,22 +4118,85 @@ dependencies = [ [[package]] name = "qrcode" -version = "0.12.0" -source = "git+https://github.com/mikedilger/qrcode-rust?rev=519b77b3efa3f84961169b47d3de08c5ddd86548#519b77b3efa3f84961169b47d3de08c5ddd86548" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" dependencies = [ - "checked_int_cast", "image", ] [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -3847,6 +4206,19 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + [[package]] name = "rand" version = "0.7.3" @@ -3891,6 +4263,21 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + [[package]] name = "rand_core" version = "0.5.1" @@ -3906,7 +4293,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", ] [[package]] @@ -3918,6 +4305,55 @@ dependencies = [ "rand_core 0.5.1", ] +[[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 0.8.5", + "rand_chacha 0.3.1", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rgb", +] + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -3926,9 +4362,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -3956,6 +4392,15 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -3976,11 +4421,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3989,21 +4434,21 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "libredox 0.1.3", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" 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]] @@ -4017,13 +4462,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]] @@ -4034,9 +4479,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 = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] [[package]] name = "renderdoc-sys" @@ -4046,22 +4500,22 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", - "http 0.2.12", + "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4070,24 +4524,25 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.11", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", + "quinn", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.4", + "webpki-roots", "winreg", ] @@ -4103,28 +4558,45 @@ dependencies = [ "pico-args", "png", "rgb", - "svgtypes", + "svgtypes 0.11.0", "tiny-skia 0.10.0", - "usvg", + "usvg 0.35.0", +] + +[[package]] +name = "resvg" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" +dependencies = [ + "gif 0.13.1", + "image-webp", + "log", + "pico-args", + "rgb", + "svgtypes 0.15.1", + "tiny-skia 0.11.4", + "usvg 0.43.0", + "zune-jpeg", ] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "0f86ae463694029097b846d8f99fd5536740602ae00022c0c50c5600720b2f71" dependencies = [ "bytemuck", ] [[package]] name = "rhai" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7d88770120601ba1e548bb6bc2a05019e54ff01b51479e38e64ec3b59d4759" +checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702" dependencies = [ "ahash 0.8.11", - "bitflags 2.5.0", + "bitflags 2.6.0", "instant", "num-traits", "once_cell", @@ -4136,13 +4608,13 @@ dependencies = [ [[package]] name = "rhai_codegen" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59aecf17969c04b9c0c5d21f6bc9da9fec9dd4980e64d1871443a476589d8c86" +checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -4153,7 +4625,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -4176,7 +4648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -4192,9 +4664,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rpassword" @@ -4219,9 +4691,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-hash" @@ -4229,6 +4701,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" @@ -4258,59 +4736,35 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.3", + "rustls-webpki", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.2", + "rustls-pemfile", "rustls-pki-types", "schannel", "security-framework", @@ -4318,44 +4772,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -4364,9 +4799,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" @@ -4378,17 +4813,35 @@ dependencies = [ "bytemuck", "smallvec", "ttf-parser 0.18.1", - "unicode-bidi-mirroring", - "unicode-ccc", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", "unicode-general-category", "unicode-script", ] [[package]] -name = "ryu" -version = "1.0.17" +name = "rustybuzz" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "core_maths", + "log", + "smallvec", + "ttf-parser 0.24.1", + "unicode-bidi-mirroring 0.3.0", + "unicode-ccc 0.3.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -4441,33 +4894,24 @@ dependencies = [ "sha2", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", "memmap2 0.9.4", - "smithay-client-toolkit", + "smithay-client-toolkit 0.18.1", "tiny-skia 0.11.4", ] [[package]] name = "sdl2" -version = "0.36.0" -source = "git+https://github.com/Rust-SDL2/rust-sdl2?rev=f2f1e29a416bcc22f2faf411866db2c8d9536308#f2f1e29a416bcc22f2faf411866db2c8d9536308" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b498da7d14d1ad6c839729bd4ad6fc11d90a57583605f3b4df2cd709a9cd380" dependencies = [ "bitflags 1.3.2", "lazy_static", @@ -4477,13 +4921,14 @@ dependencies = [ [[package]] name = "sdl2-sys" -version = "0.36.0" -source = "git+https://github.com/Rust-SDL2/rust-sdl2?rev=f2f1e29a416bcc22f2faf411866db2c8d9536308#f2f1e29a416bcc22f2faf411866db2c8d9536308" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3" dependencies = [ "cfg-if", "cmake", "libc", - "version-compare", + "version-compare 0.1.1", ] [[package]] @@ -4528,11 +4973,11 @@ dependencies = [ [[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", @@ -4541,9 +4986,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", @@ -4551,37 +4996,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" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -4594,7 +5040,16 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", ] [[package]] @@ -4661,6 +5116,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 = "simplecss" version = "0.2.1" @@ -4676,6 +5140,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -4717,9 +5187,9 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.5.0", - "calloop", - "calloop-wayland-source", + "bitflags 2.6.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", "cursor-icon", "libc", "log", @@ -4730,28 +5200,53 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.3", + "wayland-protocols-wlr 0.3.3", "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -4768,9 +5263,9 @@ dependencies = [ [[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", @@ -4794,7 +5289,7 @@ checksum = "658f2ca5276b92c3dfd65fa88316b4e032ace68f88d7570b43967784c0bac5ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -4812,7 +5307,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -4832,9 +5327,9 @@ dependencies = [ [[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 = "svgtypes" @@ -4842,8 +5337,18 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.9.5", + "siphasher 0.3.11", +] + +[[package]] +name = "svgtypes" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" +dependencies = [ + "kurbo 0.11.0", + "siphasher 1.0.1", ] [[package]] @@ -4859,9 +5364,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -4870,9 +5375,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "synchronoise" @@ -4896,7 +5401,7 @@ dependencies = [ "fnv", "once_cell", "plist", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "serde", "serde_derive", "serde_json", @@ -4906,36 +5411,45 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" +name = "system-deps" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare 0.2.0", ] [[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "target-lexicon" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" dependencies = [ - "core-foundation-sys", - "libc", + "rand 0.4.6", + "remove_dir_all", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.2", + "fastrand 2.1.0", + "once_cell", "rustix 0.38.34", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4965,31 +5479,31 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "thread-priority" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599e8e829c2314b750ecade9309ecc6cf9a48c2e62fe25680b6c1d2172463ca3" +checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", "log", @@ -5093,6 +5607,7 @@ dependencies = [ "bytemuck", "cfg-if", "log", + "png", "tiny-skia-path 0.11.4", ] @@ -5120,9 +5635,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", ] @@ -5135,32 +5650,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -5175,63 +5689,67 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.21.11", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", + "rustls", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" dependencies = [ "futures-util", "log", "native-tls", - "rustls 0.22.4", - "rustls-native-certs 0.7.0", + "rustls", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-native-tls", - "tokio-rustls 0.25.0", + "tokio-rustls", "tungstenite", - "webpki-roots 0.26.1", + "webpki-roots", ] [[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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -5241,7 +5759,7 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -5252,9 +5770,43 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5280,7 +5832,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -5342,32 +5894,34 @@ checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http", "httparse", "log", "native-tls", "rand 0.8.5", - "rustls 0.22.4", - "rustls-native-certs 0.7.0", + "rustls", + "rustls-native-certs", "rustls-pki-types", "sha1", "thiserror", - "url", "utf-8", - "webpki-roots 0.26.1", + "webpki-roots", ] [[package]] @@ -5376,7 +5930,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5417,12 +5971,24 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" + [[package]] name = "unicode-ccc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +[[package]] +name = "unicode-ccc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" + [[package]] name = "unicode-general-category" version = "0.6.0" @@ -5444,6 +6010,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + [[package]] name = "unicode-script" version = "0.5.6" @@ -5464,9 +6036,9 @@ 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 = "unicode-xid" @@ -5492,9 +6064,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", @@ -5516,21 +6088,48 @@ dependencies = [ "xmlwriter", ] +[[package]] +name = "usvg" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" +dependencies = [ + "base64 0.22.1", + "data-url 0.3.1", + "flate2", + "fontdb 0.21.0", + "imagesize 0.13.0", + "kurbo 0.11.0", + "log", + "pico-args", + "roxmltree 0.20.0", + "rustybuzz 0.18.0", + "simplecss", + "siphasher 1.0.1", + "strict-num", + "svgtypes 0.15.1", + "tiny-skia-path 0.11.4", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", +] + [[package]] name = "usvg-parser" version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ - "data-url", + "data-url 0.2.0", "flate2", - "imagesize", - "kurbo", + "imagesize 0.12.0", + "kurbo 0.9.5", "log", "roxmltree 0.18.1", "simplecss", - "siphasher", - "svgtypes", + "siphasher 0.3.11", + "svgtypes 0.11.0", "usvg-tree", ] @@ -5540,10 +6139,10 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" dependencies = [ - "fontdb", - "kurbo", + "fontdb 0.14.1", + "kurbo 0.9.5", "log", - "rustybuzz", + "rustybuzz 0.7.0", "unicode-bidi", "unicode-script", "unicode-vo", @@ -5558,7 +6157,7 @@ checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" dependencies = [ "rctree", "strict-num", - "svgtypes", + "svgtypes 0.11.0", "tiny-skia-path 0.10.0", ] @@ -5568,6 +6167,17 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[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" @@ -5587,16 +6197,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] -name = "version_check" -version = "0.9.4" +name = "version-compare" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -5650,7 +6266,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -5684,7 +6300,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5695,11 +6311,20 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +[[package]] +name = "watcher" +version = "0.1.0" +source = "git+https://github.com/mikedilger/watcher?rev=a4e7e70c396bca4630aa0ba0a15d54ea103cb0e9#a4e7e70c396bca4630aa0ba0a15d54ea103cb0e9" +dependencies = [ + "parking_lot", + "tokio", +] + [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", @@ -5711,11 +6336,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "rustix 0.38.34", "wayland-backend", "wayland-scanner", @@ -5727,16 +6352,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ "rustix 0.38.34", "wayland-client", @@ -5749,7 +6374,19 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -5761,10 +6398,10 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -5774,29 +6411,42 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.3", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -5826,32 +6476,27 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.15" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2 0.5.1", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2 0.5.2", + "objc2-foundation", "url", "web-sys", ] [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -5864,19 +6509,20 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" dependencies = [ "arrayvec", "cfg-if", "cfg_aliases", + "document-features", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "smallvec", "static_assertions", "wasm-bindgen", @@ -5889,23 +6535,24 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.4" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" +checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases", "codespan-reporting", + "document-features", "indexmap", "log", "naga", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.1", - "rustc-hash", + "raw-window-handle 0.6.2", + "rustc-hash 1.1.0", "smallvec", "thiserror", "web-sys", @@ -5915,14 +6562,14 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases", "core-graphics-types", @@ -5935,7 +6582,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.7.4", + "libloading 0.8.5", "log", "metal", "naga", @@ -5944,9 +6591,9 @@ dependencies = [ "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -5957,11 +6604,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -5990,11 +6637,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6021,7 +6668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6030,7 +6677,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6079,7 +6726,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6114,18 +6770,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -6142,9 +6798,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6160,9 +6816,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6178,15 +6834,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6202,9 +6858,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6220,9 +6876,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6238,9 +6894,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6256,9 +6912,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -6269,9 +6925,9 @@ dependencies = [ "ahash 0.8.11", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", - "calloop", + "calloop 0.12.4", "cfg_aliases", "core-foundation", "core-graphics", @@ -6288,18 +6944,18 @@ dependencies = [ "orbclient", "percent-encoding", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "redox_syscall 0.3.5", "rustix 0.38.34", "sctk-adwaita", - "smithay-client-toolkit", + "smithay-client-toolkit 0.18.1", "smol_str", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time", @@ -6319,10 +6975,19 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -6341,14 +7006,14 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "once_cell", "rustix 0.38.34", "x11rb-protocol", @@ -6356,24 +7021,24 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "f513f231f0810b04d988f0df4fb16ef0b6b25d23248f2c4b56b074e6b1b0ffe4" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -6382,7 +7047,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -6391,15 +7056,15 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "xmlparser" @@ -6490,29 +7155,36 @@ dependencies = [ [[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 = [ + "byteorder", "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.60", + "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" @@ -6523,6 +7195,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] + [[package]] name = "zvariant" version = "3.15.2" diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index 518539351cd0..5540497e35c8 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -2,7 +2,7 @@ cmake, darwin, fetchFromGitHub, - ffmpeg, + ffmpeg_6, fontconfig, git, lib, @@ -20,28 +20,26 @@ rustPlatform.buildRustPackage rec { pname = "gossip"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "mikedilger"; repo = "gossip"; rev = "refs/tags/v${version}"; - hash = "sha256-ZDpPoGLcI6ModRq0JEcibHerOrPOA3je1uE5yXsLeeg="; + hash = "sha256-mPM5HYPEUQ+cGrJ3G/0pmSN4ZQ9SvSNACJRTkgqTAeY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ecolor-0.26.2" = "sha256-Ih1JbiuUZwK6rYWRSQcP1AJA8NesJJp+EeBtG0azlw0="; - "egui-video-0.1.0" = "sha256-X75gtYMfD/Ogepe0uEulzxAOY1YpkBW6OPhgovv/uCQ="; - "ffmpeg-next-7.0.2" = "sha256-LVdaCbPHHEolcrXk9tPxUJiPNCma7qRl53TPKFijhFA="; - "gossip-relay-picker-0.2.0-unstable" = "sha256-FUhB6ql+H+E6UffWmpwRFzP8N6x+dOX4vdtYdKItjz4="; + "egui-video-0.1.0" = "sha256-mks5wYl9s8AjaEtYx3hjOPoV7g+SbK2sC/cnqsc6sM4="; + "nostr-types-0.8.0-unstable" = "sha256-ewwOmJaGGRZ25xIM+8fGtB3m46MDQ2WpP0fGF6F5yR4="; + "ecolor-0.28.1" = "sha256-X0cUCNBCsWpeoiqbEp8o9QVl29DzIVe9jjNEq9SQ7kM="; + "ffmpeg-next-7.0.4" = "sha256-ED7zY944YLVR9dgRvXuCC2n7szKkPMH8DJX4jVBNRIQ="; + "watcher-0.1.0" = "sha256-SdwmbP8JrhkBbHEzSFALf0dF2T2xHigORizRRoPVblA="; "lightning-0.0.123-beta" = "sha256-gngH0mOC9USzwUGP4bjb1foZAvg6QHuzODv7LG49MsA="; "musig2-0.1.0" = "sha256-++1x7uHHR7KEhl8LF3VywooULiTzKeDu3e+0/c/8p9Y="; "nip44-0.1.0" = "sha256-u2ALoHQrPVNoX0wjJmQ+BYRzIKsi0G5xPbYjgsNZZ7A="; - "nostr-types-0.8.0-unstable" = "sha256-HGXPJrI6+HT/oyAV3bELA0LPu4O0DmmJVr0mDtDVfr4="; - "qrcode-0.12.0" = "sha256-onnoQuMf7faDa9wTGWo688xWbmujgE9RraBialyhyPw="; - "sdl2-0.36.0" = "sha256-dfXrD9LLBGeYyOLE3PruuGGBZ3WaPBfWlwBqP2pp+NY="; }; }; @@ -67,7 +65,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ - ffmpeg + ffmpeg_6 fontconfig libGL libxkbcommon diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/by-name/go/gost/package.nix similarity index 100% rename from pkgs/tools/networking/gost/default.nix rename to pkgs/by-name/go/gost/package.nix diff --git a/pkgs/applications/misc/gostatic/default.nix b/pkgs/by-name/go/gostatic/package.nix similarity index 100% rename from pkgs/applications/misc/gostatic/default.nix rename to pkgs/by-name/go/gostatic/package.nix diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/by-name/go/gosu/package.nix similarity index 100% rename from pkgs/tools/misc/gosu/default.nix rename to pkgs/by-name/go/gosu/package.nix diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/by-name/go/gotags/package.nix similarity index 100% rename from pkgs/development/tools/gotags/default.nix rename to pkgs/by-name/go/gotags/package.nix diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/by-name/go/gotemplate/package.nix similarity index 100% rename from pkgs/development/tools/gotemplate/default.nix rename to pkgs/by-name/go/gotemplate/package.nix diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/by-name/go/gotest/package.nix similarity index 100% rename from pkgs/development/tools/gotest/default.nix rename to pkgs/by-name/go/gotest/package.nix diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/by-name/go/gotestfmt/package.nix similarity index 100% rename from pkgs/development/tools/gotestfmt/default.nix rename to pkgs/by-name/go/gotestfmt/package.nix diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/by-name/go/gotests/package.nix similarity index 100% rename from pkgs/development/tools/gotests/default.nix rename to pkgs/by-name/go/gotests/package.nix diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/by-name/go/gotify-cli/package.nix similarity index 100% rename from pkgs/tools/misc/gotify-cli/default.nix rename to pkgs/by-name/go/gotify-cli/package.nix diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/by-name/go/gotify-desktop/package.nix similarity index 100% rename from pkgs/tools/misc/gotify-desktop/default.nix rename to pkgs/by-name/go/gotify-desktop/package.nix diff --git a/pkgs/servers/gotify/default.nix b/pkgs/by-name/go/gotify-server/package.nix similarity index 100% rename from pkgs/servers/gotify/default.nix rename to pkgs/by-name/go/gotify-server/package.nix diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/by-name/go/gotify-server/ui.nix similarity index 100% rename from pkgs/servers/gotify/ui.nix rename to pkgs/by-name/go/gotify-server/ui.nix diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/by-name/go/gotosocial/package.nix similarity index 100% rename from pkgs/servers/gotosocial/default.nix rename to pkgs/by-name/go/gotosocial/package.nix diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/by-name/go/gotraceui/package.nix similarity index 100% rename from pkgs/development/tools/gotraceui/default.nix rename to pkgs/by-name/go/gotraceui/package.nix diff --git a/pkgs/servers/gotty/default.nix b/pkgs/by-name/go/gotty/package.nix similarity index 100% rename from pkgs/servers/gotty/default.nix rename to pkgs/by-name/go/gotty/package.nix diff --git a/pkgs/games/gotypist/default.nix b/pkgs/by-name/go/gotypist/package.nix similarity index 100% rename from pkgs/games/gotypist/default.nix rename to pkgs/by-name/go/gotypist/package.nix diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/by-name/go/goudy-bookletter-1911/package.nix similarity index 100% rename from pkgs/data/fonts/goudy-bookletter-1911/default.nix rename to pkgs/by-name/go/goudy-bookletter-1911/package.nix diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/by-name/go/gource/package.nix similarity index 100% rename from pkgs/applications/version-management/gource/default.nix rename to pkgs/by-name/go/gource/package.nix diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/by-name/go/govc/package.nix similarity index 100% rename from pkgs/tools/virtualization/govc/default.nix rename to pkgs/by-name/go/govc/package.nix diff --git a/pkgs/tools/security/goverview/default.nix b/pkgs/by-name/go/goverview/package.nix similarity index 100% rename from pkgs/tools/security/goverview/default.nix rename to pkgs/by-name/go/goverview/package.nix diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/by-name/go/govulncheck/package.nix similarity index 100% rename from pkgs/tools/security/govulncheck/default.nix rename to pkgs/by-name/go/govulncheck/package.nix diff --git a/pkgs/tools/security/govulncheck/version.patch b/pkgs/by-name/go/govulncheck/version.patch similarity index 100% rename from pkgs/tools/security/govulncheck/version.patch rename to pkgs/by-name/go/govulncheck/version.patch diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/by-name/go/gox/package.nix similarity index 100% rename from pkgs/development/tools/gox/default.nix rename to pkgs/by-name/go/gox/package.nix diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/by-name/go/goxel/package.nix similarity index 100% rename from pkgs/applications/graphics/goxel/default.nix rename to pkgs/by-name/go/goxel/package.nix diff --git a/pkgs/tools/audio/goxlr-utility/Cargo.lock b/pkgs/by-name/go/goxlr-utility/Cargo.lock similarity index 100% rename from pkgs/tools/audio/goxlr-utility/Cargo.lock rename to pkgs/by-name/go/goxlr-utility/Cargo.lock diff --git a/pkgs/tools/audio/goxlr-utility/default.nix b/pkgs/by-name/go/goxlr-utility/package.nix similarity index 100% rename from pkgs/tools/audio/goxlr-utility/default.nix rename to pkgs/by-name/go/goxlr-utility/package.nix diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/by-name/gp/gpa/package.nix similarity index 100% rename from pkgs/applications/misc/gpa/default.nix rename to pkgs/by-name/gp/gpa/package.nix diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/by-name/gp/gpart/package.nix similarity index 100% rename from pkgs/tools/filesystems/gpart/default.nix rename to pkgs/by-name/gp/gpart/package.nix diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/by-name/gp/gparted/package.nix similarity index 100% rename from pkgs/tools/misc/gparted/default.nix rename to pkgs/by-name/gp/gparted/package.nix diff --git a/pkgs/tools/misc/gparted/polkit.patch b/pkgs/by-name/gp/gparted/polkit.patch similarity index 100% rename from pkgs/tools/misc/gparted/polkit.patch rename to pkgs/by-name/gp/gparted/polkit.patch diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index 02c6199f0958..7911b5ffc6c0 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -18,12 +18,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "45.1"; + version = "45.2"; pname = "gpaste"; src = fetchurl { url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz"; - hash = "sha256-yYLoHn3/2xlefBeErnydNfkvtJva8/9f9JHhfschBpQ="; + hash = "sha256-2WC0FGPQisY3YH4EgJcR/Re69fJznUD1KlCGljivyEE="; }; patches = [ diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/by-name/gp/gperftools/package.nix similarity index 100% rename from pkgs/development/libraries/gperftools/default.nix rename to pkgs/by-name/gp/gperftools/package.nix diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/by-name/gp/gpg-mdp/package.nix similarity index 100% rename from pkgs/applications/misc/gpg-mdp/default.nix rename to pkgs/by-name/gp/gpg-mdp/package.nix diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/by-name/gp/gphotos-sync/package.nix similarity index 100% rename from pkgs/tools/backup/gphotos-sync/default.nix rename to pkgs/by-name/gp/gphotos-sync/package.nix diff --git a/pkgs/tools/backup/gphotos-sync/skip-network-tests.patch b/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch similarity index 100% rename from pkgs/tools/backup/gphotos-sync/skip-network-tests.patch rename to pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch diff --git a/pkgs/tools/misc/gpick/dot-version.patch b/pkgs/by-name/gp/gpick/dot-version.patch similarity index 100% rename from pkgs/tools/misc/gpick/dot-version.patch rename to pkgs/by-name/gp/gpick/dot-version.patch diff --git a/pkgs/tools/misc/gpick/default.nix b/pkgs/by-name/gp/gpick/package.nix similarity index 100% rename from pkgs/tools/misc/gpick/default.nix rename to pkgs/by-name/gp/gpick/package.nix diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/pkgs/by-name/gp/gpodder/disable-autoupdate.patch similarity index 100% rename from pkgs/applications/audio/gpodder/disable-autoupdate.patch rename to pkgs/by-name/gp/gpodder/disable-autoupdate.patch diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/by-name/gp/gpodder/package.nix similarity index 100% rename from pkgs/applications/audio/gpodder/default.nix rename to pkgs/by-name/gp/gpodder/package.nix diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/by-name/gp/gpp/package.nix similarity index 100% rename from pkgs/development/tools/gpp/default.nix rename to pkgs/by-name/gp/gpp/package.nix diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/by-name/gp/gprojector/package.nix similarity index 100% rename from pkgs/applications/science/astronomy/gprojector/default.nix rename to pkgs/by-name/gp/gprojector/package.nix diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/by-name/gp/gprolog/package.nix similarity index 100% rename from pkgs/development/compilers/gprolog/default.nix rename to pkgs/by-name/gp/gprolog/package.nix diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/by-name/gp/gpsd/package.nix similarity index 100% rename from pkgs/servers/gpsd/default.nix rename to pkgs/by-name/gp/gpsd/package.nix diff --git a/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/pkgs/by-name/gp/gpsd/sconstruct-env-fixes.patch similarity index 100% rename from pkgs/servers/gpsd/sconstruct-env-fixes.patch rename to pkgs/by-name/gp/gpsd/sconstruct-env-fixes.patch diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index ed78ef40e131..e33f340a1bd5 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "24.2"; + version = "24.5"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - hash = "sha256-wGg7WPj61yx7zMBIdH9ls18BnD1R713U5Vgc/kL9qYs="; + hash = "sha256-qQtMSQbhIgYLJbCip6ioWeVphO1DEYudmXKUer04L4Y="; }; dontUnpack = true; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/by-name/gp/gptfdisk/package.nix similarity index 100% rename from pkgs/tools/system/gptfdisk/default.nix rename to pkgs/by-name/gp/gptfdisk/package.nix diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/by-name/gp/gptman/package.nix similarity index 100% rename from pkgs/tools/system/gptman/default.nix rename to pkgs/by-name/gp/gptman/package.nix diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/by-name/gp/gpu-switch/package.nix similarity index 100% rename from pkgs/os-specific/linux/gpu-switch/default.nix rename to pkgs/by-name/gp/gpu-switch/package.nix diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/by-name/gp/gputils/package.nix similarity index 100% rename from pkgs/development/embedded/gputils/default.nix rename to pkgs/by-name/gp/gputils/package.nix diff --git a/pkgs/development/tools/misc/gpuvis/default.nix b/pkgs/by-name/gp/gpuvis/package.nix similarity index 100% rename from pkgs/development/tools/misc/gpuvis/default.nix rename to pkgs/by-name/gp/gpuvis/package.nix diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/by-name/gp/gpx-viewer/package.nix similarity index 100% rename from pkgs/applications/misc/gpx-viewer/default.nix rename to pkgs/by-name/gp/gpx-viewer/package.nix diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/by-name/gp/gpx/package.nix similarity index 100% rename from pkgs/applications/misc/gpx/default.nix rename to pkgs/by-name/gp/gpx/package.nix diff --git a/pkgs/development/interpreters/gpython/default.nix b/pkgs/by-name/gp/gpython/package.nix similarity index 100% rename from pkgs/development/interpreters/gpython/default.nix rename to pkgs/by-name/gp/gpython/package.nix diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix new file mode 100644 index 000000000000..957ac402fb42 --- /dev/null +++ b/pkgs/by-name/gq/gql/package.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2 +, zlib +, cmake +}: + +rustPlatform.buildRustPackage rec { + pname = "gql"; + version = "0.29.1"; + + src = fetchFromGitHub { + owner = "AmrDeveloper"; + repo = "GQL"; + rev = version; + hash = "sha256-Py2wTWuUfr6Poxtab4JikG4D7Iv6mBocLEbn0zgz+k8="; + }; + + cargoHash = "sha256-BAaHnBkTmk58uAnZyZ7id1WmKz/HiOKSvdZApmgk6rs="; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + libgit2 + zlib + ]; + + meta = with lib; { + description = "SQL like query language to perform queries on .git files"; + homepage = "https://github.com/AmrDeveloper/GQL"; + changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "gitql"; + }; +} diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/by-name/gq/gqlgenc/package.nix similarity index 100% rename from pkgs/development/tools/gqlgenc/default.nix rename to pkgs/by-name/gq/gqlgenc/package.nix diff --git a/pkgs/development/tools/gqlint/default.nix b/pkgs/by-name/gq/gqlint/package.nix similarity index 100% rename from pkgs/development/tools/gqlint/default.nix rename to pkgs/by-name/gq/gqlint/package.nix diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix index 9914ae54b4df..a6719d56c1ad 100644 --- a/pkgs/by-name/gr/gr-framework/package.nix +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.73.7"; + version = "0.73.8"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-Xd1x6RUlre/5oxq0wiVKkIAuGKgtoNY/5aa7dvmn71U="; + hash = "sha256-6RgNFGRprke7AUu24VS9iYUcWMWJ/DQ/LIvleyQgza4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/by-name/gr/grabserial/package.nix similarity index 100% rename from pkgs/development/tools/grabserial/default.nix rename to pkgs/by-name/gr/grabserial/package.nix diff --git a/pkgs/tools/misc/gradescope-submit/default.nix b/pkgs/by-name/gr/gradescope-submit/package.nix similarity index 100% rename from pkgs/tools/misc/gradescope-submit/default.nix rename to pkgs/by-name/gr/gradescope-submit/package.nix diff --git a/pkgs/applications/misc/gradience/default.nix b/pkgs/by-name/gr/gradience/package.nix similarity index 100% rename from pkgs/applications/misc/gradience/default.nix rename to pkgs/by-name/gr/gradience/package.nix diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix new file mode 100644 index 000000000000..f02977de87ef --- /dev/null +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gradle-completion"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "gradle"; + repo = "gradle-completion"; + rev = "v${version}"; + sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2"; + }; + + strictDeps = true; + + # we just move two files into $out, + # this shouldn't bother Hydra. + preferLocalBuild = true; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out + install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle + install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle + + runHook postInstall + ''; + + meta = with lib; { + description = "Gradle tab completion for bash and zsh"; + homepage = "https://github.com/gradle/gradle-completion"; + license = licenses.mit; + maintainers = [ ] ++ teams.java.members; + }; +} diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/by-name/gr/gradm/package.nix similarity index 100% rename from pkgs/os-specific/linux/gradm/default.nix rename to pkgs/by-name/gr/gradm/package.nix diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/by-name/gr/grafana-agent/package.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-agent/default.nix rename to pkgs/by-name/gr/grafana-agent/package.nix diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-dash-n-grab/default.nix rename to pkgs/by-name/gr/grafana-dash-n-grab/package.nix diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/by-name/gr/grafana-image-renderer/package.json similarity index 100% rename from pkgs/servers/monitoring/grafana-image-renderer/package.json rename to pkgs/by-name/gr/grafana-image-renderer/package.json diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-image-renderer/default.nix rename to pkgs/by-name/gr/grafana-image-renderer/package.nix diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/by-name/gr/grail/package.nix similarity index 100% rename from pkgs/development/libraries/grail/default.nix rename to pkgs/by-name/gr/grail/package.nix diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/by-name/gr/grandperspective/package.nix similarity index 100% rename from pkgs/os-specific/darwin/grandperspective/default.nix rename to pkgs/by-name/gr/grandperspective/package.nix diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix index 307c245eb590..a105ffedf71b 100644 --- a/pkgs/by-name/gr/granted/package.nix +++ b/pkgs/by-name/gr/granted/package.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "granted"; - version = "0.35.2"; + version = "0.36.1"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Ou1TkPGAsrRfV75ntPKpXTUEhVkwgtaXErrRX8hR0E="; + sha256 = "sha256-sIn6D0696QPo4fs7HzvQNIopIfYYV4fYLmVdwQZnZag="; }; - vendorHash = "sha256-XCq+hDxK7C9XYlKe+lUArQlPheWALx806o1IeCRD7vs="; + vendorHash = "sha256-QswW1PyxrVWf6ZAPKW69q0JIXpyhSHucE5A7hkr8uxw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/by-name/gr/graph-cli/package.nix similarity index 100% rename from pkgs/tools/graphics/graph-cli/default.nix rename to pkgs/by-name/gr/graph-cli/package.nix diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/by-name/gr/graph-easy/package.nix similarity index 100% rename from pkgs/tools/graphics/graph-easy/default.nix rename to pkgs/by-name/gr/graph-easy/package.nix diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/by-name/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch similarity index 100% rename from pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch rename to pkgs/by-name/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/by-name/gr/graphene/package.nix similarity index 100% rename from pkgs/development/libraries/graphene/default.nix rename to pkgs/by-name/gr/graphene/package.nix diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 5a449d959f75..e0da1257fe14 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphicsmagick"; - version = "1.3.43"; + version = "1.3.45"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${finalAttrs.version}.tar.xz"; - hash = "sha256-K4hYBzLNfkCdniLGEWI4vvSuBvzaEUUb8z0ln5y/OZ8="; + hash = "sha256-3OpRZ0FPfIBVV94tekepsxR7y/YXuR9fD0r+XmVDAms="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/graphinder/default.nix b/pkgs/by-name/gr/graphinder/package.nix similarity index 100% rename from pkgs/tools/security/graphinder/default.nix rename to pkgs/by-name/gr/graphinder/package.nix diff --git a/pkgs/data/icons/graphite-cursors/default.nix b/pkgs/by-name/gr/graphite-cursors/package.nix similarity index 100% rename from pkgs/data/icons/graphite-cursors/default.nix rename to pkgs/by-name/gr/graphite-cursors/package.nix diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/graphite-gtk-theme/default.nix rename to pkgs/by-name/gr/graphite-gtk-theme/package.nix diff --git a/pkgs/tools/security/graphqlmap/default.nix b/pkgs/by-name/gr/graphqlmap/package.nix similarity index 100% rename from pkgs/tools/security/graphqlmap/default.nix rename to pkgs/by-name/gr/graphqlmap/package.nix diff --git a/pkgs/tools/networking/graphqurl/default.nix b/pkgs/by-name/gr/graphqurl/package.nix similarity index 100% rename from pkgs/tools/networking/graphqurl/default.nix rename to pkgs/by-name/gr/graphqurl/package.nix diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/by-name/gr/graphs/package.nix similarity index 100% rename from pkgs/data/misc/graphs/default.nix rename to pkgs/by-name/gr/graphs/package.nix diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/by-name/gr/graphw00f/package.nix similarity index 100% rename from pkgs/tools/security/graphw00f/default.nix rename to pkgs/by-name/gr/graphw00f/package.nix diff --git a/pkgs/games/graphwar/default.nix b/pkgs/by-name/gr/graphwar/package.nix similarity index 100% rename from pkgs/games/graphwar/default.nix rename to pkgs/by-name/gr/graphwar/package.nix diff --git a/pkgs/tools/misc/grass-sass/default.nix b/pkgs/by-name/gr/grass-sass/package.nix similarity index 100% rename from pkgs/tools/misc/grass-sass/default.nix rename to pkgs/by-name/gr/grass-sass/package.nix diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/by-name/gr/gravit/package.nix similarity index 100% rename from pkgs/applications/science/astronomy/gravit/default.nix rename to pkgs/by-name/gr/gravit/package.nix diff --git a/pkgs/applications/misc/grb/default.nix b/pkgs/by-name/gr/grb/package.nix similarity index 100% rename from pkgs/applications/misc/grb/default.nix rename to pkgs/by-name/gr/grb/package.nix diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/by-name/gr/grepcidr/package.nix similarity index 100% rename from pkgs/applications/search/grepcidr/default.nix rename to pkgs/by-name/gr/grepcidr/package.nix diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/by-name/gr/grepm/package.nix similarity index 100% rename from pkgs/applications/search/grepm/default.nix rename to pkgs/by-name/gr/grepm/package.nix diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/by-name/gr/greybird/package.nix similarity index 100% rename from pkgs/data/themes/greybird/default.nix rename to pkgs/by-name/gr/greybird/package.nix diff --git a/pkgs/tools/nix/gridlock/default.nix b/pkgs/by-name/gr/gridlock/package.nix similarity index 100% rename from pkgs/tools/nix/gridlock/default.nix rename to pkgs/by-name/gr/gridlock/package.nix diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/by-name/gr/gridtracker/package.nix similarity index 100% rename from pkgs/applications/radio/gridtracker/default.nix rename to pkgs/by-name/gr/gridtracker/package.nix diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/by-name/gr/grig/package.nix similarity index 100% rename from pkgs/applications/radio/grig/default.nix rename to pkgs/by-name/gr/grig/package.nix diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/by-name/gr/grilo-plugins/chromaprint-gst-plugins.patch similarity index 100% rename from pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch rename to pkgs/by-name/gr/grilo-plugins/chromaprint-gst-plugins.patch diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix new file mode 100644 index 000000000000..4f3560fbd1c2 --- /dev/null +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -0,0 +1,108 @@ +{ lib, stdenv +, fetchurl +, substituteAll +, meson +, ninja +, pkg-config +, gettext +, gperf +, glib +, sqlite +, libarchive +, libdmapsharing +, libsoup_3 +, gnome +, libxml2 +, lua5_4 +, liboauth +, libmediaart +, grilo +, gst_all_1 +, gnome-online-accounts +, gmime +, gom +, json-glib +, avahi +, tinysparql +, dleyna-server +, itstool +, totem-pl-parser +}: + +stdenv.mkDerivation rec { + pname = "grilo-plugins"; + version = "0.3.16"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs="; + }; + + patches = [ + # grl-chromaprint requires the following GStreamer elements: + # * fakesink (gstreamer) + # * playbin (gst-plugins-base) + # * chromaprint (gst-plugins-bad) + (substituteAll { + src = ./chromaprint-gst-plugins.patch; + load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + ]); + }) + ]; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + gperf # for lua-factory + glib # glib-compile-resources + ]; + + buildInputs = [ + grilo + libxml2 + # libgdata + lua5_4 + liboauth + sqlite + gnome-online-accounts + totem-pl-parser + libarchive + libdmapsharing + libsoup_3 + gmime + gom + json-glib + avahi + libmediaart + tinysparql + dleyna-server + gst_all_1.gstreamer + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins"; + description = "Collection of plugins for the Grilo framework"; + maintainers = teams.gnome.members; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/by-name/gr/grilo/package.nix similarity index 100% rename from pkgs/development/libraries/grilo/default.nix rename to pkgs/by-name/gr/grilo/package.nix diff --git a/pkgs/development/libraries/grilo/setup-hook.sh b/pkgs/by-name/gr/grilo/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/grilo/setup-hook.sh rename to pkgs/by-name/gr/grilo/setup-hook.sh diff --git a/pkgs/by-name/gr/grim/package.nix b/pkgs/by-name/gr/grim/package.nix index 9055acb96dd8..72abbb46c7b0 100644 --- a/pkgs/by-name/gr/grim/package.nix +++ b/pkgs/by-name/gr/grim/package.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; meta = { - homepage = "https://github.com/emersion/grim"; + homepage = "https://sr.ht/~emersion/grim"; description = "Grab images from a Wayland compositor"; license = lib.licenses.mit; mainProgram = "grim"; maintainers = with lib.maintainers; [ AndersonTorres ]; - inherit (wayland.meta) platforms; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/by-name/gr/grin/package.nix similarity index 100% rename from pkgs/tools/text/grin/default.nix rename to pkgs/by-name/gr/grin/package.nix diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/by-name/gr/grip-search/package.nix similarity index 100% rename from pkgs/tools/text/grip-search/default.nix rename to pkgs/by-name/gr/grip-search/package.nix diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/by-name/gr/grip/package.nix similarity index 100% rename from pkgs/applications/misc/grip/default.nix rename to pkgs/by-name/gr/grip/package.nix diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/by-name/gr/grit/package.nix similarity index 100% rename from pkgs/tools/misc/grit/default.nix rename to pkgs/by-name/gr/grit/package.nix diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/by-name/gr/grive2/package.nix similarity index 100% rename from pkgs/tools/filesystems/grive2/default.nix rename to pkgs/by-name/gr/grive2/package.nix diff --git a/pkgs/by-name/gr/grizzly/package.nix b/pkgs/by-name/gr/grizzly/package.nix new file mode 100644 index 000000000000..07d26e1ca195 --- /dev/null +++ b/pkgs/by-name/gr/grizzly/package.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "grizzly"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zk6qcFWoRYyjy3mVSJdqwEj279QjWVF8fFYojOoD5jc="; + }; + + vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs="; + + subPackages = [ "cmd/grr" ]; + + meta = with lib; { + description = "Utility for managing Jsonnet dashboards against the Grafana API"; + homepage = "https://grafana.github.io/grizzly/"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ nrhtr ]; + platforms = platforms.unix; + mainProgram = "grr"; + }; +} diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix similarity index 100% rename from pkgs/shells/zsh/grml-zsh-config/default.nix rename to pkgs/by-name/gr/grml-zsh-config/package.nix diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/by-name/gr/grobi/package.nix similarity index 100% rename from pkgs/tools/X11/grobi/default.nix rename to pkgs/by-name/gr/grobi/package.nix diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch similarity index 100% rename from pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch rename to pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch similarity index 100% rename from pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch rename to pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch diff --git a/pkgs/servers/grocy/default.nix b/pkgs/by-name/gr/grocy/package.nix similarity index 100% rename from pkgs/servers/grocy/default.nix rename to pkgs/by-name/gr/grocy/package.nix diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/by-name/gr/groff/package.nix similarity index 100% rename from pkgs/tools/text/groff/default.nix rename to pkgs/by-name/gr/groff/package.nix diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/by-name/gr/groff/site.tmac similarity index 100% rename from pkgs/tools/text/groff/site.tmac rename to pkgs/by-name/gr/groff/site.tmac diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/by-name/gr/gron/package.nix similarity index 100% rename from pkgs/development/tools/gron/default.nix rename to pkgs/by-name/gr/gron/package.nix diff --git a/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch b/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch similarity index 100% rename from pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch rename to pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch diff --git a/pkgs/servers/search/groonga/fix-cmake-install-path.patch b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch similarity index 100% rename from pkgs/servers/search/groonga/fix-cmake-install-path.patch rename to pkgs/by-name/gr/groonga/fix-cmake-install-path.patch diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/by-name/gr/groonga/package.nix similarity index 100% rename from pkgs/servers/search/groonga/default.nix rename to pkgs/by-name/gr/groonga/package.nix diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/by-name/gr/groove/package.nix similarity index 100% rename from pkgs/applications/science/programming/groove/default.nix rename to pkgs/by-name/gr/groove/package.nix diff --git a/pkgs/by-name/gr/groovy/package.nix b/pkgs/by-name/gr/groovy/package.nix new file mode 100644 index 000000000000..1b93bf5bf4bf --- /dev/null +++ b/pkgs/by-name/gr/groovy/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchurl, + unzip, + which, + makeWrapper, + installShellFiles, + jdk, + copyDesktopItems, + makeDesktopItem, +}: + +# at runtime, need jdk + +stdenv.mkDerivation rec { + pname = "groovy"; + version = "4.0.23"; + + src = fetchurl { + url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; + sha256 = "sha256-cIndeh6ErcgU1hb17C99fawgRKCgRX8zQbO5LTAgQik="; + }; + + nativeBuildInputs = [ + makeWrapper + unzip + installShellFiles + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "groovy"; + desktopName = "Groovy Console"; + exec = "groovyConsole"; + icon = "groovy"; + comment = meta.description; + terminal = false; + startupNotify = false; + categories = [ "Development" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + rm bin/*.bat + + mkdir -p $out + mkdir -p $out/share/doc/groovy + + #Install icons + mkdir -p $out/share/icons + mv bin/groovy.ico $out/share/icons/ + + #Install Completion + for p in grape groovy{,doc,c,sh,Console}; do + installShellCompletion --cmd $p --bash bin/''${p}_completion + done + rm bin/*_completion + + mv {bin,conf,grooid,lib} $out + mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy + + sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy + + for p in grape java2groovy groovy{,doc,c,sh,Console}; do + wrapProgram $out/bin/$p \ + --set JAVA_HOME "${jdk}" \ + --prefix PATH ":" "${jdk}/bin" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Agile dynamic language for the Java Platform"; + homepage = "http://groovy-lang.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix similarity index 100% rename from pkgs/development/tools/misc/grpc-client-cli/default.nix rename to pkgs/by-name/gr/grpc-client-cli/package.nix diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/by-name/gr/grpc-gateway/package.nix similarity index 100% rename from pkgs/development/tools/grpc-gateway/default.nix rename to pkgs/by-name/gr/grpc-gateway/package.nix diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/by-name/gr/grpc-tools/package.nix similarity index 100% rename from pkgs/development/tools/misc/grpc-tools/default.nix rename to pkgs/by-name/gr/grpc-tools/package.nix diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix new file mode 100644 index 000000000000..58915a3509e2 --- /dev/null +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, automake, cmake, autoconf, curl, numactl }: + +stdenv.mkDerivation rec { + pname = "grpc_cli"; + version = "1.67.1"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-x49mh7gLliAiFjOZM5U/CnMQqs7fAhoipo18OBoeD0w="; + fetchSubmodules = true; + }; + nativeBuildInputs = [ automake cmake autoconf ]; + buildInputs = [ curl numactl ]; + cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ]; + makeFlags = [ "grpc_cli" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=format-security"; + installPhase = '' + runHook preInstall + + install -Dm555 grpc_cli "$out/bin/grpc_cli" + + runHook postInstall + ''; + meta = with lib; { + description = "Command line tool for interacting with grpc services"; + homepage = "https://github.com/grpc/grpc"; + license = licenses.asl20; + maintainers = with maintainers; [ doriath ]; + platforms = platforms.linux; + mainProgram = "grpc_cli"; + }; +} diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/by-name/gr/grpcui/package.nix similarity index 100% rename from pkgs/tools/networking/grpcui/default.nix rename to pkgs/by-name/gr/grpcui/package.nix diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/by-name/gr/grpcurl/package.nix similarity index 100% rename from pkgs/tools/networking/grpcurl/default.nix rename to pkgs/by-name/gr/grpcurl/package.nix diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/by-name/gr/grsync/package.nix similarity index 100% rename from pkgs/applications/misc/grsync/default.nix rename to pkgs/by-name/gr/grsync/package.nix diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg similarity index 100% rename from pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg rename to pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg similarity index 100% rename from pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg rename to pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix similarity index 100% rename from pkgs/tools/misc/grub/pvgrub_image/default.nix rename to pkgs/by-name/gr/grub2_pvgrub_image/package.nix diff --git a/pkgs/data/themes/gruvbox-dark-gtk/default.nix b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix similarity index 100% rename from pkgs/data/themes/gruvbox-dark-gtk/default.nix rename to pkgs/by-name/gr/gruvbox-dark-gtk/package.nix diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 19f81b25989c..72a3e999840b 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-09-12"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7"; - hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o="; + rev = "d064cd480a1e4802851b35bf051e48c808802c2a"; + hash = "sha256-LOizbRbPj3X0B0bED6fRcwxYeRFY8vtLk0i64pqyIyY="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/gr/gruvbox-kvantum/package.nix b/pkgs/by-name/gr/gruvbox-kvantum/package.nix new file mode 100644 index 000000000000..160166fd39ab --- /dev/null +++ b/pkgs/by-name/gr/gruvbox-kvantum/package.nix @@ -0,0 +1,47 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, + variant ? "Gruvbox-Dark-Brown", +}: +let + pname = "gruvbox-kvantum"; +in +lib.checkListOfEnum "${pname}: variant" + [ + "Gruvbox-Dark-Blue" + "Gruvbox-Dark-Brown" + "Gruvbox-Dark-Green" + "Gruvbox_Light_Blue" + "Gruvbox_Light_Brown" + "Gruvbox_Light_Green" + ] + [ variant ] + + stdenvNoCC.mkDerivation + { + inherit pname; + version = "1.1"; + + src = fetchFromGitHub { + owner = "sachnr"; + repo = "gruvbox-kvantum-themes"; + rev = "f47670be407c1f07c64890ad53884ee9977a7db1"; + sha256 = "sha256-u2J4Zf9HuMjNCt3qVpgEffkytl/t277FzOvWL8Nm8os="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/Kvantum + cp -a "${variant}" $out/share/Kvantum + runHook postInstall + ''; + + meta = { + description = "Gruvbox themes for kvantum"; + homepage = "https://github.com/sachnr/gruvbox-kvantum-themes"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ istudyatuni ]; + }; + } diff --git a/pkgs/by-name/gs/gsan/package.nix b/pkgs/by-name/gs/gsan/package.nix new file mode 100644 index 000000000000..8217d4b1c3c2 --- /dev/null +++ b/pkgs/by-name/gs/gsan/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gsan"; + version = "5.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "franccesco"; + repo = "getaltname"; + rev = "refs/tags/v${version}"; + hash = "sha256-Os/NappuvdadGqCouF5vhvPhRnu1SLpii+Esq0C1j48="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + cryptography + pyasn1 + pyopenssl + rich + typer + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "gsan" ]; + + meta = { + description = "Tool to extract subdomains from SSL certificates in HTTPS sites"; + homepage = "https://github.com/franccesco/getaltname"; + changelog = "https://github.com/franccesco/getaltname/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "gsan"; + }; +} diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/by-name/gs/gsasl/package.nix similarity index 100% rename from pkgs/development/libraries/gsasl/default.nix rename to pkgs/by-name/gs/gsasl/package.nix diff --git a/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch b/pkgs/by-name/gs/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch similarity index 100% rename from pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch rename to pkgs/by-name/gs/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/by-name/gs/gscreenshot/package.nix similarity index 100% rename from pkgs/applications/graphics/gscreenshot/default.nix rename to pkgs/by-name/gs/gscreenshot/package.nix diff --git a/pkgs/applications/misc/gsctl/go120-compatibility.patch b/pkgs/by-name/gs/gsctl/go120-compatibility.patch similarity index 100% rename from pkgs/applications/misc/gsctl/go120-compatibility.patch rename to pkgs/by-name/gs/gsctl/go120-compatibility.patch diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/by-name/gs/gsctl/package.nix similarity index 100% rename from pkgs/applications/misc/gsctl/default.nix rename to pkgs/by-name/gs/gsctl/package.nix diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix new file mode 100644 index 000000000000..eae3d40569a9 --- /dev/null +++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix @@ -0,0 +1,70 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, glib +, gobject-introspection +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, meson +, ninja + # just for passthru +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gsettings-desktop-schemas"; + version = "47.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-pgIE2cnAobJk1tDRNKODQLpfxgdqNLhNqUXYv8x6KBU="; + }; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ]; + + mesonFlags = [ + (lib.mesonBool "introspection" withIntrospection) + ]; + + preInstall = '' + # Meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. + mkdir -p $out/share/glib-2.0/schemas + cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + # These paths are supposed to refer to gnome-backgrounds + # but since we do not use FHS, they are broken. + # And we do not want to hardcode the correct paths + # since then every GTK app would pull in gnome-backgrounds. + # Let’s just override the broken paths so that people are not confused. + [org.gnome.desktop.background] + picture-uri=''' + picture-uri-dark=''' + + [org.gnome.desktop.screensaver] + picture-uri=''' + EOF + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"; + description = "Collection of GSettings schemas for settings shared by various components of a desktop"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/by-name/gs/gshhg-gmt/package.nix b/pkgs/by-name/gs/gshhg-gmt/package.nix new file mode 100644 index 000000000000..c17378d5ec1b --- /dev/null +++ b/pkgs/by-name/gs/gshhg-gmt/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchurl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gshhg-gmt"; + version = "2.3.7"; + src = fetchurl { + url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${finalAttrs.version}.tar.gz"; + sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f"; + }; + + installPhase = '' + mkdir -p $out/share/gshhg-gmt + cp -rv ./* $out/share/gshhg-gmt + ''; + + meta = with lib; { + homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/"; + description = "High-resolution shoreline data set, for use with GMT"; + longDescription = '' + GSHHG is a high-resolution shoreline data set amalgamated from two + databases: Global Self-consistent Hierarchical High-resolution Shorelines + (GSHHS) and CIA World Data Bank II (WDBII). GSHHG contains vector + descriptions at five different resolutions of land outlines, lakes, + rivers, and political boundaries. This data is for use by GMT, the Generic + Mapping Tools. + ''; + license = licenses.lgpl3Plus; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); + }; + +}) diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/by-name/gs/gsimplecal/package.nix similarity index 100% rename from pkgs/applications/misc/gsimplecal/default.nix rename to pkgs/by-name/gs/gsimplecal/package.nix diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/by-name/gs/gsl-lite/package.nix similarity index 100% rename from pkgs/development/libraries/gsl-lite/default.nix rename to pkgs/by-name/gs/gsl-lite/package.nix diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/by-name/gs/gsl/package.nix similarity index 100% rename from pkgs/development/libraries/gsl/default.nix rename to pkgs/by-name/gs/gsl/package.nix diff --git a/pkgs/by-name/gs/gsm/package.nix b/pkgs/by-name/gs/gsm/package.nix new file mode 100644 index 000000000000..a964c4e4bcb6 --- /dev/null +++ b/pkgs/by-name/gs/gsm/package.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl +, # Compile statically (support for packages that look for the static object) + staticSupport ? stdenv.hostPlatform.isStatic +}: + +let + inherit (stdenv.hostPlatform) isDarwin; + inherit (lib) optional optionalString; +in + +stdenv.mkDerivation rec { + pname = "gsm"; + version = "1.0.22"; + + src = fetchurl { + url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; + sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw="; + }; + + patchPhase = '' + # Fix include directory + sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile + '' + optionalString (!staticSupport) ( + (if isDarwin then '' + # Build dylib on Darwin + sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile + sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile + '' else '' + # Build ELF shared object by default + sed -e 's,libgsm.a,libgsm.so,' -i Makefile + sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile + '') + '' + # Remove line that is unused when building shared libraries + sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile + '' + ); + + preBuild = '' + makeFlagsArray+=(CC="$CC") + ''; + + makeFlags = [ + "SHELL=${stdenv.shell}" + "INSTALL_ROOT=$(out)" + ]; + + preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}"; + + parallelBuild = false; + + meta = with lib; { + description = "Lossy speech compression codec"; + homepage = "https://www.quut.com/gsm/"; + license = licenses.bsd2; + maintainers = with maintainers; [ codyopel raskin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch similarity index 100% rename from pkgs/tools/misc/gsmartcontrol/fix-paths.patch rename to pkgs/by-name/gs/gsmartcontrol/fix-paths.patch diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/by-name/gs/gsmartcontrol/package.nix similarity index 100% rename from pkgs/tools/misc/gsmartcontrol/default.nix rename to pkgs/by-name/gs/gsmartcontrol/package.nix diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/by-name/gs/gsoap/package.nix similarity index 100% rename from pkgs/development/libraries/gsoap/default.nix rename to pkgs/by-name/gs/gsoap/package.nix diff --git a/pkgs/tools/networking/gsocket/default.nix b/pkgs/by-name/gs/gsocket/package.nix similarity index 100% rename from pkgs/tools/networking/gsocket/default.nix rename to pkgs/by-name/gs/gsocket/package.nix diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/by-name/gs/gsound/package.nix similarity index 100% rename from pkgs/development/libraries/gsound/default.nix rename to pkgs/by-name/gs/gsound/package.nix diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/by-name/gs/gspeech/package.nix similarity index 100% rename from pkgs/applications/audio/gspeech/default.nix rename to pkgs/by-name/gs/gspeech/package.nix diff --git a/pkgs/by-name/gs/gspell/package.nix b/pkgs/by-name/gs/gspell/package.nix new file mode 100644 index 000000000000..d8725ed90bdc --- /dev/null +++ b/pkgs/by-name/gs/gspell/package.nix @@ -0,0 +1,75 @@ +{ + stdenv, + lib, + fetchurl, + docbook-xsl-nons, + glib, + gobject-introspection, + gtk-doc, + meson, + ninja, + pkg-config, + vala, + mesonEmulatorHook, + gtk3, + icu, + enchant2, + gnome, +}: + +stdenv.mkDerivation rec { + pname = "gspell"; + version = "1.14.0"; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + + outputBin = "dev"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "ZOodjp7cHCW0WpIOgNr2dVnRhm/81/hDL+z+ptD+iJc="; + }; + + nativeBuildInputs = [ + docbook-xsl-nons + glib # glib-mkenums + gobject-introspection + gtk-doc + meson + ninja + pkg-config + vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + gtk3 + icu + ]; + + propagatedBuildInputs = [ + # required for pkg-config + enchant2 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with lib; { + description = "Spell-checking library for GTK applications"; + mainProgram = "gspell-app1"; + homepage = "https://gitlab.gnome.org/GNOME/gspell"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/by-name/gs/gss/package.nix similarity index 100% rename from pkgs/development/libraries/gss/default.nix rename to pkgs/by-name/gs/gss/package.nix diff --git a/pkgs/applications/version-management/gst/default.nix b/pkgs/by-name/gs/gst/package.nix similarity index 100% rename from pkgs/applications/version-management/gst/default.nix rename to pkgs/by-name/gs/gst/package.nix diff --git a/pkgs/applications/audio/gst123/default.nix b/pkgs/by-name/gs/gst123/package.nix similarity index 100% rename from pkgs/applications/audio/gst123/default.nix rename to pkgs/by-name/gs/gst123/package.nix diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/by-name/gt/gt/package.nix similarity index 100% rename from pkgs/os-specific/linux/gt/default.nix rename to pkgs/by-name/gt/gt/package.nix diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/by-name/gt/gt5/package.nix similarity index 100% rename from pkgs/tools/system/gt5/default.nix rename to pkgs/by-name/gt/gt5/package.nix diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/by-name/gt/gtdialog/package.nix similarity index 100% rename from pkgs/development/libraries/gtdialog/default.nix rename to pkgs/by-name/gt/gtdialog/package.nix diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/by-name/gt/gtest/fix-cmake-config-includedir.patch similarity index 100% rename from pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch rename to pkgs/by-name/gt/gtest/fix-cmake-config-includedir.patch diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/by-name/gt/gtest/package.nix similarity index 100% rename from pkgs/development/libraries/gtest/default.nix rename to pkgs/by-name/gt/gtest/package.nix diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/by-name/gt/gtg/package.nix similarity index 100% rename from pkgs/applications/office/gtg/default.nix rename to pkgs/by-name/gt/gtg/package.nix diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/by-name/gt/gthree/package.nix similarity index 100% rename from pkgs/development/libraries/gthree/default.nix rename to pkgs/by-name/gt/gthree/package.nix diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/by-name/gt/gthumb/package.nix similarity index 100% rename from pkgs/applications/graphics/gthumb/default.nix rename to pkgs/by-name/gt/gthumb/package.nix diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/by-name/gt/gti/package.nix similarity index 100% rename from pkgs/tools/misc/gti/default.nix rename to pkgs/by-name/gt/gti/package.nix diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/by-name/gt/gtk-doc/package.nix similarity index 100% rename from pkgs/development/tools/documentation/gtk-doc/default.nix rename to pkgs/by-name/gt/gtk-doc/package.nix diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch rename to pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-engine-bluecurve/default.nix rename to pkgs/by-name/gt/gtk-engine-bluecurve/package.nix diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/by-name/gt/gtk-engine-murrine/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-engine-murrine/default.nix rename to pkgs/by-name/gt/gtk-engine-murrine/package.nix diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix new file mode 100644 index 000000000000..22524445cf08 --- /dev/null +++ b/pkgs/by-name/gt/gtk-frdp/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, glib +, gtk3 +, freerdp3 +, fuse3 +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "gtk-frdp"; + version = "0-unstable-2024-07-03"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "6cfdc840159bb349310c3b81cd2df949f1522760"; + sha256 = "Fth2kaZEy5pOvaHu10Mr/6awWuAeyQ1T9JbNL9Sl8fU="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gobject-introspection + ]; + + buildInputs = [ + glib + gtk3 + freerdp3 + fuse3 + ]; + + passthru = { + updateScript = unstableGitUpdater { + tagPrefix = "v"; + hardcodeZeroVersion = true; + }; + }; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ + "-DTARGET_OS_IPHONE=0" + "-DTARGET_OS_WATCH=0" + ]); + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; + description = "RDP viewer widget for GTK"; + maintainers = teams.gnome.members; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/by-name/gt/gtk-layer-shell/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-layer-shell/default.nix rename to pkgs/by-name/gt/gtk-layer-shell/package.nix diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/by-name/gt/gtk-mac-bundler/package.nix similarity index 100% rename from pkgs/development/tools/gtk-mac-bundler/default.nix rename to pkgs/by-name/gt/gtk-mac-bundler/package.nix diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/by-name/gt/gtk-server/package.nix similarity index 100% rename from pkgs/development/interpreters/gtk-server/default.nix rename to pkgs/by-name/gt/gtk-server/package.nix diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/by-name/gt/gtk-sharp-beans/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp-beans/default.nix rename to pkgs/by-name/gt/gtk-sharp-beans/package.nix diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/by-name/gt/gtk-vnc/package.nix similarity index 100% rename from pkgs/tools/admin/gtk-vnc/default.nix rename to pkgs/by-name/gt/gtk-vnc/package.nix diff --git a/pkgs/by-name/gt/gtk4-layer-shell/package.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix new file mode 100644 index 000000000000..132868b01e54 --- /dev/null +++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, wayland-protocols +, wayland-scanner +, wayland +, gtk4 +, gobject-introspection +, vala +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gtk4-layer-shell"; + version = "1.0.4"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; + + src = fetchFromGitHub { + owner = "wmww"; + repo = "gtk4-layer-shell"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0Ya3NVTSO/urU8H+h6SVZBkcvdnqwr06rNWyBtwhQ8E="; + }; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + vala + wayland-scanner + wayland-protocols + ]; + + buildInputs = [ + wayland + gtk4 + ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dexamples=true" + ]; + + meta = with lib; { + description = "Library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4"; + mainProgram = "gtk4-layer-demo"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/by-name/gt/gtk_engines/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-engines/default.nix rename to pkgs/by-name/gt/gtk_engines/package.nix diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/by-name/gt/gtkdatabox/package.nix similarity index 100% rename from pkgs/development/libraries/gtkdatabox/default.nix rename to pkgs/by-name/gt/gtkdatabox/package.nix diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/by-name/gt/gtkdialog/package.nix similarity index 100% rename from pkgs/development/tools/misc/gtkdialog/default.nix rename to pkgs/by-name/gt/gtkdialog/package.nix diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/by-name/gt/gtkextra/package.nix similarity index 100% rename from pkgs/development/libraries/gtkextra/default.nix rename to pkgs/by-name/gt/gtkextra/package.nix diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/by-name/gt/gtkgnutella/package.nix similarity index 100% rename from pkgs/tools/networking/p2p/gtk-gnutella/default.nix rename to pkgs/by-name/gt/gtkgnutella/package.nix diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/by-name/gt/gtkimageview/package.nix similarity index 100% rename from pkgs/development/libraries/gtkimageview/default.nix rename to pkgs/by-name/gt/gtkimageview/package.nix diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/by-name/gt/gtkradiant/package.nix similarity index 100% rename from pkgs/applications/misc/gtkradiant/default.nix rename to pkgs/by-name/gt/gtkradiant/package.nix diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/by-name/gt/gtkspellmm/package.nix similarity index 100% rename from pkgs/development/libraries/gtkspellmm/default.nix rename to pkgs/by-name/gt/gtkspellmm/package.nix diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/by-name/gt/gtkterm/package.nix similarity index 100% rename from pkgs/tools/misc/gtkterm/default.nix rename to pkgs/by-name/gt/gtkterm/package.nix diff --git a/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch similarity index 100% rename from pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch rename to pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch diff --git a/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch similarity index 100% rename from pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch rename to pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch diff --git a/pkgs/by-name/gt/gtkwave/package.nix b/pkgs/by-name/gt/gtkwave/package.nix new file mode 100644 index 000000000000..9028d3a80288 --- /dev/null +++ b/pkgs/by-name/gt/gtkwave/package.nix @@ -0,0 +1,65 @@ +{ bzip2 +, fetchurl +, glib +, gperf +, gtk3 +, gtk-mac-integration +, judy +, lib +, pkg-config +, stdenv +, tcl +, tk +, wrapGAppsHook3 +, xz +, desktopToDarwinBundle +}: + +stdenv.mkDerivation rec { + pname = "gtkwave"; + version = "3.3.121"; + + src = fetchurl { + url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; + sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y="; + }; + + nativeBuildInputs = [ + pkg-config wrapGAppsHook3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; + buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; + + # fix compilation under Darwin + # remove these patches upon next release + # https://github.com/gtkwave/gtkwave/pull/136 + patches = [ + ./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch + ./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch + ]; + + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--enable-judy" + "--enable-gtk3" + ]; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + mv $out/bin/.gtkwave-wrapped $out/Applications/GTKWave.app/Contents/MacOS/.gtkwave-wrapped + makeWrapper $out/Applications/GTKWave.app/Contents/MacOS/.gtkwave-wrapped $out/Applications/GTKWave.app/Contents/MacOS/GTKWave \ + --inherit-argv0 \ + "''${gappsWrapperArgs[@]}" + ln -sf $out/Applications/GTKWave.app/Contents/MacOS/GTKWave $out/bin/gtkwave + ''; + + meta = { + description = "VCD/Waveform viewer for Unix and Win32"; + homepage = "https://gtkwave.sourceforge.net"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ thoughtpolice jiegec jleightcap ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/tools/system/gtop/default.nix b/pkgs/by-name/gt/gtop/package.nix similarity index 100% rename from pkgs/tools/system/gtop/default.nix rename to pkgs/by-name/gt/gtop/package.nix diff --git a/pkgs/by-name/gt/gtranslator/package.nix b/pkgs/by-name/gt/gtranslator/package.nix new file mode 100644 index 000000000000..b3284fa5ed56 --- /dev/null +++ b/pkgs/by-name/gt/gtranslator/package.nix @@ -0,0 +1,71 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, itstool +, gettext +, desktop-file-utils +, wrapGAppsHook4 +, libxml2 +, libadwaita +, libgda6 +, libsoup_3 +, libspelling +, json-glib +, glib +, gtk4 +, gtksourceview5 +, gnome +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gtranslator"; + version = "47.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-duEEHF77Coi6GHZOpFiLThll+lAxTgGhc/o+oBUOHNU="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + itstool + gettext + desktop-file-utils + wrapGAppsHook4 + ]; + + buildInputs = [ + libxml2 + glib + gtk4 + gtksourceview5 + libadwaita + libgda6 + libsoup_3 + libspelling + json-glib + gettext + gsettings-desktop-schemas + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "GNOME translation making program"; + mainProgram = "gtranslator"; + homepage = "https://gitlab.gnome.org/GNOME/gtranslator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ bobby285271 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix new file mode 100644 index 000000000000..f921aed38668 --- /dev/null +++ b/pkgs/by-name/gt/gtree/package.nix @@ -0,0 +1,46 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, gtree +}: + +buildGoModule rec { + pname = "gtree"; + version = "1.10.12"; + + src = fetchFromGitHub { + owner = "ddddddO"; + repo = "gtree"; + rev = "v${version}"; + hash = "sha256-dtKT2T8GNcR5ux1whFrXgJ08XHJWS76M/wmAtBHDLUI="; + }; + + vendorHash = "sha256-wiPHK5RjMBMLHx3Vv2zWoZc1wWJ1IVxu8dIbO9fPaPQ="; + + subPackages = [ + "cmd/gtree" + ]; + + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + "-X=main.Revision=${src.rev}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = gtree; + }; + }; + + meta = with lib; { + description = "Generate directory trees and directories using Markdown or programmatically"; + mainProgram = "gtree"; + homepage = "https://github.com/ddddddO/gtree"; + changelog = "https://github.com/ddddddO/gtree/releases/tag/${src.rev}"; + license = licenses.bsd2; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/by-name/gt/gts/package.nix similarity index 100% rename from pkgs/development/libraries/gts/default.nix rename to pkgs/by-name/gt/gts/package.nix diff --git a/pkgs/games/gtypist/default.nix b/pkgs/by-name/gt/gtypist/package.nix similarity index 100% rename from pkgs/games/gtypist/default.nix rename to pkgs/by-name/gt/gtypist/package.nix diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/by-name/gu/guacamole-client/package.nix similarity index 100% rename from pkgs/servers/guacamole-client/default.nix rename to pkgs/by-name/gu/guacamole-client/package.nix diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/by-name/gu/guacamole-server/package.nix similarity index 100% rename from pkgs/servers/guacamole-server/default.nix rename to pkgs/by-name/gu/guacamole-server/package.nix diff --git a/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch b/pkgs/by-name/gu/guake/no-compile-schemas.patch similarity index 100% rename from pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch rename to pkgs/by-name/gu/guake/no-compile-schemas.patch diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/by-name/gu/guake/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/guake/default.nix rename to pkgs/by-name/gu/guake/package.nix diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/by-name/gu/gubbi-font/package.nix similarity index 100% rename from pkgs/data/fonts/gubbi/default.nix rename to pkgs/by-name/gu/gubbi-font/package.nix diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/by-name/gu/gucci/package.nix similarity index 100% rename from pkgs/tools/text/gucci/default.nix rename to pkgs/by-name/gu/gucci/package.nix diff --git a/pkgs/by-name/gu/guestfs-tools/package.nix b/pkgs/by-name/gu/guestfs-tools/package.nix new file mode 100644 index 000000000000..fb790543b1a9 --- /dev/null +++ b/pkgs/by-name/gu/guestfs-tools/package.nix @@ -0,0 +1,141 @@ +{ + lib, + stdenv, + fetchurl, + bash-completion, + bison, + cdrkit, + cpio, + curl, + flex, + getopt, + glib, + gnupg, + hivex, + jansson, + libguestfs-with-appliance, + libosinfo, + libvirt, + libxml2, + makeWrapper, + ncurses, + ocamlPackages, + openssl, + pcre2, + perlPackages, + pkg-config, + qemu, + xz, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guestfs-tools"; + version = "1.52.2"; + + src = fetchurl { + url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor finalAttrs.version}-stable/guestfs-tools-${finalAttrs.version}.tar.gz"; + hash = "sha256-02khDS2NLG1QOSqswtDoqBX2Mg6sE/OiUoP9JFs4vTU="; + }; + + nativeBuildInputs = + [ + bison + cdrkit + cpio + flex + getopt + makeWrapper + pkg-config + qemu + ] + ++ (with perlPackages; [ + GetoptLong + libintl-perl + ModuleBuild + perl + Po4a + ]) + ++ (with ocamlPackages; [ + findlib + ocaml + ounit2 + ]); + + buildInputs = [ + bash-completion + glib + hivex + jansson + libguestfs-with-appliance + libosinfo + libvirt + libxml2 + ncurses + openssl + pcre2 + xz + ]; + + postPatch = '' + # If it uses the executable name, then there's nothing we can do + # when wrapping to stop it looking in + # $out/etc/.virt-builder-wrapped, which won't exist. + substituteInPlace common/mlstdutils/std_utils.ml \ + --replace Sys.executable_name '(Array.get Sys.argv 0)' + ''; + + preConfigure = '' + patchShebangs ocaml-dep.sh.in ocaml-link.sh.in run.in + ''; + + makeFlags = [ + "LIBGUESTFS_PATH=${libguestfs-with-appliance}/lib/guestfs" + ]; + + installFlags = [ + "BASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completion/completions" + ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/virt-builder \ + --argv0 virt-builder \ + --prefix PATH : ${ + lib.makeBinPath [ + curl + gnupg + ] + }:$out/bin \ + --suffix VIRT_BUILDER_DIRS : /etc:$out/etc + wrapProgram $out/bin/virt-win-reg \ + --prefix PERL5LIB : ${ + with perlPackages; + makeFullPerlPath [ + hivex + libintl-perl + libguestfs-with-appliance + ] + } + ''; + + passthru.updateScript = gitUpdater { + url = "https://github.com/libguestfs/guestfs-tools"; + rev-prefix = "v"; + odd-unstable = true; + }; + + meta = { + description = "Extra tools for accessing and modifying virtual machine disk images"; + license = with lib.licenses; [ + gpl2Plus + lgpl21Plus + ]; + homepage = "https://libguestfs.org/"; + changelog = "https://www.libguestfs.org/guestfs-tools-release-notes-${lib.versions.majorMinor finalAttrs.version}.1.html"; + maintainers = [ ]; + platforms = lib.platforms.linux; + hydraPlatforms = [ ]; + }; +}) diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/by-name/gu/guetzli/package.nix similarity index 100% rename from pkgs/applications/graphics/guetzli/default.nix rename to pkgs/by-name/gu/guetzli/package.nix diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/by-name/gu/guff/package.nix similarity index 100% rename from pkgs/tools/graphics/guff/default.nix rename to pkgs/by-name/gu/guff/package.nix diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix new file mode 100644 index 000000000000..b4c5263a5d6d --- /dev/null +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -0,0 +1,140 @@ +{ + stdenv, + nodejs, + pnpm, + fetchFromGitHub, + buildGoModule, + lib, + wails, + webkitgtk_4_0, + pkg-config, + libsoup_3, + wrapGAppsHook3, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, +}: +let + pname = "gui-for-clash"; + version = "1.8.9"; + src = fetchFromGitHub { + owner = "GUI-for-Cores"; + repo = "GUI.for.Clash"; + rev = "v${version}"; + hash = "sha256-jNYMv3gPbZV2JlTV0v0NQ06HkXDzgHXuEdJrBgQ+p2g="; + }; + frontend = stdenv.mkDerivation (finalAttrs: { + inherit pname version src; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + hash = "sha256-RQtU61H1YklCgJrlyHALxUZp8OvVs2MgFThWBsYk2cs="; + }; + + sourceRoot = "${finalAttrs.src.name}/frontend"; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out/ + cp -r ./dist/* $out/ + + runHook postInstall + ''; + + meta = { + description = "GUI program developed by vue3"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; + }); +in +buildGoModule { + inherit pname version src; + + vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg="; + + nativeBuildInputs = [ + wails + pkg-config + wrapGAppsHook3 + autoPatchelfHook + copyDesktopItems + ]; + + buildInputs = [ + webkitgtk_4_0 + libsoup_3 + ]; + + desktopItems = [ + (makeDesktopItem { + name = "GUI.for.Clash"; + exec = "GUI.for.Clash"; + icon = "GUI.for.Clash"; + genericName = "GUI.for.Clash"; + desktopName = "GUI.for.Clash"; + categories = [ + "Network" + ]; + keywords = [ + "Proxy" + ]; + }) + ]; + + postUnpack = '' + cp -r ${frontend} $sourceRoot/frontend/dist + ''; + + postPatch = '' + sed -i '/exePath, err := os.Executable()/,+3d' bridge/bridge.go + substituteInPlace bridge/bridge.go \ + --replace-fail "Env.BasePath = filepath.Dir(exePath)" "" \ + --replace-fail "Env.AppName = filepath.Base(exePath)" "Env.AppName = \"GUI.for.Clash\" + Env.BasePath = filepath.Join(os.Getenv(\"HOME\"), \".config\", Env.AppName)" \ + --replace-fail 'exePath := Env.BasePath' 'exePath := "${placeholder "out"}/bin"' + ''; + + buildPhase = '' + runHook preBuild + + wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.Clash + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp -r ./build/bin $out/bin + cp build/appicon.png $out/share/pixmaps/GUI.for.Clash.png + + runHook postInstall + ''; + + meta = { + description = "Clash GUI program developed by vue3 + wails"; + homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash"; + mainProgram = "GUI.for.Clash"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/gu/gui-for-singbox/bridge.patch b/pkgs/by-name/gu/gui-for-singbox/bridge.patch new file mode 100644 index 000000000000..d919c8b57ce9 --- /dev/null +++ b/pkgs/by-name/gu/gui-for-singbox/bridge.patch @@ -0,0 +1,34 @@ +--- old/bridge/bridge.go 2024-11-03 02:07:33.553972040 +0800 ++++ new/bridge/bridge.go 2024-11-03 02:10:09.239584378 +0800 +@@ -38,11 +38,6 @@ + + func InitBridge(fs embed.FS) { + // step1: Set Env +- exePath, err := os.Executable() +- if err != nil { +- panic(err) +- } +- + for _, v := range os.Args { + if v == "tasksch" { + Env.FromTaskSch = true +@@ -50,8 +45,8 @@ + } + } + +- Env.BasePath = filepath.Dir(exePath) +- Env.AppName = filepath.Base(exePath) ++ Env.AppName = "GUI.for.SingBox" ++ Env.BasePath = filepath.Join(os.Getenv("HOME"), ".config", Env.AppName) + + // step2: Create a persistent data symlink + if Env.OS == "darwin" { +@@ -128,7 +123,7 @@ + } + + func (a *App) RestartApp() FlagResult { +- exePath := Env.BasePath + "/" + Env.AppName ++ exePath := Env.AppName + + cmd := exec.Command(exePath) + HideExecWindow(cmd) diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix new file mode 100644 index 000000000000..9531875fb418 --- /dev/null +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -0,0 +1,133 @@ +{ + stdenv, + nodejs, + pnpm, + fetchFromGitHub, + buildGoModule, + lib, + wails, + webkitgtk_4_0, + pkg-config, + libsoup_3, + wrapGAppsHook3, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, +}: +let + pname = "gui-for-singbox"; + version = "1.8.9"; + src = fetchFromGitHub { + owner = "GUI-for-Cores"; + repo = "GUI.for.SingBox"; + rev = "v${version}"; + hash = "sha256-mN+j2O/pM+kblmxZjVWvHXLHJSxydxLRh/Fol2+WALE="; + }; + frontend = stdenv.mkDerivation (finalAttrs: { + inherit pname version src; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + hash = "sha256-bAgyGZLmEr8tMunoeQHl+B2IDGr4Gw3by1lC811lqio="; + }; + + sourceRoot = "${finalAttrs.src.name}/frontend"; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out/ + cp -r ./dist/* $out/ + + runHook postInstall + ''; + + meta = { + description = "GUI program developed by vue3"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; + }); +in +buildGoModule { + inherit pname version src; + + vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg="; + + nativeBuildInputs = [ + wails + pkg-config + wrapGAppsHook3 + autoPatchelfHook + copyDesktopItems + ]; + + buildInputs = [ + webkitgtk_4_0 + libsoup_3 + ]; + + desktopItems = [ + (makeDesktopItem { + name = "GUI.for.SingBox"; + exec = "GUI.for.SingBox"; + icon = "GUI.for.SingBox"; + genericName = "GUI.for.SingBox"; + desktopName = "GUI.for.SingBox"; + categories = [ + "Network" + ]; + keywords = [ + "Proxy" + ]; + }) + ]; + + postUnpack = '' + cp -r ${frontend} $sourceRoot/frontend/dist + ''; + + patches = [ ./bridge.patch ]; + + buildPhase = '' + runHook preBuild + + wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.SingBox + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp -r ./build/bin $out/bin + cp build/appicon.png $out/share/pixmaps/GUI.for.SingBox.png + + runHook postInstall + ''; + + meta = { + description = "SingBox GUI program developed by vue3 + wails"; + homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox"; + mainProgram = "GUI.for.SingBox"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix index 5143c959ccd5..4d32bbb04614 100644 --- a/pkgs/by-name/gu/guile-lib/package.nix +++ b/pkgs/by-name/gu/guile-lib/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. export LD_LIBRARY_PATH=\ - "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + "$(dirname $(echo ${lib.getLib stdenv.cc.cc}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; meta = with lib; { diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix index 83879b26f7db..b996e6d84b47 100644 --- a/pkgs/by-name/gu/guile-sdl/package.nix +++ b/pkgs/by-name/gu/guile-sdl/package.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + configureFlags = [ + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") + ]; + buildInputs = [ (lib.getDev SDL) (lib.getDev SDL_image) @@ -50,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; meta = { + # clang-16: error: unsupported option '--visibility=hidden'; did you mean '-fvisibility=hidden' + broken = stdenv.hostPlatform.isDarwin; homepage = "https://www.gnu.org/software/guile-sdl/"; description = "Guile bindings for SDL"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/guilt/darwin-fix.patch b/pkgs/by-name/gu/guilt/darwin-fix.patch similarity index 100% rename from pkgs/applications/version-management/guilt/darwin-fix.patch rename to pkgs/by-name/gu/guilt/darwin-fix.patch diff --git a/pkgs/applications/version-management/guilt/guilt-help-mandir.patch b/pkgs/by-name/gu/guilt/guilt-help-mandir.patch similarity index 100% rename from pkgs/applications/version-management/guilt/guilt-help-mandir.patch rename to pkgs/by-name/gu/guilt/guilt-help-mandir.patch diff --git a/pkgs/applications/version-management/guilt/default.nix b/pkgs/by-name/gu/guilt/package.nix similarity index 100% rename from pkgs/applications/version-management/guilt/default.nix rename to pkgs/by-name/gu/guilt/package.nix diff --git a/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch b/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch deleted file mode 100644 index 0e22f0f35042..000000000000 --- a/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc -index c5383bc..50d1abc 100644 ---- a/nix/libstore/build.cc -+++ b/nix/libstore/build.cc -@@ -2312,15 +2312,6 @@ void DerivationGoal::registerOutputs() - Path actualPath = path; - if (useChroot) { - actualPath = chrootRootDir + path; -- if (pathExists(actualPath)) { -- /* Move output paths from the chroot to the store. */ -- if (buildMode == bmRepair) -- replaceValidPath(path, actualPath); -- else -- if (buildMode != bmCheck && rename(actualPath.c_str(), path.c_str()) == -1) -- throw SysError(format("moving build output `%1%' from the chroot to the store") % path); -- } -- if (buildMode != bmCheck) actualPath = path; - } else { - Path redirected = redirectedOutputs[path]; - if (buildMode == bmRepair -@@ -2360,6 +2351,21 @@ void DerivationGoal::registerOutputs() - something like that. */ - canonicalisePathMetaData(actualPath, buildUser.enabled() ? buildUser.getUID() : -1, inodesSeen); - -+ if (useChroot) { -+ if (pathExists(actualPath)) { -+ /* Now that output paths have been canonicalized (in particular -+ there are no setuid files left), move them outside of the -+ chroot and to the store. */ -+ if (buildMode == bmRepair) -+ replaceValidPath(path, actualPath); -+ else -+ if (buildMode != bmCheck && rename(actualPath.c_str(), path.c_str()) == -1) -+ throw SysError(format("moving build output `%1%' from the chroot to the store") % path); -+ } -+ if (buildMode != bmCheck) actualPath = path; -+ } -+ -+ - /* FIXME: this is in-memory. */ - StringSink sink; - dumpPath(actualPath, sink); diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix index 5752a45ae635..feb26b3ea606 100644 --- a/pkgs/by-name/gu/guix/package.nix +++ b/pkgs/by-name/gu/guix/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + fetchDebianPatch, autoreconfHook, disarchive, git, @@ -57,9 +58,19 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=ff1251de0bc327ec478fc66a562430fbf35aef42"; hash = "sha256-f4KWDVrvO/oI+4SCUHU5GandkGtHrlaM1BWygM/Qlao="; }) - # manual port of build user takeover remediation commit # see https://guix.gnu.org/en/blog/2024/build-user-takeover-vulnerability - ./guix-build-user-takeover-fix.patch + (fetchDebianPatch { + inherit pname version; + debianRevision = "8"; + patch = "security/0101-daemon-Sanitize-failed-build-outputs-prior-to-exposi.patch"; + hash = "sha256-cbra/+K8+xHUJrCKRgzJCuhMBpzCSjgjosKAkJx7QIo="; + }) + (fetchDebianPatch { + inherit pname version; + debianRevision = "8"; + patch = "security/0102-daemon-Sanitize-successful-build-outputs-prior-to-ex.patch"; + hash = "sha256-mOnlYtpIuYL+kDvSNuXuoDLJP03AA9aI2ALhap+0NOM="; + }) ]; postPatch = '' diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/by-name/gu/gum/package.nix similarity index 100% rename from pkgs/applications/misc/gum/default.nix rename to pkgs/by-name/gu/gum/package.nix diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/by-name/gu/gumbo/package.nix similarity index 100% rename from pkgs/development/libraries/gumbo/default.nix rename to pkgs/by-name/gu/gumbo/package.nix diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/by-name/gu/gummi/package.nix similarity index 100% rename from pkgs/applications/misc/gummi/default.nix rename to pkgs/by-name/gu/gummi/package.nix diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/by-name/gu/gupnp-av/package.nix similarity index 100% rename from pkgs/development/libraries/gupnp-av/default.nix rename to pkgs/by-name/gu/gupnp-av/package.nix diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/by-name/gu/gupnp-dlna/package.nix similarity index 100% rename from pkgs/development/libraries/gupnp-dlna/default.nix rename to pkgs/by-name/gu/gupnp-dlna/package.nix diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/by-name/gu/gupnp-igd/package.nix similarity index 100% rename from pkgs/development/libraries/gupnp-igd/default.nix rename to pkgs/by-name/gu/gupnp-igd/package.nix diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/by-name/gu/gupnp-tools/package.nix similarity index 100% rename from pkgs/tools/networking/gupnp-tools/default.nix rename to pkgs/by-name/gu/gupnp-tools/package.nix diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/by-name/gu/gurobi/package.nix similarity index 100% rename from pkgs/applications/science/math/gurobi/default.nix rename to pkgs/by-name/gu/gurobi/package.nix diff --git a/pkgs/development/libraries/gusb/fix-python-path.patch b/pkgs/by-name/gu/gusb/fix-python-path.patch similarity index 100% rename from pkgs/development/libraries/gusb/fix-python-path.patch rename to pkgs/by-name/gu/gusb/fix-python-path.patch diff --git a/pkgs/by-name/gu/gusb/package.nix b/pkgs/by-name/gu/gusb/package.nix new file mode 100644 index 000000000000..c49df7fd75fe --- /dev/null +++ b/pkgs/by-name/gu/gusb/package.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, meson +, ninja +, pkg-config +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, gobject-introspection +, gi-docgen +, python3 +, glib +, libusb1 +, json-glib +, vala +, hwdata +, umockdev +}: + +let + pythonEnv = python3.pythonOnBuildForHost.withPackages (ps: with ps; [ + setuptools + ]); +in +stdenv.mkDerivation rec { + pname = "gusb"; + version = "0.4.9"; + + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withIntrospection [ "devdoc" ]; + + src = fetchFromGitHub { + owner = "hughsie"; + repo = "libgusb"; + rev = "refs/tags/${version}"; + hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs="; + }; + + patches = [ + (substituteAll { + src = ./fix-python-path.patch; + python = "${pythonEnv}/bin/python3"; + }) + ]; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ] ++ lib.optionals withIntrospection [ + gobject-introspection + gi-docgen + vala + ]; + + # all required in gusb.pc + propagatedBuildInputs = [ + glib + libusb1 + json-glib + ]; + + mesonFlags = [ + (lib.mesonBool "docs" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) + (lib.mesonBool "tests" doCheck) + (lib.mesonBool "vapi" withIntrospection) + (lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids") + ]; + + checkInputs = [ + umockdev + ]; + + doCheck = false; # tests try to access USB + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + meta = with lib; { + description = "GLib libusb wrapper"; + mainProgram = "gusbcmd"; + homepage = "https://github.com/hughsie/libgusb"; + license = licenses.lgpl21; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/gut/default.nix b/pkgs/by-name/gu/gut/package.nix similarity index 100% rename from pkgs/applications/version-management/gut/default.nix rename to pkgs/by-name/gu/gut/package.nix diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/by-name/gv/gv/package.nix similarity index 100% rename from pkgs/applications/misc/gv/default.nix rename to pkgs/by-name/gv/gv/package.nix diff --git a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/pkgs/by-name/gv/gvfs/hardcode-ssh-path.patch similarity index 100% rename from pkgs/development/libraries/gvfs/hardcode-ssh-path.patch rename to pkgs/by-name/gv/gvfs/hardcode-ssh-path.patch diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix new file mode 100644 index 000000000000..046c1a59c999 --- /dev/null +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -0,0 +1,156 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, substituteAll +, gettext +, dbus +, glib +, udevSupport ? stdenv.hostPlatform.isLinux +, libgudev +, udisks2 +, libgcrypt +, libcap +, polkit +, libgphoto2 +, avahi +, libarchive +, fuse3 +, libcdio +, libxml2 +, libsoup_3 +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, samba +, libmtp +, gnomeSupport ? false +, gnome +, gcr_4 +, glib-networking +, gnome-online-accounts +, wrapGAppsHook3 +, libimobiledevice +, libbluray +, libcdio-paranoia +, libnfs +, openssh +, libsecret +, libgdata +, libmsgraph +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gvfs"; + version = "1.56.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; + hash = "sha256-hnMczsZ5ZI+HNOI3sd4ZDr3ubkyMD1b0VMMViOUJqhA="; + }; + + patches = [ + (substituteAll { + src = ./hardcode-ssh-path.patch; + ssh_program = "${lib.getBin openssh}/bin/ssh"; + }) + ]; + + postPatch = '' + patchShebangs test + ''; + + nativeBuildInputs = [ + meson + ninja + python3 + pkg-config + gettext + wrapGAppsHook3 + libxslt + docbook_xsl + docbook_xml_dtd_42 + ]; + + buildInputs = [ + glib + libgcrypt + dbus + libgphoto2 + avahi + libarchive + libimobiledevice + libbluray + libnfs + libxml2 + gsettings-desktop-schemas + libsoup_3 + ] ++ lib.optionals udevSupport [ + libgudev + udisks2 + fuse3 + libcdio + samba + libmtp + libcap + polkit + libcdio-paranoia + ] ++ lib.optionals gnomeSupport [ + gcr_4 + glib-networking # TLS support + gnome-online-accounts + libsecret + libgdata + libmsgraph + ]; + + mesonFlags = [ + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + "-Dtmpfilesdir=no" + ] ++ lib.optionals (!udevSupport) [ + "-Dgudev=false" + "-Dudisks2=false" + "-Dfuse=false" + "-Dcdda=false" + "-Dsmb=false" + "-Dmtp=false" + "-Dadmin=false" + "-Dgphoto2=false" + "-Dlibusb=false" + "-Dlogind=false" + ] ++ lib.optionals (!gnomeSupport) [ + "-Dgcr=false" + "-Dgoa=false" + "-Dkeyring=false" + "-Dgoogle=false" + "-Donedrive=false" + ] ++ lib.optionals (avahi == null) [ + "-Ddnssd=false" + ] ++ lib.optionals (samba == null) [ + # Xfce don't want samba + "-Dsmb=false" + ]; + + doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" + doInstallCheck = finalAttrs.finalPackage.doCheck; + + separateDebugInfo = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gvfs"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +}) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/by-name/gv/gvm-libs/package.nix similarity index 100% rename from pkgs/development/libraries/gvm-libs/default.nix rename to pkgs/by-name/gv/gvm-libs/package.nix diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/by-name/gv/gvolicon/package.nix similarity index 100% rename from pkgs/tools/audio/gvolicon/default.nix rename to pkgs/by-name/gv/gvolicon/package.nix diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/by-name/gv/gvpe/package.nix similarity index 100% rename from pkgs/tools/networking/gvpe/default.nix rename to pkgs/by-name/gv/gvpe/package.nix diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/by-name/gv/gvproxy/package.nix similarity index 100% rename from pkgs/tools/networking/gvproxy/default.nix rename to pkgs/by-name/gv/gvproxy/package.nix diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/by-name/gw/gwc/package.nix similarity index 100% rename from pkgs/applications/audio/gwc/default.nix rename to pkgs/by-name/gw/gwc/package.nix diff --git a/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/pkgs/by-name/gw/gwyddion/codegen.patch similarity index 100% rename from pkgs/applications/science/chemistry/gwyddion/codegen.patch rename to pkgs/by-name/gw/gwyddion/codegen.patch diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/by-name/gw/gwyddion/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/gwyddion/default.nix rename to pkgs/by-name/gw/gwyddion/package.nix diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/by-name/gx/gx-go/package.nix similarity index 100% rename from pkgs/tools/package-management/gx/go/default.nix rename to pkgs/by-name/gx/gx-go/package.nix diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/by-name/gx/gxkb/package.nix similarity index 100% rename from pkgs/applications/misc/gxkb/default.nix rename to pkgs/by-name/gx/gxkb/package.nix diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix similarity index 100% rename from pkgs/applications/audio/gxmatcheq-lv2/default.nix rename to pkgs/by-name/gx/gxmatcheq-lv2/package.nix diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/by-name/gx/gxmessage/package.nix similarity index 100% rename from pkgs/applications/misc/gxmessage/default.nix rename to pkgs/by-name/gx/gxmessage/package.nix diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix similarity index 100% rename from pkgs/applications/audio/gxplugins-lv2/default.nix rename to pkgs/by-name/gx/gxplugins-lv2/package.nix diff --git a/pkgs/tools/backup/gyb/default.nix b/pkgs/by-name/gy/gyb/package.nix similarity index 100% rename from pkgs/tools/backup/gyb/default.nix rename to pkgs/by-name/gy/gyb/package.nix diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/by-name/gy/gyre-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/gyre/default.nix rename to pkgs/by-name/gy/gyre-fonts/package.nix diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 5277ad263d78..dee7b1971da1 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.13.1"; + version = "4.13.2"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-pp05tcXFM2NqAPtOtsUprWyV6RE8MQoRSXyp56yELVI="; + hash = "sha256-3nkdpJ3XO58YHtjVTwxdSdCL6CnMcih6mTnI7FXLm34="; }; outputs = [ diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/by-name/gz/gzrt/package.nix similarity index 100% rename from pkgs/tools/compression/gzrt/default.nix rename to pkgs/by-name/gz/gzrt/package.nix diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/by-name/h2/h2o/package.nix similarity index 100% rename from pkgs/servers/http/h2o/default.nix rename to pkgs/by-name/h2/h2o/package.nix diff --git a/pkgs/applications/networking/cluster/habitat/Cargo.lock b/pkgs/by-name/ha/habitat/Cargo.lock similarity index 100% rename from pkgs/applications/networking/cluster/habitat/Cargo.lock rename to pkgs/by-name/ha/habitat/Cargo.lock diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/by-name/ha/habitat/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/habitat/default.nix rename to pkgs/by-name/ha/habitat/package.nix diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/by-name/ha/hack-font/package.nix similarity index 100% rename from pkgs/data/fonts/hack/default.nix rename to pkgs/by-name/ha/hack-font/package.nix diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/by-name/ha/hackertyper/package.nix similarity index 100% rename from pkgs/tools/misc/hackertyper/default.nix rename to pkgs/by-name/ha/hackertyper/package.nix diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/by-name/ha/hackneyed/package.nix similarity index 100% rename from pkgs/data/icons/hackneyed/default.nix rename to pkgs/by-name/ha/hackneyed/package.nix diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/by-name/ha/hackrf/package.nix similarity index 100% rename from pkgs/applications/radio/hackrf/default.nix rename to pkgs/by-name/ha/hackrf/package.nix diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/by-name/ha/hacksaw/package.nix similarity index 100% rename from pkgs/tools/misc/hacksaw/default.nix rename to pkgs/by-name/ha/hacksaw/package.nix diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/by-name/ha/hacpack/package.nix similarity index 100% rename from pkgs/tools/compression/hacpack/default.nix rename to pkgs/by-name/ha/hacpack/package.nix diff --git a/pkgs/tools/compression/hactool/musl-compat.patch b/pkgs/by-name/ha/hactool/musl-compat.patch similarity index 100% rename from pkgs/tools/compression/hactool/musl-compat.patch rename to pkgs/by-name/ha/hactool/musl-compat.patch diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/by-name/ha/hactool/package.nix similarity index 100% rename from pkgs/tools/compression/hactool/default.nix rename to pkgs/by-name/ha/hactool/package.nix diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/by-name/ha/haka/package.nix similarity index 100% rename from pkgs/tools/security/haka/default.nix rename to pkgs/by-name/ha/haka/package.nix diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/by-name/ha/hakrawler/package.nix similarity index 100% rename from pkgs/tools/security/hakrawler/default.nix rename to pkgs/by-name/ha/hakrawler/package.nix diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/by-name/ha/hakuneko/package.nix similarity index 100% rename from pkgs/tools/misc/hakuneko/default.nix rename to pkgs/by-name/ha/hakuneko/package.nix diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/by-name/ha/half/package.nix similarity index 100% rename from pkgs/development/libraries/half/default.nix rename to pkgs/by-name/ha/half/package.nix diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/by-name/ha/halfempty/package.nix similarity index 100% rename from pkgs/development/tools/halfempty/default.nix rename to pkgs/by-name/ha/halfempty/package.nix diff --git a/pkgs/applications/graphics/halftone/default.nix b/pkgs/by-name/ha/halftone/package.nix similarity index 100% rename from pkgs/applications/graphics/halftone/default.nix rename to pkgs/by-name/ha/halftone/package.nix diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/by-name/ha/halibut/package.nix similarity index 100% rename from pkgs/tools/typesetting/halibut/default.nix rename to pkgs/by-name/ha/halibut/package.nix diff --git a/pkgs/tools/misc/halp/fix-target-dir.patch b/pkgs/by-name/ha/halp/fix-target-dir.patch similarity index 100% rename from pkgs/tools/misc/halp/fix-target-dir.patch rename to pkgs/by-name/ha/halp/fix-target-dir.patch diff --git a/pkgs/tools/misc/halp/default.nix b/pkgs/by-name/ha/halp/package.nix similarity index 100% rename from pkgs/tools/misc/halp/default.nix rename to pkgs/by-name/ha/halp/package.nix diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/by-name/ha/hammer/package.nix similarity index 100% rename from pkgs/development/tools/parsing/hammer/default.nix rename to pkgs/by-name/ha/hammer/package.nix diff --git a/pkgs/applications/networking/instant-messengers/hamsket/default.nix b/pkgs/by-name/ha/hamsket/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/hamsket/default.nix rename to pkgs/by-name/ha/hamsket/package.nix diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/by-name/ha/hamster/package.nix similarity index 100% rename from pkgs/applications/misc/hamster/default.nix rename to pkgs/by-name/ha/hamster/package.nix diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/by-name/ha/hanazono/package.nix similarity index 100% rename from pkgs/data/fonts/hanazono/default.nix rename to pkgs/by-name/ha/hanazono/package.nix diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/by-name/ha/handlr/package.nix similarity index 100% rename from pkgs/tools/misc/handlr/default.nix rename to pkgs/by-name/ha/handlr/package.nix diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/by-name/ha/hannom/package.nix similarity index 100% rename from pkgs/data/fonts/hannom/default.nix rename to pkgs/by-name/ha/hannom/package.nix diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/by-name/ha/hans/package.nix similarity index 100% rename from pkgs/tools/networking/hans/default.nix rename to pkgs/by-name/ha/hans/package.nix diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/by-name/ha/haproxy/package.nix similarity index 100% rename from pkgs/tools/networking/haproxy/default.nix rename to pkgs/by-name/ha/haproxy/package.nix diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/by-name/ha/hardinfo/package.nix similarity index 100% rename from pkgs/tools/system/hardinfo/default.nix rename to pkgs/by-name/ha/hardinfo/package.nix diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/by-name/ha/harminv/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/harminv/default.nix rename to pkgs/by-name/ha/harminv/package.nix diff --git a/pkgs/games/harmonist/default.nix b/pkgs/by-name/ha/harmonist/package.nix similarity index 100% rename from pkgs/games/harmonist/default.nix rename to pkgs/by-name/ha/harmonist/package.nix diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/by-name/ha/harsh/package.nix similarity index 100% rename from pkgs/applications/misc/harsh/default.nix rename to pkgs/by-name/ha/harsh/package.nix diff --git a/pkgs/applications/misc/has/default.nix b/pkgs/by-name/ha/has/package.nix similarity index 100% rename from pkgs/applications/misc/has/default.nix rename to pkgs/by-name/ha/has/package.nix diff --git a/pkgs/games/hase/default.nix b/pkgs/by-name/ha/hase/package.nix similarity index 100% rename from pkgs/games/hase/default.nix rename to pkgs/by-name/ha/hase/package.nix diff --git a/pkgs/games/hase/prefer-dynamic.patch b/pkgs/by-name/ha/hase/prefer-dynamic.patch similarity index 100% rename from pkgs/games/hase/prefer-dynamic.patch rename to pkgs/by-name/ha/hase/prefer-dynamic.patch diff --git a/pkgs/tools/security/hash-identifier/default.nix b/pkgs/by-name/ha/hash-identifier/package.nix similarity index 100% rename from pkgs/tools/security/hash-identifier/default.nix rename to pkgs/by-name/ha/hash-identifier/package.nix diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/by-name/ha/hash-slinger/package.nix similarity index 100% rename from pkgs/tools/security/hash-slinger/default.nix rename to pkgs/by-name/ha/hash-slinger/package.nix diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/by-name/ha/hash_extender/package.nix similarity index 100% rename from pkgs/tools/security/hash_extender/default.nix rename to pkgs/by-name/ha/hash_extender/package.nix diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/by-name/ha/hashcash/package.nix similarity index 100% rename from pkgs/tools/security/hashcash/default.nix rename to pkgs/by-name/ha/hashcash/package.nix diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/by-name/ha/hashcat-utils/package.nix similarity index 100% rename from pkgs/tools/security/hashcat-utils/default.nix rename to pkgs/by-name/ha/hashcat-utils/package.nix diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/by-name/ha/hashdeep/package.nix similarity index 100% rename from pkgs/tools/security/hashdeep/default.nix rename to pkgs/by-name/ha/hashdeep/package.nix diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/by-name/ha/hashi-ui/package.nix similarity index 100% rename from pkgs/servers/hashi-ui/default.nix rename to pkgs/by-name/ha/hashi-ui/package.nix diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/by-name/ha/hashi-up/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/hashi-up/default.nix rename to pkgs/by-name/ha/hashi-up/package.nix diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/by-name/ha/hashit/package.nix similarity index 100% rename from pkgs/tools/misc/hashit/default.nix rename to pkgs/by-name/ha/hashit/package.nix diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/by-name/ha/hashlink/package.nix similarity index 100% rename from pkgs/development/interpreters/hashlink/default.nix rename to pkgs/by-name/ha/hashlink/package.nix diff --git a/pkgs/tools/misc/hashpump/default.nix b/pkgs/by-name/ha/hashpump/package.nix similarity index 100% rename from pkgs/tools/misc/hashpump/default.nix rename to pkgs/by-name/ha/hashpump/package.nix diff --git a/pkgs/by-name/ha/hashrat/package.nix b/pkgs/by-name/ha/hashrat/package.nix new file mode 100644 index 000000000000..f7ebc1179093 --- /dev/null +++ b/pkgs/by-name/ha/hashrat/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "hashrat"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "ColumPaget"; + repo = "Hashrat"; + rev = "v${version}"; + hash = "sha256-mjjK315OUUFVdUY+zcCvm7yeo7XxourR1sghWbeFT7c="; + }; + + patches = [ + # fix cross compilation by replacing hardcoded ar with AC_PROG_AR + # https://github.com/ColumPaget/Hashrat/pull/27 + (fetchpatch { + url = "https://github.com/ColumPaget/Hashrat/commit/a82615e02021245850a1703e613055da2520c8fd.patch"; + hash = "sha256-tjyhM2ahZBRoRP8WjyQhrI3l20oaqMtfYmOeAZVEZqU="; + }) + ]; + + configureFlags = [ "--enable-xattr" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Command-line hash-generation utility"; + mainProgram = "hashrat"; + longDescription = '' + Hashing tool supporting md5,sha1,sha256,sha512,whirlpool,jh and hmac versions of these. + Includes recursive file hashing and other features. + ''; + homepage = "http://www.cjpaget.co.uk/Code/Hashrat"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/by-name/ha/hasklig/package.nix similarity index 100% rename from pkgs/data/fonts/hasklig/default.nix rename to pkgs/by-name/ha/hasklig/package.nix diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/by-name/ha/hasmail/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/hasmail/default.nix rename to pkgs/by-name/ha/hasmail/package.nix diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/by-name/ha/haste-server/package.nix similarity index 100% rename from pkgs/servers/haste-server/default.nix rename to pkgs/by-name/ha/haste-server/package.nix diff --git a/pkgs/applications/emulators/hatari/default.nix b/pkgs/by-name/ha/hatari/package.nix similarity index 100% rename from pkgs/applications/emulators/hatari/default.nix rename to pkgs/by-name/ha/hatari/package.nix diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/by-name/ha/haveged/package.nix similarity index 100% rename from pkgs/tools/security/haveged/default.nix rename to pkgs/by-name/ha/haveged/package.nix diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/by-name/ha/hawknl/package.nix similarity index 100% rename from pkgs/development/libraries/hawknl/default.nix rename to pkgs/by-name/ha/hawknl/package.nix diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/by-name/ha/haxor-news/package.nix similarity index 100% rename from pkgs/applications/misc/haxor-news/default.nix rename to pkgs/by-name/ha/haxor-news/package.nix diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix new file mode 100644 index 000000000000..c668cd8bb259 --- /dev/null +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "hayagriva"; + version = "0.8.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-B0q5jwJVDpxywTuSspsfDameDfEkok5oTz/Oty9LkOI="; + }; + + cargoHash = "sha256-N+3W4x5p5qas47uwVT0NrJNe9udE+0rQLx/ypo1pbR4="; + + buildFeatures = [ "cli" ]; + + checkFlags = [ + # requires internet access + "--skip=try_archive" + "--skip=always_archive" + + # requires a separate large repository + "--skip=csl::tests::test_csl" + ]; + + meta = with lib; { + description = "Work with references: Literature database management, storage, and citation formatting"; + homepage = "https://github.com/typst/hayagriva"; + changelog = "https://github.com/typst/hayagriva/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "hayagriva"; + }; +} diff --git a/pkgs/tools/networking/hblock/default.nix b/pkgs/by-name/hb/hblock/package.nix similarity index 100% rename from pkgs/tools/networking/hblock/default.nix rename to pkgs/by-name/hb/hblock/package.nix diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/by-name/hc/hck/package.nix similarity index 100% rename from pkgs/tools/text/hck/default.nix rename to pkgs/by-name/hc/hck/package.nix diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/by-name/hc/hcl2json/package.nix similarity index 100% rename from pkgs/applications/misc/hcl2json/default.nix rename to pkgs/by-name/hc/hcl2json/package.nix diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/by-name/hc/hcledit/package.nix similarity index 100% rename from pkgs/tools/text/hcledit/default.nix rename to pkgs/by-name/hc/hcledit/package.nix diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/by-name/hc/hcloud/package.nix similarity index 100% rename from pkgs/development/tools/hcloud/default.nix rename to pkgs/by-name/hc/hcloud/package.nix diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/by-name/hc/hcxdumptool/package.nix similarity index 100% rename from pkgs/tools/security/hcxdumptool/default.nix rename to pkgs/by-name/hc/hcxdumptool/package.nix diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/by-name/hc/hcxtools/package.nix similarity index 100% rename from pkgs/tools/security/hcxtools/default.nix rename to pkgs/by-name/hc/hcxtools/package.nix diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/by-name/hd/hd-idle/package.nix similarity index 100% rename from pkgs/os-specific/linux/hd-idle/default.nix rename to pkgs/by-name/hd/hd-idle/package.nix diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/by-name/hd/hdaps-gl/package.nix similarity index 100% rename from pkgs/tools/misc/hdaps-gl/default.nix rename to pkgs/by-name/hd/hdaps-gl/package.nix diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/by-name/hd/hdapsd/package.nix similarity index 100% rename from pkgs/os-specific/linux/hdapsd/default.nix rename to pkgs/by-name/hd/hdapsd/package.nix diff --git a/pkgs/os-specific/linux/hdapsd/postInstall.sh b/pkgs/by-name/hd/hdapsd/postInstall.sh similarity index 100% rename from pkgs/os-specific/linux/hdapsd/postInstall.sh rename to pkgs/by-name/hd/hdapsd/postInstall.sh diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/by-name/hd/hdate/package.nix similarity index 100% rename from pkgs/applications/misc/hdate/default.nix rename to pkgs/by-name/hd/hdate/package.nix diff --git a/pkgs/tools/system/hddfancontrol/default.nix b/pkgs/by-name/hd/hddfancontrol/package.nix similarity index 100% rename from pkgs/tools/system/hddfancontrol/default.nix rename to pkgs/by-name/hd/hddfancontrol/package.nix diff --git a/pkgs/tools/misc/hddtemp/byteswap.patch b/pkgs/by-name/hd/hddtemp/byteswap.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/byteswap.patch rename to pkgs/by-name/hd/hddtemp/byteswap.patch diff --git a/pkgs/tools/misc/hddtemp/dontwake.patch b/pkgs/by-name/hd/hddtemp/dontwake.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/dontwake.patch rename to pkgs/by-name/hd/hddtemp/dontwake.patch diff --git a/pkgs/tools/misc/hddtemp/execinfo.patch b/pkgs/by-name/hd/hddtemp/execinfo.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/execinfo.patch rename to pkgs/by-name/hd/hddtemp/execinfo.patch diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/by-name/hd/hddtemp/package.nix similarity index 100% rename from pkgs/tools/misc/hddtemp/default.nix rename to pkgs/by-name/hd/hddtemp/package.nix diff --git a/pkgs/tools/misc/hddtemp/satacmds.patch b/pkgs/by-name/hd/hddtemp/satacmds.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/satacmds.patch rename to pkgs/by-name/hd/hddtemp/satacmds.patch diff --git a/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/pkgs/by-name/hd/hdf4/darwin-aarch64.patch similarity index 100% rename from pkgs/tools/misc/hdf4/darwin-aarch64.patch rename to pkgs/by-name/hd/hdf4/darwin-aarch64.patch diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix new file mode 100644 index 000000000000..ca839a6bea34 --- /dev/null +++ b/pkgs/by-name/hd/hdf4/package.nix @@ -0,0 +1,169 @@ +{ + lib, + stdenv, + fetchpatch, + fetchurl, + fixDarwinDylibNames, + cmake, + libjpeg, + uselibtirpc ? stdenv.hostPlatform.isLinux, + libtirpc, + zlib, + szipSupport ? false, + szip, + javaSupport ? false, + jdk, + fortranSupport ? false, + gfortran, + netcdfSupport ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hdf"; + version = "4.2.15"; + + src = fetchurl { + url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2"; + hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI="; + }; + + patches = [ + # Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch"; + hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU="; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch"; + hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY="; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch"; + hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo="; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch"; + hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q="; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch"; + hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ="; + }) + ./darwin-aarch64.patch + ]; + + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ] + ++ lib.optional fortranSupport gfortran; + + buildInputs = + [ + libjpeg + zlib + ] + ++ lib.optional javaSupport jdk + ++ lib.optional szipSupport szip + ++ lib.optional uselibtirpc libtirpc; + + preConfigure = + lib.optionalString uselibtirpc '' + # Make tirpc discovery work with CMAKE_PREFIX_PATH + substituteInPlace config/cmake/FindXDR.cmake \ + --replace-fail 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ + 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' + '' + + lib.optionalString szipSupport '' + export SZIP_INSTALL=${szip} + ''; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "HDF4_BUILD_TOOLS" true) + (lib.cmakeBool "HDF4_BUILD_UTILS" true) + (lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" false) + (lib.cmakeBool "HDF4_ENABLE_JPEG_LIB_SUPPORT" true) + (lib.cmakeBool "HDF4_ENABLE_Z_LIB_SUPPORT" true) + (lib.cmakeBool "HDF4_ENABLE_NETCDF" netcdfSupport) + (lib.cmakeBool "HDF4_BUILD_FORTRAN" fortranSupport) + (lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport) + (lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport) + (lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + ] + ++ lib.optionals javaSupport [ + (lib.cmakeFeature "JAVA_HOME" "${jdk}") + ] + ++ lib.optionals fortranSupport [ + (lib.cmakeFeature "CMAKE_Fortran_FLAGS" "-fallow-argument-mismatch") + ] + # using try_run would set these, but that requires a cross-compiling emulator to be available + # instead, we mark them as if the try_run calls returned a non-zero exit code + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + (lib.cmakeFeature "TEST_LFS_WORKS_RUN" "1") + (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN" "1") + (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT" "") + ]; + + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "MFHDF_TEST-hdftest" + "MFHDF_TEST-hdftest-shared" + "HDP-dumpsds-18" + "NC_TEST-nctest" + ]; + + checkPhase = + let + excludedTestsRegex = lib.optionalString ( + finalAttrs.excludedTests != [ ] + ) "(${lib.concatStringsSep "|" finalAttrs.excludedTests})"; + in + '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; + + outputs = [ + "bin" + "dev" + "out" + ]; + + postInstall = '' + moveToOutput bin "$bin" + ''; + + passthru = { + inherit + uselibtirpc + libtirpc + szipSupport + szip + javaSupport + jdk + ; + }; + + meta = with lib; { + description = "Data model, library, and file format for storing and managing data"; + homepage = "https://support.hdfgroup.org/products/hdf4/"; + maintainers = with maintainers; [ knedlsepp ]; + platforms = platforms.unix; + license = licenses.bsdOriginal; + }; +}) diff --git a/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/pkgs/by-name/hd/hdf5-blosc/blosc_filter.pc.in similarity index 100% rename from pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in rename to pkgs/by-name/hd/hdf5-blosc/blosc_filter.pc.in diff --git a/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch similarity index 100% rename from pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch rename to pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix similarity index 100% rename from pkgs/development/libraries/hdf5-blosc/default.nix rename to pkgs/by-name/hd/hdf5-blosc/package.nix diff --git a/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch b/pkgs/by-name/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch similarity index 100% rename from pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch rename to pkgs/by-name/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch diff --git a/pkgs/tools/misc/hdfview/disable-mac-signing.patch b/pkgs/by-name/hd/hdfview/disable-mac-signing.patch similarity index 100% rename from pkgs/tools/misc/hdfview/disable-mac-signing.patch rename to pkgs/by-name/hd/hdfview/disable-mac-signing.patch diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/by-name/hd/hdfview/package.nix similarity index 100% rename from pkgs/tools/misc/hdfview/default.nix rename to pkgs/by-name/hd/hdfview/package.nix diff --git a/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch b/pkgs/by-name/hd/hdfview/remove-properties-timestamp.patch similarity index 100% rename from pkgs/tools/misc/hdfview/remove-properties-timestamp.patch rename to pkgs/by-name/hd/hdfview/remove-properties-timestamp.patch diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/by-name/hd/hdhomerun-config-gui/package.nix similarity index 100% rename from pkgs/applications/video/hdhomerun-config-gui/default.nix rename to pkgs/by-name/hd/hdhomerun-config-gui/package.nix diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/by-name/hd/hdl-dump/package.nix similarity index 100% rename from pkgs/tools/misc/hdl-dump/default.nix rename to pkgs/by-name/hd/hdl-dump/package.nix diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/by-name/hd/hdparm/package.nix similarity index 100% rename from pkgs/os-specific/linux/hdparm/default.nix rename to pkgs/by-name/hd/hdparm/package.nix diff --git a/pkgs/misc/hdt/default.nix b/pkgs/by-name/hd/hdt/package.nix similarity index 100% rename from pkgs/misc/hdt/default.nix rename to pkgs/by-name/hd/hdt/package.nix diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/by-name/he/headache/package.nix similarity index 100% rename from pkgs/development/tools/headache/default.nix rename to pkgs/by-name/he/headache/package.nix diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/by-name/he/headlines/package.nix similarity index 100% rename from pkgs/applications/networking/headlines/default.nix rename to pkgs/by-name/he/headlines/package.nix diff --git a/pkgs/servers/headphones/default.nix b/pkgs/by-name/he/headphones/package.nix similarity index 100% rename from pkgs/servers/headphones/default.nix rename to pkgs/by-name/he/headphones/package.nix diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/by-name/he/headset-charge-indicator/package.nix similarity index 100% rename from pkgs/tools/audio/headset-charge-indicator/default.nix rename to pkgs/by-name/he/headset-charge-indicator/package.nix diff --git a/pkgs/applications/audio/headset/default.nix b/pkgs/by-name/he/headset/package.nix similarity index 100% rename from pkgs/applications/audio/headset/default.nix rename to pkgs/by-name/he/headset/package.nix diff --git a/pkgs/tools/audio/headsetcontrol/default.nix b/pkgs/by-name/he/headsetcontrol/package.nix similarity index 100% rename from pkgs/tools/audio/headsetcontrol/default.nix rename to pkgs/by-name/he/headsetcontrol/package.nix diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/by-name/he/health-check/package.nix similarity index 100% rename from pkgs/os-specific/linux/health-check/default.nix rename to pkgs/by-name/he/health-check/package.nix diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix new file mode 100644 index 000000000000..499a190dd355 --- /dev/null +++ b/pkgs/by-name/he/health/package.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, rustPlatform +, rustc +, cargo +, wrapGAppsHook4 +, blueprint-compiler +, libadwaita +, libsecret +, tinysparql +, darwin +}: + +stdenv.mkDerivation rec { + pname = "health"; + version = "0.95.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + blueprint-compiler + ]; + + buildInputs = [ + libadwaita + libsecret + tinysparql + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.Foundation + ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" + ]); + + meta = with lib; { + description = "Health tracking app for the GNOME desktop"; + homepage = "https://apps.gnome.org/app/dev.Cogitri.Health"; + license = licenses.gpl3Plus; + mainProgram = "dev.Cogitri.Health"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/by-name/he/healthchecks/package.nix similarity index 100% rename from pkgs/servers/web-apps/healthchecks/default.nix rename to pkgs/by-name/he/healthchecks/package.nix diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/by-name/he/heatseeker/package.nix similarity index 100% rename from pkgs/tools/misc/heatseeker/default.nix rename to pkgs/by-name/he/heatseeker/package.nix diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/by-name/he/heatshrink/package.nix similarity index 100% rename from pkgs/tools/compression/heatshrink/default.nix rename to pkgs/by-name/he/heatshrink/package.nix diff --git a/pkgs/by-name/ma/matrix-hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix similarity index 100% rename from pkgs/by-name/ma/matrix-hebbot/package.nix rename to pkgs/by-name/he/hebbot/package.nix diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/by-name/he/hebcal/package.nix similarity index 100% rename from pkgs/tools/misc/hebcal/default.nix rename to pkgs/by-name/he/hebcal/package.nix diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/by-name/he/hecate/package.nix similarity index 100% rename from pkgs/applications/editors/hecate/default.nix rename to pkgs/by-name/he/hecate/package.nix diff --git a/pkgs/tools/admin/hedgedoc-cli/default.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix similarity index 100% rename from pkgs/tools/admin/hedgedoc-cli/default.nix rename to pkgs/by-name/he/hedgedoc-cli/package.nix diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/by-name/he/hedgedoc/package.nix similarity index 100% rename from pkgs/servers/web-apps/hedgedoc/default.nix rename to pkgs/by-name/he/hedgedoc/package.nix diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix new file mode 100644 index 000000000000..0817f2173961 --- /dev/null +++ b/pkgs/by-name/he/heh/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "heh"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "ndd7xv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; + }; + + cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; + + meta = with lib; { + description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; + homepage = "https://github.com/ndd7xv/heh"; + changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ piturnah ]; + mainProgram = "heh"; + }; +} diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/by-name/he/heisenbridge/package.nix similarity index 100% rename from pkgs/servers/heisenbridge/default.nix rename to pkgs/by-name/he/heisenbridge/package.nix diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix new file mode 100644 index 000000000000..70a1ffe91b0f --- /dev/null +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub +, alsa-lib, freetype, xorg, curl, libGL, libjack2, zenity +, pkg-config, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helio-workstation"; + version = "3.14"; + + src = fetchFromGitHub { + owner = "helio-fm"; + repo = pname; + rev = version; + fetchSubmodules = true; + hash = "sha256-o8vMHt6ypHY7HOHnhMifQphxGb5MjSg3hREVOnIdqfc="; + }; + + buildInputs = [ + alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 zenity + ]; + + nativeBuildInputs = [ pkg-config makeWrapper ]; + + preBuild = '' + cd Projects/LinuxMakefile + substituteInPlace Makefile --replace alsa "alsa jack" + ''; + buildFlags = [ "CONFIG=Release64" ]; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 build/helio $out/bin + wrapProgram $out/bin/helio --prefix PATH ":" ${zenity}/bin + + mkdir -p $out/share + cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share + substituteInPlace $out/share/applications/Helio.desktop \ + --replace "/usr/bin/helio" "$out/bin/helio" + ''; + + meta = with lib; { + description = "One music sequencer for all major platforms, both desktop and mobile"; + mainProgram = "helio"; + homepage = "https://helio.fm/"; + license = licenses.gpl3Only; + maintainers = [ maintainers.suhr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/he/helix-gpt/pin.json b/pkgs/by-name/he/helix-gpt/pin.json index dd6dfb5d0a65..c9b18a14cee5 100644 --- a/pkgs/by-name/he/helix-gpt/pin.json +++ b/pkgs/by-name/he/helix-gpt/pin.json @@ -1,8 +1,8 @@ { - "version": "0.31", - "srcHash": "sha256-wDVeX1tHw9pTxYLRkr8BJlF5XIee0/e0f5hzes4ui/o=", - "x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=", - "x86_64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=", - "aarch64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=", - "aarch64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=" + "version": "0.34", + "srcHash": "sha256-F2E+B4kKLpX4g/iCv0i71hSx4xdV6fdkwksslELdZUQ=", + "x86_64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw=", + "x86_64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=", + "aarch64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=", + "aarch64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw=" } diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/by-name/he/helix/package.nix similarity index 100% rename from pkgs/applications/editors/helix/default.nix rename to pkgs/by-name/he/helix/package.nix diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/by-name/he/hello-unfree/package.nix similarity index 100% rename from pkgs/applications/misc/hello-unfree/default.nix rename to pkgs/by-name/he/hello-unfree/package.nix diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/by-name/he/hello-wayland/package.nix similarity index 100% rename from pkgs/applications/graphics/hello-wayland/default.nix rename to pkgs/by-name/he/hello-wayland/package.nix diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index 2463ce5ad6c4..0590131913f4 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA="; }; + # The GNU Hello `configure` script detects how to link libiconv but fails to actually make use of that. + # Unfortunately, this cannot be a patch to `Makefile.am` because `autoreconfHook` causes a gettext + # infrastructure mismatch error when trying to build `hello`. + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-liconv"; + }; + doCheck = true; doInstallCheck = true; diff --git a/pkgs/applications/networking/cluster/helm-dashboard/default.nix b/pkgs/by-name/he/helm-dashboard/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm-dashboard/default.nix rename to pkgs/by-name/he/helm-dashboard/package.nix diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/by-name/he/helm-docs/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm-docs/default.nix rename to pkgs/by-name/he/helm-docs/package.nix diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/by-name/he/helm-ls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/helm-ls/default.nix rename to pkgs/by-name/he/helm-ls/package.nix diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/by-name/he/helmholtz/package.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/helmholtz/default.nix rename to pkgs/by-name/he/helmholtz/package.nix diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/by-name/he/helmsman/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/helmsman/default.nix rename to pkgs/by-name/he/helmsman/package.nix diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/by-name/he/help2man/1.40.4-cygwin-nls.patch similarity index 100% rename from pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch rename to pkgs/by-name/he/help2man/1.40.4-cygwin-nls.patch diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/by-name/he/help2man/package.nix similarity index 100% rename from pkgs/development/tools/misc/help2man/default.nix rename to pkgs/by-name/he/help2man/package.nix diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/by-name/he/helvetica-neue-lt-std/package.nix similarity index 100% rename from pkgs/data/fonts/helvetica-neue-lt-std/default.nix rename to pkgs/by-name/he/helvetica-neue-lt-std/package.nix diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/by-name/he/helvum/package.nix similarity index 100% rename from pkgs/applications/audio/helvum/default.nix rename to pkgs/by-name/he/helvum/package.nix diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/by-name/he/hepmc2/package.nix similarity index 100% rename from pkgs/development/libraries/physics/hepmc2/default.nix rename to pkgs/by-name/he/hepmc2/package.nix diff --git a/pkgs/applications/misc/herbe/default.nix b/pkgs/by-name/he/herbe/package.nix similarity index 100% rename from pkgs/applications/misc/herbe/default.nix rename to pkgs/by-name/he/herbe/package.nix diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/by-name/he/herbstluftwm/package.nix similarity index 100% rename from pkgs/applications/window-managers/herbstluftwm/default.nix rename to pkgs/by-name/he/herbstluftwm/package.nix diff --git a/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch b/pkgs/by-name/he/herbstluftwm/test-path-environment.patch similarity index 100% rename from pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch rename to pkgs/by-name/he/herbstluftwm/test-path-environment.patch diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/by-name/he/hermit/package.nix similarity index 100% rename from pkgs/data/fonts/hermit/default.nix rename to pkgs/by-name/he/hermit/package.nix diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/by-name/he/heroku/package.nix similarity index 100% rename from pkgs/development/tools/heroku/default.nix rename to pkgs/by-name/he/heroku/package.nix diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/by-name/he/herwig/package.nix similarity index 100% rename from pkgs/development/libraries/physics/herwig/default.nix rename to pkgs/by-name/he/herwig/package.nix diff --git a/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch b/pkgs/by-name/he/hetzner-kube/fix-home.patch similarity index 100% rename from pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch rename to pkgs/by-name/he/hetzner-kube/fix-home.patch diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/by-name/he/hetzner-kube/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/hetzner-kube/default.nix rename to pkgs/by-name/he/hetzner-kube/package.nix diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/by-name/he/hevea/package.nix similarity index 100% rename from pkgs/tools/typesetting/hevea/default.nix rename to pkgs/by-name/he/hevea/package.nix diff --git a/pkgs/games/hex-a-hop/default.nix b/pkgs/by-name/he/hex-a-hop/package.nix similarity index 100% rename from pkgs/games/hex-a-hop/default.nix rename to pkgs/by-name/he/hex-a-hop/package.nix diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/by-name/he/hex/package.nix similarity index 100% rename from pkgs/tools/misc/hex/default.nix rename to pkgs/by-name/he/hex/package.nix diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/by-name/he/hexcurse/package.nix similarity index 100% rename from pkgs/applications/editors/hexcurse/default.nix rename to pkgs/by-name/he/hexcurse/package.nix diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/by-name/he/hexd/package.nix similarity index 100% rename from pkgs/tools/misc/hexd/default.nix rename to pkgs/by-name/he/hexd/package.nix diff --git a/pkgs/tools/misc/hexdiff/default.nix b/pkgs/by-name/he/hexdiff/package.nix similarity index 100% rename from pkgs/tools/misc/hexdiff/default.nix rename to pkgs/by-name/he/hexdiff/package.nix diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/by-name/he/hexdino/package.nix similarity index 100% rename from pkgs/applications/editors/hexdino/default.nix rename to pkgs/by-name/he/hexdino/package.nix diff --git a/pkgs/os-specific/darwin/hexfiend/default.nix b/pkgs/by-name/he/hexfiend/package.nix similarity index 100% rename from pkgs/os-specific/darwin/hexfiend/default.nix rename to pkgs/by-name/he/hexfiend/package.nix diff --git a/pkgs/games/hexgui/default.nix b/pkgs/by-name/he/hexgui/package.nix similarity index 100% rename from pkgs/games/hexgui/default.nix rename to pkgs/by-name/he/hexgui/package.nix diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/by-name/he/hexio/package.nix similarity index 100% rename from pkgs/development/tools/hexio/default.nix rename to pkgs/by-name/he/hexio/package.nix diff --git a/pkgs/development/tools/hexo-cli/default.nix b/pkgs/by-name/he/hexo-cli/package.nix similarity index 100% rename from pkgs/development/tools/hexo-cli/default.nix rename to pkgs/by-name/he/hexo-cli/package.nix diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix new file mode 100644 index 000000000000..715d8ba6f238 --- /dev/null +++ b/pkgs/by-name/he/hexyl/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "hexyl"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "hexyl"; + rev = "refs/tags/v${version}"; + hash = "sha256-v/mB0W/AyoJSoK00pqxpfMGZR/4DkkTCnPU6eorl/GI="; + }; + + cargoHash = "sha256-QaOp7dCXfkIpxAJ+J+Pt9op3uj+LYoYvR78BmHBgnqE="; + + meta = { + description = "Command-line hex viewer"; + longDescription = '' + `hexyl` is a simple hex viewer for the terminal. It uses a colored + output to distinguish different categories of bytes (NULL bytes, + printable ASCII characters, ASCII whitespace characters, other ASCII + characters and non-ASCII). + ''; + homepage = "https://github.com/sharkdp/hexyl"; + changelog = "https://github.com/sharkdp/hexyl/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ + dywedir + figsoda + SuperSandro2000 + ]; + mainProgram = "hexyl"; + }; +} diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/by-name/he/hey/package.nix similarity index 100% rename from pkgs/tools/networking/hey/default.nix rename to pkgs/by-name/he/hey/package.nix diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/by-name/he/heygpt/package.nix similarity index 100% rename from pkgs/tools/llm/heygpt/default.nix rename to pkgs/by-name/he/heygpt/package.nix diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/by-name/hf/hfinger/package.nix similarity index 100% rename from pkgs/tools/security/hfinger/default.nix rename to pkgs/by-name/hf/hfinger/package.nix diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/by-name/hf/hfsprogs/package.nix similarity index 100% rename from pkgs/tools/filesystems/hfsprogs/default.nix rename to pkgs/by-name/hf/hfsprogs/package.nix diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/by-name/hf/hfst-ospell/package.nix similarity index 100% rename from pkgs/development/libraries/hfst-ospell/default.nix rename to pkgs/by-name/hf/hfst-ospell/package.nix diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/by-name/hf/hfst/package.nix similarity index 100% rename from pkgs/development/libraries/hfst/default.nix rename to pkgs/by-name/hf/hfst/package.nix diff --git a/pkgs/games/hheretic/default.nix b/pkgs/by-name/hh/hheretic/package.nix similarity index 100% rename from pkgs/games/hheretic/default.nix rename to pkgs/by-name/hh/hheretic/package.nix diff --git a/pkgs/games/hhexen/default.nix b/pkgs/by-name/hh/hhexen/package.nix similarity index 100% rename from pkgs/games/hhexen/default.nix rename to pkgs/by-name/hh/hhexen/package.nix diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/by-name/hh/hhpc/package.nix similarity index 100% rename from pkgs/tools/misc/hhpc/default.nix rename to pkgs/by-name/hh/hhpc/package.nix diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/by-name/hi/hiawatha/package.nix similarity index 100% rename from pkgs/servers/http/hiawatha/default.nix rename to pkgs/by-name/hi/hiawatha/package.nix diff --git a/pkgs/servers/http/hiawatha/test.nix b/pkgs/by-name/hi/hiawatha/test.nix similarity index 100% rename from pkgs/servers/http/hiawatha/test.nix rename to pkgs/by-name/hi/hiawatha/test.nix diff --git a/pkgs/os-specific/linux/hibernate/gen-manpages.patch b/pkgs/by-name/hi/hibernate/gen-manpages.patch similarity index 100% rename from pkgs/os-specific/linux/hibernate/gen-manpages.patch rename to pkgs/by-name/hi/hibernate/gen-manpages.patch diff --git a/pkgs/os-specific/linux/hibernate/hibernate.patch b/pkgs/by-name/hi/hibernate/hibernate.patch similarity index 100% rename from pkgs/os-specific/linux/hibernate/hibernate.patch rename to pkgs/by-name/hi/hibernate/hibernate.patch diff --git a/pkgs/os-specific/linux/hibernate/install.patch b/pkgs/by-name/hi/hibernate/install.patch similarity index 100% rename from pkgs/os-specific/linux/hibernate/install.patch rename to pkgs/by-name/hi/hibernate/install.patch diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/by-name/hi/hibernate/package.nix similarity index 100% rename from pkgs/os-specific/linux/hibernate/default.nix rename to pkgs/by-name/hi/hibernate/package.nix diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index cf6226089097..34b93bd83798 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -1,21 +1,24 @@ -{ lib -, fetchFromGitHub -, openssl -, pkg-config -, rustPlatform +{ + lib, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "hickory-dns"; - version = "0.24.1"; + version = "0.25.0-alpha.3"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; - rev = "v${version}"; - hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-P9H21X/lZ8U/yfCL/rCuP9A1wnL7UuTcX7GlCuwo5ZQ="; }; - cargoHash = "sha256-LcMjHHEuDlhSfDXGIrSMXewraSxEgRw2g2DOoH4i5RU="; + + cargoHash = "sha256-3hiMBwr6XT4M7J5KeH9bfGYMjZqOmYDda2Iml2emYMY="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -23,12 +26,23 @@ rustPlatform.buildRustPackage rec { # tests expect internet connectivity to query real nameservers like 8.8.8.8 doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { + # remove when 0.25.0 is released + extraArgs = [ + "--version" + "unstable" + ]; + }; + + meta = { description = "Rust based DNS client, server, and resolver"; homepage = "https://hickory-dns.org/"; - maintainers = with maintainers; [ colinsane ]; - platforms = platforms.linux; - license = with licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + asl20 + mit + ]; mainProgram = "hickory-dns"; }; } diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/by-name/hi/hicolor-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/hicolor-icon-theme/default.nix rename to pkgs/by-name/hi/hicolor-icon-theme/package.nix diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/by-name/hi/hicolor-icon-theme/setup-hook.sh similarity index 100% rename from pkgs/data/icons/hicolor-icon-theme/setup-hook.sh rename to pkgs/by-name/hi/hicolor-icon-theme/setup-hook.sh diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/by-name/hi/hid-listen/package.nix similarity index 100% rename from pkgs/tools/misc/hid-listen/default.nix rename to pkgs/by-name/hi/hid-listen/package.nix diff --git a/pkgs/tools/misc/hid-tools/default.nix b/pkgs/by-name/hi/hid-tools/package.nix similarity index 100% rename from pkgs/tools/misc/hid-tools/default.nix rename to pkgs/by-name/hi/hid-tools/package.nix diff --git a/pkgs/by-name/hi/hiddify-app/package.nix b/pkgs/by-name/hi/hiddify-app/package.nix new file mode 100644 index 000000000000..172c4d65bc34 --- /dev/null +++ b/pkgs/by-name/hi/hiddify-app/package.nix @@ -0,0 +1,181 @@ +{ + lib, + fetchFromGitHub, + pkg-config, + flutter, + buildGoModule, + libayatana-appindicator, + stdenv, + fetchurl, + makeDesktopItem, + copyDesktopItems, + wrapGAppsHook3, + autoPatchelfHook, +}: +let + pname = "hiddify-app"; + version = "2.5.7-unstable-2024-10-30"; + src = fetchFromGitHub { + owner = "hiddify"; + repo = "hiddify-app"; + rev = "0144cddf670df11d1586a0dc76483f4c4f5b4230"; + hash = "sha256-bjZkc0H0409YxM6AGrhm6gPaKNj/9SiVs0AUPoLJX+o="; + fetchSubmodules = true; + }; + libcore = buildGoModule rec { + inherit pname version src; + + modRoot = "./libcore"; + + vendorHash = "sha256-a7NFZt4/w2+oaZG3ncaOrrhASxUptcWS/TeaIQrgLe4="; + + GO_PUBLIC_FLAGS = '' + -tags "with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc" \ + -trimpath \ + -ldflags "-s -w" \ + ''; + + postPatch = '' + sed -i '/import (/a\ \t"os"\n\t"path/filepath"' ./libcore/v2/db/hiddify_db.go + substituteInPlace ./libcore/v2/db/hiddify_db.go \ + --replace-fail 'NewGoLevelDBWithOpts(name, "./data", ' 'NewGoLevelDBWithOpts(name, filepath.Join(os.Getenv("HOME"), ".local", "share", "app.hiddify.com", "data"), ' + ''; + + buildPhase = '' + runHook preBuild + + go build ${GO_PUBLIC_FLAGS} -buildmode=c-shared -o bin/lib/libcore.so ./custom + mkdir lib + cp bin/lib/libcore.so ./lib/libcore.so + CGO_LDFLAGS="./lib/libcore.so" go build ${GO_PUBLIC_FLAGS} -o bin/HiddifyCli ./cli/bydll + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib + cp ./bin/HiddifyCli $out/bin/HiddifyCli + cp ./lib/libcore.so $out/lib/libcore.so + + runHook postInstall + ''; + + meta = { + description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc"; + homepage = "https://hiddify.com"; + mainProgram = "HiddifyCli"; + license = lib.licenses.cc-by-nc-sa-40; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aucub ]; + }; + }; + sqlite-autoconf = fetchurl { + url = "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz"; + hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0="; + }; +in +flutter.buildFlutterApplication { + inherit pname version src; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + buildInputs = [ + libayatana-appindicator + ]; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + wrapGAppsHook3 + copyDesktopItems + ]; + + customSourceBuilders = { + sqlite3_flutter_libs = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "sqlite3_flutter_libs"; + inherit version src; + inherit (src) passthru; + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace-fail "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz" "file://${sqlite-autoconf}" + ''; + installPhase = '' + runHook preInstall + mkdir $out + cp -a ./* $out/ + runHook postInstall + ''; + }; + }; + + postPatch = '' + substituteInPlace ./linux/my_application.cc \ + --replace-fail "./hiddify.png" "${placeholder "out"}/share/pixmaps/hiddify.png" + ''; + + preBuild = '' + cp -r ${libcore}/lib libcore/bin/lib + cp ${libcore}/bin/HiddifyCli libcore/bin/HiddifyCli + packageRun build_runner build --delete-conflicting-outputs + packageRun slang + ''; + + postInstall = '' + mkdir -p $out/share/pixmaps/ + cp ./assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "hiddify"; + exec = "hiddify"; + icon = "hiddify"; + genericName = "Hiddify"; + desktopName = "Hiddify"; + categories = [ + "Network" + ]; + keywords = [ + "Hiddify" + "Proxy" + "VPN" + "V2ray" + "Nekoray" + "Xray" + "Psiphon" + "OpenVPN" + ]; + }) + ]; + + flutterBuildFlags = [ + "--target lib/main_prod.dart" + ]; + + gitHashes = { + circle_flags = "sha256-dqORH4yj0jU8r9hP9NTjrlEO0ReHt4wds7BhgRPq57g="; + flutter_easy_permission = "sha256-fs2dIwFLmeDrlFIIocGw6emOW1whGi9W7nQ7mHqp8R0="; + humanizer = "sha256-zsDeol5l6maT8L8R6RRtHyd7CJn5908nvRXIytxiPqc="; + }; + + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" + ''; + + preFixup = '' + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/${pname}/lib/lib*.so + ''; + + meta = { + description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc"; + homepage = "https://hiddify.com"; + mainProgram = "hiddify"; + license = lib.licenses.cc-by-nc-sa-40; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aucub ]; + }; +} diff --git a/pkgs/by-name/hi/hiddify-app/pubspec.lock.json b/pkgs/by-name/hi/hiddify-app/pubspec.lock.json new file mode 100644 index 000000000000..c6093503f3f9 --- /dev/null +++ b/pkgs/by-name/hi/hiddify-app/pubspec.lock.json @@ -0,0 +1,2531 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, + "accessibility_tools": { + "dependency": "direct main", + "description": { + "name": "accessibility_tools", + "sha256": "deca88d9f181ad6fdd12df9c5fa952c763264da14336ca1c0e4124525725b174", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.11" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "circle_flags": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "19d83cba60de91143491a441b5076583bf1681a8", + "url": "https://github.com/hiddify-com/flutter_circle_flags.git" + }, + "source": "git", + "version": "4.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "color": { + "dependency": "transitive", + "description": { + "name": "color", + "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "combine": { + "dependency": "direct main", + "description": { + "name": "combine", + "sha256": "c16464b55d140871fbab5b37909e1808c2f020e46f9ba7deca59d40faabb6008", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.7" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "csv": { + "dependency": "transitive", + "description": { + "name": "csv", + "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "cupertino_http": { + "dependency": "direct main", + "description": { + "name": "cupertino_http", + "sha256": "7e75c45a27cc13a886ab0a1e4d8570078397057bd612de9d24fe5df0d9387717", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "dart_mappable": { + "dependency": "direct main", + "description": { + "name": "dart_mappable", + "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.2" + }, + "dart_mappable_builder": { + "dependency": "direct dev", + "description": { + "name": "dart_mappable_builder", + "sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.3" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "dartx": { + "dependency": "direct main", + "description": { + "name": "dartx", + "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "decimal": { + "dependency": "transitive", + "description": { + "name": "decimal", + "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "dependency_validator": { + "dependency": "direct dev", + "description": { + "name": "dependency_validator", + "sha256": "f727a5627aa405965fab4aef4f468e50a9b632ba0737fd2f98c932fec6d712b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.3" + }, + "device_info_plus": { + "dependency": "transitive", + "description": { + "name": "device_info_plus", + "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0+1" + }, + "dio_smart_retry": { + "dependency": "direct main", + "description": { + "name": "dio_smart_retry", + "sha256": "3d71450c19b4d91ef4c7d726a55a284bfc11eb3634f1f25006cdfab3f8595653", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "drift": { + "dependency": "direct main", + "description": { + "name": "drift", + "sha256": "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.19.1+1" + }, + "drift_dev": { + "dependency": "direct dev", + "description": { + "name": "drift_dev", + "sha256": "ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.19.1" + }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.0" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "ffigen": { + "dependency": "direct dev", + "description": { + "name": "ffigen", + "sha256": "d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.2" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "fluentui_system_icons": { + "dependency": "direct main", + "description": { + "name": "fluentui_system_icons", + "sha256": "af92e0abc8a4060ffdcae2ad31a050cd242bf9eff121769b9cfb11fe05d08d6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.252" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_adaptive_scaffold": { + "dependency": "direct main", + "description": { + "name": "flutter_adaptive_scaffold", + "sha256": "a464b74540401cade07af0ae84d19f210534cac67651a150fb413507040b74f6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.12" + }, + "flutter_animate": { + "dependency": "direct main", + "description": { + "name": "flutter_animate", + "sha256": "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.0" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_easy_permission": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "3f6611f2a88f7ed640207c3accab9178f76da2c6", + "url": "https://github.com/unger1984/flutter_easy_permission.git" + }, + "source": "git", + "version": "1.1.3" + }, + "flutter_gen_core": { + "dependency": "transitive", + "description": { + "name": "flutter_gen_core", + "sha256": "d8e828ad015a8511624491b78ad8e3f86edb7993528b1613aefbb4ad95947795", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.6.0" + }, + "flutter_gen_runner": { + "dependency": "direct dev", + "description": { + "name": "flutter_gen_runner", + "sha256": "931b03f77c164df0a4815aac0efc619a6ac8ec4cada55025119fca4894dada90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.6.0" + }, + "flutter_hooks": { + "dependency": "direct main", + "description": { + "name": "flutter_hooks", + "sha256": "cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.5" + }, + "flutter_keyboard_visibility": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility", + "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_keyboard_visibility_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_linux", + "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_keyboard_visibility_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_macos", + "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_keyboard_visibility_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_platform_interface", + "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_keyboard_visibility_web": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_web", + "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_keyboard_visibility_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_windows", + "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_loggy": { + "dependency": "direct main", + "description": { + "name": "flutter_loggy", + "sha256": "c758629403e19115af198993ff7bd3af2c5a337de16ee23acda2e6f29df1db48", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "flutter_loggy_dio": { + "dependency": "direct main", + "description": { + "name": "flutter_loggy_dio", + "sha256": "d17d26bb85667c14aefa6dce9b12bd2c1ae13cd75e89d25b0c799b063be55e3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "flutter_native_splash": { + "dependency": "direct main", + "description": { + "name": "flutter_native_splash", + "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "flutter_riverpod": { + "dependency": "transitive", + "description": { + "name": "flutter_riverpod", + "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "flutter_shaders": { + "dependency": "transitive", + "description": { + "name": "flutter_shaders", + "sha256": "02750b545c01ff4d8e9bbe8f27a7731aa3778402506c67daa1de7f5fc3f4befe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_timezone": { + "dependency": "transitive", + "description": { + "name": "flutter_timezone", + "sha256": "06b35132c98fa188db3c4b654b7e1af7ccd01dfe12a004d58be423357605fb24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "flutter_typeahead": { + "dependency": "direct main", + "description": { + "name": "flutter_typeahead", + "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.2.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fpdart": { + "dependency": "direct main", + "description": { + "name": "fpdart", + "sha256": "7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "gap": { + "dependency": "direct main", + "description": { + "name": "gap", + "sha256": "f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "globbing": { + "dependency": "transitive", + "description": { + "name": "globbing", + "sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "go_router": { + "dependency": "direct main", + "description": { + "name": "go_router", + "sha256": "b465e99ce64ba75e61c8c0ce3d87b66d8ac07f0b35d0a7e0263fcfc10f99e836", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.2.5" + }, + "go_router_builder": { + "dependency": "direct dev", + "description": { + "name": "go_router_builder", + "sha256": "3425b72dea69209754ac6b71b4da34165dcd4d4a2934713029945709a246427a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.1" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1+4" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "grpc": { + "dependency": "direct main", + "description": { + "name": "grpc", + "sha256": "e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.4" + }, + "hashcodes": { + "dependency": "transitive", + "description": { + "name": "hashcodes", + "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "hooks_riverpod": { + "dependency": "direct main", + "description": { + "name": "hooks_riverpod", + "sha256": "45b2030a18bcd6dbd680c2c91bc3b33e3fe7c323e3acb5ecec93a613e2fbaa8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http2": { + "dependency": "transitive", + "description": { + "name": "http2", + "sha256": "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "http_profile": { + "dependency": "transitive", + "description": { + "name": "http_profile", + "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "humanizer": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "up-version", + "resolved-ref": "8ae61d68357fae197be7ee71d67ccb9498b9d5c7", + "url": "https://github.com/alex-relov/humanizer" + }, + "source": "git", + "version": "2.3.0" + }, + "iconsax_flutter": { + "dependency": "transitive", + "description": { + "name": "iconsax_flutter", + "sha256": "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "image_size_getter": { + "dependency": "transitive", + "description": { + "name": "image_size_getter", + "sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "in_app_review": { + "dependency": "direct main", + "description": { + "name": "in_app_review", + "sha256": "99869244d09adc76af16bf8fd731dd13cef58ecafd5917847589c49f378cbb30", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.9" + }, + "in_app_review_platform_interface": { + "dependency": "transitive", + "description": { + "name": "in_app_review_platform_interface", + "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "injector": { + "dependency": "transitive", + "description": { + "name": "injector", + "sha256": "ed389bed5b48a699d5b9561c985023d0d5cc88dd5ff2237aadcce5a5ab433e4e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "iregexp": { + "dependency": "transitive", + "description": { + "name": "iregexp", + "sha256": "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json2yaml": { + "dependency": "transitive", + "description": { + "name": "json2yaml", + "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_path": { + "dependency": "direct main", + "description": { + "name": "json_path", + "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "launch_at_startup": { + "dependency": "direct main", + "description": { + "name": "launch_at_startup", + "sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lint": { + "dependency": "direct dev", + "description": { + "name": "lint", + "sha256": "d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "loggy": { + "dependency": "direct main", + "description": { + "name": "loggy", + "sha256": "981e03162bbd3a5a843026f75f73d26e4a0d8aa035ae060456ca7b30dfd1e339", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "maybe_just_nothing": { + "dependency": "transitive", + "description": { + "name": "maybe_just_nothing", + "sha256": "0c06326e26d08f6ed43247404376366dc4d756cef23a4f1db765f546224c35e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.3" + }, + "menu_base": { + "dependency": "transitive", + "description": { + "name": "menu_base", + "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "mobile_scanner": { + "dependency": "direct main", + "description": { + "name": "mobile_scanner", + "sha256": "b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "neat_periodic_task": { + "dependency": "direct main", + "description": { + "name": "neat_periodic_task", + "sha256": "e0dda74c996781e154f6145028dbacbcd9dbef242f5a140fa774e39381c2bf97", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "os_detect": { + "dependency": "transitive", + "description": { + "name": "os_detect", + "sha256": "faf3bcf39515e64da8ff76b2f2805b20a6ff47ae515393e535f8579ff91d6b7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.9" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "pausable_timer": { + "dependency": "transitive", + "description": { + "name": "pausable_timer", + "sha256": "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+3" + }, + "percent_indicator": { + "dependency": "direct main", + "description": { + "name": "percent_indicator", + "sha256": "c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.3" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointer_interceptor": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor", + "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1+2" + }, + "pointer_interceptor_ios": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_ios", + "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, + "pointer_interceptor_platform_interface": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_platform_interface", + "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+1" + }, + "pointer_interceptor_web": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_web", + "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.2+1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "posix": { + "dependency": "direct main", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "properties": { + "dependency": "transitive", + "description": { + "name": "properties", + "sha256": "333f427dd4ed07bdbe8c75b9ff864a1e70b5d7a8426a2e8bdd457b65ae5ac598", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "protobuf": { + "dependency": "direct main", + "description": { + "name": "protobuf", + "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "protocol_handler": { + "dependency": "direct main", + "description": { + "name": "protocol_handler", + "sha256": "dc2e2dcb1e0e313c3f43827ec3fa6d98adee6e17edc0c3923ac67efee87479a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "protocol_handler_android": { + "dependency": "transitive", + "description": { + "name": "protocol_handler_android", + "sha256": "82eb860ca42149e400328f54b85140329a1766d982e94705b68271f6ca73895c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "protocol_handler_ios": { + "dependency": "transitive", + "description": { + "name": "protocol_handler_ios", + "sha256": "0d3a56b8c1926002cb1e32b46b56874759f4dcc8183d389b670864ac041b6ec2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "protocol_handler_macos": { + "dependency": "transitive", + "description": { + "name": "protocol_handler_macos", + "sha256": "6eb8687a84e7da3afbc5660ce046f29d7ecf7976db45a9dadeae6c87147dd710", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "protocol_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "protocol_handler_platform_interface", + "sha256": "53776b10526fdc25efdf1abcf68baf57fdfdb75342f4101051db521c9e3f3e5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "protocol_handler_windows": { + "dependency": "transitive", + "description": { + "name": "protocol_handler_windows", + "sha256": "d8f3a58938386aca2c76292757392f4d059d09f11439d6d896d876ebe997f2c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "qr_flutter": { + "dependency": "direct main", + "description": { + "name": "qr_flutter", + "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "rational": { + "dependency": "transitive", + "description": { + "name": "rational", + "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "retry": { + "dependency": "transitive", + "description": { + "name": "retry", + "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "rfc_6901": { + "dependency": "transitive", + "description": { + "name": "rfc_6901", + "sha256": "df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "riverpod_annotation": { + "dependency": "direct main", + "description": { + "name": "riverpod_annotation", + "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.5" + }, + "riverpod_generator": { + "dependency": "direct dev", + "description": { + "name": "riverpod_generator", + "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "rxdart": { + "dependency": "direct main", + "description": { + "name": "rxdart", + "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.27.7" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "sentry": { + "dependency": "transitive", + "description": { + "name": "sentry", + "sha256": "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.20.2" + }, + "sentry_dart_plugin": { + "dependency": "direct main", + "description": { + "name": "sentry_dart_plugin", + "sha256": "e81fa3e0ffabd04fdcfbfecd6468d4a342f02ab33edca09708c61bcd2be42b7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.1" + }, + "sentry_flutter": { + "dependency": "direct main", + "description": { + "name": "sentry_flutter", + "sha256": "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.20.2" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "3ef39599b00059db0990ca2e30fca0a29d8b37aae924d60063f8e0184cf20900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.2.2" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "776786cff96324851b656777648f36ac772d88bc4c669acff97b7fce5de3c849", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "shortid": { + "dependency": "transitive", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "slang": { + "dependency": "direct main", + "description": { + "name": "slang", + "sha256": "f68f6d6709890f85efabfb0318e9d694be2ebdd333e57fe5cb50eee449e4e3ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.31.1" + }, + "slang_build_runner": { + "dependency": "direct dev", + "description": { + "name": "slang_build_runner", + "sha256": "6e60160e8000b91824c47221b20d9642e7408287a5a21837ecefc75270197586", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.31.0" + }, + "slang_flutter": { + "dependency": "direct main", + "description": { + "name": "slang_flutter", + "sha256": "f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.31.0" + }, + "sliver_tools": { + "dependency": "direct main", + "description": { + "name": "sliver_tools", + "sha256": "eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.12" + }, + "slugid": { + "dependency": "transitive", + "description": { + "name": "slugid", + "sha256": "e0cc54637b666c9c590f0d76df76e5e2bbf6234ae398a182aac82fd70ddd60ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqlite3": { + "dependency": "transitive", + "description": { + "name": "sqlite3", + "sha256": "fde692580bee3379374af1f624eb3e113ab2865ecb161dbe2d8ac2de9735dbdb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "sqlite3_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "sqlite3_flutter_libs", + "sha256": "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.24" + }, + "sqlparser": { + "dependency": "transitive", + "description": { + "name": "sqlparser", + "sha256": "3be52b4968fc2f098ba735863404756d2fe3ea0729cf006a5b5612618f74ca04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.37.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "system_info2": { + "dependency": "transitive", + "description": { + "name": "system_info2", + "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "time": { + "dependency": "transitive", + "description": { + "name": "time", + "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4" + }, + "timezone_to_country": { + "dependency": "direct main", + "description": { + "name": "timezone_to_country", + "sha256": "3dc8480ff450910d97555a26a19cb278fb68b69d24246fffadbc5390165457a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tint": { + "dependency": "direct main", + "description": { + "name": "tint", + "sha256": "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "toastification": { + "dependency": "direct main", + "description": { + "name": "toastification", + "sha256": "1e01495fe00b8fddce8a7f1da5e4775cd003763698e8363d7122bea4168a395e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "tray_manager": { + "dependency": "direct main", + "description": { + "name": "tray_manager", + "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "type_plus": { + "dependency": "transitive", + "description": { + "name": "type_plus", + "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "upgrader": { + "dependency": "direct main", + "description": { + "name": "upgrader", + "sha256": "0c5fe8101b9d3017aebcb5175b49c382699725ffcf477afbe93fc3351491f6e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "94d8ad05f44c6d4e2ffe5567ab4d741b82d62e3c8e288cc1fcea45965edf47c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.8" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.4.2" + }, + "vclibs": { + "dependency": "direct main", + "description": { + "name": "vclibs", + "sha256": "5dc5de54fabe27ad276898b7c04a56a4a3dd9834e479b9db5e04a9f3eb36790e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "version": { + "dependency": "direct main", + "description": { + "name": "version", + "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct overridden", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "win32": { + "dependency": "direct main", + "description": { + "name": "win32", + "sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.3" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "wolt_modal_sheet": { + "dependency": "direct main", + "description": { + "name": "wolt_modal_sheet", + "sha256": "0a04f1a11bbeeb4847bdea17707ab68fffaaa656a5ce75323939647952d696c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.4.0 <4.0.0", + "flutter": ">=3.24.0" + } +} diff --git a/pkgs/tools/misc/hidrd/default.nix b/pkgs/by-name/hi/hidrd/package.nix similarity index 100% rename from pkgs/tools/misc/hidrd/default.nix rename to pkgs/by-name/hi/hidrd/package.nix diff --git a/pkgs/by-name/hi/hieroglyphic/package.nix b/pkgs/by-name/hi/hieroglyphic/package.nix index 71f245d996f4..9802e66967f1 100644 --- a/pkgs/by-name/hi/hieroglyphic/package.nix +++ b/pkgs/by-name/hi/hieroglyphic/package.nix @@ -13,14 +13,10 @@ glib, gtk4, libadwaita, - darwin, gettext, appstream, }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation Foundation; -in stdenv.mkDerivation (finalAttrs: { pname = "hieroglyphic"; version = "1.1.0"; @@ -53,16 +49,11 @@ stdenv.mkDerivation (finalAttrs: { appstream ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; # needed for darwin env.GETTEXT_DIR = "${gettext}"; diff --git a/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch b/pkgs/by-name/hi/higan/001-include-cmath.patch similarity index 100% rename from pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch rename to pkgs/by-name/hi/higan/001-include-cmath.patch diff --git a/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch b/pkgs/by-name/hi/higan/002-sips-to-png2icns.patch similarity index 100% rename from pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch rename to pkgs/by-name/hi/higan/002-sips-to-png2icns.patch diff --git a/pkgs/applications/emulators/bsnes/higan/default.nix b/pkgs/by-name/hi/higan/package.nix similarity index 100% rename from pkgs/applications/emulators/bsnes/higan/default.nix rename to pkgs/by-name/hi/higan/package.nix diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/by-name/hi/highfive/package.nix similarity index 100% rename from pkgs/development/libraries/highfive/default.nix rename to pkgs/by-name/hi/highfive/package.nix diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/by-name/hi/highlight-assertions/package.nix similarity index 100% rename from pkgs/development/tools/misc/highlight-assertions/default.nix rename to pkgs/by-name/hi/highlight-assertions/package.nix diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/by-name/hi/hikounomizu/package.nix similarity index 100% rename from pkgs/games/hikounomizu/default.nix rename to pkgs/by-name/hi/hikounomizu/package.nix diff --git a/pkgs/by-name/hi/hilbish/package.nix b/pkgs/by-name/hi/hilbish/package.nix new file mode 100644 index 000000000000..138a750c6745 --- /dev/null +++ b/pkgs/by-name/hi/hilbish/package.nix @@ -0,0 +1,42 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "hilbish"; + version = "2.3.3"; + + src = fetchFromGitHub { + owner = "Rosettea"; + repo = "Hilbish"; + rev = "refs/tags/v${version}"; + hash = "sha256-rDE9zxkCnnvc1OWd4Baei/Bw9KdFRV7DOorxLSD/KhM"; + fetchSubmodules = true; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-8t3JBQEAmWcAlgA729IRpiewlgnRd5DQxHLTfwquE3o"; + + ldflags = [ + "-s" + "-w" + "-X main.dataDir=${placeholder "out"}/share/hilbish" + ]; + + postInstall = '' + mkdir -p "$out/share/hilbish" + + cp .hilbishrc.lua $out/share/hilbish/ + cp -r docs -t $out/share/hilbish/ + cp -r libs -t $out/share/hilbish/ + cp -r nature $out/share/hilbish/ + ''; + + meta = with lib; { + description = "Interactive Unix-like shell written in Go"; + mainProgram = "hilbish"; + changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}"; + homepage = "https://github.com/Rosettea/Hilbish"; + maintainers = with maintainers; [ moni ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/by-name/hi/hime/package.nix similarity index 100% rename from pkgs/tools/inputmethods/hime/default.nix rename to pkgs/by-name/hi/hime/package.nix diff --git a/pkgs/tools/security/himitsu-firefox/default.nix b/pkgs/by-name/hi/himitsu-firefox/package.nix similarity index 100% rename from pkgs/tools/security/himitsu-firefox/default.nix rename to pkgs/by-name/hi/himitsu-firefox/package.nix diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/by-name/hi/himitsu/package.nix similarity index 100% rename from pkgs/tools/security/himitsu/default.nix rename to pkgs/by-name/hi/himitsu/package.nix diff --git a/pkgs/servers/hiraeth/default.nix b/pkgs/by-name/hi/hiraeth/package.nix similarity index 100% rename from pkgs/servers/hiraeth/default.nix rename to pkgs/by-name/hi/hiraeth/package.nix diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/by-name/hi/hiredis-vip/package.nix similarity index 100% rename from pkgs/development/libraries/hiredis-vip/default.nix rename to pkgs/by-name/hi/hiredis-vip/package.nix diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/by-name/hi/hiredis/package.nix similarity index 100% rename from pkgs/development/libraries/hiredis/default.nix rename to pkgs/by-name/hi/hiredis/package.nix diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/by-name/hi/hisat2/package.nix similarity index 100% rename from pkgs/applications/science/biology/hisat2/default.nix rename to pkgs/by-name/hi/hisat2/package.nix diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/by-name/hi/hishtory/package.nix similarity index 100% rename from pkgs/shells/hishtory/default.nix rename to pkgs/by-name/hi/hishtory/package.nix diff --git a/pkgs/servers/hitch/default.nix b/pkgs/by-name/hi/hitch/package.nix similarity index 100% rename from pkgs/servers/hitch/default.nix rename to pkgs/by-name/hi/hitch/package.nix diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/by-name/hi/hivelytracker/package.nix similarity index 100% rename from pkgs/applications/audio/hivelytracker/default.nix rename to pkgs/by-name/hi/hivelytracker/package.nix diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/by-name/hi/hivemind/package.nix similarity index 100% rename from pkgs/applications/misc/hivemind/default.nix rename to pkgs/by-name/hi/hivemind/package.nix diff --git a/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix similarity index 100% rename from pkgs/applications/office/hledger-check-fancyassertions/default.nix rename to pkgs/by-name/hl/hledger-check-fancyassertions/package.nix diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/by-name/hm/hmat-oss/package.nix similarity index 100% rename from pkgs/development/libraries/hmat-oss/default.nix rename to pkgs/by-name/hm/hmat-oss/package.nix diff --git a/pkgs/games/hmcl/default.nix b/pkgs/by-name/hm/hmcl/package.nix similarity index 100% rename from pkgs/games/hmcl/default.nix rename to pkgs/by-name/hm/hmcl/package.nix diff --git a/pkgs/applications/misc/hmm/default.nix b/pkgs/by-name/hm/hmm/package.nix similarity index 100% rename from pkgs/applications/misc/hmm/default.nix rename to pkgs/by-name/hm/hmm/package.nix diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch b/pkgs/by-name/hm/hmm/rustc-serialize-fix.patch similarity index 100% rename from pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch rename to pkgs/by-name/hm/hmm/rustc-serialize-fix.patch diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/by-name/hm/hmmer/package.nix similarity index 100% rename from pkgs/applications/science/biology/hmmer/default.nix rename to pkgs/by-name/hm/hmmer/package.nix diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/by-name/hn/hnswlib/package.nix similarity index 100% rename from pkgs/development/libraries/hnswlib/default.nix rename to pkgs/by-name/hn/hnswlib/package.nix diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/by-name/ho/hoard/package.nix similarity index 100% rename from pkgs/tools/misc/hoard/default.nix rename to pkgs/by-name/ho/hoard/package.nix diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/by-name/ho/hobbes/package.nix similarity index 100% rename from pkgs/development/tools/hobbes/default.nix rename to pkgs/by-name/ho/hobbes/package.nix diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix index d5ca54ea5beb..13a14c4a5b13 100644 --- a/pkgs/by-name/ho/hof/package.nix +++ b/pkgs/by-name/ho/hof/package.nix @@ -1,23 +1,24 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGo122Module, + fetchFromGitHub, + installShellFiles, }: -buildGoModule rec { +buildGo122Module rec { pname = "hof"; - version = "0.6.9-beta.1"; + version = "0.6.9"; src = fetchFromGitHub { owner = "hofstadter-io"; repo = "hof"; rev = "v${version}"; - hash = "sha256-4yVP6DRHrsp52VxBhr7qppPhInYEsvPbIfxxQcRwHTw="; + hash = "sha256-okY+CkPnlndy5H4M1+T1CY21+63+KPBinHoa5+8kQ2M="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-cDUcYwcxPn+9TEP5lhVJXofijCZX94Is+Qt41PqUgjI="; + vendorHash = "sha256-SmUEVWIyV6k5Lu5zeKGqpij3zUNRZQmIgtf8/Hf7UUs="; subPackages = [ "./cmd/hof/main.go" ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/by-name/ho/hol/package.nix similarity index 100% rename from pkgs/applications/science/logic/hol/default.nix rename to pkgs/by-name/ho/hol/package.nix diff --git a/pkgs/tools/security/holehe/default.nix b/pkgs/by-name/ho/holehe/package.nix similarity index 100% rename from pkgs/tools/security/holehe/default.nix rename to pkgs/by-name/ho/holehe/package.nix diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/by-name/ho/holo-build/package.nix similarity index 100% rename from pkgs/tools/package-management/holo-build/default.nix rename to pkgs/by-name/ho/holo-build/package.nix diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/by-name/ho/holochain-launcher/package.nix similarity index 100% rename from pkgs/applications/misc/holochain-launcher/default.nix rename to pkgs/by-name/ho/holochain-launcher/package.nix diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/by-name/ho/hologram/package.nix similarity index 100% rename from pkgs/tools/security/hologram/default.nix rename to pkgs/by-name/ho/hologram/package.nix diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/by-name/ho/honcho/package.nix similarity index 100% rename from pkgs/tools/system/honcho/default.nix rename to pkgs/by-name/ho/honcho/package.nix diff --git a/pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch similarity index 100% rename from pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch rename to pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/refinery/default.nix rename to pkgs/by-name/ho/honeycomb-refinery/package.nix diff --git a/pkgs/by-name/ho/honeytrap/package.nix b/pkgs/by-name/ho/honeytrap/package.nix new file mode 100644 index 000000000000..8f83e120fdd9 --- /dev/null +++ b/pkgs/by-name/ho/honeytrap/package.nix @@ -0,0 +1,29 @@ +{ lib +, buildGo122Module +, fetchFromGitHub +}: +buildGo122Module { + pname = "honeytrap"; + version = "unstable-2021-12-20"; + + src = fetchFromGitHub { + owner = "honeytrap"; + repo = "honeytrap"; + rev = "05965fc67deab17b48e43873abc5f509067ef098"; + hash = "sha256-KSVqjHlXl85JaqKiW5R86HCMdtFBwTMJkxFoySOcahs="; + }; + + vendorHash = "sha256-W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8="; + + # Otherwise, will try to install a "scripts" binary; it's only used in + # dockerize.sh, which we don't care about. + subPackages = [ "." ]; + + meta = with lib; { + description = "Advanced Honeypot framework"; + mainProgram = "honeytrap"; + homepage = "https://github.com/honeytrap/honeytrap"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/servers/honk/default.nix b/pkgs/by-name/ho/honk/package.nix similarity index 100% rename from pkgs/servers/honk/default.nix rename to pkgs/by-name/ho/honk/package.nix diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/by-name/ho/hop/package.nix similarity index 100% rename from pkgs/development/compilers/hop/default.nix rename to pkgs/by-name/ho/hop/package.nix diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/by-name/ho/hoppet/package.nix similarity index 100% rename from pkgs/development/libraries/physics/hoppet/default.nix rename to pkgs/by-name/ho/hoppet/package.nix diff --git a/pkgs/applications/science/electronics/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix similarity index 100% rename from pkgs/applications/science/electronics/horizon-eda/base.nix rename to pkgs/by-name/ho/horizon-eda/base.nix diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/by-name/ho/horizon-eda/package.nix similarity index 100% rename from pkgs/applications/science/electronics/horizon-eda/default.nix rename to pkgs/by-name/ho/horizon-eda/package.nix diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/by-name/ho/horst/package.nix similarity index 100% rename from pkgs/tools/networking/horst/default.nix rename to pkgs/by-name/ho/horst/package.nix diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/by-name/ho/hostapd-mana/package.nix similarity index 100% rename from pkgs/tools/networking/hostapd-mana/default.nix rename to pkgs/by-name/ho/hostapd-mana/package.nix diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/by-name/ho/hostapd/package.nix similarity index 100% rename from pkgs/os-specific/linux/hostapd/default.nix rename to pkgs/by-name/ho/hostapd/package.nix diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/by-name/ho/hostctl/package.nix similarity index 100% rename from pkgs/tools/system/hostctl/default.nix rename to pkgs/by-name/ho/hostctl/package.nix diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/by-name/ho/hostess/package.nix similarity index 100% rename from pkgs/development/tools/hostess/default.nix rename to pkgs/by-name/ho/hostess/package.nix diff --git a/pkgs/by-name/ho/hostmux/package.nix b/pkgs/by-name/ho/hostmux/package.nix new file mode 100644 index 000000000000..405383d648be --- /dev/null +++ b/pkgs/by-name/ho/hostmux/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, openssh +, tmux +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hostmux"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "hukl"; + repo = "hostmux"; + rev = finalAttrs.version; + hash = "sha256-Rh8eyKoUydixj+X7muWleZW9u8djCQAyexIfRWIOr0o="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + openssh + tmux + ]; + + postPatch = '' + substituteInPlace hostmux \ + --replace "SSH_CMD=ssh" "SSH_CMD=${lib.getExe openssh}" \ + --replace "TMUX_CMD=tmux" "TMUX_CMD=${lib.getExe tmux}" + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 hostmux $out/bin/hostmux + installManPage man/hostmux.1 + installShellCompletion --zsh zsh-completion/_hostmux + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Small wrapper script for tmux to easily connect to a series of hosts via ssh and open a split pane for each of the hosts"; + homepage = "https://github.com/hukl/hostmux"; + changelog = "https://github.com/hukl/hostmux/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "hostmux"; + maintainers = with lib.maintainers; [ fernsehmuell ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/tools/networking/hostname-debian/default.nix b/pkgs/by-name/ho/hostname-debian/package.nix similarity index 100% rename from pkgs/tools/networking/hostname-debian/default.nix rename to pkgs/by-name/ho/hostname-debian/package.nix diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/by-name/ho/hostsblock/package.nix similarity index 100% rename from pkgs/tools/misc/hostsblock/default.nix rename to pkgs/by-name/ho/hostsblock/package.nix diff --git a/pkgs/development/libraries/hotpatch/no-loader-test.patch b/pkgs/by-name/ho/hotpatch/no-loader-test.patch similarity index 100% rename from pkgs/development/libraries/hotpatch/no-loader-test.patch rename to pkgs/by-name/ho/hotpatch/no-loader-test.patch diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/by-name/ho/hotpatch/package.nix similarity index 100% rename from pkgs/development/libraries/hotpatch/default.nix rename to pkgs/by-name/ho/hotpatch/package.nix diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/by-name/ho/houdini/package.nix similarity index 100% rename from pkgs/applications/misc/houdini/default.nix rename to pkgs/by-name/ho/houdini/package.nix diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/by-name/ho/houdini/runtime-build.nix similarity index 100% rename from pkgs/applications/misc/houdini/runtime-build.nix rename to pkgs/by-name/ho/houdini/runtime-build.nix diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/by-name/ho/houdini/runtime.nix similarity index 100% rename from pkgs/applications/misc/houdini/runtime.nix rename to pkgs/by-name/ho/houdini/runtime.nix diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/by-name/ho/hound/package.nix similarity index 100% rename from pkgs/development/tools/misc/hound/default.nix rename to pkgs/by-name/ho/hound/package.nix diff --git a/pkgs/development/tools/hover/fix-assets-path.patch b/pkgs/by-name/ho/hover/fix-assets-path.patch similarity index 100% rename from pkgs/development/tools/hover/fix-assets-path.patch rename to pkgs/by-name/ho/hover/fix-assets-path.patch diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/by-name/ho/hover/package.nix similarity index 100% rename from pkgs/development/tools/hover/default.nix rename to pkgs/by-name/ho/hover/package.nix diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff similarity index 100% rename from pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff rename to pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix similarity index 100% rename from pkgs/development/libraries/howard-hinnant-date/default.nix rename to pkgs/by-name/ho/howard-hinnant-date/package.nix diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/by-name/ho/howl/package.nix similarity index 100% rename from pkgs/applications/editors/howl/default.nix rename to pkgs/by-name/ho/howl/package.nix diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/by-name/hp/hp2p/package.nix similarity index 100% rename from pkgs/tools/networking/hp2p/default.nix rename to pkgs/by-name/hp/hp2p/package.nix diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/by-name/hp/hpe-ltfs/package.nix similarity index 100% rename from pkgs/tools/backup/hpe-ltfs/default.nix rename to pkgs/by-name/hp/hpe-ltfs/package.nix diff --git a/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/pkgs/by-name/hp/hpe-ltfs/remove-sysctl.patch similarity index 100% rename from pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch rename to pkgs/by-name/hp/hpe-ltfs/remove-sysctl.patch diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/by-name/hp/hping/package.nix similarity index 100% rename from pkgs/tools/networking/hping/default.nix rename to pkgs/by-name/hp/hping/package.nix diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/by-name/hp/hpl/package.nix similarity index 100% rename from pkgs/tools/misc/hpl/default.nix rename to pkgs/by-name/hp/hpl/package.nix diff --git a/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch b/pkgs/by-name/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch similarity index 100% rename from pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch rename to pkgs/by-name/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/by-name/hp/hplip/hplip.state similarity index 100% rename from pkgs/misc/drivers/hplip/hplip.state rename to pkgs/by-name/hp/hplip/hplip.state diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/by-name/hp/hplip/package.nix similarity index 100% rename from pkgs/misc/drivers/hplip/default.nix rename to pkgs/by-name/hp/hplip/package.nix diff --git a/pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/hq/hqplayerd/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch rename to pkgs/by-name/hq/hqplayerd/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/by-name/hq/hqplayerd/package.nix similarity index 100% rename from pkgs/servers/hqplayerd/default.nix rename to pkgs/by-name/hq/hqplayerd/package.nix diff --git a/pkgs/servers/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix similarity index 98% rename from pkgs/servers/hqplayerd/rygel.nix rename to pkgs/by-name/hq/hqplayerd/rygel.nix index a8d97ee24076..a76680dfff8b 100644 --- a/pkgs/servers/hqplayerd/rygel.nix +++ b/pkgs/by-name/hq/hqplayerd/rygel.nix @@ -21,7 +21,7 @@ , libmediaart , sqlite , systemd -, tracker +, tinysparql , shared-mime-info , gnome }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libmediaart sqlite systemd - tracker + tinysparql shared-mime-info ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/by-name/hr/hr/package.nix similarity index 100% rename from pkgs/applications/misc/hr/default.nix rename to pkgs/by-name/hr/hr/package.nix diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/by-name/hs/hsd/package.nix similarity index 100% rename from pkgs/tools/misc/hsd/default.nix rename to pkgs/by-name/hs/hsd/package.nix diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/by-name/hs/hsetroot/package.nix similarity index 100% rename from pkgs/tools/X11/hsetroot/default.nix rename to pkgs/by-name/hs/hsetroot/package.nix diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/by-name/hs/hsqldb/package.nix similarity index 100% rename from pkgs/development/libraries/java/hsqldb/default.nix rename to pkgs/by-name/hs/hsqldb/package.nix diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/by-name/hs/hss/package.nix similarity index 100% rename from pkgs/tools/networking/hss/default.nix rename to pkgs/by-name/hs/hss/package.nix diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/by-name/hs/hstr/package.nix similarity index 100% rename from pkgs/applications/misc/hstr/default.nix rename to pkgs/by-name/hs/hstr/package.nix diff --git a/pkgs/tools/security/hstsparser/default.nix b/pkgs/by-name/hs/hstsparser/package.nix similarity index 100% rename from pkgs/tools/security/hstsparser/default.nix rename to pkgs/by-name/hs/hstsparser/package.nix diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/by-name/ht/ht/gcc7.patch similarity index 100% rename from pkgs/applications/editors/ht/gcc7.patch rename to pkgs/by-name/ht/ht/gcc7.patch diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/by-name/ht/ht/package.nix similarity index 100% rename from pkgs/applications/editors/ht/default.nix rename to pkgs/by-name/ht/ht/package.nix diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix index 9c1742ebc712..60382597b77d 100644 --- a/pkgs/by-name/ht/htcondor/package.nix +++ b/pkgs/by-name/ht/htcondor/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "htcondor"; - version = "23.10.1"; + version = "24.1.1"; src = fetchFromGitHub { owner = "htcondor"; repo = "htcondor"; rev = "v${version}"; - hash = "sha256-5gxylfqG87dUEQT3e3vNgtTqWk0QTgWXwAdEAiIuc/E="; + hash = "sha256-k3GXaBSeRl6GJDm5+NRkV0E18RDUBYuoy2/u3ENsEyM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/html-minifier/default.nix b/pkgs/by-name/ht/html-minifier/package.nix similarity index 100% rename from pkgs/development/tools/html-minifier/default.nix rename to pkgs/by-name/ht/html-minifier/package.nix diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/by-name/ht/html-tidy/package.nix similarity index 100% rename from pkgs/tools/text/html-tidy/default.nix rename to pkgs/by-name/ht/html-tidy/package.nix diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/by-name/ht/html-xml-utils/package.nix similarity index 100% rename from pkgs/tools/text/xml/html-xml-utils/default.nix rename to pkgs/by-name/ht/html-xml-utils/package.nix diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/by-name/ht/html2text/package.nix similarity index 100% rename from pkgs/tools/text/html2text/default.nix rename to pkgs/by-name/ht/html2text/package.nix diff --git a/pkgs/development/libraries/htmlcxx/c++17.patch b/pkgs/by-name/ht/htmlcxx/c++17.patch similarity index 100% rename from pkgs/development/libraries/htmlcxx/c++17.patch rename to pkgs/by-name/ht/htmlcxx/c++17.patch diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/by-name/ht/htmlcxx/package.nix similarity index 100% rename from pkgs/development/libraries/htmlcxx/default.nix rename to pkgs/by-name/ht/htmlcxx/package.nix diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/by-name/ht/htmlcxx/ptrdiff.patch similarity index 100% rename from pkgs/development/libraries/htmlcxx/ptrdiff.patch rename to pkgs/by-name/ht/htmlcxx/ptrdiff.patch diff --git a/pkgs/development/tools/htmlhint/default.nix b/pkgs/by-name/ht/htmlhint/package.nix similarity index 100% rename from pkgs/development/tools/htmlhint/default.nix rename to pkgs/by-name/ht/htmlhint/package.nix diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/by-name/ht/htmltest/package.nix similarity index 100% rename from pkgs/development/tools/htmltest/default.nix rename to pkgs/by-name/ht/htmltest/package.nix diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/by-name/ht/htmlunit-driver/package.nix similarity index 100% rename from pkgs/development/tools/selenium/htmlunit-driver/default.nix rename to pkgs/by-name/ht/htmlunit-driver/package.nix diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/by-name/ht/htpdate/package.nix similarity index 100% rename from pkgs/tools/networking/htpdate/default.nix rename to pkgs/by-name/ht/htpdate/package.nix diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/by-name/ht/htslib/package.nix similarity index 100% rename from pkgs/development/libraries/science/biology/htslib/default.nix rename to pkgs/by-name/ht/htslib/package.nix diff --git a/pkgs/development/libraries/http-parser/enable-static-shared.patch b/pkgs/by-name/ht/http-parser/enable-static-shared.patch similarity index 100% rename from pkgs/development/libraries/http-parser/enable-static-shared.patch rename to pkgs/by-name/ht/http-parser/enable-static-shared.patch diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/by-name/ht/http-parser/package.nix similarity index 100% rename from pkgs/development/libraries/http-parser/default.nix rename to pkgs/by-name/ht/http-parser/package.nix diff --git a/pkgs/tools/networking/http2tcp/default.nix b/pkgs/by-name/ht/http2tcp/package.nix similarity index 100% rename from pkgs/tools/networking/http2tcp/default.nix rename to pkgs/by-name/ht/http2tcp/package.nix diff --git a/pkgs/tools/security/httpdump/default.nix b/pkgs/by-name/ht/httpdump/package.nix similarity index 100% rename from pkgs/tools/security/httpdump/default.nix rename to pkgs/by-name/ht/httpdump/package.nix diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/by-name/ht/httperf/package.nix similarity index 100% rename from pkgs/tools/networking/httperf/default.nix rename to pkgs/by-name/ht/httperf/package.nix diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/by-name/ht/httpfs2/package.nix similarity index 100% rename from pkgs/tools/filesystems/httpfs/default.nix rename to pkgs/by-name/ht/httpfs2/package.nix diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/by-name/ht/httplab/package.nix similarity index 100% rename from pkgs/tools/networking/httplab/default.nix rename to pkgs/by-name/ht/httplab/package.nix diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix index 7b5c7b0f68e2..739b31a6cd56 100644 --- a/pkgs/by-name/ht/httplib/package.nix +++ b/pkgs/by-name/ht/httplib/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httplib"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${finalAttrs.version}"; - hash = "sha256-cR1yRqZ6hZeGtMhiW003zcN0d/f/v1gMMNiL0hA1r6I="; + hash = "sha256-NLSflHzxXby+SpLFg32BfRafey48DZ0XULQeyHQJHP4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/by-name/ht/httplz/package.nix similarity index 100% rename from pkgs/tools/networking/httplz/default.nix rename to pkgs/by-name/ht/httplz/package.nix diff --git a/pkgs/development/tools/misc/httpref/default.nix b/pkgs/by-name/ht/httpref/package.nix similarity index 100% rename from pkgs/development/tools/misc/httpref/default.nix rename to pkgs/by-name/ht/httpref/package.nix diff --git a/pkgs/tools/networking/httprobe/default.nix b/pkgs/by-name/ht/httprobe/package.nix similarity index 100% rename from pkgs/tools/networking/httprobe/default.nix rename to pkgs/by-name/ht/httprobe/package.nix diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/by-name/ht/https-dns-proxy/package.nix similarity index 100% rename from pkgs/servers/dns/https-dns-proxy/default.nix rename to pkgs/by-name/ht/https-dns-proxy/package.nix diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/by-name/ht/httpstat/package.nix similarity index 100% rename from pkgs/tools/networking/httpstat/default.nix rename to pkgs/by-name/ht/httpstat/package.nix diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/by-name/ht/httptunnel/package.nix similarity index 100% rename from pkgs/tools/networking/httptunnel/default.nix rename to pkgs/by-name/ht/httptunnel/package.nix diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/by-name/ht/httpunit/package.nix similarity index 100% rename from pkgs/development/libraries/java/httpunit/default.nix rename to pkgs/by-name/ht/httpunit/package.nix diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/by-name/ht/httpx/package.nix similarity index 100% rename from pkgs/tools/security/httpx/default.nix rename to pkgs/by-name/ht/httpx/package.nix diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/by-name/hu/hub/package.nix similarity index 100% rename from pkgs/applications/version-management/hub/default.nix rename to pkgs/by-name/hu/hub/package.nix diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/by-name/hu/hubble/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/hubble/default.nix rename to pkgs/by-name/hu/hubble/package.nix diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/by-name/hu/hubicfuse/package.nix similarity index 100% rename from pkgs/tools/filesystems/hubicfuse/default.nix rename to pkgs/by-name/hu/hubicfuse/package.nix diff --git a/pkgs/data/fonts/hubot-sans/default.nix b/pkgs/by-name/hu/hubot-sans/package.nix similarity index 100% rename from pkgs/data/fonts/hubot-sans/default.nix rename to pkgs/by-name/hu/hubot-sans/package.nix diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix new file mode 100644 index 000000000000..e9b8d07a7e9e --- /dev/null +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -0,0 +1,88 @@ +{ lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE +, libXext , freetype, libXrender, fontconfig, libXft, libXinerama +, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 +, curl, writeShellScript, common-updater-scripts, xmlstarlet }: + +let + url = "https://app.hubstaff.com/download/8099-standard-linux-1-6-26-release"; + version = "1.6.26-95441346"; + sha256 = "sha256:0xxw2za1hmqff5y0vyrvccgldsgyb808dql548c2xqsc1qi9gbn9"; + + rpath = lib.makeLibraryPath + [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft + libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3 + curl libXfixes libXScrnSaver ]; + +in + +stdenv.mkDerivation { + pname = "hubstaff"; + inherit version; + + src = fetchurl { inherit sha256 url; }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + unpackCmd = '' + # MojoSetups have a ZIP file at the end. ZIP’s magic string is + # most often PK\x03\x04. This has worked for all past updates, + # but feel free to come up with something more reasonable. + dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text ''$'PK\x03\x04' $curSrc | cut -d: -f1) + dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null + unzip -q data.zip "data/*" + rm data.zip + ''; + + dontBuild = true; + + installPhase = '' + # remove files for 32-bit arch to skip building for this arch + # but add -f flag to not fail if files were not found (new versions dont provide 32-bit arch) + rm -rf x86 x86_64/lib64 + + opt=$out/opt/hubstaff + mkdir -p $out/bin $opt + cp -r . $opt/ + + for f in "$opt/x86_64/"*.bin.x86_64 ; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $f + wrapProgram $f --prefix LD_LIBRARY_PATH : ${rpath} + done + + ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient + ln -s $opt/x86_64/HubstaffCLI.bin.x86_64 $out/bin/HubstaffCLI + + # Why is this needed? SEGV otherwise. + ln -s $opt/data/resources $opt/x86_64/resources + ''; + + # to test run: + # nix-shell maintainers/scripts/update.nix --argstr package hubstaff + # nix-build -A pkgs.hubstaff + passthru.updateScript = writeShellScript "hubstaff-updater" '' + set -eu -o pipefail + + # Create a temporary file + temp_file=$(mktemp) + + # Fetch the appcast.xml and save it to the temporary file + curl --silent --output "$temp_file" https://app.hubstaff.com/appcast.xml + + # Extract the latest release URL for Linux using xmlstarlet + installation_script_url=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@url' "$temp_file") + version=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@sparkle:version' "$temp_file") + + sha256=$(nix-prefetch-url "$installation_script_url") + + ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "sha256:$sha256" "$installation_script_url" + ''; + + meta = with lib; { + description = "Time tracking software"; + homepage = "https://hubstaff.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michalrus srghma ]; + }; +} diff --git a/pkgs/tools/misc/hueadm/default.nix b/pkgs/by-name/hu/hueadm/package.nix similarity index 100% rename from pkgs/tools/misc/hueadm/default.nix rename to pkgs/by-name/hu/hueadm/package.nix diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 7a8f3f8bd214..2d57470e8cc0 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.136.4"; + version = "0.136.5"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-wCv0lZqvJNOwL/naFuGb6k0Xyk58NpgH1mkhoNnkSno="; + hash = "sha256-NluV9/tqWTRfs2u9g4cHC1TyrxOXx3ghOZ4GDx7OZFo="; }; vendorHash = "sha256-KqDsa7MlSONyn7AYOepQ95q1CEM83AhWk23iYSQ4twU="; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/by-name/hu/hugs/package.nix similarity index 100% rename from pkgs/development/interpreters/hugs/default.nix rename to pkgs/by-name/hu/hugs/package.nix diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/by-name/hu/humanity-icon-theme/package.nix similarity index 100% rename from pkgs/data/icons/humanity-icon-theme/default.nix rename to pkgs/by-name/hu/humanity-icon-theme/package.nix diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/by-name/hu/huniq/package.nix similarity index 100% rename from pkgs/tools/text/huniq/default.nix rename to pkgs/by-name/hu/huniq/package.nix diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/by-name/hu/hunt/package.nix similarity index 100% rename from pkgs/tools/misc/hunt/default.nix rename to pkgs/by-name/hu/hunt/package.nix diff --git a/pkgs/development/tools/misc/husky/default.nix b/pkgs/by-name/hu/husky/package.nix similarity index 100% rename from pkgs/development/tools/misc/husky/default.nix rename to pkgs/by-name/hu/husky/package.nix diff --git a/pkgs/applications/version-management/hut/default.nix b/pkgs/by-name/hu/hut/package.nix similarity index 100% rename from pkgs/applications/version-management/hut/default.nix rename to pkgs/by-name/hu/hut/package.nix diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/by-name/hw/hwatch/package.nix similarity index 100% rename from pkgs/tools/misc/hwatch/default.nix rename to pkgs/by-name/hw/hwatch/package.nix diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix new file mode 100644 index 000000000000..b03448f76288 --- /dev/null +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "hwdata"; + version = "0.388"; + + src = fetchFromGitHub { + owner = "vcrhonek"; + repo = "hwdata"; + rev = "v${version}"; + hash = "sha256-MTXRvqhzNI4afOWLWY6bvv84Q/MXVTsn0w9awRIDAEU="; + }; + + configureFlags = [ "--datadir=${placeholder "out"}/share" ]; + + doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) + + meta = { + homepage = "https://github.com/vcrhonek/hwdata"; + description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pedrohlc ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/by-name/hw/hwloc/package.nix similarity index 100% rename from pkgs/development/libraries/hwloc/default.nix rename to pkgs/by-name/hw/hwloc/package.nix diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/by-name/hy/hybridreverb2/package.nix similarity index 100% rename from pkgs/applications/audio/hybridreverb2/default.nix rename to pkgs/by-name/hy/hybridreverb2/package.nix diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/by-name/hy/hydra-cli/package.nix similarity index 100% rename from pkgs/development/tools/misc/hydra-cli/default.nix rename to pkgs/by-name/hy/hydra-cli/package.nix diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 42ebcc581caf..937165f66fc6 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-10-08"; + version = "0-unstable-2024-10-24"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "c69e30122bf7e7a7d3de70dc2418263c6e44159b"; - hash = "sha256-khkY1GG43/VUBt6g7Egt0Zz0V/rXxnDUpOLtanFum7Y="; + rev = "f974891c76e295240017dd7f04d50ecb4b70284e"; + hash = "sha256-xVSu4ZNdlOEh2KcloDvhVeiFSYgk22W5fDvQlwn+kbE="; }; buildInputs = [ diff --git a/pkgs/by-name/hy/hydraAntLogger/package.nix b/pkgs/by-name/hy/hydraAntLogger/package.nix new file mode 100644 index 000000000000..2e643dc3a971 --- /dev/null +++ b/pkgs/by-name/hy/hydraAntLogger/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ant, + jdk, + stripJavaArchivesHook, +}: + +stdenv.mkDerivation { + pname = "hydra-ant-logger"; + version = "2010.2"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra-ant-logger"; + rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; + hash = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; + }; + + nativeBuildInputs = [ + ant + jdk + stripJavaArchivesHook + ]; + + buildPhase = '' + runHook preBuild + mkdir lib + ant + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm644 *.jar -t $out/share/java + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/NixOS/hydra-ant-logger"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/by-name/hy/hydroxide/package.nix similarity index 100% rename from pkgs/applications/networking/hydroxide/default.nix rename to pkgs/by-name/hy/hydroxide/package.nix diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/by-name/hy/hyena/package.nix similarity index 100% rename from pkgs/development/libraries/hyena/default.nix rename to pkgs/by-name/hy/hyena/package.nix diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/by-name/hy/hyenae/package.nix similarity index 100% rename from pkgs/tools/networking/hyenae/default.nix rename to pkgs/by-name/hy/hyenae/package.nix diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/by-name/hy/hyp/package.nix similarity index 100% rename from pkgs/servers/http/hyp/default.nix rename to pkgs/by-name/hy/hyp/package.nix diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/by-name/hy/hyp2mat/package.nix similarity index 100% rename from pkgs/applications/science/electronics/hyp2mat/default.nix rename to pkgs/by-name/hy/hyp2mat/package.nix diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/by-name/hy/hyper/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/hyper/default.nix rename to pkgs/by-name/hy/hyper/package.nix diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/by-name/hy/hyperledger-fabric/package.nix similarity index 100% rename from pkgs/tools/misc/hyperledger-fabric/default.nix rename to pkgs/by-name/hy/hyperledger-fabric/package.nix diff --git a/pkgs/tools/misc/hyperpotamus/default.nix b/pkgs/by-name/hy/hyperpotamus/package.nix similarity index 100% rename from pkgs/tools/misc/hyperpotamus/default.nix rename to pkgs/by-name/hy/hyperpotamus/package.nix diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/by-name/hy/hyperrogue/package.nix similarity index 100% rename from pkgs/games/hyperrogue/default.nix rename to pkgs/by-name/hy/hyperrogue/package.nix diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/by-name/hy/hyperscan/package.nix similarity index 100% rename from pkgs/development/libraries/hyperscan/default.nix rename to pkgs/by-name/hy/hyperscan/package.nix diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/by-name/hy/hyperscrypt-font/package.nix similarity index 100% rename from pkgs/data/fonts/hyperscrypt/default.nix rename to pkgs/by-name/hy/hyperscrypt-font/package.nix diff --git a/pkgs/applications/video/hypnotix/libmpv-path.patch b/pkgs/by-name/hy/hypnotix/libmpv-path.patch similarity index 100% rename from pkgs/applications/video/hypnotix/libmpv-path.patch rename to pkgs/by-name/hy/hypnotix/libmpv-path.patch diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/by-name/hy/hypnotix/package.nix similarity index 100% rename from pkgs/applications/video/hypnotix/default.nix rename to pkgs/by-name/hy/hypnotix/package.nix diff --git a/pkgs/by-name/hy/hyprgui/package.nix b/pkgs/by-name/hy/hyprgui/package.nix new file mode 100644 index 000000000000..539dcf36ab72 --- /dev/null +++ b/pkgs/by-name/hy/hyprgui/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + glib, + pango, + cairo, + gtk4, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprgui"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "hyprutils"; + repo = "hyprgui"; + rev = "refs/tags/v${version}"; + hash = "sha256-toHE+N18PGSp0HdR9tcVPYRdfNv20HQfS7U5fHeJ32s="; + }; + + cargoHash = "sha256-Vn059HCHwz0j6ujDVk+GNrHQ7PhqBFb3XfjKLSYlYKg="; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + buildInputs = [ + glib + cairo + pango + gtk4 + ]; + + postInstall = '' + install -Dm644 -t $out/usr/share/icons hyprgui.png + install -Dm644 -t $out/usr/share/applications hyprgui.desktop + ''; + + meta = { + description = "GUI for configuring Hyprland written in Rust"; + homepage = "https://github.com/hyprutils/hyprgui"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fccapria ]; + badPlatforms = lib.platforms.darwin; + mainProgram = "hyprgui"; + }; +} diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 05ce061e19ca..6265bd2dc005 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -10,18 +10,19 @@ wayland-scanner, hyprlang, sdbus-cpp_2, - systemd, + systemdLibs, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-20a3pg94dyLFflbBIN+EYJ04nWfWldTfd2YmB/rcrqY="; + hash = "sha256-esE2L7+9CsmlSjTIHwU9VAhzvsFSMC3kO7EiutCPQpg="; }; nativeBuildInputs = [ @@ -34,17 +35,22 @@ stdenv.mkDerivation (finalAttrs: { hyprlang hyprutils sdbus-cpp_2 - systemd + systemdLibs wayland wayland-protocols ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ iogamaster + johnrtitor khaneliman ]; mainProgram = "hypridle"; diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix index 13f9920c23f5..522c451fd676 100644 --- a/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-activewindow"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "FieldOfClay"; repo = "hyprland-activewindow"; rev = "v${version}"; - hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk="; + hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs="; }; - cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ="; + cargoHash = "sha256-B9ZOz4U6tvUfFzI5pOuhazTZJH89jpxwRc+tbfNEZAk="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; diff --git a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix similarity index 100% rename from pkgs/applications/misc/hyprland-autoname-workspaces/default.nix rename to pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix diff --git a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix similarity index 100% rename from pkgs/tools/wayland/hyprland-per-window-layout/default.nix rename to pkgs/by-name/hy/hyprland-per-window-layout/package.nix diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix similarity index 100% rename from pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix rename to pkgs/by-name/hy/hyprland-protocols/package.nix diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index dd96593d5d18..6b925c199ddd 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k="; + hash = "sha256-P+EJoZJqSlpMX1bWOkQYlKR577nTTe1luWKK5GS9Pn4="; }; - cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs="; + cargoHash = "sha256-vUlr12K/vYJE+HlSgulE2aSowU+pT9VPCaCp7Ix9ChM="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 0f61f205b570..c7170f8c905e 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.44.1-b", - "commit_hash": "4520b30d498daca8079365bdb909a8dea38e8d55", - "commit_message": "version: bump to 0.44.1", - "date": "2024-10-09", - "tag": "v0.44.1" + "branch": "main", + "commit_hash": "a425fbebe4cf4238e48a42f724ef2208959d66cf", + "commit_message": "version: bump to 0.45.0", + "date": "2024-11-09", + "tag": "v0.45.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 3364348a1d58..7fdf15bf59e8 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -82,14 +82,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-hnoPoxMFetuoXQuAMgvopl1kCRQ33FYaVVBgV9FIFkM="; + hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA="; }; postPatch = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/by-name/hy/hyprpaper/package.nix similarity index 100% rename from pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix rename to pkgs/by-name/hy/hyprpaper/package.nix diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/by-name/hy/hyprpicker/package.nix similarity index 100% rename from pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix rename to pkgs/by-name/hy/hyprpicker/package.nix diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/by-name/hy/hysteria/package.nix similarity index 100% rename from pkgs/tools/networking/hysteria/default.nix rename to pkgs/by-name/hy/hysteria/package.nix diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/by-name/hy/hyx/package.nix similarity index 100% rename from pkgs/tools/text/hyx/default.nix rename to pkgs/by-name/hy/hyx/package.nix diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/by-name/i-/i-dot-ming/package.nix similarity index 100% rename from pkgs/data/fonts/i-dot-ming/default.nix rename to pkgs/by-name/i-/i-dot-ming/package.nix diff --git a/pkgs/by-name/i2/i2c-tools/package.nix b/pkgs/by-name/i2/i2c-tools/package.nix new file mode 100644 index 000000000000..de94d317a55b --- /dev/null +++ b/pkgs/by-name/i2/i2c-tools/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchzip +, perl +, read-edid +}: + +stdenv.mkDerivation rec { + pname = "i2c-tools"; + version = "4.4"; + + src = fetchzip { + url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-v${version}.tar.gz"; + sha256 = "sha256-Zm83gxdZH2XQCc/Dihp7vumF9WAvKgt6OORns5Mua7M="; + }; + + buildInputs = [ perl ]; + + postPatch = '' + substituteInPlace eeprom/decode-edid \ + --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid" + + substituteInPlace stub/i2c-stub-from-dump \ + --replace "/sbin/" "" + ''; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + outputs = [ "out" "man" ]; + + postInstall = '' + rm -rf $out/include/linux/i2c-dev.h # conflics with kernel headers + ''; + + meta = with lib; { + description = "Set of I2C tools for Linux"; + homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; + # library is LGPL 2.1 or later; "most tools" GPL 2 or later + license = with licenses; [ lgpl21Plus gpl2Plus ]; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/by-name/i2/i2pd/package.nix similarity index 100% rename from pkgs/tools/networking/i2pd/default.nix rename to pkgs/by-name/i2/i2pd/package.nix diff --git a/pkgs/misc/i3a/default.nix b/pkgs/by-name/i3/i3a/package.nix similarity index 100% rename from pkgs/misc/i3a/default.nix rename to pkgs/by-name/i3/i3a/package.nix diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/by-name/i3/i3lock-pixeled/package.nix similarity index 100% rename from pkgs/misc/screensavers/i3lock-pixeled/default.nix rename to pkgs/by-name/i3/i3lock-pixeled/package.nix diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/by-name/i3/i3minator/package.nix similarity index 100% rename from pkgs/tools/misc/i3minator/default.nix rename to pkgs/by-name/i3/i3minator/package.nix diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/by-name/i3/i3nator/package.nix similarity index 100% rename from pkgs/tools/misc/i3nator/default.nix rename to pkgs/by-name/i3/i3nator/package.nix diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/by-name/i8/i810switch/package.nix similarity index 100% rename from pkgs/os-specific/linux/i810switch/default.nix rename to pkgs/by-name/i8/i810switch/package.nix diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/by-name/ia/ia-writer-duospace/package.nix similarity index 100% rename from pkgs/data/fonts/ia-writer-duospace/default.nix rename to pkgs/by-name/ia/ia-writer-duospace/package.nix diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/by-name/ia/iamb/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/iamb/default.nix rename to pkgs/by-name/ia/iamb/package.nix diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/by-name/ia/iamy/package.nix similarity index 100% rename from pkgs/tools/admin/iamy/default.nix rename to pkgs/by-name/ia/iamy/package.nix diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/by-name/ia/iana-etc/package.nix similarity index 100% rename from pkgs/data/misc/iana-etc/default.nix rename to pkgs/by-name/ia/iana-etc/package.nix diff --git a/pkgs/tools/cd-dvd/iat/default.nix b/pkgs/by-name/ia/iat/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/iat/default.nix rename to pkgs/by-name/ia/iat/package.nix diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/by-name/ib/ibm-plex/package.nix similarity index 100% rename from pkgs/data/fonts/ibm-plex/default.nix rename to pkgs/by-name/ib/ibm-plex/package.nix diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/by-name/ib/ibm-sw-tpm2/package.nix similarity index 100% rename from pkgs/tools/security/ibm-sw-tpm2/default.nix rename to pkgs/by-name/ib/ibm-sw-tpm2/package.nix diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/by-name/ib/ibniz/package.nix similarity index 100% rename from pkgs/tools/graphics/ibniz/default.nix rename to pkgs/by-name/ib/ibniz/package.nix diff --git a/pkgs/tools/misc/ibus-theme-tools/default.nix b/pkgs/by-name/ib/ibus-theme-tools/package.nix similarity index 100% rename from pkgs/tools/misc/ibus-theme-tools/default.nix rename to pkgs/by-name/ib/ibus-theme-tools/package.nix diff --git a/pkgs/tools/security/ic-keysmith/default.nix b/pkgs/by-name/ic/ic-keysmith/package.nix similarity index 100% rename from pkgs/tools/security/ic-keysmith/default.nix rename to pkgs/by-name/ic/ic-keysmith/package.nix diff --git a/pkgs/tools/misc/ical2orgpy/default.nix b/pkgs/by-name/ic/ical2orgpy/package.nix similarity index 100% rename from pkgs/tools/misc/ical2orgpy/default.nix rename to pkgs/by-name/ic/ical2orgpy/package.nix diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/by-name/ic/icbm3d/package.nix similarity index 100% rename from pkgs/games/icbm3d/default.nix rename to pkgs/by-name/ic/icbm3d/package.nix diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/by-name/ic/icdiff/package.nix similarity index 100% rename from pkgs/tools/text/icdiff/default.nix rename to pkgs/by-name/ic/icdiff/package.nix diff --git a/pkgs/by-name/ic/ice-bar/package.nix b/pkgs/by-name/ic/ice-bar/package.nix index 0a8c9fd3b041..df204a7092d3 100644 --- a/pkgs/by-name/ic/ice-bar/package.nix +++ b/pkgs/by-name/ic/ice-bar/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ice-bar"; - version = "0.11.11"; + version = "0.11.12"; src = fetchurl { url = "https://github.com/jordanbaird/Ice/releases/download/${finalAttrs.version}/Ice.zip"; - hash = "sha256-Iepf+mFN7ym7aZu3xnJVJoQNDZmSFvt15QTGdXtvScs="; + hash = "sha256-13DoFZdWbdLSNj/rNQ+AjHqS42PflcUeSBQOsw5FLMk="; }; sourceRoot = "."; diff --git a/pkgs/servers/icebreaker/default.nix b/pkgs/by-name/ic/icebreaker/package.nix similarity index 100% rename from pkgs/servers/icebreaker/default.nix rename to pkgs/by-name/ic/icebreaker/package.nix diff --git a/pkgs/servers/icecast/default.nix b/pkgs/by-name/ic/icecast/package.nix similarity index 100% rename from pkgs/servers/icecast/default.nix rename to pkgs/by-name/ic/icecast/package.nix diff --git a/pkgs/servers/icecream/default.nix b/pkgs/by-name/ic/icecream/package.nix similarity index 100% rename from pkgs/servers/icecream/default.nix rename to pkgs/by-name/ic/icecream/package.nix diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/by-name/ic/iceshelf/package.nix similarity index 100% rename from pkgs/tools/backup/iceshelf/default.nix rename to pkgs/by-name/ic/iceshelf/package.nix diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/by-name/ic/icesl/package.nix similarity index 100% rename from pkgs/applications/misc/icesl/default.nix rename to pkgs/by-name/ic/icesl/package.nix diff --git a/pkgs/development/embedded/fpga/icestorm/default.nix b/pkgs/by-name/ic/icestorm/package.nix similarity index 100% rename from pkgs/development/embedded/fpga/icestorm/default.nix rename to pkgs/by-name/ic/icestorm/package.nix diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 868355dea3be..ab6576efa249 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.24.0"; + version = "1.24.3"; pyproject = true; src = fetchFromGitHub { @@ -72,8 +72,11 @@ python3Packages.buildPythonApplication rec { preBuild = '' substituteInPlace pyproject.toml \ - --replace "setuptools==69.0.2" "setuptools" \ - --replace "wheel==0.42.0" "wheel" + --replace-fail "setuptools==69.0.2" "setuptools" \ + --replace-fail "wheel==0.42.0" "wheel" + + substituteInPlace src/foundation/__init__.py \ + --replace-fail "0.0.1" "${version}" ''; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/by-name/ic/icmake/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/icmake/default.nix rename to pkgs/by-name/ic/icmake/package.nix diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/by-name/ic/icon-lang/package.nix similarity index 100% rename from pkgs/development/interpreters/icon-lang/default.nix rename to pkgs/by-name/ic/icon-lang/package.nix diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/by-name/ic/icon-library/package.nix similarity index 100% rename from pkgs/applications/graphics/icon-library/default.nix rename to pkgs/by-name/ic/icon-library/package.nix diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/by-name/ic/icon-slicer/package.nix similarity index 100% rename from pkgs/tools/X11/icon-slicer/default.nix rename to pkgs/by-name/ic/icon-slicer/package.nix diff --git a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh similarity index 100% rename from pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh rename to pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh diff --git a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/pkgs/by-name/ic/iconConvTools/bin/icoFileToHiColorTheme similarity index 100% rename from pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme rename to pkgs/by-name/ic/iconConvTools/bin/icoFileToHiColorTheme diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/by-name/ic/iconConvTools/package.nix similarity index 100% rename from pkgs/build-support/icon-conv-tools/default.nix rename to pkgs/by-name/ic/iconConvTools/package.nix diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/by-name/ic/iconnamingutils/package.nix similarity index 100% rename from pkgs/development/tools/misc/icon-naming-utils/default.nix rename to pkgs/by-name/ic/iconnamingutils/package.nix diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/by-name/ic/iconpack-jade/package.nix similarity index 100% rename from pkgs/data/icons/iconpack-jade/default.nix rename to pkgs/by-name/ic/iconpack-jade/package.nix diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix similarity index 100% rename from pkgs/data/icons/iconpack-obsidian/default.nix rename to pkgs/by-name/ic/iconpack-obsidian/package.nix diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/by-name/ic/icoutils/package.nix similarity index 100% rename from pkgs/tools/graphics/icoutils/default.nix rename to pkgs/by-name/ic/icoutils/package.nix diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/by-name/ic/icr/package.nix similarity index 100% rename from pkgs/development/tools/icr/default.nix rename to pkgs/by-name/ic/icr/package.nix diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/by-name/ic/icr/shards.nix similarity index 100% rename from pkgs/development/tools/icr/shards.nix rename to pkgs/by-name/ic/icr/shards.nix diff --git a/pkgs/tools/misc/ictree/default.nix b/pkgs/by-name/ic/ictree/package.nix similarity index 100% rename from pkgs/tools/misc/ictree/default.nix rename to pkgs/by-name/ic/ictree/package.nix diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch similarity index 100% rename from pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch rename to pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/by-name/id/id3lib/package.nix similarity index 100% rename from pkgs/development/libraries/id3lib/default.nix rename to pkgs/by-name/id/id3lib/package.nix diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/by-name/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff similarity index 100% rename from pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff rename to pkgs/by-name/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/by-name/id/id3v2/package.nix similarity index 100% rename from pkgs/applications/audio/id3v2/default.nix rename to pkgs/by-name/id/id3v2/package.nix diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/by-name/id/ideogram/package.nix similarity index 100% rename from pkgs/applications/graphics/ideogram/default.nix rename to pkgs/by-name/id/ideogram/package.nix diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/by-name/id/ideviceinstaller/package.nix similarity index 100% rename from pkgs/tools/misc/ideviceinstaller/default.nix rename to pkgs/by-name/id/ideviceinstaller/package.nix diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/by-name/id/idevicerestore/package.nix similarity index 100% rename from pkgs/tools/misc/idevicerestore/default.nix rename to pkgs/by-name/id/idevicerestore/package.nix diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/by-name/id/idle3tools/package.nix similarity index 100% rename from pkgs/tools/system/idle3tools/default.nix rename to pkgs/by-name/id/idle3tools/package.nix diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/by-name/id/idnkit/package.nix similarity index 100% rename from pkgs/development/libraries/idnkit/default.nix rename to pkgs/by-name/id/idnkit/package.nix diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/pkgs/by-name/id/idutils/nix-mapping.patch similarity index 100% rename from pkgs/tools/misc/idutils/nix-mapping.patch rename to pkgs/by-name/id/idutils/nix-mapping.patch diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/by-name/id/idutils/package.nix similarity index 100% rename from pkgs/tools/misc/idutils/default.nix rename to pkgs/by-name/id/idutils/package.nix diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/by-name/if/ifdnfc/package.nix similarity index 100% rename from pkgs/tools/security/ifdnfc/default.nix rename to pkgs/by-name/if/ifdnfc/package.nix diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/by-name/if/ifenslave/package.nix similarity index 100% rename from pkgs/os-specific/linux/ifenslave/default.nix rename to pkgs/by-name/if/ifenslave/package.nix diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/by-name/if/iferr/package.nix similarity index 100% rename from pkgs/development/tools/iferr/default.nix rename to pkgs/by-name/if/iferr/package.nix diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/by-name/if/ifm/package.nix similarity index 100% rename from pkgs/tools/graphics/ifm/default.nix rename to pkgs/by-name/if/ifm/package.nix diff --git a/pkgs/os-specific/linux/ifmetric/default.nix b/pkgs/by-name/if/ifmetric/package.nix similarity index 100% rename from pkgs/os-specific/linux/ifmetric/default.nix rename to pkgs/by-name/if/ifmetric/package.nix diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/by-name/if/ifstat-legacy/package.nix similarity index 100% rename from pkgs/tools/networking/ifstat-legacy/default.nix rename to pkgs/by-name/if/ifstat-legacy/package.nix diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/by-name/if/iftop/package.nix similarity index 100% rename from pkgs/tools/networking/iftop/default.nix rename to pkgs/by-name/if/iftop/package.nix diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/by-name/if/ifuse/package.nix similarity index 100% rename from pkgs/tools/filesystems/ifuse/default.nix rename to pkgs/by-name/if/ifuse/package.nix diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index 4ad62dff661a..25d968c19975 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -28,7 +28,7 @@ buildNpmPackage rec { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; # from lib/node_modules/igir/node_modules/@node-rs/crc32-linux-x64-musl/crc32.linux-x64-musl.node # Irrelevant to our use diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/by-name/ig/igmpproxy/package.nix similarity index 100% rename from pkgs/tools/networking/igmpproxy/default.nix rename to pkgs/by-name/ig/igmpproxy/package.nix diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/by-name/ig/igprof/package.nix similarity index 100% rename from pkgs/development/tools/misc/igprof/default.nix rename to pkgs/by-name/ig/igprof/package.nix diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/by-name/ig/igraph/package.nix similarity index 100% rename from pkgs/development/libraries/igraph/default.nix rename to pkgs/by-name/ig/igraph/package.nix diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/by-name/ig/igv/package.nix similarity index 100% rename from pkgs/applications/science/biology/igv/default.nix rename to pkgs/by-name/ig/igv/package.nix diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/by-name/ih/ihp-new/package.nix similarity index 100% rename from pkgs/development/web/ihp-new/default.nix rename to pkgs/by-name/ih/ihp-new/package.nix diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix index ac04d12a5778..5997ee5bda85 100644 --- a/pkgs/by-name/ii/iio-hyprland/package.nix +++ b/pkgs/by-name/ii/iio-hyprland/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "iio-hyprland"; - version = "0-unstable-2024-07-24"; + version = "0-unstable-2024-09-29"; src = fetchFromGitHub { owner = "JeanSchoeller"; repo = "iio-hyprland"; - rev = "bbf59e10cbf293e64b765864a324e971fcc06125"; - hash = "sha256-9tB29tP3ZQ2tU2c+FrWrGqSm70ZrJP8H9WZKzHx55zI="; + rev = "bd6be6b7e0fbc8ca1a5ccbf536602838e52c347e"; + hash = "sha256-gfH/jcrmI27OEge8OGPe7JpC0jrQJuX7v9hM/ObjjW8="; }; buildInputs = [ dbus ]; diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/by-name/ii/iio-sensor-proxy/package.nix similarity index 100% rename from pkgs/os-specific/linux/iio-sensor-proxy/default.nix rename to pkgs/by-name/ii/iio-sensor-proxy/package.nix diff --git a/pkgs/by-name/ij/ijhttp/package.nix b/pkgs/by-name/ij/ijhttp/package.nix index e6eabf9223af..bee692d94f89 100644 --- a/pkgs/by-name/ij/ijhttp/package.nix +++ b/pkgs/by-name/ij/ijhttp/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ijhttp"; - version = "241.14494.240"; + version = "242.21829.56"; src = fetchurl { url = "https://download.jetbrains.com/resources/intellij/http-client/${finalAttrs.version}/intellij-http-client.zip"; - hash = "sha256-PecGB+gwdQGQbWd401qeCFLbmr9fmIBd7lGwLlRLaGg="; + hash = "sha256-MinRCVwEpO/yToOT2zZPxmW58+FhbX2FjEOAtgfkKVk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/by-name/ij/ijs/package.nix similarity index 100% rename from pkgs/development/libraries/ijs/default.nix rename to pkgs/by-name/ij/ijs/package.nix diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/by-name/ik/ike-scan/package.nix similarity index 100% rename from pkgs/tools/security/ike-scan/default.nix rename to pkgs/by-name/ik/ike-scan/package.nix diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/by-name/ik/ikill/package.nix similarity index 100% rename from pkgs/tools/misc/ikill/default.nix rename to pkgs/by-name/ik/ikill/package.nix diff --git a/pkgs/development/libraries/ilbc/CMakeLists.txt b/pkgs/by-name/il/ilbc/CMakeLists.txt similarity index 100% rename from pkgs/development/libraries/ilbc/CMakeLists.txt rename to pkgs/by-name/il/ilbc/CMakeLists.txt diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/pkgs/by-name/il/ilbc/extract-cfile.awk similarity index 100% rename from pkgs/development/libraries/ilbc/extract-cfile.awk rename to pkgs/by-name/il/ilbc/extract-cfile.awk diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/by-name/il/ilbc/package.nix similarity index 100% rename from pkgs/development/libraries/ilbc/default.nix rename to pkgs/by-name/il/ilbc/package.nix diff --git a/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch b/pkgs/by-name/il/ili2c/dont-use-build-timestamp.patch similarity index 100% rename from pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch rename to pkgs/by-name/il/ili2c/dont-use-build-timestamp.patch diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/by-name/il/ili2c/package.nix similarity index 100% rename from pkgs/tools/misc/ili2c/default.nix rename to pkgs/by-name/il/ili2c/package.nix diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/by-name/il/illum/package.nix similarity index 100% rename from pkgs/tools/system/illum/default.nix rename to pkgs/by-name/il/illum/package.nix diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/by-name/il/ilmbase/package.nix similarity index 100% rename from pkgs/development/libraries/ilmbase/default.nix rename to pkgs/by-name/il/ilmbase/package.nix diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/by-name/im/ima-evm-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/ima-evm-utils/default.nix rename to pkgs/by-name/im/ima-evm-utils/package.nix diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/by-name/im/image-roll/package.nix similarity index 100% rename from pkgs/applications/graphics/image-roll/default.nix rename to pkgs/by-name/im/image-roll/package.nix diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/by-name/im/imagej/package.nix similarity index 100% rename from pkgs/applications/graphics/imagej/default.nix rename to pkgs/by-name/im/imagej/package.nix diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/by-name/im/imagelol/package.nix similarity index 100% rename from pkgs/tools/compression/imagelol/default.nix rename to pkgs/by-name/im/imagelol/package.nix diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/by-name/im/imaginary/package.nix similarity index 100% rename from pkgs/servers/imaginary/default.nix rename to pkgs/by-name/im/imaginary/package.nix diff --git a/pkgs/applications/video/imagination/default.nix b/pkgs/by-name/im/imagination/package.nix similarity index 100% rename from pkgs/applications/video/imagination/default.nix rename to pkgs/by-name/im/imagination/package.nix diff --git a/pkgs/applications/misc/imaginer/default.nix b/pkgs/by-name/im/imaginer/package.nix similarity index 100% rename from pkgs/applications/misc/imaginer/default.nix rename to pkgs/by-name/im/imaginer/package.nix diff --git a/pkgs/by-name/im/imapsync/package.nix b/pkgs/by-name/im/imapsync/package.nix new file mode 100644 index 000000000000..9a756aadbf5f --- /dev/null +++ b/pkgs/by-name/im/imapsync/package.nix @@ -0,0 +1,76 @@ +{ + lib, + fetchurl, + makeWrapper, + perl, + perlPackages, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "imapsync"; + version = "2.290"; + + src = fetchurl { + url = "https://imapsync.lamiral.info/dist/old_releases/${finalAttrs.version}/imapsync-${finalAttrs.version}.tgz"; + hash = "sha256-uFhTxnaUDP793isfpF/7T8d4AnXDL4uN6zU8igY+EFE="; + }; + + postPatch = '' + sed -i -e s@/usr@$out@ Makefile + substituteInPlace INSTALL.d/prerequisites_imapsync --replace "PAR::Packer" "" + ''; + + postInstall = '' + wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = with perlPackages; [ + Appcpanminus + CGI + CryptOpenSSLRSA + DataUniqid + DistCheckConflicts + EncodeIMAPUTF7 + FileCopyRecursive + FileTail + IOSocketINET6 + IOTee + JSONWebToken + LWP + MailIMAPClient + ModuleImplementation + ModuleScanDeps + NetServer + NTLM + PackageStash + PackageStashXS + ProcProcessTable + Readonly + RegexpCommon + SysMemInfo + TermReadKey + TestDeep + TestFatal + TestMockGuard + TestMockObject + TestPod + TestRequires + UnicodeString + perl + ]; + + meta = with lib; { + description = "Mail folder synchronizer between IMAP servers"; + mainProgram = "imapsync"; + homepage = "https://imapsync.lamiral.info/"; + license = licenses.nlpl; + maintainers = with maintainers; [ + pSub + motiejus + ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/by-name/im/imath/package.nix similarity index 100% rename from pkgs/development/libraries/imath/default.nix rename to pkgs/by-name/im/imath/package.nix diff --git a/pkgs/tools/security/imdshift/default.nix b/pkgs/by-name/im/imdshift/package.nix similarity index 100% rename from pkgs/tools/security/imdshift/default.nix rename to pkgs/by-name/im/imdshift/package.nix diff --git a/pkgs/applications/graphics/img-cat/default.nix b/pkgs/by-name/im/img-cat/package.nix similarity index 100% rename from pkgs/applications/graphics/img-cat/default.nix rename to pkgs/by-name/im/img-cat/package.nix diff --git a/pkgs/development/tools/img/default.nix b/pkgs/by-name/im/img/package.nix similarity index 100% rename from pkgs/development/tools/img/default.nix rename to pkgs/by-name/im/img/package.nix diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/by-name/im/imgcat/package.nix similarity index 100% rename from pkgs/applications/graphics/imgcat/default.nix rename to pkgs/by-name/im/imgcat/package.nix diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/by-name/im/imgcrypt/package.nix similarity index 100% rename from pkgs/applications/virtualization/imgcrypt/default.nix rename to pkgs/by-name/im/imgcrypt/package.nix diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/by-name/im/imgpatchtools/package.nix similarity index 100% rename from pkgs/development/mobile/imgpatchtools/default.nix rename to pkgs/by-name/im/imgpatchtools/package.nix diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix new file mode 100644 index 000000000000..160185c5f3dd --- /dev/null +++ b/pkgs/by-name/im/imgproxy/package.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection +, stdenv, libunwind }: + +buildGoModule rec { + pname = "imgproxy"; + version = "3.26.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + hash = "sha256-r8yczisCN2jfWFc0L+EIgJLw5MPK4r5+lJsW6FM2hUY="; + rev = "v${version}"; + }; + + vendorHash = "sha256-LGQ+JJ3OqDisT+CsnseVO54wyRTOkGpG9/zzpJw9P1I="; + + nativeBuildInputs = [ pkg-config gobject-introspection ]; + + buildInputs = [ vips ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libunwind ]; + + preBuild = '' + export CGO_LDFLAGS_ALLOW='-(s|w)' + ''; + + meta = with lib; { + description = "Fast and secure on-the-fly image processing server written in Go"; + mainProgram = "imgproxy"; + homepage = "https://imgproxy.net"; + changelog = "https://github.com/imgproxy/imgproxy/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ paluh ]; + }; +} diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/by-name/im/imgur-screenshot/package.nix similarity index 100% rename from pkgs/tools/graphics/imgur-screenshot/default.nix rename to pkgs/by-name/im/imgur-screenshot/package.nix diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/by-name/im/imgurbash2/package.nix similarity index 100% rename from pkgs/tools/graphics/imgurbash2/default.nix rename to pkgs/by-name/im/imgurbash2/package.nix diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/by-name/im/iml/package.nix similarity index 100% rename from pkgs/development/libraries/iml/default.nix rename to pkgs/by-name/im/iml/package.nix diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/by-name/im/imlib2/package.nix similarity index 100% rename from pkgs/development/libraries/imlib2/default.nix rename to pkgs/by-name/im/imlib2/package.nix diff --git a/pkgs/development/libraries/immer/default.nix b/pkgs/by-name/im/immer/package.nix similarity index 100% rename from pkgs/development/libraries/immer/default.nix rename to pkgs/by-name/im/immer/package.nix diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index e9f74898a776..7d29efca5603 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -4,6 +4,7 @@ immich, python3, nixosTests, + stdenv, }: let python = python3.override { @@ -27,11 +28,6 @@ python.pkgs.buildPythonApplication rec { "pydantic-settings" ]; - pythonRemoveDeps = [ - # https://github.com/immich-app/immich/pull/13762 - "setuptools" - ]; - build-system = with python.pkgs; [ poetry-core cython @@ -58,6 +54,10 @@ python.pkgs.buildPythonApplication rec { ] ++ uvicorn.optional-dependencies.standard; + # aarch64-linux tries to get cpu information from /sys, which isn't available + # inside the nix build sandbox. + doCheck = stdenv.buildPlatform.system != "aarch64-linux"; + nativeCheckInputs = with python.pkgs; [ httpx pytest-asyncio diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 66213718fd23..bb1778ee207f 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, buildNpmPackage, fetchFromGitHub, + fetchpatch2, python3, nodejs, node-gyp, @@ -17,12 +18,12 @@ cacert, unzip, # runtime deps - jellyfin-ffmpeg, + exiftool, + jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943 imagemagick, libraw, libheif, vips, - perl, }: let buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; @@ -146,6 +147,13 @@ buildNpmPackage' { src = "${src}/server"; inherit (sources.components.server) npmDepsHash; + postPatch = '' + # pg_dumpall fails without database root access + # see https://github.com/immich-app/immich/issues/13971 + substituteInPlace src/services/backup.service.ts \ + --replace-fail '`pg_dumpall`' '`pg_dump`' + ''; + nativeBuildInputs = [ pkg-config python3 @@ -166,7 +174,7 @@ buildNpmPackage' { makeCacheWritable = true; preBuild = '' - cd node_modules/sharp + pushd node_modules/sharp mkdir node_modules ln -s ${node-addon-api} node_modules/node-addon-api @@ -175,8 +183,13 @@ buildNpmPackage' { rm -r node_modules - cd ../.. + popd rm -r node_modules/@img/sharp* + + # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH + rm -r node_modules/exiftool-vendored.* + substituteInPlace node_modules/exiftool-vendored/dist/DefaultExifToolOptions.js \ + --replace-fail "checkPerl: !(0, IsWin32_1.isWin32)()," "checkPerl: false," ''; installPhase = '' @@ -197,7 +210,7 @@ buildNpmPackage' { --set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \ --suffix PATH : "${ lib.makeBinPath [ - perl + exiftool jellyfin-ffmpeg ] }" diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 27044f2a25f4..f58bc75177a1 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.119.0", - "hash": "sha256-mflVxz+Pxv7xS4onsjRQ1lMZ43U/rkuqO6vPRon7Gms=", + "version": "1.120.1", + "hash": "sha256-FKPs6BHOXmqnHh2yH+PPBFQoK5ykP716dNvES/45t4g=", "components": { "cli": { - "npmDepsHash": "sha256-QClG/WQK2MbVKuR0Wk9+TdSTAbemtFeg7GkKjvEjC4c=", - "version": "2.2.27" + "npmDepsHash": "sha256-5JmcDjLAVXhF3TH0M88dKLYPDsSctcOGPz9nV1n3k9c=", + "version": "2.2.30" }, "server": { - "npmDepsHash": "sha256-9mMnOiKsTTO4PJUKYN668yjIELeFUgdqSx6Gf87UYVU=", - "version": "1.119.0" + "npmDepsHash": "sha256-u2ZQv+z8uyn7z52V+7hNRWgnHVm4xMdhjspPqsLHYek=", + "version": "1.120.1" }, "web": { - "npmDepsHash": "sha256-ieTGMywR26msYqmQOK/q/l3O6/Vkmu0TLFn956kK/xE=", - "version": "1.119.0" + "npmDepsHash": "sha256-EAFUOhcmE1TfUBN0uxzuNkHibdaDRn8Lxvma70UJqDE=", + "version": "1.120.1" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-NLvuHTVWuzv5G0ONu3S3K8AgyliTZowYQN0fzYhWtUQ=", - "version": "1.119.0" + "npmDepsHash": "sha256-AJcK5NE+ZNAK2FJblY32jtYxY0Z9npH92A3htcPes4A=", + "version": "1.120.1" } } } diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix new file mode 100644 index 000000000000..2ebe92995bd9 --- /dev/null +++ b/pkgs/by-name/im/immudb/package.nix @@ -0,0 +1,71 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchzip +, installShellFiles +}: + +let + webconsoleVersion = "1.0.18"; + webconsoleDist = fetchzip { + url = "https://github.com/codenotary/immudb-webconsole/releases/download/v${webconsoleVersion}/immudb-webconsole.tar.gz"; + sha256 = "sha256-4BhTK+gKO8HW1CelGa30THpfkqfqFthK+b7p9QWl4Pw="; + }; +in +buildGoModule rec { + pname = "immudb"; + version = "1.9.5"; + + src = fetchFromGitHub { + owner = "codenotary"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XKioPk0Rv+I916OLInJEtOaDV9KcBMWSHmPOq2k3LTQ="; + }; + + postPatch = '' + EXPECTED_WEBCONSOLE_STRING='DEFAULT_WEBCONSOLE_VERSION=${webconsoleVersion}' + if ! grep -F "$EXPECTED_WEBCONSOLE_STRING" Makefile ; then + echo "Did not find $EXPECTED_WEBCONSOLE_STRING in Makefile. " \ + "Our webconsole version may need bumping (or the Makefile may have changed)" + exit 3 + fi + ''; + + preBuild = '' + mkdir -p webconsole/dist + cp -r ${webconsoleDist}/* ./webconsole/dist + go generate -tags webconsole ./webconsole + ''; + + vendorHash = "sha256-6DHmJrE+xkf8K38a8h1VSD33W6qj594Q5bJJXnfSW0Q="; + + nativeBuildInputs = [ installShellFiles ]; + + tags = [ "webconsole" ]; + + ldflags = [ "-X github.com/codenotary/immudb/cmd/version.Version=${version}" ]; + + subPackages = [ + "cmd/immudb" + "cmd/immuclient" + "cmd/immuadmin" + ]; + + postInstall = '' + mkdir -p share/completions + for executable in immudb immuclient immuadmin; do + for shell in bash fish zsh; do + $out/bin/$executable completion $shell > share/completions/$executable.$shell + installShellCompletion share/completions/$executable.$shell + done + done + ''; + + meta = with lib; { + description = "Immutable database based on zero trust, SQL and Key-Value, tamperproof, data change history"; + homepage = "https://github.com/codenotary/immudb"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/by-name/im/impl/package.nix similarity index 100% rename from pkgs/development/tools/impl/default.nix rename to pkgs/by-name/im/impl/package.nix diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/by-name/im/impy/package.nix similarity index 100% rename from pkgs/development/libraries/impy/default.nix rename to pkgs/by-name/im/impy/package.nix diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/by-name/im/imtui/package.nix similarity index 100% rename from pkgs/development/libraries/imtui/default.nix rename to pkgs/by-name/im/imtui/package.nix diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/by-name/im/imv/package.nix similarity index 100% rename from pkgs/applications/graphics/imv/default.nix rename to pkgs/by-name/im/imv/package.nix diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/by-name/im/imwheel/package.nix similarity index 100% rename from pkgs/tools/X11/imwheel/default.nix rename to pkgs/by-name/im/imwheel/package.nix diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/by-name/in/inadyn/package.nix similarity index 100% rename from pkgs/tools/networking/inadyn/default.nix rename to pkgs/by-name/in/inadyn/package.nix diff --git a/pkgs/by-name/in/inav-blackbox-tools/package.nix b/pkgs/by-name/in/inav-blackbox-tools/package.nix new file mode 100644 index 000000000000..4acfc4d4890e --- /dev/null +++ b/pkgs/by-name/in/inav-blackbox-tools/package.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo }: + +stdenv.mkDerivation rec { + pname = "inav-blackbox-tools"; + version = "unstable-2021-04-22"; + + src = fetchFromGitHub { + owner = "iNavFlight"; + repo = "blackbox-tools"; + rev = "0109e2fb9b44d593e60bca4cef4098d83c55c373"; + sha256 = "1rdlw74dqq0hahnka2w2pgvs172vway2x6v8byxl2s773l22k4ln"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ cairo ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp obj/{blackbox_decode,blackbox_render,encoder_testbed} "$out/bin" + + runHook postInstall + ''; + + meta = with lib; { + description = "Tools for working with blackbox flight logs"; + homepage = "https://github.com/inavflight/blackbox-tools"; + license = licenses.gpl3Only; + maintainers = []; + platforms = platforms.all; + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin + }; +} diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/by-name/in/inav-configurator/package.nix similarity index 100% rename from pkgs/applications/science/robotics/inav-configurator/default.nix rename to pkgs/by-name/in/inav-configurator/package.nix diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/by-name/in/inchi/package.nix similarity index 100% rename from pkgs/development/libraries/inchi/default.nix rename to pkgs/by-name/in/inchi/package.nix diff --git a/pkgs/tools/system/incron/default_path.patch b/pkgs/by-name/in/incron/default_path.patch similarity index 100% rename from pkgs/tools/system/incron/default_path.patch rename to pkgs/by-name/in/incron/default_path.patch diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/by-name/in/incron/package.nix similarity index 100% rename from pkgs/tools/system/incron/default.nix rename to pkgs/by-name/in/incron/package.nix diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/by-name/in/indent/package.nix similarity index 100% rename from pkgs/development/tools/misc/indent/default.nix rename to pkgs/by-name/in/indent/package.nix diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/by-name/in/indicator-sound-switcher/package.nix similarity index 100% rename from pkgs/applications/audio/indicator-sound-switcher/default.nix rename to pkgs/by-name/in/indicator-sound-switcher/package.nix diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/by-name/in/industrializer/package.nix similarity index 100% rename from pkgs/applications/audio/industrializer/default.nix rename to pkgs/by-name/in/industrializer/package.nix diff --git a/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/pkgs/by-name/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch similarity index 100% rename from pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch rename to pkgs/by-name/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/by-name/in/inetutils/package.nix similarity index 100% rename from pkgs/tools/networking/inetutils/default.nix rename to pkgs/by-name/in/inetutils/package.nix diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/by-name/in/infamousPlugins/package.nix similarity index 100% rename from pkgs/applications/audio/infamousPlugins/default.nix rename to pkgs/by-name/in/infamousPlugins/package.nix diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/by-name/in/inferno/package.nix similarity index 100% rename from pkgs/development/tools/inferno/default.nix rename to pkgs/by-name/in/inferno/package.nix diff --git a/pkgs/misc/drivers/infnoise/makefile.patch b/pkgs/by-name/in/infnoise/makefile.patch similarity index 100% rename from pkgs/misc/drivers/infnoise/makefile.patch rename to pkgs/by-name/in/infnoise/makefile.patch diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/by-name/in/infnoise/package.nix similarity index 100% rename from pkgs/misc/drivers/infnoise/default.nix rename to pkgs/by-name/in/infnoise/package.nix diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/by-name/in/inform7/package.nix similarity index 100% rename from pkgs/development/compilers/inform7/default.nix rename to pkgs/by-name/in/inform7/package.nix diff --git a/pkgs/games/infra-arcana/default.nix b/pkgs/by-name/in/infra-arcana/package.nix similarity index 100% rename from pkgs/games/infra-arcana/default.nix rename to pkgs/by-name/in/infra-arcana/package.nix diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/by-name/in/infra/package.nix similarity index 100% rename from pkgs/tools/admin/infra/default.nix rename to pkgs/by-name/in/infra/package.nix diff --git a/pkgs/applications/networking/cluster/inframap/default.nix b/pkgs/by-name/in/inframap/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/inframap/default.nix rename to pkgs/by-name/in/inframap/package.nix diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix new file mode 100644 index 000000000000..7812ec87e160 --- /dev/null +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "infrastructure-agent"; + version = "1.57.2"; + + src = fetchFromGitHub { + owner = "newrelic"; + repo = "infrastructure-agent"; + rev = version; + hash = "sha256-74aBFGBrrEiqAVG3kVYLOz3P4VTCw4G3vV/iBucFPYs="; + }; + + vendorHash = "sha256-0WLL15CXRi/flp4EV3Qt0wO1VaUmAokzsChpiqjs+YQ="; + + ldflags = [ + "-s" + "-w" + "-X main.buildVersion=${version}" + "-X main.gitCommit=${src.rev}" + ]; + + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0"; + + subPackages = [ + "cmd/newrelic-infra" + "cmd/newrelic-infra-ctl" + "cmd/newrelic-infra-service" + ]; + + meta = { + description = "New Relic Infrastructure Agent"; + homepage = "https://github.com/newrelic/infrastructure-agent.git"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ davsanchez ]; + mainProgram = "newrelic-infra"; + }; +} diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/by-name/in/ingen/package.nix similarity index 100% rename from pkgs/applications/audio/ingen/default.nix rename to pkgs/by-name/in/ingen/package.nix diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/by-name/in/inih/package.nix similarity index 100% rename from pkgs/development/libraries/inih/default.nix rename to pkgs/by-name/in/inih/package.nix diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/by-name/in/iniparser/package.nix similarity index 100% rename from pkgs/development/libraries/iniparser/default.nix rename to pkgs/by-name/in/iniparser/package.nix diff --git a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch similarity index 100% rename from pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch rename to pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/by-name/in/initool/package.nix similarity index 100% rename from pkgs/development/tools/initool/default.nix rename to pkgs/by-name/in/initool/package.nix diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/by-name/in/ink/package.nix similarity index 100% rename from pkgs/tools/misc/ink/default.nix rename to pkgs/by-name/in/ink/package.nix diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/by-name/in/inklecate/deps.nix similarity index 100% rename from pkgs/development/compilers/inklecate/deps.nix rename to pkgs/by-name/in/inklecate/deps.nix diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix new file mode 100644 index 000000000000..629b2f38ccfa --- /dev/null +++ b/pkgs/by-name/in/inklecate/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, buildDotnetModule +, dotnetCorePackages +, fetchFromGitHub +}: + +buildDotnetModule rec { + pname = "inklecate"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "inkle"; + repo = "ink"; + rev = "v${version}"; + hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; + }; + + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + + projectFile = "inklecate/inklecate.csproj"; + nugetDeps = ./deps.nix; + executables = [ "inklecate" ]; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + meta = with lib; { + description = "Compiler for ink, inkle's scripting language"; + mainProgram = "inklecate"; + longDescription = '' + Inklecate is a command-line compiler for ink, inkle's open source + scripting language for writing interactive narrative + ''; + homepage = "https://www.inklestudios.com/ink/"; + downloadPage = "https://github.com/inkle/ink/"; + license = licenses.mit; + platforms = platforms.unix; + badPlatforms = platforms.aarch64; + maintainers = with maintainers; [ shreerammodi ]; + }; +} diff --git a/pkgs/tools/misc/inklingreader/default.nix b/pkgs/by-name/in/inklingreader/package.nix similarity index 100% rename from pkgs/tools/misc/inklingreader/default.nix rename to pkgs/by-name/in/inklingreader/package.nix diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 70abc78b0fe3..a623379d0915 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { libz libxml2 ncurses - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/by-name/in/innoextract/package.nix similarity index 100% rename from pkgs/tools/archivers/innoextract/default.nix rename to pkgs/by-name/in/innoextract/package.nix diff --git a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/pkgs/by-name/in/inormalize/lgmask-interp.patch similarity index 100% rename from pkgs/applications/science/biology/inormalize/lgmask-interp.patch rename to pkgs/by-name/in/inormalize/lgmask-interp.patch diff --git a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/pkgs/by-name/in/inormalize/nu_correct_norm-interp.patch similarity index 100% rename from pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch rename to pkgs/by-name/in/inormalize/nu_correct_norm-interp.patch diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/by-name/in/inormalize/package.nix similarity index 100% rename from pkgs/applications/science/biology/inormalize/default.nix rename to pkgs/by-name/in/inormalize/package.nix diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/by-name/in/inotify-tools/package.nix similarity index 100% rename from pkgs/development/tools/misc/inotify-tools/default.nix rename to pkgs/by-name/in/inotify-tools/package.nix diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/by-name/in/inputplug/package.nix similarity index 100% rename from pkgs/tools/X11/inputplug/default.nix rename to pkgs/by-name/in/inputplug/package.nix diff --git a/pkgs/tools/security/inql/default.nix b/pkgs/by-name/in/inql/package.nix similarity index 100% rename from pkgs/tools/security/inql/default.nix rename to pkgs/by-name/in/inql/package.nix diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/by-name/in/inriafonts/package.nix similarity index 100% rename from pkgs/data/fonts/inriafonts/default.nix rename to pkgs/by-name/in/inriafonts/package.nix diff --git a/pkgs/by-name/in/inshellisense/package.nix b/pkgs/by-name/in/inshellisense/package.nix index 3b2a84ace0c5..115639aba3d3 100644 --- a/pkgs/by-name/in/inshellisense/package.nix +++ b/pkgs/by-name/in/inshellisense/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "inshellisense"; - version = "0.0.1-rc.16"; + version = "0.0.1-rc.18"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jqLYN251ZvLOjYsSQJmvQ1TupO4jz3Q23aDpKX+Puvs="; + hash = "sha256-9cSygGQar2rD3lorehlNmUzd0ZnABNJSJwmoNH3MTmk="; }; - npmDepsHash = "sha256-rGUyA0RLnNZ6ocmHPXfBLJ6ZmeeTN9w+TJTtfTQQ24M="; + npmDepsHash = "sha256-/FSzeHPgVb5OB6mjP5GYAYBdTmk93xyWJI+NH7L61Do="; # Needed for dependency `@homebridge/node-pty-prebuilt-multiarch` # On Darwin systems the build fails with, diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/by-name/in/insomnia/package.nix similarity index 100% rename from pkgs/development/web/insomnia/default.nix rename to pkgs/by-name/in/insomnia/package.nix diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/by-name/in/inspectrum/package.nix similarity index 100% rename from pkgs/applications/radio/inspectrum/default.nix rename to pkgs/by-name/in/inspectrum/package.nix diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/by-name/in/inspircd/package.nix similarity index 100% rename from pkgs/servers/irc/inspircd/default.nix rename to pkgs/by-name/in/inspircd/package.nix diff --git a/pkgs/games/instead/default.nix b/pkgs/by-name/in/instead/package.nix similarity index 100% rename from pkgs/games/instead/default.nix rename to pkgs/by-name/in/instead/package.nix diff --git a/pkgs/applications/misc/insulator2/Cargo.lock b/pkgs/by-name/in/insulator2/Cargo.lock similarity index 100% rename from pkgs/applications/misc/insulator2/Cargo.lock rename to pkgs/by-name/in/insulator2/Cargo.lock diff --git a/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch b/pkgs/by-name/in/insulator2/fix-rust-1.80.0.patch similarity index 100% rename from pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch rename to pkgs/by-name/in/insulator2/fix-rust-1.80.0.patch diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/by-name/in/insulator2/package.nix similarity index 100% rename from pkgs/applications/misc/insulator2/default.nix rename to pkgs/by-name/in/insulator2/package.nix diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix similarity index 100% rename from pkgs/os-specific/linux/intel-cmt-cat/default.nix rename to pkgs/by-name/in/intel-cmt-cat/package.nix diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix new file mode 100644 index 000000000000..872281f6c9d0 --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, intel-gmmlib +, intel-graphics-compiler +, level-zero +, libva +}: + +stdenv.mkDerivation rec { + pname = "intel-compute-runtime"; + version = "24.39.31294.12"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "compute-runtime"; + rev = version; + hash = "sha256-7GNtAo20DgxAxYSPt6Nh92nuuaS9tzsQGH+sLnsvBKU="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ]; + + cmakeFlags = [ + "-DSKIP_UNIT_TESTS=1" + "-DIGC_DIR=${intel-graphics-compiler}" + "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" + # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + outputs = [ "out" "drivers" ]; + + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + + postInstall = '' + # Avoid clash with intel-ocl + mv $out/etc/OpenCL/vendors/intel.icd $out/etc/OpenCL/vendors/intel-neo.icd + + mkdir -p $drivers/lib + mv -t $drivers/lib $out/lib/libze_intel* + ''; + + postFixup = '' + patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc ]} \ + $out/lib/intel-opencl/libigdrcl.so + ''; + + meta = with lib; { + description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond"; + mainProgram = "ocloc"; + homepage = "https://github.com/intel/compute-runtime"; + changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}"; + license = licenses.mit; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/by-name/in/intel-gmmlib/package.nix similarity index 100% rename from pkgs/development/libraries/intel-gmmlib/default.nix rename to pkgs/by-name/in/intel-gmmlib/package.nix diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix similarity index 100% rename from pkgs/development/tools/misc/intel-gpu-tools/default.nix rename to pkgs/by-name/in/intel-gpu-tools/package.nix diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix similarity index 100% rename from pkgs/development/compilers/intel-graphics-compiler/default.nix rename to pkgs/by-name/in/intel-graphics-compiler/package.nix diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/by-name/in/intel-media-driver/package.nix similarity index 100% rename from pkgs/development/libraries/intel-media-driver/default.nix rename to pkgs/by-name/in/intel-media-driver/package.nix diff --git a/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch b/pkgs/by-name/in/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch similarity index 100% rename from pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch rename to pkgs/by-name/in/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/by-name/in/intel-media-sdk/package.nix similarity index 100% rename from pkgs/development/libraries/intel-media-sdk/default.nix rename to pkgs/by-name/in/intel-media-sdk/package.nix diff --git a/pkgs/by-name/in/intel-ocl/package.nix b/pkgs/by-name/in/intel-ocl/package.nix new file mode 100644 index 000000000000..ad5699ab2f55 --- /dev/null +++ b/pkgs/by-name/in/intel-ocl/package.nix @@ -0,0 +1,78 @@ +{ lib, stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: + +stdenv.mkDerivation rec { + pname = "intel-ocl"; + version = "5.0-63503"; + + src = fetchzip { + # https://github.com/NixOS/nixpkgs/issues/166886 + urls = [ + "https://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip" + "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip" + "https://web.archive.org/web/20190526190814/http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip" + ]; + sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2"; + stripRoot = false; + }; + + buildInputs = [ rpmextract ]; + + sourceRoot = "."; + + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + ncurses5 + numactl + zlib + ]; + + postUnpack = '' + # Extract the RPMs contained within the source ZIP. + rpmextract source/intel-opencl-r${version}.x86_64.rpm + rpmextract source/intel-opencl-cpu-r${version}.x86_64.rpm + ''; + + patchPhase = '' + runHook prePatch + + # Remove libOpenCL.so, since we use ocl-icd's libOpenCL.so instead and this would cause a clash. + rm opt/intel/opencl/libOpenCL.so* + + # Patch shared libraries. + for lib in opt/intel/opencl/*.so; do + patchelf --set-rpath "${libPath}:$out/lib/intel-ocl" $lib || true + done + + runHook postPatch + ''; + + buildPhase = '' + runHook preBuild + + # Create ICD file, which just contains the path of the corresponding shared library. + echo "$out/lib/intel-ocl/libintelocl.so" > intel.icd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D -m 0755 opt/intel/opencl/*.so* -t $out/lib/intel-ocl + install -D -m 0644 opt/intel/opencl/*.{o,rtl,bin} -t $out/lib/intel-ocl + install -D -m 0644 opt/intel/opencl/{LICENSE,NOTICES} -t $out/share/doc/intel-ocl + install -D -m 0644 intel.icd -t $out/etc/OpenCL/vendors + + runHook postInstall + ''; + + dontStrip = true; + + meta = { + description = "Official OpenCL runtime for Intel CPUs"; + homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ ]; + }; +} diff --git a/pkgs/data/fonts/intel-one-mono/default.nix b/pkgs/by-name/in/intel-one-mono/package.nix similarity index 100% rename from pkgs/data/fonts/intel-one-mono/default.nix rename to pkgs/by-name/in/intel-one-mono/package.nix diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix new file mode 100644 index 000000000000..ec93f3efe588 --- /dev/null +++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + gnum4, + pkg-config, + python3, + wayland-scanner, + intel-gpu-tools, + libdrm, + libva, + libX11, + libGL, + wayland, + libXext, + enableHybridCodec ? false, + vaapi-intel-hybrid, + enableGui ? true, + nix-update-script, +}: + +stdenv.mkDerivation { + pname = "intel-vaapi-driver"; + version = "2.4.1-unstable-2024-10-29"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "intel-vaapi-driver"; + rev = "fd727a4e9cb8b2878a1e93d4dddc8dd1c1a4e0ea"; + hash = "sha256-OMFdRjzpUKdxB9eK/1OLYLaOC3NHnzZVxmh6yKrbYoE="; + }; + + # Set the correct install path: + LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; + + postInstall = lib.optionalString enableHybridCodec '' + ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ + ''; + + configureFlags = [ + (lib.enableFeature enableGui "x11") + (lib.enableFeature enableGui "wayland") + ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; + + nativeBuildInputs = [ + autoreconfHook + gnum4 + pkg-config + python3 + wayland-scanner + ]; + + buildInputs = + [ + intel-gpu-tools + libdrm + libva + ] + ++ lib.optionals enableGui [ + libX11 + libXext + libGL + wayland + ] + ++ lib.optional enableHybridCodec vaapi-intel-hybrid; + + enableParallelBuilding = true; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = with lib; { + homepage = "https://01.org/linuxmedia"; + license = licenses.mit; + description = "VA-API user mode driver for Intel GEN Graphics family"; + longDescription = '' + This VA-API video driver backend provides a bridge to the GEN GPUs through + the packaging of buffers and commands to be sent to the i915 driver for + exercising both hardware and shader functionality for video decode, + encode, and processing. + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library and driver-specific acceleration + backends for each supported hardware vendor. + ''; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/by-name/in/intel2200BGFirmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix rename to pkgs/by-name/in/intel2200BGFirmware/package.nix diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/by-name/in/inter/package.nix similarity index 100% rename from pkgs/data/fonts/inter/default.nix rename to pkgs/by-name/in/inter/package.nix diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/by-name/in/interactsh/package.nix similarity index 100% rename from pkgs/tools/misc/interactsh/default.nix rename to pkgs/by-name/in/interactsh/package.nix diff --git a/pkgs/servers/interlock/default.nix b/pkgs/by-name/in/interlock/package.nix similarity index 100% rename from pkgs/servers/interlock/default.nix rename to pkgs/by-name/in/interlock/package.nix diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/by-name/in/intermodal/package.nix similarity index 100% rename from pkgs/tools/misc/intermodal/default.nix rename to pkgs/by-name/in/intermodal/package.nix diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/by-name/in/intltool/package.nix similarity index 100% rename from pkgs/development/tools/misc/intltool/default.nix rename to pkgs/by-name/in/intltool/package.nix diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index f9ff4b6119ca..0e4d2947643b 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { let libPath = { intune = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc libuuid xorg.libX11 curlMinimal diff --git a/pkgs/tools/misc/invoice/default.nix b/pkgs/by-name/in/invoice/package.nix similarity index 100% rename from pkgs/tools/misc/invoice/default.nix rename to pkgs/by-name/in/invoice/package.nix diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/by-name/in/invoice2data/package.nix similarity index 100% rename from pkgs/tools/text/invoice2data/default.nix rename to pkgs/by-name/in/invoice2data/package.nix diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/by-name/in/invoiceplane/package.nix similarity index 100% rename from pkgs/servers/web-apps/invoiceplane/default.nix rename to pkgs/by-name/in/invoiceplane/package.nix diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/by-name/in/inxi/package.nix similarity index 100% rename from pkgs/tools/system/inxi/default.nix rename to pkgs/by-name/in/inxi/package.nix diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/by-name/io/io/package.nix similarity index 100% rename from pkgs/development/interpreters/io/default.nix rename to pkgs/by-name/io/io/package.nix diff --git a/pkgs/tools/security/ioc-scan/default.nix b/pkgs/by-name/io/ioc-scan/package.nix similarity index 100% rename from pkgs/tools/security/ioc-scan/default.nix rename to pkgs/by-name/io/ioc-scan/package.nix diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/by-name/io/ioccheck/package.nix similarity index 100% rename from pkgs/tools/security/ioccheck/default.nix rename to pkgs/by-name/io/ioccheck/package.nix diff --git a/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch b/pkgs/by-name/io/iodash/0001-Add-cmake-install-directives.patch similarity index 100% rename from pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch rename to pkgs/by-name/io/iodash/0001-Add-cmake-install-directives.patch diff --git a/pkgs/development/libraries/iodash/default.nix b/pkgs/by-name/io/iodash/package.nix similarity index 100% rename from pkgs/development/libraries/iodash/default.nix rename to pkgs/by-name/io/iodash/package.nix diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/by-name/io/iodine/package.nix similarity index 100% rename from pkgs/tools/networking/iodine/default.nix rename to pkgs/by-name/io/iodine/package.nix diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/by-name/io/iomelt/package.nix similarity index 100% rename from pkgs/os-specific/linux/iomelt/default.nix rename to pkgs/by-name/io/iomelt/package.nix diff --git a/pkgs/shells/ion/Cargo.lock b/pkgs/by-name/io/ion/Cargo.lock similarity index 100% rename from pkgs/shells/ion/Cargo.lock rename to pkgs/by-name/io/ion/Cargo.lock diff --git a/pkgs/shells/ion/build-script.patch b/pkgs/by-name/io/ion/build-script.patch similarity index 100% rename from pkgs/shells/ion/build-script.patch rename to pkgs/by-name/io/ion/build-script.patch diff --git a/pkgs/shells/ion/default.nix b/pkgs/by-name/io/ion/package.nix similarity index 100% rename from pkgs/shells/ion/default.nix rename to pkgs/by-name/io/ion/package.nix diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/by-name/io/ioping/package.nix similarity index 100% rename from pkgs/tools/system/ioping/default.nix rename to pkgs/by-name/io/ioping/package.nix diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/by-name/io/ioport/package.nix similarity index 100% rename from pkgs/os-specific/linux/ioport/default.nix rename to pkgs/by-name/io/ioport/package.nix diff --git a/pkgs/games/quake3/ioquake/Makefile.local b/pkgs/by-name/io/ioquake3/Makefile.local similarity index 100% rename from pkgs/games/quake3/ioquake/Makefile.local rename to pkgs/by-name/io/ioquake3/Makefile.local diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/by-name/io/ioquake3/package.nix similarity index 100% rename from pkgs/games/quake3/ioquake/default.nix rename to pkgs/by-name/io/ioquake3/package.nix diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/by-name/io/ior/package.nix similarity index 100% rename from pkgs/tools/system/ior/default.nix rename to pkgs/by-name/io/ior/package.nix diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/by-name/io/iotas/package.nix similarity index 100% rename from pkgs/applications/office/iotas/default.nix rename to pkgs/by-name/io/iotas/package.nix diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/by-name/io/iotop-c/package.nix similarity index 100% rename from pkgs/os-specific/linux/iotop-c/default.nix rename to pkgs/by-name/io/iotop-c/package.nix diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/by-name/io/iotop/package.nix similarity index 100% rename from pkgs/os-specific/linux/iotop/default.nix rename to pkgs/by-name/io/iotop/package.nix diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/by-name/io/iozone/package.nix similarity index 100% rename from pkgs/development/tools/misc/iozone/default.nix rename to pkgs/by-name/io/iozone/package.nix diff --git a/pkgs/tools/filesystems/ioztat/default.nix b/pkgs/by-name/io/ioztat/package.nix similarity index 100% rename from pkgs/tools/filesystems/ioztat/default.nix rename to pkgs/by-name/io/ioztat/package.nix diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/by-name/ip/ip2location-c/package.nix similarity index 100% rename from pkgs/development/libraries/ip2location-c/default.nix rename to pkgs/by-name/ip/ip2location-c/package.nix diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/by-name/ip/ip2location/package.nix similarity index 100% rename from pkgs/tools/networking/ip2location/default.nix rename to pkgs/by-name/ip/ip2location/package.nix diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/by-name/ip/ip2unix/package.nix similarity index 100% rename from pkgs/tools/networking/ip2unix/default.nix rename to pkgs/by-name/ip/ip2unix/package.nix diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/by-name/ip/ipad_charge/package.nix similarity index 100% rename from pkgs/tools/misc/ipad_charge/default.nix rename to pkgs/by-name/ip/ipad_charge/package.nix diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/by-name/ip/ipaexfont/package.nix similarity index 100% rename from pkgs/data/fonts/ipaexfont/default.nix rename to pkgs/by-name/ip/ipaexfont/package.nix diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/by-name/ip/ipafont/package.nix similarity index 100% rename from pkgs/data/fonts/ipafont/default.nix rename to pkgs/by-name/ip/ipafont/package.nix diff --git a/pkgs/applications/misc/ipatool/default.nix b/pkgs/by-name/ip/ipatool/package.nix similarity index 100% rename from pkgs/applications/misc/ipatool/default.nix rename to pkgs/by-name/ip/ipatool/package.nix diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/by-name/ip/ipbt/package.nix similarity index 100% rename from pkgs/tools/misc/ipbt/default.nix rename to pkgs/by-name/ip/ipbt/package.nix diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/by-name/ip/ipcalc/package.nix similarity index 100% rename from pkgs/tools/networking/ipcalc/default.nix rename to pkgs/by-name/ip/ipcalc/package.nix diff --git a/pkgs/tools/networking/ipcalc/sandbox_tests.patch b/pkgs/by-name/ip/ipcalc/sandbox_tests.patch similarity index 100% rename from pkgs/tools/networking/ipcalc/sandbox_tests.patch rename to pkgs/by-name/ip/ipcalc/sandbox_tests.patch diff --git a/pkgs/tools/networking/iperf3d/default.nix b/pkgs/by-name/ip/iperf3d/package.nix similarity index 100% rename from pkgs/tools/networking/iperf3d/default.nix rename to pkgs/by-name/ip/iperf3d/package.nix diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/by-name/ip/ipfetch/package.nix similarity index 100% rename from pkgs/tools/networking/ipfetch/default.nix rename to pkgs/by-name/ip/ipfetch/package.nix diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix similarity index 100% rename from pkgs/applications/networking/ipfs-cluster/default.nix rename to pkgs/by-name/ip/ipfs-cluster/package.nix diff --git a/pkgs/applications/networking/ipfs-upload-client/default.nix b/pkgs/by-name/ip/ipfs-upload-client/package.nix similarity index 100% rename from pkgs/applications/networking/ipfs-upload-client/default.nix rename to pkgs/by-name/ip/ipfs-upload-client/package.nix diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/by-name/ip/ipget/package.nix similarity index 100% rename from pkgs/applications/networking/ipget/default.nix rename to pkgs/by-name/ip/ipget/package.nix diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/by-name/ip/ipgrep/package.nix similarity index 100% rename from pkgs/tools/networking/ipgrep/default.nix rename to pkgs/by-name/ip/ipgrep/package.nix diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/by-name/ip/ipinfo/package.nix similarity index 100% rename from pkgs/tools/networking/ipinfo/default.nix rename to pkgs/by-name/ip/ipinfo/package.nix diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/by-name/ip/ipmicfg/package.nix similarity index 100% rename from pkgs/applications/misc/ipmicfg/default.nix rename to pkgs/by-name/ip/ipmicfg/package.nix diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/by-name/ip/ipmitool/package.nix similarity index 100% rename from pkgs/tools/system/ipmitool/default.nix rename to pkgs/by-name/ip/ipmitool/package.nix diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/by-name/ip/ipmiutil/package.nix similarity index 100% rename from pkgs/tools/system/ipmiutil/default.nix rename to pkgs/by-name/ip/ipmiutil/package.nix diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/by-name/ip/ipmiview/package.nix similarity index 100% rename from pkgs/applications/misc/ipmiview/default.nix rename to pkgs/by-name/ip/ipmiview/package.nix diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/by-name/ip/ipopt/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/ipopt/default.nix rename to pkgs/by-name/ip/ipopt/package.nix diff --git a/pkgs/os-specific/linux/ipp-usb/default.nix b/pkgs/by-name/ip/ipp-usb/package.nix similarity index 100% rename from pkgs/os-specific/linux/ipp-usb/default.nix rename to pkgs/by-name/ip/ipp-usb/package.nix diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix new file mode 100644 index 000000000000..923a5cc8b309 --- /dev/null +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -0,0 +1,96 @@ +{ lib, stdenv, fetchurl, fetchpatch +, buildPackages, bison, flex, pkg-config +, db, iptables, elfutils, libmnl ,libbpf +, gitUpdater, pkgsStatic +}: + +stdenv.mkDerivation rec { + pname = "iproute2"; + version = "6.11.0"; + + src = fetchurl { + url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-H3lTmKBK6qzQao9qziz9kTwz+llTypnaroO7XFNGEcM="; + }; + + patches = [ + (fetchurl { + name = "musl-endian.patch"; + url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw"; + hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E="; + }) + (fetchurl { + name = "musl-msghdr.patch"; + url = "https://lore.kernel.org/netdev/20240712191209.31324-2-contact@hacktivis.me/raw"; + hash = "sha256-X5BYSZBxcvdjtX1069a1GfcpdoVd0loSAe4xTpbCipA="; + }) + (fetchurl { + name = "musl-basename.patch"; + url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw"; + hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM="; + }) + (fetchpatch { + name = "musl-mst.patch"; + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=6a77abab92516e65f07f8657fc4e384c4541ce0e"; + hash = "sha256-19FzTDvgnmqVFBykVgXl4VIsHs8Cy9NWGOLpxifxVlI="; + }) + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "CC := gcc" "CC ?= $CC" + ''; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--color" "auto" + ]; + + makeFlags = [ + "PREFIX=$(out)" + "SBINDIR=$(out)/sbin" + "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs + "HDRDIR=$(dev)/include/iproute2" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "SHARED_LIBS=n" + # all build .so plugins: + "TC_CONFIG_NO_XT=y" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "HOSTCC=$(CC_FOR_BUILD)" + ]; + + buildFlags = [ + "CONFDIR=/etc/iproute2" + ]; + + installFlags = [ + "CONFDIR=$(out)/etc/iproute2" + ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC + nativeBuildInputs = [ bison flex pkg-config ]; + buildInputs = [ db iptables libmnl ] + # needed to uploaded bpf programs + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + elfutils libbpf + ]; + + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git"; + rev-prefix = "v"; + }; + # needed for nixos-anywhere + passthru.tests.static = pkgsStatic.iproute2; + + meta = with lib; { + homepage = "https://wiki.linuxfoundation.org/networking/iproute2"; + description = "Collection of utilities for controlling TCP/IP networking and traffic control in Linux"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ primeos fpletz globin ]; + }; +} diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/by-name/ip/iprover/package.nix similarity index 100% rename from pkgs/applications/science/logic/iprover/default.nix rename to pkgs/by-name/ip/iprover/package.nix diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/by-name/ip/ipscan/package.nix similarity index 100% rename from pkgs/tools/security/ipscan/default.nix rename to pkgs/by-name/ip/ipscan/package.nix diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/by-name/ip/ipset/package.nix similarity index 100% rename from pkgs/os-specific/linux/ipset/default.nix rename to pkgs/by-name/ip/ipset/package.nix diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/by-name/ip/iptraf-ng/package.nix similarity index 100% rename from pkgs/applications/networking/iptraf-ng/default.nix rename to pkgs/by-name/ip/iptraf-ng/package.nix diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/by-name/ip/iptsd/package.nix similarity index 100% rename from pkgs/applications/misc/iptsd/default.nix rename to pkgs/by-name/ip/iptsd/package.nix diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/by-name/ip/iptstate/package.nix similarity index 100% rename from pkgs/os-specific/linux/iptstate/default.nix rename to pkgs/by-name/ip/iptstate/package.nix diff --git a/pkgs/by-name/ip/ipu6-camera-bins/package.nix b/pkgs/by-name/ip/ipu6-camera-bins/package.nix new file mode 100644 index 000000000000..8ea3d96157a4 --- /dev/null +++ b/pkgs/by-name/ip/ipu6-camera-bins/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoPatchelfHook +, expat +, zlib +}: + +stdenv.mkDerivation (finalAttrs: rec { + pname = "ipu6-camera-bins"; + version = "unstable-2024-09-27"; + + src = fetchFromGitHub { + repo = "ipu6-camera-bins"; + owner = "intel"; + rev = "98ca6f2a54d20f171628055938619972514f7a07"; + hash = "sha256-DAjAzHMqX41mrfQVpDUJLw4Zjb9pz6Uy3TJjTGIkd6o="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + (lib.getLib stdenv.cc.cc) + expat + zlib + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp --no-preserve=mode --recursive \ + lib \ + include \ + $out/ + + # There is no LICENSE file in the src + # install -m 0644 -D LICENSE $out/share/doc/LICENSE + + runHook postInstall + ''; + + postFixup = '' + for pcfile in $out/lib/pkgconfig/*.pc; do + substituteInPlace $pcfile \ + --replace 'prefix=/usr' "prefix=$out" + done + ''; + + meta = with lib; { + description = "IPU firmware and proprietary image processing libraries"; + homepage = "https://github.com/intel/ipu6-camera-bins"; + license = licenses.issl; + sourceProvenance = with sourceTypes; [ + binaryFirmware + ]; + maintainers = [ ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/by-name/ip/ipv6calc/package.nix similarity index 100% rename from pkgs/tools/networking/ipv6calc/default.nix rename to pkgs/by-name/ip/ipv6calc/package.nix diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/by-name/ip/ipvsadm/package.nix similarity index 100% rename from pkgs/os-specific/linux/ipvsadm/default.nix rename to pkgs/by-name/ip/ipvsadm/package.nix diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/by-name/iq/iqtree/package.nix similarity index 100% rename from pkgs/applications/science/biology/iqtree/default.nix rename to pkgs/by-name/iq/iqtree/package.nix diff --git a/pkgs/development/libraries/iqueue/default.nix b/pkgs/by-name/iq/iqueue/package.nix similarity index 100% rename from pkgs/development/libraries/iqueue/default.nix rename to pkgs/by-name/iq/iqueue/package.nix diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/by-name/ir/ir-standard-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/ir-standard-fonts/default.nix rename to pkgs/by-name/ir/ir-standard-fonts/package.nix diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/by-name/ir/irccat/package.nix similarity index 100% rename from pkgs/servers/irc/irccat/default.nix rename to pkgs/by-name/ir/irccat/package.nix diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/by-name/ir/irccloud/package.nix similarity index 100% rename from pkgs/applications/networking/irc/irccloud/default.nix rename to pkgs/by-name/ir/irccloud/package.nix diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/by-name/ir/ircdHybrid/package.nix similarity index 100% rename from pkgs/servers/irc/ircd-hybrid/default.nix rename to pkgs/by-name/ir/ircdHybrid/package.nix diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/by-name/ir/ircdog/package.nix similarity index 100% rename from pkgs/applications/networking/irc/ircdog/default.nix rename to pkgs/by-name/ir/ircdog/package.nix diff --git a/pkgs/servers/irker/default.nix b/pkgs/by-name/ir/irker/package.nix similarity index 100% rename from pkgs/servers/irker/default.nix rename to pkgs/by-name/ir/irker/package.nix diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/by-name/ir/iroh/package.nix similarity index 100% rename from pkgs/applications/networking/iroh/default.nix rename to pkgs/by-name/ir/iroh/package.nix diff --git a/pkgs/games/ironwail/default.nix b/pkgs/by-name/ir/ironwail/package.nix similarity index 100% rename from pkgs/games/ironwail/default.nix rename to pkgs/by-name/ir/ironwail/package.nix diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 1161e9a881e5..c40ac4401ee6 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2024-1.4"; + version = "2024-1.5"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { year = lib.head (lib.splitVersion finalAttrs.version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-223PZyGlLSK5GzR143IlGzhmJlXmvtBdscC2roPiQhc="; + hash = "sha256-Pz8oI96GpLcHFEtnKUHnUHtZL3/QGhtG93ab5Au/tw0="; }; passthru.updateScript = writeScript "update-irpf" '' diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/by-name/ir/irqbalance/package.nix similarity index 100% rename from pkgs/os-specific/linux/irqbalance/default.nix rename to pkgs/by-name/ir/irqbalance/package.nix diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 1012d06542ec..504213a29ad0 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -151,10 +151,10 @@ in stdenv.mkDerivation (finalAttrs: rec { done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do - patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so + patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${lib.getLib stdenv.cc.cc}/lib" ]}" $d/*.so done '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3 + patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib" contrib/z3-*/$arch/z3 ''; buildPhase = '' diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/by-name/is/ised/package.nix similarity index 100% rename from pkgs/tools/misc/ised/default.nix rename to pkgs/by-name/is/ised/package.nix diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/by-name/is/iso-flags/package.nix similarity index 100% rename from pkgs/data/icons/iso-flags/default.nix rename to pkgs/by-name/is/iso-flags/package.nix diff --git a/pkgs/by-name/is/isocodes/package.nix b/pkgs/by-name/is/isocodes/package.nix new file mode 100644 index 000000000000..29b0bff5e0ad --- /dev/null +++ b/pkgs/by-name/is/isocodes/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, gettext, python3, testers }: + +stdenv.mkDerivation (finalAttrs: { + pname = "iso-codes"; + version = "4.17.0"; + + src = fetchurl { + url = with finalAttrs; "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; + hash = "sha256-3VyhPbd+xt0cwl9cAYQpCocOwf7SRdjjmgT/NPWQdsM="; + }; + + nativeBuildInputs = [ gettext python3 ]; + + enableParallelBuilding = true; + + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = with lib; { + homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; + description = "Various ISO codes packaged as XML files"; + license = licenses.lgpl21; + platforms = platforms.all; + pkgConfigModules = [ "iso-codes" ]; + }; +}) diff --git a/pkgs/tools/security/isolate/default.nix b/pkgs/by-name/is/isolate/package.nix similarity index 100% rename from pkgs/tools/security/isolate/default.nix rename to pkgs/by-name/is/isolate/package.nix diff --git a/pkgs/tools/security/isolate/take-config-file-from-env.patch b/pkgs/by-name/is/isolate/take-config-file-from-env.patch similarity index 100% rename from pkgs/tools/security/isolate/take-config-file-from-env.patch rename to pkgs/by-name/is/isolate/take-config-file-from-env.patch diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/by-name/is/isolyzer/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/isolyzer/default.nix rename to pkgs/by-name/is/isolyzer/package.nix diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/by-name/is/isomd5sum/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/isomd5sum/default.nix rename to pkgs/by-name/is/isomd5sum/package.nix diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/by-name/is/ispell/package.nix similarity index 100% rename from pkgs/tools/text/ispell/default.nix rename to pkgs/by-name/is/ispell/package.nix diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/by-name/is/ispike/package.nix similarity index 100% rename from pkgs/development/libraries/science/robotics/ispike/default.nix rename to pkgs/by-name/is/ispike/package.nix diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/by-name/is/isrcsubmit/package.nix similarity index 100% rename from pkgs/tools/audio/isrcsubmit/default.nix rename to pkgs/by-name/is/isrcsubmit/package.nix diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/by-name/is/istioctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/istioctl/default.nix rename to pkgs/by-name/is/istioctl/package.nix diff --git a/pkgs/by-name/it/it-tools/package.nix b/pkgs/by-name/it/it-tools/package.nix new file mode 100644 index 000000000000..75bba8012aaa --- /dev/null +++ b/pkgs/by-name/it/it-tools/package.nix @@ -0,0 +1,52 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nodejs, + pnpm_8, +}: +stdenv.mkDerivation rec { + pname = "it-tools"; + version = "2024.10.22-7ca5933"; + + src = fetchFromGitHub { + owner = "CorentinTh"; + repo = "it-tools"; + rev = "v${version}"; + hash = "sha256-SQAZv+9tINRH10lewcuv8G2qwfulLOP8sGjX47LxeUk="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_8.configHook + ]; + + pnpmDeps = pnpm_8.fetchDeps { + inherit pname version src; + hash = "sha256-m1eXBE5rakcq8NGnPC9clAAvNJQrN5RuSQ94zfgGZxw="; + }; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -R ./dist/* $out/lib/ + + runHook postInstall + ''; + + meta = { + description = "Self-hostable website containing handy tools for developers, with great UX"; + homepage = "https://it-tools.tech/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ akotro ]; + }; +} diff --git a/pkgs/games/itchiodl/default.nix b/pkgs/by-name/it/itchiodl/package.nix similarity index 100% rename from pkgs/games/itchiodl/default.nix rename to pkgs/by-name/it/itchiodl/package.nix diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/by-name/it/itd/package.nix similarity index 100% rename from pkgs/applications/misc/itd/default.nix rename to pkgs/by-name/it/itd/package.nix diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/by-name/it/ite-backlight/package.nix similarity index 100% rename from pkgs/misc/ite-backlight/default.nix rename to pkgs/by-name/it/ite-backlight/package.nix diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/by-name/it/iterm2/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/iterm2/default.nix rename to pkgs/by-name/it/iterm2/package.nix diff --git a/pkgs/development/tools/misc/itm-tools/Cargo.lock b/pkgs/by-name/it/itm-tools/Cargo.lock similarity index 100% rename from pkgs/development/tools/misc/itm-tools/Cargo.lock rename to pkgs/by-name/it/itm-tools/Cargo.lock diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/by-name/it/itm-tools/package.nix similarity index 100% rename from pkgs/development/tools/misc/itm-tools/default.nix rename to pkgs/by-name/it/itm-tools/package.nix diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/by-name/it/itpp/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/itpp/default.nix rename to pkgs/by-name/it/itpp/package.nix diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/by-name/it/itstool/package.nix similarity index 100% rename from pkgs/development/tools/misc/itstool/default.nix rename to pkgs/by-name/it/itstool/package.nix diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/by-name/it/itsx/package.nix similarity index 100% rename from pkgs/applications/science/biology/itsx/default.nix rename to pkgs/by-name/it/itsx/package.nix diff --git a/pkgs/games/ivan/default.nix b/pkgs/by-name/iv/ivan/package.nix similarity index 100% rename from pkgs/games/ivan/default.nix rename to pkgs/by-name/iv/ivan/package.nix diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index 3dbbd8056dd3..995eb32a5f9e 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Icarus Verilog compiler"; - homepage = "http://iverilog.icarus.com/"; # https does not work + homepage = "https://steveicarus.github.io/iverilog"; license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.all; diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 705bbf14a041..15644f2710b5 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0="; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/pkgs/by-name/iv/ivsc-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix rename to pkgs/by-name/iv/ivsc-firmware/package.nix diff --git a/pkgs/development/interpreters/ivy/default.nix b/pkgs/by-name/iv/ivy/package.nix similarity index 100% rename from pkgs/development/interpreters/ivy/default.nix rename to pkgs/by-name/iv/ivy/package.nix diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix index 7fe42f201b93..b5c7c26f09ce 100644 --- a/pkgs/by-name/iv/ivyterm/package.nix +++ b/pkgs/by-name/iv/ivyterm/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "Tomiyou"; repo = "ivyterm"; rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7"; - hash = "sha256-vxDJwA+ZM3ROX9d1+o3cXj4LbaO9Wy5jFAVuAPOzCCI="; + hash = "sha256-RVHGDgaNYhR/eGTu4bhJvEfd14qFP+u8ApItVc00Bm8="; }; cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U="; diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix new file mode 100644 index 000000000000..fdd289722155 --- /dev/null +++ b/pkgs/by-name/iw/iwd/package.nix @@ -0,0 +1,104 @@ +{ lib, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, ell +, coreutils +, docutils +, readline +, openssl +, python3Packages +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "iwd"; + version = "2.22"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; + rev = version; + hash = "sha256-t2mfBRP/PRlcfeezu3B7myCKXVv9SHeW8HlGK1cO3/I="; + }; + + outputs = [ "out" "man" "doc" ] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; + separateDebugInfo = true; + + nativeBuildInputs = [ + autoreconfHook + docutils + pkg-config + python3Packages.wrapPython + ]; + + buildInputs = [ + ell + python3Packages.python + readline + ]; + + nativeCheckInputs = [ openssl ]; + + # wrapPython wraps the scripts in $test. They pull in gobject-introspection, + # which doesn't cross-compile. + pythonPath = lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + python3Packages.dbus-python + python3Packages.pygobject3 + ]; + + configureFlags = [ + "--enable-external-ell" + "--enable-wired" + "--localstatedir=/var/" + "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/" + "--with-dbus-datadir=${placeholder "out"}/share/" + "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe + "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" + "--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" + ]; + + postUnpack = '' + mkdir -p iwd/ell + ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h + ln -s ${ell.src}/ell/asn1-private.h iwd/ell/asn1-private.h + patchShebangs . + ''; + + doCheck = true; + + postInstall = '' + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p $test/bin + cp -a test/* $test/bin/ + ''; + + preFixup = '' + wrapPythonPrograms + ''; + + postFixup = '' + substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \ + --replace-fail /bin/false ${coreutils}/bin/false + substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \ + --replace-fail /bin/false ${coreutils}/bin/false + ''; + + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; + }; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; + description = "Wireless daemon for Linux"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill fpletz ]; + }; +} diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/by-name/iw/iwgtk/package.nix similarity index 100% rename from pkgs/tools/networking/iwgtk/default.nix rename to pkgs/by-name/iw/iwgtk/package.nix diff --git a/pkgs/tools/networking/iwgtk/systemd-service.patch b/pkgs/by-name/iw/iwgtk/systemd-service.patch similarity index 100% rename from pkgs/tools/networking/iwgtk/systemd-service.patch rename to pkgs/by-name/iw/iwgtk/systemd-service.patch diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/by-name/iw/iwona/package.nix similarity index 100% rename from pkgs/data/fonts/iwona/default.nix rename to pkgs/by-name/iw/iwona/package.nix diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/by-name/ix/ix/package.nix similarity index 100% rename from pkgs/tools/misc/ix/default.nix rename to pkgs/by-name/ix/ix/package.nix diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/by-name/j4/j4-dmenu-desktop/package.nix similarity index 100% rename from pkgs/applications/misc/j4-dmenu-desktop/default.nix rename to pkgs/by-name/j4/j4-dmenu-desktop/package.nix diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/by-name/ja/jaaa/package.nix similarity index 100% rename from pkgs/applications/audio/jaaa/default.nix rename to pkgs/by-name/ja/jaaa/package.nix diff --git a/pkgs/applications/audio/jack-passthrough/default.nix b/pkgs/by-name/ja/jack-passthrough/package.nix similarity index 100% rename from pkgs/applications/audio/jack-passthrough/default.nix rename to pkgs/by-name/ja/jack-passthrough/package.nix diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/by-name/ja/jack_capture/package.nix similarity index 100% rename from pkgs/applications/audio/jack-capture/default.nix rename to pkgs/by-name/ja/jack_capture/package.nix diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/by-name/ja/jack_oscrolloscope/package.nix similarity index 100% rename from pkgs/applications/audio/jack-oscrolloscope/default.nix rename to pkgs/by-name/ja/jack_oscrolloscope/package.nix diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/by-name/ja/jack_rack/package.nix similarity index 100% rename from pkgs/applications/audio/jack-rack/default.nix rename to pkgs/by-name/ja/jack_rack/package.nix diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/by-name/ja/jackmeter/package.nix similarity index 100% rename from pkgs/applications/audio/jackmeter/default.nix rename to pkgs/by-name/ja/jackmeter/package.nix diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/by-name/ja/jacktrip/package.nix similarity index 100% rename from pkgs/applications/audio/jacktrip/default.nix rename to pkgs/by-name/ja/jacktrip/package.nix diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/by-name/ja/jacoco/package.nix similarity index 100% rename from pkgs/development/tools/analysis/jacoco/default.nix rename to pkgs/by-name/ja/jacoco/package.nix diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/by-name/ja/jade/package.nix similarity index 100% rename from pkgs/tools/text/sgml/jade/default.nix rename to pkgs/by-name/ja/jade/package.nix diff --git a/pkgs/tools/security/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json similarity index 100% rename from pkgs/tools/security/jadx/deps.json rename to pkgs/by-name/ja/jadx/deps.json diff --git a/pkgs/tools/security/jadx/no-native-deps.diff b/pkgs/by-name/ja/jadx/no-native-deps.diff similarity index 100% rename from pkgs/tools/security/jadx/no-native-deps.diff rename to pkgs/by-name/ja/jadx/no-native-deps.diff diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/by-name/ja/jadx/package.nix similarity index 100% rename from pkgs/tools/security/jadx/default.nix rename to pkgs/by-name/ja/jadx/package.nix diff --git a/pkgs/tools/security/jaeles/default.nix b/pkgs/by-name/ja/jaeles/package.nix similarity index 100% rename from pkgs/tools/security/jaeles/default.nix rename to pkgs/by-name/ja/jaeles/package.nix diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/by-name/ja/jags/package.nix similarity index 100% rename from pkgs/applications/science/math/jags/default.nix rename to pkgs/by-name/ja/jags/package.nix diff --git a/pkgs/development/tools/jake/default.nix b/pkgs/by-name/ja/jake/package.nix similarity index 100% rename from pkgs/development/tools/jake/default.nix rename to pkgs/by-name/ja/jake/package.nix diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/by-name/ja/jama/package.nix similarity index 100% rename from pkgs/development/libraries/jama/default.nix rename to pkgs/by-name/ja/jama/package.nix diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/by-name/ja/jamin/package.nix similarity index 100% rename from pkgs/applications/audio/jamin/default.nix rename to pkgs/by-name/ja/jamin/package.nix diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 5121f4af9748..df90ff0fba89 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-PkRizjF4RVhCH7YOPABb+SpZlO3aKT5W6b0YBuKTNWk="; + hash = "sha256-mWmqvyX9n79uCtCZimU7B1jFE+0Ucwe+RGw0oSQaSB4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix index 1f1e06697aa6..5ccb8c8f850f 100644 --- a/pkgs/by-name/ja/jankyborders/package.nix +++ b/pkgs/by-name/ja/jankyborders/package.nix @@ -1,15 +1,12 @@ -{ lib -, fetchFromGitHub -, pkg-config -, pkgs -, overrideSDK -, darwin -, testers -, nix-update-script +{ + lib, + stdenv, + apple-sdk_11, + fetchFromGitHub, + pkg-config, + testers, + nix-update-script, }: -let - stdenv = overrideSDK pkgs.stdenv "11.0"; -in stdenv.mkDerivation (finalAttrs: { pname = "JankyBorders"; version = "1.6.0"; @@ -25,12 +22,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = with darwin.apple_sdk.frameworks; [ - AppKit - ApplicationServices - CoreFoundation - CoreGraphics - SkyLight + buildInputs = [ + apple-sdk_11 ]; installPhase = '' diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/by-name/ja/janusgraph/package.nix similarity index 100% rename from pkgs/servers/nosql/janusgraph/default.nix rename to pkgs/by-name/ja/janusgraph/package.nix diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/by-name/ja/japa/package.nix similarity index 100% rename from pkgs/applications/audio/japa/default.nix rename to pkgs/by-name/ja/japa/package.nix diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/by-name/ja/jaq/package.nix similarity index 100% rename from pkgs/development/tools/jaq/default.nix rename to pkgs/by-name/ja/jaq/package.nix diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/by-name/ja/jarowinkler-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/jarowinkler-cpp/default.nix rename to pkgs/by-name/ja/jarowinkler-cpp/package.nix diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix similarity index 100% rename from pkgs/development/compilers/jasmin-compiler/default.nix rename to pkgs/by-name/ja/jasmin-compiler/package.nix diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/by-name/ja/jasmin/package.nix similarity index 100% rename from pkgs/development/compilers/jasmin/default.nix rename to pkgs/by-name/ja/jasmin/package.nix diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/by-name/ja/jasmin/test-assemble-hello-world/HelloWorld.j similarity index 100% rename from pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j rename to pkgs/by-name/ja/jasmin/test-assemble-hello-world/HelloWorld.j diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/by-name/ja/jasmin/test-assemble-hello-world/default.nix similarity index 100% rename from pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix rename to pkgs/by-name/ja/jasmin/test-assemble-hello-world/default.nix diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 08fd1425fc39..2fb25136e503 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -2,9 +2,10 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, buildEnv, linkFarm, - substituteAll, + replaceVars, R, rPackages, cmake, @@ -58,10 +59,15 @@ stdenv.mkDerivation { patches = [ # remove unused cmake deps, ensure boost is dynamically linked, patch readstat path - (substituteAll { - src = ./cmake.patch; + (replaceVars ./cmake.patch { inherit readstat; }) + + (fetchpatch { + name = "fix-qt-6.8-crash.patch"; + url = "https://github.com/jasp-stats/jasp-desktop/commit/d96a35d262312f72081ac3f96ae8c2ae7c796b0.patch"; + hash = "sha256-KcsFy1ImPTHwDKN5Umfoa9CbtQn7B3FNu/Srr0dEJGA="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/by-name/ja/java-language-server/package.nix similarity index 100% rename from pkgs/development/tools/java/java-language-server/default.nix rename to pkgs/by-name/ja/java-language-server/package.nix diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix similarity index 100% rename from pkgs/tools/system/java-service-wrapper/default.nix rename to pkgs/by-name/ja/java-service-wrapper/package.nix diff --git a/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix rename to pkgs/by-name/ja/javascript-typescript-langserver/package.nix diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/by-name/ja/jay/package.nix similarity index 100% rename from pkgs/applications/window-managers/jay/default.nix rename to pkgs/by-name/ja/jay/package.nix diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/by-name/jb/jbake/package.nix similarity index 100% rename from pkgs/development/tools/jbake/default.nix rename to pkgs/by-name/jb/jbake/package.nix diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/by-name/jb/jbang/package.nix similarity index 100% rename from pkgs/development/tools/jbang/default.nix rename to pkgs/by-name/jb/jbang/package.nix diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/by-name/jb/jbig2dec/package.nix similarity index 100% rename from pkgs/development/libraries/jbig2dec/default.nix rename to pkgs/by-name/jb/jbig2dec/package.nix diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/by-name/jb/jbig2enc/package.nix similarity index 100% rename from pkgs/development/libraries/jbig2enc/default.nix rename to pkgs/by-name/jb/jbig2enc/package.nix diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/by-name/jb/jbigkit/package.nix similarity index 100% rename from pkgs/development/libraries/jbigkit/default.nix rename to pkgs/by-name/jb/jbigkit/package.nix diff --git a/pkgs/tools/text/jbofihe/default.nix b/pkgs/by-name/jb/jbofihe/package.nix similarity index 100% rename from pkgs/tools/text/jbofihe/default.nix rename to pkgs/by-name/jb/jbofihe/package.nix diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix similarity index 100% rename from pkgs/servers/http/jboss/jdbc/mysql/default.nix rename to pkgs/by-name/jb/jboss_mysql_jdbc/package.nix diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix new file mode 100644 index 000000000000..d98527cc1e13 --- /dev/null +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "jbrowse"; + version = "2.16.0"; + + src = fetchurl { + url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; + sha256 = "sha256-Nf+Dp1XVXgY1+iih7/cvzxnfCKdgHz5kpefdMucrlIA="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + +in +appimageTools.wrapType2 { + inherit pname version src; + unshareIpc = false; + + extraInstallCommands = '' + mv $out/bin/jbrowse $out/bin/jbrowse-desktop + install -m 444 -D ${appimageContents}/jbrowse-desktop.desktop $out/share/applications/jbrowse-desktop.desktop + install -m 444 -D ${appimageContents}/jbrowse-desktop.png \ + $out/share/icons/hicolor/512x512/apps/jbrowse-desktop.png + substituteInPlace $out/share/applications/jbrowse-desktop.desktop \ + --replace 'Exec=AppRun --no-sandbox' 'Exec=jbrowse-desktop' + ''; + + meta = with lib; { + description = "Next-generation genome browser"; + mainProgram = "jbrowse-desktop"; + homepage = "https://jbrowse.org/jb2/"; + license = licenses.asl20; + maintainers = with maintainers; [ benwbooth ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/by-name/jc/jcal/package.nix similarity index 100% rename from pkgs/development/libraries/jcal/default.nix rename to pkgs/by-name/jc/jcal/package.nix diff --git a/pkgs/applications/audio/jconvolver/default.nix b/pkgs/by-name/jc/jconvolver/package.nix similarity index 100% rename from pkgs/applications/audio/jconvolver/default.nix rename to pkgs/by-name/jc/jconvolver/package.nix diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix similarity index 100% rename from pkgs/development/tools/jd-diff-patch/default.nix rename to pkgs/by-name/jd/jd-diff-patch/package.nix diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/by-name/jd/jdiskreport/package.nix similarity index 100% rename from pkgs/tools/misc/jdiskreport/default.nix rename to pkgs/by-name/jd/jdiskreport/package.nix diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/by-name/jd/jdom/package.nix similarity index 100% rename from pkgs/development/libraries/java/jdom/default.nix rename to pkgs/by-name/jd/jdom/package.nix diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/by-name/jd/jdupes/package.nix similarity index 100% rename from pkgs/tools/misc/jdupes/default.nix rename to pkgs/by-name/jd/jdupes/package.nix diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/by-name/je/jed/package.nix similarity index 100% rename from pkgs/applications/editors/jed/default.nix rename to pkgs/by-name/je/jed/package.nix diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/by-name/je/jedit/package.nix similarity index 100% rename from pkgs/applications/editors/jedit/default.nix rename to pkgs/by-name/je/jedit/package.nix diff --git a/pkgs/tools/filesystems/jefferson/default.nix b/pkgs/by-name/je/jefferson/package.nix similarity index 100% rename from pkgs/tools/filesystems/jefferson/default.nix rename to pkgs/by-name/je/jefferson/package.nix diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/by-name/je/jelly/package.nix similarity index 100% rename from pkgs/development/interpreters/jelly/default.nix rename to pkgs/by-name/je/jelly/package.nix diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/by-name/je/jellycli/fix-test-dir.patch similarity index 100% rename from pkgs/applications/audio/jellycli/fix-test-dir.patch rename to pkgs/by-name/je/jellycli/fix-test-dir.patch diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/by-name/je/jellycli/package.nix similarity index 100% rename from pkgs/applications/audio/jellycli/default.nix rename to pkgs/by-name/je/jellycli/package.nix diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix new file mode 100644 index 000000000000..16cd0663345d --- /dev/null +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -0,0 +1,43 @@ +{ ffmpeg_7-full +, fetchFromGitHub +, fetchpatch +, lib +}: + +let + version = "7.0.2-5"; +in + +(ffmpeg_7-full.override { + inherit version; # Important! This sets the ABI. + source = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-ffmpeg"; + rev = "v${version}"; + hash = "sha256-cqyXQNx65eLEumOoSCucNpAqShMhiPqzsKc/GjKKQOA="; + }; +}).overrideAttrs (old: { + pname = "jellyfin-ffmpeg"; + + configureFlags = old.configureFlags ++ [ + "--extra-version=Jellyfin" + "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 + ]; + + postPatch = '' + for file in $(cat debian/patches/series); do + patch -p1 < debian/patches/$file + done + + ${old.postPatch or ""} + ''; + + meta = { + inherit (old.meta) license mainProgram; + changelog = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/tag/v${version}"; + description = "${old.meta.description} (Jellyfin fork)"; + homepage = "https://github.com/jellyfin/jellyfin-ffmpeg"; + maintainers = with lib.maintainers; [ justinas ]; + pkgConfigModules = [ "libavutil" ]; + }; +}) diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix new file mode 100644 index 000000000000..e0120e9d6b98 --- /dev/null +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "jellyfin-rpc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "Radiicall"; + repo = "jellyfin-rpc"; + rev = "refs/tags/${version}"; + hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0="; + }; + + cargoHash = "sha256-KHbYM7aWgch+DWF46DpFCCt7JoKR0sasuFO3xPOytWA="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Displays the content you're currently watching on Discord"; + homepage = "https://github.com/Radiicall/jellyfin-rpc"; + changelog = "https://github.com/Radiicall/jellyfin-rpc/releases/tag/${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "jellyfin-rpc"; + }; +} diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index ee5622baabd6..6cfa106b603c 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -1,33 +1,20 @@ { lib, stdenv, - overrideSDK, fetchFromGitHub, buildNpmPackage, - jellyfin, nix-update-script, pkg-config, xcbuild, pango, giflib, - darwin, + apple-sdk_11, + darwinMinVersionHook, + jellyfin, }: -let - # node-canvas builds code that requires aligned_alloc, - # which on Darwin requires at least the 10.15 SDK - stdenv' = - if stdenv.hostPlatform.isDarwin then - overrideSDK stdenv { - darwinMinVersion = "10.15"; - darwinSdkVersion = "11.0"; - } - else - stdenv; - buildNpmPackage' = buildNpmPackage.override { stdenv = stdenv'; }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.9.11"; + version = "10.10.1"; src = assert version == jellyfin.version; @@ -35,10 +22,20 @@ buildNpmPackage' rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-zt0Exx/4B5gqiN3fxvQuVh1MqRNNtJG6/G0/reqVHRc="; + hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; }; - npmDepsHash = "sha256-kQxfh8o8NBshKmmjQrLdxiOQK83LG+lxhZwzDkEJwEo="; + postPatch = '' + substituteInPlace webpack.common.js \ + --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ + ''; + + npmDepsHash = "sha256-kL57KmBHmBwJEhsUciPaj826qdoSQxZXxtFNGkddGZk="; + + preBuild = '' + # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart + rm -r node_modules/sass-embedded* + ''; npmBuildScript = [ "build:production" ]; @@ -48,7 +45,10 @@ buildNpmPackage' rec { [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib - darwin.apple_sdk.frameworks.CoreText + apple-sdk_11 + # node-canvas builds code that requires aligned_alloc, + # which on Darwin requires at least the 10.15 SDK + (darwinMinVersionHook "10.15") ]; installPhase = '' diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.nix b/pkgs/by-name/je/jellyfin/nuget-deps.nix index 510b4adc29d7..721504ed0cec 100644 --- a/pkgs/by-name/je/jellyfin/nuget-deps.nix +++ b/pkgs/by-name/je/jellyfin/nuget-deps.nix @@ -2,17 +2,17 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.4.2"; hash = "sha256-EUr70BGXGczVP6Iq5rDpJNwHiBcQ7bLSCDr29N/V8N0="; }) + (fetchNuGet { pname = "AsyncKeyedLock"; version = "7.0.2"; hash = "sha256-UFPta8yWtuFhpfy7OpBkUDQnyO8TODXEE0zA6ubz1QM="; }) (fetchNuGet { pname = "BDInfo"; version = "0.8.0"; hash = "sha256-r6Q+rRTbHyFqiWeaUDfw0eS8D/U1FZckNzAaU4ibLhQ="; }) - (fetchNuGet { pname = "BlurHashSharp"; version = "1.3.2"; hash = "sha256-1EMObWfsDBePj9oQTy8VmefasJ29CG++J/l3UPOZ/fk="; }) - (fetchNuGet { pname = "BlurHashSharp.SkiaSharp"; version = "1.3.2"; hash = "sha256-PXYTFzJUXtldhoX3mvipQWulVKRXe1aFQazyYfvaOeI="; }) + (fetchNuGet { pname = "BlurHashSharp"; version = "1.3.3"; hash = "sha256-Zrea7/O9ARyM65xokZU9M0Lx/WsriJ1gclWB17oOQKU="; }) + (fetchNuGet { pname = "BlurHashSharp.SkiaSharp"; version = "1.3.3"; hash = "sha256-yarsi8uxOGFOx79iUts3443a79pd8NYcKy8Va2g+baw="; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) (fetchNuGet { pname = "Diacritics"; version = "3.3.29"; hash = "sha256-sIbdJ3yMthnmJHly3WheUdYjtwPakcczTJx9ycxtgrY="; }) (fetchNuGet { pname = "DiscUtils.Core"; version = "0.16.13"; hash = "sha256-EMl8Vc1nBOiPG0ilHLwar/UH2JFumPEZ1nst049et+A="; }) (fetchNuGet { pname = "DiscUtils.Iso9660"; version = "0.16.13"; hash = "sha256-pMAQwrvqhzOOaAQChdxqPNw8Xx9YP60PNsetPRFNvm0="; }) (fetchNuGet { pname = "DiscUtils.Streams"; version = "0.16.13"; hash = "sha256-DSetHA56M/GLg0cXhMjLJk8GPRa5TAieaXSbOWrfnw8="; }) (fetchNuGet { pname = "DiscUtils.Udf"; version = "0.16.13"; hash = "sha256-zEtRSgTtH3xXbhUH7XaKUilhYOyur3xiIDKLTi7pk2A="; }) - (fetchNuGet { pname = "dotnet-ef"; version = "8.0.7"; hash = "sha256-sPDzNmBUSB+3Zvxa7bVxBrk3w/Q70H+dJTRxy9obZfw="; }) + (fetchNuGet { pname = "dotnet-ef"; version = "8.0.8"; hash = "sha256-DkzLxvD9WRuX6FA3jlbUz3lPW60WZ3MO2wdn9VdqrAk="; }) (fetchNuGet { pname = "DotNet.Glob"; version = "3.1.3"; hash = "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="; }) (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) @@ -22,20 +22,16 @@ (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) (fetchNuGet { pname = "ICU4N"; version = "60.1.0-alpha.356"; hash = "sha256-1QyOgO7pNMeoEgBtl6o8IG4o91wD2hFUgRI0jM0ltxY="; }) (fetchNuGet { pname = "ICU4N.Transliterator"; version = "60.1.0-alpha.356"; hash = "sha256-RLNwQNVqNz8Omfb/mC/rzQWVq8c7uCnNdG2qi4xJmds="; }) - (fetchNuGet { pname = "IDisposableAnalyzers"; version = "4.0.7"; hash = "sha256-BAb5dWoc4akb2+iDkNHaXOxYh+XCOXUa3zP8iVWT7gw="; }) + (fetchNuGet { pname = "IDisposableAnalyzers"; version = "4.0.8"; hash = "sha256-OikeX+tNhbMoYDUYZl5YeSWaODgLLzR0S1xcwjpmmOg="; }) (fetchNuGet { pname = "J2N"; version = "2.0.0"; hash = "sha256-YvtIWErlm2O49hg3lIRm5Ha8/owkQkfMudzuldC3EhA="; }) (fetchNuGet { pname = "Jellyfin.XmlTv"; version = "10.8.0"; hash = "sha256-/e/JQw9bygAFzZC+rUTJp4YO4qwuZgr/STR9VPwQaTs="; }) - (fetchNuGet { pname = "libse"; version = "4.0.7"; hash = "sha256-fwoo+JBbXu6jIdNksrlROzyuXgO9P2n+l0BLXgn7CeE="; }) - (fetchNuGet { pname = "LrcParser"; version = "2023.524.0"; hash = "sha256-zChl87a5xZWZCIiAo/AVih1Bjo0BPdTNV4Cgtfa6TAA="; }) + (fetchNuGet { pname = "libse"; version = "4.0.8"; hash = "sha256-A17k5GpMtY3RSqZADeP4Ri9LKXkVa9jHo4+Tipn7Bs8="; }) + (fetchNuGet { pname = "LrcParser"; version = "2024.728.2"; hash = "sha256-fv0OkCfXEcXJqZcl70Ch3PduuomghPC2LscHU7nFtnc="; }) (fetchNuGet { pname = "MetaBrainz.Common"; version = "3.0.0"; hash = "sha256-P+XTQhffqSVIn0ZbC5Npl80xlx1QYHoL0y20KTvKRy0="; }) (fetchNuGet { pname = "MetaBrainz.Common.Json"; version = "6.0.2"; hash = "sha256-4IcF9xZZmI3H7WAiuN2kK61BMXS4gh2T2WrCqkwQhX8="; }) (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "8.0.7"; hash = "sha256-hvL9k41odX+1hyqdPMfeS5dWi+qi/s9hsgCyxKbdf3M="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; hash = "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; hash = "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; hash = "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; hash = "sha256-xsscB33I0DhRGWbksHpU82w1WEOIYuUxcfnR2D+rdd0="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "8.0.7"; hash = "sha256-QAX2YXKASb9b3ce0ivS38hGnIneXTggoAWUa8d01UrU="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "8.0.10"; hash = "sha256-VeUAe/OoV2zNDaiSKSv7tXR5barJzLbxS96DUb9bAz8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "8.0.10"; hash = "sha256-SxnMOWJGgUUQyKaRezJQwMUt4eMfWjnhmfk8pldYGNA="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; hash = "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="; }) @@ -43,22 +39,21 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.7"; hash = "sha256-SB3xsvBf/YIWzDW3F5FDOearyqnOXga5g4IEz2ZPHMg="; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.7"; hash = "sha256-0oDpE5n5scv9nVSkuZ1SbBtecL2Qk0+SP9RoPBU4Lu8="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.7"; hash = "sha256-frnGwFjqiq2Ja451sYmH8ZbTtDtSPGyGurzStkDkIpk="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.7"; hash = "sha256-MuddWH+nSOJQzHmYeo6NBZDCFIhKXmkkmrJKYP1Gw9A="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.7"; hash = "sha256-iWgYqv1/162ldAjwmZ9piCMlzcuyzfPki8+ZU7DMdYU="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.7"; hash = "sha256-HVke1SZEqPAJSllC5UAp/yZq0Rw0Ib+0Eq+EwgogY0I="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.7"; hash = "sha256-cTIllPWauAbpiMFw5FdacpF6ZJr+ehf+eFG8RrA5Wjg="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.7"; hash = "sha256-1mqdhUzUII2aV9WrIwnMbcYJCB677CujxWQq2UXdXNQ="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.7"; hash = "sha256-o66nSqRG1vlFpMCoLekpiZyu4K7+OZrknEmNmqKoCx4="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.7"; hash = "sha256-XOqrNIV759NIMEhJhagw+l0NZwSweq7ASYq4/nIAIEs="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.10"; hash = "sha256-BzdKtEbOp8Sq31L8pin/uM7xtgq3aYtlNqCt2t2Bzxo="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.10"; hash = "sha256-YBjY88KAC4ShfcGXcNHL6y1A9NH2xvk4d/qTMfuLuoE="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.10"; hash = "sha256-kj/PFfEdCxygb8AYuD0U6F1VPo7jBicxC3N3p/U74rM="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.10"; hash = "sha256-OwqqkvChI8qSIabo17MNmcWyby6TT5ZXv5cnOeyVFGw="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.10"; hash = "sha256-8qxvGV3dQMM8vGxEi7YqOimfWDQYFp3QVMNe3ryiO7g="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.10"; hash = "sha256-Nbwn3aeVyDl7rGftchEzFcqnTNkvArqKafaarQiCWQw="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.10"; hash = "sha256-n9xRg8WYjNLB92wMVNL/I5D3AKvtM9w0ICJ+Tieq5VQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.10"; hash = "sha256-Y0OghTa4r7VSV3jE8ZXzP8zU2eIDx/9CLAnPoNzP+vE="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.10"; hash = "sha256-NYoX3vaq687M1VfJWBMzItsBqSuRPnrL/IOIRpy6W9c="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.10"; hash = "sha256-Es4N6TP126rArsdhjbbEfJj8WQl2iaBLwgPIsJNUKQ4="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; hash = "sha256-UMNREtQwHLsq72PvbOck9DV77qukda4L+q9Ej1k/RI0="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.0.0"; hash = "sha256-Eg1MES40kzkGW9tZmjaKtbWI00Kbv7fLJQmjrigjxqk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "2.0.0"; hash = "sha256-1fnNvp62KrviVwYlqVl1CbdaZVpCDah9eCZeNDGDbWM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.1"; hash = "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; hash = "sha256-KI1WXvnF/Xe9cKTdDjzm0vd5h9bmM+3KinuWlsF/X+c="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; hash = "sha256-GMxvf0iAiWUWo0awlDczzcxNo8+MITBLp0/SqqYo8Lg="; }) @@ -67,50 +62,47 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.2"; hash = "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="; }) (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.Configuration.FileExtensions"; version = "8.0.1"; hash = "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.1"; hash = "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; hash = "sha256-S72hzDAYWzrfCH5JLJBRtwPEM/Xjh17HwcKuA3wLhvU="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.1"; hash = "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; hash = "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; hash = "sha256-cG0XS3ibJ9siu8eaQGJnyRwlEbQ9c/eGCtvPjs7Rdd8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; hash = "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.1"; hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.2"; hash = "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.2"; hash = "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.1"; hash = "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "8.0.7"; hash = "sha256-qBmqcx1FCipx7RnbvHnB5DwAKOCJGE1mvwYJbVKU9Dw="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "8.0.7"; hash = "sha256-evrmMiyETj0nU1e8U5WaH2oCrWXMO6faHz4yAeqqzCo="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "8.0.7"; hash = "sha256-5mEOkeBRyBLG5tU8V8CXTBcXM5I7oj7VUeafX5crwpk="; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; hash = "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.1"; hash = "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "8.0.10"; hash = "sha256-flcifBprRlD8qEEa4v2BUxJZE7zrWVcPnGYtmqt28Dc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "8.0.10"; hash = "sha256-bWOoqDxRJl/yRHvRiGYzWcvnuanu07mqcKx9pVCTpOs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "8.0.10"; hash = "sha256-vSy5iUGOPGx+hqvpu7Cmjcz2MiPpzVAQK46w+y/IQis="; }) (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.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.1"; hash = "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.1.0"; hash = "sha256-nhkt3qVsTXccgrW3mvx8veaJICREzeJrXfrjXI7rNwo="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; hash = "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.1"; hash = "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; hash = "sha256-BDrsqgiLYAphIOlnEuXy6iLoED/ykFO53merHCSGfrQ="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.1"; hash = "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; hash = "sha256-D3GHIGN0r6zLHHP2/5jt6hB0oMvRyl5ysvVrPVmmyv8="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; hash = "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.2"; hash = "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "7.0.0"; hash = "sha256-JxlxPnjmWbEhYLNWlSn+kNxUfwvlxgKiKFjkJyYGn5Y="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; hash = "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; hash = "sha256-0EOsmu/oLAz9WXp1CtMlclzdvs5jea0zJmokeyFnbCo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; hash = "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; hash = "sha256-K/cDq+LMfK4cBCvKWkmWAC+IB6pEWolR1J5zL60QPvA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; hash = "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; hash = "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) @@ -125,14 +117,13 @@ (fetchNuGet { pname = "prometheus-net"; version = "3.1.2"; hash = "sha256-A9wAYa1WoMCk5i1/fx5MJh6hp0KcPnVrOGt3zBLd3cs="; }) (fetchNuGet { pname = "prometheus-net"; version = "8.2.1"; hash = "sha256-NxHeXd4fwwc4MMsT6mrfX81czjHnq2GMStWTabZxMDw="; }) (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.1"; hash = "sha256-dhrATENkD/1GfSPBkAd3GvyHvzR5q+c+k22UTp33z+c="; }) - (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.0"; hash = "sha256-SbCjfHdQoKPschmSJGAFESmwsqF3vE6c5zrKKZtwP8M="; }) + (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.1"; hash = "sha256-efXYZ3T335Lm4H0mtutkUHoVvF8da70FkJ5IiXIkKts="; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) @@ -141,31 +132,20 @@ (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; }) (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) @@ -173,22 +153,22 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) - (fetchNuGet { pname = "Serilog"; version = "2.3.0"; hash = "sha256-vg6NI4K48DeW2oSBqtq3oYg+JITK2QASjdZpBnwIIXg="; }) (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.2"; hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; }) - (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.1.0"; hash = "sha256-ETM4hLjkvZgGoci/h7NG1AfsROqzRxEAtF2HKXZU5fg="; }) + (fetchNuGet { pname = "Serilog"; version = "4.1.0"; hash = "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.3"; hash = "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I="; }) + (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "4.0.0"; hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="; }) (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; }) (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.2"; hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; }) - (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "2.0.0"; hash = "sha256-oRpymEFMGT6VNyZSdKjnUcmVRRl7EXXvgyWt9l8D5W0="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.4"; hash = "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "2.1.0"; hash = "sha256-LDoLpXkleD2MVPK2KBsLGRf5yqrwckBiAnYDbuIbaUM="; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; }) (fetchNuGet { pname = "Serilog.Sinks.Graylog"; version = "3.1.1"; hash = "sha256-H9DMxdRN6LVmlK95ywqRj3nuoEvGI+9LbmbmijC+eRU="; }) (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; hash = "sha256-NG0osFNhuVIHDUOd3ZUpygSd0foH3C2QwECURL9nA00="; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.18"; hash = "sha256-72NV+OuW8bCfI/EOXwgS6dleLZnomLJTYeQPPmfhuu8="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0.1"; hash = "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) @@ -201,76 +181,52 @@ (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; }) (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.556"; hash = "sha256-97YYQcr5vZxTvi36608eUkA1wb6xllZQ7UcXbjrYIfU="; }) (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.556"; hash = "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc="; }) - (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.18"; hash = "sha256-RguRPwBM/KCogaiOgjELlvuqN1Tr+b3HA4Odz1rXBgU="; }) - (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.18"; hash = "sha256-CXZC45txfcd8MuRmDENw2ujlGk74YaUPNs7dXq+Zcg8="; }) - (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.18"; hash = "sha256-o5VnCaAGX4LuwNyl7QM0KOg2gNfkD5uNMNthxB7w0m4="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0.1"; hash = "sha256-ljkiz8xEaIMatjiGe49/LKBaPWR5D2/EY8CCNHZO4j4="; }) + (fetchNuGet { pname = "Svg.Model"; version = "2.0.0.1"; hash = "sha256-ICYIWmoBMM+nuUPQQSbwM2xggPDL+VZUG2UsnotU8Qw="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0.1"; hash = "sha256-3kGK9hc9BjaQu6u5mQ9heGKCDLpBDblgQ4VxRFLMa0Q="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; hash = "sha256-FOxHJEYFTfMhI3+/E35v/QqEhWaizueVOBwzHOkGpc8="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.ReDoc"; version = "6.6.2"; hash = "sha256-wV7wGbF6b4100CGMM5KuY9sBS2ZRwp36flbdEJtTYeo="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.ReDoc"; version = "6.5.0"; hash = "sha256-v+wBD/k0Z5hhfsrIZUfzGFtMgr/+ILSAr1UdEI4ZKLs="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.2.3"; hash = "sha256-34eh5bnYwTmqlkk79wqi1wEKG9A5Fxda9T3g5mngajw="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.2.3"; hash = "sha256-Z+uKRf+SVp7n2tfO1pjeasZQV4849VZrDkhF2D8c6rM="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.2.3"; hash = "sha256-Uf8X1kSyLr8td6Ec6LAwlkAEFCMknvogTlqocVb1eWk="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; }) (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; hash = "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; }) (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; }) (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; }) (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; }) (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.6"; hash = "sha256-dHrc4lCnhmBU3j+bdmgyjNK2pZsbfBRL1zz38lVyQvM="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.8"; hash = "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; hash = "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; hash = "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) @@ -282,24 +238,19 @@ (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; hash = "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.5"; hash = "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.1"; hash = "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo="; }) (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; }) (fetchNuGet { pname = "TMDbLib"; version = "2.2.0"; hash = "sha256-r4yV7t/biDORVYP0Go6KSSmNIVRn6IuFQ+Okt8GPvbY="; }) + (fetchNuGet { pname = "Ude.NetStandard"; version = "1.2.0"; hash = "sha256-9Dq7UE5OiuvciURQV8Aa13elolt1fzDhvF8c8Yxznhw="; }) (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; hash = "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="; }) - (fetchNuGet { pname = "zlib.net-mutliplatform"; version = "1.0.6"; hash = "sha256-xteOxDSWtNY5nHrPRDrMJR80lcE+TMOiSQBG316vOsE="; }) + (fetchNuGet { pname = "z440.atl.core"; version = "6.6.0"; hash = "sha256-tn1IEqmSwLbfAmNXk4pMiwKvVolTgwuv4bR8O5ZVMfA="; }) + (fetchNuGet { pname = "zlib.net-mutliplatform"; version = "1.0.8"; hash = "sha256-1cLkZJJ+LyZ+s5eMCcTlANnF2+U7zmgNhhVn2o/r4z0="; }) ] diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 6022bae3db84..c65949d634e3 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.9.11"; # ensure that jellyfin-web has matching version + version = "10.10.1"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-gZJIsNKXwhUUVgJh8vXuGSu9DEyrVY8NuIeyZHHQKN4="; + hash = "sha256-jDiJ1tnCR3cZvNmvZ47Vvoqow1sC+xciHsO546yoIKY="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/pkgs/tools/text/jen/default.nix b/pkgs/by-name/je/jen/package.nix similarity index 100% rename from pkgs/tools/text/jen/default.nix rename to pkgs/by-name/je/jen/package.nix diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix new file mode 100644 index 000000000000..e9cf1a7d1f11 --- /dev/null +++ b/pkgs/by-name/je/jenkins/package.nix @@ -0,0 +1,77 @@ +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused +, makeWrapper, nix, nixfmt-classic, openjdk, writeScript, nixosTests, jq, cacert +, curl }: + +stdenv.mkDerivation rec { + pname = "jenkins"; + version = "2.462.3"; + + src = fetchurl { + url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; + hash = "sha256-PlO1KoFkBeOxCtB/HEjNDLXLP4kyB+9/neKEFYBrk8E="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p "$out/bin" "$out/share" "$out/webapps" + + cp "$src" "$out/webapps/jenkins.war" + + # Create the `jenkins-cli` command. + ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \ + && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar" + + makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ + --add-flags "-jar $out/share/jenkins-cli.jar" + ''; + + passthru = { + tests = { inherit (nixosTests) jenkins jenkins-cli; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + lib.makeBinPath [ + cacert + common-updater-scripts + coreutils + curl + git + gnused + jq + nix + nixfmt-classic + ] + } + + core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') + + version="$(jq -r .version <<<$core_json)" + sha256="$(jq -r .sha256 <<<$core_json)" + hash="$(nix hash to-sri --type sha256 "$sha256")" + + if [ ! "$oldVersion" = "$version" ]; then + update-source-version jenkins "$version" "$hash" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" + nixfmt "$default_nix" + else + echo "jenkins is already up-to-date" + fi + ''; + }; + + meta = with lib; { + description = "Extendable open source continuous integration server"; + homepage = "https://jenkins.io/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.mit; + maintainers = with maintainers; [ coconnor earldouglas nequissimus ]; + changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; + mainProgram = "jenkins-cli"; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/by-name/je/jet/package.nix similarity index 100% rename from pkgs/development/tools/jet/default.nix rename to pkgs/by-name/je/jet/package.nix diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/by-name/je/jetbrains-mono/package.nix similarity index 100% rename from pkgs/data/fonts/jetbrains-mono/default.nix rename to pkgs/by-name/je/jetbrains-mono/package.nix diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 01c82469f5ed..2a66577c476b 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -6,14 +6,16 @@ , runCommand , appimageTools , icu +, genericUpdater +, writeShellScript }: let pname = "jetbrains-toolbox"; - version = "2.4.1.32573"; + version = "2.5.1.34629"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - hash = "sha256-6sfO9tDIdp/xuNtqZ7UXqzP1SuLd6ZAF7lMTlaF3Z80="; + hash = "sha256-YaMlvgktoa738grHarJX2Uh5PZ7qHuASyJBcUhMssEI="; stripRoot = false; }; @@ -58,6 +60,13 @@ stdenv.mkDerivation { # Disabling the tests, this seems to be very difficult to test this app. doCheck = false; + passthru.updateScript = genericUpdater { + versionLister = writeShellScript "jetbrains-toolbox-versionLister" '' + curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' \ + | jq -r '.[] | .releases | flatten[] | .build' + ''; + }; + meta = with lib; { description = "Jetbrains Toolbox"; homepage = "https://jetbrains.com/"; diff --git a/pkgs/by-name/je/jextract-21/package.nix b/pkgs/by-name/je/jextract-21/package.nix index ec2ad3b1485d..485f5e47de80 100644 --- a/pkgs/by-name/je/jextract-21/package.nix +++ b/pkgs/by-name/je/jextract-21/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; gradleFlags = [ - "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pllvm_home=${lib.getLib llvmPackages.libclang}" "-Pjdk21_home=${jdk21}" ]; diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix index 891eac01ae79..a20c5d03baef 100644 --- a/pkgs/by-name/je/jextract/package.nix +++ b/pkgs/by-name/je/jextract/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeBinaryWrapper , gradle -, jdk22 +, jdk23 , llvmPackages }: @@ -24,8 +24,8 @@ stdenv.mkDerivation { ]; gradleFlags = [ - "-Pllvm_home=${llvmPackages.libclang.lib}" - "-Pjdk22_home=${jdk22}" + "-Pllvm_home=${lib.getLib llvmPackages.libclang}" + "-Pjdk22_home=${jdk23}" ]; doCheck = true; @@ -46,8 +46,10 @@ stdenv.mkDerivation { description = "Tool which mechanically generates Java bindings from a native library headers"; mainProgram = "jextract"; homepage = "https://github.com/openjdk/jextract"; - platforms = jdk22.meta.platforms; + platforms = jdk23.meta.platforms; license = licenses.gpl2Only; maintainers = with maintainers; [ jlesquembre sharzy ]; + # Not yet updated for JDK 23 + broken = true; }; } diff --git a/pkgs/development/tools/jf/default.nix b/pkgs/by-name/jf/jf/package.nix similarity index 100% rename from pkgs/development/tools/jf/default.nix rename to pkgs/by-name/jf/jf/package.nix diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/by-name/jf/jffi/package.nix similarity index 100% rename from pkgs/development/libraries/java/jffi/default.nix rename to pkgs/by-name/jf/jffi/package.nix diff --git a/pkgs/applications/science/engineering/jflap/default.nix b/pkgs/by-name/jf/jflap/package.nix similarity index 100% rename from pkgs/applications/science/engineering/jflap/default.nix rename to pkgs/by-name/jf/jflap/package.nix diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/by-name/jf/jflex/package.nix similarity index 100% rename from pkgs/development/libraries/java/jflex/default.nix rename to pkgs/by-name/jf/jflex/package.nix diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/by-name/jf/jfmt/package.nix similarity index 100% rename from pkgs/development/tools/jfmt/default.nix rename to pkgs/by-name/jf/jfmt/package.nix diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/by-name/jf/jfrog-cli/package.nix similarity index 100% rename from pkgs/tools/misc/jfrog-cli/default.nix rename to pkgs/by-name/jf/jfrog-cli/package.nix diff --git a/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/pkgs/by-name/jf/jfsutils/ar-fix.patch similarity index 100% rename from pkgs/tools/filesystems/jfsutils/ar-fix.patch rename to pkgs/by-name/jf/jfsutils/ar-fix.patch diff --git a/pkgs/tools/filesystems/jfsutils/hardening-format.patch b/pkgs/by-name/jf/jfsutils/hardening-format.patch similarity index 100% rename from pkgs/tools/filesystems/jfsutils/hardening-format.patch rename to pkgs/by-name/jf/jfsutils/hardening-format.patch diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/by-name/jf/jfsutils/package.nix similarity index 100% rename from pkgs/tools/filesystems/jfsutils/default.nix rename to pkgs/by-name/jf/jfsutils/package.nix diff --git a/pkgs/tools/filesystems/jfsutils/types.patch b/pkgs/by-name/jf/jfsutils/types.patch similarity index 100% rename from pkgs/tools/filesystems/jfsutils/types.patch rename to pkgs/by-name/jf/jfsutils/types.patch diff --git a/pkgs/games/jfsw/default.nix b/pkgs/by-name/jf/jfsw/package.nix similarity index 100% rename from pkgs/games/jfsw/default.nix rename to pkgs/by-name/jf/jfsw/package.nix diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/by-name/jf/jftui/package.nix similarity index 100% rename from pkgs/applications/video/jftui/default.nix rename to pkgs/by-name/jf/jftui/package.nix diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/by-name/jg/jgmenu/package.nix similarity index 100% rename from pkgs/applications/misc/jgmenu/default.nix rename to pkgs/by-name/jg/jgmenu/package.nix diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/by-name/jh/jhead/package.nix similarity index 100% rename from pkgs/tools/graphics/jhead/default.nix rename to pkgs/by-name/jh/jhead/package.nix diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/by-name/jh/jhiccup/package.nix similarity index 100% rename from pkgs/development/tools/java/jhiccup/default.nix rename to pkgs/by-name/jh/jhiccup/package.nix diff --git a/pkgs/development/tools/jid/go-mod.patch b/pkgs/by-name/ji/jid/go-mod.patch similarity index 100% rename from pkgs/development/tools/jid/go-mod.patch rename to pkgs/by-name/ji/jid/go-mod.patch diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/by-name/ji/jid/package.nix similarity index 100% rename from pkgs/development/tools/jid/default.nix rename to pkgs/by-name/ji/jid/package.nix diff --git a/pkgs/servers/jigasi/default.nix b/pkgs/by-name/ji/jigasi/package.nix similarity index 100% rename from pkgs/servers/jigasi/default.nix rename to pkgs/by-name/ji/jigasi/package.nix diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/by-name/ji/jikespg/package.nix similarity index 100% rename from pkgs/development/tools/parsing/jikespg/default.nix rename to pkgs/by-name/ji/jikespg/package.nix diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/by-name/ji/jimtcl/package.nix similarity index 100% rename from pkgs/development/interpreters/jimtcl/default.nix rename to pkgs/by-name/ji/jimtcl/package.nix diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/by-name/ji/jiq/package.nix similarity index 100% rename from pkgs/development/tools/misc/jiq/default.nix rename to pkgs/by-name/ji/jiq/package.nix diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/by-name/ji/jirafeau/package.nix similarity index 100% rename from pkgs/servers/web-apps/jirafeau/default.nix rename to pkgs/by-name/ji/jirafeau/package.nix diff --git a/pkgs/applications/misc/jiten/cookie-fix.patch b/pkgs/by-name/ji/jiten/cookie-fix.patch similarity index 100% rename from pkgs/applications/misc/jiten/cookie-fix.patch rename to pkgs/by-name/ji/jiten/cookie-fix.patch diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/by-name/ji/jiten/package.nix similarity index 100% rename from pkgs/applications/misc/jiten/default.nix rename to pkgs/by-name/ji/jiten/package.nix diff --git a/pkgs/servers/jitsi-excalidraw/default.nix b/pkgs/by-name/ji/jitsi-excalidraw/package.nix similarity index 100% rename from pkgs/servers/jitsi-excalidraw/default.nix rename to pkgs/by-name/ji/jitsi-excalidraw/package.nix diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix rename to pkgs/by-name/ji/jitsi-meet-electron/package.nix diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/by-name/ji/jitsi/jitsi.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch rename to pkgs/by-name/ji/jitsi/jitsi.patch diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/by-name/ji/jitsi/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/jitsi/default.nix rename to pkgs/by-name/ji/jitsi/package.nix diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix new file mode 100644 index 000000000000..db1acb1728f9 --- /dev/null +++ b/pkgs/by-name/ji/jitterentropy/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "jitterentropy"; + version = "3.6.0"; + + src = fetchFromGitHub { + owner = "smuellerDD"; + repo = "jitterentropy-library"; + rev = "v${version}"; + hash = "sha256-CPvgc/W5Z2OfbP9Lp2tQevUQZr+xlh6q5r5Fp2WUHhg="; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ + "out" + "dev" + ]; + + hardeningDisable = [ "fortify" ]; # avoid warnings + + meta = { + description = "Provides a noise source using the CPU execution timing jitter"; + homepage = "https://github.com/smuellerDD/jitterentropy-library"; + changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; + license = with lib.licenses; [ + bsd3 # OR + gpl2Only + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ + johnazoidberg + c0bw3b + ]; + }; +} diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/by-name/jm/jmespath/package.nix similarity index 100% rename from pkgs/development/tools/jmespath/default.nix rename to pkgs/by-name/jm/jmespath/package.nix diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/by-name/jm/jmeter/package.nix similarity index 100% rename from pkgs/applications/networking/jmeter/default.nix rename to pkgs/by-name/jm/jmeter/package.nix diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/by-name/jm/jmtpfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/jmtpfs/default.nix rename to pkgs/by-name/jm/jmtpfs/package.nix diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/by-name/jm/jmusicbot/package.nix similarity index 100% rename from pkgs/applications/audio/jmusicbot/default.nix rename to pkgs/by-name/jm/jmusicbot/package.nix diff --git a/pkgs/development/java-modules/jna/default.nix b/pkgs/by-name/jn/jna/package.nix similarity index 100% rename from pkgs/development/java-modules/jna/default.nix rename to pkgs/by-name/jn/jna/package.nix diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/by-name/jn/jnetmap/package.nix similarity index 100% rename from pkgs/applications/networking/jnetmap/default.nix rename to pkgs/by-name/jn/jnetmap/package.nix diff --git a/pkgs/tools/networking/jnettop/no-dns-resolution.patch b/pkgs/by-name/jn/jnettop/no-dns-resolution.patch similarity index 100% rename from pkgs/tools/networking/jnettop/no-dns-resolution.patch rename to pkgs/by-name/jn/jnettop/no-dns-resolution.patch diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/by-name/jn/jnettop/package.nix similarity index 100% rename from pkgs/tools/networking/jnettop/default.nix rename to pkgs/by-name/jn/jnettop/package.nix diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/by-name/jo/jo/package.nix similarity index 100% rename from pkgs/development/tools/jo/default.nix rename to pkgs/by-name/jo/jo/package.nix diff --git a/pkgs/tools/system/jobber/default.nix b/pkgs/by-name/jo/jobber/package.nix similarity index 100% rename from pkgs/tools/system/jobber/default.nix rename to pkgs/by-name/jo/jobber/package.nix diff --git a/pkgs/tools/security/john/opencl.patch b/pkgs/by-name/jo/john/opencl.patch similarity index 100% rename from pkgs/tools/security/john/opencl.patch rename to pkgs/by-name/jo/john/opencl.patch diff --git a/pkgs/tools/security/john/default.nix b/pkgs/by-name/jo/john/package.nix similarity index 100% rename from pkgs/tools/security/john/default.nix rename to pkgs/by-name/jo/john/package.nix diff --git a/pkgs/applications/misc/johnny/default.nix b/pkgs/by-name/jo/johnny/package.nix similarity index 100% rename from pkgs/applications/misc/johnny/default.nix rename to pkgs/by-name/jo/johnny/package.nix diff --git a/pkgs/tools/security/joincap/default.nix b/pkgs/by-name/jo/joincap/package.nix similarity index 100% rename from pkgs/tools/security/joincap/default.nix rename to pkgs/by-name/jo/joincap/package.nix diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/by-name/jo/joker/package.nix similarity index 100% rename from pkgs/development/interpreters/joker/default.nix rename to pkgs/by-name/jo/joker/package.nix diff --git a/pkgs/tools/security/joomscan/default.nix b/pkgs/by-name/jo/joomscan/package.nix similarity index 100% rename from pkgs/tools/security/joomscan/default.nix rename to pkgs/by-name/jo/joomscan/package.nix diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/by-name/jo/joplin-desktop/package.nix similarity index 100% rename from pkgs/applications/misc/joplin-desktop/default.nix rename to pkgs/by-name/jo/joplin-desktop/package.nix diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/by-name/jo/jose/package.nix similarity index 100% rename from pkgs/development/libraries/jose/default.nix rename to pkgs/by-name/jo/jose/package.nix diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix new file mode 100644 index 000000000000..5d1a984c9382 --- /dev/null +++ b/pkgs/by-name/jo/josh/package.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, libgit2 +, openssl +, pkg-config +, makeWrapper +, git +, darwin +}: + +let + # josh-ui requires javascript dependencies, haven't tried to figure it out yet + cargoFlags = [ "--workspace" "--exclude" "josh-ui" ]; + version = "24.10.04"; +in + +rustPlatform.buildRustPackage { + pname = "josh"; + inherit version; + + src = fetchFromGitHub { + owner = "josh-project"; + repo = "josh"; + rev = "r${version}"; + hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo="; + }; + + cargoHash = "sha256-tK/5qNvN1zs6DM7dXNc1nPhbUOt5lPqRpbie6h2d7Y0="; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + libgit2 + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.Security + ]; + + cargoBuildFlags = cargoFlags; + cargoTestFlags = cargoFlags; + + # used to teach josh itself about its version number + env.JOSH_VERSION = "r${version}"; + + postInstall = '' + wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin" + ''; + + meta = { + description = "Just One Single History"; + homepage = "https://josh-project.github.io/josh/"; + downloadPage = "https://github.com/josh-project/josh"; + changelog = "https://github.com/josh-project/josh/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.sternenseemann + lib.maintainers.tazjin + ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index 35f395b69d31..3242b6e10921 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -3,21 +3,21 @@ }: let pname = "josm"; - version = "19230"; + version = "19253"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis="; + hash = "sha256-GnN+XtGzhLZ2PKAGHv+GMMh0FpilwET7EfKI4CAwYgg="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I="; + hash = "sha256-bcCl+w+pvsR+8QXKjM9bVyTAgzp+wre71tZMp5+VJTA="; }; pkg = fetchFromGitHub { owner = "JOSM"; repo = "josm"; rev = "refs/tags/${version}-tested"; - hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY="; + hash = "sha256-I1mMtNzFkBoU0qcx2rVd9nmDK91ccVyaKwPft72M3r0="; }; }; diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/by-name/jo/jost/package.nix similarity index 100% rename from pkgs/data/fonts/jost/default.nix rename to pkgs/by-name/jo/jost/package.nix diff --git a/pkgs/applications/misc/jot/default.nix b/pkgs/by-name/jo/jot/package.nix similarity index 100% rename from pkgs/applications/misc/jot/default.nix rename to pkgs/by-name/jo/jot/package.nix diff --git a/pkgs/tools/text/jotdown/default.nix b/pkgs/by-name/jo/jotdown/package.nix similarity index 100% rename from pkgs/tools/text/jotdown/default.nix rename to pkgs/by-name/jo/jotdown/package.nix diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/by-name/jo/jotta-cli/package.nix similarity index 100% rename from pkgs/applications/misc/jotta-cli/default.nix rename to pkgs/by-name/jo/jotta-cli/package.nix diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/by-name/jo/journaldriver/package.nix similarity index 100% rename from pkgs/tools/misc/journaldriver/default.nix rename to pkgs/by-name/jo/journaldriver/package.nix diff --git a/pkgs/os-specific/linux/joycond/default.nix b/pkgs/by-name/jo/joycond/package.nix similarity index 100% rename from pkgs/os-specific/linux/joycond/default.nix rename to pkgs/by-name/jo/joycond/package.nix diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/by-name/jo/joystickwake/package.nix similarity index 100% rename from pkgs/tools/games/joystickwake/default.nix rename to pkgs/by-name/jo/joystickwake/package.nix diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/by-name/jp/jp/package.nix similarity index 100% rename from pkgs/development/tools/jp/default.nix rename to pkgs/by-name/jp/jp/package.nix diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/by-name/jp/jp2a/package.nix similarity index 100% rename from pkgs/applications/misc/jp2a/default.nix rename to pkgs/by-name/jp/jp2a/package.nix diff --git a/pkgs/development/libraries/jpcre2/default.nix b/pkgs/by-name/jp/jpcre2/package.nix similarity index 100% rename from pkgs/development/libraries/jpcre2/default.nix rename to pkgs/by-name/jp/jpcre2/package.nix diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/by-name/jp/jpeg-archive/package.nix similarity index 100% rename from pkgs/applications/graphics/jpeg-archive/default.nix rename to pkgs/by-name/jp/jpeg-archive/package.nix diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/by-name/jp/jpegexiforient/package.nix similarity index 100% rename from pkgs/tools/graphics/jpegexiforient/default.nix rename to pkgs/by-name/jp/jpegexiforient/package.nix diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/by-name/jp/jpeginfo/package.nix similarity index 100% rename from pkgs/applications/graphics/jpeginfo/default.nix rename to pkgs/by-name/jp/jpeginfo/package.nix diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/by-name/jp/jpegoptim/package.nix similarity index 100% rename from pkgs/applications/graphics/jpegoptim/default.nix rename to pkgs/by-name/jp/jpegoptim/package.nix diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/by-name/jp/jpegrescan/package.nix similarity index 100% rename from pkgs/applications/graphics/jpegrescan/default.nix rename to pkgs/by-name/jp/jpegrescan/package.nix diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/by-name/jp/jpexs/package.nix similarity index 100% rename from pkgs/development/tools/jpexs/default.nix rename to pkgs/by-name/jp/jpexs/package.nix diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/by-name/jp/jpsxdec/package.nix similarity index 100% rename from pkgs/tools/games/jpsxdec/default.nix rename to pkgs/by-name/jp/jpsxdec/package.nix diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/by-name/jq/jq-lsp/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/jq-lsp/default.nix rename to pkgs/by-name/jq/jq-lsp/package.nix diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix new file mode 100644 index 000000000000..515923f78421 --- /dev/null +++ b/pkgs/by-name/jq/jq/package.nix @@ -0,0 +1,95 @@ +{ lib +, stdenv +, fetchurl +, removeReferencesTo +, autoreconfHook +, bison +, onigurumaSupport ? true +, oniguruma +}: + +stdenv.mkDerivation rec { + pname = "jq"; + version = "1.7.1"; + + # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages + src = fetchurl { + url = "https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + hash = "sha256-R4ycoSn9LjRD/icxS0VeIR4NjGC8j/ffcDhz3u7lgMI="; + }; + + outputs = [ "bin" "doc" "man" "dev" "out" ]; + + # https://github.com/jqlang/jq/issues/2871 + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" "" + ''; + + # Upstream script that writes the version that's eventually compiled + # and printed in `jq --help` relies on a .git directory which our src + # doesn't keep. + preConfigure = '' + echo "#!/bin/sh" > scripts/version + echo "echo ${version}" >> scripts/version + patchShebangs scripts/version + ''; + + # paranoid mode: make sure we never use vendored version of oniguruma + # Note: it must be run after automake, or automake will complain + preBuild = '' + rm -r ./modules/oniguruma + ''; + + buildInputs = lib.optionals onigurumaSupport [ oniguruma ]; + nativeBuildInputs = [ removeReferencesTo autoreconfHook bison ]; + + # Darwin requires _REENTRANT be defined to use functions like `lgamma_r`. + # Otherwise, configure will detect that they’re in libm, but the build will fail + # with clang 16+ due to calls to undeclared functions. + # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release). + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + "-D_REENTRANT=1" + "-D_DARWIN_C_SOURCE=1" + ]); + + configureFlags = [ + "--bindir=\${bin}/bin" + "--sbindir=\${bin}/bin" + "--datadir=\${doc}/share" + "--mandir=\${man}/share/man" + ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" + # jq is linked to libjq: + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + + # jq binary includes the whole `configureFlags` in: + # https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 + # Strip unnecessary dependencies here to reduce closure size and break the + # dependency cycle: $dev also refers to $bin via propagated-build-outputs + postFixup = '' + remove-references-to \ + -t "$dev" \ + -t "$man" \ + -t "$doc" \ + "$bin/bin/jq" + ''; + + doInstallCheck = true; + installCheckTarget = "check"; + + postInstallCheck = '' + $bin/bin/jq --help >/dev/null + $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null + ''; + + passthru = { inherit onigurumaSupport; }; + + meta = with lib; { + description = "Lightweight and flexible command-line JSON processor"; + homepage = "https://jqlang.github.io/jq/"; + license = licenses.mit; + maintainers = with maintainers; [ raskin artturin ncfavier ]; + platforms = platforms.unix; + downloadPage = "https://jqlang.github.io/jq/download/"; + mainProgram = "jq"; + }; +} diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix new file mode 100644 index 000000000000..d92e79a5ffc5 --- /dev/null +++ b/pkgs/by-name/jq/jql/package.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "jql"; + version = "8.0.0"; + + src = fetchFromGitHub { + owner = "yamafaktory"; + repo = pname; + rev = "jql-v${version}"; + hash = "sha256-4H2V/ZE29Jw0JWSzP7X8SKgD+vXoCd7pcfTqB7/8m7M="; + }; + + cargoHash = "sha256-/Y880GUXTUOd7SyVhbMZhMPgfm66HbWrz5miGJjfX0g="; + + meta = with lib; { + description = "JSON Query Language CLI tool built with Rust"; + homepage = "https://github.com/yamafaktory/jql"; + changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ akshgpt7 figsoda ]; + mainProgram = "jql"; + }; +} diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/by-name/jq/jqp/package.nix similarity index 100% rename from pkgs/development/tools/jqp/default.nix rename to pkgs/by-name/jq/jqp/package.nix diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/by-name/jq/jquake/package.nix similarity index 100% rename from pkgs/applications/misc/jquake/default.nix rename to pkgs/by-name/jq/jquake/package.nix diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix index b63496699896..88a984f58989 100644 --- a/pkgs/by-name/jr/jreleaser-cli/package.nix +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "jreleaser-cli"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; - hash = "sha256-LkkVxC3/0s468O84sgp7cNX53QRzdmUjCw+cgSWa5U0="; + hash = "sha256-/FDoAYf+Uy+VcWT9KpW1IEqOCvCOOyV+8/cugpeUR7Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/by-name/jr/jrnl/package.nix similarity index 100% rename from pkgs/applications/misc/jrnl/default.nix rename to pkgs/by-name/jr/jrnl/package.nix diff --git a/pkgs/development/compilers/jrsonnet/Cargo.lock b/pkgs/by-name/jr/jrsonnet/Cargo.lock similarity index 100% rename from pkgs/development/compilers/jrsonnet/Cargo.lock rename to pkgs/by-name/jr/jrsonnet/Cargo.lock diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/by-name/jr/jrsonnet/package.nix similarity index 100% rename from pkgs/development/compilers/jrsonnet/default.nix rename to pkgs/by-name/jr/jrsonnet/package.nix diff --git a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch b/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch similarity index 100% rename from pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch rename to pkgs/by-name/js/jscoverage/jsfalse_to_null.patch diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/by-name/js/jscoverage/package.nix similarity index 100% rename from pkgs/development/tools/misc/jscoverage/default.nix rename to pkgs/by-name/js/jscoverage/package.nix diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/by-name/js/jsduck/Gemfile similarity index 100% rename from pkgs/development/tools/jsduck/Gemfile rename to pkgs/by-name/js/jsduck/Gemfile diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/by-name/js/jsduck/Gemfile.lock similarity index 100% rename from pkgs/development/tools/jsduck/Gemfile.lock rename to pkgs/by-name/js/jsduck/Gemfile.lock diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/by-name/js/jsduck/gemset.nix similarity index 100% rename from pkgs/development/tools/jsduck/gemset.nix rename to pkgs/by-name/js/jsduck/gemset.nix diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/by-name/js/jsduck/package.nix similarity index 100% rename from pkgs/development/tools/jsduck/default.nix rename to pkgs/by-name/js/jsduck/package.nix diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/by-name/js/jshon/package.nix similarity index 100% rename from pkgs/development/tools/parsing/jshon/default.nix rename to pkgs/by-name/js/jshon/package.nix diff --git a/pkgs/tools/security/jsluice/default.nix b/pkgs/by-name/js/jsluice/package.nix similarity index 100% rename from pkgs/tools/security/jsluice/default.nix rename to pkgs/by-name/js/jsluice/package.nix diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/by-name/js/json-fortran/package.nix similarity index 100% rename from pkgs/development/libraries/json-fortran/default.nix rename to pkgs/by-name/js/json-fortran/package.nix diff --git a/pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch new file mode 100644 index 000000000000..ae21471dd4c0 --- /dev/null +++ b/pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch @@ -0,0 +1,27 @@ +diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build +index 1eb56c8..dca444e 100644 +--- a/json-glib/tests/meson.build ++++ b/json-glib/tests/meson.build +@@ -21,8 +21,9 @@ test_data = [ + 'stream-load.json', + ] + +-installed_test_bindir = json_libexecdir / 'installed-tests' / json_api_name +-installed_test_datadir = json_datadir / 'installed-tests' / json_api_name ++installed_test_prefix = get_option('installed_test_prefix') ++installed_test_bindir = installed_test_prefix / 'libexec' / 'installed-tests' / json_api_name ++installed_test_datadir = installed_test_prefix / 'share' / 'installed-tests' / json_api_name + + install_data(test_data, install_dir: installed_test_bindir) + +diff --git a/meson_options.txt b/meson_options.txt +index 5a96998..383aa6c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -13,3 +13,6 @@ option('tests', + option('installed_tests', + type: 'boolean', value: true, + description: 'Enable installed tests') ++option('installed_test_prefix', ++ description: 'Prefix for installed tests', ++ type: 'string') diff --git a/pkgs/by-name/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix new file mode 100644 index 000000000000..e3db856c23cd --- /dev/null +++ b/pkgs/by-name/js/json-glib/package.nix @@ -0,0 +1,110 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, docutils +, glib +, meson +, mesonEmulatorHook +, ninja +, nixosTests +, pkg-config +, gettext +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages +, gobject-introspection +, gi-docgen +, libxslt +, fixDarwinDylibNames +, gnome +}: + +stdenv.mkDerivation rec { + pname = "json-glib"; + version = "1.10.0"; + + outputs = [ "out" "dev" "installedTests" ] + ++ lib.optional withIntrospection "devdoc"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "G8qNZtlhBuzBR98xM7laW7eE8fpvFdBt18Go+0oQr3s="; + }; + + patches = [ + # Add option for changing installation path of installed tests. + ./meson-add-installed-tests-prefix-option.patch + + # Restore single quote string extension + # https://gitlab.gnome.org/GNOME/json-glib/-/issues/76 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/json-glib/-/commit/2a26bd3dedc3b27471e6df210d76333d3d41159c.patch"; + hash = "sha256-U/jWB4wneN4MwZO3vAfI9Z7UT/SLMNEx/X8NMsCO8I4="; + }) + ]; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + docutils # for rst2man, rst2html5 + meson + ninja + pkg-config + gettext + glib + libxslt + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ] ++ lib.optionals withIntrospection [ + gobject-introspection + gi-docgen + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "documentation" withIntrospection) + ]; + + doCheck = true; + + postFixup = '' + # Move developer documentation to devdoc output. + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + if [[ -d "$out/share/doc" ]]; then + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ + | while IFS= read -r -d ''' file; do + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" + done + fi + ''; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.json-glib; + }; + + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; + homepage = "https://gitlab.gnome.org/GNOME/json-glib"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/by-name/js/json-plot/package.nix similarity index 100% rename from pkgs/applications/graphics/json-plot/default.nix rename to pkgs/by-name/js/json-plot/package.nix diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/by-name/js/json2hcl/package.nix similarity index 100% rename from pkgs/development/tools/json2hcl/default.nix rename to pkgs/by-name/js/json2hcl/package.nix diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/by-name/js/json_c/package.nix similarity index 100% rename from pkgs/development/libraries/json-c/default.nix rename to pkgs/by-name/js/json_c/package.nix diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/by-name/js/jsoncpp/package.nix similarity index 100% rename from pkgs/development/libraries/jsoncpp/default.nix rename to pkgs/by-name/js/jsoncpp/package.nix diff --git a/pkgs/development/tools/misc/jsonfmt/default.nix b/pkgs/by-name/js/jsonfmt/package.nix similarity index 100% rename from pkgs/development/tools/misc/jsonfmt/default.nix rename to pkgs/by-name/js/jsonfmt/package.nix diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/by-name/js/jsonnet-bundler/package.nix similarity index 100% rename from pkgs/development/tools/jsonnet-bundler/default.nix rename to pkgs/by-name/js/jsonnet-bundler/package.nix diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/by-name/js/jsonnet-language-server/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/jsonnet-language-server/default.nix rename to pkgs/by-name/js/jsonnet-language-server/package.nix diff --git a/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch b/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch similarity index 100% rename from pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch rename to pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/by-name/js/jsonnet/package.nix similarity index 100% rename from pkgs/development/compilers/jsonnet/default.nix rename to pkgs/by-name/js/jsonnet/package.nix diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/by-name/js/jsonrpc-glib/package.nix similarity index 100% rename from pkgs/development/libraries/jsonrpc-glib/default.nix rename to pkgs/by-name/js/jsonrpc-glib/package.nix diff --git a/pkgs/tools/misc/jstest-gtk/default.nix b/pkgs/by-name/js/jstest-gtk/package.nix similarity index 100% rename from pkgs/tools/misc/jstest-gtk/default.nix rename to pkgs/by-name/js/jstest-gtk/package.nix diff --git a/pkgs/tools/security/jsubfinder/default.nix b/pkgs/by-name/js/jsubfinder/package.nix similarity index 100% rename from pkgs/tools/security/jsubfinder/default.nix rename to pkgs/by-name/js/jsubfinder/package.nix diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/by-name/js/jsvc/package.nix similarity index 100% rename from pkgs/tools/system/jsvc/default.nix rename to pkgs/by-name/js/jsvc/package.nix diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/by-name/jt/jtag-remote-server/package.nix similarity index 100% rename from pkgs/development/embedded/jtag-remote-server/default.nix rename to pkgs/by-name/jt/jtag-remote-server/package.nix diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/by-name/jt/jtc/package.nix similarity index 100% rename from pkgs/development/tools/jtc/default.nix rename to pkgs/by-name/jt/jtc/package.nix diff --git a/pkgs/development/libraries/judy/cross.patch b/pkgs/by-name/ju/judy/cross.patch similarity index 100% rename from pkgs/development/libraries/judy/cross.patch rename to pkgs/by-name/ju/judy/cross.patch diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/by-name/ju/judy/package.nix similarity index 100% rename from pkgs/development/libraries/judy/default.nix rename to pkgs/by-name/ju/judy/package.nix diff --git a/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch b/pkgs/by-name/ju/jugglinglab/fix-default-maven-plugin-versions.patch similarity index 100% rename from pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch rename to pkgs/by-name/ju/jugglinglab/fix-default-maven-plugin-versions.patch diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/by-name/ju/jugglinglab/package.nix similarity index 100% rename from pkgs/tools/misc/jugglinglab/default.nix rename to pkgs/by-name/ju/jugglinglab/package.nix diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/by-name/ju/juicity/package.nix similarity index 100% rename from pkgs/tools/networking/juicity/default.nix rename to pkgs/by-name/ju/juicity/package.nix diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/by-name/ju/juju/package.nix similarity index 100% rename from pkgs/applications/networking/juju/default.nix rename to pkgs/by-name/ju/juju/package.nix diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index a978063acaa0..6e9a9f534e26 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -21,7 +21,7 @@ }: let - version = "0.22.0"; + version = "0.23.0"; in rustPlatform.buildRustPackage { @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-GbKmX1Ev/8di3A1XT5ZIRjzn2zP6DMye2NpA26PGVIs="; + hash = "sha256-NCeD+WA3uVl4l/KKFDtdG8+vpm10Y3rEAf8kY6SP0yo="; }; - cargoHash = "sha256-+3oO2M2293Nba6P8bejgZD5OxgCpkIRdcPICDswJyEU="; + cargoHash = "sha256-lnfh9zMMZfHhYY7kgmxuqZwoEQxiInjmHjzLabbUijU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/by-name/ju/jujuutils/package.nix similarity index 100% rename from pkgs/os-specific/linux/jujuutils/default.nix rename to pkgs/by-name/ju/jujuutils/package.nix diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/by-name/ju/julia-mono/package.nix similarity index 100% rename from pkgs/data/fonts/julia-mono/default.nix rename to pkgs/by-name/ju/julia-mono/package.nix diff --git a/pkgs/games/julius/darwin-fixes.patch b/pkgs/by-name/ju/julius/darwin-fixes.patch similarity index 100% rename from pkgs/games/julius/darwin-fixes.patch rename to pkgs/by-name/ju/julius/darwin-fixes.patch diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix new file mode 100644 index 000000000000..6c85b45b0e10 --- /dev/null +++ b/pkgs/by-name/ju/julius/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_mixer +, cmake +, libpng +, darwin +, apple-sdk_11 +, libicns +, imagemagick +}: +stdenv.mkDerivation rec { + pname = "julius"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "bvschaik"; + repo = "julius"; + rev = "v${version}"; + hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A="; + }; + + patches = [ + # This fixes the darwin bundle generation, sets min. deployment version + # and patches SDL2_mixer include + ./darwin-fixes.patch + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.sigtool + libicns + imagemagick + ]; + + buildInputs = [ + SDL2 + SDL2_mixer + libpng + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + mkdir -p $out/Applications + cp -r julius.app $out/Applications/ + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/bvschaik/julius"; + description = "Open source re-implementation of Caesar III"; + mainProgram = "julius"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Thra11 matteopacini ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch similarity index 100% rename from pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch rename to pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/by-name/ju/jumanpp/package.nix similarity index 100% rename from pkgs/tools/text/jumanpp/default.nix rename to pkgs/by-name/ju/jumanpp/package.nix diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/by-name/ju/jump/package.nix similarity index 100% rename from pkgs/tools/system/jump/default.nix rename to pkgs/by-name/ju/jump/package.nix diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/by-name/ju/jumpapp/package.nix similarity index 100% rename from pkgs/tools/X11/jumpapp/default.nix rename to pkgs/by-name/ju/jumpapp/package.nix diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/by-name/ju/jumpnbump/package.nix similarity index 100% rename from pkgs/games/jumpnbump/default.nix rename to pkgs/by-name/ju/jumpnbump/package.nix diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/by-name/ju/jumppad/package.nix similarity index 100% rename from pkgs/tools/virtualization/jumppad/default.nix rename to pkgs/by-name/ju/jumppad/package.nix diff --git a/pkgs/games/jumpy/Cargo.lock b/pkgs/by-name/ju/jumpy/Cargo.lock similarity index 100% rename from pkgs/games/jumpy/Cargo.lock rename to pkgs/by-name/ju/jumpy/Cargo.lock diff --git a/pkgs/games/jumpy/default.nix b/pkgs/by-name/ju/jumpy/package.nix similarity index 100% rename from pkgs/games/jumpy/default.nix rename to pkgs/by-name/ju/jumpy/package.nix diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/by-name/ju/junction-font/package.nix similarity index 100% rename from pkgs/data/fonts/junction/default.nix rename to pkgs/by-name/ju/junction-font/package.nix diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/by-name/ju/junction/package.nix similarity index 100% rename from pkgs/applications/misc/junction/default.nix rename to pkgs/by-name/ju/junction/package.nix diff --git a/pkgs/by-name/ju/junest/package.nix b/pkgs/by-name/ju/junest/package.nix index 10f59b82adf6..4f2d89f9f6a0 100644 --- a/pkgs/by-name/ju/junest/package.nix +++ b/pkgs/by-name/ju/junest/package.nix @@ -14,11 +14,17 @@ stdenvNoCC.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/lib cp -r $src/bin/ $out/ cp -r $src/lib/ $out/ + # cp -r $src/VERSION $out/ + substituteInPlace $out/bin/junest --replace-fail '$(cat "$JUNEST_BASE"/VERSION)' ${version} substituteInPlace $out/lib/core/common.sh --replace-fail "wget" ${lib.getExe wget} + + runHook postInstall ''; meta = { diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/by-name/ju/junicode/package.nix similarity index 100% rename from pkgs/data/fonts/junicode/default.nix rename to pkgs/by-name/ju/junicode/package.nix diff --git a/pkgs/data/fonts/junicode/test-vf.tex b/pkgs/by-name/ju/junicode/test-vf.tex similarity index 100% rename from pkgs/data/fonts/junicode/test-vf.tex rename to pkgs/by-name/ju/junicode/test-vf.tex diff --git a/pkgs/data/fonts/junicode/test.tex b/pkgs/by-name/ju/junicode/test.tex similarity index 100% rename from pkgs/data/fonts/junicode/test.tex rename to pkgs/by-name/ju/junicode/test.tex diff --git a/pkgs/data/fonts/junicode/tests.nix b/pkgs/by-name/ju/junicode/tests.nix similarity index 100% rename from pkgs/data/fonts/junicode/tests.nix rename to pkgs/by-name/ju/junicode/tests.nix diff --git a/pkgs/data/fonts/junicode/tex-font-path.patch b/pkgs/by-name/ju/junicode/tex-font-path.patch similarity index 100% rename from pkgs/data/fonts/junicode/tex-font-path.patch rename to pkgs/by-name/ju/junicode/tex-font-path.patch diff --git a/pkgs/development/compilers/juniper/deps.nix b/pkgs/by-name/ju/juniper/deps.nix similarity index 100% rename from pkgs/development/compilers/juniper/deps.nix rename to pkgs/by-name/ju/juniper/deps.nix diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/by-name/ju/juniper/package.nix similarity index 100% rename from pkgs/development/compilers/juniper/default.nix rename to pkgs/by-name/ju/juniper/package.nix diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/by-name/ju/junkie/package.nix similarity index 100% rename from pkgs/tools/networking/junkie/default.nix rename to pkgs/by-name/ju/junkie/package.nix diff --git a/pkgs/data/themes/juno/default.nix b/pkgs/by-name/ju/juno-theme/package.nix similarity index 100% rename from pkgs/data/themes/juno/default.nix rename to pkgs/by-name/ju/juno-theme/package.nix diff --git a/pkgs/tools/text/justify/default.nix b/pkgs/by-name/ju/justify/package.nix similarity index 100% rename from pkgs/tools/text/justify/default.nix rename to pkgs/by-name/ju/justify/package.nix diff --git a/pkgs/tools/networking/jwhois/connect.patch b/pkgs/by-name/jw/jwhois/connect.patch similarity index 100% rename from pkgs/tools/networking/jwhois/connect.patch rename to pkgs/by-name/jw/jwhois/connect.patch diff --git a/pkgs/by-name/jw/jwhois/package.nix b/pkgs/by-name/jw/jwhois/package.nix new file mode 100644 index 000000000000..78f2398b2876 --- /dev/null +++ b/pkgs/by-name/jw/jwhois/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + lynx, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jwhois"; + version = "4.0"; + + src = fetchurl { + url = "mirror://gnu/jwhois/jwhois-${finalAttrs.version}.tar.gz"; + hash = "sha256-+pu4Z4K5FcbXMLtyP4dtybNFphfbN1qvNBbsIlU81k4="; + }; + + patches = [ + ./connect.patch + ./service-name.patch + ]; + + postPatch = '' + # avoids error on darwin where `-Werror=implicit-function-declaration` is set by default + sed 1i'void timeout_init();' -i src/jwhois.c + + substituteInPlace example/jwhois.conf \ + --replace-fail "/usr/bin/lynx" ${lib.getExe lynx} + ''; + + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + + postInstall = '' + ln -s $out/bin/jwhois $out/bin/whois + ''; + + # Work around error from on aarch64-darwin: + # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] + # TODO: this should probably be fixed at a lower level than this? + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; + + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + + meta = { + description = "Client for the WHOIS protocol allowing you to query the owner of a domain name"; + homepage = "https://www.gnu.org/software/jwhois/"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/tools/networking/jwhois/service-name.patch b/pkgs/by-name/jw/jwhois/service-name.patch similarity index 100% rename from pkgs/tools/networking/jwhois/service-name.patch rename to pkgs/by-name/jw/jwhois/service-name.patch diff --git a/pkgs/tools/security/jwt-hack/default.nix b/pkgs/by-name/jw/jwt-hack/package.nix similarity index 100% rename from pkgs/tools/security/jwt-hack/default.nix rename to pkgs/by-name/jw/jwt-hack/package.nix diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/by-name/jw/jwx/package.nix similarity index 100% rename from pkgs/tools/security/jwx/default.nix rename to pkgs/by-name/jw/jwx/package.nix diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/by-name/jx/jx/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/jx/default.nix rename to pkgs/by-name/jx/jx/package.nix diff --git a/pkgs/applications/networking/jxplorer/default.nix b/pkgs/by-name/jx/jxplorer/package.nix similarity index 100% rename from pkgs/applications/networking/jxplorer/default.nix rename to pkgs/by-name/jx/jxplorer/package.nix diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/by-name/jx/jxrlib/package.nix similarity index 100% rename from pkgs/development/libraries/jxrlib/default.nix rename to pkgs/by-name/jx/jxrlib/package.nix diff --git a/pkgs/by-name/jy/jython/package.nix b/pkgs/by-name/jy/jython/package.nix new file mode 100644 index 000000000000..83852d91760b --- /dev/null +++ b/pkgs/by-name/jy/jython/package.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "jython"; + + version = "2.7.4"; + + src = fetchurl { + url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; + sha256 = "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -pv $out/bin + cp $src $out/jython.jar + makeWrapper ${jre}/bin/java $out/bin/jython --add-flags "-jar $out/jython.jar" + ''; + + meta = { + description = "Python interpreter written in Java"; + mainProgram = "jython"; + homepage = "https://jython.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.psfl; + platforms = jre.meta.platforms; + }; +} diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix new file mode 100644 index 000000000000..f22d0b97e5f5 --- /dev/null +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -0,0 +1,54 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, testers +, k0sctl +}: + +buildGoModule rec { + pname = "k0sctl"; + version = "0.19.2"; + + src = fetchFromGitHub { + owner = "k0sproject"; + repo = "k0sctl"; + rev = "refs/tags/v${version}"; + hash = "sha256-TdnZZ27j++o9I4Zup4PmM2VAHwn8BPBG/CwxTUy0BWU="; + }; + + vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/k0sproject/k0sctl/version.Environment=production" + "-X=github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12 + "-X=github.com/carlmjohnson/versioninfo.Revision=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash zsh fish; do + installShellCompletion --cmd ${pname} \ + --$shell <($out/bin/${pname} completion --shell $shell) + done + ''; + + passthru.tests.version = testers.testVersion { + package = k0sctl; + command = "k0sctl version"; + # See https://github.com/carlmjohnson/versioninfo/discussions/12 + version = "version: (devel)\ncommit: v${version}\n"; + }; + + meta = with lib; { + description = "Bootstrapping and management tool for k0s clusters"; + homepage = "https://k0sproject.io/"; + changelog = "https://github.com/k0sproject/k0sctl/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "k0sctl"; + maintainers = with maintainers; [ nickcao qjoly ]; + }; +} diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch similarity index 100% rename from pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch rename to pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/by-name/k2/k2pdfopt/package.nix similarity index 100% rename from pkgs/applications/misc/k2pdfopt/default.nix rename to pkgs/by-name/k2/k2pdfopt/package.nix diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/by-name/k2/k2tf/package.nix similarity index 100% rename from pkgs/development/tools/misc/k2tf/default.nix rename to pkgs/by-name/k2/k2tf/package.nix diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/by-name/k3/k3d/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/k3d/default.nix rename to pkgs/by-name/k3/k3d/package.nix diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/by-name/k3/k3sup/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/k3sup/default.nix rename to pkgs/by-name/k3/k3sup/package.nix diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/by-name/k4/k40-whisperer/package.nix similarity index 100% rename from pkgs/applications/misc/k40-whisperer/default.nix rename to pkgs/by-name/k4/k40-whisperer/package.nix diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/by-name/k6/k6/package.nix similarity index 100% rename from pkgs/development/tools/k6/default.nix rename to pkgs/by-name/k6/k6/package.nix diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/by-name/k9/k9s/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/k9s/default.nix rename to pkgs/by-name/k9/k9s/package.nix diff --git a/pkgs/games/kabeljau/default.nix b/pkgs/by-name/ka/kabeljau/package.nix similarity index 100% rename from pkgs/games/kabeljau/default.nix rename to pkgs/by-name/ka/kabeljau/package.nix diff --git a/pkgs/data/fonts/kacst/default.nix b/pkgs/by-name/ka/kacst/package.nix similarity index 100% rename from pkgs/data/fonts/kacst/default.nix rename to pkgs/by-name/ka/kacst/package.nix diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/by-name/ka/kaf/package.nix similarity index 100% rename from pkgs/development/tools/kaf/default.nix rename to pkgs/by-name/ka/kaf/package.nix diff --git a/pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock b/pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock new file mode 100644 index 000000000000..5db25c199fbe --- /dev/null +++ b/pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock @@ -0,0 +1,6023 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "RustyXML" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" + +[[package]] +name = "addr" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936697e9caf938eb2905036100edf8e1269da8291f8a02f5fe7b37073784eec0" +dependencies = [ + "no-std-net", + "psl", + "psl-types", +] + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "const-random", + "getrandom 0.2.15", + "once_cell", + "version_check", + "zerocopy 0.7.35", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" + +[[package]] +name = "apache-avro" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf4144857f9e4d7dd6cc4ba4c78efd2a46bad682b029bd0d91e76a021af1b2a" +dependencies = [ + "byteorder", + "digest 0.10.7", + "lazy_static", + "libflate", + "log", + "num-bigint", + "quad-rand", + "rand 0.8.5", + "regex", + "serde", + "serde_json", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror", + "typed-builder", + "uuid 1.11.0", + "zerocopy 0.6.6", +] + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "arrow" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-csv", + "arrow-data", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", +] + +[[package]] +name = "arrow-arith" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" +dependencies = [ + "ahash", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "chrono-tz", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "atoi", + "base64 0.22.1", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-csv" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13c36dc5ddf8c128df19bab27898eea64bf9da2b555ec1cd17a8ff57fba9ec2" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-data" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "flatbuffers", + "lz4_flex", +] + +[[package]] +name = "arrow-json" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb22284c5a2a01d73cebfd88a33511a3234ab45d66086b2ca2d1228c3498e445" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "indexmap", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "half", +] + +[[package]] +name = "arrow-schema" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" +dependencies = [ + "serde", +] + +[[package]] +name = "arrow-select" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + +[[package]] +name = "arrow-string" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "memchr", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-compression" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" +dependencies = [ + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", + "xz2", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "aws-config" +version = "1.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.1.1", + "hex", + "http 0.2.12", + "ring 0.17.8", + "time", + "tokio", + "tracing", + "url", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-runtime" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.1.1", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid 1.11.0", +] + +[[package]] +name = "aws-sdk-dynamodb" +version = "1.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "473aa619c2a3581ab00d9000e66a11982f6354d0150797518b8d459c7f9a6b5c" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.1.1", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-sso" +version = "1.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded855583fa1d22e88fe39fd6062b062376e50a8211989e07cf5e38d52eb3453" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9177ea1192e6601ae16c7273385690d88a7ed386a00b74a6bc894d12103cd933" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "1.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823ef553cf36713c97453e2ddff1eb8f62be7f4523544e2a5db64caf80100f0a" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" +dependencies = [ + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "form_urlencoded", + "hex", + "hmac 0.12.1", + "http 0.2.12", + "http 1.1.0", + "once_cell", + "percent-encoding", + "sha2 0.10.8", + "time", + "tracing", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-http" +version = "0.60.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.1.1", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "hyper 0.14.31", + "hyper-rustls 0.24.2", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls 0.21.12", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c9cdc179e6afbf5d391ab08c85eac817b51c87e1892a5edb5f7bbdc64314b4" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util 0.7.12", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.60.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version", + "tracing", +] + +[[package]] +name = "azure_core" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6218987c374650fdad0b476bfc675729762c28dfb35f58608a38a2b1ea337dd" +dependencies = [ + "async-trait", + "base64 0.21.7", + "bytes", + "dyn-clone", + "futures", + "getrandom 0.2.15", + "hmac 0.12.1", + "http-types", + "log", + "once_cell", + "paste", + "pin-project", + "quick-xml 0.31.0", + "rand 0.8.5", + "reqwest 0.11.27", + "rustc_version", + "serde", + "serde_json", + "sha2 0.10.8", + "time", + "url", + "uuid 1.11.0", +] + +[[package]] +name = "azure_storage" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade8f2653e408de88b9eafec9f48c3c26b94026375e88adbd34523a7dd9795a1" +dependencies = [ + "RustyXML", + "async-lock", + "async-trait", + "azure_core", + "bytes", + "log", + "serde", + "serde_derive", + "time", + "url", + "uuid 1.11.0", +] + +[[package]] +name = "azure_storage_blobs" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "025701c7cc5b523100f0f3b2b01723564ec5a86c03236521c06826337047e872" +dependencies = [ + "RustyXML", + "azure_core", + "azure_storage", + "azure_svc_blobstorage", + "bytes", + "futures", + "log", + "serde", + "serde_derive", + "serde_json", + "time", + "url", + "uuid 1.11.0", +] + +[[package]] +name = "azure_svc_blobstorage" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76051e5bb67cea1055abe5e530a0878feac7e0ab4cbbcb4a6adc953a58993389" +dependencies = [ + "azure_core", + "bytes", + "futures", + "log", + "once_cell", + "serde", + "serde_json", + "time", +] + +[[package]] +name = "backon" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" +dependencies = [ + "fastrand 2.1.1", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +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 = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" + +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cc" +version = "1.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cfg-if" +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 = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf 0.11.2", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf 0.11.2", + "phf_codegen 0.11.2", +] + +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "comfy-table" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +dependencies = [ + "strum 0.26.3", + "strum_macros 0.26.4", + "unicode-width", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ct-logs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" +dependencies = [ + "sct 0.6.1", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "datafusion" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-ipc", + "arrow-schema", + "async-compression", + "async-trait", + "bytes", + "bzip2", + "chrono", + "dashmap 6.1.0", + "datafusion-catalog", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-nested", + "datafusion-optimizer", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "datafusion-physical-optimizer", + "datafusion-physical-plan", + "datafusion-sql", + "flate2", + "futures", + "glob", + "half", + "hashbrown 0.14.5", + "indexmap", + "itertools 0.12.1", + "log", + "num_cpus", + "object_store", + "parking_lot", + "parquet", + "paste", + "pin-project-lite", + "rand 0.8.5", + "sqlparser 0.49.0", + "tempfile", + "tokio", + "tokio-util 0.7.12", + "url", + "uuid 1.11.0", + "xz2", + "zstd", +] + +[[package]] +name = "datafusion-catalog" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", + "chrono", + "half", + "hashbrown 0.14.5", + "instant", + "libc", + "num_cpus", + "object_store", + "parquet", + "sqlparser 0.49.0", +] + +[[package]] +name = "datafusion-common-runtime" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" +dependencies = [ + "tokio", +] + +[[package]] +name = "datafusion-execution" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" +dependencies = [ + "arrow", + "chrono", + "dashmap 6.1.0", + "datafusion-common", + "datafusion-expr", + "futures", + "hashbrown 0.14.5", + "log", + "object_store", + "parking_lot", + "rand 0.8.5", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-expr" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "chrono", + "datafusion-common", + "paste", + "serde_json", + "sqlparser 0.49.0", + "strum 0.26.3", + "strum_macros 0.26.4", +] + +[[package]] +name = "datafusion-functions" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" +dependencies = [ + "arrow", + "arrow-buffer", + "base64 0.22.1", + "blake2", + "blake3", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "hashbrown 0.14.5", + "hex", + "itertools 0.12.1", + "log", + "md-5 0.10.6", + "rand 0.8.5", + "regex", + "sha2 0.10.8", + "unicode-segmentation", + "uuid 1.11.0", +] + +[[package]] +name = "datafusion-functions-aggregate" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" +dependencies = [ + "ahash", + "arrow", + "arrow-schema", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "log", + "paste", + "sqlparser 0.49.0", +] + +[[package]] +name = "datafusion-functions-nested" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" +dependencies = [ + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "itertools 0.12.1", + "log", + "paste", + "rand 0.8.5", +] + +[[package]] +name = "datafusion-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" +dependencies = [ + "arrow", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "hashbrown 0.14.5", + "indexmap", + "itertools 0.12.1", + "log", + "paste", + "regex-syntax", +] + +[[package]] +name = "datafusion-physical-expr" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "arrow-string", + "base64 0.22.1", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "half", + "hashbrown 0.14.5", + "hex", + "indexmap", + "itertools 0.12.1", + "log", + "paste", + "petgraph", + "regex", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" +dependencies = [ + "ahash", + "arrow", + "datafusion-common", + "datafusion-expr", + "hashbrown 0.14.5", + "rand 0.8.5", +] + +[[package]] +name = "datafusion-physical-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-physical-plan" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "futures", + "half", + "hashbrown 0.14.5", + "indexmap", + "itertools 0.12.1", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "rand 0.8.5", + "tokio", +] + +[[package]] +name = "datafusion-proto" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1d25864c18178d0e51438648f5e0fa08417dbbc39b642c1752cbbb1013abf0" +dependencies = [ + "arrow", + "chrono", + "datafusion", + "datafusion-common", + "datafusion-expr", + "datafusion-proto-common", + "object_store", + "prost", +] + +[[package]] +name = "datafusion-proto-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a683253732334526b1cc5314a73a0f786803831f7e189ed3fe387ac50d7222" +dependencies = [ + "arrow", + "chrono", + "datafusion-common", + "object_store", + "prost", +] + +[[package]] +name = "datafusion-sql" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" +dependencies = [ + "arrow", + "arrow-array", + "arrow-schema", + "datafusion-common", + "datafusion-expr", + "log", + "regex", + "sqlparser 0.49.0", + "strum 0.26.3", +] + +[[package]] +name = "debugid" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ee87af31d84ef885378aebca32be3d682b0e0dc119d5b4860a2c5bb5046730" +dependencies = [ + "serde", + "uuid 0.8.2", +] + +[[package]] +name = "delta_kernel" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa08a82239f51e6d3d249c38f0f5bf7c8a78b28587e1b466893c9eac84d252d8" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-cast", + "arrow-json", + "arrow-ord", + "arrow-schema", + "arrow-select", + "bytes", + "chrono", + "delta_kernel_derive", + "either", + "fix-hidden-lifetime-bug", + "indexmap", + "itertools 0.13.0", + "lazy_static", + "parquet", + "roaring", + "rustc_version", + "serde", + "serde_json", + "strum 0.26.3", + "thiserror", + "tracing", + "url", + "uuid 1.11.0", + "visibility", + "z85", +] + +[[package]] +name = "delta_kernel_derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec5c4fb5b59b1bd55ed8ebcf941f27a327d600c19a4a4103546846c358be93ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "deltalake-aws" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad95533e1e5041622bff91c9eca1430aacb0469e1dbd40ce46f67f78a93d2784" +dependencies = [ + "async-trait", + "aws-config", + "aws-credential-types", + "aws-sdk-dynamodb", + "aws-sdk-sts", + "aws-smithy-runtime-api", + "backon", + "bytes", + "chrono", + "deltalake-core", + "futures", + "lazy_static", + "maplit", + "object_store", + "regex", + "thiserror", + "tokio", + "tracing", + "url", + "uuid 1.11.0", +] + +[[package]] +name = "deltalake-azure" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b143541a5a3d02da940b1fc0a3522bd39b7f78400132e9739329b99cafc921db" +dependencies = [ + "async-trait", + "bytes", + "deltalake-core", + "futures", + "lazy_static", + "object_store", + "regex", + "thiserror", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "deltalake-core" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a95bfec2cdf24ccc7b9d7dda2d92f5d91ed892e79d0928f61fc5e7e4e27be5e" +dependencies = [ + "arrow", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "async-trait", + "bytes", + "cfg-if", + "chrono", + "dashmap 6.1.0", + "datafusion", + "datafusion-common", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-physical-expr", + "datafusion-physical-plan", + "datafusion-proto", + "datafusion-sql", + "delta_kernel", + "either", + "errno", + "fix-hidden-lifetime-bug", + "futures", + "hashbrown 0.14.5", + "indexmap", + "itertools 0.13.0", + "lazy_static", + "libc", + "maplit", + "num-bigint", + "num-traits", + "num_cpus", + "object_store", + "once_cell", + "parking_lot", + "parquet", + "percent-encoding", + "pin-project-lite", + "rand 0.8.5", + "regex", + "roaring", + "serde", + "serde_json", + "sqlparser 0.51.0", + "thiserror", + "tokio", + "tracing", + "url", + "urlencoding", + "uuid 1.11.0", + "z85", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "deunicode" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] + +[[package]] +name = "dipstick" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c118919ea86336719de0d38013d9258a60492aeb4fccf57f81ba9cd533bbe56" +dependencies = [ + "atomic_refcell", + "crossbeam-channel", + "lazy_static", + "log", + "minreq", + "num", + "parking_lot", + "time", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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.87", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "dynamodb_lock" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c4242838952a07117a4444cdf59fdcb47f181525f2dd6ae4ca6281954d09c77" +dependencies = [ + "async-trait", + "log", + "maplit", + "rusoto_core", + "rusoto_dynamodb", + "thiserror", + "tokio", + "uuid 1.11.0", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fix-hidden-lifetime-bug" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7b4994e93dd63050356bdde7d417591d1b348523638dc1c1f539f16e338d55" +dependencies = [ + "fix-hidden-lifetime-bug-proc_macros", +] + +[[package]] +name = "fix-hidden-lifetime-bug-proc_macros" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8f0de9daf465d763422866d0538f07be1596e05623e120b37b4f715f5585200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flatbuffers" +version = "24.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f" +dependencies = [ + "bitflags 1.3.2", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[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.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util 0.7.12", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util 0.7.12", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "http-types" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +dependencies = [ + "anyhow", + "async-channel", + "base64 0.13.1", + "futures-lite", + "infer", + "pin-project-lite", + "rand 0.7.3", + "serde", + "serde_json", + "serde_qs", + "serde_urlencoded", + "url", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +dependencies = [ + "ct-logs", + "futures-util", + "hyper 0.14.31", + "log", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", + "tokio", + "tokio-rustls 0.22.0", + "webpki", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.31", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.5.0", + "hyper-util", + "rustls 0.23.16", + "rustls-native-certs 0.8.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.31", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.5.0", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +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", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.1", +] + +[[package]] +name = "infer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jmespatch" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acf91a732ade34d8eda2dee9500a051833f14f0d3d10d77c149845d6ac6a5f0" +dependencies = [ + "lazy_static", + "serde", + "serde_json", + "slug", +] + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-pointer" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe841b94e719a482213cee19dd04927cf412f26d8dc84c5a446c081e49c2997" +dependencies = [ + "serde_json", +] + +[[package]] +name = "jsonway" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effcb749443c905fbaef49d214f8b1049c240e0adb7af9baa0e201e625e4f9de" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "kafka-delta-ingest" +version = "0.3.0" +dependencies = [ + "anyhow", + "apache-avro", + "async-trait", + "azure_core", + "azure_storage", + "azure_storage_blobs", + "base64 0.13.1", + "bytes", + "chrono", + "clap", + "deltalake-aws", + "deltalake-azure", + "deltalake-core", + "dipstick", + "dynamodb_lock", + "env_logger", + "flate2", + "futures", + "jmespatch", + "lazy_static", + "log", + "maplit", + "rdkafka", + "rusoto_core", + "rusoto_credential", + "rusoto_s3", + "schema_registry_converter", + "sentry", + "serde", + "serde_json", + "serial_test", + "strum 0.20.0", + "strum_macros 0.20.1", + "tempfile", + "thiserror", + "time", + "tokio", + "tokio-stream", + "tokio-util 0.6.10", + "url", + "utime", + "uuid 0.8.2", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[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.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "libflate" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +dependencies = [ + "rle-decode-fast", +] + +[[package]] +name = "libm" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "libz-sys" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lz4_flex" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "md-5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest 0.10.7", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "minreq" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763d142cdff44aaadd9268bebddb156ef6c65a0e13486bb81673cf2d8739f9b0" +dependencies = [ + "log", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "no-std-net" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bcece43b12349917e096cddfa66107277f123e6c96a5aea78711dc601a47152" +dependencies = [ + "serde", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "object_store" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "chrono", + "futures", + "humantime", + "hyper 1.5.0", + "itertools 0.13.0", + "md-5 0.10.6", + "parking_lot", + "percent-encoding", + "quick-xml 0.36.2", + "rand 0.8.5", + "reqwest 0.12.9", + "ring 0.17.8", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parquet" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e977b9066b4d3b03555c22bdc442f3fadebd96a39111249113087d0edb2691cd" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", + "base64 0.22.1", + "brotli", + "bytes", + "chrono", + "flate2", + "futures", + "half", + "hashbrown 0.14.5", + "lz4_flex", + "num", + "num-bigint", + "object_store", + "paste", + "seq-macro", + "serde_json", + "snap", + "thrift", + "tokio", + "twox-hash", + "zstd", + "zstd-sys", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy 0.7.35", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "psl" +version = "2.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9398ad066421139b2e3afe16ea46772ffda30bd9ba57554dc035df5e26edc8" +dependencies = [ + "psl-types", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "quad-rand" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b76f1009795ca44bb5aaae8fd3f18953e209259c33d9b059b1f53d58ab7511db" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.16", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring 0.17.8", + "rustc-hash", + "rustls 0.23.16", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rdkafka" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de127f294f2dba488ed46760b129d5ecbeabbd337ccbf3739cb29d50db2161c" +dependencies = [ + "futures", + "libc", + "log", + "rdkafka-sys", + "serde", + "serde_derive", + "serde_json", + "slab", + "tokio", +] + +[[package]] +name = "rdkafka-sys" +version = "4.7.0+2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55e0d2f9ba6253f6ec72385e453294f8618e9e15c2c6aba2a5c01ccf9622d615" +dependencies = [ + "libc", + "libz-sys", + "num_enum", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.31", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util 0.7.12", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.0", + "hyper-rustls 0.27.3", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.16", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls 0.26.0", + "tokio-util 0.7.12", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.15", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +[[package]] +name = "roaring" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" +dependencies = [ + "bytemuck", + "byteorder", +] + +[[package]] +name = "rusoto_core" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b4f000e8934c1b4f70adde180056812e7ea6b1a247952db8ee98c94cd3116cc" +dependencies = [ + "async-trait", + "base64 0.13.1", + "bytes", + "crc32fast", + "futures", + "http 0.2.12", + "hyper 0.14.31", + "hyper-rustls 0.22.1", + "lazy_static", + "log", + "rusoto_credential", + "rusoto_signature", + "rustc_version", + "serde", + "serde_json", + "tokio", + "xml-rs", +] + +[[package]] +name = "rusoto_credential" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a46b67db7bb66f5541e44db22b0a02fed59c9603e146db3a9e633272d3bac2f" +dependencies = [ + "async-trait", + "chrono", + "dirs-next", + "futures", + "hyper 0.14.31", + "serde", + "serde_json", + "shlex", + "tokio", + "zeroize", +] + +[[package]] +name = "rusoto_dynamodb" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7935e1f9ca57c4ee92a4d823dcd698eb8c992f7e84ca21976ae72cd2b03016e7" +dependencies = [ + "async-trait", + "bytes", + "futures", + "rusoto_core", + "serde", + "serde_json", +] + +[[package]] +name = "rusoto_s3" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048c2fe811a823ad5a9acc976e8bf4f1d910df719dcf44b15c3e96c5b7a51027" +dependencies = [ + "async-trait", + "bytes", + "futures", + "rusoto_core", + "xml-rs", +] + +[[package]] +name = "rusoto_signature" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6264e93384b90a747758bcc82079711eacf2e755c3a8b5091687b5349d870bcc" +dependencies = [ + "base64 0.13.1", + "bytes", + "chrono", + "digest 0.9.0", + "futures", + "hex", + "hmac 0.11.0", + "http 0.2.12", + "hyper 0.14.31", + "log", + "md-5 0.9.1", + "percent-encoding", + "pin-project-lite", + "rusoto_credential", + "rustc_version", + "serde", + "sha2 0.9.9", + "tokio", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring 0.16.20", + "sct 0.6.1", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-webpki 0.101.7", + "sct 0.7.1", +] + +[[package]] +name = "rustls" +version = "0.23.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +dependencies = [ + "openssl-probe", + "rustls 0.19.1", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scc" +version = "2.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8d25269dd3a12467afe2e510f69fb0b46b698e5afb296b59f2145259deaf8e8" +dependencies = [ + "sdd", +] + +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "schema_registry_converter" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea1c251bea837ece3126074d9e01c5868e5ae6135946404ceb20b5b2e264f7c" +dependencies = [ + "apache-avro", + "byteorder", + "dashmap 5.5.3", + "futures", + "reqwest 0.11.27", + "serde", + "serde_json", + "tokio", + "url", + "valico", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "sdd" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +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 = "sentry" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546b9b6f76c26c60ffbcf0b7136e15169fe13d43949b4aadb7c1edc1c3f3a26f" +dependencies = [ + "httpdate", + "reqwest 0.11.27", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-panic", + "tokio", +] + +[[package]] +name = "sentry-backtrace" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd0cba2aff36ac98708f7a6e7abbdde82dbaf180d5870c41084dc1b473648b9" +dependencies = [ + "backtrace", + "lazy_static", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bacf1c62427c6c97b896640d0c4dd204bbd3b79dd192d7cb40891aa5ee11d58" +dependencies = [ + "hostname", + "lazy_static", + "libc", + "regex", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a957270c9a430218f8031c866493061a27e35a70250e9527f093563a33ce6b" +dependencies = [ + "chrono", + "lazy_static", + "rand 0.8.5", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-panic" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692bf989f0c99f025e33d7f58e62822c3771f56d189698c66dcc863122255d95" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-types" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd2266fee014a86e250e98e389191ecd23be546b5c42b6a2fb9af2972fadac" +dependencies = [ + "chrono", + "debugid", + "serde", + "serde_json", + "thiserror", + "url", + "uuid 0.8.2", +] + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slug" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724" +dependencies = [ + "deunicode", + "wasm-bindgen", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "sqlparser" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" +dependencies = [ + "log", + "sqlparser_derive", +] + +[[package]] +name = "sqlparser" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe11944a61da0da3f592e19a45ebe5ab92dc14a779907ff1f08fbb797bfefc7" +dependencies = [ + "log", +] + +[[package]] +name = "sqlparser_derive" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + +[[package]] +name = "strum_macros" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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 = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.87", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand 2.1.1", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "ordered-float", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "js-sys", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +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 = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls 0.19.1", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.16", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typed-builder" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "uritemplate-next" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcde98d1fc3f528255b1ecb22fb688ee0d23deb672a8c57127df10b98b4bd18c" +dependencies = [ + "regex", +] + +[[package]] +name = "url" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utime" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db1c730dced511c1f1d156427c16abc9e1624091f03235b9fb2f83452ec50d2" +dependencies = [ + "libc", + "version_check", + "winapi", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.15", + "serde", +] + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "getrandom 0.2.15", + "serde", +] + +[[package]] +name = "valico" +version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647856408e327686b6640397d19f60fac3e64c3bfaa6afc409da63ef7da45edb" +dependencies = [ + "addr", + "base64 0.13.1", + "chrono", + "json-pointer", + "jsonway", + "percent-encoding", + "phf 0.8.0", + "phf_codegen 0.8.0", + "regex", + "serde", + "serde_json", + "uritemplate-next", + "url", + "uuid 0.8.2", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "visibility" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.87", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[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 = "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 = "xml-rs" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + +[[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", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "z85" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" + +[[package]] +name = "zerocopy" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +dependencies = [ + "byteorder", + "zerocopy-derive 0.6.6", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy-derive" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[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", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.12+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/ka/kafka-delta-ingest/package.nix b/pkgs/by-name/ka/kafka-delta-ingest/package.nix new file mode 100644 index 000000000000..3cd2cc590363 --- /dev/null +++ b/pkgs/by-name/ka/kafka-delta-ingest/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + perl, + rdkafka, + # these are features in the cargo, where one may be disabled to reduce the final size + enableS3 ? true, + enableAzure ? true, +}: + +assert lib.assertMsg (enableS3 || enableAzure) "Either S3 or azure support needs to be enabled"; +rustPlatform.buildRustPackage { + pname = "kafka-delta-ingest"; + version = "0-unstable-2024-11-05"; + + src = fetchFromGitHub { + owner = "delta-io"; + repo = "kafka-delta-ingest"; + rev = "b7638eda8642985b5bd56741de526ea051d784c0"; + hash = "sha256-fngPFvCxEaHVenySG5FBbVXporu3Hf957iV3rGWsrzE="; + }; + + nativeBuildInputs = [ + pkg-config + perl + ]; + + buildFeatures = [ + "dynamic-linking" + ] ++ lib.optional enableS3 "s3" ++ lib.optional enableAzure "azure"; + + buildInputs = [ + openssl + rdkafka + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + # many tests seem to require a running kafka instance + doCheck = false; + + meta = with lib; { + broken = stdenv.hostPlatform.isDarwin; + description = "Highly efficient daemon for streaming data from Kafka into Delta Lake"; + mainProgram = "kafka-delta-ingest"; + homepage = "https://github.com/delta-io/kafka-delta-ingest"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/by-name/ka/kafkactl/package.nix similarity index 100% rename from pkgs/development/tools/kafkactl/default.nix rename to pkgs/by-name/ka/kafkactl/package.nix diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/by-name/ka/kail/package.nix similarity index 100% rename from pkgs/tools/networking/kail/default.nix rename to pkgs/by-name/ka/kail/package.nix diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/by-name/ka/kaitai-struct-compiler/package.nix similarity index 100% rename from pkgs/development/compilers/kaitai-struct-compiler/default.nix rename to pkgs/by-name/ka/kaitai-struct-compiler/package.nix diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/by-name/ka/kakasi/package.nix similarity index 100% rename from pkgs/tools/text/kakasi/default.nix rename to pkgs/by-name/ka/kakasi/package.nix diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/by-name/ka/kalibrate-hackrf/package.nix similarity index 100% rename from pkgs/applications/radio/kalibrate-hackrf/default.nix rename to pkgs/by-name/ka/kalibrate-hackrf/package.nix diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/by-name/ka/kalibrate-rtl/package.nix similarity index 100% rename from pkgs/applications/radio/kalibrate-rtl/default.nix rename to pkgs/by-name/ka/kalibrate-rtl/package.nix diff --git a/pkgs/applications/science/biology/kalign/default.nix b/pkgs/by-name/ka/kalign/package.nix similarity index 100% rename from pkgs/applications/science/biology/kalign/default.nix rename to pkgs/by-name/ka/kalign/package.nix diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/by-name/ka/kalker/package.nix similarity index 100% rename from pkgs/tools/misc/kalker/default.nix rename to pkgs/by-name/ka/kalker/package.nix diff --git a/pkgs/servers/sip/kamailio/default.nix b/pkgs/by-name/ka/kamailio/package.nix similarity index 100% rename from pkgs/servers/sip/kamailio/default.nix rename to pkgs/by-name/ka/kamailio/package.nix diff --git a/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix b/pkgs/by-name/ka/kamailio/test-kamailio-bin/default.nix similarity index 100% rename from pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix rename to pkgs/by-name/ka/kamailio/test-kamailio-bin/default.nix diff --git a/pkgs/servers/ftp/kamid/default.nix b/pkgs/by-name/ka/kamid/package.nix similarity index 100% rename from pkgs/servers/ftp/kamid/default.nix rename to pkgs/by-name/ka/kamid/package.nix diff --git a/pkgs/development/interpreters/kamilalisp/default.nix b/pkgs/by-name/ka/kamilalisp/package.nix similarity index 100% rename from pkgs/development/interpreters/kamilalisp/default.nix rename to pkgs/by-name/ka/kamilalisp/package.nix diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix index 954527213054..4ac465dbc505 100644 --- a/pkgs/by-name/ka/kamp/package.nix +++ b/pkgs/by-name/ka/kamp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kamp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "vbauerster"; repo = pname; rev = "v${version}"; - hash = "sha256-9cakFhA9niMZ0jD0ilgCUztk4uL6wDp6zfHUJY/yLYw="; + hash = "sha256-JZe8z6OYJ+I0+dcq+sCoQPzlz6eB4z98jWj8MDXdODY="; }; - cargoHash = "sha256-BnVV0UnXEebq1kbQvv8PkmntLK0BwrOcMxxIODpZrxc="; + cargoHash = "sha256-+NiDSg7FJrtcNm/V0kn2kNQMJqOamE7Yl0sK/FSUYgA="; postInstall = '' install scripts/* -Dt $out/bin diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/by-name/ka/kanata/package.nix similarity index 100% rename from pkgs/tools/system/kanata/default.nix rename to pkgs/by-name/ka/kanata/package.nix diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 5456a4bd8b46..96eb5638661c 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -3,7 +3,6 @@ stdenv, buildNpmPackage, fetchFromGitHub, - overrideSDK, electron, nodejs, @@ -20,15 +19,10 @@ libXtst, libXi, wayland, - darwin, + apple-sdk_11, }: -let - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "kando"; version = "1.4.0"; @@ -64,7 +58,9 @@ buildNpmPackage' rec { libXi wayland ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; + ++ lib.optionals stdenv.isDarwin [ + apple-sdk_11 + ]; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index c2972b0778ed..710400154f25 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -28,16 +28,16 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.3.3"; + version = "1.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY="; + hash = "sha256-vKllSbJ44cO3FFIaf8rkhvKAVa2NG1Ps06VTzpi9xj0="; }; - cargoHash = "sha256-gJrzOK6vPPBgsQFkKrbMql00XSfKGjgpZhYJLTURxoI="; + cargoHash = "sha256-1mZm39l11eUjAGe0Oi9Mz94cb7DurfvUjCH5+GnA2Z0="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; @@ -55,14 +55,12 @@ rustPlatform.buildRustPackage rec { default_config_path = "/etc/kanidm/server.toml"; default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; - web_ui_pkg_path = "@web_ui_pkg_path@"; }; in '' cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \ - --replace '@htmx_ui_pkg_path@' "${placeholder "out"}/ui/hpkg" \ - --replace '@web_ui_pkg_path@' "${placeholder "out"}/ui/pkg" + --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg" ''; nativeBuildInputs = [ @@ -80,15 +78,14 @@ rustPlatform.buildRustPackage rec { # The UI needs to be in place before the tests are run. postBuild = '' - # We don't compile the wasm-part form source, as there isn't a rustc for - # wasm32-unknown-unknown in nixpkgs yet. mkdir -p $out/ui - cp -r server/web_ui/pkg $out/ui/pkg cp -r server/core/static $out/ui/hpkg ''; - # Otherwise build breaks on some unused code - env.RUSTFLAGS = "-A dead_code"; + # Upstream runs with the Rust equivalent of -Werror, + # which breaks when we upgrade to new Rust before them. + # Just allow warnings. It's fine, really. + env.RUSTFLAGS = "--cap-lints warn"; # 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 diff --git a/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch index afff94ca51e9..80bd4c16bd9b 100644 --- a/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch +++ b/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch @@ -1,6 +1,6 @@ -From 44dfbc2b9dccce86c7d7e7b54db4c989344b8c56 Mon Sep 17 00:00:00 2001 +From e9dfca73e6fb80faf6fc106e7aee6b93c0908525 Mon Sep 17 00:00:00 2001 From: oddlama -Date: Mon, 12 Aug 2024 23:17:25 +0200 +Date: Fri, 1 Nov 2024 12:26:17 +0100 Subject: [PATCH 1/2] oauth2 basic secret modify --- @@ -11,10 +11,10 @@ Subject: [PATCH 1/2] oauth2 basic secret modify 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs -index e00a969fb..1cacc67b8 100644 +index 732e826c8..0fe66503f 100644 --- a/server/core/src/actors/v1_write.rs +++ b/server/core/src/actors/v1_write.rs -@@ -315,20 +315,62 @@ impl QueryServerWriteV1 { +@@ -317,20 +317,62 @@ impl QueryServerWriteV1 { }; trace!(?del, "Begin delete event"); @@ -39,7 +39,7 @@ index e00a969fb..1cacc67b8 100644 + ) -> Result<(), OperationError> { + // Given a protoEntry, turn this into a modification set. + let ct = duration_from_epoch_now(); -+ let mut idms_prox_write = self.idms.proxy_write(ct).await; ++ let mut idms_prox_write = self.idms.proxy_write(ct).await?; + let ident = idms_prox_write + .validate_client_auth_info_to_ident(client_auth_info, ct) + .map_err(|e| { @@ -78,7 +78,7 @@ index e00a969fb..1cacc67b8 100644 filter: Filter, eventid: Uuid, diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs -index 8aba83bb2..f1f815026 100644 +index c410a4b5d..cc67cac6c 100644 --- a/server/core/src/https/v1.rs +++ b/server/core/src/https/v1.rs @@ -1,17 +1,17 @@ @@ -100,7 +100,7 @@ index 8aba83bb2..f1f815026 100644 use kanidm_proto::internal::{ ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest, CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest, -@@ -3119,20 +3119,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router { +@@ -3120,20 +3120,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router { ) .route( "/v1/oauth2/:rs_name/_image", @@ -126,7 +126,7 @@ index 8aba83bb2..f1f815026 100644 .delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete), ) diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs -index 5e481afab..a771aed04 100644 +index d3966a7ad..f89c02c69 100644 --- a/server/core/src/https/v1_oauth2.rs +++ b/server/core/src/https/v1_oauth2.rs @@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret( @@ -180,47 +180,10 @@ index 5e481afab..a771aed04 100644 tag = "v1/oauth2", operation_id = "oauth2_id_patch" diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs -index f3409649d..42e407b7d 100644 +index be1836345..ebf4445be 100644 --- a/server/lib/src/constants/acp.rs +++ b/server/lib/src/constants/acp.rs -@@ -645,34 +645,36 @@ lazy_static! { - Attribute::Image, - ], - modify_present_attrs: vec![ - Attribute::Description, - Attribute::DisplayName, - Attribute::OAuth2RsName, - Attribute::OAuth2RsOrigin, - Attribute::OAuth2RsOriginLanding, - Attribute::OAuth2RsSupScopeMap, - Attribute::OAuth2RsScopeMap, -+ Attribute::OAuth2RsBasicSecret, - Attribute::OAuth2AllowInsecureClientDisablePkce, - Attribute::OAuth2JwtLegacyCryptoEnable, - Attribute::OAuth2PreferShortUsername, - Attribute::Image, - ], - create_attrs: vec![ - Attribute::Class, - Attribute::Description, - Attribute::DisplayName, - Attribute::OAuth2RsName, - Attribute::OAuth2RsOrigin, - Attribute::OAuth2RsOriginLanding, - Attribute::OAuth2RsSupScopeMap, - Attribute::OAuth2RsScopeMap, -+ Attribute::OAuth2RsBasicSecret, - Attribute::OAuth2AllowInsecureClientDisablePkce, - Attribute::OAuth2JwtLegacyCryptoEnable, - Attribute::OAuth2PreferShortUsername, - Attribute::Image, - ], - create_classes: vec![ - EntryClass::Object, - EntryClass::OAuth2ResourceServer, - EntryClass::OAuth2ResourceServerBasic, - EntryClass::OAuth2ResourceServerPublic, -@@ -739,36 +741,38 @@ lazy_static! { +@@ -658,36 +658,38 @@ lazy_static! { Attribute::Image, ], modify_present_attrs: vec![ @@ -259,7 +222,7 @@ index f3409649d..42e407b7d 100644 create_classes: vec![ EntryClass::Object, EntryClass::OAuth2ResourceServer, -@@ -840,36 +844,38 @@ lazy_static! { +@@ -759,37 +761,39 @@ lazy_static! { Attribute::Image, ], modify_present_attrs: vec![ @@ -282,6 +245,7 @@ index f3409649d..42e407b7d 100644 Attribute::Class, Attribute::Description, Attribute::Name, + Attribute::DisplayName, Attribute::OAuth2RsName, Attribute::OAuth2RsOrigin, Attribute::OAuth2RsOriginLanding, @@ -298,6 +262,47 @@ index f3409649d..42e407b7d 100644 create_classes: vec![ EntryClass::Object, EntryClass::Account, +@@ -864,38 +868,40 @@ lazy_static! { + Attribute::OAuth2StrictRedirectUri, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::Name, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + Attribute::OAuth2StrictRedirectUri, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::Name, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + Attribute::OAuth2StrictRedirectUri, + ], + create_classes: vec![ + EntryClass::Object, -- -2.45.2 +2.46.1 diff --git a/pkgs/by-name/ka/kanidm/patches/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/recover-account.patch index a344f5a2086f..1ec61301f036 100644 --- a/pkgs/by-name/ka/kanidm/patches/recover-account.patch +++ b/pkgs/by-name/ka/kanidm/patches/recover-account.patch @@ -1,6 +1,6 @@ -From cc8269489b56755714f07eee4671f8aa2659c014 Mon Sep 17 00:00:00 2001 +From c8ed69efe3f702b19834c2659be1dd3ec2d41c17 Mon Sep 17 00:00:00 2001 From: oddlama -Date: Mon, 12 Aug 2024 23:17:42 +0200 +Date: Fri, 1 Nov 2024 12:27:43 +0100 Subject: [PATCH 2/2] recover account --- @@ -11,10 +11,10 @@ Subject: [PATCH 2/2] recover account 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs -index 40c18777f..40d553b40 100644 +index 420e72c6c..5c4353116 100644 --- a/server/core/src/actors/internal.rs +++ b/server/core/src/actors/internal.rs -@@ -153,25 +153,26 @@ impl QueryServerWriteV1 { +@@ -171,25 +171,26 @@ impl QueryServerWriteV1 { } #[instrument( @@ -29,7 +29,7 @@ index 40c18777f..40d553b40 100644 eventid: Uuid, ) -> Result { let ct = duration_from_epoch_now(); - let mut idms_prox_write = self.idms.proxy_write(ct).await; + let mut idms_prox_write = self.idms.proxy_write(ct).await?; - let pw = idms_prox_write.recover_account(name.as_str(), None)?; + let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?; @@ -95,10 +95,10 @@ index 90ccb1927..85e31ddef 100644 Some(ctrl_tx) => show_replication_certificate(ctrl_tx).await, None => { diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs -index 577995615..a967928c9 100644 +index 7486d34a8..784106352 100644 --- a/server/daemon/src/main.rs +++ b/server/daemon/src/main.rs -@@ -894,27 +894,39 @@ async fn kanidm_main( +@@ -903,27 +903,39 @@ async fn kanidm_main( } else { let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into(); submit_admin_req( @@ -169,5 +169,5 @@ index f1b45a5b3..9c013e32e 100644 /// Renew this server's replication certificate RenewReplicationCertificate { -- -2.45.2 +2.46.1 diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/by-name/ka/kanif/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kanif/default.nix rename to pkgs/by-name/ka/kanif/package.nix diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/by-name/ka/kaniko/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kaniko/default.nix rename to pkgs/by-name/ka/kaniko/package.nix diff --git a/pkgs/data/fonts/kanit/default.nix b/pkgs/by-name/ka/kanit-font/package.nix similarity index 100% rename from pkgs/data/fonts/kanit/default.nix rename to pkgs/by-name/ka/kanit-font/package.nix diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix similarity index 100% rename from pkgs/data/fonts/kanji-stroke-order-font/default.nix rename to pkgs/by-name/ka/kanji-stroke-order-font/package.nix diff --git a/pkgs/applications/misc/kanjidraw/default.nix b/pkgs/by-name/ka/kanjidraw/package.nix similarity index 100% rename from pkgs/applications/misc/kanjidraw/default.nix rename to pkgs/by-name/ka/kanjidraw/package.nix diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/by-name/ka/kanshi/package.nix similarity index 100% rename from pkgs/tools/wayland/kanshi/default.nix rename to pkgs/by-name/ka/kanshi/package.nix diff --git a/pkgs/by-name/ka/kapacitor/0001-fix-build.patch b/pkgs/by-name/ka/kapacitor/0001-fix-build.patch new file mode 100644 index 000000000000..04b3f624f485 --- /dev/null +++ b/pkgs/by-name/ka/kapacitor/0001-fix-build.patch @@ -0,0 +1,190 @@ +From 3a5c573079f427dcda47176137747806200551cb Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Fri, 27 Sep 2024 21:25:14 +0800 +Subject: [PATCH] fix build + +--- + flux-core/src/semantic/flatbuffers/types.rs | 6 +++--- + flux-core/src/semantic/nodes.rs | 5 ++--- + flux-core/src/semantic/sub.rs | 24 ++++++++++----------- + flux-core/src/semantic/types.rs | 5 +++-- + go/libflux/buildinfo.gen.go | 9 ++++---- + 5 files changed, 25 insertions(+), 24 deletions(-) + +diff --git a/flux-core/src/semantic/flatbuffers/types.rs b/flux-core/src/semantic/flatbuffers/types.rs +index c3eecf0..e7e1c95 100644 +--- a/flux-core/src/semantic/flatbuffers/types.rs ++++ b/flux-core/src/semantic/flatbuffers/types.rs +@@ -108,7 +108,7 @@ impl From> for Option { + for value in c.iter() { + let constraint: Option<(Tvar, Kind)> = value.into(); + let (tv, kind) = constraint?; +- cons.entry(tv).or_insert_with(Vec::new).push(kind); ++ cons.entry(tv).or_default().push(kind); + } + Some(PolyType { + vars, +@@ -345,9 +345,9 @@ where + builder.finished_data() + } + +-pub fn deserialize<'a, T: 'a, S>(buf: &'a [u8]) -> S ++pub fn deserialize<'a, T, S>(buf: &'a [u8]) -> S + where +- T: flatbuffers::Follow<'a> + flatbuffers::Verifiable, ++ T: flatbuffers::Follow<'a> + flatbuffers::Verifiable + 'a, + S: std::convert::From, + { + flatbuffers::root::(buf).unwrap().into() +diff --git a/flux-core/src/semantic/nodes.rs b/flux-core/src/semantic/nodes.rs +index 3213991..f64dbd4 100644 +--- a/flux-core/src/semantic/nodes.rs ++++ b/flux-core/src/semantic/nodes.rs +@@ -822,9 +822,8 @@ impl VariableAssgn { + // + // Note these variables are fixed after generalization + // and so it is safe to update these nodes in place. +- self.vars = p.vars.clone(); +- self.cons = p.cons.clone(); +- ++ self.vars.clone_from(&p.vars); ++ self.cons.clone_from(&p.cons); + // Update the type environment + infer.env.add(self.id.name.clone(), p); + Ok(()) +diff --git a/flux-core/src/semantic/sub.rs b/flux-core/src/semantic/sub.rs +index 2ca73e0..1431565 100644 +--- a/flux-core/src/semantic/sub.rs ++++ b/flux-core/src/semantic/sub.rs +@@ -481,7 +481,7 @@ where + } + + #[allow(clippy::too_many_arguments, clippy::type_complexity)] +-pub(crate) fn merge4( ++pub(crate) fn merge4( + a_original: &A, + a: Option, + b_original: &B, +@@ -492,10 +492,10 @@ pub(crate) fn merge4( + d: Option, + ) -> Option<(A::Owned, B::Owned, C::Owned, D::Owned)> + where +- A: ToOwned, +- B: ToOwned, +- C: ToOwned, +- D: ToOwned, ++ A: ToOwned + ?Sized, ++ B: ToOwned + ?Sized, ++ C: ToOwned + ?Sized, ++ D: ToOwned + ?Sized, + { + let a_b_c = merge3(a_original, a, b_original, b, c_original, c); + merge_fn( +@@ -515,7 +515,7 @@ where + .map(|((a, b, c), d)| (a, b, c, d)) + } + +-pub(crate) fn merge3( ++pub(crate) fn merge3( + a_original: &A, + a: Option, + b_original: &B, +@@ -524,9 +524,9 @@ pub(crate) fn merge3( + c: Option, + ) -> Option<(A::Owned, B::Owned, C::Owned)> + where +- A: ToOwned, +- B: ToOwned, +- C: ToOwned, ++ A: ToOwned + ?Sized, ++ B: ToOwned + ?Sized, ++ C: ToOwned + ?Sized, + { + let a_b = merge(a_original, a, b_original, b); + merge_fn( +@@ -542,15 +542,15 @@ where + + /// Merges two values using `f` if either or both them is `Some(..)`. + /// If both are `None`, `None` is returned. +-pub(crate) fn merge( ++pub(crate) fn merge( + a_original: &A, + a: Option, + b_original: &B, + b: Option, + ) -> Option<(A::Owned, B::Owned)> + where +- A: ToOwned, +- B: ToOwned, ++ A: ToOwned + ?Sized, ++ B: ToOwned + ?Sized, + { + merge_fn(a_original, A::to_owned, a, b_original, B::to_owned, b) + } +diff --git a/flux-core/src/semantic/types.rs b/flux-core/src/semantic/types.rs +index 6a0e292..685475a 100644 +--- a/flux-core/src/semantic/types.rs ++++ b/flux-core/src/semantic/types.rs +@@ -1327,7 +1327,7 @@ fn collect_record(record: &Record) -> (RefMonoTypeVecMap<'_, RecordLabel>, Optio + + let mut fields = record.fields(); + for field in &mut fields { +- a.entry(&field.k).or_insert_with(Vec::new).push(&field.v); ++ a.entry(&field.k).or_default().push(&field.v); + } + (a, fields.tail()) + } +@@ -1812,7 +1812,7 @@ impl PartialEq<&str> for Label { + + impl PartialOrd for Label { + fn partial_cmp(&self, other: &Self) -> Option { +- self.0.name().partial_cmp(other.0.name()) ++ Some(self.cmp(other)) + } + } + +@@ -2198,6 +2198,7 @@ impl Function { + pub(crate) trait TypeLike { + type Error; + fn typ(&self) -> &MonoType; ++ #[allow(dead_code)] + fn into_type(self) -> MonoType; + fn error(&self, error: Error) -> Self::Error; + } +diff --git a/go/libflux/buildinfo.gen.go b/go/libflux/buildinfo.gen.go +index 2d13f4a..266f493 100644 +--- a/go/libflux/buildinfo.gen.go ++++ b/go/libflux/buildinfo.gen.go +@@ -10,6 +10,7 @@ package libflux + // and forces the cgo library to rebuild and relink + // the sources. This is because non-C/C++ sources + // are not tracked by Go's build system.' ++// + //lint:ignore U1000 generated code + var sourceHashes = map[string]string{ + "libflux/Cargo.lock": "ec8537d38afbe08ecf451990b8c0a84ee4b30ee66d440d6525832c769764e44e", +@@ -41,17 +42,17 @@ var sourceHashes = map[string]string{ + "libflux/flux-core/src/semantic/env.rs": "8da036aa5f0e09f94fd2461687e97131068e56c762bef8cd98cfd91f36ef3e98", + "libflux/flux-core/src/semantic/flatbuffers/mod.rs": "270671ffdcb1eb5308f9bbab0431c9464df264070a2deb05c526d182a6ec5585", + "libflux/flux-core/src/semantic/flatbuffers/semantic_generated.rs": "beaaa6b08d8b56dba81153a58e440bbdc430b4eca0201a3431e90b793f1adbce", +- "libflux/flux-core/src/semantic/flatbuffers/types.rs": "029d51104eb4a0bbfc8d82a470e0f2915a27d7cb00c08a3f35e638b5a3105fc2", ++ "libflux/flux-core/src/semantic/flatbuffers/types.rs": "c378f78c87464d9ecd4dc86b4808c0268e3968adf3def0170c77ce78bb0200c9", + "libflux/flux-core/src/semantic/formatter/mod.rs": "8dd34520750a39ad242adfbb68c38a170d56bad82d5ccf80b165f0977ea68289", + "libflux/flux-core/src/semantic/fresh.rs": "97238fbc317e7c51836a6ba3441d641d9f4f8c7f637bde4bccbd0e09146129d0", + "libflux/flux-core/src/semantic/fs.rs": "f7f609bc8149769d99b737150e184a2d54029c0b768365dbcf08ff193b0e1f6f", + "libflux/flux-core/src/semantic/import.rs": "184e955211db1ceb1be782b4daf75584b86907b1428e50015497909cfc2dd89a", + "libflux/flux-core/src/semantic/infer.rs": "9d4293f2471a90cc89c1e45cdc72082e0da1a484981b803aea05856e6b4d722f", + "libflux/flux-core/src/semantic/mod.rs": "a70c32d73f0053e4a3eda7ad23626252cf6420b5db8b440a7351c2f62aa7a948", +- "libflux/flux-core/src/semantic/nodes.rs": "23ee2dec99b71f0fe81987528b3dfbd95e89d77a274ccc8a0baa146dea89ad51", +- "libflux/flux-core/src/semantic/sub.rs": "a989e50c113ca899fe02f8d49a4744a420580a3f803f656db25beb2d0c2a247b", ++ "libflux/flux-core/src/semantic/nodes.rs": "d5bff77bcb3de0e730b2a3f6d1245a12c718dfe3b8ecf937532330d2579ab53f", ++ "libflux/flux-core/src/semantic/sub.rs": "618713f4d14e9e2674204a9d293600692213327e77842cbe973c7b1715e23f24", + "libflux/flux-core/src/semantic/symbols.rs": "ddbceca632ca384c6bb461a660e02781c43295025f2dd10f1ea997131dd5eb30", +- "libflux/flux-core/src/semantic/types.rs": "ed414b695e925f18f74984ec88bba652ef8dd8c9e905cb9e8fa19b101a4601b4", ++ "libflux/flux-core/src/semantic/types.rs": "ae9cdcff357d217c0f744769a95b9f3bf55083f923df0c235f52de2b40be8f74", + "libflux/flux-core/src/semantic/vectorize.rs": "6ce2dc4e6ff572abc0146a220291322ea88557ce674ae16220a2d67420e9fa0d", + "libflux/flux-core/src/semantic/walk/_walk.rs": "c3d04e72cfbe595d4919b84f4df4bc6c55297516cf8e12e6cb691f48be648291", + "libflux/flux-core/src/semantic/walk/mod.rs": "f71aac086dd1d7b730e24bac690a3e47a9bfe575cd6cba499af67db9b920c726", +-- +2.46.0 + diff --git a/pkgs/servers/monitoring/kapacitor/fix-linting-error-on-unneeded-clone.patch b/pkgs/by-name/ka/kapacitor/fix-linting-error-on-unneeded-clone.patch similarity index 100% rename from pkgs/servers/monitoring/kapacitor/fix-linting-error-on-unneeded-clone.patch rename to pkgs/by-name/ka/kapacitor/fix-linting-error-on-unneeded-clone.patch diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix new file mode 100644 index 000000000000..3f58b489bc81 --- /dev/null +++ b/pkgs/by-name/ka/kapacitor/package.nix @@ -0,0 +1,128 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + fetchpatch, + libiconv, + buildGoModule, + pkg-config, +}: + +let + libflux_version = "0.171.0"; + flux = rustPlatform.buildRustPackage rec { + pname = "libflux"; + version = "${libflux_version}"; + src = fetchFromGitHub { + owner = "influxdata"; + repo = "flux"; + rev = "refs/tags/v${libflux_version}"; + hash = "sha256-v9MUR+PcxAus91FiHYrMN9MbNOTWewh7MT6/t/QWQcM="; + }; + patches = [ + # This fixes a linting error due to an unneeded call to `.clone()` + # that gets enforced by a strict `deny(warnings)` build config. + # This is already fixed with newer versions of `libflux`, but it + # has been changed in a giant commit with a lot of autmated changes: + # https://github.com/influxdata/flux/commit/e7f7023848929e16ad5bd3b41d217847bd4fd72b#diff-96572e971d9e19b54290a434debbf7db054b21c9ce19035159542756ffb8ab87 + # + # Can be removed as soon as kapacitor depends on a newer version of `libflux`, cf: + # https://github.com/influxdata/kapacitor/blob/v1.7.0/go.mod#L26 + ./fix-linting-error-on-unneeded-clone.patch + # https://github.com/influxdata/flux/commit/68c831c40b396f0274f6a9f97d77707c39970b02 + ./0001-fix-build.patch + + # https://github.com/influxdata/flux/pull/5273 + # fix compile error with Rust 1.64 + (fetchpatch { + url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch"; + stripLen = 2; + extraPrefix = ""; + hash = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; + }) + ]; + sourceRoot = "${src.name}/libflux"; + cargoHash = "sha256-yIYeJvLe+L72ZyuQ2AK6l4HGSF/tgCyGQsXEOWUXDn0="; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; + pkgcfg = '' + Name: flux + Version: ${libflux_version} + Description: Library for the InfluxData Flux engine + Cflags: -I/out/include + Libs: -L/out/lib -lflux -lpthread + ''; + passAsFile = [ "pkgcfg" ]; + postInstall = + '' + mkdir -p $out/include $out/pkgconfig + cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include + substitute $pkgcfgPath $out/pkgconfig/flux.pc \ + --replace-fail /out $out + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib + ''; + }; +in +buildGoModule rec { + pname = "kapacitor"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "kapacitor"; + rev = "refs/tags/v${version}"; + hash = "sha256-vxaLfJq0NFAJst0/AEhNJUl9dAaZY3blZAFthseMSX0="; + }; + + vendorHash = "sha256-myToEgta8R5R4v2/nZqtQQvNdy1kWgwklbQeFxzIdgs="; + + nativeBuildInputs = [ pkg-config ]; + + PKG_CONFIG_PATH = "${flux}/pkgconfig"; + + # Check that libflux is at the right version + preBuild = '' + flux_ver=$(grep github.com/influxdata/flux go.mod | awk '{print $2}') + if [ "$flux_ver" != "v${libflux_version}" ]; then + echo "go.mod wants libflux $flux_ver, but nix derivation provides ${libflux_version}" + exit 1 + fi + ''; + + # Remove failing server tests + preCheck = '' + rm server/server_test.go + rm pipeline/tick/*test.go + ''; + + checkFlags = + let + skippedTests = [ + "TestBatch_KapacitorLoopback" + ]; + in + [ + "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" + ]; + + # Tests start http servers which need to bind to local addresses, + # but that fails in the Darwin sandbox by default unless this option is turned on + # Error is: panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + # See also https://github.com/NixOS/nix/pull/1646 + __darwinAllowLocalNetworking = true; + + meta = { + description = "Open source framework for processing, monitoring, and alerting on time series data"; + homepage = "https://influxdata.com/time-series-platform/kapacitor/"; + downloadPage = "https://github.com/influxdata/kapacitor/releases"; + license = lib.licenses.mit; + changelog = "https://github.com/influxdata/kapacitor/blob/master/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + offline + totoroot + ]; + }; +} diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix similarity index 100% rename from pkgs/applications/audio/kapitonov-plugins-pack/default.nix rename to pkgs/by-name/ka/kapitonov-plugins-pack/package.nix diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/by-name/ka/kapowbang/package.nix similarity index 100% rename from pkgs/servers/kapowbang/default.nix rename to pkgs/by-name/ka/kapowbang/package.nix diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/by-name/ka/kapp/package.nix similarity index 100% rename from pkgs/tools/networking/kapp/default.nix rename to pkgs/by-name/ka/kapp/package.nix diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/by-name/ka/kappanhang/package.nix similarity index 100% rename from pkgs/applications/radio/kappanhang/default.nix rename to pkgs/by-name/ka/kappanhang/package.nix diff --git a/pkgs/by-name/ka/karabiner-elements/package.nix b/pkgs/by-name/ka/karabiner-elements/package.nix new file mode 100644 index 000000000000..f7c02f9bf9fa --- /dev/null +++ b/pkgs/by-name/ka/karabiner-elements/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + cpio, + xar, + undmg, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "karabiner-elements"; + version = "15.0.0"; + + src = fetchurl { + url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; + hash = "sha256-xWCsbkP9cVnDjWFTgWl5KrR7wEpcQYM4Md99pTI/l14="; + }; + + outputs = [ + "out" + "driver" + ]; + + nativeBuildInputs = [ + cpio + xar + undmg + ]; + + unpackPhase = '' + undmg $src + xar -xf Karabiner-Elements.pkg + cd Installer.pkg + zcat Payload | cpio -i + cd ../Karabiner-DriverKit-VirtualHIDDevice.pkg + zcat Payload | cpio -i + cd .. + ''; + + sourceRoot = "."; + + postPatch = '' + shopt -s globstar + for f in *.pkg/Library/**/Launch{Agents,Daemons}/*.plist; do + substituteInPlace "$f" \ + --replace-fail "/Library/" "$out/Library/" + done + ''; + + installPhase = '' + mkdir -p $out $driver + cp -R Installer.pkg/Applications Installer.pkg/Library $out + cp -R Karabiner-DriverKit-VirtualHIDDevice.pkg/Applications Karabiner-DriverKit-VirtualHIDDevice.pkg/Library $driver + + cp "$out/Library/Application Support/org.pqrs/Karabiner-Elements/package-version" "$out/Library/Application Support/org.pqrs/Karabiner-Elements/version" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${finalAttrs.version}"; + description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Ventura (13) or later"; + homepage = "https://karabiner-elements.pqrs.org/"; + license = lib.licenses.unlicense; + maintainers = [ ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/by-name/ka/karate/package.nix similarity index 100% rename from pkgs/development/tools/karate/default.nix rename to pkgs/by-name/ka/karate/package.nix diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix new file mode 100644 index 000000000000..f908979a7023 --- /dev/null +++ b/pkgs/by-name/ka/karlender/package.nix @@ -0,0 +1,91 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + pkg-config, + gtk4, + libadwaita, + wrapGAppsHook4, + glib, + tzdata, + nix-update-script, + dbus, + cargo-gra, + fetchpatch, +}: + +rustPlatform.buildRustPackage rec { + pname = "karlender"; + version = "0.10.4"; + + src = fetchFromGitLab { + owner = "floers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-W+s1RCPwy7ZiK514AaQLwV9y+VJ58oMGlrS5cdoFKIg="; + }; + + cargoPatches = [ + # https://gitlab.com/floers/calendar-stuff/karlender/-/merge_requests/43 + # Remove it when it is merged and released. + (fetchpatch { + url = "https://gitlab.com/floers/calendar-stuff/karlender/-/commit/ce50c68323a834a0ee2cbff88ed285a971dfd91e.patch"; + hash = "sha256-0hGgJPwnSNGTO/eiooQkQlBJ4brbaWVKRY6MT1PZApg="; + }) + ]; + + cargoHash = "sha256-CeHIx6oUtAcr6tBdqmIDTLuYcesaA6G72L3HwHDLY7Y="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib + cargo-gra + ]; + + buildInputs = [ + gtk4 + libadwaita + dbus + ]; + + checkFlags = [ + "--skip domain::time::tests::test_get_correct_offset_for_dst" # Need time + ]; + + preBuild = '' + cargo-gra gen + ''; + + postPatch = '' + substituteInPlace src/domain/time.rs --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + + postInstall = '' + substituteInPlace target/gra-gen/data/codes.loers.Karlender.desktop \ + --replace-fail "Exec=codes.loers.Karlender" "Exec=karlender" + substituteInPlace target/gra-gen/data/codes.loers.Karlender.appdata.xml \ + --replace-fail "codes.loers.Karlender" "karlender" + install -Dm444 target/gra-gen/codes.loers.Karlender.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.64.png -T $out/share/icons/hicolor/64x64/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.128.png -T $out/share/icons/hicolor/128x128/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.desktop -t $out/share/applications/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.appdata.xml -t $out/share/metainfo/ + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mobile-friendly GTK calendar application"; + mainProgram = "karlender"; + homepage = "https://gitlab.com/floers/karlender"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + chuangzhu + bot-wxt1221 + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/karma-runner/fix-package-lock.patch b/pkgs/by-name/ka/karma-runner/fix-package-lock.patch similarity index 100% rename from pkgs/development/tools/karma-runner/fix-package-lock.patch rename to pkgs/by-name/ka/karma-runner/fix-package-lock.patch diff --git a/pkgs/development/tools/karma-runner/default.nix b/pkgs/by-name/ka/karma-runner/package.nix similarity index 100% rename from pkgs/development/tools/karma-runner/default.nix rename to pkgs/by-name/ka/karma-runner/package.nix diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/by-name/ka/karma/package.nix similarity index 100% rename from pkgs/servers/monitoring/karma/default.nix rename to pkgs/by-name/ka/karma/package.nix diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/by-name/ka/kasmweb/package.nix similarity index 100% rename from pkgs/servers/web-apps/kasmweb/default.nix rename to pkgs/by-name/ka/kasmweb/package.nix diff --git a/pkgs/games/katago/default.nix b/pkgs/by-name/ka/katago/package.nix similarity index 100% rename from pkgs/games/katago/default.nix rename to pkgs/by-name/ka/katago/package.nix diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/by-name/ka/katana/package.nix similarity index 100% rename from pkgs/tools/security/katana/default.nix rename to pkgs/by-name/ka/katana/package.nix diff --git a/pkgs/games/katawa-shoujo/default.nix b/pkgs/by-name/ka/katawa-shoujo/package.nix similarity index 100% rename from pkgs/games/katawa-shoujo/default.nix rename to pkgs/by-name/ka/katawa-shoujo/package.nix diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/by-name/ka/kati/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/kati/default.nix rename to pkgs/by-name/ka/kati/package.nix diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/by-name/ka/kati/version.patch similarity index 100% rename from pkgs/development/tools/build-managers/kati/version.patch rename to pkgs/by-name/ka/kati/version.patch diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/by-name/ka/kaufkauflist/package.nix similarity index 100% rename from pkgs/applications/misc/kaufkauflist/default.nix rename to pkgs/by-name/ka/kaufkauflist/package.nix diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/by-name/ka/kawkab-mono-font/package.nix similarity index 100% rename from pkgs/data/fonts/kawkab-mono/default.nix rename to pkgs/by-name/ka/kawkab-mono-font/package.nix diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/pkgs/by-name/ka/kazam/fix-paths.patch similarity index 100% rename from pkgs/applications/video/kazam/fix-paths.patch rename to pkgs/by-name/ka/kazam/fix-paths.patch diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/by-name/ka/kazam/package.nix similarity index 100% rename from pkgs/applications/video/kazam/default.nix rename to pkgs/by-name/ka/kazam/package.nix diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix new file mode 100644 index 000000000000..f42f1f48afd8 --- /dev/null +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -0,0 +1,109 @@ +{ + lib, + fetchFromGitHub, + flutter, + stdenv, + webkitgtk_4_1, + alsa-lib, + libayatana-appindicator, + libepoxy, + autoPatchelfHook, + wrapGAppsHook3, + gst_all_1, + at-spi2-atk, + fetchurl, +}: +let + version = "1.4.1"; + src = fetchFromGitHub { + owner = "Predidit"; + repo = "Kazumi"; + rev = version; + hash = "sha256-LRlJo2zuE3Y3i4vBcjxIYQEDVJ2x85Fn77K4LVtTlg8="; + }; + mdk-sdk = fetchurl { + url = "https://github.com/wang-bin/mdk-sdk/releases/download/v0.29.1/mdk-sdk-linux-x64.tar.xz"; + hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0="; + }; +in +flutter.buildFlutterApplication { + pname = "kazumi"; + + inherit version src; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ + wrapGAppsHook3 + autoPatchelfHook + ]; + + buildInputs = [ + webkitgtk_4_1 + alsa-lib + at-spi2-atk + libayatana-appindicator + libepoxy + gst_all_1.gstreamer + gst_all_1.gst-vaapi + gst_all_1.gst-libav + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + ]; + + customSourceBuilders = { + flutter_volume_controller = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "flutter_volume_controller"; + inherit version src; + inherit (src) passthru; + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \ + --replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)' + ''; + installPhase = '' + runHook preInstall + mkdir $out + cp -r ./* $out/ + runHook postInstall + ''; + }; + fvp = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "fvp"; + inherit version src; + inherit (src) passthru; + installPhase = '' + runHook preInstall + tar -xf ${mdk-sdk} -C ./linux + mkdir $out + cp -r ./* $out/ + runHook postInstall + ''; + }; + }; + + gitHashes = { + desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; + webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="; + }; + + postInstall = '' + mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/ + cp ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications + cp ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png + ''; + + meta = { + description = "Watch Animes online with danmaku support"; + homepage = "https://github.com/Predidit/Kazumi"; + mainProgram = "kazumi"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json new file mode 100644 index 000000000000..c8ef02337d05 --- /dev/null +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -0,0 +1,1946 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "adaptive_theme": { + "dependency": "direct main", + "description": { + "name": "adaptive_theme", + "sha256": "f4ee609b464e5efc68131d9d15ba9aa1de4e3b5ede64be17781c6e19a52d637d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_video_progress_bar": { + "dependency": "direct main", + "description": { + "name": "audio_video_progress_bar", + "sha256": "552b1f73c56c4c88407999e0a8507176f60c56de3e6d63bc20a0eab48467d4c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "auto_injector": { + "dependency": "transitive", + "description": { + "name": "auto_injector", + "sha256": "d2e204bc46d7349795364884d07ba79fe6a0f3a84a651b70dcbb68d82dcebab0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.13" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "canvas_danmaku": { + "dependency": "direct main", + "description": { + "name": "canvas_danmaku", + "sha256": "3e5f72c169484898b6a2e0022fa66753f6d70adfa3be25f45748037ae99c2010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cookie_jar": { + "dependency": "direct main", + "description": { + "name": "cookie_jar", + "sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.8" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_webview_window": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "no_texture", + "resolved-ref": "109f1739727a71d8da60696143f5af91061faab2", + "url": "https://github.com/Predidit/linux_webview_window.git" + }, + "source": "git", + "version": "0.2.4" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "dio_cookie_manager": { + "dependency": "direct main", + "description": { + "name": "dio_cookie_manager", + "sha256": "e79498b0f632897ff0c28d6e8178b4bc6e9087412401f618c31fa0904ace050d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "dlna_dart": { + "dependency": "direct main", + "description": { + "name": "dlna_dart", + "sha256": "ae07c1c53077bbf58756fa589f936968719b0085441981d33e74f82f89d1d281", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.8" + }, + "expressions": { + "dependency": "transitive", + "description": { + "name": "expressions", + "sha256": "308a621b602923dd8a0cf3072793b24850d06453eb49c6b698cbda41a282e904", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.5+2" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_cache_manager": { + "dependency": "transitive", + "description": { + "name": "flutter_cache_manager", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_mobx": { + "dependency": "direct main", + "description": { + "name": "flutter_mobx", + "sha256": "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1+1" + }, + "flutter_modular": { + "dependency": "direct main", + "description": { + "name": "flutter_modular", + "sha256": "bc17a1eb1da676b9111e59d27834fb6673bdea01aead12f0803a0847ff9d451c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.4" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.23" + }, + "flutter_smart_dialog": { + "dependency": "direct main", + "description": { + "name": "flutter_smart_dialog", + "sha256": "7932ab58440379094c6a568efc329d322c6dd740e5a553080f2d56a71ed53752", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.8+3" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_volume_controller": { + "dependency": "direct main", + "description": { + "name": "flutter_volume_controller", + "sha256": "fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fvp": { + "dependency": "direct main", + "description": { + "name": "fvp", + "sha256": "439ff92c52349cb6c345f680dcbe7f7a40fcd524073030a1e93aec64f959d864", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.27.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.5" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "menu_base": { + "dependency": "transitive", + "description": { + "name": "menu_base", + "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mobx": { + "dependency": "direct main", + "description": { + "name": "mobx", + "sha256": "1f01a429529ac55e5e80c0fcad62c60112fb91df3dec11a9113d71cf0c2e2c4c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "mobx_codegen": { + "dependency": "direct dev", + "description": { + "name": "mobx_codegen", + "sha256": "f605e04444c5dbf8503f354577e7ad1e06887cff30ba20f147365d6130d580f7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "modular_core": { + "dependency": "transitive", + "description": { + "name": "modular_core", + "sha256": "bd60317c81cff3a510aca19d6ddd661c7c79e3cba97b9f39e9ad199156ff255d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.3" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "transitive", + "description": { + "name": "package_info_plus", + "sha256": "df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.12" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "result_dart": { + "dependency": "transitive", + "description": { + "name": "result_dart", + "sha256": "3c69c864a08df0f413a86be211d07405e9a53cc1ac111e3cc8365845a0fb5288", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "screen_brightness": { + "dependency": "direct main", + "description": { + "name": "screen_brightness", + "sha256": "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_pixel": { + "dependency": "direct main", + "description": { + "name": "screen_pixel", + "sha256": "b7310d81d98289ba1d6fb381ec95094b30b43ee1e901fefb65a3cf4de7d77e6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "scrollview_observer": { + "dependency": "direct main", + "description": { + "name": "scrollview_observer", + "sha256": "fa408bcfd41e19da841eb53fc471f8f952d5ef818b854d2505c4bb3f0c876381", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.22.0" + }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "shortid": { + "dependency": "transitive", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4+5" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1-1" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0+3" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tray_manager": { + "dependency": "direct main", + "description": { + "name": "tray_manager", + "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.4" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "video_player": { + "dependency": "direct main", + "description": { + "name": "video_player", + "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.2" + }, + "video_player_android": { + "dependency": "transitive", + "description": { + "name": "video_player_android", + "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.16" + }, + "video_player_avfoundation": { + "dependency": "transitive", + "description": { + "name": "video_player_avfoundation", + "sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "video_player_platform_interface": { + "dependency": "transitive", + "description": { + "name": "video_player_platform_interface", + "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.3" + }, + "video_player_web": { + "dependency": "transitive", + "description": { + "name": "video_player_web", + "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "wakelock_plus": { + "dependency": "direct main", + "description": { + "name": "wakelock_plus", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.8" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webdav_client": { + "dependency": "direct main", + "description": { + "name": "webdav_client", + "sha256": "682fffc50b61dc0e8f46717171db03bf9caaa17347be41c0c91e297553bf86b2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "webview_flutter": { + "dependency": "direct main", + "description": { + "name": "webview_flutter", + "sha256": "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "webview_flutter_android": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_android", + "sha256": "74693a212d990b32e0b7055d27db973a18abf31c53942063948cdfaaef9787ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "webview_flutter_platform_interface": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_platform_interface", + "sha256": "d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.10.0" + }, + "webview_flutter_wkwebview": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_wkwebview", + "sha256": "d4034901d96357beb1b6717ebf7d583c88e40cfc6eb85fe76dd1bf0979a9f251", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.0" + }, + "webview_windows": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "main", + "resolved-ref": "a32d483f4416628f1f6630592c0633f1f7c1d625", + "url": "https://github.com/Predidit/flutter-webview-windows.git" + }, + "source": "git", + "version": "0.4.0" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.2" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xpath_selector": { + "dependency": "direct main", + "description": { + "name": "xpath_selector", + "sha256": "6d8295565a34a6e2821a0721592e584c70421e52a0f54955e0c8e41963db7c90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "xpath_selector_html_parser": { + "dependency": "direct main", + "description": { + "name": "xpath_selector_html_parser", + "sha256": "ebc562a07832a4062a2bc1c238fd59a81d31d841f15460caeed412ce078af9e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.4" + } +} diff --git a/pkgs/tools/misc/kb/default.nix b/pkgs/by-name/kb/kb/package.nix similarity index 100% rename from pkgs/tools/misc/kb/default.nix rename to pkgs/by-name/kb/kb/package.nix diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/by-name/kb/kbd/package.nix similarity index 100% rename from pkgs/os-specific/linux/kbd/default.nix rename to pkgs/by-name/kb/kbd/package.nix diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/by-name/kb/kbd/search-paths.patch similarity index 100% rename from pkgs/os-specific/linux/kbd/search-paths.patch rename to pkgs/by-name/kb/kbd/search-paths.patch diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/by-name/kb/kbdd/package.nix similarity index 100% rename from pkgs/applications/window-managers/kbdd/default.nix rename to pkgs/by-name/kb/kbdd/package.nix diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/by-name/kb/kbdlight/package.nix similarity index 100% rename from pkgs/os-specific/linux/kbdlight/default.nix rename to pkgs/by-name/kb/kbdlight/package.nix diff --git a/pkgs/applications/networking/cluster/kbst/default.nix b/pkgs/by-name/kb/kbst/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kbst/default.nix rename to pkgs/by-name/kb/kbst/package.nix diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/by-name/kb/kbt/package.nix similarity index 100% rename from pkgs/applications/misc/kbt/default.nix rename to pkgs/by-name/kb/kbt/package.nix diff --git a/pkgs/development/tools/kcat/default.nix b/pkgs/by-name/kc/kcat/package.nix similarity index 100% rename from pkgs/development/tools/kcat/default.nix rename to pkgs/by-name/kc/kcat/package.nix diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/by-name/kc/kcgi/package.nix similarity index 100% rename from pkgs/development/web/kcgi/default.nix rename to pkgs/by-name/kc/kcgi/package.nix diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/by-name/kc/kcli/package.nix similarity index 100% rename from pkgs/development/tools/kcli/default.nix rename to pkgs/by-name/kc/kcli/package.nix diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/by-name/kc/kcov/package.nix similarity index 100% rename from pkgs/development/tools/analysis/kcov/default.nix rename to pkgs/by-name/kc/kcov/package.nix diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/by-name/kc/kcp/package.nix similarity index 100% rename from pkgs/development/libraries/kcp/default.nix rename to pkgs/by-name/kc/kcp/package.nix diff --git a/pkgs/data/themes/kde-gruvbox/default.nix b/pkgs/by-name/kd/kde-gruvbox/package.nix similarity index 100% rename from pkgs/data/themes/kde-gruvbox/default.nix rename to pkgs/by-name/kd/kde-gruvbox/package.nix diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/by-name/kd/kdigger/package.nix similarity index 100% rename from pkgs/tools/security/kdigger/default.nix rename to pkgs/by-name/kd/kdigger/package.nix diff --git a/pkgs/development/tools/kdoctor/default.nix b/pkgs/by-name/kd/kdoctor/package.nix similarity index 100% rename from pkgs/development/tools/kdoctor/default.nix rename to pkgs/by-name/kd/kdoctor/package.nix diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/by-name/ke/kea/dont-create-var.patch similarity index 100% rename from pkgs/tools/networking/kea/dont-create-var.patch rename to pkgs/by-name/ke/kea/dont-create-var.patch diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/by-name/ke/kea/package.nix similarity index 100% rename from pkgs/tools/networking/kea/default.nix rename to pkgs/by-name/ke/kea/package.nix diff --git a/pkgs/tools/networking/keama/default.nix b/pkgs/by-name/ke/keama/package.nix similarity index 100% rename from pkgs/tools/networking/keama/default.nix rename to pkgs/by-name/ke/keama/package.nix diff --git a/pkgs/games/keen4/default.nix b/pkgs/by-name/ke/keen4/package.nix similarity index 100% rename from pkgs/games/keen4/default.nix rename to pkgs/by-name/ke/keen4/package.nix diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/by-name/ke/keepalived/package.nix similarity index 100% rename from pkgs/tools/networking/keepalived/default.nix rename to pkgs/by-name/ke/keepalived/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix b/pkgs/by-name/ke/keepass-charactercopy/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/charactercopy/default.nix rename to pkgs/by-name/ke/keepass-charactercopy/package.nix diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/by-name/ke/keepass-diff/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-diff/default.nix rename to pkgs/by-name/ke/keepass-diff/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/by-name/ke/keepass-keeagent/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keeagent/default.nix rename to pkgs/by-name/ke/keepass-keeagent/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/by-name/ke/keepass-keepasshttp/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix rename to pkgs/by-name/ke/keepass-keepasshttp/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/by-name/ke/keepass-keepassrpc/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix rename to pkgs/by-name/ke/keepass-keepassrpc/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix b/pkgs/by-name/ke/keepass-keetraytotp/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix rename to pkgs/by-name/ke/keepass-keetraytotp/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/by-name/ke/keepass-otpkeyprov/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix rename to pkgs/by-name/ke/keepass-otpkeyprov/package.nix diff --git a/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix b/pkgs/by-name/ke/keepass-qrcodeview/package.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix rename to pkgs/by-name/ke/keepass-qrcodeview/package.nix diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index 45af2a1dc577..da3c446a801e 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "keepass"; - version = "2.57"; + version = "2.57.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip"; - hash = "sha256-emJ4QhhIaUowG4SAUzRK6hUendc/H6JH09Js2Ji9PQ0="; + hash = "sha256-97ZX1EzhMv4B3YZ3HoUqlGTEMsQn3cmNGr+uvS6AKYY="; }; sourceRoot = "."; diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/by-name/ke/keeperrl/package.nix similarity index 100% rename from pkgs/games/keeperrl/default.nix rename to pkgs/by-name/ke/keeperrl/package.nix diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/by-name/ke/keepmenu/package.nix similarity index 100% rename from pkgs/applications/misc/keepmenu/default.nix rename to pkgs/by-name/ke/keepmenu/package.nix diff --git a/pkgs/tools/security/keepwn/default.nix b/pkgs/by-name/ke/keepwn/package.nix similarity index 100% rename from pkgs/tools/security/keepwn/default.nix rename to pkgs/by-name/ke/keepwn/package.nix diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/by-name/ke/keet/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/keet/default.nix rename to pkgs/by-name/ke/keet/package.nix diff --git a/pkgs/tools/compression/keka/default.nix b/pkgs/by-name/ke/keka/package.nix similarity index 100% rename from pkgs/tools/compression/keka/default.nix rename to pkgs/by-name/ke/keka/package.nix diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/by-name/ke/kent/package.nix similarity index 100% rename from pkgs/applications/science/biology/kent/default.nix rename to pkgs/by-name/ke/kent/package.nix diff --git a/pkgs/tools/security/kepler/default.nix b/pkgs/by-name/ke/kepler/package.nix similarity index 100% rename from pkgs/tools/security/kepler/default.nix rename to pkgs/by-name/ke/kepler/package.nix diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/by-name/ke/kepubify/package.nix similarity index 100% rename from pkgs/tools/misc/kepubify/default.nix rename to pkgs/by-name/ke/kepubify/package.nix diff --git a/pkgs/tools/security/kerbrute/default.nix b/pkgs/by-name/ke/kerbrute/package.nix similarity index 100% rename from pkgs/tools/security/kerbrute/default.nix rename to pkgs/by-name/ke/kerbrute/package.nix diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/by-name/ke/kermit/package.nix similarity index 100% rename from pkgs/tools/misc/kermit/default.nix rename to pkgs/by-name/ke/kermit/package.nix diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/by-name/ke/kestrel/package.nix similarity index 100% rename from pkgs/tools/security/kestrel/default.nix rename to pkgs/by-name/ke/kestrel/package.nix diff --git a/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch b/pkgs/by-name/ke/kexec-tools/fix-purgatory-llvm-libunwind.patch similarity index 100% rename from pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch rename to pkgs/by-name/ke/kexec-tools/fix-purgatory-llvm-libunwind.patch diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/by-name/ke/kexec-tools/package.nix similarity index 100% rename from pkgs/os-specific/linux/kexec-tools/default.nix rename to pkgs/by-name/ke/kexec-tools/package.nix diff --git a/pkgs/by-name/ke/key/deps.json b/pkgs/by-name/ke/key/deps.json new file mode 100644 index 000000000000..ab34aaffc29a --- /dev/null +++ b/pkgs/by-name/ke/key/deps.json @@ -0,0 +1,688 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "ca/coglinc#javacc-gradle-plugin/2.4.0": { + "jar": "sha256-RsMHTru+ENUOzWkQpiYxCkE5FlZ5Ct0JF+kBp9afidw=", + "pom": "sha256-NTSsuHwtwH2hAqOP1wn1oANHgSkM+gcjPZTLXMOiyrA=" + }, + "ca/coglinc/javacc#ca.coglinc.javacc.gradle.plugin/2.4.0": { + "pom": "sha256-zmWjvt7VamHG21s6/cHApVuH6mvAewTxamaqn8DP2jw=" + }, + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.16.0": { + "pom": "sha256-t7fpzal2JnrDlnQg2XKuFdCUKpaOAao/w001t4FqJB8=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.36.0": { + "jar": "sha256-MZG1Gw6vUU0mzly9R+1gf9mrJj7QovAYqBkBYR+IbB4=", + "module": "sha256-8aXEkvFOqReh69NvxgccnJN2Zkla5crmxIo+Gk5ydWA=", + "pom": "sha256-nvcS3CwkJ9Hc7ZuCUwT2N2qsGrZbnW0weWVQaYqaJ5c=" + }, + "com/diffplug/spotless#spotless-lib/2.36.0": { + "jar": "sha256-X8YG5rHmDzRUljPq3WvjuL78W5phU4h1S2EpdShJ8W4=", + "module": "sha256-aPxoow80oNLAqh/z8l9Rq9OnJZFzX7cVR4YIARJjCCE=", + "pom": "sha256-XOa+58kXCmyUnZTvtzrRWbcBckyR3KT8kHWRfJ5aEMk=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.16.0": { + "jar": "sha256-4O/38KyEdJg/vJLxYwLHgq8VZueixfHaSoyWB9pMKhs=", + "module": "sha256-kT7gdWRyP7wqf62KiHFJvk8TpM65u775lF6m9fZt0Po=", + "pom": "sha256-c2VdzN3MnbLEY9abWSaedUrpw8ueVIIiDc1DvsE1TKM=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.16.1": { + "pom": "sha256-zuCrwdtD5X8obbNr6sQIQoTNfdVuayPBU6zP9FGWYVw=" + }, + "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.16.1": { + "pom": "sha256-ff5nBsj74D0Gxq7ogsJxrEpR8aTQBxJlCJK4eYQhTYM=" + }, + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "com/google/guava#guava-jdk5/17.0": { + "jar": "sha256-Wb9FZUe23aPO2WjLVvfy0+FEdOLeKWCjLEfjHB5FbGE=", + "pom": "sha256-+MFSYngT1FvE58wXrW7WpkmgIxroGf+44F0ZsgWj22Y=" + }, + "com/google/guava#guava-parent-jdk5/17.0": { + "pom": "sha256-WpYGvCdjKVazwR34h+mz54WFQGiqpOCAjtVmD2Cx+28=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/mycila#license-maven-plugin-parent/3.0": { + "pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o=" + }, + "com/mycila#license-maven-plugin/3.0": { + "jar": "sha256-Ul/o866FI9Be7ac2ZFxB6cMw8CV4K1s95u8Lqs8teMw=", + "pom": "sha256-kmJwjckIctcrvmfLFVITU6feJkgJzh6zLflfvqR2/IM=" + }, + "com/mycila#mycila-pom/3": { + "pom": "sha256-QCd6OyVlPuZDPEaFLacOlzbBmNlLyvbSw0cIqHOjGyY=" + }, + "com/mycila#mycila-xmltool/4.4.ga": { + "jar": "sha256-ddeyvpOBpl9vrDLzEIIhEvgFVm6fipekXY8Tz1UEnOA=", + "pom": "sha256-wMaee7roquvUQOFnjOn1AotD07ToHNQ26Y+BOkvDIrI=" + }, + "com/mycila/xmltool#xmltool/3.3": { + "jar": "sha256-hw+TlnieL0inuPso38BwwvjnSyAHJ0ziPmm2WBEP0pQ=", + "pom": "sha256-64P2FpRcjH37TYDm+QnnKG9SO7EQd4ArzSFr1w6ccXo=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.16.1": { + "jar": "sha256-vTz8QElIBmJZ+vHfCRGMxU14s9VpaFSAi31bOzurpi0=", + "pom": "sha256-XHYxuV84us2anPOguyxUlADYH1qSt2YCSA6KSFgWptQ=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "org/apache#apache/10": { + "pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-collections4/4.1": { + "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", + "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" + }, + "org/apache/commons#commons-lang3/3.4": { + "jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=", + "pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/37": { + "pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs=" + }, + "org/apache/commons#commons-parent/38": { + "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-pool2/2.2": { + "jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=", + "pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/apache/maven#maven-parent/21": { + "pom": "sha256-/EWviRHqMH0bV1ZO7x94tpgB6cEaVhnn61jV0Arp244=" + }, + "org/apache/maven#maven-settings-builder/3.0.4": { + "jar": "sha256-o4pU7B5pow3fwUQ04K7Cdk/CaGaKvMDhMthmkqXc4+Q=", + "pom": "sha256-Pgs/YCZ7YHCnQbFdtbQPvYJMYdsSofTxZu1li59i7OA=" + }, + "org/apache/maven#maven-settings/3.0.4": { + "jar": "sha256-Pj3xf1315M4ee38gEcV9YdMo5lZ4VCreIEjw0PopXwk=", + "pom": "sha256-vu3/18fkmtNe+UXDQT8YGfBOQ+opSjGARxTIy7DzcrM=" + }, + "org/apache/maven#maven/3.0.4": { + "pom": "sha256-TSI+AaZWnWZVwfT86Elp1FFCzbq9sRjqCMXIwz7GMvY=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/plexus#plexus-component-annotations/1.5.5": { + "jar": "sha256-Tfemp75ks1u8z2C1wRVpf56jQh0iZ0rmcTXd43X8yh8=", + "pom": "sha256-gV8+wxa4xfpwE4X99ACb+1HgfXgOj2puKv5yDFLX4pI=" + }, + "org/codehaus/plexus#plexus-components/1.1.18": { + "pom": "sha256-7128f6kYttu6cdJ+Wz16AN9iS8+iVJpyl/Nv4nX2NNc=" + }, + "org/codehaus/plexus#plexus-containers/1.5.5": { + "pom": "sha256-G8Jkgk7IdrDKb09YOBdcVBxjjLxDMmomi5rufUd4te8=" + }, + "org/codehaus/plexus#plexus-interpolation/1.14": { + "jar": "sha256-f8YzeNPoRmNhm5vtrOn5/niydsK+PGLKIkVEkpTIQXY=", + "pom": "sha256-0IFVxJffN7LD2bWw39sC7AUlsgcLW+Nzn//elC/Kya8=" + }, + "org/codehaus/plexus#plexus-utils/2.0.5": { + "pom": "sha256-Nbx9EhNhYjZXEHKyxW2hj3pXZY3otKQQBkW3BUorJzs=" + }, + "org/codehaus/plexus#plexus-utils/2.0.6": { + "jar": "sha256-i5CfTKl4hkeUL4g9TlWbzGQhI/fGvNOEaYOi5GVGnDM=", + "pom": "sha256-/drU+mLIIxCuxDUl5RnNWfJ9BMdWn+IbGwPKIQiHgQw=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/codehaus/plexus#plexus/2.0.6": { + "pom": "sha256-vqEudHcI0l5zQQyhxzHr36EC6L227H2BvUUiWDsjS8w=" + }, + "org/codehaus/plexus#plexus/2.0.7": { + "pom": "sha256-K1kGIDCrChXF0Jd7oiQhcGNokmSIc5pl8leT5xXMinQ=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.4.0.202211300538-r": { + "pom": "sha256-WEE7RzI80aRWLJNcZy1VGVUruaYRuQP8igcwXlQ7icU=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.4.0.202211300538-r": { + "jar": "sha256-wUh5ierbU71YpHty+waWNjl7uN/t8hOHpAqGw+ey+qw=", + "pom": "sha256-9ja7QmqoCtQGzr1zKrEXw9cHLBFsupggIYRSnO+mnFY=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/sonatype/forge#forge-parent/4": { + "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/plexus#plexus-cipher/1.4": { + "jar": "sha256-WhX9uiJmng/dBuENzOYyCHnh9zmPvJEM0Gd7UGcqeMQ=", + "pom": "sha256-pjouI5iMyn+sbJOIbW8FBv0m2I1+jMDLibnG4NbJlK0=" + }, + "org/sonatype/plexus#plexus-sec-dispatcher/1.3": { + "jar": "sha256-OwVZu4Qy8ok37+bKGT71SoUG0Addc/10BrmxFsahEGM=", + "pom": "sha256-1eZQxQ72lYwCjtAktZrwTPPTjhRTp31UK2tIS8D0ygs=" + }, + "org/sonatype/spice#spice-parent/12": { + "pom": "sha256-IaGbJtvlw43bURTPTq2/XMtBG8axKP3VlJscyxLzaD4=" + }, + "org/springframework#spring-asm/3.1.3.RELEASE": { + "jar": "sha256-za8dBwQOdREzok+Zesp9mOrL/mfhsoddzoynOCUngTA=", + "pom": "sha256-f7b7uYdEDEjGc9sVsIdwqcLWySBSBEIZl5z0j0ZvcSM=" + }, + "org/springframework#spring-core/3.1.3.RELEASE": { + "jar": "sha256-AUp7IdtoD9iGfgJrGMO/idME3sWyEJCotqezy1z8d9I=", + "pom": "sha256-8xqLb1m2oBgOOMnBKboGB7rnoNShC5U3V3DIFKtMx1M=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/springframework#spring-parent/3.1.3.RELEASE": { + "pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + } + }, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "backport-util-concurrent#backport-util-concurrent/3.1": { + "jar": "sha256-9XWbf838g6UloDbe7cvTLltTa2JevCgkJvFsoTfrWQI=", + "pom": "sha256-dwRxCQykChe55DbuLsAIGb5CBC2m9Ahezh03kW3Aj/k=" + }, + "ch/qos/logback#logback-classic/1.4.8": { + "jar": "sha256-5tnBIIv2ZMQnufX+lwuDcveUJHRzaTw/XSRA+mt7tSc=", + "pom": "sha256-GOI+XJts04m55gnu7km1XRURtdE6g+/2peAFAJPYadk=" + }, + "ch/qos/logback#logback-core/1.4.8": { + "jar": "sha256-EjRTFCtBtie8DQNdH+6MHtTer6z72svjojiTTBmgYno=", + "pom": "sha256-njguj3OLVBiXfjwQwcFZJuXwHn1QDVHZmqpQxqSerMw=" + }, + "ch/qos/logback#logback-parent/1.4.8": { + "pom": "sha256-83hJR2Jabz7XbSgtoOIuYVJ/kOfvllGm1ezx0mwY2mY=" + }, + "com/beust#jcommander/1.48": { + "jar": "sha256-pzE/z94HCTDkDsee3zxZSM805PDSXLOgn5lj2L3YQRM=", + "pom": "sha256-EH4aAn6KszS4H7KJYGDba68y430uME5glCNtPn6ymQM=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "com/miglayout#miglayout-core/11.1": { + "jar": "sha256-6qoDeHmJuuyi1xVYVFL3oWTYydUFkXcx6Zm0+ODZywQ=", + "pom": "sha256-TDxDWInIEEIAP7RqrD9Q1DqjNHCgJTaEEpFY+FmFu8I=" + }, + "com/miglayout#miglayout-parent/11.1": { + "pom": "sha256-vLy8hQYQqWkqV1US2xVPt+YMuXUrMzNKLeaqFZFP2xE=" + }, + "com/miglayout#miglayout-swing/11.1": { + "jar": "sha256-U8pq8ys32FhvuVCHZeJy30ry2Q5NWewMx/6+Jp0W2f0=", + "pom": "sha256-si//ijUkv+cV545/Ze+Fv1H9jGry06FmZxfEsWt6yh4=" + }, + "com/puppycrawl/tools#checkstyle/10.6.0": { + "jar": "sha256-MTe8hcSBsytp9K2S0grpnZ0VKBFXwCG2VBpNup2TPBY=", + "pom": "sha256-i/a3N1So+iHuzZCN8/HWbYcEWSnHWXdvoGQMTeiKnWg=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "info/picocli#picocli/4.7.0": { + "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=", + "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java/dev/javacc#javacc/4.0": { + "jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=", + "pom": "sha256-EBLeGTH+yhXhvQEomKaJBOXTO7TD6IhY+oagD7ePUDg=" + }, + "net/sf/retrotranslator#retrotranslator-runtime/1.2.9": { + "jar": "sha256-MHP6KzurGu5vBh7UqsUW3rmBh1az8znwWcyqmR/3dr0=", + "pom": "sha256-zKjdRXVKkGTSF0AxCUvz10Jc1nA76raZ19UjXC6S6Es=" + }, + "net/sf/retrotranslator#retrotranslator-transformer/1.2.9": { + "jar": "sha256-wcxGUGx4UV6dolMIBmz2U7qhuFL/Dnc29OhEWiwHhPc=", + "pom": "sha256-KbLlw9y352qBi+z9RBRnOvKgijjwWEEdpKxEbJyGfKA=" + }, + "net/sf/saxon#Saxon-HE/11.4": { + "jar": "sha256-QuNUlNwua16XJWrnzfK3zjBDnDUlZvNd4CvtOgaisWk=", + "pom": "sha256-zE2jTuC+5MZa2118spI0H2Wb76NSiPbjH4CdxLsvxXU=" + }, + "net/sourceforge/pmd#pmd-core/6.53.0": { + "jar": "sha256-TVRzW5uBXPrajO2Q3xneEmPJSXzOL5yXzXnPTeam0vM=", + "pom": "sha256-DDv8WArk966DtWEHdjjmirehC+BXeaEYG61upVqI5PQ=" + }, + "net/sourceforge/pmd#pmd-java/6.53.0": { + "jar": "sha256-1BIi8MXToBGU7Ryo5AAhKile4kmhmTZt7eDVd9pP6YE=", + "pom": "sha256-RWJKAFxNxC2McmSoXq79nbQautiJdcGRqLmJ8J78LxQ=" + }, + "net/sourceforge/pmd#pmd/6.53.0": { + "pom": "sha256-cCgPCSb7ENqySs3TsuGekorZ2iLZym4dL5a+aP6oPf0=" + }, + "net/sourceforge/saxon#saxon/9.1.0.8": { + "jar": "sha256-89zegQZsddtP/KNB1UNVXbu7p//3um0cLn3hEB3qOUo=", + "pom": "sha256-mwd5+pbfKagzvOMhjo25zAGGNgWy9zrePTCM4ff3kXk=" + }, + "net/sourceforge/saxon#saxon/9.1.0.8/dom": { + "jar": "sha256-xs8+zH9LZauLYT0A/Z6cBkilqgMmSpQboP0tpTOfkXo=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.1": { + "jar": "sha256-68nZvNtnVxwINf9EHq1cHekKJaDT+oQGVKFE6PoEENQ=", + "pom": "sha256-CzHPgFtmQ/oI9z3jibxVsCj++46caL1EfGFoz/32GcU=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr/3.5.3": { + "jar": "sha256-0KgZr929g3snhknrf/F7FSWdWsxJxYr2FPA0aKKRvXw=", + "pom": "sha256-lrg9SYzpdAOxtWgeV4Aaqbt74w6QWHMsyicf4GvJ2B8=" + }, + "org/antlr#antlr4-master/4.11.1": { + "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0=" + }, + "org/antlr#antlr4-master/4.13.0": { + "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.11.1": { + "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=", + "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ=" + }, + "org/antlr#antlr4-runtime/4.13.0": { + "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", + "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.13.0": { + "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=", + "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/httpcomponents#httpcomponents-parent/12": { + "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": { + "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.1.3": { + "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=", + "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": { + "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=", + "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": { + "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.1.3": { + "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=", + "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/beanshell#bsh/1.3.0": { + "jar": "sha256-mwTtx10Z21TxtOi1NV6TZDhMbPcesKG5ckwVnXeYefg=", + "pom": "sha256-DyaKBXFp+qO6hALh+8K54K4Z3voYt+xeC+hSvLoGgp0=" + }, + "org/checkerframework#checker-qual/3.27.0": { + "jar": "sha256-Jf2m8+su4hOf9dfTmSZn1Sbr8bD7h982/HWqNWeebas=", + "module": "sha256-H1L7VyqCR4PvVyPW0LejEUOz2JKpQerXur4OH/kWM30=", + "pom": "sha256-yXIt1Co1ywpkPGgAoo2sf8UXbYDkz2v4XBgjdzFjOrk=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.3": { + "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=", + "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=", + "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.3": { + "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=", + "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=", + "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o=" + }, + "org/junit/jupiter#junit-jupiter-params/5.9.3": { + "jar": "sha256-KvKC/pHlZJXAO4TpyucC6qIS/C9qMf2deeMcy2TNgf0=", + "module": "sha256-PDb9BY560Xk2w2qHkaXvks06slUbsVsYngURPhaA848=", + "pom": "sha256-HAzCQ766eIZChiVLRVKqvNUXrMMiAAJjaRxBUl/HtfY=" + }, + "org/junit/platform#junit-platform-commons/1.9.3": { + "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=", + "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=", + "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg=" + }, + "org/junit/platform#junit-platform-engine/1.9.3": { + "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=", + "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=", + "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U=" + }, + "org/junit/vintage#junit-vintage-engine/5.9.3": { + "jar": "sha256-a8G0IoKu2LnszbQGMc9FABr4qzrZ0Nhc/4bEXoX8WdA=", + "module": "sha256-903In7pI9S/PzSKUFEQbDXn4Cz5tgTsAvIuXT1K0bZE=", + "pom": "sha256-FISWCrLBD3mXJlEWmJuzsY21XJKfrFn96nS4ssd5WkY=" + }, + "org/key-project#docking-frames-base/1.1.3p1": { + "pom": "sha256-/MvGKkZ8j1YkC7AILbv5pM2X7wAYmstCBad/PrFbRgs=" + }, + "org/key-project#docking-frames-common/1.1.3p1": { + "jar": "sha256-sebcFL9BgtpRM9SPwzDECLg7J8l/HEkkiIUssda96ys=", + "pom": "sha256-3XvEh96tjyYXxiVJca+7ylNzrD3bdbLFB5o/pVdxqI8=" + }, + "org/key-project#docking-frames-core/1.1.3p1": { + "jar": "sha256-hXigFBxxS16XOpxffHemSIdXoXIIfmSBtcF04r5wBZc=", + "pom": "sha256-qkwVR2roScEeE8smsNB0dCJfr7r7B7wNoHkQtF6tV+c=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.3": { + "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=", + "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + }, + "org/ow2/asm#asm/9.5": { + "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", + "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" + }, + "org/reflections#reflections/0.10.2": { + "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", + "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" + }, + "org/slf4j#slf4j-api/2.0.7": { + "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", + "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + }, + "org/slf4j#slf4j-parent/2.0.7": { + "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + }, + "org/sonatype/oss#oss-parent/3": { + "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/xmlresolver#xmlresolver/4.4.3": { + "jar": "sha256-nWQslsP2gR4gqfbP7jyhXshOy5Ofa+Y5/uBlZwdzp9E=", + "module": "sha256-8GvLyo9h/M9XRtT+zEg+GgGNCYvVGRdxTH2wBCIA+Dc=", + "pom": "sha256-FGtXOSRyKmK1jnF2r2hgxoD4p3+XJsXiGHnJxAHtRkI=" + }, + "org/xmlresolver#xmlresolver/4.4.3/data": { + "jar": "sha256-pX2yPXXDWAyxXrbhqFRoP0V5z9Jl9c8QEaaYPZrtDx8=" + } + } +} diff --git a/pkgs/by-name/ke/key/package.nix b/pkgs/by-name/ke/key/package.nix new file mode 100644 index 000000000000..6888b5cdd35f --- /dev/null +++ b/pkgs/by-name/ke/key/package.nix @@ -0,0 +1,95 @@ +{ lib, stdenv +, fetchFromGitHub +, jdk +, gradle_8 +, jre +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, testers +, git +, key +}: + +let + gradle = gradle_8; + +in stdenv.mkDerivation rec { + pname = "key"; + version = "2.12.2"; + src = fetchFromGitHub { + owner = "KeYProject"; + repo = "key"; + rev = "refs/tags/KeY-${version}"; + hash = "sha256-veqaWyWEiTot2cAjvyPG+Ra8/pqS4i6w6iR+qhozIM4="; + }; + + nativeBuildInputs = [ + jdk + gradle + makeWrapper + copyDesktopItems + git + ]; + + desktopItems = [ + (makeDesktopItem { + name = "KeY"; + exec = meta.mainProgram; + icon = "key"; + comment = meta.description; + desktopName = "KeY"; + genericName = "KeY"; + categories = [ "Science" ]; + }) + ]; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + # tests are broken on darwin + # TODO: on update to 2.12.3+, restore to !stdenv.hostPlatform.isDarwin; + # (currently some tests are failing) + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + cp key.ui/build/libs/key-*-exe.jar $out/share/java/KeY.jar + mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/256x256/apps + cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png + makeWrapper ${lib.getExe jre} $out/bin/KeY \ + --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" + + runHook postInstall + ''; + + passthru.tests.version = + testers.testVersion { + package = key; + command = "KeY --help"; + }; + + meta = { + description = "Java formal verification tool"; + homepage = "https://www.key-project.org"; # also https://formal.iti.kit.edu/key/ + changelog = "https://keyproject.github.io/key-docs/changelog/"; + longDescription = '' + The KeY System is a formal software development tool that aims to + integrate design, implementation, formal specification, and formal + verification of object-oriented software as seamlessly as possible. + At the core of the system is a novel theorem prover for the first-order + Dynamic Logic for Java with a user-friendly graphical interface. + ''; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fgaz fliegendewurst ]; + mainProgram = "KeY"; + platforms = jdk.meta.platforms; + }; +} diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix index 5eca502af147..8efa645b49aa 100644 --- a/pkgs/by-name/ke/keycastr/package.nix +++ b/pkgs/by-name/ke/keycastr/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keycastr"; - version = "0.9.18"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip"; - hash = "sha256-q12c/W0yGoVL+wx+T/gaevx2P0Xwcv0a0FMv7bKfUnE="; + hash = "sha256-Ea/QtYiM7J2Gc5T8M+WizSBrgmhJ+NW4ern2A58glUk="; }; sourceRoot = "."; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/by-name/ke/keychain/package.nix similarity index 100% rename from pkgs/tools/misc/keychain/default.nix rename to pkgs/by-name/ke/keychain/package.nix diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix similarity index 100% rename from pkgs/servers/keycloak/all-plugins.nix rename to pkgs/by-name/ke/keycloak/all-plugins.nix diff --git a/pkgs/servers/keycloak/config_vars.patch b/pkgs/by-name/ke/keycloak/config_vars.patch similarity index 100% rename from pkgs/servers/keycloak/config_vars.patch rename to pkgs/by-name/ke/keycloak/config_vars.patch diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix similarity index 100% rename from pkgs/servers/keycloak/keycloak-discord/default.nix rename to pkgs/by-name/ke/keycloak/keycloak-discord/default.nix diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix similarity index 100% rename from pkgs/servers/keycloak/keycloak-metrics-spi/default.nix rename to pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix diff --git a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix similarity index 100% rename from pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix rename to pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix new file mode 100644 index 000000000000..95639d8047f6 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -0,0 +1,90 @@ +{ stdenv +, lib +, fetchzip +, makeWrapper +, jre +, nixosTests +, callPackage +, confFile ? null +, plugins ? [ ] +, extraFeatures ? [ ] +, disabledFeatures ? [ ] +}: + +let + featuresSubcommand = '' + ${lib.optionalString (extraFeatures != [ ]) "--features=${lib.concatStringsSep "," extraFeatures}"} \ + ${lib.optionalString (disabledFeatures != [ ]) "--features-disabled=${lib.concatStringsSep "," disabledFeatures}"} + ''; +in stdenv.mkDerivation rec { + pname = "keycloak"; + version = "26.0.5"; + + src = fetchzip { + url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; + hash = "sha256-BpXW+PN9kgHGshFwvrx2Tj5K0VXuVbT1VZgWl1ElSjI="; + }; + + nativeBuildInputs = [ makeWrapper jre ]; + + patches = [ + # Make home.dir and config.dir configurable through the + # KC_HOME_DIR and KC_CONF_DIR environment variables. + ./config_vars.patch + ]; + + buildPhase = '' + runHook preBuild + '' + lib.optionalString (confFile != null) '' + install -m 0600 ${confFile} conf/keycloak.conf + '' + '' + install_plugin() { + if [ -d "$1" ]; then + find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -m 0500 "{}" "providers/" \; + else + install -m 0500 "$1" "providers/" + fi + } + ${lib.concatMapStringsSep "\n" (pl: "install_plugin ${lib.escapeShellArg pl}") plugins} + '' + '' + patchShebangs bin/kc.sh + export KC_HOME_DIR=$(pwd) + export KC_CONF_DIR=$(pwd)/conf + bin/kc.sh build ${featuresSubcommand} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r * $out + + rm $out/bin/*.{ps1,bat,orig} + + runHook postInstall + ''; + + postFixup = '' + for script in $(find $out/bin -type f -executable); do + wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin + done + ''; + + passthru = { + tests = nixosTests.keycloak; + plugins = callPackage ./all-plugins.nix { }; + enabledPlugins = plugins; + }; + + meta = with lib; { + homepage = "https://www.keycloak.org/"; + description = "Identity and access management for modern applications and services"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.asl20; + platforms = jre.meta.platforms; + maintainers = with maintainers; [ ngerstle talyz nickcao ]; + }; + +} diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix similarity index 100% rename from pkgs/servers/keycloak/scim-for-keycloak/default.nix rename to pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix diff --git a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix similarity index 100% rename from pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix rename to pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/by-name/ke/keyd/package.nix similarity index 100% rename from pkgs/tools/inputmethods/keyd/default.nix rename to pkgs/by-name/ke/keyd/package.nix diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix similarity index 100% rename from pkgs/applications/audio/keyfinder-cli/default.nix rename to pkgs/by-name/ke/keyfinder-cli/package.nix diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/by-name/ke/keyfuzz/package.nix similarity index 100% rename from pkgs/tools/inputmethods/keyfuzz/default.nix rename to pkgs/by-name/ke/keyfuzz/package.nix diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index d1b62fc29aae..be2e151a0f94 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -2,17 +2,17 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://dl.google.com/dl/android/maven2": { - "androidx/activity#activity-compose/1.9.2": { - "module": "sha256-L3Jdm3GUbZ9FBOfFp768M7TsW8hwoSUb/dU/C1Zh6AU=", - "pom": "sha256-nYzZFp0iXZ48bJm7kC2xEFVMs7k7o7x3FML8tVbFw8E=" + "androidx/activity#activity-compose/1.9.3": { + "module": "sha256-+yJYhGSGHiedZtpv4kxZed2jS2m4RNI4DIq2eYxTMPk=", + "pom": "sha256-atgGcvLdAuuB/Hzl3OtAYenAl64WJnU+qWtPtlA/vtA=" }, - "androidx/activity#activity-ktx/1.9.2": { - "module": "sha256-Qqkke3aD9azp/srepo8rvNlepY1FUZvOJtdtc53iGMA=", - "pom": "sha256-xZIpvS4BeGpFRMcpFhIRpW5HkB1igrNvhD9Nl6MdbZ4=" + "androidx/activity#activity-ktx/1.9.3": { + "module": "sha256-MdDatmPQTZEaZ1iJMfhrEBEx4RaWu3KJWn5WA3F6wkE=", + "pom": "sha256-PIx4xqu50vaIXtgfKh2FewFLGaapoi9J2UIFAr/aKlM=" }, - "androidx/activity#activity/1.9.2": { - "module": "sha256-S2Kjf0hP+BCeWd6kisd7QIjTXCORT6ga88Rk1X9eK3Q=", - "pom": "sha256-JUcFSQUnpNsEe7eiVUrxCpAqHnm0YYVqolAs3OMkz6M=" + "androidx/activity#activity/1.9.3": { + "module": "sha256-fmok3aIF4csenJb6Nf9vJhYICH8x0yPUz/QrlxbX7Vc=", + "pom": "sha256-Pz4I4X2rXwdPqB25eL2lYmH7l8+eGS8zN4mM/YAaajQ=" }, "androidx/annotation#annotation-experimental/1.4.0": { "module": "sha256-WTDqfyH8ttDesroydIoO98j9LEI4SGBYK6fNIN65A3k=", @@ -22,12 +22,8 @@ "module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=", "pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs=" }, - "androidx/annotation#annotation-jvm/1.8.0": { - "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", - "module": "sha256-48tFJVOdDtdLsjjvksae7yKoDkIsDSrLxR5hh/67ChM=", - "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E=" - }, "androidx/annotation#annotation-jvm/1.8.1": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" }, @@ -65,13 +61,13 @@ "module": "sha256-VFHhsAgBaOJG7jVICY7iuEIqAHJ0GbNNw/NpDAO0Yn4=", "pom": "sha256-oVX2W6cA2yGiyIHd/g99z4WnMUcoeSPETvC51N2WZWg=" }, - "androidx/baselineprofile#androidx.baselineprofile.gradle.plugin/1.3.1": { - "pom": "sha256-BZQd/om3Iydt0EQl9joNOQZ9U6yNrnZ2hVVE+yeG2J0=" + "androidx/baselineprofile#androidx.baselineprofile.gradle.plugin/1.3.3": { + "pom": "sha256-ZYnvXw+bO8zqaMR+RNqnvYR0dmDhZxBQj1Wrsj3TJJo=" }, - "androidx/benchmark#benchmark-baseline-profile-gradle-plugin/1.3.1": { - "jar": "sha256-qDNAO89ka3bXSbQlXCHP0L9BG+ze6XDoJqn7qpLqE1M=", - "module": "sha256-j+nuWr7IfgX4NI92+gTX5Fy10knaB+uP5rfmkHwKLKw=", - "pom": "sha256-8MJDjRGVCHvxGlOt3hCrSz6TIn+S0QTzCxlkYS8OiTI=" + "androidx/benchmark#benchmark-baseline-profile-gradle-plugin/1.3.3": { + "jar": "sha256-TKAH2ltb/dN0oyfjMhbFYHfAX/NYhltKisnly3xTQBE=", + "module": "sha256-vxES0J8aprPfr5fyPn2DxdGY+JXEQ0SOloN9xdtGVOk=", + "pom": "sha256-nk9XEP4o1qFmNDXO0Pdo1N7pOA9j62QL6oouHVDMnFY=" }, "androidx/biometric#biometric-ktx/1.4.0-alpha02": { "module": "sha256-XlftRi6dw2P0RWxLf6eFe48clA3vatawHCMKVts0x20=", @@ -85,29 +81,29 @@ "module": "sha256-sTorfGTA8vNJoZ31EjYO2RemP4lPw94peh/eT7KHVGw=", "pom": "sha256-jJ19VEqBvl8eje0qT/R0wn6V1S1Qj1nUeSker3/gM38=" }, - "androidx/camera#camera-camera2/1.4.0-rc02": { - "module": "sha256-e7qskKx5eh7Ec8PHdsnx/cjyaKt21Ztqaj/5/qYtPcE=", - "pom": "sha256-Ca7pMgvmMOHdD97SbHkeE6PQbauA+GENC3ermmwYMx8=" + "androidx/camera#camera-camera2/1.4.0": { + "module": "sha256-drgu7NQwOhjrk/GIkO+iBqZ4bbRA9QTEgjhRy83DJ64=", + "pom": "sha256-K+q0XeFlcncn4+U0xXOI5WHUPA6WYWqb+EzbNLOhhYM=" }, - "androidx/camera#camera-core/1.4.0-rc02": { - "module": "sha256-gyKCSex584MOAOFd/FJYrJzltXb9tW06Y6TFeYoMe08=", - "pom": "sha256-hBesMfgTAskpCwxCS6N7HnIKOWBu6t1hDyODnSG2u/E=" + "androidx/camera#camera-core/1.4.0": { + "module": "sha256-YhzS8TFlQWPLeWci6brGUre2718uWInyveyK3lrev+c=", + "pom": "sha256-kIxHGTVflkb/V2A1BFxYfUT/2KEozDnMkxn3jvex6Rk=" }, - "androidx/camera#camera-extensions/1.4.0-rc02": { - "module": "sha256-Q9AvfZley507mYg6cV3UtIYL6ZwnyHZj0TmciLEh+MA=", - "pom": "sha256-rEE+UkUV2cWt9pBDpfLMXQLO+V4nqtwEHemlXTWxN+0=" + "androidx/camera#camera-extensions/1.4.0": { + "module": "sha256-ynxFG03NNyf2nnQUFDULo9T8q4ZTLdVuXZe4EbH5FrE=", + "pom": "sha256-qYJFwM6WPQVNBP0G3wNxjmyeRo0vOJDqNqW5CZAUbSo=" }, - "androidx/camera#camera-lifecycle/1.4.0-rc02": { - "module": "sha256-FDsXoLZr5ofKp+4YdJVZZSpUAMvupFhGNchhYCDi4SU=", - "pom": "sha256-3zwhtXWt5sROsYvjv14Igf1xgAH48wvjYkW7pNtIRNc=" + "androidx/camera#camera-lifecycle/1.4.0": { + "module": "sha256-ZdPS2POtzpQ4VYFP6fqKXZTb9vQmQJVge9O6ntIAGpw=", + "pom": "sha256-xxDllk/kVcjZ9tNHsMLdhL1Jngi+URow4z5HU0AmKZg=" }, - "androidx/camera#camera-video/1.4.0-rc02": { - "module": "sha256-CAQlCz+9htdQyszZo+KudN/z9zl08UZDAP3vJl7WHuM=", - "pom": "sha256-BONbwyqWaimMwtOf2kxaQnIELakH/4PjSzpXgPiV0P0=" + "androidx/camera#camera-video/1.4.0": { + "module": "sha256-mRe3EQjOtA+wIaLhCq6JgiryhDqxyENHUGtORuBtGMw=", + "pom": "sha256-q6ysRQwBXzE3zctyAwsYUiq4svySo7b1UKAVQ/z2slU=" }, - "androidx/camera#camera-view/1.4.0-rc02": { - "module": "sha256-ux6LqBw/KaL0NWgVYvQct5c90BPyUGbp04SCk1uoFmI=", - "pom": "sha256-UZd9Y9bxx6LUZArxhBvI5b7gy9hiard07IyL1M9q6Yc=" + "androidx/camera#camera-view/1.4.0": { + "module": "sha256-SGpo2BPphB1W23EWWgvjo3GLQ9xw5ecWDhIUmaPJ1S8=", + "pom": "sha256-9y8oiFiMIJat0Od1nc1ae6VSfl7bkqd3h86MFXhOr40=" }, "androidx/collection#collection-jvm/1.4.0": { "jar": "sha256-1c97cmR8eZUHFYj+hwRQ/5yPEn8lPS1IUeFhuAD2euA=", @@ -127,8 +123,8 @@ "androidx/compose#compose-bom/2023.10.01": { "pom": "sha256-brBsrckwx2qUp+PRzAYIkCdbYUJ7lpM9YFT09kHrGeE=" }, - "androidx/compose#compose-bom/2024.09.02": { - "pom": "sha256-m5ChXj8Tf1b7enp9aA0xZOtCXgJxuGD+4JK7pDB6h4k=" + "androidx/compose#compose-bom/2024.09.03": { + "pom": "sha256-TKZnMx2PrMhga+MI04mkwAlNuS2zfdZGmYyLESYNCeY=" }, "androidx/compose/animation#animation-android/1.7.1": { "module": "sha256-PFi192N3vQUR991Qv2VSPh+eCB7BwqSSRnpVw3x7Blo=", @@ -344,9 +340,9 @@ "module": "sha256-UOPdyUI2kQ5hRYijrCmm/XZbg526DMWDmkmNMYKX+I8=", "pom": "sha256-0cNjxT33H8deP2ehdUeUSeDdlB9FQJ8HJ3zNLUXopmE=" }, - "androidx/core#core-ktx/1.13.1": { - "module": "sha256-q1MLBOL75zIFSEiZo75WyQlohz60lvxS5ep1ltkQNdE=", - "pom": "sha256-Mcw0W4xs3SBG3PZ4ct+KjLT0TqDK3k34AALKp+O3GAk=" + "androidx/core#core-ktx/1.15.0": { + "module": "sha256-vum0RmT/N+LiIuvN5LMOOClKP5J0Ue3GEf7H9FT/pEI=", + "pom": "sha256-QXxqoCeex42wL+OV1AGgm8qqnYLZNRSKPi3pD9842Uw=" }, "androidx/core#core-splashscreen/1.2.0-alpha02": { "module": "sha256-gcUBgXOMI2x53hhnAYoawlCY7PSjIv3QhkVl0rfRrww=", @@ -356,13 +352,13 @@ "module": "sha256-Lg5uXBIFt0YqDFw+MrWMLlJUNYEu2JlGx75nN0k7UeM=", "pom": "sha256-RQLk7YtZEiAhrJocExLiMm5LD0P37Lu8m1Dud0KVdNQ=" }, - "androidx/core#core/1.13.1": { - "module": "sha256-KhCXm7s7zXslt/Zkq06bAW+r8hdKJnaLZ34S5L6kx8Q=", - "pom": "sha256-Unq/pajWr3SLN+HAFi0WM6LV6kOHsCBai0NrYhS6HPY=" + "androidx/core#core/1.15.0": { + "module": "sha256-6KbDhuF2XYcAEv7SIhFz1KLo0v1a7HMsUa+0qfRoRRk=", + "pom": "sha256-4WiuVgZLjlpAvOQV75X/1agTq7VFbSd18P70Ju1J41o=" }, - "androidx/credentials#credentials/1.5.0-alpha05": { - "module": "sha256-LN+mg+VI9ezkQHH5B3GOQpO3fpNH+hrwG6wALIR7CJE=", - "pom": "sha256-Or+sYjmkkUkdm91MTdxs9Z/rGHWe0Kb2uaWL/BFhKgE=" + "androidx/credentials#credentials/1.5.0-beta01": { + "module": "sha256-B/L48LIEgtXMj6HP7M1/FnOaQck7ca721Av14yIQ950=", + "pom": "sha256-rj8bwK/teqKqSRlXbhAZ3avOawZ/i6dBA988BWd8y+g=" }, "androidx/cursoradapter#cursoradapter/1.0.0": { "pom": "sha256-YtlciYUK8hAwsZ8U1ffs1ti8yaMBTFkALsmWJMqsgQA=" @@ -370,13 +366,13 @@ "androidx/customview#customview/1.0.0": { "pom": "sha256-zp5HuHGE9b1eE56b7NWyZHbULXjDG/L97cN6y0G5rUk=" }, - "androidx/databinding#databinding-common/8.7.0": { + "androidx/databinding#databinding-common/8.7.2": { "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", - "pom": "sha256-etTmwGJMO0eBWYYWQFMEuplOP77K/siKSjp7n7iG3aM=" + "pom": "sha256-AQGf9/Vhv2TVaegUbZt6csYkLy/b6toB+MgtUub0Js8=" }, - "androidx/databinding#databinding-compiler-common/8.7.0": { - "jar": "sha256-9MzA6vykpHvlv5ECCbmGrAkhtrW1LKob9KpSkA0kTt0=", - "pom": "sha256-zSUfiqqBlSb5RpTRRXf8VDOoGNA7FLGA2VdO78cYK0w=" + "androidx/databinding#databinding-compiler-common/8.7.2": { + "jar": "sha256-+BvLBHX5CY1U7RFBRSJY5Lk/4aihK14v97k7rKjicRQ=", + "pom": "sha256-2C3qfNGkIhr4HbOCWiEZBFM7SXrevHzN2GH6AESp/Y0=" }, "androidx/datastore#datastore-android/1.1.1": { "module": "sha256-cj7ozPSDglESIdoh4KPv3Nz1ix3kiU/drEBaFIERnCU=", @@ -416,114 +412,114 @@ "module": "sha256-rzJggI3OtlMu/C1yFb5Fhywkppna2n13v/c4zjuFp/A=", "pom": "sha256-+MoYd8ZuZCxVSQfhzlpJOol8opJwyxniu21CS6Q7bJg=" }, + "androidx/fragment#fragment/1.6.1": { + "module": "sha256-bXthnLEipKiiCSCHHbaohvOIQ/adLqqVISccLAi2NqA=", + "pom": "sha256-p7ITPxYF5+mMFRg27BYoyPBki4FWt3Yx8vIZbiTNOzA=" + }, "androidx/interpolator#interpolator/1.0.0": { "pom": "sha256-DdwHzDlpn0js2eyJS1gwwPCeIugpWSlO3zchciTIi3s=" }, "androidx/legacy#legacy-support-core-utils/1.0.0": { "pom": "sha256-j9CTAIs+58BuUseNoq+YCntHtpuWf6kdrXr0ZvegCjg=" }, - "androidx/lifecycle#lifecycle-common-jvm/2.8.6": { + "androidx/lifecycle#lifecycle-common-jvm/2.8.7": { "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=", - "module": "sha256-v8cWUtTFP6K8xNQV81odlVdxlmanhaGtYVtkGxgG5hQ=", - "pom": "sha256-eyfb/GATm8UCBnoPJovKa4lZl5oFpUu5Hq2euaMO//g=" + "module": "sha256-5IekwAfWq/KdAQg8M+KGls1Cz/z3FEidyR6Xw9QsYGA=", + "pom": "sha256-jwAH1nB0myxwwibXX+ODfGQ14bQANvHrgpB46QRhp+A=" }, - "androidx/lifecycle#lifecycle-common/2.8.6": { + "androidx/lifecycle#lifecycle-common/2.8.7": { "jar": "sha256-4mxtfQSkkMb9qhQVrJV5en3MdES+Pzqz2ayth9rkkhw=", - "module": "sha256-0CgJRRLgk9qZD6+uRvhrFOxzQdft+kVwneVRICfCLUo=", - "pom": "sha256-DWr4krkkdt+IY9YwIlSYET0zFKBiB4ILmV32e+MeAOk=" + "module": "sha256-DeePwG7lBF1o/H6BwxOio9U6x9En95+byVq/e+SeV2Q=", + "pom": "sha256-9Vz/SvKIUl1CXEZ43bNrqGRZH18O2huSIFZ8NshRO0k=" }, - "androidx/lifecycle#lifecycle-livedata-core-ktx/2.8.6": { - "module": "sha256-9xE2PFgyVHYR1BbIo6DcTmNi9K+wRQ0iuetXFlan+OU=", - "pom": "sha256-XGqveFJL0Qc92DnffeJLXrumDosGQOED7/GRvpsJ4tM=" + "androidx/lifecycle#lifecycle-livedata-core-ktx/2.8.7": { + "module": "sha256-PRiLtiL8uwIdk8wAfTxHfU9AKub1i3/EakQdCrcGeK0=", + "pom": "sha256-L+CUUbL5uqaNBcClSer9urSh5P69PvpHSraHXY5rJxw=" }, - "androidx/lifecycle#lifecycle-livedata-core/2.8.6": { - "module": "sha256-gkylmy7v2NtJMAvqT/afKNYfxFqK9ALlUVyJsvX7HCI=", - "pom": "sha256-uYdZtb80AXH4IGZnFnY6IoEhiPE63fygX+nfhJtIUtE=" + "androidx/lifecycle#lifecycle-livedata-core/2.8.7": { + "module": "sha256-sKHafx/jYGDseEfxlyhXokt9sp5s1FFuYsVSAAnYE8I=", + "pom": "sha256-5eML08Ctu0JGtP6vXTjgs+q25JWxJu6USX90kMo1FWo=" }, - "androidx/lifecycle#lifecycle-livedata-ktx/2.8.6": { - "module": "sha256-0g9Tn59yfEiiWd1gQSGzE4P594D4js0mKYbFc4XUfHU=", - "pom": "sha256-G9LZ96+nMgWYcC4ZoNG+EaAbNFlMyi0n239Bp1AtAz0=" + "androidx/lifecycle#lifecycle-livedata-ktx/2.8.7": { + "module": "sha256-QZCrI+E7vNbMP10HN7Rfg6QAQQR4Col8/YaX4CQhyJU=", + "pom": "sha256-kgv4IXw/1fkO03KmqIenBXnDiaHt3qoHiC7389ywPcc=" }, - "androidx/lifecycle#lifecycle-livedata/2.8.6": { - "module": "sha256-nOWJiUmAb5rhNuPZijI+Hg21HI+JJcaMCIp3/n70k+U=", - "pom": "sha256-8hb3WxZ6ZcoVWslLvQBt7wqY2SFZcM45gZY64kT5X+E=" + "androidx/lifecycle#lifecycle-livedata/2.8.7": { + "module": "sha256-1yUWz854vvZU/l30yZudq9GXgMlQUyaKbVtLDdotQyM=", + "pom": "sha256-0yTLeFE01Bl1dwkRj4biqI88wLIivYwjSV3by3qADKw=" }, - "androidx/lifecycle#lifecycle-process/2.8.6": { - "module": "sha256-csIIGfPJOQ+RrNnfj7yeYkbxvvTgj9UfeQ8BzaBArSw=", - "pom": "sha256-QCOkIKHiGSOrNWYx4s5wDgTlP9ykNaFJ3GUuIITmt+I=" + "androidx/lifecycle#lifecycle-process/2.8.7": { + "module": "sha256-mKHAjBDP1L2qienCVqm5bAnN1bz7sDqSYIF6bYnMI3g=", + "pom": "sha256-gbo66f/iWUvyGjXhgctTzns5bzV/fDy/++j906IzAzk=" }, - "androidx/lifecycle#lifecycle-runtime-android/2.8.6": { - "module": "sha256-kzdNZnU93hHZc12V5Y9PvJxXezJBjOCT5KOCIAfxJXE=", - "pom": "sha256-PgirDNhskFhYcxQroie35d1GlRsWRA8LT8o+vokFMfU=" + "androidx/lifecycle#lifecycle-runtime-android/2.8.7": { + "module": "sha256-TRs4gcmNQpNMuNXefIqeEgSVSaUUdxhkfXvmym2VjEY=", + "pom": "sha256-KMsZDeh94F08Gk92dNH0WLerk151z4O6KLFTm1+pPBo=" }, - "androidx/lifecycle#lifecycle-runtime-compose-android/2.8.6": { - "module": "sha256-EP6/9T6cZWTGGOd0pouKhYcN/SqUFe6/LV+oc+ARo2U=", - "pom": "sha256-bf2cbBp3F29E+yj+hW/mVzDHFWA2Qs1Q8+gLxYcBJrU=" + "androidx/lifecycle#lifecycle-runtime-compose-android/2.8.7": { + "module": "sha256-wCShZpTItcQeyO8O3iNl62Evij2iUBf98v80MCnzOQI=", + "pom": "sha256-DMi8bSk7qjYAj3HfaNrMZWx2D/6y8CsxNKY23LlHBeU=" }, - "androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.6": { - "jar": "sha256-ZR05Mr5ztRprhMzoiy7e7yGmr6YRGxgyfdB3Luw6HAo=", - "module": "sha256-8QsiOV9fXhpxteQqzt2qrIl+oRL0krO3Z0jysC+AP+I=", - "pom": "sha256-rx0/38DbtoYQOgB12MzK9Mt4DylAFZEEOMkF8s7MmII=" + "androidx/lifecycle#lifecycle-runtime-compose-jvmstubs/2.8.7": { + "jar": "sha256-+P5MfIt9nJzBfmA5L2T2FZD4WJU/WSNzqwyN3VrRGmg=", + "module": "sha256-5u7rnaQ7LvUAAI6coqmTMwDFfR0KoFyPO9MRMajSo1s=", + "pom": "sha256-iP5IfROOI3S8g8ZOBZyG3dG49V/45/7pHypoF9o7ot8=" }, - "androidx/lifecycle#lifecycle-runtime-compose/2.8.6": { - "jar": "sha256-Gs44yUcMeOiXHrzfjQOQvmQBD8hpp/08bl6vEDcOwbo=", - "module": "sha256-39DkQkEBKxPZVfF0Kr1O0YPKykHuCdXCzF/N0qJPCBk=", - "pom": "sha256-RbZBVmSy/2MkRlaDAgVFzKiJIB81rCswFYPjliyi+w0=" + "androidx/lifecycle#lifecycle-runtime-compose/2.8.7": { + "jar": "sha256-u1SJyb9WG3rdz/QXmxD5WbPUQaoPuuXC0kqQZZE/ohI=", + "module": "sha256-zJiohJ2B2rMGS8n/hx5D6RtI4Lp9Uh98mbomr+wlZXw=", + "pom": "sha256-zskvxmBNjuu5WJpsEdS75jYigPY62/hqns3GzD0UO6s=" }, - "androidx/lifecycle#lifecycle-runtime-desktop/2.8.6": { + "androidx/lifecycle#lifecycle-runtime-desktop/2.8.7": { "jar": "sha256-EL/lO7J1L5Z3UaUQLNt4Xu6lTh1N9r3oj7D1CwpJFWw=", - "module": "sha256-kq1WHlcSsxhBF7sMm4tES+8q0F5nZXR8n44VnEniHj8=", - "pom": "sha256-IY6pUIUJKL/ENIJv+OLr2X0XpCEbvwDDrNUelnc4SlE=" + "module": "sha256-1Av71SuALGpa8GMW9goihG5ljRLXw/xe+lqorJ1LAvo=", + "pom": "sha256-zvqomZ96sPTkSmm+lCK7LxJPBqYmZjQ+uus3fjCLlw4=" }, - "androidx/lifecycle#lifecycle-runtime-ktx-android/2.8.6": { - "module": "sha256-GEkqX9thU9CUKzZ9k2d4gAdCguPwXYm6W+erH92zSUk=", - "pom": "sha256-aw/cGAmhTDJyRutN5dou3tT/ibHMSitmV3K3Ug6pBJ8=" + "androidx/lifecycle#lifecycle-runtime-ktx-android/2.8.7": { + "module": "sha256-rcYVIeiU8WO+7jrtyMTA37WZFmO4jqHqd5j6yVaU4X0=", + "pom": "sha256-Htpm9jgGDNOY5EiW+TTCc/ADuejtNplc/fPrEx8HI2U=" }, - "androidx/lifecycle#lifecycle-runtime-ktx/2.8.6": { - "module": "sha256-bsekXvsY7kq/BTAqtTioEeRqzhEYpTCJ+C7DXwnh1QY=", - "pom": "sha256-kZTdaFi55iUSc4uisOLBVBtR32e+YSxHaob5zLyHEwE=" + "androidx/lifecycle#lifecycle-runtime-ktx/2.8.7": { + "module": "sha256-Ccbc8P7irWnFI9tsKjQxaKjZ6dJ3Q8+Etpx1e3/KskM=", + "pom": "sha256-sONluppAXk2pi58FCLmRzXb01aaCKQhHJMUFDied/BI=" }, - "androidx/lifecycle#lifecycle-runtime/2.8.6": { + "androidx/lifecycle#lifecycle-runtime/2.8.7": { "jar": "sha256-TueEUw5VB1QjA5XU9PVoF8n8vAjbTWRed0QfPdgsVrU=", - "module": "sha256-cfO/aHhz8W79hNrL46H0IdGWlQsi2aMO8wqRGfp8fOA=", - "pom": "sha256-YcWBu6Kgb5Y3B5XnzRrSfiyCvufTsqh1jeJT4pYWW0w=" + "module": "sha256-ywDly5KDt1lI3MDScjT7bXKoDDTct7O41JMYXkMWv4U=", + "pom": "sha256-YeEGnpk4pBTWv4OmwIjIpDaKJ6sjjmLvuN5E6dbqMfo=" }, - "androidx/lifecycle#lifecycle-viewmodel-android/2.8.6": { - "module": "sha256-fp3IlBPMdIWxRiHbXM8eEwZo8UY2iw/+ZuDzDNKqZQI=", - "pom": "sha256-RUUiujSKDyqMwil3K9v3JzxS0aQu0CS8je/OVdxT9nM=" + "androidx/lifecycle#lifecycle-viewmodel-android/2.8.7": { + "module": "sha256-sEmUzmfWmZQ4MW/0Gy3bhGE6ZLj4E5nvMHSJWtgQZdw=", + "pom": "sha256-s3waQR7rmHfw8leD0eyuz1ZWuEQsVEU4gEbmmqznxrA=" }, - "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.8.6": { - "module": "sha256-JeRZ8PXWrPI80LwtFSzjlAfV8OpFlJ6BwsQAI/KUW8Y=", - "pom": "sha256-EK7C8fM984U3WZV4EQd/cBINVsfuLnm66vSGG0w2XqY=" + "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.8.7": { + "module": "sha256-AysPqJLMBM7TnExfDHPloBSNoIR79L+3b8J14UPUjog=", + "pom": "sha256-TZIH05CtwnAzrm/o5nQefQ+DH4EQaIHf51o1y47mmAQ=" }, - "androidx/lifecycle#lifecycle-viewmodel-compose/2.8.6": { - "module": "sha256-IE/2DG0V2F/F3NykERxVr46JiTgkxBu3u+CAYj8NhRs=", - "pom": "sha256-SM5k+9vFkrDyhlWdrWnbYhx0q8ydapBv6McTZstw2H0=" + "androidx/lifecycle#lifecycle-viewmodel-compose/2.8.7": { + "module": "sha256-BRqR7t2IwYtSLEt7VA+TYQhe9EbyIjyhZYnZjtYmrHg=", + "pom": "sha256-7hQf0QJPhZOnqeLt7Ba8E50vj1X+/e4xSyVvBWLlq1w=" }, - "androidx/lifecycle#lifecycle-viewmodel-desktop/2.8.6": { + "androidx/lifecycle#lifecycle-viewmodel-desktop/2.8.7": { "jar": "sha256-IewOd9wC7Q1r/m88un9D4lQARG2J3thWjuFlQ34MGSI=", - "module": "sha256-wTRuA275rdk8d9bsI6BpBxGxErMYbi9b2HUJDQOCwxo=", - "pom": "sha256-+BLmr3NVnIgfejWPPN0ejd2GE4m3b2nomvRnqOBs8BA=" + "module": "sha256-WA2ZXD2wdDeY8sFz5jzxnIDUpxmZwgOaR2a2x8cQbWQ=", + "pom": "sha256-ohtgR3xEXNBIpmJuD2goSip9TJ0SEBATb07N8FqOa5E=" }, - "androidx/lifecycle#lifecycle-viewmodel-ktx/2.8.6": { - "module": "sha256-5cgGQ2qPGgZRkBPj41Hrlqc3Z6XjmQEpxxzetlL/4+8=", - "pom": "sha256-KJw1DgKA0MTpts9FuRJrItv+1E7myHHyM3dP1wwUQs0=" + "androidx/lifecycle#lifecycle-viewmodel-ktx/2.8.7": { + "module": "sha256-qZ49Ahjukr2o9cHr8l1IMrMB71gQYE4uluS2B+v2p/U=", + "pom": "sha256-kzgneQTN8EjY8dNZ+uVTejUMZPDeFrcf+k4gpCPIp8I=" }, - "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.6.1": { - "module": "sha256-2vuGSXY9KcKc2ie8IvzauanvxTwP/5rj3pCILquqiUQ=", - "pom": "sha256-qjTLhYY4S44xTP1lsYExl/Mve6cdJSmhHAcerwJ0Hls=" - }, - "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.8.6": { - "module": "sha256-hrNlXUG+xPLHkUREjIPG7HHD3WATQtX9uNNH3wxMniQ=", - "pom": "sha256-1ltx+CJUqXqhyA75V7ln/wMjCfvTbcv/Xq/rY0Q1sRI=" + "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.8.7": { + "module": "sha256-urIsBn8lV3pqwzToaCQUgYBz6fRFA40ZA5yQ+HFvv20=", + "pom": "sha256-m5HFWPwxzZpBgaQQ3bk2g1nLAjYqUK9koaMKEsPVwak=" }, "androidx/lifecycle#lifecycle-viewmodel/2.6.1": { "module": "sha256-K0BvrqXBLyuN9LemCTH4RmSPLh9NeDYeGY0RhPGaR5c=", "pom": "sha256-3C6OZdtT0hZZon7ZO5Zt7jNsHC6OhyhhZ3OJqZuLkTQ=" }, - "androidx/lifecycle#lifecycle-viewmodel/2.8.6": { - "module": "sha256-T/VDcJ4IUwF2erNzpbuFMkbWUh3JEBRwLv12fE3Ho4k=", - "pom": "sha256-3N7kezp5ve43ESOTrpb4V78BNerUVS8WJ6ZzIltvDNE=" + "androidx/lifecycle#lifecycle-viewmodel/2.8.7": { + "module": "sha256-8dgh/BgDbdIMwh/74C9UcSC/AFHgaunhl3FAITyTQ3I=", + "pom": "sha256-7h37GDtTqmIzrVLtp6dU9y2Vptttyi85FEoWDetBlfs=" }, "androidx/loader#loader/1.0.0": { "pom": "sha256-yXjVUICLR0NKpJpjFkEQpQtVsLzGFgqTouN9URDfjF4=" @@ -622,24 +618,24 @@ "androidx/viewpager#viewpager/1.0.0": { "pom": "sha256-H3L4NjOdA8brAT9lB152yocHWld1eOtPlfdKOl0lMSg=" }, - "androidx/work#work-runtime-ktx/2.9.1": { - "module": "sha256-cR+5UijQc0faUgid+10ZXFGgfddVKK1RR0w5cZavs1w=", - "pom": "sha256-EIx091ygy16ACVdo8o9Sn3aqg1CDjvji6XNTxkUdXTg=" + "androidx/work#work-runtime-ktx/2.10.0": { + "module": "sha256-gKptxuwMwhBHXIIKbTbcgQDV2prvfMysCBFpoaJQKwQ=", + "pom": "sha256-EnN38XWHfslygvmN0j5x48H37JSaoMLQKkUNtN0FhL0=" }, - "androidx/work#work-runtime/2.9.1": { - "module": "sha256-1UTtZMXLoYYflvSKzfFfegaJTzZ1oWqoFamfOqKQlGs=", - "pom": "sha256-2XC71x8rkoV4oAUexALJzKZxDV5ox96G/69eiHBr1dw=" + "androidx/work#work-runtime/2.10.0": { + "module": "sha256-RlwbR1AJLr8LAx4G7P2AEffhWs6NzLHkxH1An3e+y6A=", + "pom": "sha256-GuzFFWca/IS1/1so1Yle+0Q93atJ3VzHQAl2oc/FEMk=" }, - "com/android#signflinger/8.7.0": { + "com/android#signflinger/8.7.2": { "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", - "pom": "sha256-3nZoa+311WsNLgStx7IEthYqUrUwNg3klHY0uaTWfGA=" + "pom": "sha256-+Nlz5WpB7x6khOXP7m2aIFcyrTGov5xBpGjcH/oKsJU=" }, - "com/android#zipflinger/8.7.0": { + "com/android#zipflinger/8.7.2": { "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", - "pom": "sha256-n5w8SGypunT4CBVFWLc5RXV7+MEhZc6DRvSWzzjofJ0=" + "pom": "sha256-JQzkBbIaA5xl06CkTwNwz1mfjR/mQQkG0NmPT5m6z8k=" }, - "com/android/application#com.android.application.gradle.plugin/8.7.0": { - "pom": "sha256-7h5ZwC4JeVS67atxKbxn0cANSSfoAFPMLT2TB1hiPQU=" + "com/android/application#com.android.application.gradle.plugin/8.7.2": { + "pom": "sha256-s0CUyf2Jvehy8Lz6h9d+++HRb0tKnLz64dxI2eNVyDU=" }, "com/android/billingclient#billing-ktx/7.1.1": { "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g=" @@ -647,112 +643,112 @@ "com/android/billingclient#billing/7.1.1": { "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU=" }, - "com/android/databinding#baseLibrary/8.7.0": { + "com/android/databinding#baseLibrary/8.7.2": { "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", - "pom": "sha256-spuchjrVnveI/QF+UsxTC59xEU3SXBHwrvwewDdTC5w=" + "pom": "sha256-OcbTHhZrbU/09vCTLfB5kVZoDVfiX3E8WEAqMAmzsT8=" }, - "com/android/library#com.android.library.gradle.plugin/8.7.0": { - "pom": "sha256-qEI1Ny/YtfAS/MRRwaMWq9jVv/hFLnBVX1pHr2wabOY=" + "com/android/library#com.android.library.gradle.plugin/8.7.2": { + "pom": "sha256-pvWBDNz+bwVIHtJf5olffEDwL2ZcD6Okz3C5XNhgAWg=" }, - "com/android/test#com.android.test.gradle.plugin/8.7.0": { - "pom": "sha256-nlbxt2NGM3f+qeHaXfTCdbAeTw0wy6NyAAsyneJO7mc=" + "com/android/test#com.android.test.gradle.plugin/8.7.2": { + "pom": "sha256-RpF0YddrSbf5q0Aw1iebH5GJeFcvO6KrhKZtzVl3ncA=" }, - "com/android/tools#annotations/31.7.0": { + "com/android/tools#annotations/31.7.2": { "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", - "pom": "sha256-hRjzbfHM0bJFjGRhGlXKu9zgCi5cyL5PvVc6ZWK7pUI=" + "pom": "sha256-gPvd6AprCtEgkWukhxS0YppDEhBuASGe4dZxuykI2OU=" }, - "com/android/tools#common/31.7.0": { - "jar": "sha256-KHe7/ziyy9GMT6c0AKhK3bYK3uaVr5S5hM813CZl47U=", - "pom": "sha256-I3c6OAlykdtH5legTMh00W0Uax6eI5KChaGbJky+Ftk=" + "com/android/tools#common/31.7.2": { + "jar": "sha256-eE+AUG0Xe3cNUT9DAzFWCYk6mElH7Oocbn8JDLZvPKI=", + "pom": "sha256-gubnuIknJjmS1z6STcWF0aq33B+DrxitmEO7QL30S24=" }, - "com/android/tools#dvlib/31.7.0": { + "com/android/tools#dvlib/31.7.2": { "jar": "sha256-j9NJWi67ULGqyxtDYtxKRxuHRiwersQ2kbtW+JXpxjY=", - "pom": "sha256-77YN2IPOd9FGZq+CQDFLhMuN/P8h9D0zG4RJ/jlMEhg=" + "pom": "sha256-dR+c4x3mn6slbazHyJbRJ3yuz47/OC+HFG/rivhh6kA=" }, - "com/android/tools#repository/31.7.0": { + "com/android/tools#repository/31.7.2": { "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", - "pom": "sha256-gF/BqRqM2aW2MbDmKHfZwB8x/4P04HztbwuDQgbIoJ8=" + "pom": "sha256-xMZLLfgLHCvbIs9HRUxYLiSZB5lw078mu1DfdoieA8w=" }, - "com/android/tools#sdk-common/31.7.0": { + "com/android/tools#sdk-common/31.7.2": { "jar": "sha256-T6RKfZZ13xPaYU3uUS35CtPkMI0K3bMurZn1fOWPZ18=", - "pom": "sha256-XWcvw0L2prUWMoBq6/eVdlP1ODaP3DAxLGDF2LCSh+w=" + "pom": "sha256-bsFDlhq1jIWutSaYTCgs1vXTwdXiL+fn1KY6FnWGYWs=" }, - "com/android/tools#sdklib/31.7.0": { + "com/android/tools#sdklib/31.7.2": { "jar": "sha256-Cj9wl6SgCzhARreDtwU6WewL2SJWq4S6pr2AeqAoWLM=", - "pom": "sha256-tYwRPOs2Lu8I5HJOSXz61v5m9IyjbZE265oRs2FFWaM=" + "pom": "sha256-mCfT7BwVqKxPXthmHCQ6zK0UUlJ3LtrTF/daW3ibCpE=" }, - "com/android/tools/analytics-library#crash/31.7.0": { + "com/android/tools/analytics-library#crash/31.7.2": { "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=", - "pom": "sha256-6gsKxUwhyPYOOgIj2BupCDXdmdspNMhp6rmItfbCPZA=" + "pom": "sha256-rBBC4sEx265SouZ2TDV4bxhBTgKqQWrGbQAlRgVzNEE=" }, - "com/android/tools/analytics-library#protos/31.7.0": { + "com/android/tools/analytics-library#protos/31.7.2": { "jar": "sha256-aSz5gTlf4XGi8in/cMxswd354iYbKOrdoiadZuVQl4Y=", - "pom": "sha256-6WFdvb0hsQOB+5XBVetsy4qHymEZAWgSF9Y0m9n56RQ=" + "pom": "sha256-cU7Ku1rvYje/tMFutI6tDSiW8q633v1nIuUYt5Nr9xY=" }, - "com/android/tools/analytics-library#shared/31.7.0": { + "com/android/tools/analytics-library#shared/31.7.2": { "jar": "sha256-yte7j5agR6XvehOxyDA0FCKenVByCWRuw7Y6ZIYeHOE=", - "pom": "sha256-BiLSvOTmMBZr8SgT6DhUOUFx+vJ1k6/S2kvpwtkJEL8=" + "pom": "sha256-HrmdoNGhdtIgvidf8ARgZBDLlHpNdUFKaBAFJLOow4g=" }, - "com/android/tools/analytics-library#tracker/31.7.0": { + "com/android/tools/analytics-library#tracker/31.7.2": { "jar": "sha256-4flUlzpHM/dgJ6X5b6RUctw8wi0nsdyT8/5qRqdWgb4=", - "pom": "sha256-dvrrRI7XbpYwXlV87CwMskFP+ZXCTF4KacthsDJIes4=" + "pom": "sha256-cqrveu3eQlqUxtXMt09Qcmfjjt+3GuqpyD2gFexBMGc=" }, - "com/android/tools/build#aapt2-proto/8.7.0-12006047": { - "jar": "sha256-/he6M0iin4xBkizK/wz1TvRAfD53QHqfh8HlVaFzTJA=", - "module": "sha256-d4xt5AOdryGQB5Kq/PoN5jdIJDfiyxA4FIhlaitml0k=", - "pom": "sha256-0MBH8qY4ilqNnHto3UuvCTwDhVxXJnNNRDOHwrc17EI=" + "com/android/tools/build#aapt2-proto/8.7.2-12006047": { + "jar": "sha256-yiM9kx8k9C69fjjvSwFU97qShAHuuhpx1xFMK4sVI3I=", + "module": "sha256-WUBXRxZ4oa78DSpch+nQYa2hE56o+mBfmMa3mtp/7Ts=", + "pom": "sha256-QYCpSSeK8+D+cSUssDv722/6CNTnSUBtD7xnN2jaPyk=" }, - "com/android/tools/build#aaptcompiler/8.7.0": { - "jar": "sha256-6kqIYAlERDX3oZ/K7eHq8YDo2FFF98UqS6h8vDVsVjo=", - "module": "sha256-3v4hb6toU2kC/2hPHVupgpWXVNoI0pYBmMg1zfnrRpU=", - "pom": "sha256-mDxsnWrL9rYdo/qn4WRgLx0Z7xigFcdpEmutZ3Yo86k=" + "com/android/tools/build#aaptcompiler/8.7.2": { + "jar": "sha256-lj8abX8TYfI+RT9Bd+wQVPqlzQ1V5vn3c9hn8IhfwEU=", + "module": "sha256-gY8GpdWl5kiO9YSC/6Kr68cVem/vYZARvpuMFAYEWd8=", + "pom": "sha256-p3dFTXMlI4OOOhVGMRYVFBIla2G3KWzMILYnG1xYvY4=" }, - "com/android/tools/build#apksig/8.7.0": { + "com/android/tools/build#apksig/8.7.2": { "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", - "pom": "sha256-HoToNvBKfksjm+gnP/r23e28LYITkSiZ3XnfpvJUMTI=" + "pom": "sha256-0QaOHB2J/VPmVKdvmag2eIo6tyMEMktuKYK22J0BR5E=" }, - "com/android/tools/build#apkzlib/8.7.0": { + "com/android/tools/build#apkzlib/8.7.2": { "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", - "pom": "sha256-YeIsbhnURBJstE09/zk40sqXiEGe1IeSZZGa6Zj/ZX4=" + "pom": "sha256-+Vo1Yrq5+yJH1mUV11BNGAAUEDhkMDaN7Hb5GMlnaPk=" }, - "com/android/tools/build#builder-model/8.7.0": { - "jar": "sha256-qW3HjPObTlad6Q6BULXvpmZC0lkIyvKJDGA8xkehbHg=", - "module": "sha256-9FjJyYRDzuRy8bIVS5wOZ6qqBYDNG7OuCMw0Z3N3qUc=", - "pom": "sha256-1ZHiHL89U4t1gaf8k8oCDye1lLTnmDM3WLcqy0/YTTI=" + "com/android/tools/build#builder-model/8.7.2": { + "jar": "sha256-RkgBANdcOWwtzwRqS7Je83VvZpvEs87QtnRBVy1MidI=", + "module": "sha256-f66ACHV/AddPO2Gxst1XZj1jwDvDrND2uHZGmOWo/9o=", + "pom": "sha256-JnhzHNlgHzbi9kWcxuIjHUH5lI0lzgPkzZQR4yudrDA=" }, - "com/android/tools/build#builder-test-api/8.7.0": { - "jar": "sha256-wyUGET0QpRlrXj+GmAJyLI8ijBIwhsBIUvhmzfeMBQ0=", - "module": "sha256-Jz8BFVEUVKBmmPHS6h0Hd8qy7gBknaSeNwNB+uSnSvY=", - "pom": "sha256-XXVdxCpB7BU1lnho/yUric2ul3fKD1CRuCXZ7SNWBDQ=" + "com/android/tools/build#builder-test-api/8.7.2": { + "jar": "sha256-+jL/JjBTSAwtICP9OhlbA13Q6YuT7oT91Zl+46LHp8o=", + "module": "sha256-PsegoYlTeeQvi4Ou0N4pAMYCtbnZPAWllIh/AKCj+WA=", + "pom": "sha256-HNMeW4I/5062W63lg35Zs68e74ex/4MdKmiIF1QaNwk=" }, - "com/android/tools/build#builder/8.7.0": { - "jar": "sha256-ibW+szlqi0UpvMxlOzIanNlo4lJFvjscMgGJdZq7bt8=", - "module": "sha256-v9ZsEzgsS+tKMHItT1j++OHNQ3dcAT8yygs7kmJvMW8=", - "pom": "sha256-DN4sH7Rl891OOgHJqcTRTDGT8c43t+nmSP1AAFNEkag=" + "com/android/tools/build#builder/8.7.2": { + "jar": "sha256-8p9ibOnkHd+vMFQBOXqITloxEmpB/Rj0D9thylRhAww=", + "module": "sha256-EfWL/6/TpHkm9wsk4pAxnB/+WBoKXIR4EcnssFluasY=", + "pom": "sha256-PLR1LKU9qfSgjooty2N4jfFFniNz6pU0n5j7huSiuns=" }, "com/android/tools/build#bundletool/1.17.1": { "jar": "sha256-OS/TsJm9grEWyHcquPxBOZhKkRCKZD+N/J7ilkiBitg=", "pom": "sha256-fN0zdkTVI/5gz7YyQQxrf7fZgu7FMnDdvt/xwmMzVF0=" }, - "com/android/tools/build#gradle-api/8.7.0": { - "jar": "sha256-CeRBcyyUyBG59oXYQO3uSphu57Mi4Qq7bwq9/Wx8M4I=", - "module": "sha256-LW3zWEKMh6teJWIpIET4/MuOk5NmPUR7bylWyzF6GcA=", - "pom": "sha256-sipgfp6d69MjAK1dHx0aUxj9GIobUZlQo3YYyJPbS14=" + "com/android/tools/build#gradle-api/8.7.2": { + "jar": "sha256-ohzomuUaP3MzNyVcKbHVESBN0ZOuUoD3Wk2B0hVMv1I=", + "module": "sha256-yph0Jjvn5igYSQivBtIwrGTLWrXKCv5F65GmvRznx2A=", + "pom": "sha256-xj3pBlGK6+VhHshZdZO9qtHkck+ytM3J1rCVzHXmSr8=" }, - "com/android/tools/build#gradle-settings-api/8.7.0": { - "jar": "sha256-fd/HczLe41hSQxUiOP8ArEexcHpBnA8USEU6BJj7aDY=", - "module": "sha256-UogIaEZOzhDffTxjbC97RXHyWORY8alHO8Wds9ktAMc=", - "pom": "sha256-lrCfK/WA+DHi3D+qL0/u/ODHyj7dxpOSjuEjiLxSPoc=" + "com/android/tools/build#gradle-settings-api/8.7.2": { + "jar": "sha256-r2oaF8zcVhvhBB7f7RNtot3euvcivJVOEZ8uBhpIONQ=", + "module": "sha256-Uy6JVY4zp+pA2fj0NIrekj8WZhIkxkV6DKHMZPo0ru0=", + "pom": "sha256-Md0thmxB4ku8c32fjuW8bBIhFmhXyUNKSfKyZ3Gt0EQ=" }, - "com/android/tools/build#gradle/8.7.0": { - "jar": "sha256-H1a4cMQJth55iDqkAnoixIyvwMrNAE9N7z8t6hiC+qU=", - "module": "sha256-jQyDawhju9N6R91wmJF6Q3IwwmNoXqd/S4vFman6E1Q=", - "pom": "sha256-/W/cIMQKcXosG1+bLUtGNgWxTm4zmLMzEAvw867m69k=" + "com/android/tools/build#gradle/8.7.2": { + "jar": "sha256-kGyVRG0MGZurpmCORLVJJCoPMmNfzUOvplY3yqLUk/Y=", + "module": "sha256-ZpeR3shz+2H44JOKpZRVlsy4SiBx5AnlW1tbFbb2pBQ=", + "pom": "sha256-LRFC0n6qSZVMdPfbABzhRQlgG8IgL0jrSs16cxnDG0g=" }, - "com/android/tools/build#manifest-merger/31.7.0": { - "jar": "sha256-q5InZDTlph6GxZDnsZ8t4WF3j6J1/Aio7shAgeJwO7M=", - "module": "sha256-EugDDYtTNOtaSsPQwQ9Q9I9fe0+FQpZlmd+kX4tsU9c=", - "pom": "sha256-XV78GWn1LfmVAx2XGIkWm39oRoVEZjG6ynrODjKtwRM=" + "com/android/tools/build#manifest-merger/31.7.2": { + "jar": "sha256-g+a/vHleFh7llgkXDpUuNZGuqGyJXBGevqRk6lP59QA=", + "module": "sha256-XYlnGbfMPK7aw1a4/BLqON3QFy3laJ8/e7dpMgNGnpg=", + "pom": "sha256-pagwwHgWGZT/NBRif8b8saon9ZxfXrK1L/46D5i7i4E=" }, "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": { "jar": "sha256-TeSj0F4cU0wtueRYi/NAgrsr0jLYq7lyfEMCkM4iV0A=", @@ -768,61 +764,61 @@ "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" }, - "com/android/tools/ddms#ddmlib/31.7.0": { + "com/android/tools/ddms#ddmlib/31.7.2": { "jar": "sha256-DX71OCP2ohuAfzmPDQOaXd4YS1jFWJYlYmykqj1hCO0=", - "pom": "sha256-xF5JiS4dMxYuu8Px1FpXrAO1M9sJI1HIChEXGsemC3s=" + "pom": "sha256-ge+WpZRhtLmdMSBSNnHhbIzzy/q9ARixnnVgtZcLYJ0=" }, - "com/android/tools/layoutlib#layoutlib-api/31.7.0": { + "com/android/tools/layoutlib#layoutlib-api/31.7.2": { "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", - "pom": "sha256-Oc6KjaxnhwVd1yk9DuxGwGgoJ1pcMCDoB4aBmfue2Sw=" + "pom": "sha256-VtfZFwAPKmp8g884n+aC4KawfLysJXX8ze4L8ScncGE=" }, - "com/android/tools/lint#lint-model/31.7.0": { + "com/android/tools/lint#lint-model/31.7.2": { "jar": "sha256-n0wIehmRdFIdG8e4/wX/FIT3cPRRi3/Z9trmwmGILb0=", - "pom": "sha256-bOKv4L2eVokKZMnOl8xm1XgkBc4f5lVLf2LKeuSMl40=" + "pom": "sha256-1M8hv1CrYQinX1s9DLojlvzEaEhfuHjvTGmWKdwy1rY=" }, - "com/android/tools/lint#lint-typedef-remover/31.7.0": { + "com/android/tools/lint#lint-typedef-remover/31.7.2": { "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", - "pom": "sha256-JClmoX4PSX7Pfw8ZbzDdHrz14v4CHvTi47QtFF53rq0=" + "pom": "sha256-n2H8dvOXG3W++jZyBxKSUvxdMp1mKSpTO04vDg/FpzY=" }, - "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.2": { "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", - "pom": "sha256-jO6IDyp30tYiR3BtjUf85buIXCkz1hR5+H3TuFKcXTk=" + "pom": "sha256-fceVfuEAeETkitNQUrJh7EZ8jj0mc055gHXWDl0txrc=" }, - "com/android/tools/utp#android-device-provider-gradle-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-gradle-proto/31.7.2": { "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", - "pom": "sha256-K6qTHUdHBV/2rp+Adz/zqhxC+6D626Ghph4X9rQB9rQ=" + "pom": "sha256-b7wYgVZ6Ij0h8MU4FpxFRTqgTuZoarSxSTIaNpIdKH8=" }, - "com/android/tools/utp#android-device-provider-profile-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-profile-proto/31.7.2": { "jar": "sha256-ENEAztXQg3FMHGi7uxC7N16FRvkqsOQhnA5KX/KYEV4=", - "pom": "sha256-/1hgmrxlfZWAFFBM/e6kG3J3wNI6sOtQikfu3uMPZ5Y=" + "pom": "sha256-NCYLH8BzJ0AW4K+jqJzkCnTAlTnOKDU170uwn6nUiZo=" }, - "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.2": { "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", - "pom": "sha256-+yuHVmFNkIZ4QU7pbG+wphVTVSd8viOeCZogZhZxidE=" + "pom": "sha256-HZVLjspjr1oTeqIYvZBmn6pLPS6fKJpkEU3w6LI6wWM=" }, - "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.2": { "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", - "pom": "sha256-3ShDC26IL1zYVG4V3puMjAzkwoVLg8xLAxOCj/9YaIw=" + "pom": "sha256-Wj7az0WoDtusdGLVwroPciKVO4ER9naXzOgVH39iP7E=" }, - "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.2": { "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", - "pom": "sha256-Kr+9L1LkoLxWGzY29JUmZ7zSseaNW3S4+ecDnogCzH4=" + "pom": "sha256-z95c2bXo9Uha7d8ExVVzwPdFvRh0wJDWdb6tVX8rAuQ=" }, - "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.2": { "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", - "pom": "sha256-ClVyJT95043mEia9b0/2iv5kJ/IAzDsdfrHfl8I7jIQ=" + "pom": "sha256-ewlMa3tMgyeIeTNY8/gQ7t+oWkKRxCjGIyYE3Q30yVE=" }, - "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.2": { "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", - "pom": "sha256-mEg9815euIrO9MCHlq3RAHI+HgTV8bpojRc073/i8LI=" + "pom": "sha256-/DgckYxfXZ7Do8/3tSB2508CJgWZs6KaR9ybjfNGgLU=" }, - "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.2": { "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", - "pom": "sha256-C0HkUK7ULzF6kiKOhy1zgrp8/6bVEeXxHx28aQGv3JI=" + "pom": "sha256-nMDyQxX/ewv9HxsCAFmGxbRSMbQZm1ddUY6uN/SXAhw=" }, - "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.2": { "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", - "pom": "sha256-uYdrvyTXt53Y7vvEl8+kC1LR89Lw9B/C4YltMEHtsX4=" + "pom": "sha256-zvNh4UxGVOKXJBHYPNscXKzTkkjwe0ABaN5/RF/r5n0=" }, "com/google/android/datatransport#transport-api/3.0.0": { "pom": "sha256-FTe+vUTaLrfjvnP8QlnhEW8qaKUwX0/iPGzqmm+E95E=" @@ -883,14 +879,14 @@ "com/google/android/odml#image/1.0.0-beta1": { "pom": "sha256-eV9Hk8N17t9DMqA4EIKYGlznC3oKd2IhyiStnUDL6hw=" }, - "com/google/android/play#core-common/2.0.2": { - "pom": "sha256-GUBYeVHY7e/s+jBJHYVzMon1q1K3q2fSXw+XNaxW//c=" + "com/google/android/play#core-common/2.0.4": { + "pom": "sha256-jd6WHLfhDKX6DlUmHnurweNAv1lyujU4x89ONNM4774=" }, - "com/google/android/play#review-ktx/2.0.1": { - "pom": "sha256-LtP+xq8/PoHy1NBqQh8uXWFk8GQPMzYKGFZhR/jSpOo=" + "com/google/android/play#review-ktx/2.0.2": { + "pom": "sha256-tllwHlCGY+vaa1CiaXuywPjJhGMxRrE5BtfJhqmdBDY=" }, - "com/google/android/play#review/2.0.1": { - "pom": "sha256-chcx/XEy53bt0gj5Z+3wOOI95uZQ8PBVxC1G2TZLznQ=" + "com/google/android/play#review/2.0.2": { + "pom": "sha256-308kkM3bZR/754TIxbl57GmZa8aHynzWeMfV9lsol+g=" }, "com/google/firebase#firebase-analytics-ktx/22.1.2": { "pom": "sha256-SLZ3ajqET+jxaebbQdCcwNFilqMjGBZHLvSwTl2f030=" @@ -901,8 +897,8 @@ "com/google/firebase#firebase-annotations/16.2.0": { "pom": "sha256-CFsRHeSXHLO5OP+QAMyAeQEE/WmlE0doTftybmnoUko=" }, - "com/google/firebase#firebase-bom/33.4.0": { - "pom": "sha256-vjxNSx4io2a3/RYgg/I9AW4g+ThDDrfMTZbPoXGnadU=" + "com/google/firebase#firebase-bom/33.5.1": { + "pom": "sha256-qmUG1IFF8L6ttoh2vcA7dkaxZFC1OVEqtUm7yOe6JTs=" }, "com/google/firebase#firebase-common-ktx/21.0.0": { "pom": "sha256-wn7MtIuViBFtb9MvRle8Wd+FUAJDIpNVjbuX6YeK3rg=" @@ -928,11 +924,11 @@ "module": "sha256-/vKMVYn+7ogZWmq5SylhBAL4dVQRoTUXbdXZSASY7gQ=", "pom": "sha256-1N7+UvJE/0C7+enGSoroyoocJs3y5lZ1fAY1CuUgeI4=" }, - "com/google/firebase#firebase-crashlytics-ktx/19.2.0": { - "pom": "sha256-rsljNsCG26s6XVWGVQ/sqyI1nXvKCwwnQvVEGwbNdEc=" + "com/google/firebase#firebase-crashlytics-ktx/19.2.1": { + "pom": "sha256-4z68t3jNh55vkF/z8CDvpxd2s1WxexwI8HyHnKnEayQ=" }, - "com/google/firebase#firebase-crashlytics/19.2.0": { - "pom": "sha256-AHkhpTDKn69Dc0V4SGTxFnczsQVFUMJaPy6mEkUnGdU=" + "com/google/firebase#firebase-crashlytics/19.2.1": { + "pom": "sha256-8gfVXglDfRP0ZlCCRTDCFVAPS3g8iFPO4iBEekUfaHU=" }, "com/google/firebase#firebase-encoders-json/17.1.0": { "pom": "sha256-yCPL7XoOdb8w/tu6Qv8cDIdS49wW7cz30PLl1stpx6g=" @@ -958,8 +954,8 @@ "com/google/firebase#firebase-measurement-connector/20.0.1": { "pom": "sha256-exiY9N12nBHKu6lwJUbWiAEV6B191v8ra+JI7hVtyLw=" }, - "com/google/firebase#firebase-sessions/2.0.5": { - "pom": "sha256-1Vw4Y6oAPcTNcFJEv8g7PYmlzR3Gz1lGX7fGfXO/0WA=" + "com/google/firebase#firebase-sessions/2.0.6": { + "pom": "sha256-VtizN1WQ+rqBl1T0uI535GODGqQe0xffqx52hvGYXbU=" }, "com/google/firebase/crashlytics#com.google.firebase.crashlytics.gradle.plugin/3.0.2": { "pom": "sha256-T51Vb0qwfPielD9NqD+p8nW4v02PZEKrG15fuwm5qdw=" @@ -995,8 +991,8 @@ } }, "https://plugins.gradle.org/m2": { - "app/cash/licensee#app.cash.licensee.gradle.plugin/1.11.0": { - "pom": "sha256-TW6qfssPqKRDuXUP+4I9kU0/bJeO67Jcf4gShq6VNb4=" + "app/cash/licensee#app.cash.licensee.gradle.plugin/1.12.0": { + "pom": "sha256-a1NXxoXtJlxl+2W5S49bIf7d5kyY5TS4JzFfugt9EVs=" }, "app/cash/sqldelight#app.cash.sqldelight.gradle.plugin/2.0.2": { "pom": "sha256-xI4eHTquSFcUqPmVqfwmIE3v0FJXhyJaRotJQfOPKwk=" @@ -1019,11 +1015,11 @@ "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.20-1.0.25": { - "pom": "sha256-yzUQdo5Yv9tQqt2JXf5jB6XPBHblZZ221YRYHBSBuy8=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.26": { + "pom": "sha256-Z2JdXXdbvXnCpO5wWNDyGeskBBs6Dqyl60p6XExoRC4=" }, - "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.4": { - "pom": "sha256-Tkw14qX9gVWTV8wn9hfQfWRMQFn2MgCq4QpEucBn+iw=" + "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { + "pom": "sha256-a+z8hpHftExSYVqCqWeS8TQBpXXleMkBkR1/qjMPgoo=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.5.0": { "jar": "sha256-Ga92VnnptJN0uyg6xE81O4EJrZz+ZmjO1tmmZFVA4vo=", @@ -1172,26 +1168,26 @@ "jar": "sha256-4NqKfwZIV8BIOmVyfRYtPtV84m1+R3ix8ADg0MDck3E=", "pom": "sha256-krQjr9XnKbsRT3G1ip4DhF3+K9pWJFTrvbg8nYOyMHE=" }, - "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.20": { - "pom": "sha256-xK4aEO2SGNYivOCqvA7d9JsnMahRbWjhzfhFpXD5HBo=" + "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.21": { + "pom": "sha256-nYQQN8WWRNxbvoFOeS7Yd060hkbws6d5YE7lwbMH+Wk=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { - "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-Jk8V5sp1XIU/oPWvEPa9GgHwmLKsDPmOHP05kBF/tjo=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.20": { - "pom": "sha256-3sIntTJrP/MWMuYmdesCZOtzhonuGoHHbOrP00HQDT8=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.21": { + "pom": "sha256-A3jdmghkzs3xepZE4cpNaYzJBjT6z39QT1GiA+UnTSw=" }, - "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.20": { - "pom": "sha256-eB3fXoWUHaYbaNxvts/TEvQb20Z7A9LYFEkDkc8PHA0=" + "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": { + "pom": "sha256-tnnDkpTLqUUVcGw6nW/EDzGhCq5mqjPysFgNUp5Zx+A=" }, - "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.20": { - "pom": "sha256-qYIKx23l4slfvXM/0y0CQQRMWMo1cC1JvpkVeA4Eito=" + "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.21": { + "pom": "sha256-9hnDJ/rpwiSeUZmg9Takn0kRV2ZK+tFjyGOedA8ibUo=" }, - "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.20": { - "pom": "sha256-LVF6OaKUxLG4cV7ldiyhQx/EDL+VV5KSrSTU5B4lnFk=" + "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21": { + "pom": "sha256-RJ1618SBWsfvZKnCwXOrJiAZ8W45q/EPx/wTvyBM82I=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { - "pom": "sha256-0s2V9THwNRgW+fg0bsbWB2xxyt9jLz6PZX3dft+RukE=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-ZqPrh44Nk5i1JY0VveqGR1pdRJ9jthi1rcgMsz0bT5Y=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", @@ -1208,13 +1204,13 @@ } }, "https://repo.maven.apache.org/maven2": { - "app/cash/licensee#app.cash.licensee.gradle.plugin/1.11.0": { - "pom": "sha256-TW6qfssPqKRDuXUP+4I9kU0/bJeO67Jcf4gShq6VNb4=" + "app/cash/licensee#app.cash.licensee.gradle.plugin/1.12.0": { + "pom": "sha256-a1NXxoXtJlxl+2W5S49bIf7d5kyY5TS4JzFfugt9EVs=" }, - "app/cash/licensee#licensee-gradle-plugin/1.11.0": { - "jar": "sha256-421lXSEpw9HX+oVCAVAyX81n+tcPw5ELftex7w9vqXk=", - "module": "sha256-4hKLda1Y5Tr5CtcyLGKXfI/NonykVCykOQ+ysrr0QHc=", - "pom": "sha256-rRT8P6I5Wd+LQY8Ib0vxN/snc5TRccJWT1a/18xGJ9M=" + "app/cash/licensee#licensee-gradle-plugin/1.12.0": { + "jar": "sha256-oWiz6TSJ8RiIPrGD2uCfBAgqRIwzwKjrBipJ5co8WV0=", + "module": "sha256-lrpFacljyIiZDNT7YePL8HfdKrYRR74+2OZbvODrlqU=", + "pom": "sha256-hhw2H09+on8XdLSKb0NayvWJ2KW6pczg5WZ3xx/iSk8=" }, "app/cash/sqldelight#android-driver/2.0.2": { "module": "sha256-o/3k4blEM0Kq/3SeuCOxd3oh8Yqa0oiEJae416a4wXE=", @@ -1423,38 +1419,38 @@ "module": "sha256-pf5zlSZUrdVw3EuE5w0KeoQK5QZyqENfmFFs9WqWexE=", "pom": "sha256-g+AAH5lPJWhjyc4wzYMlf7qjQEayclcfyGQ0O8x43TQ=" }, - "com/github/bumptech/glide#disklrucache/4.16.0": { - "pom": "sha256-pejfbx0ifD6b4W/L39P1M7IdjQPiaCrddxr498u9qUQ=" + "com/github/bumptech/glide#disklrucache/5.0.0-rc01": { + "pom": "sha256-rTCxr8Od/ObYsLN/OXXMI1iY4bM67RBfEUoqgPlH9zM=" }, - "com/github/bumptech/glide#gifdecoder/4.16.0": { - "pom": "sha256-MKYI93fKdyACjDZd1nD7XDctDhFRuUAWgOPQlHLbABc=" + "com/github/bumptech/glide#gifdecoder/5.0.0-rc01": { + "pom": "sha256-bWon0m4DSok1jGLEO7/aF+vyDM4I5GItBHhFUrnEXrY=" }, - "com/github/bumptech/glide#glide/4.16.0": { - "pom": "sha256-5yyOMQ16K5zuWs3NuS/S72OU63LlapbKy1aSQEcC5XE=" + "com/github/bumptech/glide#glide/5.0.0-rc01": { + "pom": "sha256-t4B6qZ0o2S98YxD/gOEo36btXUzZsH7sQKuU2Bi2kQE=" }, "com/github/jai-imageio#jai-imageio-core/1.4.0": { "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" }, - "com/github/skydoves#landscapist-android/2.4.0": { - "module": "sha256-Iqip9b/NaDVEyHqOLbYgXHE9u+Bdrvc2Bo0zo98kKFo=", - "pom": "sha256-mohtrp2I43wKcmCGxLS+zENS3V98+Xvk5fr8UWZb4bQ=" + "com/github/skydoves#landscapist-android/2.4.1": { + "module": "sha256-CTabQKPpIMrvOjGdj/U/X3bifUQHKejj/T6ArRKtbPw=", + "pom": "sha256-HDoFMmJl4MMZmvYwaRvY9JsVB7uo1dWcUXdM0zm9r/Q=" }, - "com/github/skydoves#landscapist-glide/2.4.0": { - "module": "sha256-OJN/jZK/wE6f06GNVKUgFxVMoshfUFs/B/C5w3cN/YY=", - "pom": "sha256-aJH4hyrihRy22EWcGkIC5BtViDpNjvfQfP5XkUfpXwg=" + "com/github/skydoves#landscapist-glide/2.4.1": { + "module": "sha256-8mmntu8gt7n0OqzL7ZuzoTWBf2q1eB3CEGULrtztEso=", + "pom": "sha256-TYUKEnhZzXwXlS98Nha2HMgtxSXa8BQClPoXld2KvMA=" }, - "com/github/skydoves#landscapist-placeholder-android/2.4.0": { - "module": "sha256-fC7SUqnzD9u2B2TCzs+WWO5rB5GlIpMpUG1kLlLsETQ=", - "pom": "sha256-ojiYeuJG+n3S33m+wW9gFmRn/JmL997R2zoEcISTOG0=" + "com/github/skydoves#landscapist-placeholder-android/2.4.1": { + "module": "sha256-ycd1URN0vJMSrKqZVwPpq1YTnCTh1f5nas39bbVZpBI=", + "pom": "sha256-Ioz9A84Hdk4FgM4aLQa83LGcUwU8g5pHPboF5b49MsI=" }, - "com/github/skydoves#landscapist-placeholder/2.4.0": { - "module": "sha256-uyaHzkRh61cDI/C9DjVGxJKJtXv1b+KH+mBt4TTzu7A=", - "pom": "sha256-UKohOAS24T1yD3xKXtBp6hXfTQQ5bD81S5bpaWp9mds=" + "com/github/skydoves#landscapist-placeholder/2.4.1": { + "module": "sha256-lun5yfhpSIfMLMG79kczkV0U6sIyG0j4/3Y9hZqqaSw=", + "pom": "sha256-viPts4vQrpOlnm7gP8hECEj5jreFWQKvs3COoJ+VhOE=" }, - "com/github/skydoves#landscapist/2.4.0": { - "module": "sha256-kbVxRSW+nuZiuJ7ZO2OSnBYQqbnM8Hq5+zcBZSHNQb4=", - "pom": "sha256-Fsnfutava8Ul5R7/DmNgSI+OS2abRm/nSg6SkMyxUFc=" + "com/github/skydoves#landscapist/2.4.1": { + "module": "sha256-uYel+PoSDuDea1Ghy8galJH7VRBtwdgZditT4YAR0hM=", + "pom": "sha256-ROr1OImdYtx5/F7iv4U9t3j9SzvKNIvrdoV793cuZsA=" }, "com/google/accompanist#accompanist-drawablepainter/0.36.0": { "module": "sha256-LR2pP7TwcbJ3xHuLD439Ie53v7BUsWpWeT/xjThB2A8=", @@ -1516,32 +1512,32 @@ "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.20-1.0.25": { - "pom": "sha256-yzUQdo5Yv9tQqt2JXf5jB6XPBHblZZ221YRYHBSBuy8=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.26": { + "pom": "sha256-Z2JdXXdbvXnCpO5wWNDyGeskBBs6Dqyl60p6XExoRC4=" }, "com/google/devtools/ksp#symbol-processing-api/1.9.23-1.0.19": { "jar": "sha256-vuN5tEleLbL6L56WQysQzr9WCo5udUnVen8oIst6Jfw=", "module": "sha256-aT0JqlhIGPS2yK2oI6VLDLK8sITgWgX+WqaA9YlD9G4=", "pom": "sha256-Oup3dI9mum/DvGrSjD07+lnt9jMyAYlGCrcIWx88KXM=" }, - "com/google/devtools/ksp#symbol-processing-api/2.0.20-1.0.25": { - "jar": "sha256-vdOj527iHJWODypi1xfMYWZeb1oLFB7/AOBW659Y2P4=", - "module": "sha256-XXBDIYzfJjWb3+xLpniu15S6qtSn4EA0TTOi7ZKIR+4=", - "pom": "sha256-jjjxZ9N69wbkkn3PI/IczZKr9DXKQTC0YF9E3GTfelw=" + "com/google/devtools/ksp#symbol-processing-api/2.0.21-1.0.26": { + "jar": "sha256-BsS8s+tAlT1ENeziIyrWt2CGhjGWhZbOZmz5+AVyml8=", + "module": "sha256-ajqhacgqqBf0biw0rQajdVLjehcI8rlzMqiva35bYI0=", + "pom": "sha256-MUzVy+PX+Mw/sOa0jfrrnISBf3fYdDMGlyEUhpWHbRY=" }, - "com/google/devtools/ksp#symbol-processing-common-deps/2.0.20-1.0.25": { - "jar": "sha256-bCly0hPau2S6jdjBRxHJA0wTqjzs9Y9eyKjc40vUpPA=", - "module": "sha256-Q5xUkJOChRNfbVdylQUSnWixhp0pVMVKQ0AnMmfXsOQ=", - "pom": "sha256-pdbQUAbsbfVDFLhNRqWa8ZsNisI7TRymfZhKMyXjUdY=" + "com/google/devtools/ksp#symbol-processing-common-deps/2.0.21-1.0.26": { + "jar": "sha256-9U3futWSOlb8pZ8s/8/6SWFIizOWmTXCXpSS9N51TOQ=", + "module": "sha256-mDHtWjLSJCMF9GCKM3RLOJierSpbAUpEQCDbCuMvSh8=", + "pom": "sha256-tZqVRlTVsPdKwO33x499WS/c4kUguOIOocUGtkFgS3A=" }, - "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.0.20-1.0.25": { - "jar": "sha256-TOH8G26gjE6txjB2jWCKYk9VbWWwVr6g97l4kBgQWkE=", - "module": "sha256-+gLE/UYfiow7j2o265zQQWySRBg61m1c2eIFsId1VZs=", - "pom": "sha256-fi22jD+Ksa+WoDdPRNgBaIpX03/gG4GCLsjPPVG5vf0=" + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.0.21-1.0.26": { + "jar": "sha256-wB+hdK5CikTHfFQ6sP5qytZj8uyvmon/BT8gmfQ8804=", + "module": "sha256-gLkXElrOkTMqyrUxTqXHYs8TC/TGS6QTUfqHY1FlfHA=", + "pom": "sha256-opW31fnR1sMOuItUi6fQE2PtsP++YeNHVDIIN95ryM4=" }, - "com/google/devtools/ksp#symbol-processing/2.0.20-1.0.25": { - "jar": "sha256-5xdB6pE0JqUlMnIZkb2kqRihibNyVpVzMdww/PLb6xE=", - "pom": "sha256-2S7Uicdzd9fEaDuflleaNjQc/EfzwlJ095vzeMYr0qU=" + "com/google/devtools/ksp#symbol-processing/2.0.21-1.0.26": { + "jar": "sha256-Wo4TWFWSMrLNcFdf7QnSHRUQ3uQuJ27qUZNqR2mWNnU=", + "pom": "sha256-JU/hkxHS2kHNBwgHfCVfQgXsD8ZKHAfuE7Cxr7i0TYo=" }, "com/google/errorprone#error_prone_annotations/2.11.0": { "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" @@ -1761,6 +1757,11 @@ "module": "sha256-LiFIzSE7T49U1m0FSKIoBX4fe2czLg+Xmxoc42sidqc=", "pom": "sha256-MVkkh9X6euW87fZ4Bqy93Eh9zPROH9t/z3zlNkrPyFw=" }, + "com/squareup/okhttp3#okhttp-sse/4.12.0": { + "jar": "sha256-v/T7yu96rC2RDU/0ba+qTm0V2hJ99rrJchbaRpQ6fUw=", + "module": "sha256-c+RIzK9gfU9gO4tuZmGHKk/6PCZBGTyLvE1r2h5Ww0I=", + "pom": "sha256-lKunzO96e5DcolIFhb8LEjNtyO+U1ZGWPu2sV3lnkzw=" + }, "com/squareup/okhttp3#okhttp/4.11.0": { "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", @@ -1780,15 +1781,10 @@ "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, - "com/squareup/okio#okio-jvm/3.7.0": { - "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", - "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", - "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" - }, - "com/squareup/okio#okio-jvm/3.9.0": { - "jar": "sha256-3cOG/xS9JdXJNBZxlur0WxjeTyjhxVpNs3rllMv9N+Q=", - "module": "sha256-z5coTsYbtR5t/Lx/K22VVsm3s+PLIswOLU8O7782GVs=", - "pom": "sha256-VEiNRUqsyvaPcZnz3l3Ns4CBblfUYJBJF06FZSAROH4=" + "com/squareup/okio#okio-jvm/3.9.1": { + "jar": "sha256-/m/pE3j5v6ewjDhkgozkGABc8orMoS6IR+tlxWXDdQA=", + "module": "sha256-sK+pGSxC18Rj3jjWMlk2xpAdnjtxSXNf/RihHfMQNKs=", + "pom": "sha256-VXZInO8kBTNoAPxt6VhUU18zVxpO/lpa0OybmwkNIdU=" }, "com/squareup/okio#okio/3.2.0": { "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", @@ -1798,13 +1794,9 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "com/squareup/okio#okio/3.7.0": { - "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", - "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" - }, - "com/squareup/okio#okio/3.9.0": { - "module": "sha256-aNHIef9liTHQKzrb6vu1EuFjwgqQyt8H2QyNvqfnYhA=", - "pom": "sha256-FPNR2puXtDaeP26PaWsK1ANtFNIbD9l6pcjG7BW+fZA=" + "com/squareup/okio#okio/3.9.1": { + "module": "sha256-m5C0J0pa1gLdV01tS0iQNmOy3ppgufw0AiSCk9hD4SE=", + "pom": "sha256-06DDd+epr8zbsCqrXgUNwhL/2pQNvUcOo5cSpDQt8I4=" }, "com/sun/activation#all/1.2.0": { "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" @@ -1861,18 +1853,10 @@ "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" - }, "commons-io#commons-io/2.13.0": { "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk=" }, - "commons-logging#commons-logging/1.0.4": { - "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", - "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" - }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" @@ -1948,13 +1932,13 @@ "module": "sha256-lYBVD63Yll7/0JcuBPyr18a4tGnbZYJETGBDlhpwU3w=", "pom": "sha256-5qaM9mg8s0uAuqRMq+AKR8yzYVAK1ANjoksSYKFVePg=" }, - "io/github/pdvrieze/xmlutil#core/0.86.3": { - "module": "sha256-MzlXsdCR2LrPqwYCCGgi+a2S9hMCy3Ru8g4Z9nprTbk=", - "pom": "sha256-ngeyUCJI+U7AYn9Wsn3wiBySBCrfzoCg35oa6sQWg4M=" + "io/github/pdvrieze/xmlutil#core/0.90.2": { + "module": "sha256-h13of98HvSr9BM7PRgnTA8adxpnAJD2UPXuLR3WC5ec=", + "pom": "sha256-cZNkfkOFEPBfYeVd6cDcF9hHe4R3ndIyadDs6EIk1IA=" }, - "io/github/pdvrieze/xmlutil#serialization/0.86.3": { - "module": "sha256-gWAn/0s15EE1ZytqCH8U4O9pyfVXeUJpvXN4wm9mhOE=", - "pom": "sha256-dr67jk0C9ZRpOV1p9HIsz+W34gMz2w3sLpZXZRK5+MI=" + "io/github/pdvrieze/xmlutil#serialization/0.90.2": { + "module": "sha256-+Yzn81bcp0UrrS+E9ogdLQI1Y0b+V7FHZTOnPLU7860=", + "pom": "sha256-gW/FQKiUEdXSOCkpBj1bgVfrpgLKG0rS/y+hq2/4sYk=" }, "io/github/reactivecircus/cache4k#cache4k-jvm/0.13.0": { "jar": "sha256-jhGawjDyzFFVaPyo/o7q/TgvyPCTl6JHSqsY5JZidcs=", @@ -1997,138 +1981,184 @@ "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=", "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0=" }, - "io/ktor#ktor-client-content-negotiation-jvm/2.3.12": { - "jar": "sha256-tlKQrBAAljY9AepxAn2XDOxqSNB2tuSzbeHK4sGDzXI=", - "module": "sha256-aE9TOE1TEuLn/JQRyIMdkhnRnT48Ykph2Tcm+rrNH5U=", - "pom": "sha256-BQ388K9CsJyFJJmnK6F/mi2c7RimnnHA7LhmJ6in+Kk=" + "io/ktor#ktor-client-cio-jvm/3.0.0": { + "jar": "sha256-C+BPu8totNQEhT43DXXHqVqwkUmxPq8m9bQWAhs0bQQ=", + "module": "sha256-ypP35C2hTnq0db27+u6c1qddrxM3kLcJKMNVtUprdsQ=", + "pom": "sha256-KXVutf4U73dFHckAjV6EPXMEtM8JUm2aIDR8mwqvTr8=" }, - "io/ktor#ktor-client-content-negotiation/2.3.12": { - "jar": "sha256-Ak3H3Td7OXwXg7LDbJeQ8BYVbphzGEP1phOc8o3uP70=", - "module": "sha256-c7tFC5zZ1K6AmA8McRto9+iaYPQ4DQ1EtBeNQnmmxfM=", - "pom": "sha256-fq1NUgsZkUKY11B/SlxwkGkkMPSJXTWcc0KzjVwUZbI=" + "io/ktor#ktor-client-cio/3.0.0": { + "module": "sha256-iudmnpXhbVcoZ74lGx6jkWg3X//6ksd/ETjRSk80GgY=", + "pom": "sha256-SzlUFp02r11bGgxSfgytL026K1PGyFdvRsZkTG6GZoo=" }, - "io/ktor#ktor-client-core-jvm/2.3.12": { - "jar": "sha256-tAeoHZLmzUH5LBUPH9MGDV/KNJHOAq+39xNCRAQIHHo=", - "module": "sha256-tLgSabjOWrX2/g+F/kfRVoqOlZxKuUtn1XQn6XEzVh4=", - "pom": "sha256-DRlPg9ywetvZfpAp+cotuwCcqXJXd8bRuezOqvw7Fns=" + "io/ktor#ktor-client-content-negotiation-jvm/3.0.0": { + "jar": "sha256-m9WHswowDLaO9d47j9P9bqqm3HQ9jAeQjRt7WJceW10=", + "module": "sha256-07tySO95a59///X7utw4OyLzbd2DygXQ3M4FFTWbleI=", + "pom": "sha256-fa9qTK+Ho2lVVzlB4+4HuHKFpXPLBjMoXnxKTOa0ib0=" }, - "io/ktor#ktor-client-core/2.3.12": { - "jar": "sha256-E/nV7COKqNoX8sCAUA0GipY6OKMaFkFQl7hA5fjDv/Y=", - "module": "sha256-hCfawQzvA9tUJUm9tArUlCSP/tB5Ar35BeSw6MVB7UU=", - "pom": "sha256-0rEDA3TSk+63skT9xwQxmThMh6oJh0Wv+OqCxcnj8fM=" + "io/ktor#ktor-client-content-negotiation/3.0.0": { + "jar": "sha256-9OSVojUAqGywmqk37Jc1I/0dP8pazVarSIkSbwyE52U=", + "module": "sha256-1HEXV3yDW0vWu09WiAEO1whHuwVdcaOPyYwBGreoT8M=", + "pom": "sha256-daODY/EQym4aPbMclIxY/wCt8ZmA2AmLDvfqVLL4v8c=" }, - "io/ktor#ktor-client-darwin/2.3.11": { - "module": "sha256-YoVOVpzRv6jTMgt1jPOc1arRZi+nFzYX5r52c6ZmhCw=", - "pom": "sha256-fbAq8OBLy7jeADx7NjTeLQzx9hH76pnEZM8GDz4lkf4=" + "io/ktor#ktor-client-core-jvm/3.0.0": { + "jar": "sha256-QNLQ70M+/dc6f3lVP1INp9eg6u5Ss6mla6DnDQyplhM=", + "module": "sha256-DkDPlWGCAsCVe5ESvcCj7ViMqZeSr3+Q1dpUEOVKUL8=", + "pom": "sha256-jYcwy42ptl7pZ26tKS8gZwnSOhLKBLZl8ptQRcNaiJ4=" }, - "io/ktor#ktor-client-logging-jvm/2.3.12": { - "jar": "sha256-KQI3ExFtuckQYY7b08oOeg8H7RimeFI7iS/RZNHJ2s8=", - "module": "sha256-aRw5R1p+oq4uGM3UqbzfudfoJK+5PUfLVpimVeaH4uM=", - "pom": "sha256-eZbE6aHzj2YbMQLSwXo/UvQvLXmo8SzSjsfe6muNTXI=" + "io/ktor#ktor-client-core/3.0.0": { + "jar": "sha256-ju597n1o1mxjmmW6cqeQHwa5PDaB7+fkZcMzYP/dr9o=", + "module": "sha256-J5RlKvbMd7eog3ypfs6URW18KdutmaFS43z1QibT8Io=", + "pom": "sha256-un9vXGzVyAMMxRNmp4m52IiIxneZhJ6wqboVvFHYljY=" }, - "io/ktor#ktor-client-logging/2.3.12": { - "jar": "sha256-5j6nvrSK6N2AcBfkydxyZtUg1DTMyMmTHyONgvPXEX8=", - "module": "sha256-ELZ6GceSS+/J6/AN65qaIlFv6hW3/SRLoRjgpIL+fzQ=", - "pom": "sha256-TjkQM8cnuQsynsNMAFSWexRK+Z23LM5Xk+nVw0ceCdQ=" + "io/ktor#ktor-client-darwin/3.0.0": { + "module": "sha256-GXxqh0vyPTsH5HPIUnpG34WtfbRwQ6XC4uBga1rsJ3c=", + "pom": "sha256-5vYXKJXZezPLdShe5XWT7Jf3CMEptt0XSlEl0MAg6bM=" }, - "io/ktor#ktor-client-okhttp-jvm/2.3.12": { - "jar": "sha256-MfTZz7AtqNh08FDJhBsssx5TX5sTqXl69HmdWwNW0Qo=", - "module": "sha256-3LbvJt/LC5G4gprlRHqpPgkPOO9JoNNSHFKdD4dCUX8=", - "pom": "sha256-duHyGn0yARx70fSo5+PQLAlLqTBUbUNoJFfP/dYa91I=" + "io/ktor#ktor-client-logging-jvm/3.0.0": { + "jar": "sha256-VPWVvr26mEql1nZr/k2ZlLErMOLu+gMd0ZzF0+cASgk=", + "module": "sha256-BG20wfsZIQVklg9QhnAW2+9KpjXbvEp9Y1XEQtgZ5r4=", + "pom": "sha256-bfYvdXx5aBJP2B737DJs8i2xfbMIbxfp9qEACBn8Fn8=" }, - "io/ktor#ktor-client-okhttp/2.3.12": { - "module": "sha256-qbO/16t1wKjwHfdeBFgZ+QarS+hmNntpPI8rEV7ib9E=", - "pom": "sha256-bJpOKExTlJOcWcJPMBw+Um0v9ST/MY3+xTHPz53+CPA=" + "io/ktor#ktor-client-logging/3.0.0": { + "jar": "sha256-mHGJZAhCeexxqus3CN4eJKA33wamhBHIvjT2LBgQNMw=", + "module": "sha256-ldf3dcH61Ixik2hxBWXeb1gf257VUT7QvdzTxTagLvE=", + "pom": "sha256-uX8Y+QLz7wPBRngBvPYPTbeOw7vM/FWLNJSOR16A6Gs=" }, - "io/ktor#ktor-client-websockets-jvm/2.3.12": { - "jar": "sha256-1oyl95W+4IelVSiXQe9jhlFJuOUFuy0I5Fyh8x2MYuI=", - "module": "sha256-SNST0Ov+mK7puBx4WrgBR30iVTSC2UGUqEaeuPzp4cA=", - "pom": "sha256-VxEuZo1G9lKoq7yyVorduwzHbenEQb7+I86hrwYljNo=" + "io/ktor#ktor-client-okhttp-jvm/3.0.0": { + "jar": "sha256-p9mmD55TfEseB73ca/N7D+bSXFiNmT+DE2eHsevH5SY=", + "module": "sha256-tfBQk+8L6NeGdHdEtW059dJyhfG54umsf+32GBAXrfA=", + "pom": "sha256-b3jxdL69Mwc2L7OXgQjvZhIU6dqIjqvkTrJxewLevIc=" }, - "io/ktor#ktor-client-websockets/2.3.12": { - "jar": "sha256-qr3hPBfOOQOkZD+X89uWRfRiuDLtXQeDb2WBtNMMoz0=", - "module": "sha256-lBQ+mI228ZzeU2u7pdkwc2gxy+OFaPQoH5VSQgpanJ0=", - "pom": "sha256-DjRE95fKkOKxq4ZqH799sfnZBQguKl7v0YKoSrDxQyU=" + "io/ktor#ktor-client-okhttp/3.0.0": { + "module": "sha256-mnEmHQPWnGpy0G7rE8CFfxxjX5zEZkYE4dBa1VFJtl0=", + "pom": "sha256-4Un/ScN05PknjuBYCQ235TK6LoFPjHwILD14HRMfS1A=" }, - "io/ktor#ktor-events-jvm/2.3.12": { - "jar": "sha256-RPCx3msJRxgtJUCNEQHFbPjAGnuAnuAVK9gdmtyapXY=", - "module": "sha256-wbvWTDPBa1jkGAsX84UjGAVQl72vhJFKSCNhkxLtJ7U=", - "pom": "sha256-PKeHv6OHkBQvbKaLwYR7+AAtHiSDh3nhihK1vwIna5A=" + "io/ktor#ktor-client-websockets-jvm/3.0.0": { + "jar": "sha256-b6MvwTEvhkbtaoRXSNk2nvC/xOuKz/LxLHOFmFJ/g/8=", + "module": "sha256-vTOmfaXJez0PEd5S8bXiTWc1VTAibWp7Qc0LslIHZUI=", + "pom": "sha256-vECMavY453lRRmLluc/uzXiJvnUN9yhlgnYlyTfUbpw=" }, - "io/ktor#ktor-events/2.3.12": { - "jar": "sha256-dQdvbe9/VwlGkWmYMw0n28OvdhfOyyXRZXyaDUKQFgQ=", - "module": "sha256-+Smg6nj7EudbLYIlbMUfGL77D+8ZpGHuuJOJyVG43q4=", - "pom": "sha256-OUMSxuErQx+I/6KbrRS7mTXvJRBgyWWhatNcLxEr56w=" + "io/ktor#ktor-client-websockets/3.0.0": { + "jar": "sha256-bHJ51BRecggrWv5RsTn4KhIy0Z0y71tjU26cokrHfwg=", + "module": "sha256-WYHr66PadulBfFn1s5H+B1WRzJHdWnHKy5Jf8Pv0s08=", + "pom": "sha256-q0VIACgLhfvUBfvS8V5MW1Lbyvn1J75E7Acw9+/i6vA=" }, - "io/ktor#ktor-http-jvm/2.3.12": { - "jar": "sha256-kHERxDmzvUQz0t67aHkg1fjfjGIpto7VQIBdXjdjtqg=", - "module": "sha256-HbJfyAaPHE6s8LRgJCSSclOZItL3xCWOUR+F4FhSuMY=", - "pom": "sha256-QULK0p5v7rrjm64YKryEmVrsdwRk8lLfT+ZF4aXdfBM=" + "io/ktor#ktor-events-jvm/3.0.0": { + "jar": "sha256-hYuNvw+oTgKBYMw1jYgAKeImhgqWUdE1I95DaGn1qAQ=", + "module": "sha256-MrOYUrHaB8Ok/JO52KygXs/M1JdDIIsMxN8Zo9BdKw0=", + "pom": "sha256-pvL+a0iw1GRaHneE7ksqXYhRzhANxmiPXBnd+dRPLUA=" }, - "io/ktor#ktor-http/2.3.12": { - "jar": "sha256-2RVRfiXE5feMUP0Yg3twtGKbhQ7sXmTz5GF8Jj5ovbc=", - "module": "sha256-97kqlGhYpGSFonWEZ7EolLEmNK3B1AKQN62Fiec7MOU=", - "pom": "sha256-urBNfz5lqaxHnOzij77ymx/UAVkT6ZUZfHbORE9uWGA=" + "io/ktor#ktor-events/3.0.0": { + "jar": "sha256-9ZTNha1EJSlDiwtnUxk/nQcddWC+0Jh/RI/N1eKFUBM=", + "module": "sha256-f6YQu/QOHvwO0R7EfBuHmxtfoj+BGuo3SPBn12I4d5A=", + "pom": "sha256-2HDxlAmG2penAr/ssP/r0mn+Gh+dmlVtwZRsNu0zzEQ=" }, - "io/ktor#ktor-io-jvm/2.3.12": { - "jar": "sha256-HZOkVmX2dE/5bNe5ekX7hf/scltjvMMn0zomocfgX70=", - "module": "sha256-ZH9Yx3f3Z9IIkwbbiF9o9YyJjqGwm4+956NwUC/61BQ=", - "pom": "sha256-W8eJXaz7EhDj8C/Qchz7sSaQOaFqr5PppHGpMa9Ufe4=" + "io/ktor#ktor-http-cio-jvm/3.0.0": { + "jar": "sha256-uMqpcgttvrmKEuPXZlLZePe9237p0QO4xHJ+SK2t+Ew=", + "module": "sha256-F1/xTt58LIlDrv6ZM1mfNI0twO4Z0bMJnR0P2hm6SOg=", + "pom": "sha256-hcmW2+P201EgrxIjDwMrQ7d4x0H4tfHZJWgCvsFj9CE=" }, - "io/ktor#ktor-io/2.3.12": { - "jar": "sha256-n4jHL7xCPrCerCM9Qc4/npXZJQ4EntgD4HSoIeQsv3U=", - "module": "sha256-QCIhmbDLWK9t6Kv8UzMIVLv3h05GYpsma49J68XW54U=", - "pom": "sha256-WAtT3KPqyxvto29WIH+8uA3T9hk5h5/iEhd/G2RLJb8=" + "io/ktor#ktor-http-cio/3.0.0": { + "module": "sha256-BryhzL2ZnhkXL9sMP9fFchEO2Zb2er/p77yKCqOjX4k=", + "pom": "sha256-rQVo9KYQTK3KH7vr8bytRxo5cPCCMfE5Lv3WhMZeMKI=" }, - "io/ktor#ktor-serialization-jvm/2.3.12": { - "jar": "sha256-DgVTT7w7CUESe27znnBcNMNn2uiwoIKQcBxg6X6I+nI=", - "module": "sha256-GTKCfmbOzf9dgIaAjJdK/es3fM/bL50f+UBFdX8o1LE=", - "pom": "sha256-NrmT7RV8Xg2N6VDQjNIZyykQnY37JPYIyonzI062VzA=" + "io/ktor#ktor-http-jvm/3.0.0": { + "jar": "sha256-5YLda+2FFQWMn2obwwfIkawnkL0teyzJ7uwBbOUiru0=", + "module": "sha256-4gQAv16GCdB4DmNqz41jTEbprpYcDcYQaf9ednDfzJI=", + "pom": "sha256-66HWXy8EQXLl17IU9TKqngBZH9IEbddnqwwCX36quME=" }, - "io/ktor#ktor-serialization-kotlinx-jvm/2.3.12": { - "jar": "sha256-xhQnYJ9dbw45jfvySnyafftK1ZDon1TFwCHNfHEtSn8=", - "module": "sha256-UO9Nf4ee4QDi2uz81/tHpIX7/CPcNXDAPki21LZIfgg=", - "pom": "sha256-XbOFoQf2k+Mgk+TrG92VWfIqVsJdvxkN77eCrAtQocI=" + "io/ktor#ktor-http/3.0.0": { + "jar": "sha256-CEl/mOtpUABmJ4T12qd2FOw+ZsoemAM5zLPYri5Hr1c=", + "module": "sha256-lM74twGDwzx0gSwe4aD8lnlUAj7VzCIeZaW42UkqmXA=", + "pom": "sha256-jlUcXPg38AJy34ylxQOfRDIeoIO+8rLP73qofrqNVaw=" }, - "io/ktor#ktor-serialization-kotlinx/2.3.12": { - "jar": "sha256-+lu+kbBqPGUW1olfbvKp15rAEJO5jDKAzCv/+kgktQg=", - "module": "sha256-giYVZjIHuPTT72bZO+yzk1QhDhUEgOcHrI/LFkmYPRA=", - "pom": "sha256-1WBIrQOYmjq3ZFiYEZZ/Pt3edNBwPNGIQyS4LWCDHZc=" + "io/ktor#ktor-io-jvm/3.0.0": { + "jar": "sha256-ustZQyg85u0gFCYJeUXppbVqyV94O6abqFRWT3POT70=", + "module": "sha256-C868aTrqNg4R36xXe+9d4qo8QhBcCHPUPMj/sTzvRoM=", + "pom": "sha256-6uEaluV4CT87forg1wW3Xx11llzvt3Xq8SNz+O/zDjU=" }, - "io/ktor#ktor-serialization/2.3.12": { - "jar": "sha256-I/oFsvofdMi+5JsvpNCmzRaXdvXLw7e00I5nfmr7n14=", - "module": "sha256-k6tLV6lbcXNH6smUDI5QkhvQ2EBKw4j6mDlLRaqMRGo=", - "pom": "sha256-Q3WCoJTbZp2kPogfpctbs8IGJ+O+HgNkqk53hSqrG4Q=" + "io/ktor#ktor-io/3.0.0": { + "jar": "sha256-CZDBLe1OL74D6pFX4X0hoNH0IXtdjKlqV8r0NY00Mhg=", + "module": "sha256-9ZwwqS0Pw6mfz+Iho1F78enmaHznA8neNopHZmyBy8U=", + "pom": "sha256-Z49tKZWdnC2PV78B76DN0wNBhlxiC3eGpw9EaHhvtb8=" }, - "io/ktor#ktor-utils-jvm/2.3.12": { - "jar": "sha256-anLWhnMwBl7UYZUv/xnqVbqEQ1L3SM7Bhy9bx7Ie/AI=", - "module": "sha256-rYMuChkwgwCinDQNvY2I0pAcLzuw+CFhrWamLSB4VgQ=", - "pom": "sha256-Xi3ckkIaAAWDUdMPo45yB6qYsZ6fLYCYRFmIB3yPNGE=" + "io/ktor#ktor-network-jvm/3.0.0": { + "jar": "sha256-aKbOFcq9o5XK+Nq1X6+NfcnjH3BshrLOkMz+dHSIwwU=", + "module": "sha256-QQObTaUHAcPcLz0ef8qOhRrQPvN7Rndws1JQPo2MoRY=", + "pom": "sha256-84dDKHVkySEeG9z4f5anqHzR/TiiZqQsBjkUPDbESPw=" }, - "io/ktor#ktor-utils/2.3.12": { - "jar": "sha256-SJeUj4AL85YHGPuaWv9QErcht7iWZjhZWCbGstp8TiU=", - "module": "sha256-Rxwq3h1BTGX6Y9C0LIdLqcuUhGsZQQnD0PAEOwtnt6E=", - "pom": "sha256-lIfQwBRDfsjcthP6Gl345WmTsc7wQqKXMPw99SQlsrg=" + "io/ktor#ktor-network-tls-jvm/3.0.0": { + "jar": "sha256-w6Xr0Z1DiWKpZFjTptuyJDJTxSjWtgloLPObh68bkNk=", + "module": "sha256-/tUy73zGrUvrVIBb82LrIiG1SHQkxHQIZw3HOFXOM04=", + "pom": "sha256-NLeibN8zzWUCpPOngEj5sgX5ZAqRBh5EFYx+lck9IiY=" }, - "io/ktor#ktor-websocket-serialization-jvm/2.3.12": { - "jar": "sha256-v/iQ16thcVUa5PBjLprsy5BI3zHW1zz1Cr1bMwCArTo=", - "module": "sha256-PeyRtQnxTtpFGjWpyOY+bmuNJz/4i2u74BK7dTzdOwk=", - "pom": "sha256-pqTtw4NX9DjErB5Zbqp4SILGmurmVz1ksaKrc/cNBp0=" + "io/ktor#ktor-network-tls/3.0.0": { + "module": "sha256-zSpBln//ZOOe8ow60Hta9o2BF0C+eIJVCj24o8qgoAM=", + "pom": "sha256-WsIkLG+Uxz8ZmNky70+OxI8omNwjuunuPp5F1xdYChQ=" }, - "io/ktor#ktor-websocket-serialization/2.3.12": { - "jar": "sha256-JCEwwgnDIoLZ8g7EnlfXSBihpyiADs2QLe7dzwURgMU=", - "module": "sha256-lbcbDeXFGs93fnTXkCAnFoZi59dR3aU7lJ/C+ChHSuE=", - "pom": "sha256-eU8LskUjFQQH8+ZTrYqUYzKptPmp1ryv/RBlvxN9iSw=" + "io/ktor#ktor-network/3.0.0": { + "module": "sha256-3EgpWzP2klWeajqD3fBLMXBIVt7y86oaF4x7qyKM4qQ=", + "pom": "sha256-A8TtZp2CmBY+KwEWDTKyqtNMpMtY40U8UYP6xzjY2NE=" }, - "io/ktor#ktor-websockets-jvm/2.3.12": { - "jar": "sha256-3DXMU59N+lpK2bORwU0GUn36xPZLPj8FD1FDzrIVvKQ=", - "module": "sha256-Xcz1g9dBybFg9pnYyGS53n6JrFz+f2fTHQIHvaejvl0=", - "pom": "sha256-Pc9D1TtWf3T3z2VvF/r7QfRtqztf+6AHZ2EsJH/W7Rw=" + "io/ktor#ktor-serialization-jvm/3.0.0": { + "jar": "sha256-tphacvF9XmNyJga+0q4+7V8qG2guBQ00s/RiOJ1BZMU=", + "module": "sha256-WxJ3pA51L/9d16G0KUIX5yA05F0DkLvYDVXSwOzeduI=", + "pom": "sha256-dbdCQwGmzkLBWMaLHdk1WFR5kPgldH2k++lrx/jb7rY=" }, - "io/ktor#ktor-websockets/2.3.12": { - "jar": "sha256-XdKULp+AhVyqGFXiShT3DxqHWcg3tFTplRdqPMl3QVg=", - "module": "sha256-7biouqRoijD0YqQtIuirAHY4HvISCkwKqyasIkTsQaw=", - "pom": "sha256-fikEQUdSd1ifC2TgEptfmZHQir9YQwZCzMXfiYbEh+E=" + "io/ktor#ktor-serialization-kotlinx-jvm/3.0.0": { + "jar": "sha256-Y/3fsW8jhfou66QDYK36mZORJmfjNbBUbizE3g/WamQ=", + "module": "sha256-pNrlPxx/8Gok5UuUZh8MSsuG6p2okwAAW1kzbcBnbXc=", + "pom": "sha256-Cn/umjR5S15uoqzhlA97DP+2eYKJhtzQEInaoLzFgmw=" + }, + "io/ktor#ktor-serialization-kotlinx/3.0.0": { + "jar": "sha256-AWgIAmI0ygHr3iE67Uc/T8+4VA3xLkPvqd9NjB2HBtc=", + "module": "sha256-2n1xFSKjIhKqqzrFXOi+g272X+fBxaibqH0DbTOsUEg=", + "pom": "sha256-hrIYOupbviqDE5LlbUGlsNlnzL/pUs1rydbtBTYJw/g=" + }, + "io/ktor#ktor-serialization/3.0.0": { + "jar": "sha256-sgYtSF4XAhkeDpzlck6xSIxujiT3pzHd/GVp18XNFtc=", + "module": "sha256-6Hm2OkUpK6vY+9Vq/apM0tRcgl9UDUCbV1qtMreBzgU=", + "pom": "sha256-GCmTn7aFj24LQt0gXZm6Rbs0WQXtGX9nZsNKxRXzHHw=" + }, + "io/ktor#ktor-sse-jvm/3.0.0": { + "jar": "sha256-2JiNEV264UTuMIXtHBdKj9liZbxgM08oe6T1MvsGEk4=", + "module": "sha256-8jNJUX6IfymWJgNyBJg++6eqZV76pBSoeI0GxaCiflg=", + "pom": "sha256-Pf5Qu4jMkmzPn4pQouE0/ZzLPrN7W8pXW54OH0T4hu8=" + }, + "io/ktor#ktor-sse/3.0.0": { + "jar": "sha256-CkMI+fHIHh4OBspttiiNLerdin6lbj0ecsGurdY8FE8=", + "module": "sha256-JuiqoUnE62CLupjnCtcASvcN+DTD+BhRxeSOpA6ocX4=", + "pom": "sha256-J62e0p1svkljhSjK59ygtKmhdrhhdFBSSw+KIG6OoSo=" + }, + "io/ktor#ktor-utils-jvm/3.0.0": { + "jar": "sha256-lDZE3TKFJchGh7zbQjblTTN9Gh0MQShovw7dU6XwZ24=", + "module": "sha256-No4rXA43P0HACHGBm0/PSaZbUDuLld9t3uy8RnAUrvk=", + "pom": "sha256-kBqY9RkGg97j1yDTayuOhAcVLMTA/H5ZQTqYP8JITjo=" + }, + "io/ktor#ktor-utils/3.0.0": { + "jar": "sha256-KhfT/Xw0P8joWZ4YGu61WK9gg97quti+DONF/yODxHI=", + "module": "sha256-ycYexU9YjOSZHvczyapSggPDQV3d2mJS/sxpLk5sgyM=", + "pom": "sha256-I7S5AYs7mWJg4MgMDskOaOQgknoBshGwqkZBa+NDkOU=" + }, + "io/ktor#ktor-websocket-serialization-jvm/3.0.0": { + "jar": "sha256-Xbqz6z12xUytvAAfC1DEK9ypIJIcKuLGnMCBg6DsM0A=", + "module": "sha256-0eyfafctLS7fjzXprokVGSMPbvj17Y10IunQO+d7s9c=", + "pom": "sha256-4YgNYCDataGuPj6V+Sp+NxpC67ddXbp+DovuLvyUsNk=" + }, + "io/ktor#ktor-websocket-serialization/3.0.0": { + "jar": "sha256-5AGS3sjS8nW1CBCTYUwci8XWzz9Dg0GmVK241fmFwnE=", + "module": "sha256-k+e4Y1Helw6ePdNX1gkxKjmQAFku8/FRs0VsXQI76z4=", + "pom": "sha256-exvxu8zgYx2lyIa1b62xwd2aPTqLDL21Lp56URCPx5Q=" + }, + "io/ktor#ktor-websockets-jvm/3.0.0": { + "jar": "sha256-dQt7iJh6EZ+jK9yt14FVV8NWNYe7temFx2l98hBieaM=", + "module": "sha256-9PY7ei2ivWRtfqoKU8pULQE4YkuMTKMzTEaK92lxizc=", + "pom": "sha256-+aeJOtYmEras6xdL+BwwdUGKIJ15JodU/XnYKKAM9Tk=" + }, + "io/ktor#ktor-websockets/3.0.0": { + "jar": "sha256-phi7sxswNCc9YhDNMuTD5OJ+2vi0npU/Kf9vQdfcso4=", + "module": "sha256-fOCebPFtIZtUgJ98HXjDuuY3LAEmB+IEgVbGaeKiGF8=", + "pom": "sha256-eNL1rfAuoz38I4lK4bYLfhbKJiGwPmKBOlEgUMgBMlI=" }, "io/netty#netty-buffer/4.1.93.Final": { "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=", @@ -2206,23 +2236,77 @@ "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" }, - "media/kamel#kamel-core-desktop/0.9.5": { - "jar": "sha256-q9TSnDOThoqV9YEyU1cBjuowoN2a7QbDDNyv8cJ+m0w=", - "module": "sha256-bExl33UFF/bJa7mRqh+JVA8lYD4G7y9V7svnkzBA9lc=", - "pom": "sha256-4+vAf2+3wh9bib7xc+5KQns3xzvEFhWMJ8l0EayFgms=" + "media/kamel#kamel-core-desktop/1.0.1": { + "jar": "sha256-8vKOmPKlyGT/PHcEyrH0BQkYGsp07Qcz0P0+DR2Zw+8=", + "module": "sha256-CKKOsNNILL/MVX4eNg5YSEBWr0cKOfmzDZkLyiKZIr0=", + "pom": "sha256-/9V0d+0R5jbb9z0u6zw9ZPi6k4CpwDcKx4tqSbnze4w=" }, - "media/kamel#kamel-core/0.9.5": { - "module": "sha256-o7ZF44wFJCXXyhmWWE6+nEX0L67aYyEXV9ZTC4Pz2zE=", - "pom": "sha256-iRvxS1TFkxpw4QWQkAYp8mgA1FWM3hdldMZJvEy1Z+4=" + "media/kamel#kamel-core/1.0.1": { + "module": "sha256-H4FkNQdjPKhfz2S3yuvawg0mru3nm5QuvEHIooyg5Kc=", + "pom": "sha256-HN563jjU0YGQRjG648IZ0yD3nQ0agoTbTCYZoY98jYc=" }, - "media/kamel#kamel-image-desktop/0.9.5": { - "jar": "sha256-hcIZ8U9u3bJM+u3uLnf9U7lPaBBpRrKpjLC3ZODCFKQ=", - "module": "sha256-GIUN5w3IniJ03C0xIzhABInowxxi1niWQRj0Yh8Lcww=", - "pom": "sha256-dMQr6gAM5sTJPssay+jFNi70msEMTJDz9CzS9YusgEM=" + "media/kamel#kamel-decoder-animated-image-jvm/1.0.1": { + "jar": "sha256-SVItvyv5ILBqn+cR2fnlU/IPLMvKyPgL16UD8f5wWVU=", + "module": "sha256-fG/Oz6p5DSvMU1oMy2i90w9Wuqh4VGxxL12b6QAi69A=", + "pom": "sha256-0rTizFuE/zZB7f0bgvm8gSitaKv59SRdu9sUXvjshF0=" }, - "media/kamel#kamel-image/0.9.5": { - "module": "sha256-lKjteS+qHphhO9C1gpeipIVDqKqp41kXB1x32sQiunE=", - "pom": "sha256-IxeO09JzxhY98/inBV9cU4oksNpXGYUFsFyQ1bdau98=" + "media/kamel#kamel-decoder-animated-image/1.0.1": { + "module": "sha256-PTstgotFXOJ/IDn+68g0Y14z2CjE+K5b/Azw0KZ0vjA=", + "pom": "sha256-s9YLVLRetKBzBcSbHTAs5ARfq0AzU9GPrJZdUaieG1Q=" + }, + "media/kamel#kamel-decoder-image-bitmap-jvm/1.0.1": { + "jar": "sha256-YJ8Kq8+FBtNrcg7BzuUZO/BJqWi1cMb1ACmGokZ3bqA=", + "module": "sha256-Hj8292JjzDiNFyosy2mtPdgnY856U71BWpNHN6JXykg=", + "pom": "sha256-TsyEfyOCza1utcvDidlsTTx5P2z/SdsjS40KBBVoLF0=" + }, + "media/kamel#kamel-decoder-image-bitmap/1.0.1": { + "module": "sha256-bGMQcs47rFFKZtxyfPG3+Y3q9FW5omsJHUUMOFsA9NQ=", + "pom": "sha256-2H7DNLj5q7ydVwLOuasaj2wBCSblSwHPa7DZXsYPXFw=" + }, + "media/kamel#kamel-decoder-image-vector-jvm/1.0.1": { + "jar": "sha256-yt6sb2hn2pNOYwhsvvA4zXbQYP7BaAbCnSSKddGUGgE=", + "module": "sha256-5fkYIJR3T1ape4M0kyi/WcYfgnqgwwCy02yEfBCJYTU=", + "pom": "sha256-xHylt0kkZXXK1JHg6thTVBafGpZsG2swu2NPm0PW5aM=" + }, + "media/kamel#kamel-decoder-image-vector/1.0.1": { + "module": "sha256-2zU1AaJ92tjuTAs+BXrnDgf1dxTvMFxAFdUbHV4DxOw=", + "pom": "sha256-U27v42PhrWYaZuPN1q5Y6dK7TYTo7t+6AAfoQF3ykHs=" + }, + "media/kamel#kamel-decoder-svg-std-jvm/1.0.1": { + "jar": "sha256-ERkO0a3BAKbPH1DgdnxHWGB6m8+heC2yZ1Vf578zZMY=", + "module": "sha256-KtMHGYxMW2yHCKSFdNeHJ950taP/KPwha1yls3EwDVI=", + "pom": "sha256-BBMl8hh54taGflYEuB0uwI6VZvi0ozxzYNqwvTsY8V0=" + }, + "media/kamel#kamel-decoder-svg-std/1.0.1": { + "module": "sha256-wQW13UlxDGTDkWUkPgK2FpgNi8WN7V+3e/kEfHdOR10=", + "pom": "sha256-onFDz/fQpE9590nSpZnX6iaH7oafEK8MjkabCYcZNPo=" + }, + "media/kamel#kamel-fetcher-resources-jvm-jvm/1.0.1": { + "jar": "sha256-waJjSnPzMBsj21DVp90moiFGpbgp8IMMsQIdhLch80I=", + "module": "sha256-1GTYoXbFRIau3JzvaQfon7V2B5Xtr7WXDgXFwX15zB0=", + "pom": "sha256-ssYSzIH/yo138/ZgDq6UgT9hYamPBnllM2H2g52Igww=" + }, + "media/kamel#kamel-fetcher-resources-jvm/1.0.1": { + "module": "sha256-//HU2afNeW4SzaPxdhZyIjfSZNZ6lTfld/+X1d+jSxY=", + "pom": "sha256-VU0rk/zn0iyxqraaTEq9OKH0ug9MA6uOY4YRsOmJbOo=" + }, + "media/kamel#kamel-image-default-jvm/1.0.1": { + "jar": "sha256-/CcFqll+8JmLBj2FkiWajx0HcfzReIjPL54CYD/CiwQ=", + "module": "sha256-jcOjGd53g4DBbJCxI9MfR0FgBUsHDUF6UFsUDdu1k8w=", + "pom": "sha256-Wj+xE+vtx9mCeSGmns8aHnIOPPLmp9HfC88eQSi/vNY=" + }, + "media/kamel#kamel-image-default/1.0.1": { + "module": "sha256-SFbCHa/OFee6/3kqMXUFUPsJJ+qyfhucXDyhdLK1p/Y=", + "pom": "sha256-83dDAmegjOsqSwGiZj6K18Ur63RjP+McmtbnnDzG22I=" + }, + "media/kamel#kamel-image-desktopjvm/1.0.1": { + "jar": "sha256-vgmSUIpe4daxBiqdbPUJGBL2BgOLrS6c0waIl1L9Ln8=", + "module": "sha256-O59acoMjfMgzDcGJFaMlj/tkyzfJuSv+F+E0KH5YrfQ=", + "pom": "sha256-YIiiImO40TkdYTIPYsQKsyPAZsY9XVCkiZsujhMQXsQ=" + }, + "media/kamel#kamel-image/1.0.1": { + "module": "sha256-faLXSUC3gTNAbabysCyh9o+WAK6wO7fOLvdxHTodonY=", + "pom": "sha256-QXovGqqUSErVNV0ylHdRkhVC/TgIKtC7YWQLBEMMdWg=" }, "net/harawata#appdirs/1.2.2": { "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", @@ -2278,13 +2362,13 @@ "module": "sha256-6NeZJbYmUlEtku/D9v+0SL97teQQtwDt7KpabA6mfm0=", "pom": "sha256-gMRjsS90NbGxi0UXYRjAKoktGFJnfzP7sHF29hI3UlA=" }, - "nl/littlerobots/vcu#plugin/0.8.4": { - "jar": "sha256-54Zg4AVaPeGW7E9O7cBB34upJus06eLzIlnIj9/OLrc=", - "module": "sha256-cFqZ+tmabls7BiLsrXcF3+D1jfkXOzo5UdozWkYGNqQ=", - "pom": "sha256-U3Oz7JPtlCF07QEuUZBTR/PCmms0DEl+PJBfc8HEiUo=" + "nl/littlerobots/vcu#plugin/0.8.5": { + "jar": "sha256-bMCdHHgrZ1qTLIzypOMDQA3uPPRGShOuUa5k04oBgtI=", + "module": "sha256-B9AOrP99ZqEmVYp7WU1BaSfj9QBjGHoApMhdmf16ZwM=", + "pom": "sha256-8ydVioHfhiKEe6DDTyxKRH8/pEW/gumvo7vaTbktX0I=" }, - "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.4": { - "pom": "sha256-wXuWwZU3Y1m5uVZLE/ivDIGvCWFYZJaY3rlpYET4L68=" + "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { + "pom": "sha256-W/veb7xPghahHsYmub2pMmzhrSEt+/slMg0YtjBCoFc=" }, "org/apache#apache/13": { "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" @@ -2304,29 +2388,16 @@ "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "org/apache#apache/3": { - "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" - }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, "org/apache#apache/32": { "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, - "org/apache#apache/7": { - "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" - }, "org/apache/commons#commons-compress/1.21": { "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" - }, "org/apache/commons#commons-lang3/3.17.0": { "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" @@ -2379,106 +2450,27 @@ "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=", "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo=" }, - "org/apache/maven#maven-artifact/3.9.6": { - "jar": "sha256-rXoPtAj45HWFzMDQAR4LUB2Tv8mIjTabvUoEPRlHUHM=", - "pom": "sha256-thCjsCWYK5hXbXZkkArOMTYvAFgnBR82mOZJ0onz/7U=" + "org/apache/maven#maven-artifact/3.9.9": { + "jar": "sha256-MPAV0cGjk+GcGM1PQ1MgicNtTKMoYIzj3aeLdNPTFRU=", + "pom": "sha256-Zd33a5KnB7nxJA7Mu0d0sw1Md3eGcSkf01XgbU06lt8=" }, - "org/apache/maven#maven-builder-support/3.9.6": { - "jar": "sha256-4fTSeERZzoo0udrhgpoZmbVp5IPiHun6pzaGkecpKW4=", - "pom": "sha256-fel2uM6xpmr+Jn8qp9YVcA0JxREHqt4hifaf5DNIKlA=" + "org/apache/maven#maven-builder-support/3.9.9": { + "jar": "sha256-LKSpZ73RKp6F1A4BI3T4bmPUoQMMGZ2kgy49ChxncNg=", + "pom": "sha256-CsMYAC8RBXG6pXHs8gaX/sR2cEjSl+JohFW5FNUDD/4=" }, - "org/apache/maven#maven-model-builder/3.9.6": { - "jar": "sha256-X5ba+8QR7ksehCY2jQ0x0Fq1pNrOaYCBQxQqABdZhyE=", - "pom": "sha256-yMK3G3CDmPoHecNIR04O/+R3kb/MgPkikhnzCzoqRSw=" + "org/apache/maven#maven-model-builder/3.9.9": { + "jar": "sha256-pDdxgqwuWt/ha+OzyBmBpezdqwFBhN5yrh5SLwSndgI=", + "pom": "sha256-nSOvDg8jIkwgMgnRG3asYJClqWfT2IepIKekeyYMC9g=" }, - "org/apache/maven#maven-model/3.9.6": { - "jar": "sha256-T48H/ba4cB+omiOi7fgwgI/WWJLZDM5AwObffI8vy2I=", - "pom": "sha256-xNfsyyheYhET5UPvKT/SffqNEuoGEh81e8sR69gHrnU=" + "org/apache/maven#maven-model/3.9.9": { + "jar": "sha256-j1mwoW/pyTO+dJpgrgcFoMsze7WrrziAG0C3QP93Vyc=", + "pom": "sha256-G0gGKxU4fBxCBBV64ZpWCRnftXKLPpKhHlUD8iL6q0o=" }, - "org/apache/maven#maven-parent/41": { - "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + "org/apache/maven#maven-parent/43": { + "pom": "sha256-RooSYumqpf6/nWBOKDYmf4FTUfK0Ug8o+xf1PHHjNVQ=" }, - "org/apache/maven#maven/3.9.6": { - "pom": "sha256-ugvzJcUpVAWOmnAp5AJzof4GvkpQUw9qTrpGxVih5Kw=" - }, - "org/apache/xmlgraphics#batik-anim/1.17": { - "jar": "sha256-Z9nWkezshXrDYo+9IWfCAZQNPEtlq3OGSErHMMuM+eo=", - "pom": "sha256-SNpMQT2e8VZ6EKLn7UNPpbuOzrfolW9jxLlw42/avxw=" - }, - "org/apache/xmlgraphics#batik-awt-util/1.17": { - "jar": "sha256-f+OPlFHrlFdSFDIyYcgZK2Px39JhBlklX7u7/elKKmY=", - "pom": "sha256-K0uhvyKqtiKmdyIXZTnRlWJ92KVfggGRq0udbh/PrgI=" - }, - "org/apache/xmlgraphics#batik-bridge/1.17": { - "jar": "sha256-O9An4ZoL4klsLDlQFSUlyRRhp9CB7b2Ci7PS0mnsWHA=", - "pom": "sha256-SfOQORML7tSikG1DGOSpv8l+yRax0bo+trqK9BigvVc=" - }, - "org/apache/xmlgraphics#batik-codec/1.17": { - "jar": "sha256-ZDSkhxe2nwWYaGZlPnXVKED4Es0rwnpb9diK7pXkEh8=", - "pom": "sha256-cfyOmfGNajQC9Dtl+R9OwtkiHy22pzTOvohmAUKOhJ4=" - }, - "org/apache/xmlgraphics#batik-constants/1.17": { - "jar": "sha256-ddsAGAveTvXK7jkW1vZeUEUFHVnPUdV+ZzwDlp17u80=", - "pom": "sha256-BtbvBrb+NCkKDiopaz95YejFX18VgvCVIcguAAt5Px8=" - }, - "org/apache/xmlgraphics#batik-css/1.17": { - "jar": "sha256-3PmpAr0MSxqErAVh17ZgUryTOBxJI6W8VgIpDByCt3k=", - "pom": "sha256-kt6q1WROf4uqA6h0YZwha2eEc02elByJYnkzsKmxUTs=" - }, - "org/apache/xmlgraphics#batik-dom/1.17": { - "jar": "sha256-8kLdsFsmixX/BV0dGq8tycNBjoQrqAZzFAiphNTjJAw=", - "pom": "sha256-5j2XE/BJoPrXcWpbixROVgr7L4Opygbe0mi0QlRTjyY=" - }, - "org/apache/xmlgraphics#batik-ext/1.17": { - "jar": "sha256-gmf8YLSlsPKvp9z9rUC+sOcj1qGbZrjiS8N8LsbcVFA=", - "pom": "sha256-SIjUiOkeJB9Apenz6xS3eg+/tGK29U7i4krFp0NYh94=" - }, - "org/apache/xmlgraphics#batik-gvt/1.17": { - "jar": "sha256-k/TkqETK/Fs9VzGimbwAzxRAQCbdyx10nSnKeUhrS5A=", - "pom": "sha256-zIhrsEtaMpUrKgtYmx3XNZNoZg/ysqxcBJ5MNkdSmpE=" - }, - "org/apache/xmlgraphics#batik-i18n/1.17": { - "jar": "sha256-1aZGgDY+ezaz8ow0o6U2126Ef3fOwHQKq3x5mme1LYs=", - "pom": "sha256-LczXNOp8Pf3cOQDcrOgYGIsUZsAq6dqK4wpwj3Tw9MI=" - }, - "org/apache/xmlgraphics#batik-parser/1.17": { - "jar": "sha256-XkSLv69hJ1Z/QfaY7iWtebhENjBxwS0RdYlseIkXF9c=", - "pom": "sha256-O4WKAV0DzUCF+HnRF81IbyijM3IIG0oRL/w5OjPzMOs=" - }, - "org/apache/xmlgraphics#batik-script/1.17": { - "jar": "sha256-LMu0vW1aYw+30m8N0xGNR0L3uuDpcu5nITDoA/ZylQw=", - "pom": "sha256-cev1FjXjwA1UnPAc/HxAZXssvZOCUVkUf73N0U83xqI=" - }, - "org/apache/xmlgraphics#batik-shared-resources/1.17": { - "jar": "sha256-XXQYK5yhns2NSBTy/0tCpK7qbhiXfpBcyE6Kb4GUDJ8=", - "pom": "sha256-ut4U1rq9//BiLBjNPCUf9flZN4MFieL2jgO92nu1RxE=" - }, - "org/apache/xmlgraphics#batik-svg-dom/1.17": { - "jar": "sha256-GTRyGKSQZwxLnSzRWkUVXBr59B539+rameuU27kL6OM=", - "pom": "sha256-BRKX2S6SjPAcAWqpNp8zhw7EEBQ0j30C6avoVZKIvlA=" - }, - "org/apache/xmlgraphics#batik-svggen/1.17": { - "jar": "sha256-EI9yX/4TXcpWbZJfOs4mpfgDmfKIyhkFYYBd7CgAXWM=", - "pom": "sha256-3HgOLwRWFTzXBP+zLhjGababh+ZW77ku3KNv7tIz1DA=" - }, - "org/apache/xmlgraphics#batik-transcoder/1.17": { - "jar": "sha256-H2nphrRukfcHzxMUP04ukwufYKaXhY26vbq1y4bNWg8=", - "pom": "sha256-4UQOu5q+0Ev3RDbBkVOFeGNE4iFBaooCLHGO2oY8al0=" - }, - "org/apache/xmlgraphics#batik-util/1.17": { - "jar": "sha256-oeT3Q8i4CsaC7dSzl/qkrELeWRNDA2MkyA7o8ilzyXY=", - "pom": "sha256-gtWFfUG9TeWskX7sgSoz0zKXN04UOAew4KYt7KBVofk=" - }, - "org/apache/xmlgraphics#batik-xml/1.17": { - "jar": "sha256-+8wjAAZqxAQodsUsMnrN8LUVli8WkEAO16eO0sDUwbQ=", - "pom": "sha256-0ypeBt4LkxxN2ebgS/oSQHwkNwmmmNdpZ7TnkYoPLn0=" - }, - "org/apache/xmlgraphics#batik/1.17": { - "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" - }, - "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { - "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", - "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + "org/apache/maven#maven/3.9.9": { + "pom": "sha256-0k7WiSPfIQ0IW7XThtQzbRLt5UczkuFZ1ebmRJevbzk=" }, "org/apfloat#apfloat-parent/1.10.1": { "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8=" @@ -2495,29 +2487,29 @@ "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" }, - "org/bouncycastle#bcpkix-jdk18on/1.78.1": { - "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", - "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE=" + "org/bouncycastle#bcpkix-jdk18on/1.79": { + "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=", + "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs=" }, "org/bouncycastle#bcprov-jdk18on/1.77": { "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" }, - "org/bouncycastle#bcprov-jdk18on/1.78.1": { - "jar": "sha256-rdWRXmrPxqtYNuH9il4hxkiFNqjB8h84bus78oC3Atc=", - "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI=" + "org/bouncycastle#bcprov-jdk18on/1.79": { + "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=", + "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ=" }, - "org/bouncycastle#bctls-jdk18on/1.78.1": { - "jar": "sha256-SDvRWC05V63+EAdH8ixtoP+VMtZGT5xFQYH5m/pE5Ss=", - "pom": "sha256-Y4vYWwP9193HoELp+C8gXgNq/6DfjS4vXbvzsIEQKBA=" + "org/bouncycastle#bctls-jdk18on/1.79": { + "jar": "sha256-Sv6EeOVsB7vaRetA+omJjxPEf7mW77IDjz91ob2kS1o=", + "pom": "sha256-igGqMNhmTofBiuQ0VlTc28EtiT44bh+KBjmZj4QjeG0=" }, "org/bouncycastle#bcutil-jdk18on/1.77": { "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" }, - "org/bouncycastle#bcutil-jdk18on/1.78.1": { - "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=", - "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI=" + "org/bouncycastle#bcutil-jdk18on/1.79": { + "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=", + "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI=" }, "org/checkerframework#checker-qual/2.5.8": { "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw=" @@ -2541,9 +2533,9 @@ "org/codehaus/mojo#mojo-parent/74": { "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" }, - "org/codehaus/plexus#plexus-interpolation/1.26": { - "jar": "sha256-s7VBLOF4iRA+pWS838+fs9+lQDRP/qxrU4pzydcYJmI=", - "pom": "sha256-4cELOmM1ZB63SmaNqp7oauSrBmEBdOWboHyMaAQjJ/c=" + "org/codehaus/plexus#plexus-interpolation/1.27": { + "jar": "sha256-P7T7YUP9+WQCTDy3OFUVJLnqhOXCEc1mDFWa0HA+UjA=", + "pom": "sha256-1U+8vEOZ41IyKHSkEoudKP6f4Vg/iew2HeJC6jjTP5s=" }, "org/codehaus/plexus#plexus-utils/3.5.1": { "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", @@ -2552,8 +2544,8 @@ "org/codehaus/plexus#plexus/10": { "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" }, - "org/codehaus/plexus#plexus/5.1": { - "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + "org/codehaus/plexus#plexus/16": { + "pom": "sha256-aNTu1lo9u8NC7YDdE4++nGfLf7TCq8T1IBzbW59kWGg=" }, "org/commonmark#commonmark-ext-autolink/0.21.0": { "jar": "sha256-PNV9XR295yTmcAxTpZBTS7JPPiaV/zUF66MtxMd4G6k=", @@ -2580,12 +2572,12 @@ "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, - "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M2": { - "jar": "sha256-m2K8/DUqLsh9qLAeN8lSpU01i7sa8/ISZIrq/nqy27U=", - "pom": "sha256-BWZvJ5QRF8yt+rYykRjBw0j4uDjOie0jGCwVHLKUPuk=" + "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M3": { + "jar": "sha256-FTNcTc8IL1mfuO3c+1jWp+mpyX3iiDwlcImkebmyRSI=", + "pom": "sha256-V+0X4Fe6cWzB8eWy1OAUpow9UL0zSYInqQ9xJRkzTdQ=" }, - "org/eclipse/sisu#sisu-inject/0.9.0.M2": { - "pom": "sha256-djD0zU0WIAZ/qD4ddIsBLP+gZV5TgMwOSl4oPTtEH9s=" + "org/eclipse/sisu#sisu-inject/0.9.0.M3": { + "pom": "sha256-LkNlY9XK6jUbzl8IY+vGN2QFy2Wm9mSyVfqtnnLjuFQ=" }, "org/glassfish/jaxb#jaxb-bom/2.3.2": { "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c=" @@ -2695,6 +2687,9 @@ "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": { "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY=" }, + "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.7.0": { + "pom": "sha256-WIlrEnKu7QOcgli6rohipcNQqRgL5uaabEz8p9JOoa4=" + }, "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": { "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=", "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=", @@ -2876,105 +2871,105 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.20": { - "module": "sha256-T0tsqhEaZFnFKSfpM2+DG8qDIUtuiYndph8BAYXe5qo=", - "pom": "sha256-Q9nypAfaiyhtjfMNZw8lVhUPZW9RnYQWqbGOTHGrfFo=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.21": { + "module": "sha256-eP8Nm7m6KylBJw6aHmdCeG+r3oCAjSVLMhb7YvOGr5s=", + "pom": "sha256-9Bb6+imfEFZlOB1F3CPLdS6sGXAzy7sOfrP4M0CbrfE=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.20/gradle85": { - "jar": "sha256-wMMkdfUoT+fBgMrwC/QLb6OjsOkP7FgXttAg6xDtKbw=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-aNTHT22g1eErtyVbjW3b2IaPCiSdTf307OcPbT+/XQM=" }, "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.24": { "jar": "sha256-AoVjJSRkxIYBkX8rbFTRuOQhzcfya/L5zzCIlcgSSgY=", "pom": "sha256-Hzfc9EhcI3qtLk70O40RQJleMTKduiTJ9qa3uEBrg9Q=" }, - "org/jetbrains/kotlin#kotlin-build-common/2.0.20": { - "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=", - "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI=" + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": { - "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=", - "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { - "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", - "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": { - "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=", - "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { - "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", - "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { - "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", - "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" }, - "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.0.20": { - "jar": "sha256-549YH9VsEe1nrxzZhA3y8OCC9duKj5s949hygeZRUPg=", - "pom": "sha256-y6whk7JPaifqr5kWlZydoO+5EvrFfpWzkG5kwKbxJkc=" + "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-SaUyw+hjiBeUKVdB+A+/t5QeaLGGPPlMRoXgC01urOA=", + "pom": "sha256-CNjXRPVM+aKlZwoS4HP6qjG7F0DSivWD9v7dCAvXw64=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { - "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", - "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { - "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", - "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": { - "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=", - "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": { - "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=", - "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=", - "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20/gradle85": { - "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": { - "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=", - "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": { + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", - "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=", - "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg=" + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": { - "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=", - "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=", - "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": { - "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=", - "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": { - "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": { - "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=", - "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": { - "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=", - "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": { - "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", - "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", @@ -3000,55 +2995,55 @@ "jar": "sha256-MUx9MI/nUGVDZbrGFEeAYTyRac89nh2vurkc+AvcNXw=", "pom": "sha256-mGDF58qg5AlxmVCQEtoD01GX/teewKkKUOKPjeh1QE0=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { - "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", - "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" }, "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": { - "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=", - "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": { - "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=", - "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": { - "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=", - "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": { - "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=", - "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" }, - "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.20": { - "jar": "sha256-zI9QG2dslESLAWgNyvZ68cjFfOqEFQKnFuttEX+Xy4Y=", - "pom": "sha256-X74y6I+ly4WFjb1wpPZKWsJTSaTijzlQ3zJrMSRmUGY=" + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-3v0m28WB8x1QKe5EmZ4QRpLrAw6rrX2TZMI9jwuP2Fk=", + "pom": "sha256-0opI/fcJ0wz4lqL3XMbx7aA3L2r+MYdCDPigSrJCb/w=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.0.20": { - "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=", - "pom": "sha256-wYgmEN73pFKwREi8GVqr+D6CqMEcUSmFYUAbGyxfKCw=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.21": { + "module": "sha256-HXUsci8E/La3an9mSgXqFQAuEO1c/30pBJtd5ZfxID8=", + "pom": "sha256-Ju6iFEnSY66HScTjq7enkNl1ubpRP2jVSMzFCOFfUkI=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.0.20/gradle85": { - "jar": "sha256-Jjd6xiKasd8/ojVJPYxWfkcLjYa2PolUSMwmbL/Ob1o=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.21/gradle85": { + "jar": "sha256-wd9+ggYbMC3WH0hoOT54Uy/qeKprY7eBmybK9sJHRME=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.22": { - "pom": "sha256-pysR3wi1Mi16Xo5iB4nuPkz+846GxDDn0RO/qeVMWB4=" + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.10": { + "pom": "sha256-91ryF83Y3Z4HseDgGAhKMgkqCRo5C3P+qmV+xE5c8JQ=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": { "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", @@ -3058,9 +3053,9 @@ "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": { - "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", - "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.3.72": { "pom": "sha256-nVoT2avDNEXhNm0livCnfkLwGUWs73wJF7nVOYVOL84=" @@ -3121,45 +3116,49 @@ "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { - "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": { "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", - "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0=" + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.0.20": { - "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=", - "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw=" + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": { - "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=", - "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8=" + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" }, - "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.20": { - "pom": "sha256-kGFltQT4vUoqP4eFvhbp89a8mtiG6lXoMtQRG/rkt38=" + "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.21": { + "pom": "sha256-Yf+ockTHIjCtz8MiedShzEFxLCvF61CXG2MO2IDeSF8=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { - "pom": "sha256-sNVZXjrtI9TH63BSN0pZQGXaYdxG0GYxHT1YVz2jSSE=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-qUIL3zmifFDNZ/njC5vSJk/P4Yaq8iHrw8t5VZ8iIEw=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.20": { - "pom": "sha256-2zSCieaFMro55pUv9XVm/50NnslJBYTuLprNllrMHFI=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.21": { + "pom": "sha256-K2hwNmz5nvZS5bVbw7kDfxwS3rMy3GauAgKn/CI2WLk=" }, - "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.20": { - "pom": "sha256-I25/dk1/4C5RCIG/1ShkK+c4Y6oDbjRvs4PL3cXB8sw=" + "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": { + "pom": "sha256-0+fOgZ7Wkw4mf8bW9uQ/NYX66BNTJTdaUy3CSeuM5Kk=" }, - "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.20": { - "pom": "sha256-+kn1eMN8x3/hA7MrEU+iTbkblHrjQAQivCcuk658pYY=" + "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.21": { + "pom": "sha256-unqwb198FjgzO/+AScoZX9YY02+UtM0jJeIh4qruOB4=" }, - "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.20": { - "pom": "sha256-7W4IMHEMURJT2NQTEs1MMDP9pkXAFJ0/EYULaPzTPJk=" + "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21": { + "pom": "sha256-WlFqKbXkklcrjyCq65qyEnkyzSFiQJC8Ur5bjZ0yLnI=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { - "pom": "sha256-iVt45mokOOVxOXu8KVbSUgqTpl2jHB2Ce2NEIvbOsQ4=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-qWzO0nL6L6tLdB40cgtedO9RS0QRFSMD7fnBJ5V6R6o=" }, "org/jetbrains/kotlinx#atomicfu-jvm/0.23.2": { "jar": "sha256-EB/0P/Vj/KFnr1remMO2m/VpAQ6rdFATuE2JVQNNOzw=", @@ -3192,9 +3191,6 @@ "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.1": { - "pom": "sha256-uSWqmIxApceqDHeyE3P+sYw5QUkmvVHHbvRENPW66cI=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.9.0": { "pom": "sha256-vqVRHpAB8sWTq1CA3xMbIZq14ghcxZec5YPqzUlG/Xg=" }, @@ -3213,23 +3209,10 @@ "module": "sha256-rVNANKlTtOEsvuuHTGat+LHKFN8V/g0uZUeqNOht/so=", "pom": "sha256-dw8nk9BeKwJ7nHmZOOwdLU7xQc5YGceAwyw5lcrbCkc=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.7.1": { - "module": "sha256-sJV+aTzxwefUrWJGqm4weV2/S/t1jB5LMv25wkQJuXM=", - "pom": "sha256-x3kWU2lOpaVLnN1HCAgtv7i9apeKX0IYSxFBz7SjDnU=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.9.0": { - "jar": "sha256-0YE4yMHDSyuprzcyQec0E3b9+A0ecC36kJKdMgEx83w=", - "module": "sha256-UZXcGgvvl7cdtHJ+R9QlIFaTtT9Gs4MbVeqQtk0Qj9U=", - "pom": "sha256-i4RBO/nktxLB5mvV4mkihWTfePlxKaLw3msyuJ/MoOo=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-play-services/1.9.0": { "module": "sha256-k9zumoMaL53NqVKLqyjXJOFeigv+xBlO+B1Ox+cwH/I=", "pom": "sha256-BMklOqqrM6EDRGL//unXOkNiKpSBh/gDSLpcuXqydLE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.7.1": { - "module": "sha256-I8EQcq7URvsrZsj57aP4mWbe09mP9bnfCg3LeTwBX/o=", - "pom": "sha256-HEWyu0XLYIIjT06yJj46XBxzQ4Rm6NUlr2gZCxbIklM=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.9.0": { "jar": "sha256-hCh6m9dNy+ad6MFwGQsVWhHrtJqJ6U4DaslPx4MecyU=", "module": "sha256-ki7Xf8+ELN0KiwAi3bcPQdynPhc/WU5r/VkrTQONY64=", @@ -3250,6 +3233,26 @@ "module": "sha256-ZoDoXgAKb/ckfN38YkZyPzlXCWzT7qCp9/Qqumlzaug=", "pom": "sha256-Wx4Ylt2DYUnbnUuSIRXKxiIrDKKIm1VDTbi+hOI0wUs=" }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.5.4": { + "jar": "sha256-H8luGbRFOH28SRg9DMYjxaYb+kfIbPgar1r/SEUVT6s=", + "module": "sha256-D6a3n1wQfnNp/IMquGDLY1Ac96oH/ovZTRUTzmFOAoc=", + "pom": "sha256-DMAsF8sJSA/qlURmv8/O+JYq6+AuV+35tHZ0ZEek1eQ=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.5.4": { + "jar": "sha256-jMGXmjmiO2RLGRCjv22efNg4aGSKDb3auRs44DxfTBk=", + "module": "sha256-npefmLnoEmKwjAHFosKwBSEwE9SigNR1nBkEYFvcZ3c=", + "pom": "sha256-bKYOZ58tAJw94jCnSaYwqxi8Z+YAoj+4d4xPu820thQ=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.5.4": { + "jar": "sha256-3DWHwSeVrwEjFZHA7wmkE538qBE8KYknO5a5WABoU8M=", + "module": "sha256-PTizMz62XBMqfFZuAxDfoJEw2t+SirkjBHAstPFmjbE=", + "pom": "sha256-Diy3MY4zyA2U8M/EyEn8YsXLzQwxYOyhojm2ebn+dXM=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.5.4": { + "jar": "sha256-7XupL4/u1v8jBKsvd4DYf4HITxVfce9zwfhsW/mM8EM=", + "module": "sha256-3j/q85vfcKlbT85FjMMI6MNzfPl/rIcvSbT26/VXdgU=", + "pom": "sha256-ot/XmJrts7onKtrlmPfuuDTmnhVNSuylMFYwwY+K9CU=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.2": { "pom": "sha256-ew4dde6GIUmc+VQwyhL9qjL0p/kg1cMBv+lfoYfyczc=" }, @@ -3325,6 +3328,10 @@ "jar": "sha256-L72ZRbh+1QE5HTE+jK396wDXXKsyhiIgzOs4Uuv/3Hc=", "pom": "sha256-Nfg93UsA2fZYuezotPCaYkwrwPbGNGgtxS6a5FyNHQQ=" }, + "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.8.15": { + "jar": "sha256-FoepnFtMLNiavGVlVmidzgGkaBKSqTzu9KnEl+nhQNk=", + "pom": "sha256-e4KThaZFcZwANJjph1MCGfssKV7TwosVbio3nQxf/NQ=" + }, "org/jetbrains/skiko#skiko-awt/0.8.15": { "jar": "sha256-LW7+mI+NOlfmP8+SPzQ5zau4iUfjUfl9BuybKmqH//A=", "module": "sha256-1I2dg0p9yC6vpxX0nxLI+uKg35vEPqw3RJi/EdFrECU=", @@ -3346,6 +3353,18 @@ "jar": "sha256-SamJjaN1hlk4jxMzxTzK22+9FCp9GKp7GjNXcJBoQnk=", "pom": "sha256-Fge2IOHytOGg9IkQELNJCx+0qD5xOsTTiwjcLGf6PlE=" }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, "org/junit#junit-bom/5.11.0": { "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" @@ -3354,14 +3373,6 @@ "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" - }, "org/junit#junit-bom/5.9.2": { "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" @@ -3476,10 +3487,10 @@ "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" }, "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" }, "org/slf4j#slf4j-bom/2.0.16": { @@ -3508,14 +3519,6 @@ "jar": "sha256-Uylw98VdRF8E5NBaa0Pw6Gdjgi0IrYnkxp4ymdMaDXQ=", "module": "sha256-ccMC3YcbfoIsZ5V28baF6UueyQUshzkF6yFN+kqrufw=", "pom": "sha256-rk4+z470z6LX39SJRUeIM+pDNL4Kq2+XoENzJBX7rr8=" - }, - "xml-apis#xml-apis-ext/1.3.04": { - "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", - "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" - }, - "xml-apis#xml-apis/1.4.01": { - "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=", - "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI=" } } } diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 5929e48efba7..48d175882475 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a"; - hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug="; + rev = "81a8486ca31c86630c84c78285c49d16d7491328"; + hash = "sha256-e0Ea2QSAMQqZRVPy5/5pblHfeG+L6oHEXHV5mepE5Z8="; }; inherit gradleBuildTask gradleUpdateTask desktopItems; diff --git a/pkgs/applications/misc/keyleds/default.nix b/pkgs/by-name/ke/keyleds/package.nix similarity index 100% rename from pkgs/applications/misc/keyleds/default.nix rename to pkgs/by-name/ke/keyleds/package.nix diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix similarity index 100% rename from pkgs/applications/misc/keylight-controller-mschneider82/default.nix rename to pkgs/by-name/ke/keylight-controller-mschneider82/package.nix diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/by-name/ke/keymapper/package.nix similarity index 100% rename from pkgs/tools/inputmethods/keymapper/default.nix rename to pkgs/by-name/ke/keymapper/package.nix diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/by-name/ke/keymapviz/package.nix similarity index 100% rename from pkgs/tools/misc/keymapviz/default.nix rename to pkgs/by-name/ke/keymapviz/package.nix diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/by-name/ke/keynav/package.nix similarity index 100% rename from pkgs/tools/X11/keynav/default.nix rename to pkgs/by-name/ke/keynav/package.nix diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/by-name/ke/keystone/package.nix similarity index 100% rename from pkgs/development/libraries/keystone/default.nix rename to pkgs/by-name/ke/keystone/package.nix diff --git a/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/pkgs/by-name/ke/keyutils/0001-Remove-unused-function-after_eq.patch similarity index 100% rename from pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch rename to pkgs/by-name/ke/keyutils/0001-Remove-unused-function-after_eq.patch diff --git a/pkgs/os-specific/linux/keyutils/conf-symlink.patch b/pkgs/by-name/ke/keyutils/conf-symlink.patch similarity index 100% rename from pkgs/os-specific/linux/keyutils/conf-symlink.patch rename to pkgs/by-name/ke/keyutils/conf-symlink.patch diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/by-name/ke/keyutils/package.nix similarity index 100% rename from pkgs/os-specific/linux/keyutils/default.nix rename to pkgs/by-name/ke/keyutils/package.nix diff --git a/pkgs/os-specific/linux/keyutils/pkg-config-static.patch b/pkgs/by-name/ke/keyutils/pkg-config-static.patch similarity index 100% rename from pkgs/os-specific/linux/keyutils/pkg-config-static.patch rename to pkgs/by-name/ke/keyutils/pkg-config-static.patch diff --git a/pkgs/applications/networking/cluster/kfilt/default.nix b/pkgs/by-name/kf/kfilt/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kfilt/default.nix rename to pkgs/by-name/kf/kfilt/package.nix diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/by-name/kh/khal/package.nix similarity index 100% rename from pkgs/applications/misc/khal/default.nix rename to pkgs/by-name/kh/khal/package.nix diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/by-name/kh/khard/package.nix similarity index 100% rename from pkgs/applications/misc/khard/default.nix rename to pkgs/by-name/kh/khard/package.nix diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/by-name/kh/khmeros/package.nix similarity index 100% rename from pkgs/data/fonts/khmeros/default.nix rename to pkgs/by-name/kh/khmeros/package.nix diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/by-name/kh/khoj/package.nix similarity index 100% rename from pkgs/servers/search/khoj/default.nix rename to pkgs/by-name/kh/khoj/package.nix diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix similarity index 100% rename from pkgs/development/libraries/khronos-ocl-icd-loader/default.nix rename to pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/by-name/kh/khronos/package.nix similarity index 100% rename from pkgs/applications/office/khronos/default.nix rename to pkgs/by-name/kh/khronos/package.nix diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/by-name/ki/kibi/package.nix similarity index 100% rename from pkgs/applications/editors/kibi/default.nix rename to pkgs/by-name/ki/kibi/package.nix diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/by-name/ki/kickoff/package.nix similarity index 100% rename from pkgs/applications/misc/kickoff/default.nix rename to pkgs/by-name/ki/kickoff/package.nix diff --git a/pkgs/tools/misc/kicli/default.nix b/pkgs/by-name/ki/kicli/package.nix similarity index 100% rename from pkgs/tools/misc/kicli/default.nix rename to pkgs/by-name/ki/kicli/package.nix diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/by-name/ki/kics/package.nix similarity index 100% rename from pkgs/tools/admin/kics/default.nix rename to pkgs/by-name/ki/kics/package.nix diff --git a/pkgs/applications/misc/kile-wl/Cargo.lock b/pkgs/by-name/ki/kile-wl/Cargo.lock similarity index 100% rename from pkgs/applications/misc/kile-wl/Cargo.lock rename to pkgs/by-name/ki/kile-wl/Cargo.lock diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/by-name/ki/kile-wl/package.nix similarity index 100% rename from pkgs/applications/misc/kile-wl/default.nix rename to pkgs/by-name/ki/kile-wl/package.nix diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/by-name/ki/kile/package.nix similarity index 100% rename from pkgs/applications/editors/kile/default.nix rename to pkgs/by-name/ki/kile/package.nix diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/by-name/ki/kiln/package.nix similarity index 100% rename from pkgs/applications/misc/kiln/default.nix rename to pkgs/by-name/ki/kiln/package.nix diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/by-name/ki/kime/package.nix similarity index 100% rename from pkgs/tools/inputmethods/kime/default.nix rename to pkgs/by-name/ki/kime/package.nix diff --git a/pkgs/development/tools/kind/kernel-module-path.patch b/pkgs/by-name/ki/kind/kernel-module-path.patch similarity index 100% rename from pkgs/development/tools/kind/kernel-module-path.patch rename to pkgs/by-name/ki/kind/kernel-module-path.patch diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/by-name/ki/kind/package.nix similarity index 100% rename from pkgs/development/tools/kind/default.nix rename to pkgs/by-name/ki/kind/package.nix diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index 938adb99f754..2e28d92f7ea2 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kine"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${version}"; - hash = "sha256-KMyO9zZvQFyRaMtQ/d2Zgg6pG1SFIYWkzZgSZIqhiOQ="; + hash = "sha256-xct2CkU+EeEfyhZNp1UiLY7kJnv4pbWMA4xgHGQI898="; }; - vendorHash = "sha256-kbMwLNBPJwFbUSZdYiWWdIZM8fclHDnRnxTTIXTIuHU="; + vendorHash = "sha256-EYtkhB8MZKKh6Rf91Ru/ldnP/iQsAw6W2U82mO/7L+g="; ldflags = [ "-s" diff --git a/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch b/pkgs/by-name/ki/kinect-audio-setup/libusb-1-import-path.patch similarity index 100% rename from pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch rename to pkgs/by-name/ki/kinect-audio-setup/libusb-1-import-path.patch diff --git a/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/pkgs/by-name/ki/kinect-audio-setup/package.nix similarity index 100% rename from pkgs/os-specific/linux/kinect-audio-setup/default.nix rename to pkgs/by-name/ki/kinect-audio-setup/package.nix diff --git a/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch b/pkgs/by-name/ki/kinect-audio-setup/udev-rules-extra-devices.patch similarity index 100% rename from pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch rename to pkgs/by-name/ki/kinect-audio-setup/udev-rules-extra-devices.patch diff --git a/pkgs/applications/science/electronics/kingstvis/default.nix b/pkgs/by-name/ki/kingstvis/package.nix similarity index 100% rename from pkgs/applications/science/electronics/kingstvis/default.nix rename to pkgs/by-name/ki/kingstvis/package.nix diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/by-name/ki/kismet/package.nix similarity index 100% rename from pkgs/applications/networking/sniffers/kismet/default.nix rename to pkgs/by-name/ki/kismet/package.nix diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/by-name/ki/kissat/package.nix similarity index 100% rename from pkgs/applications/science/logic/kissat/default.nix rename to pkgs/by-name/ki/kissat/package.nix diff --git a/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/pkgs/by-name/ki/kissat/writable-passwd-is-ok.patch similarity index 100% rename from pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch rename to pkgs/by-name/ki/kissat/writable-passwd-is-ok.patch diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/by-name/ki/kisslicer/package.nix similarity index 100% rename from pkgs/tools/misc/kisslicer/default.nix rename to pkgs/by-name/ki/kisslicer/package.nix diff --git a/pkgs/tools/security/kiterunner/default.nix b/pkgs/by-name/ki/kiterunner/package.nix similarity index 100% rename from pkgs/tools/security/kiterunner/default.nix rename to pkgs/by-name/ki/kiterunner/package.nix diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix new file mode 100644 index 000000000000..854c53cc5327 --- /dev/null +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + qt6, + poppler, + libzip, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "kitsas"; + version = "5.7"; + + src = fetchFromGitHub { + owner = "artoh"; + repo = "kitupiikki"; + rev = "v${version}"; + hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k="; + }; + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; + + buildInputs = + [ + libzip + poppler + qt6.qt5compat + qt6.qtsvg + qt6.qtwebengine + ] + ++ lib.optional stdenv.hostPlatform.isLinux [ + qt6.qtwayland + ]; + + # We use a separate build-dir as otherwise ld seems to get confused between + # directory and executable name on buildPhase. + preConfigure = '' + mkdir build && cd build + ''; + + qmakeFlags = [ "../kitsas/kitsas.pro" ]; + + installPhase = + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv kitsas.app $out/Applications + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + install -Dm755 kitsas -t $out/bin + install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps + install -Dm644 ../kitsas.desktop -t $out/share/applications + ''; + + meta = with lib; { + homepage = "https://github.com/artoh/kitupiikki"; + description = "Accounting tool suitable for Finnish associations and small business"; + mainProgram = "kitsas"; + maintainers = with maintainers; [ gspia ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/kitty-img/default.nix b/pkgs/by-name/ki/kitty-img/package.nix similarity index 100% rename from pkgs/tools/misc/kitty-img/default.nix rename to pkgs/by-name/ki/kitty-img/package.nix diff --git a/pkgs/games/klavaro/default.nix b/pkgs/by-name/kl/klavaro/package.nix similarity index 100% rename from pkgs/games/klavaro/default.nix rename to pkgs/by-name/kl/klavaro/package.nix diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/by-name/kl/klick/package.nix similarity index 100% rename from pkgs/applications/audio/klick/default.nix rename to pkgs/by-name/kl/klick/package.nix diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/by-name/kl/klipperscreen/package.nix similarity index 100% rename from pkgs/applications/misc/klipperscreen/default.nix rename to pkgs/by-name/kl/klipperscreen/package.nix diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix index 110c4a111a77..ef9f4605c544 100644 --- a/pkgs/by-name/kl/klog-rs/package.nix +++ b/pkgs/by-name/kl/klog-rs/package.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "klog-rs"; - version = "0.0.3"; + version = "0.1.0"; src = fetchFromGitHub { owner = "tobifroe"; repo = "klog"; rev = version; - hash = "sha256-HEGxg277483ZZpXKFIBTAITKie/iBfbz9KmtqzlGC3E="; + hash = "sha256-MAHLTNKN0t0rUXd4f238/jcaUlcTdC3IvaviMRu6gKg="; }; - cargoHash = "sha256-mOFzlq5AEks9vwjk2FxTGLyw6RkI44kml2t8r1UsdOk="; + cargoHash = "sha256-u+kctG+38Z2xYTA9h0OY4L1zzKyAT2Wlwf08zSqxV0I="; checkFlags = [ # this integration test depends on a running kubernetes cluster "--skip=k8s::tests::test_get_pod_list" diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/by-name/kl/klystrack/package.nix similarity index 100% rename from pkgs/applications/audio/klystrack/default.nix rename to pkgs/by-name/kl/klystrack/package.nix diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/by-name/km/kmod-debian-aliases/package.nix similarity index 100% rename from pkgs/os-specific/linux/kmod-debian-aliases/default.nix rename to pkgs/by-name/km/kmod-debian-aliases/package.nix diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/by-name/km/kmon/package.nix similarity index 100% rename from pkgs/tools/system/kmon/default.nix rename to pkgs/by-name/km/kmon/package.nix diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/by-name/km/kmscon/package.nix similarity index 100% rename from pkgs/os-specific/linux/kmscon/default.nix rename to pkgs/by-name/km/kmscon/package.nix diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/by-name/km/kmscube/package.nix similarity index 100% rename from pkgs/os-specific/linux/kmscube/default.nix rename to pkgs/by-name/km/kmscube/package.nix diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/by-name/km/kmsxx/package.nix similarity index 100% rename from pkgs/development/libraries/kmsxx/default.nix rename to pkgs/by-name/km/kmsxx/package.nix diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/by-name/kn/kn/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kn/default.nix rename to pkgs/by-name/kn/kn/package.nix diff --git a/pkgs/data/fonts/knewave/default.nix b/pkgs/by-name/kn/knewave/package.nix similarity index 100% rename from pkgs/data/fonts/knewave/default.nix rename to pkgs/by-name/kn/knewave/package.nix diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix similarity index 100% rename from pkgs/development/tools/knightos/genkfs/default.nix rename to pkgs/by-name/kn/knightos-genkfs/package.nix diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/by-name/kn/knightos-kcc/package.nix similarity index 100% rename from pkgs/development/tools/knightos/kcc/default.nix rename to pkgs/by-name/kn/knightos-kcc/package.nix diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/by-name/kn/knightos-kimg/package.nix similarity index 100% rename from pkgs/development/tools/knightos/kimg/default.nix rename to pkgs/by-name/kn/knightos-kimg/package.nix diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/by-name/kn/knightos-kpack/package.nix similarity index 100% rename from pkgs/development/tools/knightos/kpack/default.nix rename to pkgs/by-name/kn/knightos-kpack/package.nix diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/by-name/kn/knightos-mkrom/package.nix similarity index 100% rename from pkgs/development/tools/knightos/mkrom/default.nix rename to pkgs/by-name/kn/knightos-mkrom/package.nix diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix similarity index 100% rename from pkgs/development/tools/knightos/mktiupgrade/default.nix rename to pkgs/by-name/kn/knightos-mktiupgrade/package.nix diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix similarity index 100% rename from pkgs/development/tools/knightos/patchrom/default.nix rename to pkgs/by-name/kn/knightos-patchrom/package.nix diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/by-name/kn/knightos-scas/package.nix similarity index 100% rename from pkgs/development/tools/knightos/scas/default.nix rename to pkgs/by-name/kn/knightos-scas/package.nix diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/by-name/kn/knightos-z80e/package.nix similarity index 100% rename from pkgs/development/tools/knightos/z80e/default.nix rename to pkgs/by-name/kn/knightos-z80e/package.nix diff --git a/pkgs/development/tools/build-managers/knit/default.nix b/pkgs/by-name/kn/knit/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/knit/default.nix rename to pkgs/by-name/kn/knit/package.nix diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/by-name/kn/knockpy/package.nix similarity index 100% rename from pkgs/tools/security/knockpy/default.nix rename to pkgs/by-name/kn/knockpy/package.nix diff --git a/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch b/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch similarity index 100% rename from pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch rename to pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix new file mode 100644 index 000000000000..301841747bf8 --- /dev/null +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -0,0 +1,91 @@ +{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl +, ngtcp2-gnutls, xdp-tools +, fstrm, protobufc +, sphinx +, autoreconfHook +, nixosTests, knot-resolver, knot-dns, runCommandLocal +}: + +stdenv.mkDerivation rec { + pname = "knot-dns"; + version = "3.4.2"; + + src = fetchurl { + url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; + sha256 = "d835285c1057d45effa1479cfe1f107a50e83d11c1c6d36f270deda88799883e"; + }; + + outputs = [ "bin" "out" "dev" ]; + + configureFlags = [ + "--with-configdir=/etc/knot" + "--with-rundir=/run/knot" + "--with-storage=/var/lib/knot" + "--with-module-dnstap" "--enable-dnstap" + ]; + + patches = [ + # Don't try to create directories like /var/lib/knot at build time. + # They are later created from NixOS itself. + ./dont-create-run-time-dirs.patch + ./runtime-deps.patch + ]; + + # FIXME: sphinx is needed for now to get man-pages + nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; + buildInputs = [ + gnutls liburcu libidn2 libunistring + nettle libedit + libiconv lmdb libintl + nghttp2 # DoH support in kdig + ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet) + libmaxminddb # optional for geoip module (it's tiny) + # without sphinx &al. for developer documentation + fstrm protobufc # dnstap support + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap_ng systemd + xdp-tools libbpf libmnl # XDP support (it's Linux kernel API) + ] ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls + + enableParallelBuilding = true; + + CFLAGS = [ "-O2" "-DNDEBUG" ]; + + doCheck = true; + checkFlags = [ "V=1" ]; # verbose output in case some test fails + doInstallCheck = true; + + postInstall = '' + rm -r "$out"/lib/*.la + ''; + + passthru.tests = { + inherit knot-resolver; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) knot kea; + prometheus-exporter = nixosTests.prometheus-exporters.knot; + # Some dependencies are very version-sensitive, so the might get dropped + # or embedded after some update, even if the nixPackagers didn't intend to. + # For non-linux I don't know a good replacement for `ldd`. + deps = runCommandLocal "knot-deps-test" + { nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; } + '' + for libname in libngtcp2 libxdp libbpf; do + echo "Checking for $libname:" + ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname" + echo "OK" + done + touch "$out" + ''; + }; + + meta = with lib; { + description = "Authoritative-only DNS server from .cz domain registry"; + homepage = "https://knot-dns.cz"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; + mainProgram = "knotd"; + }; +} diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/by-name/kn/knot-dns/runtime-deps.patch similarity index 100% rename from pkgs/servers/dns/knot-dns/runtime-deps.patch rename to pkgs/by-name/kn/knot-dns/runtime-deps.patch diff --git a/pkgs/tools/security/knowsmore/default.nix b/pkgs/by-name/kn/knowsmore/package.nix similarity index 100% rename from pkgs/tools/security/knowsmore/default.nix rename to pkgs/by-name/kn/knowsmore/package.nix diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/by-name/kn/kns/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kns/default.nix rename to pkgs/by-name/kn/kns/package.nix diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/by-name/ko/ko/package.nix similarity index 100% rename from pkgs/development/tools/ko/default.nix rename to pkgs/by-name/ko/ko/package.nix diff --git a/pkgs/games/kobodeluxe/glibc29.patch b/pkgs/by-name/ko/kobodeluxe/glibc29.patch similarity index 100% rename from pkgs/games/kobodeluxe/glibc29.patch rename to pkgs/by-name/ko/kobodeluxe/glibc29.patch diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/by-name/ko/kobodeluxe/package.nix similarity index 100% rename from pkgs/games/kobodeluxe/default.nix rename to pkgs/by-name/ko/kobodeluxe/package.nix diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index df10f0a4fd81..40cc23278ea7 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.76"; + version = "1.77"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-0zV9aZIfNnbV/K6xYUp+ucdJvdEfuGdKgE/Q7vcBopQ="; + hash = "sha256-dyu//4LRjpdxkyA9M5yNDO0DA7inZZjH4pSkj6l2afk="; }; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/by-name/ko/kochi-substitute-naga10/package.nix similarity index 100% rename from pkgs/data/fonts/kochi-substitute-naga10/default.nix rename to pkgs/by-name/ko/kochi-substitute-naga10/package.nix diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/by-name/ko/kochi-substitute/package.nix similarity index 100% rename from pkgs/data/fonts/kochi-substitute/default.nix rename to pkgs/by-name/ko/kochi-substitute/package.nix diff --git a/pkgs/data/fonts/kode-mono/default.nix b/pkgs/by-name/ko/kode-mono/package.nix similarity index 100% rename from pkgs/data/fonts/kode-mono/default.nix rename to pkgs/by-name/ko/kode-mono/package.nix diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/by-name/ko/kodi-cli/package.nix similarity index 100% rename from pkgs/tools/misc/kodi-cli/default.nix rename to pkgs/by-name/ko/kodi-cli/package.nix diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index bb0da2db7abb..93f251abdf11 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage { meta = { description = "Community Manifest Creator for WinGet"; homepage = "https://github.com/russellbanks/Komac"; - changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}"; + changelog = "https://github.com/russellbanks/Komac/releases/tag/v${version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kachick diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix new file mode 100644 index 000000000000..93a8730472b2 --- /dev/null +++ b/pkgs/by-name/ko/komga/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jdk17_headless +, nixosTests +}: + +stdenvNoCC.mkDerivation rec { + pname = "komga"; + version = "1.14.1"; + + src = fetchurl { + url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; + sha256 = "sha256-KUNF6TPqr85rm9XOcoaCGtK8VHfevRFgkl+lTfJEdbA="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildCommand = '' + makeWrapper ${jdk17_headless}/bin/java $out/bin/komga --add-flags "-jar $src" + ''; + + passthru.tests = { + komga = nixosTests.komga; + }; + + meta = { + description = "Free and open source comics/mangas server"; + homepage = "https://komga.org/"; + license = lib.licenses.mit; + platforms = jdk17_headless.meta.platforms; + maintainers = with lib.maintainers; [ govanify ]; + mainProgram = "komga"; + }; + +} diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index ab59d052d4c7..084ea2f2e7e4 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.58.0"; + version = "1.60.0"; format = "other"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-21ZtzWjyUC+/iPv+R1DUzCHITR8GVhN+6iepcTIRy0Y="; + hash = "sha256-USm/Fo1whu9KItfiwwmfVlDXri0xqhmEyMcryyP9F30="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/by-name/ko/komorebi/package.nix similarity index 100% rename from pkgs/applications/graphics/komorebi/default.nix rename to pkgs/by-name/ko/komorebi/package.nix diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/by-name/ko/kompose/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kompose/default.nix rename to pkgs/by-name/ko/kompose/package.nix diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/by-name/ko/kona/package.nix similarity index 100% rename from pkgs/development/interpreters/kona/default.nix rename to pkgs/by-name/ko/kona/package.nix diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/by-name/ko/kondo/package.nix similarity index 100% rename from pkgs/applications/misc/kondo/default.nix rename to pkgs/by-name/ko/kondo/package.nix diff --git a/pkgs/applications/misc/konsave/default.nix b/pkgs/by-name/ko/konsave/package.nix similarity index 100% rename from pkgs/applications/misc/konsave/default.nix rename to pkgs/by-name/ko/konsave/package.nix diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/by-name/ko/konstraint/package.nix similarity index 100% rename from pkgs/development/tools/konstraint/default.nix rename to pkgs/by-name/ko/konstraint/package.nix diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/by-name/ko/kool/package.nix similarity index 100% rename from pkgs/development/tools/misc/kool/default.nix rename to pkgs/by-name/ko/kool/package.nix diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix new file mode 100644 index 000000000000..35dfc707474f --- /dev/null +++ b/pkgs/by-name/ko/kopia/package.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, gitUpdater, testers, kopia }: + +buildGoModule rec { + pname = "kopia"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-Bqy9eFUvUgSdyChzh52qqPVvMi+3ad01koxVgnibbLk="; + }; + + vendorHash = "sha256-/NMp64JeCQjCcEYkE6lYzu/E+irTcwkmDCJhB04ALFY="; + + doCheck = false; + + subPackages = [ "." ]; + + ldflags = [ + "-X github.com/kopia/kopia/repo.BuildVersion=${version}" + "-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}" + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + kopia-version = testers.testVersion { + package = kopia; + }; + }; + }; + + meta = with lib; { + homepage = "https://kopia.io"; + description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; + mainProgram = "kopia"; + license = licenses.asl20; + maintainers = [ maintainers.bbigras ]; + }; +} diff --git a/pkgs/applications/misc/kord/Cargo.lock b/pkgs/by-name/ko/kord/Cargo.lock similarity index 100% rename from pkgs/applications/misc/kord/Cargo.lock rename to pkgs/by-name/ko/kord/Cargo.lock diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/by-name/ko/kord/package.nix similarity index 100% rename from pkgs/applications/misc/kord/default.nix rename to pkgs/by-name/ko/kord/package.nix diff --git a/pkgs/development/web/kore/default.nix b/pkgs/by-name/ko/kore/package.nix similarity index 100% rename from pkgs/development/web/kore/default.nix rename to pkgs/by-name/ko/kore/package.nix diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix new file mode 100644 index 000000000000..4d4f2332995e --- /dev/null +++ b/pkgs/by-name/ko/koreader/package.nix @@ -0,0 +1,82 @@ +{ lib, stdenv +, fetchurl +, makeWrapper +, fetchFromGitHub +, dpkg +, glib +, gnutar +, gtk3-x11 +, luajit +, sdcv +, SDL2 }: +let + luajit_lua52 = luajit.override { enable52Compat = true; }; +in +stdenv.mkDerivation rec { + pname = "koreader"; + version = "2024.04"; + + + src = { + aarch64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; + hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src_repo = fetchFromGitHub { + repo = "koreader"; + owner = "koreader"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc="; + }; + + sourceRoot = "."; + nativeBuildInputs = [ makeWrapper dpkg ]; + buildInputs = [ + glib + gnutar + gtk3-x11 + luajit_lua52 + sdcv + SDL2 + ]; + unpackCmd = "dpkg-deb -x ${src} ."; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp -R usr/* $out/ + ln -sf ${luajit_lua52}/bin/luajit $out/lib/koreader/luajit + ln -sf ${sdcv}/bin/sdcv $out/lib/koreader/sdcv + ln -sf ${gnutar}/bin/tar $out/lib/koreader/tar + find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; + find $out -xtype l -print -delete + wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc ] + } + ''; + + meta = with lib; { + homepage = "https://github.com/koreader/koreader"; + changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; + description = + "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + mainProgram = "koreader"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; + license = licenses.agpl3Only; + maintainers = with maintainers; [ contrun neonfuz]; + }; +} diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/by-name/ko/kotlin-language-server/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/kotlin-language-server/default.nix rename to pkgs/by-name/ko/kotlin-language-server/package.nix diff --git a/pkgs/games/koules/default.nix b/pkgs/by-name/ko/koules/package.nix similarity index 100% rename from pkgs/games/koules/default.nix rename to pkgs/by-name/ko/koules/package.nix diff --git a/pkgs/by-name/kp/kpcli/package.nix b/pkgs/by-name/kp/kpcli/package.nix new file mode 100644 index 000000000000..dff2a8d8c7c8 --- /dev/null +++ b/pkgs/by-name/kp/kpcli/package.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages }: + +stdenv.mkDerivation rec { + version = "4.1.2"; + pname = "kpcli"; + + src = fetchurl { + url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; + hash = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/{bin,share} + cp ${src} $out/share/kpcli.pl + chmod +x $out/share/kpcli.pl + + makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ + "${with perlPackages; makePerlPath ([ + BHooksEndOfScope CaptureTiny Clipboard Clone CryptRijndael CryptX DevelGlobalDestruction ModuleImplementation + ModuleRuntime SortNaturally SubExporterProgressive TermReadKey TermShellUI TryTiny FileKDBX FileKeePass + PackageStash RefUtil TermReadLineGnu XMLParser boolean namespaceclean + ] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}" + ''; + + + meta = with lib; { + description = "KeePass Command Line Interface"; + mainProgram = "kpcli"; + longDescription = '' + KeePass Command Line Interface (CLI) / interactive shell. + Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line. + ''; + license = licenses.artistic1; + homepage = "http://kpcli.sourceforge.net"; + platforms = platforms.all; + maintainers = [ maintainers.j-keck ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/by-name/kp/kpt/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kpt/default.nix rename to pkgs/by-name/kp/kpt/package.nix diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix new file mode 100644 index 000000000000..b846d81e020b --- /dev/null +++ b/pkgs/by-name/kr/krabby/package.nix @@ -0,0 +1,24 @@ +{ lib +, rustPlatform +, fetchCrate +}: +rustPlatform.buildRustPackage rec { + pname = "krabby"; + version = "0.2.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-YEY4bUZV9BpyVXzEGvnLyfG0GdE3xMN9tHlsg6RqMkk="; + }; + + cargoHash = "sha256-6NV+kqnloEFTygE5LLuCsgMYXGiDwOTnP6/CK2c9DOs="; + + meta = with lib; { + description = "Print pokemon sprites in your terminal"; + homepage = "https://github.com/yannjor/krabby"; + changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}"; + license = licenses.gpl3; + maintainers = with maintainers; [ ruby0b ]; + mainProgram = "krabby"; + }; +} diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/by-name/kr/kraft/package.nix similarity index 100% rename from pkgs/applications/virtualization/kraft/default.nix rename to pkgs/by-name/kr/kraft/package.nix diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/by-name/kr/krakenx/package.nix similarity index 100% rename from pkgs/tools/system/krakenx/default.nix rename to pkgs/by-name/kr/krakenx/package.nix diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/by-name/kr/krankerl/package.nix similarity index 100% rename from pkgs/development/tools/krankerl/default.nix rename to pkgs/by-name/kr/krankerl/package.nix diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/by-name/kr/krapslog/package.nix similarity index 100% rename from pkgs/tools/misc/krapslog/default.nix rename to pkgs/by-name/kr/krapslog/package.nix diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix new file mode 100644 index 000000000000..42530cefa886 --- /dev/null +++ b/pkgs/by-name/kr/kratos/package.nix @@ -0,0 +1,55 @@ +{ + fetchFromGitHub, + buildGoModule, + lib, + stdenv +}: +let + pname = "kratos"; + version = "1.3.1"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "ory"; + repo = "kratos"; + rev = "v${version}"; + hash = "sha256-FJrBwjWBYwoiy8rWXn+jaVc1b35So1Rb9SjkUlNwAqE="; + }; + + vendorHash = "sha256-zZwunp/433oIYI5ZA3Pznq9jfvIZE5ZUJKxboVef8g0="; + + subPackages = [ "." ]; + + tags = [ "sqlite" ]; + + # Pass versioning information via ldflags + ldflags = [ + "-X github.com/ory/kratos/driver/config.Version=${version}" + ]; + + doCheck = false; + + preBuild = '' + # Patch shebangs + files=( + test/e2e/run.sh + script/testenv.sh + script/test-envs.sh + script/debug-entrypoint.sh + ) + patchShebangs "''${files[@]}" + + # patchShebangs doesn't work for this Makefile, do it manually + substituteInPlace Makefile --replace-fail '/usr/bin/env bash' '${stdenv.shell}' + ''; + + meta = { + mainProgram = "kratos"; + description = "API-first Identity and User Management system that is built according to cloud architecture best practices"; + homepage = "https://www.ory.sh/kratos/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mrmebelman ]; + }; +} diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/by-name/kr/kreative-square-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/kreative-square-fonts/default.nix rename to pkgs/by-name/kr/kreative-square-fonts/package.nix diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/by-name/kr/krew/package.nix similarity index 100% rename from pkgs/development/tools/krew/default.nix rename to pkgs/by-name/kr/krew/package.nix diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/by-name/kr/kronosnet/package.nix similarity index 100% rename from pkgs/development/libraries/kronosnet/default.nix rename to pkgs/by-name/kr/kronosnet/package.nix diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/by-name/kr/krop/package.nix similarity index 100% rename from pkgs/applications/graphics/krop/default.nix rename to pkgs/by-name/kr/krop/package.nix diff --git a/pkgs/by-name/ks/ksh/package.nix b/pkgs/by-name/ks/ksh/package.nix new file mode 100644 index 000000000000..0751ef64dbb0 --- /dev/null +++ b/pkgs/by-name/ks/ksh/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitHub, + which, + python3, + fetchpatch, + libiconv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ksh"; + version = "2020.0.0"; + + src = fetchFromGitHub { + owner = "att"; + repo = "ast"; + sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; + rev = "refs/tags/${finalAttrs.version}"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/att/ast/commit/11983a71f5e29df578b7e2184400728b4e3f451d.patch"; + sha256 = "1n9558c4v2qpgpjb1vafs29n3qn3z0770wr1ayc0xjf5z5j4g3kv"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + which + python3 + ]; + + buildInputs = [ libiconv ]; + + strictDeps = true; + + meta = { + description = "KornShell Command And Programming Language"; + longDescription = '' + The KornShell language was designed and developed by David G. Korn at + AT&T Bell Laboratories. It is an interactive command language that + provides access to the UNIX system and to many other systems, on the + many different computers and workstations on which it is implemented. + ''; + homepage = "https://github.com/att/ast"; + license = lib.licenses.cpl10; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; + }; + + passthru = { + shellPath = "/bin/ksh"; + }; +}) diff --git a/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch b/pkgs/by-name/ks/ksmbd-tools/0001-skip-installing-example-configuration.patch similarity index 100% rename from pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch rename to pkgs/by-name/ks/ksmbd-tools/0001-skip-installing-example-configuration.patch diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix similarity index 100% rename from pkgs/os-specific/linux/ksmbd-tools/default.nix rename to pkgs/by-name/ks/ksmbd-tools/package.nix diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/by-name/ks/kssd/package.nix similarity index 100% rename from pkgs/applications/science/biology/kssd/default.nix rename to pkgs/by-name/ks/kssd/package.nix diff --git a/pkgs/tools/security/kstart/default.nix b/pkgs/by-name/ks/kstart/package.nix similarity index 100% rename from pkgs/tools/security/kstart/default.nix rename to pkgs/by-name/ks/kstart/package.nix diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/by-name/ks/ksuperkey/package.nix similarity index 100% rename from pkgs/tools/X11/ksuperkey/default.nix rename to pkgs/by-name/ks/ksuperkey/package.nix diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/by-name/kt/kt/package.nix similarity index 100% rename from pkgs/tools/misc/kt/default.nix rename to pkgs/by-name/kt/kt/package.nix diff --git a/pkgs/by-name/kt/ktlint/package.nix b/pkgs/by-name/kt/ktlint/package.nix new file mode 100644 index 000000000000..78784ec2bded --- /dev/null +++ b/pkgs/by-name/kt/ktlint/package.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gnused }: + +stdenv.mkDerivation rec { + pname = "ktlint"; + version = "1.4.0"; + + src = fetchurl { + url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; + sha256 = "sha256-7HAiTr1hH7klYafbucYtnrDq+2lCenZA1o4XawqEqXw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + install -Dm755 $src $out/bin/ktlint + ''; + + postFixup = '' + wrapProgram $out/bin/ktlint --prefix PATH : "${lib.makeBinPath [ jre_headless gnused ]}" + ''; + + meta = with lib; { + description = "Anti-bikeshedding Kotlin linter with built-in formatter"; + homepage = "https://ktlint.github.io/"; + license = licenses.mit; + platforms = jre_headless.meta.platforms; + changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; + maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "ktlint"; + }; +} diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/by-name/kt/ktop/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/ktop/default.nix rename to pkgs/by-name/kt/ktop/package.nix diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/by-name/kt/ktunnel/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/ktunnel/default.nix rename to pkgs/by-name/kt/ktunnel/package.nix diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix new file mode 100644 index 000000000000..d24be8a0df40 --- /dev/null +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -0,0 +1,50 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kube-bench"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "aquasecurity"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-x6xCrxePB/TR7BP1kLiVFjv4pLUJu9JVh5/Y0ebOjvY="; + }; + + vendorHash = "sha256-d6GhZBHDSRgMVeglw8rhq5QF7gRH4hQOzTn0DZjvhiA="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=v${version}" + ]; + + postInstall = '' + mkdir -p $out/share/kube-bench/ + mv ./cfg $out/share/kube-bench/ + + installShellCompletion --cmd kube-bench \ + --bash <($out/bin/kube-bench completion bash) \ + --fish <($out/bin/kube-bench completion fish) \ + --zsh <($out/bin/kube-bench completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/kube-bench --help + $out/bin/kube-bench version | grep "v${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/aquasecurity/kube-bench"; + changelog = "https://github.com/aquasecurity/kube-bench/releases/tag/v${version}"; + description = "Checks whether Kubernetes is deployed according to security best practices as defined in the CIS Kubernetes Benchmark"; + mainProgram = "kube-bench"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/by-name/ku/kube-capacity/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kube-capacity/default.nix rename to pkgs/by-name/ku/kube-capacity/package.nix diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/by-name/ku/kube-hunter/package.nix similarity index 100% rename from pkgs/tools/security/kube-hunter/default.nix rename to pkgs/by-name/ku/kube-hunter/package.nix diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/by-name/ku/kube-linter/package.nix similarity index 100% rename from pkgs/development/tools/kube-linter/default.nix rename to pkgs/by-name/ku/kube-linter/package.nix diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/by-name/ku/kube-prompt/package.nix similarity index 100% rename from pkgs/development/tools/kube-prompt/default.nix rename to pkgs/by-name/ku/kube-prompt/package.nix diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/by-name/ku/kube-router/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kube-router/default.nix rename to pkgs/by-name/ku/kube-router/package.nix diff --git a/pkgs/by-name/ku/kube-score/package.nix b/pkgs/by-name/ku/kube-score/package.nix new file mode 100644 index 000000000000..3295ac9c6fc4 --- /dev/null +++ b/pkgs/by-name/ku/kube-score/package.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, kube-score +}: + +buildGoModule rec { + pname = "kube-score"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "zegl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YsbefR6WkFef5nhbD9ACQ7Xx572RsHlL2zY78RtTtsQ="; + }; + + vendorHash = "sha256-9P7emxfRolhGEMiAJmBczksWkyHVFUtPZaNrjXkZ4t4="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = kube-score; + command = "kube-score version"; + }; + }; + + meta = with lib; { + description = "Kubernetes object analysis with recommendations for improved reliability and security"; + mainProgram = "kube-score"; + homepage = "https://github.com/zegl/kube-score"; + changelog = "https://github.com/zegl/kube-score/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ j4m3s ]; + }; +} diff --git a/pkgs/by-name/ku/kube-state-metrics/package.nix b/pkgs/by-name/ku/kube-state-metrics/package.nix index ec7c3f59c8b2..f44df084eb89 100644 --- a/pkgs/by-name/ku/kube-state-metrics/package.nix +++ b/pkgs/by-name/ku/kube-state-metrics/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kube-state-metrics"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kube-state-metrics"; rev = "v${version}"; - hash = "sha256-7lI1RRC/Lw3OcYs3RA3caNvLYS7xEaCoxCM/ioa0goY="; + hash = "sha256-qLn+2znmfIdBkoVkCJ0tFAPVRYc+qAJWKbDP2FqMocg="; }; - vendorHash = "sha256-Db7GTIC594yfp9gNn+hochpafqiRkLQIM/MTkX2S6E0="; + vendorHash = "sha256-KyEGmtSQO0EERLb0I7NBmxv1Jz+bYMrCZVwjJ1Jt+Ik="; excludedPackages = [ "./tests/e2e" diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/by-name/ku/kubeaudit/package.nix similarity index 100% rename from pkgs/tools/security/kubeaudit/default.nix rename to pkgs/by-name/ku/kubeaudit/package.nix diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix new file mode 100644 index 000000000000..e19b6a1545f3 --- /dev/null +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -0,0 +1,69 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, git +, go +, gnumake +, installShellFiles +, testers +, kubebuilder +}: + +buildGoModule rec { + pname = "kubebuilder"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kubebuilder"; + rev = "v${version}"; + hash = "sha256-awwUYmzLKz+K6qKN+nNWRAxIM/UFDF1r1cI7heeqrlo="; + }; + + vendorHash = "sha256-+7vCd9mC5rkC+XKc7hsHMFgT8R6dJfT0XR6PsJM3Xdc="; + + subPackages = ["cmd"]; + + allowGoReference = true; + + ldflags = [ + "-X main.kubeBuilderVersion=v${version}" + "-X main.goos=${go.GOOS}" + "-X main.goarch=${go.GOARCH}" + "-X main.gitCommit=unknown" + "-X main.buildDate=unknown" + ]; + + nativeBuildInputs = [ + makeWrapper + git + installShellFiles + ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/kubebuilder + wrapProgram $out/bin/kubebuilder \ + --prefix PATH : ${lib.makeBinPath [ go gnumake ]} + + installShellCompletion --cmd kubebuilder \ + --bash <($out/bin/kubebuilder completion bash) \ + --fish <($out/bin/kubebuilder completion fish) \ + --zsh <($out/bin/kubebuilder completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + command = "${kubebuilder}/bin/kubebuilder version"; + package = kubebuilder; + version = "v${version}"; + }; + + meta = { + description = "SDK for building Kubernetes APIs using CRDs"; + mainProgram = "kubebuilder"; + homepage = "https://github.com/kubernetes-sigs/kubebuilder"; + changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cmars ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/by-name/ku/kubecfg/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubecfg/default.nix rename to pkgs/by-name/ku/kubecfg/package.nix diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/by-name/ku/kubeclarity/package.nix similarity index 100% rename from pkgs/tools/security/kubeclarity/default.nix rename to pkgs/by-name/ku/kubeclarity/package.nix diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix new file mode 100644 index 000000000000..cef37279778a --- /dev/null +++ b/pkgs/by-name/ku/kubecm/package.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubecm"; + version = "0.32.0"; + + src = fetchFromGitHub { + owner = "sunny0826"; + repo = "kubecm"; + rev = "v${version}"; + hash = "sha256-wwAJha576P5Gt70Ys83IS4Pe1qAKvq46ucnjAcRKEKA="; + }; + + vendorHash = "sha256-7NW6j5GzOCP0Eb6IVeC9NRtMJl4ujXPWoWu/NvkMxYA="; + ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; + + doCheck = false; + + meta = with lib; { + description = "Manage your kubeconfig more easily"; + homepage = "https://github.com/sunny0826/kubecm/"; + license = licenses.asl20; + maintainers = with maintainers; [ qjoly ]; + mainProgram = "kubecm"; + }; +} diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/by-name/ku/kubeconform/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeconform/default.nix rename to pkgs/by-name/ku/kubeconform/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-cnpg/default.nix rename to pkgs/by-name/ku/kubectl-cnpg/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-example/default.nix b/pkgs/by-name/ku/kubectl-example/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-example/default.nix rename to pkgs/by-name/ku/kubectl-example/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/pkgs/by-name/ku/kubectl-explore/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-explore/default.nix rename to pkgs/by-name/ku/kubectl-explore/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/by-name/ku/kubectl-klock/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-klock/default.nix rename to pkgs/by-name/ku/kubectl-klock/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/by-name/ku/kubectl-node-shell/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-node-shell/default.nix rename to pkgs/by-name/ku/kubectl-node-shell/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-view-secret/default.nix rename to pkgs/by-name/ku/kubectl-view-secret/package.nix diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/by-name/ku/kubectx/package.nix similarity index 100% rename from pkgs/development/tools/kubectx/default.nix rename to pkgs/by-name/ku/kubectx/package.nix diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/by-name/ku/kubedb-cli/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubedb-cli/default.nix rename to pkgs/by-name/ku/kubedb-cli/package.nix diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/by-name/ku/kubedock/package.nix similarity index 100% rename from pkgs/development/tools/kubedock/default.nix rename to pkgs/by-name/ku/kubedock/package.nix diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/by-name/ku/kubedog/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubedog/default.nix rename to pkgs/by-name/ku/kubedog/package.nix diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix new file mode 100644 index 000000000000..b2e95b670c57 --- /dev/null +++ b/pkgs/by-name/ku/kubefirst/package.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "kubefirst"; + version = "2.7.3"; + + src = fetchFromGitHub { + owner = "konstructio"; + repo = "kubefirst"; + rev = "refs/tags/v${version}"; + hash = "sha256-pMvkroPxlHIf2zWO5aqTPYlQ3LlQLaahHuTZ2E1mKJY="; + }; + + vendorHash = "sha256-O7olGZC1QZQm1BPZOQdxSgUkASuE26oMpSPMv2sBawc="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/konstructio/kubefirst-api/configs.K1Version=v${version}" + ]; + + doCheck = false; + + meta = with lib; { + description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch"; + mainProgram = "kubefirst"; + homepage = "https://github.com/konstructio/kubefirst/"; + changelog = "https://github.com/konstructio/kubefirst/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix index efc658aae6a8..a5fde3f9f365 100644 --- a/pkgs/by-name/ku/kubelogin-oidc/package.nix +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -1,18 +1,18 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, }: -buildGo123Module rec { +buildGoModule rec { pname = "kubelogin"; - version = "1.30.1"; + version = "1.31.0"; src = fetchFromGitHub { owner = "int128"; repo = "kubelogin"; rev = "v${version}"; - hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU="; + hash = "sha256-IEKP5mHxJyGzlxNL4h0MR/Ge7g1kKidIjinYr+bL6as="; }; subPackages = [ "." ]; @@ -22,7 +22,7 @@ buildGo123Module rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY="; + vendorHash = "sha256-3hNc16zpazm9YqDx2M/RafCBLev2S8TzJzClGRkKydg="; # test all packages preCheck = '' diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/by-name/ku/kubelogin/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubelogin/default.nix rename to pkgs/by-name/ku/kubelogin/package.nix diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/by-name/ku/kubemq-community/package.nix similarity index 100% rename from pkgs/servers/kubemq-community/default.nix rename to pkgs/by-name/ku/kubemq-community/package.nix diff --git a/pkgs/applications/networking/cluster/kubemqctl/go.sum b/pkgs/by-name/ku/kubemqctl/go.sum similarity index 100% rename from pkgs/applications/networking/cluster/kubemqctl/go.sum rename to pkgs/by-name/ku/kubemqctl/go.sum diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/by-name/ku/kubemqctl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubemqctl/default.nix rename to pkgs/by-name/ku/kubemqctl/package.nix diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/by-name/ku/kubeone/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeone/default.nix rename to pkgs/by-name/ku/kubeone/package.nix diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/by-name/ku/kubeprompt/package.nix similarity index 100% rename from pkgs/development/tools/kubeprompt/default.nix rename to pkgs/by-name/ku/kubeprompt/package.nix diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/by-name/ku/kubepug/package.nix similarity index 100% rename from pkgs/development/tools/kubepug/default.nix rename to pkgs/by-name/ku/kubepug/package.nix diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/by-name/ku/kubergrunt/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubergrunt/default.nix rename to pkgs/by-name/ku/kubergrunt/package.nix diff --git a/pkgs/development/tools/kubernetes-code-generator/default.nix b/pkgs/by-name/ku/kubernetes-code-generator/package.nix similarity index 100% rename from pkgs/development/tools/kubernetes-code-generator/default.nix rename to pkgs/by-name/ku/kubernetes-code-generator/package.nix diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix similarity index 100% rename from pkgs/development/tools/kubernetes-controller-tools/default.nix rename to pkgs/by-name/ku/kubernetes-controller-tools/package.nix diff --git a/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/pkgs/by-name/ku/kubernetes-metrics-server/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix rename to pkgs/by-name/ku/kubernetes-metrics-server/package.nix diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix similarity index 100% rename from pkgs/tools/security/kubernetes-polaris/default.nix rename to pkgs/by-name/ku/kubernetes-polaris/package.nix diff --git a/pkgs/applications/networking/cluster/kubernix/Cargo.lock b/pkgs/by-name/ku/kubernix/Cargo.lock similarity index 100% rename from pkgs/applications/networking/cluster/kubernix/Cargo.lock rename to pkgs/by-name/ku/kubernix/Cargo.lock diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/by-name/ku/kubernix/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernix/default.nix rename to pkgs/by-name/ku/kubernix/package.nix diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/by-name/ku/kubescape/package.nix similarity index 100% rename from pkgs/tools/security/kubescape/default.nix rename to pkgs/by-name/ku/kubescape/package.nix diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/by-name/ku/kubeseal/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeseal/default.nix rename to pkgs/by-name/ku/kubeseal/package.nix diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/by-name/ku/kubesec/package.nix similarity index 100% rename from pkgs/tools/security/kubesec/default.nix rename to pkgs/by-name/ku/kubesec/package.nix diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/by-name/ku/kubeshark/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeshark/default.nix rename to pkgs/by-name/ku/kubeshark/package.nix diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/by-name/ku/kubespy/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubespy/default.nix rename to pkgs/by-name/ku/kubespy/package.nix diff --git a/pkgs/tools/security/kubestroyer/default.nix b/pkgs/by-name/ku/kubestroyer/package.nix similarity index 100% rename from pkgs/tools/security/kubestroyer/default.nix rename to pkgs/by-name/ku/kubestroyer/package.nix diff --git a/pkgs/by-name/ku/kubeswitch/package.nix b/pkgs/by-name/ku/kubeswitch/package.nix new file mode 100644 index 000000000000..9b43d80a28c4 --- /dev/null +++ b/pkgs/by-name/ku/kubeswitch/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + kubeswitch, + installShellFiles, +}: + +buildGoModule rec { + pname = "kubeswitch"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "danielfoehrKn"; + repo = "kubeswitch"; + rev = version; + hash = "sha256-P6pMT3TzY5CKFEQZMiwVeOuOCx6/SUpacKAcgjCeE5w="; + }; + + vendorHash = null; + + subPackages = [ "cmd/main.go" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}" + "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/main $out/bin/switcher + for shell in bash zsh fish; do + $out/bin/switcher --cmd switcher completion $shell > switcher.$shell + installShellCompletion --$shell switcher.$shell + done + ''; + + passthru.tests.version = testers.testVersion { package = kubeswitch; }; + + meta = { + changelog = "https://github.com/danielfoehrKn/kubeswitch/releases/tag/${version}"; + description = "Kubectx for operators, a drop-in replacement for kubectx"; + license = lib.licenses.asl20; + homepage = "https://github.com/danielfoehrKn/kubeswitch"; + maintainers = with lib.maintainers; [ bryanasdev000 ]; + mainProgram = "switcher"; + }; +} diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/by-name/ku/kubetail/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubetail/default.nix rename to pkgs/by-name/ku/kubetail/package.nix diff --git a/pkgs/by-name/ku/kubetrim/package.nix b/pkgs/by-name/ku/kubetrim/package.nix new file mode 100644 index 000000000000..1e94339958bf --- /dev/null +++ b/pkgs/by-name/ku/kubetrim/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + name = "kubetrim"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "alexellis"; + repo = "kubetrim"; + rev = "refs/tags/v${version}"; + hash = "sha256-fX8CbId2ArJlnGkevCSB7eE6Ovs8vJR9+l//k4DgvK4="; + }; + + vendorHash = "sha256-m9OuVFlD4F170Q6653HdvUhdULjR2cAttLsUN03XIXo="; + + ldflags = [ + "-s" + "-w" + "-X github.com/alexellis/kubetrim/pkg.Version=${version}" + ]; + + meta = { + description = "Trim your KUBECONFIG automatically"; + homepage = "https://github.com/alexellis/kubetrim"; + changelog = "https://github.com/alexellis/kubetrim/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bbigras ]; + mainProgram = "kubetrim"; + }; +} diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/by-name/ku/kubevela/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubevela/default.nix rename to pkgs/by-name/ku/kubevela/package.nix diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/by-name/ku/kubevirt/package.nix similarity index 100% rename from pkgs/tools/virtualization/kubevirt/default.nix rename to pkgs/by-name/ku/kubevirt/package.nix diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/by-name/ku/kubevpn/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubevpn/default.nix rename to pkgs/by-name/ku/kubevpn/package.nix diff --git a/pkgs/applications/networking/cluster/kubexit/default.nix b/pkgs/by-name/ku/kubexit/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubexit/default.nix rename to pkgs/by-name/ku/kubexit/package.nix diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/by-name/ku/kupfer/package.nix similarity index 100% rename from pkgs/applications/misc/kupfer/default.nix rename to pkgs/by-name/ku/kupfer/package.nix diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/by-name/ku/kuro/package.nix similarity index 100% rename from pkgs/applications/misc/kuro/default.nix rename to pkgs/by-name/ku/kuro/package.nix diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/by-name/ku/kuttl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kuttl/default.nix rename to pkgs/by-name/ku/kuttl/package.nix diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/by-name/kv/kvmtool/package.nix similarity index 100% rename from pkgs/applications/virtualization/kvmtool/default.nix rename to pkgs/by-name/kv/kvmtool/package.nix diff --git a/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch b/pkgs/by-name/kv/kvmtool/strlcpy-glibc-2.38-fix.patch similarity index 100% rename from pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch rename to pkgs/by-name/kv/kvmtool/strlcpy-glibc-2.38-fix.patch diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/by-name/kw/kwakd/package.nix similarity index 100% rename from pkgs/servers/kwakd/default.nix rename to pkgs/by-name/kw/kwakd/package.nix diff --git a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/pkgs/by-name/kw/kwm/org.nixos.kwm.plist similarity index 100% rename from pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist rename to pkgs/by-name/kw/kwm/org.nixos.kwm.plist diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/by-name/kw/kwm/package.nix similarity index 100% rename from pkgs/os-specific/darwin/kwm/default.nix rename to pkgs/by-name/kw/kwm/package.nix diff --git a/pkgs/by-name/kw/kwok/package.nix b/pkgs/by-name/kw/kwok/package.nix index cf11b9dadb0e..140dd1d60f12 100644 --- a/pkgs/by-name/kw/kwok/package.nix +++ b/pkgs/by-name/kw/kwok/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kwok"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kwok"; rev = "refs/tags/v${version}"; - hash = "sha256-3g8enPxxh2SaxiDgDwJpAfSjv/iRoBRmTnXwDtuMdFA="; + hash = "sha256-RVyXGPT30Fz+K1VdMneYldXvzHyimuCX406DMKOtUq4="; }; - vendorHash = "sha256-YVGXYN7PgGgBzxhx6piP3NHRAsR1/pCj97UWB21WNMg="; + vendorHash = "sha256-xzFbcsL6pz91GFwjkriTMKlX2fgm2NMO9+H3lqH/C2c="; doCheck = false; # docker is need for test diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/by-name/ky/kyotocabinet/package.nix similarity index 100% rename from pkgs/development/libraries/kyotocabinet/default.nix rename to pkgs/by-name/ky/kyotocabinet/package.nix diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/pkgs/by-name/ky/kytea/gcc-O3.patch similarity index 100% rename from pkgs/tools/text/kytea/gcc-O3.patch rename to pkgs/by-name/ky/kytea/gcc-O3.patch diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/by-name/ky/kytea/package.nix similarity index 100% rename from pkgs/tools/text/kytea/default.nix rename to pkgs/by-name/ky/kytea/package.nix diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/by-name/ky/kythe/package.nix similarity index 100% rename from pkgs/development/tools/kythe/default.nix rename to pkgs/by-name/ky/kythe/package.nix diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 059997ff15bd..9dcfbeaf5787 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -11,23 +11,23 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.8"; + version = "0.2.11"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-elszVinOGL4IbMNK3RTtzJPRRqs7qgqITQqj0g/wyk8="; + hash = "sha256-s66TG4r3WSmEfcJzibu8uKv1Pr0aKfTEFNfJzLHjbIA="; }; - vendorHash = "sha256-HDmnI+WVv4cUia+IXrBdFBFnrxKMSFjKD6LUZ393sqs="; + vendorHash = "sha256-NQJbj1lFR5947Lrw5nSsdfYlkWjTWJ5ybMq7Bpd/s3I="; + + subPackages = [ "." ]; ldflags = [ "-s" "-w" "-X github.com/kyverno/chainsaw/pkg/version.BuildVersion=v${version}" - "-X github.com/kyverno/chainsaw/pkg/version.BuildHash=${version}" - "-X github.com/kyverno/chainsaw/pkg/version.BuildTime=1970-01-01_00:00:00" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/by-name/ky/kyverno/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kyverno/default.nix rename to pkgs/by-name/ky/kyverno/package.nix diff --git a/pkgs/tools/text/l2md/default.nix b/pkgs/by-name/l2/l2md/package.nix similarity index 100% rename from pkgs/tools/text/l2md/default.nix rename to pkgs/by-name/l2/l2md/package.nix diff --git a/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/pkgs/by-name/la/LAStools/drop-64-suffix.patch similarity index 100% rename from pkgs/development/libraries/LAStools/drop-64-suffix.patch rename to pkgs/by-name/la/LAStools/drop-64-suffix.patch diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/by-name/la/LAStools/package.nix similarity index 100% rename from pkgs/development/libraries/LAStools/default.nix rename to pkgs/by-name/la/LAStools/package.nix diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/by-name/la/lab/package.nix similarity index 100% rename from pkgs/applications/version-management/lab/default.nix rename to pkgs/by-name/la/lab/package.nix diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/by-name/la/labelImg/package.nix similarity index 100% rename from pkgs/applications/science/machine-learning/labelimg/default.nix rename to pkgs/by-name/la/labelImg/package.nix diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 594a255bb989..e9b68742d681 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -8,6 +8,7 @@ libinput, libpng, librsvg, + libsfdo, libxcb, libxkbcommon, libxml2, @@ -17,6 +18,7 @@ pkg-config, scdoc, stdenv, + versionCheckHook, wayland, wayland-protocols, wayland-scanner, @@ -27,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA="; + hash = "sha256-TXxdjMkzZQoCqkZBqus5eCBEhA/nvxNNXaNHUTGFQDQ="; }; outputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libinput libpng librsvg + libsfdo libxcb libxkbcommon libxml2 @@ -69,10 +72,15 @@ stdenv.mkDerivation (finalAttrs: { xwayland ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; strictDeps = true; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + passthru = { providedSessions = [ "labwc" ]; }; @@ -80,9 +88,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; + changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; }) diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/by-name/la/lact/package.nix similarity index 100% rename from pkgs/tools/system/lact/default.nix rename to pkgs/by-name/la/lact/package.nix diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/by-name/la/lalezar-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/lalezar-fonts/default.nix rename to pkgs/by-name/la/lalezar-fonts/package.nix diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/by-name/la/lalrpop/package.nix similarity index 100% rename from pkgs/development/tools/lalrpop/default.nix rename to pkgs/by-name/la/lalrpop/package.nix diff --git a/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch b/pkgs/by-name/la/lalrpop/use-correct-binary-path-in-tests.patch similarity index 100% rename from pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch rename to pkgs/by-name/la/lalrpop/use-correct-binary-path-in-tests.patch diff --git a/pkgs/applications/emulators/lambda-delta/default.nix b/pkgs/by-name/la/lambda-delta/package.nix similarity index 100% rename from pkgs/applications/emulators/lambda-delta/default.nix rename to pkgs/by-name/la/lambda-delta/package.nix diff --git a/pkgs/development/interpreters/lambda-lisp/default.nix b/pkgs/by-name/la/lambda-lisp/package.nix similarity index 100% rename from pkgs/development/interpreters/lambda-lisp/default.nix rename to pkgs/by-name/la/lambda-lisp/package.nix diff --git a/pkgs/development/interpreters/lambda-lisp/sources.nix b/pkgs/by-name/la/lambda-lisp/sources.nix similarity index 100% rename from pkgs/development/interpreters/lambda-lisp/sources.nix rename to pkgs/by-name/la/lambda-lisp/sources.nix diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/by-name/la/lambda-mod-zsh-theme/package.nix similarity index 100% rename from pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix rename to pkgs/by-name/la/lambda-mod-zsh-theme/package.nix diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/by-name/la/lame/package.nix similarity index 100% rename from pkgs/development/libraries/lame/default.nix rename to pkgs/by-name/la/lame/package.nix diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/by-name/la/laminar/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/laminar/default.nix rename to pkgs/by-name/la/laminar/package.nix diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/by-name/la/laminar/patches/no-network.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch rename to pkgs/by-name/la/laminar/patches/no-network.patch diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/by-name/la/languagetool/package.nix similarity index 100% rename from pkgs/tools/text/languagetool/default.nix rename to pkgs/by-name/la/languagetool/package.nix diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/by-name/la/lao/package.nix similarity index 100% rename from pkgs/data/fonts/lao/default.nix rename to pkgs/by-name/la/lao/package.nix diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/by-name/la/lapack-reference/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/liblapack/default.nix rename to pkgs/by-name/la/lapack-reference/package.nix diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/by-name/la/lapack/package.nix similarity index 100% rename from pkgs/build-support/alternatives/lapack/default.nix rename to pkgs/by-name/la/lapack/package.nix diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index e0c189988053..4c83c1ad59e1 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bbbf9f75876816a919d068f10bce5fcc", + "content-hash": "399626345cd7b56932f01477c0ed926e", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -168,16 +168,16 @@ }, { "name": "illuminate/collections", - "version": "v11.11.0", + "version": "v11.30.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "176f39271b5f85bee3c4bf797d1e95102d55e12b" + "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/176f39271b5f85bee3c4bf797d1e95102d55e12b", - "reference": "176f39271b5f85bee3c4bf797d1e95102d55e12b", + "url": "https://api.github.com/repos/illuminate/collections/zipball/2d99ccbb19e34450508ff3ab2f62ba90aa2e9793", + "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793", "shasum": "" }, "require": { @@ -219,20 +219,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-11T13:32:31+00:00" + "time": "2024-10-10T19:23:07+00:00" }, { "name": "illuminate/conditionable", - "version": "v11.11.0", + "version": "v11.30.0", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "8a558fec063b6a63da1c3af1d219c0f998edffeb" + "reference": "362dd761b9920367bca1427a902158225e9e3a23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/8a558fec063b6a63da1c3af1d219c0f998edffeb", - "reference": "8a558fec063b6a63da1c3af1d219c0f998edffeb", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/362dd761b9920367bca1427a902158225e9e3a23", + "reference": "362dd761b9920367bca1427a902158225e9e3a23", "shasum": "" }, "require": { @@ -265,20 +265,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-04-04T17:36:49+00:00" + "time": "2024-06-28T20:10:30+00:00" }, { "name": "illuminate/contracts", - "version": "v11.11.0", + "version": "v11.30.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "86c1331d0b06c59ca21723d8bfc9faaa19430b46" + "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/86c1331d0b06c59ca21723d8bfc9faaa19430b46", - "reference": "86c1331d0b06c59ca21723d8bfc9faaa19430b46", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/56312862af937bd6da8e6dc8bbd88188dfb478f8", + "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8", "shasum": "" }, "require": { @@ -313,20 +313,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-05-21T17:42:34+00:00" + "time": "2024-09-22T15:08:08+00:00" }, { "name": "illuminate/filesystem", - "version": "v11.11.0", + "version": "v11.30.0", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "3a09c14df1085de6e81cecb8b5df2031c8872ca2" + "reference": "ce7013a350fb06bc65e8a2cf15fd2015f49e476d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/3a09c14df1085de6e81cecb8b5df2031c8872ca2", - "reference": "3a09c14df1085de6e81cecb8b5df2031c8872ca2", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/ce7013a350fb06bc65e8a2cf15fd2015f49e476d", + "reference": "ce7013a350fb06bc65e8a2cf15fd2015f49e476d", "shasum": "" }, "require": { @@ -380,20 +380,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-05-30T15:47:53+00:00" + "time": "2024-09-22T15:10:50+00:00" }, { "name": "illuminate/macroable", - "version": "v11.11.0", + "version": "v11.30.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", - "reference": "5b6c7c7c5951e6e8fc22dd7e4363602df8294dfa" + "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/macroable/zipball/5b6c7c7c5951e6e8fc22dd7e4363602df8294dfa", - "reference": "5b6c7c7c5951e6e8fc22dd7e4363602df8294dfa", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed", + "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed", "shasum": "" }, "require": { @@ -426,20 +426,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-05-16T21:43:47+00:00" + "time": "2024-06-28T20:10:30+00:00" }, { "name": "illuminate/support", - "version": "v11.11.0", + "version": "v11.30.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "142c5f8a3931b7a7021ab63175ae1948743fac04" + "reference": "69453485fa4c76589b5a1a98ebef0e8fee749220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/142c5f8a3931b7a7021ab63175ae1948743fac04", - "reference": "142c5f8a3931b7a7021ab63175ae1948743fac04", + "url": "https://api.github.com/repos/illuminate/support/zipball/69453485fa4c76589b5a1a98ebef0e8fee749220", + "reference": "69453485fa4c76589b5a1a98ebef0e8fee749220", "shasum": "" }, "require": { @@ -463,6 +463,7 @@ }, "suggest": { "illuminate/filesystem": "Required to use the composer class (^11.0).", + "laravel/serializable-closure": "Required to use the once function (^1.3).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", "symfony/process": "Required to use the composer class (^7.0).", @@ -478,6 +479,7 @@ }, "autoload": { "files": [ + "functions.php", "helpers.php" ], "psr-4": { @@ -500,25 +502,25 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-18T17:23:00+00:00" + "time": "2024-10-29T20:21:52+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.24", + "version": "v0.3.1", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "409b0b4305273472f3754826e68f4edbd0150149" + "reference": "0f3848a445562dac376b27968f753c65e7e1036e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149", - "reference": "409b0b4305273472f3754826e68f4edbd0150149", + "url": "https://api.github.com/repos/laravel/prompts/zipball/0f3848a445562dac376b27968f753c65e7e1036e", + "reference": "0f3848a445562dac376b27968f753c65e7e1036e", "shasum": "" }, "require": { + "composer-runtime-api": "^2.2", "ext-mbstring": "*", - "illuminate/collections": "^10.0|^11.0", "php": "^8.1", "symfony/console": "^6.2|^7.0" }, @@ -527,6 +529,7 @@ "laravel/framework": ">=10.17.0 <10.25.0" }, "require-dev": { + "illuminate/collections": "^10.0|^11.0", "mockery/mockery": "^1.5", "pestphp/pest": "^2.3", "phpstan/phpstan": "^1.11", @@ -538,7 +541,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.1.x-dev" + "dev-main": "0.3.x-dev" } }, "autoload": { @@ -556,26 +559,26 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.24" + "source": "https://github.com/laravel/prompts/tree/v0.3.1" }, - "time": "2024-06-17T13:58:22+00:00" + "time": "2024-10-09T19:42:26+00:00" }, { "name": "nesbot/carbon", - "version": "3.5.0", + "version": "3.8.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "415782b7e48223342f1a616c16c45a95b15b2318" + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/415782b7e48223342f1a616c16c45a95b15b2318", - "reference": "415782b7e48223342f1a616c16c45a95b15b2318", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", "shasum": "" }, "require": { - "carbonphp/carbon-doctrine-types": "*", + "carbonphp/carbon-doctrine-types": "<100.0", "ext-json": "*", "php": "^8.1", "psr/clock": "^1.0", @@ -664,7 +667,7 @@ "type": "tidelift" } ], - "time": "2024-06-03T17:25:54+00:00" + "time": "2024-11-07T17:46:48+00:00" }, { "name": "psr/clock", @@ -820,16 +823,16 @@ }, { "name": "symfony/clock", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7" + "reference": "97bebc53548684c17ed696bc8af016880f0f098d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7", - "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7", + "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d", + "reference": "97bebc53548684c17ed696bc8af016880f0f098d", "shasum": "" }, "require": { @@ -874,7 +877,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.1.1" + "source": "https://github.com/symfony/clock/tree/v7.1.6" }, "funding": [ { @@ -890,20 +893,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/console", - "version": "v7.1.1", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3" + "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", - "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", + "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a", + "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a", "shasum": "" }, "require": { @@ -967,7 +970,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.1" + "source": "https://github.com/symfony/console/tree/v7.1.7" }, "funding": [ { @@ -983,7 +986,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-11-05T15:34:55+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1054,16 +1057,16 @@ }, { "name": "symfony/finder", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" + "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", - "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8", + "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8", "shasum": "" }, "require": { @@ -1098,7 +1101,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.1" + "source": "https://github.com/symfony/finder/tree/v7.1.6" }, "funding": [ { @@ -1114,24 +1117,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-10-01T08:31:23+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -1177,7 +1180,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -1193,24 +1196,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1255,7 +1258,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -1271,24 +1274,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1336,7 +1339,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -1352,24 +1355,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -1416,7 +1419,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -1432,105 +1435,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-php80": "^1.14" + "php": ">=7.2" }, "type": "library", "extra": { @@ -1573,7 +1495,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" }, "funding": [ { @@ -1589,20 +1511,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v7.1.1", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "febf90124323a093c7ee06fdb30e765ca3c20028" + "reference": "9b8a40b7289767aa7117e957573c2a535efe6585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028", - "reference": "febf90124323a093c7ee06fdb30e765ca3c20028", + "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585", + "reference": "9b8a40b7289767aa7117e957573c2a535efe6585", "shasum": "" }, "require": { @@ -1634,7 +1556,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.1" + "source": "https://github.com/symfony/process/tree/v7.1.7" }, "funding": [ { @@ -1650,7 +1572,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-11-06T09:25:12+00:00" }, { "name": "symfony/service-contracts", @@ -1737,16 +1659,16 @@ }, { "name": "symfony/string", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "60bc311c74e0af215101235aa6f471bcbc032df2" + "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2", - "reference": "60bc311c74e0af215101235aa6f471bcbc032df2", + "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626", + "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626", "shasum": "" }, "require": { @@ -1804,7 +1726,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.1" + "source": "https://github.com/symfony/string/tree/v7.1.6" }, "funding": [ { @@ -1820,20 +1742,20 @@ "type": "tidelift" } ], - "time": "2024-06-04T06:40:14+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/translation", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3" + "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3", - "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3", + "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f", + "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f", "shasum": "" }, "require": { @@ -1898,7 +1820,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.1.1" + "source": "https://github.com/symfony/translation/tree/v7.1.6" }, "funding": [ { @@ -1914,7 +1836,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-28T12:35:13+00:00" }, { "name": "symfony/translation-contracts", @@ -2072,16 +1994,16 @@ "packages-dev": [ { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -2120,7 +2042,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -2128,20 +2050,20 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -2152,7 +2074,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -2184,9 +2106,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "phar-io/manifest", @@ -2308,16 +2230,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.11.5", + "version": "1.12.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443" + "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", + "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", "shasum": "" }, "require": { @@ -2362,36 +2284,36 @@ "type": "github" } ], - "time": "2024-06-17T15:10:54+00:00" + "time": "2024-11-06T19:06:49+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.14", + "version": "10.1.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" + "reference": "7e308268858ed6baedc8704a304727d20bc07c77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77", + "reference": "7e308268858ed6baedc8704a304727d20bc07c77", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=8.1", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-text-template": "^3.0.1", + "sebastian/code-unit-reverse-lookup": "^3.0.0", + "sebastian/complexity": "^3.2.0", + "sebastian/environment": "^6.1.0", + "sebastian/lines-of-code": "^2.0.2", + "sebastian/version": "^4.0.1", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { "phpunit/phpunit": "^10.1" @@ -2403,7 +2325,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.1-dev" + "dev-main": "10.1.x-dev" } }, "autoload": { @@ -2432,7 +2354,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16" }, "funding": [ { @@ -2440,7 +2362,7 @@ "type": "github" } ], - "time": "2024-03-12T15:33:41+00:00" + "time": "2024-08-22T04:31:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2687,16 +2609,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.22", + "version": "10.5.38", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "8afb89b399b17c2ce2618015bdc9f81a117c5ee1" + "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8afb89b399b17c2ce2618015bdc9f81a117c5ee1", - "reference": "8afb89b399b17c2ce2618015bdc9f81a117c5ee1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132", + "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132", "shasum": "" }, "require": { @@ -2706,26 +2628,26 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "phpunit/php-code-coverage": "^10.1.16", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-invoker": "^4.0.0", + "phpunit/php-text-template": "^3.0.1", + "phpunit/php-timer": "^6.0.0", + "sebastian/cli-parser": "^2.0.1", + "sebastian/code-unit": "^2.0.0", + "sebastian/comparator": "^5.0.3", + "sebastian/diff": "^5.1.1", + "sebastian/environment": "^6.1.0", + "sebastian/exporter": "^5.1.2", + "sebastian/global-state": "^6.0.2", + "sebastian/object-enumerator": "^5.0.0", + "sebastian/recursion-context": "^5.0.0", + "sebastian/type": "^4.0.0", + "sebastian/version": "^4.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -2768,7 +2690,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.22" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38" }, "funding": [ { @@ -2784,7 +2706,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T05:29:34+00:00" + "time": "2024-10-28T13:06:21+00:00" }, { "name": "sebastian/cli-parser", @@ -2956,16 +2878,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.1", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", "shasum": "" }, "require": { @@ -2976,7 +2898,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -3021,7 +2943,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" }, "funding": [ { @@ -3029,7 +2951,7 @@ "type": "github" } ], - "time": "2023-08-14T13:18:12+00:00" + "time": "2024-10-18T14:56:07+00:00" }, { "name": "sebastian/complexity", @@ -3755,12 +3677,12 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.2" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index 61d2a3f88d78..47aeb6210865 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -4,21 +4,21 @@ makeWrapper, php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.8.3"; + version = "5.9.2"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; rev = "v${finalAttrs.version}"; - hash = "sha256-a7DbpjIcT1JbhuzpzQVQ/iiWLAVF/XisrTUsDbR78XQ="; + hash = "sha256-XE1KYOlWehj1peSNj3sKNr6CKchCxRNpIjXHq7slVME="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-NyD/kyqGyE+yO7wCitMipTWnKbGSd/FSQ3iGcXvCv5Y="; + vendorHash = "sha256-jUg0hmkShzK1CAO3+Btqe3/5GFKVxRKDtIxmUuU3EdU="; postInstall = '' wrapProgram $out/bin/laravel \ diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/by-name/la/larswm/package.nix similarity index 100% rename from pkgs/applications/window-managers/larswm/default.nix rename to pkgs/by-name/la/larswm/package.nix diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/by-name/la/lasem/package.nix similarity index 100% rename from pkgs/development/libraries/lasem/default.nix rename to pkgs/by-name/la/lasem/package.nix diff --git a/pkgs/applications/audio/lash/gcc-47.patch b/pkgs/by-name/la/lash/gcc-47.patch similarity index 100% rename from pkgs/applications/audio/lash/gcc-47.patch rename to pkgs/by-name/la/lash/gcc-47.patch diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/by-name/la/lash/package.nix similarity index 100% rename from pkgs/applications/audio/lash/default.nix rename to pkgs/by-name/la/lash/package.nix diff --git a/pkgs/applications/audio/lash/socket.patch b/pkgs/by-name/la/lash/socket.patch similarity index 100% rename from pkgs/applications/audio/lash/socket.patch rename to pkgs/by-name/la/lash/socket.patch diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/by-name/la/lasso/package.nix similarity index 100% rename from pkgs/development/libraries/lasso/default.nix rename to pkgs/by-name/la/lasso/package.nix diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/by-name/la/last-resort/package.nix similarity index 100% rename from pkgs/data/fonts/last-resort/default.nix rename to pkgs/by-name/la/last-resort/package.nix diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/by-name/la/last/package.nix similarity index 100% rename from pkgs/applications/science/biology/last/default.nix rename to pkgs/by-name/la/last/package.nix diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/by-name/la/lastpass-cli/package.nix similarity index 100% rename from pkgs/tools/security/lastpass-cli/default.nix rename to pkgs/by-name/la/lastpass-cli/package.nix diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/by-name/la/latencytop/package.nix similarity index 100% rename from pkgs/os-specific/linux/latencytop/default.nix rename to pkgs/by-name/la/latencytop/package.nix diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/by-name/la/latex2html/package.nix similarity index 100% rename from pkgs/tools/misc/latex2html/default.nix rename to pkgs/by-name/la/latex2html/package.nix diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index 4816f4f99c50..f07f5fafd68d 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vJziNgVYcnJfmAnok2OeYZEOwGtGfhZyup3D3+BuZsU="; + hash = "sha256-bxv7dKSnlJ5njvCgAKjRVJeoE2BluP1nx9QFZ/2JYeg="; }; build-system = with python3Packages; [ diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/by-name/la/latexrun/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/latexrun/default.nix rename to pkgs/by-name/la/latexrun/package.nix diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/by-name/la/lato/package.nix similarity index 100% rename from pkgs/data/fonts/lato/default.nix rename to pkgs/by-name/la/lato/package.nix diff --git a/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/pkgs/by-name/la/lattice-diamond/package.nix similarity index 100% rename from pkgs/development/embedded/fpga/lattice-diamond/default.nix rename to pkgs/by-name/la/lattice-diamond/package.nix diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index 77ad5e5901a9..a990d58eb4df 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -1,30 +1,42 @@ -{ lib -, stdenv -, fetchgit -, meson -, ninja -, pkg-config -, scdoc -, wayland-scanner -, cairo -, librsvg -, libxkbcommon -, wayland -, wayland-protocols +{ + lib, + cairo, + fetchFromSourcehut, + librsvg, + libxkbcommon, + meson, + ninja, + pkg-config, + scdoc, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lavalauncher"; version = "2.1.1"; - src = fetchgit { - url = "https://git.sr.ht/~leon_plickat/lavalauncher"; - rev = "v${version}"; - sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; + src = fetchFromSourcehut { + pname = "lavalauncher-source"; + inherit (finalAttrs) version; + owner = "~leon_plickat"; + repo = "lavalauncher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; }; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + buildInputs = [ cairo librsvg @@ -33,7 +45,9 @@ stdenv.mkDerivation rec { wayland-protocols ]; - meta = with lib; { + strictDeps = true; + + meta = { homepage = "https://git.sr.ht/~leon_plickat/lavalauncher"; description = "Simple launcher panel for Wayland desktops"; longDescription = '' @@ -52,9 +66,13 @@ stdenv.mkDerivation rec { The Wayland compositor must implement the Layer-Shell and XDG-Output for LavaLauncher to work. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + changelog = "https://git.sr.ht/~leon_plickat/lavalauncher/refs/${finalAttrs.src.rev}"; + license = lib.licenses.gpl3Plus; mainProgram = "lavalauncher"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + # meson.build:52:23: ERROR: C shared or static library 'rt' not found + # https://logs.ofborg.org/?key=nixos/nixpkgs.340239&attempt_id=1f05cada-67d2-4cfe-b6a8-4bf4571b9375 + broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/tools/misc/lavat/default.nix b/pkgs/by-name/la/lavat/package.nix similarity index 100% rename from pkgs/tools/misc/lavat/default.nix rename to pkgs/by-name/la/lavat/package.nix diff --git a/pkgs/data/themes/layan-gtk-theme/default.nix b/pkgs/by-name/la/layan-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/layan-gtk-theme/default.nix rename to pkgs/by-name/la/layan-gtk-theme/package.nix diff --git a/pkgs/tools/misc/lazycli/default.nix b/pkgs/by-name/la/lazycli/package.nix similarity index 100% rename from pkgs/tools/misc/lazycli/default.nix rename to pkgs/by-name/la/lazycli/package.nix diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/by-name/la/lazydocker/package.nix similarity index 100% rename from pkgs/tools/misc/lazydocker/default.nix rename to pkgs/by-name/la/lazydocker/package.nix diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 8d6e2c93fad0..dc3ecec1acc8 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -2,25 +2,36 @@ , stdenv , buildGoModule , fetchFromGitHub +, testers +, lazysql , xorg ? null , darwin ? null }: buildGoModule rec { pname = "lazysql"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-6aJrLkmebOhLrnVhl9cnbW1ZBt0vq8lR7Lhz9nPFr8Q="; + hash = "sha256-nDiy7LSSUp1cPgtCfLdu7LEh0A+Ga1p5eNVanbQtQ+E="; }; - vendorHash = "sha256-celee8uyoirX+vtAww2iQJtRwJEHyfHL2mZA2muSRiQ="; + vendorHash = "sha256-SKNFViwoMzZ1hKKZSvTm0/kKro1IaUVsC+0Pbv7FoAU="; + + ldflags = [ + "-X main.version=${version}" + ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + passthru.tests.version = testers.testVersion { + package = lazysql; + command = "lazysql version"; + }; + meta = with lib; { description = "A cross-platform TUI database management tool written in Go"; homepage = "https://github.com/jorgerojas26/lazysql"; diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/pkgs/by-name/lb/lbdb/add-methods-to-rc.patch similarity index 100% rename from pkgs/tools/misc/lbdb/add-methods-to-rc.patch rename to pkgs/by-name/lb/lbdb/add-methods-to-rc.patch diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/by-name/lb/lbdb/package.nix similarity index 100% rename from pkgs/tools/misc/lbdb/default.nix rename to pkgs/by-name/lb/lbdb/package.nix diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/by-name/lb/lbry/package.nix similarity index 100% rename from pkgs/applications/video/lbry/default.nix rename to pkgs/by-name/lb/lbry/package.nix diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/by-name/lb/lbzip2/package.nix similarity index 100% rename from pkgs/tools/compression/lbzip2/default.nix rename to pkgs/by-name/lb/lbzip2/package.nix diff --git a/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/pkgs/by-name/lc/lc3tools/0001-mangle-configure.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0001-mangle-configure.patch rename to pkgs/by-name/lc/lc3tools/0001-mangle-configure.patch diff --git a/pkgs/development/tools/lc3tools/0002-lc3os-path.patch b/pkgs/by-name/lc/lc3tools/0002-lc3os-path.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0002-lc3os-path.patch rename to pkgs/by-name/lc/lc3tools/0002-lc3os-path.patch diff --git a/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch b/pkgs/by-name/lc/lc3tools/0003-lc3sim-tk-path.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch rename to pkgs/by-name/lc/lc3tools/0003-lc3sim-tk-path.patch diff --git a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/pkgs/by-name/lc/lc3tools/0004-configure-use-cc.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0004-configure-use-cc.patch rename to pkgs/by-name/lc/lc3tools/0004-configure-use-cc.patch diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/by-name/lc/lc3tools/package.nix similarity index 100% rename from pkgs/development/tools/lc3tools/default.nix rename to pkgs/by-name/lc/lc3tools/package.nix diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/by-name/lc/lcalc/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/lcalc/default.nix rename to pkgs/by-name/lc/lcalc/package.nix diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/pkgs/by-name/lc/lcdf-typetools/package.nix similarity index 100% rename from pkgs/tools/misc/lcdf-typetools/default.nix rename to pkgs/by-name/lc/lcdf-typetools/package.nix diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/pkgs/by-name/lc/lcdproc/hardcode_mtab.patch similarity index 100% rename from pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch rename to pkgs/by-name/lc/lcdproc/hardcode_mtab.patch diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/by-name/lc/lcdproc/package.nix similarity index 100% rename from pkgs/servers/monitoring/lcdproc/default.nix rename to pkgs/by-name/lc/lcdproc/package.nix diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/by-name/lc/lci/package.nix similarity index 100% rename from pkgs/applications/science/logic/lci/default.nix rename to pkgs/by-name/lc/lci/package.nix diff --git a/pkgs/development/libraries/lcm/default.nix b/pkgs/by-name/lc/lcm/package.nix similarity index 100% rename from pkgs/development/libraries/lcm/default.nix rename to pkgs/by-name/lc/lcm/package.nix diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/pkgs/by-name/lc/lcms1/cve-2013-4276.patch similarity index 100% rename from pkgs/development/libraries/lcms/cve-2013-4276.patch rename to pkgs/by-name/lc/lcms1/cve-2013-4276.patch diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/by-name/lc/lcms1/package.nix similarity index 100% rename from pkgs/development/libraries/lcms/default.nix rename to pkgs/by-name/lc/lcms1/package.nix diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/by-name/lc/lcms2/package.nix similarity index 100% rename from pkgs/development/libraries/lcms2/default.nix rename to pkgs/by-name/lc/lcms2/package.nix diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/by-name/lc/lcov/package.nix similarity index 100% rename from pkgs/development/tools/analysis/lcov/default.nix rename to pkgs/by-name/lc/lcov/package.nix diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/by-name/lc/lcrq/package.nix similarity index 100% rename from pkgs/development/libraries/lcrq/default.nix rename to pkgs/by-name/lc/lcrq/package.nix diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/by-name/lc/lcsync/package.nix similarity index 100% rename from pkgs/applications/networking/sync/lcsync/default.nix rename to pkgs/by-name/lc/lcsync/package.nix diff --git a/pkgs/by-name/ld/ld64/meson.build b/pkgs/by-name/ld/ld64/meson.build index 0de64797c4aa..84468e6f9938 100644 --- a/pkgs/by-name/ld/ld64/meson.build +++ b/pkgs/by-name/ld/ld64/meson.build @@ -90,7 +90,6 @@ configure_h = custom_target( incdirs = include_directories( 'compat', - 'include', 'src/abstraction', 'src/ld', 'src/ld/code-sign-blobs', diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 1ca229150632..e921b0ec20a8 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -1,11 +1,13 @@ { lib, stdenv, + stdenvNoCC, fetchFromGitHub, fetchurl, + apple-sdk, + cctools, darwin, libtapi, - libunwind, llvm, meson, ninja, @@ -30,16 +32,53 @@ let hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk="; }; + dyld = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "dyld"; + rev = "dyld-1162"; + hash = "sha256-uyFg8QnnP6NWv5lAOTCiFZ0SnFOA/aO/kpjkyvILVsk="; + }; + + libdispatchPrivate = apple-sdk.sourceRelease "libdispatch"; + # 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="; }; + privateHeaders = stdenvNoCC.mkDerivation { + name = "ld64-deps-private-headers"; + + buildCommand = '' + mkdir -p "$out/include/System" + for dir in arm i386 machine; do + cp -r '${xnu}/osfmk/'$dir "$out/include/System/$dir" + done + + substitute '${crashreporter_h}' "$out/include/CrashReporterClient.h" \ + --replace-fail 'USE(APPLE_INTERNAL_SDK)' '0' + + cp -r '${libdispatchPrivate}/private' "$out/include/dispatch" + + install -D -t "$out/include/mach-o" \ + '${dyld}/include/mach-o/dyld_priv.h' \ + '${cctools.src}/include/mach-o/loader.h' + + install -D -t "$out/include/mach-o/arm" \ + '${cctools.src}/include/mach-o/arm/reloc.h' + + install -D -t "$out/include/sys" \ + '${xnu}/bsd/sys/commpage.h' + + substituteInPlace "$out/include/mach-o/dyld_priv.h" \ + --replace-fail ', bridgeos(3.0)' "" + ''; + }; + # Avoid pulling in all of Swift just to build libdispatch libdispatch = swiftPackages.Dispatch.override { useSwift = false; }; in @@ -63,8 +102,6 @@ stdenv.mkDerivation (finalAttrs: { 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) @@ -100,19 +137,6 @@ stdenv.mkDerivation (finalAttrs: { --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";' @@ -134,6 +158,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + env.NIX_CFLAGS_COMPILE = "-DTARGET_OS_BRIDGE=0 -I${privateHeaders}/include"; + nativeBuildInputs = [ meson ninja @@ -146,7 +172,6 @@ stdenv.mkDerivation (finalAttrs: { [ libtapi llvm - libunwind openssl xar ] @@ -173,6 +198,7 @@ stdenv.mkDerivation (finalAttrs: { cd "$NIX_BUILD_TOP/$sourceRoot" export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/${targetPrefix}ld" + export NIX_CFLAGS_LINK+=" -L$SDKROOT/usr/lib" meson setup build-install-check -Db_lto=true --buildtype=$mesonBuildType${ lib.optionalString (targetPrefix != "") " -Dtarget_prefix=${targetPrefix}" } @@ -201,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://opensource.apple.com/releases/"; license = lib.licenses.apple-psl20; mainProgram = "ld"; - maintainers = with lib.maintainers; [ reckenrode ]; + maintainers = lib.teams.darwin.members; platforms = lib.platforms.darwin; # Porting to other platforms is incomplete. Support only Darwin for now. }; }) diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/by-name/ld/ldacbt/package.nix similarity index 100% rename from pkgs/development/libraries/ldacbt/default.nix rename to pkgs/by-name/ld/ldacbt/package.nix diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/by-name/ld/ldapmonitor/package.nix similarity index 100% rename from pkgs/tools/security/ldapmonitor/default.nix rename to pkgs/by-name/ld/ldapmonitor/package.nix diff --git a/pkgs/by-name/ld/ldapnomnom/package.nix b/pkgs/by-name/ld/ldapnomnom/package.nix new file mode 100644 index 000000000000..1215e9e34191 --- /dev/null +++ b/pkgs/by-name/ld/ldapnomnom/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ldapnomnom"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "lkarlslund"; + repo = "ldapnomnom"; + rev = "refs/tags/v${version}"; + hash = "sha256-JYpwk7ShLH9fPTFYzLecD+iPekFMnHOlzusizCYo8dA="; + }; + + vendorHash = "sha256-lm801UM7JOYsGRe92FErY2jonrqRRjLKojN5YyytqvY="; + + ldflags = [ + "-w" + "-s" + ]; + + meta = with lib; { + description = "Tool to anonymously bruteforce usernames from Domain controllers"; + homepage = "https://github.com/lkarlslund/ldapnomnom"; + changelog = "https://github.com/lkarlslund/ldapnomnom/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "ldapnomnom"; + }; +} diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/by-name/ld/ldapvi/package.nix similarity index 100% rename from pkgs/tools/misc/ldapvi/default.nix rename to pkgs/by-name/ld/ldapvi/package.nix diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/by-name/ld/ldb/package.nix similarity index 100% rename from pkgs/development/libraries/ldb/default.nix rename to pkgs/by-name/ld/ldb/package.nix diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/by-name/ld/ldeep/package.nix similarity index 100% rename from pkgs/tools/security/ldeep/default.nix rename to pkgs/by-name/ld/ldeep/package.nix diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/by-name/ld/ldm/package.nix similarity index 100% rename from pkgs/os-specific/linux/ldm/default.nix rename to pkgs/by-name/ld/ldm/package.nix diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/by-name/ld/ldmtool/package.nix similarity index 100% rename from pkgs/tools/misc/ldmtool/default.nix rename to pkgs/by-name/ld/ldmtool/package.nix diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/by-name/ld/ldns/package.nix similarity index 100% rename from pkgs/development/libraries/ldns/default.nix rename to pkgs/by-name/ld/ldns/package.nix diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/by-name/ld/ldtk/package.nix similarity index 100% rename from pkgs/applications/editors/ldtk/default.nix rename to pkgs/by-name/ld/ldtk/package.nix diff --git a/pkgs/data/fonts/league-gothic/default.nix b/pkgs/by-name/le/league-gothic/package.nix similarity index 100% rename from pkgs/data/fonts/league-gothic/default.nix rename to pkgs/by-name/le/league-gothic/package.nix diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/by-name/le/league-of-moveable-type/package.nix similarity index 100% rename from pkgs/data/fonts/league-of-moveable-type/default.nix rename to pkgs/by-name/le/league-of-moveable-type/package.nix diff --git a/pkgs/data/fonts/league-script-number-one/default.nix b/pkgs/by-name/le/league-script-number-one/package.nix similarity index 100% rename from pkgs/data/fonts/league-script-number-one/default.nix rename to pkgs/by-name/le/league-script-number-one/package.nix diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/by-name/le/league-spartan/package.nix similarity index 100% rename from pkgs/data/fonts/league-spartan/default.nix rename to pkgs/by-name/le/league-spartan/package.nix diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/by-name/le/lean/package.nix similarity index 100% rename from pkgs/applications/science/logic/lean/default.nix rename to pkgs/by-name/le/lean/package.nix diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/by-name/le/lean2/package.nix similarity index 100% rename from pkgs/applications/science/logic/lean2/default.nix rename to pkgs/by-name/le/lean2/package.nix diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/by-name/le/lean4/package.nix similarity index 100% rename from pkgs/applications/science/logic/lean4/default.nix rename to pkgs/by-name/le/lean4/package.nix diff --git a/pkgs/tools/misc/leanify/default.nix b/pkgs/by-name/le/leanify/package.nix similarity index 100% rename from pkgs/tools/misc/leanify/default.nix rename to pkgs/by-name/le/leanify/package.nix diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/by-name/le/leaps/package.nix similarity index 100% rename from pkgs/development/tools/leaps/default.nix rename to pkgs/by-name/le/leaps/package.nix diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/by-name/le/leatherman/package.nix similarity index 100% rename from pkgs/development/libraries/leatherman/default.nix rename to pkgs/by-name/le/leatherman/package.nix diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/by-name/le/ledfx/package.nix similarity index 100% rename from pkgs/applications/audio/ledfx/default.nix rename to pkgs/by-name/le/ledfx/package.nix diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix similarity index 100% rename from pkgs/applications/blockchains/ledger-live-desktop/default.nix rename to pkgs/by-name/le/ledger-live-desktop/package.nix diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/by-name/le/ledger-udev-rules/package.nix similarity index 100% rename from pkgs/os-specific/linux/ledger-udev-rules/default.nix rename to pkgs/by-name/le/ledger-udev-rules/package.nix diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/by-name/le/ledger2beancount/package.nix similarity index 100% rename from pkgs/tools/text/ledger2beancount/default.nix rename to pkgs/by-name/le/ledger2beancount/package.nix diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/by-name/le/ledit/package.nix similarity index 100% rename from pkgs/tools/misc/ledit/default.nix rename to pkgs/by-name/le/ledit/package.nix diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/by-name/le/ledmon/package.nix similarity index 100% rename from pkgs/tools/system/ledmon/default.nix rename to pkgs/by-name/le/ledmon/package.nix diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/by-name/le/leela/package.nix similarity index 100% rename from pkgs/tools/graphics/leela/default.nix rename to pkgs/by-name/le/leela/package.nix diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/by-name/le/leetcode-cli/package.nix similarity index 100% rename from pkgs/applications/misc/leetcode-cli/default.nix rename to pkgs/by-name/le/leetcode-cli/package.nix diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index b4fcfd9aad0a..df8c7f291b5f 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-FlQYTNz1Fh0igwnufjVXN4bsUYBB1kls19D+/v7Ztps="; + hash = "sha256-0cBhJfxzzZ5IrVVYNWVoKK9c1baj5U2CvDO52wdsjcs="; }; - vendorHash = "sha256-DdAe9yyusA6Ac8ioKqLiM5lcOt9Xy7F77gMG6yBTl7Q="; + vendorHash = "sha256-1/U+sPauV3kYvQKTGSuX9FvvEFNsksTPXtfZH0a/o0s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/left4gore/default.nix b/pkgs/by-name/le/left4gore-bin/package.nix similarity index 100% rename from pkgs/games/left4gore/default.nix rename to pkgs/by-name/le/left4gore-bin/package.nix diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/by-name/le/leftwm/package.nix similarity index 100% rename from pkgs/applications/window-managers/leftwm/default.nix rename to pkgs/by-name/le/leftwm/package.nix diff --git a/pkgs/applications/window-managers/leftwm/update-time-crate.patch b/pkgs/by-name/le/leftwm/update-time-crate.patch similarity index 100% rename from pkgs/applications/window-managers/leftwm/update-time-crate.patch rename to pkgs/by-name/le/leftwm/update-time-crate.patch diff --git a/pkgs/applications/version-management/legit-web/default.nix b/pkgs/by-name/le/legit-web/package.nix similarity index 100% rename from pkgs/applications/version-management/legit-web/default.nix rename to pkgs/by-name/le/legit-web/package.nix diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/by-name/le/legit/package.nix similarity index 100% rename from pkgs/applications/version-management/legit/default.nix rename to pkgs/by-name/le/legit/package.nix diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/by-name/le/legitify/package.nix similarity index 100% rename from pkgs/development/tools/legitify/default.nix rename to pkgs/by-name/le/legitify/package.nix diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/by-name/le/lego/package.nix similarity index 100% rename from pkgs/tools/admin/lego/default.nix rename to pkgs/by-name/le/lego/package.nix diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/by-name/le/lektor/package.nix similarity index 100% rename from pkgs/tools/misc/lektor/default.nix rename to pkgs/by-name/le/lektor/package.nix diff --git a/pkgs/tools/misc/lemmeknow/default.nix b/pkgs/by-name/le/lemmeknow/package.nix similarity index 100% rename from pkgs/tools/misc/lemmeknow/default.nix rename to pkgs/by-name/le/lemmeknow/package.nix diff --git a/pkgs/tools/misc/lemmy-help/default.nix b/pkgs/by-name/le/lemmy-help/package.nix similarity index 100% rename from pkgs/tools/misc/lemmy-help/default.nix rename to pkgs/by-name/le/lemmy-help/package.nix diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/by-name/le/lemon-graph/package.nix similarity index 100% rename from pkgs/development/libraries/lemon-graph/default.nix rename to pkgs/by-name/le/lemon-graph/package.nix diff --git a/pkgs/development/libraries/lemon-graph/remove-register.patch b/pkgs/by-name/le/lemon-graph/remove-register.patch similarity index 100% rename from pkgs/development/libraries/lemon-graph/remove-register.patch rename to pkgs/by-name/le/lemon-graph/remove-register.patch diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/by-name/le/lemon/package.nix similarity index 100% rename from pkgs/development/tools/parsing/lemon/default.nix rename to pkgs/by-name/le/lemon/package.nix diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/by-name/le/lemonade/package.nix similarity index 100% rename from pkgs/applications/misc/lemonade/default.nix rename to pkgs/by-name/le/lemonade/package.nix diff --git a/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch b/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch new file mode 100644 index 000000000000..fd2e06e2080f --- /dev/null +++ b/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch @@ -0,0 +1,22 @@ +tree 18207ad257a4c0a9ffc4fd250360a91d0b5240cb +parent 37963b8ff6945ae8bdbabee658e5e36d0f67b84a +author Noa Aarts Tue Nov 5 13:49:49 2024 +0100 +committer Noa Aarts Tue Nov 5 13:49:49 2024 +0100 + +fix static lifetime for string + +This fixes a compiler error without changing functionality + +diff --git a/src/config.rs b/src/config.rs +index f4bca31..a4fc6bf 100644 +--- a/src/config.rs ++++ b/src/config.rs +@@ -645,7 +645,7 @@ struct Variable<'a> { + } + + impl<'a> Variable<'a> { +- const START_SYMBOL: &str = "$"; ++ const START_SYMBOL: &'static str = "$"; + + fn span(&self) -> std::ops::Range { + self.start..self.start + Self::START_SYMBOL.len() + self.ident.len() diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix new file mode 100644 index 000000000000..e2526f322509 --- /dev/null +++ b/pkgs/by-name/le/lemurs/package.nix @@ -0,0 +1,45 @@ +{ + fetchFromGitHub, + lib, + linux-pam, + rustPlatform, + testers, + lemurs, +}: +rustPlatform.buildRustPackage rec { + pname = "lemurs"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "coastalwhite"; + repo = "lemurs"; + rev = "v${version}"; + hash = "sha256-YDopY+wdWlVL2X+/wc1tLSSqFclAkt++JXMK3VodD4s="; + }; + + patches = [ + # part of https://github.com/coastalwhite/lemurs/commit/09003a830400250ec7745939399fc942c505e6c6, but including the rest of the commit may be breaking + ./0001-fix-static-lifetime-string.patch + ]; + + cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; + + buildInputs = [ + linux-pam + ]; + + passthru.tests.version = testers.testVersion { + package = lemurs; + }; + + meta = with lib; { + description = "Customizable TUI display/login manager written in Rust"; + homepage = "https://github.com/coastalwhite/lemurs"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ jeremiahs ]; + mainProgram = "lemurs"; + }; +} diff --git a/pkgs/servers/lenpaste/default.nix b/pkgs/by-name/le/lenpaste/package.nix similarity index 100% rename from pkgs/servers/lenpaste/default.nix rename to pkgs/by-name/le/lenpaste/package.nix diff --git a/pkgs/applications/networking/cluster/lens/darwin.nix b/pkgs/by-name/le/lens/darwin.nix similarity index 100% rename from pkgs/applications/networking/cluster/lens/darwin.nix rename to pkgs/by-name/le/lens/darwin.nix diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix similarity index 100% rename from pkgs/applications/networking/cluster/lens/linux.nix rename to pkgs/by-name/le/lens/linux.nix diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/by-name/le/lens/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/lens/default.nix rename to pkgs/by-name/le/lens/package.nix diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/by-name/le/lensfun/package.nix similarity index 100% rename from pkgs/development/libraries/lensfun/default.nix rename to pkgs/by-name/le/lensfun/package.nix diff --git a/pkgs/applications/science/electronics/lepton-eda/default.nix b/pkgs/by-name/le/lepton-eda/package.nix similarity index 100% rename from pkgs/applications/science/electronics/lepton-eda/default.nix rename to pkgs/by-name/le/lepton-eda/package.nix diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/by-name/le/lepton/package.nix similarity index 100% rename from pkgs/tools/graphics/lepton/default.nix rename to pkgs/by-name/le/lepton/package.nix diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/by-name/le/leptonica/package.nix similarity index 100% rename from pkgs/development/libraries/leptonica/default.nix rename to pkgs/by-name/le/leptonica/package.nix diff --git a/pkgs/development/tools/rust/leptosfmt/default.nix b/pkgs/by-name/le/leptosfmt/package.nix similarity index 100% rename from pkgs/development/tools/rust/leptosfmt/default.nix rename to pkgs/by-name/le/leptosfmt/package.nix diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/by-name/le/lerc/package.nix similarity index 100% rename from pkgs/development/libraries/lerc/default.nix rename to pkgs/by-name/le/lerc/package.nix diff --git a/pkgs/tools/misc/lerpn/default.nix b/pkgs/by-name/le/lerpn/package.nix similarity index 100% rename from pkgs/tools/misc/lerpn/default.nix rename to pkgs/by-name/le/lerpn/package.nix diff --git a/pkgs/applications/window-managers/lesbar/default.nix b/pkgs/by-name/le/lesbar/package.nix similarity index 100% rename from pkgs/applications/window-managers/lesbar/default.nix rename to pkgs/by-name/le/lesbar/package.nix diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/by-name/le/lesscpy/package.nix similarity index 100% rename from pkgs/development/compilers/lesscpy/default.nix rename to pkgs/by-name/le/lesscpy/package.nix diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/by-name/le/lesspass-cli/package.nix similarity index 100% rename from pkgs/tools/security/lesspass-cli/default.nix rename to pkgs/by-name/le/lesspass-cli/package.nix diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/by-name/le/lesspipe/package.nix similarity index 100% rename from pkgs/tools/misc/lesspipe/default.nix rename to pkgs/by-name/le/lesspipe/package.nix diff --git a/pkgs/development/libraries/lesstif/c-missing_xm_h.patch b/pkgs/by-name/le/lesstif/c-missing_xm_h.patch similarity index 100% rename from pkgs/development/libraries/lesstif/c-missing_xm_h.patch rename to pkgs/by-name/le/lesstif/c-missing_xm_h.patch diff --git a/pkgs/development/libraries/lesstif/c-render_table_crash.patch b/pkgs/by-name/le/lesstif/c-render_table_crash.patch similarity index 100% rename from pkgs/development/libraries/lesstif/c-render_table_crash.patch rename to pkgs/by-name/le/lesstif/c-render_table_crash.patch diff --git a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch b/pkgs/by-name/le/lesstif/c-xpmpipethrough.patch similarity index 100% rename from pkgs/development/libraries/lesstif/c-xpmpipethrough.patch rename to pkgs/by-name/le/lesstif/c-xpmpipethrough.patch diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/by-name/le/lesstif/package.nix similarity index 100% rename from pkgs/development/libraries/lesstif/default.nix rename to pkgs/by-name/le/lesstif/package.nix diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/by-name/le/levant/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/levant/default.nix rename to pkgs/by-name/le/levant/package.nix diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/by-name/le/level-zero/package.nix similarity index 100% rename from pkgs/development/libraries/level-zero/default.nix rename to pkgs/by-name/le/level-zero/package.nix diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/by-name/le/leveldb/package.nix similarity index 100% rename from pkgs/development/libraries/leveldb/default.nix rename to pkgs/by-name/le/leveldb/package.nix diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/by-name/le/levmar/package.nix similarity index 100% rename from pkgs/development/libraries/levmar/default.nix rename to pkgs/by-name/le/levmar/package.nix diff --git a/pkgs/data/fonts/lexend/default.nix b/pkgs/by-name/le/lexend/package.nix similarity index 100% rename from pkgs/data/fonts/lexend/default.nix rename to pkgs/by-name/le/lexend/package.nix diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/by-name/lf/lftp/package.nix similarity index 100% rename from pkgs/tools/networking/lftp/default.nix rename to pkgs/by-name/lf/lftp/package.nix diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/by-name/lg/lguf-brightness/package.nix similarity index 100% rename from pkgs/misc/lguf-brightness/default.nix rename to pkgs/by-name/lg/lguf-brightness/package.nix diff --git a/pkgs/tools/archivers/lha/default.nix b/pkgs/by-name/lh/lha/package.nix similarity index 100% rename from pkgs/tools/archivers/lha/default.nix rename to pkgs/by-name/lh/lha/package.nix diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/by-name/lh/lhasa/package.nix similarity index 100% rename from pkgs/tools/compression/lhasa/default.nix rename to pkgs/by-name/lh/lhasa/package.nix diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/by-name/li/lib3ds/package.nix similarity index 100% rename from pkgs/development/libraries/lib3ds/default.nix rename to pkgs/by-name/li/lib3ds/package.nix diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/by-name/li/lib3mf/package.nix similarity index 100% rename from pkgs/development/libraries/lib3mf/default.nix rename to pkgs/by-name/li/lib3mf/package.nix diff --git a/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch b/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch similarity index 100% rename from pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch rename to pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch diff --git a/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/pkgs/by-name/li/libGDSII/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/libGDSII/default.nix rename to pkgs/by-name/li/libGDSII/package.nix diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/by-name/li/libHX/package.nix similarity index 100% rename from pkgs/development/libraries/libHX/default.nix rename to pkgs/by-name/li/libHX/package.nix diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/by-name/li/libLAS/package.nix similarity index 100% rename from pkgs/development/libraries/libLAS/default.nix rename to pkgs/by-name/li/libLAS/package.nix diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/by-name/li/libaacs/package.nix similarity index 100% rename from pkgs/development/libraries/libaacs/default.nix rename to pkgs/by-name/li/libaacs/package.nix diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/by-name/li/libaal/package.nix similarity index 100% rename from pkgs/development/libraries/libaal/default.nix rename to pkgs/by-name/li/libaal/package.nix diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/by-name/li/libabigail/package.nix similarity index 100% rename from pkgs/development/libraries/libabigail/default.nix rename to pkgs/by-name/li/libabigail/package.nix diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/by-name/li/libabw/package.nix similarity index 100% rename from pkgs/development/libraries/libabw/default.nix rename to pkgs/by-name/li/libabw/package.nix diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/by-name/li/libaccounts-glib/package.nix similarity index 100% rename from pkgs/development/libraries/libaccounts-glib/default.nix rename to pkgs/by-name/li/libaccounts-glib/package.nix diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/by-name/li/libad9361/package.nix similarity index 100% rename from pkgs/development/libraries/libad9361/default.nix rename to pkgs/by-name/li/libad9361/package.nix diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/by-name/li/libaec/package.nix similarity index 100% rename from pkgs/development/libraries/libaec/default.nix rename to pkgs/by-name/li/libaec/package.nix diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/by-name/li/libaio/package.nix similarity index 100% rename from pkgs/os-specific/linux/libaio/default.nix rename to pkgs/by-name/li/libaio/package.nix diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/by-name/li/libajantv2/package.nix similarity index 100% rename from pkgs/development/libraries/libajantv2/default.nix rename to pkgs/by-name/li/libajantv2/package.nix diff --git a/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch b/pkgs/by-name/li/libamplsolver/libamplsolver-sharedlib.patch similarity index 100% rename from pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch rename to pkgs/by-name/li/libamplsolver/libamplsolver-sharedlib.patch diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix new file mode 100644 index 000000000000..bfaad6cbc767 --- /dev/null +++ b/pkgs/by-name/li/libamplsolver/package.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, substitute, fetchurl }: + +stdenv.mkDerivation rec { + pname = "libamplsolver"; + version = "20211109"; + + src = fetchurl { + url = "https://ampl.com/netlib/ampl/solvers.tgz"; + sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; + }; + + patches = [ + (substitute { + src = ./libamplsolver-sharedlib.patch; + substitutions = [ "--replace" "@sharedlibext@" "${stdenv.hostPlatform.extensions.sharedLibrary}" ]; + }) + ]; + + installPhase = '' + runHook preInstall + pushd sys.$(uname -m).$(uname -s) + install -D -m 0644 *.h -t $out/include + install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib + install -D -m 0644 *.a -t $out/lib + popd + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib + '' + '' + runHook postInstall + ''; + + meta = with lib; { + description = "Library of routines that help solvers work with AMPL"; + homepage = "https://ampl.com/netlib/ampl/"; + license = [ licenses.mit ]; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + # generates header at compile time + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + }; +} diff --git a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/pkgs/by-name/li/libamqpcpp/libamqpcpp-darwin.patch similarity index 100% rename from pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch rename to pkgs/by-name/li/libamqpcpp/libamqpcpp-darwin.patch diff --git a/pkgs/by-name/li/libamqpcpp/package.nix b/pkgs/by-name/li/libamqpcpp/package.nix new file mode 100644 index 000000000000..8905f2c4da3e --- /dev/null +++ b/pkgs/by-name/li/libamqpcpp/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "libamqpcpp"; + version = "4.3.27"; + + src = fetchFromGitHub { + owner = "CopernicaMarketingSoftware"; + repo = "AMQP-CPP"; + rev = "v${version}"; + sha256 = "sha256-iaOXdDIJOBXHyjE07CvU4ApTh71lmtMCyU46AV+MGXQ="; + }; + + buildInputs = [ openssl ]; + + patches = [ ./libamqpcpp-darwin.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Library for communicating with a RabbitMQ server"; + homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; + license = licenses.asl20; + maintainers = [ maintainers.mjp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/by-name/li/libantlr3c/package.nix similarity index 100% rename from pkgs/development/libraries/libantlr3c/default.nix rename to pkgs/by-name/li/libantlr3c/package.nix diff --git a/pkgs/development/libraries/libaom/outputs.patch b/pkgs/by-name/li/libaom/outputs.patch similarity index 100% rename from pkgs/development/libraries/libaom/outputs.patch rename to pkgs/by-name/li/libaom/outputs.patch diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/by-name/li/libaom/package.nix similarity index 100% rename from pkgs/development/libraries/libaom/default.nix rename to pkgs/by-name/li/libaom/package.nix diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/by-name/li/libaosd/package.nix similarity index 100% rename from pkgs/development/libraries/libaosd/default.nix rename to pkgs/by-name/li/libaosd/package.nix diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/by-name/li/libappindicator/package.nix similarity index 100% rename from pkgs/development/libraries/libappindicator/default.nix rename to pkgs/by-name/li/libappindicator/package.nix diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 793c27dae9d3..d8b11d227180 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -31,13 +31,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.7.4"; + version = "3.7.6"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-czNKXHoEn1x4deNErnqp/NZfCglF1CxNoLtZ8tcl394="; + hash = "sha256-smj8JV5irW/StUx/Zp62w5cnlKbF6GRIOSh8i4ocJ8s="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/by-name/li/libargon2/package.nix similarity index 100% rename from pkgs/development/libraries/libargon2/default.nix rename to pkgs/by-name/li/libargon2/package.nix diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/by-name/li/libargs/package.nix similarity index 100% rename from pkgs/development/libraries/libargs/default.nix rename to pkgs/by-name/li/libargs/package.nix diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/by-name/li/libasr/package.nix similarity index 100% rename from pkgs/development/libraries/libasr/default.nix rename to pkgs/by-name/li/libasr/package.nix diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/by-name/li/libass/package.nix similarity index 100% rename from pkgs/development/libraries/libass/default.nix rename to pkgs/by-name/li/libass/package.nix diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/by-name/li/libassuan/package.nix similarity index 100% rename from pkgs/development/libraries/libassuan/default.nix rename to pkgs/by-name/li/libassuan/package.nix diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/by-name/li/libasyncns/package.nix similarity index 100% rename from pkgs/development/libraries/libasyncns/default.nix rename to pkgs/by-name/li/libasyncns/package.nix diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/by-name/li/libatasmart/package.nix similarity index 100% rename from pkgs/os-specific/linux/libatasmart/default.nix rename to pkgs/by-name/li/libatasmart/package.nix diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/by-name/li/libatomic_ops/package.nix similarity index 100% rename from pkgs/development/libraries/libatomic_ops/default.nix rename to pkgs/by-name/li/libatomic_ops/package.nix diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/by-name/li/libaudclient/package.nix similarity index 100% rename from pkgs/development/libraries/libaudclient/default.nix rename to pkgs/by-name/li/libaudclient/package.nix diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/by-name/li/libaudec/package.nix similarity index 100% rename from pkgs/development/libraries/libaudec/default.nix rename to pkgs/by-name/li/libaudec/package.nix diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/by-name/li/libavc1394/package.nix similarity index 100% rename from pkgs/development/libraries/libavc1394/default.nix rename to pkgs/by-name/li/libavc1394/package.nix diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/by-name/li/libavif/package.nix similarity index 100% rename from pkgs/development/libraries/libavif/default.nix rename to pkgs/by-name/li/libavif/package.nix diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/by-name/li/libax25/package.nix similarity index 100% rename from pkgs/development/libraries/libax25/default.nix rename to pkgs/by-name/li/libax25/package.nix diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix similarity index 100% rename from pkgs/development/libraries/libayatana-appindicator/default.nix rename to pkgs/by-name/li/libayatana-appindicator/package.nix diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/by-name/li/libayatana-common/package.nix similarity index 100% rename from pkgs/development/libraries/libayatana-common/default.nix rename to pkgs/by-name/li/libayatana-common/package.nix diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/by-name/li/libb2/package.nix similarity index 100% rename from pkgs/development/libraries/libb2/default.nix rename to pkgs/by-name/li/libb2/package.nix diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/by-name/li/libb64/package.nix similarity index 100% rename from pkgs/development/libraries/libb64/default.nix rename to pkgs/by-name/li/libb64/package.nix diff --git a/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch similarity index 100% rename from pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch rename to pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch diff --git a/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch similarity index 100% rename from pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch rename to pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch diff --git a/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/pkgs/by-name/li/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch similarity index 100% rename from pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch rename to pkgs/by-name/li/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch diff --git a/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/pkgs/by-name/li/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch similarity index 100% rename from pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch rename to pkgs/by-name/li/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/by-name/li/libbacktrace/package.nix similarity index 100% rename from pkgs/development/libraries/libbacktrace/default.nix rename to pkgs/by-name/li/libbacktrace/package.nix diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/by-name/li/libbaseencode/package.nix similarity index 100% rename from pkgs/development/libraries/libbaseencode/default.nix rename to pkgs/by-name/li/libbaseencode/package.nix diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/by-name/li/libbdplus/package.nix similarity index 100% rename from pkgs/development/libraries/libbdplus/default.nix rename to pkgs/by-name/li/libbdplus/package.nix diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/by-name/li/libbladeRF/package.nix similarity index 100% rename from pkgs/development/libraries/libbladeRF/default.nix rename to pkgs/by-name/li/libbladeRF/package.nix diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix new file mode 100644 index 000000000000..6e0f9858f730 --- /dev/null +++ b/pkgs/by-name/li/libblockdev/package.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk-doc +, docbook_xml_dtd_43 +, python3 +, gobject-introspection +, glib +, udev +, kmod +, parted +, cryptsetup +, lvm2 +, util-linux +, libbytesize +, libndctl +, nss +, volume_key +, libxslt +, docbook_xsl +, gptfdisk +, libyaml +, autoconf-archive +, thin-provisioning-tools +, makeBinaryWrapper +, e2fsprogs +, libnvme +, keyutils +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libblockdev"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "libblockdev"; + rev = "${finalAttrs.version}-1"; + hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; + }; + + outputs = [ "out" "dev" "devdoc" "python" ]; + + postPatch = '' + patchShebangs scripts + substituteInPlace src/python/gi/overrides/Makefile.am \ + --replace-fail ''\'''${exec_prefix}' '@PYTHON_EXEC_PREFIX@' + ''; + + configureFlags = [ + "--with-python_prefix=${placeholder "python"}" + ]; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + gtk-doc + libxslt + makeBinaryWrapper + pkg-config + python3 + ]; + + buildInputs = [ + cryptsetup + e2fsprogs + glib + gptfdisk + keyutils + kmod + libbytesize + libndctl + libnvme + libyaml + lvm2 + nss + parted + udev + util-linux + volume_key + ]; + + postInstall = '' + wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \ + ${lib.makeBinPath [ thin-provisioning-tools ]} + ''; + + meta = { + changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; + description = "Library for manipulating block devices"; + homepage = "http://storaged.org/libblockdev/"; + license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils + maintainers = with lib.maintainers; [ johnazoidberg ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/by-name/li/libblocksruntime/package.nix similarity index 100% rename from pkgs/development/libraries/libblocksruntime/default.nix rename to pkgs/by-name/li/libblocksruntime/package.nix diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/by-name/li/libbpkg/package.nix similarity index 100% rename from pkgs/development/libraries/libbpkg/default.nix rename to pkgs/by-name/li/libbpkg/package.nix diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/by-name/li/libbraiding/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/libbraiding/default.nix rename to pkgs/by-name/li/libbraiding/package.nix diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/by-name/li/libbs2b/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libbs2b/default.nix rename to pkgs/by-name/li/libbs2b/package.nix diff --git a/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/pkgs/by-name/li/libbsd/darwin-enable-strtonum.patch similarity index 100% rename from pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch rename to pkgs/by-name/li/libbsd/darwin-enable-strtonum.patch diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/by-name/li/libbsd/package.nix similarity index 100% rename from pkgs/development/libraries/libbsd/default.nix rename to pkgs/by-name/li/libbsd/package.nix diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index bd395682cc14..5928f4c9a7ed 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -11,7 +11,7 @@ mpfr, pcre2, pkg-config, - python3, + python3Packages, stdenv, }: @@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc libxslt pkg-config - python3 + python3Packages.python + python3Packages.pythonImportsCheckHook ]; buildInputs = [ @@ -52,6 +53,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postInstall = '' + substituteInPlace $out/${python3Packages.python.sitePackages}/bytesize/bytesize.py \ + --replace-fail 'CDLL("libbytesize.so.1")' "CDLL('$out/lib/libbytesize.so.1')" + ''; + + pythonImportsCheck = [ "bytesize" ]; + meta = { homepage = "https://github.com/storaged-project/libbytesize"; description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/by-name/li/libcacard/package.nix similarity index 100% rename from pkgs/development/libraries/libcacard/default.nix rename to pkgs/by-name/li/libcacard/package.nix diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 9af2eda79e60..f576c74cc824 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.3.1"; + version = "0.3.2"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-vB7dxBDG0y8YvG/2vCgrhyBJmumGG66Vl7yZwprxj5c="; + hash = "sha256-rW1BG5blozQKA73P5vH5dGkwQG5JJzxdOU2GCB3xIns="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/by-name/li/libcangjie/package.nix similarity index 100% rename from pkgs/development/libraries/libcangjie/default.nix rename to pkgs/by-name/li/libcangjie/package.nix diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/by-name/li/libcap/package.nix similarity index 100% rename from pkgs/os-specific/linux/libcap/default.nix rename to pkgs/by-name/li/libcap/package.nix diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/by-name/li/libcap_ng/package.nix similarity index 100% rename from pkgs/os-specific/linux/libcap-ng/default.nix rename to pkgs/by-name/li/libcap_ng/package.nix diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/by-name/li/libcaption/package.nix similarity index 100% rename from pkgs/development/libraries/libcaption/default.nix rename to pkgs/by-name/li/libcaption/package.nix diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/by-name/li/libcardiacarrest/package.nix similarity index 100% rename from pkgs/misc/libcardiacarrest/default.nix rename to pkgs/by-name/li/libcardiacarrest/package.nix diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/by-name/li/libcbor/package.nix similarity index 100% rename from pkgs/development/libraries/libcbor/default.nix rename to pkgs/by-name/li/libcbor/package.nix diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/by-name/li/libccd/package.nix similarity index 100% rename from pkgs/development/libraries/libccd/default.nix rename to pkgs/by-name/li/libccd/package.nix diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/by-name/li/libcdada/package.nix similarity index 100% rename from pkgs/development/libraries/libcdada/default.nix rename to pkgs/by-name/li/libcdada/package.nix diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/by-name/li/libcdaudio/package.nix similarity index 100% rename from pkgs/development/libraries/libcdaudio/default.nix rename to pkgs/by-name/li/libcdaudio/package.nix diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/by-name/li/libcddb/package.nix similarity index 100% rename from pkgs/development/libraries/libcddb/default.nix rename to pkgs/by-name/li/libcddb/package.nix diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/by-name/li/libcello/package.nix similarity index 100% rename from pkgs/development/libraries/libcello/default.nix rename to pkgs/by-name/li/libcello/package.nix diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/by-name/li/libcerf/package.nix similarity index 100% rename from pkgs/development/libraries/libcerf/default.nix rename to pkgs/by-name/li/libcerf/package.nix diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/by-name/li/libcgroup/package.nix similarity index 100% rename from pkgs/os-specific/linux/libcgroup/default.nix rename to pkgs/by-name/li/libcgroup/package.nix diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/by-name/li/libchamplain/package.nix similarity index 100% rename from pkgs/development/libraries/libchamplain/default.nix rename to pkgs/by-name/li/libchamplain/package.nix diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/by-name/li/libchardet/package.nix similarity index 100% rename from pkgs/development/libraries/libchardet/default.nix rename to pkgs/by-name/li/libchardet/package.nix diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix new file mode 100644 index 000000000000..5fe2d1090e8a --- /dev/null +++ b/pkgs/by-name/li/libchewing/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + sqlite, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libchewing"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "chewing"; + repo = "libchewing"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-X+4Rr5Mfc4qeJxmHczu4MKgHBvQN1rhqUrJSx8SFnDk="; + }; + + buildInputs = [ sqlite ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Intelligent Chinese phonetic input method"; + homepage = "https://chewing.im/"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ + ericsagnes + ShamrockLee + ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch similarity index 100% rename from pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch rename to pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch diff --git a/pkgs/development/libraries/libchop/gets-undeclared.patch b/pkgs/by-name/li/libchop/gets-undeclared.patch similarity index 100% rename from pkgs/development/libraries/libchop/gets-undeclared.patch rename to pkgs/by-name/li/libchop/gets-undeclared.patch diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/by-name/li/libchop/package.nix similarity index 100% rename from pkgs/development/libraries/libchop/default.nix rename to pkgs/by-name/li/libchop/package.nix diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/by-name/li/libchop/size_t.patch similarity index 100% rename from pkgs/development/libraries/libchop/size_t.patch rename to pkgs/by-name/li/libchop/size_t.patch diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/by-name/li/libcifpp/package.nix similarity index 100% rename from pkgs/development/libraries/libcifpp/default.nix rename to pkgs/by-name/li/libcifpp/package.nix diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/by-name/li/libcint/package.nix similarity index 100% rename from pkgs/development/libraries/libcint/default.nix rename to pkgs/by-name/li/libcint/package.nix diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/by-name/li/libck/package.nix similarity index 100% rename from pkgs/development/libraries/libck/default.nix rename to pkgs/by-name/li/libck/package.nix diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/by-name/li/libcli/package.nix similarity index 100% rename from pkgs/development/libraries/libcli/default.nix rename to pkgs/by-name/li/libcli/package.nix diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/by-name/li/libcloudproviders/package.nix similarity index 100% rename from pkgs/development/libraries/libcloudproviders/default.nix rename to pkgs/by-name/li/libcloudproviders/package.nix diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/by-name/li/libclthreads/package.nix similarity index 100% rename from pkgs/development/libraries/libclthreads/default.nix rename to pkgs/by-name/li/libclthreads/package.nix diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/by-name/li/libclxclient/package.nix similarity index 100% rename from pkgs/development/libraries/libclxclient/default.nix rename to pkgs/by-name/li/libclxclient/package.nix diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/by-name/li/libcmis/package.nix similarity index 100% rename from pkgs/development/libraries/libcmis/default.nix rename to pkgs/by-name/li/libcmis/package.nix diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/by-name/li/libcollectdclient/package.nix similarity index 100% rename from pkgs/development/libraries/libcollectdclient/default.nix rename to pkgs/by-name/li/libcollectdclient/package.nix diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/by-name/li/libconfuse/package.nix similarity index 100% rename from pkgs/development/libraries/libconfuse/default.nix rename to pkgs/by-name/li/libconfuse/package.nix diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/by-name/li/libcork/package.nix similarity index 100% rename from pkgs/development/libraries/libcork/default.nix rename to pkgs/by-name/li/libcork/package.nix diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/by-name/li/libcotp/package.nix similarity index 100% rename from pkgs/development/libraries/libcotp/default.nix rename to pkgs/by-name/li/libcotp/package.nix diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/by-name/li/libcouchbase/package.nix similarity index 100% rename from pkgs/development/libraries/libcouchbase/default.nix rename to pkgs/by-name/li/libcouchbase/package.nix diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/by-name/li/libcrafter/package.nix similarity index 100% rename from pkgs/development/libraries/libcrafter/default.nix rename to pkgs/by-name/li/libcrafter/package.nix diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/by-name/li/libcredis/package.nix similarity index 100% rename from pkgs/development/libraries/libcredis/default.nix rename to pkgs/by-name/li/libcredis/package.nix diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/by-name/li/libcrossguid/package.nix similarity index 100% rename from pkgs/development/libraries/libcrossguid/default.nix rename to pkgs/by-name/li/libcrossguid/package.nix diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/by-name/li/libcs50/package.nix similarity index 100% rename from pkgs/development/libraries/libcs50/default.nix rename to pkgs/by-name/li/libcs50/package.nix diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/by-name/li/libcsptr/package.nix similarity index 100% rename from pkgs/development/libraries/libcsptr/default.nix rename to pkgs/by-name/li/libcsptr/package.nix diff --git a/pkgs/development/libraries/libctb/include-kbhit.patch b/pkgs/by-name/li/libctb/include-kbhit.patch similarity index 100% rename from pkgs/development/libraries/libctb/include-kbhit.patch rename to pkgs/by-name/li/libctb/include-kbhit.patch diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/by-name/li/libctb/package.nix similarity index 100% rename from pkgs/development/libraries/libctb/default.nix rename to pkgs/by-name/li/libctb/package.nix diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/by-name/li/libctemplate/package.nix similarity index 100% rename from pkgs/development/libraries/libctemplate/default.nix rename to pkgs/by-name/li/libctemplate/package.nix diff --git a/pkgs/development/libraries/libctl/default.nix b/pkgs/by-name/li/libctl/package.nix similarity index 100% rename from pkgs/development/libraries/libctl/default.nix rename to pkgs/by-name/li/libctl/package.nix diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/by-name/li/libcue/package.nix similarity index 100% rename from pkgs/development/libraries/libcue/default.nix rename to pkgs/by-name/li/libcue/package.nix diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/pkgs/by-name/li/libdaemon/fix-includes.patch similarity index 100% rename from pkgs/development/libraries/libdaemon/fix-includes.patch rename to pkgs/by-name/li/libdaemon/fix-includes.patch diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/by-name/li/libdaemon/package.nix similarity index 100% rename from pkgs/development/libraries/libdaemon/default.nix rename to pkgs/by-name/li/libdaemon/package.nix diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/by-name/li/libdatachannel/package.nix similarity index 100% rename from pkgs/development/libraries/libdatachannel/default.nix rename to pkgs/by-name/li/libdatachannel/package.nix diff --git a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/pkgs/by-name/li/libdatovka/libdatovka-deprecated-fn-curl.patch similarity index 100% rename from pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch rename to pkgs/by-name/li/libdatovka/libdatovka-deprecated-fn-curl.patch diff --git a/pkgs/by-name/li/libdatovka/package.nix b/pkgs/by-name/li/libdatovka/package.nix new file mode 100644 index 000000000000..9b0f4f2d59e8 --- /dev/null +++ b/pkgs/by-name/li/libdatovka/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, autoreconfHook +, pkg-config +, fetchurl +, expat +, gpgme +, libgcrypt +, libxml2 +, libxslt +, gnutls +, curl +, docbook_xsl +}: + +stdenv.mkDerivation rec { + pname = "libdatovka"; + version = "0.7.0"; + + src = fetchurl { + url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; + sha256 = "sha256-D/4+ldVnJrPAPrgrV1V4FfgCzgMbw/f/rxWT7Esf8Wk="; + }; + + patches = [ + ./libdatovka-deprecated-fn-curl.patch + ]; + + configureFlags = [ + "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook" + ]; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; + + meta = with lib; { + description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; + homepage = "https://gitlab.nic.cz/datovka/libdatovka"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.ovlach ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/by-name/li/libdatrie/package.nix similarity index 100% rename from pkgs/development/libraries/libdatrie/default.nix rename to pkgs/by-name/li/libdatrie/package.nix diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/by-name/li/libdazzle/package.nix similarity index 100% rename from pkgs/development/libraries/libdazzle/default.nix rename to pkgs/by-name/li/libdazzle/package.nix diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/by-name/li/libdbi/package.nix similarity index 100% rename from pkgs/development/libraries/libdbi/default.nix rename to pkgs/by-name/li/libdbi/package.nix diff --git a/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch similarity index 100% rename from pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch rename to pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/by-name/li/libdbiDrivers/package.nix similarity index 100% rename from pkgs/development/libraries/libdbi-drivers/default.nix rename to pkgs/by-name/li/libdbiDrivers/package.nix diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/by-name/li/libdbusmenu/package.nix similarity index 100% rename from pkgs/development/libraries/libdbusmenu/default.nix rename to pkgs/by-name/li/libdbusmenu/package.nix diff --git a/pkgs/development/libraries/libdbusmenu/requires-glib.patch b/pkgs/by-name/li/libdbusmenu/requires-glib.patch similarity index 100% rename from pkgs/development/libraries/libdbusmenu/requires-glib.patch rename to pkgs/by-name/li/libdbusmenu/requires-glib.patch diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/by-name/li/libde265/package.nix similarity index 100% rename from pkgs/development/libraries/libde265/default.nix rename to pkgs/by-name/li/libde265/package.nix diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/by-name/li/libde265/test-corpus-decode.nix similarity index 100% rename from pkgs/development/libraries/libde265/test-corpus-decode.nix rename to pkgs/by-name/li/libde265/test-corpus-decode.nix diff --git a/pkgs/development/libraries/libdecor/default.nix b/pkgs/by-name/li/libdecor/package.nix similarity index 100% rename from pkgs/development/libraries/libdecor/default.nix rename to pkgs/by-name/li/libdecor/package.nix diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix new file mode 100644 index 000000000000..e605ff3ea7bd --- /dev/null +++ b/pkgs/by-name/li/libdex/package.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, fetchurl +, gi-docgen +, gobject-introspection +, meson +, ninja +, pkg-config +, vala +, glib +, liburing +, gnome +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libdex"; + version = "0.8.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; + hash = "sha256-lVR1rT5Dqr1vb3BDUmS17ne9JlvZVUUhH+4CawjTeKA="; + }; + + nativeBuildInputs = [ + gi-docgen + gobject-introspection + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + glib + liburing + ]; + + mesonFlags = [ + "-Ddocs=true" + ]; + + doCheck = true; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru.updateScript = gnome.updateScript { + packageName = "libdex"; + versionPolicy = "odd-unstable"; + }; + + meta = with lib; { + description = "Library supporting deferred execution for GNOME and GTK"; + homepage = "https://gitlab.gnome.org/GNOME/libdex"; + maintainers = teams.gnome.members; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.lgpl21Plus; + }; +}) diff --git a/pkgs/development/libraries/libdicom/default.nix b/pkgs/by-name/li/libdicom/package.nix similarity index 100% rename from pkgs/development/libraries/libdicom/default.nix rename to pkgs/by-name/li/libdicom/package.nix diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/by-name/li/libdigidocpp/package.nix similarity index 100% rename from pkgs/development/libraries/libdigidocpp/default.nix rename to pkgs/by-name/li/libdigidocpp/package.nix diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/by-name/li/libdiscid/package.nix similarity index 100% rename from pkgs/development/libraries/libdiscid/default.nix rename to pkgs/by-name/li/libdiscid/package.nix diff --git a/pkgs/development/libraries/libdisplay-info/default.nix b/pkgs/by-name/li/libdisplay-info/package.nix similarity index 100% rename from pkgs/development/libraries/libdisplay-info/default.nix rename to pkgs/by-name/li/libdisplay-info/package.nix diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/by-name/li/libdivecomputer/package.nix similarity index 100% rename from pkgs/development/libraries/libdivecomputer/default.nix rename to pkgs/by-name/li/libdivecomputer/package.nix diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/by-name/li/libdivsufsort/package.nix similarity index 100% rename from pkgs/development/libraries/libdivsufsort/default.nix rename to pkgs/by-name/li/libdivsufsort/package.nix diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/by-name/li/libdmapsharing/package.nix similarity index 100% rename from pkgs/development/libraries/libdmapsharing/default.nix rename to pkgs/by-name/li/libdmapsharing/package.nix diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/by-name/li/libdmtx/package.nix similarity index 100% rename from pkgs/development/libraries/libdmtx/default.nix rename to pkgs/by-name/li/libdmtx/package.nix diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/by-name/li/libdnet/package.nix similarity index 100% rename from pkgs/development/libraries/libdnet/default.nix rename to pkgs/by-name/li/libdnet/package.nix diff --git a/pkgs/development/libraries/libdovi/Cargo.lock b/pkgs/by-name/li/libdovi/Cargo.lock similarity index 100% rename from pkgs/development/libraries/libdovi/Cargo.lock rename to pkgs/by-name/li/libdovi/Cargo.lock diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/by-name/li/libdovi/package.nix similarity index 100% rename from pkgs/development/libraries/libdovi/default.nix rename to pkgs/by-name/li/libdovi/package.nix diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/by-name/li/libdrm/package.nix similarity index 100% rename from pkgs/development/libraries/libdrm/default.nix rename to pkgs/by-name/li/libdrm/package.nix diff --git a/pkgs/by-name/li/libdsk/package.nix b/pkgs/by-name/li/libdsk/package.nix new file mode 100644 index 000000000000..74d875483890 --- /dev/null +++ b/pkgs/by-name/li/libdsk/package.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "libdsk"; + version = "1.5.20"; + + src = fetchurl { + url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; + sha256 = "sha256-/ivN4+Oe0N6VmhWTfdDU48NcQLSIVAAtqzzi6DdlAZ0="; + }; + + meta = with lib; { + description = "Library for accessing discs and disc image files"; + homepage = "http://www.seasip.info/Unix/LibDsk/"; + license = licenses.gpl2Plus; + maintainers = [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/by-name/li/libdv/package.nix similarity index 100% rename from pkgs/development/libraries/libdv/default.nix rename to pkgs/by-name/li/libdv/package.nix diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/by-name/li/libdvbcsa/package.nix similarity index 100% rename from pkgs/development/libraries/libdvbcsa/default.nix rename to pkgs/by-name/li/libdvbcsa/package.nix diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/by-name/li/libdvbpsi/package.nix similarity index 100% rename from pkgs/development/libraries/libdvbpsi/default.nix rename to pkgs/by-name/li/libdvbpsi/package.nix diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/by-name/li/libdwarf/common.nix similarity index 100% rename from pkgs/development/libraries/libdwarf/common.nix rename to pkgs/by-name/li/libdwarf/common.nix diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/by-name/li/libdwarf/package.nix similarity index 100% rename from pkgs/development/libraries/libdwarf/default.nix rename to pkgs/by-name/li/libdwarf/package.nix diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/by-name/li/libdwg/package.nix similarity index 100% rename from pkgs/development/libraries/libdwg/default.nix rename to pkgs/by-name/li/libdwg/package.nix diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/by-name/li/libdynd/package.nix similarity index 100% rename from pkgs/development/libraries/libdynd/default.nix rename to pkgs/by-name/li/libdynd/package.nix diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/by-name/li/libe-book/package.nix similarity index 100% rename from pkgs/development/libraries/libe-book/default.nix rename to pkgs/by-name/li/libe-book/package.nix diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/by-name/li/libe57format/package.nix similarity index 100% rename from pkgs/development/libraries/libe57format/default.nix rename to pkgs/by-name/li/libe57format/package.nix diff --git a/pkgs/development/libraries/libeatmydata/LFS64.patch b/pkgs/by-name/li/libeatmydata/LFS64.patch similarity index 100% rename from pkgs/development/libraries/libeatmydata/LFS64.patch rename to pkgs/by-name/li/libeatmydata/LFS64.patch diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/by-name/li/libeatmydata/package.nix similarity index 100% rename from pkgs/development/libraries/libeatmydata/default.nix rename to pkgs/by-name/li/libeatmydata/package.nix diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/by-name/li/libeb/package.nix similarity index 100% rename from pkgs/development/libraries/libeb/default.nix rename to pkgs/by-name/li/libeb/package.nix diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/by-name/li/libebml/package.nix similarity index 100% rename from pkgs/development/libraries/libebml/default.nix rename to pkgs/by-name/li/libebml/package.nix diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/by-name/li/libebur128/package.nix similarity index 100% rename from pkgs/development/libraries/libebur128/default.nix rename to pkgs/by-name/li/libebur128/package.nix diff --git a/pkgs/by-name/li/libedgetpu/package.nix b/pkgs/by-name/li/libedgetpu/package.nix new file mode 100644 index 000000000000..9ead9c5f60b3 --- /dev/null +++ b/pkgs/by-name/li/libedgetpu/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libusb1, + abseil-cpp, + flatbuffers, + fetchpatch, + xxd, +}: +let + # Tensorflow 2.16.1 requires Flatbuffers 23.5.26 + # Compile as a shared library + flatbuffers_23_5_26 = flatbuffers.overrideAttrs (oldAttrs: rec { + version = "23.5.26"; + cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ "-DFLATBUFFERS_BUILD_SHAREDLIB=ON" ]; + NIX_CXXSTDLIB_COMPILE = "-std=c++17"; + configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ "--enable-shared" ]; + src = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "v${version}"; + hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE="; + }; + }); +in +stdenv.mkDerivation { + pname = "libedgetpu"; + version = "0-unstable-2024-03-14"; + + src = fetchFromGitHub { + owner = "google-coral"; + repo = "libedgetpu"; + rev = "e35aed18fea2e2d25d98352e5a5bd357c170bd4d"; + hash = "sha256-SabiFG/EgspiCFpg8XQs6RjFhrPPUfhILPmYQQA1E2w="; + }; + + patches = [ + (fetchpatch { + name = "fix-makefile-to-compile-with-latest-tensorflow.patch"; + url = "https://patch-diff.githubusercontent.com/raw/google-coral/libedgetpu/pull/66.patch"; + hash = "sha256-mMODpQmikfXtsQvtgh26cy97EiykYNLngSjidOBt/3I="; + }) + ]; + + makeFlags = [ + "-f" + "makefile_build/Makefile" + "libedgetpu" + ]; + + buildInputs = [ + abseil-cpp + libusb1 + flatbuffers_23_5_26 + ]; + + nativeBuildInputs = [ xxd ]; + + NIX_CXXSTDLIB_COMPILE = "-std=c++17"; + + TFROOT = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v2.16.1"; + hash = "sha256-UPvK5Kc/FNVJq3FchN5IIBBObvcHtAPVv0ARzWzA35M="; + }; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -Dm555 out/direct/k8/libedgetpu.so.1.0 -t $out/lib + ln -s $out/lib/libedgetpu.so.1.0 $out/lib/libedgetpu.so.1 + install -Dm444 debian/edgetpu-accelerator.rules $out/lib/udev/rules.d/99-edgetpu-accelerator.rules + install -Dm444 tflite/public/*.h -t $out/include + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/google-coral/libedgetpu"; + description = "Userspace level runtime driver for Coral devices"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ frenetic00 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/by-name/li/libee/package.nix similarity index 100% rename from pkgs/development/libraries/libee/default.nix rename to pkgs/by-name/li/libee/package.nix diff --git a/pkgs/development/libraries/libei/default.nix b/pkgs/by-name/li/libei/package.nix similarity index 100% rename from pkgs/development/libraries/libei/default.nix rename to pkgs/by-name/li/libei/package.nix diff --git a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch b/pkgs/by-name/li/libelf/dont-hardcode-ar.patch similarity index 100% rename from pkgs/development/libraries/libelf/dont-hardcode-ar.patch rename to pkgs/by-name/li/libelf/dont-hardcode-ar.patch diff --git a/pkgs/development/libraries/libelf/fix-configure-main.patch b/pkgs/by-name/li/libelf/fix-configure-main.patch similarity index 100% rename from pkgs/development/libraries/libelf/fix-configure-main.patch rename to pkgs/by-name/li/libelf/fix-configure-main.patch diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/by-name/li/libelf/package.nix similarity index 100% rename from pkgs/development/libraries/libelf/default.nix rename to pkgs/by-name/li/libelf/package.nix diff --git a/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/pkgs/by-name/li/libelf/preprocessor-warnings.patch similarity index 100% rename from pkgs/development/libraries/libelf/preprocessor-warnings.patch rename to pkgs/by-name/li/libelf/preprocessor-warnings.patch diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/pkgs/by-name/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch similarity index 100% rename from pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch rename to pkgs/by-name/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/by-name/li/libelfin/package.nix similarity index 100% rename from pkgs/development/libraries/libelfin/default.nix rename to pkgs/by-name/li/libelfin/package.nix diff --git a/pkgs/development/libraries/libemf2svg/default.nix b/pkgs/by-name/li/libemf2svg/package.nix similarity index 100% rename from pkgs/development/libraries/libemf2svg/default.nix rename to pkgs/by-name/li/libemf2svg/package.nix diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/by-name/li/libepc/no-avahi-ui.patch similarity index 100% rename from pkgs/development/libraries/libepc/no-avahi-ui.patch rename to pkgs/by-name/li/libepc/no-avahi-ui.patch diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/by-name/li/libepc/package.nix similarity index 100% rename from pkgs/development/libraries/libepc/default.nix rename to pkgs/by-name/li/libepc/package.nix diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/by-name/li/liberal-crime-squad/package.nix similarity index 100% rename from pkgs/games/liberal-crime-squad/default.nix rename to pkgs/by-name/li/liberal-crime-squad/package.nix diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/by-name/li/liberastika/package.nix similarity index 100% rename from pkgs/data/fonts/liberastika/default.nix rename to pkgs/by-name/li/liberastika/package.nix diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/by-name/li/liberation-circuit/package.nix similarity index 100% rename from pkgs/games/liberation-circuit/default.nix rename to pkgs/by-name/li/liberation-circuit/package.nix diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix similarity index 100% rename from pkgs/data/fonts/liberation-sans-narrow/default.nix rename to pkgs/by-name/li/liberation-sans-narrow/package.nix diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/by-name/li/liberfa/package.nix similarity index 100% rename from pkgs/development/libraries/liberfa/default.nix rename to pkgs/by-name/li/liberfa/package.nix diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/by-name/li/liberio/package.nix similarity index 100% rename from pkgs/development/libraries/liberio/default.nix rename to pkgs/by-name/li/liberio/package.nix diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/by-name/li/libertine/package.nix similarity index 100% rename from pkgs/data/fonts/libertine/default.nix rename to pkgs/by-name/li/libertine/package.nix diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/by-name/li/libertinus/package.nix similarity index 100% rename from pkgs/data/fonts/libertinus/default.nix rename to pkgs/by-name/li/libertinus/package.nix diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/by-name/li/libesmtp/package.nix similarity index 100% rename from pkgs/development/libraries/libesmtp/default.nix rename to pkgs/by-name/li/libesmtp/package.nix diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/by-name/li/libestr/package.nix similarity index 100% rename from pkgs/development/libraries/libestr/default.nix rename to pkgs/by-name/li/libestr/package.nix diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/by-name/li/libetpan/package.nix similarity index 100% rename from pkgs/development/libraries/libetpan/default.nix rename to pkgs/by-name/li/libetpan/package.nix diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/by-name/li/libev/package.nix similarity index 100% rename from pkgs/development/libraries/libev/default.nix rename to pkgs/by-name/li/libev/package.nix diff --git a/pkgs/by-name/li/libevdev/package.nix b/pkgs/by-name/li/libevdev/package.nix new file mode 100644 index 000000000000..5138eeca4dda --- /dev/null +++ b/pkgs/by-name/li/libevdev/package.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, fetchurl, python3 }: + +stdenv.mkDerivation rec { + pname = "libevdev"; + version = "1.13.3"; + + src = fetchurl { + url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-q/GqzoYgjuvdXTVQ/97UyNc7tAW3ltUcOJydBgTLz78="; + }; + + nativeBuildInputs = [ python3 ]; + + meta = with lib; { + description = "Wrapper library for evdev devices"; + homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.amorsillo ]; + }; +} diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/by-name/li/libevdevc/package.nix similarity index 100% rename from pkgs/os-specific/linux/libevdevc/default.nix rename to pkgs/by-name/li/libevdevc/package.nix diff --git a/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch similarity index 100% rename from pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch rename to pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/by-name/li/libevdevplus/package.nix similarity index 100% rename from pkgs/development/libraries/libevdevplus/default.nix rename to pkgs/by-name/li/libevdevplus/package.nix diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/by-name/li/libevent/package.nix similarity index 100% rename from pkgs/development/libraries/libevent/default.nix rename to pkgs/by-name/li/libevent/package.nix diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/by-name/li/libewf/package.nix similarity index 100% rename from pkgs/development/libraries/libewf/default.nix rename to pkgs/by-name/li/libewf/package.nix diff --git a/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/pkgs/by-name/li/libexecinfo/30-linux-makefile.patch similarity index 100% rename from pkgs/development/libraries/libexecinfo/30-linux-makefile.patch rename to pkgs/by-name/li/libexecinfo/30-linux-makefile.patch diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/by-name/li/libexecinfo/package.nix similarity index 100% rename from pkgs/development/libraries/libexecinfo/default.nix rename to pkgs/by-name/li/libexecinfo/package.nix diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/by-name/li/libexif/package.nix similarity index 100% rename from pkgs/development/libraries/libexif/default.nix rename to pkgs/by-name/li/libexif/package.nix diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/by-name/li/libexosip/package.nix similarity index 100% rename from pkgs/development/libraries/exosip/default.nix rename to pkgs/by-name/li/libexosip/package.nix diff --git a/pkgs/development/libraries/libexsid/default.nix b/pkgs/by-name/li/libexsid/package.nix similarity index 100% rename from pkgs/development/libraries/libexsid/default.nix rename to pkgs/by-name/li/libexsid/package.nix diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/by-name/li/libexttextcat/package.nix similarity index 100% rename from pkgs/development/libraries/libexttextcat/default.nix rename to pkgs/by-name/li/libexttextcat/package.nix diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/by-name/li/libf2c/package.nix similarity index 100% rename from pkgs/development/libraries/libf2c/default.nix rename to pkgs/by-name/li/libf2c/package.nix diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/by-name/li/libfabric/package.nix similarity index 100% rename from pkgs/development/libraries/libfabric/default.nix rename to pkgs/by-name/li/libfabric/package.nix diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/by-name/li/libfakekey/package.nix similarity index 100% rename from pkgs/development/libraries/libfakekey/default.nix rename to pkgs/by-name/li/libfakekey/package.nix diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch similarity index 100% rename from pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch rename to pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/by-name/li/libfaketime/nix-store-date.patch similarity index 100% rename from pkgs/development/libraries/libfaketime/nix-store-date.patch rename to pkgs/by-name/li/libfaketime/nix-store-date.patch diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/by-name/li/libfaketime/package.nix similarity index 100% rename from pkgs/development/libraries/libfaketime/default.nix rename to pkgs/by-name/li/libfaketime/package.nix diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/by-name/li/libfann/package.nix similarity index 100% rename from pkgs/development/libraries/libfann/default.nix rename to pkgs/by-name/li/libfann/package.nix diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/by-name/li/libff/package.nix similarity index 100% rename from pkgs/development/libraries/libff/default.nix rename to pkgs/by-name/li/libff/package.nix diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/by-name/li/libffcall/package.nix similarity index 100% rename from pkgs/development/libraries/libffcall/default.nix rename to pkgs/by-name/li/libffcall/package.nix diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/by-name/li/libfido2/package.nix similarity index 100% rename from pkgs/development/libraries/libfido2/default.nix rename to pkgs/by-name/li/libfido2/package.nix diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/by-name/li/libfishsound/package.nix similarity index 100% rename from pkgs/development/libraries/libfishsound/default.nix rename to pkgs/by-name/li/libfishsound/package.nix diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/by-name/li/libfixposix/package.nix similarity index 100% rename from pkgs/development/libraries/libfixposix/default.nix rename to pkgs/by-name/li/libfixposix/package.nix diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/by-name/li/libfm/package.nix similarity index 100% rename from pkgs/development/libraries/libfm/default.nix rename to pkgs/by-name/li/libfm/package.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix b/pkgs/by-name/li/libfprint-2-tod1-elan/package.nix similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-elan/default.nix rename to pkgs/by-name/li/libfprint-2-tod1-elan/package.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix b/pkgs/by-name/li/libfprint-2-tod1-goodix-550a/package.nix similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix rename to pkgs/by-name/li/libfprint-2-tod1-goodix-550a/package.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/by-name/li/libfprint-2-tod1-goodix/package.nix similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix rename to pkgs/by-name/li/libfprint-2-tod1-goodix/package.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch rename to pkgs/by-name/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch rename to pkgs/by-name/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix rename to pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix diff --git a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix new file mode 100644 index 000000000000..41b7b3129ce3 --- /dev/null +++ b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix @@ -0,0 +1,104 @@ +{ + stdenv, + lib, + fetchurl, + rpm, + cpio, + glib, + gusb, + pixman, + libgudev, + nss, + libfprint, + cairo, + pkg-config, + autoPatchelfHook, + makePkgconfigItem, + copyPkgconfigItems, +}: + +# https://discourse.nixos.org/t/request-for-libfprint-port-for-2808-a658/55474 +let + # The provided `.so`'s name in the binary package we fetch and unpack + libso = "libfprint-2.so.2.0.0"; +in +stdenv.mkDerivation rec { + pname = "libfprint-focaltech-2808-a658"; + version = "1.94.4"; + # https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/413#note_2476573 + src = fetchurl { + url = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658/raw/b040ccd953c27e26c1285c456b4264e70b36bc3f/libfprint-2-2-${version}+tod1-FT9366_20240627.x86_64.rpm"; + hash = "sha256-MRWHwBievAfTfQqjs1WGKBnht9cIDj9aYiT3YJ0/CUM="; + }; + + nativeBuildInputs = [ + rpm + cpio + pkg-config + autoPatchelfHook + copyPkgconfigItems + ]; + + buildInputs = [ + stdenv.cc.cc + glib + gusb + pixman + nss + libgudev + libfprint + cairo + ]; + + unpackPhase = '' + runHook preUnpack + + rpm2cpio $src | cpio -idmv + + runHook postUnpack + ''; + + # custom pkg-config based on libfprint's pkg-config + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "libfprint-2"; + inherit version; + inherit (meta) description; + cflags = [ "-I${variables.includedir}/libfprint-2" ]; + libs = [ + "-L${variables.libdir}" + "-lfprint-2" + ]; + variables = rec { + prefix = "${placeholder "out"}"; + includedir = "${prefix}/include"; + libdir = "${prefix}/lib"; + }; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 usr/lib64/${libso} -t $out/lib + + # create this symlink as it was there in libfprint + ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so + ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so.2 + + # get files from libfprint required to build the package + cp -r ${libfprint}/lib/girepository-1.0 $out/lib + cp -r ${libfprint}/include $out + + runHook postInstall + ''; + + meta = { + description = "Focaltech Fingerprint driver for focaltech 0x2808:0xa658"; + homepage = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.imsick ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/by-name/li/libfprint-tod/package.nix similarity index 100% rename from pkgs/development/libraries/libfprint-tod/default.nix rename to pkgs/by-name/li/libfprint-tod/package.nix diff --git a/pkgs/by-name/li/libfprint/package.nix b/pkgs/by-name/li/libfprint/package.nix new file mode 100644 index 000000000000..7e0894f6b97b --- /dev/null +++ b/pkgs/by-name/li/libfprint/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + meson, + python3, + ninja, + gusb, + pixman, + glib, + nss, + gobject-introspection, + cairo, + libgudev, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libfprint"; + version = "1.94.8"; + outputs = [ + "out" + "devdoc" + ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "libfprint"; + rev = "v${finalAttrs.version}"; + hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE="; + }; + + postPatch = '' + patchShebangs \ + tests/test-runner.sh \ + tests/unittest_inspector.py \ + tests/virtual-image.py \ + tests/umockdev-test.py \ + tests/test-generated-hwdb.sh + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + gobject-introspection + ]; + + buildInputs = [ + gusb + pixman + glib + nss + cairo + libgudev + ]; + + mesonFlags = [ + "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" + # Include virtual drivers for fprintd tests + "-Ddrivers=all" + "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" + ]; + + nativeInstallCheckInputs = [ + (python3.withPackages (p: with p; [ pygobject3 ])) + ]; + + # We need to run tests _after_ install so all the paths that get loaded are in + # the right place. + doCheck = false; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + ninjaCheckPhase + + runHook postInstallCheck + ''; + + meta = { + homepage = "https://fprint.freedesktop.org/"; + description = "Library designed to make it easy to add support for consumer fingerprint readers"; + license = lib.licenses.lgpl21Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; + }; +}) diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/by-name/li/libfpx/package.nix similarity index 100% rename from pkgs/development/libraries/libfpx/default.nix rename to pkgs/by-name/li/libfpx/package.nix diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/by-name/li/libfreeaptx/package.nix similarity index 100% rename from pkgs/development/libraries/libfreeaptx/default.nix rename to pkgs/by-name/li/libfreeaptx/package.nix diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/by-name/li/libfsm/package.nix similarity index 100% rename from pkgs/development/libraries/libfsm/default.nix rename to pkgs/by-name/li/libfsm/package.nix diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/by-name/li/libfyaml/package.nix similarity index 100% rename from pkgs/development/libraries/libfyaml/default.nix rename to pkgs/by-name/li/libfyaml/package.nix diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/by-name/li/libgadu/package.nix similarity index 100% rename from pkgs/development/libraries/libgadu/default.nix rename to pkgs/by-name/li/libgadu/package.nix diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/by-name/li/libgaminggear/package.nix similarity index 100% rename from pkgs/development/libraries/libgaminggear/default.nix rename to pkgs/by-name/li/libgaminggear/package.nix diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix new file mode 100644 index 000000000000..aa65fd3ac0f3 --- /dev/null +++ b/pkgs/by-name/li/libgbinder/package.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, glib, libglibutil }: + +stdenv.mkDerivation rec { + pname = "libgbinder"; + version = "1.1.40"; + + src = fetchFromGitHub { + owner = "mer-hybris"; + repo = pname; + rev = version; + sha256 = "sha256-bv3UeL5xx28N/fSG1BeUSbbSvDaNgehpnx2OzIIaSXw="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + libglibutil + ]; + + postPatch = '' + # Fix pkg-config and ranlib names for cross-compilation + substituteInPlace Makefile \ + --replace "pkg-config" "$PKG_CONFIG" \ + --replace "ranlib" "$RANLIB" + ''; + + makeFlags = [ + "LIBDIR=$(out)/lib" + "INSTALL_INCLUDE_DIR=$(dev)/include/gbinder" + "INSTALL_PKGCONFIG_DIR=$(dev)/lib/pkgconfig" + ]; + + installTargets = [ "install" "install-dev" ]; + + postInstall = '' + sed -i -e "s@includedir=/usr@includedir=$dev@g" $dev/lib/pkgconfig/$pname.pc + sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags libglibutil) @g" $dev/lib/pkgconfig/$pname.pc + ''; + + meta = { + description = "GLib-style interface to binder"; + homepage = "https://github.com/mer-hybris/libgbinder"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/by-name/li/libgdamm/package.nix similarity index 100% rename from pkgs/development/libraries/libgdamm/default.nix rename to pkgs/by-name/li/libgdamm/package.nix diff --git a/pkgs/development/libraries/libgdata/installed-tests-path.patch b/pkgs/by-name/li/libgdata/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/libgdata/installed-tests-path.patch rename to pkgs/by-name/li/libgdata/installed-tests-path.patch diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/by-name/li/libgdata/package.nix similarity index 100% rename from pkgs/development/libraries/libgdata/default.nix rename to pkgs/by-name/li/libgdata/package.nix diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/by-name/li/libgee/package.nix similarity index 100% rename from pkgs/development/libraries/libgee/default.nix rename to pkgs/by-name/li/libgee/package.nix diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/by-name/li/libgen-cli/package.nix similarity index 100% rename from pkgs/tools/misc/libgen-cli/default.nix rename to pkgs/by-name/li/libgen-cli/package.nix diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/by-name/li/libgeotiff/package.nix similarity index 100% rename from pkgs/development/libraries/libgeotiff/default.nix rename to pkgs/by-name/li/libgeotiff/package.nix diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/by-name/li/libgepub/package.nix similarity index 100% rename from pkgs/development/libraries/libgepub/default.nix rename to pkgs/by-name/li/libgepub/package.nix diff --git a/pkgs/os-specific/linux/libgestures/include-fix.patch b/pkgs/by-name/li/libgestures/include-fix.patch similarity index 100% rename from pkgs/os-specific/linux/libgestures/include-fix.patch rename to pkgs/by-name/li/libgestures/include-fix.patch diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/by-name/li/libgestures/package.nix similarity index 100% rename from pkgs/os-specific/linux/libgestures/default.nix rename to pkgs/by-name/li/libgestures/package.nix diff --git a/pkgs/development/libraries/libgflow/default.nix b/pkgs/by-name/li/libgflow/package.nix similarity index 100% rename from pkgs/development/libraries/libgflow/default.nix rename to pkgs/by-name/li/libgflow/package.nix diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/by-name/li/libgig/package.nix similarity index 100% rename from pkgs/development/libraries/libgig/default.nix rename to pkgs/by-name/li/libgig/package.nix diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/by-name/li/libgit2-glib/package.nix similarity index 100% rename from pkgs/development/libraries/libgit2-glib/default.nix rename to pkgs/by-name/li/libgit2-glib/package.nix diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix new file mode 100644 index 000000000000..c70dbc649c04 --- /dev/null +++ b/pkgs/by-name/li/libglibutil/package.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, glib }: + +stdenv.mkDerivation rec { + pname = "libglibutil"; + version = "1.0.79"; + + src = fetchFromGitHub { + owner = "sailfishos"; + repo = pname; + rev = version; + sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + ]; + + postPatch = '' + # Fix pkg-config name for cross-compilation + substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" + ''; + + makeFlags = [ + "LIBDIR=$(out)/lib" + "INSTALL_INCLUDE_DIR=$(dev)/include/gutil" + "INSTALL_PKGCONFIG_DIR=$(dev)/lib/pkgconfig" + ]; + + installTargets = [ "install" "install-dev" ]; + + postInstall = '' + sed -i -e "s@includedir=/usr@includedir=$dev@g" $dev/lib/pkgconfig/$pname.pc + sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags glib-2.0) @g" $dev/lib/pkgconfig/$pname.pc + ''; + + meta = { + description = "Library of glib utilities"; + homepage = "https://git.sailfishos.org/mer-core/libglibutil"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/by-name/li/libglvnd/package.nix similarity index 100% rename from pkgs/development/libraries/libglvnd/default.nix rename to pkgs/by-name/li/libglvnd/package.nix diff --git a/pkgs/development/libraries/libgmpris/default.nix b/pkgs/by-name/li/libgmpris/package.nix similarity index 100% rename from pkgs/development/libraries/libgmpris/default.nix rename to pkgs/by-name/li/libgmpris/package.nix diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/by-name/li/libgnomekbd/package.nix similarity index 100% rename from pkgs/development/libraries/libgnomekbd/default.nix rename to pkgs/by-name/li/libgnomekbd/package.nix diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/by-name/li/libgnt/package.nix similarity index 100% rename from pkgs/development/libraries/libgnt/default.nix rename to pkgs/by-name/li/libgnt/package.nix diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/by-name/li/libgnurl/package.nix similarity index 100% rename from pkgs/development/libraries/libgnurl/default.nix rename to pkgs/by-name/li/libgnurl/package.nix diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/by-name/li/libgourou/package.nix similarity index 100% rename from pkgs/development/libraries/libgourou/default.nix rename to pkgs/by-name/li/libgourou/package.nix diff --git a/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/pkgs/by-name/li/libgovirt/auto-disable-incompatible-compiler-warnings.patch similarity index 100% rename from pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch rename to pkgs/by-name/li/libgovirt/auto-disable-incompatible-compiler-warnings.patch diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/by-name/li/libgovirt/package.nix similarity index 100% rename from pkgs/applications/virtualization/libgovirt/default.nix rename to pkgs/by-name/li/libgovirt/package.nix diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/by-name/li/libgpg-error/package.nix similarity index 100% rename from pkgs/development/libraries/libgpg-error/default.nix rename to pkgs/by-name/li/libgpg-error/package.nix diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/by-name/li/libgphoto2/package.nix similarity index 100% rename from pkgs/development/libraries/libgphoto2/default.nix rename to pkgs/by-name/li/libgphoto2/package.nix diff --git a/pkgs/by-name/li/libgpiod/package.nix b/pkgs/by-name/li/libgpiod/package.nix new file mode 100644 index 000000000000..e52a0f83ad3c --- /dev/null +++ b/pkgs/by-name/li/libgpiod/package.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config +, enable-tools ? true }: + +stdenv.mkDerivation rec { + pname = "libgpiod"; + version = "2.1.3"; + + src = fetchurl { + url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; + hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0="; + }; + + nativeBuildInputs = [ + autoconf-archive + pkg-config + autoreconfHook + ]; + + configureFlags = [ + "--enable-tools=${if enable-tools then "yes" else "no"}" + "--enable-bindings-cxx" + ]; + + meta = with lib; { + description = "C library and tools for interacting with the linux GPIO character device"; + longDescription = '' + Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use + the character device instead. This library encapsulates the ioctl calls and + data structures behind a straightforward API. + ''; + homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; + license = with licenses; [ + lgpl21Plus # libgpiod + lgpl3Plus # C++ bindings + ] ++ lib.optional enable-tools gpl2Plus; + maintainers = []; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index 337229c25db7..94644afff3fe 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; license = licenses.lgpl2; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/by-name/li/libgringotts/package.nix similarity index 100% rename from pkgs/development/libraries/libgringotts/default.nix rename to pkgs/by-name/li/libgringotts/package.nix diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/by-name/li/libgsf/package.nix similarity index 100% rename from pkgs/development/libraries/libgsf/default.nix rename to pkgs/by-name/li/libgsf/package.nix diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/by-name/li/libgssglue/package.nix similarity index 100% rename from pkgs/development/libraries/libgssglue/default.nix rename to pkgs/by-name/li/libgssglue/package.nix diff --git a/pkgs/development/libraries/libgtkflow3/default.nix b/pkgs/by-name/li/libgtkflow3/package.nix similarity index 100% rename from pkgs/development/libraries/libgtkflow3/default.nix rename to pkgs/by-name/li/libgtkflow3/package.nix diff --git a/pkgs/development/libraries/libgtkflow4/default.nix b/pkgs/by-name/li/libgtkflow4/package.nix similarity index 100% rename from pkgs/development/libraries/libgtkflow4/default.nix rename to pkgs/by-name/li/libgtkflow4/package.nix diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/by-name/li/libgtop/package.nix similarity index 100% rename from pkgs/development/libraries/libgtop/default.nix rename to pkgs/by-name/li/libgtop/package.nix diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/by-name/li/libgudev/package.nix similarity index 100% rename from pkgs/development/libraries/libgudev/default.nix rename to pkgs/by-name/li/libgudev/package.nix diff --git a/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch b/pkgs/by-name/li/libgudev/tests-skip-double-test-on-stub-locale-impls.patch similarity index 100% rename from pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch rename to pkgs/by-name/li/libgudev/tests-skip-double-test-on-stub-locale-impls.patch diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/by-name/li/libgumath/package.nix similarity index 100% rename from pkgs/development/libraries/libgumath/default.nix rename to pkgs/by-name/li/libgumath/package.nix diff --git a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/pkgs/by-name/li/libgweather/fix-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/libgweather/fix-pkgconfig.patch rename to pkgs/by-name/li/libgweather/fix-pkgconfig.patch diff --git a/pkgs/by-name/li/libgweather/package.nix b/pkgs/by-name/li/libgweather/package.nix new file mode 100644 index 000000000000..838ad727b739 --- /dev/null +++ b/pkgs/by-name/li/libgweather/package.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, libxml2 +, json-glib +, glib +, gettext +, libsoup_3 +, gi-docgen +, gobject-introspection +, python3 +, tzdata +, geocode-glib_2 +, vala +, gnome +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +}: + +stdenv.mkDerivation rec { + pname = "libgweather"; + version = "4.4.4"; + + outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-cBdnd1PN99H9w1Xkv82x66g2l5Oo3yTSQUJ6k5y/QoM="; + }; + + patches = [ + # Headers depend on glib but it is only listed in Requires.private, + # which does not influence Cflags on non-static builds in nixpkgs’s + # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly. + ./fix-pkgconfig.patch + ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + glib + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) + ] ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection + vala + ]; + + buildInputs = [ + glib + libsoup_3 + libxml2 + json-glib + geocode-glib_2 + ]; + + mesonFlags = [ + "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" + (lib.mesonBool "introspection" withIntrospection) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-Dc_args=-D_DARWIN_C_SOURCE" + ]; + + postPatch = '' + patchShebangs build-aux/meson/gen_locations_variant.py + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + substituteInPlace doc/meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + + # gir works for us even when cross-compiling + # TODO: send upstream because downstream users can use the option to disable gir if they don't have it working + substituteInPlace libgweather/meson.build \ + --replace "g_ir_scanner.found() and not meson.is_cross_build()" "g_ir_scanner.found()" + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + # Version 40.alpha preceded version 4.0. + freeze = "40.alpha"; + }; + }; + + meta = with lib; { + description = "Library to access weather information from online services for numerous locations"; + homepage = "https://gitlab.gnome.org/GNOME/libgweather"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/by-name/li/libgxps/package.nix similarity index 100% rename from pkgs/development/libraries/libgxps/default.nix rename to pkgs/by-name/li/libgxps/package.nix diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/by-name/li/libhangul/package.nix similarity index 100% rename from pkgs/development/libraries/libhangul/default.nix rename to pkgs/by-name/li/libhangul/package.nix diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/by-name/li/libharu/package.nix similarity index 100% rename from pkgs/development/libraries/libharu/default.nix rename to pkgs/by-name/li/libharu/package.nix diff --git a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/pkgs/by-name/li/libhdhomerun/nixos-darwin-no-fat-dylib.patch similarity index 100% rename from pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch rename to pkgs/by-name/li/libhdhomerun/nixos-darwin-no-fat-dylib.patch diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/by-name/li/libhdhomerun/package.nix similarity index 100% rename from pkgs/development/libraries/libhdhomerun/default.nix rename to pkgs/by-name/li/libhdhomerun/package.nix diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/by-name/li/libheif/package.nix similarity index 100% rename from pkgs/development/libraries/libheif/default.nix rename to pkgs/by-name/li/libheif/package.nix diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/by-name/li/libhomfly/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/libhomfly/default.nix rename to pkgs/by-name/li/libhomfly/package.nix diff --git a/pkgs/development/libraries/libhsts/default.nix b/pkgs/by-name/li/libhsts/package.nix similarity index 100% rename from pkgs/development/libraries/libhsts/default.nix rename to pkgs/by-name/li/libhsts/package.nix diff --git a/pkgs/development/libraries/libhsts/update.sh b/pkgs/by-name/li/libhsts/update.sh similarity index 100% rename from pkgs/development/libraries/libhsts/update.sh rename to pkgs/by-name/li/libhsts/update.sh diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix similarity index 100% rename from pkgs/development/libraries/libhttpseverywhere/default.nix rename to pkgs/by-name/li/libhttpseverywhere/package.nix diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/by-name/li/libhugetlbfs/package.nix similarity index 100% rename from pkgs/development/libraries/libhugetlbfs/default.nix rename to pkgs/by-name/li/libhugetlbfs/package.nix diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/by-name/li/libhwy/package.nix similarity index 100% rename from pkgs/development/libraries/libhwy/default.nix rename to pkgs/by-name/li/libhwy/package.nix diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/by-name/li/libiberty/package.nix similarity index 100% rename from pkgs/development/libraries/libiberty/default.nix rename to pkgs/by-name/li/libiberty/package.nix diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/by-name/li/libibmad/package.nix similarity index 100% rename from pkgs/development/libraries/libibmad/default.nix rename to pkgs/by-name/li/libibmad/package.nix diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/by-name/li/libibumad/package.nix similarity index 100% rename from pkgs/development/libraries/libibumad/default.nix rename to pkgs/by-name/li/libibumad/package.nix diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/by-name/li/libical/package.nix similarity index 100% rename from pkgs/development/libraries/libical/default.nix rename to pkgs/by-name/li/libical/package.nix diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/by-name/li/libical/respect-env-tzdir.patch similarity index 100% rename from pkgs/development/libraries/libical/respect-env-tzdir.patch rename to pkgs/by-name/li/libical/respect-env-tzdir.patch diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/by-name/li/libicns/package.nix similarity index 100% rename from pkgs/development/libraries/libicns/default.nix rename to pkgs/by-name/li/libicns/package.nix diff --git a/pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch b/pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch deleted file mode 100644 index 691b483b27ef..000000000000 --- a/pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a3e945c630180e9aa182603207238302e58fe8fe Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Sat, 25 May 2024 19:03:58 -0400 -Subject: [PATCH 1/2] Support static module loading - ---- - citrus/citrus_module.c | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/citrus/citrus_module.c b/citrus/citrus_module.c -index 5103d30..c22c9da 100644 ---- a/citrus/citrus_module.c -+++ b/citrus/citrus_module.c -@@ -324,22 +324,36 @@ out: - return (path[0] ? path : NULL); - } - -+#if defined(ENABLE_STATIC) -+#include "static-modules.h" -+#endif -+ - void * - _citrus_find_getops(_citrus_module_t handle, const char *modname, - const char *ifname) - { - char name[PATH_MAX]; - void *p; -- -+#if defined(ENABLE_STATIC) -+ const struct getops_pair* res = lookup_getops(modname, strlen(modname)); -+ p = res ? res->opsfn : NULL; -+#else - snprintf(name, sizeof(name), "_citrus_%s_%s_getops", - modname, ifname); - p = dlsym((void *)handle, name); -+#endif - return (p); - } - - int - _citrus_load_module(_citrus_module_t *rhandle, const char *encname) - { -+#if defined(ENABLE_STATIC) -+ if (is_known_encoding(encname, strnlen(encname, MAX_WORD_LENGTH)) > MAX_HASH_VALUE) { -+ return (EINVAL); -+ } -+ *rhandle = (_citrus_module_t)encodings; -+#else - const char *p; - char path[PATH_MAX]; - void *handle; -@@ -368,14 +382,15 @@ _citrus_load_module(_citrus_module_t *rhandle, const char *encname) - } - - *rhandle = (_citrus_module_t)handle; -- -+#endif - return (0); - } - - void - _citrus_unload_module(_citrus_module_t handle) - { -- -+#if !defined(ENABLE_STATIC) - if (handle) - dlclose((void *)handle); -+#endif - } --- -2.44.1 - diff --git a/pkgs/by-name/li/libiconv-darwin/meson.build b/pkgs/by-name/li/libiconv-darwin/meson.build deleted file mode 100644 index 9473cb891142..000000000000 --- a/pkgs/by-name/li/libiconv-darwin/meson.build +++ /dev/null @@ -1,347 +0,0 @@ -# Build settings based on the upstream Xcode project. -# See: https://github.com/apple-oss-distributions/libiconv/blob/main/libiconv.xcodeproj/project.pbxproj - -# Project settings -project('libiconv', 'c', version : '@version@') - -fs = import('fs') - - -# Dependencies -cc = meson.get_compiler('c') - - -# Definitions -prefix_libdir = get_option('prefix') / get_option('libdir') -prefix_datadir = get_option('prefix') / get_option('datadir') - -i18nmoduledir = prefix_libdir / 'i18n' -esdbdir = prefix_datadir / 'i18n/esdb' -csmapperdir = prefix_datadir / 'i18n/csmapper' - -is_static = get_option('default_library') == 'static' -static_suffix = is_static ? '_static' : '' - -# Generators -if is_static - gperf_bin = find_program('gperf', required : true) - gperf = generator( - gperf_bin, - arguments : ['@INPUT@', '--output-file=@OUTPUT@'], - output : '@BASENAME@.h' - ) -endif - - -# Libraries -libcharset = library( - 'charset', - darwin_versions : '1', - install : true, - include_directories : ['libcharset'], - sources : [ - 'libcharset/libcharset.c' - ], - soversion : '1' -) -install_headers( - 'libcharset/libcharset.h', - 'libcharset/localcharset.h' -) - -libiconv = library( - 'iconv' + static_suffix, - build_rpath : fs.parent(libcharset.full_path()), - c_args : [ - f'-D_PATH_I18NMODULE="@i18nmoduledir@"', - f'-D_PATH_ESDB="@esdbdir@"', - f'-D_PATH_CSMAPPER="@csmapperdir@"', - is_static ? '-DENABLE_STATIC=1' : [ ] - ], - darwin_versions : '7', - install : not is_static, - include_directories : ['citrus', 'libcharset'], - link_args : ['-Wl,-reexport_library', fs.name(libcharset.full_path())], - link_depends : [libcharset], - override_options : {'b_asneeded' : false}, # Make sure the libcharset reexport is not stripped - sources : [ - 'citrus/__iconv_get_list.c', - 'citrus/__iconv_free_list.c', - 'citrus/__iconv.c', - 'citrus/bsd_iconv.c', - 'citrus/citrus_bcs_strtol.c', - 'citrus/citrus_bcs_strtoul.c', - 'citrus/citrus_bcs.c', - 'citrus/citrus_csmapper.c', - 'citrus/citrus_db.c', - 'citrus/citrus_db_factory.c', - 'citrus/citrus_db_hash.c', - 'citrus/citrus_esdb.c', - 'citrus/citrus_hash.c', - 'citrus/citrus_iconv.c', - 'citrus/citrus_lookup_factory.c', - 'citrus/citrus_lookup.c', - 'citrus/citrus_mapper.c', - 'citrus/citrus_memstream.c', - 'citrus/citrus_mmap.c', - 'citrus/citrus_module.c', - 'citrus/citrus_none.c', - 'citrus/citrus_pivot_factory.c', - 'citrus/citrus_prop.c', - 'citrus/citrus_stdenc.c', - 'citrus/iconv_canonicalize.c', - 'citrus/iconv_close.c', - 'citrus/iconv_compat.c', - 'citrus/iconv_open_into.c', - 'citrus/iconv_open.c', - 'citrus/iconv_set_relocation_prefix.c', - 'citrus/iconvctl.c', - 'citrus/iconvlist.c', - 'citrus/iconv.c', - is_static ? gperf.process('static-modules.gperf') : [ ] - ], - soversion : '2' -) -install_headers( - 'citrus/iconv.h' -) -install_man( - 'citrus/__iconv_get_list.3', - 'citrus/iconv_canonicalize.3', - 'citrus/iconv.3', - 'citrus/iconvctl.3', - 'citrus/iconvlist.3', -) - - -# Data -## csmapper -csmapper_modules = [ - 'APPLE', - 'AST', - 'BIG5', - 'CNS', - 'CP', - 'EBCDIC', - 'GB', - 'GEORGIAN', - 'ISO-8859', - 'ISO646', - 'JIS', - 'KAZAKH', - 'KOI', - 'KS', - 'MISC', - 'TCVN' -] - -foreach module : csmapper_modules - mps_files = run_command( - 'find', 'i18n/csmapper' / module, '-regex', '.*\\.\\(mps\\|646\\)', - check : true - ).stdout().strip().split('\n') - install_data(mps_files, install_dir : csmapperdir / module) -endforeach - -install_data( - 'i18n/csmapper/charset.pivot', - 'i18n/csmapper/charset.pivot.pvdb', - 'i18n/csmapper/mapper.dir', - 'i18n/csmapper/mapper.dir.db', - install_dir : csmapperdir -) - -## esdb -esdb_modules = [ - 'APPLE', - 'AST', - 'BIG5', - 'CP', - 'DEC', - 'EBCDIC', - 'EUC', - 'GB', - 'GEORGIAN', - 'ISO-2022', - 'ISO-8859', - 'ISO646', - 'KAZAKH', - 'KOI', - 'MISC', - 'TCVN', - 'UTF' -] - -foreach module : esdb_modules - esdb_files = run_command( - 'find', 'i18n/esdb' / module, '-name', '*.esdb', - check : true - ).stdout().strip().split('\n') - install_data(esdb_files, install_dir : esdbdir / module) -endforeach - -install_data( - 'i18n/esdb/esdb.alias', - 'i18n/esdb/esdb.alias.db', - 'i18n/esdb/esdb.dir', - 'i18n/esdb/esdb.dir.db', - install_dir : esdbdir -) - - -# Modules -libiconv_modules = [ - 'BIG5', - 'DECHanyu', - 'DECKanji', - 'EUC', - 'EUCTW', - 'GBK2K', - 'HZ', - 'ISO2022', - 'JOHAB', - 'MSKanji', - 'UES', - 'UTF1632', - 'UTF7', - 'UTF8', - 'UTF8MAC', - 'VIQR', - 'ZW', - 'iconv_none', - 'iconv_std', - 'mapper_646', - 'mapper_none', - 'mapper_serial', - 'mapper_parallel', - 'mapper_std', - 'mapper_zone' -] - -modules = [ ] -foreach module : libiconv_modules - module_source = module.to_lower() - module_path = 'libiconv_modules' / module - - if module == 'UTF8MAC' - extra_headers = 'libiconv_modules/UTF8' - else - extra_headers = [ ] - endif - - # Upstream builds this module under both names. - # See: https://github.com/apple-oss-distributions/libiconv/blob/81be60a93521c931a01aab9c747dd2b078bc0679/libiconv.xcodeproj/project.pbxproj#L2549-L2556 - # See also: https://cgit.freebsd.org/src/tree/lib/libiconv_modules/mapper_parallel/Makefile?id=9241ebc796c11cf133c550f188f324bd2c12d89a - if module == 'mapper_parallel' - # Skip including mapper_parallel since it’s the same as mapper_serial, which would result in duplicate symbols. - if is_static - continue - endif - - module_source = 'mapper_serial' - module_path = 'libiconv_modules/mapper_serial' - endif - - modules += library( - module, - darwin_versions : '1', - install : not is_static, - install_dir : i18nmoduledir, - include_directories : [module_path, 'citrus', 'libcharset'] + extra_headers, - link_with : [libiconv], - override_options : {'b_asneeded' : false}, # Upstream always links libiconv - sources : [ - module_path / f'citrus_@module_source@.c' - ] - ) -endforeach - - -# Bundle the modules into libiconv.a -if is_static - objects = [libiconv.extract_all_objects(recursive : true)] - foreach module : modules - objects += module.extract_all_objects(recursive : true) - endforeach - - libiconv = static_library( - 'iconv', - install : true, - objects : objects - ) -endif - - -# Binaries -executable( - 'iconv', - install : true, - include_directories : ['citrus', 'libcharset'], - link_with : [ - libiconv, - # Darwin’s system `iconv` relies on the reexported symbols from libiconv - is_static ? libcharset : [ ] - ], - sources : [ - 'iconv/iconv.c' - ] -) -install_man('iconv/iconv.1') - - -# Tests -if get_option('tests') == true -## Only required for running the tests - atf = dependency('atf-c') - foreach suite : ['libiconv_test', 'mbopt_test', 'nixpkgs_test'] - test_src = f'tests/libiconv/@suite@.c' - test_exe = executable( - suite, - dependencies : [atf], - include_directories : ['citrus', 'libcharset'], - link_with : [ - libiconv, - # Make sure the libcharset reexport is working by relying on libiconv to provide its symbols. - is_static ? libcharset : [ ] - ], - sources : [test_src] - ) - - # Extract the tests to run from the test source code. - tests = run_command( - 'sed', '-n', '-E', 's|.*ATF_TP_ADD_TC\\([^,]*, ([^)]*).*$|\\1|p', test_src, - check : true - ).stdout().strip().split('\n') - - foreach test : tests - test(test, test_exe, args : [test], suite : suite, timeout : 300) - endforeach - endforeach - -# These tests depend on `os_variant_has_internal_content`, which is stubbed out. -# atf_sh = find_program('atf-sh') -# print_charset = executable( -# 'print_charset', -# include_directories : ['citrus', 'libcharset'], -# link_with : [libiconv], -# sources : 'tests/libcharset/print_charset.c' -# ) -# -# test_charset = custom_target( -# 'test_charset.sh', -# command : ['cp', '@INPUT@', '@OUTPUT@'], -# depends : print_charset, -# input : 'tests/libcharset/test_charset.sh', -# output : 'test_charset.sh' -# ) -# -# # Extract the tests to run from the test source code. -# tests = run_command( -# 'sed', '-n', '-E', 's|.*atf_add_test_case (.*$)|\\1|p', 'tests/libcharset/test_charset.sh', -# check : true -# ).stdout().strip().split('\n') -# -# foreach test : tests -# test(test, atf_sh, args : [test_charset, test], suite : 'libcharset', timeout : 300) -# endforeach -endif diff --git a/pkgs/by-name/li/libiconv-darwin/package.nix b/pkgs/by-name/li/libiconv-darwin/package.nix deleted file mode 100644 index e928cd999165..000000000000 --- a/pkgs/by-name/li/libiconv-darwin/package.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - atf, - gperf, - libiconvReal, - meson, - ninja, - pkg-config, - gitUpdater, -}: - -let - inherit (stdenv) hostPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "libiconv"; - version = "99"; - - outputs = [ - "out" - "dev" - ]; - - # Propagate `out` only when there are dylibs to link (i.e., don’t propagate when doing a static build). - propagatedBuildOutputs = lib.optionalString (!hostPlatform.isStatic) "out"; - - src = fetchFromGitHub { - owner = "apple-oss-distributions"; - repo = "libiconv"; - rev = "libiconv-${finalAttrs.version}"; - hash = "sha256-TGt6rsU52ztfW2rCqwnhMAExLbexI/59IoDOGY+XGu0="; - }; - - setupHooks = - libiconvReal.setupHooks - ++ lib.optionals hostPlatform.isStatic [ ./static-setup-hook.sh ]; - - patches = lib.optionals hostPlatform.isStatic [ ./0001-Support-static-module-loading.patch ] ++ [ - ./0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch - ]; - - postPatch = - '' - substitute ${./meson.build} meson.build --subst-var version - cp ${./meson.options} meson.options - - # Work around unnecessary private API usage in libcharset - mkdir -p libcharset/os && cat <<-header > libcharset/os/variant_private.h - #pragma once - #include - static inline bool os_variant_has_internal_content(const char*) { return false; } - header - - cp ${./nixpkgs_test.c} tests/libiconv/nixpkgs_test.c - '' - + lib.optionalString hostPlatform.isStatic '' - cp ${./static-modules.gperf} static-modules.gperf - ''; - - strictDeps = true; - - nativeBuildInputs = - [ - meson - ninja - ] - # Dynamic builds use `dlopen` to load modules, but static builds have to link them all. - # `gperf` is used to generate a lookup table from module to ops functions. - ++ lib.optionals hostPlatform.isStatic [ gperf ]; - - mesonBuildType = "release"; - - mesonFlags = [ (lib.mesonBool "tests" finalAttrs.doInstallCheck) ]; - - postInstall = - lib.optionalString (stdenv.hostPlatform.isDarwin && !hostPlatform.isStatic) '' - ${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \ - -change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib" - '' - # Move the static library to the `dev` output - + lib.optionalString hostPlatform.isStatic '' - moveToOutput lib "$dev" - ''; - - # Tests have to be run in `installCheckPhase` because libiconv expects to `dlopen` - # modules from `$out/lib/i18n`. - nativeInstallCheckInputs = [ pkg-config ]; - installCheckInputs = [ atf ]; - - doInstallCheck = stdenv.buildPlatform.canExecute hostPlatform; - - # Can’t use `mesonCheckPhase` because it runs the wrong hooks for `installCheckPhase`. - installCheckPhase = '' - runHook preInstallCheck - meson test --no-rebuild - runHook postInstallCheck - ''; - - passthru.updateScript = gitUpdater { rev-prefix = "libiconv-"; }; - - __structuredAttrs = true; - - meta = { - description = "Iconv(3) implementation"; - homepage = "https://opensource.apple.com/releases/"; - license = - with lib.licenses; - [ - bsd2 - bsd3 - ] - ++ lib.optional finalAttrs.doInstallCheck apsl10; - mainProgram = "iconv"; - maintainers = with lib.maintainers; [ reckenrode ]; - platforms = lib.platforms.darwin; - }; -}) diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch similarity index 100% rename from pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch rename to pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch diff --git a/pkgs/development/libraries/libid3tag/debian-patches.patch b/pkgs/by-name/li/libid3tag/debian-patches.patch similarity index 100% rename from pkgs/development/libraries/libid3tag/debian-patches.patch rename to pkgs/by-name/li/libid3tag/debian-patches.patch diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/by-name/li/libid3tag/id3tag.pc similarity index 100% rename from pkgs/development/libraries/libid3tag/id3tag.pc rename to pkgs/by-name/li/libid3tag/id3tag.pc diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/by-name/li/libid3tag/package.nix similarity index 100% rename from pkgs/development/libraries/libid3tag/default.nix rename to pkgs/by-name/li/libid3tag/package.nix diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/by-name/li/libidn/package.nix similarity index 100% rename from pkgs/development/libraries/libidn/default.nix rename to pkgs/by-name/li/libidn/package.nix diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/by-name/li/libiec61883/package.nix similarity index 100% rename from pkgs/development/libraries/libiec61883/default.nix rename to pkgs/by-name/li/libiec61883/package.nix diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/by-name/li/libieee1284/package.nix similarity index 100% rename from pkgs/development/libraries/libieee1284/default.nix rename to pkgs/by-name/li/libieee1284/package.nix diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock similarity index 100% rename from pkgs/development/libraries/libimagequant/Cargo.lock rename to pkgs/by-name/li/libimagequant/Cargo.lock diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/by-name/li/libimagequant/package.nix similarity index 100% rename from pkgs/development/libraries/libimagequant/default.nix rename to pkgs/by-name/li/libimagequant/package.nix diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/by-name/li/libime/package.nix similarity index 100% rename from pkgs/development/libraries/libime/default.nix rename to pkgs/by-name/li/libime/package.nix diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/by-name/li/libimobiledevice-glue/package.nix similarity index 100% rename from pkgs/development/libraries/libimobiledevice-glue/default.nix rename to pkgs/by-name/li/libimobiledevice-glue/package.nix diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/by-name/li/libindicator/package.nix similarity index 100% rename from pkgs/development/libraries/libindicator/default.nix rename to pkgs/by-name/li/libindicator/package.nix diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/by-name/li/libinfinity/package.nix similarity index 100% rename from pkgs/development/libraries/libinfinity/default.nix rename to pkgs/by-name/li/libinfinity/package.nix diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/by-name/li/libinjection/package.nix similarity index 100% rename from pkgs/development/libraries/libinjection/default.nix rename to pkgs/by-name/li/libinjection/package.nix diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/by-name/li/libinklevel/package.nix similarity index 100% rename from pkgs/development/libraries/libinklevel/default.nix rename to pkgs/by-name/li/libinklevel/package.nix diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/by-name/li/libinotify-kqueue/package.nix similarity index 100% rename from pkgs/development/libraries/libinotify-kqueue/default.nix rename to pkgs/by-name/li/libinotify-kqueue/package.nix diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/by-name/li/libinput-gestures/0001-hardcode-name.patch similarity index 100% rename from pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch rename to pkgs/by-name/li/libinput-gestures/0001-hardcode-name.patch diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/by-name/li/libinput-gestures/0002-paths.patch similarity index 100% rename from pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch rename to pkgs/by-name/li/libinput-gestures/0002-paths.patch diff --git a/pkgs/by-name/li/libinput-gestures/package.nix b/pkgs/by-name/li/libinput-gestures/package.nix new file mode 100644 index 000000000000..07489693e1d3 --- /dev/null +++ b/pkgs/by-name/li/libinput-gestures/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + libinput, + wmctrl, + python3, + coreutils, + xdotool ? null, + extraUtilsPath ? lib.optional (xdotool != null) xdotool, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libinput-gestures"; + version = "2.77"; + + src = fetchFromGitHub { + owner = "bulletmark"; + repo = "libinput-gestures"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-eMXNlSgQSuN+/5SXJQjsylC1ygHS87sIEmnVGFk3pzA="; + }; + patches = [ + ./0001-hardcode-name.patch + ./0002-paths.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + postPatch = '' + substituteInPlace libinput-gestures-setup --replace-fail /usr/ / + + substituteInPlace libinput-gestures \ + --replace-fail /etc "$out/etc" \ + --subst-var-by libinput "${libinput}/bin/libinput" \ + --subst-var-by wmctrl "${wmctrl}/bin/wmctrl" + ''; + installPhase = '' + runHook preInstall + ${stdenv.shell} libinput-gestures-setup -d "$out" install + runHook postInstall + ''; + postFixup = '' + rm "$out/bin/libinput-gestures-setup" + substituteInPlace "$out/share/systemd/user/libinput-gestures.service" --replace "/usr" "$out" + substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out" + chmod +x "$out/share/applications/libinput-gestures.desktop" + wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${ + lib.makeBinPath ([ coreutils ] ++ extraUtilsPath) + }" + ''; + + meta = { + homepage = "https://github.com/bulletmark/libinput-gestures"; + description = "Gesture mapper for libinput"; + mainProgram = "libinput-gestures"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ teozkr ]; + }; +}) diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/by-name/li/libinsane/package.nix similarity index 100% rename from pkgs/development/libraries/libinsane/default.nix rename to pkgs/by-name/li/libinsane/package.nix diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/by-name/li/libinstpatch/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libinstpatch/default.nix rename to pkgs/by-name/li/libinstpatch/package.nix diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/by-name/li/libipfix/package.nix similarity index 100% rename from pkgs/development/libraries/libipfix/default.nix rename to pkgs/by-name/li/libipfix/package.nix diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/by-name/li/libipt/package.nix similarity index 100% rename from pkgs/development/libraries/libipt/default.nix rename to pkgs/by-name/li/libipt/package.nix diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/by-name/li/libiptcdata/package.nix similarity index 100% rename from pkgs/development/libraries/libiptcdata/default.nix rename to pkgs/by-name/li/libiptcdata/package.nix diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/by-name/li/libircclient/package.nix similarity index 100% rename from pkgs/development/libraries/libircclient/default.nix rename to pkgs/by-name/li/libircclient/package.nix diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/by-name/li/libirecovery/package.nix similarity index 100% rename from pkgs/development/libraries/libirecovery/default.nix rename to pkgs/by-name/li/libirecovery/package.nix diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/by-name/li/libiscsi/package.nix similarity index 100% rename from pkgs/development/libraries/libiscsi/default.nix rename to pkgs/by-name/li/libiscsi/package.nix diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/by-name/li/libisds/package.nix similarity index 100% rename from pkgs/development/libraries/libisds/default.nix rename to pkgs/by-name/li/libisds/package.nix diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/by-name/li/libite/package.nix similarity index 100% rename from pkgs/development/libraries/libite/default.nix rename to pkgs/by-name/li/libite/package.nix diff --git a/pkgs/by-name/li/libivykis/package.nix b/pkgs/by-name/li/libivykis/package.nix new file mode 100644 index 000000000000..aebc93f7e224 --- /dev/null +++ b/pkgs/by-name/li/libivykis/package.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: + +stdenv.mkDerivation rec { + pname = "libivykis"; + + version = "0.43.2"; + + src = fetchurl { + url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; + sha256 = "sha256-k+PpsjdpVDfNY9SqSKjZ39izm8KKGSpXcNETxP6Qme8="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ file protobufc ]; + + meta = with lib; { + homepage = "https://libivykis.sourceforge.net/"; + description = '' + A thin wrapper over various OS'es implementation of I/O readiness + notification facilities + ''; + license = licenses.zlib; + maintainers = [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libixp/default.nix b/pkgs/by-name/li/libixp/package.nix similarity index 100% rename from pkgs/development/libraries/libixp/default.nix rename to pkgs/by-name/li/libixp/package.nix diff --git a/pkgs/development/libraries/libjcat/installed-tests-path.patch b/pkgs/by-name/li/libjcat/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/libjcat/installed-tests-path.patch rename to pkgs/by-name/li/libjcat/installed-tests-path.patch diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/by-name/li/libjcat/package.nix similarity index 100% rename from pkgs/development/libraries/libjcat/default.nix rename to pkgs/by-name/li/libjcat/package.nix diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/by-name/li/libjpeg_original/package.nix similarity index 100% rename from pkgs/development/libraries/libjpeg/default.nix rename to pkgs/by-name/li/libjpeg_original/package.nix diff --git a/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/by-name/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch rename to pkgs/by-name/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch b/pkgs/by-name/li/libjpeg_turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch rename to pkgs/by-name/li/libjpeg_turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/by-name/li/libjpeg_turbo/mingw-boolean.patch similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch rename to pkgs/by-name/li/libjpeg_turbo/mingw-boolean.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/default.nix rename to pkgs/by-name/li/libjpeg_turbo/package.nix diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/libjson-rpc-cpp/default.nix rename to pkgs/by-name/li/libjson-rpc-cpp/package.nix diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/by-name/li/libjson/install-fix.patch similarity index 100% rename from pkgs/development/libraries/libjson/install-fix.patch rename to pkgs/by-name/li/libjson/install-fix.patch diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/by-name/li/libjson/package.nix similarity index 100% rename from pkgs/development/libraries/libjson/default.nix rename to pkgs/by-name/li/libjson/package.nix diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/by-name/li/libjwt/package.nix similarity index 100% rename from pkgs/development/libraries/libjwt/default.nix rename to pkgs/by-name/li/libjwt/package.nix diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix new file mode 100644 index 000000000000..2bd30ddda8e2 --- /dev/null +++ b/pkgs/by-name/li/libjxl/package.nix @@ -0,0 +1,155 @@ +{ stdenv, lib, fetchFromGitHub +, brotli +, cmake +, giflib +, gperftools +, gtest +, libhwy +, libjpeg +, libpng +, libwebp +, gdk-pixbuf +, openexr_3 +, pkg-config +, makeWrapper +, zlib +, asciidoc +, graphviz +, doxygen +, python3 +, lcms2 +, enablePlugins ? true +}: + +let + loadersPath = "${gdk-pixbuf.binaryDir}/jxl-loaders.cache"; +in + +stdenv.mkDerivation rec { + pname = "libjxl"; + version = "0.11.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "libjxl"; + repo = "libjxl"; + rev = "v${version}"; + hash = "sha256-lBc0zP+f44YadwOU9+I+YYWzTrAg7FSfF3IQuh4LjM4="; + # There are various submodules in `third_party/`. + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + gdk-pixbuf + makeWrapper + asciidoc + doxygen + python3 + ]; + + depsBuildBuild = [ + graphviz + ]; + + # Functionality not currently provided by this package + # that the cmake build can apparently use: + # OpenGL/GLUT (for Examples -> comparison with sjpeg) + # viewer (see `cmakeFlags`) + # plugins like for GDK and GIMP (see `cmakeFlags`) + + # Vendored libraries: + # `libjxl` currently vendors many libraries as git submodules that they + # might patch often (e.g. test/gmock, see + # https://github.com/NixOS/nixpkgs/pull/103160#discussion_r519487734). + # When it has stabilised in the future, we may want to tell the build + # to use use nixpkgs system libraries. + + # As of writing, libjxl does not point out all its dependencies + # conclusively in its README or otherwise; they can best be determined + # by checking the CMake output for "Could NOT find". + buildInputs = [ + lcms2 + giflib + gperftools # provides `libtcmalloc` + gtest + libjpeg + libpng + libwebp + gdk-pixbuf + openexr_3 + zlib + ]; + + propagatedBuildInputs = [ + brotli + libhwy + ]; + + cmakeFlags = [ + # For C dependencies like brotli, which are dynamically linked, + # we want to use the system libraries, so that we don't have to care about + # installing their .so files generated by this build. + # The other C++ dependencies are statically linked in, so there + # using the vendorered ones is easier. + "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON" + + # Use our version of highway, though it is still statically linked in + "-DJPEGXL_FORCE_SYSTEM_HWY=ON" + + # Use our version of gtest + "-DJPEGXL_FORCE_SYSTEM_GTEST=ON" + + # TODO: Update this package to enable this (overridably via an option): + # Viewer tools for evaluation. + # "-DJPEGXL_ENABLE_VIEWERS=ON" + ] ++ lib.optionals enablePlugins [ + # Enable plugins, such as: + # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files + # * the `gimp` one, which allows GIMP to load jpeg-xl files + "-DJPEGXL_ENABLE_PLUGINS=ON" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-DJPEGXL_STATIC=ON" + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ + "-DJPEGXL_FORCE_NEON=ON" + ]; + + # the second substitution fix regex for a2x script + # https://github.com/libjxl/libjxl/pull/3842 + postPatch = '' + substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \ + --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" + substituteInPlace CMakeLists.txt \ + --replace 'sh$' 'sh( -e$|$)' + ''; + + postInstall = lib.optionalString enablePlugins '' + GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \ + GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ + gdk-pixbuf-query-loaders --update-cache + '' + # Cross-compiled gdk-pixbuf doesn't support thumbnailers + + lib.optionalString (enablePlugins && stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p "$out/bin" + makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \ + --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}" + ''; + + CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee"; + + # FIXME x86_64-darwin: + # https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690 + doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64); + + meta = with lib; { + homepage = "https://github.com/libjxl/libjxl"; + description = "JPEG XL image format reference implementation"; + license = licenses.bsd3; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/by-name/li/libkate/package.nix similarity index 100% rename from pkgs/development/libraries/libkate/default.nix rename to pkgs/by-name/li/libkate/package.nix diff --git a/pkgs/development/libraries/libkcapi/default.nix b/pkgs/by-name/li/libkcapi/package.nix similarity index 100% rename from pkgs/development/libraries/libkcapi/default.nix rename to pkgs/by-name/li/libkcapi/package.nix diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/by-name/li/libkeyfinder/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libkeyfinder/default.nix rename to pkgs/by-name/li/libkeyfinder/package.nix diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/by-name/li/libkkc-data/package.nix similarity index 100% rename from pkgs/data/misc/libkkc-data/default.nix rename to pkgs/by-name/li/libkkc-data/package.nix diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/by-name/li/libkkc/package.nix similarity index 100% rename from pkgs/tools/inputmethods/libkkc/default.nix rename to pkgs/by-name/li/libkkc/package.nix diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/by-name/li/libkqueue/package.nix similarity index 100% rename from pkgs/development/libraries/libkqueue/default.nix rename to pkgs/by-name/li/libkqueue/package.nix diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix new file mode 100644 index 000000000000..0da33d028e1c --- /dev/null +++ b/pkgs/by-name/li/libkrun/package.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cargo +, pkg-config +, glibc +, openssl +, libepoxy +, libdrm +, pipewire +, virglrenderer +, libkrunfw +, llvmPackages +, rustc +, withGpu ? false +, withSound ? false +, withNet ? false +, sevVariant ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libkrun"; + version = "1.9.5"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "libkrun"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fVL49g71eyfYyeXI4B1qRNM90fBKjHeq0I4poz1pdME="; + }; + + outputs = [ "out" "dev" ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + hash = "sha256-MW4/iB2NsCj0s9Q/h/PoCIIaDfZ/iqw+FGrsJmVR0lw="; + }; + + nativeBuildInputs = [ + llvmPackages.clang + rustPlatform.cargoSetupHook + cargo + rustc + ] ++ lib.optional (sevVariant || withGpu) pkg-config; + + buildInputs = [ + (libkrunfw.override { inherit sevVariant; }) + glibc + glibc.static + ] ++ lib.optionals withGpu [ libepoxy libdrm virglrenderer ] + ++ lib.optional withSound pipewire + ++ lib.optional sevVariant openssl; + + env.LIBCLANG_PATH = "${lib.getLib llvmPackages.clang-unwrapped}/lib/libclang.so"; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ] ++ lib.optional withGpu "GPU=1" + ++ lib.optional withSound "SND=1" + ++ lib.optional withNet "NET=1" + ++ lib.optional sevVariant "SEV=1"; + + postInstall = '' + mkdir -p $dev/lib/pkgconfig + mv $out/lib64/pkgconfig $dev/lib/pkgconfig + mv $out/include $dev/include + ''; + + meta = with lib; { + description = "Dynamic library providing Virtualization-based process isolation capabilities"; + homepage = "https://github.com/containers/libkrun"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao RossComputerGuy ]; + platforms = libkrunfw.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/by-name/li/libkrunfw/package.nix similarity index 100% rename from pkgs/development/libraries/libkrunfw/default.nix rename to pkgs/by-name/li/libkrunfw/package.nix diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/by-name/li/libks/package.nix similarity index 100% rename from pkgs/development/libraries/libks/default.nix rename to pkgs/by-name/li/libks/package.nix diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/by-name/li/libksba/package.nix similarity index 100% rename from pkgs/development/libraries/libksba/default.nix rename to pkgs/by-name/li/libksba/package.nix diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/by-name/li/libksi/package.nix similarity index 100% rename from pkgs/development/libraries/libksi/default.nix rename to pkgs/by-name/li/libksi/package.nix diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/by-name/li/liblangtag/package.nix similarity index 100% rename from pkgs/development/libraries/liblangtag/default.nix rename to pkgs/by-name/li/liblangtag/package.nix diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/by-name/li/liblastfmSF/package.nix similarity index 100% rename from pkgs/development/libraries/liblastfmSF/default.nix rename to pkgs/by-name/li/liblastfmSF/package.nix diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/by-name/li/liblaxjson/package.nix similarity index 100% rename from pkgs/development/libraries/liblaxjson/default.nix rename to pkgs/by-name/li/liblaxjson/package.nix diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/by-name/li/liblbfgs/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/liblbfgs/default.nix rename to pkgs/by-name/li/liblbfgs/package.nix diff --git a/pkgs/development/libraries/liblc3/default.nix b/pkgs/by-name/li/liblc3/package.nix similarity index 100% rename from pkgs/development/libraries/liblc3/default.nix rename to pkgs/by-name/li/liblc3/package.nix diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/by-name/li/liblcf/package.nix similarity index 100% rename from pkgs/development/libraries/liblcf/default.nix rename to pkgs/by-name/li/liblcf/package.nix diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/by-name/li/liblinear/package.nix similarity index 100% rename from pkgs/development/libraries/liblinear/default.nix rename to pkgs/by-name/li/liblinear/package.nix diff --git a/pkgs/development/libraries/liblinphone/backport-cpp17.patch b/pkgs/by-name/li/liblinphone/backport-cpp17.patch similarity index 100% rename from pkgs/development/libraries/liblinphone/backport-cpp17.patch rename to pkgs/by-name/li/liblinphone/backport-cpp17.patch diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/by-name/li/liblinphone/package.nix similarity index 100% rename from pkgs/development/libraries/liblinphone/default.nix rename to pkgs/by-name/li/liblinphone/package.nix diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/by-name/li/liblo/package.nix similarity index 100% rename from pkgs/development/libraries/liblo/default.nix rename to pkgs/by-name/li/liblo/package.nix diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/by-name/li/liblockfile/package.nix similarity index 100% rename from pkgs/development/libraries/liblockfile/default.nix rename to pkgs/by-name/li/liblockfile/package.nix diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/by-name/li/liblogging/package.nix similarity index 100% rename from pkgs/development/libraries/liblogging/default.nix rename to pkgs/by-name/li/liblogging/package.nix diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/by-name/li/liblognorm/package.nix similarity index 100% rename from pkgs/development/libraries/liblognorm/default.nix rename to pkgs/by-name/li/liblognorm/package.nix diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/by-name/li/liblouis/package.nix similarity index 100% rename from pkgs/development/libraries/liblouis/default.nix rename to pkgs/by-name/li/liblouis/package.nix diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/by-name/li/liblscp/package.nix similarity index 100% rename from pkgs/development/libraries/liblscp/default.nix rename to pkgs/by-name/li/liblscp/package.nix diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/by-name/li/libltc/package.nix similarity index 100% rename from pkgs/development/libraries/libltc/default.nix rename to pkgs/by-name/li/libltc/package.nix diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/by-name/li/liblxi/package.nix similarity index 100% rename from pkgs/development/libraries/liblxi/default.nix rename to pkgs/by-name/li/liblxi/package.nix diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/by-name/li/libmad/package.nix similarity index 100% rename from pkgs/development/libraries/libmad/default.nix rename to pkgs/by-name/li/libmad/package.nix diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/by-name/li/libmanette/package.nix similarity index 100% rename from pkgs/development/libraries/libmanette/default.nix rename to pkgs/by-name/li/libmanette/package.nix diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/by-name/li/libmatchbox/package.nix similarity index 100% rename from pkgs/development/libraries/libmatchbox/default.nix rename to pkgs/by-name/li/libmatchbox/package.nix diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/by-name/li/libmatheval/package.nix similarity index 100% rename from pkgs/development/libraries/libmatheval/default.nix rename to pkgs/by-name/li/libmatheval/package.nix diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/by-name/li/libmaxminddb/package.nix similarity index 100% rename from pkgs/development/libraries/libmaxminddb/default.nix rename to pkgs/by-name/li/libmaxminddb/package.nix diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/by-name/li/libmbim/package.nix similarity index 100% rename from pkgs/development/libraries/libmbim/default.nix rename to pkgs/by-name/li/libmbim/package.nix diff --git a/pkgs/development/libraries/libmcfp/default.nix b/pkgs/by-name/li/libmcfp/package.nix similarity index 100% rename from pkgs/development/libraries/libmcfp/default.nix rename to pkgs/by-name/li/libmcfp/package.nix diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/by-name/li/libmcrypt/package.nix similarity index 100% rename from pkgs/development/libraries/libmcrypt/default.nix rename to pkgs/by-name/li/libmcrypt/package.nix diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/by-name/li/libmd/package.nix similarity index 100% rename from pkgs/development/libraries/libmd/default.nix rename to pkgs/by-name/li/libmd/package.nix diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/by-name/li/libmediaart/package.nix similarity index 100% rename from pkgs/development/libraries/libmediaart/default.nix rename to pkgs/by-name/li/libmediaart/package.nix diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/pkgs/by-name/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch similarity index 100% rename from pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch rename to pkgs/by-name/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/pkgs/by-name/li/libmemcached/musl-fixes.patch similarity index 100% rename from pkgs/development/libraries/libmemcached/musl-fixes.patch rename to pkgs/by-name/li/libmemcached/musl-fixes.patch diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/by-name/li/libmemcached/package.nix similarity index 100% rename from pkgs/development/libraries/libmemcached/default.nix rename to pkgs/by-name/li/libmemcached/package.nix diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/by-name/li/libmesode/package.nix similarity index 100% rename from pkgs/development/libraries/libmesode/default.nix rename to pkgs/by-name/li/libmesode/package.nix diff --git a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/pkgs/by-name/li/libmhash/autotools-define-conflict-debian-fix.patch similarity index 100% rename from pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch rename to pkgs/by-name/li/libmhash/autotools-define-conflict-debian-fix.patch diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/by-name/li/libmhash/package.nix similarity index 100% rename from pkgs/development/libraries/libmhash/default.nix rename to pkgs/by-name/li/libmhash/package.nix diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/by-name/li/libmicrodns/package.nix similarity index 100% rename from pkgs/development/libraries/libmicrodns/default.nix rename to pkgs/by-name/li/libmicrodns/package.nix diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/by-name/li/libmilter/darwin.patch similarity index 100% rename from pkgs/development/libraries/libmilter/darwin.patch rename to pkgs/by-name/li/libmilter/darwin.patch diff --git a/pkgs/development/libraries/libmilter/install.patch b/pkgs/by-name/li/libmilter/install.patch similarity index 100% rename from pkgs/development/libraries/libmilter/install.patch rename to pkgs/by-name/li/libmilter/install.patch diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/by-name/li/libmilter/package.nix similarity index 100% rename from pkgs/development/libraries/libmilter/default.nix rename to pkgs/by-name/li/libmilter/package.nix diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/by-name/li/libmilter/sharedlib.patch similarity index 100% rename from pkgs/development/libraries/libmilter/sharedlib.patch rename to pkgs/by-name/li/libmilter/sharedlib.patch diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/by-name/li/libminc/package.nix similarity index 100% rename from pkgs/development/libraries/libminc/default.nix rename to pkgs/by-name/li/libminc/package.nix diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/by-name/li/libmkv/package.nix similarity index 100% rename from pkgs/development/libraries/libmkv/default.nix rename to pkgs/by-name/li/libmkv/package.nix diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/by-name/li/libmms/package.nix similarity index 100% rename from pkgs/development/libraries/libmms/default.nix rename to pkgs/by-name/li/libmms/package.nix diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/by-name/li/libmng/package.nix similarity index 100% rename from pkgs/development/libraries/libmng/default.nix rename to pkgs/by-name/li/libmng/package.nix diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/by-name/li/libmnl/package.nix similarity index 100% rename from pkgs/development/libraries/libmnl/default.nix rename to pkgs/by-name/li/libmnl/package.nix diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/by-name/li/libmodbus/package.nix similarity index 100% rename from pkgs/development/libraries/libmodbus/default.nix rename to pkgs/by-name/li/libmodbus/package.nix diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/by-name/li/libmodplug/package.nix similarity index 100% rename from pkgs/development/libraries/libmodplug/default.nix rename to pkgs/by-name/li/libmodplug/package.nix diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/by-name/li/libmodule/package.nix similarity index 100% rename from pkgs/development/libraries/libmodule/default.nix rename to pkgs/by-name/li/libmodule/package.nix diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/by-name/li/libmodulemd/package.nix similarity index 100% rename from pkgs/development/libraries/libmodulemd/default.nix rename to pkgs/by-name/li/libmodulemd/package.nix diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/by-name/li/libmowgli/package.nix similarity index 100% rename from pkgs/development/libraries/libmowgli/default.nix rename to pkgs/by-name/li/libmowgli/package.nix diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/by-name/li/libmp3splt/package.nix similarity index 100% rename from pkgs/development/libraries/libmp3splt/default.nix rename to pkgs/by-name/li/libmp3splt/package.nix diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/by-name/li/libmpack/package.nix similarity index 100% rename from pkgs/development/libraries/libmpack/default.nix rename to pkgs/by-name/li/libmpack/package.nix diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/by-name/li/libmpc/package.nix similarity index 100% rename from pkgs/development/libraries/libmpc/default.nix rename to pkgs/by-name/li/libmpc/package.nix diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/by-name/li/libmpcdec/package.nix similarity index 100% rename from pkgs/development/libraries/libmpcdec/default.nix rename to pkgs/by-name/li/libmpcdec/package.nix diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/by-name/li/libmpeg2/package.nix similarity index 100% rename from pkgs/development/libraries/libmpeg2/default.nix rename to pkgs/by-name/li/libmpeg2/package.nix diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index 8a133e947135..21845a6b7f7e 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsgraph"; - version = "0.2.2"; + version = "0.2.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz"; - hash = "sha256-EsyVT3ULsTes6FAP6TVdJubgDvbMqrKVDp02DpJ1gzU="; + hash = "sha256-7ULoAMt/CgdHfNnj50TNwaJApq16uWuKh1gGJnqf3bA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/by-name/li/libmspack/package.nix similarity index 100% rename from pkgs/development/libraries/libmspack/default.nix rename to pkgs/by-name/li/libmspack/package.nix diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/by-name/li/libmsym/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/libmsym/default.nix rename to pkgs/by-name/li/libmsym/package.nix diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/by-name/li/libmtp/package.nix similarity index 100% rename from pkgs/development/libraries/libmtp/default.nix rename to pkgs/by-name/li/libmtp/package.nix diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/by-name/li/libmwaw/package.nix similarity index 100% rename from pkgs/development/libraries/libmwaw/default.nix rename to pkgs/by-name/li/libmwaw/package.nix diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/by-name/li/libmx/package.nix similarity index 100% rename from pkgs/development/libraries/libmx/default.nix rename to pkgs/by-name/li/libmx/package.nix diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/by-name/li/libmypaint/package.nix similarity index 100% rename from pkgs/development/libraries/libmypaint/default.nix rename to pkgs/by-name/li/libmypaint/package.nix diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/by-name/li/libmysofa/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libmysofa/default.nix rename to pkgs/by-name/li/libmysofa/package.nix diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix similarity index 100% rename from pkgs/development/libraries/libmysqlconnectorcpp/default.nix rename to pkgs/by-name/li/libmysqlconnectorcpp/package.nix diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/by-name/li/libnabo/package.nix similarity index 100% rename from pkgs/development/libraries/libnabo/default.nix rename to pkgs/by-name/li/libnabo/package.nix diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/by-name/li/libnatpmp/package.nix similarity index 100% rename from pkgs/development/libraries/libnatpmp/default.nix rename to pkgs/by-name/li/libnatpmp/package.nix diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/by-name/li/libnats-c/package.nix similarity index 100% rename from pkgs/development/libraries/libnats-c/default.nix rename to pkgs/by-name/li/libnats-c/package.nix diff --git a/pkgs/by-name/li/libnatspec/package.nix b/pkgs/by-name/li/libnatspec/package.nix new file mode 100644 index 000000000000..65ea9086dce1 --- /dev/null +++ b/pkgs/by-name/li/libnatspec/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }: + +stdenv.mkDerivation rec { + pname = "libnatspec"; + version = "0.3.0"; + + src = fetchurl { + url = "mirror://sourceforge/natspec/${pname}-${version}.tar.bz2"; + sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ popt ]; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-liconv"; + }; + + propagatedBuildInputs = [ libiconv ]; + + meta = with lib; { + homepage = "https://natspec.sourceforge.net/"; + description = "Library intended to smooth national specificities in using of programs"; + mainProgram = "natspec"; + platforms = platforms.unix; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/by-name/li/libndctl/package.nix similarity index 100% rename from pkgs/development/libraries/libndctl/default.nix rename to pkgs/by-name/li/libndctl/package.nix diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/by-name/li/libndp/package.nix similarity index 100% rename from pkgs/development/libraries/libndp/default.nix rename to pkgs/by-name/li/libndp/package.nix diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/by-name/li/libndtypes/package.nix similarity index 100% rename from pkgs/development/libraries/libndtypes/default.nix rename to pkgs/by-name/li/libndtypes/package.nix diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/by-name/li/libnest2d/package.nix similarity index 100% rename from pkgs/development/libraries/libnest2d/default.nix rename to pkgs/by-name/li/libnest2d/package.nix diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/by-name/li/libnet/package.nix similarity index 100% rename from pkgs/development/libraries/libnet/default.nix rename to pkgs/by-name/li/libnet/package.nix diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/by-name/li/libnetfilter_acct/package.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_acct/default.nix rename to pkgs/by-name/li/libnetfilter_acct/package.nix diff --git a/pkgs/by-name/li/libnetfilter_conntrack/package.nix b/pkgs/by-name/li/libnetfilter_conntrack/package.nix new file mode 100644 index 000000000000..e056eddcb1ab --- /dev/null +++ b/pkgs/by-name/li/libnetfilter_conntrack/package.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: + +stdenv.mkDerivation rec { + pname = "libnetfilter_conntrack"; + version = "1.1.0"; + + src = fetchurl { + url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.xz"; + hash = "sha256-Z+3LTrgmwvjcmK8I2r/2jzs9D+b7fZ0Kwe5+zOD+aU4="; + }; + + hardeningDisable = [ "trivialautovarinit" ]; + + buildInputs = [ libmnl ]; + propagatedBuildInputs = [ libnfnetlink ]; + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Userspace library providing an API to the in-kernel connection tracking state table"; + longDescription = '' + libnetfilter_conntrack is a userspace library providing a programming interface (API) to the + in-kernel connection tracking state table. The library libnetfilter_conntrack has been + previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used + by conntrack-tools among many other applications + ''; + homepage = "https://netfilter.org/projects/libnetfilter_conntrack/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/by-name/li/libnetfilter_cthelper/package.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_cthelper/default.nix rename to pkgs/by-name/li/libnetfilter_cthelper/package.nix diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/by-name/li/libnetfilter_cttimeout/package.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_cttimeout/default.nix rename to pkgs/by-name/li/libnetfilter_cttimeout/package.nix diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/by-name/li/libnetfilter_log/package.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_log/default.nix rename to pkgs/by-name/li/libnetfilter_log/package.nix diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/by-name/li/libnetfilter_queue/package.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_queue/default.nix rename to pkgs/by-name/li/libnetfilter_queue/package.nix diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/by-name/li/libnfc/package.nix similarity index 100% rename from pkgs/development/libraries/libnfc/default.nix rename to pkgs/by-name/li/libnfc/package.nix diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/by-name/li/libnfnetlink/package.nix similarity index 100% rename from pkgs/development/libraries/libnfnetlink/default.nix rename to pkgs/by-name/li/libnfnetlink/package.nix diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/by-name/li/libnfs/package.nix similarity index 100% rename from pkgs/development/libraries/libnfs/default.nix rename to pkgs/by-name/li/libnfs/package.nix diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix new file mode 100644 index 000000000000..bac21d63b2b6 --- /dev/null +++ b/pkgs/by-name/li/libnftnl/package.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }: + +stdenv.mkDerivation rec { + version = "1.2.8"; + pname = "libnftnl"; + + src = fetchurl { + url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; + hash = "sha256-N/6l1rXJsI3nkg0pjePNyULnrmSxo+i4gLLTkK5nrZU="; + }; + + configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version"; + + 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/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/by-name/li/libngspice/package.nix b/pkgs/by-name/li/libngspice/package.nix new file mode 100644 index 000000000000..044d1b25fafe --- /dev/null +++ b/pkgs/by-name/li/libngspice/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, flex +, bison +, fftw +, withNgshared ? true +, libXaw +, libXext +, llvmPackages +, readline +}: + +stdenv.mkDerivation rec { + pname = "${lib.optionalString withNgshared "lib"}ngspice"; + version = "43"; + + src = fetchurl { + url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; + hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk="; + }; + + nativeBuildInputs = [ + flex + bison + ]; + + buildInputs = [ + fftw + readline + ] ++ lib.optionals (!withNgshared) [ + libXaw + libXext + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + llvmPackages.openmp + ]; + + configureFlags = lib.optionals withNgshared [ + "--with-ngshared" + ] ++ [ + "--enable-xspice" + "--enable-cider" + "--enable-osdi" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Next Generation Spice (Electronic Circuit Simulator)"; + mainProgram = "ngspice"; + homepage = "http://ngspice.sourceforge.net"; + license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING + maintainers = with maintainers; [ bgamari ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/by-name/li/libnice/package.nix similarity index 100% rename from pkgs/development/libraries/libnice/default.nix rename to pkgs/by-name/li/libnice/package.nix diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/by-name/li/libnids/package.nix similarity index 100% rename from pkgs/tools/networking/libnids/default.nix rename to pkgs/by-name/li/libnids/package.nix diff --git a/pkgs/development/libraries/libnitrokey/default.nix b/pkgs/by-name/li/libnitrokey/package.nix similarity index 100% rename from pkgs/development/libraries/libnitrokey/default.nix rename to pkgs/by-name/li/libnitrokey/package.nix diff --git a/pkgs/by-name/li/libnixxml/package.nix b/pkgs/by-name/li/libnixxml/package.nix new file mode 100644 index 000000000000..fb2bfdde5c06 --- /dev/null +++ b/pkgs/by-name/li/libnixxml/package.nix @@ -0,0 +1,64 @@ +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}: + +stdenv.mkDerivation { + pname = "libnixxml"; + version = "unstable-2020-06-25"; + + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "libnixxml"; + rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; + sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; + }; + + prePatch = '' + # Remove broken test + substituteInPlace tests/draw/Makefile.am \ + --replace "draw-wrong.sh" "" + rm tests/draw/draw-wrong.sh + + # Fix bash path + substituteInPlace scripts/nixexpr2xml.in \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + preAutoreconf = '' + # Copied from bootstrap script + ln -s README.md README + mkdir -p config + ''; + + configureFlags = [ "--with-gd" "--with-glib" ]; + CFLAGS = [ + "-Wall" + "-std=c90" + ]; + + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook + pkg-config + getopt + libxslt + ]; + buildInputs = [ + bash + libxml2 + gd.dev + glib + nix + ]; + nativeCheckInputs = [ + nix + ]; + + doCheck = true; + + meta = with lib; { + description = "XML-based Nix-friendly data integration library"; + homepage = "https://github.com/svanderburg/libnixxml"; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/os-specific/linux/libnl-tiny/default.nix b/pkgs/by-name/li/libnl-tiny/package.nix similarity index 100% rename from pkgs/os-specific/linux/libnl-tiny/default.nix rename to pkgs/by-name/li/libnl-tiny/package.nix diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/by-name/li/libnl/package.nix similarity index 100% rename from pkgs/os-specific/linux/libnl/default.nix rename to pkgs/by-name/li/libnl/package.nix diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/by-name/li/libnotify/package.nix similarity index 100% rename from pkgs/development/libraries/libnotify/default.nix rename to pkgs/by-name/li/libnotify/package.nix diff --git a/pkgs/development/libraries/science/astronomy/libnova/default.nix b/pkgs/by-name/li/libnova/package.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/libnova/default.nix rename to pkgs/by-name/li/libnova/package.nix diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/by-name/li/libnsl/package.nix similarity index 100% rename from pkgs/development/libraries/libnsl/default.nix rename to pkgs/by-name/li/libnsl/package.nix diff --git a/pkgs/os-specific/linux/libnss-mysql/default.nix b/pkgs/by-name/li/libnss-mysql/package.nix similarity index 100% rename from pkgs/os-specific/linux/libnss-mysql/default.nix rename to pkgs/by-name/li/libnss-mysql/package.nix diff --git a/pkgs/development/libraries/libnut/default.nix b/pkgs/by-name/li/libnut/package.nix similarity index 100% rename from pkgs/development/libraries/libnut/default.nix rename to pkgs/by-name/li/libnut/package.nix diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/by-name/li/libnvme/package.nix similarity index 100% rename from pkgs/os-specific/linux/libnvme/default.nix rename to pkgs/by-name/li/libnvme/package.nix diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/by-name/li/liboauth/package.nix similarity index 100% rename from pkgs/development/libraries/liboauth/default.nix rename to pkgs/by-name/li/liboauth/package.nix diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/by-name/li/libodb-sqlite/package.nix similarity index 100% rename from pkgs/development/libraries/libodb-sqlite/default.nix rename to pkgs/by-name/li/libodb-sqlite/package.nix diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/by-name/li/libodb/package.nix similarity index 100% rename from pkgs/development/libraries/libodb/default.nix rename to pkgs/by-name/li/libodb/package.nix diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/by-name/li/libodfgen/package.nix similarity index 100% rename from pkgs/development/libraries/libodfgen/default.nix rename to pkgs/by-name/li/libodfgen/package.nix diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/by-name/li/libofa/package.nix similarity index 100% rename from pkgs/development/libraries/libofa/default.nix rename to pkgs/by-name/li/libofa/package.nix diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/by-name/li/libofx/package.nix similarity index 100% rename from pkgs/development/libraries/libofx/default.nix rename to pkgs/by-name/li/libofx/package.nix diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/by-name/li/libogg/package.nix similarity index 100% rename from pkgs/development/libraries/libogg/default.nix rename to pkgs/by-name/li/libogg/package.nix diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/by-name/li/liboggz/package.nix similarity index 100% rename from pkgs/development/libraries/liboggz/default.nix rename to pkgs/by-name/li/liboggz/package.nix diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/by-name/li/liboil/package.nix similarity index 100% rename from pkgs/development/libraries/liboil/default.nix rename to pkgs/by-name/li/liboil/package.nix diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/by-name/li/liboil/x86_64-cpuid.patch similarity index 100% rename from pkgs/development/libraries/liboil/x86_64-cpuid.patch rename to pkgs/by-name/li/liboil/x86_64-cpuid.patch diff --git a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/pkgs/by-name/li/libomxil-bellagio/fedora-fixes.patch similarity index 100% rename from pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch rename to pkgs/by-name/li/libomxil-bellagio/fedora-fixes.patch diff --git a/pkgs/development/libraries/libomxil-bellagio/fno-common.patch b/pkgs/by-name/li/libomxil-bellagio/fno-common.patch similarity index 100% rename from pkgs/development/libraries/libomxil-bellagio/fno-common.patch rename to pkgs/by-name/li/libomxil-bellagio/fno-common.patch diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/by-name/li/libomxil-bellagio/package.nix similarity index 100% rename from pkgs/development/libraries/libomxil-bellagio/default.nix rename to pkgs/by-name/li/libomxil-bellagio/package.nix diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/by-name/li/libopenaptx/package.nix similarity index 100% rename from pkgs/development/libraries/libopenaptx/default.nix rename to pkgs/by-name/li/libopenaptx/package.nix diff --git a/pkgs/development/libraries/libopenglrecorder/default.nix b/pkgs/by-name/li/libopenglrecorder/package.nix similarity index 100% rename from pkgs/development/libraries/libopenglrecorder/default.nix rename to pkgs/by-name/li/libopenglrecorder/package.nix diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/by-name/li/libopenmpt-modplug/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt-modplug/default.nix rename to pkgs/by-name/li/libopenmpt-modplug/package.nix diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch b/pkgs/by-name/li/libopensmtpd/no-chown-while-installing.patch similarity index 100% rename from pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch rename to pkgs/by-name/li/libopensmtpd/no-chown-while-installing.patch diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/pkgs/by-name/li/libopensmtpd/package.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix rename to pkgs/by-name/li/libopensmtpd/package.nix diff --git a/pkgs/development/libraries/liboping/ncurses-6.3.patch b/pkgs/by-name/li/liboping/ncurses-6.3.patch similarity index 100% rename from pkgs/development/libraries/liboping/ncurses-6.3.patch rename to pkgs/by-name/li/liboping/ncurses-6.3.patch diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/by-name/li/liboping/package.nix similarity index 100% rename from pkgs/development/libraries/liboping/default.nix rename to pkgs/by-name/li/liboping/package.nix diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/by-name/li/libopusenc/package.nix similarity index 100% rename from pkgs/development/libraries/libopusenc/default.nix rename to pkgs/by-name/li/libopusenc/package.nix diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/by-name/li/libosinfo/osinfo-db-data-dir.patch similarity index 100% rename from pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch rename to pkgs/by-name/li/libosinfo/osinfo-db-data-dir.patch diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/by-name/li/libosinfo/package.nix similarity index 100% rename from pkgs/development/libraries/libosinfo/default.nix rename to pkgs/by-name/li/libosinfo/package.nix diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/by-name/li/libosip/package.nix similarity index 100% rename from pkgs/development/libraries/osip/default.nix rename to pkgs/by-name/li/libosip/package.nix diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/by-name/li/libosmium/package.nix similarity index 100% rename from pkgs/development/libraries/libosmium/default.nix rename to pkgs/by-name/li/libosmium/package.nix diff --git a/pkgs/servers/osmocom/libosmo-netif/default.nix b/pkgs/by-name/li/libosmo-netif/package.nix similarity index 100% rename from pkgs/servers/osmocom/libosmo-netif/default.nix rename to pkgs/by-name/li/libosmo-netif/package.nix diff --git a/pkgs/servers/osmocom/libosmo-sccp/default.nix b/pkgs/by-name/li/libosmo-sccp/package.nix similarity index 100% rename from pkgs/servers/osmocom/libosmo-sccp/default.nix rename to pkgs/by-name/li/libosmo-sccp/package.nix diff --git a/pkgs/servers/osmocom/libosmoabis/default.nix b/pkgs/by-name/li/libosmoabis/package.nix similarity index 100% rename from pkgs/servers/osmocom/libosmoabis/default.nix rename to pkgs/by-name/li/libosmoabis/package.nix diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/by-name/li/libosmocore/package.nix similarity index 100% rename from pkgs/servers/osmocom/libosmocore/default.nix rename to pkgs/by-name/li/libosmocore/package.nix diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/by-name/li/libossp_uuid/package.nix similarity index 100% rename from pkgs/development/libraries/libossp-uuid/default.nix rename to pkgs/by-name/li/libossp_uuid/package.nix diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/by-name/li/libossp_uuid/shtool.patch similarity index 100% rename from pkgs/development/libraries/libossp-uuid/shtool.patch rename to pkgs/by-name/li/libossp_uuid/shtool.patch diff --git a/pkgs/development/libraries/libotr/fix-regtest-client.patch b/pkgs/by-name/li/libotr/fix-regtest-client.patch similarity index 100% rename from pkgs/development/libraries/libotr/fix-regtest-client.patch rename to pkgs/by-name/li/libotr/fix-regtest-client.patch diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/by-name/li/libotr/package.nix similarity index 100% rename from pkgs/development/libraries/libotr/default.nix rename to pkgs/by-name/li/libotr/package.nix diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/by-name/li/libow/package.nix similarity index 100% rename from pkgs/development/libraries/libow/default.nix rename to pkgs/by-name/li/libow/package.nix diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/by-name/li/libowfat/package.nix similarity index 100% rename from pkgs/development/libraries/libowfat/default.nix rename to pkgs/by-name/li/libowfat/package.nix diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/by-name/li/libowlevelzs/package.nix similarity index 100% rename from pkgs/development/libraries/libowlevelzs/default.nix rename to pkgs/by-name/li/libowlevelzs/package.nix diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/by-name/li/libp11/package.nix similarity index 100% rename from pkgs/development/libraries/libp11/default.nix rename to pkgs/by-name/li/libp11/package.nix diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/by-name/li/libpam-wrapper/package.nix similarity index 100% rename from pkgs/development/libraries/libpam-wrapper/default.nix rename to pkgs/by-name/li/libpam-wrapper/package.nix diff --git a/pkgs/development/libraries/libpam-wrapper/python.patch b/pkgs/by-name/li/libpam-wrapper/python.patch similarity index 100% rename from pkgs/development/libraries/libpam-wrapper/python.patch rename to pkgs/by-name/li/libpam-wrapper/python.patch diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix new file mode 100644 index 000000000000..3a8a75565418 --- /dev/null +++ b/pkgs/by-name/li/libpanel/package.nix @@ -0,0 +1,73 @@ +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + gobject-introspection, + vala, + gi-docgen, + glib, + gtk4, + libadwaita, + gnome, +}: + +stdenv.mkDerivation rec { + pname = "libpanel"; + version = "1.8.1"; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + + outputBin = "dev"; + + src = fetchurl { + url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-uHuPqbeXaMxwQkN5PwFYoECh5G03uYiRiFRaf33Kpvs="; + }; + + strictDeps = true; + + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + gtk4 # gtk4-update-icon-cache + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + mesonFlags = [ (lib.mesonBool "install-examples" true) ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { packageName = pname; }; + }; + + meta = with lib; { + description = "Dock/panel library for GTK 4"; + mainProgram = "libpanel-example"; + homepage = "https://gitlab.gnome.org/GNOME/libpanel"; + license = licenses.lgpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/by-name/li/libpaper/package.nix similarity index 100% rename from pkgs/development/libraries/libpaper/default.nix rename to pkgs/by-name/li/libpaper/package.nix diff --git a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/pkgs/by-name/li/libpar2/libpar2-0.4-external-verification.patch similarity index 100% rename from pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch rename to pkgs/by-name/li/libpar2/libpar2-0.4-external-verification.patch diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/by-name/li/libpar2/package.nix similarity index 100% rename from pkgs/development/libraries/libpar2/default.nix rename to pkgs/by-name/li/libpar2/package.nix diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/by-name/li/libpcap/package.nix similarity index 100% rename from pkgs/development/libraries/libpcap/default.nix rename to pkgs/by-name/li/libpcap/package.nix diff --git a/pkgs/tools/misc/libpff/default.nix b/pkgs/by-name/li/libpff/package.nix similarity index 100% rename from pkgs/tools/misc/libpff/default.nix rename to pkgs/by-name/li/libpff/package.nix diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/by-name/li/libpfm/fix-windows.patch similarity index 100% rename from pkgs/development/libraries/libpfm/fix-windows.patch rename to pkgs/by-name/li/libpfm/fix-windows.patch diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/by-name/li/libpfm/package.nix similarity index 100% rename from pkgs/development/libraries/libpfm/default.nix rename to pkgs/by-name/li/libpfm/package.nix diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/by-name/li/libpg_query/package.nix similarity index 100% rename from pkgs/development/libraries/libpg_query/default.nix rename to pkgs/by-name/li/libpg_query/package.nix diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/by-name/li/libpgf/package.nix similarity index 100% rename from pkgs/development/libraries/libpgf/default.nix rename to pkgs/by-name/li/libpgf/package.nix diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/by-name/li/libpinyin/package.nix similarity index 100% rename from pkgs/development/libraries/libpinyin/default.nix rename to pkgs/by-name/li/libpinyin/package.nix diff --git a/pkgs/development/libraries/libpipeline/fix-on-osx.patch b/pkgs/by-name/li/libpipeline/fix-on-osx.patch similarity index 100% rename from pkgs/development/libraries/libpipeline/fix-on-osx.patch rename to pkgs/by-name/li/libpipeline/fix-on-osx.patch diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/by-name/li/libpipeline/package.nix similarity index 100% rename from pkgs/development/libraries/libpipeline/default.nix rename to pkgs/by-name/li/libpipeline/package.nix diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/by-name/li/libplacebo/package.nix similarity index 100% rename from pkgs/development/libraries/libplacebo/default.nix rename to pkgs/by-name/li/libplacebo/package.nix diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/by-name/li/libplctag/package.nix similarity index 100% rename from pkgs/development/libraries/libplctag/default.nix rename to pkgs/by-name/li/libplctag/package.nix diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/by-name/li/libplist/package.nix similarity index 100% rename from pkgs/development/libraries/libplist/default.nix rename to pkgs/by-name/li/libplist/package.nix diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/by-name/li/libpointmatcher/package.nix similarity index 100% rename from pkgs/development/libraries/libpointmatcher/default.nix rename to pkgs/by-name/li/libpointmatcher/package.nix diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/by-name/li/libpoly/package.nix similarity index 100% rename from pkgs/applications/science/logic/poly/default.nix rename to pkgs/by-name/li/libpoly/package.nix diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/by-name/li/libportal/package.nix similarity index 100% rename from pkgs/development/libraries/libportal/default.nix rename to pkgs/by-name/li/libportal/package.nix diff --git a/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch b/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch similarity index 100% rename from pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch rename to pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/by-name/li/libpostal/package.nix similarity index 100% rename from pkgs/development/libraries/libpostal/default.nix rename to pkgs/by-name/li/libpostal/package.nix diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/by-name/li/libpqxx/package.nix similarity index 100% rename from pkgs/development/libraries/libpqxx/default.nix rename to pkgs/by-name/li/libpqxx/package.nix diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/by-name/li/libpseudo/package.nix similarity index 100% rename from pkgs/development/libraries/libpseudo/default.nix rename to pkgs/by-name/li/libpseudo/package.nix diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix new file mode 100644 index 000000000000..15cfedbdae89 --- /dev/null +++ b/pkgs/by-name/li/libpsl/package.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + docbook_xsl, + docbook_xml_dtd_43, + gtk-doc, + lzip, + libidn2, + libunistring, + libxslt, + pkg-config, + python3, + buildPackages, + publicsuffix-list, +}: + +stdenv.mkDerivation rec { + pname = "libpsl"; + version = "0.21.5"; + + src = fetchurl { + url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz"; + hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; + }; + + outputs = + [ + "out" + "dev" + ] + # bin/psl-make-dafsa brings a large runtime closure through python3 + ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; + + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gtk-doc + lzip + pkg-config + libxslt + ]; + + buildInputs = [ + libidn2 + libunistring + libxslt + ] ++ lib.optional ( + !stdenv.hostPlatform.isStatic + && !stdenv.hostPlatform.isWindows + && (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform) + ) python3; + + propagatedBuildInputs = [ + publicsuffix-list + ]; + + postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + patchShebangs src/psl-make-dafsa + ''; + + preAutoreconf = '' + gtkdocize + ''; + + configureFlags = [ + # "--enable-gtk-doc" + "--enable-man" + "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" + "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" + "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" + "PYTHON=${lib.getExe buildPackages.python3}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "C library for the Publix Suffix List"; + longDescription = '' + libpsl is a C library for the Publix Suffix List (PSL). A "public suffix" + is a domain name under which Internet users can directly register own + names. Browsers and other web clients can use it to avoid privacy-leaking + "supercookies" and "super domain" certificates, for highlighting parts of + the domain in a user interface or sorting domain lists by site. + ''; + homepage = "https://rockdaboot.github.io/libpsl/"; + changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS"; + license = licenses.mit; + maintainers = [ maintainers.c0bw3b ]; + mainProgram = "psl"; + platforms = platforms.unix ++ platforms.windows; + pkgConfigModules = [ "libpsl" ]; + }; +} diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/by-name/li/libpsm2/package.nix similarity index 100% rename from pkgs/os-specific/linux/libpsm2/default.nix rename to pkgs/by-name/li/libpsm2/package.nix diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/by-name/li/libpst/package.nix similarity index 100% rename from pkgs/development/libraries/libpst/default.nix rename to pkgs/by-name/li/libpst/package.nix diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/by-name/li/libptytty/package.nix similarity index 100% rename from pkgs/development/libraries/libptytty/default.nix rename to pkgs/by-name/li/libptytty/package.nix diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/by-name/li/libqalculate/package.nix similarity index 100% rename from pkgs/development/libraries/libqalculate/default.nix rename to pkgs/by-name/li/libqalculate/package.nix diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/by-name/li/libqb/package.nix similarity index 100% rename from pkgs/development/libraries/libqb/default.nix rename to pkgs/by-name/li/libqb/package.nix diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/by-name/li/libqmi/package.nix similarity index 100% rename from pkgs/development/libraries/libqmi/default.nix rename to pkgs/by-name/li/libqmi/package.nix diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/by-name/li/libqrtr-glib/package.nix similarity index 100% rename from pkgs/development/libraries/libqrtr-glib/default.nix rename to pkgs/by-name/li/libqrtr-glib/package.nix diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/by-name/li/libr3/package.nix similarity index 100% rename from pkgs/development/libraries/libr3/default.nix rename to pkgs/by-name/li/libr3/package.nix diff --git a/pkgs/development/libraries/libraqm/default.nix b/pkgs/by-name/li/libraqm/package.nix similarity index 100% rename from pkgs/development/libraries/libraqm/default.nix rename to pkgs/by-name/li/libraqm/package.nix diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/by-name/li/libraspberrypi/package.nix similarity index 100% rename from pkgs/development/libraries/libraspberrypi/default.nix rename to pkgs/by-name/li/libraspberrypi/package.nix diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/by-name/li/libratbag/package.nix similarity index 100% rename from pkgs/os-specific/linux/libratbag/default.nix rename to pkgs/by-name/li/libratbag/package.nix diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix new file mode 100644 index 000000000000..5c40666a2115 --- /dev/null +++ b/pkgs/by-name/li/libraw/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, lcms2 +, pkg-config + +# for passthru.tests +, deepin +, freeimage +, hdrmerge +, imagemagick +, python3 +}: + +stdenv.mkDerivation rec { + pname = "libraw"; + version = "0.21.3"; + + src = fetchFromGitHub { + owner = "LibRaw"; + repo = "LibRaw"; + rev = version; + hash = "sha256-QFyRQ0V7din/rnkRvEWf521kSzN7HwJ3kZiQ43PAmVI="; + }; + + outputs = [ "out" "lib" "dev" "doc" ]; + + propagatedBuildInputs = [ lcms2 ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + passthru.tests = { + inherit imagemagick hdrmerge freeimage; + inherit (deepin) deepin-image-viewer; + inherit (python3.pkgs) rawkit; + }; + + meta = with lib; { + description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; + homepage = "https://www.libraw.org/"; + license = with licenses; [ cddl lgpl2Plus ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/by-name/li/libraw1394/package.nix similarity index 100% rename from pkgs/development/libraries/libraw1394/default.nix rename to pkgs/by-name/li/libraw1394/package.nix diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/by-name/li/librclone/package.nix similarity index 100% rename from pkgs/development/libraries/librclone/default.nix rename to pkgs/by-name/li/librclone/package.nix diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/by-name/li/libre-baskerville/package.nix similarity index 100% rename from pkgs/data/fonts/libre-baskerville/default.nix rename to pkgs/by-name/li/libre-baskerville/package.nix diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/by-name/li/libre-bodoni/package.nix similarity index 100% rename from pkgs/data/fonts/libre-bodoni/default.nix rename to pkgs/by-name/li/libre-bodoni/package.nix diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/by-name/li/libre-caslon/package.nix similarity index 100% rename from pkgs/data/fonts/libre-caslon/default.nix rename to pkgs/by-name/li/libre-caslon/package.nix diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/by-name/li/libre-franklin/package.nix similarity index 100% rename from pkgs/data/fonts/libre-franklin/default.nix rename to pkgs/by-name/li/libre-franklin/package.nix diff --git a/pkgs/development/libraries/librecast/default.nix b/pkgs/by-name/li/librecast/package.nix similarity index 100% rename from pkgs/development/libraries/librecast/default.nix rename to pkgs/by-name/li/librecast/package.nix diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/by-name/li/libredirect/libredirect.c similarity index 100% rename from pkgs/build-support/libredirect/libredirect.c rename to pkgs/by-name/li/libredirect/libredirect.c diff --git a/pkgs/by-name/li/libredirect/package.nix b/pkgs/by-name/li/libredirect/package.nix new file mode 100644 index 000000000000..24754041a1b6 --- /dev/null +++ b/pkgs/by-name/li/libredirect/package.nix @@ -0,0 +1,115 @@ +{ lib, stdenv, bintools-unwrapped, llvmPackages, coreutils }: + +if stdenv.hostPlatform.isStatic +then throw '' + libredirect is not available on static builds. + + Please fix your derivation to not depend on libredirect on static + builds, using something like following: + + nativeBuildInputs = + lib.optional (!stdenv.buildPlatform.isStatic) libredirect; + + and disable tests as necessary, although fixing tests to work without + libredirect is even better. + + libredirect uses LD_PRELOAD feature of dynamic loader and does not + work on static builds where dynamic loader is not used. + '' +else stdenv.mkDerivation rec { + pname = "libredirect"; + version = "0"; + + unpackPhase = '' + cp ${./libredirect.c} libredirect.c + cp ${./test.c} test.c + ''; + + outputs = ["out" "hook"]; + + libName = "libredirect" + stdenv.hostPlatform.extensions.sharedLibrary; + + buildPhase = '' + runHook preBuild + + ${if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then '' + # We need the unwrapped binutils and clang: + # We also want to build a fat library with x86_64, arm64, arm64e in there. + # Because we use the unwrapped tools, we need to provide -isystem for headers + # 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:${llvmPackages.clang-unwrapped}/bin:$PATH \ + clang -arch x86_64 -arch arm64 -arch arm64e \ + -isystem "$SDKROOT/usr/include" \ + -isystem ${lib.getLib llvmPackages.libclang}/lib/clang/*/include \ + "-L$SDKROOT/usr/lib" \ + -Wl,-install_name,$out/lib/$libName \ + -Wall -std=c99 -O3 -fPIC libredirect.c \ + -shared -o "$libName" + '' else if stdenv.hostPlatform.isDarwin then '' + $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ + -Wl,-install_name,$out/lib/$libName \ + -shared -o "$libName" + '' else '' + $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ + -shared -o "$libName" + ''} + + if [ -n "$doInstallCheck" ]; then + $CC -Wall -std=c99 \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "-D_GNU_SOURCE"} \ + -O3 test.c -o test + fi + + runHook postBuild + ''; + + # We want to retain debugging info to be able to use GDB on libredirect.so + # to more easily investigate which function overrides are missing or why + # existing ones do not have the intended effect. + dontStrip = true; + + installPhase = '' + runHook preInstall + + install -vD "$libName" "$out/lib/$libName" + + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + # dylib will be rejected unless dylib rpath gets explictly set + install_name_tool \ + -change $libName $out/lib/$libName \ + $out/lib/$libName + '' + '' + # Provide a setup hook that injects our library into every process. + mkdir -p "$hook/nix-support" + cat < "$hook/nix-support/setup-hook" + ${if stdenv.hostPlatform.isDarwin then '' + export DYLD_INSERT_LIBRARIES="$out/lib/$libName" + '' else '' + export LD_PRELOAD="$out/lib/$libName" + ''} + SETUP_HOOK + + runHook postInstall + ''; + + doInstallCheck = true; + + installCheckPhase = '' + ( + source "$hook/nix-support/setup-hook" + NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test + ) + ''; + + meta = with lib; { + platforms = platforms.unix; + description = "LD_PRELOAD library to intercept and rewrite the paths in glibc calls"; + longDescription = '' + libredirect is an LD_PRELOAD library to intercept and rewrite the paths in + glibc calls based on the value of $NIX_REDIRECTS, a colon-separated list + of path prefixes to be rewritten, e.g. "/src=/dst:/usr/=/nix/store/". + ''; + }; +} diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/by-name/li/libredirect/test.c similarity index 100% rename from pkgs/build-support/libredirect/test.c rename to pkgs/by-name/li/libredirect/test.c diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/by-name/li/libredwg/package.nix similarity index 100% rename from pkgs/development/libraries/libredwg/default.nix rename to pkgs/by-name/li/libredwg/package.nix diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/by-name/li/libreelec-dvb-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix rename to pkgs/by-name/li/libreelec-dvb-firmware/package.nix diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/by-name/li/librelp/package.nix similarity index 100% rename from pkgs/development/libraries/librelp/default.nix rename to pkgs/by-name/li/librelp/package.nix diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/by-name/li/librem/package.nix similarity index 100% rename from pkgs/development/libraries/librem/default.nix rename to pkgs/by-name/li/librem/package.nix diff --git a/pkgs/servers/monitoring/librenms/broken-binary-paths.diff b/pkgs/by-name/li/librenms/broken-binary-paths.diff similarity index 100% rename from pkgs/servers/monitoring/librenms/broken-binary-paths.diff rename to pkgs/by-name/li/librenms/broken-binary-paths.diff diff --git a/pkgs/servers/monitoring/librenms/default.nix b/pkgs/by-name/li/librenms/package.nix similarity index 100% rename from pkgs/servers/monitoring/librenms/default.nix rename to pkgs/by-name/li/librenms/package.nix diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/by-name/li/librespeed-cli/package.nix similarity index 100% rename from pkgs/tools/misc/librespeed-cli/default.nix rename to pkgs/by-name/li/librespeed-cli/package.nix diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/by-name/li/libreswan/package.nix similarity index 100% rename from pkgs/tools/networking/libreswan/default.nix rename to pkgs/by-name/li/libreswan/package.nix diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/by-name/li/librevenge/package.nix similarity index 100% rename from pkgs/development/libraries/librevenge/default.nix rename to pkgs/by-name/li/librevenge/package.nix diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/by-name/li/librime/package.nix similarity index 100% rename from pkgs/development/libraries/librime/default.nix rename to pkgs/by-name/li/librime/package.nix diff --git a/pkgs/development/libraries/librist/darwin.patch b/pkgs/by-name/li/librist/darwin.patch similarity index 100% rename from pkgs/development/libraries/librist/darwin.patch rename to pkgs/by-name/li/librist/darwin.patch diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/by-name/li/librist/package.nix similarity index 100% rename from pkgs/development/libraries/librist/default.nix rename to pkgs/by-name/li/librist/package.nix diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/by-name/li/libroxml/package.nix similarity index 100% rename from pkgs/development/libraries/libroxml/default.nix rename to pkgs/by-name/li/libroxml/package.nix diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/by-name/li/librseq/package.nix similarity index 100% rename from pkgs/development/libraries/librseq/default.nix rename to pkgs/by-name/li/librseq/package.nix diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/by-name/li/librsync/package.nix similarity index 100% rename from pkgs/development/libraries/librsync/default.nix rename to pkgs/by-name/li/librsync/package.nix diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/by-name/li/librtprocess/package.nix similarity index 100% rename from pkgs/development/libraries/librtprocess/default.nix rename to pkgs/by-name/li/librtprocess/package.nix diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/by-name/li/librttopo/package.nix similarity index 100% rename from pkgs/development/libraries/librttopo/default.nix rename to pkgs/by-name/li/librttopo/package.nix diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/by-name/li/libsass/package.nix similarity index 100% rename from pkgs/development/libraries/libsass/default.nix rename to pkgs/by-name/li/libsass/package.nix diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/by-name/li/libschrift/package.nix similarity index 100% rename from pkgs/development/libraries/libschrift/default.nix rename to pkgs/by-name/li/libschrift/package.nix diff --git a/pkgs/development/libraries/libsciter/default.nix b/pkgs/by-name/li/libsciter/package.nix similarity index 100% rename from pkgs/development/libraries/libsciter/default.nix rename to pkgs/by-name/li/libsciter/package.nix diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/by-name/li/libscrypt/package.nix similarity index 100% rename from pkgs/development/libraries/libscrypt/default.nix rename to pkgs/by-name/li/libscrypt/package.nix diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/by-name/li/libsearpc/package.nix similarity index 100% rename from pkgs/development/libraries/libsearpc/default.nix rename to pkgs/by-name/li/libsearpc/package.nix diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/by-name/li/libseccomp/package.nix similarity index 100% rename from pkgs/development/libraries/libseccomp/default.nix rename to pkgs/by-name/li/libseccomp/package.nix diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/by-name/li/libsecret/package.nix similarity index 100% rename from pkgs/development/libraries/libsecret/default.nix rename to pkgs/by-name/li/libsecret/package.nix diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/by-name/li/libsegfault/package.nix similarity index 100% rename from pkgs/development/libraries/libsegfault/default.nix rename to pkgs/by-name/li/libsegfault/package.nix diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/by-name/li/libselinux/package.nix similarity index 100% rename from pkgs/os-specific/linux/libselinux/default.nix rename to pkgs/by-name/li/libselinux/package.nix diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/by-name/li/libsepol/package.nix similarity index 100% rename from pkgs/os-specific/linux/libsepol/default.nix rename to pkgs/by-name/li/libsepol/package.nix diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/by-name/li/libserdes/package.nix similarity index 100% rename from pkgs/development/libraries/libserdes/default.nix rename to pkgs/by-name/li/libserdes/package.nix diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/by-name/li/libserialport/package.nix similarity index 100% rename from pkgs/development/libraries/libserialport/default.nix rename to pkgs/by-name/li/libserialport/package.nix diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix new file mode 100644 index 000000000000..2095b8a4efce --- /dev/null +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + testers, + validatePkgConfig, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libsfdo"; + version = "0.1.3"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "vyivel"; + repo = "libsfdo"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo="; + }; + + strictDeps = true; + doCheck = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + validatePkgConfig + ]; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + description = "Collection of libraries which implement some of the freedesktop.org specifications"; + homepage = "https://gitlab.freedesktop.org/vyivel/libsfdo"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.zi3m5f ]; + pkgConfigModules = [ + "libsfdo-basedir" + "libsfdo-desktop-file" + "libsfdo-desktop" + "libsfdo-icon" + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/by-name/li/libshout/package.nix similarity index 100% rename from pkgs/development/libraries/libshout/default.nix rename to pkgs/by-name/li/libshout/package.nix diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix new file mode 100644 index 000000000000..98a3ea533bef --- /dev/null +++ b/pkgs/by-name/li/libshumate/package.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchurl +, gi-docgen +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, gperf +, glib +, cairo +, sqlite +, libsoup_3 +, gtk4 +, libsysprof-capture +, json-glib +, protobufc +, xvfb-run +, gnome +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libshumate"; + version = "1.3.0"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app + + src = fetchurl { + url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; + hash = "sha256-giem6Cgc3hIjKJT++Ddg1E+maznvAzxh7ZNKhsbcddQ="; + }; + + depsBuildBuild = [ + # required to find native gi-docgen when cross compiling + pkg-config + ]; + + nativeBuildInputs = [ + gi-docgen + meson + ninja + pkg-config + vala + gobject-introspection + gperf + ]; + + buildInputs = [ + glib + cairo + sqlite + libsoup_3 + gtk4 + libsysprof-capture + json-glib + protobufc + ]; + + nativeCheckInputs = [ + xvfb-run + ]; + + mesonFlags = [ + "-Ddemos=true" + ]; + + doCheck = !stdenv.hostPlatform.isDarwin; + + checkPhase = '' + runHook preCheck + + env \ + HOME="$TMPDIR" \ + GTK_A11Y=none \ + xvfb-run meson test --print-errorlogs + + runHook postCheck + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libshumate-1.0 "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "libshumate"; + }; + }; + + meta = with lib; { + description = "GTK toolkit providing widgets for embedded maps"; + mainProgram = "shumate-demo"; + homepage = "https://gitlab.gnome.org/GNOME/libshumate"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix new file mode 100644 index 000000000000..0367e4e3e41a --- /dev/null +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -0,0 +1,113 @@ +{ + stdenv, + lib, + fetchFromGitHub, + makeFontsConf, + nix-update-script, + testers, + autoreconfHook, + docSupport ? true, + doxygen, + graphviz, + libexsid, + libgcrypt, + perl, + pkg-config, + unittest-cpp, + xa, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libsidplayfp"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "libsidplayfp"; + repo = "libsidplayfp"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-O6VzHjJT3k1uLI0bjBDRntLqAZdMurs8onLZ6L6NlIU="; + }; + + outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; + + postPatch = '' + patchShebangs . + ''; + + strictDeps = true; + + nativeBuildInputs = + [ + autoreconfHook + perl + pkg-config + xa + ] + ++ lib.optionals docSupport [ + doxygen + graphviz + ]; + + buildInputs = [ + libexsid + libgcrypt + ]; + + checkInputs = [ unittest-cpp ]; + + enableParallelBuilding = true; + + configureFlags = [ + (lib.strings.enableFeature true "hardsid") + (lib.strings.withFeature true "gcrypt") + (lib.strings.withFeature true "exsid") + (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") + ]; + + # Make Doxygen happy with the setup, reduce log noise + env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { + fontDirectories = [ ]; + }); + + preBuild = '' + # Reduce noise from fontconfig during doc building + export XDG_CACHE_HOME=$TMPDIR + ''; + + buildFlags = [ "all" ] ++ lib.optionals docSupport [ "doc" ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postInstall = lib.optionalString docSupport '' + mkdir -p $doc/share/doc/libsidplayfp + mv docs/html $doc/share/doc/libsidplayfp/ + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Library to play Commodore 64 music derived from libsidplay2"; + longDescription = '' + libsidplayfp is a C64 music player library which integrates + the reSID SID chip emulation into a cycle-based emulator + environment, constantly aiming to improve emulation of the + C64 system and the SID chips. + ''; + homepage = "https://github.com/libsidplayfp/libsidplayfp"; + changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ + ramkromberg + OPNA2608 + ]; + platforms = lib.platforms.all; + pkgConfigModules = [ + "libsidplayfp" + "libstilview" + ]; + }; +}) diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/by-name/li/libsieve/package.nix similarity index 100% rename from pkgs/development/libraries/libsieve/default.nix rename to pkgs/by-name/li/libsieve/package.nix diff --git a/pkgs/by-name/li/libsignal-ffi/Cargo.lock b/pkgs/by-name/li/libsignal-ffi/Cargo.lock index 83c23c72ac97..88baee16918a 100644 --- a/pkgs/by-name/li/libsignal-ffi/Cargo.lock +++ b/pkgs/by-name/li/libsignal-ffi/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" @@ -100,9 +100,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -115,33 +115,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "argon2" @@ -180,9 +180,9 @@ checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "asn1" @@ -201,18 +201,19 @@ checksum = "56e6076d38cc17cc22b0f65f31170a2ee1975e6b07f0012893aefd86ce19c987" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "assert_cmd" -version = "2.0.13" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", "bstr", "doc-comment", + "libc", "predicates", "predicates-core", "predicates-tree", @@ -240,13 +241,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -267,7 +268,7 @@ version = "0.1.0" dependencies = [ "asn1", "assert_matches", - "base64 0.21.7", + "base64 0.22.1", "bitflags", "blake2", "boring", @@ -306,17 +307,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -363,7 +364,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -445,9 +446,9 @@ dependencies = [ [[package]] name = "breakpad-symbols" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9898874a43aed8d3ee52d223ba232424e9da1f9af0e6a2cfa49b506b4ad99616" +checksum = "b37cb0d96cbe2c0cb6c4fc8856dc38b87d61abaa220c818f162bee332d3f4193" dependencies = [ "async-trait", "cachemap2", @@ -463,9 +464,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata 0.4.7", @@ -486,15 +487,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cachemap2" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bba2f68a9fefca870fed897de7c655f9d5c1eaf1cd9517db96c9a3861f648b" +checksum = "68ccbd3153aa153b2f5eff557537ffce81e4dd6c50ae0eddc41dc8d0c388436f" [[package]] name = "cast" @@ -513,12 +514,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -638,9 +640,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -657,33 +659,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmake" @@ -696,9 +698,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" @@ -750,15 +752,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -883,7 +885,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551 dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -906,7 +908,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -963,7 +965,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1007,7 +1009,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1071,7 +1073,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1088,9 +1090,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clonable" @@ -1160,14 +1162,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1181,9 +1183,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1191,9 +1193,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1220,9 +1222,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fiat-crypto" @@ -1238,9 +1240,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -1270,7 +1272,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1360,7 +1362,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1427,9 +1429,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1449,7 +1451,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap", "slab", "tokio", "tokio-util", @@ -1458,9 +1460,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1468,7 +1470,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap", "slab", "tokio", "tokio-util", @@ -1485,12 +1487,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.5" @@ -1518,7 +1514,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1558,12 +1554,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" @@ -1576,6 +1566,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" @@ -1749,7 +1745,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "pin-project-lite", @@ -1760,9 +1756,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-util", @@ -1824,22 +1820,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1854,26 +1840,26 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1946,9 +1932,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1978,9 +1964,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libcrux-intrinsics" @@ -2044,7 +2030,7 @@ dependencies = [ "aes-gcm-siv", "assert_matches", "attest", - "base64 0.21.7", + "base64 0.22.1", "bincode", "device-transfer", "futures-util", @@ -2085,10 +2071,10 @@ dependencies = [ name = "libsignal-bridge-macros" version = "0.1.0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "syn-mid", ] @@ -2102,6 +2088,7 @@ dependencies = [ "jni 0.21.1", "libsignal-bridge-macros", "libsignal-bridge-types", + "libsignal-core", "libsignal-message-backup", "libsignal-net", "libsignal-protocol", @@ -2168,6 +2155,7 @@ dependencies = [ name = "libsignal-core" version = "0.1.0" dependencies = [ + "assert_matches", "hex-literal", "num_enum", "proptest", @@ -2177,7 +2165,7 @@ dependencies = [ [[package]] name = "libsignal-ffi" -version = "0.57.1" +version = "0.58.3" dependencies = [ "cpufeatures", "futures-util", @@ -2192,7 +2180,7 @@ dependencies = [ [[package]] name = "libsignal-jni" -version = "0.57.1" +version = "0.58.3" dependencies = [ "cfg-if", "cpufeatures", @@ -2208,7 +2196,7 @@ dependencies = [ [[package]] name = "libsignal-jni-testing" -version = "0.57.1" +version = "0.58.3" dependencies = [ "jni 0.21.1", "libsignal-bridge-testing", @@ -2292,10 +2280,10 @@ dependencies = [ name = "libsignal-message-backup-macros" version = "0.1.0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "test-case", ] @@ -2306,10 +2294,8 @@ dependencies = [ "assert_matches", "async-trait", "attest", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bitstream-io", - "boring", "bytes", "clap", "colored", @@ -2321,16 +2307,11 @@ dependencies = [ "futures-util", "hex", "hex-literal", - "hickory-proto", "hmac", "http 1.1.0", - "http-body-util", - "hyper 1.4.1", - "hyper-util", - "indexmap 2.2.6", "itertools 0.13.0", - "lazy_static", "libsignal-core", + "libsignal-net-infra", "libsignal-protocol", "libsignal-svr3", "log", @@ -2342,19 +2323,63 @@ dependencies = [ "prost-build", "rand", "rand_core", - "rcgen", - "rustls 0.23.12", - "rustls-platform-verifier", "serde", "serde_json", "sha2", "snow", - "socks5-server", - "static_assertions", "strum", "test-case", "test-log", "thiserror", + "tokio", + "tokio-boring", + "tokio-stream", + "tokio-tungstenite 0.23.1", + "tungstenite 0.23.0", + "url", + "uuid", + "warp", + "zerocopy", +] + +[[package]] +name = "libsignal-net-infra" +version = "0.1.0" +dependencies = [ + "assert_matches", + "async-trait", + "attest", + "base64 0.22.1", + "bitstream-io", + "boring", + "bytes", + "const-str", + "derive-where", + "displaydoc", + "either", + "env_logger", + "futures-util", + "hickory-proto", + "http 1.1.0", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "indexmap", + "itertools 0.13.0", + "lazy_static", + "log", + "nonzero_ext", + "pin-project", + "pretty_assertions", + "prost", + "rcgen", + "rustls 0.23.13", + "rustls-platform-verifier", + "snow", + "socks5-server", + "strum", + "test-case", + "thiserror", "tls-parser", "tokio", "tokio-boring", @@ -2364,14 +2389,12 @@ dependencies = [ "tokio-util", "tungstenite 0.23.0", "url", - "uuid", "warp", - "zerocopy", ] [[package]] name = "libsignal-node" -version = "0.57.1" +version = "0.58.3" dependencies = [ "cmake", "futures", @@ -2393,6 +2416,7 @@ dependencies = [ "aes", "aes-gcm-siv", "arrayref", + "assert_matches", "async-trait", "clap", "criterion", @@ -2406,7 +2430,7 @@ dependencies = [ "hex-literal", "hkdf", "hmac", - "indexmap 2.2.6", + "indexmap", "itertools 0.13.0", "libsignal-core", "log", @@ -2455,22 +2479,22 @@ dependencies = [ [[package]] name = "linkme" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5" +checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda" +checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2540,9 +2564,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2565,9 +2589,9 @@ dependencies = [ [[package]] name = "minidump" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626b6878ac52f6a1e04c9e7eb42ce577dfadf7316b8d3fa5ab1c1abefc2c156b" +checksum = "8d385b740c6b991e6eff48f26e2c6978c9e9e9e2e935f4967bcdf4c2d1d18828" dependencies = [ "debugid", "encoding_rs", @@ -2585,9 +2609,9 @@ dependencies = [ [[package]] name = "minidump-common" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b1a2187f9aea1134ed3cf96b3827283aabc67dc95ed502e7072b515a1c770c" +checksum = "5c4d14bcca0fd3ed165a03000480aaa364c6860c34e900cb2dafdf3b95340e77" dependencies = [ "bitflags", "debugid", @@ -2600,9 +2624,9 @@ dependencies = [ [[package]] name = "minidump-processor" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb61b2d7298004e47225563c0ede9a3ee2889351e1c931bbc42996411a9e4bc4" +checksum = "7869a9256743611832cdf02d01ee5e2d67055a47727b21a01d47a79839876ca4" dependencies = [ "async-trait", "breakpad-symbols", @@ -2620,9 +2644,9 @@ dependencies = [ [[package]] name = "minidump-unwind" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1951b9dfa82b5e0d22a8e08bebcb8d98f85bb07851a52f18246b7d7dc9a4a53c" +checksum = "1f4fb17e3a2508326b9547166051a979d439d883bcd1058b48a2d1181a0b37cf" dependencies = [ "async-trait", "breakpad-symbols", @@ -2640,20 +2664,20 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -2736,7 +2760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.77", "syn-mid", ] @@ -2812,7 +2836,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2845,30 +2869,30 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "object" -version = "0.36.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2920,7 +2944,7 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2964,9 +2988,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -2975,9 +2999,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" dependencies = [ "pest", "pest_generator", @@ -2985,22 +3009,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" dependencies = [ "once_cell", "pest", @@ -3014,7 +3038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap", ] [[package]] @@ -3072,7 +3096,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3099,9 +3123,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits 0.2.19", "plotters-backend", @@ -3112,15 +3136,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] @@ -3168,9 +3192,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pqcrypto-internals" @@ -3218,9 +3245,9 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "predicates" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "difflib", @@ -3229,15 +3256,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", @@ -3255,19 +3282,19 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ "toml_edit", ] @@ -3312,7 +3339,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ "bitflags", - "chrono", "hex", ] @@ -3347,9 +3373,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" dependencies = [ "bytes", "prost-derive", @@ -3357,12 +3383,12 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" +checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", - "heck 0.5.0", + "heck", "itertools 0.13.0", "log", "multimap", @@ -3372,37 +3398,37 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.72", + "syn 2.0.77", "tempfile", ] [[package]] name = "prost-derive" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "prost-types" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519" dependencies = [ "prost", ] [[package]] name = "protobuf" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" +checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" dependencies = [ "once_cell", "protobuf-support", @@ -3411,9 +3437,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77" +checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" dependencies = [ "anyhow", "once_cell", @@ -3426,9 +3452,9 @@ dependencies = [ [[package]] name = "protobuf-json-mapping" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8440284a60d89deae81f67cc713f03f770ae51461e7613e44808910502693e" +checksum = "b07993d14c66dfb74c639dc1b90381773b85cff66ef47bff35bad0778150a3aa" dependencies = [ "protobuf", "protobuf-support", @@ -3437,12 +3463,12 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642" +checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" dependencies = [ "anyhow", - "indexmap 1.9.3", + "indexmap", "log", "protobuf", "protobuf-support", @@ -3453,9 +3479,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" +checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" dependencies = [ "thiserror", ] @@ -3468,9 +3494,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3558,9 +3584,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3629,9 +3655,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -3647,9 +3673,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags", "errno", @@ -3674,9 +3700,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", @@ -3688,9 +3714,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3701,9 +3727,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3711,22 +3737,22 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-platform-verifier" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ "core-foundation", "core-foundation-sys", "jni 0.19.0", "log", "once_cell", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", @@ -3738,15 +3764,15 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3788,11 +3814,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3824,7 +3850,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3865,32 +3891,33 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.2.6", + "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -4011,6 +4038,8 @@ dependencies = [ "hex-literal", "hkdf", "hmac", + "proptest", + "rand", "rand_core", "sha2", "static_assertions", @@ -4055,7 +4084,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4135,6 +4164,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.26.3" @@ -4150,11 +4185,11 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4176,9 +4211,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -4193,19 +4228,20 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4232,7 +4268,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4243,7 +4279,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "test-case-core", ] @@ -4266,7 +4302,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4295,7 +4331,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4380,9 +4416,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.1" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -4413,7 +4449,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4441,9 +4477,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -4476,9 +4512,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4489,26 +4525,26 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap", "toml_datetime", "winnow", ] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4530,7 +4566,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4650,9 +4686,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -4744,9 +4780,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[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 = "wait-timeout" @@ -4815,34 +4851,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4850,28 +4887,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4879,9 +4916,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -4935,11 +4972,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4984,6 +5021,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -5164,9 +5210,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5216,7 +5262,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -5236,7 +5282,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -5266,7 +5312,7 @@ name = "zkgroup" version = "0.9.0" dependencies = [ "aes-gcm-siv", - "base64 0.21.7", + "base64 0.22.1", "bincode", "criterion", "curve25519-dalek", diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index bee05e01bfb5..067c207a9311 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.57.1"; + version = "0.58.3"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; rev = "v${version}"; - hash = "sha256-13XhblN82lbIdv9RVjrabQfCgW1hEG1B6pp3/nQcVgY="; + hash = "sha256-21NOPLhI7xh2A8idLxWXiZLV5l8+vfHF8/DilgWTXi4="; }; buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/by-name/li/libsignal-protocol-c/package.nix similarity index 100% rename from pkgs/development/libraries/libsignal-protocol-c/default.nix rename to pkgs/by-name/li/libsignal-protocol-c/package.nix diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/by-name/li/libsignon-glib/package.nix similarity index 100% rename from pkgs/development/libraries/libsignon-glib/default.nix rename to pkgs/by-name/li/libsignon-glib/package.nix diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/by-name/li/libsigrokdecode/package.nix similarity index 100% rename from pkgs/development/tools/libsigrokdecode/default.nix rename to pkgs/by-name/li/libsigrokdecode/package.nix diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/by-name/li/libsigsegv/package.nix similarity index 100% rename from pkgs/development/libraries/libsigsegv/default.nix rename to pkgs/by-name/li/libsigsegv/package.nix diff --git a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/pkgs/by-name/li/libsigsegv/sigbus_fix.patch similarity index 100% rename from pkgs/development/libraries/libsigsegv/sigbus_fix.patch rename to pkgs/by-name/li/libsigsegv/sigbus_fix.patch diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/by-name/li/libsixel/package.nix similarity index 100% rename from pkgs/development/libraries/libsixel/default.nix rename to pkgs/by-name/li/libsixel/package.nix diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/by-name/li/libskk/package.nix similarity index 100% rename from pkgs/development/libraries/libskk/default.nix rename to pkgs/by-name/li/libskk/package.nix diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/by-name/li/libslirp/package.nix similarity index 100% rename from pkgs/development/libraries/libslirp/default.nix rename to pkgs/by-name/li/libslirp/package.nix diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/by-name/li/libsmartcols/package.nix similarity index 100% rename from pkgs/development/libraries/libsmartcols/default.nix rename to pkgs/by-name/li/libsmartcols/package.nix diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/by-name/li/libsmbios/package.nix similarity index 100% rename from pkgs/os-specific/linux/libsmbios/default.nix rename to pkgs/by-name/li/libsmbios/package.nix diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/by-name/li/libsmf/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libsmf/default.nix rename to pkgs/by-name/li/libsmf/package.nix diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/by-name/li/libsmi/package.nix similarity index 100% rename from pkgs/development/libraries/libsmi/default.nix rename to pkgs/by-name/li/libsmi/package.nix diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix new file mode 100644 index 000000000000..199ab79c169b --- /dev/null +++ b/pkgs/by-name/li/libsnark/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + openssl, + boost, + gmp, + withProcps ? false, + procps, +}: + +stdenv.mkDerivation { + pname = "libsnark"; + version = "20140603-unstable-2024-02-23"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + openssl + boost + gmp + ] ++ lib.optional withProcps procps; + + cmakeFlags = + lib.optionals (!withProcps) [ "-DWITH_PROCPS=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ + "-DWITH_SUPERCOP=OFF" + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; + + src = fetchFromGitHub { + owner = "scipr-lab"; + repo = "libsnark"; + rev = "6c705e3135f585c222813654caedc86520fda1f6"; + hash = "sha256-5Gk24fwVaXBWEFmhTsN9Qm8x/Qpr1KjavI3staJidxQ="; + fetchSubmodules = true; + }; + + meta = { + broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it. + description = "C++ library for zkSNARKs"; + homepage = "https://github.com/scipr-lab/libsnark"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/by-name/li/libsodium/package.nix similarity index 100% rename from pkgs/development/libraries/libsodium/default.nix rename to pkgs/by-name/li/libsodium/package.nix diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/by-name/li/libsolv/package.nix similarity index 100% rename from pkgs/development/libraries/libsolv/default.nix rename to pkgs/by-name/li/libsolv/package.nix diff --git a/pkgs/development/libraries/libspatialaudio/default.nix b/pkgs/by-name/li/libspatialaudio/package.nix similarity index 100% rename from pkgs/development/libraries/libspatialaudio/default.nix rename to pkgs/by-name/li/libspatialaudio/package.nix diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/by-name/li/libspatialite/package.nix similarity index 100% rename from pkgs/development/libraries/libspatialite/default.nix rename to pkgs/by-name/li/libspatialite/package.nix diff --git a/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch b/pkgs/by-name/li/libspatialite/xmlNanoHTTPCleanup.patch similarity index 100% rename from pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch rename to pkgs/by-name/li/libspatialite/xmlNanoHTTPCleanup.patch diff --git a/pkgs/development/libraries/audio/libspecbleach/default.nix b/pkgs/by-name/li/libspecbleach/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libspecbleach/default.nix rename to pkgs/by-name/li/libspecbleach/package.nix diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/by-name/li/libspectre/package.nix similarity index 100% rename from pkgs/development/libraries/libspectre/default.nix rename to pkgs/by-name/li/libspectre/package.nix diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/by-name/li/libspectrum/package.nix similarity index 100% rename from pkgs/development/libraries/libspectrum/default.nix rename to pkgs/by-name/li/libspectrum/package.nix diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix new file mode 100644 index 000000000000..8aec418da377 --- /dev/null +++ b/pkgs/by-name/li/libspelling/package.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, glib +, gtk4 +, gtksourceview5 +, enchant +, icu +, libsysprof-capture +, gnome +}: + +stdenv.mkDerivation rec { + pname = "libspelling"; + version = "0.4.4"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libspelling"; + rev = version; + hash = "sha256-6ggegeDR4UBP2LKn6lj0pOB1Iz7MwLEf9usIB28SEMA="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + buildInputs = [ + glib + gtk4 + gtksourceview5 + enchant + icu + libsysprof-capture + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru.updateScript = gnome.updateScript { + packageName = "libspelling"; + }; + + meta = with lib; { + description = "Spellcheck library for GTK 4"; + homepage = "https://gitlab.gnome.org/GNOME/libspelling"; + license = licenses.lgpl21Plus; + changelog = "https://gitlab.gnome.org/GNOME/libspelling/-/raw/${version}/NEWS"; + maintainers = with maintainers; [ chuangzhu ] ++ teams.gnome.members; + }; +} diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix new file mode 100644 index 000000000000..9e64441af558 --- /dev/null +++ b/pkgs/by-name/li/libspf2/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "libspf2"; + version = "2.2.13"; + + src = fetchFromGitHub { + owner = "helsinki-systems"; + repo = "libspf2"; + rev = "v${version}"; + hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; + + postPatch = '' + # disable static bins compilation + sed -i \ + -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ + -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ + -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ + -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am + ''; + + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; + + doCheck = true; + + meta = with lib; { + description = "Implementation of the Sender Policy Framework for SMTP " + + "authorization (Helsinki Systems fork)"; + homepage = "https://github.com/helsinki-systems/libspf2"; + license = with licenses; [ lgpl21Plus bsd2 ]; + maintainers = with maintainers; [ pacien ] ++ teams.helsinki-systems.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/by-name/li/libspiro/package.nix similarity index 100% rename from pkgs/development/libraries/libspiro/default.nix rename to pkgs/by-name/li/libspiro/package.nix diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix new file mode 100644 index 000000000000..92d3baa5541c --- /dev/null +++ b/pkgs/by-name/li/libspnav/package.nix @@ -0,0 +1,41 @@ +{ + stdenv, + lib, + fetchFromGitHub, + libX11, + fixDarwinDylibNames, +}: + +stdenv.mkDerivation rec { + pname = "libspnav"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "FreeSpacenav"; + repo = "libspnav"; + rev = "refs/tags/v${version}"; + hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ="; + }; + + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ libX11 ]; + + configureFlags = [ "--disable-debug" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + preInstall = '' + mkdir -p $out/{lib,include} + ''; + + meta = with lib; { + homepage = "https://spacenav.sourceforge.net/"; + description = "Device driver and SDK for 3Dconnexion 3D input devices"; + longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/by-name/li/libspng/package.nix similarity index 100% rename from pkgs/development/libraries/libspng/default.nix rename to pkgs/by-name/li/libspng/package.nix diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/by-name/li/libsrs2/package.nix similarity index 100% rename from pkgs/development/libraries/libsrs2/default.nix rename to pkgs/by-name/li/libsrs2/package.nix diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/by-name/li/libssh/package.nix similarity index 100% rename from pkgs/development/libraries/libssh/default.nix rename to pkgs/by-name/li/libssh/package.nix diff --git a/pkgs/development/libraries/libssh2/CVE-2023-48795.patch b/pkgs/by-name/li/libssh2/CVE-2023-48795.patch similarity index 100% rename from pkgs/development/libraries/libssh2/CVE-2023-48795.patch rename to pkgs/by-name/li/libssh2/CVE-2023-48795.patch diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/by-name/li/libssh2/package.nix similarity index 100% rename from pkgs/development/libraries/libssh2/default.nix rename to pkgs/by-name/li/libssh2/package.nix diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/by-name/li/libstartup_notification/package.nix similarity index 100% rename from pkgs/development/libraries/startup-notification/default.nix rename to pkgs/by-name/li/libstartup_notification/package.nix diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/by-name/li/libstemmer/package.nix similarity index 100% rename from pkgs/development/libraries/libstemmer/default.nix rename to pkgs/by-name/li/libstemmer/package.nix diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/by-name/li/libstroke/package.nix similarity index 100% rename from pkgs/development/libraries/libstroke/default.nix rename to pkgs/by-name/li/libstroke/package.nix diff --git a/pkgs/by-name/li/libsurvive/package.nix b/pkgs/by-name/li/libsurvive/package.nix new file mode 100644 index 000000000000..4e5418de689a --- /dev/null +++ b/pkgs/by-name/li/libsurvive/package.nix @@ -0,0 +1,51 @@ +{ lib, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libglut +, lapack +, libusb1 +, blas +, zlib +, eigen +}: + +stdenv.mkDerivation rec { + pname = "libsurvive"; + version = "1.01"; + + src = fetchFromGitHub { + owner = "cntools"; + repo = pname; + rev = "v${version}"; + # Fixes 'Unknown CMake command "cnkalman_generate_code"' + fetchSubmodules = true; + hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libglut + lapack + libusb1 + blas + zlib + eigen + ]; + + # https://github.com/cntools/libsurvive/issues/272 + postPatch = '' + substituteInPlace survive.pc.in \ + libs/cnkalman/cnkalman.pc.in libs/cnkalman/libs/cnmatrix/cnmatrix.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + + meta = with lib; { + description = "Open Source Lighthouse Tracking System"; + homepage = "https://github.com/cntools/libsurvive"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/by-name/li/libsv/package.nix similarity index 100% rename from pkgs/development/libraries/libsv/default.nix rename to pkgs/by-name/li/libsv/package.nix diff --git a/pkgs/development/libraries/libsvm/openmp.patch b/pkgs/by-name/li/libsvm/openmp.patch similarity index 100% rename from pkgs/development/libraries/libsvm/openmp.patch rename to pkgs/by-name/li/libsvm/openmp.patch diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/by-name/li/libsvm/package.nix similarity index 100% rename from pkgs/development/libraries/libsvm/default.nix rename to pkgs/by-name/li/libsvm/package.nix diff --git a/pkgs/by-name/li/libsystemtap/package.nix b/pkgs/by-name/li/libsystemtap/package.nix new file mode 100644 index 000000000000..c227f689074b --- /dev/null +++ b/pkgs/by-name/li/libsystemtap/package.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchgit +, gettext +, python3 +, elfutils +}: + +stdenv.mkDerivation { + pname = "libsystemtap"; + version = "5.1"; + + src = fetchgit { + url = "git://sourceware.org/git/systemtap.git"; + rev = "release-5.1"; + hash = "sha256-3rhDllsgYGfh1gb5frUrlkzdz57A6lcvBELtgvb5Q7M="; + }; + + dontBuild = true; + + nativeBuildInputs = [ + gettext + python3 + ]; + + buildInputs = [ elfutils ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -r includes/* $out/include/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Statically defined probes development files"; + homepage = "https://sourceware.org/systemtap/"; + license = licenses.bsd3; + platforms = elfutils.meta.platforms or platforms.unix; + badPlatforms = elfutils.meta.badPlatforms or [ ]; + maintainers = [ lib.maintainers.farlion ]; + }; +} diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/by-name/li/libtar/package.nix similarity index 100% rename from pkgs/development/libraries/libtar/default.nix rename to pkgs/by-name/li/libtar/package.nix diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/by-name/li/libtasn1/package.nix similarity index 100% rename from pkgs/development/libraries/libtasn1/default.nix rename to pkgs/by-name/li/libtasn1/package.nix diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/by-name/li/libtelnet/package.nix similarity index 100% rename from pkgs/development/libraries/libtelnet/default.nix rename to pkgs/by-name/li/libtelnet/package.nix diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/by-name/li/libtermkey/package.nix similarity index 100% rename from pkgs/development/libraries/libtermkey/default.nix rename to pkgs/by-name/li/libtermkey/package.nix diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/by-name/li/libthai/package.nix similarity index 100% rename from pkgs/development/libraries/libthai/default.nix rename to pkgs/by-name/li/libthai/package.nix diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/by-name/li/libthreadar/package.nix similarity index 100% rename from pkgs/development/libraries/libthreadar/default.nix rename to pkgs/by-name/li/libthreadar/package.nix diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/by-name/li/libticables2/package.nix similarity index 100% rename from pkgs/development/libraries/libticables2/default.nix rename to pkgs/by-name/li/libticables2/package.nix diff --git a/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch b/pkgs/by-name/li/libtickit/001-skip-test-18term-builder-on-macos.patch similarity index 100% rename from pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch rename to pkgs/by-name/li/libtickit/001-skip-test-18term-builder-on-macos.patch diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/by-name/li/libtickit/package.nix similarity index 100% rename from pkgs/development/libraries/libtickit/default.nix rename to pkgs/by-name/li/libtickit/package.nix diff --git a/pkgs/by-name/li/libticonv/package.nix b/pkgs/by-name/li/libticonv/package.nix new file mode 100644 index 000000000000..9bc5528257f8 --- /dev/null +++ b/pkgs/by-name/li/libticonv/package.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "libticonv"; + version = "1.1.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + ]; + + configureFlags = [ + "--enable-iconv" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-liconv"; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 6622acf533a3..7ad8f84fc2a1 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -84,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1 - # - except that we have many x86_64-linux binaries depending on this already - enableParallelChecking = stdenv.system == "x86_64-linux"; + enableParallelChecking = false; passthru = { tests = { diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/by-name/li/libtifiles2/package.nix similarity index 100% rename from pkgs/development/libraries/libtifiles2/default.nix rename to pkgs/by-name/li/libtifiles2/package.nix diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/by-name/li/libtiger/package.nix similarity index 100% rename from pkgs/development/libraries/libtiger/default.nix rename to pkgs/by-name/li/libtiger/package.nix diff --git a/pkgs/development/libraries/libtiger/pkg-config.patch b/pkgs/by-name/li/libtiger/pkg-config.patch similarity index 100% rename from pkgs/development/libraries/libtiger/pkg-config.patch rename to pkgs/by-name/li/libtiger/pkg-config.patch diff --git a/pkgs/by-name/li/libtinfo/package.nix b/pkgs/by-name/li/libtinfo/package.nix new file mode 100644 index 000000000000..fa4652da0ab6 --- /dev/null +++ b/pkgs/by-name/li/libtinfo/package.nix @@ -0,0 +1,8 @@ +{ + ncurses, +}: + +ncurses.override { + unicodeSupport = false; + withTermlib = true; +} diff --git a/pkgs/development/libraries/libtins/0001-force-cpp-14.patch b/pkgs/by-name/li/libtins/0001-force-cpp-14.patch similarity index 100% rename from pkgs/development/libraries/libtins/0001-force-cpp-14.patch rename to pkgs/by-name/li/libtins/0001-force-cpp-14.patch diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/by-name/li/libtins/package.nix similarity index 100% rename from pkgs/development/libraries/libtins/default.nix rename to pkgs/by-name/li/libtins/package.nix diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/by-name/li/libtirpc/package.nix similarity index 100% rename from pkgs/development/libraries/ti-rpc/default.nix rename to pkgs/by-name/li/libtirpc/package.nix diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/by-name/li/libtomcrypt/package.nix similarity index 100% rename from pkgs/development/libraries/libtomcrypt/default.nix rename to pkgs/by-name/li/libtomcrypt/package.nix diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/by-name/li/libtommath/package.nix similarity index 100% rename from pkgs/development/libraries/libtommath/default.nix rename to pkgs/by-name/li/libtommath/package.nix diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/by-name/li/libtpms/package.nix similarity index 100% rename from pkgs/tools/security/libtpms/default.nix rename to pkgs/by-name/li/libtpms/package.nix diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/by-name/li/libtraceevent/package.nix similarity index 100% rename from pkgs/os-specific/linux/libtraceevent/default.nix rename to pkgs/by-name/li/libtraceevent/package.nix diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/by-name/li/libtracefs/package.nix similarity index 100% rename from pkgs/os-specific/linux/libtracefs/default.nix rename to pkgs/by-name/li/libtracefs/package.nix diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/by-name/li/libtree/package.nix similarity index 100% rename from pkgs/development/tools/misc/libtree/default.nix rename to pkgs/by-name/li/libtree/package.nix diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/by-name/li/libtsm/package.nix similarity index 100% rename from pkgs/development/libraries/libtsm/default.nix rename to pkgs/by-name/li/libtsm/package.nix diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/by-name/li/libu2f-host/package.nix similarity index 100% rename from pkgs/development/libraries/libu2f-host/default.nix rename to pkgs/by-name/li/libu2f-host/package.nix diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/by-name/li/libu2f-server/package.nix similarity index 100% rename from pkgs/development/libraries/libu2f-server/default.nix rename to pkgs/by-name/li/libu2f-server/package.nix diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/by-name/li/libuchardet/package.nix similarity index 100% rename from pkgs/development/libraries/libuchardet/default.nix rename to pkgs/by-name/li/libuchardet/package.nix diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/by-name/li/libucl/package.nix similarity index 100% rename from pkgs/development/libraries/libucl/default.nix rename to pkgs/by-name/li/libucl/package.nix diff --git a/pkgs/development/libraries/libucontext/default.nix b/pkgs/by-name/li/libucontext/package.nix similarity index 100% rename from pkgs/development/libraries/libucontext/default.nix rename to pkgs/by-name/li/libucontext/package.nix diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/by-name/li/libudev-zero/package.nix similarity index 100% rename from pkgs/development/libraries/libudev-zero/default.nix rename to pkgs/by-name/li/libudev-zero/package.nix diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/by-name/li/libudev0-shim/package.nix similarity index 100% rename from pkgs/os-specific/linux/libudev0-shim/default.nix rename to pkgs/by-name/li/libudev0-shim/package.nix diff --git a/pkgs/development/libraries/libudfread/default.nix b/pkgs/by-name/li/libudfread/package.nix similarity index 100% rename from pkgs/development/libraries/libudfread/default.nix rename to pkgs/by-name/li/libudfread/package.nix diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/by-name/li/libuecc/package.nix similarity index 100% rename from pkgs/development/libraries/libuecc/default.nix rename to pkgs/by-name/li/libuecc/package.nix diff --git a/pkgs/development/libraries/libuev/default.nix b/pkgs/by-name/li/libuev/package.nix similarity index 100% rename from pkgs/development/libraries/libuev/default.nix rename to pkgs/by-name/li/libuev/package.nix diff --git a/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch similarity index 100% rename from pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch rename to pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/by-name/li/libuinputplus/package.nix similarity index 100% rename from pkgs/development/libraries/libuinputplus/default.nix rename to pkgs/by-name/li/libuinputplus/package.nix diff --git a/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/pkgs/by-name/li/libuldaq/0001-uldaq.patch similarity index 100% rename from pkgs/development/libraries/libuldaq/0001-uldaq.patch rename to pkgs/by-name/li/libuldaq/0001-uldaq.patch diff --git a/pkgs/development/libraries/libuldaq/default.nix b/pkgs/by-name/li/libuldaq/package.nix similarity index 100% rename from pkgs/development/libraries/libuldaq/default.nix rename to pkgs/by-name/li/libuldaq/package.nix diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/by-name/li/libunarr/package.nix similarity index 100% rename from pkgs/development/libraries/libunarr/default.nix rename to pkgs/by-name/li/libunarr/package.nix diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/by-name/li/libunibreak/package.nix similarity index 100% rename from pkgs/development/libraries/libunibreak/default.nix rename to pkgs/by-name/li/libunibreak/package.nix diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/by-name/li/libuninameslist/package.nix similarity index 100% rename from pkgs/development/libraries/libuninameslist/default.nix rename to pkgs/by-name/li/libuninameslist/package.nix diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/by-name/li/libunity/fix-vala.patch similarity index 100% rename from pkgs/development/libraries/libunity/fix-vala.patch rename to pkgs/by-name/li/libunity/fix-vala.patch diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/by-name/li/libunity/package.nix similarity index 100% rename from pkgs/development/libraries/libunity/default.nix rename to pkgs/by-name/li/libunity/package.nix diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/by-name/li/libupnp/package.nix similarity index 100% rename from pkgs/development/libraries/pupnp/default.nix rename to pkgs/by-name/li/libupnp/package.nix diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/by-name/li/liburcu/package.nix similarity index 100% rename from pkgs/development/libraries/liburcu/default.nix rename to pkgs/by-name/li/liburcu/package.nix diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/by-name/li/liburing/package.nix similarity index 100% rename from pkgs/development/libraries/liburing/default.nix rename to pkgs/by-name/li/liburing/package.nix diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/by-name/li/libusbgx/package.nix similarity index 100% rename from pkgs/development/libraries/libusbgx/default.nix rename to pkgs/by-name/li/libusbgx/package.nix diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/by-name/li/libusbsio/package.nix similarity index 100% rename from pkgs/development/libraries/libusbsio/default.nix rename to pkgs/by-name/li/libusbsio/package.nix diff --git a/pkgs/development/libraries/libutempter/exec_path.patch b/pkgs/by-name/li/libutempter/exec_path.patch similarity index 100% rename from pkgs/development/libraries/libutempter/exec_path.patch rename to pkgs/by-name/li/libutempter/exec_path.patch diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/by-name/li/libutempter/package.nix similarity index 100% rename from pkgs/development/libraries/libutempter/default.nix rename to pkgs/by-name/li/libutempter/package.nix diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/by-name/li/libuvc/package.nix similarity index 100% rename from pkgs/development/libraries/libuvc/default.nix rename to pkgs/by-name/li/libuvc/package.nix diff --git a/pkgs/development/libraries/libva-vdpau-driver/default.nix b/pkgs/by-name/li/libva-vdpau-driver/package.nix similarity index 100% rename from pkgs/development/libraries/libva-vdpau-driver/default.nix rename to pkgs/by-name/li/libva-vdpau-driver/package.nix diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/by-name/li/libvarlink/package.nix similarity index 100% rename from pkgs/development/libraries/libvarlink/default.nix rename to pkgs/by-name/li/libvarlink/package.nix diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix similarity index 100% rename from pkgs/development/libraries/libvdpau-va-gl/default.nix rename to pkgs/by-name/li/libvdpau-va-gl/package.nix diff --git a/pkgs/development/libraries/libvdpau/installdir.patch b/pkgs/by-name/li/libvdpau/installdir.patch similarity index 100% rename from pkgs/development/libraries/libvdpau/installdir.patch rename to pkgs/by-name/li/libvdpau/installdir.patch diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/by-name/li/libvdpau/package.nix similarity index 100% rename from pkgs/development/libraries/libvdpau/default.nix rename to pkgs/by-name/li/libvdpau/package.nix diff --git a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/pkgs/by-name/li/libvdwxc/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/libvdwxc/default.nix rename to pkgs/by-name/li/libvdwxc/package.nix diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/by-name/li/libversion/package.nix similarity index 100% rename from pkgs/development/libraries/libversion/default.nix rename to pkgs/by-name/li/libversion/package.nix diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/by-name/li/libviper/package.nix similarity index 100% rename from pkgs/development/libraries/libviper/default.nix rename to pkgs/by-name/li/libviper/package.nix diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/by-name/li/libviperfx/package.nix similarity index 100% rename from pkgs/development/libraries/libviperfx/default.nix rename to pkgs/by-name/li/libviperfx/package.nix diff --git a/pkgs/by-name/li/libvirt-glib/package.nix b/pkgs/by-name/li/libvirt-glib/package.nix new file mode 100644 index 000000000000..472812e27d9e --- /dev/null +++ b/pkgs/by-name/li/libvirt-glib/package.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, gettext +, vala +, libcap_ng +, libvirt +, libxml2 +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, gobject-introspection +, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform +, gtk-doc +, docbook-xsl-nons +}: + +stdenv.mkDerivation rec { + pname = "libvirt-glib"; + version = "5.0.0"; + + outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; + + src = fetchurl { + url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; + sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s="; + }; + + patches = [ + (fetchpatch { + name = "relax-max-stack-size-limit.patch"; + url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/062f21ccaa810087637ae24e0eb69f1a0f0a45f5.patch"; + hash = "sha256-6mvINDd1HYS7oZsyNiyEwdNJfK5I5nPx86TRMq2RevA="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + vala + gobject-introspection + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withDocs [ + gtk-doc + docbook-xsl-nons + ]; + + buildInputs = [ + libvirt + libxml2 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap_ng + ]; + + strictDeps = true; + + # The build system won't let us build with docs or introspection + # unless we're building natively, but will still do a mandatory + # check for the dependencies for those things unless we explicitly + # disable the options. + mesonFlags = [ + (lib.mesonEnable "docs" withDocs) + (lib.mesonEnable "introspection" withIntrospection) + ]; + + meta = with lib; { + description = "Library for working with virtual machines"; + longDescription = '' + libvirt-glib wraps libvirt to provide a high-level object-oriented API better + suited for glib-based applications, via three libraries: + + - libvirt-glib - GLib main loop integration & misc helper APIs + - libvirt-gconfig - GObjects for manipulating libvirt XML documents + - libvirt-gobject - GObjects for managing libvirt objects + ''; + homepage = "https://libvirt.org/"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/by-name/li/libvisio/package.nix similarity index 100% rename from pkgs/development/libraries/libvisio/default.nix rename to pkgs/by-name/li/libvisio/package.nix diff --git a/pkgs/development/libraries/libvisio2svg/default.nix b/pkgs/by-name/li/libvisio2svg/package.nix similarity index 100% rename from pkgs/development/libraries/libvisio2svg/default.nix rename to pkgs/by-name/li/libvisio2svg/package.nix diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/by-name/li/libvisual/package.nix similarity index 100% rename from pkgs/development/libraries/libvisual/default.nix rename to pkgs/by-name/li/libvisual/package.nix diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/by-name/li/libvmaf/package.nix similarity index 100% rename from pkgs/development/libraries/libvmaf/default.nix rename to pkgs/by-name/li/libvmaf/package.nix diff --git a/pkgs/development/libraries/libvoikko/default.nix b/pkgs/by-name/li/libvoikko/package.nix similarity index 100% rename from pkgs/development/libraries/libvoikko/default.nix rename to pkgs/by-name/li/libvoikko/package.nix diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/by-name/li/libvolume_id/package.nix similarity index 100% rename from pkgs/os-specific/linux/libvolume_id/default.nix rename to pkgs/by-name/li/libvolume_id/package.nix diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/by-name/li/libvorbis/package.nix similarity index 100% rename from pkgs/development/libraries/libvorbis/default.nix rename to pkgs/by-name/li/libvorbis/package.nix diff --git a/pkgs/development/libraries/libvori/default.nix b/pkgs/by-name/li/libvori/package.nix similarity index 100% rename from pkgs/development/libraries/libvori/default.nix rename to pkgs/by-name/li/libvori/package.nix diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/by-name/li/libvpx/package.nix similarity index 100% rename from pkgs/development/libraries/libvpx/default.nix rename to pkgs/by-name/li/libvpx/package.nix diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/by-name/li/libvterm-neovim/package.nix similarity index 100% rename from pkgs/development/libraries/libvterm-neovim/default.nix rename to pkgs/by-name/li/libvterm-neovim/package.nix diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/by-name/li/libvterm/package.nix similarity index 100% rename from pkgs/development/libraries/libvterm/default.nix rename to pkgs/by-name/li/libvterm/package.nix diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/by-name/li/libwbxml/package.nix similarity index 100% rename from pkgs/development/libraries/libwbxml/default.nix rename to pkgs/by-name/li/libwbxml/package.nix diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/by-name/li/libwebcam/package.nix similarity index 100% rename from pkgs/os-specific/linux/libwebcam/default.nix rename to pkgs/by-name/li/libwebcam/package.nix diff --git a/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch b/pkgs/by-name/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch similarity index 100% rename from pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch rename to pkgs/by-name/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix new file mode 100644 index 000000000000..abd1e1bd9afe --- /dev/null +++ b/pkgs/by-name/li/libwebp/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + threadingSupport ? true, # multi-threading + openglSupport ? false, + libglut, + libGL, + libGLU, # OpenGL (required for vwebp) + pngSupport ? true, + libpng, # PNG image format + jpegSupport ? true, + libjpeg, # JPEG image format + tiffSupport ? true, + libtiff, # TIFF image format + gifSupport ? true, + giflib, # GIF image format + swap16bitcspSupport ? false, # Byte swap for 16bit color spaces + libwebpmuxSupport ? true, # Build libwebpmux + + # for passthru.tests + gd, + graphicsmagick, + haskellPackages, + imagemagick, + imlib2, + libjxl, + opencv, + python3, + vips, +}: + +stdenv.mkDerivation rec { + pname = "libwebp"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "webmproject"; + repo = "libwebp"; + rev = "v${version}"; + hash = "sha256-OR/VzKNn3mnwjf+G+RkEGAaaKrhVlAu1e2oTRwdsPj8="; + }; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "WEBP_USE_THREAD" threadingSupport) + (lib.cmakeBool "WEBP_BUILD_VWEBP" openglSupport) + (lib.cmakeBool "WEBP_BUILD_IMG2WEBP" (pngSupport || jpegSupport || tiffSupport)) + (lib.cmakeBool "WEBP_BUILD_GIF2WEBP" gifSupport) + (lib.cmakeBool "WEBP_BUILD_ANIM_UTILS" false) # Not installed + (lib.cmakeBool "WEBP_BUILD_EXTRAS" false) # Not installed + (lib.cmakeBool "WEBP_ENABLE_SWAP_16BIT_CSP" swap16bitcspSupport) + (lib.cmakeBool "WEBP_BUILD_LIBWEBPMUX" libwebpmuxSupport) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = + [ ] + ++ lib.optionals openglSupport [ + libglut + libGL + libGLU + ] + ++ lib.optionals pngSupport [ libpng ] + ++ lib.optionals jpegSupport [ libjpeg ] + ++ lib.optionals tiffSupport [ libtiff ] + ++ lib.optionals gifSupport [ giflib ]; + + passthru.tests = { + inherit + gd + graphicsmagick + imagemagick + imlib2 + libjxl + opencv + vips + ; + inherit (python3.pkgs) pillow imread; + haskell-webp = haskellPackages.webp; + }; + + meta = with lib; { + description = "Tools and library for the WebP image format"; + homepage = "https://developers.google.com/speed/webp/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ ajs124 ]; + }; +} diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/by-name/li/libwebsockets/package.nix similarity index 100% rename from pkgs/development/libraries/libwebsockets/default.nix rename to pkgs/by-name/li/libwebsockets/package.nix diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/by-name/li/libwhereami/package.nix similarity index 100% rename from pkgs/development/libraries/libwhereami/default.nix rename to pkgs/by-name/li/libwhereami/package.nix diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/by-name/li/libwhich/package.nix similarity index 100% rename from pkgs/development/tools/misc/libwhich/default.nix rename to pkgs/by-name/li/libwhich/package.nix diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/by-name/li/libwmf/package.nix similarity index 100% rename from pkgs/development/libraries/libwmf/default.nix rename to pkgs/by-name/li/libwmf/package.nix diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/by-name/li/libwpg/package.nix similarity index 100% rename from pkgs/development/libraries/libwpg/default.nix rename to pkgs/by-name/li/libwpg/package.nix diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/by-name/li/libwps/package.nix similarity index 100% rename from pkgs/development/libraries/libwps/default.nix rename to pkgs/by-name/li/libwps/package.nix diff --git a/pkgs/development/libraries/libwtk-sdl2/default.nix b/pkgs/by-name/li/libwtk-sdl2/package.nix similarity index 100% rename from pkgs/development/libraries/libwtk-sdl2/default.nix rename to pkgs/by-name/li/libwtk-sdl2/package.nix diff --git a/pkgs/development/libraries/libx86/constants.patch b/pkgs/by-name/li/libx86/constants.patch similarity index 100% rename from pkgs/development/libraries/libx86/constants.patch rename to pkgs/by-name/li/libx86/constants.patch diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/by-name/li/libx86/non-x86.patch similarity index 100% rename from pkgs/development/libraries/libx86/non-x86.patch rename to pkgs/by-name/li/libx86/non-x86.patch diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/by-name/li/libx86/package.nix similarity index 100% rename from pkgs/development/libraries/libx86/default.nix rename to pkgs/by-name/li/libx86/package.nix diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/by-name/li/libx86/src-for-default.nix similarity index 100% rename from pkgs/development/libraries/libx86/src-for-default.nix rename to pkgs/by-name/li/libx86/src-for-default.nix diff --git a/pkgs/development/libraries/libx86/src-info-for-default.nix b/pkgs/by-name/li/libx86/src-info-for-default.nix similarity index 100% rename from pkgs/development/libraries/libx86/src-info-for-default.nix rename to pkgs/by-name/li/libx86/src-info-for-default.nix diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/by-name/li/libx86emu/package.nix similarity index 100% rename from pkgs/development/libraries/libx86emu/default.nix rename to pkgs/by-name/li/libx86emu/package.nix diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/by-name/li/libxc/package.nix similarity index 100% rename from pkgs/development/libraries/libxc/default.nix rename to pkgs/by-name/li/libxc/package.nix diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/by-name/li/libxcomp/package.nix similarity index 100% rename from pkgs/development/libraries/libxcomp/default.nix rename to pkgs/by-name/li/libxcomp/package.nix diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/by-name/li/libxdg_basedir/package.nix similarity index 100% rename from pkgs/development/libraries/libxdg-basedir/default.nix rename to pkgs/by-name/li/libxdg_basedir/package.nix diff --git a/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch b/pkgs/by-name/li/libxisf/0001-Fix-pkg-config-paths.patch similarity index 100% rename from pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch rename to pkgs/by-name/li/libxisf/0001-Fix-pkg-config-paths.patch diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/by-name/li/libxisf/package.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/libxisf/default.nix rename to pkgs/by-name/li/libxisf/package.nix diff --git a/pkgs/development/libraries/libxkbcommon/disable-x11com.patch b/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch similarity index 100% rename from pkgs/development/libraries/libxkbcommon/disable-x11com.patch rename to pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix similarity index 100% rename from pkgs/development/libraries/libxkbcommon/default.nix rename to pkgs/by-name/li/libxkbcommon_8/package.nix diff --git a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/pkgs/by-name/li/libxklavier/honor-XKB_CONFIG_ROOT.patch similarity index 100% rename from pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch rename to pkgs/by-name/li/libxklavier/honor-XKB_CONFIG_ROOT.patch diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/by-name/li/libxklavier/package.nix similarity index 100% rename from pkgs/development/libraries/libxklavier/default.nix rename to pkgs/by-name/li/libxklavier/package.nix diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/by-name/li/libxl/package.nix similarity index 100% rename from pkgs/development/libraries/libxl/default.nix rename to pkgs/by-name/li/libxl/package.nix diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/by-name/li/libxls/package.nix similarity index 100% rename from pkgs/development/libraries/libxls/default.nix rename to pkgs/by-name/li/libxls/package.nix diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix new file mode 100644 index 000000000000..6f1a43d28a11 --- /dev/null +++ b/pkgs/by-name/li/libxlsxwriter/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, minizip +, python3 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libxlsxwriter"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "jmcnamara"; + repo = "libxlsxwriter"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZXVNW5cEWgMXKLnE0IpwWS0RIWBta5uhuGh4R9uFJ14="; + }; + + buildInputs = [ + minizip + zlib + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "USE_SYSTEM_MINIZIP=1" + ]; + + # TEST 428/429 worksheet:worksheet_table15 *** buffer overflow detected ***: terminated + hardeningDisable = [ "fortify3" ]; + + doCheck = true; + + nativeCheckInputs = [ + python3.pkgs.pytest + ]; + + checkTarget = "test"; + + meta = with lib; { + description = "C library for creating Excel XLSX files"; + homepage = "https://libxlsxwriter.github.io/"; + changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${src.rev}/Changes.txt"; + license = licenses.bsd2; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/by-name/li/libxmi/package.nix similarity index 100% rename from pkgs/development/libraries/libxmi/default.nix rename to pkgs/by-name/li/libxmi/package.nix diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/by-name/li/libxmlb/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/libxmlb/installed-tests-path.patch rename to pkgs/by-name/li/libxmlb/installed-tests-path.patch diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/by-name/li/libxmlb/package.nix similarity index 100% rename from pkgs/development/libraries/libxmlb/default.nix rename to pkgs/by-name/li/libxmlb/package.nix diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/by-name/li/libxmp/package.nix similarity index 100% rename from pkgs/development/libraries/libxmp/default.nix rename to pkgs/by-name/li/libxmp/package.nix diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/by-name/li/libxnd/package.nix similarity index 100% rename from pkgs/development/libraries/libxnd/default.nix rename to pkgs/by-name/li/libxnd/package.nix diff --git a/pkgs/by-name/li/libxo/package.nix b/pkgs/by-name/li/libxo/package.nix new file mode 100644 index 000000000000..8e20b8edc7b1 --- /dev/null +++ b/pkgs/by-name/li/libxo/package.nix @@ -0,0 +1,70 @@ +{ + lib, + autoreconfHook, + bash, + libtool, + fetchFromGitHub, + nix-update-script, + perl, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libxo"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "Juniper"; + repo = "libxo"; + rev = finalAttrs.version; + hash = "sha256-ElSxegY2ejw7IuIMznfVpl29Wyvpx9k1BdXregzYsoQ="; + }; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail LIBTOOL=glibtool 'LIBTOOL=${lib.getExe libtool}' + + # Remove impurities + substituteInPlace libxo/Makefile.am \ + --replace-fail '-L/opt/local/lib' "" + ''; + + outputs = [ + "bin" + "out" + "dev" + "man" + ]; + + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # libxo misdetects malloc and realloc when cross-compiling on Darwin + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + autoreconfHook + # For patchShebangs in postInstall + bash + perl + ]; + + postInstall = '' + moveToOutput "bin/libxo-config" "$dev" + patchShebangs --host "$out/bin" + ''; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Library to generate text, XML, JSON, and HTML"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.reckenrode ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/by-name/li/libxsmm/package.nix similarity index 100% rename from pkgs/development/libraries/libxsmm/default.nix rename to pkgs/by-name/li/libxsmm/package.nix diff --git a/pkgs/development/libraries/libxsmm/rpath.patch b/pkgs/by-name/li/libxsmm/rpath.patch similarity index 100% rename from pkgs/development/libraries/libxsmm/rpath.patch rename to pkgs/by-name/li/libxsmm/rpath.patch diff --git a/pkgs/tools/graphics/libyafaray/default.nix b/pkgs/by-name/li/libyafaray/package.nix similarity index 100% rename from pkgs/tools/graphics/libyafaray/default.nix rename to pkgs/by-name/li/libyafaray/package.nix diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/by-name/li/libyaml/package.nix similarity index 100% rename from pkgs/development/libraries/libyaml/default.nix rename to pkgs/by-name/li/libyaml/package.nix diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/by-name/li/libykclient/package.nix similarity index 100% rename from pkgs/development/libraries/libykclient/default.nix rename to pkgs/by-name/li/libykclient/package.nix diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/by-name/li/libykneomgr/package.nix similarity index 100% rename from pkgs/development/libraries/libykneomgr/default.nix rename to pkgs/by-name/li/libykneomgr/package.nix diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/by-name/li/libytnef/package.nix similarity index 100% rename from pkgs/development/libraries/libytnef/default.nix rename to pkgs/by-name/li/libytnef/package.nix diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/by-name/li/libyubikey/package.nix similarity index 100% rename from pkgs/development/libraries/libyubikey/default.nix rename to pkgs/by-name/li/libyubikey/package.nix diff --git a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch similarity index 100% rename from pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch rename to pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/by-name/li/libyuv/package.nix similarity index 100% rename from pkgs/development/libraries/libyuv/default.nix rename to pkgs/by-name/li/libyuv/package.nix diff --git a/pkgs/development/libraries/libyuv/yuv.pc b/pkgs/by-name/li/libyuv/yuv.pc similarity index 100% rename from pkgs/development/libraries/libyuv/yuv.pc rename to pkgs/by-name/li/libyuv/yuv.pc diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/by-name/li/libzapojit/package.nix similarity index 100% rename from pkgs/development/libraries/libzapojit/default.nix rename to pkgs/by-name/li/libzapojit/package.nix diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/by-name/li/libzbc/package.nix similarity index 100% rename from pkgs/os-specific/linux/libzbc/default.nix rename to pkgs/by-name/li/libzbc/package.nix diff --git a/pkgs/os-specific/linux/libzbd/default.nix b/pkgs/by-name/li/libzbd/package.nix similarity index 100% rename from pkgs/os-specific/linux/libzbd/default.nix rename to pkgs/by-name/li/libzbd/package.nix diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/by-name/li/libzdb/package.nix similarity index 100% rename from pkgs/development/libraries/libzdb/default.nix rename to pkgs/by-name/li/libzdb/package.nix diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/by-name/li/libzen/package.nix similarity index 100% rename from pkgs/development/libraries/libzen/default.nix rename to pkgs/by-name/li/libzen/package.nix diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/by-name/li/libzim/package.nix similarity index 100% rename from pkgs/development/libraries/libzim/default.nix rename to pkgs/by-name/li/libzim/package.nix diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/by-name/li/libzip/package.nix similarity index 100% rename from pkgs/development/libraries/libzip/default.nix rename to pkgs/by-name/li/libzip/package.nix diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/by-name/li/libzmf/package.nix similarity index 100% rename from pkgs/development/libraries/libzmf/default.nix rename to pkgs/by-name/li/libzmf/package.nix diff --git a/pkgs/development/libraries/libzra/fix-pkg-config.patch b/pkgs/by-name/li/libzra/fix-pkg-config.patch similarity index 100% rename from pkgs/development/libraries/libzra/fix-pkg-config.patch rename to pkgs/by-name/li/libzra/fix-pkg-config.patch diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/by-name/li/libzra/package.nix similarity index 100% rename from pkgs/development/libraries/libzra/default.nix rename to pkgs/by-name/li/libzra/package.nix diff --git a/pkgs/tools/misc/license-cli/default.nix b/pkgs/by-name/li/license-cli/package.nix similarity index 100% rename from pkgs/tools/misc/license-cli/default.nix rename to pkgs/by-name/li/license-cli/package.nix diff --git a/pkgs/development/tools/license-scanner/default.nix b/pkgs/by-name/li/license-scanner/package.nix similarity index 100% rename from pkgs/development/tools/license-scanner/default.nix rename to pkgs/by-name/li/license-scanner/package.nix diff --git a/pkgs/development/tools/misc/licenseclassifier/default.nix b/pkgs/by-name/li/licenseclassifier/package.nix similarity index 100% rename from pkgs/development/tools/misc/licenseclassifier/default.nix rename to pkgs/by-name/li/licenseclassifier/package.nix diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/by-name/li/licensor/package.nix similarity index 100% rename from pkgs/tools/misc/licensor/default.nix rename to pkgs/by-name/li/licensor/package.nix diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/by-name/li/lie/package.nix similarity index 100% rename from pkgs/applications/science/math/LiE/default.nix rename to pkgs/by-name/li/lie/package.nix diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/by-name/li/lieer/package.nix similarity index 100% rename from pkgs/applications/networking/lieer/default.nix rename to pkgs/by-name/li/lieer/package.nix diff --git a/pkgs/tools/misc/lifecycled/default.nix b/pkgs/by-name/li/lifecycled/package.nix similarity index 100% rename from pkgs/tools/misc/lifecycled/default.nix rename to pkgs/by-name/li/lifecycled/package.nix diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/by-name/li/lifelines/package.nix similarity index 100% rename from pkgs/applications/misc/lifelines/default.nix rename to pkgs/by-name/li/lifelines/package.nix diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/by-name/li/lifeograph/package.nix similarity index 100% rename from pkgs/applications/editors/lifeograph/default.nix rename to pkgs/by-name/li/lifeograph/package.nix diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/by-name/li/liferea/package.nix similarity index 100% rename from pkgs/applications/networking/newsreaders/liferea/default.nix rename to pkgs/by-name/li/liferea/package.nix diff --git a/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch b/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch new file mode 100644 index 000000000000..082f8f3f10e1 --- /dev/null +++ b/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch @@ -0,0 +1,38 @@ +From 47f163f6bcd1d66bebc49d96abcf46853a0708fb Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 22 Oct 2024 07:48:34 +0800 +Subject: [PATCH] fix build + +--- + src/helpers.c | 1 + + src/helpers.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/helpers.c b/src/helpers.c +index c7bc4de..00e6098 100644 +--- a/src/helpers.c ++++ b/src/helpers.c +@@ -9,6 +9,7 @@ + #include // errno + #include // dirname + ++light_loglevel_t light_loglevel; + + bool light_file_read_uint64(char const *filename, uint64_t *val) + { +diff --git a/src/helpers.h b/src/helpers.h +index f73714b..4a92753 100644 +--- a/src/helpers.h ++++ b/src/helpers.h +@@ -21,7 +21,7 @@ typedef enum { + LIGHT_NOTE_LEVEL + } light_loglevel_t; + +-light_loglevel_t light_loglevel; ++extern light_loglevel_t light_loglevel; + + #define LIGHT_LOG(lvl, fp, fmt, args...)\ + if(light_loglevel >= lvl)\ +-- +2.46.1 + diff --git a/pkgs/by-name/li/light/package.nix b/pkgs/by-name/li/light/package.nix new file mode 100644 index 000000000000..aa16262a8d93 --- /dev/null +++ b/pkgs/by-name/li/light/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + autoreconfHook, + coreutils, +}: + +stdenv.mkDerivation { + version = "1.2.2"; + pname = "light"; + + src = fetchFromGitLab { + owner = "dpeukert"; + repo = "light"; + rev = "2a54078cbe3814105ee4f565f451b1b5947fbde0"; + hash = "sha256-OmHdVJvBcBjJiPs45JqOHxFoJYvKIEIpt9pFhBz74Kg="; + }; + + configureFlags = [ "--with-udev" ]; + + nativeBuildInputs = [ autoreconfHook ]; + + patches = [ + ./0001-define-light-loglevel-as-extern.patch + ]; + + # ensure udev rules can find the commands used + postPatch = '' + substituteInPlace 90-backlight.rules \ + --replace-fail '/bin/chgrp' '${coreutils}/bin/chgrp' \ + --replace-fail '/bin/chmod' '${coreutils}/bin/chmod' + ''; + + meta = { + description = "GNU/Linux application to control backlights"; + homepage = "https://gitlab.com/dpeukert/light"; + license = lib.licenses.gpl3Only; + mainProgram = "light"; + maintainers = with lib.maintainers; [ + puffnfresh + dtzWill + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch similarity index 100% rename from pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch rename to pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix rename to pkgs/by-name/li/lightdm-enso-os-greeter/package.nix diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/by-name/li/lightdm-mini-greeter/package.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-mini-greeter/default.nix rename to pkgs/by-name/li/lightdm-mini-greeter/package.nix diff --git a/pkgs/applications/display-managers/lightdm-mobile-greeter/Cargo.lock b/pkgs/by-name/li/lightdm-mobile-greeter/Cargo.lock similarity index 100% rename from pkgs/applications/display-managers/lightdm-mobile-greeter/Cargo.lock rename to pkgs/by-name/li/lightdm-mobile-greeter/Cargo.lock diff --git a/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix b/pkgs/by-name/li/lightdm-mobile-greeter/package.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix rename to pkgs/by-name/li/lightdm-mobile-greeter/package.nix diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-slick-greeter/default.nix rename to pkgs/by-name/li/lightdm-slick-greeter/package.nix diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix rename to pkgs/by-name/li/lightdm-tiny-greeter/package.nix diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/by-name/li/lightgbm/package.nix similarity index 100% rename from pkgs/development/libraries/lightgbm/default.nix rename to pkgs/by-name/li/lightgbm/package.nix diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/by-name/li/lightlocker/package.nix similarity index 100% rename from pkgs/misc/screensavers/light-locker/default.nix rename to pkgs/by-name/li/lightlocker/package.nix diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix new file mode 100644 index 000000000000..e257c581fd51 --- /dev/null +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "lightning-loop"; + version = "0.28.8-beta"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "loop"; + rev = "v${version}"; + hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0="; + }; + + vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0="; + + subPackages = [ "cmd/loop" "cmd/loopd" ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Lightning Loop Client"; + homepage = "https://github.com/lightninglabs/loop"; + license = licenses.mit; + maintainers = with maintainers; [ proofofkeags prusnak ]; + }; +} diff --git a/pkgs/applications/blockchains/lightning-pool/default.nix b/pkgs/by-name/li/lightning-pool/package.nix similarity index 100% rename from pkgs/applications/blockchains/lightning-pool/default.nix rename to pkgs/by-name/li/lightning-pool/package.nix diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index cee6f869d3cc..21328f109467 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - hash = "sha256-YOTFyIDQIdqnrbXtnnY5U32rk9/fZ+1NcSb3slgkxZU="; + hash = "sha256-nW5tnHD5saY7KnccRg5NsszvrADd/tuoN7SWr7JYBVs="; }; - cargoHash = "sha256-nzRvsdW+PfcS1ocg49JtRQ9RmFJ3iz65plH1ToQXSGU="; + cargoHash = "sha256-He5lb5y3Zd1nygWJWZDzBq5avL81ZKoiZMxtxjKkU7I="; patches = [ # Backport fix for build error for lightningcss-napi @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ johnrtitor toastal ]; mainProgram = "lightningcss"; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; + platforms = lib.platforms.all; }; } diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/by-name/li/lightspark/package.nix similarity index 100% rename from pkgs/misc/lightspark/default.nix rename to pkgs/by-name/li/lightspark/package.nix diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/by-name/li/lighttpd/package.nix similarity index 100% rename from pkgs/servers/http/lighttpd/default.nix rename to pkgs/by-name/li/lighttpd/package.nix diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/by-name/li/lightum/package.nix similarity index 100% rename from pkgs/os-specific/linux/lightum/default.nix rename to pkgs/by-name/li/lightum/package.nix diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/by-name/li/lightwalletd/package.nix similarity index 100% rename from pkgs/applications/blockchains/lightwalletd/default.nix rename to pkgs/by-name/li/lightwalletd/package.nix diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/by-name/li/lightworks/package.nix similarity index 100% rename from pkgs/applications/video/lightworks/default.nix rename to pkgs/by-name/li/lightworks/package.nix diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/by-name/li/ligolo-ng/package.nix similarity index 100% rename from pkgs/tools/networking/ligolo-ng/default.nix rename to pkgs/by-name/li/ligolo-ng/package.nix diff --git a/pkgs/tools/security/lil-pwny/default.nix b/pkgs/by-name/li/lil-pwny/package.nix similarity index 100% rename from pkgs/tools/security/lil-pwny/default.nix rename to pkgs/by-name/li/lil-pwny/package.nix diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/by-name/li/lilo/package.nix similarity index 100% rename from pkgs/tools/misc/lilo/default.nix rename to pkgs/by-name/li/lilo/package.nix diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/by-name/li/lilv/package.nix similarity index 100% rename from pkgs/development/libraries/audio/lilv/default.nix rename to pkgs/by-name/li/lilv/package.nix diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/by-name/li/lime/package.nix similarity index 100% rename from pkgs/development/libraries/lime/default.nix rename to pkgs/by-name/li/lime/package.nix diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index a9a0a4c9b794..148ddc8ab65d 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -7,7 +7,6 @@ cpp-jwt, doxygen, enet, - fetchpatch, fetchzip, fmt, ffmpeg_6-headless, @@ -56,11 +55,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2118.2"; + version = "2119"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-DovVkk5QolOizV3mfxtMNMeIJWYs3xAu96icrTcQN68="; + hash = "sha256-cBPSzkvvivWGTD2E7fjeY3uJ1nSlALbOgIalGdk6xLU="; }; nativeBuildInputs = [ @@ -91,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: { openssl pipewire portaudio - SDL2 soundtouch sndio spirv-tools @@ -109,18 +107,11 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ] ) + ++ optionals enableSdl2Frontend [ SDL2 ] ++ optionals enableQtTranslations [ kdePackages.qttools ] ++ optionals enableCubeb [ cubeb ] ++ optional useDiscordRichPresence rapidjson; - patches = [ - # FIXME: this patch fixes the build with newer QT versions, remove it when the new version gets released - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Lime3DS/Lime3DS/pull/441.patch"; - hash = "sha256-NKJ3fmh5kY/DaTCVbIz1dvJrvK5IbJt1eogrbXWciCI="; - }) - ]; - postPatch = '' # Fix file not found when looking in var/empty instead of opt mkdir externals/dynarmic/src/dynarmic/ir/var diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/by-name/li/limesctl/package.nix similarity index 100% rename from pkgs/applications/misc/limesctl/default.nix rename to pkgs/by-name/li/limesctl/package.nix diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/by-name/li/limesurvey/package.nix similarity index 100% rename from pkgs/servers/limesurvey/default.nix rename to pkgs/by-name/li/limesurvey/package.nix diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/by-name/li/limitcpu/package.nix similarity index 100% rename from pkgs/tools/misc/limitcpu/default.nix rename to pkgs/by-name/li/limitcpu/package.nix diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/by-name/li/linbox/package.nix similarity index 100% rename from pkgs/development/libraries/linbox/default.nix rename to pkgs/by-name/li/linbox/package.nix diff --git a/pkgs/data/fonts/linden-hill/default.nix b/pkgs/by-name/li/linden-hill/package.nix similarity index 100% rename from pkgs/data/fonts/linden-hill/default.nix rename to pkgs/by-name/li/linden-hill/package.nix diff --git a/pkgs/data/fonts/line-awesome/default.nix b/pkgs/by-name/li/line-awesome/package.nix similarity index 100% rename from pkgs/data/fonts/line-awesome/default.nix rename to pkgs/by-name/li/line-awesome/package.nix diff --git a/pkgs/data/fonts/linearicons-free/default.nix b/pkgs/by-name/li/linearicons-free/package.nix similarity index 100% rename from pkgs/data/fonts/linearicons-free/default.nix rename to pkgs/by-name/li/linearicons-free/package.nix diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/by-name/li/linenoise-ng/package.nix similarity index 100% rename from pkgs/development/libraries/linenoise-ng/default.nix rename to pkgs/by-name/li/linenoise-ng/package.nix diff --git a/pkgs/development/libraries/linenoise/linenoise.pc.in b/pkgs/by-name/li/linenoise/linenoise.pc.in similarity index 100% rename from pkgs/development/libraries/linenoise/linenoise.pc.in rename to pkgs/by-name/li/linenoise/linenoise.pc.in diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/by-name/li/linenoise/package.nix similarity index 100% rename from pkgs/development/libraries/linenoise/default.nix rename to pkgs/by-name/li/linenoise/package.nix diff --git a/pkgs/tools/misc/lineselect/default.nix b/pkgs/by-name/li/lineselect/package.nix similarity index 100% rename from pkgs/tools/misc/lineselect/default.nix rename to pkgs/by-name/li/lineselect/package.nix diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/by-name/li/lingeling/package.nix similarity index 100% rename from pkgs/applications/science/logic/lingeling/default.nix rename to pkgs/by-name/li/lingeling/package.nix diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/by-name/li/lingot/package.nix similarity index 100% rename from pkgs/applications/audio/lingot/default.nix rename to pkgs/by-name/li/lingot/package.nix diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/by-name/li/lingua-franca/package.nix similarity index 100% rename from pkgs/development/compilers/lingua-franca/default.nix rename to pkgs/by-name/li/lingua-franca/package.nix diff --git a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/pkgs/by-name/li/linja-pi-pu-lukin/package.nix similarity index 100% rename from pkgs/data/fonts/linja-pi-pu-lukin/default.nix rename to pkgs/by-name/li/linja-pi-pu-lukin/package.nix diff --git a/pkgs/data/fonts/linja-sike/default.nix b/pkgs/by-name/li/linja-sike/package.nix similarity index 100% rename from pkgs/data/fonts/linja-sike/default.nix rename to pkgs/by-name/li/linja-sike/package.nix diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/by-name/li/link-grammar/package.nix similarity index 100% rename from pkgs/tools/text/link-grammar/default.nix rename to pkgs/by-name/li/link-grammar/package.nix diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/by-name/li/linkchecker/package.nix similarity index 100% rename from pkgs/tools/networking/linkchecker/default.nix rename to pkgs/by-name/li/linkchecker/package.nix diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/by-name/li/links2/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/links2/default.nix rename to pkgs/by-name/li/links2/package.nix diff --git a/pkgs/tools/security/linux-exploit-suggester/default.nix b/pkgs/by-name/li/linux-exploit-suggester/package.nix similarity index 100% rename from pkgs/tools/security/linux-exploit-suggester/default.nix rename to pkgs/by-name/li/linux-exploit-suggester/package.nix diff --git a/pkgs/data/documentation/linux-manual/default.nix b/pkgs/by-name/li/linux-manual/package.nix similarity index 100% rename from pkgs/data/documentation/linux-manual/default.nix rename to pkgs/by-name/li/linux-manual/package.nix diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/by-name/li/linux-pam/package.nix similarity index 100% rename from pkgs/os-specific/linux/pam/default.nix rename to pkgs/by-name/li/linux-pam/package.nix diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch similarity index 100% rename from pkgs/os-specific/linux/pam/suid-wrapper-path.patch rename to pkgs/by-name/li/linux-pam/suid-wrapper-path.patch diff --git a/pkgs/by-name/li/linux-router/package.nix b/pkgs/by-name/li/linux-router/package.nix new file mode 100644 index 000000000000..e2620b90b22b --- /dev/null +++ b/pkgs/by-name/li/linux-router/package.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper + +# --- Runtime Dependencies --- +, bash +, procps +, iproute2 +, dnsmasq +, iptables +, coreutils +, flock +, gawk +, getopt +, gnugrep +, gnused +, which +# `nmcli` is not required for create_ap. +# Use NetworkManager by default because it is very likely already present +, useNetworkManager ? true +, networkmanager + +# --- WiFi Hotspot Dependencies --- +, useWifiDependencies ? true +, hostapd +, iw +# You only need this if 'iw' can not recognize your adapter. +, useWirelessTools ? true +, wirelesstools # for iwconfig +# To fall back to haveged if entropy is low. +# Defaulting to false because not having it does not break things. +# If it is really needed, warnings will be logged to journal. +, useHaveged ? false +, haveged +# You only need this if you wish to show WiFi QR codes in terminal +, useQrencode ? true +, qrencode +}: + +stdenv.mkDerivation rec { + pname = "linux-router"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "garywill"; + repo = "linux-router"; + rev = "refs/tags/${version}"; + hash = "sha256-iiIDWDPz8MBwsBcJAWVNeuGwaNJ7xh7gFfRqXTG4oGQ="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + dontBuild = true; + + installPhase = let + binPath = lib.makeBinPath ([ procps iproute2 getopt bash dnsmasq + iptables coreutils which flock gnugrep gnused gawk ] + ++ lib.optional useNetworkManager networkmanager + ++ lib.optional useWifiDependencies hostapd + ++ lib.optional useWifiDependencies iw + ++ lib.optional (useWifiDependencies && useWirelessTools) wirelesstools + ++ lib.optional (useWifiDependencies && useHaveged) haveged + ++ lib.optional (useWifiDependencies && useQrencode) qrencode); + in + '' + mkdir -p $out/bin/ $out/.bin-wrapped + mv lnxrouter $out/.bin-wrapped/lnxrouter + makeWrapper $out/.bin-wrapped/lnxrouter $out/bin/lnxrouter --prefix PATH : ${binPath} + ''; + + meta = with lib; { + homepage = "https://github.com/garywill/linux-router"; + description = "Set Linux as router / Wifi hotspot / proxy in one command"; + longDescription = '' + Features: + + - Create a NATed sub-network + - Provide Internet + - DHCP server and RA + - DNS server + - IPv6 (behind NATed LAN, like IPv4) + - Creating Wifi hotspot: + - Channel selecting + - Choose encryptions: WPA2/WPA, WPA2, WPA, No encryption + - Create AP on the same interface you are getting Internet (require same channel) + - Transparent proxy (redsocks) + - DNS proxy + - Compatible with NetworkManager (automatically set interface as unmanaged) + ''; + changelog = "https://github.com/garywill/linux-router/releases/tag/${version}"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ x3ro ]; + platforms = platforms.linux; + mainProgram = "lnxrouter"; + }; +} diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix new file mode 100644 index 000000000000..87fd5a7d73de --- /dev/null +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -0,0 +1,210 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ffmpeg, + libglut, + glew, + glfw, + glm, + libGL, + libpulseaudio, + libX11, + libXau, + libXdmcp, + libXext, + libXpm, + libXrandr, + libXxf86vm, + lz4, + mpv, + pkg-config, + SDL2, + SDL2_mixer, + zlib, + fetchzip, + wayland, + wayland-protocols, + egl-wayland, + libffi, + wayland-scanner, + glib, + nss, + nspr, + atk, + at-spi2-atk, + libdrm, + expat, + libxcb, + libxkbcommon, + libXcomposite, + libXdamage, + libXfixes, + mesa, + gtk3, + pango, + cairo, + alsa-lib, + dbus, + at-spi2-core, + cups, + libxshmfence, + udev, + libdecor, + autoPatchelfHook, + makeWrapper, +}: +let + rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + libGL + expat + libxcb + libxkbcommon + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + mesa + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + libxshmfence + udev + ]; + buildType = "Release"; + platform = + { + "aarch64-linux" = "linuxarm64"; + "x86_64-linux" = "linux64"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + cef-bin-name = "cef_binary_120.1.10+g3ce3184+chromium-120.0.6099.129_${platform}"; + cef-bin = stdenv.mkDerivation { + pname = "cef-bin"; + version = "120.0.6099.129"; + src = + let + hash = + { + "linuxarm64" = "sha256-iu8y2r1rd78fV2argulHoZJG+hPMPDKJ9ysnUyIgo5k="; + "linux64" = "sha256-FFkFMMkTSseLZIDzESFl8+h7wRhv5QGi1Uy5MViYpX8="; + } + .${platform}; + urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] cef-bin-name; + in + fetchzip { + url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; + inherit hash; + }; + installPhase = '' + runHook preInstall + + mkdir $out + cp -r ./* $out/ + chmod +w -R $out/ + patchelf $out/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so + patchelf $out/${buildType}/libGLESv2.so --set-rpath "${rpath}" --add-needed libGL.so.1 + patchelf $out/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker) + sed 's/-O0/-O2/' -i $out/cmake/cef_variables.cmake + + runHook postInstall + ''; + meta = { + description = "Simple framework for embedding Chromium-based browsers in other applications"; + homepage = "https://cef-builds.spotifycdn.com/index.html"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.bsd3; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; + }; + buildInputs = [ + libdecor + ffmpeg + libglut + glew + glfw + glm + libpulseaudio + libXau + SDL2_mixer + libXdmcp + libXpm + libXxf86vm + mpv + lz4 + SDL2 + zlib + wayland + wayland-protocols + egl-wayland + libffi + wayland-scanner + libXrandr + ]; +in +stdenv.mkDerivation { + pname = "linux-wallpaperengine"; + version = "0-unstable-2024-10-13"; + + src = fetchFromGitHub { + owner = "Almamu"; + repo = "linux-wallpaperengine"; + rev = "ec60a8a57153e49e3684c864a6d809fe9601336b"; + hash = "sha256-M77Wp6tCXO2oFgfZ0+mdBT07CCYLsDDyHjeHtaDVvu8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + autoPatchelfHook + makeWrapper + ]; + + inherit buildInputs; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=${buildType}" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/linux-wallpaperengine" + ]; + + postPatch = '' + patchShebangs . + mkdir -p third_party/cef/ + ln -s ${cef-bin} third_party/cef/${cef-bin-name} + ''; + + preFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:${cef-bin}" $out/linux-wallpaperengine/linux-wallpaperengine + find $out -exec chmod 755 {} + + mkdir $out/bin + makeWrapper $out/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine + ''; + + meta = { + description = "Wallpaper Engine backgrounds for Linux"; + homepage = "https://github.com/Almamu/linux-wallpaperengine"; + license = lib.licenses.gpl3Plus; + mainProgram = "linux-wallpaperengine"; + maintainers = with lib.maintainers; [ aucub ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/by-name/li/linuxConsoleTools/package.nix similarity index 100% rename from pkgs/os-specific/linux/consoletools/default.nix rename to pkgs/by-name/li/linuxConsoleTools/package.nix diff --git a/pkgs/tools/misc/linux-logo/default.nix b/pkgs/by-name/li/linux_logo/package.nix similarity index 100% rename from pkgs/tools/misc/linux-logo/default.nix rename to pkgs/by-name/li/linux_logo/package.nix diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/by-name/li/linuxdoc-tools/package.nix similarity index 100% rename from pkgs/tools/text/sgml/linuxdoc-tools/default.nix rename to pkgs/by-name/li/linuxdoc-tools/package.nix diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/by-name/li/linuxptp/package.nix similarity index 100% rename from pkgs/os-specific/linux/linuxptp/default.nix rename to pkgs/by-name/li/linuxptp/package.nix diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/by-name/li/linuxquota/package.nix similarity index 100% rename from pkgs/tools/misc/linuxquota/default.nix rename to pkgs/by-name/li/linuxquota/package.nix diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/by-name/li/linuxsampler/package.nix similarity index 100% rename from pkgs/applications/audio/linuxsampler/default.nix rename to pkgs/by-name/li/linuxsampler/package.nix diff --git a/pkgs/tools/audio/linuxwave/default.nix b/pkgs/by-name/li/linuxwave/package.nix similarity index 100% rename from pkgs/tools/audio/linuxwave/default.nix rename to pkgs/by-name/li/linuxwave/package.nix diff --git a/pkgs/servers/web-apps/linx-server/default.nix b/pkgs/by-name/li/linx-server/package.nix similarity index 100% rename from pkgs/servers/web-apps/linx-server/default.nix rename to pkgs/by-name/li/linx-server/package.nix diff --git a/pkgs/servers/web-apps/linx-server/test.patch b/pkgs/by-name/li/linx-server/test.patch similarity index 100% rename from pkgs/servers/web-apps/linx-server/test.patch rename to pkgs/by-name/li/linx-server/test.patch diff --git a/pkgs/tools/misc/lipl/Cargo.lock b/pkgs/by-name/li/lipl/Cargo.lock similarity index 100% rename from pkgs/tools/misc/lipl/Cargo.lock rename to pkgs/by-name/li/lipl/Cargo.lock diff --git a/pkgs/tools/misc/lipl/default.nix b/pkgs/by-name/li/lipl/package.nix similarity index 100% rename from pkgs/tools/misc/lipl/default.nix rename to pkgs/by-name/li/lipl/package.nix diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/by-name/li/liquibase/package.nix similarity index 100% rename from pkgs/development/tools/database/liquibase/default.nix rename to pkgs/by-name/li/liquibase/package.nix diff --git a/pkgs/development/java-modules/liquibase_redshift_extension/default.nix b/pkgs/by-name/li/liquibase_redshift_extension/package.nix similarity index 100% rename from pkgs/development/java-modules/liquibase_redshift_extension/default.nix rename to pkgs/by-name/li/liquibase_redshift_extension/package.nix diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/by-name/li/liquidfun/package.nix similarity index 100% rename from pkgs/development/libraries/liquidfun/default.nix rename to pkgs/by-name/li/liquidfun/package.nix diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/by-name/li/liquidprompt/package.nix similarity index 100% rename from pkgs/shells/liquidprompt/default.nix rename to pkgs/by-name/li/liquidprompt/package.nix diff --git a/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/pkgs/by-name/li/lirc/linux-headers-5.18.patch similarity index 100% rename from pkgs/development/libraries/lirc/linux-headers-5.18.patch rename to pkgs/by-name/li/lirc/linux-headers-5.18.patch diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/by-name/li/lirc/package.nix similarity index 100% rename from pkgs/development/libraries/lirc/default.nix rename to pkgs/by-name/li/lirc/package.nix diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/by-name/li/lisgd/package.nix similarity index 100% rename from pkgs/tools/inputmethods/lisgd/default.nix rename to pkgs/by-name/li/lisgd/package.nix diff --git a/pkgs/applications/networking/listadmin/default.nix b/pkgs/by-name/li/listadmin/package.nix similarity index 100% rename from pkgs/applications/networking/listadmin/default.nix rename to pkgs/by-name/li/listadmin/package.nix diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/by-name/li/lite/package.nix similarity index 100% rename from pkgs/applications/editors/lite/default.nix rename to pkgs/by-name/li/lite/package.nix diff --git a/pkgs/applications/networking/browsers/litebrowser/default.nix b/pkgs/by-name/li/litebrowser/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/litebrowser/default.nix rename to pkgs/by-name/li/litebrowser/package.nix diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/by-name/li/litecli/package.nix similarity index 100% rename from pkgs/development/tools/database/litecli/default.nix rename to pkgs/by-name/li/litecli/package.nix diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/by-name/li/litefs/package.nix similarity index 100% rename from pkgs/development/tools/database/litefs/default.nix rename to pkgs/by-name/li/litefs/package.nix diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/by-name/li/litehtml/package.nix similarity index 100% rename from pkgs/development/libraries/litehtml/default.nix rename to pkgs/by-name/li/litehtml/package.nix diff --git a/pkgs/applications/graphics/litemdview/default.nix b/pkgs/by-name/li/litemdview/package.nix similarity index 100% rename from pkgs/applications/graphics/litemdview/default.nix rename to pkgs/by-name/li/litemdview/package.nix diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/by-name/li/litestream/package.nix similarity index 100% rename from pkgs/development/tools/database/litestream/default.nix rename to pkgs/by-name/li/litestream/package.nix diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index c218628eb162..932569f8d629 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "live-server"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lomirus"; repo = "live-server"; rev = "v${version}"; - hash = "sha256-VsM77cEAjX12qCHS9fvImloY05b+swg7mabPd655C+s="; + hash = "sha256-0XZ7ABR2xSVbixXbjdKiUTcQ7TqAZGyVpWqzMx5kR2g="; }; - cargoHash = "sha256-a4yDHZm9LBNuwOrxra4da7u/2RNXry4UYPVDGu9eGxo="; + cargoHash = "sha256-lMRj+8D5jigCNXld4QfXy3QpRQo4ecCByqoDGC8no1w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/by-name/li/livedl/package.nix similarity index 100% rename from pkgs/tools/misc/livedl/default.nix rename to pkgs/by-name/li/livedl/package.nix diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/by-name/li/livepeer/package.nix similarity index 100% rename from pkgs/servers/livepeer/default.nix rename to pkgs/by-name/li/livepeer/package.nix diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/by-name/li/lizardfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/lizardfs/default.nix rename to pkgs/by-name/li/lizardfs/package.nix diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/by-name/lk/lklug-sinhala/package.nix similarity index 100% rename from pkgs/data/fonts/lklug-sinhala/default.nix rename to pkgs/by-name/lk/lklug-sinhala/package.nix diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/by-name/lk/lkproof/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/lkproof/default.nix rename to pkgs/by-name/lk/lkproof/package.nix diff --git a/pkgs/by-name/lk/lksctp-tools/package.nix b/pkgs/by-name/lk/lksctp-tools/package.nix new file mode 100644 index 000000000000..de370c5b5c85 --- /dev/null +++ b/pkgs/by-name/lk/lksctp-tools/package.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "lksctp-tools"; + version = "1.0.21"; + + src = fetchFromGitHub { + owner = "sctp"; + repo = "lksctp-tools"; + rev = "v${version}"; + hash = "sha256-+vbdNvHuJLYp901QgtBzMejlbzMyr9Z1eXxR3Zy7eAE="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Linux Kernel Stream Control Transmission Protocol Tools"; + homepage = "https://github.com/sctp/lksctp-tools/wiki"; + license = with licenses; [ gpl2Plus lgpl21 ]; # library is lgpl21 + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/ldap/lldap/0001-parameterize-frontend-location.patch b/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch similarity index 100% rename from pkgs/servers/ldap/lldap/0001-parameterize-frontend-location.patch rename to pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch diff --git a/pkgs/by-name/ll/lldap/Cargo.lock b/pkgs/by-name/ll/lldap/Cargo.lock new file mode 100644 index 000000000000..51645b724e30 --- /dev/null +++ b/pkgs/by-name/ll/lldap/Cargo.lock @@ -0,0 +1,5524 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "actix" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de7fa236829ba0841304542f7614c42b80fca007455315c45c785ccfa873a85b" +dependencies = [ + "actix-macros", + "actix-rt", + "actix_derive", + "bitflags 2.6.0", + "bytes", + "crossbeam-channel", + "futures-core", + "futures-sink", + "futures-task", + "futures-util", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "smallvec", + "tokio", + "tokio-util", +] + +[[package]] +name = "actix-codec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-files" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" +dependencies = [ + "actix-http", + "actix-service", + "actix-utils", + "actix-web", + "bitflags 2.6.0", + "bytes", + "derive_more 0.99.18", + "futures-core", + "http-range", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "v_htmlescape", +] + +[[package]] +name = "actix-http" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash", + "base64 0.22.1", + "bitflags 2.6.0", + "brotli", + "bytes", + "bytestring", + "derive_more 0.99.18", + "encoding_rs", + "flate2", + "futures-core", + "h2", + "http 0.2.12", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand 0.8.5", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", + "zstd", +] + +[[package]] +name = "actix-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" +dependencies = [ + "quote", + "syn 2.0.79", +] + +[[package]] +name = "actix-router" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" +dependencies = [ + "bytestring", + "cfg-if", + "http 0.2.12", + "regex", + "regex-lite", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" +dependencies = [ + "actix-macros", + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca2549781d8dd6d75c40cf6b6051260a2cc2f3c62343d761a969a0640646894" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio 1.0.2", + "socket2 0.5.7", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite", +] + +[[package]] +name = "actix-tls" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "impl-more", + "pin-project-lite", + "tokio", + "tokio-rustls 0.23.4", + "tokio-util", + "tracing", + "webpki-roots 0.22.6", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "ahash", + "bytes", + "bytestring", + "cfg-if", + "cookie", + "derive_more 0.99.18", + "encoding_rs", + "futures-core", + "futures-util", + "impl-more", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "regex-lite", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2 0.5.7", + "time", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "actix-web-httpauth" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456348ed9dcd72a13a1f4a660449fafdecee9ac8205552e286809eb5b0b29bd3" +dependencies = [ + "actix-utils", + "actix-web", + "base64 0.22.1", + "futures-core", + "futures-util", + "log", + "pin-project-lite", +] + +[[package]] +name = "actix_derive" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom 0.2.15", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc 0.2.5", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "assert_cmd" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "libc", + "predicates 3.1.2", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +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 = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "boolinator" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bson" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0aa578035b938855a710ba58d43cfb4d435f3619f99236fb35922a574d6cb1" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "lazy_static", + "linked-hash-map", + "rand 0.7.3", + "serde", + "serde_json", + "uuid 0.8.2", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata 0.4.8", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "bytestring" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +dependencies = [ + "bytes", +] + +[[package]] +name = "cc" +version = "1.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cron" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio 0.8.11", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ct-codecs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1" + +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc 0.2.5", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.79", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "unicode-xid", +] + +[[package]] +name = "derive_utils" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc2ab4d5a16117f9029e9a6b5e4e79f4c67f6519bc134210d4d4a04ba31f41b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.79", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "email-encoding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a87260449b06739ee78d6281c68d2a0ff3e3af64a78df63d3a1aeb3c06997c8a" +dependencies = [ + "base64 0.22.1", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "tempfile", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "figment_file_provider_adapter" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1e0896797efa3728309408a50d307284d5af4c733fa1859edae2bc80a314" +dependencies = [ + "figment", +] + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "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 = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[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 = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-enum" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3422d14de7903a52e9dbc10ae05a7e14445ec61890100e098754e120b2bd7b1e" +dependencies = [ + "derive_utils", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "serde", + "typenum", + "version_check", +] + +[[package]] +name = "generic-bytes" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6638d839bbd1cea640d8c5348dd82e0d545dbd364f3c2a251646eaf2ef0773b" +dependencies = [ + "generic-array", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "gloo" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23947965eee55e3e97a5cd142dd4c10631cc349b48cecca0ed230fd296f568cd" +dependencies = [ + "gloo-console", + "gloo-dialogs", + "gloo-events", + "gloo-file", + "gloo-render", + "gloo-storage", + "gloo-timers", + "gloo-utils 0.1.7", +] + +[[package]] +name = "gloo-console" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" +dependencies = [ + "futures-channel", + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.2.0", + "http 1.1.0", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "graphql-introspection-query" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" +dependencies = [ + "serde", +] + +[[package]] +name = "graphql-parser" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5613c31f18676f164112732202124f373bb2103ff017b3b85ca954ea6a66ada" +dependencies = [ + "combine", + "failure", +] + +[[package]] +name = "graphql-parser" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1abd4ce5247dfc04a03ccde70f87a048458c9356c7e41d21ad8c407b3dde6f2" +dependencies = [ + "combine", + "thiserror", +] + +[[package]] +name = "graphql-parser" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" +dependencies = [ + "combine", + "thiserror", +] + +[[package]] +name = "graphql_client" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b58571cfc3cc42c3e8ff44fc6cfbb6c0dea17ed22d20f9d8f1efc4e8209a3f" +dependencies = [ + "graphql_query_derive 0.10.0", + "serde", + "serde_json", +] + +[[package]] +name = "graphql_client" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc" +dependencies = [ + "graphql_query_derive 0.11.0", + "reqwest", + "serde", + "serde_json", +] + +[[package]] +name = "graphql_client_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4bf9cd823359d74ad3d3ecf1afd4a975f4ff2f891cdf9a66744606daf52de8c" +dependencies = [ + "graphql-introspection-query", + "graphql-parser 0.2.3", + "heck 0.3.3", + "lazy_static", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + +[[package]] +name = "graphql_client_codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9" +dependencies = [ + "graphql-introspection-query", + "graphql-parser 0.4.0", + "heck 0.4.1", + "lazy_static", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + +[[package]] +name = "graphql_query_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e56b093bfda71de1da99758b036f4cc811fd2511c8a76f75680e9ffbd2bb4251" +dependencies = [ + "graphql_client_codegen 0.10.0", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "graphql_query_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" +dependencies = [ + "graphql_client_codegen 0.11.0", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +dependencies = [ + "digest 0.9.0", + "hmac 0.11.0", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + +[[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 = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +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 = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "jpeg-decoder", + "num-traits", +] + +[[package]] +name = "impl-more" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" + +[[package]] +name = "indexmap" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +dependencies = [ + "autocfg", + "hashbrown 0.9.1", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", +] + +[[package]] +name = "inherent" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "juniper" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875dca5a0c08b1521e1bb0ed940e9955a9f38971008aaa2a9f64a2ac6b59e1b5" +dependencies = [ + "async-trait", + "bson", + "chrono", + "fnv", + "futures", + "futures-enum", + "graphql-parser 0.3.0", + "indexmap 1.6.2", + "juniper_codegen", + "serde", + "smartstring", + "static_assertions", + "url", + "uuid 0.8.2", +] + +[[package]] +name = "juniper_codegen" +version = "0.15.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aee97671061ad50301ba077d054d295e01d31a1868fbd07902db651f987e71db" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "jwt" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e46349d67dc03bdbdb28da0337a355a53ca1d5156452722c36fe21d0e6389b" +dependencies = [ + "base64 0.13.1", + "crypto-mac 0.10.1", + "digest 0.9.0", + "hmac 0.10.1", + "serde", + "serde_json", + "sha2 0.9.9", +] + +[[package]] +name = "jwt" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f" +dependencies = [ + "base64 0.13.1", + "crypto-common", + "digest 0.10.7", + "hmac 0.12.1", + "serde", + "serde_json", + "sha2 0.10.8", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin 0.9.8", +] + +[[package]] +name = "lber" +version = "0.4.3" +source = "git+https://github.com/inejge/ldap3/#5238c544aa0785b6999f20702131b9982e132e18" +dependencies = [ + "bytes", + "nom", +] + +[[package]] +name = "ldap3" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "166199a8207874a275144c8a94ff6eed5fcbf5c52303e4d9b4d53a0c7ac76554" +dependencies = [ + "async-trait", + "bytes", + "futures", + "futures-util", + "lazy_static", + "lber", + "log", + "nom", + "percent-encoding", + "ring 0.16.20", + "rustls 0.21.12", + "rustls-native-certs", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", + "tokio-util", + "url", + "x509-parser", +] + +[[package]] +name = "ldap3_proto" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a047c1b49d3b4da70f52ac54310dcd879c9b7fef658615ff17f6212ae7411e" +dependencies = [ + "base64 0.21.7", + "bytes", + "lber", + "nom", + "peg", + "thiserror", + "tokio-util", + "tracing", + "uuid 1.11.0", +] + +[[package]] +name = "lettre" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d" +dependencies = [ + "async-trait", + "base64 0.21.7", + "email-encoding", + "email_address", + "fastrand 1.9.0", + "futures-io", + "futures-util", + "httpdate", + "idna 0.3.0", + "mime", + "nom", + "once_cell", + "quoted_printable", + "rustls 0.21.12", + "rustls-pemfile", + "serde", + "socket2 0.4.10", + "tokio", + "tokio-rustls 0.24.1", + "webpki-roots 0.23.1", +] + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lldap" +version = "0.5.1-alpha" +dependencies = [ + "actix", + "actix-files", + "actix-http", + "actix-rt", + "actix-server", + "actix-service", + "actix-tls", + "actix-web", + "actix-web-httpauth", + "anyhow", + "assert_cmd", + "async-trait", + "base64 0.21.7", + "bincode", + "chrono", + "clap", + "cron", + "derive_builder", + "derive_more 1.0.0", + "figment", + "figment_file_provider_adapter", + "futures", + "futures-util", + "graphql_client 0.11.0", + "hmac 0.12.1", + "http 1.1.0", + "image", + "itertools", + "juniper", + "jwt 0.16.0", + "lber", + "ldap3", + "ldap3_proto", + "lettre", + "lldap_auth", + "log", + "mockall", + "nix", + "opaque-ke", + "orion", + "pretty_assertions", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reqwest", + "rustls 0.20.9", + "rustls-pemfile", + "sea-orm", + "secstr", + "serde", + "serde_bytes", + "serde_json", + "serial_test", + "sha2 0.10.8", + "strum", + "thiserror", + "time", + "tokio", + "tokio-rustls 0.23.4", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-actix-web", + "tracing-attributes", + "tracing-forest", + "tracing-log", + "tracing-subscriber", + "url", + "urlencoding", + "uuid 1.11.0", + "webpki-roots 0.22.6", +] + +[[package]] +name = "lldap_app" +version = "0.5.1-alpha" +dependencies = [ + "anyhow", + "base64 0.13.1", + "chrono", + "gloo-console", + "gloo-file", + "gloo-net", + "graphql_client 0.10.0", + "http 0.2.12", + "image", + "indexmap 1.6.2", + "jwt 0.13.0", + "lldap_auth", + "rand 0.8.5", + "serde", + "serde_json", + "url-escape", + "validator", + "validator_derive", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew", + "yew-router", + "yew_form", + "yew_form_derive", +] + +[[package]] +name = "lldap_auth" +version = "0.4.0" +dependencies = [ + "chrono", + "curve25519-dalek", + "derive_more 1.0.0", + "digest 0.9.0", + "generic-array", + "getrandom 0.2.15", + "opaque-ke", + "rand 0.8.5", + "rust-argon2", + "sea-orm", + "serde", + "sha2 0.9.9", + "thiserror", +] + +[[package]] +name = "lldap_migration_tool" +version = "0.4.2" +dependencies = [ + "anyhow", + "base64 0.13.1", + "graphql_client 0.11.0", + "ldap3", + "lldap_auth", + "rand 0.8.5", + "requestty", + "reqwest", + "serde", + "serde_json", + "smallvec", +] + +[[package]] +name = "lldap_set_password" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "lldap_auth", + "rand 0.8.5", + "reqwest", + "serde", + "serde_json", +] + +[[package]] +name = "local-channel" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" +dependencies = [ + "futures-core", + "futures-sink", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest 0.10.7", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "mockall" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates 2.1.5", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "mutually_exclusive_features" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "opaque-ke" +version = "0.6.1" +source = "git+https://github.com/nitnelave/opaque-ke/?branch=zeroize_1.5#2f7f3a694516a7d1be4182945bed3d910cad777a" +dependencies = [ + "base64 0.13.1", + "curve25519-dalek", + "digest 0.9.0", + "displaydoc 0.1.7", + "generic-array", + "generic-bytes", + "hkdf 0.11.0", + "hmac 0.11.0", + "rand 0.8.5", + "serde", + "subtle", + "thiserror", + "zeroize", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "orion" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ab5415cf60cd271259e576f2ddee7a5f9fed42659035224c01af766943fad3" +dependencies = [ + "ct-codecs", + "fiat-crypto", + "getrandom 0.2.15", + "subtle", + "zeroize", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "peg" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "pretty_assertions" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + +[[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-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "proc-macro2" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "version_check", + "yansi", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "requestty" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d06fb394ca73d15ad0c7bbc673459506a851a84586cd90d67d42932a280281e" +dependencies = [ + "requestty-ui", + "smallvec", + "tempfile", +] + +[[package]] +name = "requestty-ui" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31a4bce6f730d12e36993944036e2f93e88033d8a78734d8734fdb0043662cae" +dependencies = [ + "bitflags 1.3.2", + "crossterm", + "once_cell", + "textwrap", + "unicode-segmentation", +] + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.15", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64 0.13.1", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +dependencies = [ + "log", + "ring 0.16.20", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scoped-tls-hkt" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9603871ffe5df3ac39cb624790c296dbd47a400d202f56bf3e414045099524d" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "sea-bae" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25" +dependencies = [ + "heck 0.4.1", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "sea-orm" +version = "0.12.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0" +dependencies = [ + "async-stream", + "async-trait", + "chrono", + "futures", + "log", + "ouroboros", + "sea-orm-macros", + "sea-query", + "sea-query-binder", + "serde", + "sqlx", + "strum", + "thiserror", + "tracing", + "url", + "uuid 1.11.0", +] + +[[package]] +name = "sea-orm-macros" +version = "0.12.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "sea-bae", + "syn 2.0.79", + "unicode-ident", +] + +[[package]] +name = "sea-query" +version = "0.30.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +dependencies = [ + "chrono", + "derivative", + "inherent", + "ordered-float", + "uuid 1.11.0", +] + +[[package]] +name = "sea-query-binder" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +dependencies = [ + "chrono", + "sea-query", + "sqlx", + "uuid 1.11.0", +] + +[[package]] +name = "secstr" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04f657244f605c4cf38f6de5993e8bd050c8a303f86aeabff142d5c7c113e12" +dependencies = [ + "libc", + "serde", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +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.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618365e8e586c22123d692b72a7d791d5ee697817b65a218cdf12a98870af0f7" +dependencies = [ + "fnv", + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "indexmap 2.6.0", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serial_test" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" +dependencies = [ + "dashmap", + "fslock", + "lazy_static", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio 0.8.11", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlformat" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.6.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls 0.21.12", + "rustls-pemfile", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid 1.11.0", + "webpki-roots 0.25.4", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.8", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf 0.12.4", + "hmac 0.12.1", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid 1.11.0", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf 0.12.4", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid 1.11.0", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", + "uuid 1.11.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.79", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand 2.1.1", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[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.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio 1.0.2", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.9", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.6.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-actix-web" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15bc0cd5f72e837e310f4d978a90abf202a7f7d8ef3272246bae381d0086d3bf" +dependencies = [ + "actix-web", + "mutually_exclusive_features", + "pin-project", + "tracing", + "uuid 1.11.0", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-forest" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee40835db14ddd1e3ba414292272eddde9dad04d3d4b65509656414d1c42592f" +dependencies = [ + "chrono", + "smallvec", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +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", + "serde", +] + +[[package]] +name = "url-escape" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44e0ce4d1246d075ca5abec4b41d33e87a6054d08e2366b63205665e950db218" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "atomic", + "getrandom 0.2.15", + "md-5", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] +name = "validator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e" +dependencies = [ + "idna 0.2.3", + "lazy_static", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_types", +] + +[[package]] +name = "validator_derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee" +dependencies = [ + "if_chain", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "validator_types", +] + +[[package]] +name = "validator_types" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.3", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "whoami" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +dependencies = [ + "redox_syscall", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[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 = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yew" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1ccb53e57d3f7d847338cf5758befa811cabe207df07f543c06f502f9998cd" +dependencies = [ + "console_error_panic_hook", + "gloo", + "gloo-utils 0.1.7", + "indexmap 1.6.2", + "js-sys", + "scoped-tls-hkt", + "slab", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew-macro", +] + +[[package]] +name = "yew-macro" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fab79082b556d768d6e21811869c761893f0450e1d550a67892b9bce303b7bb" +dependencies = [ + "boolinator", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "yew-router" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155804f6f3aa309f596d5c3fa14486a94e7756f1edd7634569949e401d5099f2" +dependencies = [ + "gloo", + "gloo-utils 0.1.7", + "js-sys", + "route-recognizer", + "serde", + "serde-wasm-bindgen", + "serde_urlencoded", + "thiserror", + "wasm-bindgen", + "web-sys", + "yew", + "yew-router-macro", +] + +[[package]] +name = "yew-router-macro" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39049d193b52eaad4ffc80916bf08806d142c90b5edcebd527644de438a7e19a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "yew_form" +version = "0.1.8" +source = "git+https://github.com/jfbilodeau/yew_form?rev=4b9fabffb63393ec7626a4477fd36de12a07fac9#4b9fabffb63393ec7626a4477fd36de12a07fac9" +dependencies = [ + "gloo-console", + "validator", + "validator_derive", + "wasm-bindgen", + "web-sys", + "yew", +] + +[[package]] +name = "yew_form_derive" +version = "0.1.8" +source = "git+https://github.com/jfbilodeau/yew_form?rev=4b9fabffb63393ec7626a4477fd36de12a07fac9#4b9fabffb63393ec7626a4477fd36de12a07fac9" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "yew_form", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix new file mode 100644 index 000000000000..cad8c501fe9e --- /dev/null +++ b/pkgs/by-name/ll/lldap/package.nix @@ -0,0 +1,84 @@ +{ binaryen +, fetchFromGitHub +, lib +, lldap +, nixosTests +, rustPlatform +, rustc +, wasm-bindgen-cli +, wasm-pack +, which +}: + +let + + commonDerivationAttrs = { + pname = "lldap"; + version = "0.5.1-unstable-2024-10-30"; + + src = fetchFromGitHub { + owner = "lldap"; + repo = "lldap"; + rev = "143eb70bee92e8225028ea00b69735a28e8c088d"; + hash = "sha256-6XGKz/OKHd80yX9a4rlvc9RZjBB6ao+jiO5Vlcc0ohE="; + }; + + # `Cargo.lock` has git dependencies, meaning can't use `cargoHash` + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "lber-0.4.3" = "sha256-ff0C4uOAohbwHIFt6c0iGQwPDUTJhO3vHlSUDK/yEbY="; + "opaque-ke-0.6.1" = "sha256-99gaDv7eIcYChmvOKQ4yXuaGVzo2Q6BcgSQOzsLF+fM="; + "yew_form-0.1.8" = "sha256-1n9C7NiFfTjbmc9B5bDEnz7ZpYJo9ZT8/dioRXJ65hc="; + }; + }; + + }; + + frontend = rustPlatform.buildRustPackage (commonDerivationAttrs // { + pname = commonDerivationAttrs.pname + "-frontend"; + + nativeBuildInputs = [ + wasm-pack wasm-bindgen-cli binaryen which rustc rustc.llvmPackages.lld + ]; + + buildPhase = '' + HOME=`pwd` ./app/build.sh + ''; + + installPhase = '' + mkdir -p $out + cp -R app/{index.html,pkg,static} $out/ + ''; + + doCheck = false; + }); + +in rustPlatform.buildRustPackage (commonDerivationAttrs // { + cargoBuildFlags = [ "-p" "lldap" "-p" "lldap_migration_tool" "-p" "lldap_set_password" ]; + + patches = [ + ./0001-parameterize-frontend-location.patch + ]; + + postPatch = '' + substituteInPlace server/src/infra/tcp_server.rs --subst-var-by frontend '${frontend}' + ''; + + passthru = { + inherit frontend; + tests = { + inherit (nixosTests) lldap; + }; + }; + + meta = with lib; { + description = "Lightweight authentication server that provides an opinionated, simplified LDAP interface for authentication"; + homepage = "https://github.com/lldap/lldap"; + changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ bendlas ]; + mainProgram = "lldap"; + }; +}) diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/by-name/ll/llhttp/package.nix similarity index 100% rename from pkgs/development/libraries/llhttp/default.nix rename to pkgs/by-name/ll/llhttp/package.nix diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/by-name/ll/llpp/package.nix similarity index 100% rename from pkgs/applications/misc/llpp/default.nix rename to pkgs/by-name/ll/llpp/package.nix diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/by-name/ll/lls/package.nix similarity index 100% rename from pkgs/applications/networking/lls/default.nix rename to pkgs/by-name/ll/lls/package.nix diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/by-name/lm/lm_sensors/package.nix similarity index 100% rename from pkgs/os-specific/linux/lm-sensors/default.nix rename to pkgs/by-name/lm/lm_sensors/package.nix diff --git a/pkgs/development/libraries/lmdb/bin-ext.patch b/pkgs/by-name/lm/lmdb/bin-ext.patch similarity index 100% rename from pkgs/development/libraries/lmdb/bin-ext.patch rename to pkgs/by-name/lm/lmdb/bin-ext.patch diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/by-name/lm/lmdb/hardcoded-compiler.patch similarity index 100% rename from pkgs/development/libraries/lmdb/hardcoded-compiler.patch rename to pkgs/by-name/lm/lmdb/hardcoded-compiler.patch diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/by-name/lm/lmdb/package.nix similarity index 100% rename from pkgs/development/libraries/lmdb/default.nix rename to pkgs/by-name/lm/lmdb/package.nix diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/by-name/lm/lmdbxx/package.nix similarity index 100% rename from pkgs/development/libraries/lmdbxx/default.nix rename to pkgs/by-name/lm/lmdbxx/package.nix diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/by-name/lm/lmmath/package.nix similarity index 100% rename from pkgs/data/fonts/lmmath/default.nix rename to pkgs/by-name/lm/lmmath/package.nix diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/by-name/lm/lmodern/package.nix similarity index 100% rename from pkgs/data/fonts/lmodern/default.nix rename to pkgs/by-name/lm/lmodern/package.nix diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/by-name/lm/lmp/package.nix similarity index 100% rename from pkgs/tools/security/lmp/default.nix rename to pkgs/by-name/lm/lmp/package.nix diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 4b2e56deee8f..dec420e3fe52 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.58.0"; + version = "3.60.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY="; + hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do="; }; strictDeps = true; @@ -54,10 +54,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/libs/core/include/core/SystemPaths.hpp --replace-fail "/etc" "$out/share/lms" ''; postInstall = '' diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/by-name/ln/lnav/package.nix similarity index 100% rename from pkgs/tools/misc/lnav/default.nix rename to pkgs/by-name/ln/lnav/package.nix diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/by-name/ln/lnch/package.nix similarity index 100% rename from pkgs/tools/misc/lnch/default.nix rename to pkgs/by-name/ln/lnch/package.nix diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/by-name/ln/lnd/package.nix similarity index 100% rename from pkgs/applications/blockchains/lnd/default.nix rename to pkgs/by-name/ln/lnd/package.nix diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/by-name/ln/lndconnect/package.nix similarity index 100% rename from pkgs/applications/blockchains/lndconnect/default.nix rename to pkgs/by-name/ln/lndconnect/package.nix diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/by-name/ln/lndhub-go/package.nix similarity index 100% rename from pkgs/applications/blockchains/lndhub-go/default.nix rename to pkgs/by-name/ln/lndhub-go/package.nix diff --git a/pkgs/by-name/ln/lndinit/package.nix b/pkgs/by-name/ln/lndinit/package.nix new file mode 100644 index 000000000000..183465512d6f --- /dev/null +++ b/pkgs/by-name/ln/lndinit/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "lndinit"; + version = "0.1.22-beta"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "lndinit"; + rev = "v${version}"; + hash = "sha256-KXCObRUhXTEeb48hnQYrnb55g+nJomr52IIVpFDn+nY="; + }; + + vendorHash = "sha256-peyLhDEH9DKHAQfxVCvv92DErHjidA3DSjpN357Px6M="; + + subPackages = [ "." ]; + + meta = { + description = "Wallet initializer utility for lnd"; + homepage = "https://github.com/lightninglabs/lndinit"; + mainProgram = "lndinit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aldoborrero ]; + }; +} diff --git a/pkgs/applications/blockchains/lndmanage/default.nix b/pkgs/by-name/ln/lndmanage/package.nix similarity index 100% rename from pkgs/applications/blockchains/lndmanage/default.nix rename to pkgs/by-name/ln/lndmanage/package.nix diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/by-name/lo/loadlibrary/package.nix similarity index 100% rename from pkgs/tools/misc/loadlibrary/default.nix rename to pkgs/by-name/lo/loadlibrary/package.nix diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/by-name/lo/loadwatch/package.nix similarity index 100% rename from pkgs/tools/system/loadwatch/default.nix rename to pkgs/by-name/lo/loadwatch/package.nix diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/by-name/lo/loc/package.nix similarity index 100% rename from pkgs/development/misc/loc/default.nix rename to pkgs/by-name/lo/loc/package.nix diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 766720dfd65b..ee73e0381de0 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -147,8 +147,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "96776405a17034dcfd53d3ddf5d142d34bdbb657"; - hash = "sha256-V5Z+8cpllhDR0s4InoXyEU59a/qo2b5Xj8oeZd0rtGk="; + rev = "45f097645efb11b6d09a5b4adbbfd7c312ac0126"; + hash = "sha256-kZlH+Xpt38Ymc9TW7qRVyN7ISwed4ycA0M0808+UcXM="; fetchSubmodules = true; }; postPatch = @@ -299,8 +299,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "fdbfb460ed546452a5d53611bba66d10d842e719"; - hash = "sha256-ZLSVPQUw1sp7sETk2w38qKq8ut7XNGuof2TUvFzjdPk="; + rev = "a5abfe6a90495f7bf19fe70d016ecc255e97359c"; + hash = "sha256-XSPO1Wtqlq1krwAH98jMIGWa1Npmnjd5oCJ0lc3D3H4="; }; nativeBuildInputs = [ @@ -431,12 +431,12 @@ let stdenv; pname = "local-ai"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-EwBgw0WXnK3E3ZyA1+Xk/o7Te7OCJWi7njefA4PDUJ0="; + hash = "sha256-vIjjGs3IIxnWlLsybQNWJHbWNnoInVh+otJ7vNODcik="; }; prepare-sources = diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index eebc357489c7..06639536ff75 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -33,7 +33,10 @@ in health = testers.runNixOSTest { name = self.name + "-health"; - nodes.machine = common-config; + nodes.machine = { + imports = [ common-config ]; + virtualisation.memorySize = 2048; + }; testScript = let port = "8080"; @@ -47,6 +50,8 @@ in ''; }; +} +// lib.optionalAttrs (!self.features.with_cublas) { # https://localai.io/features/embeddings/#bert-embeddings bert = let @@ -73,7 +78,7 @@ in nodes.machine = { imports = [ common-config ]; virtualisation.cores = 2; - virtualisation.memorySize = 2048; + virtualisation.memorySize = 4096; services.local-ai.models = models; }; passthru = { diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/by-name/lo/localproxy/package.nix similarity index 100% rename from pkgs/applications/networking/localproxy/default.nix rename to pkgs/by-name/lo/localproxy/package.nix diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix new file mode 100644 index 000000000000..09c7ab00fc4e --- /dev/null +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -0,0 +1,146 @@ +{ stdenv +, lib +, fetchurl +, asciidoc +, docbook-xsl-nons +, docbook_xml_dtd_45 +, gettext +, itstool +, libxslt +, gexiv2 +, tinysparql +, meson +, mesonEmulatorHook +, ninja +, pkg-config +, vala +, wrapGAppsNoGuiHook +, bzip2 +, dbus +, exempi +, giflib +, glib +, gobject-introspection +, gnome +, gst_all_1 +, icu +, json-glib +, libcue +, libexif +, libgsf +, libgudev +, libgxps +, libiptcdata +, libjpeg +, libosinfo +, libpng +, libseccomp +, libtiff +, libuuid +, libxml2 +, networkmanager +, poppler +, systemd +, taglib +, upower +, totem-pl-parser +, e2fsprogs +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "localsearch"; + version = "3.8.0"; + + src = fetchurl { + url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; + hash = "sha256-5Og6Ha67UmORW0W3GXMeP3BB2VnL1jfqKa++kQySu/k="; + }; + + patches = [ + ./tracker-landlock-nix-store-permission.patch + ]; + + nativeBuildInputs = [ + asciidoc + docbook-xsl-nons + docbook_xml_dtd_45 + gettext + glib + gobject-introspection + itstool + libxslt + meson + ninja + pkg-config + vala + wrapGAppsNoGuiHook + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + # TODO: add libenca, libosinfo + buildInputs = [ + bzip2 + dbus + exempi + giflib + gexiv2 + totem-pl-parser + tinysparql + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gst_all_1.gst-libav + icu + json-glib + libcue + libexif + libgsf + libgudev + libgxps + libiptcdata + libjpeg + libosinfo + libpng + libtiff + libuuid + libxml2 + poppler + taglib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libseccomp + networkmanager + systemd + upower + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + e2fsprogs + ]; + + mesonFlags = [ + # TODO: tests do not like our sandbox + "-Dfunctional_tests=false" + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + "-Dbattery_detection=none" + "-Dnetwork_manager=disabled" + "-Dsystemd_user_services=false" + ]; + + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + passthru = { + updateScript = gnome.updateScript { packageName = "localsearch"; }; + }; + + meta = { + homepage = "https://gitlab.gnome.org/GNOME/localsearch"; + description = "Desktop-neutral user information store, search tool and indexer"; + maintainers = lib.teams.gnome.members; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + mainProgram = "localsearch"; + }; +}) diff --git a/pkgs/by-name/tr/tracker-miners/tracker-landlock-nix-store-permission.patch b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch similarity index 100% rename from pkgs/by-name/tr/tracker-miners/tracker-landlock-nix-store-permission.patch rename to pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/by-name/lo/localtime/package.nix similarity index 100% rename from pkgs/tools/system/localtime/default.nix rename to pkgs/by-name/lo/localtime/package.nix diff --git a/pkgs/tools/misc/locate-dominating-file/default.nix b/pkgs/by-name/lo/locate-dominating-file/package.nix similarity index 100% rename from pkgs/tools/misc/locate-dominating-file/default.nix rename to pkgs/by-name/lo/locate-dominating-file/package.nix diff --git a/pkgs/by-name/lo/loccount/package.nix b/pkgs/by-name/lo/loccount/package.nix new file mode 100644 index 000000000000..72903e16cb13 --- /dev/null +++ b/pkgs/by-name/lo/loccount/package.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromGitLab, python3 }: +buildGoModule rec { + pname = "loccount"; + version = "2.16"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "loccount"; + rev = version; + hash = "sha256-uHX45KZO6R0tgTU10csKLiVYZZ/ea2V6BwhF6vfKKtA="; + }; + + vendorHash = null; + + excludedPackages = "tests"; + + nativeBuildInputs = [ python3 ]; + + ldflags = [ "-s" "-w" ]; + + preBuild = '' + patchShebangs --build tablegen.py + + go generate + ''; + + meta = with lib; { + description = "Re-implementation of sloccount in Go"; + mainProgram = "loccount"; + longDescription = '' + loccount is a re-implementation of David A. Wheeler's sloccount tool + in Go. It is faster and handles more different languages. Because + it's one source file in Go, it is easier to maintain and extend than the + multi-file, multi-language implementation of the original. + + The algorithms are largely unchanged and can be expected to produce + identical numbers for languages supported by both tools. Python is + an exception; loccount corrects buggy counting of single-quote multiline + literals in sloccount 2.26. + ''; + homepage = "https://gitlab.com/esr/loccount"; + downloadPage = "https://gitlab.com/esr/loccount/tree/master"; + license = licenses.bsd2; + maintainers = with maintainers; [ calvertvl ]; + }; +} diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/by-name/lo/lockdep/package.nix similarity index 100% rename from pkgs/os-specific/linux/lockdep/default.nix rename to pkgs/by-name/lo/lockdep/package.nix diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/by-name/lo/lockfileProgs/package.nix similarity index 100% rename from pkgs/tools/misc/lockfile-progs/default.nix rename to pkgs/by-name/lo/lockfileProgs/package.nix diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/by-name/lo/log4cplus/package.nix similarity index 100% rename from pkgs/development/libraries/log4cplus/default.nix rename to pkgs/by-name/lo/log4cplus/package.nix diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/by-name/lo/log4cpp/package.nix similarity index 100% rename from pkgs/development/libraries/log4cpp/default.nix rename to pkgs/by-name/lo/log4cpp/package.nix diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/by-name/lo/log4cxx/package.nix similarity index 100% rename from pkgs/development/libraries/log4cxx/default.nix rename to pkgs/by-name/lo/log4cxx/package.nix diff --git a/pkgs/tools/security/log4j-detect/default.nix b/pkgs/by-name/lo/log4j-detect/package.nix similarity index 100% rename from pkgs/tools/security/log4j-detect/default.nix rename to pkgs/by-name/lo/log4j-detect/package.nix diff --git a/pkgs/tools/security/log4j-scan/default.nix b/pkgs/by-name/lo/log4j-scan/package.nix similarity index 100% rename from pkgs/tools/security/log4j-scan/default.nix rename to pkgs/by-name/lo/log4j-scan/package.nix diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix similarity index 100% rename from pkgs/tools/security/log4j-sniffer/default.nix rename to pkgs/by-name/lo/log4j-sniffer/package.nix diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix similarity index 100% rename from pkgs/tools/security/log4j-vuln-scanner/default.nix rename to pkgs/by-name/lo/log4j-vuln-scanner/package.nix diff --git a/pkgs/tools/security/log4jcheck/default.nix b/pkgs/by-name/lo/log4jcheck/package.nix similarity index 100% rename from pkgs/tools/security/log4jcheck/default.nix rename to pkgs/by-name/lo/log4jcheck/package.nix diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/by-name/lo/log4shell-detector/package.nix similarity index 100% rename from pkgs/tools/security/log4shell-detector/default.nix rename to pkgs/by-name/lo/log4shell-detector/package.nix diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/by-name/lo/log4shib/package.nix similarity index 100% rename from pkgs/development/libraries/log4shib/default.nix rename to pkgs/by-name/lo/log4shib/package.nix diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/by-name/lo/logcheck/package.nix similarity index 100% rename from pkgs/tools/system/logcheck/default.nix rename to pkgs/by-name/lo/logcheck/package.nix diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/by-name/lo/logisim-evolution/package.nix similarity index 100% rename from pkgs/applications/science/logic/logisim-evolution/default.nix rename to pkgs/by-name/lo/logisim-evolution/package.nix diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/by-name/lo/logisim/package.nix similarity index 100% rename from pkgs/applications/science/logic/logisim/default.nix rename to pkgs/by-name/lo/logisim/package.nix diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/by-name/lo/logkeys/package.nix similarity index 100% rename from pkgs/tools/security/logkeys/default.nix rename to pkgs/by-name/lo/logkeys/package.nix diff --git a/pkgs/tools/security/logmap/default.nix b/pkgs/by-name/lo/logmap/package.nix similarity index 100% rename from pkgs/tools/security/logmap/default.nix rename to pkgs/by-name/lo/logmap/package.nix diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/by-name/lo/logmein-hamachi/package.nix similarity index 100% rename from pkgs/tools/networking/logmein-hamachi/default.nix rename to pkgs/by-name/lo/logmein-hamachi/package.nix diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/by-name/lo/logrotate/package.nix similarity index 100% rename from pkgs/tools/system/logrotate/default.nix rename to pkgs/by-name/lo/logrotate/package.nix diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index c99e04a36bf6..0f56d5def56d 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -41,7 +41,7 @@ in nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; dontUnpack = stdenv.hostPlatform.isLinux; dontConfigure = true; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/by-name/lo/logstalgia/package.nix similarity index 100% rename from pkgs/tools/graphics/logstalgia/default.nix rename to pkgs/by-name/lo/logstalgia/package.nix diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/by-name/lo/logtop/package.nix similarity index 100% rename from pkgs/tools/misc/logtop/default.nix rename to pkgs/by-name/lo/logtop/package.nix diff --git a/pkgs/by-name/lo/loguru/package.nix b/pkgs/by-name/lo/loguru/package.nix new file mode 100644 index 000000000000..84fe218859c7 --- /dev/null +++ b/pkgs/by-name/lo/loguru/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, +}: + +stdenv.mkDerivation { + pname = "loguru"; + version = "2.1.0-unstable-2023-04-06"; + + src = fetchFromGitHub { + owner = "emilk"; + repo = "loguru"; + rev = "4adaa185883e3c04da25913579c451d3c32cfac1"; + hash = "sha256-NpMKyjCC06bC5B3xqgDr2NgA9RsPEeiWr9GbHrHHzZ8="; + }; + + patches = [ + # See https://github.com/emilk/loguru/issues/249 + # The following patches are coming from a fork and fix builds on Darwin + # Hopefully they will be merged in the main repository soon. + (fetchpatch { + url = "https://github.com/virtuosonic/loguru/commit/e1ffdc4149083cc221d44b666a0f7e3ec4a87259.patch"; + hash = "sha256-fYdS8+qfgyj1J+T6H434jDGK/L+VYq+L22CQ7M/uiXE="; + }) + (fetchpatch { + url = "https://github.com/virtuosonic/loguru/commit/743777bea361642349d4673e6a0a55912849c14f.patch"; + hash = "sha256-3FhH7zdkzHuXSirSCr8A3uHg8UpSfEM02AkR0ZSG0Yw="; + }) + ]; + + cmakeFlags = [ + "-DLOGURU_WITH_STREAMS=1" + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Lightweight C++ logging library"; + homepage = "https://github.com/emilk/loguru"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix similarity index 100% rename from pkgs/tools/misc/lokalise2-cli/default.nix rename to pkgs/by-name/lo/lokalise2-cli/package.nix diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/by-name/lo/loki/package.nix similarity index 100% rename from pkgs/development/libraries/loki/default.nix rename to pkgs/by-name/lo/loki/package.nix diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/by-name/lo/lokinet/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/lokinet/default.nix rename to pkgs/by-name/lo/lokinet/package.nix diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/by-name/lo/lombok/package.nix similarity index 100% rename from pkgs/development/libraries/java/lombok/default.nix rename to pkgs/by-name/lo/lombok/package.nix diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/by-name/lo/long-shebang/package.nix similarity index 100% rename from pkgs/misc/long-shebang/default.nix rename to pkgs/by-name/lo/long-shebang/package.nix diff --git a/pkgs/servers/monitoring/longview/log-stdout.patch b/pkgs/by-name/lo/longview/log-stdout.patch similarity index 100% rename from pkgs/servers/monitoring/longview/log-stdout.patch rename to pkgs/by-name/lo/longview/log-stdout.patch diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/by-name/lo/longview/package.nix similarity index 100% rename from pkgs/servers/monitoring/longview/default.nix rename to pkgs/by-name/lo/longview/package.nix diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/by-name/lo/looking-glass-client/package.nix similarity index 100% rename from pkgs/applications/virtualization/looking-glass-client/default.nix rename to pkgs/by-name/lo/looking-glass-client/package.nix diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/by-name/lo/loop/package.nix similarity index 100% rename from pkgs/tools/misc/loop/default.nix rename to pkgs/by-name/lo/loop/package.nix diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/by-name/lo/lorien/package.nix similarity index 100% rename from pkgs/applications/graphics/lorien/default.nix rename to pkgs/by-name/lo/lorien/package.nix diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/by-name/lo/losslessaudiochecker/package.nix similarity index 100% rename from pkgs/applications/audio/losslessaudiochecker/default.nix rename to pkgs/by-name/lo/losslessaudiochecker/package.nix diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/build-from-appimage.nix rename to pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/build-from-dmg.nix rename to pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/build-from-windows.nix rename to pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/by-name/lo/losslesscut-bin/package.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/default.nix rename to pkgs/by-name/lo/losslesscut-bin/package.nix diff --git a/pkgs/tools/misc/lottieconverter/default.nix b/pkgs/by-name/lo/lottieconverter/package.nix similarity index 100% rename from pkgs/tools/misc/lottieconverter/default.nix rename to pkgs/by-name/lo/lottieconverter/package.nix diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/by-name/lo/loudmouth/package.nix similarity index 100% rename from pkgs/development/libraries/loudmouth/default.nix rename to pkgs/by-name/lo/loudmouth/package.nix diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/by-name/lo/lounge-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/lounge/default.nix rename to pkgs/by-name/lo/lounge-gtk-theme/package.nix diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 19b3d5b48614..7e2c146ae4d0 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "46.2"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-OhWj+c+PiJp+ZC45AimfeSGKkAHAjFY3TgWRT/71qzA="; + hash = "sha256-9gNWmpThcwHy2sNLAsEsbY48pq65vmq1uYM5P5Ve2Ho="; }; patches = [ diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/by-name/lo/lout/package.nix similarity index 100% rename from pkgs/tools/typesetting/lout/default.nix rename to pkgs/by-name/lo/lout/package.nix diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/by-name/lo/lowdown/package.nix similarity index 100% rename from pkgs/tools/typesetting/lowdown/default.nix rename to pkgs/by-name/lo/lowdown/package.nix diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/by-name/lo/loxodo/package.nix similarity index 100% rename from pkgs/applications/misc/loxodo/default.nix rename to pkgs/by-name/lo/loxodo/package.nix diff --git a/pkgs/applications/misc/loxodo/wxpython.patch b/pkgs/by-name/lo/loxodo/wxpython.patch similarity index 100% rename from pkgs/applications/misc/loxodo/wxpython.patch rename to pkgs/by-name/lo/loxodo/wxpython.patch diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix similarity index 100% rename from pkgs/development/libraries/lpcnetfreedv/default.nix rename to pkgs/by-name/lp/lpcnetfreedv/package.nix diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/by-name/lr/lr/package.nix similarity index 100% rename from pkgs/tools/system/lr/default.nix rename to pkgs/by-name/lr/lr/package.nix diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/by-name/lr/lrcalc/package.nix similarity index 100% rename from pkgs/applications/science/math/lrcalc/default.nix rename to pkgs/by-name/lr/lrcalc/package.nix diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/by-name/lr/lrdf/package.nix similarity index 100% rename from pkgs/development/libraries/lrdf/default.nix rename to pkgs/by-name/lr/lrdf/package.nix diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/by-name/lr/lrs/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/lrs/default.nix rename to pkgs/by-name/lr/lrs/package.nix diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/by-name/lr/lrzip/package.nix similarity index 100% rename from pkgs/tools/compression/lrzip/default.nix rename to pkgs/by-name/lr/lrzip/package.nix diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/by-name/lr/lrzsz/package.nix similarity index 100% rename from pkgs/tools/misc/lrzsz/default.nix rename to pkgs/by-name/lr/lrzsz/package.nix diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/by-name/ls/ls-lint/package.nix similarity index 100% rename from pkgs/development/tools/ls-lint/default.nix rename to pkgs/by-name/ls/ls-lint/package.nix diff --git a/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/pkgs/by-name/ls/lsb-release/lsb_release.sh similarity index 100% rename from pkgs/os-specific/linux/lsb-release/lsb_release.sh rename to pkgs/by-name/ls/lsb-release/lsb_release.sh diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/by-name/ls/lsb-release/package.nix similarity index 100% rename from pkgs/os-specific/linux/lsb-release/default.nix rename to pkgs/by-name/ls/lsb-release/package.nix diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/by-name/ls/lscolors/package.nix similarity index 100% rename from pkgs/applications/misc/lscolors/default.nix rename to pkgs/by-name/ls/lscolors/package.nix diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix index 9be5a2ef0dd6..98c2e8dfc8b1 100644 --- a/pkgs/by-name/ls/lsd/package.nix +++ b/pkgs/by-name/ls/lsd/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rustPlatform, installShellFiles, - darwin, + apple-sdk_11, pandoc, testers, lsd, @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { pandoc ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; postInstall = '' pandoc --standalone --to man doc/lsd.md -o lsd.1 diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/by-name/ls/lsdvd/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/lsdvd/default.nix rename to pkgs/by-name/ls/lsdvd/package.nix diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/by-name/ls/lsirec/package.nix similarity index 100% rename from pkgs/os-specific/linux/lsirec/default.nix rename to pkgs/by-name/ls/lsirec/package.nix diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/by-name/ls/lsiutil/package.nix similarity index 100% rename from pkgs/os-specific/linux/lsiutil/default.nix rename to pkgs/by-name/ls/lsiutil/package.nix diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/by-name/ls/lsix/package.nix similarity index 100% rename from pkgs/tools/graphics/lsix/default.nix rename to pkgs/by-name/ls/lsix/package.nix diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix new file mode 100644 index 000000000000..a878b5ff8ab5 --- /dev/null +++ b/pkgs/by-name/ls/lsof/package.nix @@ -0,0 +1,75 @@ +{ lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences, freebsd, ed }: + +let + dialect = lib.last (lib.splitString "-" stdenv.hostPlatform.system); +in + +stdenv.mkDerivation rec { + pname = "lsof"; + version = "4.99.3"; + + src = fetchFromGitHub { + owner = "lsof-org"; + repo = "lsof"; + rev = version; + hash = "sha256-XW3l+E9D8hgI9jGJGKkIAKa8O9m0JHgZhEASqg4gYuw="; + }; + + postPatch = '' + patchShebangs --build lib/dialects/*/Mksrc + # Do not re-build version.h in every 'make' to allow nuke-refs below. + # We remove phony 'FRC' target that forces rebuilds: + # 'version.h: FRC ...' is translated to 'version.h: ...'. + sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/' + '' + # help Configure find libproc.h in $SDKROOT + + lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i -e 's|lcurses|lncurses|g' \ + -e "s|/Library.*/MacOSX.sdk/|\"$SDKROOT\"/|" Configure + ''; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ nukeReferences perl which ed ]; + buildInputs = [ ncurses ]; + + # Stop build scripts from searching global include paths + LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; + configurePhase = let genericFlags = "LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB"; + linuxFlags = lib.optionalString stdenv.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD"; + freebsdFlags = lib.optionalString stdenv.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys"; + in "${genericFlags} ${linuxFlags} ${freebsdFlags} ./Configure -n ${dialect}"; + + preBuild = '' + for filepath in $(find dialects/${dialect} -type f); do + sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath + done + + # Wipe out development-only flags from CFLAGS embedding + make version.h + nuke-refs version.h + ''; + + installPhase = '' + # Fix references from man page https://github.com/lsof-org/lsof/issues/66 + substituteInPlace Lsof.8 \ + --replace ".so ./00DIALECTS" "" \ + --replace ".so ./version" ".ds VN ${version}" + mkdir -p $out/bin $out/man/man8 + cp Lsof.8 $out/man/man8/lsof.8 + cp lsof $out/bin + ''; + + meta = { + homepage = "https://github.com/lsof-org/lsof"; + description = "Tool to list open files"; + mainProgram = "lsof"; + longDescription = '' + List open files. Can show what process has opened some file, + socket (IPv6/IPv4/UNIX local), or partition (by opening a file + from it). + ''; + license = lib.licenses.purdueBsd; + maintainers = with lib.maintainers; [ dezgeg ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/by-name/ls/lsscsi/package.nix similarity index 100% rename from pkgs/os-specific/linux/lsscsi/default.nix rename to pkgs/by-name/ls/lsscsi/package.nix diff --git a/pkgs/misc/lssecret/default.nix b/pkgs/by-name/ls/lssecret/package.nix similarity index 100% rename from pkgs/misc/lssecret/default.nix rename to pkgs/by-name/ls/lssecret/package.nix diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/by-name/ls/lswt/package.nix similarity index 100% rename from pkgs/applications/misc/lswt/default.nix rename to pkgs/by-name/ls/lswt/package.nix diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/by-name/lt/ltc-tools/package.nix similarity index 100% rename from pkgs/applications/audio/ltc-tools/default.nix rename to pkgs/by-name/lt/ltc-tools/package.nix diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/by-name/lt/ltex-ls/package.nix similarity index 100% rename from pkgs/tools/text/ltex-ls/default.nix rename to pkgs/by-name/lt/ltex-ls/package.nix diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/by-name/lt/ltl2ba/package.nix similarity index 100% rename from pkgs/applications/science/logic/ltl2ba/default.nix rename to pkgs/by-name/lt/ltl2ba/package.nix diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/by-name/lt/ltrace/package.nix similarity index 100% rename from pkgs/development/tools/misc/ltrace/default.nix rename to pkgs/by-name/lt/ltrace/package.nix diff --git a/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch b/pkgs/by-name/lt/ltrace/sysdeps-x86.patch similarity index 100% rename from pkgs/development/tools/misc/ltrace/sysdeps-x86.patch rename to pkgs/by-name/lt/ltrace/sysdeps-x86.patch diff --git a/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch b/pkgs/by-name/lt/ltrace/testsuite-newfstatat.patch similarity index 100% rename from pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch rename to pkgs/by-name/lt/ltrace/testsuite-newfstatat.patch diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/by-name/lt/lttng-tools/package.nix similarity index 100% rename from pkgs/development/tools/misc/lttng-tools/default.nix rename to pkgs/by-name/lt/lttng-tools/package.nix diff --git a/pkgs/applications/misc/lttoolbox/default.nix b/pkgs/by-name/lt/lttoolbox/package.nix similarity index 100% rename from pkgs/applications/misc/lttoolbox/default.nix rename to pkgs/by-name/lt/lttoolbox/package.nix diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/by-name/lt/lttv/package.nix similarity index 100% rename from pkgs/development/tools/misc/lttv/default.nix rename to pkgs/by-name/lt/lttv/package.nix diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/by-name/lt/ltunify/package.nix similarity index 100% rename from pkgs/tools/misc/ltunify/default.nix rename to pkgs/by-name/lt/ltunify/package.nix diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/by-name/lt/ltwheelconf/package.nix similarity index 100% rename from pkgs/applications/misc/ltwheelconf/default.nix rename to pkgs/by-name/lt/ltwheelconf/package.nix diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/by-name/lu/luabridge/package.nix similarity index 100% rename from pkgs/development/libraries/luabridge/default.nix rename to pkgs/by-name/lu/luabridge/package.nix diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 91194879b875..2471e46f5f42 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -1,26 +1,26 @@ #!/usr/bin/env python # format: -# $ nix run nixpkgs#python3Packages.black -- update.py +# $ nix run nixpkgs#python3Packages.ruff -- update.py # type-check: # $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: # $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py -import inspect -import os -import tempfile -import shutil -from dataclasses import dataclass -import subprocess import csv +import inspect import logging +import os +import shutil +import subprocess +import tempfile import textwrap +from dataclasses import dataclass from multiprocessing.dummy import Pool -import pluginupdate -from pluginupdate import update_plugins, FetchConfig - -from typing import List, Tuple, Optional from pathlib import Path +from typing import List, Optional, Tuple + +import pluginupdate +from pluginupdate import FetchConfig, update_plugins log = logging.getLogger() log.addHandler(logging.StreamHandler()) @@ -35,9 +35,7 @@ HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! Regenerate it with: nix run nixpkgs#luarocks-packages-updater You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -""".format( - GENERATED_NIXFILE=GENERATED_NIXFILE -) +""".format(GENERATED_NIXFILE=GENERATED_NIXFILE) FOOTER = """ } @@ -71,7 +69,6 @@ class LuaPlugin: # rename Editor to LangUpdate/ EcosystemUpdater class LuaEditor(pluginupdate.Editor): - def create_parser(self): parser = super().create_parser() parser.set_defaults(proc=1) @@ -173,10 +170,7 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.rockspec != "": if plug.ref or plug.version: - msg = ( - "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" - % plug.name - ) + msg = "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name log.warning(msg) log.debug("Updating from rockspec %s", plug.rockspec) @@ -193,7 +187,7 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.luaversion: cmd.append(f"--lua-version={plug.luaversion}") - luaver = plug.luaversion.replace('.', '') + luaver = plug.luaversion.replace(".", "") if luaver := os.getenv(f"LUA_{luaver}"): cmd.append(f"--lua-dir={luaver}") diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/by-name/lu/luau/package.nix similarity index 100% rename from pkgs/development/interpreters/luau/default.nix rename to pkgs/by-name/lu/luau/package.nix diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/by-name/lu/lucene/package.nix similarity index 100% rename from pkgs/development/libraries/java/lucene/default.nix rename to pkgs/by-name/lu/lucene/package.nix diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/by-name/lu/lucenepp/package.nix similarity index 100% rename from pkgs/development/libraries/lucene++/default.nix rename to pkgs/by-name/lu/lucenepp/package.nix diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/by-name/lu/lucky-cli/package.nix similarity index 100% rename from pkgs/development/web/lucky-cli/default.nix rename to pkgs/by-name/lu/lucky-cli/package.nix diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/by-name/lu/lucky-cli/shard.lock similarity index 100% rename from pkgs/development/web/lucky-cli/shard.lock rename to pkgs/by-name/lu/lucky-cli/shard.lock diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/by-name/lu/lucky-cli/shards.nix similarity index 100% rename from pkgs/development/web/lucky-cli/shards.nix rename to pkgs/by-name/lu/lucky-cli/shards.nix diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/by-name/lu/luculent/package.nix similarity index 100% rename from pkgs/data/fonts/luculent/default.nix rename to pkgs/by-name/lu/luculent/package.nix diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 18145c63a676..f4ab5b57ee6e 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ludtwig"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "MalteJanz"; repo = pname; rev = "v${version}"; - hash = "sha256-nkyi6X9W92yLaSPCg3zk0z/Pwue6dGK09iCDmWliFeg="; + hash = "sha256-J5UTVXUExVApA8VVTyhkO2JhpVCK45li9VBN+oM9TBI="; }; checkType = "debug"; - cargoHash = "sha256-CZOdxrQ/50xznc8cfvi+6QFmMpPOS1st+yVPtAkZ3/A="; + cargoHash = "sha256-czofgV5a9aQoLn4JaBUbytY/aHfgJv3Q8RU2j+fbXo8="; meta = with lib; { description = "Linter / Formatter for Twig template files which respects HTML and your time"; diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/by-name/lu/ludusavi/package.nix similarity index 100% rename from pkgs/applications/backup/ludusavi/default.nix rename to pkgs/by-name/lu/ludusavi/package.nix diff --git a/pkgs/games/lugaru/default.nix b/pkgs/by-name/lu/lugaru/package.nix similarity index 100% rename from pkgs/games/lugaru/default.nix rename to pkgs/by-name/lu/lugaru/package.nix diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/by-name/lu/luigi/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/luigi/default.nix rename to pkgs/by-name/lu/luigi/package.nix diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/pkgs/by-name/lu/lukesmithxyz-st/0000-makefile-fix-install.diff similarity index 100% rename from pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff rename to pkgs/by-name/lu/lukesmithxyz-st/0000-makefile-fix-install.diff diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/pkgs/by-name/lu/lukesmithxyz-st/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix rename to pkgs/by-name/lu/lukesmithxyz-st/package.nix diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 9e41b311d5e1..aef36fb6c8ef 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.2.24"; + version = "3.2.26"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-0rTADFgOOBDuv4nk2lgP4YUFxfsasZDQkp/r26iVwSa5f1swQXALGFwLl1VdJTRQ5AlZvRm6WBbt/ML2jODTZw=="; + hash = "sha512-g8VJCIRriUMUq+I+YjvWV9erki7jtQvIQzGWTUbdp2JNY4ix6gHesl232pk0Ypu1rQKHp3wKBhF98k2w6p7d4A=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/by-name/lu/lunarml/package.nix similarity index 100% rename from pkgs/development/compilers/lunarml/default.nix rename to pkgs/by-name/lu/lunarml/package.nix diff --git a/pkgs/by-name/lu/lunarvim/package.nix b/pkgs/by-name/lu/lunarvim/package.nix index 6050010bdbb5..df4b07ff14ce 100644 --- a/pkgs/by-name/lu/lunarvim/package.nix +++ b/pkgs/by-name/lu/lunarvim/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications wrapProgram $out/bin/lvim --prefix PATH : ${ lib.makeBinPath finalAttrs.runtimeDeps } \ - --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib} \ + --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \ --prefix CC : ${stdenv.cc.targetPrefix}cc '' + lib.optionalString finalAttrs.nvimAlias '' ln -s $out/bin/lvim $out/bin/nvim diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix new file mode 100644 index 000000000000..92277537961a --- /dev/null +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -0,0 +1,47 @@ +{ + lib, + appimageTools, + fetchurl, +}: + +let + version = "2.0.12"; + pname = "lunatask"; + + src = fetchurl { + url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; + hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; + }; + + appimageContents = appimageTools.extract { + inherit pname version src; + }; + +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + install -m 444 -D -t $out/share/applications ${appimageContents}/lunatask.desktop + install -m 444 -D -t $out/share/icons/hicolor/512x512/apps ${appimageContents}/lunatask.png + substituteInPlace $out/share/applications/lunatask.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=lunatask' + ''; + + passthru.updateScript = ./update.py; + + meta = { + description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; + longDescription = '' + Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health. + ''; + homepage = "https://lunatask.app"; + downloadPage = "https://lunatask.app/download"; + changelog = "https://lunatask.app/releases/${version}"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ zi3m5f ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "lunatask"; + }; +} diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/by-name/lu/lunatask/update.py similarity index 100% rename from pkgs/applications/misc/lunatask/update.py rename to pkgs/by-name/lu/lunatask/update.py diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/by-name/lu/lunatic/package.nix similarity index 100% rename from pkgs/development/interpreters/lunatic/default.nix rename to pkgs/by-name/lu/lunatic/package.nix diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/by-name/lu/lune/package.nix similarity index 100% rename from pkgs/development/interpreters/lune/default.nix rename to pkgs/by-name/lu/lune/package.nix diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/by-name/lu/luppp/package.nix similarity index 100% rename from pkgs/applications/audio/luppp/default.nix rename to pkgs/by-name/lu/luppp/package.nix diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/by-name/lu/lurk/package.nix similarity index 100% rename from pkgs/development/tools/lurk/default.nix rename to pkgs/by-name/lu/lurk/package.nix diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/by-name/lu/lux/package.nix similarity index 100% rename from pkgs/tools/video/lux/default.nix rename to pkgs/by-name/lu/lux/package.nix diff --git a/pkgs/tools/text/lv/default.nix b/pkgs/by-name/lv/lv/package.nix similarity index 100% rename from pkgs/tools/text/lv/default.nix rename to pkgs/by-name/lv/lv/package.nix diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/by-name/lv/lv2-cpp-tools/package.nix similarity index 100% rename from pkgs/applications/audio/lv2-cpp-tools/default.nix rename to pkgs/by-name/lv/lv2-cpp-tools/package.nix diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/by-name/lv/lv2/package.nix similarity index 100% rename from pkgs/development/libraries/audio/lv2/default.nix rename to pkgs/by-name/lv/lv2/package.nix diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/by-name/lv/lv2bm/package.nix similarity index 100% rename from pkgs/applications/audio/lv2bm/default.nix rename to pkgs/by-name/lv/lv2bm/package.nix diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/by-name/lv/lvmsync/Gemfile similarity index 100% rename from pkgs/tools/backup/lvmsync/Gemfile rename to pkgs/by-name/lv/lvmsync/Gemfile diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/by-name/lv/lvmsync/Gemfile.lock similarity index 100% rename from pkgs/tools/backup/lvmsync/Gemfile.lock rename to pkgs/by-name/lv/lvmsync/Gemfile.lock diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/by-name/lv/lvmsync/gemset.nix similarity index 100% rename from pkgs/tools/backup/lvmsync/gemset.nix rename to pkgs/by-name/lv/lvmsync/gemset.nix diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/by-name/lv/lvmsync/package.nix similarity index 100% rename from pkgs/tools/backup/lvmsync/default.nix rename to pkgs/by-name/lv/lvmsync/package.nix diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/by-name/lv/lvtk/package.nix similarity index 100% rename from pkgs/development/libraries/audio/lvtk/default.nix rename to pkgs/by-name/lv/lvtk/package.nix diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/by-name/lw/lwan/package.nix similarity index 100% rename from pkgs/servers/http/lwan/default.nix rename to pkgs/by-name/lw/lwan/package.nix diff --git a/pkgs/tools/misc/lwc/default.nix b/pkgs/by-name/lw/lwc/package.nix similarity index 100% rename from pkgs/tools/misc/lwc/default.nix rename to pkgs/by-name/lw/lwc/package.nix diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index ea066fc7ba3d..e5f9fcafc412 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -39,7 +39,7 @@ let runtimeLibs = lib.makeLibraryPath [ libGL - stdenv.cc.cc.lib + stdenv.cc.cc ]; in stdenv.mkDerivation { diff --git a/pkgs/tools/virtualization/lxd-image-server/default.nix b/pkgs/by-name/lx/lxd-image-server/package.nix similarity index 100% rename from pkgs/tools/virtualization/lxd-image-server/default.nix rename to pkgs/by-name/lx/lxd-image-server/package.nix diff --git a/pkgs/tools/virtualization/lxd-image-server/run.patch b/pkgs/by-name/lx/lxd-image-server/run.patch similarity index 100% rename from pkgs/tools/virtualization/lxd-image-server/run.patch rename to pkgs/by-name/lx/lxd-image-server/run.patch diff --git a/pkgs/tools/virtualization/lxd-image-server/state.patch b/pkgs/by-name/lx/lxd-image-server/state.patch similarity index 100% rename from pkgs/tools/virtualization/lxd-image-server/state.patch rename to pkgs/by-name/lx/lxd-image-server/state.patch diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/by-name/lx/lxdvdrip/package.nix similarity index 100% rename from pkgs/applications/video/lxdvdrip/default.nix rename to pkgs/by-name/lx/lxdvdrip/package.nix diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index 113d1c17b933..9ca6ed39d146 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -5,10 +5,10 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; - version = "1.500"; + version = "1.501"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz"; - hash = "sha256-GuGIRgBQTmlKmarEVFmZ2RgYtlw6mz3nfFdWbjlm934="; + hash = "sha256-GnllwWRO2Pa7hlehZKrGJr2f4kRJN1JPxtz4UGMbqyg="; }; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/by-name/lx/lxterminal/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/lxterminal/default.nix rename to pkgs/by-name/lx/lxterminal/package.nix diff --git a/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/by-name/lx/lxterminal/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch rename to pkgs/by-name/lx/lxterminal/respect-xml-catalog-files-var.patch diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/by-name/ly/lynis/package.nix similarity index 100% rename from pkgs/tools/security/lynis/default.nix rename to pkgs/by-name/ly/lynis/package.nix diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/by-name/ly/lynx/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/lynx/default.nix rename to pkgs/by-name/ly/lynx/package.nix diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/by-name/ly/lyra/package.nix similarity index 100% rename from pkgs/development/libraries/lyra/default.nix rename to pkgs/by-name/ly/lyra/package.nix diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/by-name/ly/lyrebird/package.nix similarity index 100% rename from pkgs/applications/audio/lyrebird/default.nix rename to pkgs/by-name/ly/lyrebird/package.nix diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/by-name/lz/lz4/package.nix similarity index 100% rename from pkgs/tools/compression/lz4/default.nix rename to pkgs/by-name/lz/lz4/package.nix diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/by-name/lz/lzbench/package.nix similarity index 100% rename from pkgs/tools/compression/lzbench/default.nix rename to pkgs/by-name/lz/lzbench/package.nix diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/by-name/lz/lzfse/package.nix similarity index 100% rename from pkgs/tools/compression/lzfse/default.nix rename to pkgs/by-name/lz/lzfse/package.nix diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/by-name/lz/lzham/package.nix similarity index 100% rename from pkgs/tools/compression/lzham/default.nix rename to pkgs/by-name/lz/lzham/package.nix diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/by-name/lz/lzip/lzip-setup-hook.sh similarity index 100% rename from pkgs/tools/compression/lzip/lzip-setup-hook.sh rename to pkgs/by-name/lz/lzip/lzip-setup-hook.sh diff --git a/pkgs/tools/compression/lzip/mingw-install-exe-file.patch b/pkgs/by-name/lz/lzip/mingw-install-exe-file.patch similarity index 100% rename from pkgs/tools/compression/lzip/mingw-install-exe-file.patch rename to pkgs/by-name/lz/lzip/mingw-install-exe-file.patch diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/by-name/lz/lzip/package.nix similarity index 100% rename from pkgs/tools/compression/lzip/default.nix rename to pkgs/by-name/lz/lzip/package.nix diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/by-name/lz/lziprecover/package.nix similarity index 100% rename from pkgs/tools/compression/lziprecover/default.nix rename to pkgs/by-name/lz/lziprecover/package.nix diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/by-name/lz/lzo/package.nix similarity index 100% rename from pkgs/development/libraries/lzo/default.nix rename to pkgs/by-name/lz/lzo/package.nix diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/by-name/lz/lzop/package.nix similarity index 100% rename from pkgs/tools/compression/lzop/default.nix rename to pkgs/by-name/lz/lzop/package.nix diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/by-name/m-/m-cli/package.nix similarity index 100% rename from pkgs/os-specific/darwin/m-cli/default.nix rename to pkgs/by-name/m-/m-cli/package.nix diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix similarity index 100% rename from pkgs/applications/radio/m17-cxx-demod/default.nix rename to pkgs/by-name/m1/m17-cxx-demod/package.nix diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/by-name/m1/m17n_db/package.nix similarity index 100% rename from pkgs/tools/inputmethods/m17n-db/default.nix rename to pkgs/by-name/m1/m17n_db/package.nix diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/by-name/m3/m33-linux/package.nix similarity index 100% rename from pkgs/misc/drivers/m33-linux/default.nix rename to pkgs/by-name/m3/m33-linux/package.nix diff --git a/pkgs/applications/audio/m4acut/default.nix b/pkgs/by-name/m4/m4acut/package.nix similarity index 100% rename from pkgs/applications/audio/m4acut/default.nix rename to pkgs/by-name/m4/m4acut/package.nix diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/by-name/m4/m4ri/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/m4ri/default.nix rename to pkgs/by-name/m4/m4ri/package.nix diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/by-name/m4/m4rie/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/m4rie/default.nix rename to pkgs/by-name/m4/m4rie/package.nix diff --git a/pkgs/tools/system/mac-fdisk/default.nix b/pkgs/by-name/ma/mac-fdisk/package.nix similarity index 100% rename from pkgs/tools/system/mac-fdisk/default.nix rename to pkgs/by-name/ma/mac-fdisk/package.nix diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/by-name/ma/mac/package.nix similarity index 100% rename from pkgs/development/libraries/mac/default.nix rename to pkgs/by-name/ma/mac/package.nix diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/by-name/ma/macchanger/package.nix similarity index 100% rename from pkgs/os-specific/linux/macchanger/default.nix rename to pkgs/by-name/ma/macchanger/package.nix diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/by-name/ma/macchina/package.nix similarity index 100% rename from pkgs/tools/misc/macchina/default.nix rename to pkgs/by-name/ma/macchina/package.nix diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/by-name/ma/macdylibbundler/package.nix similarity index 100% rename from pkgs/development/tools/misc/macdylibbundler/default.nix rename to pkgs/by-name/ma/macdylibbundler/package.nix diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/by-name/ma/mackerel-agent/package.nix similarity index 100% rename from pkgs/servers/monitoring/mackerel-agent/default.nix rename to pkgs/by-name/ma/mackerel-agent/package.nix diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/by-name/ma/macs2/package.nix similarity index 100% rename from pkgs/applications/science/biology/macs2/default.nix rename to pkgs/by-name/ma/macs2/package.nix diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/by-name/ma/macse/package.nix similarity index 100% rename from pkgs/applications/science/biology/macse/default.nix rename to pkgs/by-name/ma/macse/package.nix diff --git a/pkgs/servers/maddy/default.nix b/pkgs/by-name/ma/maddy/package.nix similarity index 100% rename from pkgs/servers/maddy/default.nix rename to pkgs/by-name/ma/maddy/package.nix diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/by-name/ma/madonctl/package.nix similarity index 100% rename from pkgs/applications/misc/madonctl/default.nix rename to pkgs/by-name/ma/madonctl/package.nix diff --git a/pkgs/games/maelstrom/c++17-fixes.diff b/pkgs/by-name/ma/maelstrom/c++17-fixes.diff similarity index 100% rename from pkgs/games/maelstrom/c++17-fixes.diff rename to pkgs/by-name/ma/maelstrom/c++17-fixes.diff diff --git a/pkgs/games/maelstrom/fix-compilation.patch b/pkgs/by-name/ma/maelstrom/fix-compilation.patch similarity index 100% rename from pkgs/games/maelstrom/fix-compilation.patch rename to pkgs/by-name/ma/maelstrom/fix-compilation.patch diff --git a/pkgs/games/maelstrom/default.nix b/pkgs/by-name/ma/maelstrom/package.nix similarity index 100% rename from pkgs/games/maelstrom/default.nix rename to pkgs/by-name/ma/maelstrom/package.nix diff --git a/pkgs/development/libraries/maeparser/default.nix b/pkgs/by-name/ma/maeparser/package.nix similarity index 100% rename from pkgs/development/libraries/maeparser/default.nix rename to pkgs/by-name/ma/maeparser/package.nix diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index e0f83c3ba4d1..bf0a92e3e303 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "1.38.1"; + version = "1.39.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; - hash = "sha256-AogEVg8R73x5Q/LxZamGbFacCqB8JZeERqyf+UPXBx0="; + hash = "sha256-nvnxk3iyko2pgajmQO8F7N9EpPte3g2i5y+Wyst14mU="; }; dontUnpack = true; diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/by-name/ma/mafft/package.nix similarity index 100% rename from pkgs/applications/science/biology/mafft/default.nix rename to pkgs/by-name/ma/mafft/package.nix diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/by-name/ma/mage/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/mage/default.nix rename to pkgs/by-name/ma/mage/package.nix diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/by-name/ma/magic-enum/package.nix similarity index 100% rename from pkgs/development/libraries/magic-enum/default.nix rename to pkgs/by-name/ma/magic-enum/package.nix diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/by-name/ma/magnetico/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/magnetico/default.nix rename to pkgs/by-name/ma/magnetico/package.nix diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index d549a46148d9..9fcc3ff2bfe9 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "magpie"; - version = "0.9.3"; + version = "0.9.4"; outputs = [ "out" @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BuddiesOfBudgie"; repo = "magpie"; rev = "v${finalAttrs.version}"; - hash = "sha256-A8FmW2o2p5B5pxTZ6twwufyhfppuMXjnMKopZRD+XdE="; + hash = "sha256-a8e0uzbS0HEH/0sOOnwIiQI0/BizKbpdlVdfb3IbmcU="; }; patches = [ diff --git a/pkgs/by-name/ma/maid/Gemfile.lock b/pkgs/by-name/ma/maid/Gemfile.lock index c78adf5ba292..edf10273db01 100644 --- a/pkgs/by-name/ma/maid/Gemfile.lock +++ b/pkgs/by-name/ma/maid/Gemfile.lock @@ -1,21 +1,26 @@ GEM remote: https://rubygems.org/ specs: - concurrent-ruby (1.2.2) + base64 (0.2.0) + concurrent-ruby (1.3.4) + csv (3.3.0) deprecated (3.0.1) dimensions (1.3.0) escape (0.0.4) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo exifr (1.3.10) - ffi (1.15.5) - fugit (1.8.1) - et-orbi (~> 1, >= 1.2.7) + ffi (1.17.0) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) - geocoder (1.8.2) + geocoder (1.8.3) + base64 (>= 0.1.0) + csv (>= 3.0.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) maid (0.10.0) deprecated (~> 3.0.0) dimensions (>= 1.0.0, < 2.0) @@ -28,13 +33,14 @@ GEM rufus-scheduler (~> 3.8.2) thor (~> 1.2.1) xdg (~> 2.2.3) - mime-types (3.5.1) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) + mime-types-data (3.2024.1001) raabro (1.4.0) - rake (13.0.6) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rubyzip (2.3.2) rufus-scheduler (3.8.2) @@ -52,4 +58,4 @@ DEPENDENCIES rake BUNDLED WITH - 2.3.26 + 2.5.11 diff --git a/pkgs/by-name/ma/maid/gemset.nix b/pkgs/by-name/ma/maid/gemset.nix index f82ef7bed37a..91de26941009 100644 --- a/pkgs/by-name/ma/maid/gemset.nix +++ b/pkgs/by-name/ma/maid/gemset.nix @@ -1,13 +1,33 @@ { + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.4"; + }; + csv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + type = "gem"; + }; + version = "3.3.0"; }; deprecated = { groups = ["default"]; @@ -45,10 +65,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; exifr = { groups = ["default"]; @@ -65,10 +85,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.15.5"; + version = "1.17.0"; }; fugit = { dependencies = ["et-orbi" "raabro"]; @@ -76,20 +96,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; + sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; type = "gem"; }; - version = "1.8.1"; + version = "1.11.1"; }; geocoder = { + dependencies = ["base64" "csv"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "120lqyq308q8hg8ykawd7cp3k2ck8z9g5f9ffijp8dn2k9f21fjc"; + sha256 = "1cvzz9i5s5dngrw6101bc6kn25c4f2jsb6pnq5yb842scjh6848n"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -102,6 +123,16 @@ }; version = "3.8.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; maid = { dependencies = ["deprecated" "dimensions" "escape" "exifr" "geocoder" "listen" "mime-types" "rubyzip" "rufus-scheduler" "thor" "xdg"]; groups = ["default"]; @@ -114,25 +145,25 @@ version = "0.10.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd"; type = "gem"; }; - version = "3.2023.0808"; + version = "3.2024.1001"; }; raabro = { groups = ["default"]; @@ -149,10 +180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.0.6"; + version = "13.2.1"; }; rb-fsevent = { groups = ["default"]; @@ -170,10 +201,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rubyzip = { groups = ["default"]; diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/by-name/ma/maiko/package.nix similarity index 100% rename from pkgs/applications/emulators/maiko/default.nix rename to pkgs/by-name/ma/maiko/package.nix diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/by-name/ma/mailcap/package.nix similarity index 100% rename from pkgs/data/misc/mailcap/default.nix rename to pkgs/by-name/ma/mailcap/package.nix diff --git a/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch b/pkgs/by-name/ma/mailcheck/mailcheck-Makefile.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch rename to pkgs/by-name/ma/mailcheck/mailcheck-Makefile.patch diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/by-name/ma/mailcheck/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mailcheck/default.nix rename to pkgs/by-name/ma/mailcheck/package.nix diff --git a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch similarity index 100% rename from pkgs/tools/networking/maildrop/maildrop.configure.hack.patch rename to pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/by-name/ma/maildrop/package.nix similarity index 100% rename from pkgs/tools/networking/maildrop/default.nix rename to pkgs/by-name/ma/maildrop/package.nix diff --git a/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch b/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch new file mode 100644 index 000000000000..9e38d103fbfd --- /dev/null +++ b/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch @@ -0,0 +1,139 @@ +From ba00547a25bfea641d0c8a5dba42a6ace990767b Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 4 Nov 2024 11:04:05 +0800 +Subject: [PATCH] Add go.mod & go.sum + +--- + go.mod | 36 ++++++++++++++++++++++++++++ + go.sum | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 112 insertions(+) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..b09f764 +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,36 @@ ++module github.com/mailhog/MailHog ++ ++go 1.23.2 ++ ++require ( ++ github.com/gorilla/pat v1.0.2 ++ github.com/ian-kent/envconf v0.0.0-20141026121121-c19809918c02 ++ github.com/ian-kent/go-log v0.0.0-20160113211217-5731446c36ab ++ github.com/mailhog/MailHog-Server v1.0.1 ++ github.com/mailhog/MailHog-UI v1.0.1 ++ github.com/mailhog/http v1.0.1 ++ github.com/mailhog/mhsendmail v0.2.0 ++ golang.org/x/crypto v0.28.0 ++) ++ ++require ( ++ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect ++ github.com/gorilla/context v1.1.2 // indirect ++ github.com/gorilla/mux v1.8.1 // indirect ++ github.com/gorilla/websocket v1.5.3 // indirect ++ github.com/ian-kent/goose v0.0.0-20141221090059-c3541ea826ad // indirect ++ github.com/ian-kent/linkio v0.0.0-20170807205755-97566b872887 // indirect ++ github.com/kr/pretty v0.3.1 // indirect ++ github.com/mailhog/data v1.0.1 // indirect ++ github.com/mailhog/smtp v1.0.1 // indirect ++ github.com/mailhog/storage v1.0.1 // indirect ++ github.com/ogier/pflag v0.0.1 // indirect ++ github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect ++ github.com/smartystreets/goconvey v1.8.1 // indirect ++ github.com/stretchr/testify v1.9.0 // indirect ++ github.com/t-k/fluent-logger-golang v1.0.0 // indirect ++ github.com/tinylib/msgp v1.2.4 // indirect ++ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ++ gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect ++ gopkg.in/yaml.v2 v2.4.0 // indirect ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..9089971 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,76 @@ ++github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= ++github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= ++github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= ++github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= ++github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o= ++github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM= ++github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= ++github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= ++github.com/gorilla/pat v1.0.2 h1:TDh/RulbnPxMQACcwbgMF5Bf00jaGoeYBNu+XUFuwtE= ++github.com/gorilla/pat v1.0.2/go.mod h1:ioQ7dFQ2KXmOmWLJs6vZAfRikcm2D2JyuLrL9b5wVCg= ++github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= ++github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= ++github.com/ian-kent/envconf v0.0.0-20141026121121-c19809918c02 h1:dU8zq210pt1b71X8xh9GOxC7uBHNtQ9BYC+Lb6SA/mA= ++github.com/ian-kent/envconf v0.0.0-20141026121121-c19809918c02/go.mod h1:1m5fo3aKG2moYtGHC4I2nFkXmG97+vCeaEIWC+mXTSI= ++github.com/ian-kent/go-log v0.0.0-20160113211217-5731446c36ab h1:OgrFrYWlVzY7Tc8rq7Y4ErlKo28igc70gbfJGTVWTJk= ++github.com/ian-kent/go-log v0.0.0-20160113211217-5731446c36ab/go.mod h1:6HitiSDIbT2r0dab4CoKoMAtR7tb0ORQ3OmjkjCZ+zk= ++github.com/ian-kent/goose v0.0.0-20141221090059-c3541ea826ad h1:5UZIY1lPvsBrRQRgyt00lJ1J6HH6CwWAVQB6azyAA1c= ++github.com/ian-kent/goose v0.0.0-20141221090059-c3541ea826ad/go.mod h1:VHyJj0/IJFmpYvVqWFIN2HgjCatXujj7XaLLyOMC23M= ++github.com/ian-kent/linkio v0.0.0-20170807205755-97566b872887 h1:LPaZmcRJS13h+igi07S26uKy0qxCa76u1+pArD+JGrY= ++github.com/ian-kent/linkio v0.0.0-20170807205755-97566b872887/go.mod h1:aE63iKqF9rMrshaEiYZroUYFZLaYoTuA7pBMsg3lJoY= ++github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= ++github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= ++github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= ++github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= ++github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= ++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= ++github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= ++github.com/mailhog/MailHog-Server v1.0.1 h1:mK9inUHV2p6pO55cHZTCdZ8D4aXzd+M9wvqtU0XmWcM= ++github.com/mailhog/MailHog-Server v1.0.1/go.mod h1:ScCrImbapPxdrQ85qoxkMygsSiY74ohIj1knLzuN8J0= ++github.com/mailhog/MailHog-UI v1.0.1 h1:B3mVLiVLd4amNVQtiklr+srI3eMKiMzYSXXqDGa7JzA= ++github.com/mailhog/MailHog-UI v1.0.1/go.mod h1:zLEw2DaBMXpL6nmpdB8S5U1Y3MMSATlTcjUYSTAB7HQ= ++github.com/mailhog/data v1.0.1 h1:7I+opBvVdi4EMJaihXavM98jp/ovt4o6mz47446RAW8= ++github.com/mailhog/data v1.0.1/go.mod h1:tjR/iXRhbSUKHzAAMd99RygVaDB5rIDC/bmWc363MzU= ++github.com/mailhog/http v1.0.1 h1:i3sxAt7/WcdRXdKJZgiDRkWIAYScnrqqHQTZSxXkM0I= ++github.com/mailhog/http v1.0.1/go.mod h1:91oqUCI9ZoSDY2cTj4pWDJVBHCK1U762V2a4if4KlOw= ++github.com/mailhog/mhsendmail v0.2.0 h1:C5HUC4obHfXIkttLfGBUopYbsJmh+bnExGWHBpWQ8IA= ++github.com/mailhog/mhsendmail v0.2.0/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM= ++github.com/mailhog/smtp v1.0.1 h1:igL3N/L+pWuGCqUaje21HX3VIVnqHoVlqWO0t+wJEYE= ++github.com/mailhog/smtp v1.0.1/go.mod h1:GMrAdv1hXro38xj5dsWPAk5ZiXJHFx9t7W9Yqsk0XUM= ++github.com/mailhog/storage v1.0.1 h1:uut2nlG5hIxbsl6f8DGznPAHwQLf3/7Na2t4gmrIais= ++github.com/mailhog/storage v1.0.1/go.mod h1:4EAUf5xaEVd7c/OhvSxOOwQ66jT6q2er+BDBQ0EVrew= ++github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750= ++github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g= ++github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY= ++github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= ++github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= ++github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= ++github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY= ++github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= ++github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= ++github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= ++github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= ++github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= ++github.com/t-k/fluent-logger-golang v1.0.0 h1:4IQzY+/l66Zkkhk9eB3LwF9vPkgKHJ1rpYdrRiap0EI= ++github.com/t-k/fluent-logger-golang v1.0.0/go.mod h1:6vC3Vzp9Kva0l5J9+YDY5/ROePwkAqwLK+KneCjSm4w= ++github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU= ++github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= ++golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= ++golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= ++gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= ++gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= ++gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= ++gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= ++gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= ++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= ++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +-- +2.46.1 + diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix new file mode 100644 index 000000000000..8d73256cf5ae --- /dev/null +++ b/pkgs/by-name/ma/mailhog/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: + +buildGoModule rec { + pname = "MailHog"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "mailhog"; + repo = "MailHog"; + rev = "v${version}"; + hash = "sha256-flxEp9iXLLm/FPP8udlnpbHQpGnqxAhgyOIUUJAJgog="; + }; + + patches = [ + # Generate by go mod init github.com/mailhog/MailHog && go mod tidy + ./0001-Add-go.mod-go.sum.patch + ]; + + vendorHash = "sha256-yYMgNpthBwmDeD4pgnVj88OJWiPNWuwzxDzC6eejabU="; + + deleteVendor = true; + + ldflags = [ + "-s" + "-X main.version=${version}" + ]; + + passthru.tests = { + inherit (nixosTests) mailhog; + }; + + meta = with lib; { + description = "Web and API based SMTP testing"; + mainProgram = "MailHog"; + homepage = "https://github.com/mailhog/MailHog"; + changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}"; + maintainers = with maintainers; [ + disassembler + jojosch + ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/by-name/ma/mailsend/package.nix similarity index 100% rename from pkgs/tools/networking/mailsend/default.nix rename to pkgs/by-name/ma/mailsend/package.nix diff --git a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/pkgs/by-name/ma/mailspring/darwin.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mailspring/darwin.nix rename to pkgs/by-name/ma/mailspring/darwin.nix diff --git a/pkgs/applications/networking/mailreaders/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mailspring/linux.nix rename to pkgs/by-name/ma/mailspring/linux.nix diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/by-name/ma/mailspring/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mailspring/default.nix rename to pkgs/by-name/ma/mailspring/package.nix diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/by-name/ma/maim/package.nix similarity index 100% rename from pkgs/tools/graphics/maim/default.nix rename to pkgs/by-name/ma/maim/package.nix diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/by-name/ma/mainsail/package.nix similarity index 100% rename from pkgs/applications/misc/mainsail/default.nix rename to pkgs/by-name/ma/mainsail/package.nix diff --git a/pkgs/tools/text/mairix/mmap.patch b/pkgs/by-name/ma/mairix/mmap.patch similarity index 100% rename from pkgs/tools/text/mairix/mmap.patch rename to pkgs/by-name/ma/mairix/mmap.patch diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/by-name/ma/mairix/package.nix similarity index 100% rename from pkgs/tools/text/mairix/default.nix rename to pkgs/by-name/ma/mairix/package.nix diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/by-name/ma/maizzle/package.nix similarity index 100% rename from pkgs/development/tools/maizzle/default.nix rename to pkgs/by-name/ma/maizzle/package.nix diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh similarity index 100% rename from pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh rename to pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix similarity index 100% rename from pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix rename to pkgs/by-name/ma/makeBinaryWrapper/package.nix diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/by-name/ma/makebootfat/package.nix similarity index 100% rename from pkgs/tools/misc/makebootfat/default.nix rename to pkgs/by-name/ma/makebootfat/package.nix diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/by-name/ma/makefile2graph/package.nix similarity index 100% rename from pkgs/development/tools/analysis/makefile2graph/default.nix rename to pkgs/by-name/ma/makefile2graph/package.nix diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/by-name/ma/maker-panel/package.nix similarity index 100% rename from pkgs/tools/misc/maker-panel/default.nix rename to pkgs/by-name/ma/maker-panel/package.nix diff --git a/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch b/pkgs/by-name/ma/maker-panel/update-gerber-types-to-0.3.patch similarity index 100% rename from pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch rename to pkgs/by-name/ma/maker-panel/update-gerber-types-to-0.3.patch diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/by-name/ma/makerpm/package.nix similarity index 100% rename from pkgs/development/tools/makerpm/default.nix rename to pkgs/by-name/ma/makerpm/package.nix diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/by-name/ma/makeself/package.nix similarity index 100% rename from pkgs/applications/misc/makeself/default.nix rename to pkgs/by-name/ma/makeself/package.nix diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 804eecde7685..678d5ff9d064 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec{ pname = "makima"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "cyber-sushi"; repo = "makima"; rev = "v${version}"; - hash = "sha256-esZCFMeIRoafR7vQbnyf3Mo18trVZdIy9rvAvTHfrLA="; + hash = "sha256-cmn86ocN8DwxS9WpcHxWMjuFPAMmM60Q6jmyeBmdrPg="; }; - cargoHash = "sha256-NXiK+cimQaYpzY3WSHUlYUWcXOLWQ5TwGuZKh+OB+go="; + cargoHash = "sha256-/eM+clDZRlvfFa1eEwLo8CKEvnOq5CW19RNvbEbxVE8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/development/tools/profiling/malt/default.nix b/pkgs/by-name/ma/malt/package.nix similarity index 100% rename from pkgs/development/tools/profiling/malt/default.nix rename to pkgs/by-name/ma/malt/package.nix diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/by-name/ma/mamba/package.nix similarity index 100% rename from pkgs/applications/audio/mamba/default.nix rename to pkgs/by-name/ma/mamba/package.nix diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix new file mode 100644 index 000000000000..9bafa723dcf8 --- /dev/null +++ b/pkgs/by-name/ma/man-db/package.nix @@ -0,0 +1,102 @@ +{ buildPackages +, db +, fetchurl +, groff +, gzip +, lib +, libiconv +, libiconvReal +, libpipeline +, makeWrapper +, nixosTests +, pkg-config +, stdenv +, zstd +}: + +let + libiconv' = if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv; +in +stdenv.mkDerivation rec { + pname = "man-db"; + version = "2.13.0"; + + src = fetchurl { + url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; + hash = "sha256-gvBzn09hqrXrk30jTeOwFOd3tVOKKMvTFDPEWuCa77k="; + }; + + outputs = [ "out" "doc" ]; + outputMan = "out"; # users will want `man man` to work + + strictDeps = true; + nativeBuildInputs = [ groff makeWrapper pkg-config zstd ]; + buildInputs = [ libpipeline db groff libiconv' ]; # (Yes, 'groff' is both native and build input) + nativeCheckInputs = [ libiconv' ]; # for 'iconv' binary; make very sure it matches buildinput libiconv + + patches = [ + ./systemwide-man-db-conf.patch + ]; + + postPatch = '' + # Remove all mandatory manpaths. Nixpkgs makes no requirements on + # these directories existing. + sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in + + # Add Nix-related manpaths + echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in + + # Add mandb locations for the above + echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in + ''; + + configureFlags = [ + "--disable-setuid" + "--disable-cache-owner" + "--localstatedir=/var" + "--with-config-file=${placeholder "out"}/etc/man_db.conf" + "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-pager=less" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "ac_cv_func__set_invalid_parameter_handler=no" + "ac_cv_func_posix_fadvise=no" + "ac_cv_func_mempcpy=no" + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + "--enable-mandirs=" + ]; + + preConfigure = '' + configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7") + ''; + + postInstall = '' + # apropos/whatis uses program name to decide whether to act like apropos or whatis + # (multi-call binary). `apropos` is actually just a symlink to whatis. So we need to + # make sure that we don't wrap symlinks (since that changes argv[0] to the -wrapped name) + find "$out/bin" -type f | while read file; do + wrapProgram "$file" \ + --prefix PATH : "${lib.makeBinPath [ groff gzip zstd ]}" + done + ''; + + disallowedReferences = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + buildPackages.groff + ]; + + enableParallelBuilding = true; + + doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */; + + passthru.tests = { + nixos = nixosTests.man; + }; + + meta = with lib; { + homepage = "http://man-db.nongnu.org"; + description = "Implementation of the standard Unix documentation system accessed using the man command"; + license = licenses.gpl2Plus; + platforms = lib.platforms.unix; + mainProgram = "man"; + }; +} diff --git a/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch b/pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch similarity index 93% rename from pkgs/tools/misc/man-db/systemwide-man-db-conf.patch rename to pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch index 2d4477776bb1..5a842470c598 100644 --- a/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch +++ b/pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch @@ -27,8 +27,8 @@ index 5441339..0bbf566 100644 + config_filepath); else error (FAIL, 0, - _("can't open the manpath " - "configuration file %s"), + _ ("can't open the manpath " + "configuration file %s"), - CONFIG_FILE); + config_filepath); } else { diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/by-name/ma/man-pages-posix/package.nix similarity index 100% rename from pkgs/data/documentation/man-pages-posix/default.nix rename to pkgs/by-name/ma/man-pages-posix/package.nix diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/by-name/ma/man-pages/package.nix similarity index 100% rename from pkgs/data/documentation/man-pages/default.nix rename to pkgs/by-name/ma/man-pages/package.nix diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/by-name/ma/mandoc/package.nix similarity index 100% rename from pkgs/tools/misc/mandoc/default.nix rename to pkgs/by-name/ma/mandoc/package.nix diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/by-name/ma/mandown/package.nix similarity index 100% rename from pkgs/tools/misc/mandown/default.nix rename to pkgs/by-name/ma/mandown/package.nix diff --git a/pkgs/tools/misc/manga-cli/default.nix b/pkgs/by-name/ma/manga-cli/package.nix similarity index 100% rename from pkgs/tools/misc/manga-cli/default.nix rename to pkgs/by-name/ma/manga-cli/package.nix diff --git a/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch b/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch new file mode 100644 index 000000000000..78358ae23e69 --- /dev/null +++ b/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch @@ -0,0 +1,42 @@ +From e84ddb20ca6b99ec2bf84bb3c3cfc3cdbbfd5ff2 Mon Sep 17 00:00:00 2001 +From: Youwen Wu +Date: Wed, 6 Nov 2024 02:11:30 -0800 +Subject: [PATCH] fix: remove flaky test + +--- + src/view/pages/manga.rs | 21 --------------------- + 1 file changed, 21 deletions(-) + +diff --git a/src/view/pages/manga.rs b/src/view/pages/manga.rs +index 119d9ea..7179a22 100644 +--- a/src/view/pages/manga.rs ++++ b/src/view/pages/manga.rs +@@ -1853,25 +1853,4 @@ mod test { + assert_eq!(manga_page.bookmark_state.phase, BookmarkPhase::SearchingFromApi); + assert_eq!(expected, result) + } +- +- #[tokio::test] +- async fn it_sends_event_chapter_bookmarked_failed_to_fetch() { +- let (tx, _) = unbounded_channel(); +- let mut manga_page = MangaPage::new(Manga::default(), None).with_global_sender(tx); +- +- flush_events(&mut manga_page); +- +- let api_client = TestApiClient::with_failing_response(); +- +- manga_page.fetch_chapter_bookmarked(ChapterBookmarked::default(), api_client); +- +- let expected = MangaPageEvents::FetchBookmarkFailed; +- +- let result = timeout(Duration::from_millis(250), manga_page.local_event_rx.recv()) +- .await +- .unwrap() +- .unwrap(); +- +- assert_eq!(expected, result); +- } + } +-- +2.46.1 + diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index aafae4ab8464..81fddfde4874 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -3,13 +3,15 @@ rustPlatform, fetchFromGitHub, pkg-config, + fetchpatch, openssl, sqlite, stdenv, darwin, + nix-update-script, }: let - version = "0.3.1"; + version = "0.4.0"; in rustPlatform.buildRustPackage { pname = "manga-tui"; @@ -19,10 +21,19 @@ rustPlatform.buildRustPackage { owner = "josueBarretogit"; repo = "manga-tui"; rev = "v${version}"; - hash = "sha256-672AuQWviwihnUS3G0xSn4IAMHy0fPE1VLDfu8wrPGg="; + hash = "sha256-Se0f5jfYBmvemrYRKduDr1yT3fB2wfQP1fDpa/qrYlI="; }; - cargoHash = "sha256-yf0hISz/jHtrO1clTSIKfxFiwI+W0Mu3mY+XW6+ynJU="; + patches = [ + # apply patches to fix failing tests + (fetchpatch { + url = "https://github.com/josueBarretogit/manga-tui/commit/131a5208e6a3d74a9ad852baab75334e4a1ebf34.patch"; + hash = "sha256-RIliZcaRVUOb33Cl+uBkMH4b34S1JpvnPGv+QCFQZ58="; + }) + ./0001-fix-remove-flaky-test.patch + ]; + + cargoHash = "sha256-IufJPCvUEWR5p4PrFlaiQPW9wyIFj/Pd/JHki69L6Es="; nativeBuildInputs = [ pkg-config ]; @@ -44,7 +55,12 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/josueBarretogit/manga-tui"; changelog = "https://github.com/josueBarretogit/manga-tui/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ isabelroses ]; + maintainers = with lib.maintainers; [ + isabelroses + youwen5 + ]; mainProgram = "manga-tui"; }; + + passthru.updateScript = nix-update-script { }; } diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/by-name/ma/mani/package.nix similarity index 100% rename from pkgs/development/tools/mani/default.nix rename to pkgs/by-name/ma/mani/package.nix diff --git a/pkgs/by-name/ma/manicode/package-lock.json b/pkgs/by-name/ma/manicode/package-lock.json new file mode 100644 index 000000000000..a0af8d82c4f5 --- /dev/null +++ b/pkgs/by-name/ma/manicode/package-lock.json @@ -0,0 +1,878 @@ +{ + "name": "manicode", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "manicode": "^1.0.99" + } + }, + "node_modules/@types/diff": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.1.tgz", + "integrity": "sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==", + "license": "MIT" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/axios": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "license": "ISC" + }, + "node_modules/cheerio": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", + "license": "MIT", + "dependencies": { + "cheerio-select": "^2.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" + }, + "engines": { + "node": ">=18.17" + }, + "funding": { + "url": "https://github.com/cheeriojs/cheerio?sponsor=1" + } + }, + "node_modules/cheerio-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", + "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-select": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "license": "MIT", + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/env-cmd": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-10.1.0.tgz", + "integrity": "sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==", + "license": "MIT", + "dependencies": { + "commander": "^4.0.0", + "cross-spawn": "^7.0.0" + }, + "bin": { + "env-cmd": "bin/env-cmd.js" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz", + "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/htmlparser2": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/manicode": { + "version": "1.0.99", + "resolved": "https://registry.npmjs.org/manicode/-/manicode-1.0.99.tgz", + "integrity": "sha512-nPcFII4HyMUJJuCCVRqrt6o5ogyBcB6/SRFeUtyg2vUZyO26KMGD0v+2VHfc/L7IUSHoaAsd8OeNGWdkixg8tw==", + "license": "MIT", + "dependencies": { + "@types/diff": "5.2.1", + "axios": "1.7.4", + "cheerio": "1.0.0", + "diff": "5.2.0", + "env-cmd": "^10.1.0", + "ignore": "5.3.2", + "lodash": "*", + "nanoid": "5.0.7", + "picocolors": "1.1.0", + "systeminformation": "5.23.4", + "tree-sitter": "0.21.1", + "tree-sitter-c": "0.23.0", + "tree-sitter-c-sharp": "0.23.0", + "tree-sitter-cpp": "0.23.0", + "tree-sitter-go": "0.23.1", + "tree-sitter-java": "0.23.2", + "tree-sitter-javascript": "0.23.0", + "tree-sitter-php": "0.23.2", + "tree-sitter-python": "0.23.2", + "tree-sitter-ruby": "0.23.0", + "tree-sitter-rust": "0.23.0", + "tree-sitter-typescript": "0.23.0", + "ts-pattern": "5.3.1", + "ws": "8.18.0", + "zod": "3.23.8" + }, + "bin": { + "manicode": "dist/index.js" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/nanoid": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.7.tgz", + "integrity": "sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.js" + }, + "engines": { + "node": "^18 || >=20" + } + }, + "node_modules/node-addon-api": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.1.tgz", + "integrity": "sha512-vmEOvxwiH8tlOcv4SyE8RH34rI5/nWVaigUeAUPawC6f0+HoDthwI0vkMu4tbtsZrXq6QXFfrkhjofzKEs5tpA==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", + "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/parse5": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.0.tgz", + "integrity": "sha512-ZkDsAOcxsUMZ4Lz5fVciOehNcJ+Gb8gTzcA4yl3wnc273BAybYWrQ+Ks/OjCjSEpjvQkDSeZbybK9qj2VHHdGA==", + "license": "MIT", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "license": "MIT", + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "license": "ISC" + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/systeminformation": { + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.23.4.tgz", + "integrity": "sha512-mD2R9xnOzKOOmIVtxekosf/ghOE/DGLqAPmsEgQMWJK0pMKxBtX19riz1Ss0tN4omcfS2FQ2RDJ4lkxgADxIPw==", + "license": "MIT", + "os": [ + "darwin", + "linux", + "win32", + "freebsd", + "openbsd", + "netbsd", + "sunos", + "android" + ], + "bin": { + "systeminformation": "lib/cli.js" + }, + "engines": { + "node": ">=8.0.0" + }, + "funding": { + "type": "Buy me a coffee", + "url": "https://www.buymeacoffee.com/systeminfo" + } + }, + "node_modules/tree-sitter": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.21.1.tgz", + "integrity": "sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.0.0", + "node-gyp-build": "^4.8.0" + } + }, + "node_modules/tree-sitter-c": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.23.0.tgz", + "integrity": "sha512-ZruwnqyMrTFEvDuglqpiN7Rjh8wczh7afNMRJGK/AHdCwmtcmUzZeOiF8ZDskryoWhmAzrMHQdhpV2bj2ohQNg==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.0" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-c-sharp": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-c-sharp/-/tree-sitter-c-sharp-0.23.0.tgz", + "integrity": "sha512-ielPI6vnwW9VEH19TRCNKzkcRQ++rVwmLncPxmhMeJNporXBnXjj28U98NlGzV75arVlZmNsbMXTqBkAFNeKtw==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.0.0", + "node-gyp-build": "^4.8.1" + }, + "peerDependencies": { + "tree-sitter": "^0.21.0" + }, + "peerDependenciesMeta": { + "tree_sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-cpp": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.23.0.tgz", + "integrity": "sha512-SpPEijWCKzC92soaQlomrq9+1/U64OqqFD1n/QxYXMAXVqgcAVijHJ8Lrs4v1YzDq+MFmIj8GgO3Ve4Ub0EAQw==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.1" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-go": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.23.1.tgz", + "integrity": "sha512-WfDdd/OVwzShWkhBoh2f3nE2VBhffOGpOrTHEI7z80Yjh3TcdPp3OCryYOStYwaDdSK4+f5ZUO9dMtpXsYRRoA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.0" + }, + "peerDependenciesMeta": { + "tree_sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-java": { + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/tree-sitter-java/-/tree-sitter-java-0.23.2.tgz", + "integrity": "sha512-JI54R2Geqz0mW0Et+R2XZwWXBG2bYA95HGd2e46dbHglmZIgRvf3TVXUzdlO5RFvRMItnK8POlXjKcwKtsDjzw==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.1" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-javascript": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.23.0.tgz", + "integrity": "sha512-xw0nc8P/u+uhoRuKmalcv/3OGGLtaeVWx/NpqAHXPvJsdSPdkx+IoRod4W4hw1zDNj1V6xzJgdATk0IPNUNy3w==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.1" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-php": { + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/tree-sitter-php/-/tree-sitter-php-0.23.2.tgz", + "integrity": "sha512-ocmpnfo7jtWFkHeWnPIs1QhSdOP8eSuhaS6DM1OYHUBJTzlJAlFQ7uECnwv9FqlTzclNrJidysQlXyiluUIyhw==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "globals": "^15.9.0", + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.1" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-python": { + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.23.2.tgz", + "integrity": "sha512-QD9PbfIhlFZX3+hh5HPD8MGLIbV+CBxviyDpLRLceNCxI2ClPv8glu9TmLKaVoaWGMfDtBrU9UikRAbJ/4litA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.0" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-ruby": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.23.0.tgz", + "integrity": "sha512-ArVDutVHjDxsnpEx+afdD4l2+WOpr7OCSVIrnm0JW/vpNVU/ywQQ90dmn7rw8vRHDNiUUWGq25OerOo6PCuEGw==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.0" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-rust": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-rust/-/tree-sitter-rust-0.23.0.tgz", + "integrity": "sha512-vbb5ESloUtrRZMFA5EOgR56DMq6Ijb22PdG2zwsw8pdByYGLo0DxOmLp5KQce5rwNoZgEEp5/IiCN243TxQKIg==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.1" + }, + "peerDependenciesMeta": { + "tree-sitter": { + "optional": true + } + } + }, + "node_modules/tree-sitter-typescript": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.23.0.tgz", + "integrity": "sha512-hRy5O9d+9ON4HxIWWxkI4zonrw2v/WNN1JoiGW5HkXfC9K2R3p53ugMvs6Vs4T7ASCwggsoQ75LNdgpExC/zgQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.1.0", + "node-gyp-build": "^4.8.2" + }, + "peerDependencies": { + "tree-sitter": "^0.21.0" + }, + "peerDependenciesMeta": { + "tree_sitter": { + "optional": true + } + } + }, + "node_modules/ts-pattern": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.3.1.tgz", + "integrity": "sha512-1RUMKa8jYQdNfmnK4jyzBK3/PS/tnjcZ1CW0v1vWDeYe5RBklc/nquw03MEoB66hVBm4BnlCfmOqDVxHyT1DpA==", + "license": "MIT" + }, + "node_modules/undici": { + "version": "6.20.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz", + "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/ws": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + } + } +} diff --git a/pkgs/by-name/ma/manicode/package.nix b/pkgs/by-name/ma/manicode/package.nix new file mode 100644 index 000000000000..fc2903f2685f --- /dev/null +++ b/pkgs/by-name/ma/manicode/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildNpmPackage, + fetchzip, +}: + +buildNpmPackage rec { + pname = "manicode"; + version = "1.0.99"; + + src = fetchzip { + url = "https://registry.npmjs.org/manicode/-/manicode-${version}.tgz"; + hash = "sha256-LVTh8yOfP92zGSdxLpThC+U9E8cBjoL0+iMQOldNO8A="; + }; + + npmDepsHash = "sha256-MAm/FE8M6BBDZD5Fy2k6GcM5Qv35jNeUwHcemmbUj/A="; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Use natural language to edit your codebase and run commands from your terminal faster"; + homepage = "https://manicode.ai"; + downloadPage = "https://www.npmjs.com/package/manicode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.malo ]; + mainProgram = "manicode"; + }; +} diff --git a/pkgs/by-name/ma/manicode/update.sh b/pkgs/by-name/ma/manicode/update.sh new file mode 100755 index 000000000000..448195ca2041 --- /dev/null +++ b/pkgs/by-name/ma/manicode/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nodePackages.npm nix-update + +set -euo pipefail + +version=$(npm view manicode version) + +# Generate updated lock file +cd "$(dirname "${BASH_SOURCE[0]}")" +npm i --package-lock-only manicode@$version +rm -f package.json + +# Update version and hases +cd - +nix-update manicode --version "$version" diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/by-name/ma/manifest-tool/package.nix similarity index 100% rename from pkgs/development/tools/manifest-tool/default.nix rename to pkgs/by-name/ma/manifest-tool/package.nix diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/by-name/ma/manrope/package.nix similarity index 100% rename from pkgs/data/fonts/manrope/default.nix rename to pkgs/by-name/ma/manrope/package.nix diff --git a/pkgs/applications/science/biology/manta/default.nix b/pkgs/by-name/ma/manta/package.nix similarity index 100% rename from pkgs/applications/science/biology/manta/default.nix rename to pkgs/by-name/ma/manta/package.nix diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/by-name/ma/manticore/package.nix similarity index 100% rename from pkgs/development/compilers/manticore/default.nix rename to pkgs/by-name/ma/manticore/package.nix diff --git a/pkgs/tools/security/mantra/default.nix b/pkgs/by-name/ma/mantra/package.nix similarity index 100% rename from pkgs/tools/security/mantra/default.nix rename to pkgs/by-name/ma/mantra/package.nix diff --git a/pkgs/tools/misc/map/default.nix b/pkgs/by-name/ma/map-cmd/package.nix similarity index 100% rename from pkgs/tools/misc/map/default.nix rename to pkgs/by-name/ma/map-cmd/package.nix diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/by-name/ma/mapcidr/package.nix similarity index 100% rename from pkgs/tools/misc/mapcidr/default.nix rename to pkgs/by-name/ma/mapcidr/package.nix diff --git a/pkgs/games/mar1d/default.nix b/pkgs/by-name/ma/mar1d/package.nix similarity index 100% rename from pkgs/games/mar1d/default.nix rename to pkgs/by-name/ma/mar1d/package.nix diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/by-name/ma/marathi-cursive/package.nix similarity index 100% rename from pkgs/data/fonts/marathi-cursive/default.nix rename to pkgs/by-name/ma/marathi-cursive/package.nix diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/by-name/ma/marathonctl/package.nix similarity index 100% rename from pkgs/tools/virtualization/marathonctl/default.nix rename to pkgs/by-name/ma/marathonctl/package.nix diff --git a/pkgs/games/marble-marcher-ce/default.nix b/pkgs/by-name/ma/marble-marcher-ce/package.nix similarity index 100% rename from pkgs/games/marble-marcher-ce/default.nix rename to pkgs/by-name/ma/marble-marcher-ce/package.nix diff --git a/pkgs/games/mari0/default.nix b/pkgs/by-name/ma/mari0/package.nix similarity index 100% rename from pkgs/games/mari0/default.nix rename to pkgs/by-name/ma/mari0/package.nix diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/by-name/ma/marisa/package.nix similarity index 100% rename from pkgs/development/libraries/marisa/default.nix rename to pkgs/by-name/ma/marisa/package.nix diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/by-name/ma/mark/package.nix similarity index 100% rename from pkgs/tools/text/mark/default.nix rename to pkgs/by-name/ma/mark/package.nix diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/by-name/ma/markdown-anki-decks/package.nix similarity index 100% rename from pkgs/tools/misc/markdown-anki-decks/default.nix rename to pkgs/by-name/ma/markdown-anki-decks/package.nix diff --git a/pkgs/by-name/ma/markdown-oxide/Cargo.lock b/pkgs/by-name/ma/markdown-oxide/Cargo.lock index 8ebe7f14ce2b..999bf6c513eb 100644 --- a/pkgs/by-name/ma/markdown-oxide/Cargo.lock +++ b/pkgs/by-name/ma/markdown-oxide/Cargo.lock @@ -642,7 +642,7 @@ dependencies = [ [[package]] name = "markdown-oxide" -version = "0.23.1" +version = "0.24.0" dependencies = [ "anyhow", "chrono", diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix index 481dc7f402dc..0da83f316e71 100644 --- a/pkgs/by-name/ma/markdown-oxide/package.nix +++ b/pkgs/by-name/ma/markdown-oxide/package.nix @@ -3,16 +3,15 @@ rustPlatform, fetchFromGitHub, }: - -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "markdown-oxide"; - version = "0.23.1-unstable-2024-07-20"; + version = "0.24.2"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; - rev = "0f1542a54a44de8313087f6c60e6ecd54f52ede5"; - hash = "sha256-zxJZnhN2cN3sNd+PHi2jYuHDDA4ekEVIi3X52Z/8TGM="; + rev = "v${version}"; + hash = "sha256-LMDL2jLHKgPBkz7QcU4yVzR2ySaboCZ9AOKmdA/NA4c="; }; cargoLock = { diff --git a/pkgs/tools/text/markdownlint-cli/default.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix similarity index 100% rename from pkgs/tools/text/markdownlint-cli/default.nix rename to pkgs/by-name/ma/markdownlint-cli/package.nix diff --git a/pkgs/tools/text/markdownlint-cli2/default.nix b/pkgs/by-name/ma/markdownlint-cli2/package.nix similarity index 100% rename from pkgs/tools/text/markdownlint-cli2/default.nix rename to pkgs/by-name/ma/markdownlint-cli2/package.nix diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/by-name/ma/marker/package.nix similarity index 100% rename from pkgs/applications/editors/marker/default.nix rename to pkgs/by-name/ma/marker/package.nix diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/by-name/ma/markets/package.nix similarity index 100% rename from pkgs/applications/misc/markets/default.nix rename to pkgs/by-name/ma/markets/package.nix diff --git a/pkgs/tools/text/markscribe/default.nix b/pkgs/by-name/ma/markscribe/package.nix similarity index 100% rename from pkgs/tools/text/markscribe/default.nix rename to pkgs/by-name/ma/markscribe/package.nix diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/by-name/ma/marktext/package.nix similarity index 100% rename from pkgs/applications/misc/marktext/default.nix rename to pkgs/by-name/ma/marktext/package.nix diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/by-name/ma/marl/package.nix similarity index 100% rename from pkgs/development/libraries/marl/default.nix rename to pkgs/by-name/ma/marl/package.nix diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/by-name/ma/marlin-calc/package.nix similarity index 100% rename from pkgs/tools/misc/marlin-calc/default.nix rename to pkgs/by-name/ma/marlin-calc/package.nix diff --git a/pkgs/tools/typesetting/marp/default.nix b/pkgs/by-name/ma/marp-cli/package.nix similarity index 100% rename from pkgs/tools/typesetting/marp/default.nix rename to pkgs/by-name/ma/marp-cli/package.nix diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/by-name/ma/mars-mips/package.nix similarity index 100% rename from pkgs/development/tools/mars-mips/default.nix rename to pkgs/by-name/ma/mars-mips/package.nix diff --git a/pkgs/games/mars/default.nix b/pkgs/by-name/ma/mars/package.nix similarity index 100% rename from pkgs/games/mars/default.nix rename to pkgs/by-name/ma/mars/package.nix diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/by-name/ma/martian-mono/package.nix similarity index 100% rename from pkgs/data/fonts/martian-mono/default.nix rename to pkgs/by-name/ma/martian-mono/package.nix diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix index 432ad3dcea21..91b4f45d82e2 100644 --- a/pkgs/by-name/ma/marwaita-mint/package.nix +++ b/pkgs/by-name/ma/marwaita-mint/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "marwaita-mint"; - version = "21"; + version = "22.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-mint"; rev = finalAttrs.version; - hash = "sha256-RzQmBD4nlnzZN1BCS6EOqbuSxmjHPAgf/uv99xgAUYU="; + hash = "sha256-hKpiEq2Xofp64p5HbznNc4biDALsIN1M98px1sTluFA="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix index 16de4362c4fd..e12c9f501076 100644 --- a/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-orange"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI="; + hash = "sha256-hp+5UIr3uXuUay3K6HsaGs+Wh9VFx1yVNb3d0Jw2M34="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-red/package.nix b/pkgs/by-name/ma/marwaita-red/package.nix index 685d0df7d8ad..262ed501612b 100644 --- a/pkgs/by-name/ma/marwaita-red/package.nix +++ b/pkgs/by-name/ma/marwaita-red/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-red"; - version = "22"; + version = "22.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-oUJ74MNAFbbM123v7i+b29UEFFumswPI3DmqeeahMd4="; + hash = "sha256-MxGjJLPjvLc1kPDc9ib6hIxgbMrF8Cm+HCm2CGSrf+s="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-yellow/package.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix new file mode 100644 index 000000000000..15c51e354eb5 --- /dev/null +++ b/pkgs/by-name/ma/marwaita-yellow/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "marwaita-yellow"; + version = "20.3.1"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-yellow"; + rev = version; + hash = "sha256-ClM2lvFFLNz+pF/pY7j/V5L24egB3oxpkH8cpZMSu5g="; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Marwaita GTK theme with Pop_os Linux style"; + homepage = "https://www.pling.com/p/1377894/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/by-name/ma/marwaita/package.nix b/pkgs/by-name/ma/marwaita/package.nix index 66f4d31b971d..3078baf05390 100644 --- a/pkgs/by-name/ma/marwaita/package.nix +++ b/pkgs/by-name/ma/marwaita/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "marwaita"; - version = "22"; + version = "22.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-Aa6qJGLQ+MLn/QeZzjMj/O5vEp/Cr/g7n8JFFlSgfOc="; + hash = "sha256-LJwobpyQ2KVaJ4jkkg+ISAhjaHLWqYYVuX1z0YJdX6g="; }; buildInputs = [ diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/by-name/ma/mas/package.nix similarity index 100% rename from pkgs/os-specific/darwin/mas/default.nix rename to pkgs/by-name/ma/mas/package.nix diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/by-name/ma/mask/package.nix similarity index 100% rename from pkgs/development/tools/mask/default.nix rename to pkgs/by-name/ma/mask/package.nix diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/by-name/ma/masscan/package.nix similarity index 100% rename from pkgs/tools/security/masscan/default.nix rename to pkgs/by-name/ma/masscan/package.nix diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/by-name/ma/massren/package.nix similarity index 100% rename from pkgs/tools/misc/massren/default.nix rename to pkgs/by-name/ma/massren/package.nix diff --git a/pkgs/tools/backup/mastodon-archive/default.nix b/pkgs/by-name/ma/mastodon-archive/package.nix similarity index 100% rename from pkgs/tools/backup/mastodon-archive/default.nix rename to pkgs/by-name/ma/mastodon-archive/package.nix diff --git a/pkgs/tools/misc/mastotool/default.nix b/pkgs/by-name/ma/mastotool/package.nix similarity index 100% rename from pkgs/tools/misc/mastotool/default.nix rename to pkgs/by-name/ma/mastotool/package.nix diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/matcha/default.nix rename to pkgs/by-name/ma/matcha-gtk-theme/package.nix diff --git a/pkgs/applications/misc/matcha-rss-digest/default.nix b/pkgs/by-name/ma/matcha-rss-digest/package.nix similarity index 100% rename from pkgs/applications/misc/matcha-rss-digest/default.nix rename to pkgs/by-name/ma/matcha-rss-digest/package.nix diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/by-name/ma/matchbox/package.nix similarity index 100% rename from pkgs/applications/window-managers/matchbox/default.nix rename to pkgs/by-name/ma/matchbox/package.nix diff --git a/pkgs/data/themes/materia-kde/default.nix b/pkgs/by-name/ma/materia-kde-theme/package.nix similarity index 100% rename from pkgs/data/themes/materia-kde/default.nix rename to pkgs/by-name/ma/materia-kde-theme/package.nix diff --git a/pkgs/by-name/ma/materia-theme-transparent/package.nix b/pkgs/by-name/ma/materia-theme-transparent/package.nix new file mode 100644 index 000000000000..9eccec1c343b --- /dev/null +++ b/pkgs/by-name/ma/materia-theme-transparent/package.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + materia-theme, +}: +materia-theme.overrideAttrs (oldAttrs: rec { + pname = "materia-theme-transparent"; + version = "0-unstable-2021-03-22"; + + src = fetchFromGitHub { + owner = "ckissane"; + repo = "materia-theme-transparent"; + rev = "c5d95bbddd59a717bfc4976737af429a89ba74e0"; + hash = "sha256-dHcwPTZFWO42wu1LbtGCMm2w/YHbjSUJnRKcaFllUbs="; + }; + + meta = { + description = "Transparent Material Design theme for GNOME/GTK based desktop environments"; + homepage = "https://github.com/ckissane/materia-theme-transparent"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.corbinwunderlich ]; + }; +}) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/by-name/ma/materia-theme/package.nix similarity index 100% rename from pkgs/data/themes/materia-theme/default.nix rename to pkgs/by-name/ma/materia-theme/package.nix diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/by-name/ma/material-design-icons/package.nix similarity index 100% rename from pkgs/data/fonts/material-design-icons/default.nix rename to pkgs/by-name/ma/material-design-icons/package.nix diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/by-name/ma/material-icons/package.nix similarity index 100% rename from pkgs/data/fonts/material-icons/default.nix rename to pkgs/by-name/ma/material-icons/package.nix diff --git a/pkgs/data/fonts/material-symbols/default.nix b/pkgs/by-name/ma/material-symbols/package.nix similarity index 100% rename from pkgs/data/fonts/material-symbols/default.nix rename to pkgs/by-name/ma/material-symbols/package.nix diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index 3ab41652a09c..651a60bb4b00 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -1,34 +1,40 @@ { - telegram-desktop, lib, + telegram-desktop, fetchFromGitHub, + withWebkit ? true, }: -telegram-desktop.overrideAttrs ( - finalAttrs: previousAttrs: { - pname = "materialgram"; - version = "5.6.1.1"; - src = fetchFromGitHub { - owner = "kukuruzka165"; - repo = "materialgram"; - rev = "refs/tags/v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-e2ZLUooPMs0qB97BDyCiOUeD7cc+MuF5of65mEeJr04="; - }; +telegram-desktop.override { + pname = "materialgram"; + inherit withWebkit; + unwrapped = telegram-desktop.unwrapped.overrideAttrs ( + finalAttrs: previousAttrs: { + pname = "materialgram-unwrapped"; + version = "5.7.0.1"; - meta = previousAttrs.meta // { - description = "Telegram Desktop fork with material icons and some improvements"; - longDescription = '' - Telegram Desktop fork with Material Design and other improvements, - which is based on the Telegram API and the MTProto secure protocol. - ''; - homepage = "https://kukuruzka165.github.io/materialgram/"; - changelog = "https://github.com/kukuruzka165/materialgram/releases/tag/v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - oluceps - aleksana - ]; - mainProgram = "materialgram"; - }; - } -) + src = fetchFromGitHub { + owner = "kukuruzka165"; + repo = "materialgram"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-YdLUwXMATla64KSYnXLXwLl0KktNoB/IuHIIY44R1VY="; + fetchSubmodules = true; + }; + + meta = previousAttrs.meta // { + description = "Telegram Desktop fork with material icons and some improvements"; + longDescription = '' + Telegram Desktop fork with Material Design and other improvements, + which is based on the Telegram API and the MTProto secure protocol. + ''; + homepage = "https://kukuruzka165.github.io/materialgram/"; + changelog = "https://github.com/kukuruzka165/materialgram/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ + oluceps + aleksana + ]; + mainProgram = "materialgram"; + }; + } + ); +} diff --git a/pkgs/tools/text/math-review/default.nix b/pkgs/by-name/ma/math-preview/package.nix similarity index 100% rename from pkgs/tools/text/math-review/default.nix rename to pkgs/by-name/ma/math-preview/package.nix diff --git a/pkgs/development/libraries/mathgl/default.nix b/pkgs/by-name/ma/mathgl/package.nix similarity index 100% rename from pkgs/development/libraries/mathgl/default.nix rename to pkgs/by-name/ma/mathgl/package.nix diff --git a/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/pkgs/by-name/ma/mathpix-snipping-tool/package.nix similarity index 100% rename from pkgs/tools/misc/mathpix-snipping-tool/default.nix rename to pkgs/by-name/ma/mathpix-snipping-tool/package.nix diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/by-name/ma/matio/package.nix similarity index 100% rename from pkgs/development/libraries/matio/default.nix rename to pkgs/by-name/ma/matio/package.nix diff --git a/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/pkgs/by-name/ma/matrix-alertmanager/package.nix similarity index 100% rename from pkgs/servers/monitoring/matrix-alertmanager/default.nix rename to pkgs/by-name/ma/matrix-alertmanager/package.nix diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix rename to pkgs/by-name/ma/matrix-appservice-irc/package.nix diff --git a/pkgs/servers/matrix-conduit/Cargo.lock b/pkgs/by-name/ma/matrix-conduit/Cargo.lock similarity index 100% rename from pkgs/servers/matrix-conduit/Cargo.lock rename to pkgs/by-name/ma/matrix-conduit/Cargo.lock diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/by-name/ma/matrix-conduit/package.nix similarity index 100% rename from pkgs/servers/matrix-conduit/default.nix rename to pkgs/by-name/ma/matrix-conduit/package.nix diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/by-name/ma/matrix-corporal/package.nix similarity index 100% rename from pkgs/servers/matrix-corporal/default.nix rename to pkgs/by-name/ma/matrix-corporal/package.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/by-name/ma/matrix-dl/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-dl/default.nix rename to pkgs/by-name/ma/matrix-dl/package.nix diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 5477ad89d604..00a3f052847e 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-07-22"; + version = "0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "D3vil0p3r"; repo = "Matrix-GTK-Theme"; - rev = "f453093dffa0f46596b325c6a760afd6ea6cd810"; - hash = "sha256-DfM4nsJZvcNyUUn0opu3OM46sxhsjeeyuUuliQPrU0I="; + rev = "a91254e5827f5fb331308ecf893881bc9643f01a"; + hash = "sha256-XiXKzXzzWcJIfEV8ngczovyjCqH7uX8tToihq66q+jo="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-hookshot/package.json rename to pkgs/by-name/ma/matrix-hookshot/package.json diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-hookshot/default.nix rename to pkgs/by-name/ma/matrix-hookshot/package.nix diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-hookshot/pin.json rename to pkgs/by-name/ma/matrix-hookshot/pin.json diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/pkgs/by-name/ma/matrix-hookshot/update.sh similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-hookshot/update.sh rename to pkgs/by-name/ma/matrix-hookshot/update.sh diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix rename to pkgs/by-name/ma/mattermost-desktop/package.nix diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index b147e74c2294..1a67c6cd51f7 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -1,34 +1,28 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { pname = "matugen"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; - rev = "v${version}"; - hash = "sha256-WFitpFF1Ah4HkzSe4H4aN/ZM0EEIcP5ozLMUWaDggFU="; + rev = "refs/tags/v${version}"; + hash = "sha256-SN4m0ka5VHLIQYTszhlCIB+2D+nyWMzJM5n5bZdkG/I="; }; - cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; + cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - meta = with lib; { + meta = { description = "Material you color generation tool"; homepage = "https://github.com/InioX/matugen"; changelog = "https://github.com/InioX/matugen/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ lampros ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lampros ]; mainProgram = "matugen"; }; } diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index fa7eb781c1e4..482861c75067 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.7.1"; + version = "1.7.4"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-kFhY2ixZZrSA/YxLCQDLPjLqNWQI3zl5V1MLTPqQH60="; + hash = "sha256-Zephf4mB3RI5YIAOIjfqIfgVANefkH63OQoPPMe417E="; }; - cargoHash = "sha256-ik6kFS66umiHf0M1fE+6++zpZF4gJrN9LQ2l+vi9SSY="; + cargoHash = "sha256-yLKt/Xml7ig6QG3T5Qn39tW7U5NIN1hSOaLiSRMiy5I="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ma/maude/package.nix b/pkgs/by-name/ma/maude/package.nix new file mode 100644 index 000000000000..2050760adaf6 --- /dev/null +++ b/pkgs/by-name/ma/maude/package.nix @@ -0,0 +1,77 @@ +{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla +, libsigsegv, gmpxx, cln, yices +# passthru.tests +, tamarin-prover +}: + +let + version = "3.4"; +in + +stdenv.mkDerivation { + pname = "maude"; + inherit version; + + src = fetchurl { + url = "https://github.com/maude-lang/Maude/archive/refs/tags/Maude${version}.tar.gz"; + sha256 = "IXWEWAmh388NpNSt9wnOpLkzhZ09N+AStO2wn5dRT8o="; + }; + + nativeBuildInputs = [ flex bison unzip makeWrapper ]; + buildInputs = [ + ncurses buddy tecla gmpxx libsigsegv cln yices + ]; + + hardeningDisable = [ "stackprotector" ] ++ + lib.optionals stdenv.hostPlatform.isi686 [ "pic" "fortify" ]; + + # Fix for glibc-2.34, see + # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4 + configureFlags = [ "--without-libsigsegv" ]; + + # Certain tests (in particular, Misc/fileTest) expect us to build in a subdirectory + # We'll use the directory Opt/ as suggested in INSTALL + preConfigure = '' + mkdir Opt; cd Opt + configureFlagsArray=( + --datadir="$out/share/maude" + TECLA_LIBS="-ltecla -lncursesw" + LIBS="-lcln" + CFLAGS="-O3" CXXFLAGS="-O3" + ) + ''; + configureScript = "../configure"; + + doCheck = true; + + postInstall = '' + for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done + ''; + + passthru.tests = { + # tamarin-prover only supports specific versions of maude explicitly + inherit tamarin-prover; + }; + + enableParallelBuilding = true; + + meta = { + homepage = "http://maude.cs.illinois.edu/"; + description = "High-level specification language"; + mainProgram = "maude"; + license = lib.licenses.gpl2Plus; + + longDescription = '' + Maude is a high-performance reflective language and system + supporting both equational and rewriting logic specification and + programming for a wide range of applications. Maude has been + influenced in important ways by the OBJ3 language, which can be + regarded as an equational logic sublanguage. Besides supporting + equational specification and programming, Maude also supports + rewriting logic computation. + ''; + + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; + }; +} diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/by-name/ma/mautrix-discord/package.nix similarity index 100% rename from pkgs/servers/mautrix-discord/default.nix rename to pkgs/by-name/ma/mautrix-discord/package.nix diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/by-name/ma/mautrix-facebook/package.nix similarity index 100% rename from pkgs/servers/mautrix-facebook/default.nix rename to pkgs/by-name/ma/mautrix-facebook/package.nix diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/by-name/ma/mautrix-googlechat/package.nix similarity index 100% rename from pkgs/servers/mautrix-googlechat/default.nix rename to pkgs/by-name/ma/mautrix-googlechat/package.nix diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix similarity index 100% rename from pkgs/servers/mautrix-whatsapp/default.nix rename to pkgs/by-name/ma/mautrix-whatsapp/package.nix diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index d48e0448ea12..f7d88548f36b 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.asl20; mainProgram = "mvn"; - maintainers = [ ]; + maintainers = [ ] ++ lib.teams.java.members; inherit (jdk_headless.meta) platforms; }; }) diff --git a/pkgs/tools/archivers/maxcso/default.nix b/pkgs/by-name/ma/maxcso/package.nix similarity index 100% rename from pkgs/tools/archivers/maxcso/default.nix rename to pkgs/by-name/ma/maxcso/package.nix diff --git a/pkgs/development/libraries/maxflow/default.nix b/pkgs/by-name/ma/maxflow/package.nix similarity index 100% rename from pkgs/development/libraries/maxflow/default.nix rename to pkgs/by-name/ma/maxflow/package.nix diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/by-name/ma/maxlib/package.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/maxlib/default.nix rename to pkgs/by-name/ma/maxlib/package.nix diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/by-name/mb/mb2md/package.nix similarity index 100% rename from pkgs/tools/text/mb2md/default.nix rename to pkgs/by-name/mb/mb2md/package.nix diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/by-name/mb/mbed-cli/package.nix similarity index 100% rename from pkgs/development/tools/mbed-cli/default.nix rename to pkgs/by-name/mb/mbed-cli/package.nix diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/by-name/mb/mbelib/package.nix similarity index 100% rename from pkgs/development/libraries/audio/mbelib/default.nix rename to pkgs/by-name/mb/mbelib/package.nix diff --git a/pkgs/tools/networking/mbidled/default.nix b/pkgs/by-name/mb/mbidled/package.nix similarity index 100% rename from pkgs/tools/networking/mbidled/default.nix rename to pkgs/by-name/mb/mbidled/package.nix diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/by-name/mb/mblaze/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mblaze/default.nix rename to pkgs/by-name/mb/mblaze/package.nix diff --git a/pkgs/by-name/mb/mblock-mlink/package.nix b/pkgs/by-name/mb/mblock-mlink/package.nix new file mode 100644 index 000000000000..d2bdb21ec930 --- /dev/null +++ b/pkgs/by-name/mb/mblock-mlink/package.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook }: + +stdenv.mkDerivation rec { + pname = "mblock-mlink"; + version = "1.2.0"; + + src = fetchurl { + url = "https://dl.makeblock.com/mblock5/linux/mLink-${version}-amd64.deb"; + sha256 = "sha256-KLxj81ZjbEvhhaz0seNB4WXX5ybeZ7/WcT1dGfdWle0="; + }; + + unpackPhase = '' + ${dpkg}/bin/dpkg -x $src $out + ''; + + buildInputs = [ + (lib.getLib stdenv.cc.cc) + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + installPhase = '' + mv $out/usr/local/makeblock $out/usr/makeblock + rmdir $out/usr/local + mkdir -p $out/bin + echo $out/usr/makeblock/mLink/mnode $out/usr/makeblock/mLink/app.js > $out/bin/mlink + chmod +x $out/bin/mlink + ''; + + meta = with lib; { + description = "Driver for mBlock web version"; + homepage = "https://mblock.makeblock.com/en-us/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.mausch ]; + }; +} diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/by-name/mb/mbpfan/package.nix similarity index 100% rename from pkgs/os-specific/linux/mbpfan/default.nix rename to pkgs/by-name/mb/mbpfan/package.nix diff --git a/pkgs/by-name/mb/mbuffer/package.nix b/pkgs/by-name/mb/mbuffer/package.nix new file mode 100644 index 000000000000..c86ac98fd4b1 --- /dev/null +++ b/pkgs/by-name/mb/mbuffer/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, openssl +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mbuffer"; + version = "20241007"; + outputs = [ "out" "man" ]; + + src = fetchurl { + url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz"; + sha256 = "sha256-nXNjAQtO9FsWRva19QJ7SbtqIJxQL7hOKBx713HVa+0="; + }; + + buildInputs = [ + openssl + ]; + nativeBuildInputs = [ + which + ]; + + doCheck = true; + + meta = { + description = "Tool for buffering data streams with a large set of unique features"; + homepage = "https://www.maier-komor.de/mbuffer.html"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; # Maybe other non-darwin Unix + mainProgram = "mbuffer"; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/by-name/mc/mcabber/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mcabber/default.nix rename to pkgs/by-name/mc/mcabber/package.nix diff --git a/pkgs/os-specific/linux/mceinject/default.nix b/pkgs/by-name/mc/mceinject/package.nix similarity index 100% rename from pkgs/os-specific/linux/mceinject/default.nix rename to pkgs/by-name/mc/mceinject/package.nix diff --git a/pkgs/games/mchprs/Cargo.lock b/pkgs/by-name/mc/mchprs/Cargo.lock similarity index 100% rename from pkgs/games/mchprs/Cargo.lock rename to pkgs/by-name/mc/mchprs/Cargo.lock diff --git a/pkgs/games/mchprs/default.nix b/pkgs/by-name/mc/mchprs/package.nix similarity index 100% rename from pkgs/games/mchprs/default.nix rename to pkgs/by-name/mc/mchprs/package.nix diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/by-name/mc/mcrcon/package.nix similarity index 100% rename from pkgs/tools/networking/mcrcon/default.nix rename to pkgs/by-name/mc/mcrcon/package.nix diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/by-name/mc/mcrl2/package.nix similarity index 100% rename from pkgs/applications/science/logic/mcrl2/default.nix rename to pkgs/by-name/mc/mcrl2/package.nix diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/by-name/mc/mcron/package.nix similarity index 100% rename from pkgs/tools/system/mcron/default.nix rename to pkgs/by-name/mc/mcron/package.nix diff --git a/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch b/pkgs/by-name/mc/mcrypt/format-string_CVE-2012-4426.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch rename to pkgs/by-name/mc/mcrypt/format-string_CVE-2012-4426.patch diff --git a/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch rename to pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch diff --git a/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch b/pkgs/by-name/mc/mcrypt/overflow_CVE-2012-4409.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch rename to pkgs/by-name/mc/mcrypt/overflow_CVE-2012-4409.patch diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/by-name/mc/mcrypt/package.nix similarity index 100% rename from pkgs/tools/misc/mcrypt/default.nix rename to pkgs/by-name/mc/mcrypt/package.nix diff --git a/pkgs/tools/misc/mcrypt/segv.patch b/pkgs/by-name/mc/mcrypt/segv.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/segv.patch rename to pkgs/by-name/mc/mcrypt/segv.patch diff --git a/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch b/pkgs/by-name/mc/mcrypt/sprintf_CVE-2012-4527.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch rename to pkgs/by-name/mc/mcrypt/sprintf_CVE-2012-4527.patch diff --git a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/pkgs/by-name/mc/mctc-lib/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/mctc-lib/default.nix rename to pkgs/by-name/mc/mctc-lib/package.nix diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/by-name/mc/mcy/package.nix similarity index 100% rename from pkgs/applications/science/logic/mcy/default.nix rename to pkgs/by-name/mc/mcy/package.nix diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/by-name/md/mda_lv2/package.nix similarity index 100% rename from pkgs/applications/audio/mda-lv2/default.nix rename to pkgs/by-name/md/mda_lv2/package.nix diff --git a/pkgs/os-specific/linux/mdadm/fix-hardcoded-mapdir.patch b/pkgs/by-name/md/mdadm4/fix-hardcoded-mapdir.patch similarity index 100% rename from pkgs/os-specific/linux/mdadm/fix-hardcoded-mapdir.patch rename to pkgs/by-name/md/mdadm4/fix-hardcoded-mapdir.patch diff --git a/pkgs/os-specific/linux/mdadm/no-self-references.patch b/pkgs/by-name/md/mdadm4/no-self-references.patch similarity index 100% rename from pkgs/os-specific/linux/mdadm/no-self-references.patch rename to pkgs/by-name/md/mdadm4/no-self-references.patch diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/by-name/md/mdadm4/package.nix similarity index 100% rename from pkgs/os-specific/linux/mdadm/default.nix rename to pkgs/by-name/md/mdadm4/package.nix diff --git a/pkgs/tools/text/mdbook-cmdrun/default.nix b/pkgs/by-name/md/mdbook-cmdrun/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-cmdrun/default.nix rename to pkgs/by-name/md/mdbook-cmdrun/package.nix diff --git a/pkgs/tools/text/mdbook-emojicodes/default.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-emojicodes/default.nix rename to pkgs/by-name/md/mdbook-emojicodes/package.nix diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-i18n-helpers/default.nix rename to pkgs/by-name/md/mdbook-i18n-helpers/package.nix diff --git a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-kroki-preprocessor/default.nix rename to pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix diff --git a/pkgs/tools/text/mdbook-man/default.nix b/pkgs/by-name/md/mdbook-man/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-man/default.nix rename to pkgs/by-name/md/mdbook-man/package.nix diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-open-on-gh/default.nix rename to pkgs/by-name/md/mdbook-open-on-gh/package.nix diff --git a/pkgs/tools/text/mdbook-pagetoc/default.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix similarity index 100% rename from pkgs/tools/text/mdbook-pagetoc/default.nix rename to pkgs/by-name/md/mdbook-pagetoc/package.nix diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/by-name/md/mdbtools/package.nix similarity index 100% rename from pkgs/tools/misc/mdbtools/default.nix rename to pkgs/by-name/md/mdbtools/package.nix diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/by-name/md/mdctags/package.nix similarity index 100% rename from pkgs/development/tools/misc/mdctags/default.nix rename to pkgs/by-name/md/mdctags/package.nix diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/by-name/md/mdevctl/package.nix similarity index 100% rename from pkgs/os-specific/linux/mdevctl/default.nix rename to pkgs/by-name/md/mdevctl/package.nix diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/by-name/md/mdf2iso/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/mdf2iso/default.nix rename to pkgs/by-name/md/mdf2iso/package.nix diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/by-name/md/mdhtml/package.nix similarity index 100% rename from pkgs/tools/text/mdhtml/default.nix rename to pkgs/by-name/md/mdhtml/package.nix diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/by-name/md/mdk-sdk/package.nix similarity index 100% rename from pkgs/development/libraries/mdk-sdk/default.nix rename to pkgs/by-name/md/mdk-sdk/package.nix diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/by-name/md/mdk/package.nix similarity index 100% rename from pkgs/development/tools/mdk/default.nix rename to pkgs/by-name/md/mdk/package.nix diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/by-name/md/mdk4/package.nix similarity index 100% rename from pkgs/tools/networking/mdk4/default.nix rename to pkgs/by-name/md/mdk4/package.nix diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/by-name/md/mdp/package.nix similarity index 100% rename from pkgs/applications/misc/mdp/default.nix rename to pkgs/by-name/md/mdp/package.nix diff --git a/pkgs/tools/misc/mdr/default.nix b/pkgs/by-name/md/mdr/package.nix similarity index 100% rename from pkgs/tools/misc/mdr/default.nix rename to pkgs/by-name/md/mdr/package.nix diff --git a/pkgs/tools/misc/mdslides/default.nix b/pkgs/by-name/md/mdslides/package.nix similarity index 100% rename from pkgs/tools/misc/mdslides/default.nix rename to pkgs/by-name/md/mdslides/package.nix diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/by-name/me/me_cleaner/package.nix similarity index 100% rename from pkgs/tools/misc/me_cleaner/default.nix rename to pkgs/by-name/me/me_cleaner/package.nix diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 4da1bfba070b..8a02682a7f42 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-uN7u6/XRDpJFaZiMOYzLvTC7f0MIlKUGh6ter6aPzbI="; + hash = "sha256-DytzYnvO8LEDYWzySzoWCAwXw0VKzjlCrjvcCjm0ilE="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/by-name/me/media-player-info/package.nix similarity index 100% rename from pkgs/data/misc/media-player-info/default.nix rename to pkgs/by-name/me/media-player-info/package.nix diff --git a/pkgs/by-name/me/mediagoblin/bower-packages.nix b/pkgs/by-name/me/mediagoblin/bower-packages.nix new file mode 100644 index 000000000000..279a437a10ab --- /dev/null +++ b/pkgs/by-name/me/mediagoblin/bower-packages.nix @@ -0,0 +1,13 @@ +{ fetchbower, buildEnv }: +buildEnv { + name = "bower-env"; + ignoreCollisions = true; + paths = [ + (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0") + (fetchbower "video.js" "5.20.5" "~5.20.1" "1agvvid2valba7xxypknbb3k578jz8sa4rsmq5z2yc5010k3nkqp") + (fetchbower "videojs-resolution-switcher" "0.4.2" "~0.4.2" + "1bz2q1wwdglaxbb20fin9djgs1c71jywxhlrm16hm4bzg708ycaf" + ) + (fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca") + ]; +} diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix new file mode 100644 index 000000000000..bf57c6916282 --- /dev/null +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -0,0 +1,156 @@ +{ + lib, + buildBowerComponents, + fetchFromSourcehut, + gobject-introspection, + gst_all_1, + poppler_utils, + python3, + xorg, +}: + +let + python = python3.override { + packageOverrides = final: prev: { + celery = prev.celery.overridePythonAttrs { + doCheck = false; + }; + sqlalchemy = prev.sqlalchemy_1_4; + }; + }; + + version = "0.14.0"; + src = fetchFromSourcehut { + owner = "~mediagoblin"; + repo = "mediagoblin"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-Y1VnXLHEl6TR8nt+vKSfoCwleQ+oA2WPMN9q4fW9R3s="; + }; + + extlib = buildBowerComponents { + name = "mediagoblin-extlib"; + generated = ./bower-packages.nix; + inherit src; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "mediagoblin"; + inherit version src; + + postPatch = '' + # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L60-62 + cp mediagoblin/_version.py.in mediagoblin/_version.py + substituteInPlace mediagoblin/_version.py \ + --replace-fail "@PACKAGE_VERSION@" "${version}" + + # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L66-67 + substituteInPlace mediagoblin/gmg_commands/__init__.py \ + --replace-fail "ArgumentParser(" "ArgumentParser(prog=\"gmg\"," + ''; + + nativeBuildInputs = [ + gobject-introspection + python3.pkgs.babel + xorg.lndir + ]; + + build-system = with python.pkgs; [ + setuptools + ]; + + dependencies = with python.pkgs; [ + alembic + babel + bcrypt + celery + certifi + configobj + email-validator + exifread + feedgenerator + itsdangerous + jinja2 + jsonschema + lxml-html-clean + markdown + oauthlib + pastescript + pillow + pyld + python-dateutil + requests + soundfile + sqlalchemy + unidecode + waitress + werkzeug + wtforms + wtforms-sqlalchemy + + # undocumented and fails to start without + gst-python + pygobject3 + ]; + + optional-dependencies = + with python.pkgs; + let + # not really documented in python build system + gst = with gst_all_1; [ + # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L122-127 + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]; + in + { + ascii = [ chardet ]; + audio = [ numpy ] ++ gst; + ldap = [ python-ldap ]; + openid = [ python3-openid ]; + raw_image = [ py3exiv2 ]; + video = [ pygobject3 ] ++ gst; + }; + + postBuild = '' + ./devtools/compile_translations.sh + ''; + + postInstall = '' + lndir -silent ${extlib}/bower_components/ $out/${python.sitePackages}/mediagoblin/static/extlib/ + + ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/jquery/dist/jquery.js $out/${python.sitePackages}/mediagoblin/static/js/extlib/jquery.js + ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.css $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.css + ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.js $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.js + ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/images/ $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/ + ''; + + nativeCheckInputs = + with python.pkgs; + [ + pytest-forked + pytest-xdist + pytestCheckHook + webtest + + poppler_utils + ] + ++ lib.flatten (lib.attrValues optional-dependencies); + + pythonImportsCheck = [ "mediagoblin" ]; + + passthru = { + inherit python; + }; + + meta = { + description = "Free software media publishing platform that anyone can run"; + homepage = "https://mediagoblin.org/"; + license = lib.licenses.agpl3Plus; + maintainers = lib.teams.c3d2.members; + }; +} diff --git a/pkgs/by-name/me/mediathekview/package.nix b/pkgs/by-name/me/mediathekview/package.nix new file mode 100644 index 000000000000..d83cd57b3199 --- /dev/null +++ b/pkgs/by-name/me/mediathekview/package.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: + +stdenv.mkDerivation rec { + version = "14.1.0"; + pname = "mediathekview"; + src = fetchurl { + url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; + sha256 = "sha256-2dC7y4SbGsjU6UBHbfye1MUNiLvIQjqTcqPX0I11qIk="; + }; + + + nativeBuildInputs = [ makeWrapper zip ]; + + installPhase = + let + libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; + in + '' + runHook preInstall + + mkdir -p $out/{bin,lib} + + install -m644 MediathekView.jar $out/lib + + makeWrapper ${jre}/bin/java $out/bin/mediathek \ + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" + + makeWrapper ${jre}/bin/java $out/bin/MediathekView \ + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" + + makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; + homepage = "https://mediathekview.de/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl3Plus; + mainProgram = "mediathek"; + maintainers = with maintainers; [ ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix new file mode 100644 index 000000000000..7b8b72f1af7b --- /dev/null +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -0,0 +1,43 @@ +{ lib, stdenvNoCC, fetchurl, imagemagick, nixosTests }: + +stdenvNoCC.mkDerivation rec { + pname = "mediawiki"; + version = "1.42.3"; + + src = fetchurl { + url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; + hash = "sha256-4FVjA/HYRnnNk5sykMyrP4nLxp02B/8dRJymxZU7ILw="; + }; + + postPatch = '' + sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php + + # fix generating previews for SVGs + substituteInPlace includes/config-schema.php \ + --replace-fail "\$path/convert" "${imagemagick}/bin/convert" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/mediawiki + cp -r * $out/share/mediawiki + echo "" > $out/share/mediawiki/LocalSettings.php + + runHook postInstall + ''; + + passthru.tests = { + inherit (nixosTests.mediawiki) mysql postgresql; + }; + + meta = with lib; { + description = "Collaborative editing software that runs Wikipedia"; + license = licenses.gpl2Plus; + homepage = "https://www.mediawiki.org/"; + platforms = platforms.all; + maintainers = with maintainers; [ ] ++ teams.c3d2.members; + }; +} diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix new file mode 100644 index 000000000000..4af0469ef10a --- /dev/null +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, adwaita-qt6 +, appstream-glib +, cmake +, fetchFromGitHub +, qt6 +, udisks2 +, xz +}: + +stdenv.mkDerivation rec { + pname = "mediawriter"; + version = "5.1.90"; + + src = fetchFromGitHub { + owner = "FedoraQt"; + repo = "MediaWriter"; + rev = "refs/tags/${version}"; + hash = "sha256-ClqBEITZU1gx04ouPk4hBuURSRIg1CSYfMBdfnvD51Q="; + }; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + adwaita-qt6 + appstream-glib + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + udisks2 + xz + ]; + + meta = with lib; { + description = "Tool to write images files to portable media"; + homepage = "https://github.com/FedoraQt/MediaWriter"; + changelog = "https://github.com/FedoraQt/MediaWriter/releases/tag/${version}"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "mediawriter"; + }; +} diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/by-name/me/medio/package.nix similarity index 100% rename from pkgs/data/fonts/medio/default.nix rename to pkgs/by-name/me/medio/package.nix diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/by-name/me/medusa/package.nix similarity index 100% rename from pkgs/tools/security/medusa/default.nix rename to pkgs/by-name/me/medusa/package.nix diff --git a/pkgs/tools/networking/meek/default.nix b/pkgs/by-name/me/meek/package.nix similarity index 100% rename from pkgs/tools/networking/meek/default.nix rename to pkgs/by-name/me/meek/package.nix diff --git a/pkgs/by-name/me/megacli/package.nix b/pkgs/by-name/me/megacli/package.nix new file mode 100644 index 000000000000..37d9616446f1 --- /dev/null +++ b/pkgs/by-name/me/megacli/package.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "megacli"; + version = "8.07.14"; + + src = fetchurl { + url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip"; + sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [rpmextract ncurses5]; + libPath = + lib.makeLibraryPath + [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; + + buildCommand = '' + unzip ${src} + rpmextract Linux/MegaCli-${version}-1.noarch.rpm + + mkdir -p $out/{bin,share/MegaRAID/MegaCli} + cp -r opt $out + cp ${version}_MegaCLI.txt $out/share/MegaRAID/MegaCli + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib \ + $out/opt/MegaRAID/MegaCli/MegaCli64 + + ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 + eval fixupPhase + ''; + + meta = { + description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "MegaCli64"; + }; +} diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/by-name/me/megacmd/package.nix similarity index 100% rename from pkgs/applications/misc/megacmd/default.nix rename to pkgs/by-name/me/megacmd/package.nix diff --git a/pkgs/games/megaglest/default.nix b/pkgs/by-name/me/megaglest/package.nix similarity index 100% rename from pkgs/games/megaglest/default.nix rename to pkgs/by-name/me/megaglest/package.nix diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/by-name/me/megahit/package.nix similarity index 100% rename from pkgs/applications/science/biology/megahit/default.nix rename to pkgs/by-name/me/megahit/package.nix diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 91bd2b302b94..34eefdcbf139 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: { zbar ]; + patches = [ + # In the settings menu of Megapixels the user can select a different postprocessing script. The path to the script is then stored in a dconf setting. If the path changes, for example because it is in the Nix store and a dependency of the postprocessor changes, Megapixels will try to use this now non-existing old path. This will cause Megapixels to not save any images that were taken until the user opens the settings again and selects a postprocessor again. Using a global path allows the setting to keep working. + # Note that this patch only fixes the issue for external postprocessors like postprocessd but the postprocessor script that comes with Megapixels is still refered to by the Nix store path. + ./search-for-postprocessors-in-NixOS-specific-global-location.patch + ]; + postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; diff --git a/pkgs/by-name/me/megapixels/search-for-postprocessors-in-NixOS-specific-global-location.patch b/pkgs/by-name/me/megapixels/search-for-postprocessors-in-NixOS-specific-global-location.patch new file mode 100644 index 000000000000..85320316de02 --- /dev/null +++ b/pkgs/by-name/me/megapixels/search-for-postprocessors-in-NixOS-specific-global-location.patch @@ -0,0 +1,27 @@ +--- a/src/process_pipeline.c ++++ b/src/process_pipeline.c +@@ -179,10 +179,10 @@ mp_process_find_all_processors(GtkListStore *store) + store, &iter, 0, buffer, 1, "(built-in) postprocess.sh", -1); + } + +- // Find extra packaged postprocessor scripts +- // These should be packaged in +- // /usr/share/megapixels/postprocessor.d/executable +- sprintf(buffer, "%s/megapixels/postprocessor.d", DATADIR); ++ // Find extra system postprocessor scripts ++ // These should be accessible in ++ // /run/current-system/sw/share/megapixels/postprocessor.d/executable ++ sprintf(buffer, "/run/current-system/sw/share/megapixels/postprocessor.d"); + DIR *d; + struct dirent *dir; + d = opendir(buffer); +@@ -192,8 +192,7 @@ mp_process_find_all_processors(GtkListStore *store) + continue; + } + sprintf(buffer, +- "%s/megapixels/postprocessor.d/%s", +- DATADIR, ++ "/run/current-system/sw/share/megapixels/postprocessor.d/%s", + dir->d_name); + gtk_list_store_insert(store, &iter, -1); + gtk_list_store_set( diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/by-name/me/meh/package.nix similarity index 100% rename from pkgs/applications/graphics/meh/default.nix rename to pkgs/by-name/me/meh/package.nix diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/by-name/me/mela/package.nix similarity index 100% rename from pkgs/development/libraries/physics/mela/default.nix rename to pkgs/by-name/me/mela/package.nix diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix new file mode 100644 index 000000000000..5e83f4908a57 --- /dev/null +++ b/pkgs/by-name/me/melange/package.nix @@ -0,0 +1,73 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "melange"; + version = "0.14.10"; + + src = fetchFromGitHub { + owner = "chainguard-dev"; + repo = pname; + rev = "v${version}"; + hash = "sha256-fHHIIlxKTF4q9LOeL3jyLS7HQ/IFmx+1fS/7PitrclM="; + # 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; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = "sha256-Okil1H6+O8YjTptI00mQQ1+04OiuO/zf1L8es4CdnNc="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + + postInstall = '' + installShellCompletion --cmd melange \ + --bash <($out/bin/melange completion bash) \ + --fish <($out/bin/melange completion fish) \ + --zsh <($out/bin/melange completion zsh) + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/melange --help + $out/bin/melange version 2>&1 | grep "v${version}" + + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/chainguard-dev/melange"; + changelog = "https://github.com/chainguard-dev/melange/blob/${src.rev}/NEWS.md"; + description = "Build APKs from source code"; + mainProgram = "melange"; + license = licenses.asl20; + maintainers = with maintainers; [ developer-guy ]; + }; +} diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/by-name/me/meld/package.nix similarity index 100% rename from pkgs/applications/version-management/meld/default.nix rename to pkgs/by-name/me/meld/package.nix diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/by-name/me/melete/package.nix similarity index 100% rename from pkgs/data/fonts/melete/default.nix rename to pkgs/by-name/me/melete/package.nix diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix index b7df31cebf79..9deee8e44707 100644 --- a/pkgs/by-name/me/melodeon/package.nix +++ b/pkgs/by-name/me/melodeon/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "melodeon"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "CDrummond"; repo = "melodeon"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ="; + hash = "sha256-CwJd77FAEcfCvxHeh3V1SIsgSam3S5WtpSLj9WrOOyI="; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/by-name/me/melody/package.nix similarity index 100% rename from pkgs/tools/misc/melody/default.nix rename to pkgs/by-name/me/melody/package.nix diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch new file mode 100644 index 000000000000..6871a4f7c6fa --- /dev/null +++ b/pkgs/by-name/me/melos/add-generic-main.patch @@ -0,0 +1,48 @@ +diff --git a/bin/melos.dart b/bin/melos.dart +index 0db7013..218276f 100644 +--- a/bin/melos.dart ++++ b/bin/melos.dart +@@ -1,11 +1,37 @@ ++import 'dart:io'; + import 'package:cli_launcher/cli_launcher.dart'; + import 'package:melos/src/command_runner.dart'; + +-Future main(List arguments) async => launchExecutable( +- arguments, +- LaunchConfig( ++Future main(List arguments) async { ++ final melosYamlPath = findMelosYaml(); ++ ++ if (melosYamlPath == null) { ++ print('Error: melos.yaml not found in the project.'); ++ // Handle the error as needed ++ return; ++ } ++ ++ melosEntryPoint( ++ arguments, ++ LaunchContext( ++ directory: Directory.current, ++ localInstallation: ExecutableInstallation( + name: ExecutableName('melos'), +- launchFromSelf: false, +- entrypoint: melosEntryPoint, ++ isSelf: false, ++ packageRoot: melosYamlPath, + ), +- ); ++ ), ++ ); ++} ++ ++Directory? findMelosYaml() { ++ var directory = Directory.current; ++ while (directory.path != directory.parent.path) { ++ final melosYamlPath = '${directory.path}/melos.yaml'; ++ if (File(melosYamlPath).existsSync()) { ++ return directory; ++ } ++ directory = directory.parent; ++ } ++ return null; ++} diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix new file mode 100644 index 000000000000..4d9654af977c --- /dev/null +++ b/pkgs/by-name/me/melos/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + buildDartApplication, +}: +let + pname = "melos"; + version = "6.2.0"; + src = fetchFromGitHub { + owner = "invertase"; + repo = "melos"; + rev = "melos-v${version}"; + hash = "sha256-00K/LwrwjvO4LnXM2PDooQMJ6sXcJy9FBErtEwoMZlM="; + }; +in +buildDartApplication { + inherit pname version src; + + sourceRoot = "${src.name}/packages/melos"; + + patches = [ + # This patch (created a melos 6.1.0) modify the method melos use to find path to the root of the projects. + # It is needed because when melos is in the nixstore, it break it and fail to find the projects root with melos.yaml + ./add-generic-main.patch + ]; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + # hard code the path to the melos templates + preBuild = '' + substituteInPlace lib/src/common/utils.dart --replace-fail "final melosPackageFileUri = await Isolate.resolvePackageUri(melosPackageUri);" "return \"$out\";" + substituteInPlace lib/src/common/utils.dart --replace-fail "return p.normalize('\''${melosPackageFileUri!.toFilePath()}/../..');" " " + mkdir -p $out + cp -r templates $out/ + ''; + + meta = { + homepage = "https://github.com/invertase/melos"; + description = "A tool for managing Dart projects with multiple packages. With IntelliJ and Vscode IDE support. Supports automated versioning, changelogs & publishing via Conventional Commits. "; + mainProgram = "melos"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.eymeric ]; + }; +} diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json new file mode 100644 index 000000000000..959553a3e607 --- /dev/null +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -0,0 +1,749 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "ansi_styles": { + "dependency": "direct main", + "description": { + "name": "ansi_styles", + "sha256": "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "cli_launcher": { + "dependency": "direct main", + "description": { + "name": "cli_launcher", + "sha256": "5e7e0282b79e8642edd6510ee468ae2976d847a0a29b3916e85f5fa1bfe24005", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "cli_util": { + "dependency": "direct main", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "conventional_commit": { + "dependency": "direct main", + "description": { + "name": "conventional_commit", + "sha256": "dec15ad1118f029c618651a4359eb9135d8b88f761aa24e4016d061cd45948f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0+1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "mockito": { + "dependency": "direct dev", + "description": { + "name": "mockito", + "sha256": "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.4" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "prompts": { + "dependency": "direct main", + "description": { + "name": "prompts", + "sha256": "3773b845e85a849f01e793c4fc18a45d52d7783b4cb6c0569fad19f9d0a774a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pub_updater": { + "dependency": "direct main", + "description": { + "name": "pub_updater", + "sha256": "54e8dc865349059ebe7f163d6acce7c89eb958b8047e6d6e80ce93b13d7c9e60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "pubspec": { + "dependency": "direct main", + "description": { + "name": "pubspec", + "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.5" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "uri": { + "dependency": "transitive", + "description": { + "name": "uri", + "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.2" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.4" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.3.0 <4.0.0" + } +} + + diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/by-name/me/melt/package.nix similarity index 100% rename from pkgs/tools/security/melt/default.nix rename to pkgs/by-name/me/melt/package.nix diff --git a/pkgs/servers/memcached/default.nix b/pkgs/by-name/me/memcached/package.nix similarity index 100% rename from pkgs/servers/memcached/default.nix rename to pkgs/by-name/me/memcached/package.nix diff --git a/pkgs/servers/web-apps/meme-bingo-web/default.nix b/pkgs/by-name/me/meme-bingo-web/package.nix similarity index 100% rename from pkgs/servers/web-apps/meme-bingo-web/default.nix rename to pkgs/by-name/me/meme-bingo-web/package.nix diff --git a/pkgs/applications/graphics/meme-image-generator/default.nix b/pkgs/by-name/me/meme-image-generator/package.nix similarity index 100% rename from pkgs/applications/graphics/meme-image-generator/default.nix rename to pkgs/by-name/me/meme-image-generator/package.nix diff --git a/pkgs/applications/science/biology/meme-suite/default.nix b/pkgs/by-name/me/meme-suite/package.nix similarity index 100% rename from pkgs/applications/science/biology/meme-suite/default.nix rename to pkgs/by-name/me/meme-suite/package.nix diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/by-name/me/memo/package.nix similarity index 100% rename from pkgs/applications/misc/memo/default.nix rename to pkgs/by-name/me/memo/package.nix diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/by-name/me/memray/package.nix similarity index 100% rename from pkgs/development/tools/memray/default.nix rename to pkgs/by-name/me/memray/package.nix diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/by-name/me/memtest86-efi/package.nix similarity index 100% rename from pkgs/tools/misc/memtest86-efi/default.nix rename to pkgs/by-name/me/memtest86-efi/package.nix diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/by-name/me/memtest86plus/package.nix similarity index 100% rename from pkgs/tools/misc/memtest86+/default.nix rename to pkgs/by-name/me/memtest86plus/package.nix diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/by-name/me/memtester/package.nix similarity index 100% rename from pkgs/tools/system/memtester/default.nix rename to pkgs/by-name/me/memtester/package.nix diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/by-name/me/memtier-benchmark/package.nix similarity index 100% rename from pkgs/tools/networking/memtier-benchmark/default.nix rename to pkgs/by-name/me/memtier-benchmark/package.nix diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/by-name/me/mencal/package.nix similarity index 100% rename from pkgs/applications/misc/mencal/default.nix rename to pkgs/by-name/me/mencal/package.nix diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/by-name/me/menu-cache/package.nix similarity index 100% rename from pkgs/development/libraries/menu-cache/default.nix rename to pkgs/by-name/me/menu-cache/package.nix diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/by-name/me/menumaker/package.nix similarity index 100% rename from pkgs/applications/misc/menumaker/default.nix rename to pkgs/by-name/me/menumaker/package.nix diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/by-name/me/mepo/package.nix similarity index 100% rename from pkgs/applications/misc/mepo/default.nix rename to pkgs/by-name/me/mepo/package.nix diff --git a/pkgs/servers/http/merecat/default.nix b/pkgs/by-name/me/merecat/package.nix similarity index 100% rename from pkgs/servers/http/merecat/default.nix rename to pkgs/by-name/me/merecat/package.nix diff --git a/pkgs/tools/misc/mermaid-filter/default.nix b/pkgs/by-name/me/mermaid-filter/package.nix similarity index 100% rename from pkgs/tools/misc/mermaid-filter/default.nix rename to pkgs/by-name/me/mermaid-filter/package.nix diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/by-name/me/mermerd/package.nix similarity index 100% rename from pkgs/development/tools/database/mermerd/default.nix rename to pkgs/by-name/me/mermerd/package.nix diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/by-name/me/merriweather-sans/package.nix similarity index 100% rename from pkgs/data/fonts/merriweather-sans/default.nix rename to pkgs/by-name/me/merriweather-sans/package.nix diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/by-name/me/merriweather/package.nix similarity index 100% rename from pkgs/data/fonts/merriweather/default.nix rename to pkgs/by-name/me/merriweather/package.nix diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/by-name/me/mesa-demos/package.nix similarity index 100% rename from pkgs/tools/graphics/mesa-demos/default.nix rename to pkgs/by-name/me/mesa-demos/package.nix diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/by-name/me/mesa_glu/package.nix similarity index 100% rename from pkgs/development/libraries/mesa-glu/default.nix rename to pkgs/by-name/me/mesa_glu/package.nix diff --git a/pkgs/development/libraries/meshoptimizer/default.nix b/pkgs/by-name/me/meshoptimizer/package.nix similarity index 100% rename from pkgs/development/libraries/meshoptimizer/default.nix rename to pkgs/by-name/me/meshoptimizer/package.nix diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/by-name/me/meslo-lg/package.nix similarity index 100% rename from pkgs/data/fonts/meslo-lg/default.nix rename to pkgs/by-name/me/meslo-lg/package.nix diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/by-name/me/meslo-lgs-nf/package.nix similarity index 100% rename from pkgs/data/fonts/meslo-lgs-nf/default.nix rename to pkgs/by-name/me/meslo-lgs-nf/package.nix diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/by-name/me/meson-tools/package.nix similarity index 100% rename from pkgs/misc/meson-tools/default.nix rename to pkgs/by-name/me/meson-tools/package.nix diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index e1e0a3b771c1..bd8c30791060 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + llvmPackages_19, fetchFromGitHub, gtest, @@ -23,15 +24,18 @@ testers, }: -stdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.3.5"; + version = "4.3.7"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs="; + hash = "sha256-QhZv4PTcf1jzSOcp1+bPZWf5COugCIMq1zkhc0PJjUQ="; }; patches = [ ./disable-tests-that-require-network-access.patch ]; @@ -163,5 +167,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "mesonlsp"; maintainers = with maintainers; [ paveloom ]; platforms = platforms.unix; + # ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/by-name/me/messer-slim/package.nix similarity index 100% rename from pkgs/applications/science/biology/messer-slim/default.nix rename to pkgs/by-name/me/messer-slim/package.nix diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/by-name/me/metaBuildEnv/package.nix similarity index 100% rename from pkgs/development/compilers/meta-environment/meta-build-env/default.nix rename to pkgs/by-name/me/metaBuildEnv/package.nix diff --git a/pkgs/tools/security/metabigor/default.nix b/pkgs/by-name/me/metabigor/package.nix similarity index 100% rename from pkgs/tools/security/metabigor/default.nix rename to pkgs/by-name/me/metabigor/package.nix diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index c5691dd8fab7..ecdf42ecbad6 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz"; - hash = "sha256-pyQ4rObVkDrnkzjGCYsbNauRyKl8QyNwHTvvHz7rGRw="; + hash = "sha256-WHifKLbzhSL9iMIkKRChB9ppNCF7LH3VKn1RLTlB1kM="; }; patches = [ diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/by-name/me/metadata-cleaner/package.nix similarity index 100% rename from pkgs/applications/misc/metadata-cleaner/default.nix rename to pkgs/by-name/me/metadata-cleaner/package.nix diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/by-name/me/metal-cli/package.nix similarity index 100% rename from pkgs/development/tools/metal-cli/default.nix rename to pkgs/by-name/me/metal-cli/package.nix diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/by-name/me/metals/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/metals/default.nix rename to pkgs/by-name/me/metals/package.nix diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/by-name/me/metamath/package.nix similarity index 100% rename from pkgs/development/interpreters/metamath/default.nix rename to pkgs/by-name/me/metamath/package.nix diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/by-name/me/metamorphose2/package.nix similarity index 100% rename from pkgs/applications/misc/metamorphose2/default.nix rename to pkgs/by-name/me/metamorphose2/package.nix diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/by-name/me/metapixel/package.nix similarity index 100% rename from pkgs/tools/graphics/metapixel/default.nix rename to pkgs/by-name/me/metapixel/package.nix diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/by-name/me/metar/package.nix similarity index 100% rename from pkgs/applications/misc/metar/default.nix rename to pkgs/by-name/me/metar/package.nix diff --git a/pkgs/os-specific/linux/metastore/default.nix b/pkgs/by-name/me/metastore/package.nix similarity index 100% rename from pkgs/os-specific/linux/metastore/default.nix rename to pkgs/by-name/me/metastore/package.nix diff --git a/pkgs/by-name/me/meteo-qt/package.nix b/pkgs/by-name/me/meteo-qt/package.nix new file mode 100644 index 000000000000..33df8b4095b5 --- /dev/null +++ b/pkgs/by-name/me/meteo-qt/package.nix @@ -0,0 +1,45 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + qt5, +}: + +python3Packages.buildPythonApplication rec { + pname = "meteo-qt"; + version = "3.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dglent"; + repo = "meteo-qt"; + rev = "refs/tags/v${version}"; + hash = "sha256-J9R6UGfj3vaPfn0vmjeRMsHryc/1pxoKyIE9wteVYbY="; + }; + + nativeBuildInputs = [ + qt5.qttools + qt5.wrapQtAppsHook + ]; + + build-system = with python3Packages; [ sip ]; + + dependencies = with python3Packages; [ + lxml + pyqt5 + ]; + + pythonImportsCheck = [ "meteo_qt" ]; + + makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + + meta = { + description = "System tray application for weather status information"; + homepage = "https://github.com/dglent/meteo-qt"; + changelog = "https://github.com/dglent/meteo-qt/blob/${src.rev}/CHANGELOG"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ linuxissuper ]; + mainProgram = "meteo-qt"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/by-name/me/meteo/package.nix similarity index 100% rename from pkgs/applications/networking/weather/meteo/default.nix rename to pkgs/by-name/me/meteo/package.nix diff --git a/pkgs/servers/meteor/main.patch b/pkgs/by-name/me/meteor/main.patch similarity index 100% rename from pkgs/servers/meteor/main.patch rename to pkgs/by-name/me/meteor/main.patch diff --git a/pkgs/by-name/me/meteor/package.nix b/pkgs/by-name/me/meteor/package.nix new file mode 100644 index 000000000000..31491c8b5846 --- /dev/null +++ b/pkgs/by-name/me/meteor/package.nix @@ -0,0 +1,103 @@ +{ stdenv, lib, fetchurl, zlib, curl, xz, patchelf, runtimeShell }: + +let + version = "2.7.3"; + + inherit (stdenv.hostPlatform) system; + + srcs = { + x86_64-linux = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "sha256-ovsE7jUJIKf96WEoITXECUlPo+o1tEKvHzCc7Xgj614="; + }; + x86_64-darwin = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; + sha256 = "11206dbda50a680fdab7044def7ea68ea8f4a9bca948ca56df91fe1392b2ac16"; + }; + }; +in + +stdenv.mkDerivation { + inherit version; + pname = "meteor"; + src = srcs.${system} or (throw "unsupported system ${system}"); + + #dontStrip = true; + + sourceRoot = ".meteor"; + + installPhase = '' + mkdir $out + + cp -r packages $out + chmod -R +w $out/packages + + cp -r package-metadata $out + + devBundle=$(find $out/packages/meteor-tool -name dev_bundle) + ln -s $devBundle $out/dev_bundle + + toolsDir=$(dirname $(find $out/packages -print | grep "meteor-tool/.*/tools/index.js$")) + ln -s $toolsDir $out/tools + + # Meteor needs an initial package-metadata in $HOME/.meteor, + # otherwise it fails spectacularly. + mkdir -p $out/bin + cat << EOF > $out/bin/meteor + #!${runtimeShell} + + if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then + mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 + cp $out/package-metadata/v2.0.1/packages.data.db "\$HOME/.meteor/package-metadata/v2.0.1" + chown "\$(whoami)" "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" + chmod +w "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" + fi + + $out/dev_bundle/bin/node --no-wasm-code-gc \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" + EOF + chmod +x $out/bin/meteor + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + # Patch Meteor to dynamically fixup shebangs and ELF metadata where + # necessary. + pushd $out + patch -p1 < ${./main.patch} + popd + substituteInPlace $out/tools/cli/main.js \ + --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib curl xz ]}" \ + --replace "@PATCHELF@" "${patchelf}/bin/patchelf" + + # Patch node. + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${lib.getLib stdenv.cc.cc}/lib" \ + $out/dev_bundle/bin/node + + # Patch mongo. + for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib curl xz ]}" \ + $p + done + + # Patch node dlls. + for p in $(find $out/packages -name '*.node'); do + patchelf \ + --set-rpath "$(patchelf --print-rpath $p):${lib.getLib stdenv.cc.cc}/lib" \ + $p || true + done + ''; + + meta = with lib; { + description = "Complete open source platform for building web and mobile apps in pure JavaScript"; + homepage = "https://www.meteor.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mit; + platforms = builtins.attrNames srcs; + maintainers = [ ]; + mainProgram = "meteor"; + }; +} diff --git a/pkgs/applications/audio/meterbridge/buf_rect.patch b/pkgs/by-name/me/meterbridge/buf_rect.patch similarity index 100% rename from pkgs/applications/audio/meterbridge/buf_rect.patch rename to pkgs/by-name/me/meterbridge/buf_rect.patch diff --git a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/pkgs/by-name/me/meterbridge/fix_build_with_gcc-5.patch similarity index 100% rename from pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch rename to pkgs/by-name/me/meterbridge/fix_build_with_gcc-5.patch diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/by-name/me/meterbridge/package.nix similarity index 100% rename from pkgs/applications/audio/meterbridge/default.nix rename to pkgs/by-name/me/meterbridge/package.nix diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/by-name/me/metersLv2/package.nix similarity index 100% rename from pkgs/applications/audio/meters_lv2/default.nix rename to pkgs/by-name/me/metersLv2/package.nix diff --git a/pkgs/games/methane/default.nix b/pkgs/by-name/me/methane/package.nix similarity index 100% rename from pkgs/games/methane/default.nix rename to pkgs/by-name/me/methane/package.nix diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/by-name/me/metis-prover/package.nix similarity index 100% rename from pkgs/applications/science/logic/metis-prover/default.nix rename to pkgs/by-name/me/metis-prover/package.nix diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/by-name/me/metis/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/metis/default.nix rename to pkgs/by-name/me/metis/package.nix diff --git a/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix b/pkgs/by-name/mf/mfc465cncupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix rename to pkgs/by-name/mf/mfc465cncupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix b/pkgs/by-name/mf/mfc465cnlpr/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix rename to pkgs/by-name/mf/mfc465cnlpr/package.nix diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/by-name/mf/mfc5890cncupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix rename to pkgs/by-name/mf/mfc5890cncupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix b/pkgs/by-name/mf/mfc5890cnlpr/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix rename to pkgs/by-name/mf/mfc5890cnlpr/package.nix diff --git a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/pkgs/by-name/mf/mfc9140cdncupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix rename to pkgs/by-name/mf/mfc9140cdncupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/pkgs/by-name/mf/mfc9140cdnlpr/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix rename to pkgs/by-name/mf/mfc9140cdnlpr/package.nix diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcj470dw-cupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix rename to pkgs/by-name/mf/mfcj470dw-cupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcj6510dw-cupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix rename to pkgs/by-name/mf/mfcj6510dw-cupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/by-name/mf/mfcl2700dncupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix rename to pkgs/by-name/mf/mfcl2700dncupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcl2720dwcupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix rename to pkgs/by-name/mf/mfcl2720dwcupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/by-name/mf/mfcl2720dwlpr/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix rename to pkgs/by-name/mf/mfcl2720dwlpr/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcl2740dwcupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix rename to pkgs/by-name/mf/mfcl2740dwcupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/by-name/mf/mfcl2740dwlpr/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix rename to pkgs/by-name/mf/mfcl2740dwlpr/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix rename to pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix rename to pkgs/by-name/mf/mfcl8690cdwlpr/package.nix diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/by-name/mf/mfcuk/package.nix similarity index 100% rename from pkgs/tools/security/mfcuk/default.nix rename to pkgs/by-name/mf/mfcuk/package.nix diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/by-name/mf/mfoc/package.nix similarity index 100% rename from pkgs/tools/security/mfoc/default.nix rename to pkgs/by-name/mf/mfoc/package.nix diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/by-name/mf/mftrace/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/mftrace/default.nix rename to pkgs/by-name/mf/mftrace/package.nix diff --git a/pkgs/by-name/mg/mg/package.nix b/pkgs/by-name/mg/mg/package.nix new file mode 100644 index 000000000000..70f5dd604296 --- /dev/null +++ b/pkgs/by-name/mg/mg/package.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages, darwin }: + +stdenv.mkDerivation { + pname = "mg"; + version = "7.3-unstable-2024-06-04"; + + src = fetchFromGitHub { + owner = "ibara"; + repo = "mg"; + rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33"; + hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs="; + }; + + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace configure --replace "./conftest" "echo" + ''; + + enableParallelBuilding = true; + + makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; + + installPhase = '' + install -m 555 -Dt $out/bin mg + install -m 444 -Dt $out/share/man/man1 mg.1 + ''; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; + + meta = with lib; { + description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; + homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; + license = licenses.publicDomain; + mainProgram = "mg"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/mg/mgitstatus/package.nix b/pkgs/by-name/mg/mgitstatus/package.nix index 1214123cedd6..da906e08f922 100644 --- a/pkgs/by-name/mg/mgitstatus/package.nix +++ b/pkgs/by-name/mg/mgitstatus/package.nix @@ -1,18 +1,19 @@ -{ fetchFromGitHub -, lib -, stdenvNoCC -, testers +{ + fetchFromGitHub, + lib, + stdenvNoCC, + testers, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mgitstatus"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "fboender"; repo = "multi-git-status"; rev = finalAttrs.version; - hash = "sha256-jzoX7Efq9+1UdXQdhLRqBlhU3cBrk5AZblg9AYetItg="; + hash = "sha256-DToyP6TD9up0k2/skMW3el6hNvKD+c8q2zWpk0QZGRA="; }; installFlags = [ @@ -24,14 +25,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "v${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Show uncommitted, untracked and unpushed changes for multiple Git repos"; downloadPage = "https://github.com/fboender/multi-git-status/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/fboender/multi-git-status"; changelog = "https://github.com/fboender/multi-git-status/releases/tag/${finalAttrs.src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ getpsyched ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getpsyched ]; mainProgram = "mgitstatus"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/by-name/mg/mgmt/package.nix similarity index 100% rename from pkgs/applications/system/mgmt/default.nix rename to pkgs/by-name/mg/mgmt/package.nix diff --git a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch similarity index 100% rename from pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch rename to pkgs/by-name/mh/mhddfs/fix-format-security-error.patch diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/by-name/mh/mhddfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/mhddfs/default.nix rename to pkgs/by-name/mh/mhddfs/package.nix diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/by-name/mi/mi2ly/package.nix similarity index 100% rename from pkgs/applications/audio/mi2ly/default.nix rename to pkgs/by-name/mi/mi2ly/package.nix diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/by-name/mi/micro-httpd/package.nix similarity index 100% rename from pkgs/servers/http/micro-httpd/default.nix rename to pkgs/by-name/mi/micro-httpd/package.nix diff --git a/pkgs/servers/microbin/default.nix b/pkgs/by-name/mi/microbin/package.nix similarity index 100% rename from pkgs/servers/microbin/default.nix rename to pkgs/by-name/mi/microbin/package.nix diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix index 26916216f437..8758051500df 100644 --- a/pkgs/by-name/mi/microcode-intel/package.nix +++ b/pkgs/by-name/mi/microcode-intel/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20240910"; + version = "20241029"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-cn0qK81dwbamh5PBlPuC9KtDWyT2NwSxDD0XlCRAv6s="; + hash = "sha256-iS7OSWjAYBRHP7X1C+DiMwX2xudA6tXX6cEv/IcICxc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/microcom/default.nix b/pkgs/by-name/mi/microcom/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/microcom/default.nix rename to pkgs/by-name/mi/microcom/package.nix diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/by-name/mi/micromamba/package.nix similarity index 100% rename from pkgs/tools/package-management/micromamba/default.nix rename to pkgs/by-name/mi/micromamba/package.nix diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/by-name/mi/micronaut/package.nix similarity index 100% rename from pkgs/development/tools/micronaut/default.nix rename to pkgs/by-name/mi/micronaut/package.nix diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/by-name/mi/micronucleus/package.nix similarity index 100% rename from pkgs/development/tools/misc/micronucleus/default.nix rename to pkgs/by-name/mi/micronucleus/package.nix diff --git a/pkgs/by-name/mi/microplane/package.nix b/pkgs/by-name/mi/microplane/package.nix new file mode 100644 index 000000000000..1b16066b488a --- /dev/null +++ b/pkgs/by-name/mi/microplane/package.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "microplane"; + version = "0.0.35"; + + src = fetchFromGitHub { + owner = "Clever"; + repo = "microplane"; + rev = "v${version}"; + sha256 = "sha256-3QPxH4ZR02bkL2uKoJpLW9e7q1LjSlWw5jo0jxegeiM="; + }; + + vendorHash = "sha256-DizwNph3hmSRoozvJgs3Qw/c9iMTRR1gMGC60pBCFSk="; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; + + postInstall = '' + ln -s $out/bin/microplane $out/bin/mp + ''; + + meta = with lib; { + description = "CLI tool to make git changes across many repos"; + homepage = "https://github.com/Clever/microplane"; + license = licenses.asl20; + maintainers = with maintainers; [ dbirks ]; + }; +} diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/by-name/mi/micropython/package.nix similarity index 100% rename from pkgs/development/interpreters/micropython/default.nix rename to pkgs/by-name/mi/micropython/package.nix diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/by-name/mi/microscheme/package.nix similarity index 100% rename from pkgs/development/compilers/microscheme/default.nix rename to pkgs/by-name/mi/microscheme/package.nix diff --git a/pkgs/servers/microserver/default.nix b/pkgs/by-name/mi/microserver/package.nix similarity index 100% rename from pkgs/servers/microserver/default.nix rename to pkgs/by-name/mi/microserver/package.nix diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix new file mode 100644 index 000000000000..dff0183db0ab --- /dev/null +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -0,0 +1,287 @@ +{ + fetchurl, + lib, + makeWrapper, + patchelf, + stdenv, + + # Linked dynamic libraries. + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + expat, + fontconfig, + freetype, + gcc-unwrapped, + gdk-pixbuf, + glib, + gtk3, + gtk4, + libdrm, + libglvnd, + libkrb5, + libX11, + libxcb, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libxkbcommon, + libXrandr, + libXrender, + libXScrnSaver, + libxshmfence, + libXtst, + mesa, + nspr, + nss, + pango, + pipewire, + vulkan-loader, + wayland, # ozone/wayland + + # Command line programs + coreutils, + + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", + + # Will crash without. + systemd, + + # Loaded at runtime. + libexif, + pciutils, + + # Additional dependencies according to other distros. + ## Ubuntu + curl, + liberation_ttf, + util-linux, + wget, + xdg-utils, + ## Arch Linux. + flac, + harfbuzz, + icu, + libopus, + libpng, + snappy, + speechd-minimal, + ## Gentoo + bzip2, + libcap, + + # Necessary for USB audio devices. + libpulseaudio, + pulseSupport ? true, + + adwaita-icon-theme, + gsettings-desktop-schemas, + + # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) + libva, + libvaSupport ? true, + + # For Vulkan support (--enable-features=Vulkan) + addDriverRunpath, + + # Edge Specific + libuuid, +}: + +let + + opusWithCustomModes = libopus.override { withCustomModes = true; }; + + deps = + [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + bzip2 + cairo + coreutils + cups + curl + dbus + expat + flac + fontconfig + freetype + gcc-unwrapped.lib + gdk-pixbuf + glib + harfbuzz + icu + libcap + libdrm + liberation_ttf + libexif + libglvnd + libkrb5 + libpng + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libxkbcommon + libXrandr + libXrender + libXScrnSaver + libxshmfence + libXtst + mesa + nspr + nss + opusWithCustomModes + pango + pciutils + pipewire + snappy + speechd-minimal + systemd + util-linux + vulkan-loader + wayland + wget + libuuid + ] + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva + ++ [ + gtk3 + gtk4 + ]; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "microsoft-edge"; + version = "130.0.2849.46"; + + src = fetchurl { + url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; + hash = "sha256-QschcHSDoYakjf4oYXIc40SyniCufNmjHJPuvRazdSw="; + }; + + # With strictDeps on, some shebangs were not being patched correctly + # ie, $out/share/microsoft/msedge/microsoft-edge + strictDeps = false; + + nativeBuildInputs = [ + makeWrapper + patchelf + ]; + + buildInputs = [ + # needed for XDG_ICON_DIRS + adwaita-icon-theme + glib + gtk3 + gtk4 + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas + ]; + + unpackPhase = '' + runHook preUnpack + ar x $src + tar xf data.tar.xz + runHook postUnpack + ''; + + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; + binpath = lib.makeBinPath deps; + + installPhase = '' + runHook preInstall + + appname=msedge + dist=stable + + exe=$out/bin/microsoft-edge + + mkdir -p $out/bin $out/share + cp -v -a opt/* $out/share + cp -v -a usr/share/* $out/share + + # replace bundled vulkan-loader + rm -v $out/share/microsoft/$appname/libvulkan.so.1 + ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + + substituteInPlace $out/share/microsoft/$appname/microsoft-edge \ + --replace-fail 'CHROME_WRAPPER' 'WRAPPER' + substituteInPlace $out/share/applications/microsoft-edge.desktop \ + --replace-fail /usr/bin/microsoft-edge-$dist $exe + substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \ + --replace-fail /opt/microsoft/msedge $exe + substituteInPlace $out/share/menu/microsoft-edge.menu \ + --replace-fail /opt $out/share \ + --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe + + for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do + num_and_suffix="''${icon_file##*logo_}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -p "$logo_output_path" + mv "$icon_file" "$logo_output_path/microsoft-edge.png" + done + + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup + makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "$binpath" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ + --set CHROME_WRAPPER "microsoft-edge-$dist" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so + patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL* + + # Edge specific set liboneauth + patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so + + for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do + patchelf --set-rpath $rpath $elf + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf + done + + runHook postInstall + ''; + + passthru.updateScript = ./update.py; + + meta = { + changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel"; + description = "Web browser from Microsoft"; + homepage = "https://www.microsoft.com/en-us/edge"; + license = lib.licenses.unfree; + mainProgram = "microsoft-edge"; + maintainers = with lib.maintainers; [ + zanculmarktum + kuwii + rhysmdnz + ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py new file mode 100755 index 000000000000..c9a048d504c8 --- /dev/null +++ b/pkgs/by-name/mi/microsoft-edge/update.py @@ -0,0 +1,44 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian common-updater-scripts + +import base64 +import textwrap +import os +from urllib import request + +from collections import OrderedDict +from debian.deb822 import Packages +from debian.debian_support import Version +from os.path import abspath, dirname + +PIN_PATH = dirname(abspath(__file__)) + '/default.nix' + +def packages(): + packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' + handle = request.urlopen(packages_url) + return handle + + +def latest_packages(packages: bytes): + latest_packages: OrderedDict[str, Packages] = {} + for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): + name: str = package['Package'] + if not name.startswith('microsoft-edge-stable'): + continue + channel = name.replace('microsoft-edge-', '') + if channel not in latest_packages: + latest_packages[channel] = package + else: + old_package = latest_packages[channel] + if old_package.get_version() < package.get_version(): # type: ignore + latest_packages[channel] = package + return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0])) + + +def write_expression(): + latest = latest_packages(packages()) + version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version') + os.system(f'update-source-version microsoft-edge "{version}"') + + +write_expression() diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix similarity index 100% rename from pkgs/development/libraries/microsoft-gsl/default.nix rename to pkgs/by-name/mi/microsoft-gsl/package.nix diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/by-name/mi/mictray/package.nix similarity index 100% rename from pkgs/tools/audio/mictray/default.nix rename to pkgs/by-name/mi/mictray/package.nix diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/by-name/mi/mid2key/package.nix similarity index 100% rename from pkgs/applications/audio/mid2key/default.nix rename to pkgs/by-name/mi/mid2key/package.nix diff --git a/pkgs/applications/audio/midi-trigger/default.nix b/pkgs/by-name/mi/midi-trigger/package.nix similarity index 100% rename from pkgs/applications/audio/midi-trigger/default.nix rename to pkgs/by-name/mi/midi-trigger/package.nix diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/by-name/mi/midicsv/package.nix similarity index 100% rename from pkgs/tools/audio/midicsv/default.nix rename to pkgs/by-name/mi/midicsv/package.nix diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/by-name/mi/midimonster/package.nix similarity index 100% rename from pkgs/tools/audio/midimonster/default.nix rename to pkgs/by-name/mi/midimonster/package.nix diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/by-name/mi/midisheetmusic/package.nix similarity index 100% rename from pkgs/applications/audio/midisheetmusic/default.nix rename to pkgs/by-name/mi/midisheetmusic/package.nix diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/by-name/mi/midori-unwrapped/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/midori/default.nix rename to pkgs/by-name/mi/midori-unwrapped/package.nix diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix new file mode 100644 index 000000000000..8f23dbfabb25 --- /dev/null +++ b/pkgs/by-name/mi/mieru/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "mieru"; + version = "3.7.0"; + + src = fetchFromGitHub { + owner = "enfein"; + repo = "mieru"; + rev = "v${version}"; + hash = "sha256-VFQWiihwd0YiLpgTxKUjVd+IkGivsa4jI/jb5ckjFt8="; + }; + + vendorHash = "sha256-woQoqYjdv2TZo66IwNkSHzIHFlu9JH8q/RXGyLlnTTc="; + proxyVendor = true; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Socks5 / HTTP / HTTPS proxy to bypass censorship"; + homepage = "https://github.com/enfein/mieru"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ oluceps ]; + mainProgram = "mieru"; + }; +} diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/by-name/mi/migmix/package.nix similarity index 100% rename from pkgs/data/fonts/migmix/default.nix rename to pkgs/by-name/mi/migmix/package.nix diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/by-name/mi/migrate/package.nix similarity index 100% rename from pkgs/applications/science/biology/migrate/default.nix rename to pkgs/by-name/mi/migrate/package.nix diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/by-name/mi/migu/package.nix similarity index 100% rename from pkgs/data/fonts/migu/default.nix rename to pkgs/by-name/mi/migu/package.nix diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 80df07cd6cb1..1a879e408e93 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { alsa-lib openssl webkitgtk_4_0 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; runtimeDependencies = map lib.getLib [ diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 7177480ad8f4..6887dc875d0e 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.9"; + version = "1.18.10"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-WVzJymXmtPV5AGYYuFDlrhy5Hh9eUBOFG8UhAnFZ22g="; + hash = "sha256-VbqIlaocee+IxL3DDXr17ZmvDsRqJEuST/1HcU0bJds="; }; - vendorHash = "sha256-A10XICoieWc0FJAn2G2aolefLjguwL72qrr4KjMFYZE="; + vendorHash = "sha256-6pbrBcDTE46YTWn0CTv9Nip7iUqS8xDbHGZ7VzqDnTc="; excludedPackages = [ "./test" ]; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/by-name/mi/mikmod/package.nix similarity index 100% rename from pkgs/applications/audio/mikmod/default.nix rename to pkgs/by-name/mi/mikmod/package.nix diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/by-name/mi/mill/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/mill/default.nix rename to pkgs/by-name/mi/mill/package.nix diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/by-name/mi/miller/package.nix similarity index 100% rename from pkgs/tools/text/miller/default.nix rename to pkgs/by-name/mi/miller/package.nix diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/by-name/mi/millet/Cargo.lock similarity index 100% rename from pkgs/development/tools/language-servers/millet/Cargo.lock rename to pkgs/by-name/mi/millet/Cargo.lock diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/by-name/mi/millet/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/millet/default.nix rename to pkgs/by-name/mi/millet/package.nix diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/by-name/mi/milu/package.nix similarity index 100% rename from pkgs/applications/misc/milu/default.nix rename to pkgs/by-name/mi/milu/package.nix diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix new file mode 100644 index 000000000000..7bc0723a3044 --- /dev/null +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -0,0 +1,68 @@ +{ + cmake, + crocoddyl, + fetchFromGitHub, + lib, + llvmPackages, + pkg-config, + proxsuite, + python3Packages, + pythonSupport ? false, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mim-solvers"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "machines-in-motion"; + repo = "mim_solvers"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XV8EJqCOTYqljZe2PQvnhIaPUOJ+bBjRIoshdeqZycA="; + }; + + # eigenpy is not used without python support + postPatch = lib.optionalString (!pythonSupport) '' + substituteInPlace CMakeLists.txt --replace-fail \ + "add_project_dependency(eigenpy 2.7.10 REQUIRED)" \ + "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.osqp + python3Packages.proxsuite + python3Packages.scipy + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + proxsuite + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'" + ); + + doCheck = true; + pythonImportsCheck = [ "mim_solvers" ]; + + meta = { + description = "Numerical solvers used in the Machines in Motion Laboratory"; + homepage = "https://github.com/machines-in-motion/mim_solvers"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/by-name/mi/mimalloc/package.nix similarity index 100% rename from pkgs/development/libraries/mimalloc/default.nix rename to pkgs/by-name/mi/mimalloc/package.nix diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/by-name/mi/mimeo/package.nix similarity index 100% rename from pkgs/tools/misc/mimeo/default.nix rename to pkgs/by-name/mi/mimeo/package.nix diff --git a/pkgs/development/libraries/mimetic/narrowing.patch b/pkgs/by-name/mi/mimetic/narrowing.patch similarity index 100% rename from pkgs/development/libraries/mimetic/narrowing.patch rename to pkgs/by-name/mi/mimetic/narrowing.patch diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/by-name/mi/mimetic/package.nix similarity index 100% rename from pkgs/development/libraries/mimetic/default.nix rename to pkgs/by-name/mi/mimetic/package.nix diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/by-name/mi/mimic/package.nix similarity index 100% rename from pkgs/applications/audio/mimic/default.nix rename to pkgs/by-name/mi/mimic/package.nix diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 82b6c120b5cd..2c2c07a7424b 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-XALr755tFYaMnI913NCjwFPieedS00RXv4KhjXfOPfw="; + hash = "sha256-AcD3ebbPGzmu90TxmOBG0wptOZBG61wBXAIdJwZNMT4="; }; vendorHash = null; diff --git a/pkgs/by-name/mi/min/lock.json b/pkgs/by-name/mi/min/lock.json index 262bfee0d538..c207506bc299 100644 --- a/pkgs/by-name/mi/min/lock.json +++ b/pkgs/by-name/mi/min/lock.json @@ -2,51 +2,51 @@ "depends": [ { "method": "fetchzip", + "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source", + "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0", + "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615", + "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz", + "ref": "v0.2.1", "packages": [ "checksums" ], - "path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source", - "ref": "v0.1.0", - "rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01", - "sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj", - "srcDir": "src", - "url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "minline" - ], - "path": "/nix/store/rirdlc80sn6pp5vmbw32xaaj56n1zxl8-source", - "ref": "v0.1.1", - "rev": "a1f11470316500dceb88d7d6c30979c35aab14ff", - "sha256": "0wy8svpw0cldh1j6g5af4pxh6d6lac79sngg0i24dplh9pli7wb3", - "srcDir": ".", - "url": "https://github.com/h3rald/minline/archive/a1f11470316500dceb88d7d6c30979c35aab14ff.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "nimquery" - ], - "path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source", - "ref": "v2.0.1", - "rev": "83e2866422788a1db1906734de056b410a49d047", - "sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z", - "srcDir": "", - "url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz" + "srcDir": "src" }, { "method": "fetchzip", + "path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source", + "rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec", + "sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q", + "url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz", + "ref": "0.5.14", "packages": [ "zippy" ], - "path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source", - "ref": "0.5.14", - "rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec", - "sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q", - "srcDir": "src", - "url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz" + "srcDir": "src" + }, + { + "method": "fetchzip", + "path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source", + "rev": "83e2866422788a1db1906734de056b410a49d047", + "sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z", + "url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz", + "ref": "v2.0.1", + "packages": [ + "nimquery" + ], + "srcDir": "" + }, + { + "method": "fetchzip", + "path": "/nix/store/bn7iv51yqbqi0h8z1r9v2vmpqnz46yfr-source", + "rev": "c138b34bf3c5198c26ecfad5e251fa5d56e5ad48", + "sha256": "0wwfhjhwpmanjv4vv9yl0a0mami9x8qzzb5nialcfp9iasbwiqgj", + "url": "https://github.com/h3rald/minline/archive/c138b34bf3c5198c26ecfad5e251fa5d56e5ad48.tar.gz", + "ref": "v0.1.2", + "packages": [ + "minline" + ], + "srcDir": "." } ] } diff --git a/pkgs/by-name/mi/min/package.nix b/pkgs/by-name/mi/min/package.nix index e39a82248542..9b2bfd34a749 100644 --- a/pkgs/by-name/mi/min/package.nix +++ b/pkgs/by-name/mi/min/package.nix @@ -2,13 +2,13 @@ buildNimPackage (finalAttrs: { pname = "min"; - version = "0.43.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "h3rald"; repo = "min"; rev = "v${finalAttrs.version}"; - hash = "sha256-4coeasFZrbwYQ6FM0ENkh/pPcvN3rCuheUpmHr1f3wM="; + hash = "sha256-Uw03aSFn3EV3H2SkYoYzM5S/WLhEmLV8s3mRF3oT8ro="; }; lockFile = ./lock.json; @@ -16,15 +16,6 @@ buildNimPackage (finalAttrs: { buildInputs = [ openssl pcre ]; prePatch = '' - # substitude our code for their code for data - substituteInPlace min.nimble \ - --replace-fail 'import' "" \ - --replace-warn 'minpkg/core/meta' "" \ - --replace-warn 'pkgVersion' '"${finalAttrs.version}"' \ - --replace-warn 'pkgAuthor' '""' \ - --replace-warn 'pkgDescription' '""' \ - --replace-warn 'pkgName' '"${finalAttrs.pname}"' \ - # remove vendorabilities find . -name '*.a' -delete find minpkg/lib -name '*.nim' \ diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/by-name/mi/minc_widgets/package.nix similarity index 100% rename from pkgs/applications/science/biology/minc-widgets/default.nix rename to pkgs/by-name/mi/minc_widgets/package.nix diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix new file mode 100644 index 000000000000..cb7fc6403d97 --- /dev/null +++ b/pkgs/by-name/mi/minder/package.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, shared-mime-info +, vala +, wrapGAppsHook3 +, cairo +, discount +, glib +, gtk3 +, gtksourceview4 +, hicolor-icon-theme # for setup-hook +, json-glib +, libarchive +, libgee +, libhandy +, libxml2 +, pantheon +}: + +stdenv.mkDerivation rec { + pname = "minder"; + version = "1.17.0"; + + src = fetchFromGitHub { + owner = "phase1geo"; + repo = pname; + rev = version; + sha256 = "sha256-LZm2TLUugW/lSHp+y3Sz9IacQCEFQloVnZ9MoBjqHvI="; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + python3 + shared-mime-info + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + cairo + discount + glib + gtk3 + gtksourceview4 + hicolor-icon-theme + json-glib + libarchive + libgee + libhandy + libxml2 + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + postFixup = '' + for x in $out/bin/*; do + ln -vrs $x "$out/bin/''${x##*.}" + done + ''; + + meta = with lib; { + description = "Mind-mapping application for elementary OS"; + homepage = "https://github.com/phase1geo/Minder"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; + mainProgram = "com.github.phase1geo.minder"; + }; +} diff --git a/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix similarity index 100% rename from pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix rename to pkgs/by-name/mi/minecraft-server-hibernation/package.nix diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/by-name/mi/minesweep-rs/package.nix similarity index 100% rename from pkgs/games/minesweep-rs/default.nix rename to pkgs/by-name/mi/minesweep-rs/package.nix diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/by-name/mi/mingetty/package.nix similarity index 100% rename from pkgs/os-specific/linux/mingetty/default.nix rename to pkgs/by-name/mi/mingetty/package.nix diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/by-name/mi/miniHttpd/package.nix similarity index 100% rename from pkgs/servers/http/mini-httpd/default.nix rename to pkgs/by-name/mi/miniHttpd/package.nix diff --git a/pkgs/applications/science/biology/minia/no-bundle.patch b/pkgs/by-name/mi/minia/no-bundle.patch similarity index 100% rename from pkgs/applications/science/biology/minia/no-bundle.patch rename to pkgs/by-name/mi/minia/no-bundle.patch diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/by-name/mi/minia/package.nix similarity index 100% rename from pkgs/applications/science/biology/minia/default.nix rename to pkgs/by-name/mi/minia/package.nix diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/by-name/mi/miniaudio/package.nix similarity index 100% rename from pkgs/development/libraries/miniaudio/default.nix rename to pkgs/by-name/mi/miniaudio/package.nix diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/by-name/mi/miniball/package.nix similarity index 100% rename from pkgs/development/libraries/miniball/default.nix rename to pkgs/by-name/mi/miniball/package.nix diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/by-name/mi/minica/package.nix similarity index 100% rename from pkgs/tools/security/minica/default.nix rename to pkgs/by-name/mi/minica/package.nix diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/by-name/mi/minidjvu/package.nix similarity index 100% rename from pkgs/applications/graphics/minidjvu/default.nix rename to pkgs/by-name/mi/minidjvu/package.nix diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/by-name/mi/minidlna/package.nix similarity index 100% rename from pkgs/tools/networking/minidlna/default.nix rename to pkgs/by-name/mi/minidlna/package.nix diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index c3e590e80fd4..457c22e7d243 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM="; + hash = "sha256-FAeUhB05mDcdlHzJRLJR9mSKeqpKWed4Kxa89j/pjOQ="; }; - vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk="; + vendorHash = "sha256-FVm6kTZFp6qSUUuB2R4owzSxk+zfBWW1o7kOFadSS38="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/by-name/mi/minify/package.nix similarity index 100% rename from pkgs/development/web/minify/default.nix rename to pkgs/by-name/mi/minify/package.nix diff --git a/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff similarity index 100% rename from pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff rename to pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/by-name/mi/minigalaxy/package.nix similarity index 100% rename from pkgs/applications/misc/minigalaxy/default.nix rename to pkgs/by-name/mi/minigalaxy/package.nix diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/by-name/mi/minilibx/package.nix similarity index 100% rename from pkgs/development/libraries/minilibx/default.nix rename to pkgs/by-name/mi/minilibx/package.nix diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/by-name/mi/minimacy/package.nix similarity index 100% rename from pkgs/development/compilers/minimacy/default.nix rename to pkgs/by-name/mi/minimacy/package.nix diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/by-name/mi/minimap2/package.nix similarity index 100% rename from pkgs/applications/science/biology/minimap2/default.nix rename to pkgs/by-name/mi/minimap2/package.nix diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/by-name/mi/minimodem/package.nix similarity index 100% rename from pkgs/applications/radio/minimodem/default.nix rename to pkgs/by-name/mi/minimodem/package.nix diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/by-name/mi/mininet/package.nix similarity index 100% rename from pkgs/tools/virtualization/mininet/default.nix rename to pkgs/by-name/mi/mininet/package.nix diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/by-name/mi/minio-certgen/package.nix similarity index 100% rename from pkgs/tools/security/minio-certgen/default.nix rename to pkgs/by-name/mi/minio-certgen/package.nix diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/by-name/mi/minio-client/package.nix similarity index 100% rename from pkgs/tools/networking/minio-client/default.nix rename to pkgs/by-name/mi/minio-client/package.nix diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/by-name/mi/miniplayer/package.nix similarity index 100% rename from pkgs/applications/audio/miniplayer/default.nix rename to pkgs/by-name/mi/miniplayer/package.nix diff --git a/pkgs/by-name/mi/minipro/package.nix b/pkgs/by-name/mi/minipro/package.nix new file mode 100644 index 000000000000..d2f47e09705c --- /dev/null +++ b/pkgs/by-name/mi/minipro/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "minipro"; + version = "0.7.2"; + + src = fetchFromGitLab { + owner = "DavidGriffith"; + repo = "minipro"; + rev = version; + hash = "sha256-NIaBN+T/EzYBhBtBEIvIAmqmksYDDiMJsWm9zCzZOxE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ]; + makeFlags = [ + "VERSION=${version}" + "PREFIX=$(out)" + "UDEV_DIR=$(out)/lib/udev" + "COMPLETIONS_DIR=$(out)/share/bash-completion/completions" + "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + "CC=${stdenv.cc.targetPrefix}cc" + "CFLAGS=-O2" + ]; + + meta = with lib; { + homepage = "https://gitlab.com/DavidGriffith/minipro"; + description = "Open source program for controlling the MiniPRO TL866xx series of chip programmers"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bmwalters ]; + mainProgram = "minipro"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/by-name/mi/minisat/package.nix similarity index 100% rename from pkgs/applications/science/logic/minisat/default.nix rename to pkgs/by-name/mi/minisat/package.nix diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/by-name/mi/miniscript/package.nix similarity index 100% rename from pkgs/applications/blockchains/miniscript/default.nix rename to pkgs/by-name/mi/miniscript/package.nix diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/by-name/mi/miniserve/package.nix similarity index 100% rename from pkgs/tools/misc/miniserve/default.nix rename to pkgs/by-name/mi/miniserve/package.nix diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/by-name/mi/minisign/package.nix similarity index 100% rename from pkgs/tools/security/minisign/default.nix rename to pkgs/by-name/mi/minisign/package.nix diff --git a/pkgs/tools/networking/minissdpd/makefile-install-dir.patch b/pkgs/by-name/mi/minissdpd/makefile-install-dir.patch similarity index 100% rename from pkgs/tools/networking/minissdpd/makefile-install-dir.patch rename to pkgs/by-name/mi/minissdpd/makefile-install-dir.patch diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/by-name/mi/minissdpd/package.nix similarity index 100% rename from pkgs/tools/networking/minissdpd/default.nix rename to pkgs/by-name/mi/minissdpd/package.nix diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/by-name/mi/ministat/package.nix similarity index 100% rename from pkgs/tools/misc/ministat/default.nix rename to pkgs/by-name/mi/ministat/package.nix diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/by-name/mi/miniupnpc/package.nix similarity index 100% rename from pkgs/tools/networking/miniupnpc/default.nix rename to pkgs/by-name/mi/miniupnpc/package.nix diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/by-name/mi/minixml/package.nix similarity index 100% rename from pkgs/development/libraries/minixml/default.nix rename to pkgs/by-name/mi/minixml/package.nix diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/by-name/mi/miniz/package.nix similarity index 100% rename from pkgs/development/libraries/miniz/default.nix rename to pkgs/by-name/mi/miniz/package.nix diff --git a/pkgs/tools/security/minizign/default.nix b/pkgs/by-name/mi/minizign/package.nix similarity index 100% rename from pkgs/tools/security/minizign/default.nix rename to pkgs/by-name/mi/minizign/package.nix diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix new file mode 100644 index 000000000000..23de85f33a76 --- /dev/null +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, pkg-config +, zlib +, bzip2 +, xz +, zstd +, openssl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "minizip-ng"; + version = "4.0.7"; + + src = fetchFromGitHub { + owner = "zlib-ng"; + repo = "minizip-ng"; + rev = finalAttrs.version; + hash = "sha256-scoEqymRMBTZZVr1fxtKOyBj4VLCgI8jQpanUKrJhiQ="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ zlib bzip2 xz zstd openssl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + "-DMZ_OPENSSL=ON" + "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" + "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" + "-DMZ_LIB_SUFFIX='-ng'" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # missing header file + "-DMZ_LIBCOMP=OFF" + ]; + + postInstall = '' + # make lib findable as libminizip-ng even if compat is enabled + for ext in so dylib a ; do + if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then + ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext + fi + done + if [ ! -e $out/include/minizip-ng ]; then + ln -s $out/include $out/include/minizip-ng + fi + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + nativeCheckInputs = [ gtest ]; + enableParallelChecking = false; + + meta = with lib; { + description = "Fork of the popular zip manipulation library found in the zlib distribution"; + homepage = "https://github.com/zlib-ng/minizip-ng"; + license = licenses.zlib; + maintainers = with maintainers; [ gebner ris ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/by-name/mi/minizip/package.nix similarity index 100% rename from pkgs/development/libraries/minizip/default.nix rename to pkgs/by-name/mi/minizip/package.nix diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/by-name/mi/miraclecast/package.nix similarity index 100% rename from pkgs/os-specific/linux/miraclecast/default.nix rename to pkgs/by-name/mi/miraclecast/package.nix diff --git a/pkgs/applications/video/mirakurun/fix-musl-detection.patch b/pkgs/by-name/mi/mirakurun/fix-musl-detection.patch similarity index 100% rename from pkgs/applications/video/mirakurun/fix-musl-detection.patch rename to pkgs/by-name/mi/mirakurun/fix-musl-detection.patch diff --git a/pkgs/applications/video/mirakurun/mirakurun.1 b/pkgs/by-name/mi/mirakurun/mirakurun.1 similarity index 100% rename from pkgs/applications/video/mirakurun/mirakurun.1 rename to pkgs/by-name/mi/mirakurun/mirakurun.1 diff --git a/pkgs/applications/video/mirakurun/nix-filesystem.patch b/pkgs/by-name/mi/mirakurun/nix-filesystem.patch similarity index 100% rename from pkgs/applications/video/mirakurun/nix-filesystem.patch rename to pkgs/by-name/mi/mirakurun/nix-filesystem.patch diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/by-name/mi/mirakurun/package.nix similarity index 100% rename from pkgs/applications/video/mirakurun/default.nix rename to pkgs/by-name/mi/mirakurun/package.nix diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/by-name/mi/miranda/package.nix similarity index 100% rename from pkgs/development/compilers/miranda/default.nix rename to pkgs/by-name/mi/miranda/package.nix diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/by-name/mi/miredo/package.nix similarity index 100% rename from pkgs/tools/networking/miredo/default.nix rename to pkgs/by-name/mi/miredo/package.nix diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/by-name/mi/mirrorbits/package.nix similarity index 100% rename from pkgs/servers/mirrorbits/default.nix rename to pkgs/by-name/mi/mirrorbits/package.nix diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/by-name/mi/miscfiles/package.nix similarity index 100% rename from pkgs/data/misc/miscfiles/default.nix rename to pkgs/by-name/mi/miscfiles/package.nix diff --git a/pkgs/by-name/mi/mission-center/Cargo.lock b/pkgs/by-name/mi/mission-center/Cargo.lock index 2cf6007b7293..916ce978f88a 100644 --- a/pkgs/by-name/mi/mission-center/Cargo.lock +++ b/pkgs/by-name/mi/mission-center/Cargo.lock @@ -25,9 +25,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" @@ -66,18 +66,18 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "shlex", ] [[package]] name = "cfg-expr" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" dependencies = [ "smallvec", "target-lexicon", @@ -175,24 +175,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -201,15 +201,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -218,15 +218,15 @@ dependencies = [ [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", "futures-macro", @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" +checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -250,9 +250,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" +checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d" dependencies = [ "gio-sys", "glib-sys", @@ -263,9 +263,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" +checksum = "c121aeeb0cf7545877ae615dac6bfd088b739d8abee4d55e7143b06927d16a31" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -278,9 +278,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" +checksum = "7d3c03d1ea9d5199f14f060890fde68a3b5ec5699144773d1fa6abf337bfbc9c" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -326,9 +326,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" +checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c" dependencies = [ "futures-channel", "futures-core", @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" +checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779" dependencies = [ "glib-sys", "gobject-sys", @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4" +checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff" dependencies = [ "bitflags", "futures-channel", @@ -377,9 +377,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab" +checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7" dependencies = [ "heck", "proc-macro-crate", @@ -390,9 +390,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.20.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" +checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b" dependencies = [ "libc", "system-deps", @@ -400,9 +400,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" +checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" dependencies = [ "glib-sys", "libc", @@ -411,9 +411,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" +checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe" dependencies = [ "glib", "graphene-sys", @@ -422,9 +422,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" +checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99" dependencies = [ "glib-sys", "libc", @@ -434,9 +434,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" +checksum = "aa21a2f7c51ee1c6cc1242c2faf3aae2b7566138f182696759987bde8219e922" dependencies = [ "cairo-rs", "gdk4", @@ -449,9 +449,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" +checksum = "0f9fb607554f9f4e8829eb7ea301b0fde051e1dbfd5d16b143a8a9c2fac6c01b" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -465,9 +465,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" +checksum = "31e2d105ce672f5cdcb5af2602e91c2901e91c72da15ab76f613ad57ecf04c6d" dependencies = [ "cairo-rs", "field-offset", @@ -498,9 +498,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" +checksum = "cbe4325908b1c1642dbb48e9f49c07a73185babf43e8b2065b0f881a589f55b8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -524,13 +524,19 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hashlink" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -541,12 +547,12 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -594,9 +600,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdbus-sys" @@ -667,7 +673,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.6.1" +version = "0.6.2" dependencies = [ "dbus", "errno-sys", @@ -717,9 +723,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "ordered-multimap" @@ -728,14 +734,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "pango" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" +checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356" dependencies = [ "gio", "glib", @@ -745,9 +751,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" +checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838" dependencies = [ "glib-sys", "gobject-sys", @@ -769,9 +775,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "proc-macro-crate" @@ -802,9 +808,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -814,9 +820,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -825,9 +831,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rusqlite" @@ -909,9 +915,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -945,9 +951,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -956,9 +962,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "7.0.2" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" dependencies = [ "cfg-expr", "heck", @@ -975,9 +981,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" [[package]] name = "textdistance" @@ -1017,9 +1023,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -1161,9 +1167,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] diff --git a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock index 37053b5ba954..fa88391e6136 100644 --- a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock +++ b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock @@ -19,9 +19,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "app-rummage" @@ -120,7 +120,7 @@ dependencies = [ "hex", "ignore", "jobserver", - "libc 0.2.158", + "libc 0.2.159", "miow", "same-file", "sha2", @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "shlex", ] @@ -188,7 +188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", - "libc 0.2.158", + "libc 0.2.159", ] [[package]] @@ -203,7 +203,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", ] [[package]] @@ -262,7 +262,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", "libdbus-sys", "winapi", ] @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "drm" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" +checksum = "d000ffcf7a146ee52444a31b78ac82f981ebba5de6fb19f0b1052d98c8e5f308" dependencies = [ "bitflags", "bytemuck", @@ -310,9 +310,9 @@ dependencies = [ [[package]] name = "drm-ffi" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" +checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b" dependencies = [ "drm-sys", "rustix", @@ -326,11 +326,11 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" +checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", "linux-raw-sys 0.6.5", ] @@ -341,7 +341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" dependencies = [ "khronos", - "libc 0.2.158", + "libc 0.2.159", ] [[package]] @@ -356,7 +356,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", "windows-sys 0.52.0", ] @@ -373,16 +373,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", - "libc 0.2.158", + "libc 0.2.159", "libredox", "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -399,7 +399,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.6.1" +version = "0.6.2" dependencies = [ "anyhow", "app-rummage", @@ -417,7 +417,7 @@ dependencies = [ "gbm", "glob", "lazy_static", - "libc 0.2.158", + "libc 0.2.159", "libloading", "log", "nix", @@ -435,24 +435,24 @@ dependencies = [ [[package]] name = "gbm" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" +checksum = "c724107aa10444b1d2709aae4727c18a33c16b3e15ea8a46cc4ae226c084c88a" dependencies = [ "bitflags", "drm", "drm-fourcc", "gbm-sys", - "libc 0.2.158", + "libc 0.2.159", ] [[package]] name = "gbm-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" +checksum = "a9cc2f64de9fa707b5c6b2d2f10d7a7e49e845018a9f5685891eb40d3bab2538" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", ] [[package]] @@ -472,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "libc 0.2.158", + "libc 0.2.159", "wasi", ] @@ -545,7 +545,7 @@ version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", ] [[package]] @@ -571,9 +571,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdbus-sys" @@ -602,7 +602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags", - "libc 0.2.158", + "libc 0.2.159", "redox_syscall", ] @@ -657,14 +657,14 @@ dependencies = [ "bitflags", "cfg-if", "cfg_aliases", - "libc 0.2.158", + "libc 0.2.159", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "ordered-multimap" @@ -690,9 +690,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "proc-macro2" @@ -734,18 +734,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -754,9 +754,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" @@ -767,7 +767,7 @@ dependencies = [ "cc", "cfg-if", "getrandom", - "libc 0.2.158", + "libc 0.2.159", "spin", "untrusted", "windows-sys 0.52.0", @@ -792,16 +792,16 @@ checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags", "errno", - "libc 0.2.158", + "libc 0.2.159", "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -814,9 +814,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -919,9 +919,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -930,20 +930,20 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", - "libc 0.2.158", + "libc 0.2.159", "xattr", ] [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -954,18 +954,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -1029,9 +1029,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -1041,18 +1041,18 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "untrusted" @@ -1111,9 +1111,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -1303,7 +1303,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "libc 0.2.158", + "libc 0.2.159", "linux-raw-sys 0.4.14", "rustix", ] diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index f7176e411c54..b21baead3379 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -62,13 +62,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-1/cbU5yH6VlfFXCAO3m2CCZwCrqls8WZQf2eplfS6Rs="; + hash = "sha256-PvHIvWyhGovlLaeHk2WMp3yRz4VxvvINzX1oqkFgVuQ="; }; cargoDeps = symlinkJoin { diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/by-name/mi/mission-planner/package.nix similarity index 100% rename from pkgs/applications/science/robotics/mission-planner/default.nix rename to pkgs/by-name/mi/mission-planner/package.nix diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 6c23db392279..db8a687cdda2 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { lib.makeLibraryPath [ jemalloc ffmpeg-headless - stdenv.cc.cc.lib + stdenv.cc.cc ] } diff --git a/pkgs/by-name/mi/mistral-rs/Cargo.lock b/pkgs/by-name/mi/mistral-rs/Cargo.lock index f2ec794e49b3..d3b1750c50b3 100644 --- a/pkgs/by-name/mi/mistral-rs/Cargo.lock +++ b/pkgs/by-name/mi/mistral-rs/Cargo.lock @@ -20,9 +20,9 @@ checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -104,43 +104,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" dependencies = [ "backtrace", ] @@ -168,13 +168,13 @@ checksum = "5b8a30a44e99a1c83ccb2a6298c563c888952a1c9134953db26876528f84c93a" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -185,15 +185,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" dependencies = [ "async-trait", "axum-core", @@ -225,9 +225,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", @@ -238,7 +238,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -341,7 +341,7 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 2.0.77", + "syn 2.0.85", "thiserror", "try_match", ] @@ -354,22 +354,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -386,26 +386,27 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "candle-core" -version = "0.6.1" -source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" +version = "0.7.2" +source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646" dependencies = [ "accelerate-src", "byteorder", "candle-kernels", "candle-metal-kernels", "cudarc", + "float8", "gemm", "half", "intel-mkl-src", "libc", "memmap2", - "metal", + "metal 0.27.0", "num-traits", "num_cpus", "rand", @@ -413,14 +414,17 @@ dependencies = [ "rayon", "safetensors", "thiserror", + "ug", + "ug-cuda", + "ug-metal", "yoke", "zip", ] [[package]] name = "candle-flash-attn" -version = "0.6.1" -source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" +version = "0.7.2" +source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646" dependencies = [ "anyhow", "bindgen_cuda 0.1.5", @@ -430,18 +434,18 @@ dependencies = [ [[package]] name = "candle-kernels" -version = "0.6.1" -source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" +version = "0.7.2" +source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646" dependencies = [ "bindgen_cuda 0.1.5", ] [[package]] name = "candle-metal-kernels" -version = "0.6.1" -source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" +version = "0.7.2" +source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646" dependencies = [ - "metal", + "metal 0.27.0", "once_cell", "thiserror", "tracing", @@ -449,15 +453,15 @@ dependencies = [ [[package]] name = "candle-nn" -version = "0.6.1" -source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" +version = "0.7.2" +source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646" dependencies = [ "accelerate-src", "candle-core", "candle-metal-kernels", "half", "intel-mkl-src", - "metal", + "metal 0.27.0", "num-traits", "rayon", "safetensors", @@ -467,9 +471,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "shlex", ] @@ -538,9 +542,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -548,26 +552,27 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim 0.11.1", + "terminal_size", ] [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -607,9 +612,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "console" @@ -821,7 +826,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -843,7 +848,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -860,13 +865,13 @@ checksum = "aafbece59594ed57696a1a69e8bb3ca1683fbc9cdb41d5c02726070b2cd8f19d" [[package]] name = "derive-new" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -877,38 +882,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "derive_builder" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -919,7 +924,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -970,7 +975,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1006,9 +1011,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1028,7 +1033,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1090,9 +1095,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -1111,19 +1116,32 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", ] [[package]] -name = "flume" -version = "0.11.0" +name = "float8" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "c7c3475274d374d263c4c40c43ad854c5bdf733c7db775bbd3c1ca2ad7427978" +dependencies = [ + "cudarc", + "half", + "num-traits", + "rand", + "rand_distr", +] + +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "spin", ] @@ -1161,7 +1179,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1187,9 +1205,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1202,9 +1220,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1212,15 +1230,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1229,38 +1247,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1432,7 +1450,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1447,9 +1465,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1500,6 +1518,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.5.0" @@ -1565,9 +1589,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1577,9 +1601,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1632,9 +1656,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -1645,16 +1669,15 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1691,9 +1714,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", "byteorder-lite", @@ -1711,9 +1734,9 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f" dependencies = [ "byteorder-lite", "quick-error", @@ -1727,12 +1750,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", "serde", ] @@ -1789,9 +1812,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is_terminal_polyfill" @@ -1840,9 +1863,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1861,9 +1884,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" @@ -2007,6 +2030,21 @@ dependencies = [ "paste", ] +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -2025,9 +2063,9 @@ dependencies = [ [[package]] name = "minijinja" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" +checksum = "c9ca8daf4b0b4029777f1bc6e1aedd1aec7b74c276a43bc6f620a8e1a1c0a90e" dependencies = [ "serde", "serde_json", @@ -2035,9 +2073,9 @@ dependencies = [ [[package]] name = "minijinja-contrib" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744a2b84dbd22398e347594ed2aef9d3f1b948934e3e6e94ef69ecd39d597f4b" +checksum = "39ffd46ee854be23604a20efd6c9655374fefbe4d44b949dc0f907305d92873a" dependencies = [ "minijinja", "serde", @@ -2056,7 +2094,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -2066,6 +2103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2094,7 +2132,7 @@ dependencies = [ [[package]] name = "mistralrs" -version = "0.3.0" +version = "0.3.2" dependencies = [ "anyhow", "candle-core", @@ -2112,7 +2150,7 @@ dependencies = [ [[package]] name = "mistralrs-bench" -version = "0.3.0" +version = "0.3.2" dependencies = [ "anyhow", "candle-core", @@ -2127,7 +2165,7 @@ dependencies = [ [[package]] name = "mistralrs-core" -version = "0.3.0" +version = "0.3.2" dependencies = [ "accelerate-src", "akin", @@ -2150,6 +2188,7 @@ dependencies = [ "derive_more", "dirs", "either", + "float8", "futures", "galil-seiferas", "half", @@ -2172,7 +2211,7 @@ dependencies = [ "rand_isaac", "rayon", "regex", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "reqwest", "rustc-hash", "safetensors", @@ -2191,24 +2230,25 @@ dependencies = [ "tqdm", "tracing", "tracing-subscriber", - "uuid 1.10.0", + "uuid 1.11.0", "variantly", "vob", ] [[package]] name = "mistralrs-paged-attn" -version = "0.3.0" +version = "0.3.2" dependencies = [ "anyhow", "bindgen_cuda 0.1.6", "candle-core", + "float8", "half", ] [[package]] name = "mistralrs-pyo3" -version = "0.3.0" +version = "0.3.2" dependencies = [ "accelerate-src", "anyhow", @@ -2232,14 +2272,16 @@ dependencies = [ [[package]] name = "mistralrs-quant" -version = "0.3.0" +version = "0.3.2" dependencies = [ "bindgen_cuda 0.1.5", "byteorder", "candle-core", "candle-nn", + "float8", "half", "lazy_static", + "once_cell", "paste", "rayon", "serde", @@ -2248,7 +2290,7 @@ dependencies = [ [[package]] name = "mistralrs-server" -version = "0.3.0" +version = "0.3.2" dependencies = [ "accelerate-src", "anyhow", @@ -2277,7 +2319,7 @@ dependencies = [ [[package]] name = "mistralrs-vision" -version = "0.3.0" +version = "0.3.2" dependencies = [ "candle-core", "image", @@ -2301,7 +2343,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2371,6 +2413,20 @@ dependencies = [ "winapi", ] +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -2400,6 +2456,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-rational" version = "0.4.2" @@ -2449,7 +2516,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2479,23 +2546,21 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "oci-spec" -version = "0.6.8" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" +checksum = "bdf88ddc01cc6bccbe1044adb6a29057333f523deadcb4953c011a73158cfa5e" dependencies = [ "derive_builder", "getset", - "once_cell", - "regex", "serde", "serde_json", "strum", @@ -2526,15 +2591,15 @@ dependencies = [ "toml", "ureq", "url", - "uuid 1.10.0", + "uuid 1.11.0", "walkdir", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -2560,9 +2625,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2581,7 +2646,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2592,9 +2657,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2706,31 +2771,11 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2740,28 +2785,28 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "ppv-lite86" @@ -2824,14 +2869,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -2850,9 +2895,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51" dependencies = [ "anyhow", "cfg-if", @@ -2860,7 +2905,7 @@ dependencies = [ "chrono-tz", "either", "eyre", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "indoc", "libc", @@ -2881,9 +2926,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179" dependencies = [ "once_cell", "target-lexicon", @@ -2891,9 +2936,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d" dependencies = [ "libc", "pyo3-build-config", @@ -2901,27 +2946,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "pyo3-macros-backend" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce" dependencies = [ "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3103,9 +3148,9 @@ checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -3123,14 +3168,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -3144,13 +3189,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -3161,15 +3206,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -3249,7 +3294,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.85", "walkdir", ] @@ -3309,9 +3354,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "log", "once_cell", @@ -3324,19 +3369,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -3351,9 +3395,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -3382,9 +3426,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -3410,7 +3454,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3434,9 +3478,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3456,22 +3500,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3482,14 +3526,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3518,9 +3562,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3723,7 +3767,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3745,9 +3789,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -3777,7 +3821,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3832,9 +3876,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -3849,9 +3893,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3870,23 +3914,33 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.63" +name = "terminal_size" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3947,7 +4001,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "serde", "serde_json", "spm_precompiled", @@ -3959,9 +4013,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -3983,7 +4037,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4053,9 +4107,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -4066,14 +4120,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.13" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", - "pin-project", "pin-project-lite", + "sync_wrapper 0.1.2", "tokio", "tower-layer", "tower-service", @@ -4139,7 +4193,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4204,7 +4258,7 @@ checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4213,6 +4267,48 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ug" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4eef2ebfc18c67a6dbcacd9d8a4d85e0568cc58c82515552382312c2730ea13" +dependencies = [ + "half", + "num", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "ug-cuda" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4dcab280ad0ef3957e153a82dcad608c954d02cf253b695322f502d1f8902e" +dependencies = [ + "cudarc", + "half", + "serde", + "serde_json", + "thiserror", + "ug", +] + +[[package]] +name = "ug-metal" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4ed1df2c20a1a138f993041f650cc84ff27aaefb4342b7f986e77d00e80799" +dependencies = [ + "half", + "metal 0.29.0", + "objc", + "serde", + "serde_json", + "thiserror", + "ug", +] + [[package]] name = "unchecked-index" version = "0.2.2" @@ -4221,18 +4317,15 @@ checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -4242,9 +4335,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -4266,9 +4359,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode_categories" @@ -4344,15 +4437,15 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" +checksum = "20c24e8ab68ff9ee746aad22d39b5535601e6416d1b0feeabf78be986a5c4392" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4384,9 +4477,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", ] @@ -4461,9 +4554,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -4472,24 +4565,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -4499,9 +4592,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4509,28 +4602,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -4538,9 +4631,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -4781,9 +4874,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -4819,7 +4912,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -4841,7 +4934,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4861,7 +4954,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 1453a4c4ce8d..eb13f546c82c 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -17,6 +17,8 @@ # env fetchurl, + versionCheckHook, + testers, mistral-rs, nix-update-script, @@ -81,20 +83,20 @@ in rustPlatform.buildRustPackage rec { pname = "mistral-rs"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; rev = "refs/tags/v${version}"; - hash = "sha256-ljGr8V6WkpXPV90SiHJ0t7wzBPx0J0FOB52YdLLIeoM="; + hash = "sha256-aflzpJZ48AFBqNTssZl2KxkspQb662nGkEU6COIluxk="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "bindgen_cuda-0.1.6" = "sha256-OWGcQxT+x5HyIFskNVWpPr6Qfkh6Mv/g4PVSm5oA27g="; - "candle-core-0.6.1" = "sha256-AtKjMTtbMBI2DbZXoWimhqcHmsz2DnRXJorqA0QYNHw="; + "candle-core-0.7.2" = "sha256-OovBzD1gEYToa3HT8oQtbY6sDy0heRwAH2cK7gz5Jm0="; }; }; @@ -179,6 +181,13 @@ rustPlatform.buildRustPackage rec { "--skip=util::tests::test_parse_image_url" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/mistralrs-server"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { tests = { version = testers.testVersion { package = mistral-rs; }; diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/by-name/mi/mitama-cpp-result/package.nix similarity index 100% rename from pkgs/development/libraries/mitama-cpp-result/default.nix rename to pkgs/by-name/mi/mitama-cpp-result/package.nix diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/by-name/mi/mitm6/package.nix similarity index 100% rename from pkgs/tools/security/mitm6/default.nix rename to pkgs/by-name/mi/mitm6/package.nix diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/by-name/mi/mitmproxy2swagger/package.nix similarity index 100% rename from pkgs/tools/security/mitmproxy2swagger/default.nix rename to pkgs/by-name/mi/mitmproxy2swagger/package.nix diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/by-name/mi/mix2nix/package.nix similarity index 100% rename from pkgs/development/tools/mix2nix/default.nix rename to pkgs/by-name/mi/mix2nix/package.nix diff --git a/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch b/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch new file mode 100644 index 000000000000..ceeaa90f6351 --- /dev/null +++ b/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch @@ -0,0 +1,221 @@ +diff --git a/src/protections/NsfwProtection.ts b/src/protections/NsfwProtection.ts +deleted file mode 100644 +index 8b6f8fd..0000000 +--- a/src/protections/NsfwProtection.ts ++++ /dev/null +@@ -1,99 +0,0 @@ +-/* +-Copyright 2024 The Matrix.org Foundation C.I.C. +- +-Licensed under the Apache License, Version 2.0 (the "License"); +-you may not use this file except in compliance with the License. +-You may obtain a copy of the License at +- +- http://www.apache.org/licenses/LICENSE-2.0 +- +-Unless required by applicable law or agreed to in writing, software +-distributed under the License is distributed on an "AS IS" BASIS, +-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-See the License for the specific language governing permissions and +-limitations under the License. +-*/ +- +-import { Protection } from "./IProtection"; +-import { Mjolnir } from "../Mjolnir"; +-import * as nsfw from 'nsfwjs'; +-import {LogLevel} from "@vector-im/matrix-bot-sdk"; +-import { node } from '@tensorflow/tfjs-node'; +- +- +-export class NsfwProtection extends Protection { +- settings = {}; +- // @ts-ignore +- private model: any; +- +- constructor() { +- super(); +- } +- +- async initialize() { +- this.model = await nsfw.load(); +- } +- +- public get name(): string { +- return 'NsfwProtection'; +- } +- +- public get description(): string { +- return "Scans all images sent into a protected room to determine if the image is " + +- "NSFW. If it is, the image will automatically be redacted."; +- } +- +- public async handleEvent(mjolnir: Mjolnir, roomId: string, event: any): Promise { +- if (event['type'] === 'm.room.message') { +- let content = JSON.stringify(event['content']); +- if (!content.toLowerCase().includes("mxc")) { +- return; +- } +- // try and grab a human-readable alias for more helpful management room output +- const maybeAlias = await mjolnir.client.getPublishedAlias(roomId) +- const room = maybeAlias ? maybeAlias : roomId +- +- const mxcs = content.match(/(mxc?:\/\/[^\s'"]+)/gim); +- if (!mxcs) { +- //something's gone wrong with the regex +- await mjolnir.managementRoomOutput.logMessage(LogLevel.ERROR, "NSFWProtection", `Unable to find any mxcs in ${event["event_id"]} in ${room}`); +- return; +- } +- +- // @ts-ignore - see null check immediately above +- for (const mxc of mxcs) { +- const image = await mjolnir.client.downloadContent(mxc); +- const decodedImage = await node.decodeImage(image.data, 3); +- const predictions = await this.model.classify(decodedImage); +- +- +- for (const prediction of predictions) { +- if (["Hentai", "Porn"].includes(prediction["className"])) { +- if (prediction["probability"] > mjolnir.config.nsfwSensitivity) { +- try { +- await mjolnir.client.redactEvent(roomId, event["event_id"]); +- } catch (err) { +- await mjolnir.managementRoomOutput.logMessage(LogLevel.ERROR, "NSFWProtection", `There was an error redacting ${event["event_id"]} in ${room}: ${err}`); +- } +- let eventId = event["event_id"] +- let body = `Redacted an image in ${room} ${eventId}` +- let formatted_body = `

+- Redacted an image in ${room} +- 
${eventId}
${room}
+-                                                  
`
+-                            const msg = {
+-                                msgtype: "m.notice",
+-                                body: body,
+-                                format: "org.matrix.custom.html",
+-                                formatted_body: formatted_body
+-                            };
+-                            await mjolnir.client.sendMessage(mjolnir.managementRoomId, msg);
+-                            break
+-                        }
+-                    }
+-                }
+-                decodedImage.dispose();
+-            }
+-        }
+-    }
+-}
+\ No newline at end of file
+diff --git a/src/protections/ProtectionManager.ts b/src/protections/ProtectionManager.ts
+index 9b84318..67f10dc 100644
+--- a/src/protections/ProtectionManager.ts
++++ b/src/protections/ProtectionManager.ts
+@@ -31,7 +31,6 @@ import { htmlEscape } from "../utils";
+ import { ERROR_KIND_FATAL, ERROR_KIND_PERMISSION } from "../ErrorCache";
+ import { RoomUpdateError } from "../models/RoomUpdateError";
+ import { LocalAbuseReports } from "./LocalAbuseReports";
+-import {NsfwProtection} from "./NsfwProtection";
+ import { MentionSpam } from "./MentionSpam";
+ 
+ const PROTECTIONS: Protection[] = [
+@@ -44,7 +43,6 @@ const PROTECTIONS: Protection[] = [
+     new DetectFederationLag(),
+     new JoinWaveShortCircuit(),
+     new LocalAbuseReports(),
+-    new NsfwProtection(),
+     new MentionSpam()
+ ];
+ 
+@@ -104,9 +102,6 @@ export class ProtectionManager {
+             protection.settings[key].setValue(value);
+         }
+         if (protection.enabled) {
+-            if (protection.name === "NsfwProtection") {
+-                (protection as NsfwProtection).initialize();
+-            }
+             for (let roomId of this.mjolnir.protectedRoomsTracker.getProtectedRooms()) {
+                 await protection.startProtectingRoom(this.mjolnir, roomId);
+             }
+diff --git a/test/integration/nsfwProtectionTest.ts b/test/integration/nsfwProtectionTest.ts
+deleted file mode 100644
+index c86fd38..0000000
+--- a/test/integration/nsfwProtectionTest.ts
++++ /dev/null
+@@ -1,78 +0,0 @@
+-import {newTestUser} from "./clientHelper";
+-
+-import {MatrixClient} from "@vector-im/matrix-bot-sdk";
+-import {getFirstReaction} from "./commands/commandUtils";
+-import {strict as assert} from "assert";
+-import { readFileSync } from 'fs';
+-
+-describe("Test: NSFW protection", function () {
+-    let client: MatrixClient;
+-    let room: string;
+-    this.beforeEach(async function () {
+-        client = await newTestUser(this.config.homeserverUrl, {name: {contains: "nsfw-protection"}});
+-        await client.start();
+-        const mjolnirId = await this.mjolnir.client.getUserId();
+-        room = await client.createRoom({ invite: [mjolnirId] });
+-        await client.joinRoom(room);
+-        await client.joinRoom(this.config.managementRoom);
+-        await client.setUserPowerLevel(mjolnirId, room, 100);
+-    })
+-    this.afterEach(async function () {
+-        await client.stop();
+-    })
+-
+-    function delay(ms: number) {
+-        return new Promise(resolve => setTimeout(resolve, ms));
+-    }
+-
+-
+-    it("Nsfw protection doesn't redact sfw images", async function() {
+-        this.timeout(20000);
+-
+-        await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir rooms add ${room}` });
+-        await getFirstReaction(client, this.mjolnir.managementRoomId, '✅', async () => {
+-                return await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir enable NsfwProtection` });
+-        });
+-
+-        const data = readFileSync('test_tree.jpg');
+-        const mxc = await client.uploadContent(data, 'image/png');
+-        let content = {"msgtype": "m.image", "body": "test.jpeg", "url": mxc};
+-        let imageMessage = await client.sendMessage(room, content);
+-
+-        await delay(500);
+-        let processedImage = await client.getEvent(room, imageMessage);
+-        assert.equal(Object.keys(processedImage.content).length, 3, "This event should not have been redacted");
+-    });
+-
+-    it("Nsfw protection redacts nsfw images", async function() {
+-        this.timeout(20000);
+-        // dial the sensitivity on the protection way up so that all images are flagged as NSFW
+-        this.mjolnir.config.nsfwSensitivity = 0.0;
+-
+-        await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir rooms add ${room}` });
+-        await getFirstReaction(client, this.mjolnir.managementRoomId, '✅', async () => {
+-                return await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir enable NsfwProtection` });
+-        });
+-
+-        const data = readFileSync('test_tree.jpg');
+-        const mxc = await client.uploadContent(data, 'image/png');
+-        let content = {"msgtype": "m.image", "body": "test.jpeg", "url": mxc};
+-        let imageMessage = await client.sendMessage(room, content);
+-
+-        let formatted_body = ``
+-        let htmlContent = {
+-                                msgtype: "m.image",
+-                                body: formatted_body,
+-                                format: "org.matrix.custom.html",
+-                                formatted_body: formatted_body
+-                            };
+-        let htmlMessage = await client.sendMessage(room, htmlContent)
+-
+-        await delay(500);
+-        let processedImage = await client.getEvent(room, imageMessage);
+-        assert.equal(Object.keys(processedImage.content).length, 0, "This event should have been redacted");
+-
+-        let processedHtml = await client.getEvent(room, htmlMessage)
+-        assert.equal(Object.keys(processedHtml.content).length, 0, "This html image event should have been redacted")
+-    });
+-});
+\ No newline at end of file
diff --git a/pkgs/by-name/mj/mjolnir/package.json b/pkgs/by-name/mj/mjolnir/package.json
new file mode 100644
index 000000000000..fa276e8569a2
--- /dev/null
+++ b/pkgs/by-name/mj/mjolnir/package.json
@@ -0,0 +1,73 @@
+{
+  "name": "mjolnir",
+  "version": "1.8.3",
+  "description": "A moderation tool for Matrix",
+  "main": "lib/index.js",
+  "repository": "git@github.com:matrix-org/mjolnir.git",
+  "author": "The Matrix.org Foundation C.I.C.",
+  "license": "Apache-2.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc",
+    "postbuild": "rm -rf lib/test/ && cp -r lib/src/* lib/ && rm -rf lib/src/",
+    "lint": "tslint --project ./tsconfig.json -t stylish",
+    "start:dev": "yarn build && node --async-stack-traces lib/index.js",
+    "test": "ts-mocha --project ./tsconfig.json test/commands/**/*.ts",
+    "test:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json \"test/integration/**/*Test.ts\"",
+    "test:integration:single": "NODE_ENV=harness npx ts-mocha --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json",
+    "test:appservice:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"",
+    "test:appservice:integration:single": "NODE_ENV=harness npx ts-mocha --timeout 300000 --project ./tsconfig.json",
+    "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts",
+    "version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py"
+  },
+  "devDependencies": {
+    "@types/config": "^3.3.0",
+    "@types/crypto-js": "^4.0.2",
+    "@types/express": "^4.17.13",
+    "@types/html-to-text": "^8.0.1",
+    "@types/humanize-duration": "^3.27.1",
+    "@types/js-yaml": "^4.0.5",
+    "@types/jsdom": "^16.2.11",
+    "@types/mocha": "^9.0.0",
+    "@types/nedb": "^1.8.12",
+    "@types/node": "^18.0.0",
+    "@types/pg": "^8.6.5",
+    "@types/request": "^2.48.8",
+    "@types/shell-quote": "1.7.1",
+    "crypto-js": "^4.2.0",
+    "eslint": "^7.32",
+    "expect": "^27.0.6",
+    "mocha": "^9.0.1",
+    "ts-mocha": "^9.0.2",
+    "tslint": "^6.1.3",
+    "typescript": "^4.8.4",
+    "typescript-formatter": "^7.2"
+  },
+  "dependencies": {
+    "@sentry/node": "^7.17.2",
+    "@sentry/tracing": "^7.17.2",
+    "@tensorflow/tfjs-node": "^4.21.0",
+    "@vector-im/matrix-bot-sdk": "^0.7.1-element.6",
+    "await-lock": "^2.2.2",
+    "axios": "^1.7.6",
+    "body-parser": "^1.20.1",
+    "config": "^3.3.8",
+    "express": "^4.20",
+    "html-to-text": "^8.0.0",
+    "humanize-duration": "^3.27.1",
+    "humanize-duration-ts": "^2.1.1",
+    "js-yaml": "^4.1.0",
+    "jsdom": "^16.6.0",
+    "matrix-appservice-bridge": "10.3.1",
+    "nsfwjs": "^4.1.0",
+    "parse-duration": "^1.0.2",
+    "pg": "^8.8.0",
+    "prom-client": "^14.1.0",
+    "shell-quote": "^1.7.3",
+    "ulidx": "^0.3.0",
+    "yaml": "^2.2.2"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}
diff --git a/pkgs/by-name/mj/mjolnir/package.nix b/pkgs/by-name/mj/mjolnir/package.nix
new file mode 100644
index 000000000000..dd1404b4b5b4
--- /dev/null
+++ b/pkgs/by-name/mj/mjolnir/package.nix
@@ -0,0 +1,82 @@
+{ lib
+, mkYarnPackage
+, fetchFromGitHub
+, fetchYarnDeps
+, matrix-sdk-crypto-nodejs
+, makeWrapper
+, nodejs
+, nixosTests
+}:
+
+mkYarnPackage rec {
+  pname = "mjolnir";
+  version = "1.8.3";
+
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "mjolnir";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yD7QGsS2Em8Z95po9pGRUDmHgHe4z0j0Jnvy3IG7xKY=";
+  };
+
+  patches = [
+    # TODO: Fix tfjs-node dependency
+    ./001-disable-nsfwprotection.patch
+  ];
+
+  packageJSON = ./package.json;
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = src + "/yarn.lock";
+    hash = "sha256-05DqddK8+136Qq/JGeiITZkVJ8Dw9K9HfACKW86989U=";
+  };
+
+  packageResolutions = {
+    "@matrix-org/matrix-sdk-crypto-nodejs" = "${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pushd deps/${pname}
+    yarn run build
+    popd
+
+    runHook postBuild
+  '';
+
+  postInstall = ''
+    makeWrapper ${nodejs}/bin/node "$out/bin/mjolnir" \
+      --add-flags "$out/libexec/mjolnir/deps/mjolnir/lib/index.js"
+  '';
+
+  passthru = {
+    tests = {
+      inherit (nixosTests) mjolnir;
+    };
+  };
+
+  meta = with lib; {
+    description = "Moderation tool for Matrix";
+    homepage = "https://github.com/matrix-org/mjolnir";
+    longDescription = ''
+      As an all-in-one moderation tool, it can protect your server from
+      malicious invites, spam messages, and whatever else you don't want.
+      In addition to server-level protection, Mjolnir is great for communities
+      wanting to protect their rooms without having to use their personal
+      accounts for moderation.
+
+      The bot by default includes support for bans, redactions, anti-spam,
+      server ACLs, room directory changes, room alias transfers, account
+      deactivation, room shutdown, and more.
+
+      A Synapse module is also available to apply the same rulesets the bot
+      uses across an entire homeserver.
+    '';
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jojosch ];
+    mainProgram = "mjolnir";
+  };
+}
diff --git a/pkgs/tools/video/mjpegtools/c++-17-fixes.patch b/pkgs/by-name/mj/mjpegtools/c++-17-fixes.patch
similarity index 100%
rename from pkgs/tools/video/mjpegtools/c++-17-fixes.patch
rename to pkgs/by-name/mj/mjpegtools/c++-17-fixes.patch
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/by-name/mj/mjpegtools/package.nix
similarity index 100%
rename from pkgs/tools/video/mjpegtools/default.nix
rename to pkgs/by-name/mj/mjpegtools/package.nix
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/by-name/mj/mjpg-streamer/package.nix
similarity index 100%
rename from pkgs/applications/video/mjpg-streamer/default.nix
rename to pkgs/by-name/mj/mjpg-streamer/package.nix
diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/by-name/mk/mkcert/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/mkcert/default.nix
rename to pkgs/by-name/mk/mkcert/package.nix
diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/by-name/mk/mkclean/package.nix
similarity index 100%
rename from pkgs/applications/video/mkclean/default.nix
rename to pkgs/by-name/mk/mkclean/package.nix
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/by-name/mk/mkcue/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/mkcue/default.nix
rename to pkgs/by-name/mk/mkcue/package.nix
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
rename to pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/by-name/mk/mkl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/mkl/default.nix
rename to pkgs/by-name/mk/mkl/package.nix
diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/by-name/mk/mkl/test/default.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/mkl/test/default.nix
rename to pkgs/by-name/mk/mkl/test/default.nix
diff --git a/pkgs/development/libraries/science/math/mkl/test/test.c b/pkgs/by-name/mk/mkl/test/test.c
similarity index 100%
rename from pkgs/development/libraries/science/math/mkl/test/test.c
rename to pkgs/by-name/mk/mkl/test/test.c
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/by-name/mk/mkp224o/package.nix
similarity index 100%
rename from pkgs/tools/security/mkp224o/default.nix
rename to pkgs/by-name/mk/mkp224o/package.nix
diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/by-name/mk/mkrand/package.nix
similarity index 100%
rename from pkgs/tools/security/mkrand/default.nix
rename to pkgs/by-name/mk/mkrand/package.nix
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/by-name/mk/mktemp/package.nix
similarity index 100%
rename from pkgs/tools/security/mktemp/default.nix
rename to pkgs/by-name/mk/mktemp/package.nix
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/by-name/mk/mktorrent/package.nix
similarity index 100%
rename from pkgs/tools/misc/mktorrent/default.nix
rename to pkgs/by-name/mk/mktorrent/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/by-name/ml/mlarchive2maildir/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
rename to pkgs/by-name/ml/mlarchive2maildir/package.nix
diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/by-name/ml/mlc/package.nix
similarity index 100%
rename from pkgs/tools/system/mlc/default.nix
rename to pkgs/by-name/ml/mlc/package.nix
diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/by-name/ml/mle/package.nix
similarity index 100%
rename from pkgs/applications/editors/mle/default.nix
rename to pkgs/by-name/ml/mle/package.nix
diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/by-name/ml/mlflow-server/package.nix
similarity index 100%
rename from pkgs/servers/mlflow-server/default.nix
rename to pkgs/by-name/ml/mlflow-server/package.nix
diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/by-name/ml/mlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/mlib/default.nix
rename to pkgs/by-name/ml/mlib/package.nix
diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/by-name/ml/mlkit/package.nix
similarity index 100%
rename from pkgs/development/compilers/mlkit/default.nix
rename to pkgs/by-name/ml/mlkit/package.nix
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/by-name/ml/mlmmj/package.nix
similarity index 100%
rename from pkgs/servers/mail/mlmmj/default.nix
rename to pkgs/by-name/ml/mlmmj/package.nix
diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/by-name/ml/mloader/package.nix
similarity index 100%
rename from pkgs/tools/misc/mloader/default.nix
rename to pkgs/by-name/ml/mloader/package.nix
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/by-name/ml/mlocate/package.nix
similarity index 100%
rename from pkgs/tools/misc/mlocate/default.nix
rename to pkgs/by-name/ml/mlocate/package.nix
diff --git a/pkgs/applications/window-managers/mlvwm/default.nix b/pkgs/by-name/ml/mlvwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/mlvwm/default.nix
rename to pkgs/by-name/ml/mlvwm/package.nix
diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix
index 72b9f9cc3d23..16634879e2f3 100644
--- a/pkgs/by-name/ml/mlx42/package.nix
+++ b/pkgs/by-name/ml/mlx42/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   glfw,
-  darwin,
   enableShared ? !stdenv.hostPlatform.isStatic,
   enableDebug ? false,
 }:
@@ -33,16 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [ glfw ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        OpenGL
-        Cocoa
-        IOKit
-      ]
-    );
+  buildInputs = [ glfw ];
 
   cmakeFlags = [ (lib.cmakeBool "DEBUG" enableDebug) ];
 
diff --git a/pkgs/tools/misc/mlxbf-bootctl/default.nix b/pkgs/by-name/ml/mlxbf-bootctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/mlxbf-bootctl/default.nix
rename to pkgs/by-name/ml/mlxbf-bootctl/package.nix
diff --git a/pkgs/misc/mlxbf-bootimages/default.nix b/pkgs/by-name/ml/mlxbf-bootimages/package.nix
similarity index 100%
rename from pkgs/misc/mlxbf-bootimages/default.nix
rename to pkgs/by-name/ml/mlxbf-bootimages/package.nix
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/by-name/mm/MMA/package.nix
similarity index 100%
rename from pkgs/applications/audio/MMA/default.nix
rename to pkgs/by-name/mm/MMA/package.nix
diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/by-name/mm/mm-common/package.nix
similarity index 100%
rename from pkgs/development/libraries/mm-common/default.nix
rename to pkgs/by-name/mm/mm-common/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/by-name/mm/mm/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/mm/default.nix
rename to pkgs/by-name/mm/mm/package.nix
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/by-name/mm/mmake/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmake/default.nix
rename to pkgs/by-name/mm/mmake/package.nix
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/by-name/mm/mmark/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/mmark/default.nix
rename to pkgs/by-name/mm/mmark/package.nix
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/by-name/mm/mmc-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mmc-utils/default.nix
rename to pkgs/by-name/mm/mmc-utils/package.nix
diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/by-name/mm/mmctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmctl/default.nix
rename to pkgs/by-name/mm/mmctl/package.nix
diff --git a/pkgs/by-name/mm/mmdbctl/package.nix b/pkgs/by-name/mm/mmdbctl/package.nix
index ecd79f02e9c1..c91b82c2644a 100644
--- a/pkgs/by-name/mm/mmdbctl/package.nix
+++ b/pkgs/by-name/mm/mmdbctl/package.nix
@@ -38,8 +38,8 @@ buildGoModule rec {
 
   passthru.tests = {
     simple = runCommand "${pname}-test" { } ''
-      ${lib.getExe mmdbctl} verify ${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb | grep valid
-      ${lib.getExe mmdbctl} metadata ${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb | grep DBIP-Country-Lite
+      ${lib.getExe mmdbctl} verify ${dbip-country-lite.mmdb} | grep valid
+      ${lib.getExe mmdbctl} metadata ${dbip-country-lite.mmdb} | grep DBIP-Country-Lite
       touch $out
     '';
   };
diff --git a/pkgs/by-name/mm/mmdbinspect/package.nix b/pkgs/by-name/mm/mmdbinspect/package.nix
new file mode 100644
index 000000000000..ca0c32ad758d
--- /dev/null
+++ b/pkgs/by-name/mm/mmdbinspect/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "mmdbinspect";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "maxmind";
+    repo = "mmdbinspect";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-PYn+NgJDZBP+9nIU0kxg9KYT0EV35omagspcsCpa9DM=";
+    fetchSubmodules = true;
+  };
+
+  vendorHash = "sha256-HNgofsfMsqXttnrNDIPgLHag+2hqQTREomcesWldpMo=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Look up records for one or more IPs/networks in one or more .mmdb databases";
+    homepage = "https://github.com/maxmind/mmdbinspect";
+    changelog = "https://github.com/maxmind/mmdbinspect/blob/${src.rev}/CHANGELOG.md";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "mmdbinspect";
+  };
+}
diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/by-name/mm/mmdoc/package.nix
similarity index 100%
rename from pkgs/tools/text/mmdoc/default.nix
rename to pkgs/by-name/mm/mmdoc/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/by-name/mm/mmh/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mmh/default.nix
rename to pkgs/by-name/mm/mmh/package.nix
diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/by-name/mm/mmixware/package.nix
similarity index 100%
rename from pkgs/development/tools/mmixware/default.nix
rename to pkgs/by-name/mm/mmixware/package.nix
diff --git a/pkgs/tools/networking/mmsd-tng/default.nix b/pkgs/by-name/mm/mmsd-tng/package.nix
similarity index 100%
rename from pkgs/tools/networking/mmsd-tng/default.nix
rename to pkgs/by-name/mm/mmsd-tng/package.nix
diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/by-name/mm/mmsd/package.nix
similarity index 100%
rename from pkgs/tools/networking/mmsd/default.nix
rename to pkgs/by-name/mm/mmsd/package.nix
diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/by-name/mm/mmtc/package.nix
similarity index 100%
rename from pkgs/applications/audio/mmtc/default.nix
rename to pkgs/by-name/mm/mmtc/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/by-name/mm/mmtf-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix
rename to pkgs/by-name/mm/mmtf-cpp/package.nix
diff --git a/pkgs/tools/X11/mmutils/default.nix b/pkgs/by-name/mm/mmutils/package.nix
similarity index 100%
rename from pkgs/tools/X11/mmutils/default.nix
rename to pkgs/by-name/mm/mmutils/package.nix
diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/by-name/mm/mmv-go/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmv-go/default.nix
rename to pkgs/by-name/mm/mmv-go/package.nix
diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/by-name/mm/mmv/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmv/default.nix
rename to pkgs/by-name/mm/mmv/package.nix
diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/by-name/mn/mnamer/package.nix
similarity index 100%
rename from pkgs/applications/misc/mnamer/default.nix
rename to pkgs/by-name/mn/mnamer/package.nix
diff --git a/pkgs/applications/misc/mnamer/remove_requirements.patch b/pkgs/by-name/mn/mnamer/remove_requirements.patch
similarity index 100%
rename from pkgs/applications/misc/mnamer/remove_requirements.patch
rename to pkgs/by-name/mn/mnamer/remove_requirements.patch
diff --git a/pkgs/applications/misc/mnamer/update_hack.patch b/pkgs/by-name/mn/mnamer/update_hack.patch
similarity index 100%
rename from pkgs/applications/misc/mnamer/update_hack.patch
rename to pkgs/by-name/mn/mnamer/update_hack.patch
diff --git a/pkgs/by-name/mn/mnc/package.nix b/pkgs/by-name/mn/mnc/package.nix
new file mode 100644
index 000000000000..229600132aa9
--- /dev/null
+++ b/pkgs/by-name/mn/mnc/package.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromSourcehut
+}:
+
+buildGoModule rec {
+  pname = "mnc";
+  version = "0.5";
+
+  vendorHash = "sha256-H0KmGTWyjZOZLIEWophCwRYPeKLxBC050RI7cMXNbPs=";
+
+  src = fetchFromSourcehut {
+    owner = "~anjan";
+    repo = "mnc";
+    rev = version;
+    sha256 = "sha256-eCj7wmHxPF2j2x4yHKN7TE122TCv1++azgdoQArabBM=";
+  };
+
+  meta = with lib; {
+    description = "Opens the user's crontab and echos the time when the next cronjob will be ran";
+    homepage = "https://git.sr.ht/~anjan/mnc";
+    license = licenses.unlicense;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wentam ];
+    mainProgram = "mnc";
+  };
+}
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/by-name/mn/mnemonicode/package.nix
similarity index 100%
rename from pkgs/misc/mnemonicode/default.nix
rename to pkgs/by-name/mn/mnemonicode/package.nix
diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/by-name/mn/mni_autoreg/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/mni_autoreg/default.nix
rename to pkgs/by-name/mn/mni_autoreg/package.nix
diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/by-name/mn/mnist/package.nix
similarity index 100%
rename from pkgs/data/machine-learning/mnist/default.nix
rename to pkgs/by-name/mn/mnist/package.nix
diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/by-name/mn/mno16/package.nix
similarity index 100%
rename from pkgs/data/fonts/mno16/default.nix
rename to pkgs/by-name/mn/mno16/package.nix
diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/by-name/mo/moar/package.nix
similarity index 100%
rename from pkgs/tools/misc/moar/default.nix
rename to pkgs/by-name/mo/moar/package.nix
diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/by-name/mo/mob/package.nix
similarity index 100%
rename from pkgs/applications/misc/mob/default.nix
rename to pkgs/by-name/mo/mob/package.nix
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
similarity index 100%
rename from pkgs/data/misc/mobile-broadband-provider-info/default.nix
rename to pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/by-name/mo/mobilecoin-wallet/package.nix
similarity index 100%
rename from pkgs/applications/misc/mobilecoin-wallet/default.nix
rename to pkgs/by-name/mo/mobilecoin-wallet/package.nix
diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/by-name/mo/mockgen/package.nix
similarity index 100%
rename from pkgs/development/tools/mockgen/default.nix
rename to pkgs/by-name/mo/mockgen/package.nix
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/by-name/mo/mockobjects/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/mockobjects/default.nix
rename to pkgs/by-name/mo/mockobjects/package.nix
diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/by-name/mo/mockoon/package.nix
similarity index 100%
rename from pkgs/tools/networking/mockoon/default.nix
rename to pkgs/by-name/mo/mockoon/package.nix
diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/mod-arpeggiator-lv2/default.nix
rename to pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/by-name/mo/mod-distortion/package.nix
similarity index 100%
rename from pkgs/applications/audio/mod-distortion/default.nix
rename to pkgs/by-name/mo/mod-distortion/package.nix
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/by-name/mo/mod/package.nix
similarity index 100%
rename from pkgs/development/tools/mod/default.nix
rename to pkgs/by-name/mo/mod/package.nix
diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/by-name/mo/modd/package.nix
similarity index 100%
rename from pkgs/development/tools/modd/default.nix
rename to pkgs/by-name/mo/modd/package.nix
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/by-name/mo/modem-manager-gui/package.nix
similarity index 100%
rename from pkgs/applications/networking/modem-manager-gui/default.nix
rename to pkgs/by-name/mo/modem-manager-gui/package.nix
diff --git a/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch b/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
similarity index 100%
rename from pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch
rename to pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/by-name/mo/modemmanager/package.nix
similarity index 100%
rename from pkgs/tools/networking/modemmanager/default.nix
rename to pkgs/by-name/mo/modemmanager/package.nix
diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix
index 8f17cd3c9e7c..2e25bc8f0489 100644
--- a/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/pkgs/by-name/mo/modrinth-app/package.nix
@@ -48,7 +48,7 @@ symlinkJoin rec {
       xorg.libXxf86vm
 
       # lwjgl
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
 
       # narrator support
       flite
diff --git a/pkgs/tools/security/modsecurity-crs/default.nix b/pkgs/by-name/mo/modsecurity-crs/package.nix
similarity index 100%
rename from pkgs/tools/security/modsecurity-crs/default.nix
rename to pkgs/by-name/mo/modsecurity-crs/package.nix
diff --git a/pkgs/tools/security/modsecurity/Makefile.am.patch b/pkgs/by-name/mo/modsecurity_standalone/Makefile.am.patch
similarity index 100%
rename from pkgs/tools/security/modsecurity/Makefile.am.patch
rename to pkgs/by-name/mo/modsecurity_standalone/Makefile.am.patch
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix
similarity index 100%
rename from pkgs/tools/security/modsecurity/default.nix
rename to pkgs/by-name/mo/modsecurity_standalone/package.nix
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/mojave/default.nix
rename to pkgs/by-name/mo/mojave-gtk-theme/package.nix
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/by-name/mo/moka-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/moka-icon-theme/default.nix
rename to pkgs/by-name/mo/moka-icon-theme/package.nix
diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix
index 7d8d44d6c5c3..d1b14f45c289 100644
--- a/pkgs/by-name/mo/mokuro/package.nix
+++ b/pkgs/by-name/mo/mokuro/package.nix
@@ -17,12 +17,6 @@ python3Packages.buildPythonApplication rec {
     fetchSubmodules = true;
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-        --replace-fail 'opencv-python' 'opencv'
-  '';
-
-
   pythonRelaxDeps = [ "torchvision" ];
 
   build-system = with python3Packages; [ setuptools-scm ];
@@ -33,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     manga-ocr
     natsort
     numpy
-    opencv4
+    opencv-python
     pillow
     pyclipper
     requests
diff --git a/pkgs/tools/security/mokutil/default.nix b/pkgs/by-name/mo/mokutil/package.nix
similarity index 100%
rename from pkgs/tools/security/mokutil/default.nix
rename to pkgs/by-name/mo/mokutil/package.nix
diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/by-name/mo/molden/dont_register_file_types.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
rename to pkgs/by-name/mo/molden/dont_register_file_types.patch
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/by-name/mo/molden/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/molden/default.nix
rename to pkgs/by-name/mo/molden/package.nix
diff --git a/pkgs/tools/networking/mole/default.nix b/pkgs/by-name/mo/mole/package.nix
similarity index 100%
rename from pkgs/tools/networking/mole/default.nix
rename to pkgs/by-name/mo/mole/package.nix
diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/by-name/mo/molly-brown/package.nix
similarity index 100%
rename from pkgs/servers/gemini/molly-brown/default.nix
rename to pkgs/by-name/mo/molly-brown/package.nix
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/by-name/mo/molly-guard/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/molly-guard/default.nix
rename to pkgs/by-name/mo/molly-guard/package.nix
diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/by-name/mo/molot-lite/package.nix
similarity index 100%
rename from pkgs/applications/audio/molot-lite/default.nix
rename to pkgs/by-name/mo/molot-lite/package.nix
diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/by-name/mo/molotov/package.nix
similarity index 100%
rename from pkgs/applications/video/molotov/default.nix
rename to pkgs/by-name/mo/molotov/package.nix
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/by-name/mo/moltengamepad/package.nix
similarity index 100%
rename from pkgs/misc/drivers/moltengamepad/default.nix
rename to pkgs/by-name/mo/moltengamepad/package.nix
diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
new file mode 100644
index 000000000000..72c59cb3dc91
--- /dev/null
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -0,0 +1,215 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch2,
+  gitUpdater,
+  apple-sdk_15,
+  darwinMinVersionHook,
+  cereal,
+  libcxx,
+  glslang,
+  spirv-cross,
+  spirv-headers,
+  spirv-tools,
+  vulkan-headers,
+  xcbuildHook,
+  enableStatic ? stdenv.hostPlatform.isStatic,
+  # MoltenVK supports using private APIs to implement some Vulkan functionality.
+  # Applications that use private APIs can’t be distributed on the App Store,
+  # but that’s not really a concern for nixpkgs, so use them by default.
+  # See: https://github.com/KhronosGroup/MoltenVK/blob/main/README.md#metal_private_api
+  enablePrivateAPIUsage ? true,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "MoltenVK";
+  version = "1.2.11";
+
+  strictDeps = true;
+
+  buildInputs = [
+    apple-sdk_15
+    cereal
+    (darwinMinVersionHook "10.15")
+    glslang
+    spirv-cross
+    spirv-headers
+    spirv-tools
+    vulkan-headers
+  ];
+
+  nativeBuildInputs = [ xcbuildHook ];
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "MoltenVK";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-24qQnJ0RnJP2M4zSlSlQ4c4dVZtHutNiCvjrsCDw6wY=";
+  };
+
+  patches = [
+    # Cherry-pick patch to fix build failure due to a hardcoded SPIRV-Cross namespace.
+    # This can be dropped for MoltenVK 1.2.12.
+    (fetchpatch2 {
+      url = "https://github.com/KhronosGroup/MoltenVK/commit/856c8237ac3b32178caae3408effc35bedfdffa1.patch?full_index=1";
+      hash = "sha256-dVTop8sU19Swdb3ajbI+6S715NaxTqd7d0yQ/FDqxqY=";
+    })
+  ];
+
+  postPatch = ''
+    # Move `mvkGitRevDerived.h` to a stable location
+    substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
+      --replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
+      --replace-fail '$(git rev-parse HEAD)' ${finalAttrs.src.rev}
+
+    # Modify MoltenVK Xcode projects to build with xcbuild and dependencies from nixpkgs.
+    for proj in MoltenVK MoltenVKShaderConverter; do
+      # Remove xcframework dependencies from the Xcode projects. The basic format is:
+      #     (children|files) = (
+      #         DCFD7F822A45BDA0007BBBF7 /* SPIRVCross.xcframework in Frameworks */,
+      #         etc
+      #     )
+      # This regex will only remove lines matching `xcframework` that are in these blocks
+      # to avoid accidentally corrupting the project.
+      sed -E -e '/(children|files) = /,/;/{/xcframework/d}' \
+        -i "$proj/$proj.xcodeproj/project.pbxproj"
+      # Ensure the namespace used is consistent with the spirv-cross package in nixpkgs.
+      substituteInPlace "$proj/$proj.xcodeproj/project.pbxproj" \
+        --replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
+    done
+    substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \
+      --replace-fail MetalGLShaderConverterTool MoltenVKShaderConverter \
+      --replace-fail MetalGLShaderConverter-macOS MoltenVKShaderConverter
+
+    # Don’t try to build `xcframework`s because `xcbuild` can’t build them.
+    sed -e '/xcframework/d' -i Scripts/package_all.sh
+
+    # Remove vendored dependency links.
+    find . -lname '*/External/*' -delete
+
+    # The library will be linked in the install phase regardless of version,
+    # so truncate it if it exists to avoid link failures.
+    test -f Scripts/create_dylib.sh && truncate --size 0 Scripts/create_dylib.sh
+
+    # Link glslang source because MoltenVK needs non-public headers to build.
+    mkdir -p build/include
+    ln -s "${glslang.src}" "build/include/glslang"
+  '';
+
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-isystem ${lib.getDev libcxx}/include/c++/v1"
+      "-I${lib.getDev spirv-cross}/include/spirv_cross"
+      "-I${lib.getDev spirv-headers}/include/spirv/unified1"
+
+      # MoltenVK prints a lot of verbose output to the console out of
+      # the box; we adjust this to match Homebrew’s default log level.
+      "-DMVK_CONFIG_LOG_LEVEL=MVK_CONFIG_LOG_LEVEL_NONE"
+    ]
+    ++ lib.optional enablePrivateAPIUsage "-DMVK_USE_METAL_PRIVATE_API=1"
+  );
+
+  env.NIX_LDFLAGS = toString [
+    "-lglslang"
+    "-lSPIRV"
+    "-lSPIRV-Tools"
+    "-lSPIRV-Tools-opt"
+    "-lspirv-cross-msl"
+    "-lspirv-cross-core"
+    "-lspirv-cross-glsl"
+    "-lspirv-cross-reflect"
+  ];
+
+  preBuild = ''
+    NIX_CFLAGS_COMPILE+=" \
+      -I$NIX_BUILD_TOP/$sourceRoot/build/include \
+      -I$NIX_BUILD_TOP/$sourceRoot/Common"
+  '';
+
+  xcbuildFlags = [
+    "-configuration"
+    "Release"
+    "-project"
+    "MoltenVKPackaging.xcodeproj"
+    "-scheme"
+    "MoltenVK Package (macOS only)"
+    "-destination"
+    "generic/platform=macOS"
+    "-arch"
+    stdenv.hostPlatform.darwinArch
+  ];
+
+  postBuild =
+    if enableStatic then
+      ''
+        mkdir -p Package/Release/MoltenVK/static
+        cp Products/Release/libMoltenVK.a Package/Release/MoltenVK/static
+      ''
+    else
+      ''
+        # MoltenVK’s Xcode project builds the dylib, but it doesn’t seem to work with
+        # xcbuild. This is based on the script versions prior to 1.2.8 used.
+        mkdir -p Package/Release/MoltenVK/dynamic/dylib
+        clang++ -Wl,-all_load -Wl,-w \
+          -dynamiclib \
+          -compatibility_version 1.0.0 -current_version 1.0.0 \
+          -LProducts/Release \
+          -framework AppKit \
+          -framework CoreGraphics \
+          -framework Foundation \
+          -framework IOKit \
+          -framework IOSurface \
+          -framework Metal \
+          -framework QuartzCore \
+          -lobjc \
+          -lMoltenVKShaderConverter \
+          -lspirv-cross-reflect \
+          -install_name "$out/lib/libMoltenVK.dylib" \
+          -o Package/Release/MoltenVK/dynamic/dylib/libMoltenVK.dylib \
+          -force_load Products/Release/libMoltenVK.a
+      '';
+
+  installPhase = ''
+    runHook preInstall
+
+    libraryExtension=${if enableStatic then ".a" else ".dylib"}
+    packagePath=${if enableStatic then "static" else "dynamic/dylib"}
+
+    mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev"
+
+    cp Package/Release/MoltenVKShaderConverter/Tools/MoltenVKShaderConverter "$bin/bin"
+    cp -r Package/Release/MoltenVK/include "$dev"
+    cp Package/Release/MoltenVK/$packagePath/libMoltenVK$libraryExtension "$out/lib"
+
+    # Install ICD definition for use with vulkan-loader.
+    install -m644 MoltenVK/icd/MoltenVK_icd.json \
+      "$out/share/vulkan/icd.d/MoltenVK_icd.json"
+    substituteInPlace "$out/share/vulkan/icd.d/MoltenVK_icd.json" \
+      --replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
+
+    runHook postInstall
+  '';
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+    ignoredVersions = ".*-(beta|rc).*";
+  };
+
+  meta = {
+    description = "Vulkan Portability implementation built on top of Apple’s Metal API";
+    homepage = "https://github.com/KhronosGroup/MoltenVK";
+    changelog = "https://github.com/KhronosGroup/MoltenVK/releases";
+    maintainers = [ lib.maintainers.reckenrode ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix
index b36b4cd59a43..94eef3139754 100644
--- a/pkgs/by-name/mo/mommy/package.nix
+++ b/pkgs/by-name/mo/mommy/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mommy";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "FWDekker";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-kNhoEIzrPjCe6RA/GHFB/NtKjYFByM5TpxAwCLo5TDo=";
+    hash = "sha256-RgneMpxUDMjfo1nVJpqCDaEAs3FRum4dWe8dNF9CCTo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/by-name/mo/mona-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/mona-sans/default.nix
rename to pkgs/by-name/mo/mona-sans/package.nix
diff --git a/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch b/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch
new file mode 100644
index 000000000000..60784fc7ec9d
--- /dev/null
+++ b/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9a1b56..9a07e69 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,7 @@ generate_vulkan_api_layer_manifest_at_install(
+ 	RELATIVE_LAYER_DIR ${LAYER_INSTALLDIR}
+ 	DESTINATION ${CMAKE_INSTALL_DATADIR}/vulkan/implicit_layer.d
+ 	COMPONENT vulkan_layer
++	ABSOLUTE_LAYER_PATH
+ 	)
+ 
+ set(CPACK_COMPONENT_vulkan_layer_DISPLAY_NAME "Timeline Semaphore Vulkan Implicit Layer")
diff --git a/pkgs/by-name/mo/monado-vulkan-layers/package.nix b/pkgs/by-name/mo/monado-vulkan-layers/package.nix
new file mode 100644
index 000000000000..820a07d5d9b2
--- /dev/null
+++ b/pkgs/by-name/mo/monado-vulkan-layers/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  cmake,
+  vulkan-headers,
+  vulkan-loader,
+}:
+stdenv.mkDerivation {
+  pname = "monado-vulkan-layers";
+  version = "0-unstable-2024-02-21";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "monado";
+    repo = "utilities/vulkan-layers";
+    rev = "ae43cdcbd25c56e3481bbc8a0ce2bfcebba9f7c2";
+    sha256 = "sha256-QabYVKcenW+LQ+QSjUoQOLOQAVHdjE0YXd+1WsdzNPc=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    vulkan-headers
+    vulkan-loader
+  ];
+
+  patches = [
+    ./absolute-layer-path.patch
+  ];
+
+  meta = with lib; {
+    description = "Vulkan Layers for Monado";
+    homepage = "https://gitlab.freedesktop.org/monado/utilities/vulkan-layers";
+    platforms = platforms.linux;
+    license = licenses.boost;
+    maintainers = with maintainers; [
+      Scrumplex
+      passivelemon
+    ];
+  };
+}
diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index 84719a4fa8be..f65a83c3d601 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open source XR runtime";
     homepage = "https://monado.freedesktop.org/";
     license = licenses.boost;
-    maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ];
+    maintainers = with maintainers; [ Scrumplex prusnak ];
     platforms = platforms.linux;
     mainProgram = "monado-cli";
   };
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/by-name/mo/monetdb/package.nix
similarity index 100%
rename from pkgs/servers/sql/monetdb/default.nix
rename to pkgs/by-name/mo/monetdb/package.nix
diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix
index a5e897db2ec7..636584a20fe0 100644
--- a/pkgs/by-name/mo/moneydance/package.nix
+++ b/pkgs/by-name/mo/moneydance/package.nix
@@ -1,9 +1,7 @@
-{ lib, stdenv, fetchzip, makeWrapper, openjdk22, openjfx22, jvmFlags ? [ ] }:
+{ lib, stdenv, fetchzip, makeWrapper, openjdk23, jvmFlags ? [ ] }:
 let
-  openjfx = openjfx22;
-  jdk = openjdk22.override {
+  jdk = openjdk23.override {
     enableJavaFX = true;
-    inherit openjfx;
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ jdk openjfx ];
+  buildInputs = [ jdk ];
 
   # Note the double escaping in the call to makeWrapper. The escapeShellArgs
   # call quotes each element of the flags list as a word[1] and returns a
diff --git a/pkgs/tools/security/mongoaudit/default.nix b/pkgs/by-name/mo/mongoaudit/package.nix
similarity index 100%
rename from pkgs/tools/security/mongoaudit/default.nix
rename to pkgs/by-name/mo/mongoaudit/package.nix
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index a7ee195c9874..3b7802b8178a 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl.dev
     openssl.dev
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/mongodb-tools/default.nix
rename to pkgs/by-name/mo/mongodb-tools/package.nix
diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/by-name/mo/mongoose/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/mongoose/default.nix
rename to pkgs/by-name/mo/mongoose/package.nix
diff --git a/pkgs/by-name/mo/mongosh/package-lock.json b/pkgs/by-name/mo/mongosh/package-lock.json
index 67c8f25377d1..6e51eca9d050 100644
--- a/pkgs/by-name/mo/mongosh/package-lock.json
+++ b/pkgs/by-name/mo/mongosh/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "mongosh",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mongosh",
-      "version": "2.3.2",
+      "version": "2.3.3",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mongosh/cli-repl": "2.3.2"
+        "@mongosh/cli-repl": "2.3.3"
       },
       "bin": {
         "mongosh": "bin/mongosh.js"
@@ -157,26 +157,26 @@
       }
     },
     "node_modules/@aws-sdk/client-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.682.0.tgz",
+      "integrity": "sha512-BD8PPPk3+ZzFqCJSPraoXkgRcPTtjguXtyDYsyBMzFofWmN4YeswXSavZVAC354W98mkffDaXBvieyqu1Y9fKA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.670.0",
-        "@aws-sdk/client-sts": "3.670.0",
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/credential-provider-node": "3.670.0",
-        "@aws-sdk/middleware-host-header": "3.667.0",
-        "@aws-sdk/middleware-logger": "3.667.0",
-        "@aws-sdk/middleware-recursion-detection": "3.667.0",
-        "@aws-sdk/middleware-user-agent": "3.669.0",
-        "@aws-sdk/region-config-resolver": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
-        "@aws-sdk/util-endpoints": "3.667.0",
-        "@aws-sdk/util-user-agent-browser": "3.670.0",
-        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@aws-sdk/client-sso-oidc": "3.682.0",
+        "@aws-sdk/client-sts": "3.682.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/credential-provider-node": "3.682.0",
+        "@aws-sdk/middleware-host-header": "3.679.0",
+        "@aws-sdk/middleware-logger": "3.679.0",
+        "@aws-sdk/middleware-recursion-detection": "3.679.0",
+        "@aws-sdk/middleware-user-agent": "3.682.0",
+        "@aws-sdk/region-config-resolver": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
+        "@aws-sdk/util-endpoints": "3.679.0",
+        "@aws-sdk/util-user-agent-browser": "3.679.0",
+        "@aws-sdk/util-user-agent-node": "3.682.0",
         "@smithy/config-resolver": "^3.0.9",
         "@smithy/core": "^2.4.8",
         "@smithy/fetch-http-handler": "^3.2.9",
@@ -209,23 +209,23 @@
       }
     },
     "node_modules/@aws-sdk/client-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
-      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz",
+      "integrity": "sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/middleware-host-header": "3.667.0",
-        "@aws-sdk/middleware-logger": "3.667.0",
-        "@aws-sdk/middleware-recursion-detection": "3.667.0",
-        "@aws-sdk/middleware-user-agent": "3.669.0",
-        "@aws-sdk/region-config-resolver": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
-        "@aws-sdk/util-endpoints": "3.667.0",
-        "@aws-sdk/util-user-agent-browser": "3.670.0",
-        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/middleware-host-header": "3.679.0",
+        "@aws-sdk/middleware-logger": "3.679.0",
+        "@aws-sdk/middleware-recursion-detection": "3.679.0",
+        "@aws-sdk/middleware-user-agent": "3.682.0",
+        "@aws-sdk/region-config-resolver": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
+        "@aws-sdk/util-endpoints": "3.679.0",
+        "@aws-sdk/util-user-agent-browser": "3.679.0",
+        "@aws-sdk/util-user-agent-node": "3.682.0",
         "@smithy/config-resolver": "^3.0.9",
         "@smithy/core": "^2.4.8",
         "@smithy/fetch-http-handler": "^3.2.9",
@@ -258,24 +258,24 @@
       }
     },
     "node_modules/@aws-sdk/client-sso-oidc": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
-      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz",
+      "integrity": "sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/credential-provider-node": "3.670.0",
-        "@aws-sdk/middleware-host-header": "3.667.0",
-        "@aws-sdk/middleware-logger": "3.667.0",
-        "@aws-sdk/middleware-recursion-detection": "3.667.0",
-        "@aws-sdk/middleware-user-agent": "3.669.0",
-        "@aws-sdk/region-config-resolver": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
-        "@aws-sdk/util-endpoints": "3.667.0",
-        "@aws-sdk/util-user-agent-browser": "3.670.0",
-        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/credential-provider-node": "3.682.0",
+        "@aws-sdk/middleware-host-header": "3.679.0",
+        "@aws-sdk/middleware-logger": "3.679.0",
+        "@aws-sdk/middleware-recursion-detection": "3.679.0",
+        "@aws-sdk/middleware-user-agent": "3.682.0",
+        "@aws-sdk/region-config-resolver": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
+        "@aws-sdk/util-endpoints": "3.679.0",
+        "@aws-sdk/util-user-agent-browser": "3.679.0",
+        "@aws-sdk/util-user-agent-node": "3.682.0",
         "@smithy/config-resolver": "^3.0.9",
         "@smithy/core": "^2.4.8",
         "@smithy/fetch-http-handler": "^3.2.9",
@@ -307,29 +307,29 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.670.0"
+        "@aws-sdk/client-sts": "^3.682.0"
       }
     },
     "node_modules/@aws-sdk/client-sts": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
-      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz",
+      "integrity": "sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.670.0",
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/credential-provider-node": "3.670.0",
-        "@aws-sdk/middleware-host-header": "3.667.0",
-        "@aws-sdk/middleware-logger": "3.667.0",
-        "@aws-sdk/middleware-recursion-detection": "3.667.0",
-        "@aws-sdk/middleware-user-agent": "3.669.0",
-        "@aws-sdk/region-config-resolver": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
-        "@aws-sdk/util-endpoints": "3.667.0",
-        "@aws-sdk/util-user-agent-browser": "3.670.0",
-        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@aws-sdk/client-sso-oidc": "3.682.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/credential-provider-node": "3.682.0",
+        "@aws-sdk/middleware-host-header": "3.679.0",
+        "@aws-sdk/middleware-logger": "3.679.0",
+        "@aws-sdk/middleware-recursion-detection": "3.679.0",
+        "@aws-sdk/middleware-user-agent": "3.682.0",
+        "@aws-sdk/region-config-resolver": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
+        "@aws-sdk/util-endpoints": "3.679.0",
+        "@aws-sdk/util-user-agent-browser": "3.679.0",
+        "@aws-sdk/util-user-agent-node": "3.682.0",
         "@smithy/config-resolver": "^3.0.9",
         "@smithy/core": "^2.4.8",
         "@smithy/fetch-http-handler": "^3.2.9",
@@ -362,12 +362,12 @@
       }
     },
     "node_modules/@aws-sdk/core": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
-      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz",
+      "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/core": "^2.4.8",
         "@smithy/node-config-provider": "^3.1.8",
         "@smithy/property-provider": "^3.1.7",
@@ -384,13 +384,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.682.0.tgz",
+      "integrity": "sha512-V+y4qUQtc0kTnNR7u5LwnZn8EZk2pjdNX+84MwD9VjXekqbXikADu06Mj93kVGVW+qgqtNMvJ8PpiI3EaaxC7A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/client-cognito-identity": "3.670.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/client-cognito-identity": "3.682.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
@@ -400,13 +400,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-env": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
-      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz",
+      "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
@@ -416,13 +416,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-http": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
-      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz",
+      "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/fetch-http-handler": "^3.2.9",
         "@smithy/node-http-handler": "^3.2.4",
         "@smithy/property-provider": "^3.1.7",
@@ -437,18 +437,18 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
-      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz",
+      "integrity": "sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/credential-provider-env": "3.667.0",
-        "@aws-sdk/credential-provider-http": "3.667.0",
-        "@aws-sdk/credential-provider-process": "3.667.0",
-        "@aws-sdk/credential-provider-sso": "3.670.0",
-        "@aws-sdk/credential-provider-web-identity": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/credential-provider-env": "3.679.0",
+        "@aws-sdk/credential-provider-http": "3.679.0",
+        "@aws-sdk/credential-provider-process": "3.679.0",
+        "@aws-sdk/credential-provider-sso": "3.682.0",
+        "@aws-sdk/credential-provider-web-identity": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/credential-provider-imds": "^3.2.4",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/shared-ini-file-loader": "^3.1.8",
@@ -459,22 +459,22 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.670.0"
+        "@aws-sdk/client-sts": "^3.682.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
-      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz",
+      "integrity": "sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/credential-provider-env": "3.667.0",
-        "@aws-sdk/credential-provider-http": "3.667.0",
-        "@aws-sdk/credential-provider-ini": "3.670.0",
-        "@aws-sdk/credential-provider-process": "3.667.0",
-        "@aws-sdk/credential-provider-sso": "3.670.0",
-        "@aws-sdk/credential-provider-web-identity": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/credential-provider-env": "3.679.0",
+        "@aws-sdk/credential-provider-http": "3.679.0",
+        "@aws-sdk/credential-provider-ini": "3.682.0",
+        "@aws-sdk/credential-provider-process": "3.679.0",
+        "@aws-sdk/credential-provider-sso": "3.682.0",
+        "@aws-sdk/credential-provider-web-identity": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/credential-provider-imds": "^3.2.4",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/shared-ini-file-loader": "^3.1.8",
@@ -486,13 +486,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-process": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
-      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz",
+      "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/shared-ini-file-loader": "^3.1.8",
         "@smithy/types": "^3.5.0",
@@ -503,15 +503,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
-      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz",
+      "integrity": "sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/client-sso": "3.670.0",
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/token-providers": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/client-sso": "3.682.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/token-providers": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/shared-ini-file-loader": "^3.1.8",
         "@smithy/types": "^3.5.0",
@@ -522,13 +522,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-web-identity": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
-      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz",
+      "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
@@ -537,28 +537,28 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.667.0"
+        "@aws-sdk/client-sts": "^3.679.0"
       }
     },
     "node_modules/@aws-sdk/credential-providers": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
-      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.682.0.tgz",
+      "integrity": "sha512-vLBdUlTISEXVKYFFO665ajC0U0RdXFx21fwTHiN2g4edFH++di2XCJ8/Y34bu09z9bV/rwFT2jn41iAVWasNKg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/client-cognito-identity": "3.670.0",
-        "@aws-sdk/client-sso": "3.670.0",
-        "@aws-sdk/client-sts": "3.670.0",
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/credential-provider-cognito-identity": "3.670.0",
-        "@aws-sdk/credential-provider-env": "3.667.0",
-        "@aws-sdk/credential-provider-http": "3.667.0",
-        "@aws-sdk/credential-provider-ini": "3.670.0",
-        "@aws-sdk/credential-provider-node": "3.670.0",
-        "@aws-sdk/credential-provider-process": "3.667.0",
-        "@aws-sdk/credential-provider-sso": "3.670.0",
-        "@aws-sdk/credential-provider-web-identity": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/client-cognito-identity": "3.682.0",
+        "@aws-sdk/client-sso": "3.682.0",
+        "@aws-sdk/client-sts": "3.682.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/credential-provider-cognito-identity": "3.682.0",
+        "@aws-sdk/credential-provider-env": "3.679.0",
+        "@aws-sdk/credential-provider-http": "3.679.0",
+        "@aws-sdk/credential-provider-ini": "3.682.0",
+        "@aws-sdk/credential-provider-node": "3.682.0",
+        "@aws-sdk/credential-provider-process": "3.679.0",
+        "@aws-sdk/credential-provider-sso": "3.682.0",
+        "@aws-sdk/credential-provider-web-identity": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/credential-provider-imds": "^3.2.4",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/types": "^3.5.0",
@@ -569,12 +569,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
-      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz",
+      "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/protocol-http": "^4.1.4",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
@@ -584,12 +584,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
-      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz",
+      "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
       },
@@ -598,12 +598,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
-      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz",
+      "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/protocol-http": "^4.1.4",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
@@ -613,14 +613,14 @@
       }
     },
     "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
-      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz",
+      "integrity": "sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "3.667.0",
-        "@aws-sdk/types": "3.667.0",
-        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/core": "3.679.0",
+        "@aws-sdk/types": "3.679.0",
+        "@aws-sdk/util-endpoints": "3.679.0",
         "@smithy/core": "^2.4.8",
         "@smithy/protocol-http": "^4.1.4",
         "@smithy/types": "^3.5.0",
@@ -631,12 +631,12 @@
       }
     },
     "node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
-      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz",
+      "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/node-config-provider": "^3.1.8",
         "@smithy/types": "^3.5.0",
         "@smithy/util-config-provider": "^3.0.0",
@@ -648,12 +648,12 @@
       }
     },
     "node_modules/@aws-sdk/token-providers": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
-      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz",
+      "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/property-provider": "^3.1.7",
         "@smithy/shared-ini-file-loader": "^3.1.8",
         "@smithy/types": "^3.5.0",
@@ -663,13 +663,13 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-sso-oidc": "^3.667.0"
+        "@aws-sdk/client-sso-oidc": "^3.679.0"
       }
     },
     "node_modules/@aws-sdk/types": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
-      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz",
+      "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^3.5.0",
@@ -680,12 +680,12 @@
       }
     },
     "node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
-      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz",
+      "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/types": "^3.5.0",
         "@smithy/util-endpoints": "^2.1.3",
         "tslib": "^2.6.2"
@@ -695,9 +695,9 @@
       }
     },
     "node_modules/@aws-sdk/util-locate-window": {
-      "version": "3.568.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
-      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz",
+      "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -707,25 +707,25 @@
       }
     },
     "node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
-      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A==",
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz",
+      "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/types": "^3.5.0",
         "bowser": "^2.11.0",
         "tslib": "^2.6.2"
       }
     },
     "node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
-      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA==",
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz",
+      "integrity": "sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "3.669.0",
-        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.682.0",
+        "@aws-sdk/types": "3.679.0",
         "@smithy/node-config-provider": "^3.1.8",
         "@smithy/types": "^3.5.0",
         "tslib": "^2.6.2"
@@ -743,12 +743,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -756,30 +757,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
-      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz",
-      "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+      "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helpers": "^7.25.7",
-        "@babel/parser": "^7.25.8",
-        "@babel/template": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.8",
+        "@babel/code-frame": "^7.26.0",
+        "@babel/generator": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.0",
+        "@babel/parser": "^7.26.0",
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -804,12 +805,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7",
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -819,13 +821,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
-      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -859,28 +861,27 @@
       "license": "ISC"
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
-      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
-      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -890,89 +891,61 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
-      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
-      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz",
-      "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.8"
+        "@babel/types": "^7.26.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -982,12 +955,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
-      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -997,12 +970,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
-      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1012,12 +985,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
-      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1027,30 +1000,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.25.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1059,14 +1032,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1201,9 +1173,9 @@
       }
     },
     "node_modules/@mongodb-js/devtools-connect": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.1.tgz",
-      "integrity": "sha512-z9TJtUbDakYBKEB+/7fmBjFRcMCtiK/fIi04BKBs8cv71KmbS+PU76y6/7rE/TQucQ7/mPEhWs7+Z9TuKHR20A==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.2.tgz",
+      "integrity": "sha512-nrl6QL0c4OUX0ov1lceDalOttlsN56ST6A0lBXkhce7aDjYl5Q1+OR06C9npKOgw7QNOFzgCgNRgsd+e7kM2+Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/devtools-proxy-support": "^0.4.1",
@@ -1294,13 +1266,13 @@
       }
     },
     "node_modules/@mongosh/arg-parser": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.2.tgz",
-      "integrity": "sha512-izy830Jvg1HxP7LnE68dhKvrhIALOCBf/GDI8egJZNfRcvR1VuzaquFhHyFtvhGeoqo+j9ujbaM/24v12+LLFg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.3.tgz",
+      "integrity": "sha512-CfRB87Tia64CaaxthfQazD3AlEVSXL8UlDvXdiIyMd2LorjSKZ505u1/eO2bEecRUY2TNk724HnQ7TVl8L78QA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mongosh/errors": "2.3.2",
-        "@mongosh/i18n": "2.3.2",
+        "@mongosh/errors": "2.3.3",
+        "@mongosh/i18n": "2.3.3",
         "mongodb-connection-string-url": "^3.0.1"
       },
       "engines": {
@@ -1308,9 +1280,9 @@
       }
     },
     "node_modules/@mongosh/async-rewriter2": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.2.tgz",
-      "integrity": "sha512-VhqTUpv3q+Q/2kyOY37RrHaLyOnxTFyBqGz+wmaS9kADorsVTa6DuIO9GF+JLomVzdyFuIW3uaoNYbwq+mnPCA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.3.tgz",
+      "integrity": "sha512-JWIQ0Uz5tm5Q7wJnXJMcCFK9G688YCXV6Z929Kwpel7GmAy3B3mvgY5p33sM2ysukcjIZL6g4nRuJ5LkeVJniw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.22.8",
@@ -1327,13 +1299,13 @@
       }
     },
     "node_modules/@mongosh/autocomplete": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.2.tgz",
-      "integrity": "sha512-bpqG9A/O9ILP0vdwEZwV0Wc0T+LzcyqnWx1RWrC3XvUqMz1kfj5IJNK6RI1D7WuueWfi+HF+GAkz4kLNfFkgrg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.3.tgz",
+      "integrity": "sha512-MtY9nPO+CTQeozjbUnTWYrH7DnvNEzp4lHdviHuf9mGzFlrtel+9WzyntzRTVxR+Zy5oMK5SZewY43Z8GCjpAg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/mongodb-constants": "^0.10.1",
-        "@mongosh/shell-api": "2.3.2",
+        "@mongosh/shell-api": "2.3.3",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -1341,26 +1313,26 @@
       }
     },
     "node_modules/@mongosh/cli-repl": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.2.tgz",
-      "integrity": "sha512-uiadUiZebVKYMuUPbtw8JiD2CiSuht28+Fk9DMD+ktYBKfoA8fF4pjqVvO0HVkEWIJaDZXCMiQXwgOc3L65BTw==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.3.tgz",
+      "integrity": "sha512-xQpgweCyWHL3YRhLneHeASBO7RhVo+WsMp1nkXazZotrs0RYRLXGsGMjvXv8/vbA79aomicVY/oV6Nl5LhZ4Ew==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/devtools-proxy-support": "^0.4.1",
-        "@mongosh/arg-parser": "2.3.2",
-        "@mongosh/autocomplete": "2.3.2",
-        "@mongosh/editor": "2.3.2",
-        "@mongosh/errors": "2.3.2",
-        "@mongosh/history": "2.3.2",
-        "@mongosh/i18n": "2.3.2",
-        "@mongosh/js-multiline-to-singleline": "2.3.2",
-        "@mongosh/logging": "2.3.2",
-        "@mongosh/service-provider-core": "2.3.2",
-        "@mongosh/service-provider-server": "2.3.2",
-        "@mongosh/shell-api": "2.3.2",
-        "@mongosh/shell-evaluator": "2.3.2",
-        "@mongosh/snippet-manager": "2.3.2",
-        "@mongosh/types": "2.3.2",
+        "@mongosh/arg-parser": "2.3.3",
+        "@mongosh/autocomplete": "2.3.3",
+        "@mongosh/editor": "2.3.3",
+        "@mongosh/errors": "2.3.3",
+        "@mongosh/history": "2.3.3",
+        "@mongosh/i18n": "2.3.3",
+        "@mongosh/js-multiline-to-singleline": "2.3.3",
+        "@mongosh/logging": "2.3.3",
+        "@mongosh/service-provider-core": "2.3.3",
+        "@mongosh/service-provider-node-driver": "2.3.3",
+        "@mongosh/shell-api": "2.3.3",
+        "@mongosh/shell-evaluator": "2.3.3",
+        "@mongosh/snippet-manager": "2.3.3",
+        "@mongosh/types": "2.3.3",
         "@segment/analytics-node": "^1.3.0",
         "ansi-escape-sequences": "^5.1.2",
         "askcharacter": "^2.0.4",
@@ -1392,16 +1364,16 @@
       }
     },
     "node_modules/@mongosh/editor": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.2.tgz",
-      "integrity": "sha512-J3c6mxE5SigMb1mz8qvNVbB+OZyom+r0NoqG5ZON45h+ZFl8ookYMQhXSh4qD0qZZbxdT0Ogm/87AaGfExF6EQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.3.tgz",
+      "integrity": "sha512-Yba1rqltKYGHHsGyY7Bc5kvReV5iuBkyb5nYsJX2QVkxeJgkFlz+BQIVRJdiG29PN7RyfwqeEz5S3PDM21bb2g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mongosh/js-multiline-to-singleline": "2.3.2",
-        "@mongosh/service-provider-core": "2.3.2",
-        "@mongosh/shell-api": "2.3.2",
-        "@mongosh/shell-evaluator": "2.3.2",
-        "@mongosh/types": "2.3.2",
+        "@mongosh/js-multiline-to-singleline": "2.3.3",
+        "@mongosh/service-provider-core": "2.3.3",
+        "@mongosh/shell-api": "2.3.3",
+        "@mongosh/shell-evaluator": "2.3.3",
+        "@mongosh/types": "2.3.3",
         "js-beautify": "^1.15.1"
       },
       "engines": {
@@ -1409,18 +1381,18 @@
       }
     },
     "node_modules/@mongosh/errors": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.2.tgz",
-      "integrity": "sha512-TKjWgKmxVW16+3+IcQNgv7RxSE3XinRKapxhs9E5nM5FDAXEMRMQnrhhb4KR9Wtp6phAywPSfNjWhuAeI91efQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.3.tgz",
+      "integrity": "sha512-rGeWzTOAkmrIobffPIoQMr79TPo8HbJh/7PAYJl3z8LQY2orS4SwJbZQsqrR0XgZE7ljVGSVigMjIy5KN79Qww==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14.15.1"
       }
     },
     "node_modules/@mongosh/history": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.2.tgz",
-      "integrity": "sha512-+XLO1kbTwJ1XJ5PKpyU4vn+gqwGtTXQcF4zZIXwxZPN7a0MnBF2DaoMOvEkUYalG0/rkLdVdhILh17HM0mNLsA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.3.tgz",
+      "integrity": "sha512-NzXRXSwO1qZfZG76vwUmJvD2BAEgSvvrsuJVRMRV8XmypegLc0tKnB2gKBPzv65Y9km02usi7BhWpoa6OvQkiw==",
       "license": "Apache-2.0",
       "dependencies": {
         "mongodb-connection-string-url": "^3.0.1",
@@ -1431,21 +1403,21 @@
       }
     },
     "node_modules/@mongosh/i18n": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.2.tgz",
-      "integrity": "sha512-n/h/305TRPUAbBunhULKiqf9QyNHfgpj8WQjPI/2nZdfCKw29cdkiYjBNEMKl1j3jIGD51/wYgIUT4e51vZUwg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.3.tgz",
+      "integrity": "sha512-essiM0eMiMcmgDMjd8gYfiZSHhN+zRl//ykrKcZSHr/2Dhsz01ran2bFihkuqxqUhNS6zYwjglTVPHu7Mz+Z4w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mongosh/errors": "2.3.2"
+        "@mongosh/errors": "2.3.3"
       },
       "engines": {
         "node": ">=14.15.1"
       }
     },
     "node_modules/@mongosh/js-multiline-to-singleline": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.2.tgz",
-      "integrity": "sha512-Bvt7JSAUdODW94HOqjZ6C3LapAq0agDYVu9MXQJPuv+s+2x0K+rlZqiSLVUtus5m4GayTogY+LXvYZmoK+8CFQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.3.tgz",
+      "integrity": "sha512-XAtRFsbLajS1NgpKomLr+Mu5HEI5U66IkVA+v9P1xX5Q5RV6VkOMAKCtquU3IrkDIsrFobyYa6D/r8Oh1qnKKA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.12",
@@ -1456,15 +1428,15 @@
       }
     },
     "node_modules/@mongosh/logging": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.2.tgz",
-      "integrity": "sha512-gwFWHFTEddEFNyBb3e/vhYkkhkkNtwySDeXLPc2Ngf51zDYavFLUIsH07wz9CDdZ4Vo/MtwT/f09T1Yhg0XFsA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.3.tgz",
+      "integrity": "sha512-zhihgRJGZIzeyIlvMpyiawTXc+RMINTq/IkZ+Y769TUQvHGswqXDud/A9F7K/kSm37tk1KGvhBM1YsHiejJTnQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/devtools-connect": "^3.3.0",
-        "@mongosh/errors": "2.3.2",
-        "@mongosh/history": "2.3.2",
-        "@mongosh/types": "2.3.2",
+        "@mongosh/errors": "2.3.3",
+        "@mongosh/history": "2.3.3",
+        "@mongosh/types": "2.3.3",
         "mongodb-log-writer": "^1.4.2",
         "mongodb-redact": "^1.1.2"
       },
@@ -1473,15 +1445,15 @@
       }
     },
     "node_modules/@mongosh/service-provider-core": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.2.tgz",
-      "integrity": "sha512-lQqLuFojElKADTueYIE6gUPud31zrNwsFNk23mgH/PKDDYHGtYt5ZKQ7aAFe57HSMUZXk13SiANFukdoTcfvtA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.3.tgz",
+      "integrity": "sha512-8LIl5tBgwuuUYT9VMxdPf7Aow1D9kCUbuTzTOO7vLVYoihxAPyLcR3+N85zV4wVvKSZH69lGoFW3xFDwdTyBGQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/credential-providers": "^3.525.0",
-        "@mongosh/errors": "2.3.2",
-        "bson": "^6.8.0",
-        "mongodb": "^6.9.0",
+        "@mongosh/errors": "2.3.3",
+        "bson": "^6.9.0",
+        "mongodb": "^6.10.0",
         "mongodb-build-info": "^1.7.2",
         "mongodb-connection-string-url": "^3.0.1"
       },
@@ -1492,19 +1464,19 @@
         "mongodb-client-encryption": "^6.1.0"
       }
     },
-    "node_modules/@mongosh/service-provider-server": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.3.2.tgz",
-      "integrity": "sha512-nDrgmmA/JWyUEW551/m2O4btibc8E+kpOcTvp4LNNZwFO4flqKozMv4NKBMxnYrqTjxIEp+A4WzFEND7yesVHg==",
+    "node_modules/@mongosh/service-provider-node-driver": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-2.3.3.tgz",
+      "integrity": "sha512-82ORgX2X0mLAsyOqsLjMOGN6A1nrVS76PVoL3X9oaegcGkMduShl7mAebpAusxdXl9nNBqtsnT7PDF0X/tOAOA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/devtools-connect": "^3.3.0",
         "@mongodb-js/oidc-plugin": "^1.1.1",
-        "@mongosh/errors": "2.3.2",
-        "@mongosh/service-provider-core": "2.3.2",
-        "@mongosh/types": "2.3.2",
+        "@mongosh/errors": "2.3.3",
+        "@mongosh/service-provider-core": "2.3.3",
+        "@mongosh/types": "2.3.3",
         "aws4": "^1.12.0",
-        "mongodb": "^6.9.0",
+        "mongodb": "^6.10.0",
         "mongodb-connection-string-url": "^3.0.1",
         "socks": "^2.8.3"
       },
@@ -1516,7 +1488,7 @@
         "mongodb-client-encryption": "^6.1.0"
       }
     },
-    "node_modules/@mongosh/service-provider-server/node_modules/kerberos": {
+    "node_modules/@mongosh/service-provider-node-driver/node_modules/kerberos": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.0.tgz",
       "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==",
@@ -1532,14 +1504,14 @@
         "node": ">=12.9.0"
       }
     },
-    "node_modules/@mongosh/service-provider-server/node_modules/node-addon-api": {
+    "node_modules/@mongosh/service-provider-node-driver/node_modules/node-addon-api": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
       "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
       "license": "MIT",
       "optional": true
     },
-    "node_modules/@mongosh/service-provider-server/node_modules/prebuild-install": {
+    "node_modules/@mongosh/service-provider-node-driver/node_modules/prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
@@ -1567,16 +1539,16 @@
       }
     },
     "node_modules/@mongosh/shell-api": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.2.tgz",
-      "integrity": "sha512-VDj6XVn7m6qHWphJAxPAnQ4HknJ2VZWwQFfQHm9u/6HFDnpAdnN/bubY9nawc55qdZTadpvg5m9YvmOZ3541rA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.3.tgz",
+      "integrity": "sha512-hXnjEhW1ISH4J8UZOY0zqeZ51rkRqwoy1xfqya65Oyn22vQkO9ZR5XL3HzNVsH5h2Axvope2jbJGNsRGk0LQOQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mongosh/arg-parser": "2.3.2",
-        "@mongosh/errors": "2.3.2",
-        "@mongosh/history": "2.3.2",
-        "@mongosh/i18n": "2.3.2",
-        "@mongosh/service-provider-core": "2.3.2",
+        "@mongosh/arg-parser": "2.3.3",
+        "@mongosh/errors": "2.3.3",
+        "@mongosh/history": "2.3.3",
+        "@mongosh/i18n": "2.3.3",
+        "@mongosh/service-provider-core": "2.3.3",
         "mongodb-redact": "^1.1.2"
       },
       "engines": {
@@ -1584,30 +1556,30 @@
       }
     },
     "node_modules/@mongosh/shell-evaluator": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.2.tgz",
-      "integrity": "sha512-dQPRrsi60SFrn/p0vHkcsR+i7hUSQagdwkj0JarqDtGFuowWn6f2t4crSklOjM0wie4Bi/bsXwtFyGEUl+YN2g==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.3.tgz",
+      "integrity": "sha512-+TJxh3HgNmkApMNPsbZiZm/gqui3EYUuinZJtqWpZkisLA4dlTbuAGjkS4pKFS6CU1lLYk+7ytfj0oXFx9Ij2w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mongosh/async-rewriter2": "2.3.2",
-        "@mongosh/history": "2.3.2",
-        "@mongosh/shell-api": "2.3.2"
+        "@mongosh/async-rewriter2": "2.3.3",
+        "@mongosh/history": "2.3.3",
+        "@mongosh/shell-api": "2.3.3"
       },
       "engines": {
         "node": ">=14.15.1"
       }
     },
     "node_modules/@mongosh/snippet-manager": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.2.tgz",
-      "integrity": "sha512-h7fU2uEBPulvJdXinvz3Y17XSEIbw3ibRHabNaA/T6hM31GzxOQ2QHSawGJK+LNf0VyzwQ2L8bzFtJetoJq1OQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.3.tgz",
+      "integrity": "sha512-Lf2X9tLIDPnI9pXZfHA1jMQlbcsLKpgTHaCkfxitLinuxFXSrBlPYoVxAngbRccL2W67aK+l3FhxmKg8JMS/gg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/devtools-proxy-support": "^0.4.1",
-        "@mongosh/errors": "2.3.2",
-        "@mongosh/shell-api": "2.3.2",
-        "@mongosh/types": "2.3.2",
-        "bson": "^6.8.0",
+        "@mongosh/errors": "2.3.3",
+        "@mongosh/shell-api": "2.3.3",
+        "@mongosh/types": "2.3.3",
+        "bson": "^6.9.0",
         "cross-spawn": "^7.0.3",
         "escape-string-regexp": "^4.0.0",
         "joi": "^17.4.0",
@@ -1618,9 +1590,9 @@
       }
     },
     "node_modules/@mongosh/types": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.2.tgz",
-      "integrity": "sha512-QXKsjEVsz1X2WyvWNyGsI+8Zs3/Z+vbCiBOC3t95JrGJlbkz5uPjGbAwcXSZTheehdCd01spgedSNn3r5yQDtQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.3.tgz",
+      "integrity": "sha512-Jw/SOOPlK+O7NpD6yrtNVqvUDs96Cilb5IFjbKAeBi4z+vfjdDjBsCtpD9HfI8dc5Wh9PMZtOsbjsVhdBvvqXA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/devtools-connect": "^3.3.0"
@@ -1747,12 +1719,12 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@smithy/abort-controller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
-      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz",
+      "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1760,15 +1732,15 @@
       }
     },
     "node_modules/@smithy/config-resolver": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
-      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz",
+      "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^3.1.8",
-        "@smithy/types": "^3.5.0",
+        "@smithy/node-config-provider": "^3.1.9",
+        "@smithy/types": "^3.6.0",
         "@smithy/util-config-provider": "^3.0.0",
-        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-middleware": "^3.0.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1776,19 +1748,17 @@
       }
     },
     "node_modules/@smithy/core": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
-      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz",
+      "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/middleware-endpoint": "^3.1.4",
-        "@smithy/middleware-retry": "^3.0.23",
-        "@smithy/middleware-serde": "^3.0.7",
-        "@smithy/protocol-http": "^4.1.4",
-        "@smithy/smithy-client": "^3.4.0",
-        "@smithy/types": "^3.5.0",
+        "@smithy/middleware-serde": "^3.0.8",
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/types": "^3.6.0",
         "@smithy/util-body-length-browser": "^3.0.0",
-        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-middleware": "^3.0.8",
+        "@smithy/util-stream": "^3.2.1",
         "@smithy/util-utf8": "^3.0.0",
         "tslib": "^2.6.2"
       },
@@ -1797,15 +1767,15 @@
       }
     },
     "node_modules/@smithy/credential-provider-imds": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
-      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz",
+      "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^3.1.8",
-        "@smithy/property-provider": "^3.1.7",
-        "@smithy/types": "^3.5.0",
-        "@smithy/url-parser": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.9",
+        "@smithy/property-provider": "^3.1.8",
+        "@smithy/types": "^3.6.0",
+        "@smithy/url-parser": "^3.0.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1826,12 +1796,12 @@
       }
     },
     "node_modules/@smithy/hash-node": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
-      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz",
+      "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "@smithy/util-buffer-from": "^3.0.0",
         "@smithy/util-utf8": "^3.0.0",
         "tslib": "^2.6.2"
@@ -1841,12 +1811,12 @@
       }
     },
     "node_modules/@smithy/invalid-dependency": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
-      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz",
+      "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       }
     },
@@ -1863,13 +1833,13 @@
       }
     },
     "node_modules/@smithy/middleware-content-length": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
-      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz",
+      "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^4.1.4",
-        "@smithy/types": "^3.5.0",
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1877,17 +1847,18 @@
       }
     },
     "node_modules/@smithy/middleware-endpoint": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
-      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz",
+      "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/middleware-serde": "^3.0.7",
-        "@smithy/node-config-provider": "^3.1.8",
-        "@smithy/shared-ini-file-loader": "^3.1.8",
-        "@smithy/types": "^3.5.0",
-        "@smithy/url-parser": "^3.0.7",
-        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/core": "^2.5.1",
+        "@smithy/middleware-serde": "^3.0.8",
+        "@smithy/node-config-provider": "^3.1.9",
+        "@smithy/shared-ini-file-loader": "^3.1.9",
+        "@smithy/types": "^3.6.0",
+        "@smithy/url-parser": "^3.0.8",
+        "@smithy/util-middleware": "^3.0.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1895,18 +1866,18 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
-      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==",
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz",
+      "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^3.1.8",
-        "@smithy/protocol-http": "^4.1.4",
-        "@smithy/service-error-classification": "^3.0.7",
-        "@smithy/smithy-client": "^3.4.0",
-        "@smithy/types": "^3.5.0",
-        "@smithy/util-middleware": "^3.0.7",
-        "@smithy/util-retry": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.9",
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/service-error-classification": "^3.0.8",
+        "@smithy/smithy-client": "^3.4.2",
+        "@smithy/types": "^3.6.0",
+        "@smithy/util-middleware": "^3.0.8",
+        "@smithy/util-retry": "^3.0.8",
         "tslib": "^2.6.2",
         "uuid": "^9.0.1"
       },
@@ -1915,12 +1886,12 @@
       }
     },
     "node_modules/@smithy/middleware-serde": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
-      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz",
+      "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1928,12 +1899,12 @@
       }
     },
     "node_modules/@smithy/middleware-stack": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
-      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz",
+      "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1941,14 +1912,14 @@
       }
     },
     "node_modules/@smithy/node-config-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
-      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz",
+      "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^3.1.7",
-        "@smithy/shared-ini-file-loader": "^3.1.8",
-        "@smithy/types": "^3.5.0",
+        "@smithy/property-provider": "^3.1.8",
+        "@smithy/shared-ini-file-loader": "^3.1.9",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1956,15 +1927,15 @@
       }
     },
     "node_modules/@smithy/node-http-handler": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
-      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz",
+      "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^3.1.5",
-        "@smithy/protocol-http": "^4.1.4",
-        "@smithy/querystring-builder": "^3.0.7",
-        "@smithy/types": "^3.5.0",
+        "@smithy/abort-controller": "^3.1.6",
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/querystring-builder": "^3.0.8",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1972,12 +1943,12 @@
       }
     },
     "node_modules/@smithy/property-provider": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
-      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz",
+      "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1985,12 +1956,12 @@
       }
     },
     "node_modules/@smithy/protocol-http": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
-      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz",
+      "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1998,12 +1969,12 @@
       }
     },
     "node_modules/@smithy/querystring-builder": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
-      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz",
+      "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "@smithy/util-uri-escape": "^3.0.0",
         "tslib": "^2.6.2"
       },
@@ -2012,12 +1983,12 @@
       }
     },
     "node_modules/@smithy/querystring-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
-      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz",
+      "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2025,24 +1996,24 @@
       }
     },
     "node_modules/@smithy/service-error-classification": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
-      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz",
+      "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0"
+        "@smithy/types": "^3.6.0"
       },
       "engines": {
         "node": ">=16.0.0"
       }
     },
     "node_modules/@smithy/shared-ini-file-loader": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
-      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz",
+      "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2050,16 +2021,16 @@
       }
     },
     "node_modules/@smithy/signature-v4": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
-      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz",
+      "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/is-array-buffer": "^3.0.0",
-        "@smithy/protocol-http": "^4.1.4",
-        "@smithy/types": "^3.5.0",
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/types": "^3.6.0",
         "@smithy/util-hex-encoding": "^3.0.0",
-        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-middleware": "^3.0.8",
         "@smithy/util-uri-escape": "^3.0.0",
         "@smithy/util-utf8": "^3.0.0",
         "tslib": "^2.6.2"
@@ -2069,16 +2040,17 @@
       }
     },
     "node_modules/@smithy/smithy-client": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
-      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz",
+      "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/middleware-endpoint": "^3.1.4",
-        "@smithy/middleware-stack": "^3.0.7",
-        "@smithy/protocol-http": "^4.1.4",
-        "@smithy/types": "^3.5.0",
-        "@smithy/util-stream": "^3.1.9",
+        "@smithy/core": "^2.5.1",
+        "@smithy/middleware-endpoint": "^3.2.1",
+        "@smithy/middleware-stack": "^3.0.8",
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/types": "^3.6.0",
+        "@smithy/util-stream": "^3.2.1",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2086,9 +2058,9 @@
       }
     },
     "node_modules/@smithy/types": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
-      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz",
+      "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -2098,13 +2070,13 @@
       }
     },
     "node_modules/@smithy/url-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
-      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz",
+      "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/querystring-parser": "^3.0.7",
-        "@smithy/types": "^3.5.0",
+        "@smithy/querystring-parser": "^3.0.8",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       }
     },
@@ -2169,14 +2141,14 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
-      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==",
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz",
+      "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^3.1.7",
-        "@smithy/smithy-client": "^3.4.0",
-        "@smithy/types": "^3.5.0",
+        "@smithy/property-provider": "^3.1.8",
+        "@smithy/smithy-client": "^3.4.2",
+        "@smithy/types": "^3.6.0",
         "bowser": "^2.11.0",
         "tslib": "^2.6.2"
       },
@@ -2185,17 +2157,17 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
-      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==",
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz",
+      "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/config-resolver": "^3.0.9",
-        "@smithy/credential-provider-imds": "^3.2.4",
-        "@smithy/node-config-provider": "^3.1.8",
-        "@smithy/property-provider": "^3.1.7",
-        "@smithy/smithy-client": "^3.4.0",
-        "@smithy/types": "^3.5.0",
+        "@smithy/config-resolver": "^3.0.10",
+        "@smithy/credential-provider-imds": "^3.2.5",
+        "@smithy/node-config-provider": "^3.1.9",
+        "@smithy/property-provider": "^3.1.8",
+        "@smithy/smithy-client": "^3.4.2",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2203,13 +2175,13 @@
       }
     },
     "node_modules/@smithy/util-endpoints": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
-      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz",
+      "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^3.1.8",
-        "@smithy/types": "^3.5.0",
+        "@smithy/node-config-provider": "^3.1.9",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2229,12 +2201,12 @@
       }
     },
     "node_modules/@smithy/util-middleware": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
-      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz",
+      "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^3.5.0",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2242,13 +2214,13 @@
       }
     },
     "node_modules/@smithy/util-retry": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
-      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz",
+      "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/service-error-classification": "^3.0.7",
-        "@smithy/types": "^3.5.0",
+        "@smithy/service-error-classification": "^3.0.8",
+        "@smithy/types": "^3.6.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2256,14 +2228,14 @@
       }
     },
     "node_modules/@smithy/util-stream": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
-      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz",
+      "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/fetch-http-handler": "^3.2.9",
-        "@smithy/node-http-handler": "^3.2.4",
-        "@smithy/types": "^3.5.0",
+        "@smithy/fetch-http-handler": "^4.0.0",
+        "@smithy/node-http-handler": "^3.2.5",
+        "@smithy/types": "^3.6.0",
         "@smithy/util-base64": "^3.0.0",
         "@smithy/util-buffer-from": "^3.0.0",
         "@smithy/util-hex-encoding": "^3.0.0",
@@ -2274,6 +2246,19 @@
         "node": ">=16.0.0"
       }
     },
+    "node_modules/@smithy/util-stream/node_modules/@smithy/fetch-http-handler": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz",
+      "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/protocol-http": "^4.1.5",
+        "@smithy/querystring-builder": "^3.0.8",
+        "@smithy/types": "^3.6.0",
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
     "node_modules/@smithy/util-uri-escape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
@@ -2343,9 +2328,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -2458,15 +2443,18 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/argparse": {
@@ -2703,9 +2691,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "funding": [
         {
           "type": "opencollective",
@@ -2722,10 +2710,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
         "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2735,9 +2723,9 @@
       }
     },
     "node_modules/bson": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz",
-      "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==",
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz",
+      "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=16.20.1"
@@ -2820,9 +2808,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001668",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
-      "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
+      "version": "1.0.30001676",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz",
+      "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==",
       "funding": [
         {
           "type": "opencollective",
@@ -2840,26 +2828,19 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chownr": {
@@ -2872,18 +2853,21 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "license": "MIT"
     },
     "node_modules/commander": {
@@ -3173,9 +3157,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.36",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz",
-      "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==",
+      "version": "1.5.50",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+      "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -3199,76 +3183,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/emphasize/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/emphasize/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/emphasize/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/emphasize/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "license": "MIT"
-    },
-    "node_modules/emphasize/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/emphasize/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/encodeurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -3879,12 +3793,12 @@
       "license": "Apache-2.0"
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
@@ -4360,18 +4274,18 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz",
-      "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
+      "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==",
       "license": "ISC",
       "engines": {
         "node": "20 || >=22"
       }
     },
     "node_modules/macos-export-certificate-and-key": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.3.tgz",
-      "integrity": "sha512-O7+9e2JSctV1ylyzx8nwHDaA/H5Tpoudtd8q/YfRp26hAjE32caMPAS2jPQ2azRRSuRqx8gD24Vnf9bo7hH5Dw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.4.tgz",
+      "integrity": "sha512-y5QZEywlBNKd+EhPZ1Hz1FmDbbeQKtuVHJaTlawdl7vXw9bi/4tJB2xSMwX4sMVcddy3gbQ8K0IqXAi2TpDo2g==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -4559,9 +4473,9 @@
       "optional": true
     },
     "node_modules/mongodb": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz",
-      "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz",
+      "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/saslprep": "^1.1.5",
@@ -4712,9 +4626,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.68.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.68.0.tgz",
-      "integrity": "sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==",
+      "version": "3.71.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz",
+      "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -5036,9 +4950,9 @@
       "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
     "node_modules/prebuild-install": {
@@ -5083,76 +4997,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/pretty-repl/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-repl/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/pretty-repl/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/pretty-repl/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "license": "MIT"
-    },
-    "node_modules/pretty-repl/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pretty-repl/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -5825,15 +5669,15 @@
       "license": "MIT"
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/system-ca": {
@@ -5927,15 +5771,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -5958,9 +5793,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
     "node_modules/tunnel-agent": {
@@ -6193,39 +6028,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "license": "MIT"
-    },
     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix
index 79834dafc2b8..8221c89c7197 100644
--- a/pkgs/by-name/mo/mongosh/package.nix
+++ b/pkgs/by-name/mo/mongosh/package.nix
@@ -34,11 +34,11 @@ buildNpmPackage {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.mongodb.com/try/download/shell";
     description = "MongoDB Shell";
-    maintainers = with maintainers; [ aaronjheng ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
     mainProgram = "mongosh";
   };
 }
diff --git a/pkgs/by-name/mo/mongosh/source.json b/pkgs/by-name/mo/mongosh/source.json
index 29ff15911b93..b765ff88facf 100644
--- a/pkgs/by-name/mo/mongosh/source.json
+++ b/pkgs/by-name/mo/mongosh/source.json
@@ -1,6 +1,6 @@
 {
-  "version": "2.3.2",
-  "integrity": "sha512-KobngQr6A3kS7DJhXBc+sAnk3GujTI/WxVz+NfOVl0i/DDd6v+dI95xwhxggcu6wUtvj40AyTH20gvvvdkeGHg==",
-  "filename": "mongosh-2.3.2.tgz",
-  "deps": "sha256-t6HsvxXLutSjGfYTVX/15b+WCbT5+2NO2epW0aNttAI="
+  "version": "2.3.3",
+  "integrity": "sha512-nNVPMhaT/5HmTWGPuHfa3WWbu0lDQRyqoHP51YWZcBX4pgOWwGPXpQqEHLsKhEvzL8jdp8aemT/3/iyfvWUAhA==",
+  "filename": "mongosh-2.3.3.tgz",
+  "deps": "sha256-jL7Lf35AHZEUrsSVe4qMT60XzFr03NEBjWFWFkY3n/U="
 }
diff --git a/pkgs/servers/web-apps/monica/default.nix b/pkgs/by-name/mo/monica/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/monica/default.nix
rename to pkgs/by-name/mo/monica/package.nix
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/by-name/mo/monit/package.nix
similarity index 100%
rename from pkgs/tools/system/monit/default.nix
rename to pkgs/by-name/mo/monit/package.nix
diff --git a/pkgs/applications/misc/monitorcontrol/default.nix b/pkgs/by-name/mo/monitorcontrol/package.nix
similarity index 100%
rename from pkgs/applications/misc/monitorcontrol/default.nix
rename to pkgs/by-name/mo/monitorcontrol/package.nix
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/by-name/mo/monitoring-plugins/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/plugins/default.nix
rename to pkgs/by-name/mo/monitoring-plugins/package.nix
diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/by-name/mo/monkeysAudio/buildfix.diff
similarity index 100%
rename from pkgs/applications/audio/monkeys-audio/buildfix.diff
rename to pkgs/by-name/mo/monkeysAudio/buildfix.diff
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
similarity index 100%
rename from pkgs/applications/audio/monkeys-audio/default.nix
rename to pkgs/by-name/mo/monkeysAudio/package.nix
diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/by-name/mo/monkeysphere/monkeysphere.patch
similarity index 100%
rename from pkgs/tools/security/monkeysphere/monkeysphere.patch
rename to pkgs/by-name/mo/monkeysphere/monkeysphere.patch
diff --git a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/pkgs/by-name/mo/monkeysphere/openssh-nixos-sandbox.patch
similarity index 100%
rename from pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
rename to pkgs/by-name/mo/monkeysphere/openssh-nixos-sandbox.patch
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/by-name/mo/monkeysphere/package.nix
similarity index 100%
rename from pkgs/tools/security/monkeysphere/default.nix
rename to pkgs/by-name/mo/monkeysphere/package.nix
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/by-name/mo/mono-addins/package.nix
similarity index 100%
rename from pkgs/development/libraries/mono-addins/default.nix
rename to pkgs/by-name/mo/mono-addins/package.nix
diff --git a/pkgs/build-support/mono-dll-fixer/dll-fixer.pl b/pkgs/by-name/mo/monoDLLFixer/dll-fixer.pl
similarity index 100%
rename from pkgs/build-support/mono-dll-fixer/dll-fixer.pl
rename to pkgs/by-name/mo/monoDLLFixer/dll-fixer.pl
diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/by-name/mo/monoDLLFixer/package.nix
similarity index 100%
rename from pkgs/build-support/mono-dll-fixer/default.nix
rename to pkgs/by-name/mo/monoDLLFixer/package.nix
diff --git a/pkgs/data/fonts/monocraft/default.nix b/pkgs/by-name/mo/monocraft/package.nix
similarity index 100%
rename from pkgs/data/fonts/monocraft/default.nix
rename to pkgs/by-name/mo/monocraft/package.nix
diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/by-name/mo/monocypher/package.nix
similarity index 100%
rename from pkgs/development/libraries/monocypher/default.nix
rename to pkgs/by-name/mo/monocypher/package.nix
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/by-name/mo/monoid/package.nix
similarity index 100%
rename from pkgs/data/fonts/monoid/default.nix
rename to pkgs/by-name/mo/monoid/package.nix
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/by-name/mo/mononoki/package.nix
similarity index 100%
rename from pkgs/data/fonts/mononoki/default.nix
rename to pkgs/by-name/mo/mononoki/package.nix
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/by-name/mo/monosat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/monosat/default.nix
rename to pkgs/by-name/mo/monosat/package.nix
diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/by-name/mo/mons/package.nix
similarity index 100%
rename from pkgs/tools/misc/mons/default.nix
rename to pkgs/by-name/mo/mons/package.nix
diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/by-name/mo/monsoon/package.nix
similarity index 100%
rename from pkgs/tools/security/monsoon/default.nix
rename to pkgs/by-name/mo/monsoon/package.nix
diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/by-name/mo/montserrat/package.nix
similarity index 100%
rename from pkgs/data/fonts/montserrat/default.nix
rename to pkgs/by-name/mo/montserrat/package.nix
diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/by-name/mo/mooSpace/package.nix
similarity index 100%
rename from pkgs/applications/audio/mooSpace/default.nix
rename to pkgs/by-name/mo/mooSpace/package.nix
diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/by-name/mo/moodle-dl/package.nix
similarity index 100%
rename from pkgs/tools/networking/moodle-dl/default.nix
rename to pkgs/by-name/mo/moodle-dl/package.nix
diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/by-name/mo/moon-buggy/package.nix
similarity index 100%
rename from pkgs/games/moon-buggy/default.nix
rename to pkgs/by-name/mo/moon-buggy/package.nix
diff --git a/pkgs/tools/misc/moon-phases/default.nix b/pkgs/by-name/mo/moon-phases/package.nix
similarity index 100%
rename from pkgs/tools/misc/moon-phases/default.nix
rename to pkgs/by-name/mo/moon-phases/package.nix
diff --git a/pkgs/misc/moonfire-nvr/Cargo.lock b/pkgs/by-name/mo/moonfire-nvr/Cargo.lock
similarity index 100%
rename from pkgs/misc/moonfire-nvr/Cargo.lock
rename to pkgs/by-name/mo/moonfire-nvr/Cargo.lock
diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
similarity index 100%
rename from pkgs/misc/moonfire-nvr/default.nix
rename to pkgs/by-name/mo/moonfire-nvr/package.nix
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/by-name/mo/moonlight-embedded/package.nix
similarity index 100%
rename from pkgs/applications/misc/moonlight-embedded/default.nix
rename to pkgs/by-name/mo/moonlight-embedded/package.nix
diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index ed73a1279a46..08463c37ca9d 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -3,8 +3,6 @@
   lib,
   fetchFromGitHub,
   fetchpatch,
-  darwin,
-  overrideSDK,
   qt6,
   pkg-config,
   vulkan-headers,
@@ -24,25 +22,7 @@
   nix-update-script,
 }:
 
-let
-  inherit (darwin.apple_sdk_12_3.frameworks)
-    AVFoundation
-    AppKit
-    AudioUnit
-    Cocoa
-    VideoToolbox
-    ;
-  stdenv' =
-    if stdenv.hostPlatform.isDarwin then
-      overrideSDK stdenv {
-        darwinMinVersion = "11.0";
-        darwinSdkVersion = "12.3";
-      }
-    else
-      stdenv;
-in
-
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight-qt";
   version = "6.1.0";
 
@@ -89,13 +69,6 @@ stdenv'.mkDerivation (finalAttrs: {
       qt6.qtwayland
       wayland
       libdrm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      AVFoundation
-      AppKit
-      AudioUnit
-      Cocoa
-      VideoToolbox
     ];
 
   qmakeFlags = [ "CONFIG+=disable-prebuilts" ];
diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/by-name/mo/moonraker/package.nix
similarity index 100%
rename from pkgs/servers/moonraker/default.nix
rename to pkgs/by-name/mo/moonraker/package.nix
diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/by-name/mo/moosefs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/moosefs/default.nix
rename to pkgs/by-name/mo/moosefs/package.nix
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/by-name/mo/mop/package.nix
similarity index 100%
rename from pkgs/applications/misc/mop/default.nix
rename to pkgs/by-name/mo/mop/package.nix
diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/by-name/mo/mopac/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/mopac/default.nix
rename to pkgs/by-name/mo/mopac/package.nix
diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix
new file mode 100644
index 000000000000..06babfb658f9
--- /dev/null
+++ b/pkgs/by-name/mo/moq/package.nix
@@ -0,0 +1,35 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "moq";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "matryer";
+    repo = "moq";
+    rev = "v${version}";
+    sha256 = "sha256-fIvh+IvkyU76RzJvThIFrsBOg/w+FtNjgthOy04siOc=";
+  };
+
+  vendorHash = "sha256-Kp0mRLmOlV3UpYSQJoc54tYU78sg+RZ5qy/1ime7j7w=";
+
+  subPackages = [ "." ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${version}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/matryer/moq";
+    description = "Interface mocking tool for go generate";
+    mainProgram = "moq";
+    longDescription = ''
+      Moq is a tool that generates a struct from any interface. The struct can
+      be used in test code as a mock of the interface.
+    '';
+    license = licenses.mit;
+    maintainers = with maintainers; [ anpryl ];
+  };
+}
diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index d5668ce5428a..77ca0a63f023 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "morewaita-icon-theme";
-  version = "45";
+  version = "47.1";
 
   src = fetchFromGitHub {
     owner = "somepaulo";
     repo = "MoreWaita";
-    rev = "v${version}";
-    hash = "sha256-UtwigqJjkin53Wg3PU14Rde6V42eKhmP26a3fDpbJ4Y=";
+    rev = "${version}";
+    hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/by-name/mo/morph/package.nix
similarity index 100%
rename from pkgs/tools/package-management/morph/default.nix
rename to pkgs/by-name/mo/morph/package.nix
diff --git a/pkgs/tools/text/morsel/default.nix b/pkgs/by-name/mo/morsel/package.nix
similarity index 100%
rename from pkgs/tools/text/morsel/default.nix
rename to pkgs/by-name/mo/morsel/package.nix
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/by-name/mo/morty/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/morty/default.nix
rename to pkgs/by-name/mo/morty/package.nix
diff --git a/pkgs/tools/misc/moserial/default.nix b/pkgs/by-name/mo/moserial/package.nix
similarity index 100%
rename from pkgs/tools/misc/moserial/default.nix
rename to pkgs/by-name/mo/moserial/package.nix
diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/by-name/mo/mosh/bash_completion_datadir.patch
similarity index 100%
rename from pkgs/tools/networking/mosh/bash_completion_datadir.patch
rename to pkgs/by-name/mo/mosh/bash_completion_datadir.patch
diff --git a/pkgs/tools/networking/mosh/mosh-client_path.patch b/pkgs/by-name/mo/mosh/mosh-client_path.patch
similarity index 100%
rename from pkgs/tools/networking/mosh/mosh-client_path.patch
rename to pkgs/by-name/mo/mosh/mosh-client_path.patch
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/by-name/mo/mosh/package.nix
similarity index 100%
rename from pkgs/tools/networking/mosh/default.nix
rename to pkgs/by-name/mo/mosh/package.nix
diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/pkgs/by-name/mo/mosh/ssh_path.patch
similarity index 100%
rename from pkgs/tools/networking/mosh/ssh_path.patch
rename to pkgs/by-name/mo/mosh/ssh_path.patch
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/by-name/mo/mosml/package.nix
similarity index 100%
rename from pkgs/development/compilers/mosml/default.nix
rename to pkgs/by-name/mo/mosml/package.nix
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/by-name/mo/mosquitto/package.nix
similarity index 100%
rename from pkgs/servers/mqtt/mosquitto/default.nix
rename to pkgs/by-name/mo/mosquitto/package.nix
diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/by-name/mo/most/package.nix
similarity index 100%
rename from pkgs/tools/misc/most/default.nix
rename to pkgs/by-name/mo/most/package.nix
diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/pkgs/by-name/mo/motif/Add-X.Org-to-bindings-file.patch
similarity index 100%
rename from pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
rename to pkgs/by-name/mo/motif/Add-X.Org-to-bindings-file.patch
diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/pkgs/by-name/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
rename to pkgs/by-name/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/by-name/mo/motif/package.nix
similarity index 100%
rename from pkgs/development/libraries/motif/default.nix
rename to pkgs/by-name/mo/motif/package.nix
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/by-name/mo/motion/package.nix
similarity index 100%
rename from pkgs/applications/video/motion/default.nix
rename to pkgs/by-name/mo/motion/package.nix
diff --git a/pkgs/tools/networking/motrix/default.nix b/pkgs/by-name/mo/motrix/package.nix
similarity index 100%
rename from pkgs/tools/networking/motrix/default.nix
rename to pkgs/by-name/mo/motrix/package.nix
diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/by-name/mo/mount-zip/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mount-zip/default.nix
rename to pkgs/by-name/mo/mount-zip/package.nix
diff --git a/pkgs/tools/filesystems/mountain-duck/default.nix b/pkgs/by-name/mo/mountain-duck/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mountain-duck/default.nix
rename to pkgs/by-name/mo/mountain-duck/package.nix
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/by-name/mo/mousetweaks/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/mousetweaks/default.nix
rename to pkgs/by-name/mo/mousetweaks/package.nix
diff --git a/pkgs/development/tools/database/movine/default.nix b/pkgs/by-name/mo/movine/package.nix
similarity index 100%
rename from pkgs/development/tools/database/movine/default.nix
rename to pkgs/by-name/mo/movine/package.nix
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/by-name/mo/movit/package.nix
similarity index 100%
rename from pkgs/development/libraries/movit/default.nix
rename to pkgs/by-name/mo/movit/package.nix
diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/by-name/mo/mox/package.nix
similarity index 100%
rename from pkgs/servers/mail/mox/default.nix
rename to pkgs/by-name/mo/mox/package.nix
diff --git a/pkgs/servers/mail/mox/version.patch b/pkgs/by-name/mo/mox/version.patch
similarity index 100%
rename from pkgs/servers/mail/mox/version.patch
rename to pkgs/by-name/mo/mox/version.patch
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/by-name/mo/mozjpeg/package.nix
similarity index 100%
rename from pkgs/applications/graphics/mozjpeg/default.nix
rename to pkgs/by-name/mo/mozjpeg/package.nix
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/by-name/mo/mozlz4a/package.nix
similarity index 100%
rename from pkgs/tools/compression/mozlz4a/default.nix
rename to pkgs/by-name/mo/mozlz4a/package.nix
diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/by-name/mo/mozphab/package.nix
similarity index 100%
rename from pkgs/applications/misc/mozphab/default.nix
rename to pkgs/by-name/mo/mozphab/package.nix
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/by-name/mp/mp3blaster/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3blaster/default.nix
rename to pkgs/by-name/mp/mp3blaster/package.nix
diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/by-name/mp/mp3cat/package.nix
similarity index 100%
rename from pkgs/tools/audio/mp3cat/default.nix
rename to pkgs/by-name/mp/mp3cat/package.nix
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/by-name/mp/mp3fs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mp3fs/default.nix
rename to pkgs/by-name/mp/mp3fs/package.nix
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/by-name/mp/mp3gain/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3gain/default.nix
rename to pkgs/by-name/mp/mp3gain/package.nix
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/by-name/mp/mp3splt/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3splt/default.nix
rename to pkgs/by-name/mp/mp3splt/package.nix
diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/by-name/mp/mp3val/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3val/default.nix
rename to pkgs/by-name/mp/mp3val/package.nix
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/by-name/mp/mp4v2/package.nix
similarity index 100%
rename from pkgs/development/libraries/mp4v2/default.nix
rename to pkgs/by-name/mp/mp4v2/package.nix
diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/by-name/mp/mpage/package.nix
similarity index 100%
rename from pkgs/tools/text/mpage/default.nix
rename to pkgs/by-name/mp/mpage/package.nix
diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix
new file mode 100644
index 000000000000..2d1976123167
--- /dev/null
+++ b/pkgs/by-name/mp/mpc/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  fetchFromGitHub,
+  installShellFiles,
+  libiconv,
+  libmpdclient,
+  meson,
+  ninja,
+  pkg-config,
+  python3Packages,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mpc";
+  version = "0.35";
+
+  src = fetchFromGitHub {
+    owner = "MusicPlayerDaemon";
+    repo = "mpc";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-oVdnj3nsYvOHcIOgoamLamriuWu9lucWUQtxVmXZabs=";
+  };
+
+  buildInputs = [
+    libmpdclient
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+  nativeBuildInputs = [
+    installShellFiles
+    meson
+    ninja
+    pkg-config
+    python3Packages.sphinx
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash
+  '';
+
+  postFixup = ''
+    rm $out/share/doc/mpc/contrib/mpc-completion.bash
+  '';
+
+  meta = {
+    homepage = "https://www.musicpd.org/clients/mpc/";
+    description = "Minimalist command line interface to MPD";
+    changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "mpc";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/by-name/mp/mpc123/package.nix
similarity index 100%
rename from pkgs/applications/audio/mpc123/default.nix
rename to pkgs/by-name/mp/mpc123/package.nix
diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpd-discord-rpc/default.nix
rename to pkgs/by-name/mp/mpd-discord-rpc/package.nix
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/by-name/mp/mpd-mpris/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpd-mpris/default.nix
rename to pkgs/by-name/mp/mpd-mpris/package.nix
diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/by-name/mp/mpd-notification/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpd-notification/default.nix
rename to pkgs/by-name/mp/mpd-notification/package.nix
diff --git a/pkgs/applications/audio/mpd-touch-screen-gui/default.nix b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
similarity index 100%
rename from pkgs/applications/audio/mpd-touch-screen-gui/default.nix
rename to pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/by-name/mp/mpdas/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpdas/default.nix
rename to pkgs/by-name/mp/mpdas/package.nix
diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/by-name/mp/mpdecimal/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpdecimal/default.nix
rename to pkgs/by-name/mp/mpdecimal/package.nix
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/by-name/mp/mpdris2/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpdris2/default.nix
rename to pkgs/by-name/mp/mpdris2/package.nix
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/by-name/mp/mpdscribble/package.nix
similarity index 100%
rename from pkgs/tools/misc/mpdscribble/default.nix
rename to pkgs/by-name/mp/mpdscribble/package.nix
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/by-name/mp/mpfi/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpfi/default.nix
rename to pkgs/by-name/mp/mpfi/package.nix
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/by-name/mp/mpfr/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpfr/default.nix
rename to pkgs/by-name/mp/mpfr/package.nix
diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/by-name/mp/mpfshell/package.nix
similarity index 100%
rename from pkgs/development/tools/mpfshell/default.nix
rename to pkgs/by-name/mp/mpfshell/package.nix
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/by-name/mp/mph_2b_damase/package.nix
similarity index 100%
rename from pkgs/data/fonts/mph-2b-damase/default.nix
rename to pkgs/by-name/mp/mph_2b_damase/package.nix
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
similarity index 90%
rename from pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
rename to pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
index d7275b62244d..6adad2b44076 100644
--- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
+++ b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
@@ -6,7 +6,6 @@ setupMpiCheck() {
   # Find out which MPI implementation we are using
   # and set safe defaults that are guaranteed to run
   # on any build machine
-
   mpiType="NONE"
 
   # OpenMPI signature
@@ -41,6 +40,10 @@ setupMpiCheck() {
       export OMPI_MCA_rmaps_base_oversubscribe=1
       export PRTE_MCA_rmaps_default_mapping_policy=node:oversubscribe
 
+      # Make sure we do not need openssh in the checkPhase
+      export OMPI_MCA_plm_ssh_agent=false
+      export PRRTE_MCA_plm_ssh_agent=false
+
       # Disable CPU pinning
       export OMPI_MCA_hwloc_base_binding_policy=none
       export PRTE_MCA_hwloc_default_binding_policy=none
@@ -59,6 +62,8 @@ setupMpiCheck() {
     MPICH)
       # Fix to make mpich run in a sandbox
       export HYDRA_IFACE=lo
+      # Disable sysfs cpu topology directory discovery.
+      export HWLOC_XMLFILE="@topology@"
       ;;
     MVAPICH)
       # Disable CPU pinning
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/mpi-check-hook/default.nix
rename to pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml b/pkgs/by-name/mp/mpiCheckPhaseHook/topology.xml
similarity index 100%
rename from pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml
rename to pkgs/by-name/mp/mpiCheckPhaseHook/topology.xml
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/by-name/mp/mpir/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpir/default.nix
rename to pkgs/by-name/mp/mpir/package.nix
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/by-name/mp/mprime/package.nix
similarity index 100%
rename from pkgs/tools/misc/mprime/default.nix
rename to pkgs/by-name/mp/mprime/package.nix
diff --git a/pkgs/by-name/mp/mpris-scrobbler/package.nix b/pkgs/by-name/mp/mpris-scrobbler/package.nix
new file mode 100644
index 000000000000..749a90336ae4
--- /dev/null
+++ b/pkgs/by-name/mp/mpris-scrobbler/package.nix
@@ -0,0 +1,80 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, nix-update-script
+, curl
+, dbus
+, libevent
+, m4
+, meson
+, ninja
+, pkg-config
+, scdoc
+, json_c
+, xdg-utils
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mpris-scrobbler";
+  version = "0.5.3";
+
+  src = fetchFromGitHub {
+    owner = "mariusor";
+    repo = "mpris-scrobbler";
+    rev = "v${version}";
+    sha256 = "sha256-eeOhFkLyx+smZmKPTbVB1OiYkHdWk5v2rnOb9yCIuYE=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/signon.c \
+      --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace meson.build \
+      --replace "-Werror=format-truncation=0" "" \
+      --replace "-Wno-stringop-overflow" ""
+  '';
+
+  nativeBuildInputs = [
+    m4
+    meson
+    ninja
+    pkg-config
+    scdoc
+  ];
+
+  buildInputs = [
+    curl
+    dbus
+    json_c
+    libevent
+  ];
+
+  mesonFlags = [
+    "-Dversion=${version}"
+  ];
+
+  env.NIX_CFLAGS_COMPILE = toString ([
+    # Needed with GCC 12
+    "-Wno-error=address"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Wno-sometimes-uninitialized"
+    "-Wno-tautological-pointer-compare"
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-Wno-array-bounds"
+    "-Wno-free-nonheap-object"
+    "-Wno-stringop-truncation"
+  ]);
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "Minimalistic scrobbler for ListenBrainz, libre.fm, & last.fm";
+    homepage = "https://github.com/mariusor/mpris-scrobbler";
+    license = licenses.mit;
+    maintainers = with maintainers; [ emantor ];
+    platforms = platforms.unix;
+    mainProgram = "mpris-scrobbler";
+  };
+}
diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/by-name/mp/mprocs/package.nix
similarity index 100%
rename from pkgs/tools/misc/mprocs/default.nix
rename to pkgs/by-name/mp/mprocs/package.nix
diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/by-name/mp/mps/package.nix
similarity index 100%
rename from pkgs/development/libraries/mps/default.nix
rename to pkgs/by-name/mp/mps/package.nix
diff --git a/pkgs/applications/video/mpv-shim-default-shaders/default.nix b/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
similarity index 100%
rename from pkgs/applications/video/mpv-shim-default-shaders/default.nix
rename to pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/by-name/mp/mpvpaper/package.nix
similarity index 100%
rename from pkgs/tools/wayland/mpvpaper/default.nix
rename to pkgs/by-name/mp/mpvpaper/package.nix
diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/by-name/mp/mpw/package.nix
similarity index 100%
rename from pkgs/tools/security/mpw/default.nix
rename to pkgs/by-name/mp/mpw/package.nix
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/by-name/mq/mq-cli/package.nix
similarity index 100%
rename from pkgs/tools/system/mq-cli/default.nix
rename to pkgs/by-name/mq/mq-cli/package.nix
diff --git a/pkgs/tools/networking/mqtt-benchmark/default.nix b/pkgs/by-name/mq/mqtt-benchmark/package.nix
similarity index 100%
rename from pkgs/tools/networking/mqtt-benchmark/default.nix
rename to pkgs/by-name/mq/mqtt-benchmark/package.nix
diff --git a/pkgs/development/libraries/mqtt_cpp/default.nix b/pkgs/by-name/mq/mqtt_cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/mqtt_cpp/default.nix
rename to pkgs/by-name/mq/mqtt_cpp/package.nix
diff --git a/pkgs/tools/networking/mqttmultimeter/deps.nix b/pkgs/by-name/mq/mqttmultimeter/deps.nix
similarity index 100%
rename from pkgs/tools/networking/mqttmultimeter/deps.nix
rename to pkgs/by-name/mq/mqttmultimeter/deps.nix
diff --git a/pkgs/by-name/mq/mqttmultimeter/package.nix b/pkgs/by-name/mq/mqttmultimeter/package.nix
new file mode 100644
index 000000000000..191bc642d7c7
--- /dev/null
+++ b/pkgs/by-name/mq/mqttmultimeter/package.nix
@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, dotnetCorePackages
+, dotnet-runtime_8
+, buildDotnetModule
+, fetchFromGitHub
+, libglvnd
+, makeDesktopItem
+, copyDesktopItems
+}:
+
+buildDotnetModule rec {
+  pname = "mqttmultimeter";
+  version = "1.8.2.272";
+
+  src = fetchFromGitHub {
+    owner = "chkr1011";
+    repo = "mqttMultimeter";
+    rev = "v" + version;
+    hash = "sha256-vL9lmIhNLwuk1tmXLKV75xAhktpdNOb0Q4ZdvLur5hw=";
+  };
+
+  sourceRoot = "${src.name}/Source";
+
+  projectFile = [ "mqttMultimeter.sln" ];
+  nugetDeps = ./deps.nix;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnet-runtime_8;
+  executables = [ "mqttMultimeter" ];
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
+
+  postInstall = ''
+    rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}
+  '';
+
+  runtimeDeps = [
+    libglvnd
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = meta.mainProgram;
+      exec = meta.mainProgram;
+      icon = meta.mainProgram;
+      desktopName = meta.mainProgram;
+      genericName = meta.description;
+      comment = meta.description;
+      type = "Application";
+      categories = [ "Network" ];
+      startupNotify = true;
+    })
+  ];
+
+  meta = with lib; {
+    mainProgram = builtins.head executables;
+    description = "MQTT traffic monitor";
+    license = licenses.free;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/by-name/mr/mr/package.nix
similarity index 100%
rename from pkgs/applications/version-management/mr/default.nix
rename to pkgs/by-name/mr/mr/package.nix
diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/by-name/mr/mrbayes/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/mrbayes/default.nix
rename to pkgs/by-name/mr/mrbayes/package.nix
diff --git a/pkgs/tools/text/mrkd/default.nix b/pkgs/by-name/mr/mrkd/package.nix
similarity index 100%
rename from pkgs/tools/text/mrkd/default.nix
rename to pkgs/by-name/mr/mrkd/package.nix
diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/by-name/mr/mro-unicode/package.nix
similarity index 100%
rename from pkgs/data/fonts/mro-unicode/default.nix
rename to pkgs/by-name/mr/mro-unicode/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/by-name/mr/mrpeach/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/mrpeach/default.nix
rename to pkgs/by-name/mr/mrpeach/package.nix
diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/by-name/mr/mrsh/package.nix
similarity index 100%
rename from pkgs/shells/mrsh/default.nix
rename to pkgs/by-name/mr/mrsh/package.nix
diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/by-name/mr/mrtg/package.nix
similarity index 100%
rename from pkgs/tools/misc/mrtg/default.nix
rename to pkgs/by-name/mr/mrtg/package.nix
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/by-name/mr/mruby/package.nix
similarity index 100%
rename from pkgs/development/compilers/mruby/default.nix
rename to pkgs/by-name/mr/mruby/package.nix
diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/by-name/mr/mrxvt/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/mrxvt/default.nix
rename to pkgs/by-name/mr/mrxvt/package.nix
diff --git a/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch b/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
similarity index 100%
rename from pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
rename to pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/by-name/ms/ms-sys/package.nix
similarity index 100%
rename from pkgs/tools/misc/ms-sys/default.nix
rename to pkgs/by-name/ms/ms-sys/package.nix
diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix
index b06f097c76d8..5fd09f0035f8 100644
--- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix
+++ b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/lib
     install -m 755 usr/lib/libmsal_dbus_client.so $out/lib/
-    patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc.lib sdbus-cpp ]} $out/lib/libmsal_dbus_client.so
+    patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc sdbus-cpp ]} $out/lib/libmsal_dbus_client.so
 
     runHook postInstall
   '';
diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/by-name/ms/msat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/msat/default.nix
rename to pkgs/by-name/ms/msat/package.nix
diff --git a/pkgs/development/tools/build-managers/msbuild/deps.nix b/pkgs/by-name/ms/msbuild/deps.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/msbuild/deps.nix
rename to pkgs/by-name/ms/msbuild/deps.nix
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/by-name/ms/msbuild/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/msbuild/default.nix
rename to pkgs/by-name/ms/msbuild/package.nix
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/by-name/ms/mscgen/package.nix
similarity index 100%
rename from pkgs/tools/graphics/mscgen/default.nix
rename to pkgs/by-name/ms/mscgen/package.nix
diff --git a/pkgs/tools/security/msfpc/default.nix b/pkgs/by-name/ms/msfpc/package.nix
similarity index 100%
rename from pkgs/tools/security/msfpc/default.nix
rename to pkgs/by-name/ms/msfpc/package.nix
diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/by-name/ms/msgpack-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack-c/default.nix
rename to pkgs/by-name/ms/msgpack-c/package.nix
diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack-cxx/default.nix
rename to pkgs/by-name/ms/msgpack-cxx/package.nix
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/by-name/ms/msgpack-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/msgpack-tools/default.nix
rename to pkgs/by-name/ms/msgpack-tools/package.nix
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/by-name/ms/msgpack/generic.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack/generic.nix
rename to pkgs/by-name/ms/msgpack/generic.nix
diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/by-name/ms/msgpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack/default.nix
rename to pkgs/by-name/ms/msgpack/package.nix
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/by-name/ms/msgpuck/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpuck/default.nix
rename to pkgs/by-name/ms/msgpuck/package.nix
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/by-name/ms/msgviewer/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/msgviewer/default.nix
rename to pkgs/by-name/ms/msgviewer/package.nix
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/by-name/ms/msieve/package.nix
similarity index 100%
rename from pkgs/applications/science/math/msieve/default.nix
rename to pkgs/by-name/ms/msieve/package.nix
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/by-name/ms/msilbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/msilbc/default.nix
rename to pkgs/by-name/ms/msilbc/package.nix
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/by-name/ms/msitools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/msitools/default.nix
rename to pkgs/by-name/ms/msitools/package.nix
diff --git a/pkgs/tools/security/msldapdump/default.nix b/pkgs/by-name/ms/msldapdump/package.nix
similarity index 100%
rename from pkgs/tools/security/msldapdump/default.nix
rename to pkgs/by-name/ms/msldapdump/package.nix
diff --git a/pkgs/tools/misc/mslink/default.nix b/pkgs/by-name/ms/mslink/package.nix
similarity index 100%
rename from pkgs/tools/misc/mslink/default.nix
rename to pkgs/by-name/ms/mslink/package.nix
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/by-name/ms/msr-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/msr-tools/default.nix
rename to pkgs/by-name/ms/msr-tools/package.nix
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/by-name/ms/mstflint/package.nix
similarity index 100%
rename from pkgs/tools/misc/mstflint/default.nix
rename to pkgs/by-name/ms/mstflint/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/mstore/default.nix b/pkgs/by-name/ms/mstore/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/mstore/default.nix
rename to pkgs/by-name/ms/mstore/package.nix
diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/by-name/ms/mstpd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mstpd/default.nix
rename to pkgs/by-name/ms/mstpd/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mswatch/default.nix b/pkgs/by-name/ms/mswatch/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mswatch/default.nix
rename to pkgs/by-name/ms/mswatch/package.nix
diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/by-name/mt/mt-st/package.nix
similarity index 100%
rename from pkgs/tools/backup/mt-st/default.nix
rename to pkgs/by-name/mt/mt-st/package.nix
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/by-name/mt/mtail/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/mtail/default.nix
rename to pkgs/by-name/mt/mtail/package.nix
diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/by-name/mt/mtdev/package.nix
similarity index 100%
rename from pkgs/development/libraries/mtdev/default.nix
rename to pkgs/by-name/mt/mtdev/package.nix
diff --git a/pkgs/by-name/mt/mtm/package.nix b/pkgs/by-name/mt/mtm/package.nix
new file mode 100644
index 000000000000..97d2c72d52be
--- /dev/null
+++ b/pkgs/by-name/mt/mtm/package.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchFromGitHub, ncurses, darwin }:
+
+stdenv.mkDerivation rec {
+  pname = "mtm";
+  version = "1.2.1";
+
+  outputs = [ "out" "terminfo" ];
+
+  src = fetchFromGitHub {
+    owner = "deadpixi";
+    repo = pname;
+    rev = version;
+    sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
+  };
+
+  buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ darwin.libutil ];
+
+  makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ];
+
+  preInstall = ''
+    mkdir -p $out/bin/ $out/share/man/man1
+  '';
+
+  postInstall = ''
+    mkdir -p $terminfo/share/terminfo $out/nix-support
+    tic -x -o $terminfo/share/terminfo mtm.ti
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+  '';
+
+  meta = with lib; {
+    description = "Perhaps the smallest useful terminal multiplexer in the world";
+    homepage = "https://github.com/deadpixi/mtm";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = [ ];
+    mainProgram = "mtm";
+  };
+}
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/by-name/mt/mtpaint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/mtpaint/default.nix
rename to pkgs/by-name/mt/mtpaint/package.nix
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/by-name/mt/mtpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mtpfs/default.nix
rename to pkgs/by-name/mt/mtpfs/package.nix
diff --git a/pkgs/tools/networking/mtr-exporter/default.nix b/pkgs/by-name/mt/mtr-exporter/package.nix
similarity index 100%
rename from pkgs/tools/networking/mtr-exporter/default.nix
rename to pkgs/by-name/mt/mtr-exporter/package.nix
diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/by-name/mt/mtx/package.nix
similarity index 100%
rename from pkgs/tools/backup/mtx/default.nix
rename to pkgs/by-name/mt/mtx/package.nix
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/by-name/mu/mu/package.nix
similarity index 100%
rename from pkgs/tools/networking/mu/default.nix
rename to pkgs/by-name/mu/mu/package.nix
diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/by-name/mu/mubeng/package.nix
similarity index 100%
rename from pkgs/tools/networking/mubeng/default.nix
rename to pkgs/by-name/mu/mubeng/package.nix
diff --git a/pkgs/by-name/mu/mucommander/deps.json b/pkgs/by-name/mu/mucommander/deps.json
new file mode 100644
index 000000000000..0e59cecc9375
--- /dev/null
+++ b/pkgs/by-name/mu/mucommander/deps.json
@@ -0,0 +1,1819 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": {
+  "jediterm#jediterm-core/3.44": {
+   "jar": "sha256-Q/2Dc3iZNA/xep98U1lyHbJStLNihN8n9s4LqmzmAaM=",
+   "module": "sha256-67xQBnyqqFEYVDLmEyEBPI1Ytp23Sg+v7UB4cgmrObc=",
+   "pom": "sha256-U5/B6iPpNAxjy8RhgGbDAu76qqTQfWpKPYHrO7eyb4Y="
+  },
+  "jediterm#jediterm-ui/3.44": {
+   "jar": "sha256-ytRKdiuw4QmysGYckbDXfCLR1YTYRc/aEc0TgOz9miQ=",
+   "module": "sha256-1Sm+X5gRtwUTawDUZ0gT2ZkMh8L/UhF7A/B/2NaP7rM=",
+   "pom": "sha256-OqwtXLhLqTLfJ2nh2eUdXqSQMLt0+usdlDiltgbBnpQ="
+  },
+  "pty4j#purejavacomm/0.0.11.1": {
+   "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=",
+   "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s="
+  }
+ },
+ "https://plugins.gradle.org/m2": {
+  "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": {
+   "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk="
+  },
+  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": {
+   "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c="
+  },
+  "edu/sc/seis/launch4j#launch4j/2.5.4": {
+   "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=",
+   "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=",
+   "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8="
+  },
+  "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": {
+   "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=",
+   "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc="
+  },
+  "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": {
+   "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "ant#ant/1.6.5": {
+   "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=",
+   "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A="
+  },
+  "avalon-framework#avalon-framework-api/4.3": {
+   "jar": "sha256-/tYc754BBkWve1K2lMlYmv5TLKF/SOl3+xysa8A5UL4=",
+   "pom": "sha256-rIWI73kN92pgZnpBEagAqhv6c9iFiYu/q4htrwyOtwY="
+  },
+  "avalon-logkit#avalon-logkit/2.1": {
+   "jar": "sha256-XxE+SyULTHwh3T3aG7nkKgGwoBRTLjP8mnxzKr3Erpo=",
+   "pom": "sha256-7EPVfBpfHAORFIJgN67WhfuRZ17q7IXZ6h3MVgSJG6Y="
+  },
+  "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": {
+   "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=",
+   "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk="
+  },
+  "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": {
+   "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=",
+   "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ="
+  },
+  "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": {
+   "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=",
+   "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE="
+  },
+  "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": {
+   "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=",
+   "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw="
+  },
+  "biz/aQute/bnd#biz.aQute.repository/6.4.0": {
+   "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=",
+   "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo="
+  },
+  "biz/aQute/bnd#biz.aQute.resolve/6.4.0": {
+   "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=",
+   "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4="
+  },
+  "ch/qos/logback#logback-classic/1.2.3": {
+   "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=",
+   "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU="
+  },
+  "ch/qos/logback#logback-core/1.2.3": {
+   "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=",
+   "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A="
+  },
+  "ch/qos/logback#logback-core/1.4.0": {
+   "jar": "sha256-FOCaeJa+5u8uAFtI/FVg/iKZpXqCa8TB8cbUMALwUSw=",
+   "pom": "sha256-OQogrYWjQk0RPwyNj2ZNenc15gXEUwyuaxs/qz3EdQU="
+  },
+  "ch/qos/logback#logback-core/1.5.12": {
+   "pom": "sha256-q9tuWJh422jJrYYSyt8KIQm3hYd8ZGZnBafxaiTlouA="
+  },
+  "ch/qos/logback#logback-parent/1.2.3": {
+   "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo="
+  },
+  "ch/qos/logback#logback-parent/1.4.0": {
+   "pom": "sha256-ybgE3cIX34pXkK2CP+5lVTGWzxnpVnn9Jc91LexG5Jo="
+  },
+  "ch/qos/logback#logback-parent/1.5.12": {
+   "pom": "sha256-5mDh8HDVA4UK4HUhcOBVzgLrb4KVb0wq816AFMPuWtU="
+  },
+  "ch/qos/logback/logback-core/maven-metadata": {
+   "xml": {
+    "groupId": "ch.qos.logback",
+    "lastUpdated": "20241025204506",
+    "release": "1.5.12"
+   }
+  },
+  "ch/randelshofer#fastdoubleparser/0.8.0": {
+   "jar": "sha256-EP4oj9eiza9RdTMrc1Kfmr+P1U3P/zF9aWfAw1/7Ezs=",
+   "pom": "sha256-VWPl3UuwVHWfD4OFFgbZnSQm11wnNygUAnAF6S0cKqo="
+  },
+  "com/athaydes/osgiaas#osgiaas-cli-api/0.7": {
+   "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=",
+   "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE="
+  },
+  "com/athaydes/osgiaas#osgiaas-cli-core/0.7": {
+   "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=",
+   "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY="
+  },
+  "com/athaydes/osgiaas#osgiaas-common/0.7": {
+   "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=",
+   "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8="
+  },
+  "com/azure#azure-client-sdk-parent/1.7.0": {
+   "pom": "sha256-wefnVlRCMD/1TD6GNXTreh9pIR2EX6Q1/thCgxNL0Uo="
+  },
+  "com/azure#azure-core-http-netty/1.13.5": {
+   "jar": "sha256-t8qc2g5Ss9dIeypT++pyzPELBRbjz/LKC70WH7w587M=",
+   "pom": "sha256-8k0M8GyebhbrjdKrTP+jwtO5Tej/WbrhHagWvbX2omU="
+  },
+  "com/azure#azure-core/1.41.0": {
+   "jar": "sha256-4l36WpY+E1F+Y04xZmdkPI1V/JZxsgQs0P9EBVKPOfI=",
+   "pom": "sha256-NcSELoMrARfIV/GJksubh5zt4oeBG83gV383XCJhyMI="
+  },
+  "com/azure#azure-identity/1.9.2": {
+   "jar": "sha256-qjfuKsjQbS3LYHPxH1M5FmEcGRBmXOZDdxs2EKUers4=",
+   "pom": "sha256-EXBgdxY+sQ+NROkC3Z5b5BwefKRLtBoubvP8x9QeTwk="
+  },
+  "com/azure#azure-json/1.0.1": {
+   "jar": "sha256-KDw4/URqHRYk23N1VF2HVr/gavjMY3+FUYRkmfLsgow=",
+   "pom": "sha256-FTgCj66/3EghKzboi7i9edraT4Uv2MjM4BsoQFmwMRw="
+  },
+  "com/azure#azure-sdk-parent/1.6.0": {
+   "pom": "sha256-mDP57zl7whd1s4m+gWtWpomRiCIKJa0qQ4mwk2UDnJY="
+  },
+  "com/azure#azure-xml/1.0.0-beta.2": {
+   "jar": "sha256-1ZE+sclWldJBWR4FDxbcCyMugdS0AfpvnFZvRXe4roM=",
+   "pom": "sha256-G+9ukkm5tECQ6mczfm0mtgikmngJLGvgCVxSL64fg0k="
+  },
+  "com/beust#jcommander/1.82": {
+   "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=",
+   "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=",
+   "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM="
+  },
+  "com/dropbox/core#dropbox-core-sdk/7.0.0": {
+   "jar": "sha256-L6LLasLzL1lO/ffHn6hVOf6d8fCvyvnwP1cKlMmZE4c=",
+   "module": "sha256-si4Dd4nD+0ukio8ctHk/86ftF4FFnQ/CxZmMmSpZfqo=",
+   "pom": "sha256-IrYUPdZNJ/9S41KMkmXYsUeMhGEZE2lvBgK4n3E3DvE="
+  },
+  "com/fasterxml#oss-parent/38": {
+   "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug="
+  },
+  "com/fasterxml#oss-parent/43": {
+   "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY="
+  },
+  "com/fasterxml#oss-parent/48": {
+   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+  },
+  "com/fasterxml#oss-parent/50": {
+   "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc="
+  },
+  "com/fasterxml#oss-parent/56": {
+   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
+  },
+  "com/fasterxml/jackson#jackson-base/2.10.0": {
+   "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4="
+  },
+  "com/fasterxml/jackson#jackson-base/2.13.5": {
+   "pom": "sha256-8uQSGN1QuSzkmDxdLAQgndYc0eAPwSXjYAqp6vRQHeo="
+  },
+  "com/fasterxml/jackson#jackson-base/2.15.0": {
+   "pom": "sha256-UkKWvt4yGFrBEBLwfZJG44wZJTwrUT8c8oeZEho053A="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.10.0": {
+   "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.13.5": {
+   "pom": "sha256-Cia280q5P5z6gBeYiMa/Ql8cF9zZwR22VhOTkw/bdGo="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.14.2": {
+   "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.15.0": {
+   "pom": "sha256-4AwuhiKc2Wh5RpGukO7hWwjE1PV0jJs0u0ItcTRG3ZU="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.16.0": {
+   "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.10": {
+   "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.13": {
+   "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.14": {
+   "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.15": {
+   "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.16": {
+   "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.10.0": {
+   "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=",
+   "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.13.5": {
+   "jar": "sha256-gK6o7XIy21BAztSz+YLynalbs9gCND2/b9gszZjCHE8=",
+   "module": "sha256-V1RHbNv+Hc5wH/QUQ7FHQSL+5TEHgMnRbEoK/vlzvZQ=",
+   "pom": "sha256-RtVrd+RUf6R9Iq5EvJXgww76KFW56qsZ9TSfv+TAZMo="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.15.0": {
+   "jar": "sha256-ka3NPc9f2aFkmZNOdTaiPUVmkqAJPj1P1S8TjDk2NIw=",
+   "module": "sha256-vxVVouS7PyPbOR/EyN/GFX7GTow3ZYgUSiYPVBst4a4=",
+   "pom": "sha256-L4FZtEIZb6qg4TdOLSI0tX/uwysnYX+h1/XZqOC+Nyg="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.10.0": {
+   "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=",
+   "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.13.5": {
+   "jar": "sha256-SPNqAlMR0EZK2N2kUSogx54nmpVQ9j8xedcx2USCR0s=",
+   "module": "sha256-YmbmBIr3l7vrRuWx8bmjgyONWSjUD/ExgZkEUgGsMtk=",
+   "pom": "sha256-rZGrYCXrSK4yYigMQu/rtXtw0lwAqwppxaPHyjqAeO4="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.15.0": {
+   "jar": "sha256-W0g/aPqd1qo32jfR953VxLlGQjj08GYKJCy2tccklQw=",
+   "module": "sha256-7h0Go46NRNgaLmpvVLfYZK5LL/cQ3fWKK9+4kfJxc4E=",
+   "pom": "sha256-Cjr13zbx8n4XZEgXpiQJuqJYZKNJOj0ogK1wCbDnA64="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.10.0": {
+   "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=",
+   "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.13.5": {
+   "jar": "sha256-X+2ySyNWSRgV0YJn9l2poh3WdBM0Wtd5XyIa+iXHiYQ=",
+   "module": "sha256-HQzgnWo05MaImApbbjp/xKrhFFid9Eqa7Jf2ERrYXfI=",
+   "pom": "sha256-rhoE1XeQ6usGKh+iIGOraM7JCgMLc94tiasFIfJGVr4="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.15.0": {
+   "jar": "sha256-AMWl1a5xrI6NW42mBoQeIlHIBjVZOctdUcTNxrZEoNw=",
+   "module": "sha256-oahCNG/envxI3bk4tE8e7r1EaGj1zXAxMmZToTLAb4M=",
+   "pom": "sha256-jDgNP+PcwpjQKHmKH5Lfwxgk/aBBFEryNi8fzzDueI8="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.13.5": {
+   "jar": "sha256-7xXO3d3FjfvWhra3/QhT7TKP8Ixii9SjlXNL7CDKhXs=",
+   "module": "sha256-xO6k314TZO0p8BDUoDffcWWydfDAIdkfb1q9isD5IKc=",
+   "pom": "sha256-niBiIkjdUnZ/9vd4Z5BdfmVSNEPm4ALmuAvDmoVHE54="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.0": {
+   "jar": "sha256-1d65LVlmio3grI2oGNXZwP37Tbay8dZqd5/jV/MQ1kg=",
+   "module": "sha256-nkeKUELDePkAYsbObhljySaYhK7DhLfz1xbspH1ZIME=",
+   "pom": "sha256-sakbDIxFfs4JpHeRkyoKlBxQNz5frahmiIESH4J75jA="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.13.5": {
+   "pom": "sha256-hg2LWRRPDSDOqtPIBztQbEKkrkjrpPu7El6fc+dj4fs="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.15.0": {
+   "pom": "sha256-GMM7hIDiDXY2SpvZyxoV/XUXVJDJ4NyxKitCIymmqCc="
+  },
+  "com/fifesoft#rsyntaxtextarea/3.5.0": {
+   "jar": "sha256-pCYtsfsa3RuRLnEg44RFKCbWTrdxQn2Pd0Jqp6ReGoU=",
+   "module": "sha256-GwhM5SvwzNTjv7dCWsD9byRym/DEskhJq44N0tJczFg=",
+   "pom": "sha256-vlhVxdk8V/ViDaP4tljkeaN8kCWasK5t4Wag/6R5tVc="
+  },
+  "com/formdev#flatlaf/1.0": {
+   "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=",
+   "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=",
+   "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo="
+  },
+  "com/formdev#flatlaf/2.2": {
+   "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=",
+   "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=",
+   "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo="
+  },
+  "com/formdev#flatlaf/2.6": {
+   "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=",
+   "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=",
+   "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ="
+  },
+  "com/github/junrar#junrar/7.5.5": {
+   "jar": "sha256-4BuUlofipbTGgBHBcCql0syObEWGVqwskWWLac67G7M=",
+   "module": "sha256-MN6tDcEK8MzjOqrkn/l21sIvsbOImoZdOoXjfHKbogo=",
+   "pom": "sha256-eLkOtUPiaTa9zzpOq5cAazwdVk2b+9660FyMbAj4GYY="
+  },
+  "com/github/mwiede#jsch/0.2.10": {
+   "jar": "sha256-cX/gOLA7YG4J5nS60qw6e2qmQTEpHRzBxIn5nBqlY8o=",
+   "pom": "sha256-3TLAFA6lM8J5cp34jMLfYQQwLDT0e7M+yrLv0G3hU8E="
+  },
+  "com/github/pcorless/icepdf#icepdf-core/7.1.3": {
+   "jar": "sha256-XhWwX2/GNUqHLpXvcU9VbHlZZArXU+thAWwMDpZevEU=",
+   "pom": "sha256-xchpL8QmzK2SxF6xBShAEe/K7VSVtiaSM3x/NN2ov/g="
+  },
+  "com/github/pcorless/icepdf#icepdf-viewer/7.1.3": {
+   "jar": "sha256-6kQABjXgnLQouNwIe2hWWgHA1nFxDajcdWcT5Kbtbrs=",
+   "pom": "sha256-G4hXWQ5g8pl8qQfPIXA9RYi1jZYUzJEfcBDd9cl60aY="
+  },
+  "com/github/spotbugs#spotbugs-annotations/4.7.3": {
+   "jar": "sha256-wP0awuIqzdRpE6L/dFUbcfEkRXGZaIaYIEr0vz1DFl0=",
+   "module": "sha256-C85puO9wOJqNWr30ddFzAXe1CeQYZGP/2x1emmrVz/4=",
+   "pom": "sha256-NpAQoZC5Xi2aJi2OxRfexrZIeqGhuUaKKBY5SvS6J7Q="
+  },
+  "com/github/stephenc/jcip#jcip-annotations/1.0-1": {
+   "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=",
+   "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs="
+  },
+  "com/google/android#annotations/4.1.1.4": {
+   "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=",
+   "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng="
+  },
+  "com/google/api#api-common/2.12.0": {
+   "jar": "sha256-PRcoPEEmEnuZBnEhi+4KLnl8GrH+cQKRbCx8WNIJJZY=",
+   "pom": "sha256-CXwru4X0wVxbfF3HZwn28d8vp9mJnRFn/ImXJsrFss0="
+  },
+  "com/google/api#gapic-generator-java-bom/2.21.0": {
+   "pom": "sha256-yat2y3B7cpvKEcG2csC8Rm3+HNn8whVwNNkzLxdo7bo="
+  },
+  "com/google/api#gapic-generator-java-pom-parent/2.21.0": {
+   "pom": "sha256-VnHy90HoxMfV4JTQ2xy+0uZbY33KsFQmSJ268BImLLE="
+  },
+  "com/google/api#gax-bom/2.29.0": {
+   "pom": "sha256-XBa6jaP2ASSK5KhccDGy97o5e06qatdoZlSGaP9hn2E="
+  },
+  "com/google/api#gax-grpc/2.29.0": {
+   "jar": "sha256-fw2Bn/ll3cbzmmEe9LHyMENBAYkm33eFFe0EvfRHcTg=",
+   "pom": "sha256-YpEUH7lWvCzCRfQoK/oEJ7kIViWeL+VzD12y4x/6IqE="
+  },
+  "com/google/api#gax-httpjson/0.114.0": {
+   "jar": "sha256-pwanjb2VZAw1NbMy8nHUcVMnxqhnH4aqvhgwb1T/0ho=",
+   "pom": "sha256-FffanA4jix09ir3uV+EyYAxc2QwWoR7Ch2YJS07t/ww="
+  },
+  "com/google/api#gax-parent/2.29.0": {
+   "pom": "sha256-uu1P0cGgGcLmCPZoq5pd8JzoMlZG8I+FUA0CGt8fmwc="
+  },
+  "com/google/api#gax/2.29.0": {
+   "jar": "sha256-nzyCG2KvlkO5EMGxv2kGUGh0mRJ+4Lh60EQJ8beShe0=",
+   "pom": "sha256-dXjTQWNUZ4AciLYrP6fUyaAwcg9MlffP4khVNxLI128="
+  },
+  "com/google/api-client#google-api-client-bom/2.2.0": {
+   "pom": "sha256-8RtgZOZIf6TI7TEBOXsHnXbGrQB5r2+nDjoFglBfBYs="
+  },
+  "com/google/api-client#google-api-client-parent/2.0.0": {
+   "pom": "sha256-+RC/VDdkToiqHNYwkToFI1gvx5RK2bW9rP8sFYlk61o="
+  },
+  "com/google/api-client#google-api-client-parent/2.2.0": {
+   "pom": "sha256-kOYt+D6q2B1PW6yK8RF5wKrtsgO8xkiKKaD3XXccov8="
+  },
+  "com/google/api-client#google-api-client/2.0.0": {
+   "jar": "sha256-+vAvQHDE9ZHn0aWRFh2jvuLQjiu5xFeGRVWej1XPa3s=",
+   "pom": "sha256-jP8IwUzUQqvT/+GzJxgwSENWe/ef3dYshP9mhM9eNyQ="
+  },
+  "com/google/api-client#google-api-client/2.2.0": {
+   "jar": "sha256-WOyp+wqGk5Fon/yCizvQsZrHYEL/n6tIge3ff952kD8=",
+   "pom": "sha256-TRf5M7m2Wf0JAtun+CDhvmcsC1IVNjSpUMwf+7XSI/w="
+  },
+  "com/google/api/grpc#gapic-google-cloud-storage-v2/2.23.0-alpha": {
+   "jar": "sha256-mzZwsaFQ1Wf5BMm1rxfPuZd8W7HYzEwoDHx3F7H3hIQ=",
+   "pom": "sha256-uwToIdnCzIEngO0oGmQD7tW5R55ijY1iWTrU/TnOOuk="
+  },
+  "com/google/api/grpc#grpc-google-cloud-storage-v2/2.23.0-alpha": {
+   "jar": "sha256-4KnnWn+lrokVZnuKemtm1RPmTeFKruW2kshtB32hFcU=",
+   "pom": "sha256-u70CMNpfoXxwe1Vzs1A0SNw/sIpS+DAbuoXAwYVxBDc="
+  },
+  "com/google/api/grpc#proto-google-cloud-storage-v2/2.23.0-alpha": {
+   "jar": "sha256-jU+n4PaXjdCScbITDqH5WmVUSYtvTxV1JGQa+6eE/Sk=",
+   "pom": "sha256-LJrDR5T7r+Zg7m1x71Gkrn1pQ1NF4DGj1a0JkCAlsy0="
+  },
+  "com/google/api/grpc#proto-google-common-protos/2.20.0": {
+   "jar": "sha256-77Yg0RCbzf8/LJvy1SChjws5v9F9WF859ul+wnVpkxg=",
+   "pom": "sha256-0xsEHk8osgs3ZOkPDqbypb/TdqWAH35DSC4ueXXCXI4="
+  },
+  "com/google/api/grpc#proto-google-iam-v1/1.15.0": {
+   "jar": "sha256-Jq3Pe1NdWL4F9yFFQyHVPnCH/hGMZr+zyHrPajAYUpU=",
+   "pom": "sha256-5X4mSbLY0jGpxWxSSsDKtgxqBU2rVcnZFWCi2KOhx8E="
+  },
+  "com/google/apis#google-api-services-drive/v3-rev20220815-2.0.0": {
+   "jar": "sha256-W8MsCZfaoq2Q0Zj64ZAQAORn7z4q1HBZvhFliPs1ZjY=",
+   "pom": "sha256-Pg9xPufuHatcYGsxuC4ZPjt/5NW2nqp/onS9h8qEre8="
+  },
+  "com/google/apis#google-api-services-storage/v1-rev20230617-2.0.0": {
+   "jar": "sha256-Q0hLMrQQsrj/MqyasbicA5xyfC43Rl43XOKEbVqARkU=",
+   "pom": "sha256-OdEbFG/3/0hU4dRRUUUljwFgIIJyUeP4yt0TtYeHYYI="
+  },
+  "com/google/auth#google-auth-library-bom/1.17.0": {
+   "pom": "sha256-q189O6vBm1c/g8TmeZ44b9lzKDqbkNIn8rgrBl+9xY4="
+  },
+  "com/google/auth#google-auth-library-credentials/1.17.0": {
+   "jar": "sha256-XeNk7nqc6V2HFb8SS9sNlJ03ZJkU24RsxwBVhPunzk0=",
+   "pom": "sha256-eykzIvpbe9T74FQQzf4udTpy8hjjhgz8ppBh4DchaqE="
+  },
+  "com/google/auth#google-auth-library-oauth2-http/1.17.0": {
+   "jar": "sha256-uBSOGvDEGXrqcH0BZrTtcKdbju5yRr5+sCKKSDQJXnA=",
+   "pom": "sha256-t+/XqUPWEOCTfmQtuEir4tF+y6Kf+1AX0NZXko6BmNQ="
+  },
+  "com/google/auth#google-auth-library-parent/1.17.0": {
+   "pom": "sha256-1NeR/QXmN0n4NRQkqaXa6YuigG1ckiKMDA/ETcCfV+8="
+  },
+  "com/google/auto/value#auto-value-annotations/1.10.1": {
+   "jar": "sha256-pP4KIRkl6TioUQ10F2PuEXGhG/kx9Yke9NTuhPynK+I=",
+   "pom": "sha256-n7rMhpTRkE37TVrx5KVGD9ZMHKnQBJ0YFFQs0q0osEc="
+  },
+  "com/google/auto/value#auto-value-parent/1.10.1": {
+   "pom": "sha256-9y2jrhi84YuHRM1yM6qDSjLTvR4LRTsV9tujP3lzz+k="
+  },
+  "com/google/cloud#first-party-dependencies/3.11.0": {
+   "pom": "sha256-nN2Y625KV+jC1GnjnONRPbJQGaWNmY2X3es2OC4g+ig="
+  },
+  "com/google/cloud#google-cloud-core-bom/2.19.0": {
+   "pom": "sha256-R1d+AUcHWXUpQCzuCXVyw3B59osRrBhqURnVc8uroEE="
+  },
+  "com/google/cloud#google-cloud-core-grpc/2.19.0": {
+   "jar": "sha256-yDpYgn2A468XXxJVK+guLLbzo+A/1+RYlKYU0TzzQrU=",
+   "pom": "sha256-HJqvT/ynaiy/+YGgzdseKA9WaEkVv1z8vrK/yIv5YX8="
+  },
+  "com/google/cloud#google-cloud-core-http/2.19.0": {
+   "jar": "sha256-BAynBQHjPez+2d9+44HCc8btxSj07Zyz549vUFYKEMI=",
+   "pom": "sha256-gidJQIiur3uJzlCT2xgQfDjBzTzJJ4z43vQrmzM4M5I="
+  },
+  "com/google/cloud#google-cloud-core-parent/2.19.0": {
+   "pom": "sha256-ds6+05V6Z5s+YI9p/+oehGXyStNjDlmwd1zdJywhrP0="
+  },
+  "com/google/cloud#google-cloud-core/2.19.0": {
+   "jar": "sha256-1HR8ZJtsfgb/SfdfMByNsXu/SnK/lhk+Tkplwzu25jk=",
+   "pom": "sha256-3CToTf0yRgp35WVVOc5a53emz/2eHaod3bE0K1JKTZ4="
+  },
+  "com/google/cloud#google-cloud-shared-config/1.5.5": {
+   "pom": "sha256-mLz9fSHahIoeXpTp4VJG+eHoe1bJ54zxfJsSOG4jrnM="
+  },
+  "com/google/cloud#google-cloud-shared-config/1.5.6": {
+   "pom": "sha256-XtWUwTSjPrMih22HFNOiXb4kYV3kFa6HUkkNzZya7DM="
+  },
+  "com/google/cloud#google-cloud-shared-dependencies/3.11.0": {
+   "pom": "sha256-2zF4EnZoKP90h/U/sLxkVI9MSu2ppNj1jf7VBf64TVM="
+  },
+  "com/google/cloud#google-cloud-storage-parent/2.23.0": {
+   "pom": "sha256-03f/JUOdq3jk6q9gYh3wmr7usbBbS2r1PtSPn0pBDYs="
+  },
+  "com/google/cloud#google-cloud-storage/2.23.0": {
+   "jar": "sha256-lwD8xMevx+i+CbpHsooKzVsH79wqD9NVfpoDmBlrfc0=",
+   "pom": "sha256-9dLU2nyhmy3AhN8UUvcCUkHBRXj8567NCRGMkjpDpPw="
+  },
+  "com/google/cloud#third-party-dependencies/3.11.0": {
+   "pom": "sha256-GdHtxT8CJZACmw7UQK80zkx+CU0N4csD87ofw+JkeGs="
+  },
+  "com/google/code/findbugs#jsr305/1.3.9": {
+   "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=",
+   "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+  },
+  "com/google/code/gson#gson-parent/2.9.0": {
+   "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ="
+  },
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+  },
+  "com/google/code/gson#gson/2.9.0": {
+   "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=",
+   "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w="
+  },
+  "com/google/errorprone#error_prone_annotations/2.11.0": {
+   "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=",
+   "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg="
+  },
+  "com/google/errorprone#error_prone_annotations/2.18.0": {
+   "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=",
+   "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
+  },
+  "com/google/errorprone#error_prone_parent/2.11.0": {
+   "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE="
+  },
+  "com/google/errorprone#error_prone_parent/2.18.0": {
+   "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
+  },
+  "com/google/guava#failureaccess/1.0.1": {
+   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+  },
+  "com/google/guava#guava-bom/31.1-jre": {
+   "pom": "sha256-oRnYiA5WquiLFvM8gFLk1uZJoi4Xjzkd7zsvsfShKeY="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/31.1-jre": {
+   "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw="
+  },
+  "com/google/guava#guava-parent/32.1.2-jre": {
+   "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8="
+  },
+  "com/google/guava#guava/31.1-jre": {
+   "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=",
+   "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI="
+  },
+  "com/google/guava#guava/32.1.2-jre": {
+   "jar": "sha256-vGXep8/Z5NrPhBnYrw50FlWFfSeIW7NdlD1xh/w6j84=",
+   "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=",
+   "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/http-client#google-http-client-apache-v2/1.42.1": {
+   "jar": "sha256-i0lVds+VmtJvz90DzfeC+iF0EgxIxRX+cbcBSKlRwgo=",
+   "pom": "sha256-M0NK1qFkN7xZazUcAsMKU3vrK4v7+j6qcN8IDaJZfsY="
+  },
+  "com/google/http-client#google-http-client-apache-v2/1.43.1": {
+   "jar": "sha256-GLJai+1jCnuQIEtwIPciGf3aZDk1/KZAXm45N66Ss2E=",
+   "pom": "sha256-RNoyc7bYyQk4TpwvayCtTsToyVmYGgjCConScF/X1G0="
+  },
+  "com/google/http-client#google-http-client-appengine/1.43.1": {
+   "jar": "sha256-k3YkhKkyT4JEVbJNoMtpin40Z+Lkli7lQaFP8ZIsOog=",
+   "pom": "sha256-A/hib01jYL8WzTfzfTyiqXWT7xfSkisP/pTpgTPfPUo="
+  },
+  "com/google/http-client#google-http-client-bom/1.42.0": {
+   "pom": "sha256-mP9hZSXmP9BhMiFZAVOOI/9nrtuJNM0l3FkkjwzAU4w="
+  },
+  "com/google/http-client#google-http-client-bom/1.42.1": {
+   "pom": "sha256-5t0Lk5ba4pFnRDOT7p58BP0v0Q5W0PdLYa4lZoqNq4o="
+  },
+  "com/google/http-client#google-http-client-bom/1.42.3": {
+   "pom": "sha256-SllPSmi+keMqV7keI9plQGixLtIveYBfvNYiYfULR+w="
+  },
+  "com/google/http-client#google-http-client-bom/1.43.1": {
+   "pom": "sha256-eSc6FEsB1GX+f+tvJLN7Gfbv0mCOXvEviOY1sf3toEg="
+  },
+  "com/google/http-client#google-http-client-gson/1.42.1": {
+   "jar": "sha256-QJ6ODMsAY9H9oEQC7hfqWSmPHZL88/aWv+EpD5EJ2wE=",
+   "pom": "sha256-uXkojNI6XO2QQ7YDlF+wZywNciXelr/izn3TLBBtb/c="
+  },
+  "com/google/http-client#google-http-client-gson/1.43.1": {
+   "jar": "sha256-AXQG5RBaMxR6sTuve0kf9T2Z5UpeK2G3zNZR4WQilpg=",
+   "pom": "sha256-EqhE8wvEQ29kCX2xTYNt7vxshmldPFpetmi76P8OaUE="
+  },
+  "com/google/http-client#google-http-client-jackson2/1.43.1": {
+   "jar": "sha256-HUH6ED2kMtxJtBoyHv/D4v2nIqPciWqJ3Nw6TV/oIlU=",
+   "pom": "sha256-HuIU+V8PJoHgZMZU8Nd7UHvQ3aFt2IkISe1NVU6/trg="
+  },
+  "com/google/http-client#google-http-client-parent/1.42.1": {
+   "pom": "sha256-6xc8NOLKP7hwvV5pCJ8oPn0ifISs4UxPVko+cpYqUlA="
+  },
+  "com/google/http-client#google-http-client-parent/1.43.1": {
+   "pom": "sha256-fOZP1l2/NuZ5y+SUhU79JODdC/xXe1umLNCV5q8u6xM="
+  },
+  "com/google/http-client#google-http-client/1.42.1": {
+   "jar": "sha256-5cdHPnrTpa6KtEs4+9yygtdoQRS3RLuWiUGNYbewEQU=",
+   "pom": "sha256-HDyBoqVijXGQWl4TBRlz1OqxX1CIzxZXN1bBWRNySW0="
+  },
+  "com/google/http-client#google-http-client/1.43.1": {
+   "jar": "sha256-g043sK8s/oCyl75NalyP0MyrHQsT6bjXrJIejdLyUew=",
+   "pom": "sha256-21zBH3o7xj6nYyIPc6n1GO173MhAZ2Mt5VXeWQPtmPI="
+  },
+  "com/google/j2objc#j2objc-annotations/1.3": {
+   "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+   "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
+  },
+  "com/google/oauth-client#google-oauth-client-bom/1.34.1": {
+   "pom": "sha256-6WOBq0Zz9W3gDWxbRwwnsjFuZ4wr/8IK6ozfMqcuIT4="
+  },
+  "com/google/oauth-client#google-oauth-client-java6/1.34.1": {
+   "jar": "sha256-lwRiwuzGRVK0s4SFTTwPLP7rrANOchDhhz7m6AHpP1o=",
+   "pom": "sha256-zJKBseI64bHI6SBycx1ZVAy3AMY/ybZo1YcsOVrLjYM="
+  },
+  "com/google/oauth-client#google-oauth-client-jetty/1.34.1": {
+   "jar": "sha256-/wnm1DwYITDXGG8eLJMqpF+tK8Lkvd2OgXAtQYUqsV4=",
+   "pom": "sha256-0o5G3OUJmDmnNoQXPZ7sEPLxUdrbEOiYnbd514ZfgVE="
+  },
+  "com/google/oauth-client#google-oauth-client-parent/1.34.1": {
+   "pom": "sha256-N4sHWGVenWD93gjaiF0Vg4BAvL34ivrXrtEK8Ve0QD8="
+  },
+  "com/google/oauth-client#google-oauth-client/1.34.1": {
+   "jar": "sha256-GT7fl676KLk8WJK9xZi6w0+kw5ZYgDAITykLFEDouYo=",
+   "pom": "sha256-yF9HUepssOHsTxEwM89Odhw6vabX9BDJ1qQmpUWrgps="
+  },
+  "com/google/protobuf#protobuf-bom/3.23.2": {
+   "pom": "sha256-loU/+3OF4oU3+uLBegaGRT2H38ixPJ3P3QqS0e7yPxw="
+  },
+  "com/google/protobuf#protobuf-java-util/3.23.2": {
+   "jar": "sha256-ZEl1t4DX6N5ULdoW1M6xV7QKUqi+VkUiHp/QJu8gSxM=",
+   "pom": "sha256-jXBQCvaL7cGh95eLuwX3swQ2ePVHa1ZZmcv7pHOISlI="
+  },
+  "com/google/protobuf#protobuf-java/3.23.2": {
+   "jar": "sha256-GKBX9eD4KNqpK3HBnfkfa8wqrQZ8os3WtWmAVcp7zs4=",
+   "pom": "sha256-tQSdHWWfBDzwspcNOVJwjoEU9HuikwQkZan68m1LE3k="
+  },
+  "com/google/protobuf#protobuf-parent/3.23.2": {
+   "pom": "sha256-kjOkIPNJLyzaTArVYRiN6VxSTs5pKSK1T+xQZ1JLbn4="
+  },
+  "com/google/re2j#re2j/1.7": {
+   "jar": "sha256-T2V69Rq4uwkJvMPrQIYtJhJa+MvPkqqrpZX+13+Ue8A=",
+   "pom": "sha256-i7C3rpQfVyzEnH0DFdpHf89wHFkZPJalqP4tWcCVepo="
+  },
+  "com/googlecode/javaewah#JavaEWAH/1.1.13": {
+   "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
+   "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+  },
+  "com/googlecode/json-simple#json-simple/1.1.1": {
+   "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=",
+   "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M="
+  },
+  "com/googlecode/plist#dd-plist/1.23": {
+   "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=",
+   "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM="
+  },
+  "com/ibm/icu#icu4j/59.2": {
+   "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=",
+   "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0="
+  },
+  "com/jamesmurty/utils#java-xmlbuilder/1.1": {
+   "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=",
+   "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4="
+  },
+  "com/microsoft/azure#msal4j-persistence-extension/1.2.0": {
+   "jar": "sha256-aNg3QZ702HCO07jIgdb8Isnt+BZ/TnAYtiG8od/XUyo=",
+   "pom": "sha256-gvbJWI44ai2Iq3QatIydFTlAVvgAkDyLdS3KLhmXkSU="
+  },
+  "com/microsoft/azure#msal4j/1.13.8": {
+   "jar": "sha256-LvoCWte4PkqqjaTAiFtg1NvoL5iwD1IE+AEsWz1IGQM=",
+   "pom": "sha256-+AIib1yfOX8KT1HF7z2GxVjwYgk34ajU6KMxP3Kw3ic="
+  },
+  "com/microsoft/graph#microsoft-graph-core/2.0.19": {
+   "jar": "sha256-9F69ueIXfOOw+3Tv/ECWE7KMbpCZEvrKpmiyOuY64Tw=",
+   "module": "sha256-7mGJwLNuXS1h8UN234DS+SPICLtgpPRN49fV400ksa0=",
+   "pom": "sha256-/bosQFOC5is3UmFaohhIF07ibVSc4tWxHhZRehWZsJQ="
+  },
+  "com/microsoft/graph#microsoft-graph/5.67.0": {
+   "jar": "sha256-XAlLePWp3FRZS+eQWN8iyufT7hEr1fItcDwOivnabAE=",
+   "module": "sha256-tQBfduI1BftIRwqowjWO8NfK8trpavzKQUdxhCjyU80=",
+   "pom": "sha256-hJHorlQ6aDgitjtwCaOGSdbHR3KwveDNe2bVliCYJOE="
+  },
+  "com/nimbusds#content-type/2.2": {
+   "jar": "sha256-cw8YFhlhReiCdQk8FH8ubaPD5UEges01A6GwYSm5vqk=",
+   "pom": "sha256-iznCFjD7tvBIqAflfjy/c17zDaPxHnAZ5muqa5fa8Gs="
+  },
+  "com/nimbusds#lang-tag/1.7": {
+   "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=",
+   "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4="
+  },
+  "com/nimbusds#nimbus-jose-jwt/9.30.2": {
+   "jar": "sha256-HF89lM09d9YXb4VPHHjrZYz7g++APw2lT7R59WFJce8=",
+   "pom": "sha256-wI/3srHtdUZS3KQqwWyaPGqG8bj2gKY92nDx636/2fQ="
+  },
+  "com/nimbusds#oauth2-oidc-sdk/10.7.1": {
+   "jar": "sha256-8DsrqKUBzIfhuQcQbbsuU7wrfP+DUtC6gmi2NvhVXdo=",
+   "pom": "sha256-uUig3Af6U7rd3OrxtihjiWzIpihNLBAh/AJ8/3mmMI8="
+  },
+  "com/squareup/okhttp3#okhttp/4.11.0": {
+   "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=",
+   "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=",
+   "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94="
+  },
+  "com/squareup/okio#okio-jvm/3.5.0": {
+   "jar": "sha256-qheG6VYytxb1qFokMm3NUWwkqSlIkwjRTZIvGP44TTg=",
+   "module": "sha256-pz6DPrY/7Q4Y8j+WtjQdsyiaMY/eznVjsGeBVigOE5I=",
+   "pom": "sha256-BxH2z8tQUo9Jmf1NlzVFiAwSq5kMzprY3mSZmCmtRss="
+  },
+  "com/squareup/okio#okio/3.2.0": {
+   "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=",
+   "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE="
+  },
+  "com/sun/activation#all/1.2.0": {
+   "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
+  },
+  "com/sun/activation#javax.activation/1.2.0": {
+   "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=",
+   "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4="
+  },
+  "com/thoughtworks/xstream#xstream-parent/1.4.19": {
+   "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM="
+  },
+  "com/thoughtworks/xstream#xstream/1.4.19": {
+   "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=",
+   "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34="
+  },
+  "com/twelvemonkeys#twelvemonkeys/3.11.0": {
+   "pom": "sha256-ELLAgOMiZw7tfeBiRNhMx8WVOSfuWvPdjESGVaOAW78="
+  },
+  "com/twelvemonkeys#twelvemonkeys/3.9.4": {
+   "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc="
+  },
+  "com/twelvemonkeys/common#common-image/3.11.0": {
+   "jar": "sha256-Eh98YraQ0tUk6rzx8xrExnfBSPbDLXQpzMA6ZFFqr5M=",
+   "pom": "sha256-hY/Ng2sxCdCvls0v0+kjnlqrTneeS/o7VPgORp8q89U="
+  },
+  "com/twelvemonkeys/common#common-io/3.11.0": {
+   "jar": "sha256-mdLCffXUw84CSaPaoq1Jw5ZDo99lPAfL4igpiIklWMo=",
+   "pom": "sha256-5AuxgXc7Nc23kjFV8TbM2yg9+HZdRH+TQlFbNwlGfHE="
+  },
+  "com/twelvemonkeys/common#common-lang/3.11.0": {
+   "jar": "sha256-F7hKpUp7POYjD2FWfua6OTLL49AWRbBTh+0wcV07evo=",
+   "pom": "sha256-gkGjHq7rObaHS0h2amKKDOwrfzY8DvbCH7afao4JTvw="
+  },
+  "com/twelvemonkeys/common#common/3.11.0": {
+   "pom": "sha256-HjI1GeG/W9NRqeBIInSmPZ+SqtTGT8mRhl+3GGedUBQ="
+  },
+  "com/twelvemonkeys/imageio#imageio-core/3.11.0": {
+   "jar": "sha256-qlGUZvr/VPXhKXNxhWerSrPD0UxcW+1/wO7tQjmkjrk=",
+   "pom": "sha256-d8uK45DuE/xJIu4NYsJiZHaHQteb9ecMqA64gWAhNyM="
+  },
+  "com/twelvemonkeys/imageio#imageio-jpeg/3.11.0": {
+   "jar": "sha256-QpHkgCWdoU8AUTiSgRL2s1rO/HKpVF6pjZl+hDxV2z4=",
+   "pom": "sha256-1zL4MhQY/ADaI1fEDNXlIL3evP+UAdd8+I+Bp2xjxhQ="
+  },
+  "com/twelvemonkeys/imageio#imageio-metadata/3.11.0": {
+   "jar": "sha256-3j07qmCDbvYGmKf5vP2z4YAugUCh1TQtZmFS5qmR5ZY=",
+   "pom": "sha256-5FipFdep0DcdTYgyq90rP8Q2GKWj9/BFcRrL0FKMBK8="
+  },
+  "com/twelvemonkeys/imageio#imageio-psd/3.11.0": {
+   "jar": "sha256-akCfOParHTd/fFcU+OvAN+CVex8IjZwb1j7lPQWjoVo=",
+   "pom": "sha256-FQzNSOegAc61jrZg3FqGszM3dA+NhKa57QJaSoQxaaE="
+  },
+  "com/twelvemonkeys/imageio#imageio-tiff/3.11.0": {
+   "jar": "sha256-xEq8bYNS4rdXfquWKpS/CT+rftg3G9/dnJVd4y7NpRU=",
+   "pom": "sha256-/qrWPU1vaHuXMsWyRZ26lFtRnzSEloZypigWNX7ASW8="
+  },
+  "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": {
+   "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=",
+   "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo="
+  },
+  "com/twelvemonkeys/imageio#imageio-webp/3.11.0": {
+   "jar": "sha256-dgoMoYgzlI/TCvs0UlxW9b/xk+d4PUhSILaODVQ8QUA=",
+   "pom": "sha256-E/tHQxNVJpNOwb3iLbn6kqQtxOWBX/SCEZs5knu3STU="
+  },
+  "com/twelvemonkeys/imageio#imageio/3.11.0": {
+   "pom": "sha256-VyQzrPzkVWEQr8x2N5AOyamDYJTMjtobIMDDuR/x24Q="
+  },
+  "com/twelvemonkeys/imageio#imageio/3.9.4": {
+   "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo="
+  },
+  "commons-beanutils#commons-beanutils/1.9.4": {
+   "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
+   "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
+  },
+  "commons-cli#commons-cli/1.2": {
+   "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=",
+   "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE="
+  },
+  "commons-codec#commons-codec/1.11": {
+   "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
+   "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
+  },
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+  },
+  "commons-codec#commons-codec/1.17.1": {
+   "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
+  },
+  "commons-codec#commons-codec/1.3": {
+   "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=",
+   "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY="
+  },
+  "commons-codec#commons-codec/1.9": {
+   "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=",
+   "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA="
+  },
+  "commons-codec/commons-codec/maven-metadata": {
+   "xml": {
+    "groupId": "commons-codec",
+    "lastUpdated": "20240715222428",
+    "release": "1.17.1"
+   }
+  },
+  "commons-el#commons-el/1.0": {
+   "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=",
+   "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ="
+  },
+  "commons-httpclient#commons-httpclient/3.0.1": {
+   "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4="
+  },
+  "commons-httpclient#commons-httpclient/3.1": {
+   "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=",
+   "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
+  "commons-logging#commons-logging/1.3.2": {
+   "jar": "sha256-a4WEJPUYAV8yv80Rg6Nz9Kgn1y0Ca2Ax2gyRzw6PNIk=",
+   "pom": "sha256-ZMFGqsSRjMPiHhMij1/kF4VZM7GBN0zML4me8eFWsm0="
+  },
+  "commons-net#commons-net/1.4.1": {
+   "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=",
+   "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko="
+  },
+  "commons-net#commons-net/3.8.0": {
+   "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=",
+   "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k="
+  },
+  "eu/agno3/jcifs#jcifs-ng/2.1.7": {
+   "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=",
+   "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI="
+  },
+  "geronimo-spec#geronimo-spec-javamail/1.3.1-rc3": {
+   "jar": "sha256-2csVzW2TcROVzGxA9I3/XLhVvH93PC4LMLDg/U41zZE=",
+   "pom": "sha256-Dh0EUnPLYh/wfMrN03zjHThvUpKD+9rQQqzbKvH78X4="
+  },
+  "geronimo-spec#geronimo-spec-jms/1.1-rc4": {
+   "jar": "sha256-g66m8pdo+3frakJkwH/onqxYZfIC34jsvJQGl5AfGP8=",
+   "pom": "sha256-D00st0zeuSzp+/tOaC1AP6Uq0D7d/b9FTLdmyAN8Bl8="
+  },
+  "hsqldb#hsqldb/1.8.0.10": {
+   "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=",
+   "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE="
+  },
+  "io/fabric8#kubernetes-client-bom/5.12.4": {
+   "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A="
+  },
+  "io/github/x-stream#mxparser/1.2.2": {
+   "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=",
+   "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg="
+  },
+  "io/grpc#grpc-alts/1.56.0": {
+   "jar": "sha256-2frCakS4d6qyLe5LiwvDW6R6XrLRQ+NQ22a+Kwpv8wM=",
+   "pom": "sha256-msck0sjXjroiqFx3/F9Jebpww28gN+iOWm1xD8xAAc8="
+  },
+  "io/grpc#grpc-api/1.56.0": {
+   "jar": "sha256-+4MTRD1jQD2aZbcc/nGeDnF7Gr7w7ejF6OV77/4gIJM=",
+   "pom": "sha256-2kzQ9pL7nZwvuf00R4PLE5YLfWFupP9ZXf9O32g3kmw="
+  },
+  "io/grpc#grpc-auth/1.56.0": {
+   "jar": "sha256-Ce/udpLt0bI6IgCgzQhe8AMrxE5TrkJRhu5fZYAL+hg=",
+   "pom": "sha256-OrPE/5vl3bTW7g4k05eV7sejojGRw7DqgRCGHMacm+I="
+  },
+  "io/grpc#grpc-bom/1.55.1": {
+   "pom": "sha256-THNVmhbNzTol3h69FQRCaVKMh2oKn4nEAnF6ZJObXIY="
+  },
+  "io/grpc#grpc-bom/1.56.0": {
+   "pom": "sha256-fJq5/Zx2/5V14lXyBUsmWbK9d5SawR77BGft9b1gtP4="
+  },
+  "io/grpc#grpc-context/1.27.2": {
+   "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=",
+   "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg="
+  },
+  "io/grpc#grpc-context/1.56.0": {
+   "jar": "sha256-EZaZPyGQJMClH0XyvS9EjltmRikr63bo+2quSY5vOTs=",
+   "pom": "sha256-wU9Et0BIJNEftNJSVevEO3sTNwMGG0WzQ4FMmDC0xUA="
+  },
+  "io/grpc#grpc-core/1.56.0": {
+   "jar": "sha256-DxrDvDeEFtCw+Av5ApgI+Xj681/SAirS2L3WJ25upT4=",
+   "pom": "sha256-EZscdu7zInRKUpERfqBzJR4sHievipUtDDrBYyAIFmI="
+  },
+  "io/grpc#grpc-googleapis/1.56.0": {
+   "jar": "sha256-q3zxR05lSvARXJQM/X/1DiRPk/9HQYndd0YrnALNaSM=",
+   "pom": "sha256-OMe8XqZekM7U2XLK665eY05U47bijuYYXMqN1h67X4o="
+  },
+  "io/grpc#grpc-grpclb/1.56.0": {
+   "jar": "sha256-VwetRGMWIiiiZ6YXQrZgRHRBc2hQQ+xuHRl0yezqi6A=",
+   "pom": "sha256-l7UrJWBtEas1aqNFwNcbrHbZOyYobKNB/Nu5RjtNeAk="
+  },
+  "io/grpc#grpc-netty-shaded/1.56.0": {
+   "jar": "sha256-Wt41OEO2E79jZDEjvZzf61mjgykqz8eEyQxHBK0ZZtw=",
+   "pom": "sha256-I8R5eCgAITGKbc9KMM76HqMhIo/rdT88F77PMAk2Ce0="
+  },
+  "io/grpc#grpc-protobuf-lite/1.56.0": {
+   "jar": "sha256-81Rk7c3mpKB7WbXH3p4UIlNmUtgAL2yy0OznEXORF20=",
+   "pom": "sha256-iQJUlZ3EznqzScyixUFMS4CwAedlM3JA00+MQQFIkoE="
+  },
+  "io/grpc#grpc-protobuf/1.56.0": {
+   "jar": "sha256-1fLjM0WxmnSBWFixvYZ5lDodTF+u2I6f95LnSHXiOWY=",
+   "pom": "sha256-UVoukg3Hx0tQ6vghHswPloOKw8BAZ5yEpN7mTHrNyjg="
+  },
+  "io/grpc#grpc-rls/1.56.0": {
+   "jar": "sha256-Se3VvNgZ7GNZLC3Q69KH4SYaUI0RoxH/oJrOWcJsRH8=",
+   "pom": "sha256-+pYHQPzab+csBYmuaD3UgOTAWk1gIEMJVF9YDMZcgaw="
+  },
+  "io/grpc#grpc-services/1.56.0": {
+   "jar": "sha256-S024+5eC1i58a1idmaSlIpkKdA/1fl7/IKYM1ebv3H4=",
+   "pom": "sha256-4JyEX9qx7HwfXfn/EXHnl8YGx9yOkbZsw+QlbtZm8kE="
+  },
+  "io/grpc#grpc-stub/1.56.0": {
+   "jar": "sha256-SAjF9jIzst8sL9LOFLg4TOmwo2f3hC6TseW5uzQs2ww=",
+   "pom": "sha256-+vuE8JYro/SbifqRu3cBAnjqrw3lK0IdTqzIvwEQmkg="
+  },
+  "io/grpc#grpc-xds/1.56.0": {
+   "jar": "sha256-SZIL81LNp5o+9n9i/lJmV1IwkZtMRjZuvypJG6hernE=",
+   "pom": "sha256-MzyGTZ2587ZofESBFEKfl0vDXYRP4N1KMQx3y2FPecM="
+  },
+  "io/netty#netty-bom/4.1.104.Final": {
+   "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw="
+  },
+  "io/netty#netty-buffer/4.1.94.Final": {
+   "jar": "sha256-gGbufEn58p2pbuYvfLE77gIstLaOUUN7M9o7bQE5jxM=",
+   "pom": "sha256-wEfWyvzJXBniBS2nvifsWk9xsgKqQE3whQGTrZjw9Nw="
+  },
+  "io/netty#netty-codec-dns/4.1.93.Final": {
+   "jar": "sha256-EKJ4sZ1jk9Vjf3RQB8sm1H3RbUaImNzEpD4m05xs3Sk=",
+   "pom": "sha256-PxHNLCB0FVhNxGzw0H3qEb12cqgEZyA+AlxanLj/ST8="
+  },
+  "io/netty#netty-codec-http/4.1.94.Final": {
+   "jar": "sha256-GtpFgPaM0XpTT7PAM3CHBzIjp2y3cwTb5aGxnfPVPC8=",
+   "pom": "sha256-Yr5AyhOzsJs3mAv93Ia/bzBzLZlSMb9FSdo2K/8Jy2Q="
+  },
+  "io/netty#netty-codec-http2/4.1.94.Final": {
+   "jar": "sha256-j70ulavsYVW2DtPJwWAO1OF//j8FPNWkBnfYecCvlh8=",
+   "pom": "sha256-SNwm8n9RUgpei2uZEZAWNP70JQWbdFBVVdSVhKzpuAk="
+  },
+  "io/netty#netty-codec-socks/4.1.94.Final": {
+   "jar": "sha256-HAtO4LYjQC3Vu3j9Smm/gI2iUQUk9ImiSw88xY3tBG4=",
+   "pom": "sha256-M0YjOPOtd9Y1CklWvzSnBXunDYGe0pMy3kU8iMc6Uhc="
+  },
+  "io/netty#netty-codec/4.1.94.Final": {
+   "jar": "sha256-kSQ3dq1otNjjnq+57BFeG4+prs0UexLvFbtpFjlJgyg=",
+   "pom": "sha256-A5MvNUvFsGjvSHAmD0GMmwsKdtlYDDt7TrKm5iKyV0c="
+  },
+  "io/netty#netty-common/4.1.94.Final": {
+   "jar": "sha256-y42Eo+Y66pDQ16MzoC5QrHUdKwXbVXRdmBte/4k/ZHs=",
+   "pom": "sha256-rXG08enZZBfYFjTluaNyaZHNn0jVnbutI2/tWchYjSM="
+  },
+  "io/netty#netty-handler-proxy/4.1.94.Final": {
+   "jar": "sha256-N4c4v+uEyBIorl3iCflkyoeEn5pyDJFsd/fLpklLsew=",
+   "pom": "sha256-NgLruOowisrwT/IrXBzqYKNIGCVcp+lmBHR50eAhDbQ="
+  },
+  "io/netty#netty-handler/4.1.94.Final": {
+   "jar": "sha256-jlBxmpq4njPvhcXzbXgODXBWs/dosH0mHYe67XCU6zw=",
+   "pom": "sha256-Yq7ozQXp4OQdvbIqgtJWmvHuE3l4Unof/vU5SpEUxuM="
+  },
+  "io/netty#netty-parent/4.1.93.Final": {
+   "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4="
+  },
+  "io/netty#netty-parent/4.1.94.Final": {
+   "pom": "sha256-LZcCadTW8qkWJJc6UCzA6+qDVgvA0RFquNyqlF6DTc0="
+  },
+  "io/netty#netty-resolver-dns-classes-macos/4.1.93.Final": {
+   "jar": "sha256-+6jtDTlTjr80APk5V8DqinRnVQGcThUHawRZH7XYU3M=",
+   "pom": "sha256-abZMe18dLWPw+5hh1Ti1vyjEwm4VlfeIVFFI2jk5Yeg="
+  },
+  "io/netty#netty-resolver-dns-native-macos/4.1.93.Final": {
+   "pom": "sha256-kDD8h0sfi1ru11HdajbiUjwujvFh3PVx0wIce9Etyno="
+  },
+  "io/netty#netty-resolver-dns-native-macos/4.1.93.Final/osx-x86_64": {
+   "jar": "sha256-JpRFG7jjDxsZt4GULrZ+oP1ACv77kFg3MNuZaqzBuUg="
+  },
+  "io/netty#netty-resolver-dns/4.1.93.Final": {
+   "jar": "sha256-J0TMwbvWU8n2X1dkqyEfUcrlaqbC4iiIUKmt2cgFvlY=",
+   "pom": "sha256-36WAR5mCVjNf+gW3hgERMcRhX1f7HhqQ2FxChvP2BVE="
+  },
+  "io/netty#netty-resolver/4.1.94.Final": {
+   "jar": "sha256-vSbpvF6U4tOXSpP9+SFljv9PAzv9TFIIYHdgq1Qphhc=",
+   "pom": "sha256-4yzEsSRK3sAhxaa1K82+c0QXab8PYNFUkgs8A2BLhV0="
+  },
+  "io/netty#netty-tcnative-boringssl-static/2.0.61.Final": {
+   "jar": "sha256-tvl0lyxEzW+c7KvCVSkChvqsQLY5PGbDw8Dbf0Icwo4=",
+   "pom": "sha256-+AUaYg8cSH5pOuWHeS9udTOu6EZUzo7tklRJqme5h4M="
+  },
+  "io/netty#netty-tcnative-classes/2.0.61.Final": {
+   "jar": "sha256-m5cOzNhEv64XWly797+UiRiUrdBtbMvhq/IlDNZAgPY=",
+   "pom": "sha256-/OkkBPUJgHzfuaEih/Zlw+yJAiIMJwl7vcUvznUql20="
+  },
+  "io/netty#netty-tcnative-parent/2.0.61.Final": {
+   "pom": "sha256-flj/oEOq1khZmvTUONGwTghCycZRENP5a42WkJ7CDKo="
+  },
+  "io/netty#netty-transport-classes-epoll/4.1.94.Final": {
+   "jar": "sha256-nV1R60IIHW/BP03KaFXNMNCYpbHQsG1WRKE0K9HlCkQ=",
+   "pom": "sha256-mY8rEt2tSQS/GdWXHQSJcPMbfXdL4GRJygRCj9SXX64="
+  },
+  "io/netty#netty-transport-classes-kqueue/4.1.94.Final": {
+   "jar": "sha256-M5oGbpiOdw4DiTNIREbtam6sfDQdnvR26VSKFvlPyIY=",
+   "pom": "sha256-OAkgyGQEJb7eENPmpm1uheIUCd/0U4CherVt440wBjI="
+  },
+  "io/netty#netty-transport-native-epoll/4.1.94.Final": {
+   "pom": "sha256-C5NMNOLBwkW5YSxZfq4LiNWs8jhh1Z26EogU4tzhmIc="
+  },
+  "io/netty#netty-transport-native-epoll/4.1.94.Final/linux-x86_64": {
+   "jar": "sha256-4l4O80f3hQ5vPYpgMdZLDtsGug51Uzw27bNQ1N795fM="
+  },
+  "io/netty#netty-transport-native-kqueue/4.1.94.Final": {
+   "pom": "sha256-PnZdVS07cYHBEEkreO2yooN/FdDKLhGO1LUv2Xvf6PY="
+  },
+  "io/netty#netty-transport-native-kqueue/4.1.94.Final/osx-x86_64": {
+   "jar": "sha256-71vV+vjCqIRv/8Jq08qbq0Fi4Y8Z6P1fd9/GrSHtFpk="
+  },
+  "io/netty#netty-transport-native-unix-common/4.1.94.Final": {
+   "jar": "sha256-J9Df8c10MZAnm+ys+zcv5NRbJm7a+tnxxsAbBNACgOs=",
+   "pom": "sha256-Es2Go+zkcrOyy4ErZhZHPk3gT8nZzs3dZtLVtqNOhg0="
+  },
+  "io/netty#netty-transport/4.1.94.Final": {
+   "jar": "sha256-p1r6hMo1pQIlmRs55rYngYbmEveioMDpgd5SOqrFFqQ=",
+   "pom": "sha256-K2RhsxPlaRhBancyBv99ZM8QGmYssDoUKPBfnavkseo="
+  },
+  "io/opencensus#opencensus-api/0.31.1": {
+   "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=",
+   "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y="
+  },
+  "io/opencensus#opencensus-contrib-http-util/0.31.1": {
+   "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=",
+   "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s="
+  },
+  "io/opencensus#opencensus-proto/0.2.0": {
+   "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=",
+   "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI="
+  },
+  "io/perfmark#perfmark-api/0.26.0": {
+   "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=",
+   "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=",
+   "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto="
+  },
+  "io/projectreactor#reactor-core/3.4.30": {
+   "jar": "sha256-L4/TaePZZZMQCfDFvsY/HQFw7hEdJuCmdvW5QFC4q+o=",
+   "module": "sha256-xLtiq9sMJmiXV9THXFhVgGQumeTPFmDAaqt53DhSbq4=",
+   "pom": "sha256-HLISL4vG+ON0L4Xpm3xBFwifV4hzdJMIK0bZBCQguPE="
+  },
+  "io/projectreactor/netty#reactor-netty-core/1.0.33": {
+   "jar": "sha256-iFZCHPtcgfsR2Xo+9D/meJXVsGQceq/j5ddItL5tilk=",
+   "pom": "sha256-tazBTpaD1V30BWDe8/CDG9q21QhBZ/b1h6ooaRWeSuE="
+  },
+  "io/projectreactor/netty#reactor-netty-http/1.0.33": {
+   "jar": "sha256-7JB8UimBFZ5Fqjij1fEYPo5XJd7j/llOjyGzuP5b6is=",
+   "pom": "sha256-5frkQ0rlFQDP6PoFHuf425bf/oM05EhFmrQcX4mkOBQ="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+  },
+  "jakarta/platform#jakartaee-api-parent/9.1.0": {
+   "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+  },
+  "jakarta/servlet#jakarta.servlet-api/6.1.0": {
+   "jar": "sha256-ijH0ZfNZO/I1FTGlyVIBTrg52pamBbWCW5PdVHFMSMQ=",
+   "pom": "sha256-G6+Lb6bQIYAwINCXDqQ/sH32beZskNKZohZ3Dwsz5K4="
+  },
+  "javax/activation#activation/1.1.1": {
+   "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=",
+   "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A="
+  },
+  "javax/annotation#javax.annotation-api/1.3.2": {
+   "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=",
+   "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c="
+  },
+  "javax/jws#javax.jws-api/1.1": {
+   "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=",
+   "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM="
+  },
+  "javax/servlet#servlet-api/2.3": {
+   "jar": "sha256-hHi5AtCBXtBm24YPsUzF1ARUjUtjSKuTC0YnD83eumg=",
+   "pom": "sha256-q7KUqPBkAY6iJqWtIXbqqdvxzeAppHgV/UpASdE3QWA="
+  },
+  "javax/xml#jaxrpc-api/1.1": {
+   "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=",
+   "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY="
+  },
+  "javax/xml/bind#jaxb-api/2.2.9": {
+   "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=",
+   "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0="
+  },
+  "javax/xml/soap#javax.xml.soap-api/1.3.5": {
+   "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=",
+   "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU="
+  },
+  "javax/xml/ws#jaxws-api/2.2.12": {
+   "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=",
+   "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco="
+  },
+  "jline#jline/2.14.2": {
+   "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=",
+   "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c="
+  },
+  "junit#junit/4.10": {
+   "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=",
+   "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "junit#junit/4.5": {
+   "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=",
+   "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4="
+  },
+  "log4j#log4j/1.2.11": {
+   "jar": "sha256-imvHhajlKpfqdtfiHlkVJiImacQmLte5Haqccvz2zQc=",
+   "pom": "sha256-aaVvjRwzjc+J7p7XWzm52qqVZCxbbRMxMZ2HxNZJblw="
+  },
+  "net/iharder#base64/2.3.8": {
+   "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=",
+   "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA="
+  },
+  "net/java#jvnet-parent/1": {
+   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
+  "net/java#jvnet-parent/4": {
+   "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s="
+  },
+  "net/java#jvnet-parent/5": {
+   "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
+  },
+  "net/java/dev/jets3t#jets3t/0.7.1": {
+   "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=",
+   "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs="
+  },
+  "net/java/dev/jets3t#jets3t/0.9.4": {
+   "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=",
+   "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI="
+  },
+  "net/java/dev/jna#jna-platform/5.12.1": {
+   "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=",
+   "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc="
+  },
+  "net/java/dev/jna#jna-platform/5.13.0": {
+   "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=",
+   "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY="
+  },
+  "net/java/dev/jna#jna-platform/5.5.0": {
+   "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=",
+   "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA="
+  },
+  "net/java/dev/jna#jna-platform/5.6.0": {
+   "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig="
+  },
+  "net/java/dev/jna#jna/5.12.1": {
+   "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=",
+   "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y="
+  },
+  "net/java/dev/jna#jna/5.13.0": {
+   "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=",
+   "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q="
+  },
+  "net/java/dev/jna#jna/5.5.0": {
+   "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=",
+   "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk="
+  },
+  "net/minidev#accessors-smart/2.4.9": {
+   "jar": "sha256-rM3Vx6xMSbFViQquof/KKpzNWCa1Yt2VqZ/BiHAD4DE=",
+   "pom": "sha256-/sBelw8jmtqEcfTqPwYRwDb7zHxD886qnl575vMhe7E="
+  },
+  "net/minidev#json-smart/2.4.10": {
+   "jar": "sha256-cMq16UiGMNxjGx/G5/pVDZXN3Rm6FNs5zsp8q/vU5a4=",
+   "pom": "sha256-qVnWK1dC8NmRu3zF15fvmHgT6U3pORcAzw2N9v0hOSs="
+  },
+  "net/sf/kosmosfs#kfs/0.3": {
+   "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=",
+   "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg="
+  },
+  "net/sf/launch4j#launch4j/3.14": {
+   "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs="
+  },
+  "net/sf/launch4j#launch4j/3.14/core": {
+   "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA="
+  },
+  "net/sf/launch4j#launch4j/3.14/workdir-linux64": {
+   "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY="
+  },
+  "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": {
+   "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=",
+   "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE="
+  },
+  "org/ajoberstar/grgit#grgit-core/5.0.0": {
+   "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=",
+   "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=",
+   "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw="
+  },
+  "org/ajoberstar/grgit#grgit-gradle/5.0.0": {
+   "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=",
+   "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=",
+   "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY="
+  },
+  "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": {
+   "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache#apache/17": {
+   "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8="
+  },
+  "org/apache#apache/18": {
+   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/30": {
+   "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
+  },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+  },
+  "org/apache#apache/32": {
+   "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
+  },
+  "org/apache#apache/4": {
+   "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ="
+  },
+  "org/apache#apache/9": {
+   "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
+  },
+  "org/apache/commons#commons-collections4/4.4": {
+   "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=",
+   "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0="
+  },
+  "org/apache/commons#commons-compress/1.20": {
+   "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=",
+   "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc="
+  },
+  "org/apache/commons#commons-lang3/3.14.0": {
+   "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=",
+   "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554="
+  },
+  "org/apache/commons#commons-parent/11": {
+   "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo="
+  },
+  "org/apache/commons#commons-parent/32": {
+   "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g="
+  },
+  "org/apache/commons#commons-parent/34": {
+   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+  },
+  "org/apache/commons#commons-parent/42": {
+   "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "org/apache/commons#commons-parent/48": {
+   "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/64": {
+   "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
+  },
+  "org/apache/commons#commons-parent/69": {
+   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+  },
+  "org/apache/commons#commons-parent/71": {
+   "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
+  },
+  "org/apache/commons#commons-vfs2-project/2.3": {
+   "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E="
+  },
+  "org/apache/commons#commons-vfs2/2.3": {
+   "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=",
+   "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY="
+  },
+  "org/apache/felix#felix-parent/2.1": {
+   "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY="
+  },
+  "org/apache/felix#felix-parent/4": {
+   "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg="
+  },
+  "org/apache/felix#felix-parent/6": {
+   "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU="
+  },
+  "org/apache/felix#org.apache.felix.framework/7.0.5": {
+   "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=",
+   "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk="
+  },
+  "org/apache/felix#org.apache.felix.main/7.0.5": {
+   "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=",
+   "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0="
+  },
+  "org/apache/felix#org.apache.felix.scr/2.0.12": {
+   "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=",
+   "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI="
+  },
+  "org/apache/felix#org.apache.felix.shell/1.4.3": {
+   "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=",
+   "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY="
+  },
+  "org/apache/hadoop#hadoop-core/0.20.2": {
+   "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=",
+   "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4="
+  },
+  "org/apache/httpcomponents#httpclient/4.5": {
+   "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=",
+   "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.13": {
+   "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=",
+   "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5": {
+   "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.13": {
+   "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.1": {
+   "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.15": {
+   "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.1": {
+   "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=",
+   "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.15": {
+   "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=",
+   "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms="
+  },
+  "org/apache/httpcomponents#project/7": {
+   "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM="
+  },
+  "org/apache/logging#logging-parent/10.5.0": {
+   "pom": "sha256-ngk5zAKXfp/1KOdmBj4PMiTTbok7pMkh8JINtI86xqk="
+  },
+  "org/apache/logging/log4j#log4j-1.2-api/2.22.1": {
+   "jar": "sha256-mgJbJNffQl57IlkCdFRt+OsLBAzLOv84VvmiZvp4f9g=",
+   "pom": "sha256-W1sfYKOspQc8xMBTwEQlexBENzEaXGHgGCynDiZ2DUE="
+  },
+  "org/apache/logging/log4j#log4j-api/2.22.1": {
+   "jar": "sha256-XXvq5/8V2FFtZRcSHX8Sp5pqwYDfZLX87FXVviEFblM=",
+   "pom": "sha256-bVdUd3E5Sz7hj57T7/ohWXGeLzY0Ynhj0FAjup/Y4Ys="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.22.1": {
+   "pom": "sha256-nxUjceNriy6m6yyb0YgnYAafNhgKbygXfmpIwoFMDyM="
+  },
+  "org/apache/logging/log4j#log4j-core/2.22.1": {
+   "jar": "sha256-RtzOysVWYj2OLOhkhJaCSoKVHROQYqTmEUiv8aJe0Y0=",
+   "pom": "sha256-HPf2SP7UPwv6wzKNk/yCPHSZB4/XkE4YtlSbsQeKnFI="
+  },
+  "org/apache/logging/log4j#log4j/2.22.1": {
+   "pom": "sha256-7Zibb7CaJW69TP3MIZaIuhw9beS087UUVC0WVj3CkJc="
+  },
+  "org/apache/pdfbox#fontbox/2.0.27": {
+   "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=",
+   "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY="
+  },
+  "org/apache/pdfbox#jbig2-imageio/3.0.4": {
+   "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=",
+   "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s="
+  },
+  "org/apache/pdfbox#pdfbox-parent/2.0.27": {
+   "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po="
+  },
+  "org/bouncycastle#bcpkix-jdk18on/1.76": {
+   "jar": "sha256-k1o4iFTDKfmm8ycI8wyQBF0vkSlPpocoEnMUXUz5g0o=",
+   "pom": "sha256-9iHsfqzNMj59L7yvD/2HIM9uqEKmXCvTDoMFiJEslG4="
+  },
+  "org/bouncycastle#bcprov-ext-jdk18on/1.76": {
+   "jar": "sha256-KdZsEtOSFaKlY1+GskU+D59vP+MvQtzlN4++A21ZX7Q=",
+   "pom": "sha256-cGnxBvIKBvQFHbfJZ0Q2f3GOHEtbpDyLVX3nkhO/yJ4="
+  },
+  "org/bouncycastle#bcprov-jdk15on/1.52": {
+   "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=",
+   "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA="
+  },
+  "org/bouncycastle#bcprov-jdk15on/1.69": {
+   "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=",
+   "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4="
+  },
+  "org/bouncycastle#bcprov-jdk18on/1.76": {
+   "jar": "sha256-/ahdd3qq4WgBWGCyOnfK2bjTodXJBP2odTE0J71WAXk=",
+   "pom": "sha256-FTAJWS07j4NJ+XuPFTi+8MgzQbAmkYojJ9rOIjNP/ug="
+  },
+  "org/bouncycastle#bcutil-jdk18on/1.76": {
+   "jar": "sha256-GmWtApWCI6PzE3O9cu6pQsr9Gxh3o+0LSSwkh+d8PCc=",
+   "pom": "sha256-3l7TyhGMaT0ZDFxG2J4DgLtdd6zYpDtRkEA+dkg/ge0="
+  },
+  "org/checkerframework#checker-qual/3.12.0": {
+   "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=",
+   "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=",
+   "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk="
+  },
+  "org/checkerframework#checker-qual/3.24.0": {
+   "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=",
+   "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=",
+   "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE="
+  },
+  "org/checkerframework#checker-qual/3.32.0": {
+   "jar": "sha256-tm4CXaCmv4Xwt/X9rcqDKjJ3H4WhLKwUAaPAzY/XPM0=",
+   "module": "sha256-zN7Nqhqu63g5UfanwY3Bk5XC4qXn93RQ1we41i6H3k8=",
+   "pom": "sha256-eVqIZSpu3vocMP26soASnkGDsaz5lKx0vkPz64qnfc8="
+  },
+  "org/checkerframework#checker-qual/3.33.0": {
+   "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
+   "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
+   "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
+  },
+  "org/codehaus#codehaus-parent/3": {
+   "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE="
+  },
+  "org/codehaus/groovy#groovy-bom/3.0.19": {
+   "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE="
+  },
+  "org/codehaus/jackson#jackson-core-asl/1.9.13": {
+   "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=",
+   "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA="
+  },
+  "org/codehaus/jackson#jackson-mapper-asl/1.9.13": {
+   "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=",
+   "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4="
+  },
+  "org/codehaus/mojo#animal-sniffer-annotations/1.23": {
+   "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=",
+   "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc="
+  },
+  "org/codehaus/mojo#animal-sniffer-annotations/1.9": {
+   "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=",
+   "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0="
+  },
+  "org/codehaus/mojo#animal-sniffer-parent/1.23": {
+   "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ="
+  },
+  "org/codehaus/mojo#animal-sniffer-parent/1.9": {
+   "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs="
+  },
+  "org/codehaus/mojo#mojo-parent/28": {
+   "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc="
+  },
+  "org/codehaus/mojo#mojo-parent/74": {
+   "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM="
+  },
+  "org/conscrypt#conscrypt-openjdk-uber/2.5.2": {
+   "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=",
+   "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs="
+  },
+  "org/eclipse/ee4j#project/1.0.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/eclipse/ee4j#project/1.0.9": {
+   "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
+  },
+  "org/eclipse/jdt#core/3.1.1": {
+   "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=",
+   "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao="
+  },
+  "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": {
+   "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": {
+   "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": {
+   "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=",
+   "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs="
+  },
+  "org/exbin/auxiliary#binary_data-paged/0.2.1": {
+   "jar": "sha256-hrQsuJaXv56m0J6UYUjGil9nNRmZVBARar5RgiYiHgg=",
+   "pom": "sha256-hlRKJbEI0whPUNFB17aamkTAaevd2lptKraq3BsX/sM="
+  },
+  "org/exbin/auxiliary#binary_data/0.2.1": {
+   "jar": "sha256-KHLdfwFwKe7K4e+6WK/Y8TtZmfILLXpwC/+wGe3rIXU=",
+   "pom": "sha256-cKKzkvsi9Wu4nFtboqlVD1oR9W0Iw/49tGoVUz4qZgU="
+  },
+  "org/exbin/bined#bined-core/0.2.1": {
+   "jar": "sha256-V8Zi/yltzudxUW8z4Q64xqXrmxtirHLImlOOjYN/Qt4=",
+   "pom": "sha256-ArlTnv30BNGe0EAImfsW47RFSXIdRBPE3T8NJ4mHols="
+  },
+  "org/exbin/bined#bined-extended/0.2.1": {
+   "jar": "sha256-zI3bMximn51QCmBNdBxnrwtvxAf8D8zzH6decd10S8A=",
+   "pom": "sha256-Bw93++Ua68eldogvD/raSrnuw4m6na2TUPQpwbFgD1A="
+  },
+  "org/exbin/bined#bined-highlight-swing/0.2.1": {
+   "jar": "sha256-imLpd3jYhBi/6p7B+0xVAL4DBXZKttrRe3zRn120qkg=",
+   "pom": "sha256-+h9PY7ZMpk1f/aTppOv+H3jZPnHhRKgEOfaKOLNkm/A="
+  },
+  "org/exbin/bined#bined-operation-swing/0.2.1": {
+   "jar": "sha256-W86xnZdd+QwMBtLBCfrLNc3Pfc9f22tPRuL9ZpQxYaM=",
+   "pom": "sha256-Yd1YChfo99RriJR8mbBrITv8twmRmJZImgR1VmeKPOM="
+  },
+  "org/exbin/bined#bined-operation/0.2.1": {
+   "jar": "sha256-xwCLqoH5wDRYluFnxjgL8vFl6dZiLYKFkTtiGqNJKq4=",
+   "pom": "sha256-KcLNRZ0lASxfY6qlETPNE5oi/db6+QBLLf8QaD9ob9k="
+  },
+  "org/exbin/bined#bined-swing-extended/0.2.1": {
+   "jar": "sha256-pjSlaelSrdddQXoV/YobVFPuifBBaTc/+kMwO7VO1Ig=",
+   "pom": "sha256-CUHcanE/2Kuupq59YJDGmiV9sVzuNqpgcooDh9Ljv5g="
+  },
+  "org/exbin/bined#bined-swing/0.2.1": {
+   "jar": "sha256-uAI2FCXqNOP6XsoLiRLWjutzBcwsM6hU5fERpqE5e0Y=",
+   "pom": "sha256-VI8AQtjmm7ubBE9v3lsTrw6cHrcxwFFWuDP+Zt6n5AI="
+  },
+  "org/glassfish#glassfish-parent/10.0-b28": {
+   "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw="
+  },
+  "org/glassfish#javaee-api/10.0-b28": {
+   "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU="
+  },
+  "org/glassfish#javax.xml.soap/10.0-b28": {
+   "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=",
+   "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI="
+  },
+  "org/glassfish#pom/2": {
+   "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4="
+  },
+  "org/hamcrest#hamcrest-core/1.1": {
+   "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=",
+   "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.1": {
+   "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains#annotations/24.0.1": {
+   "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=",
+   "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA="
+  },
+  "org/jetbrains#annotations/25.0.0": {
+   "jar": "sha256-nAoVKCQNH3Mr/qwYLhJudurS5t+hV/GtjjyJGxkoFTg=",
+   "module": "sha256-fO4TLOY6T5RuLOK3fmFl2m7AMtSvGsJzGdGsCvUq0fk=",
+   "pom": "sha256-uuyLRILZFgoxmWGrhrBQdjKo5V1Uv/rX0rQkB6ri5pw="
+  },
+  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
+   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
+   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/1.9.10": {
+   "jar": "sha256-ioNfUXY1UINmiv8O1u71s+sDDhDolnntPutwP9LVuQA=",
+   "pom": "sha256-6VNknBeNIuD+9U3JC3M/23UBAXJP5F1qnV+UsSmDEho="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": {
+   "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=",
+   "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": {
+   "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
+   "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": {
+   "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
+   "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": {
+   "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=",
+   "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": {
+   "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=",
+   "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=",
+   "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM="
+  },
+  "org/jetbrains/pty4j#pty4j/0.12.35": {
+   "jar": "sha256-XMlLTyWRkTerRDwdticVB9pZlESLGELOBynZBsFImwA=",
+   "module": "sha256-CfCYdYzRcrVP+iFYFC9pMi+ehIX7HnP7SaG1tBz9Fd4=",
+   "pom": "sha256-rLLO0RQLfMjrcTjsCWBMqoQScunRA1ARQXKXkpjDauw="
+  },
+  "org/jmdns#jmdns/3.5.5": {
+   "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=",
+   "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY="
+  },
+  "org/junit#junit-bom/5.10.0": {
+   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+  },
+  "org/junit#junit-bom/5.10.1": {
+   "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
+   "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+  },
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+  },
+  "org/junit#junit-bom/5.11.0-M2": {
+   "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
+   "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
+  },
+  "org/junit#junit-bom/5.9.1": {
+   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+  },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/mockito#mockito-bom/4.11.0": {
+   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+  },
+  "org/mortbay/jetty#jetty-parent/7": {
+   "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo="
+  },
+  "org/mortbay/jetty#jetty-util/6.1.14": {
+   "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=",
+   "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ="
+  },
+  "org/mortbay/jetty#jetty/6.1.14": {
+   "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=",
+   "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU="
+  },
+  "org/mortbay/jetty#jsp-2.1/6.1.14": {
+   "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=",
+   "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y="
+  },
+  "org/mortbay/jetty#jsp-api-2.1/6.1.14": {
+   "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=",
+   "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk="
+  },
+  "org/mortbay/jetty#project/6.1.14": {
+   "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4="
+  },
+  "org/mortbay/jetty#servlet-api-2.5/6.1.14": {
+   "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=",
+   "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E="
+  },
+  "org/osgi#org.osgi.dto/1.0.0": {
+   "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=",
+   "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw="
+  },
+  "org/osgi#org.osgi.framework/1.8.0": {
+   "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=",
+   "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM="
+  },
+  "org/osgi#org.osgi.resource/1.0.0": {
+   "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=",
+   "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA="
+  },
+  "org/osgi#org.osgi.service.coordinator/1.0.2": {
+   "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=",
+   "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o="
+  },
+  "org/osgi#org.osgi.service.log/1.3.0": {
+   "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=",
+   "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos="
+  },
+  "org/osgi#org.osgi.service.repository/1.1.0": {
+   "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=",
+   "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk="
+  },
+  "org/osgi#org.osgi.service.resolver/1.1.1": {
+   "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=",
+   "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI="
+  },
+  "org/osgi#org.osgi.util.function/1.2.0": {
+   "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=",
+   "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg="
+  },
+  "org/osgi#org.osgi.util.promise/1.2.0": {
+   "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=",
+   "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY="
+  },
+  "org/osgi#org.osgi.util.tracker/1.5.4": {
+   "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=",
+   "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk="
+  },
+  "org/osgi#osgi.annotation/8.0.1": {
+   "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=",
+   "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM="
+  },
+  "org/osgi#osgi.core/8.0.0": {
+   "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=",
+   "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M="
+  },
+  "org/ovirt/engine/api#java-sdk-parent/4.4.5": {
+   "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw="
+  },
+  "org/ovirt/engine/api#sdk/4.4.5": {
+   "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=",
+   "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM="
+  },
+  "org/ow2#ow2/1.5": {
+   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+  },
+  "org/ow2/asm#asm/9.3": {
+   "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=",
+   "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A="
+  },
+  "org/reactivestreams#reactive-streams/1.0.4": {
+   "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
+   "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
+  },
+  "org/slf4j#slf4j-api/1.7.25": {
+   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
+  },
+  "org/slf4j#slf4j-api/1.7.30": {
+   "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=",
+   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
+  },
+  "org/slf4j#slf4j-api/1.7.36": {
+   "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
+   "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
+  },
+  "org/slf4j#slf4j-api/2.0.9": {
+   "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=",
+   "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U="
+  },
+  "org/slf4j#slf4j-bom/2.0.9": {
+   "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM="
+  },
+  "org/slf4j#slf4j-parent/1.7.25": {
+   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
+  },
+  "org/slf4j#slf4j-parent/1.7.30": {
+   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
+  },
+  "org/slf4j#slf4j-parent/1.7.36": {
+   "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
+  },
+  "org/slf4j#slf4j-parent/2.0.9": {
+   "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U="
+  },
+  "org/sonatype/oss#oss-parent/5": {
+   "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/testng#testng/7.10.2": {
+   "jar": "sha256-Il/VZEfy5eQ52ztIOnnNnylPrZ81f4NSsS7mo0EeuxU=",
+   "module": "sha256-AOr53InkDueoM9nIgDjF3v94rH/DhNNyAsQlJwC46Bk=",
+   "pom": "sha256-1tUdZ4rUzT1bIoBmuguIZ3l28QrQNSH+MEM/JTJGFkc="
+  },
+  "org/threeten#threetenbp/1.6.8": {
+   "jar": "sha256-5LHrPZDDilTH8zhP2pV+C1vwtBtAZypErosDy2yHzgY=",
+   "pom": "sha256-ztMznYANG7wB7mct+A5NqHUgrgKXuarI+MS33aI+SwI="
+  },
+  "org/tukaani#xz/1.9": {
+   "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+   "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
+  },
+  "org/unix4j#unix4j-base/0.6": {
+   "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=",
+   "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U="
+  },
+  "org/unix4j#unix4j-command/0.6": {
+   "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=",
+   "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko="
+  },
+  "org/unix4j#unix4j-core/0.6": {
+   "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM="
+  },
+  "org/unix4j#unix4j/0.6": {
+   "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw="
+  },
+  "org/violetlib#jnr/11": {
+   "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=",
+   "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4="
+  },
+  "org/violetlib#vappearances/3": {
+   "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=",
+   "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk="
+  },
+  "org/violetlib#vaqua/10": {
+   "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=",
+   "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns="
+  },
+  "org/webjars#jquery/3.7.1": {
+   "jar": "sha256-JiAW3TpVnfh67745KATpv2IHh8kgTAq4Ui1MIx6mUJc=",
+   "pom": "sha256-RnwtczAljAxt4ZrtKny/Bgo29MT1Jjf6wLNkMJqKpSA="
+  },
+  "oro#oro/2.0.8": {
+   "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=",
+   "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI="
+  },
+  "servletapi#servletapi/2.3": {
+   "pom": "sha256-e71KE8Qp8H1NGyGrY9K8XTKTdeXqk9KGvzNJ8RCs4C8="
+  },
+  "tomcat#jasper-compiler/5.5.12": {
+   "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=",
+   "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ="
+  },
+  "tomcat#jasper-runtime/5.5.12": {
+   "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=",
+   "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA="
+  },
+  "xmlenc#xmlenc/0.52": {
+   "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=",
+   "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ="
+  },
+  "xmlpull#xmlpull/1.1.3.1": {
+   "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=",
+   "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs="
+  }
+ },
+ "https://repository.jboss.org/maven2/javax": {
+  "activation#activation/1.1.1": {
+   "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=",
+   "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q="
+  },
+  "xml#jaxrpc-api/1.1": {
+   "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=",
+   "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto="
+  },
+  "xml/soap#saaj-api/1.3": {
+   "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=",
+   "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk="
+  }
+ },
+ "https://www.mucommander.com": {
+  "maven/com/mucommander#sevenzipjbinding-all-platforms/16.02-2.01": {
+   "jar": "sha256-IQzUnNUHVyqjLGdKFm6VvtbihY7EHG9Tw8I0TcLiarI=",
+   "pom": "sha256-SL90Ej+qA1eGFy5dnzg1Zj7tFrDkvtIAI4RxMcc6n7k="
+  }
+ }
+}
diff --git a/pkgs/by-name/mu/mucommander/package.nix b/pkgs/by-name/mu/mucommander/package.nix
new file mode 100644
index 000000000000..c97b2605e5b2
--- /dev/null
+++ b/pkgs/by-name/mu/mucommander/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  makeWrapper,
+  jdk,
+  gsettings-desktop-schemas,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mucommander";
+  version = "1.5.2-1";
+
+  src = fetchFromGitHub {
+    owner = "mucommander";
+    repo = "mucommander";
+    rev = finalAttrs.version;
+    sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc=";
+  };
+
+  postPatch = ''
+    # there is no .git anyway
+    substituteInPlace build.gradle \
+      --replace "git = grgit.open(dir: project.rootDir)" "" \
+      --replace "revision = git.head().id" "revision = '${finalAttrs.version}'"
+  '';
+
+  nativeBuildInputs = [
+    gradle
+    makeWrapper
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  gradleBuildTask = "tgz";
+
+  installPhase = ''
+    mkdir -p $out/share/mucommander
+    tar xvf build/distributions/mucommander-*.tgz --directory=$out/share/mucommander
+
+    makeWrapper $out/share/mucommander/mucommander.sh $out/bin/mucommander \
+      --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
+      --set JAVA_HOME ${jdk}
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.mucommander.com/";
+    description = "Cross-platform file manager";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jiegec ];
+    platforms = platforms.all;
+    mainProgram = "mucommander";
+  };
+})
diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix
new file mode 100644
index 000000000000..6114eb39d735
--- /dev/null
+++ b/pkgs/by-name/mu/mud/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  python3Packages,
+  versionCheckHook,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "mud";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jasursadikov";
+    repo = "mud";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pW4B4+RN7hKtG2enJ33OHBeGsLj8w20ylvjcOL6owAk=";
+  };
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies = with python3Packages; [
+    prettytable
+  ];
+
+  pythonImportsCheck = [ "mud" ];
+
+  # Version checking fails on darwin with:
+  # PermissionError: [Errno 1] Operation not permitted: '/var/empty/.mudsettings'
+  # despite adding `export HOME=$(mktemp -d)` in the `preVersionCheck` phase.
+  # The tool
+  nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "multi-directory git runner which allows you to run git commands in a multiple repositories";
+    homepage = "https://github.com/jasursadikov/mud";
+    license = lib.licenses.mit;
+    changelog = "https://github.com/jasursadikov/mud/releases/tag/v${version}";
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "mud";
+  };
+}
diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/by-name/mu/mueval/package.nix
similarity index 100%
rename from pkgs/development/tools/haskell/mueval/default.nix
rename to pkgs/by-name/mu/mueval/package.nix
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
new file mode 100644
index 000000000000..8e750cc836e0
--- /dev/null
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "muffet";
+  version = "2.10.6";
+
+  src = fetchFromGitHub {
+    owner = "raviqqe";
+    repo = "muffet";
+    rev = "v${version}";
+    hash = "sha256-9dra/LhtSIWN2pjNEJMITz/GzyWRtXTyQBqBxRhjARc=";
+  };
+
+  vendorHash = "sha256-MYU8zgqI05oBep/dehs59S3JcrThrgLEzIgrIr/Tr4Y=";
+
+  meta = with lib; {
+    description = "Website link checker which scrapes and inspects all pages in a website recursively";
+    homepage = "https://github.com/raviqqe/muffet";
+    changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "muffet";
+  };
+}
diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix
index 84d07356b5b1..6813fe5b3be7 100644
--- a/pkgs/by-name/mu/mujoco/package.nix
+++ b/pkgs/by-name/mu/mujoco/package.nix
@@ -131,7 +131,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mujoco";
-  version = "3.2.4";
+  version = "3.2.5";
 
   # Bumping version? Make sure to look though the MuJoCo's commit
   # history for bumped dependency pins!
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
     owner = "google-deepmind";
     repo = "mujoco";
     rev = "refs/tags/${version}";
-    hash = "sha256-AWRrPs4G+hLwOz6UT/oWNT1arQP2ppyi+LC4Dy+njG0=";
+    hash = "sha256-MyQL/WV8ehH7nYNlB/H5DgSrOrd252I6GFV2KLeef5g=";
   };
 
   patches = [ ./mujoco-system-deps-dont-fetch.patch ];
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/by-name/mu/mujs/package.nix
similarity index 100%
rename from pkgs/development/interpreters/mujs/default.nix
rename to pkgs/by-name/mu/mujs/package.nix
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 2dd6f0463833..84b63cc542ce 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -90,7 +90,7 @@ let
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "13.5.7";
+  version = "13.5.9";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -102,7 +102,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-Te6Cw3fUs4XGz07lL54bKUU9HYC5soaKFlbWGujd/oU=";
+      hash = "sha256-hyFYI42IfFY0vqkqInkLQAWSY8flsmWGN8CaXBwXbGA=";
     };
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/pkgs/by-name/mu/multicharge/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/multicharge/default.nix
rename to pkgs/by-name/mu/multicharge/package.nix
diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/by-name/mu/multilockscreen/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/multilockscreen/default.nix
rename to pkgs/by-name/mu/multilockscreen/package.nix
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/by-name/mu/multimon-ng/package.nix
similarity index 100%
rename from pkgs/applications/radio/multimon-ng/default.nix
rename to pkgs/by-name/mu/multimon-ng/package.nix
diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/multipart-parser-c/default.nix
rename to pkgs/by-name/mu/multipart-parser-c/package.nix
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/by-name/mu/multipath-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/multipath-tools/default.nix
rename to pkgs/by-name/mu/multipath-tools/package.nix
diff --git a/pkgs/by-name/mu/multitail/package.nix b/pkgs/by-name/mu/multitail/package.nix
new file mode 100644
index 000000000000..5a89b997512e
--- /dev/null
+++ b/pkgs/by-name/mu/multitail/package.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "7.1.5";
+  pname = "multitail";
+
+  src = fetchFromGitHub {
+    owner = "folkertvanheusden";
+    repo = pname;
+    rev = version;
+    hash = "sha256-c9NlQLgHngNBbADZ6/legWFaKHJAQR/LZIfh8bJoc4Y=";
+  };
+
+  nativeBuildInputs = [ pkg-config cmake ];
+
+  buildInputs = [ ncurses ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 multitail -t $out/bin/
+
+    runHook postInstall
+  '';
+
+  hardeningDisable = [ "format" ];
+
+  meta = {
+    homepage = "https://github.com/folkertvanheusden/multitail";
+    description = "tail on Steroids";
+    maintainers = with lib.maintainers; [ matthiasbeyer ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
+    mainProgram = "multitail";
+  };
+}
diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/by-name/mu/multitime/package.nix
similarity index 100%
rename from pkgs/tools/misc/multitime/default.nix
rename to pkgs/by-name/mu/multitime/package.nix
diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
similarity index 100%
rename from pkgs/applications/video/multiviewer-for-f1/default.nix
rename to pkgs/by-name/mu/multiviewer-for-f1/package.nix
diff --git a/pkgs/by-name/mu/multivnc/nixpkgs.patch b/pkgs/by-name/mu/multivnc/nixpkgs.patch
new file mode 100644
index 000000000000..086d6423df53
--- /dev/null
+++ b/pkgs/by-name/mu/multivnc/nixpkgs.patch
@@ -0,0 +1,65 @@
+diff -ruZ source/CMakeLists.txt source2/CMakeLists.txt
+--- source/CMakeLists.txt	1969-12-31 17:00:01.000000000 -0700
++++ source2/CMakeLists.txt	2024-11-03 21:24:22.153712626 -0700
+@@ -12,9 +12,6 @@
+ 
+ set(WXSERVDISC_INSTALL OFF CACHE BOOL "Set to OFF to not include wxservdisc artifacts in install")
+ add_subdirectory(libwxservdisc/src)
+-set(LIBVNCSERVER_INSTALL OFF CACHE BOOL "Set to OFF to not include libvncserver artifacts in install")
+-set(WITH_EXAMPLES OFF CACHE BOOL "Set to OFF to not build libvncserver examples")
+-add_subdirectory(libvncserver)
+ 
+ add_subdirectory(src)
+ 
+diff -ruZ source/src/CMakeLists.txt source2/src/CMakeLists.txt
+--- source/src/CMakeLists.txt	1969-12-31 17:00:01.000000000 -0700
++++ source2/src/CMakeLists.txt	2024-11-03 21:51:56.015301604 -0700
+@@ -1,15 +1,17 @@
+ #
+ # dependencies
+ #
++include(FindPkgConfig)
+ find_package(wxWidgets 3.0 REQUIRED core base net adv qa)
++find_package(LibVNCServer)
++pkg_search_module(GTK3 REQUIRED gtk+-3.0)
+ include(${wxWidgets_USE_FILE})
+ include_directories(
+     ${CMAKE_BINARY_DIR}
+     ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/src/
+     ${CMAKE_SOURCE_DIR}/libwxservdisc/src
+-    ${CMAKE_SOURCE_DIR}/libvncserver
+-    ${CMAKE_BINARY_DIR}/libvncserver
++    ${GTK3_INCXLUDE_DIRS}
+ )
+ 
+ 
+@@ -39,7 +41,7 @@
+ 
+ add_executable(${executable_name} MACOSX_BUNDLE ${multivnc_SRCS})
+ 
+-target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient)
++target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient ${GTK3_LIBRARIES})
+ 
+ if(APPLE AND wxWidgets_VERSION_STRING LESS 3.1)
+     set_target_properties(${executable_name} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
+@@ -47,7 +49,6 @@
+ 
+ 
+ 
+-
+ 
+ #original Makefile.am contents follow:
+ 
+diff -ruZ source/src/VNCConn.h source2/src/VNCConn.h
+--- source/src/VNCConn.h	1969-12-31 17:00:01.000000000 -0700
++++ source2/src/VNCConn.h	2024-11-03 21:28:06.620032553 -0700
+@@ -37,7 +37,7 @@
+ #include 
+ #endif
+ #include 
+-#include "rfb/rfbclient.h"
++#include 
+ 
+ 
+ 
diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix
new file mode 100644
index 000000000000..a17e323628c1
--- /dev/null
+++ b/pkgs/by-name/mu/multivnc/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  wxGTK32,
+  gtk3,
+  zlib,
+  libjpeg,
+  libvncserver,
+  cmake,
+  pkg-config,
+  libsysprof-capture,
+  pcre2,
+  util-linux,
+  libselinux,
+  libsepol,
+  libthai,
+  libdatrie,
+  xorg,
+  lerc,
+  libxkbcommon,
+  libepoxy,
+  wrapGAppsHook3,
+}:
+
+let
+  # libvncserver does not support multicast. since multivnc is mostly about multicast, it requires a special branch of libvncserver.
+  libvncserver-patched = libvncserver.overrideAttrs {
+    src = fetchFromGitHub {
+      owner = "LibVNC";
+      repo = "libvncserver";
+      rev = "ef3b57438564f2877148a23055f3f0ffce66df11";
+      hash = "sha256-Cg96tsi6h1DX4VSsq1B8DTn0GxnBfoZK2nuxeT/+ca0=";
+    };
+    patches = [ ];
+  };
+
+in
+stdenv.mkDerivation {
+  pname = "MultiVNC";
+  version = "2.8.1";
+
+  src = fetchFromGitHub {
+    owner = "bk138";
+    repo = "multivnc";
+    rev = "89225243412f43ba2903ffeda98af7fe1f8f4975";
+    hash = "sha256-qdF6nUSGaTphoe6T3gTAJTSQwvu+v/g8xfYobFBmGsI=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # remove part of vendored libraries that can be provided by Nixpkgs
+    ./nixpkgs.patch
+
+    # silences a compiler warning
+    (fetchpatch {
+      url = "https://github.com/bk138/multivnc/commit/002ba7f6b5b88dac3da5c08f99be1f237dcde904.patch";
+      hash = "sha256-Qnk7RrUaw9jsaNTbzYqsH0LU8ivT9xX2jfxrES82ArE=";
+    })
+  ];
+
+  # remove submodules we don't need
+  # some submodules can be provided by nixpkgs
+  postPatch = ''
+    rm -rfv libvncserver libsshtunnel libjpeg-turbo libressl libssh2
+  '';
+
+  buildInputs = [
+    gtk3
+    wxGTK32
+    zlib
+    libjpeg
+    libvncserver-patched
+
+    # transitive dependencies
+    libsysprof-capture
+    pcre2
+    util-linux # mount
+    libselinux
+    libsepol
+    libthai
+    libdatrie
+    lerc
+    libxkbcommon
+    libepoxy
+    xorg.libXdmcp
+    xorg.libXtst
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  meta = {
+    mainProgram = "multivnc";
+    description = "Cross-platform Multicast-enabled VNC viewer based on LibVNCClient";
+    homepage = "https://github.com/bk138/multivnc";
+    maintainers = with lib.maintainers; [ rhelmot ];
+    license = lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/by-name/mu/multus-cni/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/multus-cni/default.nix
rename to pkgs/by-name/mu/multus-cni/package.nix
diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix
index 7d0e3e154cb4..2620d5b602b5 100644
--- a/pkgs/by-name/mu/mumps/package.nix
+++ b/pkgs/by-name/mu/mumps/package.nix
@@ -6,9 +6,55 @@
   lapack,
   lib,
   metis,
+  parmetis,
+  withParmetis ? false, # default to false due to unfree license
   scotch,
+  withPtScotch ? mpiSupport,
   stdenv,
+  fixDarwinDylibNames,
+  mpi,
+  mpiSupport ? false,
+  mpiCheckPhaseHook,
+  scalapack,
 }:
+assert withParmetis -> mpiSupport;
+assert withPtScotch -> mpiSupport;
+let
+  profile = if mpiSupport then "debian.PAR" else "debian.SEQ";
+  metisFlags =
+    if withParmetis then
+      ''
+        IMETIS="-I${parmetis}/include -I${metis}/include" \
+        LMETIS="-L${parmetis}/lib -lparmetis -L${metis}/lib -lmetis"
+      ''
+    else
+      ''
+        IMETIS=-I${metis}/include \
+        LMETIS="-L${metis}/lib -lmetis"
+      '';
+  scotchFlags =
+    if withPtScotch then
+      ''
+        ISCOTCH=-I${scotch.dev}/include \
+        LSCOTCH="-L${scotch}/lib -lptscotch -lptesmumps -lptscotcherr"
+      ''
+    else
+      ''
+        ISCOTCH=-I${scotch.dev}/include \
+        LSCOTCH="-L${scotch}/lib -lesmumps -lscotch -lscotcherr"
+      '';
+  macroFlags =
+    "-Dmetis -Dpord -Dscotch"
+    + lib.optionalString withParmetis " -Dparmetis"
+    + lib.optionalString withPtScotch " -Dptscotch";
+  # Optimized options
+  # Disable -fopenmp in lines below to benefit from OpenMP
+  optFlags = ''
+    OPTF="-O3 -fallow-argument-mismatch" \
+    OPTL="-O3" \
+    OPTC="-O3"
+  '';
+in
 stdenv.mkDerivation (finalAttrs: {
   name = "mumps";
   version = "5.7.3";
@@ -18,28 +64,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw=";
   };
 
-  patches = [
-    # Compatibility with coin-or-mumps version
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/coin-or-tools/ThirdParty-Mumps/bd0bdf9baa3f3677bd34fb36ce63b2b32cc6cc7d/mumps_mpi.patch";
-      hash = "sha256-70qZUKBVBpJOSRxYxng5Y6ct1fdCUQUGur3chDhGabQ=";
-    })
-  ];
-
-  postPatch =
-    ''
-      # Compatibility with coin-or-mumps version
-      # https://github.com/coin-or-tools/ThirdParty-Mumps/blob/stable/3.0/get.Mumps#L66
-      cp libseq/mpi.h libseq/mumps_mpi.h
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/Makefile --replace-fail \
-        "-Wl,\''$(SONAME),libmumps_common" \
-        "-Wl,-install_name,$out/lib/libmumps_common"
-    '';
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/Makefile --replace-fail \
+      "-Wl,\''$(SONAME),libmumps_common" \
+      "-Wl,-install_name,$out/lib/libmumps_common"
+  '';
 
   configurePhase = ''
-    cp Make.inc/Makefile.debian.SEQ ./Makefile.inc
+    cp Make.inc/Makefile.${profile} ./Makefile.inc
+  '';
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    makeFlagsArray+=(${metisFlags} ${scotchFlags} ORDERINGSF="${macroFlags}" ${optFlags})
   '';
 
   makeFlags =
@@ -48,84 +86,74 @@ stdenv.mkDerivation (finalAttrs: {
       "LIBEXT_SHARED=.dylib"
     ]
     ++ [
-      "LSCOTCHDIR=${scotch}/lib"
-      "ISCOTCH=-I${scotch.dev}/include"
-      "LMETISDIR=${metis}/lib"
-      "IMETIS=-I${metis}/include"
+      "SCALAP=-lscalapack"
       "allshared"
     ];
 
-  installPhase = ''
-    mkdir $out
-    cp -r include lib $out
+  installPhase =
+    ''
+      mkdir $out
+      cp -r include lib $out
+    ''
+    + lib.optionalString (!mpiSupport) ''
+      # Install mumps_seq headers
+      install -Dm 444 -t $out/include/mumps_seq libseq/*.h
 
-    # Add some compatibility with coin-or-mumps
-    ln -s $out/include $out/include/mumps
-    cp libseq/mumps_mpi.h $out/include
+      # Add some compatibility with coin-or-mumps
+      ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h
+    '';
+
+  nativeBuildInputs = [
+    gfortran
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional mpiSupport mpi;
+
+  # Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h"
+  buildInputs =
+    lib.optional withParmetis parmetis
+    ++ lib.optional mpiSupport scalapack
+    ++ [
+      blas
+      lapack
+      metis
+      scotch
+    ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = lib.optional mpiSupport mpiCheckPhaseHook;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    ${lib.optionalString stdenv.hostPlatform.isDarwin "export DYLD_LIBRARY_PATH=$out/lib\n"}
+    ${lib.optionalString mpiSupport "export MPIRUN='mpirun -n 2'\n"}
+    cd examples
+    make all
+    $MPIRUN ./ssimpletest codec_ctx->hw_frames_ctx =
+-		av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx);
++		av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out));
+ 
+ 	AVDictionary *opts = NULL;
+ 	av_dict_set_int(&opts, "async_depth", 1, 0);
diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
new file mode 100644
index 000000000000..29f2186ec54c
--- /dev/null
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -0,0 +1,73 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, aml
+, ffmpeg
+, gnutls
+, libjpeg_turbo
+, mesa
+, pixman
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "neatvnc";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "any1";
+    repo = "neatvnc";
+    rev = "v${version}";
+    hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg=";
+  };
+
+  patches = [
+    # Fix build with latest ffmpeg
+    # Backport of https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01
+    # FIXME: remove in next update
+    ./fix-ffmpeg.patch
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    aml
+    ffmpeg
+    gnutls
+    libjpeg_turbo
+    mesa
+    pixman
+    zlib
+  ];
+
+  mesonFlags = [
+    (lib.mesonBool "tests" true)
+  ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "VNC server library";
+    longDescription = ''
+      This is a liberally licensed VNC server library that's intended to be
+      fast and neat. Goals:
+      - Speed
+      - Clean interface
+      - Interoperability with the Freedesktop.org ecosystem
+    '';
+    homepage = "https://github.com/any1/neatvnc";
+    changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}";
+    license = licenses.isc;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/by-name/ne/nebula/package.nix
similarity index 100%
rename from pkgs/tools/networking/nebula/default.nix
rename to pkgs/by-name/ne/nebula/package.nix
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/by-name/ne/nedit/package.nix
similarity index 100%
rename from pkgs/applications/editors/nedit/default.nix
rename to pkgs/by-name/ne/nedit/package.nix
diff --git a/pkgs/by-name/ne/neil/package.nix b/pkgs/by-name/ne/neil/package.nix
new file mode 100644
index 000000000000..4be548a8fec5
--- /dev/null
+++ b/pkgs/by-name/ne/neil/package.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, babashka
+}:
+
+stdenv.mkDerivation rec {
+  pname = "neil";
+  version = "0.3.68";
+
+  src = fetchFromGitHub {
+    owner = "babashka";
+    repo = "neil";
+    rev = "v${version}";
+    sha256 = "sha256-ulqVrFsuYvRKxASHI6AqnHkKKdmDVgtivsRIscivcXw=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -D neil $out/bin/neil
+    wrapProgram $out/bin/neil \
+      --prefix PATH : "${lib.makeBinPath [ babashka ]}"
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/babashka/neil";
+    description = "CLI to add common aliases and features to deps.edn-based projects";
+    mainProgram = "neil";
+    license = licenses.mit;
+    platforms = babashka.meta.platforms;
+    maintainers = with maintainers; [ jlesquembre ];
+  };
+}
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/by-name/ne/neko/package.nix
similarity index 100%
rename from pkgs/development/compilers/neko/default.nix
rename to pkgs/by-name/ne/neko/package.nix
diff --git a/pkgs/by-name/ne/nelua/package.nix b/pkgs/by-name/ne/nelua/package.nix
new file mode 100644
index 000000000000..2a3bd7a768ef
--- /dev/null
+++ b/pkgs/by-name/ne/nelua/package.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchFromGitHub, luaPackages, unstableGitUpdater }:
+
+stdenv.mkDerivation rec {
+  pname = "nelua";
+  version = "0-unstable-2024-10-18";
+
+  src = fetchFromGitHub {
+    owner = "edubart";
+    repo = "nelua-lang";
+    rev = "038c45f19842d7b18c32b6b4f7e631e15d77d453";
+    hash = "sha256-Qnr+A4nYPnBLUxNGRbUwEwuw2POV0AKXtpKKYcLtF1M=";
+  };
+
+  postPatch = ''
+    substituteInPlace lualib/nelua/version.lua \
+      --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \
+      --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'"
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  nativeCheckInputs = [ luaPackages.luacheck ];
+
+  doCheck = true;
+
+  passthru.updateScript = unstableGitUpdater {
+    # no releases, only stale "latest" tag
+    hardcodeZeroVersion = true;
+  };
+
+  meta = with lib; {
+    description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code";
+    homepage = "https://nelua.io/";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/by-name/ne/nemiver/package.nix
similarity index 100%
rename from pkgs/development/tools/nemiver/default.nix
rename to pkgs/by-name/ne/nemiver/package.nix
diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix
index a0bff1d11f66..6f87281ed08c 100644
--- a/pkgs/by-name/ne/nemo-emblems/package.nix
+++ b/pkgs/by-name/ne/nemo-emblems/package.nix
@@ -8,6 +8,7 @@ python3.pkgs.buildPythonApplication rec {
   pname = "nemo-emblems";
   version = "6.2.1";
 
+  # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
diff --git a/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/pkgs/by-name/ne/nengo-gui/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/nengo-gui/default.nix
rename to pkgs/by-name/ne/nengo-gui/package.nix
diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/by-name/ne/neo-cowsay/package.nix
similarity index 100%
rename from pkgs/tools/misc/neo-cowsay/default.nix
rename to pkgs/by-name/ne/neo-cowsay/package.nix
diff --git a/pkgs/applications/misc/neo/default.nix b/pkgs/by-name/ne/neo/package.nix
similarity index 100%
rename from pkgs/applications/misc/neo/default.nix
rename to pkgs/by-name/ne/neo/package.nix
diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/by-name/ne/neo4j-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/neo4j-desktop/default.nix
rename to pkgs/by-name/ne/neo4j-desktop/package.nix
diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix
new file mode 100644
index 000000000000..0f13f0b9b32f
--- /dev/null
+++ b/pkgs/by-name/ne/neo4j/package.nix
@@ -0,0 +1,44 @@
+{ stdenv, lib, fetchurl, nixosTests, makeWrapper, openjdk17, which, gawk }:
+
+stdenv.mkDerivation rec {
+  pname = "neo4j";
+  version = "5.24.2";
+
+  src = fetchurl {
+    url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
+    hash = "sha256-fhbcTyxDvBiKNYtHxfrZ0DAPH7LVmY5lOA/kJd2K9tY=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p "$out/share/neo4j"
+    cp -R * "$out/share/neo4j"
+
+    mkdir -p "$out/bin"
+    for NEO4J_SCRIPT in neo4j neo4j-admin cypher-shell
+    do
+        chmod +x "$out/share/neo4j/bin/$NEO4J_SCRIPT"
+        makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
+            "$out/bin/$NEO4J_SCRIPT" \
+            --prefix PATH : "${lib.makeBinPath [ openjdk17 which gawk ]}" \
+            --set JAVA_HOME "${openjdk17}"
+    done
+
+    patchShebangs $out/share/neo4j/bin/neo4j-admin
+
+    # user will be asked to change password on first login
+    # password must be at least 8 characters long
+    $out/bin/neo4j-admin dbms set-initial-password neo4jadmin
+  '';
+
+  passthru.tests.nixos = nixosTests.neo4j;
+
+  meta = with lib; {
+    description = "Highly scalable, robust (fully ACID) native graph database";
+    homepage = "https://neo4j.com/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/neocmakelsp/default.nix
rename to pkgs/by-name/ne/neocmakelsp/package.nix
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/by-name/ne/neocomp/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/neocomp/default.nix
rename to pkgs/by-name/ne/neocomp/package.nix
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/by-name/ne/neofetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/neofetch/default.nix
rename to pkgs/by-name/ne/neofetch/package.nix
diff --git a/pkgs/development/libraries/neon/darwin-fix-configure.patch b/pkgs/by-name/ne/neon/darwin-fix-configure.patch
similarity index 100%
rename from pkgs/development/libraries/neon/darwin-fix-configure.patch
rename to pkgs/by-name/ne/neon/darwin-fix-configure.patch
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/by-name/ne/neon/package.nix
similarity index 100%
rename from pkgs/development/libraries/neon/default.nix
rename to pkgs/by-name/ne/neon/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/by-name/ne/neosay/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/neosay/default.nix
rename to pkgs/by-name/ne/neosay/package.nix
diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index fbf3624ee0f6..f474a82d2bf1 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
   '';
 
   env = {
-    LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+    LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
   };
 
   meta = {
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 886444b9442f..bc61215ad4e9 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -1,70 +1,100 @@
-{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libiconv
-, libuv, lua, pkg-config
-, unibilium
-, libvterm-neovim
-, tree-sitter
-, fetchurl
-, buildPackages
-, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }
-, CoreServices
-, fixDarwinDylibNames
-, glibcLocales ? null, procps ? null
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  removeReferencesTo,
+  cmake,
+  gettext,
+  msgpack-c,
+  darwin,
+  libuv,
+  lua,
+  pkg-config,
+  unibilium,
+  libvterm-neovim,
+  tree-sitter,
+  fetchurl,
+  buildPackages,
+  treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; },
+  fixDarwinDylibNames,
+  glibcLocales ? null,
+  procps ? null,
 
-# now defaults to false because some tests can be flaky (clipboard etc), see
-# also: https://github.com/neovim/neovim/issues/16233
-, nodejs ? null, fish ? null, python3 ? null
+  # now defaults to false because some tests can be flaky (clipboard etc), see
+  # also: https://github.com/neovim/neovim/issues/16233
+  nodejs ? null,
+  fish ? null,
+  python3 ? null,
 }:
-stdenv.mkDerivation (finalAttrs:
+stdenv.mkDerivation (
+  finalAttrs:
   let
-  nvim-lpeg-dylib = luapkgs: if stdenv.hostPlatform.isDarwin
-    then (luapkgs.lpeg.overrideAttrs (oa: {
-      preConfigure = ''
-        # neovim wants clang .dylib
-        sed -i makefile -e "s/CC = gcc/CC = clang/"
-        sed -i makefile -e "s/-bundle/-dynamiclib/"
-      '';
-      preBuild = ''
-        # there seems to be implicit calls to Makefile from luarocks, we need to
-        # add a stage to build our dylib
-        make macosx
-        mkdir -p $out/lib
-        mv lpeg.so $out/lib/lpeg.dylib
-      '';
-      nativeBuildInputs =
-        oa.nativeBuildInputs
-        ++ (
-          lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
-        );
-    }))
-    else luapkgs.lpeg;
-  requiredLuaPkgs = ps: (with ps; [
-    (nvim-lpeg-dylib ps)
-    luabitop
-    mpack
-  ] ++ lib.optionals finalAttrs.finalPackage.doCheck [
-    luv
-    coxpcall
-    busted
-    luafilesystem
-    penlight
-    inspect
-  ]
-  );
-  neovimLuaEnv = lua.withPackages requiredLuaPkgs;
-  neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs;
-  codegenLua =
-    if lua.luaOnBuild.pkgs.isLuaJIT
-      then
-        let deterministicLuajit =
-          lua.luaOnBuild.override {
+    nvim-lpeg-dylib =
+      luapkgs:
+      if stdenv.hostPlatform.isDarwin then
+        let
+          luaLibDir = "$out/lib/lua/${lib.versions.majorMinor luapkgs.lua.luaversion}";
+        in
+        (luapkgs.lpeg.overrideAttrs (oa: {
+          preConfigure = ''
+            # neovim wants clang .dylib
+            substituteInPlace Makefile \
+              --replace-fail "CC = gcc" "CC = clang" \
+              --replace-fail "-bundle" "-dynamiclib" \
+              --replace-fail "lpeg.so" "lpeg.dylib"
+          '';
+          preBuild = ''
+            # there seems to be implicit calls to Makefile from luarocks, we need to
+            # add a stage to build our dylib
+            make macosx
+            mkdir -p ${luaLibDir}
+            mv lpeg.dylib ${luaLibDir}/lpeg.dylib
+          '';
+          postInstall = ''
+            rm -f ${luaLibDir}/lpeg.so
+          '';
+          nativeBuildInputs =
+            oa.nativeBuildInputs ++ (lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames);
+        }))
+      else
+        luapkgs.lpeg;
+    requiredLuaPkgs =
+      ps:
+      (
+        with ps;
+        [
+          (nvim-lpeg-dylib ps)
+          luabitop
+          mpack
+        ]
+        ++ lib.optionals finalAttrs.finalPackage.doCheck [
+          luv
+          coxpcall
+          busted
+          luafilesystem
+          penlight
+          inspect
+        ]
+      );
+    neovimLuaEnv = lua.withPackages requiredLuaPkgs;
+    neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs;
+    codegenLua =
+      if lua.luaOnBuild.pkgs.isLuaJIT then
+        let
+          deterministicLuajit = lua.luaOnBuild.override {
             deterministicStringIds = true;
             self = deterministicLuajit;
           };
-        in deterministicLuajit.withPackages(ps: [ ps.mpack (nvim-lpeg-dylib ps) ])
-      else lua.luaOnBuild;
+        in
+        deterministicLuajit.withPackages (ps: [
+          ps.mpack
+          (nvim-lpeg-dylib ps)
+        ])
+      else
+        lua.luaOnBuild;
 
-
-in {
+  in
+  {
     pname = "neovim-unwrapped";
     version = "0.10.2";
 
@@ -87,26 +117,39 @@ in {
     dontFixCmake = true;
 
     inherit lua;
-    treesitter-parsers = treesitter-parsers //
-      { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } //
-      { markdown_inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }
-      ;
+    treesitter-parsers =
+      treesitter-parsers
+      // {
+        markdown = treesitter-parsers.markdown // {
+          location = "tree-sitter-markdown";
+        };
+      }
+      // {
+        markdown_inline = treesitter-parsers.markdown // {
+          language = "markdown_inline";
+          location = "tree-sitter-markdown-inline";
+        };
+      };
 
-    buildInputs = [
-      libuv
-      libvterm-neovim
-      # This is actually a c library, hence it's not included in neovimLuaEnv,
-      # see:
-      # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570
-      # and it's definition at: pkgs/development/lua-modules/overrides.nix
-      lua.pkgs.libluv
-      msgpack-c
-      neovimLuaEnv
-      tree-sitter
-      unibilium
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]
-      ++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps ]
-    ;
+    buildInputs =
+      [
+        libuv
+        libvterm-neovim
+        # This is actually a c library, hence it's not included in neovimLuaEnv,
+        # see:
+        # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570
+        # and it's definition at: pkgs/development/lua-modules/overrides.nix
+        lua.pkgs.libluv
+        msgpack-c
+        neovimLuaEnv
+        tree-sitter
+        unibilium
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]
+      ++ lib.optionals finalAttrs.finalPackage.doCheck [
+        glibcLocales
+        procps
+      ];
 
     doCheck = false;
 
@@ -126,66 +169,87 @@ in {
     ];
 
     # extra programs test via `make functionaltest`
-    nativeCheckInputs = let
-      pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);
-    in [
-      fish
-      nodejs
-      pyEnv      # for src/clint.py
-    ];
+    nativeCheckInputs =
+      let
+        pyEnv = python3.withPackages (
+          ps: with ps; [
+            pynvim
+            msgpack
+          ]
+        );
+      in
+      [
+        fish
+        nodejs
+        pyEnv # for src/clint.py
+      ];
 
     # nvim --version output retains compilation flags and references to build tools
-    postPatch = ''
-      substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS "";
-    '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      sed -i runtime/CMakeLists.txt \
-        -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g"
-      sed -i src/nvim/po/CMakeLists.txt \
-        -e "s|\$=2.8.2",
+    "pygithub>=2.4.0",
+]
+
+[project.scripts]
+nixpkgs-openjdk-updater = "nixpkgs_openjdk_updater:main"
+
+[build-system]
+requires = ["hatchling>=1.25.0"]
+build-backend = "hatchling.build"
+
+[tool.pyright]
+include = ["src"]
+strict = ["**/*"]
+pythonVersion = "3.12"
+
+[tool.pytest.ini_options]
+addopts = "--doctest-modules"
+
+[tool.ruff]
+line-length = 80
+
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = ["COM812", "D203", "D213", "ISC001", "T201"]
+allowed-confusables = ["’"]
+
+[tool.ruff.format]
+docstring-code-format = true
+docstring-code-line-length = "dynamic"
+
+[tool.uv]
+dev-dependencies = [
+    "pytest>=8.3.3",
+]
diff --git a/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/src/nixpkgs_openjdk_updater/__init__.py b/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/src/nixpkgs_openjdk_updater/__init__.py
new file mode 100644
index 000000000000..9c18219770d2
--- /dev/null
+++ b/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/src/nixpkgs_openjdk_updater/__init__.py
@@ -0,0 +1,173 @@
+"""Update tool for Nixpkgs OpenJDK packages."""
+
+import argparse
+import json
+import os
+import re
+import subprocess
+from pathlib import Path
+from typing import Literal
+
+import github
+from pydantic import BaseModel
+
+
+class SourceInfo(BaseModel):
+    """GitHub fetcher data for an OpenJDK release tag."""
+
+    owner: str
+    repo: str
+    rev: str
+    hash: str
+
+
+type Update = tuple[int, ...]
+type Build = int | Literal["ga"]
+
+
+def parse_openjdk_ref_name(
+    feature_version_prefix: str,
+    ref_name: str,
+) -> tuple[Update, Build]:
+    r"""Parse an OpenJDK Git ref name containing a JDK version.
+
+    Takes the tag name prefix for a given feature version and parses
+    the rest of the version and build information.
+
+    See |java.lang.Runtime.Version|_ for documentation of the modern
+    version string scheme initially introduced in `JEP 223`_ for JDK 9,
+    though this tool also supports JDK 8 for now.
+
+    .. |java.lang.Runtime.Version| replace:: ``java.lang.Runtime.Version``
+    .. _java.lang.Runtime.Version: https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/Runtime.Version.html
+    .. _JEP 223: https://openjdk.org/jeps/223
+
+    >>> parse_openjdk_ref_name("jdk-23", "refs/tags/jdk-23-ga")
+    ((), 'ga')
+    >>> parse_openjdk_ref_name("jdk-17", "refs/tags/jdk-17.0.2+7")
+    ((0, 2), 7)
+    >>> parse_openjdk_ref_name("jdk8", "refs/tags/jdk8u422-ga")
+    ((422,), 'ga')
+    >>> parse_openjdk_ref_name("jdk8", "refs/tags/jdk8-b01")
+    ((), 1)
+    >>> parse_openjdk_ref_name("22", "refs/tags/22.0.2-ga")
+    ((0, 2), 'ga')
+    >>> parse_openjdk_ref_name("jdk8", "refs/tags/jdk7-b147")
+    Traceback (most recent call last):
+    ...
+    ValueError: unexpected OpenJDK ref name: refs/tags/jdk7-b147
+    >>> parse_openjdk_ref_name("jdk8", "refs/tags/jdk80-ga")
+    Traceback (most recent call last):
+    ...
+    ValueError: unexpected OpenJDK ref name: refs/tags/jdk80-ga
+    >>> parse_openjdk_ref_name("11", "refs/tags/jdk-11+14")
+    Traceback (most recent call last):
+    ...
+    ValueError: unexpected OpenJDK ref name: refs/tags/jdk-11+14
+    """
+    m = re.fullmatch(
+        rf"""
+            refs/tags/{re.escape(feature_version_prefix)}
+            (?P
+                (?:u[0-9]+)? # JDK 8 uses u
+                | (?:\.[0-9]+)*
+            )
+            (?P
+                -ga
+                | (\+|-b) # JDK 8 uses -b
+                [0-9]+
+            )
+        """,
+        ref_name,
+        re.VERBOSE,
+    )
+    if not m:
+        msg = f"unexpected OpenJDK ref name: {ref_name}"
+        raise ValueError(msg)
+    update = tuple(
+        int(element) for element in m["update"].replace("u", ".").split(".")[1:]
+    )
+    build = (
+        "ga"
+        if m["build"] == "-ga"
+        else int(m["build"].removeprefix("+").removeprefix("-b"))
+    )
+    return update, build
+
+
+def main() -> None:
+    """Update a Nixpkgs OpenJDK package."""
+    parser = argparse.ArgumentParser(description=main.__doc__)
+    parser.add_argument("--source-file", type=Path, required=True)
+    parser.add_argument("--owner", required=True)
+    parser.add_argument("--repo", required=True)
+    parser.add_argument("--feature-version-prefix", required=True)
+    args = parser.parse_args()
+
+    source_info: SourceInfo | None
+    try:
+        with args.source_file.open() as source_fp:
+            source_info = SourceInfo(**json.load(source_fp))
+    except FileNotFoundError:
+        source_info = None
+
+    token = os.environ.get("GITHUB_TOKEN")
+    gh = github.Github(auth=github.Auth.Token(token) if token else None)
+
+    repo = gh.get_repo(f"{args.owner}/{args.repo}")
+    versions: dict[Update, dict[Build, str]] = {}
+    for ref in repo.get_git_matching_refs(
+        "tags/" + args.feature_version_prefix
+    ):
+        update, build = parse_openjdk_ref_name(
+            args.feature_version_prefix,
+            ref.ref,
+        )
+        versions.setdefault(update, {})[build] = ref.ref
+
+    # We want a finalized General Availability release version, but we
+    # want to pin a tag with the build number in it so that we can use
+    # it for version information.
+    #
+    # The OpenJDK `-ga` tags point to the same commits as the highest
+    # build number for a given version, so we find and pin that.
+    latest_release_builds = versions[
+        max(update for update, builds in versions.items() if "ga" in builds)
+    ]
+    latest_release_ref_name = latest_release_builds[
+        max(latest_release_builds.keys() - {"ga"})
+    ]
+
+    if source_info and source_info.rev == latest_release_ref_name:
+        return
+
+    prefetch_result = subprocess.run(  # noqa: S603
+        (
+            "nix",
+            "--extra-experimental-features",
+            "nix-command",
+            "store",
+            "prefetch-file",
+            "--json",
+            "--unpack",
+            "--name",
+            "source",
+            repo.get_archive_link("tarball", latest_release_ref_name),
+        ),
+        check=True,
+        stdout=subprocess.PIPE,
+    )
+    source_info = SourceInfo(
+        owner=args.owner,
+        repo=args.repo,
+        rev=latest_release_ref_name,
+        hash=json.loads(prefetch_result.stdout)["hash"],
+    )
+    with args.source_file.open("w") as source_fp:
+        json.dump(
+            source_info.model_dump(),
+            source_fp,
+            indent="  ",
+            sort_keys=True,
+        )
+        print(file=source_fp)
diff --git a/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix b/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix
new file mode 100644
index 000000000000..124a1fced4c6
--- /dev/null
+++ b/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  python3Packages,
+  ruff,
+  pyright,
+  fetchFromGitHub,
+  nixpkgs-openjdk-updater,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "nixpkgs-openjdk-updater";
+  version = "0.1.0";
+  format = "pyproject";
+
+  src = ./nixpkgs-openjdk-updater;
+
+  build-system = [ python3Packages.hatchling ];
+
+  dependencies = [
+    python3Packages.pydantic
+    python3Packages.pygithub
+  ];
+
+  nativeCheckInputs = [
+    ruff
+    pyright
+    python3Packages.pytestCheckHook
+  ];
+
+  preCheck = ''
+    ruff format --check
+    ruff check
+    pyright
+  '';
+
+  postCheck = ''
+    $out/bin/nixpkgs-openjdk-updater --help >/dev/null
+  '';
+
+  passthru.openjdkSource =
+    {
+      sourceFile,
+      featureVersionPrefix,
+    }:
+    let
+      # TODO: Tighten up after update scripts are run.
+      src = fetchFromGitHub (lib.importJSON sourceFile);
+    in
+    {
+      inherit src;
+
+      updateScript = {
+        command = [
+          (lib.getExe nixpkgs-openjdk-updater)
+
+          "--source-file"
+          sourceFile
+
+          "--owner"
+          src.owner
+
+          "--repo"
+          src.repo
+
+          "--feature-version-prefix"
+          featureVersionPrefix
+        ];
+
+        supportedFeatures = [ "silent" ];
+      };
+    };
+
+  meta = {
+    description = "Updater for Nixpkgs OpenJDK packages";
+    license = lib.licenses.mit;
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    maintainers = [ lib.maintainers.emily ];
+    mainProgram = "nixpkgs-openjdk-updater";
+  };
+}
diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
new file mode 100644
index 000000000000..e7aebeff6093
--- /dev/null
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+
+  installShellFiles,
+  bubblewrap,
+  nix-output-monitor,
+  cacert,
+  git,
+  nix,
+  versionCheckHook,
+
+  withAutocomplete ? true,
+  withSandboxSupport ? false,
+  withNom ? false,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "nixpkgs-review";
+  version = "2.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "nixpkgs-review";
+    rev = "refs/tags/${version}";
+    hash = "sha256-yNdBqL3tceuoUHx8/j2y5ZTq1zeVDAm37RZtlCbC6rg=";
+  };
+
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = lib.optionals withAutocomplete [
+    python3Packages.argcomplete
+  ];
+
+  nativeBuildInputs =
+    [
+      installShellFiles
+    ]
+    ++ lib.optionals withAutocomplete [
+      python3Packages.argcomplete
+    ];
+
+  makeWrapperArgs =
+    let
+      binPath = [
+        nix
+        git
+      ] ++ lib.optional withSandboxSupport bubblewrap ++ lib.optional withNom nix-output-monitor;
+    in
+    [
+      "--prefix PATH : ${lib.makeBinPath binPath}"
+      "--set-default NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt"
+      # we don't have any runtime deps but nixpkgs-review shells might inject unwanted dependencies
+      "--unset PYTHONPATH"
+    ];
+
+  postInstall = lib.optionalString withAutocomplete ''
+    for cmd in nix-review nixpkgs-review; do
+      installShellCompletion --cmd $cmd \
+        --bash <(register-python-argcomplete $cmd) \
+        --fish <(register-python-argcomplete $cmd -s fish) \
+        --zsh <(register-python-argcomplete $cmd -s zsh)
+    done
+  '';
+
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
+    description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
+    homepage = "https://github.com/Mic92/nixpkgs-review";
+    license = lib.licenses.mit;
+    mainProgram = "nixpkgs-review";
+    maintainers = with lib.maintainers; [
+      figsoda
+      mic92
+    ];
+  };
+}
diff --git a/pkgs/games/njam/logfile.patch b/pkgs/by-name/nj/njam/logfile.patch
similarity index 100%
rename from pkgs/games/njam/logfile.patch
rename to pkgs/by-name/nj/njam/logfile.patch
diff --git a/pkgs/games/njam/default.nix b/pkgs/by-name/nj/njam/package.nix
similarity index 100%
rename from pkgs/games/njam/default.nix
rename to pkgs/by-name/nj/njam/package.nix
diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/by-name/nk/nkeys/package.nix
similarity index 100%
rename from pkgs/tools/system/nkeys/default.nix
rename to pkgs/by-name/nk/nkeys/package.nix
diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/by-name/nk/nkf/package.nix
similarity index 100%
rename from pkgs/tools/text/nkf/default.nix
rename to pkgs/by-name/nk/nkf/package.nix
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/by-name/nl/nload/package.nix
similarity index 100%
rename from pkgs/applications/networking/nload/default.nix
rename to pkgs/by-name/nl/nload/package.nix
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
similarity index 100%
rename from pkgs/development/libraries/nlohmann_json/default.nix
rename to pkgs/by-name/nl/nlohmann_json/package.nix
diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/by-name/nl/nlojet/nlojet_clang_fix.patch
similarity index 100%
rename from pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
rename to pkgs/by-name/nl/nlojet/nlojet_clang_fix.patch
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/by-name/nl/nlojet/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/nlojet/default.nix
rename to pkgs/by-name/nl/nlojet/package.nix
diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
similarity index 100%
rename from pkgs/tools/security/nmap-formatter/default.nix
rename to pkgs/by-name/nm/nmap-formatter/package.nix
diff --git a/pkgs/tools/networking/nmh/default.nix b/pkgs/by-name/nm/nmh/package.nix
similarity index 100%
rename from pkgs/tools/networking/nmh/default.nix
rename to pkgs/by-name/nm/nmh/package.nix
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/by-name/nm/nmon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nmon/default.nix
rename to pkgs/by-name/nm/nmon/package.nix
diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/by-name/nm/nmrpflash/package.nix
similarity index 100%
rename from pkgs/development/embedded/nmrpflash/default.nix
rename to pkgs/by-name/nm/nmrpflash/package.nix
diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/by-name/nm/nms/package.nix
similarity index 100%
rename from pkgs/tools/misc/nms/default.nix
rename to pkgs/by-name/nm/nms/package.nix
diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/by-name/nn/nng/package.nix
similarity index 100%
rename from pkgs/development/libraries/nng/default.nix
rename to pkgs/by-name/nn/nng/package.nix
diff --git a/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch b/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch
similarity index 100%
rename from pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch
rename to pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch
diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/by-name/nn/nnn/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/nnn/default.nix
rename to pkgs/by-name/nn/nnn/package.nix
diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/by-name/nn/nnpdf/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/nnpdf/default.nix
rename to pkgs/by-name/nn/nnpdf/package.nix
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/by-name/nn/nntp-proxy/package.nix
similarity index 100%
rename from pkgs/applications/networking/nntp-proxy/default.nix
rename to pkgs/by-name/nn/nntp-proxy/package.nix
diff --git a/pkgs/applications/radio/noaa-apt/Cargo.lock b/pkgs/by-name/no/noaa-apt/Cargo.lock
similarity index 100%
rename from pkgs/applications/radio/noaa-apt/Cargo.lock
rename to pkgs/by-name/no/noaa-apt/Cargo.lock
diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/by-name/no/noaa-apt/package.nix
similarity index 100%
rename from pkgs/applications/radio/noaa-apt/default.nix
rename to pkgs/by-name/no/noaa-apt/package.nix
diff --git a/pkgs/tools/misc/node-glob/default.nix b/pkgs/by-name/no/node-glob/package.nix
similarity index 100%
rename from pkgs/tools/misc/node-glob/default.nix
rename to pkgs/by-name/no/node-glob/package.nix
diff --git a/pkgs/tools/admin/manta/default.nix b/pkgs/by-name/no/node-manta/package.nix
similarity index 100%
rename from pkgs/tools/admin/manta/default.nix
rename to pkgs/by-name/no/node-manta/package.nix
diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
new file mode 100644
index 000000000000..21a7d60638ee
--- /dev/null
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, buildGoModule, fetchFromGitHub, systemd }:
+
+buildGoModule rec {
+  pname = "node-problem-detector";
+  version = "0.8.20";
+
+  src = fetchFromGitHub {
+    owner = "kubernetes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-Aw6TDyWczqWgUOCV7f4JSAI4eVcjWgwe2V5qSrx4TBI=";
+  };
+
+  vendorHash = null;
+
+  doCheck = false;
+
+  # Optionally, a log counter binary can be created to parse journald logs.
+  # The binary is dynamically linked against systemd libraries, making it a
+  # Linux-only feature. See 'ENABLE_JOURNALD' upstream:
+  # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile
+  subPackages = [ "cmd/nodeproblemdetector" ] ++
+    lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ];
+
+  preBuild = ''
+    export CGO_ENABLED=${if stdenv.hostPlatform.isLinux then "1" else "0"}
+  '';
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
+
+  tags = lib.optionals stdenv.hostPlatform.isLinux [ "journald" ];
+
+  ldflags = [
+    "-X k8s.io/${pname}/pkg/version.version=v${version}"
+  ];
+
+  meta = with lib; {
+    description = "Various problem detectors running on the Kubernetes nodes";
+    homepage = "https://github.com/kubernetes/node-problem-detector";
+    changelog = "https://github.com/kubernetes/node-problem-detector/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lbpdt ];
+  };
+}
diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/by-name/no/nodehun/package.nix
similarity index 100%
rename from pkgs/development/tools/nodehun/default.nix
rename to pkgs/by-name/no/nodehun/package.nix
diff --git a/pkgs/development/tools/nodehun/update-nan.patch b/pkgs/by-name/no/nodehun/update-nan.patch
similarity index 100%
rename from pkgs/development/tools/nodehun/update-nan.patch
rename to pkgs/by-name/no/nodehun/update-nan.patch
diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/by-name/no/nodenv/package.nix
similarity index 100%
rename from pkgs/development/tools/nodenv/default.nix
rename to pkgs/by-name/no/nodenv/package.nix
diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/by-name/no/noice/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/noice/default.nix
rename to pkgs/by-name/no/noice/package.nix
diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/by-name/no/noip/package.nix
similarity index 100%
rename from pkgs/tools/networking/noip/default.nix
rename to pkgs/by-name/no/noip/package.nix
diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/by-name/no/noise-repellent/package.nix
similarity index 100%
rename from pkgs/applications/audio/noise-repellent/default.nix
rename to pkgs/by-name/no/noise-repellent/package.nix
diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/by-name/no/noisetorch/package.nix
similarity index 100%
rename from pkgs/applications/audio/noisetorch/default.nix
rename to pkgs/by-name/no/noisetorch/package.nix
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/by-name/no/nomachine-client/package.nix
similarity index 100%
rename from pkgs/tools/admin/nomachine-client/default.nix
rename to pkgs/by-name/no/nomachine-client/package.nix
diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/by-name/no/nomad-autoscaler/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
rename to pkgs/by-name/no/nomad-autoscaler/package.nix
diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/by-name/no/nomad-driver-podman/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
rename to pkgs/by-name/no/nomad-driver-podman/package.nix
diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/by-name/no/nomino/package.nix
similarity index 100%
rename from pkgs/tools/misc/nomino/default.nix
rename to pkgs/by-name/no/nomino/package.nix
diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/by-name/no/nordzy-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/nordzy-cursor-theme/default.nix
rename to pkgs/by-name/no/nordzy-cursor-theme/package.nix
diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/by-name/no/nordzy-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/nordzy-icon-theme/default.nix
rename to pkgs/by-name/no/nordzy-icon-theme/package.nix
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/by-name/no/normalize/package.nix
similarity index 100%
rename from pkgs/applications/audio/normalize/default.nix
rename to pkgs/by-name/no/normalize/package.nix
diff --git a/pkgs/development/tools/norminette/default.nix b/pkgs/by-name/no/norminette/package.nix
similarity index 100%
rename from pkgs/development/tools/norminette/default.nix
rename to pkgs/by-name/no/norminette/package.nix
diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/by-name/no/norouter/package.nix
similarity index 100%
rename from pkgs/tools/networking/norouter/default.nix
rename to pkgs/by-name/no/norouter/package.nix
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/by-name/no/norwester-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/norwester/default.nix
rename to pkgs/by-name/no/norwester-font/package.nix
diff --git a/pkgs/tools/security/noseyparker/default.nix b/pkgs/by-name/no/noseyparker/package.nix
similarity index 100%
rename from pkgs/tools/security/noseyparker/default.nix
rename to pkgs/by-name/no/noseyparker/package.nix
diff --git a/pkgs/tools/security/nosqli/default.nix b/pkgs/by-name/no/nosqli/package.nix
similarity index 100%
rename from pkgs/tools/security/nosqli/default.nix
rename to pkgs/by-name/no/nosqli/package.nix
diff --git a/pkgs/servers/nostr-rs-relay/default.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
similarity index 100%
rename from pkgs/servers/nostr-rs-relay/default.nix
rename to pkgs/by-name/no/nostr-rs-relay/package.nix
diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/by-name/no/notable/package.nix
similarity index 100%
rename from pkgs/applications/misc/notable/default.nix
rename to pkgs/by-name/no/notable/package.nix
diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/by-name/no/notemap/package.nix
similarity index 100%
rename from pkgs/tools/networking/notemap/default.nix
rename to pkgs/by-name/no/notemap/package.nix
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/by-name/no/notes-up/package.nix
similarity index 100%
rename from pkgs/applications/office/notes-up/default.nix
rename to pkgs/by-name/no/notes-up/package.nix
diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix
index 83af624af20c..af926182fa91 100644
--- a/pkgs/by-name/no/notes/package.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "notes";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "nuttyartist";
     repo = "notes";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Z89Z7Il9K9pOxvNfFCoRUkRs0Wf5a6TQACDbBrQhGyw=";
+    hash = "sha256-ceZ37torgnxZJybacjnNG+kNAU/I2Ki7ZZ7Tzn4pIas=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/by-name/no/noteshrink/package.nix
similarity index 100%
rename from pkgs/tools/misc/noteshrink/default.nix
rename to pkgs/by-name/no/noteshrink/package.nix
diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
new file mode 100644
index 000000000000..e99f4553b925
--- /dev/null
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -0,0 +1,79 @@
+{ lib, stdenv, appimageTools, fetchurl, _7zz }:
+
+let
+  pname = "notesnook";
+  version = "3.0.19";
+
+  inherit (stdenv.hostPlatform) system;
+  throwSystem = throw "Unsupported system: ${system}";
+
+  suffix = {
+    x86_64-linux = "linux_x86_64.AppImage";
+    x86_64-darwin = "mac_x64.dmg";
+    aarch64-darwin = "mac_arm64.dmg";
+  }.${system} or throwSystem;
+
+  src = fetchurl {
+    url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
+    hash = {
+      x86_64-linux = "sha256-yCzREyFyGoAPXVVnNX6GUrr83oaPtoNOgZOOd6vJD1Q=";
+      x86_64-darwin = "sha256-WciEpt0vUuXS6YeZkbyFGqQaotXoZkWnkkn5B6/JXwE=";
+      aarch64-darwin = "sha256-iP3Xd/otYEVwU85U2dlFcX9QjDq2CbIqHmcDYVxzqzI=";
+    }.${system} or throwSystem;
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+
+  meta = with lib; {
+    description = "Fully open source & end-to-end encrypted note taking alternative to Evernote";
+    longDescription = ''
+      Notesnook is a free (as in speech) & open source note taking app
+      focused on user privacy & ease of use. To ensure zero knowledge
+      principles, Notesnook encrypts everything on your device using
+      XChaCha20-Poly1305 & Argon2.
+    '';
+    homepage = "https://notesnook.com";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ cig0 j0lol ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    mainProgram = "notesnook";
+  };
+
+  linux = appimageTools.wrapType2 rec {
+    inherit pname version src meta;
+
+    profile = ''
+      export LC_ALL=C.UTF-8
+    '';
+
+    extraInstallCommands = ''
+      install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
+      install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps
+      substituteInPlace $out/share/applications/notesnook.desktop \
+        --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
+    '';
+  };
+
+  darwin = stdenv.mkDerivation {
+    inherit pname version src meta;
+
+    nativeBuildInputs = [ _7zz ];
+
+    sourceRoot = "Notesnook.app";
+
+    # 7zz did not unpack in setup hook for some reason, done manually here
+    unpackPhase = ''
+      7zz x $src
+    '';
+
+    installPhase = ''
+      mkdir -p $out/Applications/Notesnook.app
+      cp -R . $out/Applications/Notesnook.app
+    '';
+  };
+in
+if stdenv.hostPlatform.isDarwin
+then darwin
+else linux
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/by-name/no/notify-desktop/package.nix
similarity index 100%
rename from pkgs/tools/misc/notify-desktop/default.nix
rename to pkgs/by-name/no/notify-desktop/package.nix
diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/by-name/no/notify-osd-customizable/package.nix
similarity index 100%
rename from pkgs/applications/misc/notify-osd-customizable/default.nix
rename to pkgs/by-name/no/notify-osd-customizable/package.nix
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/by-name/no/notify-osd/package.nix
similarity index 100%
rename from pkgs/applications/misc/notify-osd/default.nix
rename to pkgs/by-name/no/notify-osd/package.nix
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/by-name/no/notify-sharp/package.nix
similarity index 100%
rename from pkgs/development/libraries/notify-sharp/default.nix
rename to pkgs/by-name/no/notify-sharp/package.nix
diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/by-name/no/notify/package.nix
similarity index 100%
rename from pkgs/tools/misc/notify/default.nix
rename to pkgs/by-name/no/notify/package.nix
diff --git a/pkgs/applications/misc/notifymuch/default.nix b/pkgs/by-name/no/notifymuch/package.nix
similarity index 100%
rename from pkgs/applications/misc/notifymuch/default.nix
rename to pkgs/by-name/no/notifymuch/package.nix
diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/by-name/no/notion-app-enhanced/package.nix
similarity index 100%
rename from pkgs/applications/office/notion-app-enhanced/default.nix
rename to pkgs/by-name/no/notion-app-enhanced/package.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/by-name/no/notmuch-addrlookup/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
rename to pkgs/by-name/no/notmuch-addrlookup/package.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/by-name/no/notmuch-bower/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
rename to pkgs/by-name/no/notmuch-bower/package.nix
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/by-name/no/nova-filters/package.nix
similarity index 100%
rename from pkgs/applications/audio/nova-filters/default.nix
rename to pkgs/by-name/no/nova-filters/package.nix
diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/by-name/no/nova/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nova/default.nix
rename to pkgs/by-name/no/nova/package.nix
diff --git a/pkgs/applications/networking/novnc/fix-paths.patch b/pkgs/by-name/no/novnc/fix-paths.patch
similarity index 100%
rename from pkgs/applications/networking/novnc/fix-paths.patch
rename to pkgs/by-name/no/novnc/fix-paths.patch
diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/by-name/no/novnc/package.nix
similarity index 100%
rename from pkgs/applications/networking/novnc/default.nix
rename to pkgs/by-name/no/novnc/package.nix
diff --git a/pkgs/applications/networking/novnc/websockify.patch b/pkgs/by-name/no/novnc/websockify.patch
similarity index 100%
rename from pkgs/applications/networking/novnc/websockify.patch
rename to pkgs/by-name/no/novnc/websockify.patch
diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/by-name/no/noweb/no-FAQ.patch
similarity index 100%
rename from pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
rename to pkgs/by-name/no/noweb/no-FAQ.patch
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/by-name/no/noweb/package.nix
similarity index 100%
rename from pkgs/development/tools/literate-programming/noweb/default.nix
rename to pkgs/by-name/no/noweb/package.nix
diff --git a/pkgs/tools/package-management/nox/nox-review-wip.patch b/pkgs/by-name/no/nox/nox-review-wip.patch
similarity index 100%
rename from pkgs/tools/package-management/nox/nox-review-wip.patch
rename to pkgs/by-name/no/nox/nox-review-wip.patch
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/by-name/no/nox/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nox/default.nix
rename to pkgs/by-name/no/nox/package.nix
diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/by-name/np/np2kai/package.nix
similarity index 100%
rename from pkgs/applications/emulators/np2kai/default.nix
rename to pkgs/by-name/np/np2kai/package.nix
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/by-name/np/npapi_sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/npapi-sdk/default.nix
rename to pkgs/by-name/np/npapi_sdk/package.nix
diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/by-name/np/npins/package.nix
similarity index 100%
rename from pkgs/tools/nix/npins/default.nix
rename to pkgs/by-name/np/npins/package.nix
diff --git a/pkgs/tools/nix/npins/source.nix b/pkgs/by-name/np/npins/source.nix
similarity index 100%
rename from pkgs/tools/nix/npins/source.nix
rename to pkgs/by-name/np/npins/source.nix
diff --git a/pkgs/tools/nix/npins/sources.json b/pkgs/by-name/np/npins/sources.json
similarity index 100%
rename from pkgs/tools/nix/npins/sources.json
rename to pkgs/by-name/np/npins/sources.json
diff --git a/pkgs/tools/package-management/npm-check-updates/default.nix b/pkgs/by-name/np/npm-check-updates/package.nix
similarity index 100%
rename from pkgs/tools/package-management/npm-check-updates/default.nix
rename to pkgs/by-name/np/npm-check-updates/package.nix
diff --git a/pkgs/development/tools/npm-check/default.nix b/pkgs/by-name/np/npm-check/package.nix
similarity index 100%
rename from pkgs/development/tools/npm-check/default.nix
rename to pkgs/by-name/np/npm-check/package.nix
diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix
index 69c5d40756b7..db886f6821e3 100644
--- a/pkgs/by-name/np/npm-lockfile-fix/package.nix
+++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "npm-lockfile-fix";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "jeslie0";
     repo = "npm-lockfile-fix";
     rev = "v${version}";
-    hash = "sha256-0EGPCPmCf6bxbso3aHCeJ1XBOpYp3jtMXv8LGdwrsbs=";
+    hash = "sha256-P93OowrVkkOfX5XKsRsg0c4dZLVn2ZOonJazPmHdD7g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/by-name/np/npth/package.nix
similarity index 100%
rename from pkgs/development/libraries/npth/default.nix
rename to pkgs/by-name/np/npth/package.nix
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/by-name/nq/nq/package.nix
similarity index 100%
rename from pkgs/tools/system/nq/default.nix
rename to pkgs/by-name/nq/nq/package.nix
diff --git a/pkgs/development/compilers/nqc/nqc-unistd.patch b/pkgs/by-name/nq/nqc/nqc-unistd.patch
similarity index 100%
rename from pkgs/development/compilers/nqc/nqc-unistd.patch
rename to pkgs/by-name/nq/nqc/nqc-unistd.patch
diff --git a/pkgs/development/compilers/nqc/default.nix b/pkgs/by-name/nq/nqc/package.nix
similarity index 100%
rename from pkgs/development/compilers/nqc/default.nix
rename to pkgs/by-name/nq/nqc/package.nix
diff --git a/pkgs/tools/networking/nqptp/default.nix b/pkgs/by-name/nq/nqptp/package.nix
similarity index 100%
rename from pkgs/tools/networking/nqptp/default.nix
rename to pkgs/by-name/nq/nqptp/package.nix
diff --git a/pkgs/tools/networking/nqptp/remove-setcap.patch b/pkgs/by-name/nq/nqptp/remove-setcap.patch
similarity index 100%
rename from pkgs/tools/networking/nqptp/remove-setcap.patch
rename to pkgs/by-name/nq/nqptp/remove-setcap.patch
diff --git a/pkgs/tools/networking/nqptp/systemd-service-capability.patch b/pkgs/by-name/nq/nqptp/systemd-service-capability.patch
similarity index 100%
rename from pkgs/tools/networking/nqptp/systemd-service-capability.patch
rename to pkgs/by-name/nq/nqptp/systemd-service-capability.patch
diff --git a/pkgs/development/libraries/nrf5-sdk/default.nix b/pkgs/by-name/nr/nrf5-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/nrf5-sdk/default.nix
rename to pkgs/by-name/nr/nrf5-sdk/package.nix
diff --git a/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch b/pkgs/by-name/nr/nrg2iso/c-compiler.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
rename to pkgs/by-name/nr/nrg2iso/c-compiler.patch
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/by-name/nr/nrg2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/nrg2iso/default.nix
rename to pkgs/by-name/nr/nrg2iso/package.nix
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/by-name/nr/nrsc5/package.nix
similarity index 100%
rename from pkgs/applications/misc/nrsc5/default.nix
rename to pkgs/by-name/nr/nrsc5/package.nix
diff --git a/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules b/pkgs/by-name/ns/ns-usbloader/99-ns-usbloader.rules
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
rename to pkgs/by-name/ns/ns-usbloader/99-ns-usbloader.rules
diff --git a/pkgs/applications/misc/ns-usbloader/make-deterministic.patch b/pkgs/by-name/ns/ns-usbloader/make-deterministic.patch
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/make-deterministic.patch
rename to pkgs/by-name/ns/ns-usbloader/make-deterministic.patch
diff --git a/pkgs/applications/misc/ns-usbloader/no-launch4j.patch b/pkgs/by-name/ns/ns-usbloader/no-launch4j.patch
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/no-launch4j.patch
rename to pkgs/by-name/ns/ns-usbloader/no-launch4j.patch
diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/by-name/ns/ns-usbloader/package.nix
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/default.nix
rename to pkgs/by-name/ns/ns-usbloader/package.nix
diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/by-name/ns/nsc/package.nix
similarity index 100%
rename from pkgs/tools/system/nsc/default.nix
rename to pkgs/by-name/ns/nsc/package.nix
diff --git a/pkgs/shells/nsh/default.nix b/pkgs/by-name/ns/nsh/package.nix
similarity index 100%
rename from pkgs/shells/nsh/default.nix
rename to pkgs/by-name/ns/nsh/package.nix
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/by-name/ns/nsis/package.nix
similarity index 100%
rename from pkgs/development/tools/nsis/default.nix
rename to pkgs/by-name/ns/nsis/package.nix
diff --git a/pkgs/games/nsnake/default.nix b/pkgs/by-name/ns/nsnake/package.nix
similarity index 100%
rename from pkgs/games/nsnake/default.nix
rename to pkgs/by-name/ns/nsnake/package.nix
diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/by-name/ns/nsncd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nsncd/default.nix
rename to pkgs/by-name/ns/nsncd/package.nix
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/by-name/ns/nsq/package.nix
similarity index 100%
rename from pkgs/servers/nsq/default.nix
rename to pkgs/by-name/ns/nsq/package.nix
diff --git a/pkgs/os-specific/linux/nss_ldap/crashes.patch b/pkgs/by-name/ns/nss_ldap/crashes.patch
similarity index 100%
rename from pkgs/os-specific/linux/nss_ldap/crashes.patch
rename to pkgs/by-name/ns/nss_ldap/crashes.patch
diff --git a/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch b/pkgs/by-name/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch
similarity index 100%
rename from pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch
rename to pkgs/by-name/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch
diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/by-name/ns/nss_ldap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nss_ldap/default.nix
rename to pkgs/by-name/ns/nss_ldap/package.nix
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/by-name/ns/nss_pam_ldapd/package.nix
similarity index 100%
rename from pkgs/tools/networking/nss-pam-ldapd/default.nix
rename to pkgs/by-name/ns/nss_pam_ldapd/package.nix
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/by-name/ns/nss_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/nss_wrapper/default.nix
rename to pkgs/by-name/ns/nss_wrapper/package.nix
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/by-name/ns/nssmdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/nss-mdns/default.nix
rename to pkgs/by-name/ns/nssmdns/package.nix
diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/by-name/ns/nsync/package.nix
similarity index 100%
rename from pkgs/development/libraries/nsync/default.nix
rename to pkgs/by-name/ns/nsync/package.nix
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/by-name/nt/ntbtls/package.nix
similarity index 100%
rename from pkgs/development/libraries/ntbtls/default.nix
rename to pkgs/by-name/nt/ntbtls/package.nix
diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/by-name/nt/ntirpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/ntirpc/default.nix
rename to pkgs/by-name/nt/ntirpc/package.nix
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/by-name/nt/ntk/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/ntk/default.nix
rename to pkgs/by-name/nt/ntk/package.nix
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/by-name/nt/ntl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ntl/default.nix
rename to pkgs/by-name/nt/ntl/package.nix
diff --git a/pkgs/tools/security/ntlmrecon/default.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
similarity index 100%
rename from pkgs/tools/security/ntlmrecon/default.nix
rename to pkgs/by-name/nt/ntlmrecon/package.nix
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/by-name/nt/ntopng/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntopng/default.nix
rename to pkgs/by-name/nt/ntopng/package.nix
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/by-name/nt/ntp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntp/default.nix
rename to pkgs/by-name/nt/ntp/package.nix
diff --git a/pkgs/tools/networking/nttcp/format-security.patch b/pkgs/by-name/nt/nttcp/format-security.patch
similarity index 100%
rename from pkgs/tools/networking/nttcp/format-security.patch
rename to pkgs/by-name/nt/nttcp/format-security.patch
diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/by-name/nt/nttcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/nttcp/default.nix
rename to pkgs/by-name/nt/nttcp/package.nix
diff --git a/pkgs/tools/networking/ntttcp/default.nix b/pkgs/by-name/nt/ntttcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntttcp/default.nix
rename to pkgs/by-name/nt/ntttcp/package.nix
diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/by-name/nu/nuXmv/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/nuXmv/default.nix
rename to pkgs/by-name/nu/nuXmv/package.nix
diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/by-name/nu/nu_scripts/package.nix
similarity index 100%
rename from pkgs/shells/nushell/nu_scripts/default.nix
rename to pkgs/by-name/nu/nu_scripts/package.nix
diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index c630d8ae1f65..d15503b2b0ee 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.0.2";
+  version = "10.0.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mFuY1i+AqksAvaMAJkP227eZZE+sauRxOIqV5DO8MFE=";
+    hash = "sha256-oT2W5MuXYR2UENIAkH2Pb6f/m9gC2SfTjjvEq539PRU=";
   };
 
   installPhase = ''
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/by-name/nu/nuclei/package.nix
similarity index 100%
rename from pkgs/tools/security/nuclei/default.nix
rename to pkgs/by-name/nu/nuclei/package.nix
diff --git a/pkgs/games/nudoku/default.nix b/pkgs/by-name/nu/nudoku/package.nix
similarity index 100%
rename from pkgs/games/nudoku/default.nix
rename to pkgs/by-name/nu/nudoku/package.nix
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index 792935e080c2..f91ce84fc683 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  darwin,
+  apple-sdk_11,
   llvmPackages,
   nix-update-script,
   ...
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "nufmt";
   version = "0-unstable-2024-10-20";
 
@@ -19,14 +19,11 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AurQGIZDYOkMMyAEXP01QziISQcSME3GFtvqjCDoeiw=";
   };
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
-    with darwin.apple_sdk.frameworks;
-    [
-      IOKit
-    ]
-  );
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
+  ];
 
-  env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib";
+  env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${lib.getLib llvmPackages.libclang}/lib";
 
   cargoHash = "sha256-5DS6pTYGOQ4qay6+YiUstInRX17n3RViNxKXtFZ6J3k=";
 
diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/by-name/nu/nuget-to-nix/nuget-to-nix.sh
similarity index 100%
rename from pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
rename to pkgs/by-name/nu/nuget-to-nix/nuget-to-nix.sh
diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/by-name/nu/nuget-to-nix/package.nix
similarity index 100%
rename from pkgs/build-support/dotnet/nuget-to-nix/default.nix
rename to pkgs/by-name/nu/nuget-to-nix/package.nix
diff --git a/pkgs/applications/emulators/nuked-md/default.nix b/pkgs/by-name/nu/nuked-md/package.nix
similarity index 100%
rename from pkgs/applications/emulators/nuked-md/default.nix
rename to pkgs/by-name/nu/nuked-md/package.nix
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/by-name/nu/nullidentdmod/package.nix
similarity index 100%
rename from pkgs/servers/identd/nullidentdmod/default.nix
rename to pkgs/by-name/nu/nullidentdmod/package.nix
diff --git a/pkgs/tools/text/num-utils/default.nix b/pkgs/by-name/nu/num-utils/package.nix
similarity index 100%
rename from pkgs/tools/text/num-utils/default.nix
rename to pkgs/by-name/nu/num-utils/package.nix
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/by-name/nu/numactl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numactl/default.nix
rename to pkgs/by-name/nu/numactl/package.nix
diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/by-name/nu/numad/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numad/default.nix
rename to pkgs/by-name/nu/numad/package.nix
diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/by-name/nu/numatop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numatop/default.nix
rename to pkgs/by-name/nu/numatop/package.nix
diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/by-name/nu/numberstation/package.nix
similarity index 100%
rename from pkgs/applications/misc/numberstation/default.nix
rename to pkgs/by-name/nu/numberstation/package.nix
diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/by-name/nu/numcpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/numcpp/default.nix
rename to pkgs/by-name/nu/numcpp/package.nix
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/by-name/nu/numdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/numdiff/default.nix
rename to pkgs/by-name/nu/numdiff/package.nix
diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/by-name/nu/numix-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/numix-cursor-theme/default.nix
rename to pkgs/by-name/nu/numix-cursor-theme/package.nix
diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/by-name/nu/numix-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/numix/default.nix
rename to pkgs/by-name/nu/numix-gtk-theme/package.nix
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
similarity index 100%
rename from pkgs/data/icons/numix-icon-theme-circle/default.nix
rename to pkgs/by-name/nu/numix-icon-theme-circle/package.nix
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
similarity index 100%
rename from pkgs/data/icons/numix-icon-theme-square/default.nix
rename to pkgs/by-name/nu/numix-icon-theme-square/package.nix
diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/numix-solarized/default.nix
rename to pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/by-name/nu/numix-sx-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/numix-sx/default.nix
rename to pkgs/by-name/nu/numix-sx-gtk-theme/package.nix
diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/by-name/nu/numlockx/package.nix
similarity index 100%
rename from pkgs/tools/X11/numlockx/default.nix
rename to pkgs/by-name/nu/numlockx/package.nix
diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix
similarity index 100%
rename from pkgs/applications/science/math/numworks-epsilon/default.nix
rename to pkgs/by-name/nu/numworks-epsilon/package.nix
diff --git a/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules b/pkgs/by-name/nu/numworks-udev-rules/50-numworks-calculator.rules
similarity index 100%
rename from pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules
rename to pkgs/by-name/nu/numworks-udev-rules/50-numworks-calculator.rules
diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/by-name/nu/numworks-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numworks-udev-rules/default.nix
rename to pkgs/by-name/nu/numworks-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/numworks-udev-rules/update.sh b/pkgs/by-name/nu/numworks-udev-rules/update.sh
similarity index 100%
rename from pkgs/os-specific/linux/numworks-udev-rules/update.sh
rename to pkgs/by-name/nu/numworks-udev-rules/update.sh
diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/by-name/nu/nuraft/package.nix
similarity index 100%
rename from pkgs/development/libraries/nuraft/default.nix
rename to pkgs/by-name/nu/nuraft/package.nix
diff --git a/pkgs/tools/misc/nurl/Cargo.lock b/pkgs/by-name/nu/nurl/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/nurl/Cargo.lock
rename to pkgs/by-name/nu/nurl/Cargo.lock
diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/by-name/nu/nurl/package.nix
similarity index 100%
rename from pkgs/tools/misc/nurl/default.nix
rename to pkgs/by-name/nu/nurl/package.nix
diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/by-name/nu/nusmv/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/nusmv/default.nix
rename to pkgs/by-name/nu/nusmv/package.nix
diff --git a/pkgs/applications/misc/nut/hardcode-paths.patch b/pkgs/by-name/nu/nut/hardcode-paths.patch
similarity index 100%
rename from pkgs/applications/misc/nut/hardcode-paths.patch
rename to pkgs/by-name/nu/nut/hardcode-paths.patch
diff --git a/pkgs/applications/misc/nut/nutshutdown-conf-default.patch b/pkgs/by-name/nu/nut/nutshutdown-conf-default.patch
similarity index 100%
rename from pkgs/applications/misc/nut/nutshutdown-conf-default.patch
rename to pkgs/by-name/nu/nut/nutshutdown-conf-default.patch
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/by-name/nu/nut/package.nix
similarity index 100%
rename from pkgs/applications/misc/nut/default.nix
rename to pkgs/by-name/nu/nut/package.nix
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/by-name/nu/nuttcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/nuttcp/default.nix
rename to pkgs/by-name/nu/nuttcp/package.nix
diff --git a/pkgs/tools/misc/nux/default.nix b/pkgs/by-name/nu/nux/package.nix
similarity index 100%
rename from pkgs/tools/misc/nux/default.nix
rename to pkgs/by-name/nu/nux/package.nix
diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/by-name/nv/nvd/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nvd/default.nix
rename to pkgs/by-name/nv/nvd/package.nix
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/by-name/nv/nvi/package.nix
similarity index 100%
rename from pkgs/applications/editors/nvi/default.nix
rename to pkgs/by-name/nv/nvi/package.nix
diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/by-name/nv/nvidia-optical-flow-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
rename to pkgs/by-name/nv/nvidia-optical-flow-sdk/package.nix
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/by-name/nv/nvidia_cg_toolkit/package.nix
similarity index 100%
rename from pkgs/development/compilers/nvidia-cg-toolkit/default.nix
rename to pkgs/by-name/nv/nvidia_cg_toolkit/package.nix
diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/by-name/nv/nvimpager/package.nix
similarity index 100%
rename from pkgs/tools/misc/nvimpager/default.nix
rename to pkgs/by-name/nv/nvimpager/package.nix
diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/by-name/nv/nvitop/package.nix
similarity index 100%
rename from pkgs/tools/system/nvitop/default.nix
rename to pkgs/by-name/nv/nvitop/package.nix
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/by-name/nv/nvme-cli/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nvme-cli/default.nix
rename to pkgs/by-name/nv/nvme-cli/package.nix
diff --git a/pkgs/os-specific/linux/nvmet-cli/default.nix b/pkgs/by-name/nv/nvmet-cli/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nvmet-cli/default.nix
rename to pkgs/by-name/nv/nvmet-cli/package.nix
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/by-name/nv/nvpy/package.nix
similarity index 100%
rename from pkgs/applications/editors/nvpy/default.nix
rename to pkgs/by-name/nv/nvpy/package.nix
diff --git a/pkgs/applications/misc/nwg-bar/fix-paths.patch b/pkgs/by-name/nw/nwg-bar/fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/nwg-bar/fix-paths.patch
rename to pkgs/by-name/nw/nwg-bar/fix-paths.patch
diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/by-name/nw/nwg-bar/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-bar/default.nix
rename to pkgs/by-name/nw/nwg-bar/package.nix
diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/by-name/nw/nwg-displays/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-displays/default.nix
rename to pkgs/by-name/nw/nwg-displays/package.nix
diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
new file mode 100644
index 000000000000..a401438a0dca
--- /dev/null
+++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook3,
+  gtk-layer-shell,
+}:
+
+buildGoModule rec {
+  pname = "nwg-dock-hyprland";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "nwg-piotr";
+    repo = "nwg-dock-hyprland";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Vp8JmRQf71vezdknzifxlK7zTlorwiEHsyXpmy6mxIE=";
+  };
+
+  vendorHash = "sha256-RBU0l4YRtV5JPH1dLT+lZ05jmxRwyn3glMUKHw1Eg8g=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [ gtk-layer-shell ];
+
+  postInstall = ''
+    install -d $out/share/nwg-dock-hyprland
+    cp -r images $out/share/nwg-dock-hyprland/images
+    install -Dm644 config/style.css $out/share/nwg-dock-hyprland/style.css
+  '';
+
+  meta = {
+    description = "GTK3-based dock for Hyprland";
+    mainProgram = "nwg-dock-hyprland";
+    homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/by-name/nw/nwg-dock/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-dock/default.nix
rename to pkgs/by-name/nw/nwg-dock/package.nix
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index c5ba0f1e396f..e7ab93f870a7 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -12,16 +12,16 @@
 
 let
   pname = "nwg-drawer";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-drawer";
     rev = "v${version}";
-    hash = "sha256-0ksvat0NDC2P+T0TyDAKh7YNLYhH+znxqLCqQ/5GDj8=";
+    hash = "sha256-A/Rg7iUk8qpJ5lxumv4JNNJG1vN8wJIabJupp2c+nsw=";
   };
 
-  vendorHash = "sha256-KULOXphc6GWIGP79C9sgfAIRMoqwcjaVp4jVyF6of/E=";
+  vendorHash = "sha256-r4DtY06z0ZcPoHba4pqpCWqxYo7RbwCKi2g4jdoN1kg=";
 in
 buildGoModule {
   inherit pname version src vendorHash;
diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/by-name/nw/nwg-launchers/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-launchers/default.nix
rename to pkgs/by-name/nw/nwg-launchers/package.nix
diff --git a/pkgs/applications/misc/nwg-look/default.nix b/pkgs/by-name/nw/nwg-look/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-look/default.nix
rename to pkgs/by-name/nw/nwg-look/package.nix
diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/by-name/nw/nwg-menu/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-menu/default.nix
rename to pkgs/by-name/nw/nwg-menu/package.nix
diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/by-name/nw/nwg-wrapper/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-wrapper/default.nix
rename to pkgs/by-name/nw/nwg-wrapper/package.nix
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/by-name/nx/nx-libs/package.nix
similarity index 100%
rename from pkgs/tools/X11/nx-libs/default.nix
rename to pkgs/by-name/nx/nx-libs/package.nix
diff --git a/pkgs/tools/compression/nx2elf/default.nix b/pkgs/by-name/nx/nx2elf/package.nix
similarity index 100%
rename from pkgs/tools/compression/nx2elf/default.nix
rename to pkgs/by-name/nx/nx2elf/package.nix
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
rename to pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/by-name/ny/nyancat/package.nix
similarity index 100%
rename from pkgs/tools/misc/nyancat/default.nix
rename to pkgs/by-name/ny/nyancat/package.nix
diff --git a/pkgs/tools/networking/nylon/configure-use-solib.patch b/pkgs/by-name/ny/nylon/configure-use-solib.patch
similarity index 100%
rename from pkgs/tools/networking/nylon/configure-use-solib.patch
rename to pkgs/by-name/ny/nylon/configure-use-solib.patch
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/by-name/ny/nylon/package.nix
similarity index 100%
rename from pkgs/tools/networking/nylon/default.nix
rename to pkgs/by-name/ny/nylon/package.nix
diff --git a/pkgs/by-name/ny/nym/Cargo.lock b/pkgs/by-name/ny/nym/Cargo.lock
index 1795ec333f78..135ecf5136a3 100644
--- a/pkgs/by-name/ny/nym/Cargo.lock
+++ b/pkgs/by-name/ny/nym/Cargo.lock
@@ -45,6 +45,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aead"
 version = "0.5.2"
@@ -80,6 +86,21 @@ dependencies = [
  "subtle 2.5.0",
 ]
 
+[[package]]
+name = "aes-gcm-siv"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "polyval",
+ "subtle 2.5.0",
+ "zeroize",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -132,14 +153,13 @@ checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
 
 [[package]]
 name = "android_logger"
-version = "0.13.3"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f"
+checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
 dependencies = [
  "android_log-sys",
- "env_logger 0.10.2",
+ "env_filter",
  "log",
- "once_cell",
 ]
 
 [[package]]
@@ -174,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
@@ -208,9 +228,18 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
 
 [[package]]
 name = "argon2"
@@ -236,6 +265,47 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
+[[package]]
+name = "askama"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28"
+dependencies = [
+ "askama_derive",
+ "askama_escape",
+]
+
+[[package]]
+name = "askama_derive"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83"
+dependencies = [
+ "askama_parser",
+ "basic-toml",
+ "mime",
+ "mime_guess",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "askama_escape"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
+
+[[package]]
+name = "askama_parser"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -271,9 +341,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -379,7 +449,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -471,7 +541,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.3",
  "object",
  "rustc-demangle",
 ]
@@ -506,6 +576,15 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "basic-toml"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "binascii"
 version = "0.1.4"
@@ -523,11 +602,11 @@ dependencies = [
 
 [[package]]
 name = "bip32"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
+checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "hmac",
  "k256",
  "rand_core 0.6.4",
@@ -610,9 +689,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -657,7 +736,7 @@ checksum = "bc0bdbcf2078e0ba8a74e1fe0cf36f54054a04485759b61dfd60b174658e9607"
 dependencies = [
  "bit-vec",
  "getrandom",
- "siphasher",
+ "siphasher 1.0.1",
 ]
 
 [[package]]
@@ -682,12 +761,6 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab9008b6bb9fc80b5277f2fe481c09e828743d9151203e804583eb4c9e15b31d"
 
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -734,9 +807,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 dependencies = [
  "serde",
 ]
@@ -759,6 +832,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "cargo_metadata"
 version = "0.18.1"
@@ -787,9 +874,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "celes"
@@ -919,9 +1009,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -929,9 +1019,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
@@ -941,28 +1031,28 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.5"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4"
+checksum = "9b378c786d3bde9442d2c6dd7e6080b2a818db2b96e30d6e7f1b6d224eb617d3"
 dependencies = [
- "clap 4.5.7",
+ "clap 4.5.17",
 ]
 
 [[package]]
 name = "clap_complete_fig"
-version = "4.5.1"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612"
+checksum = "d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b"
 dependencies = [
- "clap 4.5.7",
+ "clap 4.5.17",
  "clap_complete",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1011,18 +1101,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "comfy-table"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba"
-dependencies = [
- "crossterm 0.26.1",
- "strum 0.24.1",
- "strum_macros 0.24.3",
- "unicode-width",
-]
-
 [[package]]
 name = "comfy-table"
 version = "7.1.1"
@@ -1117,18 +1195,18 @@ checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9"
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1374,7 +1452,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.7",
+ "clap 4.5.17",
  "criterion-plot",
  "is-terminal",
  "itertools 0.10.5",
@@ -1460,22 +1538,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "crossterm"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio 0.8.11",
- "parking_lot 0.12.3",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
 [[package]]
 name = "crossterm"
 version = "0.27.0"
@@ -1622,16 +1684,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms",
  "rustc_version 0.4.0",
  "serde",
  "subtle 2.5.0",
@@ -1840,6 +1901,7 @@ dependencies = [
  "lock_api",
  "once_cell",
  "parking_lot_core 0.9.10",
+ "serde",
 ]
 
 [[package]]
@@ -1850,11 +1912,10 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "defguard_wireguard_rs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba16f17698d4b389907310af018b0c3a80b025bba9c38d947cbc6dd70921743"
+version = "0.4.7"
+source = "git+https://github.com/DefGuard/wireguard-rs.git?rev=v0.4.7#ef1cf3714629bf5016fb38cbb7320451dc69fb09"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "libc",
  "log",
  "netlink-packet-core",
@@ -1863,7 +1924,7 @@ dependencies = [
  "netlink-packet-utils",
  "netlink-packet-wireguard",
  "netlink-sys",
- "nix 0.27.1",
+ "nix 0.29.0",
  "serde",
  "thiserror",
 ]
@@ -1911,6 +1972,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 = "devise"
 version = "0.4.1"
@@ -2071,6 +2143,26 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "echo-server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "bytecodec",
+ "bytes",
+ "dashmap",
+ "dirs 5.0.1",
+ "nym-sdk",
+ "serde",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tracing",
+ "tracing-subscriber",
+ "uuid",
+]
+
 [[package]]
 name = "ed25519"
 version = "2.2.3"
@@ -2101,7 +2193,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
@@ -2130,6 +2222,9 @@ name = "either"
 version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "elliptic-curve"
@@ -2166,6 +2261,16 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -2179,16 +2284,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "log",
- "regex",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -2222,10 +2317,10 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "explorer-api"
-version = "1.1.39"
+version = "1.1.41"
 dependencies = [
  "chrono",
- "clap 4.5.7",
+ "clap 4.5.17",
  "dotenvy",
  "humantime-serde",
  "isocountry",
@@ -2300,6 +2395,12 @@ dependencies = [
  "ext-trait",
 ]
 
+[[package]]
+name = "extern-c"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320bea982e85d42441eb25c49b41218e7eaa2657e8f90bc4eca7437376751e23"
+
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -2333,9 +2434,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "ff"
@@ -2380,13 +2481,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "flate2"
-version = "1.0.30"
+name = "fixedbitset"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -2432,6 +2539,15 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
 
+[[package]]
+name = "fs-err"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -2617,14 +2733,14 @@ dependencies = [
 
 [[package]]
 name = "getset"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
+checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c"
 dependencies = [
- "proc-macro-error",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -2672,9 +2788,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2708,6 +2824,17 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "goblin"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -3043,9 +3170,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3083,7 +3210,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "rustls 0.22.4",
  "rustls-pki-types",
@@ -3115,7 +3242,7 @@ dependencies = [
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -3147,124 +3274,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",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -3283,14 +3292,12 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.0.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -3435,15 +3442,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "ipnetwork"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "ipnetwork"
 version = "0.18.0"
@@ -3571,9 +3569,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3724,12 +3722,6 @@ dependencies = [
  "keystream",
 ]
 
-[[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.12"
@@ -3742,9 +3734,9 @@ 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 = "loom"
@@ -3851,6 +3843,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.2"
@@ -3882,6 +3884,16 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "minicov"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+dependencies = [
+ "cc",
+ "walkdir",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -3897,6 +3909,15 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.11"
@@ -3991,14 +4012,15 @@ dependencies = [
 
 [[package]]
 name = "netlink-packet-route"
-version = "0.17.1"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
+checksum = "55e5bda7ca0f9ac5e75b5debac3b75e29a8ac8e2171106a2c3bb466389a8dd83"
 dependencies = [
  "anyhow",
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "byteorder",
  "libc",
+ "log",
  "netlink-packet-core",
  "netlink-packet-utils",
 ]
@@ -4058,7 +4080,6 @@ dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
  "libc",
- "memoffset",
 ]
 
 [[package]]
@@ -4071,6 +4092,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
@@ -4163,6 +4185,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -4180,23 +4223,25 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nym-api"
-version = "1.1.43"
+version = "1.1.45"
 dependencies = [
  "anyhow",
  "async-trait",
+ "axum 0.7.5",
+ "axum-extra",
  "bincode",
  "bip39",
  "bloomfilter",
- "bs58 0.5.1",
+ "bs58",
  "cfg-if",
- "clap 4.5.7",
+ "clap 4.5.17",
  "console-subscriber",
  "cosmwasm-std",
  "cw-utils",
  "cw2",
  "cw3",
  "cw4",
- "dirs 4.0.0",
+ "dirs 5.0.1",
  "futures",
  "getset",
  "humantime-serde",
@@ -4220,6 +4265,7 @@ dependencies = [
  "nym-ecash-double-spending",
  "nym-ecash-time",
  "nym-gateway-client",
+ "nym-http-api-common",
  "nym-inclusion-probability",
  "nym-mixnet-contract-common",
  "nym-multisig-contract-common",
@@ -4229,6 +4275,7 @@ dependencies = [
  "nym-sphinx",
  "nym-task",
  "nym-topology",
+ "nym-types",
  "nym-validator-client",
  "nym-vesting-contract-common",
  "okapi",
@@ -4250,8 +4297,15 @@ dependencies = [
  "time",
  "tokio",
  "tokio-stream",
+ "tokio-util",
+ "tower-http",
+ "tracing",
+ "tracing-subscriber",
  "ts-rs",
  "url",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "utoipauto",
  "zeroize",
 ]
 
@@ -4259,7 +4313,7 @@ dependencies = [
 name = "nym-api-requests"
 version = "0.1.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "cosmrs 0.17.0-pre",
  "cosmwasm-std",
  "ecdsa",
@@ -4280,6 +4334,7 @@ dependencies = [
  "thiserror",
  "time",
  "ts-rs",
+ "utoipa",
 ]
 
 [[package]]
@@ -4298,22 +4353,27 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bincode",
- "bs58 0.5.1",
+ "bs58",
  "bytes",
- "clap 4.5.7",
+ "clap 4.5.17",
  "defguard_wireguard_rs",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures",
- "ipnetwork 0.16.0",
+ "ipnetwork 0.20.0",
  "log",
  "nym-authenticator-requests",
  "nym-bin-common",
  "nym-client-core",
  "nym-config",
+ "nym-credential-verification",
+ "nym-credentials-interface",
  "nym-crypto",
+ "nym-gateway-requests",
+ "nym-gateway-storage",
  "nym-id",
  "nym-network-defaults",
  "nym-sdk",
+ "nym-service-provider-requests-common",
  "nym-service-providers-common",
  "nym-sphinx",
  "nym-task",
@@ -4334,11 +4394,19 @@ dependencies = [
 name = "nym-authenticator-requests"
 version = "0.1.0"
 dependencies = [
+ "base64 0.22.1",
  "bincode",
+ "hmac",
+ "nym-credentials-interface",
+ "nym-crypto",
+ "nym-service-provider-requests-common",
  "nym-sphinx",
  "nym-wireguard-types",
  "rand",
  "serde",
+ "sha2 0.10.8",
+ "thiserror",
+ "x25519-dalek",
 ]
 
 [[package]]
@@ -4365,7 +4433,7 @@ dependencies = [
 name = "nym-bin-common"
 version = "0.6.0"
 dependencies = [
- "clap 4.5.7",
+ "clap 4.5.17",
  "clap_complete",
  "clap_complete_fig",
  "const-str",
@@ -4374,7 +4442,7 @@ dependencies = [
  "opentelemetry-jaeger",
  "pretty_env_logger",
  "schemars",
- "semver 0.11.0",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "tracing-opentelemetry",
@@ -4401,13 +4469,13 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.41"
+version = "1.1.43"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
+ "base64 0.22.1",
  "bip39",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
  "clap_complete",
  "clap_complete_fig",
  "dotenvy",
@@ -4429,13 +4497,13 @@ name = "nym-cli-commands"
 version = "1.0.0"
 dependencies = [
  "anyhow",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bip39",
- "bs58 0.5.1",
+ "bs58",
  "cfg-if",
- "clap 4.5.7",
+ "clap 4.5.17",
  "colored",
- "comfy-table 6.2.0",
+ "comfy-table",
  "cosmrs 0.17.0-pre",
  "cosmwasm-std",
  "csv",
@@ -4471,6 +4539,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tap",
+ "tempfile",
  "thiserror",
  "time",
  "tokio",
@@ -4481,11 +4550,11 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.40"
+version = "1.1.42"
 dependencies = [
- "bs58 0.5.1",
- "clap 4.5.7",
- "dirs 4.0.0",
+ "bs58",
+ "clap 4.5.17",
+ "dirs 5.0.1",
  "futures",
  "log",
  "nym-bandwidth-controller",
@@ -4521,16 +4590,16 @@ name = "nym-client-core"
 version = "1.1.15"
 dependencies = [
  "async-trait",
- "base64 0.21.7",
- "bs58 0.5.1",
+ "base64 0.22.1",
+ "bs58",
  "cfg-if",
- "clap 4.5.7",
- "comfy-table 7.1.1",
+ "clap 4.5.17",
+ "comfy-table",
  "futures",
  "gloo-timers",
  "http-body-util",
  "humantime-serde",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "log",
  "nym-bandwidth-controller",
@@ -4556,6 +4625,7 @@ dependencies = [
  "nym-topology",
  "nym-validator-client",
  "rand",
+ "rand_chacha",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -4662,7 +4732,7 @@ name = "nym-coconut"
 version = "0.5.0"
 dependencies = [
  "bls12_381",
- "bs58 0.5.1",
+ "bs58",
  "criterion 0.4.0",
  "digest 0.9.0",
  "doc-comment",
@@ -4710,7 +4780,7 @@ version = "0.1.0"
 dependencies = [
  "bincode",
  "bls12_381",
- "bs58 0.5.1",
+ "bs58",
  "cfg-if",
  "criterion 0.5.1",
  "digest 0.9.0",
@@ -4736,7 +4806,7 @@ dependencies = [
  "log",
  "nym-network-defaults",
  "serde",
- "toml 0.7.8",
+ "toml 0.8.14",
  "url",
 ]
 
@@ -4744,7 +4814,7 @@ dependencies = [
 name = "nym-contracts-common"
 version = "0.5.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-storage-plus",
@@ -4763,6 +4833,20 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "nym-cpp-ffi"
+version = "0.1.2"
+dependencies = [
+ "anyhow",
+ "bs58",
+ "lazy_static",
+ "nym-bin-common",
+ "nym-ffi-shared",
+ "nym-sdk",
+ "nym-sphinx-anonymous-replies",
+ "tokio",
+]
+
 [[package]]
 name = "nym-credential-storage"
 version = "0.1.0"
@@ -4798,6 +4882,31 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "nym-credential-verification"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "cosmwasm-std",
+ "cw-utils",
+ "futures",
+ "nym-api-requests",
+ "nym-credentials",
+ "nym-credentials-interface",
+ "nym-ecash-contract-common",
+ "nym-ecash-double-spending",
+ "nym-gateway-requests",
+ "nym-gateway-storage",
+ "nym-task",
+ "nym-validator-client",
+ "rand",
+ "si-scale",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "nym-credentials"
 version = "0.1.0"
@@ -4812,6 +4921,7 @@ dependencies = [
  "nym-ecash-contract-common",
  "nym-ecash-time",
  "nym-network-defaults",
+ "nym-serde-helpers",
  "nym-validator-client",
  "rand",
  "serde",
@@ -4830,7 +4940,7 @@ dependencies = [
  "nym-network-defaults",
  "rand",
  "serde",
- "strum 0.25.0",
+ "strum 0.26.3",
  "thiserror",
  "time",
 ]
@@ -4839,9 +4949,11 @@ dependencies = [
 name = "nym-crypto"
 version = "0.4.0"
 dependencies = [
+ "aead",
  "aes",
+ "aes-gcm-siv",
  "blake3",
- "bs58 0.5.1",
+ "bs58",
  "cipher",
  "ctr",
  "digest 0.10.7",
@@ -4861,13 +4973,37 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "nym-data-observatory"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum 0.7.5",
+ "chrono",
+ "nym-bin-common",
+ "nym-network-defaults",
+ "nym-node-requests",
+ "nym-task",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "tokio",
+ "tokio-util",
+ "tower-http",
+ "tracing",
+ "tracing-subscriber",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "utoipauto",
+]
+
 [[package]]
 name = "nym-dkg"
 version = "0.1.0"
 dependencies = [
  "bitvec",
  "bls12_381",
- "bs58 0.5.1",
+ "bs58",
  "criterion 0.4.0",
  "ff",
  "group",
@@ -4888,7 +5024,7 @@ dependencies = [
 name = "nym-ecash-contract-common"
 version = "0.1.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-controllers",
@@ -4960,6 +5096,21 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "nym-ffi-shared"
+version = "0.2.0"
+dependencies = [
+ "anyhow",
+ "bs58",
+ "lazy_static",
+ "nym-bin-common",
+ "nym-sdk",
+ "nym-sphinx-anonymous-replies",
+ "tokio",
+ "uniffi",
+ "uniffi_build",
+]
+
 [[package]]
 name = "nym-gateway"
 version = "1.1.36"
@@ -4967,28 +5118,24 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bip39",
- "bloomfilter",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
  "colored",
- "cosmwasm-std",
- "cw-utils",
  "dashmap",
  "defguard_wireguard_rs",
- "dirs 4.0.0",
+ "dirs 5.0.1",
  "dotenvy",
  "futures",
  "humantime-serde",
- "ipnetwork 0.16.0",
+ "ipnetwork 0.20.0",
  "nym-api-requests",
  "nym-authenticator",
  "nym-bin-common",
  "nym-config",
+ "nym-credential-verification",
  "nym-credentials",
  "nym-credentials-interface",
  "nym-crypto",
- "nym-ecash-contract-common",
- "nym-ecash-double-spending",
  "nym-gateway-requests",
  "nym-gateway-storage",
  "nym-ip-packet-router",
@@ -5012,7 +5159,6 @@ dependencies = [
  "sqlx",
  "subtle-encoding",
  "thiserror",
- "time",
  "tokio",
  "tokio-stream",
  "tokio-tungstenite",
@@ -5029,7 +5175,6 @@ dependencies = [
  "futures",
  "getrandom",
  "gloo-utils 0.2.0",
- "log",
  "nym-bandwidth-controller",
  "nym-credential-storage",
  "nym-credentials",
@@ -5048,19 +5193,21 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-tungstenite",
+ "tracing",
  "tungstenite 0.20.1",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-utils",
  "wasmtimer",
+ "zeroize",
 ]
 
 [[package]]
 name = "nym-gateway-requests"
 version = "0.1.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "futures",
  "generic-array 0.14.7",
  "nym-compact-ecash",
@@ -5073,6 +5220,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
+ "strum 0.26.3",
  "thiserror",
  "tokio",
  "tracing",
@@ -5099,6 +5247,22 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "nym-go-ffi"
+version = "0.2.0"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "nym-bin-common",
+ "nym-ffi-shared",
+ "nym-sdk",
+ "nym-sphinx-anonymous-replies",
+ "thiserror",
+ "tokio",
+ "uniffi",
+ "uniffi_build",
+]
+
 [[package]]
 name = "nym-group-contract-common"
 version = "0.1.0"
@@ -5132,10 +5296,12 @@ version = "0.1.0"
 dependencies = [
  "axum 0.7.5",
  "bytes",
+ "colored",
  "mime",
  "serde",
  "serde_json",
  "serde_yaml",
+ "tracing",
  "utoipa",
 ]
 
@@ -5156,8 +5322,8 @@ name = "nym-id-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
  "nym-bin-common",
  "nym-credential-storage",
  "nym-id",
@@ -5197,9 +5363,9 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bincode",
- "bs58 0.5.1",
+ "bs58",
  "bytes",
- "clap 4.5.7",
+ "clap 4.5.17",
  "etherparse",
  "futures",
  "log",
@@ -5270,7 +5436,7 @@ dependencies = [
 name = "nym-mixnet-contract-common"
 version = "0.6.0"
 dependencies = [
- "bs58 0.4.0",
+ "bs58",
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-controllers",
@@ -5286,6 +5452,7 @@ dependencies = [
  "thiserror",
  "time",
  "ts-rs",
+ "utoipa",
 ]
 
 [[package]]
@@ -5294,11 +5461,11 @@ version = "1.1.37"
 dependencies = [
  "anyhow",
  "axum 0.7.5",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
  "colored",
  "cupid",
- "dirs 4.0.0",
+ "dirs 5.0.1",
  "futures",
  "humantime-serde",
  "lazy_static",
@@ -5324,12 +5491,12 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "sysinfo 0.27.8",
+ "sysinfo",
  "thiserror",
  "time",
  "tokio",
  "tokio-util",
- "toml 0.5.11",
+ "toml 0.8.14",
  "url",
 ]
 
@@ -5387,18 +5554,49 @@ dependencies = [
  "schemars",
  "serde",
  "url",
+ "utoipa",
+]
+
+[[package]]
+name = "nym-network-monitor"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum 0.7.5",
+ "clap 4.5.17",
+ "dashmap",
+ "futures",
+ "log",
+ "nym-bin-common",
+ "nym-crypto",
+ "nym-network-defaults",
+ "nym-sdk",
+ "nym-sphinx",
+ "nym-topology",
+ "nym-types",
+ "nym-validator-client",
+ "petgraph",
+ "rand",
+ "rand_chacha",
+ "reqwest 0.12.4",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "utoipa",
+ "utoipa-swagger-ui",
 ]
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.41"
+version = "1.1.43"
 dependencies = [
  "addr",
  "anyhow",
  "async-trait",
- "bs58 0.5.1",
- "clap 4.5.7",
- "dirs 4.0.0",
+ "bs58",
+ "clap 4.5.17",
+ "dirs 5.0.1",
  "futures",
  "humantime-serde",
  "ipnetwork 0.20.0",
@@ -5442,18 +5640,18 @@ dependencies = [
 
 [[package]]
 name = "nym-node"
-version = "1.1.7"
+version = "1.1.9"
 dependencies = [
  "anyhow",
  "bip39",
- "bs58 0.5.1",
- "cargo_metadata",
+ "bs58",
+ "cargo_metadata 0.18.1",
  "celes",
- "clap 4.5.7",
+ "clap 4.5.17",
  "colored",
  "cupid",
  "humantime-serde",
- "ipnetwork 0.16.0",
+ "ipnetwork 0.20.0",
  "nym-authenticator",
  "nym-bin-common",
  "nym-client-core-config-types",
@@ -5475,7 +5673,7 @@ dependencies = [
  "semver 1.0.23",
  "serde",
  "serde_json",
- "sysinfo 0.30.12",
+ "sysinfo",
  "thiserror",
  "tokio",
  "toml 0.8.14",
@@ -5490,21 +5688,20 @@ version = "0.1.0"
 dependencies = [
  "axum 0.7.5",
  "axum-extra",
- "base64 0.21.7",
+ "base64 0.22.1",
  "colored",
  "dashmap",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "headers",
  "hmac",
- "hyper 1.3.1",
- "ipnetwork 0.16.0",
+ "hyper 1.4.1",
+ "ipnetwork 0.20.0",
  "nym-crypto",
  "nym-http-api-common",
  "nym-metrics",
  "nym-node-requests",
  "nym-task",
  "nym-wireguard",
- "nym-wireguard-types",
  "rand",
  "serde_json",
  "thiserror",
@@ -5523,7 +5720,7 @@ name = "nym-node-requests"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "base64 0.21.7",
+ "base64 0.22.1",
  "celes",
  "humantime 2.1.0",
  "humantime-serde",
@@ -5554,6 +5751,7 @@ dependencies = [
  "nym-task",
  "nym-topology",
  "rand",
+ "rand_chacha",
  "serde",
  "serde_json",
  "thiserror",
@@ -5596,7 +5794,7 @@ name = "nym-nr-query"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.7",
+ "clap 4.5.17",
  "log",
  "nym-bin-common",
  "nym-network-defaults",
@@ -5623,8 +5821,8 @@ dependencies = [
  "chacha20",
  "chacha20poly1305",
  "criterion 0.4.0",
- "curve25519-dalek 4.1.2",
- "fastrand 2.1.0",
+ "curve25519-dalek 4.1.3",
+ "fastrand 2.1.1",
  "getrandom",
  "log",
  "rand",
@@ -5647,9 +5845,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "bincode",
  "bip39",
  "bytecodec",
  "bytes",
+ "dashmap",
+ "dirs 5.0.1",
  "dotenvy",
  "futures",
  "hex",
@@ -5678,13 +5879,17 @@ dependencies = [
  "pretty_env_logger",
  "rand",
  "reqwest 0.12.4",
+ "serde",
  "tap",
  "thiserror",
  "tokio",
  "tokio-stream",
  "tokio-util",
- "toml 0.5.11",
+ "toml 0.8.14",
+ "tracing",
+ "tracing-subscriber",
  "url",
+ "uuid",
  "zeroize",
 ]
 
@@ -5692,8 +5897,16 @@ dependencies = [
 name = "nym-serde-helpers"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.7",
- "bs58 0.5.1",
+ "base64 0.22.1",
+ "bs58",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "nym-service-provider-requests-common"
+version = "0.1.0"
+dependencies = [
  "serde",
 ]
 
@@ -5716,10 +5929,10 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.40"
+version = "1.1.42"
 dependencies = [
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
  "log",
  "nym-bin-common",
  "nym-client-core",
@@ -5752,7 +5965,7 @@ name = "nym-socks5-client-core"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dirs 4.0.0",
+ "dirs 5.0.1",
  "futures",
  "log",
  "nym-bandwidth-controller",
@@ -5837,6 +6050,7 @@ version = "0.1.0"
 dependencies = [
  "log",
  "nym-crypto",
+ "nym-metrics",
  "nym-mixnet-contract-common",
  "nym-sphinx-acknowledgements",
  "nym-sphinx-addressing",
@@ -5850,6 +6064,7 @@ dependencies = [
  "nym-sphinx-types",
  "nym-topology",
  "rand",
+ "rand_chacha",
  "rand_distr",
  "thiserror",
  "tokio",
@@ -5888,7 +6103,7 @@ dependencies = [
 name = "nym-sphinx-anonymous-replies"
 version = "0.1.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "nym-crypto",
  "nym-sphinx-addressing",
  "nym-sphinx-params",
@@ -5906,12 +6121,17 @@ dependencies = [
 name = "nym-sphinx-chunking"
 version = "0.1.0"
 dependencies = [
+ "dashmap",
  "log",
+ "nym-crypto",
+ "nym-metrics",
  "nym-sphinx-addressing",
  "nym-sphinx-params",
  "nym-sphinx-types",
  "rand",
+ "serde",
  "thiserror",
+ "utoipa",
 ]
 
 [[package]]
@@ -6014,7 +6234,7 @@ name = "nym-topology"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "bs58 0.5.1",
+ "bs58",
  "log",
  "nym-api-requests",
  "nym-bin-common",
@@ -6025,7 +6245,8 @@ dependencies = [
  "nym-sphinx-routing",
  "nym-sphinx-types",
  "rand",
- "semver 0.11.0",
+ "reqwest 0.12.4",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "thiserror",
@@ -6050,7 +6271,7 @@ dependencies = [
 name = "nym-types"
 version = "1.0.0"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "cosmrs 0.17.0-pre",
  "cosmwasm-std",
  "eyre",
@@ -6067,7 +6288,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "strum 0.25.0",
+ "strum 0.26.3",
  "tempfile",
  "thiserror",
  "ts-rs",
@@ -6080,7 +6301,7 @@ name = "nym-validator-client"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "base64 0.13.1",
+ "base64 0.22.1",
  "bip32",
  "bip39",
  "colored",
@@ -6130,7 +6351,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bip39",
- "clap 4.5.7",
+ "clap 4.5.17",
  "cosmwasm-std",
  "futures",
  "humantime 2.1.0",
@@ -6198,13 +6419,16 @@ dependencies = [
 name = "nym-wireguard"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bincode",
  "chrono",
  "dashmap",
  "defguard_wireguard_rs",
+ "futures",
  "ip_network",
  "log",
+ "nym-authenticator-requests",
+ "nym-credential-verification",
  "nym-crypto",
  "nym-gateway-storage",
  "nym-network-defaults",
@@ -6220,29 +6444,24 @@ dependencies = [
 name = "nym-wireguard-types"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.7",
- "dashmap",
- "hmac",
+ "base64 0.22.1",
  "log",
  "nym-config",
  "nym-crypto",
  "nym-network-defaults",
  "rand",
  "serde",
- "serde_json",
- "sha2 0.10.8",
  "thiserror",
- "utoipa",
  "x25519-dalek",
 ]
 
 [[package]]
 name = "nymvisor"
-version = "0.1.6"
+version = "0.1.8"
 dependencies = [
  "anyhow",
  "bytes",
- "clap 4.5.7",
+ "clap 4.5.17",
  "dotenvy",
  "flate2",
  "futures",
@@ -6317,6 +6536,12 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "oneshot-uniffi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c548d5c78976f6955d72d0ced18c48ca07030f7a1d4024529fedd7c1c01b29c"
+
 [[package]]
 name = "oorandom"
 version = "11.1.3"
@@ -6662,6 +6887,16 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.2.6",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@@ -6711,10 +6946,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
-name = "platforms"
-version = "3.4.0"
+name = "plain"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "plotters"
@@ -6807,7 +7042,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
 dependencies = [
- "env_logger 0.7.1",
+ "env_logger",
  "log",
 ]
 
@@ -6821,6 +7056,15 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -6845,6 +7089,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.85"
@@ -6991,9 +7257,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -7148,9 +7414,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -7239,12 +7505,13 @@ checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
  "base64 0.22.1",
  "bytes",
+ "futures-channel",
  "futures-core",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-rustls 0.26.0",
  "hyper-util",
  "ipnet",
@@ -7645,16 +7912,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "safer-ffi"
-version = "0.1.8"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44abae8773dc41fb96af52696b834b1f4c806006b456b22ee3602f7b061e3ad0"
+checksum = "435fdd58b61a6f1d8545274c1dfa458e905ff68c166e65e294a0130ef5e675bd"
 dependencies = [
+ "extern-c",
  "inventory",
  "libc",
  "macro_rules_attribute",
  "paste",
  "safer_ffi-proc_macros",
  "scopeguard",
+ "stabby",
  "uninit",
  "unwind_safe",
  "with_builtin_macros",
@@ -7662,9 +7931,9 @@ dependencies = [
 
 [[package]]
 name = "safer_ffi-proc_macros"
-version = "0.1.8"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9d4117a8a72f9b615169d4d720d79e74931f74003c73cc2f3927c700156ddf"
+checksum = "f0f25be5ba5f319542edb31925517e0380245ae37df50a9752cdbc05ef948156"
 dependencies = [
  "macro_rules_attribute",
  "prettyplease",
@@ -7728,6 +7997,26 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scroll"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "sct"
 version = "0.7.1"
@@ -7782,16 +8071,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
+ "semver-parser",
 ]
 
 [[package]]
@@ -7809,20 +8089,11 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -7860,18 +8131,18 @@ 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.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7902,11 +8173,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -7955,9 +8227,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",
@@ -7973,9 +8245,9 @@ dependencies = [
 
 [[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.9",
  "proc-macro2",
@@ -8051,6 +8323,12 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha2-const-stable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f179d4e11094a893b82fff208f74d448a7512f99f5a0acbd5c679b705f83ed9"
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -8061,10 +8339,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "si-scale"
-version = "0.2.2"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44beb68bf488343b13ddbd74d1d5d5e6559a58b6dfaee74eb8d5ed4f7ed7666f"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "si-scale"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72e7cd0744e007e382ba320435f1ed1ecd709409b4ebd5cfbc843d77b25a8aa"
 
 [[package]]
 name = "signal-hook"
@@ -8106,6 +8390,12 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -8179,11 +8469,11 @@ dependencies = [
  "aes",
  "arrayref",
  "blake2 0.8.1",
- "bs58 0.5.1",
+ "bs58",
  "byteorder",
  "chacha",
  "ctr",
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "digest 0.10.7",
  "hkdf",
  "hmac",
@@ -8248,12 +8538,14 @@ checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029"
 dependencies = [
  "ahash 0.7.8",
  "atoi",
+ "base64 0.13.1",
  "bitflags 1.3.2",
  "byteorder",
  "bytes",
  "chrono",
  "crc",
  "crossbeam-queue",
+ "dirs 4.0.0",
  "dotenvy",
  "either",
  "event-listener",
@@ -8265,17 +8557,24 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
+ "hkdf",
+ "hmac",
  "indexmap 1.9.3",
  "itoa",
  "libc",
  "libsqlite3-sys",
  "log",
+ "md-5",
  "memchr",
  "once_cell",
  "paste",
  "percent-encoding",
+ "rand",
  "rustls 0.20.9",
  "rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "sha1",
  "sha2 0.10.8",
  "smallvec",
  "sqlformat",
@@ -8286,6 +8585,7 @@ dependencies = [
  "tokio-stream",
  "url",
  "webpki-roots 0.22.6",
+ "whoami",
 ]
 
 [[package]]
@@ -8297,9 +8597,12 @@ dependencies = [
  "dotenvy",
  "either",
  "heck 0.4.1",
+ "hex",
  "once_cell",
  "proc-macro2",
  "quote",
+ "serde",
+ "serde_json",
  "sha2 0.10.8",
  "sqlx-core",
  "sqlx-rt",
@@ -8323,11 +8626,45 @@ name = "ssl-inject"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.7",
+ "clap 4.5.17",
  "hex",
  "tokio",
 ]
 
+[[package]]
+name = "stabby"
+version = "36.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "311d6bcf0070c462ff626122ec2246f42bd2acd44b28908eedbfd07d500c7d99"
+dependencies = [
+ "rustversion",
+ "stabby-abi",
+]
+
+[[package]]
+name = "stabby-abi"
+version = "36.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6daae1a0707399f56d27fce7f212e50e31d215112a447e1bbcd837ae1bf5f49"
+dependencies = [
+ "rustversion",
+ "sha2-const-stable",
+ "stabby-macros",
+]
+
+[[package]]
+name = "stabby-macros"
+version = "36.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43cf89a0cc9131279235baf8599b0e073fbcb096419204de0cc5d1a48ae73f74"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "rand",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "stable-pattern"
 version = "0.1.0"
@@ -8337,12 +8674,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "state"
 version = "0.6.0"
@@ -8352,6 +8683,12 @@ dependencies = [
  "loom",
 ]
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "stringprep"
 version = "0.1.5"
@@ -8384,26 +8721,14 @@ dependencies = [
  "strum_macros 0.23.1",
 ]
 
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros 0.25.3",
-]
-
 [[package]]
 name = "strum"
 version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros 0.26.4",
+]
 
 [[package]]
 name = "strum_macros"
@@ -8418,32 +8743,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[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 = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "strum_macros"
 version = "0.26.4"
@@ -8518,37 +8817,11 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "sysinfo"
-version = "0.27.8"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.30.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -8604,7 +8877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "rustix",
  "windows-sys 0.52.0",
 ]
@@ -8768,8 +9041,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bip39",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
  "console",
  "cw-utils",
  "dkg-bypass-contract",
@@ -8809,18 +9082,18 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 
 [[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",
  "quote",
@@ -8893,16 +9166,6 @@ dependencies = [
  "time-core",
 ]
 
-[[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"
@@ -8930,9 +9193,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -9014,9 +9277,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -9066,9 +9329,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -9089,18 +9352,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.14"
@@ -9124,13 +9375,11 @@ dependencies = [
 
 [[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 2.2.6",
- "serde",
- "serde_spanned",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -9584,6 +9833,138 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
+[[package]]
+name = "uniffi"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21345172d31092fd48c47fd56c53d4ae9e41c4b1f559fb8c38c1ab1685fd919f"
+dependencies = [
+ "anyhow",
+ "camino",
+ "clap 4.5.17",
+ "uniffi_bindgen",
+ "uniffi_build",
+ "uniffi_core",
+ "uniffi_macros",
+]
+
+[[package]]
+name = "uniffi_bindgen"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd992f2929a053829d5875af1eff2ee3d7a7001cb3b9a46cc7895f2caede6940"
+dependencies = [
+ "anyhow",
+ "askama",
+ "camino",
+ "cargo_metadata 0.15.4",
+ "clap 4.5.17",
+ "fs-err",
+ "glob",
+ "goblin",
+ "heck 0.4.1",
+ "once_cell",
+ "paste",
+ "serde",
+ "toml 0.5.11",
+ "uniffi_meta",
+ "uniffi_testing",
+ "uniffi_udl",
+]
+
+[[package]]
+name = "uniffi_build"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "001964dd3682d600084b3aaf75acf9c3426699bc27b65e96bb32d175a31c74e9"
+dependencies = [
+ "anyhow",
+ "camino",
+ "uniffi_bindgen",
+]
+
+[[package]]
+name = "uniffi_checksum_derive"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55137c122f712d9330fd985d66fa61bdc381752e89c35708c13ce63049a3002c"
+dependencies = [
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "uniffi_core"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6121a127a3af1665cd90d12dd2b3683c2643c5103281d0fed5838324ca1fad5b"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "camino",
+ "log",
+ "once_cell",
+ "oneshot-uniffi",
+ "paste",
+ "static_assertions",
+]
+
+[[package]]
+name = "uniffi_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11cf7a58f101fcedafa5b77ea037999b88748607f0ef3a33eaa0efc5392e92e4"
+dependencies = [
+ "bincode",
+ "camino",
+ "fs-err",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.66",
+ "toml 0.5.11",
+ "uniffi_build",
+ "uniffi_meta",
+]
+
+[[package]]
+name = "uniffi_meta"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71dc8573a7b1ac4b71643d6da34888273ebfc03440c525121f1b3634ad3417a2"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "siphasher 0.3.11",
+ "uniffi_checksum_derive",
+]
+
+[[package]]
+name = "uniffi_testing"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "118448debffcb676ddbe8c5305fb933ab7e0123753e659a71dc4a693f8d9f23c"
+dependencies = [
+ "anyhow",
+ "camino",
+ "cargo_metadata 0.15.4",
+ "fs-err",
+ "once_cell",
+]
+
+[[package]]
+name = "uniffi_udl"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "889edb7109c6078abe0e53e9b4070cf74a6b3468d141bdf5ef1bd4d1dc24a1c3"
+dependencies = [
+ "anyhow",
+ "uniffi_meta",
+ "uniffi_testing",
+ "weedle2",
+]
+
 [[package]]
 name = "uninit"
 version = "0.5.1"
@@ -9629,12 +10010,12 @@ checksum = "0976c77def3f1f75c4ef892a292c31c0bbe9e3d0702c63044d7c76db298171a3"
 
 [[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",
 ]
@@ -9651,18 +10032,6 @@ 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_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -9696,25 +10065,59 @@ dependencies = [
 
 [[package]]
 name = "utoipa-swagger-ui"
-version = "6.0.0"
+version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da"
+checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e"
 dependencies = [
  "axum 0.7.5",
  "mime_guess",
  "regex",
+ "reqwest 0.12.4",
  "rust-embed",
  "serde",
  "serde_json",
+ "url",
  "utoipa",
  "zip",
 ]
 
 [[package]]
-name = "uuid"
-version = "1.8.0"
+name = "utoipauto"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "608b8f2279483be386261655b562e40877ea434eb92093c894a644fda2021860"
+dependencies = [
+ "utoipauto-macro",
+]
+
+[[package]]
+name = "utoipauto-core"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17e82ab96c5a55263b5bed151b8426410d93aa909a453acdbd4b6792b5af7d64"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "utoipauto-macro"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8338dc3c9526011ffaa2aa6bd60ddfda9d49d2123108690755c6e34844212"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "utoipauto-core",
+]
+
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
  "serde",
@@ -9740,7 +10143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525"
 dependencies = [
  "anyhow",
- "cargo_metadata",
+ "cargo_metadata 0.18.1",
  "cfg-if",
  "regex",
  "rustc_version 0.4.0",
@@ -9786,20 +10189,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
+name = "wasite"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -9812,9 +10222,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -9824,9 +10234,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -9834,9 +10244,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9847,18 +10257,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.42"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
+ "minicov",
  "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -9867,9 +10278,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
+checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9969,9 +10380,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -10020,6 +10431,26 @@ dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "weedle2"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e79c5206e1f43a2306fd64bdb95025ee4228960f2e6c5a8b173f3caaf807741"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "whoami"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+dependencies = [
+ "redox_syscall 0.5.1",
+ "wasite",
+ "web-sys",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -10342,18 +10773,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[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"
@@ -10369,7 +10788,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
  "serde",
  "zeroize",
@@ -10395,30 +10814,6 @@ dependencies = [
  "is-terminal",
 ]
 
-[[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",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
@@ -10439,27 +10834,6 @@ dependencies = [
  "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",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.6.0"
@@ -10480,38 +10854,20 @@ dependencies = [
  "syn 2.0.66",
 ]
 
-[[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",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164"
 dependencies = [
- "byteorder",
+ "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "flate2",
+ "indexmap 2.2.6",
+ "num_enum",
+ "thiserror",
 ]
 
 [[package]]
@@ -10520,7 +10876,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bs58 0.5.1",
+ "bs58",
  "getrandom",
  "js-sys",
  "nym-bin-common",
diff --git a/pkgs/by-name/ny/nym/package.nix b/pkgs/by-name/ny/nym/package.nix
index 2456b3b76906..ead40b8a913e 100644
--- a/pkgs/by-name/ny/nym/package.nix
+++ b/pkgs/by-name/ny/nym/package.nix
@@ -8,17 +8,23 @@
   darwin,
   nix-update-script,
   rustc,
+  fetchurl,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nym";
-  version = "2024.10-caramello";
+  version = "2024.12-aero";
 
   src = fetchFromGitHub {
     owner = "nymtech";
     repo = "nym";
     rev = "nym-binaries-v${version}";
-    hash = "sha256-0vEvjVCbwyJ7lpvZnIT551Kul0JfkcNSeURbX2PUZ4w=";
+    hash = "sha256-bUY0ctfE1i0pjqdT/LT43FB9rDO5OKBVaTckm5qxnms=";
+  };
+
+  swagger-ui = fetchurl {
+    url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v5.17.14.zip";
+    hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw=";
   };
 
   cargoLock = {
@@ -26,10 +32,15 @@ rustPlatform.buildRustPackage rec {
     outputHashes = {
       "bls12_381-0.8.0" = "sha256-4+X/ZQ5Z+Nax4Ot1JWWvvLxuIUaucHkfnDB2L+Ak7Ro=";
       "cosmos-sdk-proto-0.22.0-pre" = "sha256-nRfcAbjFcvAqool+6heYK8joiU5YaSWITnO6S5MRM1E=";
+      "defguard_wireguard_rs-0.4.7" = "sha256-+5m1+XGJ6Fi8v6rgjt0jRmwIruIL+OPP7zq/+166WMw=";
       "indexed_db_futures-0.4.2" = "sha256-vVqrD40CBdSSEtU+kQeuZUfsgpJdl8ks+os0Fct8Ung=";
     };
   };
 
+  env = {
+    SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
+  };
+
   nativeBuildInputs = [
     pkg-config
   ];
diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/by-name/ny/nyx/package.nix
similarity index 100%
rename from pkgs/tools/networking/nyx/default.nix
rename to pkgs/by-name/ny/nyx/package.nix
diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index db143bf1a513..8a00d6ac8824 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nzbhydra2";
-  version = "7.7.0";
+  version = "7.8.0";
 
   src = fetchzip {
     url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
-    hash = "sha256-8Q/aTMwHFy7OG+VyoSRYlXp4l247nUSPP0YCMkv9Cec=";
+    hash = "sha256-xE43ACFF9B5YMPjcSDcG2I3YlTSLR5oD3UdAL9XXUWI=";
     stripRoot = false;
   };
 
diff --git a/pkgs/development/interpreters/oak/default.nix b/pkgs/by-name/oa/oak/package.nix
similarity index 100%
rename from pkgs/development/interpreters/oak/default.nix
rename to pkgs/by-name/oa/oak/package.nix
diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/by-name/oa/oapi-codegen/package.nix
similarity index 100%
rename from pkgs/tools/networking/oapi-codegen/default.nix
rename to pkgs/by-name/oa/oapi-codegen/package.nix
diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/by-name/oa/oatpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/oatpp/default.nix
rename to pkgs/by-name/oa/oatpp/package.nix
diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
similarity index 100%
rename from pkgs/servers/oauth2-proxy/default.nix
rename to pkgs/by-name/oa/oauth2-proxy/package.nix
diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/by-name/oa/oauth2c/package.nix
similarity index 100%
rename from pkgs/tools/security/oauth2c/default.nix
rename to pkgs/by-name/oa/oauth2c/package.nix
diff --git a/pkgs/applications/emulators/oberon-risc-emu/default.nix b/pkgs/by-name/ob/oberon-risc-emu/package.nix
similarity index 100%
rename from pkgs/applications/emulators/oberon-risc-emu/default.nix
rename to pkgs/by-name/ob/oberon-risc-emu/package.nix
diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/by-name/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch
similarity index 100%
rename from pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
rename to pkgs/by-name/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/by-name/ob/obex_data_server/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obex-data-server/default.nix
rename to pkgs/by-name/ob/obex_data_server/package.nix
diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/by-name/ob/obexd/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obexd/default.nix
rename to pkgs/by-name/ob/obexd/package.nix
diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/by-name/ob/obexfs/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obexfs/default.nix
rename to pkgs/by-name/ob/obexfs/package.nix
diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/by-name/ob/obexftp/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obexftp/default.nix
rename to pkgs/by-name/ob/obexftp/package.nix
diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/by-name/ob/obfs4/package.nix
similarity index 100%
rename from pkgs/tools/networking/obfs4/default.nix
rename to pkgs/by-name/ob/obfs4/package.nix
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/by-name/ob/objconv/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/objconv/default.nix
rename to pkgs/by-name/ob/objconv/package.nix
diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix
index 4a02e4989849..6b0efddb1741 100644
--- a/pkgs/by-name/ob/objfw/package.nix
+++ b/pkgs/by-name/ob/objfw/package.nix
@@ -9,13 +9,13 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "objfw";
-  version = "1.1.7";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "ObjFW";
     repo = "ObjFW";
-    rev = "refs/tags/1.1.7-release";
-    hash = "sha256-0ylG/2ZSO3b8zdh6W9QJH5OJW9V344CCik1DduV5mhI=";
+    rev = "refs/tags/1.2-release";
+    hash = "sha256-nGajiLYwkIDyJujN2zWULkQXKV2A2wzjYl9IoZBU/N4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/obs-cli/default.nix b/pkgs/by-name/ob/obs-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/obs-cli/default.nix
rename to pkgs/by-name/ob/obs-cli/package.nix
diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index a0a495247172..96c39964a39f 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/grigio/obs-cmd";
     changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ianmjones ];
+    maintainers = with maintainers; [ ];
     mainProgram = "obs-cmd";
   };
 }
diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index 1060c148ea38..03413d8eb5d6 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -12,7 +12,7 @@
 }:
 let
   pname = "obsidian";
-  version = "1.7.4";
+  version = "1.7.5";
   appname = "Obsidian";
   meta = with lib; {
     description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -26,7 +26,7 @@ let
   filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
   src = fetchurl {
     url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    hash = if stdenv.hostPlatform.isDarwin then "sha256-r3dSHx3y7BzjbWYJwXwyWCeTRya2jLMVhzV7NWpRDb4=" else "sha256-NRL8WHi+4ne48z7b9G6trJZiTt/lhwcF2CZjgyYmOug=";
+    hash = if stdenv.hostPlatform.isDarwin then "sha256-2gUXA0a7gcVFtTl5qiJFTAu6A9W79DiP0hd8j1Mwv3I=" else "sha256-T177UqPnPLM/2dGUdwhK21AByYrJu9wgEKOWrrGBQkA=";
   };
 
   icon = fetchurl {
@@ -61,7 +61,7 @@ let
         -t $out/share/applications/
       for size in 16 24 32 48 64 128 256 512; do
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
+        magick ${icon} -background none -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
       done
       runHook postInstall
     '';
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/by-name/ob/obuild/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/obuild/default.nix
rename to pkgs/by-name/ob/obuild/package.nix
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/by-name/oc/ocaml-top/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/ocaml-top/default.nix
rename to pkgs/by-name/oc/ocaml-top/package.nix
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/by-name/oc/ocaml_make/package.nix
similarity index 100%
rename from pkgs/development/ocaml-modules/ocamlmake/default.nix
rename to pkgs/by-name/oc/ocaml_make/package.nix
diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/by-name/oc/ocaml_make/setup-hook.sh
similarity index 100%
rename from pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
rename to pkgs/by-name/oc/ocaml_make/setup-hook.sh
diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ocf-resource-agents/default.nix
rename to pkgs/by-name/oc/ocf-resource-agents/package.nix
diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/by-name/oc/oci-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/oci-cli/default.nix
rename to pkgs/by-name/oc/oci-cli/package.nix
diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix
rename to pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/by-name/oc/ocl-icd/package.nix
similarity index 100%
rename from pkgs/development/libraries/ocl-icd/default.nix
rename to pkgs/by-name/oc/ocl-icd/package.nix
diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/by-name/oc/oclgrind/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/oclgrind/default.nix
rename to pkgs/by-name/oc/oclgrind/package.nix
diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/by-name/oc/ocm/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/ocm/default.nix
rename to pkgs/by-name/oc/ocm/package.nix
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/by-name/oc/ocproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/ocproxy/default.nix
rename to pkgs/by-name/oc/ocproxy/package.nix
diff --git a/pkgs/data/fonts/ocr-a/default.nix b/pkgs/by-name/oc/ocr-a/package.nix
similarity index 100%
rename from pkgs/data/fonts/ocr-a/default.nix
rename to pkgs/by-name/oc/ocr-a/package.nix
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/by-name/oc/ocrad/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ocrad/default.nix
rename to pkgs/by-name/oc/ocrad/package.nix
diff --git a/pkgs/applications/graphics/ocrfeeder/fix-launch.diff b/pkgs/by-name/oc/ocrfeeder/fix-launch.diff
similarity index 100%
rename from pkgs/applications/graphics/ocrfeeder/fix-launch.diff
rename to pkgs/by-name/oc/ocrfeeder/fix-launch.diff
diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/by-name/oc/ocrfeeder/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ocrfeeder/default.nix
rename to pkgs/by-name/oc/ocrfeeder/package.nix
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/by-name/oc/ocserv/package.nix
similarity index 100%
rename from pkgs/tools/networking/ocserv/default.nix
rename to pkgs/by-name/oc/ocserv/package.nix
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/by-name/oc/ocsigen-i18n/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
rename to pkgs/by-name/oc/ocsigen-i18n/package.nix
diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/by-name/oc/octomap/package.nix
similarity index 100%
rename from pkgs/development/libraries/octomap/default.nix
rename to pkgs/by-name/oc/octomap/package.nix
diff --git a/pkgs/applications/misc/octoprint/ffmpeg-path.patch b/pkgs/by-name/oc/octoprint/ffmpeg-path.patch
similarity index 100%
rename from pkgs/applications/misc/octoprint/ffmpeg-path.patch
rename to pkgs/by-name/oc/octoprint/ffmpeg-path.patch
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
new file mode 100644
index 000000000000..a4b437ac6d1c
--- /dev/null
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -0,0 +1,279 @@
+{
+  pkgs,
+  stdenv,
+  callPackage,
+  lib,
+  fetchFromGitHub,
+  fetchPypi,
+  python3,
+  substituteAll,
+  nix-update-script,
+  nixosTests,
+  # To include additional plugins, pass them here as an overlay.
+  packageOverrides ? self: super: { },
+}:
+let
+
+  py = python3.override {
+    self = py;
+    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
+      (
+        # Due to flask > 2.3 the login will not work
+        self: super: {
+          werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec {
+            version = "2.2.3";
+            format = "setuptools";
+            pyproject = null;
+            src = fetchPypi {
+              pname = "Werkzeug";
+              inherit version;
+              hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4=";
+            };
+            doCheck = false;
+          });
+          flask = super.flask.overridePythonAttrs (oldAttrs: rec {
+            version = "2.2.5";
+            format = "setuptools";
+            src = fetchPypi {
+              pname = "Flask";
+              inherit version;
+              hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA=";
+            };
+            doCheck = false;
+          });
+          flask-login = super.flask-login.overridePythonAttrs (oldAttrs: rec {
+            version = "0.6.3";
+            src = fetchPypi {
+              pname = "Flask-Login";
+              inherit version;
+              hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM=";
+            };
+            build-system = [ self.setuptools ];
+            doCheck = false; # DeprecationWarnings
+          });
+
+          netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec {
+            version = "0.9.0";
+
+            src = fetchPypi {
+              pname = "netaddr";
+              inherit version;
+              hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg=";
+            };
+          });
+        })
+
+      # Built-in dependency
+      (self: super: {
+        octoprint-filecheck = self.buildPythonPackage rec {
+          pname = "OctoPrint-FileCheck";
+          version = "2024.3.27";
+
+          src = fetchFromGitHub {
+            owner = "OctoPrint";
+            repo = "OctoPrint-FileCheck";
+            rev = version;
+            sha256 = "sha256-2MK9whPpgwQC+WPbPf628Ocjz6t8HKozblP7dmjD7RQ=";
+          };
+          doCheck = false;
+        };
+      })
+
+      # Built-in dependency
+      (self: super: {
+        octoprint-firmwarecheck = self.buildPythonPackage rec {
+          pname = "OctoPrint-FirmwareCheck";
+          version = "2021.10.11";
+
+          src = fetchFromGitHub {
+            owner = "OctoPrint";
+            repo = "OctoPrint-FirmwareCheck";
+            rev = version;
+            hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI=";
+          };
+          doCheck = false;
+        };
+      })
+
+      (self: super: {
+        octoprint-pisupport = self.buildPythonPackage rec {
+          pname = "OctoPrint-PiSupport";
+          version = "2023.5.24";
+          format = "setuptools";
+
+          src = fetchFromGitHub {
+            owner = "OctoPrint";
+            repo = "OctoPrint-PiSupport";
+            rev = version;
+            hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew=";
+          };
+
+          # requires octoprint itself during tests
+          doCheck = false;
+          postPatch = ''
+            substituteInPlace octoprint_pi_support/__init__.py \
+              --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd
+          '';
+        };
+      })
+
+      (self: super: {
+        octoprint = self.buildPythonPackage rec {
+          pname = "OctoPrint";
+          version = "1.10.3";
+
+          src = fetchFromGitHub {
+            owner = "OctoPrint";
+            repo = "OctoPrint";
+            rev = version;
+            hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk=";
+          };
+
+          propagatedBuildInputs =
+            with self;
+            [
+              argon2-cffi
+              blinker
+              cachelib
+              click
+              colorlog
+              emoji
+              feedparser
+              filetype
+              flask
+              flask-babel
+              flask-assets
+              flask-login
+              flask-limiter
+              frozendict
+              future
+              itsdangerous
+              immutabledict
+              jinja2
+              markdown
+              markupsafe
+              netaddr
+              netifaces
+              octoprint-filecheck
+              octoprint-firmwarecheck
+              passlib
+              pathvalidate
+              pkginfo
+              pip
+              psutil
+              pylru
+              pyserial
+              pyyaml
+              regex
+              requests
+              rsa
+              sarge
+              semantic-version
+              sentry-sdk
+              setuptools
+              tornado
+              unidecode
+              watchdog
+              websocket-client
+              werkzeug
+              wrapt
+              zeroconf
+              zipstream-ng
+              class-doc
+              pydantic_1
+            ]
+            ++ lib.optionals stdenv.hostPlatform.isDarwin [ py.pkgs.appdirs ]
+            ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ octoprint-pisupport ];
+
+          nativeCheckInputs = with self; [
+            ddt
+            mock
+            pytestCheckHook
+          ];
+
+          patches = [
+            # substitute pip and let it find out, that it can't write anywhere
+            (substituteAll {
+              src = ./pip-path.patch;
+              pip = "${self.pip}/bin/pip";
+            })
+
+            # hardcore path to ffmpeg and hide related settings
+            (substituteAll {
+              src = ./ffmpeg-path.patch;
+              ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";
+            })
+          ];
+
+          postPatch =
+            let
+              ignoreVersionConstraints = [
+                "cachelib"
+                "colorlog"
+                "emoji"
+                "immutabledict"
+                "PyYAML"
+                "sarge"
+                "sentry-sdk"
+                "watchdog"
+                "wrapt"
+                "zeroconf"
+                "Flask-Login"
+                "werkzeug"
+                "flask"
+                "Flask-Limiter"
+                "blinker"
+              ];
+            in
+            ''
+              sed -r -i \
+                ${
+                  lib.concatStringsSep "\n" (map (e: ''-e 's@${e}[<>=]+.*@${e}",@g' \'') ignoreVersionConstraints)
+                }
+                setup.py
+            '';
+
+          dontUseSetuptoolsCheck = true;
+
+          preCheck = ''
+            export HOME=$(mktemp -d)
+            rm pytest.ini
+          '';
+
+          disabledTests = [
+            "test_check_setup" # Why should it be able to call pip?
+          ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ];
+          disabledTestPaths = [
+            "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12
+          ];
+
+          passthru = {
+            inherit (self) python;
+            updateScript = nix-update-script { };
+            tests = {
+              plugins = (callPackage ./plugins.nix { }) super self;
+              inherit (nixosTests) octoprint;
+            };
+          };
+
+          meta = with lib; {
+            homepage = "https://octoprint.org/";
+            description = "Snappy web interface for your 3D printer";
+            mainProgram = "octoprint";
+            license = licenses.agpl3Only;
+            maintainers = with maintainers; [
+              abbradar
+              gebner
+              WhittlesJr
+              gador
+            ];
+          };
+        };
+      })
+      (callPackage ./plugins.nix { })
+      packageOverrides
+    ]);
+  };
+in
+with py.pkgs;
+toPythonApplication octoprint
diff --git a/pkgs/applications/misc/octoprint/pip-path.patch b/pkgs/by-name/oc/octoprint/pip-path.patch
similarity index 100%
rename from pkgs/applications/misc/octoprint/pip-path.patch
rename to pkgs/by-name/oc/octoprint/pip-path.patch
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
similarity index 100%
rename from pkgs/applications/misc/octoprint/plugins.nix
rename to pkgs/by-name/oc/octoprint/plugins.nix
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/by-name/oc/octopus-caller/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/octopus/default.nix
rename to pkgs/by-name/oc/octopus-caller/package.nix
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/by-name/oc/octopus/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/octopus/default.nix
rename to pkgs/by-name/oc/octopus/package.nix
diff --git a/pkgs/tools/security/octosuite/default.nix b/pkgs/by-name/oc/octosuite/package.nix
similarity index 100%
rename from pkgs/tools/security/octosuite/default.nix
rename to pkgs/by-name/oc/octosuite/package.nix
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
new file mode 100644
index 000000000000..643cddcf2aca
--- /dev/null
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  openssl,
+  fontconfig,
+  nasm,
+  libX11,
+  libXcursor,
+  libXrandr,
+  libXi,
+  libGL,
+  libxkbcommon,
+  wayland,
+  stdenv,
+  gtk3,
+  darwin,
+  perl,
+  wrapGAppsHook3,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "oculante";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "woelper";
+    repo = "oculante";
+    rev = version;
+    hash = "sha256-6jow0ektqmEcwFEaJgPqhJPs8LlYmPRLE+zqk1T4wDk=";
+  };
+
+  cargoHash = "sha256-0e4FoWhZwq6as0JYHGj1zoAOSr71ztqtWJEY3QXDs9s=";
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    nasm
+    perl
+    wrapGAppsHook3
+  ];
+
+  buildInputs =
+    [
+      openssl
+      fontconfig
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libGL
+      libX11
+      libXcursor
+      libXi
+      libXrandr
+      gtk3
+
+      libxkbcommon
+      wayland
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.libobjc
+    ];
+
+  checkFlags = [
+    "--skip=bench"
+    "--skip=tests::net" # requires network access
+    "--skip=tests::flathub"
+  ];
+
+  postInstall = ''
+    install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/
+    install -Dm444 $src/res/oculante.desktop -t $out/share/applications
+    wrapProgram $out/bin/oculante \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
+  '';
+
+  meta = with lib; {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Minimalistic crossplatform image viewer written in Rust";
+    homepage = "https://github.com/woelper/oculante";
+    changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
+    license = licenses.mit;
+    mainProgram = "oculante";
+    maintainers = with maintainers; [
+      dit7ya
+      figsoda
+    ];
+  };
+}
diff --git a/pkgs/games/doom-ports/odamex/default.nix b/pkgs/by-name/od/odamex/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/odamex/default.nix
rename to pkgs/by-name/od/odamex/package.nix
diff --git a/pkgs/os-specific/linux/oddjob/default.nix b/pkgs/by-name/od/oddjob/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/oddjob/default.nix
rename to pkgs/by-name/od/oddjob/package.nix
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/by-name/od/ode/package.nix
similarity index 100%
rename from pkgs/development/libraries/ode/default.nix
rename to pkgs/by-name/od/ode/package.nix
diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/by-name/od/odin2/package.nix
similarity index 100%
rename from pkgs/applications/audio/odin2/default.nix
rename to pkgs/by-name/od/odin2/package.nix
diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/by-name/od/odo/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/odo/default.nix
rename to pkgs/by-name/od/odo/package.nix
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/by-name/od/odp-dpdk/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/odp-dpdk/default.nix
rename to pkgs/by-name/od/odp-dpdk/package.nix
diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix
new file mode 100644
index 000000000000..a1737adc69fa
--- /dev/null
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
+
+let
+  version = "5.4.0";
+  libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
+
+in
+stdenv.mkDerivation {
+  inherit version;
+
+  pname = "odpic";
+
+  src = fetchFromGitHub {
+    owner = "oracle";
+    repo = "odpi";
+    rev = "v${version}";
+    sha256 = "sha256-MmzForjAgccze7VvNcN6vX4rfiy+W9eGQ2Qh49ah7Ps=";
+  };
+
+  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+
+  buildInputs = [ oracle-instantclient ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ];
+
+  dontPatchELF = true;
+  makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];
+
+  postFixup = ''
+    ${lib.optionalString (stdenv.hostPlatform.isLinux) ''
+      patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
+    ''}
+    ${lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+      install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
+    ''}
+  '';
+
+  meta = with lib; {
+    description = "Oracle ODPI-C library";
+    homepage = "https://oracle.github.io/odpi/";
+    maintainers = with maintainers; [ mkazulak ];
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    hydraPlatforms = [ ];
+  };
+}
diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
similarity index 100%
rename from pkgs/tools/misc/odroid-xu3-bootloader/default.nix
rename to pkgs/by-name/od/odroid-xu3-bootloader/package.nix
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/by-name/od/odt2txt/package.nix
similarity index 100%
rename from pkgs/tools/text/odt2txt/default.nix
rename to pkgs/by-name/od/odt2txt/package.nix
diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/by-name/od/odyssey/package.nix
similarity index 100%
rename from pkgs/tools/misc/odyssey/default.nix
rename to pkgs/by-name/od/odyssey/package.nix
diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/by-name/oe/oed/package.nix
similarity index 100%
rename from pkgs/applications/editors/oed/default.nix
rename to pkgs/by-name/oe/oed/package.nix
diff --git a/pkgs/tools/security/offensive-azure/default.nix b/pkgs/by-name/of/offensive-azure/package.nix
similarity index 100%
rename from pkgs/tools/security/offensive-azure/default.nix
rename to pkgs/by-name/of/offensive-azure/package.nix
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/by-name/of/offlineimap/package.nix
similarity index 100%
rename from pkgs/tools/networking/offlineimap/default.nix
rename to pkgs/by-name/of/offlineimap/package.nix
diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/by-name/of/offrss/package.nix
similarity index 100%
rename from pkgs/applications/networking/offrss/default.nix
rename to pkgs/by-name/of/offrss/package.nix
diff --git a/pkgs/tools/compression/offzip/default.nix b/pkgs/by-name/of/offzip/package.nix
similarity index 100%
rename from pkgs/tools/compression/offzip/default.nix
rename to pkgs/by-name/of/offzip/package.nix
diff --git a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
similarity index 100%
rename from pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
rename to pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/by-name/of/ofono/package.nix
similarity index 100%
rename from pkgs/tools/networking/ofono/default.nix
rename to pkgs/by-name/of/ofono/package.nix
diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/by-name/og/ogdf/package.nix
similarity index 100%
rename from pkgs/development/libraries/ogdf/default.nix
rename to pkgs/by-name/og/ogdf/package.nix
diff --git a/pkgs/tools/misc/oggvideotools/default.nix b/pkgs/by-name/og/oggvideotools/package.nix
similarity index 100%
rename from pkgs/tools/misc/oggvideotools/default.nix
rename to pkgs/by-name/og/oggvideotools/package.nix
diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/by-name/og/ogmtools/package.nix
similarity index 100%
rename from pkgs/applications/video/ogmtools/default.nix
rename to pkgs/by-name/og/ogmtools/package.nix
diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/by-name/og/ograc/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/ograc/default.nix
rename to pkgs/by-name/og/ograc/package.nix
diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/by-name/oh/oh-my-git/package.nix
similarity index 100%
rename from pkgs/games/oh-my-git/default.nix
rename to pkgs/by-name/oh/oh-my-git/package.nix
diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix
index d861e5bcf20d..4c3f0a905e62 100644
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "23.15.0";
+  version = "23.20.3";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-gZCR7cDSI0gRaTnYADOLpyHe26URo27JXJjnNxr4Jwc=";
+    hash = "sha256-quncE2OfSQUnLOEKsqKGBeONCI67CNRB/egqyf7o+4U=";
   };
 
-  vendorHash = "sha256-EBLfbdTV15wSTOThzBY0d2KrSJzRaB8vNH53Uwc+XfM=";
+  vendorHash = "sha256-VgSQMY2JyGZ50T4PCdKQNnwnP6hknnxP2AJ15A9aHig=";
 
   sourceRoot = "${src.name}/src";
 
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
similarity index 100%
rename from pkgs/shells/zsh/oh-my-zsh/default.nix
rename to pkgs/by-name/oh/oh-my-zsh/package.nix
diff --git a/pkgs/shells/oh/default.nix b/pkgs/by-name/oh/oh/package.nix
similarity index 100%
rename from pkgs/shells/oh/default.nix
rename to pkgs/by-name/oh/oh/package.nix
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
new file mode 100644
index 000000000000..85f02f8c3d42
--- /dev/null
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -0,0 +1,44 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+, pkg-config
+, openssl
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "oha";
+  version = "1.4.7";
+
+  src = fetchFromGitHub {
+    owner = "hatoo";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-9nyQvzxOwBFsh6TzczYZ5Tlu7LyxuFYVECBXL5IX6TY=";
+  };
+
+  cargoHash = "sha256-EPF/NU6qFTS4K3UWd2c2poshZkACljrxfCHyDahDWxY=";
+
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  # tests don't work inside the sandbox
+  doCheck = false;
+
+  meta = with lib; {
+    description = "HTTP load generator inspired by rakyll/hey with tui animation";
+    homepage = "https://github.com/hatoo/oha";
+    changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "oha";
+  };
+}
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index 60d0c2b972a7..5f2eeb6492b2 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oidc-agent";
-  version = "5.2.2";
+  version = "5.2.3";
 
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-OW0hCDVC+AqmXP1dQK/7lnXeG8RbXzFLbKLEvc/8spY=";
+    hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/by-name/oi/oidentd/package.nix
similarity index 100%
rename from pkgs/servers/identd/oidentd/default.nix
rename to pkgs/by-name/oi/oidentd/package.nix
diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/by-name/oi/oil-buku/package.nix
similarity index 100%
rename from pkgs/applications/misc/oil-buku/default.nix
rename to pkgs/by-name/oi/oil-buku/package.nix
diff --git a/pkgs/shells/oksh/default.nix b/pkgs/by-name/ok/oksh/package.nix
similarity index 100%
rename from pkgs/shells/oksh/default.nix
rename to pkgs/by-name/ok/oksh/package.nix
diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/okta-aws-cli/default.nix
rename to pkgs/by-name/ok/okta-aws-cli/package.nix
diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 0970b4f0f011..7bc8d6c2695b 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "okteto";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     rev = version;
-    hash = "sha256-TxZdHR6SNHrIAdrrg3X9TnWCR8bjos93d7k7eaKpvQ8=";
+    hash = "sha256-hs09DdTIcORd+Ys8QPsemEsC6PXzm3GkB3gtgE3ARPs=";
   };
 
   vendorHash = "sha256-GiA/fmLT9x3gGF066bHTBWDd1yhygeG9snwCpwhOlMM=";
diff --git a/pkgs/servers/olaris/default.nix b/pkgs/by-name/ol/olaris-server/package.nix
similarity index 100%
rename from pkgs/servers/olaris/default.nix
rename to pkgs/by-name/ol/olaris-server/package.nix
diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/by-name/ol/oldsindhi/package.nix
similarity index 100%
rename from pkgs/data/fonts/oldsindhi/default.nix
rename to pkgs/by-name/ol/oldsindhi/package.nix
diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/by-name/ol/oldstandard/package.nix
similarity index 100%
rename from pkgs/data/fonts/oldstandard/default.nix
rename to pkgs/by-name/ol/oldstandard/package.nix
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/by-name/ol/olm/package.nix
similarity index 100%
rename from pkgs/development/libraries/olm/default.nix
rename to pkgs/by-name/ol/olm/package.nix
diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix
index d6f7e9664dc2..da4692dee37e 100644
--- a/pkgs/by-name/ol/ols/package.nix
+++ b/pkgs/by-name/ol/ols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "ols";
-  version = "0-unstable-2024-10-12";
+  version = "0-unstable-2024-10-27";
 
   src = fetchFromGitHub {
     owner = "DanielGavin";
     repo = "ols";
-    rev = "834ec9ad3f50add0ee8e44071275c318a9f35abb";
-    hash = "sha256-K32coqh6eCId+Rdfbu9TnN2RHDlvxF+BDsxAoP3Xk30=";
+    rev = "a3b090c7ef9604b0d6630caedb9c204a708828ac";
+    hash = "sha256-pmxdfS8GyJneuf+ADkGyj7DZVqiyQgyNILjztxMFC0c=";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/by-name/ol/olsrd/package.nix
similarity index 100%
rename from pkgs/tools/networking/olsrd/default.nix
rename to pkgs/by-name/ol/olsrd/package.nix
diff --git a/pkgs/development/tools/misc/om4/default.nix b/pkgs/by-name/om/om4/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/om4/default.nix
rename to pkgs/by-name/om/om4/package.nix
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/by-name/om/omake/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/omake/default.nix
rename to pkgs/by-name/om/omake/package.nix
diff --git a/pkgs/data/themes/omni-gtk-theme/default.nix b/pkgs/by-name/om/omni-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/omni-gtk-theme/default.nix
rename to pkgs/by-name/om/omni-gtk-theme/package.nix
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/by-name/om/omniorb/package.nix
similarity index 100%
rename from pkgs/development/tools/omniorb/default.nix
rename to pkgs/by-name/om/omniorb/package.nix
diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/by-name/om/omnisharp-roslyn/deps.nix
similarity index 100%
rename from pkgs/development/tools/omnisharp-roslyn/deps.nix
rename to pkgs/by-name/om/omnisharp-roslyn/deps.nix
diff --git a/pkgs/by-name/om/omnisharp-roslyn/package.nix b/pkgs/by-name/om/omnisharp-roslyn/package.nix
new file mode 100644
index 000000000000..5ca7c3290eab
--- /dev/null
+++ b/pkgs/by-name/om/omnisharp-roslyn/package.nix
@@ -0,0 +1,125 @@
+{
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  runCommand,
+  expect,
+}:
+
+let
+  inherit (dotnetCorePackages) sdk_8_0 runtime_6_0;
+in
+let
+  finalPackage = buildDotnetModule rec {
+    pname = "omnisharp-roslyn";
+    version = "1.39.12";
+
+    src = fetchFromGitHub {
+      owner = "OmniSharp";
+      repo = "omnisharp-roslyn";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
+    };
+
+    projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
+    nugetDeps = ./deps.nix;
+
+    dotnet-sdk =
+      with dotnetCorePackages;
+      combinePackages [
+        sdk_6_0
+        sdk_8_0
+      ];
+    dotnet-runtime = sdk_8_0;
+
+    dotnetInstallFlags = [ "--framework net6.0" ];
+    dotnetBuildFlags = [
+      "--framework net6.0"
+      "--no-self-contained"
+    ];
+    dotnetFlags = [
+      # These flags are set by the cake build.
+      "-property:PackageVersion=${version}"
+      "-property:AssemblyVersion=${version}.0"
+      "-property:FileVersion=${version}.0"
+      "-property:InformationalVersion=${version}"
+      "-property:RuntimeFrameworkVersion=${runtime_6_0.version}"
+      "-property:RollForward=LatestMajor"
+    ];
+
+    postPatch = ''
+      # Relax the version requirement
+      rm global.json
+
+      # Patch the project files so we can compile them properly
+      for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
+        substituteInPlace $project \
+          --replace 'win7-x64;win7-x86;win10-arm64' 'linux-x64;linux-arm64;osx-x64;osx-arm64'
+      done
+    '';
+
+    useDotnetFromEnv = true;
+    executables = [ "OmniSharp" ];
+
+    passthru.tests =
+      let
+        with-sdk =
+          sdk:
+          runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
+            {
+              nativeBuildInputs = [
+                finalPackage
+                sdk
+                expect
+              ];
+              meta.timeout = 60;
+            }
+            ''
+              HOME=$TMPDIR
+              expect <<"EOF"
+                spawn OmniSharp
+                expect_before timeout {
+                  send_error "timeout!\n"
+                  exit 1
+                }
+                expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
+                expect "{\"Event\":\"started\","
+                send \x03
+                expect eof
+                catch wait result
+                exit [lindex $result 3]
+              EOF
+              touch $out
+            '';
+      in
+      {
+        # Make sure we can run OmniSharp with any supported SDK version, as well as without
+        with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0;
+        with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
+        no-sdk = with-sdk null;
+      };
+
+    passthru.updateScript = ./update.sh;
+
+    meta = {
+      description = "OmniSharp based on roslyn workspaces";
+      homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
+      sourceProvenance = with lib.sourceTypes; [
+        fromSource
+        binaryNativeCode # dependencies
+      ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        corngood
+        ericdallo
+        gepbird
+        mdarocha
+        tesq0
+      ];
+      mainProgram = "OmniSharp";
+    };
+  };
+in
+finalPackage
diff --git a/pkgs/by-name/om/omnisharp-roslyn/update.sh b/pkgs/by-name/om/omnisharp-roslyn/update.sh
new file mode 100755
index 000000000000..6acb7d7e1a0a
--- /dev/null
+++ b/pkgs/by-name/om/omnisharp-roslyn/update.sh
@@ -0,0 +1,20 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
+# shellcheck shell=bash
+
+set -euo pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases/latest" | jq -r '.name')"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
+
+if [[ "$new_version" == "$old_version" ]]; then
+  echo "Already up to date!"
+  exit 0
+fi
+
+cd ../../../..
+update-source-version omnisharp-roslyn "${new_version//v}"
+
+$(nix-build -A omnisharp-roslyn.fetch-deps --no-out-link)
diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/by-name/om/omorfi/package.nix
similarity index 100%
rename from pkgs/development/libraries/omorfi/default.nix
rename to pkgs/by-name/om/omorfi/package.nix
diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/by-name/om/omping/package.nix
similarity index 100%
rename from pkgs/applications/networking/omping/default.nix
rename to pkgs/by-name/om/omping/package.nix
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/by-name/om/omxplayer/package.nix
similarity index 100%
rename from pkgs/applications/video/omxplayer/default.nix
rename to pkgs/by-name/om/omxplayer/package.nix
diff --git a/pkgs/applications/misc/onboard/fix-paths.patch b/pkgs/by-name/on/onboard/fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/onboard/fix-paths.patch
rename to pkgs/by-name/on/onboard/fix-paths.patch
diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/by-name/on/onboard/hunspell-use-xdg-datadirs.patch
similarity index 100%
rename from pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
rename to pkgs/by-name/on/onboard/hunspell-use-xdg-datadirs.patch
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/by-name/on/onboard/package.nix
similarity index 100%
rename from pkgs/applications/misc/onboard/default.nix
rename to pkgs/by-name/on/onboard/package.nix
diff --git a/pkgs/tools/misc/ondir/default.nix b/pkgs/by-name/on/ondir/package.nix
similarity index 100%
rename from pkgs/tools/misc/ondir/default.nix
rename to pkgs/by-name/on/ondir/package.nix
diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index 76dac0203c20..c11a24daddff 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.1.0";
+  version = "1.1.1a";
 
   setupPy = writeText "setup.py" ''
     from setuptools import setup
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
     owner = "bpozdena";
     repo = "OneDriveGUI";
     rev = "v${version}";
-    hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s=";
+    hash = "sha256-pcY1JOi74pePvkIMRuHv5mlE4F68NzuBLJTCtgjUFRw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/by-name/on/oneko/package.nix
similarity index 100%
rename from pkgs/applications/misc/oneko/default.nix
rename to pkgs/by-name/on/oneko/package.nix
diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/by-name/on/oneshot/package.nix
similarity index 100%
rename from pkgs/tools/networking/oneshot/default.nix
rename to pkgs/by-name/on/oneshot/package.nix
diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/by-name/on/onesixtyone/package.nix
similarity index 100%
rename from pkgs/tools/security/onesixtyone/default.nix
rename to pkgs/by-name/on/onesixtyone/package.nix
diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/by-name/on/onestepback/package.nix
similarity index 100%
rename from pkgs/data/themes/onestepback/default.nix
rename to pkgs/by-name/on/onestepback/package.nix
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/by-name/on/oniguruma/package.nix
similarity index 100%
rename from pkgs/development/libraries/oniguruma/default.nix
rename to pkgs/by-name/on/oniguruma/package.nix
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/by-name/on/onioncircuits/package.nix
similarity index 100%
rename from pkgs/tools/security/onioncircuits/default.nix
rename to pkgs/by-name/on/onioncircuits/package.nix
diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/by-name/on/onlykey-agent/package.nix
similarity index 100%
rename from pkgs/tools/security/onlykey-agent/default.nix
rename to pkgs/by-name/on/onlykey-agent/package.nix
diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/by-name/on/onlykey-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/onlykey-cli/default.nix
rename to pkgs/by-name/on/onlykey-cli/package.nix
diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
similarity index 100%
rename from pkgs/servers/onlyoffice-documentserver/default.nix
rename to pkgs/by-name/on/onlyoffice-documentserver/package.nix
diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/by-name/on/onmetal-image/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/onmetal-image/default.nix
rename to pkgs/by-name/on/onmetal-image/package.nix
diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/by-name/oo/oobicpl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/oobicpl/default.nix
rename to pkgs/by-name/oo/oobicpl/package.nix
diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/by-name/oo/ookla-speedtest/package.nix
similarity index 100%
rename from pkgs/tools/networking/ookla-speedtest/default.nix
rename to pkgs/by-name/oo/ookla-speedtest/package.nix
diff --git a/pkgs/tools/networking/oonf-olsrd2/default.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix
similarity index 100%
rename from pkgs/tools/networking/oonf-olsrd2/default.nix
rename to pkgs/by-name/oo/oonf-olsrd2/package.nix
diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/ooniprobe-cli/default.nix
rename to pkgs/by-name/oo/ooniprobe-cli/package.nix
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/by-name/op/opae/package.nix
similarity index 100%
rename from pkgs/development/libraries/opae/default.nix
rename to pkgs/by-name/op/opae/package.nix
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/by-name/op/opaline/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/opaline/default.nix
rename to pkgs/by-name/op/opaline/package.nix
diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/by-name/op/opam-publish/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/opam-publish/default.nix
rename to pkgs/by-name/op/opam-publish/package.nix
diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/by-name/op/opam2json/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/opam2json/default.nix
rename to pkgs/by-name/op/opam2json/package.nix
diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/by-name/op/opcr-policy/package.nix
similarity index 100%
rename from pkgs/development/tools/opcr-policy/default.nix
rename to pkgs/by-name/op/opcr-policy/package.nix
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/by-name/op/open-dyslexic/package.nix
similarity index 100%
rename from pkgs/data/fonts/open-dyslexic/default.nix
rename to pkgs/by-name/op/open-dyslexic/package.nix
diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/by-name/op/open-ecard/package.nix
similarity index 100%
rename from pkgs/tools/security/open-ecard/default.nix
rename to pkgs/by-name/op/open-ecard/package.nix
diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/by-name/op/open-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/open-fonts/default.nix
rename to pkgs/by-name/op/open-fonts/package.nix
diff --git a/pkgs/applications/video/open-in-mpv/default.nix b/pkgs/by-name/op/open-in-mpv/package.nix
similarity index 100%
rename from pkgs/applications/video/open-in-mpv/default.nix
rename to pkgs/by-name/op/open-in-mpv/package.nix
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/by-name/op/open-isns/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/open-isns/default.nix
rename to pkgs/by-name/op/open-isns/package.nix
diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/by-name/op/open-pdf-sign/package.nix
similarity index 100%
rename from pkgs/tools/misc/open-pdf-sign/default.nix
rename to pkgs/by-name/op/open-pdf-sign/package.nix
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
new file mode 100644
index 000000000000..86f509a8eae3
--- /dev/null
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -0,0 +1,91 @@
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+
+, enableWasmEval ? false
+}:
+
+assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs";
+
+buildGoModule rec {
+  pname = "open-policy-agent";
+  version = "0.70.0";
+
+  src = fetchFromGitHub {
+    owner = "open-policy-agent";
+    repo = "opa";
+    rev = "v${version}";
+    hash = "sha256-7br0rxhVNH+lt+gWwFSuYCBmZMrejLatWJyVNcQ95NA=";
+  };
+
+  vendorHash = null;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  subPackages = [ "." ];
+
+  ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/opa/version.Version=${version}" ];
+
+  tags = lib.optional enableWasmEval (
+    builtins.trace
+      ("Warning: enableWasmEval breaks reproducability, "
+        + "ensure you need wasm evaluation. "
+        + "`opa build` does not need this feature.")
+      "opa_wasm");
+
+  checkFlags = lib.optionals (!enableWasmEval) [
+    "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages"
+  ];
+
+  preCheck = ''
+    # Feed in all but the e2e tests for testing
+    # This is because subPackages above limits what is built to just what we
+    # want but also limits the tests
+    # Also avoid wasm tests on darwin due to wasmtime-go build issues
+    getGoDirs() {
+      go list ./... | grep -v -e e2e ${lib.optionalString stdenv.hostPlatform.isDarwin "-e wasm"}
+    }
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra
+    rm server/server_test.go
+  '';
+
+  postInstall = ''
+    installShellCompletion --cmd opa \
+      --bash <($out/bin/opa completion bash) \
+      --fish <($out/bin/opa completion fish) \
+      --zsh <($out/bin/opa completion zsh)
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/opa --help
+    $out/bin/opa version | grep "Version: ${version}"
+
+    ${lib.optionalString enableWasmEval ''
+      # If wasm is enabled verify it works
+      $out/bin/opa eval -t wasm 'trace("hello from wasm")'
+    ''}
+
+    runHook postInstallCheck
+  '';
+
+  meta = with lib; {
+    mainProgram = "opa";
+    homepage = "https://www.openpolicyagent.org";
+    changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md";
+    description = "General-purpose policy engine";
+    longDescription = ''
+      The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies
+      policy enforcement across the stack. OPA provides a high-level declarative language that let’s you specify policy
+      as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies
+      in microservices, Kubernetes, CI/CD pipelines, API gateways, and more.
+    '';
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lewo jk ];
+  };
+}
diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/by-name/op/open-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/open-sans/default.nix
rename to pkgs/by-name/op/open-sans/package.nix
diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/by-name/op/open-stage-control/package.nix
similarity index 100%
rename from pkgs/applications/audio/open-stage-control/default.nix
rename to pkgs/by-name/op/open-stage-control/package.nix
diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/by-name/op/open-wbo/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/open-wbo/default.nix
rename to pkgs/by-name/op/open-wbo/package.nix
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index b2b92282dc38..d743dda45176 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -2,24 +2,24 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  python3,
+  python311,
   nixosTests,
 }:
 let
   pname = "open-webui";
-  version = "0.3.32";
+  version = "0.3.35";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XpPaMGn+JA3Rq+Eb97IGWMLAR+0pI+ZJRxOTmxIMPZg=";
+    hash = "sha256-H46qoOEajPKRU/Lbd6r7r0vRjWSd7uGoA0deaDv6HSw=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-tAPI/H5/lv+RuDZ68lL/cZHcOs8H6ZxXSwiFvkp0y4A=";
+    npmDepsHash = "sha256-ohWSfwZfC/jfOpnNSqsvMyYnukk3Xa3Tq32PAl8Ds60=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.
@@ -29,6 +29,7 @@ let
     '';
 
     env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox
+    env.ONNXRUNTIME_NODE_INSTALL_CUDA = "skip";
 
     installPhase = ''
       runHook preInstall
@@ -40,7 +41,7 @@ let
     '';
   };
 in
-python3.pkgs.buildPythonApplication rec {
+python311.pkgs.buildPythonApplication rec {
   inherit pname version src;
   pyproject = true;
 
@@ -60,12 +61,13 @@ python3.pkgs.buildPythonApplication rec {
     "pytest-docker"
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python311.pkgs; [
     aiohttp
     alembic
     anthropic
     apscheduler
     argon2-cffi
+    async-timeout
     authlib
     bcrypt
     beautifulsoup4
@@ -84,6 +86,7 @@ python3.pkgs.buildPythonApplication rec {
     flask-cors
     fpdf2
     ftfy
+    qdrant-client
     google-generativeai
     googleapis-common-protos
     langchain
@@ -103,6 +106,7 @@ python3.pkgs.buildPythonApplication rec {
     psycopg2-binary
     pydub
     pyjwt
+    pymdown-extensions
     pymilvus
     pymongo
     pymysql
@@ -124,11 +128,12 @@ python3.pkgs.buildPythonApplication rec {
     unstructured
     uvicorn
     validators
+    xhtml2pdf
     xlrd
     youtube-transcript-api
   ];
 
-  build-system = with python3.pkgs; [ hatchling ];
+  build-system = with python311.pkgs; [ hatchling ];
 
   pythonImportsCheck = [ "open_webui" ];
 
diff --git a/pkgs/games/openarena/Makefile.local b/pkgs/by-name/op/openarena/Makefile.local
similarity index 100%
rename from pkgs/games/openarena/Makefile.local
rename to pkgs/by-name/op/openarena/Makefile.local
diff --git a/pkgs/games/openarena/default.nix b/pkgs/by-name/op/openarena/package.nix
similarity index 100%
rename from pkgs/games/openarena/default.nix
rename to pkgs/by-name/op/openarena/package.nix
diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/by-name/op/openbgpd/package.nix
similarity index 100%
rename from pkgs/servers/openbgpd/default.nix
rename to pkgs/by-name/op/openbgpd/package.nix
diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/by-name/op/openboardview/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/openboardview/default.nix
rename to pkgs/by-name/op/openboardview/package.nix
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/by-name/op/openbox/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/openbox/default.nix
rename to pkgs/by-name/op/openbox/package.nix
diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/pkgs/by-name/op/openbsm/bsm-add-audit_token_to_pid.patch
similarity index 100%
rename from pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
rename to pkgs/by-name/op/openbsm/bsm-add-audit_token_to_pid.patch
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/by-name/op/openbsm/package.nix
similarity index 100%
rename from pkgs/development/libraries/openbsm/default.nix
rename to pkgs/by-name/op/openbsm/package.nix
diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/by-name/op/opencascade-occt/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencascade-occt/default.nix
rename to pkgs/by-name/op/opencascade-occt/package.nix
diff --git a/pkgs/tools/misc/opencbm/default.nix b/pkgs/by-name/op/opencbm/package.nix
similarity index 100%
rename from pkgs/tools/misc/opencbm/default.nix
rename to pkgs/by-name/op/opencbm/package.nix
diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/by-name/op/opencc/package.nix
similarity index 100%
rename from pkgs/tools/text/opencc/default.nix
rename to pkgs/by-name/op/opencc/package.nix
diff --git a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch b/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch
similarity index 100%
rename from pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch
rename to pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch
diff --git a/pkgs/by-name/op/opencl-clang/package.nix b/pkgs/by-name/op/opencl-clang/package.nix
new file mode 100644
index 000000000000..ecd22f70b772
--- /dev/null
+++ b/pkgs/by-name/op/opencl-clang/package.nix
@@ -0,0 +1,112 @@
+{ lib
+, stdenv
+, applyPatches
+, fetchFromGitHub
+, cmake
+, git
+, llvmPackages_14
+, spirv-llvm-translator
+, buildWithPatches ? true
+}:
+
+let
+  addPatches = component: pkg: pkg.overrideAttrs (oldAttrs: {
+    postPatch = oldAttrs.postPatch or "" + ''
+      for p in ${passthru.patchesOut}/${component}/*; do
+        patch -p1 -i "$p"
+      done
+    '';
+  });
+
+  llvmPkgs = llvmPackages_14;
+  inherit (llvmPkgs) llvm;
+  spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
+  libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang;
+
+  passthru = rec {
+    spirv-llvm-translator = spirv-llvm-translator';
+    llvm = addPatches "llvm" llvmPkgs.llvm;
+    libclang = addPatches "clang" llvmPkgs.libclang;
+
+    clang-unwrapped = libclang.out;
+    clang = llvmPkgs.clang.override {
+      cc = clang-unwrapped;
+    };
+
+    patchesOut = stdenv.mkDerivation {
+      pname = "opencl-clang-patches";
+      inherit version src;
+      # Clang patches assume the root is the llvm root dir
+      # but clang root in nixpkgs is the clang sub-directory
+      postPatch = ''
+        for filename in patches/clang/*.patch; do
+          substituteInPlace "$filename" \
+            --replace "a/clang/" "a/" \
+            --replace "b/clang/" "b/"
+        done
+      '';
+
+      installPhase = ''
+        [ -d patches ] && cp -r patches/ $out || mkdir $out
+        mkdir -p $out/clang $out/llvm
+      '';
+    };
+  };
+
+  version = "14.0.0-unstable-2024-07-09";
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "intel";
+      repo = "opencl-clang";
+      # https://github.com/intel/opencl-clang/compare/ocl-open-140
+      rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc";
+      hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8=";
+    };
+
+    patches = [
+      # Build script tries to find Clang OpenCL headers under ${llvm}
+      # Work around it by specifying that directory manually.
+      ./opencl-headers-dir.patch
+    ];
+
+    postPatch = ''
+      # fix not be able to find clang from PATH
+      substituteInPlace cl_headers/CMakeLists.txt \
+        --replace " NO_DEFAULT_PATH" ""
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Uses linker flags that are not supported on Darwin.
+      sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt
+      substituteInPlace CMakeLists.txt \
+        --replace '-Wl,--no-undefined' ""
+    '';
+  };
+in
+
+stdenv.mkDerivation {
+  pname = "opencl-clang";
+  inherit version src;
+
+  nativeBuildInputs = [ cmake git llvm.dev ];
+
+  buildInputs = [ libclang llvm spirv-llvm-translator' ];
+
+  cmakeFlags = [
+    "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}"
+    "-DOPENCL_HEADERS_DIR=${lib.getLib libclang}/lib/clang/${lib.getVersion libclang}/include/"
+
+    "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF"
+    "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}"
+  ];
+
+  inherit passthru;
+
+  meta = with lib; {
+    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 = [ ];
+    platforms = platforms.all;
+    # error: invalid value 'CL3.0' in '-cl-std=CL3.0'
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/by-name/op/opencl-clhpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencl-clhpp/default.nix
rename to pkgs/by-name/op/opencl-clhpp/package.nix
diff --git a/pkgs/by-name/op/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix
new file mode 100644
index 000000000000..90dc1883eb9d
--- /dev/null
+++ b/pkgs/by-name/op/opencl-headers/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, hashcat
+, ocl-icd
+, tesseract
+, testers
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opencl-headers";
+  version = "2024.05.08";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "OpenCL-Headers";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-FXDZa5umNilFPls3g/2aNqJvJOJX2JYfY08/Lfm1H1Q=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  passthru.tests = {
+    inherit ocl-icd tesseract hashcat;
+    pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      moduleNames = [ "OpenCL-Headers" ];
+    };
+  };
+
+  meta = with lib; {
+    description = "Khronos OpenCL headers version ${finalAttrs.version}";
+    homepage = "https://www.khronos.org/registry/cl/";
+    license = licenses.asl20;
+    platforms = platforms.unix ++ platforms.windows;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/by-name/op/openclonk/package.nix
similarity index 100%
rename from pkgs/games/openclonk/default.nix
rename to pkgs/by-name/op/openclonk/package.nix
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/by-name/op/opencollada/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencollada/default.nix
rename to pkgs/by-name/op/opencollada/package.nix
diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/pkgs/by-name/op/opencollada/pcre.patch
similarity index 100%
rename from pkgs/development/libraries/opencollada/pcre.patch
rename to pkgs/by-name/op/opencollada/pcre.patch
diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix
new file mode 100644
index 000000000000..ae89601f8ce3
--- /dev/null
+++ b/pkgs/by-name/op/opencommit/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage rec {
+  pname = "opencommit";
+  version = "3.2.1";
+
+  src = fetchFromGitHub {
+    owner = "di-sukharev";
+    repo = "opencommit";
+    rev = "v${version}";
+    hash = "sha256-+uKb7qhQJEbuatPsewSGgVd5J6WtsrNO+hE59/KZIJI=";
+  };
+
+  npmDepsHash = "sha256-6tzV4iP7YzlbqOTgYf9XoTmIFPSBug0wYDelc6wcbCA=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "AI-powered commit message generator";
+    homepage = "https://www.npmjs.com/package/opencommit";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.matteopacini ];
+    mainProgram = "oco";
+  };
+
+}
diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix
index f78e6a9de933..30a18084aa32 100644
--- a/pkgs/by-name/op/opencomposite/package.nix
+++ b/pkgs/by-name/op/opencomposite/package.nix
@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation {
   pname = "opencomposite";
-  version = "0-unstable-2024-10-02";
+  version = "0-unstable-2024-10-28";
 
   src = fetchFromGitLab {
     owner = "znixian";
     repo = "OpenOVR";
-    rev = "f969a972e9a151de776fa8d1bd6e67056f0a5d5d";
+    rev = "e162c7e9be2521a357fba4bee13af85437a1027b";
     fetchSubmodules = true;
-    hash = "sha256-3Aar7HGhn9nd/EtJoeUbQTkUR16jx946ZXMNDOXSdfQ=";
+    hash = "sha256-+suq0gV8zRDhF3ApnzQCC/5st59VniU6v7TcDdght6Q=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/by-name/op/opencore-amr/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencore-amr/default.nix
rename to pkgs/by-name/op/opencore-amr/package.nix
diff --git a/pkgs/by-name/op/opencorsairlink/package.nix b/pkgs/by-name/op/opencorsairlink/package.nix
new file mode 100644
index 000000000000..e4e1791c8971
--- /dev/null
+++ b/pkgs/by-name/op/opencorsairlink/package.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, pkg-config }:
+
+stdenv.mkDerivation rec {
+  pname = "OpenCorsairLink";
+  version = "unstable-2019-12-23";
+
+  buildInputs = [ libusb1 ];
+  nativeBuildInputs = [ pkg-config ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  src = fetchFromGitHub {
+    owner = "audiohacked";
+    repo = "OpenCorsairLink";
+    rev = "46dbf206e19a40d6de6bd73142ed93bdb26c5c1a";
+    sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld";
+  };
+
+  patches = [
+    # Pull upstream fix for -fno-common toolchain
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/audiohacked/OpenCorsairLink/commit/d600c7ff032a3911d30b039844a31f0b3acfe26a.patch";
+      sha256 = "030rwka5bvf79x6ir18vqb09izhz1crp94x5gqjxwv3b20vvv4kx";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Linux and Mac OS support for the CorsairLink Devices";
+    homepage = "https://github.com/audiohacked/OpenCorsairLink";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [];
+    mainProgram = "OpenCorsairLink.elf";
+  };
+}
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/by-name/op/opencryptoki/package.nix
similarity index 100%
rename from pkgs/tools/security/opencryptoki/default.nix
rename to pkgs/by-name/op/opencryptoki/package.nix
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/by-name/op/openct/package.nix
similarity index 100%
rename from pkgs/development/libraries/openct/default.nix
rename to pkgs/by-name/op/openct/package.nix
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/by-name/op/opendbx/package.nix
similarity index 100%
rename from pkgs/development/libraries/opendbx/default.nix
rename to pkgs/by-name/op/opendbx/package.nix
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/by-name/op/opendkim/package.nix
similarity index 100%
rename from pkgs/development/libraries/opendkim/default.nix
rename to pkgs/by-name/op/opendkim/package.nix
diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/by-name/op/opendmarc/package.nix
similarity index 100%
rename from pkgs/development/libraries/opendmarc/default.nix
rename to pkgs/by-name/op/opendmarc/package.nix
diff --git a/pkgs/games/opendune/default.nix b/pkgs/by-name/op/opendune/package.nix
similarity index 100%
rename from pkgs/games/opendune/default.nix
rename to pkgs/by-name/op/opendune/package.nix
diff --git a/pkgs/games/opendungeons/cmakepaths.patch b/pkgs/by-name/op/opendungeons/cmakepaths.patch
similarity index 100%
rename from pkgs/games/opendungeons/cmakepaths.patch
rename to pkgs/by-name/op/opendungeons/cmakepaths.patch
diff --git a/pkgs/games/opendungeons/fix_link_date_time.patch b/pkgs/by-name/op/opendungeons/fix_link_date_time.patch
similarity index 100%
rename from pkgs/games/opendungeons/fix_link_date_time.patch
rename to pkgs/by-name/op/opendungeons/fix_link_date_time.patch
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/by-name/op/opendungeons/package.nix
similarity index 100%
rename from pkgs/games/opendungeons/default.nix
rename to pkgs/by-name/op/opendungeons/package.nix
diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/by-name/op/openexrid-unstable/openexrid.patch
similarity index 100%
rename from pkgs/development/libraries/openexrid-unstable/openexrid.patch
rename to pkgs/by-name/op/openexrid-unstable/openexrid.patch
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/by-name/op/openexrid-unstable/package.nix
similarity index 100%
rename from pkgs/development/libraries/openexrid-unstable/default.nix
rename to pkgs/by-name/op/openexrid-unstable/package.nix
diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/by-name/op/openfec/package.nix
similarity index 100%
rename from pkgs/development/libraries/openfec/default.nix
rename to pkgs/by-name/op/openfec/package.nix
diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/by-name/op/openfortivpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/openfortivpn/default.nix
rename to pkgs/by-name/op/openfortivpn/package.nix
diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/by-name/op/openfpgaloader/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/openfpgaloader/default.nix
rename to pkgs/by-name/op/openfpgaloader/package.nix
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/by-name/op/openfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/openfx/default.nix
rename to pkgs/by-name/op/openfx/package.nix
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/by-name/op/opengrok/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/opengrok/default.nix
rename to pkgs/by-name/op/opengrok/package.nix
diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/by-name/op/openhmd/package.nix
similarity index 100%
rename from pkgs/development/libraries/openhmd/default.nix
rename to pkgs/by-name/op/openhmd/package.nix
diff --git a/pkgs/development/libraries/openimagedenoise/cuda.patch b/pkgs/by-name/op/openimagedenoise/cuda.patch
similarity index 100%
rename from pkgs/development/libraries/openimagedenoise/cuda.patch
rename to pkgs/by-name/op/openimagedenoise/cuda.patch
diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/by-name/op/openimagedenoise/package.nix
similarity index 100%
rename from pkgs/development/libraries/openimagedenoise/default.nix
rename to pkgs/by-name/op/openimagedenoise/package.nix
diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/by-name/op/openipmi/package.nix
similarity index 100%
rename from pkgs/tools/system/openipmi/default.nix
rename to pkgs/by-name/op/openipmi/package.nix
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/by-name/op/openiscsi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/open-iscsi/default.nix
rename to pkgs/by-name/op/openiscsi/package.nix
diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/by-name/op/openjade/msggen.patch
similarity index 100%
rename from pkgs/tools/text/sgml/openjade/msggen.patch
rename to pkgs/by-name/op/openjade/msggen.patch
diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/by-name/op/openjade/package.nix
similarity index 100%
rename from pkgs/tools/text/sgml/openjade/default.nix
rename to pkgs/by-name/op/openjade/package.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/17/deps.json b/pkgs/by-name/op/openjfx/17/deps.json
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/17/deps.json
rename to pkgs/by-name/op/openjfx/17/deps.json
diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch b/pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch
rename to pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch
diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch b/pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch
rename to pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch
diff --git a/pkgs/by-name/op/openjfx/17/source.json b/pkgs/by-name/op/openjfx/17/source.json
new file mode 100644
index 000000000000..932875548f4b
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/17/source.json
@@ -0,0 +1,6 @@
+{
+  "owner": "openjdk",
+  "repo": "jfx17u",
+  "rev": "17.0.11-ga",
+  "sha256": "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="
+}
diff --git a/pkgs/development/compilers/openjdk/openjfx/21/deps.json b/pkgs/by-name/op/openjfx/21/deps.json
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/21/deps.json
rename to pkgs/by-name/op/openjfx/21/deps.json
diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch b/pkgs/by-name/op/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch
rename to pkgs/by-name/op/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch
diff --git a/pkgs/by-name/op/openjfx/21/source.json b/pkgs/by-name/op/openjfx/21/source.json
new file mode 100644
index 000000000000..adecaa605bcc
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/21/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=",
+  "owner": "openjdk",
+  "repo": "jfx21u",
+  "rev": "21.0.3-ga"
+}
diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/by-name/op/openjfx/23/deps.json
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/22/deps.json
rename to pkgs/by-name/op/openjfx/23/deps.json
diff --git a/pkgs/by-name/op/openjfx/23/source.json b/pkgs/by-name/op/openjfx/23/source.json
new file mode 100644
index 000000000000..a67cd0f370f1
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/23/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-a/ev91Rq7D3z9O56ZZQCgvvbfj5GBt5Lonow2NH3s/E=",
+  "owner": "openjdk",
+  "repo": "jfx23u",
+  "rev": "23-ga"
+}
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
new file mode 100644
index 000000000000..96269280f7b6
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -0,0 +1,208 @@
+{
+  featureVersion ? "17",
+
+  lib,
+  stdenv,
+  pkgs,
+
+  fetchpatch2,
+
+  gradle,
+  gradle_7,
+  perl,
+  pkg-config,
+  cmake,
+  gperf,
+  python3,
+  ruby,
+
+  gtk2,
+  gtk3,
+  libXtst,
+  libXxf86vm,
+  glib,
+  alsa-lib,
+  ffmpeg,
+  ffmpeg-headless,
+
+  writeText,
+
+  _experimental-update-script-combinators,
+  nixpkgs-openjdk-updater,
+  writeShellScript,
+  path,
+
+  withMedia ? true,
+  withWebKit ? false,
+
+  jdk17_headless,
+  jdk21_headless,
+  jdk23_headless,
+  jdk-bootstrap ?
+    {
+      "17" = jdk17_headless;
+      "21" = jdk21_headless;
+      "23" = jdk23_headless;
+    }
+    .${featureVersion},
+}:
+
+let
+  sourceFile = ./. + "/${featureVersion}/source.json";
+  source = nixpkgs-openjdk-updater.openjdkSource {
+    inherit sourceFile;
+    featureVersionPrefix = featureVersion;
+  };
+
+  atLeast21 = lib.versionAtLeast featureVersion "21";
+  atLeast23 = lib.versionAtLeast featureVersion "23";
+
+  gradle_openjfx = if atLeast23 then gradle else gradle_7;
+in
+
+assert lib.assertMsg (lib.pathExists sourceFile)
+  "OpenJFX ${featureVersion} is not a supported version";
+
+stdenv.mkDerivation {
+  pname = "openjfx-modular-sdk";
+  version = lib.removePrefix "refs/tags/" source.src.rev;
+
+  inherit (source) src;
+
+  patches =
+    if featureVersion == "23" then
+      [
+        # 8338701: Provide media support for libavcodec version 61
+        # 
+        (fetchpatch2 {
+          url = "https://github.com/openjdk/jfx23u/commit/aba60fda1c82f00e8e685107592305c403a31287.patch?full_index=1";
+          hash = "sha256-+aRhTwi4VQthAq1SH1jxPl0mTosNMKoTY52jm+jiKso=";
+        })
+      ]
+    else if atLeast21 then
+      [
+        ./21/patches/backport-ffmpeg-7-support-jfx21.patch
+      ]
+    else
+      [
+        ./17/patches/backport-ffmpeg-6-support-jfx11.patch
+        ./17/patches/backport-ffmpeg-7-support-jfx11.patch
+      ];
+
+  nativeBuildInputs = [
+    gradle_openjfx
+    perl
+    pkg-config
+    cmake
+    gperf
+    python3
+    ruby
+  ];
+
+  buildInputs = [
+    gtk2
+    gtk3
+    libXtst
+    libXxf86vm
+    glib
+    alsa-lib
+    (if atLeast21 then ffmpeg else ffmpeg-headless)
+  ];
+
+  mitmCache = gradle_openjfx.fetchDeps {
+    attrPath = "openjfx${featureVersion}";
+    pkg = pkgs."openjfx${featureVersion}".override { withWebKit = true; };
+    data = ./. + "/${featureVersion}/deps.json";
+  };
+
+  gradleBuildTask = "sdk";
+
+  stripDebugList = [ "." ];
+
+  enableParallelBuilding = false;
+
+  __darwinAllowLocalNetworking = true;
+
+  env.config = writeText "gradle.properties" ''
+    CONF = Release
+    JDK_HOME = ${jdk-bootstrap.home}
+    COMPILE_MEDIA = ${lib.boolToString withMedia}
+    COMPILE_WEBKIT = ${lib.boolToString withWebKit}
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  postPatch =
+    lib.optionalString (!atLeast23) ''
+      # Add missing includes for gcc-13 for webkit build:
+      sed -e '1i #include ' \
+        -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \
+           modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
+
+    ''
+    + lib.optionalString (!atLeast21) ''
+      substituteInPlace modules/javafx.web/src/main/native/Source/JavaScriptCore/offlineasm/parser.rb \
+        --replace-fail "File.exists?" "File.exist?"
+
+    ''
+    + ''
+      ln -s $config gradle.properties
+    '';
+
+  preBuild = ''
+    export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
+    export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
+  '';
+
+  installPhase = ''
+    cp -r build/modular-sdk $out
+  '';
+
+  postFixup = ''
+    # Remove references to bootstrap.
+    export openjdkOutPath='${jdk-bootstrap.outPath}'
+    find "$out" -name \*.so | while read lib; do
+      new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
+      patchelf --set-rpath "$new_refs" "$lib"
+    done
+  '';
+
+  disallowedReferences = [
+    jdk-bootstrap
+    gradle_openjfx.jdk
+  ];
+
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    source.updateScript
+
+    {
+      command = [
+        # We need to do this separate script rather than simply using
+        # `finalAttrs.mitmCache.updateScript` because the Gradle update
+        # script captures the source at the time of evaluation, making
+        # it miss the update.
+        (writeShellScript "update-openjfx-deps.sh" ''
+          eval "$(
+            nix-build "$1" \
+            -A openjfx${featureVersion}.mitmCache.updateScript
+          )"
+        '')
+
+        # This has to be a separate argument so that
+        # `maintainers/scripts/update.py` can rewrite it to the
+        # appropriate Git work tree.
+        path
+      ];
+
+      supportedFeatures = [ "silent" ];
+    }
+  ];
+
+  meta = {
+    description = "Next-generation Java client toolkit";
+    homepage = "https://openjdk.org/projects/openjfx/";
+    license = lib.licenses.gpl2Classpath;
+    maintainers = with lib.maintainers; [ abbradar ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/games/openjk/default.nix b/pkgs/by-name/op/openjk/package.nix
similarity index 100%
rename from pkgs/games/openjk/default.nix
rename to pkgs/by-name/op/openjk/package.nix
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/by-name/op/openjpeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/openjpeg/default.nix
rename to pkgs/by-name/op/openjpeg/package.nix
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/by-name/op/openldap/package.nix
similarity index 100%
rename from pkgs/development/libraries/openldap/default.nix
rename to pkgs/by-name/op/openldap/package.nix
diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix
new file mode 100644
index 000000000000..a7c5063e54db
--- /dev/null
+++ b/pkgs/by-name/op/openlibm/package.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "openlibm";
+  version = "0.8.4";
+
+  src = fetchFromGitHub {
+    owner = "JuliaLang";
+    repo = "openlibm";
+    rev = "v${version}";
+    sha256 = "sha256-JhyF93XU2Yd6Ia+JtYvF7Dr+d90r6xMZj/fWDwCNeWY=";
+  };
+
+  makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
+
+  meta = {
+    description = "High quality system independent, portable, open source libm implementation";
+    homepage = "https://openlibm.org/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/games/openlierox/default.nix b/pkgs/by-name/op/openlierox/package.nix
similarity index 100%
rename from pkgs/games/openlierox/default.nix
rename to pkgs/by-name/op/openlierox/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/by-name/op/openmm/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/openmm/default.nix
rename to pkgs/by-name/op/openmm/package.nix
diff --git a/pkgs/applications/science/chemistry/openmolcas/openblasPath.patch b/pkgs/by-name/op/openmolcas/openblasPath.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/openmolcas/openblasPath.patch
rename to pkgs/by-name/op/openmolcas/openblasPath.patch
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
new file mode 100644
index 000000000000..ed3f74e7656a
--- /dev/null
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -0,0 +1,184 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchFromGitHub,
+  cmake,
+  gfortran,
+  perl,
+  blas-ilp64,
+  hdf5-cpp,
+  python3,
+  texliveMinimal,
+  armadillo,
+  libxc,
+  makeWrapper,
+  gsl,
+  boost180,
+  autoPatchelfHook,
+  enableQcmaquis ? false,
+  # Note that the CASPT2 module is broken with MPI
+  # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169
+  enableMpi ? false,
+  mpi,
+  globalarrays,
+}:
+
+assert blas-ilp64.isILP64;
+assert lib.elem blas-ilp64.passthru.implementation [
+  "openblas"
+  "mkl"
+];
+assert enableQcmaquis -> lib.elem blas-ilp64.passthru.implementation "mkl";
+
+let
+  python = python3.withPackages (
+    ps: with ps; [
+      six
+      pyparsing
+      numpy
+      h5py
+    ]
+  );
+  qcmaquisSrc = fetchFromGitHub {
+    owner = "qcscine";
+    repo = "qcmaquis";
+    rev = "release-3.1.4"; # Must match tag in cmake/custom/qcmaquis.cmake
+    hash = "sha256-vhC5k+91IPFxdCi5oYt1NtF9W08RxonJjPpA0ls4I+o=";
+  };
+  nevtp2Src = fetchFromGitHub {
+    owner = "qcscine";
+    repo = "nevpt2";
+    rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake
+    hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0=";
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "openmolcas";
+  version = "24.10";
+
+  src = fetchFromGitLab {
+    owner = "Molcas";
+    repo = "OpenMolcas";
+    rev = "v${version}";
+    hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic=";
+  };
+
+  patches = [
+    # Required to handle openblas multiple outputs
+    ./openblasPath.patch
+
+    # Required for a local QCMaquis build
+    ./qcmaquis.patch
+  ];
+
+  postPatch = ''
+    # Using env fails in the sandbox
+    substituteInPlace Tools/pymolcas/export.py --replace \
+      "/usr/bin/env','python3" "python3"
+
+    # Pointing CMake to local QCMaquis and NEVPT2 archives
+    substituteInPlace cmake/custom/qcmaquis.cmake \
+      --subst-var-by "qcmaquis_src_url" "file://${qcmaquisSrc}"
+
+    substituteInPlace cmake/custom/nevpt2.cmake \
+      --subst-var-by "nevpt2_src_url" "file://${nevtp2Src}"
+  '';
+
+  nativeBuildInputs = [
+    perl
+    gfortran
+    cmake
+    texliveMinimal
+    makeWrapper
+    autoPatchelfHook
+  ];
+
+  buildInputs =
+    [
+      blas-ilp64.passthru.provider
+      hdf5-cpp
+      python
+      armadillo
+      libxc
+      gsl.dev
+      boost180
+    ]
+    ++ lib.optionals enableMpi [
+      mpi
+      globalarrays
+    ];
+
+  passthru = lib.optionalAttrs enableMpi { inherit mpi; };
+
+  cmakeFlags =
+    [
+      "-DOPENMP=ON"
+      "-DTOOLS=ON"
+      "-DHDF5=ON"
+      "-DFDE=ON"
+      "-DEXTERNAL_LIBXC=${lib.getDev libxc}"
+      (lib.strings.cmakeBool "DMRG" enableQcmaquis)
+      (lib.strings.cmakeBool "NEVPT2" enableQcmaquis)
+      "-DCMAKE_SKIP_BUILD_RPATH=ON"
+      (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
+      (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    ]
+    ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [
+      "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}"
+      "-DLINALG=OpenBLAS"
+    ]
+    ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [
+      "-DMKLROOT=${blas-ilp64.passthru.provider}"
+      "-DLINALG=MKL"
+    ]
+    ++ lib.optionals enableMpi [
+      "-DGA=ON"
+      "-DMPI=ON"
+    ];
+
+  preConfigure = lib.optionalString enableMpi ''
+    export GAROOT=${globalarrays};
+  '';
+
+  postConfigure = ''
+    # The Makefile will install pymolcas during the build grrr.
+    mkdir -p $out/bin
+    export PATH=$PATH:$out/bin
+  '';
+
+  postInstall = ''
+    mv $out/pymolcas $out/bin
+    find $out/Tools -type f -exec mv \{} $out/bin \;
+    rm -r $out/Tools
+  '';
+
+  # DMRG executables contain references to /build, however, they are properly
+  # removed by autopatchelf
+  noAuditTmpdir = true;
+
+  postFixup = ''
+    # Wrong store path in shebang (bare Python, no Python pkgs), force manual re-patching
+    for exe in $(find $out/bin/ -type f -name "*.py"); do
+      sed -i "1s:.*:#!${python}/bin/python:" "$exe"
+    done
+
+    wrapProgram $out/bin/pymolcas --set MOLCAS $out
+  '';
+
+  meta = {
+    description = "Advanced quantum chemistry software package";
+    homepage = "https://gitlab.com/Molcas/OpenMolcas";
+    maintainers = [ lib.maintainers.markuskowa ];
+    license = with lib.licenses; [
+      lgpl21Only
+      bsd3
+    ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    mainProgram = "pymolcas";
+  };
+}
diff --git a/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/pkgs/by-name/op/openmolcas/qcmaquis.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch
rename to pkgs/by-name/op/openmolcas/qcmaquis.patch
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/by-name/op/openmpi/package.nix
similarity index 100%
rename from pkgs/development/libraries/openmpi/default.nix
rename to pkgs/by-name/op/openmpi/package.nix
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/by-name/op/openntpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/openntpd/default.nix
rename to pkgs/by-name/op/openntpd/package.nix
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/by-name/op/openobex/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/openobex/default.nix
rename to pkgs/by-name/op/openobex/package.nix
diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/by-name/op/openocd/package.nix
similarity index 100%
rename from pkgs/development/embedded/openocd/default.nix
rename to pkgs/by-name/op/openocd/package.nix
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/by-name/op/openpa/package.nix
similarity index 100%
rename from pkgs/development/libraries/openpa/default.nix
rename to pkgs/by-name/op/openpa/package.nix
diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
index 8bd0e1fb5cb9..08f64ba4547a 100644
--- a/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -2,6 +2,7 @@
 , stdenv
 , rustPlatform
 , fetchFromGitea
+, installShellFiles
 , pkg-config
 , pcsclite
 , dbus
@@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-G5+lVK41hbzy/Ltc0EKoUfqF0M1OYu679jyVjYKJmn0=";
 
-  nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
+  nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ];
 
   buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.PCSC
@@ -37,6 +38,13 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    OCT_COMPLETION_OUTPUT_DIR=$PWD/shell $out/bin/oct
+    installShellCompletion ./shell/oct.{bash,fish} ./shell/_oct
+    OCT_MANPAGE_OUTPUT_DIR=$PWD/man $out/bin/oct
+    installManPage ./man/*.1
+  '';
+
   meta = with lib; {
     description = "Tool for inspecting and configuring OpenPGP cards";
     homepage = "https://codeberg.org/openpgp-card/openpgp-card-tools";
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/by-name/op/openrct2/package.nix
similarity index 100%
rename from pkgs/games/openrct2/default.nix
rename to pkgs/by-name/op/openrct2/package.nix
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/by-name/op/openresolv/package.nix
similarity index 100%
rename from pkgs/tools/networking/openresolv/default.nix
rename to pkgs/by-name/op/openresolv/package.nix
diff --git a/pkgs/applications/misc/openring/default.nix b/pkgs/by-name/op/openring/package.nix
similarity index 100%
rename from pkgs/applications/misc/openring/default.nix
rename to pkgs/by-name/op/openring/package.nix
diff --git a/pkgs/tools/security/openrisk/default.nix b/pkgs/by-name/op/openrisk/package.nix
similarity index 100%
rename from pkgs/tools/security/openrisk/default.nix
rename to pkgs/by-name/op/openrisk/package.nix
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/by-name/op/opensaml-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/opensaml-cpp/default.nix
rename to pkgs/by-name/op/opensaml-cpp/package.nix
diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/by-name/op/opensbi/package.nix
similarity index 100%
rename from pkgs/misc/opensbi/default.nix
rename to pkgs/by-name/op/opensbi/package.nix
diff --git a/pkgs/development/tools/language-servers/openscad-lsp/default.nix b/pkgs/by-name/op/openscad-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/openscad-lsp/default.nix
rename to pkgs/by-name/op/openscad-lsp/package.nix
diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/by-name/op/openseachest/package.nix
similarity index 100%
rename from pkgs/tools/system/openseachest/default.nix
rename to pkgs/by-name/op/openseachest/package.nix
diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix
new file mode 100644
index 000000000000..a537d2a6bfd8
--- /dev/null
+++ b/pkgs/by-name/op/opensearch/package.nix
@@ -0,0 +1,63 @@
+{ coreutils
+, fetchurl
+, gnugrep
+, jre_headless
+, lib
+, makeBinaryWrapper
+, nixosTests
+, stdenv
+, stdenvNoCC
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "opensearch";
+  version = "2.17.1";
+
+  src = fetchurl {
+    url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";
+    hash = "sha256-9m7Vt+x4SPOBAqVL88gufSmqhvAiCcnOi7bL43XzCiU=";
+  };
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    jre_headless
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp -R bin config lib modules plugins $out
+
+    substituteInPlace $out/bin/opensearch \
+      --replace 'bin/opensearch-keystore' "$out/bin/opensearch-keystore"
+
+    wrapProgram $out/bin/opensearch \
+      --prefix PATH : "${lib.makeBinPath [ gnugrep coreutils ]}" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/plugins/opensearch-knn/lib/" \
+      --set JAVA_HOME "${jre_headless}"
+
+    wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}"
+
+    rm $out/bin/opensearch-cli
+
+    runHook postInstall
+  '';
+
+  passthru.tests = nixosTests.opensearch;
+
+  meta = {
+    description = "Open Source, Distributed, RESTful Search Engine";
+    homepage = "https://github.com/opensearch-project/OpenSearch";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ shyim ];
+    platforms = lib.platforms.unix;
+    sourceProvenance = with lib.sourceTypes; [
+      binaryBytecode
+      binaryNativeCode
+    ];
+  };
+})
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/by-name/op/openshift/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/openshift/default.nix
rename to pkgs/by-name/op/openshift/package.nix
diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/by-name/op/openslide/package.nix
similarity index 100%
rename from pkgs/development/libraries/openslide/default.nix
rename to pkgs/by-name/op/openslide/package.nix
diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/by-name/op/openslp/CVE-2016-4912.patch
similarity index 100%
rename from pkgs/development/libraries/openslp/CVE-2016-4912.patch
rename to pkgs/by-name/op/openslp/CVE-2016-4912.patch
diff --git a/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/pkgs/by-name/op/openslp/CVE-2019-5544.patch
similarity index 100%
rename from pkgs/development/libraries/openslp/CVE-2019-5544.patch
rename to pkgs/by-name/op/openslp/CVE-2019-5544.patch
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/by-name/op/openslp/package.nix
similarity index 100%
rename from pkgs/development/libraries/openslp/default.nix
rename to pkgs/by-name/op/openslp/package.nix
diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/by-name/op/opensm/package.nix
similarity index 100%
rename from pkgs/tools/networking/opensm/default.nix
rename to pkgs/by-name/op/opensm/package.nix
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/by-name/op/opensmt/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/opensmt/default.nix
rename to pkgs/by-name/op/opensmt/package.nix
diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch b/pkgs/by-name/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch
rename to pkgs/by-name/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch
diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix
rename to pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix
diff --git a/pkgs/games/opensoldat/default.nix b/pkgs/by-name/op/opensoldat/package.nix
similarity index 100%
rename from pkgs/games/opensoldat/default.nix
rename to pkgs/by-name/op/opensoldat/package.nix
diff --git a/pkgs/tools/text/sgml/opensp/fix-register-storage-class.patch b/pkgs/by-name/op/opensp/fix-register-storage-class.patch
similarity index 100%
rename from pkgs/tools/text/sgml/opensp/fix-register-storage-class.patch
rename to pkgs/by-name/op/opensp/fix-register-storage-class.patch
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/by-name/op/opensp/package.nix
similarity index 100%
rename from pkgs/tools/text/sgml/opensp/default.nix
rename to pkgs/by-name/op/opensp/package.nix
diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/by-name/op/opensp/setup-hook.sh
similarity index 100%
rename from pkgs/tools/text/sgml/opensp/setup-hook.sh
rename to pkgs/by-name/op/opensp/setup-hook.sh
diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/by-name/op/openspecfun/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/openspecfun/default.nix
rename to pkgs/by-name/op/openspecfun/package.nix
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/by-name/op/openspin/package.nix
similarity index 100%
rename from pkgs/development/compilers/openspin/default.nix
rename to pkgs/by-name/op/openspin/package.nix
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/by-name/op/opensubdiv/package.nix
similarity index 100%
rename from pkgs/development/libraries/opensubdiv/default.nix
rename to pkgs/by-name/op/opensubdiv/package.nix
diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/by-name/op/opensupaplex/package.nix
similarity index 100%
rename from pkgs/games/opensupaplex/default.nix
rename to pkgs/by-name/op/opensupaplex/package.nix
diff --git a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix
index 1f47665155e2..caf5439ca6ee 100644
--- a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix
+++ b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix
@@ -5,17 +5,17 @@
 }:
 buildGoModule rec {
   pname = "ocb";
-  version = "0.101.0";
+  version = "0.112.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "cmd/builder/v${version}";
-    hash = "sha256-Ucp00OjyPtHA6so/NOzTLtPSuhXwz6A2708w2WIZb/E=";
+    hash = "sha256-0eL9J+PrURiNkL6CzUIlcvjyZor8iS9vKX8j0srLlZ8=";
   };
 
   sourceRoot = "${src.name}/cmd/builder";
-  vendorHash = "sha256-MTwD9xkrq3EudppLSoONgcPCBWlbSmaODLH9NtYgVOk=";
+  vendorHash = "sha256-vZsGSLdzKa4sA/N3RG6Kwn8tMoIIhPJ6uAkM4pheitU=";
 
   CGO_ENABLED = 0;
   ldflags = [
@@ -24,10 +24,12 @@ buildGoModule rec {
     "-X go.opentelemetry.io/collector/cmd/builder/internal.version=${version}"
   ];
 
-  # The TestGenerateAndCompile tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping.
-  checkFlags = [ "-skip TestGenerateAndCompile" ];
+  # Some tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping.
+  checkFlags = [
+    "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning"
+  ];
 
-  # Rename the to ocb (it's generated as "builder")
+  # Rename to ocb (it's generated as "builder")
   postInstall = ''
     mv $out/bin/builder $out/bin/ocb
   '';
diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
new file mode 100644
index 000000000000..03211c593a3c
--- /dev/null
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -0,0 +1,183 @@
+{ stdenv
+, lib
+, buildGoModule
+, fetchFromGitHub
+, makeWrapper
+, coreutils
+, runCommand
+, runtimeShell
+, writeText
+, terraform-providers
+, installShellFiles
+}:
+
+let
+  package =  buildGoModule rec {
+    pname = "opentofu";
+    version = "1.8.5";
+
+    src = fetchFromGitHub {
+      owner = "opentofu";
+      repo = "opentofu";
+      rev = "v${version}";
+      hash = "sha256-sZGKM6Dxz0bZkHIITujojSsKtRD4E+q1uReWRg5EfC8=";
+    };
+
+    vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";
+    ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ];
+
+    postConfigure = ''
+      # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
+      substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
+        --replace-fail "/bin/stty" "${coreutils}/bin/stty"
+    '';
+
+    nativeBuildInputs = [ installShellFiles ];
+    patches = [ ./provider-path-0_15.patch ];
+
+    passthru = {
+      inherit full plugins withPlugins;
+      tests = { inherit opentofu_plugins_test; };
+    };
+
+    # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8
+    postInstall = ''
+      installShellCompletion --bash --name tofu <(echo complete -C tofu tofu)
+    '';
+
+    preCheck = ''
+      export HOME=$TMPDIR
+      export TF_SKIP_REMOTE_TESTS=1
+    '';
+
+    subPackages = [ "./cmd/..." ];
+
+    meta = with lib; {
+      description = "Tool for building, changing, and versioning infrastructure";
+      homepage = "https://opentofu.org/";
+      changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md";
+      license = licenses.mpl20;
+      maintainers = with maintainers; [
+        nickcao
+        zowoq
+      ];
+      mainProgram = "tofu";
+    };
+  };
+
+  full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
+
+  opentofu_plugins_test = let
+    mainTf = writeText "main.tf" ''
+      terraform {
+        required_providers {
+          random = {
+            source  = "registry.terraform.io/hashicorp/random"
+          }
+        }
+      }
+
+      resource "random_id" "test" {}
+    '';
+    opentofu = package.withPlugins (p: [ p.random ]);
+    test = runCommand "opentofu-plugin-test" {
+      buildInputs = [ opentofu ];
+    } ''
+      # make it fail outside of sandbox
+      export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
+      cp ${mainTf} main.tf
+      tofu init
+      touch $out
+    '';
+  in
+    test;
+
+  plugins = removeAttrs terraform-providers [
+    "override"
+    "overrideDerivation"
+    "recurseForDerivations"
+  ];
+
+  withPlugins = plugins:
+    let
+      actualPlugins = plugins package.plugins;
+
+      # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
+      wrapperInputs = lib.unique (lib.flatten
+        (lib.catAttrs "propagatedBuildInputs"
+          (builtins.filter (x: x != null) actualPlugins)));
+
+      passthru = {
+        withPlugins = newplugins:
+          withPlugins (x: newplugins x ++ actualPlugins);
+
+        # Expose wrappers around the override* functions of the terraform
+        # derivation.
+        #
+        # Note that this does not behave as anyone would expect if plugins
+        # are specified. The overrides are not on the user-visible wrapper
+        # derivation but instead on the function application that eventually
+        # generates the wrapper. This means:
+        #
+        # 1. When using overrideAttrs, only `passthru` attributes will
+        #    become visible on the wrapper derivation. Other overrides that
+        #    modify the derivation *may* still have an effect, but it can be
+        #    difficult to follow.
+        #
+        # 2. Other overrides may work if they modify the terraform
+        #    derivation, or they may have no effect, depending on what
+        #    exactly is being changed.
+        #
+        # 3. Specifying overrides on the wrapper is unsupported.
+        #
+        # See nixpkgs#158620 for details.
+        overrideDerivation = f:
+          (package.overrideDerivation f).withPlugins plugins;
+        overrideAttrs = f:
+          (package.overrideAttrs f).withPlugins plugins;
+        override = x:
+          (package.override x).withPlugins plugins;
+      };
+      # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
+      # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
+    in
+      if actualPlugins == [ ] then
+        package.overrideAttrs
+          (orig: { passthru = orig.passthru // passthru; })
+      else
+        lib.appendToName "with-plugins" (stdenv.mkDerivation {
+          inherit (package) meta pname version;
+          nativeBuildInputs = [ makeWrapper ];
+
+          # Expose the passthru set with the override functions
+          # defined above, as well as any passthru values already
+          # set on `terraform` at this point (relevant in case a
+          # user overrides attributes).
+          passthru = package.passthru // passthru;
+
+          buildCommand = ''
+            # Create wrappers for terraform plugins because Terraform only
+            # walks inside of a tree of files.
+            for providerDir in ${toString actualPlugins}
+            do
+              for file in $(find $providerDir/libexec/terraform-providers -type f)
+              do
+                relFile=''${file#$providerDir/}
+                mkdir -p $out/$(dirname $relFile)
+                cat < $out/$relFile
+            #!${runtimeShell}
+            exec "$file" "$@"
+            WRAPPER
+                chmod +x $out/$relFile
+              done
+            done
+
+            # Create a wrapper for opentofu to point it to the plugins dir.
+            mkdir -p $out/bin/
+            makeWrapper "${package}/bin/tofu" "$out/bin/tofu" \
+              --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \
+              --prefix PATH : "${lib.makeBinPath wrapperInputs}"
+          '';
+        });
+in
+package
diff --git a/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch b/pkgs/by-name/op/opentofu/provider-path-0_15.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch
rename to pkgs/by-name/op/opentofu/provider-path-0_15.patch
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/by-name/op/opentracing-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/opentracing-cpp/default.nix
rename to pkgs/by-name/op/opentracing-cpp/package.nix
diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/by-name/op/opentracker/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/opentracker/default.nix
rename to pkgs/by-name/op/opentracker/package.nix
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/by-name/op/opentsdb/package.nix
similarity index 100%
rename from pkgs/tools/misc/opentsdb/default.nix
rename to pkgs/by-name/op/opentsdb/package.nix
diff --git a/pkgs/by-name/op/opentype-sanitizer/package.nix b/pkgs/by-name/op/opentype-sanitizer/package.nix
index 00d61a6b32d6..3319b20f1e10 100644
--- a/pkgs/by-name/op/opentype-sanitizer/package.nix
+++ b/pkgs/by-name/op/opentype-sanitizer/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentype-sanitizer";
-  version = "9.1.0";
+  version = "9.2.0";
 
   src = fetchFromGitHub {
     owner = "khaledhosny";
     repo = "ots";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gsNMPNPcfHyOgjJnIrJ5tLYHbCfIfTowEhcaGOUPb2Q=";
+    hash = "sha256-QRbF2GUDQsp8i6qVYlafSb9HaaozRuJ8dn1mhMMLeLc=";
   };
 
   mesonFlags = [ "-Dcpp_std=c++14" ];
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/by-name/op/opentyrian/package.nix
similarity index 100%
rename from pkgs/games/opentyrian/default.nix
rename to pkgs/by-name/op/opentyrian/package.nix
diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix
index 38411adb4ea2..1ab75103433c 100644
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvas-scanner";
-  version = "23.9.0";
+  version = "23.10.0";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vdqIM0qkCpOjohmMP245Og87wOmejlCBEIceBfwEB8U=";
+    hash = "sha256-5eXw9buGln2of4wumPUFloguCvru9at4pUEb1FVYzoM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openvas-smb/package.nix b/pkgs/by-name/op/openvas-smb/package.nix
index cc6297628329..66d6de69b5d4 100644
--- a/pkgs/by-name/op/openvas-smb/package.nix
+++ b/pkgs/by-name/op/openvas-smb/package.nix
@@ -1,16 +1,17 @@
-{ fetchFromGitHub
-, fetchurl
-, lib
-, stdenv
-, cmake
-, git
-, pkg-config
-, glib
-, gnutls
-, perl
-, heimdal
-, popt
-, libunistring
+{
+  fetchFromGitHub,
+  fetchurl,
+  lib,
+  stdenv,
+  cmake,
+  git,
+  pkg-config,
+  glib,
+  gnutls,
+  perl,
+  heimdal,
+  popt,
+  libunistring,
 }:
 let
   heimdalConfigHeader = fetchurl {
@@ -66,6 +67,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ mi-ael ];
     mainProgram = "wmic";
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
new file mode 100644
index 000000000000..21372f8aea4c
--- /dev/null
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -0,0 +1,187 @@
+{ lib
+, gcc12Stdenv
+, fetchFromGitHub
+, fetchurl
+, cudaSupport ? opencv.cudaSupport or false
+
+# build
+, scons
+, addDriverRunpath
+, autoPatchelfHook
+, cmake
+, git
+, libarchive
+, patchelf
+, pkg-config
+, python3Packages
+, shellcheck
+
+# runtime
+, flatbuffers
+, gflags
+, level-zero
+, libusb1
+, libxml2
+, ocl-icd
+, opencv
+, protobuf
+, pugixml
+, snappy
+, tbb_2021_5
+, cudaPackages
+}:
+
+let
+  inherit (lib)
+    cmakeBool
+  ;
+
+  stdenv = gcc12Stdenv;
+
+  # prevent scons from leaking in the default python version
+  scons' = scons.override { inherit python3Packages; };
+
+  tbbbind_version = "2_5";
+  tbbbind = fetchurl {
+    url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz";
+    hash = "sha256-Tr8wJGUweV8Gb7lhbmcHxrF756ZdKdNRi1eKdp3VTuo=";
+  };
+
+  python = python3Packages.python.withPackages (ps: with ps; [
+    cython
+    distutils
+    pybind11
+    setuptools
+    sphinx
+    wheel
+  ]);
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "openvino";
+  version = "2024.4.1";
+
+  src = fetchFromGitHub {
+    owner = "openvinotoolkit";
+    repo = "openvino";
+    rev = "refs/tags/${version}";
+    fetchSubmodules = true;
+    hash = "sha256-v0PPGFUHCGNWdlTff40Ol2NvaYglb/+L/zZAQujk6lk=";
+  };
+
+  outputs = [
+    "out"
+    "python"
+  ];
+
+  nativeBuildInputs = [
+    addDriverRunpath
+    autoPatchelfHook
+    cmake
+    git
+    libarchive
+    patchelf
+    pkg-config
+    python
+    scons'
+    shellcheck
+  ] ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
+
+  postPatch = ''
+    mkdir -p temp/tbbbind_${tbbbind_version}
+    pushd temp/tbbbind_${tbbbind_version}
+    bsdtar -xf ${tbbbind}
+    echo "${tbbbind.url}" > ie_dependency.info
+    popd
+  '';
+
+  dontUseSconsCheck = true;
+  dontUseSconsBuild = true;
+  dontUseSconsInstall = true;
+
+  cmakeFlags = [
+    "-Wno-dev"
+    "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake"
+    "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}"
+    "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/"
+    "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "-DPython_EXECUTABLE=${python.interpreter}"
+
+    (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
+    (cmakeBool "NCC_SYLE" false)
+    (cmakeBool "BUILD_TESTING" false)
+    (cmakeBool "ENABLE_CPPLINT" false)
+    (cmakeBool "ENABLE_TESTING" false)
+    (cmakeBool "ENABLE_SAMPLES" false)
+
+    # features
+    (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64)
+    (cmakeBool "ENABLE_INTEL_NPU" false) # undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
+    (cmakeBool "ENABLE_JS" false)
+    (cmakeBool "ENABLE_LTO" true)
+    (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false)
+    (cmakeBool "ENABLE_OPENCV" true)
+    (cmakeBool "ENABLE_PYTHON" true)
+
+    # system libs
+    (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true)
+    (cmakeBool "ENABLE_SYSTEM_OPENCL" true)
+    (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false)
+    (cmakeBool "ENABLE_SYSTEM_PUGIXML" true)
+    (cmakeBool "ENABLE_SYSTEM_SNAPPY" true)
+    (cmakeBool "ENABLE_SYSTEM_TBB" true)
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libngraph_backend.so"
+  ];
+
+  buildInputs = [
+    flatbuffers
+    gflags
+    level-zero
+    libusb1
+    libxml2
+    ocl-icd
+    opencv.cxxdev
+    pugixml
+    snappy
+    tbb_2021_5
+  ] ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $python
+    mv $out/python/* $python/
+    rmdir $out/python
+  '';
+
+  postFixup = ''
+    # Link to OpenCL
+    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+      addDriverRunpath "$lib"
+    done
+  '';
+
+  meta = with lib; {
+    description = "OpenVINO™ Toolkit repository";
+    longDescription = ''
+      This toolkit allows developers to deploy pre-trained deep learning models through a high-level C++ Inference Engine API integrated with application logic.
+
+      This open source version includes several components: namely Model Optimizer, nGraph and Inference Engine, as well as CPU, GPU, MYRIAD,
+      multi device and heterogeneous plugins to accelerate deep learning inferencing on Intel® CPUs and Intel® Processor Graphics.
+      It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*.
+    '';
+    homepage = "https://docs.openvinotoolkit.org/";
+    license = with licenses; [ asl20 ];
+    platforms = platforms.all;
+    broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk
+    maintainers = with maintainers; [ tfmoraes ];
+  };
+}
diff --git a/pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch b/pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch
new file mode 100644
index 000000000000..bd289b0965ae
--- /dev/null
+++ b/pkgs/by-name/op/openvpn3/0001-build-reduce-hardcode-in-asio_path.patch
@@ -0,0 +1,46 @@
+From 30b2528054e6627a7124ac04cb018356ef23d864 Mon Sep 17 00:00:00 2001
+From: Petr Portnov 
+Date: Mon, 2 Sep 2024 22:25:33 +0300
+Subject: [PATCH 1/1] build: reduce hardcode in `asio_path`
+
+Currently, `asio_path` variable value is concatenated with `/asio/include`
+to specify the path to custom `asio` installation.
+The problem is that this is too strict as some distros (namely NixOS)
+may have the `include` directory with a differently named parent.
+Thus this change minimizes the hardcoded part of the path to make it more flexible.
+
+Signed-off-by: Petr Portnov 
+---
+ meson.build       | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index c9e0a2d..c01eb8e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -74,7 +74,7 @@ endif
+ #
+ #  Setup additional include header dirs
+ #
+-asio_inc = get_option('asio_path') / 'asio' / 'include'
++asio_inc = get_option('asio_path') / 'include'
+ message ('ASIO library: ' + asio_inc)
+ 
+ openvpn3_core_inc = get_option('openvpn3_core_path')
+diff --git a/meson_options.txt b/meson_options.txt
+index d9cf02e..43e301e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -26,7 +26,7 @@ option('debug_options', type: 'boolean', value: false,
+ #
+ #  Build environment and related build time options
+ #
+-option('asio_path', type: 'string', value: './vendor/asio',
++option('asio_path', type: 'string', value: './vendor/asio/asio',
+        description: 'Path to the ASIO header files')
+ 
+ option('openvpn3_core_path', type: 'string', value: './openvpn3-core',
+-- 
+2.43.0
+
diff --git a/pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch b/pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch
new file mode 100644
index 000000000000..535f522fa64b
--- /dev/null
+++ b/pkgs/by-name/op/openvpn3/0002-build-allow-installation-directories-customization.patch
@@ -0,0 +1,115 @@
+From 848cc46d05c203de393d75434a3f571d78687f50 Mon Sep 17 00:00:00 2001
+From: Petr Portnov 
+Date: Sun, 22 Sep 2024 13:16:02 +0300
+Subject: [PATCH] build: allow installation directories' customization
+
+This allows to configure the installation directories
+for systemd and D-Bus files.
+
+Signed-off-by: Petr Portnov 
+---
+ distro/systemd/meson.build |  9 +++++++--
+ meson.build                | 12 ++++++++++--
+ meson_options.txt          | 12 ++++++++++++
+ src/configmgr/meson.build  | 10 ++++++----
+ 4 files changed, 35 insertions(+), 8 deletions(-)
+
+diff --git a/distro/systemd/meson.build b/distro/systemd/meson.build
+index 36d556c..9c636b6 100644
+--- a/distro/systemd/meson.build
++++ b/distro/systemd/meson.build
+@@ -15,12 +15,17 @@ systemd_cfg = configuration_data({
+ 
+ systemd_service_cfg = dependency('systemd')
+ 
++systemd_system_unit_dir = get_option('systemd_system_unit_dir')
++if systemd_system_unit_dir == ''
++  systemd_system_unit_dir = systemd_service_cfg.get_variable('systemdsystemunitdir')
++endif
++
+ configure_file(
+     input: 'openvpn3-autoload.service.in',
+     output: 'openvpn3-autoload.service',
+     configuration: systemd_cfg,
+     install: true,
+-    install_dir: systemd_service_cfg.get_variable('systemdsystemunitdir'),
++    install_dir: systemd_system_unit_dir,
+ )
+ 
+ configure_file(
+@@ -28,7 +33,7 @@ configure_file(
+     output: 'openvpn3-session@.service',
+     configuration: systemd_cfg,
+     install: true,
+-    install_dir: systemd_service_cfg.get_variable('systemdsystemunitdir'),
++    install_dir: systemd_system_unit_dir,
+ )
+ 
+ custom_target('openvpn3-systemd',
+diff --git a/meson.build b/meson.build
+index 586c72a..ba41440 100644
+--- a/meson.build
++++ b/meson.build
+@@ -203,8 +203,16 @@ message('OpenVPN 3 Linux service binary directory: ' + get_option('prefix') / li
+ 
+ #
+ #  D-Bus configuration
+-dbus_policy_dir = dep_dbus.get_variable('datadir') / 'dbus-1' / 'system.d'
+-dbus_service_dir = dep_dbus.get_variable('system_bus_services_dir')
++dbus_policy_dir = get_option('dbus_policy_dir')
++if dbus_policy_dir == ''
++    dbus_policy_dir = dep_dbus.get_variable('datadir') / 'dbus-1' / 'system.d'
++endif
++
++dbus_service_dir = get_option('dbus_system_service_dir')
++if dbus_service_dir == ''
++    dbus_service_dir = dep_dbus.get_variable('system_bus_services_dir')
++endif
++
+ dbus_config = {
+     'OPENVPN_USERNAME': get_option('openvpn_username'),
+     'LIBEXEC_PATH': get_option('prefix') / libexec_dir,
+diff --git a/meson_options.txt b/meson_options.txt
+index 43e301e..04809df 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -93,6 +93,18 @@ option('use-legacy-polkit-pkla', type: 'feature', value: 'disabled',
+ option('polkit_pkla_rulesdir', type: 'string', value: '',
+        description: 'Override PolicyKit PKLA rules directory')
+ 
++#
++# Installation
++#
++option('dbus_policy_dir', type: 'string',
++       description: 'D-Bus policy directory')
++option('dbus_system_service_dir', type: 'string',
++       description: 'D-Bus system service directory')
++option('systemd_system_unit_dir', type: 'string',
++       description: 'Path to systemd system unit directory')
++option('create_statedir', type: 'feature', value: 'enabled',
++       description: 'Create directory for OpenVPN 3 state during install phase')
++
+ #
+ #  Testing tools
+ #
+diff --git a/src/configmgr/meson.build b/src/configmgr/meson.build
+index 5d0a649..6f788b7 100644
+--- a/src/configmgr/meson.build
++++ b/src/configmgr/meson.build
+@@ -52,7 +52,9 @@ configure_file(
+     install_dir: dbus_service_dir,
+ )
+ 
+-# Create the configs directory for persistent configuration profiles
+-# NOTE: Can be replaced with install_emptydir() when Meson 0.60 or newer
+-#       is available on all supported distros
+-meson.add_install_script('sh','-c', 'mkdir -p $DESTDIR@0@'.format(openvpn3_statedir / 'configs'))
++if get_option('create_statedir').enabled()
++    # Create the configs directory for persistent configuration profiles
++    # NOTE: Can be replaced with install_emptydir() when Meson 0.60 or newer
++    #       is available on all supported distros
++    meson.add_install_script('sh','-c', 'mkdir -p $DESTDIR@0@'.format(openvpn3_statedir / 'configs'))
++endif
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
new file mode 100644
index 000000000000..b1c18f5fe011
--- /dev/null
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -0,0 +1,135 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  asio,
+  glib,
+  jsoncpp,
+  libcap_ng,
+  libnl,
+  libuuid,
+  lz4,
+  openssl,
+  pkg-config,
+  protobuf,
+  python3,
+  systemd,
+  tinyxml-2,
+  wrapGAppsHook3,
+  gobject-introspection,
+  meson,
+  ninja,
+  gdbuspp,
+  cmake,
+  git,
+  enableSystemdResolved ? true,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openvpn3";
+  # also update openvpn3-core
+  version = "23";
+
+  src = fetchFromGitHub {
+    owner = "OpenVPN";
+    repo = "openvpn3-linux";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-5gkutqyUPZDwRPzSFdUXg2G5mtQKbdhZu8xnNAdXoF0=";
+    # `openvpn3-core` is a submodule.
+    # TODO: make it into a separate package
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # Merged in upstream, will land in v24
+    # https://github.com/OpenVPN/openvpn3-linux/commit/75abb7dc9366ba85fb1a144d88f02a1e8a62f538
+    ./0001-build-reduce-hardcode-in-asio_path.patch
+    ./0002-build-allow-installation-directories-customization.patch
+  ];
+
+  postPatch = ''
+    echo '#define OPENVPN_VERSION "3.git:unknown:unknown"
+    #define PACKAGE_GUIVERSION "v${builtins.replaceStrings [ "_" ] [ ":" ] version}"
+    #define PACKAGE_NAME "openvpn3-linux"
+    ' > ./src/build-version.h
+
+    patchShebangs \
+      ./scripts \
+      ./src/python/{openvpn2,openvpn3-as,openvpn3-autoload} \
+      ./distro/systemd/openvpn3-systemd \
+      ./src/tests/dbus/netcfg-subscription-test \
+      ./src/shell/bash-completion/gen-openvpn2-completion.py
+  '';
+
+  pythonPath = python3.withPackages (ps: [
+    ps.dbus-python
+    ps.pygobject3
+    ps.systemd
+  ]);
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    cmake
+    git
+
+    python3.pkgs.wrapPython
+    python3.pkgs.docutils
+    python3.pkgs.jinja2
+    python3.pkgs.dbus-python
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    asio
+    glib
+    jsoncpp
+    libcap_ng
+    libnl
+    libuuid
+    lz4
+    openssl
+    protobuf
+    tinyxml-2
+    gdbuspp
+  ] ++ lib.optionals enableSystemdResolved [ systemd.dev ];
+
+  mesonFlags = [
+    (lib.mesonOption "selinux" "disabled")
+    (lib.mesonOption "selinux_policy" "disabled")
+    (lib.mesonOption "bash-completion" "enabled")
+    (lib.mesonOption "test_programs" "disabled")
+    (lib.mesonOption "unit_tests" "disabled")
+    (lib.mesonOption "asio_path" "${asio}")
+    (lib.mesonOption "dbus_policy_dir" "${placeholder "out"}/share/dbus-1/system.d")
+    (lib.mesonOption "dbus_system_service_dir" "${placeholder "out"}/share/dbus-1/system-services")
+    (lib.mesonOption "systemd_system_unit_dir" "${placeholder "out"}/lib/systemd/system")
+    (lib.mesonOption "create_statedir" "disabled")
+    (lib.mesonOption "sharedstatedir" "/etc")
+  ];
+
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+  postFixup = ''
+    wrapPythonPrograms
+    wrapPythonProgramsIn "$out/libexec/openvpn3-linux" "$out ${pythonPath}"
+  '';
+
+  NIX_LDFLAGS = "-lpthread";
+
+  meta = {
+    description = "OpenVPN 3 Linux client";
+    license = lib.licenses.agpl3Plus;
+    homepage = "https://github.com/OpenVPN/openvpn3-linux/";
+    changelog = "https://github.com/OpenVPN/openvpn3-linux/releases/tag/v${version}";
+    maintainers = with lib.maintainers; [
+      shamilton
+      progrm_jarvis
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/by-name/op/openwsman/package.nix
similarity index 100%
rename from pkgs/development/libraries/openwsman/default.nix
rename to pkgs/by-name/op/openwsman/package.nix
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/by-name/op/openxr-loader/package.nix
similarity index 100%
rename from pkgs/development/libraries/openxr-loader/default.nix
rename to pkgs/by-name/op/openxr-loader/package.nix
diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/by-name/op/openzone-cursors/package.nix
similarity index 100%
rename from pkgs/data/themes/openzone/default.nix
rename to pkgs/by-name/op/openzone-cursors/package.nix
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/by-name/op/openzwave/package.nix
similarity index 100%
rename from pkgs/development/libraries/openzwave/default.nix
rename to pkgs/by-name/op/openzwave/package.nix
diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix
new file mode 100644
index 000000000000..a6f2cf3d4f08
--- /dev/null
+++ b/pkgs/by-name/op/opera/package.nix
@@ -0,0 +1,146 @@
+{ alsa-lib
+, atk
+, cairo
+, cups
+, curl
+, dbus
+, dpkg
+, expat
+, fetchurl
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, gtk3
+, gtk4
+, lib
+, libX11
+, libxcb
+, libXScrnSaver
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXrandr
+, libXrender
+, libXtst
+, libdrm
+, libnotify
+, libpulseaudio
+, libuuid
+, libxshmfence
+, mesa
+, nspr
+, nss
+, pango
+, stdenv
+, systemd
+, at-spi2-atk
+, at-spi2-core
+, autoPatchelfHook
+, wrapGAppsHook3
+, qt6
+, proprietaryCodecs ? false
+, vivaldi-ffmpeg-codecs
+}:
+
+let
+  mirror = "https://get.geo.opera.com/pub/opera/desktop";
+in
+stdenv.mkDerivation rec {
+  pname = "opera";
+  version = "114.0.5282.102";
+
+  src = fetchurl {
+    url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
+    hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8=";
+  };
+
+  unpackPhase = "dpkg-deb -x $src .";
+
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+    wrapGAppsHook3
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig.lib
+    freetype
+    gdk-pixbuf
+    glib
+    gtk3
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    libdrm
+    libnotify
+    libuuid
+    libxcb
+    libxshmfence
+    mesa
+    nspr
+    nss
+    pango
+    (lib.getLib stdenv.cc.cc)
+    qt6.qtbase
+  ];
+
+  runtimeDependencies = [
+    # Works fine without this except there is no sound.
+    libpulseaudio.out
+
+    # This is a little tricky. Without it the app starts then crashes. Then it
+    # brings up the crash report, which also crashes. `strace -f` hints at a
+    # missing libudev.so.0.
+    (lib.getLib systemd)
+
+    # Error at startup:
+    # "Illegal instruction (core dumped)"
+    gtk3
+    gtk4
+  ] ++ lib.optionals proprietaryCodecs [
+    vivaldi-ffmpeg-codecs
+  ];
+
+  dontWrapQtApps = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r usr $out
+    cp -r usr/share $out/share
+
+    # we already using QT6, autopatchelf wants to patch this as well
+    rm $out/usr/lib/x86_64-linux-gnu/opera/libqt5_shim.so
+    ln -s $out/usr/bin/opera $out/bin/opera
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.opera.com";
+    description = "Faster, safer and smarter web browser";
+    platforms = [ "x86_64-linux" ];
+    license = licenses.unfree;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ kindrowboat ];
+  };
+}
diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/by-name/op/operator-sdk/package.nix
similarity index 100%
rename from pkgs/development/tools/operator-sdk/default.nix
rename to pkgs/by-name/op/operator-sdk/package.nix
diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/by-name/op/opkg-utils/package.nix
similarity index 100%
rename from pkgs/tools/package-management/opkg-utils/default.nix
rename to pkgs/by-name/op/opkg-utils/package.nix
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/by-name/op/opkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/opkg/default.nix
rename to pkgs/by-name/op/opkg/package.nix
diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/by-name/op/oppai-ng/package.nix
similarity index 100%
rename from pkgs/tools/misc/oppai-ng/default.nix
rename to pkgs/by-name/op/oppai-ng/package.nix
diff --git a/pkgs/applications/virtualization/ops/default.nix b/pkgs/by-name/op/ops/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/ops/default.nix
rename to pkgs/by-name/op/ops/package.nix
diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/by-name/op/opsdroid/package.nix
similarity index 100%
rename from pkgs/applications/networking/opsdroid/default.nix
rename to pkgs/by-name/op/opsdroid/package.nix
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/by-name/op/optar/package.nix
similarity index 100%
rename from pkgs/tools/graphics/optar/default.nix
rename to pkgs/by-name/op/optar/package.nix
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/by-name/op/optipng/package.nix
similarity index 100%
rename from pkgs/tools/graphics/optipng/default.nix
rename to pkgs/by-name/op/optipng/package.nix
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/by-name/op/opusTools/package.nix
similarity index 100%
rename from pkgs/applications/audio/opus-tools/default.nix
rename to pkgs/by-name/op/opusTools/package.nix
diff --git a/pkgs/applications/audio/opusfile/disable-cert-store.patch b/pkgs/by-name/op/opusfile/disable-cert-store.patch
similarity index 100%
rename from pkgs/applications/audio/opusfile/disable-cert-store.patch
rename to pkgs/by-name/op/opusfile/disable-cert-store.patch
diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/by-name/op/opusfile/include-multistream.patch
similarity index 100%
rename from pkgs/applications/audio/opusfile/include-multistream.patch
rename to pkgs/by-name/op/opusfile/include-multistream.patch
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/by-name/op/opusfile/package.nix
similarity index 100%
rename from pkgs/applications/audio/opusfile/default.nix
rename to pkgs/by-name/op/opusfile/package.nix
diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/by-name/op/opustags/package.nix
similarity index 100%
rename from pkgs/applications/audio/opustags/default.nix
rename to pkgs/by-name/op/opustags/package.nix
diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/by-name/oq/oq/package.nix
similarity index 100%
rename from pkgs/development/tools/oq/default.nix
rename to pkgs/by-name/oq/oq/package.nix
diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix
new file mode 100644
index 000000000000..c97b17a60a89
--- /dev/null
+++ b/pkgs/by-name/or/oracle-instantclient/package.nix
@@ -0,0 +1,149 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, fixDarwinDylibNames
+, unzip
+, libaio
+, makeWrapper
+, odbcSupport ? true
+, unixODBC
+}:
+
+assert odbcSupport -> unixODBC != null;
+
+let
+  inherit (lib) optional optionals optionalString;
+
+  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
+
+  # assemble list of components
+  components = [ "basic" "sdk" "sqlplus" "tools" ] ++ optional odbcSupport "odbc";
+
+  # determine the version number, there might be different ones per architecture
+  version = {
+    x86_64-linux = "21.10.0.0.0";
+    aarch64-linux = "19.10.0.0.0";
+    x86_64-darwin = "19.8.0.0.0";
+  }.${stdenv.hostPlatform.system} or throwSystem;
+
+  directory = {
+    x86_64-linux = "2110000";
+    aarch64-linux = "191000";
+    x86_64-darwin = "198000";
+  }.${stdenv.hostPlatform.system} or throwSystem;
+
+  # hashes per component and architecture
+  hashes = {
+    x86_64-linux = {
+      basic = "sha256-uo0QBOmx7TQyroD+As60IhjEkz//+0Cm1tWvLI3edaE=";
+      sdk = "sha256-TIBFi1jHLJh+SUNFvuL7aJpxh61hG6gXhFIhvdPgpts=";
+      sqlplus = "sha256-mF9kLjhZXe/fasYDfmZrYPL2CzAp3xDbi624RJDA4lM=";
+      tools = "sha256-ay8ynzo1fPHbCg9GoIT5ja//iZPIZA2yXI/auVExiRY=";
+      odbc = "sha256-3M6/cEtUrIFzQay8eHNiLGE+L0UF+VTmzp4cSBcrzlk=";
+    };
+    aarch64-linux = {
+      basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY=";
+      sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw=";
+      sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q=";
+      tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M=";
+      odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms=";
+    };
+    x86_64-darwin = {
+      basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc=";
+      sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw=";
+      sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk=";
+      tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU=";
+      odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY=";
+    };
+  }.${stdenv.hostPlatform.system} or throwSystem;
+
+  # rels per component and architecture, optional
+  rels = { }.${stdenv.hostPlatform.system} or { };
+
+  # convert platform to oracle architecture names
+  arch = {
+    x86_64-linux = "linux.x64";
+    aarch64-linux = "linux.arm64";
+    x86_64-darwin = "macos.x64";
+  }.${stdenv.hostPlatform.system} or throwSystem;
+
+  shortArch = {
+    x86_64-linux = "linux";
+    aarch64-linux = "linux";
+    x86_64-darwin = "mac";
+  }.${stdenv.hostPlatform.system} or throwSystem;
+
+  # calculate the filename of a single zip file
+  srcFilename = component: arch: version: rel:
+    "instantclient-${component}-${arch}-${version}" +
+    (optionalString (rel != "") "-${rel}") +
+    "dbru.zip"; # ¯\_(ツ)_/¯
+
+  # fetcher for the non clickthrough artifacts
+  fetcher = srcFilename: hash: fetchurl {
+    url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/${directory}/${srcFilename}";
+    sha256 = hash;
+  };
+
+  # assemble srcs
+  srcs = map
+    (component:
+      (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or ""))
+    components;
+
+  pname = "oracle-instantclient";
+  extLib = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+stdenv.mkDerivation {
+  inherit pname version srcs;
+
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ]
+    ++ optional stdenv.hostPlatform.isLinux libaio
+    ++ optional odbcSupport unixODBC;
+
+  nativeBuildInputs = [ makeWrapper unzip ]
+    ++ optional stdenv.hostPlatform.isLinux autoPatchelfHook
+    ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+
+  outputs = [ "out" "dev" "lib" ];
+
+  unpackCmd = "unzip $curSrc";
+
+  installPhase = ''
+    mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib
+    install -Dm755 {adrci,genezi,uidrvci,sqlplus,exp,expdp,imp,impdp} $out/bin
+
+    # cp to preserve symlinks
+    cp -P *${extLib}* $lib/lib
+
+    install -Dm644 *.jar $out/share/java
+    install -Dm644 sdk/include/* $out/include
+    install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo
+
+    # provide alias
+    ln -sfn $out/bin/sqlplus $out/bin/sqlplus64
+  '';
+
+  postFixup = optionalString stdenv.hostPlatform.isDarwin ''
+    for exe in "$out/bin/"* ; do
+      if [ ! -L "$exe" ]; then
+        install_name_tool -add_rpath "$lib/lib" "$exe"
+      fi
+    done
+  '';
+
+  meta = with lib; {
+    description = "Oracle instant client libraries and sqlplus CLI";
+    longDescription = ''
+      Oracle instant client provides access to Oracle databases (OCI,
+      OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus
+      command line SQL client.
+    '';
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ dylanmtaylor ];
+    hydraPlatforms = [ ];
+  };
+}
diff --git a/pkgs/data/icons/oranchelo-icon-theme/default.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/oranchelo-icon-theme/default.nix
rename to pkgs/by-name/or/oranchelo-icon-theme/package.nix
diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/by-name/or/oranda/package.nix
similarity index 100%
rename from pkgs/applications/misc/oranda/default.nix
rename to pkgs/by-name/or/oranda/package.nix
diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/by-name/or/oras/package.nix
similarity index 100%
rename from pkgs/development/tools/oras/default.nix
rename to pkgs/by-name/or/oras/package.nix
diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index 6e9cee2539fe..b1bcb193e322 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -4,32 +4,27 @@
 
 buildGoModule rec {
   pname = "orbiton";
-  version = "2.65.12";
+  version = "2.67.1";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
     rev = "v${version}";
-    hash = "sha256-1KVw2dj//6vwUUj1jVWe2J/9F6J8BQsvCAEbJZnW26c=";
+    hash = "sha256-/5USD588kr3uB/Zs1ASKVgxH4kAWZCNBrZL7qqx49gU=";
   };
 
   vendorHash = null;
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace Makefile \
-      --replace "-Wl,--as-needed" ""
-
-    # Requires impure pbcopy and pbpaste
-    substituteInPlace v2/pbcopy_test.go \
-      --replace TestPBcopy SkipTestPBcopy
-  '';
-
   nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];
 
   buildInputs = lib.optional withGui vte;
 
   preBuild = "cd v2";
 
+  checkFlags = [
+    "-skip=TestPBcopy" # Requires impure pbcopy and pbpaste
+  ];
+
   postInstall = ''
     cd ..
     installManPage o.1
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/by-name/or/orbitron/package.nix
similarity index 100%
rename from pkgs/data/fonts/orbitron/default.nix
rename to pkgs/by-name/or/orbitron/package.nix
diff --git a/pkgs/development/embedded/orbuculum/default.nix b/pkgs/by-name/or/orbuculum/package.nix
similarity index 100%
rename from pkgs/development/embedded/orbuculum/default.nix
rename to pkgs/by-name/or/orbuculum/package.nix
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/by-name/or/orc/package.nix
similarity index 100%
rename from pkgs/development/compilers/orc/default.nix
rename to pkgs/by-name/or/orc/package.nix
diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/by-name/or/orca-c/package.nix
similarity index 100%
rename from pkgs/applications/audio/orca-c/default.nix
rename to pkgs/by-name/or/orca-c/package.nix
diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch
index 5f5feacb33a5..8f713de296d6 100644
--- a/pkgs/by-name/or/orca/fix-paths.patch
+++ b/pkgs/by-name/or/orca/fix-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/orca/debug.py b/src/orca/debug.py
-index eb939a236..4e4db2e84 100644
+index e17e2333e..595c8489d 100644
 --- a/src/orca/debug.py
 +++ b/src/orca/debug.py
-@@ -522,7 +522,7 @@ def traceit(frame, event, arg):
+@@ -529,7 +529,7 @@ def traceit(frame, event, arg):
      return traceit
  
  def getOpenFDCount(pid):
@@ -11,7 +11,7 @@ index eb939a236..4e4db2e84 100644
      procs = procs.decode('UTF-8').split('\n')
      files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
  
-@@ -540,7 +540,7 @@ def getCmdline(pid):
+@@ -547,7 +547,7 @@ def getCmdline(pid):
      return cmdline
  
  def pidOf(procName):
@@ -21,10 +21,10 @@ index eb939a236..4e4db2e84 100644
                                  stdout=subprocess.PIPE).stdout
      pids = openFile.read()
 diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
-index c6f99de14..2370204f3 100755
+index c3b23dec2..320597ae6 100755
 --- a/src/orca/orca_bin.py.in
 +++ b/src/orca/orca_bin.py.in
-@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
+@@ -63,7 +63,7 @@ class ListApps(argparse.Action):
                  name = "[DEAD]"
  
              try:
@@ -33,7 +33,7 @@ index c6f99de14..2370204f3 100755
              except Exception:
                  cmdline = '(exception encountered)'
              else:
-@@ -195,7 +195,7 @@ def inGraphicalDesktop():
+@@ -199,7 +199,7 @@ def inGraphicalDesktop():
  def otherOrcas():
      """Returns the pid of any other instances of Orca owned by this user."""
  
@@ -43,19 +43,19 @@ index c6f99de14..2370204f3 100755
                                  stdout=subprocess.PIPE).stdout
      pids = openFile.read()
 diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
-index c45cd4a5b..3f2ec59f0 100644
+index 48c0dead5..8a4a04e74 100644
 --- a/src/orca/orca_modifier_manager.py
 +++ b/src/orca/orca_modifier_manager.py
-@@ -115,7 +115,7 @@ class OrcaModifierManager:
+@@ -200,7 +200,7 @@ class OrcaModifierManager:
          debug.printMessage(debug.LEVEL_INFO, msg, True)
  
          self.unset_orca_modifiers(reason)
--        self._original_xmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
-+        self._original_xmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
+-        p = subprocess.Popen(['xkbcomp', os.environ['DISPLAY'], '-'],
++        p = subprocess.Popen(['@xkbcomp@', os.environ['DISPLAY'], '-'],
+             stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+         self._original_xmodmap, _ = p.communicate()
          self._create_orca_xmodmap()
- 
-     def update_key_map(self, keyboard_event):
-@@ -162,7 +162,7 @@ class OrcaModifierManager:
+@@ -232,7 +232,7 @@ class OrcaModifierManager:
              return
  
          self._caps_lock_cleared = False
@@ -64,7 +64,7 @@ index c45cd4a5b..3f2ec59f0 100644
              stdin=subprocess.PIPE, stdout=None, stderr=None)
          p.communicate(self._original_xmodmap)
  
-@@ -223,7 +223,7 @@ class OrcaModifierManager:
+@@ -293,7 +293,7 @@ class OrcaModifierManager:
          if modified:
              msg = "ORCA MODIFIER MANAGER: Updating xmodmap"
              debug.printMessage(debug.LEVEL_INFO, msg, True)
diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 3670d6b52077..4acbd6492b25 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -28,13 +28,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "orca";
-  version = "46.2";
+  version = "47.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-j2MpmxpPnDCFfCKfapzhbyxD6u6pD7+QkxTKi7c+/V4=";
+    hash = "sha256-0H16zehWVUaXOp8pcwcy8xcmq2vJ3Mzq0uEgTX2ARO0=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/by-name/or/orcania/package.nix
similarity index 100%
rename from pkgs/development/libraries/orcania/default.nix
rename to pkgs/by-name/or/orcania/package.nix
diff --git a/pkgs/by-name/or/orchis-theme/package.nix b/pkgs/by-name/or/orchis-theme/package.nix
new file mode 100644
index 000000000000..e8524c981d3b
--- /dev/null
+++ b/pkgs/by-name/or/orchis-theme/package.nix
@@ -0,0 +1,67 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, gtk3
+, gnome-themes-extra
+, gtk-engine-murrine
+, sassc
+, border-radius ? null # Suggested: 2 < value < 16
+, tweaks ? [ ] # can be "solid" "compact" "black" "primary" "macos" "submenu" "nord|dracula"
+, withWallpapers ? false
+}:
+
+let
+  pname = "orchis-theme";
+
+  validTweaks = [ "solid" "compact" "black" "primary" "macos" "submenu" "nord" "dracula" ];
+
+  nordXorDracula = with builtins; lib.assertMsg (!(elem "nord" tweaks) || !(elem "dracula" tweaks)) ''
+    ${pname}: dracula and nord cannot be mixed. Tweaks ${toString tweaks}
+  '';
+in
+
+assert nordXorDracula;
+lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
+
+stdenvNoCC.mkDerivation
+rec {
+  inherit pname;
+  version = "2024-11-03";
+
+  src = fetchFromGitHub {
+    repo = "Orchis-theme";
+    owner = "vinceliuice";
+    rev = version;
+    hash = "sha256-K8FiS1AiFMhVaz2Jbr0pudQJGqpwBkQ/4NZdZACtM9Q=";
+  };
+
+  nativeBuildInputs = [ gtk3 sassc ];
+
+  buildInputs = [ gnome-themes-extra ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  preInstall = ''
+    mkdir -p $out/share/themes
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    bash install.sh -d $out/share/themes -t all \
+      ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
+      ${lib.optionalString (border-radius != null) ("--round " + builtins.toString border-radius + "px")}
+    ${lib.optionalString withWallpapers ''
+      mkdir -p $out/share/backgrounds
+      cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds
+    ''}
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Material Design theme for GNOME/GTK based desktop environments";
+    homepage = "https://github.com/vinceliuice/Orchis-theme";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.fufexan ];
+  };
+}
diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix
index 96e6dc775ae8..be912f31fe91 100644
--- a/pkgs/by-name/or/ord/package.nix
+++ b/pkgs/by-name/or/ord/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ord";
-  version = "0.20.1";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "ordinals";
     repo = "ord";
     rev = version;
-    hash = "sha256-gnwlNDgYEcqbwflQAvPb92pJ8kOpiPHB1co7QyMJ/xA=";
+    hash = "sha256-k2SG1PPU14Q8X6F+w5xRbEZuW5hpCPvCci3x175Utc0=";
   };
 
-  cargoHash = "sha256-6Phq3buWE+jHWrYsIhV9u5RTGtKqYkkyb/RjrdX1ETw=";
+  cargoHash = "sha256-oJecSINVjcoV8Ew8W53wjihOsF9lrQ78tNpRjfhyew8=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/tools/misc/org-stats/default.nix b/pkgs/by-name/or/org-stats/package.nix
similarity index 100%
rename from pkgs/tools/misc/org-stats/default.nix
rename to pkgs/by-name/or/org-stats/package.nix
diff --git a/pkgs/tools/misc/org-stats/version.patch b/pkgs/by-name/or/org-stats/version.patch
similarity index 100%
rename from pkgs/tools/misc/org-stats/version.patch
rename to pkgs/by-name/or/org-stats/version.patch
diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/by-name/or/orion/package.nix
similarity index 100%
rename from pkgs/data/themes/orion/default.nix
rename to pkgs/by-name/or/orion/package.nix
diff --git a/pkgs/tools/security/orjail/default.nix b/pkgs/by-name/or/orjail/package.nix
similarity index 100%
rename from pkgs/tools/security/orjail/default.nix
rename to pkgs/by-name/or/orjail/package.nix
diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/by-name/or/orocos-kdl/package.nix
similarity index 100%
rename from pkgs/development/libraries/orocos-kdl/default.nix
rename to pkgs/by-name/or/orocos-kdl/package.nix
diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/by-name/or/orogene/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/orogene/default.nix
rename to pkgs/by-name/or/orogene/package.nix
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/by-name/or/ortp/package.nix
similarity index 100%
rename from pkgs/development/libraries/ortp/default.nix
rename to pkgs/by-name/or/ortp/package.nix
diff --git a/pkgs/tools/compression/orz/default.nix b/pkgs/by-name/or/orz/package.nix
similarity index 100%
rename from pkgs/tools/compression/orz/default.nix
rename to pkgs/by-name/or/orz/package.nix
diff --git a/pkgs/by-name/os/os-prober/package.nix b/pkgs/by-name/os/os-prober/package.nix
new file mode 100644
index 000000000000..cfe673bd58f6
--- /dev/null
+++ b/pkgs/by-name/os/os-prober/package.nix
@@ -0,0 +1,75 @@
+{ lib, stdenv, fetchFromGitLab, makeWrapper, nixosTests,
+# optional dependencies, the command(s) they provide
+coreutils,  # mktemp
+grub2,      # grub-mount and grub-probe
+cryptsetup, # cryptsetup
+libuuid,    # blkid and blockdev
+systemd,    # udevadm
+ntfs3g,     # ntfs3g
+dmraid,     # dmraid
+lvm2        # lvs
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.83";
+  pname = "os-prober";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "installer-team";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-cTufM82YE1L7d3kIOtncICInBPEw4o4NzQXB4uDrMKI=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  installPhase = ''
+    # executables
+    install -Dt $out/bin os-prober linux-boot-prober
+    install -Dt $out/lib newns
+    install -Dt $out/share common.sh
+
+    # probes
+    case "${stdenv.hostPlatform.system}" in
+        i686*|x86_64*) ARCH=x86;;
+        powerpc*) ARCH=powerpc;;
+        arm*) ARCH=arm;;
+        *) ARCH=other;;
+    esac;
+    for probes in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+      install -Dt $out/lib/$probes $probes/common/*;
+      if [ -e "$probes/$ARCH" ]; then
+        mkdir -p $out/lib/$probes
+        cp -r $probes/$ARCH/* $out/lib/$probes;
+      fi;
+    done
+    if [ $ARCH = "x86" ]; then
+        cp -r os-probes/mounted/powerpc/20macosx $out/lib/os-probes/mounted;
+    fi;
+  '';
+  postFixup = ''
+    for file in $(find $out  -type f ! -name newns) ; do
+      substituteInPlace $file \
+        --replace /usr/share/os-prober/ $out/share/ \
+        --replace /usr/lib/os-probes/ $out/lib/os-probes/ \
+        --replace /usr/lib/linux-boot-probes/ $out/lib/linux-boot-probes/ \
+        --replace /usr/lib/os-prober/ $out/lib/
+    done;
+    for file in $out/bin/*; do
+      wrapProgram $file \
+        --suffix PATH : ${lib.makeBinPath [ grub2 systemd coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \
+        --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
+    done;
+  '';
+
+  passthru.tests = {
+    os-prober = nixosTests.os-prober;
+  };
+  meta = with lib; {
+    description = "Utility to detect other OSs on a set of drives";
+    homepage = "http://packages.debian.org/source/sid/os-prober";
+    license = licenses.gpl2Plus;
+    mainProgram = "os-prober";
+    maintainers = with maintainers; [ symphorien ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/by-name/os/oscclip/package.nix
similarity index 100%
rename from pkgs/tools/misc/oscclip/default.nix
rename to pkgs/by-name/os/oscclip/package.nix
diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/by-name/os/osdlyrics/package.nix
similarity index 100%
rename from pkgs/applications/audio/osdlyrics/default.nix
rename to pkgs/by-name/os/osdlyrics/package.nix
diff --git a/pkgs/development/tools/oshka/default.nix b/pkgs/by-name/os/oshka/package.nix
similarity index 100%
rename from pkgs/development/tools/oshka/default.nix
rename to pkgs/by-name/os/oshka/package.nix
diff --git a/pkgs/by-name/os/osi/package.nix b/pkgs/by-name/os/osi/package.nix
new file mode 100644
index 000000000000..cb83b2141819
--- /dev/null
+++ b/pkgs/by-name/os/osi/package.nix
@@ -0,0 +1,44 @@
+{ stdenv, lib, fetchFromGitHub, gfortran, pkg-config
+, blas, zlib, bzip2, coin-utils
+, withGurobi ? false, gurobi
+, withCplex ? false, cplex }:
+
+stdenv.mkDerivation rec {
+  pname = "osi";
+  version = "0.108.11";
+
+  src = fetchFromGitHub {
+    owner = "coin-or";
+    repo = "Osi";
+    rev = "releases/${version}";
+    hash = "sha256-3aTO7JGEOP/RCOZ1X9b68rrtv6T78euf1TYGTjyXSRE=";
+  };
+
+  buildInputs =
+    [ blas zlib bzip2 coin-utils ]
+    ++ lib.optional withGurobi gurobi
+    ++ lib.optional withCplex cplex;
+  nativeBuildInputs = [ gfortran pkg-config ];
+  configureFlags =
+    lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ]
+    ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ];
+
+  NIX_LDFLAGS =
+    lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}";
+
+  # Compile errors
+  env.NIX_CFLAGS_COMPILE = "-Wno-cast-qual";
+  hardeningDisable = [ "format" ];
+
+  enableParallelBuilding = true;
+
+  passthru = { inherit withGurobi withCplex; };
+
+  meta = with lib; {
+    description = "Abstract base class to a generic linear programming (LP) solver";
+    homepage = "https://github.com/coin-or/Osi";
+    license = licenses.epl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/by-name/os/osinfo-db-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/osinfo-db-tools/default.nix
rename to pkgs/by-name/os/osinfo-db-tools/package.nix
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/by-name/os/osinfo-db/package.nix
similarity index 100%
rename from pkgs/data/misc/osinfo-db/default.nix
rename to pkgs/by-name/os/osinfo-db/package.nix
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/by-name/os/osm-gps-map/package.nix
similarity index 100%
rename from pkgs/development/libraries/osm-gps-map/default.nix
rename to pkgs/by-name/os/osm-gps-map/package.nix
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/by-name/os/osm2xmap/package.nix
similarity index 100%
rename from pkgs/applications/misc/osm2xmap/default.nix
rename to pkgs/by-name/os/osm2xmap/package.nix
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/by-name/os/osmctools/package.nix
similarity index 100%
rename from pkgs/applications/misc/osmctools/default.nix
rename to pkgs/by-name/os/osmctools/package.nix
diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/by-name/os/osmid/package.nix
similarity index 100%
rename from pkgs/applications/audio/osmid/default.nix
rename to pkgs/by-name/os/osmid/package.nix
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/by-name/os/osmium-tool/package.nix
similarity index 100%
rename from pkgs/applications/misc/osmium-tool/default.nix
rename to pkgs/by-name/os/osmium-tool/package.nix
diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/by-name/os/osmo-bsc/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-bsc/default.nix
rename to pkgs/by-name/os/osmo-bsc/package.nix
diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/by-name/os/osmo-bts/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-bts/default.nix
rename to pkgs/by-name/os/osmo-bts/package.nix
diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/by-name/os/osmo-ggsn/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-ggsn/default.nix
rename to pkgs/by-name/os/osmo-ggsn/package.nix
diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/by-name/os/osmo-hlr/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-hlr/default.nix
rename to pkgs/by-name/os/osmo-hlr/package.nix
diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-hnbgw/default.nix
rename to pkgs/by-name/os/osmo-hnbgw/package.nix
diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-hnodeb/default.nix
rename to pkgs/by-name/os/osmo-hnodeb/package.nix
diff --git a/pkgs/by-name/os/osmo-iuh/package.nix b/pkgs/by-name/os/osmo-iuh/package.nix
new file mode 100644
index 000000000000..d4044ac512fd
--- /dev/null
+++ b/pkgs/by-name/os/osmo-iuh/package.nix
@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libosmocore
+, lksctp-tools
+, libosmo-netif
+, libosmo-sccp
+, libasn1c
+, python3
+}:
+
+let
+  inherit (stdenv.hostPlatform) isLinux;
+in
+
+stdenv.mkDerivation rec {
+  pname = "osmo-iuh";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "osmocom";
+    repo = "osmo-iuh";
+    rev = version;
+    hash = "sha256-3ADn0GSoXPXL1gD79JjD2hXNBN/v8aaEKgf5qFNGEJs=";
+  };
+
+  prePatch = ''
+    substituteInPlace src/../asn1/utils/asn1tostruct.py  \
+      --replace '#!/usr/bin/env python3' '#!${python3}/bin/python3'
+  '';
+
+  postPatch = ''
+    echo "${version}" > .tarball-version
+  '';
+
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    libosmocore
+    lksctp-tools
+    libosmo-netif
+    libosmo-sccp
+    libasn1c
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Osmocom IuH library";
+    homepage = "https://osmocom.org/projects/osmohnbgw/wiki";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix
new file mode 100644
index 000000000000..47ec9bdaf8fe
--- /dev/null
+++ b/pkgs/by-name/os/osmo-mgw/package.nix
@@ -0,0 +1,52 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libosmocore
+, libosmo-netif
+, libosmoabis
+}:
+
+let
+  inherit (stdenv.hostPlatform) isLinux;
+in
+
+stdenv.mkDerivation rec {
+  pname = "osmo-mgw";
+  version = "1.13.1";
+
+  src = fetchFromGitHub {
+    owner = "osmocom";
+    repo = "osmo-mgw";
+    rev = version;
+    hash = "sha256-krVXADmSjPnkGiIOijaUMilSyK6uHGlyuvI9WwTnLrk=";
+  };
+
+  postPatch = ''
+    echo "${version}" > .tarball-version
+  '';
+
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libosmocore
+    libosmo-netif
+    libosmoabis
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Osmocom Media Gateway (MGW). speaks RTP and E1 as well as MGCP";
+    mainProgram = "osmo-mgw";
+    homepage = "https://osmocom.org/projects/osmo-mgw";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/by-name/os/osmo-msc/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-msc/default.nix
rename to pkgs/by-name/os/osmo-msc/package.nix
diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/by-name/os/osmo-pcu/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-pcu/default.nix
rename to pkgs/by-name/os/osmo-pcu/package.nix
diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix
new file mode 100644
index 000000000000..9b71a9e1927d
--- /dev/null
+++ b/pkgs/by-name/os/osmo-sgsn/package.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libosmocore
+, libosmoabis
+, libosmo-netif
+, osmo-hlr
+, osmo-ggsn
+, c-ares
+}:
+
+let
+  inherit (stdenv.hostPlatform) isLinux;
+in
+
+stdenv.mkDerivation rec {
+  pname = "osmo-sgsn";
+  version = "1.12.1";
+
+  src = fetchFromGitHub {
+    owner = "osmocom";
+    repo = "osmo-sgsn";
+    rev = version;
+    hash = "sha256-tcGnsLsVJohxaSfMbGfkHcBhLpbTZbXM+KWe2j34qeo=";
+  };
+
+  postPatch = ''
+    echo "${version}" > .tarball-version
+  '';
+
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libosmocore
+    libosmoabis
+    libosmo-netif
+    osmo-hlr
+    osmo-ggsn
+    c-ares
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Osmocom implementation of the 3GPP Serving GPRS Support Node (SGSN)";
+    homepage = "https://osmocom.org/projects/osmosgsn";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
+    mainProgram = "osmo-sgsn";
+  };
+}
diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-sip-connector/default.nix
rename to pkgs/by-name/os/osmo-sip-connector/package.nix
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/by-name/os/osmo/package.nix
similarity index 100%
rename from pkgs/applications/office/osmo/default.nix
rename to pkgs/by-name/os/osmo/package.nix
diff --git a/pkgs/applications/misc/osmtogeojson/package-lock.json b/pkgs/by-name/os/osmtogeojson/package-lock.json
similarity index 100%
rename from pkgs/applications/misc/osmtogeojson/package-lock.json
rename to pkgs/by-name/os/osmtogeojson/package-lock.json
diff --git a/pkgs/applications/misc/osmtogeojson/default.nix b/pkgs/by-name/os/osmtogeojson/package.nix
similarity index 100%
rename from pkgs/applications/misc/osmtogeojson/default.nix
rename to pkgs/by-name/os/osmtogeojson/package.nix
diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/by-name/os/ospd-openvas/package.nix
similarity index 100%
rename from pkgs/tools/security/ospd-openvas/default.nix
rename to pkgs/by-name/os/ospd-openvas/package.nix
diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/by-name/os/osqp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/osqp/default.nix
rename to pkgs/by-name/os/osqp/package.nix
diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/by-name/os/osslsigncode/package.nix
similarity index 100%
rename from pkgs/development/tools/osslsigncode/default.nix
rename to pkgs/by-name/os/osslsigncode/package.nix
diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/by-name/os/ossutil/package.nix
similarity index 100%
rename from pkgs/tools/admin/ossutil/default.nix
rename to pkgs/by-name/os/ossutil/package.nix
diff --git a/pkgs/tools/misc/ostree-rs-ext/Cargo.lock b/pkgs/by-name/os/ostree-rs-ext/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/ostree-rs-ext/Cargo.lock
rename to pkgs/by-name/os/ostree-rs-ext/Cargo.lock
diff --git a/pkgs/tools/misc/ostree-rs-ext/default.nix b/pkgs/by-name/os/ostree-rs-ext/package.nix
similarity index 100%
rename from pkgs/tools/misc/ostree-rs-ext/default.nix
rename to pkgs/by-name/os/ostree-rs-ext/package.nix
diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix
new file mode 100644
index 000000000000..fd09015f67c7
--- /dev/null
+++ b/pkgs/by-name/os/ostree/package.nix
@@ -0,0 +1,140 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, gtk-doc
+, gobject-introspection
+, gjs
+, nixosTests
+, pkgsCross
+, curl
+, glib
+, systemd
+, xz
+, e2fsprogs
+, libsoup
+, glib-networking
+, wrapGAppsNoGuiHook
+, gpgme
+, which
+, makeWrapper
+, autoconf
+, automake
+, libtool
+, fuse3
+, util-linuxMinimal
+, libselinux
+, libsodium
+, libarchive
+, libcap
+, bzip2
+, bison
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_42
+, python3
+}:
+
+let
+  testPython = python3.withPackages (p: with p; [
+    pyyaml
+  ]);
+in stdenv.mkDerivation rec {
+  pname = "ostree";
+  version = "2024.8";
+
+  outputs = [ "out" "dev" "man" "installedTests" ];
+
+  src = fetchurl {
+    url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
+    sha256 = "sha256-4hNuEWZp8RT/c0nxLimfY8C+znM0UWSUFKjc2FuGPD8=";
+  };
+
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkg-config
+    gtk-doc
+    gobject-introspection
+    which
+    makeWrapper
+    bison
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+    wrapGAppsNoGuiHook
+  ];
+
+  buildInputs = [
+    curl
+    glib
+    systemd
+    e2fsprogs
+    libsoup
+    glib-networking
+    gpgme
+    fuse3
+    libselinux
+    libsodium
+    libcap
+    libarchive
+    bzip2
+    xz
+    util-linuxMinimal # for libmount
+
+    # for installed tests
+    testPython
+    gjs
+  ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-curl"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
+    "--enable-installed-tests"
+    "--with-ed25519-libsodium"
+  ];
+
+  makeFlags = [
+    "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree"
+    "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
+    # Setting this flag was required as workaround for a clang bug, but seems not relevant anymore.
+    # https://github.com/ostreedev/ostree/commit/fd8795f3874d623db7a82bec56904648fe2c1eb7
+    # See also Makefile-libostree.am
+    "INTROSPECTION_SCANNER_ENV="
+  ];
+
+  preConfigure = ''
+    env NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  postFixup = let
+    typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [
+      (placeholder "out")
+      gobject-introspection
+    ];
+  in ''
+    for test in $installedTests/libexec/installed-tests/libostree/*.js; do
+      wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}"
+    done
+  '';
+
+  passthru = {
+    tests = {
+      musl = pkgsCross.musl64.ostree;
+      installedTests = nixosTests.installed-tests.ostree;
+    };
+  };
+
+  meta = with lib; {
+    description = "Git for operating system binaries";
+    homepage = "https://ostreedev.github.io/ostree/";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
diff --git a/pkgs/data/fonts/ostrich-sans/default.nix b/pkgs/by-name/os/ostrich-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/ostrich-sans/default.nix
rename to pkgs/by-name/os/ostrich-sans/package.nix
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index a2523df7853c..6bd569a4b33f 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -15,6 +15,7 @@
   libglvnd,
   xorg,
   udev,
+  vulkan-loader,
 }:
 
 buildDotnetModule rec {
@@ -57,6 +58,9 @@ buildDotnetModule rec {
     # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action
     # [verbose]: SDL error log [debug]: Failed loading libudev.so.1: libudev.so.1: cannot open shared object file: No such file or directory
     udev
+
+    # needed for vulkan renderer, can fall back to opengl if omitted
+    vulkan-loader
   ];
 
   executables = [ "osu!" ];
diff --git a/pkgs/tools/security/osv-detector/default.nix b/pkgs/by-name/os/osv-detector/package.nix
similarity index 100%
rename from pkgs/tools/security/osv-detector/default.nix
rename to pkgs/by-name/os/osv-detector/package.nix
diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
new file mode 100644
index 000000000000..3426e424ea95
--- /dev/null
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, osv-scanner
+}:
+
+buildGoModule rec {
+  pname = "osv-scanner";
+  version = "1.9.1";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "osv-scanner";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-s288EHtF/YRkPVwe7b1+q/1ky8tQdHvzb8GaOPpRqTw=";
+  };
+
+  vendorHash = "sha256-DNUkUmxzej/NDwJ3lgPek/6C3/ytjlHmFIb1IvKvAQs=";
+
+  subPackages = [
+    "cmd/osv-scanner"
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${version}"
+    "-X=main.commit=n/a"
+    "-X=main.date=1970-01-01T00:00:00Z"
+  ];
+
+  # Tests require network connectivity to query https://api.osv.dev.
+  doCheck = false;
+
+  passthru.tests.version = testers.testVersion {
+    package = osv-scanner;
+  };
+
+  meta = with lib; {
+    description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev";
+    mainProgram = "osv-scanner";
+    homepage = "https://github.com/google/osv-scanner";
+    changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ stehessel urandom ];
+  };
+}
diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/by-name/os/osxsnarf/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/osxsnarf/default.nix
rename to pkgs/by-name/os/osxsnarf/package.nix
diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/by-name/ot/otel-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/otel-cli/default.nix
rename to pkgs/by-name/ot/otel-cli/package.nix
diff --git a/pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch b/pkgs/by-name/ot/otel-cli/patches/bin-echo-patch.patch
similarity index 100%
rename from pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch
rename to pkgs/by-name/ot/otel-cli/patches/bin-echo-patch.patch
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index e8dc8f184435..c8a7e0b33948 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -3,6 +3,8 @@
 , fetchFromGitHub
 , testers
 , otel-desktop-viewer
+, stdenv
+, apple-sdk_12
 }:
 
 buildGoModule rec {
@@ -25,6 +27,8 @@ buildGoModule rec {
 
   ldflags = [ "-s" "-w" ];
 
+  buildInputs = lib.optional stdenv.isDarwin apple-sdk_12;
+
   passthru.tests.version = testers.testVersion {
     inherit version;
     package = otel-desktop-viewer;
diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index 9530d7a9e866..133e89392fb6 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.4.2";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     rev = "refs/tags/${version}";
-    hash = "sha256-0wiUqpjCHGHOuJJaDzpmMGtCBgUI5Sk29DrOgbLj018=";
+    hash = "sha256-kIuWDu7CpLLRyGPcCQYNaAiZ5F/WEatDmf2XbvLedsI=";
   };
 
   pythonRelaxDeps = [
@@ -26,8 +26,7 @@ python3Packages.buildPythonApplication rec {
     "typer"
   ];
 
-  build-system = with python3Packages; [ poetry-core ];
-
+  build-system = with python3Packages; [ hatchling ];
 
   dependencies = with python3Packages; [
     aiohttp
diff --git a/pkgs/applications/misc/otf2bdf/default.nix b/pkgs/by-name/ot/otf2bdf/package.nix
similarity index 100%
rename from pkgs/applications/misc/otf2bdf/default.nix
rename to pkgs/by-name/ot/otf2bdf/package.nix
diff --git a/pkgs/tools/misc/otfcc/fix-aarch64.patch b/pkgs/by-name/ot/otfcc/fix-aarch64.patch
similarity index 100%
rename from pkgs/tools/misc/otfcc/fix-aarch64.patch
rename to pkgs/by-name/ot/otfcc/fix-aarch64.patch
diff --git a/pkgs/tools/misc/otfcc/move-makefiles.patch b/pkgs/by-name/ot/otfcc/move-makefiles.patch
similarity index 100%
rename from pkgs/tools/misc/otfcc/move-makefiles.patch
rename to pkgs/by-name/ot/otfcc/move-makefiles.patch
diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/by-name/ot/otfcc/package.nix
similarity index 100%
rename from pkgs/tools/misc/otfcc/default.nix
rename to pkgs/by-name/ot/otfcc/package.nix
diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/by-name/ot/otpauth/package.nix
similarity index 100%
rename from pkgs/tools/security/otpauth/default.nix
rename to pkgs/by-name/ot/otpauth/package.nix
diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/by-name/ot/otpclient/package.nix
similarity index 100%
rename from pkgs/applications/misc/otpclient/default.nix
rename to pkgs/by-name/ot/otpclient/package.nix
diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/by-name/ot/otpw/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/otpw/default.nix
rename to pkgs/by-name/ot/otpw/package.nix
diff --git a/pkgs/tools/security/ots/default.nix b/pkgs/by-name/ot/ots/package.nix
similarity index 100%
rename from pkgs/tools/security/ots/default.nix
rename to pkgs/by-name/ot/ots/package.nix
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/by-name/ot/ott/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/ott/default.nix
rename to pkgs/by-name/ot/ott/package.nix
diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/by-name/ot/otto-matic/package.nix
similarity index 100%
rename from pkgs/games/otto-matic/default.nix
rename to pkgs/by-name/ot/otto-matic/package.nix
diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/by-name/ou/ouch/package.nix
similarity index 100%
rename from pkgs/tools/compression/ouch/default.nix
rename to pkgs/by-name/ou/ouch/package.nix
diff --git a/pkgs/tools/networking/oui/default.nix b/pkgs/by-name/ou/oui/package.nix
similarity index 100%
rename from pkgs/tools/networking/oui/default.nix
rename to pkgs/by-name/ou/oui/package.nix
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/by-name/ou/out-of-tree/package.nix
similarity index 100%
rename from pkgs/development/tools/out-of-tree/default.nix
rename to pkgs/by-name/ou/out-of-tree/package.nix
diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
new file mode 100644
index 000000000000..aa0b24a4959b
--- /dev/null
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, pandoc
+, makeWrapper
+, testers
+, ov
+}:
+
+buildGoModule rec {
+  pname = "ov";
+  version = "0.37.0";
+
+  src = fetchFromGitHub {
+    owner = "noborus";
+    repo = "ov";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-PZYYr2763L/BOn05TSDr3tkjQQkg2Niic3rJrFSevu0=";
+  };
+
+  vendorHash = "sha256-Xntel9WXwCY5iqC9JvrE/iSIXff504fCUP5kYc6pf7Y=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Version=v${version}"
+    "-X=main.Revision=${src.rev}"
+  ];
+
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [
+    installShellFiles
+    pandoc
+    makeWrapper
+  ];
+
+  outputs = [ "out" "doc" ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd ov \
+      --bash <($out/bin/ov --completion bash) \
+      --fish <($out/bin/ov --completion fish) \
+      --zsh <($out/bin/ov --completion zsh)
+    '' + ''
+    mkdir -p $out/share/$name
+    cp $src/ov-less.yaml $out/share/$name/less-config.yaml
+    makeWrapper $out/bin/ov $out/bin/ov-less --add-flags "--config $out/share/$name/less-config.yaml"
+
+    mkdir -p $doc/share/doc/$name
+    pandoc -s < $src/README.md > $doc/share/doc/$name/README.html
+    mkdir -p $doc/share/$name
+    cp $src/ov.yaml $doc/share/$name/sample-config.yaml
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = ov;
+      version = "v${version}";
+    };
+  };
+
+  meta = with lib; {
+    description = "Feature-rich terminal-based text viewer";
+    homepage = "https://noborus.github.io/ov";
+    changelog = "https://github.com/noborus/ov/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ farcaller figsoda ];
+  };
+}
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/by-name/ov/oven-media-engine/package.nix
similarity index 100%
rename from pkgs/servers/misc/oven-media-engine/default.nix
rename to pkgs/by-name/ov/oven-media-engine/package.nix
diff --git a/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch b/pkgs/by-name/ov/oven-media-engine/support-ffmpeg-7.patch
similarity index 100%
rename from pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch
rename to pkgs/by-name/ov/oven-media-engine/support-ffmpeg-7.patch
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/by-name/ov/overmind/package.nix
similarity index 100%
rename from pkgs/applications/misc/overmind/default.nix
rename to pkgs/by-name/ov/overmind/package.nix
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/by-name/ov/overpass/package.nix
similarity index 100%
rename from pkgs/data/fonts/overpass/default.nix
rename to pkgs/by-name/ov/overpass/package.nix
diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/by-name/ov/oversteer/package.nix
similarity index 100%
rename from pkgs/applications/misc/oversteer/default.nix
rename to pkgs/by-name/ov/oversteer/package.nix
diff --git a/pkgs/tools/virtualization/ovftool/installCheckPhase.ova b/pkgs/by-name/ov/ovftool/installCheckPhase.ova
similarity index 100%
rename from pkgs/tools/virtualization/ovftool/installCheckPhase.ova
rename to pkgs/by-name/ov/ovftool/installCheckPhase.ova
diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/by-name/ov/ovftool/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/ovftool/default.nix
rename to pkgs/by-name/ov/ovftool/package.nix
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/by-name/ow/owamp/package.nix
similarity index 100%
rename from pkgs/applications/networking/owamp/default.nix
rename to pkgs/by-name/ow/owamp/package.nix
diff --git a/pkgs/applications/window-managers/owl/mac/MainMenu.nib b/pkgs/by-name/ow/owl-compositor/mac/MainMenu.nib
similarity index 100%
rename from pkgs/applications/window-managers/owl/mac/MainMenu.nib
rename to pkgs/by-name/ow/owl-compositor/mac/MainMenu.nib
diff --git a/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib b/pkgs/by-name/ow/owl-compositor/mac/OwlPreferences.nib
similarity index 100%
rename from pkgs/applications/window-managers/owl/mac/OwlPreferences.nib
rename to pkgs/by-name/ow/owl-compositor/mac/OwlPreferences.nib
diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/by-name/ow/owl-compositor/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/owl/default.nix
rename to pkgs/by-name/ow/owl-compositor/package.nix
diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/by-name/ow/owl-lisp/package.nix
similarity index 100%
rename from pkgs/development/compilers/owl-lisp/default.nix
rename to pkgs/by-name/ow/owl-lisp/package.nix
diff --git a/pkgs/tools/networking/owl/default.nix b/pkgs/by-name/ow/owl/package.nix
similarity index 100%
rename from pkgs/tools/networking/owl/default.nix
rename to pkgs/by-name/ow/owl/package.nix
diff --git a/pkgs/servers/owncast/default.nix b/pkgs/by-name/ow/owncast/package.nix
similarity index 100%
rename from pkgs/servers/owncast/default.nix
rename to pkgs/by-name/ow/owncast/package.nix
diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix
similarity index 100%
rename from pkgs/servers/owntracks-recorder/default.nix
rename to pkgs/by-name/ow/owntracks-recorder/package.nix
diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
new file mode 100644
index 000000000000..a9b15a7380e5
--- /dev/null
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ox";
+  version = "0.6.10";
+
+  src = fetchFromGitHub {
+    owner = "curlpipe";
+    repo = pname;
+    rev = version;
+    hash = "sha256-7PaAcVatm/gqeZRuzCjoF6ZGDP6mIjDTuhmJQ5wt7x8=";
+  };
+
+  cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0=";
+
+  meta = with lib; {
+    description = "Independent Rust text editor that runs in your terminal";
+    homepage = "https://github.com/curlpipe/ox";
+    changelog = "https://github.com/curlpipe/ox/releases/tag/${version}";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ moni ];
+    mainProgram = "ox";
+  };
+}
diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/by-name/ox/oxefmsynth/package.nix
similarity index 100%
rename from pkgs/applications/audio/oxefmsynth/default.nix
rename to pkgs/by-name/ox/oxefmsynth/package.nix
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/by-name/ox/oxipng/package.nix
similarity index 100%
rename from pkgs/tools/graphics/oxipng/default.nix
rename to pkgs/by-name/ox/oxipng/package.nix
diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/by-name/ox/oxker/package.nix
similarity index 100%
rename from pkgs/applications/misc/oxker/default.nix
rename to pkgs/by-name/ox/oxker/package.nix
diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
new file mode 100644
index 000000000000..0af3530a11a0
--- /dev/null
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, rust-jemalloc-sys
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "oxlint";
+  version = "0.9.10";
+
+  src = fetchFromGitHub {
+    owner = "web-infra-dev";
+    repo = "oxc";
+    rev = "oxlint_v${version}";
+    hash = "sha256-hcn076GADmduX30eyFNKoFrOP5DDv2HgMY0EbvJOwJE=";
+  };
+
+  cargoHash = "sha256-wNdf3LA9QHkbTrchpv5CHz7PMftkIMyc2tGLQxC+4Kg=";
+
+  buildInputs = [
+    rust-jemalloc-sys
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  cargoBuildFlags = [ "--bin=oxlint" ];
+  cargoTestFlags = cargoBuildFlags;
+
+  meta = with lib; {
+    description = "Suite of high-performance tools for JavaScript and TypeScript written in Rust";
+    homepage = "https://github.com/web-infra-dev/oxc";
+    changelog = "https://github.com/web-infra-dev/oxc/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "oxlint";
+  };
+}
diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/by-name/ox/oxtools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/oxtools/default.nix
rename to pkgs/by-name/ox/oxtools/package.nix
diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/by-name/ox/oxygenfonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/oxygenfonts/default.nix
rename to pkgs/by-name/ox/oxygenfonts/package.nix
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/by-name/p0/p0f/package.nix
similarity index 100%
rename from pkgs/tools/security/p0f/default.nix
rename to pkgs/by-name/p0/p0f/package.nix
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/by-name/p1/p11-kit/package.nix
similarity index 100%
rename from pkgs/development/libraries/p11-kit/default.nix
rename to pkgs/by-name/p1/p11-kit/package.nix
diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/by-name/p2/p2pool/package.nix
similarity index 100%
rename from pkgs/applications/misc/p2pool/default.nix
rename to pkgs/by-name/p2/p2pool/package.nix
diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/by-name/p4/p4d/package.nix
similarity index 100%
rename from pkgs/applications/version-management/p4d/default.nix
rename to pkgs/by-name/p4/p4d/package.nix
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/by-name/p9/p910nd/package.nix
similarity index 100%
rename from pkgs/servers/p910nd/default.nix
rename to pkgs/by-name/p9/p910nd/package.nix
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/by-name/pa/pa_applet/package.nix
similarity index 100%
rename from pkgs/tools/audio/pa-applet/default.nix
rename to pkgs/by-name/pa/pa_applet/package.nix
diff --git a/pkgs/by-name/pa/pacemaker/package.nix b/pkgs/by-name/pa/pacemaker/package.nix
new file mode 100644
index 000000000000..365021ba7f72
--- /dev/null
+++ b/pkgs/by-name/pa/pacemaker/package.nix
@@ -0,0 +1,103 @@
+{ lib
+, stdenv
+, autoconf
+, automake
+, bash
+, bzip2
+, corosync
+, dbus
+, fetchFromGitHub
+, glib
+, gnutls
+, libqb
+, libtool
+, libuuid
+, libxml2
+, libxslt
+, pam
+, pkg-config
+, python3
+, nixosTests
+
+# Pacemaker is compiled twice, once with forOCF = true to extract its
+# OCF definitions for use in the ocf-resource-agents derivation, then
+# again with forOCF = false, where the ocf-resource-agents is provided
+# as the OCF_ROOT.
+, forOCF ? false
+, ocf-resource-agents
+} :
+
+stdenv.mkDerivation rec {
+  pname = "pacemaker";
+  version = "2.1.9";
+
+  src = fetchFromGitHub {
+    owner = "ClusterLabs";
+    repo = pname;
+    rev = "Pacemaker-${version}";
+    sha256 = "sha256-L/LQS5XLps0pqTfMAh1ZiR00SVltrNxMl6DXQhXBw1Q=";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkg-config
+  ];
+
+  buildInputs = [
+    bash
+    bzip2
+    corosync
+    dbus.dev
+    glib
+    gnutls
+    libqb
+    libuuid
+    libxml2.dev
+    libxslt.dev
+    pam
+    python3
+  ];
+
+  preConfigure = ''
+    ./autogen.sh --prefix="$out"
+  '';
+  configureFlags = [
+    "--exec-prefix=${placeholder "out"}"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-initdir=/etc/systemd/system"
+    "--with-systemdsystemunitdir=/etc/systemd/system"
+    "--with-corosync"
+    # allows Type=notify in the systemd service
+    "--enable-systemd"
+  ] ++ lib.optional (!forOCF) "--with-ocfdir=${ocf-resource-agents}/usr/lib/ocf";
+
+  installFlags = [ "DESTDIR=${placeholder "out"}" ];
+
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
+    "-Wno-error=strict-prototypes"
+    "-Wno-error=deprecated-declarations"
+  ]);
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    # pacemaker's install linking requires a weirdly nested hierarchy
+    mv $out$out/* $out
+    rm -r $out/nix
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) pacemaker;
+  };
+
+  meta = with lib; {
+    homepage = "https://clusterlabs.org/pacemaker/";
+    description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ryantm astro ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/by-name/pa/pachyderm/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pachyderm/default.nix
rename to pkgs/by-name/pa/pachyderm/package.nix
diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/by-name/pa/package-project-cmake/package.nix
similarity index 100%
rename from pkgs/development/tools/package-project-cmake/default.nix
rename to pkgs/by-name/pa/package-project-cmake/package.nix
diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/by-name/pa/packcc/package.nix
similarity index 100%
rename from pkgs/development/tools/packcc/default.nix
rename to pkgs/by-name/pa/packcc/package.nix
diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/by-name/pa/packet-sd/package.nix
similarity index 100%
rename from pkgs/development/tools/packet-sd/default.nix
rename to pkgs/by-name/pa/packet-sd/package.nix
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/by-name/pa/packetdrill/package.nix
similarity index 100%
rename from pkgs/tools/networking/packetdrill/default.nix
rename to pkgs/by-name/pa/packetdrill/package.nix
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
new file mode 100644
index 000000000000..f2766c3998d0
--- /dev/null
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -0,0 +1,63 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  rustPlatform,
+  gtk4,
+  pkg-config,
+  pango,
+  wrapGAppsHook4,
+  apple-sdk_11,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "packetry";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "greatscottgadgets";
+    repo = "packetry";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM=";
+  };
+
+  cargoHash = "sha256-xz9PdVVB1u6s/anPBRonWS1kMN+4kfkK/gaOlF9Z3yk=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs =
+    [
+      gtk4
+      pango
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      apple-sdk_11
+    ];
+
+  # Disable test_replay tests as they need a gui
+  preCheck = ''
+    sed -i 's:#\[test\]:#[test] #[ignore]:' src/test_replay.rs
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  # packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154
+  postInstall = ''
+    rm $out/bin/packetry-cli
+  '';
+
+  meta = {
+    description = "USB 2.0 protocol analysis application for use with Cynthion";
+    homepage = "https://github.com/greatscottgadgets/packetry";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ carlossless ];
+    mainProgram = "packetry";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/by-name/pa/packr/package.nix
similarity index 100%
rename from pkgs/development/libraries/packr/default.nix
rename to pkgs/by-name/pa/packr/package.nix
diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/by-name/pa/packwiz/package.nix
similarity index 100%
rename from pkgs/tools/games/minecraft/packwiz/default.nix
rename to pkgs/by-name/pa/packwiz/package.nix
diff --git a/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch b/pkgs/by-name/pa/pacman/dont-create-empty-dirs.patch
similarity index 100%
rename from pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch
rename to pkgs/by-name/pa/pacman/dont-create-empty-dirs.patch
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/by-name/pa/pacman/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pacman/default.nix
rename to pkgs/by-name/pa/pacman/package.nix
diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/by-name/pa/paco/package.nix
similarity index 100%
rename from pkgs/development/compilers/paco/default.nix
rename to pkgs/by-name/pa/paco/package.nix
diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/by-name/pa/pacparser/package.nix
similarity index 100%
rename from pkgs/tools/networking/pacparser/default.nix
rename to pkgs/by-name/pa/pacparser/package.nix
diff --git a/pkgs/tools/package-management/pacup/default.nix b/pkgs/by-name/pa/pacup/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pacup/default.nix
rename to pkgs/by-name/pa/pacup/package.nix
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/by-name/pa/pacvim/package.nix
similarity index 100%
rename from pkgs/games/pacvim/default.nix
rename to pkgs/by-name/pa/pacvim/package.nix
diff --git a/pkgs/tools/security/padbuster/default.nix b/pkgs/by-name/pa/padbuster/package.nix
similarity index 100%
rename from pkgs/tools/security/padbuster/default.nix
rename to pkgs/by-name/pa/padbuster/package.nix
diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/by-name/pa/page/package.nix
similarity index 100%
rename from pkgs/tools/misc/page/default.nix
rename to pkgs/by-name/pa/page/package.nix
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/by-name/pa/pagemon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pagemon/default.nix
rename to pkgs/by-name/pa/pagemon/package.nix
diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/by-name/pa/paging-calculator/package.nix
similarity index 100%
rename from pkgs/development/tools/paging-calculator/default.nix
rename to pkgs/by-name/pa/paging-calculator/package.nix
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/by-name/pa/pagmo2/package.nix
similarity index 100%
rename from pkgs/development/libraries/pagmo2/default.nix
rename to pkgs/by-name/pa/pagmo2/package.nix
diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/by-name/pa/pagsuite/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pagsuite/default.nix
rename to pkgs/by-name/pa/pagsuite/package.nix
diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/by-name/pa/paho-mqtt-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/paho-mqtt-c/default.nix
rename to pkgs/by-name/pa/paho-mqtt-c/package.nix
diff --git a/pkgs/applications/misc/pairdrop/default.nix b/pkgs/by-name/pa/pairdrop/package.nix
similarity index 100%
rename from pkgs/applications/misc/pairdrop/default.nix
rename to pkgs/by-name/pa/pairdrop/package.nix
diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/by-name/pa/pal/package.nix
similarity index 100%
rename from pkgs/tools/misc/pal/default.nix
rename to pkgs/by-name/pa/pal/package.nix
diff --git a/pkgs/applications/graphics/paleta/default.nix b/pkgs/by-name/pa/paleta/package.nix
similarity index 100%
rename from pkgs/applications/graphics/paleta/default.nix
rename to pkgs/by-name/pa/paleta/package.nix
diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/by-name/pa/palp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/palp/default.nix
rename to pkgs/by-name/pa/palp/package.nix
diff --git a/pkgs/os-specific/darwin/pam-reattach/default.nix b/pkgs/by-name/pa/pam-reattach/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/pam-reattach/default.nix
rename to pkgs/by-name/pa/pam-reattach/package.nix
diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/by-name/pa/pam_ccreds/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ccreds/default.nix
rename to pkgs/by-name/pa/pam_ccreds/package.nix
diff --git a/pkgs/os-specific/linux/pam_dp9ik/default.nix b/pkgs/by-name/pa/pam_dp9ik/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_dp9ik/default.nix
rename to pkgs/by-name/pa/pam_dp9ik/package.nix
diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/by-name/pa/pam_gnupg/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_gnupg/default.nix
rename to pkgs/by-name/pa/pam_gnupg/package.nix
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/by-name/pa/pam_krb5/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_krb5/default.nix
rename to pkgs/by-name/pa/pam_krb5/package.nix
diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/by-name/pa/pam_ldap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ldap/default.nix
rename to pkgs/by-name/pa/pam_ldap/package.nix
diff --git a/pkgs/os-specific/linux/pam_mktemp/default.nix b/pkgs/by-name/pa/pam_mktemp/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_mktemp/default.nix
rename to pkgs/by-name/pa/pam_mktemp/package.nix
diff --git a/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch b/pkgs/by-name/pa/pam_mount/insert_utillinux_path_hooks.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
rename to pkgs/by-name/pa/pam_mount/insert_utillinux_path_hooks.patch
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/by-name/pa/pam_mount/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_mount/default.nix
rename to pkgs/by-name/pa/pam_mount/package.nix
diff --git a/pkgs/os-specific/linux/pam_mysql/default.nix b/pkgs/by-name/pa/pam_mysql/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_mysql/default.nix
rename to pkgs/by-name/pa/pam_mysql/package.nix
diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/by-name/pa/pam_p11/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_p11/default.nix
rename to pkgs/by-name/pa/pam_p11/package.nix
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/by-name/pa/pam_pgsql/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_pgsql/default.nix
rename to pkgs/by-name/pa/pam_pgsql/package.nix
diff --git a/pkgs/os-specific/linux/pam_rssh/default.nix b/pkgs/by-name/pa/pam_rssh/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_rssh/default.nix
rename to pkgs/by-name/pa/pam_rssh/package.nix
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch b/pkgs/by-name/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch
rename to pkgs/by-name/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/by-name/pa/pam_ssh_agent_auth/multiple-key-files.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
rename to pkgs/by-name/pa/pam_ssh_agent_auth/multiple-key-files.patch
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
rename to pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
diff --git a/pkgs/os-specific/linux/pam_tmpdir/default.nix b/pkgs/by-name/pa/pam_tmpdir/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_tmpdir/default.nix
rename to pkgs/by-name/pa/pam_tmpdir/package.nix
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/by-name/pa/pam_u2f/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_u2f/default.nix
rename to pkgs/by-name/pa/pam_u2f/package.nix
diff --git a/pkgs/os-specific/linux/pam_ussh/go.mod b/pkgs/by-name/pa/pam_ussh/go.mod
similarity index 100%
rename from pkgs/os-specific/linux/pam_ussh/go.mod
rename to pkgs/by-name/pa/pam_ussh/go.mod
diff --git a/pkgs/os-specific/linux/pam_ussh/go.sum b/pkgs/by-name/pa/pam_ussh/go.sum
similarity index 100%
rename from pkgs/os-specific/linux/pam_ussh/go.sum
rename to pkgs/by-name/pa/pam_ussh/go.sum
diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/by-name/pa/pam_ussh/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ussh/default.nix
rename to pkgs/by-name/pa/pam_ussh/package.nix
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/by-name/pa/pamix/package.nix
similarity index 100%
rename from pkgs/applications/audio/pamix/default.nix
rename to pkgs/by-name/pa/pamix/package.nix
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/by-name/pa/pamixer/package.nix
similarity index 100%
rename from pkgs/applications/audio/pamixer/default.nix
rename to pkgs/by-name/pa/pamixer/package.nix
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/by-name/pa/paml/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/paml/default.nix
rename to pkgs/by-name/pa/paml/package.nix
diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/by-name/pa/pamtester/package.nix
similarity index 100%
rename from pkgs/tools/security/pamtester/default.nix
rename to pkgs/by-name/pa/pamtester/package.nix
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/by-name/pa/pan/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/pan/default.nix
rename to pkgs/by-name/pa/pan/package.nix
diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/by-name/pa/panamax/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/panamax/default.nix
rename to pkgs/by-name/pa/panamax/package.nix
diff --git a/pkgs/tools/misc/pandoc-katex/default.nix b/pkgs/by-name/pa/pandoc-katex/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-katex/default.nix
rename to pkgs/by-name/pa/pandoc-katex/package.nix
diff --git a/pkgs/tools/misc/pandoc-lua-filters/default.nix b/pkgs/by-name/pa/pandoc-lua-filters/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-lua-filters/default.nix
rename to pkgs/by-name/pa/pandoc-lua-filters/package.nix
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/by-name/pa/pandoc/package.nix
similarity index 100%
rename from pkgs/development/tools/pandoc/default.nix
rename to pkgs/by-name/pa/pandoc/package.nix
diff --git a/pkgs/tools/misc/panicparse/default.nix b/pkgs/by-name/pa/panicparse/package.nix
similarity index 100%
rename from pkgs/tools/misc/panicparse/default.nix
rename to pkgs/by-name/pa/panicparse/package.nix
diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix
new file mode 100644
index 000000000000..20b27dac96e5
--- /dev/null
+++ b/pkgs/by-name/pa/panoply/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  makeWrapper,
+  jre,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "panoply";
+  version = "5.5.5";
+
+  src = fetchurl {
+    url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
+    hash = "sha256-rvJ3pyAbHI2/g3v+eKQF0Q9mx6+lLozaB8CLAAzOXRs=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    jarbase=$out/share/panoply
+    mkdir -p $out/bin $jarbase/jars
+
+    sed -i "s:^SCRIPTDIR.*:SCRIPTDIR=$jarbase:" panoply.sh
+
+    cp panoply.sh $out/bin/panoply
+    cp -r jars $jarbase
+
+    wrapProgram "$out/bin/panoply" --prefix PATH : "${jre}/bin"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "netCDF, HDF and GRIB Data Viewer";
+    homepage = "https://www.giss.nasa.gov/tools/panoply";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.markuskowa ];
+    license = licenses.unfree; # Package does not state a license
+    mainProgram = "panoply";
+  };
+}
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/by-name/pa/panopticon/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/panopticon/default.nix
rename to pkgs/by-name/pa/panopticon/package.nix
diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/by-name/pa/panotools/package.nix
similarity index 100%
rename from pkgs/applications/graphics/panotools/default.nix
rename to pkgs/by-name/pa/panotools/package.nix
diff --git a/pkgs/misc/drivers/pantum-driver/default.nix b/pkgs/by-name/pa/pantum-driver/package.nix
similarity index 100%
rename from pkgs/misc/drivers/pantum-driver/default.nix
rename to pkgs/by-name/pa/pantum-driver/package.nix
diff --git a/pkgs/tools/text/papeer/default.nix b/pkgs/by-name/pa/papeer/package.nix
similarity index 100%
rename from pkgs/tools/text/papeer/default.nix
rename to pkgs/by-name/pa/papeer/package.nix
diff --git a/pkgs/data/themes/paper-gtk/default.nix b/pkgs/by-name/pa/paper-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/paper-gtk/default.nix
rename to pkgs/by-name/pa/paper-gtk-theme/package.nix
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/by-name/pa/paper-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/paper-icon-theme/default.nix
rename to pkgs/by-name/pa/paper-icon-theme/package.nix
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
new file mode 100644
index 000000000000..9035cd8778dc
--- /dev/null
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -0,0 +1,303 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, buildNpmPackage
+, nixosTests
+, gettext
+, python3
+, giflib
+, darwin
+, ghostscript_headless
+, imagemagickBig
+, jbig2enc
+, optipng
+, pngquant
+, qpdf
+, tesseract5
+, unpaper
+, poppler_utils
+, liberation_ttf
+, xcbuild
+, pango
+, pkg-config
+, nltk-data
+, xorg
+}:
+
+let
+  version = "2.13.4";
+
+  src = fetchFromGitHub {
+    owner = "paperless-ngx";
+    repo = "paperless-ngx";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-db8omhyngvenAgfGGpMAhGkgqGug/sv7AL1G+sniM/c=";
+  };
+
+  # subpath installation is broken with uvicorn >= 0.26
+  # https://github.com/NixOS/nixpkgs/issues/298719
+  # https://github.com/paperless-ngx/paperless-ngx/issues/5494
+  python = python3.override {
+    self = python;
+    packageOverrides = final: prev: {
+      django = prev.django_5;
+
+      # TODO: drop after https://github.com/NixOS/nixpkgs/pull/306556 or similar got merged
+      django-allauth = prev.django-allauth.overridePythonAttrs ({ src, nativeCheckInputs, ... }: let
+        version = "65.0.2";
+      in {
+        inherit version;
+        src = src.override {
+          rev = "refs/tags/${version}";
+          hash = "sha256-GvYdExkNuySrg8ERnWOJxucFe5HVdPAcHfRNeqiVS7M=";
+        };
+
+        nativeCheckInputs = nativeCheckInputs ++ [ prev.fido2 ];
+      });
+
+      django-extensions = prev.django-extensions.overridePythonAttrs (_: {
+        # fails with: TypeError: 'class Meta' got invalid attribute(s): index_together
+        # probably because of django_5 but it is the latest version available and used like that in paperless-ngx
+        doCheck = false;
+      });
+
+      # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
+      ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
+
+      uvicorn = prev.uvicorn.overridePythonAttrs (_: {
+        version = "0.25.0";
+        src = fetchFromGitHub {
+          owner = "encode";
+          repo = "uvicorn";
+          rev = "0.25.0";
+          hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk=";
+        };
+      });
+    };
+  };
+
+
+  path = lib.makeBinPath [
+    ghostscript_headless
+    imagemagickBig
+    jbig2enc
+    optipng
+    pngquant
+    qpdf
+    tesseract5
+    unpaper
+    poppler_utils
+  ];
+
+  frontend = buildNpmPackage {
+    pname = "paperless-ngx-frontend";
+    inherit version src;
+
+    postPatch = ''
+      cd src-ui
+    '';
+
+    npmDepsHash = "sha256-pBCWcdCTQh0N4pRLBWLZXybuhpiat030xvPZ5z7CUJ0=";
+
+    nativeBuildInputs = [
+      pkg-config
+      python3
+    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      xcbuild
+    ];
+
+    buildInputs = [
+      pango
+    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      giflib
+      darwin.apple_sdk.frameworks.CoreText
+    ];
+
+    CYPRESS_INSTALL_BINARY = "0";
+    NG_CLI_ANALYTICS = "false";
+
+    npmBuildFlags = [
+      "--" "--configuration" "production"
+    ];
+
+    doCheck = true;
+    checkPhase = ''
+      runHook preCheck
+      npm run test
+      runHook postCheck
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/lib/paperless-ui
+      mv ../src/documents/static/frontend $out/lib/paperless-ui/
+      runHook postInstall
+    '';
+  };
+in
+python.pkgs.buildPythonApplication rec {
+  pname = "paperless-ngx";
+  pyproject = false;
+
+  inherit version src;
+
+  postPatch = ''
+    # pytest-xdist makes the tests flaky
+    substituteInPlace src/setup.cfg \
+      --replace-fail "--numprocesses auto --maxprocesses=16" ""
+  '';
+
+  nativeBuildInputs = [
+    gettext
+    xorg.lndir
+  ];
+
+  dependencies = with python.pkgs; [
+    bleach
+    channels
+    channels-redis
+    concurrent-log-handler
+    dateparser
+    django_5
+    django-allauth
+    django-auditlog
+    django-celery-results
+    django-compression-middleware
+    django-cors-headers
+    django-extensions
+    django-filter
+    django-guardian
+    django-multiselectfield
+    django-soft-delete
+    djangorestframework
+    djangorestframework-guardian2
+    drf-writable-nested
+    filelock
+    flower
+    gotenberg-client
+    gunicorn
+    httpx-oauth
+    imap-tools
+    inotifyrecursive
+    jinja2
+    langdetect
+    mysqlclient
+    nltk
+    ocrmypdf
+    pathvalidate
+    pdf2image
+    psycopg
+    python-dateutil
+    python-dotenv
+    python-gnupg
+    python-ipware
+    python-magic
+    pyzbar
+    rapidfuzz
+    redis
+    scikit-learn
+    setproctitle
+    tika-client
+    tqdm
+    uvicorn
+    watchdog
+    whitenoise
+    whoosh
+    zxing-cpp
+  ]
+  ++ redis.optional-dependencies.hiredis
+  ++ uvicorn.optional-dependencies.standard;
+
+  postBuild = ''
+    # Compile manually because `pythonRecompileBytecodeHook` only works
+    # for files in `python.sitePackages`
+    ${python.pythonOnBuildForHost.interpreter} -OO -m compileall src
+
+    # Collect static files
+    ${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input
+
+    # Compile string translations using gettext
+    ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages
+  '';
+
+  installPhase = let
+    pythonPath = python.pkgs.makePythonPath dependencies;
+  in ''
+    runHook preInstall
+
+    mkdir -p $out/lib/paperless-ngx/static/frontend
+    cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx
+    lndir -silent ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/frontend
+    chmod +x $out/lib/paperless-ngx/src/manage.py
+    makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \
+      --prefix PYTHONPATH : "${pythonPath}" \
+      --prefix PATH : "${path}"
+    makeWrapper ${lib.getExe python.pkgs.celery} $out/bin/celery \
+      --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \
+      --prefix PATH : "${path}"
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    # Remove tests with samples (~14M)
+    find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} +
+  '';
+
+  nativeCheckInputs = with python.pkgs; [
+    daphne
+    factory-boy
+    imagehash
+    pytest-cov-stub
+    pytest-django
+    pytest-env
+    pytest-httpx
+    pytest-mock
+    pytest-rerunfailures
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "src"
+  ];
+
+  # The tests require:
+  # - PATH with runtime binaries
+  # - A temporary HOME directory for gnupg
+  # - XDG_DATA_DIRS with test-specific fonts
+  preCheck = ''
+    export PATH="${path}:$PATH"
+    export HOME=$(mktemp -d)
+    export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS"
+  '';
+
+  disabledTests = [
+    # FileNotFoundError(2, 'No such file or directory'): /build/tmp...
+    "test_script_with_output"
+    "test_script_exit_non_zero"
+    # AssertionError: 10 != 4 (timezone/time issue)
+    # Due to getting local time from modification date in test_consumer.py
+    "testNormalOperation"
+    # Something broken with new Tesseract and inline RTL/LTR overrides?
+    "test_rtl_language_detection"
+    # django.core.exceptions.FieldDoesNotExist: Document has no field named 'transaction_id'
+    "test_convert"
+  ];
+
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  passthru = {
+    inherit python path frontend tesseract5;
+    nltkData = with nltk-data; [ punkt_tab snowball_data stopwords ];
+    tests = { inherit (nixosTests) paperless; };
+  };
+
+  meta = with lib; {
+    description = "Tool to scan, index, and archive all of your physical documents";
+    homepage = "https://docs.paperless-ngx.com/";
+    changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}";
+    license = licenses.gpl3Only;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ];
+  };
+}
diff --git a/pkgs/tools/misc/paperlike-go/default.nix b/pkgs/by-name/pa/paperlike-go/package.nix
similarity index 100%
rename from pkgs/tools/misc/paperlike-go/default.nix
rename to pkgs/by-name/pa/paperlike-go/package.nix
diff --git a/pkgs/tools/text/papertrail/Gemfile b/pkgs/by-name/pa/papertrail/Gemfile
similarity index 100%
rename from pkgs/tools/text/papertrail/Gemfile
rename to pkgs/by-name/pa/papertrail/Gemfile
diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/by-name/pa/papertrail/Gemfile.lock
similarity index 100%
rename from pkgs/tools/text/papertrail/Gemfile.lock
rename to pkgs/by-name/pa/papertrail/Gemfile.lock
diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/by-name/pa/papertrail/gemset.nix
similarity index 100%
rename from pkgs/tools/text/papertrail/gemset.nix
rename to pkgs/by-name/pa/papertrail/gemset.nix
diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/by-name/pa/papertrail/package.nix
similarity index 100%
rename from pkgs/tools/text/papertrail/default.nix
rename to pkgs/by-name/pa/papertrail/package.nix
diff --git a/pkgs/tools/X11/paperview/default.nix b/pkgs/by-name/pa/paperview/package.nix
similarity index 100%
rename from pkgs/tools/X11/paperview/default.nix
rename to pkgs/by-name/pa/paperview/package.nix
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/by-name/pa/papi/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/benchmark/papi/default.nix
rename to pkgs/by-name/pa/papi/package.nix
diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/by-name/pa/papirus-folders/package.nix
similarity index 100%
rename from pkgs/data/misc/papirus-folders/default.nix
rename to pkgs/by-name/pa/papirus-folders/package.nix
diff --git a/pkgs/data/icons/papirus-nord/default.nix b/pkgs/by-name/pa/papirus-nord/package.nix
similarity index 100%
rename from pkgs/data/icons/papirus-nord/default.nix
rename to pkgs/by-name/pa/papirus-nord/package.nix
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/by-name/pa/paprefs/package.nix
similarity index 100%
rename from pkgs/applications/audio/paprefs/default.nix
rename to pkgs/by-name/pa/paprefs/package.nix
diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/by-name/pa/paps/package.nix
similarity index 100%
rename from pkgs/tools/misc/paps/default.nix
rename to pkgs/by-name/pa/paps/package.nix
diff --git a/pkgs/tools/text/par/default.nix b/pkgs/by-name/pa/par/package.nix
similarity index 100%
rename from pkgs/tools/text/par/default.nix
rename to pkgs/by-name/pa/par/package.nix
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/by-name/pa/par2cmdline/package.nix
similarity index 100%
rename from pkgs/tools/networking/par2cmdline/default.nix
rename to pkgs/by-name/pa/par2cmdline/package.nix
diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix
index 03396d94b1a6..ddfa5723bbbb 100644
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@@ -4,16 +4,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "parallel-disk-usage";
-  version = "0.9.3";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "KSXGitHub";
     repo = pname;
     rev = version;
-    hash = "sha256-2w+A2ZpmLPBSj9odGh8QWAadE6e2XPJmBZwl6ZT6bSc=";
+    hash = "sha256-BeTidzXcCSe2IEXHAPpG9ZZJV/l/g09gtlZ9JNOuvsw=";
   };
 
-  cargoHash = "sha256-WwWNAF0iKFZJ8anvXUJwXo8xw5pCNVO7RcAMyA1R4wE=";
+  cargoHash = "sha256-rATv8Bg9g2vVyTWCjGPaBtvVgtqQCSs/RurvKmafG/8=";
 
   meta = with lib; {
     description = "Highly parallelized, blazing fast directory tree analyzer";
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/by-name/pa/parastoo-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/parastoo-fonts/default.nix
rename to pkgs/by-name/pa/parastoo-fonts/package.nix
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/by-name/pa/pari-galdata/package.nix
similarity index 100%
rename from pkgs/data/misc/pari-galdata/default.nix
rename to pkgs/by-name/pa/pari-galdata/package.nix
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/by-name/pa/pari-seadata-small/package.nix
similarity index 100%
rename from pkgs/data/misc/pari-seadata-small/default.nix
rename to pkgs/by-name/pa/pari-seadata-small/package.nix
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/by-name/pa/parinfer-rust/package.nix
similarity index 100%
rename from pkgs/development/tools/parinfer-rust/default.nix
rename to pkgs/by-name/pa/parinfer-rust/package.nix
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/by-name/pa/parlatype/package.nix
similarity index 100%
rename from pkgs/applications/audio/parlatype/default.nix
rename to pkgs/by-name/pa/parlatype/package.nix
diff --git a/pkgs/tools/misc/parquet-tools/moto5.patch b/pkgs/by-name/pa/parquet-tools/moto5.patch
similarity index 100%
rename from pkgs/tools/misc/parquet-tools/moto5.patch
rename to pkgs/by-name/pa/parquet-tools/moto5.patch
diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/by-name/pa/parquet-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/parquet-tools/default.nix
rename to pkgs/by-name/pa/parquet-tools/package.nix
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/by-name/pa/parse-cli-bin/package.nix
similarity index 100%
rename from pkgs/development/tools/parse-cli-bin/default.nix
rename to pkgs/by-name/pa/parse-cli-bin/package.nix
diff --git a/pkgs/tools/security/parsero/default.nix b/pkgs/by-name/pa/parsero/package.nix
similarity index 100%
rename from pkgs/tools/security/parsero/default.nix
rename to pkgs/by-name/pa/parsero/package.nix
diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/by-name/pa/parson/package.nix
similarity index 100%
rename from pkgs/development/libraries/parson/default.nix
rename to pkgs/by-name/pa/parson/package.nix
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/by-name/pa/partclone/package.nix
similarity index 100%
rename from pkgs/tools/backup/partclone/default.nix
rename to pkgs/by-name/pa/partclone/package.nix
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/by-name/pa/parted/package.nix
similarity index 100%
rename from pkgs/tools/misc/parted/default.nix
rename to pkgs/by-name/pa/parted/package.nix
diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/by-name/pa/particl-core/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/particl-core/default.nix
rename to pkgs/by-name/pa/particl-core/package.nix
diff --git a/pkgs/tools/backup/partimage/gentoos-zlib.patch b/pkgs/by-name/pa/partimage/gentoos-zlib.patch
similarity index 100%
rename from pkgs/tools/backup/partimage/gentoos-zlib.patch
rename to pkgs/by-name/pa/partimage/gentoos-zlib.patch
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/by-name/pa/partimage/package.nix
similarity index 100%
rename from pkgs/tools/backup/partimage/default.nix
rename to pkgs/by-name/pa/partimage/package.nix
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/by-name/pa/partio/package.nix
similarity index 100%
rename from pkgs/development/libraries/partio/default.nix
rename to pkgs/by-name/pa/partio/package.nix
diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/by-name/pa/pass-secret-service/package.nix
similarity index 100%
rename from pkgs/applications/misc/pass-secret-service/default.nix
rename to pkgs/by-name/pa/pass-secret-service/package.nix
diff --git a/pkgs/tools/security/passage/darwin-getopt-path.patch b/pkgs/by-name/pa/passage/darwin-getopt-path.patch
similarity index 100%
rename from pkgs/tools/security/passage/darwin-getopt-path.patch
rename to pkgs/by-name/pa/passage/darwin-getopt-path.patch
diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/by-name/pa/passage/package.nix
similarity index 100%
rename from pkgs/tools/security/passage/default.nix
rename to pkgs/by-name/pa/passage/package.nix
diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/by-name/pa/passerine/package.nix
similarity index 100%
rename from pkgs/development/compilers/passerine/default.nix
rename to pkgs/by-name/pa/passerine/package.nix
diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/by-name/pa/passff-host/package.nix
similarity index 100%
rename from pkgs/tools/security/passff-host/default.nix
rename to pkgs/by-name/pa/passff-host/package.nix
diff --git a/pkgs/tools/networking/passh/default.nix b/pkgs/by-name/pa/passh/package.nix
similarity index 100%
rename from pkgs/tools/networking/passh/default.nix
rename to pkgs/by-name/pa/passh/package.nix
diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/by-name/pa/passky-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/passky-desktop/default.nix
rename to pkgs/by-name/pa/passky-desktop/package.nix
diff --git a/pkgs/by-name/pa/passmark-performancetest/package.nix b/pkgs/by-name/pa/passmark-performancetest/package.nix
index 72914a647126..1d021281f154 100644
--- a/pkgs/by-name/pa/passmark-performancetest/package.nix
+++ b/pkgs/by-name/pa/passmark-performancetest/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ unzip autoPatchelfHook makeWrapper ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     curl
     ncurses5
   ];
diff --git a/pkgs/tools/security/passphrase2pgp/default.nix b/pkgs/by-name/pa/passphrase2pgp/package.nix
similarity index 100%
rename from pkgs/tools/security/passphrase2pgp/default.nix
rename to pkgs/by-name/pa/passphrase2pgp/package.nix
diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/by-name/pa/past-time/package.nix
similarity index 100%
rename from pkgs/tools/misc/past-time/default.nix
rename to pkgs/by-name/pa/past-time/package.nix
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/by-name/pa/pastebinit/package.nix
similarity index 100%
rename from pkgs/tools/misc/pastebinit/default.nix
rename to pkgs/by-name/pa/pastebinit/package.nix
diff --git a/pkgs/tools/misc/pastebinit/use-drv-etc.patch b/pkgs/by-name/pa/pastebinit/use-drv-etc.patch
similarity index 100%
rename from pkgs/tools/misc/pastebinit/use-drv-etc.patch
rename to pkgs/by-name/pa/pastebinit/use-drv-etc.patch
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/by-name/pa/pasystray/package.nix
similarity index 100%
rename from pkgs/tools/audio/pasystray/default.nix
rename to pkgs/by-name/pa/pasystray/package.nix
diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/by-name/pa/patatt/package.nix
similarity index 100%
rename from pkgs/development/tools/patatt/default.nix
rename to pkgs/by-name/pa/patatt/package.nix
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/default.nix b/pkgs/by-name/pa/patchPpdFilesHook/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/default.nix
rename to pkgs/by-name/pa/patchPpdFilesHook/package.nix
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh
rename to pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-lines.awk
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk
rename to pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-lines.awk
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/test.nix b/pkgs/by-name/pa/patchPpdFilesHook/test.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/test.nix
rename to pkgs/by-name/pa/patchPpdFilesHook/test.nix
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd b/pkgs/by-name/pa/patchPpdFilesHook/test.ppd
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd
rename to pkgs/by-name/pa/patchPpdFilesHook/test.ppd
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/by-name/pa/patchage/package.nix
similarity index 100%
rename from pkgs/applications/audio/patchage/default.nix
rename to pkgs/by-name/pa/patchage/package.nix
diff --git a/pkgs/development/tools/patcher9x/default.nix b/pkgs/by-name/pa/patcher9x/package.nix
similarity index 100%
rename from pkgs/development/tools/patcher9x/default.nix
rename to pkgs/by-name/pa/patcher9x/package.nix
diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/by-name/pa/pathvector/package.nix
similarity index 100%
rename from pkgs/tools/networking/pathvector/default.nix
rename to pkgs/by-name/pa/pathvector/package.nix
diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/by-name/pa/patray/package.nix
similarity index 100%
rename from pkgs/tools/audio/patray/default.nix
rename to pkgs/by-name/pa/patray/package.nix
diff --git a/pkgs/development/tools/misc/patsh/default.nix b/pkgs/by-name/pa/patsh/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/patsh/default.nix
rename to pkgs/by-name/pa/patsh/package.nix
diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/by-name/pa/paulstretch/package.nix
similarity index 100%
rename from pkgs/applications/audio/paulstretch/default.nix
rename to pkgs/by-name/pa/paulstretch/package.nix
diff --git a/pkgs/by-name/pa/paup-cli/package.nix b/pkgs/by-name/pa/paup-cli/package.nix
new file mode 100644
index 000000000000..12796245bced
--- /dev/null
+++ b/pkgs/by-name/pa/paup-cli/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  autoPatchelfHook,
+  curl,
+  gfortran,
+  zlib,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "paup-cli";
+  version = "4.0a168";
+
+  src = fetchurl {
+    url = "http://phylosolutions.com/paup-test/paup4a168_centos64.gz";
+    hash = "sha256-41dZswlrIQ05f1zJzId78DKmPf0QH1SfrexzvCAUxq8=";
+  };
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    gunzip -c $src > paup
+
+    runHook postUnpack
+  '';
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+  buildInputs = [
+    curl
+    gfortran
+    zlib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 paup -t $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A software package for inferring evolutionary trees";
+    homepage = "http://phylosolutions.com/paup-test/";
+    license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    mainProgram = "paup";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/by-name/pa/paup/package.nix b/pkgs/by-name/pa/paup/package.nix
deleted file mode 100644
index 62bb5206587a..000000000000
--- a/pkgs/by-name/pa/paup/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  autoPatchelfHook,
-  curl,
-  gfortran,
-  zlib,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "paup";
-  version = "4.0a168";
-
-  src = fetchurl {
-    url = "http://phylosolutions.com/paup-test/paup4a168_centos64.gz";
-    hash = "sha256-41dZswlrIQ05f1zJzId78DKmPf0QH1SfrexzvCAUxq8=";
-  };
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    gunzip -c $src > paup
-
-    runHook postUnpack
-  '';
-
-  nativeBuildInputs = [ autoPatchelfHook ];
-  buildInputs = [
-    curl
-    gfortran
-    zlib
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 paup -t $out/bin
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "A software package for inferring evolutionary trees";
-    homepage = "http://phylosolutions.com/paup-test/";
-    license = lib.licenses.unfree;
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-    maintainers = with lib.maintainers; [ pandapip1 ];
-    mainProgram = "paup";
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/by-name/pa/pavucontrol/package.nix b/pkgs/by-name/pa/pavucontrol/package.nix
new file mode 100644
index 000000000000..a7ca399e4946
--- /dev/null
+++ b/pkgs/by-name/pa/pavucontrol/package.nix
@@ -0,0 +1,72 @@
+{
+  fetchFromGitLab,
+  lib,
+  stdenv,
+  pkg-config,
+  intltool,
+  libpulseaudio,
+  gtkmm4,
+  libsigcxx,
+  # Since version 6.1, libcanberra is optional
+  withLibcanberra ? true,
+  libcanberra-gtk3,
+  json-glib,
+  adwaita-icon-theme,
+  wrapGAppsHook4,
+  meson,
+  ninja,
+  libpressureaudio,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pavucontrol";
+  version = "6.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "pulseaudio";
+    repo = "pavucontrol";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-cru4I+LljYKIpIr7gSolnuLuUIXgc8l+JUmPrme4+YA=";
+  };
+
+  buildInputs = [
+    libpulseaudio
+    gtkmm4
+    libsigcxx
+    (lib.optionals withLibcanberra libcanberra-gtk3)
+    json-glib
+    adwaita-icon-theme
+    libpressureaudio
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+    wrapGAppsHook4
+    meson
+    ninja
+  ];
+
+  mesonFlags = [
+    "--prefix=${placeholder "out"}"
+    (lib.mesonBool "lynx" false)
+  ];
+
+  enableParallelBuilding = true;
+
+  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.
+    '';
+    mainProgram = "pavucontrol";
+    maintainers = with lib.maintainers; [ abbradar ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/by-name/pa/pax-rs/package.nix
similarity index 100%
rename from pkgs/development/tools/pax-rs/default.nix
rename to pkgs/by-name/pa/pax-rs/package.nix
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/by-name/pa/pax-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pax-utils/default.nix
rename to pkgs/by-name/pa/pax-utils/package.nix
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/by-name/pa/paxctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/paxctl/default.nix
rename to pkgs/by-name/pa/paxctl/package.nix
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/by-name/pa/paxtest/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/paxtest/default.nix
rename to pkgs/by-name/pa/paxtest/package.nix
diff --git a/pkgs/tools/archivers/payload-dumper-go/default.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix
similarity index 100%
rename from pkgs/tools/archivers/payload-dumper-go/default.nix
rename to pkgs/by-name/pa/payload-dumper-go/package.nix
diff --git a/pkgs/tools/archivers/payload_dumper/default.nix b/pkgs/by-name/pa/payload_dumper/package.nix
similarity index 100%
rename from pkgs/tools/archivers/payload_dumper/default.nix
rename to pkgs/by-name/pa/payload_dumper/package.nix
diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/by-name/pa/pazi/package.nix
similarity index 100%
rename from pkgs/tools/misc/pazi/default.nix
rename to pkgs/by-name/pa/pazi/package.nix
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/by-name/pb/pb_cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/pb_cli/default.nix
rename to pkgs/by-name/pb/pb_cli/package.nix
diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/by-name/pb/pbgopy/package.nix
similarity index 100%
rename from pkgs/tools/text/pbgopy/default.nix
rename to pkgs/by-name/pb/pbgopy/package.nix
diff --git a/pkgs/tools/admin/pbm/default.nix b/pkgs/by-name/pb/pbm/package.nix
similarity index 100%
rename from pkgs/tools/admin/pbm/default.nix
rename to pkgs/by-name/pb/pbm/package.nix
diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/by-name/pb/pbpctrl/package.nix
similarity index 100%
rename from pkgs/applications/audio/pbpctrl/default.nix
rename to pkgs/by-name/pb/pbpctrl/package.nix
diff --git a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/pkgs/by-name/pb/pbrt/openexr-cmake-3.12.patch
similarity index 100%
rename from pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
rename to pkgs/by-name/pb/pbrt/openexr-cmake-3.12.patch
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/by-name/pb/pbrt/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pbrt/default.nix
rename to pkgs/by-name/pb/pbrt/package.nix
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/by-name/pb/pbzip2/package.nix
similarity index 100%
rename from pkgs/tools/compression/pbzip2/default.nix
rename to pkgs/by-name/pb/pbzip2/package.nix
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/by-name/pb/pbzx/package.nix
similarity index 100%
rename from pkgs/tools/compression/pbzx/default.nix
rename to pkgs/by-name/pb/pbzx/package.nix
diff --git a/pkgs/tools/compression/pbzx/stdin.patch b/pkgs/by-name/pb/pbzx/stdin.patch
similarity index 100%
rename from pkgs/tools/compression/pbzx/stdin.patch
rename to pkgs/by-name/pb/pbzx/stdin.patch
diff --git a/pkgs/tools/misc/pc/default.nix b/pkgs/by-name/pc/pc/package.nix
similarity index 100%
rename from pkgs/tools/misc/pc/default.nix
rename to pkgs/by-name/pc/pc/package.nix
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/by-name/pc/pcalc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pcalc/default.nix
rename to pkgs/by-name/pc/pcalc/package.nix
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/by-name/pc/pcapc/package.nix
similarity index 100%
rename from pkgs/tools/networking/pcapc/default.nix
rename to pkgs/by-name/pc/pcapc/package.nix
diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/by-name/pc/pcapfix/package.nix
similarity index 100%
rename from pkgs/tools/networking/pcapfix/default.nix
rename to pkgs/by-name/pc/pcapfix/package.nix
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/by-name/pc/pcaudiolib/package.nix
similarity index 100%
rename from pkgs/development/libraries/pcaudiolib/default.nix
rename to pkgs/by-name/pc/pcaudiolib/package.nix
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/by-name/pc/pcb/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/pcb/default.nix
rename to pkgs/by-name/pc/pcb/package.nix
diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/by-name/pc/pcb2gcode/package.nix
similarity index 100%
rename from pkgs/tools/misc/pcb2gcode/default.nix
rename to pkgs/by-name/pc/pcb2gcode/package.nix
diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/by-name/pc/pcem/package.nix
similarity index 100%
rename from pkgs/applications/emulators/pcem/default.nix
rename to pkgs/by-name/pc/pcem/package.nix
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/by-name/pc/pcg_c/package.nix
similarity index 100%
rename from pkgs/development/libraries/pcg-c/default.nix
rename to pkgs/by-name/pc/pcg_c/package.nix
diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/by-name/pc/pcg_c/prefix-variable.patch
similarity index 100%
rename from pkgs/development/libraries/pcg-c/prefix-variable.patch
rename to pkgs/by-name/pc/pcg_c/prefix-variable.patch
diff --git a/pkgs/os-specific/linux/pcimem/default.nix b/pkgs/by-name/pc/pcimem/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pcimem/default.nix
rename to pkgs/by-name/pc/pcimem/package.nix
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/by-name/pc/pcloud/package.nix
similarity index 100%
rename from pkgs/applications/networking/pcloud/default.nix
rename to pkgs/by-name/pc/pcloud/package.nix
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/by-name/pc/pcm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pcm/default.nix
rename to pkgs/by-name/pc/pcm/package.nix
diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/by-name/pc/pcmanfm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/pcmanfm/default.nix
rename to pkgs/by-name/pc/pcmanfm/package.nix
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
similarity index 100%
rename from pkgs/applications/misc/pcmanx-gtk2/default.nix
rename to pkgs/by-name/pc/pcmanx-gtk2/package.nix
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/by-name/pc/pcmciaUtils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pcmciautils/default.nix
rename to pkgs/by-name/pc/pcmciaUtils/package.nix
diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/by-name/pc/pcmsolver/package.nix
similarity index 100%
rename from pkgs/development/libraries/pcmsolver/default.nix
rename to pkgs/by-name/pc/pcmsolver/package.nix
diff --git a/pkgs/tools/misc/pcp/default.nix b/pkgs/by-name/pc/pcp/package.nix
similarity index 100%
rename from pkgs/tools/misc/pcp/default.nix
rename to pkgs/by-name/pc/pcp/package.nix
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/by-name/pc/pcsc-cyberjack/package.nix
similarity index 100%
rename from pkgs/tools/security/pcsc-cyberjack/default.nix
rename to pkgs/by-name/pc/pcsc-cyberjack/package.nix
diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/by-name/pc/pcsc-safenet/package.nix
similarity index 100%
rename from pkgs/tools/security/pcsc-safenet/default.nix
rename to pkgs/by-name/pc/pcsc-safenet/package.nix
diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/pkgs/by-name/pc/pcsc-scm-scl011/eid.patch
similarity index 100%
rename from pkgs/tools/security/pcsc-scm-scl011/eid.patch
rename to pkgs/by-name/pc/pcsc-scm-scl011/eid.patch
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/by-name/pc/pcsc-scm-scl011/package.nix
similarity index 100%
rename from pkgs/tools/security/pcsc-scm-scl011/default.nix
rename to pkgs/by-name/pc/pcsc-scm-scl011/package.nix
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/by-name/pc/pcstat/package.nix
similarity index 100%
rename from pkgs/tools/system/pcstat/default.nix
rename to pkgs/by-name/pc/pcstat/package.nix
diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index 335cf8353f08..71b64e23672f 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pcsx2-bin";
-  version = "2.1.205";
+  version = "2.1.231";
 
   src = fetchurl {
     url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
-    hash = "sha256-m5OSxAUBJhokNd7AamQJmkKSMYd1JRidHVYLHpyb0IQ=";
+    hash = "sha256-c1Tvti8NatGct0OAwcWdFNBQhv6Zwiy2ECJ2qyCs9qA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/by-name/pd/pdal/package.nix
similarity index 100%
rename from pkgs/development/libraries/pdal/default.nix
rename to pkgs/by-name/pd/pdal/package.nix
diff --git a/pkgs/development/libraries/pdal/tests.nix b/pkgs/by-name/pd/pdal/tests.nix
similarity index 100%
rename from pkgs/development/libraries/pdal/tests.nix
rename to pkgs/by-name/pd/pdal/tests.nix
diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/by-name/pd/pdf-parser/package.nix
similarity index 100%
rename from pkgs/tools/misc/pdf-parser/default.nix
rename to pkgs/by-name/pd/pdf-parser/package.nix
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/by-name/pd/pdf-quench/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdf-quench/default.nix
rename to pkgs/by-name/pd/pdf-quench/package.nix
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/by-name/pd/pdf2djvu/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdf2djvu/default.nix
rename to pkgs/by-name/pd/pdf2djvu/package.nix
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/by-name/pd/pdf2svg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pdf2svg/default.nix
rename to pkgs/by-name/pd/pdf2svg/package.nix
diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/by-name/pd/pdfchain/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdfchain/default.nix
rename to pkgs/by-name/pd/pdfchain/package.nix
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/by-name/pd/pdfcpu/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pdfcpu/default.nix
rename to pkgs/by-name/pd/pdfcpu/package.nix
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/by-name/pd/pdfcrack/package.nix
similarity index 100%
rename from pkgs/tools/security/pdfcrack/default.nix
rename to pkgs/by-name/pd/pdfcrack/package.nix
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/by-name/pd/pdfdiff/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdfdiff/default.nix
rename to pkgs/by-name/pd/pdfdiff/package.nix
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/by-name/pd/pdfgrep/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdfgrep/default.nix
rename to pkgs/by-name/pd/pdfgrep/package.nix
diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/by-name/pd/pdfmm/package.nix
similarity index 100%
rename from pkgs/applications/office/pdfmm/default.nix
rename to pkgs/by-name/pd/pdfmm/package.nix
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/by-name/pd/pdfsandwich/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdfsandwich/default.nix
rename to pkgs/by-name/pd/pdfsandwich/package.nix
diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/by-name/pd/pdfslicer/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdfslicer/default.nix
rename to pkgs/by-name/pd/pdfslicer/package.nix
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/by-name/pd/pdftag/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pdftag/default.nix
rename to pkgs/by-name/pd/pdftag/package.nix
diff --git a/pkgs/tools/typesetting/pdftk/deps.json b/pkgs/by-name/pd/pdftk/deps.json
similarity index 100%
rename from pkgs/tools/typesetting/pdftk/deps.json
rename to pkgs/by-name/pd/pdftk/deps.json
diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/by-name/pd/pdftk/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdftk/default.nix
rename to pkgs/by-name/pd/pdftk/package.nix
diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/by-name/pd/pdftoipe/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pdftoipe/default.nix
rename to pkgs/by-name/pd/pdftoipe/package.nix
diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix
index 7159af6a03ae..519b72594a10 100644
--- a/pkgs/by-name/pd/pdi/package.nix
+++ b/pkgs/by-name/pd/pdi/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   # Patch it to make it match a 4 number-long version.
   postPatch = ''
     substituteInPlace plugins/decl_hdf5/cmake/FindHDF5.cmake \
-      --replace-fail '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)' '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)'
+      --replace-fail '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)' '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)*)'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pd/pdk/Gemfile b/pkgs/by-name/pd/pdk/Gemfile
index 1e165ac0c6c1..7a7c9e0ec7f4 100644
--- a/pkgs/by-name/pd/pdk/Gemfile
+++ b/pkgs/by-name/pd/pdk/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'pdk', '3.2.0'
+gem 'pdk', '3.3.0'
diff --git a/pkgs/by-name/pd/pdk/Gemfile.lock b/pkgs/by-name/pd/pdk/Gemfile.lock
index cd5c071a641b..c34293761fb2 100644
--- a/pkgs/by-name/pd/pdk/Gemfile.lock
+++ b/pkgs/by-name/pd/pdk/Gemfile.lock
@@ -1,24 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    childprocess (4.1.0)
-    cri (2.15.11)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
+    cri (2.15.12)
     deep_merge (1.2.2)
     diff-lcs (1.5.1)
     ffi (1.17.0)
     hitimes (2.0.0)
-    json-schema (4.3.0)
+    json-schema (4.3.1)
       addressable (>= 2.8)
     json_pure (2.6.3)
-    minitar (0.9)
+    logger (1.6.1)
+    minitar (0.12.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
     pathspec (1.1.3)
-    pdk (3.2.0)
+    pdk (3.3.0)
       bundler (>= 2.1.0, < 3.0.0)
-      childprocess (~> 4.1.0)
+      childprocess (~> 5.0)
       cri (~> 2.15.11)
       deep_merge (~> 1.2.2)
       diff-lcs (>= 1.5.0)
@@ -28,10 +30,14 @@ GEM
       json_pure (~> 2.6.3)
       minitar (~> 0.8)
       pathspec (~> 1.1)
+      puppet-modulebuilder (~> 1.0)
       tty-prompt (~> 0.23)
       tty-spinner (~> 0.9)
       tty-which (~> 0.5)
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
+    puppet-modulebuilder (1.1.0)
+      minitar (~> 0.9)
+      pathspec (>= 0.2.1, < 3.0.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
@@ -51,7 +57,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  pdk (= 3.2.0)
+  pdk (= 3.3.0)
 
 BUNDLED WITH
-   2.5.9
+   2.5.16
diff --git a/pkgs/by-name/pd/pdk/gemset.nix b/pkgs/by-name/pd/pdk/gemset.nix
index 28f276022d0e..77f06054e403 100644
--- a/pkgs/by-name/pd/pdk/gemset.nix
+++ b/pkgs/by-name/pd/pdk/gemset.nix
@@ -5,30 +5,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
       type = "gem";
     };
-    version = "2.8.6";
+    version = "2.8.7";
   };
   childprocess = {
+    dependencies = ["logger"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in";
+      sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "5.1.0";
   };
   cri = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5";
+      sha256 = "1rank6i9p2drwdcmhan6ifkzrz1v3mwpx47fwjl75rskxwjfkgwa";
       type = "gem";
     };
-    version = "2.15.11";
+    version = "2.15.12";
   };
   deep_merge = {
     groups = ["default"];
@@ -76,10 +77,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ljqbpjc5aa8a2cgq8f64iwbx7rr9dqvpk7v8n5jpslyz6mvyddc";
+      sha256 = "09bq393nrxa7hmphc3li8idgxdnb5hwgj15d0q5qsh4l5g1qvrnm";
       type = "gem";
     };
-    version = "4.3.0";
+    version = "4.3.1";
   };
   json_pure = {
     groups = ["default"];
@@ -91,15 +92,25 @@
     };
     version = "2.6.3";
   };
+  logger = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      type = "gem";
+    };
+    version = "1.6.1";
+  };
   minitar = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13";
+      sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s";
       type = "gem";
     };
-    version = "0.9";
+    version = "0.12.1";
   };
   pastel = {
     dependencies = ["tty-color"];
@@ -123,25 +134,36 @@
     version = "1.1.3";
   };
   pdk = {
-    dependencies = ["childprocess" "cri" "deep_merge" "diff-lcs" "ffi" "hitimes" "json-schema" "json_pure" "minitar" "pathspec" "tty-prompt" "tty-spinner" "tty-which"];
+    dependencies = ["childprocess" "cri" "deep_merge" "diff-lcs" "ffi" "hitimes" "json-schema" "json_pure" "minitar" "pathspec" "puppet-modulebuilder" "tty-prompt" "tty-spinner" "tty-which"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1avc2dgcdi9l6xam9crka790jhpx04536387f1vq2p9yqpr5lw7h";
+      sha256 = "1gildcnii3ayw585as8d8bqhnfb9diqg7n3vmgaz8c5b9wb8c106";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.3.0";
   };
   public_suffix = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
+      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
       type = "gem";
     };
-    version = "5.0.5";
+    version = "6.0.1";
+  };
+  puppet-modulebuilder = {
+    dependencies = ["minitar" "pathspec"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rh31hq24nkddd83cx7n9ln5bsib3a052hrmn120sq0937337173";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   tty-color = {
     groups = ["default"];
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/by-name/pd/pdm/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pdm/default.nix
rename to pkgs/by-name/pd/pdm/package.nix
diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/by-name/pd/pdns/package.nix
similarity index 100%
rename from pkgs/servers/dns/pdns/default.nix
rename to pkgs/by-name/pd/pdns/package.nix
diff --git a/pkgs/servers/dns/pdns/version.patch b/pkgs/by-name/pd/pdns/version.patch
similarity index 100%
rename from pkgs/servers/dns/pdns/version.patch
rename to pkgs/by-name/pd/pdns/version.patch
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/by-name/pd/pdnsd/package.nix
similarity index 100%
rename from pkgs/tools/networking/pdnsd/default.nix
rename to pkgs/by-name/pd/pdnsd/package.nix
diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/by-name/pe/pe-parse/package.nix
similarity index 100%
rename from pkgs/development/libraries/pe-parse/default.nix
rename to pkgs/by-name/pe/pe-parse/package.nix
diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
new file mode 100644
index 000000000000..953fc886632f
--- /dev/null
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -0,0 +1,110 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, libsForQt5
+, fpc
+, lazarus
+, xorg
+, libqt5pas
+, runCommand
+, _7zz
+, archiver
+, brotli
+, upx
+, zpaq
+, zstd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "peazip";
+  version = "10.0.0";
+
+  src = fetchFromGitHub {
+    owner = "peazip";
+    repo = pname;
+    rev = version;
+    hash = "sha256-dxFGYMq1L7oRGUAfshLTBCXrYL6lzJPu5qIItrjeE5c=";
+  };
+  sourceRoot = "${src.name}/peazip-sources";
+
+  postPatch = ''
+    # set it to use compression programs from $PATH
+    substituteInPlace dev/peach.pas --replace "  HSYSBIN       = 0;" "  HSYSBIN       = 2;"
+  '';
+
+  nativeBuildInputs = [
+    libsForQt5.wrapQtAppsHook
+    lazarus
+    fpc
+  ];
+
+  buildInputs = [
+    xorg.libX11
+    libqt5pas
+  ];
+
+  NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
+
+  buildPhase = ''
+    # lazarus tries to create files in $HOME/.lazarus
+    export HOME=$(mktemp -d)
+    pushd dev
+    lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk
+    lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi
+    lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi
+    popd
+  '';
+
+  # peazip looks for the "7z", not "7zz"
+  _7z = runCommand "7z" {} ''
+    mkdir -p $out/bin
+    ln -s ${_7zz}/bin/7zz $out/bin/7z
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D dev/{pea,peazip} -t $out/lib/peazip
+    wrapProgram $out/lib/peazip/peazip --prefix PATH : ${lib.makeBinPath [
+      _7z
+      archiver
+      brotli
+      upx
+      zpaq
+      zstd
+    ]}
+    mkdir -p $out/bin
+    ln -s $out/lib/peazip/{pea,peazip} $out/bin/
+
+    mkdir -p $out/share/peazip $out/lib/peazip/res/share
+    ln -s $out/share/peazip $out/lib/peazip/res/share
+    cp -r res/share/{icons,lang,themes,presets} $out/share/peazip/
+    # Install desktop entries
+    install -D res/share/batch/freedesktop_integration/*.desktop -t $out/share/applications
+    # Install desktop entries's icons
+    mkdir -p $out/share/icons/hicolor/256x256/apps
+    ln -s $out/share/peazip/icons/peazip.png -t $out/share/icons/hicolor/256x256/apps/
+    mkdir $out/share/icons/hicolor/256x256/mimetypes
+    ln -s $out/share/peazip/icons/peazip_{7z,zip,cd}.png $out/share/icons/hicolor/256x256/mimetypes/
+    mkdir $out/share/icons/hicolor/256x256/actions
+    ln -s $out/share/peazip/icons/peazip_{add,extract,convert}.png $out/share/icons/hicolor/256x256/actions/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Cross-platform file and archive manager";
+    longDescription = ''
+      Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager.
+
+      Features volume spanning, compression, authenticated encryption.
+
+      Supports 7Z, 7-Zip sfx, ACE, ARJ, Brotli, BZ2, CAB, CHM, CPIO, DEB, GZ, ISO, JAR, LHA/LZH, NSIS, OOo, PEA, RAR, RPM, split, TAR, Z, ZIP, ZIPX, Zstandard.
+    '';
+    license = licenses.gpl3Only;
+    homepage = "https://peazip.github.io";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ annaaurora ];
+    mainProgram = "peazip";
+  };
+}
diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/by-name/pe/pebble/package.nix
similarity index 100%
rename from pkgs/tools/admin/pebble/default.nix
rename to pkgs/by-name/pe/pebble/package.nix
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/by-name/pe/pecita/package.nix
similarity index 100%
rename from pkgs/data/fonts/pecita/default.nix
rename to pkgs/by-name/pe/pecita/package.nix
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/by-name/pe/peco/package.nix
similarity index 100%
rename from pkgs/tools/text/peco/default.nix
rename to pkgs/by-name/pe/peco/package.nix
diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/by-name/pe/peek/package.nix
similarity index 100%
rename from pkgs/applications/video/peek/default.nix
rename to pkgs/by-name/pe/peek/package.nix
diff --git a/pkgs/tools/misc/peep/default.nix b/pkgs/by-name/pe/peep/package.nix
similarity index 100%
rename from pkgs/tools/misc/peep/default.nix
rename to pkgs/by-name/pe/peep/package.nix
diff --git a/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch b/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
similarity index 100%
rename from pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
rename to pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/by-name/pe/peering-manager/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/peering-manager/default.nix
rename to pkgs/by-name/pe/peering-manager/package.nix
diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix
index 3981fb69f311..749948f2ccf2 100644
--- a/pkgs/by-name/pe/peertube-viewer/package.nix
+++ b/pkgs/by-name/pe/peertube-viewer/package.nix
@@ -4,7 +4,7 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "peertube-viewer";
   version = "1.8.6";
 
@@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ haruki7049 ];
+    mainProgram = "peertube-viewer-rs";
   };
 }
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/by-name/pe/peg/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/peg/default.nix
rename to pkgs/by-name/pe/peg/package.nix
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/by-name/pe/pell/package.nix
similarity index 100%
rename from pkgs/applications/misc/pell/default.nix
rename to pkgs/by-name/pe/pell/package.nix
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/by-name/pe/penna/package.nix
similarity index 100%
rename from pkgs/data/fonts/penna/default.nix
rename to pkgs/by-name/pe/penna/package.nix
diff --git a/pkgs/tools/security/pentestgpt/default.nix b/pkgs/by-name/pe/pentestgpt/package.nix
similarity index 100%
rename from pkgs/tools/security/pentestgpt/default.nix
rename to pkgs/by-name/pe/pentestgpt/package.nix
diff --git a/pkgs/tools/misc/perccli/default.nix b/pkgs/by-name/pe/perccli/package.nix
similarity index 100%
rename from pkgs/tools/misc/perccli/default.nix
rename to pkgs/by-name/pe/perccli/package.nix
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/by-name/pe/perceptualdiff/package.nix
similarity index 100%
rename from pkgs/tools/graphics/perceptualdiff/default.nix
rename to pkgs/by-name/pe/perceptualdiff/package.nix
diff --git a/pkgs/tools/text/percollate/default.nix b/pkgs/by-name/pe/percollate/package.nix
similarity index 100%
rename from pkgs/tools/text/percollate/default.nix
rename to pkgs/by-name/pe/percollate/package.nix
diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/by-name/pe/perf-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/perf-tools/default.nix
rename to pkgs/by-name/pe/perf-tools/package.nix
diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/by-name/pe/perfect-hash/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/perfect-hash/default.nix
rename to pkgs/by-name/pe/perfect-hash/package.nix
diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix
new file mode 100644
index 000000000000..f1082473cf98
--- /dev/null
+++ b/pkgs/by-name/pe/performous/package.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  SDL2,
+  aubio,
+  boost,
+  cmake,
+  ffmpeg,
+  fmt,
+  gettext,
+  glew,
+  glibmm,
+  glm,
+  icu,
+  libepoxy,
+  librsvg,
+  libxmlxx,
+  nlohmann_json,
+  pango,
+  pkg-config,
+  portaudio,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "performous";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "performous";
+    repo = "performous";
+    rev = "refs/tags/${version}";
+    hash = "sha256-f70IHA8LqIlkMRwJqSmszx3keStSx50nKcEWLGEjc3g=";
+  };
+
+  cedSrc = fetchFromGitHub {
+    owner = "performous";
+    repo = "compact_enc_det";
+    rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e";
+    hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec=";
+  };
+
+  patches = [
+    ./performous-cmake.patch
+    ./performous-fftw.patch
+    (fetchpatch {
+      name = "performous-ffmpeg.patch";
+      url = "https://github.com/performous/performous/commit/f26c27bf74b85fa3e3b150682ab9ecf9aecb3c50.patch";
+      excludes = [ ".github/workflows/macos.yml" ];
+      hash = "sha256-cQVelET/g2Kx2PlV3pspjEoNIwwn5Yz6enYl5vCMMKo=";
+    })
+  ];
+
+  postPatch = ''
+    mkdir ced-src
+    cp -R ${cedSrc}/* ced-src
+
+    substituteInPlace data/CMakeLists.txt \
+      --replace "/usr" "$out"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    gettext
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    aubio
+    boost
+    ffmpeg
+    fmt
+    glew
+    glibmm
+    glm
+    icu
+    libepoxy
+    librsvg
+    libxmlxx
+    nlohmann_json
+    pango
+    portaudio
+  ];
+
+  meta = with lib; {
+    description = "Karaoke, band and dancing game";
+    mainProgram = "performous";
+    homepage = "https://performous.org/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ wegank ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/by-name/pe/performous/performous-cmake.patch
similarity index 100%
rename from pkgs/games/performous/performous-cmake.patch
rename to pkgs/by-name/pe/performous/performous-cmake.patch
diff --git a/pkgs/games/performous/performous-fftw.patch b/pkgs/by-name/pe/performous/performous-fftw.patch
similarity index 100%
rename from pkgs/games/performous/performous-fftw.patch
rename to pkgs/by-name/pe/performous/performous-fftw.patch
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/by-name/pe/perkeep/package.nix
similarity index 100%
rename from pkgs/applications/misc/perkeep/default.nix
rename to pkgs/by-name/pe/perkeep/package.nix
diff --git a/pkgs/development/tools/language-servers/perlnavigator/default.nix b/pkgs/by-name/pe/perlnavigator/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/perlnavigator/default.nix
rename to pkgs/by-name/pe/perlnavigator/package.nix
diff --git a/pkgs/by-name/pe/peroxide/package.nix b/pkgs/by-name/pe/peroxide/package.nix
new file mode 100644
index 000000000000..1275329bcf65
--- /dev/null
+++ b/pkgs/by-name/pe/peroxide/package.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildGo122Module
+, fetchFromGitHub
+, nixosTests
+}:
+
+buildGo122Module rec {
+  pname = "peroxide";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "ljanyst";
+    repo = "peroxide";
+    rev = "v${version}";
+    sha256 = "sha256-6Jb1i4aNjeemiQp9FF/KGyZ+Evom9PPBvARbJWyrhok=";
+  };
+
+  vendorHash = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY=";
+
+  postPatch = ''
+    # These tests connect to the internet, which does not work in sandboxed
+    # builds, so skip these.
+    rm pkg/pmapi/dialer_pinning_test.go \
+       pkg/pmapi/dialer_proxy_provider_test.go \
+       pkg/pmapi/dialer_proxy_test.go
+  '';
+
+  passthru.tests.peroxide = nixosTests.peroxide;
+
+  meta = with lib; {
+    homepage = "https://github.com/ljanyst/peroxide";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ aidalgol ];
+    description = "Unofficial ProtonMail bridge";
+    longDescription = ''
+      Peroxide is a fork of the official ProtonMail bridge that aims to be
+      similar to Hydroxide while reusing as much code from the official bridge
+      as possible.
+    '';
+  };
+}
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/by-name/pe/perseus/package.nix
similarity index 100%
rename from pkgs/applications/science/math/perseus/default.nix
rename to pkgs/by-name/pe/perseus/package.nix
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/by-name/pe/peru/package.nix
similarity index 100%
rename from pkgs/applications/version-management/peru/default.nix
rename to pkgs/by-name/pe/peru/package.nix
diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
new file mode 100644
index 000000000000..4e0fdaebdb33
--- /dev/null
+++ b/pkgs/by-name/pe/pest-ide-tools/package.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, nix-update-script
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "pest-ide-tools";
+  version = "0.3.11";
+  cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
+
+  src = fetchFromGitHub {
+    owner = "pest-parser";
+    repo = "pest-ide-tools";
+    rev = "v${version}";
+    sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ=";
+  };
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "IDE support for Pest, via the LSP";
+    homepage = "https://pest.rs";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ nickhu ];
+    mainProgram = "pest-language-server";
+  };
+}
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/by-name/pe/pet/package.nix
similarity index 100%
rename from pkgs/development/tools/pet/default.nix
rename to pkgs/by-name/pe/pet/package.nix
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/by-name/pe/petidomo/package.nix
similarity index 100%
rename from pkgs/servers/mail/petidomo/default.nix
rename to pkgs/by-name/pe/petidomo/package.nix
diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 8d0db4a768db..ebe5564441ca 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -10,7 +10,6 @@
   mpiSupport ? true,
   mpi, # generic mpi dependency
   mpiCheckPhaseHook,
-  openssh, # required for openmpi tests
   petsc-withp4est ? false,
   hdf5-support ? false,
   hdf5,
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
     python3
     gfortran
     pkg-config
-  ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh;
+  ] ++ lib.optional mpiSupport mpi;
   buildInputs = [
     blas
     lapack
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/by-name/pe/pev/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/pev/default.nix
rename to pkgs/by-name/pe/pev/package.nix
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/by-name/pe/pew/package.nix
similarity index 100%
rename from pkgs/development/tools/pew/default.nix
rename to pkgs/by-name/pe/pew/package.nix
diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/by-name/pf/pferd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pferd/default.nix
rename to pkgs/by-name/pf/pferd/package.nix
diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/by-name/pf/pfetch-rs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pfetch-rs/default.nix
rename to pkgs/by-name/pf/pfetch-rs/package.nix
diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/by-name/pf/pfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/pfetch/default.nix
rename to pkgs/by-name/pf/pfetch/package.nix
diff --git a/pkgs/development/libraries/pffft/default.nix b/pkgs/by-name/pf/pffft/package.nix
similarity index 100%
rename from pkgs/development/libraries/pffft/default.nix
rename to pkgs/by-name/pf/pffft/package.nix
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/by-name/pf/pflask/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pflask/default.nix
rename to pkgs/by-name/pf/pflask/package.nix
diff --git a/pkgs/tools/misc/pfsshell/default.nix b/pkgs/by-name/pf/pfsshell/package.nix
similarity index 100%
rename from pkgs/tools/misc/pfsshell/default.nix
rename to pkgs/by-name/pf/pfsshell/package.nix
diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix
index d5f5dddea496..a097eb8aa9c7 100644
--- a/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql, makeWrapper }:
+{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql_17, makeWrapper }:
 
 buildGoModule rec {
   pname = "pg-dump-anon";
@@ -14,12 +14,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-CwU1zoIayxvfnGL9kPdummPJiV+ECfSz4+q6gZGb8pw=";
 
-  passthru.tests = { inherit (nixosTests) pg_anonymizer; };
+  passthru.tests = { inherit (nixosTests.postgresql) anonymizer; };
 
   nativeBuildInputs = [ makeWrapper ];
   postInstall = ''
     wrapProgram $out/bin/pg_dump_anon \
-      --prefix PATH : ${lib.makeBinPath [ postgresql ]}
+      --prefix PATH : ${lib.makeBinPath [ postgresql_17 ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/by-name/pg/pg_activity/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pg_activity/default.nix
rename to pkgs/by-name/pg/pg_activity/package.nix
diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/by-name/pg/pg_checksums/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pg_checksums/default.nix
rename to pkgs/by-name/pg/pg_checksums/package.nix
diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/by-name/pg/pg_featureserv/package.nix
similarity index 100%
rename from pkgs/servers/geospatial/pg_featureserv/default.nix
rename to pkgs/by-name/pg/pg_featureserv/package.nix
diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/by-name/pg/pg_flame/package.nix
similarity index 100%
rename from pkgs/tools/misc/pg_flame/default.nix
rename to pkgs/by-name/pg/pg_flame/package.nix
diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/by-name/pg/pg_tileserv/package.nix
similarity index 100%
rename from pkgs/servers/geospatial/pg_tileserv/default.nix
rename to pkgs/by-name/pg/pg_tileserv/package.nix
diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/by-name/pg/pg_top/package.nix
similarity index 100%
rename from pkgs/tools/misc/pg_top/default.nix
rename to pkgs/by-name/pg/pg_top/package.nix
diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/by-name/pg/pgbackrest/package.nix
similarity index 100%
rename from pkgs/tools/backup/pgbackrest/default.nix
rename to pkgs/by-name/pg/pgbackrest/package.nix
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/by-name/pg/pgbouncer/package.nix
similarity index 100%
rename from pkgs/servers/sql/pgbouncer/default.nix
rename to pkgs/by-name/pg/pgbouncer/package.nix
diff --git a/pkgs/servers/sql/pgcat/default.nix b/pkgs/by-name/pg/pgcat/package.nix
similarity index 100%
rename from pkgs/servers/sql/pgcat/default.nix
rename to pkgs/by-name/pg/pgcat/package.nix
diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/by-name/pg/pgcenter/package.nix
similarity index 100%
rename from pkgs/tools/misc/pgcenter/default.nix
rename to pkgs/by-name/pg/pgcenter/package.nix
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/by-name/pg/pgf_graphics/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pgf/default.nix
rename to pkgs/by-name/pg/pgf_graphics/package.nix
diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/by-name/pg/pgformatter/package.nix
similarity index 100%
rename from pkgs/development/tools/pgformatter/default.nix
rename to pkgs/by-name/pg/pgformatter/package.nix
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/by-name/pg/pgloader/package.nix
similarity index 100%
rename from pkgs/development/tools/pgloader/default.nix
rename to pkgs/by-name/pg/pgloader/package.nix
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/by-name/pg/pgmanage/package.nix
similarity index 100%
rename from pkgs/applications/misc/pgmanage/default.nix
rename to pkgs/by-name/pg/pgmanage/package.nix
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/by-name/pg/pgmetrics/package.nix
similarity index 100%
rename from pkgs/tools/misc/pgmetrics/default.nix
rename to pkgs/by-name/pg/pgmetrics/package.nix
diff --git a/pkgs/applications/networking/cluster/pgo-client/default.nix b/pkgs/by-name/pg/pgo-client/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pgo-client/default.nix
rename to pkgs/by-name/pg/pgo-client/package.nix
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/by-name/pg/pgpdump/package.nix
similarity index 100%
rename from pkgs/tools/security/pgpdump/default.nix
rename to pkgs/by-name/pg/pgpdump/package.nix
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
rename to pkgs/by-name/pg/pgpkeyserver-lite/package.nix
diff --git a/pkgs/servers/sql/pgpool/darwin-strlcpy.patch b/pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
similarity index 100%
rename from pkgs/servers/sql/pgpool/darwin-strlcpy.patch
rename to pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/by-name/pg/pgpool/package.nix
similarity index 100%
rename from pkgs/servers/sql/pgpool/default.nix
rename to pkgs/by-name/pg/pgpool/package.nix
diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/by-name/pg/pgtop/package.nix
similarity index 100%
rename from pkgs/development/tools/pgtop/default.nix
rename to pkgs/by-name/pg/pgtop/package.nix
diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix
new file mode 100644
index 000000000000..ed539899ba3d
--- /dev/null
+++ b/pkgs/by-name/pg/pgweb/package.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, pgweb
+}:
+
+buildGoModule rec {
+  pname = "pgweb";
+  version = "0.16.2";
+
+  src = fetchFromGitHub {
+    owner = "sosedoff";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-gZK8+H3dBMzSVyE96E7byihKMR4+1YlVFZJtCTGUZwI=";
+  };
+
+  postPatch = ''
+    # Disable tests require network access.
+    rm -f pkg/client/{client,dump}_test.go
+  '';
+
+  vendorHash = "sha256-Jpvf6cST3kBvYzCQLoJ1fijUC/hP1ouptd2bQZ1J/Lo=";
+
+  ldflags = [ "-s" "-w" ];
+
+  checkFlags =
+    let
+      skippedTests = [
+        # There is a `/tmp/foo` file on the test machine causing the test case to fail on macOS
+        "TestParseOptions"
+      ];
+    in
+    [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ];
+
+    passthru.tests.version = testers.testVersion {
+      version = "v${version}";
+      package = pgweb;
+      command = "pgweb --version";
+    };
+
+  meta = with lib; {
+    changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}";
+    description = "Web-based database browser for PostgreSQL";
+    longDescription = ''
+      A simple postgres browser that runs as a web server. You can view data,
+      run queries and examine tables and indexes.
+    '';
+    homepage = "https://sosedoff.github.io/pgweb/";
+    license = licenses.mit;
+    mainProgram = "pgweb";
+    maintainers = with maintainers; [ zupo luisnquin ];
+  };
+}
diff --git a/pkgs/tools/networking/phantomsocks/default.nix b/pkgs/by-name/ph/phantomsocks/package.nix
similarity index 100%
rename from pkgs/tools/networking/phantomsocks/default.nix
rename to pkgs/by-name/ph/phantomsocks/package.nix
diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix
index 8e6d7bf31127..f05cf2752522 100644
--- a/pkgs/by-name/ph/pharo/package.nix
+++ b/pkgs/by-name/ph/pharo/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   preFixup = let
     libPath = lib.makeLibraryPath (finalAttrs.buildInputs ++ [
-      stdenv.cc.cc.lib
+      stdenv.cc.cc
       "$out"
     ]);
   in ''
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/by-name/ph/phash/package.nix
similarity index 100%
rename from pkgs/development/libraries/phash/default.nix
rename to pkgs/by-name/ph/phash/package.nix
diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/by-name/ph/phd2/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/phd2/default.nix
rename to pkgs/by-name/ph/phd2/package.nix
diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/by-name/ph/phinger-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/phinger-cursors/default.nix
rename to pkgs/by-name/ph/phinger-cursors/package.nix
diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/by-name/ph/phlare/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/phlare/default.nix
rename to pkgs/by-name/ph/phlare/package.nix
diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/by-name/ph/phockup/package.nix
similarity index 100%
rename from pkgs/applications/misc/phockup/default.nix
rename to pkgs/by-name/ph/phockup/package.nix
diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/by-name/ph/phodav/package.nix
similarity index 100%
rename from pkgs/tools/networking/phodav/default.nix
rename to pkgs/by-name/ph/phodav/package.nix
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/by-name/ph/phoronix-test-suite/package.nix
similarity index 100%
rename from pkgs/tools/misc/phoronix-test-suite/default.nix
rename to pkgs/by-name/ph/phoronix-test-suite/package.nix
diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/by-name/ph/phoronix-test-suite/tests.nix
similarity index 100%
rename from pkgs/tools/misc/phoronix-test-suite/tests.nix
rename to pkgs/by-name/ph/phoronix-test-suite/tests.nix
diff --git a/pkgs/by-name/ph/photofield/package.nix b/pkgs/by-name/ph/photofield/package.nix
new file mode 100644
index 000000000000..0858765f8caf
--- /dev/null
+++ b/pkgs/by-name/ph/photofield/package.nix
@@ -0,0 +1,81 @@
+{ lib
+, fetchFromGitHub
+, buildGo122Module
+, buildNpmPackage
+, makeWrapper
+, exiftool
+, ffmpeg
+, testers
+, photofield
+, nix-update-script
+}:
+
+let
+  version = "0.17.0";
+
+  src = fetchFromGitHub {
+    owner = "SmilyOrg";
+    repo = "photofield";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GYU0BR5X3s3SGmZEFMyK7m+zUa2i2E9krAbtk8dwPdg=";
+  };
+
+  webui = buildNpmPackage {
+    inherit src version;
+    pname = "photofield-ui";
+
+    sourceRoot = "${src.name}/ui";
+
+    npmDepsHash = "sha256-ULl4wHEo/PP0Y0O5po7eRDd+T/UjkZhQGIj262WFtFU=";
+
+    installPhase = ''
+      mkdir -p $out/share
+      mv dist $out/share/photofield-ui
+    '';
+  };
+in
+
+buildGo122Module {
+  pname = "photofield";
+  inherit version src;
+
+  vendorHash = "sha256-eN9syG9/QUA8yut3LaeIb+xlaNUvRAFspyqcCHv6oSA=";
+
+  preBuild = ''
+    cp -r ${webui}/share/photofield-ui ui/dist
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+    "-X main.builtBy=Nix"
+  ];
+
+  tags = [ "embedui" ];
+
+  doCheck = false; # tries to modify filesytem
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/photofield \
+      --prefix PATH : "${lib.makeBinPath [exiftool ffmpeg]}"
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = photofield;
+      command = "photofield -version";
+    };
+  };
+
+  meta = with lib; {
+    description = "Experimental fast photo viewer";
+    homepage = "https://github.com/SmilyOrg/photofield";
+    license = licenses.mit;
+    mainProgram = "photofield";
+    maintainers = with maintainers; [ dit7ya ];
+  };
+}
diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/by-name/ph/photon-rss/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/photon/default.nix
rename to pkgs/by-name/ph/photon-rss/package.nix
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/by-name/ph/photon/package.nix
similarity index 100%
rename from pkgs/tools/networking/photon/default.nix
rename to pkgs/by-name/ph/photon/package.nix
diff --git a/pkgs/by-name/ph/photonvision/package.nix b/pkgs/by-name/ph/photonvision/package.nix
index 408dfb123f30..09330c9c442b 100644
--- a/pkgs/by-name/ph/photonvision/package.nix
+++ b/pkgs/by-name/ph/photonvision/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     install -D $src $out/lib/photonvision.jar
 
     makeWrapper ${temurin-jre-bin-11}/bin/java $out/bin/photonvision \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib suitesparse ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc suitesparse ]} \
       --prefix PATH : ${lib.makeBinPath [ temurin-jre-bin-11 bash.out ]} \
       --add-flags "-jar $out/lib/photonvision.jar"
 
diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix
similarity index 100%
rename from pkgs/servers/photoprism/backend.nix
rename to pkgs/by-name/ph/photoprism/backend.nix
diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix
similarity index 100%
rename from pkgs/servers/photoprism/frontend.nix
rename to pkgs/by-name/ph/photoprism/frontend.nix
diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/by-name/ph/photoprism/libtensorflow.nix
similarity index 97%
rename from pkgs/servers/photoprism/libtensorflow.nix
rename to pkgs/by-name/ph/photoprism/libtensorflow.nix
index e1c8f9338cc8..db1be8d95e24 100644
--- a/pkgs/servers/photoprism/libtensorflow.nix
+++ b/pkgs/by-name/ph/photoprism/libtensorflow.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   # Patch library to use our libc, libstdc++ and others
   patchPhase =
     let
-      rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ];
+      rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc ];
     in
     ''
       chmod -R +w lib
diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/by-name/ph/photoprism/package.nix
similarity index 100%
rename from pkgs/servers/photoprism/default.nix
rename to pkgs/by-name/ph/photoprism/package.nix
diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix
index dbd86adc44cc..7a171733b480 100644
--- a/pkgs/by-name/ph/phpactor/package.nix
+++ b/pkgs/by-name/ph/phpactor/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpactor";
-  version = "2024.06.30.0";
+  version = "2024.11.05.0";
 
   src = fetchFromGitHub {
     owner = "phpactor";
     repo = "phpactor";
     rev = finalAttrs.version;
-    hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM=";
+    hash = "sha256-/h7Apqo0N4aQvLfzfV/v35npo1wwOOZksokJKhCp8oA=";
   };
 
-  vendorHash = "sha256-Q72EeGeVqjaOZeW8VAB59OY0E/wvL8Ljq/9XC4iK/rg=";
+  vendorHash = "sha256-nfy2H6isjW7m0UdPaX9Kqt2iwA2IwOhHE+xmqJ2t1qo=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/by-name/ph/phrase-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/phrase-cli/default.nix
rename to pkgs/by-name/ph/phrase-cli/package.nix
diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/by-name/ph/phrasendrescher/package.nix
similarity index 100%
rename from pkgs/tools/security/phrasendrescher/default.nix
rename to pkgs/by-name/ph/phrasendrescher/package.nix
diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/by-name/ph/phylactery/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/phylactery/default.nix
rename to pkgs/by-name/ph/phylactery/package.nix
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/by-name/ph/physlock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/physlock/default.nix
rename to pkgs/by-name/ph/physlock/package.nix
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/by-name/pi/pianobar/package.nix
similarity index 100%
rename from pkgs/applications/audio/pianobar/default.nix
rename to pkgs/by-name/pi/pianobar/package.nix
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/by-name/pi/picard-tools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/picard-tools/default.nix
rename to pkgs/by-name/pi/picard-tools/package.nix
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/by-name/pi/picard/package.nix
similarity index 100%
rename from pkgs/applications/audio/picard/default.nix
rename to pkgs/by-name/pi/picard/package.nix
diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/by-name/pi/picat/package.nix
similarity index 100%
rename from pkgs/development/compilers/picat/default.nix
rename to pkgs/by-name/pi/picat/package.nix
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/by-name/pi/pick/package.nix
similarity index 100%
rename from pkgs/tools/misc/pick/default.nix
rename to pkgs/by-name/pi/pick/package.nix
diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/by-name/pi/pico-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/pico-sdk/default.nix
rename to pkgs/by-name/pi/pico-sdk/package.nix
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/by-name/pi/picoc/package.nix
similarity index 100%
rename from pkgs/development/interpreters/picoc/default.nix
rename to pkgs/by-name/pi/picoc/package.nix
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/by-name/pi/picolisp/package.nix
similarity index 100%
rename from pkgs/development/interpreters/picolisp/default.nix
rename to pkgs/by-name/pi/picolisp/package.nix
diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/by-name/pi/picoloop/package.nix
similarity index 100%
rename from pkgs/applications/audio/picoloop/default.nix
rename to pkgs/by-name/pi/picoloop/package.nix
diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix
index a735f2691331..098e7a68be1a 100644
--- a/pkgs/by-name/pi/picom-pijulius/package.nix
+++ b/pkgs/by-name/pi/picom-pijulius/package.nix
@@ -9,13 +9,13 @@
 }:
 picom.overrideAttrs (previousAttrs: {
   pname = "picom-pijulius";
-  version = "8.2-unstable-2024-10-05";
+  version = "8.2-unstable-2024-10-30";
 
   src = fetchFromGitHub {
     owner = "pijulius";
     repo = "picom";
-    rev = "9977760e5ace3b17453e3cd89d14bc0f8de5b5f9";
-    hash = "sha256-lqmZqEmD/+qZg+8UOOGJB6L0FdUuZFN5qBdL593RC/A=";
+    rev = "bdbcae085c1ba6c2ec6f21712ed140daaa630d89";
+    hash = "sha256-3S8p4vXfryL3IfWPpjhp1GxqJelHRw5aFI3a+ysRKTU=";
   };
 
   buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ];
diff --git a/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/picoprobe-udev-rules/default.nix
rename to pkgs/by-name/pi/picoprobe-udev-rules/package.nix
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/by-name/pi/picosat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/picosat/default.nix
rename to pkgs/by-name/pi/picosat/package.nix
diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix
new file mode 100644
index 000000000000..056a682d1c1c
--- /dev/null
+++ b/pkgs/by-name/pi/picoscope/package.nix
@@ -0,0 +1,137 @@
+{ stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0
+, glib, libusb1 , zlib, gtk3-x11, callPackage, writeTextDir
+, scopes ? [
+  "picocv"
+  "ps2000"
+  "ps2000a"
+  "ps3000"
+  "ps3000a"
+  "ps4000"
+  "ps4000a"
+  "ps5000"
+  "ps5000a"
+  "ps6000"
+  "ps6000a"
+] }:
+
+let
+  shared_meta = lib: {
+    homepage = "https://www.picotech.com/downloads/linux";
+    maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members;
+    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.unfree;
+  };
+
+  libpicoipp = callPackage ({ stdenv, lib, fetchurl, autoPatchelfHook, dpkg }:
+    stdenv.mkDerivation rec {
+      pname = "libpicoipp";
+      inherit (sources.libpicoipp) version;
+      src = fetchurl { inherit (sources.libpicoipp) url sha256; };
+      nativeBuildInputs = [ dpkg autoPatchelfHook ];
+      buildInputs = [ (lib.getLib stdenv.cc.cc) ];
+      sourceRoot = ".";
+      unpackCmd = "dpkg-deb -x $src .";
+      installPhase = ''
+        runHook preInstall
+        mkdir -p $out/lib
+        cp -d opt/picoscope/lib/* $out/lib
+        install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright
+        runHook postInstall
+      '';
+      meta = shared_meta lib // {
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+        description = "library for picotech oscilloscope software";
+      };
+    }) { };
+
+  # If we don't have a platform available, put a dummy version here, so at
+  # least evaluation succeeds.
+  sources =
+    (lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}");
+
+  scopePkg = name:
+    { url, version, sha256 }:
+    stdenv.mkDerivation rec {
+      pname = "lib${name}";
+      inherit version;
+      src = fetchurl { inherit url sha256; };
+      # picoscope does a signature check, so we can't patchelf these
+      nativeBuildInputs = [ dpkg ];
+      sourceRoot = ".";
+      unpackCmd = "dpkg-deb -x $src .";
+      installPhase = ''
+        runHook preInstall
+        mkdir -p $out/lib
+        cp -d opt/picoscope/lib/* $out/lib
+         runHook postInstall
+      '';
+      meta = with lib;
+        shared_meta lib // {
+          description = "library for picotech oscilloscope ${name} series";
+        };
+    };
+
+  scopePkgs = lib.mapAttrs scopePkg sources;
+
+in stdenv.mkDerivation rec {
+  pname = "picoscope";
+  inherit (sources.picoscope) version;
+
+  src = fetchurl { inherit (sources.picoscope) url sha256; };
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+  buildInputs = [ gtk-sharp-3_0 mono glib libusb1 zlib ];
+
+  unpackCmd = "dpkg-deb -x $src .";
+  sourceRoot = ".";
+  scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs;
+  MONO_PATH = "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" + (lib.makeLibraryPath
+    ([
+      glib
+      gtk3-x11
+      gtk-sharp-3_0
+      libusb1
+      zlib
+      libpicoipp
+    ] ++ scopeLibs));
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/
+    cp -dr usr/share $out/share
+    cp -dr opt/picoscope/* $out/
+    makeWrapper "$(command -v mono)" $out/bin/picoscope \
+      --add-flags $out/lib/PicoScope.GTK.exe \
+      --prefix MONO_PATH : "$MONO_PATH" \
+      --prefix LD_LIBRARY_PATH : "$MONO_PATH" \
+      --set LANG C
+    runHook postInstall
+  '';
+
+  # usage:
+  # services.udev.packages = [ pkgs.picoscope.rules ];
+  # users.groups.pico = {};
+  # users.users.you.extraGroups = [ "pico" ];
+  passthru.rules = writeTextDir "lib/udev/rules.d/95-pico.rules" ''
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico"
+  '';
+
+  meta = with lib;
+    shared_meta lib // {
+      description =
+        "Oscilloscope application that works with all PicoScope models";
+      longDescription = ''
+        PicoScope for Linux is a powerful oscilloscope application that works
+        with all PicoScope models. The most important features from PicoScope
+        for Windows are included—scope, spectrum analyzer, advanced triggers,
+        automated measurements, interactive zoom, persistence modes and signal
+        generator control. More features are being added all the time.
+
+        Waveform captures can be saved for off-line analysis, and shared with
+        PicoScope for Linux, PicoScope for macOS and PicoScope for Windows
+        users, or exported in text, CSV and MathWorks MATLAB 4 formats.
+      '';
+      sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    };
+}
+
diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/by-name/pi/picoscope/sources.json
similarity index 100%
rename from pkgs/applications/science/electronics/picoscope/sources.json
rename to pkgs/by-name/pi/picoscope/sources.json
diff --git a/pkgs/applications/science/electronics/picoscope/update.py b/pkgs/by-name/pi/picoscope/update.py
similarity index 100%
rename from pkgs/applications/science/electronics/picoscope/update.py
rename to pkgs/by-name/pi/picoscope/update.py
diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/by-name/pi/picosnitch/package.nix
similarity index 100%
rename from pkgs/tools/networking/picosnitch/default.nix
rename to pkgs/by-name/pi/picosnitch/package.nix
diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/by-name/pi/picotool/package.nix
similarity index 100%
rename from pkgs/development/tools/picotool/default.nix
rename to pkgs/by-name/pi/picotool/package.nix
diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/by-name/pi/picotts/package.nix
similarity index 100%
rename from pkgs/tools/audio/picotts/default.nix
rename to pkgs/by-name/pi/picotts/package.nix
diff --git a/pkgs/servers/web-apps/pict-rs/0.3.nix b/pkgs/by-name/pi/pict-rs/0.3.nix
similarity index 100%
rename from pkgs/servers/web-apps/pict-rs/0.3.nix
rename to pkgs/by-name/pi/pict-rs/0.3.nix
diff --git a/pkgs/servers/web-apps/pict-rs/Cargo-0.3.lock b/pkgs/by-name/pi/pict-rs/Cargo-0.3.lock
similarity index 100%
rename from pkgs/servers/web-apps/pict-rs/Cargo-0.3.lock
rename to pkgs/by-name/pi/pict-rs/Cargo-0.3.lock
diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/by-name/pi/pict-rs/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/pict-rs/default.nix
rename to pkgs/by-name/pi/pict-rs/package.nix
diff --git a/pkgs/servers/pies/default.nix b/pkgs/by-name/pi/pies/package.nix
similarity index 100%
rename from pkgs/servers/pies/default.nix
rename to pkgs/by-name/pi/pies/package.nix
diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/by-name/pi/pifpaf/package.nix
similarity index 100%
rename from pkgs/development/tools/pifpaf/default.nix
rename to pkgs/by-name/pi/pifpaf/package.nix
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/by-name/pi/pig/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pig/default.nix
rename to pkgs/by-name/pi/pig/package.nix
diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/by-name/pi/piglit/package.nix
similarity index 100%
rename from pkgs/tools/graphics/piglit/default.nix
rename to pkgs/by-name/pi/piglit/package.nix
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/by-name/pi/pigz/package.nix
similarity index 100%
rename from pkgs/tools/compression/pigz/default.nix
rename to pkgs/by-name/pi/pigz/package.nix
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/by-name/pi/pijul/package.nix
similarity index 100%
rename from pkgs/applications/version-management/pijul/default.nix
rename to pkgs/by-name/pi/pijul/package.nix
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
new file mode 100644
index 000000000000..9a0ab2efb19b
--- /dev/null
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  testers,
+  pik,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "pik";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "jacek-kurlit";
+    repo = "pik";
+    rev = version;
+    hash = "sha256-q1nNQC9qGa7nUNIaDdqW3wIrfzH7JKS/yZAe9KNmX3k=";
+  };
+
+  cargoHash = "sha256-gqzt3cFOS4uzIstIvmPS0n18aFUt0YnoTRz7EVTV7sA=";
+
+  passthru.tests.version = testers.testVersion { package = pik; };
+
+  meta = {
+    description = "Process Interactive Kill";
+    longDescription = ''
+      Process Interactive Kill is a command line tool that helps to find and kill process.
+      It works like pkill command but search is interactive.
+    '';
+    homepage = "https://github.com/jacek-kurlit/pik";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ bew ];
+    mainProgram = "pik";
+  };
+}
diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/by-name/pi/pika-backup/borg-path.patch
similarity index 100%
rename from pkgs/applications/backup/pika-backup/borg-path.patch
rename to pkgs/by-name/pi/pika-backup/borg-path.patch
diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/by-name/pi/pika-backup/package.nix
similarity index 100%
rename from pkgs/applications/backup/pika-backup/default.nix
rename to pkgs/by-name/pi/pika-backup/package.nix
diff --git a/pkgs/applications/graphics/pika/default.nix b/pkgs/by-name/pi/pika/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pika/default.nix
rename to pkgs/by-name/pi/pika/package.nix
diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/by-name/pi/pikchr/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pikchr/default.nix
rename to pkgs/by-name/pi/pikchr/package.nix
diff --git a/pkgs/tools/networking/piknik/default.nix b/pkgs/by-name/pi/piknik/package.nix
similarity index 100%
rename from pkgs/tools/networking/piknik/default.nix
rename to pkgs/by-name/pi/piknik/package.nix
diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/by-name/pi/pikopixel/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pikopixel/default.nix
rename to pkgs/by-name/pi/pikopixel/package.nix
diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/by-name/pi/pim6sd/package.nix
similarity index 100%
rename from pkgs/servers/pim6sd/default.nix
rename to pkgs/by-name/pi/pim6sd/package.nix
diff --git a/pkgs/games/pinball/default.nix b/pkgs/by-name/pi/pinball/package.nix
similarity index 100%
rename from pkgs/games/pinball/default.nix
rename to pkgs/by-name/pi/pinball/package.nix
diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/by-name/pi/pinentry-bemenu/package.nix
similarity index 100%
rename from pkgs/tools/security/pinentry-bemenu/default.nix
rename to pkgs/by-name/pi/pinentry-bemenu/package.nix
diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/by-name/pi/pinentry-rofi/package.nix
similarity index 100%
rename from pkgs/tools/security/pinentry-rofi/default.nix
rename to pkgs/by-name/pi/pinentry-rofi/package.nix
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/by-name/pi/pinfo/package.nix
similarity index 100%
rename from pkgs/applications/misc/pinfo/default.nix
rename to pkgs/by-name/pi/pinfo/package.nix
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/by-name/pi/pingtcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/pingtcp/default.nix
rename to pkgs/by-name/pi/pingtcp/package.nix
diff --git a/pkgs/games/pingus/default.nix b/pkgs/by-name/pi/pingus/package.nix
similarity index 100%
rename from pkgs/games/pingus/default.nix
rename to pkgs/by-name/pi/pingus/package.nix
diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/by-name/pi/pinniped/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pinniped/default.nix
rename to pkgs/by-name/pi/pinniped/package.nix
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/by-name/pi/pinpoint/package.nix
similarity index 100%
rename from pkgs/applications/office/pinpoint/default.nix
rename to pkgs/by-name/pi/pinpoint/package.nix
diff --git a/pkgs/tools/misc/pinsel/default.nix b/pkgs/by-name/pi/pinsel/package.nix
similarity index 100%
rename from pkgs/tools/misc/pinsel/default.nix
rename to pkgs/by-name/pi/pinsel/package.nix
diff --git a/pkgs/games/pioneer/default.nix b/pkgs/by-name/pi/pioneer/package.nix
similarity index 100%
rename from pkgs/games/pioneer/default.nix
rename to pkgs/by-name/pi/pioneer/package.nix
diff --git a/pkgs/games/pioneers/default.nix b/pkgs/by-name/pi/pioneers/package.nix
similarity index 100%
rename from pkgs/games/pioneers/default.nix
rename to pkgs/by-name/pi/pioneers/package.nix
diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/by-name/pi/pip-audit/package.nix
similarity index 100%
rename from pkgs/development/tools/pip-audit/default.nix
rename to pkgs/by-name/pi/pip-audit/package.nix
diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/by-name/pi/pipe-rename/package.nix
similarity index 100%
rename from pkgs/tools/misc/pipe-rename/default.nix
rename to pkgs/by-name/pi/pipe-rename/package.nix
diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/by-name/pi/pipectl/package.nix
similarity index 100%
rename from pkgs/tools/misc/pipectl/default.nix
rename to pkgs/by-name/pi/pipectl/package.nix
diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix
new file mode 100644
index 000000000000..0843e6162227
--- /dev/null
+++ b/pkgs/by-name/pi/pipenv/package.nix
@@ -0,0 +1,107 @@
+{ lib
+, stdenv
+, python3
+, fetchFromGitHub
+, installShellFiles
+, pipenv
+, runCommand
+}:
+
+with python3.pkgs;
+
+let
+
+  runtimeDeps = ps: with ps; [
+    certifi
+    setuptools
+    pip
+    virtualenv
+    virtualenv-clone
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAndroid [
+    pyjnius
+  ];
+
+  pythonEnv = python3.withPackages runtimeDeps;
+
+in buildPythonApplication rec {
+  pname = "pipenv";
+  version = "2024.2.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "pypa";
+    repo = "pipenv";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-5gq1kXVNAMH/AeovpUStcZffXN4GfXj3wJ7lW4qebRM=";
+  };
+
+  env.LC_ALL = "en_US.UTF-8";
+
+  nativeBuildInputs = [
+    installShellFiles
+    setuptools
+    wheel
+  ];
+
+  postPatch = ''
+    # pipenv invokes python in a subprocess to create a virtualenv
+    # and to call setup.py.
+    # It would use sys.executable, which in our case points to a python that
+    # does not have the required dependencies.
+    substituteInPlace pipenv/utils/virtualenv.py \
+      --replace "sys.executable" "'${pythonEnv.interpreter}'"
+  '';
+
+  propagatedBuildInputs = runtimeDeps python3.pkgs;
+
+  preCheck = ''
+    export HOME="$TMPDIR"
+  '';
+
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
+    pytest-xdist
+    pytz
+    requests
+  ];
+
+  disabledTests = [
+    # this test wants access to the internet
+    "test_download_file"
+  ];
+
+  disabledTestPaths = [
+    # many of these tests want access to the internet
+    "tests/integration"
+  ];
+
+  passthru.tests = {
+    verify-venv-patch = runCommand "${pname}-test-verify-venv-patch" {} ''
+      export PIPENV_VENV_IN_PROJECT=1
+
+      # "pipenv install" should be able to create a venv
+      ${pipenv}/bin/pipenv install
+
+       # the venv exists
+      [ -d .venv ]
+
+      touch $out
+    '';
+  };
+
+  postInstall = ''
+    installShellCompletion --cmd pipenv \
+      --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \
+      --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \
+      --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv)
+  '';
+
+  meta = with lib; {
+    description = "Python Development Workflow for Humans";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ berdario ];
+  };
+}
diff --git a/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch b/pkgs/by-name/pi/piper-phonemize/espeak-mbrola.patch
similarity index 100%
rename from pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch
rename to pkgs/by-name/pi/piper-phonemize/espeak-mbrola.patch
diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/by-name/pi/piper-phonemize/package.nix
similarity index 100%
rename from pkgs/development/libraries/piper-phonemize/default.nix
rename to pkgs/by-name/pi/piper-phonemize/package.nix
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/by-name/pi/piper/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/piper/default.nix
rename to pkgs/by-name/pi/piper/package.nix
diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/by-name/pi/pipes-rs/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/pipes-rs/default.nix
rename to pkgs/by-name/pi/pipes-rs/package.nix
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/by-name/pi/pipes/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/pipes/default.nix
rename to pkgs/by-name/pi/pipes/package.nix
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/by-name/pi/pipework/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pipework/default.nix
rename to pkgs/by-name/pi/pipework/package.nix
diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/by-name/pi/pipr/package.nix
similarity index 100%
rename from pkgs/applications/misc/pipr/default.nix
rename to pkgs/by-name/pi/pipr/package.nix
diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/by-name/pi/pipreqs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pipreqs/default.nix
rename to pkgs/by-name/pi/pipreqs/package.nix
diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/by-name/pi/pirate-get/package.nix
similarity index 100%
rename from pkgs/tools/networking/pirate-get/default.nix
rename to pkgs/by-name/pi/pirate-get/package.nix
diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/by-name/pi/pistol/package.nix
similarity index 100%
rename from pkgs/tools/misc/pistol/default.nix
rename to pkgs/by-name/pi/pistol/package.nix
diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/by-name/pi/piston-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/piston-cli/default.nix
rename to pkgs/by-name/pi/piston-cli/package.nix
diff --git a/pkgs/data/themes/pitch-black/default.nix b/pkgs/by-name/pi/pitch-black/package.nix
similarity index 100%
rename from pkgs/data/themes/pitch-black/default.nix
rename to pkgs/by-name/pi/pitch-black/package.nix
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/by-name/pi/pitivi/package.nix
similarity index 100%
rename from pkgs/applications/video/pitivi/default.nix
rename to pkgs/by-name/pi/pitivi/package.nix
diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/by-name/pi/pitivi/prevent-closure-contamination.patch
similarity index 100%
rename from pkgs/applications/video/pitivi/prevent-closure-contamination.patch
rename to pkgs/by-name/pi/pitivi/prevent-closure-contamination.patch
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/by-name/pi/pius/package.nix
similarity index 100%
rename from pkgs/tools/security/pius/default.nix
rename to pkgs/by-name/pi/pius/package.nix
diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix
index 5a8f25000efc..84f7db49becb 100644
--- a/pkgs/by-name/pi/piv-agent/package.nix
+++ b/pkgs/by-name/pi/piv-agent/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "piv-agent";
-  version = "0.21.2";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "smlx";
     repo = "piv-agent";
     rev = "v${version}";
-    hash = "sha256-nHxtQaQ5Lc0QAJrWU6fUWViDwOKkxVyj9/B6XZ+Y0zw=";
+    hash = "sha256-bfJIrWDFQIg0n1RDadARPHhQwE6i7mAMxE5GPYo4WU8=";
   };
 
-  vendorHash = "sha256-L5HuTYA01w3LUtSy7OVxG6QN5uQZ8LVYyrBcJQTkIUA=";
+  vendorHash = "sha256-HIB+p0yh7EWudLp1YGoClYbK3hkYEJZ+o+9BbOHE4+0=";
 
   subPackages = [ "cmd/piv-agent" ];
 
diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/by-name/pi/pixd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pixd/default.nix
rename to pkgs/by-name/pi/pixd/package.nix
diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/by-name/pi/pixelfed/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/pixelfed/default.nix
rename to pkgs/by-name/pi/pixelfed/package.nix
diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/by-name/pi/pixelnuke/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pixelnuke/default.nix
rename to pkgs/by-name/pi/pixelnuke/package.nix
diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/by-name/pi/pixeluvo/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pixeluvo/default.nix
rename to pkgs/by-name/pi/pixeluvo/package.nix
diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/by-name/pi/pixiecore/package.nix
similarity index 100%
rename from pkgs/tools/networking/pixiecore/default.nix
rename to pkgs/by-name/pi/pixiecore/package.nix
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/by-name/pi/pixiewps/package.nix
similarity index 100%
rename from pkgs/tools/networking/pixiewps/default.nix
rename to pkgs/by-name/pi/pixiewps/package.nix
diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix
new file mode 100644
index 000000000000..0678539b79a3
--- /dev/null
+++ b/pkgs/by-name/pi/pixman/package.nix
@@ -0,0 +1,88 @@
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, pkg-config
+, libpng
+, glib /*just passthru*/
+
+# for passthru.tests
+, cairo
+, qemu
+, scribus
+, tigervnc
+, wlroots_0_17
+, wlroots_0_18
+, xwayland
+
+, gitUpdater
+, testers
+
+, __flattenIncludeHackHook
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pixman";
+  version = "0.43.4";
+
+  src = fetchurl {
+    urls = with finalAttrs; [
+      "mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
+      "https://cairographics.org/releases/${pname}-${version}.tar.gz"
+    ];
+    hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY=";
+  };
+
+  # Raise test timeout, 120s can be slightly exceeded on slower hardware
+  postPatch = ''
+    substituteInPlace test/meson.build \
+      --replace-fail 'timeout : 120' 'timeout : 240'
+  '';
+
+  separateDebugInfo = !stdenv.hostPlatform.isStatic;
+
+  nativeBuildInputs = [ meson ninja pkg-config __flattenIncludeHackHook ];
+
+  buildInputs = [ libpng ];
+
+  # Default "enabled" value attempts to enable CPU features on all
+  # architectures and requires used to disable them:
+  #   https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
+  mesonAutoFeatures = "auto";
+  mesonFlags = [
+    "-Diwmmxt=disabled"
+  ]
+  # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
+  ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";
+
+  preConfigure = ''
+    # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62
+    export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES))
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  passthru = {
+    tests = {
+      inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland;
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+      };
+    };
+    updateScript = gitUpdater {
+      url = "https://gitlab.freedesktop.org/pixman/pixman.git";
+      rev-prefix = "pixman-";
+    };
+  };
+
+  meta = with lib; {
+    homepage = "http://pixman.org";
+    description = "Low-level library for pixel manipulation";
+    license = licenses.mit;
+    platforms = platforms.all;
+    pkgConfigModules = [ "pixman-1" ];
+  };
+})
diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/by-name/pi/pixz/package.nix
similarity index 100%
rename from pkgs/tools/compression/pixz/default.nix
rename to pkgs/by-name/pi/pixz/package.nix
diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/by-name/pi/pizarra/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pizarra/default.nix
rename to pkgs/by-name/pi/pizarra/package.nix
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 31435c52f017..ec5ddcf36657 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -3,8 +3,8 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  apple-sdk_11,
   stdenv,
-  darwin,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -14,15 +14,16 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
-    rev = "pizauth-${version}";
+    rev = "refs/tags/pizauth-${version}";
     hash = "sha256-9NezG644oCLTWHTdUaUpJbuwkJu3at/IGNH3FSxl/DI=";
   };
 
   cargoHash = "sha256-Lp5ovkQKShgT7EFvQ+5KE3eQWJEQAL68Bk1d+wUo+bc=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  # pizauth cannot be built with default apple-sdk_10 on x86_64-darwin, pin to 11
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+  nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
     installShellCompletion --cmd pizauth \
diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/by-name/pk/pk2cmd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pk2cmd/default.nix
rename to pkgs/by-name/pk/pk2cmd/package.nix
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/by-name/pk/pkcs11helper/package.nix
similarity index 100%
rename from pkgs/development/libraries/pkcs11helper/default.nix
rename to pkgs/by-name/pk/pkcs11helper/package.nix
diff --git a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch b/pkgs/by-name/pk/pkg-config-unwrapped/2.36.3-not-win32.patch
similarity index 100%
rename from pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
rename to pkgs/by-name/pk/pkg-config-unwrapped/2.36.3-not-win32.patch
diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/pkg-config/default.nix
rename to pkgs/by-name/pk/pkg-config-unwrapped/package.nix
diff --git a/pkgs/development/tools/misc/pkg-config/requires-private.patch b/pkgs/by-name/pk/pkg-config-unwrapped/requires-private.patch
similarity index 100%
rename from pkgs/development/tools/misc/pkg-config/requires-private.patch
rename to pkgs/by-name/pk/pkg-config-unwrapped/requires-private.patch
diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/by-name/pk/pkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pkg/default.nix
rename to pkgs/by-name/pk/pkg/package.nix
diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/by-name/pk/pkgdiff/package.nix
similarity index 100%
rename from pkgs/tools/misc/pkgdiff/default.nix
rename to pkgs/by-name/pk/pkgdiff/package.nix
diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/by-name/pk/pkger/package.nix
similarity index 100%
rename from pkgs/development/libraries/pkger/default.nix
rename to pkgs/by-name/pk/pkger/package.nix
diff --git a/pkgs/tools/misc/pkgtop/default.nix b/pkgs/by-name/pk/pkgtop/package.nix
similarity index 100%
rename from pkgs/tools/misc/pkgtop/default.nix
rename to pkgs/by-name/pk/pkgtop/package.nix
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/by-name/pk/pktgen/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pktgen/default.nix
rename to pkgs/by-name/pk/pktgen/package.nix
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/by-name/pl/planarity/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/planarity/default.nix
rename to pkgs/by-name/pl/planarity/package.nix
diff --git a/pkgs/by-name/pl/plandex-server/package.nix b/pkgs/by-name/pl/plandex-server/package.nix
index a1d0c846eb58..4511a3a518ff 100644
--- a/pkgs/by-name/pl/plandex-server/package.nix
+++ b/pkgs/by-name/pl/plandex-server/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  makeWrapper,
   git,
 }:
 buildGoModule rec {
@@ -24,6 +25,13 @@ buildGoModule rec {
     cp -r migrations $out/migrations
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/plandex-server \
+      --prefix PATH : ${lib.makeBinPath [ git ]}
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
   nativeCheckInputs = [ git ];
 
   sourceRoot = "${src.name}/app/server";
diff --git a/pkgs/by-name/pl/planetary_annihilation/package.nix b/pkgs/by-name/pl/planetary_annihilation/package.nix
new file mode 100644
index 000000000000..23cd996dfcf1
--- /dev/null
+++ b/pkgs/by-name/pl/planetary_annihilation/package.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
+, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }:
+
+stdenv.mkDerivation rec {
+  pname = "planetary-annihalation";
+  version = "62857";
+
+  src = requireFile {
+    message = "This file has to be downloaded manually via nix-prefetch-url.";
+    name = "PA_Linux_${version}.tar.bz2";
+    sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k";
+  };
+
+  nativeBuildInputs = [ patchelf makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+
+    cp -R * $out/
+    mv $out/*.so $out/lib
+    ln -s $out/PA $out/bin/PA
+
+    ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host"
+
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64"
+
+    for f in $out/lib/*; do
+      patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" $f
+    done
+  '';
+
+  meta = with lib; {
+    homepage = "http://www.uberent.com/pa/";
+    description = "Next-generation RTS that takes the genre to a planetary scale";
+    license = lib.licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.domenkozar ];
+  };
+}
diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/by-name/pl/planify/package.nix
similarity index 100%
rename from pkgs/applications/office/planify/default.nix
rename to pkgs/by-name/pl/planify/package.nix
diff --git a/pkgs/applications/misc/plank/hide-in-pantheon.patch b/pkgs/by-name/pl/plank/hide-in-pantheon.patch
similarity index 100%
rename from pkgs/applications/misc/plank/hide-in-pantheon.patch
rename to pkgs/by-name/pl/plank/hide-in-pantheon.patch
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/by-name/pl/plank/package.nix
similarity index 100%
rename from pkgs/applications/misc/plank/default.nix
rename to pkgs/by-name/pl/plank/package.nix
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/by-name/pl/planner/package.nix
similarity index 100%
rename from pkgs/applications/office/planner/default.nix
rename to pkgs/by-name/pl/planner/package.nix
diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/by-name/pl/plano-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/plano/default.nix
rename to pkgs/by-name/pl/plano-theme/package.nix
diff --git a/pkgs/development/tools/misc/planus/default.nix b/pkgs/by-name/pl/planus/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/planus/default.nix
rename to pkgs/by-name/pl/planus/package.nix
diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/by-name/pl/plasma-hud/package.nix
similarity index 100%
rename from pkgs/misc/plasma-hud/default.nix
rename to pkgs/by-name/pl/plasma-hud/package.nix
diff --git a/pkgs/data/themes/plasma-overdose-kde-theme/default.nix b/pkgs/by-name/pl/plasma-overdose-kde-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/plasma-overdose-kde-theme/default.nix
rename to pkgs/by-name/pl/plasma-overdose-kde-theme/package.nix
diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index fb477ce07f2a..cc17a083f913 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec  {
     nss
     openssl
     pango
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     trash-cli
     xdg-utils
   ];
diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/by-name/pl/platform-folders/package.nix
similarity index 100%
rename from pkgs/development/libraries/platform-folders/default.nix
rename to pkgs/by-name/pl/platform-folders/package.nix
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/by-name/pl/platinum-searcher/package.nix
similarity index 100%
rename from pkgs/tools/text/platinum-searcher/default.nix
rename to pkgs/by-name/pl/platinum-searcher/package.nix
diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix
index 200bc55569da..69a8b7cabf0f 100644
--- a/pkgs/by-name/pl/plattenalbum/package.nix
+++ b/pkgs/by-name/pl/plattenalbum/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "plattenalbum";
-  version = "2.1.1";
+  version = "2.2.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "SoongNoonien";
     repo = "plattenalbum";
     rev = "refs/tags/v${version}";
-    hash = "sha256-M4WjRQQYu8ixUYV6LgiyAPyvCS1Vk+UpLq/Sek0qBlw=";
+    hash = "sha256-WUhKNt6jAKHsLGy862DJqV4S34krNl9y43vyLiq5qss=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/by-name/pl/platypus/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/platypus/default.nix
rename to pkgs/by-name/pl/platypus/package.nix
diff --git a/pkgs/tools/video/play-with-mpv/default.nix b/pkgs/by-name/pl/play-with-mpv/package.nix
similarity index 100%
rename from pkgs/tools/video/play-with-mpv/default.nix
rename to pkgs/by-name/pl/play-with-mpv/package.nix
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/by-name/pl/playerctl/package.nix
similarity index 100%
rename from pkgs/tools/audio/playerctl/default.nix
rename to pkgs/by-name/pl/playerctl/package.nix
diff --git a/pkgs/applications/misc/please-cli/default.nix b/pkgs/by-name/pl/please-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/please-cli/default.nix
rename to pkgs/by-name/pl/please-cli/package.nix
diff --git a/pkgs/tools/security/please/nixos-specific.patch b/pkgs/by-name/pl/please/nixos-specific.patch
similarity index 100%
rename from pkgs/tools/security/please/nixos-specific.patch
rename to pkgs/by-name/pl/please/nixos-specific.patch
diff --git a/pkgs/tools/security/please/default.nix b/pkgs/by-name/pl/please/package.nix
similarity index 100%
rename from pkgs/tools/security/please/default.nix
rename to pkgs/by-name/pl/please/package.nix
diff --git a/pkgs/tools/security/plecost/default.nix b/pkgs/by-name/pl/plecost/package.nix
similarity index 100%
rename from pkgs/tools/security/plecost/default.nix
rename to pkgs/by-name/pl/plecost/package.nix
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/by-name/pl/plib/package.nix
similarity index 100%
rename from pkgs/development/libraries/plib/default.nix
rename to pkgs/by-name/pl/plib/package.nix
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/by-name/pl/plink-ng/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/plink-ng/default.nix
rename to pkgs/by-name/pl/plink-ng/package.nix
diff --git a/pkgs/os-specific/darwin/plistwatch/go-modules.patch b/pkgs/by-name/pl/plistwatch/go-modules.patch
similarity index 100%
rename from pkgs/os-specific/darwin/plistwatch/go-modules.patch
rename to pkgs/by-name/pl/plistwatch/go-modules.patch
diff --git a/pkgs/os-specific/darwin/plistwatch/default.nix b/pkgs/by-name/pl/plistwatch/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/plistwatch/default.nix
rename to pkgs/by-name/pl/plistwatch/package.nix
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/by-name/pl/plm/package.nix
similarity index 100%
rename from pkgs/applications/science/programming/plm/default.nix
rename to pkgs/by-name/pl/plm/package.nix
diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/by-name/pl/plocate/package.nix
similarity index 100%
rename from pkgs/tools/misc/plocate/default.nix
rename to pkgs/by-name/pl/plocate/package.nix
diff --git a/pkgs/development/libraries/plog/default.nix b/pkgs/by-name/pl/plog/package.nix
similarity index 100%
rename from pkgs/development/libraries/plog/default.nix
rename to pkgs/by-name/pl/plog/package.nix
diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/by-name/pl/ploticus/package.nix
similarity index 100%
rename from pkgs/tools/graphics/ploticus/default.nix
rename to pkgs/by-name/pl/ploticus/package.nix
diff --git a/pkgs/tools/graphics/ploticus/ploticus-install.patch b/pkgs/by-name/pl/ploticus/ploticus-install.patch
similarity index 100%
rename from pkgs/tools/graphics/ploticus/ploticus-install.patch
rename to pkgs/by-name/pl/ploticus/ploticus-install.patch
diff --git a/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch b/pkgs/by-name/pl/ploticus/set-prefabs-dir.patch
similarity index 100%
rename from pkgs/tools/graphics/ploticus/set-prefabs-dir.patch
rename to pkgs/by-name/pl/ploticus/set-prefabs-dir.patch
diff --git a/pkgs/tools/graphics/ploticus/use-gd-package.patch b/pkgs/by-name/pl/ploticus/use-gd-package.patch
similarity index 100%
rename from pkgs/tools/graphics/ploticus/use-gd-package.patch
rename to pkgs/by-name/pl/ploticus/use-gd-package.patch
diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/by-name/pl/plotinus/package.nix
similarity index 100%
rename from pkgs/tools/misc/plotinus/default.nix
rename to pkgs/by-name/pl/plotinus/package.nix
diff --git a/pkgs/applications/misc/plots/default.nix b/pkgs/by-name/pl/plots/package.nix
similarity index 100%
rename from pkgs/applications/misc/plots/default.nix
rename to pkgs/by-name/pl/plots/package.nix
diff --git a/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch b/pkgs/by-name/pl/plotutils/c++17-register-usage-fix.patch
similarity index 100%
rename from pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch
rename to pkgs/by-name/pl/plotutils/c++17-register-usage-fix.patch
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/by-name/pl/plotutils/debian-patches.nix
similarity index 100%
rename from pkgs/tools/graphics/plotutils/debian-patches.nix
rename to pkgs/by-name/pl/plotutils/debian-patches.nix
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/by-name/pl/plotutils/debian-patches.txt
similarity index 100%
rename from pkgs/tools/graphics/plotutils/debian-patches.txt
rename to pkgs/by-name/pl/plotutils/debian-patches.txt
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/by-name/pl/plotutils/package.nix
similarity index 100%
rename from pkgs/tools/graphics/plotutils/default.nix
rename to pkgs/by-name/pl/plotutils/package.nix
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/by-name/pl/plowshare/package.nix
similarity index 100%
rename from pkgs/tools/misc/plowshare/default.nix
rename to pkgs/by-name/pl/plowshare/package.nix
diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix
index af2be4c57ada..0b51b8bad0ba 100644
--- a/pkgs/by-name/pl/pls/package.nix
+++ b/pkgs/by-name/pl/pls/package.nix
@@ -1,8 +1,6 @@
 { lib
-, stdenv
 , rustPlatform
 , fetchFromGitHub
-, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-cDAHzK3pgpn5zEFdLBltf1e28yFFkXOzcF+nvDb8aWI=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
-
   meta = {
     changelog = "https://github.com/pls-rs/pls/releases/tag/${src.rev}";
     description = "Prettier and powerful ls";
diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/by-name/pl/plugdata/package.nix
similarity index 100%
rename from pkgs/applications/audio/plugdata/default.nix
rename to pkgs/by-name/pl/plugdata/package.nix
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/by-name/pl/plugin-torture/package.nix
similarity index 100%
rename from pkgs/applications/audio/plugin-torture/default.nix
rename to pkgs/by-name/pl/plugin-torture/package.nix
diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/by-name/pl/plujain-ramp/package.nix
similarity index 100%
rename from pkgs/applications/audio/plujain-ramp/default.nix
rename to pkgs/by-name/pl/plujain-ramp/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/plumed/default.nix b/pkgs/by-name/pl/plumed/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/plumed/default.nix
rename to pkgs/by-name/pl/plumed/package.nix
diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/by-name/pl/pluto/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pluto/default.nix
rename to pkgs/by-name/pl/pluto/package.nix
diff --git a/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch b/pkgs/by-name/pl/plymouth/add-runtime-plugin-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch
rename to pkgs/by-name/pl/plymouth/add-runtime-plugin-path.patch
diff --git a/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch b/pkgs/by-name/pl/plymouth/dont-create-broken-symlink.patch
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch
rename to pkgs/by-name/pl/plymouth/dont-create-broken-symlink.patch
diff --git a/pkgs/os-specific/linux/plymouth/fix-paths.patch b/pkgs/by-name/pl/plymouth/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/fix-paths.patch
rename to pkgs/by-name/pl/plymouth/fix-paths.patch
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/by-name/pl/plymouth/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/default.nix
rename to pkgs/by-name/pl/plymouth/package.nix
diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/by-name/pm/pmacct/package.nix
similarity index 100%
rename from pkgs/tools/networking/pmacct/default.nix
rename to pkgs/by-name/pm/pmacct/package.nix
diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/pkgs/by-name/pm/pmccabe/getopt_on_darwin.patch
similarity index 100%
rename from pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
rename to pkgs/by-name/pm/pmccabe/getopt_on_darwin.patch
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/by-name/pm/pmccabe/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/pmccabe/default.nix
rename to pkgs/by-name/pm/pmccabe/package.nix
diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/by-name/pm/pmenu/package.nix
similarity index 100%
rename from pkgs/tools/X11/pmenu/default.nix
rename to pkgs/by-name/pm/pmenu/package.nix
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/by-name/pm/pmidi/package.nix
similarity index 100%
rename from pkgs/applications/audio/pmidi/default.nix
rename to pkgs/by-name/pm/pmidi/package.nix
diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/by-name/pm/pmix/package.nix
similarity index 100%
rename from pkgs/development/libraries/pmix/default.nix
rename to pkgs/by-name/pm/pmix/package.nix
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/by-name/pm/pmount/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pmount/default.nix
rename to pkgs/by-name/pm/pmount/package.nix
diff --git a/pkgs/applications/audio/pms/default.nix b/pkgs/by-name/pm/pms/package.nix
similarity index 100%
rename from pkgs/applications/audio/pms/default.nix
rename to pkgs/by-name/pm/pms/package.nix
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/by-name/pm/pmutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pm-utils/default.nix
rename to pkgs/by-name/pm/pmutils/package.nix
diff --git a/pkgs/tools/text/pn/default.nix b/pkgs/by-name/pn/pn/package.nix
similarity index 100%
rename from pkgs/tools/text/pn/default.nix
rename to pkgs/by-name/pn/pn/package.nix
diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/by-name/pn/pngcheck/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngcheck/default.nix
rename to pkgs/by-name/pn/pngcheck/package.nix
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/by-name/pn/pngcrush/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngcrush/default.nix
rename to pkgs/by-name/pn/pngcrush/package.nix
diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/by-name/pn/pngloss/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngloss/default.nix
rename to pkgs/by-name/pn/pngloss/package.nix
diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/by-name/pn/pngnq/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngnq/default.nix
rename to pkgs/by-name/pn/pngnq/package.nix
diff --git a/pkgs/tools/graphics/pngoptimizer/default.nix b/pkgs/by-name/pn/pngoptimizer/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngoptimizer/default.nix
rename to pkgs/by-name/pn/pngoptimizer/package.nix
diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/by-name/pn/pngout/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngout/default.nix
rename to pkgs/by-name/pn/pngout/package.nix
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/by-name/pn/pngpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/png++/default.nix
rename to pkgs/by-name/pn/pngpp/package.nix
diff --git a/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch b/pkgs/by-name/pn/pngquant/add-Cargo.lock.patch
similarity index 100%
rename from pkgs/tools/graphics/pngquant/add-Cargo.lock.patch
rename to pkgs/by-name/pn/pngquant/add-Cargo.lock.patch
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/by-name/pn/pngquant/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngquant/default.nix
rename to pkgs/by-name/pn/pngquant/package.nix
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/by-name/pn/pngtoico/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngtoico/default.nix
rename to pkgs/by-name/pn/pngtoico/package.nix
diff --git a/pkgs/tools/graphics/pngtools/default.nix b/pkgs/by-name/pn/pngtools/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngtools/default.nix
rename to pkgs/by-name/pn/pngtools/package.nix
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/by-name/pn/pnmixer/package.nix
similarity index 100%
rename from pkgs/tools/audio/pnmixer/default.nix
rename to pkgs/by-name/pn/pnmixer/package.nix
diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/by-name/po/pocketbase/package.nix
similarity index 100%
rename from pkgs/servers/pocketbase/default.nix
rename to pkgs/by-name/po/pocketbase/package.nix
diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix
index d3c58c00e21e..795a3893d873 100644
--- a/pkgs/by-name/po/pocl/package.nix
+++ b/pkgs/by-name/po/pocl/package.nix
@@ -30,7 +30,7 @@ let
       rm -f $out/bin/$BASENAME
       makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \
         --add-flags "-L$LIBGCC_DIR" \
-        --add-flags "-L${stdenv.cc.cc.lib}/lib"
+        --add-flags "-L${lib.getLib stdenv.cc.cc}/lib"
     done
   '';
 in
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/by-name/po/poco/package.nix
similarity index 100%
rename from pkgs/development/libraries/poco/default.nix
rename to pkgs/by-name/po/poco/package.nix
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/by-name/po/pod2mdoc/package.nix
similarity index 100%
rename from pkgs/tools/misc/pod2mdoc/default.nix
rename to pkgs/by-name/po/pod2mdoc/package.nix
diff --git a/pkgs/servers/misc/podgrab/default.nix b/pkgs/by-name/po/podgrab/package.nix
similarity index 100%
rename from pkgs/servers/misc/podgrab/default.nix
rename to pkgs/by-name/po/podgrab/package.nix
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/by-name/po/podiff/package.nix
similarity index 100%
rename from pkgs/tools/text/podiff/default.nix
rename to pkgs/by-name/po/podiff/package.nix
diff --git a/pkgs/applications/virtualization/podman/hardcode-paths.patch b/pkgs/by-name/po/podman/hardcode-paths.patch
similarity index 100%
rename from pkgs/applications/virtualization/podman/hardcode-paths.patch
rename to pkgs/by-name/po/podman/hardcode-paths.patch
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/by-name/po/podman/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/podman/default.nix
rename to pkgs/by-name/po/podman/package.nix
diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
similarity index 100%
rename from pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
rename to pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
diff --git a/pkgs/applications/virtualization/pods/Cargo.lock b/pkgs/by-name/po/pods/Cargo.lock
similarity index 100%
rename from pkgs/applications/virtualization/pods/Cargo.lock
rename to pkgs/by-name/po/pods/Cargo.lock
diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/by-name/po/pods/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/pods/default.nix
rename to pkgs/by-name/po/pods/package.nix
diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/by-name/po/poetry/package.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/default.nix
rename to pkgs/by-name/po/poetry/package.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix b/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/unwrapped.nix
rename to pkgs/by-name/po/poetry/unwrapped.nix
diff --git a/pkgs/tools/package-management/poetry2conda/default.nix b/pkgs/by-name/po/poetry2conda/package.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry2conda/default.nix
rename to pkgs/by-name/po/poetry2conda/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/by-name/po/poezio/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/poezio/default.nix
rename to pkgs/by-name/po/poezio/package.nix
diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/by-name/po/pokeget-rs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pokeget-rs/default.nix
rename to pkgs/by-name/po/pokeget-rs/package.nix
diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/by-name/po/pokemon-colorscripts-mac/package.nix
similarity index 100%
rename from pkgs/applications/misc/pokemon-colorscripts-mac/default.nix
rename to pkgs/by-name/po/pokemon-colorscripts-mac/package.nix
diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/by-name/po/pokemonsay/package.nix
similarity index 100%
rename from pkgs/tools/misc/pokemonsay/default.nix
rename to pkgs/by-name/po/pokemonsay/package.nix
diff --git a/pkgs/games/pokete/default.nix b/pkgs/by-name/po/pokete/package.nix
similarity index 100%
rename from pkgs/games/pokete/default.nix
rename to pkgs/by-name/po/pokete/package.nix
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
similarity index 100%
rename from pkgs/applications/misc/polar-bookshelf/default.nix
rename to pkgs/by-name/po/polar-bookshelf/package.nix
diff --git a/pkgs/applications/misc/polar-bookshelf1/default.nix b/pkgs/by-name/po/polar-bookshelf1/package.nix
similarity index 100%
rename from pkgs/applications/misc/polar-bookshelf1/default.nix
rename to pkgs/by-name/po/polar-bookshelf1/package.nix
diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix
index 69cee89770dd..75606d704197 100644
--- a/pkgs/by-name/po/polari/package.nix
+++ b/pkgs/by-name/po/polari/package.nix
@@ -14,7 +14,7 @@
   desktop-file-utils,
   pkg-config,
   gtk4,
-  tracker,
+  tinysparql,
   libadwaita,
   gtk3,
   glib,
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk4
-    tracker
+    tinysparql
     libadwaita
     gtk3 # for thumbnailer
     glib
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/by-name/po/policycoreutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/policycoreutils/default.nix
rename to pkgs/by-name/po/policycoreutils/package.nix
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/by-name/po/polipo/package.nix
similarity index 100%
rename from pkgs/servers/polipo/default.nix
rename to pkgs/by-name/po/polipo/package.nix
diff --git a/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
similarity index 100%
rename from pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
rename to pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
diff --git a/pkgs/development/libraries/polkit/elogind.patch b/pkgs/by-name/po/polkit/elogind.patch
similarity index 100%
rename from pkgs/development/libraries/polkit/elogind.patch
rename to pkgs/by-name/po/polkit/elogind.patch
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/by-name/po/polkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/polkit/default.nix
rename to pkgs/by-name/po/polkit/package.nix
diff --git a/pkgs/development/libraries/polkit/system_bus.conf b/pkgs/by-name/po/polkit/system_bus.conf
similarity index 100%
rename from pkgs/development/libraries/polkit/system_bus.conf
rename to pkgs/by-name/po/polkit/system_bus.conf
diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/by-name/po/poly/package.nix
similarity index 100%
rename from pkgs/data/fonts/poly/default.nix
rename to pkgs/by-name/po/poly/package.nix
diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/by-name/po/poly2tri-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/poly2tri-c/default.nix
rename to pkgs/by-name/po/poly2tri-c/package.nix
diff --git a/pkgs/tools/networking/polygon-cli/default.nix b/pkgs/by-name/po/polygon-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/polygon-cli/default.nix
rename to pkgs/by-name/po/polygon-cli/package.nix
diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/by-name/po/polygraph/package.nix
similarity index 100%
rename from pkgs/tools/networking/polygraph/default.nix
rename to pkgs/by-name/po/polygraph/package.nix
diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/by-name/po/polylith/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/polylith/default.nix
rename to pkgs/by-name/po/polylith/package.nix
diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/by-name/po/polymake/package.nix
similarity index 100%
rename from pkgs/applications/science/math/polymake/default.nix
rename to pkgs/by-name/po/polymake/package.nix
diff --git a/pkgs/by-name/po/polypane/package.nix b/pkgs/by-name/po/polypane/package.nix
new file mode 100644
index 000000000000..5b6d17985d04
--- /dev/null
+++ b/pkgs/by-name/po/polypane/package.nix
@@ -0,0 +1,39 @@
+{ lib, fetchurl, appimageTools }:
+
+let
+  pname = "polypane";
+  version = "22.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
+    name = "${pname}-${version}.AppImage";
+    sha256 = "sha256-m1alnK5p5RVn/m4tFB2BG/sFNOGBjtJPrE/pJhLa5N0=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname src version;
+  };
+in appimageTools.wrapType2 {
+  inherit pname src version;
+
+  extraPkgs = pkgs: [ pkgs.bash ];
+
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+    install -m 444 -D ${appimageContents}/${pname}.png \
+      $out/share/icons/hicolor/512x512/apps/${pname}.png
+  '';
+
+  meta = with lib; {
+    description = "Browser with unified devtools targeting responsability and accessibility";
+    longDescription = ''
+      The stand-alone browser for ambitious developers that want to build responsive,
+      accessible and performant websites in a fraction of the time it takes with other browsers.
+    '';
+    homepage = "https://polypane.app/";
+    maintainers = with maintainers; [ zoedsoupe ];
+    platforms = [ "x86_64-linux" ];
+    changelog = "https://polypane.app/docs/changelog/";
+    license = licenses.unfree;
+  };
+}
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/by-name/po/polytopes_db/package.nix
similarity index 100%
rename from pkgs/data/misc/polytopes_db/default.nix
rename to pkgs/by-name/po/polytopes_db/package.nix
diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/by-name/po/pomerium-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/pomerium-cli/default.nix
rename to pkgs/by-name/po/pomerium-cli/package.nix
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/by-name/po/pommed_light/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pommed-light/default.nix
rename to pkgs/by-name/po/pommed_light/package.nix
diff --git a/pkgs/tools/text/pomsky/Cargo.lock b/pkgs/by-name/po/pomsky/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/pomsky/Cargo.lock
rename to pkgs/by-name/po/pomsky/Cargo.lock
diff --git a/pkgs/tools/text/pomsky/default.nix b/pkgs/by-name/po/pomsky/package.nix
similarity index 100%
rename from pkgs/tools/text/pomsky/default.nix
rename to pkgs/by-name/po/pomsky/package.nix
diff --git a/pkgs/games/pong3d/default.nix b/pkgs/by-name/po/pong3d/package.nix
similarity index 100%
rename from pkgs/games/pong3d/default.nix
rename to pkgs/by-name/po/pong3d/package.nix
diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/by-name/po/ponymix/package.nix
similarity index 100%
rename from pkgs/applications/audio/ponymix/default.nix
rename to pkgs/by-name/po/ponymix/package.nix
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/by-name/po/ponysay/package.nix
similarity index 100%
rename from pkgs/tools/misc/ponysay/default.nix
rename to pkgs/by-name/po/ponysay/package.nix
diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/by-name/po/poop/package.nix
similarity index 100%
rename from pkgs/tools/misc/poop/default.nix
rename to pkgs/by-name/po/poop/package.nix
diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/by-name/po/pop-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/pop-gtk/default.nix
rename to pkgs/by-name/po/pop-gtk-theme/package.nix
diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/by-name/po/pop-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/pop-icon-theme/default.nix
rename to pkgs/by-name/po/pop-icon-theme/package.nix
diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/by-name/po/pop/package.nix
similarity index 100%
rename from pkgs/applications/misc/pop/default.nix
rename to pkgs/by-name/po/pop/package.nix
diff --git a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/pkgs/by-name/po/popa3d/enable-standalone-mode.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/enable-standalone-mode.patch
rename to pkgs/by-name/po/popa3d/enable-standalone-mode.patch
diff --git a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/pkgs/by-name/po/popa3d/fix-mail-spool-path.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
rename to pkgs/by-name/po/popa3d/fix-mail-spool-path.patch
diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/by-name/po/popa3d/package.nix
similarity index 100%
rename from pkgs/servers/mail/popa3d/default.nix
rename to pkgs/by-name/po/popa3d/package.nix
diff --git a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/pkgs/by-name/po/popa3d/use-glibc-crypt.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/use-glibc-crypt.patch
rename to pkgs/by-name/po/popa3d/use-glibc-crypt.patch
diff --git a/pkgs/servers/mail/popa3d/use-openssl.patch b/pkgs/by-name/po/popa3d/use-openssl.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/use-openssl.patch
rename to pkgs/by-name/po/popa3d/use-openssl.patch
diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix
new file mode 100644
index 000000000000..7f6f7dae8638
--- /dev/null
+++ b/pkgs/by-name/po/popeye/package.nix
@@ -0,0 +1,44 @@
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+
+buildGoModule rec {
+  pname = "popeye";
+  version = "0.21.5";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "derailed";
+    repo = "popeye";
+    sha256 = "sha256-2Ooh8yk6sD0VuHHxgkyIwqbJ9ynEUFDW3ti9ZzBOPX0=";
+  };
+
+  ldflags = [
+    "-s" "-w"
+    "-X github.com/derailed/popeye/cmd.version=${version}"
+    "-X github.com/derailed/popeye/cmd.commit=${version}"
+  ];
+
+  vendorHash = "sha256-uTuDI9cQFE5Fdf5wcCAwjO1p/niSNHnXmWF6QhLkDUk=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd popeye \
+      --bash <($out/bin/popeye completion bash) \
+      --fish <($out/bin/popeye completion fish) \
+      --zsh <($out/bin/popeye completion zsh)
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/popeye version | grep ${version} > /dev/null
+  '';
+
+  meta = with lib; {
+    description = "Kubernetes cluster resource sanitizer";
+    mainProgram = "popeye";
+    homepage = "https://github.com/derailed/popeye";
+    changelog = "https://github.com/derailed/popeye/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = [ maintainers.bryanasdev000 ];
+  };
+}
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/by-name/po/popfile/package.nix
similarity index 100%
rename from pkgs/tools/text/popfile/default.nix
rename to pkgs/by-name/po/popfile/package.nix
diff --git a/pkgs/development/libraries/popl/default.nix b/pkgs/by-name/po/popl/package.nix
similarity index 100%
rename from pkgs/development/libraries/popl/default.nix
rename to pkgs/by-name/po/popl/package.nix
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/by-name/po/poppler_data/package.nix
similarity index 100%
rename from pkgs/data/misc/poppler-data/default.nix
rename to pkgs/by-name/po/poppler_data/package.nix
diff --git a/pkgs/tools/misc/popsicle/Cargo.lock b/pkgs/by-name/po/popsicle/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/popsicle/Cargo.lock
rename to pkgs/by-name/po/popsicle/Cargo.lock
diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/by-name/po/popsicle/package.nix
similarity index 100%
rename from pkgs/tools/misc/popsicle/default.nix
rename to pkgs/by-name/po/popsicle/package.nix
diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/by-name/po/popt/1.16-cygwin.patch
similarity index 100%
rename from pkgs/development/libraries/popt/1.16-cygwin.patch
rename to pkgs/by-name/po/popt/1.16-cygwin.patch
diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/by-name/po/popt/1.16-vpath.patch
similarity index 100%
rename from pkgs/development/libraries/popt/1.16-vpath.patch
rename to pkgs/by-name/po/popt/1.16-vpath.patch
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/by-name/po/popt/package.nix
similarity index 100%
rename from pkgs/development/libraries/popt/default.nix
rename to pkgs/by-name/po/popt/package.nix
diff --git a/pkgs/tools/networking/popura/default.nix b/pkgs/by-name/po/popura/package.nix
similarity index 100%
rename from pkgs/tools/networking/popura/default.nix
rename to pkgs/by-name/po/popura/package.nix
diff --git a/pkgs/applications/misc/porsmo/default.nix b/pkgs/by-name/po/porsmo/package.nix
similarity index 100%
rename from pkgs/applications/misc/porsmo/default.nix
rename to pkgs/by-name/po/porsmo/package.nix
diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 12872711f56a..3b3c399d4a9e 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -35,7 +35,7 @@ let
     libGL
     glfw
     openal
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
 
     # oshi
     udev
diff --git a/pkgs/tools/misc/portal/default.nix b/pkgs/by-name/po/portal/package.nix
similarity index 100%
rename from pkgs/tools/misc/portal/default.nix
rename to pkgs/by-name/po/portal/package.nix
diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/portfolio-filemanager/default.nix
rename to pkgs/by-name/po/portfolio-filemanager/package.nix
diff --git a/pkgs/games/portmod/default.nix b/pkgs/by-name/po/portmod/package.nix
similarity index 100%
rename from pkgs/games/portmod/default.nix
rename to pkgs/by-name/po/portmod/package.nix
diff --git a/pkgs/servers/portunus/default.nix b/pkgs/by-name/po/portunus/package.nix
similarity index 100%
rename from pkgs/servers/portunus/default.nix
rename to pkgs/by-name/po/portunus/package.nix
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
new file mode 100644
index 000000000000..c26e54e5b3d1
--- /dev/null
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -0,0 +1,133 @@
+{
+  lib,
+  _7zz,
+  alsa-lib,
+  systemd,
+  autoPatchelfHook,
+  blas,
+  dpkg,
+  fetchurl,
+  gtk3,
+  libglvnd,
+  libxkbcommon,
+  makeShellWrapper,
+  mesa,
+  musl,
+  nss,
+  patchelf,
+  stdenv,
+  xorg,
+}:
+let
+  pname = "positron-bin";
+  version = "2024.11.0-116";
+in
+stdenv.mkDerivation {
+  inherit version pname;
+
+  src =
+    if stdenv.isDarwin then
+      fetchurl {
+        url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg";
+        hash = "sha256-5Ym42InDgFLGdZk0LYV1H0eC5WzmsYToG1KLdiGgTto=";
+      }
+    else
+      fetchurl {
+        url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.deb";
+        hash = "sha256-pE25XVYFW8WwyQ7zmox2mmXy6ZCSaXk2gSnPimg7xtU=";
+      };
+
+  buildInputs =
+    [ makeShellWrapper ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+      dpkg
+      gtk3
+      libglvnd
+      libxkbcommon
+      mesa
+      musl
+      nss
+      stdenv.cc.cc
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libxkbfile
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      blas
+      patchelf
+    ];
+
+  nativeBuildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      autoPatchelfHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      _7zz
+    ];
+
+  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
+    # Needed to fix the "Zygote could not fork" error.
+    (lib.getLib systemd)
+  ];
+
+  postUnpack = lib.optionalString stdenv.hostPlatform.isLinux ''dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-owner'';
+
+  installPhase =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        runHook preInstall
+        mkdir -p "$out/Applications" "$out/bin"
+        cp -r . "$out/Applications/Positron.app"
+
+        # Positron will use the system version of BLAS if we don't provide the nix version.
+        wrapProgram "$out/Applications/Positron.app/Contents/Resources/app/bin/code" \
+          --prefix DYLD_INSERT_LIBRARIES : "${lib.makeLibraryPath [ blas ]}/libblas.dylib"
+
+        ln -s "$out/Applications/Positron.app/Contents/Resources/app/bin/code" "$out/bin/positron"
+        runHook postInstall
+      ''
+    else
+      ''
+        runHook preInstall
+        mkdir -p "$out/share"
+        cp -r usr/share/pixmaps "$out/share/pixmaps"
+        cp -r usr/share/positron "$out/share/positron"
+
+        mkdir -p "$out/share/applications"
+        install -m 444 -D usr/share/applications/positron.desktop "$out/share/applications/positron.desktop"
+        substituteInPlace "$out/share/applications/positron.desktop" \
+          --replace-fail \
+          "Icon=com.visualstudio.code.oss" \
+          "Icon=$out/share/pixmaps/com.visualstudio.code.oss.png" \
+          --replace-fail \
+          "Exec=/usr/share/positron/positron %F" \
+          "Exec=$out/share/positron/.positron-wrapped %F" \
+          --replace-fail \
+          "/usr/share/positron/positron --new-window %F" \
+          "$out/share/positron/.positron-wrapped --new-window %F"
+
+        # Fix libGL.so not found errors.
+        wrapProgram "$out/share/positron/positron" \
+          --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd ]}"
+
+        mkdir -p "$out/bin"
+        ln -s "$out/share/positron/positron" "$out/bin/positron"
+        runHook postInstall
+      '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = with lib; {
+    description = "Positron, a next-generation data science IDE";
+    homepage = "https://github.com/posit-dev/positron";
+    license = licenses.elastic20;
+    maintainers = with maintainers; [
+      b-rodrigues
+      detroyejr
+    ];
+    mainProgram = "positron";
+    platforms = [ "x86_64-linux" ] ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh
new file mode 100755
index 000000000000..28081f589ec9
--- /dev/null
+++ b/pkgs/by-name/po/positron-bin/update.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq git
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+positron_nix="$nixpkgs/pkgs/by-name/po/positron-bin/package.nix"
+
+current_version=$(grep -oP "version = \"\K.*\d" $positron_nix)
+new_version=$(curl -sSfL \
+  -H "Accept: application/vnd.github+json" \
+  -H "X-GitHub-Api-Version: 2022-11-28" \
+  "https://api.github.com/repos/posit-dev/positron/releases?per_page=1" \
+  | jq -r '.[0].name')
+
+if [[ "$new_version" == "$current_version" ]]; then
+    echo 'Positron is already up to date'
+    exit 0;
+fi
+
+# Update Darwin hash.
+current_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.dmg" \
+    | jq -r .hash)
+
+new_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.dmg" \
+    | jq -r .hash)
+
+sed -i "s|$current_hash|$new_hash|g" $positron_nix
+
+# Update Linux hash.
+current_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.deb" \
+    | jq -r .hash)
+
+new_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.deb" \
+    | jq -r .hash)
+
+sed -i "s|$current_hash|$new_hash|g" $positron_nix
+
+# Update version
+sed -i "s|$current_version|$new_version|g" $positron_nix
+
+# Attempt to build.
+export NIXPKGS_ALLOW_UNFREE=1
+
+if ! nix-build -A positron-bin "$nixpkgs"; then
+  echo "The updated positron-bin failed to build."
+  exit 1
+fi
+
+# Commit changes
+git add "$positron_nix"
+git commit -m "positron-bin: ${current_version} -> ${new_version}"
diff --git a/pkgs/tools/security/posteid-seed-extractor/default.nix b/pkgs/by-name/po/posteid-seed-extractor/package.nix
similarity index 100%
rename from pkgs/tools/security/posteid-seed-extractor/default.nix
rename to pkgs/by-name/po/posteid-seed-extractor/package.nix
diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/by-name/po/postfixadmin/package.nix
similarity index 100%
rename from pkgs/servers/postfixadmin/default.nix
rename to pkgs/by-name/po/postfixadmin/package.nix
diff --git a/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/pkgs/by-name/po/postgres-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/postgres-lsp/default.nix
rename to pkgs/by-name/po/postgres-lsp/package.nix
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix b/pkgs/by-name/po/postgresqlTestHook/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix
rename to pkgs/by-name/po/postgresqlTestHook/package.nix
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
rename to pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/by-name/po/postgresqlTestHook/test.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix
rename to pkgs/by-name/po/postgresqlTestHook/test.nix
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/by-name/po/postgresql_jdbc/package.nix
similarity index 100%
rename from pkgs/development/java-modules/postgresql_jdbc/default.nix
rename to pkgs/by-name/po/postgresql_jdbc/package.nix
diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/by-name/po/postgrey/package.nix
similarity index 100%
rename from pkgs/servers/mail/postgrey/default.nix
rename to pkgs/by-name/po/postgrey/package.nix
diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/by-name/po/postiats-utilities/package.nix
similarity index 100%
rename from pkgs/development/tools/postiats-utilities/default.nix
rename to pkgs/by-name/po/postiats-utilities/package.nix
diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix
similarity index 100%
rename from pkgs/development/web/postman/darwin.nix
rename to pkgs/by-name/po/postman/darwin.nix
diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
new file mode 100644
index 000000000000..4ef52b253205
--- /dev/null
+++ b/pkgs/by-name/po/postman/linux.nix
@@ -0,0 +1,161 @@
+{ lib
+, stdenv
+, fetchurl
+, makeDesktopItem
+, wrapGAppsHook3
+, atk
+, at-spi2-atk
+, at-spi2-core
+, alsa-lib
+, cairo
+, cups
+, dbus
+, expat
+, gdk-pixbuf
+, glib
+, gtk3
+, freetype
+, fontconfig
+, nss
+, nspr
+, pango
+, udev
+, libsecret
+, libuuid
+, libX11
+, libxcb
+, libXi
+, libXcursor
+, libXdamage
+, libXrandr
+, libXcomposite
+, libXext
+, libXfixes
+, libXrender
+, libXtst
+, libXScrnSaver
+, libxkbcommon
+, libdrm
+, mesa
+# It's unknown which version of openssl that postman expects but it seems that
+# OpenSSL 3+ seems to work fine (cf.
+# https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently
+# around OpenSSL stuff then try changing this dependency version.
+, openssl
+, xorg
+, pname
+, version
+, meta
+, copyDesktopItems
+, makeWrapper
+}:
+
+let
+  dist = {
+    aarch64-linux = {
+      arch = "arm64";
+      sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo=";
+    };
+
+    x86_64-linux = {
+      arch = "64";
+      sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM=";
+    };
+  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+in
+stdenv.mkDerivation rec {
+  inherit pname version meta;
+
+  src = fetchurl {
+    url = "https://dl.pstmn.io/download/version/${version}/linux${dist.arch}";
+    inherit (dist) sha256;
+    name = "${pname}-${version}.tar.gz";
+  };
+
+  dontConfigure = true;
+
+  desktopItems = [
+      (makeDesktopItem {
+      name = "postman";
+      exec = "postman %U";
+      icon = "postman";
+      comment = "API Development Environment";
+      desktopName = "Postman";
+      genericName = "Postman";
+      categories = [ "Development" ];
+    })
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    atk
+    at-spi2-atk
+    at-spi2-core
+    alsa-lib
+    cairo
+    cups
+    dbus
+    expat
+    gdk-pixbuf
+    glib
+    gtk3
+    freetype
+    fontconfig
+    mesa
+    nss
+    nspr
+    pango
+    udev
+    libdrm
+    libsecret
+    libuuid
+    libX11
+    libxcb
+    libXi
+    libXcursor
+    libXdamage
+    libXrandr
+    libXcomposite
+    libXext
+    libXfixes
+    libXrender
+    libXtst
+    libXScrnSaver
+    libxkbcommon
+    xorg.libxshmfence
+  ];
+
+  nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/postman
+    cp -R app/* $out/share/postman
+    rm $out/share/postman/Postman
+
+    mkdir -p $out/bin
+    ln -s $out/share/postman/postman $out/bin/postman
+
+    source "${makeWrapper}/nix-support/setup-hook"
+    wrapProgram $out/bin/${pname} \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+
+    mkdir -p $out/share/icons/hicolor/128x128/apps
+    ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/postman.png
+    ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/hicolor/128x128/apps/postman.png
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    pushd $out/share/postman
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" chrome_crashpad_handler
+    for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do
+      ORIGIN=$(patchelf --print-rpath $file); \
+      patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
+    done
+    popd
+    wrapProgram $out/bin/postman --set PATH ${lib.makeBinPath [ openssl ]}
+  '';
+}
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/by-name/po/postman/package.nix
similarity index 100%
rename from pkgs/development/web/postman/default.nix
rename to pkgs/by-name/po/postman/package.nix
diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix
index 5e6c60aba67a..25f9f6067e38 100644
--- a/pkgs/by-name/po/postmoogle/package.nix
+++ b/pkgs/by-name/po/postmoogle/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "postmoogle";
-  version = "0.9.21";
+  version = "0.9.24";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "postmoogle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/AuxrIvxoKb08uf4EOYXorl7vJ99KgEH9DZYLidDzI4=";
+    hash = "sha256-6KxPsg1zy8Dpo0UcgEWRmH6bI5oKJyzkZTelgk3SjoY=";
   };
 
   tags = [
@@ -21,14 +21,10 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  postInstall = ''
-    mv $out/bin/cmd $out/bin/postmoogle
-  '';
-
   meta = with lib; {
     description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server";
     homepage = "https://github.com/etkecc/postmoogle";
-    changelog = "https://github.com/etkecc/postmoogle/releases/tag/v0.9.21";
+    changelog = "https://github.com/etkecc/postmoogle/releases/tag/v${version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ amuckstot30 ];
     mainProgram = "postmoogle";
diff --git a/pkgs/by-name/po/postprocessd/package.nix b/pkgs/by-name/po/postprocessd/package.nix
new file mode 100644
index 000000000000..ef74fd7ad53b
--- /dev/null
+++ b/pkgs/by-name/po/postprocessd/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  fetchFromSourcehut,
+  libexif,
+  libraw,
+  meson,
+  ninja,
+  opencv4,
+  pkg-config,
+  scdoc,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "postprocessd";
+  version = "0.3.0";
+
+  src = fetchFromSourcehut {
+    owner = "~martijnbraam";
+    repo = "postprocessd";
+    rev = finalAttrs.version;
+    hash = "sha256-xqEjjAv27TUrEU/5j8Um7fTFjmIYZovyJCccbtHPuGo=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    scdoc
+  ];
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libexif
+    libraw
+    opencv4
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "Queueing megapixels post-processor";
+    homepage = "https://git.sr.ht/~martijnbraam/postprocessd";
+    changelog = "https://git.sr.ht/~martijnbraam/postprocessd/refs/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ Luflosi ];
+    platforms = lib.platforms.linux;
+    mainProgram = "postprocess-single";
+  };
+})
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/by-name/po/postscript-lexmark/package.nix
similarity index 100%
rename from pkgs/misc/drivers/postscript-lexmark/default.nix
rename to pkgs/by-name/po/postscript-lexmark/package.nix
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/by-name/po/postsrsd/package.nix
similarity index 100%
rename from pkgs/servers/mail/postsrsd/default.nix
rename to pkgs/by-name/po/postsrsd/package.nix
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/by-name/po/potrace/package.nix
similarity index 100%
rename from pkgs/applications/graphics/potrace/default.nix
rename to pkgs/by-name/po/potrace/package.nix
diff --git a/pkgs/applications/graphics/potreeconverter/default.nix b/pkgs/by-name/po/potreeconverter/package.nix
similarity index 100%
rename from pkgs/applications/graphics/potreeconverter/default.nix
rename to pkgs/by-name/po/potreeconverter/package.nix
diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/by-name/po/pouf/package.nix
similarity index 100%
rename from pkgs/tools/misc/pouf/default.nix
rename to pkgs/by-name/po/pouf/package.nix
diff --git a/pkgs/servers/pounce/default.nix b/pkgs/by-name/po/pounce/package.nix
similarity index 100%
rename from pkgs/servers/pounce/default.nix
rename to pkgs/by-name/po/pounce/package.nix
diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/by-name/po/power-calibrate/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/power-calibrate/default.nix
rename to pkgs/by-name/po/power-calibrate/package.nix
diff --git a/pkgs/tools/misc/poweralertd/default.nix b/pkgs/by-name/po/poweralertd/package.nix
similarity index 100%
rename from pkgs/tools/misc/poweralertd/default.nix
rename to pkgs/by-name/po/poweralertd/package.nix
diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/by-name/po/powercap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/powercap/default.nix
rename to pkgs/by-name/po/powercap/package.nix
diff --git a/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch b/pkgs/by-name/po/powerdns-admin/0001-Fix-flask-2.3-issue.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch
rename to pkgs/by-name/po/powerdns-admin/0001-Fix-flask-2.3-issue.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch b/pkgs/by-name/po/powerdns-admin/0002-Remove-cssrewrite-filter.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch
rename to pkgs/by-name/po/powerdns-admin/0002-Remove-cssrewrite-filter.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch b/pkgs/by-name/po/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
rename to pkgs/by-name/po/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch b/pkgs/by-name/po/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
rename to pkgs/by-name/po/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch b/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch
rename to pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch b/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch
rename to pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch
diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/by-name/po/powerdns-admin/package.nix
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/default.nix
rename to pkgs/by-name/po/powerdns-admin/package.nix
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/by-name/po/powerline-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/powerline-fonts/default.nix
rename to pkgs/by-name/po/powerline-fonts/package.nix
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/by-name/po/powerline-go/package.nix
similarity index 100%
rename from pkgs/tools/misc/powerline-go/default.nix
rename to pkgs/by-name/po/powerline-go/package.nix
diff --git a/pkgs/data/fonts/powerline-symbols/default.nix b/pkgs/by-name/po/powerline-symbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/powerline-symbols/default.nix
rename to pkgs/by-name/po/powerline-symbols/package.nix
diff --git a/pkgs/games/powermanga/default.nix b/pkgs/by-name/po/powermanga/package.nix
similarity index 100%
rename from pkgs/games/powermanga/default.nix
rename to pkgs/by-name/po/powermanga/package.nix
diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix
index b64c4a39ad78..99807e5cfe26 100644
--- a/pkgs/by-name/po/powerpipe/package.nix
+++ b/pkgs/by-name/po/powerpipe/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "powerpipe";
-  version = "0.4.4";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "powerpipe";
     rev = "refs/tags/v${version}";
-    hash = "sha256-B88Kc4cCadsyN/sx3TimFX3ad6WZqn/Qaw39ms8b+HE=";
+    hash = "sha256-ou24M5S6GfrQxmcmESzhU52ZQqdb+1s2ExLBljM0RR0=";
   };
 
-  vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk=";
+  vendorHash = "sha256-CveNSjZCdV8YEis0PNP8F9+ht+Q9vz0VWCEp9lCJsTs=";
   proxyVendor = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/by-name/po/powershell/package.nix
similarity index 100%
rename from pkgs/shells/powershell/default.nix
rename to pkgs/by-name/po/powershell/package.nix
diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/by-name/po/powerstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/powerstat/default.nix
rename to pkgs/by-name/po/powerstat/package.nix
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/by-name/pp/ppl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ppl/default.nix
rename to pkgs/by-name/pp/ppl/package.nix
diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/by-name/pp/pplatex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/pplatex/default.nix
rename to pkgs/by-name/pp/pplatex/package.nix
diff --git a/pkgs/development/libraries/pplite/default.nix b/pkgs/by-name/pp/pplite/package.nix
similarity index 100%
rename from pkgs/development/libraries/pplite/default.nix
rename to pkgs/by-name/pp/pplite/package.nix
diff --git a/pkgs/by-name/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix
new file mode 100644
index 000000000000..b671e5880c5a
--- /dev/null
+++ b/pkgs/by-name/pp/ppp/package.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, libpcap
+, libxcrypt
+, pkg-config
+, autoreconfHook
+, openssl
+, bash
+, nixosTests
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.5.1";
+  pname = "ppp";
+
+  src = fetchFromGitHub {
+    owner = "ppp-project";
+    repo = "ppp";
+    rev = "ppp-${version}";
+    hash = "sha256-sjaBFP/A63+ycuZm3bxOxAAxMrVHZZFED2Uq8rBapdo=";
+  };
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-openssl=${openssl.dev}"
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    libpcap
+    libxcrypt
+    openssl
+    bash
+  ];
+
+  postPatch = ''
+    for file in $(find -name Makefile.linux); do
+      substituteInPlace "$file" --replace '-m 4550' '-m 550'
+    done
+
+    patchShebangs --host \
+      scripts/{pon,poff,plog}
+  '';
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  NIX_LDFLAGS = "-lcrypt";
+
+  installFlags = [
+    "sysconfdir=$(out)/etc"
+  ];
+
+  postInstall = ''
+    install -Dm755 -t $out/bin scripts/{pon,poff,plog}
+  '';
+
+  postFixup = ''
+    substituteInPlace "$out/bin/pon" --replace "/usr/sbin" "$out/bin"
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) pppd;
+  };
+
+  meta = with lib; {
+    homepage = "https://ppp.samba.org";
+    description = "Point-to-point implementation to provide Internet connections over serial lines";
+    license = with licenses; [
+      bsdOriginal
+      publicDomain
+      gpl2Only
+      lgpl2
+    ];
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/by-name/pp/pprof/package.nix
similarity index 100%
rename from pkgs/development/tools/profiling/pprof/default.nix
rename to pkgs/by-name/pp/pprof/package.nix
diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/by-name/pp/pps-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pps-tools/default.nix
rename to pkgs/by-name/pp/pps-tools/package.nix
diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix
index 1b2b2931247d..d15187254b48 100644
--- a/pkgs/by-name/pp/ppsspp/package.nix
+++ b/pkgs/by-name/pp/ppsspp/package.nix
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
           + lib.optionalString enableQt "-qt"
           + lib.optionalString (!enableQt) "-sdl"
           + lib.optionalString forceWayland "-wayland";
-  version = "1.17.1";
+  version = "1.18";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-I84zJqEE1X/eo/ukeGA2iZe3lWKvilk+RNGUzl2wZXY=";
+    hash = "sha256-ssZthilRMukgJm6Rnv79Yu6Rc/pTIX9E12rXY6Ct6bc=";
   };
 
   patches = lib.optionals useSystemFfmpeg [
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/by-name/pp/pptp/package.nix
similarity index 100%
rename from pkgs/tools/networking/pptp/default.nix
rename to pkgs/by-name/pp/pptp/package.nix
diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/by-name/pp/pptpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/pptpd/default.nix
rename to pkgs/by-name/pp/pptpd/package.nix
diff --git a/pkgs/tools/networking/pptpd/ppp-2.5.0-compat.patch b/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
similarity index 100%
rename from pkgs/tools/networking/pptpd/ppp-2.5.0-compat.patch
rename to pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
diff --git a/pkgs/by-name/pq/pqiv/package.nix b/pkgs/by-name/pq/pqiv/package.nix
index ec621a56dca3..f9d17bc2f913 100644
--- a/pkgs/by-name/pq/pqiv/package.nix
+++ b/pkgs/by-name/pq/pqiv/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pqiv";
-  version = "2.13.1";
+  version = "2.13.2";
 
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
     rev = finalAttrs.version;
-    hash = "sha256-Op+N4zzq7MazjFvx5VisjsRXbIqLtWPv4hdVjmS7lPY=";
+    hash = "sha256-wpM8eG2/sEfwYLfh6s3AL+z73IzeXxwGm/scWRRKLPo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/by-name/pq/pqrs/package.nix
similarity index 100%
rename from pkgs/development/tools/pqrs/default.nix
rename to pkgs/by-name/pq/pqrs/package.nix
diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/by-name/pr/pr-tracker/package.nix
similarity index 100%
rename from pkgs/servers/pr-tracker/default.nix
rename to pkgs/by-name/pr/pr-tracker/package.nix
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/by-name/pr/praat/package.nix
similarity index 100%
rename from pkgs/applications/audio/praat/default.nix
rename to pkgs/by-name/pr/praat/package.nix
diff --git a/pkgs/games/doom-ports/prboom-plus/default.nix b/pkgs/by-name/pr/prboom-plus/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/prboom-plus/default.nix
rename to pkgs/by-name/pr/prboom-plus/package.nix
diff --git a/pkgs/tools/misc/pre-commit-hook-ensure-sops/default.nix b/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
similarity index 100%
rename from pkgs/tools/misc/pre-commit-hook-ensure-sops/default.nix
rename to pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
diff --git a/pkgs/tools/misc/pre-commit/hook-tmpl.patch b/pkgs/by-name/pr/pre-commit/hook-tmpl.patch
similarity index 100%
rename from pkgs/tools/misc/pre-commit/hook-tmpl.patch
rename to pkgs/by-name/pr/pre-commit/hook-tmpl.patch
diff --git a/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/by-name/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
similarity index 100%
rename from pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
rename to pkgs/by-name/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/by-name/pr/pre-commit/package.nix
similarity index 100%
rename from pkgs/tools/misc/pre-commit/default.nix
rename to pkgs/by-name/pr/pre-commit/package.nix
diff --git a/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch b/pkgs/by-name/pr/pre-commit/pygrep-pythonpath.patch
similarity index 100%
rename from pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch
rename to pkgs/by-name/pr/pre-commit/pygrep-pythonpath.patch
diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/by-name/pr/precice-config-visualizer/package.nix
similarity index 100%
rename from pkgs/tools/misc/precice-config-visualizer/default.nix
rename to pkgs/by-name/pr/precice-config-visualizer/package.nix
diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/by-name/pr/precice/package.nix
similarity index 100%
rename from pkgs/development/libraries/precice/default.nix
rename to pkgs/by-name/pr/precice/package.nix
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/by-name/pr/prelink/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/prelink/default.nix
rename to pkgs/by-name/pr/prelink/package.nix
diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/by-name/pr/premid/package.nix
similarity index 100%
rename from pkgs/applications/misc/premid/default.nix
rename to pkgs/by-name/pr/premid/package.nix
diff --git a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/pkgs/by-name/pr/presage/fixed-cppunit-detection.patch
similarity index 100%
rename from pkgs/development/libraries/presage/fixed-cppunit-detection.patch
rename to pkgs/by-name/pr/presage/fixed-cppunit-detection.patch
diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/by-name/pr/presage/package.nix
similarity index 100%
rename from pkgs/development/libraries/presage/default.nix
rename to pkgs/by-name/pr/presage/package.nix
diff --git a/pkgs/tools/misc/present-cli/default.nix b/pkgs/by-name/pr/present-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/present-cli/default.nix
rename to pkgs/by-name/pr/present-cli/package.nix
diff --git a/pkgs/misc/present/default.nix b/pkgs/by-name/pr/present/package.nix
similarity index 100%
rename from pkgs/misc/present/default.nix
rename to pkgs/by-name/pr/present/package.nix
diff --git a/pkgs/tools/security/pretender/default.nix b/pkgs/by-name/pr/pretender/package.nix
similarity index 100%
rename from pkgs/tools/security/pretender/default.nix
rename to pkgs/by-name/pr/pretender/package.nix
diff --git a/pkgs/by-name/pr/pretix-banktool/package.nix b/pkgs/by-name/pr/pretix-banktool/package.nix
index 9628e2dbda72..fc91c12e97a7 100644
--- a/pkgs/by-name/pr/pretix-banktool/package.nix
+++ b/pkgs/by-name/pr/pretix-banktool/package.nix
@@ -2,29 +2,20 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  fetchpatch2,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "pretix-banktool";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-banktool";
     rev = "v${version}";
-    hash = "sha256-vYHjotx1RujPV53Ei7bXAc3kL/3cwbWQB1T3sQ15MFA=";
+    hash = "sha256-x6P+WqrOak5/gmMEmBkHrx6kPsbSOAXbKRbndFG3IJU=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # migrate to pyproject.toml, relax constraints
-      url = "https://github.com/pretix/pretix-banktool/commit/48a8125aba86d70f62c2b1f88bcf21c783402589.patch";
-      hash = "sha256-HbVzWoI5LlNyh0MZnPsLmzu7RMY8/BDfOwgDWMD+k5w=";
-    })
-  ];
-
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 66540cdfff2a..ddbbe8781a4e 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -51,13 +51,13 @@ let
   };
 
   pname = "pretix";
-  version = "2024.9.0";
+  version = "2024.10.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L6mTfLIx8kD/5s0Dfp24TEATmjxBXERQjynB0szH3DM=";
+    hash = "sha256-MCiCr00N7894DjckAw3vpxdiNtlgzqivlbSY4A/327E=";
   };
 
   npmDeps = buildNpmPackage {
@@ -65,7 +65,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-zUui5tYINTDKA91WgRV51ilIPFBJpZ+S2fJwW85KJ9k=";
+    npmDepsHash = "sha256-PPcA6TBsU/gGk4wII+w7VZOm65nS7qGjZ/UoQs31s9M=";
 
     dontBuild = true;
 
@@ -91,14 +91,17 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "django-phonenumber-field"
+    "dnspython"
     "importlib-metadata"
     "kombu"
     "markdown"
     "pillow"
     "protobuf"
+    "pycryptodome"
     "pyjwt"
     "python-bidi"
     "qrcode"
+    "redis"
     "requests"
     "sentry-sdk"
   ];
diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages.nix
index 0edc1f9c3489..97e409679385 100644
--- a/pkgs/by-name/pr/pretix/plugins/pages.nix
+++ b/pkgs/by-name/pr/pretix/plugins/pages.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-pages";
-  version = "1.6.1";
+  version = "1.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-pages";
     rev = "v${version}";
-    hash = "sha256-u2POt3v0OpjbauDCX8Uclvqd1+jujvVrzUIYrvDv/qI=";
+    hash = "sha256-0pTFGCgtt/JGviTLsZFwgx93TD8ArLwZGfWoSYv5XuY=";
   };
 
   build-system = [
diff --git a/pkgs/development/tools/pretty-simple/default.nix b/pkgs/by-name/pr/pretty-simple/package.nix
similarity index 100%
rename from pkgs/development/tools/pretty-simple/default.nix
rename to pkgs/by-name/pr/pretty-simple/package.nix
diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/by-name/pr/prettyping/package.nix
similarity index 100%
rename from pkgs/tools/networking/prettyping/default.nix
rename to pkgs/by-name/pr/prettyping/package.nix
diff --git a/pkgs/by-name/pr/prevo-tools/package.nix b/pkgs/by-name/pr/prevo-tools/package.nix
index 741e6e80d87c..a4bb505357b0 100644
--- a/pkgs/by-name/pr/prevo-tools/package.nix
+++ b/pkgs/by-name/pr/prevo-tools/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, glib, expat
 , installShellFiles }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-TfgsZidwXewwqGkb31Qv0SrX8wQdPaK7JQA3nB5h2bs=";
   };
 
+  patches = [
+    # Fix building with glib-2.82
+    # https://github.com/bpeel/prevodb/issues/8
+    (fetchpatch {
+      url = "https://github.com/bpeel/prevodb/commit/38474b47d0ab8ef5451997b87493f0677b8b8358.patch";
+      hash = "sha256-mGHwnN4TT3jiandaN+6uNttKMg0OjV9yKLSuVn3F0CA=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ];
   buildInputs = [ glib expat ];
 
diff --git a/pkgs/tools/misc/pridecat/fix_install.patch b/pkgs/by-name/pr/pridecat/fix_install.patch
similarity index 100%
rename from pkgs/tools/misc/pridecat/fix_install.patch
rename to pkgs/by-name/pr/pridecat/fix_install.patch
diff --git a/pkgs/tools/misc/pridecat/default.nix b/pkgs/by-name/pr/pridecat/package.nix
similarity index 100%
rename from pkgs/tools/misc/pridecat/default.nix
rename to pkgs/by-name/pr/pridecat/package.nix
diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/by-name/pr/pridefetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/pridefetch/default.nix
rename to pkgs/by-name/pr/pridefetch/package.nix
diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/by-name/pr/prime-server/package.nix
similarity index 100%
rename from pkgs/development/libraries/prime-server/default.nix
rename to pkgs/by-name/pr/prime-server/package.nix
diff --git a/pkgs/games/principia/default.nix b/pkgs/by-name/pr/principia/package.nix
similarity index 100%
rename from pkgs/games/principia/default.nix
rename to pkgs/by-name/pr/principia/package.nix
diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/by-name/pr/printrun/package.nix
similarity index 100%
rename from pkgs/applications/misc/printrun/default.nix
rename to pkgs/by-name/pr/printrun/package.nix
diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/by-name/pr/prism/package.nix
similarity index 100%
rename from pkgs/applications/video/prism/default.nix
rename to pkgs/by-name/pr/prism/package.nix
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index 6b935d55642a..25136ffeb359 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prisma";
-  version = "5.21.1";
+  version = "5.22.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
     rev = finalAttrs.version;
-    hash = "sha256-75TmTFl1EKLGE3kgghghary4Z2gjEjdguZ//ND3HAkc=";
+    hash = "sha256-Z7zSL2eixoNqWpgzVbiDUG2ViSmJtho7lRmvZ10ft3I=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_8.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-fu2SJUn2xKm8lKNE8ncMRuNu6snj1J6cnHrJfzg+hJc=";
+    hash = "sha256-2o6ClY0zMctLR4nFmApiYnzXlrN1EqbHkAP/FEcXnEQ=";
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
index ab9b7144b922..03c1f0421530 100644
--- a/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -78,7 +78,7 @@ symlinkJoin {
     let
       runtimeLibs =
         [
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
           ## native versions
           glfw3-minecraft
           openal
diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix
new file mode 100644
index 000000000000..28389dcc6c74
--- /dev/null
+++ b/pkgs/by-name/pr/pritunl-client/package.nix
@@ -0,0 +1,147 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, nix-update-script
+, runtimeShell
+, runCommand
+, makeWrapper
+, installShellFiles
+, buildGoModule
+, coreutils
+, which
+, gnugrep
+, gnused
+, openresolv
+, systemd
+, iproute2
+, openvpn
+, electron
+}: let
+  version = "1.3.4066.51";
+  src = fetchFromGitHub {
+    owner = "pritunl";
+    repo = "pritunl-client-electron";
+    rev = version;
+    sha256 = "sha256-yoPpDOcTv3kBTHscYn//KseZpfj1HArInODSxPKOFXY=";
+  };
+
+  cli = buildGoModule {
+    pname = "pritunl-cli";
+    inherit version src;
+
+    modRoot = "cli";
+    vendorHash = "sha256-wwPgyIo14zpA+oCJH0CQ4+7zyP+Itxbd6S0P7t01wBw=";
+
+    postInstall = ''
+      mv $out/bin/cli $out/bin/pritunl-client
+    '';
+    passthru.updateScript = nix-update-script { };
+  };
+
+  service = buildGoModule {
+    pname = "pritunl-client-service";
+    inherit version src;
+
+    modRoot = "service";
+    vendorHash = "sha256-uy8+R4l3e4YAWMxWWbVHhkwxvbOsY5PF7fs1dVyMIAg=";
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    postPatch = ''
+      sed -Ei service/connection/scripts.go \
+        -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g'
+    '' + lib.optionalString stdenv.hostPlatform.isLinux ''
+      sed -Ei service/connection/scripts.go \
+        -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \
+        -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \
+        -e 's|(/usr)?/s?bin/ip\b|ip|g'
+    '';
+
+    postInstall = ''
+      mv $out/bin/service $out/bin/pritunl-client-service
+    '' + lib.optionalString stdenv.hostPlatform.isLinux ''
+      mkdir -p $out/lib/systemd/system/
+      cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/
+      substituteInPlace $out/lib/systemd/system/pritunl-client.service \
+        --replace-warn "/usr" "$out"
+    '';
+
+    postFixup = let
+      hookScriptsDeps = [
+        coreutils
+        which
+        gnused
+        gnugrep
+      ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+        openresolv
+        systemd
+        iproute2
+      ];
+      openvpn-wrapped = runCommand "openvpn-wrapped" {
+        nativeBuildInputs = [ makeWrapper ];
+      } ''
+        mkdir -p $out/bin
+        makeWrapper ${openvpn}/bin/openvpn $out/bin/openvpn \
+          --prefix PATH : ${lib.makeBinPath hookScriptsDeps} \
+          --add-flags "--setenv PATH \$PATH"
+      '';
+    in lib.optionalString stdenv.hostPlatform.isLinux ''
+      wrapProgram $out/bin/pritunl-client-service \
+        --prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}"
+    '';
+    passthru.updateScript = nix-update-script { };
+  };
+in stdenv.mkDerivation {
+  pname = "pritunl-client";
+  inherit version src;
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin/
+    ln -s ${cli}/bin/pritunl-client $out/bin/
+    ln -s ${service}/bin/pritunl-client-service $out/bin/
+
+    mkdir -p $out/lib/
+    cp -r client $out/lib/pritunl_client_electron
+
+    makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \
+      --add-flags $out/lib/pritunl_client_electron
+
+  '' + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/lib/systemd/system/
+    ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/
+
+    mkdir -p $out/share/icons/
+    cp -r resources_linux/icons $out/share/icons/hicolor
+
+    mkdir -p $out/share/applications/
+    cp resources_linux/pritunl-client-electron.desktop $out/share/applications/
+    substituteInPlace $out/share/applications/pritunl-client-electron.desktop \
+      --replace-fail "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron"
+  '' + ''
+    # install shell completions for pritunl-client
+    installShellCompletion --cmd pritunl-client \
+      --bash <($out/bin/pritunl-client completion bash) \
+      --fish <($out/bin/pritunl-client completion fish) \
+      --zsh <($out/bin/pritunl-client completion zsh)
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+  meta = with lib; {
+    description = "Pritunl OpenVPN client";
+    homepage = "https://client.pritunl.com/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ minizilla andrevmatos ];
+  };
+}
diff --git a/pkgs/tools/networking/pritunl-ssh/default.nix b/pkgs/by-name/pr/pritunl-ssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/pritunl-ssh/default.nix
rename to pkgs/by-name/pr/pritunl-ssh/package.nix
diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/by-name/pr/procdump/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/procdump/default.nix
rename to pkgs/by-name/pr/procdump/package.nix
diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/by-name/pr/process-compose/package.nix
similarity index 100%
rename from pkgs/applications/misc/process-compose/default.nix
rename to pkgs/by-name/pr/process-compose/package.nix
diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/by-name/pr/process-viewer/package.nix
similarity index 100%
rename from pkgs/applications/misc/process-viewer/default.nix
rename to pkgs/by-name/pr/process-viewer/package.nix
diff --git a/pkgs/data/fonts/prociono/default.nix b/pkgs/by-name/pr/prociono/package.nix
similarity index 100%
rename from pkgs/data/fonts/prociono/default.nix
rename to pkgs/by-name/pr/prociono/package.nix
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/by-name/pr/procmail/package.nix
similarity index 100%
rename from pkgs/applications/misc/procmail/default.nix
rename to pkgs/by-name/pr/procmail/package.nix
diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/by-name/pr/procyon/package.nix
similarity index 100%
rename from pkgs/tools/misc/procyon/default.nix
rename to pkgs/by-name/pr/procyon/package.nix
diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/by-name/pr/prodigal/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/prodigal/default.nix
rename to pkgs/by-name/pr/prodigal/package.nix
diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/by-name/pr/professor/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/professor/default.nix
rename to pkgs/by-name/pr/professor/package.nix
diff --git a/pkgs/tools/misc/profetch/default.nix b/pkgs/by-name/pr/profetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/profetch/default.nix
rename to pkgs/by-name/pr/profetch/package.nix
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/by-name/pr/profile-cleaner/package.nix
similarity index 100%
rename from pkgs/tools/misc/profile-cleaner/default.nix
rename to pkgs/by-name/pr/profile-cleaner/package.nix
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/by-name/pr/profile-sync-daemon/package.nix
similarity index 100%
rename from pkgs/tools/misc/profile-sync-daemon/default.nix
rename to pkgs/by-name/pr/profile-sync-daemon/package.nix
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/by-name/pr/proggyfonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/proggyfonts/default.nix
rename to pkgs/by-name/pr/proggyfonts/package.nix
diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/by-name/pr/programmer-calculator/package.nix
similarity index 100%
rename from pkgs/applications/science/math/programmer-calculator/default.nix
rename to pkgs/by-name/pr/programmer-calculator/package.nix
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/by-name/pr/progress/package.nix
similarity index 100%
rename from pkgs/tools/misc/progress/default.nix
rename to pkgs/by-name/pr/progress/package.nix
diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix
similarity index 100%
rename from pkgs/development/libraries/proj-datumgrid/default.nix
rename to pkgs/by-name/pr/proj-datumgrid/package.nix
diff --git a/pkgs/by-name/pr/project-lemonlime/0001-Bind-Nix-Store.patch b/pkgs/by-name/pr/project-lemonlime/0001-Bind-Nix-Store.patch
new file mode 100644
index 000000000000..86420dc0916a
--- /dev/null
+++ b/pkgs/by-name/pr/project-lemonlime/0001-Bind-Nix-Store.patch
@@ -0,0 +1,41 @@
+From f404e176e89c5d778363cb0177b44dc1aa5e1fda Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Tue, 5 Nov 2024 12:53:04 +0800
+Subject: [PATCH] Bind Nix Store
+
+---
+ src/core/judgingthread.cpp | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/src/core/judgingthread.cpp b/src/core/judgingthread.cpp
+index 7201552..88aee9d 100644
+--- a/src/core/judgingthread.cpp
++++ b/src/core/judgingthread.cpp
+@@ -893,21 +893,9 @@ void JudgingThread::runProgram() {
+ 	auto *runner = new QProcess(this);
+ 	QStringList argumentsList;
+ 
+-	argumentsList << "--ro-bind"
+-	              << "/usr"
+-	              << "/usr";
+-	argumentsList << "--symlink"
+-	              << "/usr/lib"
+-	              << "/lib";
+-	argumentsList << "--symlink"
+-	              << "/usr/lib64"
+-	              << "/lib64";
+-	argumentsList << "--symlink"
+-	              << "/usr/bin"
+-	              << "/bin";
+-	argumentsList << "--symlink"
+-	              << "/usr/sbin"
+-	              << "/sbin";
++	argumentsList << "--bind"
++	              << "/nix/store"
++	              << "/nix/store";
+ 	argumentsList << "--tmpfs"
+ 	              << "/tmp";
+ 
+-- 
+2.46.1
+
diff --git a/pkgs/by-name/pr/project-lemonlime/package.nix b/pkgs/by-name/pr/project-lemonlime/package.nix
index c49682b64116..f29a7c671e37 100644
--- a/pkgs/by-name/pr/project-lemonlime/package.nix
+++ b/pkgs/by-name/pr/project-lemonlime/package.nix
@@ -5,6 +5,9 @@
   cmake,
   qt6,
   nix-update-script,
+  bubblewrap,
+  bash,
+  diffutils,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,6 +27,19 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
+  patches = [
+    ./0001-Bind-Nix-Store.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace src/core/judgingthread.cpp \
+      --replace-fail "/usr/bin/bwrap" "${lib.getExe bubblewrap}"
+    substituteInPlace unix/watcher_unix.cpp \
+      --replace-fail "bash" "${lib.getExe bash}"
+    substituteInPlace src/base/settings.cpp \
+      --replace-fail "/usr/bin/diff" "${diffutils}/bin/diff"
+  '';
+
   cmakeFlags = [
     (lib.cmakeBool "LEMON_QT6" true)
   ];
diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/by-name/pr/projectable/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/projectable/default.nix
rename to pkgs/by-name/pr/projectable/package.nix
diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
index 9aef55d3ae19..c5fc4c0eb530 100644
--- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "prometheus-borgmatic-exporter";
-  version = "0.2.5";
+  version = "0.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maxim-mityutko";
     repo = "borgmatic-exporter";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SgP1utu4Eqs9214pYOT9wP0Ms7AUQH1A3czQF8+qBRo=";
+    hash = "sha256-ZZdCuIavJrIHO/ayMnirNRYyqovKQaW5jTRRrSOhofQ=";
   };
 
   pythonRelaxDeps = [ "prometheus-client" ];
diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/prometheus-cpp/default.nix
rename to pkgs/by-name/pr/prometheus-cpp/package.nix
diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
similarity index 100%
rename from pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
rename to pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix
rename to pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
index 4b8d9c16c9ec..db41ced6fd45 100644
--- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
@@ -2,26 +2,30 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
   nixosTests,
 }:
 
 buildGoModule rec {
   pname = "prometheus-klipper-exporter";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "scross01";
     repo = "prometheus-klipper-exporter";
     rev = "v${version}";
-    sha256 = "sha256-ow7bzgaY4pYccslITlkNBKfZBJv9uwPk25I1Y3bnjbU=";
+    sha256 = "sha256-OlNUBdCizMOSb7WEtu00LaHYSXLSPlISVJD/0rHujnY=";
   };
 
   vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0=";
 
   doCheck = true;
 
-  passthru.tests = {
-    inherit (nixosTests.prometheus-exporters) process;
+  passthru = {
+    tests = {
+      inherit (nixosTests.prometheus-exporters) process;
+    };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {
diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix
rename to pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
diff --git a/pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch b/pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch
new file mode 100644
index 000000000000..6cf3cc4e3290
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch
@@ -0,0 +1,72 @@
+diff --git a/go.mod b/go.mod
+new file mode 100644
+index 0000000..64972bc
+--- /dev/null
++++ b/go.mod
+@@ -0,0 +1,20 @@
++module github.com/ipstatic/surfboard_exporter
++
++go 1.22
++
++require (
++	github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
++	github.com/prometheus/common v0.0.0-20160928123818-e35a2e33a50a
++	golang.org/x/net v0.0.0-20161019184016-3bafa3320efd
++)
++
++require (
++	github.com/Sirupsen/logrus v0.10.1-0.20160829202321-3ec0642a7fb6 // indirect
++	github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
++	github.com/golang/protobuf v0.0.0-20160926185624-87c000235d3d // indirect
++	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
++	github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
++	github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9 // indirect
++	github.com/stretchr/testify v1.9.0 // indirect
++	golang.org/x/sys v0.26.0 // indirect
++)
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+new file mode 100644
+index 0000000..d7c6fa3
+--- /dev/null
++++ b/vendor/modules.txt
+@@ -0,0 +1,40 @@
++# github.com/Sirupsen/logrus v0.10.1-0.20160829202321-3ec0642a7fb6
++## explicit
++github.com/Sirupsen/logrus
++# github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
++## explicit
++github.com/beorn7/perks/quantile
++# github.com/golang/protobuf v0.0.0-20160926185624-87c000235d3d
++## explicit
++github.com/golang/protobuf/proto
++# github.com/matttproud/golang_protobuf_extensions v1.0.1
++## explicit
++github.com/matttproud/golang_protobuf_extensions/pbutil
++# github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
++## explicit
++github.com/prometheus/client_golang/prometheus
++# github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335
++## explicit
++github.com/prometheus/client_model/go
++# github.com/prometheus/common v0.0.0-20160928123818-e35a2e33a50a
++## explicit
++github.com/prometheus/common/expfmt
++github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
++github.com/prometheus/common/log
++github.com/prometheus/common/model
++github.com/prometheus/common/version
++# github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9
++## explicit
++github.com/prometheus/procfs
++# github.com/stretchr/testify v1.9.0
++## explicit; go 1.17
++# golang.org/x/net v0.0.0-20161019184016-3bafa3320efd
++## explicit
++golang.org/x/net/html
++golang.org/x/net/html/atom
++# golang.org/x/sys v0.26.0
++## explicit; go 1.18
++golang.org/x/sys/unix
++golang.org/x/sys/windows
++golang.org/x/sys/windows/registry
++golang.org/x/sys/windows/svc/eventlog
diff --git a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
new file mode 100644
index 000000000000..780d090f41cf
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
@@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
+
+buildGoModule rec {
+  pname = "surfboard_exporter";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    rev = version;
+    owner = "ipstatic";
+    repo = "surfboard_exporter";
+    sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw";
+  };
+
+  patches = [
+    ./add-go-mod.patch
+  ];
+
+  vendorHash = null;
+
+  passthru.tests = { inherit (nixosTests.prometheus-exporters) surfboard; };
+
+  meta = with lib; {
+    description = "Arris Surfboard signal metrics exporter";
+    mainProgram = "surfboard_exporter";
+    homepage = "https://github.com/ipstatic/surfboard_exporter";
+    license = licenses.mit;
+    maintainers = with maintainers; [ disassembler ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/by-name/pr/promscale/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/promscale/default.nix
rename to pkgs/by-name/pr/promscale/package.nix
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/by-name/pr/proot/package.nix
similarity index 100%
rename from pkgs/tools/system/proot/default.nix
rename to pkgs/by-name/pr/proot/package.nix
diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/by-name/pr/properties-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/properties-cpp/default.nix
rename to pkgs/by-name/pr/properties-cpp/package.nix
diff --git a/pkgs/servers/xmpp/prosody-filer/default.nix b/pkgs/by-name/pr/prosody-filer/package.nix
similarity index 100%
rename from pkgs/servers/xmpp/prosody-filer/default.nix
rename to pkgs/by-name/pr/prosody-filer/package.nix
diff --git a/pkgs/development/web/protege-distribution/disable-console-log.patch b/pkgs/by-name/pr/protege-distribution/disable-console-log.patch
similarity index 100%
rename from pkgs/development/web/protege-distribution/disable-console-log.patch
rename to pkgs/by-name/pr/protege-distribution/disable-console-log.patch
diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/by-name/pr/protege-distribution/package.nix
similarity index 100%
rename from pkgs/development/web/protege-distribution/default.nix
rename to pkgs/by-name/pr/protege-distribution/package.nix
diff --git a/pkgs/development/web/protege-distribution/static-path.patch b/pkgs/by-name/pr/protege-distribution/static-path.patch
similarity index 100%
rename from pkgs/development/web/protege-distribution/static-path.patch
rename to pkgs/by-name/pr/protege-distribution/static-path.patch
diff --git a/pkgs/applications/audio/proteus/default.nix b/pkgs/by-name/pr/proteus/package.nix
similarity index 100%
rename from pkgs/applications/audio/proteus/default.nix
rename to pkgs/by-name/pr/proteus/package.nix
diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/by-name/pr/proto-contrib/package.nix
similarity index 100%
rename from pkgs/development/tools/proto-contrib/default.nix
rename to pkgs/by-name/pr/proto-contrib/package.nix
diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index 04618f14d5e9..859dddcf17d4 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "proto";
-  version = "0.41.3";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
     rev = "v${version}";
-    hash = "sha256-FkuHKfrMH+l/k9lfFhbG619KoDIxmEYwoaniHSPF8hQ=";
+    hash = "sha256-ZCuqxsCyaw5JmX9bpsSeTpSc07DnvPE9EiRQrHR5UNo=";
   };
 
-  cargoHash = "sha256-vll9ckegcECmzoOkTCe2q2M1r4s5JlUnv2DtzJEQ7bY=";
+  cargoHash = "sha256-ykl/WC3sfIwT1uhTrnRz2G8bzr1vkoGB03MwNP/Y5Xs=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.SystemConfiguration
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/by-name/pr/protobufc/package.nix
similarity index 100%
rename from pkgs/development/libraries/protobufc/default.nix
rename to pkgs/by-name/pr/protobufc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-connect-go/default.nix
rename to pkgs/by-name/pr/protoc-gen-connect-go/package.nix
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/by-name/pr/protoc-gen-doc/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-doc/default.nix
rename to pkgs/by-name/pr/protoc-gen-doc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-entgrpc/default.nix
rename to pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-go-grpc/default.nix
rename to pkgs/by-name/pr/protoc-gen-go-grpc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-go-vtproto/default.nix
rename to pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-go/default.nix
rename to pkgs/by-name/pr/protoc-gen-go/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/by-name/pr/protoc-gen-twirp/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp_php/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp_php/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix b/pkgs/by-name/pr/protoc-gen-twirp_swagger/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp_swagger/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp_swagger/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/by-name/pr/protoc-gen-twirp_typescript/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp_typescript/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp_typescript/package.nix
diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-validate/default.nix
rename to pkgs/by-name/pr/protoc-gen-validate/package.nix
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/by-name/pr/protocol/package.nix
similarity index 100%
rename from pkgs/applications/networking/protocol/default.nix
rename to pkgs/by-name/pr/protocol/package.nix
diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/by-name/pr/protolint/package.nix
similarity index 100%
rename from pkgs/development/tools/protolint/default.nix
rename to pkgs/by-name/pr/protolint/package.nix
diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/by-name/pr/protolock/package.nix
similarity index 100%
rename from pkgs/development/libraries/protolock/default.nix
rename to pkgs/by-name/pr/protolock/package.nix
diff --git a/pkgs/applications/emulators/proton-caller/default.nix b/pkgs/by-name/pr/proton-caller/package.nix
similarity index 100%
rename from pkgs/applications/emulators/proton-caller/default.nix
rename to pkgs/by-name/pr/proton-caller/package.nix
diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index fa152d3aeb8b..e144efcc8340 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton9-16";
+  version = "GE-Proton9-18";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-n/pU5bAr78Hawo8BMk7VW8uK0FjVsBJGMf78zRMGFPQ=";
+    hash = "sha256-NoRNM61Y9q8ksOXPeDV/NaIqHblWjXtK3tXcX5UEwkI=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index 5545ab8a94f2..82ab6501009e 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -5,6 +5,7 @@
   dpkg,
   makeWrapper,
   electron,
+  asar,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
@@ -21,21 +22,30 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     dpkg
     makeWrapper
+    asar
   ];
 
+  # Rebuild the ASAR archive with the assets embedded
+  preInstall = ''
+    asar extract usr/lib/proton-pass/resources/app.asar tmp
+    cp -r usr/lib/proton-pass/resources/assets/ tmp/
+    rm usr/lib/proton-pass/resources/app.asar
+    asar pack tmp/ usr/lib/proton-pass/resources/app.asar
+    rm -fr tmp
+  '';
+
   installPhase = ''
     runHook preInstall
-    mkdir -p $out
+    mkdir -p $out/share/proton-pass
     cp -r usr/share/ $out/
-    cp -r usr/lib/proton-pass/resources/app.asar $out/share/
+    cp -r usr/lib/proton-pass/resources/app.asar $out/share/proton-pass/
     runHook postInstall
   '';
 
   preFixup = ''
     makeWrapper ${lib.getExe electron} $out/bin/proton-pass \
-      --add-flags $out/share/app.asar \
+      --add-flags $out/share/proton-pass/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
-      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
       --set-default ELECTRON_IS_DEV 0 \
       --inherit-argv0
   '';
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix
similarity index 100%
rename from pkgs/applications/networking/protonmail-bridge/default.nix
rename to pkgs/by-name/pr/protonmail-bridge/package.nix
diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/by-name/pr/prototool/package.nix
similarity index 100%
rename from pkgs/development/tools/prototool/default.nix
rename to pkgs/by-name/pr/prototool/package.nix
diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/by-name/pr/prototypejs/package.nix
similarity index 100%
rename from pkgs/development/libraries/prototypejs/default.nix
rename to pkgs/by-name/pr/prototypejs/package.nix
diff --git a/pkgs/development/tools/misc/protox/default.nix b/pkgs/by-name/pr/protox/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/protox/default.nix
rename to pkgs/by-name/pr/protox/package.nix
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/by-name/pr/protozero/package.nix
similarity index 100%
rename from pkgs/development/libraries/protozero/default.nix
rename to pkgs/by-name/pr/protozero/package.nix
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/by-name/pr/prover9/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/prover9/default.nix
rename to pkgs/by-name/pr/prover9/package.nix
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/by-name/pr/proverif/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/proverif/default.nix
rename to pkgs/by-name/pr/proverif/package.nix
diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/by-name/pr/proxify/package.nix
similarity index 100%
rename from pkgs/tools/networking/proxify/default.nix
rename to pkgs/by-name/pr/proxify/package.nix
diff --git a/pkgs/tools/misc/proximity-sort/default.nix b/pkgs/by-name/pr/proximity-sort/package.nix
similarity index 100%
rename from pkgs/tools/misc/proximity-sort/default.nix
rename to pkgs/by-name/pr/proximity-sort/package.nix
diff --git a/pkgs/tools/admin/proxmove/default.nix b/pkgs/by-name/pr/proxmove/package.nix
similarity index 100%
rename from pkgs/tools/admin/proxmove/default.nix
rename to pkgs/by-name/pr/proxmove/package.nix
diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock
new file mode 100644
index 000000000000..ae850ced93c7
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock
@@ -0,0 +1,1667 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "base64"
+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 = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "cc"
+version = "1.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "4.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cursive"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839"
+dependencies = [
+ "ahash",
+ "cfg-if",
+ "crossbeam-channel",
+ "cursive_core",
+ "lazy_static",
+ "libc",
+ "log",
+ "signal-hook",
+ "termion",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "cursive_core"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d"
+dependencies = [
+ "ahash",
+ "crossbeam-channel",
+ "enum-map",
+ "enumset",
+ "lazy_static",
+ "log",
+ "num",
+ "owning_ref",
+ "time",
+ "unicode-segmentation",
+ "unicode-width",
+ "xi-unicode",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "enum-map"
+version = "2.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
+dependencies = [
+ "enum-map-derive",
+]
+
+[[package]]
+name = "enum-map-derive"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "enumset"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
+dependencies = [
+ "enumset_derive",
+]
+
+[[package]]
+name = "enumset_derive"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[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.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "flate2"
+version = "1.0.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[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 = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[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 = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "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",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "numtoa"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "openssl"
+version = "0.10.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "owning_ref"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proxmox-auto-install-assistant"
+version = "8.2.6"
+dependencies = [
+ "anyhow",
+ "clap",
+ "glob",
+ "log",
+ "proxmox-auto-installer",
+ "regex",
+ "serde",
+ "serde_json",
+ "toml",
+]
+
+[[package]]
+name = "proxmox-auto-installer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "glob",
+ "log",
+ "proxmox-installer-common",
+ "regex",
+ "serde",
+ "serde_json",
+ "serde_plain",
+ "toml",
+]
+
+[[package]]
+name = "proxmox-chroot"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "nix",
+ "proxmox-installer-common",
+ "regex",
+ "serde_json",
+]
+
+[[package]]
+name = "proxmox-fetch-answer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "log",
+ "native-tls",
+ "proxmox-auto-installer",
+ "rustls 0.20.9",
+ "rustls-native-certs 0.6.3",
+ "sha2",
+ "toml",
+ "ureq",
+]
+
+[[package]]
+name = "proxmox-installer-common"
+version = "0.1.0"
+dependencies = [
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "proxmox-tui-installer"
+version = "0.1.0"
+dependencies = [
+ "cursive",
+ "proxmox-installer-common",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_termios"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+dependencies = [
+ "log",
+ "ring 0.16.20",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "schannel"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_plain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termion"
+version = "1.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
+dependencies = [
+ "libc",
+ "numtoa",
+ "redox_syscall",
+ "redox_termios",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+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 = "toml"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+dependencies = [
+ "base64 0.22.1",
+ "flate2",
+ "log",
+ "native-tls",
+ "once_cell",
+ "rustls 0.23.14",
+ "rustls-native-certs 0.7.3",
+ "rustls-pki-types",
+ "url",
+ "webpki-roots",
+]
+
+[[package]]
+name = "url"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "web-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+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.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xi-unicode"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
new file mode 100644
index 000000000000..d161ab4ab0f3
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  fetchgit,
+  rustPlatform,
+  testers,
+  proxmox-auto-install-assistant,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "proxmox-auto-install-assistant";
+  version = "8.2.6";
+
+  src = fetchgit {
+    url = "git://git.proxmox.com/git/pve-installer.git";
+    rev = "c339618cbdcbce378bf192e01393a60903fe2b04";
+    hash = "sha256-nF2FpzXeoPIB+dW92HAI+EJZuMJxlnD012Yu3hL9OvU=";
+  };
+
+  postPatch = ''
+    rm -v .cargo/config.toml
+    cp -v ${./Cargo.lock} Cargo.lock
+    # fix up hard-coded version number to match that of the debian package
+    substituteInPlace proxmox-auto-install-assistant/Cargo.toml \
+      --replace-fail 'version = "0.1.0"' 'version = "${version}"'
+  '';
+
+  buildAndTestSubdir = "proxmox-auto-install-assistant";
+
+  cargoLock.lockFile = ./Cargo.lock;
+
+  passthru.tests.version = testers.testVersion { package = proxmox-auto-install-assistant; };
+
+  meta = {
+    description = "Tool to prepare a Proxmox installation ISO for automated installations";
+    longDescription = ''
+      This tool can be used to prepare a Proxmox installation ISO for automated installations.
+      Additional uses are to validate the format of an answer file or to test match filters and
+      print information on the properties to match against for the current hardware
+    '';
+    homepage = "https://pve.proxmox.com/wiki/Automated_Installation";
+    changelog = "https://git.proxmox.com/?p=pve-installer.git;a=blob;f=debian/changelog";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ christoph-heiss ];
+    platforms = lib.platforms.linux;
+    mainProgram = "proxmox-auto-install-assistant";
+  };
+}
diff --git a/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
similarity index 100%
rename from pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
rename to pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
diff --git a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
similarity index 100%
rename from pkgs/applications/backup/proxmox-backup-client/Cargo.lock
rename to pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
similarity index 100%
rename from pkgs/applications/backup/proxmox-backup-client/default.nix
rename to pkgs/by-name/pr/proxmox-backup-client/package.nix
diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/by-name/pr/proxychains-ng/package.nix
similarity index 100%
rename from pkgs/tools/networking/proxychains-ng/default.nix
rename to pkgs/by-name/pr/proxychains-ng/package.nix
diff --git a/pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch b/pkgs/by-name/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
similarity index 100%
rename from pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
rename to pkgs/by-name/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/by-name/pr/proxychains/package.nix
similarity index 100%
rename from pkgs/tools/networking/proxychains/default.nix
rename to pkgs/by-name/pr/proxychains/package.nix
diff --git a/pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch b/pkgs/by-name/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch
similarity index 100%
rename from pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch
rename to pkgs/by-name/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch
diff --git a/pkgs/servers/sql/proxysql/dont-phone-home.patch b/pkgs/by-name/pr/proxysql/dont-phone-home.patch
similarity index 100%
rename from pkgs/servers/sql/proxysql/dont-phone-home.patch
rename to pkgs/by-name/pr/proxysql/dont-phone-home.patch
diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch
similarity index 100%
rename from pkgs/servers/sql/proxysql/makefiles.patch
rename to pkgs/by-name/pr/proxysql/makefiles.patch
diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/by-name/pr/proxysql/package.nix
similarity index 100%
rename from pkgs/servers/sql/proxysql/default.nix
rename to pkgs/by-name/pr/proxysql/package.nix
diff --git a/pkgs/tools/wayland/proycon-wayout/default.nix b/pkgs/by-name/pr/proycon-wayout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/proycon-wayout/default.nix
rename to pkgs/by-name/pr/proycon-wayout/package.nix
diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix
new file mode 100644
index 000000000000..06fcb68038c7
--- /dev/null
+++ b/pkgs/by-name/pr/prqlc/package.nix
@@ -0,0 +1,59 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, sqlite
+, zlib
+, stdenv
+, darwin
+, python3
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "prqlc";
+  version = "0.13.2";
+
+  src = fetchFromGitHub {
+    owner = "prql";
+    repo = "prql";
+    rev = version;
+    hash = "sha256-DuuWeXuqOKpC4NbaQ6xhYxzZLtxOMzqDl7eOd9zTIuY=";
+  };
+
+  cargoHash = "sha256-ZOlbKmSHAcgYMYbeyyljltf56WbP5dK7ezpmgSA3CyQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs =
+    [
+      openssl
+      sqlite
+      zlib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.CoreFoundation
+      darwin.apple_sdk.frameworks.CoreServices
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  env = {
+    PYO3_PYTHON = "${python3}/bin/python3";
+  };
+
+  # we are only interested in the prqlc binary
+  postInstall = ''
+    rm -r $out/bin/compile-files $out/bin/mdbook-prql $out/lib
+  '';
+
+  meta = with lib; {
+    description = "CLI for the PRQL compiler - a simple, powerful, pipelined SQL replacement";
+    homepage = "https://github.com/prql/prql";
+    changelog = "https://github.com/prql/prql/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dit7ya ];
+  };
+}
diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/by-name/pr/prs/package.nix
similarity index 100%
rename from pkgs/tools/security/prs/default.nix
rename to pkgs/by-name/pr/prs/package.nix
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/by-name/ps/ps2client/package.nix
similarity index 100%
rename from pkgs/applications/networking/ps2client/default.nix
rename to pkgs/by-name/ps/ps2client/package.nix
diff --git a/pkgs/tools/typesetting/ps2eps/hardcode-deps.patch b/pkgs/by-name/ps/ps2eps/hardcode-deps.patch
similarity index 100%
rename from pkgs/tools/typesetting/ps2eps/hardcode-deps.patch
rename to pkgs/by-name/ps/ps2eps/hardcode-deps.patch
diff --git a/pkgs/tools/typesetting/ps2eps/default.nix b/pkgs/by-name/ps/ps2eps/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/ps2eps/default.nix
rename to pkgs/by-name/ps/ps2eps/package.nix
diff --git a/pkgs/tools/games/ps3-disc-dumper/deps.nix b/pkgs/by-name/ps/ps3-disc-dumper/deps.nix
similarity index 100%
rename from pkgs/tools/games/ps3-disc-dumper/deps.nix
rename to pkgs/by-name/ps/ps3-disc-dumper/deps.nix
diff --git a/pkgs/tools/games/ps3-disc-dumper/default.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
similarity index 100%
rename from pkgs/tools/games/ps3-disc-dumper/default.nix
rename to pkgs/by-name/ps/ps3-disc-dumper/package.nix
diff --git a/pkgs/tools/games/ps3iso-utils/default.nix b/pkgs/by-name/ps/ps3iso-utils/package.nix
similarity index 100%
rename from pkgs/tools/games/ps3iso-utils/default.nix
rename to pkgs/by-name/ps/ps3iso-utils/package.nix
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/by-name/ps/ps3netsrv/package.nix
similarity index 100%
rename from pkgs/servers/ps3netsrv/default.nix
rename to pkgs/by-name/ps/ps3netsrv/package.nix
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/by-name/ps/psc-package/package.nix
similarity index 100%
rename from pkgs/development/compilers/purescript/psc-package/default.nix
rename to pkgs/by-name/ps/psc-package/package.nix
diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
new file mode 100644
index 000000000000..a73f5f316157
--- /dev/null
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -0,0 +1,52 @@
+{ buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, lib
+, pscale
+, testers
+}:
+
+buildGoModule rec {
+  pname = "pscale";
+  version = "0.213.0";
+
+  src = fetchFromGitHub {
+    owner = "planetscale";
+    repo = "cli";
+    rev = "v${version}";
+    sha256 = "sha256-WgivwlsT8QytB6oaB8lQASq+YQa8lbe/6PwpJUFZifU=";
+  };
+
+  vendorHash = "sha256-R0ZabOquZQLONbW6p5xtYKLi8P3Q5JieM4EATT1a83U=";
+
+  ldflags = [
+    "-s" "-w"
+    "-X main.version=v${version}"
+    "-X main.commit=v${version}"
+    "-X main.date=unknown"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd pscale \
+      --bash <($out/bin/pscale completion bash) \
+      --fish <($out/bin/pscale completion fish) \
+      --zsh <($out/bin/pscale completion zsh)
+  '';
+
+  __darwinAllowLocalNetworking = true;
+
+  passthru.tests.version = testers.testVersion {
+    package = pscale;
+  };
+
+  meta = with lib; {
+    description = "CLI for PlanetScale Database";
+    mainProgram = "pscale";
+    changelog = "https://github.com/planetscale/cli/releases/tag/v${version}";
+    homepage = "https://www.planetscale.com/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pimeys kashw2 ];
+  };
+}
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/by-name/ps/pscircle/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pscircle/default.nix
rename to pkgs/by-name/ps/pscircle/package.nix
diff --git a/pkgs/os-specific/linux/psftools/default.nix b/pkgs/by-name/ps/psftools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/psftools/default.nix
rename to pkgs/by-name/ps/psftools/package.nix
diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/by-name/ps/psi-notify/package.nix
similarity index 100%
rename from pkgs/applications/misc/psi-notify/default.nix
rename to pkgs/by-name/ps/psi-notify/package.nix
diff --git a/pkgs/applications/system/psitop/default.nix b/pkgs/by-name/ps/psitop/package.nix
similarity index 100%
rename from pkgs/applications/system/psitop/default.nix
rename to pkgs/by-name/ps/psitop/package.nix
diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/by-name/ps/psitransfer/package.nix
similarity index 100%
rename from pkgs/servers/psitransfer/default.nix
rename to pkgs/by-name/ps/psitransfer/package.nix
diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/by-name/ps/pslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/pslib/default.nix
rename to pkgs/by-name/ps/pslib/package.nix
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/by-name/ps/psmisc/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/psmisc/default.nix
rename to pkgs/by-name/ps/psmisc/package.nix
diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/by-name/ps/psol/package.nix
similarity index 100%
rename from pkgs/development/libraries/psol/default.nix
rename to pkgs/by-name/ps/psol/package.nix
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/by-name/ps/pspg/package.nix
similarity index 100%
rename from pkgs/tools/misc/pspg/default.nix
rename to pkgs/by-name/ps/pspg/package.nix
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/by-name/ps/pspp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pspp/default.nix
rename to pkgs/by-name/ps/pspp/package.nix
diff --git a/pkgs/tools/misc/psql2csv/default.nix b/pkgs/by-name/ps/psql2csv/package.nix
similarity index 100%
rename from pkgs/tools/misc/psql2csv/default.nix
rename to pkgs/by-name/ps/psql2csv/package.nix
diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/by-name/ps/psqlodbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/psqlodbc/default.nix
rename to pkgs/by-name/ps/psqlodbc/package.nix
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/by-name/ps/pssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/pssh/default.nix
rename to pkgs/by-name/ps/pssh/package.nix
diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/by-name/ps/psstop/package.nix
similarity index 100%
rename from pkgs/tools/system/psstop/default.nix
rename to pkgs/by-name/ps/psstop/package.nix
diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix
new file mode 100644
index 000000000000..69b69d1c4c8b
--- /dev/null
+++ b/pkgs/by-name/ps/pstoedit/package.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkg-config, darwin, lib
+, zlib, ghostscript, imagemagick, plotutils, gd
+, libjpeg, libwebp, libiconv, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pstoedit";
+  version = "4.01";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz";
+    hash = "sha256-RZdlq3NssQ+VVKesAsXqfzVcbC6fz9IXYRx9UQKxB2s=";
+  };
+
+  outputs = [ "out" "dev" ];
+  nativeBuildInputs = [ makeWrapper pkg-config ];
+  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+    libiconv ApplicationServices
+  ]);
+
+  # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out)
+  # so we need to remove it from the pkg-config file as well
+  preConfigure = ''
+    substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' ""
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/pstoedit \
+      --prefix PATH : ${lib.makeBinPath [ ghostscript ]}
+  '';
+
+  meta = with lib; {
+    description = "Translates PostScript and PDF graphics into other vector formats";
+    homepage = "https://sourceforge.net/projects/pstoedit/";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.unix;
+    mainProgram = "pstoedit";
+  };
+}
diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/by-name/ps/pstreams/package.nix
similarity index 100%
rename from pkgs/development/libraries/pstreams/default.nix
rename to pkgs/by-name/ps/pstreams/package.nix
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/by-name/ps/pstree/package.nix
similarity index 100%
rename from pkgs/applications/misc/pstree/default.nix
rename to pkgs/by-name/ps/pstree/package.nix
diff --git a/pkgs/tools/security/psudohash/default.nix b/pkgs/by-name/ps/psudohash/package.nix
similarity index 100%
rename from pkgs/tools/security/psudohash/default.nix
rename to pkgs/by-name/ps/psudohash/package.nix
diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/by-name/ps/psutils/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/psutils/default.nix
rename to pkgs/by-name/ps/psutils/package.nix
diff --git a/pkgs/tools/misc/psw/default.nix b/pkgs/by-name/ps/psw/package.nix
similarity index 100%
rename from pkgs/tools/misc/psw/default.nix
rename to pkgs/by-name/ps/psw/package.nix
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/by-name/pt/pt2-clone/package.nix
similarity index 100%
rename from pkgs/applications/audio/pt2-clone/default.nix
rename to pkgs/by-name/pt/pt2-clone/package.nix
diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/by-name/pt/ptags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ptags/default.nix
rename to pkgs/by-name/pt/ptags/package.nix
diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/by-name/pt/ptask/json_c_is_error.patch
similarity index 100%
rename from pkgs/applications/misc/ptask/json_c_is_error.patch
rename to pkgs/by-name/pt/ptask/json_c_is_error.patch
diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/by-name/pt/ptask/package.nix
similarity index 100%
rename from pkgs/applications/misc/ptask/default.nix
rename to pkgs/by-name/pt/ptask/package.nix
diff --git a/pkgs/applications/misc/ptask/tw-version.patch b/pkgs/by-name/pt/ptask/tw-version.patch
similarity index 100%
rename from pkgs/applications/misc/ptask/tw-version.patch
rename to pkgs/by-name/pt/ptask/tw-version.patch
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/by-name/pt/ptex/package.nix
similarity index 100%
rename from pkgs/development/libraries/ptex/default.nix
rename to pkgs/by-name/pt/ptex/package.nix
diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/by-name/pt/ptouch-print/package.nix
similarity index 100%
rename from pkgs/misc/ptouch-print/default.nix
rename to pkgs/by-name/pt/ptouch-print/package.nix
diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix
index 1fe983d258d6..9b3fbaf6e091 100644
--- a/pkgs/by-name/pt/ptyxis/package.nix
+++ b/pkgs/by-name/pt/ptyxis/package.nix
@@ -16,24 +16,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ptyxis";
-  version = "46.6";
+  version = "47.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "chergert";
     repo = "ptyxis";
     rev = finalAttrs.version;
-    hash = "sha256-exsb5+5jxUKRHDaaBG3rJcJoqLGa6n/dsMlDtwUGfJo=";
+    hash = "sha256-8b+leFzVEj75xAnGwmVoCr6+mTO3e+DOPUNe0A5KGYY=";
   };
 
-  # FIXME: drop patched vte-gtk4 in 47.x release
-  vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: {
-    patches = (prev.patches or [ ]) ++ [
-      "${finalAttrs.src}/build-aux/0001-a11y-implement-GtkAccessibleText.patch"
-      "${finalAttrs.src}/build-aux/0001-add-notification-and-shell-precmd-preexec.patch"
-    ];
-  });
-
   nativeBuildInputs = [
     meson
     ninja
@@ -45,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libadwaita
     json-glib
-    finalAttrs.vte-gtk4-patched
+    vte-gtk4
     libportal-gtk4
     pcre2
   ];
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/by-name/pu/public-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/public-sans/default.nix
rename to pkgs/by-name/pu/public-sans/package.nix
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
similarity index 100%
rename from pkgs/data/misc/publicsuffix-list/default.nix
rename to pkgs/by-name/pu/publicsuffix-list/package.nix
diff --git a/pkgs/development/web/publii/default.nix b/pkgs/by-name/pu/publii/package.nix
similarity index 100%
rename from pkgs/development/web/publii/default.nix
rename to pkgs/by-name/pu/publii/package.nix
diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/by-name/pu/pubs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pubs/default.nix
rename to pkgs/by-name/pu/pubs/package.nix
diff --git a/pkgs/servers/pufferpanel/deps.patch b/pkgs/by-name/pu/pufferpanel/deps.patch
similarity index 100%
rename from pkgs/servers/pufferpanel/deps.patch
rename to pkgs/by-name/pu/pufferpanel/deps.patch
diff --git a/pkgs/servers/pufferpanel/disable-group-checks.patch b/pkgs/by-name/pu/pufferpanel/disable-group-checks.patch
similarity index 100%
rename from pkgs/servers/pufferpanel/disable-group-checks.patch
rename to pkgs/by-name/pu/pufferpanel/disable-group-checks.patch
diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/by-name/pu/pufferpanel/package.nix
similarity index 100%
rename from pkgs/servers/pufferpanel/default.nix
rename to pkgs/by-name/pu/pufferpanel/package.nix
diff --git a/pkgs/servers/pufferpanel/skip-network-tests.patch b/pkgs/by-name/pu/pufferpanel/skip-network-tests.patch
similarity index 100%
rename from pkgs/servers/pufferpanel/skip-network-tests.patch
rename to pkgs/by-name/pu/pufferpanel/skip-network-tests.patch
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/by-name/pu/pugixml/package.nix
similarity index 100%
rename from pkgs/development/libraries/pugixml/default.nix
rename to pkgs/by-name/pu/pugixml/package.nix
diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pulldown-cmark/default.nix
rename to pkgs/by-name/pu/pulldown-cmark/package.nix
diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index 8e5f9d295fb7..b50947419c23 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -70,7 +70,7 @@ let
     libxkbcommon
     xorg.libxkbfile
     pango
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
     systemd
   ];
 
diff --git a/pkgs/tools/admin/pulsarctl/default.nix b/pkgs/by-name/pu/pulsarctl/package.nix
similarity index 100%
rename from pkgs/tools/admin/pulsarctl/default.nix
rename to pkgs/by-name/pu/pulsarctl/package.nix
diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/by-name/pu/pulseaudio-ctl/package.nix
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-ctl/default.nix
rename to pkgs/by-name/pu/pulseaudio-ctl/package.nix
diff --git a/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch b/pkgs/by-name/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
rename to pkgs/by-name/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/by-name/pu/pulseaudio-dlna/package.nix
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-dlna/default.nix
rename to pkgs/by-name/pu/pulseaudio-dlna/package.nix
diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
rename to pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
diff --git a/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix
rename to pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/by-name/pu/pulseeffects-legacy/package.nix
similarity index 100%
rename from pkgs/applications/audio/pulseeffects-legacy/default.nix
rename to pkgs/by-name/pu/pulseeffects-legacy/package.nix
diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/by-name/pu/pulsemixer/package.nix
similarity index 100%
rename from pkgs/tools/audio/pulsemixer/default.nix
rename to pkgs/by-name/pu/pulsemixer/package.nix
diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix
new file mode 100644
index 000000000000..f46f3c25775e
--- /dev/null
+++ b/pkgs/by-name/pu/pulumi/package.nix
@@ -0,0 +1,150 @@
+{ stdenv
+, lib
+, buildGoModule
+, coreutils
+, fetchFromGitHub
+, fetchpatch
+, installShellFiles
+, git
+  # passthru
+, runCommand
+, makeWrapper
+, pulumi
+, pulumiPackages
+}:
+
+buildGoModule rec {
+  pname = "pulumi";
+  version = "3.122.0";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-5KHptoQliqPtJ6J5u23ZgRZOdO77BJhZbdc3Cty9Myk=";
+    # Some tests rely on checkout directory name
+    name = "pulumi";
+  };
+
+  vendorHash = "sha256-1UyYbmNNHlAeaW6M6AkaQ5Hs25ziHenSs4QjlnUQGjs=";
+
+  patches = [
+    # Fix a test failure, can be dropped in next release (3.100.0)
+    (fetchpatch {
+      url = "https://github.com/pulumi/pulumi/commit/6dba7192d134d3b6f7e26dee9205711ccc736fa7.patch";
+      hash = "sha256-QRN6XnIR2rrqJ4UFYNt/YmIlokTSkGUvnBO/Q9UN8X8=";
+      stripLen = 1;
+    })
+  ];
+
+  sourceRoot = "${src.name}/pkg";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  # Bundle release metadata
+  ldflags = [
+    # Omit the symbol table and debug information.
+    "-s"
+    # Omit the DWARF symbol table.
+    "-w"
+  ] ++ importpathFlags;
+
+  importpathFlags = [
+    "-X github.com/pulumi/pulumi/pkg/v3/version.Version=v${version}"
+  ];
+
+  nativeCheckInputs = [
+    git
+  ];
+
+  preCheck = ''
+    # The tests require `version.Version` to be unset
+    ldflags=''${ldflags//"$importpathFlags"/}
+
+    # Create some placeholders for plugins used in tests. Otherwise, Pulumi
+    # tries to donwload them and fails, resulting in really long test runs
+    dummyPluginPath=$(mktemp -d)
+    for name in pulumi-{resource-pkg{A,B},-pkgB}; do
+      ln -s ${coreutils}/bin/true "$dummyPluginPath/$name"
+    done
+
+    export PATH=$dummyPluginPath''${PATH:+:}$PATH
+
+    # Code generation tests also download dependencies from network
+    rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go
+    rm -R codegen/{dotnet,go,nodejs,python}/gen_program_test
+
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export PULUMI_HOME=$(mktemp -d)
+  '';
+
+  checkFlags =
+    let
+      disabledTests = [
+        # Flaky test
+        "TestPendingDeleteOrder"
+        # Tries to clone repo: github.com/pulumi/templates.git
+        "TestGenerateOnlyProjectCheck"
+        # Following tests give this error, not quite sure why:
+        #     Error Trace:    /build/pulumi/pkg/engine/lifecycletest/update_plan_test.go:273
+        # Error:          Received unexpected error:
+        #                 Unexpected diag message: <{%reset%}>using pulumi-resource-pkgA from $PATH at /build/tmp.bS8caxmTx7/pulumi-resource-pkgA<{%reset%}>
+        # Test:           TestUnplannedDelete
+        "TestExpectedDelete"
+        "TestPlannedInputOutputDifferences"
+        "TestPlannedUpdateChangedStack"
+        "TestExpectedCreate"
+        "TestUnplannedDelete"
+        # Following test gives this  error, not sure why:
+        # --- Expected
+        # +++ Actual
+        # @@ -1 +1 @@
+        # -gcp
+        # +aws
+        "TestPluginMapper_MappedNamesDifferFromPulumiName"
+        "TestProtect"
+      ];
+    in
+    [ "-skip=^${lib.concatStringsSep "$|^" disabledTests}$" ];
+
+  # Allow tests that bind or connect to localhost on macOS.
+  __darwinAllowLocalNetworking = true;
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    PULUMI_SKIP_UPDATE_CHECK=1 $out/bin/pulumi version | grep v${version} > /dev/null
+  '';
+
+  postInstall = ''
+    installShellCompletion --cmd pulumi \
+      --bash <($out/bin/pulumi gen-completion bash) \
+      --fish <($out/bin/pulumi gen-completion fish) \
+      --zsh  <($out/bin/pulumi gen-completion zsh)
+  '';
+
+  passthru = {
+    pkgs = pulumiPackages;
+    withPackages = f: runCommand "${pulumi.name}-with-packages"
+      {
+        nativeBuildInputs = [ makeWrapper ];
+      }
+      ''
+        mkdir -p $out/bin
+        makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \
+          --suffix PATH : ${lib.makeBinPath (f pulumiPackages)} \
+          --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib"
+      '';
+  };
+
+  meta = with lib; {
+    homepage = "https://pulumi.io/";
+    description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
+    sourceProvenance = [ sourceTypes.fromSource ];
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [
+      trundle
+      veehaitch
+    ];
+  };
+}
diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/by-name/pu/pulumictl/package.nix
similarity index 100%
rename from pkgs/development/tools/pulumictl/default.nix
rename to pkgs/by-name/pu/pulumictl/package.nix
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/by-name/pu/pup/package.nix
similarity index 100%
rename from pkgs/development/tools/pup/default.nix
rename to pkgs/by-name/pu/pup/package.nix
diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix
index 2c3121a39ba1..b537d4c1b834 100644
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@@ -20,7 +20,7 @@ buildDotnetModule rec {
   };
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
     openssl
   ];
diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/by-name/pu/puppeteer-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/puppeteer-cli/default.nix
rename to pkgs/by-name/pu/puppeteer-cli/package.nix
diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/by-name/pu/pur/package.nix
similarity index 100%
rename from pkgs/development/tools/pur/default.nix
rename to pkgs/by-name/pu/pur/package.nix
diff --git a/pkgs/by-name/pu/pure-ftpd/package.nix b/pkgs/by-name/pu/pure-ftpd/package.nix
new file mode 100644
index 000000000000..22a7d65fc1c3
--- /dev/null
+++ b/pkgs/by-name/pu/pure-ftpd/package.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchurl, openssl, pam, libxcrypt }:
+
+stdenv.mkDerivation rec {
+  pname = "pure-ftpd";
+  version = "1.0.52";
+
+  src = fetchurl {
+    url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
+    sha256 = "sha256-ESbzqVhW0IiJ/4lwPLGqnsmSTZOdFU6WkEySDwXcPHQ=";
+  };
+
+  buildInputs = [ openssl pam libxcrypt ];
+
+  configureFlags = [ "--with-tls" ];
+
+  meta = with lib; {
+    description = "Free, secure, production-quality and standard-conformant FTP server";
+    homepage = "https://www.pureftpd.org";
+    license = licenses.isc; # with some parts covered by BSD3(?)
+    maintainers = [ ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/by-name/pu/pure-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/pure-prompt/default.nix
rename to pkgs/by-name/pu/pure-prompt/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/by-name/pu/puremapping/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/puremapping/default.nix
rename to pkgs/by-name/pu/puremapping/package.nix
diff --git a/pkgs/by-name/pu/pureref/package.nix b/pkgs/by-name/pu/pureref/package.nix
new file mode 100644
index 000000000000..d9ff3269f162
--- /dev/null
+++ b/pkgs/by-name/pu/pureref/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  appimageTools,
+  runCommand,
+  curl,
+  gnugrep,
+  cacert,
+}:
+
+appimageTools.wrapType1 rec {
+  pname = "pureref";
+  version = "2.0.3";
+
+  src =
+    runCommand "PureRef-${version}_x64.Appimage"
+      {
+        nativeBuildInputs = [
+          curl
+          gnugrep
+          cacert
+        ];
+        outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
+      }
+      ''
+        key="$(curl -A 'nixpkgs/Please contact maintainer if there is an issue' "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
+        curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
+      '';
+
+  meta = with lib; {
+    description = "Reference Image Viewer";
+    homepage = "https://www.pureref.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [
+      elnudev
+      husjon
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
diff --git a/pkgs/games/purpur/default.nix b/pkgs/by-name/pu/purpur/package.nix
similarity index 100%
rename from pkgs/games/purpur/default.nix
rename to pkgs/by-name/pu/purpur/package.nix
diff --git a/pkgs/applications/misc/pw-viz/Cargo.lock b/pkgs/by-name/pw/pw-viz/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/pw-viz/Cargo.lock
rename to pkgs/by-name/pw/pw-viz/Cargo.lock
diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/by-name/pw/pw-viz/package.nix
similarity index 100%
rename from pkgs/applications/misc/pw-viz/default.nix
rename to pkgs/by-name/pw/pw-viz/package.nix
diff --git a/pkgs/tools/audio/pw-volume/default.nix b/pkgs/by-name/pw/pw-volume/package.nix
similarity index 100%
rename from pkgs/tools/audio/pw-volume/default.nix
rename to pkgs/by-name/pw/pw-volume/package.nix
diff --git a/pkgs/tools/security/pwdsafety/default.nix b/pkgs/by-name/pw/pwdsafety/package.nix
similarity index 100%
rename from pkgs/tools/security/pwdsafety/default.nix
rename to pkgs/by-name/pw/pwdsafety/package.nix
diff --git a/pkgs/tools/security/pwgen-secure/default.nix b/pkgs/by-name/pw/pwgen-secure/package.nix
similarity index 100%
rename from pkgs/tools/security/pwgen-secure/default.nix
rename to pkgs/by-name/pw/pwgen-secure/package.nix
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/by-name/pw/pwgen/package.nix
similarity index 100%
rename from pkgs/tools/security/pwgen/default.nix
rename to pkgs/by-name/pw/pwgen/package.nix
diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/by-name/pw/pwnat/package.nix
similarity index 100%
rename from pkgs/tools/networking/pwnat/default.nix
rename to pkgs/by-name/pw/pwnat/package.nix
diff --git a/pkgs/by-name/pw/pwru/package.nix b/pkgs/by-name/pw/pwru/package.nix
index 1b83c51649a4..33012d43aa26 100644
--- a/pkgs/by-name/pw/pwru/package.nix
+++ b/pkgs/by-name/pw/pwru/package.nix
@@ -1,19 +1,19 @@
 { lib
-, buildGo123Module
+, buildGoModule
 , fetchFromGitHub
 , clang
 , libpcap
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "pwru";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "pwru";
     rev = "v${version}";
-    hash = "sha256-HK8t+IaeFLuyqUTuVSShbO426uaFyZcr+jZyz0wo4jw=";
+    hash = "sha256-3lIKbzwPX6okJT9CeErX5/innUK3VqnnbWPpvlSN+6U=";
   };
 
   vendorHash = null;
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/by-name/pw/pwsafe/package.nix
similarity index 100%
rename from pkgs/applications/misc/pwsafe/default.nix
rename to pkgs/by-name/pw/pwsafe/package.nix
diff --git a/pkgs/by-name/pw/pwvucontrol/Cargo.lock b/pkgs/by-name/pw/pwvucontrol/Cargo.lock
new file mode 100644
index 000000000000..9047b639e3ce
--- /dev/null
+++ b/pkgs/by-name/pw/pwvucontrol/Cargo.lock
@@ -0,0 +1,1302 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "annotate-snippets"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+dependencies = [
+ "unicode-width",
+ "yansi-term",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bindgen"
+version = "0.69.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+dependencies = [
+ "annotate-snippets",
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitmaps"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "cairo-rs"
+version = "0.19.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
+dependencies = [
+ "bitflags",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+ "thiserror",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2755ff20a1d93490d26ba33a6f092a38a508398a5320df5d4b3014fcccce9410"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cookie-factory"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699"
+dependencies = [
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk4"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
+dependencies = [
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk4-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk4-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gettext-rs"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
+dependencies = [
+ "gettext-sys",
+ "locale_config",
+]
+
+[[package]]
+name = "gettext-sys"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
+dependencies = [
+ "cc",
+ "temp-dir",
+]
+
+[[package]]
+name = "gio"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys",
+ "glib",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+ "windows-sys",
+]
+
+[[package]]
+name = "glib"
+version = "0.19.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44"
+dependencies = [
+ "bitflags",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "log",
+ "memchr",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.19.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7"
+dependencies = [
+ "heck",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5"
+dependencies = [
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "gobject-sys"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf"
+dependencies = [
+ "glib",
+ "graphene-sys",
+ "libc",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gsk4"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
+dependencies = [
+ "cairo-rs",
+ "gdk4",
+ "glib",
+ "graphene-rs",
+ "gsk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gsk4-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk4-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk4"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
+dependencies = [
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gtk4-macros"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "gtk4-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "imbl"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb"
+dependencies = [
+ "bitmaps",
+ "imbl-sized-chunks",
+ "rand_core",
+ "rand_xoshiro",
+ "version_check",
+]
+
+[[package]]
+name = "imbl-sized-chunks"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
+dependencies = [
+ "bitmaps",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libadwaita"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9"
+dependencies = [
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "gtk4",
+ "libadwaita-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "libadwaita-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8"
+dependencies = [
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libspa"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
+dependencies = [
+ "bitflags",
+ "cc",
+ "convert_case",
+ "cookie-factory",
+ "libc",
+ "libspa-sys",
+ "nix",
+ "nom",
+ "system-deps",
+]
+
+[[package]]
+name = "libspa-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
+dependencies = [
+ "bindgen",
+ "cc",
+ "system-deps",
+]
+
+[[package]]
+name = "locale_config"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
+dependencies = [
+ "lazy_static",
+ "objc",
+ "objc-foundation",
+ "regex",
+ "winapi",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "pango"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd"
+dependencies = [
+ "gio",
+ "glib",
+ "libc",
+ "pango-sys",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pipewire"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "libc",
+ "libspa",
+ "libspa-sys",
+ "nix",
+ "once_cell",
+ "pipewire-sys",
+ "thiserror",
+]
+
+[[package]]
+name = "pipewire-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
+dependencies = [
+ "bindgen",
+ "libspa-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pwvucontrol"
+version = "0.4.7"
+dependencies = [
+ "anyhow",
+ "futures",
+ "gettext-rs",
+ "glib",
+ "gtk4",
+ "imbl",
+ "libadwaita",
+ "log",
+ "pipewire",
+ "wireplumber",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "rand_xoshiro"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core",
+]
+
+[[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",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[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.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+
+[[package]]
+name = "temp-dir"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.13",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wireplumber"
+version = "0.1.0"
+source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda"
+dependencies = [
+ "bitflags",
+ "gio",
+ "glib",
+ "libc",
+ "libspa-sys",
+ "pipewire-sys",
+ "pkg-config",
+ "semver",
+ "wireplumber-sys",
+]
+
+[[package]]
+name = "wireplumber-sys"
+version = "0.1.0"
+source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "libspa-sys",
+ "pipewire-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "yansi-term"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
+dependencies = [
+ "winapi",
+]
diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
new file mode 100644
index 000000000000..203315886168
--- /dev/null
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -0,0 +1,88 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchFromGitLab
+, cargo
+, desktop-file-utils
+, meson
+, ninja
+, pkg-config
+, rustPlatform
+, rustc
+, wrapGAppsHook4
+, cairo
+, gdk-pixbuf
+, glib
+, gtk4
+, libadwaita
+, pango
+, pipewire
+, wireplumber
+}:
+
+let
+  wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
+    version = "0.4.17";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "pipewire";
+      repo = "wireplumber";
+      rev = version;
+      hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
+    };
+  });
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pwvucontrol";
+  version = "0.4.7";
+
+  src = fetchFromGitHub {
+    owner = "saivert";
+    repo = "pwvucontrol";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-v8xANTbaIPIAPoukP8rcVzM6NHNpS2Ej/nfdmg3Vgvg=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "wireplumber-0.1.0" = "sha256-ocagwmjyhfx6n/9xKxF2vhylqy2HunKQRx3eMo6m/l4=";
+    };
+  };
+
+  nativeBuildInputs = [
+    cargo
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    glib
+    gtk4
+    libadwaita
+    pango
+    pipewire
+    wireplumber_0_4
+  ];
+
+  meta = {
+    description = "Pipewire Volume Control";
+    homepage = "https://github.com/saivert/pwvucontrol";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      figsoda
+      Guanran928
+      johnrtitor
+    ];
+    mainProgram = "pwvucontrol";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/by-name/px/pxattr/package.nix
similarity index 100%
rename from pkgs/tools/archivers/pxattr/default.nix
rename to pkgs/by-name/px/pxattr/package.nix
diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/by-name/px/pxlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/pxlib/default.nix
rename to pkgs/by-name/px/pxlib/package.nix
diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/by-name/px/pxview/package.nix
similarity index 100%
rename from pkgs/development/tools/pxview/default.nix
rename to pkgs/by-name/px/pxview/package.nix
diff --git a/pkgs/tools/compression/pxz/flush-stdout-help-version.patch b/pkgs/by-name/px/pxz/flush-stdout-help-version.patch
similarity index 100%
rename from pkgs/tools/compression/pxz/flush-stdout-help-version.patch
rename to pkgs/by-name/px/pxz/flush-stdout-help-version.patch
diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/by-name/px/pxz/package.nix
similarity index 100%
rename from pkgs/tools/compression/pxz/default.nix
rename to pkgs/by-name/px/pxz/package.nix
diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/by-name/py/py3c/package.nix
similarity index 100%
rename from pkgs/development/libraries/py3c/default.nix
rename to pkgs/by-name/py/py3c/package.nix
diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/by-name/py/pyCA/package.nix
similarity index 100%
rename from pkgs/applications/video/pyca/default.nix
rename to pkgs/by-name/py/pyCA/package.nix
diff --git a/pkgs/by-name/py/pyamlboot/package.nix b/pkgs/by-name/py/pyamlboot/package.nix
new file mode 100644
index 000000000000..6606fee6d187
--- /dev/null
+++ b/pkgs/by-name/py/pyamlboot/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  testers,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "pyamlboot";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "superna9999";
+    repo = "pyamlboot";
+    rev = "refs/tags/${version}";
+    hash = "sha256-vpWq8+0ZoTkfVyx+2BbXdULFwo/Ug4U1gWArXDfnzyk=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    pyusb
+    wheel
+    setuptools
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = "pyamlboot";
+    command = "boot.py -v";
+    version = "boot.py ${version}";
+  };
+
+  meta = {
+    description = "Amlogic USB Boot Protocol Library";
+    homepage = "https://github.com/superna9999/pyamlboot";
+    license = with lib.licenses; [
+      asl20
+      gpl2Only
+      mit
+    ];
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "boot.py";
+  };
+}
diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/by-name/py/pydf/package.nix
similarity index 100%
rename from pkgs/applications/misc/pydf/default.nix
rename to pkgs/by-name/py/pydf/package.nix
diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/by-name/py/pyenv/package.nix
similarity index 100%
rename from pkgs/development/tools/pyenv/default.nix
rename to pkgs/by-name/py/pyenv/package.nix
diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index f056ee9e99a0..bf9785d49468 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
 }:
 let
-  version = "2.60.1";
+  version = "2.60.2";
 in
 appimageTools.wrapType2 {
   inherit version;
@@ -13,7 +13,7 @@ appimageTools.wrapType2 {
   src = fetchurl {
     name = "pyfa-appimage-${version}";
     url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage";
-    hash = "sha256-+nyIG6pweIgC6ZiWJaO4E2Fp0/zP+DhQrUWzHnIBQXk=";
+    hash = "sha256-6doetQ6E1Occ/SqewfxRqPEX1MnUuFomm+8VmetIz4Y=";
   };
 
   meta = {
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/by-name/py/pykms/package.nix
similarity index 100%
rename from pkgs/tools/networking/pykms/default.nix
rename to pkgs/by-name/py/pykms/package.nix
diff --git a/pkgs/development/tools/pylint-exit/default.nix b/pkgs/by-name/py/pylint-exit/package.nix
similarity index 100%
rename from pkgs/development/tools/pylint-exit/default.nix
rename to pkgs/by-name/py/pylint-exit/package.nix
diff --git a/pkgs/applications/networking/pyload-ng/declarative-default-user.patch b/pkgs/by-name/py/pyload-ng/declarative-default-user.patch
similarity index 100%
rename from pkgs/applications/networking/pyload-ng/declarative-default-user.patch
rename to pkgs/by-name/py/pyload-ng/declarative-default-user.patch
diff --git a/pkgs/applications/networking/pyload-ng/declarative-env-config.patch b/pkgs/by-name/py/pyload-ng/declarative-env-config.patch
similarity index 100%
rename from pkgs/applications/networking/pyload-ng/declarative-env-config.patch
rename to pkgs/by-name/py/pyload-ng/declarative-env-config.patch
diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/by-name/py/pyload-ng/package.nix
similarity index 100%
rename from pkgs/applications/networking/pyload-ng/default.nix
rename to pkgs/by-name/py/pyload-ng/package.nix
diff --git a/pkgs/misc/pylode/default.nix b/pkgs/by-name/py/pylode/package.nix
similarity index 100%
rename from pkgs/misc/pylode/default.nix
rename to pkgs/by-name/py/pylode/package.nix
diff --git a/pkgs/by-name/py/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock
index 217016722d5e..bc834e889976 100644
--- a/pkgs/by-name/py/pylyzer/Cargo.lock
+++ b/pkgs/by-name/py/pylyzer/Cargo.lock
@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "addr2line"
 version = "0.24.2"
@@ -37,9 +31,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.90"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "autocfg"
@@ -99,9 +93,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.1.30"
+version = "1.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
 dependencies = [
  "shlex",
 ]
@@ -134,7 +128,18 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.79",
+ "syn 2.0.87",
+]
+
+[[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.87",
 ]
 
 [[package]]
@@ -145,9 +150,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "els"
-version = "0.1.59-nightly.2"
+version = "0.1.60-nightly.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f90c210a0919808e48b96ecffd370ac788386ab061203132872e9bf1ad9f7f"
+checksum = "89c30c054c5e833e623d0673f81696e19e58269c66a7a134785e00c0534979b6"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -161,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "erg_common"
-version = "0.6.47-nightly.2"
+version = "0.6.48-nightly.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41f171eb77bf2763b119893966358ad9da72a3edd43cf278a78cf1c16daa2cf"
+checksum = "b194a638b1a921dfe528d62aa8a027f822142a3898f28d65c965bdacf50a2de1"
 dependencies = [
  "backtrace-on-stack-overflow",
  "erg_proc_macros",
@@ -174,9 +179,9 @@ dependencies = [
 
 [[package]]
 name = "erg_compiler"
-version = "0.6.47-nightly.2"
+version = "0.6.48-nightly.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d0486bc668c120faf7af954dd4046224185c28821fb945a97eedcadf3e7d58"
+checksum = "9d437395714e82c213db0366bab94b314f8f0fac5eaeb8297580df1e0b004fa1"
 dependencies = [
  "erg_common",
  "erg_parser",
@@ -184,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "erg_parser"
-version = "0.6.47-nightly.2"
+version = "0.6.48-nightly.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c37f58f3aef2e765610e7281ada15dbba707beaa0262a71e7f6958ee058ed0"
+checksum = "d27a6c9659043cf12bcfc8066f34193438e19633ecc1161bfe5e36df12d2aa4a"
 dependencies = [
  "erg_common",
  "erg_proc_macros",
@@ -195,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "erg_proc_macros"
-version = "0.6.47-nightly.2"
+version = "0.6.48-nightly.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fa545f626fd04abea193a07c364c4fca3903c228bbe9cca4895500944b5aaf"
+checksum = "52070b88941a145aecc724ff8dd57742f6e36cbb422311db5858dccf7c84efed"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -248,25 +253,160 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
+name = "heck"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "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.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+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",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "is-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1"
+checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
 dependencies = [
- "Inflector",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -292,15 +432,21 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
 
 [[package]]
 name = "lock_api"
@@ -554,16 +700,16 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "py2erg"
-version = "0.0.67"
+version = "0.0.70"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -573,7 +719,7 @@ dependencies = [
 
 [[package]]
 name = "pylyzer"
-version = "0.0.67"
+version = "0.0.70"
 dependencies = [
  "els",
  "erg_common",
@@ -583,7 +729,7 @@ dependencies = [
 
 [[package]]
 name = "pylyzer_core"
-version = "0.0.67"
+version = "0.0.70"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -594,7 +740,7 @@ dependencies = [
 
 [[package]]
 name = "pylyzer_wasm"
-version = "0.0.67"
+version = "0.0.70"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -674,7 +820,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.4.0"
-source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
+source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
 dependencies = [
  "is-macro",
  "malachite-bigint",
@@ -685,7 +831,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.4.0"
-source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
+source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
 dependencies = [
  "anyhow",
  "is-macro",
@@ -708,7 +854,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser-core"
 version = "0.4.0"
-source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
+source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
 dependencies = [
  "is-macro",
  "memchr",
@@ -718,7 +864,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser-vendored"
 version = "0.4.0"
-source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
+source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
 dependencies = [
  "memchr",
  "once_cell",
@@ -744,29 +890,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.131"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
  "memchr",
@@ -782,7 +928,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -803,6 +949,12 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[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"
@@ -822,15 +974,26 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -851,20 +1014,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -917,27 +1075,12 @@ dependencies = [
  "unic-common",
 ]
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-width"
 version = "0.1.14"
@@ -974,9 +1117,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -984,6 +1127,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -1027,7 +1182,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -1049,7 +1204,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1091,7 +1246,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1102,7 +1257,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1188,6 +1343,42 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[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 = "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",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -1206,5 +1397,48 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.87",
+]
+
+[[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",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index c033e5c6c47f..a73a9de8f728 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -7,7 +7,6 @@
   python3,
   makeWrapper,
   writeScriptBin,
-  darwin,
   which,
   nix-update-script,
   versionCheckHook,
@@ -15,19 +14,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.67";
+  version = "0.0.70";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UMNyztdcFr88wOpRMBtLigGJcxR+0uScN+8i0+WfeYU=";
+    hash = "sha256-jj9r5npClLY9mhDHFI92825RYvwn6m9KlngfFL0bqCw=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "rustpython-ast-0.4.0" = "sha256-kMUuqOVFSvvSHOeiYMjWdsLnDu12RyQld3qtTyd5tAM=";
+      "rustpython-ast-0.4.0" = "sha256-RChZlXzdzyLp0Lb/LTLbWfbUzPDhmWkf0uVobflCKRk=";
     };
   };
 
@@ -39,10 +38,10 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     python3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+  ];
 
   preBuild = ''
-    export HOME=$TMPDIR
+    export HOME=$(mktemp -d)
   '';
 
   postInstall = ''
@@ -52,11 +51,17 @@ rustPlatform.buildRustPackage rec {
 
   nativeCheckInputs = [ which ];
 
-  checkFlags = [
-    # this test causes stack overflow
-    # > thread 'exec_import' has overflowed its stack
-    "--skip=exec_import"
-  ];
+  checkFlags =
+    [
+      # this test causes stack overflow
+      # > thread 'exec_import' has overflowed its stack
+      "--skip=exec_import"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      # Dict({Str..Obj: Int}) does not implement Iterable(Str..Obj..Obj) and Indexable({"a"}..Obj, Int)
+      # https://github.com/mtshiba/pylyzer/issues/114
+      "--skip=exec_casting"
+    ];
 
   postFixup = ''
     wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg
diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/by-name/py/pympress/package.nix
similarity index 100%
rename from pkgs/applications/office/pympress/default.nix
rename to pkgs/by-name/py/pympress/package.nix
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/by-name/py/pynac/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pynac/default.nix
rename to pkgs/by-name/py/pynac/package.nix
diff --git a/pkgs/by-name/py/pypi-mirror/package.nix b/pkgs/by-name/py/pypi-mirror/package.nix
new file mode 100644
index 000000000000..8d55d7b73cf9
--- /dev/null
+++ b/pkgs/by-name/py/pypi-mirror/package.nix
@@ -0,0 +1,28 @@
+{ fetchFromGitHub
+, lib
+, python3
+}:
+python3.pkgs.buildPythonApplication rec {
+  pname = "pypi-mirror";
+  version = "5.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "montag451";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hRqQDYgOKpv4jmNvyrt/+EInPM/Xwsr3IjtrySAGRgY=";
+  };
+
+  build-system = [ python3.pkgs.setuptools ];
+
+  pythonImportsCheck = [ "pypi_mirror" ];
+
+  meta = with lib; {
+    description = "Script to create a partial PyPI mirror";
+    mainProgram = "pypi-mirror";
+    homepage = "https://github.com/montag451/pypi-mirror";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kamadorueda ];
+  };
+}
diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix
index 4ae7590aec37..e5da7fbc37ef 100644
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyprland";
-  version = "2.4.0";
+  version = "2.4.1";
   format = "pyproject";
 
   disabled = python3Packages.pythonOlder "3.10";
@@ -16,12 +16,15 @@ python3Packages.buildPythonApplication rec {
     owner = "hyprland-community";
     repo = "pyprland";
     rev = "refs/tags/${version}";
-    hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4=";
+    hash = "sha256-QONnIElYz8UjyLICSm2QGZME5jx+l2Zw4r7kwHW8YEM=";
   };
 
   nativeBuildInputs = with python3Packages; [ poetry-core ];
 
   propagatedBuildInputs = with python3Packages; [ aiofiles ];
+  pythonRelaxDeps = [
+    "aiofiles"
+  ];
 
   postInstall = ''
     # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin
diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/by-name/py/pyrosimple/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/pyrosimple/default.nix
rename to pkgs/by-name/py/pyrosimple/package.nix
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/by-name/py/pyrseas/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pyrseas/default.nix
rename to pkgs/by-name/py/pyrseas/package.nix
diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/by-name/py/pysentation/package.nix
similarity index 100%
rename from pkgs/applications/misc/pysentation/default.nix
rename to pkgs/by-name/py/pysentation/package.nix
diff --git a/pkgs/development/libraries/pystring/default.nix b/pkgs/by-name/py/pystring/package.nix
similarity index 100%
rename from pkgs/development/libraries/pystring/default.nix
rename to pkgs/by-name/py/pystring/package.nix
diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/by-name/py/python-cosmopolitan/package.nix
similarity index 100%
rename from pkgs/development/interpreters/python-cosmopolitan/default.nix
rename to pkgs/by-name/py/python-cosmopolitan/package.nix
diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/by-name/py/python-launcher/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/python-launcher/default.nix
rename to pkgs/by-name/py/python-launcher/package.nix
diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
new file mode 100644
index 000000000000..80ebfc7c5a11
--- /dev/null
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -0,0 +1,99 @@
+{ lib
+, python3
+, fetchFromGitHub
+, gdk-pixbuf
+, adwaita-icon-theme
+, gpsbabel
+, glib-networking
+, glibcLocales
+, gobject-introspection
+, gtk3
+, perl
+, sqlite
+, tzdata
+, webkitgtk_4_0
+, wrapGAppsHook3
+, xvfb-run
+}:
+
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = (self: super: {
+      matplotlib = super.matplotlib.override {
+        enableGtk3 = true;
+      };
+    });
+  };
+in python.pkgs.buildPythonApplication rec {
+  pname = "pytrainer";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "pytrainer";
+    repo = "pytrainer";
+    rev = "v${version}";
+    hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
+  };
+
+  propagatedBuildInputs = with python.pkgs; [
+    sqlalchemy
+    python-dateutil
+    matplotlib
+    lxml
+    setuptools
+    requests
+    gdal
+  ];
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    sqlite
+    gtk3
+    webkitgtk_4_0
+    glib-networking
+    adwaita-icon-theme
+    gdk-pixbuf
+  ];
+
+  makeWrapperArgs = [
+    "--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ])
+  ];
+
+  nativeCheckInputs = [
+    glibcLocales
+    perl
+    xvfb-run
+  ] ++ (with python.pkgs; [
+    mysqlclient
+    psycopg2
+  ]);
+
+  postPatch = ''
+    substituteInPlace pytrainer/platform.py \
+        --replace 'sys.prefix' "\"$out\""
+  '';
+
+  checkPhase = ''
+    env \
+      HOME=$TEMPDIR \
+      TZDIR=${tzdata}/share/zoneinfo \
+      TZ=Europe/Kaliningrad \
+      LC_TIME=C \
+      xvfb-run -s '-screen 0 800x600x24' \
+      ${python.interpreter} -m unittest
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pytrainer/pytrainer";
+    description = "Application for logging and graphing sporting excursions";
+    mainProgram = "pytrainer";
+    maintainers = with maintainers; [ rycee dotlambda ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix
index 1103dbba4619..b2041d5e7682 100644
--- a/pkgs/by-name/py/pyxel/package.nix
+++ b/pkgs/by-name/py/pyxel/package.nix
@@ -1,12 +1,9 @@
 {
   lib,
-  stdenv,
   python3,
   fetchFromGitHub,
   rustPlatform,
   SDL2,
-  libiconv,
-  darwin,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -44,12 +41,7 @@ python3.pkgs.buildPythonApplication rec {
     bindgenHook
   ];
 
-  buildInputs =
-    [ SDL2 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      darwin.apple_sdk.frameworks.IOKit
-    ];
+  buildInputs = [ SDL2 ];
 
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
 
diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/by-name/q-/q-text-as-data/package.nix
similarity index 100%
rename from pkgs/tools/misc/q-text-as-data/default.nix
rename to pkgs/by-name/q-/q-text-as-data/package.nix
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
similarity index 100%
rename from pkgs/applications/science/math/qalculate-gtk/default.nix
rename to pkgs/by-name/qa/qalculate-gtk/package.nix
diff --git a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch b/pkgs/by-name/qb/qbe/001-dont-hardcode-tmp.patch
similarity index 100%
rename from pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch
rename to pkgs/by-name/qb/qbe/001-dont-hardcode-tmp.patch
diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/by-name/qb/qbe/package.nix
similarity index 100%
rename from pkgs/development/compilers/qbe/default.nix
rename to pkgs/by-name/qb/qbe/package.nix
diff --git a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix b/pkgs/by-name/qb/qbe/test-can-run-hello-world.nix
similarity index 100%
rename from pkgs/development/compilers/qbe/test-can-run-hello-world.nix
rename to pkgs/by-name/qb/qbe/test-can-run-hello-world.nix
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/by-name/qb/qbec/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/qbec/default.nix
rename to pkgs/by-name/qb/qbec/package.nix
diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/by-name/qc/qc/package.nix
similarity index 100%
rename from pkgs/development/tools/qc/default.nix
rename to pkgs/by-name/qc/qc/package.nix
diff --git a/pkgs/tools/networking/qcard/default.nix b/pkgs/by-name/qc/qcard/package.nix
similarity index 100%
rename from pkgs/tools/networking/qcard/default.nix
rename to pkgs/by-name/qc/qcard/package.nix
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/by-name/qc/qcdnum/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/qcdnum/default.nix
rename to pkgs/by-name/qc/qcdnum/package.nix
diff --git a/pkgs/tools/misc/qdl/default.nix b/pkgs/by-name/qd/qdl/package.nix
similarity index 100%
rename from pkgs/tools/misc/qdl/default.nix
rename to pkgs/by-name/qd/qdl/package.nix
diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/by-name/qe/qemacs/package.nix
similarity index 100%
rename from pkgs/applications/editors/qemacs/default.nix
rename to pkgs/by-name/qe/qemacs/package.nix
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/by-name/qh/qhull/package.nix
similarity index 100%
rename from pkgs/development/libraries/qhull/default.nix
rename to pkgs/by-name/qh/qhull/package.nix
diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/by-name/qm/qm-dsp/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/qm-dsp/default.nix
rename to pkgs/by-name/qm/qm-dsp/package.nix
diff --git a/pkgs/by-name/qm/qmidiarp/package.nix b/pkgs/by-name/qm/qmidiarp/package.nix
new file mode 100644
index 000000000000..1208697dc3a4
--- /dev/null
+++ b/pkgs/by-name/qm/qmidiarp/package.nix
@@ -0,0 +1,49 @@
+{ lib, stdenv
+, fetchgit
+, autoreconfHook
+, lv2
+, pkg-config
+, qt5
+, alsa-lib
+, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qmidiarp";
+  version = "0.7.1";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/qmidiarp/code";
+    sha256 = "sha256-xTDI1QtgOOMexzFKvYWhlfpXv8uXaoD4o+G6XF8/Cw8=";
+    rev = "qmidiarp-${version}";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    alsa-lib
+    lv2
+    libjack2
+  ] ++ (with qt5; [
+    qttools
+  ]);
+
+  meta = with lib; {
+    description = "Advanced MIDI arpeggiator";
+    mainProgram = "qmidiarp";
+    longDescription = ''
+      An advanced MIDI arpeggiator, programmable step sequencer and LFO for Linux.
+      It can hold any number of arpeggiator, sequencer, or LFO modules running in
+      parallel.
+    '';
+
+    homepage = "https://qmidiarp.sourceforge.net";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sjfloat ];
+  };
+}
diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/by-name/qm/qmk-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/qmk-udev-rules/default.nix
rename to pkgs/by-name/qm/qmk-udev-rules/package.nix
diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/by-name/qm/qmk/package.nix
similarity index 100%
rename from pkgs/tools/misc/qmk/default.nix
rename to pkgs/by-name/qm/qmk/package.nix
diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/by-name/qm/qmk_hid/package.nix
similarity index 100%
rename from pkgs/tools/misc/qmk_hid/default.nix
rename to pkgs/by-name/qm/qmk_hid/package.nix
diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/qogir-icon-theme/default.nix
rename to pkgs/by-name/qo/qogir-icon-theme/package.nix
diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/by-name/qo/qogir-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/qogir/default.nix
rename to pkgs/by-name/qo/qogir-theme/package.nix
diff --git a/pkgs/development/libraries/qoi/default.nix b/pkgs/by-name/qo/qoi/package.nix
similarity index 100%
rename from pkgs/development/libraries/qoi/default.nix
rename to pkgs/by-name/qo/qoi/package.nix
diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/by-name/qo/qovery-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/qovery-cli/default.nix
rename to pkgs/by-name/qo/qovery-cli/package.nix
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/by-name/qp/qpdf/package.nix
similarity index 100%
rename from pkgs/development/libraries/qpdf/default.nix
rename to pkgs/by-name/qp/qpdf/package.nix
diff --git a/pkgs/os-specific/linux/qperf/default.nix b/pkgs/by-name/qp/qperf/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/qperf/default.nix
rename to pkgs/by-name/qp/qperf/package.nix
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/by-name/qp/qpid-cpp/package.nix
similarity index 100%
rename from pkgs/servers/amqp/qpid-cpp/default.nix
rename to pkgs/by-name/qp/qpid-cpp/package.nix
diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/by-name/qp/qprint/package.nix
similarity index 100%
rename from pkgs/tools/text/qprint/default.nix
rename to pkgs/by-name/qp/qprint/package.nix
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/by-name/qq/qqwing/package.nix
similarity index 100%
rename from pkgs/games/qqwing/default.nix
rename to pkgs/by-name/qq/qqwing/package.nix
diff --git a/pkgs/tools/misc/qrscan/default.nix b/pkgs/by-name/qr/qrscan/package.nix
similarity index 100%
rename from pkgs/tools/misc/qrscan/default.nix
rename to pkgs/by-name/qr/qrscan/package.nix
diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 1743b5e511d0..669c7b69ad3a 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "qrtool";
-  version = "0.11.5";
+  version = "0.11.6";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
     rev = "v${version}";
-    hash = "sha256-2Msc8VTEzpK5eQHxJxNekj6YSqFRX/DN206hvYshiOg=";
+    hash = "sha256-ViDlY60iGNBwCDRgKiNKbsFSXozyzqlTzKpd9NCxrv0=";
   };
 
-  cargoHash = "sha256-wBEimPiht7VN3lQfPlflrG2L47bfNnipK/JmurKqHrg=";
+  cargoHash = "sha256-Bcu5hyW0uUHkshlBoKNG/NL0XYnrPJa/P8bHdcGjFTc=";
 
   nativeBuildInputs = [
     asciidoctor
diff --git a/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch b/pkgs/by-name/qr/qrupdate/disable-zch1dn-test.patch
similarity index 100%
rename from pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch
rename to pkgs/by-name/qr/qrupdate/disable-zch1dn-test.patch
diff --git a/pkgs/by-name/qr/qrupdate/package.nix b/pkgs/by-name/qr/qrupdate/package.nix
new file mode 100644
index 000000000000..27c569ccad39
--- /dev/null
+++ b/pkgs/by-name/qr/qrupdate/package.nix
@@ -0,0 +1,60 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, lapack
+, which
+, gfortran
+, blas
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qrupdate";
+  version = "1.1.5";
+
+  src = fetchFromGitHub {
+    owner = "mpimd-csc";
+    repo = "qrupdate-ng";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-dHxLPrN00wwozagY2JyfZkD3sKUD2+BcnbjNgZepzFg=";
+  };
+
+  cmakeFlags = assert (blas.isILP64 == lapack.isILP64); [
+    "-DCMAKE_Fortran_FLAGS=${toString ([
+      "-std=legacy"
+    ] ++ lib.optionals blas.isILP64 [
+      # If another application intends to use qrupdate compiled with blas with
+      # 64 bit support, it should add this to it's FFLAGS as well. See (e.g):
+      # https://savannah.gnu.org/bugs/?50339
+      "-fdefault-integer-8"
+    ])}"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # prevent cmake from using Accelerate, which causes all tests to segfault
+    "-DBLA_VENDOR=Generic"
+  ];
+
+  # https://github.com/mpimd-csc/qrupdate-ng/issues/4
+  patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    ./disable-zch1dn-test.patch
+  ];
+
+  doCheck = true;
+
+  nativeBuildInputs = [
+    cmake
+    which
+    gfortran
+  ];
+  buildInputs = [
+    blas
+    lapack
+  ];
+
+  meta = with lib; {
+    description = "Library for fast updating of qr and cholesky decompositions";
+    homepage = "https://github.com/mpimd-csc/qrupdate-ng";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ doronbehar ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix
index 877bae48a72f..779b056415f3 100644
--- a/pkgs/by-name/qt/qtractor/package.nix
+++ b/pkgs/by-name/qt/qtractor/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "1.1.1";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
-    hash = "sha256-Q/6AS9mZwsG+wF/h0xt77s8qpuLwcO1CjoVaX9ta9Qc=";
+    hash = "sha256-ufQUNQvmxxAMIAWusclPzE1zkjz93guvygi6EfAEgH4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/by-name/qu/QuadProgpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/QuadProgpp/default.nix
rename to pkgs/by-name/qu/QuadProgpp/package.nix
diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/by-name/qu/quadrafuzz/package.nix
similarity index 100%
rename from pkgs/applications/audio/quadrafuzz/default.nix
rename to pkgs/by-name/qu/quadrafuzz/package.nix
diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/by-name/qu/quake3e/package.nix
similarity index 100%
rename from pkgs/games/quake3/quake3e/default.nix
rename to pkgs/by-name/qu/quake3e/package.nix
diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/by-name/qu/quantlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/quantlib/default.nix
rename to pkgs/by-name/qu/quantlib/package.nix
diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/by-name/qu/quantomatic/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/quantomatic/default.nix
rename to pkgs/by-name/qu/quantomatic/package.nix
diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/by-name/qu/quantumminigolf/package.nix
similarity index 100%
rename from pkgs/games/quantumminigolf/default.nix
rename to pkgs/by-name/qu/quantumminigolf/package.nix
diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/by-name/qu/quark-engine/package.nix
similarity index 100%
rename from pkgs/tools/security/quark-engine/default.nix
rename to pkgs/by-name/qu/quark-engine/package.nix
diff --git a/pkgs/servers/http/quark/default.nix b/pkgs/by-name/qu/quark/package.nix
similarity index 100%
rename from pkgs/servers/http/quark/default.nix
rename to pkgs/by-name/qu/quark/package.nix
diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix
similarity index 100%
rename from pkgs/applications/editors/quartus-prime/default.nix
rename to pkgs/by-name/qu/quartus-prime-lite/package.nix
diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
similarity index 100%
rename from pkgs/applications/editors/quartus-prime/quartus.nix
rename to pkgs/by-name/qu/quartus-prime-lite/quartus.nix
diff --git a/pkgs/by-name/qu/quast/package.nix b/pkgs/by-name/qu/quast/package.nix
new file mode 100644
index 000000000000..e390b5d3ec67
--- /dev/null
+++ b/pkgs/by-name/qu/quast/package.nix
@@ -0,0 +1,60 @@
+{ lib, stdenv, fetchurl, python3Packages, zlib, bash }:
+
+let
+  pythonPackages = python3Packages;
+  inherit (pythonPackages) python;
+in
+
+pythonPackages.buildPythonApplication rec {
+  pname = "quast";
+  version = "5.0.2";
+
+  src = fetchurl {
+    url = "https://github.com/ablab/quast/releases/download/${pname}_${version}/${pname}-${version}.tar.gz";
+    sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d";
+  };
+
+  pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ];
+
+  buildInputs = [ zlib ] ++ pythonPath;
+
+  dontConfigure = true;
+
+  dontBuild = true;
+
+  installPhase = ''
+    substituteInPlace quast_libs/bedtools/Makefile \
+      --replace "/bin/bash" "${bash}/bin/bash"
+    mkdir -p "$out/${python.sitePackages}"
+    export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
+    ${python.pythonOnBuildForHost.interpreter} setup.py install \
+      --install-lib=$out/${python.sitePackages} \
+      --prefix="$out"
+  '';
+
+   postFixup = ''
+   for file in $(find $out -type f -type f -perm /0111); do
+       old_rpath=$(patchelf --print-rpath $file) && \
+       patchelf --set-rpath $old_rpath:${lib.getLib stdenv.cc.cc}/lib $file || true
+   done
+   # Link to the master program
+   ln -s $out/bin/quast.py $out/bin/quast
+  '';
+
+  dontPatchELF = true;
+
+  # Tests need to download data files, so manual run after packaging is needed
+  doCheck = false;
+
+  meta = with lib ; {
+    description = "Evaluates genome assemblies by computing various metrics";
+    homepage = "https://github.com/ablab/quast";
+    sourceProvenance = with sourceTypes; [
+      fromSource
+      binaryNativeCode  # source bundles binary dependencies
+    ];
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/by-name/qu/quattrocento-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/quattrocento-sans/default.nix
rename to pkgs/by-name/qu/quattrocento-sans/package.nix
diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/by-name/qu/quattrocento/package.nix
similarity index 100%
rename from pkgs/data/fonts/quattrocento/default.nix
rename to pkgs/by-name/qu/quattrocento/package.nix
diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
similarity index 100%
rename from pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
rename to pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/by-name/qu/quesoglc/package.nix
similarity index 100%
rename from pkgs/development/libraries/quesoglc/default.nix
rename to pkgs/by-name/qu/quesoglc/package.nix
diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
new file mode 100644
index 000000000000..0cb64149514f
--- /dev/null
+++ b/pkgs/by-name/qu/questdb/package.nix
@@ -0,0 +1,43 @@
+{
+  fetchurl,
+  jdk17_headless,
+  lib,
+  makeBinaryWrapper,
+  stdenv
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "questdb";
+  version = "8.1.2";
+
+  src = fetchurl {
+    url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
+    hash = "sha256-oFhr/lBsg3e7vUiNQXwjBTF6GAjBYym4+YBoA/2Lsag=";
+  };
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/java
+    cp questdb.sh $out/bin
+    cp questdb.jar $out/share/java
+
+    ln -s $out/share/java/questdb.jar $out/bin
+    wrapProgram $out/bin/questdb.sh --set JAVA_HOME "${jdk17_headless}"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "high-performance, open-source SQL database for applications in financial services, IoT, machine learning, DevOps and observability";
+    homepage = "https://questdb.io/";
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jacfal ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/tools/misc/quich/default.nix b/pkgs/by-name/qu/quich/package.nix
similarity index 100%
rename from pkgs/tools/misc/quich/default.nix
rename to pkgs/by-name/qu/quich/package.nix
diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/by-name/qu/quick-lint-js/package.nix
similarity index 100%
rename from pkgs/development/tools/quick-lint-js/default.nix
rename to pkgs/by-name/qu/quick-lint-js/package.nix
diff --git a/pkgs/by-name/qu/quick-lookup/package.nix b/pkgs/by-name/qu/quick-lookup/package.nix
index ffd8d48a2c51..10dfa854059e 100644
--- a/pkgs/by-name/qu/quick-lookup/package.nix
+++ b/pkgs/by-name/qu/quick-lookup/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quick-lookup";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "johnfactotum";
     repo = "quick-lookup";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-I6a8J/Z1yJhdqWES+1mIlvJq6FBOX0GiW0muNP/iSjE=";
+    hash = "sha256-KENHYdhB1OHIB1RKyv78QFdsq3fYRqKgBDCFPLxHZ+k=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix
new file mode 100644
index 000000000000..981fa635a30b
--- /dev/null
+++ b/pkgs/by-name/qu/quickder/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchFromGitLab,
+  python3,
+  cmake,
+  doxygen,
+  graphviz,
+  quickmem,
+  arpa2common,
+  arpa2cm,
+  ensureNewerSourcesForZipFilesHook,
+}:
+
+let
+  python =
+    let
+      packageOverrides = self: super: {
+        pyparsing = super.pyparsing.overridePythonAttrs (old: rec {
+          version = "3.1.2";
+          src = fetchFromGitHub {
+            owner = "pyparsing";
+            repo = "pyparsing";
+            rev = "refs/tags/${version}";
+            hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A=";
+          };
+        });
+      };
+    in
+    python3.override {
+      inherit packageOverrides;
+      self = python;
+    };
+in
+stdenv.mkDerivation rec {
+  pname = "quickder";
+  version = "1.7.1";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "quick-der";
+    rev = "v${version}";
+    hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    graphviz
+    ensureNewerSourcesForZipFilesHook
+  ];
+
+  buildInputs = [
+    arpa2cm
+    arpa2common
+    (python.withPackages (
+      ps: with ps; [
+        asn1ate
+        colored
+        pyparsing
+        setuptools
+        six
+      ]
+    ))
+    quickmem
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Quick (and Easy) DER, a Library for parsing ASN.1";
+    homepage = "https://gitlab.com/arpa2/quick-der/";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/development/libraries/quickfix/disableUnitTests.patch b/pkgs/by-name/qu/quickfix/disableUnitTests.patch
similarity index 100%
rename from pkgs/development/libraries/quickfix/disableUnitTests.patch
rename to pkgs/by-name/qu/quickfix/disableUnitTests.patch
diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/by-name/qu/quickfix/package.nix
similarity index 100%
rename from pkgs/development/libraries/quickfix/default.nix
rename to pkgs/by-name/qu/quickfix/package.nix
diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/by-name/qu/quickgui/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/quickgui/default.nix
rename to pkgs/by-name/qu/quickgui/package.nix
diff --git a/pkgs/applications/virtualization/quickgui/pubspec.lock.json b/pkgs/by-name/qu/quickgui/pubspec.lock.json
similarity index 100%
rename from pkgs/applications/virtualization/quickgui/pubspec.lock.json
rename to pkgs/by-name/qu/quickgui/pubspec.lock.json
diff --git a/pkgs/development/libraries/quickmem/default.nix b/pkgs/by-name/qu/quickmem/package.nix
similarity index 100%
rename from pkgs/development/libraries/quickmem/default.nix
rename to pkgs/by-name/qu/quickmem/package.nix
diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/by-name/qu/quickserve/package.nix
similarity index 100%
rename from pkgs/tools/networking/quickserve/default.nix
rename to pkgs/by-name/qu/quickserve/package.nix
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/by-name/qu/quicksynergy/package.nix
similarity index 100%
rename from pkgs/applications/misc/quicksynergy/default.nix
rename to pkgs/by-name/qu/quicksynergy/package.nix
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/by-name/qu/quicktemplate/package.nix
similarity index 100%
rename from pkgs/development/tools/quicktemplate/default.nix
rename to pkgs/by-name/qu/quicktemplate/package.nix
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/by-name/qu/quicktun/package.nix
similarity index 100%
rename from pkgs/tools/networking/quicktun/default.nix
rename to pkgs/by-name/qu/quicktun/package.nix
diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/by-name/qu/quicktun/tar-1.30.diff
similarity index 100%
rename from pkgs/tools/networking/quicktun/tar-1.30.diff
rename to pkgs/by-name/qu/quicktun/tar-1.30.diff
diff --git a/pkgs/tools/security/quill-qr/default.nix b/pkgs/by-name/qu/quill-qr/package.nix
similarity index 100%
rename from pkgs/tools/security/quill-qr/default.nix
rename to pkgs/by-name/qu/quill-qr/package.nix
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/by-name/qu/quilt/package.nix
similarity index 100%
rename from pkgs/development/tools/quilt/default.nix
rename to pkgs/by-name/qu/quilt/package.nix
diff --git a/pkgs/data/icons/quintom-cursor-theme/default.nix b/pkgs/by-name/qu/quintom-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/quintom-cursor-theme/default.nix
rename to pkgs/by-name/qu/quintom-cursor-theme/package.nix
diff --git a/pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch b/pkgs/by-name/qu/quirc/0001-Don-t-build-demos.patch
similarity index 100%
rename from pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch
rename to pkgs/by-name/qu/quirc/0001-Don-t-build-demos.patch
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/by-name/qu/quirc/package.nix
similarity index 100%
rename from pkgs/tools/graphics/quirc/default.nix
rename to pkgs/by-name/qu/quirc/package.nix
diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/by-name/qu/quisk/package.nix
similarity index 100%
rename from pkgs/applications/radio/quisk/default.nix
rename to pkgs/by-name/qu/quisk/package.nix
diff --git a/pkgs/data/fonts/quivira/default.nix b/pkgs/by-name/qu/quivira/package.nix
similarity index 100%
rename from pkgs/data/fonts/quivira/default.nix
rename to pkgs/by-name/qu/quivira/package.nix
diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/by-name/qu/quorum/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/quorum/default.nix
rename to pkgs/by-name/qu/quorum/package.nix
diff --git a/pkgs/by-name/r1/r128gain/ffmpeg-location.patch b/pkgs/by-name/r1/r128gain/ffmpeg-location.patch
new file mode 100644
index 000000000000..53d755cdae41
--- /dev/null
+++ b/pkgs/by-name/r1/r128gain/ffmpeg-location.patch
@@ -0,0 +1,31 @@
+diff --git a/r128gain/__init__.py b/r128gain/__init__.py
+index 79a5cbd..d8f13ba 100755
+--- a/r128gain/__init__.py
++++ b/r128gain/__init__.py
+@@ -86,7 +86,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path: Optional[str] = None) -> Dict[str, int]
+     Example: 0x3040100 for FFmpeg 3.4.1
+     """
+     r = collections.OrderedDict()
+-    cmd = (ffmpeg_path or "ffmpeg", "-version")
++    cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version")
+     output_str = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, universal_newlines=True).stdout
+     output_lines = output_str.splitlines()
+     lib_version_regex = re.compile(r"^\s*(lib[a-z]+)\s+([0-9]+).\s*([0-9]+).\s*([0-9]+)\s+")
+@@ -194,7 +194,7 @@ def get_r128_loudness(  # noqa: C901
+         ffmpeg.output(*output_streams, os.devnull, **additional_ffmpeg_args, f="null").global_args(
+             "-hide_banner", "-nostats"
+         ),
+-        cmd=ffmpeg_path or "ffmpeg",
++        cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg",
+     )
+ 
+     # run
+@@ -885,7 +885,7 @@ def cl_main() -> None:
+     arg_parser.add_argument(
+         "-f",
+         "--ffmpeg-path",
+-        default=shutil.which("ffmpeg"),
++        default="@ffmpeg@/bin/ffmpeg",
+         help="""Full file path of ffmpeg executable (only needed if not in PATH).
+                 If not specified, autodetect""",
+     )
diff --git a/pkgs/by-name/r1/r128gain/package.nix b/pkgs/by-name/r1/r128gain/package.nix
new file mode 100644
index 000000000000..7ff5a13b775e
--- /dev/null
+++ b/pkgs/by-name/r1/r128gain/package.nix
@@ -0,0 +1,45 @@
+{ lib
+, fetchFromGitHub
+, gitUpdater
+, substituteAll
+, ffmpeg
+, python3Packages
+, sox
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "r128gain";
+  version = "1.0.7";
+
+  src = fetchFromGitHub {
+    owner = "desbma";
+    repo = "r128gain";
+    rev = version;
+    sha256 = "sha256-JyKacDqjIKTNl2GjbJPkgbakF8HR4Jd4czAtOaemDH8=";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./ffmpeg-location.patch;
+      inherit ffmpeg;
+    })
+  ];
+
+  propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ];
+  nativeCheckInputs = with python3Packages; [ requests sox ];
+
+  # Testing downloads media files for testing, which requires the
+  # sandbox to be disabled.
+  doCheck = false;
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = with lib; {
+    description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";
+    mainProgram = "r128gain";
+    homepage = "https://github.com/desbma/r128gain";
+    license = licenses.lgpl2Plus;
+    maintainers = [ ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/by-name/r2/r2mod_cli/package.nix
similarity index 100%
rename from pkgs/games/r2mod_cli/default.nix
rename to pkgs/by-name/r2/r2mod_cli/package.nix
diff --git a/pkgs/games/r2modman/default.nix b/pkgs/by-name/r2/r2modman/package.nix
similarity index 100%
rename from pkgs/games/r2modman/default.nix
rename to pkgs/by-name/r2/r2modman/package.nix
diff --git a/pkgs/games/r2modman/steam-launch-fix.patch b/pkgs/by-name/r2/r2modman/steam-launch-fix.patch
similarity index 100%
rename from pkgs/games/r2modman/steam-launch-fix.patch
rename to pkgs/by-name/r2/r2modman/steam-launch-fix.patch
diff --git a/pkgs/applications/networking/r53-ddns/default.nix b/pkgs/by-name/r5/r53-ddns/package.nix
similarity index 100%
rename from pkgs/applications/networking/r53-ddns/default.nix
rename to pkgs/by-name/r5/r53-ddns/package.nix
diff --git a/pkgs/development/tools/rust/ra-multiplex/default.nix b/pkgs/by-name/ra/ra-multiplex/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/ra-multiplex/default.nix
rename to pkgs/by-name/ra/ra-multiplex/package.nix
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/by-name/ra/rabbitmq-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/rabbitmq-c/default.nix
rename to pkgs/by-name/ra/rabbitmq-c/package.nix
diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/by-name/ra/rabtap/package.nix
similarity index 100%
rename from pkgs/tools/networking/rabtap/default.nix
rename to pkgs/by-name/ra/rabtap/package.nix
diff --git a/pkgs/games/racer/mkdir.patch b/pkgs/by-name/ra/racer/mkdir.patch
similarity index 100%
rename from pkgs/games/racer/mkdir.patch
rename to pkgs/by-name/ra/racer/mkdir.patch
diff --git a/pkgs/games/racer/default.nix b/pkgs/by-name/ra/racer/package.nix
similarity index 100%
rename from pkgs/games/racer/default.nix
rename to pkgs/by-name/ra/racer/package.nix
diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/by-name/ra/radamsa/package.nix
similarity index 100%
rename from pkgs/tools/security/radamsa/default.nix
rename to pkgs/by-name/ra/radamsa/package.nix
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/by-name/ra/radeontools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/radeontools/default.nix
rename to pkgs/by-name/ra/radeontools/package.nix
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/by-name/ra/radeontop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/radeontop/default.nix
rename to pkgs/by-name/ra/radeontop/package.nix
diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/by-name/ra/radioboat/package.nix
similarity index 100%
rename from pkgs/applications/audio/radioboat/default.nix
rename to pkgs/by-name/ra/radioboat/package.nix
diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/by-name/ra/radsecproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/radsecproxy/default.nix
rename to pkgs/by-name/ra/radsecproxy/package.nix
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/by-name/ra/radvd/package.nix
similarity index 100%
rename from pkgs/tools/networking/radvd/default.nix
rename to pkgs/by-name/ra/radvd/package.nix
diff --git a/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch
similarity index 100%
rename from pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch
rename to pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch
diff --git a/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch
similarity index 100%
rename from pkgs/development/libraries/raft-canonical/disable-net-tests.patch
rename to pkgs/by-name/ra/raft-canonical/disable-net-tests.patch
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/by-name/ra/raft-canonical/package.nix
similarity index 100%
rename from pkgs/development/libraries/raft-canonical/default.nix
rename to pkgs/by-name/ra/raft-canonical/package.nix
diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index 0c41c5a55368..f8539df67e5e 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rage";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "str4d";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-7PfNDFDuvQ9T3BeA15FuY1jAprGLsyglWXcNrZvtPAE=";
+    hash = "sha256-4ongCmO88IJjUPz35jOOpG4XpfVGYdA3GR2w3E/h+M4=";
   };
 
-  cargoHash = "sha256-5aLT0JfeFj0fZP/1sHXulCQtoquHYriapMdPtN+fxko=";
+  cargoHash = "sha256-Nhm6xn7Upc9m+sTU9Pw3NGdpvwHvb4JGN6CQuMykILo=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/applications/window-managers/ragnarwm/default.nix b/pkgs/by-name/ra/ragnarwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/ragnarwm/default.nix
rename to pkgs/by-name/ra/ragnarwm/package.nix
diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
new file mode 100644
index 000000000000..c5921f90bff6
--- /dev/null
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, rain
+}:
+
+buildGoModule rec {
+  pname = "rain";
+  version = "1.19.0";
+
+  src = fetchFromGitHub {
+    owner = "aws-cloudformation";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-I5h09XbBDrMXQczpNoUENkOp3b4NxBR5Hr58nNVh1JM=";
+  };
+
+  vendorHash = "sha256-6xSWaLnE9pD2d49OVjg2IIbhgdJ5R2I0fuRZ4wFudoI=";
+
+  subPackages = [ "cmd/rain" ];
+
+  ldflags = [ "-s" "-w" ];
+
+  passthru.tests.version = testers.testVersion {
+    package = rain;
+    command = "rain --version";
+    version = "v${version}";
+  };
+
+  meta = with lib; {
+    description = "Development workflow tool for working with AWS CloudFormation";
+    mainProgram = "rain";
+    homepage = "https://github.com/aws-cloudformation/rain";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jiegec ];
+  };
+}
diff --git a/pkgs/by-name/ra/rainbowcrack/package.nix b/pkgs/by-name/ra/rainbowcrack/package.nix
index bc138dbc9c74..40ddf8df8963 100644
--- a/pkgs/by-name/ra/rainbowcrack/package.nix
+++ b/pkgs/by-name/ra/rainbowcrack/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   dontConfigure = true;
 
diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/by-name/ra/raiseorlaunch/package.nix
similarity index 100%
rename from pkgs/applications/misc/raiseorlaunch/default.nix
rename to pkgs/by-name/ra/raiseorlaunch/package.nix
diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/by-name/ra/rakkess/package.nix
similarity index 100%
rename from pkgs/development/tools/rakkess/default.nix
rename to pkgs/by-name/ra/rakkess/package.nix
diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/by-name/ra/raleway/package.nix
similarity index 100%
rename from pkgs/data/fonts/raleway/default.nix
rename to pkgs/by-name/ra/raleway/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/by-name/ra/rambox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/rambox/default.nix
rename to pkgs/by-name/ra/rambox/package.nix
diff --git a/pkgs/tools/misc/ramfetch/default.nix b/pkgs/by-name/ra/ramfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/ramfetch/default.nix
rename to pkgs/by-name/ra/ramfetch/package.nix
diff --git a/pkgs/servers/http/ran/default.nix b/pkgs/by-name/ra/ran/package.nix
similarity index 100%
rename from pkgs/servers/http/ran/default.nix
rename to pkgs/by-name/ra/ran/package.nix
diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/by-name/ra/rancher/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/rancher/default.nix
rename to pkgs/by-name/ra/rancher/package.nix
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/by-name/ra/randoop/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/randoop/default.nix
rename to pkgs/by-name/ra/randoop/package.nix
diff --git a/pkgs/games/randtype/default.nix b/pkgs/by-name/ra/randtype/package.nix
similarity index 100%
rename from pkgs/games/randtype/default.nix
rename to pkgs/by-name/ra/randtype/package.nix
diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/by-name/ra/rang/package.nix
similarity index 100%
rename from pkgs/development/libraries/rang/default.nix
rename to pkgs/by-name/ra/rang/package.nix
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/by-name/ra/range-v3/package.nix
similarity index 100%
rename from pkgs/development/libraries/range-v3/default.nix
rename to pkgs/by-name/ra/range-v3/package.nix
diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/by-name/ra/ranger/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/ranger/default.nix
rename to pkgs/by-name/ra/ranger/package.nix
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/by-name/ra/rankwidth/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/rankwidth/default.nix
rename to pkgs/by-name/ra/rankwidth/package.nix
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/by-name/ra/rapidcheck/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidcheck/default.nix
rename to pkgs/by-name/ra/rapidcheck/package.nix
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidfuzz-cpp/default.nix
rename to pkgs/by-name/ra/rapidfuzz-cpp/package.nix
diff --git a/pkgs/by-name/ra/rapidjson/package.nix b/pkgs/by-name/ra/rapidjson/package.nix
new file mode 100644
index 000000000000..09707dc75b9a
--- /dev/null
+++ b/pkgs/by-name/ra/rapidjson/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  doxygen,
+  graphviz,
+  gtest,
+  valgrind,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rapidjson";
+  version = "unstable-2024-04-09";
+
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "Tencent";
+    repo = "rapidjson";
+    rev = "ab1842a2dae061284c0a62dca1cc6d5e7e37e346";
+    hash = "sha256-kAGVJfDHEUV2qNR1LpnWq3XKBJy4hD3Swh6LX5shJpM=";
+  };
+
+  patches = [
+    ./use-nixpkgs-gtest.patch
+    # https://github.com/Tencent/rapidjson/issues/2214
+    ./suppress-valgrind-failures.patch
+  ];
+
+  postPatch = ''
+    for f in doc/Doxyfile.*; do
+      substituteInPlace $f \
+        --replace-fail "WARN_IF_UNDOCUMENTED   = YES" "WARN_IF_UNDOCUMENTED   = NO"
+    done
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    graphviz
+  ];
+
+  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.hostPlatform.isDarwin);
+
+  nativeCheckInputs = [
+    valgrind
+  ];
+
+  meta = {
+    description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
+    homepage = "http://rapidjson.org/";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = [
+      lib.maintainers.dotlambda
+      lib.maintainers.Madouura
+      lib.maintainers.tobim
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch b/pkgs/by-name/ra/rapidjson/suppress-valgrind-failures.patch
similarity index 100%
rename from pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch
rename to pkgs/by-name/ra/rapidjson/suppress-valgrind-failures.patch
diff --git a/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch b/pkgs/by-name/ra/rapidjson/use-nixpkgs-gtest.patch
similarity index 100%
rename from pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch
rename to pkgs/by-name/ra/rapidjson/use-nixpkgs-gtest.patch
diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/by-name/ra/rapidsvn/fix-build.patch
similarity index 100%
rename from pkgs/applications/version-management/rapidsvn/fix-build.patch
rename to pkgs/by-name/ra/rapidsvn/fix-build.patch
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/by-name/ra/rapidsvn/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rapidsvn/default.nix
rename to pkgs/by-name/ra/rapidsvn/package.nix
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/by-name/ra/rapidxml/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidxml/default.nix
rename to pkgs/by-name/ra/rapidxml/package.nix
diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/by-name/ra/rapidyaml/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidyaml/default.nix
rename to pkgs/by-name/ra/rapidyaml/package.nix
diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/by-name/ra/rappel/package.nix
similarity index 100%
rename from pkgs/development/misc/rappel/default.nix
rename to pkgs/by-name/ra/rappel/package.nix
diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/by-name/ra/rar2fs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rar2fs/default.nix
rename to pkgs/by-name/ra/rar2fs/package.nix
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/by-name/ra/rarcrack/package.nix
similarity index 100%
rename from pkgs/tools/security/rarcrack/default.nix
rename to pkgs/by-name/ra/rarcrack/package.nix
diff --git a/pkgs/tools/text/rare-regex/default.nix b/pkgs/by-name/ra/rare-regex/package.nix
similarity index 100%
rename from pkgs/tools/text/rare-regex/default.nix
rename to pkgs/by-name/ra/rare-regex/package.nix
diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/by-name/ra/rargs/package.nix
similarity index 100%
rename from pkgs/tools/misc/rargs/default.nix
rename to pkgs/by-name/ra/rargs/package.nix
diff --git a/pkgs/development/tools/rars/default.nix b/pkgs/by-name/ra/rars/package.nix
similarity index 100%
rename from pkgs/development/tools/rars/default.nix
rename to pkgs/by-name/ra/rars/package.nix
diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/by-name/ra/rascal/package.nix
similarity index 100%
rename from pkgs/development/interpreters/rascal/default.nix
rename to pkgs/by-name/ra/rascal/package.nix
diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/by-name/ra/rasdaemon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rasdaemon/default.nix
rename to pkgs/by-name/ra/rasdaemon/package.nix
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
rename to pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/by-name/ra/ratman/package.nix
similarity index 100%
rename from pkgs/tools/networking/ratman/default.nix
rename to pkgs/by-name/ra/ratman/package.nix
diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/by-name/ra/ratmen/package.nix
similarity index 100%
rename from pkgs/tools/X11/ratmen/default.nix
rename to pkgs/by-name/ra/ratmen/package.nix
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/by-name/ra/ratools/package.nix
similarity index 100%
rename from pkgs/tools/networking/ratools/default.nix
rename to pkgs/by-name/ra/ratools/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/by-name/ra/ratox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/ratox/default.nix
rename to pkgs/by-name/ra/ratox/package.nix
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/by-name/ra/ratpoints/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ratpoints/default.nix
rename to pkgs/by-name/ra/ratpoints/package.nix
diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/by-name/ra/ratt/package.nix
similarity index 100%
rename from pkgs/applications/misc/ratt/default.nix
rename to pkgs/by-name/ra/ratt/package.nix
diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/by-name/ra/rauc/package.nix
similarity index 100%
rename from pkgs/tools/misc/rauc/default.nix
rename to pkgs/by-name/ra/rauc/package.nix
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/by-name/ra/raul/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/raul/default.nix
rename to pkgs/by-name/ra/raul/package.nix
diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/by-name/ra/ravedude/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/ravedude/default.nix
rename to pkgs/by-name/ra/ravedude/package.nix
diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/by-name/ra/raven-reader/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/raven-reader/default.nix
rename to pkgs/by-name/ra/raven-reader/package.nix
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/by-name/ra/raxml/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/raxml/default.nix
rename to pkgs/by-name/ra/raxml/package.nix
diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
new file mode 100644
index 000000000000..d0a726e2a406
--- /dev/null
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  writeShellApplication,
+  curl,
+  jq,
+  common-updater-scripts,
+  undmg,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "raycast";
+  version = "1.85.0";
+
+  src = fetchurl {
+    name = "Raycast.dmg";
+    url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
+    hash = "sha256-wx9Ps/7O4y21D7lK3UlL23Cbvl8lRDZ375lOHq67w0I=";
+  };
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  nativeBuildInputs = [ undmg ];
+
+  sourceRoot = "Raycast.app";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications/Raycast.app
+    cp -R . $out/Applications/Raycast.app
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    name = "raycast-update-script";
+    runtimeInputs = [
+      curl
+      jq
+      common-updater-scripts
+    ];
+    text = ''
+      url=$(curl --silent "https://releases.raycast.com/releases/latest?build=universal")
+      version=$(echo "$url" | jq -r '.version')
+      update-source-version raycast "$version" --file=./pkgs/by-name/ra/raycast/package.nix
+    '';
+  });
+
+  meta = {
+    description = "Control your tools with a few keystrokes";
+    homepage = "https://raycast.app/";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
+      lovesegfault
+      stepbrobd
+      donteatoreo
+      jakecleary
+    ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/by-name/ra/raylib-games/package.nix
similarity index 100%
rename from pkgs/games/raylib-games/default.nix
rename to pkgs/by-name/ra/raylib-games/package.nix
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
new file mode 100644
index 000000000000..086d6ae60c82
--- /dev/null
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -0,0 +1,85 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, fetchpatch
+, mesa
+, libGLU
+, glfw
+, libX11
+, libXi
+, libXcursor
+, libXrandr
+, libXinerama
+, alsaSupport ? stdenv.hostPlatform.isLinux
+, alsa-lib
+, pulseSupport ? stdenv.hostPlatform.isLinux
+, libpulseaudio
+, sharedLib ? true
+, includeEverything ? true
+, raylib-games
+, darwin
+, autoPatchelfHook
+}:
+let
+  inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "raylib";
+  version = "5.0";
+
+  src = fetchFromGitHub {
+    owner = "raysan5";
+    repo = "raylib";
+    rev = finalAttrs.version;
+    hash = "sha256-gEstNs3huQ1uikVXOW4uoYnIDr5l8O9jgZRTX1mkRww=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+
+  buildInputs = [ glfw ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa libXi libXcursor libXrandr libXinerama ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]
+    ++ lib.optional alsaSupport alsa-lib
+    ++ lib.optional pulseSupport libpulseaudio;
+
+  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ];
+
+  # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
+  cmakeFlags = [
+    "-DUSE_EXTERNAL_GLFW=ON"
+    "-DBUILD_EXAMPLES=OFF"
+    "-DCUSTOMIZE_BUILD=1"
+  ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
+  ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
+
+  passthru.tests = { inherit raylib-games; };
+
+  patches = [
+    # Patch version in CMakeLists.txt to 5.0.0
+    # The library author doesn't use cmake, so when updating this package please
+    # check that the resulting library extension matches the package version
+    # and remove/update this patch
+    (fetchpatch {
+      url = "https://github.com/raysan5/raylib/commit/032cc497ca5aaca862dc926a93c2a45ed8017737.patch";
+      hash = "sha256-qsX5AwyQaGoRsbdszOO7tUF9dR+AkEFi4ebNkBVHNEY=";
+    })
+  ];
+
+  # fix libasound.so/libpulse.so not being found
+  appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio))
+  ];
+
+  meta = with lib; {
+    description = "Simple and easy-to-use library to enjoy videogames programming";
+    homepage = "https://www.raylib.com/";
+    license = licenses.zlib;
+    maintainers = [ ];
+    platforms = platforms.all;
+    changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
+  };
+})
diff --git a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/rbdoom-3-bfg/default.nix
rename to pkgs/by-name/rb/rbdoom-3-bfg/package.nix
diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/by-name/rb/rbenv/package.nix
similarity index 100%
rename from pkgs/development/ruby-modules/rbenv/default.nix
rename to pkgs/by-name/rb/rbenv/package.nix
diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/by-name/rb/rbw/package.nix
similarity index 100%
rename from pkgs/tools/security/rbw/default.nix
rename to pkgs/by-name/rb/rbw/package.nix
diff --git a/pkgs/shells/rc-9front/default.nix b/pkgs/by-name/rc/rc-9front/package.nix
similarity index 100%
rename from pkgs/shells/rc-9front/default.nix
rename to pkgs/by-name/rc/rc-9front/package.nix
diff --git a/pkgs/shells/rc-9front/path.patch b/pkgs/by-name/rc/rc-9front/path.patch
similarity index 100%
rename from pkgs/shells/rc-9front/path.patch
rename to pkgs/by-name/rc/rc-9front/path.patch
diff --git a/pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch b/pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch
new file mode 100644
index 000000000000..ce48e30bbea1
--- /dev/null
+++ b/pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch
@@ -0,0 +1,14 @@
+diff --git a/apple-codesign/tests/cli_tests.rs b/apple-codesign/tests/cli_tests.rs
+index 22166712ec..8721a92753 100644
+--- a/apple-codesign/tests/cli_tests.rs
++++ b/apple-codesign/tests/cli_tests.rs
+@@ -271,6 +271,9 @@
+ 
+     cases.case("tests/cmd/*.trycmd").case("tests/cmd/*.toml");
+ 
++    // Disable in nixpkgs because it requires network access
++    cases.skip("tests/cmd/sign-for-notarization.trycmd");
++
+     // Help output breaks without notarize feature.
+     if cfg!(not(feature = "notarize")) {
+         cases.skip("tests/cmd/encode-app-store-connect-api-key.trycmd");
diff --git a/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch b/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
new file mode 100644
index 000000000000..5d134bd71165
--- /dev/null
+++ b/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
@@ -0,0 +1,19 @@
+diff --git a/apple-codesign/src/cli/mod.rs b/apple-codesign/src/cli/mod.rs
+index 53e9649271..82d4d061a6 100644
+--- a/apple-codesign/src/cli/mod.rs
++++ b/apple-codesign/src/cli/mod.rs
+@@ -2499,9 +2499,11 @@
+         _ => LevelFilter::Trace,
+     };
+ 
+-    let mut builder = env_logger::Builder::from_env(
+-        env_logger::Env::default().default_filter_or(log_level.as_str()),
+-    );
++    let mut builder = env_logger::Builder::new();
++
++    builder
++        .filter_level(log_level)
++        .parse_default_env();
+ 
+     // Disable log context except at higher log levels.
+     if log_level <= LevelFilter::Info {
diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix
new file mode 100644
index 000000000000..b96258cf1672
--- /dev/null
+++ b/pkgs/by-name/rc/rcodesign/package.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, apple-sdk_11
+, uutils-coreutils
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rcodesign";
+  version = "0.27.0";
+
+  src = fetchFromGitHub {
+    owner = "indygreg";
+    repo = "apple-platform-rs";
+    rev = "apple-codesign/${version}";
+    hash = "sha256-F6Etl3Zbpmh3A/VeCcSXIy3W1WYFg8WUSJBJV/akCxU=";
+  };
+
+  cargoPatches = [
+    # Update time to a version that is compatible with Rust 1.80
+    ./update-time-rs-in-cargo-lock.patch
+  ];
+
+  patches = [
+    # Fix rcodesign’s verbosity level to set the logging level as intended. Needed for cli_tests.
+    ./fix-verbosity-level.patch
+    # Disable cli_tests test that requires network access.
+    ./disable-sign-for-notarization-test.patch
+  ];
+
+  cargoHash = "sha256-VrexypkCW58asvzXo3wj/Rgi72tiGuchA31BkEZoYpI=";
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+
+  cargoBuildFlags = [
+    # Only build the binary we want
+    "--bin"
+    "rcodesign"
+  ];
+
+  checkFlags = [
+    # Does network IO
+    "--skip=ticket_lookup::test::lookup_ticket"
+    # These tests require Xcode to be installed
+    "--skip=find_all_platform_directories"
+    "--skip=find_all_sdks"
+  ];
+
+  # Set up uutils-coreutils for cli_tests. Without this, it will be installed with `cargo install`, which will fail
+  # due to the lack of network access in the build environment.
+  preCheck = ''
+    coreutils_dir=''${CARGO_TARGET_DIR:-"$(pwd)/target"}/${stdenv.hostPlatform.rust.cargoShortTarget}/coreutils/bin
+    install -m 755 -d "$coreutils_dir"
+    ln -s '${lib.getExe' uutils-coreutils "uutils-coreutils"}' "$coreutils_dir/coreutils"
+  '';
+
+  meta = with lib; {
+    description = "Cross-platform CLI interface to interact with Apple code signing";
+    mainProgram = "rcodesign";
+    longDescription = ''
+      rcodesign provides various commands to interact with Apple signing,
+      including signing and notarizing binaries, generating signing
+      certificates, and verifying existing signed binaries.
+
+      For more information, refer to the [documentation](https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html).
+    '';
+    homepage = "https://github.com/indygreg/apple-platform-rs";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ euank ];
+  };
+}
diff --git a/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch b/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
new file mode 100644
index 000000000000..892c5c2ae402
--- /dev/null
+++ b/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
@@ -0,0 +1,47 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 3a5dd6d244..787b048829 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2257,6 +2257,12 @@
+ ]
+ 
+ [[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
++[[package]]
+ name = "num-integer"
+ version = "0.1.45"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -3605,12 +3611,13 @@
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.31"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
++ "num-conv",
+  "powerfmt",
+  "serde",
+  "time-core",
+@@ -3625,10 +3632,11 @@
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.16"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+  "time-core",
+ ]
+ 
diff --git a/pkgs/tools/networking/rcon/default.nix b/pkgs/by-name/rc/rcon/package.nix
similarity index 100%
rename from pkgs/tools/networking/rcon/default.nix
rename to pkgs/by-name/rc/rcon/package.nix
diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/by-name/rc/rconc/package.nix
similarity index 100%
rename from pkgs/tools/networking/rconc/default.nix
rename to pkgs/by-name/rc/rconc/package.nix
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/by-name/rc/rcs/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rcs/default.nix
rename to pkgs/by-name/rc/rcs/package.nix
diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/by-name/rc/rcshist/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rcshist/default.nix
rename to pkgs/by-name/rc/rcshist/package.nix
diff --git a/pkgs/tools/networking/rdap/default.nix b/pkgs/by-name/rd/rdap/package.nix
similarity index 100%
rename from pkgs/tools/networking/rdap/default.nix
rename to pkgs/by-name/rd/rdap/package.nix
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/by-name/rd/rdesktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/rdesktop/default.nix
rename to pkgs/by-name/rd/rdesktop/package.nix
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/by-name/rd/rdfind/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rdfind/default.nix
rename to pkgs/by-name/rd/rdfind/package.nix
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/by-name/rd/rdiff-backup/package.nix
similarity index 100%
rename from pkgs/tools/backup/rdiff-backup/default.nix
rename to pkgs/by-name/rd/rdiff-backup/package.nix
diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix
new file mode 100644
index 000000000000..bc0983599b36
--- /dev/null
+++ b/pkgs/by-name/rd/rdkafka/package.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which, curl }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rdkafka";
+  version = "2.6.0";
+
+  src = fetchFromGitHub {
+    owner = "confluentinc";
+    repo = "librdkafka";
+    rev = "refs/tags/v${finalAttrs.version}";
+    sha256 = "sha256-QjmVu9d/wlLjt5WWyZi+WEWibfDUynHGvTwLbH36T84=";
+  };
+
+  nativeBuildInputs = [ pkg-config python3 which ];
+
+  buildInputs = [ zlib zstd openssl curl ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "librdkafka - Apache Kafka C/C++ client library";
+    homepage = "https://github.com/confluentinc/librdkafka";
+    license = licenses.bsd2;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ commandodev ];
+  };
+})
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/by-name/rd/rdma-core/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rdma-core/default.nix
rename to pkgs/by-name/rd/rdma-core/package.nix
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/by-name/rd/rdocker/package.nix
similarity index 100%
rename from pkgs/development/tools/rdocker/default.nix
rename to pkgs/by-name/rd/rdocker/package.nix
diff --git a/pkgs/tools/networking/rdrview/default.nix b/pkgs/by-name/rd/rdrview/package.nix
similarity index 100%
rename from pkgs/tools/networking/rdrview/default.nix
rename to pkgs/by-name/rd/rdrview/package.nix
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/by-name/rd/rdup/package.nix
similarity index 100%
rename from pkgs/tools/backup/rdup/default.nix
rename to pkgs/by-name/rd/rdup/package.nix
diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/by-name/re/re-flex/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/re-flex/default.nix
rename to pkgs/by-name/re/re-flex/package.nix
diff --git a/pkgs/applications/search/re-isearch/default.nix b/pkgs/by-name/re/re-isearch/package.nix
similarity index 100%
rename from pkgs/applications/search/re-isearch/default.nix
rename to pkgs/by-name/re/re-isearch/package.nix
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/by-name/re/re2/package.nix
similarity index 100%
rename from pkgs/development/libraries/re2/default.nix
rename to pkgs/by-name/re/re2/package.nix
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/by-name/re/re2c/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/re2c/default.nix
rename to pkgs/by-name/re/re2c/package.nix
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/by-name/re/react-native-debugger/package.nix
similarity index 100%
rename from pkgs/development/tools/react-native-debugger/default.nix
rename to pkgs/by-name/re/react-native-debugger/package.nix
diff --git a/pkgs/development/tools/react-static/package.json b/pkgs/by-name/re/react-static/package.json
similarity index 100%
rename from pkgs/development/tools/react-static/package.json
rename to pkgs/by-name/re/react-static/package.json
diff --git a/pkgs/development/tools/react-static/default.nix b/pkgs/by-name/re/react-static/package.nix
similarity index 100%
rename from pkgs/development/tools/react-static/default.nix
rename to pkgs/by-name/re/react-static/package.nix
diff --git a/pkgs/os-specific/linux/read-edid/fno-common.patch b/pkgs/by-name/re/read-edid/fno-common.patch
similarity index 100%
rename from pkgs/os-specific/linux/read-edid/fno-common.patch
rename to pkgs/by-name/re/read-edid/fno-common.patch
diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/by-name/re/read-edid/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/read-edid/default.nix
rename to pkgs/by-name/re/read-edid/package.nix
diff --git a/pkgs/tools/text/readability-cli/default.nix b/pkgs/by-name/re/readability-cli/package.nix
similarity index 100%
rename from pkgs/tools/text/readability-cli/default.nix
rename to pkgs/by-name/re/readability-cli/package.nix
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/by-name/re/readosm/package.nix
similarity index 100%
rename from pkgs/development/libraries/readosm/default.nix
rename to pkgs/by-name/re/readosm/package.nix
diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/by-name/re/readstat/package.nix
similarity index 100%
rename from pkgs/applications/science/math/readstat/default.nix
rename to pkgs/by-name/re/readstat/package.nix
diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/by-name/re/real_time_config_quick_scan/package.nix
similarity index 100%
rename from pkgs/applications/audio/real_time_config_quick_scan/default.nix
rename to pkgs/by-name/re/real_time_config_quick_scan/package.nix
diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch b/pkgs/by-name/re/realesrgan-ncnn-vulkan/cmakelists.patch
similarity index 100%
rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch
rename to pkgs/by-name/re/realesrgan-ncnn-vulkan/cmakelists.patch
diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch b/pkgs/by-name/re/realesrgan-ncnn-vulkan/models_path.patch
similarity index 100%
rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch
rename to pkgs/by-name/re/realesrgan-ncnn-vulkan/models_path.patch
diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
similarity index 100%
rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix
rename to pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
diff --git a/pkgs/os-specific/linux/reap/default.nix b/pkgs/by-name/re/reap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/reap/default.nix
rename to pkgs/by-name/re/reap/package.nix
diff --git a/pkgs/applications/science/misc/reason-shell/default.nix b/pkgs/by-name/re/reason-shell/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/reason-shell/default.nix
rename to pkgs/by-name/re/reason-shell/package.nix
diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/by-name/re/reaverwps-t6x/package.nix
similarity index 100%
rename from pkgs/tools/networking/reaver-wps-t6x/default.nix
rename to pkgs/by-name/re/reaverwps-t6x/package.nix
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/by-name/re/reaverwps/package.nix
similarity index 100%
rename from pkgs/tools/networking/reaver-wps/default.nix
rename to pkgs/by-name/re/reaverwps/package.nix
diff --git a/pkgs/tools/networking/reaver-wps/parallel-build.patch b/pkgs/by-name/re/reaverwps/parallel-build.patch
similarity index 100%
rename from pkgs/tools/networking/reaver-wps/parallel-build.patch
rename to pkgs/by-name/re/reaverwps/parallel-build.patch
diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/by-name/re/recapp/package.nix
similarity index 100%
rename from pkgs/applications/video/recapp/default.nix
rename to pkgs/by-name/re/recapp/package.nix
diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/by-name/re/recastnavigation/package.nix
similarity index 100%
rename from pkgs/development/libraries/recastnavigation/default.nix
rename to pkgs/by-name/re/recastnavigation/package.nix
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/by-name/re/recode/package.nix
similarity index 100%
rename from pkgs/tools/text/recode/default.nix
rename to pkgs/by-name/re/recode/package.nix
diff --git a/pkgs/by-name/re/recordbox/Cargo.lock b/pkgs/by-name/re/recordbox/Cargo.lock
new file mode 100644
index 000000000000..164c6efadf6f
--- /dev/null
+++ b/pkgs/by-name/re/recordbox/Cargo.lock
@@ -0,0 +1,2900 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ashpd"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
+dependencies = [
+ "async-fs",
+ "async-net",
+ "enumflags2",
+ "futures-channel",
+ "futures-util",
+ "rand",
+ "serde",
+ "serde_repr",
+ "url",
+ "zbus",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-net"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
+dependencies = [
+ "async-io",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "atomic_refcell"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytemuck"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cairo-rs"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7fa699e1d7ae691001a811dda5ef0e3e42e1d4119b26426352989df9e94e3e6"
+dependencies = [
+ "bitflags 2.6.0",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f57c4b4da2a9d619dd035f27316d7a426305b75be93d09e92f2b9229c34feaf"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+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 = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "color-thief"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6460d760cf38ce67c9e0318f896538820acc54f2d0a3bfc5b2c557211066c98"
+dependencies = [
+ "rgb",
+]
+
+[[package]]
+name = "common-path"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[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.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "file-id"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "flexi_logger"
+version = "0.29.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26948e37cfcb1f2c2cd38e0602d3a8ab6b9472c0c6eff4516fc8def9a3124d7"
+dependencies = [
+ "chrono",
+ "log",
+ "nu-ansi-term",
+ "regex",
+ "thiserror",
+]
+
+[[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 = "formatx"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db0f0c49aba98a3b2578315766960bd242885ff672fd62610c5557cd6c6efe03"
+
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19"
+dependencies = [
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk4"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fb4af2d606b0ac4e81f982f0d064bcb71ca73859ce5f30475f7eb2e2be4bc3"
+dependencies = [
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk4-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk4-sys"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3642625b384ad43c006871462e6c498488b503dbf219542591f4ddf0f5f2032b"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gettext-rs"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a"
+dependencies = [
+ "gettext-sys",
+ "locale_config",
+]
+
+[[package]]
+name = "gettext-sys"
+version = "0.22.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661"
+dependencies = [
+ "cc",
+ "temp-dir",
+]
+
+[[package]]
+name = "gio"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8569975884fdfdbed536b682448fbd8c70bafbd69cac2d45eb1a7a372702241"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys",
+ "glib",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "217f464cad5946ae4369c355155e2d16b488c08920601083cb4891e352ae777b"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "glib"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "358431b0e0eb15b9d02db52e1f19c805b953c5c168099deb3de88beab761768c"
+dependencies = [
+ "bitflags 2.6.0",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d21ca27acfc3e91da70456edde144b4ac7c36f78ee77b10189b3eb4901c156"
+dependencies = [
+ "heck",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5911863ab7ecd4a6f8d5976f12eeba076b23669c49b066d877e742544aa389"
+dependencies = [
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe"
+dependencies = [
+ "glib",
+ "graphene-sys",
+ "libc",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gsk4"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3deb9ae5a7fb759b2405e248d52850d9ef733079b90af2d6b01638f5b9eeafe1"
+dependencies = [
+ "cairo-rs",
+ "gdk4",
+ "glib",
+ "graphene-rs",
+ "gsk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gsk4-sys"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2226662e97948f3f241c9a6c432cd95eeca662daf4a327e201458bb540ad9590"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk4-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "680006694e79692f831ca4f3ba6e147b8c23db289b2df1d33a4a97fd038145d7"
+dependencies = [
+ "cfg-if",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "glib",
+ "gstreamer-sys",
+ "itertools",
+ "libc",
+ "muldiv",
+ "num-integer",
+ "num-rational",
+ "once_cell",
+ "option-operations",
+ "paste",
+ "pin-project-lite",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "gstreamer-audio"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36d39b07213f83055fc705a384fa32ad581776b8e5b04c86f3a419ec5dfc0f81"
+dependencies = [
+ "cfg-if",
+ "glib",
+ "gstreamer",
+ "gstreamer-audio-sys",
+ "gstreamer-base",
+ "libc",
+ "once_cell",
+ "smallvec",
+]
+
+[[package]]
+name = "gstreamer-audio-sys"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "980a205553927ec2167ad79b80819df79c3683632abefbe255baffe1b4112044"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "gstreamer-base-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-base"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a11df90e3abf1d9747111c41902338fc1bd13b1c23b27fb828d43e57bd190134"
+dependencies = [
+ "atomic_refcell",
+ "cfg-if",
+ "glib",
+ "gstreamer",
+ "gstreamer-base-sys",
+ "libc",
+]
+
+[[package]]
+name = "gstreamer-base-sys"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d691b2bb51a9e5727fb33c3b53fb64ee5b80c40cbbd250941a6d44b142f7a6a0"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-sys"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db89964774a97d5b092e2d124debc6bbcaf34b5c7cdef1759f4a9e1e3f8326ef"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk4"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34465497f5a4c182c9c94a582a187db7d6af0863f28e87ccf4379f21f0e2a22"
+dependencies = [
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gtk4-macros"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7c518d5dd41c57385c7cd30af52e261820c897fc1144e558bb88c303d048ae2"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "gtk4-sys"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f11c7812e28542edb4d0495a2fde1f4588899e2accfcebaa80115f27dc7358a3"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+
+[[package]]
+name = "hashlink"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+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.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+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",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.1",
+]
+
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "intersection"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "133d3551b09a5131c0ffc31eaefdafdd58b1cdd272f7d1bab4db623c245a266c"
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "json"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
+
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libadwaita"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247"
+dependencies = [
+ "gdk4",
+ "gio",
+ "glib",
+ "gtk4",
+ "libadwaita-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "libadwaita-sys"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b099a223560118d4d4fa04b6d23f3ea5b7171fe1d83dfb7e6b45b54cdfc83af9"
+dependencies = [
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
+dependencies = [
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
+[[package]]
+name = "locale_config"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
+dependencies = [
+ "lazy_static",
+ "objc",
+ "objc-foundation",
+ "regex",
+ "winapi",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "lofty"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8bc4717ff10833a623b009e9254ae8667c7a59edc3cfb01c37aeeef4b6d54a7"
+dependencies = [
+ "byteorder",
+ "data-encoding",
+ "flate2",
+ "lofty_attr",
+ "log",
+ "ogg_pager",
+ "paste",
+]
+
+[[package]]
+name = "lofty_attr"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28bd4b9d8a5af74808932492521cdd272019b056f75fcc70056bd2c09fceb550"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "mpris-server"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae"
+dependencies = [
+ "async-channel",
+ "futures-channel",
+ "serde",
+ "trait-variant",
+ "zbus",
+]
+
+[[package]]
+name = "muldiv"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.6.0",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "notify-debouncer-full"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e"
+dependencies = [
+ "crossbeam-channel",
+ "file-id",
+ "log",
+ "notify",
+ "parking_lot",
+ "walkdir",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
+[[package]]
+name = "ogg_pager"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87b0bef808533c5890ab77279538212efdbbbd9aa4ef1ccdfcfbf77a42f7e6fa"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "option-operations"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
+dependencies = [
+ "paste",
+]
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "pango"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356"
+dependencies = [
+ "gio",
+ "glib",
+ "libc",
+ "pango-sys",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "polling"
+version = "3.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "recordbox"
+version = "0.8.3"
+dependencies = [
+ "ashpd",
+ "async-channel",
+ "async-lock",
+ "color-thief",
+ "common-path",
+ "flexi_logger",
+ "formatx",
+ "futures",
+ "gettext-rs",
+ "gstreamer",
+ "gstreamer-audio",
+ "gstreamer-base",
+ "gtk4",
+ "intersection",
+ "json",
+ "lazy_static",
+ "libadwaita",
+ "lofty",
+ "log",
+ "mime_guess",
+ "mpris-server",
+ "notify-debouncer-full",
+ "rand",
+ "rusqlite",
+ "rusqlite_migration",
+ "search-provider",
+ "similar",
+ "walkdir",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rgb"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "rusqlite"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
+dependencies = [
+ "bitflags 2.6.0",
+ "fallible-iterator",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
+[[package]]
+name = "rusqlite_migration"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "923b42e802f7dc20a0a6b5e097ba7c83fe4289da07e49156fecf6af08aa9cd1c"
+dependencies = [
+ "log",
+ "rusqlite",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "search-provider"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8de586207b4f0b88883d27791ea2e8663900fdc78bffb36660bd1eb79f129ba"
+dependencies = [
+ "futures-channel",
+ "futures-util",
+ "serde",
+ "zbus",
+]
+
+[[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.214"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.214"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "similar"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "2.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
+dependencies = [
+ "cfg-expr",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "temp-dir"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72"
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "trait-variant"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicase"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "url"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[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.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+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.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "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]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[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 = "xdg-home"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[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",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[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",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "url",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
new file mode 100644
index 000000000000..57b68097a0ee
--- /dev/null
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -0,0 +1,110 @@
+{
+  lib,
+  stdenv,
+  appstream-glib,
+  blueprint-compiler,
+  cargo,
+  desktop-file-utils,
+  fetchFromGitea,
+  glib,
+  gst_all_1,
+  gtk4,
+  hicolor-icon-theme,
+  libadwaita,
+  libxml2,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  sqlite,
+  wrapGAppsHook4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "recordbox";
+  version = "0.8.3";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "edestcroix";
+    repo = "Recordbox";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-/yg/75LswCj3HhsUhMXgIDpx2tlNkdTuImkqMwU6uio=";
+  };
+
+  # Patch in our Cargo.lock and ensure AppStream tests don't use the network
+  # TODO: Switch back to the default `validate` when the upstream file actually
+  # passes it
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+
+    substituteInPlace data/meson.build \
+      --replace-fail "['validate', appstream_file]" "['validate-relax', '--nonet', appstream_file]"
+  '';
+
+  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    appstream-glib # For `appstream-util`
+    blueprint-compiler
+    cargo
+    desktop-file-utils # For `desktop-file-validate`
+    glib # For `glib-compile-schemas`
+    gtk4 # For `gtk-update-icon-cache`
+    libxml2 # For `xmllint`
+    meson
+    ninja
+    pkg-config
+    rustPlatform.cargoCheckHook
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs =
+    [
+      gtk4
+      hicolor-icon-theme
+      libadwaita
+      sqlite
+    ]
+    ++ (with gst_all_1; [
+      gst-plugins-bad
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-rs
+      gst-plugins-ugly
+      gstreamer
+    ]);
+
+  mesonBuildType = "release";
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
+
+  checkPhase = ''
+    runHook preCheck
+
+    mesonCheckPhase
+    cargoCheckHook
+
+    runHook postCheck
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Relatively simple music player";
+    homepage = "https://codeberg.org/edestcroix/Recordbox";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "recordbox";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/by-name/re/recoverjpeg/package.nix
similarity index 100%
rename from pkgs/tools/misc/recoverjpeg/default.nix
rename to pkgs/by-name/re/recoverjpeg/package.nix
diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/by-name/re/recursive/package.nix
similarity index 100%
rename from pkgs/data/fonts/recursive/default.nix
rename to pkgs/by-name/re/recursive/package.nix
diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix
index e96375f6a0a4..61f6f60def04 100644
--- a/pkgs/by-name/re/recutils/package.nix
+++ b/pkgs/by-name/re/recutils/package.nix
@@ -4,6 +4,16 @@
 , bc
 , check
 , curl
+
+, withEncryption ? true
+, libgcrypt
+, libgpg-error
+
+, withUuid ? true
+, libuuid
+
+, withBashBuiltins ? true
+, bash
 }:
 
 stdenv.mkDerivation rec {
@@ -17,8 +27,20 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = lib.optional stdenv.cc.isClang "format";
 
+  configureFlags =
+    lib.optionals withBashBuiltins [
+      "--with-bash-headers=${bash.dev}/include/bash"
+    ];
+
   buildInputs = [
     curl
+  ] ++ lib.optionals withEncryption [
+    libgpg-error.dev
+    libgcrypt.dev
+  ] ++ lib.optionals withUuid [
+    libuuid
+  ] ++ lib.optionals withBashBuiltins [
+    bash.dev
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/by-name/re/red/package.nix
similarity index 100%
rename from pkgs/development/interpreters/red/default.nix
rename to pkgs/by-name/re/red/package.nix
diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix
new file mode 100644
index 000000000000..d922ce7e26c1
--- /dev/null
+++ b/pkgs/by-name/re/redact/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchurl,
+  appimageTools,
+  makeWrapper,
+  writeScript,
+}:
+let
+  pname = "redact";
+  version = "0.18.0";
+  src = fetchurl {
+    url = "https://update-desktop.redact.dev/build/Redact-${version}.AppImage";
+    hash = "sha256-qqqf8BAwXEKgZwl6vsPw/0S+qItz5ZqB59DJkW9q1xc=";
+  };
+  appimageContents = appimageTools.extractType2 { inherit pname src version; };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  extraInstallCommands = ''
+    wrapProgram $out/bin/${pname} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
+    install -Dm444 ${appimageContents}/redact.desktop -t $out/share/applications
+    install -Dm444 ${appimageContents}/redact.png -t $out/share/icons/hicolor/512x512/apps/redact.png
+    substituteInPlace $out/share/applications/redact.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+  '';
+
+  passthru.updateScript =
+    writeScript "update.sh"
+      /**
+        Scraping the Windows URL for version is intentional, since
+        the download link for Linux on redact.dev points to an older version,
+        even though the Cloudflare bucket contains the latest Linux version.
+      */
+      ''
+        #!/usr/bin/env nix-shell
+        #!nix-shell -i bash -p curl coreutils gnused common-updater-scripts
+        set -eu -o pipefail
+        url="$(curl -ILs -w %{url_effective} -o /dev/null https://download.redact.dev/windows)"
+        version="$(echo $url | sed -n 's/.*Redact-Setup-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')"
+        currentVersion=$(nix-instantiate --eval -E "with import ./. {}; redact.version or (lib.getVersion redact)" | tr -d '"')
+        if [[ "$version" != "$currentVersion" ]]; then
+          hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")")
+          update-source-version redact "$version" "$hash" --print-changes
+        fi
+      '';
+
+  meta = {
+    description = "The only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place.";
+    homepage = "https://redact.dev/";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ reputable2772 ];
+    mainProgram = "redact";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/by-name/re/redeclipse/package.nix
similarity index 100%
rename from pkgs/games/redeclipse/default.nix
rename to pkgs/by-name/re/redeclipse/package.nix
diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/by-name/re/redfang/package.nix
similarity index 100%
rename from pkgs/tools/networking/redfang/default.nix
rename to pkgs/by-name/re/redfang/package.nix
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/by-name/re/redhat-official-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/redhat-official/default.nix
rename to pkgs/by-name/re/redhat-official-fonts/package.nix
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/by-name/re/redir/package.nix
similarity index 100%
rename from pkgs/tools/networking/redir/default.nix
rename to pkgs/by-name/re/redir/package.nix
diff --git a/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/pkgs/by-name/re/redis-plus-plus/0001-Fix-pkg-config-paths.patch
similarity index 100%
rename from pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch
rename to pkgs/by-name/re/redis-plus-plus/0001-Fix-pkg-config-paths.patch
diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
similarity index 100%
rename from pkgs/development/libraries/redis-plus-plus/default.nix
rename to pkgs/by-name/re/redis-plus-plus/package.nix
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
new file mode 100644
index 000000000000..b39d9258ae64
--- /dev/null
+++ b/pkgs/by-name/re/redis/package.nix
@@ -0,0 +1,99 @@
+{ lib, stdenv, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests
+, tcl, which, ps, getconf
+, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
+# dependency ordering is broken at the moment when building with openssl
+, tlsSupport ? !stdenv.hostPlatform.isStatic, openssl
+
+# Using system jemalloc fixes cross-compilation and various setups.
+# However the experimental 'active defragmentation' feature of redis requires
+# their custom patched version of jemalloc.
+, useSystemJemalloc ? true
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "redis";
+  version = "7.2.6";
+
+  src = fetchurl {
+    url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz";
+    hash = "sha256-+xDWei/itFVvbLhABk3W5uMXXOjKA18HJpkOwtqfPQ4=";
+  };
+
+  patches = [
+    # fixes: make test [exception]: Executing test client: permission denied
+    # https://github.com/redis/redis/issues/12792
+    (fetchpatch {
+      url = "https://github.com/redis/redis/pull/12887.diff";
+      hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8=";
+    })
+  ] ++ lib.optionals useSystemJemalloc [
+    # use system jemalloc
+    (fetchurl {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch";
+      hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM=";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ lua ]
+    ++ lib.optional useSystemJemalloc jemalloc
+    ++ lib.optional withSystemd systemd
+    ++ lib.optionals tlsSupport [ openssl ];
+
+  preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/Makefile --replace "-flto" ""
+  '';
+
+  # More cross-compiling fixes.
+  makeFlags = [ "PREFIX=${placeholder "out"}" ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]
+    ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
+    ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
+
+  enableParallelBuilding = true;
+
+  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
+
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
+
+  # darwin currently lacks a pure `pgrep` which is extensively used here
+  doCheck = !stdenv.hostPlatform.isDarwin;
+  nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
+  checkPhase = ''
+    runHook preCheck
+
+    # disable test "Connect multiple replicas at the same time": even
+    # upstream find this test too timing-sensitive
+    substituteInPlace tests/integration/replication.tcl \
+      --replace 'foreach mdl {no yes}' 'foreach mdl {}'
+
+    substituteInPlace tests/support/server.tcl \
+      --replace 'exec /usr/bin/env' 'exec env'
+
+    sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
+      tests/support/util.tcl
+
+    ./runtest \
+      --no-latency \
+      --timeout 2000 \
+      --clients $NIX_BUILD_CORES \
+      --tags -leaks \
+      --skipunit integration/failover # flaky and slow
+
+    runHook postCheck
+  '';
+
+  passthru.tests.redis = nixosTests.redis;
+  passthru.serverBin = "redis-server";
+
+  meta = with lib; {
+    homepage = "https://redis.io";
+    description = "Open source, advanced key-value store";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    changelog = "https://github.com/redis/redis/raw/${finalAttrs.version}/00-RELEASENOTES";
+    maintainers = with maintainers; [ berdario globin ];
+    mainProgram = "redis-cli";
+  };
+})
diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/by-name/re/redisinsight/package.nix
similarity index 100%
rename from pkgs/development/tools/redisinsight/default.nix
rename to pkgs/by-name/re/redisinsight/package.nix
diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/by-name/re/redli/package.nix
similarity index 100%
rename from pkgs/tools/networking/redli/default.nix
rename to pkgs/by-name/re/redli/package.nix
diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile
index 732a5d669712..6179281ca355 100644
--- a/pkgs/by-name/re/redmine/Gemfile
+++ b/pkgs/by-name/re/redmine/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '>= 2.7.0', '< 3.3.0'
 
-gem 'rails', '6.1.7.8'
+gem 'rails', '6.1.7.10'
 gem 'rouge', '~> 4.2.0'
 gem 'request_store', '~> 1.5.0'
 gem 'mini_mime', '~> 1.1.0'
diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock
index fe895ddd26e7..67a9b7575dc5 100644
--- a/pkgs/by-name/re/redmine/Gemfile.lock
+++ b/pkgs/by-name/re/redmine/Gemfile.lock
@@ -1,28 +1,28 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailer (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionpack (6.1.7.10)
+      actionview (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -30,34 +30,34 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (6.1.7.10)
+      activesupport (= 6.1.7.10)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (6.1.7.10)
+      activesupport (= 6.1.7.10)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (6.1.7.10)
+      activesupport (= 6.1.7.10)
+    activerecord (6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+    activestorage (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -79,15 +79,15 @@ GEM
       xpath (~> 3.2)
     chunky_png (1.4.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     crass (1.0.6)
-    css_parser (1.17.1)
+    css_parser (1.19.1)
       addressable
     csv (3.2.9)
-    date (3.3.4)
+    date (3.4.0)
     deckar01-task_list (2.3.2)
       html-pipeline
-    docile (1.4.0)
+    docile (1.4.1)
     erubi (1.13.0)
     ffi (1.17.0)
     globalid (1.2.1)
@@ -96,15 +96,15 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlentities (4.3.4)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.7.5)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
-    loofah (2.22.0)
+    logger (1.6.1)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -118,8 +118,8 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    mocha (2.4.0)
+    minitest (5.25.1)
+    mocha (2.5.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
     net-imap (0.3.7)
@@ -132,36 +132,36 @@ GEM
       timeout
     net-smtp (0.3.4)
       net-protocol
-    nio4r (2.7.3)
+    nio4r (2.7.4)
     nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
-    public_suffix (6.0.0)
-    puma (6.4.2)
+    pg (1.5.9)
+    public_suffix (6.0.1)
+    puma (6.4.3)
       nio4r (~> 2.0)
-    racc (1.8.0)
-    rack (2.2.9)
+    racc (1.8.1)
+    rack (2.2.10)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (6.1.7.10)
+      actioncable (= 6.1.7.10)
+      actionmailbox (= 6.1.7.10)
+      actionmailer (= 6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actiontext (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
+      railties (= 6.1.7.10)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
@@ -170,9 +170,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    railties (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -189,8 +189,7 @@ GEM
     regexp_parser (2.9.2)
     request_store (1.5.1)
       rack (>= 1.4)
-    rexml (3.3.1)
-      strscan
+    rexml (3.3.9)
     roadie (5.2.1)
       css_parser (~> 1.4)
       nokogiri (~> 1.15)
@@ -214,7 +213,7 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -227,10 +226,10 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sanitize (6.1.1)
+    sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    selenium-webdriver (4.22.0)
+    selenium-webdriver (4.26.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -240,24 +239,23 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.1)
+    sprockets-rails (3.5.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
-    strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    unicode-display_width (2.6.0)
+    webrick (1.9.0)
     websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -267,8 +265,8 @@ GEM
       zeitwerk (>= 2.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.36)
-    zeitwerk (2.6.16)
+    yard (0.9.37)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -297,7 +295,7 @@ DEPENDENCIES
   nokogiri (~> 1.15.2)
   pg (~> 1.5.3)
   puma
-  rails (= 6.1.7.8)
+  rails (= 6.1.7.10)
   rails-dom-testing
   rbpdf (~> 1.21.3)
   redcarpet (~> 3.6.0)
@@ -321,7 +319,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 3.1.5p252
+   ruby 3.1.6p260
 
 BUNDLED WITH
    2.5.9
diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix
index 720e7d7fa731..3f51758eb333 100644
--- a/pkgs/by-name/re/redmine/gemset.nix
+++ b/pkgs/by-name/re/redmine/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gxw5sxfj6i9q68yv0aq8jn0rzfypqbsidvj8pin8i7kpd636f9d";
+      sha256 = "0a2rn3ygh50d7p29zvd0yfcd0q7kf4c2n2kf1kjgxf3qlyi5036h";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   actionmailbox = {
     dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@@ -16,10 +16,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02ffqgzvlx4gjmxs474q5xfvl4c5ykdgj0y9whkrm0si6xpzajn0";
+      sha256 = "19f6kc470ahwmnrpc302wdkw8c6yw15q442g6cq4wccmkdarflz9";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   actionmailer = {
     dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@@ -27,10 +27,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0icpi06ibsi9xmcy2p0c33wh8p7rl2j26r6rmbhknp9jw3rlga9s";
+      sha256 = "1nyzqnl6wz7qxynbwwra7vlajm6hi5swfk52zrp6x1c62zj4blrd";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -38,10 +38,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1plks83m7pbvxg8dp7aw8706kv5rxsxgpmcxdzwz57gsqkirvc7w";
+      sha256 = "0vnmynck11qwzzza8knx63a8djsrz0f2cibdnk463nr19ghjdmbx";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   actionpack-xml_parser = {
     dependencies = ["actionpack" "railties"];
@@ -60,10 +60,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ki290ng0xkbjhr5sgrd98p4ysvbjdgxv4aqrafabcs0axgfibkx";
+      sha256 = "1r2bdsbm6zl85fy9kaqspq34cfh4da69hxag5ahbncq5cicdvpn0";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -71,10 +71,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16diw7arrvrxlk04c6h46qzyyikl1jf18z5sgixvcqzz8sfqp7g0";
+      sha256 = "1hmw0ymn4f0x4yxb1wrbycjan0z72x1wgq9g9ljfmv3fd66a7dr3";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   activejob = {
     dependencies = ["activesupport" "globalid"];
@@ -82,10 +82,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06r93sgvbyqlv6sjy97qqlpa671lni4cvb5gd208m6215xk7ds71";
+      sha256 = "1k0nmq5djwmhk61px5749x9i9m5cginz6z4kzz6ncifhmrc0q47i";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   activemodel = {
     dependencies = ["activesupport"];
@@ -93,10 +93,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13562p4p9wra5k07jxi9g1v0l0plkkavr0z5jr1iznf7yizms8nq";
+      sha256 = "132bbnhkax3fqxx26yswrr60fgizn506bkf7gr1m1x4p0lfrnban";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   activerecord = {
     dependencies = ["activemodel" "activesupport"];
@@ -104,10 +104,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x0nym941dhgh5q5p293y2jk2b4baxmcgs6xkc5vrsqf164jmq9p";
+      sha256 = "06mkkxbcqsyahmqc775niyc8bfbxvashy7davjx3fm1s8kpij5yv";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   activestorage = {
     dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@@ -115,10 +115,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i6vr1vng0pdb1dy8g1yvsfi90ji4bw02d06i6jyfvy9jb66amh7";
+      sha256 = "1p6l6nk7krnvn7gz15v40w3m71d9avf5sw1n38xl2r95s3zy4fjv";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -126,10 +126,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09krayvf764y868qm0sy0ssmcjx5a7iksnbi7zx284jjggc574ry";
+      sha256 = "0w6l6fzi4nin364hfr5qbjrr70mgf3phk9cvjmjzgyvvg9w1z3iz";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -208,10 +208,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
+      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
       type = "gem";
     };
-    version = "1.3.3";
+    version = "1.3.4";
   };
   crass = {
     groups = ["default"];
@@ -229,10 +229,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rhqn05w27w2mjrf0a6ppb4fxpxbfvyhwgdxa8z886jr4qnhywzb";
+      sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r";
       type = "gem";
     };
-    version = "1.17.1";
+    version = "1.19.1";
   };
   csv = {
     groups = ["default"];
@@ -249,10 +249,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
+      sha256 = "04d7l3xdmkybrd20gayf8s38pgfld0hf8m726lz9np32xnnsszrf";
       type = "gem";
     };
-    version = "3.3.4";
+    version = "3.4.0";
   };
   deckar01-task_list = {
     dependencies = ["html-pipeline"];
@@ -270,10 +270,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
+      sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   erubi = {
     groups = ["default"];
@@ -343,20 +343,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
+      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
       type = "gem";
     };
-    version = "1.14.5";
+    version = "1.14.6";
   };
   json = {
     groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
+      sha256 = "0pkcvzvarzs5y87srla1m6rgng8mm7y4gnshlpawddsci3rlhd7b";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.7.5";
   };
   language_server-protocol = {
     groups = ["default" "test"];
@@ -384,10 +384,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa";
+      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   loofah = {
     dependencies = ["crass" "nokogiri"];
@@ -395,10 +395,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh";
+      sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h";
       type = "gem";
     };
-    version = "2.22.0";
+    version = "2.23.1";
   };
   mail = {
     dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
@@ -484,10 +484,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i";
+      sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
       type = "gem";
     };
-    version = "5.24.1";
+    version = "5.25.1";
   };
   mocha = {
     dependencies = ["ruby2_keywords"];
@@ -495,10 +495,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bzpqxmk8h9pr0m6knryjd0dgmmyg0bwrksp3rqhrdxpaa3ddr6s";
+      sha256 = "05vp9kfz8d8wmclpkc9vj67ic1f7p1d5m2kd7xm4rvz8ci85jlkq";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   mysql2 = {
     groups = ["default"];
@@ -577,10 +577,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
+      sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr";
       type = "gem";
     };
-    version = "2.7.3";
+    version = "2.7.4";
   };
   nokogiri = {
     dependencies = ["mini_portile2" "racc"];
@@ -598,10 +598,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "145bn5q7ysnjj02jdf1x4nc1f0xxrv7ihgz9yr1j7sinmawqkq0j";
+      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
       type = "gem";
     };
-    version = "1.25.1";
+    version = "1.26.3";
   };
   parser = {
     dependencies = ["ast" "racc"];
@@ -609,10 +609,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10ly2wind06nylyqa5724ld2l0l46d3ag4fm04ifjgw7qdlpf94d";
+      sha256 = "0rbc2ggfw9cwscv1f9dl39a85vl5gysy7sprfagxlanxp01l8k5p";
       type = "gem";
     };
-    version = "3.3.4.0";
+    version = "3.3.5.1";
   };
   pg = {
     groups = ["default"];
@@ -627,20 +627,20 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb";
+      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
       type = "gem";
     };
-    version = "1.5.6";
+    version = "1.5.9";
   };
   public_suffix = {
     groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
+      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
       type = "gem";
     };
-    version = "6.0.0";
+    version = "6.0.1";
   };
   puma = {
     dependencies = ["nio4r"];
@@ -648,30 +648,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y";
+      sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
       type = "gem";
     };
-    version = "6.4.2";
+    version = "6.4.3";
   };
   racc = {
     groups = ["common_mark" "default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
+      sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.8.1";
   };
   rack = {
     groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx";
+      sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
       type = "gem";
     };
-    version = "2.2.9";
+    version = "2.2.10";
   };
   rack-test = {
     dependencies = ["rack"];
@@ -690,10 +690,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cj4sr7fw01ycfkqmpz6zr90zyfxl8yw9s6m0df47a71m56hjb21";
+      sha256 = "1lc8j6b4nvsxa5m86nxw4ydv3h21xw1m5rk0n43i9zlixjrr55l0";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   rails-dom-testing = {
     dependencies = ["activesupport" "minitest" "nokogiri"];
@@ -723,10 +723,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04k6y7balxm5d1sq53rb613lm1bwxmmzavmxg1h9z6dnds2djylb";
+      sha256 = "02szdqfif0s34k2lwfj9pm06m2h6dkhc5ni021s2q5val4c7lvny";
       type = "gem";
     };
-    version = "6.1.7.8";
+    version = "6.1.7.10";
   };
   rainbow = {
     groups = ["default" "test"];
@@ -822,15 +822,14 @@
     version = "1.5.1";
   };
   rexml = {
-    dependencies = ["strscan"];
     groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
+      sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.3.9";
   };
   roadie = {
     dependencies = ["css_parser" "nokogiri"];
@@ -912,10 +911,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "063qgvqbyv354icl2sgx758z22wzq38hd9skc3n96sbpv0cdc1qv";
+      sha256 = "0dvmlnmz173xwvcijgmkibga4viwz8xnm36j6lnxp6nik5pphm47";
       type = "gem";
     };
-    version = "1.31.3";
+    version = "1.33.1";
   };
   rubocop-performance = {
     dependencies = ["rubocop" "rubocop-ast"];
@@ -975,10 +974,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qczw46f82f8nam87xdzk17frwfwwqq7km6ma0kwc0nadmi4glgq";
+      sha256 = "0lj1jjxn1znxmaf6jnngfrz26rw85smxb69m4jl6a9yq6gwyab54";
       type = "gem";
     };
-    version = "6.1.1";
+    version = "6.1.3";
   };
   selenium-webdriver = {
     dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"];
@@ -986,10 +985,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rjxlivsh32xvjq78p1m1sr366aa04wms4hwb2r187ygrnmp0hv4";
+      sha256 = "1406irn0zgxasqha9l64w7h2kjxivys7hagdlnk40n8fwpzjc15v";
       type = "gem";
     };
-    version = "4.22.0";
+    version = "4.26.0";
   };
   simplecov = {
     dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
@@ -1007,10 +1006,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb";
+      sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
       type = "gem";
     };
-    version = "0.12.3";
+    version = "0.13.1";
   };
   simplecov_json_formatter = {
     groups = ["default" "test"];
@@ -1039,10 +1038,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4";
+      sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.5.2";
   };
   sqlite3 = {
     dependencies = ["mini_portile2"];
@@ -1063,25 +1062,15 @@
     };
     version = "1.6.9";
   };
-  strscan = {
-    groups = ["default" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
-      type = "gem";
-    };
-    version = "3.1.0";
-  };
   thor = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
+      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.2";
   };
   timeout = {
     groups = ["default"];
@@ -1109,20 +1098,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+      sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.6.0";
   };
   webrick = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
+      sha256 = "0r79mir4phdmcx0l4yqfwfzdy8vgvrl4ym07585rd2b401bhrrcy";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.9.0";
   };
   websocket = {
     groups = ["default" "test"];
@@ -1182,19 +1171,19 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r0b8w58p7gy06wph1qdjv2p087hfnmhd9jk23vjdj803dn761am";
+      sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6";
       type = "gem";
     };
-    version = "0.9.36";
+    version = "0.9.37";
   };
   zeitwerk = {
     groups = ["common_mark" "default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp";
+      sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx";
       type = "gem";
     };
-    version = "2.6.16";
+    version = "2.6.18";
   };
 }
diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix
index f4b66763daa1..58bdda723b33 100644
--- a/pkgs/by-name/re/redmine/package.nix
+++ b/pkgs/by-name/re/redmine/package.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, bundlerEnv, ruby_3_2, makeWrapper, nixosTests }:
 
 let
-  version = "5.1.3";
+  version = "5.1.4";
   rubyEnv = bundlerEnv {
     name = "redmine-env-${version}";
 
@@ -16,7 +16,7 @@ in
 
     src = fetchurl {
       url = "https://www.redmine.org/releases/redmine-${version}.tar.gz";
-      hash = "sha256-iiIyD9nJQOZZjzrV+3o5MxlchgaO7plLpvzcIsXOy1k=";
+      hash = "sha256-9XONahB/IxuPSwrlQQ4MRXQtdeDvMMSzGifArJ2v1Rw=";
     };
 
     nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/by-name/re/redo-apenwarr/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-apenwarr/default.nix
rename to pkgs/by-name/re/redo-apenwarr/package.nix
diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/by-name/re/redo-c/Makefile
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-c/Makefile
rename to pkgs/by-name/re/redo-c/Makefile
diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/by-name/re/redo-c/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-c/default.nix
rename to pkgs/by-name/re/redo-c/package.nix
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/by-name/re/redo-sh/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-sh/default.nix
rename to pkgs/by-name/re/redo-sh/package.nix
diff --git a/pkgs/development/tools/redoc-cli/default.nix b/pkgs/by-name/re/redoc-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/redoc-cli/default.nix
rename to pkgs/by-name/re/redoc-cli/package.nix
diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/by-name/re/redoflacs/package.nix
similarity index 100%
rename from pkgs/applications/audio/redoflacs/default.nix
rename to pkgs/by-name/re/redoflacs/package.nix
diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/by-name/re/redpanda-client/package.nix
similarity index 100%
rename from pkgs/servers/redpanda/default.nix
rename to pkgs/by-name/re/redpanda-client/package.nix
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/by-name/re/redprl/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/redprl/default.nix
rename to pkgs/by-name/re/redprl/package.nix
diff --git a/pkgs/development/java-modules/redshift_jdbc/default.nix b/pkgs/by-name/re/redshift_jdbc/package.nix
similarity index 100%
rename from pkgs/development/java-modules/redshift_jdbc/default.nix
rename to pkgs/by-name/re/redshift_jdbc/package.nix
diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/by-name/re/redsocks/package.nix
similarity index 100%
rename from pkgs/tools/networking/redsocks/default.nix
rename to pkgs/by-name/re/redsocks/package.nix
diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/by-name/re/redstore/package.nix
similarity index 100%
rename from pkgs/servers/http/redstore/default.nix
rename to pkgs/by-name/re/redstore/package.nix
diff --git a/pkgs/by-name/re/redux/package.nix b/pkgs/by-name/re/redux/package.nix
new file mode 100644
index 000000000000..1ddf62dd2ca2
--- /dev/null
+++ b/pkgs/by-name/re/redux/package.nix
@@ -0,0 +1,77 @@
+{ lib
+, stdenv
+, fetchurl
+, writeScript
+, libX11
+, libXext
+, alsa-lib
+, autoPatchelfHook
+, releasePath ? null
+}:
+
+# To use the full release version (same as renoise):
+# 1) Sign into https://backstage.renoise.com and download the release version to some stable location.
+# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
+# Note: Renoise creates an individual build for each license which screws somewhat with the
+# use of functions like requireFile as the hash will be different for every user.
+
+stdenv.mkDerivation rec {
+  pname = "redux";
+  version = "1.3.5";
+
+  src = if releasePath != null then releasePath
+    else fetchurl {
+      urls = [
+        "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz"
+        "https://files.renoise.com/demo/archive/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz"
+      ];
+      sha256 = "sha256-eznsdLzgdJ7MyWe5WAEg1MHId5VlfyanoZ6+I9nI/0I=";
+    };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    libX11
+    libXext
+    alsa-lib
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    OUTDIR=$out/lib/vst2/RenoiseRedux.vst2
+    mkdir -p $OUTDIR
+    cp -r ./renoise_redux_x86_64/* $OUTDIR
+
+    runHook postInstall
+  '';
+
+
+  passthru.updateScript = writeScript "update-redux" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts
+    set -euo pipefail
+
+    new_version="$(
+      curl 'https://files.renoise.com/demo/' \
+        | htmlq a --text \
+        | grep -E '^Renoise_Redux_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \
+        | grep -Eo '[0-9]+(_[0-9]+)*' \
+        | head -n1 \
+        | tr _ .
+    )"
+    update-source-version redux "$new_version" --system="x86_64-linux"
+  '';
+
+  meta = with lib; {
+    description = "Sample-based instrument, with a powerful phrase sequencer";
+    homepage = "https://www.renoise.com/products/redux";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ mihnea-s ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/tools/security/redwax-tool/default.nix b/pkgs/by-name/re/redwax-tool/package.nix
similarity index 100%
rename from pkgs/tools/security/redwax-tool/default.nix
rename to pkgs/by-name/re/redwax-tool/package.nix
diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/by-name/re/reflex/package.nix
similarity index 100%
rename from pkgs/development/tools/reflex/default.nix
rename to pkgs/by-name/re/reflex/package.nix
diff --git a/pkgs/development/tools/refmt/default.nix b/pkgs/by-name/re/refmt/package.nix
similarity index 100%
rename from pkgs/development/tools/refmt/default.nix
rename to pkgs/by-name/re/refmt/package.nix
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/by-name/re/reftools/package.nix
similarity index 100%
rename from pkgs/development/tools/reftools/default.nix
rename to pkgs/by-name/re/reftools/package.nix
diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/by-name/re/refurb/package.nix
similarity index 100%
rename from pkgs/development/tools/refurb/default.nix
rename to pkgs/by-name/re/refurb/package.nix
diff --git a/pkgs/tools/virtualization/reg/default.nix b/pkgs/by-name/re/reg/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/reg/default.nix
rename to pkgs/by-name/re/reg/package.nix
diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/by-name/re/regclient/package.nix
similarity index 100%
rename from pkgs/development/tools/regclient/default.nix
rename to pkgs/by-name/re/regclient/package.nix
diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/by-name/re/regenkfs/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/regenkfs/default.nix
rename to pkgs/by-name/re/regenkfs/package.nix
diff --git a/pkgs/development/tools/misc/regex-cli/default.nix b/pkgs/by-name/re/regex-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/regex-cli/default.nix
rename to pkgs/by-name/re/regex-cli/package.nix
diff --git a/pkgs/tools/security/regexploit/default.nix b/pkgs/by-name/re/regexploit/package.nix
similarity index 100%
rename from pkgs/tools/security/regexploit/default.nix
rename to pkgs/by-name/re/regexploit/package.nix
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/by-name/re/regextester/package.nix
similarity index 100%
rename from pkgs/applications/misc/regextester/default.nix
rename to pkgs/by-name/re/regextester/package.nix
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/by-name/re/regionset/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/regionset/default.nix
rename to pkgs/by-name/re/regionset/package.nix
diff --git a/pkgs/tools/security/regpg/default.nix b/pkgs/by-name/re/regpg/package.nix
similarity index 100%
rename from pkgs/tools/security/regpg/default.nix
rename to pkgs/by-name/re/regpg/package.nix
diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index a26a00a41d37..ac5405d72fda 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -1,29 +1,27 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, perl
-, perlPackages
-, runtimeShell
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  perl,
+  perlPackages,
+  runtimeShell,
 }:
 
 stdenv.mkDerivation rec {
   pname = "regripper";
-  version = "unstable-2023-07-23";
+  version = "0-unstable-2024-11-02";
 
   src = fetchFromGitHub {
     owner = "keydet89";
     repo = "RegRipper3.0";
-    rev = "cee174fb6f137b14c426e97d17945ddee0d31051";
-    hash = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ=";
+    rev = "89f3cac57e10bce1a79627e6038353e8e8a0c378";
+    hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
   };
 
-  propagatedBuildInputs = [ perl perlPackages.ParseWin32Registry ];
-
-  postPatch = ''
-    substituteInPlace rip.pl rr.pl \
-      --replace \"plugins/\" \"$out/share/regripper/plugins/\" \
-      --replace \"plugins\" \"$out/share/regripper/plugins\"
-  '';
+  propagatedBuildInputs = [
+    perl
+    perlPackages.ParseWin32Registry
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
new file mode 100644
index 000000000000..e971360b64e3
--- /dev/null
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -0,0 +1,64 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, which
+, zip
+, libicns
+, botan3
+, capstone
+, jansson
+, libunistring
+, wxGTK32
+, lua53Packages
+, perlPackages
+, gtk3
+, apple-sdk_11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rehex";
+  version = "0.62.1";
+
+  src = fetchFromGitHub {
+    owner = "solemnwarning";
+    repo = pname;
+    rev = version;
+    hash = "sha256-RlYpg3aon1d25n8K/bbHGVLn5/iOOUSlvjT8U0fp9hA=";
+  };
+
+  nativeBuildInputs = [ pkg-config which zip ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ];
+
+  buildInputs = [ botan3 capstone jansson libunistring wxGTK32 ]
+    ++ (with lua53Packages; [ lua busted ])
+    ++ (with perlPackages; [ perl TemplateToolkit ])
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+    "BOTAN_PKG=botan-3"
+    "CXXSTD=-std=c++20"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ];
+
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Reverse Engineers' Hex Editor";
+    longDescription = ''
+      A cross-platform (Windows, Linux, Mac) hex editor for reverse
+      engineering, and everything else.
+    '';
+    homepage = "https://github.com/solemnwarning/rehex";
+    changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ markus1189 wegank ];
+    platforms = platforms.all;
+    mainProgram = "rehex";
+  };
+}
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
new file mode 100644
index 000000000000..8f552c7834e7
--- /dev/null
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -0,0 +1,43 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, stdenv
+, libiconv
+, darwin
+, nix-update-script
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "reindeer";
+  version = "2024.10.28.00";
+
+  src = fetchFromGitHub {
+    owner = "facebookincubator";
+    repo = "reindeer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1wbw92dZT5SVXgfWMgXd3asHhilVzH4lvqW60hTznVc=";
+  };
+
+  cargoHash = "sha256-OjA0OKotAdRLGRkl8n3Gn2+Z8JVcGjQYHtOszWnnFdM=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs =
+    [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.CoreServices
+    ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules";
+    mainProgram = "reindeer";
+    homepage = "https://github.com/facebookincubator/reindeer";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ nickgerace ];
+  };
+}
+
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/by-name/re/reiser4progs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/reiser4progs/default.nix
rename to pkgs/by-name/re/reiser4progs/package.nix
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/by-name/re/reiserfsprogs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/reiserfsprogs/default.nix
rename to pkgs/by-name/re/reiserfsprogs/package.nix
diff --git a/pkgs/by-name/re/relic/package.nix b/pkgs/by-name/re/relic/package.nix
new file mode 100644
index 000000000000..a191bc3dd7fc
--- /dev/null
+++ b/pkgs/by-name/re/relic/package.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, relic
+}:
+
+buildGoModule rec {
+  pname = "relic";
+  version = "8.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sassoftware";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-jBE23kGrU/q53ZTVoQ9xmeL+rVuSneObbCRqEa/zvpI=";
+  };
+
+  vendorHash = "sha256-x0EqKotZJny+7FtRvdXWUkPpG0jntFGe/IpNzKVL2pI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${version}"
+    "-X=main.commit=${src.rev}"
+  ];
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = relic;
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/sassoftware/relic";
+    description = "Service and a tool for adding digital signatures to operating system packages for Linux and Windows";
+    mainProgram = "relic";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ strager ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/by-name/re/remake/glibc-2.27-glob.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch
rename to pkgs/by-name/re/remake/glibc-2.27-glob.patch
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/by-name/re/remake/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/remake/default.nix
rename to pkgs/by-name/re/remake/package.nix
diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/by-name/re/remarkable-toolchain/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
rename to pkgs/by-name/re/remarkable-toolchain/package.nix
diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/by-name/re/remarkable2-toolchain/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
rename to pkgs/by-name/re/remarkable2-toolchain/package.nix
diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/by-name/re/remkrom/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/remkrom/default.nix
rename to pkgs/by-name/re/remkrom/package.nix
diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/by-name/re/remontoire/package.nix
similarity index 100%
rename from pkgs/applications/misc/remontoire/default.nix
rename to pkgs/by-name/re/remontoire/package.nix
diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/by-name/re/remote-touchpad/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/remote-touchpad/default.nix
rename to pkgs/by-name/re/remote-touchpad/package.nix
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/by-name/re/remotebox/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/remotebox/default.nix
rename to pkgs/by-name/re/remotebox/package.nix
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/by-name/re/rename/package.nix
similarity index 100%
rename from pkgs/tools/misc/rename/default.nix
rename to pkgs/by-name/re/rename/package.nix
diff --git a/pkgs/tools/misc/renameutils/install-exec.patch b/pkgs/by-name/re/renameutils/install-exec.patch
similarity index 100%
rename from pkgs/tools/misc/renameutils/install-exec.patch
rename to pkgs/by-name/re/renameutils/install-exec.patch
diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/by-name/re/renameutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/renameutils/default.nix
rename to pkgs/by-name/re/renameutils/package.nix
diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/by-name/re/renderizer/package.nix
similarity index 100%
rename from pkgs/development/tools/renderizer/default.nix
rename to pkgs/by-name/re/renderizer/package.nix
diff --git a/pkgs/by-name/re/renoise/package.nix b/pkgs/by-name/re/renoise/package.nix
new file mode 100644
index 000000000000..dd350e02249a
--- /dev/null
+++ b/pkgs/by-name/re/renoise/package.nix
@@ -0,0 +1,139 @@
+{ lib
+, stdenv
+, writeScript
+, alsa-lib
+, fetchurl
+, libjack2
+, libX11
+, libXcursor
+, libXext
+, libXinerama
+, libXrandr
+, libXtst
+, mpg123
+, pipewire
+, releasePath ? null
+}:
+
+# To use the full release version:
+# 1) Sign into https://backstage.renoise.com and download the release version to some stable location.
+# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
+# Note: Renoise creates an individual build for each license which screws somewhat with the
+# use of functions like requireFile as the hash will be different for every user.
+let
+  platforms = {
+    x86_64-linux = {
+      archSuffix = "x86_64";
+      hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss=";
+    };
+    aarch64-linux = {
+      archSuffix = "arm64";
+      hash = "sha256-l54FAtT+Rj4Mv3GuOF0/9WuKdJowgbZDZYo7VCh6Flg=";
+    };
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "renoise";
+  version = "3.4.4";
+
+  src = if releasePath != null then
+    releasePath
+  else
+    let
+      platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
+      urlVersion = lib.replaceStrings [ "." ] [ "_" ] version;
+    in fetchurl {
+      urls = [
+        "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"
+        "https://files.renoise.com/demo/archive/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"
+      ];
+      hash = platform.hash;
+    };
+
+  buildInputs = [
+    alsa-lib
+    libjack2
+    libX11
+    libXcursor
+    libXext
+    libXinerama
+    libXrandr
+    libXtst
+    pipewire
+  ];
+
+  installPhase = ''
+    cp -r Resources $out
+
+    mkdir -p $out/lib/
+
+    cp renoise $out/renoise
+
+    for path in ${toString buildInputs}; do
+      ln -s $path/lib/*.so* $out/lib/
+    done
+
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+
+    mkdir $out/bin
+    ln -s $out/renoise $out/bin/renoise
+
+    # Desktop item
+    mkdir -p $out/share/applications
+    cp -r Installer/renoise.desktop $out/share/applications/renoise.desktop
+
+    # Desktop item icons
+    mkdir -p $out/share/icons/hicolor/{48x48,64x64,128x128}/apps
+    cp Installer/renoise-48.png $out/share/icons/hicolor/48x48/apps/renoise.png
+    cp Installer/renoise-64.png $out/share/icons/hicolor/64x64/apps/renoise.png
+    cp Installer/renoise-128.png $out/share/icons/hicolor/128x128/apps/renoise.png
+  '';
+
+  postFixup = ''
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath ${mpg123}/lib:$out/lib \
+      $out/renoise
+
+    for path in $out/AudioPluginServer*; do
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        --set-rpath $out/lib \
+        $path
+    done
+
+    substituteInPlace $out/share/applications/renoise.desktop \
+      --replace Exec=renoise Exec=$out/bin/renoise
+  '';
+
+  passthru.updateScript = writeScript "update-renoise" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts
+    set -euo pipefail
+
+    new_version="$(
+      curl 'https://files.renoise.com/demo/' \
+        | htmlq a --text \
+        | grep -E '^Renoise_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \
+        | grep -Eo '[0-9]+(_[0-9]+)*' \
+        | head -n1 \
+        | tr _ .
+    )"
+    hash_x86_64="$(nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_x86_64.tar.gz")"
+    hash_arm64="$( nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_arm64.tar.gz")"
+    sri_x86_64="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_x86_64")"
+    sri_arm64="$( nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_arm64")"
+    update-source-version renoise "$new_version" "$sri_x86_64" --system="x86_64-linux"  --ignore-same-version
+    update-source-version renoise "$new_version" "$sri_arm64"  --system="aarch64-linux" --ignore-same-version
+  '';
+
+  meta = {
+    description = "Modern tracker-based DAW";
+    homepage = "https://www.renoise.com/";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ uakci ];
+    platforms = lib.attrNames platforms;
+    mainProgram = "renoise";
+  };
+}
diff --git a/pkgs/development/tools/rep/default.nix b/pkgs/by-name/re/rep/package.nix
similarity index 100%
rename from pkgs/development/tools/rep/default.nix
rename to pkgs/by-name/re/rep/package.nix
diff --git a/pkgs/tools/text/repgrep/default.nix b/pkgs/by-name/re/repgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/repgrep/default.nix
rename to pkgs/by-name/re/repgrep/package.nix
diff --git a/pkgs/tools/text/replace/malloc.patch b/pkgs/by-name/re/replace/malloc.patch
similarity index 100%
rename from pkgs/tools/text/replace/malloc.patch
rename to pkgs/by-name/re/replace/malloc.patch
diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/by-name/re/replace/package.nix
similarity index 100%
rename from pkgs/tools/text/replace/default.nix
rename to pkgs/by-name/re/replace/package.nix
diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/by-name/re/replacement/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/replacement/default.nix
rename to pkgs/by-name/re/replacement/package.nix
diff --git a/pkgs/by-name/re/repocheck/package.nix b/pkgs/by-name/re/repocheck/package.nix
new file mode 100644
index 000000000000..846d7770dee5
--- /dev/null
+++ b/pkgs/by-name/re/repocheck/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "repocheck";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "kynikos";
+    repo = "repocheck";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pCz+oAfDFyDeuXumfNzLTXnftM9+IG+lZzWSKtbZ9dg=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  pythonImportsCheck = [ "repocheck" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "Check the status of code repositories under a root directory";
+    mainProgram = "repocheck";
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/applications/version-management/reposurgeon/fix-makefile.patch b/pkgs/by-name/re/reposurgeon/fix-makefile.patch
similarity index 100%
rename from pkgs/applications/version-management/reposurgeon/fix-makefile.patch
rename to pkgs/by-name/re/reposurgeon/fix-makefile.patch
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/by-name/re/reposurgeon/package.nix
similarity index 100%
rename from pkgs/applications/version-management/reposurgeon/default.nix
rename to pkgs/by-name/re/reposurgeon/package.nix
diff --git a/pkgs/tools/package-management/repro-get/default.nix b/pkgs/by-name/re/repro-get/package.nix
similarity index 100%
rename from pkgs/tools/package-management/repro-get/default.nix
rename to pkgs/by-name/re/repro-get/package.nix
diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/by-name/re/reproc/package.nix
similarity index 100%
rename from pkgs/development/libraries/reproc/default.nix
rename to pkgs/by-name/re/reproc/package.nix
diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/by-name/re/repseek/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/repseek/default.nix
rename to pkgs/by-name/re/repseek/package.nix
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/by-name/re/reptyr/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/reptyr/default.nix
rename to pkgs/by-name/re/reptyr/package.nix
diff --git a/pkgs/tools/networking/requestly/default.nix b/pkgs/by-name/re/requestly/package.nix
similarity index 100%
rename from pkgs/tools/networking/requestly/default.nix
rename to pkgs/by-name/re/requestly/package.nix
diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/by-name/re/reredirect/package.nix
similarity index 100%
rename from pkgs/tools/misc/reredirect/default.nix
rename to pkgs/by-name/re/reredirect/package.nix
diff --git a/pkgs/servers/resgate/default.nix b/pkgs/by-name/re/resgate/package.nix
similarity index 100%
rename from pkgs/servers/resgate/default.nix
rename to pkgs/by-name/re/resgate/package.nix
diff --git a/pkgs/development/tools/reshape/default.nix b/pkgs/by-name/re/reshape/package.nix
similarity index 100%
rename from pkgs/development/tools/reshape/default.nix
rename to pkgs/by-name/re/reshape/package.nix
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/by-name/re/resilio-sync/package.nix
similarity index 100%
rename from pkgs/applications/networking/resilio-sync/default.nix
rename to pkgs/by-name/re/resilio-sync/package.nix
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/by-name/re/resolv_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/resolv_wrapper/default.nix
rename to pkgs/by-name/re/resolv_wrapper/package.nix
diff --git a/pkgs/development/tools/resolve-march-native/default.nix b/pkgs/by-name/re/resolve-march-native/package.nix
similarity index 100%
rename from pkgs/development/tools/resolve-march-native/default.nix
rename to pkgs/by-name/re/resolve-march-native/package.nix
diff --git a/pkgs/tools/security/responder/default.nix b/pkgs/by-name/re/responder/package.nix
similarity index 100%
rename from pkgs/tools/security/responder/default.nix
rename to pkgs/by-name/re/responder/package.nix
diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/by-name/re/restic-integrity/package.nix
similarity index 100%
rename from pkgs/applications/backup/restic-integrity/default.nix
rename to pkgs/by-name/re/restic-integrity/package.nix
diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/by-name/re/restish/package.nix
similarity index 100%
rename from pkgs/tools/networking/restish/default.nix
rename to pkgs/by-name/re/restish/package.nix
diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/by-name/re/restool/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/restool/default.nix
rename to pkgs/by-name/re/restool/package.nix
diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/by-name/re/restream/package.nix
similarity index 100%
rename from pkgs/applications/misc/remarkable/restream/default.nix
rename to pkgs/by-name/re/restream/package.nix
diff --git a/pkgs/applications/misc/resumed/default.nix b/pkgs/by-name/re/resumed/package.nix
similarity index 100%
rename from pkgs/applications/misc/resumed/default.nix
rename to pkgs/by-name/re/resumed/package.nix
diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/by-name/re/resvg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/resvg/default.nix
rename to pkgs/by-name/re/resvg/package.nix
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/by-name/re/retdec/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/retdec/default.nix
rename to pkgs/by-name/re/retdec/package.nix
diff --git a/pkgs/development/libraries/retro-gtk/gio-unix.patch b/pkgs/by-name/re/retro-gtk/gio-unix.patch
similarity index 100%
rename from pkgs/development/libraries/retro-gtk/gio-unix.patch
rename to pkgs/by-name/re/retro-gtk/gio-unix.patch
diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/by-name/re/retro-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/retro-gtk/default.nix
rename to pkgs/by-name/re/retro-gtk/package.nix
diff --git a/pkgs/applications/emulators/retrofe/default.nix b/pkgs/by-name/re/retrofe/package.nix
similarity index 100%
rename from pkgs/applications/emulators/retrofe/default.nix
rename to pkgs/by-name/re/retrofe/package.nix
diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/by-name/re/retry/package.nix
similarity index 100%
rename from pkgs/tools/system/retry/default.nix
rename to pkgs/by-name/re/retry/package.nix
diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/by-name/re/revanced-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/revanced-cli/default.nix
rename to pkgs/by-name/re/revanced-cli/package.nix
diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/by-name/re/reveal-md/package.nix
similarity index 100%
rename from pkgs/tools/text/reveal-md/default.nix
rename to pkgs/by-name/re/reveal-md/package.nix
diff --git a/pkgs/data/icons/reversal-icon-theme/default.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/reversal-icon-theme/default.nix
rename to pkgs/by-name/re/reversal-icon-theme/package.nix
diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/by-name/re/reviewdog/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/reviewdog/default.nix
rename to pkgs/by-name/re/reviewdog/package.nix
diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/by-name/re/revive/package.nix
similarity index 100%
rename from pkgs/development/tools/revive/default.nix
rename to pkgs/by-name/re/revive/package.nix
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/by-name/re/rewritefs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rewritefs/default.nix
rename to pkgs/by-name/re/rewritefs/package.nix
diff --git a/pkgs/tools/networking/rewrk/Cargo.lock b/pkgs/by-name/re/rewrk/Cargo.lock
similarity index 100%
rename from pkgs/tools/networking/rewrk/Cargo.lock
rename to pkgs/by-name/re/rewrk/Cargo.lock
diff --git a/pkgs/tools/networking/rewrk/default.nix b/pkgs/by-name/re/rewrk/package.nix
similarity index 100%
rename from pkgs/tools/networking/rewrk/default.nix
rename to pkgs/by-name/re/rewrk/package.nix
diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/by-name/re/rex/package.nix
similarity index 100%
rename from pkgs/tools/system/rex/default.nix
rename to pkgs/by-name/re/rex/package.nix
diff --git a/pkgs/tools/typesetting/rfc-bibtex/default.nix b/pkgs/by-name/rf/rfc-bibtex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/rfc-bibtex/default.nix
rename to pkgs/by-name/rf/rfc-bibtex/package.nix
diff --git a/pkgs/tools/misc/rfc/default.nix b/pkgs/by-name/rf/rfc/package.nix
similarity index 100%
rename from pkgs/tools/misc/rfc/default.nix
rename to pkgs/by-name/rf/rfc/package.nix
diff --git a/pkgs/games/rftg/default.nix b/pkgs/by-name/rf/rftg/package.nix
similarity index 100%
rename from pkgs/games/rftg/default.nix
rename to pkgs/by-name/rf/rftg/package.nix
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/by-name/rg/rgbds/package.nix
similarity index 100%
rename from pkgs/development/compilers/rgbds/default.nix
rename to pkgs/by-name/rg/rgbds/package.nix
diff --git a/pkgs/tools/text/rgxg/default.nix b/pkgs/by-name/rg/rgxg/package.nix
similarity index 100%
rename from pkgs/tools/text/rgxg/default.nix
rename to pkgs/by-name/rg/rgxg/package.nix
diff --git a/pkgs/development/tools/rust/rhack/default.nix b/pkgs/by-name/rh/rhack/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rhack/default.nix
rename to pkgs/by-name/rh/rhack/package.nix
diff --git a/pkgs/development/tools/misc/rhai-doc/default.nix b/pkgs/by-name/rh/rhai-doc/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rhai-doc/default.nix
rename to pkgs/by-name/rh/rhai-doc/package.nix
diff --git a/pkgs/tools/security/rhash/do-link-so.patch b/pkgs/by-name/rh/rhash/do-link-so.patch
similarity index 100%
rename from pkgs/tools/security/rhash/do-link-so.patch
rename to pkgs/by-name/rh/rhash/do-link-so.patch
diff --git a/pkgs/tools/security/rhash/dont-fail-ln.patch b/pkgs/by-name/rh/rhash/dont-fail-ln.patch
similarity index 100%
rename from pkgs/tools/security/rhash/dont-fail-ln.patch
rename to pkgs/by-name/rh/rhash/dont-fail-ln.patch
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/by-name/rh/rhash/package.nix
similarity index 100%
rename from pkgs/tools/security/rhash/default.nix
rename to pkgs/by-name/rh/rhash/package.nix
diff --git a/pkgs/tools/admin/rhoas/default.nix b/pkgs/by-name/rh/rhoas/package.nix
similarity index 100%
rename from pkgs/tools/admin/rhoas/default.nix
rename to pkgs/by-name/rh/rhoas/package.nix
diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/by-name/rh/rhodium-libre/package.nix
similarity index 100%
rename from pkgs/data/fonts/rhodium-libre/default.nix
rename to pkgs/by-name/rh/rhodium-libre/package.nix
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/by-name/rh/rhvoice/honor_nix_environment.patch
similarity index 100%
rename from pkgs/applications/audio/rhvoice/honor_nix_environment.patch
rename to pkgs/by-name/rh/rhvoice/honor_nix_environment.patch
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/by-name/rh/rhvoice/package.nix
similarity index 100%
rename from pkgs/applications/audio/rhvoice/default.nix
rename to pkgs/by-name/rh/rhvoice/package.nix
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/by-name/rh/rhythmbox/package.nix
similarity index 100%
rename from pkgs/applications/audio/rhythmbox/default.nix
rename to pkgs/by-name/rh/rhythmbox/package.nix
diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/by-name/ri/rich-cli/package.nix
similarity index 100%
rename from pkgs/misc/rich-cli/default.nix
rename to pkgs/by-name/ri/rich-cli/package.nix
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/by-name/ri/richgo/package.nix
similarity index 100%
rename from pkgs/development/tools/richgo/default.nix
rename to pkgs/by-name/ri/richgo/package.nix
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/by-name/ri/ricty/package.nix
similarity index 100%
rename from pkgs/data/fonts/ricty/default.nix
rename to pkgs/by-name/ri/ricty/package.nix
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
similarity index 100%
rename from pkgs/data/fonts/rictydiminished-with-firacode/default.nix
rename to pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix
index 360a3bfcb164..f2f8ca1a978a 100644
--- a/pkgs/by-name/ri/ride/package.nix
+++ b/pkgs/by-name/ri/ride/package.nix
@@ -12,7 +12,7 @@
   copyDesktopItems,
   makeDesktopItem,
   electron,
-  cctools,
+  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -65,21 +65,15 @@ buildNpmPackage rec {
     popd
   '';
 
-  nativeBuildInputs =
-    [
-      zip
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
+  nativeBuildInputs = [
+    zip
+    makeWrapper
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
-  # Fix error: no member named 'aligned_alloc' in the global namespace
-  env.NIX_CFLAGS_COMPILE = lib.optionalString (
-    stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"
-  ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";
-
   # our patch adds the platform detecting build option
   npmBuildFlags = "self";
 
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/by-name/ri/riemann/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/riemann/default.nix
rename to pkgs/by-name/ri/riemann/package.nix
diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix
new file mode 100644
index 000000000000..788e0821fc01
--- /dev/null
+++ b/pkgs/by-name/ri/riemann_c_client/package.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetchFromGitea, autoreconfHook, check, pkg-config, file, protobufc
+,withWolfSSL ? false, wolfssl
+,withGnuTLS ? false, gnutls
+,withJSON ? true, json_c
+}:
+
+stdenv.mkDerivation rec {
+  pname = "riemann-c-client";
+  version = "2.2.2";
+
+  src = fetchFromGitea {
+    domain = "git.madhouse-project.org";
+    owner = "algernon";
+    repo = "riemann-c-client";
+    rev = "riemann-c-client-${version}";
+    hash = "sha256-l9iUDhagODi58FDT9vEb90tsiIcrcMmGYCmH3ML3RCM=";
+  };
+
+  outputs = [ "bin" "dev" "out" ];
+
+  nativeBuildInputs = [ autoreconfHook check pkg-config ];
+  buildInputs = [ file protobufc ]
+    ++ lib.optional withWolfSSL wolfssl
+    ++ lib.optional withGnuTLS gnutls
+    ++ lib.optional withJSON json_c
+  ;
+
+  configureFlags = []
+    ++ lib.optional withWolfSSL "--with-tls=wolfssl"
+    ++ lib.optional withGnuTLS "--with-tls=gnutls"
+  ;
+
+  doCheck = true;
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://git.madhouse-project.org/algernon/riemann-c-client";
+    description = "C client library for the Riemann monitoring system";
+    mainProgram = "riemann-client";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ pradeepchhetri ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/by-name/ri/ries/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ries/default.nix
rename to pkgs/by-name/ri/ries/package.nix
diff --git a/pkgs/development/tools/misc/riff/default.nix b/pkgs/by-name/ri/riff/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/riff/default.nix
rename to pkgs/by-name/ri/riff/package.nix
diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
new file mode 100644
index 000000000000..eecc8e3e57b0
--- /dev/null
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  riffdiff,
+  testers,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "riffdiff";
+  version = "3.3.6";
+
+  src = fetchFromGitHub {
+    owner = "walles";
+    repo = "riff";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qXFSO2VIPaGnB+5Wp/u0FTcKnpcMLxW6uNykKL681lU=";
+  };
+
+  cargoHash = "sha256-i6/wa2/ogyLwLBdIXqTYdJX9+SFf+p7Zm2j2Q3mje6w=";
+
+  passthru = {
+    tests.version = testers.testVersion { package = riffdiff; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Diff filter highlighting which line parts have changed";
+    homepage = "https://github.com/walles/riff";
+    changelog = "https://github.com/walles/riff/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      johnpyp
+      getchoo
+    ];
+    mainProgram = "riff";
+  };
+}
diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/by-name/ri/rig/package.nix
similarity index 100%
rename from pkgs/tools/misc/rig/default.nix
rename to pkgs/by-name/ri/rig/package.nix
diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/pkgs/by-name/ri/rig/rig_1.11-1.diff
similarity index 100%
rename from pkgs/tools/misc/rig/rig_1.11-1.diff
rename to pkgs/by-name/ri/rig/rig_1.11-1.diff
diff --git a/pkgs/games/rigsofrods-bin/default.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
similarity index 100%
rename from pkgs/games/rigsofrods-bin/default.nix
rename to pkgs/by-name/ri/rigsofrods-bin/package.nix
diff --git a/pkgs/games/riko4/default.nix b/pkgs/by-name/ri/riko4/package.nix
similarity index 100%
rename from pkgs/games/riko4/default.nix
rename to pkgs/by-name/ri/riko4/package.nix
diff --git a/pkgs/games/rili/moderinze_cpp.patch b/pkgs/by-name/ri/rili/moderinze_cpp.patch
similarity index 100%
rename from pkgs/games/rili/moderinze_cpp.patch
rename to pkgs/by-name/ri/rili/moderinze_cpp.patch
diff --git a/pkgs/games/rili/default.nix b/pkgs/by-name/ri/rili/package.nix
similarity index 100%
rename from pkgs/games/rili/default.nix
rename to pkgs/by-name/ri/rili/package.nix
diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/by-name/ri/rime-cli/package.nix
similarity index 100%
rename from pkgs/applications/office/rime-cli/default.nix
rename to pkgs/by-name/ri/rime-cli/package.nix
diff --git a/pkgs/data/misc/rime-data/fetchSchema.nix b/pkgs/by-name/ri/rime-data/fetchSchema.nix
similarity index 100%
rename from pkgs/data/misc/rime-data/fetchSchema.nix
rename to pkgs/by-name/ri/rime-data/fetchSchema.nix
diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/by-name/ri/rime-data/generateFetchSchema.sh
similarity index 100%
rename from pkgs/data/misc/rime-data/generateFetchSchema.sh
rename to pkgs/by-name/ri/rime-data/generateFetchSchema.sh
diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/by-name/ri/rime-data/package.nix
similarity index 100%
rename from pkgs/data/misc/rime-data/default.nix
rename to pkgs/by-name/ri/rime-data/package.nix
diff --git a/pkgs/by-name/ri/rime-japanese/package.nix b/pkgs/by-name/ri/rime-japanese/package.nix
new file mode 100644
index 000000000000..92c4db33eb95
--- /dev/null
+++ b/pkgs/by-name/ri/rime-japanese/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "rime-japanese";
+  version = "0-unstable-2023-08-02";
+
+  src = fetchFromGitHub {
+    owner = "gkovacs";
+    repo = "rime-japanese";
+    rev = "4c1e65135459175136f380e90ba52acb40fdfb2d";
+    hash = "sha256-/mIIyCu8V95ArKo/vIS3qAiD8InUmk8fAF/wejxRxGw=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D japanese.*.yaml -t $out/share/rime-data/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Layout for typing in Japanese with RIME";
+    homepage = "https://github.com/gkovacs/rime-japanese";
+
+    # Awaiting upstream response (gkovacs/rime-japanese#6)
+    # Packages are assumed unfree unless explicitly indicated otherwise
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pluiedev ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/by-name/ri/rinetd/package.nix
similarity index 100%
rename from pkgs/servers/rinetd/default.nix
rename to pkgs/by-name/ri/rinetd/package.nix
diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/by-name/ri/rinutils/package.nix
similarity index 100%
rename from pkgs/development/libraries/rinutils/default.nix
rename to pkgs/by-name/ri/rinutils/package.nix
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
new file mode 100644
index 000000000000..7c6a6094b12b
--- /dev/null
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -0,0 +1,152 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  nixosTests,
+  nix-update-script,
+
+  autoPatchelfHook,
+  cmake,
+  ncurses,
+  pkg-config,
+
+  gcc-unwrapped,
+  fontconfig,
+  libGL,
+  vulkan-loader,
+  libxkbcommon,
+  apple-sdk_11,
+
+  withX11 ? !stdenv.hostPlatform.isDarwin,
+  libX11,
+  libXcursor,
+  libXi,
+  libXrandr,
+  libxcb,
+
+  withWayland ? !stdenv.hostPlatform.isDarwin,
+  wayland,
+
+  testers,
+  rio,
+}:
+let
+  rlinkLibs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      (lib.getLib gcc-unwrapped)
+      fontconfig
+      libGL
+      libxkbcommon
+      vulkan-loader
+    ]
+    ++ lib.optionals withX11 [
+      libX11
+      libXcursor
+      libXi
+      libXrandr
+      libxcb
+    ]
+    ++ lib.optionals withWayland [
+      wayland
+    ];
+in
+rustPlatform.buildRustPackage rec {
+  pname = "rio";
+  version = "0.1.17";
+
+  src = fetchFromGitHub {
+    owner = "raphamorim";
+    repo = "rio";
+    rev = "v${version}";
+    hash = "sha256-10E7tIuix0BGKFbADLhcReRC01FXV/dBivJjfSe/X/c=";
+  };
+
+  cargoHash = "sha256-yGOvY5+ThSey/k8ilTTC0CzaOIJtc4hDYmdrHJC3HyE=";
+
+  nativeBuildInputs =
+    [
+      ncurses
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      cmake
+      pkg-config
+      autoPatchelfHook
+    ];
+
+  runtimeDependencies = rlinkLibs;
+
+  buildInputs =
+    rlinkLibs
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.libutil
+      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
+    ];
+
+  outputs = [
+    "out"
+    "terminfo"
+  ];
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ ] ++ lib.optional withX11 "x11" ++ lib.optional withWayland "wayland";
+
+  checkFlags = [
+    # Fail to run in sandbox environment.
+    "--skip=sys::unix::eventedfd::EventedFd"
+  ];
+
+  postInstall =
+    ''
+      install -D -m 644 misc/rio.desktop -t $out/share/applications
+      install -D -m 644 misc/logo.svg \
+                        $out/share/icons/hicolor/scalable/apps/rio.svg
+
+      install -dm 755 "$terminfo/share/terminfo/r/"
+      tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
+      mkdir -p $out/nix-support
+      echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir $out/Applications/
+      mv misc/osx/Rio.app/ $out/Applications/
+      mkdir $out/Applications/Rio.app/Contents/MacOS/
+      ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/
+    '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v([0-9.]+)"
+      ];
+    };
+
+    tests =
+      {
+        version = testers.testVersion { package = rio; };
+      }
+      // lib.optionalAttrs stdenv.buildPlatform.isLinux {
+        # FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg
+        # 'passthru.tests' nixosTests are failing on Darwin architectures.
+        #
+        # Ref: https://github.com/NixOS/nixpkgs/issues/345825
+        test = nixosTests.terminal-emulators.rio;
+      };
+  };
+
+  meta = {
+    description = "Hardware-accelerated GPU terminal emulator powered by WebGPU";
+    homepage = "https://raphamorim.io/rio";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      tornax
+      otavio
+      oluceps
+    ];
+    platforms = lib.platforms.unix;
+    changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md";
+    mainProgram = "rio";
+  };
+}
diff --git a/pkgs/development/tools/riot-redis/default.nix b/pkgs/by-name/ri/riot-redis/package.nix
similarity index 100%
rename from pkgs/development/tools/riot-redis/default.nix
rename to pkgs/by-name/ri/riot-redis/package.nix
diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
new file mode 100644
index 000000000000..eba6c5f81484
--- /dev/null
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rip2";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "MilesCranmer";
+    repo = "rip2";
+    rev = "v${version}";
+    hash = "sha256-9leLWfPilDQHzQRzTUjAFt9olTPEL4GcQgYFWZu3dug=";
+  };
+
+  cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8=";
+
+  # TODO: Unsure why this test fails, but not a major issue so
+  #       skipping for now.
+  checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/rip";
+
+  meta = {
+    description = "Safe and ergonomic alternative to rm";
+    homepage = "https://github.com/MilesCranmer/rip2";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ milescranmer ];
+    mainProgram = "rip";
+  };
+}
diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/by-name/ri/ripdrag/package.nix
similarity index 100%
rename from pkgs/tools/misc/ripdrag/default.nix
rename to pkgs/by-name/ri/ripdrag/package.nix
diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
similarity index 100%
rename from pkgs/tools/networking/ripe-atlas-tools/default.nix
rename to pkgs/by-name/ri/ripe-atlas-tools/package.nix
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
new file mode 100644
index 000000000000..c6d3884921be
--- /dev/null
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -0,0 +1,63 @@
+{ lib, stdenv
+, buildPackages
+, fetchFromGitHub
+, rustPlatform
+, installShellFiles
+, pkg-config
+, apple-sdk_11
+, withPCRE2 ? true
+, pcre2
+}:
+
+let
+  canRunRg = stdenv.hostPlatform.emulatorAvailable buildPackages;
+  rg = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/rg";
+in rustPlatform.buildRustPackage rec {
+  pname = "ripgrep";
+  version = "14.1.1";
+
+  src = fetchFromGitHub {
+    owner = "BurntSushi";
+    repo = pname;
+    rev = version;
+    hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
+  };
+
+  cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE=";
+
+  nativeBuildInputs = [ installShellFiles ]
+    ++ lib.optional withPCRE2 pkg-config;
+  buildInputs = lib.optional withPCRE2 pcre2
+    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+
+  buildFeatures = lib.optional withPCRE2 "pcre2";
+
+  preFixup = lib.optionalString canRunRg ''
+    ${rg} --generate man > rg.1
+    installManPage rg.1
+
+    installShellCompletion --cmd rg \
+      --bash <(${rg} --generate complete-bash) \
+      --fish <(${rg} --generate complete-fish) \
+      --zsh <(${rg} --generate complete-zsh)
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    file="$(mktemp)"
+    echo "abc\nbcd\ncde" > "$file"
+    ${rg} -N 'bcd' "$file"
+    ${rg} -N 'cd' "$file"
+  '' + lib.optionalString withPCRE2 ''
+    echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
+  '';
+
+  meta = with lib; {
+    description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep";
+    homepage = "https://github.com/BurntSushi/ripgrep";
+    changelog = "https://github.com/BurntSushi/ripgrep/releases/tag/${version}";
+    license = with licenses; [ unlicense /* or */ mit ];
+    maintainers = with maintainers; [ globin ma27 zowoq ];
+    mainProgram = "rg";
+  };
+}
diff --git a/pkgs/by-name/ri/ripmime/package.nix b/pkgs/by-name/ri/ripmime/package.nix
new file mode 100644
index 000000000000..f1bcc58f4dcd
--- /dev/null
+++ b/pkgs/by-name/ri/ripmime/package.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "ripmime";
+  version = "1.4.0.10";
+  src = fetchurl {
+    url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
+  };
+
+  preInstall = ''
+    sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" -e "s@man/man1@share/&@"
+    mkdir -p "$out/bin" "$out/share/man/man1"
+  '';
+
+  env = {
+    NIX_CFLAGS_COMPILE = " -Wno-error ";
+  } // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
+
+  meta = with lib; {
+    description = "Attachment extractor for MIME messages";
+    maintainers = with maintainers; [ raskin ];
+    homepage = "https://pldaniels.com/ripmime/";
+    platforms = platforms.all;
+    mainProgram = "ripmime";
+  };
+
+  passthru = {
+    updateInfo = {
+      downloadPage = "https://pldaniels.com/ripmime/";
+    };
+  };
+}
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/by-name/ri/ripser/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ripser/default.nix
rename to pkgs/by-name/ri/ripser/package.nix
diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/by-name/ri/riscv-pk/package.nix
similarity index 100%
rename from pkgs/misc/riscv-pk/default.nix
rename to pkgs/by-name/ri/riscv-pk/package.nix
diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/by-name/ri/risor/package.nix
similarity index 100%
rename from pkgs/development/interpreters/risor/default.nix
rename to pkgs/by-name/ri/risor/package.nix
diff --git a/pkgs/tools/misc/ristate/default.nix b/pkgs/by-name/ri/ristate/package.nix
similarity index 100%
rename from pkgs/tools/misc/ristate/default.nix
rename to pkgs/by-name/ri/ristate/package.nix
diff --git a/pkgs/misc/rivalcfg/default.nix b/pkgs/by-name/ri/rivalcfg/package.nix
similarity index 100%
rename from pkgs/misc/rivalcfg/default.nix
rename to pkgs/by-name/ri/rivalcfg/package.nix
diff --git a/pkgs/applications/misc/river-luatile/default.nix b/pkgs/by-name/ri/river-luatile/package.nix
similarity index 100%
rename from pkgs/applications/misc/river-luatile/default.nix
rename to pkgs/by-name/ri/river-luatile/package.nix
diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/by-name/ri/river-tag-overlay/package.nix
similarity index 100%
rename from pkgs/applications/misc/river-tag-overlay/default.nix
rename to pkgs/by-name/ri/river-tag-overlay/package.nix
diff --git a/pkgs/applications/misc/rivercarro/deps.nix b/pkgs/by-name/ri/rivercarro/deps.nix
similarity index 100%
rename from pkgs/applications/misc/rivercarro/deps.nix
rename to pkgs/by-name/ri/rivercarro/deps.nix
diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/by-name/ri/rivercarro/package.nix
similarity index 100%
rename from pkgs/applications/misc/rivercarro/default.nix
rename to pkgs/by-name/ri/rivercarro/package.nix
diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/by-name/rk/rkdeveloptool-pine64/package.nix
similarity index 100%
rename from pkgs/misc/rkdeveloptool-pine64/default.nix
rename to pkgs/by-name/rk/rkdeveloptool-pine64/package.nix
diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix
similarity index 100%
rename from pkgs/misc/rkdeveloptool/default.nix
rename to pkgs/by-name/rk/rkdeveloptool/package.nix
diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/by-name/rk/rke/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/rke/default.nix
rename to pkgs/by-name/rk/rke/package.nix
diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/by-name/rk/rkflashtool/package.nix
similarity index 100%
rename from pkgs/tools/misc/rkflashtool/default.nix
rename to pkgs/by-name/rk/rkflashtool/package.nix
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/by-name/rk/rkrlv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/rkrlv2/default.nix
rename to pkgs/by-name/rk/rkrlv2/package.nix
diff --git a/pkgs/tools/misc/rkvm/default.nix b/pkgs/by-name/rk/rkvm/package.nix
similarity index 100%
rename from pkgs/tools/misc/rkvm/default.nix
rename to pkgs/by-name/rk/rkvm/package.nix
diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/by-name/rl/rlaunch/package.nix
similarity index 100%
rename from pkgs/applications/misc/rlaunch/default.nix
rename to pkgs/by-name/rl/rlaunch/package.nix
diff --git a/pkgs/development/interpreters/rlci/default.nix b/pkgs/by-name/rl/rlci/package.nix
similarity index 100%
rename from pkgs/development/interpreters/rlci/default.nix
rename to pkgs/by-name/rl/rlci/package.nix
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/by-name/rl/rlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/rlog/default.nix
rename to pkgs/by-name/rl/rlog/package.nix
diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/by-name/rl/rlottie/package.nix
similarity index 100%
rename from pkgs/development/libraries/rlottie/default.nix
rename to pkgs/by-name/rl/rlottie/package.nix
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/by-name/rl/rlwrap/package.nix
similarity index 100%
rename from pkgs/tools/misc/rlwrap/default.nix
rename to pkgs/by-name/rl/rlwrap/package.nix
diff --git a/pkgs/applications/misc/rm-improved/Cargo.lock.patch b/pkgs/by-name/rm/rm-improved/Cargo.lock.patch
similarity index 100%
rename from pkgs/applications/misc/rm-improved/Cargo.lock.patch
rename to pkgs/by-name/rm/rm-improved/Cargo.lock.patch
diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/by-name/rm/rm-improved/package.nix
similarity index 100%
rename from pkgs/applications/misc/rm-improved/default.nix
rename to pkgs/by-name/rm/rm-improved/package.nix
diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/by-name/rm/rman/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rman/default.nix
rename to pkgs/by-name/rm/rman/package.nix
diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/by-name/rm/rmapi/package.nix
similarity index 100%
rename from pkgs/applications/misc/remarkable/rmapi/default.nix
rename to pkgs/by-name/rm/rmapi/package.nix
diff --git a/pkgs/tools/misc/rmate-sh/default.nix b/pkgs/by-name/rm/rmate-sh/package.nix
similarity index 100%
rename from pkgs/tools/misc/rmate-sh/default.nix
rename to pkgs/by-name/rm/rmate-sh/package.nix
diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/by-name/rm/rmfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rmfuse/default.nix
rename to pkgs/by-name/rm/rmfuse/package.nix
diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix
index 50c6e4306ffe..8dcd685da4dd 100644
--- a/pkgs/by-name/rm/rmg/package.nix
+++ b/pkgs/by-name/rm/rmg/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "rmg";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "Rosalie241";
     repo = "RMG";
     rev = "v${version}";
-    hash = "sha256-mgb9Ed11fBQVnhhU5w1958a19dbTOL0ADczUOxKAnqA=";
+    hash = "sha256-3Bl9SEHWQbi58VPpCT4H8TC1E5J5j4lRXS1QF+udPdg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/by-name/rm/rmount/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rmount/default.nix
rename to pkgs/by-name/rm/rmount/package.nix
diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index 6efe7b07a43a..ed25639833e2 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rmpc";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "mierak";
     repo = "rmpc";
     rev = "v${version}";
-    hash = "sha256-eWscMWOjTGmFCNGwf/6lMU0JbULC7/AFCPbznGQYRQI=";
+    hash = "sha256-hQhcNeGNxUxJ9hO/ukmt6V8V8zQHQLvejeu692pKTwg=";
   };
 
-  cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng=";
+  cargoHash = "sha256-Y+NmBAcp6lu1dmMo1Gpozmm/YvNYM7mUAvU2C7iO0ew=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -48,7 +48,10 @@ rustPlatform.buildRustPackage rec {
       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 ];
+    maintainers = with lib.maintainers; [
+      donovanglover
+      bloxx12
+    ];
     mainProgram = "rmpc";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/by-name/rm/rmtrash/package.nix
similarity index 100%
rename from pkgs/tools/misc/rmtrash/default.nix
rename to pkgs/by-name/rm/rmtrash/package.nix
diff --git a/pkgs/tools/misc/rmw/default.nix b/pkgs/by-name/rm/rmw/package.nix
similarity index 100%
rename from pkgs/tools/misc/rmw/default.nix
rename to pkgs/by-name/rm/rmw/package.nix
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/by-name/rn/rng-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/rng-tools/default.nix
rename to pkgs/by-name/rn/rng-tools/package.nix
diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/by-name/rn/rnix-hashes/package.nix
similarity index 100%
rename from pkgs/tools/nix/rnix-hashes/default.nix
rename to pkgs/by-name/rn/rnix-hashes/package.nix
diff --git a/pkgs/tools/filesystems/rnm/default.nix b/pkgs/by-name/rn/rnm/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rnm/default.nix
rename to pkgs/by-name/rn/rnm/package.nix
diff --git a/pkgs/development/libraries/rnnoise/model-version.json b/pkgs/by-name/rn/rnnoise/model-version.json
similarity index 100%
rename from pkgs/development/libraries/rnnoise/model-version.json
rename to pkgs/by-name/rn/rnnoise/model-version.json
diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/by-name/rn/rnnoise/package.nix
similarity index 100%
rename from pkgs/development/libraries/rnnoise/default.nix
rename to pkgs/by-name/rn/rnnoise/package.nix
diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/by-name/rn/rnp/package.nix
similarity index 100%
rename from pkgs/tools/security/rnp/default.nix
rename to pkgs/by-name/rn/rnp/package.nix
diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/by-name/rn/rnr/package.nix
similarity index 100%
rename from pkgs/tools/text/rnr/default.nix
rename to pkgs/by-name/rn/rnr/package.nix
diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/by-name/rn/rnv/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/rnv/default.nix
rename to pkgs/by-name/rn/rnv/package.nix
diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/by-name/ro/roadrunner/package.nix
similarity index 100%
rename from pkgs/servers/roadrunner/default.nix
rename to pkgs/by-name/ro/roadrunner/package.nix
diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/by-name/ro/roam-research/common.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/common.nix
rename to pkgs/by-name/ro/roam-research/common.nix
diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/by-name/ro/roam-research/darwin.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/darwin.nix
rename to pkgs/by-name/ro/roam-research/darwin.nix
diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/by-name/ro/roam-research/linux.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/linux.nix
rename to pkgs/by-name/ro/roam-research/linux.nix
diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/by-name/ro/roam-research/package.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/default.nix
rename to pkgs/by-name/ro/roam-research/package.nix
diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 50eaa4e1376d..df952d702362 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -6,18 +6,18 @@
   roave-backward-compatibility-check,
 }:
 
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.9.0";
+  version = "8.10.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     rev = finalAttrs.version;
-    hash = "sha256-Bvqo2SmtRWvatXxtHbctBrY0xe0KA+knNmEg+KC8hgY=";
+    hash = "sha256-wOqF7FkwOnTxYe7OnAl8R7NyGkdJ37H0OIr5e/1Q03I=";
   };
 
-  vendorHash = "sha256-cMVOcLRvfwFbxd2mXJhDx1iaUTHPEsI4vh9/JCoOj3M=";
+  vendorHash = "sha256-Xd+SxqLbm5QCROwq4jDm4cWLxF2nraqA+xdrZxW3ILY=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/by-name/ro/robin-map/package.nix
similarity index 100%
rename from pkgs/development/libraries/robin-map/default.nix
rename to pkgs/by-name/ro/robin-map/package.nix
diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix
index adde9d7c2d50..e1713b90b5a6 100644
--- a/pkgs/by-name/ro/robo/package.nix
+++ b/pkgs/by-name/ro/robo/package.nix
@@ -2,31 +2,20 @@
   lib,
   php82,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
-php82.buildComposerProject (finalAttrs: {
+php82.buildComposerProject2 (finalAttrs: {
   pname = "robo";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "consolidation";
     repo = "robo";
     rev = finalAttrs.version;
-    hash = "sha256-tibG2sR5CsRnUjZEvOewX/fyMuAS1kgKjYbrkk+f0BI=";
+    hash = "sha256-bAT4jHvqWeYcACeyGtBwVBA2Rz+AvkZcUGLDwSf+fLg=";
   };
 
-  patches = [
-    # Fix the version number
-    # Most likely to remove at the next bump update
-    # See https://github.com/drupol/robo/pull/1
-    (fetchpatch {
-      url = "https://github.com/drupol/robo/commit/c3cd001525c1adb5980a3a18a5561a0a5bbe1f50.patch";
-      hash = "sha256-iMdZx+Bldmf1IS6Ypoet7GSsE6J9ZnE0HTskznkyEKM=";
-    })
-  ];
-
-  vendorHash = "sha256-RRnHv6sOYm8fYhY3Q6m5sFDflFXd9b9LPcAqk/D1jdE=";
+  vendorHash = "sha256-PYtZy6c/Z1GTcYyfU77uJjXCzQSfBaNkon8kqGyVq+o=";
 
   meta = {
     changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/by-name/ro/robo3t/package.nix
similarity index 100%
rename from pkgs/applications/misc/robo3t/default.nix
rename to pkgs/by-name/ro/robo3t/package.nix
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/by-name/ro/roboto-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto-mono/default.nix
rename to pkgs/by-name/ro/roboto-mono/package.nix
diff --git a/pkgs/data/fonts/roboto-serif/default.nix b/pkgs/by-name/ro/roboto-serif/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto-serif/default.nix
rename to pkgs/by-name/ro/roboto-serif/package.nix
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/by-name/ro/roboto-slab/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto-slab/default.nix
rename to pkgs/by-name/ro/roboto-slab/package.nix
diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/by-name/ro/roboto/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto/default.nix
rename to pkgs/by-name/ro/roboto/package.nix
diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/by-name/ro/robustirc-bridge/package.nix
similarity index 100%
rename from pkgs/servers/irc/robustirc-bridge/default.nix
rename to pkgs/by-name/ro/robustirc-bridge/package.nix
diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/by-name/ro/roc-toolkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/roc-toolkit/default.nix
rename to pkgs/by-name/ro/roc-toolkit/package.nix
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/by-name/ro/roccat-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/roccat-tools/default.nix
rename to pkgs/by-name/ro/roccat-tools/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
rename to pkgs/by-name/ro/rocketchat-desktop/package.nix
diff --git a/pkgs/development/libraries/rocksdb/fix-findliburing.patch b/pkgs/by-name/ro/rocksdb/fix-findliburing.patch
similarity index 100%
rename from pkgs/development/libraries/rocksdb/fix-findliburing.patch
rename to pkgs/by-name/ro/rocksdb/fix-findliburing.patch
diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix
new file mode 100644
index 000000000000..c08f38accaf0
--- /dev/null
+++ b/pkgs/by-name/ro/rocksdb/package.nix
@@ -0,0 +1,112 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, ninja
+, bzip2
+, lz4
+, snappy
+, zlib
+, zstd
+, windows
+, enableJemalloc ? false
+, jemalloc
+, enableLiburing ? stdenv.hostPlatform.isLinux
+, liburing
+, enableShared ? !stdenv.hostPlatform.isStatic
+, sse42Support ? stdenv.hostPlatform.sse4_2Support
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocksdb";
+  version = "9.7.3";
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "rocksdb";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-HeC7m9ZK7SIU7adkQEurzHf+MY7AiEwXZQaz9uZZncU=";
+  };
+
+  patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch;
+
+  nativeBuildInputs = [ cmake ninja ];
+
+  propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ];
+
+  buildInputs = lib.optional enableJemalloc jemalloc
+    ++ lib.optional enableLiburing liburing
+    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
+
+  outputs = [
+    "out"
+    "tools"
+  ];
+
+ env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
+   "-faligned-allocation"
+ ]);
+
+  cmakeFlags = [
+    "-DPORTABLE=1"
+    "-DWITH_JEMALLOC=${if enableJemalloc then "1" else "0"}"
+    "-DWITH_LIBURING=${if enableLiburing then "1" else "0"}"
+    "-DWITH_JNI=0"
+    "-DWITH_BENCHMARK_TOOLS=0"
+    "-DWITH_TESTS=1"
+    "-DWITH_TOOLS=0"
+    "-DWITH_CORE_TOOLS=1"
+    "-DWITH_BZ2=1"
+    "-DWITH_LZ4=1"
+    "-DWITH_SNAPPY=1"
+    "-DWITH_ZLIB=1"
+    "-DWITH_ZSTD=1"
+    "-DWITH_GFLAGS=0"
+    "-DUSE_RTTI=1"
+    "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere
+    (lib.optional sse42Support "-DFORCE_SSE42=1")
+    "-DFAIL_ON_WARNINGS=NO"
+  ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
+
+  # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
+  hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format";
+
+  postPatch = lib.optionalString (lib.versionOlder finalAttrs.version "8") ''
+    # Fix gcc-13 build failures due to missing  and
+    #  includes, fixed upstyream sice 8.x
+    sed -e '1i #include ' -i db/compaction/compaction_iteration_stats.h
+    sed -e '1i #include ' -i table/block_based/data_block_hash_index.h
+    sed -e '1i #include ' -i util/string_util.h
+    sed -e '1i #include ' -i include/rocksdb/utilities/checkpoint.h
+  '' + lib.optionalString (lib.versionOlder finalAttrs.version "7") ''
+    # Fix gcc-13 build failures due to missing  and
+    #  includes, fixed upstyream sice 7.x
+    sed -e '1i #include ' -i third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
+  '';
+
+  preInstall = ''
+    mkdir -p $tools/bin
+    cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {}
+  '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
+    ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib {}
+  '';
+
+  # Old version doesn't ship the .pc file, new version puts wrong paths in there.
+  postFixup = ''
+    if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then
+      substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \
+        --replace '="''${prefix}//' '="/'
+    fi
+  '';
+
+  meta = with lib; {
+    homepage = "https://rocksdb.org";
+    description = "Library that provides an embeddable, persistent key-value store for fast storage";
+    changelog = "https://github.com/facebook/rocksdb/raw/v${finalAttrs.version}/HISTORY.md";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ adev magenbluten ];
+  };
+})
diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
similarity index 100%
rename from pkgs/games/rocksndiamonds/default.nix
rename to pkgs/by-name/ro/rocksndiamonds/package.nix
diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/by-name/ro/rofi-bluetooth/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-bluetooth/default.nix
rename to pkgs/by-name/ro/rofi-bluetooth/package.nix
diff --git a/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
rename to pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/by-name/ro/rofi-calc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/rofi-calc/default.nix
rename to pkgs/by-name/ro/rofi-calc/package.nix
diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-file-browser/default.nix
rename to pkgs/by-name/ro/rofi-file-browser/package.nix
diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/by-name/ro/rofi-menugen/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-menugen/default.nix
rename to pkgs/by-name/ro/rofi-menugen/package.nix
diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/by-name/ro/rofi-mpd/package.nix
similarity index 100%
rename from pkgs/applications/audio/rofi-mpd/default.nix
rename to pkgs/by-name/ro/rofi-mpd/package.nix
diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-power-menu/default.nix
rename to pkgs/by-name/ro/rofi-power-menu/package.nix
diff --git a/pkgs/applications/audio/rofi-pulse-select/default.nix b/pkgs/by-name/ro/rofi-pulse-select/package.nix
similarity index 100%
rename from pkgs/applications/audio/rofi-pulse-select/default.nix
rename to pkgs/by-name/ro/rofi-pulse-select/package.nix
diff --git a/pkgs/applications/misc/rofi-screenshot/default.nix b/pkgs/by-name/ro/rofi-screenshot/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-screenshot/default.nix
rename to pkgs/by-name/ro/rofi-screenshot/package.nix
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/by-name/ro/rofi-systemd/package.nix
similarity index 100%
rename from pkgs/tools/system/rofi-systemd/default.nix
rename to pkgs/by-name/ro/rofi-systemd/package.nix
diff --git a/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-top/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch
rename to pkgs/by-name/ro/rofi-top/0001-Patch-plugindir-to-output.patch
diff --git a/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch b/pkgs/by-name/ro/rofi-top/0002-Patch-add-cairo.patch
similarity index 100%
rename from pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch
rename to pkgs/by-name/ro/rofi-top/0002-Patch-add-cairo.patch
diff --git a/pkgs/applications/misc/rofi-top/default.nix b/pkgs/by-name/ro/rofi-top/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-top/default.nix
rename to pkgs/by-name/ro/rofi-top/package.nix
diff --git a/pkgs/applications/networking/rofi-vpn/default.nix b/pkgs/by-name/ro/rofi-vpn/package.nix
similarity index 100%
rename from pkgs/applications/networking/rofi-vpn/default.nix
rename to pkgs/by-name/ro/rofi-vpn/package.nix
diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/by-name/ro/rojo/package.nix
similarity index 100%
rename from pkgs/development/tools/rojo/default.nix
rename to pkgs/by-name/ro/rojo/package.nix
diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/by-name/ro/rolespec/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rolespec/default.nix
rename to pkgs/by-name/ro/rolespec/package.nix
diff --git a/pkgs/development/tools/rust/roogle/default.nix b/pkgs/by-name/ro/roogle/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/roogle/default.nix
rename to pkgs/by-name/ro/roogle/package.nix
diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/by-name/ro/roomeqwizard/package.nix
similarity index 100%
rename from pkgs/applications/audio/roomeqwizard/default.nix
rename to pkgs/by-name/ro/roomeqwizard/package.nix
diff --git a/pkgs/by-name/ro/roon-bridge/package.nix b/pkgs/by-name/ro/roon-bridge/package.nix
new file mode 100644
index 000000000000..876702f6beb7
--- /dev/null
+++ b/pkgs/by-name/ro/roon-bridge/package.nix
@@ -0,0 +1,83 @@
+{ alsa-lib
+, alsa-utils
+, autoPatchelfHook
+, fetchurl
+, ffmpeg
+, lib
+, makeWrapper
+, openssl
+, stdenv
+, zlib
+}:
+let
+  version = "1.8-1125";
+  urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
+  host = stdenv.hostPlatform.system;
+  system = if host == "x86_64-linux" then "linuxx64"
+           else if host == "aarch64-linux" then "linuxarmv8"
+           else throw "Unsupported platform ${host}";
+  src = fetchurl {
+    url = "https://download.roonlabs.com/updates/stable/RoonBridge_${system}_${urlVersion}.tar.bz2";
+    hash = if system == "linuxx64" then "sha256-DbtKPFEz2WIoKTxP+zoehzz+BjfsLZ2ZQk/FMh+zFBM="
+           else if system == "linuxarmv8" then "sha256-+przEj96R+f1z4ewETFarF4oY6tT2VW/ukSTgUBLiYk="
+           else throw "Unsupported platform ${host}";
+  };
+in
+stdenv.mkDerivation {
+  pname = "roon-bridge";
+  inherit src version;
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  buildInputs = [
+    alsa-lib
+    zlib
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
+  installPhase =
+    let
+      fixBin = binPath: ''
+        (
+          sed -i '/ulimit/d' ${binPath}
+          sed -i 's@^SCRIPT=.*@SCRIPT="$(basename "${binPath}")"@' ${binPath}
+          wrapProgram ${binPath} \
+            --argv0 "$(basename ${binPath})" \
+            --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib ffmpeg openssl ]}" \
+            --prefix PATH : "${lib.makeBinPath [ alsa-utils ffmpeg ]}"
+        )
+      '';
+    in
+    ''
+      runHook preInstall
+      mkdir -p $out
+      mv * $out
+
+      rm $out/check.sh
+      rm $out/start.sh
+      rm $out/VERSION
+
+      ${fixBin "${placeholder "out"}/Bridge/RAATServer"}
+      ${fixBin "${placeholder "out"}/Bridge/RoonBridge"}
+      ${fixBin "${placeholder "out"}/Bridge/RoonBridgeHelper"}
+
+      mkdir -p $out/bin
+      makeWrapper "$out/Bridge/RoonBridge" "$out/bin/RoonBridge" --chdir "$out"
+
+      runHook postInstall
+    '';
+
+  meta = with lib; {
+    description = "Music player for music lovers";
+    changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18";
+    homepage = "https://roonlabs.com";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ lovesegfault ];
+    platforms = [ "aarch64-linux" "x86_64-linux" ];
+    mainProgram = "RoonBridge";
+  };
+}
diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix
new file mode 100644
index 000000000000..de90d8b8e040
--- /dev/null
+++ b/pkgs/by-name/ro/roon-server/package.nix
@@ -0,0 +1,100 @@
+{ alsa-lib
+, alsa-utils
+, autoPatchelfHook
+, cifs-utils
+, fetchurl
+, ffmpeg
+, freetype
+, icu66
+, krb5
+, lib
+, libtasn1
+, lttng-ust_2_12
+, makeWrapper
+, openssl
+, stdenv
+}:
+let
+  version = "2.0-1470";
+  urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
+in
+stdenv.mkDerivation {
+  pname = "roon-server";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
+    hash = "sha256-esaxrSdvl1qUNfotOSs8Tj/AUg6hFpl23DGbji/uFO8=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  buildInputs = [
+    alsa-lib
+    freetype
+    krb5
+    libtasn1
+    lttng-ust_2_12
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
+  installPhase =
+    let
+      # NB: While this might seem like odd behavior, it's what Roon expects. The
+      # tarball distribution provides scripts that do a bunch of nonsense on top
+      # of what wrapBin is doing here, so consider it the lesser of two evils.
+      # I didn't bother checking whether the symlinks are really necessary, but
+      # I wouldn't put it past Roon to have custom code based on the binary
+      # name, so we're playing it safe.
+      wrapBin = binPath: ''
+        (
+          binDir="$(dirname "${binPath}")"
+          binName="$(basename "${binPath}")"
+          dotnetDir="$out/RoonDotnet"
+
+          ln -sf "$dotnetDir/dotnet" "$dotnetDir/$binName"
+          rm "${binPath}"
+          makeWrapper "$dotnetDir/$binName" "${binPath}" \
+            --add-flags "$binDir/$binName.dll" \
+            --argv0 "$binName" \
+            --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib icu66 ffmpeg openssl ]}" \
+            --prefix PATH : "$dotnetDir" \
+            --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \
+            --chdir "$binDir" \
+            --set DOTNET_ROOT "$dotnetDir"
+        )
+      '';
+    in
+    ''
+      runHook preInstall
+      mkdir -p $out
+      mv * $out
+
+      rm $out/check.sh
+      rm $out/start.sh
+      rm $out/VERSION
+
+      ${wrapBin "$out/Appliance/RAATServer"}
+      ${wrapBin "$out/Appliance/RoonAppliance"}
+      ${wrapBin "$out/Server/RoonServer"}
+
+      mkdir -p $out/bin
+      makeWrapper "$out/Server/RoonServer" "$out/bin/RoonServer" --chdir "$out"
+
+      runHook postInstall
+    '';
+
+  meta = with lib; {
+    description = "Music player for music lovers";
+    changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18";
+    homepage = "https://roonlabs.com";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ lovesegfault steell ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "RoonServer";
+  };
+}
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/by-name/ro/rootlesskit/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/rootlesskit/default.nix
rename to pkgs/by-name/ro/rootlesskit/package.nix
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/rose-pine-gtk/default.nix
rename to pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/by-name/ro/rose-pine-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/rose-pine/default.nix
rename to pkgs/by-name/ro/rose-pine-icon-theme/package.nix
diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/by-name/ro/rosie/package.nix
similarity index 100%
rename from pkgs/tools/text/rosie/default.nix
rename to pkgs/by-name/ro/rosie/package.nix
diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/by-name/ro/roslyn/deps.nix
similarity index 100%
rename from pkgs/development/compilers/roslyn/deps.nix
rename to pkgs/by-name/ro/roslyn/deps.nix
diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/by-name/ro/roslyn/package.nix
similarity index 100%
rename from pkgs/development/compilers/roslyn/default.nix
rename to pkgs/by-name/ro/roslyn/package.nix
diff --git a/pkgs/development/tools/roswell/0001-get-image-from-environment.patch b/pkgs/by-name/ro/roswell/0001-get-image-from-environment.patch
similarity index 100%
rename from pkgs/development/tools/roswell/0001-get-image-from-environment.patch
rename to pkgs/by-name/ro/roswell/0001-get-image-from-environment.patch
diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/by-name/ro/roswell/package.nix
similarity index 100%
rename from pkgs/development/tools/roswell/default.nix
rename to pkgs/by-name/ro/roswell/package.nix
diff --git a/pkgs/tools/misc/rot8/default.nix b/pkgs/by-name/ro/rot8/package.nix
similarity index 100%
rename from pkgs/tools/misc/rot8/default.nix
rename to pkgs/by-name/ro/rot8/package.nix
diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/by-name/ro/rotate-backups/package.nix
similarity index 100%
rename from pkgs/tools/backup/rotate-backups/default.nix
rename to pkgs/by-name/ro/rotate-backups/package.nix
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/by-name/ro/rote/package.nix
similarity index 100%
rename from pkgs/development/libraries/rote/default.nix
rename to pkgs/by-name/ro/rote/package.nix
diff --git a/pkgs/games/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch b/pkgs/by-name/ro/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
similarity index 100%
rename from pkgs/games/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
rename to pkgs/by-name/ro/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
diff --git a/pkgs/games/rotp/default.nix b/pkgs/by-name/ro/rotp/package.nix
similarity index 100%
rename from pkgs/games/rotp/default.nix
rename to pkgs/by-name/ro/rotp/package.nix
diff --git a/pkgs/applications/graphics/round/default.nix b/pkgs/by-name/ro/round/package.nix
similarity index 100%
rename from pkgs/applications/graphics/round/default.nix
rename to pkgs/by-name/ro/round/package.nix
diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/by-name/ro/rounded-mgenplus/package.nix
similarity index 100%
rename from pkgs/data/fonts/rounded-mgenplus/default.nix
rename to pkgs/by-name/ro/rounded-mgenplus/package.nix
diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/by-name/ro/roundup/package.nix
similarity index 100%
rename from pkgs/tools/misc/roundup/default.nix
rename to pkgs/by-name/ro/roundup/package.nix
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/by-name/ro/route159/package.nix
similarity index 100%
rename from pkgs/data/fonts/route159/default.nix
rename to pkgs/by-name/ro/route159/package.nix
diff --git a/pkgs/tools/networking/routedns/default.nix b/pkgs/by-name/ro/routedns/package.nix
similarity index 100%
rename from pkgs/tools/networking/routedns/default.nix
rename to pkgs/by-name/ro/routedns/package.nix
diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/by-name/ro/router/librusty_v8.nix
similarity index 100%
rename from pkgs/servers/http/router/librusty_v8.nix
rename to pkgs/by-name/ro/router/librusty_v8.nix
diff --git a/pkgs/servers/http/router/default.nix b/pkgs/by-name/ro/router/package.nix
similarity index 100%
rename from pkgs/servers/http/router/default.nix
rename to pkgs/by-name/ro/router/package.nix
diff --git a/pkgs/tools/security/routersploit/default.nix b/pkgs/by-name/ro/routersploit/package.nix
similarity index 100%
rename from pkgs/tools/security/routersploit/default.nix
rename to pkgs/by-name/ro/routersploit/package.nix
diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/by-name/ro/routino/package.nix
similarity index 100%
rename from pkgs/tools/misc/routino/default.nix
rename to pkgs/by-name/ro/routino/package.nix
diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/by-name/ro/rowhammer-test/package.nix
similarity index 100%
rename from pkgs/tools/system/rowhammer-test/default.nix
rename to pkgs/by-name/ro/rowhammer-test/package.nix
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/by-name/rp/rpPPPoE/package.nix
similarity index 100%
rename from pkgs/tools/networking/rp-pppoe/default.nix
rename to pkgs/by-name/rp/rpPPPoE/package.nix
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/by-name/rp/rpcbind/package.nix
similarity index 100%
rename from pkgs/servers/rpcbind/default.nix
rename to pkgs/by-name/rp/rpcbind/package.nix
diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/by-name/rp/rpcbind/sunrpc.patch
similarity index 100%
rename from pkgs/servers/rpcbind/sunrpc.patch
rename to pkgs/by-name/rp/rpcbind/sunrpc.patch
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 12942225207d..deaeac82bda8 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,10 +33,10 @@
 
 let
   # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "16999-938306a7b";
-  rpcs3Version = "0.0.33-16999-938306a7b";
-  rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f";
-  rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34=";
+  rpcs3GitVersion = "17070-8b8396b94";
+  rpcs3Version = "0.0.33-17070-8b8396b94";
+  rpcs3Revision = "8b8396b9455394486656660c960d420c5b6c446c";
+  rpcs3Hash = "sha256-LUgKUzoBNY4ZemRBsLOjtXxLXHyRkPivtdSSgUGw5h4=";
 
   inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
 in
diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/by-name/rp/rpcsvc-proto/package.nix
similarity index 100%
rename from pkgs/tools/misc/rpcsvc-proto/default.nix
rename to pkgs/by-name/rp/rpcsvc-proto/package.nix
diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/by-name/rp/rpg-cli/package.nix
similarity index 100%
rename from pkgs/games/rpg-cli/default.nix
rename to pkgs/by-name/rp/rpg-cli/package.nix
diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix
index 424132d6361a..57ce9d56e39f 100644
--- a/pkgs/by-name/rp/rpiboot/package.nix
+++ b/pkgs/by-name/rp/rpiboot/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  gitUpdater,
   libusb1,
   pkg-config,
 }:
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
     cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-imager-embedded $out/share/rpiboot
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://github.com/raspberrypi/usbboot";
     changelog = "https://github.com/raspberrypi/usbboot/blob/${version}/debian/changelog";
diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/by-name/rp/rpiplay/package.nix
similarity index 100%
rename from pkgs/servers/rpiplay/default.nix
rename to pkgs/by-name/rp/rpiplay/package.nix
diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/by-name/rp/rpl/package.nix
similarity index 100%
rename from pkgs/tools/text/rpl/default.nix
rename to pkgs/by-name/rp/rpl/package.nix
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/by-name/rp/rpm-ostree/package.nix
similarity index 100%
rename from pkgs/tools/misc/rpm-ostree/default.nix
rename to pkgs/by-name/rp/rpm-ostree/package.nix
diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/by-name/rp/rpm2targz/package.nix
similarity index 100%
rename from pkgs/tools/archivers/rpm2targz/default.nix
rename to pkgs/by-name/rp/rpm2targz/package.nix
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/by-name/rp/rpmextract/package.nix
similarity index 100%
rename from pkgs/tools/archivers/rpmextract/default.nix
rename to pkgs/by-name/rp/rpmextract/package.nix
diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/by-name/rp/rpmextract/rpmextract.sh
similarity index 100%
rename from pkgs/tools/archivers/rpmextract/rpmextract.sh
rename to pkgs/by-name/rp/rpmextract/rpmextract.sh
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/by-name/rq/rq/package.nix
similarity index 100%
rename from pkgs/development/tools/rq/default.nix
rename to pkgs/by-name/rq/rq/package.nix
diff --git a/pkgs/by-name/rq/rqbit/Cargo.lock b/pkgs/by-name/rq/rqbit/Cargo.lock
deleted file mode 100644
index 16673eb56f63..000000000000
--- a/pkgs/by-name/rq/rqbit/Cargo.lock
+++ /dev/null
@@ -1,3310 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "axum"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core 0.3.4",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper 0.1.2",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
-dependencies = [
- "async-trait",
- "axum-core 0.4.3",
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper 1.0.1",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper 0.1.2",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "backoff"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
-dependencies = [
- "getrandom",
- "instant",
- "rand",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-
-[[package]]
-name = "cc"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "clap"
-version = "4.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim 0.10.0",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "commoncrypto"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
-dependencies = [
- "commoncrypto-sys",
-]
-
-[[package]]
-name = "commoncrypto-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "console-api"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"
-dependencies = [
- "futures-core",
- "prost",
- "prost-types",
- "tonic",
- "tracing-core",
-]
-
-[[package]]
-name = "console-subscriber"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e"
-dependencies = [
- "console-api",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures-task",
- "hdrhistogram",
- "humantime",
- "prost-types",
- "serde",
- "serde_json",
- "thread_local",
- "tokio",
- "tokio-stream",
- "tonic",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array 0.14.7",
- "typenum",
-]
-
-[[package]]
-name = "crypto-hash"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca"
-dependencies = [
- "commoncrypto",
- "hex 0.3.2",
- "openssl",
- "winapi",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.11.1",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
- "serde",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "directories"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
-[[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.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[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 = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.3.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.1.0",
- "indexmap 2.3.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "hdrhistogram"
-version = "7.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
-dependencies = [
- "base64 0.21.7",
- "byteorder",
- "flate2",
- "nom",
- "num-traits",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http 1.1.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2 0.4.5",
- "http 1.1.0",
- "http-body 1.0.1",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
-dependencies = [
- "futures-util",
- "http 1.1.0",
- "hyper 1.4.1",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "webpki-roots",
-]
-
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper 0.14.30",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "hyper 1.4.1",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[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 = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
- "serde",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "leaky-bucket"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5"
-dependencies = [
- "parking_lot",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
-]
-
-[[package]]
-name = "librqbit"
-version = "6.0.0"
-dependencies = [
- "anyhow",
- "async-stream",
- "axum 0.7.5",
- "backoff",
- "base64 0.21.7",
- "bincode",
- "bitvec",
- "byteorder",
- "bytes",
- "crypto-hash",
- "dashmap",
- "futures",
- "hex 0.4.3",
- "http 1.1.0",
- "itertools",
- "librqbit-bencode",
- "librqbit-buffers",
- "librqbit-clone-to-owned",
- "librqbit-core",
- "librqbit-dht",
- "librqbit-peer-protocol",
- "librqbit-sha1-wrapper",
- "librqbit-tracker-comms",
- "librqbit-upnp",
- "lru",
- "memmap2",
- "mime_guess",
- "openssl",
- "parking_lot",
- "rand",
- "regex",
- "reqwest",
- "rlimit",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "serde_with",
- "sha1",
- "size_format",
- "tempfile",
- "tokio",
- "tokio-stream",
- "tokio-test",
- "tokio-util",
- "tower-http",
- "tracing",
- "tracing-subscriber",
- "url",
- "urlencoding",
- "uuid",
-]
-
-[[package]]
-name = "librqbit-bencode"
-version = "2.2.3"
-dependencies = [
- "anyhow",
- "librqbit-buffers",
- "librqbit-clone-to-owned",
- "librqbit-sha1-wrapper",
- "serde",
-]
-
-[[package]]
-name = "librqbit-buffers"
-version = "3.0.1"
-dependencies = [
- "librqbit-clone-to-owned",
- "serde",
-]
-
-[[package]]
-name = "librqbit-clone-to-owned"
-version = "2.2.1"
-
-[[package]]
-name = "librqbit-core"
-version = "3.9.0"
-dependencies = [
- "anyhow",
- "data-encoding",
- "directories",
- "hex 0.4.3",
- "itertools",
- "librqbit-bencode",
- "librqbit-buffers",
- "librqbit-clone-to-owned",
- "parking_lot",
- "serde",
- "serde_json",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "librqbit-dht"
-version = "5.0.4"
-dependencies = [
- "anyhow",
- "backoff",
- "chrono",
- "dashmap",
- "futures",
- "hex 0.4.3",
- "indexmap 2.3.0",
- "leaky-bucket",
- "librqbit-bencode",
- "librqbit-clone-to-owned",
- "librqbit-core",
- "parking_lot",
- "rand",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "librqbit-peer-protocol"
-version = "3.6.0"
-dependencies = [
- "anyhow",
- "bincode",
- "bitvec",
- "byteorder",
- "librqbit-bencode",
- "librqbit-buffers",
- "librqbit-clone-to-owned",
- "librqbit-core",
- "serde",
-]
-
-[[package]]
-name = "librqbit-sha1-wrapper"
-version = "3.0.0"
-dependencies = [
- "crypto-hash",
-]
-
-[[package]]
-name = "librqbit-tracker-comms"
-version = "1.0.3"
-dependencies = [
- "anyhow",
- "async-stream",
- "byteorder",
- "futures",
- "librqbit-bencode",
- "librqbit-buffers",
- "librqbit-core",
- "rand",
- "reqwest",
- "serde",
- "tokio",
- "tracing",
- "url",
- "urlencoding",
-]
-
-[[package]]
-name = "librqbit-upnp"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-recursion",
- "futures",
- "network-interface",
- "reqwest",
- "serde",
- "serde-xml-rs",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "lru"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
-dependencies = [
- "hermit-abi",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "network-interface"
-version = "1.1.1"
-source = "git+https://github.com/ikatson/network-interface?branch=compile-on-freebsd#aca8a95ab1bb41a27bc82c6a2425eb4824bf0352"
-dependencies = [
- "cc",
- "libc",
- "thiserror",
- "winapi",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg",
- "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-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "object"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "openssl"
-version = "0.10.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-src"
-version = "300.3.1+3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
-dependencies = [
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "backtrace",
- "cfg-if",
- "libc",
- "petgraph",
- "redox_syscall",
- "smallvec",
- "thread-id",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "parse_duration"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7037e5e93e0172a5a96874380bf73bc6ecef022e26fa25f2be26864d6b3ba95d"
-dependencies = [
- "lazy_static",
- "num",
- "regex",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap 2.3.0",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[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.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "prost"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "quinn"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
-dependencies = [
- "bytes",
- "rand",
- "ring",
- "rustc-hash",
- "rustls",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
-dependencies = [
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.4.5",
- "http 1.1.0",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-pemfile",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 1.0.1",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rlimit"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "rqbit"
-version = "6.0.0"
-dependencies = [
- "anyhow",
- "bytes",
- "clap",
- "clap_complete",
- "console-subscriber",
- "futures",
- "librqbit",
- "openssl",
- "parking_lot",
- "parse_duration",
- "regex",
- "serde",
- "serde_json",
- "size_format",
- "tokio",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc-hash"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
-dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
-dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-xml-rs"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782"
-dependencies = [
- "log",
- "serde",
- "thiserror",
- "xml-rs",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.122"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "3.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex 0.4.3",
- "indexmap 1.9.3",
- "indexmap 2.3.0",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "size_format"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed5f6ab2122c6dec69dca18c72fa4590a27e581ad20d44960fe74c032a0b23b"
-dependencies = [
- "generic-array 0.12.4",
- "num",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "2.0.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "tempfile"
-version = "3.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread-id"
-version = "4.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-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.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "pin-project-lite",
- "socket2",
- "tokio-macros",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "tokio-test"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
-dependencies = [
- "async-stream",
- "bytes",
- "futures-core",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tonic"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum 0.6.20",
- "base64 0.21.7",
- "bytes",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "tokio",
- "tokio-stream",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap 1.9.3",
- "pin-project",
- "pin-project-lite",
- "rand",
- "slab",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
-dependencies = [
- "bitflags 2.6.0",
- "bytes",
- "http 1.1.0",
- "http-body 1.0.1",
- "http-body-util",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "untrusted"
-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",
- "percent-encoding",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-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.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "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]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index bdd27f02a896..9be8715f9cb1 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -1,27 +1,70 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, darwin }:
-
-rustPlatform.buildRustPackage rec {
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  darwin,
+  buildNpmPackage,
+  nodejs_20,
+}:
+let
   pname = "rqbit";
-  version = "6.0.0";
+
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "ikatson";
     repo = "rqbit";
     rev = "v${version}";
-    hash = "sha256-YOjFCX1Ckk0M2QOGoYKoY80TFnHs00aVJJAWv2RIp4A=";
+    hash = "sha256-Lt3HxK8fB1Xn2422wGkJ90muJjZ7r9ZHngGD/2tkaMM=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "network-interface-1.1.1" = "sha256-9fWdR5nr73oFP9FzHhDsbA4ifQf3LkzBygspxI9/ufs=";
-    };
+  rqbit-webui = buildNpmPackage {
+    pname = "rqbit-webui";
+
+    nodejs = nodejs_20;
+
+    inherit version src;
+
+    sourceRoot = "${src.name}/crates/librqbit/webui";
+
+    npmDepsHash = "sha256-VYPZXZx9rKLKZm5+d2wSVkoPLCQCffaeZVSi7mKRH/M=";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/dist
+      cp -r dist/** $out/dist
+
+      runHook postInstall
+    '';
   };
+in
+rustPlatform.buildRustPackage {
+  inherit pname version src;
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+  cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [
+    pkg-config
+  ];
+
+  buildInputs =
+    lib.optionals stdenv.isLinux [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
+
+  preConfigure = ''
+    mkdir -p crates/librqbit/webui/dist
+    cp -R ${rqbit-webui}/dist/** crates/librqbit/webui/dist
+  '';
+
+  postPatch = ''
+    # This script fascilitates the build of the webui,
+    #  we've already built that
+    rm crates/librqbit/build.rs
+  '';
 
   doCheck = false;
 
@@ -30,7 +73,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ikatson/rqbit";
     changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ cafkafk toasteruwu ];
+    maintainers = with maintainers; [
+      cafkafk
+      toasteruwu
+    ];
     mainProgram = "rqbit";
   };
 }
diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/by-name/rq/rqlite/package.nix
similarity index 100%
rename from pkgs/servers/sql/rqlite/default.nix
rename to pkgs/by-name/rq/rqlite/package.nix
diff --git a/pkgs/games/rrootage/default.nix b/pkgs/by-name/rr/rrootage/package.nix
similarity index 100%
rename from pkgs/games/rrootage/default.nix
rename to pkgs/by-name/rr/rrootage/package.nix
diff --git a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rs-git-fsmonitor/default.nix
rename to pkgs/by-name/rs/rs-git-fsmonitor/package.nix
diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix
index ec6c62e96e36..79b5180c065a 100644
--- a/pkgs/by-name/rs/rs-tftpd/package.nix
+++ b/pkgs/by-name/rs/rs-tftpd/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rs-tftpd";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "altugbakan";
     repo = "rs-tftpd";
     rev = version;
-    hash = "sha256-ZWafSqHEBgS7LR9hTfatatvAFZnCP8L5rHLerdjyrUc=";
+    hash = "sha256-RUjxCHO4X3V3Mt6zargqqT2v92XTt8FO9S68+tYZFC0=";
   };
 
-  cargoHash = "sha256-uBVDH7YYSuFv0r5T2+EAoL02ta+1hjaza/Ilu+a+k0k=";
+  cargoHash = "sha256-sLdOVthIHXzdY0/tVn2J0CUr3IqLsVHO/5S4X0NmN64=";
 
   buildFeatures = [ "client" ];
 
diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/by-name/rs/rsass/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rsass/default.nix
rename to pkgs/by-name/rs/rsass/package.nix
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/by-name/rs/rsbep/package.nix
similarity index 100%
rename from pkgs/tools/backup/rsbep/default.nix
rename to pkgs/by-name/rs/rsbep/package.nix
diff --git a/pkgs/tools/text/rsbkb/default.nix b/pkgs/by-name/rs/rsbkb/package.nix
similarity index 100%
rename from pkgs/tools/text/rsbkb/default.nix
rename to pkgs/by-name/rs/rsbkb/package.nix
diff --git a/pkgs/tools/text/rsbkb/time.patch b/pkgs/by-name/rs/rsbkb/time.patch
similarity index 100%
rename from pkgs/tools/text/rsbkb/time.patch
rename to pkgs/by-name/rs/rsbkb/time.patch
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/by-name/rs/rsclock/package.nix
similarity index 100%
rename from pkgs/applications/misc/rsclock/default.nix
rename to pkgs/by-name/rs/rsclock/package.nix
diff --git a/pkgs/applications/radio/rscw/default.nix b/pkgs/by-name/rs/rscw/package.nix
similarity index 100%
rename from pkgs/applications/radio/rscw/default.nix
rename to pkgs/by-name/rs/rscw/package.nix
diff --git a/pkgs/tools/admin/rset/default.nix b/pkgs/by-name/rs/rset/package.nix
similarity index 100%
rename from pkgs/tools/admin/rset/default.nix
rename to pkgs/by-name/rs/rset/package.nix
diff --git a/pkgs/tools/admin/rset/paths.patch b/pkgs/by-name/rs/rset/paths.patch
similarity index 100%
rename from pkgs/tools/admin/rset/paths.patch
rename to pkgs/by-name/rs/rset/paths.patch
diff --git a/pkgs/by-name/rs/rshijack/package.nix b/pkgs/by-name/rs/rshijack/package.nix
new file mode 100644
index 000000000000..6984d538c5d4
--- /dev/null
+++ b/pkgs/by-name/rs/rshijack/package.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rshijack";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "kpcyrd";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo=";
+  };
+
+  cargoHash = "sha256-3rDPk+lPRrDrE2iqHAOi7zhyc+xYPXkM9P4Bu0JUL40=";
+
+  meta = with lib; {
+    description = "TCP connection hijacker";
+    homepage = "https://github.com/kpcyrd/rshijack";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ xrelkd ];
+    platforms = platforms.unix;
+    mainProgram = "rshijack";
+  };
+}
diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/by-name/rs/rshim-user-space/package.nix
similarity index 100%
rename from pkgs/tools/misc/rshim-user-space/default.nix
rename to pkgs/by-name/rs/rshim-user-space/package.nix
diff --git a/pkgs/tools/security/rsign2/default.nix b/pkgs/by-name/rs/rsign2/package.nix
similarity index 100%
rename from pkgs/tools/security/rsign2/default.nix
rename to pkgs/by-name/rs/rsign2/package.nix
diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/by-name/rs/rslint/package.nix
similarity index 100%
rename from pkgs/development/tools/rslint/default.nix
rename to pkgs/by-name/rs/rslint/package.nix
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/by-name/rs/rsnapshot/package.nix
similarity index 100%
rename from pkgs/tools/backup/rsnapshot/default.nix
rename to pkgs/by-name/rs/rsnapshot/package.nix
diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/by-name/rs/rsonpath/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rsonpath/default.nix
rename to pkgs/by-name/rs/rsonpath/package.nix
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
new file mode 100644
index 000000000000..ea0768433325
--- /dev/null
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -0,0 +1,108 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  doctest,
+  fmt_11,
+  perl,
+  glib,
+  luajit,
+  openssl,
+  pcre,
+  pkg-config,
+  sqlite,
+  ragel,
+  icu,
+  hyperscan,
+  jemalloc,
+  blas,
+  lapack,
+  lua,
+  libsodium,
+  xxHash,
+  zstd,
+  libarchive,
+  withBlas ? true,
+  withHyperscan ? stdenv.hostPlatform.isx86_64,
+  withLuaJIT ? stdenv.hostPlatform.isx86_64,
+  nixosTests,
+}:
+
+assert withHyperscan -> stdenv.hostPlatform.isx86_64;
+
+stdenv.mkDerivation rec {
+  pname = "rspamd";
+  version = "3.10.2";
+
+  src = fetchFromGitHub {
+    owner = "rspamd";
+    repo = "rspamd";
+    rev = version;
+    hash = "sha256-x0Mw2ug5H6BZI6LKOjFufYzGVxZIkgxXHeIX7Emsj8A=";
+  };
+
+  hardeningEnable = [ "pie" ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    perl
+  ];
+  buildInputs =
+    [
+      doctest
+      fmt_11
+      glib
+      openssl
+      pcre
+      sqlite
+      ragel
+      icu
+      jemalloc
+      libsodium
+      xxHash
+      zstd
+      libarchive
+    ]
+    ++ lib.optional withHyperscan hyperscan
+    ++ lib.optionals withBlas [
+      blas
+      lapack
+    ]
+    ++ lib.optional withLuaJIT luajit
+    ++ lib.optional (!withLuaJIT) lua;
+
+  cmakeFlags =
+    [
+      # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
+      "-DENABLE_PCRE2=OFF"
+      "-DDEBIAN_BUILD=ON"
+      "-DRUNDIR=/run/rspamd"
+      "-DDBDIR=/var/lib/rspamd"
+      "-DLOGDIR=/var/log/rspamd"
+      "-DLOCAL_CONFDIR=/etc/rspamd"
+      "-DENABLE_JEMALLOC=ON"
+      "-DSYSTEM_DOCTEST=ON"
+      "-DSYSTEM_FMT=ON"
+      "-DSYSTEM_XXHASH=ON"
+      "-DSYSTEM_ZSTD=ON"
+    ]
+    ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
+    ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
+
+  passthru.tests.rspamd = nixosTests.rspamd;
+
+  meta = with lib; {
+    homepage = "https://rspamd.com";
+    license = licenses.asl20;
+    description = "Advanced spam filtering system";
+    maintainers = with maintainers; [
+      avnik
+      fpletz
+      globin
+      lewo
+    ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/by-name/rs/rss-bridge-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/rss-bridge-cli/default.nix
rename to pkgs/by-name/rs/rss-bridge-cli/package.nix
diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/by-name/rs/rss-bridge/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/rss-bridge/default.nix
rename to pkgs/by-name/rs/rss-bridge/package.nix
diff --git a/pkgs/misc/screensavers/rss-glx/cstddef.patch b/pkgs/by-name/rs/rss-glx/cstddef.patch
similarity index 100%
rename from pkgs/misc/screensavers/rss-glx/cstddef.patch
rename to pkgs/by-name/rs/rss-glx/cstddef.patch
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/by-name/rs/rss-glx/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/rss-glx/default.nix
rename to pkgs/by-name/rs/rss-glx/package.nix
diff --git a/pkgs/by-name/rs/rsstail/package.nix b/pkgs/by-name/rs/rsstail/package.nix
new file mode 100644
index 000000000000..c654bd4e8a1d
--- /dev/null
+++ b/pkgs/by-name/rs/rsstail/package.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchFromGitHub, libmrss }:
+
+stdenv.mkDerivation (final: {
+  pname = "rsstail";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "folkertvanheusden";
+    repo = "rsstail";
+    rev = "v${final.version}";
+    hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I=";
+  };
+
+  buildInputs = [ libmrss ];
+
+  makeFlags = [ "prefix=$(out)" ];
+  enableParallelBuilding = true;
+
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
+
+  # just runs cppcheck linter
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Monitor RSS feeds for new entries";
+    mainProgram = "rsstail";
+    longDescription = ''
+      RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
+      detects a new entry it'll emit only that new entry.
+    '';
+    homepage = "https://www.vanheusden.com/rsstail/";
+    license = licenses.gpl2Only;
+    maintainers = [ maintainers.Necior ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/development/tools/rstfmt/default.nix b/pkgs/by-name/rs/rstfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/rstfmt/default.nix
rename to pkgs/by-name/rs/rstfmt/package.nix
diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/by-name/rt/rt-tests/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rt-tests/default.nix
rename to pkgs/by-name/rt/rt-tests/package.nix
diff --git a/pkgs/servers/rt/dont-check-users_groups.patch b/pkgs/by-name/rt/rt/dont-check-users_groups.patch
similarity index 100%
rename from pkgs/servers/rt/dont-check-users_groups.patch
rename to pkgs/by-name/rt/rt/dont-check-users_groups.patch
diff --git a/pkgs/servers/rt/override-generated.patch b/pkgs/by-name/rt/rt/override-generated.patch
similarity index 100%
rename from pkgs/servers/rt/override-generated.patch
rename to pkgs/by-name/rt/rt/override-generated.patch
diff --git a/pkgs/servers/rt/default.nix b/pkgs/by-name/rt/rt/package.nix
similarity index 100%
rename from pkgs/servers/rt/default.nix
rename to pkgs/by-name/rt/rt/package.nix
diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/by-name/rt/rt5677-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/rt5677/default.nix
rename to pkgs/by-name/rt/rt5677-firmware/package.nix
diff --git a/pkgs/applications/misc/rtfm/enable-write-permissions.patch b/pkgs/by-name/rt/rtfm/enable-write-permissions.patch
similarity index 100%
rename from pkgs/applications/misc/rtfm/enable-write-permissions.patch
rename to pkgs/by-name/rt/rtfm/enable-write-permissions.patch
diff --git a/pkgs/applications/misc/rtfm/make.patch b/pkgs/by-name/rt/rtfm/make.patch
similarity index 100%
rename from pkgs/applications/misc/rtfm/make.patch
rename to pkgs/by-name/rt/rtfm/make.patch
diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/by-name/rt/rtfm/package.nix
similarity index 100%
rename from pkgs/applications/misc/rtfm/default.nix
rename to pkgs/by-name/rt/rtfm/package.nix
diff --git a/pkgs/applications/misc/rtfm/shards.nix b/pkgs/by-name/rt/rtfm/shards.nix
similarity index 100%
rename from pkgs/applications/misc/rtfm/shards.nix
rename to pkgs/by-name/rt/rtfm/shards.nix
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/by-name/rt/rtkit/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rtkit/default.nix
rename to pkgs/by-name/rt/rtkit/package.nix
diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/by-name/rt/rtl-ais/package.nix
similarity index 100%
rename from pkgs/applications/radio/rtl-ais/default.nix
rename to pkgs/by-name/rt/rtl-ais/package.nix
diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/by-name/rt/rtl8192su-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
rename to pkgs/by-name/rt/rtl8192su-firmware/package.nix
diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/by-name/rt/rtl8761b-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix
rename to pkgs/by-name/rt/rtl8761b-firmware/package.nix
diff --git a/pkgs/by-name/rt/rtl_433/package.nix b/pkgs/by-name/rt/rtl_433/package.nix
new file mode 100644
index 000000000000..c1a5f1cea877
--- /dev/null
+++ b/pkgs/by-name/rt/rtl_433/package.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+, libusb1, rtl-sdr, soapysdr-with-plugins
+}:
+
+stdenv.mkDerivation rec {
+  version = "24.10";
+  pname = "rtl_433";
+
+  src = fetchFromGitHub {
+    owner = "merbanan";
+    repo = "rtl_433";
+    rev = version;
+    hash = "sha256-o4eAG6iYK4JXbh9JRv5NLmSxg396ErH++H0J8tTXiUA=";
+  };
+
+  nativeBuildInputs = [ pkg-config cmake ];
+
+  buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz";
+    homepage = "https://github.com/merbanan/rtl_433";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ earldouglas markuskowa ];
+    platforms = platforms.all;
+    mainProgram = "rtl_433";
+  };
+}
diff --git a/pkgs/development/libraries/rtlcss/default.nix b/pkgs/by-name/rt/rtlcss/package.nix
similarity index 100%
rename from pkgs/development/libraries/rtlcss/default.nix
rename to pkgs/by-name/rt/rtlcss/package.nix
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/by-name/rt/rtmpdump/package.nix
similarity index 100%
rename from pkgs/tools/video/rtmpdump/default.nix
rename to pkgs/by-name/rt/rtmpdump/package.nix
diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index b2739defd11b..94da18d76891 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -1,21 +1,23 @@
-{ lib
-, stdenv
-, autoconf-archive
-, autoreconfHook
-, cppunit
-, curl
-, fetchFromGitHub
-, installShellFiles
-, libsigcxx
-, libtool
-, libtorrent
-, ncurses
-, openssl
-, pkg-config
-, xmlrpc_c
-, zlib
-, nixosTests
-, gitUpdater
+{
+  lib,
+  stdenv,
+  autoconf-archive,
+  autoreconfHook,
+  cppunit,
+  curl,
+  fetchFromGitHub,
+  fetchpatch,
+  installShellFiles,
+  libsigcxx,
+  libtool,
+  libtorrent,
+  ncurses,
+  openssl,
+  pkg-config,
+  xmlrpc_c,
+  zlib,
+  nixosTests,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +31,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8=";
   };
 
-  outputs = [ "out" "man" ];
+  patches = [
+    # fix: use fsync for osx builds
+    (fetchpatch {
+      url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch";
+      hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw=";
+    })
+  ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
 
   passthru = {
     inherit libtorrent;
@@ -77,7 +90,11 @@ stdenv.mkDerivation rec {
     homepage = "https://rakshasa.github.io/rtorrent/";
     description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];
+    maintainers = with lib.maintainers; [
+      ebzzry
+      codyopel
+      thiagokokada
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "rtorrent";
   };
diff --git a/pkgs/tools/networking/rtptools/default.nix b/pkgs/by-name/rt/rtptools/package.nix
similarity index 100%
rename from pkgs/tools/networking/rtptools/default.nix
rename to pkgs/by-name/rt/rtptools/package.nix
diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/by-name/rt/rtrlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/rtrlib/default.nix
rename to pkgs/by-name/rt/rtrlib/package.nix
diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/by-name/rt/rtss/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rtss/default.nix
rename to pkgs/by-name/rt/rtss/package.nix
diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/by-name/rt/rttr/package.nix
similarity index 100%
rename from pkgs/development/libraries/rttr/default.nix
rename to pkgs/by-name/rt/rttr/package.nix
diff --git a/pkgs/tools/misc/rtz/Cargo.lock b/pkgs/by-name/rt/rtz/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/rtz/Cargo.lock
rename to pkgs/by-name/rt/rtz/Cargo.lock
diff --git a/pkgs/tools/misc/rtz/default.nix b/pkgs/by-name/rt/rtz/package.nix
similarity index 100%
rename from pkgs/tools/misc/rtz/default.nix
rename to pkgs/by-name/rt/rtz/package.nix
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/by-name/ru/rubber/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/rubber/default.nix
rename to pkgs/by-name/ru/rubber/package.nix
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/by-name/ru/rubberband/package.nix
similarity index 100%
rename from pkgs/development/libraries/rubberband/default.nix
rename to pkgs/by-name/ru/rubberband/package.nix
diff --git a/pkgs/data/fonts/rubik/default.nix b/pkgs/by-name/ru/rubik/package.nix
similarity index 100%
rename from pkgs/data/fonts/rubik/default.nix
rename to pkgs/by-name/ru/rubik/package.nix
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/by-name/ru/rubiks/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/rubiks/default.nix
rename to pkgs/by-name/ru/rubiks/package.nix
diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/by-name/ru/rubyripper/package.nix
similarity index 100%
rename from pkgs/applications/audio/rubyripper/default.nix
rename to pkgs/by-name/ru/rubyripper/package.nix
diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/by-name/ru/rucksack/package.nix
similarity index 100%
rename from pkgs/development/tools/rucksack/default.nix
rename to pkgs/by-name/ru/rucksack/package.nix
diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock
index 0e488abec554..c2078ab16a8d 100644
--- a/pkgs/by-name/ru/ruff/Cargo.lock
+++ b/pkgs/by-name/ru/ruff/Cargo.lock
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.90"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "append-only-vec"
@@ -407,7 +407,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -687,7 +687,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -698,7 +698,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1162,12 +1162,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -1193,9 +1193,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "inotify"
-version = "0.9.6"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
 dependencies = [
  "bitflags 1.3.2",
  "inotify-sys",
@@ -1213,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.40.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
+checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8"
 dependencies = [
  "console",
  "globset",
@@ -1267,7 +1267,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1393,7 +1393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b"
 dependencies = [
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1532,14 +1532,15 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi",
  "libc",
  "log",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1593,12 +1594,11 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "6.1.1"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009"
 dependencies = [
  "bitflags 2.6.0",
- "crossbeam-channel",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -1606,8 +1606,18 @@ dependencies = [
  "libc",
  "log",
  "mio",
+ "notify-types",
  "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "notify-types"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df"
+dependencies = [
+ "instant",
 ]
 
 [[package]]
@@ -1786,9 +1796,9 @@ dependencies = [
 
 [[package]]
 name = "pep440_rs"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8ee724d21f351f9d47276614ac9710975db827ba9fe2ca5a517ba648193307"
+checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7"
 dependencies = [
  "serde",
  "unicode-width 0.2.0",
@@ -1848,7 +1858,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1963,9 +1973,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2102,6 +2112,7 @@ dependencies = [
  "countme",
  "dir-test",
  "hashbrown 0.15.0",
+ "indexmap",
  "insta",
  "itertools 0.13.0",
  "memchr",
@@ -2247,9 +2258,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2306,7 +2317,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.7.1"
+version = "0.7.3"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2523,7 +2534,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.7.1"
+version = "0.7.3"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2546,7 +2557,7 @@ dependencies = [
  "natord",
  "path-absolutize",
  "pathdiff",
- "pep440_rs 0.7.1",
+ "pep440_rs 0.7.2",
  "pyproject-toml",
  "quick-junit",
  "regex",
@@ -2590,7 +2601,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "ruff_python_trivia",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2620,12 +2631,14 @@ dependencies = [
  "compact_str",
  "is-macro",
  "itertools 0.13.0",
+ "memchr",
  "ruff_cache",
  "ruff_macros",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash 2.0.0",
+ "salsa",
  "schemars",
  "serde",
 ]
@@ -2748,7 +2761,6 @@ dependencies = [
  "ruff_python_ast",
  "ruff_python_parser",
  "ruff_python_stdlib",
- "ruff_source_file",
  "ruff_text_size",
  "rustc-hash 2.0.0",
  "schemars",
@@ -2779,7 +2791,6 @@ dependencies = [
  "insta",
  "ruff_python_parser",
  "ruff_python_trivia",
- "ruff_source_file",
  "ruff_text_size",
 ]
 
@@ -2838,7 +2849,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.7.1"
+version = "0.7.3"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -2877,7 +2888,7 @@ dependencies = [
  "matchit",
  "path-absolutize",
  "path-slash",
- "pep440_rs 0.7.1",
+ "pep440_rs 0.7.2",
  "regex",
  "ruff_cache",
  "ruff_formatter",
@@ -3009,7 +3020,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
  "synstructure",
 ]
 
@@ -3043,7 +3054,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3066,9 +3077,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
@@ -3086,13 +3097,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3103,7 +3114,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3126,7 +3137,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3167,7 +3178,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3269,7 +3280,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3291,9 +3302,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.82"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3308,7 +3319,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3371,7 +3382,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3382,28 +3393,28 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
  "test-case-core",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3515,7 +3526,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3773,7 +3784,7 @@ checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3859,7 +3870,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -3893,7 +3904,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3927,7 +3938,7 @@ checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4215,7 +4226,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 25678f65f83a..914b9b29714f 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -15,7 +15,7 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "ruff";
-  version = "0.7.1";
+  version = "0.7.3";
   pyproject = true;
 
   outputs = [
@@ -27,7 +27,7 @@ python3Packages.buildPythonPackage rec {
     owner = "astral-sh";
     repo = "ruff";
     rev = "refs/tags/${version}";
-    hash = "sha256-TPr6YdSb5JKltXHDi1PdGzPYjmmsbCFQKxIiJURrBMI=";
+    hash = "sha256-TQ7nBd2S77VYShYxpxZ3CfCMiOGyl9EtIv9nXZjmijc=";
   };
 
   # Do not rely on path lookup at runtime to find the ruff binary
@@ -93,8 +93,8 @@ python3Packages.buildPythonPackage rec {
   # 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.hostPlatform.isDarwin [
+    "--skip=add_search_path"
     "--skip=changed_file"
-    "--skip=changed_metadata"
     "--skip=changed_versions_file"
     "--skip=deleted_file"
     "--skip=directory_deleted"
@@ -109,7 +109,9 @@ python3Packages.buildPythonPackage rec {
     "--skip=new_ignored_file"
     "--skip=rename_file"
     "--skip=search_path"
+    "--skip=unix::changed_metadata"
     "--skip=unix::symlink_inside_workspace"
+    "--skip=unix::symlinked_module_search_path"
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/applications/emulators/ruffle/Cargo.lock b/pkgs/by-name/ru/ruffle/Cargo.lock
similarity index 100%
rename from pkgs/applications/emulators/ruffle/Cargo.lock
rename to pkgs/by-name/ru/ruffle/Cargo.lock
diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/by-name/ru/ruffle/package.nix
similarity index 100%
rename from pkgs/applications/emulators/ruffle/default.nix
rename to pkgs/by-name/ru/ruffle/package.nix
diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/by-name/ru/ruler/package.nix
similarity index 100%
rename from pkgs/tools/security/ruler/default.nix
rename to pkgs/by-name/ru/ruler/package.nix
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/by-name/ru/run-scaled/package.nix
similarity index 100%
rename from pkgs/tools/X11/run-scaled/default.nix
rename to pkgs/by-name/ru/run-scaled/package.nix
diff --git a/pkgs/development/tools/run/default.nix b/pkgs/by-name/ru/run/package.nix
similarity index 100%
rename from pkgs/development/tools/run/default.nix
rename to pkgs/by-name/ru/run/package.nix
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/by-name/ru/runc/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/runc/default.nix
rename to pkgs/by-name/ru/runc/package.nix
diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/by-name/ru/rund/package.nix
similarity index 100%
rename from pkgs/development/tools/rund/default.nix
rename to pkgs/by-name/ru/rund/package.nix
diff --git a/pkgs/development/tools/language-servers/rune-languageserver/default.nix b/pkgs/by-name/ru/rune-languageserver/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/rune-languageserver/default.nix
rename to pkgs/by-name/ru/rune-languageserver/package.nix
diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/by-name/ru/rune/package.nix
similarity index 100%
rename from pkgs/development/interpreters/rune/default.nix
rename to pkgs/by-name/ru/rune/package.nix
diff --git a/pkgs/games/runelite/default.nix b/pkgs/by-name/ru/runelite/package.nix
similarity index 100%
rename from pkgs/games/runelite/default.nix
rename to pkgs/by-name/ru/runelite/package.nix
diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/by-name/ru/runescape/package.nix
similarity index 100%
rename from pkgs/games/runescape-launcher/default.nix
rename to pkgs/by-name/ru/runescape/package.nix
diff --git a/pkgs/tools/text/runiq/Cargo.lock b/pkgs/by-name/ru/runiq/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/runiq/Cargo.lock
rename to pkgs/by-name/ru/runiq/Cargo.lock
diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/by-name/ru/runiq/package.nix
similarity index 100%
rename from pkgs/tools/text/runiq/default.nix
rename to pkgs/by-name/ru/runiq/package.nix
diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
similarity index 100%
rename from pkgs/tools/system/runit/fix-ar-ranlib.patch
rename to pkgs/by-name/ru/runit/fix-ar-ranlib.patch
diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix
new file mode 100644
index 000000000000..f300ab2a33ac
--- /dev/null
+++ b/pkgs/by-name/ru/runit/package.nix
@@ -0,0 +1,61 @@
+{ lib, stdenv, fetchurl, darwin
+
+# Build runit-init as a static binary
+, static ? false
+}:
+
+stdenv.mkDerivation rec {
+  pname = "runit";
+  version = "2.2.0";
+
+  src = fetchurl {
+    url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
+    sha256 = "sha256-le9NKGi5eMcXn+R5AeXFeOEc8nPSkr1iCL06fMsCkpA=";
+  };
+
+  patches = [
+    ./fix-ar-ranlib.patch
+  ];
+
+  outputs = [ "out" "man" ];
+
+  sourceRoot = "admin/${pname}-${version}";
+
+  doCheck = true;
+
+  buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
+    lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp;
+
+  postPatch = ''
+    sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
+    # usernamespace sandbox of nix seems to conflict with runit's assumptions
+    # about unix users. Therefor skip the check
+    sed -i '/.\/chkshsgr/d' src/Makefile
+  '' + lib.optionalString (!static) ''
+    sed -i 's,-static,,g' src/Makefile
+  '';
+
+  preBuild = ''
+    cd src
+
+    # Both of these are originally hard-coded to gcc
+    echo ${stdenv.cc.targetPrefix}cc > conf-cc
+    echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.hostPlatform.isDarwin "-Xlinker -x "}> conf-ld
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -t $out/bin $(< ../package/commands)
+
+    mkdir -p $man/share/man
+    cp -r ../man $man/share/man/man8
+  '';
+
+  meta = with lib; {
+    description = "UNIX init scheme with service supervision";
+    license = licenses.bsd3;
+    homepage = "http://smarden.org/runit";
+    maintainers = with maintainers; [ joachifm ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/by-name/ru/runitor/package.nix
similarity index 100%
rename from pkgs/tools/system/runitor/default.nix
rename to pkgs/by-name/ru/runitor/package.nix
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/by-name/ru/runningx/package.nix
similarity index 100%
rename from pkgs/tools/X11/runningx/default.nix
rename to pkgs/by-name/ru/runningx/package.nix
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/by-name/ru/runzip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/runzip/default.nix
rename to pkgs/by-name/ru/runzip/package.nix
diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix
index 930eab157eed..c1db6cf152fd 100644
--- a/pkgs/by-name/ru/rush-parallel/package.nix
+++ b/pkgs/by-name/ru/rush-parallel/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rush-parallel";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "rush";
     rev = "v${version}";
-    hash = "sha256-u3KGjZ5C8jDuAKE/dy4zR+EEFb35aJtj2YkwIb+kad4=";
+    hash = "sha256-xwU6ZPGhaMxIsowTxWUxMDXO7hlWg2KynGGDX1dMZmo=";
   };
 
   vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M=";
diff --git a/pkgs/by-name/ru/rush/package.nix b/pkgs/by-name/ru/rush/package.nix
new file mode 100644
index 000000000000..92d78644864f
--- /dev/null
+++ b/pkgs/by-name/ru/rush/package.nix
@@ -0,0 +1,50 @@
+{ fetchurl, lib, stdenv, bash, perl }:
+
+stdenv.mkDerivation rec {
+  pname = "rush";
+  version = "2.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "sha256-Jm80iJq2pwO/CJCItSN8gUo5ThxRQsG0Z5TYVtWSEts=";
+  };
+
+  strictDeps = true;
+  buildInputs = [ bash ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/rush-po \
+      --replace "exec perl" "exec ${lib.getExe perl}"
+  '';
+
+  doCheck = true;
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Restricted User Shell";
+
+    longDescription = ''
+         GNU Rush is a Restricted User Shell, designed for sites
+         providing limited remote access to their resources, such as
+         svn or git repositories, scp, or the like.  Using a
+         sophisticated configuration file, Rush gives you complete
+         control over the command lines that users execute, as well as
+         over the usage of system resources, such as virtual memory,
+         CPU time, etc.
+
+         In particular, it allows remote programs to be run in a chrooted
+         environment, which is important with such programs as
+         sftp-server or scp, that lack this ability.
+      '';
+
+    homepage = "https://www.gnu.org/software/rush/";
+    license = lib.licenses.gpl3Plus;
+
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+
+  passthru = {
+    shellPath = "/bin/rush";
+  };
+}
diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/by-name/ru/rust-audit-info/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rust-audit-info/default.nix
rename to pkgs/by-name/ru/rust-audit-info/package.nix
diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix
similarity index 100%
rename from pkgs/development/tools/rust-code-analysis/default.nix
rename to pkgs/by-name/ru/rust-code-analysis/package.nix
diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/by-name/ru/rust-petname/package.nix
similarity index 100%
rename from pkgs/tools/text/rust-petname/default.nix
rename to pkgs/by-name/ru/rust-petname/package.nix
diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/by-name/ru/rust-script/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rust-script/default.nix
rename to pkgs/by-name/ru/rust-script/package.nix
diff --git a/pkgs/applications/misc/rust-traverse/default.nix b/pkgs/by-name/ru/rust-traverse/package.nix
similarity index 100%
rename from pkgs/applications/misc/rust-traverse/default.nix
rename to pkgs/by-name/ru/rust-traverse/package.nix
diff --git a/pkgs/development/libraries/rustc-demangle/Cargo.lock b/pkgs/by-name/ru/rustc-demangle/Cargo.lock
similarity index 100%
rename from pkgs/development/libraries/rustc-demangle/Cargo.lock
rename to pkgs/by-name/ru/rustc-demangle/Cargo.lock
diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/by-name/ru/rustc-demangle/package.nix
similarity index 100%
rename from pkgs/development/libraries/rustc-demangle/default.nix
rename to pkgs/by-name/ru/rustc-demangle/package.nix
diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
index 406c1525a8f8..fb924be286cf 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
+++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
@@ -3043,7 +3043,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 [[package]]
 name = "hwcodec"
 version = "0.7.0"
-source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26"
+source = "git+https://github.com/rustdesk-org/hwcodec#8bbd05bb300ad07cc345356ad85570f9ea99fbfa"
 dependencies = [
  "bindgen 0.59.2",
  "cc",
@@ -5197,7 +5197,7 @@ dependencies = [
 [[package]]
 name = "rdev"
 version = "0.5.0-2"
-source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e"
+source = "git+https://github.com/rustdesk-org/rdev#961d25cc00c6b3ef80f444e6a7bed9872e2c35ea"
 dependencies = [
  "cocoa 0.24.1",
  "core-foundation 0.9.4",
@@ -5472,7 +5472,7 @@ dependencies = [
 
 [[package]]
 name = "rustdesk"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "android-wakelock",
  "android_logger",
@@ -5572,7 +5572,7 @@ dependencies = [
 
 [[package]]
 name = "rustdesk-portable-packer"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "brotli",
  "dirs 5.0.1",
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 2dd1b134eaa6..3ff05d808baa 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -29,7 +29,7 @@ let
 
   flutterRustBridge = rustPlatform.buildRustPackage rec {
     pname = "flutter_rust_bridge_codegen";
-    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.1/.github/workflows/bridge.yml#L10
+    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.2/.github/workflows/bridge.yml#L10
 
     src = fetchFromGitHub {
       owner = "fzyzcjy";
@@ -51,12 +51,12 @@ let
 in
 flutter319.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.3.1";
+  version = "1.3.2";
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     rev = version;
-    hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90=";
+    hash = "sha256-SvK11IuuTkO8sxLVnYyyRtYyzV6R9NwMtyY5UCdw/P8=";
   };
 
   strictDeps = true;
@@ -64,13 +64,13 @@ flutter319.buildFlutterApplication rec {
 
   # Configure the Flutter/Dart build
   sourceRoot = "${src.name}/flutter";
-  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.1/flutter/pubspec.lock | yq > pubspec.lock.json
+  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.2/flutter/pubspec.lock | yq > pubspec.lock.json
   pubspecLock = lib.importJSON ./pubspec.lock.json;
   gitHashes = {
     dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
-    desktop_multi_window = "sha256-6nbOUmGTmJQx3Dr4MI6cKWwB1jEgUFUeHx24gpCkWY0=";
+    desktop_multi_window = "sha256-yIhcsTb3/mynUDE05c7dANj32O2tcZl8m0Tw8d36J/4=";
     dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
-    flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q=";
+    flutter_gpu_texture_renderer = "sha256-6m34FB9Zi4wWbpQQ7uwtMnjUBvdCQnqlkHtWcZddtqU=";
     flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc=";
     window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4=";
     window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak=";
@@ -90,7 +90,7 @@ flutter319.buildFlutterApplication rec {
       "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
       "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
       "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
-      "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA=";
+      "hwcodec-0.7.0" = "sha256-JdpaKIzI6AOaHPB4SeWIccpP7FuDLP00fOFnbA9DIEc=";
       "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
       "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4=";
       "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
@@ -98,7 +98,7 @@ flutter319.buildFlutterApplication rec {
       "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE=";
       "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
       "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
-      "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8=";
+      "rdev-0.5.0-2" = "sha256-0e8NMPMlzkmghe/E4SssoRzbGG2jWMKwxzVpiJ8MnDo=";
       "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
       "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
       "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E=";
@@ -242,7 +242,7 @@ flutter319.buildFlutterApplication rec {
     description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative";
     homepage = "https://rustdesk.com";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ das_j ];
+    maintainers = teams.helsinki-systems.members;
     mainProgram = "rustdesk";
     platforms = platforms.linux; # should work on darwin as well but I have no machine to test with
   };
diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
index a0a7ad0d8076..4ca542e41794 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@@ -416,7 +416,7 @@
       "description": {
         "path": ".",
         "ref": "HEAD",
-        "resolved-ref": "80b063b9d4e015f62e17f42a5aa0b3d20a365926",
+        "resolved-ref": "519350f1f40746798299e94786197d058353bac9",
         "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
       },
       "source": "git",
diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/by-name/ru/rustfilt/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rustfilt/default.nix
rename to pkgs/by-name/ru/rustfilt/package.nix
diff --git a/pkgs/development/tools/rust/rusty-man/default.nix b/pkgs/by-name/ru/rusty-man/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rusty-man/default.nix
rename to pkgs/by-name/ru/rusty-man/package.nix
diff --git a/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch b/pkgs/by-name/ru/rusty-psn/fix-cargo-lock.patch
similarity index 100%
rename from pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch
rename to pkgs/by-name/ru/rusty-psn/fix-cargo-lock.patch
diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/by-name/ru/rusty-psn/package.nix
similarity index 100%
rename from pkgs/applications/misc/rusty-psn/default.nix
rename to pkgs/by-name/ru/rusty-psn/package.nix
diff --git a/pkgs/development/tools/rust/rustycli/default.nix b/pkgs/by-name/ru/rustycli/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rustycli/default.nix
rename to pkgs/by-name/ru/rustycli/package.nix
diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/rustypaste-cli/default.nix
rename to pkgs/by-name/ru/rustypaste-cli/package.nix
diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/by-name/ru/rustypaste/package.nix
similarity index 100%
rename from pkgs/servers/rustypaste/default.nix
rename to pkgs/by-name/ru/rustypaste/package.nix
diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/by-name/ru/rustywind/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rustywind/default.nix
rename to pkgs/by-name/ru/rustywind/package.nix
diff --git a/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch b/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch
similarity index 100%
rename from pkgs/development/libraries/rutabaga_gfx/darwin-install.patch
rename to pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch
diff --git a/pkgs/development/libraries/rutabaga_gfx/default.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/rutabaga_gfx/default.nix
rename to pkgs/by-name/ru/rutabaga_gfx/package.nix
diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/by-name/ru/ruwudu/package.nix
similarity index 100%
rename from pkgs/data/fonts/ruwudu/default.nix
rename to pkgs/by-name/ru/ruwudu/package.nix
diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/by-name/rv/rvvm/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/rvvm/default.nix
rename to pkgs/by-name/rv/rvvm/package.nix
diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/by-name/rw/rw/package.nix
similarity index 100%
rename from pkgs/tools/misc/rw/default.nix
rename to pkgs/by-name/rw/rw/package.nix
diff --git a/pkgs/tools/system/rwc/default.nix b/pkgs/by-name/rw/rwc/package.nix
similarity index 100%
rename from pkgs/tools/system/rwc/default.nix
rename to pkgs/by-name/rw/rwc/package.nix
diff --git a/pkgs/tools/video/rwedid/default.nix b/pkgs/by-name/rw/rwedid/package.nix
similarity index 100%
rename from pkgs/tools/video/rwedid/default.nix
rename to pkgs/by-name/rw/rwedid/package.nix
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/by-name/rx/rx/package.nix
similarity index 100%
rename from pkgs/applications/graphics/rx/default.nix
rename to pkgs/by-name/rx/rx/package.nix
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/by-name/rx/rxp/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/rxp/default.nix
rename to pkgs/by-name/rx/rxp/package.nix
diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index a0cf6b55cf22..4f512d820c63 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
+, docbook-xsl-nons
 , meson
 , ninja
 , pkg-config
 , vala
 , gettext
 , libxml2
+, libxslt
 , gobject-introspection
 , wrapGAppsHook3
 , python3
@@ -21,21 +24,21 @@
 , libmediaart
 , sqlite
 , systemd
-, tracker
+, tinysparql
 , shared-mime-info
 , gnome
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rygel";
-  version = "0.42.6";
+  version = "0.44.1";
 
   # TODO: split out lib
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-R9JXBLYQiDdeJqq6Vr5HwXGJRy5vgMdSq+hvAu9OMwQ=";
+    hash = "sha256-eyxjG4QkCNonpUJC+Agqukm9HKAgQeeeHu+6DHAJqHs=";
   };
 
   patches = [
@@ -43,12 +46,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    docbook-xsl-nons
     meson
     ninja
     pkg-config
     vala
     gettext
     libxml2
+    libxslt # for xsltproc
     gobject-introspection
     wrapGAppsHook3
     python3
@@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmediaart
     sqlite
     systemd
-    tracker
+    tinysparql
     shared-mime-info
   ] ++ (with gst_all_1; [
     gstreamer
diff --git a/pkgs/by-name/ry/rymcast/package.nix b/pkgs/by-name/ry/rymcast/package.nix
new file mode 100644
index 000000000000..ddd9c751083f
--- /dev/null
+++ b/pkgs/by-name/ry/rymcast/package.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
+, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }:
+
+stdenv.mkDerivation rec {
+  pname = "rymcast";
+  version = "1.0.6";
+
+  src = fetchzip {
+    url = "https://www.inphonik.com/files/rymcast/rymcast-${version}-linux-x64.tar.gz";
+    hash = "sha256:0vjjhfrwdibjjgz3awbg30qxkjrzc4cya1f4pigwjh3r0vvrq0ga";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
+  buildInputs = [ alsa-lib curl gtk3 (lib.getLib stdenv.cc.cc) webkitgtk_4_0 zenity ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp RYMCast "$out/bin/"
+    wrapProgram "$out/bin/RYMCast" \
+      --set PATH "${lib.makeBinPath [ zenity ]}"
+  '';
+
+  meta = with lib; {
+    description = "Player for Mega Drive/Genesis VGM files";
+    homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ astsmtl ];
+  };
+}
diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/by-name/ry/ryzenadj/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ryzenadj/default.nix
rename to pkgs/by-name/ry/ryzenadj/package.nix
diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/by-name/rz/rzip/package.nix
similarity index 100%
rename from pkgs/tools/compression/rzip/default.nix
rename to pkgs/by-name/rz/rzip/package.nix
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/by-name/s-/s-tar/package.nix
similarity index 100%
rename from pkgs/tools/archivers/s-tar/default.nix
rename to pkgs/by-name/s-/s-tar/package.nix
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/by-name/s-/s-tui/package.nix
similarity index 100%
rename from pkgs/tools/system/s-tui/default.nix
rename to pkgs/by-name/s-/s-tui/package.nix
diff --git a/pkgs/development/libraries/s2geometry/default.nix b/pkgs/by-name/s2/s2geometry/package.nix
similarity index 100%
rename from pkgs/development/libraries/s2geometry/default.nix
rename to pkgs/by-name/s2/s2geometry/package.nix
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
new file mode 100644
index 000000000000..d2d8de6b4306
--- /dev/null
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, openssl
+, nix
+}:
+
+stdenv.mkDerivation rec {
+  pname = "s2n-tls";
+  version = "1.5.5";
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "s2n-tls";
+    rev = "v${version}";
+    hash = "sha256-vIwhV8kFP7sN0tz8ZE3bDGD/v08pq2PCl1ea5w+ejHg=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  outputs = [ "out" "dev" ];
+
+  buildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror
+  ] ++ lib.optionals stdenv.hostPlatform.isMips64 [
+    # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609
+    "-DS2N_NO_PQ=ON"
+  ];
+
+  propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
+
+  postInstall = ''
+    # Glob for 'shared' or 'static' subdir
+    for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do
+      substituteInPlace "$f" \
+        --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
+    done
+  '';
+
+  passthru.tests = {
+    inherit nix;
+  };
+
+  meta = with lib; {
+    description = "C99 implementation of the TLS/SSL protocols";
+    homepage = "https://github.com/aws/s2n-tls";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/by-name/s2/s2png/package.nix
similarity index 100%
rename from pkgs/tools/graphics/s2png/default.nix
rename to pkgs/by-name/s2/s2png/package.nix
diff --git a/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/pkgs/by-name/s3/s3backer/fix-darwin-builds.patch
similarity index 100%
rename from pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch
rename to pkgs/by-name/s3/s3backer/fix-darwin-builds.patch
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/by-name/s3/s3backer/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/s3backer/default.nix
rename to pkgs/by-name/s3/s3backer/package.nix
diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/by-name/s3/s3bro/package.nix
similarity index 100%
rename from pkgs/tools/admin/s3bro/default.nix
rename to pkgs/by-name/s3/s3bro/package.nix
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/by-name/s3/s3ql/package.nix
similarity index 100%
rename from pkgs/tools/backup/s3ql/default.nix
rename to pkgs/by-name/s3/s3ql/package.nix
diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/by-name/s4/s4cmd/package.nix
similarity index 100%
rename from pkgs/tools/networking/s4cmd/default.nix
rename to pkgs/by-name/s4/s4cmd/package.nix
diff --git a/pkgs/tools/security/s5/default.nix b/pkgs/by-name/s5/s5/package.nix
similarity index 100%
rename from pkgs/tools/security/s5/default.nix
rename to pkgs/by-name/s5/s5/package.nix
diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/by-name/s5/s5cmd/package.nix
similarity index 100%
rename from pkgs/tools/networking/s5cmd/default.nix
rename to pkgs/by-name/s5/s5cmd/package.nix
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
new file mode 100644
index 000000000000..acc989e0283a
--- /dev/null
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -0,0 +1,159 @@
+{
+  lib,
+  fetchFromGitLab,
+  stdenv,
+  notcurses,
+  gmp,
+  mpfr,
+  libmpc,
+  flint3,
+  unstableGitUpdater,
+  writeScript,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "s7";
+  version = "11.2-unstable-2024-11-02";
+
+  src = fetchFromGitLab {
+    domain = "cm-gitlab.stanford.edu";
+    owner = "bil";
+    repo = "s7";
+    rev = "6b6651de318c3360aa2711a445659f372ffe894e";
+    hash = "sha256-9x1u60jflESAHgP0gwIDVFwhI5XU5gsAiXaic8zdW2U=";
+  };
+
+  buildInputs = [
+    notcurses
+    gmp
+    mpfr
+    libmpc
+    flint3
+  ];
+
+  # The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/).
+
+  patchPhase = ''
+    runHook prePatch
+
+    substituteInPlace s7.c \
+        --replace-fail libc_s7.so $out/lib/libc_s7.so
+
+    runHook postPatch
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    # The older REPL
+    cc s7.c -o s7-repl \
+        -O2 -I. \
+        -Wl,-export-dynamic \
+        -lm -ldl \
+        -DWITH_MAIN \
+        -DS7_LOAD_PATH=\"$out/share/s7/scm\"
+
+    # The newer REPL powered by Notcurses
+    cc s7.c -o s7-nrepl \
+        -O2 -I. \
+        -Wl,-export-dynamic \
+        -lm -ldl \
+        -DWITH_MAIN \
+        -DWITH_NOTCURSES -lnotcurses-core \
+        -DS7_LOAD_PATH=\"$out/share/s7/scm\"
+
+    cc libarb_s7.c -o libarb_s7.so \
+        -O2 -I. \
+        -shared \
+        -lflint -lmpc \
+        -fPIC
+
+    cc notcurses_s7.c -o libnotcurses_s7.so \
+        -O2 -I. \
+        -shared \
+        -lnotcurses-core \
+        -fPIC
+
+    cc s7.c -c -o s7.o \
+        -O2 -I. \
+        -ldl -lm
+
+    cc ffitest.c s7.o -o ffitest \
+        -I. \
+        -Wl,-export-dynamic \
+        -ldl -lm
+
+    ./s7-repl libc.scm
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    dst_bin=$out/bin
+    dst_lib=$out/lib
+    dst_inc=$out/include
+    dst_share=$out/share/s7
+    dst_scm=$out/share/s7/scm
+    dst_doc=$out/share/doc/s7
+    mkdir -p $dst_bin $dst_lib $dst_inc $dst_share $dst_scm $dst_doc
+
+    cp -pr -t $dst_bin s7-repl s7-nrepl
+    ln -s s7-nrepl $dst_bin/s7
+    cp -pr -t $dst_lib libarb_s7.so libnotcurses_s7.so libc_s7.so
+    cp -pr -t $dst_share s7.c
+    cp -pr -t $dst_inc s7.h
+    cp -pr -t $dst_scm *.scm
+    cp -pr -t $dst_doc s7.html
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $dst_bin/s7-repl s7test.scm
+
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = unstableGitUpdater rec {
+    branch = "master";
+    tagConverter = writeScript "update-s7-version-number" ''
+      #! /usr/bin/env nix-shell
+      #! nix-shell -p curl -i bash
+      set -eu -o pipefail
+      read tag # should be "0" if the upstream sticks to tagging nothing.
+      curl -sS https://cm-gitlab.stanford.edu/bil/s7/-/raw/${branch}/s7.h \
+          | grep '#define S7_VERSION' \
+          | awk -F \" '{print $2}'
+    '';
+  };
+
+  meta = {
+    description = "Scheme interpreter intended as an extension language for other applications";
+    longDescription = ''
+      s7 is a Scheme interpreter intended as an extension language for other
+      applications.
+
+      Although it is a descendant of tinyScheme, s7 is closest as a Scheme
+      dialect to Guile 1.8. It is expected to be compatible with r5rs and r7rs.
+      It has continuations, ratios, complex numbers, macros, keywords,
+      hash-tables, multiprecision arithmetic, generalized `set!`, unicode, and so
+      on. It does not have `syntax-rules` or any of its friends, and it thinks
+      there is no such thing as an inexact integer.
+
+      s7 is an extension language of Snd and sndlib, Rick Taube's Common Music
+      (commonmusic at sourceforge), Kjetil Matheussen's Radium music editor, and
+      Iain Duncan's Scheme for Max (or Pd).
+    '';
+    homepage = "https://ccrma.stanford.edu/software/s7/";
+    license = lib.licenses.bsd0;
+    maintainers = with lib.maintainers; [ rc-zb ];
+    mainProgram = "s7";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/by-name/s9/s9fes/package.nix
similarity index 100%
rename from pkgs/development/interpreters/s9fes/default.nix
rename to pkgs/by-name/s9/s9fes/package.nix
diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/by-name/sa/sacad/package.nix
similarity index 100%
rename from pkgs/tools/misc/sacad/default.nix
rename to pkgs/by-name/sa/sacad/package.nix
diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/by-name/sa/sacc/package.nix
similarity index 100%
rename from pkgs/applications/networking/gopher/sacc/default.nix
rename to pkgs/by-name/sa/sacc/package.nix
diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/by-name/sa/sacd/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/sacd/default.nix
rename to pkgs/by-name/sa/sacd/package.nix
diff --git a/pkgs/applications/science/physics/sacrifice/compat.patch b/pkgs/by-name/sa/sacrifice/compat.patch
similarity index 100%
rename from pkgs/applications/science/physics/sacrifice/compat.patch
rename to pkgs/by-name/sa/sacrifice/compat.patch
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/by-name/sa/sacrifice/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/sacrifice/default.nix
rename to pkgs/by-name/sa/sacrifice/package.nix
diff --git a/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/pkgs/by-name/sa/sacrifice/pythia83xx.patch
similarity index 100%
rename from pkgs/applications/science/physics/sacrifice/pythia83xx.patch
rename to pkgs/by-name/sa/sacrifice/pythia83xx.patch
diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/by-name/sa/sad/package.nix
similarity index 100%
rename from pkgs/tools/text/sad/default.nix
rename to pkgs/by-name/sa/sad/package.nix
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/by-name/sa/safe-rm/package.nix
similarity index 100%
rename from pkgs/tools/system/safe-rm/default.nix
rename to pkgs/by-name/sa/safe-rm/package.nix
diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/by-name/sa/safe/package.nix
similarity index 100%
rename from pkgs/tools/security/safe/default.nix
rename to pkgs/by-name/sa/safe/package.nix
diff --git a/pkgs/applications/misc/safecloset/default.nix b/pkgs/by-name/sa/safecloset/package.nix
similarity index 100%
rename from pkgs/applications/misc/safecloset/default.nix
rename to pkgs/by-name/sa/safecloset/package.nix
diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/by-name/sa/safecopy/package.nix
similarity index 100%
rename from pkgs/tools/system/safecopy/default.nix
rename to pkgs/by-name/sa/safecopy/package.nix
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/by-name/sa/safeeyes/package.nix
similarity index 100%
rename from pkgs/applications/misc/safeeyes/default.nix
rename to pkgs/by-name/sa/safeeyes/package.nix
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/by-name/sa/safefile/package.nix
similarity index 100%
rename from pkgs/development/libraries/safefile/default.nix
rename to pkgs/by-name/sa/safefile/package.nix
diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/by-name/sa/sage/README.md
similarity index 100%
rename from pkgs/applications/science/math/sage/README.md
rename to pkgs/by-name/sa/sage/README.md
diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/by-name/sa/sage/dist-tests.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/dist-tests.nix
rename to pkgs/by-name/sa/sage/dist-tests.nix
diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/by-name/sa/sage/env-locations.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/env-locations.nix
rename to pkgs/by-name/sa/sage/env-locations.nix
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/by-name/sa/sage/package.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/default.nix
rename to pkgs/by-name/sa/sage/package.nix
diff --git a/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch b/pkgs/by-name/sa/sage/patches/disable-singular-doctest.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch
rename to pkgs/by-name/sa/sage/patches/disable-singular-doctest.patch
diff --git a/pkgs/applications/science/math/sage/patches/gap-element-crash.patch b/pkgs/by-name/sa/sage/patches/gap-element-crash.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/gap-element-crash.patch
rename to pkgs/by-name/sa/sage/patches/gap-element-crash.patch
diff --git a/pkgs/applications/science/math/sage/patches/silence-linker.patch b/pkgs/by-name/sa/sage/patches/silence-linker.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/silence-linker.patch
rename to pkgs/by-name/sa/sage/patches/silence-linker.patch
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
rename to pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/by-name/sa/sage/patches/sympow-cache.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/sympow-cache.patch
rename to pkgs/by-name/sa/sage/patches/sympow-cache.patch
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix
rename to pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/by-name/sa/sage/python-modules/sage-setup.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/python-modules/sage-setup.nix
rename to pkgs/by-name/sa/sage/python-modules/sage-setup.nix
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-env.nix
rename to pkgs/by-name/sa/sage/sage-env.nix
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
similarity index 75%
rename from pkgs/applications/science/math/sage/sage-src.nix
rename to pkgs/by-name/sa/sage/sage-src.nix
index b8d9e3e903a6..16a551a56cb5 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -54,13 +54,19 @@ stdenv.mkDerivation rec {
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
   bugfixPatches = [
-    # Sage uses mixed integer programs (MIPs) to find edge disjoint
-    # spanning trees. For some reason, aarch64 glpk takes much longer
-    # than x86_64 glpk to solve such MIPs. Since the MIP formulation
-    # has "numerous problems" and will be replaced by a polynomial
-    # algorithm soon, disable this test for now.
-    # https://github.com/sagemath/sage/issues/34575
-    ./patches/disable-slow-glpk-test.patch
+    # https://github.com/sagemath/sage/pull/38628, landed in 10.5.beta4
+    (fetchpatch {
+      name = "pari-stack-cysignals-exception.patch";
+      url = "https://github.com/sagemath/sage/commit/4a9c985b769b1209902c970ade1892f18ab48c10.diff";
+      hash = "sha256-S6NdonB7needJlQdx52Huk34Q8/vG3nyGicA5JpsdWc=";
+    })
+
+    # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
+    (fetchpatch {
+      name = "glpk-aarch64-hang-workaround.patch";
+      url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff";
+      hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0=";
+    })
 
     # compile libs/gap/element.pyx with -O1
     # a more conservative version of https://github.com/sagemath/sage/pull/37951
@@ -74,12 +80,26 @@ stdenv.mkDerivation rec {
   # should come from or be proposed to upstream. This list will probably never
   # be empty since dependencies update all the time.
   packageUpgradePatches = [
-    # https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3
+    # https://github.com/sagemath/sage/pull/38500, landed in 10.5.beta3
     (fetchpatch {
       name = "cython-3.0.11-upgrade.patch";
       url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff";
       hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA=";
     })
+
+    # https://github.com/sagemath/sage/pull/36641, landed in 10.5.beta3
+    (fetchpatch {
+      name = "sympy-1.13.2-update.patch";
+      url = "https://github.com/sagemath/sage/commit/100189fa62f9a40e7aa0d856615366ea99b87aff.diff";
+      sha256 = "sha256-uWr3I15WByQYGVxbJFqG4zUJ7c7+4rjkcgwkAT85O7w=";
+    })
+
+    # https://github.com/sagemath/sage/pull/38250, landed in 10.5.beta0
+    (fetchpatch {
+      name = "numpy-2.0-compat.patch";
+      url = "https://github.com/sagemath/sage/commit/0962e0bcb159d342e7c7d83557a71e7b670fff47.diff";
+      sha256 = "sha256-4SBhgPgT9VsBxcBH8+T5uYtWzYP5tZi9+iKOG55hWgI=";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/by-name/sa/sage/sage-tests.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-tests.nix
rename to pkgs/by-name/sa/sage/sage-tests.nix
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/by-name/sa/sage/sage-with-env.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-with-env.nix
rename to pkgs/by-name/sa/sage/sage-with-env.nix
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/by-name/sa/sage/sage.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage.nix
rename to pkgs/by-name/sa/sage/sage.nix
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/by-name/sa/sage/sagedoc.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sagedoc.nix
rename to pkgs/by-name/sa/sage/sagedoc.nix
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sagelib.nix
rename to pkgs/by-name/sa/sage/sagelib.nix
diff --git a/pkgs/applications/science/math/sage/threejs-sage.nix b/pkgs/by-name/sa/sage/threejs-sage.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/threejs-sage.nix
rename to pkgs/by-name/sa/sage/threejs-sage.nix
diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/by-name/sa/sagetex/package.nix
similarity index 100%
rename from pkgs/misc/sagetex/default.nix
rename to pkgs/by-name/sa/sagetex/package.nix
diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/by-name/sa/sagittarius-scheme/package.nix
similarity index 100%
rename from pkgs/development/compilers/sagittarius-scheme/default.nix
rename to pkgs/by-name/sa/sagittarius-scheme/package.nix
diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/by-name/sa/sagoin/package.nix
similarity index 100%
rename from pkgs/tools/misc/sagoin/default.nix
rename to pkgs/by-name/sa/sagoin/package.nix
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/by-name/sa/sahel-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/sahel-fonts/default.nix
rename to pkgs/by-name/sa/sahel-fonts/package.nix
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/by-name/sa/sailsd/package.nix
similarity index 100%
rename from pkgs/misc/sailsd/default.nix
rename to pkgs/by-name/sa/sailsd/package.nix
diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/by-name/sa/saldl/package.nix
similarity index 100%
rename from pkgs/tools/networking/saldl/default.nix
rename to pkgs/by-name/sa/saldl/package.nix
diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/saleae-logic-2/default.nix
rename to pkgs/by-name/sa/saleae-logic-2/package.nix
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
new file mode 100644
index 000000000000..27b01dc5ffe1
--- /dev/null
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -0,0 +1,98 @@
+# Saleae logic analyzer software
+#
+# Suggested udev rules to be able to access the Logic device without being root:
+#   SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666"
+#   SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666"
+#
+# In NixOS, simply add this package to services.udev.packages.
+
+{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
+, fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
+, freetype, libXinerama, libxcb, zlib, pciutils
+, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL
+}:
+
+let
+
+  libPath = lib.makeLibraryPath [
+    glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
+    libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc
+    dbus libGL
+  ];
+
+in
+
+assert stdenv.hostPlatform.system == "x86_64-linux";
+
+stdenv.mkDerivation rec {
+  pname = "saleae-logic";
+  version = "1.2.18";
+
+  src = fetchurl {
+    name = "saleae-logic-${version}-64bit.zip";
+    url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
+    sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "saleae-logic";
+    exec = "saleae-logic";
+    icon = ""; # the package contains no icon
+    comment = "Software for Saleae logic analyzers";
+    desktopName = "Saleae Logic";
+    genericName = "Logic analyzer";
+    categories = [ "Development" ];
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    # Copy prebuilt app to $out
+    mkdir "$out"
+    cp -r * "$out"
+
+    # Patch it
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
+    for bin in "$out/Logic"              \
+               "$out/libQt5Widgets.so.5" \
+               "$out/libQt5Gui.so.5"     \
+               "$out/libQt5Core.so.5"    \
+               "$out/libQt5Network.so.5" ; do
+        patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin"
+    done
+
+    patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so"
+
+    # Build the LD_PRELOAD library that makes Logic work from a read-only directory
+    mkdir -p "$out/lib"
+    gcc -shared -fPIC -DOUT=\"$out\" "${./preload.c}" -o "$out/lib/preload.so" -ldl
+
+    # Make wrapper script that uses the LD_PRELOAD library
+    mkdir -p "$out/bin"
+    cat > "$out/bin/saleae-logic" << EOF
+    #!${runtimeShell}
+    export LD_PRELOAD="$out/lib/preload.so"
+    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
+    export PATH="${pciutils}/bin:\$PATH"
+    exec "$out/Logic" "\$@"
+    EOF
+    chmod a+x "$out"/bin/saleae-logic
+
+    # Copy the generated .desktop file
+    mkdir -p "$out/share/applications"
+    cp "$desktopItem"/share/applications/* "$out/share/applications/"
+
+    # Install provided udev rules
+    mkdir -p "$out/etc/udev/rules.d"
+    cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/"
+  '';
+
+  meta = with lib; {
+    description = "Software for Saleae logic analyzers";
+    homepage = "https://www.saleae.com/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/development/tools/misc/saleae-logic/preload.c b/pkgs/by-name/sa/saleae-logic/preload.c
similarity index 100%
rename from pkgs/development/tools/misc/saleae-logic/preload.c
rename to pkgs/by-name/sa/saleae-logic/preload.c
diff --git a/pkgs/by-name/sa/salt-lint/package.nix b/pkgs/by-name/sa/salt-lint/package.nix
new file mode 100644
index 000000000000..2f114e91d84b
--- /dev/null
+++ b/pkgs/by-name/sa/salt-lint/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  versionCheckHook,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "salt-lint";
+  version = "0.9.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "warpnet";
+    repo = "salt-lint";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Q/blaqDqs9gPrMfN+e1hkCi9IPMM0osPYTDsT6UODB4=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    pathspec
+    pyyaml
+  ];
+
+  nativeInputChecks = [
+    python3Packages.pytestCheckHook
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "Command-line utility that checks for best practices in SaltStack";
+    homepage = "https://salt-lint.readthedocs.io/en/latest/";
+    license = lib.licenses.mit;
+    mainProgram = "salt-lint";
+    maintainers = with lib.maintainers; [ genga898 ];
+  };
+}
diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/by-name/sa/salt/fix-libcrypto-loading.patch
similarity index 100%
rename from pkgs/tools/admin/salt/fix-libcrypto-loading.patch
rename to pkgs/by-name/sa/salt/fix-libcrypto-loading.patch
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/by-name/sa/salt/package.nix
similarity index 100%
rename from pkgs/tools/admin/salt/default.nix
rename to pkgs/by-name/sa/salt/package.nix
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/by-name/sa/sam-ba/package.nix
similarity index 100%
rename from pkgs/tools/misc/sam-ba/default.nix
rename to pkgs/by-name/sa/sam-ba/package.nix
diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/by-name/sa/sambamba/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/sambamba/default.nix
rename to pkgs/by-name/sa/sambamba/package.nix
diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/by-name/sa/samblaster/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/samblaster/default.nix
rename to pkgs/by-name/sa/samblaster/package.nix
diff --git a/pkgs/by-name/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix
new file mode 100644
index 000000000000..d1e7c13c6694
--- /dev/null
+++ b/pkgs/by-name/sa/sameboy/package.nix
@@ -0,0 +1,49 @@
+{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook3, glib }:
+
+stdenv.mkDerivation rec {
+  pname = "sameboy";
+  version = "0.16.7";
+
+  src = fetchFromGitHub {
+    owner = "LIJI32";
+    repo = "SameBoy";
+    rev = "v${version}";
+    sha256 = "sha256-KUvhmORI3hIJFMCW8U2BZYnIwzg7h+GZZA4+U0IPS9E=";
+  };
+
+  enableParallelBuilding = true;
+  # glib and wrapGAppsHook3 are needed to make the Open ROM menu work.
+  nativeBuildInputs = [ rgbds glib wrapGAppsHook3 ];
+  buildInputs = [ SDL2 ];
+
+  makeFlags = [
+    "CONF=release"
+    "FREEDESKTOP=true"
+    "PREFIX=$(out)"
+  ];
+
+  postPatch = ''
+    substituteInPlace OpenDialog/gtk.c \
+      --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"'
+  '';
+
+  meta = with lib; {
+    homepage = "https://sameboy.github.io";
+    description = "Game Boy, Game Boy Color, and Super Game Boy emulator";
+    mainProgram = "sameboy";
+
+    longDescription = ''
+      SameBoy is a user friendly Game Boy, Game Boy Color and Super
+      Game Boy emulator for macOS, Windows and Unix-like platforms.
+      SameBoy is extremely accurate and includes a wide range of
+      powerful debugging features, making it ideal for both casual
+      players and developers. In addition to accuracy and developer
+      capabilities, SameBoy has all the features one would expect from
+      an emulator – from save states to scaling filters.
+    '';
+
+    license = licenses.mit;
+    maintainers = with maintainers; [ NieDzejkob ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/by-name/sa/samim-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/samim-fonts/default.nix
rename to pkgs/by-name/sa/samim-fonts/package.nix
diff --git a/pkgs/tools/security/sammler/default.nix b/pkgs/by-name/sa/sammler/package.nix
similarity index 100%
rename from pkgs/tools/security/sammler/default.nix
rename to pkgs/by-name/sa/sammler/package.nix
diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/by-name/sa/sampler/package.nix
similarity index 100%
rename from pkgs/applications/misc/sampler/default.nix
rename to pkgs/by-name/sa/sampler/package.nix
diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/by-name/sa/samplicator/package.nix
similarity index 100%
rename from pkgs/tools/networking/samplicator/default.nix
rename to pkgs/by-name/sa/samplicator/package.nix
diff --git a/pkgs/development/tools/misc/samply/default.nix b/pkgs/by-name/sa/samply/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/samply/default.nix
rename to pkgs/by-name/sa/samply/package.nix
diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/by-name/sa/sampradaya/package.nix
similarity index 100%
rename from pkgs/data/fonts/sampradaya/default.nix
rename to pkgs/by-name/sa/sampradaya/package.nix
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/module.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
rename to pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/module.nix
diff --git a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix
new file mode 100644
index 000000000000..0a09bdb272e6
--- /dev/null
+++ b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix
@@ -0,0 +1,120 @@
+{ lib, stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }:
+
+let
+
+    arch = if stdenv.system == "x86_64-linux"
+      then "x86_64"
+      else "i386";
+
+in stdenv.mkDerivation rec {
+  pname = "samsung-unified-linux-driver";
+  version = "1.00.36";
+
+  src = fetchurl {
+    sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9";
+    url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
+  };
+
+  buildInputs = [
+    cups
+    libusb-compat-0_1
+    libxml2
+    perl
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin
+
+    mkdir -p $out/etc/sane.d/dll.d/
+    install -m644 noarch/etc/smfp.conf $out/etc/sane.d
+    echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf
+
+    mkdir -p $out/etc/smfp-common/scanner/share/
+    install -m644 noarch/libsane-smfp.cfg $out/etc/smfp-common/scanner/share/
+    install -m644 noarch/pagesize.xml $out/etc/smfp-common/scanner/share/
+
+    mkdir -p $out/etc/samsung/scanner/share/
+    install -m644 noarch/oem.conf $out/etc/samsung/scanner/share/
+
+    mkdir -p $out/lib
+    install -m755 ${arch}/libscmssc.so* $out/lib
+
+    mkdir -p $out/lib/cups/backend
+    ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend
+
+    mkdir -p $out/lib/cups/filter
+    ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter
+    ln -s $ghostscript/bin/gs $out/lib/cups/filter
+
+    mkdir -p $out/lib/sane
+    install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
+    ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1
+    ln -s libsane-smfp.so.1     $out/lib/sane/libsane-smfp.so
+
+    perl -pi -e \
+      's|/opt/smfp-common/scanner/.usedby/|/tmp/\0\0fp-common/scanner/.usedby/|g' \
+       $out/lib/sane/libsane-smfp.so.1.0.1
+    perl -pi -e 's|/opt|/etc|g' \
+       $out/lib/sane/libsane-smfp.so.1.0.1 \
+       $out/bin/rastertospl \
+       noarch/package_utils \
+       noarch/pre_install.sh
+
+    mkdir -p $out/lib/udev/rules.d
+    (
+      OEM_FILE=noarch/oem.conf
+      INSTALL_LOG_FILE=/dev/null
+      . noarch/scripting_utils
+      . noarch/package_utils
+      . noarch/scanner-script.pkg
+      fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules
+      chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules
+    )
+
+    mkdir -p $out/share
+    cp -R noarch/share/* $out/share
+    gzip -9 $out/share/ppd/*.ppd
+    rm -r $out/share/locale/*/*/install.mo
+
+    mkdir -p $out/share/cups
+    cd $out/share/cups
+    ln -s ../ppd .
+    ln -s ppd model
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    for bin in "$out/bin/"*; do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
+      patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin"
+    done
+
+    patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
+    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
+
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+  '';
+
+  # all binaries are already stripped
+  dontStrip = true;
+
+  # we did this in prefixup already
+  dontPatchELF = true;
+
+  meta = with lib; {
+    description = "Unified Linux Driver for Samsung printers and scanners";
+    homepage = "http://www.bchemnet.com/suldr";
+    downloadPage = "http://www.bchemnet.com/suldr/driver/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+
+    # Tested on linux-x86_64. Might work on linux-i386.
+    # Probably won't work on anything else.
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/by-name/sa/sanctity/package.nix
similarity index 100%
rename from pkgs/tools/misc/sanctity/default.nix
rename to pkgs/by-name/sa/sanctity/package.nix
diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/by-name/sa/sane-airscan/package.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/airscan/default.nix
rename to pkgs/by-name/sa/sane-airscan/package.nix
diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index f8577d3b8a15..71d96226cf07 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
     opencl-clhpp
   ];
 
+  postPatch = ''
+    # TODO: Remove when https://github.com/MCJack123/sanjuuni/commit/778644b164c8877e56f9f5512480dde857133815 is released
+    substituteInPlace configure \
+      --replace-fail "swr_alloc_set_opts" "swr_alloc_set_opts2"
+  '';
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/by-name/sa/sanoid/package.nix
similarity index 100%
rename from pkgs/tools/backup/sanoid/default.nix
rename to pkgs/by-name/sa/sanoid/package.nix
diff --git a/pkgs/data/fonts/sarabun/default.nix b/pkgs/by-name/sa/sarabun-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/sarabun/default.nix
rename to pkgs/by-name/sa/sarabun-font/package.nix
diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index 3b6c2e372a8d..2d9c546f11eb 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.22";
+  version = "1.0.23";
 
   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-356T39GotzLj4lu5KYulpFn2RmS7fZOgjz6Yy9M2T6Y=";
+    hash = "sha256-g2IBx++zm2AandHhGVlNVH/r9AM42tPrIMd//Uv1uYg=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix
index 1c71a75452fb..40d31d04a143 100644
--- a/pkgs/by-name/sa/sasquatch/package.nix
+++ b/pkgs/by-name/sa/sasquatch/package.nix
@@ -51,6 +51,7 @@ let
       "LZO_SUPPORT=1"
       "XZ_SUPPORT=1"
       "ZSTD_SUPPORT=1"
+      "AR:=$(AR)"
     ];
 
     env.NIX_CFLAGS_COMPILE = lib.optionalString bigEndian "-DFIX_BE";
diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/by-name/sa/sassc/package.nix
similarity index 100%
rename from pkgs/development/tools/sassc/default.nix
rename to pkgs/by-name/sa/sassc/package.nix
diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/by-name/sa/sasutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sasutils/default.nix
rename to pkgs/by-name/sa/sasutils/package.nix
diff --git a/pkgs/tools/misc/savepagenow/default.nix b/pkgs/by-name/sa/savepagenow/package.nix
similarity index 100%
rename from pkgs/tools/misc/savepagenow/default.nix
rename to pkgs/by-name/sa/savepagenow/package.nix
diff --git a/pkgs/by-name/sa/saw-tools/package.nix b/pkgs/by-name/sa/saw-tools/package.nix
new file mode 100644
index 000000000000..ca2e3d303571
--- /dev/null
+++ b/pkgs/by-name/sa/saw-tools/package.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, fetchurl, gmp4, ncurses, zlib, clang }:
+
+let
+  libPath = lib.makeLibraryPath
+    [ stdenv.cc.libc
+      stdenv.cc.cc
+      gmp4
+      ncurses
+      zlib
+    ] + ":${lib.getLib stdenv.cc.cc}/lib64";
+
+  url = "https://github.com/GaloisInc/saw-script/releases/download";
+
+  saw-bin =
+    if stdenv.hostPlatform.system == "i686-linux"
+    then fetchurl {
+      url    = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz";
+      sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9";
+    }
+    else fetchurl {
+      url    = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz";
+      sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr";
+    };
+in
+stdenv.mkDerivation {
+  pname = "saw-tools";
+  version = "0.1.1-20150731";
+
+  src = saw-bin;
+
+  installPhase = ''
+    mkdir -p $out/lib $out/share
+
+    mv bin $out/bin
+    mv doc $out/share
+
+    ln -s ${ncurses.out}/lib/libtinfo.so.5       $out/lib/libtinfo.so.5
+    ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
+
+    # Add a clang symlink for easy building with a suitable compiler.
+    ln -s ${clang}/bin/clang $out/bin/saw-clang
+  '';
+
+  fixupPhase = ''
+    for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do
+      patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$out/lib:${libPath}" $out/$x;
+    done
+  '';
+
+  meta = {
+    description = "Tools for software verification and analysis";
+    homepage    = "https://saw.galois.com";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/by-name/sa/sawjap/package.nix
similarity index 100%
rename from pkgs/development/tools/java/sawjap/default.nix
rename to pkgs/by-name/sa/sawjap/package.nix
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/by-name/sb/sbagen/package.nix
similarity index 100%
rename from pkgs/applications/misc/sbagen/default.nix
rename to pkgs/by-name/sb/sbagen/package.nix
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/by-name/sb/sbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/sbc/default.nix
rename to pkgs/by-name/sb/sbc/package.nix
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/by-name/sb/sblim-sfcc/package.nix
similarity index 100%
rename from pkgs/development/libraries/sblim-sfcc/default.nix
rename to pkgs/by-name/sb/sblim-sfcc/package.nix
diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix
index 0b3b9ffba21f..7e745b811b90 100644
--- a/pkgs/by-name/sb/sbom-utility/package.nix
+++ b/pkgs/by-name/sb/sbom-utility/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "sbom-utility";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "sbom-utility";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EqK2TGlv2RGfvR95lzYz3EHJkfq4q4Ty5H2zFdd9cME=";
+    hash = "sha256-LiHCA5q9IJ67jZ2JUcbCFVCYnT36nyq9QzgH9PMr9kM=";
   };
 
-  vendorHash = "sha256-qh8kIwgrlmHkocM5ZoGnOY7ISJlct/TV7dAxvXlPw68=";
+  vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM=";
 
   preCheck = ''
     cd test
diff --git a/pkgs/tools/X11/sbs/default.nix b/pkgs/by-name/sb/sbs/package.nix
similarity index 100%
rename from pkgs/tools/X11/sbs/default.nix
rename to pkgs/by-name/sb/sbs/package.nix
diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/pkgs/by-name/sb/sbsigntool/autoconf.patch
similarity index 100%
rename from pkgs/tools/security/sbsigntool/autoconf.patch
rename to pkgs/by-name/sb/sbsigntool/autoconf.patch
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/by-name/sb/sbsigntool/package.nix
similarity index 100%
rename from pkgs/tools/security/sbsigntool/default.nix
rename to pkgs/by-name/sb/sbsigntool/package.nix
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/by-name/sb/sbt-extras/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/sbt-extras/default.nix
rename to pkgs/by-name/sb/sbt-extras/package.nix
diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 0390df3e0519..225a5dfb1b8f 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.45";
+  version = "0.46";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     rev = "yosys-${version}";
-    hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs=";
+    hash = "sha256-LVfHSVMrAKImD1y6icQSSfOSt9khZfOKK+lXhxdvRb4=";
   };
 
   nativeBuildInputs = [ bash ];
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/by-name/sc/sc-im/package.nix
similarity index 100%
rename from pkgs/applications/misc/sc-im/default.nix
rename to pkgs/by-name/sc/sc-im/package.nix
diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/by-name/sc/sc68/package.nix
similarity index 100%
rename from pkgs/applications/audio/sc68/default.nix
rename to pkgs/by-name/sc/sc68/package.nix
diff --git a/pkgs/development/tools/sca2d/default.nix b/pkgs/by-name/sc/sca2d/package.nix
similarity index 100%
rename from pkgs/development/tools/sca2d/default.nix
rename to pkgs/by-name/sc/sca2d/package.nix
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/by-name/sc/scalafmt/package.nix
similarity index 100%
rename from pkgs/development/tools/scalafmt/default.nix
rename to pkgs/by-name/sc/scalafmt/package.nix
diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix
new file mode 100644
index 000000000000..3efd66dff395
--- /dev/null
+++ b/pkgs/by-name/sc/scalapack/package.nix
@@ -0,0 +1,86 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
+, mpiCheckPhaseHook, mpi, blas, lapack
+} :
+
+assert blas.isILP64 == lapack.isILP64;
+
+stdenv.mkDerivation rec {
+  pname = "scalapack";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "Reference-ScaLAPACK";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4=";
+  };
+
+  passthru = { inherit (blas) isILP64; };
+
+  __structuredAttrs = true;
+
+  # upstream patch, remove with next release
+  patches = [ (fetchpatch {
+    name = "gcc-10";
+    url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch";
+    sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp";
+  })];
+
+  # Required to activate ILP64.
+  # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19
+  postPatch = lib.optionalString passthru.isILP64 ''
+    sed -i 's/INTSZ = 4/INTSZ = 8/g'   TESTING/EIG/* TESTING/LIN/*
+    sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/*
+
+    # These tests are not adapted to ILP64
+    sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt
+  '';
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake ];
+  nativeCheckInputs = [ mpiCheckPhaseHook ];
+  buildInputs = [ blas lapack ];
+  propagatedBuildInputs = [ mpi ];
+  hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ];
+
+  # xslu and xsllt tests seem to time out on x86_64-darwin.
+  # this line is left so those who force installation on x86_64-darwin can still build
+  doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin);
+
+  preConfigure = ''
+    cmakeFlagsArray+=(
+      -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+      -DLAPACK_LIBRARIES="-llapack"
+      -DBLAS_LIBRARIES="-lblas"
+      -DCMAKE_Fortran_COMPILER=${lib.getDev mpi}/bin/mpif90
+      -DCMAKE_C_FLAGS="${lib.concatStringsSep " " [
+            "-Wno-implicit-function-declaration"
+            (lib.optionalString passthru.isILP64 "-DInt=long")
+      ]}"
+      ${lib.optionalString passthru.isILP64 ''-DCMAKE_Fortran_FLAGS="-fdefault-integer-8"''}
+      )
+  '';
+
+  # Increase individual test timeout from 1500s to 10000s because hydra's builds
+  # sometimes fail due to this
+  checkFlags = [ "ARGS=--timeout 10000" ];
+
+  postFixup = ''
+    # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated
+    # cmake file will thus look for the library in the dev output instead of out.
+    # Use the absolute path to $out instead to fix the issue.
+    substituteInPlace  $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \
+      --replace "\''${_IMPORT_PREFIX}" "$out"
+  '';
+
+  meta = with lib; {
+    homepage = "http://www.netlib.org/scalapack/";
+    description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ costrouc markuskowa gdinh ];
+    # xslu and xsllt tests fail on x86 darwin
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
+  };
+}
diff --git a/pkgs/by-name/sc/scaleft/package.nix b/pkgs/by-name/sc/scaleft/package.nix
new file mode 100644
index 000000000000..a184e0488692
--- /dev/null
+++ b/pkgs/by-name/sc/scaleft/package.nix
@@ -0,0 +1,49 @@
+{ lib, stdenv, fetchurl, rpmextract, patchelf, testers, scaleft }:
+
+stdenv.mkDerivation rec {
+  pname = "scaleft";
+  version = "1.80.1";
+
+  src =
+    fetchurl {
+      url = "https://dist.scaleft.com/repos/rpm/stable/centos/9/x86_64/1.80.1/scaleft-client-tools-${version}-1.x86_64.rpm";
+      sha256 = "sha256-QrkqAgkplFF6Tp6FWKb2TJaqeOw8ec4zd9pymDP2IyY=";
+    };
+
+  nativeBuildInputs = [ patchelf rpmextract ];
+
+  libPath =
+    lib.makeLibraryPath
+       [ stdenv.cc stdenv.cc.cc ];
+
+  buildCommand = ''
+    mkdir -p $out/bin/
+    cd $out
+    rpmextract $src
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      usr/bin/sft
+    patchelf \
+      --set-rpath ${libPath} \
+      usr/bin/sft
+    ln -s $out/usr/bin/sft $out/bin/sft
+    chmod +x $out/bin/sft
+    patchShebangs $out
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = scaleft;
+    command = "sft -v";
+    version = "sft version ${version}";
+  };
+
+  meta = with lib; {
+    description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services";
+    homepage = "https://www.scaleft.com";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ jloyet ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "sft";
+  };
+}
diff --git a/pkgs/applications/science/math/scalp/default.nix b/pkgs/by-name/sc/scalp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/scalp/default.nix
rename to pkgs/by-name/sc/scalp/package.nix
diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/by-name/sc/scalr-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/scalr-cli/default.nix
rename to pkgs/by-name/sc/scalr-cli/package.nix
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/by-name/sc/scanbd/package.nix
similarity index 100%
rename from pkgs/tools/graphics/scanbd/default.nix
rename to pkgs/by-name/sc/scanbd/package.nix
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/by-name/sc/scanmem/package.nix
similarity index 100%
rename from pkgs/tools/misc/scanmem/default.nix
rename to pkgs/by-name/sc/scanmem/package.nix
diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/by-name/sc/scaphandre/package.nix
similarity index 100%
rename from pkgs/servers/scaphandre/default.nix
rename to pkgs/by-name/sc/scaphandre/package.nix
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/by-name/sc/sccache/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sccache/default.nix
rename to pkgs/by-name/sc/sccache/package.nix
diff --git a/pkgs/by-name/sc/scd2html/package.nix b/pkgs/by-name/sc/scd2html/package.nix
index 17cd4f211685..8ca7f8824a80 100644
--- a/pkgs/by-name/sc/scd2html/package.nix
+++ b/pkgs/by-name/sc/scd2html/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "scd2html generates HTML from scdoc source files";
     homepage = "https://git.sr.ht/~bitfehler/scd2html";
     license = licenses.mit;
-    maintainers = with maintainers; [ ianmjones ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
     mainProgram = "scd2html";
   };
diff --git a/pkgs/tools/misc/scdl/default.nix b/pkgs/by-name/sc/scdl/package.nix
similarity index 100%
rename from pkgs/tools/misc/scdl/default.nix
rename to pkgs/by-name/sc/scdl/package.nix
diff --git a/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/pkgs/by-name/sc/scenebuilder/fix-default-maven-plugin-versions.patch
similarity index 100%
rename from pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch
rename to pkgs/by-name/sc/scenebuilder/fix-default-maven-plugin-versions.patch
diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/by-name/sc/scenebuilder/package.nix
similarity index 100%
rename from pkgs/development/tools/scenebuilder/default.nix
rename to pkgs/by-name/sc/scenebuilder/package.nix
diff --git a/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/pkgs/by-name/sc/scenebuilder/pom-remove-javafx.patch
similarity index 100%
rename from pkgs/development/tools/scenebuilder/pom-remove-javafx.patch
rename to pkgs/by-name/sc/scenebuilder/pom-remove-javafx.patch
diff --git a/pkgs/development/tools/scenic-view/deps.json b/pkgs/by-name/sc/scenic-view/deps.json
similarity index 100%
rename from pkgs/development/tools/scenic-view/deps.json
rename to pkgs/by-name/sc/scenic-view/deps.json
diff --git a/pkgs/by-name/sc/scenic-view/package.nix b/pkgs/by-name/sc/scenic-view/package.nix
new file mode 100644
index 000000000000..e0c79ed08f77
--- /dev/null
+++ b/pkgs/by-name/sc/scenic-view/package.nix
@@ -0,0 +1,72 @@
+{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }:
+let
+  jdk = openjdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    enableJavaFX = true;
+    openjfx_jdk = openjfx.override { withWebKit = true; };
+  });
+
+  pname = "scenic-view";
+  version = "11.0.2";
+
+  src = fetchFromGitHub {
+    owner = "JonathanGiles";
+    repo = pname;
+    rev = version;
+    sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";
+  };
+
+  gradle = gradle_7;
+
+  desktopItem = makeDesktopItem {
+    name = pname;
+    desktopName = pname;
+    exec = pname;
+    comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications.";
+    mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ];
+    categories = [ "Development" ];
+  };
+
+in stdenv.mkDerivation rec {
+  inherit pname version src;
+  nativeBuildInputs = [ gradle makeWrapper ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit pname;
+    data = ./deps.json;
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/${pname}
+    cp build/libs/scenicview.jar $out/share/${pname}/${pname}.jar
+    makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [ desktopItem ];
+
+  meta = with lib; {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications";
+    mainProgram = "scenic-view";
+    longDescription = ''
+      A JavaFX application designed to make it simple to understand the current state of your application scenegraph
+      and to also easily manipulate properties of the scenegraph without having to keep editing your code.
+      This lets you find bugs and get things pixel perfect without having to do the compile-check-compile dance.
+    '';
+    homepage = "https://github.com/JonathanGiles/scenic-view/";
+    sourceProvenance = with sourceTypes; [
+      fromSource
+      binaryBytecode  # deps
+    ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ wirew0rm ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/by-name/sc/schedtool/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/schedtool/default.nix
rename to pkgs/by-name/sc/schedtool/package.nix
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/by-name/sc/schema2ldif/package.nix
similarity index 100%
rename from pkgs/tools/text/schema2ldif/default.nix
rename to pkgs/by-name/sc/schema2ldif/package.nix
diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/by-name/sc/schemacrawler/package.nix
similarity index 100%
rename from pkgs/development/tools/schemacrawler/default.nix
rename to pkgs/by-name/sc/schemacrawler/package.nix
diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix
index f8f0e962b020..b3999fce965c 100644
--- a/pkgs/by-name/sc/schemamap/package.nix
+++ b/pkgs/by-name/sc/schemamap/package.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "0.4.0";
+  version = "0.4.3";
 in
 rustPlatform.buildRustPackage rec {
   pname = "schemamap";
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
     owner = "schemamap";
     repo = "schemamap";
     rev = "v${version}";
-    hash = "sha256-L5p7Kh5sQAlDHrXgWUuiYZb3sV0Mp2ODEOMQsaB0iMs=";
+    hash = "sha256-YR7Ucd8/Z1hOUNokmfSVP2ZxDL7qLb6SZ86/S7V/GKk=";
   };
 
   sourceRoot = "${src.name}/rust";
 
-  cargoHash = "sha256-rwAujQC/zV5nH5YQdjPRyf1L7SYSbdS3FJ5SAVMlhRE=";
+  cargoHash = "sha256-iq1/8oWVgiqdYfmJKzrIe9gkCz7fDw08QcaQgfd7vuo=";
 
   buildInputs =
     [ openssl ]
diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/by-name/sc/scheme-bytestructures/package.nix
similarity index 100%
rename from pkgs/development/scheme-modules/scheme-bytestructures/default.nix
rename to pkgs/by-name/sc/scheme-bytestructures/package.nix
diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/by-name/sc/scheme-manpages/package.nix
similarity index 100%
rename from pkgs/data/documentation/scheme-manpages/default.nix
rename to pkgs/by-name/sc/scheme-manpages/package.nix
diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/by-name/sc/scheme48/package.nix
similarity index 100%
rename from pkgs/development/interpreters/scheme48/default.nix
rename to pkgs/by-name/sc/scheme48/package.nix
diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/by-name/sc/schemes/package.nix
similarity index 100%
rename from pkgs/applications/misc/schemes/default.nix
rename to pkgs/by-name/sc/schemes/package.nix
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix
similarity index 100%
rename from pkgs/games/scid-vs-pc/default.nix
rename to pkgs/by-name/sc/scid-vs-pc/package.nix
diff --git a/pkgs/games/scid/default.nix b/pkgs/by-name/sc/scid/package.nix
similarity index 100%
rename from pkgs/games/scid/default.nix
rename to pkgs/by-name/sc/scid/package.nix
diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/by-name/sc/scientifica/package.nix
similarity index 100%
rename from pkgs/data/fonts/scientifica/default.nix
rename to pkgs/by-name/sc/scientifica/package.nix
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/by-name/sc/scilab-bin/package.nix
similarity index 100%
rename from pkgs/applications/science/math/scilab-bin/default.nix
rename to pkgs/by-name/sc/scilab-bin/package.nix
diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/by-name/sc/scilla/package.nix
similarity index 100%
rename from pkgs/tools/security/scilla/default.nix
rename to pkgs/by-name/sc/scilla/package.nix
diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 54bb11c8d5ae..3f4c8de886a7 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "scip-go";
-  version = "0.1.15";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
     rev = "v${version}";
-    hash = "sha256-2UKiPKeGDkNiI96RieYWaJygz/ZqfdcBmm9PCuby7qQ=";
+    hash = "sha256-CUmivqMFAjtSS06tEs8xuXh5nyLD3MYdI2j0EAyWpY0=";
   };
 
-  vendorHash = "sha256-UID2mLrkY86k5Ms0cDgIsZR8s6h4TVwRLvLtoLXAXl4=";
+  vendorHash = "sha256-E/1ubWGIx+sGC+owqw4nOkrwUFJfgTeqDNpH8HCwNhA=";
 
   ldflags = [ "-s" "-w" ];
 
diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
new file mode 100644
index 000000000000..22f26382026c
--- /dev/null
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, scip
+}:
+
+buildGoModule rec {
+  pname = "scip";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "sourcegraph";
+    repo = "scip";
+    rev = "v${version}";
+    hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8=";
+  };
+
+  vendorHash = "sha256-6vx3Dt0ZNR0rY5bEUF5X1hHj/gv21920bhfd+JJ9bYk=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Reproducible=true"
+  ];
+
+  # update documentation to fix broken test
+  postPatch = ''
+    substituteInPlace docs/CLI.md \
+      --replace 0.3.0 0.3.1
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = scip;
+      version = "v${version}";
+    };
+  };
+
+  meta = with lib; {
+    description = "SCIP Code Intelligence Protocol CLI";
+    mainProgram = "scip";
+    homepage = "https://github.com/sourcegraph/scip";
+    changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix
index 56cc5ba18bb8..fee6a28bb4e5 100644
--- a/pkgs/by-name/sc/scitokens-cpp/package.nix
+++ b/pkgs/by-name/sc/scitokens-cpp/package.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "scitokens-cpp";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "scitokens";
     repo = "scitokens-cpp";
 
-    rev = "v1.1.1";
-    hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA=";
+    rev = "v1.1.2";
+    hash = "sha256-87mV1hyoUI/pWzRXaI051H3+FN5TXcachhgAPTtQYHg=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/by-name/sc/scli/package.nix
similarity index 100%
rename from pkgs/applications/misc/scli/default.nix
rename to pkgs/by-name/sc/scli/package.nix
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/by-name/sc/scmccid/package.nix
similarity index 100%
rename from pkgs/development/libraries/scmccid/default.nix
rename to pkgs/by-name/sc/scmccid/package.nix
diff --git a/pkgs/applications/version-management/scmpuff/default.nix b/pkgs/by-name/sc/scmpuff/package.nix
similarity index 100%
rename from pkgs/applications/version-management/scmpuff/default.nix
rename to pkgs/by-name/sc/scmpuff/package.nix
diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix
index 8ebc736097b0..f2b6790d1aad 100644
--- a/pkgs/by-name/sc/scons/package.nix
+++ b/pkgs/by-name/sc/scons/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
 python3Packages.buildPythonApplication rec {
   pname = "scons";
   version = "4.7.0";
@@ -15,6 +15,11 @@ python3Packages.buildPythonApplication rec {
   patches = [
     ./env.patch
     ./no-man-pages.patch
+    # Fix builds on sandboxed Darwin: https://github.com/SCons/scons/pull/4603
+    (fetchpatch {
+      url = "https://github.com/SCons/scons/commit/2d5e3a40a613225b329776ab9dbd9abcd2d24222.patch";
+      hash = "sha256-N1xQOvsPTi7a2maEZJQVu6vJ9AoWMqDOsScXHp9KuXI=";
+    })
   ];
 
   build-system = [
diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/by-name/sc/scope-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/scope-lite/default.nix
rename to pkgs/by-name/sc/scope-lite/package.nix
diff --git a/pkgs/games/scorched3d/file-existence.patch b/pkgs/by-name/sc/scorched3d/file-existence.patch
similarity index 100%
rename from pkgs/games/scorched3d/file-existence.patch
rename to pkgs/by-name/sc/scorched3d/file-existence.patch
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/by-name/sc/scorched3d/package.nix
similarity index 100%
rename from pkgs/games/scorched3d/default.nix
rename to pkgs/by-name/sc/scorched3d/package.nix
diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/by-name/sc/scorecard/package.nix
similarity index 100%
rename from pkgs/tools/security/scorecard/default.nix
rename to pkgs/by-name/sc/scorecard/package.nix
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/by-name/sc/scowl/package.nix
similarity index 100%
rename from pkgs/data/misc/scowl/default.nix
rename to pkgs/by-name/sc/scowl/package.nix
diff --git a/pkgs/shells/scponly/default.nix b/pkgs/by-name/sc/scponly/package.nix
similarity index 100%
rename from pkgs/shells/scponly/default.nix
rename to pkgs/by-name/sc/scponly/package.nix
diff --git a/pkgs/shells/scponly/scponly-fix-make.patch b/pkgs/by-name/sc/scponly/scponly-fix-make.patch
similarity index 100%
rename from pkgs/shells/scponly/scponly-fix-make.patch
rename to pkgs/by-name/sc/scponly/scponly-fix-make.patch
diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix
new file mode 100644
index 000000000000..f8fc949da05a
--- /dev/null
+++ b/pkgs/by-name/sc/scraper/package.nix
@@ -0,0 +1,28 @@
+{ lib, rustPlatform, fetchCrate, installShellFiles }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "scraper";
+  version = "0.21.0";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-S9bVsLDAX7UJ9FV4ZuI1G1D2fSZSZsevtftr7y+HyI8=";
+  };
+
+  cargoHash = "sha256-K4ZmarOniI7OgzjkaP66Py5ei+NKeJEOuziS//NXffw=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage scraper.1
+  '';
+
+  meta = with lib; {
+    description = "Tool to query HTML files with CSS selectors";
+    mainProgram = "scraper";
+    homepage = "https://github.com/causal-agent/scraper";
+    changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}";
+    license = licenses.isc;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/by-name/sc/scream/package.nix
similarity index 100%
rename from pkgs/applications/audio/scream/default.nix
rename to pkgs/by-name/sc/scream/package.nix
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/by-name/sc/screen-message/package.nix
similarity index 100%
rename from pkgs/tools/X11/screen-message/default.nix
rename to pkgs/by-name/sc/screen-message/package.nix
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/by-name/sc/screenfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/screenfetch/default.nix
rename to pkgs/by-name/sc/screenfetch/package.nix
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/by-name/sc/screenkey/package.nix
similarity index 100%
rename from pkgs/applications/video/screenkey/default.nix
rename to pkgs/by-name/sc/screenkey/package.nix
diff --git a/pkgs/tools/misc/script-directory/default.nix b/pkgs/by-name/sc/script-directory/package.nix
similarity index 100%
rename from pkgs/tools/misc/script-directory/default.nix
rename to pkgs/by-name/sc/script-directory/package.nix
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/by-name/sc/scriptaculous/package.nix
similarity index 100%
rename from pkgs/development/libraries/scriptaculous/default.nix
rename to pkgs/by-name/sc/scriptaculous/package.nix
diff --git a/pkgs/development/tools/misc/scriptisto/default.nix b/pkgs/by-name/sc/scriptisto/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/scriptisto/default.nix
rename to pkgs/by-name/sc/scriptisto/package.nix
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/by-name/sc/scrolls/package.nix
similarity index 100%
rename from pkgs/games/scrolls/default.nix
rename to pkgs/by-name/sc/scrolls/package.nix
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/by-name/sc/scrot/package.nix
similarity index 100%
rename from pkgs/tools/graphics/scrot/default.nix
rename to pkgs/by-name/sc/scrot/package.nix
diff --git a/pkgs/tools/misc/scrub/default.nix b/pkgs/by-name/sc/scrub/package.nix
similarity index 100%
rename from pkgs/tools/misc/scrub/default.nix
rename to pkgs/by-name/sc/scrub/package.nix
diff --git a/pkgs/development/compilers/scryer-prolog/Cargo.lock b/pkgs/by-name/sc/scryer-prolog/Cargo.lock
similarity index 100%
rename from pkgs/development/compilers/scryer-prolog/Cargo.lock
rename to pkgs/by-name/sc/scryer-prolog/Cargo.lock
diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
similarity index 100%
rename from pkgs/development/compilers/scryer-prolog/default.nix
rename to pkgs/by-name/sc/scryer-prolog/package.nix
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/by-name/sc/scrypt/package.nix
similarity index 100%
rename from pkgs/tools/security/scrypt/default.nix
rename to pkgs/by-name/sc/scrypt/package.nix
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/by-name/sc/scsh/package.nix
similarity index 100%
rename from pkgs/development/interpreters/scsh/default.nix
rename to pkgs/by-name/sc/scsh/package.nix
diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/by-name/sc/sct/package.nix
similarity index 100%
rename from pkgs/tools/X11/sct/default.nix
rename to pkgs/by-name/sc/sct/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/by-name/sc/scudcloud/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/scudcloud/default.nix
rename to pkgs/by-name/sc/scudcloud/package.nix
diff --git a/pkgs/by-name/sd/SDL_gpu/package.nix b/pkgs/by-name/sd/SDL_gpu/package.nix
index 5165099d4488..5e9cb88687fa 100644
--- a/pkgs/by-name/sd/SDL_gpu/package.nix
+++ b/pkgs/by-name/sd/SDL_gpu/package.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
   ];
 
+  # error: incompatible function pointer types assigning to 'GPU_Image *(*)(GPU_Renderer *, SDL_Surface *, GPU_Rect *)'...
+  env.NIX_CFLAGS_COMPILE = lib.optionalString (
+    stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"
+  ) "-Wno-error=incompatible-function-pointer-types";
+
   cmakeFlags = [
     (lib.cmakeBool "SDL_gpu_BUILD_DEMOS" false)
     (lib.cmakeBool "SDL_gpu_BUILD_TOOLS" false)
@@ -37,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "SDL_gpu_BUILD_TESTS" false)
   ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   strictDeps = true;
 
@@ -45,8 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library for high-performance, modern 2D graphics with SDL written in C";
     homepage = "https://grimfang4.github.io/sdl-gpu";
     license = lib.licenses.mit;
-    maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ ]);
+    maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]);
     inherit (SDL2.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix
index e2fd8000c546..33a15ff71b68 100644
--- a/pkgs/by-name/sd/SDL_sound/package.nix
+++ b/pkgs/by-name/sd/SDL_sound/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    (lib.enableFeature enableSdltest "--disable-sdltest")
+    (lib.enableFeature enableSdltest "sdltest")
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/sd/SDL_stretch/package.nix b/pkgs/by-name/sd/SDL_stretch/package.nix
index f7267b86fd6d..70a79f63515f 100644
--- a/pkgs/by-name/sd/SDL_stretch/package.nix
+++ b/pkgs/by-name/sd/SDL_stretch/package.nix
@@ -16,16 +16,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ SDL ];
 
+  configureFlags = [
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
+  ];
+
   buildInputs = [ SDL ];
 
   strictDeps = true;
 
   meta = {
-     homepage = "https://sdl-stretch.sourceforge.net/";
-     description = "Stretch Functions For SDL";
-     license = lib.licenses.lgpl2;
-     maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ ]);
-     inherit (SDL.meta) platforms;
+    # sdlstretchcode.c:38:10: fatal error: 'malloc.h' file not found
+    broken = stdenv.hostPlatform.isDarwin;
+    homepage = "https://sdl-stretch.sourceforge.net/";
+    description = "Stretch Functions For SDL";
+    license = lib.licenses.lgpl2;
+    maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]);
+    inherit (SDL.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
index bd40d331b9b9..2617f8e28eff 100644
--- a/pkgs/by-name/sd/SDL_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL_ttf/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    (lib.enableFeature enableSdltest "-sdltest")
+    (lib.enableFeature enableSdltest "sdltest")
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/by-name/sd/sd-local/package.nix
similarity index 100%
rename from pkgs/development/tools/sd-local/default.nix
rename to pkgs/by-name/sd/sd-local/package.nix
diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/by-name/sd/sd-switch/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sd-switch/default.nix
rename to pkgs/by-name/sd/sd-switch/package.nix
diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/by-name/sd/sdat2img/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/sdat2img/default.nix
rename to pkgs/by-name/sd/sdat2img/package.nix
diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/by-name/sd/sdate/package.nix
similarity index 100%
rename from pkgs/tools/misc/sdate/default.nix
rename to pkgs/by-name/sd/sdate/package.nix
diff --git a/pkgs/by-name/sd/sdcv/package.nix b/pkgs/by-name/sd/sdcv/package.nix
new file mode 100644
index 000000000000..a4a890f9c7ba
--- /dev/null
+++ b/pkgs/by-name/sd/sdcv/package.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, gettext, readline }:
+
+stdenv.mkDerivation rec {
+  pname = "sdcv";
+  version = "0.5.5";
+
+  src = fetchFromGitHub {
+    owner = "Dushistov";
+    repo = "sdcv";
+    rev = "v${version}";
+    sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
+  };
+
+  hardeningDisable = [ "format" ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ glib gettext readline ];
+
+  postPatch = ''
+    # https://github.com/Dushistov/sdcv/pull/104
+    substituteInPlace src/stardict_lib.cpp --replace-fail \
+      "gchar *nextchar = g_utf8_next_char(sWord)" \
+      "gchar *nextchar = const_cast(g_utf8_next_char(sWord))"
+  '';
+
+  preInstall = ''
+    mkdir locale
+  '';
+
+  env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
+
+  meta = with lib; {
+    homepage = "https://dushistov.github.io/sdcv/";
+    description = "Console version of StarDict";
+    maintainers = with maintainers; [ lovek323 ];
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    mainProgram = "sdcv";
+  };
+}
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
similarity index 100%
rename from pkgs/tools/misc/sdl-jstest/default.nix
rename to pkgs/by-name/sd/sdl-jstest/package.nix
diff --git a/pkgs/tools/security/sdlookup/default.nix b/pkgs/by-name/sd/sdlookup/package.nix
similarity index 100%
rename from pkgs/tools/security/sdlookup/default.nix
rename to pkgs/by-name/sd/sdlookup/package.nix
diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/by-name/sd/sdlpop/package.nix
similarity index 100%
rename from pkgs/games/sdlpop/default.nix
rename to pkgs/by-name/sd/sdlpop/package.nix
diff --git a/pkgs/games/sdlpop/prince.sh b/pkgs/by-name/sd/sdlpop/prince.sh
similarity index 100%
rename from pkgs/games/sdlpop/prince.sh
rename to pkgs/by-name/sd/sdlpop/prince.sh
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/by-name/sd/sdparm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sdparm/default.nix
rename to pkgs/by-name/sd/sdparm/package.nix
diff --git a/pkgs/by-name/sd/sdrplay/package.nix b/pkgs/by-name/sd/sdrplay/package.nix
new file mode 100644
index 000000000000..b3259412da24
--- /dev/null
+++ b/pkgs/by-name/sd/sdrplay/package.nix
@@ -0,0 +1,69 @@
+{ stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }:
+let
+  arch =
+    if stdenv.hostPlatform.isx86_64 then "x86_64"
+    else if stdenv.hostPlatform.isi686 then "i686"
+    else if stdenv.hostPlatform.isAarch64 then "aarch64"
+    else throw "unsupported architecture";
+
+  version = "3.07.1";
+
+  srcs = rec {
+    aarch64 = {
+      url = "https://www.sdrplay.com/software/SDRplay_RSP_API-ARM64-${version}.run";
+      hash = "sha256-GJPFW6W8Ke4mnczcSLFYfioOMGCfFn2/EIA07VnmVGY=";
+    };
+
+    x86_64 = {
+      url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run";
+      sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf";
+    };
+
+    i686 = x86_64;
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "sdrplay";
+  inherit version;
+
+  src = fetchurl srcs."${arch}";
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  buildInputs = [ libusb1 udev (lib.getLib stdenv.cc.cc) ];
+
+  unpackPhase = ''
+    sh "$src" --noexec --target source
+  '';
+
+  sourceRoot = "source";
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib,include,lib/udev/rules.d}
+    majorVersion="${lib.concatStringsSep "." (lib.take 1 (builtins.splitVersion version))}"
+    majorMinorVersion="${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}"
+    libName="libsdrplay_api"
+    cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/
+    ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion"
+    ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so"
+    cp "${arch}/sdrplay_apiService" $out/bin/
+    cp -r inc/* $out/include/
+    cp 66-mirics.rules $out/lib/udev/rules.d/
+  '';
+
+  meta = with lib; {
+    description = "SDRplay API";
+    longDescription = ''
+      Proprietary library and api service for working with SDRplay devices. For documentation and licensing details see
+      https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf
+    '';
+    homepage = "https://www.sdrplay.com/downloads/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ pmenke zaninime ];
+    platforms = platforms.linux;
+    mainProgram = "sdrplay_apiService";
+  };
+}
diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/sea-orm-cli/default.nix
rename to pkgs/by-name/se/sea-orm-cli/package.nix
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/by-name/se/seafile-shared/package.nix
similarity index 100%
rename from pkgs/misc/seafile-shared/default.nix
rename to pkgs/by-name/se/seafile-shared/package.nix
diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix
index 65b3cf855abb..832bca687d07 100644
--- a/pkgs/by-name/se/seahorse/package.nix
+++ b/pkgs/by-name/se/seahorse/package.nix
@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, fetchpatch
 , fetchurl
 , vala
 , meson
@@ -30,21 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seahorse";
-  version = "43.0";
+  version = "47.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/seahorse/${lib.versions.major version}/seahorse-${version}.tar.xz";
-    hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0=";
+    hash = "sha256-nBkX5KYff+u3h4Sc42znF/znBsNGiAuZHQVtVNrbysw=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "gpg-2.4.patch";
-      url = "https://gitlab.gnome.org/GNOME/seahorse/-/commit/9260c74779be3d7a378db0671af862ffa3573d42.patch";
-      hash = "sha256-4QiFgH4jC1ucmA9fFozUQZ3Mat76SgpYkMpRz80RH64=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/by-name/se/sealcurses/package.nix
similarity index 100%
rename from pkgs/development/libraries/sealcurses/default.nix
rename to pkgs/by-name/se/sealcurses/package.nix
diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/by-name/se/seashells/package.nix
similarity index 100%
rename from pkgs/applications/misc/seashells/default.nix
rename to pkgs/by-name/se/seashells/package.nix
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/by-name/se/seasocks/package.nix
similarity index 100%
rename from pkgs/development/libraries/seasocks/default.nix
rename to pkgs/by-name/se/seasocks/package.nix
diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/by-name/se/seatd/package.nix
similarity index 100%
rename from pkgs/applications/misc/seatd/default.nix
rename to pkgs/by-name/se/seatd/package.nix
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/by-name/se/seaview/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/seaview/default.nix
rename to pkgs/by-name/se/seaview/package.nix
diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix
new file mode 100644
index 000000000000..62eb95cc34ea
--- /dev/null
+++ b/pkgs/by-name/se/seaweedfs/package.nix
@@ -0,0 +1,61 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+, testers
+, seaweedfs
+}:
+
+buildGoModule rec {
+  pname = "seaweedfs";
+  version = "3.79";
+
+  src = fetchFromGitHub {
+    owner = "seaweedfs";
+    repo = "seaweedfs";
+    rev = version;
+    hash = "sha256-oAgeK9ZPH1uTFaGQv9T+yhHVla/hxyp84WTZ2PfpjOg=";
+  };
+
+  vendorHash = "sha256-4hftmcIHItEM4t2U/iT4mZsURejaO0JqSG3kjlBk77M=";
+
+  subPackages = [ "weed" ];
+
+  ldflags = [
+    "-w"
+    "-s"
+    "-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=N/A"
+  ];
+
+  tags = [
+    "elastic"
+    "gocdk"
+    "sqlite"
+    "ydb"
+    "tikv"
+  ];
+
+  preBuild = ''
+    export GODEBUG=http2client=0
+  '';
+
+  preCheck = ''
+    # Test all targets.
+    unset subPackages
+
+    # Remove unmaintained tests ahd those that require additional services.
+    rm -rf unmaintained test/s3
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = seaweedfs;
+    command = "weed version";
+  };
+
+  meta = with lib; {
+    description = "Simple and highly scalable distributed file system";
+    homepage = "https://github.com/chrislusf/seaweedfs";
+    maintainers = with maintainers; [ azahi cmacrae wozeparrot ];
+    mainProgram = "weed";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/by-name/se/sec/package.nix b/pkgs/by-name/se/sec/package.nix
new file mode 100644
index 000000000000..8a1f83ba6793
--- /dev/null
+++ b/pkgs/by-name/se/sec/package.nix
@@ -0,0 +1,33 @@
+{ fetchFromGitHub, perl, lib, stdenv }:
+
+stdenv.mkDerivation rec {
+  pname = "sec";
+  version = "2.9.3";
+
+  src = fetchFromGitHub {
+    owner = "simple-evcorr";
+    repo = "sec";
+    rev = version;
+    sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU=";
+  };
+
+  buildInputs = [ perl ];
+
+  dontBuild = false;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp sec $out/bin
+    cp sec.man $out/share/man/man1/sec.1
+  '';
+
+  meta = {
+    homepage = "https://simple-evcorr.github.io";
+    license = lib.licenses.gpl2Plus;
+    description = "Simple Event Correlator";
+    maintainers = [ lib.maintainers.tv ];
+    platforms = lib.platforms.all;
+    mainProgram = "sec";
+  };
+}
diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/by-name/se/seccure/package.nix
similarity index 100%
rename from pkgs/tools/security/seccure/default.nix
rename to pkgs/by-name/se/seccure/package.nix
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/by-name/se/secp256k1/package.nix
similarity index 100%
rename from pkgs/tools/security/secp256k1/default.nix
rename to pkgs/by-name/se/secp256k1/package.nix
diff --git a/pkgs/tools/security/secrets-extractor/default.nix b/pkgs/by-name/se/secrets-extractor/package.nix
similarity index 100%
rename from pkgs/tools/security/secrets-extractor/default.nix
rename to pkgs/by-name/se/secrets-extractor/package.nix
diff --git a/pkgs/tools/security/secretscanner/default.nix b/pkgs/by-name/se/secretscanner/package.nix
similarity index 100%
rename from pkgs/tools/security/secretscanner/default.nix
rename to pkgs/by-name/se/secretscanner/package.nix
diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/by-name/se/sedutil/package.nix
similarity index 100%
rename from pkgs/tools/security/sedutil/default.nix
rename to pkgs/by-name/se/sedutil/package.nix
diff --git a/pkgs/tools/misc/see/default.nix b/pkgs/by-name/se/see/package.nix
similarity index 100%
rename from pkgs/tools/misc/see/default.nix
rename to pkgs/by-name/se/see/package.nix
diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/by-name/se/seehecht/package.nix
similarity index 100%
rename from pkgs/tools/text/seehecht/default.nix
rename to pkgs/by-name/se/seehecht/package.nix
diff --git a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix
index b1cce1f4a351..76fb252afe25 100644
--- a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix
+++ b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     fontconfig
     xorg.libXrandr
     xorg.libXfixes
diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix
new file mode 100644
index 000000000000..ea8ddd53c09f
--- /dev/null
+++ b/pkgs/by-name/se/segger-ozone/package.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, fontconfig
+, freetype
+, libICE
+, libSM
+, libX11
+, libXcursor
+, libXfixes
+, libXrandr
+, libXrender
+}:
+
+stdenv.mkDerivation rec {
+  pname = "segger-ozone";
+  version = "3.30b";
+
+  src = {
+    x86_64-linux = fetchurl {
+      url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_x86_64.tgz";
+      hash = "sha256-W8Fo0q58pAn1aB92CjYARcN3vMLEguvsyozsS7VRArQ=";
+    };
+    i686-linux = fetchurl {
+      url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_i386.tgz";
+      hash = "sha256-Xq/69lwF2Ll5VdkYMDNRtc0YUUvWc+XR0FHJXxOLNQ4=";
+    };
+  }.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+    libICE
+    libSM
+    libX11
+    libXcursor
+    libXfixes
+    libXrandr
+    libXrender
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mv Lib lib
+    mv * $out
+    ln -s $out/Ozone $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "J-Link Debugger and Performance Analyzer";
+    longDescription = ''
+      Ozone is a cross-platform debugger and performance analyzer for J-Link
+      and J-Trace.
+
+        - Stand-alone graphical debugger
+        - Debug output of any tool chain and IDE 1
+        - C/C++ source level debugging and assembly instruction debugging
+        - Debug information windows for any purpose: disassembly, memory,
+          globals and locals, (live) watches, CPU and peripheral registers
+        - Source editor to fix bugs immediately
+        - High-speed programming of the application into the target
+        - Direct use of J-Link built-in features (Unlimited Flash
+          Breakpoints, Flash Download, Real Time Terminal, Instruction Trace)
+        - Scriptable project files to set up everything automatically
+          - New project wizard to ease the basic configuration of new projects
+
+      1 Ozone has been tested with the output of the following compilers:
+      GCC, Clang, ARM, IAR. Output of other compilers may be supported but is
+      not guaranteed to be.
+    '';
+    homepage = "https://www.segger.com/products/development-tools/ozone-j-link-debugger";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = [ maintainers.bmilanov ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/by-name/se/selendroid/package.nix
similarity index 100%
rename from pkgs/development/tools/selenium/selendroid/default.nix
rename to pkgs/by-name/se/selendroid/package.nix
diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/by-name/se/selene/package.nix
similarity index 100%
rename from pkgs/development/tools/selene/default.nix
rename to pkgs/by-name/se/selene/package.nix
diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix
index 250dea11f0b3..6420ff34f3ed 100644
--- a/pkgs/by-name/se/selenium-manager/package.nix
+++ b/pkgs/by-name/se/selenium-manager/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "selenium-manager";
-  version = "4.24.0";
+  version = "4.25.0";
 
   src = fetchFromGitHub {
     owner = "SeleniumHQ";
     repo = "selenium";
     rev = "selenium-${version}";
-    hash = "sha256-AsQr9kGv2dxkiFzptDA0D27OXZjYj7oDKz2oEQ2qW7s=";
+    hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY=";
   };
 
   sourceRoot = "${src.name}/rust";
 
-  cargoHash = "sha256-mirEeOi6CfKjb8ZuqardJeYy9EGnpsw5fkUw7umhkro=";
+  cargoHash = "sha256-8is7lQ+V1Xf+Aturg836jRMoHIJzDoSVJT5ZOd8W51k=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.SystemConfiguration
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/by-name/se/selenium-server-standalone/package.nix
similarity index 100%
rename from pkgs/development/tools/selenium/server/default.nix
rename to pkgs/by-name/se/selenium-server-standalone/package.nix
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/by-name/se/selfoss/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/selfoss/default.nix
rename to pkgs/by-name/se/selfoss/package.nix
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/by-name/se/selinux-python/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/selinux-python/default.nix
rename to pkgs/by-name/se/selinux-python/package.nix
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/by-name/se/selinux-sandbox/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/selinux-sandbox/default.nix
rename to pkgs/by-name/se/selinux-sandbox/package.nix
diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/by-name/se/sem/package.nix
similarity index 100%
rename from pkgs/development/tools/sem/default.nix
rename to pkgs/by-name/se/sem/package.nix
diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/by-name/se/semantic-release/package.nix
similarity index 100%
rename from pkgs/development/tools/semantic-release/default.nix
rename to pkgs/by-name/se/semantic-release/package.nix
diff --git a/pkgs/tools/misc/semiphemeral/default.nix b/pkgs/by-name/se/semiphemeral/package.nix
similarity index 100%
rename from pkgs/tools/misc/semiphemeral/default.nix
rename to pkgs/by-name/se/semiphemeral/package.nix
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/by-name/se/semodule-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/semodule-utils/default.nix
rename to pkgs/by-name/se/semodule-utils/package.nix
diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/by-name/se/semver-tool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/semver-tool/default.nix
rename to pkgs/by-name/se/semver-tool/package.nix
diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/by-name/se/semver/package.nix
similarity index 100%
rename from pkgs/applications/misc/semver/default.nix
rename to pkgs/by-name/se/semver/package.nix
diff --git a/pkgs/applications/networking/irc/senpai/bump-go-version.patch b/pkgs/by-name/se/senpai/bump-go-version.patch
similarity index 100%
rename from pkgs/applications/networking/irc/senpai/bump-go-version.patch
rename to pkgs/by-name/se/senpai/bump-go-version.patch
diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/by-name/se/senpai/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/senpai/default.nix
rename to pkgs/by-name/se/senpai/package.nix
diff --git a/pkgs/os-specific/darwin/sensible-side-buttons/default.nix b/pkgs/by-name/se/sensible-side-buttons/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/sensible-side-buttons/default.nix
rename to pkgs/by-name/se/sensible-side-buttons/package.nix
diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/by-name/se/sensible-utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/sensible-utils/default.nix
rename to pkgs/by-name/se/sensible-utils/package.nix
diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/by-name/se/sent/package.nix
similarity index 100%
rename from pkgs/applications/misc/sent/default.nix
rename to pkgs/by-name/se/sent/package.nix
diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/by-name/se/sentencepiece/package.nix
similarity index 100%
rename from pkgs/development/libraries/sentencepiece/default.nix
rename to pkgs/by-name/se/sentencepiece/package.nix
diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
new file mode 100644
index 000000000000..0960229a8980
--- /dev/null
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, curl
+, breakpad
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sentry-native";
+  version = "0.7.11";
+
+  src = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "sentry-native";
+    rev = version;
+    hash = "sha256-IDtymBIG5ilTHyFZ/EA2YJK72wvz7kHn2o9gbu7ejKM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    curl
+    breakpad
+  ];
+
+  cmakeBuildType = "RelWithDebInfo";
+
+  cmakeFlags = [
+    "-DSENTRY_BREAKPAD_SYSTEM=On"
+    "-DSENTRY_BACKEND=breakpad"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/getsentry/sentry-native";
+    description = "Sentry SDK for C, C++ and native applications";
+    changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wheelsandmetal daniel-fahey ];
+  };
+}
diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/by-name/se/senv/package.nix
similarity index 100%
rename from pkgs/applications/misc/senv/default.nix
rename to pkgs/by-name/se/senv/package.nix
diff --git a/pkgs/applications/audio/seq24/mutex_no_nameclash.patch b/pkgs/by-name/se/seq24/mutex_no_nameclash.patch
similarity index 100%
rename from pkgs/applications/audio/seq24/mutex_no_nameclash.patch
rename to pkgs/by-name/se/seq24/mutex_no_nameclash.patch
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/by-name/se/seq24/package.nix
similarity index 100%
rename from pkgs/applications/audio/seq24/default.nix
rename to pkgs/by-name/se/seq24/package.nix
diff --git a/pkgs/by-name/se/seqkit/package.nix b/pkgs/by-name/se/seqkit/package.nix
new file mode 100644
index 000000000000..c5fb63c66eda
--- /dev/null
+++ b/pkgs/by-name/se/seqkit/package.nix
@@ -0,0 +1,25 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+  pname = "seqkit";
+  version = "2.9.0";
+
+  src = fetchFromGitHub {
+    owner = "shenwei356";
+    repo = "seqkit";
+    rev = "v${version}";
+    sha256 = "sha256-xPlqS0tYx077YD/MIxGFn8Bdy4h25dY8idhypIj28rI=";
+  };
+
+  vendorHash = "sha256-EzEomz9GVcirx+Uk1Ygmmb1/GkdUS9aBStLxuNzjHAU=";
+
+  meta = with lib; {
+    description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation";
+    homepage = "https://github.com/shenwei356/seqkit";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bzizou ];
+  };
+}
diff --git a/pkgs/applications/science/biology/seqtk/default.nix b/pkgs/by-name/se/seqtk/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/seqtk/default.nix
rename to pkgs/by-name/se/seqtk/package.nix
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/by-name/se/sequeler/package.nix
similarity index 100%
rename from pkgs/applications/misc/sequeler/default.nix
rename to pkgs/by-name/se/sequeler/package.nix
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/by-name/se/sequelpro/package.nix
similarity index 100%
rename from pkgs/applications/misc/sequelpro/default.nix
rename to pkgs/by-name/se/sequelpro/package.nix
diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
similarity index 100%
rename from pkgs/tools/security/sequoia-chameleon-gnupg/default.nix
rename to pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 450113dda742..5d60be2f96c0 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sequoia-sq";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
     rev = "v${version}";
-    hash = "sha256-Zzk7cQs5zD+houNjK8s3tP9kZ2/eAUV/OE3/GrNAXk8=";
+    hash = "sha256-nLrwf/4vbASOAyOWlc4X9ZQKFq/Kdh83XadpRuquEA4=";
   };
 
-  cargoHash = "sha256-Ou+YKfEOmMTZVg9unqoOibMQYsdNAYTq4ZoOANLRk2Y=";
+  cargoHash = "sha256-MnxvuO1KG7X2plFkQ/DNBHnH2cPi1X3SVbvcN8N7ZXk=";
 
   nativeBuildInputs = [
     pkg-config
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://sequoia-pgp.org/";
     changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ minijackson doronbehar ];
+    maintainers = with lib.maintainers; [ minijackson doronbehar dvn0 ];
     mainProgram = "sq";
   };
 }
diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/by-name/se/sequoia-sqop/package.nix
similarity index 100%
rename from pkgs/tools/security/sequoia-sqop/default.nix
rename to pkgs/by-name/se/sequoia-sqop/package.nix
diff --git a/pkgs/tools/security/sequoia-sqv/Cargo.lock.patch b/pkgs/by-name/se/sequoia-sqv/Cargo.lock.patch
similarity index 100%
rename from pkgs/tools/security/sequoia-sqv/Cargo.lock.patch
rename to pkgs/by-name/se/sequoia-sqv/Cargo.lock.patch
diff --git a/pkgs/tools/security/sequoia-sqv/default.nix b/pkgs/by-name/se/sequoia-sqv/package.nix
similarity index 100%
rename from pkgs/tools/security/sequoia-sqv/default.nix
rename to pkgs/by-name/se/sequoia-sqv/package.nix
diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/by-name/se/ser2net/package.nix
similarity index 100%
rename from pkgs/servers/ser2net/default.nix
rename to pkgs/by-name/se/ser2net/package.nix
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/by-name/se/serd/package.nix
similarity index 100%
rename from pkgs/development/libraries/serd/default.nix
rename to pkgs/by-name/se/serd/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/by-name/se/seren/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/seren/default.nix
rename to pkgs/by-name/se/seren/package.nix
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/by-name/se/serf/package.nix
similarity index 100%
rename from pkgs/development/libraries/serf/default.nix
rename to pkgs/by-name/se/serf/package.nix
diff --git a/pkgs/development/libraries/serf/scons.patch b/pkgs/by-name/se/serf/scons.patch
similarity index 100%
rename from pkgs/development/libraries/serf/scons.patch
rename to pkgs/by-name/se/serf/scons.patch
diff --git a/pkgs/servers/serf/default.nix b/pkgs/by-name/se/serfdom/package.nix
similarity index 100%
rename from pkgs/servers/serf/default.nix
rename to pkgs/by-name/se/serfdom/package.nix
diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/by-name/se/serialdv/package.nix
similarity index 100%
rename from pkgs/development/libraries/serialdv/default.nix
rename to pkgs/by-name/se/serialdv/package.nix
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/by-name/se/serpent/package.nix
similarity index 100%
rename from pkgs/development/compilers/serpent/default.nix
rename to pkgs/by-name/se/serpent/package.nix
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/by-name/se/service-wrapper/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/service-wrapper/default.nix
rename to pkgs/by-name/se/service-wrapper/package.nix
diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/by-name/se/service-wrapper/service-wrapper.sh
similarity index 100%
rename from pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
rename to pkgs/by-name/se/service-wrapper/service-wrapper.sh
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/by-name/se/serviio/package.nix
similarity index 100%
rename from pkgs/servers/serviio/default.nix
rename to pkgs/by-name/se/serviio/package.nix
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index fc586d5ddcd9..af6fb95d9585 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -142,7 +142,7 @@ rustPlatform.buildRustPackage {
       --prefix LD_LIBRARY_PATH : ${runtimePaths}
   '';
 
-  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+  LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
 
   meta = {
     description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine";
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/by-name/se/seshat/package.nix
similarity index 100%
rename from pkgs/data/fonts/seshat/default.nix
rename to pkgs/by-name/se/seshat/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/by-name/se/session-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/session-desktop/default.nix
rename to pkgs/by-name/se/session-desktop/package.nix
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/by-name/se/setbfree/package.nix
similarity index 100%
rename from pkgs/applications/audio/setbfree/default.nix
rename to pkgs/by-name/se/setbfree/package.nix
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/by-name/se/setools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/setools/default.nix
rename to pkgs/by-name/se/setools/package.nix
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/by-name/se/setroot/package.nix
similarity index 100%
rename from pkgs/tools/X11/setroot/default.nix
rename to pkgs/by-name/se/setroot/package.nix
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/by-name/se/setserial/package.nix
similarity index 100%
rename from pkgs/tools/system/setserial/default.nix
rename to pkgs/by-name/se/setserial/package.nix
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/by-name/se/seturgent/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/seturgent/default.nix
rename to pkgs/by-name/se/seturgent/package.nix
diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/by-name/se/sewer/package.nix
similarity index 100%
rename from pkgs/tools/admin/sewer/default.nix
rename to pkgs/by-name/se/sewer/package.nix
diff --git a/pkgs/development/libraries/sexpp/default.nix b/pkgs/by-name/se/sexpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/sexpp/default.nix
rename to pkgs/by-name/se/sexpp/package.nix
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/by-name/se/seyren/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/seyren/default.nix
rename to pkgs/by-name/se/seyren/package.nix
diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/by-name/sf/sfeed/package.nix
similarity index 100%
rename from pkgs/tools/misc/sfeed/default.nix
rename to pkgs/by-name/sf/sfeed/package.nix
diff --git a/pkgs/applications/audio/sfizz/gcc13.patch b/pkgs/by-name/sf/sfizz/gcc13.patch
similarity index 100%
rename from pkgs/applications/audio/sfizz/gcc13.patch
rename to pkgs/by-name/sf/sfizz/gcc13.patch
diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/by-name/sf/sfizz/package.nix
similarity index 100%
rename from pkgs/applications/audio/sfizz/default.nix
rename to pkgs/by-name/sf/sfizz/package.nix
diff --git a/pkgs/applications/file-managers/sfm/default.nix b/pkgs/by-name/sf/sfm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/sfm/default.nix
rename to pkgs/by-name/sf/sfm/package.nix
diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/by-name/sf/sfrotz/package.nix
similarity index 100%
rename from pkgs/games/sfrotz/default.nix
rename to pkgs/by-name/sf/sfrotz/package.nix
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/by-name/sf/sfsexp/package.nix
similarity index 100%
rename from pkgs/development/libraries/sfsexp/default.nix
rename to pkgs/by-name/sf/sfsexp/package.nix
diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/by-name/sf/sftpgo/package.nix
similarity index 100%
rename from pkgs/servers/sftpgo/default.nix
rename to pkgs/by-name/sf/sftpgo/package.nix
diff --git a/pkgs/tools/filesystems/sftpman/default.nix b/pkgs/by-name/sf/sftpman/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/sftpman/default.nix
rename to pkgs/by-name/sf/sftpman/package.nix
diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/by-name/sf/sfxr/package.nix
similarity index 100%
rename from pkgs/applications/audio/sfxr/default.nix
rename to pkgs/by-name/sf/sfxr/package.nix
diff --git a/pkgs/tools/misc/sfz/default.nix b/pkgs/by-name/sf/sfz/package.nix
similarity index 100%
rename from pkgs/tools/misc/sfz/default.nix
rename to pkgs/by-name/sf/sfz/package.nix
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/by-name/sg/sg3_utils/package.nix
similarity index 100%
rename from pkgs/tools/system/sg3_utils/default.nix
rename to pkgs/by-name/sg/sg3_utils/package.nix
diff --git a/pkgs/development/libraries/sgp4/default.nix b/pkgs/by-name/sg/sgp4/package.nix
similarity index 100%
rename from pkgs/development/libraries/sgp4/default.nix
rename to pkgs/by-name/sg/sgp4/package.nix
diff --git a/pkgs/tools/text/sgrep/default.nix b/pkgs/by-name/sg/sgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/sgrep/default.nix
rename to pkgs/by-name/sg/sgrep/package.nix
diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix
rename to pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix
rename to pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/tests-missing-includes.patch b/pkgs/by-name/sg/sgx-azure-dcap-client/tests-missing-includes.patch
similarity index 100%
rename from pkgs/os-specific/linux/sgx/azure-dcap-client/tests-missing-includes.patch
rename to pkgs/by-name/sg/sgx-azure-dcap-client/tests-missing-includes.patch
diff --git a/pkgs/os-specific/linux/sgx/ssl/default.nix b/pkgs/by-name/sg/sgx-ssl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/ssl/default.nix
rename to pkgs/by-name/sg/sgx-ssl/package.nix
diff --git a/pkgs/os-specific/linux/sgx/ssl/tests.nix b/pkgs/by-name/sg/sgx-ssl/tests.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/ssl/tests.nix
rename to pkgs/by-name/sg/sgx-ssl/tests.nix
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/by-name/sh/sha1collisiondetection/package.nix
similarity index 100%
rename from pkgs/tools/security/sha1collisiondetection/default.nix
rename to pkgs/by-name/sh/sha1collisiondetection/package.nix
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/by-name/sh/shaarli/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/shaarli/default.nix
rename to pkgs/by-name/sh/shaarli/package.nix
diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/by-name/sh/shabnam-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/shabnam-fonts/default.nix
rename to pkgs/by-name/sh/shabnam-fonts/package.nix
diff --git a/pkgs/by-name/sh/shadcn/package.nix b/pkgs/by-name/sh/shadcn/package.nix
new file mode 100644
index 000000000000..9135d1b5dd0b
--- /dev/null
+++ b/pkgs/by-name/sh/shadcn/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  nodejs,
+  pnpm_9,
+  testers,
+  shadcn,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "shadcn";
+  version = "2.0.3";
+
+  src = fetchFromGitHub {
+    owner = "shadcn-ui";
+    repo = "ui";
+    rev = "shadcn@${finalAttrs.version}";
+    hash = "sha256-OBLKCj+v5KgYslJGuwLgJHjgcrxLPiiyO5/ucrJ14Ws=";
+  };
+
+  pnpmWorkspaces = [ "shadcn" ];
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmWorkspaces
+      ;
+    hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ=";
+  };
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    nodejs
+    pnpm_9.configHook
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run shadcn:build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib}
+    cp -r {packages,node_modules} $out/lib
+
+    # cleanup
+    rm -r $out/lib/packages/{cli,shadcn/src}
+    find $out/lib/packages/shadcn -name '*.ts' -delete
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/shadcn \
+      --inherit-argv0 \
+      --add-flags $out/lib/packages/shadcn/dist/index.js
+
+    runHook postInstall
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = shadcn;
+    command = "shadcn --version";
+    version = finalAttrs.version;
+  };
+
+  meta = {
+    changelog = "https://github.com/shadcn-ui/ui/blob/${finalAttrs.src.rev}/packages/shadcn/CHANGELOG.md#${
+      builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version
+    }";
+    description = "Beautifully designed components that you can copy and paste into your apps";
+    homepage = "https://ui.shadcn.com/docs/cli";
+    license = lib.licenses.mit;
+    mainProgram = "shadcn";
+    maintainers = with lib.maintainers; [ getpsyched ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/development/tools/shadered/install_path_fix.patch b/pkgs/by-name/sh/shadered/install_path_fix.patch
similarity index 100%
rename from pkgs/development/tools/shadered/install_path_fix.patch
rename to pkgs/by-name/sh/shadered/install_path_fix.patch
diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/by-name/sh/shadered/package.nix
similarity index 100%
rename from pkgs/development/tools/shadered/default.nix
rename to pkgs/by-name/sh/shadered/package.nix
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/by-name/sh/shades-of-gray-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/shades-of-gray/default.nix
rename to pkgs/by-name/sh/shades-of-gray-theme/package.nix
diff --git a/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch
rename to pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/by-name/sh/shadow/keep-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/keep-path.patch
rename to pkgs/by-name/sh/shadow/keep-path.patch
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/by-name/sh/shadow/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/shadow/default.nix
rename to pkgs/by-name/sh/shadow/package.nix
diff --git a/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch b/pkgs/by-name/sh/shadow/respect-xml-catalog-files-var.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch
rename to pkgs/by-name/sh/shadow/respect-xml-catalog-files-var.patch
diff --git a/pkgs/os-specific/linux/shadow/runtime-shell.patch b/pkgs/by-name/sh/shadow/runtime-shell.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/runtime-shell.patch
rename to pkgs/by-name/sh/shadow/runtime-shell.patch
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/by-name/sh/shadowfox/package.nix
similarity index 100%
rename from pkgs/tools/networking/shadowfox/default.nix
rename to pkgs/by-name/sh/shadowfox/package.nix
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix
similarity index 100%
rename from pkgs/tools/networking/shadowsocks-libev/default.nix
rename to pkgs/by-name/sh/shadowsocks-libev/package.nix
diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
similarity index 100%
rename from pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix
rename to pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
diff --git a/pkgs/by-name/sh/shadps4/av_err2str_macro.patch b/pkgs/by-name/sh/shadps4/av_err2str_macro.patch
new file mode 100644
index 000000000000..cb4507b6a35c
--- /dev/null
+++ b/pkgs/by-name/sh/shadps4/av_err2str_macro.patch
@@ -0,0 +1,28 @@
+diff --git a/src/core/libraries/videodec/videodec2_impl.cpp b/src/core/libraries/videodec/videodec2_impl.cpp
+index 021965e..31eb537 100644
+--- a/src/core/libraries/videodec/videodec2_impl.cpp
++++ b/src/core/libraries/videodec/videodec2_impl.cpp
+@@ -8,6 +8,16 @@
+ #include "common/logging/log.h"
+ #include "core/libraries/error_codes.h"
+ 
++#ifdef av_err2str 
++#undef av_err2str 
++#include  
++av_always_inline std::string av_err2string(int errnum) { 
++    char errbuf[AV_ERROR_MAX_STRING_SIZE]; 
++    return av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum); 
++} 
++#define av_err2str(err) av_err2string(err).c_str() 
++#endif // av_err2str
++
+ namespace Libraries::Vdec2 {
+ 
+ std::vector gPictureInfos;
+@@ -225,4 +235,4 @@ AVFrame* VdecDecoder::ConvertNV12Frame(AVFrame& frame) {
+     return nv12_frame;
+ }
+ 
+-} // namespace Libraries::Vdec2
+\ No newline at end of file
++} // namespace Libraries::Vdec2
diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 9c751d267334..5484724d886e 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -33,15 +33,15 @@
   unstableGitUpdater,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
-  version = "0.3.0-unstable-2024-10-14";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "shadps4-emu";
     repo = "shadPS4";
-    rev = "09725bd921088b73746605e672abf6ff40171880";
-    hash = "sha256-NtIiqmiZ1iCciMjT1cL7ONWxNHRO/0bci/thLrcORjo=";
+    rev = "refs/tags/v.${finalAttrs.version}";
+    hash = "sha256-dAhm9XMFnpNmbgi/TGktNHMdFDYPOWj31pZkBoUfQhA=";
     fetchSubmodules = true;
   };
 
@@ -55,6 +55,9 @@ stdenv.mkDerivation {
     # downloading an AppImage and trying to run it just won't work.
     # https://github.com/shadps4-emu/shadPS4/issues/1368
     ./0001-Disable-update-checking.patch
+
+    # https://github.com/shadps4-emu/shadPS4/issues/1457
+    ./av_err2str_macro.patch
   ];
 
   buildInputs = [
@@ -132,9 +135,10 @@ stdenv.mkDerivation {
   meta = {
     description = "Early in development PS4 emulator";
     homepage = "https://github.com/shadps4-emu/shadPS4";
+    changelog = "https://github.com/shadps4-emu/shadPS4/releases/tag/v.${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ ryand56 ];
     mainProgram = "shadps4";
     platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64;
   };
-}
+})
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/by-name/sh/shairport-sync/package.nix
similarity index 100%
rename from pkgs/servers/shairport-sync/default.nix
rename to pkgs/by-name/sh/shairport-sync/package.nix
diff --git a/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch b/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch
index ef06193a68d7..c6d54b5943de 100644
--- a/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch
+++ b/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch
@@ -1,12 +1,3 @@
-From e243cc17f48c5e1b8db29cab85ca98b033d972fb Mon Sep 17 00:00:00 2001
-From: Niklas Korz 
-Date: Wed, 4 Sep 2024 14:51:30 +0200
-Subject: [PATCH 1/3] Allow external declaration of packager version
-
----
- packager/version/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/packager/version/CMakeLists.txt b/packager/version/CMakeLists.txt
 index fba4fb8282..ad56e0a23b 100644
 --- a/packager/version/CMakeLists.txt
@@ -27,6 +18,4 @@ index fba4fb8282..ad56e0a23b 100644
  
  add_library(version STATIC version.cc)
  target_compile_definitions(version PRIVATE
--- 
-2.46.0
 
diff --git a/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch b/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch
index 5054862b656c..19abd9ad5a6c 100644
--- a/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch
+++ b/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch
@@ -1,13 +1,3 @@
-From 4c7743f4fd231648d7bd1513c9db71a651ef7553 Mon Sep 17 00:00:00 2001
-From: Niklas Korz 
-Date: Wed, 4 Sep 2024 14:52:23 +0200
-Subject: [PATCH 2/3] Unvendor dependencies
-
----
- CMakeLists.txt          | 24 ++++++++++++++++++++++++
- packager/CMakeLists.txt |  1 -
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 5b96a2429e..181df0bf2d 100644
 --- a/CMakeLists.txt
@@ -62,6 +52,27 @@ index 7238d243bb..722217bbc4 100644
  add_subdirectory(tools)
  add_subdirectory(utils)
  add_subdirectory(version)
--- 
-2.46.0
+diff --git a/packager/tools/pssh/CMakeLists.txt b/packager/tools/pssh/CMakeLists.txt
+index 9ec3a39d26..0b981cec29 100644
+--- a/packager/tools/pssh/CMakeLists.txt
++++ b/packager/tools/pssh/CMakeLists.txt
+@@ -14,7 +14,6 @@ set(PSSH_BOX_OUTPUTS
+ 
+ add_custom_command(
+     DEPENDS
+-        protobuf_py
+         widevine_protos
+         pssh-box.py
+     OUTPUT ${PSSH_BOX_OUTPUTS}
+@@ -26,10 +25,6 @@ add_custom_command(
+         ${CMAKE_BINARY_DIR}/packager/media/base/widevine_common_encryption_pb2.py
+         ${CMAKE_BINARY_DIR}/packager/media/base/widevine_pssh_data_pb2.py
+         ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/
+-    COMMAND
+-        ${CMAKE_COMMAND} -E copy_directory
+-        ${CMAKE_BINARY_DIR}/packager/third_party/protobuf/py/google
+-        ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/google
+     COMMAND
+         ${CMAKE_COMMAND} -E copy
+         ${CMAKE_CURRENT_SOURCE_DIR}/pssh-box.py
 
diff --git a/pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch b/pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch
deleted file mode 100644
index 59bffb9925ef..000000000000
--- a/pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c8b0b467a140d8a67157f5cee26a8510444706be Mon Sep 17 00:00:00 2001
-From: Niklas Korz 
-Date: Wed, 4 Sep 2024 14:52:47 +0200
-Subject: [PATCH 3/3] Fix curl deprecations
-
----
- packager/file/http_file.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
-index b50fef6f07..dca43e26ca 100644
---- a/packager/file/http_file.cc
-+++ b/packager/file/http_file.cc
-@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {
-       curl_easy_setopt(curl, CURLOPT_POST, 1L);
-       break;
-     case HttpMethod::kPut:
--      curl_easy_setopt(curl, CURLOPT_PUT, 1L);
-+      curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
-       break;
-   }
- 
--- 
-2.46.0
-
diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix
index 6c1cd25bd2e1..2923b852d479 100644
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shaka-packager";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "shaka-project";
     repo = "shaka-packager";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-L10IMsc4dTMa5zwYq612F4J+uKOmEEChY8k/m09wuNE=";
+    hash = "sha256-5TDfIbguBipYciXusn0rDS0ZQl0+fDFfHYbrnYjxSdE=";
   };
 
   patches = [
@@ -46,10 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     # The last step is necessary to keep the patch size to a minimum, otherwise we'd have
     # to add the namespace identifiers everywhere a dependency is used.
     ./0002-Unvendor-dependencies.patch
-    # As nixpkgs ships with a newer version of libcurl than the one vendored in shaka-packager,
-    # we have to fix one deprecation.
-    # See https://curl.se/libcurl/c/CURLOPT_PUT.html for further information.
-    ./0003-Fix-curl-deprecations.patch
   ];
 
   nativeBuildInputs = [
@@ -58,7 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    python3
+    (python3.withPackages (ps: [
+      # As we remove the vendored protobuf in our patch,
+      # we must re-add it to the python package used for
+      # pssh_box.py.
+      ps.protobuf
+    ]))
     abseil-cpp
     curl
     gtest
@@ -95,13 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Media packaging framework for VOD and Live DASH and HLS applications";
     homepage = "https://shaka-project.github.io/shaka-packager/html/";
     changelog = "https://github.com/shaka-project/shaka-packager/releases/tag/v${finalAttrs.version}";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     mainProgram = "packager";
-    maintainers = with maintainers; [ niklaskorz ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ niklaskorz ];
+    platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/by-name/sh/shallot/package.nix
similarity index 100%
rename from pkgs/tools/misc/shallot/default.nix
rename to pkgs/by-name/sh/shallot/package.nix
diff --git a/pkgs/tools/audio/shaq/default.nix b/pkgs/by-name/sh/shaq/package.nix
similarity index 100%
rename from pkgs/tools/audio/shaq/default.nix
rename to pkgs/by-name/sh/shaq/package.nix
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/by-name/sh/shared-mime-info/package.nix
similarity index 100%
rename from pkgs/data/misc/shared-mime-info/default.nix
rename to pkgs/by-name/sh/shared-mime-info/package.nix
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/by-name/sh/shared_desktop_ontologies/package.nix
similarity index 100%
rename from pkgs/data/misc/shared-desktop-ontologies/default.nix
rename to pkgs/by-name/sh/shared_desktop_ontologies/package.nix
diff --git a/pkgs/servers/sharing/default.nix b/pkgs/by-name/sh/sharing/package.nix
similarity index 100%
rename from pkgs/servers/sharing/default.nix
rename to pkgs/by-name/sh/sharing/package.nix
diff --git a/pkgs/development/libraries/sharness/default.nix b/pkgs/by-name/sh/sharness/package.nix
similarity index 100%
rename from pkgs/development/libraries/sharness/default.nix
rename to pkgs/by-name/sh/sharness/package.nix
diff --git a/pkgs/applications/science/logic/sharpsat-td/default.nix b/pkgs/by-name/sh/sharpsat-td/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/sharpsat-td/default.nix
rename to pkgs/by-name/sh/sharpsat-td/package.nix
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/by-name/sh/sharutils/package.nix
similarity index 100%
rename from pkgs/tools/archivers/sharutils/default.nix
rename to pkgs/by-name/sh/sharutils/package.nix
diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/by-name/sh/shavee/package.nix
similarity index 100%
rename from pkgs/applications/misc/shavee/default.nix
rename to pkgs/by-name/sh/shavee/package.nix
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/by-name/sh/shc/package.nix
similarity index 100%
rename from pkgs/tools/security/shc/default.nix
rename to pkgs/by-name/sh/shc/package.nix
diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/by-name/sh/shell-genie/package.nix
similarity index 100%
rename from pkgs/applications/misc/shell-genie/default.nix
rename to pkgs/by-name/sh/shell-genie/package.nix
diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/by-name/sh/shell-hist/package.nix
similarity index 100%
rename from pkgs/tools/misc/shell-hist/default.nix
rename to pkgs/by-name/sh/shell-hist/package.nix
diff --git a/pkgs/servers/misc/shell2http/default.nix b/pkgs/by-name/sh/shell2http/package.nix
similarity index 100%
rename from pkgs/servers/misc/shell2http/default.nix
rename to pkgs/by-name/sh/shell2http/package.nix
diff --git a/pkgs/tools/security/shellclear/default.nix b/pkgs/by-name/sh/shellclear/package.nix
similarity index 100%
rename from pkgs/tools/security/shellclear/default.nix
rename to pkgs/by-name/sh/shellclear/package.nix
diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/by-name/sh/shelldap/package.nix
similarity index 100%
rename from pkgs/tools/misc/shelldap/default.nix
rename to pkgs/by-name/sh/shelldap/package.nix
diff --git a/pkgs/development/tools/shellharden/default.nix b/pkgs/by-name/sh/shellharden/package.nix
similarity index 100%
rename from pkgs/development/tools/shellharden/default.nix
rename to pkgs/by-name/sh/shellharden/package.nix
diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
similarity index 100%
rename from pkgs/applications/networking/shellhub-agent/default.nix
rename to pkgs/by-name/sh/shellhub-agent/package.nix
diff --git a/pkgs/tools/security/shellnoob/default.nix b/pkgs/by-name/sh/shellnoob/package.nix
similarity index 100%
rename from pkgs/tools/security/shellnoob/default.nix
rename to pkgs/by-name/sh/shellnoob/package.nix
diff --git a/pkgs/tools/misc/shellspec/default.nix b/pkgs/by-name/sh/shellspec/package.nix
similarity index 100%
rename from pkgs/tools/misc/shellspec/default.nix
rename to pkgs/by-name/sh/shellspec/package.nix
diff --git a/pkgs/tools/security/shellz/default.nix b/pkgs/by-name/sh/shellz/package.nix
similarity index 100%
rename from pkgs/tools/security/shellz/default.nix
rename to pkgs/by-name/sh/shellz/package.nix
diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/by-name/sh/shen-sbcl/package.nix
similarity index 100%
rename from pkgs/development/interpreters/shen-sbcl/default.nix
rename to pkgs/by-name/sh/shen-sbcl/package.nix
diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/by-name/sh/shen-sources/package.nix
similarity index 100%
rename from pkgs/development/interpreters/shen-sources/default.nix
rename to pkgs/by-name/sh/shen-sources/package.nix
diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix
index 50421ff991b6..84f9fe58d35e 100644
--- a/pkgs/by-name/sh/sherlock/package.nix
+++ b/pkgs/by-name/sh/sherlock/package.nix
@@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   meta = {
-    homepage = "https://sherlock-project.github.io/";
+    homepage = "https://sherlockproject.xyz/";
     description = "Hunt down social media accounts by username across social networks";
     license = lib.licenses.mit;
     mainProgram = "sherlock";
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/by-name/sh/sherpa/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/sherpa/default.nix
rename to pkgs/by-name/sh/sherpa/package.nix
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/by-name/sh/shfmt/package.nix
similarity index 100%
rename from pkgs/tools/text/shfmt/default.nix
rename to pkgs/by-name/sh/shfmt/package.nix
diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/by-name/sh/shhmsg/package.nix
similarity index 100%
rename from pkgs/development/libraries/shhmsg/default.nix
rename to pkgs/by-name/sh/shhmsg/package.nix
diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/by-name/sh/shhopt/package.nix
similarity index 100%
rename from pkgs/development/libraries/shhopt/default.nix
rename to pkgs/by-name/sh/shhopt/package.nix
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix
similarity index 100%
rename from pkgs/development/libraries/shibboleth-sp/default.nix
rename to pkgs/by-name/sh/shibboleth-sp/package.nix
diff --git a/pkgs/tools/wayland/shikane/default.nix b/pkgs/by-name/sh/shikane/package.nix
similarity index 100%
rename from pkgs/tools/wayland/shikane/default.nix
rename to pkgs/by-name/sh/shikane/package.nix
diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/by-name/sh/shim-unsigned/package.nix
similarity index 100%
rename from pkgs/tools/misc/shim/default.nix
rename to pkgs/by-name/sh/shim-unsigned/package.nix
diff --git a/pkgs/development/libraries/shine/default.nix b/pkgs/by-name/sh/shine/package.nix
similarity index 100%
rename from pkgs/development/libraries/shine/default.nix
rename to pkgs/by-name/sh/shine/package.nix
diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/by-name/sh/shiori/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/shiori/default.nix
rename to pkgs/by-name/sh/shiori/package.nix
diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/by-name/sh/shipments/package.nix
similarity index 100%
rename from pkgs/applications/misc/shipments/default.nix
rename to pkgs/by-name/sh/shipments/package.nix
diff --git a/pkgs/games/shipwright/darwin-fixes.patch b/pkgs/by-name/sh/shipwright/darwin-fixes.patch
similarity index 100%
rename from pkgs/games/shipwright/darwin-fixes.patch
rename to pkgs/by-name/sh/shipwright/darwin-fixes.patch
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
new file mode 100644
index 000000000000..ee23cbc332bf
--- /dev/null
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -0,0 +1,189 @@
+{ stdenv
+, cmake
+, lsb-release
+, ninja
+, lib
+, fetchFromGitHub
+, fetchurl
+, copyDesktopItems
+, makeDesktopItem
+, python3
+, libX11
+, libXrandr
+, libXinerama
+, libXcursor
+, libXi
+, libXext
+, glew
+, boost
+, SDL2
+, SDL2_net
+, pkg-config
+, libpulseaudio
+, libpng
+, imagemagick
+, zenity
+, makeWrapper
+, darwin
+, apple-sdk_11
+, libicns
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "shipwright";
+  version = "8.0.6";
+
+  src = fetchFromGitHub {
+    owner = "harbourmasters";
+    repo = "shipwright";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-bA+Bm7M6udeZLpFhGa8fCtagfYBeRxWWqFuAj62XwGQ=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    ./darwin-fixes.patch
+  ];
+
+  # This would get fetched at build time otherwise, see:
+  # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736
+  gamecontrollerdb = fetchurl {
+    name = "gamecontrollerdb.txt";
+    url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/075c1549075ef89a397fd7e0663d21e53a2485fd/gamecontrollerdb.txt";
+    hash = "sha256-atjc0t921l6JSUAd/Yk7uup2R7mCp5ivAh6Dr7HBY7I=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    python3
+    imagemagick
+    makeWrapper
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lsb-release
+    copyDesktopItems
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
+    darwin.sigtool
+  ];
+
+  buildInputs = [
+    boost
+    glew
+    SDL2
+    SDL2_net
+    libpng
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    libXi
+    libXext
+    libpulseaudio
+    zenity
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+
+  cmakeFlags = [
+    (lib.cmakeBool "NON_PORTABLE" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
+  ];
+
+  env.NIX_CFLAGS_COMPILE =
+    lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int";
+
+  dontAddPrefix = true;
+
+  # Linking fails without this
+  hardeningDisable = [ "format" ];
+
+  postBuild = ''
+    cp ${finalAttrs.gamecontrollerdb} ${finalAttrs.gamecontrollerdb.name}
+    pushd ../OTRExporter
+    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver ${finalAttrs.version}
+    popd
+  '';
+
+  preInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Cmake likes it here for its install paths
+    cp ../OTRExporter/soh.otr ..
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp ../OTRExporter/soh.otr soh/soh.otr
+  '';
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/bin
+    ln -s $out/lib/soh.elf $out/bin/soh
+    install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Recreate the macOS bundle (without using cpack)
+    # We mirror the structure of the bundle distributed by the project
+
+    mkdir -p $out/Applications/soh.app/Contents
+    cp $src/soh/macosx/Info.plist.in $out/Applications/soh.app/Contents/Info.plist
+    substituteInPlace $out/Applications/soh.app/Contents/Info.plist \
+      --replace-fail "@CMAKE_PROJECT_VERSION@" "${finalAttrs.version}"
+
+    mv $out/MacOS $out/Applications/soh.app/Contents/MacOS
+
+    # Wrapper
+    cp $src/soh/macosx/soh-macos.sh.in $out/Applications/soh.app/Contents/MacOS/soh
+    chmod +x $out/Applications/soh.app/Contents/MacOS/soh
+    patchShebangs $out/Applications/soh.app/Contents/MacOS/soh
+
+    # "lib" contains all resources that are in "Resources" in the official bundle.
+    # We move them to the right place and symlink them back to $out/lib,
+    # as that's where the game expects them.
+    mv $out/Resources $out/Applications/soh.app/Contents/Resources
+    mv $out/lib/** $out/Applications/soh.app/Contents/Resources
+    rm -rf $out/lib
+    ln -s $out/Applications/soh.app/Contents/Resources $out/lib
+
+    # Copy icons
+    cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns
+
+    # Fix executable
+    install_name_tool -change @executable_path/../Frameworks/libSDL2-2.0.0.dylib \
+                      ${SDL2}/lib/libSDL2-2.0.0.dylib \
+                      $out/Applications/soh.app/Contents/Resources/soh-macos
+    install_name_tool -change @executable_path/../Frameworks/libGLEW.2.2.0.dylib \
+                      ${glew}/lib/libGLEW.2.2.0.dylib \
+                      $out/Applications/soh.app/Contents/Resources/soh-macos
+    install_name_tool -change @executable_path/../Frameworks/libpng16.16.dylib \
+                      ${libpng}/lib/libpng16.16.dylib \
+                      $out/Applications/soh.app/Contents/Resources/soh-macos
+
+    # Codesign (ad-hoc)
+    codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos
+  '';
+
+  fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "soh";
+      icon = "soh";
+      exec = "soh";
+      comment = finalAttrs.meta.description;
+      genericName = "Ship of Harkinian";
+      desktopName = "soh";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    homepage = "https://github.com/HarbourMasters/Shipwright";
+    description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
+    mainProgram = "soh";
+    platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ j0lol matteopacini ];
+    license = with lib.licenses; [
+      # OTRExporter, OTRGui, ZAPDTR, libultraship
+      mit
+      # Ship of Harkinian itself
+      unfree
+    ];
+  };
+})
diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/by-name/sh/shisho/package.nix
similarity index 100%
rename from pkgs/tools/security/shisho/default.nix
rename to pkgs/by-name/sh/shisho/package.nix
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/by-name/sh/shmig/package.nix
similarity index 100%
rename from pkgs/development/tools/database/shmig/default.nix
rename to pkgs/by-name/sh/shmig/package.nix
diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/by-name/sh/shncpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/shncpd/default.nix
rename to pkgs/by-name/sh/shncpd/package.nix
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/by-name/sh/shntool/package.nix
similarity index 100%
rename from pkgs/applications/audio/shntool/default.nix
rename to pkgs/by-name/sh/shntool/package.nix
diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/by-name/sh/shocco/package.nix
similarity index 100%
rename from pkgs/tools/text/shocco/default.nix
rename to pkgs/by-name/sh/shocco/package.nix
diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/by-name/sh/shod/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/shod/default.nix
rename to pkgs/by-name/sh/shod/package.nix
diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/package-lock.json
index 791b8cf7a175..7ed9710de6eb 100644
--- a/pkgs/by-name/sh/shopify-cli/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/package-lock.json
@@ -1,14 +1,14 @@
 {
   "name": "shopify",
-  "version": "3.67.1",
+  "version": "3.69.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shopify",
-      "version": "3.67.1",
+      "version": "3.69.3",
       "dependencies": {
-        "@shopify/cli": "3.67.1"
+        "@shopify/cli": "3.69.3"
       },
       "bin": {
         "shopify": "node_modules/@shopify/cli/bin/run.js"
@@ -480,9 +480,9 @@
       }
     },
     "node_modules/@shopify/cli": {
-      "version": "3.67.1",
-      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.67.1.tgz",
-      "integrity": "sha512-yThhhrfV4M9cAx8Ng5DPoxEemtPtiIur1jiVJBp8cuooJMTHvjANZ3eOcs9xeKGb5BMzoseZ1jR5Gh8MYGCjQQ==",
+      "version": "3.69.3",
+      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.69.3.tgz",
+      "integrity": "sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==",
       "license": "MIT",
       "os": [
         "darwin",
diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/package.json
index 288f3e31876a..d4515de77622 100644
--- a/pkgs/by-name/sh/shopify-cli/package.json
+++ b/pkgs/by-name/sh/shopify-cli/package.json
@@ -1,11 +1,11 @@
 {
   "name": "shopify",
-  "version": "3.67.1",
+  "version": "3.69.3",
   "private": true,
   "bin": {
     "shopify": "node_modules/@shopify/cli/bin/run.js"
   },
   "dependencies": {
-    "@shopify/cli": "3.67.1"
+    "@shopify/cli": "3.69.3"
   }
 }
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index b0c74741be1e..b49e430de8be 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -1,6 +1,6 @@
 { buildNpmPackage, lib, testers, shopify-cli }:
 let
-  version = "3.67.1";
+  version = "3.69.3";
 in
 buildNpmPackage {
   pname = "shopify";
@@ -14,7 +14,7 @@ buildNpmPackage {
     ];
   };
 
-  npmDepsHash = "sha256-jb87K1tCMYgWrsAgzvdHW8ChB+dvc9yNM0hqajy8Rbo=";
+  npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk=";
   dontNpmBuild = true;
 
   passthru = {
diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/by-name/sh/shopify-themekit/package.nix
similarity index 100%
rename from pkgs/development/web/shopify-themekit/default.nix
rename to pkgs/by-name/sh/shopify-themekit/package.nix
diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/by-name/sh/shorewall/package.nix
similarity index 100%
rename from pkgs/tools/networking/shorewall/default.nix
rename to pkgs/by-name/sh/shorewall/package.nix
diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/by-name/sh/shortcat/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/shortcat/default.nix
rename to pkgs/by-name/sh/shortcat/package.nix
diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix
new file mode 100644
index 000000000000..36eab9d392de
--- /dev/null
+++ b/pkgs/by-name/sh/shortwave/package.nix
@@ -0,0 +1,88 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  cargo,
+  dbus,
+  desktop-file-utils,
+  gdk-pixbuf,
+  gettext,
+  gitMinimal,
+  glib,
+  gst_all_1,
+  gtk4,
+  libadwaita,
+  meson,
+  ninja,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  sqlite,
+  wrapGAppsHook4,
+  libshumate,
+  libseccomp,
+  lcms2,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "shortwave";
+  version = "4.0.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "World";
+    repo = "Shortwave";
+    rev = version;
+    sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-O5K5aNcWwUYkaJbGzTzS3FdNbEsQsdliyi0YShw+6PU=";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gettext
+    gitMinimal
+    glib # for glib-compile-schemas
+    meson
+    ninja
+    pkg-config
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs =
+    [
+      dbus
+      gdk-pixbuf
+      glib
+      gtk4
+      libadwaita
+      openssl
+      sqlite
+      libshumate
+      libseccomp
+      lcms2
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-bad
+    ]);
+
+  meta = {
+    homepage = "https://gitlab.gnome.org/World/Shortwave";
+    description = "Find and listen to internet radio stations";
+    mainProgram = "shortwave";
+    maintainers = with lib.maintainers; [ lasandell ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/graphics/shot-scraper/default.nix b/pkgs/by-name/sh/shot-scraper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/shot-scraper/default.nix
rename to pkgs/by-name/sh/shot-scraper/package.nix
diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index 09bcb4447aed..293f000a09ba 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "shotcut";
-  version = "24.09.13";
+  version = "24.10.13";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hYpb3ZCRXd07KQVZ3xpNeEJY5HFLNDsqpPJp3b9UXtE=";
+    hash = "sha256-lt8NXjh222h6l+zfGNKGntUNPya4TUjwqA74DDdWzQo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/by-name/sh/shotgun/package.nix
similarity index 100%
rename from pkgs/tools/graphics/shotgun/default.nix
rename to pkgs/by-name/sh/shotgun/package.nix
diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/by-name/sh/shotman/package.nix
similarity index 100%
rename from pkgs/tools/wayland/shotman/default.nix
rename to pkgs/by-name/sh/shotman/package.nix
diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix
new file mode 100644
index 000000000000..8305afb563ab
--- /dev/null
+++ b/pkgs/by-name/sh/shotwell/package.nix
@@ -0,0 +1,104 @@
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, adwaita-icon-theme
+, gtk3
+, libexif
+, libgphoto2
+, libwebp
+, libsoup_3
+, libxml2
+, vala
+, sqlite
+, pkg-config
+, gnome
+, gst_all_1
+, libgudev
+, libraw
+, glib
+, glib-networking
+, json-glib
+, gcr
+, libgee
+, gexiv2
+, librest
+, gettext
+, desktop-file-utils
+, gdk-pixbuf
+, librsvg
+, wrapGAppsHook3
+, gobject-introspection
+, itstool
+, libsecret
+, libportal-gtk3
+, gsettings-desktop-schemas
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "shotwell";
+  version = "0.32.10";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
+    sha256 = "sha256-JuRaYbVDGwlv/NF28RW9B76ad6aDNYmVQhBuGeB/QA4=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkg-config
+    itstool
+    gettext
+    desktop-file-utils
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    gtk3
+    libexif
+    libgphoto2
+    libwebp
+    libsoup_3
+    libxml2
+    sqlite
+    gst_all_1.gstreamer
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    libgee
+    libgudev
+    gexiv2
+    gsettings-desktop-schemas
+    libraw
+    json-glib
+    glib
+    glib-networking
+    gdk-pixbuf
+    librsvg
+    librest
+    gcr
+    adwaita-icon-theme
+    libsecret
+    libportal-gtk3
+  ];
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "shotwell";
+      versionPolicy = "odd-unstable";
+    };
+  };
+
+  meta = with lib; {
+    description = "Popular photo organizer for the GNOME desktop";
+    mainProgram = "shotwell";
+    homepage = "https://gitlab.gnome.org/GNOME/shotwell";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ bobby285271 ];
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix
index b9842ae0a66b..c7d390e971fe 100644
--- a/pkgs/by-name/sh/showmethekey/package.nix
+++ b/pkgs/by-name/sh/showmethekey/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "showmethekey";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "AlynxZhou";
     repo = "showmethekey";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY=";
+    hash = "sha256-zlLpQZbjEJjgCxlHGaiDFGRZ/6tz5fpKVLVqtjO4pHM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/by-name/sh/shrikhand/package.nix
similarity index 100%
rename from pkgs/data/fonts/shrikhand/default.nix
rename to pkgs/by-name/sh/shrikhand/package.nix
diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/by-name/sh/shticker-book-unwritten/package.nix
similarity index 100%
rename from pkgs/games/shticker-book-unwritten/default.nix
rename to pkgs/by-name/sh/shticker-book-unwritten/package.nix
diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
similarity index 100%
rename from pkgs/games/shticker-book-unwritten/unwrapped.nix
rename to pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
diff --git a/pkgs/applications/science/physics/shtns/default.nix b/pkgs/by-name/sh/shtns/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/shtns/default.nix
rename to pkgs/by-name/sh/shtns/package.nix
diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/by-name/sh/shunit2/package.nix
similarity index 100%
rename from pkgs/tools/misc/shunit2/default.nix
rename to pkgs/by-name/sh/shunit2/package.nix
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/by-name/sh/shutter/package.nix
similarity index 100%
rename from pkgs/applications/graphics/shutter/default.nix
rename to pkgs/by-name/sh/shutter/package.nix
diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/by-name/si/sic-image-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/sic-image-cli/default.nix
rename to pkgs/by-name/si/sic-image-cli/package.nix
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/by-name/si/sic/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/sic/default.nix
rename to pkgs/by-name/si/sic/package.nix
diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix
new file mode 100644
index 000000000000..3ff0b4340c44
--- /dev/null
+++ b/pkgs/by-name/si/sidekick/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  installShellFiles,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "sidekick";
+  version = "0.6.6";
+
+  src = fetchFromGitHub {
+    owner = "MightyMoud";
+    repo = "sidekick";
+    rev = "v${version}";
+    hash = "sha256-Y/dQRix/cxV3NGqTGtRP6Bcprj0jzzOpudgm9a1UMLc=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  doInstallCheck = true;
+
+  doCheck = true;
+
+  vendorHash = "sha256-35MThhVqCcIFH2oQNw6n73JqNVr2T6mXaIJMK9LiXq8=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/mightymoud/sidekick/cmd.version=${version}"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd sidekick \
+      --bash <($out/bin/sidekick completion bash) \
+      --fish <($out/bin/sidekick completion fish) \
+      --zsh <($out/bin/sidekick completion zsh)
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Command-line tool designed to simplify the process of deploying and managing applications on a VPS";
+    mainProgram = "sidekick";
+    homepage = "https://github.com/MightyMoud/sidekick";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ nipeharefa ];
+  };
+}
diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix
new file mode 100644
index 000000000000..ef8e0a20560b
--- /dev/null
+++ b/pkgs/by-name/si/sidequest/package.nix
@@ -0,0 +1,126 @@
+{ stdenv
+, lib
+, fetchurl
+, buildFHSEnv
+, makeDesktopItem
+, makeWrapper
+, alsa-lib
+, at-spi2-atk
+, cairo
+, cups
+, dbus
+, expat
+, gdk-pixbuf
+, glib
+, gtk3
+, mesa
+, nss
+, nspr
+, libdrm
+, xorg
+, libxkbcommon
+, libxshmfence
+, pango
+, systemd
+, icu
+, openssl
+, zlib
+}:
+  let
+    pname = "sidequest";
+    version = "0.10.33";
+
+    desktopItem = makeDesktopItem rec {
+      name = "SideQuest";
+      exec = "SideQuest";
+      desktopName = name;
+      genericName = "VR App Store";
+      categories = [ "Settings" "PackageManager" ];
+    };
+
+    sidequest = stdenv.mkDerivation {
+      inherit pname version;
+
+      src = fetchurl {
+        url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
+        sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995";
+      };
+      dontUnpack = true;
+
+      nativeBuildInputs = [ makeWrapper ];
+
+      installPhase = ''
+        mkdir -p "$out/lib/SideQuest" "$out/bin"
+        tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
+
+        ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
+      '';
+
+      postFixup = let
+        libPath = lib.makeLibraryPath [
+          alsa-lib
+          at-spi2-atk
+          cairo
+          cups
+          dbus
+          expat
+          gdk-pixbuf
+          glib
+          gtk3
+          mesa
+          nss
+          nspr
+          libdrm
+          xorg.libX11
+          xorg.libxcb
+          xorg.libXcomposite
+          xorg.libXdamage
+          xorg.libXext
+          xorg.libXfixes
+          xorg.libXrandr
+          xorg.libxshmfence
+          libxkbcommon
+          xorg.libxkbfile
+          pango
+          (lib.getLib stdenv.cc.cc)
+          systemd
+        ];
+      in ''
+        patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "${libPath}:$out/lib/SideQuest" \
+          "$out/lib/SideQuest/sidequest"
+      '';
+    };
+  in buildFHSEnv {
+    name = "SideQuest";
+
+    passthru = {
+      inherit pname version;
+
+      meta = with lib; {
+        description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
+        homepage = "https://github.com/SideQuestVR/SideQuest";
+        downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
+        sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+        license = licenses.mit;
+        maintainers = with maintainers; [ joepie91 rvolosatovs ];
+        platforms = [ "x86_64-linux" ];
+        mainProgram = "SideQuest";
+      };
+    };
+
+    targetPkgs = pkgs: [
+      sidequest
+      # Needed in the environment on runtime, to make QuestSaberPatch work
+      icu openssl zlib
+      libxkbcommon libxshmfence
+    ];
+
+    extraInstallCommands = ''
+      mkdir -p "$out/share/applications"
+      ln -s ${desktopItem}/share/applications/* "$out/share/applications"
+    '';
+
+    runScript = "sidequest";
+  }
diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
new file mode 100644
index 000000000000..ac1b3aa55278
--- /dev/null
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, nix-update-script
+, alsaSupport ? stdenv.hostPlatform.isLinux
+, alsa-lib
+, autoreconfHook
+, pulseSupport ? stdenv.hostPlatform.isLinux
+, libpulseaudio
+, libsidplayfp
+, out123Support ? stdenv.hostPlatform.isDarwin
+, mpg123
+, perl
+, pkg-config
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sidplayfp";
+  version = "2.11.0";
+
+  src = fetchFromGitHub {
+    owner = "libsidplayfp";
+    repo = "sidplayfp";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-X2ds7pYglxvwLOHXfCULwSeWAS9l2Y3PUdSxcuugwHs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    perl
+    pkg-config
+  ];
+
+  buildInputs = [
+    libsidplayfp
+  ] ++ lib.optionals alsaSupport [
+    alsa-lib
+  ] ++ lib.optionals pulseSupport [
+    libpulseaudio
+  ] ++ lib.optionals out123Support [
+    mpg123
+  ];
+
+  configureFlags = [
+    (lib.strings.withFeature out123Support "out123")
+  ];
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "SID player using libsidplayfp";
+    homepage = "https://github.com/libsidplayfp/sidplayfp";
+    license = with licenses; [ gpl2Plus ];
+    mainProgram = "sidplayfp";
+    maintainers = with maintainers; [ dezgeg OPNA2608 ];
+    platforms = platforms.all;
+  };
+})
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/by-name/si/siege/package.nix
similarity index 100%
rename from pkgs/tools/networking/siege/default.nix
rename to pkgs/by-name/si/siege/package.nix
diff --git a/pkgs/games/sienna/default.nix b/pkgs/by-name/si/sienna/package.nix
similarity index 100%
rename from pkgs/games/sienna/default.nix
rename to pkgs/by-name/si/sienna/package.nix
diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/by-name/si/sierra-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/sierra/default.nix
rename to pkgs/by-name/si/sierra-gtk-theme/package.nix
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/by-name/si/sieve-connect/package.nix
similarity index 100%
rename from pkgs/applications/networking/sieve-connect/default.nix
rename to pkgs/by-name/si/sieve-connect/package.nix
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/by-name/si/sift/package.nix
similarity index 100%
rename from pkgs/tools/text/sift/default.nix
rename to pkgs/by-name/si/sift/package.nix
diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/by-name/si/sigal/package.nix
similarity index 100%
rename from pkgs/applications/misc/sigal/default.nix
rename to pkgs/by-name/si/sigal/package.nix
diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/by-name/si/siglo/package.nix
similarity index 100%
rename from pkgs/applications/misc/siglo/default.nix
rename to pkgs/by-name/si/siglo/package.nix
diff --git a/pkgs/applications/misc/siglo/siglo-no-user-install.patch b/pkgs/by-name/si/siglo/siglo-no-user-install.patch
similarity index 100%
rename from pkgs/applications/misc/siglo/siglo-no-user-install.patch
rename to pkgs/by-name/si/siglo/siglo-no-user-install.patch
diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/by-name/si/sigma-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/sigma-cli/default.nix
rename to pkgs/by-name/si/sigma-cli/package.nix
diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
new file mode 100644
index 000000000000..8d0140590a18
--- /dev/null
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -0,0 +1,56 @@
+{ stdenv, lib, fetchurl, makeWrapper, openjdk21_headless, libmatthew_java, dbus, dbus_java }:
+
+stdenv.mkDerivation rec {
+  pname = "signal-cli";
+  version = "0.13.9";
+
+  # 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-axvMUbF9TE1WLbunZni/KyjFUCdHSimP4AB8nSKf9zI=";
+  };
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r lib $out/lib
+    cp bin/signal-cli $out/bin/signal-cli
+  '' + (if stdenv.hostPlatform.isLinux then ''
+    makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \
+      --set JAVA_HOME "${openjdk21_headless}" \
+      --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
+      --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
+      --add-flags "org.asamk.signal.Main"
+  '' else ''
+    wrapProgram $out/bin/signal-cli \
+      --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \
+      --set JAVA_HOME ${openjdk21_headless}
+  '');
+
+  # Execution in the macOS (10.13) sandbox fails with
+  # dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
+  #   Referenced from: /nix/store/5ghc2l65p8jcjh0bsmhahd5m9k5p8kx0-zulu1.8.0_121-8.20.0.5/bin/java
+  #   Reason: no suitable image found.  Did find:
+  #         /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat()
+  #         /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat()
+  # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310:  2231 Abort trap: 6           signal-cli --version
+  doInstallCheck = stdenv.hostPlatform.isLinux;
+
+  installCheckPhase = ''
+    export PATH=$PATH:$out/bin
+    # --help returns non-0 exit code even when working
+    signal-cli --version
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/AsamK/signal-cli";
+    description = "Command-line and dbus interface for communicating with the Signal messaging service";
+    mainProgram = "signal-cli";
+    changelog = "https://github.com/AsamK/signal-cli/blob/v${version}/CHANGELOG.md";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ivan ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
new file mode 100644
index 000000000000..b7aacf1b70ee
--- /dev/null
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  cmake,
+  pkg-config,
+
+  apple-sdk_11,
+  darwinMinVersionHook,
+  dbus,
+  openssl,
+  sqlite,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "signalbackup-tools";
+  version = "20241106-1";
+
+  src = fetchFromGitHub {
+    owner = "bepaald";
+    repo = "signalbackup-tools";
+    rev = version;
+    hash = "sha256-klIkNt3AlT/msZl7pYPQaFMl/pdI7rcaeLDZekmTIzY=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+    sqlite
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Needed for `utimensat` on `x86_64-darwin`
+    apple-sdk_11
+    (darwinMinVersionHook "11.3")
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp signalbackup-tools $out/bin/
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Tool to work with Signal Backup files";
+    mainProgram = "signalbackup-tools";
+    homepage = "https://github.com/bepaald/signalbackup-tools";
+    license = licenses.gpl3Only;
+    maintainers = [ maintainers.malo ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/signald/deps.json b/pkgs/by-name/si/signald/deps.json
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/signald/deps.json
rename to pkgs/by-name/si/signald/deps.json
diff --git a/pkgs/by-name/si/signald/package.nix b/pkgs/by-name/si/signald/package.nix
new file mode 100644
index 000000000000..acadc87d9a3d
--- /dev/null
+++ b/pkgs/by-name/si/signald/package.nix
@@ -0,0 +1,90 @@
+{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
+gradle, git, makeWrapper, jre_minimal
+}:
+
+let
+  pname = "signald";
+  version = "0.23.2";
+
+  src = fetchFromGitLab {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    hash = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA=";
+  };
+
+  jre' = jre_minimal.override {
+    jdk = jdk17_headless;
+    # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173
+    modules = [
+      "java.base"
+      "java.management"
+      "java.naming"
+      "java.sql"
+      "java.xml"
+      "jdk.crypto.ec"
+      "jdk.httpserver"
+
+      # for java/beans/PropertyChangeEvent
+      "java.desktop"
+      # for sun/misc/Unsafe
+      "jdk.unsupported"
+    ];
+  };
+
+in stdenv.mkDerivation {
+  inherit pname src version;
+
+  mitmCache = gradle.fetchDeps {
+    inherit pname;
+    data = ./deps.json;
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ];
+
+  gradleBuildTask = "distTar";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
+    wrapProgram $out/bin/signald \
+      --prefix PATH : ${lib.makeBinPath [ coreutils findutils gnused ]} \
+      --set JAVA_HOME "${jre'}"
+
+    runHook postInstall
+  '';
+
+  nativeBuildInputs = [ git gradle makeWrapper ];
+
+  doCheck = true;
+
+  gradleUpdateScript = ''
+    runHook preBuild
+
+    SIGNALD_TARGET=x86_64-unknown-linux-gnu gradle nixDownloadDeps
+    SIGNALD_TARGET=aarch64-unknown-linux-gnu gradle nixDownloadDeps
+    SIGNALD_TARGET=x86_64-apple-darwin gradle nixDownloadDeps
+    SIGNALD_TARGET=aarch64-apple-darwin gradle nixDownloadDeps
+  '';
+
+  meta = with lib; {
+    description = "Unofficial daemon for interacting with Signal";
+    longDescription = ''
+      Signald is a daemon that facilitates communication over Signal.  It is
+      unofficial, unapproved, and not nearly as secure as the real Signal
+      clients.
+    '';
+    homepage = "https://signald.org";
+    sourceProvenance = with sourceTypes; [
+      fromSource
+      binaryBytecode  # deps
+    ];
+    license = licenses.gpl3Plus;
+    maintainers = [];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/by-name/si/signaldctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/signaldctl/default.nix
rename to pkgs/by-name/si/signaldctl/package.nix
diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/by-name/si/signify/package.nix
similarity index 100%
rename from pkgs/tools/security/signify/default.nix
rename to pkgs/by-name/si/signify/package.nix
diff --git a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/pkgs/by-name/si/signing-party/gpgwrap_makefile.patch
similarity index 100%
rename from pkgs/tools/security/signing-party/gpgwrap_makefile.patch
rename to pkgs/by-name/si/signing-party/gpgwrap_makefile.patch
diff --git a/pkgs/by-name/si/signing-party/package.nix b/pkgs/by-name/si/signing-party/package.nix
new file mode 100644
index 000000000000..5780fca0250e
--- /dev/null
+++ b/pkgs/by-name/si/signing-party/package.nix
@@ -0,0 +1,226 @@
+{ lib, stdenv, fetchFromGitLab, autoconf, automake, makeWrapper
+, python3, perl, perlPackages
+, libmd, gnupg, which, getopt, libpaper, nettools, qprint
+, sendmailPath ? "/run/wrappers/bin/sendmail" }:
+
+let
+  # All runtime dependencies from the CPAN graph:
+  # https://widgets.stratopan.com/wheel?q=GnuPG-Interface-0.52&runtime=1&fs=1
+  GnuPGInterfaceRuntimeDependencies = with perlPackages; [
+    strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny
+    GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate
+    RoleTiny SubExporterProgressive SubQuote TypeTiny
+  ];
+in stdenv.mkDerivation rec {
+  pname = "signing-party";
+  version = "2.11";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "signing-party-team";
+    repo = "signing-party";
+    rev = "v${version}";
+    sha256 = "1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5";
+  };
+
+  # TODO: Get this patch upstream...
+  patches = [ ./gpgwrap_makefile.patch ];
+
+  postPatch = ''
+    substituteInPlace gpg-mailkeys/gpg-mailkeys --replace \
+      "/usr/sbin/sendmail" "${sendmailPath}"
+  '';
+
+  # One can use the following command to find all relevant Makefiles:
+  # grep -R '$(DESTDIR)/usr' | cut -d: -f1 | sort -u | grep -v 'debian/rules'
+  preBuild = ''
+    substituteInPlace gpgsigs/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace keyanalyze/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace keylookup/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace sig2dot/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace springgraph/Makefile --replace '$(DESTDIR)/usr' "$out"
+  '';
+
+  # Perl is required for it's pod2man.
+  # Python and Perl are required for patching the script interpreter paths.
+  nativeBuildInputs = [ autoconf automake makeWrapper ];
+  buildInputs = [ python3 perl perlPackages.GnuPGInterface libmd gnupg ];
+
+  postInstall = ''
+    # Install all tools which aren't handled by 'make install'.
+    # TODO: Fix upstream...!
+
+    # caff: CA - Fire and Forget signs and mails a key
+    install -D -m555 caff/caff $out/bin/caff;
+    install -D -m444 caff/caff.1 $out/share/man/man1/caff.1;
+
+    # pgp-clean: removes all non-self signatures from key
+    install -D -m555 caff/pgp-clean $out/bin/pgp-clean;
+    install -D -m444 caff/pgp-clean.1 $out/share/man/man1/pgp-clean.1;
+
+    # pgp-fixkey: removes broken packets from keys
+    install -D -m555 caff/pgp-fixkey $out/bin/pgp-fixkey;
+    install -D -m444 caff/pgp-fixkey.1 $out/share/man/man1/pgp-fixkey.1;
+
+    # gpg-mailkeys: simply mail out a signed key to its owner
+    install -D -m555 gpg-mailkeys/gpg-mailkeys $out/bin/gpg-mailkeys;
+    install -D -m444 gpg-mailkeys/gpg-mailkeys.1 $out/share/man/man1/gpg-mailkeys.1;
+
+    # gpg-key2ps: generate PostScript file with fingerprint paper slips
+    install -D -m555 gpg-key2ps/gpg-key2ps $out/bin/gpg-key2ps;
+    install -D -m444 gpg-key2ps/gpg-key2ps.1 $out/share/man/man1/gpg-key2ps.1;
+
+    # gpgdir: recursive directory encryption tool
+    install -D -m555 gpgdir/gpgdir $out/bin/gpgdir;
+    install -D -m444 gpgdir/gpgdir.1 $out/share/man/man1/gpgdir.1;
+
+    # gpglist: show who signed which of your UIDs
+    install -D -m555 gpglist/gpglist $out/bin/gpglist;
+    install -D -m444 gpglist/gpglist.1 $out/share/man/man1/gpglist.1;
+
+    # gpgsigs: annotates list of GnuPG keys with already done signatures
+    # The manual page is not handled by 'make install'
+    install -D -m444 gpgsigs/gpgsigs.1 $out/share/man/man1/gpgsigs.1;
+
+    # gpgparticipants: create list of party participants for the organiser
+    install -D -m555 gpgparticipants/gpgparticipants $out/bin/gpgparticipants;
+    install -D -m444 gpgparticipants/gpgparticipants.1 $out/share/man/man1/gpgparticipants.1;
+    install -D -m555 gpgparticipants/gpgparticipants-prefill $out/bin/gpgparticipants-prefill;
+    install -D -m444 gpgparticipants/gpgparticipants-prefill.1 $out/share/man/man1/gpgparticipants-prefill.1;
+    install -D -m555 gpgparticipants/gpgparticipants-filter $out/bin/gpgparticipants-filter;
+    install -D -m444 gpgparticipants/gpgparticipants-filter.1 $out/share/man/man1/gpgparticipants-filter.1;
+
+    # gpgwrap: a passphrase wrapper
+    install -D -m555 gpgwrap/bin/gpgwrap $out/bin/gpgwrap;
+    install -D -m444 gpgwrap/doc/gpgwrap.1 $out/share/man/man1/gpgwrap.1;
+
+    # keyanalyze: minimum signing distance (MSD) analysis on keyrings
+    # Only the binaries are handled by 'make install'
+    install -D -m444 keyanalyze/keyanalyze.1 $out/share/man/man1/keyanalyze.1;
+    install -D -m444 keyanalyze/pgpring/pgpring.1 $out/share/man/man1/pgpring.1;
+    install -D -m444 keyanalyze/process_keys.1 $out/share/man/man1/process_keys.1;
+
+    # keylookup: ncurses wrapper around gpg --search
+    # Handled by 'make install'
+
+    # sig2dot: converts a list of GnuPG signatures to a .dot file
+    # Handled by 'make install'
+
+    # springgraph: creates a graph from a .dot file
+    # Handled by 'make install'
+
+    # keyart: creates a random ASCII art of a PGP key file
+    install -D -m555 keyart/keyart $out/bin/keyart;
+    install -D -m444 keyart/doc/keyart.1 $out/share/man/man1/keyart.1;
+
+    # gpg-key2latex: generate LaTeX file with fingerprint paper slips
+    install -D -m555 gpg-key2latex/gpg-key2latex $out/bin/gpg-key2latex;
+    install -D -m444 gpg-key2latex/gpg-key2latex.1 $out/share/man/man1/gpg-key2latex.1;
+  '';
+
+  postFixup = ''
+    # Add the runtime dependencies for all programs (but mainly for the Perl
+    # scripts)
+
+    wrapProgram $out/bin/caff --set PERL5LIB \
+      ${with perlPackages; makePerlPath ([
+        TextTemplate MIMETools MailTools TimeDate NetIDNEncode SubHandlesVia ]
+        ++ GnuPGInterfaceRuntimeDependencies)} \
+      --prefix PATH ":" \
+      "${lib.makeBinPath [ nettools gnupg ]}"
+
+    wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \
+      ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg libpaper ]}"
+
+    wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \
+      "${lib.makeBinPath [ which gnupg libpaper ]}"
+
+    wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg qprint ]}"
+
+    wrapProgram $out/bin/gpgdir --set PERL5LIB \
+      ${with perlPackages; makePerlPath ([
+        TermReadKey ]
+        ++ GnuPGInterfaceRuntimeDependencies)} \
+      --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/gpglist --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \
+      "${lib.makeBinPath [ getopt gnupg ]}"
+
+#    wrapProgram $out/bin/gpgparticipants-prefill
+
+    wrapProgram $out/bin/gpgparticipants-filter --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/gpgsigs --set PERL5LIB \
+      ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/gpgwrap --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+#    wrapProgram $out/bin/keyanalyze --set PERL5LIB \
+
+    wrapProgram $out/bin/keyart --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/keylookup --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/pgp-clean --set PERL5LIB \
+      ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+    wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \
+      ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${lib.makeBinPath [ gnupg ]}"
+
+#    wrapProgram $out/bin/pgpring
+
+#    wrapProgram $out/bin/process_keys
+
+     # Upstream-Bug: Seems like sig2dot doesn't work with 2.1 (modern) anymore,
+     # please use 2.0 (stable) instead.
+#    wrapProgram $out/bin/sig2dot
+
+    wrapProgram $out/bin/springgraph --set PERL5LIB \
+      ${with perlPackages; makePerlPath [ GD ]}
+  '';
+
+  meta = with lib; {
+    homepage = "https://salsa.debian.org/signing-party-team/signing-party";
+    description = "Collection of several projects relating to OpenPGP";
+    longDescription = ''
+      This is a collection of several projects relating to OpenPGP.
+
+      * caff: CA - Fire and Forget signs and mails a key
+      * pgp-clean: removes all non-self signatures from key
+      * pgp-fixkey: removes broken packets from keys
+      * gpg-mailkeys: simply mail out a signed key to its owner
+      * gpg-key2ps: generate PostScript file with fingerprint paper slips
+      * gpgdir: recursive directory encryption tool
+      * gpglist: show who signed which of your UIDs
+      * gpgsigs: annotates list of GnuPG keys with already done signatures
+      * gpgparticipants: create list of party participants for the organiser
+      * gpgwrap: a passphrase wrapper
+      * keyanalyze: minimum signing distance (MSD) analysis on keyrings
+      * keylookup: ncurses wrapper around gpg --search
+      * sig2dot: converts a list of GnuPG signatures to a .dot file
+      * springgraph: creates a graph from a .dot file
+      * keyart: creates a random ASCII art of a PGP key file
+      * gpg-key2latex: generate LaTeX file with fingerprint paper slips
+    '';
+    license = with licenses; [ bsd2 bsd3 gpl2Only gpl2Plus gpl3Plus ];
+    maintainers = with maintainers; [ primeos ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/by-name/si/signwriting/package.nix
similarity index 100%
rename from pkgs/data/fonts/signwriting/default.nix
rename to pkgs/by-name/si/signwriting/package.nix
diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/by-name/si/sigrok-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/sigrok-cli/default.nix
rename to pkgs/by-name/si/sigrok-cli/package.nix
diff --git a/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix b/pkgs/by-name/si/sigrok-firmware-fx2lafw/package.nix
similarity index 100%
rename from pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix
rename to pkgs/by-name/si/sigrok-firmware-fx2lafw/package.nix
diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/by-name/si/sigslot/package.nix
similarity index 100%
rename from pkgs/development/libraries/sigslot/default.nix
rename to pkgs/by-name/si/sigslot/package.nix
diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/by-name/si/sigtop/package.nix
similarity index 100%
rename from pkgs/tools/backup/sigtop/default.nix
rename to pkgs/by-name/si/sigtop/package.nix
diff --git a/pkgs/applications/radio/sigutils/default.nix b/pkgs/by-name/si/sigutils/package.nix
similarity index 100%
rename from pkgs/applications/radio/sigutils/default.nix
rename to pkgs/by-name/si/sigutils/package.nix
diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/by-name/si/siji/package.nix
similarity index 100%
rename from pkgs/data/fonts/siji/default.nix
rename to pkgs/by-name/si/siji/package.nix
diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/by-name/si/sil-abyssinica/package.nix
similarity index 100%
rename from pkgs/data/fonts/sil-abyssinica/default.nix
rename to pkgs/by-name/si/sil-abyssinica/package.nix
diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/by-name/si/sil-padauk/package.nix
similarity index 100%
rename from pkgs/data/fonts/sil-padauk/default.nix
rename to pkgs/by-name/si/sil-padauk/package.nix
diff --git a/pkgs/games/sil-q/default.nix b/pkgs/by-name/si/sil-q/package.nix
similarity index 100%
rename from pkgs/games/sil-q/default.nix
rename to pkgs/by-name/si/sil-q/package.nix
diff --git a/pkgs/games/sil/default.nix b/pkgs/by-name/si/sil/package.nix
similarity index 100%
rename from pkgs/games/sil/default.nix
rename to pkgs/by-name/si/sil/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/by-name/si/silc_client/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/silc-client/default.nix
rename to pkgs/by-name/si/silc_client/package.nix
diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/by-name/si/silc_server/package.nix
similarity index 100%
rename from pkgs/servers/silc-server/default.nix
rename to pkgs/by-name/si/silc_server/package.nix
diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
new file mode 100644
index 000000000000..db31c2e38323
--- /dev/null
+++ b/pkgs/by-name/si/sile/package.nix
@@ -0,0 +1,190 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+
+  # nativeBuildInputs
+  zstd,
+  pkg-config,
+  jq,
+  cargo,
+  rustc,
+  rustPlatform,
+
+  # buildInputs
+  lua,
+  harfbuzz,
+  icu,
+  fontconfig,
+  libiconv,
+  stylua,
+  typos,
+  darwin,
+  # FONTCONFIG_FILE
+  makeFontsConf,
+  gentium,
+
+  # passthru.tests
+  runCommand,
+  poppler_utils,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sile";
+  version = "0.15.5";
+
+  src = fetchurl {
+    url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst";
+    sha256 = "sha256-0gE3sC0WMC0odnD9KFrSisO406+RZGCqa8jL/5Mhufk=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit (finalAttrs) src;
+    nativeBuildInputs = [ zstd ];
+    dontConfigure = true;
+    hash = "sha256-hmgDG29C5JfQX2acMr8c3lmswa1u5XHauRWFd4QGmOo=";
+  };
+
+  nativeBuildInputs = [
+    zstd
+    pkg-config
+    jq
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs =
+    [
+      finalAttrs.finalPackage.passthru.luaEnv
+      harfbuzz
+      icu
+      fontconfig
+      libiconv
+      stylua
+      typos
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.AppKit
+    ];
+
+  configureFlags =
+    [
+      # Nix will supply all the Lua dependencies, so stop the build system from
+      # bundling vendored copies of them.
+      "--with-system-lua-sources"
+      "--with-system-luarocks"
+      # The automake check target uses pdfinfo to confirm the output of a test
+      # run, and uses autotools to discover it. This flake build eschews that
+      # test because it is run from the source directory but the binary is
+      # already built with system paths, so it can't be checked under Nix until
+      # after install. After install the Makefile isn't available of course, so
+      # we have our own copy of it with a hard coded path to `pdfinfo`. By
+      # specifying some binary here we skip the configure time test for
+      # `pdfinfo`, by using `false` we make sure that if it is expected during
+      # build time we would fail to build since we only provide it at test time.
+      "PDFINFO=false"
+    ]
+    ++ lib.optionals (!lua.pkgs.isLuaJIT) [
+      "--without-luajit"
+    ];
+
+  outputs = [
+    "out"
+    "doc"
+    "man"
+    "dev"
+  ];
+
+  # TODO: At some point, upstream should support installing the pre-built
+  # manual automatically
+  postInstall = ''
+    install -Dm0644 documentation/sile.pdf $out/share/doc/sile/manual.pdf
+  '';
+
+  FONTCONFIG_FILE = makeFontsConf {
+    fontDirectories = [
+      gentium
+    ];
+  };
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    luaEnv = lua.withPackages (
+      ps:
+      with ps;
+      [
+        cassowary
+        cldr
+        fluent
+        linenoise
+        loadkit
+        lpeg
+        lua-zlib
+        lua_cliargs
+        luaepnf
+        luaexpat
+        luafilesystem
+        luarepl
+        luasec
+        luasocket
+        luautf8
+        penlight
+        vstruct
+        # lua packages needed for testing
+        busted
+        luacheck
+        # packages needed for building api docs
+        ldoc
+        # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
+      ]
+      ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
+        bit32
+      ]
+      ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
+        compat53
+      ]
+    );
+
+    # Copied from Makefile.am
+    tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) (
+      runCommand "${finalAttrs.pname}-test"
+        {
+          nativeBuildInputs = [
+            poppler_utils
+            finalAttrs.finalPackage
+          ];
+          inherit (finalAttrs) FONTCONFIG_FILE;
+        }
+        ''
+          output=$(mktemp -t selfcheck-XXXXXX.pdf)
+          echo "foo" | sile -o $output -
+          pdfinfo $output | grep "SILE v${finalAttrs.version}" > $out
+        ''
+    );
+  };
+
+  meta = {
+    description = "Typesetting system";
+    longDescription = ''
+      SILE is a typesetting system; its job is to produce beautiful
+      printed documents. Conceptually, SILE is similar to TeX—from
+      which it borrows some concepts and even syntax and
+      algorithms—but the similarities end there. Rather than being a
+      derivative of the TeX family SILE is a new typesetting and
+      layout engine written from the ground up using modern
+      technologies and borrowing some ideas from graphical systems
+      such as InDesign.
+    '';
+    homepage = "https://sile-typesetter.org";
+    changelog = "https://github.com/sile-typesetter/sile/raw/v${finalAttrs.version}/CHANGELOG.md";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      doronbehar
+      alerque
+    ];
+    license = lib.licenses.mit;
+    mainProgram = "sile";
+  };
+})
diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/by-name/si/silenthound/package.nix
similarity index 100%
rename from pkgs/tools/security/silenthound/default.nix
rename to pkgs/by-name/si/silenthound/package.nix
diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/by-name/si/silice/package.nix
similarity index 100%
rename from pkgs/development/compilers/silice/default.nix
rename to pkgs/by-name/si/silice/package.nix
diff --git a/pkgs/tools/text/silver-searcher/bash-completion.patch b/pkgs/by-name/si/silver-searcher/bash-completion.patch
similarity index 100%
rename from pkgs/tools/text/silver-searcher/bash-completion.patch
rename to pkgs/by-name/si/silver-searcher/bash-completion.patch
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/by-name/si/silver-searcher/package.nix
similarity index 100%
rename from pkgs/tools/text/silver-searcher/default.nix
rename to pkgs/by-name/si/silver-searcher/package.nix
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/by-name/si/simdjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/simdjson/default.nix
rename to pkgs/by-name/si/simdjson/package.nix
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/by-name/si/simg2img/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/simg2img/default.nix
rename to pkgs/by-name/si/simg2img/package.nix
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/by-name/si/simgear/package.nix
similarity index 100%
rename from pkgs/development/libraries/simgear/default.nix
rename to pkgs/by-name/si/simgear/package.nix
diff --git a/pkgs/by-name/si/simgrid/package.nix b/pkgs/by-name/si/simgrid/package.nix
new file mode 100644
index 000000000000..81a474f2d9aa
--- /dev/null
+++ b/pkgs/by-name/si/simgrid/package.nix
@@ -0,0 +1,120 @@
+{ stdenv, lib, fetchFromGitLab, cmake, perl, python3, boost
+, fortranSupport ? false, gfortran
+, buildDocumentation ? false, fig2dev, ghostscript, doxygen
+, buildJavaBindings ? false, openjdk
+, buildPythonBindings ? true, python3Packages
+, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw
+, bmfSupport ? true, eigen
+, minimalBindings ? false
+, debug ? false
+, optimize ? (!debug)
+, moreTests ? false
+, withoutBin ? false
+}:
+
+stdenv.mkDerivation rec {
+  pname = "simgrid";
+  version = "3.36";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-7w4ObbMem1Y8Lh9MOcdCSEktTDRkvVKmKlS9adm15oE=";
+  };
+
+  propagatedBuildInputs = [ boost ];
+  nativeBuildInputs = [ cmake perl python3 ]
+    ++ lib.optionals fortranSupport [ gfortran ]
+    ++ lib.optionals buildJavaBindings [ openjdk ]
+    ++ lib.optionals buildPythonBindings [ python3Packages.pybind11 ]
+    ++ lib.optionals buildDocumentation [ fig2dev ghostscript doxygen ]
+    ++ lib.optionals bmfSupport [ eigen ]
+    ++ lib.optionals modelCheckingSupport [ libunwind libevent elfutils ];
+
+  outputs = [ "out" ]
+    ++ lib.optionals buildPythonBindings [ "python" ];
+
+  # "Release" does not work. non-debug mode is Debug compiled with optimization
+  cmakeBuildType = "Debug";
+
+  cmakeFlags = [
+    (lib.cmakeBool "enable_documentation" buildDocumentation)
+    (lib.cmakeBool "enable_java" buildJavaBindings)
+    (lib.cmakeBool "enable_python" buildPythonBindings)
+    (lib.cmakeFeature "SIMGRID_PYTHON_LIBDIR" "./") # prevents CMake to install in ${python3} dir
+    (lib.cmakeBool "enable_msg" buildJavaBindings)
+    (lib.cmakeBool "enable_fortran" fortranSupport)
+    (lib.cmakeBool "enable_model-checking" modelCheckingSupport)
+    (lib.cmakeBool "enable_ns3" false)
+    (lib.cmakeBool "enable_lua" false)
+    (lib.cmakeBool "enable_lib_in_jar" false)
+    (lib.cmakeBool "enable_maintainer_mode" false)
+    (lib.cmakeBool "enable_mallocators" true)
+    (lib.cmakeBool "enable_debug" true)
+    (lib.cmakeBool "enable_smpi" true)
+    (lib.cmakeBool "minimal-bindings" minimalBindings)
+    (lib.cmakeBool "enable_smpi_ISP_testsuite" moreTests)
+    (lib.cmakeBool "enable_smpi_MPICH3_testsuite" moreTests)
+    (lib.cmakeBool "enable_compile_warnings" false)
+    (lib.cmakeBool "enable_compile_optimizations" optimize)
+    (lib.cmakeBool "enable_lto" optimize)
+    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
+    (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" optimize)
+  ];
+
+  makeFlags = lib.optional debug "VERBOSE=1";
+
+  # needed to run tests and to ensure correct shabangs in output scripts
+  preBuild = ''
+    patchShebangs ..
+  '';
+
+  # needed by tests (so libsimgrid.so is found)
+  preConfigure = ''
+    export LD_LIBRARY_PATH="$PWD/build/lib"
+  '';
+
+  doCheck = true;
+  preCheck = ''
+    # prevent the execution of tests known to fail
+    cat <CTestCustom.cmake
+    SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple)
+    EOW
+
+    # make sure tests are built in parallel (this can be long otherwise)
+    make tests -j $NIX_BUILD_CORES
+  '';
+
+  postInstall = lib.optionalString withoutBin ''
+    # remove bin from output if requested.
+    # having a specific bin output would be cleaner but it does not work currently (circular references)
+    rm -rf $out/bin
+  '' + lib.optionalString buildPythonBindings ''
+    # manually install the python binding if requested.
+    mkdir -p $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/
+    cp ./lib/simgrid.cpython*.so $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/
+   '';
+
+  # improve debuggability if requested
+  hardeningDisable = lib.optionals debug [ "fortify" ];
+  dontStrip = debug;
+
+  meta = with lib; {
+    description = "Framework for the simulation of distributed applications";
+    longDescription = ''
+      SimGrid is a toolkit that provides core functionalities for the
+      simulation of distributed applications in heterogeneous distributed
+      environments.  The specific goal of the project is to facilitate
+      research in the area of distributed and parallel application
+      scheduling on distributed computing platforms ranging from simple
+      network of workstations to Computational Grids.
+    '';
+    homepage = "https://simgrid.org/";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ mickours mpoquet ];
+    platforms = platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/data/icons/simp1e-cursors/default.nix b/pkgs/by-name/si/simp1e-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/simp1e-cursors/default.nix
rename to pkgs/by-name/si/simp1e-cursors/package.nix
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/by-name/si/simp_le/package.nix
similarity index 100%
rename from pkgs/tools/admin/simp_le/default.nix
rename to pkgs/by-name/si/simp_le/package.nix
diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/by-name/si/simple-dlna-browser/package.nix
similarity index 100%
rename from pkgs/tools/networking/simple-dlna-browser/default.nix
rename to pkgs/by-name/si/simple-dlna-browser/package.nix
diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/by-name/si/simple-http-server/package.nix
similarity index 100%
rename from pkgs/servers/simple-http-server/default.nix
rename to pkgs/by-name/si/simple-http-server/package.nix
diff --git a/pkgs/tools/filesystems/simple-mtpfs/default.nix b/pkgs/by-name/si/simple-mtpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/simple-mtpfs/default.nix
rename to pkgs/by-name/si/simple-mtpfs/package.nix
diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix
new file mode 100644
index 000000000000..079997fca19b
--- /dev/null
+++ b/pkgs/by-name/si/simple64-netplay-server/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "simple64-netplay-server";
+  version = "2024.10.1";
+
+  src = fetchFromGitHub {
+    owner = "simple64";
+    repo = "simple64-netplay-server";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-p9hHVf1LD95w280ScUkxHKmBJLJ9eiH3WEYV+kaALgQ=";
+  };
+
+  vendorHash = "sha256-HeYA/nR0NuP/fPMJXGGuN2eP6vB4yj1yWFfFDyp34QE=";
+
+  meta = {
+    description = "Dedicated server for simple64 netplay";
+    homepage = "https://github.com/simple64/simple64-netplay-server";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "simple64-netplay-server";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
diff --git a/pkgs/by-name/si/simple64/add-official-server-error-message.patch b/pkgs/by-name/si/simple64/add-official-server-error-message.patch
new file mode 100644
index 000000000000..7d37e33c11d1
--- /dev/null
+++ b/pkgs/by-name/si/simple64/add-official-server-error-message.patch
@@ -0,0 +1,15 @@
+diff --git a/simple64-gui/netplay/joinroom.cpp b/simple64-gui/netplay/joinroom.cpp
+index 3b5c34e..68b46f2 100644
+--- a/simple64-gui/netplay/joinroom.cpp
++++ b/simple64-gui/netplay/joinroom.cpp
+@@ -308,7 +308,9 @@ void JoinRoom::processTextMessage(QString message)
+         }
+         else
+         {
+-            msgBox.setText(json.value("message").toString());
++            QString msg = json.value("message").toString();
++            if(msg == "Bad authentication code") msg += "
Note: using the official netplay servers is not allowed on unofficial builds.
You can host your own server with `simple64-netplay-server`";
++            msgBox.setText(msg);
+             msgBox.exec();
+         }
+     }
diff --git a/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch b/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch
new file mode 100644
index 000000000000..69d595cc428a
--- /dev/null
+++ b/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch
@@ -0,0 +1,37 @@
+diff --git a/build.sh b/build.sh
+index 254a90d..e2d26cf 100644
+--- a/build.sh
++++ b/build.sh
+@@ -77,7 +77,7 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE="${RELEASE_TYPE}" ..
+ cmake --build .
+ cp simple64-video-parallel.* "${install_dir}"
+ 
+-if [[ ! -d "${base_dir}/discord" ]]; then
++if false; then
+   echo "Downloading Discord SDK"
+   mkdir -p "${base_dir}/discord"
+   cd "${base_dir}/discord"
+@@ -86,7 +86,7 @@ if [[ ! -d "${base_dir}/discord" ]]; then
+   rm discord_game_sdk.zip
+ fi
+ 
+-if [[ ! -d "${base_dir}/vosk" ]]; then
++if false; then
+   mkdir -p "${base_dir}/vosk"
+   cd "${base_dir}/vosk"
+   if [[ ${UNAME} == *"MINGW64"* ]]; then
+@@ -156,14 +156,6 @@ if [[ ${UNAME} == *"MINGW64"* ]]; then
+   cp -v "${base_dir}/7z/x64/7za.exe" "${install_dir}"
+   cp -v "${base_dir}/discord/lib/x86_64/discord_game_sdk.dll" "${install_dir}"
+   cp -v "${base_dir}/vosk/libvosk.dll" "${install_dir}/vosk.dll"
+-else
+-  cp "${base_dir}/vosk/libvosk.so" "${install_dir}"
+-  if [[ "${PLATFORM}" == "aarch64" ]]; then
+-    my_os=linux_aarch64
+-  else
+-    my_os=linux_x86_64
+-    cp "${base_dir}/discord/lib/x86_64/discord_game_sdk.so" "${install_dir}/libdiscord_game_sdk.so"
+-  fi
+ fi
+ 
+ if [[ "$1" == "zip" ]]; then
diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix
new file mode 100644
index 000000000000..3f6a46c6e15a
--- /dev/null
+++ b/pkgs/by-name/si/simple64/package.nix
@@ -0,0 +1,123 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  writeShellScriptBin,
+  cmake,
+  ninja,
+  pkg-config,
+  makeWrapper,
+  zlib,
+  libpng,
+  SDL2,
+  SDL2_net,
+  hidapi,
+  qt6,
+  vulkan-loader,
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+
+let
+  cheats-json = fetchurl {
+    url = "https://raw.githubusercontent.com/simple64/cheat-parser/87963b7aca06e0d4632b66bc5ffe7d6b34060f4f/cheats.json";
+    hash = "sha256-rS/4Mdi+18C2ywtM5nW2XaJkC1YnKZPc4YdQ3mCfESU=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "simple64";
+  version = "2024.09.1";
+
+  src = fetchFromGitHub {
+    owner = "simple64";
+    repo = "simple64";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-t3V7mvHlCP8cOvizR3N9DiCofnSvSHI6U0iXXkaMb34=";
+  };
+
+  patches = [
+    ./dont-use-vosk-and-discord.patch
+    ./add-official-server-error-message.patch
+  ];
+
+  postPatch = ''
+    cp ${cheats-json} cheats.json
+  '';
+
+  stictDeps = true;
+
+  nativeBuildInputs = [
+    qt6.wrapQtAppsHook
+    cmake
+    ninja
+    pkg-config
+    makeWrapper
+    copyDesktopItems
+    # fake git command for version info generator
+    (writeShellScriptBin "git" "echo ${finalAttrs.src.rev}")
+  ];
+
+  buildInputs = [
+    zlib
+    libpng
+    SDL2
+    SDL2_net
+    hidapi
+    qt6.qtbase
+    qt6.qtwebsockets
+    qt6.qtwayland
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  dontWrapQtApps = true;
+
+  buildPhase = ''
+    runHook preInstall
+
+    sh build.sh
+
+    runHook postInstall
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/simple64 $out/bin
+    cp -r simple64/* $out/share/simple64
+
+    install -Dm644 ./simple64-gui/icons/simple64.svg -t $out/share/icons/hicolor/scalable/apps/
+
+    makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \
+        "''${qtWrapperArgs[@]}"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "simple64";
+      desktopName = "simple64";
+      genericName = "Nintendo 64 Emulator";
+      exec = "simple64-gui";
+      mimeTypes = [ "application/x-n64-rom" ];
+      icon = "simple64";
+      terminal = false;
+      categories = [
+        "Game"
+        "Emulator"
+      ];
+    })
+  ];
+
+  meta = {
+    description = "Easy to use N64 emulator";
+    homepage = "https://simple64.github.io";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "simple64-gui";
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/si/simpleDBus/package.nix b/pkgs/by-name/si/simpleDBus/package.nix
index 1e2cbaa0b2a3..97dfd36492e0 100644
--- a/pkgs/by-name/si/simpleDBus/package.nix
+++ b/pkgs/by-name/si/simpleDBus/package.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "simpleDBus";
 
-  version = "0.7.3";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "OpenBluetoothToolbox";
     repo = "SimpleBLE";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
+    hash = "sha256-rtctBKHujVqZXkblgoaaOQmrHT15HiDmev+rS4ZnYqI=";
   };
 
   outputs = [
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/by-name/si/simpleTpmPk11/package.nix
similarity index 100%
rename from pkgs/tools/security/simple-tpm-pk11/default.nix
rename to pkgs/by-name/si/simpleTpmPk11/package.nix
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/by-name/si/simplehttp2server/package.nix
similarity index 100%
rename from pkgs/servers/simplehttp2server/default.nix
rename to pkgs/by-name/si/simplehttp2server/package.nix
diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/by-name/si/simplenes/package.nix
similarity index 100%
rename from pkgs/applications/emulators/simplenes/default.nix
rename to pkgs/by-name/si/simplenes/package.nix
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/by-name/si/simpleproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/simpleproxy/default.nix
rename to pkgs/by-name/si/simpleproxy/package.nix
diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index 4c9c443ee8d6..5fe138d19420 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -6,11 +6,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-Fe84rggb539MJXkbJqQRemToTLyX61BbXtoDRUuds8k=";
+    hash = "sha256-FHkZqbbJTQz+gIOgpMiak9u4ZOY/7r+1+if74LHLw/c=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/by-name/si/simutrans/package.nix
similarity index 100%
rename from pkgs/games/simutrans/default.nix
rename to pkgs/by-name/si/simutrans/package.nix
diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/by-name/si/sing-box/package.nix
similarity index 100%
rename from pkgs/tools/networking/sing-box/default.nix
rename to pkgs/by-name/si/sing-box/package.nix
diff --git a/pkgs/data/misc/sing-geoip/main.go b/pkgs/by-name/si/sing-geoip/main.go
similarity index 100%
rename from pkgs/data/misc/sing-geoip/main.go
rename to pkgs/by-name/si/sing-geoip/main.go
diff --git a/pkgs/data/misc/sing-geoip/default.nix b/pkgs/by-name/si/sing-geoip/package.nix
similarity index 100%
rename from pkgs/data/misc/sing-geoip/default.nix
rename to pkgs/by-name/si/sing-geoip/package.nix
diff --git a/pkgs/data/misc/sing-geosite/main.go b/pkgs/by-name/si/sing-geosite/main.go
similarity index 100%
rename from pkgs/data/misc/sing-geosite/main.go
rename to pkgs/by-name/si/sing-geosite/main.go
diff --git a/pkgs/data/misc/sing-geosite/default.nix b/pkgs/by-name/si/sing-geosite/package.nix
similarity index 100%
rename from pkgs/data/misc/sing-geosite/default.nix
rename to pkgs/by-name/si/sing-geosite/package.nix
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/by-name/si/singular/package.nix
similarity index 100%
rename from pkgs/applications/science/math/singular/default.nix
rename to pkgs/by-name/si/singular/package.nix
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/by-name/si/sipcalc/package.nix
similarity index 100%
rename from pkgs/tools/networking/sipcalc/default.nix
rename to pkgs/by-name/si/sipcalc/package.nix
diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/by-name/si/sipexer/package.nix
similarity index 100%
rename from pkgs/tools/networking/sipexer/default.nix
rename to pkgs/by-name/si/sipexer/package.nix
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/by-name/si/sipp/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sipp/default.nix
rename to pkgs/by-name/si/sipp/package.nix
diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/by-name/si/siproxd/cheaders.patch
similarity index 100%
rename from pkgs/applications/networking/siproxd/cheaders.patch
rename to pkgs/by-name/si/siproxd/cheaders.patch
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/by-name/si/siproxd/package.nix
similarity index 100%
rename from pkgs/applications/networking/siproxd/default.nix
rename to pkgs/by-name/si/siproxd/package.nix
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/by-name/si/sipsak/package.nix
similarity index 100%
rename from pkgs/tools/networking/sipsak/default.nix
rename to pkgs/by-name/si/sipsak/package.nix
diff --git a/pkgs/tools/security/sipvicious/default.nix b/pkgs/by-name/si/sipvicious/package.nix
similarity index 100%
rename from pkgs/tools/security/sipvicious/default.nix
rename to pkgs/by-name/si/sipvicious/package.nix
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/by-name/si/sipwitch/package.nix
similarity index 100%
rename from pkgs/servers/sip/sipwitch/default.nix
rename to pkgs/by-name/si/sipwitch/package.nix
diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix
new file mode 100644
index 000000000000..39f58adfc41d
--- /dev/null
+++ b/pkgs/by-name/si/siril/package.nix
@@ -0,0 +1,50 @@
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, cmake
+, git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib
+, fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg
+, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook3
+, curl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "siril";
+  version = "1.2.4";
+
+  src = fetchFromGitLab {
+    owner = "free-astro";
+    repo = "siril";
+    rev = version;
+    hash = "sha256-orNu9qo7sutMUPeIPPhxKETEKbCm4D6nAuo4Hc/8Bdo=";
+  };
+
+  nativeBuildInputs = [
+    meson ninja cmake pkg-config git criterion wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib
+    libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib
+    curl
+  ];
+
+  # Necessary because project uses default build dir for flatpaks/snaps
+  dontUseMesonConfigure = true;
+  dontUseCmakeConfigure = true;
+
+  # Meson fails to find libcurl unless the option is specifically enabled
+  configureScript = ''
+    ${meson}/bin/meson setup -Denable-libcurl=yes --buildtype release nixbld .
+  '';
+
+  postConfigure = ''
+    cd nixbld
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.siril.org/";
+    description = "Astrophotographic image processing tool";
+    license = licenses.gpl3Plus;
+    changelog = "https://gitlab.com/free-astro/siril/-/blob/HEAD/ChangeLog";
+    maintainers = with maintainers; [ hjones2199 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index d437eece8b21..58c6e6a6dd2e 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -5,7 +5,6 @@
 , pkg-config
 , mpi
 , mpiCheckPhaseHook
-, openssh
 , gfortran
 , blas
 , lapack
@@ -139,7 +138,6 @@ stdenv.mkDerivation rec {
 
   nativeCheckInputs = [
     mpiCheckPhaseHook
-    openssh
   ];
 
   meta = with lib; {
diff --git a/pkgs/tools/wayland/sirula/Cargo.lock b/pkgs/by-name/si/sirula/Cargo.lock
similarity index 100%
rename from pkgs/tools/wayland/sirula/Cargo.lock
rename to pkgs/by-name/si/sirula/Cargo.lock
diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/by-name/si/sirula/package.nix
similarity index 100%
rename from pkgs/tools/wayland/sirula/default.nix
rename to pkgs/by-name/si/sirula/package.nix
diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/by-name/si/sish/package.nix
similarity index 100%
rename from pkgs/tools/networking/sish/default.nix
rename to pkgs/by-name/si/sish/package.nix
diff --git a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/pkgs/by-name/si/sitelen-seli-kiwen/package.nix
similarity index 100%
rename from pkgs/data/fonts/sitelen-seli-kiwen/default.nix
rename to pkgs/by-name/si/sitelen-seli-kiwen/package.nix
diff --git a/pkgs/tools/networking/sitespeed-io/default.nix b/pkgs/by-name/si/sitespeed-io/package.nix
similarity index 100%
rename from pkgs/tools/networking/sitespeed-io/default.nix
rename to pkgs/by-name/si/sitespeed-io/package.nix
diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/pkgs/by-name/si/sixpair/hcitool.patch
similarity index 100%
rename from pkgs/tools/misc/sixpair/hcitool.patch
rename to pkgs/by-name/si/sixpair/hcitool.patch
diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/by-name/si/sixpair/package.nix
similarity index 100%
rename from pkgs/tools/misc/sixpair/default.nix
rename to pkgs/by-name/si/sixpair/package.nix
diff --git a/pkgs/development/compilers/sjasmplus/default.nix b/pkgs/by-name/sj/sjasmplus/package.nix
similarity index 100%
rename from pkgs/development/compilers/sjasmplus/default.nix
rename to pkgs/by-name/sj/sjasmplus/package.nix
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/by-name/sk/skaffold/package.nix
similarity index 100%
rename from pkgs/development/tools/skaffold/default.nix
rename to pkgs/by-name/sk/skaffold/package.nix
diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/by-name/sk/skate/package.nix
similarity index 100%
rename from pkgs/applications/misc/skate/default.nix
rename to pkgs/by-name/sk/skate/package.nix
diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix
index 57ffd6d6b01e..337122b218e7 100644
--- a/pkgs/by-name/sk/skeditor/package.nix
+++ b/pkgs/by-name/sk/skeditor/package.nix
@@ -3,6 +3,9 @@
   buildDotnetModule,
   fetchFromGitHub,
   dotnetCorePackages,
+  makeDesktopItem,
+  copyDesktopItems,
+  iconConvTools,
 }:
 buildDotnetModule rec {
   pname = "skeditor";
@@ -22,6 +25,36 @@ buildDotnetModule rec {
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
+  nativeBuildInputs = [
+    iconConvTools
+    copyDesktopItems
+  ];
+
+  postInstall = ''
+    icoFileToHiColorTheme SkEditor/Assets/SkEditor.ico skeditor $out
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      desktopName = "SkEditor";
+      exec = meta.mainProgram;
+      icon = "SkEditor";
+      startupWMClass = "SkEditor";
+      genericName = "Skript Editor";
+      keywords = [
+        "skeditor"
+        "SkEditor"
+      ];
+      categories = [
+        "Utility"
+        "TextEditor"
+        "Development"
+        "IDE"
+      ];
+    })
+  ];
+
   passthru.updateScript = ./update.sh;
 
   meta = {
@@ -29,6 +62,7 @@ buildDotnetModule rec {
     homepage = "https://github.com/SkEditorTeam/SkEditor";
     changelog = "https://github.com/SkEditorTeam/SkEditor/releases/tag/v${version}";
     license = lib.licenses.mit;
+    mainProgram = "SkEditor";
     maintainers = with lib.maintainers; [ eveeifyeve ];
   };
 }
diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 143339093140..b82123b36639 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sketchybar-app-font";
-  version = "2.0.24";
+  version = "2.0.27";
 
   src = fetchFromGitHub {
     owner = "kvndrsslr";
     repo = "sketchybar-app-font";
-    rev = "v2.0.24";
-    hash = "sha256-7ILGOz+5S1I6R28i3cdmVs7gYmucPiOfCTIZM7rimV4=";
+    rev = "v2.0.27";
+    hash = "sha256-IgyDJvx+CxjSm2Aoh6TEPUcGdPJi48YnNyAhGUYVYjQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index e0e2a004e6d7..c6c83ca298cd 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -1,26 +1,14 @@
 {
   lib,
-  overrideSDK,
   stdenv,
-  darwin,
   fetchFromGitHub,
-  testers,
   nix-update-script,
+  apple-sdk_15,
+  versionCheckHook,
 }:
 
 let
   inherit (stdenv.hostPlatform) system;
-  inherit (darwin.apple_sdk_11_0.frameworks)
-    AppKit
-    Carbon
-    CoreAudio
-    CoreWLAN
-    CoreVideo
-    DisplayServices
-    IOKit
-    MediaRemote
-    SkyLight
-    ;
 
   target =
     {
@@ -28,10 +16,8 @@ let
       "x86_64-darwin" = "x86";
     }
     .${system} or (throw "Unsupported system: ${system}");
-
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
 in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
   version = "2.21.0";
 
@@ -43,15 +29,7 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    AppKit
-    Carbon
-    CoreAudio
-    CoreWLAN
-    CoreVideo
-    DisplayServices
-    IOKit
-    MediaRemote
-    SkyLight
+    apple-sdk_15
   ];
 
   makeFlags = [ target ];
@@ -65,14 +43,11 @@ stdenv'.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      version = "sketchybar-v${finalAttrs.version}";
-    };
+  passthru.updateScript = nix-update-script { };
 
-    updateScript = nix-update-script { };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
   meta = {
     description = "Highly customizable macOS status bar replacement";
diff --git a/pkgs/data/themes/skeu/default.nix b/pkgs/by-name/sk/skeu/package.nix
similarity index 100%
rename from pkgs/data/themes/skeu/default.nix
rename to pkgs/by-name/sk/skeu/package.nix
diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix
index 1876a43916a7..60321fae3557 100644
--- a/pkgs/by-name/sk/skhd/package.nix
+++ b/pkgs/by-name/sk/skhd/package.nix
@@ -1,18 +1,13 @@
 {
   lib,
-  overrideSDK,
   stdenv,
-  darwin,
   fetchFromGitHub,
-  testers,
+  apple-sdk_11,
+  darwinMinVersionHook,
   nix-update-script,
+  versionCheckHook,
 }:
-let
-  inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa;
-
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "skhd";
   version = "0.3.9";
 
@@ -24,8 +19,8 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    Carbon
-    Cocoa
+    apple-sdk_11
+    (darwinMinVersionHook "10.13")
   ];
 
   makeFlags = [ "BUILD_PATH=$(out)/bin" ];
@@ -38,14 +33,11 @@ stdenv'.mkDerivation (finalAttrs: {
     substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
   '';
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      version = "skhd-v${finalAttrs.version}";
-    };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
-    updateScript = nix-update-script { };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Simple hotkey daemon for macOS";
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index 2790b77101d5..6622b305e5b7 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -17,6 +17,9 @@
 , vulkan-headers
 , vulkan-memory-allocator
 , xcbuild
+, cctools
+, zlib
+, apple-sdk_11
 
 , enableVulkan ? !stdenv.hostPlatform.isDarwin
 }:
@@ -46,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     gn
     ninja
     python3
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild cctools.libtool zlib ];
 
   buildInputs = [
     expat
@@ -61,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals enableVulkan [
     vulkan-headers
     vulkan-memory-allocator
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
   ];
 
   gnFlags = let
@@ -92,13 +97,15 @@ stdenv.mkDerivation (finalAttrs: {
     "skia_use_vulkan=true"
   ];
 
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lz";
+
   # Somewhat arbitrary, but similar to what other distros are doing
   installPhase = ''
     runHook preInstall
 
     # Libraries
     mkdir -p $out/lib
-    cp *.so *.a $out/lib
+    cp *.so *.a *.dylib $out/lib
 
     # Includes
     pushd ../../include
@@ -144,7 +151,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ fgaz ];
     platforms = with lib.platforms; arm ++ aarch64 ++ x86 ++ x86_64;
     pkgConfigModules = [ "skia" ];
-    # https://github.com/NixOS/nixpkgs/pull/325871#issuecomment-2220610016
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/by-name/sk/skim/package.nix
similarity index 100%
rename from pkgs/tools/misc/skim/default.nix
rename to pkgs/by-name/sk/skim/package.nix
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/by-name/sk/skippy-xd/package.nix
similarity index 100%
rename from pkgs/tools/X11/skippy-xd/default.nix
rename to pkgs/by-name/sk/skippy-xd/package.nix
diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/by-name/sk/skjold/package.nix
similarity index 100%
rename from pkgs/development/tools/skjold/default.nix
rename to pkgs/by-name/sk/skjold/package.nix
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/by-name/sk/skktools/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/skk/skktools/default.nix
rename to pkgs/by-name/sk/skktools/package.nix
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/by-name/sk/skopeo/package.nix
similarity index 100%
rename from pkgs/development/tools/skopeo/default.nix
rename to pkgs/by-name/sk/skopeo/package.nix
diff --git a/pkgs/by-name/sk/skydns/package.nix b/pkgs/by-name/sk/skydns/package.nix
new file mode 100644
index 000000000000..27581d185463
--- /dev/null
+++ b/pkgs/by-name/sk/skydns/package.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
+
+buildGoModule rec {
+  pname = "skydns";
+  version = "unstable-2019-10-15";
+
+  src = fetchFromGitHub {
+    owner = "skynetservices";
+    repo = "skydns";
+    rev = "94b2ea0d8bfa43395656ea94d4a6235bdda47129";
+    hash = "sha256-OWLJmGx21UoWwrm6YNbPYdj3OgEZz7C+xccnkMOZ71g=";
+  };
+
+  vendorHash = "sha256-J3+DACU9JuazGCZZrfKxHukG5M+nb+WbV3eTG8EaT/w=";
+
+  patches = [
+    # Add Go Modules support
+    (fetchpatch {
+      url = "https://github.com/skynetservices/skydns/commit/37be34cd64a3037a6d5a3b3dbb673f391e9d7eb1.patch";
+      hash = "sha256-JziYREg3vw8NMIPd8Zv8An7XUj+U6dvgRcaZph0DLPg=";
+    })
+  ];
+
+  subPackages = [ "." ];
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = {
+    description = "Distributed service for announcement and discovery of services";
+    homepage = "https://github.com/skynetservices/skydns";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    mainProgram = "skydns";
+    # link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix
index fa58fd862638..16822a140032 100644
--- a/pkgs/by-name/sk/skypeforlinux/package.nix
+++ b/pkgs/by-name/sk/skypeforlinux/package.nix
@@ -96,7 +96,7 @@ let
       xorg.libXScrnSaver
       xorg.libxcb
     ]
-    + ":${stdenv.cc.cc.lib}/lib64";
+    + ":${lib.getLib stdenv.cc.cc}/lib64";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/by-name/sk/skytemple/package.nix
similarity index 100%
rename from pkgs/applications/misc/skytemple/default.nix
rename to pkgs/by-name/sk/skytemple/package.nix
diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/by-name/sl/sl/package.nix
similarity index 100%
rename from pkgs/tools/misc/sl/default.nix
rename to pkgs/by-name/sl/sl/package.nix
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/by-name/sl/slack-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/slack-cli/default.nix
rename to pkgs/by-name/sl/slack-cli/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/by-name/sl/slack-term/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/slack-term/default.nix
rename to pkgs/by-name/sl/slack-term/package.nix
diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
new file mode 100644
index 000000000000..734d8de262b6
--- /dev/null
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -0,0 +1,43 @@
+{
+  buildGoModule,
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
+}:
+
+buildGoModule rec {
+  pname = "slackdump";
+  version = "2.6.0";
+
+  src = fetchFromGitHub {
+    owner = "rusq";
+    repo = "slackdump";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hdSsvV1mQet61pWeo5icDhFxAVNP5QU1fdb1YgyXVWU=";
+  };
+
+  nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
+
+  checkFlags =
+    let
+      skippedTests = [
+        "TestSession_saveUserCache"
+        "TestSession_GetUsers"
+      ];
+    in
+    [
+      "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
+    ];
+
+  vendorHash = "sha256-LjZP00YL0Coc7yY0Bm7AaYoAP37vQVJpVYPxuEnVEp4=";
+
+  meta = {
+    homepage = "https://github.com/rusq/slackdump";
+    changelog = "https://github.com/rusq/slackdump/releases/tag/v${version}";
+    description = "Tools for saving Slack's data without admin privileges";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    mainProgram = "slackdump";
+    license = lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/development/tools/database/sleek/Cargo.lock b/pkgs/by-name/sl/sleek/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/database/sleek/Cargo.lock
rename to pkgs/by-name/sl/sleek/Cargo.lock
diff --git a/pkgs/development/tools/database/sleek/default.nix b/pkgs/by-name/sl/sleek/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sleek/default.nix
rename to pkgs/by-name/sl/sleek/package.nix
diff --git a/pkgs/tools/networking/sleep-on-lan/default.nix b/pkgs/by-name/sl/sleep-on-lan/package.nix
similarity index 100%
rename from pkgs/tools/networking/sleep-on-lan/default.nix
rename to pkgs/by-name/sl/sleep-on-lan/package.nix
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/by-name/sl/sleuthkit/package.nix
similarity index 100%
rename from pkgs/tools/system/sleuthkit/default.nix
rename to pkgs/by-name/sl/sleuthkit/package.nix
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/by-name/sl/slic3r/package.nix
similarity index 100%
rename from pkgs/applications/misc/slic3r/default.nix
rename to pkgs/by-name/sl/slic3r/package.nix
diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/by-name/sl/slides/package.nix
similarity index 100%
rename from pkgs/applications/misc/slides/default.nix
rename to pkgs/by-name/sl/slides/package.nix
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/by-name/sl/slimerjs/package.nix
similarity index 100%
rename from pkgs/development/tools/slimerjs/default.nix
rename to pkgs/by-name/sl/slimerjs/package.nix
diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix
index abdb045e7ced..0fd579e7a3b8 100644
--- a/pkgs/by-name/sl/slimserver/package.nix
+++ b/pkgs/by-name/sl/slimserver/package.nix
@@ -28,7 +28,7 @@ let
   );
   libPath = lib.makeLibraryPath [
     zlib
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
   ];
 in
 perlPackages.buildPerlPackage rec {
diff --git a/pkgs/tools/misc/slingshot/default.nix b/pkgs/by-name/sl/slingshot/package.nix
similarity index 100%
rename from pkgs/tools/misc/slingshot/default.nix
rename to pkgs/by-name/sl/slingshot/package.nix
diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/by-name/sl/slippy/package.nix
similarity index 100%
rename from pkgs/applications/misc/slippy/default.nix
rename to pkgs/by-name/sl/slippy/package.nix
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/by-name/sl/slirp4netns/package.nix
similarity index 100%
rename from pkgs/tools/networking/slirp4netns/default.nix
rename to pkgs/by-name/sl/slirp4netns/package.nix
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/by-name/sl/sloccount/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sloccount/default.nix
rename to pkgs/by-name/sl/sloccount/package.nix
diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/by-name/sl/slop/package.nix
similarity index 100%
rename from pkgs/tools/misc/slop/default.nix
rename to pkgs/by-name/sl/slop/package.nix
diff --git a/pkgs/tools/misc/sloth/default.nix b/pkgs/by-name/sl/sloth/package.nix
similarity index 100%
rename from pkgs/tools/misc/sloth/default.nix
rename to pkgs/by-name/sl/sloth/package.nix
diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/by-name/sl/slowhttptest/package.nix
similarity index 100%
rename from pkgs/tools/security/slowhttptest/default.nix
rename to pkgs/by-name/sl/slowhttptest/package.nix
diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/by-name/sl/slrn/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/slrn/default.nix
rename to pkgs/by-name/sl/slrn/package.nix
diff --git a/pkgs/tools/security/slsa-verifier/default.nix b/pkgs/by-name/sl/slsa-verifier/package.nix
similarity index 100%
rename from pkgs/tools/security/slsa-verifier/default.nix
rename to pkgs/by-name/sl/slsa-verifier/package.nix
diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/by-name/sl/slsnif/package.nix
similarity index 100%
rename from pkgs/tools/misc/slsnif/default.nix
rename to pkgs/by-name/sl/slsnif/package.nix
diff --git a/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch b/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch
rename to pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch
diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-stunnel/default.nix
rename to pkgs/by-name/sl/slurm-spank-stunnel/package.nix
diff --git a/pkgs/servers/computing/slurm-spank-x11/hostlist.patch b/pkgs/by-name/sl/slurm-spank-x11/hostlist.patch
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-x11/hostlist.patch
rename to pkgs/by-name/sl/slurm-spank-x11/hostlist.patch
diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-x11/default.nix
rename to pkgs/by-name/sl/slurm-spank-x11/package.nix
diff --git a/pkgs/servers/computing/slurm/common-env-echo.patch b/pkgs/by-name/sl/slurm/common-env-echo.patch
similarity index 100%
rename from pkgs/servers/computing/slurm/common-env-echo.patch
rename to pkgs/by-name/sl/slurm/common-env-echo.patch
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
new file mode 100644
index 000000000000..baf99a2633b6
--- /dev/null
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -0,0 +1,105 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl
+, python3, munge, perl, pam, shadow, coreutils, dbus, libbpf
+, ncurses, libmysqlclient, lua, hwloc, numactl
+, readline, freeipmi, xorg, lz4, rdma-core, nixosTests
+, pmix
+, libjwt
+, libyaml
+, json_c
+, http-parser
+# enable internal X11 support via libssh2
+, enableX11 ? true
+, enableGtk2 ? false, gtk2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "slurm";
+  version = "24.05.4.1";
+
+  # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
+  # because the latter does not keep older releases.
+  src = fetchFromGitHub {
+    owner = "SchedMD";
+    repo = "slurm";
+    # The release tags use - instead of .
+    rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
+    hash = "sha256-sviXuRJOpuSoOMNjGPRe11qlphk0Y1/YV/Y5M+QkWys=";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  patches = [
+    # increase string length to allow for full
+    # path of 'echo' in nix store
+    ./common-env-echo.patch
+  ];
+
+  prePatch = ''
+    substituteInPlace src/common/env.c \
+        --replace "/bin/echo" "${coreutils}/bin/echo"
+
+    # Autoconf does not support split packages for pmix (libs and headers).
+    # Fix the path to the pmix libraries, so dlopen can find it.
+    substituteInPlace src/plugins/mpi/pmix/mpi_pmix.c \
+        --replace 'xstrfmtcat(full_path, "%s/", PMIXP_LIBPATH)' \
+                  'xstrfmtcat(full_path, "${lib.getLib pmix}/lib/")'
+
+  '' + (lib.optionalString enableX11 ''
+    substituteInPlace src/common/x11_util.c \
+        --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
+  '');
+
+  # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
+  # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
+  # this doesn't fix tests completely at least makes slurmd to launch
+  hardeningDisable = [ "bindnow" ];
+
+  nativeBuildInputs = [ pkg-config libtool python3 perl ];
+  buildInputs = [
+    curl python3 munge pam
+    libmysqlclient ncurses lz4 rdma-core
+    lua hwloc numactl readline freeipmi shadow.su
+    pmix json_c libjwt libyaml dbus libbpf
+    http-parser
+  ] ++ lib.optionals enableX11 [ xorg.xauth ]
+  ++ lib.optionals enableGtk2 [ gtk2 ];
+
+  configureFlags = [
+      "--with-freeipmi=${freeipmi}"
+      "--with-http-parser=${http-parser}"
+      "--with-hwloc=${lib.getDev hwloc}"
+      "--with-json=${lib.getDev json_c}"
+      "--with-jwt=${libjwt}"
+      "--with-lz4=${lib.getDev lz4}"
+      "--with-munge=${munge}"
+      "--with-yaml=${lib.getDev libyaml}"
+      "--with-ofed=${lib.getDev rdma-core}"
+      "--sysconfdir=/etc/slurm"
+      "--with-pmix=${lib.getDev pmix}"
+      "--with-bpf=${libbpf}"
+      "--without-rpath" # Required for configure to pick up the right dlopen path
+    ] ++ (lib.optional enableGtk2  "--disable-gtktest")
+      ++ (lib.optional (!enableX11) "--disable-x11");
+
+
+  preConfigure = ''
+    patchShebangs ./doc/html/shtml2html.py
+    patchShebangs ./doc/man/man2html.py
+  '';
+
+  postInstall = ''
+    rm -f $out/lib/*.la $out/lib/slurm/*.la
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.tests.slurm = nixosTests.slurm;
+
+  meta = with lib; {
+    homepage = "http://www.schedmd.com/";
+    description = "Simple Linux Utility for Resource Management";
+    platforms = platforms.linux;
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ jagajaga markuskowa ];
+  };
+}
diff --git a/pkgs/by-name/sl/slweb/package.nix b/pkgs/by-name/sl/slweb/package.nix
index ceabcd001d1b..337d8a8e454d 100644
--- a/pkgs/by-name/sl/slweb/package.nix
+++ b/pkgs/by-name/sl/slweb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slweb";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromSourcehut {
     owner = "~strahinja";
     repo = "slweb";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-AJg8qgbNUKizU0uyTnq9EviIXOUuaGvQowLAyTWhGTY=";
+    hash = "sha256-TS87rFmK6IZbyj+11Oi/lHepa3MDebYILVLLLAgNEdc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
new file mode 100644
index 000000000000..82fd9823285f
--- /dev/null
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  flutter,
+}:
+let
+  version = "0.4.0";
+  src = fetchFromGitHub {
+    owner = "kra-mo";
+    repo = "sly";
+    rev = "v${version}";
+    hash = "sha256-P7LhhXQQDRsDQ8bZgfvWazLRMYVGhFhMTD41fgs718g=";
+  };
+in
+flutter.buildFlutterApplication {
+  pname = "sly";
+  inherit version src;
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  postInstall = ''
+    install -Dm0644 ./packaging/linux/page.kramo.Sly.svg $out/share/icons/hicolor/scalable/apps/page.kramo.Sly.svg
+    install -Dm0644 ./packaging/linux/page.kramo.Sly.desktop $out/share/applications/page.kramo.Sly.desktop
+  '';
+
+  meta = {
+    description = "Friendly image editor";
+    homepage = "https://github.com/kra-mo/sly";
+    mainProgram = "sly";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ aucub ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/sl/sly/pubspec.lock.json b/pkgs/by-name/sl/sly/pubspec.lock.json
new file mode 100644
index 000000000000..12897b2cd77c
--- /dev/null
+++ b/pkgs/by-name/sl/sly/pubspec.lock.json
@@ -0,0 +1,922 @@
+{
+  "packages": {
+    "archive": {
+      "dependency": "transitive",
+      "description": {
+        "name": "archive",
+        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.6.1"
+    },
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.0"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.11.0"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "characters": {
+      "dependency": "transitive",
+      "description": {
+        "name": "characters",
+        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "cli_util": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_util",
+        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.1"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "collection",
+        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.18.0"
+    },
+    "console": {
+      "dependency": "transitive",
+      "description": {
+        "name": "console",
+        "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.0"
+    },
+    "crop_image": {
+      "dependency": "direct main",
+      "description": {
+        "name": "crop_image",
+        "sha256": "6cf20655ecbfba99c369d43ec7adcfa49bf135af88fb75642173d6224a95d3f1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.13"
+    },
+    "cross_file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cross_file",
+        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.4+2"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.5"
+    },
+    "equatable": {
+      "dependency": "transitive",
+      "description": {
+        "name": "equatable",
+        "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.5"
+    },
+    "fake_async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fake_async",
+        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.1"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.0"
+    },
+    "file_selector": {
+      "dependency": "direct main",
+      "description": {
+        "name": "file_selector",
+        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.3"
+    },
+    "file_selector_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_android",
+        "sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1+7"
+    },
+    "file_selector_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_ios",
+        "sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.3"
+    },
+    "file_selector_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_linux",
+        "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.2+1"
+    },
+    "file_selector_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_macos",
+        "sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.4"
+    },
+    "file_selector_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_platform_interface",
+        "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.2"
+    },
+    "file_selector_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_web",
+        "sha256": "c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.4+2"
+    },
+    "file_selector_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_selector_windows",
+        "sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.3+2"
+    },
+    "fl_chart": {
+      "dependency": "direct main",
+      "description": {
+        "name": "fl_chart",
+        "sha256": "94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.69.0"
+    },
+    "flutter": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_lints",
+        "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "flutter_plugin_android_lifecycle": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_plugin_android_lifecycle",
+        "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.22"
+    },
+    "flutter_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_web_plugins": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "gal": {
+      "dependency": "direct main",
+      "description": {
+        "name": "gal",
+        "sha256": "54c9b72528efce7c66234f3b6dd01cb0304fd8af8196de15571d7bdddb940977",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "get_it": {
+      "dependency": "transitive",
+      "description": {
+        "name": "get_it",
+        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.7.0"
+    },
+    "handy_window": {
+      "dependency": "direct main",
+      "description": {
+        "name": "handy_window",
+        "sha256": "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.0"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.2"
+    },
+    "image": {
+      "dependency": "direct main",
+      "description": {
+        "name": "image",
+        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.2.0"
+    },
+    "image_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "image_picker",
+        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2"
+    },
+    "image_picker_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_android",
+        "sha256": "c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.8.12+13"
+    },
+    "image_picker_for_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_for_web",
+        "sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.5"
+    },
+    "image_picker_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_ios",
+        "sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.8.12"
+    },
+    "image_picker_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_linux",
+        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.1+1"
+    },
+    "image_picker_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_macos",
+        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.1+1"
+    },
+    "image_picker_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_platform_interface",
+        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.10.0"
+    },
+    "image_picker_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image_picker_windows",
+        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.1+1"
+    },
+    "leak_tracker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker",
+        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.0.5"
+    },
+    "leak_tracker_flutter_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_flutter_testing",
+        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.5"
+    },
+    "leak_tracker_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_testing",
+        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.1"
+    },
+    "lints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "lints",
+        "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.16+1"
+    },
+    "material_color_utilities": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_color_utilities",
+        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.11.1"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
+    "mime": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mime",
+        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.6"
+    },
+    "msix": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "msix",
+        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.16.8"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "path": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path",
+        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.0"
+    },
+    "path_provider_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_linux",
+        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "path_provider_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_platform_interface",
+        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "path_provider_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_windows",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.2"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.5"
+    },
+    "plugin_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "plugin_platform_interface",
+        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.8"
+    },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "screen_retriever": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever",
+        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.9"
+    },
+    "shared_preferences": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shared_preferences",
+        "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "shared_preferences_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_android",
+        "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "shared_preferences_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_foundation",
+        "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.2"
+    },
+    "shared_preferences_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_linux",
+        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shared_preferences_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_platform_interface",
+        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shared_preferences_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_web",
+        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "shared_preferences_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_windows",
+        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "sky_engine": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.99"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.0"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.11.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.0"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.2"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.2"
+    },
+    "url_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "url_launcher",
+        "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.0"
+    },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.10"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.1"
+    },
+    "url_launcher_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_linux",
+        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.0"
+    },
+    "url_launcher_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_macos",
+        "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.0"
+    },
+    "url_launcher_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_platform_interface",
+        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "url_launcher_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_web",
+        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.3"
+    },
+    "url_launcher_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_windows",
+        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "vector_math": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_math",
+        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "14.2.5"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "window_manager": {
+      "dependency": "direct main",
+      "description": {
+        "name": "window_manager",
+        "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.2"
+    },
+    "xdg_directories": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xdg_directories",
+        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.5.0 <4.0.0",
+    "flutter": ">=3.24.0"
+  }
+}
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/by-name/sm/smack/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/smack/default.nix
rename to pkgs/by-name/sm/smack/package.nix
diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/by-name/sm/smart-wallpaper/package.nix
similarity index 100%
rename from pkgs/tools/X11/smart-wallpaper/default.nix
rename to pkgs/by-name/sm/smart-wallpaper/package.nix
diff --git a/pkgs/tools/graphics/smartcrop/default.nix b/pkgs/by-name/sm/smartcrop/package.nix
similarity index 100%
rename from pkgs/tools/graphics/smartcrop/default.nix
rename to pkgs/by-name/sm/smartcrop/package.nix
diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/by-name/sm/smartdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/smartdns/default.nix
rename to pkgs/by-name/sm/smartdns/package.nix
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/by-name/sm/smarty3-i18n/package.nix
similarity index 100%
rename from pkgs/development/libraries/smarty3-i18n/default.nix
rename to pkgs/by-name/sm/smarty3-i18n/package.nix
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/by-name/sm/smarty3/package.nix
similarity index 100%
rename from pkgs/development/libraries/smarty3/default.nix
rename to pkgs/by-name/sm/smarty3/package.nix
diff --git a/pkgs/tools/security/smbmap/default.nix b/pkgs/by-name/sm/smbmap/package.nix
similarity index 100%
rename from pkgs/tools/security/smbmap/default.nix
rename to pkgs/by-name/sm/smbmap/package.nix
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/by-name/sm/smbnetfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/smbnetfs/default.nix
rename to pkgs/by-name/sm/smbnetfs/package.nix
diff --git a/pkgs/tools/security/smbscan/default.nix b/pkgs/by-name/sm/smbscan/package.nix
similarity index 100%
rename from pkgs/tools/security/smbscan/default.nix
rename to pkgs/by-name/sm/smbscan/package.nix
diff --git a/pkgs/data/fonts/smc-chilanka/default.nix b/pkgs/by-name/sm/smc-chilanka/package.nix
similarity index 100%
rename from pkgs/data/fonts/smc-chilanka/default.nix
rename to pkgs/by-name/sm/smc-chilanka/package.nix
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/by-name/sm/smc/package.nix
similarity index 100%
rename from pkgs/tools/misc/smc/default.nix
rename to pkgs/by-name/sm/smc/package.nix
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/by-name/sm/smcroute/package.nix
similarity index 100%
rename from pkgs/servers/smcroute/default.nix
rename to pkgs/by-name/sm/smcroute/package.nix
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/by-name/sm/smem/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/smem/default.nix
rename to pkgs/by-name/sm/smem/package.nix
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/by-name/sm/smemstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/smemstat/default.nix
rename to pkgs/by-name/sm/smemstat/package.nix
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/by-name/sm/smenu/package.nix
similarity index 100%
rename from pkgs/tools/misc/smenu/default.nix
rename to pkgs/by-name/sm/smenu/package.nix
diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/by-name/sm/smiley-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/smiley-sans/default.nix
rename to pkgs/by-name/sm/smiley-sans/package.nix
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/by-name/sm/smimesign/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/smimesign/default.nix
rename to pkgs/by-name/sm/smimesign/package.nix
diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/by-name/sm/smlfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/smlfmt/default.nix
rename to pkgs/by-name/sm/smlfmt/package.nix
diff --git a/pkgs/tools/package-management/smlpkg/default.nix b/pkgs/by-name/sm/smlpkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/smlpkg/default.nix
rename to pkgs/by-name/sm/smlpkg/package.nix
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/by-name/sm/smokeping/package.nix
similarity index 100%
rename from pkgs/tools/networking/smokeping/default.nix
rename to pkgs/by-name/sm/smokeping/package.nix
diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/by-name/sm/smooth/package.nix
similarity index 100%
rename from pkgs/development/libraries/smooth/default.nix
rename to pkgs/by-name/sm/smooth/package.nix
diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/by-name/sm/smpeg/format.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/format.patch
rename to pkgs/by-name/sm/smpeg/format.patch
diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/by-name/sm/smpeg/gcc6.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/gcc6.patch
rename to pkgs/by-name/sm/smpeg/gcc6.patch
diff --git a/pkgs/development/libraries/smpeg/gtk.patch b/pkgs/by-name/sm/smpeg/gtk.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/gtk.patch
rename to pkgs/by-name/sm/smpeg/gtk.patch
diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/by-name/sm/smpeg/libx11.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/libx11.patch
rename to pkgs/by-name/sm/smpeg/libx11.patch
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/by-name/sm/smpeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/smpeg/default.nix
rename to pkgs/by-name/sm/smpeg/package.nix
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/by-name/sm/smpeg2/package.nix
similarity index 100%
rename from pkgs/development/libraries/smpeg2/default.nix
rename to pkgs/by-name/sm/smpeg2/package.nix
diff --git a/pkgs/servers/mail/smtprelay/default.nix b/pkgs/by-name/sm/smtprelay/package.nix
similarity index 100%
rename from pkgs/servers/mail/smtprelay/default.nix
rename to pkgs/by-name/sm/smtprelay/package.nix
diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/by-name/sm/smu/package.nix
similarity index 100%
rename from pkgs/tools/text/smu/default.nix
rename to pkgs/by-name/sm/smu/package.nix
diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/by-name/sm/smug/package.nix
similarity index 100%
rename from pkgs/tools/misc/smug/default.nix
rename to pkgs/by-name/sm/smug/package.nix
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/by-name/sn/snabb/package.nix
similarity index 100%
rename from pkgs/tools/networking/snabb/default.nix
rename to pkgs/by-name/sn/snabb/package.nix
diff --git a/pkgs/games/snake4/default.nix b/pkgs/by-name/sn/snake4/package.nix
similarity index 100%
rename from pkgs/games/snake4/default.nix
rename to pkgs/by-name/sn/snake4/package.nix
diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/by-name/sn/snallygaster/package.nix
similarity index 100%
rename from pkgs/tools/security/snallygaster/default.nix
rename to pkgs/by-name/sn/snallygaster/package.nix
diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/by-name/sn/snap7/package.nix
similarity index 100%
rename from pkgs/development/libraries/snap7/default.nix
rename to pkgs/by-name/sn/snap7/package.nix
diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/by-name/sn/snapdragon-profiler/package.nix
similarity index 100%
rename from pkgs/tools/graphics/snapdragon-profiler/default.nix
rename to pkgs/by-name/sn/snapdragon-profiler/package.nix
diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix
similarity index 100%
rename from pkgs/applications/misc/snapmaker-luban/default.nix
rename to pkgs/by-name/sn/snapmaker-luban/package.nix
diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/by-name/sn/snapper-gui/package.nix
similarity index 100%
rename from pkgs/applications/misc/snapper-gui/default.nix
rename to pkgs/by-name/sn/snapper-gui/package.nix
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/by-name/sn/snapper/package.nix
similarity index 100%
rename from pkgs/tools/misc/snapper/default.nix
rename to pkgs/by-name/sn/snapper/package.nix
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/by-name/sn/snappy/package.nix
similarity index 100%
rename from pkgs/development/libraries/snappy/default.nix
rename to pkgs/by-name/sn/snappy/package.nix
diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/by-name/sn/snappymail/package.nix
similarity index 100%
rename from pkgs/servers/snappymail/default.nix
rename to pkgs/by-name/sn/snappymail/package.nix
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/by-name/sn/snapraid/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/snapraid/default.nix
rename to pkgs/by-name/sn/snapraid/package.nix
diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix
new file mode 100644
index 000000000000..fcf98fe93a3f
--- /dev/null
+++ b/pkgs/by-name/sn/snapshot/package.nix
@@ -0,0 +1,94 @@
+{ stdenv
+, lib
+, fetchurl
+, glycin-loaders
+, cargo
+, desktop-file-utils
+, jq
+, meson
+, moreutils
+, ninja
+, pkg-config
+, rustc
+, wrapGAppsHook4
+, glib
+, gst_all_1
+, gtk4
+, libadwaita
+, libcamera
+, libseccomp
+, pipewire
+, gnome
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "snapshot";
+  version = "47.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5LFiZ5ryTH6W7m4itH1f8NqW4KD2FtE66xIHxgn4lIM=";
+  };
+
+  patches = [
+    # Fix paths in glycin library
+    glycin-loaders.passthru.glycinPathsPatch
+  ];
+
+  nativeBuildInputs = [
+    cargo
+    desktop-file-utils
+    jq
+    meson
+    moreutils # sponge is used in postPatch
+    ninja
+    pkg-config
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-rs # for gtk4paintablesink
+    gst_all_1.gstreamer
+    gtk4
+    libadwaita
+    libcamera # for the gstreamer plugin
+    libseccomp
+    pipewire # for device provider
+  ];
+
+  postPatch = ''
+    # Replace hash of file we patch in vendored glycin.
+    jq \
+      --arg hash "$(sha256sum vendor/glycin/src/sandbox.rs | cut -d' ' -f 1)" \
+      '.files."src/sandbox.rs" = $hash' \
+      vendor/glycin/.cargo-checksum.json \
+      | sponge vendor/glycin/.cargo-checksum.json
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # vp8enc preset
+      --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
+      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
+      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+    )
+  '';
+
+  passthru.updateScript = gnome.updateScript {
+    packageName = "snapshot";
+  };
+
+  meta = with lib; {
+    homepage = "https://gitlab.gnome.org/GNOME/snapshot";
+    description = "Take pictures and videos on your computer, tablet, or phone";
+    maintainers = teams.gnome.members;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    mainProgram = "snapshot";
+  };
+})
diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/by-name/sn/snazy/package.nix
similarity index 100%
rename from pkgs/development/tools/snazy/default.nix
rename to pkgs/by-name/sn/snazy/package.nix
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/by-name/sn/sndio/package.nix
similarity index 100%
rename from pkgs/misc/sndio/default.nix
rename to pkgs/by-name/sn/sndio/package.nix
diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/by-name/sn/sndpeek/package.nix
similarity index 100%
rename from pkgs/applications/audio/sndpeek/default.nix
rename to pkgs/by-name/sn/sndpeek/package.nix
diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/pkgs/by-name/sn/sndpeek/pthread.patch
similarity index 100%
rename from pkgs/applications/audio/sndpeek/pthread.patch
rename to pkgs/by-name/sn/sndpeek/pthread.patch
diff --git a/pkgs/tools/networking/snet/default.nix b/pkgs/by-name/sn/snet/package.nix
similarity index 100%
rename from pkgs/tools/networking/snet/default.nix
rename to pkgs/by-name/sn/snet/package.nix
diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/by-name/sn/sngrep/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/sngrep/default.nix
rename to pkgs/by-name/sn/sngrep/package.nix
diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/by-name/sn/sniffnet/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffnet/default.nix
rename to pkgs/by-name/sn/sniffnet/package.nix
diff --git a/pkgs/data/fonts/sniglet/default.nix b/pkgs/by-name/sn/sniglet/package.nix
similarity index 100%
rename from pkgs/data/fonts/sniglet/default.nix
rename to pkgs/by-name/sn/sniglet/package.nix
diff --git a/pkgs/games/snipes/default.nix b/pkgs/by-name/sn/snipes/package.nix
similarity index 100%
rename from pkgs/games/snipes/default.nix
rename to pkgs/by-name/sn/snipes/package.nix
diff --git a/pkgs/by-name/sn/snippetexpander/package.nix b/pkgs/by-name/sn/snippetexpander/package.nix
index 31c1a59f84a0..4aed8b58adeb 100644
--- a/pkgs/by-name/sn/snippetexpander/package.nix
+++ b/pkgs/by-name/sn/snippetexpander/package.nix
@@ -50,7 +50,7 @@ buildGoModule rec {
     description = "Your little expandable text snippet helper CLI";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ianmjones ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpander";
   };
diff --git a/pkgs/by-name/sn/snippetexpanderd/package.nix b/pkgs/by-name/sn/snippetexpanderd/package.nix
index fbaa7541e8fe..e657ed758ff7 100644
--- a/pkgs/by-name/sn/snippetexpanderd/package.nix
+++ b/pkgs/by-name/sn/snippetexpanderd/package.nix
@@ -61,7 +61,7 @@ buildGoModule rec {
     description = "Your little expandable text snippet helper daemon";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ianmjones ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpanderd";
   };
diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix
index 5e5e6a60cda7..ed496b76b905 100644
--- a/pkgs/by-name/sn/snippetexpandergui/package.nix
+++ b/pkgs/by-name/sn/snippetexpandergui/package.nix
@@ -65,7 +65,7 @@ buildGoModule rec {
     description = "Your little expandable text snippet helper GUI";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ianmjones ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpandergui";
   };
diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix
index 5f67512edda6..e88cbe15ae0d 100644
--- a/pkgs/by-name/sn/snippetexpanderx/package.nix
+++ b/pkgs/by-name/sn/snippetexpanderx/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     description = "Your little expandable text snippet helper auto expander daemon";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ianmjones ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpanderx";
   };
diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix
new file mode 100644
index 000000000000..49b633b02f01
--- /dev/null
+++ b/pkgs/by-name/sn/snippetpixie/package.nix
@@ -0,0 +1,89 @@
+{ lib, stdenv
+, fetchFromGitHub
+, nix-update-script
+, meson
+, ninja
+, vala
+, pkg-config
+, wrapGAppsHook3
+, appstream
+, desktop-file-utils
+, python3
+, libgee
+, glib
+, gtk3
+, sqlite
+, at-spi2-atk
+, at-spi2-core
+, dbus
+, ibus
+, json-glib
+, pantheon
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "snippetpixie";
+  version = "1.5.3";
+
+  src = fetchFromGitHub {
+    owner = "bytepixie";
+    repo = pname;
+    rev = version;
+    sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkg-config
+    wrapGAppsHook3
+    appstream
+    desktop-file-utils
+    python3
+  ];
+
+  buildInputs = [
+    libgee
+    glib
+    gtk3
+    sqlite
+    at-spi2-atk
+    at-spi2-core
+    dbus
+    ibus
+    json-glib
+    xorg.libXtst
+    pantheon.granite
+  ];
+
+  doCheck = true;
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "Your little expandable text snippet helper";
+    longDescription = ''
+      Your little expandable text snippet helper.
+
+      Save your often used text snippets and then expand them whenever you type their abbreviation.
+
+      For example:- "spr`" expands to "Snippet Pixie rules!"
+
+      For non-accessible applications such as browsers and Electron apps, there's a shortcut (default is Ctrl+`) for opening a search window that pastes the selected snippet.
+    '';
+    homepage = "https://www.snippetpixie.com";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
+    platforms = platforms.linux;
+    mainProgram = "com.github.bytepixie.snippetpixie";
+  };
+}
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/by-name/sn/sniproxy/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniproxy/default.nix
rename to pkgs/by-name/sn/sniproxy/package.nix
diff --git a/pkgs/games/snis/default.nix b/pkgs/by-name/sn/snis/package.nix
similarity index 100%
rename from pkgs/games/snis/default.nix
rename to pkgs/by-name/sn/snis/package.nix
diff --git a/pkgs/applications/misc/snixembed/default.nix b/pkgs/by-name/sn/snixembed/package.nix
similarity index 100%
rename from pkgs/applications/misc/snixembed/default.nix
rename to pkgs/by-name/sn/snixembed/package.nix
diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/by-name/sn/snmpcheck/package.nix
similarity index 100%
rename from pkgs/tools/networking/snmpcheck/default.nix
rename to pkgs/by-name/sn/snmpcheck/package.nix
diff --git a/pkgs/development/interpreters/snobol4/fix-paths.patch b/pkgs/by-name/sn/snobol4/fix-paths.patch
similarity index 100%
rename from pkgs/development/interpreters/snobol4/fix-paths.patch
rename to pkgs/by-name/sn/snobol4/fix-paths.patch
diff --git a/pkgs/development/interpreters/snobol4/default.nix b/pkgs/by-name/sn/snobol4/package.nix
similarity index 100%
rename from pkgs/development/interpreters/snobol4/default.nix
rename to pkgs/by-name/sn/snobol4/package.nix
diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/by-name/sn/snooze/package.nix
similarity index 100%
rename from pkgs/tools/system/snooze/default.nix
rename to pkgs/by-name/sn/snooze/package.nix
diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/by-name/sn/snore/package.nix
similarity index 100%
rename from pkgs/tools/misc/snore/default.nix
rename to pkgs/by-name/sn/snore/package.nix
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/by-name/sn/snort/package.nix
similarity index 100%
rename from pkgs/applications/networking/ids/snort/default.nix
rename to pkgs/by-name/sn/snort/package.nix
diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/by-name/sn/snow/package.nix
similarity index 100%
rename from pkgs/tools/security/snow/default.nix
rename to pkgs/by-name/sn/snow/package.nix
diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/by-name/sn/snowblind/package.nix
similarity index 100%
rename from pkgs/data/themes/snowblind/default.nix
rename to pkgs/by-name/sn/snowblind/package.nix
diff --git a/pkgs/tools/security/snowcat/default.nix b/pkgs/by-name/sn/snowcat/package.nix
similarity index 100%
rename from pkgs/tools/security/snowcat/default.nix
rename to pkgs/by-name/sn/snowcat/package.nix
diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/by-name/sn/snowcrash/package.nix
similarity index 100%
rename from pkgs/tools/security/snowcrash/default.nix
rename to pkgs/by-name/sn/snowcrash/package.nix
diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix
new file mode 100644
index 000000000000..370e535ecca6
--- /dev/null
+++ b/pkgs/by-name/sn/snowflake-cli/package.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenv,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "snowflake-cli";
+  version = "3.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "snowflakedb";
+    repo = "snowflake-cli";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/n11GbrgFwjiAuwpFNJ3T96VDhdOy2x+hesgh4oPVbo=";
+  };
+
+  build-system = with python3Packages; [
+    hatch-vcs
+    hatchling
+    pip
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  dependencies = with python3Packages; [
+    jinja2
+    pluggy
+    pyyaml
+    rich
+    requests
+    requirements-parser
+    setuptools
+    tomlkit
+    typer
+    urllib3
+    gitpython
+    pydantic
+    snowflake-connector-python
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+    syrupy
+    coverage
+    pytest-randomly
+    pytest-factoryboy
+    pytest-xdist
+  ];
+
+  pytestFlagsArray = [
+    "-n"
+    "$NIX_BUILD_CORES"
+    "--snapshot-warn-unused" # Turn unused snapshots into a warning and not a failure
+  ];
+
+  disabledTests = [
+    "integration"
+    "spcs"
+    "loaded_modules"
+    "integration_experimental"
+    "test_snow_typer_help_sanitization" # Snapshot needs update?
+    "test_help_message" # Snapshot needs update?
+    "test_executing_command_sends_telemetry_usage_data" # Fails on mocked version
+  ];
+
+  pythonRelaxDeps = true;
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+
+    # Looks like the completion generation has some sort of a race
+    # Occasionally one of the completion generations would fail with
+    #
+    # An unexpected exception occurred. Use --debug option to see the traceback. Exception message:
+    # [Errno 17] File exists: '/build/tmp.W654FVhCPT/.config/snowflake/logs'
+    #
+    # This creates a fake config that prevents logging in the build sandbox.
+    export HOME=$(mktemp -d)
+    mkdir -p $HOME/.config/snowflake
+    cat < $HOME/.config/snowflake/config.toml
+    [cli.logs]
+    save_logs = false
+    EOF
+    # snowcli checks the config permissions upon launch and exits with an error code if it's not 0600.
+    chmod 0600 $HOME/.config/snowflake/config.toml
+
+    # Typer tries to guess the current shell by default
+    export _TYPER_COMPLETE_TEST_DISABLE_SHELL_DETECTION=1
+
+    installShellCompletion --cmd snow \
+      --bash <($out/bin/snow --show-completion bash) \
+      --fish <($out/bin/snow --show-completion fish) \
+      --zsh <($out/bin/snow --show-completion zsh)
+  '';
+
+  meta = {
+    changelog = "https://github.com/snowflakedb/snowflake-cli/blob/main/RELEASE-NOTES.md";
+    homepage = "https://docs.snowflake.com/en/developer-guide/snowflake-cli-v2/index";
+    description = "Command-line tool explicitly designed for developer-centric workloads in addition to SQL operations";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ vtimofeenko ];
+    mainProgram = "snow";
+  };
+}
diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/by-name/sn/snowflake/package.nix
similarity index 100%
rename from pkgs/tools/networking/snowflake/default.nix
rename to pkgs/by-name/sn/snowflake/package.nix
diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/by-name/sn/snowsql/package.nix
similarity index 100%
rename from pkgs/applications/misc/snowsql/default.nix
rename to pkgs/by-name/sn/snowsql/package.nix
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/by-name/sn/snpeff/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/snpeff/default.nix
rename to pkgs/by-name/sn/snpeff/package.nix
diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix
index 4c90ad105a6f..de9ae70d9a4a 100644
--- a/pkgs/by-name/sn/snyk/package.nix
+++ b/pkgs/by-name/sn/snyk/package.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.1293.1";
+  version = "1.1294.0";
 in
 buildNpmPackage {
   pname = "snyk";
@@ -18,10 +18,10 @@ buildNpmPackage {
     owner = "snyk";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vgt9h0LLIC5I9NZZKKWD9b1xnNOSkxApLxSGf2C0ODk=";
+    hash = "sha256-AO36b3VWdklfMjSEE3JMZUVS1KmBSra2xX6hqlf3OUM=";
   };
 
-  npmDepsHash = "sha256-1YtyQg14vj85KtOXP93vLkqIMmT+8DAJdG/ql+1ooyU=";
+  npmDepsHash = "sha256-xGRmZyDXZVuFdpT1LcSLBh9bY86rOjGvVjyCt9PSigg=";
 
   postPatch = ''
     substituteInPlace package.json \
diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/by-name/sn/snzip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/snzip/default.nix
rename to pkgs/by-name/sn/snzip/package.nix
diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/by-name/so/soapyremote/package.nix
similarity index 100%
rename from pkgs/applications/radio/soapyremote/default.nix
rename to pkgs/by-name/so/soapyremote/package.nix
diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/by-name/so/soapysdrplay/package.nix
similarity index 100%
rename from pkgs/applications/radio/soapysdrplay/default.nix
rename to pkgs/by-name/so/soapysdrplay/package.nix
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/by-name/so/socat/package.nix
similarity index 100%
rename from pkgs/tools/networking/socat/default.nix
rename to pkgs/by-name/so/socat/package.nix
diff --git a/pkgs/tools/security/social-engineer-toolkit/default.nix b/pkgs/by-name/so/social-engineer-toolkit/package.nix
similarity index 100%
rename from pkgs/tools/security/social-engineer-toolkit/default.nix
rename to pkgs/by-name/so/social-engineer-toolkit/package.nix
diff --git a/pkgs/tools/networking/sockdump/default.nix b/pkgs/by-name/so/sockdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/sockdump/default.nix
rename to pkgs/by-name/so/sockdump/package.nix
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/by-name/so/socket_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/socket_wrapper/default.nix
rename to pkgs/by-name/so/socket_wrapper/package.nix
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/by-name/so/socklog/package.nix
similarity index 100%
rename from pkgs/tools/system/socklog/default.nix
rename to pkgs/by-name/so/socklog/package.nix
diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/by-name/so/sockperf/package.nix
similarity index 100%
rename from pkgs/tools/networking/sockperf/default.nix
rename to pkgs/by-name/so/sockperf/package.nix
diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/by-name/so/sof-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/sof-firmware/default.nix
rename to pkgs/by-name/so/sof-firmware/package.nix
diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/by-name/so/soft-serve/package.nix
similarity index 100%
rename from pkgs/servers/soft-serve/default.nix
rename to pkgs/by-name/so/soft-serve/package.nix
diff --git a/pkgs/tools/networking/softnet/default.nix b/pkgs/by-name/so/softnet/package.nix
similarity index 100%
rename from pkgs/tools/networking/softnet/default.nix
rename to pkgs/by-name/so/softnet/package.nix
diff --git a/pkgs/servers/web-apps/sogo/enable-activesync.patch b/pkgs/by-name/so/sogo/enable-activesync.patch
similarity index 100%
rename from pkgs/servers/web-apps/sogo/enable-activesync.patch
rename to pkgs/by-name/so/sogo/enable-activesync.patch
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/by-name/so/sogo/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/sogo/default.nix
rename to pkgs/by-name/so/sogo/package.nix
diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/by-name/so/sokol/package.nix
similarity index 100%
rename from pkgs/development/libraries/sokol/default.nix
rename to pkgs/by-name/so/sokol/package.nix
diff --git a/pkgs/development/libraries/sol2/default.nix b/pkgs/by-name/so/sol2/package.nix
similarity index 100%
rename from pkgs/development/libraries/sol2/default.nix
rename to pkgs/by-name/so/sol2/package.nix
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/by-name/so/solaar/package.nix
similarity index 100%
rename from pkgs/applications/misc/solaar/default.nix
rename to pkgs/by-name/so/solaar/package.nix
diff --git a/pkgs/by-name/so/solana-cli/Cargo.lock b/pkgs/by-name/so/solana-cli/Cargo.lock
index d50e156b347f..0194c34ed2c0 100644
--- a/pkgs/by-name/so/solana-cli/Cargo.lock
+++ b/pkgs/by-name/so/solana-cli/Cargo.lock
@@ -51,8 +51,7 @@ dependencies = [
 [[package]]
 name = "aes-gcm-siv"
 version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc"
+source = "git+https://github.com/RustCrypto/AEADs?rev=6105d7a5591aefa646a95d12b5e8d3f55a9214ef#6105d7a5591aefa646a95d12b5e8d3f55a9214ef"
 dependencies = [
  "aead",
  "aes",
@@ -76,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if 1.0.0",
  "getrandom 0.2.10",
@@ -164,9 +163,23 @@ checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+
+[[package]]
+name = "aquamarine"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760"
+dependencies = [
+ "include_dir",
+ "itertools",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "arc-swap"
@@ -431,13 +444,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -484,7 +497,7 @@ dependencies = [
  "matchit",
  "memchr",
  "mime",
- "percent-encoding 2.3.0",
+ "percent-encoding 2.3.1",
  "pin-project-lite",
  "rustversion",
  "serde",
@@ -554,9 +567,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"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -591,7 +604,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -617,9 +630,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 dependencies = [
  "serde",
 ]
@@ -710,7 +723,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
 dependencies = [
  "borsh-derive 0.10.3",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "borsh"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9897ef0f1bd2362169de6d7e436ea2237dc1085d7d1e4db75f4be34d86f309d1"
+dependencies = [
+ "borsh-derive 1.2.1",
+ "cfg_aliases",
 ]
 
 [[package]]
@@ -739,6 +762,20 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "borsh-derive"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478b41ff04256c5c8330f3dfdaaae2a5cc976a8e75088bafa4625b0d0208de8c"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 2.0.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "syn_derive",
+]
+
 [[package]]
 name = "borsh-derive-internal"
 version = "0.9.3"
@@ -865,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "bytecount"
-version = "0.6.4"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7"
+checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
 
 [[package]]
 name = "bytemuck"
@@ -964,7 +1001,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_json",
  "thiserror",
@@ -1016,6 +1053,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chrono"
 version = "0.4.31"
@@ -1190,15 +1233,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1356,11 +1399,10 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
 dependencies = [
- "cfg-if 1.0.0",
  "crossbeam-utils",
 ]
 
@@ -1378,7 +1420,7 @@ dependencies = [
 [[package]]
 name = "crossbeam-epoch"
 version = "0.9.5"
-source = "git+https://github.com/solana-labs/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
+source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -1389,9 +1431,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1454,19 +1496,18 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.1"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf"
+checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b"
 dependencies = [
  "nix 0.27.1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
+source = "git+https://github.com/anza-xyz/curve25519-dalek.git?rev=0382b672560493840f453f2a0e24c4a129abd3a4#0382b672560493840f453f2a0e24c4a129abd3a4"
 dependencies = [
  "byteorder",
  "digest 0.9.0",
@@ -1497,7 +1538,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1508,18 +1549,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.38",
-]
-
-[[package]]
-name = "dashmap"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if 1.0.0",
- "num_cpus",
- "rayon",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1529,10 +1559,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "lock_api",
  "once_cell",
  "parking_lot_core 0.9.8",
+ "rayon",
 ]
 
 [[package]]
@@ -1643,9 +1674,9 @@ dependencies = [
 
 [[package]]
 name = "dir-diff"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b"
+checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10"
 dependencies = [
  "walkdir",
 ]
@@ -1702,7 +1733,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1711,6 +1742,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "downcast"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+
 [[package]]
 name = "eager"
 version = "0.1.0"
@@ -1787,22 +1824,22 @@ dependencies = [
 
 [[package]]
 name = "enum-iterator"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689"
+checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94"
 dependencies = [
  "enum-iterator-derive",
 ]
 
 [[package]]
 name = "enum-iterator-derive"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
+checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1839,23 +1876,12 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[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]]
@@ -1989,18 +2015,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "percent-encoding 2.3.0",
+ "percent-encoding 2.3.1",
 ]
 
 [[package]]
-name = "fs-err"
-version = "2.9.0"
+name = "fragile"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "fs_extra"
@@ -2022,9 +2048,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2037,9 +2063,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2047,15 +2073,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+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",
@@ -2065,38 +2091,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures 0.1.31",
  "futures-channel",
@@ -2137,7 +2163,7 @@ dependencies = [
 
 [[package]]
 name = "gen-headers"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "regex",
@@ -2145,7 +2171,7 @@ dependencies = [
 
 [[package]]
 name = "gen-syscall-list"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "regex",
 ]
@@ -2238,7 +2264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240"
 dependencies = [
  "arc-swap",
- "futures 0.3.28",
+ "futures 0.3.30",
  "log",
  "reqwest",
  "serde",
@@ -2273,7 +2299,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util 0.7.1",
@@ -2319,14 +2345,14 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.5",
+ "ahash 0.8.7",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "headers"
@@ -2430,9 +2456,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -2470,9 +2496,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2485,7 +2511,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.5.5",
  "tokio",
  "tower-service",
  "tracing",
@@ -2499,7 +2525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
 dependencies = [
  "bytes",
- "futures 0.3.28",
+ "futures 0.3.30",
  "headers",
  "http",
  "hyper",
@@ -2581,9 +2607,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -2612,10 +2638,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "index_list"
-version = "0.2.7"
+name = "include_dir"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce"
+checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "index_list"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70891286cb8e844fdfcf1178b47569699f9e20b5ecc4b45a6240a64771444638"
 
 [[package]]
 name = "indexmap"
@@ -2629,12 +2674,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "rayon",
 ]
 
@@ -2703,9 +2748,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2728,7 +2773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a"
 dependencies = [
  "derive_more",
- "futures 0.3.28",
+ "futures 0.3.30",
  "jsonrpc-core",
  "jsonrpc-pubsub",
  "jsonrpc-server-utils",
@@ -2746,7 +2791,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "futures 0.3.28",
+ "futures 0.3.30",
  "futures-executor",
  "futures-util",
  "log",
@@ -2761,7 +2806,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
 dependencies = [
- "futures 0.3.28",
+ "futures 0.3.30",
  "jsonrpc-client-transports",
 ]
 
@@ -2783,7 +2828,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff"
 dependencies = [
- "futures 0.3.28",
+ "futures 0.3.30",
  "hyper",
  "jsonrpc-core",
  "jsonrpc-server-utils",
@@ -2799,7 +2844,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845"
 dependencies = [
- "futures 0.3.28",
+ "futures 0.3.30",
  "jsonrpc-core",
  "jsonrpc-server-utils",
  "log",
@@ -2814,7 +2859,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011"
 dependencies = [
- "futures 0.3.28",
+ "futures 0.3.30",
  "jsonrpc-core",
  "lazy_static",
  "log",
@@ -2830,7 +2875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
 dependencies = [
  "bytes",
- "futures 0.3.28",
+ "futures 0.3.30",
  "globset",
  "jsonrpc-core",
  "lazy_static",
@@ -2871,9 +2916,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libloading"
@@ -2985,9 +3030,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
 [[package]]
 name = "lock_api"
@@ -3150,6 +3195,33 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mockall"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
+dependencies = [
+ "cfg-if 1.0.0",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
+dependencies = [
+ "cfg-if 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "modular-bitfield"
 version = "0.11.2"
@@ -3225,7 +3297,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "cfg-if 1.0.0",
  "libc",
 ]
@@ -3312,7 +3384,7 @@ checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3388,11 +3460,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.7.1",
+ "num_enum_derive 0.7.2",
 ]
 
 [[package]]
@@ -3416,19 +3488,19 @@ dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3490,11 +3562,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.57"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -3522,18 +3594,18 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-src"
-version = "111.25.0+1.1.1t"
+version = "300.1.6+3.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.92"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
  "cc",
  "libc",
@@ -3555,7 +3627,7 @@ dependencies = [
  "futures-util",
  "js-sys",
  "lazy_static",
- "percent-encoding 2.3.0",
+ "percent-encoding 2.3.1",
  "pin-project",
  "rand 0.8.5",
  "thiserror",
@@ -3596,7 +3668,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
 dependencies = [
- "futures 0.3.28",
+ "futures 0.3.30",
  "libc",
  "log",
  "rand 0.7.3",
@@ -3699,9 +3771,9 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 
 [[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 = "percentage"
@@ -3797,9 +3869,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -3935,16 +4007,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058"
 dependencies = [
  "proc-macro2",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
+[[package]]
+name = "prio-graph"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6492a75ca57066a4479af45efa302bed448680182b0563f96300645d5f896097"
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 dependencies = [
- "toml",
+ "toml 0.5.8",
 ]
 
 [[package]]
@@ -3954,7 +4032,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
 dependencies = [
  "thiserror",
- "toml",
+ "toml 0.5.8",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
@@ -3983,28 +4070,28 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.7.5",
+ "regex-syntax",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -4066,7 +4153,7 @@ dependencies = [
 
 [[package]]
 name = "proto"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "protobuf-src",
  "tonic-build",
@@ -4087,7 +4174,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e"
 dependencies = [
- "percent-encoding 2.3.0",
+ "percent-encoding 2.3.1",
 ]
 
 [[package]]
@@ -4098,7 +4185,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4126,13 +4213,13 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1"
+checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
 dependencies = [
  "bytes",
  "rand 0.8.5",
- "ring",
+ "ring 0.16.20",
  "rustc-hash",
  "rustls",
  "rustls-native-certs",
@@ -4157,9 +4244,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -4283,15 +4370,15 @@ dependencies = [
 
 [[package]]
 name = "raptorq"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655b020bbf5c89791160a30f0d4706d8ec7aa5718d6a198f6df19c400e4f4470"
+checksum = "6c9cf9270cc5903afdef387f06ef1cd89fb77f45c357c2a425bae78b839fd866"
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
 dependencies = [
  "either",
  "rayon-core",
@@ -4299,9 +4386,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",
@@ -4309,7 +4396,7 @@ dependencies = [
 
 [[package]]
 name = "rbpf-cli"
-version = "1.17.31"
+version = "1.18.26"
 
 [[package]]
 name = "rcgen"
@@ -4318,7 +4405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
- "ring",
+ "ring 0.16.20",
  "time",
  "yasna",
 ]
@@ -4350,6 +4437,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.0"
@@ -4377,14 +4473,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick 1.0.1",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.4",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -4395,21 +4491,15 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
 dependencies = [
  "aho-corasick 1.0.1",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -4418,12 +4508,12 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
  "async-compression",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -4440,7 +4530,7 @@ dependencies = [
  "mime",
  "native-tls",
  "once_cell",
- "percent-encoding 2.3.0",
+ "percent-encoding 2.3.1",
  "pin-project-lite",
  "rustls",
  "rustls-pemfile 1.0.0",
@@ -4453,7 +4543,7 @@ dependencies = [
  "tokio-rustls",
  "tokio-util 0.7.1",
  "tower-service",
- "url 2.4.1",
+ "url 2.5.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -4471,11 +4561,25 @@ dependencies = [
  "libc",
  "once_cell",
  "spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e"
+dependencies = [
+ "cc",
+ "getrandom 0.2.10",
+ "libc",
+ "spin 0.9.2",
+ "untrusted 0.9.0",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "rocksdb"
 version = "0.21.0"
@@ -4497,13 +4601,13 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "7.2.0"
+version = "7.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
+checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f"
 dependencies = [
  "libc",
  "rtoolbox",
- "winapi 0.3.9",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4543,7 +4647,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.20",
+ "semver 1.0.21",
 ]
 
 [[package]]
@@ -4557,25 +4661,25 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.3"
+version = "0.38.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.3",
  "rustls-webpki",
  "sct",
 ]
@@ -4612,12 +4716,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.4"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.3",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -4695,8 +4799,8 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -4733,9 +4837,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 dependencies = [
  "serde",
 ]
@@ -4750,45 +4854,63 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde"
-version = "1.0.189"
+name = "seqlock"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "b5c67b6f14ecc5b86c66fa63d76b5092352678545a8a3cdae80aef5128371910"
+dependencies = [
+ "parking_lot 0.12.1",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.195"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.12"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4820,7 +4942,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4837,11 +4959,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.25"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -4854,8 +4976,8 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
 dependencies = [
- "dashmap 5.5.3",
- "futures 0.3.28",
+ "dashmap",
+ "futures 0.3.30",
  "lazy_static",
  "log",
  "parking_lot 0.12.1",
@@ -4870,7 +4992,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5090,7 +5212,7 @@ checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
  "base64 0.13.1",
  "bytes",
- "futures 0.3.28",
+ "futures 0.3.30",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -5099,11 +5221,11 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "Inflector",
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bs58",
  "bv",
@@ -5124,7 +5246,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-bench"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -5138,7 +5260,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-cluster-bench"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -5168,7 +5290,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-db"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "arrayref",
  "assert_matches",
@@ -5179,11 +5301,10 @@ dependencies = [
  "byteorder",
  "bzip2",
  "crossbeam-channel",
- "dashmap 4.0.2",
+ "dashmap",
  "ed25519-dalek",
  "flate2",
  "fnv",
- "fs-err",
  "im",
  "index_list",
  "itertools",
@@ -5194,10 +5315,10 @@ dependencies = [
  "memmap2",
  "memoffset 0.9.0",
  "modular-bitfield",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "num_cpus",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "ouroboros",
  "percentage",
  "qualifier_attr",
@@ -5206,8 +5327,10 @@ dependencies = [
  "rayon",
  "regex",
  "rustc_version 0.4.0",
+ "seqlock",
  "serde",
  "serde_derive",
+ "smallvec",
  "solana-accounts-db",
  "solana-bucket-map",
  "solana-config-program",
@@ -5216,6 +5339,7 @@ dependencies = [
  "solana-logger",
  "solana-measure",
  "solana-metrics",
+ "solana-nohash-hasher",
  "solana-program-runtime",
  "solana-rayon-threadlimit",
  "solana-sdk",
@@ -5227,17 +5351,18 @@ dependencies = [
  "strum_macros",
  "tar",
  "tempfile",
+ "test-case",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "bytemuck",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "rustc_version 0.4.0",
  "serde",
@@ -5251,7 +5376,7 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program-tests"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5262,7 +5387,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banking-bench"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 3.2.23",
  "crossbeam-channel",
@@ -5286,10 +5411,10 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "borsh 0.10.3",
- "futures 0.3.28",
+ "borsh 1.2.1",
+ "futures 0.3.30",
  "solana-banks-interface",
  "solana-banks-server",
  "solana-program",
@@ -5303,7 +5428,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "serde",
  "solana-sdk",
@@ -5312,11 +5437,11 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "crossbeam-channel",
- "futures 0.3.28",
+ "futures 0.3.30",
  "solana-accounts-db",
  "solana-banks-interface",
  "solana-client",
@@ -5330,7 +5455,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bench-streamer"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 3.2.23",
  "crossbeam-channel",
@@ -5341,7 +5466,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bench-tps"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "crossbeam-channel",
@@ -5349,7 +5474,7 @@ dependencies = [
  "rand 0.8.5",
  "rayon",
  "serde_json",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.30",
  "serial_test",
  "solana-clap-utils",
  "solana-cli-config",
@@ -5382,7 +5507,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bloom"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bv",
  "fnv",
@@ -5399,7 +5524,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5420,7 +5545,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program-tests"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5431,7 +5556,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bucket-map"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bv",
  "bytemuck",
@@ -5439,7 +5564,7 @@ dependencies = [
  "log",
  "memmap2",
  "modular-bitfield",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "rand 0.8.5",
  "rayon",
  "solana-logger",
@@ -5450,7 +5575,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-build-bpf"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "solana-logger",
@@ -5458,7 +5583,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-build-sbf"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_cmd",
  "bzip2",
@@ -5469,7 +5594,7 @@ dependencies = [
  "predicates",
  "regex",
  "reqwest",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serial_test",
  "solana-download-utils",
  "solana-logger",
@@ -5477,13 +5602,42 @@ dependencies = [
  "tar",
 ]
 
+[[package]]
+name = "solana-cargo-registry"
+version = "1.18.26"
+dependencies = [
+ "clap 2.33.3",
+ "flate2",
+ "hex",
+ "hyper",
+ "log",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "solana-clap-utils",
+ "solana-cli",
+ "solana-cli-config",
+ "solana-cli-output",
+ "solana-logger",
+ "solana-remote-wallet",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-sdk",
+ "solana-version",
+ "tar",
+ "tempfile",
+ "tokio",
+ "toml 0.8.8",
+]
+
 [[package]]
 name = "solana-cargo-test-bpf"
-version = "1.17.31"
+version = "1.18.26"
 
 [[package]]
 name = "solana-cargo-test-sbf"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "cargo_metadata",
  "clap 3.2.23",
@@ -5494,7 +5648,7 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "chrono",
@@ -5506,12 +5660,12 @@ dependencies = [
  "thiserror",
  "tiny-bip39",
  "uriparse",
- "url 2.4.1",
+ "url 2.5.0",
 ]
 
 [[package]]
 name = "solana-clap-v3-utils"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "chrono",
@@ -5524,12 +5678,12 @@ dependencies = [
  "thiserror",
  "tiny-bip39",
  "uriparse",
- "url 2.4.1",
+ "url 2.5.0",
 ]
 
 [[package]]
 name = "solana-cli"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5546,7 +5700,7 @@ dependencies = [
  "num-traits",
  "pretty-hex",
  "reqwest",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5563,6 +5717,7 @@ dependencies = [
  "solana-program-runtime",
  "solana-pubsub-client",
  "solana-remote-wallet",
+ "solana-rpc",
  "solana-rpc-client",
  "solana-rpc-client-api",
  "solana-rpc-client-nonce-utils",
@@ -5576,31 +5731,32 @@ dependencies = [
  "solana_rbpf",
  "spl-memo",
  "tempfile",
+ "test-case",
  "thiserror",
  "tiny-bip39",
 ]
 
 [[package]]
 name = "solana-cli-config"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "anyhow",
  "dirs-next",
  "lazy_static",
  "serde",
  "serde_derive",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.30",
  "solana-clap-utils",
  "solana-sdk",
- "url 2.4.1",
+ "url 2.5.0",
 ]
 
 [[package]]
 name = "solana-cli-output"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "Inflector",
- "base64 0.21.4",
+ "base64 0.21.7",
  "chrono",
  "clap 2.33.3",
  "console",
@@ -5608,7 +5764,7 @@ dependencies = [
  "humantime",
  "indicatif",
  "pretty-hex",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_json",
  "solana-account-decoder",
@@ -5623,15 +5779,15 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "async-trait",
  "bincode",
  "crossbeam-channel",
- "dashmap 4.0.2",
- "futures 0.3.28",
+ "dashmap",
+ "futures 0.3.30",
  "futures-util",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "indicatif",
  "log",
  "quinn",
@@ -5655,7 +5811,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client-test"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "futures-util",
  "rand 0.8.5",
@@ -5685,7 +5841,7 @@ dependencies = [
 
 [[package]]
 name = "solana-compute-budget-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -5693,7 +5849,7 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "chrono",
@@ -5706,13 +5862,13 @@ dependencies = [
 
 [[package]]
 name = "solana-connection-cache"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "async-trait",
  "bincode",
  "crossbeam-channel",
  "futures-util",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "indicatif",
  "log",
  "rand 0.8.5",
@@ -5730,27 +5886,28 @@ dependencies = [
 
 [[package]]
 name = "solana-core"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bs58",
  "bytes",
  "chrono",
  "crossbeam-channel",
- "dashmap 4.0.2",
+ "dashmap",
  "eager",
  "etcd-client",
  "fs_extra",
- "futures 0.3.28",
+ "futures 0.3.30",
  "histogram",
  "itertools",
  "lazy_static",
  "log",
  "lru",
  "min-max-heap",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
+ "prio-graph",
  "quinn",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -5795,9 +5952,11 @@ dependencies = [
  "solana-tpu-client",
  "solana-transaction-status",
  "solana-turbine",
+ "solana-unified-scheduler-pool",
  "solana-version",
  "solana-vote",
  "solana-vote-program",
+ "solana-wen-restart",
  "static_assertions",
  "strum",
  "strum_macros",
@@ -5813,7 +5972,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cost-model"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "lazy_static",
  "log",
@@ -5838,7 +5997,7 @@ dependencies = [
 
 [[package]]
 name = "solana-dos"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "clap 3.2.23",
@@ -5868,7 +6027,7 @@ dependencies = [
 
 [[package]]
 name = "solana-download-utils"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "console",
  "indicatif",
@@ -5880,7 +6039,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ed25519-program-tests"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "ed25519-dalek",
@@ -5891,7 +6050,7 @@ dependencies = [
 
 [[package]]
 name = "solana-entry"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5913,7 +6072,7 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5935,16 +6094,12 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "ahash 0.8.5",
- "bitflags 2.3.3",
- "blake3",
+ "bitflags 2.4.2",
  "block-buffer 0.10.4",
  "bs58",
  "bv",
- "byteorder",
- "cc",
  "either",
  "generic-array 0.14.7",
  "im",
@@ -5955,7 +6110,6 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "serde_json",
  "sha2 0.10.8",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -5965,25 +6119,25 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.0",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "solana-genesis"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "clap 2.33.3",
  "itertools",
  "serde",
  "serde_json",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.30",
  "solana-accounts-db",
  "solana-clap-utils",
  "solana-cli-config",
@@ -6000,7 +6154,7 @@ dependencies = [
 
 [[package]]
 name = "solana-genesis-utils"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "solana-accounts-db",
@@ -6011,7 +6165,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "solana-sdk",
@@ -6021,7 +6175,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-manager"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bs58",
  "crossbeam-channel",
@@ -6046,7 +6200,7 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -6054,7 +6208,7 @@ dependencies = [
  "clap 2.33.3",
  "crossbeam-channel",
  "flate2",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "itertools",
  "log",
  "lru",
@@ -6097,7 +6251,7 @@ dependencies = [
 
 [[package]]
 name = "solana-install"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "atty",
  "bincode",
@@ -6113,10 +6267,10 @@ dependencies = [
  "nix 0.26.4",
  "reqwest",
  "scopeguard",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_yaml 0.8.26",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.30",
  "solana-clap-utils",
  "solana-config-program",
  "solana-logger",
@@ -6125,14 +6279,14 @@ dependencies = [
  "solana-version",
  "tar",
  "tempfile",
- "url 2.4.1",
+ "url 2.5.0",
  "winapi 0.3.9",
  "winreg",
 ]
 
 [[package]]
 name = "solana-keygen"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bs58",
  "clap 3.2.23",
@@ -6149,27 +6303,29 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "bs58",
  "byteorder",
  "chrono",
  "chrono-humanize",
  "crossbeam-channel",
- "dashmap 4.0.2",
+ "dashmap",
  "fs_extra",
- "futures 0.3.28",
+ "futures 0.3.30",
  "itertools",
  "lazy_static",
  "libc",
  "log",
  "lru",
+ "mockall",
  "num_cpus",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "prost",
+ "qualifier_attr",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
@@ -6217,7 +6373,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger-tool"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_cmd",
  "bs58",
@@ -6226,8 +6382,8 @@ dependencies = [
  "clap 2.33.3",
  "crossbeam-channel",
  "csv",
- "dashmap 4.0.2",
- "futures 0.3.28",
+ "dashmap",
+ "futures 0.3.30",
  "histogram",
  "itertools",
  "log",
@@ -6257,16 +6413,18 @@ dependencies = [
  "solana-storage-bigtable",
  "solana-streamer",
  "solana-transaction-status",
+ "solana-unified-scheduler-pool",
  "solana-version",
  "solana-vote-program",
  "solana_rbpf",
+ "thiserror",
  "tikv-jemallocator",
  "tokio",
 ]
 
 [[package]]
 name = "solana-loader-v4-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "log",
@@ -6278,7 +6436,7 @@ dependencies = [
 
 [[package]]
 name = "solana-local-cluster"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "crossbeam-channel",
@@ -6317,7 +6475,7 @@ dependencies = [
 
 [[package]]
 name = "solana-log-analyzer"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "byte-unit",
  "clap 3.2.23",
@@ -6329,7 +6487,7 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -6338,7 +6496,7 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "solana-sdk",
@@ -6346,11 +6504,11 @@ dependencies = [
 
 [[package]]
 name = "solana-memory-management"
-version = "1.17.31"
+version = "1.18.26"
 
 [[package]]
 name = "solana-merkle-root-bench"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -6363,7 +6521,7 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-tree"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "fast-math",
  "hex",
@@ -6372,7 +6530,7 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "crossbeam-channel",
  "env_logger",
@@ -6388,7 +6546,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-shaper"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 3.2.23",
  "rand 0.8.5",
@@ -6399,7 +6557,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "clap 3.2.23",
@@ -6414,12 +6572,18 @@ dependencies = [
  "solana-sdk",
  "solana-version",
  "tokio",
- "url 2.4.1",
+ "url 2.5.0",
 ]
 
+[[package]]
+name = "solana-nohash-hasher"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
+
 [[package]]
 name = "solana-notifier"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "reqwest",
@@ -6429,9 +6593,9 @@ dependencies = [
 
 [[package]]
 name = "solana-perf"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "ahash 0.8.5",
+ "ahash 0.8.7",
  "assert_matches",
  "bincode",
  "bv",
@@ -6460,7 +6624,7 @@ dependencies = [
 
 [[package]]
 name = "solana-poh"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -6474,6 +6638,7 @@ dependencies = [
  "solana-measure",
  "solana-metrics",
  "solana-perf",
+ "solana-poh",
  "solana-runtime",
  "solana-sdk",
  "thiserror",
@@ -6481,7 +6646,7 @@ dependencies = [
 
 [[package]]
 name = "solana-poh-bench"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 3.2.23",
  "log",
@@ -6496,7 +6661,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -6505,12 +6670,13 @@ dependencies = [
  "ark-serialize",
  "array-bytes",
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "blake3",
  "borsh 0.10.3",
  "borsh 0.9.3",
+ "borsh 1.2.1",
  "bs58",
  "bv",
  "bytemuck",
@@ -6528,7 +6694,7 @@ dependencies = [
  "log",
  "memoffset 0.9.0",
  "num-bigint 0.4.4",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "parking_lot 0.12.1",
  "rand 0.8.5",
@@ -6553,10 +6719,10 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "eager",
  "enum-iterator",
@@ -6564,7 +6730,7 @@ dependencies = [
  "libc",
  "libsecp256k1",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "percentage",
  "rand 0.8.5",
@@ -6582,11 +6748,11 @@ dependencies = [
 
 [[package]]
 name = "solana-program-test"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "async-trait",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "chrono-humanize",
  "crossbeam-channel",
@@ -6611,14 +6777,14 @@ dependencies = [
 
 [[package]]
 name = "solana-pubsub-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
  "futures-util",
  "log",
  "reqwest",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_derive",
  "serde_json",
@@ -6630,17 +6796,17 @@ dependencies = [
  "tokio-stream",
  "tokio-tungstenite",
  "tungstenite",
- "url 2.4.1",
+ "url 2.5.0",
 ]
 
 [[package]]
 name = "solana-quic-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "async-mutex",
  "async-trait",
  "crossbeam-channel",
- "futures 0.3.28",
+ "futures 0.3.30",
  "itertools",
  "lazy_static",
  "log",
@@ -6663,7 +6829,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -6671,18 +6837,18 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "console",
  "dialoguer",
  "hidapi",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "parking_lot 0.12.1",
  "qstring",
- "semver 1.0.20",
+ "semver 1.0.21",
  "solana-sdk",
  "thiserror",
  "uriparse",
@@ -6690,13 +6856,13 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bs58",
  "crossbeam-channel",
- "dashmap 4.0.2",
+ "dashmap",
  "itertools",
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -6749,21 +6915,21 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "async-trait",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bs58",
  "crossbeam-channel",
- "futures 0.3.28",
+ "futures 0.3.30",
  "indicatif",
  "jsonrpc-core",
  "jsonrpc-http-server",
  "log",
  "reqwest",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_derive",
  "serde_json",
@@ -6778,13 +6944,13 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bs58",
  "jsonrpc-core",
  "reqwest",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_derive",
  "serde_json",
@@ -6798,11 +6964,11 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-nonce-utils"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "anyhow",
  "clap 2.33.3",
- "futures 0.3.28",
+ "futures 0.3.30",
  "serde_json",
  "solana-account-decoder",
  "solana-clap-utils",
@@ -6815,7 +6981,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-test"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "bs58",
@@ -6842,11 +7008,12 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
+ "aquamarine",
  "arrayref",
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "blake3",
  "bv",
@@ -6854,12 +7021,11 @@ dependencies = [
  "byteorder",
  "bzip2",
  "crossbeam-channel",
- "dashmap 4.0.2",
+ "dashmap",
  "dir-diff",
  "ed25519-dalek",
  "flate2",
  "fnv",
- "fs-err",
  "im",
  "index_list",
  "itertools",
@@ -6870,11 +7036,12 @@ dependencies = [
  "lz4",
  "memmap2",
  "memoffset 0.9.0",
+ "mockall",
  "modular-bitfield",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "num_cpus",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "ouroboros",
  "percentage",
  "qualifier_attr",
@@ -6886,7 +7053,6 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "siphasher",
  "solana-accounts-db",
  "solana-address-lookup-table-program",
  "solana-bpf-loader-program",
@@ -6923,16 +7089,30 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "solana-runtime-transaction"
+version = "1.18.26"
+dependencies = [
+ "bincode",
+ "log",
+ "rand 0.8.5",
+ "rustc_version 0.4.0",
+ "solana-program",
+ "solana-program-runtime",
+ "solana-sdk",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-sdk"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "anyhow",
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
- "bitflags 2.3.3",
- "borsh 0.10.3",
+ "bitflags 2.4.2",
+ "borsh 1.2.1",
  "bs58",
  "bytemuck",
  "byteorder",
@@ -6951,9 +7131,9 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "pbkdf2 0.11.0",
  "qstring",
  "qualifier_attr",
@@ -6968,6 +7148,7 @@ dependencies = [
  "serde_with",
  "sha2 0.10.8",
  "sha3 0.10.4",
+ "siphasher",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -6983,13 +7164,13 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bs58",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -7000,7 +7181,7 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-send-transaction-service"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -7015,7 +7196,7 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-accounts"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "solana-clap-utils",
@@ -7031,7 +7212,7 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7048,7 +7229,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "backoff",
  "bincode",
@@ -7056,7 +7237,7 @@ dependencies = [
  "bzip2",
  "enum-iterator",
  "flate2",
- "futures 0.3.28",
+ "futures 0.3.30",
  "goauth",
  "http",
  "hyper",
@@ -7080,7 +7261,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "bs58",
@@ -7096,7 +7277,7 @@ dependencies = [
 
 [[package]]
 name = "solana-store-tool"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -7108,7 +7289,7 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "async-channel",
@@ -7116,7 +7297,7 @@ dependencies = [
  "crossbeam-channel",
  "futures-util",
  "histogram",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "itertools",
  "libc",
  "log",
@@ -7141,7 +7322,7 @@ dependencies = [
 
 [[package]]
 name = "solana-system-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7155,9 +7336,9 @@ dependencies = [
 
 [[package]]
 name = "solana-test-validator"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "crossbeam-channel",
  "log",
@@ -7185,7 +7366,7 @@ dependencies = [
 
 [[package]]
 name = "solana-thin-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "log",
@@ -7199,7 +7380,7 @@ dependencies = [
 
 [[package]]
 name = "solana-tokens"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7208,7 +7389,7 @@ dependencies = [
  "console",
  "csv",
  "ctrlc",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "indicatif",
  "pickledb",
  "serde",
@@ -7232,12 +7413,12 @@ dependencies = [
 
 [[package]]
 name = "solana-tpu-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "async-trait",
  "bincode",
  "futures-util",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "indicatif",
  "log",
  "rayon",
@@ -7254,7 +7435,7 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-dos"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "clap 2.33.3",
@@ -7281,10 +7462,10 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "Inflector",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "borsh 0.10.3",
  "bs58",
@@ -7304,13 +7485,13 @@ dependencies = [
 
 [[package]]
 name = "solana-turbine"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
  "bytes",
  "crossbeam-channel",
- "futures 0.3.28",
+ "futures 0.3.30",
  "itertools",
  "log",
  "lru",
@@ -7335,13 +7516,14 @@ dependencies = [
  "solana-runtime",
  "solana-sdk",
  "solana-streamer",
+ "test-case",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "solana-udp-client"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -7352,9 +7534,27 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "solana-unified-scheduler-logic"
+version = "1.18.26"
+
+[[package]]
+name = "solana-unified-scheduler-pool"
+version = "1.18.26"
+dependencies = [
+ "assert_matches",
+ "solana-ledger",
+ "solana-logger",
+ "solana-program-runtime",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-unified-scheduler-logic",
+ "solana-vote",
+]
+
 [[package]]
 name = "solana-upload-perf"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "serde_json",
  "solana-metrics",
@@ -7362,7 +7562,7 @@ dependencies = [
 
 [[package]]
 name = "solana-validator"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "chrono",
  "clap 2.33.3",
@@ -7386,7 +7586,7 @@ dependencies = [
  "rayon",
  "serde",
  "serde_json",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.30",
  "signal-hook",
  "solana-account-decoder",
  "solana-accounts-db",
@@ -7426,11 +7626,11 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "log",
  "rustc_version 0.4.0",
- "semver 1.0.20",
+ "semver 1.0.21",
  "serde",
  "serde_derive",
  "solana-frozen-abi",
@@ -7440,7 +7640,7 @@ dependencies = [
 
 [[package]]
 name = "solana-vote"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -7459,12 +7659,12 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "assert_matches",
  "bincode",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "rustc_version 0.4.0",
  "serde",
@@ -7482,7 +7682,7 @@ dependencies = [
 
 [[package]]
 name = "solana-watchtower"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "clap 2.33.3",
  "humantime",
@@ -7499,9 +7699,31 @@ dependencies = [
  "solana-version",
 ]
 
+[[package]]
+name = "solana-wen-restart"
+version = "1.18.26"
+dependencies = [
+ "log",
+ "prost",
+ "prost-build",
+ "prost-types",
+ "protobuf-src",
+ "rustc_version 0.4.0",
+ "serial_test",
+ "solana-entry",
+ "solana-gossip",
+ "solana-ledger",
+ "solana-logger",
+ "solana-program",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-vote-program",
+]
+
 [[package]]
 name = "solana-zk-keygen"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bs58",
  "clap 3.2.23",
@@ -7520,12 +7742,12 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bytemuck",
  "criterion",
  "curve25519-dalek",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "solana-program-runtime",
  "solana-sdk",
@@ -7534,7 +7756,7 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program-tests"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "bytemuck",
  "curve25519-dalek",
@@ -7546,10 +7768,10 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.17.31"
+version = "1.18.26"
 dependencies = [
  "aes-gcm-siv",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bytemuck",
  "byteorder",
@@ -7558,7 +7780,7 @@ dependencies = [
  "itertools",
  "lazy_static",
  "merlin",
- "num-derive 0.3.3",
+ "num-derive 0.4.1",
  "num-traits",
  "rand 0.7.3",
  "serde",
@@ -7574,9 +7796,9 @@ dependencies = [
 
 [[package]]
 name = "solana_rbpf"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3"
+checksum = "da5d083187e3b3f453e140f292c09186881da8a02a7b5e27f645ee26de3d9cc5"
 dependencies = [
  "byteorder",
  "combine",
@@ -7649,7 +7871,7 @@ checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b"
 dependencies = [
  "quote",
  "spl-discriminator-syn",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -7661,7 +7883,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "syn 2.0.38",
+ "syn 2.0.48",
  "thiserror",
 ]
 
@@ -7719,7 +7941,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -7761,7 +7983,7 @@ dependencies = [
  "bytemuck",
  "num-derive 0.4.1",
  "num-traits",
- "num_enum 0.7.1",
+ "num_enum 0.7.2",
  "solana-program",
  "solana-security-txt",
  "solana-zk-token-sdk",
@@ -7839,9 +8061,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "stream-cancel"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b"
+checksum = "5f9fbf9bd71e4cf18d68a8a0951c0e5b7255920c0cd992c4ff51cddd6ef514a3"
 dependencies = [
  "futures-core",
  "pin-project",
@@ -7907,15 +8129,27 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.1"
@@ -8011,7 +8245,7 @@ checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80"
 dependencies = [
  "anyhow",
  "fnv",
- "futures 0.3.28",
+ "futures 0.3.30",
  "humantime",
  "opentelemetry",
  "pin-project",
@@ -8040,15 +8274,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -8068,9 +8302,9 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
 
 [[package]]
 name = "test-case"
-version = "3.2.1"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425"
+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
 dependencies = [
  "test-case-macros",
 ]
@@ -8085,7 +8319,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -8097,7 +8331,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
  "test-case-core",
 ]
 
@@ -8118,22 +8352,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -8237,7 +8471,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 [[package]]
 name = "tokio"
 version = "1.29.1"
-source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21"
+source = "git+https://github.com/anza-xyz/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21"
 dependencies = [
  "autocfg",
  "backtrace",
@@ -8266,11 +8500,11 @@ dependencies = [
 [[package]]
 name = "tokio-macros"
 version = "2.1.0"
-source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21"
+source = "git+https://github.com/anza-xyz/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -8374,6 +8608,51 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.21.0",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+dependencies = [
+ "indexmap 2.1.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tonic"
 version = "0.9.2"
@@ -8383,7 +8662,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bytes",
  "futures-core",
  "futures-util",
@@ -8392,7 +8671,7 @@ dependencies = [
  "http-body",
  "hyper",
  "hyper-timeout",
- "percent-encoding 2.3.0",
+ "percent-encoding 2.3.1",
  "pin-project",
  "prost",
  "rustls-pemfile 1.0.0",
@@ -8452,10 +8731,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
 dependencies = [
+ "cfg-if 1.0.0",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -8470,7 +8750,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -8534,7 +8814,7 @@ dependencies = [
  "rustls",
  "sha1",
  "thiserror",
- "url 2.4.1",
+ "url 2.5.0",
  "utf-8",
  "webpki-roots 0.24.0",
 ]
@@ -8620,9 +8900,9 @@ dependencies = [
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
 [[package]]
 name = "untrusted"
@@ -8630,6 +8910,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "uriparse"
 version = "0.6.4"
@@ -8653,13 +8939,13 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.4.0",
- "percent-encoding 2.3.0",
+ "idna 0.5.0",
+ "percent-encoding 2.3.1",
 ]
 
 [[package]]
@@ -8748,9 +9034,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -8758,16 +9044,16 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -8785,9 +9071,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -8795,22 +9081,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "web-sys"
@@ -8891,15 +9177,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -8910,18 +9187,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.2"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -8940,10 +9211,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+name = "windows-targets"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+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",
+]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -8952,10 +9232,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -8964,10 +9244,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+name = "windows_aarch64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -8976,10 +9256,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnu"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -8988,10 +9268,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+name = "windows_i686_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -9000,10 +9280,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+name = "windows_x86_64_gnu"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -9012,10 +9292,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -9023,6 +9303,21 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winnow"
+version = "0.5.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -9095,7 +9390,7 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -9115,7 +9410,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix
index 614be9acbc5f..710d6ec7c43a 100644
--- a/pkgs/by-name/so/solana-cli/package.nix
+++ b/pkgs/by-name/so/solana-cli/package.nix
@@ -31,8 +31,8 @@
   ]
 }:
 let
-  version = "1.17.31";
-  hash = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ=";
+  version = "1.18.26";
+  hash = "sha256-sJ0Zn5GMi64/S8zqomL/dYRVW8SOQWsP+bpcdatJC0A=";
   rocksdb = rocksdb_8_3;
 
   inherit (darwin.apple_sdk_11_0) Libsystem;
@@ -55,6 +55,8 @@ rustPlatform.buildRustPackage rec {
     outputHashes = {
       "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws=";
       "tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk=";
+      "aes-gcm-siv-0.10.3" = "sha256-N1ppxvew4B50JQWsC3xzP0X4jgyXZ5aOQ0oJMmArjW8=";
+      "curve25519-dalek-3.2.1" = "sha256-FuVNFuGCyHXqKqg+sn3hocZf1KMCI092Ohk7cvLPNjQ=";
     };
   };
 
@@ -83,8 +85,7 @@ rustPlatform.buildRustPackage rec {
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd solana \
       --bash <($out/bin/solana completion --shell bash) \
-      --fish <($out/bin/solana completion --shell fish) \
-      --zsh  <($out/bin/solana completion --shell zsh)
+      --fish <($out/bin/solana completion --shell fish)
 
     mkdir -p $out/bin/sdk/bpf
     cp -a ./sdk/bpf/* $out/bin/sdk/bpf/
diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/by-name/so/solarc-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/solarc/default.nix
rename to pkgs/by-name/so/solarc-gtk-theme/package.nix
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/by-name/so/solc/package.nix
similarity index 100%
rename from pkgs/development/compilers/solc/default.nix
rename to pkgs/by-name/so/solc/package.nix
diff --git a/pkgs/games/solicurses/default.nix b/pkgs/by-name/so/solicurses/package.nix
similarity index 100%
rename from pkgs/games/solicurses/default.nix
rename to pkgs/by-name/so/solicurses/package.nix
diff --git a/pkgs/development/interpreters/sollya/default.nix b/pkgs/by-name/so/sollya/package.nix
similarity index 100%
rename from pkgs/development/interpreters/sollya/default.nix
rename to pkgs/by-name/so/sollya/package.nix
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/by-name/so/solvespace/package.nix
similarity index 100%
rename from pkgs/applications/graphics/solvespace/default.nix
rename to pkgs/by-name/so/solvespace/package.nix
diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/by-name/so/somafm-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/somafm-cli/default.nix
rename to pkgs/by-name/so/somafm-cli/package.nix
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/by-name/so/somatic-sniper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/somatic-sniper/default.nix
rename to pkgs/by-name/so/somatic-sniper/package.nix
diff --git a/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch b/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
similarity index 100%
rename from pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch
rename to pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
diff --git a/pkgs/applications/misc/somebar/default.nix b/pkgs/by-name/so/somebar/package.nix
similarity index 100%
rename from pkgs/applications/misc/somebar/default.nix
rename to pkgs/by-name/so/somebar/package.nix
diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix
new file mode 100644
index 000000000000..94c03ac15530
--- /dev/null
+++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  coreutils,
+  fetchFromGitHub,
+  jre,
+  libarchive,
+  makeWrapper,
+  maven,
+  nix-update-script,
+}:
+
+maven.buildMavenPackage rec {
+  pname = "sonar-scanner-cli";
+  version = "6.2.1.4610";
+
+  src = fetchFromGitHub {
+    owner = "SonarSource";
+    repo = "sonar-scanner-cli";
+    rev = "refs/tags/${version}";
+    hash = "sha256-k1gZO3h6ZGwxJNQ5QwUH96aDPGpJuEn6HYUsYOpqo+g=";
+  };
+
+  mvnHash = "sha256-RNWE9wjX2CP6G/Hoh/vJExUkTEsSh5D+1PAMZ9TuIh0=";
+
+  mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
+
+  nativeBuildInputs = [
+    # For bsdtar (name is a misnomer since it handles multiple archive formats) to extract nested directories from .zip files.
+    libarchive
+    makeWrapper
+  ];
+
+  doCheck = false;
+
+  # The .zip file with the programs is placed at "target/sonar-scanner-{project.version}.zip".
+  #
+  # To compute this .zip file path directly, we need to get the project version from the project's pom.xml.
+  #
+  # Parsing pom.xml is unsafe because project versions can be set dynamically. We need to use maven-help-plugin to get the evaluated value instead.
+  #
+  # Network isolation, however, prevents Maven from downloading packages in our shell script so we can't do this:
+  #
+  #   MAVEN_PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.4.1:evaluate \
+  #     -Dmaven.repo.local=.m2 \
+  #     -Dexpression=project.version \
+  #     -DforceStdout \
+  #     --quiet)
+  #
+  # We'll use wildcard expansion instead to find (what should be) the only .zip file in the "target" directory.
+  installPhase = ''
+    mkdir $out
+
+    FILES=(target/sonar-scanner-*.zip)
+    bsdtar --extract --file ''${FILES[0]} --strip-components 1 --directory $out
+
+    wrapProgram $out/bin/sonar-scanner \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          jre
+        ]
+      } \
+      --set JAVA_HOME ${jre}
+
+    wrapProgram $out/bin/sonar-scanner-debug \
+      --prefix PATH : ${lib.makeBinPath [ coreutils ]}
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Scanner CLI for SonarQube and SonarCloud";
+    homepage = "https://github.com/SonarSource/sonar-scanner-cli";
+    license = lib.licenses.lgpl3Only;
+    mainProgram = "sonar-scanner";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ peterromfeldhk ];
+  };
+}
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/by-name/so/sonata/package.nix
similarity index 100%
rename from pkgs/applications/audio/sonata/default.nix
rename to pkgs/by-name/so/sonata/package.nix
diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/by-name/so/songrec/package.nix
similarity index 100%
rename from pkgs/applications/audio/songrec/default.nix
rename to pkgs/by-name/so/songrec/package.nix
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/by-name/so/sonic/package.nix
similarity index 100%
rename from pkgs/development/libraries/sonic/default.nix
rename to pkgs/by-name/so/sonic/package.nix
diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix
new file mode 100644
index 000000000000..54bbacc847ff
--- /dev/null
+++ b/pkgs/by-name/so/sonivox/package.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "sonivox";
+  version = "3.6.13";
+
+  src = fetchFromGitHub {
+    owner = "pedrolcl";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-QhXMmJbyqDxSJmT847Qbg1jbU3gLFsJ/FWVTy7MV2fE=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    homepage = "https://github.com/pedrolcl/sonivox";
+    description = "MIDI synthesizer library";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/by-name/so/sonixd/package.nix
similarity index 100%
rename from pkgs/applications/audio/sonixd/default.nix
rename to pkgs/by-name/so/sonixd/package.nix
diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/by-name/so/sonobus/package.nix
similarity index 100%
rename from pkgs/applications/audio/sonobus/default.nix
rename to pkgs/by-name/so/sonobus/package.nix
diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/by-name/so/sonota/package.nix
similarity index 100%
rename from pkgs/tools/misc/sonota/default.nix
rename to pkgs/by-name/so/sonota/package.nix
diff --git a/pkgs/tools/misc/sonota/set_resource_path.patch b/pkgs/by-name/so/sonota/set_resource_path.patch
similarity index 100%
rename from pkgs/tools/misc/sonota/set_resource_path.patch
rename to pkgs/by-name/so/sonota/set_resource_path.patch
diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/by-name/so/sony-headphones-client/package.nix
similarity index 100%
rename from pkgs/applications/audio/sony-headphones-client/default.nix
rename to pkgs/by-name/so/sony-headphones-client/package.nix
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/by-name/so/sooperlooper/package.nix
similarity index 100%
rename from pkgs/applications/audio/sooperlooper/default.nix
rename to pkgs/by-name/so/sooperlooper/package.nix
diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/by-name/so/sope/package.nix
similarity index 100%
rename from pkgs/development/libraries/sope/default.nix
rename to pkgs/by-name/so/sope/package.nix
diff --git a/pkgs/tools/security/sops/bash_autocomplete b/pkgs/by-name/so/sops/bash_autocomplete
similarity index 100%
rename from pkgs/tools/security/sops/bash_autocomplete
rename to pkgs/by-name/so/sops/bash_autocomplete
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/by-name/so/sops/package.nix
similarity index 100%
rename from pkgs/tools/security/sops/default.nix
rename to pkgs/by-name/so/sops/package.nix
diff --git a/pkgs/tools/security/sops/zsh_autocomplete b/pkgs/by-name/so/sops/zsh_autocomplete
similarity index 100%
rename from pkgs/tools/security/sops/zsh_autocomplete
rename to pkgs/by-name/so/sops/zsh_autocomplete
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/by-name/so/sorcer/package.nix
similarity index 100%
rename from pkgs/applications/audio/sorcer/default.nix
rename to pkgs/by-name/so/sorcer/package.nix
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/by-name/so/sord/package.nix
similarity index 100%
rename from pkgs/development/libraries/sord/default.nix
rename to pkgs/by-name/so/sord/package.nix
diff --git a/pkgs/tools/text/sorted-grep/default.nix b/pkgs/by-name/so/sorted-grep/package.nix
similarity index 100%
rename from pkgs/tools/text/sorted-grep/default.nix
rename to pkgs/by-name/so/sorted-grep/package.nix
diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/by-name/so/sortmerna/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/sortmerna/default.nix
rename to pkgs/by-name/so/sortmerna/package.nix
diff --git a/pkgs/data/fonts/sorts-mill-goudy/default.nix b/pkgs/by-name/so/sorts-mill-goudy/package.nix
similarity index 100%
rename from pkgs/data/fonts/sorts-mill-goudy/default.nix
rename to pkgs/by-name/so/sorts-mill-goudy/package.nix
diff --git a/pkgs/development/compilers/souffle/includes.patch b/pkgs/by-name/so/souffle/includes.patch
similarity index 100%
rename from pkgs/development/compilers/souffle/includes.patch
rename to pkgs/by-name/so/souffle/includes.patch
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/by-name/so/souffle/package.nix
similarity index 100%
rename from pkgs/development/compilers/souffle/default.nix
rename to pkgs/by-name/so/souffle/package.nix
diff --git a/pkgs/development/compilers/souffle/tests.nix b/pkgs/by-name/so/souffle/tests.nix
similarity index 100%
rename from pkgs/development/compilers/souffle/tests.nix
rename to pkgs/by-name/so/souffle/tests.nix
diff --git a/pkgs/development/compilers/souffle/threads.patch b/pkgs/by-name/so/souffle/threads.patch
similarity index 100%
rename from pkgs/development/compilers/souffle/threads.patch
rename to pkgs/by-name/so/souffle/threads.patch
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/by-name/so/sound-juicer/package.nix
similarity index 100%
rename from pkgs/applications/audio/sound-juicer/default.nix
rename to pkgs/by-name/so/sound-juicer/package.nix
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/by-name/so/sound-theme-freedesktop/package.nix
similarity index 100%
rename from pkgs/data/misc/sound-theme-freedesktop/default.nix
rename to pkgs/by-name/so/sound-theme-freedesktop/package.nix
diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/by-name/so/soundconverter/package.nix
similarity index 100%
rename from pkgs/applications/audio/soundconverter/default.nix
rename to pkgs/by-name/so/soundconverter/package.nix
diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/by-name/so/soundfont-fluid/package.nix
similarity index 100%
rename from pkgs/data/soundfonts/fluid/default.nix
rename to pkgs/by-name/so/soundfont-fluid/package.nix
diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/by-name/so/soundfont-generaluser/package.nix
similarity index 100%
rename from pkgs/data/soundfonts/generaluser/default.nix
rename to pkgs/by-name/so/soundfont-generaluser/package.nix
diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/by-name/so/soundfont-ydp-grand/package.nix
similarity index 100%
rename from pkgs/data/soundfonts/ydp-grand/default.nix
rename to pkgs/by-name/so/soundfont-ydp-grand/package.nix
diff --git a/pkgs/applications/radio/soundmodem/matFix.patch b/pkgs/by-name/so/soundmodem/matFix.patch
similarity index 100%
rename from pkgs/applications/radio/soundmodem/matFix.patch
rename to pkgs/by-name/so/soundmodem/matFix.patch
diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/by-name/so/soundmodem/package.nix
similarity index 100%
rename from pkgs/applications/radio/soundmodem/default.nix
rename to pkgs/by-name/so/soundmodem/package.nix
diff --git a/pkgs/applications/audio/soundsource/default.nix b/pkgs/by-name/so/soundsource/package.nix
similarity index 100%
rename from pkgs/applications/audio/soundsource/default.nix
rename to pkgs/by-name/so/soundsource/package.nix
diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/by-name/so/soundtouch/package.nix
similarity index 100%
rename from pkgs/development/libraries/soundtouch/default.nix
rename to pkgs/by-name/so/soundtouch/package.nix
diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/by-name/so/soundtracker/package.nix
similarity index 100%
rename from pkgs/applications/audio/soundtracker/default.nix
rename to pkgs/by-name/so/soundtracker/package.nix
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/by-name/so/source-code-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-code-pro/default.nix
rename to pkgs/by-name/so/source-code-pro/package.nix
diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/by-name/so/source-han-code-jp/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-han-code-jp/default.nix
rename to pkgs/by-name/so/source-han-code-jp/package.nix
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/by-name/so/source-sans-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-sans-pro/default.nix
rename to pkgs/by-name/so/source-sans-pro/package.nix
diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/by-name/so/source-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-sans/default.nix
rename to pkgs/by-name/so/source-sans/package.nix
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/by-name/so/source-serif-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-serif-pro/default.nix
rename to pkgs/by-name/so/source-serif-pro/package.nix
diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/by-name/so/source-serif/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-serif/default.nix
rename to pkgs/by-name/so/source-serif/package.nix
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/by-name/so/sourceHighlight/package.nix
similarity index 100%
rename from pkgs/tools/text/source-highlight/default.nix
rename to pkgs/by-name/so/sourceHighlight/package.nix
diff --git a/pkgs/applications/misc/audio/soxr/arm64-check.patch b/pkgs/by-name/so/soxr/arm64-check.patch
similarity index 100%
rename from pkgs/applications/misc/audio/soxr/arm64-check.patch
rename to pkgs/by-name/so/soxr/arm64-check.patch
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/by-name/so/soxr/package.nix
similarity index 100%
rename from pkgs/applications/misc/audio/soxr/default.nix
rename to pkgs/by-name/so/soxr/package.nix
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/by-name/so/soxt/package.nix
similarity index 100%
rename from pkgs/development/libraries/soxt/default.nix
rename to pkgs/by-name/so/soxt/package.nix
diff --git a/pkgs/servers/sozu/default.nix b/pkgs/by-name/so/sozu/package.nix
similarity index 100%
rename from pkgs/servers/sozu/default.nix
rename to pkgs/by-name/so/sozu/package.nix
diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/by-name/sp/space-orbit/package.nix
similarity index 100%
rename from pkgs/games/space-orbit/default.nix
rename to pkgs/by-name/sp/space-orbit/package.nix
diff --git a/pkgs/applications/file-managers/spacefm/glibc-fix.patch b/pkgs/by-name/sp/spaceFM/glibc-fix.patch
similarity index 100%
rename from pkgs/applications/file-managers/spacefm/glibc-fix.patch
rename to pkgs/by-name/sp/spaceFM/glibc-fix.patch
diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/by-name/sp/spaceFM/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/spacefm/default.nix
rename to pkgs/by-name/sp/spaceFM/package.nix
diff --git a/pkgs/applications/file-managers/spacefm/x11-only.patch b/pkgs/by-name/sp/spaceFM/x11-only.patch
similarity index 100%
rename from pkgs/applications/file-managers/spacefm/x11-only.patch
rename to pkgs/by-name/sp/spaceFM/x11-only.patch
diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix
new file mode 100644
index 000000000000..535b8d5876d8
--- /dev/null
+++ b/pkgs/by-name/sp/spacebar/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  apple-sdk_12,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "spacebar";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "cmacrae";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
+  };
+
+  buildInputs = [
+    apple-sdk_12
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1/
+    cp ./bin/spacebar $out/bin/spacebar
+    cp ./doc/spacebar.1 $out/share/man/man1/spacebar.1
+  '';
+
+  meta = with lib; {
+    description = "Minimal status bar for macOS";
+    homepage = "https://github.com/cmacrae/spacebar";
+    platforms = platforms.darwin;
+    maintainers = [ maintainers.cmacrae ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/by-name/sp/spacenav-cube-example/package.nix
similarity index 100%
rename from pkgs/applications/misc/spacenav-cube-example/default.nix
rename to pkgs/by-name/sp/spacenav-cube-example/package.nix
diff --git a/pkgs/tools/misc/spacer/default.nix b/pkgs/by-name/sp/spacer/package.nix
similarity index 100%
rename from pkgs/tools/misc/spacer/default.nix
rename to pkgs/by-name/sp/spacer/package.nix
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/spaceship-prompt/default.nix
rename to pkgs/by-name/sp/spaceship-prompt/package.nix
diff --git a/pkgs/applications/editors/spacevim/helptags.patch b/pkgs/by-name/sp/spacevim/helptags.patch
similarity index 100%
rename from pkgs/applications/editors/spacevim/helptags.patch
rename to pkgs/by-name/sp/spacevim/helptags.patch
diff --git a/pkgs/applications/editors/spacevim/init.nix b/pkgs/by-name/sp/spacevim/init.nix
similarity index 100%
rename from pkgs/applications/editors/spacevim/init.nix
rename to pkgs/by-name/sp/spacevim/init.nix
diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/by-name/sp/spacevim/package.nix
similarity index 100%
rename from pkgs/applications/editors/spacevim/default.nix
rename to pkgs/by-name/sp/spacevim/package.nix
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/by-name/sp/spamassassin/package.nix
similarity index 100%
rename from pkgs/servers/mail/spamassassin/default.nix
rename to pkgs/by-name/sp/spamassassin/package.nix
diff --git a/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch b/pkgs/by-name/sp/spamassassin/sa_compile-use-perl5lib.patch
similarity index 100%
rename from pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch
rename to pkgs/by-name/sp/spamassassin/sa_compile-use-perl5lib.patch
diff --git a/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch b/pkgs/by-name/sp/spamassassin/satest-no-clean-path.patch
similarity index 100%
rename from pkgs/servers/mail/spamassassin/satest-no-clean-path.patch
rename to pkgs/by-name/sp/spamassassin/satest-no-clean-path.patch
diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/by-name/sp/span-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/span-lite/default.nix
rename to pkgs/by-name/sp/span-lite/package.nix
diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/by-name/sp/sparkleshare/package.nix
similarity index 100%
rename from pkgs/applications/version-management/sparkleshare/default.nix
rename to pkgs/by-name/sp/sparkleshare/package.nix
diff --git a/pkgs/development/libraries/sparrow3d/default.nix b/pkgs/by-name/sp/sparrow3d/package.nix
similarity index 100%
rename from pkgs/development/libraries/sparrow3d/default.nix
rename to pkgs/by-name/sp/sparrow3d/package.nix
diff --git a/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in b/pkgs/by-name/sp/sparrow3d/sparrow3d.pc.in
similarity index 100%
rename from pkgs/development/libraries/sparrow3d/sparrow3d.pc.in
rename to pkgs/by-name/sp/sparrow3d/sparrow3d.pc.in
diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/by-name/sp/sparsehash/package.nix
similarity index 100%
rename from pkgs/development/libraries/sparsehash/default.nix
rename to pkgs/by-name/sp/sparsehash/package.nix
diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/by-name/sp/spasm-ng/package.nix
similarity index 100%
rename from pkgs/development/compilers/spasm-ng/default.nix
rename to pkgs/by-name/sp/spasm-ng/package.nix
diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/by-name/sp/spatialite_tools/package.nix
similarity index 100%
rename from pkgs/applications/gis/spatialite-tools/default.nix
rename to pkgs/by-name/sp/spatialite_tools/package.nix
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/by-name/sp/spawn_fcgi/package.nix
similarity index 100%
rename from pkgs/servers/http/spawn-fcgi/default.nix
rename to pkgs/by-name/sp/spawn_fcgi/package.nix
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/by-name/sp/spdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/spdk/default.nix
rename to pkgs/by-name/sp/spdk/package.nix
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/by-name/sp/spdlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/spdlog/default.nix
rename to pkgs/by-name/sp/spdlog/package.nix
diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/by-name/sp/spdx-license-list-data/package.nix
similarity index 100%
rename from pkgs/data/misc/spdx-license-list-data/default.nix
rename to pkgs/by-name/sp/spdx-license-list-data/package.nix
diff --git a/pkgs/development/tools/rust/specr-transpile/default.nix b/pkgs/by-name/sp/specr-transpile/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/specr-transpile/default.nix
rename to pkgs/by-name/sp/specr-transpile/package.nix
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/by-name/sp/spectmorph/package.nix
similarity index 100%
rename from pkgs/applications/audio/spectmorph/default.nix
rename to pkgs/by-name/sp/spectmorph/package.nix
diff --git a/pkgs/development/libraries/spectra/default.nix b/pkgs/by-name/sp/spectra/package.nix
similarity index 100%
rename from pkgs/development/libraries/spectra/default.nix
rename to pkgs/by-name/sp/spectra/package.nix
diff --git a/pkgs/tools/security/spectre-cli/default.nix b/pkgs/by-name/sp/spectre-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/spectre-cli/default.nix
rename to pkgs/by-name/sp/spectre-cli/package.nix
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
similarity index 100%
rename from pkgs/tools/security/spectre-meltdown-checker/default.nix
rename to pkgs/by-name/sp/spectre-meltdown-checker/package.nix
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/by-name/sp/spectrojack/package.nix
similarity index 100%
rename from pkgs/applications/audio/spectrojack/default.nix
rename to pkgs/by-name/sp/spectrojack/package.nix
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/by-name/sp/spectrwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/spectrwm/default.nix
rename to pkgs/by-name/sp/spectrwm/package.nix
diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/by-name/sp/speech-denoiser/package.nix
similarity index 100%
rename from pkgs/applications/audio/speech-denoiser/default.nix
rename to pkgs/by-name/sp/speech-denoiser/package.nix
diff --git a/pkgs/development/libraries/speechd/fix-mbrola-paths.patch b/pkgs/by-name/sp/speechd/fix-mbrola-paths.patch
similarity index 100%
rename from pkgs/development/libraries/speechd/fix-mbrola-paths.patch
rename to pkgs/by-name/sp/speechd/fix-mbrola-paths.patch
diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/by-name/sp/speechd/fix-paths.patch
similarity index 100%
rename from pkgs/development/libraries/speechd/fix-paths.patch
rename to pkgs/by-name/sp/speechd/fix-paths.patch
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/by-name/sp/speechd/package.nix
similarity index 100%
rename from pkgs/development/libraries/speechd/default.nix
rename to pkgs/by-name/sp/speechd/package.nix
diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/by-name/sp/speedread/package.nix
similarity index 100%
rename from pkgs/applications/misc/speedread/default.nix
rename to pkgs/by-name/sp/speedread/package.nix
diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/by-name/sp/speedtest-go/package.nix
similarity index 100%
rename from pkgs/tools/networking/speedtest-go/default.nix
rename to pkgs/by-name/sp/speedtest-go/package.nix
diff --git a/pkgs/tools/networking/speedtest-rs/default.nix b/pkgs/by-name/sp/speedtest-rs/package.nix
similarity index 100%
rename from pkgs/tools/networking/speedtest-rs/default.nix
rename to pkgs/by-name/sp/speedtest-rs/package.nix
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/by-name/sp/sphinxsearch/package.nix
similarity index 100%
rename from pkgs/servers/search/sphinxsearch/default.nix
rename to pkgs/by-name/sp/sphinxsearch/package.nix
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/by-name/sp/spice-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/spice-gtk/default.nix
rename to pkgs/by-name/sp/spice-gtk/package.nix
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/by-name/sp/spice-protocol/package.nix
similarity index 100%
rename from pkgs/development/libraries/spice-protocol/default.nix
rename to pkgs/by-name/sp/spice-protocol/package.nix
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/by-name/sp/spice-up/package.nix
similarity index 100%
rename from pkgs/applications/office/spice-up/default.nix
rename to pkgs/by-name/sp/spice-up/package.nix
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/by-name/sp/spice-vdagent/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/spice-vdagent/default.nix
rename to pkgs/by-name/sp/spice-vdagent/package.nix
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/by-name/sp/spice/package.nix
similarity index 100%
rename from pkgs/development/libraries/spice/default.nix
rename to pkgs/by-name/sp/spice/package.nix
diff --git a/pkgs/development/libraries/spice/remove-rt-on-darwin.patch b/pkgs/by-name/sp/spice/remove-rt-on-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/spice/remove-rt-on-darwin.patch
rename to pkgs/by-name/sp/spice/remove-rt-on-darwin.patch
diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
new file mode 100644
index 000000000000..6199fad8e637
--- /dev/null
+++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, makeWrapper
+, python3
+, bison
+, flex
+, zlib
+, apple-sdk_11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "spicy";
+  version = "1.11.3";
+
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "spicy";
+    rev = "v${version}";
+    hash = "sha256-SKhNBqZRgeN2cZZ2lv/IsOqaa5LY666OlICewN/iPVA=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    makeWrapper
+    python3
+  ];
+
+  buildInputs = [
+    flex
+    zlib
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
+  ];
+
+  postPatch = ''
+    patchShebangs scripts tests/scripts
+  '';
+
+  cmakeFlags = [
+    "-DHILTI_DEV_PRECOMPILE_HEADERS=OFF"
+  ];
+
+  preFixup = ''
+    for b in $out/bin/*
+      do wrapProgram "$b" --prefix PATH : "${lib.makeBinPath [ bison flex ]}"
+    done
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/zeek/spicy";
+    description = "C++ parser generator for dissecting protocols & files";
+    longDescription = ''
+      Spicy is a parser generator that makes it easy to create robust C++
+      parsers for network protocols, file formats, and more. Spicy is a bit
+      like a "yacc for protocols", but it's much more than that: It's an
+      all-in-one system enabling developers to write attributed grammars that
+      describe both syntax and semantics of an input format using a single,
+      unified language. Think of Spicy as a domain-specific scripting language
+      for all your parsing needs.
+    '';
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ tobim ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/spicy/default.nix b/pkgs/by-name/sp/spicy/package.nix
similarity index 100%
rename from pkgs/development/tools/spicy/default.nix
rename to pkgs/by-name/sp/spicy/package.nix
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/by-name/sp/spideroak/package.nix
similarity index 100%
rename from pkgs/applications/networking/spideroak/default.nix
rename to pkgs/by-name/sp/spideroak/package.nix
diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/by-name/sp/spike/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/spike/default.nix
rename to pkgs/by-name/sp/spike/package.nix
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/by-name/sp/spin/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/spin/default.nix
rename to pkgs/by-name/sp/spin/package.nix
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/by-name/sp/spiped/package.nix
similarity index 100%
rename from pkgs/tools/networking/spiped/default.nix
rename to pkgs/by-name/sp/spiped/package.nix
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
new file mode 100644
index 000000000000..c1905d7411c8
--- /dev/null
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -0,0 +1,37 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "spire";
+  version = "1.11.0";
+
+  outputs = [ "out" "agent" "server" ];
+
+  src = fetchFromGitHub {
+    owner = "spiffe";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-0L3RRCItRzgt0RBhTbqx0Myg3UlP1JNPibwSDfx8+oI=";
+  };
+
+  vendorHash = "sha256-hvgJvDv4rnpS3T4EOgQBjMp59O6fAPK3AD1eKvplJi4=";
+
+  subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
+
+  # Usually either the agent or server is needed for a given use case, but not both
+  postInstall = ''
+    mkdir -vp $agent/bin $server/bin
+    mv -v $out/bin/spire-agent $agent/bin/
+    mv -v $out/bin/spire-server $server/bin/
+
+    ln -vs $agent/bin/spire-agent $out/bin/spire-agent
+    ln -vs $server/bin/spire-server $out/bin/spire-server
+  '';
+
+  meta = with lib; {
+    description = "SPIFFE Runtime Environment";
+    homepage = "https://github.com/spiffe/spire";
+    changelog = "https://github.com/spiffe/spire/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fkautz ];
+  };
+}
diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix
new file mode 100644
index 000000000000..7115a09bd8e9
--- /dev/null
+++ b/pkgs/by-name/sp/spirv-cross/package.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, cmake, python3 }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "spirv-cross";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Cross";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-HKEh/UQzDQEOvJGHQlM6kEYVZrMaUBOcOGjjHWXSPoo=";
+  };
+
+  nativeBuildInputs = [ cmake python3 ];
+
+  postFixup = ''
+    substituteInPlace $out/lib/pkgconfig/*.pc \
+      --replace '=''${prefix}//' '=/'
+  '';
+
+  meta = with lib; {
+    description = "Tool designed for parsing and converting SPIR-V to other shader languages";
+    homepage = "https://github.com/KhronosGroup/SPIRV-Cross";
+    changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${finalAttrs.version}";
+    platforms = platforms.all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ Flakebi ];
+    mainProgram = "spirv-cross";
+  };
+})
diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix
new file mode 100644
index 000000000000..837967827f31
--- /dev/null
+++ b/pkgs/by-name/sp/spirv-headers/package.nix
@@ -0,0 +1,22 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "spirv-headers";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Headers";
+    rev = "vulkan-sdk-${version}";
+    hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "Machine-readable components of the Khronos SPIR-V Registry";
+    homepage = "https://github.com/KhronosGroup/SPIRV-Headers";
+    license = licenses.mit;
+    maintainers = [ maintainers.ralith ];
+  };
+}
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
similarity index 100%
rename from pkgs/development/compilers/spirv-llvm-translator/default.nix
rename to pkgs/by-name/sp/spirv-llvm-translator/package.nix
diff --git a/pkgs/development/tools/spirv-tools/no-shared-libs.patch b/pkgs/by-name/sp/spirv-tools/no-shared-libs.patch
similarity index 100%
rename from pkgs/development/tools/spirv-tools/no-shared-libs.patch
rename to pkgs/by-name/sp/spirv-tools/no-shared-libs.patch
diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix
new file mode 100644
index 000000000000..b9d4ba122748
--- /dev/null
+++ b/pkgs/by-name/sp/spirv-tools/package.nix
@@ -0,0 +1,50 @@
+{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
+
+stdenv.mkDerivation rec {
+  pname = "spirv-tools";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Tools";
+    rev = "vulkan-sdk-${version}";
+    hash = "sha256-ExseInoB/mMtVUOf0KMrQwDQ5UQdo3Ru7VnGMGPeXrk=";
+  };
+
+  # The cmake options are sufficient for turning on static building, but not
+  # for disabling shared building, just trim the shared lib from the CMake
+  # description
+  patches = lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch;
+
+  nativeBuildInputs = [ cmake python3 ];
+
+  cmakeFlags = [
+    "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}"
+    # Avoid blanket -Werror to evade build failures on less
+    # tested compilers.
+    "-DSPIRV_WERROR=OFF"
+  ];
+
+  # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \
+                '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR}
+                 -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR}
+                 -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake'
+    substituteInPlace cmake/SPIRV-Tools.pc.in \
+      --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
+      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+    substituteInPlace cmake/SPIRV-Tools-shared.pc.in \
+      --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
+      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+  '';
+
+  meta = with lib; {
+    description = "SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
+    homepage = "https://github.com/KhronosGroup/SPIRV-Tools";
+    license = licenses.asl20;
+    platforms = with platforms; unix ++ windows;
+    maintainers = [ maintainers.ralith ];
+  };
+}
diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/by-name/sp/splat/package.nix
similarity index 100%
rename from pkgs/applications/radio/splat/default.nix
rename to pkgs/by-name/sp/splat/package.nix
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/by-name/sp/spleen/package.nix
similarity index 100%
rename from pkgs/data/fonts/spleen/default.nix
rename to pkgs/by-name/sp/spleen/package.nix
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/by-name/sp/splix/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/splix/default.nix
rename to pkgs/by-name/sp/splix/package.nix
diff --git a/pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch b/pkgs/by-name/sp/spnavcfg/configure-cfgfile-path.patch
similarity index 100%
rename from pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch
rename to pkgs/by-name/sp/spnavcfg/configure-cfgfile-path.patch
diff --git a/pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch b/pkgs/by-name/sp/spnavcfg/configure-pidfile-path.patch
similarity index 100%
rename from pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch
rename to pkgs/by-name/sp/spnavcfg/configure-pidfile-path.patch
diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
new file mode 100644
index 000000000000..7b5e3ed47ab7
--- /dev/null
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -0,0 +1,51 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  libspnav,
+  libX11,
+
+  # Qt6 support is close: https://github.com/FreeSpacenav/spnavcfg/issues/43
+  libsForQt5,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "spnavcfg";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "FreeSpacenav";
+    repo = "spnavcfg";
+    rev = "refs/tags/v${finalAttrs.version}";
+    fetchLFS = true;
+    hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/FreeSpacenav/spnavcfg/commit/fd9aa10fb8e19a257398757943b3d8e79906e583.patch";
+      hash = "sha256-XKEyLAFrA4qRU3zkBozblb/fKtLKsaItze0xv1uLnq0=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libspnav
+    libX11
+  ];
+
+  meta = with lib; {
+    homepage = "https://spacenav.sourceforge.net/";
+    description = "Interactive configuration GUI for space navigator input devices";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ gebner ];
+    mainProgram = "spnavcfg";
+  };
+})
diff --git a/pkgs/development/libraries/science/math/spooles/allocate.patch b/pkgs/by-name/sp/spooles/allocate.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/allocate.patch
rename to pkgs/by-name/sp/spooles/allocate.patch
diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/by-name/sp/spooles/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/default.nix
rename to pkgs/by-name/sp/spooles/package.nix
diff --git a/pkgs/development/libraries/science/math/spooles/spooles.patch b/pkgs/by-name/sp/spooles/spooles.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/spooles.patch
rename to pkgs/by-name/sp/spooles/spooles.patch
diff --git a/pkgs/development/libraries/science/math/spooles/transform.patch b/pkgs/by-name/sp/spooles/transform.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/transform.patch
rename to pkgs/by-name/sp/spooles/transform.patch
diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/by-name/sp/spotdl/package.nix
similarity index 100%
rename from pkgs/tools/audio/spotdl/default.nix
rename to pkgs/by-name/sp/spotdl/package.nix
diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/by-name/sp/spotify-cli-linux/package.nix
similarity index 100%
rename from pkgs/applications/audio/spotify-cli-linux/default.nix
rename to pkgs/by-name/sp/spotify-cli-linux/package.nix
diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
new file mode 100644
index 000000000000..3f297c3e9bc4
--- /dev/null
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -0,0 +1,104 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, cmake
+# deps for audio backends
+, alsa-lib
+, libpulseaudio
+, portaudio
+, libjack2
+, SDL2
+, gst_all_1
+, dbus
+, fontconfig
+, libsixel
+
+# build options
+, withStreaming ? true
+, withDaemon ? true
+, withAudioBackend ? "rodio" # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl
+, withMediaControl ? true
+, withLyrics ? true
+, withImage ? true
+, withNotify ? true
+, withSixel ? true
+, withFuzzy ? true
+, stdenv
+, darwin
+, makeBinaryWrapper
+}:
+
+assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ];
+
+rustPlatform.buildRustPackage rec {
+  pname = "spotify-player";
+  version = "0.20.0";
+
+  src = fetchFromGitHub {
+    owner = "aome510";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-heycCm2Nwyo+DegMKeXZ+dF+ZqiFT/6P08/28buJc6I=";
+  };
+
+  cargoHash = "sha256-U3a/6uF7vOV3QnxqPnooBdvjyyIPLnQXiXtTwKeHAxA=";
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    rustPlatform.bindgenHook
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    openssl
+    dbus
+    fontconfig
+  ]
+    ++ lib.optionals withSixel [ libsixel ]
+    ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
+    ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]
+    ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ]
+    ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ]
+    ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ]
+    ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ]
+    ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ]
+    ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+      AppKit
+      AudioUnit
+      Cocoa
+    ]);
+
+  buildNoDefaultFeatures = true;
+
+  buildFeatures = [ ]
+    ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ]
+    ++ lib.optionals withMediaControl [ "media-control" ]
+    ++ lib.optionals withImage [ "image" ]
+    ++ lib.optionals withLyrics [ "lyric-finder" ]
+    ++ lib.optionals withDaemon [ "daemon" ]
+    ++ lib.optionals withNotify [ "notify" ]
+    ++ lib.optionals withStreaming [ "streaming" ]
+    ++ lib.optionals withSixel [ "sixel" ]
+    ++ lib.optionals withFuzzy [ "fzf" ];
+
+  # sixel-sys is dynamically linked to libsixel
+  postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) ''
+    wrapProgram $out/bin/spotify_player \
+      --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"
+  '';
+
+  meta = {
+    description = "Terminal spotify player that has feature parity with the official client";
+    homepage = "https://github.com/aome510/spotify-player";
+    changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}";
+    mainProgram = "spotify_player";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith ];
+  };
+}
diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/by-name/sp/spotify-tray/package.nix
similarity index 100%
rename from pkgs/applications/misc/spotify-tray/default.nix
rename to pkgs/by-name/sp/spotify-tray/package.nix
diff --git a/pkgs/applications/audio/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix
similarity index 100%
rename from pkgs/applications/audio/spotify/darwin.nix
rename to pkgs/by-name/sp/spotify/darwin.nix
diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix
new file mode 100644
index 000000000000..b295d6fa5083
--- /dev/null
+++ b/pkgs/by-name/sp/spotify/linux.nix
@@ -0,0 +1,190 @@
+{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype
+, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify
+, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity
+, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
+, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL
+  # High-DPI support: Spotify's --force-device-scale-factor argument
+  # not added if `null`, otherwise, should be a number.
+, deviceScaleFactor ? null
+}:
+
+let
+  # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
+  # "rev" decides what is actually being downloaded
+  # If an update breaks things, one of those might have valuable info:
+  # https://aur.archlinux.org/packages/spotify/
+  # https://community.spotify.com/t5/Desktop-Linux
+  version = "1.2.48.405.gf2c48e6f";
+  # To get the latest stable revision:
+  # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
+  # To get general information:
+  # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
+  # More examples of api usage:
+  # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
+  rev = "80";
+
+  deps = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    curlWithGnuTls
+    dbus
+    expat
+    ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d
+    fontconfig
+    freetype
+    gdk-pixbuf
+    glib
+    gtk3
+    harfbuzz
+    libayatana-appindicator
+    libdbusmenu
+    libdrm
+    libgcrypt
+    libGL
+    libnotify
+    libpng
+    libpulseaudio
+    libxkbcommon
+    mesa
+    nss_latest
+    pango
+    stdenv.cc.cc
+    systemd
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libxcb
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libxshmfence
+    xorg.libXtst
+    zlib
+  ];
+
+in
+
+stdenv.mkDerivation {
+  inherit pname version;
+
+  # fetch from snapcraft instead of the debian repository most repos fetch from.
+  # That is a bit more cumbersome. But the debian repository only keeps the last
+  # two versions, while snapcraft should provide versions indefinitely:
+  # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512
+
+  # This is the next-best thing, since we're not allowed to re-distribute
+  # spotify ourselves:
+  # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
+  src = fetchurl {
+    name = "spotify-${version}-${rev}.snap";
+    url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
+    hash = "sha512-Ej9SEhZhssQiH1srcgUW5lQuUNg+htudV7mcnK6o0pW5PiBYZ6qOPEIZ/1tZzD9xkUJ8hCq08fJMB8NQ12KXMg==";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ];
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  unpackPhase = ''
+    runHook preUnpack
+    unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml'
+    cd squashfs-root
+    if ! grep -q 'grade: stable' meta/snap.yaml; then
+      # Unfortunately this check is not reliable: At the moment (2018-07-26) the
+      # latest version in the "edge" channel is also marked as stable.
+      echo "The snap package is marked as unstable:"
+      grep 'grade: ' meta/snap.yaml
+      echo "You probably chose the wrong revision."
+      exit 1
+    fi
+    if ! grep -q '${version}' meta/snap.yaml; then
+      echo "Package version differs from version found in snap metadata:"
+      grep 'version: ' meta/snap.yaml
+      echo "While the nix package specifies: ${version}."
+      echo "You probably chose the wrong revision or forgot to update the nix version."
+      exit 1
+    fi
+    runHook postUnpack
+  '';
+
+  # Prevent double wrapping
+  dontWrapGApps = true;
+
+  env = rec {
+    libdir = "${placeholder "out"}/lib/spotify";
+    librarypath = "${lib.makeLibraryPath deps}:${libdir}";
+  };
+
+  installPhase =
+    ''
+      runHook preInstall
+
+      mkdir -p $libdir
+      mv ./usr/* $out/
+
+      # Work around Spotify referring to a specific minor version of
+      # OpenSSL.
+
+      ln -s ${lib.getLib openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
+      ln -s ${lib.getLib openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
+      ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
+      ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
+
+      ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir
+      ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir
+
+      rpath="$out/share/spotify:$libdir"
+
+      chmod +w "$out/share/spotify/spotify"
+      patchelf \
+        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath $rpath $out/share/spotify/spotify
+
+      # fix Icon line in the desktop file (#48062)
+      sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
+
+      # Desktop file
+      mkdir -p "$out/share/applications/"
+      cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
+
+      # Icons
+      for i in 16 22 24 32 48 64 128 256 512; do
+        ixi="$i"x"$i"
+        mkdir -p "$out/share/icons/hicolor/$ixi/apps"
+        ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \
+          "$out/share/icons/hicolor/$ixi/apps/spotify-client.png"
+      done
+
+      runHook postInstall
+    '';
+
+    fixupPhase = ''
+      runHook preFixup
+
+      wrapProgramShell $out/share/spotify/spotify \
+        ''${gappsWrapperArgs[@]} \
+        ${lib.optionalString (deviceScaleFactor != null) ''
+          --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
+        ''} \
+        --prefix LD_LIBRARY_PATH : "$librarypath" \
+        --prefix PATH : "${zenity}/bin" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+
+      runHook postFixup
+    '';
+
+  meta = meta // {
+    maintainers = with lib.maintainers; [ ftrvxmtrx sheenobu timokau ma27 ];
+  };
+}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/by-name/sp/spotify/package.nix
similarity index 100%
rename from pkgs/applications/audio/spotify/default.nix
rename to pkgs/by-name/sp/spotify/package.nix
diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/by-name/sp/spotify/update.sh
similarity index 100%
rename from pkgs/applications/audio/spotify/update.sh
rename to pkgs/by-name/sp/spotify/update.sh
diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
new file mode 100644
index 000000000000..34fa52cfd7bc
--- /dev/null
+++ b/pkgs/by-name/sp/spring-boot-cli/package.nix
@@ -0,0 +1,63 @@
+{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils, testers, gitUpdater }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "spring-boot-cli";
+  version = "3.3.4";
+
+  src = fetchzip {
+    url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
+    hash = "sha256-7/pYGj3GpdLjrFGq9QnlfHhYMs8DjMbmDloDsQu2BZY=";
+  };
+
+  nativeBuildInputs = [ makeWrapper installShellFiles ];
+
+  installPhase = ''
+    runHook preInstall
+    rm bin/spring.bat
+    installShellCompletion --bash shell-completion/bash/spring
+    installShellCompletion --zsh shell-completion/zsh/_spring
+    rm -r shell-completion
+    cp -r . $out
+    wrapProgram $out/bin/spring \
+      --set JAVA_HOME ${jdk} \
+      --set PATH /bin:${coreutils}/bin:${jdk}/bin
+    runHook postInstall
+  '';
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "${lib.getExe finalAttrs.finalPackage} --version";
+      version = "v${finalAttrs.version}";
+    };
+    updateScript = gitUpdater {
+      url = "https://github.com/spring-projects/spring-boot";
+      ignoredVersions = ".*-(RC|M).*";
+      rev-prefix = "v";
+    };
+  };
+
+  meta = with lib; {
+    description = ''
+      CLI which makes it easy to create spring-based applications
+    '';
+    longDescription = ''
+      Spring Boot makes it easy to create stand-alone, production-grade
+      Spring-based Applications that you can run. We take an opinionated view
+      of the Spring platform and third-party libraries, so that you can get
+      started with minimum fuss. Most Spring Boot applications need very
+      little Spring configuration.
+
+      You can use Spring Boot to create Java applications that can be started
+      by using java -jar or more traditional war deployments. We also provide
+      a command line tool that runs “spring scripts”.
+    '';
+    homepage = "https://spring.io/projects/spring-boot";
+    changelog = "https://github.com/spring-projects/spring-boot/releases/tag/v${finalAttrs.version}";
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    mainProgram = "spring";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ moaxcp ];
+  };
+})
diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/by-name/sp/spruce/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/spruce/default.nix
rename to pkgs/by-name/sp/spruce/package.nix
diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/by-name/sp/sptk/package.nix
similarity index 100%
rename from pkgs/development/libraries/sptk/default.nix
rename to pkgs/by-name/sp/sptk/package.nix
diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/by-name/sp/sptlrx/package.nix
similarity index 100%
rename from pkgs/applications/audio/sptlrx/default.nix
rename to pkgs/by-name/sp/sptlrx/package.nix
diff --git a/pkgs/tools/security/spyre/default.nix b/pkgs/by-name/sp/spyre/package.nix
similarity index 100%
rename from pkgs/tools/security/spyre/default.nix
rename to pkgs/by-name/sp/spyre/package.nix
diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/by-name/sq/sq/package.nix
similarity index 100%
rename from pkgs/development/tools/sq/default.nix
rename to pkgs/by-name/sq/sq/package.nix
diff --git a/pkgs/development/tools/database/sqlboiler-crdb/default.nix b/pkgs/by-name/sq/sqlboiler-crdb/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlboiler-crdb/default.nix
rename to pkgs/by-name/sq/sqlboiler-crdb/package.nix
diff --git a/pkgs/development/tools/sqlboiler/default.nix b/pkgs/by-name/sq/sqlboiler/package.nix
similarity index 100%
rename from pkgs/development/tools/sqlboiler/default.nix
rename to pkgs/by-name/sq/sqlboiler/package.nix
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/by-name/sq/sqlcheck/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlcheck/default.nix
rename to pkgs/by-name/sq/sqlcheck/package.nix
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/by-name/sq/sqlcipher/package.nix
similarity index 100%
rename from pkgs/development/libraries/sqlcipher/default.nix
rename to pkgs/by-name/sq/sqlcipher/package.nix
diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix
new file mode 100644
index 000000000000..0000e94a8ff3
--- /dev/null
+++ b/pkgs/by-name/sq/sqlcl/package.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sqlcl";
+  version = "24.3.0.285.0530";
+
+  src = fetchurl {
+    url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
+    hash = "sha256-WUGPFJENRvSOTOPtkxEjITZASajWrNgsVJbuMEKm1SI=";
+  };
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+
+  unpackCmd = "unzip $curSrc";
+
+  installPhase = ''
+    mkdir -p $out/libexec
+    mv * $out/libexec/
+
+    makeWrapper $out/libexec/bin/sql $out/bin/sqlcl \
+      --set JAVA_HOME ${jdk.home} \
+      --chdir "$out/libexec/bin"
+  '';
+
+  meta = with lib; {
+    description = "Oracle's Oracle DB CLI client";
+    longDescription = ''
+      Oracle SQL Developer Command Line (SQLcl) is a free command line
+      interface for Oracle Database. It allows you to interactively or batch
+      execute SQL and PL/SQL. SQLcl provides in-line editing, statement
+      completion, and command recall for a feature-rich experience, all while
+      also supporting your previously written SQL*Plus scripts.
+    '';
+    homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/";
+    license = licenses.unfreeRedistributable;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ misterio77 ];
+  };
+})
diff --git a/pkgs/by-name/sq/sqlcmd/package.nix b/pkgs/by-name/sq/sqlcmd/package.nix
new file mode 100644
index 000000000000..20e7cd0a1587
--- /dev/null
+++ b/pkgs/by-name/sq/sqlcmd/package.nix
@@ -0,0 +1,56 @@
+{ buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, lib
+, sqlcmd
+, testers
+}:
+
+buildGoModule rec {
+  pname = "sqlcmd";
+  version = "1.8.1";
+
+  src = fetchFromGitHub {
+    repo = "go-sqlcmd";
+    owner = "microsoft";
+    rev = "v${version}";
+    sha256 = "sha256-XV6sPlTBBUMFzWVaLbbtbb/FLYlOkp8htBnVZdaVLQs=";
+  };
+
+  vendorHash = "sha256-gc/pOFtQMCLjHbW9z8r08Q+1QnOe5WllSuhIeiz9Huo=";
+  proxyVendor = true;
+
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+
+  subPackages = [ "cmd/modern" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  postInstall = ''
+    mv $out/bin/modern $out/bin/sqlcmd
+
+    installShellCompletion --cmd sqlcmd \
+      --bash <($out/bin/sqlcmd completion bash) \
+      --fish <($out/bin/sqlcmd completion fish) \
+      --zsh <($out/bin/sqlcmd completion zsh)
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = sqlcmd;
+    command = "sqlcmd --version";
+    inherit version;
+  };
+
+  meta = {
+    description = "Command line tool for working with Microsoft SQL Server, Azure SQL Database, and Azure Synapse";
+    mainProgram = "sqlcmd";
+    homepage = "https://github.com/microsoft/go-sqlcmd";
+    changelog = "https://github.com/microsoft/go-sqlcmd/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ratsclub ];
+  };
+}
diff --git a/pkgs/servers/sql/sqld/Cargo.lock b/pkgs/by-name/sq/sqld/Cargo.lock
similarity index 100%
rename from pkgs/servers/sql/sqld/Cargo.lock
rename to pkgs/by-name/sq/sqld/Cargo.lock
diff --git a/pkgs/servers/sql/sqld/default.nix b/pkgs/by-name/sq/sqld/package.nix
similarity index 100%
rename from pkgs/servers/sql/sqld/default.nix
rename to pkgs/by-name/sq/sqld/package.nix
diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/by-name/sq/sqldef/package.nix
similarity index 100%
rename from pkgs/development/tools/sqldef/default.nix
rename to pkgs/by-name/sq/sqldef/package.nix
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/by-name/sq/sqlfluff/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlfluff/default.nix
rename to pkgs/by-name/sq/sqlfluff/package.nix
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/by-name/sq/sqlite-jdbc/package.nix
similarity index 100%
rename from pkgs/servers/sql/sqlite/jdbc/default.nix
rename to pkgs/by-name/sq/sqlite-jdbc/package.nix
diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/by-name/sq/sqlite-web/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlite-web/default.nix
rename to pkgs/by-name/sq/sqlite-web/package.nix
diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
similarity index 100%
rename from pkgs/tools/misc/sqlite3-to-mysql/default.nix
rename to pkgs/by-name/sq/sqlite3-to-mysql/package.nix
diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/by-name/sq/sqlitecpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/sqlitecpp/default.nix
rename to pkgs/by-name/sq/sqlitecpp/package.nix
diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
new file mode 100644
index 000000000000..148cc8d944a8
--- /dev/null
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  sqlite,
+  zstd,
+  fetchurl,
+}:
+
+let
+  apexcharts = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js";
+    hash = "sha256-2sxp9+shRA5LMxzhgx+fpeQPIY2ZWgBdt4mp5V2Yn+E=";
+  };
+  tablerCss = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css";
+    hash = "sha256-lS3nKxMMZiKIRJG7UgUonOHYuvHgW5eckEjvHMYxb9Q=";
+  };
+  tablerVendorsCss = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css";
+    hash = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY=";
+  };
+  tablerJs = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js";
+    hash = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ=";
+  };
+  listJsFixed = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js";
+    hash = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM=";
+  };
+  tablerIcons = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg";
+    hash = "sha256-lEUAtxI+NffqLDllirLgcCRjEgbeCaz9Gkn3Tu9e9F4=";
+  };
+  tomselect = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js";
+    hash = "sha256-51NcdIM8GseVFFmg8mUWDxfhjLCA+n8kw/Ojyo+6Hjk=";
+  };
+in
+
+rustPlatform.buildRustPackage rec {
+  pname = "sqlpage";
+  version = "0.29.0";
+
+  src = fetchFromGitHub {
+    owner = "lovasoa";
+    repo = "SQLpage";
+    rev = "v${version}";
+    hash = "sha256-wI+nXrjX98vqyCE6Ofa5KxKUvpLfHqd7KFCsILuOnGk=";
+  };
+
+  postPatch = ''
+    substituteInPlace sqlpage/apexcharts.js \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js */' \
+      "$(cat ${apexcharts})"
+    substituteInPlace sqlpage/sqlpage.css \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \
+      "$(cat ${tablerCss})"
+    substituteInPlace sqlpage/sqlpage.css \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \
+      "$(cat ${tablerVendorsCss})"
+    substituteInPlace sqlpage/sqlpage.js \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \
+      "$(cat ${tablerJs})"
+    substituteInPlace sqlpage/sqlpage.js \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \
+      "$(cat ${listJsFixed})"
+    substituteInPlace sqlpage/tabler-icons.svg \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg */' \
+      "$(cat ${tablerIcons})"
+    substituteInPlace sqlpage/tomselect.js \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js */' \
+      "$(cat ${tomselect})"
+  '';
+
+  cargoHash = "sha256-/B8tayEbyOsc0/po1YQKtp694X12B3I50OU4cMwJo8Q=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    sqlite
+    zstd
+  ];
+
+  env = {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  meta = {
+    description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly";
+    homepage = "https://github.com/lovasoa/SQLpage";
+    changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
+    mainProgram = "sqlpage";
+  };
+}
diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/by-name/sq/sqls/package.nix
similarity index 100%
rename from pkgs/applications/misc/sqls/default.nix
rename to pkgs/by-name/sq/sqls/package.nix
diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix
index d1c9343296ef..f923d3a1edfb 100644
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@@ -2,7 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  installShellFiles,
   stdenv,
   darwin,
   rust-jemalloc-sys,
@@ -11,21 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sqruff";
-  version = "0.17.0";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "quarylabs";
     repo = "sqruff";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uUtbVf4U59jne5uORXpyzpqhFQoviKi2O9KQ5s1CfhU=";
+    hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM=";
   };
 
-  cargoHash = "sha256-kIBjPh+rL4vzIAqGNYMpw39A0vADbHxi/PkhoG+QL6c=";
-
-  # Requires nightly features (feature(let_chains) and feature(trait_upcasting))
-  RUSTC_BOOTSTRAP = true;
-
-  nativeBuildInputs = [ installShellFiles ];
+  cargoHash = "sha256-WqkHZcA4FBm8zubAnDrJGH+fgLVIxsNNm3B+mdj5Sxw=";
 
   buildInputs = [
     rust-jemalloc-sys
@@ -35,8 +29,8 @@ rustPlatform.buildRustPackage rec {
   postPatch = ''
     substituteInPlace crates/cli/tests/ui.rs \
       --replace-fail \
-      'config.program.program = format!("../../target/{profile}/sqruff").into();' \
-      'config.program.program = "../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/sqruff".into();'
+      'sqruff_path.push(format!("../../target/{}/sqruff", profile));' \
+      'sqruff_path.push(format!("../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/{}/sqruff", profile));'
   '';
 
   nativeCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/by-name/sq/sqsh/package.nix
similarity index 100%
rename from pkgs/development/tools/sqsh/default.nix
rename to pkgs/by-name/sq/sqsh/package.nix
diff --git a/pkgs/tools/filesystems/squashfs/4k-align.patch b/pkgs/by-name/sq/squashfsTools/4k-align.patch
similarity index 100%
rename from pkgs/tools/filesystems/squashfs/4k-align.patch
rename to pkgs/by-name/sq/squashfsTools/4k-align.patch
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/by-name/sq/squashfsTools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/squashfs/default.nix
rename to pkgs/by-name/sq/squashfsTools/package.nix
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/by-name/sq/squashfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/squashfuse/default.nix
rename to pkgs/by-name/sq/squashfuse/package.nix
diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/by-name/sq/squawk/package.nix
similarity index 100%
rename from pkgs/development/tools/squawk/default.nix
rename to pkgs/by-name/sq/squawk/package.nix
diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/by-name/sq/squeekboard/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/squeekboard/default.nix
rename to pkgs/by-name/sq/squeekboard/package.nix
diff --git a/pkgs/servers/squid/default.nix b/pkgs/by-name/sq/squid/package.nix
similarity index 100%
rename from pkgs/servers/squid/default.nix
rename to pkgs/by-name/sq/squid/package.nix
diff --git a/pkgs/by-name/sr/srain/package.nix b/pkgs/by-name/sr/srain/package.nix
new file mode 100644
index 000000000000..6984d720b638
--- /dev/null
+++ b/pkgs/by-name/sr/srain/package.nix
@@ -0,0 +1,63 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, gtk3
+, libconfig
+, libsoup_3
+, libsecret
+, libayatana-appindicator
+, openssl
+, gettext
+, glib
+, glib-networking
+, appstream-glib
+, dbus-glib
+, python3Packages
+, meson
+, ninja
+, wrapGAppsHook3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "srain";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "SrainApp";
+    repo = "srain";
+    rev = version;
+    hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    appstream-glib
+    wrapGAppsHook3
+    python3Packages.sphinx
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    glib-networking
+    dbus-glib
+    libconfig
+    libsoup_3
+    libsecret
+    libayatana-appindicator
+    openssl
+  ];
+
+  meta = with lib; {
+    description = "Modern IRC client written in GTK";
+    mainProgram = "srain";
+    homepage = "https://srain.silverrainz.me";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rewine ];
+  };
+}
diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/by-name/sr/srandrd/package.nix
similarity index 100%
rename from pkgs/tools/X11/srandrd/default.nix
rename to pkgs/by-name/sr/srandrd/package.nix
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/by-name/sr/sratom/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/sratom/default.nix
rename to pkgs/by-name/sr/sratom/package.nix
diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/by-name/sr/src-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/src-cli/default.nix
rename to pkgs/by-name/sr/src-cli/package.nix
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/by-name/sr/srecord/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/srecord/default.nix
rename to pkgs/by-name/sr/srecord/package.nix
diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/by-name/sr/sregex/package.nix
similarity index 100%
rename from pkgs/development/libraries/sregex/default.nix
rename to pkgs/by-name/sr/sregex/package.nix
diff --git a/pkgs/tools/networking/srelay/arm.patch b/pkgs/by-name/sr/srelay/arm.patch
similarity index 100%
rename from pkgs/tools/networking/srelay/arm.patch
rename to pkgs/by-name/sr/srelay/arm.patch
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/by-name/sr/srelay/package.nix
similarity index 100%
rename from pkgs/tools/networking/srelay/default.nix
rename to pkgs/by-name/sr/srelay/package.nix
diff --git a/pkgs/tools/misc/srisum/default.nix b/pkgs/by-name/sr/srisum/package.nix
similarity index 100%
rename from pkgs/tools/misc/srisum/default.nix
rename to pkgs/by-name/sr/srisum/package.nix
diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix
index e601e0e64e80..edb84d89ca12 100644
--- a/pkgs/by-name/sr/srm-cuarzo/package.nix
+++ b/pkgs/by-name/sr/srm-cuarzo/package.nix
@@ -14,9 +14,9 @@
 }:
 stdenv.mkDerivation (self: {
   pname = "srm-cuarzo";
-  version = "0.7.2-1";
+  version = "0.8.0-1";
   rev = "v${self.version}";
-  hash = "sha256-VxLiGA7AvNNjl8UjFbBE9Z/T+YrTj9Hb3LASgzE9iH0=";
+  hash = "sha256-QQYn7TR2+6nZHOohjqEg6uMt4OBvfYD4+bFiDIaC7SU=";
 
   src = fetchFromGitHub {
     inherit (self) rev hash;
diff --git a/pkgs/tools/security/srm/fix-output-in-verbose-mode.patch b/pkgs/by-name/sr/srm/fix-output-in-verbose-mode.patch
similarity index 100%
rename from pkgs/tools/security/srm/fix-output-in-verbose-mode.patch
rename to pkgs/by-name/sr/srm/fix-output-in-verbose-mode.patch
diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/by-name/sr/srm/package.nix
similarity index 100%
rename from pkgs/tools/security/srm/default.nix
rename to pkgs/by-name/sr/srm/package.nix
diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/by-name/sr/srsran/package.nix
similarity index 100%
rename from pkgs/applications/radio/srsran/default.nix
rename to pkgs/by-name/sr/srsran/package.nix
diff --git a/pkgs/applications/video/srt-live-server/add-ctime-include.patch b/pkgs/by-name/sr/srt-live-server/add-ctime-include.patch
similarity index 100%
rename from pkgs/applications/video/srt-live-server/add-ctime-include.patch
rename to pkgs/by-name/sr/srt-live-server/add-ctime-include.patch
diff --git a/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch b/pkgs/by-name/sr/srt-live-server/fix-insecure-printfs.patch
similarity index 100%
rename from pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch
rename to pkgs/by-name/sr/srt-live-server/fix-insecure-printfs.patch
diff --git a/pkgs/applications/video/srt-live-server/default.nix b/pkgs/by-name/sr/srt-live-server/package.nix
similarity index 100%
rename from pkgs/applications/video/srt-live-server/default.nix
rename to pkgs/by-name/sr/srt-live-server/package.nix
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch b/pkgs/by-name/sr/srt-to-vtt-cl/fix-validation.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
rename to pkgs/by-name/sr/srt-to-vtt-cl/fix-validation.patch
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/by-name/sr/srt-to-vtt-cl/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
rename to pkgs/by-name/sr/srt-to-vtt-cl/package.nix
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch b/pkgs/by-name/sr/srt-to-vtt-cl/simplify-macOS-builds.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch
rename to pkgs/by-name/sr/srt-to-vtt-cl/simplify-macOS-builds.patch
diff --git a/pkgs/development/libraries/srt/no-msvc-compat-headers.patch b/pkgs/by-name/sr/srt/no-msvc-compat-headers.patch
similarity index 100%
rename from pkgs/development/libraries/srt/no-msvc-compat-headers.patch
rename to pkgs/by-name/sr/srt/no-msvc-compat-headers.patch
diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/by-name/sr/srt/package.nix
similarity index 100%
rename from pkgs/development/libraries/srt/default.nix
rename to pkgs/by-name/sr/srt/package.nix
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/by-name/sr/srtp/package.nix
similarity index 100%
rename from pkgs/development/libraries/srtp/default.nix
rename to pkgs/by-name/sr/srtp/package.nix
diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/by-name/sr/srtrelay/package.nix
similarity index 100%
rename from pkgs/applications/video/srtrelay/default.nix
rename to pkgs/by-name/sr/srtrelay/package.nix
diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/by-name/ss/ssb-patchwork/package.nix
similarity index 100%
rename from pkgs/applications/networking/ssb-patchwork/default.nix
rename to pkgs/by-name/ss/ssb-patchwork/package.nix
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/by-name/ss/ssdeep/package.nix
similarity index 100%
rename from pkgs/tools/security/ssdeep/default.nix
rename to pkgs/by-name/ss/ssdeep/package.nix
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/by-name/ss/sselp/package.nix
similarity index 100%
rename from pkgs/tools/X11/sselp/default.nix
rename to pkgs/by-name/ss/sselp/package.nix
diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/by-name/ss/ssh-agents/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssh-agents/default.nix
rename to pkgs/by-name/ss/ssh-agents/package.nix
diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/by-name/ss/ssh-audit/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-audit/default.nix
rename to pkgs/by-name/ss/ssh-audit/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/pkgs/by-name/ss/ssh-chat/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
rename to pkgs/by-name/ss/ssh-chat/package.nix
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/by-name/ss/ssh-ident/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssh-ident/default.nix
rename to pkgs/by-name/ss/ssh-ident/package.nix
diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/by-name/ss/ssh-key-confirmer/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssh-key-confirmer/default.nix
rename to pkgs/by-name/ss/ssh-key-confirmer/package.nix
diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix
new file mode 100644
index 000000000000..e17925444dea
--- /dev/null
+++ b/pkgs/by-name/ss/ssh-mitm/package.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  installShellFiles,
+  python3,
+}:
+
+let
+  py = python3.override {
+    self = py;
+    packageOverrides = self: super: {
+      paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec {
+        version = "3.4.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          hash = "sha256-ixUwKHCvf2ZS8uA4l1wdKXPwYEbLXX1lNVZos+y+zgw=";
+        };
+        dependencies = oldAttrs.dependencies ++ [ python3.pkgs.icecream ];
+      });
+    };
+  };
+in
+with py.pkgs;
+
+
+buildPythonApplication rec {
+  pname = "ssh-mitm";
+  version = "5.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ssh-mitm";
+    repo = "ssh-mitm";
+    rev = "refs/tags/${version}";
+    hash = "sha256-jRheKLAXbbMyxdtDSJ4QSN4PoUM2YoK7nmU5xqPq7DY=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-requirements-txt
+  ];
+
+  dependencies = [
+    appimage
+    argcomplete
+    colored
+    packaging
+    paramiko
+    pytz
+    pyyaml
+    python-json-logger
+    rich
+    tkinter
+    setuptools
+    sshpubkeys
+    wrapt
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ];
+  # fix for darwin users
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  # Module has no tests
+  doCheck = false;
+  # Install man page
+  postInstall = ''
+    installManPage man1/*
+  '';
+
+  pythonImportsCheck = [ "sshmitm" ];
+
+  meta = with lib; {
+    description = "Tool for SSH security audits";
+    homepage = "https://github.com/ssh-mitm/ssh-mitm";
+    changelog = "https://github.com/ssh-mitm/ssh-mitm/blob/${version}/CHANGELOG.md";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/by-name/ss/ssh-to-age/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-to-age/default.nix
rename to pkgs/by-name/ss/ssh-to-age/package.nix
diff --git a/pkgs/tools/security/ssh-to-pgp/default.nix b/pkgs/by-name/ss/ssh-to-pgp/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-to-pgp/default.nix
rename to pkgs/by-name/ss/ssh-to-pgp/package.nix
diff --git a/pkgs/by-name/ss/ssh-tools/package.nix b/pkgs/by-name/ss/ssh-tools/package.nix
new file mode 100644
index 000000000000..8d1f69ca538a
--- /dev/null
+++ b/pkgs/by-name/ss/ssh-tools/package.nix
@@ -0,0 +1,37 @@
+{ lib, buildGoModule, fetchFromGitea, installShellFiles, perl }:
+
+buildGoModule rec {
+  pname = "ssh-tools";
+  version = "1.9";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "vaporup";
+    repo = "ssh-tools";
+    rev = "v${version}";
+    hash = "sha256-ZMjpc2zjvuLJES5ixEHvo7oAx1JGzy60LzN09Ykn/54=";
+  };
+
+  vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug=";
+
+  subPackages = [
+    "cmd/go/ssh-authorized-keys"
+    "cmd/go/ssh-sig"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = [ perl ];
+
+  postInstall = ''
+    install cmd/{bash,perl}/ssh-*/ssh-* -t $out/bin
+    installManPage man/*.1
+  '';
+
+  meta = with lib; {
+    description = "Making SSH more convenient";
+    homepage = "https://codeberg.org/vaporup/ssh-tools";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/tools/security/sshchecker/default.nix b/pkgs/by-name/ss/sshchecker/package.nix
similarity index 100%
rename from pkgs/tools/security/sshchecker/default.nix
rename to pkgs/by-name/ss/sshchecker/package.nix
diff --git a/pkgs/tools/networking/sshed/default.nix b/pkgs/by-name/ss/sshed/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshed/default.nix
rename to pkgs/by-name/ss/sshed/package.nix
diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/by-name/ss/sshfs-fuse/common.nix
similarity index 100%
rename from pkgs/tools/filesystems/sshfs-fuse/common.nix
rename to pkgs/by-name/ss/sshfs-fuse/common.nix
diff --git a/pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch b/pkgs/by-name/ss/sshfs-fuse/fix-fuse-darwin-h.patch
similarity index 100%
rename from pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch
rename to pkgs/by-name/ss/sshfs-fuse/fix-fuse-darwin-h.patch
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/by-name/ss/sshfs-fuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/sshfs-fuse/default.nix
rename to pkgs/by-name/ss/sshfs-fuse/package.nix
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/by-name/ss/sshguard/package.nix
similarity index 100%
rename from pkgs/tools/security/sshguard/default.nix
rename to pkgs/by-name/ss/sshguard/package.nix
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/by-name/ss/sshlatex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/sshlatex/default.nix
rename to pkgs/by-name/ss/sshlatex/package.nix
diff --git a/pkgs/tools/security/sshocker/default.nix b/pkgs/by-name/ss/sshocker/package.nix
similarity index 100%
rename from pkgs/tools/security/sshocker/default.nix
rename to pkgs/by-name/ss/sshocker/package.nix
diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/by-name/ss/sshoogr/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshoogr/default.nix
rename to pkgs/by-name/ss/sshoogr/package.nix
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/by-name/ss/sshpass/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshpass/default.nix
rename to pkgs/by-name/ss/sshpass/package.nix
diff --git a/pkgs/tools/networking/sshping/default.nix b/pkgs/by-name/ss/sshping/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshping/default.nix
rename to pkgs/by-name/ss/sshping/package.nix
diff --git a/pkgs/servers/sshportal/default.nix b/pkgs/by-name/ss/sshportal/package.nix
similarity index 100%
rename from pkgs/servers/sshportal/default.nix
rename to pkgs/by-name/ss/sshportal/package.nix
diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/by-name/ss/sshs/package.nix
similarity index 100%
rename from pkgs/development/tools/sshs/default.nix
rename to pkgs/by-name/ss/sshs/package.nix
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/by-name/ss/sshuttle/package.nix
similarity index 100%
rename from pkgs/tools/security/sshuttle/default.nix
rename to pkgs/by-name/ss/sshuttle/package.nix
diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/by-name/ss/sshuttle/sudo.patch
similarity index 100%
rename from pkgs/tools/security/sshuttle/sudo.patch
rename to pkgs/by-name/ss/sshuttle/sudo.patch
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/by-name/ss/ssl-cert-check/package.nix
similarity index 100%
rename from pkgs/tools/admin/ssl-cert-check/default.nix
rename to pkgs/by-name/ss/ssl-cert-check/package.nix
diff --git a/pkgs/tools/networking/ssl-proxy/default.nix b/pkgs/by-name/ss/ssl-proxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssl-proxy/default.nix
rename to pkgs/by-name/ss/ssl-proxy/package.nix
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/by-name/ss/ssldump/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssldump/default.nix
rename to pkgs/by-name/ss/ssldump/package.nix
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/by-name/ss/sslh/package.nix
similarity index 100%
rename from pkgs/servers/sslh/default.nix
rename to pkgs/by-name/ss/sslh/package.nix
diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/by-name/ss/sslmate-agent/package.nix
similarity index 100%
rename from pkgs/development/tools/sslmate-agent/default.nix
rename to pkgs/by-name/ss/sslmate-agent/package.nix
diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/by-name/ss/sslmate/package.nix
similarity index 100%
rename from pkgs/development/tools/sslmate/default.nix
rename to pkgs/by-name/ss/sslmate/package.nix
diff --git a/pkgs/tools/networking/sslsplit/default.nix b/pkgs/by-name/ss/sslsplit/package.nix
similarity index 100%
rename from pkgs/tools/networking/sslsplit/default.nix
rename to pkgs/by-name/ss/sslsplit/package.nix
diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/by-name/ss/ssmsh/package.nix
similarity index 100%
rename from pkgs/tools/admin/ssmsh/default.nix
rename to pkgs/by-name/ss/ssmsh/package.nix
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/by-name/ss/ssocr/package.nix
similarity index 100%
rename from pkgs/applications/misc/ssocr/default.nix
rename to pkgs/by-name/ss/ssocr/package.nix
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/by-name/ss/ssrc/package.nix
similarity index 100%
rename from pkgs/applications/audio/ssrc/default.nix
rename to pkgs/by-name/ss/ssrc/package.nix
diff --git a/pkgs/tools/security/sss-cli/fix-cargo-lock.patch b/pkgs/by-name/ss/sss-cli/fix-cargo-lock.patch
similarity index 100%
rename from pkgs/tools/security/sss-cli/fix-cargo-lock.patch
rename to pkgs/by-name/ss/sss-cli/fix-cargo-lock.patch
diff --git a/pkgs/tools/security/sss-cli/default.nix b/pkgs/by-name/ss/sss-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/sss-cli/default.nix
rename to pkgs/by-name/ss/sss-cli/package.nix
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/by-name/ss/ssss/package.nix
similarity index 100%
rename from pkgs/tools/security/ssss/default.nix
rename to pkgs/by-name/ss/ssss/package.nix
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/by-name/ss/sstp/package.nix
similarity index 100%
rename from pkgs/tools/networking/sstp/default.nix
rename to pkgs/by-name/ss/sstp/package.nix
diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/by-name/ss/ssw/package.nix
similarity index 100%
rename from pkgs/applications/misc/ssw/default.nix
rename to pkgs/by-name/ss/ssw/package.nix
diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/by-name/st/sta/package.nix
similarity index 100%
rename from pkgs/tools/misc/sta/default.nix
rename to pkgs/by-name/st/sta/package.nix
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/by-name/st/stabber/package.nix
similarity index 100%
rename from pkgs/misc/stabber/default.nix
rename to pkgs/by-name/st/stabber/package.nix
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/by-name/st/stacks/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/stacks/default.nix
rename to pkgs/by-name/st/stacks/package.nix
diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/by-name/st/stacs/package.nix
similarity index 100%
rename from pkgs/tools/security/stacs/default.nix
rename to pkgs/by-name/st/stacs/package.nix
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/by-name/st/stagit/package.nix
similarity index 100%
rename from pkgs/development/tools/stagit/default.nix
rename to pkgs/by-name/st/stagit/package.nix
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/by-name/st/stalin/package.nix
similarity index 100%
rename from pkgs/development/compilers/stalin/default.nix
rename to pkgs/by-name/st/stalin/package.nix
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/by-name/st/stalonetray/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/stalonetray/default.nix
rename to pkgs/by-name/st/stalonetray/package.nix
diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix
index e11ef03b6534..d757c9dde44a 100644
--- a/pkgs/by-name/st/stalwart-mail/webadmin.nix
+++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  trunk-ng,
+  trunk,
   tailwindcss,
   fetchNpmDeps,
   nix-update-script,
@@ -44,15 +44,20 @@ rustPlatform.buildRustPackage rec {
     nodejs
     npmHooks.npmConfigHook
     tailwindcss
-    trunk-ng
-    wasm-bindgen-cli
+    trunk
+    # needs to match with wasm-bindgen version in upstreams Cargo.lock
+    (wasm-bindgen-cli.override {
+      version = "0.2.93";
+      hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
+      cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
+    })
     zip
   ];
 
   NODE_PATH = "$npmDeps";
 
   buildPhase = ''
-    trunk-ng build --offline --verbose --release
+    trunk build --offline --frozen --release
   '';
 
   installPhase = ''
diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/by-name/st/star-history/package.nix
similarity index 100%
rename from pkgs/tools/misc/star-history/default.nix
rename to pkgs/by-name/st/star-history/package.nix
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/by-name/st/star/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/star/default.nix
rename to pkgs/by-name/st/star/package.nix
diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/by-name/st/starboard/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/starboard/default.nix
rename to pkgs/by-name/st/starboard/package.nix
diff --git a/pkgs/servers/misc/starcharts/default.nix b/pkgs/by-name/st/starcharts/package.nix
similarity index 100%
rename from pkgs/servers/misc/starcharts/default.nix
rename to pkgs/by-name/st/starcharts/package.nix
diff --git a/pkgs/by-name/st/stardust-xr-atmosphere/Cargo.lock b/pkgs/by-name/st/stardust-xr-atmosphere/Cargo.lock
new file mode 100644
index 000000000000..4df443535d8b
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-atmosphere/Cargo.lock
@@ -0,0 +1,2376 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[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 = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+
+[[package]]
+name = "cfg-if"
+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 = "chumsky"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
+dependencies = [
+ "hashbrown",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[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",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "confy"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45b1f4c00870f07dc34adcac82bb6a72cc5aabca8536ba1797e01df51d2ce9a0"
+dependencies = [
+ "directories",
+ "serde",
+ "thiserror",
+ "toml",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "copy_dir"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "543d1dd138ef086e2ff05e3a48cf9da045da2033d16f8538fd76b86cd49b2ca3"
+dependencies = [
+ "walkdir",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[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.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+dependencies = [
+ "mint",
+ "serde",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "kdl"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "114071e31456ec827056ca691d141f8e96327d9d9a29140da2e6fba9a5f17b83"
+dependencies = [
+ "nom",
+ "phf",
+ "thiserror",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "knuffel"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04bee6ddc6071011314b1ce4f7705fef6c009401dba4fd22cb0009db6a177413"
+dependencies = [
+ "base64",
+ "chumsky",
+ "knuffel-derive",
+ "miette",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "knuffel-derive"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91977f56c49cfb961e3d840e2e7c6e4a56bde7283898cf606861f1421348283d"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.68",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.4.0",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+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-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[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.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 2.0.68",
+]
+
+[[package]]
+name = "serde_kdl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3466b825d24b720fbdc89a64e0c548b5484d622f47974f5d10248eb5c04d389"
+dependencies = [
+ "kdl 3.0.0",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shiva-color-rs"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bea807e4f40f1a3df2717cc134562397b6a8f869f22568388fd5eb14bb1b69"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "cluFlock",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash 2.0.0",
+ "serde",
+ "shiva-color-rs",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-atmosphere"
+version = "0.4.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "confy",
+ "copy_dir",
+ "dirs",
+ "glam 0.28.0",
+ "kdl 4.6.0",
+ "knuffel",
+ "mint",
+ "rustc-hash 2.0.0",
+ "serde",
+ "serde_kdl",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "toml",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/molecules.git?branch=dev#a7732c8ec7fd30adf947209211f1079fa065657d"
+dependencies = [
+ "glam 0.27.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "rustc-hash 1.1.0",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl 4.6.0",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+ "zbus",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.13",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "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]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[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",
+]
+
+[[package]]
+name = "xdg-home"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "zbus"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
diff --git a/pkgs/by-name/st/stardust-xr-atmosphere/package.nix b/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
new file mode 100644
index 000000000000..ca6df5a18cc2
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  testers,
+  stardust-xr-atmosphere,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-atmosphere";
+  version = "0-unstable-2024-08-22";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "atmosphere";
+    rev = "0c8bfb91e8ca32a4895f858067334ed265517309";
+    hash = "sha256-pk1+kkPV6fx+7Xz9hKFFVw402iztcvNC31zVCc3hfTY=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.45.0" = "sha256-WF/uNtFYB+ZQqsyXJe7qUCd8SHUgaNOLMxGuNIN1iKM=";
+      "stardust-xr-molecules-0.45.0" = "sha256-UldPQQ0Psx/lFUdCKJJDeG8W6lK6qDU3JSwffawK3xg=";
+    };
+  };
+
+  passthru = {
+    tests.versionTest = testers.testVersion {
+      package = stardust-xr-atmosphere;
+      command = "atmosphere --version";
+      version = "stardust-xr-atmosphere 0.4.0";
+    };
+    updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
+    };
+  };
+
+  meta = {
+    description = "Environment, homespace, and setup client for Stardust XR";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    mainProgram = "atmosphere";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-flatland/Cargo.lock b/pkgs/by-name/st/stardust-xr-flatland/Cargo.lock
new file mode 100644
index 000000000000..2623ce6ebc64
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-flatland/Cargo.lock
@@ -0,0 +1,1342 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorgrad"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6"
+dependencies = [
+ "csscolorparser",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flatland"
+version = "0.8.0"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "colorgrad",
+ "glam 0.24.2",
+ "input-event-codes",
+ "lazy_static",
+ "manifest-dir-macros",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.48",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[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 = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.8",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.3.9",
+ "regex-syntax 0.7.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[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_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.44.0"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.44.0"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.44.0"
+source = "git+https://github.com/StardustXR/molecules.git#dffa22c302e730776876940f4dac39a526d601bc"
+dependencies = [
+ "color-rs",
+ "glam 0.25.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.25.0",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+dependencies = [
+ "memchr",
+]
diff --git a/pkgs/by-name/st/stardust-xr-flatland/package.nix b/pkgs/by-name/st/stardust-xr-flatland/package.nix
new file mode 100644
index 000000000000..214c5636dfd9
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-flatland/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-flatland";
+  version = "0-unstable-2024-04-13";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "flatland";
+    rev = "b3b0f29c4ea1b82c96cf9de507837bf15a5e4c0e";
+    hash = "sha256-m7c6XpmpTM1URuqMG2KqtaWbL2Vt8vJFJtmvq123BmY=";
+  };
+
+  env.STARDUST_RES_PREFIXES = "${src}/res";
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.44.0" = "sha256-Gu/P78nFFVSpgwCcbMwyoqdEZO8zIcvP1ovU7Y0sXqg=";
+      "stardust-xr-molecules-0.44.0" = "sha256-TpgsmQnaAbtcp+veclGaht7f9hwEWEzMOpEIvdICTbc=";
+    };
+  };
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "A flat window for Stardust XR";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    mainProgram = "flatland";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-gravity/Cargo.lock b/pkgs/by-name/st/stardust-xr-gravity/Cargo.lock
new file mode 100644
index 000000000000..76c81456e18a
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-gravity/Cargo.lock
@@ -0,0 +1,1332 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[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 = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+
+[[package]]
+name = "cfg-if"
+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 = "clap"
+version = "4.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "git+https://github.com/arturoc/color-rs.git#d50d5e37aaf91ccd39d0832f43a417e3405d2ece"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.5.0",
+ "libc",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.66",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[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.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 2.0.66",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-gravity"
+version = "0.4.1"
+dependencies = [
+ "clap",
+ "glam 0.28.0",
+ "nix 0.29.0",
+ "stardust-xr-fusion",
+ "tokio",
+ "ustr",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "ustr"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e904a2279a4a36d2356425bb20be271029cc650c335bc82af8bfae30085a3d0"
+dependencies = [
+ "ahash",
+ "byteorder",
+ "lazy_static",
+ "parking_lot 0.12.3",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "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]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[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 = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
diff --git a/pkgs/by-name/st/stardust-xr-gravity/package.nix b/pkgs/by-name/st/stardust-xr-gravity/package.nix
new file mode 100644
index 000000000000..326b709e2be2
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-gravity/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-gravity";
+  version = "0-unstable-2024-08-20";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "gravity";
+    rev = "96787ed3139717ea6061f6e259e9fed3e483274a";
+    hash = "sha256-R87u7CX2n7iOOEEB3cHae2doqCn/skChHgeU+RNsHVk=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.45.0" = "sha256-1Bor53L+Fe18SU6MKwPLQXDGZq6E9++gtwDy4zkzZXw=";
+      "color-rs-0.8.0" = "sha256-/p4wYiLryY0+h0HBJUo4OV2jdZpcVn2kqv+8XewM4gM=";
+    };
+  };
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Utility to launch apps and stardust clients at an offet";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    mainProgram = "gravity";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-kiara/Cargo.lock b/pkgs/by-name/st/stardust-xr-kiara/Cargo.lock
new file mode 100644
index 000000000000..3b35f08aeb9c
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-kiara/Cargo.lock
@@ -0,0 +1,1964 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "colorgrad"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6"
+dependencies = [
+ "csscolorparser",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flagset"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+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"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+ "serde",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "kiara"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "color-rs",
+ "colorgrad",
+ "glam 0.25.0",
+ "input-event-codes",
+ "lazy_static",
+ "manifest-dir-macros",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.48",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[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 = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.5",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[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_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.113"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smallvec"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.43.2"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "enum_dispatch",
+ "flagset",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "serde_with",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.29.0"
+source = "git+https://github.com/StardustXR/molecules.git#8681d8f60bf49bcb73e5fb32c89c4f441b94533b"
+dependencies = [
+ "color-rs",
+ "glam 0.24.2",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.24.2",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.2.2",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+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.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+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",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winnow"
+version = "0.5.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "yansi"
+version = "1.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
diff --git a/pkgs/by-name/st/stardust-xr-kiara/package.nix b/pkgs/by-name/st/stardust-xr-kiara/package.nix
new file mode 100644
index 000000000000..1cc87ecca8a6
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-kiara/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  makeBinaryWrapper,
+  niri,
+  stardust-xr-kiara,
+  testers,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-kiara";
+  version = "0-unstable-2024-07-13";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "kiara";
+    rev = "186b00a460c9dd8179f9af42fb9a420506ac3aff";
+    hash = "sha256-e89/x66S+MpJFtqat1hYEyRVUYFjef62LDN2hQPjNVw=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.14.1" = "sha256-fmRb46s0Ec8wnoerBh4JCv1WKz2of1YW+YGwy0Gr/yQ=";
+      "stardust-xr-molecules-0.29.0" = "sha256-sXwzrh052DCo7Jj1waebqKVmX8J9VRj5DpeUcGq3W2k=";
+    };
+  };
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+    tests.helpTest = testers.runCommand {
+      name = "stardust-xr-kiara";
+      script = ''
+        kiara --help
+        touch $out
+      '';
+      nativeBuildInputs = [ stardust-xr-kiara ];
+    };
+  };
+
+  postInstall = ''
+    wrapProgram $out/bin/kiara --prefix PATH : ${niri}/bin
+  '';
+
+  env = {
+    NIRI_CONFIG = "${src}/src/niri_config.kdl";
+    STARDUST_RES_PREFIXES = "${src}/res";
+  };
+
+  meta = {
+    description = "A 360-degree app shell / DE for Stardust XR using Niri";
+    homepage = "https://stardustxr.org/";
+    license = lib.licenses.mit;
+    mainProgram = "kiara";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-magnetar/Cargo.lock b/pkgs/by-name/st/stardust-xr-magnetar/Cargo.lock
new file mode 100644
index 000000000000..1d32fd4828d8
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-magnetar/Cargo.lock
@@ -0,0 +1,1874 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[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 = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[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.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "magnetar"
+version = "0.1.0"
+dependencies = [
+ "color-eyre",
+ "glam 0.28.0",
+ "map-range",
+ "mint",
+ "rustc-hash 2.0.0",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tween",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.68",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[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.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 2.0.68",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shiva-color-rs"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bea807e4f40f1a3df2717cc134562397b6a8f869f22568388fd5eb14bb1b69"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "cluFlock",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash 2.0.0",
+ "serde",
+ "shiva-color-rs",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/molecules.git?branch=dev#0f50742e8a9466a80677ae6d2f5aeede6b869180"
+dependencies = [
+ "glam 0.27.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "rustc-hash 1.1.0",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+ "zbus",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "tween"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "782d1e33eba0670d92d03e4da87f7304490493fc983d229dff383934c23f2d16"
+dependencies = [
+ "glam 0.27.0",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "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]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[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 = "xdg-home"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "zbus"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.28.0",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
new file mode 100644
index 000000000000..5494dd52d49a
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-magnetar";
+  version = "0-unstable-2024-08-31";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "magnetar";
+    rev = "48064b84b71d27ceea00b5d2f19dcbf21d75f554";
+    hash = "sha256-x1yHf5ceCws4C8NuoB/+kHwZK09vnn4IOFgduhjl4O8=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.45.0" = "sha256-WF/uNtFYB+ZQqsyXJe7qUCd8SHUgaNOLMxGuNIN1iKM=";
+      "stardust-xr-molecules-0.45.0" = "sha256-NncLa5ApFtlxy/BF08vy4mw2zor02VsGPaVI4arMaqM=";
+    };
+  };
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Workspaces client for Stardust";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    mainProgram = "magnetar";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-phobetor/Cargo.lock b/pkgs/by-name/st/stardust-xr-phobetor/Cargo.lock
new file mode 100644
index 000000000000..110171355f3d
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-phobetor/Cargo.lock
@@ -0,0 +1,1579 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets",
+]
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flagset"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+ "serde",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.48",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "phobetor"
+version = "0.1.0"
+dependencies = [
+ "color-eyre",
+ "glam 0.25.0",
+ "input-event-codes",
+ "manifest-dir-macros",
+ "mint",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[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_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.43.2"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "enum_dispatch",
+ "flagset",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "serde_with",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.29.0"
+source = "git+https://github.com/StardustXR/molecules.git#675acfd0a9e2610e5269edbf4baab35395849e3e"
+dependencies = [
+ "color-rs",
+ "glam 0.24.2",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.25.0",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.2",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "yansi"
+version = "1.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
diff --git a/pkgs/by-name/st/stardust-xr-phobetor/package.nix b/pkgs/by-name/st/stardust-xr-phobetor/package.nix
new file mode 100644
index 000000000000..819ddcfce37a
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-phobetor/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-phobetor";
+  version = "0-unstable-2024-02-10";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "phobetor";
+    rev = "f47d10c9ab8b37941bc9ca94677d6c80332376f3";
+    hash = "sha256-7CWOoirQ/8zKCO7lBA9snyShlwsKYONiYkl39lQrpTY=";
+  };
+
+  env.STARDUST_RES_PREFIXES = "${src}/res";
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.14.1" = "sha256-HEv1KzemGHEEcfFrzgKJmHUhGsW95J+6bcK7Bb8T9KE=";
+      "stardust-xr-molecules-0.29.0" = "sha256-yAdoJiTEulZiwRzhgoQ2cDUBxCe6NcTm88TfvDJ9Co4=";
+    };
+  };
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Handheld panel shell for Stardust XR";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    mainProgram = "phobetor";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-protostar/Cargo.lock b/pkgs/by-name/st/stardust-xr-protostar/Cargo.lock
new file mode 100644
index 000000000000..7703e25b5b69
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-protostar/Cargo.lock
@@ -0,0 +1,3432 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "app_grid"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.24.2",
+ "manifest-dir-macros",
+ "protostar",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[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 = "base64"
+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 = "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytemuck"
+version = "1.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-maps"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120b737cc99b0d73bf0a9bfa6086e84c0bde3b955851f37f812865bc08b35feb"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "data-url"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
+dependencies = [
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[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.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "exr"
+version = "1.72.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half 2.4.1",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "ez-pixmap"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db6eea12c2400666a40349e9be4020a7a81a02a0adfa52d7b72695e720e8b44d"
+dependencies = [
+ "color-maps",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
+dependencies = [
+ "roxmltree 0.19.0",
+]
+
+[[package]]
+name = "fontdb"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2",
+ "ttf-parser",
+]
+
+[[package]]
+name = "freedesktop-icons-greedy"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31b487427ff5df1386fa4721fcf41923140eb72fc20d776ac95ccbc21fa7bbb"
+dependencies = [
+ "dirs 4.0.0",
+ "itertools 0.11.0",
+ "once_cell",
+ "rust-ini 0.18.0",
+ "thiserror",
+ "walkdir",
+ "xdg",
+]
+
+[[package]]
+name = "freedesktop_entry_parser"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4"
+dependencies = [
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash 0.4.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hexagon_launcher"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.25.0",
+ "manifest-dir-macros",
+ "protostar",
+ "serde",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif 0.13.1",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
+[[package]]
+name = "imagesize"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[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",
+ "serde",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[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.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "kurbo"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "kurbo"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linicon-theme"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f8240c33bb08c5d8b8cdea87b683b05e61037aa76ff26bef40672cc6ecbb80"
+dependencies = [
+ "freedesktop_entry_parser",
+ "rust-ini 0.17.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.68",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-multimap"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485"
+dependencies = [
+ "dlv-list 0.2.3",
+ "hashbrown 0.9.1",
+]
+
+[[package]]
+name = "ordered-multimap"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
+dependencies = [
+ "dlv-list 0.3.0",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[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 = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "protostar"
+version = "0.4.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "directories",
+ "dirs 5.0.1",
+ "ez-pixmap",
+ "freedesktop-icons-greedy",
+ "glam 0.24.2",
+ "image",
+ "itertools 0.12.1",
+ "lazy_static",
+ "linicon-theme",
+ "manifest-dir-macros",
+ "mint",
+ "nix 0.27.1",
+ "regex",
+ "resvg",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_with",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tempdir",
+ "tokio",
+ "toml",
+ "tracing-subscriber",
+ "tween",
+ "ustr",
+ "walkdir",
+]
+
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+dependencies = [
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rctree"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[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.7",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "resvg"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76888219c0881e22b0ceab06fddcfe83163cd81642bd60c7842387f9c968a72e"
+dependencies = [
+ "gif 0.12.0",
+ "jpeg-decoder",
+ "log",
+ "pico-args",
+ "png",
+ "rgb",
+ "svgfilters",
+ "svgtypes 0.10.0",
+ "tiny-skia",
+ "usvg",
+ "usvg-text-layout",
+]
+
+[[package]]
+name = "rgb"
+version = "0.8.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "rosvgtree"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
+dependencies = [
+ "log",
+ "roxmltree 0.18.1",
+ "simplecss",
+ "siphasher",
+ "svgtypes 0.9.0",
+]
+
+[[package]]
+name = "roxmltree"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302"
+dependencies = [
+ "xmlparser",
+]
+
+[[package]]
+name = "roxmltree"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+
+[[package]]
+name = "rust-ini"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap 0.3.1",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap 0.4.3",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustybuzz"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "smallvec",
+ "ttf-parser",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-general-category",
+ "unicode-script",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[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.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 2.0.68",
+]
+
+[[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 = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.6",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shiva-color-rs"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bea807e4f40f1a3df2717cc134562397b6a8f869f22568388fd5eb14bb1b69"
+dependencies = [
+ "angle",
+ "half 1.8.3",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simplecss"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "single"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.24.2",
+ "manifest-dir-macros",
+ "protostar",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "sirius"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.24.2",
+ "manifest-dir-macros",
+ "protostar",
+ "serde",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+ "walkdir",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "cluFlock",
+ "dirs 5.0.1",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash 2.0.0",
+ "serde",
+ "shiva-color-rs",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/molecules.git?branch=dev#0f50742e8a9466a80677ae6d2f5aeede6b869180"
+dependencies = [
+ "glam 0.27.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "rustc-hash 1.1.0",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+ "zbus",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+dependencies = [
+ "float-cmp",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "svgfilters"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce"
+dependencies = [
+ "float-cmp",
+ "rgb",
+]
+
+[[package]]
+name = "svgtypes"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734"
+dependencies = [
+ "kurbo 0.8.3",
+ "siphasher",
+]
+
+[[package]]
+name = "svgtypes"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98ffacedcdcf1da6579c907279b4f3c5492fbce99fbbf227f5ed270a589c2765"
+dependencies = [
+ "kurbo 0.9.5",
+ "siphasher",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempdir"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+dependencies = [
+ "rand 0.4.6",
+ "remove_dir_all",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "png",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.2.6",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.2.6",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap 2.2.6",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.13",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "ttf-parser"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
+
+[[package]]
+name = "tween"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "782d1e33eba0670d92d03e4da87f7304490493fc983d229dff383934c23f2d16"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
+
+[[package]]
+name = "unicode-general-category"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-vo"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "ustr"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87"
+dependencies = [
+ "ahash 0.8.11",
+ "byteorder",
+ "lazy_static",
+ "parking_lot 0.12.3",
+]
+
+[[package]]
+name = "usvg"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
+dependencies = [
+ "base64 0.21.7",
+ "data-url",
+ "flate2",
+ "imagesize",
+ "kurbo 0.9.5",
+ "log",
+ "rctree",
+ "rosvgtree",
+ "strict-num",
+]
+
+[[package]]
+name = "usvg-text-layout"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db"
+dependencies = [
+ "fontdb",
+ "kurbo 0.9.5",
+ "log",
+ "rustybuzz",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "usvg",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "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]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[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.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[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",
+]
+
+[[package]]
+name = "xdg"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
+
+[[package]]
+name = "xdg-home"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
+[[package]]
+name = "zbus"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.28.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[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 = "zvariant"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
diff --git a/pkgs/by-name/st/stardust-xr-protostar/package.nix b/pkgs/by-name/st/stardust-xr-protostar/package.nix
new file mode 100644
index 000000000000..237b5c204edc
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-protostar/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-protostar";
+  version = "0-unstable-2024-07-19";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "protostar";
+    rev = "39499a061af74c3a2d5e1e46e4ad21aca5727219";
+    hash = "sha256-TPpkjTOZVtyVZdK65C951DpEzfI9aaRMXclZ31dAk9s=";
+  };
+
+  env.STARDUST_RES_PREFIXES = "${src}/res";
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.45.0" = "sha256-WF/uNtFYB+ZQqsyXJe7qUCd8SHUgaNOLMxGuNIN1iKM=";
+      "stardust-xr-molecules-0.45.0" = "sha256-NncLa5ApFtlxy/BF08vy4mw2zor02VsGPaVI4arMaqM=";
+    };
+  };
+
+  checkFlags = [
+    # ---- xdg::test_get_desktop_files stdout ----
+    # thread 'xdg::test_get_desktop_files' panicked at protostar/src/xdg.rs:98:5:
+    # assertion failed: desktop_files.iter().any(|file|
+    #    file.ends_with("com.belmoussaoui.ashpd.demo.desktop"))
+    "--skip=xdg::test_get_desktop_files"
+
+    # ---- xdg::test_get_icon_path stdout ----
+    # thread 'xdg::test_get_icon_path' panicked at protostar/src/xdg.rs:355:38:
+    # Could not create image cache directory: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }
+    # note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+    "--skip=xdg::test_get_icon_path"
+
+    # ---- xdg::test_render_svg_to_png stdout ----
+    # thread 'xdg::test_render_svg_to_png' panicked at protostar/src/xdg.rs:355:38:
+    # Could not create image cache directory: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }
+    "--skip=xdg::test_render_svg_to_png"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Prototype application launchers for Stardust XR";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-server/Cargo.lock b/pkgs/by-name/st/stardust-xr-server/Cargo.lock
new file mode 100644
index 000000000000..25fbfb68ac0b
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-server/Cargo.lock
@@ -0,0 +1,2867 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "angular-units"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f1c36cde4b75aa8518ad38880fdc7b649d7bf22b359a296964756e2319d598d"
+dependencies = [
+ "approx 0.3.2",
+ "num-traits",
+]
+
+[[package]]
+name = "anstream"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+
+[[package]]
+name = "appendlist"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2"
+
+[[package]]
+name = "approx"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "approx"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+
+[[package]]
+name = "bindgen"
+version = "0.64.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 1.0.109",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+
+[[package]]
+name = "bytemuck"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "calloop"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aadd183e815348c0649051b1c43418643208f8ed13c8a84da7215b4e1cf42714"
+dependencies = [
+ "bitflags 2.4.0",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cgmath"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"
+dependencies = [
+ "approx 0.4.0",
+ "num-traits",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading 0.7.4",
+]
+
+[[package]]
+name = "clap"
+version = "4.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "concat-idents"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
+dependencies = [
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "console-api"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tonic",
+ "tracing-core",
+]
+
+[[package]]
+name = "console-subscriber"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb"
+dependencies = [
+ "console-api",
+ "crossbeam-channel",
+ "crossbeam-utils",
+ "futures",
+ "hdrhistogram",
+ "humantime",
+ "prost-types",
+ "serde",
+ "serde_json",
+ "thread_local",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ctrlc"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf"
+dependencies = [
+ "nix 0.27.1",
+ "windows-sys",
+]
+
+[[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading 0.8.0",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
+[[package]]
+name = "drm"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
+dependencies = [
+ "bitflags 2.4.0",
+ "bytemuck",
+ "drm-ffi",
+ "drm-fourcc",
+ "rustix",
+]
+
+[[package]]
+name = "drm-ffi"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
+dependencies = [
+ "drm-sys",
+ "rustix",
+]
+
+[[package]]
+name = "drm-fourcc"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
+
+[[package]]
+name = "drm-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.6.1",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+dependencies = [
+ "cfg-if",
+]
+
+[[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.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum 0.5.11",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-io"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "fxtypemap"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11c87c936dd5cbf3389179749cf020d886f32cc577fc214a7a65eaac5c569db"
+dependencies = [
+ "fxhash",
+]
+
+[[package]]
+name = "generator"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
+
+[[package]]
+name = "glam"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
+dependencies = [
+ "mint",
+ "serde",
+]
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "hdrhistogram"
+version = "7.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
+dependencies = [
+ "base64 0.13.1",
+ "byteorder",
+ "flate2",
+ "nom",
+ "num-traits",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.4.9",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c"
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "libloading"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+dependencies = [
+ "cfg-if",
+ "windows-sys",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da4a7ec558fa3b65e4c69b6af8df01fb9ad51ac69262335e1505276bc091935d"
+
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "memchr"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+
+[[package]]
+name = "memmap2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "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.37",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.0",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.3",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive 0.5.11",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c86de06555b970aec45229b27291b53154f21a5743a163419f4e4c0b065dcde"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cad0c4b129e9696e37cb712b243777b90ef489a0bfaa0ac34e7d9b860e4f134"
+dependencies = [
+ "heck",
+ "itertools 0.11.0",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[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 = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.8",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "smallvec",
+ "windows-targets",
+]
+
+[[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.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "polling"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7571075a670bb8e02350c4d1c27d934aabdce416aa91a95d58dc9e21267dad3c"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "prisma"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5640533116b656900156ef15e22d3789edb9a71f36ec04a2678a307be243495"
+dependencies = [
+ "angular-units",
+ "approx 0.3.2",
+ "num-traits",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f"
+dependencies = [
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.3.8",
+ "regex-syntax 0.7.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[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_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234"
+dependencies = [
+ "bitflags 2.4.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.11",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "scan_fmt"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
+[[package]]
+name = "serde"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "smithay"
+version = "0.3.0"
+source = "git+https://github.com/smithay/smithay.git#91e61f13501f21d66803efac947bfafed43080c5"
+dependencies = [
+ "appendlist",
+ "bitflags 2.4.0",
+ "calloop",
+ "cgmath",
+ "cursor-icon",
+ "downcast-rs",
+ "drm",
+ "drm-ffi",
+ "drm-fourcc",
+ "encoding_rs",
+ "errno",
+ "gl_generator",
+ "indexmap 2.0.0",
+ "lazy_static",
+ "libc",
+ "libloading 0.8.0",
+ "once_cell",
+ "profiling",
+ "rand",
+ "rustix",
+ "scan_fmt",
+ "scopeguard",
+ "smallvec",
+ "tempfile",
+ "thiserror",
+ "tracing",
+ "wayland-protocols",
+ "wayland-protocols-misc",
+ "wayland-protocols-wlr",
+ "wayland-server",
+ "x11rb",
+ "xkbcommon",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.26.4",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.24.2",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "stardust-xr-server"
+version = "0.44.1"
+dependencies = [
+ "atty",
+ "clap",
+ "cluFlock",
+ "color-eyre",
+ "console-subscriber",
+ "ctrlc",
+ "directories",
+ "fxtypemap",
+ "glam 0.23.0",
+ "global_counter",
+ "input-event-codes",
+ "lazy_static",
+ "libc",
+ "mint",
+ "nanoid",
+ "nix 0.27.1",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "portable-atomic",
+ "prisma",
+ "rand",
+ "rustc-hash",
+ "send_wrapper",
+ "serde",
+ "serde_repr",
+ "smithay",
+ "stardust-xr",
+ "stardust-xr-server-codegen",
+ "stereokit",
+ "tokio",
+ "toml",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-tracy",
+ "wayland-backend",
+ "wayland-scanner",
+ "xkbcommon",
+]
+
+[[package]]
+name = "stardust-xr-server-codegen"
+version = "0.1.0"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stereokit"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e814a6b795ce9f02126e95a04ce5a5e80a07179e334da2e1545258799388e2"
+dependencies = [
+ "bitflags 1.3.2",
+ "concat-idents",
+ "glam 0.23.0",
+ "ndk-context",
+ "num_enum 0.6.1",
+ "serde",
+ "serde_repr",
+ "stereokit-sys",
+ "thiserror",
+]
+
+[[package]]
+name = "stereokit-sys"
+version = "2.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54ebf7419a56e4a6b1c361e8a7219172ad795ef4fc70e59136dc5ed2c4df4a78"
+dependencies = [
+ "bindgen",
+ "cmake",
+ "glam 0.23.0",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "tempfile"
+version = "3.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.5.4",
+ "tokio-macros",
+ "tracing",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.6",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.0",
+ "toml_datetime",
+ "winnow 0.5.15",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.2",
+]
+
+[[package]]
+name = "tonic"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+dependencies = [
+ "async-trait",
+ "axum",
+ "base64 0.21.4",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "tracing-tracy"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6c7bf057d67aa107e076129a4f331aaac47ec379952d9f0775c6b1d838ee97"
+dependencies = [
+ "tracing-core",
+ "tracing-subscriber",
+ "tracy-client",
+]
+
+[[package]]
+name = "tracy-client"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03684af8fb393cc7903210d868e4cb9f5c1e156737be38f52c4217fb21b86bf6"
+dependencies = [
+ "loom",
+ "once_cell",
+ "tracy-client-sys",
+]
+
+[[package]]
+name = "tracy-client-sys"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
+dependencies = [
+ "bitflags 2.4.0",
+ "wayland-backend",
+ "wayland-scanner",
+ "wayland-server",
+]
+
+[[package]]
+name = "wayland-protocols-misc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e"
+dependencies = [
+ "bitflags 2.4.0",
+ "wayland-backend",
+ "wayland-protocols",
+ "wayland-scanner",
+ "wayland-server",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+dependencies = [
+ "bitflags 2.4.0",
+ "wayland-backend",
+ "wayland-protocols",
+ "wayland-scanner",
+ "wayland-server",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-server"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce"
+dependencies = [
+ "bitflags 2.4.0",
+ "downcast-rs",
+ "io-lifetimes",
+ "nix 0.26.4",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+dependencies = [
+ "gethostname",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+
+[[package]]
+name = "xkbcommon"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
+dependencies = [
+ "libc",
+ "memmap2",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix
new file mode 100644
index 000000000000..f9567d8c54d7
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-server/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  rustPlatform,
+  cmake,
+  cpm-cmake,
+  fontconfig,
+  libGL,
+  libxkbcommon,
+  mesa,
+  openxr-loader,
+  pkg-config,
+  xorg,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-server";
+  version = "0.44.1";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "server";
+    rev = "refs/tags/${version}";
+    hash = "sha256-sCatpWDdy7NFWOWUARjN3fZMDVviX2iV79G0HTxfYZU=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "smithay-0.3.0" = "sha256-dxAgTGW+xxnL+vA6j2Ng02F1zt/Y5VaSxP9xg8jfMy8=";
+      "stardust-xr-0.14.1" = "sha256-fmRb46s0Ec8wnoerBh4JCv1WKz2of1YW+YGwy0Gr/yQ=";
+    };
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    fontconfig
+    libGL
+    libxkbcommon
+    mesa
+    openxr-loader
+    xorg.libX11
+    xorg.libXfixes
+  ];
+
+  CPM_SOURCE_CACHE = "./build";
+
+  postPatch = ''
+    install -D ${cpm-cmake}/share/cpm/CPM.cmake $(echo $cargoDepsCopy/stereokit-sys-*/StereoKit)/build/cpm/CPM_0.32.2.cmake
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Wayland compositor and display server for 3D applications";
+    homepage = "https://stardustxr.org/";
+    changelog = "https://github.com/StardustXR/server/releases";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "stardust-xr-server";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/st/stardust-xr-sphereland/Cargo.lock b/pkgs/by-name/st/stardust-xr-sphereland/Cargo.lock
new file mode 100644
index 000000000000..c3e55b6e62a3
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-sphereland/Cargo.lock
@@ -0,0 +1,1687 @@
+# This file is automatically @generated by Cargo.
+# 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets",
+]
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorgrad"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6"
+dependencies = [
+ "csscolorparser",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flagset"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+ "serde",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c86de06555b970aec45229b27291b53154f21a5743a163419f4e4c0b065dcde"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cad0c4b129e9696e37cb712b243777b90ef489a0bfaa0ac34e7d9b860e4f134"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[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 = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[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.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[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_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "1.0.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "sphereland"
+version = "0.8.0"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "colorgrad",
+ "glam",
+ "input-event-codes",
+ "lazy_static",
+ "manifest-dir-macros",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#975331f9739a9f6cb90ec75813b7720c86225848"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.43.2"
+source = "git+https://github.com/StardustXR/core.git#975331f9739a9f6cb90ec75813b7720c86225848"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "enum_dispatch",
+ "flagset",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "serde_with",
+ "stardust-xr",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.29.0"
+source = "git+https://github.com/StardustXR/molecules.git#55c108d9a717df5265ac02306264b1bf64e758fc"
+dependencies = [
+ "color-rs",
+ "glam",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+ "xkbcommon",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#975331f9739a9f6cb90ec75813b7720c86225848"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.2",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xkbcommon"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c286371c44b3572d19b09196c129a8fff47d7704d6494daefb44fec10f0278ab"
+dependencies = [
+ "libc",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
diff --git a/pkgs/by-name/st/stardust-xr-sphereland/package.nix b/pkgs/by-name/st/stardust-xr-sphereland/package.nix
new file mode 100644
index 000000000000..77ebbac9b487
--- /dev/null
+++ b/pkgs/by-name/st/stardust-xr-sphereland/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  libxkbcommon,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stardust-xr-sphereland";
+  version = "0-unstable-2023-11-06";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "sphereland";
+    rev = "39552d918c99a84eaf5f2d5e8734a472bf196f65";
+    hash = "sha256-LKdqTl14cdgD14IwAP34mWdDgREhy1CHOT86HywOxqM=";
+  };
+
+  env.STARDUST_RES_PREFIXES = "${src}/res";
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "stardust-xr-0.14.1" = "sha256-aJYovCKcR6zoqsVenCBnL5a/ccvXxNku+mAKRf0pp1Q=";
+      "stardust-xr-molecules-0.29.0" = "sha256-rzbLqx+X8KEjut6Cq4x/qiSN9OfbMemrDUP0F+hXy4U=";
+    };
+  };
+  buildInputs = [
+    libxkbcommon
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Pointer/keyboard operated window manager for Stardust XR";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    mainProgram = "sphereland";
+    maintainers = with lib.maintainers; [
+      pandapip1
+      technobaboo
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/games/stardust/default.nix b/pkgs/by-name/st/stardust/package.nix
similarity index 100%
rename from pkgs/games/stardust/default.nix
rename to pkgs/by-name/st/stardust/package.nix
diff --git a/pkgs/tools/misc/starfetch/default.nix b/pkgs/by-name/st/starfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/starfetch/default.nix
rename to pkgs/by-name/st/starfetch/package.nix
diff --git a/pkgs/development/libraries/stargate-libcds/Makefile.patch b/pkgs/by-name/st/stargate-libcds/Makefile.patch
similarity index 100%
rename from pkgs/development/libraries/stargate-libcds/Makefile.patch
rename to pkgs/by-name/st/stargate-libcds/Makefile.patch
diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/by-name/st/stargate-libcds/package.nix
similarity index 100%
rename from pkgs/development/libraries/stargate-libcds/default.nix
rename to pkgs/by-name/st/stargate-libcds/package.nix
diff --git a/pkgs/development/interpreters/starlark-rust/default.nix b/pkgs/by-name/st/starlark-rust/package.nix
similarity index 100%
rename from pkgs/development/interpreters/starlark-rust/default.nix
rename to pkgs/by-name/st/starlark-rust/package.nix
diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls-bin/package.nix
index ada91ae6bc42..a41e194615c0 100644
--- a/pkgs/by-name/st/starpls-bin/package.nix
+++ b/pkgs/by-name/st/starpls-bin/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isElf [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/misc/starry/default.nix b/pkgs/by-name/st/starry/package.nix
similarity index 100%
rename from pkgs/tools/misc/starry/default.nix
rename to pkgs/by-name/st/starry/package.nix
diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix
index 634bdf0eb474..84703b0c8c88 100644
--- a/pkgs/by-name/st/staruml/package.nix
+++ b/pkgs/by-name/st/staruml/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "/opt/StarUML/staruml" "$out/bin/staruml"
 
     mkdir -p $out/lib
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
     ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf \
diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/by-name/st/static-web-server/package.nix
similarity index 100%
rename from pkgs/servers/static-web-server/default.nix
rename to pkgs/by-name/st/static-web-server/package.nix
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/by-name/st/statifier/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/statifier/default.nix
rename to pkgs/by-name/st/statifier/package.nix
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/by-name/st/statik/package.nix
similarity index 100%
rename from pkgs/development/tools/statik/default.nix
rename to pkgs/by-name/st/statik/package.nix
diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/by-name/st/station/package.nix
similarity index 100%
rename from pkgs/applications/networking/station/default.nix
rename to pkgs/by-name/st/station/package.nix
diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/by-name/st/statix/package.nix
similarity index 100%
rename from pkgs/tools/nix/statix/default.nix
rename to pkgs/by-name/st/statix/package.nix
diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/by-name/st/statserial/package.nix
similarity index 100%
rename from pkgs/tools/misc/statserial/default.nix
rename to pkgs/by-name/st/statserial/package.nix
diff --git a/pkgs/by-name/st/stayrtr/package.nix b/pkgs/by-name/st/stayrtr/package.nix
new file mode 100644
index 000000000000..d2cc50cb1e6e
--- /dev/null
+++ b/pkgs/by-name/st/stayrtr/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  stayrtr,
+  testers,
+}:
+
+buildGoModule rec {
+  pname = "stayrtr";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "bgp";
+    repo = "stayrtr";
+    rev = "v${version}";
+    hash = "sha256-uNZe3g8hs9c0uXrkWSTA+e/gziOpWqx5oFIJ2ZPgEzU=";
+  };
+  vendorHash = "sha256-0PtQzwBhUoASUMnAAVZ4EIDmqIEaH0nct2ngyIkR+Qg=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = stayrtr;
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/bgp/stayrtr/releases/tag/v${version}";
+    description = "RPKI-To-Router server implementation in Go";
+    homepage = "https://github.com/bgp/stayrtr/";
+    license = licenses.bsd3;
+    mainProgram = "stayrtr";
+    maintainers = with maintainers; [ _0x4A6F ];
+  };
+}
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/by-name/st/stb/package.nix
similarity index 100%
rename from pkgs/development/libraries/stb/default.nix
rename to pkgs/by-name/st/stb/package.nix
diff --git a/pkgs/tools/misc/stderred/default.nix b/pkgs/by-name/st/stderred/package.nix
similarity index 100%
rename from pkgs/tools/misc/stderred/default.nix
rename to pkgs/by-name/st/stderred/package.nix
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/by-name/st/stdman/package.nix
similarity index 100%
rename from pkgs/data/documentation/stdman/default.nix
rename to pkgs/by-name/st/stdman/package.nix
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/by-name/st/stdmanpages/package.nix
similarity index 100%
rename from pkgs/data/documentation/std-man-pages/default.nix
rename to pkgs/by-name/st/stdmanpages/package.nix
diff --git a/pkgs/tools/games/steam-acf/default.nix b/pkgs/by-name/st/steam-acf/package.nix
similarity index 100%
rename from pkgs/tools/games/steam-acf/default.nix
rename to pkgs/by-name/st/steam-acf/package.nix
diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/by-name/st/steam-rom-manager/package.nix
similarity index 100%
rename from pkgs/tools/games/steam-rom-manager/default.nix
rename to pkgs/by-name/st/steam-rom-manager/package.nix
diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/by-name/st/steam-tui/package.nix
similarity index 100%
rename from pkgs/games/steam-tui/default.nix
rename to pkgs/by-name/st/steam-tui/package.nix
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/by-name/st/steamcontroller/package.nix
similarity index 100%
rename from pkgs/misc/drivers/steamcontroller/default.nix
rename to pkgs/by-name/st/steamcontroller/package.nix
diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/by-name/st/steamos-devkit/package.nix
similarity index 100%
rename from pkgs/development/tools/steamos-devkit/default.nix
rename to pkgs/by-name/st/steamos-devkit/package.nix
diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/by-name/st/steamtinkerlaunch/package.nix
similarity index 100%
rename from pkgs/tools/games/steamtinkerlaunch/default.nix
rename to pkgs/by-name/st/steamtinkerlaunch/package.nix
diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix
index c62761bb2a21..86cb3cfb4bb7 100644
--- a/pkgs/by-name/st/steghide/package.nix
+++ b/pkgs/by-name/st/steghide/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, libjpeg
-, libmcrypt
-, libmhash
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  libjpeg,
+  libmcrypt,
+  libmhash,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,16 +25,21 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-     libjpeg
-     libmcrypt
-     libmhash
-     zlib
+    libjpeg
+    libmcrypt
+    libmhash
+    zlib
   ];
 
   postPatch = ''
     cd src
   '';
 
+  # std::binary_function and std::unary_function has been removed in c++17
+  makeFlags = lib.optionals stdenv.cc.isClang [
+    "CXXFLAGS=-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/museoa/steghide";
     description = "Open source steganography program";
diff --git a/pkgs/tools/security/stegseek/default.nix b/pkgs/by-name/st/stegseek/package.nix
similarity index 100%
rename from pkgs/tools/security/stegseek/default.nix
rename to pkgs/by-name/st/stegseek/package.nix
diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/by-name/st/stegsolve/package.nix
similarity index 100%
rename from pkgs/tools/graphics/stegsolve/default.nix
rename to pkgs/by-name/st/stegsolve/package.nix
diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/by-name/st/stellar-core/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/stellar-core/default.nix
rename to pkgs/by-name/st/stellar-core/package.nix
diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/by-name/st/stenc/package.nix
similarity index 100%
rename from pkgs/tools/backup/stenc/default.nix
rename to pkgs/by-name/st/stenc/package.nix
diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix
index 7ece59b98f3d..39ebf0227d9b 100644
--- a/pkgs/by-name/st/step-cli/package.nix
+++ b/pkgs/by-name/st/step-cli/package.nix
@@ -6,7 +6,7 @@
   installShellFiles,
 }:
 let
-  version = "0.27.5";
+  version = "0.28.0";
 in
 buildGoModule {
   pname = "step-cli";
@@ -16,7 +16,7 @@ buildGoModule {
     owner = "smallstep";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5WtXJOyVUkjuJdUJ2Q4wAVDMLQ0lZI6461bZVR26h1A=";
+    hash = "sha256-Ha64SLJWJdfVt1T2M6UHyFD/OD8lmUQ0vU8OKjN272Y=";
   };
 
   ldflags = [
@@ -30,7 +30,7 @@ buildGoModule {
     rm command/certificate/remote_test.go
   '';
 
-  vendorHash = "sha256-7N+0sp1/vl2VWZWT4R6XMiji7g/qPz68JMnZaNIUl+Y=";
+  vendorHash = "sha256-yfaAms1reMGfLwiTJVRKvpNb4EzoN62W0oXoT7ErTN0=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
similarity index 100%
rename from pkgs/tools/security/step-kms-plugin/default.nix
rename to pkgs/by-name/st/step-kms-plugin/package.nix
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/by-name/st/stepmania/package.nix
similarity index 100%
rename from pkgs/games/stepmania/default.nix
rename to pkgs/by-name/st/stepmania/package.nix
diff --git a/pkgs/applications/misc/stepreduce/default.nix b/pkgs/by-name/st/stepreduce/package.nix
similarity index 100%
rename from pkgs/applications/misc/stepreduce/default.nix
rename to pkgs/by-name/st/stepreduce/package.nix
diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index d48c4e5d4239..74c5270bdbdd 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.14.115";
+  version = "3.14.127";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-Iw3NUY0rWF+/lbGcO6zn96oNnRWRH33+8gs4e5yA1vM=";
+    hash = "sha256-85d3cDtmblTrTyCQJUgQgIh2KCAuQRZhBVuo7BXsJLQ=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/st/stfl/package.nix b/pkgs/by-name/st/stfl/package.nix
new file mode 100644
index 000000000000..d53d22006036
--- /dev/null
+++ b/pkgs/by-name/st/stfl/package.nix
@@ -0,0 +1,60 @@
+{ lib, stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  pname = "stfl";
+  version = "0.24-unstable-2021-11-29";
+
+  src = fetchFromGitHub {
+    owner ="newsboat";
+    repo = "stfl";
+    rev = "c2c10b8a50fef613c0aacdc5d06a0fa610bf79e9";
+    hash = "sha256-os1yQ6o4m7yBiEZQIPP64diRleIr7FtuQucUbWs4A6k=";
+  };
+
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+  buildInputs = [ ncurses ];
+
+  # Silence warnings related to use of implicitly declared library functions and implicit ints.
+  # TODO: Remove and/or fix with patches the next time this package is updated.
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=implicit-function-declaration"
+      "-Wno-error=implicit-int"
+    ];
+  } // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
+
+  preBuild = ''
+    sed -i s/gcc/cc/g Makefile
+    sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i s/-soname/-install_name/ Makefile
+  ''
+  # upstream builds shared library unconditionally. Also, it has no
+  # support for cross-compilation.
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile
+    sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile
+    sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile
+    sed -i '/install -m 644 libstfl.so./d' Makefile
+    sed -i '/ln -fs libstfl.so./d' Makefile
+  '' ;
+
+  installPhase = ''
+    DESTDIR=$out prefix=\"\" make install
+  ''
+  # some programs rely on libstfl.so.0 to be present, so link it
+  + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+    ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0
+  '';
+
+  meta = {
+    homepage = "https://web.archive.org/web/20211113222004/http://www.clifford.at/stfl/";
+    description = "Library which implements a curses-based widget set for text terminals";
+    maintainers = with lib.maintainers; [ lovek323 ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/by-name/st/stgit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/stgit/default.nix
rename to pkgs/by-name/st/stgit/package.nix
diff --git a/pkgs/by-name/st/sticky-notes/yarn.lock b/pkgs/by-name/st/sticky-notes/yarn.lock
deleted file mode 100644
index 487cf869c895..000000000000
--- a/pkgs/by-name/st/sticky-notes/yarn.lock
+++ /dev/null
@@ -1,1093 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@adobe/css-tools@^4.0.1":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855"
-  integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==
-
-"@esbuild/android-arm64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz#ad2ee47dd021035abdfb0c38848ff77a1e1918c4"
-  integrity sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==
-
-"@esbuild/android-arm@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.10.tgz#bb5a68af8adeb94b30eadee7307404dc5237d076"
-  integrity sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==
-
-"@esbuild/android-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.10.tgz#751d5d8ae9ece1efa9627b689c888eb85b102360"
-  integrity sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==
-
-"@esbuild/darwin-arm64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz#85601ee7efb2129cd3218d5bcbe8da1173bc1e8b"
-  integrity sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==
-
-"@esbuild/darwin-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz#362c7e988c61fe72d5edef4f717e4b4fc728da98"
-  integrity sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==
-
-"@esbuild/freebsd-arm64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz#e8a85a46ede7c3a048a12f16b9d551d25adc8bb1"
-  integrity sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==
-
-"@esbuild/freebsd-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz#cd0a1b68bffbcb5b65e65b3fd542e8c7c3edd86b"
-  integrity sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==
-
-"@esbuild/linux-arm64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz#13b183f432512ed9d9281cc89476caeebe9e9123"
-  integrity sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==
-
-"@esbuild/linux-arm@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz#dd11e0a5faa3ea94dc80278a601c3be7b4fdf1da"
-  integrity sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==
-
-"@esbuild/linux-ia32@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz#4d836f87b92807d9292379963c4888270d282405"
-  integrity sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==
-
-"@esbuild/linux-loong64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz#92eb2ee200c17ef12c7fb3b648231948699e7a4c"
-  integrity sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==
-
-"@esbuild/linux-mips64el@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz#14f7d50c40fe7f7ee545a9bd07c6f6e4cba5570e"
-  integrity sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==
-
-"@esbuild/linux-ppc64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz#1ab5802e93ae511ce9783e1cb95f37df0f84c4af"
-  integrity sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==
-
-"@esbuild/linux-riscv64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz#4fae25201ef7ad868731d16c8b50b0e386c4774a"
-  integrity sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==
-
-"@esbuild/linux-s390x@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz#126254d8335bb3586918b1ca60beb4abb46e6d54"
-  integrity sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==
-
-"@esbuild/linux-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz#7fa4667b2df81ea0538e1b75e607cf04e526ce91"
-  integrity sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==
-
-"@esbuild/netbsd-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz#2d24727ddc2305619685bf237a46d6087a02ee9a"
-  integrity sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==
-
-"@esbuild/openbsd-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz#bf3fc38ee6ecf028c1f0cfe11f61d53cc75fef12"
-  integrity sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==
-
-"@esbuild/sunos-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz#8deabd6dfec6256f80bb101bc59d29dbae99c69b"
-  integrity sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==
-
-"@esbuild/win32-arm64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz#1ec1ee04c788c4c57a83370b6abf79587b3e4965"
-  integrity sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==
-
-"@esbuild/win32-ia32@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz#a362528d7f3ad5d44fa8710a96764677ef92ebe9"
-  integrity sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==
-
-"@esbuild/win32-x64@0.17.10":
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz#ac779220f2da96afd480fb3f3148a292f66e7fc3"
-  integrity sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==
-
-"@eslint/eslintrc@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
-  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.4.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.5"
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/minimist@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
-
-"@types/node@*":
-  version "18.14.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f"
-  integrity sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ==
-
-"@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
-
-"@types/stylus@^0.48.38":
-  version "0.48.38"
-  resolved "https://registry.yarnpkg.com/@types/stylus/-/stylus-0.48.38.tgz#6e62a59f9350f53a253aa42b038b6aa44a642c5b"
-  integrity sha512-B5otJekvD6XM8iTrnO6e2twoTY2tKL9VkL/57/2Lo4tv3EatbCaufdi68VVtn/h4yjO+HVvYEyrNQd0Lzj6riw==
-  dependencies:
-    "@types/node" "*"
-
-"@typescript-eslint/eslint-plugin@^5.33.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz#da3f2819633061ced84bb82c53bba45a6fe9963a"
-  integrity sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.51.0"
-    "@typescript-eslint/type-utils" "5.51.0"
-    "@typescript-eslint/utils" "5.51.0"
-    debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    regexpp "^3.2.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^5.33.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz#2d74626652096d966ef107f44b9479f02f51f271"
-  integrity sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.51.0"
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/typescript-estree" "5.51.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz#ad3e3c2ecf762d9a4196c0fbfe19b142ac498990"
-  integrity sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==
-  dependencies:
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/visitor-keys" "5.51.0"
-
-"@typescript-eslint/type-utils@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz#7af48005531700b62a20963501d47dfb27095988"
-  integrity sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "5.51.0"
-    "@typescript-eslint/utils" "5.51.0"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/types@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz#e7c1622f46c7eea7e12bbf1edfb496d4dec37c90"
-  integrity sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==
-
-"@typescript-eslint/typescript-estree@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz#0ec8170d7247a892c2b21845b06c11eb0718f8de"
-  integrity sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==
-  dependencies:
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/visitor-keys" "5.51.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.51.0.tgz#074f4fabd5b12afe9c8aa6fdee881c050f8b4d47"
-  integrity sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.51.0"
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/typescript-estree" "5.51.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-    semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz#c0147dd9a36c0de758aaebd5b48cae1ec59eba87"
-  integrity sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==
-  dependencies:
-    "@typescript-eslint/types" "5.51.0"
-    eslint-visitor-keys "^3.3.0"
-
-acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^8.8.0:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-ajv@^6.10.0, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-chalk@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-deep-is@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-esbuild@^0.17.10:
-  version "0.17.10"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.10.tgz#3be050561b34c5dc05b46978f4e1f326d5cc9437"
-  integrity sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==
-  optionalDependencies:
-    "@esbuild/android-arm" "0.17.10"
-    "@esbuild/android-arm64" "0.17.10"
-    "@esbuild/android-x64" "0.17.10"
-    "@esbuild/darwin-arm64" "0.17.10"
-    "@esbuild/darwin-x64" "0.17.10"
-    "@esbuild/freebsd-arm64" "0.17.10"
-    "@esbuild/freebsd-x64" "0.17.10"
-    "@esbuild/linux-arm" "0.17.10"
-    "@esbuild/linux-arm64" "0.17.10"
-    "@esbuild/linux-ia32" "0.17.10"
-    "@esbuild/linux-loong64" "0.17.10"
-    "@esbuild/linux-mips64el" "0.17.10"
-    "@esbuild/linux-ppc64" "0.17.10"
-    "@esbuild/linux-riscv64" "0.17.10"
-    "@esbuild/linux-s390x" "0.17.10"
-    "@esbuild/linux-x64" "0.17.10"
-    "@esbuild/netbsd-x64" "0.17.10"
-    "@esbuild/openbsd-x64" "0.17.10"
-    "@esbuild/sunos-x64" "0.17.10"
-    "@esbuild/win32-arm64" "0.17.10"
-    "@esbuild/win32-ia32" "0.17.10"
-    "@esbuild/win32-x64" "0.17.10"
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint@^8.21.0:
-  version "8.33.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7"
-  integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==
-  dependencies:
-    "@eslint/eslintrc" "^1.4.1"
-    "@humanwhocodes/config-array" "^0.11.8"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.4.0"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-
-espree@^9.4.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
-  integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
-  dependencies:
-    reusify "^1.0.4"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
-  dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
-
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-glob-parent@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
-glob@^7.1.3, glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
-  dependencies:
-    type-fest "^0.20.2"
-
-globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-ignore@^5.2.0:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-js-sdsl@^4.1.4:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
-  integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
-
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-linkifyjs@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde"
-  integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-mkdirp@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.3.tgz#b083ff37be046fd3d6552468c1f0ff44c1545d1f"
-  integrity sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-punycode@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-sax@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-semver@^7.3.7:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-source-map@^0.7.3:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-stylus@^0.59.0:
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.59.0.tgz#a344d5932787142a141946536d6e24e6a6be7aa6"
-  integrity sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==
-  dependencies:
-    "@adobe/css-tools" "^4.0.1"
-    debug "^4.3.2"
-    glob "^7.1.6"
-    sax "~1.2.4"
-    source-map "^0.7.3"
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-typescript@^4.7.4:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/by-name/st/sticky/package.nix
similarity index 100%
rename from pkgs/applications/misc/sticky/default.nix
rename to pkgs/by-name/st/sticky/package.nix
diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/by-name/st/stig/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/stig/default.nix
rename to pkgs/by-name/st/stig/package.nix
diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/by-name/st/stilo-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/stilo/default.nix
rename to pkgs/by-name/st/stilo-themes/package.nix
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/by-name/st/stix-otf/package.nix
similarity index 100%
rename from pkgs/data/fonts/stix-otf/default.nix
rename to pkgs/by-name/st/stix-otf/package.nix
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/by-name/st/stix-two/package.nix
similarity index 100%
rename from pkgs/data/fonts/stix-two/default.nix
rename to pkgs/by-name/st/stix-two/package.nix
diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/by-name/st/stm32cubemx/package.nix
similarity index 100%
rename from pkgs/development/embedded/stm32/stm32cubemx/default.nix
rename to pkgs/by-name/st/stm32cubemx/package.nix
diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/by-name/st/stm32flash/package.nix
similarity index 100%
rename from pkgs/development/embedded/stm32/stm32flash/default.nix
rename to pkgs/by-name/st/stm32flash/package.nix
diff --git a/pkgs/development/embedded/stm8/stm8flash/default.nix b/pkgs/by-name/st/stm8flash/package.nix
similarity index 100%
rename from pkgs/development/embedded/stm8/stm8flash/default.nix
rename to pkgs/by-name/st/stm8flash/package.nix
diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/by-name/st/stochas/package.nix
similarity index 100%
rename from pkgs/applications/audio/stochas/default.nix
rename to pkgs/by-name/st/stochas/package.nix
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
new file mode 100644
index 000000000000..134eaa660d3a
--- /dev/null
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchFromGitHub,
+  apple-sdk,
+  apple-sdk_11,
+  darwinMinVersionHook
+}:
+
+let
+    # The x86-64-modern may need to be refined further in the future
+    # but stdenv.hostPlatform CPU flags do not currently work on Darwin
+    # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745
+    archDarwin = if stdenv.hostPlatform.isx86_64 then "x86-64-modern" else "apple-silicon";
+    arch = if stdenv.hostPlatform.isDarwin then archDarwin else
+           if stdenv.hostPlatform.isx86_64 then "x86-64" else
+           if stdenv.hostPlatform.isi686 then "x86-32" else
+           if stdenv.hostPlatform.isAarch64 then "armv8" else
+           "unknown";
+
+    # These files can be found in src/evaluate.h
+    nnueBigFile = "nn-1111cefa1111.nnue";
+    nnueBig = fetchurl {
+      name = nnueBigFile;
+      url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
+      sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
+    };
+    nnueSmallFile = "nn-37f18f62d772.nnue";
+    nnueSmall = fetchurl {
+      name = nnueSmallFile;
+      url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
+      sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
+    };
+in
+
+stdenv.mkDerivation rec {
+  pname = "stockfish";
+  version = "17";
+
+  src = fetchFromGitHub {
+    owner = "official-stockfish";
+    repo = "Stockfish";
+    rev = "sf_${version}";
+    sha256 = "sha256-oXvLaC5TEUPlHjhm7tOxpNPY88QxYHFw+Cev3Q8NEeQ=";
+  };
+
+  postUnpack = ''
+    sourceRoot+=/src
+    cp "${nnueBig}" "$sourceRoot/${nnueBigFile}"
+    cp "${nnueSmall}" "$sourceRoot/${nnueSmallFile}"
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" "CXX=${stdenv.cc.targetPrefix}c++" ];
+  buildFlags = [ "build" ];
+
+  buildInputs = lib.optionals (
+       stdenv.hostPlatform.isDarwin
+    && lib.versionOlder apple-sdk.version "11") [
+    apple-sdk_11
+    (darwinMinVersionHook "10.15")
+  ];
+
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://stockfishchess.org/";
+    description = "Strong open source chess engine";
+    mainProgram = "stockfish";
+    longDescription = ''
+      Stockfish is one of the strongest chess engines in the world. It is also
+      much stronger than the best human chess grandmasters.
+      '';
+    maintainers = with maintainers; [ luispedro siraben thibaultd ];
+    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
+    license = licenses.gpl3Only;
+  };
+
+}
diff --git a/pkgs/games/stone-kingdoms/default.nix b/pkgs/by-name/st/stone-kingdoms/package.nix
similarity index 100%
rename from pkgs/games/stone-kingdoms/default.nix
rename to pkgs/by-name/st/stone-kingdoms/package.nix
diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/by-name/st/stone-phaser/package.nix
similarity index 100%
rename from pkgs/applications/audio/stone-phaser/default.nix
rename to pkgs/by-name/st/stone-phaser/package.nix
diff --git a/pkgs/servers/stone/default.nix b/pkgs/by-name/st/stone/package.nix
similarity index 100%
rename from pkgs/servers/stone/default.nix
rename to pkgs/by-name/st/stone/package.nix
diff --git a/pkgs/by-name/st/stopmotion/package.nix b/pkgs/by-name/st/stopmotion/package.nix
new file mode 100644
index 000000000000..a285c847a6fb
--- /dev/null
+++ b/pkgs/by-name/st/stopmotion/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  cmake,
+  pkg-config,
+  qt5,
+  libvorbis,
+  libarchive,
+  libxml2,
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.8.7";
+  pname = "stopmotion";
+
+  src = fetchgit {
+    url = "https://invent.kde.org/multimedia/stopmotion";
+    rev = version;
+    hash = "sha256-wqrB0mo7sI9ntWF9QlYmGiRiIoLkMzD+mQ6BzhbAKX8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt5.wrapQtAppsHook
+  ];
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtmultimedia
+    libvorbis
+    libarchive
+    libxml2
+  ];
+
+  meta = with lib; {
+    description = "Create stop-motion animation movies";
+    homepage = "http://linuxstopmotion.org/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+    mainProgram = "stopmotion";
+  };
+}
diff --git a/pkgs/tools/backup/store-backup/CVE-2020-7040.patch b/pkgs/by-name/st/storeBackup/CVE-2020-7040.patch
similarity index 100%
rename from pkgs/tools/backup/store-backup/CVE-2020-7040.patch
rename to pkgs/by-name/st/storeBackup/CVE-2020-7040.patch
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/by-name/st/storeBackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/store-backup/default.nix
rename to pkgs/by-name/st/storeBackup/package.nix
diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/by-name/st/storj-uplink/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/storj-uplink/default.nix
rename to pkgs/by-name/st/storj-uplink/package.nix
diff --git a/pkgs/by-name/st/storm/package.nix b/pkgs/by-name/st/storm/package.nix
new file mode 100644
index 000000000000..2a3e31dc052b
--- /dev/null
+++ b/pkgs/by-name/st/storm/package.nix
@@ -0,0 +1,76 @@
+{ stdenv, lib, fetchurl, zip, unzip
+, jdk, python3
+, confFile ? ""
+, extraLibraryPaths ? []
+, extraJars ? []
+, testers
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "apache-storm";
+  version = "2.6.4";
+  name = "${finalAttrs.pname}-${finalAttrs.version}";
+
+  src = fetchurl {
+    url = "mirror://apache/storm/${finalAttrs.name}/${finalAttrs.name}.tar.gz";
+    hash = "sha256-7RNnzqiA0JPDcixvkKjc34mqpZ7+7Ti2B8nY1AXUPl0=";
+  };
+
+  nativeBuildInputs = [ zip unzip ];
+
+  installPhase = ''
+    mkdir -p $out/share/${finalAttrs.name}
+    mv public $out/docs
+    mv examples $out/share/${finalAttrs.name}/.
+
+    mv external extlib* lib $out/.
+    mv conf bin $out/.
+    mv log4j2 $out/conf/.
+  '';
+
+  fixupPhase = ''
+    patchShebangs $out
+    # Fix python reference
+    sed -i \
+      -e '19iPYTHON=${python3}/bin/python' \
+      -e 's|#!/usr/bin/.*python|#!${python3}/bin/python|' \
+      $out/bin/storm
+    sed -i \
+      -e 's|#!/usr/bin/.*python|#!${python3}/bin/python|' \
+      -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \
+      -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \
+        $out/bin/storm.py
+
+    # Default jdk location
+    sed -i -e 's|export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \
+           $out/conf/storm-env.sh
+    unzip  $out/lib/storm-client-${finalAttrs.version}.jar defaults.yaml;
+    zip -d $out/lib/storm-client-${finalAttrs.version}.jar defaults.yaml;
+    sed -i \
+       -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \
+       -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \
+      defaults.yaml
+    ${lib.optionalString (confFile != "") "cat ${confFile} >> defaults.yaml"}
+    mv defaults.yaml $out/conf;
+
+    # Link to extra jars
+    cd $out/lib;
+    ${lib.concatMapStrings (jar: "ln -s ${jar};\n") extraJars}
+  '';
+
+  dontStrip = true;
+
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "storm version";
+  };
+
+  meta = with lib; {
+    homepage = "https://storm.apache.org/";
+    description = "Distributed realtime computation system";
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.asl20;
+    maintainers = with maintainers; [ edwtjo vizanto ];
+    platforms = with platforms; unix;
+  };
+})
diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/by-name/st/storrent/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/storrent/default.nix
rename to pkgs/by-name/st/storrent/package.nix
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/by-name/st/stow/package.nix
similarity index 100%
rename from pkgs/tools/misc/stow/default.nix
rename to pkgs/by-name/st/stow/package.nix
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/by-name/st/stp/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/stp/default.nix
rename to pkgs/by-name/st/stp/package.nix
diff --git a/pkgs/applications/science/logic/stp/stdint.patch b/pkgs/by-name/st/stp/stdint.patch
similarity index 100%
rename from pkgs/applications/science/logic/stp/stdint.patch
rename to pkgs/by-name/st/stp/stdint.patch
diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/by-name/st/strace-analyzer/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/strace-analyzer/default.nix
rename to pkgs/by-name/st/strace-analyzer/package.nix
diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
new file mode 100644
index 000000000000..7725eef3f65e
--- /dev/null
+++ b/pkgs/by-name/st/strace/package.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater, elfutils }:
+
+stdenv.mkDerivation rec {
+  pname = "strace";
+  version = "6.11";
+
+  src = fetchurl {
+    url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U=";
+  };
+
+  separateDebugInfo = true;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ perl ];
+
+  enableParallelBuilding = true;
+
+  # libunwind for -k.
+  # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
+  # The build will silently fall back and -k will not work on RISC-V.
+  buildInputs = [ libunwind ]
+    # -kk
+    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
+
+  configureFlags = [ "--enable-mpers=check" ]
+    ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function";
+
+  passthru.updateScript = gitUpdater {
+    # No nicer place to find latest release.
+    url = "https://github.com/strace/strace.git";
+    rev-prefix = "v";
+  };
+
+  meta = with lib; {
+    homepage = "https://strace.io/";
+    description = "System call tracer for Linux";
+    license =  with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ globin ma27 qyliss ];
+    mainProgram = "strace";
+  };
+}
diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/by-name/st/stratis-cli/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/stratis-cli/default.nix
rename to pkgs/by-name/st/stratis-cli/package.nix
diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/by-name/st/stratisd/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/stratisd/default.nix
rename to pkgs/by-name/st/stratisd/package.nix
diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/by-name/st/stratovirt/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/stratovirt/default.nix
rename to pkgs/by-name/st/stratovirt/package.nix
diff --git a/pkgs/applications/video/streamlink/ffmpeg-path.patch b/pkgs/by-name/st/streamlink/ffmpeg-path.patch
similarity index 100%
rename from pkgs/applications/video/streamlink/ffmpeg-path.patch
rename to pkgs/by-name/st/streamlink/ffmpeg-path.patch
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/by-name/st/streamlink/package.nix
similarity index 100%
rename from pkgs/applications/video/streamlink/default.nix
rename to pkgs/by-name/st/streamlink/package.nix
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/by-name/st/streamripper/package.nix
similarity index 100%
rename from pkgs/applications/audio/streamripper/default.nix
rename to pkgs/by-name/st/streamripper/package.nix
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/by-name/st/strelka/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/strelka/default.nix
rename to pkgs/by-name/st/strelka/package.nix
diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
new file mode 100644
index 000000000000..88d18c2211db
--- /dev/null
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -0,0 +1,76 @@
+{ lib, stdenv, fetchFromGitHub
+, attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib
+, libglvnd, mesa
+}:
+
+stdenv.mkDerivation rec {
+  pname = "stress-ng";
+  version = "0.18.06";
+
+  src = fetchFromGitHub {
+    owner = "ColinIanKing";
+    repo = pname;
+    rev = "V${version}";
+    hash = "sha256-zQKyVzfqDzarEhb2tlndQ60GuIkL5a2fXh86wIdWLDk=";
+  };
+
+  postPatch = ''
+    sed -i '/\#include /i #undef HAVE_STRLCAT\n#undef HAVE_STRLCPY' stress-ng.h
+  ''; # needed because of Darwin patch on libbsd
+
+  # All platforms inputs then Linux-only ones
+  buildInputs = [ judy libbsd libgcrypt zlib ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      attr keyutils libaio libapparmor libcap lksctp-tools libglvnd mesa
+    ];
+
+  makeFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "MANDIR=${placeholder "out"}/share/man/man1"
+    "JOBDIR=${placeholder "out"}/share/stress-ng/example-jobs"
+    "BASHDIR=${placeholder "out"}/share/bash-completion/completions"
+  ];
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";
+
+  # Won't build on i686 because the binary will be linked again in the
+  # install phase without checking the dependencies. This will prevent
+  # triggering the rebuild. Why this only happens on i686 remains a
+  # mystery, though. :-(
+  enableParallelBuilding = (!stdenv.hostPlatform.isi686);
+
+  meta = with lib; {
+    description = "Stress test a computer system";
+    longDescription = ''
+      stress-ng will stress test a computer system in various selectable ways. It
+      was designed to exercise various physical subsystems of a computer as well as
+      the various operating system kernel interfaces. Stress-ng features:
+
+        * over 210 stress tests
+        * over 50 CPU specific stress tests that exercise floating point, integer,
+          bit manipulation and control flow
+        * over 20 virtual memory stress tests
+        * portable: builds on Linux, Solaris, *BSD, Minix, Android, MacOS X,
+          Debian Hurd, Haiku, Windows Subsystem for Linux and SunOs/Dilos with
+          gcc, clang, tcc and pcc.
+
+      stress-ng was originally intended to make a machine work hard and trip hardware
+      issues such as thermal overruns as well as operating system bugs that only
+      occur when a system is being thrashed hard. Use stress-ng with caution as some
+      of the tests can make a system run hot on poorly designed hardware and also can
+      cause excessive system thrashing which may be difficult to stop.
+
+      stress-ng can also measure test throughput rates; this can be useful to observe
+      performance changes across different operating system releases or types of
+      hardware. However, it has never been intended to be used as a precise benchmark
+      test suite, so do NOT use it in this manner.
+    '';
+    homepage = "https://github.com/ColinIanKing/stress-ng";
+    downloadPage = "https://github.com/ColinIanKing/stress-ng/tags";
+    changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${version}/debian/changelog";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ c0bw3b ];
+    platforms = platforms.unix;
+    mainProgram = "stress-ng";
+  };
+}
diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/by-name/st/stress/package.nix
similarity index 100%
rename from pkgs/tools/system/stress/default.nix
rename to pkgs/by-name/st/stress/package.nix
diff --git a/pkgs/tools/system/stressapptest/default.nix b/pkgs/by-name/st/stressapptest/package.nix
similarity index 100%
rename from pkgs/tools/system/stressapptest/default.nix
rename to pkgs/by-name/st/stressapptest/package.nix
diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/by-name/st/stretchly/package.nix
similarity index 100%
rename from pkgs/applications/misc/stretchly/default.nix
rename to pkgs/by-name/st/stretchly/package.nix
diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/by-name/st/stricat/package.nix
similarity index 100%
rename from pkgs/tools/security/stricat/default.nix
rename to pkgs/by-name/st/stricat/package.nix
diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/by-name/st/string-machine/package.nix
similarity index 100%
rename from pkgs/applications/audio/string-machine/default.nix
rename to pkgs/by-name/st/string-machine/package.nix
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/by-name/st/stripe-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/stripe-cli/default.nix
rename to pkgs/by-name/st/stripe-cli/package.nix
diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/pkgs/by-name/st/strongswan/ext_auth-path.patch
similarity index 100%
rename from pkgs/tools/networking/strongswan/ext_auth-path.patch
rename to pkgs/by-name/st/strongswan/ext_auth-path.patch
diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/pkgs/by-name/st/strongswan/firewall_defaults.patch
similarity index 100%
rename from pkgs/tools/networking/strongswan/firewall_defaults.patch
rename to pkgs/by-name/st/strongswan/firewall_defaults.patch
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/by-name/st/strongswan/package.nix
similarity index 100%
rename from pkgs/tools/networking/strongswan/default.nix
rename to pkgs/by-name/st/strongswan/package.nix
diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/pkgs/by-name/st/strongswan/updown-path.patch
similarity index 100%
rename from pkgs/tools/networking/strongswan/updown-path.patch
rename to pkgs/by-name/st/strongswan/updown-path.patch
diff --git a/pkgs/applications/graphics/structorizer/makeBigJar.patch b/pkgs/by-name/st/structorizer/makeBigJar.patch
similarity index 100%
rename from pkgs/applications/graphics/structorizer/makeBigJar.patch
rename to pkgs/by-name/st/structorizer/makeBigJar.patch
diff --git a/pkgs/applications/graphics/structorizer/makeStructorizer.patch b/pkgs/by-name/st/structorizer/makeStructorizer.patch
similarity index 100%
rename from pkgs/applications/graphics/structorizer/makeStructorizer.patch
rename to pkgs/by-name/st/structorizer/makeStructorizer.patch
diff --git a/pkgs/by-name/st/structorizer/package.nix b/pkgs/by-name/st/structorizer/package.nix
new file mode 100644
index 000000000000..282a1eb1cb7e
--- /dev/null
+++ b/pkgs/by-name/st/structorizer/package.nix
@@ -0,0 +1,109 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, jdk11
+, makeDesktopItem
+, makeWrapper
+, copyDesktopItems
+, nix-update-script
+}:
+
+stdenv.mkDerivation rec {
+  pname = "structorizer";
+  version = "3.32-23";
+
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = "Structorizer";
+      desktopName = "Structorizer";
+      genericName = "Diagram creator";
+      comment = meta.description;
+      icon = pname;
+      exec = pname;
+      terminal = false;
+      mimeTypes = [ "application/nsd" ];
+      categories = [
+        "Development"
+        "Graphics"
+        "VectorGraphics"
+        "RasterGraphics"
+        "ComputerScience"
+      ];
+      keywords = [ "nsd" "diagrams" ];
+    })
+  ];
+
+  src = fetchFromGitHub {
+    owner = "fesch";
+    repo = "Structorizer.Desktop";
+    rev = version;
+    hash = "sha256-fqvQH4DRl+R0laGOnfWgFz67JSAdUzrws4k7gmQ3S7A=";
+  };
+
+  patches = [ ./makeStructorizer.patch ./makeBigJar.patch ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ];
+
+  buildInputs = [ jdk11 ];
+
+  postPatch = ''
+    chmod +x makeStructorizer
+    chmod +x makeBigJar
+
+    patchShebangs --build makeStructorizer
+    patchShebangs --build makeBigJar
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    ./makeStructorizer
+    ./makeBigJar
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -d $out/bin $out/share/mime/packages
+
+    install -D ${pname}.jar -t $out/share/java/
+      makeWrapper ${jdk11}/bin/java $out/bin/${pname} \
+      --add-flags "-jar $out/share/java/${pname}.jar" \
+      --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd'
+
+    cat << EOF > $out/share/mime/packages/structorizer.xml
+    
+    
+      
+             Nassi-Shneiderman diagram
+             Nassi-Shneiderman-Diagramm
+             
+      
+    
+    EOF
+
+    cd src/lu/fisch/${pname}/gui
+    install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png
+    for icon_width in 24 32 48 64 128 256; do
+      install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png
+    done
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Create Nassi-Shneiderman diagrams (NSD)";
+    homepage = "https://structorizer.fisch.lu";
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ annaaurora ];
+    mainProgram = "structorizer";
+  };
+}
diff --git a/pkgs/by-name/st/stt/package.nix b/pkgs/by-name/st/stt/package.nix
new file mode 100644
index 000000000000..8d3cb54d614b
--- /dev/null
+++ b/pkgs/by-name/st/stt/package.nix
@@ -0,0 +1,41 @@
+{ stdenv, lib, fetchurl, autoPatchelfHook, bzip2, xz }:
+
+stdenv.mkDerivation rec {
+  pname = "stt";
+  version = "1.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/coqui-ai/STT/releases/download/v${version}/native_client.tflite.Linux.tar.xz";
+    hash = "sha256-RVYc64pLYumQoVUEFZdxfUUaBMozaqgD0h/yiMaWN90=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    bzip2
+    xz
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  installPhase = ''
+    install -D stt $out/bin/stt
+    install -D coqui-stt.h $out/include/coqui-stt.h
+    install -D libkenlm.so $out/lib/libkenlm.so
+    install -D libsox.so.3 $out/lib/libsox.so.3
+    install -D libstt.so $out/lib/libstt.so
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/coqui-ai/STT";
+    description = "Deep learning toolkit for Speech-to-Text, battle-tested in research and production";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.mpl20;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ rvolosatovs ];
+    mainProgram = "stt";
+  };
+}
diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/by-name/st/stuffbin/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/stuffbin/default.nix
rename to pkgs/by-name/st/stuffbin/package.nix
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/by-name/st/stumpish/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/stumpish/default.nix
rename to pkgs/by-name/st/stumpish/package.nix
diff --git a/pkgs/applications/window-managers/stumpish/paths.patch b/pkgs/by-name/st/stumpish/paths.patch
similarity index 100%
rename from pkgs/applications/window-managers/stumpish/paths.patch
rename to pkgs/by-name/st/stumpish/paths.patch
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/by-name/st/stun/package.nix
similarity index 100%
rename from pkgs/tools/networking/stun/default.nix
rename to pkgs/by-name/st/stun/package.nix
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/by-name/st/stunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/stunnel/default.nix
rename to pkgs/by-name/st/stunnel/package.nix
diff --git a/pkgs/tools/networking/stuntman/default.nix b/pkgs/by-name/st/stuntman/package.nix
similarity index 100%
rename from pkgs/tools/networking/stuntman/default.nix
rename to pkgs/by-name/st/stuntman/package.nix
diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/by-name/st/stw/package.nix
similarity index 100%
rename from pkgs/applications/misc/stw/default.nix
rename to pkgs/by-name/st/stw/package.nix
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/by-name/st/stxxl/package.nix
similarity index 100%
rename from pkgs/development/libraries/stxxl/default.nix
rename to pkgs/by-name/st/stxxl/package.nix
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index b0154c709191..fd01a5acf180 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -4,14 +4,14 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "stylance-cli";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-kpii3Jwvqhzp+Kummr0ypI9vyYVOcYKK0xCPwQknuWY=";
+    hash = "sha256-2RLdO2TxIa/ngji5tzKzSfpq2qErI7gaQqObDTMrd/g=";
   };
 
-  cargoHash = "sha256-tVSMZW2umkSilgPs/J7iFoBxKISrh7D73q3JWh2dJhI=";
+  cargoHash = "sha256-26EKLvqc9x7JT6EDkH9KbQJ+xX/CUslLmEF4XxnPbFY=";
 
   meta = with lib; {
     description = "Library and cli tool for working with scoped CSS in rust";
diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/by-name/st/stylish/package.nix
similarity index 100%
rename from pkgs/applications/misc/stylish/default.nix
rename to pkgs/by-name/st/stylish/package.nix
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/by-name/st/stylua/package.nix
similarity index 100%
rename from pkgs/development/tools/stylua/default.nix
rename to pkgs/by-name/st/stylua/package.nix
diff --git a/pkgs/by-name/st/styluslabs-write-bin/package.nix b/pkgs/by-name/st/styluslabs-write-bin/package.nix
index 4e5ca2af4942..d15875494d79 100644
--- a/pkgs/by-name/st/styluslabs-write-bin/package.nix
+++ b/pkgs/by-name/st/styluslabs-write-bin/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     libPath = lib.makeLibraryPath [
       libsForQt5.qtbase # libQt5PrintSupport.so.5
       libsForQt5.qtsvg  # libQt5Svg.so.5
-      stdenv.cc.cc.lib  # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc)  # libstdc++.so.6
       libglvnd          # libGL.so.1
       libX11            # libX11.so.6
       libXi             # libXi.so.6
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/by-name/st/styx/package.nix
similarity index 100%
rename from pkgs/applications/misc/styx/default.nix
rename to pkgs/by-name/st/styx/package.nix
diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/by-name/su/sub-batch/package.nix
similarity index 100%
rename from pkgs/applications/video/sub-batch/default.nix
rename to pkgs/by-name/su/sub-batch/package.nix
diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/by-name/su/subberthehut/package.nix
similarity index 100%
rename from pkgs/tools/misc/subberthehut/default.nix
rename to pkgs/by-name/su/subberthehut/package.nix
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/by-name/su/subdl/package.nix
similarity index 100%
rename from pkgs/applications/video/subdl/default.nix
rename to pkgs/by-name/su/subdl/package.nix
diff --git a/pkgs/tools/text/subedit/default.nix b/pkgs/by-name/su/subedit/package.nix
similarity index 100%
rename from pkgs/tools/text/subedit/default.nix
rename to pkgs/by-name/su/subedit/package.nix
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/by-name/su/subfinder/package.nix
similarity index 100%
rename from pkgs/tools/networking/subfinder/default.nix
rename to pkgs/by-name/su/subfinder/package.nix
diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/by-name/su/subgit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/subgit/default.nix
rename to pkgs/by-name/su/subgit/package.nix
diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/by-name/su/subjs/package.nix
similarity index 100%
rename from pkgs/tools/security/subjs/default.nix
rename to pkgs/by-name/su/subjs/package.nix
diff --git a/pkgs/by-name/su/sublime/package.nix b/pkgs/by-name/su/sublime/package.nix
new file mode 100644
index 000000000000..1a62b1256cca
--- /dev/null
+++ b/pkgs/by-name/su/sublime/package.nix
@@ -0,0 +1,68 @@
+{ fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }:
+let
+  libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ];
+in
+
+stdenv.mkDerivation rec {
+  pname = "sublimetext";
+  version = "2.0.2";
+
+  src =
+    if stdenv.hostPlatform.system == "i686-linux" then
+      fetchurl {
+        name = "sublimetext-${version}.tar.bz2";
+        urls = [
+          "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
+          "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2"
+        ];
+        sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7";
+      }
+    else
+      fetchurl {
+        name = "sublimetext-${version}.tar.bz2";
+        urls = [
+          "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
+          "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2"
+        ];
+        sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1";
+      };
+  buildCommand = ''
+    tar xvf ${src}
+    mkdir -p $out/bin
+    mv Sublime* $out/sublime
+    ln -s $out/sublime/sublime_text $out/bin/sublime
+    ln -s $out/sublime/sublime_text $out/bin/sublime2
+
+    echo ${libPath}
+    patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
+      $out/sublime/sublime_text
+
+    mkdir -p $out/share/icons
+
+    for x in $(ls $out/sublime/Icon); do
+      mkdir -p $out/share/icons/hicolor/$x/apps
+      cp -v $out/sublime/Icon/$x/* $out/share/icons/hicolor/$x/apps
+    done
+
+    ln -sv "${desktopItem}/share/applications" $out/share
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "sublime2";
+    exec = "sublime2 %F";
+    comment = meta.description;
+    desktopName = "Sublime Text";
+    genericName = "Text Editor";
+    categories = [ "TextEditor" "Development" ];
+    icon = "sublime_text";
+  };
+
+  meta = {
+    description = "Sophisticated text editor for code, markup and prose";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/by-name/su/subnetcalc/package.nix
similarity index 100%
rename from pkgs/tools/networking/subnetcalc/default.nix
rename to pkgs/by-name/su/subnetcalc/package.nix
diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/by-name/su/subread/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/subread/default.nix
rename to pkgs/by-name/su/subread/package.nix
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/by-name/su/subsonic/package.nix
similarity index 100%
rename from pkgs/servers/misc/subsonic/default.nix
rename to pkgs/by-name/su/subsonic/package.nix
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/by-name/su/subtitleeditor/package.nix
similarity index 100%
rename from pkgs/applications/video/subtitleeditor/default.nix
rename to pkgs/by-name/su/subtitleeditor/package.nix
diff --git a/pkgs/applications/audio/subtitlr/default.nix b/pkgs/by-name/su/subtitlr/package.nix
similarity index 100%
rename from pkgs/applications/audio/subtitlr/default.nix
rename to pkgs/by-name/su/subtitlr/package.nix
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/by-name/su/subunit/package.nix
similarity index 100%
rename from pkgs/development/libraries/subunit/default.nix
rename to pkgs/by-name/su/subunit/package.nix
diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/by-name/su/subxt/package.nix
similarity index 100%
rename from pkgs/development/tools/subxt/default.nix
rename to pkgs/by-name/su/subxt/package.nix
diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix
index cb5149dcb446..744439283367 100644
--- a/pkgs/by-name/su/sudachidict/package.nix
+++ b/pkgs/by-name/su/sudachidict/package.nix
@@ -6,20 +6,20 @@
 
 let
   pname = "sudachidict";
-  version = "20240716";
+  version = "20241021";
 
   srcs = {
     core = fetchzip {
       url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-core.zip";
-      hash = "sha256-6Sps7Q2AdQRJfhRf9oibLLIpgmNL//74lzCmTKXy7sU=";
+      hash = "sha256-wLcRhR4TCazRxDMKXYZ8T5Vn+rnY6aJmwExIpTIAyeE=";
     };
     small = fetchzip {
       url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-small.zip";
-      hash = "sha256-cZveAFaTpjaL/ge5Qv6zUzXYlNI/oLDivNnAa37gNYY=";
+      hash = "sha256-Qhp9seFCnLnLLWoQ2izDVKcdca+xZE1s+SCqfj0d3sU=";
     };
     full = fetchzip {
       url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-full.zip";
-      hash = "sha256-Mu0JgR3G6CRIzh25cCGhsUQBnfotOzRYzEC5Lma+n8s=";
+      hash = "sha256-8nlUDGHUKrZ0ZFEnnL4rHiu2ybyW25G6Bm6vF4smxWE=";
     };
   };
 in
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/by-name/su/sudo-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/sudo/default.nix
rename to pkgs/by-name/su/sudo-font/package.nix
diff --git a/pkgs/tools/security/sudo-rs/default.nix b/pkgs/by-name/su/sudo-rs/package.nix
similarity index 100%
rename from pkgs/tools/security/sudo-rs/default.nix
rename to pkgs/by-name/su/sudo-rs/package.nix
diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix
new file mode 100644
index 000000000000..1fecbceb98cb
--- /dev/null
+++ b/pkgs/by-name/su/sudo/package.nix
@@ -0,0 +1,100 @@
+{ lib
+, stdenv
+, fetchpatch
+, fetchurl
+, buildPackages
+, coreutils
+, pam
+, groff
+, sssd
+, nixosTests
+, sendmailPath ? "/run/wrappers/bin/sendmail"
+, withInsults ? false
+, withSssd ? false
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sudo";
+  # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
+  # e.g. links to man pages, value constraints etc.
+  version = "1.9.16";
+
+  __structuredAttrs = true;
+
+  src = fetchurl {
+    url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
+    hash = "sha256-wNhNeX8GtzL8Vz0LeYroMSjCvDMFIFfwW1YOxry/oD0=";
+  };
+
+  prePatch = ''
+    # do not set sticky bit in nix store
+    substituteInPlace src/Makefile.in --replace 04755 0755
+  '';
+
+  patches = [
+    # Fix for https://github.com/NixOS/nixpkgs/issues/354544
+    (fetchpatch {
+      url = "https://www.sudo.ws/repos/sudo/raw-rev/71e3f5a288e1ac21151b1b9577f0fe3745671cf7";
+      hash = "sha256-L4AF1ee+qW9QKLrUzL5+hC5EznNC9k7sNeVGNBAJ6S4=";
+    })
+  ];
+
+  configureFlags = [
+    "--with-env-editor"
+    "--with-editor=/run/current-system/sw/bin/nano"
+    "--with-rundir=/run/sudo"
+    "--with-vardir=/var/db/sudo"
+    "--with-logpath=/var/log/sudo.log"
+    "--with-iologdir=/var/log/sudo-io"
+    "--with-sendmail=${sendmailPath}"
+    "--enable-tmpfiles.d=no"
+    "--with-passprompt=[sudo] password for %p: " # intentional trailing space
+  ] ++ lib.optionals withInsults [
+    "--with-insults"
+    "--with-all-insults"
+  ] ++ lib.optionals withSssd [
+    "--with-sssd"
+    "--with-sssd-lib=${sssd}/lib"
+  ];
+
+  postConfigure =
+    ''
+      cat >> pathnames.h <<'EOF'
+        #undef _PATH_MV
+        #define _PATH_MV "${coreutils}/bin/mv"
+      EOF
+      makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
+      installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
+    '';
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ groff ];
+  buildInputs = [ pam ];
+
+  enableParallelBuilding = true;
+
+  doCheck = false; # needs root
+
+  postInstall = ''
+    rm $out/share/doc/sudo/ChangeLog
+  '';
+
+  passthru.tests = { inherit (nixosTests) sudo; };
+
+  meta = with lib; {
+    description = "Command to run commands as root";
+    longDescription =
+      ''
+        Sudo (su "do") allows a system administrator to delegate
+        authority to give certain users (or groups of users) the ability
+        to run some (or all) commands as root or another user while
+        providing an audit trail of the commands and their arguments.
+      '';
+    homepage = "https://www.sudo.ws/";
+    # From https://www.sudo.ws/about/license/
+    license = with licenses; [ sudo bsd2 bsd3 zlib ];
+    maintainers = with maintainers; [ rhendric ];
+    platforms = platforms.linux ++ platforms.freebsd;
+    mainProgram = "sudo";
+  };
+})
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/by-name/su/suidChroot/package.nix
similarity index 100%
rename from pkgs/tools/system/suid-chroot/default.nix
rename to pkgs/by-name/su/suidChroot/package.nix
diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
rename to pkgs/by-name/su/suitesparse-graphblas/package.nix
diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/by-name/su/summon/package.nix
similarity index 100%
rename from pkgs/development/tools/summon/default.nix
rename to pkgs/by-name/su/summon/package.nix
diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix
new file mode 100644
index 000000000000..282a1f23c944
--- /dev/null
+++ b/pkgs/by-name/su/sumo/package.nix
@@ -0,0 +1,69 @@
+{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
+  git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
+  libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
+  python3Packages, stdenv, swig, xercesc, xorg, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "sumo";
+  version = "1.21.0";
+
+  src = fetchFromGitHub {
+    owner = "eclipse";
+    repo = "sumo";
+    rev = "v${lib.replaceStrings ["."] ["_"] version}";
+    hash = "sha256-VST3ZJuDQBWf+YoN0kPyLrlXWmJABubUFDsKEMxfxHY=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    git
+    swig
+  ];
+
+  buildInputs = [
+    bzip2
+    eigen
+    ffmpeg
+    fox_1_6
+    gdal
+    gl2ps
+    gpp
+    gtest
+    jdk
+    libGL
+    libGLU
+    libjpeg
+    libpng
+    libtiff
+    libxcrypt
+    openscenegraph
+    proj
+    python3Packages.setuptools
+    xercesc
+    zlib
+    python3
+  ] ++ (with xorg; [
+    libX11
+    libXcursor
+    libXext
+    libXfixes
+    libXft
+    libXrandr
+    libXrender
+  ]);
+
+  meta = with lib; {
+    description = "SUMO traffic simulator";
+    longDescription = ''
+      Eclipse SUMO is an open source, highly
+      portable, microscopic and continuous traffic simulation package
+      designed to handle large networks. It allows for intermodal
+      simulation including pedestrians and comes with a large set of
+      tools for scenario creation.
+    '';
+    homepage = "https://github.com/eclipse/sumo";
+    license = licenses.epl20;
+    maintainers = with maintainers; [ mtreca ];
+  };
+}
diff --git a/pkgs/applications/blockchains/sumokoin/default.nix b/pkgs/by-name/su/sumokoin/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/sumokoin/default.nix
rename to pkgs/by-name/su/sumokoin/package.nix
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/by-name/su/sundtek/package.nix
similarity index 100%
rename from pkgs/misc/drivers/sundtek/default.nix
rename to pkgs/by-name/su/sundtek/package.nix
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 60f7ca0c45f9..a5d2af067044 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -24,15 +24,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sunvox";
-  version = "2.1.1c";
+  version = "2.1.2";
 
   src = fetchzip {
     urls = [
       "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
       # Upstream removes downloads of older versions, please save bumped versions to archive.org
-      "https://web.archive.org/web/20231204012052/https://www.warmplace.ru/soft/sunvox/sunvox-2.1.1c.zip"
+      # FIXME At the time of writing, archive.org is still recovering from the recent attacks and has not yet re-opened the page saving functionality
+      # https://blog.archive.org/2024/10/21/internet-archive-services-update-2024-10-21/
     ];
-    hash = "sha256-vJ76ELjqP4wo0tCJJd3A9RarpNo8FJaiyZhj+Q7nEGs=";
+    hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/by-name/su/sunwait/package.nix
similarity index 100%
rename from pkgs/applications/misc/sunwait/default.nix
rename to pkgs/by-name/su/sunwait/package.nix
diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/by-name/su/sunxi-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/sunxi-tools/default.nix
rename to pkgs/by-name/su/sunxi-tools/package.nix
diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/by-name/su/supabase-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/supabase-cli/default.nix
rename to pkgs/by-name/su/supabase-cli/package.nix
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
new file mode 100644
index 000000000000..4ce5ca9f7123
--- /dev/null
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -0,0 +1,51 @@
+{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron }:
+
+stdenv.mkDerivation rec {
+  pname = "super-productivity";
+  version = "10.0.11";
+
+  src = fetchurl {
+    url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
+    sha256 = "sha256-sYHfzqP/Vla0DEReVjaPvo8fe1wNdZnNDhefqPrPFPE=";
+    name = "${pname}-${version}.AppImage";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/${pname} $out/share/applications
+
+    cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+    cp -a ${appimageContents}/superproductivity.desktop $out/share/applications/${pname}.desktop
+    cp -a ${appimageContents}/usr/share/icons $out/share
+
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+      --add-flags $out/share/${pname}/resources/app.asar
+  '';
+
+  meta = with lib; {
+    description = "To Do List / Time Tracker with Jira Integration";
+    homepage = "https://super-productivity.com";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ offline ];
+    mainProgram = "super-productivity";
+  };
+}
diff --git a/pkgs/data/icons/super-tiny-icons/default.nix b/pkgs/by-name/su/super-tiny-icons/package.nix
similarity index 100%
rename from pkgs/data/icons/super-tiny-icons/default.nix
rename to pkgs/by-name/su/super-tiny-icons/package.nix
diff --git a/pkgs/games/supertux/default.nix b/pkgs/by-name/su/superTux/package.nix
similarity index 100%
rename from pkgs/games/supertux/default.nix
rename to pkgs/by-name/su/superTux/package.nix
diff --git a/pkgs/tools/system/supercronic/default.nix b/pkgs/by-name/su/supercronic/package.nix
similarity index 100%
rename from pkgs/tools/system/supercronic/default.nix
rename to pkgs/by-name/su/supercronic/package.nix
diff --git a/pkgs/misc/superd/default.nix b/pkgs/by-name/su/superd/package.nix
similarity index 100%
rename from pkgs/misc/superd/default.nix
rename to pkgs/by-name/su/superd/package.nix
diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/by-name/su/supergfxctl/package.nix
similarity index 100%
rename from pkgs/applications/system/supergfxctl/default.nix
rename to pkgs/by-name/su/supergfxctl/package.nix
diff --git a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/pkgs/by-name/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
rename to pkgs/by-name/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/by-name/su/superlu/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/superlu/default.nix
rename to pkgs/by-name/su/superlu/package.nix
diff --git a/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch
similarity index 100%
rename from pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch
rename to pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch
diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/by-name/su/supertag/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/supertag/default.nix
rename to pkgs/by-name/su/supertag/package.nix
diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/by-name/su/supervise/package.nix
similarity index 100%
rename from pkgs/tools/system/supervise/default.nix
rename to pkgs/by-name/su/supervise/package.nix
diff --git a/pkgs/by-name/su/surelog/package.nix b/pkgs/by-name/su/surelog/package.nix
new file mode 100644
index 000000000000..595a3e168040
--- /dev/null
+++ b/pkgs/by-name/su/surelog/package.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+, pkg-config
+, libuuid
+, openjdk
+, gperftools
+, gtest
+, uhdm
+, antlr4
+, capnproto
+, nlohmann_json
+, darwin
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "surelog";
+  version = "1.83";
+
+  src = fetchFromGitHub {
+    owner = "chipsalliance";
+    repo = "surelog";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag=";
+    fetchSubmodules = false;  # we use all dependencies from nix
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    openjdk
+    (python3.withPackages (p: with p; [
+      psutil
+      orderedmultidict
+    ]))
+    gtest
+    antlr4
+  ];
+
+  buildInputs = [
+    libuuid
+    gperftools
+    uhdm
+    capnproto
+    antlr4.runtime.cpp
+    nlohmann_json
+  ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ];
+
+  cmakeFlags = [
+    "-DSURELOG_USE_HOST_CAPNP=On"
+    "-DSURELOG_USE_HOST_UHDM=On"
+    "-DSURELOG_USE_HOST_GTEST=On"
+    "-DSURELOG_USE_HOST_ANTLR=On"
+    "-DSURELOG_USE_HOST_JSON=On"
+    "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}"
+  ];
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    make -j $NIX_BUILD_CORES UnitTests
+    ctest --output-on-failure
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler";
+    homepage = "https://github.com/chipsalliance/Surelog";
+    license = lib.licenses.asl20;
+    mainProgram = "surelog";
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/by-name/su/surf-display/package.nix
similarity index 100%
rename from pkgs/desktops/surf-display/default.nix
rename to pkgs/by-name/su/surf-display/package.nix
diff --git a/pkgs/desktops/surf-display/pdf-makefile.patch b/pkgs/by-name/su/surf-display/pdf-makefile.patch
similarity index 100%
rename from pkgs/desktops/surf-display/pdf-makefile.patch
rename to pkgs/by-name/su/surf-display/pdf-makefile.patch
diff --git a/pkgs/applications/misc/surface-control/Cargo.lock b/pkgs/by-name/su/surface-control/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/surface-control/Cargo.lock
rename to pkgs/by-name/su/surface-control/Cargo.lock
diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/by-name/su/surface-control/package.nix
similarity index 100%
rename from pkgs/applications/misc/surface-control/default.nix
rename to pkgs/by-name/su/surface-control/package.nix
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index 08fba6bdb0ce..ff820885e643 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       openssl
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
 
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/by-name/su/surfraw/package.nix
similarity index 100%
rename from pkgs/tools/networking/surfraw/default.nix
rename to pkgs/by-name/su/surfraw/package.nix
diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/by-name/su/surge-XT/package.nix
similarity index 100%
rename from pkgs/applications/audio/surge-XT/default.nix
rename to pkgs/by-name/su/surge-XT/package.nix
diff --git a/pkgs/development/tools/surge-cli/default.nix b/pkgs/by-name/su/surge-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/surge-cli/default.nix
rename to pkgs/by-name/su/surge-cli/package.nix
diff --git a/pkgs/by-name/su/surreal-engine/package.nix b/pkgs/by-name/su/surreal-engine/package.nix
new file mode 100644
index 000000000000..71376ed3d3eb
--- /dev/null
+++ b/pkgs/by-name/su/surreal-engine/package.nix
@@ -0,0 +1,75 @@
+{
+  alsa-lib,
+  cmake,
+  dbus,
+  fetchFromGitHub,
+  lib,
+  libffi,
+  makeWrapper,
+  openal,
+  pkg-config,
+  SDL2,
+  stdenv,
+  vulkan-loader,
+  wayland,
+  waylandpp,
+  libxkbcommon,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "surreal-engine";
+  version = "0-unstable-2024-11-08";
+
+  src = fetchFromGitHub {
+    owner = "dpjudas";
+    repo = "SurrealEngine";
+    rev = "087fa2af7fd0ce51702dd4024b4ae15a88222678";
+    hash = "sha256-AEIBhTkkRq4+L4ycx82GE29dM7zNgE0oHOkwEH9ezUg=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+    dbus
+    libffi
+    openal
+    SDL2
+    vulkan-loader
+    wayland
+    waylandpp
+    libxkbcommon
+  ];
+
+  postPatch = ''
+    substituteInPlace SurrealEngine/UI/WidgetResourceData.cpp --replace-fail /usr/share $out/share
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dt $out/bin Surreal{Debugger,Editor,Engine}
+    install -Dt $out/share/surrealengine SurrealEngine.pk3
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    for bin in $out/bin/Surreal{Debugger,Editor,Engine}; do
+      wrapProgram $bin --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
+    done
+  '';
+
+  meta = with lib; {
+    description = "Reimplementation of the original Unreal Engine";
+    mainProgram = "SurrealEngine";
+    homepage = "https://github.com/dpjudas/SurrealEngine";
+    license = licenses.zlib;
+    maintainers = with maintainers; [ hughobrien ];
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/by-name/su/suscan/package.nix
similarity index 100%
rename from pkgs/applications/radio/suscan/default.nix
rename to pkgs/by-name/su/suscan/package.nix
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/by-name/su/sutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/sutils/default.nix
rename to pkgs/by-name/su/sutils/package.nix
diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
new file mode 100644
index 000000000000..2bc5059b8b80
--- /dev/null
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -0,0 +1,74 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, boost182
+, catch2_3
+, cmake
+, ninja
+, fmt_9
+, python3
+}:
+
+let
+  # dependency for this library has been removed in master (i.e. next release)
+  unordered_dense = stdenv.mkDerivation rec {
+    version = "2.0.1";
+    pname = "unordered_dense";
+    src = fetchFromGitHub {
+      owner = "martinus";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "sha256-9zlWYAY4lOQsL9+MYukqavBi5k96FvglRgznLIwwRyw=";
+    };
+    nativeBuildInputs = [
+      cmake
+    ];
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "sv-lang";
+  version = "3.0";
+
+  src = fetchFromGitHub {
+    owner = "MikePopoloski";
+    repo = "slang";
+    rev = "v${version}";
+    sha256 = "sha256-v2sStvukLFMRXGeATxvizmnwEPDE4kwnS06n+37OrJA=";
+  };
+
+  cmakeFlags = [
+    # fix for https://github.com/NixOS/nixpkgs/issues/144170
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+
+    "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    ninja
+  ];
+
+  buildInputs = [
+    unordered_dense
+    boost182
+    fmt_9
+    # though only used in tests, cmake will complain its absence when configuring
+    catch2_3
+  ];
+
+  # TODO: a mysterious linker error occurs when building the unittests on darwin.
+  # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  meta = with lib; {
+    description = "SystemVerilog compiler and language services";
+    homepage = "https://github.com/MikePopoloski/slang";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sharzy ];
+    mainProgram = "slang";
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/by-name/sv/svaba/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/svaba/default.nix
rename to pkgs/by-name/sv/svaba/package.nix
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/by-name/sv/svd2rust/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/svd2rust/default.nix
rename to pkgs/by-name/sv/svd2rust/package.nix
diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/by-name/sv/svg2pdf/package.nix
similarity index 100%
rename from pkgs/tools/graphics/svg2pdf/default.nix
rename to pkgs/by-name/sv/svg2pdf/package.nix
diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/by-name/sv/svgbob/package.nix
similarity index 100%
rename from pkgs/tools/graphics/svgbob/default.nix
rename to pkgs/by-name/sv/svgbob/package.nix
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/by-name/sv/svgcleaner/package.nix
similarity index 100%
rename from pkgs/tools/graphics/svgcleaner/default.nix
rename to pkgs/by-name/sv/svgcleaner/package.nix
diff --git a/pkgs/applications/accessibility/svkbd/default.nix b/pkgs/by-name/sv/svkbd/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/svkbd/default.nix
rename to pkgs/by-name/sv/svkbd/package.nix
diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/by-name/sv/svlint/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/svlint/default.nix
rename to pkgs/by-name/sv/svlint/package.nix
diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/by-name/sv/svls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/svls/default.nix
rename to pkgs/by-name/sv/svls/package.nix
diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/by-name/sv/svnfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/svnfs/default.nix
rename to pkgs/by-name/sv/svnfs/package.nix
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/by-name/sv/svox/package.nix
similarity index 100%
rename from pkgs/applications/audio/svox/default.nix
rename to pkgs/by-name/sv/svox/package.nix
diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix
index 0978a9e64f69..41c20ed0a48f 100644
--- a/pkgs/by-name/sv/svp/package.nix
+++ b/pkgs/by-name/sv/svp/package.nix
@@ -53,7 +53,7 @@ let
     libusb1
     mpvForSVP
     ocl-icd
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     vapoursynth
     xdg-utils
     xorg.libX11
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/by-name/sv/svrcore/package.nix
similarity index 100%
rename from pkgs/development/libraries/svrcore/default.nix
rename to pkgs/by-name/sv/svrcore/package.nix
diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/by-name/sv/svt-av1/package.nix
similarity index 100%
rename from pkgs/tools/video/svt-av1/default.nix
rename to pkgs/by-name/sv/svt-av1/package.nix
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
similarity index 100%
rename from pkgs/tools/misc/svtplay-dl/default.nix
rename to pkgs/by-name/sv/svtplay-dl/package.nix
diff --git a/pkgs/tools/misc/svu/default.nix b/pkgs/by-name/sv/svu/package.nix
similarity index 100%
rename from pkgs/tools/misc/svu/default.nix
rename to pkgs/by-name/sv/svu/package.nix
diff --git a/pkgs/tools/networking/swagger-cli/default.nix b/pkgs/by-name/sw/swagger-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/swagger-cli/default.nix
rename to pkgs/by-name/sw/swagger-cli/package.nix
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/by-name/sw/swagger-codegen/package.nix
similarity index 100%
rename from pkgs/tools/networking/swagger-codegen/default.nix
rename to pkgs/by-name/sw/swagger-codegen/package.nix
diff --git a/pkgs/by-name/sw/swagger-codegen3/package.nix b/pkgs/by-name/sw/swagger-codegen3/package.nix
new file mode 100644
index 000000000000..59222c1d412d
--- /dev/null
+++ b/pkgs/by-name/sw/swagger-codegen3/package.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.62";
+  pname = "swagger-codegen";
+
+  jarfilename = "${pname}-cli-${version}.jar";
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  src = fetchurl {
+    url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
+    sha256 = "sha256-23opx14BRfG7SjcSKXu59wmrrJsJiGebiMRvidV2gE8=";
+  };
+
+  dontUnpack = true;
+
+  installPhase = ''
+    install -D $src $out/share/java/${jarfilename}
+
+    makeWrapper ${jre}/bin/java $out/bin/${pname}3 \
+      --add-flags "-jar $out/share/java/${jarfilename}"
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = swagger-codegen3;
+    command = "swagger-codegen3 version";
+  };
+
+  meta = with lib; {
+    description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
+    homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0";
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.asl20;
+    maintainers = [ maintainers._1000101 ];
+    mainProgram = "swagger-codegen3";
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/security/swaggerhole/default.nix b/pkgs/by-name/sw/swaggerhole/package.nix
similarity index 100%
rename from pkgs/tools/security/swaggerhole/default.nix
rename to pkgs/by-name/sw/swaggerhole/package.nix
diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/by-name/sw/swaglyrics/package.nix
similarity index 100%
rename from pkgs/tools/misc/swaglyrics/default.nix
rename to pkgs/by-name/sw/swaglyrics/package.nix
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/by-name/sw/swaks/package.nix
similarity index 100%
rename from pkgs/tools/networking/swaks/default.nix
rename to pkgs/by-name/sw/swaks/package.nix
diff --git a/pkgs/by-name/sw/swapspace/package.nix b/pkgs/by-name/sw/swapspace/package.nix
new file mode 100644
index 000000000000..d9749c23c55e
--- /dev/null
+++ b/pkgs/by-name/sw/swapspace/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  installShellFiles,
+  util-linux,
+  binlore,
+  swapspace,
+  nixosTests,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "swapspace";
+  version = "1.18";
+
+  src = fetchFromGitHub {
+    owner = "Tookmund";
+    repo = "Swapspace";
+    rev = "v${version}";
+    sha256 = "sha256-tzsw10cpu5hldkm0psWcFnWToWQejout/oGHJais6yw=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    installShellFiles
+  ];
+
+  postPatch = ''
+    substituteInPlace 'swapspace.service' \
+      --replace '/usr/local/sbin/' "$out/bin/"
+    substituteInPlace 'src/support.c' \
+      --replace '/sbin/swapon' '${lib.getBin util-linux}/bin/swapon' \
+      --replace '/sbin/swapoff' '${lib.getBin util-linux}/bin/swapoff'
+    substituteInPlace 'src/swaps.c' \
+      --replace 'mkswap' '${lib.getBin util-linux}/bin/mkswap'
+
+    # Don't create empty directory $out/var/lib/swapspace
+    substituteInPlace 'Makefile.am' \
+      --replace 'install-data-local:' 'do-not-execute:'
+  '';
+
+  postInstall = ''
+    installManPage doc/swapspace.8
+    install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"
+  '';
+
+  # Nothing in swapspace --help or swapspace’s man page mentions
+  # anything about swapspace executing its arguments.
+  passthru.binlore.out = binlore.synthesize swapspace ''
+    execer cannot bin/swapspace
+  '';
+  passthru.tests = {
+    inherit (nixosTests) swapspace;
+  };
+
+  meta = with lib; {
+    description = "Dynamic swap manager for Linux";
+    homepage = "https://github.com/Tookmund/Swapspace";
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ Luflosi ];
+    mainProgram = "swapspace";
+  };
+}
diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/by-name/sw/swapview/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/swapview/default.nix
rename to pkgs/by-name/sw/swapview/package.nix
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/by-name/sw/swarm/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/swarm/default.nix
rename to pkgs/by-name/sw/swarm/package.nix
diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/sway-launcher-desktop/default.nix
rename to pkgs/by-name/sw/sway-launcher-desktop/package.nix
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 6bcff1c52a2d..05a182ac8063 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sway-unwrapped";
-  version = "1.9";
+  version = "1.10";
 
   inherit enableXWayland isNixOS systemdSupport trayEnabled;
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = finalAttrs.version;
-    hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg=";
+    hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk=";
   };
 
   patches = [
@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     sd-bus-provider =  if systemdSupport then "libsystemd" else "basu";
     in [
       (mesonOption "sd-bus-provider" sd-bus-provider)
-      (mesonEnable "xwayland" finalAttrs.enableXWayland)
       (mesonEnable "tray" finalAttrs.trayEnabled)
     ];
 
diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/by-name/sw/swaynag-battery/package.nix
similarity index 100%
rename from pkgs/applications/misc/swaynag-battery/default.nix
rename to pkgs/by-name/sw/swaynag-battery/package.nix
diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
similarity index 100%
rename from pkgs/applications/misc/swaynotificationcenter/default.nix
rename to pkgs/by-name/sw/swaynotificationcenter/package.nix
diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix
index 8ce57143381a..6f688436395c 100644
--- a/pkgs/by-name/sw/swayosd/package.nix
+++ b/pkgs/by-name/sw/swayosd/package.nix
@@ -1,38 +1,37 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, wrapGAppsHook3
-, brightnessctl
-, cargo
-, coreutils
-, gtk-layer-shell
-, libevdev
-, libinput
-, libpulseaudio
-, meson
-, ninja
-, rustc
-, sassc
-, stdenv
-, udev
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook3,
+  brightnessctl,
+  cargo,
+  coreutils,
+  gtk-layer-shell,
+  libevdev,
+  libinput,
+  libpulseaudio,
+  meson,
+  ninja,
+  rustc,
+  sassc,
+  stdenv,
+  udev,
 }:
-
 stdenv.mkDerivation rec {
   pname = "swayosd";
-  version = "0-unstable-2024-04-15";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = "SwayOSD";
-    rev = "11271760052c4a4a4057f2d287944d74e8fbdb58";
-    hash = "sha256-qOxnl2J+Ivx/TIqodv3a8nP0JQsYoKIrhqnbD9IxU8g=";
+    rev = "v${version}";
+    hash = "sha256-GyvRWEzTxQxTAk+xCLFsHdd1SttBliOgJ6eZqAxQMME=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    name = "swayosd-${version}";
-    hash = "sha256-exbVanUvGp0ub4WE3VcsN8hkcK0Ipf0tNfd92UecICg=";
+    inherit pname version src;
+    hash = "sha256-EUxJ+aGtYAO0kNggNXIZqj2DmPzc4serj0/V+fvH7ds=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ brightnessctl ]}
+      --prefix PATH : ${lib.makeBinPath [brightnessctl]}
     )
   '';
 
@@ -74,7 +73,11 @@ stdenv.mkDerivation rec {
     description = "GTK based on screen display for keyboard shortcuts";
     homepage = "https://github.com/ErikReider/SwayOSD";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aleksana barab-i sergioribera ];
+    maintainers = with maintainers; [
+      aleksana
+      barab-i
+      sergioribera
+    ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/by-name/sw/swayr/icon-paths.patch
similarity index 100%
rename from pkgs/tools/wayland/swayr/icon-paths.patch
rename to pkgs/by-name/sw/swayr/icon-paths.patch
diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/by-name/sw/swayr/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swayr/default.nix
rename to pkgs/by-name/sw/swayr/package.nix
diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/by-name/sw/swayrbar/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swayrbar/default.nix
rename to pkgs/by-name/sw/swayrbar/package.nix
diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/by-name/sw/swaysettings/package.nix
similarity index 100%
rename from pkgs/applications/misc/swaysettings/default.nix
rename to pkgs/by-name/sw/swaysettings/package.nix
diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/by-name/sw/swaysome/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swaysome/default.nix
rename to pkgs/by-name/sw/swaysome/package.nix
diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/by-name/sw/swc/package.nix
similarity index 100%
rename from pkgs/development/tools/swc/default.nix
rename to pkgs/by-name/sw/swc/package.nix
diff --git a/pkgs/data/themes/sweet-nova/default.nix b/pkgs/by-name/sw/sweet-nova/package.nix
similarity index 100%
rename from pkgs/data/themes/sweet-nova/default.nix
rename to pkgs/by-name/sw/sweet-nova/package.nix
diff --git a/pkgs/servers/swego/default.nix b/pkgs/by-name/sw/swego/package.nix
similarity index 100%
rename from pkgs/servers/swego/default.nix
rename to pkgs/by-name/sw/swego/package.nix
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/by-name/sw/swfmill/package.nix
similarity index 100%
rename from pkgs/tools/video/swfmill/default.nix
rename to pkgs/by-name/sw/swfmill/package.nix
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/by-name/sw/swh_lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/swh-lv2/default.nix
rename to pkgs/by-name/sw/swh_lv2/package.nix
diff --git a/pkgs/os-specific/darwin/swiftbar/default.nix b/pkgs/by-name/sw/swiftbar/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/swiftbar/default.nix
rename to pkgs/by-name/sw/swiftbar/package.nix
diff --git a/pkgs/os-specific/darwin/swiftdefaultapps/default.nix b/pkgs/by-name/sw/swiftdefaultapps/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/swiftdefaultapps/default.nix
rename to pkgs/by-name/sw/swiftdefaultapps/package.nix
diff --git a/pkgs/development/libraries/swiften/build-fix.patch b/pkgs/by-name/sw/swiften/build-fix.patch
similarity index 100%
rename from pkgs/development/libraries/swiften/build-fix.patch
rename to pkgs/by-name/sw/swiften/build-fix.patch
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/by-name/sw/swiften/package.nix
similarity index 100%
rename from pkgs/development/libraries/swiften/default.nix
rename to pkgs/by-name/sw/swiften/package.nix
diff --git a/pkgs/development/libraries/swiften/scons.patch b/pkgs/by-name/sw/swiften/scons.patch
similarity index 100%
rename from pkgs/development/libraries/swiften/scons.patch
rename to pkgs/by-name/sw/swiften/scons.patch
diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/by-name/sw/swiftformat/package.nix
similarity index 100%
rename from pkgs/development/tools/swiftformat/default.nix
rename to pkgs/by-name/sw/swiftformat/package.nix
diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix
new file mode 100644
index 000000000000..3063ccc3a189
--- /dev/null
+++ b/pkgs/by-name/sw/swiftshader/package.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchgit, python3, cmake, jq }:
+
+stdenv.mkDerivation rec {
+  pname = "swiftshader";
+  version = "2023-09-11";
+
+  src = fetchgit {
+    url = "https://swiftshader.googlesource.com/SwiftShader";
+    rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa";
+    hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI=";
+    # Remove 1GB of test files to get under Hydra output limit
+    postFetch = ''
+      rm -r $out/third_party/llvm-project/llvm/test
+      rm -r $out/third_party/json/test
+      rm -r $out/third_party/cppdap/third_party/json/test
+      rm -r $out/third_party/llvm-project/clang/test
+    '';
+  };
+
+  nativeBuildInputs = [ cmake python3 jq ];
+
+  # Make sure we include the drivers and icd files in the output as the cmake
+  # generated install command only puts in the spirv-tools stuff.
+  installPhase = ''
+    runHook preInstall
+
+    #
+    # Vulkan driver
+    #
+    vk_so_path="$out/lib/libvk_swiftshader.so"
+    mkdir -p "$(dirname "$vk_so_path")"
+    mv Linux/libvk_swiftshader.so "$vk_so_path"
+
+    vk_icd_json="$out/share/vulkan/icd.d/vk_swiftshader_icd.json"
+    mkdir -p "$(dirname "$vk_icd_json")"
+    jq ".ICD.library_path = \"$vk_so_path\"" "$vk_icd_json"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description =
+      "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API";
+    homepage = "https://opensource.google/projects/swiftshader";
+    license = licenses.asl20;
+    # Should be possible to support Darwin by changing the install phase with
+    # 's/Linux/Darwin/' and 's/so/dylib/' or something similar.
+    platforms = with platforms; linux;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/by-name/sw/swig3/package.nix b/pkgs/by-name/sw/swig3/package.nix
new file mode 100644
index 000000000000..44848c13582c
--- /dev/null
+++ b/pkgs/by-name/sw/swig3/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libtool,
+  bison,
+  pcre,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "swig";
+  version = "3.0.12";
+
+  src = fetchFromGitHub {
+    owner = "swig";
+    repo = "swig";
+    rev = "rel-${finalAttrs.version}";
+    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
+  };
+
+  # Not using autoreconfHook because it fails due to missing macros, contrary
+  # to this script
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    bison
+  ];
+  buildInputs = [
+    pcre
+  ];
+
+  configureFlags = [
+    "--without-tcl"
+  ];
+
+  # Disable ccache documentation as it needs yodl
+  postPatch = ''
+    sed -i '/man1/d' CCache/Makefile.in
+  '';
+
+  meta = {
+    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 = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/by-name/sw/swingsane/package.nix
similarity index 100%
rename from pkgs/applications/graphics/swingsane/default.nix
rename to pkgs/by-name/sw/swingsane/package.nix
diff --git a/pkgs/os-specific/linux/switcheroo-control/default.nix b/pkgs/by-name/sw/switcheroo-control/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/switcheroo-control/default.nix
rename to pkgs/by-name/sw/switcheroo-control/package.nix
diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/by-name/sw/swtpm/package.nix
similarity index 100%
rename from pkgs/tools/security/swtpm/default.nix
rename to pkgs/by-name/sw/swtpm/package.nix
diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/by-name/sx/sx-go/package.nix
similarity index 100%
rename from pkgs/tools/security/sx-go/default.nix
rename to pkgs/by-name/sx/sx-go/package.nix
diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/by-name/sy/sycl-info/package.nix
similarity index 100%
rename from pkgs/development/libraries/sycl-info/default.nix
rename to pkgs/by-name/sy/sycl-info/package.nix
diff --git a/pkgs/os-specific/linux/sydbox/default.nix b/pkgs/by-name/sy/sydbox/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sydbox/default.nix
rename to pkgs/by-name/sy/sydbox/package.nix
diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/by-name/sy/symbolic-preview/package.nix
similarity index 100%
rename from pkgs/applications/graphics/symbolic-preview/default.nix
rename to pkgs/by-name/sy/symbolic-preview/package.nix
diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix
new file mode 100644
index 000000000000..9d6ef0f2404c
--- /dev/null
+++ b/pkgs/by-name/sy/symengine/package.nix
@@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gmp
+, flint
+, mpfr
+, libmpc
+, withShared ? true
+}:
+
+stdenv.mkDerivation rec {
+  pname = "symengine";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "symengine";
+    repo = "symengine";
+    rev = "v${version}";
+    hash = "sha256-hMTndwIXTqf3cxKZdnn38SFvZLEb48k1Lvm5/hW7U8k=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ gmp flint mpfr libmpc ];
+
+  cmakeFlags = [
+    "-DWITH_FLINT=ON"
+    "-DINTEGER_CLASS=flint"
+    "-DWITH_SYMENGINE_THREAD_SAFE=yes"
+    "-DWITH_MPC=yes"
+    "-DBUILD_FOR_DISTRIBUTION=yes"
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not?
+    "-DBUILD_TESTS=OFF"
+  ] ++ lib.optionals withShared [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Fast symbolic manipulation library";
+    homepage = "https://github.com/symengine/symengine";
+    platforms = platforms.unix ++ platforms.windows;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+
+}
diff --git a/pkgs/applications/science/logic/symfpu/default.nix b/pkgs/by-name/sy/symfpu/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/symfpu/default.nix
rename to pkgs/by-name/sy/symfpu/package.nix
diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/by-name/sy/symlinks/package.nix
similarity index 100%
rename from pkgs/tools/system/symlinks/default.nix
rename to pkgs/by-name/sy/symlinks/package.nix
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/by-name/sy/symmetrica/package.nix
similarity index 100%
rename from pkgs/applications/science/math/symmetrica/default.nix
rename to pkgs/by-name/sy/symmetrica/package.nix
diff --git a/pkgs/servers/mail/sympa/make-docs.patch b/pkgs/by-name/sy/sympa/make-docs.patch
similarity index 100%
rename from pkgs/servers/mail/sympa/make-docs.patch
rename to pkgs/by-name/sy/sympa/make-docs.patch
diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/by-name/sy/sympa/package.nix
similarity index 100%
rename from pkgs/servers/mail/sympa/default.nix
rename to pkgs/by-name/sy/sympa/package.nix
diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/by-name/sy/sympow/clean-extra-logfile-output-from-pari.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch
rename to pkgs/by-name/sy/sympow/clean-extra-logfile-output-from-pari.patch
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/by-name/sy/sympow/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/sympow/default.nix
rename to pkgs/by-name/sy/sympow/package.nix
diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/by-name/sy/synaesthesia/package.nix
similarity index 100%
rename from pkgs/applications/audio/synaesthesia/default.nix
rename to pkgs/by-name/sy/synaesthesia/package.nix
diff --git a/pkgs/tools/admin/synapse-admin/package.json b/pkgs/by-name/sy/synapse-admin/package.json
similarity index 100%
rename from pkgs/tools/admin/synapse-admin/package.json
rename to pkgs/by-name/sy/synapse-admin/package.json
diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/by-name/sy/synapse-admin/package.nix
similarity index 100%
rename from pkgs/tools/admin/synapse-admin/default.nix
rename to pkgs/by-name/sy/synapse-admin/package.nix
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/by-name/sy/synapse/package.nix
similarity index 100%
rename from pkgs/applications/misc/synapse/default.nix
rename to pkgs/by-name/sy/synapse/package.nix
diff --git a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock
index 4333f1d26fbb..4f364aacbdd5 100644
--- a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock
+++ b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock
@@ -2458,8 +2458,7 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 [[package]]
 name = "sentry"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "curl",
  "httpdate",
@@ -2473,8 +2472,7 @@ dependencies = [
 [[package]]
 name = "sentry-backtrace"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -2485,8 +2483,7 @@ dependencies = [
 [[package]]
 name = "sentry-contexts"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "hostname",
  "libc",
@@ -2499,8 +2496,7 @@ dependencies = [
 [[package]]
 name = "sentry-core"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "once_cell",
  "rand",
@@ -2512,8 +2508,7 @@ dependencies = [
 [[package]]
 name = "sentry-debug-images"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "findshlibs",
  "once_cell",
@@ -2523,8 +2518,7 @@ dependencies = [
 [[package]]
 name = "sentry-tracing"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -2535,8 +2529,7 @@ dependencies = [
 [[package]]
 name = "sentry-types"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
 dependencies = [
  "debugid",
  "hex",
@@ -2827,7 +2820,7 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
 [[package]]
 name = "syncserver"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -2882,7 +2875,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -2902,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "backtrace",
  "deadpool",
@@ -2916,7 +2909,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -2930,7 +2923,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-db"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "async-trait",
  "cadence",
@@ -2953,7 +2946,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-db-common"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -2972,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-mysql"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -2995,7 +2988,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "rand",
  "serde 1.0.203",
@@ -3005,7 +2998,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-spanner"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3149,7 +3142,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokenserver-auth"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3176,7 +3169,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-common"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3191,7 +3184,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-db"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3216,7 +3209,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.17.9"
+version = "0.17.12"
 dependencies = [
  "jsonwebtoken",
  "serde 1.0.203",
diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 4c24a889afd0..51dc44b14e34 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -6,6 +6,7 @@
 , libmysqlclient
 , makeBinaryWrapper
 , lib
+, nix-update-script
 }:
 
 let
@@ -20,13 +21,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "syncstorage-rs";
-  version = "0.17.9";
+  version = "0.17.12";
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ezTwAAtt0/jKfA6FtvzuQVFYOODMcD4RFiU3x0Umifk=";
+    hash = "sha256-hvKbKbRa5zk+80xmKWeMRjshaS6uybFzb5KdBY19Sl8=";
   };
 
   nativeBuildInputs = [
@@ -49,12 +50,15 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "deadpool-0.7.0" = "sha256-yQwn45EuzmPBwuT+iLJ/LLWAkBkW2vF+GLswdbpFVAY=";
+      "sentry-0.34.0" = "sha256-BdWz6EIEm2YU3DG3ODkuXCVCMV6srdyx2gXkOxINjHc=";
     };
   };
 
   # almost all tests need a DB to test against
   doCheck = false;
 
+  passthru.updateScript = nix-update-script {};
+
   meta = {
     description = "Mozilla Sync Storage built with Rust";
     homepage = "https://github.com/mozilla-services/syncstorage-rs";
diff --git a/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch b/pkgs/by-name/sy/syncterm/0001-use-sched-yield-53264f2b.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch
rename to pkgs/by-name/sy/syncterm/0001-use-sched-yield-53264f2b.patch
diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/by-name/sy/syncterm/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/syncterm/default.nix
rename to pkgs/by-name/sy/syncterm/package.nix
diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix
new file mode 100644
index 000000000000..79ad559a5f38
--- /dev/null
+++ b/pkgs/by-name/sy/synfigstudio/package.nix
@@ -0,0 +1,156 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, autoreconfHook
+, wrapGAppsHook3
+
+, boost
+, cairo
+, darwin
+, gettext
+, glibmm
+, gtk3
+, gtkmm3
+, libjack2
+, libsigcxx
+, libxmlxx
+, mlt
+, pango
+, imagemagick
+, intltool
+, adwaita-icon-theme
+, harfbuzz
+, freetype
+, fribidi
+, openexr
+, fftw
+}:
+
+let
+  version = "1.5.3";
+  src = fetchFromGitHub {
+    owner = "synfig";
+    repo = "synfig";
+    rev = "v${version}";
+    hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ=";
+  };
+
+  ETL = stdenv.mkDerivation {
+    pname = "ETL";
+    inherit version src;
+
+    sourceRoot = "${src.name}/ETL";
+
+    nativeBuildInputs = [
+      pkg-config
+      autoreconfHook
+    ];
+    buildInputs = [
+      glibmm
+    ];
+  };
+
+  synfig = stdenv.mkDerivation {
+    pname = "synfig";
+    inherit version src;
+
+    sourceRoot = "${src.name}/synfig-core";
+
+    configureFlags = [
+      "--with-boost=${boost.dev}"
+      "--with-boost-libdir=${boost.out}/lib"
+    ] ++ lib.optionals stdenv.cc.isClang [
+      # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that
+      # are removed in C++17. Setting the language version to C++14 allows it to build.
+      "CXXFLAGS=-std=c++14"
+    ];
+
+    enableParallelBuilding = true;
+
+    nativeBuildInputs = [
+      pkg-config
+      autoreconfHook
+      gettext
+      intltool
+    ];
+    buildInputs = [
+      ETL
+      boost
+      cairo
+      glibmm
+      mlt
+      libsigcxx
+      libxmlxx
+      pango
+      imagemagick
+      harfbuzz
+      freetype
+      fribidi
+      openexr
+      fftw
+    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.Foundation
+    ];
+  };
+in
+stdenv.mkDerivation {
+  pname = "synfigstudio";
+  inherit version src;
+
+  sourceRoot = "${src.name}/synfig-studio";
+
+  postPatch = ''
+    patchShebangs images/splash_screen_development.sh
+  '';
+
+  preConfigure = ''
+    ./bootstrap.sh
+  '';
+
+  configureFlags = lib.optionals stdenv.cc.isClang [
+    # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that
+    # are removed in C++17. Setting the language version to C++14 allows it to build.
+    "CXXFLAGS=-std=c++14"
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    gettext
+    intltool
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    ETL
+    synfig
+    boost
+    cairo
+    glibmm
+    gtk3
+    gtkmm3
+    imagemagick
+    libjack2
+    libsigcxx
+    libxmlxx
+    mlt
+    adwaita-icon-theme
+    openexr
+    fftw
+  ];
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    # Expose libraries and cli tools
+    inherit ETL synfig;
+  };
+
+  meta = with lib; {
+    description = "2D animation program";
+    homepage = "http://www.synfig.org";
+    license = licenses.gpl3Plus;
+    maintainers = [ ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/by-name/sy/synology-cloud-sync-decryption-tool/package.nix
similarity index 100%
rename from pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix
rename to pkgs/by-name/sy/synology-cloud-sync-decryption-tool/package.nix
diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/by-name/sy/synology-drive-client/package.nix
similarity index 100%
rename from pkgs/applications/networking/synology-drive-client/default.nix
rename to pkgs/by-name/sy/synology-drive-client/package.nix
diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/by-name/sy/syntex/package.nix
similarity index 100%
rename from pkgs/tools/graphics/syntex/default.nix
rename to pkgs/by-name/sy/syntex/package.nix
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/by-name/sy/sysbench/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sysbench/default.nix
rename to pkgs/by-name/sy/sysbench/package.nix
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/by-name/sy/syscall_limiter/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/syscall_limiter/default.nix
rename to pkgs/by-name/sy/syscall_limiter/package.nix
diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/by-name/sy/sysfsutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysfsutils/default.nix
rename to pkgs/by-name/sy/sysfsutils/package.nix
diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch b/pkgs/by-name/sy/sysklogd/fix-includes-for-musl.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch
rename to pkgs/by-name/sy/sysklogd/fix-includes-for-musl.patch
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/by-name/sy/sysklogd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/default.nix
rename to pkgs/by-name/sy/sysklogd/package.nix
diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/by-name/sy/sysklogd/systemd.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/systemd.patch
rename to pkgs/by-name/sy/sysklogd/systemd.patch
diff --git a/pkgs/os-specific/linux/sysklogd/union-wait.patch b/pkgs/by-name/sy/sysklogd/union-wait.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/union-wait.patch
rename to pkgs/by-name/sy/sysklogd/union-wait.patch
diff --git a/pkgs/os-specific/linux/syslinux/define-wchar_t.patch b/pkgs/by-name/sy/syslinux/define-wchar_t.patch
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/define-wchar_t.patch
rename to pkgs/by-name/sy/syslinux/define-wchar_t.patch
diff --git a/pkgs/os-specific/linux/syslinux/gcc10.patch b/pkgs/by-name/sy/syslinux/gcc10.patch
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/gcc10.patch
rename to pkgs/by-name/sy/syslinux/gcc10.patch
diff --git a/pkgs/os-specific/linux/syslinux/import-efisetjmp.patch b/pkgs/by-name/sy/syslinux/import-efisetjmp.patch
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/import-efisetjmp.patch
rename to pkgs/by-name/sy/syslinux/import-efisetjmp.patch
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/by-name/sy/syslinux/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/default.nix
rename to pkgs/by-name/sy/syslinux/package.nix
diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/by-name/sy/sysstat/install.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysstat/install.patch
rename to pkgs/by-name/sy/sysstat/install.patch
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/by-name/sy/sysstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysstat/default.nix
rename to pkgs/by-name/sy/sysstat/package.nix
diff --git a/pkgs/games/system-syzygy/Cargo.lock b/pkgs/by-name/sy/system-syzygy/Cargo.lock
similarity index 100%
rename from pkgs/games/system-syzygy/Cargo.lock
rename to pkgs/by-name/sy/system-syzygy/Cargo.lock
diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/by-name/sy/system-syzygy/package.nix
similarity index 100%
rename from pkgs/games/system-syzygy/default.nix
rename to pkgs/by-name/sy/system-syzygy/package.nix
diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/Cargo.lock b/pkgs/by-name/sy/system76-firmware/Cargo.lock
similarity index 100%
rename from pkgs/os-specific/linux/firmware/system76-firmware/Cargo.lock
rename to pkgs/by-name/sy/system76-firmware/Cargo.lock
diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/by-name/sy/system76-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/system76-firmware/default.nix
rename to pkgs/by-name/sy/system76-firmware/package.nix
diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
similarity index 100%
rename from pkgs/applications/misc/system76-keyboard-configurator/default.nix
rename to pkgs/by-name/sy/system76-keyboard-configurator/package.nix
diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/by-name/sy/systembus-notify/package.nix
similarity index 100%
rename from pkgs/applications/misc/systembus-notify/default.nix
rename to pkgs/by-name/sy/systembus-notify/package.nix
diff --git a/pkgs/by-name/sy/systemc/package.nix b/pkgs/by-name/sy/systemc/package.nix
new file mode 100644
index 000000000000..54f9a080c1d2
--- /dev/null
+++ b/pkgs/by-name/sy/systemc/package.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "systemc";
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner = "accellera-official";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-ReYRKx7H9rxVhvY9gAdxrMu5nlsK2FcVIzfgvZroD/E=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    # Undefined reference to the sc_core::sc_api_version_2_3_4_XXX
+    # https://github.com/accellera-official/systemc/issues/21
+    "-DCMAKE_CXX_STANDARD=17"
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  meta = with lib; {
+    description = "Language for System-level design, modeling and verification";
+    homepage    = "https://systemc.org/";
+    license     = licenses.asl20;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ amiloradovsky ];
+  };
+}
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/by-name/sy/systemd-journal2gelf/package.nix
similarity index 100%
rename from pkgs/tools/system/systemd-journal2gelf/default.nix
rename to pkgs/by-name/sy/systemd-journal2gelf/package.nix
diff --git a/pkgs/by-name/sy/systemd-netlogd/package.nix b/pkgs/by-name/sy/systemd-netlogd/package.nix
new file mode 100644
index 000000000000..177994c04c53
--- /dev/null
+++ b/pkgs/by-name/sy/systemd-netlogd/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gperf,
+  libcap,
+  meson,
+  ninja,
+  nix-update-script,
+  openssl,
+  pkg-config,
+  pkgsCross,
+  sphinx,
+  systemd,
+  systemdLibs,
+  opensslSupport ? true,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "systemd-netlogd";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "systemd";
+    repo = "systemd-netlogd";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-FwBwhsnVathlRQjKyrsPpZZlCb2rIpVuHGq9mG3mNsw=";
+  };
+
+  # Fixup a few installation paths
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "get_option('prefix')" "get_option('bindir')"
+    substituteInPlace doc/meson.build \
+      --replace-fail "'/usr/share/man/man8'" "get_option('mandir') / 'man8'"
+    substituteInPlace units/meson.build \
+      --replace-fail "get_option('prefix') / 'system'" "get_option('libdir') / 'systemd/system'"
+
+    substituteInPlace units/systemd-netlogd.service.in \
+      --replace-fail '@PKGPREFIX@/systemd-netlogd' '${placeholder "out"}/bin/systemd-netlogd'
+  '';
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gperf
+    meson
+    ninja
+    pkg-config
+    sphinx
+  ];
+
+  buildInputs = [
+    libcap
+    systemdLibs
+  ] ++ lib.optional opensslSupport openssl;
+
+  mesonFlags = [
+    "--sysconfdir=${placeholder "out"}/etc/systemd"
+    (lib.mesonBool "openssl" opensslSupport)
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru = {
+    # Make sure x86_64-linux -> aarch64-linux cross compilation works
+    tests = lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") {
+      aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Forwards messages from the journal to other hosts over the network";
+    homepage = "https://github.com/systemd/systemd-netlogd";
+    changelog = "https://github.com/systemd/systemd-netlogd/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ getchoo ];
+    inherit (systemd.meta) platforms;
+    mainProgram = "systemd-netlogd";
+  };
+})
diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/by-name/sy/systemd-wait/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/systemd-wait/default.nix
rename to pkgs/by-name/sy/systemd-wait/package.nix
diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/by-name/sy/systemfd/package.nix
similarity index 100%
rename from pkgs/development/tools/systemfd/default.nix
rename to pkgs/by-name/sy/systemfd/package.nix
diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/by-name/sy/systeroid/package.nix
similarity index 100%
rename from pkgs/tools/system/systeroid/default.nix
rename to pkgs/by-name/sy/systeroid/package.nix
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/by-name/sy/systrayhelper/package.nix
similarity index 100%
rename from pkgs/tools/misc/systrayhelper/default.nix
rename to pkgs/by-name/sy/systrayhelper/package.nix
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/by-name/sy/sysvinit/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysvinit/default.nix
rename to pkgs/by-name/sy/sysvinit/package.nix
diff --git a/pkgs/tools/misc/sysz/default.nix b/pkgs/by-name/sy/sysz/package.nix
similarity index 100%
rename from pkgs/tools/misc/sysz/default.nix
rename to pkgs/by-name/sy/sysz/package.nix
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/by-name/sz/szip/package.nix
similarity index 100%
rename from pkgs/development/libraries/szip/default.nix
rename to pkgs/by-name/sz/szip/package.nix
diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/by-name/sz/szyszka/package.nix
similarity index 100%
rename from pkgs/tools/misc/szyszka/default.nix
rename to pkgs/by-name/sz/szyszka/package.nix
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/by-name/t1/t1lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/t1lib/default.nix
rename to pkgs/by-name/t1/t1lib/package.nix
diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/by-name/t1/t1utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/t1utils/default.nix
rename to pkgs/by-name/t1/t1utils/package.nix
diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/by-name/t4/t4kcommon/package.nix
similarity index 100%
rename from pkgs/games/t4kcommon/default.nix
rename to pkgs/by-name/t4/t4kcommon/package.nix
diff --git a/pkgs/development/libraries/ta-lib/default.nix b/pkgs/by-name/ta/ta-lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/ta-lib/default.nix
rename to pkgs/by-name/ta/ta-lib/package.nix
diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/by-name/ta/tab/package.nix
similarity index 100%
rename from pkgs/tools/text/tab/default.nix
rename to pkgs/by-name/ta/tab/package.nix
diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock
index e310f97d2622..3bc79f2f32b2 100644
--- a/pkgs/by-name/ta/tabby/Cargo.lock
+++ b/pkgs/by-name/ta/tabby/Cargo.lock
@@ -41,7 +41,7 @@ dependencies = [
 
 [[package]]
 name = "aim-downloader"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "async-stream",
  "clap",
@@ -1691,7 +1691,7 @@ dependencies = [
 
 [[package]]
 name = "hash-ids"
-version = "0.18.0"
+version = "0.19.0"
 
 [[package]]
 name = "hashbrown"
@@ -1875,7 +1875,7 @@ dependencies = [
 
 [[package]]
 name = "http-api-bindings"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -2538,7 +2538,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "llama-cpp-server"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -3066,7 +3066,7 @@ dependencies = [
 
 [[package]]
 name = "ollama-api-bindings"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -4980,7 +4980,7 @@ dependencies = [
 
 [[package]]
 name = "tabby"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -5030,7 +5030,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-common"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5058,7 +5058,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-crawler"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -5077,7 +5077,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-db"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -5095,7 +5095,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-db-macros"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "quote",
  "syn 2.0.66",
@@ -5103,10 +5103,11 @@ dependencies = [
 
 [[package]]
 name = "tabby-download"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "aim-downloader",
  "anyhow",
+ "serial_test 3.1.1",
  "tabby-common",
  "tokio-retry",
  "tracing",
@@ -5114,7 +5115,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-git"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -5135,7 +5136,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-index"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -5177,7 +5178,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-index-cli"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -5189,7 +5190,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-inference"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -5206,7 +5207,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-schema"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5231,7 +5232,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-webserver"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "argon2",
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index 03179482b4d8..725cbb669f66 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -13,17 +13,15 @@
 
   llama-cpp,
 
+  apple-sdk_15,
   autoAddDriverRunpath,
+  versionCheckHook,
+
   cudaSupport ? config.cudaSupport,
-
   rocmSupport ? config.rocmSupport,
-
-  darwin,
   metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64,
-
   # one of [ null "cpu" "rocm" "cuda" "metal" ];
   acceleration ? null,
-  versionCheckHook,
 }:
 
 let
@@ -33,7 +31,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
 
   pname = "tabby";
-  version = "0.18.0";
+  version = "0.19.0";
 
   availableAccelerations = flatten [
     (optional cudaSupport "cuda")
@@ -106,19 +104,9 @@ let
   # TODO(ghthor): some of this can be removed
   darwinBuildInputs =
     [ llamaccpPackage ]
-    ++ optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Foundation
-        Accelerate
-        CoreVideo
-        CoreGraphics
-      ]
-      ++ optionals enableMetal [
-        Metal
-        MetalKit
-      ]
-    );
+    ++ optionals stdenv.hostPlatform.isDarwin ([
+      apple-sdk_15
+    ]);
 
   cudaBuildInputs = [ llamaccpPackage ];
   rocmBuildInputs = [ llamaccpPackage ];
@@ -132,7 +120,7 @@ rustPlatform.buildRustPackage {
     owner = "TabbyML";
     repo = "tabby";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g=";
+    hash = "sha256-RK81gQ5IUzZ4HXJbKBr5bqayH0Xip6ZVAgdMwqP+kx8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/misc/tableplus/default.nix b/pkgs/by-name/ta/tableplus/package.nix
similarity index 100%
rename from pkgs/applications/misc/tableplus/default.nix
rename to pkgs/by-name/ta/tableplus/package.nix
diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/by-name/ta/tabula-java/package.nix
similarity index 100%
rename from pkgs/applications/misc/tabula-java/default.nix
rename to pkgs/by-name/ta/tabula-java/package.nix
diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/by-name/ta/tacacsplus/package.nix
similarity index 100%
rename from pkgs/servers/tacacsplus/default.nix
rename to pkgs/by-name/ta/tacacsplus/package.nix
diff --git a/pkgs/development/libraries/taco/default.nix b/pkgs/by-name/ta/taco/package.nix
similarity index 100%
rename from pkgs/development/libraries/taco/default.nix
rename to pkgs/by-name/ta/taco/package.nix
diff --git a/pkgs/development/libraries/taco/taco.patch b/pkgs/by-name/ta/taco/taco.patch
similarity index 100%
rename from pkgs/development/libraries/taco/taco.patch
rename to pkgs/by-name/ta/taco/taco.patch
diff --git a/pkgs/applications/audio/tagger/deps.nix b/pkgs/by-name/ta/tagger/deps.nix
similarity index 100%
rename from pkgs/applications/audio/tagger/deps.nix
rename to pkgs/by-name/ta/tagger/deps.nix
diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/by-name/ta/tagger/package.nix
similarity index 100%
rename from pkgs/applications/audio/tagger/default.nix
rename to pkgs/by-name/ta/tagger/package.nix
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/by-name/ta/taglib-sharp/package.nix
similarity index 100%
rename from pkgs/development/libraries/taglib-sharp/default.nix
rename to pkgs/by-name/ta/taglib-sharp/package.nix
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/by-name/ta/taglib/package.nix
similarity index 100%
rename from pkgs/development/libraries/taglib/default.nix
rename to pkgs/by-name/ta/taglib/package.nix
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/by-name/ta/taglib_extras/package.nix
similarity index 100%
rename from pkgs/development/libraries/taglib-extras/default.nix
rename to pkgs/by-name/ta/taglib_extras/package.nix
diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/by-name/ta/tagparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/tagparser/default.nix
rename to pkgs/by-name/ta/tagparser/package.nix
diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/by-name/ta/tagref/package.nix
similarity index 100%
rename from pkgs/tools/misc/tagref/default.nix
rename to pkgs/by-name/ta/tagref/package.nix
diff --git a/pkgs/applications/misc/tagtime/default.nix b/pkgs/by-name/ta/tagtime/package.nix
similarity index 100%
rename from pkgs/applications/misc/tagtime/default.nix
rename to pkgs/by-name/ta/tagtime/package.nix
diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/by-name/ta/tagutil/package.nix
similarity index 100%
rename from pkgs/applications/audio/tagutil/default.nix
rename to pkgs/by-name/ta/tagutil/package.nix
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/tahoe-lafs/default.nix
rename to pkgs/by-name/ta/tahoe-lafs/package.nix
diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/by-name/ta/tailer/package.nix
similarity index 100%
rename from pkgs/tools/misc/tailer/default.nix
rename to pkgs/by-name/ta/tailer/package.nix
diff --git a/pkgs/os-specific/linux/tailor-gui/default.nix b/pkgs/by-name/ta/tailor-gui/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tailor-gui/default.nix
rename to pkgs/by-name/ta/tailor-gui/package.nix
diff --git a/pkgs/applications/misc/tailscale-systray/default.nix b/pkgs/by-name/ta/tailscale-systray/package.nix
similarity index 100%
rename from pkgs/applications/misc/tailscale-systray/default.nix
rename to pkgs/by-name/ta/tailscale-systray/package.nix
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 5e1b6a9babe8..47a2dd94c399 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  version = "1.76.1";
+  version = "1.76.6";
 in
 buildGo123Module {
   pname = "tailscale";
@@ -27,7 +27,7 @@ buildGo123Module {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw=";
+    hash = "sha256-c44Fz/cYGN2nsjlaKln8ozjjS5jHSO/X9RMnHa37tJM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix
new file mode 100644
index 000000000000..bb4c046462b0
--- /dev/null
+++ b/pkgs/by-name/ta/tailspin/package.nix
@@ -0,0 +1,32 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tailspin";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "bensadeh";
+    repo = "tailspin";
+    rev = version;
+    hash = "sha256-5VbxQDK69If5N8EiS8sIKNqHkCAfquOz8nUS7ynp+nA=";
+  };
+
+  cargoHash = "sha256-ohfza2ti7Ar/9TV/WoTL5g6CPaONrxtr7nW0qmLdB/8=";
+
+  postPatch = ''
+    substituteInPlace tests/utils.rs --replace-fail \
+      'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/debug"
+  '';
+
+  meta = with lib; {
+    description = "Log file highlighter";
+    homepage = "https://github.com/bensadeh/tailspin";
+    changelog = "https://github.com/bensadeh/tailspin/blob/${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dit7ya ];
+    mainProgram = "tspin";
+  };
+}
diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
new file mode 100644
index 000000000000..452fbf04d0db
--- /dev/null
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  # Build depends
+  docutils,
+  meson,
+  ninja,
+  pkg-config,
+  python3Packages,
+  opusfile,
+  openssl,
+  gamemode,
+  shaderc,
+  ensureNewerSourcesForZipFilesHook,
+  # Runtime depends
+  glfw,
+  SDL2,
+  SDL2_mixer,
+  cglm,
+  freetype,
+  libpng,
+  libwebp,
+  libzip,
+  zlib,
+  zstd,
+  spirv-cross,
+
+  gamemodeSupport ? stdenv.hostPlatform.isLinux,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "taisei";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "taisei-project";
+    repo = "taisei";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    docutils
+    meson
+    ninja
+    pkg-config
+    python3Packages.python
+    python3Packages.zstandard
+    ensureNewerSourcesForZipFilesHook
+    shaderc
+  ];
+
+  buildInputs = [
+    glfw
+    SDL2
+    SDL2_mixer
+    cglm
+    freetype
+    libpng
+    libwebp
+    libzip
+    zlib
+    zstd
+    opusfile
+    openssl
+    spirv-cross
+  ] ++ lib.optional gamemodeSupport gamemode;
+
+  mesonFlags = [
+    (lib.mesonBool "b_lto" false)
+    (lib.mesonEnable "install_macos_bundle" false)
+    (lib.mesonEnable "install_relocatable" false)
+    (lib.mesonEnable "shader_transpiler" false)
+    (lib.mesonEnable "gamemode" gamemodeSupport)
+  ];
+
+  preConfigure = ''
+    patchShebangs .
+  '';
+
+  strictDeps = true;
+
+  meta = {
+    description = "Free and open-source Touhou Project clone and fangame";
+    mainProgram = "taisei";
+    longDescription = ''
+      Taisei is an open clone of the Tōhō Project series. Tōhō is a one-man
+      project of shoot-em-up games set in an isolated world full of Japanese
+      folklore.
+    '';
+    homepage = "https://taisei-project.org/";
+    license = with lib.licenses; [
+      mit
+      cc-by-40
+    ];
+    maintainers = with lib.maintainers; [
+      lambda-11235
+      Gliczy
+    ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/by-name/ta/taizen/package.nix
similarity index 100%
rename from pkgs/applications/misc/taizen/default.nix
rename to pkgs/by-name/ta/taizen/package.nix
diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/by-name/ta/takao/package.nix
similarity index 100%
rename from pkgs/data/fonts/takao/default.nix
rename to pkgs/by-name/ta/takao/package.nix
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/by-name/ta/taktuk/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/taktuk/default.nix
rename to pkgs/by-name/ta/taktuk/package.nix
diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/by-name/ta/talentedhack/package.nix
similarity index 100%
rename from pkgs/applications/audio/talentedhack/default.nix
rename to pkgs/by-name/ta/talentedhack/package.nix
diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/by-name/ta/talkfilters/package.nix
similarity index 100%
rename from pkgs/misc/talkfilters/default.nix
rename to pkgs/by-name/ta/talkfilters/package.nix
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/by-name/ta/talloc/package.nix
similarity index 100%
rename from pkgs/development/libraries/talloc/default.nix
rename to pkgs/by-name/ta/talloc/package.nix
diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/by-name/ta/talosctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/talosctl/default.nix
rename to pkgs/by-name/ta/talosctl/package.nix
diff --git a/pkgs/by-name/ta/tamatool/package.nix b/pkgs/by-name/ta/tamatool/package.nix
new file mode 100644
index 000000000000..254d1b8a036b
--- /dev/null
+++ b/pkgs/by-name/ta/tamatool/package.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  zip,
+  copyDesktopItems,
+  libpng,
+  SDL2,
+  SDL2_image,
+
+  # Optionally bundle a ROM file
+  rom ? null,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tamatool";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "jcrona";
+    repo = "tamatool";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VDmpIBuMWg3TwfCf9J6/bi/DaWip6ESAQWvGh2SH+A8=";
+    fetchSubmodules = true;
+  };
+
+  # * Point to the installed rom and res directory
+  # * Tell the user to use --rom instead of telling them to place the rom in the
+  #   program directory (it's immutable!)
+  postPatch = ''
+    substituteInPlace src/tamatool.c \
+      --replace '#define RES_PATH'          "#define RES_PATH         \"$out/share/tamatool/res\"          //" \
+      --replace '#define ROM_PATH'          "#define ROM_PATH         \"$out/share/tamatool/rom.bin\"      //" \
+      --replace '#define ROM_NOT_FOUND_MSG' '#define ROM_NOT_FOUND_MSG "You need to use the --rom option!" //'
+  '';
+
+  nativeBuildInputs = [
+    zip
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    libpng
+    SDL2
+    SDL2_image
+  ];
+
+  makeFlags = [
+    "-Clinux"
+    "VERSION=${finalAttrs.version}"
+    "CFLAGS+=-I${SDL2.dev}/include/SDL2"
+    "CFLAGS+=-I${SDL2_image}/include/SDL2"
+    "DIST_PATH=$(out)"
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-framework CoreFoundation";
+  };
+
+  desktopItems = [ "linux/tamatool.desktop" ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 linux/tamatool $out/bin/tamatool
+    mkdir -p $out/share/tamatool
+    cp -r res $out/share/tamatool/res
+    install -Dm644 linux/tamatool.png $out/share/icons/hicolor/128x126/apps/tamatool.png
+    ${lib.optionalString (rom != null) "install -Dm677 ${rom} $out/share/tamatool/rom.bin"}
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Cross-platform Tamagotchi P1 explorer";
+    homepage = "https://github.com/jcrona/tamatool";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+    mainProgram = "tamatool";
+  };
+})
diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/by-name/ta/tambura/package.nix
similarity index 100%
rename from pkgs/applications/audio/tambura/default.nix
rename to pkgs/by-name/ta/tambura/package.nix
diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/by-name/ta/tamsyn/package.nix
similarity index 100%
rename from pkgs/data/fonts/tamsyn/default.nix
rename to pkgs/by-name/ta/tamsyn/package.nix
diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/by-name/ta/tamzen/package.nix
similarity index 100%
rename from pkgs/data/fonts/tamzen/default.nix
rename to pkgs/by-name/ta/tamzen/package.nix
diff --git a/pkgs/applications/misc/tango/default.nix b/pkgs/by-name/ta/tango/package.nix
similarity index 100%
rename from pkgs/applications/misc/tango/default.nix
rename to pkgs/by-name/ta/tango/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/by-name/ta/tangram/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/tangram/default.nix
rename to pkgs/by-name/ta/tangram/package.nix
diff --git a/pkgs/applications/video/tanidvr/default.nix b/pkgs/by-name/ta/tanidvr/package.nix
similarity index 100%
rename from pkgs/applications/video/tanidvr/default.nix
rename to pkgs/by-name/ta/tanidvr/package.nix
diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/by-name/ta/tanka/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tanka/default.nix
rename to pkgs/by-name/ta/tanka/package.nix
diff --git a/pkgs/tools/misc/taoup/cachefile.patch b/pkgs/by-name/ta/taoup/cachefile.patch
similarity index 100%
rename from pkgs/tools/misc/taoup/cachefile.patch
rename to pkgs/by-name/ta/taoup/cachefile.patch
diff --git a/pkgs/tools/misc/taoup/help.patch b/pkgs/by-name/ta/taoup/help.patch
similarity index 100%
rename from pkgs/tools/misc/taoup/help.patch
rename to pkgs/by-name/ta/taoup/help.patch
diff --git a/pkgs/by-name/ta/taoup/package.nix b/pkgs/by-name/ta/taoup/package.nix
new file mode 100644
index 000000000000..6b1f0778e3ee
--- /dev/null
+++ b/pkgs/by-name/ta/taoup/package.nix
@@ -0,0 +1,66 @@
+{ lib, stdenv, fetchFromGitHub, ruby, bash, ncurses }:
+let
+  rubyEnv = ruby.withPackages (ps: with ps; [ ansi ]);
+in
+stdenv.mkDerivation rec {
+  pname = "taoup";
+  version = "1.1.23";
+
+  src = fetchFromGitHub {
+    owner = "globalcitizen";
+    repo = "taoup";
+    rev = "v${version}";
+    hash = "sha256-9J46fKyeSZW71r67R8y9KVPeCH8fn27hOk/XpusqGmk=";
+  };
+
+  buildInputs = [ rubyEnv bash ncurses ];
+
+  patches = [
+    # Pre-create a cache within this derivation
+    ./cachefile.patch
+    # Remove the need to test for `tput`, depend on ncurses directly
+    ./tput.patch
+    # Fix the script name in `taoup --help` output
+    ./help.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace taoup \
+     --subst-var-by ncurses ${ncurses} \
+     --subst-var-by pname taoup
+    substituteInPlace taoup-fortune \
+      --subst-var-by out $out \
+      --replace-fail "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/taoup}
+
+    cp taoup $out/lib/taoup
+    cat > $out/bin/taoup < $out/lib/taoup/cache
+
+    cp taoup-fortune $out/bin
+    chmod +x $out/bin/taoup-fortune
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Tao of Unix Programming (Ruby-powered ANSI colored fortunes)";
+    homepage = "https://github.com/globalcitizen/taoup";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.zakame ];
+  };
+}
diff --git a/pkgs/tools/misc/taoup/tput.patch b/pkgs/by-name/ta/taoup/tput.patch
similarity index 100%
rename from pkgs/tools/misc/taoup/tput.patch
rename to pkgs/by-name/ta/taoup/tput.patch
diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/by-name/ta/taplo/package.nix
similarity index 100%
rename from pkgs/development/tools/taplo/default.nix
rename to pkgs/by-name/ta/taplo/package.nix
diff --git a/pkgs/applications/blockchains/taproot-assets/default.nix b/pkgs/by-name/ta/taproot-assets/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/taproot-assets/default.nix
rename to pkgs/by-name/ta/taproot-assets/package.nix
diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/by-name/ta/tapview/dont_check_echo.patch
similarity index 100%
rename from pkgs/development/tools/tapview/dont_check_echo.patch
rename to pkgs/by-name/ta/tapview/dont_check_echo.patch
diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/by-name/ta/tapview/package.nix
similarity index 100%
rename from pkgs/development/tools/tapview/default.nix
rename to pkgs/by-name/ta/tapview/package.nix
diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/by-name/ta/tar2ext4/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/tar2ext4/default.nix
rename to pkgs/by-name/ta/tar2ext4/package.nix
diff --git a/pkgs/servers/tarantool/default.nix b/pkgs/by-name/ta/tarantool/package.nix
similarity index 100%
rename from pkgs/servers/tarantool/default.nix
rename to pkgs/by-name/ta/tarantool/package.nix
diff --git a/pkgs/os-specific/linux/target-isns/install_prefix_path.patch b/pkgs/by-name/ta/target-isns/install_prefix_path.patch
similarity index 100%
rename from pkgs/os-specific/linux/target-isns/install_prefix_path.patch
rename to pkgs/by-name/ta/target-isns/install_prefix_path.patch
diff --git a/pkgs/os-specific/linux/target-isns/default.nix b/pkgs/by-name/ta/target-isns/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/target-isns/default.nix
rename to pkgs/by-name/ta/target-isns/package.nix
diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli/package.nix
new file mode 100644
index 000000000000..a0a2aad949fd
--- /dev/null
+++ b/pkgs/by-name/ta/targetcli/package.nix
@@ -0,0 +1,35 @@
+{ lib, python3, fetchFromGitHub, nixosTests, wrapGAppsNoGuiHook, gobject-introspection, glib }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "targetcli";
+  version = "2.1.58";
+
+  src = fetchFromGitHub {
+    owner = "open-iscsi";
+    repo = "${pname}-fb";
+    rev = "v${version}";
+    hash = "sha256-9QYo7jGk9iWr26j0qPQCqYsJ+vLXAsO4Xs7+7VT9/yc=";
+  };
+
+  nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ];
+  buildInputs = [ glib ];
+
+  propagatedBuildInputs = with python3.pkgs; [ configshell rtslib pygobject3 ];
+
+  postInstall = ''
+    install -D targetcli.8 -t $out/share/man/man8/
+    install -D targetclid.8 -t $out/share/man/man8/
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) iscsi-root;
+  };
+
+  meta = with lib; {
+    description = "Command shell for managing the Linux LIO kernel target";
+    homepage = "https://github.com/open-iscsi/targetcli-fb";
+    license = licenses.asl20;
+    maintainers = [ ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/by-name/ta/tarsnap/package.nix
similarity index 100%
rename from pkgs/tools/backup/tarsnap/default.nix
rename to pkgs/by-name/ta/tarsnap/package.nix
diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/by-name/ta/tarsnapper/package.nix
similarity index 100%
rename from pkgs/tools/backup/tarsnapper/default.nix
rename to pkgs/by-name/ta/tarsnapper/package.nix
diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/by-name/ta/tarssh/package.nix
similarity index 100%
rename from pkgs/servers/tarssh/default.nix
rename to pkgs/by-name/ta/tarssh/package.nix
diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix
new file mode 100644
index 000000000000..77d218191ca2
--- /dev/null
+++ b/pkgs/by-name/ta/tart/package.nix
@@ -0,0 +1,47 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, makeWrapper
+# Softnet support ("--net-softnet") is disabled by default as it requires
+# passwordless-sudo when installed through nix. Alternatively users may install
+# softnet through other means with "setuid"-bit enabled.
+# See https://github.com/cirruslabs/softnet#installing
+, enableSoftnet ? false, softnet
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "tart";
+  version = "2.19.3";
+
+  src = fetchurl {
+      url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
+      hash = "sha256-WigjqOu36bkNsTk6WpLwpyaauk4RtwShw1wWBHdxTFI=";
+  };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    # ./tart.app/Contents/MacOS/tart binary is required to be used in order to
+    # trick macOS to pick tart.app/Contents/embedded.provision profile for elevated
+    # privileges that Tart needs
+    mkdir -p $out/bin $out/Applications
+    cp -r tart.app $out/Applications/tart.app
+    makeWrapper $out/Applications/tart.app/Contents/MacOS/tart $out/bin/tart \
+      --prefix PATH : ${lib.makeBinPath (lib.optional enableSoftnet softnet)}
+    install -Dm444 LICENSE $out/share/tart/LICENSE
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "macOS VMs on Apple Silicon to use in CI and other automations";
+    homepage = "https://tart.run";
+    license = licenses.fairsource09;
+    maintainers = with maintainers; [ emilytrau aduh95 ];
+    mainProgram = finalAttrs.pname;
+    platforms = [ "aarch64-darwin" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix
index 1ee23cf2516c..92cd656bd7e0 100644
--- a/pkgs/by-name/ta/tartufo/package.nix
+++ b/pkgs/by-name/ta/tartufo/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "tartufo";
-  version = "5.0.1";
+  version = "5.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "godaddy";
     repo = "tartufo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mwwenmSCxnzD2DLf1a/dsQjwJ2GetMgRGj/noqWJ/E0=";
+    hash = "sha256-s7gqGvOnie7lGlpW3wfd8igWfowxwg9mftRjiHnvedc=";
   };
 
   pythonRelaxDeps = [ "tomlkit" ];
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/by-name/ta/tasknc/package.nix
similarity index 100%
rename from pkgs/applications/misc/tasknc/default.nix
rename to pkgs/by-name/ta/tasknc/package.nix
diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/by-name/ta/taskopen/package.nix
similarity index 100%
rename from pkgs/applications/misc/taskopen/default.nix
rename to pkgs/by-name/ta/taskopen/package.nix
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/by-name/ta/taskserver/package.nix
similarity index 100%
rename from pkgs/servers/misc/taskserver/default.nix
rename to pkgs/by-name/ta/taskserver/package.nix
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/by-name/ta/tasksh/package.nix
similarity index 100%
rename from pkgs/applications/misc/tasksh/default.nix
rename to pkgs/by-name/ta/tasksh/package.nix
diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/by-name/ta/taskspooler/package.nix
similarity index 100%
rename from pkgs/tools/system/taskspooler/default.nix
rename to pkgs/by-name/ta/taskspooler/package.nix
diff --git a/pkgs/applications/misc/tasktimer/default.nix b/pkgs/by-name/ta/tasktimer/package.nix
similarity index 100%
rename from pkgs/applications/misc/tasktimer/default.nix
rename to pkgs/by-name/ta/tasktimer/package.nix
diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
similarity index 100%
rename from pkgs/applications/misc/taskwarrior-tui/default.nix
rename to pkgs/by-name/ta/taskwarrior-tui/package.nix
diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix
similarity index 100%
rename from pkgs/data/icons/tau-hydrogen/default.nix
rename to pkgs/by-name/ta/tau-hydrogen/package.nix
diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/by-name/ta/tauon/package.nix
similarity index 100%
rename from pkgs/applications/audio/tauon/default.nix
rename to pkgs/by-name/ta/tauon/package.nix
diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/by-name/ta/tayga/package.nix
similarity index 100%
rename from pkgs/tools/networking/tayga/default.nix
rename to pkgs/by-name/ta/tayga/package.nix
diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/by-name/tb/tbls/package.nix
similarity index 100%
rename from pkgs/tools/misc/tbls/default.nix
rename to pkgs/by-name/tb/tbls/package.nix
diff --git a/pkgs/by-name/tb/tboot/package.nix b/pkgs/by-name/tb/tboot/package.nix
new file mode 100644
index 000000000000..aabbe94bdb0c
--- /dev/null
+++ b/pkgs/by-name/tb/tboot/package.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchurl, openssl, perl, trousers, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "tboot";
+  version = "1.11.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
+    sha256 = "sha256-TIs/xLxLBkKBN0a0CRB2KMmCq8QgICH1++i485WDU3A=";
+  };
+
+  buildInputs = [ openssl trousers zlib ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    substituteInPlace tboot/Makefile --replace /usr/bin/perl ${perl}/bin/perl
+
+    for a in lcptools-v2 tb_polgen utils; do
+      substituteInPlace "$a/Makefile" --replace /usr/sbin /sbin
+    done
+    substituteInPlace docs/Makefile --replace /usr/share /share
+  '';
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with lib; {
+    description = "Pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
+    homepage    = "https://sourceforge.net/projects/tboot/";
+    changelog   = "https://sourceforge.net/p/tboot/code/ci/v${version}/tree/CHANGELOG";
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ ak ];
+    platforms   = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/development/libraries/tbox/libtbox.pc.in b/pkgs/by-name/tb/tbox/libtbox.pc.in
similarity index 100%
rename from pkgs/development/libraries/tbox/libtbox.pc.in
rename to pkgs/by-name/tb/tbox/libtbox.pc.in
diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/by-name/tb/tbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/tbox/default.nix
rename to pkgs/by-name/tb/tbox/package.nix
diff --git a/pkgs/tools/misc/tcat/default.nix b/pkgs/by-name/tc/tcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/tcat/default.nix
rename to pkgs/by-name/tc/tcat/package.nix
diff --git a/pkgs/tools/security/tcb/fix-makefiles.patch b/pkgs/by-name/tc/tcb/fix-makefiles.patch
similarity index 100%
rename from pkgs/tools/security/tcb/fix-makefiles.patch
rename to pkgs/by-name/tc/tcb/fix-makefiles.patch
diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/by-name/tc/tcb/package.nix
similarity index 100%
rename from pkgs/tools/security/tcb/default.nix
rename to pkgs/by-name/tc/tcb/package.nix
diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/by-name/tc/tcl2048/package.nix
similarity index 100%
rename from pkgs/games/tcl2048/default.nix
rename to pkgs/by-name/tc/tcl2048/package.nix
diff --git a/pkgs/tools/networking/tcp-cutter/default.nix b/pkgs/by-name/tc/tcp-cutter/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcp-cutter/default.nix
rename to pkgs/by-name/tc/tcp-cutter/package.nix
diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/pkgs/by-name/tc/tcp_wrappers/cdecls.patch
similarity index 100%
rename from pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
rename to pkgs/by-name/tc/tcp_wrappers/cdecls.patch
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/by-name/tc/tcp_wrappers/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tcp-wrappers/default.nix
rename to pkgs/by-name/tc/tcp_wrappers/package.nix
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/by-name/tc/tcpcrypt/package.nix
similarity index 100%
rename from pkgs/tools/security/tcpcrypt/default.nix
rename to pkgs/by-name/tc/tcpcrypt/package.nix
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/by-name/tc/tcpdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcpdump/default.nix
rename to pkgs/by-name/tc/tcpdump/package.nix
diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/by-name/tc/tcpflow/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcpflow/default.nix
rename to pkgs/by-name/tc/tcpflow/package.nix
diff --git a/pkgs/applications/networking/tcping-go/default.nix b/pkgs/by-name/tc/tcping-go/package.nix
similarity index 100%
rename from pkgs/applications/networking/tcping-go/default.nix
rename to pkgs/by-name/tc/tcping-go/package.nix
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/by-name/tc/tcpkali/package.nix
similarity index 100%
rename from pkgs/applications/networking/tcpkali/default.nix
rename to pkgs/by-name/tc/tcpkali/package.nix
diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/by-name/tc/tcptraceroute/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcptraceroute/default.nix
rename to pkgs/by-name/tc/tcptraceroute/package.nix
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/by-name/tc/tcptrack/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tcptrack/default.nix
rename to pkgs/by-name/tc/tcptrack/package.nix
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/by-name/td/tdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tdb/default.nix
rename to pkgs/by-name/td/tdb/package.nix
diff --git a/pkgs/tools/misc/tdfgo/default.nix b/pkgs/by-name/td/tdfgo/package.nix
similarity index 100%
rename from pkgs/tools/misc/tdfgo/default.nix
rename to pkgs/by-name/td/tdfgo/package.nix
diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix
index da454bc57fca..a02c113df614 100644
--- a/pkgs/by-name/td/tdl/package.nix
+++ b/pkgs/by-name/td/tdl/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "tdl";
-  version = "0.17.5";
+  version = "0.17.7";
 
   src = fetchFromGitHub {
     owner = "iyear";
     repo = "tdl";
     rev = "v${version}";
-    hash = "sha256-K8eq3cuPRgVSqd9VVjlE9DQJQKlyUGZKAhPRwpUTrTc=";
+    hash = "sha256-1dRZdLHSZo4d6kE8qdyyk8Va4VUVxw3LiiWaz4lGpPQ=";
   };
 
-  vendorHash = "sha256-X9gQ0mtuIgeo7s/IOAC5k6q3C8rBOKjTdQgeV7d3L60=";
+  vendorHash = "sha256-4lTbDMJkABZC1Slf9YhNZHXECbRhMbck2mqeIfog/aU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
new file mode 100644
index 000000000000..3ae5b281e1fb
--- /dev/null
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -0,0 +1,40 @@
+{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }:
+
+stdenv.mkDerivation {
+  pname = "tdlib";
+  version = "1.8.38";
+
+  src = fetchFromGitHub {
+    owner = "tdlib";
+    repo = "td";
+
+    # The tdlib authors do not set tags for minor versions, but
+    # external programs depending on tdlib constrain the minor
+    # version, hence we set a specific commit with a known version.
+    rev = "d321984b75fccdb76239529e8aadcf7f80b0e35a";
+    hash = "sha256-5QNcpwW0viWUtsW7b5oSq6X0tRyup6V5CT/BNhdv6lw=";
+  };
+
+  buildInputs = [ gperf openssl readline zlib ];
+  nativeBuildInputs = [ cmake ];
+
+  # https://github.com/tdlib/td/issues/1974
+  postPatch = ''
+    substituteInPlace CMake/GeneratePkgConfig.cmake \
+      --replace 'function(generate_pkgconfig' \
+                'include(GNUInstallDirs)
+                 function(generate_pkgconfig' \
+      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
+      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
+  '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    sed -i "/vptr/d" test/CMakeLists.txt
+  '';
+
+  meta = with lib; {
+    description = "Cross-platform library for building Telegram clients";
+    homepage = "https://core.telegram.org/tdlib/";
+    license = [ licenses.boost ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vyorkin ];
+  };
+}
diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/by-name/td/tdns-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/tdns-cli/default.nix
rename to pkgs/by-name/td/tdns-cli/package.nix
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/by-name/td/tdrop/package.nix
similarity index 100%
rename from pkgs/applications/misc/tdrop/default.nix
rename to pkgs/by-name/td/tdrop/package.nix
diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/by-name/te/tea/package.nix
similarity index 100%
rename from pkgs/tools/misc/tea/default.nix
rename to pkgs/by-name/te/tea/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/by-name/te/teams/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/teams/default.nix
rename to pkgs/by-name/te/teams/package.nix
diff --git a/pkgs/by-name/te/teamspeak3/package.nix b/pkgs/by-name/te/teamspeak3/package.nix
new file mode 100644
index 000000000000..01e5739b169f
--- /dev/null
+++ b/pkgs/by-name/te/teamspeak3/package.nix
@@ -0,0 +1,143 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchzip,
+  makeDesktopItem,
+  glib,
+  qt5,
+  libsForQt5,
+  perl,
+  libcxx,
+  autoPatchelfHook,
+  copyDesktopItems,
+}:
+
+let
+  pluginsdk = fetchzip {
+    url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip";
+    hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ=";
+  };
+in
+
+stdenv.mkDerivation rec {
+  pname = "teamspeak3";
+
+  version = "3.6.2";
+
+  src = fetchurl {
+    url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_amd64-${version}.run";
+    hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI=";
+  };
+
+  nativeBuildInputs = [
+    perl # Installer script needs `shasum`
+    qt5.wrapQtAppsHook
+    autoPatchelfHook
+    copyDesktopItems
+  ];
+
+  buildInputs =
+    [
+      libsForQt5.quazip
+      glib
+      libcxx
+    ]
+    ++ (with qt5; [
+      qtbase
+      qtwebengine
+      qtwebchannel
+      qtwebsockets
+      qtsvg
+    ]);
+
+  # This runs the installer script. If it gets stuck, run it with -x.
+  # If it then gets stuck at something like:
+  #
+  # ++ exec
+  # + PAGER_PATH=
+  #
+  # it's looking for a dependency and didn't find it. Check the script and make
+  # sure the dep is in nativeBuildInputs.
+  unpackPhase = ''
+    runHook preUnpack
+
+    # Run the installer script non-interactively
+    echo -e '\ny' | PAGER=cat sh -e $src
+
+    cd TeamSpeak3-Client-linux_amd64
+
+    runHook postUnpack
+  '';
+
+  patchPhase = ''
+    runHook prePatch
+
+    # Delete unecessary libraries - these are provided by nixos.
+    find . -\( -name '*.so' -or -name '*.so.*' -\) -print0 | xargs -0 rm # I hate find.
+
+    rm QtWebEngineProcess
+    rm qt.conf
+
+    mv ts3client_linux_amd64 ts3client
+
+    # Our libquazip's so name has this suffix and there is no symlink
+    patchelf --replace-needed libquazip.so libquazip1-qt5.so ts3client error_report
+
+    runHook postPatch
+  '';
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "teamspeak";
+      exec = "ts3client";
+      icon = "teamspeak";
+      comment = "The TeamSpeak voice communication tool";
+      desktopName = "TeamSpeak";
+      genericName = "TeamSpeak";
+      categories = [ "Network" ];
+    })
+  ];
+
+  qtWrapperArgs = [
+    # wayland is currently broken, remove when TS3 fixes that
+    "--set QT_QPA_PLATFORM xcb"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/opt/teamspeak
+    mv * $out/opt/teamspeak/
+
+    # Grab the desktop icon from the plugin sdk
+    install ${pluginsdk}/doc/_static/logo.png -D $out/share/icons/hicolor/64x64/apps/teamspeak.png
+
+    mkdir -p $out/bin/
+    ln -s $out/opt/teamspeak/ts3client $out/bin/ts3client
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "TeamSpeak voice communication tool";
+    homepage = "https://teamspeak.com/";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = {
+      # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
+      fullName = "Teamspeak client license";
+      url = "https://www.teamspeak.com/en/privacy-and-terms/";
+      free = false;
+    };
+    maintainers = with lib.maintainers; [
+      lhvwb
+      lukegb
+      atemu
+    ];
+    mainProgram = "ts3client";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/tools/networking/teavpn2/nix.patch b/pkgs/by-name/te/teavpn2/nix.patch
similarity index 100%
rename from pkgs/tools/networking/teavpn2/nix.patch
rename to pkgs/by-name/te/teavpn2/nix.patch
diff --git a/pkgs/tools/networking/teavpn2/default.nix b/pkgs/by-name/te/teavpn2/package.nix
similarity index 100%
rename from pkgs/tools/networking/teavpn2/default.nix
rename to pkgs/by-name/te/teavpn2/package.nix
diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/by-name/te/tebreak/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/tebreak/default.nix
rename to pkgs/by-name/te/tebreak/package.nix
diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/by-name/te/tecnoballz/package.nix
similarity index 100%
rename from pkgs/games/tecnoballz/default.nix
rename to pkgs/by-name/te/tecnoballz/package.nix
diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/by-name/te/ted/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/ted/default.nix
rename to pkgs/by-name/te/ted/package.nix
diff --git a/pkgs/applications/editors/teehee/default.nix b/pkgs/by-name/te/teehee/package.nix
similarity index 100%
rename from pkgs/applications/editors/teehee/default.nix
rename to pkgs/by-name/te/teehee/package.nix
diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/by-name/te/teensy-cmake-macros/hook.nix
similarity index 100%
rename from pkgs/development/embedded/teensy-cmake-macros/hook.nix
rename to pkgs/by-name/te/teensy-cmake-macros/hook.nix
diff --git a/pkgs/development/embedded/teensy-cmake-macros/default.nix b/pkgs/by-name/te/teensy-cmake-macros/package.nix
similarity index 100%
rename from pkgs/development/embedded/teensy-cmake-macros/default.nix
rename to pkgs/by-name/te/teensy-cmake-macros/package.nix
diff --git a/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh b/pkgs/by-name/te/teensy-cmake-macros/setup-hook.sh
similarity index 100%
rename from pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh
rename to pkgs/by-name/te/teensy-cmake-macros/setup-hook.sh
diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/by-name/te/teensy-loader-cli/package.nix
similarity index 100%
rename from pkgs/development/embedded/teensy-loader-cli/default.nix
rename to pkgs/by-name/te/teensy-loader-cli/package.nix
diff --git a/pkgs/os-specific/linux/teensy-udev-rules/default.nix b/pkgs/by-name/te/teensy-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/teensy-udev-rules/default.nix
rename to pkgs/by-name/te/teensy-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/teensy-udev-rules/teensy.rules b/pkgs/by-name/te/teensy-udev-rules/teensy.rules
similarity index 100%
rename from pkgs/os-specific/linux/teensy-udev-rules/teensy.rules
rename to pkgs/by-name/te/teensy-udev-rules/teensy.rules
diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/by-name/te/teetertorture/package.nix
similarity index 100%
rename from pkgs/games/teetertorture/default.nix
rename to pkgs/by-name/te/teetertorture/package.nix
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
rename to pkgs/by-name/te/tegaki-zinnia-japanese/package.nix
diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/by-name/te/teip/package.nix
similarity index 100%
rename from pkgs/tools/text/teip/default.nix
rename to pkgs/by-name/te/teip/package.nix
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tektoncd-cli/default.nix
rename to pkgs/by-name/te/tektoncd-cli/package.nix
diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/by-name/te/tela-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/tela-icon-theme/default.nix
rename to pkgs/by-name/te/tela-icon-theme/package.nix
diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix
new file mode 100644
index 000000000000..e87de1d53f5e
--- /dev/null
+++ b/pkgs/by-name/te/telegram-bot-api/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gperf,
+  openssl,
+  zlib,
+}:
+
+stdenv.mkDerivation {
+  pname = "telegram-bot-api";
+  version = "7.11";
+
+  src = fetchFromGitHub {
+    repo = "telegram-bot-api";
+    owner = "tdlib";
+    rev = "6d1b62b51bdc543c10f854aae751e160e5b7b9c5";
+    hash = "sha256-FLHAv9CQ90Jd2DnzQSRl5wHW6hnWUCz0Ap65Vjkgj0s=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    gperf
+  ];
+  buildInputs = [
+    openssl
+    zlib
+  ];
+
+  meta = {
+    description = "Telegram Bot API server";
+    homepage = "https://github.com/tdlib/telegram-bot-api";
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [
+      Anillc
+      Forden
+      nartsiss
+    ];
+    platforms = lib.platforms.all;
+    mainProgram = "telegram-bot-api";
+  };
+}
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/by-name/te/telepathy-farstream/package.nix
similarity index 100%
rename from pkgs/development/libraries/telepathy/farstream/default.nix
rename to pkgs/by-name/te/telepathy-farstream/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/by-name/te/telepathy-gabble/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
rename to pkgs/by-name/te/telepathy-gabble/package.nix
diff --git a/pkgs/by-name/te/telepathy-glib/package.nix b/pkgs/by-name/te/telepathy-glib/package.nix
new file mode 100644
index 000000000000..a04cf25b7bcd
--- /dev/null
+++ b/pkgs/by-name/te/telepathy-glib/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dbus-glib,
+  glib,
+  python3,
+  pkg-config,
+  libxslt,
+  gobject-introspection,
+  vala,
+  glibcLocales,
+  fetchpatch,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "telepathy-glib";
+  version = "0.24.2";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
+    sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    pkg-config
+    libxslt
+    gobject-introspection
+    vala
+    python3
+  ];
+
+  buildInputs = [
+    glibcLocales
+  ];
+
+  propagatedBuildInputs = [
+    dbus-glib
+    glib
+  ];
+
+  configureFlags = [
+    "--enable-vala-bindings"
+  ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
+  '';
+
+  patches = [
+    # Upstream unreleased patch for gcc14 error
+    (fetchpatch {
+      name = "fix-incompatible-pointer-types.patch";
+      url = "https://github.com/TelepathyIM/telepathy-glib/commit/72412c944b771f3214ddc40fa9dea82cea3a5651.patch";
+      hash = "sha256-NXQel0eS7zK6FRbJcPsPXCQxos0xT8EN102vX94M5Vo=";
+    })
+  ];
+
+  meta = with lib; {
+    homepage = "https://telepathy.freedesktop.org";
+    platforms = platforms.unix;
+    license = with licenses; [
+      bsd2
+      bsd3
+      lgpl21Plus
+    ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/by-name/te/telepathy-haze/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
rename to pkgs/by-name/te/telepathy-haze/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/by-name/te/telepathy-idle/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
rename to pkgs/by-name/te/telepathy-idle/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/by-name/te/telepathy-logger/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
rename to pkgs/by-name/te/telepathy-logger/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/by-name/te/telepathy-mission-control/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
rename to pkgs/by-name/te/telepathy-mission-control/package.nix
diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix
new file mode 100644
index 000000000000..1b37d7e2c65f
--- /dev/null
+++ b/pkgs/by-name/te/telepresence2/package.nix
@@ -0,0 +1,65 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+, fuse
+}:
+
+let
+  fuseftp = buildGoModule rec {
+    pname = "go-fuseftp";
+    version = "0.4.2";
+
+    src = fetchFromGitHub {
+      owner = "datawire";
+      repo = "go-fuseftp";
+      rev = "v${version}";
+      hash = "sha256-bkaC+EOqFPQA4fDkVhO6EqgGhOJy31yGwVbbPoRd+70=";
+    };
+
+    vendorHash = "sha256-Dk4wvg2lTGTw8vP42+XuvmMXeMluR0SPwlVHLEB8yCQ=";
+
+    buildInputs = [ fuse ];
+
+    ldflags = [ "-s" "-w" ];
+
+    subPackages = [ "pkg/main" ];
+  };
+in
+buildGoModule rec {
+  pname = "telepresence2";
+  version = "2.20.2";
+
+  src = fetchFromGitHub {
+    owner = "telepresenceio";
+    repo = "telepresence";
+    rev = "v${version}";
+    hash = "sha256-MwAet+UJ6BNEj6/NYN9HBxTGbw2CS2ASUJQrKtpoV1I=";
+  };
+
+  propagatedBuildInputs = [
+    fuseftp
+  ];
+
+  # telepresence depends on fuseftp existing as a built binary, as it gets embedded
+  # CGO gets disabled to match their build process as that is how it's done upstream
+  preBuild = ''
+    cp ${fuseftp}/bin/main ./pkg/client/remotefs/fuseftp.bits
+    export CGO_ENABLED=0
+  '';
+
+  vendorHash = "sha256-i9quHeAb8PCG1KQGKaOkxTxjImiuK6oMJcRI443/mkI=";
+
+  ldflags = [
+    "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
+  ];
+
+  subPackages = [ "cmd/telepresence" ];
+
+  meta = with lib; {
+    description = "Local development against a remote Kubernetes or OpenShift cluster";
+    homepage = "https://telepresence.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mausch vilsol ];
+    mainProgram = "telepresence";
+  };
+}
diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/by-name/te/teler/package.nix
similarity index 100%
rename from pkgs/tools/security/teler/default.nix
rename to pkgs/by-name/te/teler/package.nix
diff --git a/pkgs/tools/security/tell-me-your-secrets/default.nix b/pkgs/by-name/te/tell-me-your-secrets/package.nix
similarity index 100%
rename from pkgs/tools/security/tell-me-your-secrets/default.nix
rename to pkgs/by-name/te/tell-me-your-secrets/package.nix
diff --git a/pkgs/development/tools/teller/default.nix b/pkgs/by-name/te/teller/package.nix
similarity index 100%
rename from pkgs/development/tools/teller/default.nix
rename to pkgs/by-name/te/teller/package.nix
diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index 8e90a4823ffc..727ddff217e5 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "templ";
-  version = "0.2.778";
+  version = "0.2.793";
 
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
     rev = "v${version}";
-    hash = "sha256-lU8aVTw73HX0lNGPyD8Xnvtnr2VFTXv/S6xCVn6Lg74=";
+    hash = "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw=";
   };
 
   vendorHash = "sha256-ZWY19f11+UI18jeHYIEZjdb9Ii74mD6w+dYRLPkdfBU=";
diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/by-name/te/template-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/template-glib/default.nix
rename to pkgs/by-name/te/template-glib/package.nix
diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/by-name/te/tempo/package.nix
similarity index 100%
rename from pkgs/servers/tracing/tempo/default.nix
rename to pkgs/by-name/te/tempo/package.nix
diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/by-name/te/tempora_lgc/package.nix
similarity index 100%
rename from pkgs/data/fonts/tempora-lgc/default.nix
rename to pkgs/by-name/te/tempora_lgc/package.nix
diff --git a/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch b/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch
rename to pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch
diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/by-name/te/temporal-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/temporal-cli/default.nix
rename to pkgs/by-name/te/temporal-cli/package.nix
diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/by-name/te/temporal/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/temporal/default.nix
rename to pkgs/by-name/te/temporal/package.nix
diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/by-name/te/temporalite/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/temporalite/default.nix
rename to pkgs/by-name/te/temporalite/package.nix
diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/by-name/te/tenacity/package.nix
similarity index 100%
rename from pkgs/applications/audio/tenacity/default.nix
rename to pkgs/by-name/te/tenacity/package.nix
diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/by-name/te/tendermint/package.nix
similarity index 100%
rename from pkgs/tools/networking/tendermint/default.nix
rename to pkgs/by-name/te/tendermint/package.nix
diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/by-name/te/tenderness/package.nix
similarity index 100%
rename from pkgs/data/fonts/tenderness/default.nix
rename to pkgs/by-name/te/tenderness/package.nix
diff --git a/pkgs/games/tennix/default.nix b/pkgs/by-name/te/tennix/package.nix
similarity index 100%
rename from pkgs/games/tennix/default.nix
rename to pkgs/by-name/te/tennix/package.nix
diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/by-name/te/tensorflow-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/tensorflow-lite/default.nix
rename to pkgs/by-name/te/tensorflow-lite/package.nix
diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/by-name/te/tensorman/package.nix
similarity index 100%
rename from pkgs/tools/misc/tensorman/default.nix
rename to pkgs/by-name/te/tensorman/package.nix
diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index c2c7c21321c2..480f5b46ab97 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, installShellFiles, lib, tenv, testers }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, lib, tenv, testers }:
 
 buildGoModule rec {
   pname = "tenv";
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd tenv \
       --zsh <($out/bin/tenv completion zsh) \
       --bash <($out/bin/tenv completion bash) \
diff --git a/pkgs/by-name/te/tere/package.nix b/pkgs/by-name/te/tere/package.nix
new file mode 100644
index 000000000000..cadf6ec59635
--- /dev/null
+++ b/pkgs/by-name/te/tere/package.nix
@@ -0,0 +1,59 @@
+{ lib, fetchFromGitHub, rustPlatform, ncurses, stdenv, python3 }:
+
+rustPlatform.buildRustPackage {
+  pname = "tere";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "mgunyho";
+    repo = "tere";
+    rev = "5adf1176e8c12c073ad244cac7773a7808ed2021";
+    sha256 = "sha256-oY4oeSttM8LLXLirYq/B7Nzajkg4Pw26uig5gZxqU3s=";
+  };
+
+  cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg=";
+
+  nativeCheckInputs = [
+    # ncurses provides the tput command needed for integration tests
+    # https://github.com/mgunyho/tere/issues/93#issuecomment-2029624187
+    ncurses
+  ];
+
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Unexplained fail
+    # https://github.com/NixOS/nixpkgs/pull/298527#issuecomment-2053758845
+    "--skip=first_run_prompt"
+  ];
+
+  # NOTE: workaround for build fail on aarch64
+  # See https://github.com/NixOS/nixpkgs/issues/145726#issuecomment-971331986
+  preBuild =
+    let
+      python-with-toml = python3.withPackages (ps: [ps.toml]);
+      script = builtins.toFile "clear_linkers.py" ''
+        from os import path
+        import toml
+
+        if path.exists(".cargo/config.toml"):
+          config = toml.load(open(".cargo/config.toml"))
+
+          for target in config.get("target",{}).values():
+            if "linker" in target:
+              del target["linker"]
+
+          toml.dump(config,open(".cargo/config.toml", "w"))
+        else:
+          print(__file__, ":  CONFIG.TOML EXPECTED")
+          exit(1)
+      '';
+    in
+      "${python-with-toml}/bin/python3 ${script}";
+
+  meta = with lib; {
+    description = "Faster alternative to cd + ls";
+    homepage = "https://github.com/mgunyho/tere";
+    license = licenses.eupl12;
+    maintainers = with maintainers; [ ProducerMatt ];
+    mainProgram = "tere";
+  };
+}
diff --git a/pkgs/tools/text/termbook/Cargo.lock b/pkgs/by-name/te/termbook/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/termbook/Cargo.lock
rename to pkgs/by-name/te/termbook/Cargo.lock
diff --git a/pkgs/tools/text/termbook/default.nix b/pkgs/by-name/te/termbook/package.nix
similarity index 100%
rename from pkgs/tools/text/termbook/default.nix
rename to pkgs/by-name/te/termbook/package.nix
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/by-name/te/termbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/termbox/default.nix
rename to pkgs/by-name/te/termbox/package.nix
diff --git a/pkgs/development/libraries/termcolor/default.nix b/pkgs/by-name/te/termcolor/package.nix
similarity index 100%
rename from pkgs/development/libraries/termcolor/default.nix
rename to pkgs/by-name/te/termcolor/package.nix
diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/by-name/te/termdbms/package.nix
similarity index 100%
rename from pkgs/development/tools/database/termdbms/default.nix
rename to pkgs/by-name/te/termdbms/package.nix
diff --git a/pkgs/development/tools/database/termdbms/viewer.patch b/pkgs/by-name/te/termdbms/viewer.patch
similarity index 100%
rename from pkgs/development/tools/database/termdbms/viewer.patch
rename to pkgs/by-name/te/termdbms/viewer.patch
diff --git a/pkgs/tools/graphics/termimage/default.nix b/pkgs/by-name/te/termimage/package.nix
similarity index 100%
rename from pkgs/tools/graphics/termimage/default.nix
rename to pkgs/by-name/te/termimage/package.nix
diff --git a/pkgs/applications/misc/terminal-colors/default.nix b/pkgs/by-name/te/terminal-colors/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-colors/default.nix
rename to pkgs/by-name/te/terminal-colors/package.nix
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/by-name/te/terminal-notifier/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-notifier/default.nix
rename to pkgs/by-name/te/terminal-notifier/package.nix
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/by-name/te/terminal-parrot/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-parrot/default.nix
rename to pkgs/by-name/te/terminal-parrot/package.nix
diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/by-name/te/terminal-stocks/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-stocks/default.nix
rename to pkgs/by-name/te/terminal-stocks/package.nix
diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/by-name/te/terminator/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/terminator/default.nix
rename to pkgs/by-name/te/terminator/package.nix
diff --git a/pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch b/pkgs/by-name/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch
similarity index 100%
rename from pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch
rename to pkgs/by-name/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/by-name/te/terminus_font/package.nix
similarity index 100%
rename from pkgs/data/fonts/terminus-font/default.nix
rename to pkgs/by-name/te/terminus_font/package.nix
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/by-name/te/terminus_font_ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/terminus-font-ttf/default.nix
rename to pkgs/by-name/te/terminus_font_ttf/package.nix
diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/by-name/te/termius/package.nix
similarity index 100%
rename from pkgs/applications/networking/termius/default.nix
rename to pkgs/by-name/te/termius/package.nix
diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/by-name/te/termonad/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/termonad/default.nix
rename to pkgs/by-name/te/termonad/package.nix
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/by-name/te/termplay/package.nix
similarity index 100%
rename from pkgs/tools/misc/termplay/default.nix
rename to pkgs/by-name/te/termplay/package.nix
diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/by-name/te/termshark/package.nix
similarity index 100%
rename from pkgs/tools/networking/termshark/default.nix
rename to pkgs/by-name/te/termshark/package.nix
diff --git a/pkgs/data/fonts/termsyn/default.nix b/pkgs/by-name/te/termsyn/package.nix
similarity index 100%
rename from pkgs/data/fonts/termsyn/default.nix
rename to pkgs/by-name/te/termsyn/package.nix
diff --git a/pkgs/applications/emulators/termtekst/default.nix b/pkgs/by-name/te/termtekst/package.nix
similarity index 100%
rename from pkgs/applications/emulators/termtekst/default.nix
rename to pkgs/by-name/te/termtekst/package.nix
diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/by-name/te/termtosvg/package.nix
similarity index 100%
rename from pkgs/tools/misc/termtosvg/default.nix
rename to pkgs/by-name/te/termtosvg/package.nix
diff --git a/pkgs/by-name/te/terra-station/package.nix b/pkgs/by-name/te/terra-station/package.nix
new file mode 100644
index 000000000000..f5365f29b2f1
--- /dev/null
+++ b/pkgs/by-name/te/terra-station/package.nix
@@ -0,0 +1,76 @@
+{ lib, stdenv
+, fetchurl
+, dpkg
+, makeWrapper
+, electron
+, asar
+}:
+
+let
+  inherit (stdenv.hostPlatform) system;
+
+  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
+
+  sha256 = {
+    "x86_64-linux" = "139nlr191bsinx6ixpi2glcr03lsnzq7b0438h3245napsnjpx6p";
+  }."${system}" or throwSystem;
+
+  arch = {
+    "x86_64-linux" = "amd64";
+  }."${system}" or throwSystem;
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "terra-station";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/terra-money/station-desktop/releases/download/v${version}/Terra.Station_${version}_${arch}.deb";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ makeWrapper asar ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  unpackPhase = ''
+    ${dpkg}/bin/dpkg-deb -x $src .
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/${pname}
+
+    cp -a usr/share/* $out/share
+    cp -a "opt/Terra Station/"{locales,resources} $out/share/${pname}
+
+    # patch pre-built node modules
+    asar e $out/share/${pname}/resources/app.asar asar-unpacked
+    find asar-unpacked -name '*.node' -exec patchelf \
+      --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \
+      {} \;
+    asar p asar-unpacked $out/share/${pname}/resources/app.asar
+
+    substituteInPlace $out/share/applications/station-electron.desktop \
+      --replace "/opt/Terra Station/station-electron" ${pname}
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+      --add-flags $out/share/${pname}/resources/app.aasar
+  '';
+
+  meta = with lib; {
+    description = "Terra station is the official wallet of the Terra blockchain";
+    homepage = "https://docs.terra.money/docs/learn/terra-station/README.html";
+    license = licenses.isc;
+    maintainers = [ maintainers.peterwilli ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "terra-station";
+  };
+}
diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/by-name/te/terracognita/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terracognita/default.nix
rename to pkgs/by-name/te/terracognita/package.nix
diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix
new file mode 100644
index 000000000000..54bbb1b13b1e
--- /dev/null
+++ b/pkgs/by-name/te/terraform-backend-git/package.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
+
+buildGoModule rec {
+  pname = "terraform-backend-git";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "plumber-cd";
+    repo = "terraform-backend-git";
+    rev = "v${version}";
+    hash = "sha256-mLgUA7f4enlVuQx4VM3QbNuaAq7FgDaRyiG0sbT31ng=";
+  };
+
+  vendorHash = "sha256-vFx59dIdniLRP0xHcD3c22GidZOPdGZvmvg/BvxFBGI=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/plumber-cd/terraform-backend-git/cmd.Version=${version}"
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd terraform-backend-git \
+      --bash <($out/bin/terraform-backend-git completion bash) \
+      --fish <($out/bin/terraform-backend-git completion fish) \
+      --zsh <($out/bin/terraform-backend-git completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "Terraform HTTP Backend implementation that uses Git repository as storage";
+    mainProgram = "terraform-backend-git";
+    homepage = "https://github.com/plumber-cd/terraform-backend-git";
+    changelog = "https://github.com/plumber-cd/terraform-backend-git/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ blaggacao ];
+  };
+}
diff --git a/pkgs/by-name/te/terraform-docs/package.nix b/pkgs/by-name/te/terraform-docs/package.nix
index 6a395109426f..33c9620d541b 100644
--- a/pkgs/by-name/te/terraform-docs/package.nix
+++ b/pkgs/by-name/te/terraform-docs/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "terraform-docs";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "terraform-docs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-XZS+mGp2QsrKS3fPZd0ja4w/CAfPcyzSgwolQ+StER0=";
+    hash = "sha256-NOI9/2zGimsHMvdi2lGwl6YLVGpOET6g9C/l0xUZ/pI=";
   };
 
-  vendorHash = "sha256-aweKTHQBYYqSp8CymwhnVv1WNQ7cZ1/bJNz7DSo7PKc=";
+  vendorHash = "sha256-/56Y3VE4h//8IlyP8ocMFiorgw/4ee32J5FQYxFCIU8=";
 
   excludedPackages = [ "scripts" ];
 
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/by-name/te/terraform-inventory/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-inventory/default.nix
rename to pkgs/by-name/te/terraform-inventory/package.nix
diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/by-name/te/terraform-ls/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terraform-ls/default.nix
rename to pkgs/by-name/te/terraform-ls/package.nix
diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/by-name/te/terraform-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terraform-lsp/default.nix
rename to pkgs/by-name/te/terraform-lsp/package.nix
diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/by-name/te/terraformer/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terraformer/default.nix
rename to pkgs/by-name/te/terraformer/package.nix
diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/by-name/te/terramate/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terramate/default.nix
rename to pkgs/by-name/te/terramate/package.nix
diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/by-name/te/terranix/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terranix/default.nix
rename to pkgs/by-name/te/terranix/package.nix
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/by-name/te/terraria-server/package.nix
similarity index 100%
rename from pkgs/games/terraria-server/default.nix
rename to pkgs/by-name/te/terraria-server/package.nix
diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/by-name/te/terrascan/package.nix
similarity index 100%
rename from pkgs/tools/security/terrascan/default.nix
rename to pkgs/by-name/te/terrascan/package.nix
diff --git a/pkgs/by-name/te/terser/package.nix b/pkgs/by-name/te/terser/package.nix
new file mode 100644
index 000000000000..11877fcedd9e
--- /dev/null
+++ b/pkgs/by-name/te/terser/package.nix
@@ -0,0 +1,23 @@
+{ buildNpmPackage, fetchFromGitHub, lib }:
+
+buildNpmPackage rec {
+  pname = "terser";
+  version = "5.34.1";
+
+  src = fetchFromGitHub {
+    owner = "terser";
+    repo = "terser";
+    rev = "v${version}";
+    hash = "sha256-xbURSt4gBpDVxV5Y9tWfHKAQ7cLt0iAH8VFH6zfboyI=";
+  };
+
+  npmDepsHash = "sha256-P2oHKwkDhUvLSUYpzhUxrNKZNGUbyB6KnwYbizHTrew=";
+
+  meta = with lib; {
+    description = "JavaScript parser, mangler and compressor toolkit for ES6+";
+    mainProgram = "terser";
+    homepage = "https://terser.org";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ talyz ];
+  };
+}
diff --git a/pkgs/games/tes3cmd/default.nix b/pkgs/by-name/te/tes3cmd/package.nix
similarity index 100%
rename from pkgs/games/tes3cmd/default.nix
rename to pkgs/by-name/te/tes3cmd/package.nix
diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/by-name/te/teseq/package.nix
similarity index 100%
rename from pkgs/applications/misc/teseq/default.nix
rename to pkgs/by-name/te/teseq/package.nix
diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/by-name/te/tesh/package.nix
similarity index 100%
rename from pkgs/tools/text/tesh/default.nix
rename to pkgs/by-name/te/tesh/package.nix
diff --git a/pkgs/tools/security/tessen/default.nix b/pkgs/by-name/te/tessen/package.nix
similarity index 100%
rename from pkgs/tools/security/tessen/default.nix
rename to pkgs/by-name/te/tessen/package.nix
diff --git a/pkgs/applications/blockchains/tessera/default.nix b/pkgs/by-name/te/tessera/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/tessera/default.nix
rename to pkgs/by-name/te/tessera/package.nix
diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/by-name/te/test-drive/package.nix
similarity index 100%
rename from pkgs/development/libraries/test-drive/default.nix
rename to pkgs/by-name/te/test-drive/package.nix
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/by-name/te/testssl/package.nix
similarity index 100%
rename from pkgs/applications/networking/testssl/default.nix
rename to pkgs/by-name/te/testssl/package.nix
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/by-name/te/tet/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tet/default.nix
rename to pkgs/by-name/te/tet/package.nix
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/by-name/te/tetraproc/package.nix
similarity index 100%
rename from pkgs/applications/audio/tetraproc/default.nix
rename to pkgs/by-name/te/tetraproc/package.nix
diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/by-name/te/tetrd/package.nix
similarity index 100%
rename from pkgs/applications/networking/tetrd/default.nix
rename to pkgs/by-name/te/tetrd/package.nix
diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/by-name/te/tev/package.nix
similarity index 100%
rename from pkgs/applications/graphics/tev/default.nix
rename to pkgs/by-name/te/tev/package.nix
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/by-name/te/tevent/package.nix
similarity index 100%
rename from pkgs/development/libraries/tevent/default.nix
rename to pkgs/by-name/te/tevent/package.nix
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/by-name/te/tewi-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/tewi/default.nix
rename to pkgs/by-name/te/tewi-font/package.nix
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/by-name/te/tewisay/package.nix
similarity index 100%
rename from pkgs/tools/misc/tewisay/default.nix
rename to pkgs/by-name/te/tewisay/package.nix
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/by-name/te/texi2html/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/texi2html/default.nix
rename to pkgs/by-name/te/texi2html/package.nix
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/by-name/te/texi2mdoc/package.nix
similarity index 100%
rename from pkgs/tools/misc/texi2mdoc/default.nix
rename to pkgs/by-name/te/texi2mdoc/package.nix
diff --git a/pkgs/development/libraries/text-engine/default.nix b/pkgs/by-name/te/text-engine/package.nix
similarity index 100%
rename from pkgs/development/libraries/text-engine/default.nix
rename to pkgs/by-name/te/text-engine/package.nix
diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/by-name/te/textplots/package.nix
similarity index 100%
rename from pkgs/tools/graphics/textplots/default.nix
rename to pkgs/by-name/te/textplots/package.nix
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/by-name/te/textql/package.nix
similarity index 100%
rename from pkgs/development/tools/textql/default.nix
rename to pkgs/by-name/te/textql/package.nix
diff --git a/pkgs/applications/graphics/textual-paint/default.nix b/pkgs/by-name/te/textual-paint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/textual-paint/default.nix
rename to pkgs/by-name/te/textual-paint/package.nix
diff --git a/pkgs/tools/graphics/texture-synthesis/Cargo.lock b/pkgs/by-name/te/texture-synthesis/Cargo.lock
similarity index 100%
rename from pkgs/tools/graphics/texture-synthesis/Cargo.lock
rename to pkgs/by-name/te/texture-synthesis/Cargo.lock
diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/by-name/te/texture-synthesis/package.nix
similarity index 100%
rename from pkgs/tools/graphics/texture-synthesis/default.nix
rename to pkgs/by-name/te/texture-synthesis/package.nix
diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix
similarity index 100%
rename from pkgs/development/libraries/tezos-rust-libs/default.nix
rename to pkgs/by-name/te/tezos-rust-libs/package.nix
diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/by-name/tf/tf-summarize/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tf-summarize/default.nix
rename to pkgs/by-name/tf/tf-summarize/package.nix
diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/by-name/tf/tf2pulumi/package.nix
similarity index 100%
rename from pkgs/development/tools/tf2pulumi/default.nix
rename to pkgs/by-name/tf/tf2pulumi/package.nix
diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/by-name/tf/tfautomv/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tfautomv/default.nix
rename to pkgs/by-name/tf/tfautomv/package.nix
diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/by-name/tf/tfk8s/package.nix
similarity index 100%
rename from pkgs/tools/misc/tfk8s/default.nix
rename to pkgs/by-name/tf/tfk8s/package.nix
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/pkgs/by-name/tf/tfk8s/tests/sample1/default.nix
similarity index 100%
rename from pkgs/tools/misc/tfk8s/tests/sample1/default.nix
rename to pkgs/by-name/tf/tfk8s/tests/sample1/default.nix
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
similarity index 100%
rename from pkgs/tools/misc/tfk8s/tests/sample1/input.yaml
rename to pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/pkgs/by-name/tf/tfk8s/tests/sample1/output.tf
similarity index 100%
rename from pkgs/tools/misc/tfk8s/tests/sample1/output.tf
rename to pkgs/by-name/tf/tfk8s/tests/sample1/output.tf
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/by-name/tf/tfsec/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/tfsec/default.nix
rename to pkgs/by-name/tf/tfsec/package.nix
diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/by-name/tf/tfswitch/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tfswitch/default.nix
rename to pkgs/by-name/tf/tfswitch/package.nix
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/by-name/tf/tftp-hpa/package.nix
similarity index 100%
rename from pkgs/tools/networking/tftp-hpa/default.nix
rename to pkgs/by-name/tf/tftp-hpa/package.nix
diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/by-name/tf/tfupdate/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tfupdate/default.nix
rename to pkgs/by-name/tf/tfupdate/package.nix
diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/by-name/tg/tgswitch/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tgswitch/default.nix
rename to pkgs/by-name/tg/tgswitch/package.nix
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/by-name/tg/tgt/package.nix
similarity index 100%
rename from pkgs/tools/networking/tgt/default.nix
rename to pkgs/by-name/tg/tgt/package.nix
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/by-name/th/thc-hydra/package.nix
similarity index 100%
rename from pkgs/tools/security/thc-hydra/default.nix
rename to pkgs/by-name/th/thc-hydra/package.nix
diff --git a/pkgs/tools/security/thc-ipv6/default.nix b/pkgs/by-name/th/thc-ipv6/package.nix
similarity index 100%
rename from pkgs/tools/security/thc-ipv6/default.nix
rename to pkgs/by-name/th/thc-ipv6/package.nix
diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/by-name/th/the-foundation/package.nix
similarity index 100%
rename from pkgs/development/libraries/the-foundation/default.nix
rename to pkgs/by-name/th/the-foundation/package.nix
diff --git a/pkgs/data/fonts/the-neue-black/default.nix b/pkgs/by-name/th/the-neue-black/package.nix
similarity index 100%
rename from pkgs/data/fonts/the-neue-black/default.nix
rename to pkgs/by-name/th/the-neue-black/package.nix
diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/by-name/th/the-way/package.nix
similarity index 100%
rename from pkgs/development/tools/the-way/default.nix
rename to pkgs/by-name/th/the-way/package.nix
diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/by-name/th/theano/package.nix
similarity index 100%
rename from pkgs/data/fonts/theano/default.nix
rename to pkgs/by-name/th/theano/package.nix
diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix
index d23a00943eb2..baf3252e4399 100644
--- a/pkgs/by-name/th/theattyr/package.nix
+++ b/pkgs/by-name/th/theattyr/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A terminal theater for playing VT100 art and animations";
+    description = "Terminal theater for playing VT100 art and animations";
     homepage = "https://github.com/orhun/theattyr";
     changelog = "https://github.com/orhun/theattyr/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/by-name/th/thedesk/package.nix
similarity index 100%
rename from pkgs/applications/misc/thedesk/default.nix
rename to pkgs/by-name/th/thedesk/package.nix
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/by-name/th/theft/package.nix
similarity index 100%
rename from pkgs/development/libraries/theft/default.nix
rename to pkgs/by-name/th/theft/package.nix
diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/by-name/th/theharvester/package.nix
similarity index 100%
rename from pkgs/tools/security/theharvester/default.nix
rename to pkgs/by-name/th/theharvester/package.nix
diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/by-name/th/thelounge/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/thelounge/default.nix
rename to pkgs/by-name/th/thelounge/package.nix
diff --git a/pkgs/applications/networking/irc/thelounge/packages-path.patch b/pkgs/by-name/th/thelounge/packages-path.patch
similarity index 100%
rename from pkgs/applications/networking/irc/thelounge/packages-path.patch
rename to pkgs/by-name/th/thelounge/packages-path.patch
diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/by-name/th/theme-jade1/package.nix
similarity index 100%
rename from pkgs/data/themes/jade1/default.nix
rename to pkgs/by-name/th/theme-jade1/package.nix
diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/by-name/th/theme-obsidian2/package.nix
similarity index 100%
rename from pkgs/data/themes/obsidian2/default.nix
rename to pkgs/by-name/th/theme-obsidian2/package.nix
diff --git a/pkgs/tools/misc/theme-sh/default.nix b/pkgs/by-name/th/theme-sh/package.nix
similarity index 100%
rename from pkgs/tools/misc/theme-sh/default.nix
rename to pkgs/by-name/th/theme-sh/package.nix
diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/by-name/th/theme-vertex/package.nix
similarity index 100%
rename from pkgs/data/themes/vertex/default.nix
rename to pkgs/by-name/th/theme-vertex/package.nix
diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/by-name/th/themechanger/package.nix
similarity index 100%
rename from pkgs/applications/misc/themechanger/default.nix
rename to pkgs/by-name/th/themechanger/package.nix
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/by-name/th/thepeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/thepeg/default.nix
rename to pkgs/by-name/th/thepeg/package.nix
diff --git a/pkgs/applications/misc/therion/default.nix b/pkgs/by-name/th/therion/package.nix
similarity index 100%
rename from pkgs/applications/misc/therion/default.nix
rename to pkgs/by-name/th/therion/package.nix
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/by-name/th/thermald/package.nix
similarity index 100%
rename from pkgs/tools/system/thermald/default.nix
rename to pkgs/by-name/th/thermald/package.nix
diff --git a/pkgs/applications/version-management/thicket/default.nix b/pkgs/by-name/th/thicket/package.nix
similarity index 100%
rename from pkgs/applications/version-management/thicket/default.nix
rename to pkgs/by-name/th/thicket/package.nix
diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/by-name/th/thiefmd/package.nix
similarity index 100%
rename from pkgs/applications/editors/thiefmd/default.nix
rename to pkgs/by-name/th/thiefmd/package.nix
diff --git a/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock b/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/thin-provisioning-tools/Cargo.lock
rename to pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/thin-provisioning-tools/default.nix
rename to pkgs/by-name/th/thin-provisioning-tools/package.nix
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/by-name/th/thinkfan/package.nix
similarity index 100%
rename from pkgs/tools/system/thinkfan/default.nix
rename to pkgs/by-name/th/thinkfan/package.nix
diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/by-name/th/thinkingRock/package.nix
similarity index 100%
rename from pkgs/applications/misc/thinking-rock/default.nix
rename to pkgs/by-name/th/thinkingRock/package.nix
diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/by-name/th/thokr/package.nix
similarity index 100%
rename from pkgs/applications/misc/thokr/default.nix
rename to pkgs/by-name/th/thokr/package.nix
diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/by-name/th/threatest/package.nix
similarity index 100%
rename from pkgs/tools/security/threatest/default.nix
rename to pkgs/by-name/th/threatest/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/by-name/th/threema-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
rename to pkgs/by-name/th/threema-desktop/package.nix
diff --git a/pkgs/development/libraries/thrift/disable-failing-test.patch b/pkgs/by-name/th/thrift/disable-failing-test.patch
similarity index 100%
rename from pkgs/development/libraries/thrift/disable-failing-test.patch
rename to pkgs/by-name/th/thrift/disable-failing-test.patch
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/by-name/th/thrift/package.nix
similarity index 100%
rename from pkgs/development/libraries/thrift/default.nix
rename to pkgs/by-name/th/thrift/package.nix
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/by-name/th/throttled/package.nix
similarity index 100%
rename from pkgs/tools/system/throttled/default.nix
rename to pkgs/by-name/th/throttled/package.nix
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/by-name/th/thttpd/package.nix
similarity index 100%
rename from pkgs/servers/http/thttpd/default.nix
rename to pkgs/by-name/th/thttpd/package.nix
diff --git a/pkgs/tools/misc/thumbs/fix.patch b/pkgs/by-name/th/thumbs/fix.patch
similarity index 100%
rename from pkgs/tools/misc/thumbs/fix.patch
rename to pkgs/by-name/th/thumbs/fix.patch
diff --git a/pkgs/tools/misc/thumbs/default.nix b/pkgs/by-name/th/thumbs/package.nix
similarity index 100%
rename from pkgs/tools/misc/thumbs/default.nix
rename to pkgs/by-name/th/thumbs/package.nix
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/by-name/th/thunderbolt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/thunderbolt/default.nix
rename to pkgs/by-name/th/thunderbolt/package.nix
diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/by-name/ti/tibetan-machine/package.nix
similarity index 100%
rename from pkgs/data/fonts/tibetan-machine/default.nix
rename to pkgs/by-name/ti/tibetan-machine/package.nix
diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/by-name/ti/ticker/package.nix
similarity index 100%
rename from pkgs/applications/misc/ticker/default.nix
rename to pkgs/by-name/ti/ticker/package.nix
diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/by-name/ti/tickrs/package.nix
similarity index 100%
rename from pkgs/applications/misc/tickrs/default.nix
rename to pkgs/by-name/ti/tickrs/package.nix
diff --git a/pkgs/by-name/ti/ticktick/package.nix b/pkgs/by-name/ti/ticktick/package.nix
new file mode 100644
index 000000000000..6c6797374c59
--- /dev/null
+++ b/pkgs/by-name/ti/ticktick/package.nix
@@ -0,0 +1,77 @@
+{ lib
+, fetchurl
+, stdenv
+, wrapGAppsHook3
+, dpkg
+, autoPatchelfHook
+, glibc
+, gcc-unwrapped
+, nss
+, libdrm
+, mesa
+, alsa-lib
+, xdg-utils
+, systemd
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ticktick";
+  version = "6.0.10";
+
+  src = fetchurl {
+    url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb";
+    hash = "sha256-/SaQJFaz8quuFk4bLmRrvfYpqyDNTV/dJBrAJpOT4S4=";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    nss
+    glibc
+    libdrm
+    gcc-unwrapped
+    mesa
+    alsa-lib
+    xdg-utils
+  ];
+
+  # Needed to make the process get past zygote_linux fork()'ing
+  runtimeDependencies = [
+    systemd
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    mkdir -p "$out/share" "$out/opt/${finalAttrs.pname}" "$out/bin"
+    dpkg-deb --fsys-tarfile "$src" | tar --extract --directory="$out"
+
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -av $out/opt/TickTick/* $out/opt/${finalAttrs.pname}
+    cp -av $out/usr/share/* $out/share
+    rm -rf $out/usr $out/opt/TickTick
+    ln -sf "$out/opt/${finalAttrs.pname}/${finalAttrs.pname}" "$out/bin/${finalAttrs.pname}"
+
+    substituteInPlace "$out/share/applications/${finalAttrs.pname}.desktop" \
+      --replace "Exec=/opt/TickTick/ticktick" "Exec=$out/bin/${finalAttrs.pname}"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Powerful to-do & task management app with seamless cloud synchronization across all your devices";
+    homepage = "https://ticktick.com/home/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ hbjydev ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/by-name/ti/ticpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/ticpp/default.nix
rename to pkgs/by-name/ti/ticpp/package.nix
diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
similarity index 100%
rename from pkgs/applications/audio/tidal-hifi/default.nix
rename to pkgs/by-name/ti/tidal-hifi/package.nix
diff --git a/pkgs/servers/tidb/default.nix b/pkgs/by-name/ti/tidb/package.nix
similarity index 100%
rename from pkgs/servers/tidb/default.nix
rename to pkgs/by-name/ti/tidb/package.nix
diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
similarity index 100%
rename from pkgs/tools/text/tidy-viewer/default.nix
rename to pkgs/by-name/ti/tidy-viewer/package.nix
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/by-name/ti/tidyp/package.nix
similarity index 100%
rename from pkgs/development/libraries/tidyp/default.nix
rename to pkgs/by-name/ti/tidyp/package.nix
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/by-name/ti/tie/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tie/default.nix
rename to pkgs/by-name/ti/tie/package.nix
diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/by-name/ti/tig/package.nix
similarity index 100%
rename from pkgs/applications/version-management/tig/default.nix
rename to pkgs/by-name/ti/tig/package.nix
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/by-name/ti/tigervnc/package.nix
similarity index 100%
rename from pkgs/tools/admin/tigervnc/default.nix
rename to pkgs/by-name/ti/tigervnc/package.nix
diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/by-name/ti/tijolo/package.nix
similarity index 100%
rename from pkgs/applications/editors/tijolo/default.nix
rename to pkgs/by-name/ti/tijolo/package.nix
diff --git a/pkgs/applications/editors/tijolo/shards.nix b/pkgs/by-name/ti/tijolo/shards.nix
similarity index 100%
rename from pkgs/applications/editors/tijolo/shards.nix
rename to pkgs/by-name/ti/tijolo/shards.nix
diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix
index 72194aebfbac..23034db5feb2 100644
--- a/pkgs/by-name/ti/tile38/package.nix
+++ b/pkgs/by-name/ti/tile38/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tile38";
-  version = "1.33.3";
+  version = "1.33.4";
 
   src = fetchFromGitHub {
     owner = "tidwall";
     repo = pname;
     rev = version;
-    hash = "sha256-r13STmaDJz4OGboNPsrJSi668q72Bzffe5TRXJk6pdI=";
+    hash = "sha256-8Qu1tuNAqO/XFcfSJ0fXMWFY4UhViV3CFsfAZ2zUsxE=";
   };
 
   vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY=";
diff --git a/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch b/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch
similarity index 100%
rename from pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch
rename to pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/by-name/ti/tiledb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tiledb/default.nix
rename to pkgs/by-name/ti/tiledb/package.nix
diff --git a/pkgs/applications/emulators/tilem/default.nix b/pkgs/by-name/ti/tilem/package.nix
similarity index 100%
rename from pkgs/applications/emulators/tilem/default.nix
rename to pkgs/by-name/ti/tilem/package.nix
diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tilt/assets.nix
rename to pkgs/by-name/ti/tilt/assets.nix
diff --git a/pkgs/applications/networking/cluster/tilt/binary.nix b/pkgs/by-name/ti/tilt/binary.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tilt/binary.nix
rename to pkgs/by-name/ti/tilt/binary.nix
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/by-name/ti/tilt/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tilt/default.nix
rename to pkgs/by-name/ti/tilt/package.nix
diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/by-name/ti/time-decode/package.nix
similarity index 100%
rename from pkgs/tools/misc/time-decode/default.nix
rename to pkgs/by-name/ti/time-decode/package.nix
diff --git a/pkgs/development/tools/time-ghc-modules/default.nix b/pkgs/by-name/ti/time-ghc-modules/package.nix
similarity index 100%
rename from pkgs/development/tools/time-ghc-modules/default.nix
rename to pkgs/by-name/ti/time-ghc-modules/package.nix
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/by-name/ti/time/package.nix
similarity index 100%
rename from pkgs/tools/misc/time/default.nix
rename to pkgs/by-name/ti/time/package.nix
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/by-name/ti/timelapse-deflicker/package.nix
similarity index 100%
rename from pkgs/applications/graphics/timelapse-deflicker/default.nix
rename to pkgs/by-name/ti/timelapse-deflicker/package.nix
diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/by-name/ti/timelens/package.nix
similarity index 100%
rename from pkgs/applications/video/timelens/default.nix
rename to pkgs/by-name/ti/timelens/package.nix
diff --git a/pkgs/tools/misc/timelimit/default.nix b/pkgs/by-name/ti/timelimit/package.nix
similarity index 100%
rename from pkgs/tools/misc/timelimit/default.nix
rename to pkgs/by-name/ti/timelimit/package.nix
diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/by-name/ti/timeline/package.nix
similarity index 100%
rename from pkgs/applications/office/timeline/default.nix
rename to pkgs/by-name/ti/timeline/package.nix
diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/by-name/ti/timemachine/package.nix
similarity index 100%
rename from pkgs/applications/audio/timemachine/default.nix
rename to pkgs/by-name/ti/timemachine/package.nix
diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/by-name/ti/timer/package.nix
similarity index 100%
rename from pkgs/tools/misc/timer/default.nix
rename to pkgs/by-name/ti/timer/package.nix
diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/by-name/ti/times-newer-roman/package.nix
similarity index 100%
rename from pkgs/data/fonts/times-newer-roman/default.nix
rename to pkgs/by-name/ti/times-newer-roman/package.nix
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/by-name/ti/timescaledb-parallel-copy/package.nix
similarity index 100%
rename from pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
rename to pkgs/by-name/ti/timescaledb-parallel-copy/package.nix
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/by-name/ti/timescaledb-tune/package.nix
similarity index 100%
rename from pkgs/development/tools/database/timescaledb-tune/default.nix
rename to pkgs/by-name/ti/timescaledb-tune/package.nix
diff --git a/pkgs/servers/timetagger/default.nix b/pkgs/by-name/ti/timetagger/package.nix
similarity index 100%
rename from pkgs/servers/timetagger/default.nix
rename to pkgs/by-name/ti/timetagger/package.nix
diff --git a/pkgs/tools/misc/timetagger_cli/default.nix b/pkgs/by-name/ti/timetagger_cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/timetagger_cli/default.nix
rename to pkgs/by-name/ti/timetagger_cli/package.nix
diff --git a/pkgs/by-name/ti/timeular/package.nix b/pkgs/by-name/ti/timeular/package.nix
new file mode 100644
index 000000000000..3191838a20f7
--- /dev/null
+++ b/pkgs/by-name/ti/timeular/package.nix
@@ -0,0 +1,43 @@
+{ lib
+, fetchurl
+, appimageTools
+}:
+
+let
+  version = "6.8.4";
+  pname = "timeular";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
+    hash = "sha256-0x8Ra6NlYnYCcRTmEzFTBYOtUIaMBtL4/0293gxxeS0=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in appimageTools.wrapType2 rec {
+  inherit pname version src;
+
+  extraPkgs = pkgs: [ pkgs.libsecret ];
+
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
+    install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png
+    substituteInPlace $out/share/applications/timeular.desktop \
+      --replace "Exec=AppRun --no-sandbox %U" "Exec=$out/bin/${pname}"
+  '';
+
+  meta = with lib; {
+    description = "Timetracking by flipping 8-sided dice";
+    longDescription = ''
+      The Timeular Tracker is an 8-sided dice that sits on your desk.
+      Assign an activity to each side and flip to start tracking your time.
+      The desktop app tell you where every minute of your day is spent.
+    '';
+    homepage = "https://timeular.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ ktor ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "timeular";
+  };
+}
diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/by-name/ti/timew-sync-server/package.nix
similarity index 100%
rename from pkgs/applications/misc/timew-sync-server/default.nix
rename to pkgs/by-name/ti/timew-sync-server/package.nix
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/by-name/ti/timewarrior/package.nix
similarity index 100%
rename from pkgs/applications/misc/timewarrior/default.nix
rename to pkgs/by-name/ti/timewarrior/package.nix
diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/by-name/ti/timezonemap/package.nix
similarity index 100%
rename from pkgs/development/libraries/timezonemap/default.nix
rename to pkgs/by-name/ti/timezonemap/package.nix
diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/by-name/ti/timg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/timg/default.nix
rename to pkgs/by-name/ti/timg/package.nix
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/by-name/ti/tini/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/tini/default.nix
rename to pkgs/by-name/ti/tini/package.nix
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/by-name/ti/tint2/package.nix
similarity index 100%
rename from pkgs/applications/misc/tint2/default.nix
rename to pkgs/by-name/ti/tint2/package.nix
diff --git a/pkgs/games/tintin/default.nix b/pkgs/by-name/ti/tintin/package.nix
similarity index 100%
rename from pkgs/games/tintin/default.nix
rename to pkgs/by-name/ti/tintin/package.nix
diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix
rename to pkgs/by-name/ti/tiny-cuda-nn/package.nix
diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/by-name/ti/tinycbor/package.nix
similarity index 100%
rename from pkgs/development/libraries/tinycbor/default.nix
rename to pkgs/by-name/ti/tinycbor/package.nix
diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/by-name/ti/tinycdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tinycdb/default.nix
rename to pkgs/by-name/ti/tinycdb/package.nix
diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/by-name/ti/tinyfecvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinyfecvpn/default.nix
rename to pkgs/by-name/ti/tinyfecvpn/package.nix
diff --git a/pkgs/games/tinyfugue/001-darwin-fixes.patch b/pkgs/by-name/ti/tinyfugue/001-darwin-fixes.patch
similarity index 100%
rename from pkgs/games/tinyfugue/001-darwin-fixes.patch
rename to pkgs/by-name/ti/tinyfugue/001-darwin-fixes.patch
diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/by-name/ti/tinyfugue/package.nix
similarity index 100%
rename from pkgs/games/tinyfugue/default.nix
rename to pkgs/by-name/ti/tinyfugue/package.nix
diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/by-name/ti/tinyobjloader/package.nix
similarity index 100%
rename from pkgs/development/libraries/tinyobjloader/default.nix
rename to pkgs/by-name/ti/tinyobjloader/package.nix
diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/by-name/ti/tinyprog/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/tinyprog/default.nix
rename to pkgs/by-name/ti/tinyprog/package.nix
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/by-name/ti/tinyproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinyproxy/default.nix
rename to pkgs/by-name/ti/tinyproxy/package.nix
diff --git a/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch b/pkgs/by-name/ti/tinyscheme/01-remove-macOS-main.patch
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch
rename to pkgs/by-name/ti/tinyscheme/01-remove-macOS-main.patch
diff --git a/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch b/pkgs/by-name/ti/tinyscheme/02-use-toolchain-env-vars.patch
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch
rename to pkgs/by-name/ti/tinyscheme/02-use-toolchain-env-vars.patch
diff --git a/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch b/pkgs/by-name/ti/tinyscheme/03-macOS-SOsuf.patch
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch
rename to pkgs/by-name/ti/tinyscheme/03-macOS-SOsuf.patch
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/by-name/ti/tinyscheme/package.nix
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/default.nix
rename to pkgs/by-name/ti/tinyscheme/package.nix
diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix
new file mode 100644
index 000000000000..f4d5283c91d4
--- /dev/null
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -0,0 +1,191 @@
+{ stdenv
+, lib
+, fetchurl
+, gettext
+, meson
+, mesonEmulatorHook
+, ninja
+, pkg-config
+, asciidoc
+, gobject-introspection
+, buildPackages
+, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
+, vala
+, python3
+, gi-docgen
+, graphviz
+, libxml2
+, glib
+, wrapGAppsNoGuiHook
+, sqlite
+, libstemmer
+, gnome
+, icu
+, libuuid
+, libsoup_3
+, json-glib
+, avahi
+, systemd
+, dbus
+, man-db
+, writeText
+, testers
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tinysparql";
+  version = "3.8.0";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz";
+    hash = "sha256-wPzad1IPUxVIsjlRN9zRk+6c3l4iLTydJz8DDRdipQQ=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    asciidoc
+    gettext
+    glib
+    wrapGAppsNoGuiHook
+    gi-docgen
+    graphviz
+    (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ]))
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
+
+  buildInputs = [
+    glib
+    libxml2
+    sqlite
+    icu
+    libsoup_3
+    libuuid
+    json-glib
+    avahi
+    libstemmer
+    dbus
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    systemd
+  ];
+
+  nativeCheckInputs = [
+    dbus
+    man-db
+  ];
+
+  mesonFlags = [
+    "-Ddocs=true"
+    (lib.mesonEnable "introspection" withIntrospection)
+    (lib.mesonEnable "vapi" withIntrospection)
+  ] ++ (
+    let
+      # https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.7.3/meson.build#L170
+      crossFile = writeText "cross-file.conf" ''
+        [properties]
+        sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}'
+      '';
+    in
+    [
+      "--cross-file=${crossFile}"
+    ]
+  ) ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Dsystemd_user_services=false"
+  ];
+
+  doCheck =
+    # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/402
+    !stdenv.hostPlatform.isDarwin
+    # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/398
+    && !stdenv.hostPlatform.is32bit
+    # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/474
+    && !stdenv.hostPlatform.isMusl;
+
+  postPatch = ''
+    chmod +x \
+      docs/reference/libtracker-sparql/embed-files.py \
+      docs/reference/libtracker-sparql/generate-svgs.sh
+    patchShebangs \
+      utils/data-generators/cc/generate \
+      docs/reference/libtracker-sparql/embed-files.py \
+      docs/reference/libtracker-sparql/generate-svgs.sh
+
+    # File "/build/tinysparql-3.8.0/tests/functional-tests/test_cli.py", line 233, in test_help
+    # self.assertIn("TINYSPARQL-IMPORT(1)", output, "Manpage not found")
+    # AssertionError: 'TINYSPARQL-IMPORT(1)' not found in '\x1b[4mTINYSPARQL-IMPORT\x1b[24m(1) ...'
+    substituteInPlace tests/functional-tests/test_cli.py --replace-fail "TINYSPARQL-IMPORT(1)" "TINYSPARQL-IMPORT"
+  '';
+
+  preCheck =
+    let
+      linuxDot0 = lib.optionalString stdenv.hostPlatform.isLinux ".0";
+      darwinDot0 = lib.optionalString stdenv.hostPlatform.isDarwin ".0";
+      extension = stdenv.hostPlatform.extensions.sharedLibrary;
+    in
+    ''
+      # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file
+      export HOME=$(mktemp -d)
+
+      # Our gobject-introspection patches make the shared library paths absolute
+      # in the GIR files. When running functional tests, the library is not yet installed,
+      # though, so we need to replace the absolute path with a local one during build.
+      # We are using a symlink that will be overridden during installation.
+      mkdir -p $out/lib
+      ln -s $PWD/src/libtracker-sparql/libtinysparql-3.0${darwinDot0}${extension} $out/lib/libtinysparql-3.0${darwinDot0}${extension}${linuxDot0}
+    '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    # The "tinysparql:core / service" test can take 180s+ when builder is in high load.
+    dbus-run-session \
+      --config-file=${dbus}/share/dbus-1/session.conf \
+      meson test \
+        --timeout-multiplier 0 \
+        --print-errorlogs
+
+    runHook postCheck
+  '';
+
+  postCheck = ''
+    # Clean up out symlinks
+    rm -r $out/lib
+  '';
+
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
+  passthru = {
+    updateScript = gnome.updateScript { packageName = finalAttrs.pname; };
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://tracker.gnome.org/";
+    description = "Desktop-neutral user information store, search tool and indexer";
+    mainProgram = "tinysparql";
+    maintainers = teams.gnome.members;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    pkgConfigModules = [ "tracker-sparql-3.0" "tinysparql-3.0" ];
+    # Not before  is properly conditioned.
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})
diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/by-name/ti/tinyssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinyssh/default.nix
rename to pkgs/by-name/ti/tinyssh/package.nix
diff --git a/pkgs/tools/networking/tinystatus/default.nix b/pkgs/by-name/ti/tinystatus/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinystatus/default.nix
rename to pkgs/by-name/ti/tinystatus/package.nix
diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/by-name/ti/tipa/package.nix
similarity index 100%
rename from pkgs/data/fonts/tipa/default.nix
rename to pkgs/by-name/ti/tipa/package.nix
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/by-name/ti/tiptop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tiptop/default.nix
rename to pkgs/by-name/ti/tiptop/package.nix
diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/by-name/ti/tiramisu/package.nix
similarity index 100%
rename from pkgs/applications/misc/tiramisu/default.nix
rename to pkgs/by-name/ti/tiramisu/package.nix
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/by-name/ti/tiscamera/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tiscamera/default.nix
rename to pkgs/by-name/ti/tiscamera/package.nix
diff --git a/pkgs/games/titanion/default.nix b/pkgs/by-name/ti/titanion/package.nix
similarity index 100%
rename from pkgs/games/titanion/default.nix
rename to pkgs/by-name/ti/titanion/package.nix
diff --git a/pkgs/development/mobile/titanium-alloy/default.nix b/pkgs/by-name/ti/titanium-alloy/package.nix
similarity index 100%
rename from pkgs/development/mobile/titanium-alloy/default.nix
rename to pkgs/by-name/ti/titanium-alloy/package.nix
diff --git a/pkgs/development/mobile/titanium/default.nix b/pkgs/by-name/ti/titanium/package.nix
similarity index 100%
rename from pkgs/development/mobile/titanium/default.nix
rename to pkgs/by-name/ti/titanium/package.nix
diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/by-name/ti/tiv/package.nix
similarity index 100%
rename from pkgs/applications/misc/tiv/default.nix
rename to pkgs/by-name/ti/tiv/package.nix
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/by-name/ti/tivodecode/package.nix
similarity index 100%
rename from pkgs/applications/video/tivodecode/default.nix
rename to pkgs/by-name/ti/tivodecode/package.nix
diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index 22f851065074..f377f940baa4 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, gitUpdater, testers, tkey-ssh-agent }:
 
 buildGoModule rec {
   pname = "tkey-ssh-agent";
@@ -17,6 +17,15 @@ buildGoModule rec {
     "cmd/tkey-ssh-agent"
   ];
 
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      tkey-ssh-agent-version = testers.testVersion {
+        package = tkey-ssh-agent;
+      };
+    };
+  };
+
   meta = with lib; {
     description = "SSH Agent for TKey, the flexible open hardware/software USB security key";
     homepage    = "https://tillitis.se/app/tkey-ssh-agent/";
diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/by-name/tk/tkman/package.nix
similarity index 100%
rename from pkgs/tools/misc/tkman/default.nix
rename to pkgs/by-name/tk/tkman/package.nix
diff --git a/pkgs/applications/version-management/tkrev/default.nix b/pkgs/by-name/tk/tkrev/package.nix
similarity index 100%
rename from pkgs/applications/version-management/tkrev/default.nix
rename to pkgs/by-name/tk/tkrev/package.nix
diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/by-name/tk/tkrzw/package.nix
similarity index 100%
rename from pkgs/development/libraries/tkrzw/default.nix
rename to pkgs/by-name/tk/tkrzw/package.nix
diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/by-name/tl/tl-expected/package.nix
similarity index 100%
rename from pkgs/development/libraries/tl-expected/default.nix
rename to pkgs/by-name/tl/tl-expected/package.nix
diff --git a/pkgs/applications/version-management/arch/configure-tmpdir.patch b/pkgs/by-name/tl/tla/configure-tmpdir.patch
similarity index 100%
rename from pkgs/applications/version-management/arch/configure-tmpdir.patch
rename to pkgs/by-name/tl/tla/configure-tmpdir.patch
diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/by-name/tl/tla/package.nix
similarity index 100%
rename from pkgs/applications/version-management/arch/default.nix
rename to pkgs/by-name/tl/tla/package.nix
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/by-name/tl/tldr/package.nix
similarity index 100%
rename from pkgs/tools/misc/tldr/default.nix
rename to pkgs/by-name/tl/tldr/package.nix
diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/by-name/tl/tlf/package.nix
similarity index 100%
rename from pkgs/applications/radio/tlf/default.nix
rename to pkgs/by-name/tl/tlf/package.nix
diff --git a/pkgs/tools/admin/tlsclient/default.nix b/pkgs/by-name/tl/tlsclient/package.nix
similarity index 100%
rename from pkgs/tools/admin/tlsclient/default.nix
rename to pkgs/by-name/tl/tlsclient/package.nix
diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/by-name/tl/tlsx/package.nix
similarity index 100%
rename from pkgs/tools/security/tlsx/default.nix
rename to pkgs/by-name/tl/tlsx/package.nix
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/by-name/tl/tlwg/package.nix
similarity index 100%
rename from pkgs/data/fonts/tlwg/default.nix
rename to pkgs/by-name/tl/tlwg/package.nix
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/by-name/tm/tm/package.nix
similarity index 100%
rename from pkgs/tools/system/tm/default.nix
rename to pkgs/by-name/tm/tm/package.nix
diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/by-name/tm/tmate-ssh-server/package.nix
similarity index 100%
rename from pkgs/servers/tmate-ssh-server/default.nix
rename to pkgs/by-name/tm/tmate-ssh-server/package.nix
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/by-name/tm/tmate/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmate/default.nix
rename to pkgs/by-name/tm/tmate/package.nix
diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/by-name/tm/tmatrix/package.nix
similarity index 100%
rename from pkgs/applications/misc/tmatrix/default.nix
rename to pkgs/by-name/tm/tmatrix/package.nix
diff --git a/pkgs/tools/text/tml/default.nix b/pkgs/by-name/tm/tml/package.nix
similarity index 100%
rename from pkgs/tools/text/tml/default.nix
rename to pkgs/by-name/tm/tml/package.nix
diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/by-name/tm/tmpmail/package.nix
similarity index 100%
rename from pkgs/applications/networking/tmpmail/default.nix
rename to pkgs/by-name/tm/tmpmail/package.nix
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/by-name/tm/tmpwatch/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmpwatch/default.nix
rename to pkgs/by-name/tm/tmpwatch/package.nix
diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmux-mem-cpu-load/default.nix
rename to pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/by-name/tm/tmux-xpanes/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmux-xpanes/default.nix
rename to pkgs/by-name/tm/tmux-xpanes/package.nix
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/by-name/tm/tmux/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmux/default.nix
rename to pkgs/by-name/tm/tmux/package.nix
diff --git a/pkgs/by-name/tm/tmuxinator/package.nix b/pkgs/by-name/tm/tmuxinator/package.nix
new file mode 100644
index 000000000000..596407b5b4b5
--- /dev/null
+++ b/pkgs/by-name/tm/tmuxinator/package.nix
@@ -0,0 +1,54 @@
+{ lib, buildRubyGem, ruby, installShellFiles }:
+
+# Cannot use bundleEnv because bundleEnv create stub with
+# BUNDLE_FROZEN='1' environment variable set, which broke everything
+# that rely on Bundler that runs under Tmuxinator.
+
+buildRubyGem rec {
+  inherit ruby;
+  name = "${gemName}-${version}";
+  gemName = "tmuxinator";
+  version = "3.3.2";
+  source.sha256 = "sha256-q1VS4ChHVqIpHHO/fGANG5IjgwUfBT2VqT9WAkQeGh4=";
+
+  erubi = buildRubyGem rec {
+    inherit ruby;
+    name = "ruby${ruby.version}-${gemName}-${version}";
+    gemName = "erubi";
+    version = "1.13.0";
+    source.sha256 = "fca61b47daefd865d0fb50d168634f27ad40181867445badf6427c459c33cd62";
+  };
+
+  thor = buildRubyGem rec {
+    inherit ruby;
+    name = "ruby${ruby.version}-${gemName}-${version}";
+    gemName = "thor";
+    version = "1.3.2";
+    source.sha256 = "sha256-7vApO54kFYzK16s4Oug1NLetTtmcCflvGmsDZVCrvto=";
+  };
+
+  xdg = buildRubyGem rec {
+    inherit ruby;
+    name = "ruby${ruby.version}-${gemName}-${version}";
+    gemName = "xdg";
+    version = "2.2.5";
+    source.sha256 = "04xr4cavnzxlk926pkji7b5yiqy4qsd3gdvv8mg6jliq6sczg9gk";
+  };
+
+  propagatedBuildInputs = [ erubi thor xdg ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion $GEM_HOME/gems/${gemName}-${version}/completion/tmuxinator.{bash,zsh,fish}
+  '';
+
+  meta = with lib; {
+    description = "Manage complex tmux sessions easily";
+    homepage    = "https://github.com/tmuxinator/tmuxinator";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ auntie ericsagnes ];
+    platforms   = platforms.unix;
+    mainProgram = "tmuxinator";
+  };
+}
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/by-name/tm/tmuxp/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmuxp/default.nix
rename to pkgs/by-name/tm/tmuxp/package.nix
diff --git a/pkgs/tools/networking/tnat64/default.nix b/pkgs/by-name/tn/tnat64/package.nix
similarity index 100%
rename from pkgs/tools/networking/tnat64/default.nix
rename to pkgs/by-name/tn/tnat64/package.nix
diff --git a/pkgs/applications/radio/tncattach/default.nix b/pkgs/by-name/tn/tncattach/package.nix
similarity index 100%
rename from pkgs/applications/radio/tncattach/default.nix
rename to pkgs/by-name/tn/tncattach/package.nix
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/by-name/tn/tnef/package.nix
similarity index 100%
rename from pkgs/applications/misc/tnef/default.nix
rename to pkgs/by-name/tn/tnef/package.nix
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/by-name/tn/tnt/package.nix
similarity index 100%
rename from pkgs/development/libraries/tnt/default.nix
rename to pkgs/by-name/tn/tnt/package.nix
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/by-name/tn/tntdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tntdb/default.nix
rename to pkgs/by-name/tn/tntdb/package.nix
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/by-name/tn/tntnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/tntnet/default.nix
rename to pkgs/by-name/tn/tntnet/package.nix
diff --git a/pkgs/tools/text/to-html/default.nix b/pkgs/by-name/to/to-html/package.nix
similarity index 100%
rename from pkgs/tools/text/to-html/default.nix
rename to pkgs/by-name/to/to-html/package.nix
diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/by-name/to/toast/package.nix
similarity index 100%
rename from pkgs/development/tools/toast/default.nix
rename to pkgs/by-name/to/toast/package.nix
diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/by-name/to/tockloader/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tockloader/default.nix
rename to pkgs/by-name/to/tockloader/package.nix
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/by-name/to/todiff/package.nix
similarity index 100%
rename from pkgs/applications/misc/todiff/default.nix
rename to pkgs/by-name/to/todiff/package.nix
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/by-name/to/todo-txt-cli/package.nix
similarity index 100%
rename from pkgs/applications/office/todo.txt-cli/default.nix
rename to pkgs/by-name/to/todo-txt-cli/package.nix
diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/by-name/to/todo/package.nix
similarity index 100%
rename from pkgs/tools/misc/todo/default.nix
rename to pkgs/by-name/to/todo/package.nix
diff --git a/pkgs/applications/office/todofi.sh/default.nix b/pkgs/by-name/to/todofi-sh/package.nix
similarity index 100%
rename from pkgs/applications/office/todofi.sh/default.nix
rename to pkgs/by-name/to/todofi-sh/package.nix
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/by-name/to/todoist-electron/package.nix
similarity index 100%
rename from pkgs/applications/misc/todoist-electron/default.nix
rename to pkgs/by-name/to/todoist-electron/package.nix
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/by-name/to/todoist/package.nix
similarity index 100%
rename from pkgs/applications/misc/todoist/default.nix
rename to pkgs/by-name/to/todoist/package.nix
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/by-name/to/todoman/package.nix
similarity index 100%
rename from pkgs/applications/office/todoman/default.nix
rename to pkgs/by-name/to/todoman/package.nix
diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/by-name/to/tofi/package.nix
similarity index 100%
rename from pkgs/applications/misc/tofi/default.nix
rename to pkgs/by-name/to/tofi/package.nix
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/by-name/to/toilet/package.nix
similarity index 100%
rename from pkgs/tools/misc/toilet/default.nix
rename to pkgs/by-name/to/toilet/package.nix
diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/by-name/to/toipe/package.nix
similarity index 100%
rename from pkgs/applications/misc/toipe/default.nix
rename to pkgs/by-name/to/toipe/package.nix
diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix
new file mode 100644
index 000000000000..00067f8335d4
--- /dev/null
+++ b/pkgs/by-name/to/tokio-console/package.nix
@@ -0,0 +1,53 @@
+{ lib
+, fetchFromGitHub
+, installShellFiles
+, rustPlatform
+, protobuf
+, stdenv
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tokio-console";
+  version = "0.1.13";
+
+  src = fetchFromGitHub {
+    owner = "tokio-rs";
+    repo = "console";
+    rev = "tokio-console-v${version}";
+    hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA=";
+  };
+
+  cargoHash = "sha256-QJdTysoVIbeLsTMt62Q355S8zx8tNCikZAyeRs7cz4o=";
+
+  buildAndTestSubdir = "tokio-console";
+
+  nativeBuildInputs = [
+    installShellFiles
+    protobuf
+  ];
+
+  # uses currently unstable tokio features
+  RUSTFLAGS = "--cfg tokio_unstable";
+
+  checkFlags = [
+    # tests depend upon git repository at test execution time
+    "--skip bootstrap"
+    "--skip config::tests::args_example_changed"
+    "--skip config::tests::toml_example_changed"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd tokio-console \
+      --bash <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion bash) \
+      --fish <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion fish) \
+      --zsh <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "Debugger for asynchronous Rust code";
+    homepage = "https://github.com/tokio-rs/console";
+    mainProgram = "tokio-console";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ max-niederman ];
+  };
+}
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/by-name/to/tokyocabinet/package.nix
similarity index 100%
rename from pkgs/development/libraries/tokyo-cabinet/default.nix
rename to pkgs/by-name/to/tokyocabinet/package.nix
diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index cd4d28ca6621..346b4d69a03d 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2024-07-22";
+    version = "0-unstable-2024-11-06";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "a9a25010e9fbfca783c3c27258dbad76a9cc7842";
-      hash = "sha256-HbrDDiMej4DjvskGItele/iCUY1NzlWlu3ZneA76feM=";
+      rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
+      hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/by-name/to/tokyotyrant/package.nix
similarity index 100%
rename from pkgs/development/libraries/tokyo-tyrant/default.nix
rename to pkgs/by-name/to/tokyotyrant/package.nix
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/by-name/to/tomcat_mysql_jdbc/package.nix
similarity index 100%
rename from pkgs/servers/http/tomcat/jdbc/mysql/default.nix
rename to pkgs/by-name/to/tomcat_mysql_jdbc/package.nix
diff --git a/pkgs/games/tome2/default.nix b/pkgs/by-name/to/tome2/package.nix
similarity index 100%
rename from pkgs/games/tome2/default.nix
rename to pkgs/by-name/to/tome2/package.nix
diff --git a/pkgs/games/tome4/default.nix b/pkgs/by-name/to/tome4/package.nix
similarity index 100%
rename from pkgs/games/tome4/default.nix
rename to pkgs/by-name/to/tome4/package.nix
diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/by-name/to/toml-f/package.nix
similarity index 100%
rename from pkgs/development/libraries/toml-f/default.nix
rename to pkgs/by-name/to/toml-f/package.nix
diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/by-name/to/toml2json/package.nix
similarity index 100%
rename from pkgs/development/tools/toml2json/default.nix
rename to pkgs/by-name/to/toml2json/package.nix
diff --git a/pkgs/development/tools/toml2nix/Cargo.lock b/pkgs/by-name/to/toml2nix/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/toml2nix/Cargo.lock
rename to pkgs/by-name/to/toml2nix/Cargo.lock
diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/by-name/to/toml2nix/package.nix
similarity index 100%
rename from pkgs/development/tools/toml2nix/default.nix
rename to pkgs/by-name/to/toml2nix/package.nix
diff --git a/pkgs/by-name/to/tomlcpp/package.nix b/pkgs/by-name/to/tomlcpp/package.nix
index f782719f2b63..6f77fe1cc763 100644
--- a/pkgs/by-name/to/tomlcpp/package.nix
+++ b/pkgs/by-name/to/tomlcpp/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "tomlcpp";
@@ -11,17 +11,26 @@ stdenv.mkDerivation rec {
     hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Use implicit $AR variable in Makefile
+      # https://github.com/cktan/tomlcpp/pull/6
+      url = "https://github.com/cktan/tomlcpp/commit/abdb4e0db8b27f719434f5a0d6ec0b1a6b086ded.patch";
+      hash = "sha256-SurUKdAZNWqBC7ss5nv5mDnJyC3DqxG/Q/FweTrkLnk=";
+    })
+  ];
+
   dontConfigure = true;
 
   installFlags = [
     "prefix=${placeholder "out"}"
   ];
 
-  meta = with lib;{
+  meta = {
     homepage = "https://github.com/cktan/tomlcpp";
     description = "No fanfare TOML C++ Library";
-    license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/to/tomlplusplus/package.nix b/pkgs/by-name/to/tomlplusplus/package.nix
index 7d95a15503b1..38e213eff28c 100644
--- a/pkgs/by-name/to/tomlplusplus/package.nix
+++ b/pkgs/by-name/to/tomlplusplus/package.nix
@@ -44,12 +44,15 @@ stdenv.mkDerivation (finalAttrs: {
     glibcLocales
   ];
 
-  doCheck = true;
   mesonFlags = [
     "-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}"
     "-Dbuild_examples=true"
   ];
 
+  # almost all tests fail on Darwin with the following exception:
+  # libc++abi: terminating due to uncaught exception of type std::runtime_error: collate_byname::collate_byname failed to construct for
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   passthru = {
     updateScript = nix-update-script { };
     tests.pkg-config = testers.hasPkgConfigModules {
diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/by-name/to/ton/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/ton/default.nix
rename to pkgs/by-name/to/ton/package.nix
diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/by-name/to/tone/nuget-deps.nix
similarity index 100%
rename from pkgs/applications/audio/tone/nuget-deps.nix
rename to pkgs/by-name/to/tone/nuget-deps.nix
diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/by-name/to/tone/package.nix
similarity index 100%
rename from pkgs/applications/audio/tone/default.nix
rename to pkgs/by-name/to/tone/package.nix
diff --git a/pkgs/by-name/to/tonelib-gfx/package.nix b/pkgs/by-name/to/tonelib-gfx/package.nix
new file mode 100644
index 000000000000..5e076f77ca6b
--- /dev/null
+++ b/pkgs/by-name/to/tonelib-gfx/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  alsa-lib,
+  freetype,
+  libglvnd,
+  curl,
+  libXcursor,
+  libXinerama,
+  libXrandr,
+  libXrender,
+  libjack2,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tonelib-gfx";
+  version = "4.8.5";
+
+  src = fetchurl {
+    url = "https://tonelib.vip/download/24-10-03/ToneLib-GFX-amd64.deb";
+    hash = "sha256-RG5rliF4/9LDd07i5dSFQzTGPqyF6UmTfatKb59LZA4=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+  ] ++ runtimeDependencies;
+
+  runtimeDependencies = map lib.getLib [
+    curl
+    libXcursor
+    libXinerama
+    libXrandr
+    libXrender
+    libjack2
+  ];
+
+  unpackCmd = "dpkg -x $curSrc source";
+
+  installPhase = ''
+    mv usr $out
+    substituteInPlace $out/share/applications/ToneLib-GFX.desktop --replace /usr/ $out/
+  '';
+
+  meta = with lib; {
+    description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass";
+    homepage = "https://tonelib.net/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [
+      dan4ik605743
+      husjon
+      orivej
+    ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "ToneLib-GFX";
+  };
+}
diff --git a/pkgs/by-name/to/tonelib-jam/package.nix b/pkgs/by-name/to/tonelib-jam/package.nix
new file mode 100644
index 000000000000..293e8885626a
--- /dev/null
+++ b/pkgs/by-name/to/tonelib-jam/package.nix
@@ -0,0 +1,63 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, dpkg
+, alsa-lib
+, freetype
+, libglvnd
+, curl
+, libXcursor
+, libXinerama
+, libXrandr
+, libXrender
+, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tonelib-jam";
+  version = "4.7.8";
+
+  src = fetchurl {
+    url = "https://tonelib.net/download/221222/ToneLib-Jam-amd64.deb";
+    sha256 = "sha256-c6At2lRPngQPpE7O+VY/Hsfw+QfIb3COIuHfbqqIEuM=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+  ] ++ runtimeDependencies;
+
+  runtimeDependencies = map lib.getLib [
+    curl
+    libXcursor
+    libXinerama
+    libXrandr
+    libXrender
+    libjack2
+  ];
+
+  unpackCmd = "dpkg -x $curSrc source";
+
+  installPhase = ''
+    mv usr $out
+    substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/
+  '';
+
+  meta = with lib; {
+    description = "ToneLib Jam – the learning and practice software for guitar players";
+    homepage = "https://tonelib.net/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ dan4ik605743 ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "ToneLib-Jam";
+  };
+}
diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix
new file mode 100644
index 000000000000..f337e59c2274
--- /dev/null
+++ b/pkgs/by-name/to/tonelib-metal/package.nix
@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, dpkg
+, alsa-lib
+, freetype
+, libglvnd
+, mesa
+, curl
+, libXcursor
+, libXinerama
+, libXrandr
+, libXrender
+, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tonelib-metal";
+  version = "1.2.6";
+
+  src = fetchurl {
+    url = "https://tonelib.net/download/221222/ToneLib-Metal-amd64.deb";
+    sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU=";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook dpkg ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+    mesa
+  ] ++ runtimeDependencies;
+
+  runtimeDependencies = map lib.getLib [
+    curl
+    libXcursor
+    libXinerama
+    libXrandr
+    libXrender
+    libjack2
+  ];
+
+  unpackCmd = "dpkg -x $curSrc source";
+
+  installPhase = ''
+    mv usr $out
+    substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/
+ '';
+
+  meta = with lib; {
+    description = "ToneLib Metal – Guitar amp simulator targeted at metal players";
+    homepage = "https://tonelib.net/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ dan4ik605743 ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "ToneLib-Metal";
+  };
+}
diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix
new file mode 100644
index 000000000000..df86ff86aabb
--- /dev/null
+++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix
@@ -0,0 +1,61 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, dpkg
+, alsa-lib
+, freetype
+, libglvnd
+, mesa
+, curl
+, libXcursor
+, libXinerama
+, libXrandr
+, libXrender
+, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tonelib-noisereducer";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "https://tonelib.net/download/221222/ToneLib-NoiseReducer-amd64.deb";
+    sha256 = "sha256-27JuFVmamIUUKRrpjlsE0E6x+5X9RutNGPiDf5dxitI=";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook dpkg ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+    mesa
+  ] ++ runtimeDependencies;
+
+  runtimeDependencies = map lib.getLib [
+    curl
+    libXcursor
+    libXinerama
+    libXrandr
+    libXrender
+    libjack2
+  ];
+
+  unpackCmd = "dpkg -x $curSrc source";
+
+  installPhase = ''
+    mv usr $out
+ '';
+
+  meta = with lib; {
+    description = "ToneLib NoiseReducer – two-unit noise reduction rack effect plugin";
+    homepage = "https://tonelib.net/tl-noisereducer.html";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ orivej ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "ToneLib-NoiseReducer";
+  };
+}
diff --git a/pkgs/by-name/to/tonelib-zoom/package.nix b/pkgs/by-name/to/tonelib-zoom/package.nix
new file mode 100644
index 000000000000..9f07141437fe
--- /dev/null
+++ b/pkgs/by-name/to/tonelib-zoom/package.nix
@@ -0,0 +1,65 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, dpkg
+, alsa-lib
+, freetype
+, libglvnd
+, curl
+, libXcursor
+, libXinerama
+, libXrandr
+, libXrender
+, libjack2
+, webkitgtk_4_0
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tonelib-zoom";
+  version = "4.3.1";
+
+  src = fetchurl {
+    url = "https://www.tonelib.net/download/0129/ToneLib-Zoom-amd64.deb";
+    sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+    webkitgtk_4_0
+  ] ++ runtimeDependencies;
+
+  runtimeDependencies = map lib.getLib [
+    curl
+    libXcursor
+    libXinerama
+    libXrandr
+    libXrender
+    libjack2
+  ];
+
+  unpackCmd = "dpkg -x $curSrc source";
+
+  installPhase = ''
+    mv usr $out
+    substituteInPlace $out/share/applications/ToneLib-Zoom.desktop --replace /usr/ $out/
+  '';
+
+  meta = with lib; {
+    description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal";
+    homepage = "https://tonelib.net/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ dan4ik605743 ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "ToneLib-Zoom";
+  };
+}
diff --git a/pkgs/applications/virtualization/toolbox/glibc.patch b/pkgs/by-name/to/toolbox/glibc.patch
similarity index 100%
rename from pkgs/applications/virtualization/toolbox/glibc.patch
rename to pkgs/by-name/to/toolbox/glibc.patch
diff --git a/pkgs/applications/virtualization/toolbox/default.nix b/pkgs/by-name/to/toolbox/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/toolbox/default.nix
rename to pkgs/by-name/to/toolbox/package.nix
diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix
new file mode 100644
index 000000000000..0f1b5ce9ed1b
--- /dev/null
+++ b/pkgs/by-name/to/toot/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  nixosTests,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "toot";
+  version = "0.45.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ihabunek";
+    repo = "toot";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q=";
+  };
+
+  nativeCheckInputs = with python3Packages; [ pytest ];
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    requests
+    beautifulsoup4
+    wcwidth
+    urwid
+    urwidgets
+    tomlkit
+    click
+    pillow
+    term-image
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    py.test
+    runHook postCheck
+  '';
+
+  passthru.tests.toot = nixosTests.pleroma;
+
+  meta = {
+    description = "Mastodon CLI interface";
+    mainProgram = "toot";
+    homepage = "https://github.com/ihabunek/toot";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      aleksana
+    ];
+  };
+}
diff --git a/pkgs/applications/version-management/topgit/default.nix b/pkgs/by-name/to/top-git/package.nix
similarity index 100%
rename from pkgs/applications/version-management/topgit/default.nix
rename to pkgs/by-name/to/top-git/package.nix
diff --git a/pkgs/tools/text/topfew-rs/default.nix b/pkgs/by-name/to/topfew-rs/package.nix
similarity index 100%
rename from pkgs/tools/text/topfew-rs/default.nix
rename to pkgs/by-name/to/topfew-rs/package.nix
diff --git a/pkgs/tools/text/topfew/default.nix b/pkgs/by-name/to/topfew/package.nix
similarity index 100%
rename from pkgs/tools/text/topfew/default.nix
rename to pkgs/by-name/to/topfew/package.nix
diff --git a/pkgs/development/tools/misc/topiary/Cargo.lock b/pkgs/by-name/to/topiary/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/misc/topiary/Cargo.lock
rename to pkgs/by-name/to/topiary/Cargo.lock
diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/by-name/to/topiary/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/topiary/default.nix
rename to pkgs/by-name/to/topiary/package.nix
diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/by-name/to/topicctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/topicctl/default.nix
rename to pkgs/by-name/to/topicctl/package.nix
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/by-name/to/topydo/package.nix
similarity index 100%
rename from pkgs/applications/misc/topydo/default.nix
rename to pkgs/by-name/to/topydo/package.nix
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index e0d96106f792..cdda6d6b9d57 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ lib.warnIf (useHardenedMalloc != null)
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.0";
+  version = "14.0.1";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-RNsTj8/HP10ElIjutYCqp50gN7W7Kz+DA94rkkU/VaI=";
+      hash = "sha256-DQbKMaXgEXNKHPonQF7RZ1TtEqCRnvD81ahyVUkknY8=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-rHInikR2UvsB8A0cC7gqj09CWajJtR9ZhS3WFrv2z94=";
+      hash = "sha256-khY/B4c0DjqRd0s9PblEhL0jJONVU5mQCAqZ60M+CjE=";
     };
   };
 
diff --git a/pkgs/games/torcs/default.nix b/pkgs/by-name/to/torcs/package.nix
similarity index 100%
rename from pkgs/games/torcs/default.nix
rename to pkgs/by-name/to/torcs/package.nix
diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/by-name/to/torq/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/torq/default.nix
rename to pkgs/by-name/to/torq/package.nix
diff --git a/pkgs/tools/archivers/torrent7z/default.nix b/pkgs/by-name/to/torrent7z/package.nix
similarity index 100%
rename from pkgs/tools/archivers/torrent7z/default.nix
rename to pkgs/by-name/to/torrent7z/package.nix
diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/by-name/to/torrential/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/torrential/default.nix
rename to pkgs/by-name/to/torrential/package.nix
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/by-name/to/tortoisehg/package.nix
similarity index 100%
rename from pkgs/applications/version-management/tortoisehg/default.nix
rename to pkgs/by-name/to/tortoisehg/package.nix
diff --git a/pkgs/games/torus-trooper/default.nix b/pkgs/by-name/to/torus-trooper/package.nix
similarity index 100%
rename from pkgs/games/torus-trooper/default.nix
rename to pkgs/by-name/to/torus-trooper/package.nix
diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/by-name/to/toss/package.nix
similarity index 100%
rename from pkgs/tools/networking/toss/default.nix
rename to pkgs/by-name/to/toss/package.nix
diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/by-name/to/totem-pl-parser/package.nix
similarity index 100%
rename from pkgs/development/libraries/totem-pl-parser/default.nix
rename to pkgs/by-name/to/totem-pl-parser/package.nix
diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix
index 8baa3f884c80..db3e8892fe56 100644
--- a/pkgs/by-name/to/totem/package.nix
+++ b/pkgs/by-name/to/totem/package.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , gettext
@@ -32,32 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "totem";
-  version = "43.0";
+  version = "43.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz";
-    hash = "sha256-s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4=";
+    hash = "sha256-VmgpHpxkRJhcs//k6k8CEvVMK75g3QERTBqVD5R1nm0=";
   };
 
-  patches = [
-    # Lower X11 dependency version since we do not have it.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch";
-      hash = "sha256-ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8=";
-      revert = true;
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch";
-      hash = "sha256-nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38=";
-      revert = true;
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch";
-      hash = "sha256-LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg=";
-      revert = true;
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -103,9 +83,7 @@ stdenv.mkDerivation rec {
     "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
   ];
 
-  # Tests do not work with GStreamer 1.18.
-  # https://gitlab.gnome.org/GNOME/totem/-/issues/450
-  doCheck = false;
+  doCheck = true;
 
   postPatch = ''
     chmod +x meson_compile_python.py # patchShebangs requires executable file
@@ -117,7 +95,7 @@ stdenv.mkDerivation rec {
     runHook preCheck
 
     xvfb-run -s '-screen 0 800x600x24' \
-      ninja test
+      meson test --print-errorlogs
 
     runHook postCheck
   '';
diff --git a/pkgs/by-name/to/totp-cli/package.nix b/pkgs/by-name/to/totp-cli/package.nix
new file mode 100644
index 000000000000..39db0a9682cc
--- /dev/null
+++ b/pkgs/by-name/to/totp-cli/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+let
+  pname = "totp-cli";
+  version = "1.8.7";
+in
+buildGoModule {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "yitsushi";
+    repo = "totp-cli";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WCPDrKGIRrYJFeozXtf8YPgHJ8m6DAsMBD8Xgjvclvc=";
+  };
+
+  vendorHash = "sha256-VTlSnw3TyVOQPU+nMDhRtyUrBID2zesGeG2CgDyjwWY=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --bash autocomplete/bash_autocomplete
+    installShellCompletion --zsh autocomplete/zsh_autocomplete
+  '';
+
+  meta = {
+    description = "Authy/Google Authenticator like TOTP CLI tool written in Go";
+    changelog = "https://github.com/yitsushi/totp-cli/releases/";
+    homepage = "https://yitsushi.github.io/totp-cli/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
+    mainProgram = "totp-cli";
+  };
+}
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/by-name/to/touchegg/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/touchegg/default.nix
rename to pkgs/by-name/to/touchegg/package.nix
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/by-name/to/tox-node/package.nix
similarity index 100%
rename from pkgs/tools/networking/tox-node/default.nix
rename to pkgs/by-name/to/tox-node/package.nix
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/by-name/to/toxiproxy/package.nix
similarity index 100%
rename from pkgs/development/tools/toxiproxy/default.nix
rename to pkgs/by-name/to/toxiproxy/package.nix
diff --git a/pkgs/tools/networking/toxvpn/bootstrap.json b/pkgs/by-name/to/toxvpn/bootstrap.json
similarity index 100%
rename from pkgs/tools/networking/toxvpn/bootstrap.json
rename to pkgs/by-name/to/toxvpn/bootstrap.json
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/by-name/to/toxvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/toxvpn/default.nix
rename to pkgs/by-name/to/toxvpn/package.nix
diff --git a/pkgs/tools/system/tp-auto-kbbl/default.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
similarity index 100%
rename from pkgs/tools/system/tp-auto-kbbl/default.nix
rename to pkgs/by-name/tp/tp-auto-kbbl/package.nix
diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/by-name/tp/tpacpi-bat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tpacpi-bat/default.nix
rename to pkgs/by-name/tp/tpacpi-bat/package.nix
diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix
index 58e65af868d2..5441a1413cc8 100644
--- a/pkgs/by-name/tp/tparse/package.nix
+++ b/pkgs/by-name/tp/tparse/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "tparse";
-  version = "0.15.0";
+  version = "0.16.0";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "mfridman";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-CxoVu3WH2I/1wT5o/RGIrGFrGCQOC4vcUKMiH/Gv3aY=";
+    hash = "sha256-fljSjch09kQCpnZerI/h4SRCyxUydfFZGyOXsxmgYOk=";
   };
 
-  vendorHash = "sha256-soIti6o8BUnarPf5/bcMJKdEG0oRpDLMkQM6RlbZQ5I=";
+  vendorHash = "sha256-gGmPQ8YaTk7xG5B8UPK7vOui5YFeEnkuGrAsf0eylXQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix
index bd9965029ea6..7ccd26716664 100644
--- a/pkgs/by-name/tp/tpi/package.nix
+++ b/pkgs/by-name/tp/tpi/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tpi";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "turing-machines";
     repo = "tpi";
     rev = "v${version}";
-    hash = "sha256-rkqkb3iJL4obHjTkGEUbVPJmUmfT9KKP4yoQ71cbpKs=";
+    hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA=";
   };
 
-  cargoHash = "sha256-hSWDr1XuD6x96QV2QIdhGPQ00Sg7G5O5bkFNTdUx0ug=";
+  cargoHash = "sha256-5TfLAMPl3I9gkd3SSjPlBeBJzANK9u5XjY0ReHVSTJw=";
 
   meta = {
     description = "CLI tool to control your Turing Pi 2 board";
diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix
index 39204176b534..600e61fa7795 100644
--- a/pkgs/by-name/tp/tplay/package.nix
+++ b/pkgs/by-name/tp/tplay/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     openssl.dev
     alsa-lib.dev
-    libclang.lib
+    (lib.getLib libclang)
     ffmpeg.dev
     opencv
   ];
diff --git a/pkgs/by-name/tp/tpm-fido/package.nix b/pkgs/by-name/tp/tpm-fido/package.nix
new file mode 100644
index 000000000000..8fd67b27d920
--- /dev/null
+++ b/pkgs/by-name/tp/tpm-fido/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  pinentry-tty,
+}:
+
+buildGoModule {
+  pname = "tpm-fido";
+  version = "0-unstable-2024-10-30";
+
+  src = fetchFromGitHub {
+    owner = "psanford";
+    repo = "tpm-fido";
+    rev = "5f8828b82b58f9badeed65718fca72bc31358c5c";
+    hash = "sha256-Yfr5B4AfcBscD31QOsukamKtEDWC9Cx2ee4L6HM2554=";
+  };
+
+  vendorHash = "sha256-qm/iDc9tnphQ4qooufpzzX7s4dbnUbR9J5L770qXw8Y=";
+
+  buildInputs = [
+    pinentry-tty
+  ];
+
+  ldFlags = [
+    "-s "
+    "-w"
+  ];
+
+  meta = {
+    description = "WebAuthn/U2F token protected by a TPM";
+    homepage = "https://github.com/psanford/tpm-fido";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "tpm-fido";
+  };
+}
diff --git a/pkgs/tools/security/tpm-luks/openssl-1.1.patch b/pkgs/by-name/tp/tpm-luks/openssl-1.1.patch
similarity index 100%
rename from pkgs/tools/security/tpm-luks/openssl-1.1.patch
rename to pkgs/by-name/tp/tpm-luks/openssl-1.1.patch
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/by-name/tp/tpm-luks/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm-luks/default.nix
rename to pkgs/by-name/tp/tpm-luks/package.nix
diff --git a/pkgs/tools/security/tpm-luks/signed-ptr.patch b/pkgs/by-name/tp/tpm-luks/signed-ptr.patch
similarity index 100%
rename from pkgs/tools/security/tpm-luks/signed-ptr.patch
rename to pkgs/by-name/tp/tpm-luks/signed-ptr.patch
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/by-name/tp/tpm-quote-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm-quote-tools/default.nix
rename to pkgs/by-name/tp/tpm-quote-tools/package.nix
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/by-name/tp/tpm-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm-tools/default.nix
rename to pkgs/by-name/tp/tpm-tools/package.nix
diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm2-abrmd/default.nix
rename to pkgs/by-name/tp/tpm2-abrmd/package.nix
diff --git a/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch b/pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
similarity index 100%
rename from pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch
rename to pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
similarity index 100%
rename from pkgs/misc/tpm2-pkcs11/default.nix
rename to pkgs/by-name/tp/tpm2-pkcs11/package.nix
diff --git a/pkgs/misc/tpm2-pkcs11/version.patch b/pkgs/by-name/tp/tpm2-pkcs11/version.patch
similarity index 100%
rename from pkgs/misc/tpm2-pkcs11/version.patch
rename to pkgs/by-name/tp/tpm2-pkcs11/version.patch
diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/by-name/tp/tpm2-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm2-tools/default.nix
rename to pkgs/by-name/tp/tpm2-tools/package.nix
diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index ea58c45f579b..91d03eb80a14 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tpnote";
-  version = "1.24.8";
+  version = "1.24.9";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     rev = "v${version}";
-    hash = "sha256-tn6GCBX3DrqyZZz2FJLTn1vJd4eEbawyJM5huco21/8=";
+    hash = "sha256-KXkriFFn1GapoVimcK7Hqv1mUTZ2EbnnZPyX2izI2oo=";
   };
 
-  cargoHash = "sha256-2qGObTu7g6GbUwd4obgqufig7bABFLBsCWSyZt8AVac=";
+  cargoHash = "sha256-MCnQJ1cJeWUJ8L+u09px4COG7XUAVOOgBg8nUi37J90=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/by-name/tp/tptp/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/tptp/default.nix
rename to pkgs/by-name/tp/tptp/package.nix
diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/by-name/tq/tqsl/package.nix
similarity index 100%
rename from pkgs/applications/radio/tqsl/default.nix
rename to pkgs/by-name/tq/tqsl/package.nix
diff --git a/pkgs/games/tr-patcher/default.nix b/pkgs/by-name/tr/tr-patcher/package.nix
similarity index 100%
rename from pkgs/games/tr-patcher/default.nix
rename to pkgs/by-name/tr/tr-patcher/package.nix
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/by-name/tr/tracebox/package.nix
similarity index 100%
rename from pkgs/tools/networking/tracebox/default.nix
rename to pkgs/by-name/tr/tracebox/package.nix
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/pkgs/by-name/tr/tracefilegen/gcc7.patch
similarity index 100%
rename from pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch
rename to pkgs/by-name/tr/tracefilegen/gcc7.patch
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/by-name/tr/tracefilegen/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
rename to pkgs/by-name/tr/tracefilegen/package.nix
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/by-name/tr/tracefilesim/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
rename to pkgs/by-name/tr/tracefilesim/package.nix
diff --git a/pkgs/by-name/tr/traceroute/package.nix b/pkgs/by-name/tr/traceroute/package.nix
new file mode 100644
index 000000000000..3a61c5eacbef
--- /dev/null
+++ b/pkgs/by-name/tr/traceroute/package.nix
@@ -0,0 +1,34 @@
+{ lib
+, stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "traceroute";
+  version = "2.1.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz";
+    sha256 = "sha256-nM75zbnXqY/3+/k/eevQ5IiBZktSXEsjKg/Ox9y5214=";
+  };
+
+  makeFlags = [
+    "prefix=$(out)"
+    "LDFLAGS=-lm"
+    "env=yes"
+  ];
+
+  preConfigure = ''
+    sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules
+  '';
+
+  meta = with lib; {
+    description = "Tracks the route taken by packets over an IP network";
+    homepage = "https://traceroute.sourceforge.net/";
+    changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ koral ];
+    platforms = platforms.linux;
+    mainProgram = "traceroute";
+  };
+}
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/by-name/tr/trackballs/package.nix
similarity index 100%
rename from pkgs/games/trackballs/default.nix
rename to pkgs/by-name/tr/trackballs/package.nix
diff --git a/pkgs/by-name/tr/tracker-miners/package.nix b/pkgs/by-name/tr/tracker-miners/package.nix
deleted file mode 100644
index 963df6517e35..000000000000
--- a/pkgs/by-name/tr/tracker-miners/package.nix
+++ /dev/null
@@ -1,148 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, asciidoc
-, docbook-xsl-nons
-, docbook_xml_dtd_45
-, gettext
-, itstool
-, libxslt
-, gexiv2
-, tracker
-, meson
-, mesonEmulatorHook
-, ninja
-, pkg-config
-, vala
-, wrapGAppsNoGuiHook
-, bzip2
-, dbus
-, exempi
-, giflib
-, glib
-, gnome
-, gst_all_1
-, icu
-, json-glib
-, libcue
-, libexif
-, libgsf
-, libgxps
-, libiptcdata
-, libjpeg
-, libosinfo
-, libpng
-, libseccomp
-, libtiff
-, libuuid
-, libxml2
-, networkmanager
-, poppler
-, systemd
-, taglib
-, upower
-, totem-pl-parser
-, e2fsprogs
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tracker-miners";
-  version = "3.7.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker-miners/${lib.versions.majorMinor finalAttrs.version}/tracker-miners-${finalAttrs.version}.tar.xz";
-    hash = "sha256-50OIFUtcGXtLfuQvDc6MX7vd1NNhCT74jU+zA+M9pf4=";
-  };
-
-  patches = [
-    ./tracker-landlock-nix-store-permission.patch
-  ];
-
-  nativeBuildInputs = [
-    asciidoc
-    docbook-xsl-nons
-    docbook_xml_dtd_45
-    gettext
-    glib
-    itstool
-    libxslt
-    meson
-    ninja
-    pkg-config
-    vala
-    wrapGAppsNoGuiHook
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    mesonEmulatorHook
-  ];
-
-  # TODO: add libenca, libosinfo
-  buildInputs = [
-    bzip2
-    dbus
-    exempi
-    giflib
-    gexiv2
-    totem-pl-parser
-    tracker
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-ugly
-    gst_all_1.gstreamer
-    gst_all_1.gst-libav
-    icu
-    json-glib
-    libcue
-    libexif
-    libgsf
-    libgxps
-    libiptcdata
-    libjpeg
-    libosinfo
-    libpng
-    libtiff
-    libuuid
-    libxml2
-    poppler
-    taglib
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libseccomp
-    networkmanager
-    systemd
-    upower
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    e2fsprogs
-  ];
-
-  mesonFlags = [
-    # TODO: tests do not like our sandbox
-    "-Dfunctional_tests=false"
-
-    # libgrss is unmaintained and has no new releases since 2015, and an open
-    # security issue since then. Despite a patch now being availab, we're opting
-    # to be safe due to the general state of the project
-    "-Dminer_rss=false"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-    "-Dbattery_detection=none"
-    "-Dnetwork_manager=disabled"
-    "-Dsystemd_user_services=false"
-  ];
-
-  postInstall = ''
-    glib-compile-schemas "$out/share/glib-2.0/schemas"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "tracker-miners";
-    };
-  };
-
-  meta = {
-    homepage = "https://gitlab.gnome.org/GNOME/tracker-miners";
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = lib.teams.gnome.members;
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/by-name/tr/tradcpp/aarch64.patch
similarity index 100%
rename from pkgs/development/tools/tradcpp/aarch64.patch
rename to pkgs/by-name/tr/tradcpp/aarch64.patch
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/by-name/tr/tradcpp/package.nix
similarity index 100%
rename from pkgs/development/tools/tradcpp/default.nix
rename to pkgs/by-name/tr/tradcpp/package.nix
diff --git a/pkgs/development/tools/tradcpp/tradcpp-configure.patch b/pkgs/by-name/tr/tradcpp/tradcpp-configure.patch
similarity index 100%
rename from pkgs/development/tools/tradcpp/tradcpp-configure.patch
rename to pkgs/by-name/tr/tradcpp/tradcpp-configure.patch
diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix
index 9c7fb11aa345..958e0f4135e4 100644
--- a/pkgs/by-name/tr/tradingview/package.nix
+++ b/pkgs/by-name/tr/tradingview/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     atk
     at-spi2-atk
diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
similarity index 100%
rename from pkgs/tools/misc/traefik-certs-dumper/default.nix
rename to pkgs/by-name/tr/traefik-certs-dumper/package.nix
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/by-name/tr/traefik/package.nix
similarity index 100%
rename from pkgs/servers/traefik/default.nix
rename to pkgs/by-name/tr/traefik/package.nix
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/by-name/tr/trafficserver/package.nix
similarity index 100%
rename from pkgs/servers/http/trafficserver/default.nix
rename to pkgs/by-name/tr/trafficserver/package.nix
diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/by-name/tr/traitor/package.nix
similarity index 100%
rename from pkgs/tools/security/traitor/default.nix
rename to pkgs/by-name/tr/traitor/package.nix
diff --git a/pkgs/tools/networking/tran/default.nix b/pkgs/by-name/tr/tran/package.nix
similarity index 100%
rename from pkgs/tools/networking/tran/default.nix
rename to pkgs/by-name/tr/tran/package.nix
diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/by-name/tr/transcode/package.nix
similarity index 100%
rename from pkgs/applications/audio/transcode/default.nix
rename to pkgs/by-name/tr/transcode/package.nix
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/by-name/tr/transcribe/package.nix
similarity index 100%
rename from pkgs/applications/audio/transcribe/default.nix
rename to pkgs/by-name/tr/transcribe/package.nix
diff --git a/pkgs/applications/version-management/transcrypt/default.nix b/pkgs/by-name/tr/transcrypt/package.nix
similarity index 100%
rename from pkgs/applications/version-management/transcrypt/default.nix
rename to pkgs/by-name/tr/transcrypt/package.nix
diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
new file mode 100644
index 000000000000..6985ee6770b1
--- /dev/null
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -0,0 +1,75 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip
+, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl
+, unstableGitUpdater }:
+
+stdenv.mkDerivation rec {
+  pname = "transgui";
+  version = "5.18.0-unstable-2024-02-26";
+
+  src = fetchFromGitHub {
+    owner = "transmission-remote-gui";
+    repo = "transgui";
+    rev = "25df397d92fbd53b970ef72a6ffd9f644458f935";
+    hash = "sha256-jQIe2vTDeJM/lhl6alNhEPOqXjyd18x+Kg29+le/dks=";
+  };
+
+  nativeBuildInputs = [ pkg-config unzip ];
+  buildInputs = [
+    fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf
+    pango atk cairo openssl
+  ];
+
+  NIX_LDFLAGS = ''
+    -L${lib.getLib stdenv.cc.cc}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0
+    -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo
+    -lc -lcrypto
+  '';
+
+  postPatch = ''
+    substituteInPlace restranslator.pas --replace /usr/ $out/
+  '';
+
+  preBuild = ''
+    FPCDIR=${fpc}/lib/fpc/${fpc.version} fpcmake -w
+    lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus
+  '';
+
+  makeFlags = [ "FPC=fpc" "PP=fpc" "INSTALL_PREFIX=$(out)" ];
+
+  LCL_PLATFORM = "gtk2";
+
+  desktopItem = makeDesktopItem {
+    name = pname;
+    exec = "${pname} %U";
+    icon = pname;
+    type = "Application";
+    comment = meta.description;
+    desktopName = "Transmission Remote GUI";
+    genericName = "BitTorrent Client";
+    categories = [ "Network" "FileTransfer" "P2P" "GTK" ];
+    startupNotify = true;
+    mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ];
+  };
+
+  postInstall = ''
+    mkdir -p "$out/share/applications"
+    cp $desktopItem/share/applications/* $out/share/applications
+    mkdir -p "$out/share/icons/hicolor/48x48/apps"
+    cp transgui.png "$out/share/icons/hicolor/48x48/apps"
+    mkdir -p "$out/share/transgui"
+    cp -r "./lang" "$out/share/transgui"
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+  };
+
+  meta = {
+    description = "A cross platform front-end for the Transmission BitTorrent client";
+    homepage = "https://sourceforge.net/p/transgui";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ramkromberg ];
+    mainProgram = "transgui";
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/by-name/tr/transifex-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/transifex-cli/default.nix
rename to pkgs/by-name/tr/transifex-cli/package.nix
diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/by-name/tr/translate-shell/package.nix
similarity index 100%
rename from pkgs/applications/misc/translate-shell/default.nix
rename to pkgs/by-name/tr/translate-shell/package.nix
diff --git a/pkgs/applications/misc/translatelocally/default.nix b/pkgs/by-name/tr/translatelocally/package.nix
similarity index 100%
rename from pkgs/applications/misc/translatelocally/default.nix
rename to pkgs/by-name/tr/translatelocally/package.nix
diff --git a/pkgs/applications/misc/translatelocally/version_without_git.patch b/pkgs/by-name/tr/translatelocally/version_without_git.patch
similarity index 100%
rename from pkgs/applications/misc/translatelocally/version_without_git.patch
rename to pkgs/by-name/tr/translatelocally/version_without_git.patch
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
rename to pkgs/by-name/tr/transmission-remote-gtk/package.nix
diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/by-name/tr/transmission-rss/package.nix
similarity index 100%
rename from pkgs/tools/networking/transmission-rss/default.nix
rename to pkgs/by-name/tr/transmission-rss/package.nix
diff --git a/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch b/pkgs/by-name/tr/transmission-rss/update-cargo-lock-version.patch
similarity index 100%
rename from pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch
rename to pkgs/by-name/tr/transmission-rss/update-cargo-lock-version.patch
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/by-name/tr/trash-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/trash-cli/default.nix
rename to pkgs/by-name/tr/trash-cli/package.nix
diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/by-name/tr/trashy/package.nix
similarity index 100%
rename from pkgs/tools/misc/trashy/default.nix
rename to pkgs/by-name/tr/trashy/package.nix
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/by-name/tr/trayer/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/trayer/default.nix
rename to pkgs/by-name/tr/trayer/package.nix
diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix
new file mode 100644
index 000000000000..9fa5c40e073f
--- /dev/null
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, pkg-config
+, wrapGAppsHook4
+, tailscale
+, gtk4
+, gobject-introspection
+, libadwaita
+}:
+
+buildGoModule rec {
+  pname = "trayscale";
+  version = "0.13.5";
+
+  src = fetchFromGitHub {
+    owner = "DeedleFake";
+    repo = "trayscale";
+    rev = "v${version}";
+    hash = "sha256-SBt9bK2fjxIEANjw+Gs+lHiWplzNMfporj+ZVtt50pw=";
+  };
+
+  vendorHash = "sha256-PPKrtvW0fwzCO+OqJ7S/Kd6WOwN1DqQDhpeQUPCSpUU=";
+
+  subPackages = [ "cmd/trayscale" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=deedles.dev/trayscale/internal/version.version=${version}"
+  ];
+
+  nativeBuildInputs = [ pkg-config gobject-introspection wrapGAppsHook4 ];
+  buildInputs = [ gtk4 libadwaita ];
+
+  # there are no actual tests, and it takes 20 minutes to rebuild
+  doCheck = false;
+
+  postInstall = ''
+    sh ./dist.sh install $out
+    glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : "${tailscale}/bin")
+  '';
+
+  meta = {
+    changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}";
+    description = "Unofficial GUI wrapper around the Tailscale CLI client";
+    homepage = "https://github.com/DeedleFake/trayscale";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sikmir ];
+    mainProgram = "trayscale";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/by-name/tr/trdl-client/package.nix
similarity index 100%
rename from pkgs/tools/misc/trdl-client/default.nix
rename to pkgs/by-name/tr/trdl-client/package.nix
diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/by-name/tr/tre-command/package.nix
similarity index 100%
rename from pkgs/tools/system/tre-command/default.nix
rename to pkgs/by-name/tr/tre-command/package.nix
diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/by-name/tr/tre/package.nix
similarity index 100%
rename from pkgs/development/libraries/tre/default.nix
rename to pkgs/by-name/tr/tre/package.nix
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/by-name/tr/tree/package.nix
similarity index 100%
rename from pkgs/tools/system/tree/default.nix
rename to pkgs/by-name/tr/tree/package.nix
diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix
index ca5b0445ab23..659ba98707d0 100644
--- a/pkgs/by-name/tr/treefmt2/package.nix
+++ b/pkgs/by-name/tr/treefmt2/package.nix
@@ -1,16 +1,16 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "treefmt";
-  version = "2.0.5";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
     rev = "v${version}";
-    hash = "sha256-lDQbrq9AWH5Hjgy5AllbLLBUl/JkYGw68M5wob14kus=";
+    hash = "sha256-I97mCxQMPq6fV0GD9gVbtQ/i/Sju9/+ZazbkbGqy9Qw=";
   };
 
-  vendorHash = "sha256-OyOgTBwcRNd6kdnn3TFuq7xukeK0A1imK/WMer0tldk=";
+  vendorHash = "sha256-PiH+FMSPeTFwS6cMgZX8Uy2bjZnQ+APqL5d7FMnqR9U=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/science/biology/treemix/default.nix b/pkgs/by-name/tr/treemix/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/treemix/default.nix
rename to pkgs/by-name/tr/treemix/package.nix
diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/by-name/tr/trellis/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/trellis/default.nix
rename to pkgs/by-name/tr/trellis/package.nix
diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/by-name/tr/tremc/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/tremc/default.nix
rename to pkgs/by-name/tr/tremc/package.nix
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/by-name/tr/tremor/package.nix
similarity index 100%
rename from pkgs/development/libraries/tremor/default.nix
rename to pkgs/by-name/tr/tremor/package.nix
diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/by-name/tr/trezor-suite/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/trezor-suite/default.nix
rename to pkgs/by-name/tr/trezor-suite/package.nix
diff --git a/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/pkgs/by-name/tr/trezor-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/trezor-udev-rules/default.nix
rename to pkgs/by-name/tr/trezor-udev-rules/package.nix
diff --git a/pkgs/applications/science/biology/trf/default.nix b/pkgs/by-name/tr/trf/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/trf/default.nix
rename to pkgs/by-name/tr/trf/package.nix
diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/by-name/tr/trickle/package.nix
similarity index 100%
rename from pkgs/tools/networking/trickle/default.nix
rename to pkgs/by-name/tr/trickle/package.nix
diff --git a/pkgs/games/trigger/default.nix b/pkgs/by-name/tr/trigger/package.nix
similarity index 100%
rename from pkgs/games/trigger/default.nix
rename to pkgs/by-name/tr/trigger/package.nix
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/by-name/tr/triggerhappy/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/triggerhappy/default.nix
rename to pkgs/by-name/tr/triggerhappy/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/by-name/tr/trillian-im/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/trillian-im/default.nix
rename to pkgs/by-name/tr/trillian-im/package.nix
diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/by-name/tr/trillian/package.nix
similarity index 100%
rename from pkgs/tools/misc/trillian/default.nix
rename to pkgs/by-name/tr/trillian/package.nix
diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/by-name/tr/trimal/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/trimal/default.nix
rename to pkgs/by-name/tr/trimal/package.nix
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/by-name/tr/trinity/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/trinity/default.nix
rename to pkgs/by-name/tr/trinity/package.nix
diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/by-name/tr/trino-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/database/trino-cli/default.nix
rename to pkgs/by-name/tr/trino-cli/package.nix
diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
new file mode 100644
index 000000000000..2e4a39565228
--- /dev/null
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, installShellFiles
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "trippy";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "fujiapple852";
+    repo = "trippy";
+    rev = version;
+    hash = "sha256-ArSIeu3u+TUy18rzJvhq0+/qvi5xPZmtQ7rPpwaEx9g=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  cargoHash = "sha256-h1NQQFjtlpQuyTz7AHuAPUe1GxR0Q2yKzow8XB9375U=";
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    local INSTALL="$out/bin/trip"
+    installShellCompletion --cmd trip \
+      --bash <($out/bin/trip --generate bash) \
+      --fish <($out/bin/trip --generate fish) \
+      --zsh <($out/bin/trip --generate zsh)
+  '';
+
+  meta = with lib; {
+    description = "Network diagnostic tool";
+    homepage = "https://trippy.cli.rs";
+    changelog = "https://github.com/fujiapple852/trippy/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "trip";
+  };
+}
diff --git a/pkgs/tools/admin/triton/default.nix b/pkgs/by-name/tr/triton/package.nix
similarity index 100%
rename from pkgs/tools/admin/triton/default.nix
rename to pkgs/by-name/tr/triton/package.nix
diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
new file mode 100644
index 000000000000..ac34affce1c8
--- /dev/null
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  testers,
+  trivy,
+}:
+
+buildGoModule rec {
+  pname = "trivy";
+  version = "0.57.0";
+
+  src = fetchFromGitHub {
+    owner = "aquasecurity";
+    repo = "trivy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-al8hxVNyDoGQaoqa0fmA7Bn7M1twwlS4I5+XZnETXyc=";
+  };
+
+  # Hash mismatch on across Linux and Darwin
+  proxyVendor = true;
+
+  vendorHash = "sha256-TEjV9Cr5oXNMvzFpRDQ9MxgbZMJnq++eU/xJi2/piF8=";
+
+  subPackages = [ "cmd/trivy" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  # Tests require network access
+  doCheck = false;
+
+  postInstall =
+    let
+      trivy =
+        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+          placeholder "out"
+        else
+          buildPackages.trivy;
+    in
+    ''
+      installShellCompletion --cmd trivy \
+        --bash <(${trivy}/bin/trivy completion bash) \
+        --fish <(${trivy}/bin/trivy completion fish) \
+        --zsh <(${trivy}/bin/trivy completion zsh)
+    '';
+
+  doInstallCheck = true;
+
+  passthru.tests.version = testers.testVersion {
+    package = trivy;
+    command = "trivy --version";
+    version = "Version: ${version}";
+  };
+
+  meta = with lib; {
+    description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI";
+    homepage = "https://github.com/aquasecurity/trivy";
+    changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}";
+    longDescription = ''
+      Trivy is a simple and comprehensive vulnerability scanner for containers
+      and other artifacts. A software vulnerability is a glitch, flaw, or
+      weakness present in the software or in an Operating System. Trivy detects
+      vulnerabilities of OS packages (Alpine, RHEL, CentOS, etc.) and
+      application dependencies (Bundler, Composer, npm, yarn, etc.).
+    '';
+    mainProgram = "trivy";
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      fab
+      jk
+    ];
+  };
+}
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/by-name/tr/trompeloeil/package.nix
similarity index 100%
rename from pkgs/development/libraries/trompeloeil/default.nix
rename to pkgs/by-name/tr/trompeloeil/package.nix
diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/pkgs/by-name/tr/trousers/allow-non-tss-config-file-owner.patch
similarity index 100%
rename from pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
rename to pkgs/by-name/tr/trousers/allow-non-tss-config-file-owner.patch
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/by-name/tr/trousers/package.nix
similarity index 100%
rename from pkgs/tools/security/trousers/default.nix
rename to pkgs/by-name/tr/trousers/package.nix
diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/by-name/tr/truecrack/package.nix
similarity index 100%
rename from pkgs/tools/security/truecrack/default.nix
rename to pkgs/by-name/tr/truecrack/package.nix
diff --git a/pkgs/by-name/tr/trueseeing/package.nix b/pkgs/by-name/tr/trueseeing/package.nix
new file mode 100644
index 000000000000..2a5001a41a51
--- /dev/null
+++ b/pkgs/by-name/tr/trueseeing/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "trueseeing";
+  version = "2.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "alterakey";
+    repo = "trueseeing";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2KELqHa6lw9wdJBaC90vTZSjD7tfkr3K6yDNhqBQrR0=";
+  };
+
+  build-system = with python3.pkgs; [
+    flit-core
+  ];
+
+  pythonRelaxDeps = true;
+
+  dependencies = with python3.pkgs; [
+    aiohttp
+    asn1crypto
+    importlib-metadata
+    jinja2
+    lief
+    lxml
+    progressbar2
+    prompt-toolkit
+    pyaxmlparser
+    pypubsub
+    pyyaml
+    termcolor
+    zstandard
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "trueseeing"
+  ];
+
+  meta = {
+    description = "Non-decompiling Android vulnerability scanner";
+    homepage = "https://github.com/alterakey/trueseeing";
+    changelog = "https://github.com/alterakey/trueseeing/releases/tag/v${version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.fab ];
+    mainProgram = "trueseeing";
+  };
+}
diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix
new file mode 100644
index 000000000000..59852e783c7e
--- /dev/null
+++ b/pkgs/by-name/tr/trunk-recorder/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  git,
+  makeWrapper,
+  pkg-config,
+  boost,
+  curl,
+  gmp,
+  gnuradio,
+  gnuradioPackages,
+  hackrf,
+  mpir,
+  openssl,
+  spdlog,
+  uhd,
+  volk,
+  fdk-aac-encoder,
+  sox,
+  hackrfSupport ? true,
+}:
+stdenv.mkDerivation rec {
+  pname = "trunk-recorder";
+  version = "5.0.1";
+
+  src = fetchFromGitHub {
+    owner = "robotastic";
+    repo = "trunk-recorder";
+    rev = "v${version}";
+    hash = "sha256-d2iBCSLR3kr6rnLXO3MeGVdi6+8pqXZqW/yhxAvA1cY=";
+  };
+
+  cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
+
+  nativeBuildInputs = [
+    cmake
+    git
+    pkg-config
+    makeWrapper
+  ];
+  buildInputs = [
+    boost
+    curl
+    gmp
+    gnuradio
+    gnuradioPackages.osmosdr
+    openssl
+    spdlog
+    uhd
+    volk
+  ] ++ lib.optionals hackrfSupport [ hackrf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mpir ];
+
+  postFixup = ''
+    wrapProgram $out/bin/trunk-recorder --prefix PATH : ${
+      lib.makeBinPath [
+        sox
+        fdk-aac-encoder
+      ]
+    }
+  '';
+
+  meta = {
+    description = "Record calls from trunked radio systems";
+    homepage = "https://trunkrecorder.com/";
+    changelog = "https://github.com/robotastic/trunk-recorder/releases/tag/v${version}";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+    mainProgram = "trunk-recorder";
+  };
+}
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
new file mode 100644
index 000000000000..e82b79a07bf3
--- /dev/null
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -0,0 +1,33 @@
+{ lib,
+rustPlatform,
+fetchFromGitHub,
+pkg-config,
+openssl,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "trunk";
+  version = "0.21.1";
+
+  src = fetchFromGitHub {
+    owner = "trunk-rs";
+    repo = "trunk";
+    rev = "v${version}";
+    hash = "sha256-6EuSz7bFlL49l5gjoKCyRTfAWiwIHFdG0t+StvGj7f8=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+  # requires network
+  checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
+
+  cargoHash = "sha256-NfGDra5xHVY04CofTriCUspLY3f4Tiq6Wm9ON0K8jwY=";
+
+  meta = with lib; {
+    homepage = "https://github.com/trunk-rs/trunk";
+    description = "Build, bundle & ship your Rust WASM application to the web";
+    mainProgram = "trunk";
+    maintainers = with maintainers; [ freezeboy ctron ];
+    license = with licenses; [ asl20 ];
+  };
+}
diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/by-name/tr/trurl/package.nix
similarity index 100%
rename from pkgs/tools/networking/trurl/default.nix
rename to pkgs/by-name/tr/trurl/package.nix
diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/by-name/tr/trustymail/package.nix
similarity index 100%
rename from pkgs/tools/security/trustymail/default.nix
rename to pkgs/by-name/tr/trustymail/package.nix
diff --git a/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/pkgs/by-name/tr/trx/add_bctoolbox_ldlib.patch
similarity index 100%
rename from pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch
rename to pkgs/by-name/tr/trx/add_bctoolbox_ldlib.patch
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/by-name/tr/trx/package.nix
similarity index 100%
rename from pkgs/tools/audio/trx/default.nix
rename to pkgs/by-name/tr/trx/package.nix
diff --git a/pkgs/tools/admin/try/default.nix b/pkgs/by-name/tr/try/package.nix
similarity index 100%
rename from pkgs/tools/admin/try/default.nix
rename to pkgs/by-name/tr/try/package.nix
diff --git a/pkgs/by-name/tr/tryton/package.nix b/pkgs/by-name/tr/tryton/package.nix
new file mode 100644
index 000000000000..2da566d27760
--- /dev/null
+++ b/pkgs/by-name/tr/tryton/package.nix
@@ -0,0 +1,86 @@
+{ lib
+, python3Packages
+, fetchPypi
+, pkg-config
+, librsvg
+, gobject-introspection
+, atk
+, gtk3
+, gtkspell3
+, adwaita-icon-theme
+, glib
+, goocanvas2
+, gdk-pixbuf
+, pango
+, fontconfig
+, freetype
+, wrapGAppsHook3
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "tryton";
+  version = "7.2.6";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-dyJ+PsMUinJWYZjcwUuDLHQyB+m5AdfCR+gXfUrvjDc=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  nativeBuildInputs = [
+    pkg-config
+    gobject-introspection
+    wrapGAppsHook3
+  ];
+
+  dependencies = with python3Packages; [
+    python-dateutil
+    pygobject3
+    goocalendar
+    pycairo
+  ];
+
+  buildInputs = [
+    atk
+    gdk-pixbuf
+    glib
+    adwaita-icon-theme
+    goocanvas2
+    fontconfig
+    freetype
+    gtk3
+    gtkspell3
+    librsvg
+    pango
+  ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  strictDeps = false;
+
+  pythonImportsCheck = [ "tryton" ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Client of the Tryton application platform";
+    mainProgram = "tryton";
+    longDescription = ''
+      The client for Tryton, a three-tier high-level general purpose
+      application platform under the license GPL-3 written in Python and using
+      PostgreSQL as database engine.
+
+      It is the core base of a complete business solution providing
+      modularity, scalability and security.
+    '';
+    homepage = "http://www.tryton.org/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ johbo udono ];
+  };
+}
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/by-name/ts/ts/package.nix
similarity index 100%
rename from pkgs/tools/system/ts/default.nix
rename to pkgs/by-name/ts/ts/package.nix
diff --git a/pkgs/tools/video/tsduck/default.nix b/pkgs/by-name/ts/tsduck/package.nix
similarity index 100%
rename from pkgs/tools/video/tsduck/default.nix
rename to pkgs/by-name/ts/tsduck/package.nix
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/by-name/ts/tsocks/package.nix
similarity index 100%
rename from pkgs/development/libraries/tsocks/default.nix
rename to pkgs/by-name/ts/tsocks/package.nix
diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/by-name/ts/tsocks/poll.patch
similarity index 100%
rename from pkgs/development/libraries/tsocks/poll.patch
rename to pkgs/by-name/ts/tsocks/poll.patch
diff --git a/pkgs/applications/misc/tsukae/default.nix b/pkgs/by-name/ts/tsukae/package.nix
similarity index 100%
rename from pkgs/applications/misc/tsukae/default.nix
rename to pkgs/by-name/ts/tsukae/package.nix
diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index 7d8889079a7f..a1cf6380d0c0 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -11,26 +11,26 @@
   libepoxy,
   wrapGAppsHook4,
   makeDesktopItem,
-  copyDesktopItems,
   stdenv,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tsukimi";
-  version = "0.12.2";
+  version = "0.16.9";
 
   src = fetchFromGitHub {
     owner = "tsukinaha";
     repo = "tsukimi";
     rev = "v${version}";
-    hash = "sha256-pJ+SUNGQS/kqBdOg21GgDeZThcjnB0FhgG00qLfqxYA=";
+    hash = "sha256-SeABeXg2dpGYxGiDDwn811egRe8BYVdxK8hz7qfBagQ=";
+    fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-PCJiSyfEgK8inzoRmRvnAU50kLnyVhNrgLrwtBUFpIU=";
+  cargoHash = "sha256-o6FjBauHjdhxNXpqlJc/yNNTkRJyX3R4smAMrdFUjLA=";
 
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook4
-    copyDesktopItems
   ];
 
   buildInputs =
@@ -52,18 +52,6 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false; # tests require networking
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "Tsukimi";
-      exec = "tsukimi";
-      type = "Application";
-      icon = "tsukimi";
-      categories = [ "AudioVideo" ];
-      startupWMClass = "moe.tsuna.tsukimi";
-      desktopName = "Tsukimi";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace build.rs \
       --replace-fail 'i18n/locale' "$out/share/locale"
@@ -73,12 +61,16 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postInstall = ''
-    install -Dm644 moe.tsuna.tsukimi.gschema.xml -t $out/share/glib-2.0/schemas
+    install -Dm644 resources/moe.tsuna.tsukimi.gschema.xml -t $out/share/glib-2.0/schemas
     glib-compile-schemas $out/share/glib-2.0/schemas
 
-    install -Dm644 resources/ui/icons/tsukimi.png -t $out/share/pixmaps
+    install -Dm644 resources/icons/tsukimi.png -t $out/share/pixmaps
+
+    install -Dm644 resources/moe.tsuna.tsukimi.desktop.in $out/share/applications/moe.tsuna.tsukimi.desktop
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Simple third-party Emby client, featured with GTK4-RS, MPV and GStreamer";
     homepage = "https://github.com/tsukinaha/tsukimi";
diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/by-name/ts/tsung/package.nix
similarity index 100%
rename from pkgs/applications/networking/tsung/default.nix
rename to pkgs/by-name/ts/tsung/package.nix
diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
rename to pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix
diff --git a/pkgs/servers/tt-rss/plugin-feediron/default.nix b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/plugin-feediron/default.nix
rename to pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
rename to pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/theme-feedly/default.nix
rename to pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/by-name/tt/tt2020/package.nix
similarity index 100%
rename from pkgs/data/fonts/tt2020/default.nix
rename to pkgs/by-name/tt/tt2020/package.nix
diff --git a/pkgs/development/tools/misc/ttags/default.nix b/pkgs/by-name/tt/ttags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ttags/default.nix
rename to pkgs/by-name/tt/ttags/package.nix
diff --git a/pkgs/tools/misc/ttchat/default.nix b/pkgs/by-name/tt/ttchat/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttchat/default.nix
rename to pkgs/by-name/tt/ttchat/package.nix
diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/by-name/tt/ttdl/package.nix
similarity index 100%
rename from pkgs/applications/misc/ttdl/default.nix
rename to pkgs/by-name/tt/ttdl/package.nix
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/by-name/tt/ttf-envy-code-r/package.nix
similarity index 100%
rename from pkgs/data/fonts/ttf-envy-code-r/default.nix
rename to pkgs/by-name/tt/ttf-envy-code-r/package.nix
diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/by-name/tt/ttf-tw-moe/package.nix
similarity index 100%
rename from pkgs/data/fonts/ttf-tw-moe/default.nix
rename to pkgs/by-name/tt/ttf-tw-moe/package.nix
diff --git a/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch b/pkgs/by-name/tt/ttf2pt1/gentoo-makefile.patch
similarity index 100%
rename from pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
rename to pkgs/by-name/tt/ttf2pt1/gentoo-makefile.patch
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/by-name/tt/ttf2pt1/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttf2pt1/default.nix
rename to pkgs/by-name/tt/ttf2pt1/package.nix
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/by-name/tt/ttf_bitstream_vera/package.nix
similarity index 100%
rename from pkgs/data/fonts/ttf-bitstream-vera/default.nix
rename to pkgs/by-name/tt/ttf_bitstream_vera/package.nix
diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/by-name/tt/ttfb/package.nix
similarity index 100%
rename from pkgs/development/tools/ttfb/default.nix
rename to pkgs/by-name/tt/ttfb/package.nix
diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/by-name/tt/tthsum/package.nix
similarity index 100%
rename from pkgs/applications/misc/tthsum/default.nix
rename to pkgs/by-name/tt/tthsum/package.nix
diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/pkgs/by-name/tt/ttmkfdir/cstring.patch
similarity index 100%
rename from pkgs/tools/misc/ttmkfdir/cstring.patch
rename to pkgs/by-name/tt/ttmkfdir/cstring.patch
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/by-name/tt/ttmkfdir/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttmkfdir/default.nix
rename to pkgs/by-name/tt/ttmkfdir/package.nix
diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/by-name/tt/tts/package.nix
similarity index 100%
rename from pkgs/tools/audio/tts/default.nix
rename to pkgs/by-name/tt/tts/package.nix
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/by-name/tt/ttwatch/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttwatch/default.nix
rename to pkgs/by-name/tt/ttwatch/package.nix
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/by-name/tt/tty-clock/package.nix
similarity index 100%
rename from pkgs/tools/misc/tty-clock/default.nix
rename to pkgs/by-name/tt/tty-clock/package.nix
diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/by-name/tt/tty-share/package.nix
similarity index 100%
rename from pkgs/applications/misc/tty-share/default.nix
rename to pkgs/by-name/tt/tty-share/package.nix
diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/by-name/tt/ttyd/package.nix
similarity index 100%
rename from pkgs/servers/ttyd/default.nix
rename to pkgs/by-name/tt/ttyd/package.nix
diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/by-name/tt/ttygif/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttygif/default.nix
rename to pkgs/by-name/tt/ttygif/package.nix
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/by-name/tt/ttylog/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttylog/default.nix
rename to pkgs/by-name/tt/ttylog/package.nix
diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/by-name/tt/ttyper/package.nix
similarity index 100%
rename from pkgs/applications/misc/ttyper/default.nix
rename to pkgs/by-name/tt/ttyper/package.nix
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/by-name/tt/ttyplot/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttyplot/default.nix
rename to pkgs/by-name/tt/ttyplot/package.nix
diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/by-name/tu/tuba/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuba/default.nix
rename to pkgs/by-name/tu/tuba/package.nix
diff --git a/pkgs/tools/text/tuc/default.nix b/pkgs/by-name/tu/tuc/package.nix
similarity index 100%
rename from pkgs/tools/text/tuc/default.nix
rename to pkgs/by-name/tu/tuc/package.nix
diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix
new file mode 100644
index 000000000000..04a72a8f493b
--- /dev/null
+++ b/pkgs/by-name/tu/tuckr/package.nix
@@ -0,0 +1,26 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tuckr";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "RaphGL";
+    repo = "Tuckr";
+    rev = version;
+    hash = "sha256-JxXFz7ijCQktpYrwBA8ajvZj3gRloO/cAOo4wskF70o=";
+  };
+
+  cargoHash = "sha256-mGBsQd3yiwuAH3KHtAsLx0ai3ui2EUaf9SW+czvo9vE=";
+
+  doCheck = false; # test result: FAILED. 5 passed; 3 failed;
+
+  meta = with lib; {
+    description = "Super powered replacement for GNU Stow";
+    homepage = "https://github.com/RaphGL/Tuckr";
+    changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ mimame ];
+    mainProgram = "tuckr";
+  };
+}
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/by-name/tu/tudu/package.nix
similarity index 100%
rename from pkgs/applications/office/tudu/default.nix
rename to pkgs/by-name/tu/tudu/package.nix
diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/by-name/tu/tuhi/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuhi/default.nix
rename to pkgs/by-name/tu/tuhi/package.nix
diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/by-name/tu/tui-journal/package.nix
similarity index 100%
rename from pkgs/applications/misc/tui-journal/default.nix
rename to pkgs/by-name/tu/tui-journal/package.nix
diff --git a/pkgs/tools/networking/tuic/Cargo.lock b/pkgs/by-name/tu/tuic/Cargo.lock
similarity index 100%
rename from pkgs/tools/networking/tuic/Cargo.lock
rename to pkgs/by-name/tu/tuic/Cargo.lock
diff --git a/pkgs/tools/networking/tuic/default.nix b/pkgs/by-name/tu/tuic/package.nix
similarity index 100%
rename from pkgs/tools/networking/tuic/default.nix
rename to pkgs/by-name/tu/tuic/package.nix
diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/by-name/tu/tuir/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuir/default.nix
rename to pkgs/by-name/tu/tuir/package.nix
diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix
new file mode 100644
index 000000000000..76a045ebd204
--- /dev/null
+++ b/pkgs/by-name/tu/tuisky/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tuisky";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "sugyan";
+    repo = "tuisky";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-TsxERi+xxWk6SJwIxMgqiYCAUrDLzZXPL1xQCIXtUr0=";
+  };
+
+  cargoHash = "sha256-p6Yqg4HdkviuOuYMGEPXyySduiS47aPOshr5iXE+f+A=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "TUI client for bluesky";
+    homepage = "https://github.com/sugyan/tuisky";
+    changelog = "https://github.com/sugyan/tuisky/blob/${lib.removePrefix "refs/tags/" src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "tuisky";
+  };
+}
diff --git a/pkgs/games/tumiki-fighters/default.nix b/pkgs/by-name/tu/tumiki-fighters/package.nix
similarity index 100%
rename from pkgs/games/tumiki-fighters/default.nix
rename to pkgs/by-name/tu/tumiki-fighters/package.nix
diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/by-name/tu/tun2socks/package.nix
similarity index 100%
rename from pkgs/tools/networking/tun2socks/default.nix
rename to pkgs/by-name/tu/tun2socks/package.nix
diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/by-name/tu/tuna/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tuna/default.nix
rename to pkgs/by-name/tu/tuna/package.nix
diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/by-name/tu/tunctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tunctl/default.nix
rename to pkgs/by-name/tu/tunctl/package.nix
diff --git a/pkgs/applications/audio/tuner/default.nix b/pkgs/by-name/tu/tuner/package.nix
similarity index 100%
rename from pkgs/applications/audio/tuner/default.nix
rename to pkgs/by-name/tu/tuner/package.nix
diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix
index a24ea1b67fc6..08086fc91807 100644
--- a/pkgs/by-name/tu/tunnelgraf/package.nix
+++ b/pkgs/by-name/tu/tunnelgraf/package.nix
@@ -1,28 +1,28 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "tunnelgraf";
-  version = "0.6.1";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "denniswalker";
     repo = "tunnelgraf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CsrbSpp1VszEAKpmHx8GbB7vfZCOvB+tDFNFwWKexEw=";
+    hash = "sha256-pwHP9eAf2S08ucUawxrQvzMBJNITxbddoLzEoSNUdao=";
   };
 
   pythonRelaxDeps = [
     "click"
+    "paramiko"
     "pydantic"
   ];
 
-  build-system = with python3.pkgs; [
-    hatchling
-  ];
+  build-system = with python3.pkgs; [ hatchling ];
 
   dependencies = with python3.pkgs; [
     click
@@ -37,13 +37,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "tunnelgraf"
-  ];
+  pythonImportsCheck = [ "tunnelgraf" ];
 
   meta = with lib; {
     description = "Tool to manage SSH tunnel hops to many endpoints";
     homepage = "https://github.com/denniswalker/tunnelgraf";
+    changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "tunnelgraf";
diff --git a/pkgs/applications/gis/tunnelx/default.nix b/pkgs/by-name/tu/tunnelx/package.nix
similarity index 100%
rename from pkgs/applications/gis/tunnelx/default.nix
rename to pkgs/by-name/tu/tunnelx/package.nix
diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/by-name/tu/tuntox/package.nix
similarity index 100%
rename from pkgs/tools/networking/tuntox/default.nix
rename to pkgs/by-name/tu/tuntox/package.nix
diff --git a/pkgs/tools/networking/tunwg/default.nix b/pkgs/by-name/tu/tunwg/package.nix
similarity index 100%
rename from pkgs/tools/networking/tunwg/default.nix
rename to pkgs/by-name/tu/tunwg/package.nix
diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/by-name/tu/tuptime/package.nix
similarity index 100%
rename from pkgs/tools/system/tuptime/default.nix
rename to pkgs/by-name/tu/tuptime/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/by-name/tu/turses/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/turses/default.nix
rename to pkgs/by-name/tu/turses/package.nix
diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/by-name/tu/turso-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/turso-cli/default.nix
rename to pkgs/by-name/tu/turso-cli/package.nix
diff --git a/pkgs/development/tools/build-managers/turtle-build/default.nix b/pkgs/by-name/tu/turtle-build/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/turtle-build/default.nix
rename to pkgs/by-name/tu/turtle-build/package.nix
diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/by-name/tu/tusk/package.nix
similarity index 100%
rename from pkgs/applications/office/tusk/default.nix
rename to pkgs/by-name/tu/tusk/package.nix
diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/by-name/tu/tut/package.nix
similarity index 100%
rename from pkgs/applications/misc/tut/default.nix
rename to pkgs/by-name/tu/tut/package.nix
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
new file mode 100644
index 000000000000..95357df6af97
--- /dev/null
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -0,0 +1,44 @@
+{ lib
+, appimageTools
+, fetchurl
+, gitUpdater
+}:
+
+appimageTools.wrapType2 rec {
+  pname = "tutanota-desktop";
+  version = "250.241025.0";
+
+  src = fetchurl {
+    url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
+    hash = "sha256-PhcrDjqRmR1NVBLVCuj5dcc+WskWeZ9dJXdtOUveyL0=";
+  };
+
+  extraPkgs = pkgs: [ pkgs.libsecret ];
+
+  extraInstallCommands =
+    let appimageContents = appimageTools.extract { inherit pname version src; };
+    in ''
+      install -Dm 444 ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications
+      install -Dm 444 ${appimageContents}/tutanota-desktop.png -t $out/share/pixmaps
+
+      substituteInPlace $out/share/applications/tutanota-desktop.desktop \
+        --replace 'Exec=AppRun' 'Exec=${pname}'
+    '';
+
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/tutao/tutanota";
+    rev-prefix = "tutanota-desktop-release-";
+    allowedVersions = ".+\\.[0-9]{6}\\..+";
+  };
+
+  meta = with lib; {
+    description = "Tuta official desktop client";
+    homepage = "https://tuta.com/";
+    changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}";
+    license = licenses.gpl3Only;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = [ ];
+    mainProgram = "tutanota-desktop";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/os-specific/linux/tuxedo-rs/default.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tuxedo-rs/default.nix
rename to pkgs/by-name/tu/tuxedo-rs/package.nix
diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix
index d3399471a75a..e8df3929fc6f 100644
--- a/pkgs/by-name/tu/tuxguitar/package.nix
+++ b/pkgs/by-name/tu/tuxguitar/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       TuxGuitar is a multitrack guitar tablature editor and player written
       in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files.
     '';
-    homepage = "http://www.tuxguitar.com.ar/";
+    homepage = "https://github.com/helge17/tuxguitar";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.lgpl2;
     maintainers = with lib.maintainers; [ ardumont ];
diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/by-name/tu/tuxpaint/package.nix
similarity index 100%
rename from pkgs/games/tuxpaint/default.nix
rename to pkgs/by-name/tu/tuxpaint/package.nix
diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff
similarity index 100%
rename from pkgs/games/tuxpaint/tuxpaint-completion.diff
rename to pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff
diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/by-name/tu/tuxtype/package.nix
similarity index 100%
rename from pkgs/games/tuxtype/default.nix
rename to pkgs/by-name/tu/tuxtype/package.nix
diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/by-name/tv/tv/package.nix
similarity index 100%
rename from pkgs/tools/text/tv/default.nix
rename to pkgs/by-name/tv/tv/package.nix
diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/by-name/tv/tvbrowser/package.nix
similarity index 100%
rename from pkgs/applications/misc/tvbrowser/default.nix
rename to pkgs/by-name/tv/tvbrowser/package.nix
diff --git a/pkgs/applications/misc/tvbrowser/test.nix b/pkgs/by-name/tv/tvbrowser/test.nix
similarity index 100%
rename from pkgs/applications/misc/tvbrowser/test.nix
rename to pkgs/by-name/tv/tvbrowser/test.nix
diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/by-name/tv/tvm/package.nix
similarity index 100%
rename from pkgs/development/compilers/tvm/default.nix
rename to pkgs/by-name/tv/tvm/package.nix
diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/by-name/tv/tvnamer/package.nix
similarity index 100%
rename from pkgs/tools/misc/tvnamer/default.nix
rename to pkgs/by-name/tv/tvnamer/package.nix
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/by-name/tw/twa/package.nix
similarity index 100%
rename from pkgs/tools/networking/twa/default.nix
rename to pkgs/by-name/tw/twa/package.nix
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/by-name/tw/tweak/package.nix
similarity index 100%
rename from pkgs/applications/editors/tweak/default.nix
rename to pkgs/by-name/tw/tweak/package.nix
diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/by-name/tw/tweeny/package.nix
similarity index 100%
rename from pkgs/development/libraries/tweeny/default.nix
rename to pkgs/by-name/tw/tweeny/package.nix
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/by-name/tw/twelf/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/twelf/default.nix
rename to pkgs/by-name/tw/twelf/package.nix
diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
new file mode 100644
index 000000000000..ca1ecd8f8bf9
--- /dev/null
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "twemoji-color-font";
+  version = "15.1.0";
+
+  # We fetch the prebuilt font because building it takes 1.5 hours on hydra.
+  # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
+  src = fetchurl {
+    url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
+    install -Dm644 fontconfig/46-twemoji-color.conf $out/etc/fonts/conf.d/46-twemoji-color.conf
+  '';
+
+  meta = with lib; {
+    description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
+    longDescription = ''
+      A color and B&W emoji SVGinOT font built from the Twitter Emoji for
+      Everyone artwork with support for ZWJ, skin tone diversity and country
+      flags.
+
+      The font works in all operating systems, but will currently only show
+      color emoji in Firefox, Thunderbird, Photoshop CC 2017, and Windows Edge
+      V38.14393+. This is not a limitation of the font, but of the operating
+      systems and applications. Regular B&W outline emoji are included for
+      backwards/fallback compatibility.
+    '';
+    homepage = "https://github.com/eosrei/twemoji-color-font";
+    downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
+    license = with licenses; [ cc-by-40 mit ];
+    maintainers = [ maintainers.fgaz ];
+  };
+})
diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/by-name/tw/twilio-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/twilio-cli/default.nix
rename to pkgs/by-name/tw/twilio-cli/package.nix
diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/by-name/tw/twingate/package.nix
similarity index 100%
rename from pkgs/applications/networking/twingate/default.nix
rename to pkgs/by-name/tw/twingate/package.nix
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix
similarity index 100%
rename from pkgs/data/fonts/twitter-color-emoji/default.nix
rename to pkgs/by-name/tw/twitter-color-emoji/package.nix
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/by-name/tw/twitterBootstrap/package.nix
similarity index 100%
rename from pkgs/development/web/twitter-bootstrap/default.nix
rename to pkgs/by-name/tw/twitterBootstrap/package.nix
diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/by-name/tw/twspace-crawler/package.nix
similarity index 100%
rename from pkgs/tools/misc/twspace-crawler/default.nix
rename to pkgs/by-name/tw/twspace-crawler/package.nix
diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/by-name/tw/twspace-dl/package.nix
similarity index 100%
rename from pkgs/tools/misc/twspace-dl/default.nix
rename to pkgs/by-name/tw/twspace-dl/package.nix
diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/by-name/tx/txt2man/package.nix
similarity index 100%
rename from pkgs/tools/misc/txt2man/default.nix
rename to pkgs/by-name/tx/txt2man/package.nix
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/by-name/tx/txt2tags/package.nix
similarity index 100%
rename from pkgs/tools/text/txt2tags/default.nix
rename to pkgs/by-name/tx/txt2tags/package.nix
diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/by-name/tx/txtw/package.nix
similarity index 100%
rename from pkgs/tools/misc/txtw/default.nix
rename to pkgs/by-name/tx/txtw/package.nix
diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/by-name/ty/tydra/package.nix
similarity index 100%
rename from pkgs/tools/misc/tydra/default.nix
rename to pkgs/by-name/ty/tydra/package.nix
diff --git a/pkgs/by-name/ty/tygo/package.nix b/pkgs/by-name/ty/tygo/package.nix
new file mode 100644
index 000000000000..10a8ae2c9333
--- /dev/null
+++ b/pkgs/by-name/ty/tygo/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "tygo";
+  version = "0.2.17";
+
+  src = fetchFromGitHub {
+    owner = "gzuidhof";
+    repo = "tygo";
+    rev = "v${version}";
+    hash = "sha256-yaXS+DS/xeIQXhn3L6x2lp/xu4OxrBqr5wKVbADhZkU=";
+  };
+
+  vendorHash = "sha256-E73yqGhPzZA/1xTYGvTBy0/b4SE9hzx+gdhjX3ClE/Y=";
+
+  CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-extldflags -static"
+  ];
+
+  meta = {
+    description = "Generate Typescript types from Golang source code";
+    homepage = "https://github.com/gzuidhof/tygo";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ alexymantha ];
+    mainProgram = "tygo";
+  };
+}
diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/by-name/ty/tym/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/tym/default.nix
rename to pkgs/by-name/ty/tym/package.nix
diff --git a/pkgs/applications/misc/typer/default.nix b/pkgs/by-name/ty/typer/package.nix
similarity index 100%
rename from pkgs/applications/misc/typer/default.nix
rename to pkgs/by-name/ty/typer/package.nix
diff --git a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch b/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
similarity index 100%
rename from pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch
rename to pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/by-name/ty/typescript/package.nix
similarity index 100%
rename from pkgs/development/compilers/typescript/default.nix
rename to pkgs/by-name/ty/typescript/package.nix
diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/by-name/ty/typeshare/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/typeshare/default.nix
rename to pkgs/by-name/ty/typeshare/package.nix
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/by-name/ty/typespeed/package.nix
similarity index 100%
rename from pkgs/games/typespeed/default.nix
rename to pkgs/by-name/ty/typespeed/package.nix
diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/by-name/ty/typespeed/typespeed-config-in-home.patch
similarity index 100%
rename from pkgs/games/typespeed/typespeed-config-in-home.patch
rename to pkgs/by-name/ty/typespeed/typespeed-config-in-home.patch
diff --git a/pkgs/development/tools/misc/typical/default.nix b/pkgs/by-name/ty/typical/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/typical/default.nix
rename to pkgs/by-name/ty/typical/package.nix
diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/by-name/ty/typioca/package.nix
similarity index 100%
rename from pkgs/applications/misc/typioca/default.nix
rename to pkgs/by-name/ty/typioca/package.nix
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/by-name/ty/typora/package.nix
similarity index 100%
rename from pkgs/applications/editors/typora/default.nix
rename to pkgs/by-name/ty/typora/package.nix
diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 748e18ae23e0..8d8b04efa006 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.27";
+  version = "0.1.30";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WiU6SRhW7LBDFJ/6qv0X/H86FiTYadN02iyi87oQRBY=";
+    hash = "sha256-MnN7cMbvQef3UEQzsrH6i0O+f1nnfHJVI8O8NmBUpuo=";
   };
 
-  cargoHash = "sha256-v9CwoLfqww5UNsVONAWb2D9F/ljq/YXTCCjrJaJWENE=";
+  cargoHash = "sha256-F9e6GLWcZNJZo2kc8f2o1tCvv0JeAJnmltAuSTqQKwY=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index 9415daee69ca..5e9167ac2fd0 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/typst/typst/releases/tag/${src.rev}";
+    changelog = "https://github.com/typst/typst/releases/tag/v${version}";
     description = "New markup-based typesetting system that is powerful and easy to learn";
     homepage = "https://github.com/typst/typst";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/ty/typstyle/Cargo.lock b/pkgs/by-name/ty/typstyle/Cargo.lock
index 95e6754fefa7..e56057a5e1dc 100644
--- a/pkgs/by-name/ty/typstyle/Cargo.lock
+++ b/pkgs/by-name/ty/typstyle/Cargo.lock
@@ -3915,7 +3915,7 @@ dependencies = [
 
 [[package]]
 name = "typstyle"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
  "anyhow",
  "clap",
diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index cbd73dfc8ef7..665bb01daf05 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -2,24 +2,19 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  pkg-config,
-  libgit2,
-  zlib,
-  stdenv,
-  darwin,
   nix-update-script,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "typstyle";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jrhxOtaawZ2vCiK8BQ9G09HTC5F6cnEK/Ji567xYfXw=";
+    hash = "sha256-liGGnaUhi3/d4SxpiG/P1wp89brqUJaLyo9/KJvPf9I=";
   };
 
   cargoLock = {
@@ -29,22 +24,6 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs =
-    [
-      libgit2
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.CoreFoundation
-      darwin.apple_sdk.frameworks.CoreServices
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.SystemConfiguration
-    ];
-
   # Disabling tests requiring network access
   checkFlags = [
     "--skip=e2e"
diff --git a/pkgs/by-name/ty/tyson/package.nix b/pkgs/by-name/ty/tyson/package.nix
new file mode 100644
index 000000000000..ace33ac47201
--- /dev/null
+++ b/pkgs/by-name/ty/tyson/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+buildGoModule rec {
+  pname = "tyson";
+  version = "0.1.1-unstable-2024-04-10";
+
+  src = fetchFromGitHub {
+    owner = "jetpack-io";
+    repo = "tyson";
+    rev = "d6b38819db9b260928b29f4d39bf4c72841c6a01";
+    hash = "sha256-NoQJBEedV3NDNQ4PVvvjjsO7N+rq40LWKp962P+naEY=";
+  };
+
+  vendorHash = "sha256-kJIfKgVaHuCYvvTZXyuZ/Hg8z1BlW4oW6+5s1inFizg=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd tyson \
+      --bash <($out/bin/tyson completion bash) \
+      --fish <($out/bin/tyson completion fish) \
+      --zsh <($out/bin/tyson completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "TypeScript as a configuration language";
+    mainProgram = "tyson";
+    homepage = "https://github.com/jetify-com/tyson";
+    changelog = "https://github.com/jetify-com/tyson/releases/tag/${src.rev}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/by-name/tz/tz/package.nix
similarity index 100%
rename from pkgs/tools/misc/tz/default.nix
rename to pkgs/by-name/tz/tz/package.nix
diff --git a/pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch b/pkgs/by-name/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
similarity index 100%
rename from pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
rename to pkgs/by-name/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/by-name/tz/tzdata/package.nix
similarity index 100%
rename from pkgs/data/misc/tzdata/default.nix
rename to pkgs/by-name/tz/tzdata/package.nix
diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/by-name/tz/tzdata/tzdata-setup-hook.sh
similarity index 100%
rename from pkgs/data/misc/tzdata/tzdata-setup-hook.sh
rename to pkgs/by-name/tz/tzdata/tzdata-setup-hook.sh
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/by-name/tz/tzupdate/package.nix
similarity index 100%
rename from pkgs/applications/misc/tzupdate/default.nix
rename to pkgs/by-name/tz/tzupdate/package.nix
diff --git a/pkgs/data/fonts/u001/default.nix b/pkgs/by-name/u0/u001-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/u001/default.nix
rename to pkgs/by-name/u0/u001-font/package.nix
diff --git a/pkgs/tools/text/u2ps/default.nix b/pkgs/by-name/u2/u2ps/package.nix
similarity index 100%
rename from pkgs/tools/text/u2ps/default.nix
rename to pkgs/by-name/u2/u2ps/package.nix
diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/by-name/u3/u3-tool/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/u3-tool/default.nix
rename to pkgs/by-name/u3/u3-tool/package.nix
diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/by-name/u9/u9fs/package.nix
similarity index 100%
rename from pkgs/servers/u9fs/default.nix
rename to pkgs/by-name/u9/u9fs/package.nix
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/by-name/ua/ua/package.nix
similarity index 100%
rename from pkgs/tools/networking/ua/default.nix
rename to pkgs/by-name/ua/ua/package.nix
diff --git a/pkgs/tools/admin/uacme/default.nix b/pkgs/by-name/ua/uacme/package.nix
similarity index 100%
rename from pkgs/tools/admin/uacme/default.nix
rename to pkgs/by-name/ua/uacme/package.nix
diff --git a/pkgs/applications/audio/uade/default.nix b/pkgs/by-name/ua/uade/package.nix
similarity index 100%
rename from pkgs/applications/audio/uade/default.nix
rename to pkgs/by-name/ua/uade/package.nix
diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/by-name/ua/uae/package.nix
similarity index 100%
rename from pkgs/applications/emulators/uae/default.nix
rename to pkgs/by-name/ua/uae/package.nix
diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/by-name/ua/uair/package.nix
similarity index 100%
rename from pkgs/tools/misc/uair/default.nix
rename to pkgs/by-name/ua/uair/package.nix
diff --git a/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/pkgs/by-name/ua/uarmsolver/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/uarmsolver/default.nix
rename to pkgs/by-name/ua/uarmsolver/package.nix
diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/by-name/ua/uasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/uasm/default.nix
rename to pkgs/by-name/ua/uasm/package.nix
diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/by-name/ub/ubertooth/package.nix
similarity index 100%
rename from pkgs/applications/radio/ubertooth/default.nix
rename to pkgs/by-name/ub/ubertooth/package.nix
diff --git a/pkgs/tools/filesystems/ubi_reader/default.nix b/pkgs/by-name/ub/ubi_reader/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ubi_reader/default.nix
rename to pkgs/by-name/ub/ubi_reader/package.nix
diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/by-name/ub/ubuntu-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/ubuntu-themes/default.nix
rename to pkgs/by-name/ub/ubuntu-themes/package.nix
diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/by-name/ub/ubus/package.nix
similarity index 100%
rename from pkgs/development/libraries/ubus/default.nix
rename to pkgs/by-name/ub/ubus/package.nix
diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/by-name/uc/ucarp/package.nix
similarity index 100%
rename from pkgs/servers/ucarp/default.nix
rename to pkgs/by-name/uc/ucarp/package.nix
diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/by-name/uc/ucc/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucc/default.nix
rename to pkgs/by-name/uc/ucc/package.nix
diff --git a/pkgs/games/uchess/default.nix b/pkgs/by-name/uc/uchess/package.nix
similarity index 100%
rename from pkgs/games/uchess/default.nix
rename to pkgs/by-name/uc/uchess/package.nix
diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/by-name/uc/uci/package.nix
similarity index 100%
rename from pkgs/development/libraries/uci/default.nix
rename to pkgs/by-name/uc/uci/package.nix
diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/by-name/uc/ucl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucl/default.nix
rename to pkgs/by-name/uc/ucl/package.nix
diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/by-name/uc/uclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/uclient/default.nix
rename to pkgs/by-name/uc/uclient/package.nix
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/by-name/uc/ucommon/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucommon/default.nix
rename to pkgs/by-name/uc/ucommon/package.nix
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/by-name/uc/ucs-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/ucs-fonts/default.nix
rename to pkgs/by-name/uc/ucs-fonts/package.nix
diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/by-name/uc/ucspi-tcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ucspi-tcp/default.nix
rename to pkgs/by-name/uc/ucspi-tcp/package.nix
diff --git a/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch b/pkgs/by-name/uc/ucspi-tcp/remove-setuid.patch
similarity index 100%
rename from pkgs/tools/networking/ucspi-tcp/remove-setuid.patch
rename to pkgs/by-name/uc/ucspi-tcp/remove-setuid.patch
diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/by-name/uc/ucx/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucx/default.nix
rename to pkgs/by-name/uc/ucx/package.nix
diff --git a/pkgs/tools/security/uddup/default.nix b/pkgs/by-name/ud/uddup/package.nix
similarity index 100%
rename from pkgs/tools/security/uddup/default.nix
rename to pkgs/by-name/ud/uddup/package.nix
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/by-name/ud/udftools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/udftools/default.nix
rename to pkgs/by-name/ud/udftools/package.nix
diff --git a/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch b/pkgs/by-name/ud/udict/0001-update-version-in-lock-file.patch
similarity index 100%
rename from pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch
rename to pkgs/by-name/ud/udict/0001-update-version-in-lock-file.patch
diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/by-name/ud/udict/package.nix
similarity index 100%
rename from pkgs/applications/misc/udict/default.nix
rename to pkgs/by-name/ud/udict/package.nix
diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/by-name/ud/udig/package.nix
similarity index 100%
rename from pkgs/applications/gis/udig/default.nix
rename to pkgs/by-name/ud/udig/package.nix
diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/by-name/ud/udis86/package.nix
similarity index 100%
rename from pkgs/development/tools/udis86/default.nix
rename to pkgs/by-name/ud/udis86/package.nix
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/by-name/ud/udns/package.nix
similarity index 100%
rename from pkgs/development/libraries/udns/default.nix
rename to pkgs/by-name/ud/udns/package.nix
diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/by-name/ud/udocker/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/udocker/default.nix
rename to pkgs/by-name/ud/udocker/package.nix
diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/by-name/ud/udp2raw/package.nix
similarity index 100%
rename from pkgs/tools/networking/udp2raw/default.nix
rename to pkgs/by-name/ud/udp2raw/package.nix
diff --git a/pkgs/tools/networking/udpreplay/default.nix b/pkgs/by-name/ud/udpreplay/package.nix
similarity index 100%
rename from pkgs/tools/networking/udpreplay/default.nix
rename to pkgs/by-name/ud/udpreplay/package.nix
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/by-name/ud/udpt/package.nix
similarity index 100%
rename from pkgs/servers/udpt/default.nix
rename to pkgs/by-name/ud/udpt/package.nix
diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/by-name/ud/udptunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/udptunnel/default.nix
rename to pkgs/by-name/ud/udptunnel/package.nix
diff --git a/pkgs/tools/security/udpx/default.nix b/pkgs/by-name/ud/udpx/package.nix
similarity index 100%
rename from pkgs/tools/security/udpx/default.nix
rename to pkgs/by-name/ud/udpx/package.nix
diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/by-name/ue/uefi-run/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/uefi-run/default.nix
rename to pkgs/by-name/ue/uefi-run/package.nix
diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix
new file mode 100644
index 000000000000..ce4d23fb138d
--- /dev/null
+++ b/pkgs/by-name/ue/uesave/package.nix
@@ -0,0 +1,32 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "uesave";
+  version = "0.5.0";
+  src = fetchFromGitHub {
+    owner = "trumank";
+    repo = "uesave-rs";
+    rev = "v${version}";
+    hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI=";
+  };
+
+  cargoHash = "sha256-U6RzSS2j6FK70OHlmWmHZZYT3UB0+Hi+uLofLy+XtGQ=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+
+  meta = {
+    maintainers = with lib.maintainers; [ xddxdd ];
+    description = "Reading and writing Unreal Engine save files (commonly referred to as GVAS)";
+    homepage = "https://github.com/trumank/uesave-rs";
+    license = lib.licenses.mit;
+    mainProgram = "uesave";
+  };
+}
diff --git a/pkgs/tools/system/ufiformat/default.nix b/pkgs/by-name/uf/ufiformat/package.nix
similarity index 100%
rename from pkgs/tools/system/ufiformat/default.nix
rename to pkgs/by-name/uf/ufiformat/package.nix
diff --git a/pkgs/games/ufoai/default.nix b/pkgs/by-name/uf/ufoai/package.nix
similarity index 100%
rename from pkgs/games/ufoai/default.nix
rename to pkgs/by-name/uf/ufoai/package.nix
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/by-name/uf/uftp/package.nix
similarity index 100%
rename from pkgs/servers/uftp/default.nix
rename to pkgs/by-name/uf/uftp/package.nix
diff --git a/pkgs/servers/ftp/uftpd/default.nix b/pkgs/by-name/uf/uftpd/package.nix
similarity index 100%
rename from pkgs/servers/ftp/uftpd/default.nix
rename to pkgs/by-name/uf/uftpd/package.nix
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/by-name/uf/uftrace/package.nix
similarity index 100%
rename from pkgs/development/tools/uftrace/default.nix
rename to pkgs/by-name/uf/uftrace/package.nix
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/by-name/ug/uget-integrator/package.nix
similarity index 100%
rename from pkgs/tools/networking/uget-integrator/default.nix
rename to pkgs/by-name/ug/uget-integrator/package.nix
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/by-name/ug/uget/package.nix
similarity index 100%
rename from pkgs/tools/networking/uget/default.nix
rename to pkgs/by-name/ug/uget/package.nix
diff --git a/pkgs/by-name/ug/ugit/package.nix b/pkgs/by-name/ug/ugit/package.nix
new file mode 100644
index 000000000000..067a70cbf8d9
--- /dev/null
+++ b/pkgs/by-name/ug/ugit/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  git,
+  fzf,
+  bash,
+  ncurses,
+  curl,
+  nix-update-script,
+  testers,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "ugit";
+  version = "5.8";
+
+  src = fetchFromGitHub {
+    owner = "Bhupesh-V";
+    repo = "ugit";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-WnEyS2JKH6rrsYOeGEwughWq2LKrHPSjio3TOI0Xm4g=";
+  };
+
+  strictDeps = true;
+  doInstallCheck = true;
+
+  buildInputs = [
+    fzf
+    curl
+    bash
+    ncurses
+  ];
+
+  propagatedBuildInputs = [ git ];
+  nativeInstallCheckInputs = [ ncurses ];
+
+  postPatch = ''
+    substituteInPlace ugit \
+      --replace-fail "fzf " "${lib.getExe fzf} " \
+      --replace-fail "curl" "${lib.getExe curl}" \
+      --replace-fail "tput " "${ncurses}/bin/tput "
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 ugit $out/bin/ugit
+    ln -s $out/bin/ugit $out/bin/git-undo
+    install -Dm644 ugit.plugin.zsh $out/share/zsh/ugit/ugit.zsh
+
+    runHook postInstall
+  '';
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    PATH=$PATH:$out/bin ugit --help
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Tool that helps undoing the last git command with grace";
+    homepage = "https://github.com/Bhupesh-V/ugit";
+    downloadPage = "https://github.com/Bhupesh-V/ugit/releases";
+    license = lib.licenses.mit;
+    mainProgram = "ugit";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ d-brasher ];
+  };
+})
diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/by-name/ug/ugrep/package.nix
similarity index 100%
rename from pkgs/tools/text/ugrep/default.nix
rename to pkgs/by-name/ug/ugrep/package.nix
diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/by-name/ug/ugs/package.nix
similarity index 100%
rename from pkgs/tools/misc/ugs/default.nix
rename to pkgs/by-name/ug/ugs/package.nix
diff --git a/pkgs/tools/misc/ugtrain/default.nix b/pkgs/by-name/ug/ugtrain/package.nix
similarity index 100%
rename from pkgs/tools/misc/ugtrain/default.nix
rename to pkgs/by-name/ug/ugtrain/package.nix
diff --git a/pkgs/by-name/uh/uhdm/package.nix b/pkgs/by-name/uh/uhdm/package.nix
new file mode 100644
index 000000000000..eb078d482732
--- /dev/null
+++ b/pkgs/by-name/uh/uhdm/package.nix
@@ -0,0 +1,51 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+, capnproto
+, gtest
+, darwin
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "UHDM";
+  # When updating this package, also consider updating science/logic/surelog
+  version = "1.83";
+
+  src = fetchFromGitHub {
+    owner = "chipsalliance";
+    repo = "UHDM";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok=";
+    fetchSubmodules = false;  # we use all dependencies from nix
+  };
+
+  nativeBuildInputs = [
+    cmake
+    (python3.withPackages (p: with p; [ orderedmultidict ]))
+    gtest
+  ];
+
+  buildInputs = [
+    capnproto
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.libutil
+  ];
+
+  cmakeFlags = [
+    "-DUHDM_USE_HOST_GTEST=On"
+    "-DUHDM_USE_HOST_CAPNP=On"
+  ];
+
+  doCheck = true;
+  checkPhase = "make test";
+
+  meta = {
+    description = "Universal Hardware Data Model";
+    homepage = "https://github.com/chipsalliance/UHDM";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/by-name/uh/uhexen2/package.nix
similarity index 100%
rename from pkgs/games/uhexen2/default.nix
rename to pkgs/by-name/uh/uhexen2/package.nix
diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix
new file mode 100644
index 000000000000..d2a4078a8957
--- /dev/null
+++ b/pkgs/by-name/uh/uhk-agent/package.nix
@@ -0,0 +1,78 @@
+{ lib
+, stdenv
+, stdenvNoCC
+, fetchurl
+, appimageTools
+, electron
+, makeWrapper
+, asar
+, autoPatchelfHook
+, libusb1
+}:
+
+let
+  pname = "uhk-agent";
+  version = "4.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
+    name = "${pname}-${version}.AppImage";
+    sha256 = "sha256-5VzUSuq+yc8HXSILMg24w/hbwasf4jq0H0wte9Mw+nY=";
+  };
+
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
+  };
+in
+stdenvNoCC.mkDerivation {
+  inherit pname version src;
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [
+    asar
+    makeWrapper
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    libusb1
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libc.musl-x86_64.so.1"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"/{opt,share/applications}
+
+    cp -r --no-preserve=mode "${appimageContents}/resources"        "$out/opt/${pname}"
+    cp -r --no-preserve=mode "${appimageContents}/usr/share/icons"  "$out/share/icons"
+    cp -r --no-preserve=mode "${appimageContents}/${pname}.desktop" "$out/share/applications/${pname}.desktop"
+
+    substituteInPlace "$out/share/applications/${pname}.desktop" \
+      --replace "Exec=AppRun" "Exec=${pname}"
+
+    asar extract "$out/opt/${pname}/app.asar" "$out/opt/${pname}/app.asar.unpacked"
+    rm           "$out/opt/${pname}/app.asar"
+
+    makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \
+      --add-flags "$out/opt/${pname}/app.asar.unpacked" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Agent is the configuration application of the Ultimate Hacking Keyboard";
+    homepage = "https://github.com/UltimateHackingKeyboard/agent";
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ ngiger nickcao ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/pkgs/by-name/uh/uhk-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/uhk-udev-rules/default.nix
rename to pkgs/by-name/uh/uhk-udev-rules/package.nix
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/by-name/uh/uhttpmock/package.nix
similarity index 100%
rename from pkgs/development/libraries/uhttpmock/default.nix
rename to pkgs/by-name/uh/uhttpmock/package.nix
diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
index 1cc16f96eb5e..755e7a18d5ce 100644
--- a/pkgs/by-name/uh/uhttpmock_1_0/package.nix
+++ b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uhttpmock";
-  version = "0.10.0";
+  version = "0.11.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pwithnall";
     repo = "uhttpmock";
     rev = finalAttrs.version;
-    hash = "sha256-d3IVlPOLOLzlUDuGOLll8pOK5FMsXI/d2wbwPZ6WI34=";
+    hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4=";
   };
 
   strictDeps = true;
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/by-name/uh/uhub/package.nix
similarity index 100%
rename from pkgs/servers/uhub/default.nix
rename to pkgs/by-name/uh/uhub/package.nix
diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/by-name/uh/uhubctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/uhubctl/default.nix
rename to pkgs/by-name/uh/uhubctl/package.nix
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/by-name/ui/uid_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/uid_wrapper/default.nix
rename to pkgs/by-name/ui/uid_wrapper/package.nix
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/by-name/ui/uif2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/uif2iso/default.nix
rename to pkgs/by-name/ui/uif2iso/package.nix
diff --git a/pkgs/development/embedded/uisp/default.nix b/pkgs/by-name/ui/uisp/package.nix
similarity index 100%
rename from pkgs/development/embedded/uisp/default.nix
rename to pkgs/by-name/ui/uisp/package.nix
diff --git a/pkgs/applications/editors/uivonim/default.nix b/pkgs/by-name/ui/uivonim/package.nix
similarity index 100%
rename from pkgs/applications/editors/uivonim/default.nix
rename to pkgs/by-name/ui/uivonim/package.nix
diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/by-name/uk/ukmm/Cargo.lock
similarity index 100%
rename from pkgs/tools/games/ukmm/Cargo.lock
rename to pkgs/by-name/uk/ukmm/Cargo.lock
diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/by-name/uk/ukmm/package.nix
similarity index 100%
rename from pkgs/tools/games/ukmm/default.nix
rename to pkgs/by-name/uk/ukmm/package.nix
diff --git a/pkgs/applications/misc/ulauncher/fix-extensions.patch b/pkgs/by-name/ul/ulauncher/fix-extensions.patch
similarity index 100%
rename from pkgs/applications/misc/ulauncher/fix-extensions.patch
rename to pkgs/by-name/ul/ulauncher/fix-extensions.patch
diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/pkgs/by-name/ul/ulauncher/fix-path.patch
similarity index 100%
rename from pkgs/applications/misc/ulauncher/fix-path.patch
rename to pkgs/by-name/ul/ulauncher/fix-path.patch
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/by-name/ul/ulauncher/package.nix
similarity index 100%
rename from pkgs/applications/misc/ulauncher/default.nix
rename to pkgs/by-name/ul/ulauncher/package.nix
diff --git a/pkgs/tools/misc/ulid/default.nix b/pkgs/by-name/ul/ulid/package.nix
similarity index 100%
rename from pkgs/tools/misc/ulid/default.nix
rename to pkgs/by-name/ul/ulid/package.nix
diff --git a/pkgs/os-specific/linux/ulogd/default.nix b/pkgs/by-name/ul/ulogd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ulogd/default.nix
rename to pkgs/by-name/ul/ulogd/package.nix
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/by-name/ul/ultimate-oldschool-pc-font-pack/package.nix
similarity index 100%
rename from pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
rename to pkgs/by-name/ul/ultimate-oldschool-pc-font-pack/package.nix
diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/by-name/ul/ultimatestunts/package.nix
similarity index 100%
rename from pkgs/games/ultimatestunts/default.nix
rename to pkgs/by-name/ul/ultimatestunts/package.nix
diff --git a/pkgs/os-specific/linux/ultrablue-server/default.nix b/pkgs/by-name/ul/ultrablue-server/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ultrablue-server/default.nix
rename to pkgs/by-name/ul/ultrablue-server/package.nix
diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/by-name/ul/ultralist/package.nix
similarity index 100%
rename from pkgs/applications/misc/ultralist/default.nix
rename to pkgs/by-name/ul/ultralist/package.nix
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
new file mode 100644
index 000000000000..1a8187f7f0e3
--- /dev/null
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -0,0 +1,67 @@
+{ lib, stdenv
+, autoreconfHook
+, fetchFromGitHub
+, pkg-config
+, lua
+, fpc
+, pcre
+, portaudio
+, freetype
+, libpng
+, SDL2
+, SDL2_image
+, SDL2_gfx
+, SDL2_mixer
+, SDL2_net, SDL2_ttf
+, ffmpeg
+, sqlite
+, zlib
+, libX11
+, libGLU
+, libGL
+}:
+
+let
+  sharedLibs = [
+    pcre portaudio freetype
+    SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
+    sqlite lua zlib libX11 libGLU libGL ffmpeg
+  ];
+
+in stdenv.mkDerivation rec {
+  pname = "ultrastardx";
+  version = "2024.10.0";
+
+  src = fetchFromGitHub {
+    owner = "UltraStar-Deluxe";
+    repo = "USDX";
+    rev = "v${version}";
+    hash = "sha256-X5LixPRAI7A8Ns3D2A24T05w0iHag1EJVqt0aW1ZBps=";
+  };
+
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
+  buildInputs = [ fpc libpng ] ++ sharedLibs;
+
+  postPatch = ''
+    substituteInPlace src/config.inc.in \
+      --subst-var-by libpcre_LIBNAME libpcre.so.1
+  '';
+
+  preBuild =
+    let items = lib.concatMapStringsSep " " (x: "-rpath ${lib.getLib x}/lib") sharedLibs;
+    in ''
+      export NIX_LDFLAGS="$NIX_LDFLAGS ${items}"
+    '';
+
+  # dlopened libgcc requires the rpath not to be shrinked
+  dontPatchELF = true;
+
+  meta = with lib; {
+    homepage = "https://usdx.eu/";
+    description = "Free and open source karaoke game";
+    mainProgram = "ultrastardx";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ Profpatsch ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/by-name/um/umlet/package.nix
similarity index 100%
rename from pkgs/tools/misc/umlet/default.nix
rename to pkgs/by-name/um/umlet/package.nix
diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/by-name/um/umoci/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/umoci/default.nix
rename to pkgs/by-name/um/umoci/package.nix
diff --git a/pkgs/development/libraries/umockdev/hardcode-paths.patch b/pkgs/by-name/um/umockdev/hardcode-paths.patch
similarity index 100%
rename from pkgs/development/libraries/umockdev/hardcode-paths.patch
rename to pkgs/by-name/um/umockdev/hardcode-paths.patch
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/by-name/um/umockdev/package.nix
similarity index 100%
rename from pkgs/development/libraries/umockdev/default.nix
rename to pkgs/by-name/um/umockdev/package.nix
diff --git a/pkgs/development/libraries/umockdev/substitute-udevadm.patch b/pkgs/by-name/um/umockdev/substitute-udevadm.patch
similarity index 100%
rename from pkgs/development/libraries/umockdev/substitute-udevadm.patch
rename to pkgs/by-name/um/umockdev/substitute-udevadm.patch
diff --git a/pkgs/games/umoria/default.nix b/pkgs/by-name/um/umoria/package.nix
similarity index 100%
rename from pkgs/games/umoria/default.nix
rename to pkgs/by-name/um/umoria/package.nix
diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/by-name/um/umr/package.nix
similarity index 100%
rename from pkgs/development/misc/umr/default.nix
rename to pkgs/by-name/um/umr/package.nix
diff --git a/pkgs/servers/ums/default.nix b/pkgs/by-name/um/ums/package.nix
similarity index 100%
rename from pkgs/servers/ums/default.nix
rename to pkgs/by-name/um/ums/package.nix
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/by-name/um/umurmur/package.nix
similarity index 100%
rename from pkgs/applications/networking/umurmur/default.nix
rename to pkgs/by-name/um/umurmur/package.nix
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 9c789a3b0564..c9d9a7a26cf6 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -50,11 +50,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz";
-    hash = "sha256-59yn1rD4G9+m+mTr8QU7WpmaWukniofvGCQlBn6hRSE=";
+    hash = "sha256-MDbSPCNiKzbTyH6UMRe97BrI+Bljbrl42AZBaw+p6kY=";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Validating, recursive, and caching DNS resolver";
     license = licenses.bsd3;
     homepage = "https://www.unbound.net";
-    maintainers = lib.teams.helsinki-systems.members;
+    maintainers = [ ];
     platforms = platforms.unix ++ platforms.windows;
   };
 })
diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
similarity index 100%
rename from pkgs/tools/misc/unclutter-xfixes/default.nix
rename to pkgs/by-name/un/unclutter-xfixes/package.nix
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/by-name/un/unclutter/package.nix
similarity index 100%
rename from pkgs/tools/misc/unclutter/default.nix
rename to pkgs/by-name/un/unclutter/package.nix
diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/by-name/un/unconvert/package.nix
similarity index 100%
rename from pkgs/development/tools/unconvert/default.nix
rename to pkgs/by-name/un/unconvert/package.nix
diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/by-name/un/uncover/package.nix
similarity index 100%
rename from pkgs/tools/security/uncover/default.nix
rename to pkgs/by-name/un/uncover/package.nix
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/by-name/un/uncrustify/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/uncrustify/default.nix
rename to pkgs/by-name/un/uncrustify/package.nix
diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/by-name/un/undaemonize/package.nix
similarity index 100%
rename from pkgs/tools/system/undaemonize/default.nix
rename to pkgs/by-name/un/undaemonize/package.nix
diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/by-name/un/undefined-medium/package.nix
similarity index 100%
rename from pkgs/data/fonts/undefined-medium/default.nix
rename to pkgs/by-name/un/undefined-medium/package.nix
diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/by-name/un/undervolt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/undervolt/default.nix
rename to pkgs/by-name/un/undervolt/package.nix
diff --git a/pkgs/shells/bash/undistract-me/default.nix b/pkgs/by-name/un/undistract-me/package.nix
similarity index 100%
rename from pkgs/shells/bash/undistract-me/default.nix
rename to pkgs/by-name/un/undistract-me/package.nix
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/by-name/un/undmg/package.nix
similarity index 100%
rename from pkgs/tools/archivers/undmg/default.nix
rename to pkgs/by-name/un/undmg/package.nix
diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/by-name/un/undmg/setup-hook.sh
similarity index 100%
rename from pkgs/tools/archivers/undmg/setup-hook.sh
rename to pkgs/by-name/un/undmg/setup-hook.sh
diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/by-name/un/undocker/package.nix
similarity index 100%
rename from pkgs/tools/misc/undocker/default.nix
rename to pkgs/by-name/un/undocker/package.nix
diff --git a/pkgs/tools/audio/unflac/default.nix b/pkgs/by-name/un/unflac/package.nix
similarity index 100%
rename from pkgs/tools/audio/unflac/default.nix
rename to pkgs/by-name/un/unflac/package.nix
diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/by-name/un/unfonts-core/package.nix
similarity index 100%
rename from pkgs/data/fonts/unfonts-core/default.nix
rename to pkgs/by-name/un/unfonts-core/package.nix
diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/by-name/un/unfs3/package.nix
similarity index 100%
rename from pkgs/servers/unfs3/default.nix
rename to pkgs/by-name/un/unfs3/package.nix
diff --git a/pkgs/tools/text/unfurl/default.nix b/pkgs/by-name/un/unfurl/package.nix
similarity index 100%
rename from pkgs/tools/text/unfurl/default.nix
rename to pkgs/by-name/un/unfurl/package.nix
diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/by-name/un/ungit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/ungit/default.nix
rename to pkgs/by-name/un/ungit/package.nix
diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/by-name/un/uni-vga/package.nix
similarity index 100%
rename from pkgs/data/fonts/uni-vga/default.nix
rename to pkgs/by-name/un/uni-vga/package.nix
diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/by-name/un/uni/package.nix
similarity index 100%
rename from pkgs/applications/misc/uni/default.nix
rename to pkgs/by-name/un/uni/package.nix
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/by-name/un/uni2ascii/package.nix
similarity index 100%
rename from pkgs/tools/text/uni2ascii/default.nix
rename to pkgs/by-name/un/uni2ascii/package.nix
diff --git a/pkgs/by-name/un/unibilium/package.nix b/pkgs/by-name/un/unibilium/package.nix
new file mode 100644
index 000000000000..66e7a8d3843f
--- /dev/null
+++ b/pkgs/by-name/un/unibilium/package.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "unibilium";
+  version = "2.1.2";
+
+  src = fetchFromGitHub {
+    owner = "neovim";
+    repo = "unibilium";
+    rev = "v${version}";
+    sha256 = "sha256-6bFZtR8TUZJembRBj6wUUCyurUdsn3vDGnCzCti/ESc=";
+  };
+
+  strictDeps = true;
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ autoreconfHook pkg-config perl libtool ];
+  buildInputs = [ ncurses ];
+
+  meta = with lib; {
+    description = "Very basic terminfo library";
+    license = licenses.lgpl3Plus;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/by-name/un/unicap/package.nix
similarity index 100%
rename from pkgs/development/libraries/unicap/default.nix
rename to pkgs/by-name/un/unicap/package.nix
diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/by-name/un/unicode-character-database/package.nix
similarity index 100%
rename from pkgs/data/misc/unicode-character-database/default.nix
rename to pkgs/by-name/un/unicode-character-database/package.nix
diff --git a/pkgs/by-name/un/unicode-emoji/package.nix b/pkgs/by-name/un/unicode-emoji/package.nix
new file mode 100644
index 000000000000..b32cdc45d1d5
--- /dev/null
+++ b/pkgs/by-name/un/unicode-emoji/package.nix
@@ -0,0 +1,61 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, symlinkJoin
+}:
+
+let
+  version = "16.0";
+
+  fetchData = { suffix, hash }: stdenvNoCC.mkDerivation {
+    pname = "unicode-emoji-${suffix}";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://www.unicode.org/Public/emoji/${version}/emoji-${suffix}.txt";
+      inherit hash;
+    };
+
+    dontUnpack = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      installDir="$out/share/unicode/emoji"
+      mkdir -p "$installDir"
+      cp "$src" "$installDir/emoji-${suffix}.txt"
+
+      runHook postInstall
+    '';
+  };
+
+  srcs = {
+    emoji-sequences = fetchData {
+      suffix = "sequences";
+      hash = "sha256-P+PHfnLo8m3zAtx9mbEGxdCP2Ajvckb7XUUC1ln+ZZw=";
+    };
+    emoji-test = fetchData {
+      suffix = "test";
+      hash = "sha256-JPDFNOhs8ULiSWlT6PDkaj5wI5KRHt3NKcbM7YUTlpc=";
+    };
+    emoji-zwj-sequences = fetchData {
+      suffix = "zwj-sequences";
+      hash = "sha256-lCPsI1R0NW+XCmllBnN+LV1lRTpn9F32a4u+kgw/q4M=";
+    };
+  };
+in
+
+symlinkJoin {
+  name = "unicode-emoji-${version}";
+
+  paths = lib.attrValues srcs;
+
+  passthru = srcs;
+
+  meta = with lib; {
+    description = "Unicode Emoji Data Files";
+    homepage = "https://home.unicode.org/emoji/";
+    license = licenses.unicode-dfs-2016;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/by-name/un/unicode-paracode/package.nix
similarity index 100%
rename from pkgs/tools/misc/unicode/default.nix
rename to pkgs/by-name/un/unicode-paracode/package.nix
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/by-name/un/unicon-lang/package.nix
similarity index 100%
rename from pkgs/development/interpreters/unicon-lang/default.nix
rename to pkgs/by-name/un/unicon-lang/package.nix
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/by-name/un/unifdef/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/unifdef/default.nix
rename to pkgs/by-name/un/unifdef/package.nix
diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix
similarity index 100%
rename from pkgs/applications/backup/unifi-protect-backup/default.nix
rename to pkgs/by-name/un/unifi-protect-backup/package.nix
diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
similarity index 100%
rename from pkgs/servers/unifiedpush-common-proxies/default.nix
rename to pkgs/by-name/un/unifiedpush-common-proxies/package.nix
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/by-name/un/unifont/package.nix
similarity index 100%
rename from pkgs/data/fonts/unifont/default.nix
rename to pkgs/by-name/un/unifont/package.nix
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/by-name/un/unifont_upper/package.nix
similarity index 100%
rename from pkgs/data/fonts/unifont_upper/default.nix
rename to pkgs/by-name/un/unifont_upper/package.nix
diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/by-name/un/unigine-heaven/package.nix
similarity index 100%
rename from pkgs/applications/graphics/unigine-heaven/default.nix
rename to pkgs/by-name/un/unigine-heaven/package.nix
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/by-name/un/unigine-valley/package.nix
similarity index 100%
rename from pkgs/applications/graphics/unigine-valley/default.nix
rename to pkgs/by-name/un/unigine-valley/package.nix
diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/by-name/un/unihan-database/package.nix
similarity index 100%
rename from pkgs/data/misc/unihan-database/default.nix
rename to pkgs/by-name/un/unihan-database/package.nix
diff --git a/pkgs/by-name/un/unionfs-fuse/package.nix b/pkgs/by-name/un/unionfs-fuse/package.nix
new file mode 100644
index 000000000000..6f55dbe426a6
--- /dev/null
+++ b/pkgs/by-name/un/unionfs-fuse/package.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchFromGitHub, cmake, fuse }:
+
+stdenv.mkDerivation rec {
+  pname = "unionfs-fuse";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "rpodgorny";
+    repo = "unionfs-fuse";
+    rev = "v${version}";
+    sha256 = "sha256-EJryML6E0CW4kvsqMRqV3cq77j50HuylNzgaHD6CL/o=";
+  };
+
+  patches = [
+    # Prevent the unionfs daemon from being killed during
+    # shutdown. See
+    # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+    # for details.
+    ./prevent-kill-on-shutdown.patch
+  ];
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace '/usr/local/include/osxfuse/fuse' '${lib.getDev fuse}/include/fuse'
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ fuse ];
+
+  # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
+  # possible to do:
+  #   mount -t unionfs-fuse none /dest -o dirs=/source1=RW,/source2=RO
+  #
+  # This must be done in preConfigure because the build process removes
+  # helper from the source directory during the build.
+  preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -p $out/sbin
+    cp -a mount.unionfs $out/sbin/mount.unionfs-fuse
+    substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse
+    substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs
+  '';
+
+  meta = with lib; {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "FUSE UnionFS implementation";
+    homepage = "https://github.com/rpodgorny/unionfs-fuse";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/pkgs/by-name/un/unionfs-fuse/prevent-kill-on-shutdown.patch
similarity index 100%
rename from pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
rename to pkgs/by-name/un/unionfs-fuse/prevent-kill-on-shutdown.patch
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/by-name/un/unison-ucm/package.nix
similarity index 100%
rename from pkgs/development/compilers/unison/default.nix
rename to pkgs/by-name/un/unison-ucm/package.nix
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/by-name/un/unit/package.nix
similarity index 100%
rename from pkgs/servers/http/unit/default.nix
rename to pkgs/by-name/un/unit/package.nix
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/by-name/un/unittest-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/unittest-cpp/default.nix
rename to pkgs/by-name/un/unittest-cpp/package.nix
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/by-name/un/unixODBC/package.nix
similarity index 100%
rename from pkgs/development/libraries/unixODBC/default.nix
rename to pkgs/by-name/un/unixODBC/package.nix
diff --git a/pkgs/development/tools/misc/unixbench/common.patch b/pkgs/by-name/un/unixbench/common.patch
similarity index 100%
rename from pkgs/development/tools/misc/unixbench/common.patch
rename to pkgs/by-name/un/unixbench/common.patch
diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/by-name/un/unixbench/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/unixbench/default.nix
rename to pkgs/by-name/un/unixbench/package.nix
diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/by-name/un/unnaturalscrollwheels/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix
rename to pkgs/by-name/un/unnaturalscrollwheels/package.nix
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/by-name/un/unnethack/package.nix
similarity index 100%
rename from pkgs/games/unnethack/default.nix
rename to pkgs/by-name/un/unnethack/package.nix
diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/by-name/un/unoconv/package.nix
similarity index 100%
rename from pkgs/tools/text/unoconv/default.nix
rename to pkgs/by-name/un/unoconv/package.nix
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/by-name/un/unp/package.nix
similarity index 100%
rename from pkgs/tools/archivers/unp/default.nix
rename to pkgs/by-name/un/unp/package.nix
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/by-name/un/unpaper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/unpaper/default.nix
rename to pkgs/by-name/un/unpaper/package.nix
diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/by-name/un/unparam/package.nix
similarity index 100%
rename from pkgs/tools/misc/unparam/default.nix
rename to pkgs/by-name/un/unparam/package.nix
diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/by-name/un/unpfs/package.nix
similarity index 100%
rename from pkgs/servers/unpfs/default.nix
rename to pkgs/by-name/un/unpfs/package.nix
diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/by-name/un/unpoller/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/unpoller/default.nix
rename to pkgs/by-name/un/unpoller/package.nix
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/by-name/un/unrtf/package.nix
similarity index 100%
rename from pkgs/tools/text/unrtf/default.nix
rename to pkgs/by-name/un/unrtf/package.nix
diff --git a/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch b/pkgs/by-name/un/unscd/0001-adjust-socket-paths-for-nixos.patch
similarity index 100%
rename from pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch
rename to pkgs/by-name/un/unscd/0001-adjust-socket-paths-for-nixos.patch
diff --git a/pkgs/os-specific/linux/unscd/default.nix b/pkgs/by-name/un/unscd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/unscd/default.nix
rename to pkgs/by-name/un/unscd/package.nix
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/by-name/un/unscii/package.nix
similarity index 100%
rename from pkgs/data/fonts/unscii/default.nix
rename to pkgs/by-name/un/unscii/package.nix
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/by-name/un/unshield/package.nix
similarity index 100%
rename from pkgs/tools/archivers/unshield/default.nix
rename to pkgs/by-name/un/unshield/package.nix
diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/by-name/un/unstick/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/unstick/default.nix
rename to pkgs/by-name/un/unstick/package.nix
diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/by-name/un/untex/package.nix
similarity index 100%
rename from pkgs/tools/text/untex/default.nix
rename to pkgs/by-name/un/untex/package.nix
diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/by-name/un/untie/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/untie/default.nix
rename to pkgs/by-name/un/untie/package.nix
diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/by-name/un/untrunc-anthwlock/package.nix
similarity index 100%
rename from pkgs/tools/video/untrunc-anthwlock/default.nix
rename to pkgs/by-name/un/untrunc-anthwlock/package.nix
diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/by-name/un/unused/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/unused/default.nix
rename to pkgs/by-name/un/unused/package.nix
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/by-name/un/unvanquished/package.nix
similarity index 100%
rename from pkgs/games/unvanquished/default.nix
rename to pkgs/by-name/un/unvanquished/package.nix
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8139.diff b/pkgs/by-name/un/unzip/CVE-2014-8139.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-8139.diff
rename to pkgs/by-name/un/unzip/CVE-2014-8139.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8140.diff b/pkgs/by-name/un/unzip/CVE-2014-8140.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-8140.diff
rename to pkgs/by-name/un/unzip/CVE-2014-8140.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8141.diff b/pkgs/by-name/un/unzip/CVE-2014-8141.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-8141.diff
rename to pkgs/by-name/un/unzip/CVE-2014-8141.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/pkgs/by-name/un/unzip/CVE-2014-9636.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-9636.diff
rename to pkgs/by-name/un/unzip/CVE-2014-9636.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/pkgs/by-name/un/unzip/CVE-2014-9913.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-9913.patch
rename to pkgs/by-name/un/unzip/CVE-2014-9913.patch
diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7696.diff b/pkgs/by-name/un/unzip/CVE-2015-7696.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2015-7696.diff
rename to pkgs/by-name/un/unzip/CVE-2015-7696.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7697.diff b/pkgs/by-name/un/unzip/CVE-2015-7697.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2015-7697.diff
rename to pkgs/by-name/un/unzip/CVE-2015-7697.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/pkgs/by-name/un/unzip/CVE-2016-9844.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2016-9844.patch
rename to pkgs/by-name/un/unzip/CVE-2016-9844.patch
diff --git a/pkgs/tools/archivers/unzip/CVE-2018-18384.patch b/pkgs/by-name/un/unzip/CVE-2018-18384.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2018-18384.patch
rename to pkgs/by-name/un/unzip/CVE-2018-18384.patch
diff --git a/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch b/pkgs/by-name/un/unzip/dont-hardcode-cc.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
rename to pkgs/by-name/un/unzip/dont-hardcode-cc.patch
diff --git a/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch b/pkgs/by-name/un/unzip/implicit-declarations-fix.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/implicit-declarations-fix.patch
rename to pkgs/by-name/un/unzip/implicit-declarations-fix.patch
diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix
new file mode 100644
index 000000000000..50e2261aa7d4
--- /dev/null
+++ b/pkgs/by-name/un/unzip/package.nix
@@ -0,0 +1,113 @@
+{ lib, stdenv, fetchurl
+, bzip2
+, enableNLS ? false, libnatspec
+}:
+
+stdenv.mkDerivation rec {
+  pname = "unzip";
+  version = "6.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/infozip/unzip${lib.replaceStrings ["."] [""] version}.tar.gz";
+    sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  patchFlags = [ "-p1" "-F3" ];
+
+  patches = [
+    ./CVE-2014-8139.diff
+    ./CVE-2014-8140.diff
+    ./CVE-2014-8141.diff
+    ./CVE-2014-9636.diff
+    ./CVE-2015-7696.diff
+    ./CVE-2015-7697.diff
+    ./CVE-2014-9913.patch
+    ./CVE-2016-9844.patch
+    ./CVE-2018-18384.patch
+    ./dont-hardcode-cc.patch
+    (fetchurl {
+      url = "https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213.patch";
+      name = "CVE-2019-13232-1.patch";
+      sha256 = "04jzd6chg9fw4l5zadkfsrfm5llrd7vhd1dgdjjd29nrvkrjyn14";
+    })
+    (fetchurl {
+      url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch";
+      name = "CVE-2019-13232-2.patch";
+      sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32";
+    })
+    (fetchurl {
+      url = "https://github.com/madler/unzip/commit/6d351831be705cc26d897db44f878a978f4138fc.patch";
+      name = "CVE-2019-13232-3.patch";
+      sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
+    })
+    (fetchurl {
+      urls = [
+        # original link (will be dead eventually):
+        "https://sources.debian.org/data/main/u/unzip/6.0-26%2Bdeb11u1/debian/patches/06-initialize-the-symlink-flag.patch"
+
+        "https://gist.github.com/veprbl/41261bb781571e2246ea42d3f37795f5/raw/d8533d8c6223150f76b0f31aec03e185fcde3579/06-initialize-the-symlink-flag.patch"
+      ];
+      sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj";
+    })
+    (fetchurl {
+      urls = [
+        # original link (will be dead eventually):
+        "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"
+
+        "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"
+      ];
+      sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc=";
+    })
+    # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the
+    # configure script to fail to detect errno and the directory libraries on Darwin.
+    ./implicit-declarations-fix.patch
+    (fetchurl {
+      name = "CVE-2021-4217.patch";
+      url = "https://git.launchpad.net/ubuntu/+source/unzip/plain/debian/patches/CVE-2021-4217.patch?id=94a790fcbb5d6c53cdf5d786bcaa0b8dc10309b6";
+      hash = "sha256-YKE4jVNSlrHLbszXNYYRtAQs0ly4AsodEz6tadMIVqE=";
+    })
+  ] ++ lib.optional enableNLS
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+      name = "unzip-6.0-natspec.patch";
+      sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
+    });
+
+
+  nativeBuildInputs = [ bzip2 ];
+  buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec;
+
+  makefile = "unix/Makefile";
+
+  NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec";
+
+  buildFlags = [
+    "generic"
+    "D_USE_BZ2=-DUSE_BZIP2"
+    "L_BZ2=-lbz2"
+  ]
+  # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks).
+  # Alpine (musl) and Debian (glibc) also add this flag.
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ];
+
+  preConfigure = ''
+    sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile
+  '';
+
+  installFlags = [
+    "prefix=${placeholder "out"}"
+  ];
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = "http://www.info-zip.org";
+    description = "Extraction utility for archives compressed in .zip format";
+    license = lib.licenses.info-zip;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    mainProgram = "unzip";
+  };
+}
diff --git a/pkgs/tools/archivers/unzip/setup-hook.sh b/pkgs/by-name/un/unzip/setup-hook.sh
similarity index 100%
rename from pkgs/tools/archivers/unzip/setup-hook.sh
rename to pkgs/by-name/un/unzip/setup-hook.sh
diff --git a/pkgs/tools/compression/unzrip/default.nix b/pkgs/by-name/un/unzrip/package.nix
similarity index 100%
rename from pkgs/tools/compression/unzrip/default.nix
rename to pkgs/by-name/un/unzrip/package.nix
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/by-name/up/up/package.nix
similarity index 100%
rename from pkgs/tools/misc/up/default.nix
rename to pkgs/by-name/up/up/package.nix
diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/by-name/up/update-python-libraries/package.nix
similarity index 100%
rename from pkgs/development/interpreters/python/update-python-libraries/default.nix
rename to pkgs/by-name/up/update-python-libraries/package.nix
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
similarity index 100%
rename from pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
rename to pkgs/by-name/up/update-python-libraries/update-python-libraries.py
diff --git a/pkgs/development/libraries/updfparser/default.nix b/pkgs/by-name/up/updfparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/updfparser/default.nix
rename to pkgs/by-name/up/updfparser/package.nix
diff --git a/pkgs/tools/networking/updog/default.nix b/pkgs/by-name/up/updog/package.nix
similarity index 100%
rename from pkgs/tools/networking/updog/default.nix
rename to pkgs/by-name/up/updog/package.nix
diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/by-name/up/upnp-router-control/package.nix
similarity index 100%
rename from pkgs/applications/networking/upnp-router-control/default.nix
rename to pkgs/by-name/up/upnp-router-control/package.nix
diff --git a/pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch b/pkgs/by-name/up/upower/i686-test-remove-battery-check.patch
similarity index 100%
rename from pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch
rename to pkgs/by-name/up/upower/i686-test-remove-battery-check.patch
diff --git a/pkgs/os-specific/linux/upower/installed-tests-path.patch b/pkgs/by-name/up/upower/installed-tests-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/upower/installed-tests-path.patch
rename to pkgs/by-name/up/upower/installed-tests-path.patch
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/by-name/up/upower/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/upower/default.nix
rename to pkgs/by-name/up/upower/package.nix
diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix
new file mode 100644
index 000000000000..414a2eb1456b
--- /dev/null
+++ b/pkgs/by-name/up/upscayl/package.nix
@@ -0,0 +1,54 @@
+{
+  appimageTools,
+  fetchurl,
+  lib,
+  makeWrapper,
+}:
+
+let
+  pname = "upscayl";
+  version = "2.11.5";
+
+  src = fetchurl {
+    url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
+    hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  extraPkgs = pkgs: [
+    pkgs.vulkan-headers
+    pkgs.vulkan-loader
+  ];
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/{applications,pixmaps}
+
+    cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+    cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
+
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
+
+    wrapProgram $out/bin/${pname} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+  '';
+
+  meta = with lib; {
+    description = "Free and Open Source AI Image Upscaler";
+    homepage = "https://upscayl.github.io/";
+    maintainers = with maintainers; [ icy-thought ];
+    license = licenses.agpl3Plus;
+    platforms = platforms.linux;
+    mainProgram = "upscayl";
+  };
+}
diff --git a/pkgs/tools/filesystems/upspin/default.nix b/pkgs/by-name/up/upspin/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/upspin/default.nix
rename to pkgs/by-name/up/upspin/package.nix
diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/by-name/up/upterm/package.nix
similarity index 100%
rename from pkgs/tools/misc/upterm/default.nix
rename to pkgs/by-name/up/upterm/package.nix
diff --git a/pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch b/pkgs/by-name/up/uptime-kuma/fix-database-permissions.patch
similarity index 100%
rename from pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch
rename to pkgs/by-name/up/uptime-kuma/fix-database-permissions.patch
diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/by-name/up/uptime-kuma/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/uptime-kuma/default.nix
rename to pkgs/by-name/up/uptime-kuma/package.nix
diff --git a/pkgs/tools/system/uptimed/no-var-spool-install.patch b/pkgs/by-name/up/uptimed/no-var-spool-install.patch
similarity index 100%
rename from pkgs/tools/system/uptimed/no-var-spool-install.patch
rename to pkgs/by-name/up/uptimed/no-var-spool-install.patch
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/by-name/up/uptimed/package.nix
similarity index 100%
rename from pkgs/tools/system/uptimed/default.nix
rename to pkgs/by-name/up/uptimed/package.nix
diff --git a/pkgs/by-name/up/upwork/package.nix b/pkgs/by-name/up/upwork/package.nix
new file mode 100644
index 000000000000..6516e05b0f35
--- /dev/null
+++ b/pkgs/by-name/up/upwork/package.nix
@@ -0,0 +1,68 @@
+{ lib, stdenv, requireFile, dpkg, wrapGAppsHook3, autoPatchelfHook
+, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
+, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb
+, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
+, libXScrnSaver, libXtst, mesa, nspr, nss, openssl, pango, systemd }:
+
+stdenv.mkDerivation rec {
+  pname = "upwork";
+  version = "5.8.0.35";
+
+  src = requireFile {
+    name = "${pname}_${version}_amd64.deb";
+    url = "https://www.upwork.com/ab/downloads/os/linux/";
+    sha256 = "sha256-Suv23TL6l5HhkOSRT56LpFRZJxuSLYVc1uT6he8j7O0=";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    wrapGAppsHook3
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    libcxx systemd libpulseaudio
+    stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups
+    dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify
+    libuuid libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
+    libXi libXrandr libXrender libXScrnSaver libXtst mesa nspr nss pango systemd
+  ];
+
+  libPath = lib.makeLibraryPath buildInputs;
+
+  dontWrapGApps = true;
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mv usr $out
+    mv opt $out
+
+    # Now it requires lib{ssl,crypto}.so.1.0.0. Fix based on Spotify pkg.
+    # https://github.com/NixOS/nixpkgs/blob/efea022d6fe0da84aa6613d4ddeafb80de713457/pkgs/applications/audio/spotify/default.nix#L129
+    mkdir -p $out/lib/upwork
+    ln -s ${lib.getLib openssl}/lib/libssl.so $out/lib/upwork/libssl.so.1.0.0
+    ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/upwork/libcrypto.so.1.0.0
+
+    sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop
+    makeWrapper $out/opt/Upwork/upwork \
+      $out/bin/upwork \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      --prefix LD_LIBRARY_PATH : ${libPath}
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Online freelancing platform desktop application for time tracking";
+    homepage = "https://www.upwork.com/ab/downloads/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ zakkor ];
+  };
+}
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/by-name/up/upx/package.nix
similarity index 100%
rename from pkgs/tools/compression/upx/default.nix
rename to pkgs/by-name/up/upx/package.nix
diff --git a/pkgs/misc/uq/default.nix b/pkgs/by-name/uq/uq/package.nix
similarity index 100%
rename from pkgs/misc/uq/default.nix
rename to pkgs/by-name/uq/uq/package.nix
diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/by-name/uq/uqm/3dovideo.nix
similarity index 100%
rename from pkgs/games/uqm/3dovideo.nix
rename to pkgs/by-name/uq/uqm/3dovideo.nix
diff --git a/pkgs/games/uqm/default.nix b/pkgs/by-name/uq/uqm/package.nix
similarity index 100%
rename from pkgs/games/uqm/default.nix
rename to pkgs/by-name/uq/uqm/package.nix
diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/by-name/uq/uqmi/package.nix
similarity index 100%
rename from pkgs/tools/networking/uqmi/default.nix
rename to pkgs/by-name/uq/uqmi/package.nix
diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/by-name/ur/urbackup-client/package.nix
similarity index 100%
rename from pkgs/applications/backup/urbackup-client/default.nix
rename to pkgs/by-name/ur/urbackup-client/package.nix
diff --git a/pkgs/games/urbanterror/Makefile.local b/pkgs/by-name/ur/urbanterror/Makefile.local
similarity index 100%
rename from pkgs/games/urbanterror/Makefile.local
rename to pkgs/by-name/ur/urbanterror/Makefile.local
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/by-name/ur/urbanterror/package.nix
similarity index 100%
rename from pkgs/games/urbanterror/default.nix
rename to pkgs/by-name/ur/urbanterror/package.nix
diff --git a/pkgs/development/libraries/urdfdom-headers/default.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/urdfdom-headers/default.nix
rename to pkgs/by-name/ur/urdfdom-headers/package.nix
diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/by-name/ur/urdfdom/package.nix
similarity index 100%
rename from pkgs/development/libraries/urdfdom/default.nix
rename to pkgs/by-name/ur/urdfdom/package.nix
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/by-name/ur/urh/package.nix
similarity index 100%
rename from pkgs/applications/radio/urh/default.nix
rename to pkgs/by-name/ur/urh/package.nix
diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/by-name/ur/uri/package.nix
similarity index 100%
rename from pkgs/development/libraries/uri/default.nix
rename to pkgs/by-name/ur/uri/package.nix
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/by-name/ur/uriparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/uriparser/default.nix
rename to pkgs/by-name/ur/uriparser/package.nix
diff --git a/pkgs/tools/misc/url-parser/default.nix b/pkgs/by-name/ur/url-parser/package.nix
similarity index 100%
rename from pkgs/tools/misc/url-parser/default.nix
rename to pkgs/by-name/ur/url-parser/package.nix
diff --git a/pkgs/tools/misc/urlencode/default.nix b/pkgs/by-name/ur/urlencode/package.nix
similarity index 100%
rename from pkgs/tools/misc/urlencode/default.nix
rename to pkgs/by-name/ur/urlencode/package.nix
diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/by-name/ur/urlhunter/package.nix
similarity index 100%
rename from pkgs/tools/security/urlhunter/default.nix
rename to pkgs/by-name/ur/urlhunter/package.nix
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/by-name/ur/urlscan/package.nix
similarity index 100%
rename from pkgs/applications/misc/urlscan/default.nix
rename to pkgs/by-name/ur/urlscan/package.nix
diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix
new file mode 100644
index 000000000000..1eec3cf0653d
--- /dev/null
+++ b/pkgs/by-name/ur/urlwatch/package.nix
@@ -0,0 +1,43 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "urlwatch";
+  version = "2.29";
+
+  src = fetchFromGitHub {
+    owner = "thp";
+    repo = "urlwatch";
+    rev = version;
+    hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    cssselect
+    jq
+    keyring
+    lxml
+    markdown2
+    matrix-client
+    minidb
+    playwright
+    platformdirs
+    pushbullet-py
+    pycodestyle
+    pyyaml
+    requests
+  ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Tool for monitoring webpages for updates";
+    mainProgram = "urlwatch";
+    homepage = "https://thp.io/2008/urlwatch/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kmein tv ];
+  };
+}
diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/by-name/ur/urn-timer/package.nix
similarity index 100%
rename from pkgs/tools/misc/urn-timer/default.nix
rename to pkgs/by-name/ur/urn-timer/package.nix
diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/by-name/ur/urn/package.nix
similarity index 100%
rename from pkgs/development/compilers/urn/default.nix
rename to pkgs/by-name/ur/urn/package.nix
diff --git a/pkgs/tools/system/uroboros/default.nix b/pkgs/by-name/ur/uroboros/package.nix
similarity index 100%
rename from pkgs/tools/system/uroboros/default.nix
rename to pkgs/by-name/ur/uroboros/package.nix
diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/by-name/ur/ursadb/package.nix
similarity index 100%
rename from pkgs/servers/ursadb/default.nix
rename to pkgs/by-name/ur/ursadb/package.nix
diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
new file mode 100644
index 000000000000..1df9c40aee32
--- /dev/null
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv
+, fetchurl
+, autoPatchelfHook
+, bluez
+, libX11
+, libXtst
+, makeWrapper
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "urserver";
+  version = "3.13.0.2505";
+
+  src = fetchurl {
+    url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz";
+    hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    bluez
+    libX11
+    libXtst
+  ];
+
+  installPhase = ''
+    install -m755 -D urserver $out/bin/urserver
+    wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+    cp -r remotes $out/bin/remotes
+    cp -r manager $out/bin/manager
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.unifiedremote.com/";
+    description = "One-and-only remote for your computer";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ sfrijters ];
+    platforms = [ "x86_64-linux" ];
+  };
+})
diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/pkgs/by-name/us/usb-blaster-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix
rename to pkgs/by-name/us/usb-blaster-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/pkgs/by-name/us/usb-blaster-udev-rules/usb-blaster.rules
similarity index 100%
rename from pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules
rename to pkgs/by-name/us/usb-blaster-udev-rules/usb-blaster.rules
diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/by-name/us/usb-reset/package.nix
similarity index 100%
rename from pkgs/applications/misc/usb-reset/default.nix
rename to pkgs/by-name/us/usb-reset/package.nix
diff --git a/pkgs/os-specific/linux/usbguard-notifier/default.nix b/pkgs/by-name/us/usbguard-notifier/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbguard-notifier/default.nix
rename to pkgs/by-name/us/usbguard-notifier/package.nix
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/by-name/us/usbguard/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbguard/default.nix
rename to pkgs/by-name/us/usbguard/package.nix
diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/by-name/us/usbimager/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbimager/default.nix
rename to pkgs/by-name/us/usbimager/package.nix
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/by-name/us/usbmuxd/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbmuxd/default.nix
rename to pkgs/by-name/us/usbmuxd/package.nix
diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/by-name/us/usbmuxd2/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbmuxd2/default.nix
rename to pkgs/by-name/us/usbmuxd2/package.nix
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/by-name/us/usbredir/package.nix
similarity index 100%
rename from pkgs/development/libraries/usbredir/default.nix
rename to pkgs/by-name/us/usbredir/package.nix
diff --git a/pkgs/tools/security/usbrip/default.nix b/pkgs/by-name/us/usbrip/package.nix
similarity index 100%
rename from pkgs/tools/security/usbrip/default.nix
rename to pkgs/by-name/us/usbrip/package.nix
diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/by-name/us/usbsdmux/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/usbsdmux/default.nix
rename to pkgs/by-name/us/usbsdmux/package.nix
diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/by-name/us/usbtop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbtop/default.nix
rename to pkgs/by-name/us/usbtop/package.nix
diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/by-name/us/usbutils/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/usbutils/fix-paths.patch
rename to pkgs/by-name/us/usbutils/fix-paths.patch
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/by-name/us/usbutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbutils/default.nix
rename to pkgs/by-name/us/usbutils/package.nix
diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/by-name/us/usbview/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbview/default.nix
rename to pkgs/by-name/us/usbview/package.nix
diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/by-name/us/userhosts/package.nix
similarity index 100%
rename from pkgs/tools/networking/userhosts/default.nix
rename to pkgs/by-name/us/userhosts/package.nix
diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/by-name/us/usermount/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usermount/default.nix
rename to pkgs/by-name/us/usermount/package.nix
diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix
index a91319183f00..8122dd981379 100644
--- a/pkgs/by-name/us/usql/package.nix
+++ b/pkgs/by-name/us/usql/package.nix
@@ -10,18 +10,18 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.19.3";
+  version = "0.19.12";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    hash = "sha256-VenqDYkBJ4XJ2zV7kaVvwlgDyCaTY77zQ5hPq5cOZKg=";
+    hash = "sha256-gutAb6GkaHtZK0uw9+If/luIUn8jiGfruWtAV3nQJvE=";
   };
 
   buildInputs = [ unixODBC icu ];
 
-  vendorHash = "sha256-KdLUxgNGMkkWBhUpXSecu0m3fsKl7Qj8Aw3z8WcdnSs=";
+  vendorHash = "sha256-32tl3mXpFqthXMRERDvMsocfMW0ltSvnm8/+NKiSjmE=";
   proxyVendor = true;
 
   # Exclude drivers from the bad group
diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/by-name/us/usrsctp/clang-fix-build.patch
similarity index 100%
rename from pkgs/development/libraries/usrsctp/clang-fix-build.patch
rename to pkgs/by-name/us/usrsctp/clang-fix-build.patch
diff --git a/pkgs/by-name/us/usrsctp/package.nix b/pkgs/by-name/us/usrsctp/package.nix
new file mode 100644
index 000000000000..58448d0a453d
--- /dev/null
+++ b/pkgs/by-name/us/usrsctp/package.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "usrsctp";
+  version = "0.9.5.0";
+
+  src = fetchFromGitHub {
+    owner = "sctplab";
+    repo = "usrsctp";
+    rev = version;
+    sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9";
+  };
+
+  patches = [
+    # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype
+    # errors. These issues are fixed in the master branch, but a new release with them has not
+    # been made. The following patch can be dropped once a release has been made.
+    ./clang-fix-build.patch
+
+    (fetchpatch {
+      name = "freebsd-14.patch";
+      url = "https://github.com/sctplab/usrsctp/commit/ac559d2a95277e5e0827e9ee5a1d3b1b50e0822a.patch";
+      hash = "sha256-QBlzH37Xwwnn1y8pM941Zesz18p2EazfeD0lCU8n6nI=";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  # https://github.com/sctplab/usrsctp/issues/662
+  postPatch = ''
+    substituteInPlace usrsctplib/CMakeLists.txt \
+      --replace '$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
+      --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/sctplab/usrsctp";
+    description = "Portable SCTP userland stack";
+    maintainers = with maintainers; [ misuzu ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/by-name/us/ustreamer/package.nix
similarity index 100%
rename from pkgs/applications/video/ustreamer/default.nix
rename to pkgs/by-name/us/ustreamer/package.nix
diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/by-name/us/usync/package.nix
similarity index 100%
rename from pkgs/applications/misc/usync/default.nix
rename to pkgs/by-name/us/usync/package.nix
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
new file mode 100644
index 000000000000..18c253cc5c61
--- /dev/null
+++ b/pkgs/by-name/ut/utf8cpp/package.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "utf8cpp";
+  version = "4.0.6";
+
+  src = fetchFromGitHub {
+    owner = "nemtrif";
+    repo = "utfcpp";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-e8qH4eygLnQw7B8x+HN+vH8cr8fkxnTFz+PKtFJ8dGE=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    homepage = "https://github.com/nemtrif/utfcpp";
+    changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}";
+    description = "UTF-8 with C++ in a Portable Way";
+    license = licenses.boost;
+    maintainers = with maintainers; [ jobojeha ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/by-name/ut/utf8proc/package.nix
similarity index 100%
rename from pkgs/development/libraries/utf8proc/default.nix
rename to pkgs/by-name/ut/utf8proc/package.nix
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/by-name/ut/uthash/package.nix
similarity index 100%
rename from pkgs/development/libraries/uthash/default.nix
rename to pkgs/by-name/ut/uthash/package.nix
diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/by-name/ut/uthenticode/package.nix
similarity index 100%
rename from pkgs/development/libraries/uthenticode/default.nix
rename to pkgs/by-name/ut/uthenticode/package.nix
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/by-name/ut/util-linux/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/util-linux/default.nix
rename to pkgs/by-name/ut/util-linux/package.nix
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/by-name/ut/util-linux/rtcwake-search-PATH-for-shutdown.patch
similarity index 100%
rename from pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
rename to pkgs/by-name/ut/util-linux/rtcwake-search-PATH-for-shutdown.patch
diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/by-name/ut/utm/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/utm/default.nix
rename to pkgs/by-name/ut/utm/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/by-name/ut/utox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/utox/default.nix
rename to pkgs/by-name/ut/utox/package.nix
diff --git a/pkgs/data/themes/utterly-round-plasma-style/default.nix b/pkgs/by-name/ut/utterly-round-plasma-style/package.nix
similarity index 100%
rename from pkgs/data/themes/utterly-round-plasma-style/default.nix
rename to pkgs/by-name/ut/utterly-round-plasma-style/package.nix
diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/by-name/uu/uucp/package.nix
similarity index 100%
rename from pkgs/tools/misc/uucp/default.nix
rename to pkgs/by-name/uu/uucp/package.nix
diff --git a/pkgs/tools/misc/uudeview/matherr.patch b/pkgs/by-name/uu/uudeview/matherr.patch
similarity index 100%
rename from pkgs/tools/misc/uudeview/matherr.patch
rename to pkgs/by-name/uu/uudeview/matherr.patch
diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/by-name/uu/uudeview/package.nix
similarity index 100%
rename from pkgs/tools/misc/uudeview/default.nix
rename to pkgs/by-name/uu/uudeview/package.nix
diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock
index 28a28b4206d4..651d4c41cc0b 100644
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@@ -49,26 +49,26 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -83,9 +83,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "arrayref"
@@ -183,14 +183,14 @@ dependencies = [
 
 [[package]]
 name = "async_http_range_reader"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a0e0571c5d724d17fbe0b608d31a91e94938722c141877d3a2982216b084c2"
+checksum = "4015e7130cf870da1c64a9c7ba474f4b3772a530edbeb05f8358bc9a02f8e505"
 dependencies = [
  "bisection",
  "futures",
  "http-content-range",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "memmap2 0.9.5",
  "reqwest",
  "reqwest-middleware",
@@ -229,12 +229,13 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "axoasset"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e7b7ac1c1cd4fdcaa2f9e704defa9defd996039083d85e17efa5e8eefb3bd2"
+checksum = "90f16d4ba2365a6f9b4394b369597b9bc00a1651db758edbe6d63a34879b9024"
 dependencies = [
  "camino",
  "image",
+ "lazy_static",
  "miette",
  "mime",
  "reqwest",
@@ -269,9 +270,9 @@ dependencies = [
 
 [[package]]
 name = "axoupdater"
-version = "0.7.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe17874ee40fb66fe1d2cb7871b14de4d298fbf77ea29a6cedb8027365e1a33"
+checksum = "7fb8d8889305a413a040f281197bb2f8982a1d25c9696707cab350e3cc780ba5"
 dependencies = [
  "axoasset",
  "axoprocess",
@@ -284,6 +285,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
+ "url",
 ]
 
 [[package]]
@@ -420,9 +422,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "bzip2"
@@ -465,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-util"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d"
+checksum = "b6dd67a24439ca5260a08128b6cbf4b0f4453497a2f60508163ab9d5b534b122"
 dependencies = [
  "anyhow",
  "core-foundation",
@@ -483,7 +485,7 @@ dependencies = [
  "tempfile",
  "tracing",
  "walkdir",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -494,9 +496,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.1.30"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "jobserver",
  "libc",
@@ -577,9 +579,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.33"
+version = "4.5.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb"
+checksum = "86bc73de94bc81e52f3bebec71bc4463e9748f7a59166663e32044669577b0e2"
 dependencies = [
  "clap",
 ]
@@ -662,9 +664,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
@@ -948,6 +950,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
 [[package]]
 name = "dunce"
 version = "1.0.5"
@@ -974,9 +982,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -1056,9 +1064,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
+checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb"
 dependencies = [
  "simd-adler32",
 ]
@@ -1207,9 +1215,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1470,9 +1478,9 @@ dependencies = [
 
 [[package]]
 name = "http-content-range"
-version = "0.1.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa7929c876417cd3ece616950474c7dff5b0150a2b53bd7e7fda55afa086c22b"
+checksum = "91314cc9d86f625097a3365cab4e4b6f190eac231650f8f41c1edd8080cea1d0"
 
 [[package]]
 name = "httparse"
@@ -1528,9 +1536,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1573,9 +1581,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.2"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -1620,9 +1628,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "insta"
-version = "1.41.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef"
+checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8"
 dependencies = [
  "console",
  "lazy_static",
@@ -1684,15 +1692,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1710,9 +1709,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jiff"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb"
+checksum = "b9d9d414fc817d3e3d62b2598616733f76c4cc74fbac96069674739b881295c8"
 dependencies = [
  "jiff-tzdb-platform",
  "serde",
@@ -2320,18 +2319,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2340,9 +2339,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2475,6 +2474,29 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "procfs"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
+dependencies = [
+ "bitflags 2.6.0",
+ "flate2",
+ "hex",
+ "procfs-core",
+ "rustix",
+]
+
+[[package]]
+name = "procfs-core"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
+dependencies = [
+ "bitflags 2.6.0",
+ "hex",
+]
+
 [[package]]
 name = "ptr_meta"
 version = "0.3.0"
@@ -2498,13 +2520,14 @@ dependencies = [
 [[package]]
 name = "pubgrub"
 version = "0.2.1"
-source = "git+https://github.com/astral-sh/pubgrub?rev=7243f4faf8e54837aa8a401a18406e7173de4ad5#7243f4faf8e54837aa8a401a18406e7173de4ad5"
+source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79"
 dependencies = [
  "indexmap",
  "log",
  "priority-queue",
  "rustc-hash",
  "thiserror",
+ "version-ranges",
 ]
 
 [[package]]
@@ -2544,10 +2567,11 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
@@ -2739,9 +2763,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.8"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
@@ -2784,7 +2808,7 @@ dependencies = [
  "wasm-streams",
  "web-sys",
  "webpki-roots",
- "windows-registry",
+ "windows-registry 0.2.0",
 ]
 
 [[package]]
@@ -2991,9 +3015,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.15"
+version = "0.23.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
 dependencies = [
  "once_cell",
  "ring",
@@ -3181,9 +3205,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.213"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
@@ -3201,9 +3225,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.213"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3465,9 +3489,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3607,15 +3631,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "testing_logger"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d92b727cb45d33ae956f7f46b966b25f1bc712092aeef9dba5ac798fc89f720"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.1"
@@ -3629,18 +3644,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3942,6 +3957,27 @@ dependencies = [
  "tracing-serde",
 ]
 
+[[package]]
+name = "tracing-test"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68"
+dependencies = [
+ "tracing-core",
+ "tracing-subscriber",
+ "tracing-test-macro",
+]
+
+[[package]]
+name = "tracing-test-macro"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-tree"
 version = "0.4.0"
@@ -3986,12 +4022,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-bidi"
@@ -4139,7 +4172,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 
 [[package]]
 name = "uv"
-version = "0.4.28"
+version = "0.4.30"
 dependencies = [
  "anstream",
  "anyhow",
@@ -4151,6 +4184,7 @@ dependencies = [
  "clap",
  "console",
  "ctrlc",
+ "dotenvy",
  "etcetera",
  "filetime",
  "flate2",
@@ -4158,7 +4192,6 @@ dependencies = [
  "futures",
  "http",
  "ignore",
- "indexmap",
  "indicatif",
  "indoc",
  "insta",
@@ -4166,6 +4199,7 @@ dependencies = [
  "jiff",
  "miette",
  "owo-colors",
+ "petgraph",
  "predicates",
  "rayon",
  "regex",
@@ -4219,6 +4253,7 @@ dependencies = [
  "uv-shell",
  "uv-static",
  "uv-tool",
+ "uv-trampoline-builder",
  "uv-types",
  "uv-version",
  "uv-virtualenv",
@@ -4302,9 +4337,9 @@ dependencies = [
  "uv-normalize",
  "uv-pep440",
  "uv-pep508",
- "uv-pubgrub",
  "uv-pypi-types",
  "uv-warnings",
+ "version-ranges",
  "walkdir",
  "zip",
 ]
@@ -4770,6 +4805,7 @@ dependencies = [
  "uv-pep440",
  "uv-platform-tags",
  "uv-pypi-types",
+ "uv-trampoline-builder",
  "uv-warnings",
  "walkdir",
  "zip",
@@ -4873,6 +4909,7 @@ dependencies = [
  "tracing",
  "unicode-width",
  "unscanny",
+ "version-ranges",
 ]
 
 [[package]]
@@ -4883,23 +4920,21 @@ dependencies = [
  "indexmap",
  "insta",
  "itertools 0.13.0",
- "log",
- "pubgrub",
  "regex",
  "rustc-hash",
  "schemars",
  "serde",
  "serde_json",
  "smallvec",
- "testing_logger",
  "thiserror",
  "tracing",
+ "tracing-test",
  "unicode-width",
  "url",
  "uv-fs",
  "uv-normalize",
  "uv-pep440",
- "uv-pubgrub",
+ "version-ranges",
 ]
 
 [[package]]
@@ -4907,6 +4942,7 @@ name = "uv-performance-flate2-backend"
 version = "0.1.0"
 dependencies = [
  "flate2",
+ "libz-ng-sys",
 ]
 
 [[package]]
@@ -4927,16 +4963,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "uv-pubgrub"
-version = "0.0.1"
-dependencies = [
- "itertools 0.13.0",
- "pubgrub",
- "thiserror",
- "uv-pep440",
-]
-
 [[package]]
 name = "uv-publish"
 version = "0.1.0"
@@ -4955,15 +4981,17 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "sha2",
  "thiserror",
  "tokio",
  "tokio-util",
  "tracing",
  "url",
+ "uv-cache",
  "uv-client",
  "uv-configuration",
  "uv-distribution-filename",
+ "uv-distribution-types",
+ "uv-extract",
  "uv-fs",
  "uv-metadata",
  "uv-pypi-types",
@@ -5011,6 +5039,7 @@ dependencies = [
  "indoc",
  "itertools 0.13.0",
  "owo-colors",
+ "procfs",
  "regex",
  "reqwest",
  "reqwest-middleware",
@@ -5032,6 +5061,7 @@ dependencies = [
  "uv-cache-info",
  "uv-cache-key",
  "uv-client",
+ "uv-dirs",
  "uv-distribution-filename",
  "uv-extract",
  "uv-fs",
@@ -5042,9 +5072,10 @@ dependencies = [
  "uv-pypi-types",
  "uv-state",
  "uv-static",
+ "uv-trampoline-builder",
  "uv-warnings",
  "which",
- "windows-registry",
+ "windows-registry 0.3.0",
  "windows-result 0.2.0",
  "windows-sys 0.59.0",
 ]
@@ -5156,7 +5187,6 @@ dependencies = [
  "uv-pep440",
  "uv-pep508",
  "uv-platform-tags",
- "uv-pubgrub",
  "uv-pypi-types",
  "uv-python",
  "uv-requirements-txt",
@@ -5241,6 +5271,9 @@ dependencies = [
 [[package]]
 name = "uv-static"
 version = "0.0.1"
+dependencies = [
+ "uv-macros",
+]
 
 [[package]]
 name = "uv-tool"
@@ -5268,6 +5301,20 @@ dependencies = [
  "uv-virtualenv",
 ]
 
+[[package]]
+name = "uv-trampoline-builder"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "assert_cmd",
+ "assert_fs",
+ "fs-err",
+ "thiserror",
+ "uv-fs",
+ "which",
+ "zip",
+]
+
 [[package]]
 name = "uv-types"
 version = "0.0.1"
@@ -5290,7 +5337,7 @@ dependencies = [
 
 [[package]]
 name = "uv-version"
-version = "0.4.28"
+version = "0.4.30"
 
 [[package]]
 name = "uv-virtualenv"
@@ -5323,7 +5370,6 @@ version = "0.0.1"
 dependencies = [
  "anyhow",
  "assert_fs",
- "either",
  "fs-err",
  "glob",
  "insta",
@@ -5361,6 +5407,14 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
+[[package]]
+name = "version-ranges"
+version = "0.1.0"
+source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -5470,9 +5524,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -5523,9 +5577,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "which"
-version = "6.0.3"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
 dependencies = [
  "either",
  "home",
@@ -5612,7 +5666,7 @@ dependencies = [
  "windows-implement 0.58.0",
  "windows-interface 0.58.0",
  "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
  "windows-targets 0.52.6",
 ]
 
@@ -5667,7 +5721,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
  "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-strings 0.2.0",
  "windows-targets 0.52.6",
 ]
 
@@ -5699,6 +5764,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index c2b4691e9c20..2652cbbc3e89 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -1,35 +1,32 @@
 {
   lib,
   cmake,
-  darwin,
   fetchFromGitHub,
   installShellFiles,
-  libiconv,
   pkg-config,
   python3Packages,
   rustPlatform,
-  stdenv,
   versionCheckHook,
   nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "uv";
-  version = "0.4.28";
+  version = "0.4.30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     rev = "refs/tags/${version}";
-    hash = "sha256-QoEgwMhoqabwbtjOVOW+hgOUuDVZQQ5x+cF6kdWgFvc=";
+    hash = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss=";
-      "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY=";
+      "pubgrub-0.2.1" = "sha256-8TrOQ6fYJrYgFNuqiqnGztnHOqFIEDi2MFZEBA+oks4=";
       "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM=";
       "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ=";
     };
@@ -43,10 +40,6 @@ python3Packages.buildPythonApplication rec {
     rustPlatform.maturinBuildHook
   ];
 
-  buildInputs = [
-    libiconv
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
-
   dontUseCmakeConfigure = true;
 
   cargoBuildFlags = [
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/by-name/uv/uvccapture/package.nix
similarity index 100%
rename from pkgs/applications/video/uvccapture/default.nix
rename to pkgs/by-name/uv/uvccapture/package.nix
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/by-name/uv/uvcdynctrl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/uvcdynctrl/default.nix
rename to pkgs/by-name/uv/uvcdynctrl/package.nix
diff --git a/pkgs/data/fonts/uw-ttyp0/determinism.patch b/pkgs/by-name/uw/uw-ttyp0/determinism.patch
similarity index 100%
rename from pkgs/data/fonts/uw-ttyp0/determinism.patch
rename to pkgs/by-name/uw/uw-ttyp0/determinism.patch
diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/by-name/uw/uw-ttyp0/package.nix
similarity index 100%
rename from pkgs/data/fonts/uw-ttyp0/default.nix
rename to pkgs/by-name/uw/uw-ttyp0/package.nix
diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/by-name/uw/uwc/package.nix
similarity index 100%
rename from pkgs/tools/text/uwc/default.nix
rename to pkgs/by-name/uw/uwc/package.nix
diff --git a/pkgs/tools/networking/uwimap/clang-fix.patch b/pkgs/by-name/uw/uwimap/clang-fix.patch
similarity index 100%
rename from pkgs/tools/networking/uwimap/clang-fix.patch
rename to pkgs/by-name/uw/uwimap/clang-fix.patch
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/by-name/uw/uwimap/package.nix
similarity index 100%
rename from pkgs/tools/networking/uwimap/default.nix
rename to pkgs/by-name/uw/uwimap/package.nix
diff --git a/pkgs/servers/uwsgi/additional-php-ldflags.patch b/pkgs/by-name/uw/uwsgi/additional-php-ldflags.patch
similarity index 100%
rename from pkgs/servers/uwsgi/additional-php-ldflags.patch
rename to pkgs/by-name/uw/uwsgi/additional-php-ldflags.patch
diff --git a/pkgs/servers/uwsgi/nixos.ini b/pkgs/by-name/uw/uwsgi/nixos.ini
similarity index 100%
rename from pkgs/servers/uwsgi/nixos.ini
rename to pkgs/by-name/uw/uwsgi/nixos.ini
diff --git a/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch b/pkgs/by-name/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
similarity index 100%
rename from pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
rename to pkgs/by-name/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/by-name/uw/uwsgi/package.nix
similarity index 100%
rename from pkgs/servers/uwsgi/default.nix
rename to pkgs/by-name/uw/uwsgi/package.nix
diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/by-name/uw/uwufetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/uwufetch/default.nix
rename to pkgs/by-name/uw/uwufetch/package.nix
diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/by-name/uw/uwuify/package.nix
similarity index 100%
rename from pkgs/tools/misc/uwuify/default.nix
rename to pkgs/by-name/uw/uwuify/package.nix
diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index 0a9db5026aa3..e0e95f1f65cf 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2024-09-20";
+  version = "1.0-unstable-2024-10-19";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "f8c53f59b012dd56d44ae50cdf90dd1dad6cce23";
-    hash = "sha256-Ee4hN3OnqF/OhKieGtzT4XOhNJIhywCgP6Us0DZTVBI=";
+    rev = "30ac4bdcb1efed3680f746fd8290f1aeb7a6fd27";
+    hash = "sha256-p+N5zOl9Gjd3C0Vx8t4B9njO1aQ8PTcik6WlsQPGKyU=";
   };
 
   outputs = [ "out" "projects" ];
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
similarity index 100%
rename from pkgs/data/misc/v2ray-domain-list-community/default.nix
rename to pkgs/by-name/v2/v2ray-domain-list-community/package.nix
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/by-name/v2/v2ray-geoip/package.nix
similarity index 100%
rename from pkgs/data/misc/v2ray-geoip/default.nix
rename to pkgs/by-name/v2/v2ray-geoip/package.nix
diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/by-name/v2/v2ray/package.nix
similarity index 100%
rename from pkgs/tools/networking/v2ray/default.nix
rename to pkgs/by-name/v2/v2ray/package.nix
diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/by-name/v2/v2raya/package.nix
similarity index 100%
rename from pkgs/tools/networking/v2raya/default.nix
rename to pkgs/by-name/v2/v2raya/package.nix
diff --git a/pkgs/os-specific/linux/v4l2-relayd/default.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/v4l2-relayd/default.nix
rename to pkgs/by-name/v4/v4l2-relayd/package.nix
diff --git a/pkgs/os-specific/linux/v4l2-relayd/upstream-v4l2loopback-compatibility.patch b/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
similarity index 100%
rename from pkgs/os-specific/linux/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
rename to pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
similarity index 100%
rename from pkgs/development/libraries/vaapi-intel-hybrid/default.nix
rename to pkgs/by-name/va/vaapi-intel-hybrid/package.nix
diff --git a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
rename to pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/by-name/va/vagrant/0004-Support-system-installed-plugins.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
rename to pkgs/by-name/va/vagrant/0004-Support-system-installed-plugins.patch
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix
similarity index 100%
rename from pkgs/development/tools/vagrant/gemset.nix
rename to pkgs/by-name/va/vagrant/gemset.nix
diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/by-name/va/vagrant/gemset_libvirt.nix
similarity index 100%
rename from pkgs/development/tools/vagrant/gemset_libvirt.nix
rename to pkgs/by-name/va/vagrant/gemset_libvirt.nix
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/by-name/va/vagrant/package.nix
similarity index 100%
rename from pkgs/development/tools/vagrant/default.nix
rename to pkgs/by-name/va/vagrant/package.nix
diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
rename to pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/by-name/va/vagrant/use-system-bundler-version.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/use-system-bundler-version.patch
rename to pkgs/by-name/va/vagrant/use-system-bundler-version.patch
diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/pkgs/by-name/va/vagrant/vagrant-libvirt.json.in
similarity index 100%
rename from pkgs/development/tools/vagrant/vagrant-libvirt.json.in
rename to pkgs/by-name/va/vagrant/vagrant-libvirt.json.in
diff --git a/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/by-name/va/vala-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/vala-language-server/default.nix
rename to pkgs/by-name/va/vala-language-server/package.nix
diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/by-name/va/vala-lint/package.nix
similarity index 100%
rename from pkgs/development/tools/vala-lint/default.nix
rename to pkgs/by-name/va/vala-lint/package.nix
diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 4ece69a6f189..7a849967fe3b 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.8.0";
+  version = "3.9.0";
 
   subPackages = [ "cmd/vale" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     rev = "v${version}";
-    hash = "sha256-0opa8F0cpC0uh51JDgofxl6e0oecxgkEufnLfxtkaOw=";
+    hash = "sha256-4zDngF2K6Fsn/Ml4rhHQxDXOD7meXePoqZ9+XPrHO0g=";
   };
 
   vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";
diff --git a/pkgs/by-name/va/valent/package.nix b/pkgs/by-name/va/valent/package.nix
new file mode 100644
index 000000000000..951ebb5a6069
--- /dev/null
+++ b/pkgs/by-name/va/valent/package.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  desktop-file-utils,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  vala,
+  evolution-data-server-gtk4,
+  gdk-pixbuf,
+  glib,
+  glib-networking,
+  gnutls,
+  gst_all_1,
+  json-glib,
+  libadwaita,
+  libpeas2,
+  libphonenumber,
+  libportal-gtk4,
+  pipewire,
+  pulseaudio,
+  tinysparql,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "valent";
+  version = "1.0.0.alpha.46-unstable-2024-10-26";
+
+  src = fetchFromGitHub {
+    owner = "andyholmes";
+    repo = "valent";
+    rev = "165a2791d4bf3e7dee69e3dd7885dbe4948265b9";
+    hash = "sha256-7klvOvwyAg+Xno6zWo8UByjaS9OkOuCceuZcAIEgdyU=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    vala
+  ];
+
+  buildInputs = [
+    evolution-data-server-gtk4
+    gdk-pixbuf
+    glib
+    glib-networking
+    gnutls
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    json-glib
+    libadwaita
+    libpeas2
+    libphonenumber
+    libportal-gtk4
+    pipewire
+    pulseaudio
+    tinysparql
+  ];
+
+  mesonFlags = [
+    (lib.mesonBool "plugin_bluez" true)
+  ];
+
+  meta = {
+    description = "Implementation of the KDE Connect protocol, built on GNOME platform libraries";
+    mainProgram = "valent";
+    longDescription = ''
+      Note that you have to open firewall ports for other devices
+      to connect to it. Use either:
+      ```nix
+      programs.kdeconnect = {
+        enable = true;
+        package = pkgs.valent;
+      }
+      ```
+      or open corresponding firewall ports directly:
+      ```nix
+      networking.firewall = rec {
+        allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
+        allowedUDPPortRanges = allowedTCPPortRanges;
+      }
+      ```
+    '';
+    homepage = "https://valent.andyholmes.ca";
+    changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = with lib.licenses; [
+      gpl3Plus
+      cc0
+      cc-by-sa-30
+    ];
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/tools/text/validator-nu/default.nix b/pkgs/by-name/va/validator-nu/package.nix
similarity index 100%
rename from pkgs/tools/text/validator-nu/default.nix
rename to pkgs/by-name/va/validator-nu/package.nix
diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/by-name/va/vals/package.nix
similarity index 100%
rename from pkgs/tools/security/vals/default.nix
rename to pkgs/by-name/va/vals/package.nix
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/by-name/va/valum/package.nix
similarity index 100%
rename from pkgs/development/web/valum/default.nix
rename to pkgs/by-name/va/valum/package.nix
diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/by-name/va/vamp-plugin-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
rename to pkgs/by-name/va/vamp-plugin-sdk/package.nix
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/by-name/va/vanilla-dmz/package.nix
similarity index 100%
rename from pkgs/data/icons/vanilla-dmz/default.nix
rename to pkgs/by-name/va/vanilla-dmz/package.nix
diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix
index 3fdbfd1cc445..88f341bfb699 100644
--- a/pkgs/by-name/va/vapoursynth/package.nix
+++ b/pkgs/by-name/va/vapoursynth/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth";
-  version = "69";
+  version = "70";
 
   src = fetchFromGitHub {
     owner = "vapoursynth";
     repo = "vapoursynth";
     rev = "R${version}";
-    hash = "sha256-T2bCVNH0dLM9lFYChXzvD6AJM3xEtOVCb2tI10tIXJs=";
+    hash = "sha256-jkRjFKHNTekXluSKQ33QqsGRy7LKnkmG97U5WIjI6EM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/by-name/va/varscan/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/varscan/default.nix
rename to pkgs/by-name/va/varscan/package.nix
diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix
new file mode 100644
index 000000000000..a15c581ffc0b
--- /dev/null
+++ b/pkgs/by-name/va/vassal/package.nix
@@ -0,0 +1,56 @@
+{ lib
+, stdenv
+, fetchzip
+, glib
+, jre
+, makeWrapper
+, wrapGAppsHook3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "VASSAL";
+  version = "3.7.15";
+
+  src = fetchzip {
+    url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
+    sha256 = "sha256-eFFzUssElsLkCLgbojF6VQ8hzn15NYljBH/I7k98LMk=";
+  };
+
+  buildInputs = [
+    glib
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+    wrapGAppsHook3
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/vassal $out/doc
+
+    cp CHANGES LICENSE README.md $out
+    cp -R lib/* $out/share/vassal
+    cp -R doc/* $out/doc
+
+    makeWrapper ${jre}/bin/java $out/bin/vassal \
+      --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \
+      VASSAL.launch.ModuleManager"
+
+    runHook postInstall
+  '';
+
+  # Don't move doc to share/, VASSAL expects it to be in the root
+  forceShare = [ "man" "info" ];
+
+  meta = with lib; {
+      description = "Free, open-source boardgame engine";
+      homepage = "https://vassalengine.org/";
+      sourceProvenance = with sourceTypes; [ binaryBytecode ];
+      license = licenses.lgpl21Only;
+      maintainers = with maintainers; [ tvestelind ];
+      platforms = platforms.unix;
+      mainProgram = "vassal";
+  };
+}
diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/by-name/va/vault-medusa/package.nix
similarity index 100%
rename from pkgs/tools/security/vault-medusa/default.nix
rename to pkgs/by-name/va/vault-medusa/package.nix
diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix
similarity index 100%
rename from pkgs/tools/security/vault-ssh-plus/default.nix
rename to pkgs/by-name/va/vault-ssh-plus/package.nix
diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/by-name/va/vazir-code-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/vazir-code-font/default.nix
rename to pkgs/by-name/va/vazir-code-font/package.nix
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/by-name/va/vazir-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/vazir-fonts/default.nix
rename to pkgs/by-name/va/vazir-fonts/package.nix
diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/by-name/vb/vbam/package.nix
similarity index 100%
rename from pkgs/applications/emulators/vbam/default.nix
rename to pkgs/by-name/vb/vbam/package.nix
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/by-name/vb/vbetool/package.nix
similarity index 100%
rename from pkgs/tools/system/vbetool/default.nix
rename to pkgs/by-name/vb/vbetool/package.nix
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/by-name/vb/vbindiff/package.nix
similarity index 100%
rename from pkgs/applications/editors/vbindiff/default.nix
rename to pkgs/by-name/vb/vbindiff/package.nix
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/by-name/vb/vboot_reference/package.nix
similarity index 100%
rename from pkgs/tools/system/vboot_reference/default.nix
rename to pkgs/by-name/vb/vboot_reference/package.nix
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/by-name/vc/vcal/package.nix
similarity index 100%
rename from pkgs/applications/misc/vcal/default.nix
rename to pkgs/by-name/vc/vcal/package.nix
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/by-name/vc/vcdimager/package.nix
similarity index 100%
rename from pkgs/development/libraries/vcdimager/default.nix
rename to pkgs/by-name/vc/vcdimager/package.nix
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/by-name/vc/vcftools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/vcftools/default.nix
rename to pkgs/by-name/vc/vcftools/package.nix
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/by-name/vc/vcg/package.nix
similarity index 100%
rename from pkgs/development/libraries/vcg/default.nix
rename to pkgs/by-name/vc/vcg/package.nix
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 532c6cb4e42d..f35b29fe33e3 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2024.09.30";
+  version = "2024.10.21";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     rev = finalAttrs.version;
-    hash = "sha256-lPvThSB8xYZQBRKTJmFwoCKBd5lOHaAOttrtcuQDIUg=";
+    hash = "sha256-OBGaNK+gKIdes/7jgvsKshDT19Wv2N6vqUtTDchvu+o=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
diff --git a/pkgs/applications/video/vcs/fonts.patch b/pkgs/by-name/vc/vcs/fonts.patch
similarity index 100%
rename from pkgs/applications/video/vcs/fonts.patch
rename to pkgs/by-name/vc/vcs/fonts.patch
diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/by-name/vc/vcs/package.nix
similarity index 100%
rename from pkgs/applications/video/vcs/default.nix
rename to pkgs/by-name/vc/vcs/package.nix
diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/by-name/vc/vcs_query/package.nix
similarity index 100%
rename from pkgs/tools/misc/vcs_query/default.nix
rename to pkgs/by-name/vc/vcs_query/package.nix
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/by-name/vc/vcsh/package.nix
similarity index 100%
rename from pkgs/applications/version-management/vcsh/default.nix
rename to pkgs/by-name/vc/vcsh/package.nix
diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/by-name/vc/vcsi/package.nix
similarity index 100%
rename from pkgs/tools/video/vcsi/default.nix
rename to pkgs/by-name/vc/vcsi/package.nix
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/by-name/vc/vcstool/package.nix
similarity index 100%
rename from pkgs/development/tools/vcstool/default.nix
rename to pkgs/by-name/vc/vcstool/package.nix
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/by-name/vc/vcv-rack/package.nix
similarity index 100%
rename from pkgs/applications/audio/vcv-rack/default.nix
rename to pkgs/by-name/vc/vcv-rack/package.nix
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch
similarity index 100%
rename from pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
rename to pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/by-name/vd/vde2/package.nix
similarity index 100%
rename from pkgs/tools/networking/vde2/default.nix
rename to pkgs/by-name/vd/vde2/package.nix
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/by-name/vd/vdmfec/package.nix
similarity index 100%
rename from pkgs/applications/backup/vdmfec/default.nix
rename to pkgs/by-name/vd/vdmfec/package.nix
diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
new file mode 100644
index 000000000000..bbfb8c36d725
--- /dev/null
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -0,0 +1,65 @@
+{ lib, stdenv
+, fetchFromGitHub
+, installShellFiles
+, libuuid
+, lvm2_dmeventd  # 
+, zlib
+, python3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vdo";
+  version = "8.3.0.72";
+
+  src = fetchFromGitHub {
+    owner = "dm-vdo";
+    repo = pname;
+    rev = version;
+    hash = "sha256-ILS5cUWR04/GePyXHj00Am4HMDAhAaN/uUe7kchjo/8=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  buildInputs = [
+    libuuid
+    lvm2_dmeventd
+    zlib
+    python3.pkgs.wrapPython
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pyyaml
+  ];
+
+  pythonPath = propagatedBuildInputs;
+
+  makeFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "INSTALLOWNER="
+    # all of these paths are relative to DESTDIR and have defaults that don't work for us
+    "bindir=/bin"
+    "defaultdocdir=/share/doc"
+    "mandir=/share/man"
+    "python3_sitelib=${python3.sitePackages}"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    installShellCompletion --bash $out/usr/share/bash-completion/completions/*
+    rm -rv $out/usr
+
+    wrapPythonPrograms
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/dm-vdo/vdo";
+    description = "Set of userspace tools for managing pools of deduplicated and/or compressed block storage";
+    # platforms are defined in https://github.com/dm-vdo/vdo/blob/master/utils/uds/atomicDefs.h
+    platforms = [ "x86_64-linux" "aarch64-linux" "s390-linux" "powerpc64-linux" "powerpc64le-linux" ];
+    license = with licenses; [ gpl2Plus ];
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/by-name/vd/vdpauinfo/package.nix
similarity index 100%
rename from pkgs/tools/X11/vdpauinfo/default.nix
rename to pkgs/by-name/vd/vdpauinfo/package.nix
diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/by-name/vd/vdrift/0001-Ignore-missing-data-for-installation.patch
similarity index 100%
rename from pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
rename to pkgs/by-name/vd/vdrift/0001-Ignore-missing-data-for-installation.patch
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/by-name/vd/vdrift/package.nix
similarity index 100%
rename from pkgs/games/vdrift/default.nix
rename to pkgs/by-name/vd/vdrift/package.nix
diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/by-name/vd/vdrsymbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/vdrsymbols/default.nix
rename to pkgs/by-name/vd/vdrsymbols/package.nix
diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/by-name/ve/vectoroids/package.nix
similarity index 100%
rename from pkgs/games/vectoroids/default.nix
rename to pkgs/by-name/ve/vectoroids/package.nix
diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/by-name/ve/vectorscan/package.nix
similarity index 100%
rename from pkgs/development/libraries/vectorscan/default.nix
rename to pkgs/by-name/ve/vectorscan/package.nix
diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/by-name/ve/vegeta/package.nix
similarity index 100%
rename from pkgs/tools/networking/vegeta/default.nix
rename to pkgs/by-name/ve/vegeta/package.nix
diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/by-name/ve/vegur/package.nix
similarity index 100%
rename from pkgs/data/fonts/vegur/default.nix
rename to pkgs/by-name/ve/vegur/package.nix
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 981e5d08a4a9..1bcbeadc7d69 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,19 +14,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.10.5";
+  version = "1.10.6";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pzb2x5tTDT6yUNURbAok5eQWZHaxP/RUo8T0JECKHJ4=";
+    hash = "sha256-Pp8QpagTgWWHoC+e/iGfEveQYuMDDX7Oz1IAUx8cp3A=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname src;
 
-    hash = "sha256-YBWe4MEmFu8cksOIxuTK0deO7q0QuqgOUc9WkUNBwp0=";
+    hash = "sha256-vVzERis1W3QZB/i6SQR9dQR56yDWadKWvFr+nLTQY9Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/by-name/ve/vendir/package.nix
similarity index 100%
rename from pkgs/development/tools/vendir/default.nix
rename to pkgs/by-name/ve/vendir/package.nix
diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/by-name/ve/venta/package.nix
similarity index 100%
rename from pkgs/data/themes/venta/default.nix
rename to pkgs/by-name/ve/venta/package.nix
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/by-name/ve/verbiste/package.nix
similarity index 100%
rename from pkgs/applications/misc/verbiste/default.nix
rename to pkgs/by-name/ve/verbiste/package.nix
diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/by-name/ve/verco/package.nix
similarity index 100%
rename from pkgs/applications/version-management/verco/default.nix
rename to pkgs/by-name/ve/verco/package.nix
diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix
new file mode 100644
index 000000000000..3f990a6fb554
--- /dev/null
+++ b/pkgs/by-name/ve/verifast/package.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype
+, fontconfig, libxml2, gnome2 }:
+
+let
+
+  libPath = lib.makeLibraryPath
+    [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo
+      freetype fontconfig libxml2 gnome2.gtksourceview
+    ] + ":${lib.getLib stdenv.cc.cc}/lib64:$out/libexec";
+
+  patchExe = x: ''
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath} ${x}
+  '';
+
+  patchLib = x: ''
+    patchelf --set-rpath ${libPath} ${x}
+  '';
+
+in
+stdenv.mkDerivation rec {
+  pname = "verifast";
+  version = "24.08.30";
+
+  src = fetchurl {
+    url    = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz";
+    sha256 = "sha256-hIS5e+zVlxSOqr1/ZDy0PangyWjB9uLCvN8Qr688msg=";
+  };
+
+  dontConfigure = true;
+  dontStrip = true;
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R bin $out/libexec
+
+    ${patchExe "$out/libexec/verifast"}
+    ${patchExe "$out/libexec/vfide"}
+    ${patchLib "$out/libexec/libz3.so"}
+    ln -s $out/libexec/verifast $out/bin/verifast
+    ln -s $out/libexec/vfide    $out/bin/vfide
+  '';
+
+  meta = {
+    description = "Verification for C and Java programs via separation logic";
+    homepage    = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license     = lib.licenses.mit;
+    platforms   = [ "x86_64-linux" ];
+    maintainers = [ lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/by-name/ve/verilator/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/verilator/default.nix
rename to pkgs/by-name/ve/verilator/package.nix
diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index 7f960aa06ce4..c0f2c33d2e71 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "versatiles";
-  version = "0.12.10"; # When updating: Replace with current version
+  version = "0.13.0"; # When updating: Replace with current version
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-LKUpxsAy39dX8hESlUEVs4rkOpYsd7kbATfnU1QYd9Q="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    hash = "sha256-6HuBKRvt6P4GpFaIiYsGO/8wcjML2UDdUFoYvIM/Z0k="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
-  cargoHash = "sha256-dkFnoQY1+VNNrjS+o5Y0cvhWKoHt38KJKyNhCQ0dGaY="; # When updating: Same as above
+  cargoHash = "sha256-7kJf6BHNRfLDFRZp8Q2M2ZGXH0NzG/QBqw5/s20AIm4="; # When updating: Same as above
 
   # Testing only necessary for the `bins` and `lib` features
   cargoTestFlags = [
diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/by-name/ve/versus/package.nix
similarity index 100%
rename from pkgs/applications/networking/versus/default.nix
rename to pkgs/by-name/ve/versus/package.nix
diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/by-name/ve/veryfasttree/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/veryfasttree/default.nix
rename to pkgs/by-name/ve/veryfasttree/package.nix
diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index febb85b3c9b7..c59dc81710e5 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veryl";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "veryl-lang";
     repo = "veryl";
     rev = "v${version}";
-    hash = "sha256-YcYP7JO27Fv/LTrxbQ0vNqwBE6anGjeTFS31MAp2ip4=";
+    hash = "sha256-LSQ3ZM7BWXiwBqlw6usImpt+w+wC2EvkoAMblTb0pvg=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-HvT56jBmFTWUdzHjyPVaJ3wuMD01omCFEIEJ53JrKY4=";
+  cargoHash = "sha256-w7mB0cAN5aRO1pw21BDIFUtnYUJUoYjW+7nXFCBfYgM=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index bfe935453489..02b11d55baa3 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     pipewire
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   patches =
@@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/{Applications,bin}
-      mv dist/mac*/Vesktop.App $out/Applications
+      mv dist/mac*/Vesktop.app $out/Applications/Vesktop.app
     ''
     + ''
       runHook postInstall
diff --git a/pkgs/tools/security/vexctl/default.nix b/pkgs/by-name/ve/vexctl/package.nix
similarity index 100%
rename from pkgs/tools/security/vexctl/default.nix
rename to pkgs/by-name/ve/vexctl/package.nix
diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/by-name/vg/vgmplay-libvgm/package.nix
similarity index 100%
rename from pkgs/applications/audio/vgmplay-libvgm/default.nix
rename to pkgs/by-name/vg/vgmplay-libvgm/package.nix
diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/by-name/vg/vgmtools/package.nix
similarity index 100%
rename from pkgs/tools/audio/vgmtools/default.nix
rename to pkgs/by-name/vg/vgmtools/package.nix
diff --git a/pkgs/by-name/vg/vgmtrans/package.nix b/pkgs/by-name/vg/vgmtrans/package.nix
new file mode 100644
index 000000000000..8feb722e116f
--- /dev/null
+++ b/pkgs/by-name/vg/vgmtrans/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch2,
+  cmake,
+  ninja,
+  qt6,
+  spdlog,
+  zlib-ng,
+  minizip-ng,
+  libbass,
+  libbassmidi,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vgmtrans";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "vgmtrans";
+    repo = "vgmtrans";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-HVC45B1DFThZRkPVrroiay+9ufkOrTMUZoNIuC1CjjM=";
+  };
+
+  patches = [
+    # https://github.com/vgmtrans/vgmtrans/pull/567
+    (fetchpatch2 {
+      name = "fix-version-string.patch";
+      url = "https://github.com/vgmtrans/vgmtrans/commit/5ad8a60a19476d2ae9a7c409b83ab6d5e1ff827f.patch?full_index=1";
+      hash = "sha256-I5ykYzj3tUBQ2e3TAnCm5Ry1Hmmi2IVneFQCe5/JV/A=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtsvg
+    libbass
+    libbassmidi
+  ];
+
+  preConfigure = ''
+    rm -r lib/{spdlog,zlib-ng,minizip-ng}
+    ln -s ${spdlog.src} lib/spdlog
+    ln -s ${zlib-ng.src} lib/zlib-ng
+    ln -s ${minizip-ng.src} lib/minizip-ng
+  '';
+
+  meta = {
+    description = "Tool to convert proprietary, sequenced videogame music to industry-standard formats";
+    homepage = "https://github.com/vgmtrans/vgmtrans";
+    license = with lib.licenses; [
+      zlib
+      libpng
+      bsd3 # oki_adpcm_state
+    ];
+    # See CMakePresets.json
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+      "x86_64-windows"
+      "aarch64-windows"
+    ];
+    maintainers = with lib.maintainers; [ pluiedev ];
+    mainProgram = "vgmtrans";
+  };
+})
diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/by-name/vg/vgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/vgrep/default.nix
rename to pkgs/by-name/vg/vgrep/package.nix
diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/by-name/vh/vhd2vl/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/vhd2vl/default.nix
rename to pkgs/by-name/vh/vhd2vl/package.nix
diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/by-name/vh/vhdl-ls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/vhdl-ls/default.nix
rename to pkgs/by-name/vh/vhdl-ls/package.nix
diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/by-name/vh/vhs/package.nix
similarity index 100%
rename from pkgs/applications/misc/vhs/default.nix
rename to pkgs/by-name/vh/vhs/package.nix
diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/by-name/vi/via/package.nix
similarity index 100%
rename from pkgs/tools/misc/via/default.nix
rename to pkgs/by-name/vi/via/package.nix
diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/by-name/vi/vial/package.nix
similarity index 100%
rename from pkgs/tools/misc/vial/default.nix
rename to pkgs/by-name/vi/vial/package.nix
diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/by-name/vi/vice/package.nix
similarity index 100%
rename from pkgs/applications/emulators/vice/default.nix
rename to pkgs/by-name/vi/vice/package.nix
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/by-name/vi/victor-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/victor-mono/default.nix
rename to pkgs/by-name/vi/victor-mono/package.nix
diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index 293990d4d545..9436e2a8d5f4 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -6,21 +6,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viddy";
-  version = "1.1.5";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
     rev = "v${version}";
-    hash = "sha256-RewzToI7vhaH8r6ZWDLgfSJOOCm26Udkzh9+xkJP2jE=";
+    hash = "sha256-r+zgZutBwNRLYNltdSaIB5lS4qHAhI5XL3iFF+FVd64=";
   };
 
-  cargoHash = "sha256-NhgiaUEUTfsbVqFkBgLPc3A8XmtwgQ5tp673zFD4TGI=";
+  cargoHash = "sha256-rEz3GFfqtSzZa0r4Nwbu3gEf7GhsOkfawaFaNplD/tE=";
 
   # requires nightly features
   env.RUSTC_BOOTSTRAP = 1;
 
-  env.VERGEN_BUILD_DATE = "2024-09-30"; # managed via the update script
+  env.VERGEN_BUILD_DATE = "2024-10-13"; # managed via the update script
   env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
 
   passthru.updateScript.command = [ ./update.sh ];
diff --git a/pkgs/by-name/vi/viddy/update.sh b/pkgs/by-name/vi/viddy/update.sh
index 4740effde4a2..ae1586d7e00d 100755
--- a/pkgs/by-name/vi/viddy/update.sh
+++ b/pkgs/by-name/vi/viddy/update.sh
@@ -35,10 +35,10 @@ update-source-version viddy "${latestVersion}"
 
 pushd "$SCRIPT_DIR"
 # Build date
-sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' default.nix
+sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' package.nix
 
 # Hashes
 # https://github.com/msteen/nix-prefetch/issues/51
 cargoHash=$(nix-prefetch --option extra-experimental-features flakes "{ sha256 }: (import $NIXPKGS_DIR {}).viddy.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
-sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' default.nix
+sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' package.nix
 popd
diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix
index dc94d051e4e7..003a23b08210 100644
--- a/pkgs/by-name/vi/video-trimmer/package.nix
+++ b/pkgs/by-name/vi/video-trimmer/package.nix
@@ -19,20 +19,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "video-trimmer";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "YaLTeR";
     repo = "video-trimmer";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-GXFbfebwiESplOeYDWxBH8Q0SCgV0vePYV7rv0qgrHM=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-4B3NNGww+UjI/VbsKL62vWlKye7NYXYPzlJ4TfywJDw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit (finalAttrs) src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
-    hash = "sha256-szxJzBFtyFZ1T5TZb2MDPFJzn+EYETa/JbPdlg6UrTk=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-vtV5TrF81TK4PUwzOF/CuDsKH1vTLO+4PFufyIOp2zk=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  strictDeps = true;
+
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix PATH : "${lib.makeBinPath [ ffmpeg-headless ]}"
diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/by-name/vi/viennarna/package.nix
similarity index 100%
rename from pkgs/applications/science/molecular-dynamics/viennarna/default.nix
rename to pkgs/by-name/vi/viennarna/package.nix
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/by-name/vi/viewnior/package.nix
similarity index 100%
rename from pkgs/applications/graphics/viewnior/default.nix
rename to pkgs/by-name/vi/viewnior/package.nix
diff --git a/pkgs/applications/file-managers/vifm/default.nix b/pkgs/by-name/vi/vifm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/vifm/default.nix
rename to pkgs/by-name/vi/vifm/package.nix
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/by-name/vi/viking/package.nix
similarity index 100%
rename from pkgs/applications/misc/viking/default.nix
rename to pkgs/by-name/vi/viking/package.nix
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/by-name/vi/vim-vint/package.nix
similarity index 100%
rename from pkgs/development/tools/vim-vint/default.nix
rename to pkgs/by-name/vi/vim-vint/package.nix
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/vimb/default.nix
rename to pkgs/by-name/vi/vimb-unwrapped/package.nix
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/by-name/vi/vimer/package.nix
similarity index 100%
rename from pkgs/tools/misc/vimer/default.nix
rename to pkgs/by-name/vi/vimer/package.nix
diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/by-name/vi/vimiv-qt/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vimiv-qt/default.nix
rename to pkgs/by-name/vi/vimiv-qt/package.nix
diff --git a/pkgs/data/icons/vimix-cursor-theme/default.nix b/pkgs/by-name/vi/vimix-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/vimix-cursor-theme/default.nix
rename to pkgs/by-name/vi/vimix-cursor-theme/package.nix
diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/vimix/default.nix
rename to pkgs/by-name/vi/vimix-gtk-themes/package.nix
diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/vimix-icon-theme/default.nix
rename to pkgs/by-name/vi/vimix-icon-theme/package.nix
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/by-name/vi/vimpc/package.nix
similarity index 100%
rename from pkgs/applications/audio/vimpc/default.nix
rename to pkgs/by-name/vi/vimpc/package.nix
diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix
new file mode 100644
index 000000000000..ebd812c3f762
--- /dev/null
+++ b/pkgs/by-name/vi/vimv-rs/package.nix
@@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchCrate, stdenv, apple-sdk_11 }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "vimv-rs";
+  version = "3.1.0";
+
+  src = fetchCrate {
+    inherit version;
+    crateName = "vimv";
+    hash = "sha256-jbRsgEsRYF5hlvo0jEB4jhy5jzCAXNzOsNWWyh4XULQ=";
+  };
+
+  cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M=";
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+
+  meta = with lib; {
+    description = "Command line utility for batch-renaming files";
+    homepage = "https://www.dmulholl.com/dev/vimv.html";
+    license = licenses.bsd0;
+    mainProgram = "vimv";
+    maintainers = with maintainers; [ zowoq ];
+  };
+}
diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/by-name/vi/vimv/package.nix
similarity index 100%
rename from pkgs/tools/misc/vimv/default.nix
rename to pkgs/by-name/vi/vimv/package.nix
diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/by-name/vi/vintagestory/package.nix
similarity index 100%
rename from pkgs/games/vintagestory/default.nix
rename to pkgs/by-name/vi/vintagestory/package.nix
diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/by-name/vi/viper4linux/package.nix
similarity index 100%
rename from pkgs/applications/audio/viper4linux/default.nix
rename to pkgs/by-name/vi/viper4linux/package.nix
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
new file mode 100644
index 000000000000..ca866f148441
--- /dev/null
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -0,0 +1,169 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # Native build inputs
+  docbook-xsl-nons,
+  gobject-introspection,
+  gtk-doc,
+  meson,
+  ninja,
+  pkg-config,
+
+  # Build inputs
+  ApplicationServices,
+  expat,
+  Foundation,
+  glib,
+  libxml2,
+  python3,
+
+  # Optional dependencies
+  cfitsio,
+  cgif,
+  fftw,
+  imagemagick,
+  lcms2,
+  libarchive,
+  libexif,
+  libheif,
+  libhwy,
+  libimagequant,
+  libjpeg,
+  libjxl,
+  librsvg,
+  libspng,
+  libtiff,
+  libwebp,
+  matio,
+  openexr,
+  openjpeg,
+  openslide,
+  pango,
+  poppler,
+
+  # passthru
+  testers,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vips";
+  version = "8.15.5";
+
+  outputs = [
+    "bin"
+    "out"
+    "man"
+    "dev"
+  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ];
+
+  src = fetchFromGitHub {
+    owner = "libvips";
+    repo = "libvips";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-Lwe4lu3kS1WxgbM0eRfrMf/UIpDebvooHKvyVv7lq24=";
+    # Remove unicode file names which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalisation.
+    postFetch = ''
+      rm -r $out/test/test-suite/images/
+    '';
+  };
+
+  nativeBuildInputs =
+    [
+      docbook-xsl-nons
+      gobject-introspection
+      meson
+      ninja
+      pkg-config
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      gtk-doc
+    ];
+
+  buildInputs =
+    [
+      glib
+      libxml2
+      expat
+      (python3.withPackages (p: [ p.pycairo ]))
+
+      # Optional dependencies
+      cfitsio
+      cgif
+      fftw
+      imagemagick
+      lcms2
+      libarchive
+      libexif
+      libheif
+      libhwy
+      libimagequant
+      libjpeg
+      libjxl
+      librsvg
+      libspng
+      libtiff
+      libwebp
+      matio
+      openexr
+      openjpeg
+      openslide
+      pango
+      poppler
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      ApplicationServices
+      Foundation
+    ];
+
+  # Required by .pc file
+  propagatedBuildInputs = [
+    glib
+  ];
+
+  mesonFlags =
+    [
+      (lib.mesonEnable "pdfium" false)
+      (lib.mesonEnable "nifti" false)
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) (lib.mesonBool "gtk_doc" true)
+    ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
+
+  passthru = {
+    tests = {
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+      };
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = "vips --version";
+      };
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v([0-9.]+)"
+      ];
+    };
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog";
+    homepage = "https://www.libvips.org/";
+    description = "Image processing system for large images";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [
+      kovirobi
+      anthonyroussel
+    ];
+    pkgConfigModules = [
+      "vips"
+      "vips-cpp"
+    ];
+    platforms = platforms.unix;
+    mainProgram = "vips";
+  };
+})
diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/by-name/vi/vipsdisp/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vipsdisp/default.nix
rename to pkgs/by-name/vi/vipsdisp/package.nix
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/by-name/vi/virglrenderer/package.nix
similarity index 100%
rename from pkgs/development/libraries/virglrenderer/default.nix
rename to pkgs/by-name/vi/virglrenderer/package.nix
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/by-name/vi/virt-viewer/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/virt-viewer/default.nix
rename to pkgs/by-name/vi/virt-viewer/package.nix
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/by-name/vi/virt-what/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/virt-what/default.nix
rename to pkgs/by-name/vi/virt-what/package.nix
diff --git a/pkgs/by-name/vi/virter/package.nix b/pkgs/by-name/vi/virter/package.nix
new file mode 100644
index 000000000000..2b172cfe3d26
--- /dev/null
+++ b/pkgs/by-name/vi/virter/package.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "virter";
+  version = "0.28.0";
+
+  src = fetchFromGitHub {
+    owner = "LINBIT";
+    repo = "virter";
+    rev = "v${version}";
+    hash = "sha256-/AhC7eQE9ITvXcK228ZgcIOaSs0osjdFZI/0jHL7mqc=";
+  };
+
+  vendorHash = "sha256-v3rM45hijJKNxW43VhwcL3R2heZLA70RzqBXYeOYgRY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/LINBIT/virter/cmd.version=${version}"
+    "-X github.com/LINBIT/virter/cmd.builddate=builtByNix"
+    "-X github.com/LINBIT/virter/cmd.githash=builtByNix"
+  ];
+
+  # requires network access
+  doCheck = false;
+
+  meta = {
+    description = "Command line tool for simple creation and cloning of virtual machines based on libvirt";
+    homepage = "https://github.com/LINBIT/virter";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dit7ya ];
+    mainProgram = "virter";
+  };
+}
diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/by-name/vi/virtiofsd/package.nix
similarity index 100%
rename from pkgs/servers/misc/virtiofsd/default.nix
rename to pkgs/by-name/vi/virtiofsd/package.nix
diff --git a/pkgs/by-name/vi/virtual-ans/package.nix b/pkgs/by-name/vi/virtual-ans/package.nix
new file mode 100644
index 000000000000..4a7467da125d
--- /dev/null
+++ b/pkgs/by-name/vi/virtual-ans/package.nix
@@ -0,0 +1,90 @@
+{ lib, stdenv
+, fetchzip
+, libX11
+, libXi
+, libGL
+, alsa-lib
+, SDL2
+, autoPatchelfHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "virtual-ans";
+  version = "3.0.3";
+
+  src = fetchzip {
+    url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip";
+    sha256 = "sha256-tqR7icgURUFOyLJ8+mS17JRf2gK53I2FW/2m8IJPtJE=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    libX11
+    libXi
+    libGL
+    alsa-lib
+    SDL2
+  ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R ./* $out/
+
+    # Remove all executables except for current architecture
+    ls -1d $out/START*              | grep -v ${startScript}     | xargs rm -rf
+    ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf
+
+    # Start script performs relative search for resources, so it cannot be moved
+    # to bin directory
+    ln -s $out/${startScript} $out/bin/virtual-ans
+  '';
+
+  startScript = if stdenv.hostPlatform.isx86_32 then "START_LINUX_X86"
+    else        if stdenv.hostPlatform.isx86_64 then "START_LINUX_X86_64"
+    #else        if stdenv.hostPlatform.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin
+    else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}.";
+
+  linuxExecutable = if stdenv.hostPlatform.isx86_32 then "pixilang_linux_x86"
+    else            if stdenv.hostPlatform.isx86_64 then "pixilang_linux_x86_64"
+    else                                    "";
+
+  meta = with lib; {
+    description = "Photoelectronic microtonal/spectral musical instrument";
+    longDescription = ''
+      Virtual ANS is a software simulator of the unique Russian synthesizer ANS
+      - photoelectronic musical instrument created by Evgeny Murzin from 1938 to
+      1958. The ANS made it possible to draw music in the form of a spectrogram
+      (sonogram), without live instruments and performers. It was used by
+      Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet
+      composers in their experimental works. You can also hear the sound of the
+      ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker.
+
+      The simulator extends the capabilities of the original instrument. Now
+      it's a full-featured graphics editor where you can convert sound into an
+      image, load and play pictures, draw microtonal/spectral music and create
+      some unusual deep atmospheric sounds. This app is for everyone who loves
+      experiments and is looking for something new.
+
+      Key features:
+
+      + unlimited number of pure tone generators;
+      + powerful sonogram editor - you can draw the spectrum and play it at the same time;
+      + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa;
+      + support for MIDI devices;
+      + polyphonic synth mode with MIDI mapping;
+      + supported file formats: WAV, AIFF, PNG, JPEG, GIF;
+      + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA.
+      '';
+    homepage = "https://warmplace.ru/soft/ans/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.unfreeRedistributable;
+    # I cannot test the Darwin version, so I'll leave it disabled
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ jacg ];
+  };
+
+}
diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/by-name/vi/virtualpg/package.nix
similarity index 100%
rename from pkgs/development/libraries/virtualpg/default.nix
rename to pkgs/by-name/vi/virtualpg/package.nix
diff --git a/pkgs/data/fonts/vista-fonts-chs/no-op.conf b/pkgs/by-name/vi/vistafonts-chs/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-chs/no-op.conf
rename to pkgs/by-name/vi/vistafonts-chs/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/by-name/vi/vistafonts-chs/package.nix
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-chs/default.nix
rename to pkgs/by-name/vi/vistafonts-chs/package.nix
diff --git a/pkgs/data/fonts/vista-fonts-cht/no-op.conf b/pkgs/by-name/vi/vistafonts-cht/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-cht/no-op.conf
rename to pkgs/by-name/vi/vistafonts-cht/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts-cht/default.nix b/pkgs/by-name/vi/vistafonts-cht/package.nix
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-cht/default.nix
rename to pkgs/by-name/vi/vistafonts-cht/package.nix
diff --git a/pkgs/data/fonts/vista-fonts/no-op.conf b/pkgs/by-name/vi/vistafonts/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/vista-fonts/no-op.conf
rename to pkgs/by-name/vi/vistafonts/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/by-name/vi/vistafonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/vista-fonts/default.nix
rename to pkgs/by-name/vi/vistafonts/package.nix
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/by-name/vi/visualvm/package.nix
similarity index 100%
rename from pkgs/development/tools/java/visualvm/default.nix
rename to pkgs/by-name/vi/visualvm/package.nix
diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/by-name/vi/vit/package.nix
similarity index 100%
rename from pkgs/applications/misc/vit/default.nix
rename to pkgs/by-name/vi/vit/package.nix
diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix
new file mode 100644
index 000000000000..8a794925a7f3
--- /dev/null
+++ b/pkgs/by-name/vi/vital/package.nix
@@ -0,0 +1,67 @@
+{ lib
+, stdenv
+, fetchzip
+, autoPatchelfHook
+, makeBinaryWrapper
+
+, alsa-lib
+, libjack2
+, curl
+, xorg
+, libGL
+, freetype
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vital";
+  version = "1.5.5";
+
+  src = fetchzip {
+    url = "https://builds.vital.audio/VitalAudio/vital/${builtins.replaceStrings ["."] ["_"] finalAttrs.version}/VitalInstaller.zip";
+    hash = "sha256-hCwXSUiBB0YpQ1oN6adLprwAoel6f72tBG5fEb61OCI=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    alsa-lib
+    (lib.getLib stdenv.cc.cc)
+    libGL
+    xorg.libSM
+    xorg.libICE
+    xorg.libX11
+    freetype
+    libjack2
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    # copy each output to its destination (individually)
+    mkdir -p $out/{bin,lib/{clap,vst,vst3}}
+    for f in bin/Vital lib/{clap/Vital.clap,vst/Vital.so,vst3/Vital.vst3}; do
+      cp -r $f $out/$f
+    done
+
+    wrapProgram $out/bin/Vital \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl libjack2 ]}"
+
+    runHook postInstall
+  '';
+
+
+  meta = with lib; {
+    description = "Spectral warping wavetable synth";
+    homepage = "https://vital.audio/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = with licenses; [ unfree gpl3Plus ];
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ PowerUser64 ];
+    mainProgram = "Vital";
+  };
+})
diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/by-name/vi/vitess/package.nix
similarity index 100%
rename from pkgs/development/tools/database/vitess/default.nix
rename to pkgs/by-name/vi/vitess/package.nix
diff --git a/pkgs/games/vitetris/default.nix b/pkgs/by-name/vi/vitetris/package.nix
similarity index 100%
rename from pkgs/games/vitetris/default.nix
rename to pkgs/by-name/vi/vitetris/package.nix
diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/by-name/vi/viu/package.nix
similarity index 100%
rename from pkgs/tools/graphics/viu/default.nix
rename to pkgs/by-name/vi/viu/package.nix
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/by-name/vi/vivid/package.nix
similarity index 100%
rename from pkgs/tools/misc/vivid/default.nix
rename to pkgs/by-name/vi/vivid/package.nix
diff --git a/pkgs/by-name/vi/vix/package.nix b/pkgs/by-name/vi/vix/package.nix
new file mode 100644
index 000000000000..8b6eeb912fcc
--- /dev/null
+++ b/pkgs/by-name/vi/vix/package.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL }:
+
+stdenv.mkDerivation {
+  pname = "vix";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "BatchDrake";
+    repo = "vix";
+    rev = "824b6755157a0f7430a0be0af454487d1492204d";
+    sha256 = "1y0a2sajkrsg36px21b8lgx1irf0pyj7hccyd6k806bm4zhgxw1z";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  configureFlags = [
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
+  ];
+
+  buildInputs = [ SDL ];
+
+  meta = with lib; {
+    description = "Visual Interface heXadecimal dump";
+    homepage = "http://actinid.org/vix/";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.ehmry ];
+    mainProgram = "vix";
+    # sys/io.h missing on other platforms
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix
similarity index 100%
rename from pkgs/development/libraries/vk-bootstrap/default.nix
rename to pkgs/by-name/vk/vk-bootstrap/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/by-name/vk/vk-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/vk-cli/default.nix
rename to pkgs/by-name/vk/vk-cli/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/by-name/vk/vk-messenger/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
rename to pkgs/by-name/vk/vk-messenger/package.nix
diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vkbasalt-cli/default.nix
rename to pkgs/by-name/vk/vkbasalt-cli/package.nix
diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index eba5b7014300..b7835e8a9409 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkd3d";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchFromGitLab {
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "vkd3d";
     rev = "vkd3d-${finalAttrs.version}";
-    hash = "sha256-9FNuWtfJJqkSZ3O11G22aNp8PfseLHH4oyL6MulNwMY=";
+    hash = "sha256-5G+cdK3rJWlEbJN7uPspPyTtjVk4v/sTg134tZo1CTI=";
   };
 
   outputs = [ "out" "dev" "lib" ];
diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/by-name/vk/vkdisplayinfo/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vkdisplayinfo/default.nix
rename to pkgs/by-name/vk/vkdisplayinfo/package.nix
diff --git a/pkgs/by-name/vk/vkdt/Cargo.lock b/pkgs/by-name/vk/vkdt/Cargo.lock
new file mode 100644
index 000000000000..2cdb0e8c366b
--- /dev/null
+++ b/pkgs/by-name/vk/vkdt/Cargo.lock
@@ -0,0 +1,1353 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "adler32"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide 0.7.4",
+ "object",
+ "rustc-demangle",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitstream-io"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytemuck"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+
+[[package]]
+name = "cc"
+version = "1.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "dary_heap"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "enumn"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[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 0.7.4",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.8.0",
+]
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gimli"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[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.158"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+
+[[package]]
+name = "libflate"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e"
+dependencies = [
+ "adler32",
+ "core2",
+ "crc32fast",
+ "dary_heap",
+ "libflate_lz77",
+]
+
+[[package]]
+name = "libflate_lz77"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
+dependencies = [
+ "core2",
+ "hashbrown",
+ "rle-decode-fast",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "multiversion"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142"
+dependencies = [
+ "multiversion-macros",
+ "target-features",
+]
+
+[[package]]
+name = "multiversion-macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "target-features",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "object"
+version = "0.36.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide 0.7.4",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rawler"
+version = "0.6.3"
+source = "git+https://github.com/dnglab/dnglab?branch=main#51d1a746797893108c99897d5f43c70a46598256"
+dependencies = [
+ "async-trait",
+ "backtrace",
+ "bitstream-io",
+ "byteorder",
+ "chrono",
+ "enumn",
+ "futures",
+ "glob",
+ "hex",
+ "image",
+ "itertools",
+ "lazy_static",
+ "libc",
+ "libflate",
+ "log",
+ "md5",
+ "multiversion",
+ "num_enum",
+ "rayon",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "toml",
+ "uuid",
+ "weezl",
+]
+
+[[package]]
+name = "rawloader-clib"
+version = "0.1.0"
+dependencies = [
+ "libc",
+ "rawler",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "rle-decode-fast"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[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.209"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.209"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.127"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-features"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
+
+[[package]]
+name = "thiserror"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
+[[package]]
+name = "tokio"
+version = "1.39.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.20",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.18",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+dependencies = [
+ "getrandom",
+ "serde",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+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.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[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.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
diff --git a/pkgs/by-name/vk/vkdt/package.nix b/pkgs/by-name/vk/vkdt/package.nix
new file mode 100644
index 000000000000..41380271dd7d
--- /dev/null
+++ b/pkgs/by-name/vk/vkdt/package.nix
@@ -0,0 +1,93 @@
+{ lib
+, stdenv
+, fetchurl
+, vulkan-headers
+, vulkan-tools
+, vulkan-loader
+, glslang
+, glfw
+, libjpeg
+, pkg-config
+, rsync
+, cmake
+, clang
+, llvm
+, llvmPackages
+, pugixml
+, freetype
+, exiv2
+, ffmpeg
+, libvorbis
+, libmad
+, testers
+, vkdt
+, xxd
+, alsa-lib
+, cargo
+, rustPlatform
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vkdt";
+  version = "0.9.0";
+
+  src = fetchurl {
+    url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-LXUTDwUjlfyhtXkYW4Zivqt8vyctoz+ID5AQ7gg+d9A=";
+  };
+
+  strictDeps = true;
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "rawler-0.6.3" = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw=";
+    };
+  };
+  cargoRoot = "src/pipe/modules/i-raw/rawloader-c";
+
+  nativeBuildInputs = [
+    cargo
+    clang
+    cmake
+    glslang
+    llvm
+    llvmPackages.openmp
+    pkg-config
+    rsync
+    rustPlatform.cargoSetupHook
+    xxd
+  ];
+
+  buildInputs = [
+    alsa-lib
+    exiv2
+    ffmpeg
+    freetype
+    glfw
+    libjpeg
+    libmad
+    libvorbis
+    llvmPackages.openmp
+    pugixml
+    vulkan-headers
+    vulkan-loader
+    vulkan-tools
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  makeFlags = [ "DESTDIR=$(out)" "prefix=" ];
+
+  passthru.tests.version = testers.testVersion {
+    package = vkdt;
+  };
+
+  meta = with lib; {
+    description = "Vulkan-powered raw image processor";
+    homepage = "https://github.com/hanatos/vkdt";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ paperdigits ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/by-name/vk/vkeybd/package.nix
similarity index 100%
rename from pkgs/applications/audio/vkeybd/default.nix
rename to pkgs/by-name/vk/vkeybd/package.nix
diff --git a/pkgs/tools/graphics/vkmark/default.nix b/pkgs/by-name/vk/vkmark/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vkmark/default.nix
rename to pkgs/by-name/vk/vkmark/package.nix
diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/by-name/vl/vlan/package.nix
similarity index 100%
rename from pkgs/tools/networking/vlan/default.nix
rename to pkgs/by-name/vl/vlan/package.nix
diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/by-name/vl/vlang/package.nix
similarity index 100%
rename from pkgs/development/compilers/vlang/default.nix
rename to pkgs/by-name/vl/vlang/package.nix
diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/pkgs/by-name/vl/vlock/eintr.patch
similarity index 100%
rename from pkgs/misc/screensavers/vlock/eintr.patch
rename to pkgs/by-name/vl/vlock/eintr.patch
diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/by-name/vl/vlock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/vlock/default.nix
rename to pkgs/by-name/vl/vlock/package.nix
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/by-name/vm/vmfs-tools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/vmfs-tools/default.nix
rename to pkgs/by-name/vm/vmfs-tools/package.nix
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/by-name/vm/vmime/package.nix
similarity index 100%
rename from pkgs/development/libraries/vmime/default.nix
rename to pkgs/by-name/vm/vmime/package.nix
diff --git a/pkgs/by-name/vm/vms-empire/package.nix b/pkgs/by-name/vm/vms-empire/package.nix
index a43c61e30a26..a1d565b18a03 100644
--- a/pkgs/by-name/vm/vms-empire/package.nix
+++ b/pkgs/by-name/vm/vms-empire/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vms-empire";
-  version = "1.17";
+  version = "1.18";
 
   src = fetchurl{
     url = "http://www.catb.org/~esr/vms-empire/vms-empire-${finalAttrs.version}.tar.gz";
-    hash = "sha256-AmHs6ojVcfglvvFvC9JzNWVS2t4Coqg8WwyNCM+sEno=";
+    hash = "sha256-JWCmrGS4jClSi6MCcGNiq8zUH+92fiqMtk58B+wMKQk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/by-name/vm/vmtouch/package.nix
similarity index 100%
rename from pkgs/tools/misc/vmtouch/default.nix
rename to pkgs/by-name/vm/vmtouch/package.nix
diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/by-name/vm/vmware-workstation/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/default.nix
rename to pkgs/by-name/vm/vmware-workstation/package.nix
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/by-name/vm/vmware-workstation/vmware-bootstrap
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap
rename to pkgs/by-name/vm/vmware-workstation/vmware-bootstrap
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/by-name/vm/vmware-workstation/vmware-config
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-config
rename to pkgs/by-name/vm/vmware-workstation/vmware-config
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/by-name/vm/vmware-workstation/vmware-installer-bootstrap
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap
rename to pkgs/by-name/vm/vmware-workstation/vmware-installer-bootstrap
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/by-name/vm/vmware-workstation/vmware-modconfig
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-modconfig
rename to pkgs/by-name/vm/vmware-workstation/vmware-modconfig
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/by-name/vn/vncrec/package.nix
similarity index 100%
rename from pkgs/tools/video/vncrec/default.nix
rename to pkgs/by-name/vn/vncrec/package.nix
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/by-name/vn/vnstat/package.nix
similarity index 100%
rename from pkgs/applications/networking/vnstat/default.nix
rename to pkgs/by-name/vn/vnstat/package.nix
diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/by-name/vo/vo-aacenc/package.nix
similarity index 100%
rename from pkgs/development/libraries/vo-aacenc/default.nix
rename to pkgs/by-name/vo/vo-aacenc/package.nix
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/by-name/vo/vo-amrwbenc/package.nix
similarity index 100%
rename from pkgs/development/libraries/vo-amrwbenc/default.nix
rename to pkgs/by-name/vo/vo-amrwbenc/package.nix
diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/by-name/vo/vobcopy/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/vobcopy/default.nix
rename to pkgs/by-name/vo/vobcopy/package.nix
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/by-name/vo/vobsub2srt/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/vobsub2srt/default.nix
rename to pkgs/by-name/vo/vobsub2srt/package.nix
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/by-name/vo/vocal/package.nix
similarity index 100%
rename from pkgs/applications/audio/vocal/default.nix
rename to pkgs/by-name/vo/vocal/package.nix
diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/by-name/vo/vocproc/package.nix
similarity index 100%
rename from pkgs/applications/audio/vocproc/default.nix
rename to pkgs/by-name/vo/vocproc/package.nix
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/by-name/vo/void/package.nix
similarity index 100%
rename from pkgs/tools/misc/void/default.nix
rename to pkgs/by-name/vo/void/package.nix
diff --git a/pkgs/data/icons/volantes-cursors/default.nix b/pkgs/by-name/vo/volantes-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/volantes-cursors/default.nix
rename to pkgs/by-name/vo/volantes-cursors/package.nix
diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/by-name/vo/volatility3/package.nix
similarity index 100%
rename from pkgs/tools/security/volatility3/default.nix
rename to pkgs/by-name/vo/volatility3/package.nix
diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/by-name/vo/volctl/package.nix
similarity index 100%
rename from pkgs/tools/audio/volctl/default.nix
rename to pkgs/by-name/vo/volctl/package.nix
diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/by-name/vo/vollkorn/package.nix
similarity index 100%
rename from pkgs/data/fonts/vollkorn/default.nix
rename to pkgs/by-name/vo/vollkorn/package.nix
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/by-name/vo/volnoti/package.nix
similarity index 100%
rename from pkgs/applications/misc/volnoti/default.nix
rename to pkgs/by-name/vo/volnoti/package.nix
diff --git a/pkgs/development/tools/volta/Cargo.lock b/pkgs/by-name/vo/volta/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/volta/Cargo.lock
rename to pkgs/by-name/vo/volta/Cargo.lock
diff --git a/pkgs/development/tools/volta/default.nix b/pkgs/by-name/vo/volta/package.nix
similarity index 100%
rename from pkgs/development/tools/volta/default.nix
rename to pkgs/by-name/vo/volta/package.nix
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/by-name/vo/volume_key/package.nix
similarity index 100%
rename from pkgs/development/libraries/volume-key/default.nix
rename to pkgs/by-name/vo/volume_key/package.nix
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/by-name/vo/volumeicon/package.nix
similarity index 100%
rename from pkgs/tools/audio/volumeicon/default.nix
rename to pkgs/by-name/vo/volumeicon/package.nix
diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/by-name/vo/vopono/package.nix
similarity index 100%
rename from pkgs/tools/networking/vopono/default.nix
rename to pkgs/by-name/vo/vopono/package.nix
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/by-name/vo/vorbisgain/package.nix
similarity index 100%
rename from pkgs/tools/misc/vorbisgain/default.nix
rename to pkgs/by-name/vo/vorbisgain/package.nix
diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/by-name/vo/vouch-proxy/package.nix
similarity index 100%
rename from pkgs/servers/vouch-proxy/default.nix
rename to pkgs/by-name/vo/vouch-proxy/package.nix
diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/by-name/vo/vowpal-wabbit/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
rename to pkgs/by-name/vo/vowpal-wabbit/package.nix
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/by-name/vo/voxelands/package.nix
similarity index 100%
rename from pkgs/games/voxelands/default.nix
rename to pkgs/by-name/vo/voxelands/package.nix
diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix
similarity index 100%
rename from pkgs/tools/networking/vpnc-scripts/default.nix
rename to pkgs/by-name/vp/vpnc-scripts/package.nix
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/by-name/vp/vpnc/package.nix
similarity index 100%
rename from pkgs/tools/networking/vpnc/default.nix
rename to pkgs/by-name/vp/vpnc/package.nix
diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/by-name/vp/vpv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vpv/default.nix
rename to pkgs/by-name/vp/vpv/package.nix
diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/by-name/vr/vrb/package.nix
similarity index 100%
rename from pkgs/development/libraries/vrb/default.nix
rename to pkgs/by-name/vr/vrb/package.nix
diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/by-name/vr/vrb/removed_options.patch
similarity index 100%
rename from pkgs/development/libraries/vrb/removed_options.patch
rename to pkgs/by-name/vr/vrb/removed_options.patch
diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/by-name/vr/vrb/unused-but-set-variable.patch
similarity index 100%
rename from pkgs/development/libraries/vrb/unused-but-set-variable.patch
rename to pkgs/by-name/vr/vrb/unused-but-set-variable.patch
diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/by-name/vr/vrpn/package.nix
similarity index 100%
rename from pkgs/development/libraries/vrpn/default.nix
rename to pkgs/by-name/vr/vrpn/package.nix
diff --git a/pkgs/tools/video/vrrtest/default.nix b/pkgs/by-name/vr/vrrtest/package.nix
similarity index 100%
rename from pkgs/tools/video/vrrtest/default.nix
rename to pkgs/by-name/vr/vrrtest/package.nix
diff --git a/pkgs/tools/misc/vsc-leetcode-cli/default.nix b/pkgs/by-name/vs/vsc-leetcode-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/vsc-leetcode-cli/default.nix
rename to pkgs/by-name/vs/vsc-leetcode-cli/package.nix
diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix
rename to pkgs/by-name/vs/vscode-langservers-extracted/package.nix
diff --git a/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch b/pkgs/by-name/vs/vsftpd/CVE-2015-1419.patch
similarity index 100%
rename from pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
rename to pkgs/by-name/vs/vsftpd/CVE-2015-1419.patch
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/by-name/vs/vsftpd/package.nix
similarity index 100%
rename from pkgs/servers/ftp/vsftpd/default.nix
rename to pkgs/by-name/vs/vsftpd/package.nix
diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/by-name/vs/vsh/package.nix
similarity index 100%
rename from pkgs/tools/misc/vsh/default.nix
rename to pkgs/by-name/vs/vsh/package.nix
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/by-name/vs/vsqlite/package.nix
similarity index 100%
rename from pkgs/development/libraries/vsqlite/default.nix
rename to pkgs/by-name/vs/vsqlite/package.nix
diff --git a/pkgs/tools/security/vt-cli/default.nix b/pkgs/by-name/vt/vt-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/vt-cli/default.nix
rename to pkgs/by-name/vt/vt-cli/package.nix
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/by-name/vt/vtable-dumper/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/vtable-dumper/default.nix
rename to pkgs/by-name/vt/vtable-dumper/package.nix
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
new file mode 100644
index 000000000000..08b67f3b70f3
--- /dev/null
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -0,0 +1,164 @@
+{ stdenv
+, lib
+, fetchFromGitLab
+, fetchpatch
+, gettext
+, pkg-config
+, meson
+, ninja
+, gnome
+, glib
+, gtk3
+, gtk4
+, gtkVersion ? "3"
+, gobject-introspection
+, vala
+, python3
+, gi-docgen
+, libxml2
+, gnutls
+, gperf
+, pango
+, pcre2
+, cairo
+, fribidi
+, lz4
+, icu
+, systemd
+, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, fast-float
+, nixosTests
+, blackbox-terminal
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vte";
+  version = "0.78.1";
+
+  outputs = [ "out" "dev" ]
+    ++ lib.optional (gtkVersion != null) "devdoc";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "vte";
+    rev = finalAttrs.version;
+    hash = "sha256-dVCvf4eTIJlrSzG6xLdKU47N9uAtHDwRrGkWtSmqbEU=";
+  };
+
+  patches = [
+    # VTE needs a small patch to work with musl:
+    # https://gitlab.gnome.org/GNOME/vte/issues/72
+    # Taken from https://git.alpinelinux.org/aports/tree/community/vte3
+    (fetchpatch {
+      name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
+      url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
+      hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
+    })
+    # build: Add fast_float dependency
+    # https://gitlab.gnome.org/GNOME/vte/-/issues/2823
+    (fetchpatch {
+      name = "0003-build-Add-fast_float-dependency.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f6095fca4d1baf950817e7010e6f1e7c313b9e2e.patch";
+      hash = "sha256-EL9PPiI5pDJOXf4Ck4nkRte/jHx/QWbxkjDFRSsp+so=";
+    })
+    (fetchpatch {
+      name = "0003-widget-termprops-Use-fast_float.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/6c2761f51a0400772f443f12ea23a75576e195d3.patch";
+      hash = "sha256-jjM9bhl8EhtylUIQ2nMSNX3ugnkZQP/2POvSUDW0LM0=";
+    })
+    (fetchpatch {
+      name = "0003-build-Use-correct-path-to-include-fast_float.h.patch";
+      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/d09330585e648b5c9991dffab4a06d1f127bf916.patch";
+      hash = "sha256-YGVXt2VojljYgTcmahQ2YEZGEysyUSwk+snQfoipJ+E=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    gperf
+    libxml2
+    meson
+    ninja
+    pkg-config
+    vala
+    python3
+    gi-docgen
+  ];
+
+  buildInputs = [
+    cairo
+    fribidi
+    gnutls
+    pango # duplicated with propagatedBuildInputs to support gtkVersion == null
+    pcre2
+    lz4
+    icu
+    fast-float
+  ] ++ lib.optionals systemdSupport [
+    systemd
+  ];
+
+  # Required by vte-2.91.pc.
+  propagatedBuildInputs = lib.optionals (gtkVersion != null) [
+    (assert (gtkVersion == "3" || gtkVersion == "4");
+    if gtkVersion == "3" then gtk3 else gtk4)
+    glib
+    pango
+  ];
+
+  mesonFlags = [
+    "-Ddocs=true"
+    (lib.mesonBool "gtk3" (gtkVersion == "3"))
+    (lib.mesonBool "gtk4" (gtkVersion == "4"))
+  ] ++ lib.optionals (!systemdSupport) [
+    "-D_systemd=false"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # -Bsymbolic-functions is not supported on darwin
+    "-D_b_symbolic_functions=false"
+  ];
+
+  # error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
+  env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument"
+    ++ lib.optional stdenv.cc.isClang "-Wno-cast-function-type-strict");
+
+  postPatch = ''
+    patchShebangs perf/*
+    patchShebangs src/parser-seq.py
+    patchShebangs src/minifont-coverage.py
+    patchShebangs src/modes.py
+  '';
+
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "vte";
+      versionPolicy = "odd-unstable";
+    };
+    tests = {
+      inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal;
+      blackbox-terminal = blackbox-terminal.override { sixelSupport = true; };
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://www.gnome.org/";
+    description = "Library implementing a terminal emulator widget for GTK";
+    longDescription = ''
+      VTE is a library (libvte) implementing a terminal emulator widget for
+      GTK, and a minimal sample application (vte) using that.  Vte is
+      mainly used in gnome-terminal, but can also be used to embed a
+      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+      character set conversion, as well as emulating any terminal known to
+      the system's terminfo database.
+    '';
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members;
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/by-name/vt/vtm/package.nix
similarity index 100%
rename from pkgs/tools/misc/vtm/default.nix
rename to pkgs/by-name/vt/vtm/package.nix
diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/by-name/vt/vttest/package.nix
similarity index 100%
rename from pkgs/tools/misc/vttest/default.nix
rename to pkgs/by-name/vt/vttest/package.nix
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/by-name/vu/vue/package.nix
similarity index 100%
rename from pkgs/applications/misc/vue/default.nix
rename to pkgs/by-name/vu/vue/package.nix
diff --git a/pkgs/applications/misc/vul/default.nix b/pkgs/by-name/vu/vul/package.nix
similarity index 100%
rename from pkgs/applications/misc/vul/default.nix
rename to pkgs/by-name/vu/vul/package.nix
diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
new file mode 100644
index 000000000000..4b03e4e098f2
--- /dev/null
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, vulkan-utility-libraries,  jq, libX11, libXrandr, libxcb, wayland }:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-extension-layer";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-ExtensionLayer";
+    rev = "vulkan-sdk-${version}";
+    hash = "sha256-pBpHYxJq36FrHsvpaMJvX0IKTvAh0R86qR7/vn6EBCw=";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config jq ];
+
+  buildInputs = [ vulkan-headers vulkan-utility-libraries libX11 libXrandr libxcb wayland ];
+
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    addToSearchPath XDG_DATA_DIRS @out@/share
+  '';
+
+  # Tests are not for gpu-less and headless environments
+  cmakeFlags = [
+    "-DBUILD_TESTS=false"
+  ];
+
+  # Include absolute paths to layer libraries in their associated
+  # layer definition json files.
+  preFixup = ''
+    for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
+      jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+      mv tmp.json "$f"
+    done
+  '';
+
+  meta = with lib; {
+    description = "Layers providing Vulkan features when native support is unavailable";
+    homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/by-name/vu/vulkan-helper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vulkan-helper/default.nix
rename to pkgs/by-name/vu/vulkan-helper/package.nix
diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/by-name/vu/vulkan-loader/fix-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch
rename to pkgs/by-name/vu/vulkan-loader/fix-pkgconfig.patch
diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
new file mode 100644
index 000000000000..0b94d331b40f
--- /dev/null
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -0,0 +1,61 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libX11, libxcb
+, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath
+, testers }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vulkan-loader";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-Loader";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-6GHZUiYL3gDWN61SaLiD/3xXSoQb1rx6U5eu1cl8ZwM=";
+  };
+
+  patches = [ ./fix-pkgconfig.patch ]
+    ++ lib.optionals stdenv.hostPlatform.is32bit [
+      # Backport patch to support 64-bit inodes on 32-bit systems
+      # FIXME: remove in next update
+      (fetchpatch {
+        url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch";
+        hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0=";
+      })
+    ];
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ vulkan-headers ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libXrandr wayland ];
+
+  cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
+    ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
+    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
+
+  outputs = [ "out" "dev" ];
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || {
+      echo vulkan-headers include directory not found in pkg-config file
+      exit 1
+    }
+  '';
+
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = with lib; {
+    description = "LunarG Vulkan loader";
+    homepage    = "https://www.lunarg.com";
+    platforms   = platforms.unix ++ platforms.windows;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.ralith ];
+    broken = finalAttrs.version != vulkan-headers.version;
+    pkgConfigModules = [ "vulkan" ];
+  };
+})
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
new file mode 100644
index 000000000000..08236ab39a2c
--- /dev/null
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -0,0 +1,93 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+, jq
+, expat
+, jsoncpp
+, libX11
+, libXdmcp
+, libXrandr
+, libffi
+, libxcb
+, pkg-config
+, wayland
+, which
+, xcbutilkeysyms
+, xcbutilwm
+, valijson
+, vulkan-headers
+, vulkan-loader
+, vulkan-utility-libraries
+, writeText
+, libsForQt5
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-tools-lunarg";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+   owner = "LunarG";
+   repo = "VulkanTools";
+   rev = "vulkan-sdk-${version}";
+   hash = "sha256-RaL7sqy5Rc8syPoM3SedZ6UilV9JUAA96JZh5/gIfPU=";
+ };
+
+  nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ];
+
+  buildInputs = [
+    expat
+    jsoncpp
+    libX11
+    libXdmcp
+    libXrandr
+    libffi
+    libxcb
+    valijson
+    vulkan-headers
+    vulkan-loader
+    vulkan-utility-libraries
+    wayland
+    xcbutilkeysyms
+    xcbutilwm
+    libsForQt5.qt5.qtbase
+    libsForQt5.qt5.qtwayland
+  ];
+
+  cmakeFlags = [
+    "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
+  ];
+
+  preConfigure = ''
+    patchShebangs scripts/*
+    substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp"
+  '';
+
+  # Include absolute paths to layer libraries in their associated
+  # layer definition json files.
+  preFixup = ''
+    for f in "$out"/etc/vulkan/explicit_layer.d/*.json "$out"/etc/vulkan/implicit_layer.d/*.json; do
+      jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+      mv tmp.json "$f"
+    done
+  '';
+
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
+  '';
+
+  meta = with lib; {
+    description = "LunarG Vulkan Tools and Utilities";
+    longDescription = ''
+      Tools to aid in Vulkan development including useful layers, trace and
+      replay, and tests.
+    '';
+    homepage = "https://github.com/LunarG/VulkanTools";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
new file mode 100644
index 000000000000..4c31f09958de
--- /dev/null
+++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vulkan-utility-libraries";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-Utility-Libraries";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-WDRDpUOZN/akUA6gsJMlC2GKolVt3g1NerKqe7aLhek=";
+  };
+
+  nativeBuildInputs = [ cmake python3 ];
+  buildInputs = [ vulkan-headers ];
+
+  meta = with lib; {
+    description = "Set of utility libraries for Vulkan";
+    homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries";
+    platforms = platforms.all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+})
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
new file mode 100644
index 000000000000..ccf00646f57f
--- /dev/null
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -0,0 +1,88 @@
+{ lib
+, callPackage
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, jq
+, glslang
+, libffi
+, libX11
+, libXau
+, libxcb
+, libXdmcp
+, libXrandr
+, spirv-headers
+, spirv-tools
+, vulkan-headers
+, vulkan-utility-libraries
+, wayland
+}:
+
+let
+  robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
+in
+stdenv.mkDerivation rec {
+  pname = "vulkan-validation-layers";
+  version = "1.3.296.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-ValidationLayers";
+    rev = "vulkan-sdk-${version}";
+    hash = "sha256-H5AG+PXM3IdCfDqHMdaunRUWRm8QgdS6ZbZLMaOOALk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    jq
+  ];
+
+  buildInputs = [
+    glslang
+    libX11
+    libXau
+    libXdmcp
+    libXrandr
+    libffi
+    libxcb
+    robin-hood-hashing
+    spirv-headers
+    spirv-tools
+    vulkan-headers
+    vulkan-utility-libraries
+    wayland
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_LAYER_SUPPORT_FILES=ON"
+    # Hide dev warnings that are useless for packaging
+    "-Wno-dev"
+  ];
+
+  # Tests require access to vulkan-compatible GPU, which isn't
+  # available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER.
+  doCheck = false;
+
+  separateDebugInfo = true;
+
+  # Include absolute paths to layer libraries in their associated
+  # layer definition json files.
+  preFixup = ''
+    for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
+      jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+      mv tmp.json "$f"
+    done
+  '';
+
+  meta = with lib; {
+    description = "Official Khronos Vulkan validation layers";
+    homepage    = "https://github.com/KhronosGroup/Vulkan-ValidationLayers";
+    platforms   = platforms.linux;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.ralith ];
+  };
+}
diff --git a/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
similarity index 100%
rename from pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix
rename to pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix
index 378e32cd01a2..53f8b8b802d6 100644
--- a/pkgs/by-name/vu/vulkan-volk/package.nix
+++ b/pkgs/by-name/vu/vulkan-volk/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "volk";
-  version = "1.3.290.0";
+  version = "1.3.296.0";
 
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "volk";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-SbTBwS4mJETrXRT7QMJX9F8ukcZmzz8+1atVbB/fid4=";
+    hash = "sha256-faLszfOeFo5eAzwvnrAUDVAPCVt/F9xRUFGxC9TA8E8=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/by-name/vu/vulnix/package.nix
similarity index 100%
rename from pkgs/tools/security/vulnix/default.nix
rename to pkgs/by-name/vu/vulnix/package.nix
diff --git a/pkgs/by-name/vu/vultr-cli/package.nix b/pkgs/by-name/vu/vultr-cli/package.nix
new file mode 100644
index 000000000000..b312ac66e3f0
--- /dev/null
+++ b/pkgs/by-name/vu/vultr-cli/package.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+
+buildGoModule rec {
+  pname = "vultr-cli";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "vultr";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-uk0tG66u0gQgEzpiFAeMC0qPrd+Pk6nbrXuuyOtVLe4=";
+  };
+
+  vendorHash = "sha256-qf0l76MGIFv5m7uSjo4FgS6XxYzCT4+Efgt6W6jA1i8=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [ "-s" "-w" ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd vultr-cli \
+      --bash <($out/bin/vultr-cli completion bash) \
+      --fish <($out/bin/vultr-cli completion fish) \
+      --zsh <($out/bin/vultr-cli completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "Official command line tool for Vultr services";
+    homepage = "https://github.com/vultr/vultr-cli";
+    changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ Br1ght0ne ];
+    mainProgram = "vultr-cli";
+  };
+}
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/by-name/vu/vultr/package.nix
similarity index 100%
rename from pkgs/development/tools/vultr/default.nix
rename to pkgs/by-name/vu/vultr/package.nix
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 5543834ea5a6..fff20fecc568 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -20,7 +20,9 @@ python3.pkgs.buildPythonApplication rec {
   pythonRelaxDeps = [
     "defusedxml"
     "ijson"
+    "importlib-metadata"
     "sqlalchemy"
+    "websockets"
     "xsdata"
   ];
 
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/by-name/vw/vwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/vwm/default.nix
rename to pkgs/by-name/vw/vwm/package.nix
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/by-name/vx/vxl/package.nix
similarity index 100%
rename from pkgs/development/libraries/vxl/default.nix
rename to pkgs/by-name/vx/vxl/package.nix
diff --git a/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch b/pkgs/by-name/w3/w3m/RAND_egd.libressl.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch
rename to pkgs/by-name/w3/w3m/RAND_egd.libressl.patch
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/by-name/w3/w3m/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/w3m/default.nix
rename to pkgs/by-name/w3/w3m/package.nix
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/by-name/w_/w_scan/package.nix
similarity index 100%
rename from pkgs/applications/video/w_scan/default.nix
rename to pkgs/by-name/w_/w_scan/package.nix
diff --git a/pkgs/applications/video/w_scan2/default.nix b/pkgs/by-name/w_/w_scan2/package.nix
similarity index 100%
rename from pkgs/applications/video/w_scan2/default.nix
rename to pkgs/by-name/w_/w_scan2/package.nix
diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix
index 0f643690921f..8f5085ca9e03 100644
--- a/pkgs/by-name/wa/waagent/package.nix
+++ b/pkgs/by-name/wa/waagent/package.nix
@@ -2,13 +2,12 @@
   coreutils,
   fetchFromGitHub,
   lib,
-  python39,
+  python3,
   bash,
 }:
 
 let
-  # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75
-  python = python39;
+  python = python3;
 
 in
 python.pkgs.buildPythonApplication rec {
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/by-name/wa/wabt/package.nix
similarity index 100%
rename from pkgs/development/tools/wabt/default.nix
rename to pkgs/by-name/wa/wabt/package.nix
diff --git a/pkgs/tools/security/wad/default.nix b/pkgs/by-name/wa/wad/package.nix
similarity index 100%
rename from pkgs/tools/security/wad/default.nix
rename to pkgs/by-name/wa/wad/package.nix
diff --git a/pkgs/tools/security/waf-tester/default.nix b/pkgs/by-name/wa/waf-tester/package.nix
similarity index 100%
rename from pkgs/tools/security/waf-tester/default.nix
rename to pkgs/by-name/wa/waf-tester/package.nix
diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/by-name/wa/waffle/package.nix
similarity index 100%
rename from pkgs/development/libraries/waffle/default.nix
rename to pkgs/by-name/wa/waffle/package.nix
diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/by-name/wa/wafw00f/package.nix
similarity index 100%
rename from pkgs/tools/security/wafw00f/default.nix
rename to pkgs/by-name/wa/wafw00f/package.nix
diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/by-name/wa/waitron/package.nix
similarity index 100%
rename from pkgs/tools/networking/waitron/default.nix
rename to pkgs/by-name/wa/waitron/package.nix
diff --git a/pkgs/tools/networking/waitron/staticfiles-directory.patch b/pkgs/by-name/wa/waitron/staticfiles-directory.patch
similarity index 100%
rename from pkgs/tools/networking/waitron/staticfiles-directory.patch
rename to pkgs/by-name/wa/waitron/staticfiles-directory.patch
diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix
index 5ee8fee4f3de..364822734629 100644
--- a/pkgs/by-name/wa/wakapi/package.nix
+++ b/pkgs/by-name/wa/wakapi/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "2.12.1";
+  version = "2.12.2";
 in
 buildGoModule {
   pname = "wakapi";
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "muety";
     repo = "wakapi";
     rev = "refs/tags/${version}";
-    hash = "sha256-+JxTszBa6rURm0vPy8Oke5/hX9EmDphWEp2eglS+SFU=";
+    hash = "sha256-6wlFgIof4uzQ3phd7paHZ6Sezp0Dfj8qFzsudFKfNdU=";
   };
 
-  vendorHash = "sha256-Q56Ud0MtkstB/dhn+QyAHTzIqHsmKvHEK+5PAt5lIMM=";
+  vendorHash = "sha256-q5o88fwc1S14ZwGyDS9aFtJMfPZ4pmMjffmeXODhajg=";
 
   # Not a go module required by the project, contains development utilities
   excludedPackages = [ "scripts" ];
diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix
index 7524d82c62b8..c678e5764feb 100644
--- a/pkgs/by-name/wa/wakatime-cli/package.nix
+++ b/pkgs/by-name/wa/wakatime-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "wakatime-cli";
-  version = "1.98.5";
+  version = "1.102.3";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     rev = "v${version}";
-    hash = "sha256-Ez5fzaZxvHOH8z4tQ7+PUnGrpzAd97vbAta1exEtvtQ=";
+    hash = "sha256-RnEyrbdYP8BYQ9M+iwikTfYF8HRosR6vhHiQJvGNZ/s=";
   };
 
-  vendorHash = "sha256-+9zdEIaKQlLcBwFaY5Fe5mpHWQDqfV+j1TPmDkdRjyk=";
+  vendorHash = "sha256-s9nCr55XR/0ZriweDOBRIDpmp+GUE85FWLJkWXqX5/U=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/by-name/wa/wakelan/package.nix
similarity index 100%
rename from pkgs/tools/networking/wakelan/default.nix
rename to pkgs/by-name/wa/wakelan/package.nix
diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/by-name/wa/wakeonlan/package.nix
similarity index 100%
rename from pkgs/tools/networking/wakeonlan/default.nix
rename to pkgs/by-name/wa/wakeonlan/package.nix
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/by-name/wa/wal-g/package.nix
similarity index 100%
rename from pkgs/tools/backup/wal-g/default.nix
rename to pkgs/by-name/wa/wal-g/package.nix
diff --git a/pkgs/applications/file-managers/walk/default.nix b/pkgs/by-name/wa/walk/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/walk/default.nix
rename to pkgs/by-name/wa/walk/package.nix
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/by-name/wa/wallabag/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/wallabag/default.nix
rename to pkgs/by-name/wa/wallabag/package.nix
diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/by-name/wa/wallabag/wallabag-data.patch
similarity index 100%
rename from pkgs/servers/web-apps/wallabag/wallabag-data.patch
rename to pkgs/by-name/wa/wallabag/wallabag-data.patch
diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/by-name/wa/wally-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/wally-cli/default.nix
rename to pkgs/by-name/wa/wally-cli/package.nix
diff --git a/pkgs/development/tools/wambo/default.nix b/pkgs/by-name/wa/wambo/package.nix
similarity index 100%
rename from pkgs/development/tools/wambo/default.nix
rename to pkgs/by-name/wa/wambo/package.nix
diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/by-name/wa/wander/package.nix
similarity index 100%
rename from pkgs/tools/admin/wander/default.nix
rename to pkgs/by-name/wa/wander/package.nix
diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/by-name/wa/waon/package.nix
similarity index 100%
rename from pkgs/applications/audio/waon/default.nix
rename to pkgs/by-name/wa/waon/package.nix
diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/by-name/wa/wapiti/package.nix
similarity index 100%
rename from pkgs/tools/security/wapiti/default.nix
rename to pkgs/by-name/wa/wapiti/package.nix
diff --git a/pkgs/games/wargus/default.nix b/pkgs/by-name/wa/wargus/package.nix
similarity index 100%
rename from pkgs/games/wargus/default.nix
rename to pkgs/by-name/wa/wargus/package.nix
diff --git a/pkgs/games/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
similarity index 100%
rename from pkgs/games/wargus/stratagus.nix
rename to pkgs/by-name/wa/wargus/stratagus.nix
diff --git a/pkgs/games/warmux/default.nix b/pkgs/by-name/wa/warmux/package.nix
similarity index 100%
rename from pkgs/games/warmux/default.nix
rename to pkgs/by-name/wa/warmux/package.nix
diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix
index adb2b2614e82..646750978bc9 100644
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@@ -48,7 +48,7 @@ linux = stdenv.mkDerivation (finalAttrs:  {
   buildInputs = [
     curl
     fontconfig
-    stdenv.cc.cc.lib # libstdc++.so libgcc_s.so
+    (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
     zlib
   ];
 
diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 365b4a17878a..43a4f271aaa5 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-KaHjVEdmzOw3BnFd77vTb+067IEOPIWiJmVOHQcjN6E=",
-    "version": "0.2024.10.23.14.49.stable_00"
+    "hash": "sha256-AtKLtEhibD5sHNcjmScxykLd2si5dwGDTFd0NldbHFQ=",
+    "version": "0.2024.10.29.08.02.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-gRuA+drCQdOPJrSKky2WKxon84dxVVcfK+0GipzMBZU=",
-    "version": "0.2024.10.23.14.49.stable_00"
+    "hash": "sha256-jKk80+9XKLzM68a9YQFIddxzRLzVc8vmPmnS3ZJ+9s8=",
+    "version": "0.2024.10.29.08.02.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-LTpcGsQscEbxAosW68yfSb9lDyecDLdci3JzPimTYrQ=",
-    "version": "0.2024.10.23.14.49.stable_00"
+    "hash": "sha256-k1OkiK3reedJQINK8vZYP7G2Mm9KnWV+RuvHZZJYHqI=",
+    "version": "0.2024.10.29.08.02.stable_02"
   }
 }
diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/by-name/wa/warpd/package.nix
similarity index 100%
rename from pkgs/applications/misc/warpd/default.nix
rename to pkgs/by-name/wa/warpd/package.nix
diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix
new file mode 100644
index 000000000000..e7377243ab3d
--- /dev/null
+++ b/pkgs/by-name/wa/warzone2100/package.nix
@@ -0,0 +1,146 @@
+{ lib
+, stdenv
+, fetchurl
+, cmake
+, ninja
+, p7zip
+, pkg-config
+, asciidoctor
+, gettext
+
+, SDL2
+, libtheora
+, libvorbis
+, libopus
+, openal
+, openalSoft
+, physfs
+, miniupnpc
+, libsodium
+, curl
+, libpng
+, freetype
+, harfbuzz
+, sqlite
+, which
+, vulkan-headers
+, vulkan-loader
+, shaderc
+
+, testers
+, warzone2100
+, nixosTests
+
+, gitUpdater
+
+, withVideos ? false
+}:
+
+let
+  pname = "warzone2100";
+  sequences_src = fetchurl {
+    url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz";
+    sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa";
+  };
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname;
+  version  = "4.5.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz";
+    hash = "sha256-v7Odn5UJwNxdr6Pm959VgtdkFJYpN6e9f30bVXqIr8I=";
+  };
+
+  buildInputs = [
+    SDL2
+    libtheora
+    libvorbis
+    libopus
+    openal
+    openalSoft
+    physfs
+    miniupnpc
+    libsodium
+    curl
+    libpng
+    freetype
+    harfbuzz
+    sqlite
+  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    vulkan-headers
+    vulkan-loader
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    ninja
+    p7zip
+    asciidoctor
+    gettext
+    shaderc
+  ];
+
+  postPatch = ''
+    substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
+                      --replace '"which "' '"${which}/bin/which "'
+    substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
+                      --replace "which %s" "${which}/bin/which %s"
+  '';
+
+  cmakeFlags = [
+    "-DWZ_DISTRIBUTOR=NixOS"
+    # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute
+    # path, but this results in an error:
+    #
+    # > An absolute CMAKE_INSTALL_BINDIR path cannot be used if the following
+    # > are not also absolute paths: WZ_DATADIR
+    #
+    # WZ_DATADIR is based on CMAKE_INSTALL_DATAROOTDIR, so we set that.
+    #
+    # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin".
+    "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share"
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake";
+
+  postInstall = lib.optionalString withVideos ''
+    cp ${sequences_src} $out/share/warzone2100/sequences.wz
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = warzone2100;
+      # The command always exits with code 1
+      command = "(warzone2100 --version || [ $? -eq 1 ])";
+    };
+    nixosTest = nixosTests.warzone2100;
+  };
+
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/Warzone2100/warzone2100";
+  };
+
+  meta = with lib; {
+    description = "Free RTS game, originally developed by Pumpkin Studios";
+    mainProgram = "warzone2100";
+    longDescription = ''
+        Warzone 2100 is an open source real-time strategy and real-time tactics
+      hybrid computer game, originally developed by Pumpkin Studios and
+      published by Eidos Interactive.
+        In Warzone 2100, you command the forces of The Project in a battle to
+      rebuild the world after mankind has almost been destroyed by nuclear
+      missiles. The game offers campaign, multi-player, and single-player
+      skirmish modes. An extensive tech tree with over 400 different
+      technologies, combined with the unit design system, allows for a wide
+      variety of possible units and tactics.
+    '';
+    homepage = "https://wz2100.net";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ astsmtl fgaz ];
+    platforms = platforms.all;
+    # configure_mac.cmake tries to download stuff
+    # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})
diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/by-name/wa/wasabibackend/deps.nix
similarity index 100%
rename from pkgs/applications/blockchains/wasabibackend/deps.nix
rename to pkgs/by-name/wa/wasabibackend/deps.nix
diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix
new file mode 100644
index 000000000000..394c6fc744ee
--- /dev/null
+++ b/pkgs/by-name/wa/wasabibackend/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  zlib,
+  openssl,
+  nixosTests,
+}:
+buildDotnetModule rec {
+  pname = "wasabibackend";
+  version = "2.0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "zkSNACKs";
+    repo = "WalletWasabi";
+    rev = "refs/tags/v${version}";
+    hash = "sha512-JuCl3SyejzwUd2n8Fy7EdxUuO4bIcGb8yMWZQOhZzsY4fvg9prFOnVZEquxahD0a41MLKHRNA1R2N3NMapcc0A==";
+  };
+
+  projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj";
+  nugetDeps = ./deps.nix;
+
+  dotnet-sdk = dotnetCorePackages.sdk_7_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
+
+  buildInputs = [(lib.getLib stdenv.cc.cc) zlib];
+
+  runtimeDeps = [openssl zlib];
+
+  preConfigure = ''
+    makeWrapperArgs+=(
+      --chdir "$out/lib/${pname}"
+    )
+  '';
+
+  postFixup = ''
+    mv $out/bin/WalletWasabi.Backend $out/bin/WasabiBackend
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) wasabibackend;
+  };
+
+  meta = with lib; {
+    description = "Backend for the Wasabi Wallet";
+    homepage = "https://wasabiwallet.io/";
+    sourceProvenance = with sourceTypes; [binaryNativeCode];
+    license = licenses.mit;
+    maintainers = with maintainers; [mmahut];
+    platforms = ["x86_64-linux"];
+  };
+}
diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix
new file mode 100644
index 000000000000..ad05e27385a6
--- /dev/null
+++ b/pkgs/by-name/wa/wasabiwallet/package.nix
@@ -0,0 +1,72 @@
+{ lib, stdenv
+, autoPatchelfHook
+, makeWrapper
+, fetchurl
+, makeDesktopItem
+, lttng-ust_2_12
+, fontconfig
+, openssl
+, xorg
+, zlib
+}:
+
+let
+  # These libraries are dynamically loaded by the application,
+  # and need to be present in LD_LIBRARY_PATH
+  runtimeLibs = [
+    fontconfig.lib
+    openssl
+    (lib.getLib stdenv.cc.cc)
+    xorg.libX11
+    xorg.libICE
+    xorg.libSM
+    zlib
+  ];
+in
+stdenv.mkDerivation rec {
+  pname = "wasabiwallet";
+  version = "2.0.8.1";
+
+  src = fetchurl {
+    url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
+    sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w=";
+  };
+
+  dontBuild = true;
+
+  desktopItem = makeDesktopItem {
+    name = "wasabi";
+    exec = "wasabiwallet";
+    desktopName = "Wasabi";
+    genericName = "Bitcoin wallet";
+    comment = meta.description;
+    categories = [ "Network" "Utility" ];
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+  buildInputs = runtimeLibs ++ [
+    lttng-ust_2_12
+  ];
+
+  installPhase = ''
+    mkdir -p $out/opt/${pname} $out/bin $out/share/applications
+    cp -Rv . $out/opt/${pname}
+
+    makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \
+      --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}"
+
+    makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \
+      --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}"
+
+    cp -v $desktopItem/share/applications/* $out/share/applications
+  '';
+
+  meta = with lib; {
+    description = "Privacy focused Bitcoin wallet";
+    homepage = "https://wasabiwallet.io/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ mmahut ];
+  };
+}
diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix
new file mode 100644
index 000000000000..818274a35a54
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  darwin,
+  cmake,
+  pkg-config,
+  zstd,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "wasm-pack";
+  version = "0.13.1";
+
+  src = fetchFromGitHub {
+    owner = "rustwasm";
+    repo = "wasm-pack";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc=";
+  };
+
+  cargoHash = "sha256-RdBnW8HKSgjVnyafycGFTSTc5j1A9WRDvUuZu8upRWY=";
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [
+    zstd
+  ];
+
+  # Most tests rely on external resources and build artifacts.
+  # Disabling check here to work with build sandboxing.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Utility that builds rust-generated WebAssembly package";
+    mainProgram = "wasm-pack";
+    homepage = "https://github.com/rustwasm/wasm-pack";
+    license = with licenses; [
+      asl20 # or
+      mit
+    ];
+    maintainers = [ maintainers.dhkl ];
+  };
+}
diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/by-name/wa/wasm-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/wasm-tools/default.nix
rename to pkgs/by-name/wa/wasm-tools/package.nix
diff --git a/pkgs/development/interpreters/wasm3/default.nix b/pkgs/by-name/wa/wasm3/package.nix
similarity index 100%
rename from pkgs/development/interpreters/wasm3/default.nix
rename to pkgs/by-name/wa/wasm3/package.nix
diff --git a/pkgs/development/tools/misc/wasmer-pack/default.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/wasmer-pack/default.nix
rename to pkgs/by-name/wa/wasmer-pack/package.nix
diff --git a/pkgs/development/tools/wasmi/Cargo.lock b/pkgs/by-name/wa/wasmi/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/wasmi/Cargo.lock
rename to pkgs/by-name/wa/wasmi/Cargo.lock
diff --git a/pkgs/development/tools/wasmi/default.nix b/pkgs/by-name/wa/wasmi/package.nix
similarity index 100%
rename from pkgs/development/tools/wasmi/default.nix
rename to pkgs/by-name/wa/wasmi/package.nix
diff --git a/pkgs/development/tools/wasmserve/default.nix b/pkgs/by-name/wa/wasmserve/package.nix
similarity index 100%
rename from pkgs/development/tools/wasmserve/default.nix
rename to pkgs/by-name/wa/wasmserve/package.nix
diff --git a/pkgs/development/tools/wasynth/Cargo.lock b/pkgs/by-name/wa/wasynth/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/wasynth/Cargo.lock
rename to pkgs/by-name/wa/wasynth/Cargo.lock
diff --git a/pkgs/development/tools/wasynth/default.nix b/pkgs/by-name/wa/wasynth/package.nix
similarity index 100%
rename from pkgs/development/tools/wasynth/default.nix
rename to pkgs/by-name/wa/wasynth/package.nix
diff --git a/pkgs/by-name/wa/watchdog/package.nix b/pkgs/by-name/wa/watchdog/package.nix
new file mode 100644
index 000000000000..3f94879716ae
--- /dev/null
+++ b/pkgs/by-name/wa/watchdog/package.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  version = "5.16";
+  pname = "watchdog";
+  src = fetchzip {
+    url = "mirror://sourceforge/watchdog/watchdog-${finalAttrs.version}.tar.gz";
+    hash = "sha256-ecXsnPvAhlRB8jiTgK+i1j6m/0idNqmzjSqi6UGCydE=";
+  };
+  makeFlags = [
+    "CONFIG_FILENAME:=${placeholder "out"}/etc/watchdog.conf"
+  ];
+
+  meta = {
+    description = "Software watchdog for Linux";
+    homepage = "https://sourceforge.net/projects/watchdog/";
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ n8henrie ];
+    mainProgram = "watchdog";
+  };
+})
diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/by-name/wa/watchlog/package.nix
similarity index 100%
rename from pkgs/tools/misc/watchlog/default.nix
rename to pkgs/by-name/wa/watchlog/package.nix
diff --git a/pkgs/applications/misc/watchmate/Cargo.lock b/pkgs/by-name/wa/watchmate/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/watchmate/Cargo.lock
rename to pkgs/by-name/wa/watchmate/Cargo.lock
diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/by-name/wa/watchmate/package.nix
similarity index 100%
rename from pkgs/applications/misc/watchmate/default.nix
rename to pkgs/by-name/wa/watchmate/package.nix
diff --git a/pkgs/applications/misc/watershot/default.nix b/pkgs/by-name/wa/watershot/package.nix
similarity index 100%
rename from pkgs/applications/misc/watershot/default.nix
rename to pkgs/by-name/wa/watershot/package.nix
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/by-name/wa/watson/package.nix
similarity index 100%
rename from pkgs/applications/office/watson/default.nix
rename to pkgs/by-name/wa/watson/package.nix
diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
new file mode 100644
index 000000000000..305f78db06ef
--- /dev/null
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -0,0 +1,247 @@
+{
+  lib,
+  stdenv,
+  patchelf,
+  makeWrapper,
+  fetchurl,
+  writeScript,
+
+  # Libraries
+  glib,
+  fontconfig,
+  freetype,
+  pango,
+  cairo,
+  libX11,
+  libXi,
+  atk,
+  nss,
+  nspr,
+  libXcursor,
+  libXext,
+  libXfixes,
+  libXrender,
+  libXScrnSaver,
+  libXcomposite,
+  libxcb,
+  alsa-lib,
+  libXdamage,
+  libXtst,
+  libXrandr,
+  libxshmfence,
+  expat,
+  cups,
+  dbus,
+  gtk3,
+  gtk4,
+  gdk-pixbuf,
+  gcc-unwrapped,
+  at-spi2-atk,
+  at-spi2-core,
+  libkrb5,
+  libdrm,
+  libglvnd,
+  mesa,
+  libxkbcommon,
+  pipewire,
+  wayland,
+
+  coreutils,
+
+  # command line arguments which are always set e.g "--disable-gpu"
+  commandLineArgs ? "",
+
+  systemd,
+
+  # Loaded at runtime.
+  libexif,
+  pciutils,
+
+  liberation_ttf,
+  curl,
+  util-linux,
+  xdg-utils,
+  wget,
+  flac,
+  harfbuzz,
+  icu,
+  libpng,
+  libopus,
+  snappy,
+  speechd,
+  bzip2,
+  libcap,
+
+  # Necessary for USB audio devices.
+  pulseSupport ? true,
+  libpulseaudio,
+
+  gsettings-desktop-schemas,
+
+  # Allow video acceleration via VA-API to be disabled on systems where is doesn't
+  # work reliably (--enable-features=VaapiVideoDecoder)
+  libvaSupport ? true,
+  libva,
+
+  # For Vulkan support (--enable-features=Vulkan)
+  addDriverRunpath,
+}:
+
+let
+  opusWithCustomModes = libopus.override { withCustomModes = true; };
+
+  deps =
+    [
+      glib
+      fontconfig
+      freetype
+      pango
+      cairo
+      libX11
+      libXi
+      atk
+      nss
+      nspr
+      libXcursor
+      libXext
+      libXfixes
+      libXrender
+      libXScrnSaver
+      libXcomposite
+      libxcb
+      alsa-lib
+      libXdamage
+      libXtst
+      libXrandr
+      libxshmfence
+      expat
+      cups
+      dbus
+      gdk-pixbuf
+      gcc-unwrapped.lib
+      systemd
+      libexif
+      pciutils
+      liberation_ttf
+      curl
+      util-linux
+      wget
+      flac
+      harfbuzz
+      icu
+      libpng
+      opusWithCustomModes
+      snappy
+      speechd
+      bzip2
+      libcap
+      at-spi2-atk
+      at-spi2-core
+      libkrb5
+      libdrm
+      libglvnd
+      mesa
+      coreutils
+      libxkbcommon
+      pipewire
+      wayland
+    ]
+    ++ lib.optional pulseSupport libpulseaudio
+    ++ lib.optional libvaSupport libva
+    ++ [
+      gtk3
+      gtk4
+    ];
+
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wavebox";
+  version = "10.129.32-2";
+
+  src = fetchurl {
+    url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-MaVmiD+XwQLZVVTEZTn/2Kme5pCHXpgQ9bgJRsfrlU0=";
+  };
+
+  nativeBuildInputs = [
+    patchelf
+    makeWrapper
+  ];
+  buildInputs = [
+    gsettings-desktop-schemas # needed for GSETTINGS_SCHEMAS_PATH
+    glib
+    gtk3
+  ];
+
+  unpackPhase = ''
+    ar x $src
+    tar xf data.tar.xz
+  '';
+
+  rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
+
+  installPhase = ''
+    runHook preInstall
+
+    exe=$out/bin/wavebox
+
+    mkdir -p $out/bin $out/share
+
+    cp -a opt/* $out/share
+    cp -a usr/share/* $out/share
+
+
+    substituteInPlace $out/share/wavebox.io/wavebox/wavebox-launcher \
+      --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
+    substituteInPlace $out/share/applications/wavebox.desktop \
+      --replace-fail /opt/wavebox.io/wavebox/wavebox-launcher $exe
+    substituteInPlace $out/share/menu/wavebox.menu \
+      --replace-fail /opt $out/share \
+      --replace-fail $out/share/wavebox.io/wavebox/wavebox $exe
+
+    for icon_file in $out/share/wavebox.io/wavebox/product_logo_[0-9]*.png; do
+      num_and_suffix="''${icon_file##*logo_}"
+      icon_size="''${num_and_suffix%.*}"
+      logo_output_prefix="$out/share/icons/hicolor"
+      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
+      mkdir -p "$logo_output_path"
+      mv "$icon_file" "$logo_output_path/wavebox.png"
+    done
+
+    makeWrapper "$out/share/wavebox.io/wavebox/wavebox" "$exe" \
+      --prefix LD_LIBRARY_PATH : "$rpath" \
+      --prefix PATH            : "${lib.makeBinPath deps}" \
+      --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
+      --set CHROME_WRAPPER "wavebox" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+
+    for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do
+      patchelf --set-rpath $rpath $elf
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+    done
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-wavebox.sh" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p nix-update curl jq
+
+      version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["deb"] | match("https://download.wavebox.app/stable/linux/deb/amd64/wavebox_(.+)_amd64.deb").captures[0]["string"]')
+      nix-update wavebox --version "$version"
+    '';
+  };
+
+  meta = {
+    description = "Wavebox Productivity Browser";
+    homepage = "https://wavebox.io";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ flexiondotorg ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "wavebox";
+  };
+})
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/by-name/wa/wavefunctioncollapse/package.nix
similarity index 100%
rename from pkgs/tools/graphics/wavefunctioncollapse/default.nix
rename to pkgs/by-name/wa/wavefunctioncollapse/package.nix
diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/by-name/wa/wavegain/package.nix
similarity index 100%
rename from pkgs/applications/audio/wavegain/default.nix
rename to pkgs/by-name/wa/wavegain/package.nix
diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/by-name/wa/wavemon/package.nix
similarity index 100%
rename from pkgs/tools/networking/wavemon/default.nix
rename to pkgs/by-name/wa/wavemon/package.nix
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 7f762178a93c..a72a83b30f03 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -33,7 +33,7 @@
 
 let
   pname = "waveterm";
-  version = "0.8.12";
+  version = "0.9.1";
 
   src =
     let
@@ -46,10 +46,10 @@ let
         aarch64-darwin = "Wave-darwin-arm64-${version}.zip";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-lk+YBlsgS2kOsaesKJ0XMCnbxq5iza/0xG6qWjHLZA8=";
-        aarch64-linux = "sha256-57j5qp/1jGiqJP6Qmfw5XkoyXkNpnaTepfhSzlISExM=";
-        x86_64-darwin = "sha256-jBFkBC4PcWSQNw8A2w+2iUnSLoRvXQ3A0CVqkqfx4dI=";
-        aarch64-darwin = "sha256-pQ3TXKhiCI164qmmDkDFb3WUjd/lX1MnAOWqsQICHR4=";
+        x86_64-linux = "sha256-DtpS9jRQljAhPA9Qcpd5acIeCyb5E/Nkyg3LXa4wrk0=";
+        aarch64-linux = "sha256-xM+34vsp+LFCYAFIrb0mKQRy/vPqn7FFvPlzV4JWPCg=";
+        x86_64-darwin = "sha256-fadf/qOec1liqpBOH+lTEGnTYJlvL8QJ3kHNcuI1wew=";
+        aarch64-darwin = "sha256-kKDDeIyO4CSxLWYpJyfz0Egl2S1ADRk4N/XXpsCBXVo=";
       };
     in
     fetchurl {
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/by-name/wa/wavpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/wavpack/default.nix
rename to pkgs/by-name/wa/wavpack/package.nix
diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/by-name/wa/wavrsocvt/package.nix
similarity index 100%
rename from pkgs/applications/misc/audio/wavrsocvt/default.nix
rename to pkgs/by-name/wa/wavrsocvt/package.nix
diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/by-name/wa/way-displays/package.nix
similarity index 100%
rename from pkgs/tools/wayland/way-displays/default.nix
rename to pkgs/by-name/wa/way-displays/package.nix
diff --git a/pkgs/tools/misc/wayback-machine-archiver/default.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix
similarity index 100%
rename from pkgs/tools/misc/wayback-machine-archiver/default.nix
rename to pkgs/by-name/wa/wayback-machine-archiver/package.nix
diff --git a/pkgs/tools/misc/wayback/default.nix b/pkgs/by-name/wa/wayback/package.nix
similarity index 100%
rename from pkgs/tools/misc/wayback/default.nix
rename to pkgs/by-name/wa/wayback/package.nix
diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 8ea14e4b7c37..d1703941a4e5 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -101,6 +101,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/waydroid/waydroid";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ mcaju ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/wa/wayfreeze/package.nix b/pkgs/by-name/wa/wayfreeze/package.nix
index 0f0997888d58..7a53a49f6fb7 100644
--- a/pkgs/by-name/wa/wayfreeze/package.nix
+++ b/pkgs/by-name/wa/wayfreeze/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
-  cargoHash = "sha256-3OjZhWAgfmMZ0OGeRawk3KZpPqz1QCVkwsyGM+E7o88=";
+  cargoHash = "sha256-DOG/IMtHYjdzfPVyFDN20+VB4oEzdSle28F07DydETc=";
 
   buildInputs = [
     libxkbcommon
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
rename to pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/by-name/wa/wayland-utils/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wayland-utils/default.nix
rename to pkgs/by-name/wa/wayland-utils/package.nix
diff --git a/pkgs/tools/misc/waylevel/default.nix b/pkgs/by-name/wa/waylevel/package.nix
similarity index 100%
rename from pkgs/tools/misc/waylevel/default.nix
rename to pkgs/by-name/wa/waylevel/package.nix
diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix
index 2ee83bc20cec..75cb2579adf1 100644
--- a/pkgs/by-name/wa/waylock/build.zig.zon.nix
+++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix
@@ -1,20 +1,107 @@
-# generated by zon2nix (https://github.com/nix-community/zon2nix)
+# generated by zon2nix (https://github.com/Cloudef/zig2nix)
 
-{ linkFarm, fetchzip }:
+{
+  lib,
+  linkFarm,
+  fetchurl,
+  fetchgit,
+  runCommandLocal,
+  zig,
+  name ? "zig-packages",
+}:
 
-linkFarm "zig-packages" [
+with builtins;
+with lib;
+
+let
+  unpackZigArtifact =
+    { name, artifact }:
+    runCommandLocal name
+      {
+        nativeBuildInputs = [ zig ];
+      }
+      ''
+        hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+        mv "$TMPDIR/p/$hash" "$out"
+        chmod 755 "$out"
+      '';
+
+  fetchZig =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      artifact = fetchurl { inherit url hash; };
+    in
+    unpackZigArtifact { inherit name artifact; };
+
+  fetchGitZig =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      parts = splitString "#" url;
+      url_base = elemAt parts 0;
+      url_without_query = elemAt (splitString "?" url_base) 0;
+      rev_base = elemAt parts 1;
+      rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
+    in
+    fetchgit {
+      inherit name rev hash;
+      url = url_without_query;
+      deepClone = false;
+    };
+
+  fetchZigArtifact =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      parts = splitString "://" url;
+      proto = elemAt parts 0;
+      path = elemAt parts 1;
+      fetcher = {
+        "git+http" = fetchGitZig {
+          inherit name hash;
+          url = "http://${path}";
+        };
+        "git+https" = fetchGitZig {
+          inherit name hash;
+          url = "https://${path}";
+        };
+        http = fetchZig {
+          inherit name hash;
+          url = "http://${path}";
+        };
+        https = fetchZig {
+          inherit name hash;
+          url = "https://${path}";
+        };
+      };
+    in
+    fetcher.${proto};
+in
+linkFarm name [
   {
     name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
-    path = fetchzip {
+    path = fetchZigArtifact {
+      name = "zig-wayland";
       url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
-      hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
+      hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA=";
     };
   }
   {
     name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
-    path = fetchzip {
+    path = fetchZigArtifact {
+      name = "zig-xkbcommon";
       url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
-      hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk=";
+      hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0=";
     };
   }
 ]
diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index 42e5df06185c..53f8ff52e816 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waylock";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "waylock";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-i1Nd39666xrkzi7r08ZRIXJXvK9wmzb8zdmvmWEQaHE=";
+    hash = "sha256-jfMSar+Y3inu1Cly6rIDw+akBJIQ6huL0smAstgQmEo=";
   };
 
   deps = callPackage ./build.zig.zon.nix { };
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace pam.d/waylock --replace-fail "system-auth" "login"
   '';
 
-  passthru.updateScript = ./update.nu;
+  passthru.updateScript = ./update.sh;
 
   meta = {
     homepage = "https://codeberg.org/ifreund/waylock";
diff --git a/pkgs/by-name/wa/waylock/update.nu b/pkgs/by-name/wa/waylock/update.nu
deleted file mode 100755
index e227fb646517..000000000000
--- a/pkgs/by-name/wa/waylock/update.nu
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i nu -p nushell common-updater-scripts zon2nix
-
-let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last
-update-source-version waylock $latest_tag
-
-http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon
-zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix
diff --git a/pkgs/by-name/wa/waylock/update.sh b/pkgs/by-name/wa/waylock/update.sh
new file mode 100755
index 000000000000..5916fa443945
--- /dev/null
+++ b/pkgs/by-name/wa/waylock/update.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style zon2nix
+
+latest_tag=$(list-git-tags --url=https://codeberg.org/ifreund/waylock | sed 's/^v//' | tail -n 1)
+
+update-source-version waylock "$latest_tag"
+
+wget "https://codeberg.org/ifreund/waylock/raw/tag/v${latest_tag}/build.zig.zon"
+nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/wa/waylock/build.zig.zon.nix
+# strip file protocol
+sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/wa/waylock/build.zig.zon.nix
+nixfmt pkgs/by-name/wa/waylock/build.zig.zon.nix
+
+rm -f build.zig.zon build.zig.zon2json-lock
diff --git a/pkgs/tools/wayland/waylogout/default.nix b/pkgs/by-name/wa/waylogout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/waylogout/default.nix
rename to pkgs/by-name/wa/waylogout/package.nix
diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/by-name/wa/waylyrics/package.nix
similarity index 100%
rename from pkgs/applications/audio/waylyrics/default.nix
rename to pkgs/by-name/wa/waylyrics/package.nix
diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/by-name/wa/waynergy/package.nix
similarity index 100%
rename from pkgs/tools/wayland/waynergy/default.nix
rename to pkgs/by-name/wa/waynergy/package.nix
diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/by-name/wa/wayout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wayout/default.nix
rename to pkgs/by-name/wa/wayout/package.nix
diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/by-name/wa/waypaper/package.nix
similarity index 100%
rename from pkgs/applications/misc/waypaper/default.nix
rename to pkgs/by-name/wa/waypaper/package.nix
diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/by-name/wa/waypipe/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/waypipe/default.nix
rename to pkgs/by-name/wa/waypipe/package.nix
diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/by-name/wa/wayshot/package.nix
similarity index 100%
rename from pkgs/tools/misc/wayshot/default.nix
rename to pkgs/by-name/wa/wayshot/package.nix
diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/by-name/wa/wayst/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/wayst/default.nix
rename to pkgs/by-name/wa/wayst/package.nix
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/by-name/wa/wayv/package.nix
similarity index 100%
rename from pkgs/tools/X11/wayv/default.nix
rename to pkgs/by-name/wa/wayv/package.nix
diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/by-name/wa/wayvnc/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/wayvnc/default.nix
rename to pkgs/by-name/wa/wayvnc/package.nix
diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/by-name/wa/wazero/package.nix
similarity index 100%
rename from pkgs/development/interpreters/wazero/default.nix
rename to pkgs/by-name/wa/wazero/package.nix
diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/by-name/wb/wbox/package.nix
similarity index 100%
rename from pkgs/tools/networking/wbox/default.nix
rename to pkgs/by-name/wb/wbox/package.nix
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/by-name/wc/wcalc/package.nix
similarity index 100%
rename from pkgs/applications/misc/wcalc/default.nix
rename to pkgs/by-name/wc/wcalc/package.nix
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/by-name/wc/wcc/package.nix
similarity index 100%
rename from pkgs/development/compilers/wcc/default.nix
rename to pkgs/by-name/wc/wcc/package.nix
diff --git a/pkgs/development/embedded/wch-isp/default.nix b/pkgs/by-name/wc/wch-isp/package.nix
similarity index 100%
rename from pkgs/development/embedded/wch-isp/default.nix
rename to pkgs/by-name/wc/wch-isp/package.nix
diff --git a/pkgs/development/libraries/science/math/wcpg/default.nix b/pkgs/by-name/wc/wcpg/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/wcpg/default.nix
rename to pkgs/by-name/wc/wcpg/package.nix
diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/by-name/wc/wcslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/wcslib/default.nix
rename to pkgs/by-name/wc/wcslib/package.nix
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/by-name/wd/wdfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/wdfs/default.nix
rename to pkgs/by-name/wd/wdfs/package.nix
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/by-name/wd/wdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/wdiff/default.nix
rename to pkgs/by-name/wd/wdiff/package.nix
diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/by-name/wd/wdisplays/package.nix
similarity index 100%
rename from pkgs/tools/graphics/wdisplays/default.nix
rename to pkgs/by-name/wd/wdisplays/package.nix
diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/by-name/wd/wdomirror/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wdomirror/default.nix
rename to pkgs/by-name/wd/wdomirror/package.nix
diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/by-name/wd/wdt/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/wdt/default.nix
rename to pkgs/by-name/wd/wdt/package.nix
diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/by-name/we/weather-icons/package.nix
similarity index 100%
rename from pkgs/data/fonts/weather-icons/default.nix
rename to pkgs/by-name/we/weather-icons/package.nix
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/by-name/we/weather/package.nix
similarity index 100%
rename from pkgs/applications/misc/weather/default.nix
rename to pkgs/by-name/we/weather/package.nix
diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/by-name/we/weave-gitops/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/weave-gitops/default.nix
rename to pkgs/by-name/we/weave-gitops/package.nix
diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/by-name/we/weaviate/package.nix
similarity index 100%
rename from pkgs/servers/search/weaviate/default.nix
rename to pkgs/by-name/we/weaviate/package.nix
diff --git a/pkgs/by-name/we/web-archives/package.nix b/pkgs/by-name/we/web-archives/package.nix
index 2c052474489b..d59c456cc2c9 100644
--- a/pkgs/by-name/we/web-archives/package.nix
+++ b/pkgs/by-name/we/web-archives/package.nix
@@ -11,7 +11,7 @@
   libzim-glib,
   sqlite,
   webkitgtk_4_1,
-  tracker,
+  tinysparql,
   libxml2,
   libisocodes,
   libhandy,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libzim-glib
     sqlite
     webkitgtk_4_1
-    tracker
+    tinysparql
     libxml2
     libisocodes
     libhandy
diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/by-name/we/web-ext/package.nix
similarity index 100%
rename from pkgs/development/tools/web-ext/default.nix
rename to pkgs/by-name/we/web-ext/package.nix
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/by-name/we/webalizer/package.nix
similarity index 100%
rename from pkgs/tools/networking/webalizer/default.nix
rename to pkgs/by-name/we/webalizer/package.nix
diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/by-name/we/webanalyze/package.nix
similarity index 100%
rename from pkgs/tools/security/webanalyze/default.nix
rename to pkgs/by-name/we/webanalyze/package.nix
diff --git a/pkgs/tools/misc/webcat/default.nix b/pkgs/by-name/we/webcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/webcat/default.nix
rename to pkgs/by-name/we/webcat/package.nix
diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/by-name/we/webdav-server-rs/package.nix
similarity index 100%
rename from pkgs/servers/webdav-server-rs/default.nix
rename to pkgs/by-name/we/webdav-server-rs/package.nix
diff --git a/pkgs/servers/webdav/default.nix b/pkgs/by-name/we/webdav/package.nix
similarity index 100%
rename from pkgs/servers/webdav/default.nix
rename to pkgs/by-name/we/webdav/package.nix
diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/by-name/we/webdis/package.nix
similarity index 100%
rename from pkgs/development/tools/database/webdis/default.nix
rename to pkgs/by-name/we/webdis/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/by-name/we/webex/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/webex/default.nix
rename to pkgs/by-name/we/webex/package.nix
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/by-name/we/webhook/package.nix
similarity index 100%
rename from pkgs/servers/http/webhook/default.nix
rename to pkgs/by-name/we/webhook/package.nix
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 88133c882c42..ec952498d215 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -49,6 +49,8 @@ python.pkgs.buildPythonApplication rec {
     "qrcode"
     # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7
     "rapidfuzz"
+    # https://github.com/WeblateOrg/weblate/commit/3e34566fd7c151e1983586586bd7651cefe79585
+    "redis"
   ];
 
   patches = [
diff --git a/pkgs/servers/webmesh/default.nix b/pkgs/by-name/we/webmesh/package.nix
similarity index 100%
rename from pkgs/servers/webmesh/default.nix
rename to pkgs/by-name/we/webmesh/package.nix
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/by-name/we/webmetro/package.nix
similarity index 100%
rename from pkgs/servers/webmetro/default.nix
rename to pkgs/by-name/we/webmetro/package.nix
diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
similarity index 100%
rename from pkgs/development/libraries/webp-pixbuf-loader/default.nix
rename to pkgs/by-name/we/webp-pixbuf-loader/package.nix
diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/by-name/we/websocketd/package.nix
similarity index 100%
rename from pkgs/applications/networking/websocketd/default.nix
rename to pkgs/by-name/we/websocketd/package.nix
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/by-name/we/websocketpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/websocket++/default.nix
rename to pkgs/by-name/we/websocketpp/package.nix
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/by-name/we/webtorrent_desktop/package.nix
similarity index 100%
rename from pkgs/applications/video/webtorrent_desktop/default.nix
rename to pkgs/by-name/we/webtorrent_desktop/package.nix
diff --git a/pkgs/tools/networking/webwormhole/default.nix b/pkgs/by-name/we/webwormhole/package.nix
similarity index 100%
rename from pkgs/tools/networking/webwormhole/default.nix
rename to pkgs/by-name/we/webwormhole/package.nix
diff --git a/pkgs/by-name/we/wechat-uos/libuosdevicea.c b/pkgs/by-name/we/wechat-uos/libuosdevicea.c
deleted file mode 100644
index 0cdc0cecde7d..000000000000
--- a/pkgs/by-name/we/wechat-uos/libuosdevicea.c
+++ /dev/null
@@ -1,44 +0,0 @@
-// taken from https://aur.archlinux.org/cgit/aur.git/tree/libuosdevicea.c?h=wechat-universal
-
-/*
- * licensestub - compat layer for libuosdevicea
- * Copyright (C) 2024 Zephyr Lykos 
- * Copyright (C) 2024 Guoxin "7Ji" Pu 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#define _GNU_SOURCE
-
-#include 
-
-#define declare_string_getter(suffix, constant) void uos_get_##suffix(char *const restrict out) { if (out) strcpy(out, constant); }
-
-declare_string_getter(mac,      // MAC address with colon stripped
-    "000000000000")
-declare_string_getter(hddsninfo,
-    "SN")
-declare_string_getter(hwserial, // MD5 of hddsninfo
-    "92666505ce75444ee14be2ebc2f10a60")
-declare_string_getter(mb_sn,    // hardcoded
-    "E50022008800015957007202c59a1a8-3981-2020-0810-204909000000")
-declare_string_getter(osver, 
-    "UnionTech OS Desktop")
-declare_string_getter(licensetoken, 
-    "djEsdjEsMSwyLDk5QUFFN0FBQVdRQjk5OFhKS0FIU1QyOTQsMTAsOTI2NjY1MDVjZTc1NDQ0ZWUxNGJlMmViYzJmMTBhNjAsQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE6ZjA3NjAwYzZkNmMyMDkyMDBkMzE5YzU2OThmNTc3MGRlYWY1NjAyZTY5MzUxZTczNjI2NjlhNzIyZTBkNTJiOTNhYzk0MmM3YTNkZTgxNjIxMmUwMDA1NTUwODg4N2NlMDQ4ODMyNTExY2JhNGFiMjdmYzlmZjMyYzFiNTYwNjMwZDI3ZDI2NmE5ZGIxZDQ0N2QxYjNlNTNlNTVlOTY1MmU5YTU4OGY0NWYzMTMwZDE0NDc4MTRhM2FmZjRlZGNmYmNkZjhjMmFiMDc5OWYwNGVmYmQ2NjdiNGYwYzEwNDhkYzExNjYwZWU1NTdlNTdmNzBlNjA1N2I0NThkMDgyOA==")
-
-int uos_is_active() {
-    return 0;
-}
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index 63b47dde8500..d5462739cf56 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -2,7 +2,6 @@
 , stdenv
 , lib
 , fetchurl
-, requireFile
 , dpkg
 , nss
 , nspr
@@ -45,21 +44,6 @@
 , libnotify
 , buildFHSEnv
 , writeShellScript
-, /**
-  License for wechat-uos, packed in a gz archive named "license.tar.gz".
-  It should have the following files:
-  license.tar.gz
-  ├── etc
-  │   ├── lsb-release
-  │   └── os-release
-  └── var
-      ├── lib
-      │   └── uos-license
-      │       └── .license.json
-      └── uos
-          └── .license.key
-  */
-  uosLicense ? null
 }:
 let
   # zerocallusedregs hardening breaks WeChat
@@ -72,79 +56,16 @@ let
     name = "wechat-uos-env";
     buildCommand = ''
       mkdir -p $out/etc
-      mkdir -p $out/lib/license
       mkdir -p $out/usr/bin
       mkdir -p $out/usr/share
       mkdir -p $out/opt
       mkdir -p $out/var
 
       ln -s ${wechat}/opt/* $out/opt/
-      ln -s ${wechat}/usr/lib/wechat-uos/license/etc/os-release  $out/etc/os-release
-      ln -s ${wechat}/usr/lib/wechat-uos/license/etc/lsb-release  $out/etc/lsb-release
-      ln -s ${wechat}/usr/lib/wechat-uos/license/var/*  $out/var/
-      ln -s ${wechat}/usr/lib/wechat-uos/license/libuosdevicea.so $out/lib/license/
     '';
     preferLocalBuild = true;
   };
 
-  uosLicenseUnzipped = stdenvNoCC.mkDerivation {
-    name = "uos-license-unzipped";
-    src =
-      if uosLicense == null then
-        requireFile
-          {
-            name = "license.tar.gz";
-            url = "https://www.uniontech.com";
-            hash = "sha256-U3YAecGltY8vo9Xv/h7TUjlZCyiIQdgSIp705VstvWk=";
-          } else uosLicense;
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out
-      cp -r * $out/
-
-      runHook postInstall
-    '';
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME=";
-  };
-
-  libuosdevicea = stdenv.mkDerivation rec {
-    name = "libuosdevicea";
-    src = ./libuosdevicea.c;
-
-    unpackPhase = ''
-      runHook preUnpack
-
-      cp ${src} libuosdevicea.c
-
-      runHook postUnpack
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      $CC -shared -fPIC -o libuosdevicea.so libuosdevicea.c
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/lib
-      cp libuosdevicea.so $out/lib/
-
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      license = licenses.gpl2Plus;
-    };
-  };
-
   wechat-uos-runtime = with xorg; [
     # Make sure our glibc without hardening gets picked up first
     (lib.hiPrio glibcWithoutHardening)
@@ -231,8 +152,6 @@ let
         };
       }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
 
-      inherit uosLicense;
-
       nativeBuildInputs = [ dpkg ];
 
       unpackPhase = ''
@@ -250,10 +169,6 @@ let
 
         cp -r wechat-uos/* $out
 
-        mkdir -pv $out/usr/lib/wechat-uos/license
-        ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/
-        ln -s ${libuosdevicea}/lib/libuosdevicea.so $out/usr/lib/wechat-uos/license/
-
         runHook postInstall
       '';
 
@@ -272,6 +187,7 @@ buildFHSEnv {
   inherit (wechat) name meta;
   runScript = writeShellScript "wechat-uos-launcher" ''
     export QT_QPA_PLATFORM=xcb
+    export QT_AUTO_SCREEN_SCALE_FACTOR=1
     export LD_LIBRARY_PATH=${lib.makeLibraryPath wechat-uos-runtime}
 
     if [[ ''${XMODIFIERS} =~ fcitx ]]; then
diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix
index 3d5590de6416..4bf6f508b8b8 100644
--- a/pkgs/by-name/we/wechat-uos/sources.nix
+++ b/pkgs/by-name/we/wechat-uos/sources.nix
@@ -1,11 +1,11 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2024-05-06
+# Last updated: 2024-11-08
 {
-  version = "1.0.0.241";
-  amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_amd64.deb";
-  arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_arm64.deb";
-  loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_loongarch64.deb";
-  amd64_hash = "sha256-J2ipc3byBzvVFe+B1k+nsgZo+mwRpBd6LtF/ybAzmKM=";
-  arm64_hash = "sha256-5KA4ekhVdXoin/7VhuMbG8XIlx0w7vHAedZ1fnBOBYo=";
-  loongarch64_hash = "sha256-kMMnb9jjOOtQFivLDu+aQctVMYeFHQ1fNg49AQE4yLk=";
+  version = "4.0.0.23";
+  amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.23_amd64.deb";
+  arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.23_arm64.deb";
+  loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.23_loongarch64.deb";
+  amd64_hash = "sha256-Q3gmo83vJddj9p4prhBHm16LK6CAtW3ltd5j4FqPcgM=";
+  arm64_hash = "sha256-oIsPbEkw1+zXpzvXAVEdmykXjb5zulHATwnrnhsxkPc=";
+  loongarch64_hash = "sha256-grj9yGHZZag20l5s8IgcknvUvz0fBHkakgKsOe+rhmI=";
 }
diff --git a/pkgs/tools/security/weggli/default.nix b/pkgs/by-name/we/weggli/package.nix
similarity index 100%
rename from pkgs/tools/security/weggli/default.nix
rename to pkgs/by-name/we/weggli/package.nix
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/by-name/we/wego/package.nix
similarity index 100%
rename from pkgs/applications/misc/wego/default.nix
rename to pkgs/by-name/we/wego/package.nix
diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/by-name/we/weidu/package.nix
similarity index 100%
rename from pkgs/tools/games/weidu/default.nix
rename to pkgs/by-name/we/weidu/package.nix
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/by-name/we/welkin/package.nix
similarity index 100%
rename from pkgs/tools/graphics/welkin/default.nix
rename to pkgs/by-name/we/welkin/package.nix
diff --git a/pkgs/tools/misc/wemux/default.nix b/pkgs/by-name/we/wemux/package.nix
similarity index 100%
rename from pkgs/tools/misc/wemux/default.nix
rename to pkgs/by-name/we/wemux/package.nix
diff --git a/pkgs/servers/wesher/default.nix b/pkgs/by-name/we/wesher/package.nix
similarity index 100%
rename from pkgs/servers/wesher/default.nix
rename to pkgs/by-name/we/wesher/package.nix
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/by-name/we/weston/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/weston/default.nix
rename to pkgs/by-name/we/weston/package.nix
diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/by-name/we/wev/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wev/default.nix
rename to pkgs/by-name/we/wev/package.nix
diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix
new file mode 100644
index 000000000000..5f25b7112d98
--- /dev/null
+++ b/pkgs/by-name/wf/wf-recorder/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  scdoc,
+  wayland-scanner,
+  wayland,
+  wayland-protocols,
+  ffmpeg,
+  x264,
+  libpulseaudio,
+  pipewire,
+  mesa, # for libgbm
+  fetchpatch,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wf-recorder";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "ammen99";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk=";
+  };
+
+  patches = [
+    # compile fixes from upstream, remove when they stop applying
+    (fetchpatch {
+      url = "https://github.com/ammen99/wf-recorder/commit/560bb92d3ddaeb31d7af77d22d01b0050b45bebe.diff";
+      sha256 = "sha256-7jbX5k8dh4dWfolMkZXiERuM72zVrkarsamXnd+1YoI=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+    scdoc
+  ];
+  buildInputs = [
+    wayland
+    wayland-protocols
+    ffmpeg
+    x264
+    libpulseaudio
+    pipewire
+    mesa
+  ];
+
+  meta = with lib; {
+    description = "Utility program for screen recording of wlroots-based compositors";
+    inherit (src.meta) homepage;
+    changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.linux;
+    mainProgram = "wf-recorder";
+  };
+}
diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/by-name/wf/wfa2-lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/wfa2-lib/default.nix
rename to pkgs/by-name/wf/wfa2-lib/package.nix
diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/by-name/wg/wg-bond/package.nix
similarity index 100%
rename from pkgs/applications/networking/wg-bond/default.nix
rename to pkgs/by-name/wg/wg-bond/package.nix
diff --git a/pkgs/tools/networking/wg-friendly-peer-names/default.nix b/pkgs/by-name/wg/wg-friendly-peer-names/package.nix
similarity index 100%
rename from pkgs/tools/networking/wg-friendly-peer-names/default.nix
rename to pkgs/by-name/wg/wg-friendly-peer-names/package.nix
diff --git a/pkgs/tools/networking/wgautomesh/default.nix b/pkgs/by-name/wg/wgautomesh/package.nix
similarity index 100%
rename from pkgs/tools/networking/wgautomesh/default.nix
rename to pkgs/by-name/wg/wgautomesh/package.nix
diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/by-name/wg/wgcf/package.nix
similarity index 100%
rename from pkgs/applications/networking/wgcf/default.nix
rename to pkgs/by-name/wg/wgcf/package.nix
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/by-name/wg/wget/package.nix
similarity index 100%
rename from pkgs/tools/networking/wget/default.nix
rename to pkgs/by-name/wg/wget/package.nix
diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/pkgs/by-name/wg/wget/remove-runtime-dep-on-openssl-headers.patch
similarity index 100%
rename from pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
rename to pkgs/by-name/wg/wget/remove-runtime-dep-on-openssl-headers.patch
diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/by-name/wg/wget2/package.nix
similarity index 100%
rename from pkgs/tools/networking/wget2/default.nix
rename to pkgs/by-name/wg/wget2/package.nix
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/by-name/wg/wgetpaste/package.nix
similarity index 100%
rename from pkgs/tools/text/wgetpaste/default.nix
rename to pkgs/by-name/wg/wgetpaste/package.nix
diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/by-name/wg/wgo/package.nix
similarity index 100%
rename from pkgs/development/tools/wgo/default.nix
rename to pkgs/by-name/wg/wgo/package.nix
diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/by-name/wh/whatip/package.nix
similarity index 100%
rename from pkgs/tools/networking/whatip/default.nix
rename to pkgs/by-name/wh/whatip/package.nix
diff --git a/pkgs/tools/misc/whatsapp-chat-exporter/default.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
similarity index 100%
rename from pkgs/tools/misc/whatsapp-chat-exporter/default.nix
rename to pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/by-name/wh/whatsapp-for-linux/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
rename to pkgs/by-name/wh/whatsapp-for-linux/package.nix
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index 1a54a4f142aa..e9888da4ea15 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "whatsie";
-  version = "4.16.2";
+  version = "4.16.3";
 
   src = fetchFromGitHub {
     owner = "keshavbhatt";
     repo = "whatsie";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-4Ur/FNg4jqtyWGB0lW4Uw2XlfMclz080LDRNO+RnkrM=";
+    hash = "sha256-F6hQY3Br0iFDYkghBgRAyzLW6QhhG8UHOgkEgDjeQLg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/development/libraries/whereami/default.nix b/pkgs/by-name/wh/whereami/package.nix
similarity index 100%
rename from pkgs/development/libraries/whereami/default.nix
rename to pkgs/by-name/wh/whereami/package.nix
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/by-name/wh/which/package.nix
similarity index 100%
rename from pkgs/tools/system/which/default.nix
rename to pkgs/by-name/wh/which/package.nix
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/by-name/wh/whipper/package.nix
similarity index 100%
rename from pkgs/applications/audio/whipper/default.nix
rename to pkgs/by-name/wh/whipper/package.nix
diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix
similarity index 100%
rename from pkgs/tools/audio/whisper-ctranslate2/default.nix
rename to pkgs/by-name/wh/whisper-ctranslate2/package.nix
diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/by-name/wh/whisper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/whisper/default.nix
rename to pkgs/by-name/wh/whisper/package.nix
diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix
index 7cbe05f6cea8..e1e12ec8fd81 100644
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "whistle";
-  version = "2.9.80";
+  version = "2.9.86";
 
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
     rev = "v${version}";
-    hash = "sha256-nBjVPWs9ZTs35UHysITlJc/SEA7nJ16ZF7qWQGzrp70=";
+    hash = "sha256-k6JAOnHm5xFdI5rKSOj33YtpkHEGx/6Bs0PLQNerH+M=";
   };
 
-  npmDepsHash = "sha256-kWlScRM6vkSQgH3Z4voIsjV+wRbaKL4ApSdP58u9cxg=";
+  npmDepsHash = "sha256-kVjZ0E1iQtUOf9LWPHVMj0eQRDwDREiTAGrFaa/m4/I=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/by-name/wh/whitebophir/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/whitebophir/default.nix
rename to pkgs/by-name/wh/whitebophir/package.nix
diff --git a/pkgs/data/icons/whitesur-cursors/default.nix b/pkgs/by-name/wh/whitesur-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/whitesur-cursors/default.nix
rename to pkgs/by-name/wh/whitesur-cursors/package.nix
diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
new file mode 100644
index 000000000000..82b30082d1e1
--- /dev/null
+++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
@@ -0,0 +1,113 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gitUpdater
+, dialog
+, glib
+, gnome-themes-extra
+, jdupes
+, libxml2
+, sassc
+, util-linux
+, altVariants ? [] # default: normal
+, colorVariants ? [] # default: all
+, opacityVariants ? [] # default: all
+, themeVariants ? [] # default: default (BigSur-like theme)
+, iconVariant ? null # default: standard (Apple logo)
+, nautilusStyle ? null # default: stable (BigSur-like style)
+, nautilusSize ? null # default: 200px
+, panelOpacity ? null # default: 15%
+, panelSize ? null # default: 32px
+, roundedMaxWindow ? false # default: false
+, nordColor ? false # default = false
+, darkerColor ? false # default = false
+}:
+
+let
+  pname = "whitesur-gtk-theme";
+  single = x: lib.optional (x != null) x;
+
+in
+lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants
+lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants
+lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
+lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
+lib.checkListOfEnum "${pname}: activities icon variants" [ "standard" "apple" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
+lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle)
+lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
+lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
+lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize)
+
+stdenv.mkDerivation rec {
+  pname = "whitesur-gtk-theme";
+  version = "2024.09.02";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = pname;
+    rev = version;
+    hash = "sha256-a32iHPcbMYuBy65FWm/fkjwJQE3aVScR3WJJzKTVx9k=";
+  };
+
+  nativeBuildInputs = [
+    dialog
+    glib
+    jdupes
+    libxml2
+    sassc
+    util-linux
+  ];
+
+  buildInputs = [
+    gnome-themes-extra # adwaita engine for Gtk2
+  ];
+
+  postPatch = ''
+    find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do
+      patchShebangs "$file"
+    done
+
+    # Do not provide `sudo`, as it is not needed in our use case of the install script
+    substituteInPlace shell/lib-core.sh --replace-fail '$(which sudo)' false
+
+    # Provides a dummy home directory
+    substituteInPlace shell/lib-core.sh --replace-fail 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes
+
+    ./install.sh \
+      ${toString (map (x: "--alt " + x) altVariants)} \
+      ${toString (map (x: "--color " + x) colorVariants)} \
+      ${toString (map (x: "--opacity " + x) opacityVariants)} \
+      ${toString (map (x: "--theme " + x) themeVariants)} \
+      ${lib.optionalString (nautilusStyle != null) ("--nautilus " + nautilusStyle)} \
+      ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
+      ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \
+      ${lib.optionalString nordColor "--nordcolor"} \
+      ${lib.optionalString darkerColor "--darkercolor"} \
+      ${lib.optionalString (iconVariant != null) ("--gnome-shell -i " + iconVariant)} \
+      ${lib.optionalString (panelSize != null) ("--gnome-shell -height " + panelSize)} \
+      ${lib.optionalString (panelOpacity != null) ("--gnome-shell -panelopacity " + panelOpacity)} \
+      --dest $out/share/themes
+
+    jdupes --quiet --link-soft --recurse $out/share
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
+    description = "MacOS BigSur like Gtk+ theme based on Elegant Design";
+    homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/whitesur-icon-theme/default.nix
rename to pkgs/by-name/wh/whitesur-icon-theme/package.nix
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/by-name/wh/whois/package.nix
similarity index 100%
rename from pkgs/tools/networking/whois/default.nix
rename to pkgs/by-name/wh/whois/package.nix
diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/by-name/wh/whsniff/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/whsniff/default.nix
rename to pkgs/by-name/wh/whsniff/package.nix
diff --git a/pkgs/games/widelands/default.nix b/pkgs/by-name/wi/widelands/package.nix
similarity index 100%
rename from pkgs/games/widelands/default.nix
rename to pkgs/by-name/wi/widelands/package.nix
diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/by-name/wi/wifi-password/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/wifi-password/default.nix
rename to pkgs/by-name/wi/wifi-password/package.nix
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/by-name/wi/wiggle/package.nix
similarity index 100%
rename from pkgs/development/tools/wiggle/default.nix
rename to pkgs/by-name/wi/wiggle/package.nix
diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/by-name/wi/wiiload/package.nix
similarity index 100%
rename from pkgs/development/tools/wiiload/default.nix
rename to pkgs/by-name/wi/wiiload/package.nix
diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff b/pkgs/by-name/wi/wiimms-iso-tools/fix-paths.diff
similarity index 100%
rename from pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff
rename to pkgs/by-name/wi/wiimms-iso-tools/fix-paths.diff
diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/by-name/wi/wiimms-iso-tools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/wiimms-iso-tools/default.nix
rename to pkgs/by-name/wi/wiimms-iso-tools/package.nix
diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/by-name/wi/wily/package.nix
similarity index 100%
rename from pkgs/applications/editors/wily/default.nix
rename to pkgs/by-name/wi/wily/package.nix
diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/by-name/wi/wimboot/package.nix
similarity index 100%
rename from pkgs/tools/misc/wimboot/default.nix
rename to pkgs/by-name/wi/wimboot/package.nix
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/by-name/wi/wimlib/package.nix
similarity index 100%
rename from pkgs/tools/archivers/wimlib/default.nix
rename to pkgs/by-name/wi/wimlib/package.nix
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/by-name/wi/win-spice/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/driver/win-spice/default.nix
rename to pkgs/by-name/wi/win-spice/package.nix
diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
index b6f4d07bd649..ec030845cc00 100644
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@@ -144,7 +144,7 @@ rustPlatform.buildRustPackage {
     openssl
     rustfmt
     lld
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [
@@ -170,7 +170,7 @@ rustPlatform.buildRustPackage {
           bash
         ]
       } \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]} \
       --set PYTHON_PATH "${pythonEnv}/bin/python3" \
       --set GO_PATH "${go}/bin/go" \
       --set DENO_PATH "${deno}/bin/deno" \
diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/by-name/wi/windowchef/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowchef/default.nix
rename to pkgs/by-name/wi/windowchef/package.nix
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/by-name/wi/windowlab/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowlab/default.nix
rename to pkgs/by-name/wi/windowlab/package.nix
diff --git a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
index bd873bd7ba33..1baf11642eb7 100644
--- a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
+++ b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
@@ -4,15 +4,15 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wine-discord-ipc-bridge";
-  version = "unstable-2023-08-09";
+  version = "0.0.3";
 
   src = fetchFromGitHub {
     owner = "0e4ef622";
     repo = "wine-discord-ipc-bridge";
-    rev = "f8198c9d52e708143301017a296f7557c4387127";
-    hash = "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-jzsbOKMakNQ6RNMlioX088fGzFBDxOP45Atlsfm2RKg=";
   };
 
   postPatch = ''
@@ -33,6 +33,6 @@ stdenv.mkDerivation {
     license = licenses.mit;
     maintainers = [ maintainers.uku3lig ];
     mainProgram = "winediscordipcbridge";
-    platforms = [ "mingw32" ];
+    platforms = [ "i686-windows" ];
   };
-}
+})
diff --git a/pkgs/applications/emulators/wineasio/default.nix b/pkgs/by-name/wi/wineasio/package.nix
similarity index 100%
rename from pkgs/applications/emulators/wineasio/default.nix
rename to pkgs/by-name/wi/wineasio/package.nix
diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch b/pkgs/by-name/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
similarity index 100%
rename from pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
rename to pkgs/by-name/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix
similarity index 100%
rename from pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
rename to pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix
diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/by-name/wi/wings/package.nix
similarity index 100%
rename from pkgs/applications/graphics/wings/default.nix
rename to pkgs/by-name/wi/wings/package.nix
diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/by-name/wi/winhelpcgi/package.nix
similarity index 100%
rename from pkgs/development/tools/winhelpcgi/default.nix
rename to pkgs/by-name/wi/winhelpcgi/package.nix
diff --git a/pkgs/tools/security/wipe/fix-install.patch b/pkgs/by-name/wi/wipe/fix-install.patch
similarity index 100%
rename from pkgs/tools/security/wipe/fix-install.patch
rename to pkgs/by-name/wi/wipe/fix-install.patch
diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/by-name/wi/wipe/package.nix
similarity index 100%
rename from pkgs/tools/security/wipe/default.nix
rename to pkgs/by-name/wi/wipe/package.nix
diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/by-name/wi/wipefreespace/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/wipefreespace/default.nix
rename to pkgs/by-name/wi/wipefreespace/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/by-name/wi/wire-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
rename to pkgs/by-name/wi/wire-desktop/package.nix
diff --git a/pkgs/development/tools/wire/go-modules.patch b/pkgs/by-name/wi/wire/go-modules.patch
similarity index 100%
rename from pkgs/development/tools/wire/go-modules.patch
rename to pkgs/by-name/wi/wire/go-modules.patch
diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/by-name/wi/wire/package.nix
similarity index 100%
rename from pkgs/development/tools/wire/default.nix
rename to pkgs/by-name/wi/wire/package.nix
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/by-name/wi/wiredtiger/package.nix
similarity index 100%
rename from pkgs/development/libraries/wiredtiger/default.nix
rename to pkgs/by-name/wi/wiredtiger/package.nix
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/by-name/wi/wireless-regdb/package.nix
similarity index 100%
rename from pkgs/data/misc/wireless-regdb/default.nix
rename to pkgs/by-name/wi/wireless-regdb/package.nix
diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/by-name/wi/wirelesstools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/wireless-tools/default.nix
rename to pkgs/by-name/wi/wirelesstools/package.nix
diff --git a/pkgs/games/wireworld/default.nix b/pkgs/by-name/wi/wireworld/package.nix
similarity index 100%
rename from pkgs/games/wireworld/default.nix
rename to pkgs/by-name/wi/wireworld/package.nix
diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/by-name/wi/wiringpi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/wiringpi/default.nix
rename to pkgs/by-name/wi/wiringpi/package.nix
diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/by-name/wi/wishbone-tool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/wishbone-tool/default.nix
rename to pkgs/by-name/wi/wishbone-tool/package.nix
diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/by-name/wi/wishlist/package.nix
similarity index 100%
rename from pkgs/servers/wishlist/default.nix
rename to pkgs/by-name/wi/wishlist/package.nix
diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 7404dd906335..d619491020ee 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wit-bindgen";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
     rev = "v${version}";
-    hash = "sha256-+3tWqNdDZagJa9cLSz1OBaPtCr2F1joYyzB//BPqV34=";
+    hash = "sha256-ZnMQpIfKN6ByEZasvy+UM12ZBsrhTM1s3TN1dF/3YMY=";
   };
 
-  cargoHash = "sha256-3TrnSU7qXC8INlEZMbYTNwZsqiKMZ6j7tdGmz3DFl1g=";
+  cargoHash = "sha256-eF1qJ0fH3ODG1u9tUD3dj/2i7+0BJ4fJPlaYjS3XiGU=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
   # However, GitHub Actions ensures a proper build.
diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/by-name/wi/witness/package.nix
similarity index 100%
rename from pkgs/tools/security/witness/default.nix
rename to pkgs/by-name/wi/witness/package.nix
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix
similarity index 100%
rename from pkgs/tools/graphics/wkhtmltopdf/default.nix
rename to pkgs/by-name/wk/wkhtmltopdf/package.nix
diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/by-name/wl/wl-clipboard-x11/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-clipboard-x11/default.nix
rename to pkgs/by-name/wl/wl-clipboard-x11/package.nix
diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/by-name/wl/wl-clipboard/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-clipboard/default.nix
rename to pkgs/by-name/wl/wl-clipboard/package.nix
diff --git a/pkgs/tools/wayland/wl-color-picker/default.nix b/pkgs/by-name/wl/wl-color-picker/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-color-picker/default.nix
rename to pkgs/by-name/wl/wl-color-picker/package.nix
diff --git a/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff b/pkgs/by-name/wl/wl-gammactl/dont-need-wlroots.diff
similarity index 100%
rename from pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff
rename to pkgs/by-name/wl/wl-gammactl/dont-need-wlroots.diff
diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/by-name/wl/wl-gammactl/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-gammactl/default.nix
rename to pkgs/by-name/wl/wl-gammactl/package.nix
diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix
index 64388cf0b7be..7da62ca22f87 100644
--- a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix
+++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   runtimeDependencies = [
diff --git a/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock b/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock
index 0df34b9852a9..9725cbb75cbd 100644
--- a/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock
+++ b/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock
@@ -1,36 +1,36 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[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"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[package]]
 name = "cfg-if"
@@ -46,9 +46,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "clap"
-version = "4.5.3"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -56,9 +56,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -66,9 +66,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.3"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "equivalent"
@@ -90,9 +90,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 
 [[package]]
 name = "heck"
@@ -102,9 +102,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -112,30 +112,30 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
 
 [[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",
 ]
@@ -155,36 +155,36 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -239,9 +239,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -250,18 +250,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -270,15 +270,15 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -287,26 +287,36 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "wayrs-client"
-version = "1.0.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae384b841a260a5d86f471b21c22639a6fd41fe37c407be72a6d714fd3433bae"
+checksum = "38de237bedae071e5557d126e1baa1b88ae7512c725fdd54617453f3b544f3e0"
 dependencies = [
- "nix",
  "thiserror",
+ "wayrs-core",
  "wayrs-scanner",
 ]
 
 [[package]]
-name = "wayrs-proto-parser"
-version = "2.0.0"
+name = "wayrs-core"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1406ebeb6ba4a201745a92c221eca3dcec5b404fcbe948acf8a166b323582fa9"
+checksum = "e8bb65fd8a7197918772a8622547b380d4ca62c53a6c43c2b176dcb3f8b69246"
+dependencies = [
+ "libc",
+ "thiserror",
+]
+
+[[package]]
+name = "wayrs-proto-parser"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076ab8342497b77753c4f882f6d1654e1f8f4bd648ce72d045f237b8a727f4c9"
 dependencies = [
  "quick-xml",
  "thiserror",
@@ -314,20 +324,19 @@ dependencies = [
 
 [[package]]
 name = "wayrs-protocols"
-version = "0.13.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37562eeb522e6cbc9fb9e4e96a8622e10d0f31fec780ed5c12c1fc15d127a47"
+checksum = "28591a3ed941f8db9a747f4256ac65efda2cfae983315fd8cbe046bea91f2518"
 dependencies = [
  "wayrs-client",
 ]
 
 [[package]]
 name = "wayrs-scanner"
-version = "0.13.2"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e387d47549e37bd2a6f03973a77578bb003f661559a096c9274b5b9bcd78bf1f"
+checksum = "21f171cbfea7942eb5a4648496730cc7757536fa5ac77774652a13b1570085c5"
 dependencies = [
- "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -336,16 +345,16 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "wl-gammarelay-rs"
-version = "0.4.1"
+version = "1.0.0"
 dependencies = [
  "anyhow",
  "bytemuck",
diff --git a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
index 202fcf7c7da1..e569ff58dfc8 100644
--- a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
+++ b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
@@ -5,13 +5,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "wl-gammarelay-rs";
-  version = "0.4.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "wl-gammarelay-rs";
     rev = "v${version}";
-    hash = "sha256-36u2s+Yv+0/lZErHonVvzyBuZ2xES2MGMG4PRjaM74k=";
+    hash = "sha256-zmtC4xNNAK/TiB5TU6qsY5y0Z3roaEnTwHMZPjq6SbE=";
   };
 
   cargoLock = {
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Plus;
     mainProgram = "wl-gammarelay-rs";
     maintainers = with lib.maintainers; [ quantenzitrone ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix
index b252a985dd00..947fe055ce76 100644
--- a/pkgs/by-name/wl/wl-kbptr/package.nix
+++ b/pkgs/by-name/wl/wl-kbptr/package.nix
@@ -14,7 +14,7 @@
 }:
 let
   pname = "wl-kbptr";
-  version = "0.2.1";
+  version = "0.2.3";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     owner = "moverest";
     repo = "wl-kbptr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bA4PbWJNM4qWDF5KfNEgeQ5Z/r/Aw3wL8YUMSnzUo0w=";
+    hash = "sha256-4OWy5Q+NSKgzDn12aflZ+YAfacLeOTIhOojiJ2WiqQg=";
   };
 
   depsBuildBuild = [ pkg-config ];
diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/by-name/wl/wl-mirror/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-mirror/default.nix
rename to pkgs/by-name/wl/wl-mirror/package.nix
diff --git a/pkgs/by-name/wl/wl-screenrec/package.nix b/pkgs/by-name/wl/wl-screenrec/package.nix
new file mode 100644
index 000000000000..5bba48bd9b46
--- /dev/null
+++ b/pkgs/by-name/wl/wl-screenrec/package.nix
@@ -0,0 +1,44 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libdrm
+, ffmpeg_6
+, wayland
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "wl-screenrec";
+  version = "0.1.4-unstable-2024-07-28";
+
+  src = fetchFromGitHub {
+    owner = "russelltg";
+    repo = pname;
+    rev = "b817accf1d4f2373cb6f466f760de35e5b8626bd";
+    hash = "sha256-07O2YM9dOHWzriM2+uiBWjEt2hKAuXtRtnKBuzb02Us=";
+  };
+
+  cargoHash = "sha256-AYirjrnk8SGTXk5IjzCep2AQJYPbgHAOOf47MUDYj4k=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    wayland
+    libdrm
+    ffmpeg_6
+  ];
+
+  doCheck = false; # tests use host compositor, etc
+
+  meta = with lib; {
+    description = "High performance wlroots screen recording, featuring hardware encoding";
+    homepage = "https://github.com/russelltg/wl-screenrec";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    mainProgram = "wl-screenrec";
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/by-name/wl/wla-dx/package.nix
similarity index 100%
rename from pkgs/development/compilers/wla-dx/default.nix
rename to pkgs/by-name/wl/wla-dx/package.nix
diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/by-name/wl/wlc/package.nix
similarity index 100%
rename from pkgs/tools/misc/wlc/default.nix
rename to pkgs/by-name/wl/wlc/package.nix
diff --git a/pkgs/applications/misc/wlclock/default.nix b/pkgs/by-name/wl/wlclock/package.nix
similarity index 100%
rename from pkgs/applications/misc/wlclock/default.nix
rename to pkgs/by-name/wl/wlclock/package.nix
diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/by-name/wl/wlcs/package.nix
similarity index 100%
rename from pkgs/development/tools/wlcs/default.nix
rename to pkgs/by-name/wl/wlcs/package.nix
diff --git a/pkgs/tools/wayland/wleave/default.nix b/pkgs/by-name/wl/wleave/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wleave/default.nix
rename to pkgs/by-name/wl/wleave/package.nix
diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/by-name/wl/wllvm/package.nix
similarity index 100%
rename from pkgs/development/tools/wllvm/default.nix
rename to pkgs/by-name/wl/wllvm/package.nix
diff --git a/pkgs/tools/wayland/wlopm/default.nix b/pkgs/by-name/wl/wlopm/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlopm/default.nix
rename to pkgs/by-name/wl/wlopm/package.nix
diff --git a/pkgs/tools/wayland/wlprop/default.nix b/pkgs/by-name/wl/wlprop/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlprop/default.nix
rename to pkgs/by-name/wl/wlprop/package.nix
diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/by-name/wl/wlr-randr/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlr-randr/default.nix
rename to pkgs/by-name/wl/wlr-randr/package.nix
diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/by-name/wl/wlr-which-key/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlr-which-key/default.nix
rename to pkgs/by-name/wl/wlr-which-key/package.nix
diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/by-name/wl/wlrctl/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlrctl/default.nix
rename to pkgs/by-name/wl/wlrctl/package.nix
diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/by-name/wl/wlsunset/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlsunset/default.nix
rename to pkgs/by-name/wl/wlsunset/package.nix
diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/by-name/wl/wluma/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wluma/default.nix
rename to pkgs/by-name/wl/wluma/package.nix
diff --git a/pkgs/tools/X11/wmctrl/64-bit-data.patch b/pkgs/by-name/wm/wmctrl/64-bit-data.patch
similarity index 100%
rename from pkgs/tools/X11/wmctrl/64-bit-data.patch
rename to pkgs/by-name/wm/wmctrl/64-bit-data.patch
diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/by-name/wm/wmctrl/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmctrl/default.nix
rename to pkgs/by-name/wm/wmctrl/package.nix
diff --git a/pkgs/applications/window-managers/wmderland/0001-remove-flto.patch b/pkgs/by-name/wm/wmderland/0001-remove-flto.patch
similarity index 100%
rename from pkgs/applications/window-managers/wmderland/0001-remove-flto.patch
rename to pkgs/by-name/wm/wmderland/0001-remove-flto.patch
diff --git a/pkgs/applications/window-managers/wmderland/default.nix b/pkgs/by-name/wm/wmderland/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmderland/default.nix
rename to pkgs/by-name/wm/wmderland/package.nix
diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/by-name/wm/wmderlandc/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmderlandc/default.nix
rename to pkgs/by-name/wm/wmderlandc/package.nix
diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/by-name/wm/wmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/wmenu/default.nix
rename to pkgs/by-name/wm/wmenu/package.nix
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/by-name/wm/wmfs/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmfs/default.nix
rename to pkgs/by-name/wm/wmfs/package.nix
diff --git a/pkgs/servers/monitoring/wmic-bin/default.nix b/pkgs/by-name/wm/wmic-bin/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/wmic-bin/default.nix
rename to pkgs/by-name/wm/wmic-bin/package.nix
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/by-name/wm/wmii/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmii/default.nix
rename to pkgs/by-name/wm/wmii/package.nix
diff --git a/pkgs/development/web/wml/dynaloader.patch b/pkgs/by-name/wm/wml/dynaloader.patch
similarity index 100%
rename from pkgs/development/web/wml/dynaloader.patch
rename to pkgs/by-name/wm/wml/dynaloader.patch
diff --git a/pkgs/development/web/wml/no_bitvector.patch b/pkgs/by-name/wm/wml/no_bitvector.patch
similarity index 100%
rename from pkgs/development/web/wml/no_bitvector.patch
rename to pkgs/by-name/wm/wml/no_bitvector.patch
diff --git a/pkgs/development/web/wml/default.nix b/pkgs/by-name/wm/wml/package.nix
similarity index 100%
rename from pkgs/development/web/wml/default.nix
rename to pkgs/by-name/wm/wml/package.nix
diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/pkgs/by-name/wm/wml/redhat-with-thr.patch
similarity index 100%
rename from pkgs/development/web/wml/redhat-with-thr.patch
rename to pkgs/by-name/wm/wml/redhat-with-thr.patch
diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/by-name/wm/wmname/package.nix
similarity index 100%
rename from pkgs/applications/misc/wmname/default.nix
rename to pkgs/by-name/wm/wmname/package.nix
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/by-name/wm/wmutils-core/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmutils-core/default.nix
rename to pkgs/by-name/wm/wmutils-core/package.nix
diff --git a/pkgs/tools/X11/wmutils-libwm/default.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmutils-libwm/default.nix
rename to pkgs/by-name/wm/wmutils-libwm/package.nix
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/by-name/wm/wmutils-opt/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmutils-opt/default.nix
rename to pkgs/by-name/wm/wmutils-opt/package.nix
diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/by-name/wo/wob/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wob/default.nix
rename to pkgs/by-name/wo/wob/package.nix
diff --git a/pkgs/tools/misc/woeusb-ng/default.nix b/pkgs/by-name/wo/woeusb-ng/package.nix
similarity index 100%
rename from pkgs/tools/misc/woeusb-ng/default.nix
rename to pkgs/by-name/wo/woeusb-ng/package.nix
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/by-name/wo/woeusb/package.nix
similarity index 100%
rename from pkgs/tools/misc/woeusb/default.nix
rename to pkgs/by-name/wo/woeusb/package.nix
diff --git a/pkgs/development/web/woff2/brotli-static.patch b/pkgs/by-name/wo/woff2/brotli-static.patch
similarity index 100%
rename from pkgs/development/web/woff2/brotli-static.patch
rename to pkgs/by-name/wo/woff2/brotli-static.patch
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/by-name/wo/woff2/package.nix
similarity index 100%
rename from pkgs/development/web/woff2/default.nix
rename to pkgs/by-name/wo/woff2/package.nix
diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/by-name/wo/wofi-emoji/package.nix
similarity index 100%
rename from pkgs/applications/misc/wofi-emoji/default.nix
rename to pkgs/by-name/wo/wofi-emoji/package.nix
diff --git a/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/pkgs/by-name/wo/wofi/do_not_follow_symlinks.patch
similarity index 100%
rename from pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
rename to pkgs/by-name/wo/wofi/do_not_follow_symlinks.patch
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/by-name/wo/wofi/package.nix
similarity index 100%
rename from pkgs/applications/misc/wofi/default.nix
rename to pkgs/by-name/wo/wofi/package.nix
diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/by-name/wo/wol/package.nix
similarity index 100%
rename from pkgs/tools/networking/wol/default.nix
rename to pkgs/by-name/wo/wol/package.nix
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/by-name/wo/wolf-shaper/package.nix
similarity index 100%
rename from pkgs/applications/audio/wolf-shaper/default.nix
rename to pkgs/by-name/wo/wolf-shaper/package.nix
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/by-name/wo/wolfebin/package.nix
similarity index 100%
rename from pkgs/tools/networking/wolfebin/default.nix
rename to pkgs/by-name/wo/wolfebin/package.nix
diff --git a/pkgs/games/wolfstoneextract/default.nix b/pkgs/by-name/wo/wolfstoneextract/package.nix
similarity index 100%
rename from pkgs/games/wolfstoneextract/default.nix
rename to pkgs/by-name/wo/wolfstoneextract/package.nix
diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
rename to pkgs/by-name/wo/woodpecker-plugin-git/package.nix
diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/by-name/wo/woof/package.nix
similarity index 100%
rename from pkgs/tools/misc/woof/default.nix
rename to pkgs/by-name/wo/woof/package.nix
diff --git a/pkgs/by-name/wo/woomer/Cargo.lock b/pkgs/by-name/wo/woomer/Cargo.lock
new file mode 100644
index 000000000000..dcd8ec2909cd
--- /dev/null
+++ b/pkgs/by-name/wo/woomer/Cargo.lock
@@ -0,0 +1,1091 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bindgen"
+version = "0.69.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+dependencies = [
+ "bitflags 2.5.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.66",
+ "which",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "bytemuck"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils 0.8.20",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils 0.8.20",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
+dependencies = [
+ "cfg-if 0.1.10",
+ "crossbeam-utils 0.7.2",
+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+dependencies = [
+ "autocfg",
+ "cfg-if 0.1.10",
+ "lazy_static",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "either"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[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 = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
+]
+
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
+[[package]]
+name = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf"
+dependencies = [
+ "ahash",
+ "autocfg",
+]
+
+[[package]]
+name = "hibitset"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[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.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-targets",
+]
+
+[[package]]
+name = "libwayshot"
+version = "0.3.2-dev"
+source = "git+https://github.com/waycrate/wayshot?branch=freeze-feat-andreas#10b748f555fea5a2a7ac7d49f8ecf6637819f12d"
+dependencies = [
+ "image",
+ "memmap2",
+ "nix",
+ "thiserror",
+ "tracing",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "memmap2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mopa"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915"
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "raylib"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afd22532c5f4d413f428069d686875429989296ded0e84355ea1f8ba192dabda"
+dependencies = [
+ "cfg-if 1.0.0",
+ "lazy_static",
+ "libc",
+ "parking_lot",
+ "raylib-sys",
+ "specs",
+ "specs-derive",
+]
+
+[[package]]
+name = "raylib-sys"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ee1bd66c8383858fc46b4846589656a18ae54f4e0cf84a242b0ec723fa37"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "fs_extra",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils 0.8.20",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "shred"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f08237e667ac94ad20f8878b5943d91a93ccb231428446c57c21c57779016d"
+dependencies = [
+ "arrayvec",
+ "hashbrown",
+ "mopa",
+ "smallvec",
+ "tynm",
+]
+
+[[package]]
+name = "shrev"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ea33232fdcf1bf691ca33450e5a94dde13e1a8cbb8caabc5e4f9d761e10b1a"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "specs"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fff28a29366aff703d5da8a7e2c8875dc8453ac1118f842cbc0fa70c7db51240"
+dependencies = [
+ "crossbeam-queue",
+ "hashbrown",
+ "hibitset",
+ "log",
+ "shred",
+ "shrev",
+ "tuple_utils",
+]
+
+[[package]]
+name = "specs-derive"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "tuple_utils"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
+
+[[package]]
+name = "tynm"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd30d05e69d1478e13fe3e7a853409cfec82cebc2cf9b8d613b3c6b0081781ed"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
+dependencies = [
+ "bitflags 2.5.0",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
+dependencies = [
+ "bitflags 2.5.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+dependencies = [
+ "bitflags 2.5.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
+[[package]]
+name = "weezl"
+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 = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "woomer"
+version = "0.1.0"
+dependencies = [
+ "image",
+ "libwayshot",
+ "raylib",
+]
+
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix
new file mode 100644
index 000000000000..5996731dfafb
--- /dev/null
+++ b/pkgs/by-name/wo/woomer/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  glfw3,
+  nix-update-script,
+  pkg-config,
+  rustPlatform,
+  wayland,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "woomer";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "coffeeispower";
+    repo = "woomer";
+    rev = "refs/tags/${version}";
+    hash = "sha256-puALhN54ma2KToXUF8ipaYysyayjaSp+ISZ3AgQvniw=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "libwayshot-0.3.2-dev" = "sha256-QETmdzA7a1XMGdMU7tUNSJzzDw/4nkH9gKZv3pP0Nwc=";
+    };
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    glfw3
+    wayland
+  ];
+
+  # `raylib-sys` wants to compile examples that don't exist in its crate
+  doCheck = false;
+
+  env = {
+    # Force linking so libwayland-client.so can be `dlopen`'d
+    CARGO_BUILD_RUSTFLAGS = toString (
+      map (arg: "-C link-arg=" + arg) [
+        "-Wl,--push-state,--as-needed"
+        "-lwayland-client"
+        "-Wl,--pop-state"
+      ]
+    );
+  };
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Zoomer application for Wayland inspired by tsoding's boomer";
+    homepage = "https://github.com/coffeeispower/woomer";
+    changelog = "https://github.com/coffeeispower/woomer/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "woomer";
+    inherit (wayland.meta) platforms;
+    # TODO: Remove after upstream is no longer affected by
+    # https://github.com/raylib-rs/raylib-rs/issues/74
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+}
diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/by-name/wo/wootility/package.nix
similarity index 100%
rename from pkgs/tools/misc/wootility/default.nix
rename to pkgs/by-name/wo/wootility/package.nix
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/by-name/wo/wooting-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/wooting-udev-rules/default.nix
rename to pkgs/by-name/wo/wooting-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
similarity index 100%
rename from pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
rename to pkgs/by-name/wo/wooting-udev-rules/wooting.rules
diff --git a/pkgs/applications/misc/wordbook/default.nix b/pkgs/by-name/wo/wordbook/package.nix
similarity index 100%
rename from pkgs/applications/misc/wordbook/default.nix
rename to pkgs/by-name/wo/wordbook/package.nix
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/by-name/wo/wordgrinder/package.nix
similarity index 100%
rename from pkgs/applications/office/wordgrinder/default.nix
rename to pkgs/by-name/wo/wordgrinder/package.nix
diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/by-name/wo/work-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/work-sans/default.nix
rename to pkgs/by-name/wo/work-sans/package.nix
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/by-name/wo/workcraft/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/workcraft/default.nix
rename to pkgs/by-name/wo/workcraft/package.nix
diff --git a/pkgs/by-name/wo/worldofgoo/package.nix b/pkgs/by-name/wo/worldofgoo/package.nix
new file mode 100644
index 000000000000..16d3e67e892c
--- /dev/null
+++ b/pkgs/by-name/wo/worldofgoo/package.nix
@@ -0,0 +1,74 @@
+{ lib, stdenv, requireFile, unzip, makeDesktopItem, SDL2, SDL2_mixer, libogg, libvorbis }:
+
+let
+  arch = if stdenv.system == "x86_64-linux"
+    then "x86_64"
+    else "x86";
+
+  desktopItem = makeDesktopItem {
+    desktopName = "World of Goo";
+    genericName = "World of Goo";
+    categories = [ "Game" ];
+    exec = "WorldOfGoo.bin.${arch}";
+    icon = "2dboy-worldofgoo";
+    name = "worldofgoo";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "WorldOfGoo";
+  version = "1.53";
+
+  helpMsg = ''
+    We cannot download the full version automatically, as you require a license.
+    Once you have bought a license, you need to add your downloaded version to the nix store.
+    You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux.${version}.sh"
+    in the directory where you saved it.
+  '';
+
+  src = requireFile {
+    message = helpMsg;
+    name = "WorldOfGoo.Linux.1.53.sh";
+    sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee";
+  };
+
+  nativeBuildInputs = [ unzip ];
+  sourceRoot = pname;
+
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc SDL2 SDL2_mixer
+    libogg libvorbis ];
+
+  unpackPhase = ''
+    # The game is distributed as a shell script, with a tar of mojosetup, and a
+    # zip archive attached to the end. Therefore a simple unzip does the job.
+    # However, to avoid unzip errors, we need to strip those out first.
+    tail -c +421887 ${src} > ${src}.zip
+    unzip -q ${src}.zip -d ${pname}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/256x256/apps
+
+    install -t $out/bin -m755 data/${arch}/WorldOfGoo.bin.${arch}
+    cp -R data/noarch/* $out/bin
+    cp data/noarch/game/gooicon.png $out/share/icons/hicolor/256x256/apps/2dboy-worldofgoo.png
+    cp ${desktopItem}/share/applications/worldofgoo.desktop \
+      $out/share/applications/worldofgoo.desktop
+
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath $out/bin/WorldOfGoo.bin.${arch}
+  '';
+
+  meta = with lib; {
+    description = "Physics based puzzle game";
+    longDescription = ''
+      World of Goo is a physics based puzzle / construction game. The millions of Goo
+      Balls who live in the beautiful World of Goo don't know that they are in a
+      game, or that they are extremely delicious.
+    '';
+    homepage = "https://worldofgoo.com";
+    license = licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = with maintainers; [ jcumming ];
+  };
+}
diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/by-name/wo/wormhole-william/package.nix
similarity index 100%
rename from pkgs/tools/networking/wormhole-william/default.nix
rename to pkgs/by-name/wo/wormhole-william/package.nix
diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/by-name/wo/wownero/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/wownero/default.nix
rename to pkgs/by-name/wo/wownero/package.nix
diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/by-name/wp/wp4nix/package.nix
similarity index 100%
rename from pkgs/development/tools/wp4nix/default.nix
rename to pkgs/by-name/wp/wp4nix/package.nix
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/by-name/wp/wpgtk/package.nix
similarity index 100%
rename from pkgs/tools/X11/wpgtk/default.nix
rename to pkgs/by-name/wp/wpgtk/package.nix
diff --git a/pkgs/applications/misc/wpm/default.nix b/pkgs/by-name/wp/wpm/package.nix
similarity index 100%
rename from pkgs/applications/misc/wpm/default.nix
rename to pkgs/by-name/wp/wpm/package.nix
diff --git a/pkgs/tools/security/wprecon/default.nix b/pkgs/by-name/wp/wprecon/package.nix
similarity index 100%
rename from pkgs/tools/security/wprecon/default.nix
rename to pkgs/by-name/wp/wprecon/package.nix
diff --git a/pkgs/by-name/wp/wprs/package.nix b/pkgs/by-name/wp/wprs/package.nix
index 9adb934731d1..829992ed8fbb 100644
--- a/pkgs/by-name/wp/wprs/package.nix
+++ b/pkgs/by-name/wp/wprs/package.nix
@@ -5,9 +5,10 @@
   pkg-config,
   libxkbcommon,
   python3,
-  python3Packages,
+  runCommand,
+  wprs,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "wprs";
   version = "0-unstable-2024-10-22";
 
@@ -24,9 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libxkbcommon
-    python3
-    python3Packages.psutil
-
+    (python3.withPackages (pp: with pp; [ psutil ]))
   ];
 
   cargoLock = {
@@ -43,6 +42,10 @@ rustPlatform.buildRustPackage rec {
     cp  wprs "$out/bin/wprs"
   '';
 
+  passthru.tests.sanity = runCommand "wprs-sanity" { nativeBuildInputs = [ wprs ]; } ''
+    ${wprs}/bin/wprs -h > /dev/null && touch $out
+  '';
+
   meta = with lib; {
     description = "rootless remote desktop access for remote Wayland";
     license = licenses.asl20;
diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/by-name/wq/wqy_microhei/package.nix
similarity index 100%
rename from pkgs/data/fonts/wqy-microhei/default.nix
rename to pkgs/by-name/wq/wqy_microhei/package.nix
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/by-name/wq/wqy_zenhei/package.nix
similarity index 100%
rename from pkgs/data/fonts/wqy-zenhei/default.nix
rename to pkgs/by-name/wq/wqy_zenhei/package.nix
diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 65845f5dc131..41db1bf4a379 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -27,19 +27,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ=";
   };
 
-  buildInputs = [
-    llvmPackages.libcxx
-    llvmPackages.libunwind
-    musl
-    xorg.libX11
-  ];
+  buildInputs =
+    [
+      llvmPackages.libcxx
+      llvmPackages.libunwind
+    ]
+    ++ lib.optionals (stdenv.isLinux) [
+      musl # not used, but requires extra work to remove
+      xorg.libX11 # for the clipboardy package
+    ];
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-    makeWrapper
-    nodejs
-    pnpm_9.configHook
-  ];
+  nativeBuildInputs =
+    [
+      makeWrapper
+      nodejs
+      pnpm_9.configHook
+    ]
+    ++ lib.optionals (stdenv.isLinux) [
+      autoPatchelfHook
+    ];
 
   # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process
   # so I simply removed it
@@ -91,10 +97,10 @@ stdenv.mkDerivation (finalAttrs: {
       ryand56
     ];
     mainProgram = "wrangler";
-    # cpp is required for building workerd.
-    # workerd is used for some wrangler subcommands.
-    # non-linux platforms may experience errors
-    # on certain subcommands due to this issue.
-    platforms = [ "x86_64-linux" ];
+    # Tunneling and other parts of wrangler, which require workerd won't run on
+    # other systems where precompiled binaries are not provided, but most
+    # commands are will still work everywhere.
+    # Potential improvements: build workerd from source instead.
+    inherit (nodejs.meta) platforms;
   };
 })
diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/by-name/wr/wrap/package.nix
similarity index 100%
rename from pkgs/tools/text/wrap/default.nix
rename to pkgs/by-name/wr/wrap/package.nix
diff --git a/pkgs/tools/text/write-good/default.nix b/pkgs/by-name/wr/write-good/package.nix
similarity index 100%
rename from pkgs/tools/text/write-good/default.nix
rename to pkgs/by-name/wr/write-good/package.nix
diff --git a/pkgs/tools/misc/writedisk/default.nix b/pkgs/by-name/wr/writedisk/package.nix
similarity index 100%
rename from pkgs/tools/misc/writedisk/default.nix
rename to pkgs/by-name/wr/writedisk/package.nix
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/by-name/wr/wrk/package.nix
similarity index 100%
rename from pkgs/tools/networking/wrk/default.nix
rename to pkgs/by-name/wr/wrk/package.nix
diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/by-name/wr/wrk2/package.nix
similarity index 100%
rename from pkgs/tools/networking/wrk2/default.nix
rename to pkgs/by-name/wr/wrk2/package.nix
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/by-name/ws/wsdd/package.nix
similarity index 100%
rename from pkgs/servers/wsdd/default.nix
rename to pkgs/by-name/ws/wsdd/package.nix
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/by-name/ws/wshowkeys/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wshowkeys/default.nix
rename to pkgs/by-name/ws/wshowkeys/package.nix
diff --git a/pkgs/tools/misc/wsl-open/default.nix b/pkgs/by-name/ws/wsl-open/package.nix
similarity index 100%
rename from pkgs/tools/misc/wsl-open/default.nix
rename to pkgs/by-name/ws/wsl-open/package.nix
diff --git a/pkgs/tools/networking/wsl-vpnkit/default.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix
similarity index 100%
rename from pkgs/tools/networking/wsl-vpnkit/default.nix
rename to pkgs/by-name/ws/wsl-vpnkit/package.nix
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/by-name/ws/wsmancli/package.nix
similarity index 100%
rename from pkgs/tools/system/wsmancli/default.nix
rename to pkgs/by-name/ws/wsmancli/package.nix
diff --git a/pkgs/tools/system/wsysmon/dependencies.patch b/pkgs/by-name/ws/wsysmon/dependencies.patch
similarity index 100%
rename from pkgs/tools/system/wsysmon/dependencies.patch
rename to pkgs/by-name/ws/wsysmon/dependencies.patch
diff --git a/pkgs/tools/system/wsysmon/install.patch b/pkgs/by-name/ws/wsysmon/install.patch
similarity index 100%
rename from pkgs/tools/system/wsysmon/install.patch
rename to pkgs/by-name/ws/wsysmon/install.patch
diff --git a/pkgs/tools/system/wsysmon/default.nix b/pkgs/by-name/ws/wsysmon/package.nix
similarity index 100%
rename from pkgs/tools/system/wsysmon/default.nix
rename to pkgs/by-name/ws/wsysmon/package.nix
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/by-name/wt/wtf/package.nix
similarity index 100%
rename from pkgs/applications/misc/wtf/default.nix
rename to pkgs/by-name/wt/wtf/package.nix
diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/by-name/wt/wthrr/package.nix
similarity index 100%
rename from pkgs/applications/misc/wthrr/default.nix
rename to pkgs/by-name/wt/wthrr/package.nix
diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/by-name/wt/wtk/builder.sh
similarity index 100%
rename from pkgs/development/libraries/wtk/builder.sh
rename to pkgs/by-name/wt/wtk/builder.sh
diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/by-name/wt/wtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/wtk/default.nix
rename to pkgs/by-name/wt/wtk/package.nix
diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix
index 0110caec8e50..752592da69c7 100644
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wttrbar";
-  version = "0.10.6";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "wttrbar";
     rev = version;
-    hash = "sha256-fuLKWooXn966RORH20D9wwbjNtyLEZOO8Y8RcjsFwqM=";
+    hash = "sha256-EEc64pTAdVZZJtzHzACxZktUJMz10yuqdYG+N1CAD8k=";
   };
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
 
-  cargoHash = "sha256-Of1tHKIL2XbzA6YFxtvaP9sa+KMw8uJTFG0n84g2Eog=";
+  cargoHash = "sha256-UXC7b0FDyKSRpYGJOLcG0mqZgKTLJA+eTqKMp1Zo1so=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/by-name/wt/wtype/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wtype/default.nix
rename to pkgs/by-name/wt/wtype/package.nix
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/by-name/wu/wuzz/package.nix
similarity index 100%
rename from pkgs/tools/networking/wuzz/default.nix
rename to pkgs/by-name/wu/wuzz/package.nix
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/by-name/wv/wv/package.nix
similarity index 100%
rename from pkgs/tools/misc/wv/default.nix
rename to pkgs/by-name/wv/wv/package.nix
diff --git a/pkgs/tools/misc/wv2/fix-include.patch b/pkgs/by-name/wv/wv2/fix-include.patch
similarity index 100%
rename from pkgs/tools/misc/wv2/fix-include.patch
rename to pkgs/by-name/wv/wv2/fix-include.patch
diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/by-name/wv/wv2/package.nix
similarity index 100%
rename from pkgs/tools/misc/wv2/default.nix
rename to pkgs/by-name/wv/wv2/package.nix
diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/by-name/wv/wvkbd/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/wvkbd/default.nix
rename to pkgs/by-name/wv/wvkbd/package.nix
diff --git a/pkgs/tools/misc/wwcd/default.nix b/pkgs/by-name/ww/wwcd/package.nix
similarity index 100%
rename from pkgs/tools/misc/wwcd/default.nix
rename to pkgs/by-name/ww/wwcd/package.nix
diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/by-name/wx/wxformbuilder/package.nix
similarity index 100%
rename from pkgs/development/tools/wxformbuilder/default.nix
rename to pkgs/by-name/wx/wxformbuilder/package.nix
diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/wxmacmolplt/default.nix
rename to pkgs/by-name/wx/wxmacmolplt/package.nix
diff --git a/pkgs/games/wyvern/cargo-lock.patch b/pkgs/by-name/wy/wyvern/cargo-lock.patch
similarity index 100%
rename from pkgs/games/wyvern/cargo-lock.patch
rename to pkgs/by-name/wy/wyvern/cargo-lock.patch
diff --git a/pkgs/games/wyvern/default.nix b/pkgs/by-name/wy/wyvern/package.nix
similarity index 100%
rename from pkgs/games/wyvern/default.nix
rename to pkgs/by-name/wy/wyvern/package.nix
diff --git a/pkgs/applications/window-managers/x-create-mouse-void/default.nix b/pkgs/by-name/x-/x-create-mouse-void/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/x-create-mouse-void/default.nix
rename to pkgs/by-name/x-/x-create-mouse-void/package.nix
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/by-name/x1/x11_ssh_askpass/package.nix
similarity index 100%
rename from pkgs/tools/networking/x11-ssh-askpass/default.nix
rename to pkgs/by-name/x1/x11_ssh_askpass/package.nix
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/by-name/x1/x11docker/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/x11docker/default.nix
rename to pkgs/by-name/x1/x11docker/package.nix
diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/by-name/x1/x11idle/package.nix
similarity index 100%
rename from pkgs/tools/misc/x11idle/default.nix
rename to pkgs/by-name/x1/x11idle/package.nix
diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/by-name/x1/x11spice/package.nix
similarity index 100%
rename from pkgs/tools/X11/x11spice/default.nix
rename to pkgs/by-name/x1/x11spice/package.nix
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/by-name/x1/x11vnc/package.nix
similarity index 100%
rename from pkgs/tools/X11/x11vnc/default.nix
rename to pkgs/by-name/x1/x11vnc/package.nix
diff --git a/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/pkgs/by-name/x2/x264/disable-arm-neon-default.patch
similarity index 100%
rename from pkgs/development/libraries/x264/disable-arm-neon-default.patch
rename to pkgs/by-name/x2/x264/disable-arm-neon-default.patch
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/by-name/x2/x264/package.nix
similarity index 100%
rename from pkgs/development/libraries/x264/default.nix
rename to pkgs/by-name/x2/x264/package.nix
diff --git a/pkgs/development/libraries/x265/darwin-__rdtsc.patch b/pkgs/by-name/x2/x265/darwin-__rdtsc.patch
similarity index 100%
rename from pkgs/development/libraries/x265/darwin-__rdtsc.patch
rename to pkgs/by-name/x2/x265/darwin-__rdtsc.patch
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/by-name/x2/x265/package.nix
similarity index 100%
rename from pkgs/development/libraries/x265/default.nix
rename to pkgs/by-name/x2/x265/package.nix
diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/by-name/x2/x2goserver/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/x2goserver/default.nix
rename to pkgs/by-name/x2/x2goserver/package.nix
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/by-name/x2/x2vnc/package.nix
similarity index 100%
rename from pkgs/tools/X11/x2vnc/default.nix
rename to pkgs/by-name/x2/x2vnc/package.nix
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/by-name/x2/x2x/package.nix
similarity index 100%
rename from pkgs/tools/X11/x2x/default.nix
rename to pkgs/by-name/x2/x2x/package.nix
diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/by-name/x3/x3270/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/x3270/default.nix
rename to pkgs/by-name/x3/x3270/package.nix
diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/by-name/x4/x42-avldrums/package.nix
similarity index 100%
rename from pkgs/applications/audio/x42-avldrums/default.nix
rename to pkgs/by-name/x4/x42-avldrums/package.nix
diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/by-name/x4/x42-gmsynth/package.nix
similarity index 100%
rename from pkgs/applications/audio/x42-gmsynth/default.nix
rename to pkgs/by-name/x4/x42-gmsynth/package.nix
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/by-name/x4/x42-plugins/package.nix
similarity index 100%
rename from pkgs/applications/audio/x42-plugins/default.nix
rename to pkgs/by-name/x4/x42-plugins/package.nix
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/by-name/x8/x86info/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/x86info/default.nix
rename to pkgs/by-name/x8/x86info/package.nix
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/by-name/xa/Xaw3d/package.nix
similarity index 100%
rename from pkgs/development/libraries/Xaw3d/default.nix
rename to pkgs/by-name/xa/Xaw3d/package.nix
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/by-name/xa/xalanc/package.nix
similarity index 100%
rename from pkgs/development/libraries/xalanc/default.nix
rename to pkgs/by-name/xa/xalanc/package.nix
diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix
new file mode 100644
index 000000000000..cfaeef7b1315
--- /dev/null
+++ b/pkgs/by-name/xa/xandikos/package.nix
@@ -0,0 +1,50 @@
+{
+  fetchFromGitHub,
+  lib,
+  nixosTests,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "xandikos";
+  version = "0.2.12";
+  pyproject = true;
+
+  disabled = python3Packages.pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "jelmer";
+    repo = "xandikos";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-wdEwIVN9dkLVj8oe+2eh5n258pZRfKgLgzVCmwafCis=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    aiohttp
+    aiohttp-openmetrics
+    dulwich
+    defusedxml
+    icalendar
+    jinja2
+    multidict
+    pytz
+    vobject
+  ];
+
+  passthru.tests.xandikos = nixosTests.xandikos;
+
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Lightweight CalDAV/CardDAV server";
+    homepage = "https://github.com/jelmer/xandikos";
+    license = licenses.gpl3Plus;
+    changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS";
+    maintainers = with maintainers; [ _0x4A6F ];
+    mainProgram = "xandikos";
+  };
+}
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/by-name/xa/xannotate/package.nix
similarity index 100%
rename from pkgs/tools/X11/xannotate/default.nix
rename to pkgs/by-name/xa/xannotate/package.nix
diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix
index 4ad071f36a1f..455576526dd5 100644
--- a/pkgs/by-name/xa/xar/package.nix
+++ b/pkgs/by-name/xa/xar/package.nix
@@ -30,14 +30,14 @@
   xar,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "xar";
-  version = "498";
+  pname = "xar${lib.optionalString (e2fsprogs == null) "-minimal"}";
+  version = "501";
 
   src = fetchFromGitHub {
     owner = "apple-oss-distributions";
     repo = "xar";
     rev = "xar-${finalAttrs.version}";
-    hash = "sha256-RyWeR/ZnDBHIZhwzVxETdrTTPQA2VgsLZegRkxX1240=";
+    hash = "sha256-Fq+Re0LCBIGhW2FR+pgV8SWtaDOEFgTh+rQ8JFWK/k0=";
   };
 
   # Update patch set with
@@ -48,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
   #   # …
   #   rm -r ../pkgs/by-name/xa/xar/patches
   #   git format-patch --zero-commit --output-directory ../pkgs/by-name/xa/xar/patches main
-  patches = lib.filesystem.listFilesRecursive ./patches;
+  patches =
+    # Avoid Darwin rebuilds on staging-next
+    lib.filter (
+      p: stdenv.hostPlatform.isDarwin -> baseNameOf p != "0020-Fall-back-to-readlink-on-Linux.patch"
+    ) (lib.filesystem.listFilesRecursive ./patches);
 
   # We do not use or modify files outside of the xar subdirectory.
   patchFlags = [ "-p2" ];
diff --git a/pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch b/pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch
new file mode 100644
index 000000000000..02b96aee1be3
--- /dev/null
+++ b/pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode 
+Date: Wed, 30 Oct 2024 20:19:20 -0400
+Subject: [PATCH 20/20] Fall back to readlink on Linux
+
+---
+ xar/lib/archive.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/xar/lib/archive.c b/xar/lib/archive.c
+index b7f9cbf..3a79c74 100644
+--- a/xar/lib/archive.c
++++ b/xar/lib/archive.c
+@@ -507,10 +507,31 @@ xar_t xar_fdopen_digest_verify(int fd, int32_t flags, void *expected_toc_digest,
+ 	// If there are hardlinks, the path we pick is the most recently opened by
+ 	// the filesystem; which is effectively random.
+ 	char path_buff[PATH_MAX];
++#if defined(__APPLE__)
+ 	if (fcntl(fd, F_GETPATH, path_buff) < 0) {
+ 		close(fd);
+ 		return NULL;
+ 	}
++#elif defined(__linux__)
++	// Linux has to get the path to the file via `/proc`.
++	char proc_buff[PATH_MAX];
++	if (snprintf(proc_buff, PATH_MAX, "/proc/self/fd/%i", fd) < 0) {
++		close(fd);
++		return NULL;
++	}
++	if (readlink(proc_buff, &path_buff, PATH_MAX) < 0) {
++		close(fd);
++		return NULL;
++	}
++	// The filename is the file’s when the fd was created. Check to make sure it still exists.
++	struct stat stat_buff;
++	if (stat(path_buff, &stat_buff) < 0) {
++		close(fd);
++		return NULL;
++	}
++#else
++#error "Unknown platform. Please update with an implementation of `F_GETPATH`."
++#endif
+ 	
+ 	// Don't trust the position of the descriptor we were given, reset it back to 0
+ 	if (lseek(fd, 0, SEEK_SET) != 0) {
+-- 
+2.47.0
+
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/by-name/xa/xarchiver/package.nix
similarity index 100%
rename from pkgs/tools/archivers/xarchiver/default.nix
rename to pkgs/by-name/xa/xarchiver/package.nix
diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/by-name/xa/xastir/package.nix
similarity index 100%
rename from pkgs/applications/misc/xastir/default.nix
rename to pkgs/by-name/xa/xastir/package.nix
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/by-name/xa/xautoclick/package.nix
similarity index 100%
rename from pkgs/applications/misc/xautoclick/default.nix
rename to pkgs/by-name/xa/xautoclick/package.nix
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/by-name/xa/xautolock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xautolock/default.nix
rename to pkgs/by-name/xa/xautolock/package.nix
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/by-name/xa/xautomation/package.nix
similarity index 100%
rename from pkgs/tools/X11/xautomation/default.nix
rename to pkgs/by-name/xa/xautomation/package.nix
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/by-name/xa/xavs/package.nix
similarity index 100%
rename from pkgs/development/libraries/xavs/default.nix
rename to pkgs/by-name/xa/xavs/package.nix
diff --git a/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch b/pkgs/by-name/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch
similarity index 100%
rename from pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch
rename to pkgs/by-name/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/by-name/xa/xawtv/package.nix
similarity index 100%
rename from pkgs/applications/video/xawtv/default.nix
rename to pkgs/by-name/xa/xawtv/package.nix
diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/by-name/xb/xbanish/package.nix
similarity index 100%
rename from pkgs/tools/X11/xbanish/default.nix
rename to pkgs/by-name/xb/xbanish/package.nix
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/by-name/xb/xbase/package.nix
similarity index 100%
rename from pkgs/development/libraries/xbase/default.nix
rename to pkgs/by-name/xb/xbase/package.nix
diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/pkgs/by-name/xb/xbase/xbase-fixes.patch
similarity index 100%
rename from pkgs/development/libraries/xbase/xbase-fixes.patch
rename to pkgs/by-name/xb/xbase/xbase-fixes.patch
diff --git a/pkgs/applications/misc/xbattbar/default.nix b/pkgs/by-name/xb/xbattbar/package.nix
similarity index 100%
rename from pkgs/applications/misc/xbattbar/default.nix
rename to pkgs/by-name/xb/xbattbar/package.nix
diff --git a/pkgs/applications/misc/xbattbar/sys-by-default.patch b/pkgs/by-name/xb/xbattbar/sys-by-default.patch
similarity index 100%
rename from pkgs/applications/misc/xbattbar/sys-by-default.patch
rename to pkgs/by-name/xb/xbattbar/sys-by-default.patch
diff --git a/pkgs/games/xbill/default.nix b/pkgs/by-name/xb/xbill/package.nix
similarity index 100%
rename from pkgs/games/xbill/default.nix
rename to pkgs/by-name/xb/xbill/package.nix
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/by-name/xb/xbindkeys/package.nix
similarity index 100%
rename from pkgs/tools/X11/xbindkeys/default.nix
rename to pkgs/by-name/xb/xbindkeys/package.nix
diff --git a/pkgs/games/xboard/default.nix b/pkgs/by-name/xb/xboard/package.nix
similarity index 100%
rename from pkgs/games/xboard/default.nix
rename to pkgs/by-name/xb/xboard/package.nix
diff --git a/pkgs/games/xbomb/default.nix b/pkgs/by-name/xb/xbomb/package.nix
similarity index 100%
rename from pkgs/games/xbomb/default.nix
rename to pkgs/by-name/xb/xbomb/package.nix
diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/by-name/xb/xborders/package.nix
similarity index 100%
rename from pkgs/tools/X11/xborders/default.nix
rename to pkgs/by-name/xb/xborders/package.nix
diff --git a/pkgs/tools/X11/xborders/setup.py b/pkgs/by-name/xb/xborders/setup.py
similarity index 100%
rename from pkgs/tools/X11/xborders/setup.py
rename to pkgs/by-name/xb/xborders/setup.py
diff --git a/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/pkgs/by-name/xb/xboxdrv/fix-60-sec-delay.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch
rename to pkgs/by-name/xb/xboxdrv/fix-60-sec-delay.patch
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/by-name/xb/xboxdrv/package.nix
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/default.nix
rename to pkgs/by-name/xb/xboxdrv/package.nix
diff --git a/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/pkgs/by-name/xb/xboxdrv/scons-py3.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/scons-py3.patch
rename to pkgs/by-name/xb/xboxdrv/scons-py3.patch
diff --git a/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/pkgs/by-name/xb/xboxdrv/scons-v4.2.0.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch
rename to pkgs/by-name/xb/xboxdrv/scons-v4.2.0.patch
diff --git a/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/pkgs/by-name/xb/xboxdrv/xboxdrvctl-py3.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch
rename to pkgs/by-name/xb/xboxdrv/xboxdrvctl-py3.patch
diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/pkgs/by-name/xb/xbps/cert-paths.patch
similarity index 100%
rename from pkgs/tools/package-management/xbps/cert-paths.patch
rename to pkgs/by-name/xb/xbps/cert-paths.patch
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/by-name/xb/xbps/package.nix
similarity index 100%
rename from pkgs/tools/package-management/xbps/default.nix
rename to pkgs/by-name/xb/xbps/package.nix
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/by-name/xb/xbrightness/package.nix
similarity index 100%
rename from pkgs/tools/X11/xbrightness/default.nix
rename to pkgs/by-name/xb/xbrightness/package.nix
diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/by-name/xc/xc/package.nix
similarity index 100%
rename from pkgs/development/tools/xc/default.nix
rename to pkgs/by-name/xc/xc/package.nix
diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/by-name/xc/xc3sprog/package.nix
similarity index 100%
rename from pkgs/development/embedded/xc3sprog/default.nix
rename to pkgs/by-name/xc/xc3sprog/package.nix
diff --git a/pkgs/by-name/xc/xcaddy/package.nix b/pkgs/by-name/xc/xcaddy/package.nix
index 11faf60e3447..b2df908b3e07 100644
--- a/pkgs/by-name/xc/xcaddy/package.nix
+++ b/pkgs/by-name/xc/xcaddy/package.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "xcaddy";
-  version = "0.4.2";
+  version = "0.4.4";
 
   subPackages = [ "cmd/xcaddy" ];
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner = "caddyserver";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4evqpkDb6/sduPuqRlnvvi/kS4H2zpYB8LB2PXmoopA=";
+    hash = "sha256-vpaweUU++3ZHj7KT5WNUCw3X93sQBTgjKlB8rJwrHlM=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule rec {
     "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}"
   ];
 
-  vendorHash = "sha256-NoOEvvaD3oUejlFIe1s95SjL/YRsuCSHFElnxaweA/s=";
+  vendorHash = "sha256-vU/ptOzBjMpRG2Do6ODC+blcCNl15D9mSsEV8QgNN3Y=";
 
   meta = with lib; {
     homepage = "https://github.com/caddyserver/xcaddy";
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/by-name/xc/xcalib/package.nix
similarity index 100%
rename from pkgs/tools/X11/xcalib/default.nix
rename to pkgs/by-name/xc/xcalib/package.nix
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/by-name/xc/xcape/package.nix
similarity index 100%
rename from pkgs/tools/X11/xcape/default.nix
rename to pkgs/by-name/xc/xcape/package.nix
diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/by-name/xc/xcat/package.nix
similarity index 100%
rename from pkgs/tools/security/xcat/default.nix
rename to pkgs/by-name/xc/xcat/package.nix
diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/xcb-imdkit/default.nix
rename to pkgs/by-name/xc/xcb-imdkit/package.nix
diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix
new file mode 100644
index 000000000000..7b574aa91994
--- /dev/null
+++ b/pkgs/by-name/xc/xcbuild/package.nix
@@ -0,0 +1,161 @@
+{
+  lib,
+  cmake,
+  darwin,
+  fetchFromGitHub,
+  libpng,
+  libxml2,
+  makeBinaryWrapper,
+  ninja,
+  stdenv,
+  zlib,
+
+  # These arguments are obsolete but required to avoid evaluation errors (for now).
+  CoreGraphics ? null,
+  CoreServices ? null,
+  ImageIO ? null,
+
+  # These are deprecated and do nothing. They’re needed for compatibility and will
+  # warn eventually once in-tree uses are cleaned up.
+  xcodePlatform ? null,
+  xcodeVer ? null,
+  sdkVer ? null,
+  productBuildVer ? null,
+}:
+
+# TODO(@reckenrode) enable this warning after uses in nixpkgs have been fixed
+#let
+#  attrs = {
+#    inherit
+#      xcodePlatform
+#      xcodeVer
+#      sdkVer
+#      productBuildVer
+#      ;
+#  };
+#in
+#assert lib.warnIf (lib.any (attr: attr != null) (lib.attrValues attrs)) ''
+#  The following arguments are deprecated and do nothing: ${
+#    lib.concatStringsSep ", " (lib.attrNames (lib.filterAttrs (_: value: value != null) attrs))
+#  }
+#
+#  xcbuild will dynamically pick up the SDK and SDK version based
+#  on the SDK used in nixpkgs. If you need to use a different SDK,
+#  add the appropriate SDK to your package’s `buildInputs`.
+#
+#  See the stdenv documentation for how to use `apple-sdk`.
+#'' true;
+
+let
+  googletest = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "43359642a1c16ad3f4fc575c7edd0cb935810815";
+    sha256 = "sha256-mKjXaawFHSRrbJBtADJ1Pdk6vtuD+ax0HFk6YaBSnXg=";
+  };
+
+  linenoise = fetchFromGitHub {
+    owner = "antirez";
+    repo = "linenoise";
+    rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
+    sha256 = "sha256-nKxwWuSqr89lvI9Y3QAW5Mo7/iFfMNj/OOQVeA/FWnE=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcbuild";
+
+  outputs = [
+    "out"
+    "xcrun"
+  ];
+
+  version = "0.1.1-unstable-2019-11-20";
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "xcbuild";
+    rev = "dbaee552d2f13640773eb1ad3c79c0d2aca7229c";
+    hash = "sha256-7mvSuRCWU/LlIBdmnC59F4SSzJPEcQhlmEK13PNe1xc=";
+  };
+
+  patches = [
+    # Add missing header for `abort`
+    ./patches/includes.patch
+    # Prevent xcrun from recursively invoking itself
+    ./patches/Avoid-fork-bomb-when-searching-system-paths.patch
+  ];
+
+  prePatch = ''
+    rmdir ThirdParty/*
+    cp -r --no-preserve=all ${googletest} ThirdParty/googletest
+    cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
+  '';
+
+  postPatch =
+    lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      # Fix build on gcc-13 due to missing includes
+      sed -e '1i #include ' -i \
+        Libraries/libutil/Headers/libutil/Permissions.h \
+        Libraries/pbxbuild/Headers/pbxbuild/Tool/AuxiliaryFile.h \
+        Libraries/pbxbuild/Headers/pbxbuild/Tool/Invocation.h
+
+      # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+      sed 1i'#include ' \
+        -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Apple Open Sourced LZFSE, but not libcompression, and it isn't
+      # part of an impure framework we can add
+      substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
+        --replace "#if HAVE_LIBCOMPRESSION" "#if 0"
+    '';
+
+  strictDeps = true;
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+
+  nativeBuildInputs = [
+    cmake
+    makeBinaryWrapper
+    ninja
+  ];
+
+  buildInputs = [
+    libpng
+    libxml2
+    zlib
+  ];
+
+  # TODO: instruct cmake not to put it in /usr, rather than cleaning up
+  postInstall = ''
+    mv $out/usr/* $out
+    rmdir $out/usr
+    cp liblinenoise.* $out/lib/
+
+    mkdir -p "$xcrun/bin"
+    ln -s "$out/bin/xcrun" "$xcrun/bin/xcrun"
+
+    # xcbuild and xcrun support absolute paths, but they can’t find the SDK with the way it’s set up in
+    # the store. Fortunately, the combination of `DEVELOPER_DIR` and a plain `SDKROOT` is enough.
+    wrapProgram "$out/bin/xcbuild" --set SDKROOT macosx
+    wrapProgram "$out/bin/xcrun" --set SDKROOT macosx
+  '';
+
+  __structuredAttrs = true;
+
+  passthru = {
+    xcbuild =
+      # lib.warn "xcbuild.xcbuild is deprecated and will be removed; use xcbuild instead."
+      finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xcode-compatible build tool";
+    homepage = "https://github.com/facebook/xcbuild";
+    license = with lib.licenses; [
+      bsd2
+      bsd3
+    ];
+    maintainers = lib.teams.darwin.members;
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch b/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch
new file mode 100644
index 000000000000..bad8621e4b8c
--- /dev/null
+++ b/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch
@@ -0,0 +1,47 @@
+diff --git a/Libraries/xcsdk/Tools/xcrun.cpp b/Libraries/xcsdk/Tools/xcrun.cpp
+index 9d6d4576d7..7400267c2b 100644
+--- a/Libraries/xcsdk/Tools/xcrun.cpp
++++ b/Libraries/xcsdk/Tools/xcrun.cpp
+@@ -23,6 +23,8 @@
+ #include 
+ #include 
+ 
++#include 
++
+ using libutil::DefaultFilesystem;
+ using libutil::Filesystem;
+ using libutil::FSUtil;
+@@ -398,6 +400,8 @@
+             fprintf(stderr, "\n");
+         }
+ 
++        std::unordered_map environment = processContext->environmentVariables();
++
+         /*
+          * Collect search paths for the tool.
+          * Can be in toolchains, target (if one is provided), developer root,
+@@ -408,6 +412,15 @@
+         executablePaths.insert(executablePaths.end(), defaultExecutablePaths.begin(), defaultExecutablePaths.end());
+ 
+         /*
++         * Don’t look for tools in `/usr/bin` because it can cause an infinite recursion when `xcrun` finds a shim
++         * that tries to invoke `xcrun` to run the tool.
++         */
++        executablePaths.erase(
++            std::remove(executablePaths.begin(), executablePaths.end(), "/usr/bin"),
++            executablePaths.end()
++        );
++
++        /*
+          * Find the tool to execute.
+          */
+         ext::optional executable = filesystem->findExecutable(*options.tool(), executablePaths);
+@@ -428,8 +441,6 @@
+         } else {
+             /* Run is the default. */
+ 
+-            std::unordered_map environment = processContext->environmentVariables();
+-
+             if (target != nullptr) {
+                 /*
+                  * Update effective environment to include the target path.
diff --git a/pkgs/development/tools/xcbuild/includes.patch b/pkgs/by-name/xc/xcbuild/patches/includes.patch
similarity index 100%
rename from pkgs/development/tools/xcbuild/includes.patch
rename to pkgs/by-name/xc/xcbuild/patches/includes.patch
diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/by-name/xc/xcbuild/setup-hook.sh
similarity index 100%
rename from pkgs/development/tools/xcbuild/setup-hook.sh
rename to pkgs/by-name/xc/xcbuild/setup-hook.sh
diff --git a/pkgs/tools/misc/xcd/default.nix b/pkgs/by-name/xc/xcd/package.nix
similarity index 100%
rename from pkgs/tools/misc/xcd/default.nix
rename to pkgs/by-name/xc/xcd/package.nix
diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/by-name/xc/xcftools/package.nix
similarity index 100%
rename from pkgs/tools/graphics/xcftools/default.nix
rename to pkgs/by-name/xc/xcftools/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/by-name/xc/xcfun/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/xcfun/default.nix
rename to pkgs/by-name/xc/xcfun/package.nix
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/by-name/xc/xchainkeys/package.nix
similarity index 100%
rename from pkgs/tools/X11/xchainkeys/default.nix
rename to pkgs/by-name/xc/xchainkeys/package.nix
diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/by-name/xc/xcircuit/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/xcircuit/default.nix
rename to pkgs/by-name/xc/xcircuit/package.nix
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/by-name/xc/xclip/package.nix
similarity index 100%
rename from pkgs/tools/misc/xclip/default.nix
rename to pkgs/by-name/xc/xclip/package.nix
diff --git a/pkgs/by-name/xc/xcodes/generated/default.nix b/pkgs/by-name/xc/xcodes/generated/default.nix
new file mode 100644
index 000000000000..910f134c5bfe
--- /dev/null
+++ b/pkgs/by-name/xc/xcodes/generated/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by swiftpm2nix.
+{
+  workspaceStateFile = ./workspace-state.json;
+  hashes = {
+    "big-num" = "0wj45pmiafhbj5ch7b4s41ldycps0hcj29d0z6fanhiy7ljlhk35";
+    "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg";
+    "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7";
+    "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l";
+    "LegibleError" = "137hc96cqpiwsyybj2xawyfmqh7rmk1khqkiqp3616ql909mh99y";
+    "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83";
+    "PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg";
+    "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0";
+    "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9";
+    "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";
+    "swift-srp" = "0nsinkgf050z1wkzmaxaf5qkvplsgyqwps9xi9zkbcg6y7143xy1";
+    "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8";
+    "Version" = "0s5bwr1li6dnsnalfyraq1kzhqmmn9qwp1mld4msrn3q5vvjmql9";
+    "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";
+  };
+}
diff --git a/pkgs/development/tools/xcodes/generated/workspace-state.json b/pkgs/by-name/xc/xcodes/generated/workspace-state.json
similarity index 78%
rename from pkgs/development/tools/xcodes/generated/workspace-state.json
rename to pkgs/by-name/xc/xcodes/generated/workspace-state.json
index cddcff170085..68cc38c3c716 100644
--- a/pkgs/development/tools/xcodes/generated/workspace-state.json
+++ b/pkgs/by-name/xc/xcodes/generated/workspace-state.json
@@ -2,6 +2,23 @@
   "object": {
     "artifacts": [],
     "dependencies": [
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "big-num",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/adam-fowler/big-num",
+          "name": "big-num"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "5c5511ad06aeb2b97d0868f7394e14a624bfb1c7",
+            "version": "2.0.2"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "big-num"
+      },
       {
         "basedOn": null,
         "packageRef": {
@@ -137,6 +154,40 @@
         },
         "subpath": "swift-argument-parser"
       },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "swift-crypto",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/apple/swift-crypto",
+          "name": "swift-crypto"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
+            "version": "1.1.7"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "swift-crypto"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "swift-srp",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/xcodesOrg/swift-srp",
+          "name": "swift-srp"
+        },
+        "state": {
+          "checkoutState": {
+            "branch": "main",
+            "revision": "543aa0122a0257b992f6c7d62d18a26e3dffb8fe"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "swift-srp"
+      },
       {
         "basedOn": null,
         "packageRef": {
diff --git a/pkgs/by-name/xc/xcodes/package.nix b/pkgs/by-name/xc/xcodes/package.nix
new file mode 100644
index 000000000000..bd5a56ce145d
--- /dev/null
+++ b/pkgs/by-name/xc/xcodes/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchFromGitHub,
+  swiftPackages,
+  swift,
+  swiftpm,
+  swiftpm2nix,
+  makeWrapper,
+  aria2,
+}:
+let
+  generated = swiftpm2nix.helpers ./generated;
+  stdenv = swiftPackages.stdenv;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcodes";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "XcodesOrg";
+    repo = "xcodes";
+    rev = finalAttrs.version;
+    hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";
+  };
+
+  nativeBuildInputs = [
+    swift
+    swiftpm
+    makeWrapper
+  ];
+
+  configurePhase = generated.configure;
+
+  installPhase = ''
+    runHook preInstall
+
+    binPath="$(swiftpmBinPath)"
+    install -D $binPath/xcodes $out/bin/xcodes
+    wrapProgram $out/bin/xcodes \
+      --prefix PATH : ${lib.makeBinPath [ aria2 ]}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}";
+    description = "Command-line tool to install and switch between multiple versions of Xcode";
+    homepage = "https://github.com/XcodesOrg/xcodes";
+    license = with lib.licenses; [
+      mit
+      # unxip
+      lgpl3Only
+    ];
+    maintainers = with lib.maintainers; [
+      _0x120581f
+      emilytrau
+    ];
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/by-name/xc/xcolor/package.nix
similarity index 100%
rename from pkgs/tools/graphics/xcolor/default.nix
rename to pkgs/by-name/xc/xcolor/package.nix
diff --git a/pkgs/games/xconq/default.nix b/pkgs/by-name/xc/xconq/package.nix
similarity index 100%
rename from pkgs/games/xconq/default.nix
rename to pkgs/by-name/xc/xconq/package.nix
diff --git a/pkgs/games/xcowsay/default.nix b/pkgs/by-name/xc/xcowsay/package.nix
similarity index 100%
rename from pkgs/games/xcowsay/default.nix
rename to pkgs/by-name/xc/xcowsay/package.nix
diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/by-name/xc/xcp/package.nix
similarity index 100%
rename from pkgs/tools/misc/xcp/default.nix
rename to pkgs/by-name/xc/xcp/package.nix
diff --git a/pkgs/applications/emulators/xcpc/default.nix b/pkgs/by-name/xc/xcpc/package.nix
similarity index 100%
rename from pkgs/applications/emulators/xcpc/default.nix
rename to pkgs/by-name/xc/xcpc/package.nix
diff --git a/pkgs/tools/security/xcrawl3r/default.nix b/pkgs/by-name/xc/xcrawl3r/package.nix
similarity index 100%
rename from pkgs/tools/security/xcrawl3r/default.nix
rename to pkgs/by-name/xc/xcrawl3r/package.nix
diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/by-name/xc/xcruiser/package.nix
similarity index 100%
rename from pkgs/applications/misc/xcruiser/default.nix
rename to pkgs/by-name/xc/xcruiser/package.nix
diff --git a/pkgs/tools/graphics/xcur2png/malloc.diff b/pkgs/by-name/xc/xcur2png/malloc.diff
similarity index 100%
rename from pkgs/tools/graphics/xcur2png/malloc.diff
rename to pkgs/by-name/xc/xcur2png/malloc.diff
diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/by-name/xc/xcur2png/package.nix
similarity index 100%
rename from pkgs/tools/graphics/xcur2png/default.nix
rename to pkgs/by-name/xc/xcur2png/package.nix
diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/by-name/xc/xcwd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xcwd/default.nix
rename to pkgs/by-name/xc/xcwd/package.nix
diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/by-name/xd/xd/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/xd/default.nix
rename to pkgs/by-name/xd/xd/package.nix
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/by-name/xd/xdaliclock/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdaliclock/default.nix
rename to pkgs/by-name/xd/xdaliclock/package.nix
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-dbus-proxy/default.nix
rename to pkgs/by-name/xd/xdg-dbus-proxy/package.nix
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock
index 6c927b566144..4cfe8b70fbe4 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.28"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
+checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -91,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -312,7 +312,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -369,9 +369,9 @@ dependencies = [
 
 [[package]]
 name = "ashpd"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
+checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
 dependencies = [
  "enumflags2",
  "futures-channel",
@@ -571,7 +571,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -600,13 +600,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -675,9 +675,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "av1-grain"
@@ -734,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
  "annotate-snippets",
  "bitflags 2.6.0",
@@ -750,7 +750,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -900,13 +900,13 @@ dependencies = [
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1002,9 +1002,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
 dependencies = [
  "jobserver",
  "libc",
@@ -1113,9 +1113,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1123,9 +1123,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1142,7 +1142,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1387,7 +1387,7 @@ dependencies = [
 [[package]]
 name = "cosmic-bg-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-bg#584f6b3c0454396df25d36c6c2b59b018946e81e"
+source = "git+https://github.com/pop-os/cosmic-bg#fd44edf79b5ffbced27540fd222e37aa05daeeba"
 dependencies = [
  "colorgrad",
  "cosmic-config",
@@ -1412,7 +1412,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1434,7 +1434,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1443,7 +1443,7 @@ dependencies = [
 [[package]]
 name = "cosmic-files"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-files#774ccf955f59f24cf9493f9249d20788ad394d48"
+source = "git+https://github.com/pop-os/cosmic-files#2b4a14dfe2403f1adfeb0423870216ee9a48cd06"
 dependencies = [
  "chrono",
  "dirs 5.0.1",
@@ -1478,6 +1478,7 @@ dependencies = [
  "slotmap",
  "smol_str",
  "tar",
+ "tempfile",
  "tokio",
  "trash",
  "unix_permissions_ext",
@@ -1516,7 +1517,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-daemon"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#8059e6bdaa35fecd70d228a999ca342fb00d313b"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#931f5db558bf3fcb572ff4e18f7f1618a7430046"
 dependencies = [
  "zbus 4.4.0",
 ]
@@ -1547,7 +1548,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -1703,7 +1704,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1714,7 +1715,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1724,7 +1725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
  "parking_lot_core 0.9.10",
@@ -1770,7 +1771,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1782,7 +1783,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1872,7 +1873,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2024,7 +2025,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2168,9 +2169,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
 dependencies = [
  "simd-adler32",
 ]
@@ -2207,9 +2208,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.0",
@@ -2290,10 +2291,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "font-types"
-version = "0.6.0"
+name = "foldhash"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
+[[package]]
+name = "font-types"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43"
 dependencies = [
  "bytemuck",
 ]
@@ -2339,7 +2346,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2444,9 +2451,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2459,9 +2466,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2469,15 +2476,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2487,9 +2494,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -2521,32 +2528,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2577,9 +2584,9 @@ dependencies = [
 
 [[package]]
 name = "gbm-sys"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58"
+checksum = "a9cc2f64de9fa707b5c6b2d2f10d7a7e49e845018a9f5685891eb40d3bab2538"
 dependencies = [
  "libc",
 ]
@@ -2617,9 +2624,9 @@ dependencies = [
 
 [[package]]
 name = "gettext-rs"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c"
+checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a"
 dependencies = [
  "gettext-sys",
  "locale_config",
@@ -2627,9 +2634,9 @@ dependencies = [
 
 [[package]]
 name = "gettext-sys"
-version = "0.21.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67"
+checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661"
 dependencies = [
  "cc",
  "temp-dir",
@@ -2657,15 +2664,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gio"
-version = "0.20.1"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52"
+checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2680,9 +2687,9 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.20.1"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
+checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2710,9 +2717,9 @@ checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 
 [[package]]
 name = "glib"
-version = "0.20.3"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4"
+checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff"
 dependencies = [
  "bitflags 2.6.0",
  "futures-channel",
@@ -2731,22 +2738,22 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.20.3"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab"
+checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7"
 dependencies = [
  "heck 0.5.0",
  "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "glib-sys"
-version = "0.20.2"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
+checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b"
 dependencies = [
  "libc",
  "system-deps 7.0.3",
@@ -2805,9 +2812,9 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.20.1"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
+checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462"
 dependencies = [
  "glib-sys",
  "libc",
@@ -2854,7 +2861,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
  "bitflags 2.6.0",
  "gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -2874,9 +2881,9 @@ checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9"
 
 [[package]]
 name = "gstreamer"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140"
+checksum = "49ecf3bcfc2ceb82ce02437f53ff2fcaee5e7d45ae697ab64a018408749779b9"
 dependencies = [
  "cfg-if",
  "futures-channel",
@@ -2899,9 +2906,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-sys"
-version = "0.23.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3"
+checksum = "cb3859929db32f26a35818d0d9ed82f0887c9221ca402ddefaea2bb99833d535"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2939,6 +2946,17 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "hassle-rs"
 version = "0.11.0"
@@ -3058,7 +3076,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.77",
+ "syn 2.0.79",
  "unic-langid",
 ]
 
@@ -3079,7 +3097,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.77",
+ "syn 2.0.79",
  "unic-langid",
 ]
 
@@ -3093,7 +3111,7 @@ dependencies = [
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3122,7 +3140,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3141,7 +3159,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -3151,7 +3169,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "bitflags 2.6.0",
  "dnd",
@@ -3173,7 +3191,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "futures",
  "iced_core",
@@ -3186,7 +3204,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
@@ -3210,7 +3228,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3222,7 +3240,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3236,7 +3254,7 @@ dependencies = [
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "enum-repr",
  "float-cmp",
@@ -3263,7 +3281,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -3273,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3290,7 +3308,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "as-raw-xcb-connection",
  "bitflags 2.6.0",
@@ -3319,7 +3337,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3337,7 +3355,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3514,7 +3532,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3614,12 +3632,12 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -3677,7 +3695,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3807,9 +3825,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3918,10 +3936,10 @@ checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147"
+source = "git+https://github.com/pop-os/libcosmic#100f75f88edc5b602e29587fd6698dbf0038901d"
 dependencies = [
  "apply",
- "ashpd 0.9.1",
+ "ashpd 0.9.2",
  "chrono",
  "cosmic-client-toolkit",
  "cosmic-config",
@@ -3958,6 +3976,7 @@ dependencies = [
  "tracing",
  "unicode-segmentation",
  "url",
+ "ustr",
  "zbus 4.4.0",
 ]
 
@@ -4017,7 +4036,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.4",
+ "redox_syscall 0.5.7",
 ]
 
 [[package]]
@@ -4116,11 +4135,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -4297,7 +4316,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
- "simd-adler32",
 ]
 
 [[package]]
@@ -4307,6 +4325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -4544,7 +4563,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4616,7 +4635,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4719,18 +4738,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "open"
@@ -4774,7 +4793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
 dependencies = [
  "dlv-list",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -4808,16 +4827,16 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
+checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
 dependencies = [
- "ttf-parser 0.24.1",
+ "ttf-parser 0.25.0",
 ]
 
 [[package]]
@@ -4842,7 +4861,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4894,7 +4913,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.4",
+ "redox_syscall 0.5.7",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -4957,7 +4976,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5032,15 +5051,15 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
-version = "0.17.13"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.7.4",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -5117,7 +5136,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.21",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -5146,9 +5165,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
 dependencies = [
  "unicode-ident",
 ]
@@ -5169,7 +5188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5337,9 +5356,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
 
 [[package]]
 name = "read-fonts"
-version = "0.20.0"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd"
+checksum = "fb94d9ac780fdcf9b6b252253f7d8f221379b84bd3573131139b383df69f85e1"
 dependencies = [
  "bytemuck",
  "font-types",
@@ -5390,9 +5409,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5410,9 +5429,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5422,9 +5441,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5433,9 +5452,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "renderdoc-sys"
@@ -5536,7 +5555,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.77",
+ "syn 2.0.79",
  "walkdir",
 ]
 
@@ -5710,7 +5729,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5734,14 +5753,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -5815,9 +5834,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "skrifa"
-version = "0.20.0"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23"
+checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe"
 dependencies = [
  "bytemuck",
  "read-fonts",
@@ -6045,9 +6064,9 @@ dependencies = [
 
 [[package]]
 name = "swash"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac"
+checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2"
 dependencies = [
  "skrifa",
  "yazi",
@@ -6067,9 +6086,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6084,7 +6103,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6135,9 +6154,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
 dependencies = [
  "filetime",
  "libc",
@@ -6152,15 +6171,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "temp-dir"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
+checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand 2.1.1",
@@ -6201,7 +6220,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6347,7 +6366,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6379,7 +6398,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.21",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -6404,15 +6423,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.21"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.20",
 ]
 
 [[package]]
@@ -6434,7 +6453,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6476,9 +6495,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
 
 [[package]]
 name = "ttf-parser"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
+checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e"
 
 [[package]]
 name = "type-map"
@@ -6536,9 +6555,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-bidi-mirroring"
@@ -6587,9 +6606,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-script"
@@ -6645,6 +6664,19 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
+[[package]]
+name = "ustr"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e904a2279a4a36d2356425bb20be271029cc650c335bc82af8bfae30085a3d0"
+dependencies = [
+ "ahash",
+ "byteorder",
+ "lazy_static",
+ "parking_lot 0.12.3",
+ "serde",
+]
+
 [[package]]
 name = "usvg"
 version = "0.37.0"
@@ -6799,9 +6831,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6810,24 +6842,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6837,9 +6869,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6847,22 +6879,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
 
 [[package]]
 name = "wasm-timer"
@@ -7033,9 +7065,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7282,7 +7314,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -7304,7 +7336,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -7588,9 +7620,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -7812,7 +7844,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "synstructure",
 ]
 
@@ -7920,7 +7952,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "zvariant_utils 2.1.0",
 ]
 
@@ -7970,7 +8002,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -7990,7 +8022,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "synstructure",
 ]
 
@@ -8011,7 +8043,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -8033,7 +8065,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -8181,7 +8213,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "zvariant_utils 2.1.0",
 ]
 
@@ -8204,5 +8236,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 70524b3ce13e..23e1a5014443 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-alpha.2";
+  version = "1.0.0-alpha.3";
 
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = pname;
+    repo = "xdg-desktop-portal-cosmic";
     rev = "epoch-${version}";
-    hash = "sha256-MbcktIXkiH3uxQLduXF76ZGn2aoTd/D6xKeUM4M/btM=";
+    hash = "sha256-IlMcgzhli61QWjdovj5BpOxOebV3RytBeHPhxzWNXqg=";
   };
 
-  env.VERGEN_GIT_COMMIT_DATE = "2024-09-24";
+  env.VERGEN_GIT_COMMIT_DATE = "2024-10-10";
   env.VERGEN_GIT_SHA = src.rev;
 
   cargoLock = {
@@ -30,11 +30,11 @@ rustPlatform.buildRustPackage rec {
       "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ=";
       "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
       "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
-      "cosmic-bg-config-0.1.0" = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik=";
+      "cosmic-bg-config-0.1.0" = "sha256-bmcMZIURozlptsR4si62NTmexqaCX1Yj5bYj49GDehQ=";
       "cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0=";
-      "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk=";
-      "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg=";
-      "cosmic-settings-daemon-0.1.0" = "sha256-6cEgFfkBxEpIo8LsvKDR2khMdhEz/dp2oYJXXBiC9zg=";
+      "cosmic-config-0.1.0" = "sha256-XXT92zsdwkzx9dajSYlK6p/XPp6ajq9xJT504T1L4qU=";
+      "cosmic-files-0.1.0" = "sha256-eP6uLHxXpx+nNkEcROlqi0t3qRtU8vYITyt4JXtd7vw=";
+      "cosmic-settings-daemon-0.1.0" = "sha256-mklNPKVMO6iFrxki2DwiL5K78KiWpGxksisYldaASIE=";
       "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w=";
       "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
       "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE=";
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
new file mode 100644
index 000000000000..8c09c2cf0b21
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
@@ -0,0 +1,80 @@
+{ stdenv
+, lib
+, fetchurl
+, fontconfig
+, glib
+, gnome
+, gnome-desktop
+, gsettings-desktop-schemas
+, gtk4
+, libadwaita
+, libjxl
+, librsvg
+, meson
+, ninja
+, pkg-config
+, wayland
+, wayland-scanner
+, webp-pixbuf-loader
+, wrapGAppsHook4
+, xdg-desktop-portal
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdg-desktop-portal-gnome";
+  version = "47.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
+    hash = "sha256-1CD/chc7BNyUkdPX3YzJYgT38/J8TL6mAkNh6pg592k=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    fontconfig
+    glib
+    gsettings-desktop-schemas # settings exposed by settings portal
+    gtk4
+    libadwaita
+    gnome-desktop
+    xdg-desktop-portal
+    wayland # required by GTK 4
+  ];
+
+  mesonFlags = [
+    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+  ];
+
+  postInstall = ''
+    # Pull in WebP and JXL support for gnome-backgrounds.
+    # In postInstall to run before gappsWrapperArgsHook.
+    export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+      extraLoaders = [
+        libjxl
+        librsvg
+        webp-pixbuf-loader
+      ];
+    }}"
+  '';
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "xdg-desktop-portal-gnome";
+    };
+  };
+
+  meta = with lib; {
+    description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment";
+    homepage = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome";
+    maintainers = teams.gnome.members;
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+  };
+})
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/by-name/xd/xdg-launch/package.nix
similarity index 100%
rename from pkgs/applications/misc/xdg-launch/default.nix
rename to pkgs/by-name/xd/xdg-launch/package.nix
diff --git a/pkgs/tools/misc/xdg-ninja/default.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdg-ninja/default.nix
rename to pkgs/by-name/xd/xdg-ninja/package.nix
diff --git a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix
new file mode 100644
index 000000000000..f0ac6e12eb08
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix
@@ -0,0 +1,65 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  fetchpatch,
+  autoreconfHook,
+  intltool,
+  pkg-config,
+  xdg-user-dirs,
+  wrapGAppsHook3,
+  gtk3,
+  gnome,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdg-user-dirs-gtk";
+  version = "0.11";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/xdg-user-dirs-gtk/${lib.versions.majorMinor finalAttrs.version}/xdg-user-dirs-gtk-${finalAttrs.version}.tar.xz";
+    hash = "sha256-U0vVY9PA4/jcvzV4y4qw5J07pByWbUd8ivlDg2QSHn0=";
+  };
+
+  patches = [
+    # Fix cross: ./configure: line 7633: no: command not found
+    (fetchpatch {
+      url = "https://salsa.debian.org/gnome-team/xdg-user-dirs-gtk/-/raw/b047b613d5f18aebe8e9bca4e0a82b75b2d1f8c4/debian/patches/fix-pkg-config-cross-compilation.patch";
+      hash = "sha256-QHq8hlX0SS+T6jtagMs9qApJCWFG1PHxftzoID2Nag4=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    intltool
+    pkg-config
+    xdg-user-dirs # for AC_PATH_PROG
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [ gtk3 ];
+
+  postPatch = ''
+    # Fetch translations from correct localedir.
+    substituteInPlace update.c --replace-fail \
+      'bindtextdomain ("xdg-user-dirs", GLIBLOCALEDIR);' \
+      'bindtextdomain ("xdg-user-dirs", "${xdg-user-dirs}/share/locale");'
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}")
+  '';
+
+  passthru.updateScript = gnome.updateScript {
+    packageName = "xdg-user-dirs-gtk";
+  };
+
+  meta = {
+    homepage = "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk";
+    description = "Companion to xdg-user-dirs that integrates it into the GNOME desktop and GTK applications";
+    license = lib.licenses.gpl2Only;
+    maintainers = lib.teams.gnome.members;
+    platforms = lib.platforms.unix;
+    mainProgram = "xdg-user-dirs-gtk-update";
+  };
+})
diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix
index 98d95290ca1e..d11223121392 100644
--- a/pkgs/by-name/xd/xdg-user-dirs/package.nix
+++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   stdenv,
+  autoreconfHook,
   fetchurl,
   libxslt,
   docbook_xsl,
+  docbook_xml_dtd_43,
   gettext,
-  libiconv,
   makeWrapper,
 }:
 
@@ -18,12 +19,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw=";
   };
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  postPatch = ''
+    substituteInPlace Makefile.am \
+      --replace-fail 'libraries = $(LIBINTL)' 'libraries = $(LIBICONV) $(LIBINTL)'
+  '';
 
   nativeBuildInputs = [
+    autoreconfHook
     makeWrapper
     libxslt
     docbook_xsl
+    docbook_xml_dtd_43
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
   preFixup = ''
@@ -36,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs";
     description = "Tool to help manage well known user directories like the desktop folder and the music folder";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ donovanglover ];
+    maintainers = with maintainers; [
+      donovanglover
+      iFreilicht
+    ];
     platforms = platforms.unix;
     mainProgram = "xdg-user-dirs-update";
   };
diff --git a/pkgs/tools/X11/xdg-utils/allow-forcing-portal-use.patch b/pkgs/by-name/xd/xdg-utils/allow-forcing-portal-use.patch
similarity index 100%
rename from pkgs/tools/X11/xdg-utils/allow-forcing-portal-use.patch
rename to pkgs/by-name/xd/xdg-utils/allow-forcing-portal-use.patch
diff --git a/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch b/pkgs/by-name/xd/xdg-utils/enable-xdg-terminal.patch
similarity index 100%
rename from pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch
rename to pkgs/by-name/xd/xdg-utils/enable-xdg-terminal.patch
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/by-name/xd/xdg-utils/package.nix
similarity index 100%
rename from pkgs/tools/X11/xdg-utils/default.nix
rename to pkgs/by-name/xd/xdg-utils/package.nix
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix
similarity index 100%
rename from pkgs/applications/misc/xdgmenumaker/default.nix
rename to pkgs/by-name/xd/xdgmenumaker/package.nix
diff --git a/pkgs/tools/misc/xdiskusage/default.nix b/pkgs/by-name/xd/xdiskusage/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdiskusage/default.nix
rename to pkgs/by-name/xd/xdiskusage/package.nix
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/by-name/xd/xdo/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdo/default.nix
rename to pkgs/by-name/xd/xdo/package.nix
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/by-name/xd/xdotool/package.nix
similarity index 100%
rename from pkgs/tools/X11/xdotool/default.nix
rename to pkgs/by-name/xd/xdotool/package.nix
diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/by-name/xd/xdummy/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdummy/default.nix
rename to pkgs/by-name/xd/xdummy/package.nix
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/by-name/xd/xdxf2slob/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdxf2slob/default.nix
rename to pkgs/by-name/xd/xdxf2slob/package.nix
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/by-name/xe/xe-guest-utilities/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/xe-guest-utilities/default.nix
rename to pkgs/by-name/xe/xe-guest-utilities/package.nix
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/by-name/xe/xe/package.nix
similarity index 100%
rename from pkgs/tools/system/xe/default.nix
rename to pkgs/by-name/xe/xe/package.nix
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/by-name/xe/xearth/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/xearth/default.nix
rename to pkgs/by-name/xe/xearth/package.nix
diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/by-name/xe/xed/package.nix
similarity index 100%
rename from pkgs/development/libraries/xed/default.nix
rename to pkgs/by-name/xe/xed/package.nix
diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/by-name/xe/xedit/package.nix
similarity index 100%
rename from pkgs/applications/editors/xedit/default.nix
rename to pkgs/by-name/xe/xedit/package.nix
diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/by-name/xe/xenomapper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/xenomapper/default.nix
rename to pkgs/by-name/xe/xenomapper/package.nix
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/by-name/xe/xercesc/package.nix
similarity index 100%
rename from pkgs/development/libraries/xercesc/default.nix
rename to pkgs/by-name/xe/xercesc/package.nix
diff --git a/pkgs/development/libraries/xeus-zmq/default.nix b/pkgs/by-name/xe/xeus-zmq/package.nix
similarity index 100%
rename from pkgs/development/libraries/xeus-zmq/default.nix
rename to pkgs/by-name/xe/xeus-zmq/package.nix
diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/by-name/xe/xeus/package.nix
similarity index 100%
rename from pkgs/development/libraries/xeus/default.nix
rename to pkgs/by-name/xe/xeus/package.nix
diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix
index 2f9f2b029d21..f7513d9c1298 100644
--- a/pkgs/by-name/xe/xeve/package.nix
+++ b/pkgs/by-name/xe/xeve/package.nix
@@ -9,41 +9,38 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xeve";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "mpeg5";
     repo = "xeve";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8jXntm/yFme9ZPImdW54jAr11hEsU1K+N5/7RLmITPs=";
+    hash = "sha256-/DcYv2fInr8MN1wpOgJHcFWEvW//7SIXccheRfeaTHM=";
   };
 
   patches =
-    lib.optionals (!lib.versionOlder "0.5.0" finalAttrs.version) (
-      builtins.map fetchpatch2 [
-        {
-          url = "https://github.com/mpeg5/xeve/commit/954ed6e0494cd2438fd15c717c0146e88e582b33.patch?full_index=1";
-          hash = "sha256-//NtOUm1fqPFvOM955N6gF+QgmOdmuVunwx/3s/G/J8=";
-        }
-        {
-          url = "https://github.com/mpeg5/xeve/commit/07a6f2a6d13dfaa0f73c3752f8cd802c251d8252.patch?full_index=1";
-          hash = "sha256-P9J7Y9O/lb/MSa5oCfft7z764AbLBLZnMmrmPEZPcws=";
-        }
-        {
-          url = "https://github.com/mpeg5/xeve/commit/0a0f3bd397161253b606bdbeaa518fbe019d24e1.patch?full_index=1";
-          hash = "sha256-PoZpE64gWkTUS4Q+SK+DH1I1Ac0UEzwwnlvpYN16hsI=";
-        }
-        {
-          url = "https://github.com/mpeg5/xeve/commit/e029f1619ecedbda152b8680641fa10eea9eeace.patch?full_index=1";
-          hash = "sha256-ooIBzNtGSjDgYvTzA8T0KB+QzsUiy14mPpoRqrHF3Pg=";
-        }
-      ]
-      ++ [
-        # Backport to 0.5.0 of upstream patch c564ac77c103dbba472df3e13f4733691fd499ed
-        ./0001-CMakeLists.txt-Disable-static-linking-on-Darwin.patch
-      ]
-    )
+    builtins.map fetchpatch2 [
+      {
+        url = "https://github.com/mpeg5/xeve/commit/954ed6e0494cd2438fd15c717c0146e88e582b33.patch?full_index=1";
+        hash = "sha256-//NtOUm1fqPFvOM955N6gF+QgmOdmuVunwx/3s/G/J8=";
+      }
+      {
+        url = "https://github.com/mpeg5/xeve/commit/07a6f2a6d13dfaa0f73c3752f8cd802c251d8252.patch?full_index=1";
+        hash = "sha256-P9J7Y9O/lb/MSa5oCfft7z764AbLBLZnMmrmPEZPcws=";
+      }
+      {
+        url = "https://github.com/mpeg5/xeve/commit/0a0f3bd397161253b606bdbeaa518fbe019d24e1.patch?full_index=1";
+        hash = "sha256-PoZpE64gWkTUS4Q+SK+DH1I1Ac0UEzwwnlvpYN16hsI=";
+      }
+      {
+        url = "https://github.com/mpeg5/xeve/commit/e029f1619ecedbda152b8680641fa10eea9eeace.patch?full_index=1";
+        hash = "sha256-ooIBzNtGSjDgYvTzA8T0KB+QzsUiy14mPpoRqrHF3Pg=";
+      }
+    ]
     ++ [
+      # Backport to 0.5.0 of upstream patch c564ac77c103dbba472df3e13f4733691fd499ed
+      ./0001-CMakeLists.txt-Disable-static-linking-on-Darwin.patch
+
       # Rejected upstream, can be dropped when a fix for
       # https://github.com/mpeg5/xeve/pull/123 is in a version bump.
       ./0002-sse2neon-Cast-to-variable-type.patch
@@ -64,23 +61,20 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optional isDarwin (cmakeFeature "CMAKE_SYSTEM_NAME" "Darwin");
 
   env.NIX_CFLAGS_COMPILE = builtins.toString (
-    builtins.map (w: "-Wno-" + w) (
-      [
-        # Patch addressing an if without a body was rejected upstream, third
-        # line-based comment in this thread, https://github.com/mpeg5/xeve/pull/122#pullrequestreview-2187744305
-        # Evaluate on version bump whether still necessary.
-        "empty-body"
+    builtins.map (w: "-Wno-" + w) [
+      # Patch addressing an if without a body was rejected upstream, third
+      # line-based comment in this thread, https://github.com/mpeg5/xeve/pull/122#pullrequestreview-2187744305
+      # Evaluate on version bump whether still necessary.
+      "empty-body"
 
-        # Evaluate on version bump whether still necessary.
-        "parentheses-equality"
-        "unknown-warning-option"
-      ]
-      ++ (
-        # Fixed upstream in 325fd9f94f3fdf0231fa931a31ebb72e63dc3498 but might
-        # change behavior, therefore opted to leave it out for now.
-        lib.optional (!lib.versionOlder "0.5.0" finalAttrs.version) "for-loop-analysis"
-      )
-    )
+      # Evaluate on version bump whether still necessary.
+      "parentheses-equality"
+      "unknown-warning-option"
+
+      # Fixed upstream in 325fd9f94f3fdf0231fa931a31ebb72e63dc3498 but might
+      # change behavior, therefore opted to leave it out for now.
+      "for-loop-analysis"
+    ]
   );
 
   postInstall = ''
diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/by-name/xf/xf86_input_cmt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xf86-input-cmt/default.nix
rename to pkgs/by-name/xf/xf86_input_cmt/package.nix
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/by-name/xf/xf86_input_wacom/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xf86-input-wacom/default.nix
rename to pkgs/by-name/xf/xf86_input_wacom/package.nix
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/by-name/xf/xf86_video_nested/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xf86-video-nested/default.nix
rename to pkgs/by-name/xf/xf86_video_nested/package.nix
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/by-name/xf/xfig/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xfig/default.nix
rename to pkgs/by-name/xf/xfig/package.nix
diff --git a/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch b/pkgs/by-name/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
similarity index 100%
rename from pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
rename to pkgs/by-name/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/by-name/xf/xfitter/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/xfitter/default.nix
rename to pkgs/by-name/xf/xfitter/package.nix
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/by-name/xf/xfontsel/package.nix
similarity index 100%
rename from pkgs/applications/misc/xfontsel/default.nix
rename to pkgs/by-name/xf/xfontsel/package.nix
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/by-name/xf/xfractint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xfractint/default.nix
rename to pkgs/by-name/xf/xfractint/package.nix
diff --git a/pkgs/tools/filesystems/xfsdump/default.nix b/pkgs/by-name/xf/xfsdump/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/xfsdump/default.nix
rename to pkgs/by-name/xf/xfsdump/package.nix
diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix
new file mode 100644
index 000000000000..427aa4d36c14
--- /dev/null
+++ b/pkgs/by-name/xf/xfsprogs/package.nix
@@ -0,0 +1,66 @@
+{ lib, stdenv, buildPackages, fetchurl, gettext, pkg-config
+, icu, libuuid, readline, inih, liburcu
+, nixosTests
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xfsprogs";
+  version = "6.11.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
+    hash = "sha256-2uO7QyGW97GDsua9XcRL8z7b19DoW9N9JcI134G4EAo=";
+  };
+
+  outputs = [ "bin" "dev" "out" "doc" ];
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [
+    gettext pkg-config
+    libuuid # codegen tool uses libuuid
+    liburcu # required by crc32selftest
+  ];
+  buildInputs = [ readline icu inih liburcu ];
+  propagatedBuildInputs = [ libuuid ]; # Dev headers include 
+
+  enableParallelBuilding = true;
+  # Install fails as:
+  #   make[1]: *** No rule to make target '\', needed by 'kmem.lo'.  Stop.
+  enableParallelInstalling = false;
+
+  # @sbindir@ is replaced with /run/current-system/sw/bin to fix dependency cycles
+  # and '@pkg_state_dir@' should not point to the nix store, but we cannot use the configure parameter
+  # because then it will try to install to /var
+  preConfigure = ''
+    for file in scrub/*.in; do
+      substituteInPlace "$file" \
+        --replace-quiet '@sbindir@' '/run/current-system/sw/bin' \
+        --replace-quiet '@pkg_state_dir@' '/var'
+    done
+    patchShebangs ./install-sh
+  '';
+
+  configureFlags = [
+    "--disable-lib64"
+    "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system"
+  ];
+
+  installFlags = [ "install-dev" ];
+
+  # FIXME: forbidden rpath
+  postInstall = ''
+    find . -type d -name .libs | xargs rm -rf
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests.installer) lvm;
+  };
+
+  meta = with lib; {
+    homepage = "https://xfs.wiki.kernel.org";
+    description = "SGI XFS utilities";
+    license = with licenses; [ gpl2Only lgpl21 gpl3Plus ];  # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dezgeg ajs124 ];
+  };
+}
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/by-name/xf/xfstests/package.nix
similarity index 100%
rename from pkgs/tools/misc/xfstests/default.nix
rename to pkgs/by-name/xf/xfstests/package.nix
diff --git a/pkgs/games/xgalaga++/default.nix b/pkgs/by-name/xg/xgalagapp/package.nix
similarity index 100%
rename from pkgs/games/xgalaga++/default.nix
rename to pkgs/by-name/xg/xgalagapp/package.nix
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/by-name/xg/xgboost/package.nix
similarity index 100%
rename from pkgs/development/libraries/xgboost/default.nix
rename to pkgs/by-name/xg/xgboost/package.nix
diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/by-name/xg/xgeometry-select/package.nix
similarity index 100%
rename from pkgs/tools/X11/xgeometry-select/default.nix
rename to pkgs/by-name/xg/xgeometry-select/package.nix
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/by-name/xh/xh/package.nix
similarity index 100%
rename from pkgs/tools/networking/xh/default.nix
rename to pkgs/by-name/xh/xh/package.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/by-name/xh/xhtml1/package.nix
similarity index 100%
rename from pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
rename to pkgs/by-name/xh/xhtml1/package.nix
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/by-name/xi/xiccd/package.nix
similarity index 100%
rename from pkgs/tools/misc/xiccd/default.nix
rename to pkgs/by-name/xi/xiccd/package.nix
diff --git a/pkgs/by-name/xi/xidel/package.nix b/pkgs/by-name/xi/xidel/package.nix
new file mode 100644
index 000000000000..6119151e5294
--- /dev/null
+++ b/pkgs/by-name/xi/xidel/package.nix
@@ -0,0 +1,100 @@
+{ lib, stdenv, fetchFromGitHub, fpc, openssl }:
+
+let
+  flreSrc = fetchFromGitHub {
+    owner = "benibela";
+    repo = "flre";
+    rev = "3e926d45d4352f1b7c7cd411ccd625df117dad5c";
+    hash = "sha256-fs7CIjd3fwD/SORYh5pmJxIdrr8F9e36TNmnKUbUxP0=";
+  };
+  synapseSrc = fetchFromGitHub {
+    owner = "benibela";
+    repo = "ararat-synapse";
+    rev = "7a77db926de66809080bada68b54172da7f84c0e";
+    hash = "sha256-bVLQ0ohGJYtuP88Krxy9a7RnHHrW0OWw8H/uxa3PerU=";
+  };
+  rcmdlineSrc = fetchFromGitHub {
+    owner = "benibela";
+    repo = "rcmdline";
+    rev = "ea02b770c4568717dd7b3b72da191a8bbcb4c751";
+    hash = "sha256-6YtvAf0joRvtCKbUAaLwuwABw1GEIzammFLhboq9aG0=";
+  };
+  internettoolsSrc = fetchFromGitHub {
+    owner = "benibela";
+    repo = "internettools";
+    rev = "dd972caaa4415468fa679ea7262976ead3fd3e38";
+    hash = "sha256-09sADxPiE6ky1EX7dTXRBYVT3IarUcLYf5knzi7+CHU=";
+  };
+  pasdblstrutilsSrc = fetchFromGitHub {
+    owner = "BeRo1985";
+    repo = "pasdblstrutils";
+    rev = "1696f0a2b822fef26c8992f96620f1be129cfa99";
+    hash = "sha256-x0AjOTa1g7gJOR2iBO76yBt1kzcRNujHRUsq5QOlfP0=";
+  };
+in stdenv.mkDerivation rec {
+  pname = "xidel";
+  version = "unstable-2022-11-01";
+
+  src = fetchFromGitHub {
+    owner = "benibela";
+    repo = pname;
+    rev = "6d5655c1d73b88ddeb32d2450a35ee36e4762bb8";
+    hash = "sha256-9x2d5AKRBjocRawRHdeI4heIM5nb00/F/EIj+/to7ac=";
+  };
+
+  nativeBuildInputs = [ fpc ];
+  buildInputs = [ openssl ];
+
+  NIX_LDFLAGS = [ "-lcrypto" ];
+
+  patchPhase = ''
+    patchShebangs \
+      build.sh \
+      tests/test.sh \
+      tests/tests-file-module.sh \
+      tests/tests.sh \
+      tests/downloadTest.sh \
+      tests/downloadTests.sh \
+      tests/zorbajsoniq.sh \
+      tests/zorbajsoniq/download.sh
+  '';
+
+  preBuildPhase = ''
+    mkdir -p import/{flre,synapse,pasdblstrutils} rcmdline internettools
+    cp -R ${flreSrc}/. import/flre
+    cp -R ${pasdblstrutilsSrc}/. import/pasdblstrutils
+    cp -R ${rcmdlineSrc}/. rcmdline
+    cp -R ${internettoolsSrc}/. internettools
+
+    cp -R ${synapseSrc}/. import/synapse
+    substituteInPlace import/synapse/ssl_openssl{,11}_lib.pas \
+      --replace-fail 'libcrypto.dylib' '${lib.getLib openssl}/lib/libcrypto.dylib' \
+      --replace-fail 'libssl.dylib' '${lib.getLib openssl}/lib/libssl.dylib'
+  '';
+
+  buildPhase = ''
+    runHook preBuildPhase
+    ./build.sh
+    runHook postBuildPhase
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/bin" "$out/share/man/man1"
+    cp meta/xidel.1 "$out/share/man/man1/"
+    cp xidel "$out/bin/"
+  '';
+
+  # disabled, because tests require network
+  checkPhase = ''
+    ./tests/tests.sh
+  '';
+
+  meta = with lib; {
+    description = "Command line tool to download and extract data from HTML/XML pages as well as JSON APIs";
+    mainProgram = "xidel";
+    homepage = "https://www.videlibri.de/xidel.html";
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/by-name/xi/xinetd/package.nix
similarity index 100%
rename from pkgs/servers/xinetd/default.nix
rename to pkgs/by-name/xi/xinetd/package.nix
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/by-name/xi/xinput_calibrator/package.nix
similarity index 100%
rename from pkgs/tools/X11/xinput_calibrator/default.nix
rename to pkgs/by-name/xi/xinput_calibrator/package.nix
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/by-name/xi/xits-math/package.nix
similarity index 100%
rename from pkgs/data/fonts/xits-math/default.nix
rename to pkgs/by-name/xi/xits-math/package.nix
diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/by-name/xj/xjadeo/package.nix
similarity index 100%
rename from pkgs/tools/video/xjadeo/default.nix
rename to pkgs/by-name/xj/xjadeo/package.nix
diff --git a/pkgs/tools/misc/xjobs/default.nix b/pkgs/by-name/xj/xjobs/package.nix
similarity index 100%
rename from pkgs/tools/misc/xjobs/default.nix
rename to pkgs/by-name/xj/xjobs/package.nix
diff --git a/pkgs/games/xjump/darwin.patch b/pkgs/by-name/xj/xjump/darwin.patch
similarity index 100%
rename from pkgs/games/xjump/darwin.patch
rename to pkgs/by-name/xj/xjump/darwin.patch
diff --git a/pkgs/games/xjump/default.nix b/pkgs/by-name/xj/xjump/package.nix
similarity index 100%
rename from pkgs/games/xjump/default.nix
rename to pkgs/by-name/xj/xjump/package.nix
diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkb-switch-i3/default.nix
rename to pkgs/by-name/xk/xkb-switch-i3/package.nix
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/by-name/xk/xkb-switch/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkb-switch/default.nix
rename to pkgs/by-name/xk/xkb-switch/package.nix
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/by-name/xk/xkbd/package.nix
similarity index 100%
rename from pkgs/applications/misc/xkbd/default.nix
rename to pkgs/by-name/xk/xkbd/package.nix
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/by-name/xk/xkblayout-state/package.nix
similarity index 100%
rename from pkgs/applications/misc/xkblayout-state/default.nix
rename to pkgs/by-name/xk/xkblayout-state/package.nix
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/by-name/xk/xkbmon/package.nix
similarity index 100%
rename from pkgs/applications/misc/xkbmon/default.nix
rename to pkgs/by-name/xk/xkbmon/package.nix
diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/by-name/xk/xkbset/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkbset/default.nix
rename to pkgs/by-name/xk/xkbset/package.nix
diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/by-name/xk/xkbvalidate/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkbvalidate/default.nix
rename to pkgs/by-name/xk/xkbvalidate/package.nix
diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/by-name/xk/xkbvalidate/xkbvalidate.c
similarity index 100%
rename from pkgs/tools/X11/xkbvalidate/xkbvalidate.c
rename to pkgs/by-name/xk/xkbvalidate/xkbvalidate.c
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/by-name/xk/xkcd-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/xkcd-font/default.nix
rename to pkgs/by-name/xk/xkcd-font/package.nix
diff --git a/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py b/pkgs/by-name/xk/xkeysnail/browser-emacs-bindings.py
similarity index 100%
rename from pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py
rename to pkgs/by-name/xk/xkeysnail/browser-emacs-bindings.py
diff --git a/pkgs/tools/X11/xkeysnail/default.nix b/pkgs/by-name/xk/xkeysnail/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkeysnail/default.nix
rename to pkgs/by-name/xk/xkeysnail/package.nix
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/by-name/xl/xl2tpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/xl2tpd/default.nix
rename to pkgs/by-name/xl/xl2tpd/package.nix
diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
similarity index 100%
rename from pkgs/tools/X11/xlayoutdisplay/default.nix
rename to pkgs/by-name/xl/xlayoutdisplay/package.nix
diff --git a/pkgs/tools/inputmethods/xlibinput_calibrator/default.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/xlibinput_calibrator/default.nix
rename to pkgs/by-name/xl/xlibinput-calibrator/package.nix
diff --git a/pkgs/applications/graphics/xlife/default.nix b/pkgs/by-name/xl/xlife/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xlife/default.nix
rename to pkgs/by-name/xl/xlife/package.nix
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/by-name/xl/xloadimage/package.nix
similarity index 100%
rename from pkgs/tools/X11/xloadimage/default.nix
rename to pkgs/by-name/xl/xloadimage/package.nix
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/by-name/xl/xlockmore/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xlockmore/default.nix
rename to pkgs/by-name/xl/xlockmore/package.nix
diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/by-name/xl/xlog/package.nix
similarity index 100%
rename from pkgs/applications/radio/xlog/default.nix
rename to pkgs/by-name/xl/xlog/package.nix
diff --git a/pkgs/tools/X11/xlogo/default.nix b/pkgs/by-name/xl/xlogo/package.nix
similarity index 100%
rename from pkgs/tools/X11/xlogo/default.nix
rename to pkgs/by-name/xl/xlogo/package.nix
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/by-name/xl/xlslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/xlslib/default.nix
rename to pkgs/by-name/xl/xlslib/package.nix
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/by-name/xm/xmacro/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmacro/default.nix
rename to pkgs/by-name/xm/xmacro/package.nix
diff --git a/pkgs/games/xmage/default.nix b/pkgs/by-name/xm/xmage/package.nix
similarity index 100%
rename from pkgs/games/xmage/default.nix
rename to pkgs/by-name/xm/xmage/package.nix
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/by-name/xm/xmagnify/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmagnify/default.nix
rename to pkgs/by-name/xm/xmagnify/package.nix
diff --git a/pkgs/tools/X11/xmcp/default.nix b/pkgs/by-name/xm/xmcp/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmcp/default.nix
rename to pkgs/by-name/xm/xmcp/package.nix
diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/by-name/xm/xmedcon/package.nix
similarity index 100%
rename from pkgs/applications/science/medicine/xmedcon/default.nix
rename to pkgs/by-name/xm/xmedcon/package.nix
diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/by-name/xm/xmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmenu/default.nix
rename to pkgs/by-name/xm/xmenu/package.nix
diff --git a/pkgs/applications/misc/xmind/java-env-config-fixes.patch b/pkgs/by-name/xm/xmind/java-env-config-fixes.patch
similarity index 100%
rename from pkgs/applications/misc/xmind/java-env-config-fixes.patch
rename to pkgs/by-name/xm/xmind/java-env-config-fixes.patch
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/by-name/xm/xmind/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmind/default.nix
rename to pkgs/by-name/xm/xmind/package.nix
diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix
new file mode 100644
index 000000000000..e198848d0fa2
--- /dev/null
+++ b/pkgs/by-name/xm/xml-security-c/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  autoreconfHook,
+  pkg-config,
+  xalanc,
+  xercesc,
+  openssl,
+  darwin,
+}:
+
+let
+  inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xml-security-c";
+  version = "3.0.0";
+
+  src = fetchgit {
+    url = "https://git.shibboleth.net/git/cpp-xml-security";
+    rev = finalAttrs.version;
+    hash = "sha256-D60JtD4p9ERh6sowvwBHtE9XWVm3D8saooagDvA6ZtQ=";
+  };
+
+  configureFlags = [
+    "--with-openssl"
+    "--with-xerces"
+    "--with-xalan"
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      xalanc
+      xercesc
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      CoreFoundation
+      CoreServices
+      SystemConfiguration
+    ];
+
+  meta = {
+    homepage = "https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario";
+    description = "C++ Implementation of W3C security standards for XML";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.jagajaga ];
+  };
+})
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/by-name/xm/xml2/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xml2/default.nix
rename to pkgs/by-name/xm/xml2/package.nix
diff --git a/pkgs/tools/misc/xmlbeans/default.nix b/pkgs/by-name/xm/xmlbeans/package.nix
similarity index 100%
rename from pkgs/tools/misc/xmlbeans/default.nix
rename to pkgs/by-name/xm/xmlbeans/package.nix
diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/by-name/xm/xmlformat/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xmlformat/default.nix
rename to pkgs/by-name/xm/xmlformat/package.nix
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/by-name/xm/xmlindent/package.nix
similarity index 100%
rename from pkgs/development/web/xmlindent/default.nix
rename to pkgs/by-name/xm/xmlindent/package.nix
diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/by-name/xm/xmloscopy/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xmloscopy/default.nix
rename to pkgs/by-name/xm/xmloscopy/package.nix
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/by-name/xm/xmlroff/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/xmlroff/default.nix
rename to pkgs/by-name/xm/xmlroff/package.nix
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/by-name/xm/xmlrpc_c/package.nix
similarity index 100%
rename from pkgs/development/libraries/xmlrpc-c/default.nix
rename to pkgs/by-name/xm/xmlrpc_c/package.nix
diff --git a/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch b/pkgs/by-name/xm/xmlsec/lt_dladdsearchdir.patch
similarity index 100%
rename from pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch
rename to pkgs/by-name/xm/xmlsec/lt_dladdsearchdir.patch
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/by-name/xm/xmlsec/package.nix
similarity index 100%
rename from pkgs/development/libraries/xmlsec/default.nix
rename to pkgs/by-name/xm/xmlsec/package.nix
diff --git a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/pkgs/by-name/xm/xmlsec/remove_bsd_base64_decode_flag.patch
similarity index 100%
rename from pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
rename to pkgs/by-name/xm/xmlsec/remove_bsd_base64_decode_flag.patch
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/by-name/xm/xmlstarlet/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xmlstarlet/default.nix
rename to pkgs/by-name/xm/xmlstarlet/package.nix
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/by-name/xm/xmoto/package.nix
similarity index 100%
rename from pkgs/games/xmoto/default.nix
rename to pkgs/by-name/xm/xmoto/package.nix
diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/by-name/xm/xmountains/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xmountains/default.nix
rename to pkgs/by-name/xm/xmountains/package.nix
diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmousepasteblock/default.nix
rename to pkgs/by-name/xm/xmousepasteblock/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/xmppc/default.nix b/pkgs/by-name/xm/xmppc/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/xmppc/default.nix
rename to pkgs/by-name/xm/xmppc/package.nix
diff --git a/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch b/pkgs/by-name/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch
similarity index 100%
rename from pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch
rename to pkgs/by-name/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch
diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/by-name/xn/xnbd/package.nix
similarity index 100%
rename from pkgs/tools/networking/xnbd/default.nix
rename to pkgs/by-name/xn/xnbd/package.nix
diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/by-name/xn/xnec2c/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/xnec2c/default.nix
rename to pkgs/by-name/xn/xnec2c/package.nix
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/by-name/xn/xnee/package.nix
similarity index 100%
rename from pkgs/tools/X11/xnee/default.nix
rename to pkgs/by-name/xn/xnee/package.nix
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/by-name/xn/xneur/package.nix
similarity index 100%
rename from pkgs/applications/misc/xneur/default.nix
rename to pkgs/by-name/xn/xneur/package.nix
diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/by-name/xn/xnotify/package.nix
similarity index 100%
rename from pkgs/tools/X11/xnotify/default.nix
rename to pkgs/by-name/xn/xnotify/package.nix
diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/by-name/xo/xob/package.nix
similarity index 100%
rename from pkgs/tools/X11/xob/default.nix
rename to pkgs/by-name/xo/xob/package.nix
diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 90afc4ddbcbd..ce0533d0200d 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -12,7 +12,7 @@ let
 
   argset = {
     pname = "xonsh";
-    version = "0.18.3";
+    version = "0.18.4";
     pyproject = true;
 
     # PyPI package ships incomplete tests
@@ -20,7 +20,7 @@ let
       owner = "xonsh";
       repo = "xonsh";
       rev = "refs/tags/${argset.version}";
-      hash = "sha256-MJTsYnuFENHLDDMIWcs0IRcBmWs4XyfDWDG7AY2P6cM=";
+      hash = "sha256-L5UwmwwM42E3l+sIBwXgMf/q5r22cUoRbE2cqM09bZA=";
     };
 
     nativeBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/security/xorex/default.nix b/pkgs/by-name/xo/xorex/package.nix
similarity index 100%
rename from pkgs/tools/security/xorex/default.nix
rename to pkgs/by-name/xo/xorex/package.nix
diff --git a/pkgs/development/tools/misc/xorg-autoconf/default.nix b/pkgs/by-name/xo/xorg-autoconf/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xorg-autoconf/default.nix
rename to pkgs/by-name/xo/xorg-autoconf/package.nix
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/by-name/xo/xorg-rgb/package.nix
similarity index 100%
rename from pkgs/data/misc/xorg-rgb/default.nix
rename to pkgs/by-name/xo/xorg-rgb/package.nix
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/by-name/xo/xorg_sys_opengl/builder.sh
similarity index 100%
rename from pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
rename to pkgs/by-name/xo/xorg_sys_opengl/builder.sh
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/by-name/xo/xorg_sys_opengl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/opengl/xorg-sys/default.nix
rename to pkgs/by-name/xo/xorg_sys_opengl/package.nix
diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/by-name/xo/xoscope/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/xoscope/default.nix
rename to pkgs/by-name/xo/xoscope/package.nix
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/by-name/xo/xosd/package.nix
similarity index 100%
rename from pkgs/misc/xosd/default.nix
rename to pkgs/by-name/xo/xosd/package.nix
diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
rename to pkgs/by-name/xo/xow_dongle-firmware/package.nix
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/by-name/xp/xpad/package.nix
similarity index 100%
rename from pkgs/applications/misc/xpad/default.nix
rename to pkgs/by-name/xp/xpad/package.nix
diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix
new file mode 100644
index 000000000000..44a2c8c5c1d8
--- /dev/null
+++ b/pkgs/by-name/xp/xpano/package.nix
@@ -0,0 +1,63 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, ninja
+, opencv
+, SDL2
+, gtk3
+, catch2_3
+, spdlog
+, exiv2
+, wrapGAppsHook3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xpano";
+  version = "0.19.3";
+
+  src = fetchFromGitHub {
+    owner = "krupkat";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    opencv
+    SDL2
+    gtk3
+    spdlog
+    exiv2
+  ];
+
+  checkInputs = [
+    catch2_3
+  ];
+
+  doCheck = true;
+
+  cmakeFlags = [
+    "-DBUILD_TESTING=ON"
+    "-DXPANO_INSTALL_DESKTOP_FILES=ON"
+  ];
+
+  meta = with lib; {
+    description = "Panorama stitching tool";
+    mainProgram = "Xpano";
+    homepage = "https://krupkat.github.io/xpano/";
+    changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ krupkat ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/xp/xpar/package.nix b/pkgs/by-name/xp/xpar/package.nix
new file mode 100644
index 000000000000..0409a1351b70
--- /dev/null
+++ b/pkgs/by-name/xp/xpar/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  nasm,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xpar";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "kspalaiologos";
+    repo = "xpar";
+    rev = finalAttrs.version;
+    hash = "sha256-DMUDWQqYSQjGxYOpcfwNaaM21avcZ1w3IqEhuOaabrw=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm ];
+
+  configureFlags =
+    [
+      "--disable-arch-native"
+      "--enable-lto"
+    ]
+    ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-x86-64"
+    ++ lib.optional stdenv.hostPlatform.isAarch64 "--enable-aarch64";
+
+  meta = {
+    description = "Error/erasure code system guarding data integrity";
+    homepage = "https://github.com/kspalaiologos/xpar";
+    changelog = "https://github.com/kspalaiologos/xpar/blob/${finalAttrs.version}/NEWS";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mrbenjadmin ];
+    platforms = lib.platforms.all;
+    mainProgram = "xpar";
+  };
+})
diff --git a/pkgs/tools/text/xpaste/default.nix b/pkgs/by-name/xp/xpaste/package.nix
similarity index 100%
rename from pkgs/tools/text/xpaste/default.nix
rename to pkgs/by-name/xp/xpaste/package.nix
diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/by-name/xp/xpipe/package.nix
similarity index 100%
rename from pkgs/applications/networking/xpipe/default.nix
rename to pkgs/by-name/xp/xpipe/package.nix
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/by-name/xp/xplanet/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/xplanet/default.nix
rename to pkgs/by-name/xp/xplanet/package.nix
diff --git a/pkgs/applications/file-managers/xplorer/Cargo.lock b/pkgs/by-name/xp/xplorer/Cargo.lock
similarity index 100%
rename from pkgs/applications/file-managers/xplorer/Cargo.lock
rename to pkgs/by-name/xp/xplorer/Cargo.lock
diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/by-name/xp/xplorer/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/xplorer/default.nix
rename to pkgs/by-name/xp/xplorer/package.nix
diff --git a/pkgs/tools/X11/xplugd/default.nix b/pkgs/by-name/xp/xplugd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xplugd/default.nix
rename to pkgs/by-name/xp/xplugd/package.nix
diff --git a/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch b/pkgs/by-name/xp/xprintidle-ng/fix-config_h-includes-should-be-first.patch
similarity index 100%
rename from pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch
rename to pkgs/by-name/xp/xprintidle-ng/fix-config_h-includes-should-be-first.patch
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/by-name/xp/xprintidle-ng/package.nix
similarity index 100%
rename from pkgs/tools/X11/xprintidle-ng/default.nix
rename to pkgs/by-name/xp/xprintidle-ng/package.nix
diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/by-name/xp/xprintidle/package.nix
similarity index 100%
rename from pkgs/tools/X11/xprintidle/default.nix
rename to pkgs/by-name/xp/xprintidle/package.nix
diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/by-name/xp/xprompt/package.nix
similarity index 100%
rename from pkgs/tools/X11/xprompt/default.nix
rename to pkgs/by-name/xp/xprompt/package.nix
diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/by-name/xp/xpwn/package.nix
similarity index 100%
rename from pkgs/development/mobile/xpwn/default.nix
rename to pkgs/by-name/xp/xpwn/package.nix
diff --git a/pkgs/tools/text/xml/xq/default.nix b/pkgs/by-name/xq/xq-xml/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xq/default.nix
rename to pkgs/by-name/xq/xq-xml/package.nix
diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/by-name/xq/xq/package.nix
similarity index 100%
rename from pkgs/tools/misc/xq/default.nix
rename to pkgs/by-name/xq/xq/package.nix
diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/by-name/xq/xqilla/package.nix
similarity index 100%
rename from pkgs/development/tools/xqilla/default.nix
rename to pkgs/by-name/xq/xqilla/package.nix
diff --git a/pkgs/servers/x11/xquartz/10-fontdir.sh b/pkgs/by-name/xq/xquartz/10-fontdir.sh
similarity index 100%
rename from pkgs/servers/x11/xquartz/10-fontdir.sh
rename to pkgs/by-name/xq/xquartz/10-fontdir.sh
diff --git a/pkgs/servers/x11/xquartz/98-user.sh b/pkgs/by-name/xq/xquartz/98-user.sh
similarity index 100%
rename from pkgs/servers/x11/xquartz/98-user.sh
rename to pkgs/by-name/xq/xquartz/98-user.sh
diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/by-name/xq/xquartz/font_cache
similarity index 100%
rename from pkgs/servers/x11/xquartz/font_cache
rename to pkgs/by-name/xq/xquartz/font_cache
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist b/pkgs/by-name/xq/xquartz/org.nixos.xquartz.privileged_startx.plist
similarity index 100%
rename from pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
rename to pkgs/by-name/xq/xquartz/org.nixos.xquartz.privileged_startx.plist
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist b/pkgs/by-name/xq/xquartz/org.nixos.xquartz.startx.plist
similarity index 100%
rename from pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
rename to pkgs/by-name/xq/xquartz/org.nixos.xquartz.startx.plist
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/by-name/xq/xquartz/package.nix
similarity index 100%
rename from pkgs/servers/x11/xquartz/default.nix
rename to pkgs/by-name/xq/xquartz/package.nix
diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/pkgs/by-name/xq/xquartz/system-fonts.nix
similarity index 100%
rename from pkgs/servers/x11/xquartz/system-fonts.nix
rename to pkgs/by-name/xq/xquartz/system-fonts.nix
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
similarity index 100%
rename from pkgs/applications/misc/xrandr-invert-colors/default.nix
rename to pkgs/by-name/xr/xrandr-invert-colors/package.nix
diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/by-name/xr/xray/package.nix
similarity index 100%
rename from pkgs/tools/networking/xray/default.nix
rename to pkgs/by-name/xr/xray/package.nix
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/by-name/xr/xrectsel/package.nix
similarity index 100%
rename from pkgs/tools/X11/xrectsel/default.nix
rename to pkgs/by-name/xr/xrectsel/package.nix
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/by-name/xr/xrestop/package.nix
similarity index 100%
rename from pkgs/tools/X11/xrestop/default.nix
rename to pkgs/by-name/xr/xrestop/package.nix
diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix
index 82a801a54be0..96737ae7972e 100644
--- a/pkgs/by-name/xr/xrgears/package.nix
+++ b/pkgs/by-name/xr/xrgears/package.nix
@@ -65,9 +65,6 @@ stdenv.mkDerivation {
     mainProgram = "xrgears";
     platforms = platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [
-      expipiplus1
-      Scrumplex
-    ];
+    maintainers = with maintainers; [ Scrumplex ];
   };
 }
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/by-name/xr/xrq/package.nix
similarity index 100%
rename from pkgs/applications/misc/xrq/default.nix
rename to pkgs/by-name/xr/xrq/package.nix
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/by-name/xs/xscast/package.nix
similarity index 100%
rename from pkgs/applications/video/xscast/default.nix
rename to pkgs/by-name/xs/xscast/package.nix
diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/by-name/xs/xscope/package.nix
similarity index 100%
rename from pkgs/applications/misc/xscope/default.nix
rename to pkgs/by-name/xs/xscope/package.nix
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/by-name/xs/xsecurelock/package.nix
similarity index 100%
rename from pkgs/tools/X11/xsecurelock/default.nix
rename to pkgs/by-name/xs/xsecurelock/package.nix
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/by-name/xs/xsel/package.nix
similarity index 100%
rename from pkgs/tools/misc/xsel/default.nix
rename to pkgs/by-name/xs/xsel/package.nix
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/by-name/xs/xsensors/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xsensors/default.nix
rename to pkgs/by-name/xs/xsensors/package.nix
diff --git a/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch b/pkgs/by-name/xs/xsensors/remove-unused-variables.patch
similarity index 100%
rename from pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
rename to pkgs/by-name/xs/xsensors/remove-unused-variables.patch
diff --git a/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch b/pkgs/by-name/xs/xsensors/replace-deprecated-gtk.patch
similarity index 100%
rename from pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
rename to pkgs/by-name/xs/xsensors/replace-deprecated-gtk.patch
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/by-name/xs/xsettingsd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xsettingsd/default.nix
rename to pkgs/by-name/xs/xsettingsd/package.nix
diff --git a/pkgs/games/xskat/default.nix b/pkgs/by-name/xs/xskat/package.nix
similarity index 100%
rename from pkgs/games/xskat/default.nix
rename to pkgs/by-name/xs/xskat/package.nix
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/by-name/xs/xsnow/package.nix
similarity index 100%
rename from pkgs/games/xsnow/default.nix
rename to pkgs/by-name/xs/xsnow/package.nix
diff --git a/pkgs/games/xsok/default.nix b/pkgs/by-name/xs/xsok/package.nix
similarity index 100%
rename from pkgs/games/xsok/default.nix
rename to pkgs/by-name/xs/xsok/package.nix
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/by-name/xs/xsokoban/package.nix
similarity index 100%
rename from pkgs/games/xsokoban/default.nix
rename to pkgs/by-name/xs/xsokoban/package.nix
diff --git a/pkgs/os-specific/linux/xsos/default.nix b/pkgs/by-name/xs/xsos/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xsos/default.nix
rename to pkgs/by-name/xs/xsos/package.nix
diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/by-name/xs/xspim/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xspim/default.nix
rename to pkgs/by-name/xs/xspim/package.nix
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/by-name/xs/xss-lock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xss-lock/default.nix
rename to pkgs/by-name/xs/xss-lock/package.nix
diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/by-name/xs/xssproxy/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xssproxy/default.nix
rename to pkgs/by-name/xs/xssproxy/package.nix
diff --git a/pkgs/tools/X11/xssstate/default.nix b/pkgs/by-name/xs/xssstate/package.nix
similarity index 100%
rename from pkgs/tools/X11/xssstate/default.nix
rename to pkgs/by-name/xs/xssstate/package.nix
diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/by-name/xs/xstow/package.nix
similarity index 100%
rename from pkgs/tools/misc/xstow/default.nix
rename to pkgs/by-name/xs/xstow/package.nix
diff --git a/pkgs/tools/security/xsubfind3r/default.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
similarity index 100%
rename from pkgs/tools/security/xsubfind3r/default.nix
rename to pkgs/by-name/xs/xsubfind3r/package.nix
diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/by-name/xs/xsuspender/package.nix
similarity index 100%
rename from pkgs/applications/misc/xsuspender/default.nix
rename to pkgs/by-name/xs/xsuspender/package.nix
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/by-name/xs/xsynth_dssi/package.nix
similarity index 100%
rename from pkgs/applications/audio/xsynth-dssi/default.nix
rename to pkgs/by-name/xs/xsynth_dssi/package.nix
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/by-name/xt/xteddy/package.nix
similarity index 100%
rename from pkgs/applications/misc/xteddy/default.nix
rename to pkgs/by-name/xt/xteddy/package.nix
diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/by-name/xt/xtensor/package.nix
similarity index 100%
rename from pkgs/development/libraries/xtensor/default.nix
rename to pkgs/by-name/xt/xtensor/package.nix
diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/by-name/xt/xterm/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/xterm/default.nix
rename to pkgs/by-name/xt/xterm/package.nix
diff --git a/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch b/pkgs/by-name/xt/xterm/sixel-256.support.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
rename to pkgs/by-name/xt/xterm/sixel-256.support.patch
diff --git a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/pkgs/by-name/xt/xtermcontrol/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/xtermcontrol/default.nix
rename to pkgs/by-name/xt/xtermcontrol/package.nix
diff --git a/pkgs/servers/xteve/default.nix b/pkgs/by-name/xt/xteve/package.nix
similarity index 100%
rename from pkgs/servers/xteve/default.nix
rename to pkgs/by-name/xt/xteve/package.nix
diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/by-name/xt/xtitle/package.nix
similarity index 100%
rename from pkgs/tools/misc/xtitle/default.nix
rename to pkgs/by-name/xt/xtitle/package.nix
diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/by-name/xt/xtl/package.nix
similarity index 100%
rename from pkgs/development/libraries/xtl/default.nix
rename to pkgs/by-name/xt/xtl/package.nix
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/by-name/xt/xtrace/package.nix
similarity index 100%
rename from pkgs/tools/X11/xtrace/default.nix
rename to pkgs/by-name/xt/xtrace/package.nix
diff --git a/pkgs/games/xtris/default.nix b/pkgs/by-name/xt/xtris/package.nix
similarity index 100%
rename from pkgs/games/xtris/default.nix
rename to pkgs/by-name/xt/xtris/package.nix
diff --git a/pkgs/by-name/xt/xtrlock-pam/package.nix b/pkgs/by-name/xt/xtrlock-pam/package.nix
new file mode 100644
index 000000000000..7c3bba246cb7
--- /dev/null
+++ b/pkgs/by-name/xt/xtrlock-pam/package.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, python39, pkg-config, pam, xorg }:
+
+stdenv.mkDerivation {
+  pname = "xtrlock-pam";
+  version = "3.4-post-20150909";
+
+  src = fetchFromGitHub {
+    owner = "aanatoly";
+    repo = "xtrlock-pam";
+    rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
+    sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ python39 pam xorg.libX11 ];
+
+  configurePhase = ''
+    substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h
+    substituteInPlace src/xtrlock.c --replace system-local-login xscreensaver
+    python configure --prefix=$out
+  '';
+
+  meta = {
+    homepage = "https://github.com/aanatoly/xtrlock-pam";
+    description = "PAM based X11 screen locker";
+    license = "unknown";
+    maintainers = with lib.maintainers; [ ondt ];
+    platforms = with lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/by-name/xt/xtruss/package.nix
similarity index 100%
rename from pkgs/tools/X11/xtruss/default.nix
rename to pkgs/by-name/xt/xtruss/package.nix
diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/by-name/xt/xtuner/package.nix
similarity index 100%
rename from pkgs/applications/audio/xtuner/default.nix
rename to pkgs/by-name/xt/xtuner/package.nix
diff --git a/pkgs/by-name/xu/xurls/package.nix b/pkgs/by-name/xu/xurls/package.nix
new file mode 100644
index 000000000000..b507226e60d6
--- /dev/null
+++ b/pkgs/by-name/xu/xurls/package.nix
@@ -0,0 +1,31 @@
+{
+  buildGoModule,
+  lib,
+  fetchFromGitHub,
+}:
+
+buildGoModule {
+  pname = "xurls";
+  version = "2.5.0-unstable-2024-11-03";
+
+  src = fetchFromGitHub {
+    owner = "mvdan";
+    repo = "xurls";
+    rev = "7c973a26c7bd6ecd8d86bb435d93ff98df2710fa";
+    sha256 = "sha256-jZmlM9rs+N0ks7msmb3eJ96aTYp0qUo/1bgLAgHnvSo=";
+  };
+
+  vendorHash = "sha256-W6Z1E6a+qBdOuyHoiT6YA+CAJHBJ0FTYH8AntiKvVBY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = with lib; {
+    description = "Extract urls from text";
+    homepage = "https://github.com/mvdan/xurls";
+    maintainers = with maintainers; [ koral ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/by-name/xv/xv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xv/default.nix
rename to pkgs/by-name/xv/xv/package.nix
diff --git a/pkgs/tools/virtualization/xva-img/default.nix b/pkgs/by-name/xv/xva-img/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/xva-img/default.nix
rename to pkgs/by-name/xv/xva-img/package.nix
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/by-name/xv/xvidcore/package.nix
similarity index 100%
rename from pkgs/development/libraries/xvidcore/default.nix
rename to pkgs/by-name/xv/xvidcore/package.nix
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/by-name/xv/xvkbd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xvkbd/default.nix
rename to pkgs/by-name/xv/xvkbd/package.nix
diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/by-name/xw/xwallpaper/package.nix
similarity index 100%
rename from pkgs/tools/X11/xwallpaper/default.nix
rename to pkgs/by-name/xw/xwallpaper/package.nix
diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index 19194ffabd85..c39830d8bf73 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -3,23 +3,23 @@
   fetchFromGitHub,
   libxcb,
   makeBinaryWrapper,
+  nix-update-script,
   pkg-config,
   rustPlatform,
-  unstableGitUpdater,
   xcb-util-cursor,
   xwayland,
   withSystemd ? true,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "xwayland-satellite";
-  version = "0.4-unstable-2024-09-15";
+  version = "0.5";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xwayland-satellite";
-    rev = "b962a0f33b503aa39c9cf6919f488b664e5b79b4";
-    hash = "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=";
   };
 
   postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
       --replace-fail '/usr/local/bin' "$out/bin"
   '';
 
-  cargoHash = "sha256-1EtwGMoLfYK0VZj8jdQiweO/RHGBzyEoeMEI4pmqfu8=";
+  cargoHash = "sha256-KnkU+uLToD0cBNgPnRiR34XHIphQWoATjim1E/MVf48=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
       --prefix PATH : "${lib.makeBinPath [ xwayland ]}"
   '';
 
-  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Xwayland outside your Wayland compositor";
@@ -63,6 +63,7 @@ rustPlatform.buildRustPackage {
       Grants rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base.
     '';
     homepage = "https://github.com/Supreeeme/xwayland-satellite";
+    changelog = "https://github.com/Supreeeme/xwayland-satellite/releases/tag/v${version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       if-loop69420
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
similarity index 100%
rename from pkgs/tools/X11/xwinmosaic/default.nix
rename to pkgs/by-name/xw/xwinmosaic/package.nix
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/by-name/xw/xwinwrap/package.nix
similarity index 100%
rename from pkgs/tools/X11/xwinwrap/default.nix
rename to pkgs/by-name/xw/xwinwrap/package.nix
diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/by-name/xx/xxHash/package.nix
similarity index 100%
rename from pkgs/development/libraries/xxHash/default.nix
rename to pkgs/by-name/xx/xxHash/package.nix
diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/by-name/xx/xxgdb/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xxgdb/default.nix
rename to pkgs/by-name/xx/xxgdb/package.nix
diff --git a/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch b/pkgs/by-name/xx/xxgdb/xxgdb-pty.patch
similarity index 100%
rename from pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch
rename to pkgs/by-name/xx/xxgdb/xxgdb-pty.patch
diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/by-name/xx/xxh/package.nix
similarity index 100%
rename from pkgs/tools/networking/xxh/default.nix
rename to pkgs/by-name/xx/xxh/package.nix
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/by-name/xx/xxkb/package.nix
similarity index 100%
rename from pkgs/applications/misc/xxkb/default.nix
rename to pkgs/by-name/xx/xxkb/package.nix
diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/by-name/xx/xxv/package.nix
similarity index 100%
rename from pkgs/tools/misc/xxv/default.nix
rename to pkgs/by-name/xx/xxv/package.nix
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/by-name/xy/xylib/package.nix
similarity index 100%
rename from pkgs/development/libraries/xylib/default.nix
rename to pkgs/by-name/xy/xylib/package.nix
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/by-name/xz/xzgv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xzgv/default.nix
rename to pkgs/by-name/xz/xzgv/package.nix
diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/by-name/xz/xzoom/package.nix
similarity index 100%
rename from pkgs/tools/X11/xzoom/default.nix
rename to pkgs/by-name/xz/xzoom/package.nix
diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index 53834f3cd739..451fd71fff88 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -1,55 +1,33 @@
 {
   lib,
   stdenv,
-  overrideSDK,
   fetchFromGitHub,
   fetchzip,
-  installShellFiles,
-  testers,
-  writeShellScript,
+  apple-sdk_15,
   common-updater-scripts,
   curl,
-  darwin,
+  installShellFiles,
   jq,
-  xcodebuild,
+  versionCheckHook,
+  writeShellScript,
   xxd,
-  yabai,
 }:
-let
-  inherit (darwin.apple_sdk_11_0.frameworks)
-    Carbon
-    Cocoa
-    ScriptingBridge
-    SkyLight
-    ;
-
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yabai";
-  version = "7.1.4";
+  version = "7.1.5";
 
   src =
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
       or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  env = {
-    # silence service.h error
-    NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
-  };
-
   nativeBuildInputs =
     [ installShellFiles ]
     ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      xcodebuild
       xxd
     ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isx86_64 [
-    Carbon
-    Cocoa
-    ScriptingBridge
-    SkyLight
+    apple-sdk_15
   ];
 
   dontConfigure = true;
@@ -74,35 +52,27 @@ stdenv'.mkDerivation (finalAttrs: {
         # aarch64 code is compiled on all targets, which causes our Apple SDK headers to error out.
         # Since multilib doesn't work on darwin i dont know of a better way of handling this.
         substituteInPlace makefile \
-        --replace "-arch arm64e" "" \
-        --replace "-arch arm64" "" \
-        --replace "clang" "${stdenv.cc.targetPrefix}clang"
-
-        # `NSScreen::safeAreaInsets` is only available on macOS 12.0 and above, which frameworks aren't packaged.
-        # When a lower OS version is detected upstream just returns 0, so we can hardcode that at compile time.
-        # https://github.com/koekeishiya/yabai/blob/v4.0.2/src/workspace.m#L109
-        substituteInPlace src/workspace.m \
-        --replace 'return screen.safeAreaInsets.top;' 'return 0;'
+        --replace-fail "-arch arm64e" "" \
+        --replace-fail "-arch arm64" ""
       '';
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = yabai;
-      version = "yabai-v${finalAttrs.version}";
-    };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
+  passthru = {
     sources = {
       # Unfortunately compiling yabai from source on aarch64-darwin is a bit complicated. We use the precompiled binary instead for now.
       # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
       "aarch64-darwin" = fetchzip {
         url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
-        hash = "sha256-DAHZwEhPIBIfR2V+jTKje1msB8OMKzwGYgYnDql8zb0=";
+        hash = "sha256-o+9Z3Kxo1ff1TZPmmE6ptdOSsruQzxZm59bdYvhRo3c=";
       };
       "x86_64-darwin" = fetchFromGitHub {
         owner = "koekeishiya";
         repo = "yabai";
         rev = "v${finalAttrs.version}";
-        hash = "sha256-i/UqmBNTLBYY4ORI1Y7FWr+LZK0f/qMdWLPPuTb9+2w=";
+        hash = "sha256-6HBWJvjVWagtHrfjWaYSRcnQOuwTBVeVxo3wc+jSlyE=";
       };
     };
 
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/by-name/ya/yad/package.nix
similarity index 100%
rename from pkgs/tools/misc/yad/default.nix
rename to pkgs/by-name/ya/yad/package.nix
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/by-name/ya/yadm/package.nix
similarity index 100%
rename from pkgs/applications/version-management/yadm/default.nix
rename to pkgs/by-name/ya/yadm/package.nix
diff --git a/pkgs/development/interpreters/yaegi/default.nix b/pkgs/by-name/ya/yaegi/package.nix
similarity index 100%
rename from pkgs/development/interpreters/yaegi/default.nix
rename to pkgs/by-name/ya/yaegi/package.nix
diff --git a/pkgs/by-name/ya/yafc-ce/deps.nix b/pkgs/by-name/ya/yafc-ce/deps.nix
new file mode 100644
index 000000000000..529913f5a3be
--- /dev/null
+++ b/pkgs/by-name/ya/yafc-ce/deps.nix
@@ -0,0 +1,696 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }:
+[
+  (fetchNuGet {
+    pname = "Google.OrTools";
+    version = "9.10.4067";
+    hash = "sha256-3iWcH1uKVOxrD6bL27TMVVNj5JX1fjdZ89d3Ddy8Fg0=";
+  })
+  (fetchNuGet {
+    pname = "Google.OrTools.runtime.linux-arm64";
+    version = "9.10.4067";
+    hash = "sha256-6OE7+DFbLUqBKmw1t2wli//Y+EAy6o67jFtW2lhS0Hw=";
+  })
+  (fetchNuGet {
+    pname = "Google.OrTools.runtime.linux-x64";
+    version = "9.10.4067";
+    hash = "sha256-vd5XqXkOlO8nik5od56x4tncUVJmqamU0CC2DVbEEvY=";
+  })
+  (fetchNuGet {
+    pname = "Google.OrTools.runtime.osx-arm64";
+    version = "9.10.4067";
+    hash = "sha256-2eJVMi51PVat/CrQiW5BailiJQsvKk+ivpAu46S4lHE=";
+  })
+  (fetchNuGet {
+    pname = "Google.OrTools.runtime.osx-x64";
+    version = "9.10.4067";
+    hash = "sha256-3o0Feg/t70gUmH5lAZzt+dClJkjzuz1e2Q/m8kjAhUo=";
+  })
+  (fetchNuGet {
+    pname = "Google.OrTools.runtime.win-x64";
+    version = "9.10.4067";
+    hash = "sha256-7uLHbUEHu9BsC14FXikiApnruLZnMavyFPD+jSAU3XY=";
+  })
+  (fetchNuGet {
+    pname = "Google.Protobuf";
+    version = "3.26.1";
+    hash = "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
+    version = "8.0.10";
+    hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
+    version = "8.0.10";
+    hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.CodeCoverage";
+    version = "17.4.0";
+    hash = "sha256-YDALPHtbD+zMN+Llm0aKSG1rp5adKZl7R14h8vdLlZ4=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NET.Test.Sdk";
+    version = "17.4.0";
+    hash = "sha256-jXKJwOZBy4NJtWwPRjw5wLmNGJD6Wr+YYCokIOIXONA=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.osx-arm64";
+    version = "8.0.10";
+    hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.osx-x64";
+    version = "8.0.10";
+    hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
+    version = "8.0.10";
+    hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.osx-x64";
+    version = "8.0.10";
+    hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Platforms";
+    version = "1.1.0";
+    hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Targets";
+    version = "1.1.0";
+    hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.TestPlatform.ObjectModel";
+    version = "17.4.0";
+    hash = "sha256-SyCFW5vyzm4/YSKogIhmYYUvWdS2pPRur17JMxMOiDY=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.TestPlatform.TestHost";
+    version = "17.4.0";
+    hash = "sha256-xPsmpE7pSfZonzvtMaJtVMCeszBqUPGzTWWSYpt65sY=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Win32.Primitives";
+    version = "4.3.0";
+    hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=";
+  })
+  (fetchNuGet {
+    pname = "NETStandard.Library";
+    version = "1.6.1";
+    hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=";
+  })
+  (fetchNuGet {
+    pname = "Newtonsoft.Json";
+    version = "13.0.1";
+    hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=";
+  })
+  (fetchNuGet {
+    pname = "Newtonsoft.Json";
+    version = "13.0.3";
+    hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Frameworks";
+    version = "5.11.0";
+    hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Collections";
+    version = "4.3.0";
+    hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Diagnostics.Tools";
+    version = "4.3.0";
+    hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Diagnostics.Tracing";
+    version = "4.3.0";
+    hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Globalization";
+    version = "4.3.0";
+    hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Globalization.Calendars";
+    version = "4.3.0";
+    hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.IO";
+    version = "4.3.0";
+    hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Reflection";
+    version = "4.3.0";
+    hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Reflection.Extensions";
+    version = "4.3.0";
+    hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Reflection.Primitives";
+    version = "4.3.0";
+    hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Resources.ResourceManager";
+    version = "4.3.0";
+    hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Runtime";
+    version = "4.3.0";
+    hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Runtime.Handles";
+    version = "4.3.0";
+    hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Runtime.InteropServices";
+    version = "4.3.0";
+    hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Text.Encoding";
+    version = "4.3.0";
+    hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Text.Encoding.Extensions";
+    version = "4.3.0";
+    hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Threading.Tasks";
+    version = "4.3.0";
+    hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Threading.Timer";
+    version = "4.3.0";
+    hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=";
+  })
+  (fetchNuGet {
+    pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=";
+  })
+  (fetchNuGet {
+    pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=";
+  })
+  (fetchNuGet {
+    pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System";
+    version = "4.3.0";
+    hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System.IO.Compression";
+    version = "4.3.0";
+    hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System.Net.Http";
+    version = "4.3.0";
+    hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System.Security.Cryptography.Apple";
+    version = "4.3.0";
+    hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=";
+  })
+  (fetchNuGet {
+    pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=";
+  })
+  (fetchNuGet {
+    pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple";
+    version = "4.3.0";
+    hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=";
+  })
+  (fetchNuGet {
+    pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=";
+  })
+  (fetchNuGet {
+    pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=";
+  })
+  (fetchNuGet {
+    pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=";
+  })
+  (fetchNuGet {
+    pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.Microsoft.Win32.Primitives";
+    version = "4.3.0";
+    hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Console";
+    version = "4.3.0";
+    hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Diagnostics.Debug";
+    version = "4.3.0";
+    hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.IO.FileSystem";
+    version = "4.3.0";
+    hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Net.Primitives";
+    version = "4.3.0";
+    hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Net.Sockets";
+    version = "4.3.0";
+    hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Private.Uri";
+    version = "4.3.0";
+    hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Runtime.Extensions";
+    version = "4.3.0";
+    hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=";
+  })
+  (fetchNuGet {
+    pname = "SDL2-CS.NetCore";
+    version = "2.0.8";
+    hash = "sha256-8uz6Y2G9fLQkjs+7t7QPdUJFXs9bKAYeoGP+174OE/k=";
+  })
+  (fetchNuGet {
+    pname = "Serilog";
+    version = "4.0.0";
+    hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw=";
+  })
+  (fetchNuGet {
+    pname = "Serilog.Enrichers.Thread";
+    version = "4.0.0";
+    hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8=";
+  })
+  (fetchNuGet {
+    pname = "Serilog.Sinks.Console";
+    version = "6.0.0";
+    hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=";
+  })
+  (fetchNuGet {
+    pname = "Serilog.Sinks.File";
+    version = "6.0.0";
+    hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=";
+  })
+  (fetchNuGet {
+    pname = "System.AppContext";
+    version = "4.3.0";
+    hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=";
+  })
+  (fetchNuGet {
+    pname = "System.Buffers";
+    version = "4.3.0";
+    hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=";
+  })
+  (fetchNuGet {
+    pname = "System.Collections";
+    version = "4.3.0";
+    hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=";
+  })
+  (fetchNuGet {
+    pname = "System.Collections.Concurrent";
+    version = "4.3.0";
+    hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=";
+  })
+  (fetchNuGet {
+    pname = "System.Console";
+    version = "4.3.0";
+    hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=";
+  })
+  (fetchNuGet {
+    pname = "System.Diagnostics.Debug";
+    version = "4.3.0";
+    hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=";
+  })
+  (fetchNuGet {
+    pname = "System.Diagnostics.DiagnosticSource";
+    version = "4.3.0";
+    hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=";
+  })
+  (fetchNuGet {
+    pname = "System.Diagnostics.Tools";
+    version = "4.3.0";
+    hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=";
+  })
+  (fetchNuGet {
+    pname = "System.Diagnostics.Tracing";
+    version = "4.3.0";
+    hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=";
+  })
+  (fetchNuGet {
+    pname = "System.Globalization";
+    version = "4.3.0";
+    hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=";
+  })
+  (fetchNuGet {
+    pname = "System.Globalization.Calendars";
+    version = "4.3.0";
+    hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=";
+  })
+  (fetchNuGet {
+    pname = "System.Globalization.Extensions";
+    version = "4.3.0";
+    hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=";
+  })
+  (fetchNuGet {
+    pname = "System.IO";
+    version = "4.3.0";
+    hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.Compression";
+    version = "4.3.0";
+    hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.Compression.ZipFile";
+    version = "4.3.0";
+    hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.FileSystem";
+    version = "4.3.0";
+    hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.FileSystem.Primitives";
+    version = "4.3.0";
+    hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=";
+  })
+  (fetchNuGet {
+    pname = "System.Linq";
+    version = "4.3.0";
+    hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=";
+  })
+  (fetchNuGet {
+    pname = "System.Linq.Expressions";
+    version = "4.3.0";
+    hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=";
+  })
+  (fetchNuGet {
+    pname = "System.Net.Http";
+    version = "4.3.0";
+    hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=";
+  })
+  (fetchNuGet {
+    pname = "System.Net.NameResolution";
+    version = "4.3.0";
+    hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=";
+  })
+  (fetchNuGet {
+    pname = "System.Net.Primitives";
+    version = "4.3.0";
+    hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=";
+  })
+  (fetchNuGet {
+    pname = "System.Net.Sockets";
+    version = "4.3.0";
+    hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=";
+  })
+  (fetchNuGet {
+    pname = "System.ObjectModel";
+    version = "4.3.0";
+    hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=";
+  })
+  (fetchNuGet {
+    pname = "System.Private.Uri";
+    version = "4.3.0";
+    hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection";
+    version = "4.3.0";
+    hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Emit";
+    version = "4.3.0";
+    hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Emit.ILGeneration";
+    version = "4.3.0";
+    hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Emit.Lightweight";
+    version = "4.3.0";
+    hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Extensions";
+    version = "4.3.0";
+    hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Metadata";
+    version = "1.6.0";
+    hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Primitives";
+    version = "4.3.0";
+    hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.TypeExtensions";
+    version = "4.3.0";
+    hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=";
+  })
+  (fetchNuGet {
+    pname = "System.Resources.ResourceManager";
+    version = "4.3.0";
+    hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime";
+    version = "4.3.0";
+    hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.Extensions";
+    version = "4.3.0";
+    hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.Handles";
+    version = "4.3.0";
+    hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.InteropServices";
+    version = "4.3.0";
+    hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.InteropServices.RuntimeInformation";
+    version = "4.3.0";
+    hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.Numerics";
+    version = "4.3.0";
+    hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Claims";
+    version = "4.3.0";
+    hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.Algorithms";
+    version = "4.3.0";
+    hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.Cng";
+    version = "4.3.0";
+    hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.Csp";
+    version = "4.3.0";
+    hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.Encoding";
+    version = "4.3.0";
+    hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.OpenSsl";
+    version = "4.3.0";
+    hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.Primitives";
+    version = "4.3.0";
+    hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.X509Certificates";
+    version = "4.3.0";
+    hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Principal";
+    version = "4.3.0";
+    hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Principal.Windows";
+    version = "4.3.0";
+    hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.Encoding";
+    version = "4.3.0";
+    hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.Encoding.Extensions";
+    version = "4.3.0";
+    hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.RegularExpressions";
+    version = "4.3.0";
+    hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=";
+  })
+  (fetchNuGet {
+    pname = "System.Threading";
+    version = "4.3.0";
+    hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=";
+  })
+  (fetchNuGet {
+    pname = "System.Threading.Tasks";
+    version = "4.3.0";
+    hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=";
+  })
+  (fetchNuGet {
+    pname = "System.Threading.Tasks.Extensions";
+    version = "4.3.0";
+    hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=";
+  })
+  (fetchNuGet {
+    pname = "System.Threading.ThreadPool";
+    version = "4.3.0";
+    hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=";
+  })
+  (fetchNuGet {
+    pname = "System.Threading.Timer";
+    version = "4.3.0";
+    hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=";
+  })
+  (fetchNuGet {
+    pname = "System.Xml.ReaderWriter";
+    version = "4.3.0";
+    hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=";
+  })
+  (fetchNuGet {
+    pname = "System.Xml.XDocument";
+    version = "4.3.0";
+    hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=";
+  })
+  (fetchNuGet {
+    pname = "xunit";
+    version = "2.4.2";
+    hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0=";
+  })
+  (fetchNuGet {
+    pname = "xunit.abstractions";
+    version = "2.0.3";
+    hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=";
+  })
+  (fetchNuGet {
+    pname = "xunit.analyzers";
+    version = "1.0.0";
+    hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw=";
+  })
+  (fetchNuGet {
+    pname = "xunit.assert";
+    version = "2.4.2";
+    hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU=";
+  })
+  (fetchNuGet {
+    pname = "xunit.core";
+    version = "2.4.2";
+    hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc=";
+  })
+  (fetchNuGet {
+    pname = "xunit.extensibility.core";
+    version = "2.4.2";
+    hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA=";
+  })
+  (fetchNuGet {
+    pname = "xunit.extensibility.execution";
+    version = "2.4.2";
+    hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U=";
+  })
+  (fetchNuGet {
+    pname = "xunit.runner.visualstudio";
+    version = "2.4.5";
+    hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk=";
+  })
+]
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
new file mode 100644
index 000000000000..7a76a6ceccb3
--- /dev/null
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -0,0 +1,58 @@
+{
+  buildDotnetModule,
+  lib,
+  fetchFromGitHub,
+  dotnetCorePackages,
+  SDL2,
+  SDL2_image,
+  SDL2_ttf,
+}:
+let
+  dotnet = dotnetCorePackages.dotnet_8;
+in
+buildDotnetModule (finalAttrs: {
+  pname = "yafc-ce";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "shpaass";
+    repo = "yafc-ce";
+    rev = finalAttrs.version;
+    hash = "sha256-dh+lnilwQSrbZNcRGpEXybsNYxkihZUp5t8co06ZXYE=";
+  };
+
+  projectFile = [ "Yafc/Yafc.csproj" ];
+  testProjectFile = [ "Yafc.Model.Tests/Yafc.Model.Tests.csproj" ];
+  nugetDeps = ./deps.nix;
+
+  dotnet-sdk = dotnet.sdk;
+  dotnet-runtime = dotnet.runtime;
+
+  executables = [ "Yafc" ];
+
+  runtimeDeps = [
+    SDL2
+    SDL2_ttf
+    SDL2_image
+  ];
+
+  meta = {
+    description = "Powerful Factorio calculator/analyser that works with mods, Community Edition";
+    longDescription = ''
+      Yet Another Factorio Calculator or YAFC is a planner and analyzer.
+      The main goal of YAFC is to help with heavily modded Factorio games.
+
+      YAFC Community Edition is an updated and actively-maintained version of the original YAFC.
+    '';
+    homepage = "https://github.com/shpaass/yafc-ce";
+    downloadPage = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
+      diamond-deluxe
+      TheColorman
+    ];
+    platforms = with lib.platforms; x86_64 ++ darwin;
+    mainProgram = "Yafc";
+  };
+})
diff --git a/pkgs/by-name/ya/yaffshiv/package.nix b/pkgs/by-name/ya/yaffshiv/package.nix
new file mode 100644
index 000000000000..2b319ad44d0a
--- /dev/null
+++ b/pkgs/by-name/ya/yaffshiv/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  python3,
+}:
+
+stdenv.mkDerivation {
+  pname = "yaffshiv";
+  version = "0-unstable-2024-08-30";
+
+  src = fetchFromGitHub {
+    owner = "devttys0";
+    repo = "yaffshiv";
+    rev = "f6f0ef77bf79ca46aaa77bc34eda06e7b55da8e8";
+    sha256 = "sha256-C43UzkaPKheexvVcKi/Krcik+arPXggWAYMSi9RY5eo=";
+  };
+
+  buildInputs = [ python3 ];
+
+  installPhase = ''
+    install -D -m755 src/yaffshiv $out/bin/yaffshiv
+  '';
+
+  meta = {
+    description = "Simple YAFFS file system parser and extractor";
+    homepage = "https://github.com/devttys0/yaffshiv";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sgo ];
+    mainProgram = "yaffshiv";
+  };
+}
diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/by-name/ya/yaft/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/yaft/default.nix
rename to pkgs/by-name/ya/yaft/package.nix
diff --git a/pkgs/tools/misc/yai/default.nix b/pkgs/by-name/ya/yai/package.nix
similarity index 100%
rename from pkgs/tools/misc/yai/default.nix
rename to pkgs/by-name/ya/yai/package.nix
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/by-name/ya/yajl/package.nix
similarity index 100%
rename from pkgs/development/libraries/yajl/default.nix
rename to pkgs/by-name/ya/yajl/package.nix
diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/by-name/ya/yajsv/package.nix
similarity index 100%
rename from pkgs/tools/misc/yajsv/default.nix
rename to pkgs/by-name/ya/yajsv/package.nix
diff --git a/pkgs/by-name/ya/yalc/package.nix b/pkgs/by-name/ya/yalc/package.nix
new file mode 100644
index 000000000000..5e9fe9c5fbfd
--- /dev/null
+++ b/pkgs/by-name/ya/yalc/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  nodejs,
+  yarnBuildHook,
+  yarnConfigHook,
+  yarnInstallHook,
+  unstableGitUpdater,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "yalc";
+  version = "0-unstable-2023-07-04";
+
+  src = fetchFromGitHub {
+    owner = "wclr";
+    repo = "yalc";
+    # Upstream has no tagged versions
+    rev = "3b834e488837e87df47414fd9917c10f07f0df08";
+    hash = "sha256-v8OhLVuRhnyN2PrslgVVS0r56wGhYYmjoz3ZUZ95xBc=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-+w3azJEnRx4v3nJ3rhpLWt6CjOFhMMmr1UL5hg2ZR48=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Work with yarn/npm packages locally like a boss";
+    mainProgram = "yalc";
+    homepage = "https://github.com/wclr/yalc";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/by-name/ya/yallback/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/yallback/default.nix
rename to pkgs/by-name/ya/yallback/package.nix
diff --git a/pkgs/applications/misc/yambar-hyprland-wses/default.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
similarity index 100%
rename from pkgs/applications/misc/yambar-hyprland-wses/default.nix
rename to pkgs/by-name/ya/yambar-hyprland-wses/package.nix
diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/by-name/ya/yamdi/package.nix
similarity index 100%
rename from pkgs/tools/video/yamdi/default.nix
rename to pkgs/by-name/ya/yamdi/package.nix
diff --git a/pkgs/development/tools/language-servers/yaml-language-server/package.json b/pkgs/by-name/ya/yaml-language-server/package.json
similarity index 100%
rename from pkgs/development/tools/language-servers/yaml-language-server/package.json
rename to pkgs/by-name/ya/yaml-language-server/package.json
diff --git a/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/yaml-language-server/default.nix
rename to pkgs/by-name/ya/yaml-language-server/package.nix
diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/by-name/ya/yaml-merge/package.nix
similarity index 100%
rename from pkgs/tools/text/yaml-merge/default.nix
rename to pkgs/by-name/ya/yaml-merge/package.nix
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/by-name/ya/yaml2json/package.nix
similarity index 100%
rename from pkgs/development/tools/yaml2json/default.nix
rename to pkgs/by-name/ya/yaml2json/package.nix
diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
new file mode 100644
index 000000000000..039e54c1b130
--- /dev/null
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  testers,
+  yamlfmt,
+}:
+
+buildGoModule rec {
+  pname = "yamlfmt";
+  version = "0.14.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "yamlfmt";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI=";
+  };
+
+  vendorHash = "sha256-lsNldfacBoeTPyhkjyDZhI5YR+kDke0TarfG/KdjEOg=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${version}"
+    "-X=main.commit=${src.rev}"
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = yamlfmt;
+  };
+
+  meta = with lib; {
+    description = "Extensible command line tool or library to format yaml files";
+    homepage = "https://github.com/google/yamlfmt";
+    changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ sno2wman ];
+    mainProgram = "yamlfmt";
+  };
+}
diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/by-name/ya/yamlpath/package.nix
similarity index 100%
rename from pkgs/development/tools/yamlpath/default.nix
rename to pkgs/by-name/ya/yamlpath/package.nix
diff --git a/pkgs/applications/audio/yams/default.nix b/pkgs/by-name/ya/yams/package.nix
similarity index 100%
rename from pkgs/applications/audio/yams/default.nix
rename to pkgs/by-name/ya/yams/package.nix
diff --git a/pkgs/by-name/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix
new file mode 100644
index 000000000000..21469edcbca9
--- /dev/null
+++ b/pkgs/by-name/ya/yandex-browser/package.nix
@@ -0,0 +1,176 @@
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, wrapGAppsHook3
+, flac
+, gnome2
+, harfbuzzFull
+, nss
+, snappy
+, xdg-utils
+, xorg
+, alsa-lib
+, atk
+, cairo
+, cups
+, curl
+, dbus
+, expat
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, gtk3
+, libX11
+, libxcb
+, libXScrnSaver
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXrandr
+, libXrender
+, libXtst
+, libdrm
+, libnotify
+, libopus
+, libpulseaudio
+, libuuid
+, libxshmfence
+, mesa
+, nspr
+, pango
+, systemd
+, at-spi2-atk
+, at-spi2-core
+, libqt5pas
+, qt6
+, vivaldi-ffmpeg-codecs
+, edition ? "stable"
+}:
+
+let
+  version = {
+    corporate = "24.7.1.1195-1";
+    beta = "24.7.1.1124-1";
+    stable = "24.7.1.1120-1";
+  }.${edition};
+
+  hash = {
+    corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4=";
+    beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ=";
+    stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U=";
+  }.${edition};
+
+  app = {
+    corporate = "";
+    beta = "-beta";
+    stable = "";
+  }.${edition};
+
+in stdenv.mkDerivation rec {
+  pname = "yandex-browser-${edition}";
+  inherit version;
+
+  src = fetchurl {
+    url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb";
+    inherit hash;
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt6.wrapQtAppsHook
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    flac
+    harfbuzzFull
+    nss
+    snappy
+    xdg-utils
+    xorg.libxkbfile
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig.lib
+    freetype
+    gdk-pixbuf
+    glib
+    gnome2.GConf
+    gtk3
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    libdrm
+    libnotify
+    libopus
+    libuuid
+    libxcb
+    libxshmfence
+    mesa
+    nspr
+    nss
+    pango
+    (lib.getLib stdenv.cc.cc)
+    libqt5pas
+    qt6.qtbase
+  ];
+
+  unpackPhase = ''
+    mkdir $TMP/ya/ $out/bin/ -p
+    ar vx $src
+    tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/
+  '';
+
+  installPhase = ''
+    cp $TMP/ya/{usr/share,opt} $out/ -R
+    cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true
+    rm -f $out/share/applications/yandex-browser.desktop
+    substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/
+    substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/
+    substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/
+    ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so
+    ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname}
+  '';
+
+  runtimeDependencies = map lib.getLib [
+    libpulseaudio
+    curl
+    systemd
+    vivaldi-ffmpeg-codecs
+  ] ++ buildInputs;
+
+  meta = with lib; {
+    description = "Yandex Web Browser";
+    homepage = "https://browser.yandex.ru/";
+    license = licenses.unfree;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ dan4ik605743 ionutnechita ];
+    platforms = [ "x86_64-linux" ];
+
+    knownVulnerabilities = [
+      ''
+      Trusts a Russian government issued CA certificate for some websites.
+      See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details.
+      ''
+    ];
+  };
+}
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 2f9bfea320d9..e78fd955b500 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.133.0",
+  "version": "0.136.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/darwin/arm64/yc",
-      "hash": "sha256-qdpiMIQygggXRysEClQPCSTHyG4Iz3qsqcpkGUmPylQ="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/darwin/arm64/yc",
+      "hash": "sha256-tX0YL906t7jSp1cMBrlPvK8xYpZocMM1dyVvrBxjbWQ="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/arm64/yc",
-      "hash": "sha256-GyAeEIF07DmNFLYsmhmc76pEK7uao5v3XswG/mY0HNA="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/linux/arm64/yc",
+      "hash": "sha256-AKix6Qp+3rwv2MzI/e7QDkNS9v84gZV0mWydPDZZBQM="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/386/yc",
-      "hash": "sha256-j3Ieq2C+/LHHX7W5xhi77xKLqlMWV6MeCEVmR46ZLDk="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/linux/386/yc",
+      "hash": "sha256-897mGRv1D5vhgMUsbPB96UJuFxJO44YZh4OpGb8yKhc="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/darwin/amd64/yc",
-      "hash": "sha256-0HnSg1cwLDwv8RuGPZ0wJcCD1vCYOCjJJfLxu5b7hag="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/darwin/amd64/yc",
+      "hash": "sha256-wwcISiHla+Kd9emFlfK/hKmD8+L5jx0vIrrxtf+3WX0="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/amd64/yc",
-      "hash": "sha256-kP0BJUTVtRcyE/S24hBQrKxu/A4Zxo+PzlhdVZbcNc8="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/linux/amd64/yc",
+      "hash": "sha256-7q7MR/aP8uUwRu8hsLOJosn9/uIOMZW8Q+VAVtbf6qk="
     }
   }
 }
diff --git a/pkgs/by-name/ya/yandex-disk/package.nix b/pkgs/by-name/ya/yandex-disk/package.nix
new file mode 100644
index 000000000000..b0056602c387
--- /dev/null
+++ b/pkgs/by-name/ya/yandex-disk/package.nix
@@ -0,0 +1,72 @@
+{ lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }:
+
+let
+  p = if stdenv.hostPlatform.is64bit then {
+      arch = "x86_64";
+      gcclib = "${lib.getLib stdenv.cc.cc}/lib64";
+      sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0=";
+      webarchive = "20220519080155";
+    }
+    else {
+      arch = "i386";
+      gcclib = "${lib.getLib stdenv.cc.cc}/lib";
+      sha256 = "sha256-28dmdnJf+qh9r3F0quwlYXB/UqcOzcHzuzFq8vt2bf0=";
+      webarchive = "20220519080430";
+    };
+in
+stdenv.mkDerivation rec {
+
+  pname = "yandex-disk";
+  version = "0.1.6.1080";
+
+  src = fetchurl {
+    urls = [
+      "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"
+      "https://web.archive.org/web/${p.webarchive}/https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"
+    ];
+    sha256 = p.sha256;
+  };
+
+  builder = writeText "builder.sh" ''
+    . $stdenv/setup
+    mkdir -pv $out/bin
+    mkdir -pv $out/share
+    mkdir -pv $out/etc
+
+    mkdir -pv unpacked
+    cd unpacked
+    ${rpmextract}/bin/rpmextract $src
+
+    mkdir -p $out/share/bash-completion/completions
+    cp -r -t $out/bin usr/bin/*
+    cp -r -t $out/share usr/share/*
+    cp -r -t $out/share/bash-completion/completions etc/bash_completion.d/*
+
+    sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \
+      $out/share/bash-completion/completions/yandex-disk-completion.bash
+
+    ${patchelf}/bin/patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${zlib.out}/lib:${p.gcclib}" \
+      $out/bin/yandex-disk
+  '';
+
+  meta = {
+    homepage = "https://help.yandex.com/disk/cli-clients.xml";
+    description = "Free cloud file storage service";
+    maintainers = with lib.maintainers; [ smironov jagajaga ];
+    platforms = ["i686-linux" "x86_64-linux"];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    longDescription = ''
+      Yandex.Disk console client for Linux lets you manage files on Disk without
+      using a window interface or programs that support WebDAV. The advantages
+      of the console client compared to a WebDAV connection:
+       * low system resource requirements;
+       * faster file reading and writing speeds;
+       * faster syncing with Disk's server;
+       * no need to be constantly connected to work with files.
+    '';
+    mainProgram = "yandex-disk";
+  };
+}
diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/by-name/ya/yank/package.nix
similarity index 100%
rename from pkgs/tools/misc/yank/default.nix
rename to pkgs/by-name/ya/yank/package.nix
diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/by-name/ya/yanone-kaffeesatz/package.nix
similarity index 100%
rename from pkgs/data/fonts/yanone-kaffeesatz/default.nix
rename to pkgs/by-name/ya/yanone-kaffeesatz/package.nix
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/by-name/ya/yap/package.nix
similarity index 100%
rename from pkgs/development/compilers/yap/default.nix
rename to pkgs/by-name/ya/yap/package.nix
diff --git a/pkgs/tools/security/yarGen/default.nix b/pkgs/by-name/ya/yarGen/package.nix
similarity index 100%
rename from pkgs/tools/security/yarGen/default.nix
rename to pkgs/by-name/ya/yarGen/package.nix
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/by-name/ya/yara/package.nix
similarity index 100%
rename from pkgs/tools/security/yara/default.nix
rename to pkgs/by-name/ya/yara/package.nix
diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/by-name/ya/yaralyzer/package.nix
similarity index 100%
rename from pkgs/tools/security/yaralyzer/default.nix
rename to pkgs/by-name/ya/yaralyzer/package.nix
diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix
index 47c179af860f..8bf3447b9ac5 100644
--- a/pkgs/by-name/ya/yarg/package.nix
+++ b/pkgs/by-name/ya/yarg/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Load-time libraries (loaded from DT_NEEDED section in ELF binary)
     alsa-lib
     gtk3
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
 
     # Run-time libraries (loaded with dlopen)
diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/by-name/ya/yarn-bash-completion/package.nix
similarity index 100%
rename from pkgs/shells/bash/yarn-completion/default.nix
rename to pkgs/by-name/ya/yarn-bash-completion/package.nix
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/by-name/ya/yarn/package.nix
similarity index 100%
rename from pkgs/development/tools/yarn/default.nix
rename to pkgs/by-name/ya/yarn/package.nix
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/by-name/ya/yarp/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/yarp/default.nix
rename to pkgs/by-name/ya/yarp/package.nix
diff --git a/pkgs/applications/networking/feedreaders/yarr/default.nix b/pkgs/by-name/ya/yarr/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/yarr/default.nix
rename to pkgs/by-name/ya/yarr/package.nix
diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/by-name/ya/yaru-remix-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/yaru-remix/default.nix
rename to pkgs/by-name/ya/yaru-remix-theme/package.nix
diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/by-name/ya/yaru-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/yaru/default.nix
rename to pkgs/by-name/ya/yaru-theme/package.nix
diff --git a/pkgs/development/libraries/yas/default.nix b/pkgs/by-name/ya/yas/package.nix
similarity index 100%
rename from pkgs/development/libraries/yas/default.nix
rename to pkgs/by-name/ya/yas/package.nix
diff --git a/pkgs/development/libraries/yascreen/default.nix b/pkgs/by-name/ya/yascreen/package.nix
similarity index 100%
rename from pkgs/development/libraries/yascreen/default.nix
rename to pkgs/by-name/ya/yascreen/package.nix
diff --git a/pkgs/shells/yash/default.nix b/pkgs/by-name/ya/yash/package.nix
similarity index 100%
rename from pkgs/shells/yash/default.nix
rename to pkgs/by-name/ya/yash/package.nix
diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/by-name/ya/yasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/yasm/default.nix
rename to pkgs/by-name/ya/yasm/package.nix
diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch b/pkgs/by-name/ya/yasr/10_fix_openpty_forkpty_declarations.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch
rename to pkgs/by-name/ya/yasr/10_fix_openpty_forkpty_declarations.patch
diff --git a/pkgs/applications/audio/yasr/20_maxpathlen.patch b/pkgs/by-name/ya/yasr/20_maxpathlen.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/20_maxpathlen.patch
rename to pkgs/by-name/ya/yasr/20_maxpathlen.patch
diff --git a/pkgs/applications/audio/yasr/30_conf.patch b/pkgs/by-name/ya/yasr/30_conf.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/30_conf.patch
rename to pkgs/by-name/ya/yasr/30_conf.patch
diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch b/pkgs/by-name/ya/yasr/40_dectalk_extended_chars.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch
rename to pkgs/by-name/ya/yasr/40_dectalk_extended_chars.patch
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/by-name/ya/yasr/package.nix
similarity index 100%
rename from pkgs/applications/audio/yasr/default.nix
rename to pkgs/by-name/ya/yasr/package.nix
diff --git a/pkgs/tools/security/yatas/default.nix b/pkgs/by-name/ya/yatas/package.nix
similarity index 100%
rename from pkgs/tools/security/yatas/default.nix
rename to pkgs/by-name/ya/yatas/package.nix
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/by-name/ya/yate/package.nix
similarity index 100%
rename from pkgs/applications/misc/yate/default.nix
rename to pkgs/by-name/ya/yate/package.nix
diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/by-name/ya/yaup/package.nix
similarity index 100%
rename from pkgs/applications/networking/yaup/default.nix
rename to pkgs/by-name/ya/yaup/package.nix
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/by-name/ya/yaws/package.nix
similarity index 100%
rename from pkgs/servers/http/yaws/default.nix
rename to pkgs/by-name/ya/yaws/package.nix
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/by-name/ya/yaxg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/yaxg/default.nix
rename to pkgs/by-name/ya/yaxg/package.nix
diff --git a/pkgs/development/libraries/yder/fix-pkgconfig.patch b/pkgs/by-name/yd/yder/fix-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/yder/fix-pkgconfig.patch
rename to pkgs/by-name/yd/yder/fix-pkgconfig.patch
diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/by-name/yd/yder/package.nix
similarity index 100%
rename from pkgs/development/libraries/yder/default.nix
rename to pkgs/by-name/yd/yder/package.nix
diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/by-name/yd/ydict/package.nix
similarity index 100%
rename from pkgs/applications/misc/ydict/default.nix
rename to pkgs/by-name/yd/ydict/package.nix
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/by-name/ye/yed/package.nix
similarity index 100%
rename from pkgs/applications/graphics/yed/default.nix
rename to pkgs/by-name/ye/yed/package.nix
diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/by-name/ye/yeetgif/package.nix
similarity index 100%
rename from pkgs/applications/graphics/yeetgif/default.nix
rename to pkgs/by-name/ye/yeetgif/package.nix
diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/by-name/ye/yelp-tools/package.nix
similarity index 100%
rename from pkgs/development/misc/yelp-tools/default.nix
rename to pkgs/by-name/ye/yelp-tools/package.nix
diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/by-name/ye/yersinia/package.nix
similarity index 100%
rename from pkgs/tools/security/yersinia/default.nix
rename to pkgs/by-name/ye/yersinia/package.nix
diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/by-name/ye/yeshup/package.nix
similarity index 100%
rename from pkgs/tools/system/yeshup/default.nix
rename to pkgs/by-name/ye/yeshup/package.nix
diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/by-name/ye/yewtube/package.nix
similarity index 100%
rename from pkgs/applications/misc/yewtube/default.nix
rename to pkgs/by-name/ye/yewtube/package.nix
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/by-name/yl/yle-dl/package.nix
similarity index 100%
rename from pkgs/tools/misc/yle-dl/default.nix
rename to pkgs/by-name/yl/yle-dl/package.nix
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/by-name/ym/ympd/package.nix
similarity index 100%
rename from pkgs/applications/audio/ympd/default.nix
rename to pkgs/by-name/ym/ympd/package.nix
diff --git a/pkgs/applications/audio/ymuse/default.nix b/pkgs/by-name/ym/ymuse/package.nix
similarity index 100%
rename from pkgs/applications/audio/ymuse/default.nix
rename to pkgs/by-name/ym/ymuse/package.nix
diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/by-name/yo/yo/package.nix
similarity index 100%
rename from pkgs/development/tools/yo/default.nix
rename to pkgs/by-name/yo/yo/package.nix
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/by-name/yo/yodl/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/yodl/default.nix
rename to pkgs/by-name/yo/yodl/package.nix
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/by-name/yo/yojimbo/package.nix
similarity index 100%
rename from pkgs/development/libraries/yojimbo/default.nix
rename to pkgs/by-name/yo/yojimbo/package.nix
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
new file mode 100644
index 000000000000..190ad3a99341
--- /dev/null
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, alsa-lib
+, boost
+, cairo
+, cmake
+, fftwSinglePrec
+, fltk
+, libGLU
+, libjack2
+, libsndfile
+, libXdmcp
+, lv2
+, minixml
+, pcre
+, pkg-config
+, readline
+, xorg
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "yoshimi";
+  version = "2.3.3.1";
+
+  src = fetchFromGitHub {
+    owner = "Yoshimi";
+    repo = pname;
+    rev = version;
+    hash = "sha256-uBivCygpvJ6psgqW3FOHaW5IzUq8vrC2uk4KRv6L2oY=";
+  };
+
+  sourceRoot = "${src.name}/src";
+
+  postPatch = ''
+    substituteInPlace Misc/Config.cpp --replace /usr $out
+    substituteInPlace Misc/Bank.cpp --replace /usr $out
+  '';
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [
+    alsa-lib
+    boost
+    cairo
+    fftwSinglePrec
+    fltk
+    libGLU
+    libjack2
+    libsndfile
+    libXdmcp
+    lv2
+    minixml
+    pcre
+    readline
+    xorg.libpthreadstubs
+    zlib
+  ];
+
+  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.cc.libc}/lib/libm.so" ];
+
+  meta = with lib; {
+    description = "High quality software synthesizer based on ZynAddSubFX";
+    longDescription = ''
+      Yoshimi delivers the same synthesizer capabilities as
+      ZynAddSubFX along with very good Jack and Alsa midi/audio
+      functionality on Linux
+    '';
+    homepage = "https://yoshimi.github.io/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ ];
+    mainProgram = "yoshimi";
+  };
+}
diff --git a/pkgs/tools/misc/you-get/ffmpeg-path.patch b/pkgs/by-name/yo/you-get/ffmpeg-path.patch
similarity index 100%
rename from pkgs/tools/misc/you-get/ffmpeg-path.patch
rename to pkgs/by-name/yo/you-get/ffmpeg-path.patch
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/by-name/yo/you-get/package.nix
similarity index 100%
rename from pkgs/tools/misc/you-get/default.nix
rename to pkgs/by-name/yo/you-get/package.nix
diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index c51bdf5ee787..9f8329fdc3be 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -9,7 +9,7 @@
 let
   vPath = v: lib.elemAt (lib.splitString "-" v) 0;
 
-  version = "2024.3-b161";
+  version = "2024.9-b158";
 
   arches = {
     aarch64-linux = "arm64";
@@ -20,8 +20,8 @@ let
     arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
 
   hashes = {
-    arm64 = "sha256-Qm/+KQ4nZr1IIyo+i8Gp8K2PEU844tuigiopWEibaAE=";
-    x64 = "sha256-yxbPS5UrYq6FgPlqfWjO9tPI/rjA/400JnS3kKHgMV0=";
+    arm64 = "sha256-juRU7rLek1vT4hRglMoyw2SyLoBh4mhg45AroMq+TE0=";
+    x64 = "sha256-3qO3l+L9fBFIumFKS9noA+c0Gu5GlMrxQaCyhW5Wark=";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/by-name/yq/yq-go/package.nix
similarity index 100%
rename from pkgs/development/tools/yq-go/default.nix
rename to pkgs/by-name/yq/yq-go/package.nix
diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 3f1b836dac0c..c3149189b538 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,30 +17,38 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2024.10.22";
+  version = "2024.11.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-R7gqH9IkEbXJXvLwoa4a9Obf1zbqmf2yoOpBRFq8Yro=";
+    hash = "sha256-7SBMG2G8Vj4TREd2bRqzQxc1QHmeE+u5U+iHzn3PaGU=";
   };
 
   build-system = with python3Packages; [
     hatchling
   ];
 
-  dependencies = with python3Packages; [
-    brotli
-    certifi
-    curl-cffi
-    mutagen
-    pycryptodomex
-    requests
-    secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser`
-    urllib3
-    websockets
-  ];
+  # expose optional-dependencies, but provide all features
+  dependencies = lib.flatten (lib.attrValues optional-dependencies);
+
+  optional-dependencies = {
+    default = with python3Packages; [
+      brotli
+      certifi
+      mutagen
+      pycryptodomex
+      requests
+      urllib3
+      websockets
+    ];
+    curl-cffi = [ python3Packages.curl-cffi ];
+    secretstorage = with python3Packages; [
+      cffi
+      secretstorage
+    ];
+  };
 
   pythonRelaxDeps = [ "websockets" ];
 
@@ -87,7 +95,7 @@ python3Packages.buildPythonApplication rec {
       youtube-dl is released to the public domain, which means
       you can modify it, redistribute it or use it however you like.
     '';
-    changelog = "https://github.com/yt-dlp/yt-dlp/releases/tag/${version}";
+    changelog = "https://github.com/yt-dlp/yt-dlp/blob/HEAD/Changelog.md";
     license = licenses.unlicense;
     maintainers = with maintainers; [
       mkg20001
diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/by-name/yt/ytalk/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/ytalk/default.nix
rename to pkgs/by-name/yt/ytalk/package.nix
diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/by-name/yt/ytarchive/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytarchive/default.nix
rename to pkgs/by-name/yt/ytarchive/package.nix
diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/by-name/yt/ytcast/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytcast/default.nix
rename to pkgs/by-name/yt/ytcast/package.nix
diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/by-name/yt/ytcc/package.nix
similarity index 100%
rename from pkgs/tools/networking/ytcc/default.nix
rename to pkgs/by-name/yt/ytcc/package.nix
diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 5e43a0548088..7e3a59cdb392 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -6,13 +6,13 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2024.10.27.post5";
+  version = "2024.11.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ytdl_sub";
-    hash = "sha256-NVIQOoRAyiFtc83r7z7DfDiIdWIPmUwylNzG3KSyOXw=";
+    hash = "sha256-YMki+1rC726RtbZceoVbcpk/Gi3F81xxERQjpqLjn+A=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/yt/ytermusic/Cargo.lock b/pkgs/by-name/yt/ytermusic/Cargo.lock
index 1fbd706c0c5c..efbe123c38e2 100644
--- a/pkgs/by-name/yt/ytermusic/Cargo.lock
+++ b/pkgs/by-name/yt/ytermusic/Cargo.lock
@@ -4,24 +4,24 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aes"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if 1.0.0",
  "cipher",
@@ -30,12 +30,12 @@ dependencies = [
 
 [[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 1.0.0",
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -43,18 +43,18 @@ dependencies = [
 
 [[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 = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "alsa"
@@ -95,21 +95,21 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "async-compression"
-version = "0.4.6"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c"
+checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
 dependencies = [
  "flate2",
  "futures-core",
@@ -120,13 +120,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -137,31 +137,25 @@ checksum = "62af46d040ba9df09edc6528dae9d8e49f5f3e82f55b7d2ec31a733c38dbc49d"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.7.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -179,21 +173,20 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.59.2"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -204,9 +197,9 @@ 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",
 ]
@@ -219,9 +212,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array",
 ]
@@ -241,7 +234,7 @@ version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73498e9b2f0aa7db74977afa4d594657611e90587abf0dd564c0b55b4a130163"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "boa_interner",
  "boa_macros",
  "indexmap",
@@ -255,7 +248,7 @@ version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16377479d5d6d33896e7acdd1cc698d04a8f72004025bbbddf47558cd29146a6"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "boa_ast",
  "boa_gc",
  "boa_icu_provider",
@@ -322,7 +315,7 @@ checksum = "f3e5afa991908cfbe79bd3109b824e473a1dc5f74f31fab91bb44c9e245daa77"
 dependencies = [
  "boa_gc",
  "boa_macros",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "indexmap",
  "once_cell",
  "phf 0.11.2",
@@ -338,7 +331,7 @@ checksum = "005fa0c5bd20805466dda55eb34cd709bb31a2592bb26927b47714eeed6914d8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "synstructure",
 ]
 
@@ -348,7 +341,7 @@ version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e09afb035377a9044443b598187a7d34cd13164617182a4d7c348522ee3f052"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "boa_ast",
  "boa_icu_provider",
  "boa_interner",
@@ -375,27 +368,27 @@ checksum = "3190f92dfe48224adc92881c620f08ccf37ff62b91a094bb357fe53bd5e84647"
 
 [[package]]
 name = "bumpalo"
-version = "3.9.1"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.2"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[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.1.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "calloop"
@@ -415,9 +408,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "castaway"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
+checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
 dependencies = [
  "rustversion",
 ]
@@ -433,12 +426,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -470,14 +464,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.33"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -492,13 +486,13 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.3.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.7.3",
+ "libloading",
 ]
 
 [[package]]
@@ -509,14 +503,14 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
 [[package]]
 name = "cocoa"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832"
+checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
 dependencies = [
  "bitflags 1.3.2",
  "block",
  "cocoa-foundation",
- "core-foundation 0.9.3",
+ "core-foundation 0.9.4",
  "core-graphics 0.22.3",
  "foreign-types",
  "libc",
@@ -525,24 +519,23 @@ dependencies = [
 
 [[package]]
 name = "cocoa-foundation"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
 dependencies = [
  "bitflags 1.3.2",
  "block",
- "core-foundation 0.9.3",
+ "core-foundation 0.9.4",
  "core-graphics-types",
- "foreign-types",
  "libc",
  "objc",
 ]
 
 [[package]]
 name = "combine"
-version = "4.6.4"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -608,11 +601,11 @@ 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 0.8.3",
+ "core-foundation-sys 0.8.7",
  "libc",
 ]
 
@@ -624,9 +617,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core-graphics"
@@ -647,7 +640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation 0.9.3",
+ "core-foundation 0.9.4",
  "core-graphics-types",
  "foreign-types",
  "libc",
@@ -655,13 +648,12 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation 0.9.3",
- "foreign-types",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -690,9 +682,9 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.10"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dff444d80630d7073077d38d40b4501fd518bd2b922c2a55edcc8b0f7be57e6"
+checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
 dependencies = [
  "bindgen",
 ]
@@ -704,7 +696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
 dependencies = [
  "alsa",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.7",
  "coreaudio-rs",
  "jni",
  "js-sys",
@@ -712,7 +704,7 @@ dependencies = [
  "libc",
  "mach",
  "ndk 0.6.0",
- "ndk-glue 0.6.1",
+ "ndk-glue 0.6.2",
  "nix 0.23.2",
  "oboe",
  "parking_lot 0.11.2",
@@ -724,27 +716,27 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 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 1.0.0",
 ]
 
 [[package]]
 name = "critical-section"
-version = "1.1.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crossterm"
@@ -752,11 +744,11 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "crossterm_winapi",
  "libc",
- "mio",
- "parking_lot 0.12.0",
+ "mio 0.8.11",
+ "parking_lot 0.12.3",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -795,7 +787,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "smallvec",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -805,7 +797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -816,9 +808,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "darling"
-version = "0.13.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -826,27 +818,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.13.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.13.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -856,17 +848,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
 name = "dbus"
-version = "0.9.5"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce"
+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
 dependencies = [
  "libc",
  "libdbus-sys",
@@ -875,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "dbus-crossroads"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d83c4b78f7c7d0dec4859d286665a06858a607ba406c91a36316ff36918141"
+checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0"
 dependencies = [
  "dbus",
 ]
@@ -899,20 +891,20 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[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 = [
  "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.99",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -954,13 +946,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[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.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -969,14 +961,14 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.1",
+ "libloading",
 ]
 
 [[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"
@@ -986,24 +978,24 @@ 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",
 ]
 
 [[package]]
 name = "ego-tree"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
+checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
 
 [[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 = "embedded-io"
@@ -1012,10 +1004,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
 
 [[package]]
-name = "encoding_rs"
-version = "0.8.30"
+name = "embedded-io"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1028,14 +1026,20 @@ 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",
 ]
 
+[[package]]
+name = "extended"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
+
 [[package]]
 name = "fast-float"
 version = "0.2.0"
@@ -1044,32 +1048,30 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "flate2"
-version = "1.0.22"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
- "cfg-if 1.0.0",
  "crc32fast",
- "libc",
- "miniz_oxide 0.4.4",
+ "miniz_oxide",
 ]
 
 [[package]]
 name = "flume"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
  "nanorand",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -1078,6 +1080,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1114,9 +1122,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1129,9 +1137,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1139,15 +1147,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1156,38 +1164,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1212,9 +1220,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -1242,9 +1250,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 1.0.0",
  "js-sys",
@@ -1255,21 +1263,21 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -1295,28 +1303,32 @@ 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 = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 dependencies = [
- "ahash",
  "allocator-api2",
+ "equivalent",
+ "foldhash",
 ]
 
 [[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 = "hermit-abi"
-version = "0.1.19"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1335,14 +1347,14 @@ dependencies = [
  "markup5ever",
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.6"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1351,9 +1363,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
@@ -1362,21 +1374,21 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1425,12 +1437,12 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.7",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
@@ -1559,7 +1571,7 @@ checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1590,20 +1602,14 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.15.0",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
-
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -1616,9 +1622,9 @@ 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 1.0.0",
  "js-sys",
@@ -1628,9 +1634,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.4.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "itertools"
@@ -1651,10 +1657,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.1"
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jni"
@@ -1678,96 +1693,90 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.24"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 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 = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libdbus-sys"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
 dependencies = [
  "pkg-config",
 ]
 
 [[package]]
 name = "libloading"
-version = "0.7.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.35"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
+checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
 dependencies = [
  "cc",
  "libc",
 ]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.4.13"
+name = "libredox"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "litemap"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
 
 [[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",
@@ -1775,17 +1784,17 @@ 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"
-version = "0.12.2"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -1838,15 +1847,15 @@ dependencies = [
 
 [[package]]
 name = "matches"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -1868,24 +1877,24 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.39"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
+checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
 dependencies = [
  "libmimalloc-sys",
 ]
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+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",
@@ -1899,28 +1908,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
- "autocfg",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
@@ -1928,22 +1927,33 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "nanorand"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -1964,7 +1974,7 @@ dependencies = [
  "bitflags 1.3.2",
  "jni-sys",
  "ndk-sys 0.2.2",
- "num_enum 0.5.7",
+ "num_enum 0.5.11",
  "thiserror",
 ]
 
@@ -1977,7 +1987,7 @@ dependencies = [
  "bitflags 1.3.2",
  "jni-sys",
  "ndk-sys 0.3.0",
- "num_enum 0.5.7",
+ "num_enum 0.5.11",
  "thiserror",
 ]
 
@@ -2004,9 +2014,9 @@ dependencies = [
 
 [[package]]
 name = "ndk-glue"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ffb7443daba48349d545028777ca98853b018b4c16624aa01223bc29e078da"
+checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f"
 dependencies = [
  "lazy_static",
  "libc",
@@ -2027,7 +2037,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2047,9 +2057,9 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nix"
@@ -2097,9 +2107,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "nom"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
@@ -2107,11 +2117,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",
  "serde",
@@ -2131,45 +2140,34 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "num_enum"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
- "num_enum_derive 0.5.7",
+ "num_enum_derive 0.5.11",
 ]
 
 [[package]]
@@ -2183,14 +2181,14 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2202,7 +2200,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2216,9 +2214,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -2248,9 +2246,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 dependencies = [
  "critical-section",
  "portable-atomic",
@@ -2258,11 +2256,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.63"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -2279,7 +2277,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2290,9 +2288,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.99"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -2319,12 +2317,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -2336,35 +2334,29 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.11",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
 
 [[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 1.0.0",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.7",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "percent-encoding"
@@ -2463,7 +2455,7 @@ dependencies = [
  "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.99",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2476,7 +2468,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2508,9 +2500,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2520,9 +2512,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.24"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "player"
@@ -2543,18 +2535,19 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "postcard"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8"
+checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e"
 dependencies = [
  "cobs",
- "embedded-io",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
  "serde",
 ]
 
@@ -2566,9 +2559,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "precomputed-hash"
@@ -2578,25 +2574,25 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "thiserror",
- "toml 0.5.9",
+ "once_cell",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.19"
+version = "0.5.20+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2619,9 +2615,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -2686,7 +2682,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -2709,15 +2705,14 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.26.0"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "154b85ef15a5d1719bcaa193c3c81fe645cd120c156874cd660fe49fd21d1373"
+checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cassowary",
  "compact_str",
  "crossterm",
- "indoc",
  "itertools 0.12.1",
  "lru",
  "paste",
@@ -2725,6 +2720,7 @@ dependencies = [
  "stability",
  "strum",
  "unicode-segmentation",
+ "unicode-truncate",
  "unicode-width",
 ]
 
@@ -2739,38 +2735,38 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.11"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.12",
- "redox_syscall 0.2.11",
+ "getrandom 0.2.15",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2780,9 +2776,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2791,9 +2787,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "regress"
@@ -2807,12 +2803,12 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "async-compression",
- "base64 0.21.7",
+ "base64",
  "bytes",
  "cookie",
  "cookie_store",
@@ -2856,9 +2852,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest-middleware"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690"
+checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2879,7 +2875,7 @@ dependencies = [
  "async-trait",
  "chrono",
  "futures",
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "http",
  "hyper",
  "parking_lot 0.11.2",
@@ -2905,38 +2901,24 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if 1.0.0",
+ "getrandom 0.2.15",
  "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
-dependencies = [
- "cc",
- "getrandom 0.2.12",
- "libc",
- "spin 0.9.8",
- "untrusted 0.9.0",
- "windows-sys 0.48.0",
+ "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-hash"
@@ -2946,20 +2928,20 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2968,23 +2950,23 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.10"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.17.7",
+ "ring",
  "rustls-webpki",
  "sct",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.13.0",
+ "base64",
 ]
 
 [[package]]
@@ -2993,15 +2975,15 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.17.7",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.6"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "rusty_ytdl"
@@ -3035,9 +3017,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "ryu-js"
@@ -3056,24 +3038,24 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "scoped-tls"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
@@ -3094,34 +3076,34 @@ dependencies = [
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.3",
- "core-foundation-sys 0.8.3",
+ "bitflags 2.6.0",
+ "core-foundation 0.9.4",
+ "core-foundation-sys 0.8.7",
  "libc",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.7",
  "libc",
 ]
 
@@ -3145,37 +3127,38 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.6"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -3193,9 +3176,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -3235,9 +3218,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
@@ -3251,20 +3234,20 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -3286,9 +3269,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -3311,12 +3294,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3336,12 +3319,6 @@ dependencies = [
  "windows",
 ]
 
-[[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"
@@ -3359,12 +3336,12 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
 
 [[package]]
 name = "stability"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
+checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
 dependencies = [
  "quote",
- "syn 1.0.99",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3393,7 +3370,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
 dependencies = [
  "new_debug_unreachable",
  "once_cell",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.3",
  "phf_shared 0.10.0",
  "precomputed-hash",
  "serde",
@@ -3419,30 +3396,30 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "strum"
-version = "0.26.1"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros",
 ]
 
 [[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",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "symphonia"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "lazy_static",
  "symphonia-bundle-flac",
@@ -3454,14 +3431,14 @@ dependencies = [
  "symphonia-format-isomp4",
  "symphonia-format-mkv",
  "symphonia-format-ogg",
- "symphonia-format-wav",
+ "symphonia-format-riff",
  "symphonia-metadata",
 ]
 
 [[package]]
 name = "symphonia-bundle-flac"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "log",
  "symphonia-core",
@@ -3471,8 +3448,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-codec-aac"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "lazy_static",
  "log",
@@ -3481,8 +3458,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-codec-adpcm"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "log",
  "symphonia-core",
@@ -3490,8 +3467,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-codec-pcm"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "log",
  "symphonia-core",
@@ -3499,8 +3476,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-codec-vorbis"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "log",
  "symphonia-core",
@@ -3509,8 +3486,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-core"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "arrayvec",
  "bitflags 1.3.2",
@@ -3521,8 +3498,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-format-isomp4"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "encoding_rs",
  "log",
@@ -3533,8 +3510,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-format-mkv"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "lazy_static",
  "log",
@@ -3545,8 +3522,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-format-ogg"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "log",
  "symphonia-core",
@@ -3555,10 +3532,11 @@ dependencies = [
 ]
 
 [[package]]
-name = "symphonia-format-wav"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+name = "symphonia-format-riff"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
+ "extended",
  "log",
  "symphonia-core",
  "symphonia-metadata",
@@ -3566,8 +3544,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-metadata"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "encoding_rs",
  "lazy_static",
@@ -3577,8 +3555,8 @@ dependencies = [
 
 [[package]]
 name = "symphonia-utils-xiph"
-version = "0.5.1"
-source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385"
+version = "0.5.4"
+source = "git+https://github.com/pdeljanov/Symphonia#f1a0df4fcb34712b5750b3bfca251e31fa523d38"
 dependencies = [
  "symphonia-core",
  "symphonia-metadata",
@@ -3586,9 +3564,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3597,9 +3575,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3620,7 +3598,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3630,7 +3608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation 0.9.3",
+ "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
 
@@ -3640,7 +3618,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
 dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.7",
  "libc",
 ]
 
@@ -3661,14 +3639,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3690,29 +3669,29 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
@@ -3731,9 +3710,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
  "num-conv",
  "time-core",
@@ -3752,47 +3731,46 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.5.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
- "num_cpus",
- "parking_lot 0.12.0",
+ "mio 1.0.2",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3817,66 +3795,67 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.3"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.4"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.20",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -3897,7 +3876,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3911,63 +3890,65 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-truncate"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
+dependencies = [
+ "itertools 0.13.0",
+ "unicode-segmentation",
+ "unicode-width",
+]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "untrusted"
@@ -3977,9 +3958,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 0.5.0",
@@ -4024,28 +4005,26 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[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"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -4063,34 +4042,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if 1.0.0",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -4100,9 +4080,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4110,22 +4090,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-timer"
@@ -4217,9 +4197,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4249,11 +4229,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4277,7 +4257,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4295,7 +4275,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4330,17 +4319,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 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.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]]
@@ -4357,9 +4347,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4375,9 +4365,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4393,9 +4383,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+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"
@@ -4411,9 +4407,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4429,9 +4425,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4447,9 +4443,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4465,9 +4461,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
@@ -4477,7 +4473,7 @@ checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a"
 dependencies = [
  "bitflags 1.3.2",
  "cocoa",
- "core-foundation 0.9.3",
+ "core-foundation 0.9.4",
  "core-graphics 0.22.3",
  "core-video-sys",
  "dispatch",
@@ -4485,7 +4481,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "mio",
+ "mio 0.8.11",
  "ndk 0.5.0",
  "ndk-glue 0.5.2",
  "ndk-sys 0.2.2",
@@ -4504,9 +4500,18 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.39"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -4529,41 +4534,38 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 
 [[package]]
 name = "writeable"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "x11-dl"
-version = "2.19.1"
+version = "2.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
 dependencies = [
- "lazy_static",
  "libc",
+ "once_cell",
  "pkg-config",
 ]
 
 [[package]]
 name = "xcursor"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
-dependencies = [
- "nom",
-]
+checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.19"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
 
 [[package]]
 name = "yoke"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -4573,13 +4575,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "synstructure",
 ]
 
@@ -4603,7 +4605,7 @@ dependencies = [
  "serde_json",
  "souvlaki",
  "tokio",
- "toml 0.8.10",
+ "toml",
  "urlencoding",
  "varuint",
  "winit",
@@ -4624,50 +4626,51 @@ dependencies = [
 
 [[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 = [
+ "byteorder",
  "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.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "synstructure",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46"
+checksum = "432bfb1b38809863a16add25daeff2cc63c8e6bbc1cb05b178237e35ab457885"
 dependencies = [
  "serde",
  "yoke",
@@ -4677,11 +4680,11 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a4a1638a1934450809c2266a70362bfc96cd90550c073f5b8a55014d1010157"
+checksum = "fa94b6a91d81a9d96473412885b87d8fb677accc447cae54571f93313aebf109"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
diff --git a/pkgs/by-name/yt/ytermusic/package.nix b/pkgs/by-name/yt/ytermusic/package.nix
index 2611d46b849e..e3edf35fe8fc 100644
--- a/pkgs/by-name/yt/ytermusic/package.nix
+++ b/pkgs/by-name/yt/ytermusic/package.nix
@@ -1,11 +1,11 @@
-{ alsa-lib
-, dbus
-, fetchFromGitHub
-, lib
-, openssl
-, pkg-config
-, rustPlatform
-,
+{
+  alsa-lib,
+  dbus,
+  fetchFromGitHub,
+  lib,
+  openssl,
+  pkg-config,
+  rustPlatform,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "rusty_ytdl-0.6.6" = "sha256-htXD8v9Yd7S0iLjP6iZu94tP5KO5vbmkdUybqA7OtlU=";
-      "symphonia-0.5.1" = "sha256-rGvde5w7czMLcOPARK1gFfDLn70VeIrn4nKOL6FPc2U=";
+      "symphonia-0.5.4" = "sha256-uf0BbpqtlpZhsnV7Cm8egxjb/fXSINsOANTjDUQ4U9M=";
     };
   };
   postPatch = "cp ${./Cargo.lock} Cargo.lock";
diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/by-name/yt/ytfzf/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytfzf/default.nix
rename to pkgs/by-name/yt/ytfzf/package.nix
diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/by-name/yt/ytmdl/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytmdl/default.nix
rename to pkgs/by-name/yt/ytmdl/package.nix
diff --git a/pkgs/by-name/yt/ytt/package.nix b/pkgs/by-name/yt/ytt/package.nix
new file mode 100644
index 000000000000..45a7b65e97d8
--- /dev/null
+++ b/pkgs/by-name/yt/ytt/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  testers,
+  ytt,
+}:
+buildGoModule rec {
+  pname = "ytt";
+  version = "0.51.0";
+
+  src = fetchFromGitHub {
+    owner = "carvel-dev";
+    repo = "ytt";
+    rev = "v${version}";
+    sha256 = "sha256-7PN6ejI7Ov0O3oJW71P3s3RWeRrX6M4+GTqsVlr8+7w=";
+  };
+
+  vendorHash = null;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X carvel.dev/ytt/pkg/version.Version=${version}"
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd ytt \
+      --bash <($out/bin/ytt completion bash) \
+      --fish <($out/bin/ytt completion fish) \
+      --zsh <($out/bin/ytt completion zsh)
+  '';
+
+  # Once `__structuredArgs` is introduced, integrate checks and
+  # set some regexes `checkFlags = [ "-skip=TestDataValues.*" ]`
+  # etc. So far we dont test because passing '*' chars through the Go builder
+  # is flawed.
+  doCheck = false;
+
+  passthru.tests.version = testers.testVersion {
+    package = ytt;
+    command = "ytt --version";
+    inherit version;
+  };
+
+  meta = with lib; {
+    description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values";
+    mainProgram = "ytt";
+    homepage = "https://get-ytt.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      brodes
+      techknowlogick
+      gabyx
+    ];
+  };
+}
diff --git a/pkgs/by-name/yu/yubihsm-connector/package.nix b/pkgs/by-name/yu/yubihsm-connector/package.nix
new file mode 100644
index 000000000000..6f7918347b72
--- /dev/null
+++ b/pkgs/by-name/yu/yubihsm-connector/package.nix
@@ -0,0 +1,37 @@
+{ lib, libusb1, buildGoModule, fetchFromGitHub, pkg-config }:
+
+buildGoModule rec {
+  pname = "yubihsm-connector";
+  version = "3.0.5";
+
+  src = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubihsm-connector";
+    rev = version;
+    hash = "sha256-hiCh/TG1epSmJtaptfVzcPklDTaBh0biKqfM01YoWo0=";
+  };
+
+  vendorHash = "sha256-XW7rEHY3S+M3b6QjmINgrCak+BqCEV3PJP90jz7J47A=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libusb1
+  ];
+
+  ldflags = [ "-s" "-w" ];
+
+  preBuild = ''
+    GOOS= GOARCH= go generate
+  '';
+
+  meta = with lib; {
+    description = "yubihsm-connector performs the communication between the YubiHSM 2 and applications that use it";
+    homepage = "https://developers.yubico.com/yubihsm-connector/";
+    maintainers = with maintainers; [ matthewcroughan ];
+    license = licenses.asl20;
+    mainProgram = "yubihsm-connector";
+  };
+}
diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
new file mode 100644
index 000000000000..107053ca00a7
--- /dev/null
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, openssl
+, libusb1
+, libedit
+, curl
+, gengetopt
+, pkg-config
+, pcsclite
+, help2man
+, darwin
+, libiconv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "yubihsm-shell";
+  version = "2.6.0";
+
+  src = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubihsm-shell";
+    rev = version;
+    hash = "sha256-0IsdIhuKpzfArVB4xBaxCPqtk0fKWb6RuGImUj1E4Zs=";
+  };
+
+  postPatch = ''
+    # Can't find libyubihsm at runtime because of dlopen() in C code
+    substituteInPlace lib/yubihsm.c \
+      --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \
+      --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so"
+    # ld: unknown option: -z
+    substituteInPlace CMakeLists.txt cmake/SecurityFlags.cmake \
+      --replace "AppleClang" "Clang"
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    help2man
+    gengetopt
+  ];
+
+  buildInputs = [
+    libusb1
+    libedit
+    curl
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pcsclite.dev
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.apple_sdk.frameworks.PCSC
+    libiconv
+  ];
+
+  preBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
+    NIX_CFLAGS_COMPILE="$(pkg-config --cflags libpcsclite) $NIX_CFLAGS_COMPILE"
+  '';
+
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DDISABLE_LTO=ON"
+  ];
+
+  # causes redefinition of _FORTIFY_SOURCE
+  hardeningDisable = [ "fortify3" ];
+
+  meta = with lib; {
+    description = "yubihsm-shell and libyubihsm";
+    homepage = "https://github.com/Yubico/yubihsm-shell";
+    maintainers = with maintainers; [ matthewcroughan ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/by-name/yu/yubikey-agent/package.nix
similarity index 100%
rename from pkgs/tools/security/yubikey-agent/default.nix
rename to pkgs/by-name/yu/yubikey-agent/package.nix
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/by-name/yu/yubikey-manager/package.nix
similarity index 100%
rename from pkgs/tools/misc/yubikey-manager/default.nix
rename to pkgs/by-name/yu/yubikey-manager/package.nix
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/by-name/yu/yubikey-personalization/package.nix
similarity index 100%
rename from pkgs/tools/misc/yubikey-personalization/default.nix
rename to pkgs/by-name/yu/yubikey-personalization/package.nix
diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
similarity index 100%
rename from pkgs/tools/security/yubikey-touch-detector/default.nix
rename to pkgs/by-name/yu/yubikey-touch-detector/package.nix
diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/by-name/yu/yubioath-flutter/helper.nix
similarity index 100%
rename from pkgs/applications/misc/yubioath-flutter/helper.nix
rename to pkgs/by-name/yu/yubioath-flutter/helper.nix
diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix
new file mode 100644
index 000000000000..a13c6e623da6
--- /dev/null
+++ b/pkgs/by-name/yu/yubioath-flutter/package.nix
@@ -0,0 +1,93 @@
+{ lib
+, flutter324
+, python3
+, fetchFromGitHub
+, pcre2
+, libnotify
+, libappindicator
+, pkg-config
+, gnome-screenshot
+, makeWrapper
+, removeReferencesTo
+}:
+
+flutter324.buildFlutterApplication rec {
+  pname = "yubioath-flutter";
+  version = "7.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubioath-flutter";
+    rev = version;
+    hash = "sha256-MpY6yJvGBaFiEwuGEme2Uvyi5INCYhZJHyaRpC9pCuk=";
+  };
+
+  passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+  gitHashes = {
+    window_manager = "sha256-mLX51nbWFccsAfcqLQIYDjYz69y9wAz4U1RZ8TIYSj0=";
+  };
+
+  postPatch = ''
+    rm -f pubspec.lock
+
+    substituteInPlace linux/CMakeLists.txt \
+      --replace-fail "../build/linux/helper" "${passthru.helper}/libexec/helper"
+  '';
+
+  preInstall = ''
+    # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere.
+    chmod -R +w build
+  '';
+
+  postInstall = ''
+    # Swap the authenticator-helper symlink with the correct symlink.
+    ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper"
+
+    # Move the icon.
+    mkdir $out/share/icons
+    mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/icons
+
+    # Cleanup.
+    rm -rf \
+      "$out/app/$pname/README.adoc" \
+      "$out/app/$pname/desktop_integration.sh" \
+      "$out/app/$pname/linux_support" \
+      $out/bin/* # We will repopulate this directory later.
+
+    # Symlink binary.
+    ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter"
+
+    # Set the correct path to the binary in desktop file.
+    substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \
+      --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \
+      --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"
+  '';
+
+  # Needed for QR scanning to work
+  extraWrapProgramArgs = ''
+    --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]}
+  '';
+
+  nativeBuildInputs = [
+    makeWrapper
+    removeReferencesTo
+    pkg-config
+  ];
+
+  buildInputs = [
+    pcre2
+    libnotify
+    libappindicator
+  ];
+
+  meta = with lib; {
+    description = "Yubico Authenticator for Desktop";
+    mainProgram = "yubioath-flutter";
+    homepage = "https://github.com/Yubico/yubioath-flutter";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lukegb ];
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
+  };
+}
diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
similarity index 100%
rename from pkgs/applications/misc/yubioath-flutter/pubspec.lock.json
rename to pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/by-name/yu/yuicompressor/package.nix
similarity index 100%
rename from pkgs/development/tools/yuicompressor/default.nix
rename to pkgs/by-name/yu/yuicompressor/package.nix
diff --git a/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch b/pkgs/by-name/yx/yx/0001-Don-t-strip-binary-when-installing.patch
similarity index 100%
rename from pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch
rename to pkgs/by-name/yx/yx/0001-Don-t-strip-binary-when-installing.patch
diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/by-name/yx/yx/package.nix
similarity index 100%
rename from pkgs/tools/text/yx/default.nix
rename to pkgs/by-name/yx/yx/package.nix
diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/by-name/yy/yyjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/yyjson/default.nix
rename to pkgs/by-name/yy/yyjson/package.nix
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/by-name/z-/z-lua/package.nix
similarity index 100%
rename from pkgs/tools/misc/z-lua/default.nix
rename to pkgs/by-name/z-/z-lua/package.nix
diff --git a/pkgs/by-name/z8/z88dk/package.nix b/pkgs/by-name/z8/z88dk/package.nix
new file mode 100644
index 000000000000..c2b36703d51d
--- /dev/null
+++ b/pkgs/by-name/z8/z88dk/package.nix
@@ -0,0 +1,186 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  unzip,
+  libxml2,
+  gmp,
+  m4,
+  uthash,
+  which,
+  pkg-config,
+  perl,
+  perlPackages,
+  fetchurl,
+}:
+
+let
+  # Perl packages used by this project.
+  # TODO: put these into global perl-packages.nix once this is submitted.
+  ObjectTinyRW = perlPackages.buildPerlPackage {
+    pname = "Object-Tiny-RW";
+    version = "1.07";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz";
+      hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs=";
+    };
+    meta = {
+      description = "A date object with as little code as possible (and rw accessors)";
+      license = with lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+  IteratorSimpleLookahead = perlPackages.buildPerlPackage {
+    pname = "Iterator-Simple-Lookahead";
+    version = "0.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz";
+      hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw=";
+    };
+    propagatedBuildInputs = with perlPackages; [
+      ClassAccessor IteratorSimple
+    ];
+    meta = {
+      description = "Simple iterator with lookahead and unget";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+
+  AsmPreproc = perlPackages.buildPerlPackage {
+    pname = "Asm-Preproc";
+    version = "1.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz";
+      hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M=";
+    };
+    propagatedBuildInputs = [
+        IteratorSimpleLookahead
+      ] ++ (with perlPackages; [
+        IteratorSimple
+        TextTemplate
+        DataDump
+        FileSlurp
+      ]);
+    meta = {
+      description = "Preprocessor to be called from an assembler";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+
+  CPUZ80Assembler = perlPackages.buildPerlPackage {
+    pname = "CPU-Z80-Assembler";
+    version = "2.25";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz";
+      hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU=";
+    };
+    buildInputs = [ AsmPreproc ] ++ (with perlPackages; [
+        CaptureTiny
+        RegexpTrie
+        PathTiny
+        ClassAccessor
+      ]);
+    meta = {
+      description = "Functions to assemble a set of Z80 assembly instructions";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "z88dk";
+  version = "2.3";
+
+  src = fetchFromGitHub {
+    owner = "z88dk";
+    repo = "z88dk";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    # we dont rely on build.sh :
+    export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite
+    export ZCCCFG=$PWD/lib/config/
+
+    # we don't want to build zsdcc since it required network (svn)
+    # we test in checkPhase
+    substituteInPlace Makefile \
+      --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
+      --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
+
+    # rc2014.lib not created, making corresponding tests fail. Comment out.
+    substituteInPlace  test/suites/make.config \
+      --replace 'zcc +rc2014'            '#zcc +rc2014' \
+      --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000'
+
+    # The following tests don't pass.
+    rm src/z80asm/t/issue_0341.t
+    rm src/z80asm/t/z80asm_lib.t
+  '';
+
+  # Parallel building is not working yet with the upstream Makefiles.
+  # Explicitly switch this off for now.
+  enableParallelBuilding = false;
+
+  doCheck = true;
+  checkPhase = ''
+    # Need to build libs first, Makefile deps not fully defined
+    make libs      $makeFlags
+    make testsuite $makeFlags
+    make -k test   $makeFlags
+  '';
+
+  short_rev = builtins.substring 0 7 finalAttrs.src.rev;
+  makeFlags = [
+    "git_rev=${finalAttrs.short_rev}"
+    "version=${finalAttrs.version}"
+    "PREFIX=$(out)"
+    "git_count=0"
+  ];
+
+  nativeBuildInputs = [
+    which
+    unzip
+    m4
+    perl
+    pkg-config
+
+    # Local perl packages
+    AsmPreproc
+    CPUZ80Assembler
+    ObjectTinyRW
+  ] ++ (with perlPackages; [
+    CaptureTiny
+    DataHexDump
+    ModernPerl
+    PathTiny
+    RegexpCommon
+    TestHexDifferences
+    TextDiff
+    RegexpTrie
+  ]);
+
+  buildInputs = [
+    libxml2
+    uthash
+    gmp
+  ];
+
+  preInstall = ''
+    mkdir -p $out/{bin,share}
+  '';
+
+  installTargets = [
+    "libs"
+    "install"
+  ];
+
+  meta = with lib; {
+    homepage = "https://www.z88dk.org";
+    description = "z80 Development Kit";
+    license = licenses.clArtistic;
+    maintainers = [ maintainers.siraben ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
index 87879b5a8a48..da017d4d42df 100644
--- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
+++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
@@ -6,11 +6,11 @@
 
 buildGoModule rec {
   pname = "zabbix-agent2-plugin-postgresql";
-  version = "7.0.2";
+  version = "7.0.4";
 
   src = fetchurl {
     url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
-    hash = "sha256-2+P0a74flxWIpZaII+V04G/szFUrnnIy+f8LfDewcx0=";
+    hash = "sha256-BgCdy+0VVe2+NTwZII3ASaxGGAT7zGiQUppI9whJtQ8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/by-name/za/zabbixctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/zabbixctl/default.nix
rename to pkgs/by-name/za/zabbixctl/package.nix
diff --git a/pkgs/tools/misc/zalgo/default.nix b/pkgs/by-name/za/zalgo/package.nix
similarity index 100%
rename from pkgs/tools/misc/zalgo/default.nix
rename to pkgs/by-name/za/zalgo/package.nix
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/by-name/za/zam-plugins/package.nix
similarity index 100%
rename from pkgs/applications/audio/zam-plugins/default.nix
rename to pkgs/by-name/za/zam-plugins/package.nix
diff --git a/pkgs/by-name/za/zap-chip/dont-download-copyfiles-to-copy-files.patch b/pkgs/by-name/za/zap-chip/dont-download-copyfiles-to-copy-files.patch
new file mode 100644
index 000000000000..6b6e0307f48f
--- /dev/null
+++ b/pkgs/by-name/za/zap-chip/dont-download-copyfiles-to-copy-files.patch
@@ -0,0 +1,42 @@
+diff --git a/src-script/pack-apack-win-linux.js b/src-script/pack-apack-win-linux.js
+index 0120f9f9..41fcf99c 100644
+--- a/src-script/pack-apack-win-linux.js
++++ b/src-script/pack-apack-win-linux.js
+@@ -6,12 +6,12 @@ exports.default = async function (context) {
+     context.electronPlatformName === 'win32' ||
+     context.electronPlatformName === 'linux'
+   ) {
+-    return scriptUtil.executeCmd({}, 'npx', [
+-      'copyfiles',
+-      '-V',
+-      '-f',
+-      path.resolve(context.outDir, '../apack.json'),
+-      context.appOutDir
++    return scriptUtil.executeCmd({}, 'install', [
++      '-m466',
++      '-v',
++      '-Dt',
++      context.appOutDir,
++      path.resolve(context.outDir, '../apack.json')
+     ])
+   }
+ }
+diff --git a/src-script/script-util.js b/src-script/script-util.js
+index 1897c2b8..9faa5f20 100644
+--- a/src-script/script-util.js
++++ b/src-script/script-util.js
+@@ -181,11 +181,9 @@ async function rebuildBackendIfNeeded() {
+   return scriptUtil
+     .executeCmd({}, 'npx', ['tsc', '--build', './tsconfig.json'])
+     .then(() =>
+-      scriptUtil.executeCmd({}, 'npx', [
+-        'copyfiles',
+-        './src-electron/**/*.sql',
+-        './src-electron/icons/*',
+-        './dist/'
++      scriptUtil.executeCmd({}, 'bash', [
++        '-xec',
++        'for i in ./src-electron/**/*.sql ./src-electron/icons/*; do install -m 644 -Dt dist/$(dirname $i) $i; done'
+       ])
+     )
+ }
diff --git a/pkgs/by-name/za/zap-chip/dont-get-version-from-git.patch b/pkgs/by-name/za/zap-chip/dont-get-version-from-git.patch
new file mode 100644
index 000000000000..ec31cab794fc
--- /dev/null
+++ b/pkgs/by-name/za/zap-chip/dont-get-version-from-git.patch
@@ -0,0 +1,28 @@
+diff --git a/src-script/script-util.js b/src-script/script-util.js
+index 1897c2b8..aaf9a08b 100644
+--- a/src-script/script-util.js
++++ b/src-script/script-util.js
+@@ -196,23 +194,6 @@ async function rebuildBackendIfNeeded() {
+  * ads the timestamp and saves it into .version.json
+  */
+ async function stampVersion() {
+-  try {
+-    let out = await getStdout('{"hash": null,"date": null}', 'git', [
+-      'log',
+-      '-1',
+-      '--format={"hash": "%H","timestamp": %ct}'
+-    ])
+-    let version = JSON.parse(out)
+-    let d = new Date(version.timestamp * 1000) // git gives seconds, Date needs milliseconds
+-    let result = await setPackageJsonVersion(d, 'real')
+-    version.date = d
+-    version.zapVersion = result.version
+-    let versionFile = path.join(__dirname, '../.version.json')
+-    console.log(`🔍 Git commit: ${version.hash} from ${version.date}`)
+-    await fsp.writeFile(versionFile, JSON.stringify(version))
+-  } catch (err) {
+-    console.log(`Error retrieving version: ${err}`)
+-  }
+ }
+ 
+ /**
diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
new file mode 100644
index 000000000000..e2e8f2e896ae
--- /dev/null
+++ b/pkgs/by-name/za/zap-chip/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  buildNpmPackage,
+  electron_31,
+  fetchFromGitHub,
+  writers,
+}:
+
+let
+  electron = electron_31;
+in
+buildNpmPackage rec {
+  pname = "zap-chip";
+  version = "2024.09.27";
+
+  src = fetchFromGitHub {
+    owner = "project-chip";
+    repo = "zap";
+    rev = "v${version}";
+    hash = "sha256-Dc5rU4jJ6aJpk8mwL+XNSmtisYxF86VzXd/Aacd4p0o=";
+  };
+
+  npmDepsHash = "sha256-ZFksGwKlXkz6XTs2QdalGB0hR16HfB69XQOFWI9X/KY=";
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  env.CYPRESS_INSTALL_BINARY = "0";
+
+  patches = [
+    # the build system creates a file `.version.json` from a git command
+    # as we don't build from a git repo, we create the file manually in postPatch
+    # and this patch disables the logic running git
+    ./dont-get-version-from-git.patch
+    # some files are installed via `npx copyfiles` which tries to download
+    # code from the internet. This fails in the sandbox. This patch replaces the
+    # logic by running "normal" commands instead of `npx copyfiles`
+    ./dont-download-copyfiles-to-copy-files.patch
+  ];
+
+  postPatch =
+    let
+      versionJson = {
+        hash = version;
+        timestamp = 1;
+        date = version;
+        zapVersion = version;
+      };
+    in
+    ''
+      cp ${writers.writeJSON "zapversion.json" versionJson} .version.json
+      cat .version.json
+    '';
+
+  postBuild = ''
+    npm exec electron-builder -- \
+      --dir \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
+  '';
+
+  postInstall = ''
+    # this file is also used at runtime
+    install -m644 .version.json $out/lib/node_modules/zap/
+    # home-assistant chip-* python packages need the executable under the name zap-cli
+    ln -s $out/bin/zap $out/bin/zap-cli
+  '';
+
+  meta = {
+    description = "Generic generation engine and user interface for applications and libraries based on Zigbee Cluster Library (ZCL)";
+    changelog = "https://github.com/project-chip/zap/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ symphorien ];
+    mainProgram = "zap-cli";
+  };
+}
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/by-name/za/zap/package.nix
similarity index 100%
rename from pkgs/tools/networking/zap/default.nix
rename to pkgs/by-name/za/zap/package.nix
diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index 4cb0f099e08f..470f65d1b267 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -13,40 +13,40 @@
   gawk
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "0-unstable-2024-08-01";
+  version = "67";
 
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
-    rev = "9cf72b7c68f6a7c80dfddc6c1cf6d6db32718376";
-    hash = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-4TgM0NkvVvdSEJ01SULu+GqpfqokTTErHAt3QkxkLIs=";
   };
 
   buildInputs = [ libcap zlib libnetfilter_queue libnfnetlink ];
   nativeBuildInputs = [ iptables nftables gawk ];
 
-  buildPhase = ''
-    mkdir -p $out/bin
-
-    make TGT=$out/bin
-  '';
+  makeFlags = [ "TGT=${placeholder "out"}/bin" ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/usr/share/zapret/init.d/sysv
     mkdir -p $out/usr/share/docs
 
     cp $src/blockcheck.sh $out/bin/blockcheck
 
     substituteInPlace $out/bin/blockcheck \
-      --replace "ZAPRET_BASE=\"\$EXEDIR\"" "ZAPRET_BASE=$out/usr/share/zapret"
+      --replace-fail '$(cd "$EXEDIR"; pwd)' "$out/usr/share/zapret"
+
+    ln -s ../../../bin/blockcheck $out/usr/share/zapret/blockcheck
 
     cp $src/init.d/sysv/functions $out/usr/share/zapret/init.d/sysv/functions
     cp $src/init.d/sysv/zapret $out/usr/share/zapret/init.d/sysv/init.d
 
     substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \
-      --replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret"
+      --replace-fail "/opt/zapret" "\"$out/usr/share/zapret\""
 
     touch $out/usr/share/zapret/config
 
@@ -57,6 +57,8 @@ stdenv.mkDerivation {
     cp $src/common/* $out/usr/share/zapret/common
     cp $src/ipset/* $out/usr/share/zapret/ipset
 
+    rm -f $out/usr/share/zapret/ipset/zapret-hosts-user-exclude.txt.default
+
     mkdir -p $out/usr/share/zapret/nfq
     ln -s ../../../../bin/nfqws $out/usr/share/zapret/nfq/nfqws
 
@@ -67,16 +69,18 @@ stdenv.mkDerivation {
     done
 
     ln -s ../usr/share/zapret/init.d/sysv/init.d $out/bin/zapret
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "DPI bypass multi platform";
     homepage = "https://github.com/bol-van/zapret";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nishimara ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nishimara ];
     mainProgram = "zapret";
 
     # probably gonna work on darwin, but untested
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})
diff --git a/pkgs/tools/archivers/zarchive/default.nix b/pkgs/by-name/za/zarchive/package.nix
similarity index 100%
rename from pkgs/tools/archivers/zarchive/default.nix
rename to pkgs/by-name/za/zarchive/package.nix
diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/by-name/za/zarf/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/zarf/default.nix
rename to pkgs/by-name/za/zarf/package.nix
diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/by-name/za/zasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/zasm/default.nix
rename to pkgs/by-name/za/zasm/package.nix
diff --git a/pkgs/games/zaz/default.nix b/pkgs/by-name/za/zaz/package.nix
similarity index 100%
rename from pkgs/games/zaz/default.nix
rename to pkgs/by-name/za/zaz/package.nix
diff --git a/pkgs/tools/admin/zbctl/default.nix b/pkgs/by-name/zb/zbctl/package.nix
similarity index 100%
rename from pkgs/tools/admin/zbctl/default.nix
rename to pkgs/by-name/zb/zbctl/package.nix
diff --git a/pkgs/applications/science/logic/zchaff/default.nix b/pkgs/by-name/zc/zchaff/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/zchaff/default.nix
rename to pkgs/by-name/zc/zchaff/package.nix
diff --git a/pkgs/applications/science/logic/zchaff/sat_solver.patch b/pkgs/by-name/zc/zchaff/sat_solver.patch
similarity index 100%
rename from pkgs/applications/science/logic/zchaff/sat_solver.patch
rename to pkgs/by-name/zc/zchaff/sat_solver.patch
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/by-name/zd/zd1211fw/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/zd1211/default.nix
rename to pkgs/by-name/zd/zd1211fw/package.nix
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/by-name/zd/zdelta/package.nix
similarity index 100%
rename from pkgs/tools/compression/zdelta/default.nix
rename to pkgs/by-name/zd/zdelta/package.nix
diff --git a/pkgs/tools/security/zdns/default.nix b/pkgs/by-name/zd/zdns/package.nix
similarity index 100%
rename from pkgs/tools/security/zdns/default.nix
rename to pkgs/by-name/zd/zdns/package.nix
diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/by-name/ze/zecwallet-lite/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/zecwallet-lite/default.nix
rename to pkgs/by-name/ze/zecwallet-lite/package.nix
diff --git a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
index 4d02d0931d40..b5c804da5459 100644
--- a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
+++ b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
@@ -1,8 +1,8 @@
 diff --git a/script/generate-licenses b/script/generate-licenses
-index 43b2f5c458..c740a3afa2 100755
+index 9602813f0c..d16d11c203 100755
 --- a/script/generate-licenses
 +++ b/script/generate-licenses
-@@ -15,12 +15,6 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
+@@ -16,16 +16,9 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
  
  echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
  
@@ -14,4 +14,8 @@ index 43b2f5c458..c740a3afa2 100755
 -fi
  
  echo "Generating cargo licenses"
- cargo about generate --fail -c script/licenses/zed-licenses.toml script/licenses/template.hbs.md >> $OUTPUT_FILE
+ cargo about generate \
+-    --fail \
+     -c script/licenses/zed-licenses.toml \
+     "${TEMPLATE_FILE}" >> $OUTPUT_FILE
+ 
diff --git a/pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch b/pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch
new file mode 100644
index 000000000000..2c82a2d49b68
--- /dev/null
+++ b/pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch
@@ -0,0 +1,55 @@
+diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
+index e23c63453e..d0142b83d8 100644
+--- a/crates/live_kit_client/Cargo.toml
++++ b/crates/live_kit_client/Cargo.toml
+@@ -40,10 +40,10 @@ nanoid = { workspace = true, optional = true}
+ parking_lot.workspace = true
+ postage.workspace = true
+ 
+-[target.'cfg(target_os = "macos")'.dependencies]
++[target.'cfg(target_os = "none")'.dependencies]
+ core-foundation.workspace = true
+ 
+-[target.'cfg(all(not(target_os = "macos")))'.dependencies]
++[target.'cfg(all(not(target_os = "none")))'.dependencies]
+ async-trait = { workspace = true }
+ collections = { workspace = true }
+ gpui = { workspace = true }
+diff --git a/crates/live_kit_client/build.rs b/crates/live_kit_client/build.rs
+index 2fdfd982bf..7272614b87 100644
+--- a/crates/live_kit_client/build.rs
++++ b/crates/live_kit_client/build.rs
+@@ -36,7 +36,7 @@ const MACOS_TARGET_VERSION: &str = "10.15.7";
+ 
+ fn main() {
+     if cfg!(all(
+-        target_os = "macos",
++        target_os = "none",
+         not(any(test, feature = "test-support", feature = "no-webrtc")),
+     )) {
+         let swift_target = get_swift_target();
+diff --git a/crates/live_kit_client/src/live_kit_client.rs b/crates/live_kit_client/src/live_kit_client.rs
+index 4820a4eedb..6179e6c55a 100644
+--- a/crates/live_kit_client/src/live_kit_client.rs
++++ b/crates/live_kit_client/src/live_kit_client.rs
+@@ -2,16 +2,16 @@
+ 
+ use std::sync::Arc;
+ 
+-#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
++#[cfg(all(target_os = "none", not(any(test, feature = "test-support"))))]
+ pub mod prod;
+ 
+-#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
++#[cfg(all(target_os = "none", not(any(test, feature = "test-support"))))]
+ pub use prod::*;
+ 
+-#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
++#[cfg(any(test, feature = "test-support", not(target_os = "none")))]
+ pub mod test;
+ 
+-#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
++#[cfg(any(test, feature = "test-support", not(target_os = "none")))]
+ pub use test::*;
+ 
+ pub type Sid = String;
diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock
index ed5ad77c2862..2732c56fab82 100644
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -16,6 +16,7 @@ dependencies = [
  "project",
  "smallvec",
  "ui",
+ "util",
  "workspace",
 ]
 
@@ -261,9 +262,9 @@ checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4"
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
 
 [[package]]
 name = "approx"
@@ -291,6 +292,12 @@ dependencies = [
  "syn 2.0.76",
 ]
 
+[[package]]
+name = "arraydeque"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+
 [[package]]
 name = "arrayref"
 version = "0.3.8"
@@ -385,7 +392,7 @@ dependencies = [
  "ctor",
  "db",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "feature_flags",
  "fs",
  "futures 0.3.30",
@@ -412,6 +419,7 @@ dependencies = [
  "parking_lot",
  "paths",
  "picker",
+ "pretty_assertions",
  "project",
  "proto",
  "rand 0.8.5",
@@ -452,9 +460,11 @@ dependencies = [
  "anyhow",
  "collections",
  "derive_more",
+ "futures 0.3.30",
  "gpui",
  "language",
  "parking_lot",
+ "pretty_assertions",
  "serde",
  "serde_json",
  "workspace",
@@ -1008,6 +1018,7 @@ dependencies = [
  "smol",
  "tempfile",
  "util",
+ "which 6.0.3",
  "workspace",
 ]
 
@@ -2546,9 +2557,8 @@ dependencies = [
  "ctor",
  "dashmap 6.0.1",
  "derive_more",
- "dev_server_projects",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "envy",
  "file_finder",
  "fs",
@@ -2557,7 +2567,6 @@ dependencies = [
  "git_hosting_providers",
  "google_ai",
  "gpui",
- "headless",
  "hex",
  "http_client",
  "hyper 0.14.30",
@@ -2704,7 +2713,7 @@ dependencies = [
  "command_palette_hooks",
  "ctor",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "fuzzy",
  "go_to_line",
  "gpui",
@@ -3472,18 +3481,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dev_server_projects"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "gpui",
- "rpc",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "diagnostics"
 version = "0.1.0"
@@ -3493,7 +3490,7 @@ dependencies = [
  "collections",
  "ctor",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "language",
@@ -3648,6 +3645,12 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
+[[package]]
+name = "ec4rs"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf65d056c7da9c971c2847ce250fd1f0f9659d5718845c3ec0ad95f5668352c"
+
 [[package]]
 name = "ecdsa"
 version = "0.14.8"
@@ -3675,7 +3678,7 @@ dependencies = [
  "ctor",
  "db",
  "emojis",
- "env_logger",
+ "env_logger 0.11.5",
  "file_icons",
  "futures 0.3.30",
  "fuzzy",
@@ -3715,6 +3718,7 @@ dependencies = [
  "tree-sitter-rust",
  "tree-sitter-typescript",
  "ui",
+ "unicode-segmentation",
  "unindent",
  "url",
  "util",
@@ -3881,6 +3885,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.11.5"
@@ -3989,7 +4006,7 @@ dependencies = [
  "client",
  "clock",
  "collections",
- "env_logger",
+ "env_logger 0.11.5",
  "feature_flags",
  "fs",
  "git",
@@ -4084,7 +4101,7 @@ dependencies = [
  "client",
  "collections",
  "ctor",
- "env_logger",
+ "env_logger 0.11.5",
  "fs",
  "futures 0.3.30",
  "gpui",
@@ -4126,7 +4143,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "env_logger",
+ "env_logger 0.11.5",
  "extension",
  "fs",
  "language",
@@ -4285,7 +4302,7 @@ dependencies = [
  "collections",
  "ctor",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "file_icons",
  "futures 0.3.30",
  "fuzzy",
@@ -4893,12 +4910,13 @@ dependencies = [
  "git",
  "gpui",
  "http_client",
+ "indoc",
  "pretty_assertions",
  "regex",
  "serde",
  "serde_json",
- "unindent",
  "url",
+ "util",
 ]
 
 [[package]]
@@ -5040,7 +5058,7 @@ dependencies = [
  "ctor",
  "derive_more",
  "embed-resource",
- "env_logger",
+ "env_logger 0.11.5",
  "etagere",
  "filedescriptor",
  "flume",
@@ -5230,6 +5248,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.9.1"
@@ -5263,28 +5290,6 @@ dependencies = [
  "http 0.2.12",
 ]
 
-[[package]]
-name = "headless"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "extension",
- "fs",
- "futures 0.3.30",
- "gpui",
- "language",
- "log",
- "node_runtime",
- "postage",
- "project",
- "proto",
- "settings",
- "shellexpand 2.1.2",
- "signal-hook",
- "util",
-]
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -6150,6 +6155,20 @@ dependencies = [
  "simple_asn1",
 ]
 
+[[package]]
+name = "jupyter-serde"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a444fb3f87ee6885eb316028cc998c7d84811663ef95d78c419419423d5a054"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "uuid",
+]
+
 [[package]]
 name = "khronos-egl"
 version = "6.0.0"
@@ -6209,7 +6228,8 @@ dependencies = [
  "clock",
  "collections",
  "ctor",
- "env_logger",
+ "ec4rs",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "fuzzy",
  "git",
@@ -6222,6 +6242,7 @@ dependencies = [
  "lsp",
  "parking_lot",
  "postage",
+ "pretty_assertions",
  "pulldown-cmark 0.12.1",
  "rand 0.8.5",
  "regex",
@@ -6265,7 +6286,7 @@ dependencies = [
  "copilot",
  "ctor",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "feature_flags",
  "futures 0.3.30",
  "google_ai",
@@ -6322,7 +6343,7 @@ dependencies = [
  "collections",
  "copilot",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "language",
@@ -6356,6 +6377,11 @@ dependencies = [
  "lsp",
  "node_runtime",
  "paths",
+ "pet",
+ "pet-conda",
+ "pet-core",
+ "pet-poetry",
+ "pet-reporter",
  "project",
  "regex",
  "rope",
@@ -6652,7 +6678,7 @@ dependencies = [
  "async-pipe",
  "collections",
  "ctor",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "log",
@@ -6735,7 +6761,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assets",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "language",
@@ -6848,7 +6874,7 @@ dependencies = [
  "clap",
  "clap_complete",
  "elasticlunr-rs",
- "env_logger",
+ "env_logger 0.11.5",
  "futures-util",
  "handlebars 5.1.2",
  "ignore",
@@ -7030,6 +7056,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "msvc_spectre_libs"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8661ace213a0a130c7c5b9542df5023aedf092a02008ccf477b39ff108990305"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "multi_buffer"
 version = "0.1.0"
@@ -7038,7 +7073,7 @@ dependencies = [
  "clock",
  "collections",
  "ctor",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "itertools 0.13.0",
@@ -7117,6 +7152,21 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "nbformat"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146074ad45cab20f5d98ccded164826158471f21d04f96e40b9872529e10979d"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "jupyter-serde",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "uuid",
+]
+
 [[package]]
 name = "ndk"
 version = "0.8.0"
@@ -7752,8 +7802,10 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "smallvec",
  "smol",
  "theme",
+ "ui",
  "util",
  "workspace",
  "worktree",
@@ -7996,6 +8048,366 @@ dependencies = [
  "sha2",
 ]
 
+[[package]]
+name = "pet"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "clap",
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-env-var-path",
+ "pet-fs",
+ "pet-global-virtualenvs",
+ "pet-homebrew",
+ "pet-jsonrpc",
+ "pet-linux-global-python",
+ "pet-mac-commandlinetools",
+ "pet-mac-python-org",
+ "pet-mac-xcode",
+ "pet-pipenv",
+ "pet-poetry",
+ "pet-pyenv",
+ "pet-python-utils",
+ "pet-reporter",
+ "pet-telemetry",
+ "pet-venv",
+ "pet-virtualenv",
+ "pet-virtualenvwrapper",
+ "pet-windows-registry",
+ "pet-windows-store",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-conda"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-reporter",
+ "regex",
+ "serde",
+ "serde_json",
+ "yaml-rust2",
+]
+
+[[package]]
+name = "pet-core"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-fs",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-env-var-path"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "regex",
+]
+
+[[package]]
+name = "pet-fs"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+]
+
+[[package]]
+name = "pet-global-virtualenvs"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-homebrew"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-jsonrpc"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-linux-global-python"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-mac-commandlinetools"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-mac-python-org"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-mac-xcode"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-pipenv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-poetry"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "base64 0.22.1",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-reporter",
+ "pet-virtualenv",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha2",
+ "toml 0.8.19",
+]
+
+[[package]]
+name = "pet-pyenv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-reporter",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-python-utils"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha2",
+]
+
+[[package]]
+name = "pet-reporter"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-jsonrpc",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-telemetry"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "regex",
+]
+
+[[package]]
+name = "pet-venv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-virtualenv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+]
+
+[[package]]
+name = "pet-virtualenvwrapper"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-windows-registry"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "pet-windows-store",
+ "regex",
+ "winreg 0.52.0",
+]
+
+[[package]]
+name = "pet-windows-store"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "regex",
+ "winreg 0.52.0",
+]
+
 [[package]]
 name = "petgraph"
 version = "0.6.5"
@@ -8084,7 +8496,7 @@ dependencies = [
  "anyhow",
  "ctor",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "gpui",
  "menu",
  "serde",
@@ -8430,8 +8842,7 @@ dependencies = [
  "client",
  "clock",
  "collections",
- "dev_server_projects",
- "env_logger",
+ "env_logger 0.11.5",
  "fs",
  "futures 0.3.30",
  "fuzzy",
@@ -8472,6 +8883,7 @@ dependencies = [
  "terminal",
  "text",
  "unindent",
+ "url",
  "util",
  "which 6.0.3",
  "windows 0.58.0",
@@ -8501,6 +8913,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "settings",
+ "smallvec",
  "theme",
  "ui",
  "util",
@@ -8966,15 +9379,15 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "auto_update",
- "client",
- "dev_server_projects",
  "editor",
  "file_finder",
  "futures 0.3.30",
  "fuzzy",
  "gpui",
+ "itertools 0.13.0",
  "language",
  "log",
+ "markdown",
  "menu",
  "ordered-float 2.10.1",
  "paths",
@@ -8982,14 +9395,13 @@ dependencies = [
  "project",
  "release_channel",
  "remote",
- "rpc",
  "schemars",
  "serde",
  "serde_json",
  "settings",
  "smol",
  "task",
- "terminal_view",
+ "theme",
  "ui",
  "util",
  "workspace",
@@ -9116,16 +9528,20 @@ name = "remote"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "async-trait",
  "collections",
  "fs",
  "futures 0.3.30",
  "gpui",
+ "itertools 0.13.0",
  "log",
  "parking_lot",
  "prost",
+ "release_channel",
  "rpc",
  "serde",
  "serde_json",
+ "shlex",
  "smol",
  "tempfile",
  "thiserror",
@@ -9140,21 +9556,28 @@ dependencies = [
  "async-watch",
  "backtrace",
  "cargo_toml",
+ "chrono",
  "clap",
  "client",
  "clock",
- "env_logger",
+ "env_logger 0.11.5",
+ "fork",
  "fs",
  "futures 0.3.30",
+ "git",
+ "git_hosting_providers",
  "gpui",
  "http_client",
  "language",
  "languages",
+ "libc",
  "log",
  "lsp",
  "node_runtime",
  "paths",
  "project",
+ "proto",
+ "release_channel",
  "remote",
  "reqwest_client",
  "rpc",
@@ -9164,6 +9587,7 @@ dependencies = [
  "settings",
  "shellexpand 2.1.2",
  "smol",
+ "telemetry_events",
  "toml 0.8.19",
  "util",
  "worktree",
@@ -9190,7 +9614,8 @@ dependencies = [
  "collections",
  "command_palette_hooks",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
+ "feature_flags",
  "futures 0.3.30",
  "gpui",
  "http_client",
@@ -9200,7 +9625,9 @@ dependencies = [
  "languages",
  "log",
  "markdown_preview",
+ "menu",
  "multi_buffer",
+ "nbformat",
  "project",
  "runtimelib",
  "schemars",
@@ -9297,6 +9724,7 @@ dependencies = [
  "system-configuration 0.6.1",
  "tokio",
  "tokio-rustls 0.26.0",
+ "tokio-socks",
  "tokio-util",
  "tower-service",
  "url",
@@ -9469,10 +9897,11 @@ dependencies = [
  "arrayvec",
  "criterion",
  "ctor",
- "env_logger",
+ "env_logger 0.11.5",
  "gpui",
  "log",
  "rand 0.8.5",
+ "rayon",
  "smallvec",
  "sum_tree",
  "unicode-segmentation",
@@ -9500,7 +9929,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "collections",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "parking_lot",
@@ -9538,9 +9967,9 @@ dependencies = [
 
 [[package]]
 name = "runtimelib"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d76d28b882a7b889ebb04e79bc2b160b3061821ea596ff0f4a838fc7a76db0"
+checksum = "263588fe9593333c4bfde258c9021fc64e766ea434e070c6b67c7100536d6499"
 dependencies = [
  "anyhow",
  "async-dispatcher",
@@ -9552,6 +9981,7 @@ dependencies = [
  "dirs 5.0.1",
  "futures 0.3.30",
  "glob",
+ "jupyter-serde",
  "rand 0.8.5",
  "ring 0.17.8",
  "serde",
@@ -10089,7 +10519,7 @@ dependencies = [
  "client",
  "clock",
  "collections",
- "env_logger",
+ "env_logger 0.11.5",
  "feature_flags",
  "fs",
  "futures 0.3.30",
@@ -10294,6 +10724,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
+ "ec4rs",
  "fs",
  "futures 0.3.30",
  "gpui",
@@ -10781,7 +11212,7 @@ dependencies = [
  "futures-io",
  "futures-util",
  "hashbrown 0.14.5",
- "hashlink",
+ "hashlink 0.9.1",
  "hex",
  "indexmap 2.4.0",
  "log",
@@ -11105,7 +11536,7 @@ version = "0.1.0"
 dependencies = [
  "arrayvec",
  "ctor",
- "env_logger",
+ "env_logger 0.11.5",
  "log",
  "rand 0.8.5",
  "rayon",
@@ -11119,7 +11550,7 @@ dependencies = [
  "client",
  "collections",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "futures 0.3.30",
  "gpui",
  "http_client",
@@ -11418,7 +11849,7 @@ dependencies = [
  "collections",
  "ctor",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "gpui",
  "language",
  "menu",
@@ -11625,7 +12056,7 @@ dependencies = [
  "clock",
  "collections",
  "ctor",
- "env_logger",
+ "env_logger 0.11.5",
  "gpui",
  "http_client",
  "log",
@@ -11886,7 +12317,6 @@ dependencies = [
  "client",
  "collections",
  "command_palette",
- "dev_server_projects",
  "editor",
  "extensions_ui",
  "feature_flags",
@@ -11995,6 +12425,7 @@ dependencies = [
  "futures-io",
  "futures-util",
  "thiserror",
+ "tokio",
 ]
 
 [[package]]
@@ -12114,6 +12545,21 @@ dependencies = [
  "winnow 0.6.18",
 ]
 
+[[package]]
+name = "toolchain_selector"
+version = "0.1.0"
+dependencies = [
+ "editor",
+ "fuzzy",
+ "gpui",
+ "language",
+ "picker",
+ "project",
+ "ui",
+ "util",
+ "workspace",
+]
+
 [[package]]
 name = "topological-sort"
 version = "0.2.2"
@@ -12285,9 +12731,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-c"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e795ad541f7ae6a80d22975296340a75a12a29afd3a7089f4368021613728e17"
+checksum = "c8b3fb515e498e258799a31d78e6603767cd6892770d9e2290ec00af5c3ad80b"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -12295,9 +12741,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-cpp"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a588a816017469b69f2e3544742e34a5a59dddfb4b9457b657a6052e2ea39c"
+checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -12325,9 +12771,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-elixir"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174acad8a059851f6f768d7893f4b25eedc80eb6643283d545dd71bbb38222a"
+checksum = "97bf0efa4be41120018f23305b105ad4dfd3be1b7f302dc4071d0e6c2dec3a32"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -12419,7 +12865,7 @@ checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"
 [[package]]
 name = "tree-sitter-md"
 version = "0.3.2"
-source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=4cfa6aad6b75052a5077c80fd934757d9267d81b#4cfa6aad6b75052a5077c80fd934757d9267d81b"
+source = "git+https://github.com/tree-sitter-grammars/tree-sitter-markdown?rev=9a23c1a96c0513d8fc6520972beedd419a973539#9a23c1a96c0513d8fc6520972beedd419a973539"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -12859,6 +13305,7 @@ dependencies = [
  "git",
  "gpui",
  "picker",
+ "project",
  "ui",
  "util",
  "workspace",
@@ -13403,9 +13850,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi"
-version = "24.0.0"
+version = "24.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545ae8298ffce025604f7480f9c7d6948c985bef7ce9aee249ef79307813e83c"
+checksum = "fda03f5bfd5c4cc09f75c7e44846663f25f2c48a2d688fbfb5c7a33af6cf34f5"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -13658,9 +14105,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle"
-version = "24.0.0"
+version = "24.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc850ca3c02c5835934d23f28cec4c5a3fb66fe0b4ecd968bbb35609dda5ddc0"
+checksum = "2d3b31bd2b4d2d82a4b747b8dbc45f566214214a4ffdc5690429a73bc221dc8a"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -13673,9 +14120,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-generate"
-version = "24.0.0"
+version = "24.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634b8804a67200bcb43ea8af5f7c53e862439a086b68b16fd333454bc74d5aab"
+checksum = "e2c6136b195fc12067aa9d4e7a5baf118729394df7bc7cbf8c63119bc9f2a7cd"
 dependencies = [
  "anyhow",
  "heck 0.4.1",
@@ -13688,9 +14135,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-macro"
-version = "24.0.0"
+version = "24.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474b7cbdb942c74031e619d66c600bba7f73867c5800fc2c2306cf307649be2f"
+checksum = "8a41eaceee468da976ac43b85c4eb82e482f828d5e8e56f49f90dfac2d9bc3b4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14282,8 +14729,7 @@ dependencies = [
  "collections",
  "db",
  "derive_more",
- "dev_server_projects",
- "env_logger",
+ "env_logger 0.11.5",
  "fs",
  "futures 0.3.30",
  "git",
@@ -14296,7 +14742,6 @@ dependencies = [
  "parking_lot",
  "postage",
  "project",
- "release_channel",
  "remote",
  "schemars",
  "serde",
@@ -14320,12 +14765,13 @@ dependencies = [
  "anyhow",
  "clock",
  "collections",
- "env_logger",
+ "env_logger 0.11.5",
  "fs",
  "futures 0.3.30",
  "fuzzy",
  "git",
  "git2",
+ "git_hosting_providers",
  "gpui",
  "http_client",
  "ignore",
@@ -14490,6 +14936,17 @@ dependencies = [
  "clap",
 ]
 
+[[package]]
+name = "yaml-rust2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8"
+dependencies = [
+ "arraydeque",
+ "encoding_rs",
+ "hashlink 0.8.4",
+]
+
 [[package]]
 name = "yansi"
 version = "1.0.1"
@@ -14577,7 +15034,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.158.2"
+version = "0.160.7"
 dependencies = [
  "activity_indicator",
  "anyhow",
@@ -14601,10 +15058,9 @@ dependencies = [
  "command_palette_hooks",
  "copilot",
  "db",
- "dev_server_projects",
  "diagnostics",
  "editor",
- "env_logger",
+ "env_logger 0.11.5",
  "extension",
  "extensions_ui",
  "feature_flags",
@@ -14617,7 +15073,6 @@ dependencies = [
  "git_hosting_providers",
  "go_to_line",
  "gpui",
- "headless",
  "http_client",
  "image_viewer",
  "inline_completion_button",
@@ -14644,6 +15099,7 @@ dependencies = [
  "project",
  "project_panel",
  "project_symbols",
+ "proto",
  "quick_action_bar",
  "recent_projects",
  "release_channel",
@@ -14672,6 +15128,7 @@ dependencies = [
  "theme",
  "theme_selector",
  "time",
+ "toolchain_selector",
  "tree-sitter-md",
  "tree-sitter-rust",
  "ui",
@@ -14685,7 +15142,6 @@ dependencies = [
  "winresource",
  "workspace",
  "zed_actions",
- "zstd",
 ]
 
 [[package]]
@@ -14718,13 +15174,6 @@ dependencies = [
  "zed_extension_api 0.1.0",
 ]
 
-[[package]]
-name = "zed_dart"
-version = "0.1.1"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zed_deno"
 version = "0.0.2"
@@ -14734,7 +15183,7 @@ dependencies = [
 
 [[package]]
 name = "zed_elixir"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "zed_extension_api 0.1.0",
 ]
@@ -14817,7 +15266,7 @@ dependencies = [
 
 [[package]]
 name = "zed_php"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "zed_extension_api 0.1.0",
 ]
@@ -14858,13 +15307,6 @@ dependencies = [
  "zed_extension_api 0.1.0",
 ]
 
-[[package]]
-name = "zed_svelte"
-version = "0.2.0"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zed_terraform"
 version = "0.1.1"
@@ -14893,14 +15335,6 @@ dependencies = [
  "zed_extension_api 0.1.0",
 ]
 
-[[package]]
-name = "zed_vue"
-version = "0.1.0"
-dependencies = [
- "serde",
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zed_zig"
 version = "0.3.1"
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index cda48aac2a4a..e0c1383b6a64 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -9,7 +9,6 @@
   perl,
   pkg-config,
   protobuf,
-  xcbuild,
   fontconfig,
   freetype,
   libgit2,
@@ -23,7 +22,6 @@
   libglvnd,
   xorg,
   stdenv,
-  darwin,
   makeFontsConf,
   vulkan-loader,
   envsubst,
@@ -32,6 +30,12 @@
   versionCheckHook,
   zed-editor,
   buildFHSEnv,
+  cargo-bundle,
+  git,
+  apple-sdk_15,
+  darwinMinVersionHook,
+  makeWrapper,
+  nodePackages_latest,
 
   withGLES ? false,
 }:
@@ -86,20 +90,32 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.158.2";
+  version = "0.160.7";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1mNJ3uL5/Sxwiiq2fO+yE9SHiM/5FQWmnNgOEMWpU9s=";
+    hash = "sha256-mbBETOZVXTcfS+yGWPqEh+NEjo6UMTvk3XMghd8+s/s=";
   };
 
-  patches = [
-    # Zed uses cargo-install to install cargo-about during the script execution.
-    # We provide cargo-about ourselves and can skip this step.
-    ./0001-generate-licenses.patch
-  ];
+  patches =
+    [
+      # Zed uses cargo-install to install cargo-about during the script execution.
+      # We provide cargo-about ourselves and can skip this step.
+      # Until https://github.com/zed-industries/zed/issues/19971 is fixed,
+      # we also skip any crate for which the license cannot be determined.
+      ./0001-generate-licenses.patch
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # The Swift variant of livekit currently used inside Zed requires
+      # Swift 6, which is not available in nixpkgs yet:
+      #   https://github.com/NixOS/nixpkgs/issues/343210
+      # The Rust variant of livekit for Zed is still pending and there is no
+      # schedule when it will be finished:
+      #   https://github.com/zed-industries/zed/pull/13343
+      ./0002-disable-livekit-darwin.patch
+    ];
 
   cargoLock = {
     lockFile = ./Cargo.lock;
@@ -112,28 +128,32 @@ rustPlatform.buildRustPackage rec {
       "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
       "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
       "nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo=";
+      "pet-0.1.0" = "sha256-RxwisvRC5I3TCMAOT+kPasijuf66F+VFok1O9Ep8tGE=";
       "reqwest-0.12.8" = "sha256-mjO6SPYOMiw1H0ZEbd4BlPivPtaLVNftpsCu+M2i3Qw=";
       "tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0=";
       "tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE=";
       "tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw=";
-      "tree-sitter-md-0.3.2" = "sha256-sFcQDabSay9qxzVNAQkHEZB1b9j171dDoYQqaL1iVhE=";
+      "tree-sitter-md-0.3.2" = "sha256-q2/aJx+385B8HiU0soZ1vtRvjkE21ABGzIyR1qwKFOU=";
       "tree-sitter-yaml-0.6.1" = "sha256-95u/bq74SiUHW8lVp3RpanmYS/lyVPW0Inn8gR7N3IQ=";
       "xim-0.4.0" = "sha256-BXyaIBoqMNbzaSJqMadmofdjtlEVSoU6iogF66YP6a4=";
       "xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo=";
     };
   };
 
-  nativeBuildInputs = [
-    clang
-    cmake
-    copyDesktopItems
-    curl
-    perl
-    pkg-config
-    protobuf
-    rustPlatform.bindgenHook
-    cargo-about
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
+  nativeBuildInputs =
+    [
+      clang
+      cmake
+      copyDesktopItems
+      curl
+      perl
+      pkg-config
+      protobuf
+      rustPlatform.bindgenHook
+      cargo-about
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
 
   dontUseCmakeConfigure = true;
 
@@ -154,30 +174,23 @@ rustPlatform.buildRustPackage rec {
       wayland
       xorg.libxcb
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AppKit
-        CoreAudio
-        CoreFoundation
-        CoreGraphics
-        CoreMedia
-        CoreServices
-        CoreText
-        Foundation
-        IOKit
-        Metal
-        Security
-        SystemConfiguration
-        VideoToolbox
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_15
+      # This will need to be increased to 12.3 once
+      # https://github.com/zed-industries/zed/pull/13343
+      # is merged and released, as ScreenCaptureKit is only available on 12.3 and up:
+      # https://developer.apple.com/documentation/screencapturekit
+      (darwinMinVersionHook "10.15")
+    ];
 
   cargoBuildFlags = [
     "--package=zed"
     "--package=cli"
   ];
-  buildFeatures = [ "gpui/runtime_shaders" ];
+
+  # Required on darwin because we don't have access to the
+  # proprietary Metal shader compiler.
+  buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -189,9 +202,12 @@ rustPlatform.buildRustPackage rec {
     };
     # Setting this environment variable allows to disable auto-updates
     # https://zed.dev/docs/development/linux#notes-for-packaging-zed
-    ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled.";
+    ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
     # Used by `zed --version`
     RELEASE_VERSION = version;
+    # Required until `-isysroot` can be used with libclang in nixpkgs on darwin, otherwise
+    # rust bindgen will not work as expected
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${apple-sdk_15.sdkroot}/System/Library/Frameworks";
   };
 
   RUSTFLAGS = if withGLES then "--cfg gles" else "";
@@ -204,44 +220,88 @@ rustPlatform.buildRustPackage rec {
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
     patchelf --add-rpath ${wayland}/lib $out/libexec/*
+    wrapProgram $out/libexec/zed-editor --suffix PATH : ${
+      lib.makeBinPath [ nodePackages_latest.nodejs ]
+    }
   '';
 
   preCheck = ''
     export HOME=$(mktemp -d);
   '';
 
-  checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
-    # Fails on certain hosts (including Hydra) for unclear reason
-    "--skip=test_open_paths_action"
+  checkFlags =
+    [
+      # Flaky: unreliably fails on certain hosts (including Hydra)
+      "--skip=zed::tests::test_window_edit_state_restoring_enabled"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      # Fails on certain hosts (including Hydra) for unclear reason
+      "--skip=test_open_paths_action"
+    ];
 
-    # Flaky: unreliably fails on certain hosts (including Hydra)
-    "--skip=zed::tests::test_window_edit_state_restoring_enabled"
-  ];
+  installPhase =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        runHook preInstall
 
-  installPhase = ''
-    runHook preInstall
+        # cargo-bundle expects the binary in target/release
+        mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed target/release/zed
 
-    mkdir -p $out/bin $out/libexec
-    cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
-    cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor
+        pushd crates/zed
 
-    install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
-    install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
+        # Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
+        sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
+        export CARGO_BUNDLE_SKIP_BUILD=true
+        app_path=$(cargo bundle --release | xargs)
 
-    # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
-    # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
-    (
-      export DO_STARTUP_NOTIFY="true"
-      export APP_CLI="zeditor"
-      export APP_ICON="zed"
-      export APP_NAME="Zed"
-      export APP_ARGS="%U"
-      mkdir -p "$out/share/applications"
-      ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
-    )
+        # We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
+        # Remove closing tags from Info.plist (last two lines)
+        head -n -2 $app_path/Contents/Info.plist > Info.plist
+        # Append extensions
+        cat resources/info/*.plist >> Info.plist
+        # Add closing tags
+        printf "\n\n" >> Info.plist
+        mv Info.plist $app_path/Contents/Info.plist
 
-    runHook postInstall
-  '';
+        popd
+
+        mkdir -p $out/Applications $out/bin
+        # Zed expects git next to its own binary
+        ln -s ${git}/bin/git $app_path/Contents/MacOS/git
+        mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $app_path/Contents/MacOS/cli
+        mv $app_path $out/Applications/
+
+        # Physical location of the CLI must be inside the app bundle as this is used
+        # to determine which app to start
+        ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zeditor
+
+        runHook postInstall
+      ''
+    else
+      ''
+        runHook preInstall
+
+        mkdir -p $out/bin $out/libexec
+        cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
+        cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor
+
+        install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
+        install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
+
+        # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
+        # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
+        (
+          export DO_STARTUP_NOTIFY="true"
+          export APP_CLI="zeditor"
+          export APP_ICON="zed"
+          export APP_NAME="Zed"
+          export APP_ARGS="%U"
+          mkdir -p "$out/share/applications"
+          ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
+        )
+
+        runHook postInstall
+      '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -269,8 +329,6 @@ rustPlatform.buildRustPackage rec {
       niklaskorz
     ];
     mainProgram = "zeditor";
-    platforms = lib.platforms.all;
-    # Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618
-    broken = stdenv.hostPlatform.isDarwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/by-name/ze/zed/package.nix
similarity index 100%
rename from pkgs/development/tools/zed/default.nix
rename to pkgs/by-name/ze/zed/package.nix
diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix
new file mode 100644
index 000000000000..9cca3fdaac51
--- /dev/null
+++ b/pkgs/by-name/ze/zeekscript/package.nix
@@ -0,0 +1,42 @@
+{ lib
+, python3
+, fetchPypi
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "zeekscript";
+  version = "1.2.8";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-v0PJY0Ahxa4k011AwtWSIAWBXvt3Aybrd382j1SIT6M=";
+  };
+
+  postPatch = ''
+    sed -i '/name = "zeekscript"/a version = "${version}"' pyproject.toml
+  '';
+
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools
+    wheel
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    tree-sitter
+  ];
+
+  pythonImportsCheck = [
+    "zeekscript"
+  ];
+
+  meta = with lib; {
+    description = "Zeek script formatter and analyzer";
+    homepage = "https://github.com/zeek/zeekscript";
+    changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fab tobim ];
+    # Incompatible with tree-sitter > 0.21.
+    broken = true;
+  };
+}
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/by-name/ze/zeitgeist/package.nix
similarity index 100%
rename from pkgs/development/libraries/zeitgeist/default.nix
rename to pkgs/by-name/ze/zeitgeist/package.nix
diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
new file mode 100644
index 000000000000..5d7b348bc1f8
--- /dev/null
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
+  installShellFiles,
+  pkg-config,
+  curl,
+  openssl,
+  mandown,
+  zellij,
+  testers,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zellij";
+  version = "0.41.1";
+
+  src = fetchFromGitHub {
+    owner = "zellij-org";
+    repo = "zellij";
+    rev = "v${version}";
+    hash = "sha256-EUoJHM0Jm0uFKFeHhtzon/ZRC615SHfYa1gr4RnCNBw=";
+  };
+
+  cargoHash = "sha256-rI3pa0dvC/OVJz8gzD1bM0Q+8OWwvGj+jGDEMSbSb2I=";
+
+  env.OPENSSL_NO_VENDOR = 1;
+
+  # Workaround for https://github.com/zellij-org/zellij/issues/3720
+  postPatch = ''
+    substituteInPlace zellij-utils/Cargo.toml \
+      --replace-fail 'isahc = "1.7.2"' 'isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }'
+  '';
+
+  nativeBuildInputs = [
+    mandown
+    installShellFiles
+    pkg-config
+    (lib.getDev curl)
+  ];
+
+  buildInputs = [
+    curl
+    openssl
+  ];
+
+  preCheck = ''
+    HOME=$TMPDIR
+  '';
+
+  # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs
+  doInstallCheck = stdenv.hostPlatform.libc == "glibc";
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    ldd "$out/bin/zellij" | grep libcurl.so
+
+    runHook postInstallCheck
+  '';
+
+  postInstall =
+    ''
+      mandown docs/MANPAGE.md > zellij.1
+      installManPage zellij.1
+
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd $pname \
+        --bash <($out/bin/zellij setup --generate-completion bash) \
+        --fish <($out/bin/zellij setup --generate-completion fish) \
+        --zsh <($out/bin/zellij setup --generate-completion zsh)
+    '';
+
+  passthru.tests.version = testers.testVersion { package = zellij; };
+
+  meta = with lib; {
+    description = "Terminal workspace with batteries included";
+    homepage = "https://zellij.dev/";
+    changelog = "https://github.com/zellij-org/zellij/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [
+      therealansh
+      _0x4A6F
+      abbe
+      pyrox0
+    ];
+    mainProgram = "zellij";
+  };
+}
diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/by-name/ze/zenmonitor/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/zenmonitor/default.nix
rename to pkgs/by-name/ze/zenmonitor/package.nix
diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/by-name/ze/zenstates/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/zenstates/default.nix
rename to pkgs/by-name/ze/zenstates/package.nix
diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/by-name/ze/zerobin/package.nix
similarity index 100%
rename from pkgs/applications/networking/zerobin/default.nix
rename to pkgs/by-name/ze/zerobin/package.nix
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/by-name/ze/zeroc-ice/package.nix
similarity index 100%
rename from pkgs/development/libraries/zeroc-ice/default.nix
rename to pkgs/by-name/ze/zeroc-ice/package.nix
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/by-name/ze/zerofree/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zerofree/default.nix
rename to pkgs/by-name/ze/zerofree/package.nix
diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/by-name/ze/zeronet-conservancy/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/zeronet-conservancy/default.nix
rename to pkgs/by-name/ze/zeronet-conservancy/package.nix
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/by-name/ze/zeronet/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/zeronet/default.nix
rename to pkgs/by-name/ze/zeronet/package.nix
diff --git a/pkgs/tools/text/zet/default.nix b/pkgs/by-name/ze/zet/package.nix
similarity index 100%
rename from pkgs/tools/text/zet/default.nix
rename to pkgs/by-name/ze/zet/package.nix
diff --git a/pkgs/misc/zeyple/default.nix b/pkgs/by-name/ze/zeyple/package.nix
similarity index 100%
rename from pkgs/misc/zeyple/default.nix
rename to pkgs/by-name/ze/zeyple/package.nix
diff --git a/pkgs/tools/misc/zf/deps.nix b/pkgs/by-name/zf/zf/deps.nix
similarity index 100%
rename from pkgs/tools/misc/zf/deps.nix
rename to pkgs/by-name/zf/zf/deps.nix
diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/by-name/zf/zf/package.nix
similarity index 100%
rename from pkgs/tools/misc/zf/default.nix
rename to pkgs/by-name/zf/zf/package.nix
diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix
index 9e0030fe40cd..f0017eb84c8c 100644
--- a/pkgs/by-name/zf/zfind/package.nix
+++ b/pkgs/by-name/zf/zfind/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "zfind";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "laktak";
     repo = "zfind";
     rev = "v${version}";
-    hash = "sha256-sRZAsmh193K5HX7oC1UdCQccNpSc5QHtec+UpvpntKU=";
+    hash = "sha256-bbeS2x9HzrsOE5h1y07LoEBm9dinMCHX9GJftj5Md9s=";
   };
 
   vendorHash = "sha256-blq0/pRppdf2jcuhIqYeNhcazFNZOGeEjPTSLgHqhrU=";
diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
new file mode 100644
index 000000000000..01919156fc80
--- /dev/null
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -0,0 +1,82 @@
+{
+  cmake,
+  cudatoolkit,
+  fetchFromGitHub,
+  gfortran,
+  lib,
+  llvmPackages,
+  python3Packages,
+  stdenv,
+  config,
+  enableCfp ? true,
+  enableCuda ? config.cudaSupport,
+  enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms,
+  enableOpenMP ? true,
+  enablePython ? true,
+  enableUtilities ? true,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zfp";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "LLNL";
+    repo = "zfp";
+    rev = finalAttrs.version;
+    hash = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
+  };
+
+  patches = [
+    # part of https://github.com/LLNL/zfp/pull/217
+    # Remove distutils
+    ./python312.patch
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs =
+    lib.optional enableCuda cudatoolkit
+    ++ lib.optional enableFortran gfortran
+    ++ lib.optional enableOpenMP llvmPackages.openmp
+    ++ lib.optionals enablePython (
+      with python3Packages;
+      [
+        cython
+        numpy
+        python
+      ]
+    );
+
+  # compile CUDA code for all extant GPUs so the binary will work with any GPU
+  # and driver combination. to be ultimately solved upstream:
+  # https://github.com/LLNL/zfp/issues/178
+  # NB: not in cmakeFlags due to https://github.com/NixOS/nixpkgs/issues/114044
+  preConfigure = lib.optionalString enableCuda ''
+    cmakeFlagsArray+=(
+      "-DCMAKE_CUDA_FLAGS=-gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_87,code=sm_87 -gencode=arch=compute_86,code=compute_86"
+    )
+  '';
+
+  cmakeFlags =
+    [
+    ]
+    ++ lib.optional enableCfp "-DBUILD_CFP=ON"
+    ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON"
+    ++ lib.optional enableFortran "-DBUILD_ZFORP=ON"
+    ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"
+    ++ lib.optional enablePython "-DBUILD_ZFPY=ON"
+    ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]);
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://computing.llnl.gov/projects/zfp";
+    description = "Library for random-access compression of floating-point arrays";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.spease ];
+    # 64-bit only
+    platforms = lib.platforms.aarch64 ++ lib.platforms.x86_64;
+    mainProgram = "zfp";
+  };
+})
diff --git a/pkgs/by-name/zf/zfp/python312.patch b/pkgs/by-name/zf/zfp/python312.patch
new file mode 100644
index 000000000000..acd5a9127c72
--- /dev/null
+++ b/pkgs/by-name/zf/zfp/python312.patch
@@ -0,0 +1,43 @@
+From 6610107a865ddaf988a29fe0f07ece05949a0c77 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Wed, 30 Oct 2024 18:20:51 +0800
+Subject: [PATCH] a
+
+---
+ python/scikit-build-cmake/FindPythonExtensions.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/scikit-build-cmake/FindPythonExtensions.cmake b/python/scikit-build-cmake/FindPythonExtensions.cmake
+index 59b30c2..d06c9ad 100644
+--- a/python/scikit-build-cmake/FindPythonExtensions.cmake
++++ b/python/scikit-build-cmake/FindPythonExtensions.cmake
+@@ -254,7 +254,7 @@ endif()
+ include(targetLinkLibrariesWithDynamicLookup)
+ 
+ set(_command "
+-import distutils.sysconfig
++import sysconfig
+ import itertools
+ import os
+ import os.path
+@@ -266,7 +266,7 @@ rel_result = None
+ candidate_lists = []
+ 
+ try:
+-    candidate_lists.append((distutils.sysconfig.get_python_lib(),))
++    candidate_lists.append((sysconfig.get_paths()['purelib'],))
+ except AttributeError: pass
+ 
+ try:
+@@ -293,7 +293,7 @@ sys.stdout.write(\";\".join((
+     sys.prefix,
+     result,
+     rel_result,
+-    distutils.sysconfig.get_config_var('EXT_SUFFIX')
++    sysconfig.get_config_var('EXT_SUFFIX')
+ )))
+ ")
+ 
+-- 
+2.46.1
+
diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfs-autobackup/default.nix
rename to pkgs/by-name/zf/zfs-autobackup/package.nix
diff --git a/pkgs/tools/backup/zfs-prune-snapshots/default.nix b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfs-prune-snapshots/default.nix
rename to pkgs/by-name/zf/zfs-prune-snapshots/package.nix
diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/by-name/zf/zfsbackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfsbackup/default.nix
rename to pkgs/by-name/zf/zfsbackup/package.nix
diff --git a/pkgs/tools/backup/zfsnap/default.nix b/pkgs/by-name/zf/zfsnap/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfsnap/default.nix
rename to pkgs/by-name/zf/zfsnap/package.nix
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/by-name/zf/zfstools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zfstools/default.nix
rename to pkgs/by-name/zf/zfstools/package.nix
diff --git a/pkgs/tools/system/zfxtop/default.nix b/pkgs/by-name/zf/zfxtop/package.nix
similarity index 100%
rename from pkgs/tools/system/zfxtop/default.nix
rename to pkgs/by-name/zf/zfxtop/package.nix
diff --git a/pkgs/tools/security/zgrab2/fix-go-version-error.patch b/pkgs/by-name/zg/zgrab2/fix-go-version-error.patch
similarity index 100%
rename from pkgs/tools/security/zgrab2/fix-go-version-error.patch
rename to pkgs/by-name/zg/zgrab2/fix-go-version-error.patch
diff --git a/pkgs/tools/security/zgrab2/default.nix b/pkgs/by-name/zg/zgrab2/package.nix
similarity index 100%
rename from pkgs/tools/security/zgrab2/default.nix
rename to pkgs/by-name/zg/zgrab2/package.nix
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/by-name/zg/zgrviewer/package.nix
similarity index 100%
rename from pkgs/applications/graphics/zgrviewer/default.nix
rename to pkgs/by-name/zg/zgrviewer/package.nix
diff --git a/pkgs/shells/zsh/zi/default.nix b/pkgs/by-name/zi/zi/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zi/default.nix
rename to pkgs/by-name/zi/zi/package.nix
diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
new file mode 100644
index 000000000000..bd4038cf3dee
--- /dev/null
+++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix
@@ -0,0 +1,47 @@
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+, systemdMinimal
+, nixosTests
+, nix-update-script
+, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal
+}:
+
+buildNpmPackage rec {
+  pname = "zigbee2mqtt";
+  version = "1.41.0";
+
+  src = fetchFromGitHub {
+    owner = "Koenkk";
+    repo = "zigbee2mqtt";
+    rev = version;
+    hash = "sha256-WIU3fTONRckPmSdW5DJXripsf4QdEZM7UBVSru7JqYc=";
+  };
+
+  npmDepsHash = "sha256-yCFhHJCBSc8tCWib9ffqBg4sF9VURx+nXln9ghmBpyM=";
+
+  buildInputs = lib.optionals withSystemd [
+    systemdMinimal
+  ];
+
+  npmFlags = lib.optionals (!withSystemd) [ "--omit=optional" ];
+
+  passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${version}";
+    description = "Zigbee to MQTT bridge using zigbee-shepherd";
+    homepage = "https://github.com/Koenkk/zigbee2mqtt";
+    license = licenses.gpl3;
+    longDescription = ''
+      Allows you to use your Zigbee devices without the vendor's bridge or gateway.
+
+      It bridges events and allows you to control your Zigbee devices via MQTT.
+      In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using.
+    '';
+    maintainers = with maintainers; [ sweber hexa ];
+    mainProgram = "zigbee2mqtt";
+  };
+}
diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/by-name/zi/zilla-slab/package.nix
similarity index 100%
rename from pkgs/data/fonts/zilla-slab/default.nix
rename to pkgs/by-name/zi/zilla-slab/package.nix
diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/by-name/zi/zim-tools/package.nix
similarity index 100%
rename from pkgs/tools/text/zim-tools/default.nix
rename to pkgs/by-name/zi/zim-tools/package.nix
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/by-name/zi/zim/package.nix
similarity index 100%
rename from pkgs/applications/office/zim/default.nix
rename to pkgs/by-name/zi/zim/package.nix
diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/by-name/zi/zimfw/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zimfw/default.nix
rename to pkgs/by-name/zi/zimfw/package.nix
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/by-name/zi/zimg/package.nix
similarity index 100%
rename from pkgs/development/libraries/zimg/default.nix
rename to pkgs/by-name/zi/zimg/package.nix
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/by-name/zi/zimlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/zimlib/default.nix
rename to pkgs/by-name/zi/zimlib/package.nix
diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/by-name/zi/zine/package.nix
similarity index 100%
rename from pkgs/applications/misc/zine/default.nix
rename to pkgs/by-name/zi/zine/package.nix
diff --git a/pkgs/applications/misc/zine/update-time-crate.patch b/pkgs/by-name/zi/zine/update-time-crate.patch
similarity index 100%
rename from pkgs/applications/misc/zine/update-time-crate.patch
rename to pkgs/by-name/zi/zine/update-time-crate.patch
diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/by-name/zi/zinit/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zinit/default.nix
rename to pkgs/by-name/zi/zinit/package.nix
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/by-name/zi/zinnia/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/zinnia/default.nix
rename to pkgs/by-name/zi/zinnia/package.nix
diff --git a/pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch b/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
rename to pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
diff --git a/pkgs/tools/archivers/zip/fix-implicit-declarations.patch b/pkgs/by-name/zi/zip/fix-implicit-declarations.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/fix-implicit-declarations.patch
rename to pkgs/by-name/zi/zip/fix-implicit-declarations.patch
diff --git a/pkgs/tools/archivers/zip/fix-memset-detection.patch b/pkgs/by-name/zi/zip/fix-memset-detection.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/fix-memset-detection.patch
rename to pkgs/by-name/zi/zip/fix-memset-detection.patch
diff --git a/pkgs/tools/archivers/zip/fix-time.h-not-included.patch b/pkgs/by-name/zi/zip/fix-time.h-not-included.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/fix-time.h-not-included.patch
rename to pkgs/by-name/zi/zip/fix-time.h-not-included.patch
diff --git a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/pkgs/by-name/zi/zip/natspec-gentoo.patch.bz2
similarity index 100%
rename from pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
rename to pkgs/by-name/zi/zip/natspec-gentoo.patch.bz2
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/by-name/zi/zip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/zip/default.nix
rename to pkgs/by-name/zi/zip/package.nix
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/by-name/zi/zipkin/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/zipkin/default.nix
rename to pkgs/by-name/zi/zipkin/package.nix
diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/by-name/zi/zita-ajbridge/package.nix
similarity index 100%
rename from pkgs/applications/audio/zita-ajbridge/default.nix
rename to pkgs/by-name/zi/zita-ajbridge/package.nix
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/by-name/zi/zita-alsa-pcmi/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
rename to pkgs/by-name/zi/zita-alsa-pcmi/package.nix
diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/by-name/zi/zita-at1/package.nix
similarity index 100%
rename from pkgs/applications/audio/zita-at1/default.nix
rename to pkgs/by-name/zi/zita-at1/package.nix
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/by-name/zi/zita-convolver/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zita-convolver/default.nix
rename to pkgs/by-name/zi/zita-convolver/package.nix
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/by-name/zi/zita-njbridge/package.nix
similarity index 100%
rename from pkgs/applications/audio/zita-njbridge/default.nix
rename to pkgs/by-name/zi/zita-njbridge/package.nix
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/by-name/zi/zita-resampler/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zita-resampler/default.nix
rename to pkgs/by-name/zi/zita-resampler/package.nix
diff --git a/pkgs/tools/misc/zitadel-tools/default.nix b/pkgs/by-name/zi/zitadel-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/zitadel-tools/default.nix
rename to pkgs/by-name/zi/zitadel-tools/package.nix
diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/by-name/zi/zix/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zix/default.nix
rename to pkgs/by-name/zi/zix/package.nix
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
new file mode 100644
index 000000000000..c16ecd20e9d3
--- /dev/null
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  testers,
+  zizmor,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zizmor";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "woodruffw";
+    repo = "zizmor";
+    rev = "v${version}";
+    hash = "sha256-3W5S49eHZZfKXTI2xdB32kLoTnCVKYtwLbJwempnXCc=";
+  };
+
+  cargoHash = "sha256-ZCCmdnSj6u+k+dRUHFyKuDvnVNBtMAkmcz6TMQ1i7zs=";
+
+  buildInputs = [ openssl ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  passthru.tests.version = testers.testVersion {
+    package = zizmor;
+  };
+
+  meta = {
+    description = "Tool for finding security issues in GitHub Actions setups";
+    homepage = "https://woodruffw.github.io/zizmor/";
+    changelog = "https://github.com/woodruffw/zizmor/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lesuisse ];
+    mainProgram = "zizmor";
+  };
+}
diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/by-name/zk/zk/package.nix
similarity index 100%
rename from pkgs/applications/office/zk/default.nix
rename to pkgs/by-name/zk/zk/package.nix
diff --git a/pkgs/tools/security/zkar/default.nix b/pkgs/by-name/zk/zkar/package.nix
similarity index 100%
rename from pkgs/tools/security/zkar/default.nix
rename to pkgs/by-name/zk/zkar/package.nix
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/by-name/zk/zkfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zkfuse/default.nix
rename to pkgs/by-name/zk/zkfuse/package.nix
diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/by-name/zk/zktree/package.nix
similarity index 100%
rename from pkgs/applications/misc/zktree/default.nix
rename to pkgs/by-name/zk/zktree/package.nix
diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/by-name/zl/zld/package.nix
similarity index 100%
rename from pkgs/development/tools/zld/default.nix
rename to pkgs/by-name/zl/zld/package.nix
diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/by-name/zl/zlib-ng/package.nix
similarity index 100%
rename from pkgs/development/libraries/zlib-ng/default.nix
rename to pkgs/by-name/zl/zlib-ng/package.nix
diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/by-name/zl/zlint/package.nix
similarity index 100%
rename from pkgs/tools/security/zlint/default.nix
rename to pkgs/by-name/zl/zlint/package.nix
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/by-name/zl/zlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/zlog/default.nix
rename to pkgs/by-name/zl/zlog/package.nix
diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/by-name/zl/zls/deps.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/zls/deps.nix
rename to pkgs/by-name/zl/zls/deps.nix
diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix
new file mode 100644
index 000000000000..b685a66a2b08
--- /dev/null
+++ b/pkgs/by-name/zl/zls/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, zig_0_13
+, callPackage
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zls";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "zigtools";
+    repo = "zls";
+    rev = finalAttrs.version;
+    fetchSubmodules = true;
+    hash = "sha256-vkFGoKCYUk6B40XW2T/pdhir2wzN1kpFmlLcoLwJx1U=";
+  };
+
+  zigBuildFlags = [
+    "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in"
+  ];
+
+  nativeBuildInputs = [ zig_0_13.hook ];
+
+  postPatch = ''
+    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  '';
+
+  meta = {
+    description = "Zig LSP implementation + Zig Language Server";
+    mainProgram = "zls";
+    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 _0x5a4 ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/by-name/zm/zmap/package.nix
similarity index 100%
rename from pkgs/tools/security/zmap/default.nix
rename to pkgs/by-name/zm/zmap/package.nix
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/by-name/zm/zmqpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/zmqpp/default.nix
rename to pkgs/by-name/zm/zmqpp/package.nix
diff --git a/pkgs/development/libraries/zmusic/fluidsynth.patch b/pkgs/by-name/zm/zmusic/fluidsynth.patch
similarity index 100%
rename from pkgs/development/libraries/zmusic/fluidsynth.patch
rename to pkgs/by-name/zm/zmusic/fluidsynth.patch
diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/by-name/zm/zmusic/package.nix
similarity index 100%
rename from pkgs/development/libraries/zmusic/default.nix
rename to pkgs/by-name/zm/zmusic/package.nix
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/by-name/zn/zn_poly/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/zn_poly/default.nix
rename to pkgs/by-name/zn/zn_poly/package.nix
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/by-name/zn/znapzend/package.nix
similarity index 100%
rename from pkgs/tools/backup/znapzend/default.nix
rename to pkgs/by-name/zn/znapzend/package.nix
diff --git a/pkgs/games/zod/0002-add-scaling-factor-to-source.patch b/pkgs/by-name/zo/zod/0002-add-scaling-factor-to-source.patch
similarity index 100%
rename from pkgs/games/zod/0002-add-scaling-factor-to-source.patch
rename to pkgs/by-name/zo/zod/0002-add-scaling-factor-to-source.patch
diff --git a/pkgs/games/zod/default.nix b/pkgs/by-name/zo/zod/package.nix
similarity index 100%
rename from pkgs/games/zod/default.nix
rename to pkgs/by-name/zo/zod/package.nix
diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index 4af89fc2f468..81182b2d9d6c 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2024-10-01";
+  version = "3.7.2-2-unstable-2024-10-24";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "650136078a98ef99acf4159310a2c12fd25075d7";
-    hash = "sha256-MtN/x5o0iHZeDqIQCuio8y5pmZXq5qFIE6FySgIY2CY=";
+    rev = "bfd8ee868c4c3fe509fa0fd4f2b8c68d84805ff9";
+    hash = "sha256-hoKMD/nTX0r2PEM0qRhAQFXM45UhDztwK0epL2EIMY8=";
   };
 
-  vendorHash = "sha256-+ayixWCD2e+7Nh9WJmDAloSzp63v9hQYQd8UMuo8qxQ=";
+  vendorHash = "sha256-QZysaEBZ1/ISPRkUPr6UIEUlWv/aHEwk8B/wxaYe7zU=";
 
   nativeCheckInputs = [
     git
diff --git a/pkgs/tools/nix/zon2nix/default.nix b/pkgs/by-name/zo/zon2nix/package.nix
similarity index 100%
rename from pkgs/tools/nix/zon2nix/default.nix
rename to pkgs/by-name/zo/zon2nix/package.nix
diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
similarity index 100%
rename from pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
rename to pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
diff --git a/pkgs/servers/zoneminder/default-to-http-1dot1.patch b/pkgs/by-name/zo/zoneminder/default-to-http-1dot1.patch
similarity index 100%
rename from pkgs/servers/zoneminder/default-to-http-1dot1.patch
rename to pkgs/by-name/zo/zoneminder/default-to-http-1dot1.patch
diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix
new file mode 100644
index 000000000000..766c42c8b742
--- /dev/null
+++ b/pkgs/by-name/zo/zoneminder/package.nix
@@ -0,0 +1,185 @@
+{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkg-config
+, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages
+, polkit, util-linuxMinimal, x264, zlib
+, coreutils, procps, psmisc, nixosTests }:
+
+# NOTES:
+#
+# 1. ZM_CONFIG_DIR is set to $out/etc/zoneminder as the .conf file distributed
+# by upstream contains defaults and is not supposed to be edited so it is fine
+# to keep it read-only.
+#
+# 2. ZM_CONFIG_SUBDIR is where we place our configuration from the NixOS module
+# but as the installer will try to put files there, we patch Config.pm after the
+# install.
+#
+# 3. ZoneMinder is run with -T passed to the perl interpreter which makes perl
+# ignore PERL5LIB. We therefore have to do the substitution into -I parameters
+# ourselves which results in ugly wrappers.
+#
+# 4. The makefile for the perl modules needs patching to put things into the
+# right place. That also means we have to not run "make install" for them.
+#
+# 5. In principal the various ZM_xx variables should be overridable from the
+# config file but some of them are baked into the perl scripts, so we *have* to
+# set them here instead of in the configuration in the NixOS module.
+#
+# 6. I am no PolicyKit expert but the .policy file looks fishy:
+#   a. The user needs to be known at build-time so we should probably throw
+#   upstream's policy file away and generate it from the NixOS module
+#   b. I *think* we may have to substitute the store paths with
+#   /run/current-system/sw/bin paths for it to work.
+#
+# 7. we manually fix up the perl paths in the scripts as fixupPhase will only
+# handle pkexec and not perl if both are present.
+#
+# 8. There are several perl modules needed at runtime which are not checked when
+# building so if a new version stops working, check if there is a missing
+# dependency by running the failing component manually.
+#
+# 9. Parts of the web UI has a hardcoded /zm path so we create a symlink to work
+# around it.
+
+let
+  addons = [
+    {
+      path = "scripts/ZoneMinder/lib/ZoneMinder/Control/Xiaomi.pm";
+      src = fetchurl {
+        url = "https://gist.githubusercontent.com/joshstrange/73a2f24dfaf5cd5b470024096ce2680f/raw/e964270c5cdbf95e5b7f214f7f0fc6113791530e/Xiaomi.pm";
+        sha256 = "04n1ap8fx66xfl9q9rypj48pzbgzikq0gisfsfm8wdsmflarz43v";
+      };
+    }
+  ];
+
+  user    = "zoneminder";
+  dirName = "zoneminder";
+  perlBin = "${perl}/bin/perl";
+
+in stdenv.mkDerivation rec {
+  pname = "zoneminder";
+  version = "1.36.35";
+
+  src = fetchFromGitHub {
+    owner  = "ZoneMinder";
+    repo   = "zoneminder";
+    rev    = version;
+    hash = "sha256-0mpT3qjF8zlcsd6OlNIvrabDsz+oJPPy9Vn2TQSuHAI=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    ./default-to-http-1dot1.patch
+    ./0001-Don-t-use-file-timestamp-in-cache-filename.patch
+  ];
+
+  postPatch = ''
+    rm -rf web/api/lib/Cake/Test
+
+    ${lib.concatStringsSep "\n" (map (e: ''
+      cp ${e.src} ${e.path}
+    '') addons)}
+
+    for d in scripts/ZoneMinder onvif/{modules,proxy} ; do
+      substituteInPlace $d/CMakeLists.txt \
+        --replace 'DESTDIR="''${CMAKE_CURRENT_BINARY_DIR}/output"' "PREFIX=$out INSTALLDIRS=site"
+      sed -i '/^install/d' $d/CMakeLists.txt
+    done
+
+    substituteInPlace misc/CMakeLists.txt \
+      --replace '"''${PC_POLKIT_PREFIX}/''${CMAKE_INSTALL_DATAROOTDIR}' "\"$out/share"
+
+    for f in misc/*.policy.in \
+             scripts/*.pl* \
+             scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in ; do
+      substituteInPlace $f \
+        --replace '/usr/bin/perl' '${perlBin}' \
+        --replace '/bin:/usr/bin' "$out/bin:${lib.makeBinPath [ coreutils procps psmisc ]}"
+    done
+
+    substituteInPlace scripts/zmdbbackup.in \
+      --replace /usr/bin/mysqldump ${mariadb.client}/bin/mysqldump
+
+    substituteInPlace scripts/zmupdate.pl.in \
+      --replace "'mysql'" "'${mariadb.client}/bin/mysql'" \
+      --replace "'mysqldump'" "'${mariadb.client}/bin/mysqldump'"
+
+    for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
+             scripts/zmupdate.pl.in \
+             src/zm_config_data.h.in \
+             web/api/app/Config/bootstrap.php.in \
+             web/includes/config.php.in ; do
+      substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
+    done
+
+    for f in includes/Event.php views/image.php ; do
+      substituteInPlace web/$f \
+        --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
+    done
+
+    for f in scripts/ZoneMinder/lib/ZoneMinder/Event.pm \
+             scripts/ZoneMinder/lib/ZoneMinder/Storage.pm ; do
+      substituteInPlace $f \
+        --replace '/bin/rm' "${coreutils}/bin/rm"
+    done
+
+    substituteInPlace web/includes/functions.php \
+      --replace "'date " "'${coreutils}/bin/date " \
+      --subst-var-by srcHash "`basename $out`"
+  '';
+
+  buildInputs = [
+    curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb pcre perl polkit x264 zlib
+    util-linuxMinimal # for libmount
+  ] ++ (with perlPackages; [
+    # build-time dependencies
+    DateManip DBI DBDmysql LWP SysMmap
+    # run-time dependencies not checked at build-time
+    ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
+    CryptEksblowfish DataEntropy # zmupdate.pl
+  ]);
+
+  nativeBuildInputs = [ cmake makeWrapper pkg-config ];
+
+  cmakeFlags = [
+    "-DWITH_SYSTEMD=ON"
+    "-DZM_LOGDIR=/var/log/${dirName}"
+    "-DZM_RUNDIR=/run/${dirName}"
+    "-DZM_SOCKDIR=/run/${dirName}"
+    "-DZM_TMPDIR=/tmp/${dirName}"
+    "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
+    "-DZM_WEB_USER=${user}"
+    "-DZM_WEB_GROUP=${user}"
+  ];
+
+  passthru = {
+    inherit dirName;
+    tests = nixosTests.zoneminder;
+  };
+
+  postInstall = ''
+    PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}"
+
+    perlFlags="-wT"
+    for i in $(IFS=$'\n'; echo $PERL5LIB | tr ':' "\n" | sort -u); do
+      perlFlags="$perlFlags -I$i"
+    done
+
+    mkdir -p $out/libexec
+    for f in $out/bin/*.pl ; do
+      mv $f $out/libexec/
+      makeWrapper ${perlBin} $f \
+        --prefix PATH : $out/bin \
+        --add-flags "$perlFlags $out/libexec/$(basename $f)"
+    done
+
+    ln -s $out/share/zoneminder/www $out/share/zoneminder/www/zm
+  '';
+
+  meta = with lib; {
+    description = "Video surveillance software system";
+    homepage = "https://zoneminder.com";
+    license = licenses.gpl3;
+    maintainers = [ ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix
new file mode 100644
index 000000000000..f230b9d8d21e
--- /dev/null
+++ b/pkgs/by-name/zo/zookeeper/package.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }:
+let
+  # Latest supported LTS JDK for Zookeeper 3.9:
+  # https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_requiredSoftware
+  jre = jdk11_headless;
+in
+stdenv.mkDerivation rec {
+  pname = "zookeeper";
+  version = "3.9.3";
+
+  src = fetchurl {
+    url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
+    hash = "sha512-1E2HDBaRZi778ai68YWckBuCDcX/Fjs26BvrJ7b7880xtfHwdWl+2q9tPnpMsMyS+STc/2SylO8T1TVYm9rxQw==";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ jre ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -R conf docs lib $out
+    mkdir -p $out/bin
+    cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin
+    patchShebangs $out/bin
+    substituteInPlace $out/bin/zkServer.sh \
+        --replace-fail /bin/echo ${coreutils}/bin/echo
+    for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do
+      wrapProgram $i \
+        --set JAVA_HOME "${jre}" \
+        --prefix PATH : "${bash}/bin"
+    done
+    chmod -x $out/bin/zkEnv.sh
+    runHook postInstall
+  '';
+
+  passthru = {
+    tests = {
+      nixos = nixosTests.zookeeper;
+    };
+    inherit jre;
+  };
+
+  meta = with lib; {
+    homepage = "https://zookeeper.apache.org";
+    description = "Apache Zookeeper";
+    changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nathan-gs pradeepchhetri ztzg ];
+    platforms = platforms.unix;
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+  };
+}
diff --git a/pkgs/by-name/zo/zookeeper_mt/package.nix b/pkgs/by-name/zo/zookeeper_mt/package.nix
new file mode 100644
index 000000000000..953559dbecb5
--- /dev/null
+++ b/pkgs/by-name/zo/zookeeper_mt/package.nix
@@ -0,0 +1,56 @@
+{ lib, stdenv
+, fetchurl
+, autoreconfHook
+, jre
+, openssl
+, pkg-config
+# We depend on ZooKeeper for the Jute compiler.
+, zookeeper
+}:
+
+stdenv.mkDerivation rec {
+  pname = "zookeeper_mt";
+  version = lib.getVersion zookeeper;
+
+  src = fetchurl {
+    url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
+    hash = "sha512-eo/9yeSPbik+5f3g3uc//N0aTx5VS0KCzkA/+wn/FFtAmHwnLex1GZOoOlQwly4KU10Y+pgY1shKab/aigPSFg==";
+  };
+
+  sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    jre
+  ];
+
+  buildInputs = [
+    openssl
+    zookeeper
+  ];
+
+  # Generate the C marshallers/unmarshallers for the Jute-encoded
+  # definitions.
+  preConfigure = ''
+    mkdir generated
+    cd generated
+    java -cp ${zookeeper}/lib/${zookeeper.pname}-jute-${version}.jar \
+        org.apache.jute.compiler.generated.Rcc -l c \
+        ../../../zookeeper-jute/src/main/resources/zookeeper.jute
+    cd ..
+  '';
+
+  configureFlags = [
+    # We're not going to start test servers in the sandbox anyway.
+    "--without-cppunit"
+  ];
+
+  meta = with lib; {
+    homepage = "https://zookeeper.apache.org";
+    description = "Apache Zookeeper";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ commandodev ztzg ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 23f909a274e6..798f7302ea66 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -49,23 +49,23 @@ let
   # and often with different versions.  We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.2.3.40682";
-  versions.x86_64-darwin = "6.2.3.40682";
-  versions.x86_64-linux = "6.2.3.2056";
+  versions.aarch64-darwin = "6.2.5.41699";
+  versions.x86_64-darwin = "6.2.5.41699";
+  versions.x86_64-linux = "6.2.5.2440";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-kpncl6ZVs/O2TXtBhZ/2049jJuUdYlIaxtLX3wIfpVE=";
+      hash = "sha256-GD3WS4O8Xg2EKYS+CirXWHVjNkn3tQ6Ee5u15x218yA=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-gB8pM3EYmA5jF2s/XobV5hk71q16x76nG6M20rWatzE=";
+      hash = "sha256-8yEkB7hpvat33VCxuScsLD+zPKvqeTfK4Wx0vjyA9yY=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-dEQdyYEGXMwABulPHK3fLgHo0ZMF5BT6RnqzD23Al38=";
+      hash = "sha256-h+kt+Im0xv1zoLTvE+Ac9sfw1VyoAnvqFThf5/MwjHU=";
     };
   };
 
diff --git a/pkgs/games/zoom/default.nix b/pkgs/by-name/zo/zoom/package.nix
similarity index 100%
rename from pkgs/games/zoom/default.nix
rename to pkgs/by-name/zo/zoom/package.nix
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/by-name/zo/zopfli/package.nix
similarity index 100%
rename from pkgs/tools/compression/zopfli/default.nix
rename to pkgs/by-name/zo/zopfli/package.nix
diff --git a/pkgs/tools/misc/zotero-translation-server/default.nix b/pkgs/by-name/zo/zotero-translation-server/package.nix
similarity index 100%
rename from pkgs/tools/misc/zotero-translation-server/default.nix
rename to pkgs/by-name/zo/zotero-translation-server/package.nix
diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix
new file mode 100644
index 000000000000..ad60ee9d409e
--- /dev/null
+++ b/pkgs/by-name/zo/zotero/darwin.nix
@@ -0,0 +1,33 @@
+{
+  pname,
+  version,
+  meta,
+  stdenv,
+  fetchurl,
+  undmg,
+}:
+
+stdenv.mkDerivation rec {
+  inherit pname version meta;
+
+  src = fetchurl {
+    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";
+    hash = "sha256-z1HAkHz4JGRfQJna2cINZTmYPzyj9ofp7mJHN/mNyOo=";
+  };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true; # breaks notarization
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -r Zotero.app $out/Applications
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
new file mode 100644
index 000000000000..1b7d58f86883
--- /dev/null
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -0,0 +1,118 @@
+{
+  pname,
+  version,
+  meta,
+  lib,
+  stdenv,
+  fetchurl,
+  wrapGAppsHook3,
+  makeDesktopItem,
+  alsa-lib,
+  atk,
+  cairo,
+  dbus-glib,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  libGL,
+  libva,
+  xorg,
+  mesa,
+  pango,
+  pciutils,
+}:
+
+stdenv.mkDerivation rec {
+  inherit pname version meta;
+
+  src = fetchurl {
+    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
+    hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk=";
+  };
+
+  dontPatchELF = true;
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
+  libPath =
+    lib.makeLibraryPath [
+      alsa-lib
+      atk
+      cairo
+      dbus-glib
+      gdk-pixbuf
+      glib
+      gtk3
+      libGL
+      libva
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXtst
+      xorg.libxcb
+      mesa
+      pango
+      pciutils
+    ]
+    + ":"
+    + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+
+  desktopItem = makeDesktopItem {
+    name = "zotero";
+    exec = "zotero -url %U";
+    icon = "zotero";
+    comment = meta.description;
+    desktopName = "Zotero";
+    genericName = "Reference Management";
+    categories = [
+      "Office"
+      "Database"
+    ];
+    startupNotify = true;
+    mimeTypes = [
+      "x-scheme-handler/zotero"
+      "text/plain"
+    ];
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    # Copy package contents to the output directory
+    mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
+    cp -r * "$prefix/usr/lib/zotero-bin-${version}"
+    mkdir -p "$out/bin"
+    ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
+
+    # Install desktop file and icons
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications/
+    for size in 32 64 128; do
+      install -Dm444 icons/icon''${size}.png \
+        $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
+    done
+    install -Dm444 icons/symbolic.svg \
+      $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    for executable in \
+      zotero-bin plugin-container updater vaapitest \
+      minidump-analyzer glxtest
+    do
+      if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
+        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          "$out/usr/lib/zotero-bin-${version}/$executable"
+      fi
+    done
+    find . -executable -type f -exec \
+      patchelf --set-rpath "$libPath" \
+        "$out/usr/lib/zotero-bin-${version}/{}" \;
+  '';
+}
diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix
new file mode 100644
index 000000000000..f6117050c97f
--- /dev/null
+++ b/pkgs/by-name/zo/zotero/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  callPackage,
+}:
+
+let
+  pname = "zotero";
+  version = "7.0.8";
+  meta = {
+    homepage = "https://www.zotero.org";
+    description = "Collect, organize, cite, and share your research sources";
+    mainProgram = "zotero";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.agpl3Only;
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    maintainers = with lib.maintainers; [
+      atila
+      justanotherariel
+    ];
+  };
+in
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix { inherit pname version meta; }
+else
+  callPackage ./linux.nix { inherit pname version meta; }
diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/by-name/zo/zoxide/package.nix
similarity index 100%
rename from pkgs/tools/misc/zoxide/default.nix
rename to pkgs/by-name/zo/zoxide/package.nix
diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/by-name/zp/zplug/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zplug/default.nix
rename to pkgs/by-name/zp/zplug/package.nix
diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock b/pkgs/by-name/zp/zpool-auto-expand-partitions/Cargo.lock
similarity index 100%
rename from pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock
rename to pkgs/by-name/zp/zpool-auto-expand-partitions/Cargo.lock
diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix
rename to pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/by-name/zp/zpool-iostat-viz/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zpool-iostat-viz/default.nix
rename to pkgs/by-name/zp/zpool-iostat-viz/package.nix
diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/by-name/zp/zprint/package.nix
similarity index 100%
rename from pkgs/development/tools/zprint/default.nix
rename to pkgs/by-name/zp/zprint/package.nix
diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/by-name/zp/zps/package.nix
similarity index 100%
rename from pkgs/tools/system/zps/default.nix
rename to pkgs/by-name/zp/zps/package.nix
diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/by-name/zr/zrepl/package.nix
similarity index 100%
rename from pkgs/tools/backup/zrepl/default.nix
rename to pkgs/by-name/zr/zrepl/package.nix
diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
similarity index 100%
rename from pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
rename to pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
diff --git a/pkgs/tools/networking/zs-wait4host/default.nix b/pkgs/by-name/zs/zs-wait4host/package.nix
similarity index 100%
rename from pkgs/tools/networking/zs-wait4host/default.nix
rename to pkgs/by-name/zs/zs-wait4host/package.nix
diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/by-name/zs/zsa-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/zsa-udev-rules/default.nix
rename to pkgs/by-name/zs/zsa-udev-rules/package.nix
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/by-name/zs/zscroll/package.nix
similarity index 100%
rename from pkgs/applications/misc/zscroll/default.nix
rename to pkgs/by-name/zs/zscroll/package.nix
diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/by-name/zs/zsh-abbr/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-abbr/default.nix
rename to pkgs/by-name/zs/zsh-abbr/package.nix
diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/by-name/zs/zsh-autocomplete/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-autocomplete/default.nix
rename to pkgs/by-name/zs/zsh-autocomplete/package.nix
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/by-name/zs/zsh-autoenv/package.nix
similarity index 100%
rename from pkgs/tools/misc/zsh-autoenv/default.nix
rename to pkgs/by-name/zs/zsh-autoenv/package.nix
diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/by-name/zs/zsh-autopair/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-autopair/default.nix
rename to pkgs/by-name/zs/zsh-autopair/package.nix
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-autosuggestions/default.nix
rename to pkgs/by-name/zs/zsh-autosuggestions/package.nix
diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/by-name/zs/zsh-bd/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-bd/default.nix
rename to pkgs/by-name/zs/zsh-bd/package.nix
diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/by-name/zs/zsh-better-npm-completion/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-better-npm-completion/default.nix
rename to pkgs/by-name/zs/zsh-better-npm-completion/package.nix
diff --git a/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh b/pkgs/by-name/zs/zsh-clipboard/clipboard.plugin.zsh
similarity index 100%
rename from pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh
rename to pkgs/by-name/zs/zsh-clipboard/clipboard.plugin.zsh
diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/by-name/zs/zsh-clipboard/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-clipboard/default.nix
rename to pkgs/by-name/zs/zsh-clipboard/package.nix
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/by-name/zs/zsh-command-time/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-command-time/default.nix
rename to pkgs/by-name/zs/zsh-command-time/package.nix
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/by-name/zs/zsh-completions/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-completions/default.nix
rename to pkgs/by-name/zs/zsh-completions/package.nix
diff --git a/pkgs/shells/zsh/zsh-defer/default.nix b/pkgs/by-name/zs/zsh-defer/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-defer/default.nix
rename to pkgs/by-name/zs/zsh-defer/package.nix
diff --git a/pkgs/shells/zsh/zsh-edit/default.nix b/pkgs/by-name/zs/zsh-edit/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-edit/default.nix
rename to pkgs/by-name/zs/zsh-edit/package.nix
diff --git a/pkgs/shells/zsh/zsh-f-sy-h/default.nix b/pkgs/by-name/zs/zsh-f-sy-h/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-f-sy-h/default.nix
rename to pkgs/by-name/zs/zsh-f-sy-h/package.nix
diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
rename to pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
new file mode 100644
index 000000000000..f63496d0df7e
--- /dev/null
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -0,0 +1,57 @@
+{ stdenvNoCC
+, lib
+, bash
+, coreutils
+, findutils
+, fetchFromGitHub
+, fzf
+, gawk
+, git
+, gnugrep
+, gnused
+, makeWrapper
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "zsh-forgit";
+  version = "24.11.0";
+
+  src = fetchFromGitHub {
+    owner = "wfxr";
+    repo = "forgit";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-8BMFL3WktkkB8m6asbNeb9swnLWi3jHo012fBXGa8ls=";
+  };
+
+  strictDeps = true;
+
+  postPatch = ''
+    substituteInPlace forgit.plugin.zsh \
+      --replace-fail "\$FORGIT_INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit"
+  '';
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D bin/git-forgit $out/bin/git-forgit
+    install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit
+    install -D forgit.plugin.zsh $out/share/zsh/${finalAttrs.pname}/forgit.plugin.zsh
+    wrapProgram $out/bin/git-forgit \
+      --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf gawk git gnugrep gnused ]}
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/wfxr/forgit";
+    description = "Utility tool powered by fzf for using git interactively";
+    mainProgram = "git-forgit";
+    license = licenses.mit;
+    maintainers = with maintainers; [ deejayem ];
+    platforms = platforms.all;
+  };
+})
diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/by-name/zs/zsh-fzf-history-search/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-fzf-history-search/default.nix
rename to pkgs/by-name/zs/zsh-fzf-history-search/package.nix
diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-fzf-tab/default.nix
rename to pkgs/by-name/zs/zsh-fzf-tab/package.nix
diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/by-name/zs/zsh-git-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-git-prompt/default.nix
rename to pkgs/by-name/zs/zsh-git-prompt/package.nix
diff --git a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix b/pkgs/by-name/zs/zsh-history-search-multi-word/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-history-search-multi-word/default.nix
rename to pkgs/by-name/zs/zsh-history-search-multi-word/package.nix
diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-history-substring-search/default.nix
rename to pkgs/by-name/zs/zsh-history-substring-search/package.nix
diff --git a/pkgs/tools/misc/zsh-history-to-fish/default.nix b/pkgs/by-name/zs/zsh-history-to-fish/package.nix
similarity index 100%
rename from pkgs/tools/misc/zsh-history-to-fish/default.nix
rename to pkgs/by-name/zs/zsh-history-to-fish/package.nix
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/by-name/zs/zsh-history/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-history/default.nix
rename to pkgs/by-name/zs/zsh-history/package.nix
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/by-name/zs/zsh-navigation-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/zsh-navigation-tools/default.nix
rename to pkgs/by-name/zs/zsh-navigation-tools/package.nix
diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-nix-shell/default.nix
rename to pkgs/by-name/zs/zsh-nix-shell/package.nix
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch b/pkgs/by-name/zs/zsh-powerlevel10k/gitstatusd.patch
similarity index 100%
rename from pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch
rename to pkgs/by-name/zs/zsh-powerlevel10k/gitstatusd.patch
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-powerlevel10k/default.nix
rename to pkgs/by-name/zs/zsh-powerlevel10k/package.nix
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-powerlevel9k/default.nix
rename to pkgs/by-name/zs/zsh-powerlevel9k/package.nix
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/by-name/zs/zsh-prezto/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-prezto/default.nix
rename to pkgs/by-name/zs/zsh-prezto/package.nix
diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
rename to pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/by-name/zs/zsh-system-clipboard/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-system-clipboard/default.nix
rename to pkgs/by-name/zs/zsh-system-clipboard/package.nix
diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/by-name/zs/zsh-vi-mode/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-vi-mode/default.nix
rename to pkgs/by-name/zs/zsh-vi-mode/package.nix
diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-you-should-use/default.nix
rename to pkgs/by-name/zs/zsh-you-should-use/package.nix
diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/by-name/zs/zsh-z/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-z/default.nix
rename to pkgs/by-name/zs/zsh-z/package.nix
diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/by-name/zs/zssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/zssh/default.nix
rename to pkgs/by-name/zs/zssh/package.nix
diff --git a/pkgs/tools/text/zstxtns-utils/default.nix b/pkgs/by-name/zs/zstxtns-utils/package.nix
similarity index 100%
rename from pkgs/tools/text/zstxtns-utils/default.nix
rename to pkgs/by-name/zs/zstxtns-utils/package.nix
diff --git a/pkgs/by-name/zs/zsv/package.nix b/pkgs/by-name/zs/zsv/package.nix
new file mode 100644
index 000000000000..0cfc77d01074
--- /dev/null
+++ b/pkgs/by-name/zs/zsv/package.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, perl, jq }:
+
+stdenv.mkDerivation rec {
+  pname = "zsv";
+  version = "0.3.8-alpha";
+
+  src = fetchFromGitHub {
+    owner = "liquidaty";
+    repo = "zsv";
+    rev = "v${version}";
+    hash = "sha256-+6oZvMlfLVTDLRlqOpgdZP2YxT6Zlt13wBMFlryBrXY=";
+  };
+
+  nativeBuildInputs = [ perl ];
+
+  buildInputs = [ jq ];
+
+  configureFlags = [
+    "--jq-prefix=${lib.getLib jq}"
+  ];
+
+  meta = with lib; {
+    description = "World's fastest (simd) CSV parser, with an extensible CLI";
+    mainProgram = "zsv";
+    homepage = "https://github.com/liquidaty/zsv";
+    changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = [ ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/misc/ztags/default.nix b/pkgs/by-name/zt/ztags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ztags/default.nix
rename to pkgs/by-name/zt/ztags/package.nix
diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/by-name/zt/zthrottle/package.nix
similarity index 100%
rename from pkgs/tools/misc/zthrottle/default.nix
rename to pkgs/by-name/zt/zthrottle/package.nix
diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/by-name/zu/zuki-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/zuki/default.nix
rename to pkgs/by-name/zu/zuki-themes/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/by-name/zu/zulip-term/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/zulip-term/default.nix
rename to pkgs/by-name/zu/zulip-term/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/pkgs/by-name/zu/zulip-term/pytest-executable-name.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch
rename to pkgs/by-name/zu/zulip-term/pytest-executable-name.patch
diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/by-name/zu/zulip/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/zulip/default.nix
rename to pkgs/by-name/zu/zulip/package.nix
diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/by-name/zu/zuo/package.nix
similarity index 100%
rename from pkgs/development/interpreters/zuo/default.nix
rename to pkgs/by-name/zu/zuo/package.nix
diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix
new file mode 100644
index 000000000000..cc48da24bb3c
--- /dev/null
+++ b/pkgs/by-name/zv/zvbi/package.nix
@@ -0,0 +1,57 @@
+{
+  autoreconfHook,
+  fetchFromGitHub,
+  gitUpdater,
+  lib,
+  libiconv,
+  stdenv,
+  testers,
+  validatePkgConfig,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zvbi";
+  version = "0.2.42";
+
+  src = fetchFromGitHub {
+    owner = "zapping-vbi";
+    repo = "zvbi";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-IeSGscgz51IndX6Xbu8Kw8GcJ9MLXXFhV+4LvnVkrLE=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    validatePkgConfig
+  ];
+
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "Vertical Blanking Interval (VBI) utilities";
+    homepage = "https://github.com/zapping-vbi/zvbi";
+    changelog = "https://github.com/zapping-vbi/zvbi/blob/v${finalAttrs.version}/ChangeLog";
+    pkgConfigModules = [ "zvbi-0.2" ];
+    license = with lib.licenses; [
+      bsd2
+      bsd3
+      gpl2
+      gpl2Plus
+      lgpl21Plus
+      lgpl2Plus
+      mit
+    ];
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+})
diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix
new file mode 100644
index 000000000000..edb53c145578
--- /dev/null
+++ b/pkgs/by-name/zx/zx/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildNpmPackage rec {
+  pname = "zx";
+  version = "8.2.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "zx";
+    rev = version;
+    hash = "sha256-tu5arRnbIVEVkmLBrutW8rNIHN3joA87AYyO+Smmcug=";
+  };
+
+  npmDepsHash = "sha256-TEVEa0hvSRFp1ju1Ajer4u7mdf4y/N3ged8wuXzyy8A=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for writing scripts using JavaScript";
+    homepage = "https://github.com/google/zx";
+    changelog = "https://github.com/google/zx/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jlbribeiro ];
+    mainProgram = "zx";
+  };
+}
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/by-name/zx/zxcvbn-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/zxcvbn-c/default.nix
rename to pkgs/by-name/zx/zxcvbn-c/package.nix
diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/by-name/zx/zxfer/package.nix
similarity index 100%
rename from pkgs/applications/system/zxfer/default.nix
rename to pkgs/by-name/zx/zxfer/package.nix
diff --git a/pkgs/tools/graphics/zxing/java-zxing.sh b/pkgs/by-name/zx/zxing/java-zxing.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/java-zxing.sh
rename to pkgs/by-name/zx/zxing/java-zxing.sh
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/by-name/zx/zxing/package.nix
similarity index 100%
rename from pkgs/tools/graphics/zxing/default.nix
rename to pkgs/by-name/zx/zxing/package.nix
diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/pkgs/by-name/zx/zxing/zxing-cmdline-encoder.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh
rename to pkgs/by-name/zx/zxing/zxing-cmdline-encoder.sh
diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/pkgs/by-name/zx/zxing/zxing-cmdline-runner.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh
rename to pkgs/by-name/zx/zxing/zxing-cmdline-runner.sh
diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/by-name/zx/zxing/zxing.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/zxing.sh
rename to pkgs/by-name/zx/zxing/zxing.sh
diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index 2b6675459d97..56b62844af84 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -43,7 +43,7 @@ let
     ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
 in stdenv.mkDerivation rec {
   pname = "zxtune";
-  version = "5072";
+  version = "5075";
 
   outputs = [ "out" ];
 
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
     owner = "zxtune";
     repo = "zxtune";
     rev = "r${version}";
-    hash = "sha256-cbSz5fi2HYE7ScYFhopXcp9Ct4dMFughF2TKkY1K4uQ=";
+    hash = "sha256-EhzkNrUU/GEYyLZE5TUIMVaALfqZ3n/0khoZV47GV88=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/by-name/zz/zzuf/package.nix
similarity index 100%
rename from pkgs/tools/security/zzuf/default.nix
rename to pkgs/by-name/zz/zzuf/package.nix
diff --git a/pkgs/common-updater/combinators.nix b/pkgs/common-updater/combinators.nix
index dadbb1e81ca4..a774328380bb 100644
--- a/pkgs/common-updater/combinators.nix
+++ b/pkgs/common-updater/combinators.nix
@@ -120,21 +120,33 @@ rec {
     let
       scripts = scriptsNormalized;
       hasCommitSupport = lib.findSingle ({ supportedFeatures, ... }: supportedFeatures == [ "commit" ]) null null scripts != null;
+      hasSilentSupport = lib.findFirst ({ supportedFeatures, ... }: supportedFeatures == [ "silent" ]) null scripts != null;
+      # Supported features currently only describe the format of the standard output of the update script.
+      # Here we ensure that the standard output of the combined update script is well formed.
       validateFeatures =
         if hasCommitSupport then
+          # Exactly one update script declares only “commit” feature and all the rest declare only “silent” feature.
           ({ supportedFeatures, ... }: supportedFeatures == [ "commit" ] || supportedFeatures == [ "silent" ])
+        else if hasSilentSupport then
+          # All update scripts declare only “silent” feature.
+          ({ supportedFeatures, ... }: supportedFeatures == [ "silent" ])
         else
+          # No update script declares any supported feature to fail loudly on unknown features rather than silently discard them.
           ({ supportedFeatures, ... }: supportedFeatures == [ ]);
     in
 
-    assert lib.assertMsg (lib.all validateFeatures scripts) "Combining update scripts with features enabled (other than a single script with “commit” and all other with “silent”) is currently unsupported.";
+    assert lib.assertMsg (lib.all validateFeatures scripts) "Combining update scripts with features enabled (other than “silent” scripts and an optional single script with “commit”) is currently unsupported.";
     assert lib.assertMsg (builtins.length (lib.unique (builtins.map ({ attrPath ? null, ... }: attrPath) scripts)) == 1) "Combining update scripts with different attr paths is currently unsupported.";
 
     {
       command = commandsToShellInvocation (builtins.map ({ command, ... }: command) scripts);
-      supportedFeatures = lib.optionals hasCommitSupport [
-        "commit"
-      ];
+      supportedFeatures =
+        if hasCommitSupport then
+          [ "commit" ]
+        else if hasSilentSupport then
+          [ "silent" ]
+        else
+          [ ];
     };
 
   /*
diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix
index 2ebfb0fa6fc2..bc7affea173f 100644
--- a/pkgs/common-updater/generic-updater.nix
+++ b/pkgs/common-updater/generic-updater.nix
@@ -42,7 +42,7 @@ let
     ignored_versions="$7"
     rev_prefix="$8"
     odd_unstable="$9"
-    patchlevel_unstable="$${10}"
+    patchlevel_unstable="''${10}"
 
     [[ -n "$name" ]] || name="$UPDATE_NIX_NAME"
     [[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME"
@@ -54,7 +54,7 @@ let
 
     function version_is_ignored() {
       local tag="$1"
-      [ -n "$ignored_versions" ] && ${grep} -E -e "$ignored_versions" <<< "$tag"
+      [ -n "$ignored_versions" ] && ${grep} -q -E -e "$ignored_versions" <<< "$tag"
     }
 
     function version_is_unstable() {
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
deleted file mode 100644
index a9d5885d0e28..000000000000
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv
-, fetchurl
-, gettext
-, gnome
-, itstool
-, libxml2
-, yelp-tools
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-user-docs";
-  version = "46.4";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-J3YHLxX5K9BQKDRfOsigk9RCYN5SpiDWJpPA5e6iBTQ=";
-  };
-
-  nativeBuildInputs = [
-    gettext
-    itstool
-    libxml2
-    yelp-tools
-  ];
-
-  enableParallelBuilding = true;
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-    };
-  };
-
-  meta = with lib; {
-    description = "User and system administration help for the GNOME desktop";
-    homepage = "https://help.gnome.org/users/gnome-help/";
-    license = licenses.cc-by-30;
-    maintainers = teams.gnome.members;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
deleted file mode 100644
index 20f071050dff..000000000000
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "twemoji-color-font";
-  version = "15.0.3";
-
-  # We fetch the prebuilt font because building it takes 1.5 hours on hydra.
-  # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
-  src = fetchurl {
-    url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho=";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
-    install -Dm644 fontconfig/46-twemoji-color.conf $out/etc/fonts/conf.d/46-twemoji-color.conf
-  '';
-
-  meta = with lib; {
-    description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
-    longDescription = ''
-      A color and B&W emoji SVGinOT font built from the Twitter Emoji for
-      Everyone artwork with support for ZWJ, skin tone diversity and country
-      flags.
-
-      The font works in all operating systems, but will currently only show
-      color emoji in Firefox, Thunderbird, Photoshop CC 2017, and Windows Edge
-      V38.14393+. This is not a limitation of the font, but of the operating
-      systems and applications. Regular B&W outline emoji are included for
-      backwards/fallback compatibility.
-    '';
-    homepage = "https://github.com/eosrei/twemoji-color-font";
-    downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
-    license = with licenses; [ cc-by-40 mit ];
-    maintainers = [ maintainers.fgaz ];
-  };
-})
diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix
deleted file mode 100644
index 4fbfeb0fcc39..000000000000
--- a/pkgs/data/icons/colloid-icon-theme/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gitUpdater
-, gtk3
-, hicolor-icon-theme
-, jdupes
-, schemeVariants ? []
-, colorVariants ? [] # default is blue
-}:
-
-let
-  pname = "colloid-icon-theme";
-
-in
-lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ] schemeVariants
-lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants
-
-stdenvNoCC.mkDerivation rec {
-  inherit pname;
-  version = "2024-08-31";
-
-  src = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = pname;
-    rev = version;
-    hash = "sha256-/eUlc+fnmQZ61qE/JWZDiR0mMPntLOec0nmevJa7lrc=";
-  };
-
-  nativeBuildInputs = [
-    gtk3
-    jdupes
-  ];
-
-  propagatedBuildInputs = [
-    hicolor-icon-theme
-  ];
-
-  dontDropIconThemeCache = true;
-
-  # These fixup steps are slow and unnecessary for this package.
-  # Package may install almost 400 000 small files.
-  dontPatchELF = true;
-  dontRewriteSymlinks = true;
-
-  postPatch = ''
-    patchShebangs install.sh
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    name= ./install.sh \
-      ${lib.optionalString (schemeVariants != []) ("--scheme " + builtins.toString schemeVariants)} \
-      ${lib.optionalString (colorVariants != []) ("--theme " + builtins.toString colorVariants)} \
-      --dest $out/share/icons
-
-    jdupes --quiet --link-soft --recurse $out/share
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
-    description = "Colloid icon theme";
-    homepage = "https://github.com/vinceliuice/colloid-icon-theme";
-    license = licenses.gpl3Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ romildo ];
-  };
-}
diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix
deleted file mode 100644
index 05c5092e9b42..000000000000
--- a/pkgs/data/icons/luna-icons/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
-, breeze-icons
-, hicolor-icon-theme
-, pantheon
-, gitUpdater
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "luna-icons";
-  version = "2.1";
-
-  src = fetchFromGitHub {
-    owner = "darkomarko42";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-zxaay4hwKgb9WWhPNG/s9JekltAvRNYmObeoTJi6Po0=";
-  };
-
-  nativeBuildInputs = [
-    gtk3
-  ];
-
-  propagatedBuildInputs = [
-    breeze-icons
-    hicolor-icon-theme
-    pantheon.elementary-icon-theme
-  ];
-
-  dontDropIconThemeCache = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/icons
-    cp -a Luna* $out/share/icons
-
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache "$theme"
-    done
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
-    description = "Icon pack based on marwaita and papirus icons";
-    homepage = "https://github.com/darkomarko42/Luna-Icons";
-    license = [ licenses.gpl3Only ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
-  };
-}
diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix
deleted file mode 100644
index e230382727d0..000000000000
--- a/pkgs/data/misc/cldr-annotations/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenvNoCC, fetchzip }:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "cldr-annotations";
-  version = "45.0";
-
-  src = fetchzip {
-    url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip";
-    stripRoot = false;
-    hash = "sha256-8Id9thc3LWSw87aNpuSjQuLmFsx+XvXcz8Ox1Ua3sJw=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/unicode/cldr/common
-    mv common/annotations{,Derived} -t $out/share/unicode/cldr/common
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
-    homepage = "https://cldr.unicode.org";
-    license = licenses.unicode-30;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ DeeUnderscore ];
-  };
-}
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
deleted file mode 100644
index 54b9c6d27e92..000000000000
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchurl, zstd }:
-
-stdenv.mkDerivation rec {
-  pname = "geolite-legacy";
-  version = "20230901";
-
-  # We use Arch Linux package as a snapshot, because upstream database is updated in-place.
-  geoip = fetchurl {
-    url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-${version}-1-any.pkg.tar.zst";
-    sha256 = "sha256-H6tv0OEf04TvbhbWsm5vwq+lBj4GSyOezd258VOT8yQ=";
-  };
-
-  extra = fetchurl {
-    url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-${version}-1-any.pkg.tar.zst";
-    sha256 = "sha256-Zb5m5TLJ1vcPKypZ3NliaL9oluz97ukTVGlOehuzyPU=";
-  };
-
-  nativeBuildInputs = [ zstd ];
-
-  buildCommand = ''
-    tar -xaf ${geoip}
-    tar -xaf ${extra}
-    mkdir -p $out/share
-    mv usr/share/GeoIP $out/share
-  '';
-
-  meta = with lib; {
-    description = "GeoLite Legacy IP geolocation databases";
-    homepage = "https://mailfud.org/geoip-legacy/";
-    license = licenses.cc-by-sa-40;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ fpletz ];
-  };
-}
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 97532fab180f..557a787a0965 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "5d97d9c05e76d8cecb68f1e9063afb39ca0fb26b",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5d97d9c05e76d8cecb68f1e9063afb39ca0fb26b.tar.gz",
-  "sha256": "1ic4wn5immv06m1m2cq6mzrrgrxbidxmj39licxlkmnm9jlwzjwr",
-  "msg": "Update from Hackage at 2024-09-03T10:29:19Z"
+  "commit": "750067bc36e810a96c066c8800438e0ce9ced327",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz",
+  "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny",
+  "msg": "Update from Hackage at 2024-10-05T14:46:54Z"
 }
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
deleted file mode 100644
index 580dfef90bc5..000000000000
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchurl
-, symlinkJoin
-}:
-
-let
-  version = "15.1";
-
-  fetchData = { suffix, hash }: stdenvNoCC.mkDerivation {
-    pname = "unicode-emoji-${suffix}";
-    inherit version;
-
-    src = fetchurl {
-      url = "https://www.unicode.org/Public/emoji/${version}/emoji-${suffix}.txt";
-      inherit hash;
-    };
-
-    dontUnpack = true;
-
-    installPhase = ''
-      runHook preInstall
-
-      installDir="$out/share/unicode/emoji"
-      mkdir -p "$installDir"
-      cp "$src" "$installDir/emoji-${suffix}.txt"
-
-      runHook postInstall
-    '';
-  };
-
-  srcs = {
-    emoji-sequences = fetchData {
-      suffix = "sequences";
-      hash = "sha256-63LJEV41BPu+HIYhthn4eUcaRszFbi9EVBe3wcrQUNE=";
-    };
-    emoji-test = fetchData {
-      suffix = "test";
-      hash = "sha256-2HbuJJqijqp2z6bfqnAoR6jROwYqpIjUZdA5XugTftk=";
-    };
-    emoji-zwj-sequences = fetchData {
-      suffix = "zwj-sequences";
-      hash = "sha256-mnagPcrPzY+b/gjEnI2QtVGCuXfLzIemlOioGT77Dlc=";
-    };
-  };
-in
-
-symlinkJoin rec {
-  name = "unicode-emoji-${version}";
-
-  paths = lib.attrValues srcs;
-
-  passthru = srcs;
-
-  meta = with lib; {
-    description = "Unicode Emoji Data Files";
-    homepage = "https://home.unicode.org/emoji/";
-    license = licenses.unicode-dfs-2016;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix
deleted file mode 100644
index fd73f1cf4d4d..000000000000
--- a/pkgs/data/themes/adw-gtk3/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, nix-update-script
-, meson
-, ninja
-, sassc
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "adw-gtk3";
-  version = "5.3";
-
-  src = fetchFromGitHub {
-    owner = "lassekongo83";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-DpJLX9PJX1Q8dDOx7YOXQzgNECsKp5uGiCVTX6iSlbI=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    sassc
-  ];
-
-  postPatch = ''
-    chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
-    patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Theme from libadwaita ported to GTK-3";
-    homepage = "https://github.com/lassekongo83/adw-gtk3";
-    license = licenses.lgpl21Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ciferkey ];
-  };
-}
diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/data/themes/marwaita-pop_os/default.nix
deleted file mode 100644
index 33e75cdd08c2..000000000000
--- a/pkgs/data/themes/marwaita-pop_os/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gdk-pixbuf
-, gtk-engine-murrine
-, gtk_engines
-, librsvg
-, gitUpdater
-}:
-
-stdenv.mkDerivation rec {
-  pname = "marwaita-pop_os";
-  version = "17.0";
-
-  src = fetchFromGitHub {
-    owner = "darkomarko42";
-    repo = pname;
-    rev = "1f3561f1231d0e9e931f93c5d59df19ed2205ce0";
-    hash = "sha256-WbCIMEWF5853TQyhq8aRoWzpsmjObm9hEc4I0pxDNOM=";
-  };
-
-  buildInputs = [
-    gdk-pixbuf
-    gtk_engines
-    librsvg
-  ];
-
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/themes
-    cp -a Marwaita* $out/share/themes
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
-    description = "Marwaita GTK theme with Pop_os Linux style";
-    homepage = "https://www.pling.com/p/1377894/";
-    license = licenses.gpl3Only;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix
deleted file mode 100644
index 637fc72acf0a..000000000000
--- a/pkgs/data/themes/orchis-theme/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
-, gnome-themes-extra
-, gtk-engine-murrine
-, sassc
-, border-radius ? null # Suggested: 2 < value < 16
-, tweaks ? [ ] # can be "solid" "compact" "black" "primary" "macos" "submenu" "nord|dracula"
-, withWallpapers ? false
-}:
-
-let
-  pname = "orchis-theme";
-
-  validTweaks = [ "solid" "compact" "black" "primary" "macos" "submenu" "nord" "dracula" ];
-
-  nordXorDracula = with builtins; lib.assertMsg (!(elem "nord" tweaks) || !(elem "dracula" tweaks)) ''
-    ${pname}: dracula and nord cannot be mixed. Tweaks ${toString tweaks}
-  '';
-in
-
-assert nordXorDracula;
-lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
-
-stdenvNoCC.mkDerivation
-rec {
-  inherit pname;
-  version = "2024-09-02";
-
-  src = fetchFromGitHub {
-    repo = "Orchis-theme";
-    owner = "vinceliuice";
-    rev = version;
-    hash = "sha256-rgbqVU2tKLnp+ZQpLTthpo9vPFRkGuayJCADrI2R1ls=";
-  };
-
-  nativeBuildInputs = [ gtk3 sassc ];
-
-  buildInputs = [ gnome-themes-extra ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  preInstall = ''
-    mkdir -p $out/share/themes
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    bash install.sh -d $out/share/themes -t all \
-      ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
-      ${lib.optionalString (border-radius != null) ("--round " + builtins.toString border-radius + "px")}
-    ${lib.optionalString withWallpapers ''
-      mkdir -p $out/share/backgrounds
-      cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds
-    ''}
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Material Design theme for GNOME/GTK based desktop environments";
-    homepage = "https://github.com/vinceliuice/Orchis-theme";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.fufexan ];
-  };
-}
diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix
index 0a3d99458663..6c404d8c534e 100644
--- a/pkgs/data/themes/qogir-kde/default.nix
+++ b/pkgs/data/themes/qogir-kde/default.nix
@@ -1,31 +1,41 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
-, kdeclarative
-, plasma-framework
-, plasma-workspace
 , unstableGitUpdater
 }:
 
+# NOTE:
+#
+# In order to use the qogir sddm theme, the packages
+# kdePackages.plasma-desktop and kdePackages.qtsvg should be added to
+# the option services.displayManager.sddm.extraPackages of the sddm
+# module:
+#
+# environment.systemPackages = with pkgs; [
+#   qogir-kde
+# ];
+#
+# services.displayManager.sddm = {
+#     enable = true;
+#     package = pkgs.kdePackages.sddm;
+#     theme = "Qogir";
+#     extraPackages = with pkgs; [
+#       kdePackages.plasma-desktop
+#       kdePackages.qtsvg
+#     ];
+# };
+
 stdenvNoCC.mkDerivation rec {
   pname = "qogir-kde";
-  version = "0-unstable-2024-09-21";
+  version = "0-unstable-2024-10-30";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "9f665cc10ded4fe0a3100c9151a5bd12d1ac50ca";
-    hash = "sha256-3WdDzOKO962RykLS8P4paxEiA1keGhuah/GhAKdsuhA=";
+    rev = "f2fdab049c403a356a79c9c3b9d45ec4357c1649";
+    hash = "sha256-6Hl2ozxqufin0fe33HZVuofk61E8Vggyk8/XX2R+2H0=";
   };
 
-  # Propagate sddm theme dependencies to user env otherwise sddm does
-  # not find them. Putting them in buildInputs is not enough.
-  propagatedUserEnvPkgs = [
-    kdeclarative.bin
-    plasma-framework
-    plasma-workspace
-  ];
-
   postPatch = ''
     patchShebangs install.sh
 
@@ -52,11 +62,11 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Flat Design theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Qogir-kde";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix
index 299e4c89a131..2a7cada3a46a 100644
--- a/pkgs/data/themes/whitesur-kde/default.nix
+++ b/pkgs/data/themes/whitesur-kde/default.nix
@@ -1,29 +1,41 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
-, plasma-desktop
-, qtsvg
 , unstableGitUpdater
 }:
 
+# NOTE:
+#
+# In order to use the whitesur sddm themes, the packages
+# kdePackages.plasma-desktop and kdePackages.qtsvg should be added to
+# the option services.displayManager.sddm.extraPackages of the sddm
+# module:
+#
+# environment.systemPackages = with pkgs; [
+#   whitesur-kde
+# ];
+#
+# services.displayManager.sddm = {
+#     enable = true;
+#     package = pkgs.kdePackages.sddm;
+#     theme = "WhiteSur-dark";
+#     extraPackages = with pkgs; [
+#       kdePackages.plasma-desktop
+#       kdePackages.qtsvg
+#     ];
+# };
+
 stdenvNoCC.mkDerivation {
   pname = "whitesur-kde";
-  version = "2022-05-01-unstable-2024-09-26";
+  version = "2022-05-01-unstable-2024-11-01";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "whitesur-kde";
-    rev = "8cbb617049ad79ecff63eb62770d360b73fed656";
-    hash = "sha256-uNRO/r8kJByS4BDq0jXth+y0rg3GtGsbXoNLOZHpuNU=";
+    rev = "efba411e11f8f4d3219bffb393d25afae62eacf2";
+    hash = "sha256-052mKpf8e5pSecMzaWB3McOZ/uAqp/XGJjcVWnlKPLE=";
   };
 
-  # Propagate sddm theme dependencies to user env otherwise sddm does
-  # not find them. Putting them in buildInputs is not enough.
-  propagatedUserEnvPkgs = [
-    plasma-desktop
-    qtsvg
-  ];
-
   postPatch = ''
     patchShebangs install.sh sddm/install.sh
 
@@ -55,11 +67,11 @@ stdenvNoCC.mkDerivation {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "MacOS big sur like theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/WhiteSur-kde";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix
deleted file mode 100644
index 6909db147de3..000000000000
--- a/pkgs/data/themes/whitesur/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gitUpdater
-, glib
-, gnome-shell
-, gnome-themes-extra
-, jdupes
-, libxml2
-, sassc
-, util-linux
-, altVariants ? [] # default: normal
-, colorVariants ? [] # default: all
-, opacityVariants ? [] # default: all
-, themeVariants ? [] # default: default (BigSur-like theme)
-, iconVariant ? null # default: standard (Apple logo)
-, nautilusStyle ? null # default: stable (BigSur-like style)
-, nautilusSize ? null # default: 200px
-, panelOpacity ? null # default: 15%
-, panelSize ? null # default: 32px
-, roundedMaxWindow ? false # default: false
-, nordColor ? false # default = false
-, darkerColor ? false # default = false
-}:
-
-let
-  pname = "whitesur-gtk-theme";
-  single = x: lib.optional (x != null) x;
-
-in
-lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants
-lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants
-lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
-lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
-lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
-lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle)
-lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
-lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
-lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize)
-
-stdenv.mkDerivation rec {
-  pname = "whitesur-gtk-theme";
-  version = "2024-05-01";
-
-  src = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-NgmFQtgVJvVXJjZUXt/BIx1hdzjHfVmmwXUCDZZD7+g=";
-  };
-
-  nativeBuildInputs = [
-    glib
-    gnome-shell
-    jdupes
-    libxml2
-    sassc
-    util-linux
-  ];
-
-  buildInputs = [
-    gnome-themes-extra # adwaita engine for Gtk2
-  ];
-
-  postPatch = ''
-    find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do
-      patchShebangs "$file"
-    done
-
-    # Do not provide `sudo`, as it is not needed in our use case of the install script
-    substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false
-
-    # Provides a dummy home directory
-    substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
-  '';
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/themes
-
-    ./install.sh  \
-      ${toString (map (x: "--alt " + x) altVariants)} \
-      ${toString (map (x: "--color " + x) colorVariants)} \
-      ${toString (map (x: "--opacity " + x) opacityVariants)} \
-      ${toString (map (x: "--theme " + x) themeVariants)} \
-      ${lib.optionalString (iconVariant != null) ("--icon " + iconVariant)} \
-      ${lib.optionalString (nautilusStyle != null) ("--nautilus-style " + nautilusStyle)} \
-      ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
-      ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \
-      ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
-      ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \
-      ${lib.optionalString nordColor "--nordcolor"} \
-      ${lib.optionalString darkerColor "--darkercolor"} \
-      --dest $out/share/themes
-
-    jdupes --quiet --link-soft --recurse $out/share
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = {
-    description = "MacOS BigSur like Gtk+ theme based on Elegant Design";
-    homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ romildo ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix
index ed1edae06321..5e4cbf659bc2 100644
--- a/pkgs/desktops/deepin/apps/deepin-album/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix
@@ -4,18 +4,15 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   dtkdeclarative,
   qt5integration,
   qt5platform-plugins,
-  qtbase,
-  qtsvg,
   udisks2-qt5,
   gio-qt,
   freeimage,
-  ffmpeg,
+  ffmpeg_6,
   ffmpegthumbnailer,
 }:
 
@@ -33,8 +30,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -42,12 +39,12 @@ stdenv.mkDerivation rec {
     dtkdeclarative
     qt5integration
     qt5platform-plugins
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     udisks2-qt5
     gio-qt
     freeimage
-    ffmpeg
+    ffmpeg_6
     ffmpegthumbnailer
   ];
 
diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
index 631e42407875..d241359a22a6 100644
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
@@ -5,13 +5,10 @@
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   dde-qt-dbus-factory,
   cmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
   gtest,
 }:
 
@@ -28,17 +25,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     qt5integration
     qt5platform-plugins
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     dde-qt-dbus-factory
     gtest
   ];
diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix
index 19bca29ba5b2..750696aee61a 100644
--- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix
@@ -4,17 +4,14 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   wayland,
   dwayland,
   qt5integration,
   qt5platform-plugins,
   image-editor,
-  qtbase,
-  qtmultimedia,
-  ffmpeg,
+  ffmpeg_6,
   ffmpegthumbnailer,
   libusb1,
   libpciaccess,
@@ -43,15 +40,15 @@ stdenv.mkDerivation rec {
       --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \
       --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0"
     substituteInPlace src/com.deepin.Camera.service \
-      --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \
+      --replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \
       --replace "/usr/share" "$out/share"
   '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -62,9 +59,9 @@ stdenv.mkDerivation rec {
       qt5integration
       qt5platform-plugins
       image-editor
-      qtbase
-      qtmultimedia
-      ffmpeg
+      libsForQt5.qtbase
+      libsForQt5.qtmultimedia
+      ffmpeg_6
       ffmpegthumbnailer
       libusb1
       libpciaccess
@@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
   qtWrapperArgs = [
     "--prefix LD_LIBRARY_PATH : ${
       lib.makeLibraryPath [
-        ffmpeg
+        ffmpeg_6
         ffmpegthumbnailer
         gst_all_1.gstreamer
         gst_all_1.gst-plugins-base
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
index 29c538406c25..9d269f40ba0e 100644
--- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
@@ -7,12 +7,8 @@
   qt5platform-plugins,
   udisks2-qt5,
   cmake,
-  qtbase,
-  qttools,
   pkg-config,
-  kcodecs,
-  karchive,
-  wrapQtAppsHook,
+  libsForQt5,
   minizip,
   libzip,
   libuuid,
@@ -39,9 +35,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -49,8 +45,8 @@ stdenv.mkDerivation rec {
     qt5integration
     qt5platform-plugins
     udisks2-qt5
-    kcodecs
-    karchive
+    libsForQt5.kcodecs
+    libsForQt5.karchive
     minizip
     libzip
     libuuid
@@ -62,9 +58,6 @@ stdenv.mkDerivation rec {
     "-DUSE_TEST=OFF"
   ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
   strictDeps = true;
 
   meta = with lib; {
diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index eaa6ee1a1cfe..50db4ec7095b 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -3,11 +3,8 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
@@ -31,15 +28,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     qt5integration
-    qtsvg
+    libsForQt5.qtsvg
     dtkwidget
     qt5platform-plugins
   ];
diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
index fa5c20c8f545..8f15c0895182 100644
--- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
@@ -5,8 +5,7 @@
   fetchpatch,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   qt5platform-plugins,
   dtkwidget,
   dtkdeclarative,
@@ -37,8 +36,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
index be2af30cc3a2..7e6b31b3ff30 100644
--- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
@@ -4,15 +4,10 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qttools,
-  qtx11extras,
-  qtmultimedia,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qtmpris,
-  qtdbusextended,
   gsettings-qt,
   elfutils,
   ffmpeg_6,
@@ -52,8 +47,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -61,10 +56,10 @@ stdenv.mkDerivation rec {
       dtkwidget
       qt5integration
       qt5platform-plugins
-      qtx11extras
-      qtmultimedia
-      qtdbusextended
-      qtmpris
+      libsForQt5.qtx11extras
+      libsForQt5.qtmultimedia
+      libsForQt5.qtdbusextended
+      libsForQt5.qtmpris
       gsettings-qt
       elfutils
       ffmpeg_6
@@ -88,8 +83,8 @@ stdenv.mkDerivation rec {
     ]);
 
   propagatedBuildInputs = [
-    qtmultimedia
-    qtx11extras
+    libsForQt5.qtmultimedia
+    libsForQt5.qtx11extras
     ffmpegthumbnailer
   ];
 
diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
index f74e2ae3513d..ba567a9ad47e 100644
--- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
@@ -2,13 +2,9 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
-  qtbase,
-  qtsvg,
   xorg,
 }:
 
@@ -24,16 +20,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     dtkwidget
-    qtsvg
+    libsForQt5.qtsvg
     xorg.libXtst
   ];
 
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
index f2ad2569b248..44faf032a4b7 100644
--- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
@@ -2,16 +2,12 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
   dde-qt-dbus-factory,
-  qtwebengine,
-  karchive,
   poppler,
   libchardet,
   libspectre,
@@ -42,10 +38,10 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -53,8 +49,8 @@ stdenv.mkDerivation rec {
     qt5integration
     qt5platform-plugins
     dde-qt-dbus-factory
-    qtwebengine
-    karchive
+    libsForQt5.qtwebengine
+    libsForQt5.karchive
     poppler
     libchardet
     libspectre
diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
index 6c2fffe63032..33d514f48c25 100644
--- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
@@ -2,16 +2,11 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   dde-qt-dbus-factory,
-  qtbase,
-  qtmultimedia,
-  qtx11extras,
   image-editor,
   gsettings-qt,
   xorg,
@@ -20,7 +15,7 @@
   ffmpeg,
   ffmpegthumbnailer,
   portaudio,
-  kwayland,
+  dwayland,
   udev,
   gst_all_1,
 }:
@@ -50,19 +45,20 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
     [
       dtkwidget
       dde-qt-dbus-factory
-      qtbase
-      qtmultimedia
-      qtx11extras
+      qt5integration
+      libsForQt5.qtbase
+      libsForQt5.qtmultimedia
+      libsForQt5.qtx11extras
       image-editor
       gsettings-qt
       xorg.libXdmcp
@@ -73,7 +69,7 @@ stdenv.mkDerivation rec {
       ffmpeg
       ffmpegthumbnailer
       portaudio
-      kwayland
+      dwayland
       udev
     ]
     ++ (with gst_all_1; [
@@ -82,9 +78,7 @@ stdenv.mkDerivation rec {
       gst-plugins-good
     ]);
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
   qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
     "--prefix LD_LIBRARY_PATH : ${
       lib.makeLibraryPath [
         udev
@@ -106,5 +100,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = lib.teams.deepin.members;
+    broken = true;
   };
 }
diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
index 6324cc4d7dd9..2692f445c08e 100644
--- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
@@ -2,13 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtx11extras,
-  qtdeclarative,
+  libsForQt5,
   dtkwidget,
   dde-qt-dbus-factory,
   xorg,
@@ -39,16 +34,16 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qtdeclarative
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
+    libsForQt5.qtdeclarative
     dtkwidget
     dde-qt-dbus-factory
     xorg.libXScrnSaver
diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
index 4542558e399e..540d9d5f1fd7 100644
--- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
@@ -5,11 +5,8 @@
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qmake,
-  qtbase,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,14 +21,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     dtkwidget
     qt5integration
     qt5platform-plugins
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
index a0af0f680634..80415ec8640d 100644
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
@@ -4,19 +4,14 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
   deepin-gettext-tools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qtbase,
-  qtsvg,
-  qtx11extras,
   dde-qt-dbus-factory,
   dde-tray-loader,
   gsettings-qt,
-  polkit-qt,
   procps,
   libpcap,
   libnl,
@@ -60,22 +55,22 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
+    libsForQt5.qttools
     deepin-gettext-tools
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     qt5integration
     qt5platform-plugins
-    qtbase
-    qtsvg
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qtx11extras
     dde-qt-dbus-factory
     dde-tray-loader
     gsettings-qt
-    polkit-qt
+    libsForQt5.polkit-qt
     procps
     libpcap
     libnl
diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
index 1d5e0d390d9d..20e5dab288a3 100644
--- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
@@ -7,12 +7,8 @@
   qt5integration,
   qt5platform-plugins,
   cmake,
-  qtbase,
-  qtsvg,
-  qttools,
-  qtx11extras,
+  libsForQt5,
   pkg-config,
-  wrapQtAppsHook,
   libsecret,
   chrpath,
   lxqt,
@@ -33,19 +29,19 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     lxqt.lxqt-build-tools_0_13
   ];
 
   buildInputs = [
     qt5integration
     qt5platform-plugins
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     dtkwidget
-    qtx11extras
+    libsForQt5.qtx11extras
     libsecret
     chrpath
   ];
diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
index b102318c56ac..46a35db365c2 100644
--- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
@@ -4,17 +4,12 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qtsvg,
   dde-qt-dbus-factory,
   deepin-movie-reborn,
-  qtmultimedia,
-  qtwebengine,
   libvlc,
   gst_all_1,
   gtest,
@@ -43,20 +38,21 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
     [
-      qtbase
-      qtsvg
+      libsForQt5.qtbase
+      libsForQt5.qtsvg
       dtkwidget
+      qt5integration
       qt5platform-plugins
       dde-qt-dbus-factory
       deepin-movie-reborn
-      qtmultimedia
-      qtwebengine
+      libsForQt5.qtmultimedia
+      libsForQt5.qtwebengine
       libvlc
       gtest
     ]
@@ -69,9 +65,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
   qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
     "--prefix LD_LIBRARY_PATH : ${
       lib.makeLibraryPath [
         gst_all_1.gstreamer
diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
index fbbd90703464..7dfc41fe8f0d 100644
--- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
@@ -6,7 +6,7 @@
   gtk3,
   xcursorgen,
   papirus-icon-theme,
-  breeze-icons,
+  libsForQt5,
   hicolor-icon-theme,
   deepin-icon-theme,
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     papirus-icon-theme
     hicolor-icon-theme
     deepin-icon-theme
diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix
index fe8198ad6b9f..711e3e9f9301 100644
--- a/pkgs/desktops/deepin/core/dde-app-services/default.nix
+++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix
@@ -6,9 +6,7 @@
   qt5integration,
   qt5platform-plugins,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
+  libsForQt5,
   doxygen,
 }:
 
@@ -39,9 +37,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     doxygen
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -53,13 +51,13 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DDVERSION=${version}"
     "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "out"}/${qtbase.qtDocPrefix}"
+    "-DQCH_INSTALL_DESTINATION=${placeholder "out"}/${libsForQt5.qtbase.qtDocPrefix}"
   ];
 
   preConfigure = ''
     # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
     # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
+    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
   meta = with lib; {
diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix
index 5a2648d690e8..ca391f0379c2 100644
--- a/pkgs/desktops/deepin/core/dde-appearance/default.nix
+++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix
@@ -4,13 +4,10 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkgui,
   gsettings-qt,
   gtk3,
-  kconfig,
-  kwindowsystem,
-  kglobalaccel,
   xorg,
   iconv,
 }:
@@ -50,16 +47,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkgui
     gsettings-qt
     gtk3
-    kconfig
-    kwindowsystem
-    kglobalaccel
+    libsForQt5.kconfig
+    libsForQt5.kwindowsystem
+    libsForQt5.kglobalaccel
     xorg.libXcursor
     xorg.xcbutilcursor
   ];
diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
index 71069e96ea96..9dbbf0a966e6 100644
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix
@@ -3,15 +3,12 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
   dde-qt-dbus-factory,
-  qtbase,
-  qtsvg,
   libical,
   sqlite,
   runtimeShell,
@@ -38,17 +35,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     qt5integration
     qt5platform-plugins
     dtkwidget
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     dde-qt-dbus-factory
     libical
     sqlite
diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
index 7aecb9f3ba10..03fd59596732 100644
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
@@ -6,12 +6,10 @@
   gio-qt,
   cmake,
   extra-cmake-modules,
-  qttools,
+  libsForQt5,
   wayland,
-  kwayland,
   dwayland,
   pkg-config,
-  wrapQtAppsHook,
   glibmm,
   gtest,
 }:
@@ -31,15 +29,14 @@ stdenv.mkDerivation rec {
     cmake
     extra-cmake-modules
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     gio-qt
     wayland
-    kwayland
     dwayland
     glibmm
     gtest
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index 5e4c8c4f7823..a0d91cbfd262 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -11,10 +11,7 @@
   docparser,
   dde-tray-loader,
   cmake,
-  qttools,
-  qtx11extras,
-  qtmultimedia,
-  kcodecs,
+  libsForQt5,
   pkg-config,
   ffmpegthumbnailer,
   libsecret,
@@ -22,16 +19,13 @@
   mediainfo,
   libzen,
   poppler,
-  polkit-qt,
   polkit,
-  wrapQtAppsHook,
   wrapGAppsHook3,
   lucenepp,
   boost,
   taglib,
   cryptsetup,
   glib,
-  qtbase,
   util-dfm,
   deepin-pdfium,
   libuuid,
@@ -56,9 +50,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     wrapGAppsHook3
   ];
   dontWrapGApps = true;
@@ -109,6 +103,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     dtkwidget
+    qt5integration
     qt5platform-plugins
     deepin-pdfium
     util-dfm
@@ -116,15 +111,15 @@ stdenv.mkDerivation rec {
     glibmm
     docparser
     dde-tray-loader
-    qtx11extras
-    qtmultimedia
-    kcodecs
+    libsForQt5.qtx11extras
+    libsForQt5.qtmultimedia
+    libsForQt5.kcodecs
     ffmpegthumbnailer
     libsecret
     libmediainfo
     mediainfo
     poppler
-    polkit-qt
+    libsForQt5.polkit-qt
     polkit
     lucenepp
     boost
@@ -146,9 +141,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
index 92109c2d9772..89e22adcd0fe 100644
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -3,9 +3,8 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qttools,
+  libsForQt5,
   pkg-config,
-  wrapQtAppsHook,
   dtkwidget,
   dde-qt-dbus-factory,
   dde-tray-loader,
@@ -33,9 +32,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
index 9b71012b11ca..cf83ed735088 100644
--- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
@@ -8,10 +8,7 @@
   dde-qt-dbus-factory,
   pkg-config,
   cmake,
-  qttools,
-  wrapQtAppsHook,
-  polkit-qt,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,20 +25,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
+    qt5integration
     qt5platform-plugins
     dde-qt-dbus-factory
-    polkit-qt
+    libsForQt5.polkit-qt
   ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
   postFixup = ''
     wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent
   '';
diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
index 91c44895e335..9d4e8a227878 100644
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
@@ -5,17 +5,14 @@
   linkFarm,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   wrapGAppsHook3,
-  qtbase,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
   deepin-pw-check,
   gsettings-qt,
   lightdm_qt,
-  qtx11extras,
   linux-pam,
   xorg,
   gtest,
@@ -64,20 +61,21 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
     wrapGAppsHook3
   ];
   dontWrapGApps = true;
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     dtkwidget
+    qt5integration
     qt5platform-plugins
     deepin-pw-check
     gsettings-qt
     lightdm_qt
-    qtx11extras
+    libsForQt5.qtx11extras
     linux-pam
     xorg.libXcursor
     xorg.libXtst
@@ -91,9 +89,6 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
index 4a7e5cf9b016..1f1d9907ec16 100644
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
@@ -4,15 +4,12 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
   dde-tray-loader,
   gsettings-qt,
-  qtx11extras,
   gtest,
 }:
 
@@ -42,29 +39,23 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     dtkwidget
     qt5platform-plugins
+    qt5integration
     dde-tray-loader
     gsettings-qt
-    qtx11extras
+    libsForQt5.qtx11extras
     gtest
   ];
 
   cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
   postFixup = ''
     for binary in $out/lib/deepin-daemon/*; do
       wrapProgram $binary "''${qtWrapperArgs[@]}"
diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix
index 291f20ea63c0..a146f0c6747a 100644
--- a/pkgs/desktops/deepin/core/dde-session/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session/default.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   dtkcore,
   gsettings-qt,
   libsecret,
@@ -48,11 +47,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     dtkcore
     gsettings-qt
     libsecret
diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index a9980375022b..ee1558ef6145 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -5,7 +5,6 @@
   cmake,
   extra-cmake-modules,
   pkg-config,
-  wrapQtAppsHook,
   wayland-scanner,
   dtk6declarative,
   dtk6widget,
diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix
index 4faa91d3ca08..a8a14938a661 100644
--- a/pkgs/desktops/deepin/core/dde-widgets/default.nix
+++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix
@@ -5,10 +5,8 @@
   cmake,
   pkg-config,
   dde-qt-dbus-factory,
-  wrapQtAppsHook,
-  qtbase,
-  qtx11extras,
   dtkwidget,
+  libsForQt5,
   qt5integration,
   gtest,
 }:
@@ -28,12 +26,12 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     dde-qt-dbus-factory
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
     dtkwidget
     qt5integration
     gtest
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index bb4ddee47bf2..5db2a43a5596 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -6,29 +6,10 @@
   pkg-config,
   wayland,
   dwayland,
-  qtbase,
-  qttools,
-  qtx11extras,
-  wrapQtAppsHook,
+  libsForQt5,
   extra-cmake-modules,
   gsettings-qt,
   libepoxy,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kcrash,
-  kdbusaddons,
-  kiconthemes,
-  kglobalaccel,
-  kidletime,
-  knotifications,
-  kpackage,
-  plasma-framework,
-  kcmutils,
-  knewstuff,
-  kdecoration,
-  kscreenlocker,
-  breeze-qt5,
   libinput,
   mesa,
   lcms2,
@@ -58,47 +39,48 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     extra-cmake-modules
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
-  buildInputs = [
-    qtbase
-    qttools
-    qtx11extras
-    wayland
-    dwayland
-    libepoxy
-    gsettings-qt
+  buildInputs =
+    [
+      wayland
+      dwayland
+      libepoxy
+      gsettings-qt
 
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    kiconthemes
+      libinput
+      mesa
+      lcms2
 
-    kglobalaccel
-    kidletime
-    knotifications
-    kpackage
-    plasma-framework
-    kcmutils
-    knewstuff
-    kdecoration
-    kscreenlocker
-
-    breeze-qt5
-    libinput
-    mesa
-    lcms2
-
-    xorg.libxcb
-    xorg.libXdmcp
-    xorg.libXcursor
-    xorg.xcbutilcursor
-    xorg.libXtst
-    xorg.libXScrnSaver
-  ];
+      xorg.libxcb
+      xorg.libXdmcp
+      xorg.libXcursor
+      xorg.xcbutilcursor
+      xorg.libXtst
+      xorg.libXScrnSaver
+    ]
+    ++ (with libsForQt5; [
+      qtbase
+      qtx11extras
+      kconfig
+      kconfigwidgets
+      kcoreaddons
+      kcrash
+      kdbusaddons
+      kiconthemes
+      kglobalaccel
+      kidletime
+      knotifications
+      kpackage
+      plasma-framework
+      kcmutils
+      knewstuff
+      kdecoration
+      kscreenlocker
+      breeze-qt5
+    ]);
 
   cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ];
 
@@ -107,11 +89,11 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Fork of kwin, an easy to use, but flexible, composited Window Manager";
     homepage = "https://github.com/linuxdeepin/deepin-kwin";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }
diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
index c76a095b2463..b3deff9bf44f 100644
--- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = with lib; {
diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
index e78ba159c95d..30c9bf457642 100644
--- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   dde-polkit-agent,
   qt5integration,
@@ -31,8 +30,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 4b350abdd1a7..21f585da53b3 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   config,
-  libsForQt5,
+  pkgs,
 }:
 let
   packages =
@@ -117,4 +117,4 @@ let
       go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
     };
 in
-lib.makeScope libsForQt5.newScope packages
+lib.makeScope pkgs.newScope packages
diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix
index d8b848851a82..512db885951d 100644
--- a/pkgs/desktops/deepin/go-package/dde-api/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix
@@ -4,7 +4,6 @@
   buildGoModule,
   pkg-config,
   deepin-gettext-tools,
-  wrapQtAppsHook,
   wrapGAppsHook3,
   alsa-lib,
   gtk3,
@@ -56,10 +55,8 @@ buildGoModule rec {
   nativeBuildInputs = [
     pkg-config
     deepin-gettext-tools
-    wrapQtAppsHook
     wrapGAppsHook3
   ];
-  dontWrapGApps = true;
 
   buildInputs = [
     alsa-lib
@@ -86,13 +83,9 @@ buildGoModule rec {
     runHook postInstall
   '';
 
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
   postFixup = ''
     for binary in $out/lib/deepin-api/*; do
-      wrapProgram $binary "''${qtWrapperArgs[@]}"
+      wrapProgram $binary "''${gappsWrapperArgs[@]}"
     done
   '';
 
diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix
index f5da5c8fee71..26549922bd8d 100644
--- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   ncnn,
   opencv,
   vulkan-headers,
@@ -32,9 +31,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
index cbe86ed26257..94db61834bb0 100644
--- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
+  libsForQt5,
   pkg-config,
   libchardet,
   lcms2,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
   ];
 
diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix
index 0e398b42c176..d485fbb23f3b 100644
--- a/pkgs/desktops/deepin/library/disomaster/default.nix
+++ b/pkgs/desktops/deepin/library/disomaster/default.nix
@@ -3,9 +3,7 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   libisoburn,
 }:
 
@@ -21,10 +19,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [ libisoburn ];
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
index e909169a0854..c1462f135d94 100644
--- a/pkgs/desktops/deepin/library/docparser/default.nix
+++ b/pkgs/desktops/deepin/library/docparser/default.nix
@@ -3,9 +3,7 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   poppler,
   pugixml,
   libzip,
@@ -25,10 +23,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
index 362c7600e64c..32a385d9cef8 100644
--- a/pkgs/desktops/deepin/library/dwayland/default.nix
+++ b/pkgs/desktops/deepin/library/dwayland/default.nix
@@ -3,14 +3,12 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  qtwayland,
+  libsForQt5,
   wayland,
   wayland-protocols,
   wayland-scanner,
   extra-cmake-modules,
   deepin-wayland-protocols,
-  qttools,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,13 +25,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    qttools
+    libsForQt5.qttools
     wayland-scanner
   ];
 
   buildInputs = [
-    qtbase
-    qtwayland
+    libsForQt5.qtbase
+    libsForQt5.qtwayland
     wayland
     wayland-protocols
     deepin-wayland-protocols
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
index df790e6609b4..af90a645f25f 100644
--- a/pkgs/desktops/deepin/library/gio-qt/default.nix
+++ b/pkgs/desktops/deepin/library/gio-qt/default.nix
@@ -4,11 +4,9 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   glibmm,
   doxygen,
-  qttools,
-  qtbase,
   buildDocs ? true,
 }:
 
@@ -34,11 +32,11 @@ stdenv.mkDerivation rec {
     [
       cmake
       pkg-config
-      wrapQtAppsHook
+      libsForQt5.wrapQtAppsHook
     ]
     ++ lib.optionals buildDocs [
       doxygen
-      qttools.dev
+      libsForQt5.qttools
     ];
 
   cmakeFlags = [
@@ -51,7 +49,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
     # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
+    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
   meta = with lib; {
diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix
index 576dda7f5a3e..1154b5e0e89c 100644
--- a/pkgs/desktops/deepin/library/image-editor/default.nix
+++ b/pkgs/desktops/deepin/library/image-editor/default.nix
@@ -4,9 +4,8 @@
   fetchFromGitHub,
   dtkwidget,
   cmake,
-  qttools,
+  libsForQt5,
   pkg-config,
-  wrapQtAppsHook,
   opencv,
   freeimage,
   libmediainfo,
@@ -33,8 +32,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
index 3a9be5a65879..cdfbe3011c64 100644
--- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
@@ -2,9 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
+  libsForQt5,
   pkg-config,
-  wrapQtAppsHook,
   udisks,
 }:
 
@@ -20,9 +19,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [ udisks ];
diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
index b7c2071a3868..5b298b8765ea 100644
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ b/pkgs/desktops/deepin/library/util-dfm/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qtbase,
+  libsForQt5,
   libmediainfo,
   libsecret,
   libisoburn,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libmediainfo
     libsecret
     libuuid
diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
index 973df30e5bb5..d6ed1a723334 100644
--- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [ dtkwidget ];
diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
index 42da994bbb00..441003d522b3 100644
--- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   udisks2-qt5,
   util-linux,
   libnl,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/gnome/extensions/collisions.json b/pkgs/desktops/gnome/extensions/collisions.json
index e96cbc3d5633..807b54d32f1b 100644
--- a/pkgs/desktops/gnome/extensions/collisions.json
+++ b/pkgs/desktops/gnome/extensions/collisions.json
@@ -3,47 +3,23 @@
     "Applications_Menu@rmy.pobox.com",
     "apps-menu@gnome-shell-extensions.gcampax.github.com"
   ],
-  "workspace-indicator": [
-    "horizontal-workspace-indicator@tty2.io",
-    "workspace-indicator@gnome-shell-extensions.gcampax.github.com"
-  ],
   "persian-calendar": [
     "persian-calendar@iamrezamousavi.gmail.com",
     "PersianCalendar@oxygenws.com"
   ],
-  "openweather": [
-    "openweather-extension@jenslody.de",
-    "openweather-extension@penguin-teal.github.io"
-  ],
-  "clipboard-indicator": [
-    "clipboard-indicator@tudmotu.com",
-    "clipboard-indicator@Dieg0Js.github.io"
-  ],
   "system-monitor": [
     "system-monitor@gnome-shell-extensions.gcampax.github.com",
     "System_Monitor@bghome.gmail.com"
   ],
-  "virtualbox-applet": [
-    "vbox-applet@gs.eros2.info",
-    "vbox-applet@buba98"
-  ],
-  "panel-date-format": [
-    "panel-date-format@atareao.es",
-    "panel-date-format@keiii.github.com"
-  ],
-  "battery-time": [
-    "batterytime@typeof.pw",
-    "batime@martin.zurowietz.de"
-  ],
-  "kernel-indicator": [
-    "kernel-indicator@elboulangero.gitlab.com",
-    "kernel-indicator@pvizc.gitlab.com"
-  ],
   "fuzzy-clock": [
     "fuzzy-clock@keepawayfromfire.co.uk",
     "FuzzyClock@johngoetz",
     "FuzzyClock@fire-man-x"
   ],
+  "battery-time": [
+    "batterytime@typeof.pw",
+    "batime@martin.zurowietz.de"
+  ],
   "power-profile-indicator": [
     "power-profile-indicator@laux.wtf",
     "power-profile@fthx"
diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix
index 035531a5f05e..4e7b3c75e8b7 100644
--- a/pkgs/desktops/gnome/extensions/default.nix
+++ b/pkgs/desktops/gnome/extensions/default.nix
@@ -64,9 +64,10 @@ in rec {
   gnome44Extensions = mapUuidNames (produceExtensionsList "44");
   gnome45Extensions = mapUuidNames (produceExtensionsList "45");
   gnome46Extensions = mapUuidNames (produceExtensionsList "46");
+  gnome47Extensions = mapUuidNames (produceExtensionsList "47");
 
   # Keep the last three versions in here
-  gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions // gnome46Extensions) [
+  gnomeExtensions = lib.trivial.pipe (gnome45Extensions // gnome46Extensions // gnome47Extensions) [
     (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ])
     # Apply some custom patches for automatically packaged extensions
     (callPackage ./extensionOverrides.nix {})
diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch
index 2d9f6291c5a1..8e40102526eb 100644
--- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch
+++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch
@@ -1,13 +1,3 @@
-diff --git a/app/createThumbnail.js b/app/createThumbnail.js
-index d070248..f0c2def 100755
---- a/app/createThumbnail.js
-+++ b/app/createThumbnail.js
-@@ -1,4 +1,4 @@
--#!/usr/bin/gjs
-+#!@gjs@/bin/gjs
- 
- /* DING: Desktop Icons New Generation for GNOME Shell
-  *
 diff --git a/app/ding.js b/app/ding.js
 index 1062bc7..c312d48 100755
 --- a/app/ding.js
diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix
index bc01f9ef6ea5..95dbcf60fa04 100644
--- a/pkgs/desktops/gnome/extensions/extensionRenames.nix
+++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix
@@ -7,38 +7,19 @@
   "Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
   "apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
 
-  "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
-  "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
-
   "persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2";
   "PersianCalendar@oxygenws.com" = "persian-calendar";
 
-  "openweather-extension@jenslody.de" = "openweather";
-  "openweather-extension@penguin-teal.github.io" = "openweather-refined";
-
-  "clipboard-indicator@tudmotu.com" = "clipboard-indicator";
-  "clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2";
-
   "system-monitor@gnome-shell-extensions.gcampax.github.com" = "system-monitor";
   "System_Monitor@bghome.gmail.com" = "system-monitor-2";
 
-  "vbox-applet@gs.eros2.info" = "virtualbox-applet";
-  "vbox-applet@buba98" = "virtualbox-applet-2";
-
-  "panel-date-format@atareao.es" = "panel-date-format-2";
-  "panel-date-format@keiii.github.com" = "panel-date-format";
-
-  "batterytime@typeof.pw" = "battery-time-2";
-  "batime@martin.zurowietz.de" = "battery-time";
-
-  # No longer maintained: https://gitlab.com/arnaudr/gnome-shell-extension-kernel-indicator
-  "kernel-indicator@elboulangero.gitlab.com" = null;
-  "kernel-indicator@pvizc.gitlab.com" = "kernel-indicator";
-
   "FuzzyClock@fire-man-x" = "fuzzy-clock-3";
   "fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
   "FuzzyClock@johngoetz" = "fuzzy-clock";
 
+  "batterytime@typeof.pw" = "battery-time-2";
+  "batime@martin.zurowietz.de" = "battery-time";
+
   "power-profile-indicator@laux.wtf" = "power-profile-indicator";
   "power-profile@fthx" = "power-profile-indicator-2";
 
@@ -47,6 +28,7 @@
   "floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
   "true-color-window-invert@lynet101" = "true-color-window-invert";
   "volume_scroller@francislavoie.github.io" = "volume-scroller-2";
+  "openweather-extension@penguin-teal.github.io" = "openweather-refined";
 
   # ############################################################################
   # Overrides for extensions that were manually packaged in the past but are gradually
diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json
index c707c0f2f187..c13fb0e06cb7 100644
--- a/pkgs/desktops/gnome/extensions/extensions.json
+++ b/pkgs/desktops/gnome/extensions/extensions.json
@@ -6,7 +6,8 @@
     "43": {"version": "28", "sha256": "12hwvdc7hk0p6p72fp4lj43wsq7gq0dwv6kra785v6q8mq298vvd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "44": {"version": "28", "sha256": "12hwvdc7hk0p6p72fp4lj43wsq7gq0dwv6kra785v6q8mq298vvd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "45": {"version": "29", "sha256": "0463xm7cm4m83j4jhhr4rq9b336dgqib0v2zh6wl5pzprn3p092h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIk1vdmVfQ2xvY2tAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"},
-    "46": {"version": "31", "sha256": "0b5h8ra2a7d0lbkax9dqjsq3wbd9pfwiqi63m03wivy97hl8xg1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIk1vdmVfQ2xvY2tAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}
+    "46": {"version": "32", "sha256": "0r113icpr3d6wpf03285kdmn7p5gflwc8mgbfsgfrdl683j58bvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
+    "47": {"version": "32", "sha256": "0r113icpr3d6wpf03285kdmn7p5gflwc8mgbfsgfrdl683j58bvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}
   }}
 , {"uuid": "Bottom_Panel@rmy.pobox.com", "name": "Frippery Bottom Panel", "pname": "bottom-panel", "description": "Add a bottom panel to the shell", "link": "https://extensions.gnome.org/extension/3/bottom-panel/", "shell_version_map": {
     "38": {"version": "49", "sha256": "09gsbnj564z8f7m593iv8j7s6f32230k0ikfsl1dlv1jsfpfn8zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYm90dG9tLXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkJvdHRvbV9QYW5lbEBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
@@ -16,7 +17,8 @@
     "43": {"version": "63", "sha256": "11hf5j54zww67n69xz59lfmgi281j11pfljlbkl4kpq1kaii7n5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYm90dG9tLXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQm90dG9tX1BhbmVsQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "44": {"version": "67", "sha256": "0azl76vkxnppw5lclk1dyh747ahxllyvcbhnff54ykx7nb4lnkmj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkJvdHRvbV9QYW5lbEBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDY3Cn0="},
     "45": {"version": "70", "sha256": "0g9m181vy1bjkjl15qaw6zca31cam8491g17dckvy0pb3xs2jlwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkJvdHRvbV9QYW5lbEBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDcwCn0="},
-    "46": {"version": "71", "sha256": "03b99f2g6v4nlhkk05z7za9kj4vaqghz3wig27vb3h68d4v6qmcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkJvdHRvbV9QYW5lbEBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDcxCn0="}
+    "46": {"version": "72", "sha256": "1dai045blz78q35pq8kygzn648jgmmhhq87j2nsqghgmgac0xj6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJCb3R0b21fUGFuZWxAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"},
+    "47": {"version": "72", "sha256": "1dai045blz78q35pq8kygzn648jgmmhhq87j2nsqghgmgac0xj6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJCb3R0b21fUGFuZWxAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"}
   }}
 , {"uuid": "Panel_Favorites@rmy.pobox.com", "name": "Frippery Panel Favorites", "pname": "panel-favorites", "description": "Add launchers for Favorites to the panel", "link": "https://extensions.gnome.org/extension/4/panel-favorites/", "shell_version_map": {
     "38": {"version": "39", "sha256": "0jqysp82rhckdlgn1jhf1n6sqqphv97m9dri5pjiqjggvm4ls80j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkucGFuZWwtZmF2b3JpdGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJQYW5lbF9GYXZvcml0ZXNAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"},
@@ -26,7 +28,8 @@
     "43": {"version": "47", "sha256": "0him9afr50fqgp8mdq5nbdsq4igqvwn7k3grvxzixb4y68514b5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiUGFuZWxfRmF2b3JpdGVzQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="},
     "44": {"version": "47", "sha256": "0him9afr50fqgp8mdq5nbdsq4igqvwn7k3grvxzixb4y68514b5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiUGFuZWxfRmF2b3JpdGVzQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="},
     "45": {"version": "49", "sha256": "0ayp2h0bimj0b4341rclsfszli77yh5i2gjrp16avs1m8zrqyll1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJQYW5lbF9GYXZvcml0ZXNAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"},
-    "46": {"version": "50", "sha256": "0nzxbsdscyblfkszlf8idkpfhxf128k23gylxipfyxblijxxbrgz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJQYW5lbF9GYXZvcml0ZXNAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}
+    "46": {"version": "51", "sha256": "13axicfyqbc71lyfdgw1i9vwvq9qpii82km8p5dz1c4ii7sgvsdz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiUGFuZWxfRmF2b3JpdGVzQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="},
+    "47": {"version": "51", "sha256": "13axicfyqbc71lyfdgw1i9vwvq9qpii82km8p5dz1c4ii7sgvsdz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiUGFuZWxfRmF2b3JpdGVzQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}
   }}
 , {"uuid": "apps-menu@gnome-shell-extensions.gcampax.github.com", "name": "Apps Menu", "pname": "applications-menu", "description": "Add a category-based menu for apps.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/6/applications-menu/", "shell_version_map": {
     "38": {"version": "46", "sha256": "1l5fliypxq3s3b6crv7rc6nl741m7hw48dwl0g7vi3yxyw0vyc0x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJhcHBzLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="},
@@ -36,7 +39,8 @@
     "43": {"version": "52", "sha256": "0h9b0kw919sfcx4l4ffi96fgvhgqnvssgwkbf3qh4lyqs4avb2xy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"},
     "44": {"version": "53", "sha256": "18wh0z8pq991i2kcp4a5dpx6m05qansm357k98n258j1q3jxac5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"},
     "45": {"version": "56", "sha256": "1k8048dmqyyh3vzamafj90qsn4m98kj7gz5f4hj7z9bqdi38nn6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"},
-    "46": {"version": "59", "sha256": "17d0jpqim13130f7205jpsa88j3azqc281a8877nbhlbha44ilcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="}
+    "46": {"version": "59", "sha256": "17d0jpqim13130f7205jpsa88j3azqc281a8877nbhlbha44ilcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
+    "47": {"version": "60", "sha256": "00igsscc0rifk8zqvf8mqnsmdmfinv9k10ri9jh8wncbk14pcxjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}
   }}
 , {"uuid": "drive-menu@gnome-shell-extensions.gcampax.github.com", "name": "Removable Drive Menu", "pname": "removable-drive-menu", "description": "A status menu for accessing and unmounting removable devices.", "link": "https://extensions.gnome.org/extension/7/removable-drive-menu/", "shell_version_map": {
     "38": {"version": "45", "sha256": "1f5a9md2gxbl65shbdm498y5dwhhqdpj96gvf2m81ad7gsgxzliv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJkcml2ZS1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
@@ -46,7 +50,8 @@
     "43": {"version": "52", "sha256": "0zn9xkw5r0j1kwbs78j7chp4l2404d177w3a4shjd765hvjy6wam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
     "44": {"version": "53", "sha256": "01wn2icq1cnly9xg7pr2pzk4vqw4l5fhasy5hvq3pq8mbidmdm5s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="},
     "45": {"version": "57", "sha256": "1a2j8l2wmxx97snqrj5hs9y0qcjwkv9g00bgr0968h8rpy4fl56y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="},
-    "46": {"version": "61", "sha256": "0qjg90axaivcsnw94xam8r39734y3pj1315lj2xqv0fjq6163h3v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}
+    "46": {"version": "61", "sha256": "0qjg90axaivcsnw94xam8r39734y3pj1315lj2xqv0fjq6163h3v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="},
+    "47": {"version": "62", "sha256": "1zl0k8qpvgfv2jpfksprx0p9vd3ym4gr635bhyl6ki5l5pgk338i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}
   }}
 , {"uuid": "places-menu@gnome-shell-extensions.gcampax.github.com", "name": "Places Status Indicator", "pname": "places-status-indicator", "description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/8/places-status-indicator/", "shell_version_map": {
     "38": {"version": "48", "sha256": "05m8nkg2km72iwnmadx6f4br8qnzqagp78mlhz8r2z6hp19nqsh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
@@ -56,7 +61,8 @@
     "43": {"version": "55", "sha256": "19pw472bjz3j9z1s23q4rxsjmz0x54fcpi968yw7k8ivd1cihfx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NQp9"},
     "44": {"version": "56", "sha256": "0fc52km2aj7c4n1q6y4yf2l4nzzwawyizi8d6d0b1wrcqa8n64n6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"},
     "45": {"version": "59", "sha256": "1sai071js4l70mm8cfnr8yavisiy5wbdifkhc9wl4pqj12g33x31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"},
-    "46": {"version": "62", "sha256": "0c2yh37sxrbvlcijamyy7pwi2qfmks0jvj3kw0ih581sjsbigmgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Mgp9"}
+    "46": {"version": "62", "sha256": "0c2yh37sxrbvlcijamyy7pwi2qfmks0jvj3kw0ih581sjsbigmgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Mgp9"},
+    "47": {"version": "63", "sha256": "0b7vp887asaas9x0aa2s4qh41jvwl9xzyzpsyznn5q6v73m3xjrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Mwp9"}
   }}
 , {"uuid": "windowsNavigator@gnome-shell-extensions.gcampax.github.com", "name": "windowNavigator", "pname": "windownavigator", "description": "Allow keyboard selection of windows and workspaces in overlay mode. number selects a workspace, and number selects a window.", "link": "https://extensions.gnome.org/extension/10/windownavigator/", "shell_version_map": {
     "38": {"version": "49", "sha256": "1rzfnssk0iw1ysaya79ksghikkr1rpm41h2w39cz142fby6kip2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"},
@@ -66,7 +72,8 @@
     "43": {"version": "58", "sha256": "1l5fiajbv9484ln7kkq5nm4ph71ir9fnav6gqhyzbfhbx94qh9gd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="},
     "44": {"version": "59", "sha256": "1pa1i7scsjj91dql0v6zajyx30w446r1cxknl0dp1fpmydqwxjpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
     "45": {"version": "62", "sha256": "10d6hj0nbnfq55lqjjmilb8f6v2cv70kk6bnzyj3cn832hrz959a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="},
-    "46": {"version": "65", "sha256": "1npjmmzfvcmhvjzyr7fhslznmsc7cvwavfp5v8idydqrvx4lz6md", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="}
+    "46": {"version": "65", "sha256": "1npjmmzfvcmhvjzyr7fhslznmsc7cvwavfp5v8idydqrvx4lz6md", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="},
+    "47": {"version": "66", "sha256": "0k5xd1ni6mnv71fshs36a33pbm0q7y1zn1byv96hpj4cynmb2psr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY2Cn0="}
   }}
 , {"uuid": "Applications_Menu@rmy.pobox.com", "name": "Frippery Applications Menu", "pname": "applications-menu", "description": "Replace Activities button with an Applications menu", "link": "https://extensions.gnome.org/extension/13/applications-menu/", "shell_version_map": {
     "38": {"version": "45", "sha256": "0kg9dq1ssa11xizb31kcq3p724qzm1cmf30wriqffj043n5nd125", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYXBwbGljYXRpb25zLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQXBwbGljYXRpb25zX01lbnVAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
@@ -76,7 +83,8 @@
     "43": {"version": "52", "sha256": "0dwfbbdcifciyyj03k1mnmnx66djhszc65hf4z0rhyyry5r5bi99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1hcHBsaWNhdGlvbnMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkFwcGxpY2F0aW9uc19NZW51QHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
     "44": {"version": "52", "sha256": "0dwfbbdcifciyyj03k1mnmnx66djhszc65hf4z0rhyyry5r5bi99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1hcHBsaWNhdGlvbnMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkFwcGxpY2F0aW9uc19NZW51QHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
     "45": {"version": "54", "sha256": "0ykp28ibnvcz5y07pcrz2gsnwz7l80bbxbgk9kksc33bchhmyrlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1hcHBsaWNhdGlvbnMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQXBwbGljYXRpb25zX01lbnVAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
-    "46": {"version": "55", "sha256": "08b35dv1amplplai6idszq751bhfs83arg1ap7acv3pjfgsb4g0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1hcHBsaWNhdGlvbnMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQXBwbGljYXRpb25zX01lbnVAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA1NQp9"}
+    "46": {"version": "57", "sha256": "0401zs4s1vwv7l5fnjhcsjdcblp009nq1ir8rirl1in01bqbs0rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1hcHBsaWNhdGlvbnMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkFwcGxpY2F0aW9uc19NZW51QHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="},
+    "47": {"version": "57", "sha256": "0401zs4s1vwv7l5fnjhcsjdcblp009nq1ir8rirl1in01bqbs0rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmlwcGVyeS1hcHBsaWNhdGlvbnMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkFwcGxpY2F0aW9uc19NZW51QHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}
   }}
 , {"uuid": "auto-move-windows@gnome-shell-extensions.gcampax.github.com", "name": "Auto Move Windows", "pname": "auto-move-windows", "description": "Move applications to specific workspaces when they create windows.", "link": "https://extensions.gnome.org/extension/16/auto-move-windows/", "shell_version_map": {
     "38": {"version": "44", "sha256": "05lmpmyzaawxh3kn030a8sanq7p6g87zfh7nzxfvgi8nbpygd59q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkF1dG8gTW92ZSBXaW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhbGVzc2FuZHJvLmNyaXNtYW5pQGdtYWlsLmNvbSIsCiAgICAidGhvbWFzLmJvdWZmb25AZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLW1vdmUtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="},
@@ -86,7 +94,8 @@
     "43": {"version": "50", "sha256": "0s0ky7sslyf2cy68xlqrrz01py82wi861gpcfqj97qdwdf9hzq2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUwCn0="},
     "44": {"version": "51", "sha256": "1j9nba9r5a56c2ks61jbrr6n8gc470g4c0lig9r4angqhc6sn7bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="},
     "45": {"version": "54", "sha256": "11gxlyp83096ky0iqd8svn802ih7knvhn3qml6532c1h2xv8krlp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU0Cn0="},
-    "46": {"version": "57", "sha256": "1h5fcmik8cr8hq4kxnabi9wrgqg13i81d3xgh1b9hlnf2aah091y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}
+    "46": {"version": "57", "sha256": "1h5fcmik8cr8hq4kxnabi9wrgqg13i81d3xgh1b9hlnf2aah091y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="},
+    "47": {"version": "58", "sha256": "0224l0i1hh2n9f8pb5y9652x89wfgrl9jw7fbil52wg896fripqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="}
   }}
 , {"uuid": "native-window-placement@gnome-shell-extensions.gcampax.github.com", "name": "Native Window Placement", "pname": "native-window-placement", "description": "Arrange windows in overview in a more compact way.", "link": "https://extensions.gnome.org/extension/18/native-window-placement/", "shell_version_map": {
     "38": {"version": "45", "sha256": "15vhdcfrfbsinp0m1jfygjl4djccafhvgwc1rsi321jvykqhajmm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
@@ -96,7 +105,8 @@
     "43": {"version": "52", "sha256": "09660cb8y0549py4d4wrl2fhg7grl0c1fnakzznvfwzh0cdr3f8r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUyCn0="},
     "44": {"version": "53", "sha256": "18k0b7vsjmvbvnzb5b5qa3jk0i14ah93cwi1399m6ma9llhyhwjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="},
     "45": {"version": "56", "sha256": "0g864ji4bazc7x25qqjrcayhpq8sqrabxdwfl7iviz7s0yc40iz0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="},
-    "46": {"version": "59", "sha256": "09fccn043bgxv1idh1y2siimgdbrkwxsdn6zqx93wbrw10i2b355", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="}
+    "46": {"version": "59", "sha256": "09fccn043bgxv1idh1y2siimgdbrkwxsdn6zqx93wbrw10i2b355", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
+    "47": {"version": "60", "sha256": "1lwgzgvva0gnazxl7kpz54wvh6z5ggkg0yja0ayyvwsmz7yp43bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}
   }}
 , {"uuid": "user-theme@gnome-shell-extensions.gcampax.github.com", "name": "User Themes", "pname": "user-themes", "description": "Load shell themes from user directory.", "link": "https://extensions.gnome.org/extension/19/user-themes/", "shell_version_map": {
     "38": {"version": "42", "sha256": "0jykwcd8pmvr03dm2vala6nzzhi9i83c11svgx8wymfvxr5qrya8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInVzZXItdGhlbWVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="},
@@ -106,7 +116,8 @@
     "43": {"version": "50", "sha256": "0jyd2rn2nlvcmx8xn2azhbaqf5k0kgyx8ciy6bj1iq35s7k5sp7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"},
     "44": {"version": "51", "sha256": "0m7gw3lcds1r6d8q5962bjxb4b2hqy633c73axxc5gvyr9i0bjf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"},
     "45": {"version": "54", "sha256": "0gpkxmjaaq9rmh16wf5cf24q2w2wb0z0z8v7mcg7wrwsjszg7xhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
-    "46": {"version": "58", "sha256": "15qrirgx7ikjxz0jzlxf7k8b41j3crlvzcm952h6ajmg6smbbf7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OAp9"}
+    "46": {"version": "58", "sha256": "15qrirgx7ikjxz0jzlxf7k8b41j3crlvzcm952h6ajmg6smbbf7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OAp9"},
+    "47": {"version": "59", "sha256": "0imwmjqpw3djqi0i7wgm3hz9jz6sfybi15fzywp8hgv6idgnmnwn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"}
   }}
 , {"uuid": "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "name": "Workspace Indicator", "pname": "workspace-indicator", "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.", "link": "https://extensions.gnome.org/extension/21/workspace-indicator/", "shell_version_map": {
     "38": {"version": "45", "sha256": "16y7zhlsj0qjwwj78fvcr81m7081i2y30gwjm35qahr3j0gfrk16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid29ya3NwYWNlLWluZGljYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
@@ -116,7 +127,8 @@
     "43": {"version": "53", "sha256": "0idl8n6205ymh1z3w15sxv98940q8qch2pp5wk9gzd594i2aya2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="},
     "44": {"version": "54", "sha256": "03jq25xa3z0b32vczqv12gkfdmw4ll56zb0walm5gfmmmzivsn1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU0Cn0="},
     "45": {"version": "57", "sha256": "0qpzc1njng95ck1svw9nig2j9i5p7nqbgaxm1x7gg3i9jn8rgwqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="},
-    "46": {"version": "60", "sha256": "19kqy6xfl8kxc4h1nn1gl979m6jk3c2s91hbrxjd2lvak3sap0wa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}
+    "46": {"version": "60", "sha256": "19kqy6xfl8kxc4h1nn1gl979m6jk3c2s91hbrxjd2lvak3sap0wa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="},
+    "47": {"version": "61", "sha256": "1j5nwhjsafya5byiy0z89bnaq07lk4g9rdcrm17sqdfv3pgm0dcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="}
   }}
 , {"uuid": "gTile@vibou", "name": "gTile", "pname": "gtile", "description": "Tile windows on a grid", "link": "https://extensions.gnome.org/extension/28/gtile/", "shell_version_map": {
     "38": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
@@ -126,7 +138,8 @@
     "43": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
     "44": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
     "45": {"version": "59", "sha256": "1xf0g2y0722nxiy768p54v5ra06fh0smvgf6wh5vcrs2s521rbrp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTkKfQ=="},
-    "46": {"version": "59", "sha256": "1xf0g2y0722nxiy768p54v5ra06fh0smvgf6wh5vcrs2s521rbrp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTkKfQ=="}
+    "46": {"version": "59", "sha256": "1xf0g2y0722nxiy768p54v5ra06fh0smvgf6wh5vcrs2s521rbrp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTkKfQ=="},
+    "47": {"version": "60", "sha256": "1asdv0a01ymbb7lscbyy580xsjvybj8fg85d7gqxqniq0xf1klbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA2MAp9"}
   }}
 , {"uuid": "lockkeys@vaina.lt", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock & Capslock status on the panel.", "link": "https://extensions.gnome.org/extension/36/lock-keys/", "shell_version_map": {
     "38": {"version": "52", "sha256": "02190kcp0c1mzlxf4ax0shk7r6zh9adynidxnjdhbkwl9knxalra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDUyCn0="},
@@ -135,8 +148,9 @@
     "42": {"version": "52", "sha256": "02190kcp0c1mzlxf4ax0shk7r6zh9adynidxnjdhbkwl9knxalra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDUyCn0="},
     "43": {"version": "52", "sha256": "02190kcp0c1mzlxf4ax0shk7r6zh9adynidxnjdhbkwl9knxalra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDUyCn0="},
     "44": {"version": "52", "sha256": "02190kcp0c1mzlxf4ax0shk7r6zh9adynidxnjdhbkwl9knxalra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDUyCn0="},
-    "45": {"version": "58", "sha256": "0r8yx8vs0zrvs2fz5i7plsbp684sn6ds6c9y9zskxwcaq30b7rdc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2trZXlzIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayBhbmQgbWFueSBvdGhlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja2tleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTgKfQ=="},
-    "46": {"version": "58", "sha256": "0r8yx8vs0zrvs2fz5i7plsbp684sn6ds6c9y9zskxwcaq30b7rdc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2trZXlzIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayBhbmQgbWFueSBvdGhlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja2tleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}
+    "45": {"version": "59", "sha256": "0gqykxgwbxjk1nl2l52sy0dm2p0896lh44k1vdzf3rmp9x8idb09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2trZXlzIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayBhbmQgbWFueSBvdGhlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja2tleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDU5Cn0="},
+    "46": {"version": "59", "sha256": "0gqykxgwbxjk1nl2l52sy0dm2p0896lh44k1vdzf3rmp9x8idb09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2trZXlzIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayBhbmQgbWFueSBvdGhlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja2tleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDU5Cn0="},
+    "47": {"version": "59", "sha256": "0gqykxgwbxjk1nl2l52sy0dm2p0896lh44k1vdzf3rmp9x8idb09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2trZXlzIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayBhbmQgbWFueSBvdGhlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja2tleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDU5Cn0="}
   }}
 , {"uuid": "putWindow@clemens.lab21.org", "name": "Put Windows", "pname": "put-windows", "description": "Fully customizable replacement for the old compiz put plugin. \n * Move windows to left/right side, bottom/top, center or corner (aka tile)\n * Move window to other screen \n * Select focused window using the keyboard \n * Application based window placement \n\n Please check github if your gnome-shell version is not supported", "link": "https://extensions.gnome.org/extension/39/put-windows/", "shell_version_map": {
     "38": {"version": "32", "sha256": "0gzi2xmqkjl6x3q1lcb5mrlvvxsni7bax8j5q7wy25hhpizbj2m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgdGhlIG9sZCBjb21waXogcHV0IHBsdWdpbi4gXG4gKiBNb3ZlIHdpbmRvd3MgdG8gbGVmdC9yaWdodCBzaWRlLCBib3R0b20vdG9wLCBjZW50ZXIgb3IgY29ybmVyIChha2EgdGlsZSlcbiAqIE1vdmUgd2luZG93IHRvIG90aGVyIHNjcmVlbiBcbiAqIFNlbGVjdCBmb2N1c2VkIHdpbmRvdyB1c2luZyB0aGUga2V5Ym9hcmQgXG4gKiBBcHBsaWNhdGlvbiBiYXNlZCB3aW5kb3cgcGxhY2VtZW50IFxuXG4gUGxlYXNlIGNoZWNrIGdpdGh1YiBpZiB5b3VyIGdub21lLXNoZWxsIHZlcnNpb24gaXMgbm90IHN1cHBvcnRlZCIsCiAgImdldHRleHQtZG9tYWluIjogInB1dFdpbmRvdyIsCiAgIm5hbWUiOiAiUHV0IFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3JnLWxhYjIxLXB1dHdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZ2VzdGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1uZWdlc3RpIiwKICAidXVpZCI6ICJwdXRXaW5kb3dAY2xlbWVucy5sYWIyMS5vcmciLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
@@ -178,7 +192,8 @@
     "43": {"version": "61", "sha256": "0bnwwvq73hn0p5qy2h9n7zq8wpna7wf3mx94i1p2mxkl4l2mv6f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="},
     "44": {"version": "65", "sha256": "04ydnd74kyc38l0k4sc20g42c17p0k79gd5iknivwz7i6xx6hbx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="},
     "45": {"version": "71", "sha256": "0agf21qyk576aa212w42hcn9vhpbsrjisrby0mfnw22giah9sf28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiZHNoZWVsZXIiLAogICAgImxpYmVyYXBheSI6ICJkc2hlZWxlciIsCiAgICAicGF5cGFsIjogIkRhbmllbFNoZWVsZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAibmFtZSI6ICJDb3ZlcmZsb3cgQWx0LVRhYiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb3ZlcmZsb3dhbHR0YWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNzEKfQ=="},
-    "46": {"version": "73", "sha256": "1xxi587gla0cr5ry76m8a0iqprgy5kaf6njq7w5zgbgb7hj50vpy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiZHNoZWVsZXIiLAogICAgImxpYmVyYXBheSI6ICJkc2hlZWxlciIsCiAgICAicGF5cGFsIjogIkRhbmllbFNoZWVsZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAibmFtZSI6ICJDb3ZlcmZsb3cgQWx0LVRhYiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb3ZlcmZsb3dhbHR0YWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHNoZWVsZXIvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNzMKfQ=="}
+    "46": {"version": "76", "sha256": "1sxfns598y8dbdqx9s7lzfg4k797h0miqfz06byn1gyn1gfkkcap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiZHNoZWVsZXIiLAogICAgImxpYmVyYXBheSI6ICJkc2hlZWxlciIsCiAgICAicGF5cGFsIjogIkRhbmllbFNoZWVsZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAibmFtZSI6ICJDb3ZlcmZsb3cgQWx0LVRhYiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb3ZlcmZsb3dhbHR0YWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RzaGVlbGVyL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDc2Cn0="},
+    "47": {"version": "76", "sha256": "1sxfns598y8dbdqx9s7lzfg4k797h0miqfz06byn1gyn1gfkkcap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiZHNoZWVsZXIiLAogICAgImxpYmVyYXBheSI6ICJkc2hlZWxlciIsCiAgICAicGF5cGFsIjogIkRhbmllbFNoZWVsZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAibmFtZSI6ICJDb3ZlcmZsb3cgQWx0LVRhYiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb3ZlcmZsb3dhbHR0YWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RzaGVlbGVyL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDc2Cn0="}
   }}
 , {"uuid": "netspeed@hedayaty.gmail.com", "name": "NetSpeed", "pname": "netspeed", "description": "Displays Internet Speed", "link": "https://extensions.gnome.org/extension/104/netspeed/", "shell_version_map": {
     "40": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
@@ -210,7 +225,8 @@
     "43": {"version": "104", "sha256": "1qsdr2jr0474z9hzcz1hk1hz10cq0v71f9p4zd4maxy0fqnsw84r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiAxMDQKfQ=="},
     "44": {"version": "104", "sha256": "1qsdr2jr0474z9hzcz1hk1hz10cq0v71f9p4zd4maxy0fqnsw84r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiAxMDQKfQ=="},
     "45": {"version": "107", "sha256": "1nkqfk7r6rvagfr5wvg5adxm5p70c0v61n8hc63cq8yrg4432jcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTA3Cn0="},
-    "46": {"version": "114", "sha256": "17r3ngcirszxbmfxpvy7s1lg86rhpkvqxb2dnvff6vnj1z7fhzhd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTE0Cn0="}
+    "46": {"version": "115", "sha256": "14dvm2lij1k2lxmmap5qic0jh2ij6g4rhf7zl9wifk7fr2y7zg1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbWlkL1BlcnNpYW4tQ2FsZW5kYXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJQZXJzaWFuQ2FsZW5kYXJAb3h5Z2Vud3MuY29tIiwKICAidmVyc2lvbiI6IDExNQp9"},
+    "47": {"version": "115", "sha256": "14dvm2lij1k2lxmmap5qic0jh2ij6g4rhf7zl9wifk7fr2y7zg1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbWlkL1BlcnNpYW4tQ2FsZW5kYXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJQZXJzaWFuQ2FsZW5kYXJAb3h5Z2Vud3MuY29tIiwKICAidmVyc2lvbiI6IDExNQp9"}
   }}
 , {"uuid": "notifications-alert-on-user-menu@hackedbellini.gmail.com", "name": "Notifications Alert", "pname": "notifications-alert-on-user-menu", "description": "Changes the color of the time and date indicator in the top bar when there are unread notifications. Colors and blinking are customizable.\n\nIf you have questions, please take a look at the FAQ:\nhttp://goo.gl/lmwtW\n\nCredits: The idea of painting the message on user's menu was borrowed from 'Pidgin Persistent Notification' extension by nemo. The code itself has some parts forked from 'Message Notifier' extension by barisione, 'Media player indicator' extension by eon and convenience.js from git.gnome.org/gnome-shell-extensions. The blink idea and it's initial code was written by hossman. The initial gnome 3.10 support was done by Anthony25. The filtering support was done by ilgarmehmetali", "link": "https://extensions.gnome.org/extension/258/notifications-alert-on-user-menu/", "shell_version_map": {
     "40": {"version": "47", "sha256": "0pvm01r7x8cl8dww1bm491znlcrymcnq4ndrbfxjlvigdnk46pz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW5ldmVyIHRoZXJlIGlzIGFuIHVucmVhZCBub3RpZmljYXRpb24gKGUuZy4gY2hhdCBtZXNzYWdlcyksIGJsaW5rcyB0aGUgbWVzc2FnZSBpbiB0aGUgdXNlcidzIG1lbnUgd2l0aCBhIGNvbG9yIGNob3NlbiBieSB0aGUgdXNlci5cblxuTm93IGNvbmZpZ3VyYWJsZSAoMy40KyBvbmx5KSEhIEFsZXJ0IGNvbG9yIGFuZCBibGluayByYXRlIGNhbiBiZSBjaGFuZ2VkIG9uIHNldHRpbmdzIDspXG5cbklmIHlvdSBoYXZlIGFueSBxdWVzdGlvbiwgYmUgc3VyZSB0byB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0VyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgQWxlcnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlRoaWFnbyBCZWxsaW5pIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZWxsaW5pNjY2L2dub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnMtYWxlcnQtb24tdXNlci1tZW51QGhhY2tlZGJlbGxpbmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
@@ -218,8 +234,9 @@
     "42": {"version": "47", "sha256": "0pvm01r7x8cl8dww1bm491znlcrymcnq4ndrbfxjlvigdnk46pz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW5ldmVyIHRoZXJlIGlzIGFuIHVucmVhZCBub3RpZmljYXRpb24gKGUuZy4gY2hhdCBtZXNzYWdlcyksIGJsaW5rcyB0aGUgbWVzc2FnZSBpbiB0aGUgdXNlcidzIG1lbnUgd2l0aCBhIGNvbG9yIGNob3NlbiBieSB0aGUgdXNlci5cblxuTm93IGNvbmZpZ3VyYWJsZSAoMy40KyBvbmx5KSEhIEFsZXJ0IGNvbG9yIGFuZCBibGluayByYXRlIGNhbiBiZSBjaGFuZ2VkIG9uIHNldHRpbmdzIDspXG5cbklmIHlvdSBoYXZlIGFueSBxdWVzdGlvbiwgYmUgc3VyZSB0byB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0VyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgQWxlcnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlRoaWFnbyBCZWxsaW5pIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZWxsaW5pNjY2L2dub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnMtYWxlcnQtb24tdXNlci1tZW51QGhhY2tlZGJlbGxpbmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
     "43": {"version": "47", "sha256": "0pvm01r7x8cl8dww1bm491znlcrymcnq4ndrbfxjlvigdnk46pz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW5ldmVyIHRoZXJlIGlzIGFuIHVucmVhZCBub3RpZmljYXRpb24gKGUuZy4gY2hhdCBtZXNzYWdlcyksIGJsaW5rcyB0aGUgbWVzc2FnZSBpbiB0aGUgdXNlcidzIG1lbnUgd2l0aCBhIGNvbG9yIGNob3NlbiBieSB0aGUgdXNlci5cblxuTm93IGNvbmZpZ3VyYWJsZSAoMy40KyBvbmx5KSEhIEFsZXJ0IGNvbG9yIGFuZCBibGluayByYXRlIGNhbiBiZSBjaGFuZ2VkIG9uIHNldHRpbmdzIDspXG5cbklmIHlvdSBoYXZlIGFueSBxdWVzdGlvbiwgYmUgc3VyZSB0byB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0VyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgQWxlcnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlRoaWFnbyBCZWxsaW5pIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZWxsaW5pNjY2L2dub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnMtYWxlcnQtb24tdXNlci1tZW51QGhhY2tlZGJlbGxpbmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
     "44": {"version": "47", "sha256": "0pvm01r7x8cl8dww1bm491znlcrymcnq4ndrbfxjlvigdnk46pz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW5ldmVyIHRoZXJlIGlzIGFuIHVucmVhZCBub3RpZmljYXRpb24gKGUuZy4gY2hhdCBtZXNzYWdlcyksIGJsaW5rcyB0aGUgbWVzc2FnZSBpbiB0aGUgdXNlcidzIG1lbnUgd2l0aCBhIGNvbG9yIGNob3NlbiBieSB0aGUgdXNlci5cblxuTm93IGNvbmZpZ3VyYWJsZSAoMy40KyBvbmx5KSEhIEFsZXJ0IGNvbG9yIGFuZCBibGluayByYXRlIGNhbiBiZSBjaGFuZ2VkIG9uIHNldHRpbmdzIDspXG5cbklmIHlvdSBoYXZlIGFueSBxdWVzdGlvbiwgYmUgc3VyZSB0byB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0VyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgQWxlcnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlRoaWFnbyBCZWxsaW5pIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZWxsaW5pNjY2L2dub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnMtYWxlcnQtb24tdXNlci1tZW51QGhhY2tlZGJlbGxpbmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
-    "45": {"version": "51", "sha256": "1bdni1ibqwflr4ncp14rczk4xqmy5nahwjzcmlbk14g3pdslnj3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNvbG9yIG9mIHRoZSB0aW1lIGFuZCBkYXRlIGluZGljYXRvciBpbiB0aGUgdG9wIGJhciB3aGVuIHRoZXJlIGFyZSB1bnJlYWQgbm90aWZpY2F0aW9ucy4gQ29sb3JzIGFuZCBibGlua2luZyBhcmUgY3VzdG9taXphYmxlLlxuXG5JZiB5b3UgaGF2ZSBxdWVzdGlvbnMsIHBsZWFzZSB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0V1xuXG5DcmVkaXRzOiBUaGUgaWRlYSBvZiBwYWludGluZyB0aGUgbWVzc2FnZSBvbiB1c2VyJ3MgbWVudSB3YXMgYm9ycm93ZWQgZnJvbSAnUGlkZ2luIFBlcnNpc3RlbnQgTm90aWZpY2F0aW9uJyBleHRlbnNpb24gYnkgbmVtby4gVGhlIGNvZGUgaXRzZWxmIGhhcyBzb21lIHBhcnRzIGZvcmtlZCBmcm9tICdNZXNzYWdlIE5vdGlmaWVyJyBleHRlbnNpb24gYnkgYmFyaXNpb25lLCAnTWVkaWEgcGxheWVyIGluZGljYXRvcicgZXh0ZW5zaW9uIGJ5IGVvbiBhbmQgY29udmVuaWVuY2UuanMgZnJvbSBnaXQuZ25vbWUub3JnL2dub21lLXNoZWxsLWV4dGVuc2lvbnMuIFRoZSBibGluayBpZGVhIGFuZCBpdCdzIGluaXRpYWwgY29kZSB3YXMgd3JpdHRlbiBieSBob3NzbWFuLiBUaGUgaW5pdGlhbCBnbm9tZSAzLjEwIHN1cHBvcnQgd2FzIGRvbmUgYnkgQW50aG9ueTI1LiBUaGUgZmlsdGVyaW5nIHN1cHBvcnQgd2FzIGRvbmUgYnkgaWxnYXJtZWhtZXRhbGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAibmFtZSI6ICJOb3RpZmljYXRpb25zIEFsZXJ0IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJUaGlhZ28gQmVsbGluaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVsbGluaTY2Ni9nbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb25zLWFsZXJ0LW9uLXVzZXItbWVudUBoYWNrZWRiZWxsaW5pLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"},
-    "46": {"version": "51", "sha256": "1bdni1ibqwflr4ncp14rczk4xqmy5nahwjzcmlbk14g3pdslnj3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNvbG9yIG9mIHRoZSB0aW1lIGFuZCBkYXRlIGluZGljYXRvciBpbiB0aGUgdG9wIGJhciB3aGVuIHRoZXJlIGFyZSB1bnJlYWQgbm90aWZpY2F0aW9ucy4gQ29sb3JzIGFuZCBibGlua2luZyBhcmUgY3VzdG9taXphYmxlLlxuXG5JZiB5b3UgaGF2ZSBxdWVzdGlvbnMsIHBsZWFzZSB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0V1xuXG5DcmVkaXRzOiBUaGUgaWRlYSBvZiBwYWludGluZyB0aGUgbWVzc2FnZSBvbiB1c2VyJ3MgbWVudSB3YXMgYm9ycm93ZWQgZnJvbSAnUGlkZ2luIFBlcnNpc3RlbnQgTm90aWZpY2F0aW9uJyBleHRlbnNpb24gYnkgbmVtby4gVGhlIGNvZGUgaXRzZWxmIGhhcyBzb21lIHBhcnRzIGZvcmtlZCBmcm9tICdNZXNzYWdlIE5vdGlmaWVyJyBleHRlbnNpb24gYnkgYmFyaXNpb25lLCAnTWVkaWEgcGxheWVyIGluZGljYXRvcicgZXh0ZW5zaW9uIGJ5IGVvbiBhbmQgY29udmVuaWVuY2UuanMgZnJvbSBnaXQuZ25vbWUub3JnL2dub21lLXNoZWxsLWV4dGVuc2lvbnMuIFRoZSBibGluayBpZGVhIGFuZCBpdCdzIGluaXRpYWwgY29kZSB3YXMgd3JpdHRlbiBieSBob3NzbWFuLiBUaGUgaW5pdGlhbCBnbm9tZSAzLjEwIHN1cHBvcnQgd2FzIGRvbmUgYnkgQW50aG9ueTI1LiBUaGUgZmlsdGVyaW5nIHN1cHBvcnQgd2FzIGRvbmUgYnkgaWxnYXJtZWhtZXRhbGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAibmFtZSI6ICJOb3RpZmljYXRpb25zIEFsZXJ0IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJUaGlhZ28gQmVsbGluaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVsbGluaTY2Ni9nbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb25zLWFsZXJ0LW9uLXVzZXItbWVudUBoYWNrZWRiZWxsaW5pLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}
+    "45": {"version": "52", "sha256": "1459klx03sw584iyacbsj7f97s3ndzvfyxhgn59rxl3gz8pz7h54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNvbG9yIG9mIHRoZSB0aW1lIGFuZCBkYXRlIGluZGljYXRvciBpbiB0aGUgdG9wIGJhciB3aGVuIHRoZXJlIGFyZSB1bnJlYWQgbm90aWZpY2F0aW9ucy4gQ29sb3JzIGFuZCBibGlua2luZyBhcmUgY3VzdG9taXphYmxlLlxuXG5JZiB5b3UgaGF2ZSBxdWVzdGlvbnMsIHBsZWFzZSB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0V1xuXG5DcmVkaXRzOiBUaGUgaWRlYSBvZiBwYWludGluZyB0aGUgbWVzc2FnZSBvbiB1c2VyJ3MgbWVudSB3YXMgYm9ycm93ZWQgZnJvbSAnUGlkZ2luIFBlcnNpc3RlbnQgTm90aWZpY2F0aW9uJyBleHRlbnNpb24gYnkgbmVtby4gVGhlIGNvZGUgaXRzZWxmIGhhcyBzb21lIHBhcnRzIGZvcmtlZCBmcm9tICdNZXNzYWdlIE5vdGlmaWVyJyBleHRlbnNpb24gYnkgYmFyaXNpb25lLCAnTWVkaWEgcGxheWVyIGluZGljYXRvcicgZXh0ZW5zaW9uIGJ5IGVvbiBhbmQgY29udmVuaWVuY2UuanMgZnJvbSBnaXQuZ25vbWUub3JnL2dub21lLXNoZWxsLWV4dGVuc2lvbnMuIFRoZSBibGluayBpZGVhIGFuZCBpdCdzIGluaXRpYWwgY29kZSB3YXMgd3JpdHRlbiBieSBob3NzbWFuLiBUaGUgaW5pdGlhbCBnbm9tZSAzLjEwIHN1cHBvcnQgd2FzIGRvbmUgYnkgQW50aG9ueTI1LiBUaGUgZmlsdGVyaW5nIHN1cHBvcnQgd2FzIGRvbmUgYnkgaWxnYXJtZWhtZXRhbGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAibmFtZSI6ICJOb3RpZmljYXRpb25zIEFsZXJ0IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJUaGlhZ28gQmVsbGluaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JlbGxpbmk2NjYvZ25vbWUtc2hlbGwtbm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9ucy1hbGVydC1vbi11c2VyLW1lbnVAaGFja2VkYmVsbGluaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
+    "46": {"version": "52", "sha256": "1459klx03sw584iyacbsj7f97s3ndzvfyxhgn59rxl3gz8pz7h54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNvbG9yIG9mIHRoZSB0aW1lIGFuZCBkYXRlIGluZGljYXRvciBpbiB0aGUgdG9wIGJhciB3aGVuIHRoZXJlIGFyZSB1bnJlYWQgbm90aWZpY2F0aW9ucy4gQ29sb3JzIGFuZCBibGlua2luZyBhcmUgY3VzdG9taXphYmxlLlxuXG5JZiB5b3UgaGF2ZSBxdWVzdGlvbnMsIHBsZWFzZSB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0V1xuXG5DcmVkaXRzOiBUaGUgaWRlYSBvZiBwYWludGluZyB0aGUgbWVzc2FnZSBvbiB1c2VyJ3MgbWVudSB3YXMgYm9ycm93ZWQgZnJvbSAnUGlkZ2luIFBlcnNpc3RlbnQgTm90aWZpY2F0aW9uJyBleHRlbnNpb24gYnkgbmVtby4gVGhlIGNvZGUgaXRzZWxmIGhhcyBzb21lIHBhcnRzIGZvcmtlZCBmcm9tICdNZXNzYWdlIE5vdGlmaWVyJyBleHRlbnNpb24gYnkgYmFyaXNpb25lLCAnTWVkaWEgcGxheWVyIGluZGljYXRvcicgZXh0ZW5zaW9uIGJ5IGVvbiBhbmQgY29udmVuaWVuY2UuanMgZnJvbSBnaXQuZ25vbWUub3JnL2dub21lLXNoZWxsLWV4dGVuc2lvbnMuIFRoZSBibGluayBpZGVhIGFuZCBpdCdzIGluaXRpYWwgY29kZSB3YXMgd3JpdHRlbiBieSBob3NzbWFuLiBUaGUgaW5pdGlhbCBnbm9tZSAzLjEwIHN1cHBvcnQgd2FzIGRvbmUgYnkgQW50aG9ueTI1LiBUaGUgZmlsdGVyaW5nIHN1cHBvcnQgd2FzIGRvbmUgYnkgaWxnYXJtZWhtZXRhbGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAibmFtZSI6ICJOb3RpZmljYXRpb25zIEFsZXJ0IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJUaGlhZ28gQmVsbGluaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JlbGxpbmk2NjYvZ25vbWUtc2hlbGwtbm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9ucy1hbGVydC1vbi11c2VyLW1lbnVAaGFja2VkYmVsbGluaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
+    "47": {"version": "52", "sha256": "1459klx03sw584iyacbsj7f97s3ndzvfyxhgn59rxl3gz8pz7h54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNvbG9yIG9mIHRoZSB0aW1lIGFuZCBkYXRlIGluZGljYXRvciBpbiB0aGUgdG9wIGJhciB3aGVuIHRoZXJlIGFyZSB1bnJlYWQgbm90aWZpY2F0aW9ucy4gQ29sb3JzIGFuZCBibGlua2luZyBhcmUgY3VzdG9taXphYmxlLlxuXG5JZiB5b3UgaGF2ZSBxdWVzdGlvbnMsIHBsZWFzZSB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0V1xuXG5DcmVkaXRzOiBUaGUgaWRlYSBvZiBwYWludGluZyB0aGUgbWVzc2FnZSBvbiB1c2VyJ3MgbWVudSB3YXMgYm9ycm93ZWQgZnJvbSAnUGlkZ2luIFBlcnNpc3RlbnQgTm90aWZpY2F0aW9uJyBleHRlbnNpb24gYnkgbmVtby4gVGhlIGNvZGUgaXRzZWxmIGhhcyBzb21lIHBhcnRzIGZvcmtlZCBmcm9tICdNZXNzYWdlIE5vdGlmaWVyJyBleHRlbnNpb24gYnkgYmFyaXNpb25lLCAnTWVkaWEgcGxheWVyIGluZGljYXRvcicgZXh0ZW5zaW9uIGJ5IGVvbiBhbmQgY29udmVuaWVuY2UuanMgZnJvbSBnaXQuZ25vbWUub3JnL2dub21lLXNoZWxsLWV4dGVuc2lvbnMuIFRoZSBibGluayBpZGVhIGFuZCBpdCdzIGluaXRpYWwgY29kZSB3YXMgd3JpdHRlbiBieSBob3NzbWFuLiBUaGUgaW5pdGlhbCBnbm9tZSAzLjEwIHN1cHBvcnQgd2FzIGRvbmUgYnkgQW50aG9ueTI1LiBUaGUgZmlsdGVyaW5nIHN1cHBvcnQgd2FzIGRvbmUgYnkgaWxnYXJtZWhtZXRhbGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAibmFtZSI6ICJOb3RpZmljYXRpb25zIEFsZXJ0IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJUaGlhZ28gQmVsbGluaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JlbGxpbmk2NjYvZ25vbWUtc2hlbGwtbm90aWZpY2F0aW9ucy1hbGVydCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9ucy1hbGVydC1vbi11c2VyLW1lbnVAaGFja2VkYmVsbGluaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}
   }}
 , {"uuid": "kimpanel@kde.org", "name": "Input Method Panel", "pname": "kimpanel", "description": "Input Method Panel using KDE's kimpanel protocol for Gnome-Shell", "link": "https://extensions.gnome.org/extension/261/kimpanel/", "shell_version_map": {
     "38": {"version": "59", "sha256": "0rh2in9cm9khvmhhzyyw98z6bwvv95v59zcapkjpd7kbs38hqdw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDU5Cn0="},
@@ -228,8 +245,9 @@
     "42": {"version": "76", "sha256": "0p615amdp1fh6k7ci7m2j4fr3z3fc94jpm0nqwwp6m51phbi386n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzYKfQ=="},
     "43": {"version": "76", "sha256": "0p615amdp1fh6k7ci7m2j4fr3z3fc94jpm0nqwwp6m51phbi386n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzYKfQ=="},
     "44": {"version": "76", "sha256": "0p615amdp1fh6k7ci7m2j4fr3z3fc94jpm0nqwwp6m51phbi386n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNzYKfQ=="},
-    "45": {"version": "82", "sha256": "100rmmp53r2lbwpgyj8giyx5l2i7yl2hfs5qpcrs4m5a56s74wjs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogODIKfQ=="},
-    "46": {"version": "82", "sha256": "100rmmp53r2lbwpgyj8giyx5l2i7yl2hfs5qpcrs4m5a56s74wjs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogODIKfQ=="}
+    "45": {"version": "83", "sha256": "1bd5bhgzq1fsr4rbmxyja6cmsa6068c6s78qpc2s76clagcq68y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDgzCn0="},
+    "46": {"version": "83", "sha256": "1bd5bhgzq1fsr4rbmxyja6cmsa6068c6s78qpc2s76clagcq68y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDgzCn0="},
+    "47": {"version": "85", "sha256": "0hlnqdb3j3pycmbr1nl10m3kmg8gb4m9pl2p9wd6n5401ld24ma5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2VuZ3h0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1raW1wYW5lbCIsCiAgInV1aWQiOiAia2ltcGFuZWxAa2RlLm9yZyIsCiAgInZlcnNpb24iOiA4NQp9"}
   }}
 , {"uuid": "impatience@gfxmonk.net", "name": "Impatience", "pname": "impatience", "description": "Speed up the gnome-shell animation speed", "link": "https://extensions.gnome.org/extension/277/impatience/", "shell_version_map": {
     "40": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
@@ -237,8 +255,9 @@
     "42": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
     "43": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
     "44": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
-    "45": {"version": "25", "sha256": "0nrn3qaz3dv6wrf69ammp847ggkcxmzmzql91vr42r9ds9fr2gml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"},
-    "46": {"version": "25", "sha256": "0nrn3qaz3dv6wrf69ammp847ggkcxmzmzql91vr42r9ds9fr2gml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"}
+    "45": {"version": "27", "sha256": "0fw8cxk8xqiqw395h08732r1nqk5p6j1s7fjd7c6v3cfr2r6hamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "46": {"version": "27", "sha256": "0fw8cxk8xqiqw395h08732r1nqk5p6j1s7fjd7c6v3cfr2r6hamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "47": {"version": "27", "sha256": "0fw8cxk8xqiqw395h08732r1nqk5p6j1s7fjd7c6v3cfr2r6hamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}
   }}
 , {"uuid": "windowoverlay-icons@sustmidown.centrum.cz", "name": "WindowOverlay Icons", "pname": "windowoverlay-icons", "description": "Add application icons to window overview", "link": "https://extensions.gnome.org/extension/302/windowoverlay-icons/", "shell_version_map": {
     "38": {"version": "37", "sha256": "108a5i5v62a9i61av5pib3b0hcpmb6pw3np7c29jfngs25n14wd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhcHBsaWNhdGlvbiBpY29ucyB0byB3aW5kb3cgb3ZlcnZpZXciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aW5kb3dvdmVybGF5LWljb25zIiwKICAibmFtZSI6ICJXaW5kb3dPdmVybGF5IEljb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd292ZXJsYXktaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdXN0bWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd292ZXJsYXktaWNvbnMiLAogICJ1dWlkIjogIndpbmRvd292ZXJsYXktaWNvbnNAc3VzdG1pZG93bi5jZW50cnVtLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="}
@@ -250,8 +269,9 @@
     "42": {"version": "84", "sha256": "0a62pmg5jwp812nxb4gsxw2m0jn7p5l3y9m7a57zxzk6cy831asi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogODQKfQ=="},
     "43": {"version": "84", "sha256": "0a62pmg5jwp812nxb4gsxw2m0jn7p5l3y9m7a57zxzk6cy831asi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogODQKfQ=="},
     "44": {"version": "84", "sha256": "0a62pmg5jwp812nxb4gsxw2m0jn7p5l3y9m7a57zxzk6cy831asi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogODQKfQ=="},
-    "45": {"version": "92", "sha256": "0d0xv1q4b75f2ry6hfrzpb1wmbxcpzcr39q4qm9qx3qp0i2b3ix3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOTIKfQ=="},
-    "46": {"version": "92", "sha256": "0d0xv1q4b75f2ry6hfrzpb1wmbxcpzcr39q4qm9qx3qp0i2b3ix3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOTIKfQ=="}
+    "45": {"version": "99", "sha256": "0r9bjwwkzknypj9wp2yilx40az2vf6wsq3fvh0c53njn8hajmvg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDk5Cn0="},
+    "46": {"version": "99", "sha256": "0r9bjwwkzknypj9wp2yilx40az2vf6wsq3fvh0c53njn8hajmvg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDk5Cn0="},
+    "47": {"version": "99", "sha256": "0r9bjwwkzknypj9wp2yilx40az2vf6wsq3fvh0c53njn8hajmvg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDk5Cn0="}
   }}
 , {"uuid": "mythtv-fnx@fnxweb.com", "name": "MythTV", "pname": "mythtv", "description": "Displays MythTV status (free space and upcoming recordings)", "link": "https://extensions.gnome.org/extension/321/mythtv/", "shell_version_map": {
     "38": {"version": "10", "sha256": "070h11gk5zpxn5xbc71skdz174hbb72l0isia2vp7d9wy4ackl0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbnh3ZWIvZ25vbWUtc2hlbGwtbXl0aHR2IiwKICAidXVpZCI6ICJteXRodHYtZm54QGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
@@ -269,8 +289,9 @@
     "42": {"version": "28", "sha256": "0c2akxvw2351a6i0ah5rrir9n05zxibzhiz7n97xk8b4d03hh1kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wOTFwYXVsL21pZGRsZWNsaWNrY2xvc2UiLAogICJ1dWlkIjogIm1pZGRsZWNsaWNrY2xvc2VAcGFvbG8udHJhbnF1aWxsaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "43": {"version": "28", "sha256": "0c2akxvw2351a6i0ah5rrir9n05zxibzhiz7n97xk8b4d03hh1kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wOTFwYXVsL21pZGRsZWNsaWNrY2xvc2UiLAogICJ1dWlkIjogIm1pZGRsZWNsaWNrY2xvc2VAcGFvbG8udHJhbnF1aWxsaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "44": {"version": "28", "sha256": "0c2akxvw2351a6i0ah5rrir9n05zxibzhiz7n97xk8b4d03hh1kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wOTFwYXVsL21pZGRsZWNsaWNrY2xvc2UiLAogICJ1dWlkIjogIm1pZGRsZWNsaWNrY2xvc2VAcGFvbG8udHJhbnF1aWxsaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
-    "45": {"version": "30", "sha256": "1vw310ji7n8fv4xd099xv06yjq79d53v5lmxx2szyzy723nn0r7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcDkxcGF1bC9taWRkbGVjbGlja2Nsb3NlIiwKICAidXVpZCI6ICJtaWRkbGVjbGlja2Nsb3NlQHBhb2xvLnRyYW5xdWlsbGkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="},
-    "46": {"version": "30", "sha256": "1vw310ji7n8fv4xd099xv06yjq79d53v5lmxx2szyzy723nn0r7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcDkxcGF1bC9taWRkbGVjbGlja2Nsb3NlIiwKICAidXVpZCI6ICJtaWRkbGVjbGlja2Nsb3NlQHBhb2xvLnRyYW5xdWlsbGkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}
+    "45": {"version": "31", "sha256": "1v5i47krmzmjg85627dda7w7vbildd8i3yx0ijbmwi2zr0ybmbyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "46": {"version": "31", "sha256": "1v5i47krmzmjg85627dda7w7vbildd8i3yx0ijbmwi2zr0ybmbyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "47": {"version": "31", "sha256": "1v5i47krmzmjg85627dda7w7vbildd8i3yx0ijbmwi2zr0ybmbyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}
   }}
 , {"uuid": "status-area-horizontal-spacing@mathematical.coffee.gmail.com", "name": "Status Area Horizontal Spacing", "pname": "status-area-horizontal-spacing", "description": "Reduce the horizontal spacing between icons in the top-right status area", "link": "https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/", "shell_version_map": {
     "38": {"version": "16", "sha256": "05hhj10hlcpbgd9sbvq89vxzqj6ndf21syas8zidy6yfy613b6l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
@@ -280,7 +301,8 @@
     "43": {"version": "24", "sha256": "092ydcl7f0s9bfwnb8366hrjbfmd4xrjipfbqr6h6mwiavmphip9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nQG1hdGhlbWF0aWNhbC5jb2ZmZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="},
     "44": {"version": "24", "sha256": "092ydcl7f0s9bfwnb8366hrjbfmd4xrjipfbqr6h6mwiavmphip9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nQG1hdGhlbWF0aWNhbC5jb2ZmZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="},
     "45": {"version": "26", "sha256": "187mxv4381sqh9xclnh1n3mq48dw6x5c4wdzknq3b8cglfv3ii6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS41IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"},
-    "46": {"version": "28", "sha256": "1hcb108xi257w4mnw2qddz2avfxd9vfir9vxn9c57wkclblzm2qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS41IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}
+    "46": {"version": "29", "sha256": "0zsfg2qnz38ikh2h1lii2vxavs6znp2c8skhpc7cw0g1lqxci7zk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS42IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
+    "47": {"version": "29", "sha256": "0zsfg2qnz38ikh2h1lii2vxavs6znp2c8skhpc7cw0g1lqxci7zk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS42IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="}
   }}
 , {"uuid": "activities-config@nls1729", "name": "Activities Configurator", "pname": "activities-configurator", "description": "Activities Configurator, activities-config@nls1729 -  Effective March 29, 2021 the extension is NOT MAINTAINED.  I give my permission to anyone who may want to become the maintainer.  I do not have the free time or energy necessary to maintain the extension.\n\nConfigure the Activities Button and Top Panel. Select an icon. Change the text. Disable Hot Corner or set the Hot Corner Threshold. Set Panel Background color and transparency plus much more to enhance your desktop.  Click the icon or text with the secondary mouse button to launch the GS Extension Prefs.", "link": "https://extensions.gnome.org/extension/358/activities-configurator/", "shell_version_map": {
     "38": {"version": "89", "sha256": "1z00smimg5fj6ri35g80bvfzzy5xxxrgwy4idsakphszdwryi8ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2aXRpZXMgQ29uZmlndXJhdG9yLCBhY3Rpdml0aWVzLWNvbmZpZ0BubHMxNzI5IC0gIEVmZmVjdGl2ZSBNYXJjaCAyOSwgMjAyMSB0aGUgZXh0ZW5zaW9uIGlzIE5PVCBNQUlOVEFJTkVELiAgSSBnaXZlIG15IHBlcm1pc3Npb24gdG8gYW55b25lIHdobyBtYXkgd2FudCB0byBiZWNvbWUgdGhlIG1haW50YWluZXIuICBJIGRvIG5vdCBoYXZlIHRoZSBmcmVlIHRpbWUgb3IgZW5lcmd5IG5lY2Vzc2FyeSB0byBtYWludGFpbiB0aGUgZXh0ZW5zaW9uLlxuXG5Db25maWd1cmUgdGhlIEFjdGl2aXRpZXMgQnV0dG9uIGFuZCBUb3AgUGFuZWwuIFNlbGVjdCBhbiBpY29uLiBDaGFuZ2UgdGhlIHRleHQuIERpc2FibGUgSG90IENvcm5lciBvciBzZXQgdGhlIEhvdCBDb3JuZXIgVGhyZXNob2xkLiBTZXQgUGFuZWwgQmFja2dyb3VuZCBjb2xvciBhbmQgdHJhbnNwYXJlbmN5IHBsdXMgbXVjaCBtb3JlIHRvIGVuaGFuY2UgeW91ciBkZXNrdG9wLiAgQ2xpY2sgdGhlIGljb24gb3IgdGV4dCB3aXRoIHRoZSBzZWNvbmRhcnkgbW91c2UgYnV0dG9uIHRvIGxhdW5jaCB0aGUgR1MgRXh0ZW5zaW9uIFByZWZzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhY3Rpdml0aWVzLWNvbmZpZyIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXRpZXMtY29uZmlnLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBDb25maWd1cmF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWN0aXZpdGllcy1jb25maWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmxzMTcyOS5naXRodWIuaW8vYWN0aXZpdGllc19jb25maWcuaHRtbCIsCiAgInV1aWQiOiAiYWN0aXZpdGllcy1jb25maWdAbmxzMTcyOSIsCiAgInZlcnNpb24iOiA4OQp9"}
@@ -291,8 +313,9 @@
     "42": {"version": "12", "sha256": "04hy8bjr82hzcf7y6hg878ygqgbzr8d4y3w0cvd7zz86knpc6kfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2FsY0BkYW5pZ20ud2Fkb2JvLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "43": {"version": "12", "sha256": "04hy8bjr82hzcf7y6hg878ygqgbzr8d4y3w0cvd7zz86knpc6kfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2FsY0BkYW5pZ20ud2Fkb2JvLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "04hy8bjr82hzcf7y6hg878ygqgbzr8d4y3w0cvd7zz86knpc6kfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2FsY0BkYW5pZ20ud2Fkb2JvLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "45": {"version": "15", "sha256": "12rrykrrbkbzjads39apw8rdxnmic3y03c2mndqnybhlnxmbrrpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vZ25vbWUtc2hlbGwtY2FsY3VsYXRvciIsCiAgInV1aWQiOiAiY2FsY0BkYW5pZ20ud2Fkb2JvLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "46": {"version": "15", "sha256": "12rrykrrbkbzjads39apw8rdxnmic3y03c2mndqnybhlnxmbrrpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vZ25vbWUtc2hlbGwtY2FsY3VsYXRvciIsCiAgInV1aWQiOiAiY2FsY0BkYW5pZ20ud2Fkb2JvLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
+    "45": {"version": "16", "sha256": "01p4sglgyx3qhg2qrv6sw4jmk9xsp0v199my636l9hk5nll7dvch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2dub21lLXNoZWxsLWNhbGN1bGF0b3IiLAogICJ1dWlkIjogImNhbGNAZGFuaWdtLndhZG9iby5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "46": {"version": "16", "sha256": "01p4sglgyx3qhg2qrv6sw4jmk9xsp0v199my636l9hk5nll7dvch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2dub21lLXNoZWxsLWNhbGN1bGF0b3IiLAogICJ1dWlkIjogImNhbGNAZGFuaWdtLndhZG9iby5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "47": {"version": "16", "sha256": "01p4sglgyx3qhg2qrv6sw4jmk9xsp0v199my636l9hk5nll7dvch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2dub21lLXNoZWxsLWNhbGN1bGF0b3IiLAogICJ1dWlkIjogImNhbGNAZGFuaWdtLndhZG9iby5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
   }}
 , {"uuid": "remmina-search-provider@alexmurray.github.com", "name": "Remmina Search Provider", "pname": "remmina-search-provider", "description": "Search for Remmina Remote Desktop Connections\n\nEasily search for and launch connections to remote machines by name and protocol.", "link": "https://extensions.gnome.org/extension/473/remmina-search-provider/", "shell_version_map": {
     "40": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
@@ -300,8 +323,9 @@
     "42": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
     "43": {"version": "16", "sha256": "0mlbda3rln4fr4i9hzy36xkfw8xnr3y5q6rc3zvv1nz24zavzlhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhtdXJyYXkvcmVtbWluYS1zZWFyY2gtcHJvdmlkZXIvIiwKICAidXVpZCI6ICJyZW1taW5hLXNlYXJjaC1wcm92aWRlckBhbGV4bXVycmF5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
     "44": {"version": "18", "sha256": "0l3p1w4ynn38gvqky0cmldcc7md7rcqn5w1iskhv8d5bg0arccsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhtdXJyYXkvcmVtbWluYS1zZWFyY2gtcHJvdmlkZXIvIiwKICAidXVpZCI6ICJyZW1taW5hLXNlYXJjaC1wcm92aWRlckBhbGV4bXVycmF5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
-    "45": {"version": "23", "sha256": "15736fnizd9fjwxwd6xha1iqgwmqfrvv5bfbwydk9vajkv5wyb4m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4bXVycmF5L3JlbW1pbmEtc2VhcmNoLXByb3ZpZGVyLyIsCiAgInV1aWQiOiAicmVtbWluYS1zZWFyY2gtcHJvdmlkZXJAYWxleG11cnJheS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "46": {"version": "23", "sha256": "15736fnizd9fjwxwd6xha1iqgwmqfrvv5bfbwydk9vajkv5wyb4m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4bXVycmF5L3JlbW1pbmEtc2VhcmNoLXByb3ZpZGVyLyIsCiAgInV1aWQiOiAicmVtbWluYS1zZWFyY2gtcHJvdmlkZXJAYWxleG11cnJheS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "45": {"version": "26", "sha256": "1fc6025s90ma4k6zx6wba3pfnpik2snnxg1k1c3hprkbw7sjgswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"},
+    "46": {"version": "26", "sha256": "1fc6025s90ma4k6zx6wba3pfnpik2snnxg1k1c3hprkbw7sjgswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"},
+    "47": {"version": "26", "sha256": "1fc6025s90ma4k6zx6wba3pfnpik2snnxg1k1c3hprkbw7sjgswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}
   }}
 , {"uuid": "uptime-indicator@gniourfgniourf.gmail.com", "name": "Uptime Indicator", "pname": "uptime-indicator", "description": "Indicates uptime in status area. When clicked, a popup menu indicates the date when the system was started.", "link": "https://extensions.gnome.org/extension/508/uptime-indicator/", "shell_version_map": {
     "38": {"version": "23", "sha256": "0rq7q1h2vr8f44b5vgyrhbhr3d1hir173kk6c2zl81kj77nvna0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0duaW91cmYvVXB0aW1lLUluZGljYXRvciIsCiAgInV1aWQiOiAidXB0aW1lLWluZGljYXRvckBnbmlvdXJmZ25pb3VyZi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
@@ -319,8 +343,9 @@
     "42": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="},
     "43": {"version": "51", "sha256": "1vpm780bcjf5g0fxwdb1blch6yzy60vwa1acxwf53m8zyqsxbmfx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDUxCn0="},
     "44": {"version": "51", "sha256": "1vpm780bcjf5g0fxwdb1blch6yzy60vwa1acxwf53m8zyqsxbmfx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDUxCn0="},
-    "45": {"version": "54", "sha256": "0l4m23qjx0h7plakrvpgy3vvmga2b4v76jxlzhxydsj3ivyr4f3q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogWwogICAgICAiZW9ucGF0YXBvbiIsCiAgICAgICJzdHVhcnRhaGF5aHVyc3QiLAogICAgICAicGFrYW9yYWtpIgogICAgXQogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgIm5hbWUiOiAiQ2FmZmVpbmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FmZmVpbmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNTQKfQ=="},
-    "46": {"version": "54", "sha256": "0l4m23qjx0h7plakrvpgy3vvmga2b4v76jxlzhxydsj3ivyr4f3q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogWwogICAgICAiZW9ucGF0YXBvbiIsCiAgICAgICJzdHVhcnRhaGF5aHVyc3QiLAogICAgICAicGFrYW9yYWtpIgogICAgXQogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgIm5hbWUiOiAiQ2FmZmVpbmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FmZmVpbmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNTQKfQ=="}
+    "45": {"version": "55", "sha256": "1393cxsc57msva0gfw025w500xzfzkxgg22skaf1pgrl1mbzwk3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogWwogICAgICAiZW9ucGF0YXBvbiIsCiAgICAgICJzdHVhcnRhaGF5aHVyc3QiLAogICAgICAicGFrYW9yYWtpIgogICAgXQogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgIm5hbWUiOiAiQ2FmZmVpbmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FmZmVpbmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDU1Cn0="},
+    "46": {"version": "55", "sha256": "1393cxsc57msva0gfw025w500xzfzkxgg22skaf1pgrl1mbzwk3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogWwogICAgICAiZW9ucGF0YXBvbiIsCiAgICAgICJzdHVhcnRhaGF5aHVyc3QiLAogICAgICAicGFrYW9yYWtpIgogICAgXQogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgIm5hbWUiOiAiQ2FmZmVpbmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FmZmVpbmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDU1Cn0="},
+    "47": {"version": "55", "sha256": "1393cxsc57msva0gfw025w500xzfzkxgg22skaf1pgrl1mbzwk3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogWwogICAgICAiZW9ucGF0YXBvbiIsCiAgICAgICJzdHVhcnRhaGF5aHVyc3QiLAogICAgICAicGFrYW9yYWtpIgogICAgXQogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgIm5hbWUiOiAiQ2FmZmVpbmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FmZmVpbmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDU1Cn0="}
   }}
 , {"uuid": "backslide@codeisland.org", "name": "BackSlide", "pname": "backslide", "description": "Automatic background-image (wallpaper) slideshow for Gnome Shell", "link": "https://extensions.gnome.org/extension/543/backslide/", "shell_version_map": {
     "38": {"version": "18", "sha256": "155fpm71cfy23xj9pz0n7299vc4rdfkd5mjgg55vkz8wh76xbc7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvQmFja1NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
@@ -329,7 +354,8 @@
     "42": {"version": "26", "sha256": "09qd7az18fr9l67v00fxgpnzfwwn7qlz1r274rgsnsi6wjxd50qv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL0JhY2tTbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI2Cn0="},
     "43": {"version": "28", "sha256": "0436dfcm4j7kgiz83hkkwg1p0mcq5x5if5xvbx693lm9qvisw09k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9CYWNrU2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyOAp9"},
     "44": {"version": "28", "sha256": "0436dfcm4j7kgiz83hkkwg1p0mcq5x5if5xvbx693lm9qvisw09k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9CYWNrU2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyOAp9"},
-    "46": {"version": "32", "sha256": "1kab8y5q3x9vqi3ih4i1h17c5y3pkyvyb6w6x8ckfjnhb8bwpbdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYWNrc2xpZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9CYWNrU2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAzMgp9"}
+    "46": {"version": "33", "sha256": "0xdip5x3ml94vclvm80dhqcy0k5aab7hfw9ycsxwm0xb7xvhrpda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYWNrc2xpZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvQmFja1NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
+    "47": {"version": "33", "sha256": "0xdip5x3ml94vclvm80dhqcy0k5aab7hfw9ycsxwm0xb7xvhrpda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYWNrc2xpZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvQmFja1NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMzMKfQ=="}
   }}
 , {"uuid": "historymanager-prefix-search@sustmidown.centrum.cz", "name": "History Manager Prefix Search", "pname": "historymanager-prefix-search", "description": "Use PageUp and PageDown to move in HistoryManager (eg. Run Command, Looking Glass) according to prefix", "link": "https://extensions.gnome.org/extension/544/historymanager-prefix-search/", "shell_version_map": {
     "40": {"version": "18", "sha256": "0qhwdpdnxs3drda29zdb3vy8d7djb55i9a0d9a9rar3wqlncpbny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBQYWdlVXAgYW5kIFBhZ2VEb3duIHRvIG1vdmUgaW4gSGlzdG9yeU1hbmFnZXIgKGVnLiBSdW4gQ29tbWFuZCwgTG9va2luZyBHbGFzcykgYWNjb3JkaW5nIHRvIHByZWZpeCIsCiAgImdldHRleHQtZG9tYWluIjogImhpc3RvcnltYW5hZ2VyLXByZWZpeC1zZWFyY2giLAogICJuYW1lIjogIkhpc3RvcnkgTWFuYWdlciBQcmVmaXggU2VhcmNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhpc3RvcnltYW5hZ2VyLXByZWZpeC1zZWFyY2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1c3RtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGlzdG9yeW1hbmFnZXItcHJlZml4LXNlYXJjaCIsCiAgInV1aWQiOiAiaGlzdG9yeW1hbmFnZXItcHJlZml4LXNlYXJjaEBzdXN0bWlkb3duLmNlbnRydW0uY3oiLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
@@ -347,8 +373,9 @@
     "42": {"version": "114", "sha256": "07mqqya5vpfs3bf7823ir3c23rjpn81l58m8r5nas3i2ggxsgfln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvdHV4b3IxMzM3L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMTQKfQ=="},
     "43": {"version": "114", "sha256": "07mqqya5vpfs3bf7823ir3c23rjpn81l58m8r5nas3i2ggxsgfln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvdHV4b3IxMzM3L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMTQKfQ=="},
     "44": {"version": "114", "sha256": "07mqqya5vpfs3bf7823ir3c23rjpn81l58m8r5nas3i2ggxsgfln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvdHV4b3IxMzM3L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMTQKfQ=="},
-    "45": {"version": "117", "sha256": "1hb3g8r0hwrmymni2klzmb3chc9z9vddiqkavlc10hcrbhi8qs60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvdHV4b3IxMzM3L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMTcKfQ=="},
-    "46": {"version": "117", "sha256": "1hb3g8r0hwrmymni2klzmb3chc9z9vddiqkavlc10hcrbhi8qs60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvdHV4b3IxMzM3L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMTcKfQ=="}
+    "45": {"version": "118", "sha256": "1y5yyhg3yxihvk0m6y4bxl5x49xcvzc5fxk56f2yyy6444msygpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTE4Cn0="},
+    "46": {"version": "118", "sha256": "1y5yyhg3yxihvk0m6y4bxl5x49xcvzc5fxk56f2yyy6444msygpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTE4Cn0="},
+    "47": {"version": "118", "sha256": "1y5yyhg3yxihvk0m6y4bxl5x49xcvzc5fxk56f2yyy6444msygpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTE4Cn0="}
   }}
 , {"uuid": "hdate@hatul.info", "name": "Gnome HDate", "pname": "gnome-hdate", "description": "Show Hebrew Date in the Panel.\nRequires libhdate-glib", "link": "https://extensions.gnome.org/extension/554/gnome-hdate/", "shell_version_map": {
     "40": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"},
@@ -366,7 +393,8 @@
     "43": {"version": "40", "sha256": "0ly27qxr126ffhpx8hvvyz6q2179kpq1q7hjy1wja6zflwcc94jf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS90b2RvLnR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24vdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
     "44": {"version": "40", "sha256": "0ly27qxr126ffhpx8hvvyz6q2179kpq1q7hjy1wja6zflwcc94jf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS90b2RvLnR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24vdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
     "45": {"version": "43", "sha256": "1xmsvsi23gl44nz6ldgyfp086711m155vz69md3dch1d3ilfhq1h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
-    "46": {"version": "44", "sha256": "0yzzvw9xlqmwh543j5g9v1g3avbpsz5kngfdnrg70yyxslr6ahm1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NAp9"}
+    "46": {"version": "44", "sha256": "0yzzvw9xlqmwh543j5g9v1g3avbpsz5kngfdnrg70yyxslr6ahm1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NAp9"},
+    "47": {"version": "46", "sha256": "1gwn9jalbxihbamyvjw642xfv7l5f7y3gxnzcn37prrn64f9q7zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}
   }}
 , {"uuid": "text_translator@awamper.gmail.com", "name": "Text Translator", "pname": "text-translator", "description": "** Needs the package translate-shell **\nTranslation of the text by different translators (currently Google.Translate, Yandex.Translate).\nShortcuts:\nSuper+T - open translator dialog.\nSuper+Shift+T - open translator dialog and translate text from clipboard.\nSuper+Alt+T - open translator dialog and translate from primary selection.\nCtrl+Enter+ - Translate text.\nCtrl+Shift+C - copy translated text to clipboard.\nCtrl+S - swap languages.\nCtrl+D - reset languages to default\nTab+ - toggle transliteration of result text.", "link": "https://extensions.gnome.org/extension/593/text-translator/", "shell_version_map": {
     "38": {"version": "36", "sha256": "1idzgg4vb791k5dryjvznr6mfwfx59vlgabw2n3spysbwvjv2a48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqIE5lZWRzIHRoZSBwYWNrYWdlIHRyYW5zbGF0ZS1zaGVsbCAqKlxuVHJhbnNsYXRpb24gb2YgdGhlIHRleHQgYnkgZGlmZmVyZW50IHRyYW5zbGF0b3JzIChjdXJyZW50bHkgR29vZ2xlLlRyYW5zbGF0ZSwgWWFuZGV4LlRyYW5zbGF0ZSkuXG5TaG9ydGN1dHM6XG5TdXBlcitUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZy5cblN1cGVyK1NoaWZ0K1QgLSBvcGVuIHRyYW5zbGF0b3IgZGlhbG9nIGFuZCB0cmFuc2xhdGUgdGV4dCBmcm9tIGNsaXBib2FyZC5cblN1cGVyK0FsdCtUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZyBhbmQgdHJhbnNsYXRlIGZyb20gcHJpbWFyeSBzZWxlY3Rpb24uXG5DdHJsK0VudGVyKyAtIFRyYW5zbGF0ZSB0ZXh0LlxuQ3RybCtTaGlmdCtDIC0gY29weSB0cmFuc2xhdGVkIHRleHQgdG8gY2xpcGJvYXJkLlxuQ3RybCtTIC0gc3dhcCBsYW5ndWFnZXMuXG5DdHJsK0QgLSByZXNldCBsYW5ndWFnZXMgdG8gZGVmYXVsdFxuVGFiKyAtIHRvZ2dsZSB0cmFuc2xpdGVyYXRpb24gb2YgcmVzdWx0IHRleHQuIiwKICAibmFtZSI6ICJUZXh0IFRyYW5zbGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGV4dC10cmFuc2xhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Vmb2UvdGV4dC10cmFuc2xhdG9yIiwKICAidXVpZCI6ICJ0ZXh0X3RyYW5zbGF0b3JAYXdhbXBlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
@@ -377,8 +405,9 @@
     "42": {"version": "41", "sha256": "071m9z08bipyjfbvzyd00cdd0qrjz8ix6p2rjkqcjqgv102hldb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA0MQp9"},
     "43": {"version": "41", "sha256": "071m9z08bipyjfbvzyd00cdd0qrjz8ix6p2rjkqcjqgv102hldb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA0MQp9"},
     "44": {"version": "41", "sha256": "071m9z08bipyjfbvzyd00cdd0qrjz8ix6p2rjkqcjqgv102hldb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA0MQp9"},
-    "45": {"version": "52", "sha256": "1wbbv6pr2d1m33zdb88hpgmay98g310k8w8lwfgzqn4w067fzby7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvYXV0b2hpZGUtYmF0dGVyeSIsCiAgInV1aWQiOiAiYXV0b2hpZGUtYmF0dGVyeUBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
-    "46": {"version": "52", "sha256": "1wbbv6pr2d1m33zdb88hpgmay98g310k8w8lwfgzqn4w067fzby7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvYXV0b2hpZGUtYmF0dGVyeSIsCiAgInV1aWQiOiAiYXV0b2hpZGUtYmF0dGVyeUBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogNTIKfQ=="}
+    "45": {"version": "53", "sha256": "1nbvyd02z2y9ixhiad6nvbkrlx888bj424zs1rx84g3amndwjq2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUzCn0="},
+    "46": {"version": "53", "sha256": "1nbvyd02z2y9ixhiad6nvbkrlx888bj424zs1rx84g3amndwjq2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUzCn0="},
+    "47": {"version": "53", "sha256": "1nbvyd02z2y9ixhiad6nvbkrlx888bj424zs1rx84g3amndwjq2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUzCn0="}
   }}
 , {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch new instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {
     "38": {"version": "29", "sha256": "0qb1ajjwm076zxsd314n7f5vl72ih7j4h9y84bqwb9cxa53mp4g4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsYXVuY2gtbmV3LWluc3RhbmNlQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="},
@@ -388,7 +417,8 @@
     "43": {"version": "35", "sha256": "1i96p4jzi3yfkccbzv7r7x059xr834wispzg1n2888im51zz6x4h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="},
     "44": {"version": "36", "sha256": "06rhp1difpb7j1l49lay3h5wscf8nv2p0xqs70rss6yvjywsgi34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
     "45": {"version": "39", "sha256": "0ap68r89z2z95vvmr6k009gczijanlkp002dbvkr5dpvzknzzc09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
-    "46": {"version": "42", "sha256": "0gn1wj1z104k6xwk04bgd04ipjmqw1mfpv0rsm14byv7mga9b6fb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}
+    "46": {"version": "42", "sha256": "0gn1wj1z104k6xwk04bgd04ipjmqw1mfpv0rsm14byv7mga9b6fb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="},
+    "47": {"version": "43", "sha256": "17hid4nnc6i2c2a9x4kdmsvhp22yy07vlp5ni1wsds2xr83n3hci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}
   }}
 , {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": {
     "38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
@@ -398,7 +428,8 @@
     "43": {"version": "47", "sha256": "1nzdl0zb8i7wipsnnrixkpj6rrsv3vz4c1snqspb23h494232wmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="},
     "44": {"version": "48", "sha256": "121n3vcy1kk3vj7say292synnl5ig3kl94i039d2b40pslh4zlq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDgKfQ=="},
     "45": {"version": "51", "sha256": "1nb3iwyhn08m9ylyb8jn9lncqmj08vrldvjvn642wkibi0vg1dwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="},
-    "46": {"version": "54", "sha256": "1944z394b9sfll8jmyc8p5q9nl69xxvkk1626gykaaavywn9y7y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTQKfQ=="}
+    "46": {"version": "54", "sha256": "1944z394b9sfll8jmyc8p5q9nl69xxvkk1626gykaaavywn9y7y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTQKfQ=="},
+    "47": {"version": "55", "sha256": "0b79vampbfi1pr9nddd6drr7z7pr4phx95grighw40fjly2vnb5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}
   }}
 , {"uuid": "MultiClock@mibus.org", "name": "MultiClock", "pname": "multiclock", "description": "A clock for showing a second timezone in the panel.", "link": "https://extensions.gnome.org/extension/605/multiclock/", "shell_version_map": {
     "40": {"version": "8", "sha256": "1pp1cnmpix668mrywpv6mkyb45lw7f6cwibjl6bc7cgb01hkzd53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY2xvY2sgZm9yIHNob3dpbmcgYSBzZWNvbmQgdGltZXpvbmUgaW4gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiTXVsdGlDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5taWJ1c011bHRpQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWJ1cy9NdWx0aUNsb2NrIiwKICAidXVpZCI6ICJNdWx0aUNsb2NrQG1pYnVzLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="}
@@ -410,8 +441,9 @@
     "42": {"version": "53", "sha256": "18c8dykfnd7ci8d3lxcaimh60sbcsimrl8zygv85yhm44j8hcv8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="},
     "43": {"version": "53", "sha256": "18c8dykfnd7ci8d3lxcaimh60sbcsimrl8zygv85yhm44j8hcv8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="},
     "44": {"version": "53", "sha256": "18c8dykfnd7ci8d3lxcaimh60sbcsimrl8zygv85yhm44j8hcv8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="},
-    "45": {"version": "58", "sha256": "1fbf4n2wvli1hayv6mhmncx4jh30gp4a6gmh5l6j6xman8lig319", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="},
-    "46": {"version": "58", "sha256": "1fbf4n2wvli1hayv6mhmncx4jh30gp4a6gmh5l6j6xman8lig319", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}
+    "45": {"version": "59", "sha256": "1i887f32y2v908dy1dgyadn7sabkdqmvf1xsmny9qk991l43985h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
+    "46": {"version": "59", "sha256": "1i887f32y2v908dy1dgyadn7sabkdqmvf1xsmny9qk991l43985h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
+    "47": {"version": "59", "sha256": "1i887f32y2v908dy1dgyadn7sabkdqmvf1xsmny9qk991l43985h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="}
   }}
 , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": {
     "38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="},
@@ -434,7 +466,8 @@
     "43": {"version": "47", "sha256": "01kw3aqcyv5lm0rfyfg1vkmn9bwm8ai0yg29b48b0904jc31qad3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiBDaGluZXNlQ2FsZW5kYXIgYnkgeXRsaXUwOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL0NoaW5lc2VDYWxlbmRhci8tL2FyY2hpdmUvMjAyNDAxMDcvQ2hpbmVzZUNhbGVuZGFyLTIwMjQwMTA3LnRhci5neiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbHVuYXItY2FsZW5kYXIvLS9pc3N1ZXMiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
     "44": {"version": "47", "sha256": "01kw3aqcyv5lm0rfyfg1vkmn9bwm8ai0yg29b48b0904jc31qad3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiBDaGluZXNlQ2FsZW5kYXIgYnkgeXRsaXUwOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL0NoaW5lc2VDYWxlbmRhci8tL2FyY2hpdmUvMjAyNDAxMDcvQ2hpbmVzZUNhbGVuZGFyLTIwMjQwMTA3LnRhci5neiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbHVuYXItY2FsZW5kYXIvLS9pc3N1ZXMiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
     "45": {"version": "46", "sha256": "1wxanc7saa6vl78k2fi2v8skcj90k1hkb8v85b8n608ma90gycbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiBDaGluZXNlQ2FsZW5kYXIgYnkgeXRsaXUwOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL0NoaW5lc2VDYWxlbmRhci8tL2FyY2hpdmUvMjAyNDAxMDcvQ2hpbmVzZUNhbGVuZGFyLTIwMjQwMTA3LnRhci5neiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sdW5hci1jYWxlbmRhci8tL2lzc3VlcyIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogNDYKfQ=="},
-    "46": {"version": "48", "sha256": "17ksgq6bd9n3xjj02bkisp70bag4mdzi3k8yzrsn3whz6mgrfsch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiBDaGluZXNlQ2FsZW5kYXIgYnkgeXRsaXUwOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL0NoaW5lc2VDYWxlbmRhci8tL2FyY2hpdmUvMjAyNDAxMDcvQ2hpbmVzZUNhbGVuZGFyLTIwMjQwMTA3LnRhci5neiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sdW5hci1jYWxlbmRhci8tL2lzc3VlcyIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}
+    "46": {"version": "49", "sha256": "1gxz64n801jp528ivh8wy8xq284ki2shdqjs74a9gva5l5h9k2il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiBDaGluZXNlQ2FsZW5kYXIgYnkgeXRsaXUwOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL0NoaW5lc2VDYWxlbmRhci8tL2FyY2hpdmUvMjAyNDAxMDcvQ2hpbmVzZUNhbGVuZGFyLTIwMjQwMTA3LnRhci5neiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbHVuYXItY2FsZW5kYXIvLS9pc3N1ZXMiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
+    "47": {"version": "49", "sha256": "1gxz64n801jp528ivh8wy8xq284ki2shdqjs74a9gva5l5h9k2il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiBDaGluZXNlQ2FsZW5kYXIgYnkgeXRsaXUwOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL0NoaW5lc2VDYWxlbmRhci8tL2FyY2hpdmUvMjAyNDAxMDcvQ2hpbmVzZUNhbGVuZGFyLTIwMjQwMTA3LnRhci5neiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbHVuYXItY2FsZW5kYXIvLS9pc3N1ZXMiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDQ5Cn0="}
   }}
 , {"uuid": "EasyScreenCast@iacopodeenosee.gmail.com", "name": "EasyScreenCast", "pname": "easyscreencast", "description": "This extension simplifies the use of the video recording function integrated in gnome shell, allows quickly to change the various settings of the desktop recording.\n\nSOURCE CODE ->  https://github.com/EasyScreenCast/EasyScreenCast\n\nVIDEO ->  https://youtu.be/81E9AruraKU\n\n**NOTICE**\nif an error occurs during the update is recommended to reload GNOME Shell (Alt + F2, 'r') and reload the extension's installation page.", "link": "https://extensions.gnome.org/extension/690/easyscreencast/", "shell_version_map": {
     "38": {"version": "47", "sha256": "0fkp5qg6xg4jh8zamba7gva5imp83pg4cy4v8q586dcli2r8yzmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"},
@@ -444,7 +477,8 @@
     "43": {"version": "47", "sha256": "0fkp5qg6xg4jh8zamba7gva5imp83pg4cy4v8q586dcli2r8yzmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"},
     "44": {"version": "47", "sha256": "0fkp5qg6xg4jh8zamba7gva5imp83pg4cy4v8q586dcli2r8yzmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"},
     "45": {"version": "49", "sha256": "1jz9g6ni05pjf0kghzsjqm1l05sagbyns5x97dx464dkvbjfn56p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
-    "46": {"version": "50", "sha256": "0fxnymblyrh6clh19jx1y8ln7xclyb8xv25lc0bbja3q7w4pxfh4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUwCn0="}
+    "46": {"version": "51", "sha256": "0h7666g80xid1arrffrnp2s2dd3xhr4h2ywhh3vbvmbkcxra8966", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"},
+    "47": {"version": "51", "sha256": "0h7666g80xid1arrffrnp2s2dd3xhr4h2ywhh3vbvmbkcxra8966", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}
   }}
 , {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {
     "40": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="},
@@ -452,7 +486,9 @@
     "42": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="},
     "43": {"version": "34", "sha256": "1kjxk2jq3pg3h729xhp5x00irjayvkmqwgphp5a6mjgx9xizrd07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAzNAp9"},
     "44": {"version": "34", "sha256": "1kjxk2jq3pg3h729xhp5x00irjayvkmqwgphp5a6mjgx9xizrd07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAzNAp9"},
-    "45": {"version": "36", "sha256": "1jvsw57kmf9ha82krcg4cxfj8nk2gpzy43z8jm07j9raia41mzm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JvbGwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVG9wIFBhbmVsIFdvcmtzcGFjZSBTY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRpbUBnZnhtb25rLm5ldCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
+    "45": {"version": "37", "sha256": "0czca78x6fbriw4sh1pgkv9wgq6ljmybyj2rkq2wcls7i46fzv2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JvbGwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVG9wIFBhbmVsIFdvcmtzcGFjZSBTY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRpbUBnZnhtb25rLm5ldCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "46": {"version": "37", "sha256": "0czca78x6fbriw4sh1pgkv9wgq6ljmybyj2rkq2wcls7i46fzv2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JvbGwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVG9wIFBhbmVsIFdvcmtzcGFjZSBTY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRpbUBnZnhtb25rLm5ldCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "47": {"version": "37", "sha256": "0czca78x6fbriw4sh1pgkv9wgq6ljmybyj2rkq2wcls7i46fzv2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JvbGwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVG9wIFBhbmVsIFdvcmtzcGFjZSBTY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRpbUBnZnhtb25rLm5ldCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAzNwp9"}
   }}
 , {"uuid": "all-windows@ezix.org", "name": "All Windows", "pname": "all-windows", "description": "List open windows of all workspaces", "link": "https://extensions.gnome.org/extension/704/all-windows/", "shell_version_map": {
     "40": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -485,8 +521,9 @@
     "42": {"version": "15", "sha256": "1bz18vqqk7ya2w53qa3jnw33vfxisjmr76ribdq3lwsjm0kimmyc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFxuXG5UbyBkaXNhYmxlIHRvcCBsZWZ0IGhvdCBjb3JuZXIgLSBpbiBvbGRlciBnbm9tZS1zaGVsbCAtICB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuXG5cbk5ld2VyIGdub21lLXNoZWxsIGhhcyBhIGJ1aWx0aW4gc2V0dGluZyB0byBkaXNhYmxlIGhvdC1jb3JuZXI7KSIsCiAgIm5hbWUiOiAiSGlkZSBBY3Rpdml0aWVzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "43": {"version": "15", "sha256": "1bz18vqqk7ya2w53qa3jnw33vfxisjmr76ribdq3lwsjm0kimmyc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFxuXG5UbyBkaXNhYmxlIHRvcCBsZWZ0IGhvdCBjb3JuZXIgLSBpbiBvbGRlciBnbm9tZS1zaGVsbCAtICB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuXG5cbk5ld2VyIGdub21lLXNoZWxsIGhhcyBhIGJ1aWx0aW4gc2V0dGluZyB0byBkaXNhYmxlIGhvdC1jb3JuZXI7KSIsCiAgIm5hbWUiOiAiSGlkZSBBY3Rpdml0aWVzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "44": {"version": "15", "sha256": "1bz18vqqk7ya2w53qa3jnw33vfxisjmr76ribdq3lwsjm0kimmyc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFxuXG5UbyBkaXNhYmxlIHRvcCBsZWZ0IGhvdCBjb3JuZXIgLSBpbiBvbGRlciBnbm9tZS1zaGVsbCAtICB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuXG5cbk5ld2VyIGdub21lLXNoZWxsIGhhcyBhIGJ1aWx0aW4gc2V0dGluZyB0byBkaXNhYmxlIGhvdC1jb3JuZXI7KSIsCiAgIm5hbWUiOiAiSGlkZSBBY3Rpdml0aWVzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
-    "45": {"version": "19", "sha256": "1li9glqlxcxsxv4v6l3ahk1i11rlkyg54zxl6d55vwl2ywka1yjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96ZXRlbjMwL0hpZGVBY3Rpdml0aWVzIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="},
-    "46": {"version": "19", "sha256": "1li9glqlxcxsxv4v6l3ahk1i11rlkyg54zxl6d55vwl2ywka1yjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96ZXRlbjMwL0hpZGVBY3Rpdml0aWVzIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="}
+    "45": {"version": "20", "sha256": "1sr6krdl1973pf8c22w1h00ml2dqwcxxl2xqnksmyclv755wn80g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemV0ZW4zMC9IaWRlQWN0aXZpdGllcyIsCiAgInV1aWQiOiAiSGlkZV9BY3Rpdml0aWVzQHNoYXkuc2hheWVsLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "46": {"version": "20", "sha256": "1sr6krdl1973pf8c22w1h00ml2dqwcxxl2xqnksmyclv755wn80g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemV0ZW4zMC9IaWRlQWN0aXZpdGllcyIsCiAgInV1aWQiOiAiSGlkZV9BY3Rpdml0aWVzQHNoYXkuc2hheWVsLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "47": {"version": "20", "sha256": "1sr6krdl1973pf8c22w1h00ml2dqwcxxl2xqnksmyclv755wn80g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemV0ZW4zMC9IaWRlQWN0aXZpdGllcyIsCiAgInV1aWQiOiAiSGlkZV9BY3Rpdml0aWVzQHNoYXkuc2hheWVsLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}
   }}
 , {"uuid": "openweather-extension@jenslody.de", "name": "OpenWeather", "pname": "openweather", "description": "Display weather information for any location on Earth in the GNOME Shell", "link": "https://extensions.gnome.org/extension/750/openweather/", "shell_version_map": {
     "38": {"version": "105", "sha256": "0mz63xcvd8v6kyak2n0fs0rd07vwy2j3mdbj9nzvcd71askdm5rd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiT3BlbldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9za3Jld2JhbGwvb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBqZW5zbG9keS5kZSIsCiAgInZlcnNpb24iOiAxMDUKfQ=="},
@@ -509,8 +546,9 @@
     "42": {"version": "33", "sha256": "181j95bhmrkvxvpam8ysrxzsaznfkgnn92xxfkg86lavvyl1alv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
     "43": {"version": "36", "sha256": "1a1is1bp28ml1m5nfqf4vkzd682bcx1avqlii5qpcd9d8ykq1l68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmVsYW5nZS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGliZXJuYXRlLXN0YXR1cyIsCiAgInV1aWQiOiAiaGliZXJuYXRlLXN0YXR1c0Bkcm9taSIsCiAgInZlcnNpb24iOiAzNgp9"},
     "44": {"version": "36", "sha256": "1a1is1bp28ml1m5nfqf4vkzd682bcx1avqlii5qpcd9d8ykq1l68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmVsYW5nZS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGliZXJuYXRlLXN0YXR1cyIsCiAgInV1aWQiOiAiaGliZXJuYXRlLXN0YXR1c0Bkcm9taSIsCiAgInZlcnNpb24iOiAzNgp9"},
-    "45": {"version": "40", "sha256": "0r0c9rd1v2k3hnxizkzsc536d3c4f6fh6f8xmwhhg7xqzfw29y7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhpYmVybmF0ZS1zdGF0dXMtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmVsYW5nZS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGliZXJuYXRlLXN0YXR1cyIsCiAgInV1aWQiOiAiaGliZXJuYXRlLXN0YXR1c0Bkcm9taSIsCiAgInZlcnNpb24iOiA0MAp9"},
-    "46": {"version": "40", "sha256": "0r0c9rd1v2k3hnxizkzsc536d3c4f6fh6f8xmwhhg7xqzfw29y7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhpYmVybmF0ZS1zdGF0dXMtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmVsYW5nZS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGliZXJuYXRlLXN0YXR1cyIsCiAgInV1aWQiOiAiaGliZXJuYXRlLXN0YXR1c0Bkcm9taSIsCiAgInZlcnNpb24iOiA0MAp9"}
+    "45": {"version": "41", "sha256": "1x9q68v7h9knk61z26dgml6rcaqynpifvcpm3nkjmj1cn9dcqg54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhpYmVybmF0ZS1zdGF0dXMtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
+    "46": {"version": "41", "sha256": "1x9q68v7h9knk61z26dgml6rcaqynpifvcpm3nkjmj1cn9dcqg54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhpYmVybmF0ZS1zdGF0dXMtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
+    "47": {"version": "41", "sha256": "1x9q68v7h9knk61z26dgml6rcaqynpifvcpm3nkjmj1cn9dcqg54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhpYmVybmF0ZS1zdGF0dXMtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogNDEKfQ=="}
   }}
 , {"uuid": "minimizeall@scharlessantos.org", "name": "Minimize All", "pname": "minimize-all", "description": "Minimize all windows in current workspace", "link": "https://extensions.gnome.org/extension/760/minimize-all/", "shell_version_map": {
     "38": {"version": "23", "sha256": "1qksj7cg740bbywfwal92mghpgyj89qz5knfaij5fnh8xkf4pvrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIGFsbCB3aW5kb3dzIGluIGN1cnJlbnQgd29ya3NwYWNlIiwKICAibmFtZSI6ICJNaW5pbWl6ZSBBbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NjaGFybGVzc2FudG9zL21pbmltaXplYWxsIiwKICAidXVpZCI6ICJtaW5pbWl6ZWFsbEBzY2hhcmxlc3NhbnRvcy5vcmciLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
@@ -528,7 +566,8 @@
     "43": {"version": "28", "sha256": "0hmsvvg0skdj13bbbx29hjykranvhd9dir84c3z0kbz8wv8q5wx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnFAbWVnaCIsCiAgIm5hbWUiOiAiRm9yY2UgUXVpdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVnaHBya2gvZm9yY2UtcXVpdC8iLAogICJ1dWlkIjogImZxQG1lZ2giLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "44": {"version": "28", "sha256": "0hmsvvg0skdj13bbbx29hjykranvhd9dir84c3z0kbz8wv8q5wx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnFAbWVnaCIsCiAgIm5hbWUiOiAiRm9yY2UgUXVpdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVnaHBya2gvZm9yY2UtcXVpdC8iLAogICJ1dWlkIjogImZxQG1lZ2giLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "45": {"version": "31", "sha256": "0gh8k4lysjk1piq576kb4c9mj6syad7rn5nqrvgcmq818cgfvl29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcUBtZWdoIiwKICAibmFtZSI6ICJGb3JjZSBRdWl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lZ2hwcmtoL2ZvcmNlLXF1aXQvIiwKICAidXVpZCI6ICJmcUBtZWdoIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "46": {"version": "32", "sha256": "02kjfddlbdvsck5ra9f1pzvsi3xl3d3dgp8i6dmgqh55lw359cyf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcUBtZWdoIiwKICAibmFtZSI6ICJGb3JjZSBRdWl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lZ2hwcmtoL2ZvcmNlLXF1aXQvIiwKICAidXVpZCI6ICJmcUBtZWdoIiwKICAidmVyc2lvbiI6IDMyCn0="}
+    "46": {"version": "34", "sha256": "0d2gxpcnyd2gysl8n5l168g997gp8ncagcrnkfx3c8g1gi5sdi1m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcUBtZWdoIiwKICAibmFtZSI6ICJGb3JjZSBRdWl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWdocHJraC9mb3JjZS1xdWl0LyIsCiAgInV1aWQiOiAiZnFAbWVnaCIsCiAgInZlcnNpb24iOiAzNAp9"},
+    "47": {"version": "34", "sha256": "0d2gxpcnyd2gysl8n5l168g997gp8ncagcrnkfx3c8g1gi5sdi1m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcUBtZWdoIiwKICAibmFtZSI6ICJGb3JjZSBRdWl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWdocHJraC9mb3JjZS1xdWl0LyIsCiAgInV1aWQiOiAiZnFAbWVnaCIsCiAgInZlcnNpb24iOiAzNAp9"}
   }}
 , {"uuid": "ProxySwitcher@flannaghan.com", "name": "Proxy Switcher", "pname": "proxy-switcher", "description": "Switches between the system proxy settings profiles defined in Network Settings.", "link": "https://extensions.gnome.org/extension/771/proxy-switcher/", "shell_version_map": {
     "38": {"version": "17", "sha256": "0ap55mxnhwzxzv95jfc4l3bz9v6z04yn53yf233vbjsdpx55vh38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbWZsYW5uYWdoYW4vcHJveHktc3dpdGNoZXIiLAogICJ1dWlkIjogIlByb3h5U3dpdGNoZXJAZmxhbm5hZ2hhbi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
@@ -538,7 +577,8 @@
     "43": {"version": "18", "sha256": "1bd2zjmb5h4iw9z9k07x92fmxgbj8psz44p4fa64k0kzxka10mzp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "44": {"version": "19", "sha256": "0y7qx8kjwgpghl9w30xwmaxv9bafb26fhyx4lr52p4i1q2fi7y65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "45": {"version": "20", "sha256": "1d2zkxpg3fidr1q0v1dzxw3y0c24ixv712s3vzrylzn761jllcmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJveHlTd2l0Y2hlckBmbGFubmFnaGFuLmNvbSIsCiAgIm5hbWUiOiAiUHJveHkgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tZmxhbm5hZ2hhbi9wcm94eS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiUHJveHlTd2l0Y2hlckBmbGFubmFnaGFuLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "46": {"version": "23", "sha256": "089vs06s6m9q0g9mw3jg8h0x6qgxr66xhjj6h2vhs01bvfdv6dr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJveHlTd2l0Y2hlckBmbGFubmFnaGFuLmNvbSIsCiAgIm5hbWUiOiAiUHJveHkgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29tLWZsYW5uYWdoYW4tUHJveHlTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "46": {"version": "23", "sha256": "089vs06s6m9q0g9mw3jg8h0x6qgxr66xhjj6h2vhs01bvfdv6dr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJveHlTd2l0Y2hlckBmbGFubmFnaGFuLmNvbSIsCiAgIm5hbWUiOiAiUHJveHkgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29tLWZsYW5uYWdoYW4tUHJveHlTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
+    "47": {"version": "24", "sha256": "156kvdkvabffdkamfdx6d0p18msfhxb90bsigd5w0dgl6rmkah5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJveHlTd2l0Y2hlckBmbGFubmFnaGFuLmNvbSIsCiAgIm5hbWUiOiAiUHJveHkgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29tLWZsYW5uYWdoYW4tUHJveHlTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}
   }}
 , {"uuid": "clipboard-indicator@tudmotu.com", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "The most popular clipboard manager for GNOME, with over 1M downloads", "link": "https://extensions.gnome.org/extension/779/clipboard-indicator/", "shell_version_map": {
     "38": {"version": "37", "sha256": "1nd6ydp5wmd56zf3vwrsi2wflrw15krdbvqv2fkmla8rndallp1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
@@ -547,7 +587,8 @@
     "43": {"version": "47", "sha256": "1w34xlbsphxp0k9smlcf8kq9ccq15yarnf265q0fbh6qc7lgfj4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="},
     "44": {"version": "47", "sha256": "1w34xlbsphxp0k9smlcf8kq9ccq15yarnf265q0fbh6qc7lgfj4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="},
     "45": {"version": "57", "sha256": "1cpa30a9y6gw9k27njcb795j3vdwpx2jfivz858zs2k5n9wl9ypq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="},
-    "46": {"version": "64", "sha256": "0ahd5wp9in4n04lqj1ix2z2g64sif08rr815qv7qni7xyfz6ckwl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNjQKfQ=="}
+    "46": {"version": "65", "sha256": "1yplsl962sv2dvmhcb0kw5p4a64bc0l20511z30m63hbhf59qdni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9UdWRtb3R1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJjbGlwYm9hcmQtaW5kaWNhdG9yQHR1ZG1vdHUuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="},
+    "47": {"version": "65", "sha256": "1yplsl962sv2dvmhcb0kw5p4a64bc0l20511z30m63hbhf59qdni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9UdWRtb3R1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJjbGlwYm9hcmQtaW5kaWNhdG9yQHR1ZG1vdHUuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="}
   }}
 , {"uuid": "pidgin@muffinmad", "name": "Pidgin IM integration", "pname": "pidgin-im-integration", "description": "Integrate Pidgin IMs in the Gnome Shell message tray", "link": "https://extensions.gnome.org/extension/782/pidgin-im-integration/", "shell_version_map": {
     "40": {"version": "44", "sha256": "0s7xra49fbm5byh82ihwrz0b8bvli0bmsmwz58868bl42zb0l0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211ZmZpbm1hZC9waWRnaW4taW0tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwaWRnaW5AbXVmZmlubWFkIiwKICAidmVyc2lvbiI6IDQ0Cn0="},
@@ -592,8 +633,9 @@
     "42": {"version": "11", "sha256": "0j97fsw2qsac4dxyvc7cman33snkcvj0lm80gfs94w8cjlcvd4j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "43": {"version": "11", "sha256": "0j97fsw2qsac4dxyvc7cman33snkcvj0lm80gfs94w8cjlcvd4j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "44": {"version": "11", "sha256": "0j97fsw2qsac4dxyvc7cman33snkcvj0lm80gfs94w8cjlcvd4j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "45": {"version": "16", "sha256": "1gg9kvr7gc6qm890q1g30zd9brn59dhzp0rdzr2kykl8dyyg6amv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd2l0Y2hmb2N1c3R5cGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS1zd2l0Y2gtZm9jdXMtbW9kZSIsCiAgInV1aWQiOiAiU3dpdGNoRm9jdXNUeXBlQHJvbWFuby5yZ3R0aS5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
-    "46": {"version": "16", "sha256": "1gg9kvr7gc6qm890q1g30zd9brn59dhzp0rdzr2kykl8dyyg6amv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd2l0Y2hmb2N1c3R5cGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS1zd2l0Y2gtZm9jdXMtbW9kZSIsCiAgInV1aWQiOiAiU3dpdGNoRm9jdXNUeXBlQHJvbWFuby5yZ3R0aS5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
+    "45": {"version": "17", "sha256": "00h6myasb8xnzvppwr8484zfr4bdxbd175xvgq4cnpmca2lrdzvh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd2l0Y2hmb2N1c3R5cGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "46": {"version": "17", "sha256": "00h6myasb8xnzvppwr8484zfr4bdxbd175xvgq4cnpmca2lrdzvh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd2l0Y2hmb2N1c3R5cGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "47": {"version": "17", "sha256": "00h6myasb8xnzvppwr8484zfr4bdxbd175xvgq4cnpmca2lrdzvh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd2l0Y2hmb2N1c3R5cGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}
   }}
 , {"uuid": "radio@hslbck.gmail.com", "name": "Internet Radio", "pname": "internet-radio", "description": "Listen to an Internet Radio Stream", "link": "https://extensions.gnome.org/extension/836/internet-radio/", "shell_version_map": {
     "38": {"version": "14", "sha256": "013wbf3npz7f438i39cd41s6whs4lgaigv4i1zais994n9ybw5y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
@@ -610,8 +652,9 @@
     "42": {"version": "52", "sha256": "1i59pp1wzd49fvz56rk2fq3zi0zkh8y2jf17ssgjcj1cn68x6k7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDUyCn0="},
     "43": {"version": "52", "sha256": "1i59pp1wzd49fvz56rk2fq3zi0zkh8y2jf17ssgjcj1cn68x6k7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDUyCn0="},
     "44": {"version": "52", "sha256": "1i59pp1wzd49fvz56rk2fq3zi0zkh8y2jf17ssgjcj1cn68x6k7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDUyCn0="},
-    "45": {"version": "56", "sha256": "1pakk3gnswg3z7lw2rw8vwz2p17aynyyaq7q8fn8qjkk1rhakbyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="},
-    "46": {"version": "56", "sha256": "1pakk3gnswg3z7lw2rw8vwz2p17aynyyaq7q8fn8qjkk1rhakbyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="}
+    "45": {"version": "57", "sha256": "1b1pslcpdvad9qcghra6z6qgksysdrd96ha4vbln1hkbwd1zb0kn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1VzaGFrb3ZWYXNpbGlpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mcmVvbiIsCiAgInV1aWQiOiAiZnJlb25AVXNoYWtvdlZhc2lsaWlfR2l0aHViLnlhaG9vLmNvbSIsCiAgInZlcnNpb24iOiA1Nwp9"},
+    "46": {"version": "57", "sha256": "1b1pslcpdvad9qcghra6z6qgksysdrd96ha4vbln1hkbwd1zb0kn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1VzaGFrb3ZWYXNpbGlpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mcmVvbiIsCiAgInV1aWQiOiAiZnJlb25AVXNoYWtvdlZhc2lsaWlfR2l0aHViLnlhaG9vLmNvbSIsCiAgInZlcnNpb24iOiA1Nwp9"},
+    "47": {"version": "57", "sha256": "1b1pslcpdvad9qcghra6z6qgksysdrd96ha4vbln1hkbwd1zb0kn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1VzaGFrb3ZWYXNpbGlpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mcmVvbiIsCiAgInV1aWQiOiAiZnJlb25AVXNoYWtvdlZhc2lsaWlfR2l0aHViLnlhaG9vLmNvbSIsCiAgInZlcnNpb24iOiA1Nwp9"}
   }}
 , {"uuid": "shell-volume-mixer@derhofbauer.at", "name": "Volume Mixer", "pname": "volume-mixer", "description": "Applet allowing separate configuration of PulseAudio mixers.\n\nShell Volume Mixer is an extension for GNOME Shell allowing separate configuration of PulseAudio devices and output switches. It features a profile switcher to quickly switch between pinned profiles and devices.\n\nMiddle mouse click on a slider mutes the selected stream.\n\nPlease file bugs and feature requests on the GitHub page.", "link": "https://extensions.gnome.org/extension/858/volume-mixer/", "shell_version_map": {
     "38": {"version": "39", "sha256": "1cnyapjvqri5k5m4nbcmbcx97b4akwv32h7ddav2ipahqh1lqqzj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJuYW1lIjogIlZvbHVtZSBNaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZWhvL2dub21lLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAic2hlbGwtdm9sdW1lLW1peGVyQGRlcmhvZmJhdWVyLmF0IiwKICAidmVyc2lvbiI6IDM5Cn0="},
@@ -630,7 +673,8 @@
     "43": {"version": "30", "sha256": "036h42fs0yjgfjncvv97wpb2y860rhncfhz0znw4npj0gab5pn42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
     "44": {"version": "32", "sha256": "1km4mvmv9350172fjihzmjd18l6ypm8hb22vz1k09xpcas01p448", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
     "45": {"version": "35", "sha256": "0id9z143wm1xqb4ppvvwrfqrjm9qwaqgxz6hb37s0h2gvr5lamw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="},
-    "46": {"version": "38", "sha256": "0a3vxfywsqmjr2pfm27aic4hvv4sx00crkgi4lrhl8nrivh5gj4a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}
+    "46": {"version": "38", "sha256": "0a3vxfywsqmjr2pfm27aic4hvv4sx00crkgi4lrhl8nrivh5gj4a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
+    "47": {"version": "39", "sha256": "0csg3xkpzlcgq323j5jxzw8xr9rvvl81rpwmyj953fhq63gmjnc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}
   }}
 , {"uuid": "mailnag@pulb.github.com", "name": "Mailnag", "pname": "mailnag", "description": "Mail indicator (GMail, IMAP, POP) for GNOME.\n\nPlease note that this extension requires the mailnag daemon.\nInstall it from your distros package repositories or get it here:\nhttps://github.com/pulb/mailnag\n\nPlease also note that this version of the extension does not support avatars (as shown in the screenshot).\nIf you like to have avatar support install this extension from your distros package repositories or get a package from here:\nhttps://github.com/pulb/mailnag-gnome-shell\n\nIMPORTANT:\nI do not get notifications for user comments. Please always report bugs here:\nhttps://github.com/pulb/mailnag-gnome-shell/issues", "link": "https://extensions.gnome.org/extension/886/mailnag/", "shell_version_map": {
     "38": {"version": "20", "sha256": "15n816y34qlc7va72q75ngzw1my3n5j7xhg9a6dc0g8q4dd0g2r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1haWwgaW5kaWNhdG9yIChHTWFpbCwgSU1BUCwgUE9QKSBmb3IgR05PTUUuXG5cblBsZWFzZSBub3RlIHRoYXQgdGhpcyBleHRlbnNpb24gcmVxdWlyZXMgdGhlIG1haWxuYWcgZGFlbW9uLlxuSW5zdGFsbCBpdCBmcm9tIHlvdXIgZGlzdHJvcyBwYWNrYWdlIHJlcG9zaXRvcmllcyBvciBnZXQgaXQgaGVyZTpcbmh0dHBzOi8vZ2l0aHViLmNvbS9wdWxiL21haWxuYWdcblxuUGxlYXNlIGFsc28gbm90ZSB0aGF0IHRoaXMgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGRvZXMgbm90IHN1cHBvcnQgYXZhdGFycyAoYXMgc2hvd24gaW4gdGhlIHNjcmVlbnNob3QpLlxuSWYgeW91IGxpa2UgdG8gaGF2ZSBhdmF0YXIgc3VwcG9ydCBpbnN0YWxsIHRoaXMgZXh0ZW5zaW9uIGZyb20geW91ciBkaXN0cm9zIHBhY2thZ2UgcmVwb3NpdG9yaWVzIG9yIGdldCBhIHBhY2thZ2UgZnJvbSBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbFxuXG5JTVBPUlRBTlQ6XG5JIGRvIG5vdCBnZXQgbm90aWZpY2F0aW9ucyBmb3IgdXNlciBjb21tZW50cy4gUGxlYXNlIGFsd2F5cyByZXBvcnQgYnVncyBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbC9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtYWlsbmFnLWdub21lLXNoZWxsIiwKICAibmFtZSI6ICJNYWlsbmFnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1haWxuYWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWFpbG5hZ0BwdWxiLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
@@ -657,7 +701,8 @@
     "40": {"version": "31", "sha256": "01qn80gk0zvsblby0x0rgji6azim2vr5inr1y5l7sxnp2wkd5f2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBEaXNjb25uZWN0IG9wdGlvbiBmb3IgV2lmaSBpbiBzdGF0dXMgbWVudSwgd2hlbiBhIG5ldHdvcmsgaXMgY29ubmVjdGVkLiBTaG93cyBhIFJlY29ubmVjdCBvcHRpb24sIGFmdGVyIG5ldHdvcmsgaXMgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiRGlzY29ubmVjdCBXaWZpIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkdvcEkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZ3NoYW5rL2dzZS1kaXNjb25uZWN0LXdpZmkiLAogICJ1dWlkIjogImRpc2Nvbm5lY3Qtd2lmaUBrZ3NoYW5rLm5ldCIsCiAgInZlcnNpb24iOiAzMQp9"},
     "41": {"version": "31", "sha256": "01qn80gk0zvsblby0x0rgji6azim2vr5inr1y5l7sxnp2wkd5f2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBEaXNjb25uZWN0IG9wdGlvbiBmb3IgV2lmaSBpbiBzdGF0dXMgbWVudSwgd2hlbiBhIG5ldHdvcmsgaXMgY29ubmVjdGVkLiBTaG93cyBhIFJlY29ubmVjdCBvcHRpb24sIGFmdGVyIG5ldHdvcmsgaXMgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiRGlzY29ubmVjdCBXaWZpIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkdvcEkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZ3NoYW5rL2dzZS1kaXNjb25uZWN0LXdpZmkiLAogICJ1dWlkIjogImRpc2Nvbm5lY3Qtd2lmaUBrZ3NoYW5rLm5ldCIsCiAgInZlcnNpb24iOiAzMQp9"},
     "42": {"version": "31", "sha256": "01qn80gk0zvsblby0x0rgji6azim2vr5inr1y5l7sxnp2wkd5f2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBEaXNjb25uZWN0IG9wdGlvbiBmb3IgV2lmaSBpbiBzdGF0dXMgbWVudSwgd2hlbiBhIG5ldHdvcmsgaXMgY29ubmVjdGVkLiBTaG93cyBhIFJlY29ubmVjdCBvcHRpb24sIGFmdGVyIG5ldHdvcmsgaXMgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiRGlzY29ubmVjdCBXaWZpIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkdvcEkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZ3NoYW5rL2dzZS1kaXNjb25uZWN0LXdpZmkiLAogICJ1dWlkIjogImRpc2Nvbm5lY3Qtd2lmaUBrZ3NoYW5rLm5ldCIsCiAgInZlcnNpb24iOiAzMQp9"},
-    "46": {"version": "35", "sha256": "1il2v2xhbz71caxzzyrjrb52n4lwzkxf8ar8dirwjrjadycqibdz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBEaXNjb25uZWN0IG9wdGlvbiBmb3IgV2lmaSBpbiBzdGF0dXMgbWVudSwgd2hlbiBhIG5ldHdvcmsgaXMgY29ubmVjdGVkLiBTaG93cyBhIFJlY29ubmVjdCBvcHRpb24sIGFmdGVyIG5ldHdvcmsgaXMgZGlzY29ubmVjdGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImRpc2Nvbm5lY3Qtd2lmaSIsCiAgIm5hbWUiOiAiRGlzY29ubmVjdCBXaWZpIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkdvcEkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzY29ubmVjdC13aWZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tnc2hhbmsvZ3NlLWRpc2Nvbm5lY3Qtd2lmaSIsCiAgInV1aWQiOiAiZGlzY29ubmVjdC13aWZpQGtnc2hhbmsubmV0IiwKICAidmVyc2lvbiI6IDM1Cn0="}
+    "46": {"version": "36", "sha256": "0cykgr7ycx3fzg7mlsinymm5c562gwq4i8f1sywxq7lv8r4q5pkc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBEaXNjb25uZWN0IG9wdGlvbiBmb3IgV2lmaSBpbiBzdGF0dXMgbWVudSwgd2hlbiBhIG5ldHdvcmsgaXMgY29ubmVjdGVkLiBTaG93cyBhIFJlY29ubmVjdCBvcHRpb24sIGFmdGVyIG5ldHdvcmsgaXMgZGlzY29ubmVjdGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImRpc2Nvbm5lY3Qtd2lmaSIsCiAgIm5hbWUiOiAiRGlzY29ubmVjdCBXaWZpIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkdvcEkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzY29ubmVjdC13aWZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZ3NoYW5rL2dzZS1kaXNjb25uZWN0LXdpZmkiLAogICJ1dWlkIjogImRpc2Nvbm5lY3Qtd2lmaUBrZ3NoYW5rLm5ldCIsCiAgInZlcnNpb24iOiAzNgp9"},
+    "47": {"version": "36", "sha256": "0cykgr7ycx3fzg7mlsinymm5c562gwq4i8f1sywxq7lv8r4q5pkc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBEaXNjb25uZWN0IG9wdGlvbiBmb3IgV2lmaSBpbiBzdGF0dXMgbWVudSwgd2hlbiBhIG5ldHdvcmsgaXMgY29ubmVjdGVkLiBTaG93cyBhIFJlY29ubmVjdCBvcHRpb24sIGFmdGVyIG5ldHdvcmsgaXMgZGlzY29ubmVjdGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImRpc2Nvbm5lY3Qtd2lmaSIsCiAgIm5hbWUiOiAiRGlzY29ubmVjdCBXaWZpIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkdvcEkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzY29ubmVjdC13aWZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZ3NoYW5rL2dzZS1kaXNjb25uZWN0LXdpZmkiLAogICJ1dWlkIjogImRpc2Nvbm5lY3Qtd2lmaUBrZ3NoYW5rLm5ldCIsCiAgInZlcnNpb24iOiAzNgp9"}
   }}
 , {"uuid": "refresh-wifi@kgshank.net", "name": "Refresh Wifi Connections", "pname": "refresh-wifi-connections", "description": "This extension adds a refresh button to the Wi-Fi connection selection dialog to manually request for a network scan.\n\nNOTE: In GNOME Shell 3.32 and above, the available network list is automatically updated every 15 seconds, so most people probably don't need this extension anymore.", "link": "https://extensions.gnome.org/extension/905/refresh-wifi-connections/", "shell_version_map": {
     "38": {"version": "16", "sha256": "1hdbdb1jgi0siqy6cmwn323rzsa8apw858q14k083ifiks5xzdhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZHMgYSByZWZyZXNoIGJ1dHRvbiB0byB0aGUgV2ktRmkgY29ubmVjdGlvbiBzZWxlY3Rpb24gZGlhbG9nIHRvIG1hbnVhbGx5IHJlcXVlc3QgZm9yIGEgbmV0d29yayBzY2FuLlxuXG5OT1RFOiBJbiBHTk9NRSBTaGVsbCAzLjMyIGFuZCBhYm92ZSwgdGhlIGF2YWlsYWJsZSBuZXR3b3JrIGxpc3QgaXMgYXV0b21hdGljYWxseSB1cGRhdGVkIGV2ZXJ5IDE1IHNlY29uZHMsIHNvIG1vc3QgcGVvcGxlIHByb2JhYmx5IGRvbid0IG5lZWQgdGhpcyBleHRlbnNpb24gYW55bW9yZS4iLAogICJuYW1lIjogIlJlZnJlc2ggV2lmaSBDb25uZWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJHb3BJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2dzaGFuay9nc2UtcmVmcmVzaC13aWZpIiwKICAidXVpZCI6ICJyZWZyZXNoLXdpZmlAa2dzaGFuay5uZXQiLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
@@ -690,8 +735,9 @@
     "42": {"version": "13", "sha256": "00fxrq4abxqczkypvbqnw2z5q5adb6gdlz98c9hijj7s7jpp3xcy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "43": {"version": "13", "sha256": "00fxrq4abxqczkypvbqnw2z5q5adb6gdlz98c9hijj7s7jpp3xcy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "44": {"version": "13", "sha256": "00fxrq4abxqczkypvbqnw2z5q5adb6gdlz98c9hijj7s7jpp3xcy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "45": {"version": "16", "sha256": "0y911i7k3705ql9pymyrl47jwkmjg9f3hr5bxms59abdgs5ycpia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
-    "46": {"version": "16", "sha256": "0y911i7k3705ql9pymyrl47jwkmjg9f3hr5bxms59abdgs5ycpia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
+    "45": {"version": "18", "sha256": "1anlbni40amzqxwjcjv2y624jq7irn28vdr7lv28sas3i94v4xy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3RhdHlhbi9nbm9tZS1leHRlbnNpb24tdHJhbnNjb2RlLXNlYXJjaGFwcCIsCiAgInV1aWQiOiAidHJhbnNjb2RlLWFwcHNlYXJjaEBrLmt1YnVzaGFAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
+    "46": {"version": "18", "sha256": "1anlbni40amzqxwjcjv2y624jq7irn28vdr7lv28sas3i94v4xy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3RhdHlhbi9nbm9tZS1leHRlbnNpb24tdHJhbnNjb2RlLXNlYXJjaGFwcCIsCiAgInV1aWQiOiAidHJhbnNjb2RlLWFwcHNlYXJjaEBrLmt1YnVzaGFAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
+    "47": {"version": "18", "sha256": "1anlbni40amzqxwjcjv2y624jq7irn28vdr7lv28sas3i94v4xy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3RhdHlhbi9nbm9tZS1leHRlbnNpb24tdHJhbnNjb2RlLXNlYXJjaGFwcCIsCiAgInV1aWQiOiAidHJhbnNjb2RlLWFwcHNlYXJjaEBrLmt1YnVzaGFAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="}
   }}
 , {"uuid": "synaptic-button@fthx", "name": "Synaptic Button", "pname": "synaptic-button", "description": "NOT MAINTAINED ANYMORE\n\nButton that directly starts Synaptic package manager.\n\n For snap management without Snap Store, consider Snap Manager extension.", "link": "https://extensions.gnome.org/extension/938/synaptic-button/", "shell_version_map": {
     "38": {"version": "4", "sha256": "1l564ma14p1msykgl67836y7nf6wsnqcvch0kmc19mqasj5gp96z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQnV0dG9uIHRoYXQgZGlyZWN0bHkgc3RhcnRzIFN5bmFwdGljIHBhY2thZ2UgbWFuYWdlci5cblxuIEZvciBzbmFwIG1hbmFnZW1lbnQgd2l0aG91dCBTbmFwIFN0b3JlLCBjb25zaWRlciBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3luYXB0aWMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zeW5hcHRpYy1idXR0b24iLAogICJ1dWlkIjogInN5bmFwdGljLWJ1dHRvbkBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}
@@ -714,8 +760,9 @@
     "42": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "43": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "44": {"version": "24", "sha256": "0s1d81fxndbsx1cnh05zpwhcr5p5gqniszm0c8q8vm1m1jm5d92g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtd29ybGQtY2xvY2stbGl0ZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAid29ybGRfY2xvY2tfbGl0ZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "45": {"version": "29", "sha256": "0vcrp9s23lav5443561lz973wfs58069zhh95q8l44mb3lvfai63", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbC4gVGltZSB6b25lcy9DaXRpZXMvVVRDL0FvRS5cblxuSW5zdGFsbCBnbm9tZS1jbG9ja3MgdG8gZ2V0IHN0YXJ0ZWQhIChGbGF0cGFrIG9yIFNuYXAgdmVyc2lvbnMgTk9UIHN1cHBvcnRlZCkiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJhaWxpbiIKICB9LAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbC13b3JsZC1jbG9jay1saXRlLy0vaXNzdWVzIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDI5Cn0="},
-    "46": {"version": "29", "sha256": "0vcrp9s23lav5443561lz973wfs58069zhh95q8l44mb3lvfai63", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbC4gVGltZSB6b25lcy9DaXRpZXMvVVRDL0FvRS5cblxuSW5zdGFsbCBnbm9tZS1jbG9ja3MgdG8gZ2V0IHN0YXJ0ZWQhIChGbGF0cGFrIG9yIFNuYXAgdmVyc2lvbnMgTk9UIHN1cHBvcnRlZCkiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJhaWxpbiIKICB9LAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbC13b3JsZC1jbG9jay1saXRlLy0vaXNzdWVzIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDI5Cn0="}
+    "45": {"version": "30", "sha256": "037h583sbnwlwgxhmhcpc2m145cyw80q4g80bqinsj6mm8ds2442", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbC4gVGltZSB6b25lcy9DaXRpZXMvVVRDL0FvRS5cblxuSW5zdGFsbCBnbm9tZS1jbG9ja3MgdG8gZ2V0IHN0YXJ0ZWQhIChGbGF0cGFrIG9yIFNuYXAgdmVyc2lvbnMgTk9UIHN1cHBvcnRlZCkiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJhaWxpbiIKICB9LAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtd29ybGQtY2xvY2stbGl0ZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAid29ybGRfY2xvY2tfbGl0ZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAzMAp9"},
+    "46": {"version": "30", "sha256": "037h583sbnwlwgxhmhcpc2m145cyw80q4g80bqinsj6mm8ds2442", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbC4gVGltZSB6b25lcy9DaXRpZXMvVVRDL0FvRS5cblxuSW5zdGFsbCBnbm9tZS1jbG9ja3MgdG8gZ2V0IHN0YXJ0ZWQhIChGbGF0cGFrIG9yIFNuYXAgdmVyc2lvbnMgTk9UIHN1cHBvcnRlZCkiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJhaWxpbiIKICB9LAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtd29ybGQtY2xvY2stbGl0ZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAid29ybGRfY2xvY2tfbGl0ZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAzMAp9"},
+    "47": {"version": "30", "sha256": "037h583sbnwlwgxhmhcpc2m145cyw80q4g80bqinsj6mm8ds2442", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbC4gVGltZSB6b25lcy9DaXRpZXMvVVRDL0FvRS5cblxuSW5zdGFsbCBnbm9tZS1jbG9ja3MgdG8gZ2V0IHN0YXJ0ZWQhIChGbGF0cGFrIG9yIFNuYXAgdmVyc2lvbnMgTk9UIHN1cHBvcnRlZCkiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJhaWxpbiIKICB9LAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtd29ybGQtY2xvY2stbGl0ZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAid29ybGRfY2xvY2tfbGl0ZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAzMAp9"}
   }}
 , {"uuid": "dim-on-battery@nailfarmer.nailfarmer.com", "name": "Dim On Battery Power", "pname": "dim-on-battery-power", "description": "Automatically dims the screen when the machine is running on battery power.", "link": "https://extensions.gnome.org/extension/947/dim-on-battery-power/", "shell_version_map": {
     "38": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
@@ -759,7 +806,8 @@
     "43": {"version": "17", "sha256": "0q8ah8ms6iv24fyl684hbivbnw5d9k4as991zng9k9ywsjlpp40d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbXVqYWtpdHovdGhpbmtwYWQtdGhlcm1hbCIsCiAgInV1aWQiOiAidGhpbmtwYWR0aGVybWFsQG1vb25saWdodC5kcml2ZS52ay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "44": {"version": "17", "sha256": "0q8ah8ms6iv24fyl684hbivbnw5d9k4as991zng9k9ywsjlpp40d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbXVqYWtpdHovdGhpbmtwYWQtdGhlcm1hbCIsCiAgInV1aWQiOiAidGhpbmtwYWR0aGVybWFsQG1vb25saWdodC5kcml2ZS52ay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "45": {"version": "26", "sha256": "0pym8nq0kfvacqvzisk3q0045jh8s1f4xkjylzsigk0abmqci937", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm11amFraXR6L3RoaW5rcGFkLXRoZXJtYWwiLAogICJ1dWlkIjogInRoaW5rcGFkdGhlcm1hbEBtb29ubGlnaHQuZHJpdmUudmsuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="},
-    "46": {"version": "27", "sha256": "1j94q6jvrgahgazdfhm1jfhhnmlmq4052h5h78bs28gvpcjalwaz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm11amFraXR6L3RoaW5rcGFkLXRoZXJtYWwiLAogICJ1dWlkIjogInRoaW5rcGFkdGhlcm1hbEBtb29ubGlnaHQuZHJpdmUudmsuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}
+    "46": {"version": "28", "sha256": "0gndvbvimg83lmaskqq58zb7j1fggr1n0km4wzx6752bkyzz52qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"},
+    "47": {"version": "28", "sha256": "0gndvbvimg83lmaskqq58zb7j1fggr1n0km4wzx6752bkyzz52qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}
   }}
 , {"uuid": "harddiskled@bijidroid.gmail.com", "name": "Harddisk LED", "pname": "harddisk-led", "description": "Show harddisk activity (IO speed read/write and LED). Click to change led size", "link": "https://extensions.gnome.org/extension/988/harddisk-led/", "shell_version_map": {
     "38": {"version": "34", "sha256": "039bkjfr4ga2n3cj8pqpkvqpbspyk23f1dnv15sbq1il2zjqnm4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="},
@@ -787,10 +835,11 @@
     "42": {"version": "20", "sha256": "0ymrcci3pn62x80kazp2rn3yb52pz885w99djl25s8x764nzksjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
     "43": {"version": "20", "sha256": "0ymrcci3pn62x80kazp2rn3yb52pz885w99djl25s8x764nzksjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
     "44": {"version": "20", "sha256": "0ymrcci3pn62x80kazp2rn3yb52pz885w99djl25s8x764nzksjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "45": {"version": "23", "sha256": "1fkk6v623p0vka9g1rw0h98g9zb7kxh6ds71synp5fg3mw87nvs5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
-    "46": {"version": "23", "sha256": "1fkk6v623p0vka9g1rw0h98g9zb7kxh6ds71synp5fg3mw87nvs5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}
+    "45": {"version": "24", "sha256": "1dbs06ljywrqrraja0rn6bqf4mviy28f6x2v4xvmibxlh5z9p9hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9udW5vZmFycnVjYS9XaW5kb3dJc1JlYWR5X1JlbW92ZXIiLAogICJ1dWlkIjogIndpbmRvd0lzUmVhZHlfUmVtb3ZlckBudW5vZmFycnVjYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
+    "46": {"version": "24", "sha256": "1dbs06ljywrqrraja0rn6bqf4mviy28f6x2v4xvmibxlh5z9p9hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9udW5vZmFycnVjYS9XaW5kb3dJc1JlYWR5X1JlbW92ZXIiLAogICJ1dWlkIjogIndpbmRvd0lzUmVhZHlfUmVtb3ZlckBudW5vZmFycnVjYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
+    "47": {"version": "24", "sha256": "1dbs06ljywrqrraja0rn6bqf4mviy28f6x2v4xvmibxlh5z9p9hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9udW5vZmFycnVjYS9XaW5kb3dJc1JlYWR5X1JlbW92ZXIiLAogICJ1dWlkIjogIndpbmRvd0lzUmVhZHlfUmVtb3ZlckBudW5vZmFycnVjYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}
   }}
-, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n  Can support AUR or other distros by changing command used to check for and apply updates. There are examples in the wiki page on GitHub.\n See README about Gnome Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {
+, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell. Runs gnome-terminal by default, you can change in settings. \n** Note : you need to install the package pacman-contrib to use the checkupdates script. **\n  Can support AUR or other distros by changing command used to check for and apply updates.", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {
     "38": {"version": "39", "sha256": "1wcyjy9idj674s7pyz0210pb6kzb3jmj1fv08cm93frdl9g61dn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
     "40": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"},
     "41": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"},
@@ -798,7 +847,8 @@
     "43": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"},
     "44": {"version": "53", "sha256": "09vkzz2rkjaf0z3snpkd67brq2kimq5l2clyhyfvyp2wf71f5zp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1Mwp9"},
     "45": {"version": "57", "sha256": "1g66g1abf0hsshihc76n3qznfd476sxg8yrj8h279cvqh8q6xgqx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FyY2gtdXBkYXRlIiwKICAidXVpZCI6ICJhcmNoLXVwZGF0ZUBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDU3Cn0="},
-    "46": {"version": "61", "sha256": "19zicr5d5pl954i45zglpyh8h99z9plsnmajbsx8n2q2awbl2svf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FyY2gtdXBkYXRlIiwKICAidXVpZCI6ICJhcmNoLXVwZGF0ZUBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDYxCn0="}
+    "46": {"version": "63", "sha256": "0vki5psbdpqqs094rl6ndjd6dapx2sib9p6vv62802ckgq8ql3jz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLiBSdW5zIGdub21lLXRlcm1pbmFsIGJ5IGRlZmF1bHQsIHlvdSBjYW4gY2hhbmdlIGluIHNldHRpbmdzLiBcbioqIE5vdGUgOiB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA2Mwp9"},
+    "47": {"version": "63", "sha256": "0vki5psbdpqqs094rl6ndjd6dapx2sib9p6vv62802ckgq8ql3jz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLiBSdW5zIGdub21lLXRlcm1pbmFsIGJ5IGRlZmF1bHQsIHlvdSBjYW4gY2hhbmdlIGluIHNldHRpbmdzLiBcbioqIE5vdGUgOiB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA2Mwp9"}
   }}
 , {"uuid": "dynamic-panel-transparency@rockon999.github.io", "name": "Dynamic Panel Transparency", "pname": "dynamic-panel-transparency", "description": "This extension fades your top panel to nothingness when there are no maximized windows present. Never again will the panel be abruptly darkened!", "link": "https://extensions.gnome.org/extension/1011/dynamic-panel-transparency/", "shell_version_map": {
     "38": {"version": "34", "sha256": "118j8sc295szqlsz7r7sdywvp5lxpzpv24q2g1f4lzl79v6i9i1m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGZhZGVzIHlvdXIgdG9wIHBhbmVsIHRvIG5vdGhpbmduZXNzIHdoZW4gdGhlcmUgYXJlIG5vIG1heGltaXplZCB3aW5kb3dzIHByZXNlbnQuIE5ldmVyIGFnYWluIHdpbGwgdGhlIHBhbmVsIGJlIGFicnVwdGx5IGRhcmtlbmVkISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V3bHNoL2R5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5LyIsCiAgInV1aWQiOiAiZHluYW1pYy1wYW5lbC10cmFuc3BhcmVuY3lAcm9ja29uOTk5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzNAp9"},
@@ -822,7 +872,8 @@
     "43": {"version": "17", "sha256": "1j14ibzkqfy3zvk09nxnb9yaw4rlw7gb1nzg49h29c5cmnv57l1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxNwp9"},
     "44": {"version": "17", "sha256": "1j14ibzkqfy3zvk09nxnb9yaw4rlw7gb1nzg49h29c5cmnv57l1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxNwp9"},
     "45": {"version": "21", "sha256": "1lbhwda77yyvp6aiincpqdbddl916aczbp0mnsm7rbbgw8nv618a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDIxCn0="},
-    "46": {"version": "22", "sha256": "18c2hfjbhs4ldi153bvf89l5zq4j2m7gpjxwsdvbypy06g86088h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDIyCn0="}
+    "46": {"version": "22", "sha256": "18c2hfjbhs4ldi153bvf89l5zq4j2m7gpjxwsdvbypy06g86088h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDIyCn0="},
+    "47": {"version": "23", "sha256": "01g1kdbv5q4v097b9dbwykdpbwmbrv1dhzn16k38i142r5s014bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDIzCn0="}
   }}
 , {"uuid": "taskwhisperer-extension@infinicode.de", "name": "TaskWhisperer", "pname": "taskwhisperer", "description": "Taskwhisperer is a extension for TaskWarrior Application https://taskwarrior.org. It is to display upcoming tasks and task details as well as to create and modify them.\n", "link": "https://extensions.gnome.org/extension/1039/taskwhisperer/", "shell_version_map": {
     "38": {"version": "20", "sha256": "067z3j2px4rz5yspfjx2s6p5j4l1svxllclahnf3zmv1nlbhzq8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUYXNrV2hpc3BlcmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvdGFza3doaXNwZXJlciIsCiAgInV1aWQiOiAidGFza3doaXNwZXJlci1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiAyMAp9"},
@@ -843,8 +894,9 @@
     "46": {"version": "35", "sha256": "16hqgsxafiqbrnnpmflslqyc0yklsdvn7kw8pnrnnh57b7fzn265", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgbmV3IGRlc2t0b3Agd2FsbHBhcGVycyBmcm9tIHZhcmlvdXMgb25saW5lIHNvdXJjZXMgd2l0aCBlYXNlISIsCiAgImlzc3VlLXVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWZsMHcvUmFuZG9tV2FsbHBhcGVyR25vbWUzL2lzc3VlcyIsCiAgIm5hbWUiOiAiUmFuZG9tIFdhbGxwYXBlciIsCiAgInNlbWFudGljLXZlcnNpb24iOiAiMy4wLjIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BhY2UuaWZsb3cucmFuZG9td2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzNQp9"}
   }}
 , {"uuid": "invert-window@maiself", "name": "Invert Window Color", "pname": "invert-window-color", "description": "Inverts the color of individual windows\nDefault shortcut is Super+I", "link": "https://extensions.gnome.org/extension/1041/invert-window-color/", "shell_version_map": {
-    "45": {"version": "8", "sha256": "1w8ypg709rsmbghygbz20hw3jp9fq5cl15q5dbgbm0h238kzlw98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93c1xuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJJbnZlcnQgV2luZG93IENvbG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmludmVydC13aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21haXNlbGYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWludmVydC1jb2xvciIsCiAgInV1aWQiOiAiaW52ZXJ0LXdpbmRvd0BtYWlzZWxmIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "1w8ypg709rsmbghygbz20hw3jp9fq5cl15q5dbgbm0h238kzlw98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93c1xuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJJbnZlcnQgV2luZG93IENvbG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmludmVydC13aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21haXNlbGYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWludmVydC1jb2xvciIsCiAgInV1aWQiOiAiaW52ZXJ0LXdpbmRvd0BtYWlzZWxmIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "9", "sha256": "0bc2gp056xk4l8r1ilqp6b5cgq4vvr794w4qpjxc20lcbqfs9l6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93c1xuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJJbnZlcnQgV2luZG93IENvbG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmludmVydC13aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWlzZWxmL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnZlcnQtY29sb3IiLAogICJ1dWlkIjogImludmVydC13aW5kb3dAbWFpc2VsZiIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "0bc2gp056xk4l8r1ilqp6b5cgq4vvr794w4qpjxc20lcbqfs9l6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93c1xuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJJbnZlcnQgV2luZG93IENvbG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmludmVydC13aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWlzZWxmL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnZlcnQtY29sb3IiLAogICJ1dWlkIjogImludmVydC13aW5kb3dAbWFpc2VsZiIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "0bc2gp056xk4l8r1ilqp6b5cgq4vvr794w4qpjxc20lcbqfs9l6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93c1xuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJJbnZlcnQgV2luZG93IENvbG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmludmVydC13aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWlzZWxmL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnZlcnQtY29sb3IiLAogICJ1dWlkIjogImludmVydC13aW5kb3dAbWFpc2VsZiIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "gnome-stats-pro@thrallingpenguin.com", "name": "GnomeStatsPro", "pname": "gnomestatspro", "description": "System monitor showing CPU and memory usage.", "link": "https://extensions.gnome.org/extension/1043/gnomestatspro/", "shell_version_map": {
     "38": {"version": "12", "sha256": "08czzpkxf468fhg4v3fnai01dagkcdc2xwgivlp4yc00xwn0mdnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtb25pdG9yIHNob3dpbmcgQ1BVIGFuZCBtZW1vcnkgdXNhZ2UuIiwKICAiZXh0ZW5zaW9uLWlkIjogImdub21lLXN0YXRzLXBybyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkdub21lU3RhdHNQcm8iLAogICJvcmlnaW5hbC1hdXRob3IiOiAiam9lQHRocmFsbGluZ3Blbmd1aW4uY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXN0YXRzLXBybyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0MC40IgogIF0sCiAgInVybCI6ICJodHRwOi8vVGhyYWxsaW5nUGVuZ3Vpbi5jb20vcHJvZHVjdHMvZ25vbWUtc3RhdHMtcHJvIiwKICAidXVpZCI6ICJnbm9tZS1zdGF0cy1wcm9AdGhyYWxsaW5ncGVuZ3Vpbi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
@@ -861,8 +913,9 @@
     "42": {"version": "23", "sha256": "0gffarks0z70gdiz8jlgivv2lzxbr0hwbljjhs1xbffx45rla3g5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAibmFtZSI6ICJIYWd1aWNoaSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
     "43": {"version": "23", "sha256": "0gffarks0z70gdiz8jlgivv2lzxbr0hwbljjhs1xbffx45rla3g5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAibmFtZSI6ICJIYWd1aWNoaSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
     "44": {"version": "23", "sha256": "0gffarks0z70gdiz8jlgivv2lzxbr0hwbljjhs1xbffx45rla3g5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAibmFtZSI6ICJIYWd1aWNoaSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
-    "45": {"version": "30", "sha256": "11vqbf56djyrn0ikgpjqhmivjxf6nmnswc0q340kl9b7sjq33id3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGFndWljaGkiLAogICJuYW1lIjogIkhhZ3VpY2hpIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20venRlZm4vZ3NlLWhhZ3VpY2hpLWluZGljYXRvciIsCiAgInV1aWQiOiAiZ3NlLWhhZ3VpY2hpLWluZGljYXRvckB6dGVmbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="},
-    "46": {"version": "30", "sha256": "11vqbf56djyrn0ikgpjqhmivjxf6nmnswc0q340kl9b7sjq33id3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGFndWljaGkiLAogICJuYW1lIjogIkhhZ3VpY2hpIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20venRlZm4vZ3NlLWhhZ3VpY2hpLWluZGljYXRvciIsCiAgInV1aWQiOiAiZ3NlLWhhZ3VpY2hpLWluZGljYXRvckB6dGVmbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}
+    "45": {"version": "33", "sha256": "08nzpzzf0s1m9x23yc1asgm0g5rzq7l75n721qvzn4frh7q0qswr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGFndWljaGkiLAogICJuYW1lIjogIkhhZ3VpY2hpIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"},
+    "46": {"version": "33", "sha256": "08nzpzzf0s1m9x23yc1asgm0g5rzq7l75n721qvzn4frh7q0qswr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGFndWljaGkiLAogICJuYW1lIjogIkhhZ3VpY2hpIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"},
+    "47": {"version": "33", "sha256": "08nzpzzf0s1m9x23yc1asgm0g5rzq7l75n721qvzn4frh7q0qswr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAienRlZm4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGFndWljaGkiLAogICJuYW1lIjogIkhhZ3VpY2hpIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"}
   }}
 , {"uuid": "gnome-shutdown-button@kirby_33@hotmail.fr", "name": "Gnome-Shutdown Button", "pname": "gnome-shutdown-button", "description": "Add a power off button to easily turn off your computer.\nThis button replaces the power off icon in the system area of the Gnome panel.\nYou no longer need to open the system menu to turn off your computer.", "link": "https://extensions.gnome.org/extension/1056/gnome-shutdown-button/", "shell_version_map": {
     "40": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"},
@@ -886,8 +939,9 @@
     "42": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "43": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "44": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
-    "45": {"version": "36", "sha256": "09cl6f9m126mcq0gh5h5q1jcimqgk8fwc6b7wg1xl2h0bs6kk5v0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="},
-    "46": {"version": "36", "sha256": "09cl6f9m126mcq0gh5h5q1jcimqgk8fwc6b7wg1xl2h0bs6kk5v0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}
+    "45": {"version": "38", "sha256": "1vqzrjxgf2dk1s8ikyic7kb6yw7qzwn06y0dvf7b4j6dzhvpflcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "46": {"version": "38", "sha256": "1vqzrjxgf2dk1s8ikyic7kb6yw7qzwn06y0dvf7b4j6dzhvpflcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "47": {"version": "38", "sha256": "1vqzrjxgf2dk1s8ikyic7kb6yw7qzwn06y0dvf7b4j6dzhvpflcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}
   }}
 , {"uuid": "syncthing@gnome.2nv2u.com", "name": "Syncthing Indicator", "pname": "syncthing-indicator", "description": "Shell indicator for starting, monitoring and controlling the Syncthing daemon using SystemD", "link": "https://extensions.gnome.org/extension/1070/syncthing-indicator/", "shell_version_map": {
     "38": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
@@ -896,8 +950,9 @@
     "42": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
     "43": {"version": "31", "sha256": "1kv8n1iv436pfxc3in6p2m9apr4jjhc120l5x3wn2z6chryxspl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzJudjJ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "44": {"version": "31", "sha256": "1kv8n1iv436pfxc3in6p2m9apr4jjhc120l5x3wn2z6chryxspl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzJudjJ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "45": {"version": "35", "sha256": "0q9scpih53y3i1ybjqcfr0jmk4caykk2pyl5739yqw0f6y64mkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"},
-    "46": {"version": "35", "sha256": "0q9scpih53y3i1ybjqcfr0jmk4caykk2pyl5739yqw0f6y64mkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}
+    "45": {"version": "36", "sha256": "0ql4l0adgazphfcmzydzb3f57a3hahmd5c1db2awdxz5hkilvkks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMm52MnUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5bmN0aGluZ0Bnbm9tZS4ybnYydS5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
+    "46": {"version": "36", "sha256": "0ql4l0adgazphfcmzydzb3f57a3hahmd5c1db2awdxz5hkilvkks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMm52MnUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5bmN0aGluZ0Bnbm9tZS4ybnYydS5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
+    "47": {"version": "36", "sha256": "0ql4l0adgazphfcmzydzb3f57a3hahmd5c1db2awdxz5hkilvkks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMm52MnUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5bmN0aGluZ0Bnbm9tZS4ybnYydS5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
   }}
 , {"uuid": "applications-overview-tooltip@RaphaelRochet", "name": "Applications Overview Tooltip", "pname": "applications-overview-tooltip", "description": "Shows a tooltip over applications icons on applications overview with application name and/or description.", "link": "https://extensions.gnome.org/extension/1071/applications-overview-tooltip/", "shell_version_map": {
     "38": {"version": "11", "sha256": "0alvg0l46hls3jz3a5ic21fgbjbg0kv0nn0pkknzsgjfw5mmwz69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDExCn0="},
@@ -907,7 +962,8 @@
     "43": {"version": "17", "sha256": "1mkagqmgc660n3vryp7vybk9dkk7g0iyaa8r69s8rmyf692vdbcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "44": {"version": "17", "sha256": "1mkagqmgc660n3vryp7vybk9dkk7g0iyaa8r69s8rmyf692vdbcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "45": {"version": "19", "sha256": "1z583a2g6sdj1srkq3idzmdc7dvhddpd6ynw7z2kyy0rz4xkk3d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgInV1aWQiOiAiYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXBAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "46": {"version": "21", "sha256": "13ipf5mjsbhjxym5cmzi8zrm92q721m6gwvik5fn3bygzrb9vc3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgInV1aWQiOiAiYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXBAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAyMQp9"}
+    "46": {"version": "22", "sha256": "08y3v4pfwzsnns0l870a6rl1g3kd51qb5brvvsfjys3wrzj23kig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
+    "47": {"version": "22", "sha256": "08y3v4pfwzsnns0l870a6rl1g3kd51qb5brvvsfjys3wrzj23kig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}
   }}
 , {"uuid": "TwitchLive_Panel@extensions.maweki.de", "name": "TwitchLive Panel", "pname": "twitchlive-panel", "description": "A panel showing whether your favorite Twitch.tv streamers are streaming.\n\nCycles through the online streamers if multiples are configured. Click on the panel and then on streamer's name to launch the stream with a custom command (your browser or some other application).\n\nNeeds curl and mogrify to fully support streamer logos.", "link": "https://extensions.gnome.org/extension/1078/twitchlive-panel/", "shell_version_map": {
     "40": {"version": "44", "sha256": "0shgh7lb1h8cwzj1h6ia26dqk4yimx3zqb0vgz4sdak8h55x8486", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0d2l0Y2hsaXZlIiwKICAibmFtZSI6ICJUd2l0Y2hMaXZlIFBhbmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnR3aXRjaGxpdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogNDQKfQ=="},
@@ -942,8 +998,9 @@
     "42": {"version": "11", "sha256": "0ppvb3j8f8b9r1n72cdwwjj488grvqnk9b3j0y103kgwbxhr8qw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "43": {"version": "11", "sha256": "0ppvb3j8f8b9r1n72cdwwjj488grvqnk9b3j0y103kgwbxhr8qw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "44": {"version": "11", "sha256": "0ppvb3j8f8b9r1n72cdwwjj488grvqnk9b3j0y103kgwbxhr8qw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "45": {"version": "13", "sha256": "19rg75wpw1ar1wg6qxw4v9hwd9g1nwgf0n94j5f9y71b6q4a17j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "46": {"version": "13", "sha256": "19rg75wpw1ar1wg6qxw4v9hwd9g1nwgf0n94j5f9y71b6q4a17j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
+    "45": {"version": "14", "sha256": "14qw7yk53l3fdivxj03i0sbv4iq1jp8k7paasr72lf8wrvk1jpx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
+    "46": {"version": "14", "sha256": "14qw7yk53l3fdivxj03i0sbv4iq1jp8k7paasr72lf8wrvk1jpx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
+    "47": {"version": "14", "sha256": "14qw7yk53l3fdivxj03i0sbv4iq1jp8k7paasr72lf8wrvk1jpx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}
   }}
 , {"uuid": "KeepAwake@jepfa.de", "name": "Keep awake!", "pname": "keep-awake", "description": "Keep your computer awake! Prevents that your computer activates sceensaver, turns off screen(s) or goes to hibernate when not actively used for a while. Click the indicator icon once to keep your computer awake for the current session. Click again to keep it awake also between restarts (indicated by a small lock icon on the indicator). Clicking again to not keep awake.", "link": "https://extensions.gnome.org/extension/1097/keep-awake/", "shell_version_map": {
     "38": {"version": "11", "sha256": "0v16xkjry4anjk12iy5p1ny5mh3ckbf4s4h9qmbfljfhmzsfkm09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
@@ -952,8 +1009,9 @@
     "42": {"version": "11", "sha256": "0v16xkjry4anjk12iy5p1ny5mh3ckbf4s4h9qmbfljfhmzsfkm09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "43": {"version": "11", "sha256": "0v16xkjry4anjk12iy5p1ny5mh3ckbf4s4h9qmbfljfhmzsfkm09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "44": {"version": "11", "sha256": "0v16xkjry4anjk12iy5p1ny5mh3ckbf4s4h9qmbfljfhmzsfkm09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "45": {"version": "14", "sha256": "177l0kcffdbm823dz1lsq0ga7mdn4dw76qzahy52bb170vmj9547", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgc2NyZWVuKHMpIG9yIGdvZXMgdG8gaGliZXJuYXRlIHdoZW4gbm90IGFjdGl2ZWx5IHVzZWQgZm9yIGEgd2hpbGUuIENsaWNrIHRoZSBpbmRpY2F0b3IgaWNvbiBvbmNlIHRvIGtlZXAgeW91ciBjb21wdXRlciBhd2FrZSBmb3IgdGhlIGN1cnJlbnQgc2Vzc2lvbi4gQ2xpY2sgYWdhaW4gdG8ga2VlcCBpdCBhd2FrZSBhbHNvIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gQ2xpY2tpbmcgYWdhaW4gdG8gbm90IGtlZXAgYXdha2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiS2VlcEF3YWtlIiwKICAibmFtZSI6ICJLZWVwIGF3YWtlISIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5LZWVwQXdha2VAamVwZmEuZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "177l0kcffdbm823dz1lsq0ga7mdn4dw76qzahy52bb170vmj9547", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgc2NyZWVuKHMpIG9yIGdvZXMgdG8gaGliZXJuYXRlIHdoZW4gbm90IGFjdGl2ZWx5IHVzZWQgZm9yIGEgd2hpbGUuIENsaWNrIHRoZSBpbmRpY2F0b3IgaWNvbiBvbmNlIHRvIGtlZXAgeW91ciBjb21wdXRlciBhd2FrZSBmb3IgdGhlIGN1cnJlbnQgc2Vzc2lvbi4gQ2xpY2sgYWdhaW4gdG8ga2VlcCBpdCBhd2FrZSBhbHNvIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gQ2xpY2tpbmcgYWdhaW4gdG8gbm90IGtlZXAgYXdha2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiS2VlcEF3YWtlIiwKICAibmFtZSI6ICJLZWVwIGF3YWtlISIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5LZWVwQXdha2VAamVwZmEuZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "45": {"version": "15", "sha256": "17r366pkhh6f3lfz04n2a75wfpcp7rb50hd7ncgf1fzjlp5r3nri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgc2NyZWVuKHMpIG9yIGdvZXMgdG8gaGliZXJuYXRlIHdoZW4gbm90IGFjdGl2ZWx5IHVzZWQgZm9yIGEgd2hpbGUuIENsaWNrIHRoZSBpbmRpY2F0b3IgaWNvbiBvbmNlIHRvIGtlZXAgeW91ciBjb21wdXRlciBhd2FrZSBmb3IgdGhlIGN1cnJlbnQgc2Vzc2lvbi4gQ2xpY2sgYWdhaW4gdG8ga2VlcCBpdCBhd2FrZSBhbHNvIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gQ2xpY2tpbmcgYWdhaW4gdG8gbm90IGtlZXAgYXdha2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiS2VlcEF3YWtlIiwKICAibmFtZSI6ICJLZWVwIGF3YWtlISIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5LZWVwQXdha2VAamVwZmEuZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "17r366pkhh6f3lfz04n2a75wfpcp7rb50hd7ncgf1fzjlp5r3nri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgc2NyZWVuKHMpIG9yIGdvZXMgdG8gaGliZXJuYXRlIHdoZW4gbm90IGFjdGl2ZWx5IHVzZWQgZm9yIGEgd2hpbGUuIENsaWNrIHRoZSBpbmRpY2F0b3IgaWNvbiBvbmNlIHRvIGtlZXAgeW91ciBjb21wdXRlciBhd2FrZSBmb3IgdGhlIGN1cnJlbnQgc2Vzc2lvbi4gQ2xpY2sgYWdhaW4gdG8ga2VlcCBpdCBhd2FrZSBhbHNvIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gQ2xpY2tpbmcgYWdhaW4gdG8gbm90IGtlZXAgYXdha2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiS2VlcEF3YWtlIiwKICAibmFtZSI6ICJLZWVwIGF3YWtlISIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5LZWVwQXdha2VAamVwZmEuZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "17r366pkhh6f3lfz04n2a75wfpcp7rb50hd7ncgf1fzjlp5r3nri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgc2NyZWVuKHMpIG9yIGdvZXMgdG8gaGliZXJuYXRlIHdoZW4gbm90IGFjdGl2ZWx5IHVzZWQgZm9yIGEgd2hpbGUuIENsaWNrIHRoZSBpbmRpY2F0b3IgaWNvbiBvbmNlIHRvIGtlZXAgeW91ciBjb21wdXRlciBhd2FrZSBmb3IgdGhlIGN1cnJlbnQgc2Vzc2lvbi4gQ2xpY2sgYWdhaW4gdG8ga2VlcCBpdCBhd2FrZSBhbHNvIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gQ2xpY2tpbmcgYWdhaW4gdG8gbm90IGtlZXAgYXdha2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiS2VlcEF3YWtlIiwKICAibmFtZSI6ICJLZWVwIGF3YWtlISIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5LZWVwQXdha2VAamVwZmEuZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "todolist@tomMoral.org", "name": "Section Todo List", "pname": "section-todo-list", "description": "Manage todo list with an applet\n\n* Add and remove task on your list in different sections.\n* Click an item to rename it.\n* Access the extension using Hot-Key (default: Ctrl+Space)\n\n**Note:** I don't come on this page often so if you need any help, please refer to the github repo and open an issue :) ", "link": "https://extensions.gnome.org/extension/1104/section-todo-list/", "shell_version_map": {
     "38": {"version": "13", "sha256": "0q2sl28w2dmcdxvhvwvldmm89qh3m83678nww0v6varbmf99vj1b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuXG4qKk5vdGU6KiogSSBkb24ndCBjb21lIG9uIHRoaXMgcGFnZSBvZnRlbiBzbyBpZiB5b3UgbmVlZCBhbnkgaGVscCwgcGxlYXNlIHJlZmVyIHRvIHRoZSBnaXRodWIgcmVwbyBhbmQgb3BlbiBhbiBpc3N1ZSA6KSAiLAogICJuYW1lIjogIlNlY3Rpb24gVG9kbyBMaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tTW9yYWwvVG9Eb0xpc3QiLAogICJ1dWlkIjogInRvZG9saXN0QHRvbU1vcmFsLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -968,8 +1026,9 @@
     "42": {"version": "8", "sha256": "0vkbwld1p68y1w97qblkra164698qbhkk8laamr6rdnk29iy0zrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
     "43": {"version": "11", "sha256": "17z80qwsad3bd0kfs5bz8l6gz39kdzhbd3ym5f5h32q6sbjyrp2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
     "44": {"version": "11", "sha256": "17z80qwsad3bd0kfs5bz8l6gz39kdzhbd3ym5f5h32q6sbjyrp2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "45": {"version": "13", "sha256": "1l05dqc59xv3yjj8grn11l2af6sx7s3ck8g4wn9sbbc93la1v46a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "46": {"version": "13", "sha256": "1l05dqc59xv3yjj8grn11l2af6sx7s3ck8g4wn9sbbc93la1v46a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
+    "45": {"version": "14", "sha256": "16hk0hxyry58q8bdxvcdladjiwd5p33crpj093jni228kwabshrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "46": {"version": "14", "sha256": "16hk0hxyry58q8bdxvcdladjiwd5p33crpj093jni228kwabshrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "47": {"version": "14", "sha256": "16hk0hxyry58q8bdxvcdladjiwd5p33crpj093jni228kwabshrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
   }}
 , {"uuid": "hide_clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hides Clock", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {
     "38": {"version": "11", "sha256": "1gzk6xf5jy2cq33s7fbl2s57y8jfdcz096r6czc2mdd4n5aqiija", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncmFudG1jd2lsbGlhbXMvR25vbWVfSGlkZV9DbG9jayIsCiAgInV1aWQiOiAiaGlkZV9jbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
@@ -988,15 +1047,16 @@
     "44": {"version": "70", "sha256": "1ns5rbk3y67bs801ry2kafbn51k3lxabf0simdvhhr3djgssdygs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY3MCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA3MAp9"},
     "45": {"version": "75", "sha256": "17161703kvysrklpa84k2yrxm1q6rzq1nhj8pa94956dlgb6c7sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY3NSIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1zY3JlZW5zaG90LyIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdEB0dGxsLmRlIiwKICAidmVyc2lvbiI6IDc1Cn0="}
   }}
-, {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {
+, {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say. (keywords: microphone mic mute say push talk)\n", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {
     "38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "40": {"version": "18", "sha256": "1kif3hd58yqa7y05w08rbkg7ipj9f8569gcjb1kz7m3fajysjx3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "41": {"version": "18", "sha256": "1kif3hd58yqa7y05w08rbkg7ipj9f8569gcjb1kz7m3fajysjx3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "42": {"version": "18", "sha256": "1kif3hd58yqa7y05w08rbkg7ipj9f8569gcjb1kz7m3fajysjx3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "43": {"version": "18", "sha256": "1kif3hd58yqa7y05w08rbkg7ipj9f8569gcjb1kz7m3fajysjx3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "44": {"version": "18", "sha256": "1kif3hd58yqa7y05w08rbkg7ipj9f8569gcjb1kz7m3fajysjx3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxOAp9"},
-    "45": {"version": "21", "sha256": "049n0xc0s8wg4wblp2fv6x2x2y61fan3f461yanpp84jc97fglnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93Ym9sc3Rlci9ub3RoaW5nLXRvLXNheSIsCiAgInV1aWQiOiAibm90aGluZy10by1zYXlAZXh0ZW5zaW9ucy5nbm9tZS53b3V0ZXIuYm9sc3RlcmwuZWUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
-    "46": {"version": "21", "sha256": "049n0xc0s8wg4wblp2fv6x2x2y61fan3f461yanpp84jc97fglnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93Ym9sc3Rlci9ub3RoaW5nLXRvLXNheSIsCiAgInV1aWQiOiAibm90aGluZy10by1zYXlAZXh0ZW5zaW9ucy5nbm9tZS53b3V0ZXIuYm9sc3RlcmwuZWUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}
+    "45": {"version": "22", "sha256": "0lmhblmj4y6k4dkhdp33wap96g3rybz5sighhpczd972p9nqbp9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDIyCn0="},
+    "46": {"version": "22", "sha256": "0lmhblmj4y6k4dkhdp33wap96g3rybz5sighhpczd972p9nqbp9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDIyCn0="},
+    "47": {"version": "22", "sha256": "0lmhblmj4y6k4dkhdp33wap96g3rybz5sighhpczd972p9nqbp9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDIyCn0="}
   }}
 , {"uuid": "workspace-switch-wraparound@theychx.org", "name": "Workspace Switch Wraparound", "pname": "workspace-switch-wraparound", "description": "NO LONGER MAINTAINED\n\nWhen switching workspaces, going down from the bottom workspace switches to the top workspace. Likewise, up from the top workspace goes to the bottom workspace.", "link": "https://extensions.gnome.org/extension/1116/workspace-switch-wraparound/", "shell_version_map": {
     "38": {"version": "10", "sha256": "0r8ivrnnilvm0yijdra2n1n9ygcaclz57d5zcmi1jihggdhnc3ca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhleWNoeC9Xb3Jrc3BhY2VTd2l0Y2hlcldyYXBBcm91bmQiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2gtd3JhcGFyb3VuZEB0aGV5Y2h4Lm9yZyIsCiAgInZlcnNpb24iOiAxMAp9"},
@@ -1036,7 +1096,8 @@
     "43": {"version": "15", "sha256": "0bhq1ns7pbrdxkclg2q213hfy0633171zfj17jhxxv70qpkskpbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIEN0cmwgKyBBbHQgKyBTdXBlciArIFMgaXMgcHJlc3NlZCIsCiAgImdldHRleHQtZG9tYWluIjogIlNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3J0Y3V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "44": {"version": "15", "sha256": "0bhq1ns7pbrdxkclg2q213hfy0633171zfj17jhxxv70qpkskpbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIEN0cmwgKyBBbHQgKyBTdXBlciArIFMgaXMgcHJlc3NlZCIsCiAgImdldHRleHQtZG9tYWluIjogIlNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3J0Y3V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "45": {"version": "26", "sha256": "1996qchzb9rib835vjq3lf04pfbq596jp0rrl9xp1spiaqx2mnkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIEN0cmwgKyBBbHQgKyBTdXBlciArIFMgaXMgcHJlc3NlZCAoaG90a2V5IGNhbiBiZSBjaGFuZ2VkIGluIHNldHRpbmdzKSIsCiAgImdldHRleHQtZG9tYWluIjogIlNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3J0Y3V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMjYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4xIgp9"},
-    "46": {"version": "26", "sha256": "1996qchzb9rib835vjq3lf04pfbq596jp0rrl9xp1spiaqx2mnkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIEN0cmwgKyBBbHQgKyBTdXBlciArIFMgaXMgcHJlc3NlZCAoaG90a2V5IGNhbiBiZSBjaGFuZ2VkIGluIHNldHRpbmdzKSIsCiAgImdldHRleHQtZG9tYWluIjogIlNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3J0Y3V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMjYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4xIgp9"}
+    "46": {"version": "26", "sha256": "1996qchzb9rib835vjq3lf04pfbq596jp0rrl9xp1spiaqx2mnkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIEN0cmwgKyBBbHQgKyBTdXBlciArIFMgaXMgcHJlc3NlZCAoaG90a2V5IGNhbiBiZSBjaGFuZ2VkIGluIHNldHRpbmdzKSIsCiAgImdldHRleHQtZG9tYWluIjogIlNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3J0Y3V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMjYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4xIgp9"},
+    "47": {"version": "27", "sha256": "0bzgcmp2fa4y0wjj0ssbzj83rv3zai319hxwhcaxbg2y05xi7565", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIEN0cmwgKyBBbHQgKyBTdXBlciArIFMgaXMgcHJlc3NlZCAoaG90a2V5IGNhbiBiZSBjaGFuZ2VkIGluIHNldHRpbmdzKSIsCiAgImdldHRleHQtZG9tYWluIjogIlNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3J0Y3V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAyNywKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="}
   }}
 , {"uuid": "sensory-perception@HarlemSquirrel.github.io", "name": "Sensory Perception", "pname": "sensory-perception", "description": "Requires lm-sensors (or lm_sensors). Shows CPU temperature, disk temperature, video card temperature, voltage and fan RPM.", "link": "https://extensions.gnome.org/extension/1145/sensory-perception/", "shell_version_map": {
     "38": {"version": "13", "sha256": "16wc49khyk5arsis8kzpjgl6nl8gccc2y5sspq8rwnab22jnzwjh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -1065,7 +1126,8 @@
     "43": {"version": "56", "sha256": "0hl85jdmv07viqhvfd35w2wdyjyv5hywr55pycgz21fjk11waf1k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"},
     "44": {"version": "56", "sha256": "0hl85jdmv07viqhvfd35w2wdyjyv5hywr55pycgz21fjk11waf1k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"},
     "45": {"version": "60", "sha256": "12l8fvw271k5q0dbhq5vw5li7fbjxi4y0n5d4rz0w8hrgj2jsikb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG9tZS1zd2VldC1nbm9tZS9kYXNoLXRvLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLXRvLXBhbmVsQGpkZXJvc2U5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
-    "46": {"version": "62", "sha256": "05g651mh4db8s5p796702d0sd5yipdrv4pm0p3b7v0m5b9q8hwhf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImNoYXJsZXNnOTkiCiAgfSwKICAiZXh0ZW5zaW9uLWlkIjogImRhc2gtdG8tcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNoLXRvLXBhbmVsIiwKICAibmFtZSI6ICJEYXNoIHRvIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hvbWUtc3dlZXQtZ25vbWUvZGFzaC10by1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC10by1wYW5lbEBqZGVyb3NlOS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="}
+    "46": {"version": "64", "sha256": "0b43jc93xik3krmyx6rn2wl8ss4gv83ggl181mrvp4vl6xsxcn5d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImNoYXJsZXNnOTkiCiAgfSwKICAiZXh0ZW5zaW9uLWlkIjogImRhc2gtdG8tcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNoLXRvLXBhbmVsIiwKICAibmFtZSI6ICJEYXNoIHRvIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2NAp9"},
+    "47": {"version": "64", "sha256": "0b43jc93xik3krmyx6rn2wl8ss4gv83ggl181mrvp4vl6xsxcn5d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImNoYXJsZXNnOTkiCiAgfSwKICAiZXh0ZW5zaW9uLWlkIjogImRhc2gtdG8tcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNoLXRvLXBhbmVsIiwKICAibmFtZSI6ICJEYXNoIHRvIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2NAp9"}
   }}
 , {"uuid": "emoji-selector@maestroschan.fr", "name": "Emoji Selector", "pname": "emoji-selector", "description": "This extension provides a parametrable popup menu displaying most emojis, clicking on an emoji copies it to the clipboard. An appropriate font like 'Twitter Color Emoji' or 'JoyPixels Color' should be installed on your system for a better visual result.", "link": "https://extensions.gnome.org/extension/1162/emoji-selector/", "shell_version_map": {
     "38": {"version": "20", "sha256": "1i6py149m46xig5a0ry7y5v887nlzw644mw72gcr2hkfsn8b0gnd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
@@ -1080,8 +1142,9 @@
     "42": {"version": "7", "sha256": "0ykqd0yazwrrb93gq07mbb0jcyfpmj8imbk324iq1828zsvfld8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JvbnppbmkvZ25vbWUta2luaXQiLAogICJ1dWlkIjogImdub21lLWtpbml0QGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="},
     "43": {"version": "12", "sha256": "1wrlnsgq181636ai3p14l8rx809qn0kykhh1q0267jw108hjha1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "44": {"version": "12", "sha256": "1wrlnsgq181636ai3p14l8rx809qn0kykhh1q0267jw108hjha1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "45": {"version": "15", "sha256": "1683b2y6asv4vjr603hmsfk074n5w0bs5swbw5li7vmjzx9v1m0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
-    "46": {"version": "15", "sha256": "1683b2y6asv4vjr603hmsfk074n5w0bs5swbw5li7vmjzx9v1m0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
+    "45": {"version": "16", "sha256": "0kdd4gvwcxx31zm6zizsh261zyj3mv5dc4z1c1iq2s9h1lsi242c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYm9uemluaS9nbm9tZS1raW5pdCIsCiAgInV1aWQiOiAiZ25vbWUta2luaXRAYm9uemluaS5nbnUub3JnIiwKICAidmVyc2lvbiI6IDE2Cn0="},
+    "46": {"version": "16", "sha256": "0kdd4gvwcxx31zm6zizsh261zyj3mv5dc4z1c1iq2s9h1lsi242c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYm9uemluaS9nbm9tZS1raW5pdCIsCiAgInV1aWQiOiAiZ25vbWUta2luaXRAYm9uemluaS5nbnUub3JnIiwKICAidmVyc2lvbiI6IDE2Cn0="},
+    "47": {"version": "16", "sha256": "0kdd4gvwcxx31zm6zizsh261zyj3mv5dc4z1c1iq2s9h1lsi242c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYm9uemluaS9nbm9tZS1raW5pdCIsCiAgInV1aWQiOiAiZ25vbWUta2luaXRAYm9uemluaS5nbnUub3JnIiwKICAidmVyc2lvbiI6IDE2Cn0="}
   }}
 , {"uuid": "screenshotlocations.timur@linux.com", "name": "Screenshot Locations", "pname": "screenshot-locations", "description": "Change the default GNOME screenshot directory", "link": "https://extensions.gnome.org/extension/1179/screenshot-locations/", "shell_version_map": {
     "38": {"version": "7", "sha256": "0ymb4m8fgxgi964fdfdqwgjw95qbcm906zgqmyqxgd4ggip3mn47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMuZGF0YS5ncmVzb3VyY2UiLAogICJkZXNjcmlwdGlvbiI6ICJDaGFuZ2UgdGhlIGRlZmF1bHQgR05PTUUgc2NyZWVuc2hvdCBkaXJlY3RvcnkiLAogICJuYW1lIjogIlNjcmVlbnNob3QgTG9jYXRpb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2tpeXVpL2dub21lLXNoZWxsLXNjcmVlbnNob3Rsb2NhdGlvbnMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzY3JlZW5zaG90bG9jYXRpb25zLnRpbXVyQGxpbnV4LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
@@ -1094,8 +1157,9 @@
     "42": {"version": "34", "sha256": "12n7mvnar9k2hndmn4habdw5jigc458sy2nvsvi8g84c9ryd38xr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "43": {"version": "34", "sha256": "12n7mvnar9k2hndmn4habdw5jigc458sy2nvsvi8g84c9ryd38xr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "44": {"version": "34", "sha256": "12n7mvnar9k2hndmn4habdw5jigc458sy2nvsvi8g84c9ryd38xr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "45": {"version": "36", "sha256": "0wamnpd3pq8nqafl00sbm03sqimz3sfc2v8zj9f2kfn3x3hqrcr1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
-    "46": {"version": "36", "sha256": "0wamnpd3pq8nqafl00sbm03sqimz3sfc2v8zj9f2kfn3x3hqrcr1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
+    "45": {"version": "37", "sha256": "0icadkr1wb6ki5c7nig8fa63jp6ihcr1ihgagkqgsh4rxyj1hnd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="},
+    "46": {"version": "37", "sha256": "0icadkr1wb6ki5c7nig8fa63jp6ihcr1ihgagkqgsh4rxyj1hnd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="},
+    "47": {"version": "37", "sha256": "0icadkr1wb6ki5c7nig8fa63jp6ihcr1ihgagkqgsh4rxyj1hnd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImluamNyaXN0aWFucm9qYXMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiVVRDQ2xvY2siLAogICJuYW1lIjogIlVUQ0Nsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnV0Y2Nsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}
   }}
 , {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {
     "38": {"version": "17", "sha256": "0hq25s6kwkd857z5799598n8nx5dxvwy9xwnsrsad3n79pgl7rir", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"},
@@ -1104,8 +1168,9 @@
     "42": {"version": "32", "sha256": "0kpg34m9n4m6cm262gz20akrjlpd7mhfgqsbrjs9wr9xv16wzw95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDMyCn0="},
     "43": {"version": "32", "sha256": "0kpg34m9n4m6cm262gz20akrjlpd7mhfgqsbrjs9wr9xv16wzw95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDMyCn0="},
     "44": {"version": "32", "sha256": "0kpg34m9n4m6cm262gz20akrjlpd7mhfgqsbrjs9wr9xv16wzw95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDMyCn0="},
-    "45": {"version": "35", "sha256": "0izyic6a5laajgnm29cw3r6f6m7q96530j1k6wvsanb8r1j21v01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDM1Cn0="},
-    "46": {"version": "35", "sha256": "0izyic6a5laajgnm29cw3r6f6m7q96530j1k6wvsanb8r1j21v01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDM1Cn0="}
+    "45": {"version": "40", "sha256": "0h3f3dnryc5zkjyy6nndr46b9pmfbjmh5skfcpqa9y6r921n0qvc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiA0MAp9"},
+    "46": {"version": "40", "sha256": "0h3f3dnryc5zkjyy6nndr46b9pmfbjmh5skfcpqa9y6r921n0qvc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiA0MAp9"},
+    "47": {"version": "40", "sha256": "0h3f3dnryc5zkjyy6nndr46b9pmfbjmh5skfcpqa9y6r921n0qvc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiA0MAp9"}
   }}
 , {"uuid": "walkpaper@walkpaper.blinkbp.github.com", "name": "Walkpaper", "pname": "walkpaper", "description": "Set different wallpaper for each workspace by having the wallpaper switch on workspace change.", "link": "https://extensions.gnome.org/extension/1200/walkpaper/", "shell_version_map": {
     "40": {"version": "9", "sha256": "1ckrf3y20wp3dv4aig44rycj7kbrxj14gh3rzs17vcqma3aw76bq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4iLAogICJleHRlbnNpb24taWQiOiAid2Fsa3BhcGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZW5nbGlzaCIsCiAgIm5hbWUiOiAiV2Fsa3BhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmxpbmtCUC93YWxrcGFwZXIiLAogICJ1dWlkIjogIndhbGtwYXBlckB3YWxrcGFwZXIuYmxpbmticC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
@@ -1129,8 +1194,9 @@
     "42": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "43": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "44": {"version": "8", "sha256": "0wwzfas2q81wl3vnwhadyb14fgrzk5s4l65zk5js137x93vvi0k0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "45": {"version": "11", "sha256": "1fyyvhqhjrklak5i716maspm1x6ikcmify4b2bzb22bbgddsfxa5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJleHRlbnNpb24taWQiOiAidW5kZWNvcmF0ZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "46": {"version": "11", "sha256": "1fyyvhqhjrklak5i716maspm1x6ikcmify4b2bzb22bbgddsfxa5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJleHRlbnNpb24taWQiOiAidW5kZWNvcmF0ZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}
+    "45": {"version": "12", "sha256": "0gbzl25a749scagyk58j60q1qhr1yhwngmwkbp8i4n8y02p7ma8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJleHRlbnNpb24taWQiOiAidW5kZWNvcmF0ZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "46": {"version": "12", "sha256": "0gbzl25a749scagyk58j60q1qhr1yhwngmwkbp8i4n8y02p7ma8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJleHRlbnNpb24taWQiOiAidW5kZWNvcmF0ZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "47": {"version": "12", "sha256": "0gbzl25a749scagyk58j60q1qhr1yhwngmwkbp8i4n8y02p7ma8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJleHRlbnNpb24taWQiOiAidW5kZWNvcmF0ZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
 , {"uuid": "rcd@criztovyl.space", "name": "Right Click Down", "pname": "right-click-down", "description": "Moves windows one workspace down by right-clicking them in the overview.", "link": "https://extensions.gnome.org/extension/1210/right-click-down/", "shell_version_map": {
     "38": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -1144,7 +1210,8 @@
     "43": {"version": "21", "sha256": "0iz189f0wjz1m57g48hj6zpg5ix0hghr8qlybxsfqd4kyh5ls6an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1tYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50ZXJzIiwKICAidXVpZCI6ICJwcmludGVyc0BsaW51eC1tYW4ub3JnIiwKICAidmVyc2lvbiI6IDIxCn0="},
     "44": {"version": "21", "sha256": "0iz189f0wjz1m57g48hj6zpg5ix0hghr8qlybxsfqd4kyh5ls6an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1tYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50ZXJzIiwKICAidXVpZCI6ICJwcmludGVyc0BsaW51eC1tYW4ub3JnIiwKICAidmVyc2lvbiI6IDIxCn0="},
     "45": {"version": "24", "sha256": "1jwnzqlr5nhjg9sj9wmwipm7gxq9d6cvqq4b6is8fsz7icxax85x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwcmludGVycyIsCiAgIm5hbWUiOiAiUHJpbnRlcnMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvYW8uY2FsZGFzLmxvcGVzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpbnRlcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "46": {"version": "26", "sha256": "0cxnvzqanjnx8s5xr5l4ak5nbj2ij6p0n23kscbvgvz9c56wwiyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwcmludGVycyIsCiAgIm5hbWUiOiAiUHJpbnRlcnMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvYW8uY2FsZGFzLmxvcGVzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpbnRlcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAyNgp9"}
+    "46": {"version": "27", "sha256": "1ig73cliknyz056xyz7wq1s559p6p3y3vngd3pn32hmj54i7dvnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwcmludGVycyIsCiAgIm5hbWUiOiAiUHJpbnRlcnMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvYW8uY2FsZGFzLmxvcGVzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpbnRlcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "47": {"version": "27", "sha256": "1ig73cliknyz056xyz7wq1s559p6p3y3vngd3pn32hmj54i7dvnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwcmludGVycyIsCiAgIm5hbWUiOiAiUHJpbnRlcnMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvYW8uY2FsZGFzLmxvcGVzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpbnRlcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjcKfQ=="}
   }}
 , {"uuid": "move-osd-windows@maestroschan.fr", "name": "Move OSD Windows", "pname": "move-osd-windows", "description": "Change the position of OSD windows (sound & luminosity popups).", "link": "https://extensions.gnome.org/extension/1220/move-osd-windows/", "shell_version_map": {
     "38": {"version": "3", "sha256": "1nmvbx7qbr9a9al5wirnsfwn4qb1qbql2w9f7fpajipasill9hkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgcG9zaXRpb24gb2YgT1NEIHdpbmRvd3MgKHNvdW5kICYgbHVtaW5vc2l0eSBwb3B1cHMpLiIsCiAgImdldHRleHQtZG9tYWluIjogIm1vdmUtb3NkLXdpbmRvd3MiLAogICJuYW1lIjogIk1vdmUgT1NEIFdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWVzdHJvc2NoYW4vTW92ZS1PU0QtV2luZG93cy1HTk9NRS1FeHRlbnNpb24iLAogICJ1dWlkIjogIm1vdmUtb3NkLXdpbmRvd3NAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}
@@ -1167,7 +1234,8 @@
     "43": {"version": "36", "sha256": "1m7v0apk4csy7wq0wzxspfqjazqpchnwmwmcj4hngspz9z0zmky4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN3aXRjaHdvcmtzcGFjZSIsCiAgInV1aWQiOiAic3dpdGNoV29ya1NwYWNlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="},
     "44": {"version": "36", "sha256": "1m7v0apk4csy7wq0wzxspfqjazqpchnwmwmcj4hngspz9z0zmky4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN3aXRjaHdvcmtzcGFjZSIsCiAgInV1aWQiOiAic3dpdGNoV29ya1NwYWNlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="},
     "45": {"version": "37", "sha256": "0ng09kk9ipqkz5kvdj3r3mk69j2rfgv9cbnvklrzvd4vvx853zbx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzd2l0Y2gtd29ya3NwYWNlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dpdGNoV29ya1NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
-    "46": {"version": "38", "sha256": "1amic3gxc3slf2142652xp1jpdfvgp8pmgv9syr5ycd2sp6v0l6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzd2l0Y2gtd29ya3NwYWNlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dpdGNoV29ya1NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}
+    "46": {"version": "39", "sha256": "1q36wv4x3ac6p5swhx6y2sk2ci8ycbbgpbs0514lc6gy49awkwj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzd2l0Y2gtd29ya3NwYWNlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dpdGNoV29ya1NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN3aXRjaHdvcmtzcGFjZSIsCiAgInV1aWQiOiAic3dpdGNoV29ya1NwYWNlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="},
+    "47": {"version": "39", "sha256": "1q36wv4x3ac6p5swhx6y2sk2ci8ycbbgpbs0514lc6gy49awkwj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzd2l0Y2gtd29ya3NwYWNlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dpdGNoV29ya1NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN3aXRjaHdvcmtzcGFjZSIsCiAgInV1aWQiOiAic3dpdGNoV29ya1NwYWNlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}
   }}
 , {"uuid": "noannoyance@sindex.com", "name": "NoAnnoyance", "pname": "noannoyance", "description": "Removes the 'Windows is ready' notification and puts the window into focus.", "link": "https://extensions.gnome.org/extension/1236/noannoyance/", "shell_version_map": {
     "38": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -1176,15 +1244,16 @@
     "42": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
-, {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n- Holiday channels (only in December)\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {
+, {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio from the comfort of your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n- Holiday channels (only in December)\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {
     "38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"},
     "40": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "41": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "42": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "43": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "44": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "45": {"version": "40", "sha256": "03151gwjrr5b8jb73fgpx1n6180xs9f956cd25ybmcwszh0372ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG4tIEhvbGlkYXkgY2hhbm5lbHMgKG9ubHkgaW4gRGVjZW1iZXIpXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="},
-    "46": {"version": "40", "sha256": "03151gwjrr5b8jb73fgpx1n6180xs9f956cd25ybmcwszh0372ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG4tIEhvbGlkYXkgY2hhbm5lbHMgKG9ubHkgaW4gRGVjZW1iZXIpXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}
+    "45": {"version": "41", "sha256": "1pyzsx7g07bbgj312h07l7h8gmfyqgwg5qf6nr5z0nwgvc4dg012", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG4tIEhvbGlkYXkgY2hhbm5lbHMgKG9ubHkgaW4gRGVjZW1iZXIpXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"},
+    "46": {"version": "41", "sha256": "1pyzsx7g07bbgj312h07l7h8gmfyqgwg5qf6nr5z0nwgvc4dg012", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG4tIEhvbGlkYXkgY2hhbm5lbHMgKG9ubHkgaW4gRGVjZW1iZXIpXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"},
+    "47": {"version": "41", "sha256": "1pyzsx7g07bbgj312h07l7h8gmfyqgwg5qf6nr5z0nwgvc4dg012", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG4tIEhvbGlkYXkgY2hhbm5lbHMgKG9ubHkgaW4gRGVjZW1iZXIpXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}
   }}
 , {"uuid": "timepp@zagortenay333", "name": "Time++", "pname": "time", "description": "All-in-one timer, stopwatch, pomodoro, alarm, todo and time tracker\n\nThis extension has been renamed and is available at:\n\nhttps://extensions.gnome.org/extension/6003/cronomix/\n", "link": "https://extensions.gnome.org/extension/1238/time/", "shell_version_map": {
     "38": {"version": "155", "sha256": "0q3612mlccfzma6i9vs3g42xg71axach3gi7llajrlx59y5jjgb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQWxsLWluLW9uZSB0aW1lciwgc3RvcHdhdGNoLCBwb21vZG9ybywgYWxhcm0sIHRvZG8gYW5kIHRpbWUgdHJhY2tlclxuXG5UaGlzIGV4dGVuc2lvbiBoYXMgYmVlbiByZW5hbWVkIGFuZCBpcyBhdmFpbGFibGUgYXQ6XG5cbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzYwMDMvY3Jvbm9taXgvXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lKysiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvY3Jvbm9taXgiLAogICJ1dWlkIjogInRpbWVwcEB6YWdvcnRlbmF5MzMzIiwKICAidmVyc2lvbiI6IDE1NQp9"},
@@ -1197,15 +1266,16 @@
     "40": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="},
     "41": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}
   }}
-, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Sync your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nFeatures:\n* UHD resolution wallpapers\n* Automatically fetches current Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n * random mode (from previously downloaded wallpapers)\n *NEW: select/cycle wallpaper through previously downloaded images\n* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN, zh_TW), French (fr), Portuguese (pt), Ukrainian (uk), Russian (ru_RU), Spanish (es), Korean (ko), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Japanese (ja) - a HUGE thanks to the translators\n\nThis extension was forked from the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {
+, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Bring some color to your GNOME desktop by syncing your desktop and lockscreen wallpapers with today's Microsoft Bing image of the day (the image you see when you visit Bing.com) with this extension. The intention of this extension is to just do what it needs to do and stay out of your way, with a few optional features to improve quality-of-life.\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nFeatures:\n* UHD resolution wallpapers\n* Automatically fetches current Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n * random mode (from previously downloaded wallpapers)\n* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN, zh_TW), French (fr_FR), Portuguese (pt, pt_BR), Ukrainian (uk), Russian (ru_RU), Spanish (es), Korean (ko), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) &amp; Nynorsk (nn), Swedish (sv), Arabic (ar), Hungarian (hu), Japanese (ja), Czech (cs_CZ), Finnish (fi_FI) and Turkish (tr), Persian (fa_ir) - a HUGE thanks to the translators\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {
     "38": {"version": "45", "sha256": "0dyb94ncgimzl6iyfrxls8kqca0bsykkws6zmjdq657rckjgainj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
     "40": {"version": "45", "sha256": "0dyb94ncgimzl6iyfrxls8kqca0bsykkws6zmjdq657rckjgainj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
     "41": {"version": "45", "sha256": "0dyb94ncgimzl6iyfrxls8kqca0bsykkws6zmjdq657rckjgainj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
     "42": {"version": "45", "sha256": "0dyb94ncgimzl6iyfrxls8kqca0bsykkws6zmjdq657rckjgainj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
     "43": {"version": "45", "sha256": "0dyb94ncgimzl6iyfrxls8kqca0bsykkws6zmjdq657rckjgainj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
     "44": {"version": "45", "sha256": "0dyb94ncgimzl6iyfrxls8kqca0bsykkws6zmjdq657rckjgainj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
-    "45": {"version": "49", "sha256": "14c2s823q6rl0g9kgixicjrb6gnv2bz1x2ywkjr2shcjxkwkxs3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnIpLCBQb3J0dWd1ZXNlIChwdCksIFVrcmFpbmlhbiAodWspLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbyksIEluZG9uZXNpYW4gKGlkKSwgQ2F0YWxhbiAoY2EpLCBOb3J3ZWdpYW4gQm9rbVx1MDBlNWwgKG5iKSAmIE55bm9yc2sgKG5pKSwgU3dlZGlzaCAoc3YpLCBBcmFiaWMgKGFyKSwgSHVuZ2FyaWFuIChodSkgYW5kIEphcGFuZXNlIChqYSkgLSBhIEhVR0UgdGhhbmtzIHRvIHRoZSB0cmFuc2xhdG9yc1xuXG5UaGlzIGV4dGVuc2lvbiB3YXMgZm9ya2VkIGZyb20gdGhlIE5BU0EgQVBPRCBleHRlbnNpb24gYnkgRWxpbnZlbnRpb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbikgYW5kIGluc3BpcmVkIGJ5IEJpbmcgRGVza3RvcCBXYWxscGFwZXIgQ2hhbmdlciBieSBVdGthcnNoIEd1cHRhIChodHRwczovL2dpdGh1Yi5jb20vVXRrYXJzaEdwdGEpLlxuXG5BbHdheXMgcmVzdGFydCBHTk9NRSBhZnRlciBtYW51YWxseSB1cGRhdGluZyBleHRlbnNpb25zLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gdGhlIEdpdEh1YiBwYWdlIGJlbG93OiIsCiAgImdldHRleHQtZG9tYWluIjogIkJpbmdXYWxscGFwZXIiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
-    "46": {"version": "49", "sha256": "14c2s823q6rl0g9kgixicjrb6gnv2bz1x2ywkjr2shcjxkwkxs3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnIpLCBQb3J0dWd1ZXNlIChwdCksIFVrcmFpbmlhbiAodWspLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbyksIEluZG9uZXNpYW4gKGlkKSwgQ2F0YWxhbiAoY2EpLCBOb3J3ZWdpYW4gQm9rbVx1MDBlNWwgKG5iKSAmIE55bm9yc2sgKG5pKSwgU3dlZGlzaCAoc3YpLCBBcmFiaWMgKGFyKSwgSHVuZ2FyaWFuIChodSkgYW5kIEphcGFuZXNlIChqYSkgLSBhIEhVR0UgdGhhbmtzIHRvIHRoZSB0cmFuc2xhdG9yc1xuXG5UaGlzIGV4dGVuc2lvbiB3YXMgZm9ya2VkIGZyb20gdGhlIE5BU0EgQVBPRCBleHRlbnNpb24gYnkgRWxpbnZlbnRpb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbikgYW5kIGluc3BpcmVkIGJ5IEJpbmcgRGVza3RvcCBXYWxscGFwZXIgQ2hhbmdlciBieSBVdGthcnNoIEd1cHRhIChodHRwczovL2dpdGh1Yi5jb20vVXRrYXJzaEdwdGEpLlxuXG5BbHdheXMgcmVzdGFydCBHTk9NRSBhZnRlciBtYW51YWxseSB1cGRhdGluZyBleHRlbnNpb25zLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gdGhlIEdpdEh1YiBwYWdlIGJlbG93OiIsCiAgImdldHRleHQtZG9tYWluIjogIkJpbmdXYWxscGFwZXIiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}
+    "45": {"version": "50", "sha256": "05ghwjk1bbz8d2q2m42a0nbmp9vmq6wr3jdcanv5n5d5ffpyywfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnIpLCBQb3J0dWd1ZXNlIChwdCksIFVrcmFpbmlhbiAodWspLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbyksIEluZG9uZXNpYW4gKGlkKSwgQ2F0YWxhbiAoY2EpLCBOb3J3ZWdpYW4gQm9rbVx1MDBlNWwgKG5iKSAmIE55bm9yc2sgKG5pKSwgU3dlZGlzaCAoc3YpLCBBcmFiaWMgKGFyKSwgSHVuZ2FyaWFuIChodSkgYW5kIEphcGFuZXNlIChqYSkgLSBhIEhVR0UgdGhhbmtzIHRvIHRoZSB0cmFuc2xhdG9yc1xuXG5UaGlzIGV4dGVuc2lvbiB3YXMgZm9ya2VkIGZyb20gdGhlIE5BU0EgQVBPRCBleHRlbnNpb24gYnkgRWxpbnZlbnRpb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbikgYW5kIGluc3BpcmVkIGJ5IEJpbmcgRGVza3RvcCBXYWxscGFwZXIgQ2hhbmdlciBieSBVdGthcnNoIEd1cHRhIChodHRwczovL2dpdGh1Yi5jb20vVXRrYXJzaEdwdGEpLlxuXG5BbHdheXMgcmVzdGFydCBHTk9NRSBhZnRlciBtYW51YWxseSB1cGRhdGluZyBleHRlbnNpb25zLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gdGhlIEdpdEh1YiBwYWdlIGJlbG93OiIsCiAgImdldHRleHQtZG9tYWluIjogIkJpbmdXYWxscGFwZXIiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"},
+    "46": {"version": "50", "sha256": "05ghwjk1bbz8d2q2m42a0nbmp9vmq6wr3jdcanv5n5d5ffpyywfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnIpLCBQb3J0dWd1ZXNlIChwdCksIFVrcmFpbmlhbiAodWspLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbyksIEluZG9uZXNpYW4gKGlkKSwgQ2F0YWxhbiAoY2EpLCBOb3J3ZWdpYW4gQm9rbVx1MDBlNWwgKG5iKSAmIE55bm9yc2sgKG5pKSwgU3dlZGlzaCAoc3YpLCBBcmFiaWMgKGFyKSwgSHVuZ2FyaWFuIChodSkgYW5kIEphcGFuZXNlIChqYSkgLSBhIEhVR0UgdGhhbmtzIHRvIHRoZSB0cmFuc2xhdG9yc1xuXG5UaGlzIGV4dGVuc2lvbiB3YXMgZm9ya2VkIGZyb20gdGhlIE5BU0EgQVBPRCBleHRlbnNpb24gYnkgRWxpbnZlbnRpb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbikgYW5kIGluc3BpcmVkIGJ5IEJpbmcgRGVza3RvcCBXYWxscGFwZXIgQ2hhbmdlciBieSBVdGthcnNoIEd1cHRhIChodHRwczovL2dpdGh1Yi5jb20vVXRrYXJzaEdwdGEpLlxuXG5BbHdheXMgcmVzdGFydCBHTk9NRSBhZnRlciBtYW51YWxseSB1cGRhdGluZyBleHRlbnNpb25zLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gdGhlIEdpdEh1YiBwYWdlIGJlbG93OiIsCiAgImdldHRleHQtZG9tYWluIjogIkJpbmdXYWxscGFwZXIiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"},
+    "47": {"version": "50", "sha256": "05ghwjk1bbz8d2q2m42a0nbmp9vmq6wr3jdcanv5n5d5ffpyywfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnIpLCBQb3J0dWd1ZXNlIChwdCksIFVrcmFpbmlhbiAodWspLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbyksIEluZG9uZXNpYW4gKGlkKSwgQ2F0YWxhbiAoY2EpLCBOb3J3ZWdpYW4gQm9rbVx1MDBlNWwgKG5iKSAmIE55bm9yc2sgKG5pKSwgU3dlZGlzaCAoc3YpLCBBcmFiaWMgKGFyKSwgSHVuZ2FyaWFuIChodSkgYW5kIEphcGFuZXNlIChqYSkgLSBhIEhVR0UgdGhhbmtzIHRvIHRoZSB0cmFuc2xhdG9yc1xuXG5UaGlzIGV4dGVuc2lvbiB3YXMgZm9ya2VkIGZyb20gdGhlIE5BU0EgQVBPRCBleHRlbnNpb24gYnkgRWxpbnZlbnRpb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbikgYW5kIGluc3BpcmVkIGJ5IEJpbmcgRGVza3RvcCBXYWxscGFwZXIgQ2hhbmdlciBieSBVdGthcnNoIEd1cHRhIChodHRwczovL2dpdGh1Yi5jb20vVXRrYXJzaEdwdGEpLlxuXG5BbHdheXMgcmVzdGFydCBHTk9NRSBhZnRlciBtYW51YWxseSB1cGRhdGluZyBleHRlbnNpb25zLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gdGhlIEdpdEh1YiBwYWdlIGJlbG93OiIsCiAgImdldHRleHQtZG9tYWluIjogIkJpbmdXYWxscGFwZXIiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAaW5lZmZhYmxlLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}
   }}
 , {"uuid": "gnomesome@chwick.github.com", "name": "Gnomesome", "pname": "gnomesome", "description": "Tiling window manager with awesome keybindings", "link": "https://extensions.gnome.org/extension/1268/gnomesome/", "shell_version_map": {
     "38": {"version": "15", "sha256": "1dn67is3qk80xxfkc2pd43jrsyylmsprd7v3axvl677wdjgaq83z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGF3ZXNvbWUga2V5YmluZGluZ3MiLAogICJuYW1lIjogIkdub21lc29tZSIsCiAgInNldHRpbmdzLWtleWJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lc29tZS5rZXliaW5kaW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nod2ljay9nbm9tZXNvbWUiLAogICJ1dWlkIjogImdub21lc29tZUBjaHdpY2suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
@@ -1277,7 +1347,8 @@
     "43": {"version": "54", "sha256": "1964vai2d5jn0s9aa0nckdsq17mgirl57jznp5glhp4gpq5y970j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU0Cn0="},
     "44": {"version": "55", "sha256": "048ykk6mzvvdwi9kyppgcgl0dhv2pda9ify7m6fq2xkmkyxk39ka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU1Cn0="},
     "45": {"version": "56", "sha256": "1f24lagkn7wi250f5yq1s472asm845ad8njm3fgwjx2dgfv4bmhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU2Cn0="},
-    "46": {"version": "57", "sha256": "14y3zqrg06y1himnriwk09r3j0jlv0xh695gxxdpr379fnhzqzv2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU3Cn0="}
+    "46": {"version": "58", "sha256": "0y1fwgwa3v4dz0n5dhhx78pb24p076ligwz0xwy35b0vqbrjhr7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dTQ29ubmVjdC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZ3Njb25uZWN0L3dpa2kiLAogICJ1dWlkIjogImdzY29ubmVjdEBhbmR5aG9sbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1OAp9"},
+    "47": {"version": "58", "sha256": "0y1fwgwa3v4dz0n5dhhx78pb24p076ligwz0xwy35b0vqbrjhr7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dTQ29ubmVjdC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZ3Njb25uZWN0L3dpa2kiLAogICJ1dWlkIjogImdzY29ubmVjdEBhbmR5aG9sbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1OAp9"}
   }}
 , {"uuid": "nvidiautil@ethanwharris", "name": "NVIDIA GPU Stats Tool", "pname": "nvidia-gpu-stats-tool", "description": "Shows NVIDIA GPU stats in the toolbar. Requires nvidia-settings or nvidia-smi. Includes Bumblebee support.", "link": "https://extensions.gnome.org/extension/1320/nvidia-gpu-stats-tool/", "shell_version_map": {
     "38": {"version": "8", "sha256": "12yi2kcq2rm1ddb8djjlffvk6dhpfd996wjhwdf4jch1r85r8a30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5WSURJQSBHUFUgc3RhdHMgaW4gdGhlIHRvb2xiYXIuIFJlcXVpcmVzIG52aWRpYS1zZXR0aW5ncyBvciBudmlkaWEtc21pLiBJbmNsdWRlcyBCdW1ibGViZWUgc3VwcG9ydC4iLAogICJuYW1lIjogIk5WSURJQSBHUFUgU3RhdHMgVG9vbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udmlkaWF1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXRoYW53aGFycmlzL2dub21lLW52aWRpYS1leHRlbnNpb24iLAogICJ1dWlkIjogIm52aWRpYXV0aWxAZXRoYW53aGFycmlzIiwKICAidmVyc2lvbiI6IDgKfQ=="},
@@ -1316,8 +1387,9 @@
     "42": {"version": "31", "sha256": "00nayj91lmdl12s8g1lh785ywq2svmvlz4k79kb5jdl3p6ljx8j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAzMQp9"},
     "43": {"version": "31", "sha256": "00nayj91lmdl12s8g1lh785ywq2svmvlz4k79kb5jdl3p6ljx8j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAzMQp9"},
     "44": {"version": "31", "sha256": "00nayj91lmdl12s8g1lh785ywq2svmvlz4k79kb5jdl3p6ljx8j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAzMQp9"},
-    "45": {"version": "37", "sha256": "14j4m6w83a2jdvy6lg51z2f0bkb33hnswm23242i3d18klxlycnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DWi1OSUMvcnVuLW9yLXJhaXNlIiwKICAidXVpZCI6ICJydW4tb3ItcmFpc2VAZWR2YXJkLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="},
-    "46": {"version": "37", "sha256": "14j4m6w83a2jdvy6lg51z2f0bkb33hnswm23242i3d18klxlycnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DWi1OSUMvcnVuLW9yLXJhaXNlIiwKICAidXVpZCI6ICJydW4tb3ItcmFpc2VAZWR2YXJkLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="}
+    "45": {"version": "38", "sha256": "1k3y70jx35pnv2kmh2i7hg56crdyg6xaybd6pk681jlp8vm5rvcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "46": {"version": "38", "sha256": "1k3y70jx35pnv2kmh2i7hg56crdyg6xaybd6pk681jlp8vm5rvcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "47": {"version": "38", "sha256": "1k3y70jx35pnv2kmh2i7hg56crdyg6xaybd6pk681jlp8vm5rvcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAzOAp9"}
   }}
 , {"uuid": "show_applications_instead_of_overview@fawtytoo", "name": "Show Applications Instead Of Workspaces", "pname": "show-applications-instead-of-overview", "description": "The Overview will show Applications instead of Workspaces when invoked.", "link": "https://extensions.gnome.org/extension/1337/show-applications-instead-of-overview/", "shell_version_map": {
     "38": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -1335,8 +1407,11 @@
     "41": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
     "42": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}
   }}
-, {"uuid": "slinger@gfxmonk.net", "name": "slinger", "pname": "slinger", "description": "Sling windows around efficiently. See homepage for instructions.", "link": "https://extensions.gnome.org/extension/1372/slinger/", "shell_version_map": {
-    "40": {"version": "7", "sha256": "1hpzcslqln0yz4kv216z8qqq9639sh1awp6q8c33d7jp11ydwhlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW1iZXJ0c29uL3NsaW5nZXIiLAogICJ1dWlkIjogInNsaW5nZXJAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}
+, {"uuid": "slinger@gfxmonk.net", "name": "slinger", "pname": "slinger", "description": "Sling windows around efficiently", "link": "https://extensions.gnome.org/extension/1372/slinger/", "shell_version_map": {
+    "40": {"version": "7", "sha256": "1hpzcslqln0yz4kv216z8qqq9639sh1awp6q8c33d7jp11ydwhlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW1iZXJ0c29uL3NsaW5nZXIiLAogICJ1dWlkIjogInNsaW5nZXJAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"},
+    "45": {"version": "12", "sha256": "05fgajp87ibkayhziki94nw8j3lax6xn0m3wr6s59n5igylqpm88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RpbWJlcnRzb24vc2xpbmdlciIsCiAgInV1aWQiOiAic2xpbmdlckBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "46": {"version": "12", "sha256": "05fgajp87ibkayhziki94nw8j3lax6xn0m3wr6s59n5igylqpm88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RpbWJlcnRzb24vc2xpbmdlciIsCiAgInV1aWQiOiAic2xpbmdlckBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "47": {"version": "12", "sha256": "05fgajp87ibkayhziki94nw8j3lax6xn0m3wr6s59n5igylqpm88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RpbWJlcnRzb24vc2xpbmdlciIsCiAgInV1aWQiOiAic2xpbmdlckBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
 , {"uuid": "unix-timestamp-clock@se1exin.github.com", "name": "Unix Timestamp Clock", "pname": "unix-timestamp-clock", "description": "Show the current unix timestamp as a clock in the top bar.\n\nCopy-paste currently shown timestamp (left mouse button) or current timestamp (any other mouse button) to clipboard", "link": "https://extensions.gnome.org/extension/1375/unix-timestamp-clock/", "shell_version_map": {
     "38": {"version": "5", "sha256": "11awssml3n1kza1inny4j89bkmgpldzcglwa26pyr432i4la0jh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGN1cnJlbnQgdW5peCB0aW1lc3RhbXAgYXMgYSBjbG9jayBpbiB0aGUgdG9wIGJhci5cblxuQ29weS1wYXN0ZSBjdXJyZW50bHkgc2hvd24gdGltZXN0YW1wIChsZWZ0IG1vdXNlIGJ1dHRvbikgb3IgY3VycmVudCB0aW1lc3RhbXAgKGFueSBvdGhlciBtb3VzZSBidXR0b24pIHRvIGNsaXBib2FyZCIsCiAgIm5hbWUiOiAiVW5peCBUaW1lc3RhbXAgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZTFleGluL3VuaXgtdGltZXN0YW1wLWNsb2NrIiwKICAidXVpZCI6ICJ1bml4LXRpbWVzdGFtcC1jbG9ja0BzZTFleGluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -1376,8 +1451,9 @@
     "42": {"version": "34", "sha256": "0yv1igdh95s70jrqz3y6p0135a2yzzsjvqm2l2lg81qkfms6jk3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "43": {"version": "34", "sha256": "0yv1igdh95s70jrqz3y6p0135a2yzzsjvqm2l2lg81qkfms6jk3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "44": {"version": "37", "sha256": "0ydch21gzvndvbr7hlhps4l6gcncd6whdswf8rj23axl4q1smx4w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
-    "45": {"version": "50", "sha256": "1qmgpdbpign0x4rjnxxa874hdqwzi67ihqxppgmpqzck267h3jg2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBwYWlyZWQgQmx1ZXRvb3RoIGRldmljZXMgdG8gYmUgY29ubmVjdGVkIGFuZCBkaXNjb25uZWN0ZWQgdmlhIHRoZSBHTk9NRSBzeXN0ZW0gbWVudSwgU2hvd3MgYmF0dGVyeSBzdGF0dXMgYW5kIG1vcmUuXG4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkJsYW5rUGFydGljbGUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHRlbnNpb25zLVZhbGhhbGxhL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="},
-    "46": {"version": "50", "sha256": "1qmgpdbpign0x4rjnxxa874hdqwzi67ihqxppgmpqzck267h3jg2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBwYWlyZWQgQmx1ZXRvb3RoIGRldmljZXMgdG8gYmUgY29ubmVjdGVkIGFuZCBkaXNjb25uZWN0ZWQgdmlhIHRoZSBHTk9NRSBzeXN0ZW0gbWVudSwgU2hvd3MgYmF0dGVyeSBzdGF0dXMgYW5kIG1vcmUuXG4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkJsYW5rUGFydGljbGUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHRlbnNpb25zLVZhbGhhbGxhL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}
+    "45": {"version": "51", "sha256": "1803h95gnwjfyqq8fhpkkclgx1zbvx9p8d6pf6wfycs3662ywaj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBwYWlyZWQgQmx1ZXRvb3RoIGRldmljZXMgdG8gYmUgY29ubmVjdGVkIGFuZCBkaXNjb25uZWN0ZWQgdmlhIHRoZSBHTk9NRSBzeXN0ZW0gbWVudSwgU2hvd3MgYmF0dGVyeSBzdGF0dXMgYW5kIG1vcmUuXG4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkJsYW5rUGFydGljbGUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXh0ZW5zaW9ucy1WYWxoYWxsYS9nbm9tZS1ibHVldG9vdGgtcXVpY2stY29ubmVjdCIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3RAYmphcm9zemUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="},
+    "46": {"version": "51", "sha256": "1803h95gnwjfyqq8fhpkkclgx1zbvx9p8d6pf6wfycs3662ywaj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBwYWlyZWQgQmx1ZXRvb3RoIGRldmljZXMgdG8gYmUgY29ubmVjdGVkIGFuZCBkaXNjb25uZWN0ZWQgdmlhIHRoZSBHTk9NRSBzeXN0ZW0gbWVudSwgU2hvd3MgYmF0dGVyeSBzdGF0dXMgYW5kIG1vcmUuXG4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkJsYW5rUGFydGljbGUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXh0ZW5zaW9ucy1WYWxoYWxsYS9nbm9tZS1ibHVldG9vdGgtcXVpY2stY29ubmVjdCIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3RAYmphcm9zemUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="},
+    "47": {"version": "51", "sha256": "1803h95gnwjfyqq8fhpkkclgx1zbvx9p8d6pf6wfycs3662ywaj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBwYWlyZWQgQmx1ZXRvb3RoIGRldmljZXMgdG8gYmUgY29ubmVjdGVkIGFuZCBkaXNjb25uZWN0ZWQgdmlhIHRoZSBHTk9NRSBzeXN0ZW0gbWVudSwgU2hvd3MgYmF0dGVyeSBzdGF0dXMgYW5kIG1vcmUuXG4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkJsYW5rUGFydGljbGUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXh0ZW5zaW9ucy1WYWxoYWxsYS9nbm9tZS1ibHVldG9vdGgtcXVpY2stY29ubmVjdCIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3RAYmphcm9zemUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="}
   }}
 , {"uuid": "syspeek-gs@gs.eros2.info", "name": "SysPeek-GS", "pname": "syspeek-gs", "description": "Minimalistic CPU load monitor widget inspired by SysPeek indicator", "link": "https://extensions.gnome.org/extension/1409/syspeek-gs/", "shell_version_map": {
     "38": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
@@ -1386,8 +1462,9 @@
     "42": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "43": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "44": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "45": {"version": "15", "sha256": "1h97v8v19lwvc5xcmxyyikmrs8lz3kxhx55hh5wahdk8gi8yycbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
-    "46": {"version": "15", "sha256": "1h97v8v19lwvc5xcmxyyikmrs8lz3kxhx55hh5wahdk8gi8yycbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
+    "45": {"version": "16", "sha256": "1v0n8db520xnlamzczcki4518xkwzrbd854wfgmrpj1m4fx9ahk0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="},
+    "46": {"version": "16", "sha256": "1v0n8db520xnlamzczcki4518xkwzrbd854wfgmrpj1m4fx9ahk0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="},
+    "47": {"version": "16", "sha256": "1v0n8db520xnlamzczcki4518xkwzrbd854wfgmrpj1m4fx9ahk0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="}
   }}
 , {"uuid": "discrete-brightness@gs.eros2.info", "name": "Discrete brightness", "pname": "discrete-brightness", "description": "Discrete brightness indicator changes brightness in discrete steps, unlike default smooth brightness bar in Gnome Shell. Extension for notebooks/tablets only, default brightness bar must be present in Gnome Shell.", "link": "https://extensions.gnome.org/extension/1410/discrete-brightness/", "shell_version_map": {
     "38": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -1412,8 +1489,9 @@
     "42": {"version": "29", "sha256": "00b6r3gc9pkhkwwmvc2b3w27spa7sxijiz540s7g6amyb8gmwj6h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
     "43": {"version": "29", "sha256": "00b6r3gc9pkhkwwmvc2b3w27spa7sxijiz540s7g6amyb8gmwj6h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
     "44": {"version": "29", "sha256": "00b6r3gc9pkhkwwmvc2b3w27spa7sxijiz540s7g6amyb8gmwj6h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
-    "45": {"version": "31", "sha256": "0hs1zq6fng86zis7jqvnfsx9mai050r4xj5k2a4hqjzgxqhf33jg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAiZXh0ZW5zaW9uLWlkIjogInVuYmxhbmsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmJsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "46": {"version": "31", "sha256": "0hs1zq6fng86zis7jqvnfsx9mai050r4xj5k2a4hqjzgxqhf33jg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAiZXh0ZW5zaW9uLWlkIjogInVuYmxhbmsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmJsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}
+    "45": {"version": "32", "sha256": "1dxjfcjg1a0mvhl5r92zhhr8fgakzzh3a9ngravrmpj4h0mzb9b5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAiZXh0ZW5zaW9uLWlkIjogInVuYmxhbmsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmJsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmJsYW5rIiwKICAidXVpZCI6ICJ1bmJsYW5rQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="},
+    "46": {"version": "32", "sha256": "1dxjfcjg1a0mvhl5r92zhhr8fgakzzh3a9ngravrmpj4h0mzb9b5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAiZXh0ZW5zaW9uLWlkIjogInVuYmxhbmsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmJsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmJsYW5rIiwKICAidXVpZCI6ICJ1bmJsYW5rQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="},
+    "47": {"version": "32", "sha256": "1dxjfcjg1a0mvhl5r92zhhr8fgakzzh3a9ngravrmpj4h0mzb9b5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAiZXh0ZW5zaW9uLWlkIjogInVuYmxhbmsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmJsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmJsYW5rIiwKICAidXVpZCI6ICJ1bmJsYW5rQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}
   }}
 , {"uuid": "vbox-applet@gs.eros2.info", "name": "VirtualBox applet", "pname": "virtualbox-applet", "description": "Provide menu to run VirtualBox machines and switch between running VMs", "link": "https://extensions.gnome.org/extension/1415/virtualbox-applet/", "shell_version_map": {
     "38": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="},
@@ -1422,8 +1500,9 @@
     "42": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "43": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "44": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "45": {"version": "16", "sha256": "1cy0mdh6ba7sjv6bmmvz30wxrza8q2nvxpr00wsqbhqgq0i2x5n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="},
-    "46": {"version": "16", "sha256": "1cy0mdh6ba7sjv6bmmvz30wxrza8q2nvxpr00wsqbhqgq0i2x5n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="}
+    "45": {"version": "17", "sha256": "1fh1qj4abc4635w8bzcwr9yyz3ccd8hz2ly8qzvvffkpk5kqy167", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "46": {"version": "17", "sha256": "1fh1qj4abc4635w8bzcwr9yyz3ccd8hz2ly8qzvvffkpk5kqy167", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "47": {"version": "17", "sha256": "1fh1qj4abc4635w8bzcwr9yyz3ccd8hz2ly8qzvvffkpk5kqy167", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxNwp9"}
   }}
 , {"uuid": "stocks@infinicode.de", "name": "Stocks Extension", "pname": "stocks-extension", "description": "Stocks Extension brings stock quotes to your GNOME Shell Panel", "link": "https://extensions.gnome.org/extension/1422/stocks-extension/", "shell_version_map": {
     "38": {"version": "19", "sha256": "1414cksayqpv0w0q632yi33ifqlwyfggwf684aci6qj81fs644y2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b2NrcyBFeHRlbnNpb24gYnJpbmdzIHN0b2NrIHF1b3RlcyB0byB5b3VyIEdOT01FIFNoZWxsIFBhbmVsIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTdG9ja3MgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvc3RvY2tzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
@@ -1464,8 +1543,9 @@
     "42": {"version": "13", "sha256": "1iknj3xp78brp6mcfcpqc0a95xflpdili1rghh0j0cp21z1rc92f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "43": {"version": "13", "sha256": "1iknj3xp78brp6mcfcpqc0a95xflpdili1rghh0j0cp21z1rc92f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "44": {"version": "13", "sha256": "1iknj3xp78brp6mcfcpqc0a95xflpdili1rghh0j0cp21z1rc92f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "45": {"version": "17", "sha256": "0x8ff59wmr24r7472qm8zpf19nncx5gaxrfdzvk7m2ab57q42mn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "46": {"version": "17", "sha256": "0x8ff59wmr24r7472qm8zpf19nncx5gaxrfdzvk7m2ab57q42mn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}
+    "45": {"version": "18", "sha256": "1x7jw4xi4wq1wrf1nm9kh8v0562138swfkkrf5zlqvf21qhcjyz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
+    "46": {"version": "18", "sha256": "1x7jw4xi4wq1wrf1nm9kh8v0562138swfkkrf5zlqvf21qhcjyz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
+    "47": {"version": "18", "sha256": "1x7jw4xi4wq1wrf1nm9kh8v0562138swfkkrf5zlqvf21qhcjyz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}
   }}
 , {"uuid": "transparent-window@pbxqdown.github.com", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {
     "38": {"version": "13", "sha256": "18n67rgcw44d9bpam8fj018z5bznlsysh99lrcffnlq8mr6yjm0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjMuMzguNCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BieHFkb3duL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC13aW5kb3ciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvd0BwYnhxZG93bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
@@ -1491,17 +1571,19 @@
     "42": {"version": "61", "sha256": "137piq92wc23imcwqg5jyra1yfvj5xhm3iy7ls3djni76xkcfghf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="},
     "43": {"version": "61", "sha256": "137piq92wc23imcwqg5jyra1yfvj5xhm3iy7ls3djni76xkcfghf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="},
     "44": {"version": "61", "sha256": "137piq92wc23imcwqg5jyra1yfvj5xhm3iy7ls3djni76xkcfghf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="},
-    "45": {"version": "68", "sha256": "0b4abfrgndb4qmbgngxc5608wyc2blhnx85p0g8a8pb4bbfgrv0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJjb3JlY29kaW5nIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZpdGFscyIsCiAgIm5hbWUiOiAiVml0YWxzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZpdGFscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"},
-    "46": {"version": "68", "sha256": "0b4abfrgndb4qmbgngxc5608wyc2blhnx85p0g8a8pb4bbfgrv0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJjb3JlY29kaW5nIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZpdGFscyIsCiAgIm5hbWUiOiAiVml0YWxzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZpdGFscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"}
+    "45": {"version": "69", "sha256": "1lr252zmyy51hsicdvv15dln93zrsgnvl38pl4jzg2w4p5y9dl9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJjb3JlY29kaW5nIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZpdGFscyIsCiAgIm5hbWUiOiAiVml0YWxzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZpdGFscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="},
+    "46": {"version": "69", "sha256": "1lr252zmyy51hsicdvv15dln93zrsgnvl38pl4jzg2w4p5y9dl9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJjb3JlY29kaW5nIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZpdGFscyIsCiAgIm5hbWUiOiAiVml0YWxzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZpdGFscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="},
+    "47": {"version": "69", "sha256": "1lr252zmyy51hsicdvv15dln93zrsgnvl38pl4jzg2w4p5y9dl9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJjb3JlY29kaW5nIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZpdGFscyIsCiAgIm5hbWUiOiAiVml0YWxzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZpdGFscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="}
   }}
-, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {
+, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel. Follow extension homepage link to changing format instruction.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {
     "40": {"version": "11", "sha256": "1l6kaq9lpxyyj81iqqxwdpa4mwdsndx744zmgr69vklz4lkyznj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "41": {"version": "11", "sha256": "1l6kaq9lpxyyj81iqqxwdpa4mwdsndx744zmgr69vklz4lkyznj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "42": {"version": "11", "sha256": "1l6kaq9lpxyyj81iqqxwdpa4mwdsndx744zmgr69vklz4lkyznj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "43": {"version": "11", "sha256": "1l6kaq9lpxyyj81iqqxwdpa4mwdsndx744zmgr69vklz4lkyznj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "44": {"version": "11", "sha256": "1l6kaq9lpxyyj81iqqxwdpa4mwdsndx744zmgr69vklz4lkyznj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "45": {"version": "13", "sha256": "0b65dsimr97x8vgsvn5gsplfxipxq6ghc7cyrfkdpyk1xa84pjp3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "46": {"version": "13", "sha256": "0b65dsimr97x8vgsvn5gsplfxipxq6ghc7cyrfkdpyk1xa84pjp3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}
+    "45": {"version": "14", "sha256": "0xsn8lf32jm0szvi731rks5xrvjfkr8hxg631ha9rmkbzjqcbswi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "46": {"version": "14", "sha256": "0xsn8lf32jm0szvi731rks5xrvjfkr8hxg631ha9rmkbzjqcbswi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "47": {"version": "14", "sha256": "0xsn8lf32jm0szvi731rks5xrvjfkr8hxg631ha9rmkbzjqcbswi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
   }}
 , {"uuid": "desktop-icons@csoriano", "name": "Desktop Icons", "pname": "desktop-icons", "description": "Add icons to the desktop", "link": "https://extensions.gnome.org/extension/1465/desktop-icons/", "shell_version_map": {
     "38": {"version": "19", "sha256": "01qdh1kigl3ck1mzgha1a9218lpam5b54ai72mpvr64gkaax2mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBpY29ucyB0byB0aGUgZGVza3RvcCIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvV29ybGQvU2hlbGxFeHRlbnNpb25zL2Rlc2t0b3AtaWNvbnMiLAogICJ1dWlkIjogImRlc2t0b3AtaWNvbnNAY3Nvcmlhbm8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}
@@ -1517,8 +1599,9 @@
     "42": {"version": "19", "sha256": "19jmxb7lhnwzssr7zcp4hrlwawcxsbz6ckabrsv4cppyal54j6dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "43": {"version": "19", "sha256": "19jmxb7lhnwzssr7zcp4hrlwawcxsbz6ckabrsv4cppyal54j6dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "44": {"version": "19", "sha256": "19jmxb7lhnwzssr7zcp4hrlwawcxsbz6ckabrsv4cppyal54j6dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="},
-    "45": {"version": "24", "sha256": "0r5aqs29920jnxb7sgqqlh4mrfhry6sllp2ya5gsydn2710jfxpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="},
-    "46": {"version": "24", "sha256": "0r5aqs29920jnxb7sgqqlh4mrfhry6sllp2ya5gsydn2710jfxpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}
+    "45": {"version": "25", "sha256": "148apis5a171l8xvici2g5li8w50dryn755vh3zsz0h42b3isarr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "46": {"version": "25", "sha256": "148apis5a171l8xvici2g5li8w50dryn755vh3zsz0h42b3isarr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "148apis5a171l8xvici2g5li8w50dryn755vh3zsz0h42b3isarr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "tint-all@amarovita.github.com", "name": "Tint All", "pname": "tint-all", "description": "Colorize the entire gnome workspace. Amber, green, cyan, sepia and grayscale - just keep clicking extension icon. Scroll over extension icon to change fx level.", "link": "https://extensions.gnome.org/extension/1471/tint-all/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
@@ -1542,7 +1625,8 @@
     "43": {"version": "28", "sha256": "1iag2yy73ixz4al1ml8kfhf1hwy4lw3y0b5ngyy5w73hv5janivp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5sb2NrRGlhbG9nQmFja2dyb3VuZCIsCiAgInV1aWQiOiAidW5sb2NrRGlhbG9nQmFja2dyb3VuZEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"},
     "44": {"version": "28", "sha256": "1iag2yy73ixz4al1ml8kfhf1hwy4lw3y0b5ngyy5w73hv5janivp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5sb2NrRGlhbG9nQmFja2dyb3VuZCIsCiAgInV1aWQiOiAidW5sb2NrRGlhbG9nQmFja2dyb3VuZEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"},
     "45": {"version": "34", "sha256": "0f0azv8scjhrj3pgpancgdmj3wz5b7p6aq562a1nz0b4bw6bwzv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1bmxvY2tEaWFsb2ctQmFja2dyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkxvY2sgc2NyZWVuIGJhY2tncm91bmQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5sb2NrRGlhbG9nQmFja2dyb3VuZCIsCiAgInV1aWQiOiAidW5sb2NrRGlhbG9nQmFja2dyb3VuZEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"},
-    "46": {"version": "35", "sha256": "0fwj1y12zgcp954ifaa1alzpylnqlgzkbgdg5hkia8k4bx6i8xdr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1bmxvY2tEaWFsb2ctQmFja2dyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkxvY2sgc2NyZWVuIGJhY2tncm91bmQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5sb2NrRGlhbG9nQmFja2dyb3VuZCIsCiAgInV1aWQiOiAidW5sb2NrRGlhbG9nQmFja2dyb3VuZEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}
+    "46": {"version": "35", "sha256": "0fwj1y12zgcp954ifaa1alzpylnqlgzkbgdg5hkia8k4bx6i8xdr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1bmxvY2tEaWFsb2ctQmFja2dyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkxvY2sgc2NyZWVuIGJhY2tncm91bmQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5sb2NrRGlhbG9nQmFja2dyb3VuZCIsCiAgInV1aWQiOiAidW5sb2NrRGlhbG9nQmFja2dyb3VuZEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"},
+    "47": {"version": "37", "sha256": "1l6v1hgvld67sv9wb0rchq4qcxq3pa84s4van6ssxnxhy4yq2p9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1bmxvY2tEaWFsb2ctQmFja2dyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkxvY2sgc2NyZWVuIGJhY2tncm91bmQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5sb2NrRGlhbG9nQmFja2dyb3VuZCIsCiAgInV1aWQiOiAidW5sb2NrRGlhbG9nQmFja2dyb3VuZEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}
   }}
 , {"uuid": "wsmatrix@martin.zurowietz.de", "name": "Workspace Matrix", "pname": "workspace-matrix", "description": "Arrange workspaces in a two dimensional grid with workspace thumbnails.\n\nIf you appreciate this extension please consider to donate $1.", "link": "https://extensions.gnome.org/extension/1485/workspace-matrix/", "shell_version_map": {
     "38": {"version": "27", "sha256": "1ll51pnpx29vckdhz739i6gnfababi2xdbhfv1hm5xhd1jrqc1kz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLXdzbWF0cml4IiwKICAidXVpZCI6ICJ3c21hdHJpeEBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDI3Cn0="},
@@ -1552,7 +1636,8 @@
     "43": {"version": "38", "sha256": "04fdwjpc9x9zql2ziiapg5j57z3iqv3hghg9azfzvwfh2l8kp7dx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
     "44": {"version": "40", "sha256": "1cmy7y5v36n5jm5xhccwg2n7j7z6jkx1zx1a12hq1hpmmmgn3qdi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
     "45": {"version": "43", "sha256": "029vizybxq1ivk1pkaiyq6haxdp6g1yzs4rv5hbn31v4aflyl3gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDMKfQ=="},
-    "46": {"version": "44", "sha256": "02da4kalr53vwj48k3w2gfhpk7x5jcfj2n69j5fxi3821ypqgqfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}
+    "46": {"version": "44", "sha256": "02da4kalr53vwj48k3w2gfhpk7x5jcfj2n69j5fxi3821ypqgqfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDQKfQ=="},
+    "47": {"version": "45", "sha256": "1s7zpl4p0gcnxcvkj5asxkyimzm3mspjzjsl9lzm8ihsdj0hma79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDUKfQ=="}
   }}
 , {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Sync all extensions and their configurations across all gnome instances", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {
     "38": {"version": "12", "sha256": "0yb0brjnqvvlqpdyh841qwh3q2d02vi1an0s93gb2b6kagy1g7zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="},
@@ -1568,8 +1653,9 @@
     "42": {"version": "33", "sha256": "1pywy1sn2szb01s4f9kq69kyxnmnbffz3hiwmcmfr1g4l2sx7sns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzMwp9"},
     "43": {"version": "33", "sha256": "1pywy1sn2szb01s4f9kq69kyxnmnbffz3hiwmcmfr1g4l2sx7sns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzMwp9"},
     "44": {"version": "33", "sha256": "1pywy1sn2szb01s4f9kq69kyxnmnbffz3hiwmcmfr1g4l2sx7sns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzMwp9"},
-    "45": {"version": "34", "sha256": "1y9nyiaqi4vrsm7y6xz4w5xcjc695npkwla6wq6l6r1xcsrpz3ja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNAp9"},
-    "46": {"version": "34", "sha256": "1y9nyiaqi4vrsm7y6xz4w5xcjc695npkwla6wq6l6r1xcsrpz3ja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNAp9"}
+    "45": {"version": "36", "sha256": "04yl317xvzhg75k327hkac0i7q6ixiyp78sx6n7ngw1fsg78cwgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNgp9"},
+    "46": {"version": "36", "sha256": "04yl317xvzhg75k327hkac0i7q6ixiyp78sx6n7ngw1fsg78cwgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNgp9"},
+    "47": {"version": "36", "sha256": "04yl317xvzhg75k327hkac0i7q6ixiyp78sx6n7ngw1fsg78cwgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNgp9"}
   }}
 , {"uuid": "fullscreenworkspace@satran.in", "name": "Fullscreen On New Workspace", "pname": "fullscreen-on-new-workspace", "description": "Move window to a new workspace when you maximize or make it fullscreen.", "link": "https://extensions.gnome.org/extension/1502/fullscreen-on-new-workspace/", "shell_version_map": {
     "38": {"version": "8", "sha256": "0csx7mqgbjjvf3cwk492bk9b92l2270qw2c2badckwsyl6qwahj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYXRyYW4vZnVsbHNjcmVlbndvcmtzcGFjZS1zYXRyYW4uaW4iLAogICJ1dWlkIjogImZ1bGxzY3JlZW53b3Jrc3BhY2VAc2F0cmFuLmluIiwKICAidmVyc2lvbiI6IDgKfQ=="},
@@ -1586,10 +1672,13 @@
     "40": {"version": "33", "sha256": "1kqmlf9yqz4d76q21ky09x4xqbyyd462wzg7ar83v1b3vr2a3c9x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQW4gaWNvbiBiZXNpZGUgdGhlIGRhdGUgaW4gdGhlIHRvcGJhciB0byBzaG93IGlmIHRoZXJlIGFyZSB1bnJlYWQgZW1haWxzIHdoZW4gcnVubmluZyB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50LlxuXG4gSXQgY2hlY2tzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBtZXNzYWdlIHRyYXkgcmVsYXRlZCB0byBhIG5ldyBtYWlsLCBubyBleHRyYSBjb25maWd1cmF0aW9uIG5lZWRlZCwgdmVyeSBsaWdodCBleHRlbnNpb24uIENsaWNrIG9uIHRoZSBpY29uIGRvZXMgdG9nZ2xlIHlvdXIgZW1haWwgY2xpZW50IHdpbmRvdy4qKiogRG8gbm90IGRpc2FibGUgdGhlIG5vdGlmaWNhdGlvbnMgb2YgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudCEgKioqIEl0IGlzIG5vdCBhIHN0YW5kYWxvbmUgbWFpbCBjaGVja2VyLCB5b3UgbmVlZCB5b3VyIGVtYWlsIGNsaWVudCB0byBiZSBydW5uaW5nLiAqKiogUGxlYXNlIGNoZWNrIHRoYXQgdGhlIHhkZy11dGlscyBwYWNrYWdlIGlzIGluc3RhbGxlZC5cblxuIEVtYWlsIGNsaWVudHMgdmVyaWZpZWQgYXQgdGhlIG1vbWVudCBhcmU6IFRodW5kZXJiaXJkLCBFdm9sdXRpb24sIEdlYXJ5LCBNYWlsc3ByaW5nLiBQbGVhc2UgYXNrIHRvIGFkZCB0aGUgY2xpZW50LCBpbmNsdWRpbmcgc3BlY2lhbCBwYWNrYWdpbmcgKHNuYXAvZmxhdHBhayksIHRoYXQgeW91IG5lZWQuIElmIHlvdSByZXBvcnQgYW4gZXJyb3IsIHBsZWFzZSBwcm92aWRlIGF0IGxlYXN0IHRoZSBkaXN0cmlidXRpb24gYW5kIHRoZSBlbWFpbCBjbGllbnQgeW91IHVzZSB0aHJvdWdoIHRoZSBHaXRIdWIgbGluay5cblxuIEZvciBwZXJzaXN0ZW50IG5vdGlmaWNhdGlvbnMgb25seSwgc2VlOiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zOTUxL3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyAuIiwKICAibmFtZSI6ICJOZXcgTWFpbCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvbmV3LW1haWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJuZXctbWFpbC1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiAzMwp9"},
     "41": {"version": "33", "sha256": "1kqmlf9yqz4d76q21ky09x4xqbyyd462wzg7ar83v1b3vr2a3c9x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQW4gaWNvbiBiZXNpZGUgdGhlIGRhdGUgaW4gdGhlIHRvcGJhciB0byBzaG93IGlmIHRoZXJlIGFyZSB1bnJlYWQgZW1haWxzIHdoZW4gcnVubmluZyB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50LlxuXG4gSXQgY2hlY2tzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBtZXNzYWdlIHRyYXkgcmVsYXRlZCB0byBhIG5ldyBtYWlsLCBubyBleHRyYSBjb25maWd1cmF0aW9uIG5lZWRlZCwgdmVyeSBsaWdodCBleHRlbnNpb24uIENsaWNrIG9uIHRoZSBpY29uIGRvZXMgdG9nZ2xlIHlvdXIgZW1haWwgY2xpZW50IHdpbmRvdy4qKiogRG8gbm90IGRpc2FibGUgdGhlIG5vdGlmaWNhdGlvbnMgb2YgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudCEgKioqIEl0IGlzIG5vdCBhIHN0YW5kYWxvbmUgbWFpbCBjaGVja2VyLCB5b3UgbmVlZCB5b3VyIGVtYWlsIGNsaWVudCB0byBiZSBydW5uaW5nLiAqKiogUGxlYXNlIGNoZWNrIHRoYXQgdGhlIHhkZy11dGlscyBwYWNrYWdlIGlzIGluc3RhbGxlZC5cblxuIEVtYWlsIGNsaWVudHMgdmVyaWZpZWQgYXQgdGhlIG1vbWVudCBhcmU6IFRodW5kZXJiaXJkLCBFdm9sdXRpb24sIEdlYXJ5LCBNYWlsc3ByaW5nLiBQbGVhc2UgYXNrIHRvIGFkZCB0aGUgY2xpZW50LCBpbmNsdWRpbmcgc3BlY2lhbCBwYWNrYWdpbmcgKHNuYXAvZmxhdHBhayksIHRoYXQgeW91IG5lZWQuIElmIHlvdSByZXBvcnQgYW4gZXJyb3IsIHBsZWFzZSBwcm92aWRlIGF0IGxlYXN0IHRoZSBkaXN0cmlidXRpb24gYW5kIHRoZSBlbWFpbCBjbGllbnQgeW91IHVzZSB0aHJvdWdoIHRoZSBHaXRIdWIgbGluay5cblxuIEZvciBwZXJzaXN0ZW50IG5vdGlmaWNhdGlvbnMgb25seSwgc2VlOiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zOTUxL3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyAuIiwKICAibmFtZSI6ICJOZXcgTWFpbCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvbmV3LW1haWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJuZXctbWFpbC1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiAzMwp9"},
     "45": {"version": "39", "sha256": "1zjzrs3fasm5rylq4x1w3gzl86hyqknaapm1vs4wa0k0k3xir75i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBtYWlsIGluZGljYXRvci5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCBjb21pbmcgZnJvbSB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50LCBubyBleHRyYSBjb25maWd1cmF0aW9uIG5lZWRlZCwgdmVyeSBsaWdodCBleHRlbnNpb24uIENsaWNrIG9uIHRoZSBpY29uIGRvZXMgdG9nZ2xlIHlvdXIgZW1haWwgY2xpZW50IHdpbmRvdy5cblxuICoqKiBEbyBub3QgZGlzYWJsZSB0aGUgbm90aWZpY2F0aW9ucyBvZiB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50IVxuXG4gKioqIEl0IGlzIG5vdCBhIHN0YW5kYWxvbmUgbWFpbCBjaGVja2VyLCB5b3UgbmVlZCB5b3VyIGVtYWlsIGNsaWVudCB0byBiZSBydW5uaW5nLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
-    "46": {"version": "39", "sha256": "1zjzrs3fasm5rylq4x1w3gzl86hyqknaapm1vs4wa0k0k3xir75i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBtYWlsIGluZGljYXRvci5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCBjb21pbmcgZnJvbSB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50LCBubyBleHRyYSBjb25maWd1cmF0aW9uIG5lZWRlZCwgdmVyeSBsaWdodCBleHRlbnNpb24uIENsaWNrIG9uIHRoZSBpY29uIGRvZXMgdG9nZ2xlIHlvdXIgZW1haWwgY2xpZW50IHdpbmRvdy5cblxuICoqKiBEbyBub3QgZGlzYWJsZSB0aGUgbm90aWZpY2F0aW9ucyBvZiB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50IVxuXG4gKioqIEl0IGlzIG5vdCBhIHN0YW5kYWxvbmUgbWFpbCBjaGVja2VyLCB5b3UgbmVlZCB5b3VyIGVtYWlsIGNsaWVudCB0byBiZSBydW5uaW5nLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}
+    "46": {"version": "40", "sha256": "0k7xcw3vq9q7p3d50gz0cdsbjqnxxv4kq76fjrbvvrv34n32nmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBtYWlsIGluZGljYXRvci5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCBjb21pbmcgZnJvbSB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50LCBubyBleHRyYSBjb25maWd1cmF0aW9uIG5lZWRlZCwgdmVyeSBsaWdodCBleHRlbnNpb24uIENsaWNrIG9uIHRoZSBpY29uIGRvZXMgdG9nZ2xlIHlvdXIgZW1haWwgY2xpZW50IHdpbmRvdy5cblxuICoqKiBEbyBub3QgZGlzYWJsZSB0aGUgbm90aWZpY2F0aW9ucyBvZiB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50IVxuXG4gKioqIEl0IGlzIG5vdCBhIHN0YW5kYWxvbmUgbWFpbCBjaGVja2VyLCB5b3UgbmVlZCB5b3VyIGVtYWlsIGNsaWVudCB0byBiZSBydW5uaW5nLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
+    "47": {"version": "40", "sha256": "0k7xcw3vq9q7p3d50gz0cdsbjqnxxv4kq76fjrbvvrv34n32nmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBtYWlsIGluZGljYXRvci5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCBjb21pbmcgZnJvbSB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50LCBubyBleHRyYSBjb25maWd1cmF0aW9uIG5lZWRlZCwgdmVyeSBsaWdodCBleHRlbnNpb24uIENsaWNrIG9uIHRoZSBpY29uIGRvZXMgdG9nZ2xlIHlvdXIgZW1haWwgY2xpZW50IHdpbmRvdy5cblxuICoqKiBEbyBub3QgZGlzYWJsZSB0aGUgbm90aWZpY2F0aW9ucyBvZiB5b3VyIGRlZmF1bHQgZW1haWwgY2xpZW50IVxuXG4gKioqIEl0IGlzIG5vdCBhIHN0YW5kYWxvbmUgbWFpbCBjaGVja2VyLCB5b3UgbmVlZCB5b3VyIGVtYWlsIGNsaWVudCB0byBiZSBydW5uaW5nLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogNDAKfQ=="}
   }}
 , {"uuid": "tandem-raise@tomdryer.com", "name": "Tandem Raise", "pname": "tandem-raise", "description": "Raise pairs of tiled windows in tandem.", "link": "https://extensions.gnome.org/extension/1506/tandem-raise/", "shell_version_map": {
-    "42": {"version": "5", "sha256": "0v82zypsh7qc3yv6fmqx9a2568q014papax4yrs9f92nqljzj7a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJhaXNlIHBhaXJzIG9mIHRpbGVkIHdpbmRvd3MgaW4gdGFuZGVtLiIsCiAgIm5hbWUiOiAiVGFuZGVtIFJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM2IiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Rkcnllci90YW5kZW0tcmFpc2UiLAogICJ1dWlkIjogInRhbmRlbS1yYWlzZUB0b21kcnllci5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}
+    "42": {"version": "5", "sha256": "0v82zypsh7qc3yv6fmqx9a2568q014papax4yrs9f92nqljzj7a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJhaXNlIHBhaXJzIG9mIHRpbGVkIHdpbmRvd3MgaW4gdGFuZGVtLiIsCiAgIm5hbWUiOiAiVGFuZGVtIFJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM2IiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Rkcnllci90YW5kZW0tcmFpc2UiLAogICJ1dWlkIjogInRhbmRlbS1yYWlzZUB0b21kcnllci5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "7", "sha256": "1ln2ly84lji9v9j5prby1898wcysaf8a27c6lrwz2amrda6mxbi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJhaXNlIHBhaXJzIG9mIHRpbGVkIHdpbmRvd3MgaW4gdGFuZGVtLiIsCiAgIm5hbWUiOiAiVGFuZGVtIFJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90ZHJ5ZXIvdGFuZGVtLXJhaXNlIiwKICAidXVpZCI6ICJ0YW5kZW0tcmFpc2VAdG9tZHJ5ZXIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "7", "sha256": "1ln2ly84lji9v9j5prby1898wcysaf8a27c6lrwz2amrda6mxbi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJhaXNlIHBhaXJzIG9mIHRpbGVkIHdpbmRvd3MgaW4gdGFuZGVtLiIsCiAgIm5hbWUiOiAiVGFuZGVtIFJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90ZHJ5ZXIvdGFuZGVtLXJhaXNlIiwKICAidXVpZCI6ICJ0YW5kZW0tcmFpc2VAdG9tZHJ5ZXIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "drop-down-terminal-x@bigbn.pro", "name": "Drop Down Terminal X", "pname": "drop-down-terminal-x", "description": "THIS EXTENSION IS NO LONGER SUPPORTED.\n\nIf you are looking for an alternative please look at that https://extensions.gnome.org/extension/3780/ddterm \nawesome extension.\n\nA GNOME Shell drop down terminal with extra feautures.\n \nSpecial thanks to:\n- Osman Alperen Elhan (https://github.com/oae)\n- Balder Claassen (https://github.com/balderclaassen)\n- Adrien Pyke (https://github.com/kufii)\n- Alan J Carvajal (https://github.com/ajcarvajal)\n- Massimo Mund (https://github.com/masmu)\n- Jakub Żywiec (https://github.com/jakubzet)\n- Mattias Eriksson (https://github.com/snaggen)\n- Henry78 (https://github.com/Henry78)\n- Maxim Toropov (https://github.com/MaxMaxoff)\nfor active contribution.\n\nBased on original extension \"gs-extensions-drop-down-terminal\" from Stéphane Démurget (https://github.com/zzrough)", "link": "https://extensions.gnome.org/extension/1509/drop-down-terminal-x/", "shell_version_map": {
     "38": {"version": "17", "sha256": "1k90g6bndw1xr56k7lwlxyw89aqbl47spkfmj1lq224z83w6hzdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRISVMgRVhURU5TSU9OIElTIE5PIExPTkdFUiBTVVBQT1JURUQuXG5cbklmIHlvdSBhcmUgbG9va2luZyBmb3IgYW4gYWx0ZXJuYXRpdmUgcGxlYXNlIGxvb2sgYXQgdGhhdCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zNzgwL2RkdGVybSBcbmF3ZXNvbWUgZXh0ZW5zaW9uLlxuXG5BIEdOT01FIFNoZWxsIGRyb3AgZG93biB0ZXJtaW5hbCB3aXRoIGV4dHJhIGZlYXV0dXJlcy5cbiBcblNwZWNpYWwgdGhhbmtzIHRvOlxuLSBPc21hbiBBbHBlcmVuIEVsaGFuIChodHRwczovL2dpdGh1Yi5jb20vb2FlKVxuLSBCYWxkZXIgQ2xhYXNzZW4gKGh0dHBzOi8vZ2l0aHViLmNvbS9iYWxkZXJjbGFhc3Nlbilcbi0gQWRyaWVuIFB5a2UgKGh0dHBzOi8vZ2l0aHViLmNvbS9rdWZpaSlcbi0gQWxhbiBKIENhcnZhamFsIChodHRwczovL2dpdGh1Yi5jb20vYWpjYXJ2YWphbClcbi0gTWFzc2ltbyBNdW5kIChodHRwczovL2dpdGh1Yi5jb20vbWFzbXUpXG4tIEpha3ViIFx1MDE3Ynl3aWVjIChodHRwczovL2dpdGh1Yi5jb20vamFrdWJ6ZXQpXG4tIE1hdHRpYXMgRXJpa3Nzb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9zbmFnZ2VuKVxuLSBIZW5yeTc4IChodHRwczovL2dpdGh1Yi5jb20vSGVucnk3OClcbi0gTWF4aW0gVG9yb3BvdiAoaHR0cHM6Ly9naXRodWIuY29tL01heE1heG9mZilcbmZvciBhY3RpdmUgY29udHJpYnV0aW9uLlxuXG5CYXNlZCBvbiBvcmlnaW5hbCBleHRlbnNpb24gXCJncy1leHRlbnNpb25zLWRyb3AtZG93bi10ZXJtaW5hbFwiIGZyb20gU3RcdTAwZTlwaGFuZSBEXHUwMGU5bXVyZ2V0IChodHRwczovL2dpdGh1Yi5jb20venpyb3VnaCkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcm9wLWRvd24tdGVybWluYWwteCIsCiAgImlkIjogImRyb3AtZG93bi10ZXJtaW5hbC14IiwKICAibmFtZSI6ICJEcm9wIERvd24gVGVybWluYWwgWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4wIiwKICAgICIzLjI4LjEiLAogICAgIjMuMjguMiIsCiAgICAiMy4zMC4wIiwKICAgICIzLjMwLjEiLAogICAgIjMuMzAuMiIsCiAgICAiMy4zMi4wIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNC4wIiwKICAgICIzLjM0LjQiLAogICAgIjMuMzYuMCIsCiAgICAiMy4zNi4xIiwKICAgICIzLjM2LjIiLAogICAgIjMuMzguMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpZ2JuL2dzLWV4dGVuc2lvbnMtZHJvcC1kb3duLXRlcm1pbmFsIiwKICAidXVpZCI6ICJkcm9wLWRvd24tdGVybWluYWwteEBiaWdibi5wcm8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}
@@ -1608,8 +1697,9 @@
     "42": {"version": "10", "sha256": "0916v0xrfzq9zpsqy6r2z3gly4cvfmrcdjjlmb8qcp44q61hxqx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "43": {"version": "10", "sha256": "0916v0xrfzq9zpsqy6r2z3gly4cvfmrcdjjlmb8qcp44q61hxqx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "44": {"version": "10", "sha256": "0916v0xrfzq9zpsqy6r2z3gly4cvfmrcdjjlmb8qcp44q61hxqx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "45": {"version": "13", "sha256": "01aphkw696xzcaimng2j3zawss6h7dijryipkxj8zr0df0yq61m2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "46": {"version": "13", "sha256": "01aphkw696xzcaimng2j3zawss6h7dijryipkxj8zr0df0yq61m2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiAxMwp9"}
+    "45": {"version": "14", "sha256": "1zl324a7idrkf80mrhcdkzhnxmp3i24bhv50nnxi1y93bc9qxnir", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "46": {"version": "14", "sha256": "1zl324a7idrkf80mrhcdkzhnxmp3i24bhv50nnxi1y93bc9qxnir", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "47": {"version": "14", "sha256": "1zl324a7idrkf80mrhcdkzhnxmp3i24bhv50nnxi1y93bc9qxnir", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
   }}
 , {"uuid": "scrovol@andyholmes.github.io", "name": "Scrovol", "pname": "scrovol", "description": "Change the volume by scrolling anywhere on the System Tray.\n\nWith this extension, you can scroll over Night Light, WiFi, Volume, Battery or any other icon in the system status tray to change the volume, instead of just the Volume icon.", "link": "https://extensions.gnome.org/extension/1519/scrovol/", "shell_version_map": {
     "40": {"version": "4", "sha256": "1md52ygz481nvhq00bkq2ymby7f647cfvw4wx1wqkwp7b796d59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgdm9sdW1lIGJ5IHNjcm9sbGluZyBhbnl3aGVyZSBvbiB0aGUgU3lzdGVtIFRyYXkuXG5cbldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gc2Nyb2xsIG92ZXIgTmlnaHQgTGlnaHQsIFdpRmksIFZvbHVtZSwgQmF0dGVyeSBvciBhbnkgb3RoZXIgaWNvbiBpbiB0aGUgc3lzdGVtIHN0YXR1cyB0cmF5IHRvIGNoYW5nZSB0aGUgdm9sdW1lLCBpbnN0ZWFkIG9mIGp1c3QgdGhlIFZvbHVtZSBpY29uLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3Jvdm9sIiwKICAibmFtZSI6ICJTY3Jvdm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keWhvbG1lcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2Nyb3ZvbC8iLAogICJ1dWlkIjogInNjcm92b2xAYW5keWhvbG1lcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}
@@ -1638,7 +1728,8 @@
     "43": {"version": "12", "sha256": "1qdyyrlgj3zgby95i2hvycgb3b2rfz29z9qbi3mccwqvz5r4in1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWZ1bGxzY3JlZW4taG90LWNvcm5lciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ob3QtY29ybmVyQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "1qdyyrlgj3zgby95i2hvycgb3b2rfz29z9qbi3mccwqvz5r4in1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWZ1bGxzY3JlZW4taG90LWNvcm5lciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ob3QtY29ybmVyQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "45": {"version": "14", "sha256": "1pzrcqw79ldm5p0w0r86nc3apl5dcmx49zbjw0hpicpc6gzgyxq1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
-    "46": {"version": "14", "sha256": "1pzrcqw79ldm5p0w0r86nc3apl5dcmx49zbjw0hpicpc6gzgyxq1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
+    "46": {"version": "14", "sha256": "1pzrcqw79ldm5p0w0r86nc3apl5dcmx49zbjw0hpicpc6gzgyxq1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "47": {"version": "15", "sha256": "1va9zssvc8jz0i6ywjwizgcy9ch1cy5bbhxbrqxa6mhx6dvfyy0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWZ1bGxzY3JlZW4taG90LWNvcm5lciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ob3QtY29ybmVyQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAxNQp9"}
   }}
 , {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Choose a different background image for each workspace\n* Your dash will have unique favourite applications on each workspace\n* Optionally isolate running applications to only appear on the dash in their respective workspace\n* Optionally show workspace information and actions in the overview\n* Set each customised workspace to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nPlease do not leave a comment for issues and instead report it here: https://github.com/blipk/Customised-Workspaces/issues", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {
     "38": {"version": "30", "sha256": "1z1yy47x20vqmjgghn91zs9nfs2g6f57nv4rzyi47bnklw7zsdcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhZG1pbkBrcm9ub3NvdWwueHl6IiwKICAicmVzb3VyY2UtcGF0aCI6ICIvb3JnL2tyb25vc291bC93b3Jrc2V0cy8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy93b3Jrc2V0cy8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
@@ -1648,7 +1739,7 @@
     "43": {"version": "60", "sha256": "1f79yi0g8pdnxpbfq098xi52shg5qn1s8gy5yi83i38brz3dv4bp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
     "44": {"version": "60", "sha256": "1f79yi0g8pdnxpbfq098xi52shg5qn1s8gy5yi83i38brz3dv4bp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
     "45": {"version": "66", "sha256": "10dbblq7x9fwmxk66m9bv3g79nr78jv5by21nkaiph4xwj0kblqq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDY2Cn0="},
-    "46": {"version": "68", "sha256": "129d2bwkq48pmm8vja9ywi2nsydvsqs60kc67zm1ffwakyny2c7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDY4Cn0="}
+    "46": {"version": "70", "sha256": "1flp7ynhcvbj8m0hbcnapr5wxhm1hcnb3chrbs457xkv8bqaz99z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDcwCn0="}
   }}
 , {"uuid": "NordVPN_Connect@poilrouge.fr", "name": "NordVPN Connect", "pname": "nordvpn-connect", "description": "Unofficial Gnome-Shell Extension to provide a GUI for the official NordVPN CLI Tool.", "link": "https://extensions.gnome.org/extension/1595/nordvpn-connect/", "shell_version_map": {
     "38": {"version": "15", "sha256": "0xccvy3kqgglhcjhixlxi65sa49lbm896lra2sks65arkx3fh63k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsZXhQb2lscm91Z2UvTm9yZFZQTi1jb25uZWN0IiwKICAidXVpZCI6ICJOb3JkVlBOX0Nvbm5lY3RAcG9pbHJvdWdlLmZyIiwKICAidmVyc2lvbiI6IDE1Cn0="},
@@ -1663,7 +1754,8 @@
     "43": {"version": "28", "sha256": "0m32y943k89775ibci9j6k75la2qhr0z6va0yisb77sv2gy72cqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"},
     "44": {"version": "28", "sha256": "0m32y943k89775ibci9j6k75la2qhr0z6va0yisb77sv2gy72cqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"},
     "45": {"version": "29", "sha256": "1nqmg1ra61kc5kchwprav13cjck1n2r97hdbrnz1iq0v8pwk63sl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAiZXh0ZW5zaW9uLWlkIjogImFycmFnbmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFycmFuZ2UgV2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJyYW5nZVdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcnJhbmdlV2luZG93cyIsCiAgInV1aWQiOiAiYXJyYW5nZVdpbmRvd3NAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
-    "46": {"version": "30", "sha256": "1cpzyg3swis4rfgajsk92pvpk1831wnrq14rl7f04wraw41md3bs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAiZXh0ZW5zaW9uLWlkIjogImFycmFnbmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFycmFuZ2UgV2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJyYW5nZVdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcnJhbmdlV2luZG93cyIsCiAgInV1aWQiOiAiYXJyYW5nZVdpbmRvd3NAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}
+    "46": {"version": "31", "sha256": "1gx1py714pibxwmg7x9nxxyppsgbmi5w0a0wv7baf7g3z54p1d8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAiZXh0ZW5zaW9uLWlkIjogImFycmFnbmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFycmFuZ2UgV2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJyYW5nZVdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
+    "47": {"version": "31", "sha256": "1gx1py714pibxwmg7x9nxxyppsgbmi5w0a0wv7baf7g3z54p1d8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAiZXh0ZW5zaW9uLWlkIjogImFycmFnbmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFycmFuZ2UgV2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJyYW5nZVdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}
   }}
 , {"uuid": "fullscreen-notifications@sorrow.about.alice.pm.me", "name": "Fullscreen Notifications", "pname": "fullscreen-notifications", "description": "Enables all notifications in fullscreen mode", "link": "https://extensions.gnome.org/extension/1610/fullscreen-notifications/", "shell_version_map": {
     "38": {"version": "3", "sha256": "1g1dgrhbif7qcxga7302bhhdjrr2v3vkp6dfavyclzsdkkrr2wwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzAuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -1673,7 +1765,8 @@
     "43": {"version": "8", "sha256": "0dwg21ic5xs6pmrgfjfrw7a8s5clfqazkmh0b3q3rh93dqizmp7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnNAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "44": {"version": "8", "sha256": "0dwg21ic5xs6pmrgfjfrw7a8s5clfqazkmh0b3q3rh93dqizmp7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnNAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "45": {"version": "10", "sha256": "039x00zq8vqa32qfv2452wrnka5wq3asn19nwpzc3fgn43b5g8cz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "46": {"version": "10", "sha256": "039x00zq8vqa32qfv2452wrnka5wq3asn19nwpzc3fgn43b5g8cz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"}
+    "46": {"version": "10", "sha256": "039x00zq8vqa32qfv2452wrnka5wq3asn19nwpzc3fgn43b5g8cz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "47": {"version": "11", "sha256": "08g89j5zk7ckmzq3n1gkyklr9cfmslkdgwx6bfjw9d1kzlrjp21w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnNAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDExCn0="}
   }}
 , {"uuid": "panelScroll@sun.wxg@gmail.com", "name": "panel scroll", "pname": "panel-scroll", "description": "Switch windows or workspace by mouse scroll on the panel.\nPointer on left of panel, switch windows.\nPointer on right of panel, switch workspaces.", "link": "https://extensions.gnome.org/extension/1616/panel-scroll/", "shell_version_map": {
     "38": {"version": "10", "sha256": "1llw16wszrkrrzrlyd1ppw8kn1cqp2z4irzi9q7v2nr47hrk14kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWxTY3JvbGwiLAogICJ1dWlkIjogInBhbmVsU2Nyb2xsQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
@@ -1682,8 +1775,9 @@
     "42": {"version": "21", "sha256": "0fdhbk1pxh5vwrkwxzzcanf9sm5zm83149gg69nch1mph4bk9s06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
     "43": {"version": "21", "sha256": "0fdhbk1pxh5vwrkwxzzcanf9sm5zm83149gg69nch1mph4bk9s06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
     "44": {"version": "21", "sha256": "0fdhbk1pxh5vwrkwxzzcanf9sm5zm83149gg69nch1mph4bk9s06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
-    "45": {"version": "24", "sha256": "0i9ay2nb26k6bvrfjaldmyr1h1s2s1xj8vsbkhw7lnp5b24jprnl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC1zY3JvbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJwYW5lbCBzY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsU2Nyb2xsIiwKICAidXVpZCI6ICJwYW5lbFNjcm9sbEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "46": {"version": "24", "sha256": "0i9ay2nb26k6bvrfjaldmyr1h1s2s1xj8vsbkhw7lnp5b24jprnl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC1zY3JvbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJwYW5lbCBzY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsU2Nyb2xsIiwKICAidXVpZCI6ICJwYW5lbFNjcm9sbEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}
+    "45": {"version": "25", "sha256": "1635b6zk4snka3kwm0gg8x7khrd8xfk0l11yba9g587c73jnygba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC1zY3JvbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJwYW5lbCBzY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "46": {"version": "25", "sha256": "1635b6zk4snka3kwm0gg8x7khrd8xfk0l11yba9g587c73jnygba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC1zY3JvbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJwYW5lbCBzY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "47": {"version": "25", "sha256": "1635b6zk4snka3kwm0gg8x7khrd8xfk0l11yba9g587c73jnygba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC1zY3JvbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJwYW5lbCBzY3JvbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
   }}
 , {"uuid": "soft-brightness@fifi.org", "name": "Soft brightness", "pname": "soft-brightness", "description": "Add or override the brightness slider to change the brightness via an alpha layer (and optionally stop using or cooperate with the exising backlight, if present).\nEither internal, external or all monitors can be dimmed.\nSee the GitHub page for details.\n\nNote that this extension will keep running on the lock screen, as you'd also want the brightness setting to apply to the lock screen as well. Please report on GitHub if this gives you any trouble.", "link": "https://extensions.gnome.org/extension/1625/soft-brightness/", "shell_version_map": {
     "38": {"version": "30", "sha256": "0d8561qp92v8n561bafhkj9j5k21knljzyrf2msihxxj1kfgkp9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzb2Z0LWJyaWdodG5lc3MiLAogICJuYW1lIjogIlNvZnQgYnJpZ2h0bmVzcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzMuOTAiLAogICAgIjMuMzYiLAogICAgIjMuMzUuMSIsCiAgICAiMy4zNS45MiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3NvZnQtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzQGZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYzMC0wLWc4ODQyZGZiIiwKICAidmVyc2lvbiI6IDMwCn0="},
@@ -1691,23 +1785,25 @@
     "41": {"version": "30", "sha256": "0d8561qp92v8n561bafhkj9j5k21knljzyrf2msihxxj1kfgkp9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzb2Z0LWJyaWdodG5lc3MiLAogICJuYW1lIjogIlNvZnQgYnJpZ2h0bmVzcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzMuOTAiLAogICAgIjMuMzYiLAogICAgIjMuMzUuMSIsCiAgICAiMy4zNS45MiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3NvZnQtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzQGZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYzMC0wLWc4ODQyZGZiIiwKICAidmVyc2lvbiI6IDMwCn0="},
     "42": {"version": "30", "sha256": "0d8561qp92v8n561bafhkj9j5k21knljzyrf2msihxxj1kfgkp9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzb2Z0LWJyaWdodG5lc3MiLAogICJuYW1lIjogIlNvZnQgYnJpZ2h0bmVzcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzMuOTAiLAogICAgIjMuMzYiLAogICAgIjMuMzUuMSIsCiAgICAiMy4zNS45MiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3NvZnQtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzQGZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYzMC0wLWc4ODQyZGZiIiwKICAidmVyc2lvbiI6IDMwCn0="}
   }}
-, {"uuid": "Resource_Monitor@Ory0n", "name": "Resource Monitor", "pname": "resource-monitor", "description": "Monitor the use of system resources like cpu, ram, disk, network and display them in gnome shell top bar.", "link": "https://extensions.gnome.org/extension/1634/resource-monitor/", "shell_version_map": {
+, {"uuid": "Resource_Monitor@Ory0n", "name": "Resource Monitor", "pname": "resource-monitor", "description": "Resource Monitor is a GNOME Shell extension that provides real-time monitoring of key system resources directly in the GNOME Shell top bar. It tracks CPU usage, load average, and temperature; RAM and swap usage; disk stats and space; GPU usage, memory, and temperature; and network activity for both WLAN and Ethernet connections.", "link": "https://extensions.gnome.org/extension/1634/resource-monitor/", "shell_version_map": {
     "38": {"version": "14", "sha256": "0mg6b54cinplc4i3kzn6p397a8flyivcyzg30pnfq7phhgpcnxwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHJ5MG4vUmVzb3VyY2VfTW9uaXRvci8iLAogICJ1dWlkIjogIlJlc291cmNlX01vbml0b3JAT3J5MG4iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "40": {"version": "19", "sha256": "0aznblvswlnxbykwb0p1yn4mzasa7bmqz1f45ka0j06kj4747ns5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxOQp9"},
     "41": {"version": "19", "sha256": "0aznblvswlnxbykwb0p1yn4mzasa7bmqz1f45ka0j06kj4747ns5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxOQp9"},
     "42": {"version": "19", "sha256": "0aznblvswlnxbykwb0p1yn4mzasa7bmqz1f45ka0j06kj4747ns5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxOQp9"},
     "43": {"version": "19", "sha256": "0aznblvswlnxbykwb0p1yn4mzasa7bmqz1f45ka0j06kj4747ns5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxOQp9"},
     "44": {"version": "19", "sha256": "0aznblvswlnxbykwb0p1yn4mzasa7bmqz1f45ka0j06kj4747ns5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "45": {"version": "22", "sha256": "0aw867izp6ibi1vwhpw8hk75i1phrx0m18al6vggvjy9bidlcqbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgdGhlIHVzZSBvZiBzeXN0ZW0gcmVzb3VyY2VzIGxpa2UgY3B1LCByYW0sIGRpc2ssIG5ldHdvcmsgYW5kIGRpc3BsYXkgdGhlbSBpbiBnbm9tZSBzaGVsbCB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiMHJ5MG4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29tLWdpdGh1Yi1Pcnkwbi1SZXNvdXJjZV9Nb25pdG9yIiwKICAibmFtZSI6ICJSZXNvdXJjZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuT3J5MG4uUmVzb3VyY2VfTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHJ5MG4vUmVzb3VyY2VfTW9uaXRvci8iLAogICJ1dWlkIjogIlJlc291cmNlX01vbml0b3JAT3J5MG4iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
-    "46": {"version": "22", "sha256": "0aw867izp6ibi1vwhpw8hk75i1phrx0m18al6vggvjy9bidlcqbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgdGhlIHVzZSBvZiBzeXN0ZW0gcmVzb3VyY2VzIGxpa2UgY3B1LCByYW0sIGRpc2ssIG5ldHdvcmsgYW5kIGRpc3BsYXkgdGhlbSBpbiBnbm9tZSBzaGVsbCB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiMHJ5MG4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29tLWdpdGh1Yi1Pcnkwbi1SZXNvdXJjZV9Nb25pdG9yIiwKICAibmFtZSI6ICJSZXNvdXJjZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuT3J5MG4uUmVzb3VyY2VfTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHJ5MG4vUmVzb3VyY2VfTW9uaXRvci8iLAogICJ1dWlkIjogIlJlc291cmNlX01vbml0b3JAT3J5MG4iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}
+    "45": {"version": "24", "sha256": "09c2zsy2c4y554h0hpwjwfwvs2i9j78i2rrlyz46cz82nn6ny7h8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgdGhlIHVzZSBvZiBzeXN0ZW0gcmVzb3VyY2VzIGxpa2UgY3B1LCByYW0sIGRpc2ssIG5ldHdvcmsgYW5kIGRpc3BsYXkgdGhlbSBpbiBnbm9tZSBzaGVsbCB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiMHJ5MG4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29tLWdpdGh1Yi1Pcnkwbi1SZXNvdXJjZV9Nb25pdG9yIiwKICAibmFtZSI6ICJSZXNvdXJjZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuT3J5MG4uUmVzb3VyY2VfTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzByeTBuL1Jlc291cmNlX01vbml0b3IvIiwKICAidXVpZCI6ICJSZXNvdXJjZV9Nb25pdG9yQE9yeTBuIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "46": {"version": "24", "sha256": "09c2zsy2c4y554h0hpwjwfwvs2i9j78i2rrlyz46cz82nn6ny7h8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgdGhlIHVzZSBvZiBzeXN0ZW0gcmVzb3VyY2VzIGxpa2UgY3B1LCByYW0sIGRpc2ssIG5ldHdvcmsgYW5kIGRpc3BsYXkgdGhlbSBpbiBnbm9tZSBzaGVsbCB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiMHJ5MG4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29tLWdpdGh1Yi1Pcnkwbi1SZXNvdXJjZV9Nb25pdG9yIiwKICAibmFtZSI6ICJSZXNvdXJjZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuT3J5MG4uUmVzb3VyY2VfTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzByeTBuL1Jlc291cmNlX01vbml0b3IvIiwKICAidXVpZCI6ICJSZXNvdXJjZV9Nb25pdG9yQE9yeTBuIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "47": {"version": "24", "sha256": "09c2zsy2c4y554h0hpwjwfwvs2i9j78i2rrlyz46cz82nn6ny7h8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgdGhlIHVzZSBvZiBzeXN0ZW0gcmVzb3VyY2VzIGxpa2UgY3B1LCByYW0sIGRpc2ssIG5ldHdvcmsgYW5kIGRpc3BsYXkgdGhlbSBpbiBnbm9tZSBzaGVsbCB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiMHJ5MG4iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29tLWdpdGh1Yi1Pcnkwbi1SZXNvdXJjZV9Nb25pdG9yIiwKICAibmFtZSI6ICJSZXNvdXJjZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuT3J5MG4uUmVzb3VyY2VfTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzByeTBuL1Jlc291cmNlX01vbml0b3IvIiwKICAidXVpZCI6ICJSZXNvdXJjZV9Nb25pdG9yQE9yeTBuIiwKICAidmVyc2lvbiI6IDI0Cn0="}
   }}
 , {"uuid": "tweaks-system-menu@extensions.gnome-shell.fifi.org", "name": "Tweaks & Extensions in System Menu", "pname": "tweaks-in-system-menu", "description": "Put Gnome Tweaks, Extensions, Extension Manager and any other application in the System menu.", "link": "https://extensions.gnome.org/extension/1653/tweaks-in-system-menu/", "shell_version_map": {
     "38": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "40": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "41": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "42": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="},
-    "45": {"version": "22", "sha256": "0l5qnwwi4b166c6m4h4adcc8mh252ippc3y5p8c3cfxkbzd6fc3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MsIEV4dGVuc2lvbnMsIEV4dGVuc2lvbiBNYW5hZ2VyIGFuZCBhbnkgb3RoZXIgYXBwbGljYXRpb24gaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3R3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAidHdlYWtzLXN5c3RlbS1tZW51QGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjIyLTAtZ2MxMDU2NGEiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
-    "46": {"version": "22", "sha256": "0l5qnwwi4b166c6m4h4adcc8mh252ippc3y5p8c3cfxkbzd6fc3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MsIEV4dGVuc2lvbnMsIEV4dGVuc2lvbiBNYW5hZ2VyIGFuZCBhbnkgb3RoZXIgYXBwbGljYXRpb24gaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3R3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAidHdlYWtzLXN5c3RlbS1tZW51QGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjIyLTAtZ2MxMDU2NGEiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}
+    "45": {"version": "23", "sha256": "07pc8s1afvw6indapcmbxmrj6dc9qb2jmdbgnjhji0wpncqa0rnn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MsIEV4dGVuc2lvbnMsIEV4dGVuc2lvbiBNYW5hZ2VyIGFuZCBhbnkgb3RoZXIgYXBwbGljYXRpb24gaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYyMy0wLWdmNDMwNDJlIiwKICAidmVyc2lvbiI6IDIzCn0="},
+    "46": {"version": "23", "sha256": "07pc8s1afvw6indapcmbxmrj6dc9qb2jmdbgnjhji0wpncqa0rnn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MsIEV4dGVuc2lvbnMsIEV4dGVuc2lvbiBNYW5hZ2VyIGFuZCBhbnkgb3RoZXIgYXBwbGljYXRpb24gaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYyMy0wLWdmNDMwNDJlIiwKICAidmVyc2lvbiI6IDIzCn0="},
+    "47": {"version": "23", "sha256": "07pc8s1afvw6indapcmbxmrj6dc9qb2jmdbgnjhji0wpncqa0rnn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MsIEV4dGVuc2lvbnMsIEV4dGVuc2lvbiBNYW5hZ2VyIGFuZCBhbnkgb3RoZXIgYXBwbGljYXRpb24gaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYyMy0wLWdmNDMwNDJlIiwKICAidmVyc2lvbiI6IDIzCn0="}
   }}
 , {"uuid": "topiconsfix@aleskva@devnullmail.com", "name": "TopIconsFix", "pname": "topiconsfix", "description": "Shows legacy tray icons on top – the fixed version of https://extensions.gnome.org/extension/495/topicons/", "link": "https://extensions.gnome.org/extension/1674/topiconsfix/", "shell_version_map": {
     "38": {"version": "13", "sha256": "1q9zzjcy8pyifqm51p51wb290casl3464k1w1p5ijgwf492va6gf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9waWNvbnNmaXhAYWxlc2t2YUBkZXZudWxsbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
@@ -1751,7 +1847,8 @@
     "43": {"version": "16", "sha256": "0hbgig15gyvnivhjny2i899rbwl5whcliwj1nn1zyccdv0v7xad8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckB6aGFuZ2hhaS5tZSIsCiAgInZlcnNpb24iOiAxNgp9"},
     "44": {"version": "17", "sha256": "16fd6rqvfm6d9qcy60ww5v5i6dhid59ski9ijn0ab0a0zbb2s4yy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "45": {"version": "20", "sha256": "021pwcnyj79r8w1hjyv8xqqdzbzk0f5fbiply0izp690ahvkx7gn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDIwCn0="},
-    "46": {"version": "22", "sha256": "0ns2f83jch8fqsbkd8ax7a9cv45ywi6mpn5r16qhzgigv3576vj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDIyCn0="}
+    "46": {"version": "23", "sha256": "071ij46n0izvrzb8palfhfa7r366945lsrlx88r75wclfh9sy9ag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckB6aGFuZ2hhaS5tZSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "47": {"version": "23", "sha256": "071ij46n0izvrzb8palfhfa7r366945lsrlx88r75wclfh9sy9ag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckB6aGFuZ2hhaS5tZSIsCiAgInZlcnNpb24iOiAyMwp9"}
   }}
 , {"uuid": "ssh-search-provider@extensions.gnome-shell.fifi.org", "name": "SSH Search Provider Reborn", "pname": "ssh-search-provider-reborn", "description": "Provide SSH search results in overview.\n\nThis is a fork of the original \"SSH Search Provider\", updated to work with newer Gnome-Shells.", "link": "https://extensions.gnome.org/extension/1714/ssh-search-provider-reborn/", "shell_version_map": {
     "38": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="},
@@ -1760,8 +1857,9 @@
     "42": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="},
     "43": {"version": "13", "sha256": "1y4167891nh4vd9d9jmy23cdzsgfxivwaf4s71j7x3hvpw52iwj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjEzLTAtZzM1NmJlMmUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "44": {"version": "13", "sha256": "1y4167891nh4vd9d9jmy23cdzsgfxivwaf4s71j7x3hvpw52iwj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjEzLTAtZzM1NmJlMmUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "45": {"version": "16", "sha256": "0vgckaj2qjyy3r5w7c1b8cf8qz3lff177m921vsm5q7mc8ry3h7l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjE2LTAtZzdmNDdlNTYiLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
-    "46": {"version": "16", "sha256": "0vgckaj2qjyy3r5w7c1b8cf8qz3lff177m921vsm5q7mc8ry3h7l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjE2LTAtZzdmNDdlNTYiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
+    "45": {"version": "18", "sha256": "0xszm7g2cwwqxbpa47hdqhdzbparlzp2674x69lbrgxarf5lsjc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWc5M2U1MjQyIiwKICAidmVyc2lvbiI6IDE4Cn0="},
+    "46": {"version": "18", "sha256": "0xszm7g2cwwqxbpa47hdqhdzbparlzp2674x69lbrgxarf5lsjc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWc5M2U1MjQyIiwKICAidmVyc2lvbiI6IDE4Cn0="},
+    "47": {"version": "18", "sha256": "0xszm7g2cwwqxbpa47hdqhdzbparlzp2674x69lbrgxarf5lsjc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWc5M2U1MjQyIiwKICAidmVyc2lvbiI6IDE4Cn0="}
   }}
 , {"uuid": "weeks-start-on-monday@extensions.gnome-shell.fifi.org", "name": "Weeks Start on Monday Again...", "pname": "weeks-start-on-monday-again", "description": "... or maybe not, and that's why the start day is configurable in the preferences.\n\nThis is an updated version of the \"Weeks Start on Monday\" extension for newer Gnome Shells.", "link": "https://extensions.gnome.org/extension/1720/weeks-start-on-monday-again/", "shell_version_map": {
     "38": {"version": "14", "sha256": "1zavccgxfqnf19qab2iwrprh966bl19a5n912sxyd9k3aagp64b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxNC0wLWdjNGIxNzI2IiwKICAidmVyc2lvbiI6IDE0Cn0="},
@@ -1770,8 +1868,9 @@
     "42": {"version": "14", "sha256": "1zavccgxfqnf19qab2iwrprh966bl19a5n912sxyd9k3aagp64b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxNC0wLWdjNGIxNzI2IiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "43": {"version": "14", "sha256": "1zavccgxfqnf19qab2iwrprh966bl19a5n912sxyd9k3aagp64b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxNC0wLWdjNGIxNzI2IiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "44": {"version": "14", "sha256": "1zavccgxfqnf19qab2iwrprh966bl19a5n912sxyd9k3aagp64b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxNC0wLWdjNGIxNzI2IiwKICAidmVyc2lvbiI6IDE0Cn0="},
-    "45": {"version": "17", "sha256": "0h867ikg8gb8dam28c1mjhw16a8nknp7d83p7h2ipji008mg3kr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxNy0wLWdjYTFiYWRlIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "46": {"version": "17", "sha256": "0h867ikg8gb8dam28c1mjhw16a8nknp7d83p7h2ipji008mg3kr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxNy0wLWdjYTFiYWRlIiwKICAidmVyc2lvbiI6IDE3Cn0="}
+    "45": {"version": "18", "sha256": "0qp0gwgyl6nx9ya75q246ca7d6z40dgk48yzl0wp6b45xbba7068", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTgtMC1nYTVjZDljYyIsCiAgInZlcnNpb24iOiAxOAp9"},
+    "46": {"version": "18", "sha256": "0qp0gwgyl6nx9ya75q246ca7d6z40dgk48yzl0wp6b45xbba7068", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTgtMC1nYTVjZDljYyIsCiAgInZlcnNpb24iOiAxOAp9"},
+    "47": {"version": "18", "sha256": "0qp0gwgyl6nx9ya75q246ca7d6z40dgk48yzl0wp6b45xbba7068", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTgtMC1nYTVjZDljYyIsCiAgInZlcnNpb24iOiAxOAp9"}
   }}
 , {"uuid": "wintile@nowsci.com", "name": "WinTile", "pname": "wintile-windows-10-window-tiling-for-gnome", "description": "WinTile is a hotkey driven window tiling system for GNOME that imitates the standard Win-Arrow keys of Windows 10, allowing you to maximize, maximize to sides, or 1/4 sized to corner across a single or multiple monitors using just Super+Arrow.\n\nAs of v14, WinTile also supports:\n- 2-5 columns and 1-4 rows for standard or ultrawide monitors\n- Top/bottom half support\n- Mouse preview and snapping for placing windows\n- 'Maximize' mode, which adds/removes GNOME animations\n- 'Ultrawide-only' mode, to allow standard screens to have different cols/row than ultrawides\n- Portrait screens will automatically swap columns and rows\n- Add gaps around tiles to avoid the 'crowded elevator' feeling'\n- Ctrl+Super+Arrow to grow a tile in that direction if space is available\n- Ctrl+drag to drop a tile in a specific spot\n- Ctrl+Super+drag to draw a grid for the new tile", "link": "https://extensions.gnome.org/extension/1723/wintile-windows-10-window-tiling-for-gnome/", "shell_version_map": {
     "38": {"version": "15", "sha256": "14phsrk15m0l7k01jbzxb5iyfxkq414zmgx8byj644wh99r7jx22", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpblRpbGUgaXMgYSBob3RrZXkgZHJpdmVuIHdpbmRvdyB0aWxpbmcgc3lzdGVtIGZvciBHTk9NRSB0aGF0IGltaXRhdGVzIHRoZSBzdGFuZGFyZCBXaW4tQXJyb3cga2V5cyBvZiBXaW5kb3dzIDEwLCBhbGxvd2luZyB5b3UgdG8gbWF4aW1pemUsIG1heGltaXplIHRvIHNpZGVzLCBvciAxLzQgc2l6ZWQgdG8gY29ybmVyIGFjcm9zcyBhIHNpbmdsZSBvciBtdWx0aXBsZSBtb25pdG9ycyB1c2luZyBqdXN0IFN1cGVyK0Fycm93LlxuXG5BcyBvZiB2MTQsIFdpblRpbGUgYWxzbyBzdXBwb3J0czpcbi0gMi01IGNvbHVtbnMgYW5kIDEtNCByb3dzIGZvciBzdGFuZGFyZCBvciB1bHRyYXdpZGUgbW9uaXRvcnNcbi0gVG9wL2JvdHRvbSBoYWxmIHN1cHBvcnRcbi0gTW91c2UgcHJldmlldyBhbmQgc25hcHBpbmcgZm9yIHBsYWNpbmcgd2luZG93c1xuLSAnTWF4aW1pemUnIG1vZGUsIHdoaWNoIGFkZHMvcmVtb3ZlcyBHTk9NRSBhbmltYXRpb25zXG4tICdVbHRyYXdpZGUtb25seScgbW9kZSwgdG8gYWxsb3cgc3RhbmRhcmQgc2NyZWVucyB0byBoYXZlIGRpZmZlcmVudCBjb2xzL3JvdyB0aGFuIHVsdHJhd2lkZXNcbi0gUG9ydHJhaXQgc2NyZWVucyB3aWxsIGF1dG9tYXRpY2FsbHkgc3dhcCBjb2x1bW5zIGFuZCByb3dzXG4tIEFkZCBnYXBzIGFyb3VuZCB0aWxlcyB0byBhdm9pZCB0aGUgJ2Nyb3dkZWQgZWxldmF0b3InIGZlZWxpbmcnXG4tIEN0cmwrU3VwZXIrQXJyb3cgdG8gZ3JvdyBhIHRpbGUgaW4gdGhhdCBkaXJlY3Rpb24gaWYgc3BhY2UgaXMgYXZhaWxhYmxlXG4tIEN0cmwrZHJhZyB0byBkcm9wIGEgdGlsZSBpbiBhIHNwZWNpZmljIHNwb3Rcbi0gQ3RybCtTdXBlcitkcmFnIHRvIGRyYXcgYSBncmlkIGZvciB0aGUgbmV3IHRpbGUiLAogICJuYW1lIjogIldpblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2ludGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm1zdHJhdC93aW50aWxlIiwKICAidXVpZCI6ICJ3aW50aWxlQG5vd3NjaS5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
@@ -1801,8 +1900,9 @@
     "42": {"version": "12", "sha256": "08ph5bjwka0vh912yhpb5zh2gvr2slvk9c46l09j5hwb93k8ki3p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "43": {"version": "12", "sha256": "08ph5bjwka0vh912yhpb5zh2gvr2slvk9c46l09j5hwb93k8ki3p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "08ph5bjwka0vh912yhpb5zh2gvr2slvk9c46l09j5hwb93k8ki3p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "45": {"version": "14", "sha256": "0k2wljqaq6sd9cdnl3fxvavj0d46dqrqh93y5ydyyz8kbbb4kchf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "0k2wljqaq6sd9cdnl3fxvavj0d46dqrqh93y5ydyyz8kbbb4kchf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "45": {"version": "15", "sha256": "1h64c8rwwhsiy2v3w36fwc14iffyzb69fp0146h3lpy5qbbjnw9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zaG9saXRoL2dub21lLWV4dGVuc2lvbi1sYW4taXAtYWRkcmVzcyIsCiAgInV1aWQiOiAibGFuLWlwLWFkZHJlc3NAbXJodWJlci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "1h64c8rwwhsiy2v3w36fwc14iffyzb69fp0146h3lpy5qbbjnw9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zaG9saXRoL2dub21lLWV4dGVuc2lvbi1sYW4taXAtYWRkcmVzcyIsCiAgInV1aWQiOiAibGFuLWlwLWFkZHJlc3NAbXJodWJlci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "1h64c8rwwhsiy2v3w36fwc14iffyzb69fp0146h3lpy5qbbjnw9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zaG9saXRoL2dub21lLWV4dGVuc2lvbi1sYW4taXAtYWRkcmVzcyIsCiAgInV1aWQiOiAibGFuLWlwLWFkZHJlc3NAbXJodWJlci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "TransparentTopbar@enrico.sorio.net", "name": "Transparent Topbar", "pname": "transparent-topbar", "description": "Transparent Topbar with Multi monitors support", "link": "https://extensions.gnome.org/extension/1765/transparent-topbar/", "shell_version_map": {
     "38": {"version": "4", "sha256": "1ps75ilgnlspimsxgwc0j1yfbfxp6qp8is4g9kg7k3c5n9dzlp8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IFRvcGJhciB3aXRoIE11bHRpIG1vbml0b3JzIHN1cHBvcnQiLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNvcmlvL3RyYW5zcGFyZW50LXRvcGJhciIsCiAgInV1aWQiOiAiVHJhbnNwYXJlbnRUb3BiYXJAZW5yaWNvLnNvcmlvLm5ldCIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -1819,8 +1919,8 @@
     "42": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "43": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "44": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
-    "45": {"version": "23", "sha256": "1l16gc0q7i9qm9ziddklbfxbnrdmvwyqx92hqyxsi43cffap71sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hdHRieW5hbWUiLAogICAgImtvZmkiOiAibWF0dGJ5bmFtZSIsCiAgICAibGliZXJhcGF5IjogIm1hdHRieW5hbWUiCiAgfSwKICAibmFtZSI6ICJDb2xvclRpbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3J0aW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "46": {"version": "23", "sha256": "1l16gc0q7i9qm9ziddklbfxbnrdmvwyqx92hqyxsi43cffap71sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hdHRieW5hbWUiLAogICAgImtvZmkiOiAibWF0dGJ5bmFtZSIsCiAgICAibGliZXJhcGF5IjogIm1hdHRieW5hbWUiCiAgfSwKICAibmFtZSI6ICJDb2xvclRpbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3J0aW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "45": {"version": "25", "sha256": "1jz7wx3zwdikfqfzxvva21arsrqi2a21miwy6k8q98jg4c57v58b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hdHRieW5hbWUiLAogICAgImtvZmkiOiAibWF0dGJ5bmFtZSIsCiAgICAibGliZXJhcGF5IjogIm1hdHRieW5hbWUiCiAgfSwKICAibmFtZSI6ICJDb2xvclRpbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3J0aW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDI1Cn0="},
+    "46": {"version": "25", "sha256": "1jz7wx3zwdikfqfzxvva21arsrqi2a21miwy6k8q98jg4c57v58b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hdHRieW5hbWUiLAogICAgImtvZmkiOiAibWF0dGJ5bmFtZSIsCiAgICAibGliZXJhcGF5IjogIm1hdHRieW5hbWUiCiAgfSwKICAibmFtZSI6ICJDb2xvclRpbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3J0aW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDI1Cn0="}
   }}
 , {"uuid": "sermon@rovellipaolo-gmail.com", "name": "SerMon: Service Monitor", "pname": "sermon", "description": "SerMon: an extension for monitoring and managing systemd services, cron jobs, docker and podman containers", "link": "https://extensions.gnome.org/extension/1804/sermon/", "shell_version_map": {
     "38": {"version": "28", "sha256": "0vxvd4q5bysqmrbw6d169l3ww37j6cdk70n1gk4m35ydvq7cpp6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcm92ZWxsaXBhb2xvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZXJtb24iLAogICJ1dWlkIjogInNlcm1vbkByb3ZlbGxpcGFvbG8tZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="},
@@ -1840,7 +1940,8 @@
     "43": {"version": "44", "sha256": "012cnqrlb2xbnj9swjzlgm21720v7zwj0lvx2ygy5xyclnk8dwic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NAp9"},
     "44": {"version": "44", "sha256": "012cnqrlb2xbnj9swjzlgm21720v7zwj0lvx2ygy5xyclnk8dwic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NAp9"},
     "45": {"version": "46", "sha256": "02nd0n6dpxn68a0f8ai3bjjpqq8s78hs5b1wim1bkzypq29gjcyx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJleHRlbnNpb24taWQiOiAiZGljdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGljdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="},
-    "46": {"version": "48", "sha256": "19wd655nw6v2i24az5jxm0s33ai7hc9ybibz6pmpyx4svw4x326d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJleHRlbnNpb24taWQiOiAiZGljdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGljdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDgKfQ=="}
+    "46": {"version": "49", "sha256": "0183gwgrh9cw2s6ajnjjmwds0daiqx106kxyxz2qb1x957q2n22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJleHRlbnNpb24taWQiOiAiZGljdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGljdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaWN0IiwKICAidXVpZCI6ICJkaWN0QHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
+    "47": {"version": "49", "sha256": "0183gwgrh9cw2s6ajnjjmwds0daiqx106kxyxz2qb1x957q2n22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJleHRlbnNpb24taWQiOiAiZGljdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGljdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaWN0IiwKICAidXVpZCI6ICJkaWN0QHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}
   }}
 , {"uuid": "gamemode@christian.kellner.me", "name": "GameMode", "pname": "gamemode", "description": "Status indicator for GameMode", "link": "https://extensions.gnome.org/extension/1852/gamemode/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="},
@@ -1855,8 +1956,9 @@
     "42": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="},
     "43": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="},
     "44": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "45": {"version": "11", "sha256": "0m5z7hdxv3zzw0fsq9ic42xfrg25afa5gbdl1ck7ypik6lc3fk7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "46": {"version": "11", "sha256": "0m5z7hdxv3zzw0fsq9ic42xfrg25afa5gbdl1ck7ypik6lc3fk7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "12", "sha256": "1hz2myfji62lpcj7gk2sbz4cr871rc97mpmvh6ll9nr8f4vvqmr8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "46": {"version": "12", "sha256": "1hz2myfji62lpcj7gk2sbz4cr871rc97mpmvh6ll9nr8f4vvqmr8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "47": {"version": "12", "sha256": "1hz2myfji62lpcj7gk2sbz4cr871rc97mpmvh6ll9nr8f4vvqmr8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
   }}
 , {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "GNOME extension to display cryptocurrency prices", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1rpp22asfnhi11lprl70lr9dh2cw7w23yqf4hi629357592px2sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA1Cn0="},
@@ -1865,8 +1967,9 @@
     "42": {"version": "33", "sha256": "0qmwzrhgjl012ahxmck937wibz7r3k1fr4rxb27b2frr5hmccry2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rcnlwdG8iLAogICJ1dWlkIjogImtyeXB0b0BzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
     "43": {"version": "33", "sha256": "0qmwzrhgjl012ahxmck937wibz7r3k1fr4rxb27b2frr5hmccry2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rcnlwdG8iLAogICJ1dWlkIjogImtyeXB0b0BzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
     "44": {"version": "33", "sha256": "0qmwzrhgjl012ahxmck937wibz7r3k1fr4rxb27b2frr5hmccry2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rcnlwdG8iLAogICJ1dWlkIjogImtyeXB0b0BzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
-    "45": {"version": "34", "sha256": "0011szahh84x4fh7mi9qzr3d8bdxn6bp82zicaqpx01ybqnaqisk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rcnlwdG8iLAogICJ1dWlkIjogImtyeXB0b0BzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDM0Cn0="},
-    "46": {"version": "34", "sha256": "0011szahh84x4fh7mi9qzr3d8bdxn6bp82zicaqpx01ybqnaqisk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rcnlwdG8iLAogICJ1dWlkIjogImtyeXB0b0BzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDM0Cn0="}
+    "45": {"version": "35", "sha256": "1yqq6pk2m016mbirld30jwx7gwphagz33rzmkkgkrqqdqfwpw2wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAzNQp9"},
+    "46": {"version": "35", "sha256": "1yqq6pk2m016mbirld30jwx7gwphagz33rzmkkgkrqqdqfwpw2wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAzNQp9"},
+    "47": {"version": "35", "sha256": "1yqq6pk2m016mbirld30jwx7gwphagz33rzmkkgkrqqdqfwpw2wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAzNQp9"}
   }}
 , {"uuid": "cmus-status@yagreg7.gmail.com", "name": "cmus status", "pname": "cmus-status", "description": "Shows cmus status", "link": "https://extensions.gnome.org/extension/1934/cmus-status/", "shell_version_map": {
     "38": {"version": "8", "sha256": "1a6b10kirzbjlllcnffznjlljicah172kpvs0p8rmwhcpn88i8hx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dyZWdUaGVNYWRNb25rL2dub21lLWNtdXMtc3RhdHVzIiwKICAidXVpZCI6ICJjbXVzLXN0YXR1c0B5YWdyZWc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -1896,15 +1999,16 @@
     "43": {"version": "28", "sha256": "14c6l7d3jrjvk4q7hjy9i1h8isp4igyh8f3lcmfw8llq0lf4brny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDI4Cn0="},
     "44": {"version": "28", "sha256": "14c6l7d3jrjvk4q7hjy9i1h8isp4igyh8f3lcmfw8llq0lf4brny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDI4Cn0="}
   }}
-, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements . It requires gir1.2-gnomedesktop-3.0", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {
+, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {
     "38": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "40": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "41": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "42": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "43": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "44": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
-    "45": {"version": "69", "sha256": "0dvxfjcam3i35mwka7f69qlpgc5wyhq1wmdvd6kjpbi20d1iadls", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="},
-    "46": {"version": "69", "sha256": "0dvxfjcam3i35mwka7f69qlpgc5wyhq1wmdvd6kjpbi20d1iadls", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="}
+    "45": {"version": "71", "sha256": "1xbk92x6w28na3kb5cd8ihjjgsjwxzar0gslp1lhnkiczc3fkx46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJkaW5nQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDcxCn0="},
+    "46": {"version": "71", "sha256": "1xbk92x6w28na3kb5cd8ihjjgsjwxzar0gslp1lhnkiczc3fkx46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJkaW5nQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDcxCn0="},
+    "47": {"version": "71", "sha256": "1xbk92x6w28na3kb5cd8ihjjgsjwxzar0gslp1lhnkiczc3fkx46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJkaW5nQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDcxCn0="}
   }}
 , {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Orders icons from extensions in the top bar", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {
     "38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
@@ -1935,8 +2039,9 @@
     "42": {"version": "22", "sha256": "02iz0p36naxg5hm0h5w84ic9rmsxz52sh7x9hh6sxfplw1hz09hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL3Nwb3RpZnktYWQtYmxvY2tlciIsCiAgInV1aWQiOiAic3BvdGlmeS1hZC1ibG9ja0BkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDIyCn0="},
     "43": {"version": "22", "sha256": "02iz0p36naxg5hm0h5w84ic9rmsxz52sh7x9hh6sxfplw1hz09hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL3Nwb3RpZnktYWQtYmxvY2tlciIsCiAgInV1aWQiOiAic3BvdGlmeS1hZC1ibG9ja0BkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDIyCn0="},
     "44": {"version": "22", "sha256": "02iz0p36naxg5hm0h5w84ic9rmsxz52sh7x9hh6sxfplw1hz09hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL3Nwb3RpZnktYWQtYmxvY2tlciIsCiAgInV1aWQiOiAic3BvdGlmeS1hZC1ibG9ja0BkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDIyCn0="},
-    "45": {"version": "25", "sha256": "0iwbrlr6ym37mz0cwf18v0195hmfj4k47v1zqwqc60iamvnwqmwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFkLWJsb2NrQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
-    "46": {"version": "25", "sha256": "0iwbrlr6ym37mz0cwf18v0195hmfj4k47v1zqwqc60iamvnwqmwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFkLWJsb2NrQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
+    "45": {"version": "26", "sha256": "0shicy7dj6jfgks9rvaz50qrip8lgzzyabjiqw76l95aacvsm34x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL3Nwb3RpZnktYWQtYmxvY2tlciIsCiAgInV1aWQiOiAic3BvdGlmeS1hZC1ibG9ja0BkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "46": {"version": "26", "sha256": "0shicy7dj6jfgks9rvaz50qrip8lgzzyabjiqw76l95aacvsm34x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL3Nwb3RpZnktYWQtYmxvY2tlciIsCiAgInV1aWQiOiAic3BvdGlmeS1hZC1ibG9ja0BkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "47": {"version": "26", "sha256": "0shicy7dj6jfgks9rvaz50qrip8lgzzyabjiqw76l95aacvsm34x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL3Nwb3RpZnktYWQtYmxvY2tlciIsCiAgInV1aWQiOiAic3BvdGlmeS1hZC1ibG9ja0BkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDI2Cn0="}
   }}
 , {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {
     "38": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
@@ -1962,8 +2067,8 @@
     "42": {"version": "20", "sha256": "0dh3km7fnl2wg5p13knp3kzwfm5sfx2rlw4hcmpplqarwc3xxfp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAyMAp9"},
     "43": {"version": "20", "sha256": "0dh3km7fnl2wg5p13knp3kzwfm5sfx2rlw4hcmpplqarwc3xxfp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAyMAp9"},
     "44": {"version": "20", "sha256": "0dh3km7fnl2wg5p13knp3kzwfm5sfx2rlw4hcmpplqarwc3xxfp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "45": {"version": "25", "sha256": "1n10k147k1lv30h20vmf9rfxzr58f9qxxc1f054s51gsqblwyvkm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogInJlZC5zb2Z0d2FyZS5zeXN0ZW1zLmVhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDI1Cn0="},
-    "46": {"version": "25", "sha256": "1n10k147k1lv30h20vmf9rfxzr58f9qxxc1f054s51gsqblwyvkm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogInJlZC5zb2Z0d2FyZS5zeXN0ZW1zLmVhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDI1Cn0="}
+    "45": {"version": "26", "sha256": "079qfypaphdqrlbchi72cgz227sxq1nq565jkr3r5z3va699qgyk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogInJlZC5zb2Z0d2FyZS5zeXN0ZW1zLmVhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "46": {"version": "26", "sha256": "079qfypaphdqrlbchi72cgz227sxq1nq565jkr3r5z3va699qgyk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogInJlZC5zb2Z0d2FyZS5zeXN0ZW1zLmVhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDI2Cn0="}
   }}
 , {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Automatically toggle your desktop’s color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\n⚠️ Ubuntu is not supported due to their heavily patched GNOME components that conflict with the extension ⚠️", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {
     "38": {"version": "46", "sha256": "1mqan95pv7fjgr3bis9f1262i6nwwmp15lalh6c3aspn17pncp7w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNDYKfQ=="},
@@ -1973,7 +2078,8 @@
     "43": {"version": "73", "sha256": "1x845glwv6h4a5hf1dy1i6m37dj17nf3sdllzqvgdn1dgipb6212", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3Mwp9"},
     "44": {"version": "74", "sha256": "1w3j973n598pqv011h858gai918j1f048ih74z964bym0axi44dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3NAp9"},
     "45": {"version": "75", "sha256": "1ivhdg0kwn5v720jcgrm4d0ma98i8cbnl3xhynj552wzpd4bqf8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3NQp9"},
-    "46": {"version": "77", "sha256": "0bprqy4gq30nlkjm4x4vmr7ymknfa2325dzj9a6i4nqk37ai5igp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3Nwp9"}
+    "46": {"version": "77", "sha256": "0bprqy4gq30nlkjm4x4vmr7ymknfa2325dzj9a6i4nqk37ai5igp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3Nwp9"},
+    "47": {"version": "78", "sha256": "1c83bw0d7b4z56zrqi0q1lvsaza0dwh5xdr14y4a4m0vgg026hvh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3OAp9"}
   }}
 , {"uuid": "binaryclock@vancha.march", "name": "binaryclock DEPRECATED", "pname": "binaryclock", "description": "Adds a binary clock to the gnome bar\nDoes not work for gnome shell 45 and up. Use the maintained version over at Adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": {
     "38": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"},
@@ -1986,8 +2092,9 @@
     "42": {"version": "12", "sha256": "083h60v38xrqx88i6zisln318gfd12knzangl1x06crf3bk7xx06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sZ2J1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sZ2J1dHRvbiIsCiAgInV1aWQiOiAibGdidXR0b25AZ2xlcnJvLmdub21lLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"},
     "43": {"version": "12", "sha256": "083h60v38xrqx88i6zisln318gfd12knzangl1x06crf3bk7xx06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sZ2J1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sZ2J1dHRvbiIsCiAgInV1aWQiOiAibGdidXR0b25AZ2xlcnJvLmdub21lLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "083h60v38xrqx88i6zisln318gfd12knzangl1x06crf3bk7xx06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sZ2J1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sZ2J1dHRvbiIsCiAgInV1aWQiOiAibGdidXR0b25AZ2xlcnJvLmdub21lLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "45": {"version": "16", "sha256": "08jhraf4rdsd15974224v659s25500nq0fxsq6p04c994zc70bks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIuXG5cblZlcnNpb24gNCBhbHNvIGRyb3AgdGhlIGNvbXBhdGliaWxpdHkgd2l0aCBHbm9tZSBTaGVsbCAzLjMwLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxnYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="},
-    "46": {"version": "16", "sha256": "08jhraf4rdsd15974224v659s25500nq0fxsq6p04c994zc70bks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIuXG5cblZlcnNpb24gNCBhbHNvIGRyb3AgdGhlIGNvbXBhdGliaWxpdHkgd2l0aCBHbm9tZSBTaGVsbCAzLjMwLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxnYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}
+    "45": {"version": "18", "sha256": "0nj4z1wmfpxmsn61m1bd4hfz0bf0axj5kwb24yj674rchy41v5rd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIuXG5cblZlcnNpb24gNCBhbHNvIGRyb3AgdGhlIGNvbXBhdGliaWxpdHkgd2l0aCBHbm9tZSBTaGVsbCAzLjMwLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxnYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sZ2J1dHRvbiIsCiAgInV1aWQiOiAibGdidXR0b25AZ2xlcnJvLmdub21lLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxOCwKICAidmVyc2lvbi1uYW1lIjogIjIuMy4wIgp9"},
+    "46": {"version": "18", "sha256": "0nj4z1wmfpxmsn61m1bd4hfz0bf0axj5kwb24yj674rchy41v5rd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIuXG5cblZlcnNpb24gNCBhbHNvIGRyb3AgdGhlIGNvbXBhdGliaWxpdHkgd2l0aCBHbm9tZSBTaGVsbCAzLjMwLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxnYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sZ2J1dHRvbiIsCiAgInV1aWQiOiAibGdidXR0b25AZ2xlcnJvLmdub21lLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxOCwKICAidmVyc2lvbi1uYW1lIjogIjIuMy4wIgp9"},
+    "47": {"version": "18", "sha256": "0nj4z1wmfpxmsn61m1bd4hfz0bf0axj5kwb24yj674rchy41v5rd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIuXG5cblZlcnNpb24gNCBhbHNvIGRyb3AgdGhlIGNvbXBhdGliaWxpdHkgd2l0aCBHbm9tZSBTaGVsbCAzLjMwLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxnYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sZ2J1dHRvbiIsCiAgInV1aWQiOiAibGdidXR0b25AZ2xlcnJvLmdub21lLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxOCwKICAidmVyc2lvbi1uYW1lIjogIjIuMy4wIgp9"}
   }}
 , {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops. Now configurable!", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {
     "40": {"version": "11", "sha256": "1sw6mq3fgzv1jl33yf08rgd1fzqb17c5qvq41gq5b6kgn1cs36ji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -1998,7 +2105,9 @@
     "38": {"version": "4", "sha256": "0hi2knfigh23r7rjzsq8j6ls953hin038ia5v0ll6cnxzj42f91q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJhbWFnaXQub3JnL3N5bHRlci9kZW5vbi1hdnItY29udHJvbGVyIiwKICAidXVpZCI6ICJEZW5vbl9BVlJfY29udHJvbGVyQHN5bHRlci5mciIsCiAgInZlcnNpb24iOiA0Cn0="},
     "42": {"version": "7", "sha256": "1031wznkq4nr32iqzvp1k69bhwpnv5a04vl0f7sjwx48ll3062wj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJhbWFnaXQub3JnL3N5bHRlci9kZW5vbi1hdnItY29udHJvbGVyIiwKICAidXVpZCI6ICJEZW5vbl9BVlJfY29udHJvbGVyQHN5bHRlci5mciIsCiAgInZlcnNpb24iOiA3Cn0="},
     "43": {"version": "7", "sha256": "1031wznkq4nr32iqzvp1k69bhwpnv5a04vl0f7sjwx48ll3062wj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJhbWFnaXQub3JnL3N5bHRlci9kZW5vbi1hdnItY29udHJvbGVyIiwKICAidXVpZCI6ICJEZW5vbl9BVlJfY29udHJvbGVyQHN5bHRlci5mciIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "44": {"version": "7", "sha256": "1031wznkq4nr32iqzvp1k69bhwpnv5a04vl0f7sjwx48ll3062wj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJhbWFnaXQub3JnL3N5bHRlci9kZW5vbi1hdnItY29udHJvbGVyIiwKICAidXVpZCI6ICJEZW5vbl9BVlJfY29udHJvbGVyQHN5bHRlci5mciIsCiAgInZlcnNpb24iOiA3Cn0="}
+    "44": {"version": "7", "sha256": "1031wznkq4nr32iqzvp1k69bhwpnv5a04vl0f7sjwx48ll3062wj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJhbWFnaXQub3JnL3N5bHRlci9kZW5vbi1hdnItY29udHJvbGVyIiwKICAidXVpZCI6ICJEZW5vbl9BVlJfY29udHJvbGVyQHN5bHRlci5mciIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "46": {"version": "10", "sha256": "1w6nkzj114jhpcn5wv1mfbi31ydzhpmmy97c4jr6h0yrd5sz1g7z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyYW1hZ2l0Lm9yZy9zeWx0ZXIvZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInV1aWQiOiAiRGVub25fQVZSX2NvbnRyb2xlckBzeWx0ZXIuZnIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "47": {"version": "10", "sha256": "1w6nkzj114jhpcn5wv1mfbi31ydzhpmmy97c4jr6h0yrd5sz1g7z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJuYW1lIjogIkRlbm9uIEFWUiBjb250cm9sZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyYW1hZ2l0Lm9yZy9zeWx0ZXIvZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInV1aWQiOiAiRGVub25fQVZSX2NvbnRyb2xlckBzeWx0ZXIuZnIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
   }}
 , {"uuid": "hide-universal-access@akiirui.github.io", "name": "Hide Universal Access", "pname": "hide-universal-access", "description": "Hide Universal Access icon from the status bar", "link": "https://extensions.gnome.org/extension/2398/hide-universal-access/", "shell_version_map": {
     "38": {"version": "13", "sha256": "1xw8i864lc2zvzphh3rdal6d8l4nj5xmjigknrmb4pd2npwh6i20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -2008,7 +2117,8 @@
     "43": {"version": "13", "sha256": "1xw8i864lc2zvzphh3rdal6d8l4nj5xmjigknrmb4pd2npwh6i20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"},
     "44": {"version": "13", "sha256": "1xw8i864lc2zvzphh3rdal6d8l4nj5xmjigknrmb4pd2npwh6i20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"},
     "45": {"version": "16", "sha256": "11vwyvry553k1ffwmzy9mhracibn0nbwa3p4wnvi7czh55cq92ji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ha2lpcnVpL2hpZGUtdW5pdmVyc2FsLWFjY2VzcyIsCiAgInV1aWQiOiAiaGlkZS11bml2ZXJzYWwtYWNjZXNzQGFraWlydWkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="},
-    "46": {"version": "17", "sha256": "03gbsi62h3p2z3b0c8kfyxvxlqm5cbajlqzbk0692hdw9cy7lqcx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ha2lpcnVpL2hpZGUtdW5pdmVyc2FsLWFjY2VzcyIsCiAgInV1aWQiOiAiaGlkZS11bml2ZXJzYWwtYWNjZXNzQGFraWlydWkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}
+    "46": {"version": "17", "sha256": "03gbsi62h3p2z3b0c8kfyxvxlqm5cbajlqzbk0692hdw9cy7lqcx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ha2lpcnVpL2hpZGUtdW5pdmVyc2FsLWFjY2VzcyIsCiAgInV1aWQiOiAiaGlkZS11bml2ZXJzYWwtYWNjZXNzQGFraWlydWkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "47": {"version": "18", "sha256": "0k9ssq4ci97biwjkr3ss0zz4yrvw87i3kd6xyv3pv93xxi2x81ig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ha2lpcnVpL2hpZGUtdW5pdmVyc2FsLWFjY2VzcyIsCiAgInV1aWQiOiAiaGlkZS11bml2ZXJzYWwtYWNjZXNzQGFraWlydWkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}
   }}
 , {"uuid": "roundrobintaborder@scottworley.com", "name": "Round Robin Tab Order", "pname": "round-robin-tab-order", "description": "Window switch order becomes round-robin instead of most-recently-used", "link": "https://extensions.gnome.org/extension/2446/round-robin-tab-order/", "shell_version_map": {
     "40": {"version": "3", "sha256": "0p2qfv6i43pi0hjsyz8xzxkxijr06b0d20q618y8gfj4ar82glv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdyBzd2l0Y2ggb3JkZXIgYmVjb21lcyByb3VuZC1yb2JpbiBpbnN0ZWFkIG9mIG1vc3QtcmVjZW50bHktdXNlZCIsCiAgIm5hbWUiOiAiUm91bmQgUm9iaW4gVGFiIE9yZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2NodWNrL3JvdW5kLXJvYmluLXRhYi1vcmRlciIsCiAgInV1aWQiOiAicm91bmRyb2JpbnRhYm9yZGVyQHNjb3R0d29ybGV5LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
@@ -2020,8 +2130,9 @@
     "42": {"version": "20", "sha256": "0yz3vcjrbhlpiy5wbnbyp4ns9dbp4cgjhn7v9n65vfxf2r0498i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2J1YmJsZW1haWwuZnJlZS5mciIsCiAgInV1aWQiOiAiYnViYmxlbWFpbEByYXplci5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "43": {"version": "20", "sha256": "0yz3vcjrbhlpiy5wbnbyp4ns9dbp4cgjhn7v9n65vfxf2r0498i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2J1YmJsZW1haWwuZnJlZS5mciIsCiAgInV1aWQiOiAiYnViYmxlbWFpbEByYXplci5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "44": {"version": "20", "sha256": "0yz3vcjrbhlpiy5wbnbyp4ns9dbp4cgjhn7v9n65vfxf2r0498i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2J1YmJsZW1haWwuZnJlZS5mciIsCiAgInV1aWQiOiAiYnViYmxlbWFpbEByYXplci5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
-    "45": {"version": "23", "sha256": "00sksbyzis2jv06iaq4gmzjni269x2ygzlm6kipad3wkkg6y7g5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cDovL2J1YmJsZW1haWwuZnJlZS5mciIsCiAgInV1aWQiOiAiYnViYmxlbWFpbEByYXplci5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "46": {"version": "23", "sha256": "00sksbyzis2jv06iaq4gmzjni269x2ygzlm6kipad3wkkg6y7g5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cDovL2J1YmJsZW1haWwuZnJlZS5mciIsCiAgInV1aWQiOiAiYnViYmxlbWFpbEByYXplci5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMjMKfQ=="}
+    "45": {"version": "24", "sha256": "0m50szyww7hzm78pgldp29mpy12rpnwjalf3dhmwg91mmhy9dp9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHA6Ly9idWJibGVtYWlsLmZyZWUuZnIiLAogICJ1dWlkIjogImJ1YmJsZW1haWxAcmF6ZXIuZnJhbWFnaXQub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "46": {"version": "24", "sha256": "0m50szyww7hzm78pgldp29mpy12rpnwjalf3dhmwg91mmhy9dp9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHA6Ly9idWJibGVtYWlsLmZyZWUuZnIiLAogICJ1dWlkIjogImJ1YmJsZW1haWxAcmF6ZXIuZnJhbWFnaXQub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "47": {"version": "24", "sha256": "0m50szyww7hzm78pgldp29mpy12rpnwjalf3dhmwg91mmhy9dp9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHA6Ly9idWJibGVtYWlsLmZyZWUuZnIiLAogICJ1dWlkIjogImJ1YmJsZW1haWxAcmF6ZXIuZnJhbWFnaXQub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}
   }}
 , {"uuid": "keypadTiling@abakkk.framagit.org", "name": "Keypad Tiling", "pname": "keypad-tiling", "description": "", "link": "https://extensions.gnome.org/extension/2473/keypad-tiling/", "shell_version_map": {
     "38": {"version": "4", "sha256": "1v0hxg96l482wngrszh0xabgj95q7rmyimd2rxnbkddd2gascnya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXBhZC10aWxpbmciLAogICJuYW1lIjogIktleXBhZCBUaWxpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2V5cGFkLXRpbGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJrZXlwYWRUaWxpbmdAYWJha2trLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}
@@ -2055,12 +2166,10 @@
     "43": {"version": "33", "sha256": "1rbbnrywlwxfag6k393mnm54fxl8wk86h8fsqc7iaryiqxkdqj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
     "44": {"version": "33", "sha256": "1rbbnrywlwxfag6k393mnm54fxl8wk86h8fsqc7iaryiqxkdqj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
     "45": {"version": "35", "sha256": "1lamf55kfx2v0xwnlw5f1mjavyl3qf6cjrb77q0bim05zcd00dzj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogImZsb2F0aW5nLWRvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbG9hdGluZ0RvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mbG9hdGluZ0RvY2siLAogICJ1dWlkIjogImZsb2F0aW5nRG9ja0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"},
-    "46": {"version": "36", "sha256": "18dwf6k6i742iq0mnh0in3jxl6ws29ik2v3wr93mk8p5vkcd9r4a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogImZsb2F0aW5nLWRvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbG9hdGluZ0RvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mbG9hdGluZ0RvY2siLAogICJ1dWlkIjogImZsb2F0aW5nRG9ja0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"}
+    "46": {"version": "37", "sha256": "1w395crvcbbas9fgfn713g77i25yz0qjxfdd0abf1izmzq6vzmq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogImZsb2F0aW5nLWRvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbG9hdGluZ0RvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
+    "47": {"version": "37", "sha256": "1w395crvcbbas9fgfn713g77i25yz0qjxfdd0abf1izmzq6vzmq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogImZsb2F0aW5nLWRvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbG9hdGluZ0RvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}
   }}
-, {"uuid": "maxi@darkretailer.github.com", "name": "Maxi", "pname": "maxi", "description": "Maximize your windows vertical and/or horizontal (based on https://github.com/aXe1/gnome-shell-extension-maximized-by-default)", "link": "https://extensions.gnome.org/extension/2554/maxi/", "shell_version_map": {
-    "40": {"version": "5", "sha256": "121nd6ggr9id3yfsrkiza7rjq19638p156ym83i3j57ikz6r3ky5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgd2luZG93cyB2ZXJ0aWNhbCBhbmQvb3IgaG9yaXpvbnRhbCAoYmFzZWQgb24gaHR0cHM6Ly9naXRodWIuY29tL2FYZTEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplZC1ieS1kZWZhdWx0KSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtYXhpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWF4aSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhcmtyZXRhaWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25fbWF4aSIsCiAgInV1aWQiOiAibWF4aUBkYXJrcmV0YWlsZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}
-  }}
-, {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {
+, {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.\n\nPlease report issues via the github page.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {
     "38": {"version": "10", "sha256": "0xpw8n29y5j8vfb1fkxn8ph78m4bhi1k8q830g1zzpr3gmsabadi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "40": {"version": "15", "sha256": "14prrydkkvyq6kmznapjq31abk55v04bxdp3cx30gsdi6bkbfqav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxNQp9"},
     "41": {"version": "15", "sha256": "14prrydkkvyq6kmznapjq31abk55v04bxdp3cx30gsdi6bkbfqav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxNQp9"},
@@ -2068,7 +2177,7 @@
     "43": {"version": "23", "sha256": "1h6mwfjaqv56mxbc3yjaw9d008wacly4qigz7532mjzirmgpiqds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAyMwp9"},
     "44": {"version": "23", "sha256": "1h6mwfjaqv56mxbc3yjaw9d008wacly4qigz7532mjzirmgpiqds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAyMwp9"},
     "45": {"version": "26", "sha256": "1jaksr9ysszwvnqhz7sbsxjkkhmnbgpp7rrdshhqnns9xx251dpn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMjYKfQ=="},
-    "46": {"version": "27", "sha256": "08g8wjsgr1q1gzigac6xdmzqp7iykqk7cw2gxgbwc07m8dn24665", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}
+    "46": {"version": "28", "sha256": "0zdn82g1pp95r4dk0x0dlk022hg5nx0k72ibcy6nyqj3hg6ji2q1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}
   }}
 , {"uuid": "fully-transparent-top-bar@aunetx", "name": "Smart transparent topbar", "pname": "fully-transparent-top-bar", "description": "Permits to change topbar's look and feel when free-floating.\n\nIf you have issues or recommandations, you can tell me on github so I can see them!", "link": "https://extensions.gnome.org/extension/2588/fully-transparent-top-bar/", "shell_version_map": {
     "38": {"version": "11", "sha256": "1mksqaxw7jzzdghzii1bhhkbsccxb23qa69f3x6hg32ig9qi762x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcm1pdHMgdG8gY2hhbmdlIHRvcGJhcidzIGxvb2sgYW5kIGZlZWwgd2hlbiBmcmVlLWZsb2F0aW5nLlxuXG5JZiB5b3UgaGF2ZSBpc3N1ZXMgb3IgcmVjb21tYW5kYXRpb25zLCB5b3UgY2FuIHRlbGwgbWUgb24gZ2l0aHViIHNvIEkgY2FuIHNlZSB0aGVtISIsCiAgIm5hbWUiOiAiU21hcnQgdHJhbnNwYXJlbnQgdG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJmdWxseS10cmFuc3BhcmVudC10b3AtYmFyQGF1bmV0eCIsCiAgInZlcnNpb24iOiAxMQp9"}
@@ -2079,8 +2188,9 @@
     "42": {"version": "12", "sha256": "13pzx9h8685pk3wv5mndwdnsfd1zjywxxrc5z7759kd8hgvwqp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "43": {"version": "12", "sha256": "13pzx9h8685pk3wv5mndwdnsfd1zjywxxrc5z7759kd8hgvwqp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "44": {"version": "12", "sha256": "13pzx9h8685pk3wv5mndwdnsfd1zjywxxrc5z7759kd8hgvwqp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "45": {"version": "16", "sha256": "0si884yba6844x8nn4dy43y64h4lks9n648xqqhwalj10qxganr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
-    "46": {"version": "16", "sha256": "0si884yba6844x8nn4dy43y64h4lks9n648xqqhwalj10qxganr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
+    "45": {"version": "17", "sha256": "04gv14lpii71llbbfv9sn95d7cwiaayw8b4148kn4i3kvxss9jch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "46": {"version": "17", "sha256": "04gv14lpii71llbbfv9sn95d7cwiaayw8b4148kn4i3kvxss9jch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "47": {"version": "17", "sha256": "04gv14lpii71llbbfv9sn95d7cwiaayw8b4148kn4i3kvxss9jch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6XG4xKSBOZXcgbWVzc2FnZSBpbmRpY2F0b3IgaXMgYWx3YXlzIHNob3duIGlmIHRoZXJlIGFyZSBub3RpZmljYXRpb25zLlxuMikgVGhlIGNvbG9yIG9mIHRoZSBpbmRpY2F0b3IgY2FuIGJlIGN1c3RvbWl6ZWQuXG4zKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFsd2F5cy1pbmRpY2F0b3IiLAogICJuYW1lIjogIkFsd2F5cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx3YXlzLWluZGljYXRvci1zZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDE3Cn0="}
   }}
 , {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {
     "38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"},
@@ -2102,7 +2212,8 @@
     "43": {"version": "10", "sha256": "0w3xh2bdyc2x2scj70qvjpj39hjhsayfsy8065dp0qmlhfi7z9kz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInVzZXItaWQtaW4tdG9wLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "44": {"version": "10", "sha256": "0w3xh2bdyc2x2scj70qvjpj39hjhsayfsy8065dp0qmlhfi7z9kz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInVzZXItaWQtaW4tdG9wLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "45": {"version": "13", "sha256": "102yl3xq7vzfp81dm5awa5qqh5ddzaw419q50dy7wfl567p8fya0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4gQ2xpY2sgdG8gYWNjZXNzIHVzZXJzIHBhbmVsIGluIGNvbnRyb2wgY2VudGVyLiIsCiAgIm5hbWUiOiAiVXNlciBpZCBpbiB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "46": {"version": "13", "sha256": "102yl3xq7vzfp81dm5awa5qqh5ddzaw419q50dy7wfl567p8fya0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4gQ2xpY2sgdG8gYWNjZXNzIHVzZXJzIHBhbmVsIGluIGNvbnRyb2wgY2VudGVyLiIsCiAgIm5hbWUiOiAiVXNlciBpZCBpbiB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAxMwp9"}
+    "46": {"version": "14", "sha256": "1zzk6l8vx46x6ywvf1g273m55kgi04nkl5nyva990q0ycxvqyddr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4gQ2xpY2sgdG8gYWNjZXNzIHVzZXJzIHBhbmVsIGluIGNvbnRyb2wgY2VudGVyLiIsCiAgIm5hbWUiOiAiVXNlciBpZCBpbiB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "47": {"version": "14", "sha256": "1zzk6l8vx46x6ywvf1g273m55kgi04nkl5nyva990q0ycxvqyddr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4gQ2xpY2sgdG8gYWNjZXNzIHVzZXJzIHBhbmVsIGluIGNvbnRyb2wgY2VudGVyLiIsCiAgIm5hbWUiOiAiVXNlciBpZCBpbiB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAxNAp9"}
   }}
 , {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {
     "38": {"version": "8", "sha256": "1r39a9px28kwz1ndxrbgn1d5nyp8bcyl37ihg6p3y4fnzk5racab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
@@ -2111,8 +2222,9 @@
     "42": {"version": "8", "sha256": "1r39a9px28kwz1ndxrbgn1d5nyp8bcyl37ihg6p3y4fnzk5racab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "43": {"version": "8", "sha256": "1r39a9px28kwz1ndxrbgn1d5nyp8bcyl37ihg6p3y4fnzk5racab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "44": {"version": "8", "sha256": "1r39a9px28kwz1ndxrbgn1d5nyp8bcyl37ihg6p3y4fnzk5racab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "45": {"version": "10", "sha256": "1hzxdim8w2shkyrivm4ws8sd63nci1j1fr8ykw2na9g0wkjjznnl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "46": {"version": "10", "sha256": "1hzxdim8w2shkyrivm4ws8sd63nci1j1fr8ykw2na9g0wkjjznnl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "11", "sha256": "15d2xmfz5ygyhgmzxvcfc2ch6cdhpq1fbq7mskj2vqgrcp89yjd7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "46": {"version": "11", "sha256": "15d2xmfz5ygyhgmzxvcfc2ch6cdhpq1fbq7mskj2vqgrcp89yjd7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "47": {"version": "11", "sha256": "15d2xmfz5ygyhgmzxvcfc2ch6cdhpq1fbq7mskj2vqgrcp89yjd7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}
   }}
 , {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {
     "40": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"},
@@ -2120,8 +2232,9 @@
     "42": {"version": "31", "sha256": "035j0qswaw2hj06ybq2qdhlsshwfi2fyh2l0mca7jq1qp2w955xw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
     "43": {"version": "44", "sha256": "0566dw0517wb3xz64grv5bk3kvk9494ijzkkpvhi0jzx87b2dgvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="},
     "44": {"version": "44", "sha256": "0566dw0517wb3xz64grv5bk3kvk9494ijzkkpvhi0jzx87b2dgvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="},
-    "45": {"version": "49", "sha256": "0s3kwzjlp9zx558hh9ih50sd2dvap491i6cqd2iwym4q33jwdi6f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
-    "46": {"version": "49", "sha256": "0s3kwzjlp9zx558hh9ih50sd2dvap491i6cqd2iwym4q33jwdi6f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}
+    "45": {"version": "54", "sha256": "1x9c0g914f405yq50n92v14pyq6j3vivc75bkyqh7a6qgb047gjy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
+    "46": {"version": "54", "sha256": "1x9c0g914f405yq50n92v14pyq6j3vivc75bkyqh7a6qgb047gjy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
+    "47": {"version": "54", "sha256": "1x9c0g914f405yq50n92v14pyq6j3vivc75bkyqh7a6qgb047gjy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}
   }}
 , {"uuid": "timezones@masquerade-circus.net", "name": "Timezones extension", "pname": "timezones-extension", "description": "Show multiple clocks in the panel. For those who need more than one additional clock.", "link": "https://extensions.gnome.org/extension/2657/timezones-extension/", "shell_version_map": {
     "38": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -2184,16 +2297,18 @@
     "43": {"version": "41", "sha256": "0irsbwxbh9xvb76j4nfiy508kir72x11h9bbmwhsyd531d0jmyjm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiA0MQp9"},
     "44": {"version": "41", "sha256": "0irsbwxbh9xvb76j4nfiy508kir72x11h9bbmwhsyd531d0jmyjm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiA0MQp9"},
     "45": {"version": "46", "sha256": "0b9a6ngj9w83gqasg0b3h8iy4abl0ysrj9jpkqwj8xq0xr9b0g3v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiA0Ngp9"},
-    "46": {"version": "47", "sha256": "0pmhl80q5d4h39kb9bb6abnr75hvliin0c7h9m66z3giqxq7nss0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ3Cn0="}
+    "46": {"version": "49", "sha256": "0azw9qyakk3228m12251xrj2aijfhb5nj460qwvms8i8d3855yyk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiA0OQp9"},
+    "47": {"version": "49", "sha256": "0azw9qyakk3228m12251xrj2aijfhb5nj460qwvms8i8d3855yyk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiA0OQp9"}
   }}
-, {"uuid": "ibus-tweaker@tuberry.github.com", "name": "IBus Tweaker", "pname": "ibus-tweaker", "description": "Tweaker of IBus for orientation, theme, font, input mode and clipboard history\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2820/ibus-tweaker/", "shell_version_map": {
+, {"uuid": "ibus-tweaker@tuberry.github.com", "name": "IBus Tweaker", "pname": "ibus-tweaker", "description": "Tweaker of IBus for theme, font, input mode and clipboard history\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2820/ibus-tweaker/", "shell_version_map": {
     "38": {"version": "28", "sha256": "1ahhcq8hpxkdvq1fp8gd8qp1cfsgqsm9swn4ph9kyrzr7j8jvc3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2lidXMtdHdlYWtlciIsCiAgInV1aWQiOiAiaWJ1cy10d2Vha2VyQHR1YmVycnkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"},
     "40": {"version": "34", "sha256": "0fs0hlxdnhssx9vcghbicg1fn3clws9q2f3nzdi4virpm8wksf3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9pYnVzLXR3ZWFrZXIiLAogICJ1dWlkIjogImlidXMtdHdlYWtlckB0dWJlcnJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "41": {"version": "36", "sha256": "0f819v8n1rvvwrir7qf8fp0bvn5zk899lpc4dr8f9jk9g8w57q7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="},
     "42": {"version": "38", "sha256": "0crdw1z2yan0mbc36v8vw0iinqbv4lyqzsvdyhz8zsi9q4asrlg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="},
     "43": {"version": "40", "sha256": "0b807s4bfxmxf6131749gi3nil42dabmz2ndwwsblcpbj0cas7mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="},
     "45": {"version": "44", "sha256": "1fk1mbsms1y4h08vrgaq4iqi995q849891n15j9a34xd31a3qcmk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="},
-    "46": {"version": "46", "sha256": "1dgswxn9p66svnw1l6c6p0zv9dbgirx03hjxjhn8w1dbb54sryy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}
+    "46": {"version": "46", "sha256": "1dgswxn9p66svnw1l6c6p0zv9dbgirx03hjxjhn8w1dbb54sryy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="},
+    "47": {"version": "47", "sha256": "15178w023fk9i1qa654ijsg828nk140y6gpn4rfdya7jxhi3c40s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3IgdGhlbWUsIGZvbnQsIGlucHV0IG1vZGUgYW5kIGNsaXBib2FyZCBoaXN0b3J5XG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9pYnVzLXR3ZWFrZXIiLAogICJ1dWlkIjogImlidXMtdHdlYWtlckB0dWJlcnJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}
   }}
 , {"uuid": "generic-monitor@gnome-shell-extensions", "name": "Generic Monitor", "pname": "generic-monitor", "description": "Display text & icon on systray using DBUS", "link": "https://extensions.gnome.org/extension/2826/generic-monitor/", "shell_version_map": {
     "38": {"version": "10", "sha256": "0kvniacvxv57f6jfcrlrd7ggwj4h0bfs60r59p150m6nldm9zf23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEwCn0="},
@@ -2201,7 +2316,10 @@
     "41": {"version": "13", "sha256": "1mpk0c7ica7876jlw65sx8mm3qnjzg6vqv7c3yq83cl0nh3c3bw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0Mi4zIgogIF0sCiAgInVybCI6ICJodHRwOi8vaW5kZWZlcm8uc291dGFkZS5mci9wL2dlbmVyaWNtb25pdG9yIiwKICAidXVpZCI6ICJnZW5lcmljLW1vbml0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInZlcnNpb24iOiAxMwp9"},
     "42": {"version": "13", "sha256": "1mpk0c7ica7876jlw65sx8mm3qnjzg6vqv7c3yq83cl0nh3c3bw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0Mi4zIgogIF0sCiAgInVybCI6ICJodHRwOi8vaW5kZWZlcm8uc291dGFkZS5mci9wL2dlbmVyaWNtb25pdG9yIiwKICAidXVpZCI6ICJnZW5lcmljLW1vbml0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInZlcnNpb24iOiAxMwp9"},
     "43": {"version": "13", "sha256": "1mpk0c7ica7876jlw65sx8mm3qnjzg6vqv7c3yq83cl0nh3c3bw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0Mi4zIgogIF0sCiAgInVybCI6ICJodHRwOi8vaW5kZWZlcm8uc291dGFkZS5mci9wL2dlbmVyaWNtb25pdG9yIiwKICAidXVpZCI6ICJnZW5lcmljLW1vbml0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "44": {"version": "13", "sha256": "1mpk0c7ica7876jlw65sx8mm3qnjzg6vqv7c3yq83cl0nh3c3bw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0Mi4zIgogIF0sCiAgInVybCI6ICJodHRwOi8vaW5kZWZlcm8uc291dGFkZS5mci9wL2dlbmVyaWNtb25pdG9yIiwKICAidXVpZCI6ICJnZW5lcmljLW1vbml0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInZlcnNpb24iOiAxMwp9"}
+    "44": {"version": "13", "sha256": "1mpk0c7ica7876jlw65sx8mm3qnjzg6vqv7c3yq83cl0nh3c3bw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0Mi4zIgogIF0sCiAgInVybCI6ICJodHRwOi8vaW5kZWZlcm8uc291dGFkZS5mci9wL2dlbmVyaWNtb25pdG9yIiwKICAidXVpZCI6ICJnZW5lcmljLW1vbml0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInZlcnNpb24iOiAxMwp9"},
+    "45": {"version": "15", "sha256": "0cx0mbwhv0k7p47mmhsgifvvamv1ik0ifn7awbdiwzmaxx0nib41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZm9yZ2Uuc291dGFkZS5mci9zb3V0YWRlL0dub21lU2hlbGxHZW5lcmljTW9uaXRvciIsCiAgInV1aWQiOiAiZ2VuZXJpYy1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "0cx0mbwhv0k7p47mmhsgifvvamv1ik0ifn7awbdiwzmaxx0nib41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZm9yZ2Uuc291dGFkZS5mci9zb3V0YWRlL0dub21lU2hlbGxHZW5lcmljTW9uaXRvciIsCiAgInV1aWQiOiAiZ2VuZXJpYy1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "0cx0mbwhv0k7p47mmhsgifvvamv1ik0ifn7awbdiwzmaxx0nib41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZm9yZ2Uuc291dGFkZS5mci9zb3V0YWRlL0dub21lU2hlbGxHZW5lcmljTW9uaXRvciIsCiAgInV1aWQiOiAiZ2VuZXJpYy1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "hide-keyboard-layout@sitnik.ru", "name": "Hide Keyboard Layout", "pname": "hide-keyboard-layout", "description": "Hide keyboard layout indicator in status bar", "link": "https://extensions.gnome.org/extension/2848/hide-keyboard-layout/", "shell_version_map": {
     "38": {"version": "6", "sha256": "10mk7fbm3bp9rz8xqmwkrc8ww587ia8r4v8zdcsp0ps0qwbdra1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -2210,8 +2328,9 @@
     "42": {"version": "6", "sha256": "10mk7fbm3bp9rz8xqmwkrc8ww587ia8r4v8zdcsp0ps0qwbdra1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "6", "sha256": "10mk7fbm3bp9rz8xqmwkrc8ww587ia8r4v8zdcsp0ps0qwbdra1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "44": {"version": "6", "sha256": "10mk7fbm3bp9rz8xqmwkrc8ww587ia8r4v8zdcsp0ps0qwbdra1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA2Cn0="},
-    "45": {"version": "8", "sha256": "05vm7a94nysn8si3pgdcmn5r8242q6ikw1hkc4bwcpmf2lifbfbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "05vm7a94nysn8si3pgdcmn5r8242q6ikw1hkc4bwcpmf2lifbfbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "9", "sha256": "1s5drvrm0ry1fj27fav5nll0rwrxrkm0s88apcmywcvxsg2xsvn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "1s5drvrm0ry1fj27fav5nll0rwrxrkm0s88apcmywcvxsg2xsvn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "1s5drvrm0ry1fj27fav5nll0rwrxrkm0s88apcmywcvxsg2xsvn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "poweroff-button-on-topbar@darknico.com", "name": "Poweroff Button on Topbar", "pname": "poweroff-button-on-topbar", "description": "Add poweroff button on topbar", "link": "https://extensions.gnome.org/extension/2851/poweroff-button-on-topbar/", "shell_version_map": {
     "38": {"version": "5", "sha256": "0wl9qhrrx1j1qwz7iczpn1zb2kzy7q895a1ar8178a58lddxhwzy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFya25pY28vR05PTUUtU2hlbGwtRXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicG93ZXJvZmYtYnV0dG9uLW9uLXRvcGJhckBkYXJrbmljby5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -2250,7 +2369,8 @@
     "43": {"version": "26", "sha256": "1yx9w70ql13f0gnjbihkscyhi8mgapbl6p0hy0aqmnirhwn3fc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNgp9"},
     "44": {"version": "27", "sha256": "1jmbprslj0yk1hpdwlxs8qgg2r9djyp7wgz30jv0nylkg6y1api3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNwp9"},
     "45": {"version": "29", "sha256": "1p87lk0rsrj8vr2kdckshcq1y72az2dyzckgy7gj83a2v2mhfghd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyOQp9"},
-    "46": {"version": "30", "sha256": "0pjiyzn40zf6l0288jh8nh9nlz9v8919635mgjzf6l37m8mc4rwq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAzMAp9"}
+    "46": {"version": "30", "sha256": "0pjiyzn40zf6l0288jh8nh9nlz9v8919635mgjzf6l37m8mc4rwq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAzMAp9"},
+    "47": {"version": "31", "sha256": "0md1lm9dl0rb2hys3gp7zagddcb87fl35xlnmv0ymh98fji782di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAzMQp9"}
   }}
 , {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {
     "38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -2259,8 +2379,9 @@
     "42": {"version": "27", "sha256": "1bssg2w71qinr2hhsyv0rpps7876y91azpqcl3dhdgipki4n7yvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
     "43": {"version": "27", "sha256": "1bssg2w71qinr2hhsyv0rpps7876y91azpqcl3dhdgipki4n7yvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
     "44": {"version": "27", "sha256": "1bssg2w71qinr2hhsyv0rpps7876y91azpqcl3dhdgipki4n7yvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
-    "45": {"version": "34", "sha256": "1lj314mf4zvp36sfzxm7jqwk17qvbd73jrbji8jd52b3l3svigjl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAzNCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIiCn0="},
-    "46": {"version": "34", "sha256": "1lj314mf4zvp36sfzxm7jqwk17qvbd73jrbji8jd52b3l3svigjl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAzNCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIiCn0="}
+    "45": {"version": "36", "sha256": "028x34r7zvk8lbbc8y0kc6p5kbdhwwvm4zfnq9y7xa9pp12iz109", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "46": {"version": "36", "sha256": "028x34r7zvk8lbbc8y0kc6p5kbdhwwvm4zfnq9y7xa9pp12iz109", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "47": {"version": "36", "sha256": "028x34r7zvk8lbbc8y0kc6p5kbdhwwvm4zfnq9y7xa9pp12iz109", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"}
   }}
 , {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {
     "38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -2269,8 +2390,9 @@
     "42": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="},
     "43": {"version": "22", "sha256": "0vpnp0w7h33p5as86a03i5sg6clfd61q7f4p40ab16i4fsyy0dyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMgp9"},
     "44": {"version": "22", "sha256": "0vpnp0w7h33p5as86a03i5sg6clfd61q7f4p40ab16i4fsyy0dyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMgp9"},
-    "45": {"version": "30", "sha256": "0rrm7b0jsmdjixw28gahmkw1dmrgashqvr0f6fcj7nyqhj8glrc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiQ2hyaXNMYXVpbmdlcjc3IiwKICAgICJwYXlwYWwiOiAiQ2hyaXNMYXVpbmdlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLVNldHRpbmdzQ2VudGVyIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDMwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMyIKfQ=="},
-    "46": {"version": "30", "sha256": "0rrm7b0jsmdjixw28gahmkw1dmrgashqvr0f6fcj7nyqhj8glrc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiQ2hyaXNMYXVpbmdlcjc3IiwKICAgICJwYXlwYWwiOiAiQ2hyaXNMYXVpbmdlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLVNldHRpbmdzQ2VudGVyIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDMwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMyIKfQ=="}
+    "45": {"version": "31", "sha256": "0nhaangqw51m0hqmh5j4k2xpi76majwd05zprnllcjywl72f22bk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiQ2hyaXNMYXVpbmdlcjc3IiwKICAgICJwYXlwYWwiOiAiQ2hyaXNMYXVpbmdlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1TZXR0aW5nc0NlbnRlciIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAzMSwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "46": {"version": "31", "sha256": "0nhaangqw51m0hqmh5j4k2xpi76majwd05zprnllcjywl72f22bk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiQ2hyaXNMYXVpbmdlcjc3IiwKICAgICJwYXlwYWwiOiAiQ2hyaXNMYXVpbmdlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1TZXR0aW5nc0NlbnRlciIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAzMSwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "47": {"version": "32", "sha256": "1d64d8q062hnr8499vnclifv9zcvw3phc7d6v3m4367pnq1zqcah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiQ2hyaXNMYXVpbmdlcjc3IiwKICAgICJwYXlwYWwiOiAiQ2hyaXNMYXVpbmdlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tU2V0dGluZ3NDZW50ZXIiLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzIsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4xIgp9"}
   }}
 , {"uuid": "auto-mute-toggle@garotosopa.github.io", "name": "Auto-mute toggle", "pname": "auto-mute-toggle", "description": "Toggle whether to auto-mute speakers when headphones are plugged in.", "link": "https://extensions.gnome.org/extension/2905/auto-mute-toggle/", "shell_version_map": {
     "40": {"version": "6", "sha256": "1lyh51gvsh9ydip77vjj8rigjiah97lh8gp91jcpqblwx69fs3dk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3aGV0aGVyIHRvIGF1dG8tbXV0ZSBzcGVha2VycyB3aGVuIGhlYWRwaG9uZXMgYXJlIHBsdWdnZWQgaW4uIiwKICAibmFtZSI6ICJBdXRvLW11dGUgdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhcm90b3NvcGEvZ3NlLWF1dG8tbXV0ZS10b2dnbGUiLAogICJ1dWlkIjogImF1dG8tbXV0ZS10b2dnbGVAZ2Fyb3Rvc29wYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}
@@ -2286,8 +2408,9 @@
     "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"},
     "43": {"version": "37", "sha256": "1v8mwc6sy99mnxqzpcgrnc06sdnnm6digwpn6yk7prsfgygpd00i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
     "44": {"version": "43", "sha256": "1s49pdsab7qw4g14b3ghns2jlsi7h97zz9k9fiqpy4ff6mk41kni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNDMKfQ=="},
-    "45": {"version": "58", "sha256": "0c67y69zsjk1a9sp06ar0pllnabgwfl19g4m82aq3zc1634k6zq2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5icmluZy1vdXQtc3VibWVudS1vZi1wb3dlci1vZmYtbG9nb3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvYnJpbmctb3V0LXN1Ym1lbnUtb2YtcG93ZXItb2ZmLWxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNTgKfQ=="},
-    "46": {"version": "58", "sha256": "0c67y69zsjk1a9sp06ar0pllnabgwfl19g4m82aq3zc1634k6zq2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5icmluZy1vdXQtc3VibWVudS1vZi1wb3dlci1vZmYtbG9nb3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvYnJpbmctb3V0LXN1Ym1lbnUtb2YtcG93ZXItb2ZmLWxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}
+    "45": {"version": "60", "sha256": "0m1l7by7i2nd0h400l9glx6mzqnkggngkazz5yyvxyawxhcs7j1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5icmluZy1vdXQtc3VibWVudS1vZi1wb3dlci1vZmYtbG9nb3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2JyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDYwCn0="},
+    "46": {"version": "60", "sha256": "0m1l7by7i2nd0h400l9glx6mzqnkggngkazz5yyvxyawxhcs7j1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5icmluZy1vdXQtc3VibWVudS1vZi1wb3dlci1vZmYtbG9nb3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2JyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDYwCn0="},
+    "47": {"version": "60", "sha256": "0m1l7by7i2nd0h400l9glx6mzqnkggngkazz5yyvxyawxhcs7j1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5icmluZy1vdXQtc3VibWVudS1vZi1wb3dlci1vZmYtbG9nb3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2JyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDYwCn0="}
   }}
 , {"uuid": "batterytimepercentagecompact@sagrland.de", "name": "Battery Time (Percentage) Compact", "pname": "battery-time-percentage-compact", "description": "Show the remaining time until fully charged/discharged as well as percentage of battery charge in the panel.", "link": "https://extensions.gnome.org/extension/2929/battery-time-percentage-compact/", "shell_version_map": {
     "38": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -2304,18 +2427,20 @@
     "42": {"version": "23", "sha256": "137lcwg6c0xarz6px5z846cfpl1vaklh5m525a8p3793cxa24lbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
     "43": {"version": "23", "sha256": "137lcwg6c0xarz6px5z846cfpl1vaklh5m525a8p3793cxa24lbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
     "44": {"version": "23", "sha256": "137lcwg6c0xarz6px5z846cfpl1vaklh5m525a8p3793cxa24lbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "45": {"version": "26", "sha256": "1b00a3r3656iln0blf0883riy6q4k3pybzzsdi9ymd6cifvkhrm6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYXVqb25hcy9leGVjdXRvciIsCiAgInV1aWQiOiAiZXhlY3V0b3JAcmF1am9uYXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI2Cn0="},
-    "46": {"version": "26", "sha256": "1b00a3r3656iln0blf0883riy6q4k3pybzzsdi9ymd6cifvkhrm6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYXVqb25hcy9leGVjdXRvciIsCiAgInV1aWQiOiAiZXhlY3V0b3JAcmF1am9uYXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI2Cn0="}
+    "45": {"version": "27", "sha256": "1jkyqyi69rrfg6qizvwdlbh2nrwpym6qnqvm25m7c60l7f6y08hh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNwp9"},
+    "46": {"version": "27", "sha256": "1jkyqyi69rrfg6qizvwdlbh2nrwpym6qnqvm25m7c60l7f6y08hh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNwp9"},
+    "47": {"version": "27", "sha256": "1jkyqyi69rrfg6qizvwdlbh2nrwpym6qnqvm25m7c60l7f6y08hh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNwp9"}
   }}
-, {"uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm", "name": "Control Blur Effect On Lockscreen", "pname": "control-blur-effect-on-lock-screen", "description": "Control the Blur Effect On Lockscreen.", "link": "https://extensions.gnome.org/extension/2935/control-blur-effect-on-lock-screen/", "shell_version_map": {
+, {"uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm", "name": "Control Blur Effect On Lockscreen", "pname": "control-blur-effect-on-lock-screen", "description": "October 31st 2024\n\nPlease use lockscreen-extension instead of this one as this (\nControl Blur Effect On Lockscreen\n) extension is now migrated to lockscreen-extension (\nhttps://extensions.gnome.org/extension/7472/lockscreen-extension/\n).\n\nIt is a improved version which has the capability to change the background and set the blur in real time.", "link": "https://extensions.gnome.org/extension/2935/control-blur-effect-on-lock-screen/", "shell_version_map": {
     "38": {"version": "14", "sha256": "176qxx2zykzzjq2xf8sf1c83r1skaxa2mzmp51v8bq3vbbxp0wij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "40": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "41": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "42": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "43": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "44": {"version": "21", "sha256": "1vwbls2cnlgcbjspwnxadd8b8d34lisaddxhlfhymn6hnjyi7skx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIxCn0="},
-    "45": {"version": "25", "sha256": "01167j6kp1jm238qs9lngqz137nlwaj4qc9lbfpxf8p325fc2qc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2tzY3JlZW4uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkNvbnRyb2wgQmx1ciBFZmZlY3QgT24gTG9ja3NjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
-    "46": {"version": "25", "sha256": "01167j6kp1jm238qs9lngqz137nlwaj4qc9lbfpxf8p325fc2qc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2tzY3JlZW4uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkNvbnRyb2wgQmx1ciBFZmZlY3QgT24gTG9ja3NjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
+    "45": {"version": "26", "sha256": "1x8n9pnf2x7q9zc3b12rzdvqm9ygkx5iqa3x2adwlcllp1gbjsdq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2tzY3JlZW4uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkNvbnRyb2wgQmx1ciBFZmZlY3QgT24gTG9ja3NjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2NvbnRyb2wtYmx1ci1lZmZlY3Qtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "46": {"version": "26", "sha256": "1x8n9pnf2x7q9zc3b12rzdvqm9ygkx5iqa3x2adwlcllp1gbjsdq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2tzY3JlZW4uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkNvbnRyb2wgQmx1ciBFZmZlY3QgT24gTG9ja3NjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2NvbnRyb2wtYmx1ci1lZmZlY3Qtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "47": {"version": "26", "sha256": "1x8n9pnf2x7q9zc3b12rzdvqm9ygkx5iqa3x2adwlcllp1gbjsdq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2tzY3JlZW4uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkNvbnRyb2wgQmx1ciBFZmZlY3QgT24gTG9ja3NjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udHJvbC1ibHVyLWVmZmVjdC1vbi1sb2Nrc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2NvbnRyb2wtYmx1ci1lZmZlY3Qtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI2Cn0="}
   }}
 , {"uuid": "light-dict@tuberry.github.io", "name": "Light Dict", "pname": "light-dict", "description": "Lightweight extension for on-the-fly manipulation to primary selections, especially optimized for Dictionary lookups\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2959/light-dict/", "shell_version_map": {
     "38": {"version": "47", "sha256": "1m2cbi9vza162fvkp9lsmnxwg0j4ixp976pq5znzhxsik2l8r4nr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzIG9yIHRyYW5zbGF0aW9uc1xuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsaWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2xpZ2h0LWRpY3QiLAogICJ1dWlkIjogImxpZ2h0LWRpY3RAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDcKfQ=="},
@@ -2324,7 +2449,8 @@
     "42": {"version": "67", "sha256": "0405yz8w5a1h56csh2xl9kn7bbxr7r8vmsslh9y4l16gxs2nmkrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzIG9yIHRyYW5zbGF0aW9uc1xuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Nwp9"},
     "43": {"version": "71", "sha256": "01hmh278h8kjym6zvvqglfdg8qkfrz364p3srci137vwkc2rpd9x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzIG9yIHRyYW5zbGF0aW9uc1xuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3MQp9"},
     "45": {"version": "76", "sha256": "1m4k6gkda7axddm6y16z6d10sv0awxp6vsa23sw10djzk211bgf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDc2Cn0="},
-    "46": {"version": "80", "sha256": "016x7ihcahs19gbihdrlhrgrpmw04cnjcmhgkv5q1hvkzgq12wza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgwCn0="}
+    "46": {"version": "80", "sha256": "016x7ihcahs19gbihdrlhrgrpmw04cnjcmhgkv5q1hvkzgq12wza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgwCn0="},
+    "47": {"version": "81", "sha256": "1xq327m2q19204l0vvrwr5swal7i4bikb1ppzgrr7rslbzry74xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgxCn0="}
   }}
 , {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for the Gnome Shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {
     "38": {"version": "11", "sha256": "1y33l24q441nc147njjp4ylygmfr73br8adc8yfbp9p8dzh084f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="},
@@ -2333,10 +2459,11 @@
     "42": {"version": "16", "sha256": "0zjrnixd5cld46vj1ibl70gn5223rp9kllsq6wy53cqhxmrizskg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxNgp9"},
     "43": {"version": "16", "sha256": "0zjrnixd5cld46vj1ibl70gn5223rp9kllsq6wy53cqhxmrizskg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxNgp9"},
     "44": {"version": "16", "sha256": "0zjrnixd5cld46vj1ibl70gn5223rp9kllsq6wy53cqhxmrizskg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxNgp9"},
-    "45": {"version": "18", "sha256": "165410zy48ar7fhwfqzi07i585krpcs05819k1x5kqclngvy0g9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxOAp9"},
-    "46": {"version": "18", "sha256": "165410zy48ar7fhwfqzi07i585krpcs05819k1x5kqclngvy0g9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxOAp9"}
+    "45": {"version": "19", "sha256": "1pzfgjywcmsvyb9bvfqbklpwb6p1cy3nkbdbfvkifmwjf4w47r8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbFNoYWtpYi9JbnRlcm5ldFNwZWVkTWV0ZXIiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNZXRlckBhbHNoYWtpYi5kZXYiLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
+    "46": {"version": "19", "sha256": "1pzfgjywcmsvyb9bvfqbklpwb6p1cy3nkbdbfvkifmwjf4w47r8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbFNoYWtpYi9JbnRlcm5ldFNwZWVkTWV0ZXIiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNZXRlckBhbHNoYWtpYi5kZXYiLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
+    "47": {"version": "19", "sha256": "1pzfgjywcmsvyb9bvfqbklpwb6p1cy3nkbdbfvkifmwjf4w47r8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbFNoYWtpYi9JbnRlcm5ldFNwZWVkTWV0ZXIiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNZXRlckBhbHNoYWtpYi5kZXYiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}
   }}
-, {"uuid": "IP-Finder@linxgem33.com", "name": "IP Finder", "pname": "ip-finder", "description": "Displays useful information about your public IP Address and VPN status.\n\nIP Finder displays information about your public IP address, hostname, country, AS Block, as well as  a map tile of your Geolocation and country flag,  this extension is Also Useful for informational purposes to monitor VPN changes and public network IP Addresses.\n\nIP Finder can monitor in real time\n\n*Wireguard connections\n*OpenVPN connections\n*IPV4/6 connections\n*Proxy connections\n*VPN vendor applications\n*Manual static IP changes\n*Manually added connections", "link": "https://extensions.gnome.org/extension/2983/ip-finder/", "shell_version_map": {
+, {"uuid": "IP-Finder@linxgem33.com", "name": "IP Finder", "pname": "ip-finder", "description": "Displays useful information about your public IP Address and VPN status.\n\nIP Finder displays information about your public IP address, host-name, country, AS Block, as well as  a map tile of your Geo-location and country flag,  this extension is Also Useful for informational purposes to monitor VPN changes and public network IP Addresses.\n\nIP Finder can monitor in real time\n\n*Wire-guard connections\n*Open-VPN connections\n*IPV4/6 connections\n*Proxy connections\n*VPN vendor applications\n*Manual static IP changes\n*Manually added connections", "link": "https://extensions.gnome.org/extension/2983/ip-finder/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1g6xady411kx81crwnbgqh1afxlfjakgwdhbwznqvrjnbb98dh1r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0xpbnhHZW0zMy9JUC1GaW5kZXIiLAogICJ1dWlkIjogIklQLUZpbmRlckBsaW54Z2VtMzMuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "40": {"version": "9", "sha256": "08m3cga2xxkfwk3divpisf5zpyibj899ayzhhvznf0yxg4dh2x79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
     "41": {"version": "9", "sha256": "08m3cga2xxkfwk3divpisf5zpyibj899ayzhhvznf0yxg4dh2x79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
@@ -2344,7 +2471,8 @@
     "43": {"version": "16", "sha256": "0rn17nx1awl85ldrbwqdcyiyflaqgin3wq178pwnwlwlh80jzl46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImlwLWZpbmRlciIsCiAgIm5hbWUiOiAiSVAgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlwLWZpbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
     "44": {"version": "16", "sha256": "0rn17nx1awl85ldrbwqdcyiyflaqgin3wq178pwnwlwlh80jzl46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImlwLWZpbmRlciIsCiAgIm5hbWUiOiAiSVAgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlwLWZpbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
     "45": {"version": "20", "sha256": "17a2f11qa25lk3cq29kd2442hsi0csk2q120w1pfcy7m42dmp72l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImlwLWZpbmRlciIsCiAgIm5hbWUiOiAiSVAgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlwLWZpbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9MaW54R2VtMzMvSVAtRmluZGVyIiwKICAidXVpZCI6ICJJUC1GaW5kZXJAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "46": {"version": "21", "sha256": "0gmfiqvsl9nl219qvw6x9v0kjpk7xb7gzs5vjr88krhzzcvxbpgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImlwLWZpbmRlciIsCiAgIm5hbWUiOiAiSVAgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlwLWZpbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9MaW54R2VtMzMvSVAtRmluZGVyIiwKICAidXVpZCI6ICJJUC1GaW5kZXJAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}
+    "46": {"version": "21", "sha256": "0gmfiqvsl9nl219qvw6x9v0kjpk7xb7gzs5vjr88krhzzcvxbpgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImlwLWZpbmRlciIsCiAgIm5hbWUiOiAiSVAgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlwLWZpbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9MaW54R2VtMzMvSVAtRmluZGVyIiwKICAidXVpZCI6ICJJUC1GaW5kZXJAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
+    "47": {"version": "22", "sha256": "1n1vf5kv0nmifk73axgi0sn1jrfjh09qkvghlqmi389jf8pp1zqz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzIGFuZCBWUE4gc3RhdHVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImlwLWZpbmRlciIsCiAgIm5hbWUiOiAiSVAgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlwLWZpbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9MaW54R2VtMzMvSVAtRmluZGVyIiwKICAidXVpZCI6ICJJUC1GaW5kZXJAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}
   }}
 , {"uuid": "runcat@kolesnikov.se", "name": "RunCat", "pname": "runcat", "description": "The cat tells you the CPU usage by running speed", "link": "https://extensions.gnome.org/extension/2986/runcat/", "shell_version_map": {
     "38": {"version": "19", "sha256": "1l15bacj0rn9s4y3ksqqfk0jps12xvdajlvfllb1mjiijw4qdcx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpbjBlcnIvZ25vbWUtcnVuY2F0IiwKICAidXVpZCI6ICJydW5jYXRAa29sZXNuaWtvdi5zZSIsCiAgInZlcnNpb24iOiAxOQp9"},
@@ -2353,8 +2481,9 @@
     "42": {"version": "23", "sha256": "1hj57dm6a1ip664dxbqbv233viy0zwi3bcfsmlvn4h9x00ainc47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
     "43": {"version": "23", "sha256": "1hj57dm6a1ip664dxbqbv233viy0zwi3bcfsmlvn4h9x00ainc47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
     "44": {"version": "23", "sha256": "1hj57dm6a1ip664dxbqbv233viy0zwi3bcfsmlvn4h9x00ainc47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "45": {"version": "27", "sha256": "0apb33c415lqisr382zs2kci0mf43idb9gxj7ch35wql6clvxsxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuY2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
-    "46": {"version": "27", "sha256": "0apb33c415lqisr382zs2kci0mf43idb9gxj7ch35wql6clvxsxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuY2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}
+    "45": {"version": "28", "sha256": "0xkn30dicq76h1p1chjqi3qj98wi1qpzpjyhjqqa0ckh69cw1q53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuY2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDI4Cn0="},
+    "46": {"version": "28", "sha256": "0xkn30dicq76h1p1chjqi3qj98wi1qpzpjyhjqqa0ckh69cw1q53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuY2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDI4Cn0="},
+    "47": {"version": "28", "sha256": "0xkn30dicq76h1p1chjqi3qj98wi1qpzpjyhjqqa0ckh69cw1q53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuY2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDI4Cn0="}
   }}
 , {"uuid": "bowser-gnome@kronosoul.xyz", "name": "Bowser Gnome Extension", "pname": "bowser-gnome-extension", "description": "Create rules to open specific websites in specific web browsers for links clicked in any application on your computer. (emails, chat etc)", "link": "https://extensions.gnome.org/extension/2989/bowser-gnome-extension/", "shell_version_map": {
     "38": {"version": "13", "sha256": "1qh02pk4s8lni7rgsbbdv1hb1brh4sfqkr82f4a9lcll2s486hfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9ib3dzZXItZ25vbWUiLAogICJ1dWlkIjogImJvd3Nlci1nbm9tZUBrcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEzCn0="},
@@ -2372,8 +2501,9 @@
     "42": {"version": "11", "sha256": "0p0crv91n0lals20hkrvivj00yhsadkwy9s2bfdyzmk6slwa35rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDExCn0="},
     "43": {"version": "12", "sha256": "1z9n3qfr129ismgzw7nwgmq0gwjwf7y7lzq7mcdw0dc227gkxww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "14", "sha256": "1s5nzq74q4zvb3mmzrxkzlwb24m520c3yssddgwkqx956xi0h743", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "45": {"version": "18", "sha256": "0jszd9hq7bjw6ai2s3j098mjwspj8pk72rd29sxamx63ydrxmy27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
-    "46": {"version": "18", "sha256": "0jszd9hq7bjw6ai2s3j098mjwspj8pk72rd29sxamx63ydrxmy27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}
+    "45": {"version": "19", "sha256": "1gys4llvbqwp909znsbzjpzc3n3yhyzn41w7rj9jz607pdvsy20w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDE5Cn0="},
+    "46": {"version": "19", "sha256": "1gys4llvbqwp909znsbzjpzc3n3yhyzn41w7rj9jz607pdvsy20w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDE5Cn0="},
+    "47": {"version": "19", "sha256": "1gys4llvbqwp909znsbzjpzc3n3yhyzn41w7rj9jz607pdvsy20w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDE5Cn0="}
   }}
 , {"uuid": "system-monitor-next@paradoxxx.zero.gmail.com", "name": "system-monitor-next", "pname": "system-monitor-next", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…\n\nThis is a fork of the seemingly abandoned paradoxxxzero/gnome-shell-system-monitor-applet.\n\nIf you get an error after updating, try logging out and logging back in (this is a known issue that is being worked on).", "link": "https://extensions.gnome.org/extension/3010/system-monitor-next/", "shell_version_map": {
     "40": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="},
@@ -2381,8 +2511,9 @@
     "42": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="},
     "43": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="},
     "44": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="},
-    "45": {"version": "69", "sha256": "098bhziypfd6vmn61lxp25wwb0n3mv9shan0idkpl8q330ripawv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="},
-    "46": {"version": "69", "sha256": "098bhziypfd6vmn61lxp25wwb0n3mv9shan0idkpl8q330ripawv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNjkKfQ=="}
+    "45": {"version": "73", "sha256": "0r2ncz62gw705hlnjzzgcwahi5qj68yzf95dlxa4slngs338cl16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDczCn0="},
+    "46": {"version": "73", "sha256": "0r2ncz62gw705hlnjzzgcwahi5qj68yzf95dlxa4slngs338cl16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDczCn0="},
+    "47": {"version": "73", "sha256": "0r2ncz62gw705hlnjzzgcwahi5qj68yzf95dlxa4slngs338cl16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDczCn0="}
   }}
 , {"uuid": "user-theme-x@tuberry.github.io", "name": "User Theme X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch based on the Night Light\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": {
     "38": {"version": "21", "sha256": "0qiahmg2nmrnlyablyava1488rvy0r2rq8pyv932lsx6vrn9gh6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIxCn0="},
@@ -2392,7 +2523,8 @@
     "43": {"version": "31", "sha256": "1aqni9lybrws04mz4k9ygpv2yqg0vs6867ga7k3ah6f92j8bin74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZSBYIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2huLnN0b3dlcnNAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51c2VyLXRoZW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
     "44": {"version": "32", "sha256": "1i36lgx76p2fxa7kn0zaisc5jz6a2ky3dckxx2x3j3s91q5pn5ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZS14IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
     "45": {"version": "34", "sha256": "1hs8jdzal7jpw03fl3qppcvrdalhsy32hl2vchd5x92rfwamrm3q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZS14IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "46": {"version": "40", "sha256": "0y8djs3h92jgv70zl7d63khm1w8zpjvq02q5pv80pm3gj6ldmmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZS14IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}
+    "46": {"version": "40", "sha256": "0y8djs3h92jgv70zl7d63khm1w8zpjvq02q5pv80pm3gj6ldmmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZS14IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
+    "47": {"version": "41", "sha256": "1iga8g5y9d6i12aiwqc95m90ycm09cs0si41mk3vlvadxc0cb1b9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZS14IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}
   }}
 , {"uuid": "app_view_text@fawtytoo", "name": "Application View Text", "pname": "application-view-text", "description": "The text in the Application view can be hard to read on a light coloured background. This extension makes the text bolder with a drop shadow.\nAlso improves the visibility of the app running dot.", "link": "https://extensions.gnome.org/extension/3028/application-view-text/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="},
@@ -2424,7 +2556,8 @@
     "43": {"version": "34", "sha256": "0jq0c80y20d8rljn1478v537lch6klwir0gkzp35y03s1wj0ma36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "44": {"version": "35", "sha256": "1py1lbb00f9kcylc96kk2lr9r8ka9liyxhxxz1nzggz3jzxphw06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzUKfQ=="},
     "45": {"version": "37", "sha256": "0algkzsdha6996w760nnqmm70n96aymr6ipinq9h95pzf208qy20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
-    "46": {"version": "40", "sha256": "0xw4qv6990z2icpxkipzh57xanxgpalhh43dvphnbg8by1r6b6bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogNDAKfQ=="}
+    "46": {"version": "40", "sha256": "0xw4qv6990z2icpxkipzh57xanxgpalhh43dvphnbg8by1r6b6bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
+    "47": {"version": "41", "sha256": "1nm7kss344n9l6vg25ssqpiw2j7ixaf4dkvdvhawagp3r5ii016d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogNDEKfQ=="}
   }}
 , {"uuid": "MaximizeToEmptyWorkspace-extension@kaisersite.de", "name": "Maximize To Empty Workspace", "pname": "maximize-to-empty-workspace", "description": "New and maximized windows will be moved to empty workspaces.\nSupports multiple monitors.", "link": "https://extensions.gnome.org/extension/3100/maximize-to-empty-workspace/", "shell_version_map": {
     "38": {"version": "13", "sha256": "0bxanhx2ylpw0rh69lfdhkixsfggkp7b119ah3rrslx7w71qki6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
@@ -2432,7 +2565,10 @@
     "41": {"version": "13", "sha256": "0bxanhx2ylpw0rh69lfdhkixsfggkp7b119ah3rrslx7w71qki6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "42": {"version": "13", "sha256": "0bxanhx2ylpw0rh69lfdhkixsfggkp7b119ah3rrslx7w71qki6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "43": {"version": "13", "sha256": "0bxanhx2ylpw0rh69lfdhkixsfggkp7b119ah3rrslx7w71qki6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "44": {"version": "13", "sha256": "0bxanhx2ylpw0rh69lfdhkixsfggkp7b119ah3rrslx7w71qki6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
+    "44": {"version": "13", "sha256": "0bxanhx2ylpw0rh69lfdhkixsfggkp7b119ah3rrslx7w71qki6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "45": {"version": "15", "sha256": "1l1pabbvr52yw93gq9khayvxrizgrw39qs5i4g9dn8fhmrj3zb2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDE1Cn0="},
+    "46": {"version": "15", "sha256": "1l1pabbvr52yw93gq9khayvxrizgrw39qs5i4g9dn8fhmrj3zb2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDE1Cn0="},
+    "47": {"version": "15", "sha256": "1l1pabbvr52yw93gq9khayvxrizgrw39qs5i4g9dn8fhmrj3zb2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDE1Cn0="}
   }}
 , {"uuid": "jetbrains-search-provider@swsnr.de", "name": "JetBrains Search Provider", "pname": "jetbrains-search-provider", "description": "Deprecated, see alternative search provider\n\nUse https://github.com/swsnr/gnome-search-providers-jetbrains instead", "link": "https://extensions.gnome.org/extension/3115/jetbrains-search-provider/", "shell_version_map": {
     "38": {"version": "14", "sha256": "0hg9vv7vs419mjlc2smj25b4v5hnxi9yakwks19grlyd7gwhd70j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlcHJlY2F0ZWQsIHNlZSBhbHRlcm5hdGl2ZSBzZWFyY2ggcHJvdmlkZXJcblxuVXNlIGh0dHBzOi8vZ2l0aHViLmNvbS9sdW5hcnlvcm4vZ25vbWUtc2VhcmNoLXByb3ZpZGVycy1qZXRicmFpbnMgaW5zdGVhZCIsCiAgIm5hbWUiOiAiSmV0QnJhaW5zIFNlYXJjaCBQcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1bmFyeW9ybi9nbm9tZS1zZWFyY2gtcHJvdmlkZXJzLWpldGJyYWlucyIsCiAgInV1aWQiOiAiamV0YnJhaW5zLXNlYXJjaC1wcm92aWRlckBzd3Nuci5kZSIsCiAgInZlcnNpb24iOiAxNAp9"}
@@ -2466,7 +2602,8 @@
     "43": {"version": "47", "sha256": "04h957nzzvblk8zxiyanzyw02czdk459ljq1kkkhgk929cqsc0b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiA0Nwp9"},
     "44": {"version": "47", "sha256": "04h957nzzvblk8zxiyanzyw02czdk459ljq1kkkhgk929cqsc0b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiA0Nwp9"},
     "45": {"version": "58", "sha256": "05f2v981nfmnrddb2pd0zdncyj5p76z4sz96xy8hyp9brskwv4wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="},
-    "46": {"version": "62", "sha256": "02s3ly9zq8nwzdvziimbb4qjbfv2i2bwr0bs1f8z3kn81ga3p02d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5JZiB5b3UgdXNlIFVidW50dSwgeW91IG1heSB3YW50IHRvIGNoYW5nZSB0aGUgcmFkaXVzIG9mIHRoZSBjb3JuZXIgZWZmZWN0IGZvciBEYXNoLXRvLURvY2sgaW4gcHJlZmVyZW5jZXMsIGVsc2UgeW91IG1heSBzZWUgdW5wbGVhc2FudGx5IG1peGVkIHJhZGlpIGluIHlvdXIgZG9jay5cblxuTm90ZTogaWYgdGhlIGV4dGVuc2lvbiBzaG93cyBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgcGxlYXNlIG1ha2Ugc3VyZSB0byByZXN0YXJ0IHlvdXIgc2Vzc2lvbiB0byBzZWUgaWYgaXQgcGVyc2lzdHMuIFRoaXMgaXMgZHVlIHRvIGEgYnVnIGluIGdub21lIHNoZWxsLCB3aGljaCBJIGNhbid0IGZpeCBieSBteXNlbGYuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhdW5ldHgiLAogICAgImtvZmkiOiAiYXVuZXR4IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ci1teS1zaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}
+    "46": {"version": "67", "sha256": "11a19krqy97sk97y2r04v5b1yyz9wmz4d8rhc1zs8izgixw26115", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5JZiB5b3UgdXNlIFVidW50dSwgeW91IG1heSB3YW50IHRvIGNoYW5nZSB0aGUgcmFkaXVzIG9mIHRoZSBjb3JuZXIgZWZmZWN0IGZvciBEYXNoLXRvLURvY2sgaW4gcHJlZmVyZW5jZXMsIGVsc2UgeW91IG1heSBzZWUgdW5wbGVhc2FudGx5IG1peGVkIHJhZGlpIGluIHlvdXIgZG9jay5cblxuTm90ZTogaWYgdGhlIGV4dGVuc2lvbiBzaG93cyBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgcGxlYXNlIG1ha2Ugc3VyZSB0byByZXN0YXJ0IHlvdXIgc2Vzc2lvbiB0byBzZWUgaWYgaXQgcGVyc2lzdHMuIFRoaXMgaXMgZHVlIHRvIGEgYnVnIGluIGdub21lIHNoZWxsLCB3aGljaCBJIGNhbid0IGZpeCBieSBteXNlbGYuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhdW5ldHgiLAogICAgImtvZmkiOiAiYXVuZXR4IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ci1teS1zaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2JsdXItbXktc2hlbGwiLAogICJ1dWlkIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAidmVyc2lvbiI6IDY3Cn0="},
+    "47": {"version": "67", "sha256": "11a19krqy97sk97y2r04v5b1yyz9wmz4d8rhc1zs8izgixw26115", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5JZiB5b3UgdXNlIFVidW50dSwgeW91IG1heSB3YW50IHRvIGNoYW5nZSB0aGUgcmFkaXVzIG9mIHRoZSBjb3JuZXIgZWZmZWN0IGZvciBEYXNoLXRvLURvY2sgaW4gcHJlZmVyZW5jZXMsIGVsc2UgeW91IG1heSBzZWUgdW5wbGVhc2FudGx5IG1peGVkIHJhZGlpIGluIHlvdXIgZG9jay5cblxuTm90ZTogaWYgdGhlIGV4dGVuc2lvbiBzaG93cyBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgcGxlYXNlIG1ha2Ugc3VyZSB0byByZXN0YXJ0IHlvdXIgc2Vzc2lvbiB0byBzZWUgaWYgaXQgcGVyc2lzdHMuIFRoaXMgaXMgZHVlIHRvIGEgYnVnIGluIGdub21lIHNoZWxsLCB3aGljaCBJIGNhbid0IGZpeCBieSBteXNlbGYuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhdW5ldHgiLAogICAgImtvZmkiOiAiYXVuZXR4IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ci1teS1zaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2JsdXItbXktc2hlbGwiLAogICJ1dWlkIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAidmVyc2lvbiI6IDY3Cn0="}
   }}
 , {"uuid": "escape-overview@raelgc", "name": "ESCape Overview", "pname": "escape-overview", "description": "Close the Overview with a single ESC press when searchbox is empty.\n\nThe default gnome-shell behaviour is, during first ESC press, clean the searchbox, then second ESC press get back to Activities overview and then third ESC press will finally close the overview.", "link": "https://extensions.gnome.org/extension/3204/escape-overview/", "shell_version_map": {
     "38": {"version": "5", "sha256": "12jycfdlywlc2gf7hcpa1draqsy8jgb2dgr8sihh2f97b31dk1nh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZWxnYy9lc2NhcGUtb3ZlcnZpZXciLAogICJ1dWlkIjogImVzY2FwZS1vdmVydmlld0ByYWVsZ2MiLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -2481,14 +2618,16 @@
     "42": {"version": "21", "sha256": "173zaap7s35naqff1phs5rskgdlwfib415vxcnfxi8132627fxhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LXdpbmRvd3MtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotd2luZG93cy1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "43": {"version": "21", "sha256": "173zaap7s35naqff1phs5rskgdlwfib415vxcnfxi8132627fxhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LXdpbmRvd3MtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotd2luZG93cy1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "44": {"version": "21", "sha256": "173zaap7s35naqff1phs5rskgdlwfib415vxcnfxi8132627fxhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LXdpbmRvd3MtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotd2luZG93cy1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
-    "45": {"version": "24", "sha256": "0zj9m96bipm36m2gg80s29a9068602xyncmryv2zqf64ywmnbai1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb20uZ2l0aHViLmhlcm1lczgzLmNvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LXdpbmRvd3MtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotd2luZG93cy1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "46": {"version": "24", "sha256": "0zj9m96bipm36m2gg80s29a9068602xyncmryv2zqf64ywmnbai1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb20uZ2l0aHViLmhlcm1lczgzLmNvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LXdpbmRvd3MtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotd2luZG93cy1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}
+    "45": {"version": "25", "sha256": "0pq1p6jjnjwr3vdxhil2kwf26qrgwkcgr0z65arfv3rm73y6ijsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb20uZ2l0aHViLmhlcm1lczgzLmNvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "46": {"version": "25", "sha256": "0pq1p6jjnjwr3vdxhil2kwf26qrgwkcgr0z65arfv3rm73y6ijsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb20uZ2l0aHViLmhlcm1lczgzLmNvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "47": {"version": "25", "sha256": "0pq1p6jjnjwr3vdxhil2kwf26qrgwkcgr0z65arfv3rm73y6ijsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb20uZ2l0aHViLmhlcm1lczgzLmNvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
   }}
 , {"uuid": "EndSessionTimer@pratap.fastmail.fm", "name": "End Session Timer", "pname": "end-session-timer", "description": "Set end session timer in seconds", "link": "https://extensions.gnome.org/extension/3216/end-session-timer/", "shell_version_map": {
     "38": {"version": "7", "sha256": "0c3wfx1iksb67fq3hm8cprhwb2f6xykkr4fv4y4drf78f15sh5gm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBFbmQgU2Vzc2lvbiBUaW1lciBiZXR3ZWVuIDUgdG8gNjAgU2Vjb25kcyIsCiAgIm5hbWUiOiAiRW5kIFNlc3Npb24gVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiRW5kU2Vzc2lvblRpbWVyQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiA3Cn0="},
     "41": {"version": "8", "sha256": "0mm9g2ldl2lw52plx3hpbaniqlci1c10q9blkbdpwcmyv53z1dq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBFbmQgU2Vzc2lvbiBUaW1lciBiZXR3ZWVuIDUgdG8gNjAgU2Vjb25kcyIsCiAgIm5hbWUiOiAiRW5kIFNlc3Npb24gVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkVuZFNlc3Npb25UaW1lckBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogOAp9"},
-    "45": {"version": "12", "sha256": "15gb0jc3v9lmlkidnjprra4nyxlq7lvkhbldg38iji62v6ik18zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBlbmQgc2Vzc2lvbiB0aW1lciBpbiBzZWNvbmRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkVuZCBTZXNzaW9uIFRpbWVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVuZC1zZXNzaW9uLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvZW5kLXNlc3Npb24tdGltZXIiLAogICJ1dWlkIjogIkVuZFNlc3Npb25UaW1lckBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "46": {"version": "12", "sha256": "15gb0jc3v9lmlkidnjprra4nyxlq7lvkhbldg38iji62v6ik18zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBlbmQgc2Vzc2lvbiB0aW1lciBpbiBzZWNvbmRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkVuZCBTZXNzaW9uIFRpbWVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVuZC1zZXNzaW9uLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvZW5kLXNlc3Npb24tdGltZXIiLAogICJ1dWlkIjogIkVuZFNlc3Npb25UaW1lckBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
+    "45": {"version": "13", "sha256": "1pcw1anzi4709qd2kwqzw45xq82rsz5ycz857c9frh7b69mxkiic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBlbmQgc2Vzc2lvbiB0aW1lciBpbiBzZWNvbmRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkVuZCBTZXNzaW9uIFRpbWVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVuZC1zZXNzaW9uLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2VuZC1zZXNzaW9uLXRpbWVyIiwKICAidXVpZCI6ICJFbmRTZXNzaW9uVGltZXJAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "13", "sha256": "1pcw1anzi4709qd2kwqzw45xq82rsz5ycz857c9frh7b69mxkiic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBlbmQgc2Vzc2lvbiB0aW1lciBpbiBzZWNvbmRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkVuZCBTZXNzaW9uIFRpbWVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVuZC1zZXNzaW9uLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2VuZC1zZXNzaW9uLXRpbWVyIiwKICAidXVpZCI6ICJFbmRTZXNzaW9uVGltZXJAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "1pcw1anzi4709qd2kwqzw45xq82rsz5ycz857c9frh7b69mxkiic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBlbmQgc2Vzc2lvbiB0aW1lciBpbiBzZWNvbmRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwcmF0YXBwYW5hYmFrYSIKICB9LAogICJuYW1lIjogIkVuZCBTZXNzaW9uIFRpbWVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVuZC1zZXNzaW9uLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2VuZC1zZXNzaW9uLXRpbWVyIiwKICAidXVpZCI6ICJFbmRTZXNzaW9uVGltZXJAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "block-caribou-36@lxylxy123456.ercli.dev", "name": "Block Caribou 36", "pname": "block-caribou-36", "description": "Blocks caribou (the on screen keyboard) from popping up when you use a touchscreen. Even if it's disabled in the accessibility services menu. Continuation of keringar's work. Tested on GNOME Shell version 3.36 - 45 on Fedora 32 - 39. For a higher version see https://github.com/lxylxy123456/cariboublocker#installing-on-high-gnome-shell-version .", "link": "https://extensions.gnome.org/extension/3222/block-caribou-36/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1zfb6kxdcagfpsdgfyqbms5zxc0saycfrz4rj09sk01ifnzkm3fv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDQgb24gRmVkb3JhIDMyIC0gMzguIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x4eWx4eTEyMzQ1Ni9jYXJpYm91YmxvY2tlciIsCiAgInV1aWQiOiAiYmxvY2stY2FyaWJvdS0zNkBseHlseHkxMjM0NTYuZXJjbGkuZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -2509,7 +2648,8 @@
     "38": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "40": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "41": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "42": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
+    "42": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "15", "sha256": "1h27gzaz3divlgp7n53zqnkrlcj3w5b0m5x3nva28m8x8fp5kzgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VuaXR5LWxpa2Utc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bml0eS1saWtlLWFwcHN3aXRjaGVyQGdvbnphLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
   }}
 , {"uuid": "ssh-quick-connect@ibrokemy.computer", "name": "SSH Quick Connect", "pname": "ssh-quick-connect", "description": "This extension puts an icon in the panel with a simple dropdown menu that launches items from your ssh configs", "link": "https://extensions.gnome.org/extension/3237/ssh-quick-connect/", "shell_version_map": {
     "40": {"version": "12", "sha256": "1gmkphpjdgv9z5db9c3ia25k1zjh7l9s7cpziffxrx0jzdf77vim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5naXRodWIuY29tL2licm9rZW15Y29tcHV0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNzaC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJzc2gtcXVpY2stY29ubmVjdEBpYnJva2VteS5jb21wdXRlciIsCiAgInZlcnNpb24iOiAxMgp9"},
@@ -2525,8 +2665,9 @@
     "42": {"version": "10", "sha256": "1x76p06ni4byl469hk0y3l5dkg2ad4khn5h02pgbyqxkfhf2y1il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21taW1vbi9hZGQtdG8tZGVza3RvcCIsCiAgInV1aWQiOiAiYWRkLXRvLWRlc2t0b3BAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "43": {"version": "10", "sha256": "1x76p06ni4byl469hk0y3l5dkg2ad4khn5h02pgbyqxkfhf2y1il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21taW1vbi9hZGQtdG8tZGVza3RvcCIsCiAgInV1aWQiOiAiYWRkLXRvLWRlc2t0b3BAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "44": {"version": "10", "sha256": "1x76p06ni4byl469hk0y3l5dkg2ad4khn5h02pgbyqxkfhf2y1il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21taW1vbi9hZGQtdG8tZGVza3RvcCIsCiAgInV1aWQiOiAiYWRkLXRvLWRlc2t0b3BAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "45": {"version": "12", "sha256": "1gc8cdjckf662fnd1c1q4p1iva5wphk4b4hwji9hf7hjbh8c9rqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgImdldHRleHQtZG9tYWluIjogImFkZC10by1kZXNrdG9wIiwKICAibmFtZSI6ICJBZGQgdG8gRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2LmJldGEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21taW1vbi9hZGQtdG8tZGVza3RvcCIsCiAgInV1aWQiOiAiYWRkLXRvLWRlc2t0b3BAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "46": {"version": "12", "sha256": "1gc8cdjckf662fnd1c1q4p1iva5wphk4b4hwji9hf7hjbh8c9rqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgImdldHRleHQtZG9tYWluIjogImFkZC10by1kZXNrdG9wIiwKICAibmFtZSI6ICJBZGQgdG8gRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2LmJldGEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21taW1vbi9hZGQtdG8tZGVza3RvcCIsCiAgInV1aWQiOiAiYWRkLXRvLWRlc2t0b3BAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}
+    "45": {"version": "13", "sha256": "11wkl11f2n91izvqph8jpjxwvcyccdzimgw8iz1jpyycx8zj59zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgImdldHRleHQtZG9tYWluIjogImFkZC10by1kZXNrdG9wIiwKICAibmFtZSI6ICJBZGQgdG8gRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "13", "sha256": "11wkl11f2n91izvqph8jpjxwvcyccdzimgw8iz1jpyycx8zj59zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgImdldHRleHQtZG9tYWluIjogImFkZC10by1kZXNrdG9wIiwKICAibmFtZSI6ICJBZGQgdG8gRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "11wkl11f2n91izvqph8jpjxwvcyccdzimgw8iz1jpyycx8zj59zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgImdldHRleHQtZG9tYWluIjogImFkZC10by1kZXNrdG9wIiwKICAibmFtZSI6ICJBZGQgdG8gRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "wifi-power-management-toggle@rthery", "name": "Wi-Fi Power Management Toggle", "pname": "wi-fi-power-management-toggle", "description": "Add a toggle to limit Wi-Fi power consumption (when supported by the card) in Gnome System Menu.", "link": "https://extensions.gnome.org/extension/3258/wi-fi-power-management-toggle/", "shell_version_map": {
     "38": {"version": "3", "sha256": "0w3w0wx6pdwr0ya69dkhjv10m0csjv2gsab98f57ycn8vi4zd7n5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ydGhlcnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmktcG93ZXItbWFuYWdlbWVudC10b2dnbGUiLAogICJ1dWlkIjogIndpZmktcG93ZXItbWFuYWdlbWVudC10b2dnbGVAcnRoZXJ5IiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -2574,7 +2715,8 @@
     "43": {"version": "34", "sha256": "00mpmx7yfzy9wram6abwm8m7dklk84m3z38r0p8zxp20p3rik660", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDM0Cn0="},
     "44": {"version": "36", "sha256": "0mc7lbw6rsb65i1ha7js1syhk0k5z0kg3l4gzhxprlv2h4dnchaz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDM2Cn0="},
     "45": {"version": "40", "sha256": "0cpav8qrj8jj7zd1v1s4h7p5429gk8njr74zh0v7fk05ygb7skbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDQwCn0="},
-    "46": {"version": "44", "sha256": "1sx95qb5bc6adk8524wblxbcqhdhsj17m4scsvipk1biyh0n0nsi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIEdOT01FIFNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDQ0Cn0="}
+    "46": {"version": "44", "sha256": "1sx95qb5bc6adk8524wblxbcqhdhsj17m4scsvipk1biyh0n0nsi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIEdOT01FIFNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDQ0Cn0="},
+    "47": {"version": "45", "sha256": "0m9m44cn5r1603cf473nvgspprab4dypw2w7gm68gcr4k4ghbjdl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIEdOT01FIFNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDQ1Cn0="}
   }}
 , {"uuid": "yaru-remix-theme-toggle@muqtxdir.me", "name": "Yaru remix theme toggle", "pname": "yaru-remix-theme-toggle", "description": "Switches GTK3, Gnome-shell, cursor and icon themes to Yaru-remix variants", "link": "https://extensions.gnome.org/extension/3402/yaru-remix-theme-toggle/", "shell_version_map": {
     "38": {"version": "2", "sha256": "04dh163dshjnq3fa1y5kbkgl94q4cifvffq6i2pr4zd1v7d4zrf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcnMiOiBbCiAgICAibXVxdGFkaXI1NTU1QGdtYWlsLmNvbSIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJTd2l0Y2hlcyBHVEszLCBHbm9tZS1zaGVsbCwgY3Vyc29yIGFuZCBpY29uIHRoZW1lcyB0byBZYXJ1LXJlbWl4IHZhcmlhbnRzIiwKICAibmFtZSI6ICJZYXJ1IHJlbWl4IHRoZW1lIHRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL011cXR4ZGlyL3lhcnUtcmVtaXgtdGhlbWUtdG9nZ2xlIiwKICAidXVpZCI6ICJ5YXJ1LXJlbWl4LXRoZW1lLXRvZ2dsZUBtdXF0eGRpci5tZSIsCiAgInZlcnNpb24iOiAyCn0="}
@@ -2590,7 +2732,7 @@
     "43": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"},
     "45": {"version": "8", "sha256": "1h98d46qvj5cncb6l7xfi67iaqs8vw9nfi3ix0iajdjs7fr95x5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "9", "sha256": "1m1cmasa5cxz2gmcq3d22lzgw5jb35qzhqy70kz6s9549a0lww4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA5Cn0="}
+    "46": {"version": "10", "sha256": "0imq6ay1kjg2xnapyfm0c75f72hyk34ip7jympgl8wxjk43871zg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiAxMAp9"}
   }}
 , {"uuid": "wg-indicator@dpf12110.gmail.com", "name": "WG Indicator", "pname": "wg-indicator", "description": "A status indicator for Wireguard connections.", "link": "https://extensions.gnome.org/extension/3418/wg-indicator/", "shell_version_map": {
     "40": {"version": "15", "sha256": "1zzr04l03aka1rk2rhqvj102dan80zdywgizxfygffvy4fjh99n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3luYzEyMTEvd2ctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3Zy1pbmRpY2F0b3JAZHBmMTIxMTAuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="},
@@ -2604,8 +2746,9 @@
     "42": {"version": "22", "sha256": "1y0gx662rhs32bjng5i5w3f6bkgc7i71rxki9qav4rp69fpnqnxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="},
     "43": {"version": "22", "sha256": "1y0gx662rhs32bjng5i5w3f6bkgc7i71rxki9qav4rp69fpnqnxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="},
     "44": {"version": "22", "sha256": "1y0gx662rhs32bjng5i5w3f6bkgc7i71rxki9qav4rp69fpnqnxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="},
-    "45": {"version": "26", "sha256": "0mcja775pi9wkl2cnz3g44skcg817krs3c7jvwsbm8f6kx2xlaqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="},
-    "46": {"version": "26", "sha256": "0mcja775pi9wkl2cnz3g44skcg817krs3c7jvwsbm8f6kx2xlaqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}
+    "45": {"version": "27", "sha256": "0gpflaw9s2jkih38wa9x1rjrbgv8c9xdh4in8npq9yr45x3jfh58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
+    "46": {"version": "27", "sha256": "0gpflaw9s2jkih38wa9x1rjrbgv8c9xdh4in8npq9yr45x3jfh58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
+    "47": {"version": "27", "sha256": "0gpflaw9s2jkih38wa9x1rjrbgv8c9xdh4in8npq9yr45x3jfh58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}
   }}
 , {"uuid": "jiggle@jeffchannell.com", "name": "Jiggle", "pname": "jiggle", "description": "Jiggle is a Gnome Shell extension that highlights the cursor position when the mouse is moved rapidly.", "link": "https://extensions.gnome.org/extension/3438/jiggle/", "shell_version_map": {
     "38": {"version": "8", "sha256": "0f5zwvcqz648sn11nl49r0ki6zy5c2hp4imgba0dlc02fags7pxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkppZ2dsZSBpcyBhIEdub21lIFNoZWxsIGV4dGVuc2lvbiB0aGF0IGhpZ2hsaWdodHMgdGhlIGN1cnNvciBwb3NpdGlvbiB3aGVuIHRoZSBtb3VzZSBpcyBtb3ZlZCByYXBpZGx5LiIsCiAgIm5hbWUiOiAiSmlnZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjMiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plZmZjaGFubmVsbC9qaWdnbGUiLAogICJ1dWlkIjogImppZ2dsZUBqZWZmY2hhbm5lbGwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
@@ -2678,8 +2821,9 @@
     "42": {"version": "24", "sha256": "18drfdz739l0nhac3qlxjsik5ixqb3v1y1s55f1bjgszh69kzc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"},
     "43": {"version": "24", "sha256": "18drfdz739l0nhac3qlxjsik5ixqb3v1y1s55f1bjgszh69kzc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"},
     "44": {"version": "24", "sha256": "18drfdz739l0nhac3qlxjsik5ixqb3v1y1s55f1bjgszh69kzc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "45": {"version": "38", "sha256": "12bj0m57m4qihnmayapb7i3ai9w5mv77ymkdd7r0ykzji1y7s03v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiRG93bkZhbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG93bmZhbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="},
-    "46": {"version": "38", "sha256": "12bj0m57m4qihnmayapb7i3ai9w5mv77ymkdd7r0ykzji1y7s03v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiRG93bkZhbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG93bmZhbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}
+    "45": {"version": "39", "sha256": "05xi8nj7gk5c1db02cxyxzc6pimm7a9614ymb812zma3vbpbk4a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiRG93bkZhbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG93bmZhbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"},
+    "46": {"version": "39", "sha256": "05xi8nj7gk5c1db02cxyxzc6pimm7a9614ymb812zma3vbpbk4a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiRG93bkZhbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG93bmZhbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"},
+    "47": {"version": "39", "sha256": "05xi8nj7gk5c1db02cxyxzc6pimm7a9614ymb812zma3vbpbk4a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiRG93bkZhbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG93bmZhbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}
   }}
 , {"uuid": "time-awareness@gnome-extensions.kapranoff.ru", "name": "Time Awareness", "pname": "time-awareness", "description": "Tracks the time you have been actively using your computer", "link": "https://extensions.gnome.org/extension/3556/time-awareness/", "shell_version_map": {
     "38": {"version": "9", "sha256": "0rsnkbl7snkym66sc2yd6sw3xlbq2fhk4iw1c1f56g7nklf3y48k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogOQp9"},
@@ -2707,7 +2851,8 @@
     "43": {"version": "16", "sha256": "1i0gzrlqcjqgv0vmynxbkj84gsaacfrzgm0vzf26qgcjlblhz5lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxNiwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="},
     "44": {"version": "16", "sha256": "1i0gzrlqcjqgv0vmynxbkj84gsaacfrzgm0vzf26qgcjlblhz5lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxNiwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="},
     "45": {"version": "19", "sha256": "0m1kxcjnr7j8cjb0h7i3vwjk5hf6izbgfhnka5rcjww1qw2fp07b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvZmZlZSI6ICJodHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL25ieHdmcG0iLAogICJkZXBlbmRlbmNpZXMiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQvd2lraXMvSW5zdGFsbGF0aW9uIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB0YXNrcyBuZXh0IHRvIHRoZSBjYWxlbmRhciB3aWRnZXQuXG5cblZpc2l0IG91ciBXaWtpIHBhZ2UgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIHRyb3VibGVzaG9vdGluZy4iLAogICJlcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvdGFzay13aWRnZXQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50YXNrLXdpZGdldCIsCiAgImdyZXNvdXJjZSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50YXNrLXdpZGdldC5ncmVzb3VyY2UiLAogICJsaWJlcmFwYXkiOiAiaHR0cHM6Ly9saWJlcmFwYXkuY29tL2pvYXNpcy8iLAogICJuYW1lIjogIlRhc2sgV2lkZ2V0IiwKICAicGF5cGFsIjogImh0dHBzOi8vcGF5cGFsLm1lL2ptaXNraW5pcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50YXNrLXdpZGdldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0IiwKICAidXVpZCI6ICJ0YXNrLXdpZGdldEBqdW96YXNtaXNraW5pcy5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogMTksCiAgIndpa2kiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQvd2lraXMiCn0="},
-    "46": {"version": "20", "sha256": "05cly2d6iz71cvv8yb8c87miz5blf2sy1g4ayffcg4898kcdq6wh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvZmZlZSI6ICJodHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL25ieHdmcG0iLAogICJkZXBlbmRlbmNpZXMiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQvd2lraXMvSW5zdGFsbGF0aW9uIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB0YXNrcyBuZXh0IHRvIHRoZSBjYWxlbmRhciB3aWRnZXQuXG5cblZpc2l0IG91ciBXaWtpIHBhZ2UgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIHRyb3VibGVzaG9vdGluZy4iLAogICJlcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvdGFzay13aWRnZXQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50YXNrLXdpZGdldCIsCiAgImdyZXNvdXJjZSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50YXNrLXdpZGdldC5ncmVzb3VyY2UiLAogICJsaWJlcmFwYXkiOiAiaHR0cHM6Ly9saWJlcmFwYXkuY29tL2pvYXNpcy8iLAogICJuYW1lIjogIlRhc2sgV2lkZ2V0IiwKICAicGF5cGFsIjogImh0dHBzOi8vcGF5cGFsLm1lL2ptaXNraW5pcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50YXNrLXdpZGdldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0IiwKICAidXVpZCI6ICJ0YXNrLXdpZGdldEBqdW96YXNtaXNraW5pcy5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogMjAsCiAgIndpa2kiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQvd2lraXMiCn0="}
+    "46": {"version": "22", "sha256": "0wcdpq6d83m6mdinf9nbsvnyhnj6jgprywwch8wyf3x534l6msa0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcy9JbnN0YWxsYXRpb24iLAogICJkZXNjcmlwdGlvbiI6ICJEaXNwbGF5IHRhc2tzIG5leHQgdG8gdGhlIGNhbGVuZGFyIHdpZGdldC5cblxuVmlzaXQgb3VyIFdpa2kgcGFnZSBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgdHJvdWJsZXNob290aW5nLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiam1pc2tpbmlzIiwKICAgICJsaWJlcmFwYXkiOiAiam9hc2lzIiwKICAgICJwYXlwYWwiOiAiam1pc2tpbmlzIgogIH0sCiAgImVwYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy90YXNrLXdpZGdldCIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgIm5hbWUiOiAiVGFzayBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAyMiwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="},
+    "47": {"version": "22", "sha256": "0wcdpq6d83m6mdinf9nbsvnyhnj6jgprywwch8wyf3x534l6msa0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcy9JbnN0YWxsYXRpb24iLAogICJkZXNjcmlwdGlvbiI6ICJEaXNwbGF5IHRhc2tzIG5leHQgdG8gdGhlIGNhbGVuZGFyIHdpZGdldC5cblxuVmlzaXQgb3VyIFdpa2kgcGFnZSBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgdHJvdWJsZXNob290aW5nLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiam1pc2tpbmlzIiwKICAgICJsaWJlcmFwYXkiOiAiam9hc2lzIiwKICAgICJwYXlwYWwiOiAiam1pc2tpbmlzIgogIH0sCiAgImVwYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy90YXNrLXdpZGdldCIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgIm5hbWUiOiAiVGFzayBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAyMiwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}
   }}
 , {"uuid": "air-quality@mcardillo55", "name": "Air Quality", "pname": "air-quality", "description": "View local air quality from PurpleAir in the top bar", "link": "https://extensions.gnome.org/extension/3574/air-quality/", "shell_version_map": {
     "40": {"version": "2", "sha256": "037hbbb6z3gj818hqxqq96yszd1hka57pn4gj9f5kps7ak5hca4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbG9jYWwgYWlyIHF1YWxpdHkgZnJvbSBQdXJwbGVBaXIgaW4gdGhlIHRvcCBiYXIiLAogICJuYW1lIjogIkFpciBRdWFsaXR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21jYXJkaWxsbzU1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1haXItcXVhbGl0eSIsCiAgInV1aWQiOiAiYWlyLXF1YWxpdHlAbWNhcmRpbGxvNTUiLAogICJ2ZXJzaW9uIjogMgp9"}
@@ -2748,8 +2893,9 @@
     "42": {"version": "48", "sha256": "0y7pbng3jvvpwnjbajh4qs5n9rlb42w5q4cm2is7s9znwc4n73zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
     "43": {"version": "48", "sha256": "0y7pbng3jvvpwnjbajh4qs5n9rlb42w5q4cm2is7s9znwc4n73zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
     "44": {"version": "48", "sha256": "0y7pbng3jvvpwnjbajh4qs5n9rlb42w5q4cm2is7s9znwc4n73zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
-    "45": {"version": "57", "sha256": "1gzvm4c6d986qzbdki1w5fhqzpw8l6v0aiawldj5hv4zfw1zvi8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDU3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNTciCn0="},
-    "46": {"version": "57", "sha256": "1gzvm4c6d986qzbdki1w5fhqzpw8l6v0aiawldj5hv4zfw1zvi8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDU3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNTciCn0="}
+    "45": {"version": "62", "sha256": "17yb5fk96v6wbjdb4my47z80fb2rbsypbp1wy2mc7r1jbrh9av6x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA2MiwKICAidmVyc2lvbi1uYW1lIjogIjYyIgp9"},
+    "46": {"version": "62", "sha256": "17yb5fk96v6wbjdb4my47z80fb2rbsypbp1wy2mc7r1jbrh9av6x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA2MiwKICAidmVyc2lvbi1uYW1lIjogIjYyIgp9"},
+    "47": {"version": "62", "sha256": "17yb5fk96v6wbjdb4my47z80fb2rbsypbp1wy2mc7r1jbrh9av6x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA2MiwKICAidmVyc2lvbi1uYW1lIjogIjYyIgp9"}
   }}
 , {"uuid": "fixedimelist@alynx.one", "name": "Fixed IME List", "pname": "fixed-ime-list", "description": "Prevent MRU re-sorting of IME list on switching input method so it will always be the same sequence as you set in Settings.", "link": "https://extensions.gnome.org/extension/3663/fixed-ime-list/", "shell_version_map": {
     "38": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"},
@@ -2770,8 +2916,9 @@
     "42": {"version": "21", "sha256": "1yi0nqrkz6kl6cdcncxg1jdag4dkgxjkccknxmy9amzi9f4lj3f7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
     "43": {"version": "21", "sha256": "1yi0nqrkz6kl6cdcncxg1jdag4dkgxjkccknxmy9amzi9f4lj3f7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
     "44": {"version": "21", "sha256": "1yi0nqrkz6kl6cdcncxg1jdag4dkgxjkccknxmy9amzi9f4lj3f7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
-    "45": {"version": "23", "sha256": "1si2p2fxh19azf9vrg7w263bk0r87iifg01vjskfw5lw04hiwxjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc21tcjAvZ25vbWUtcmVvcmRlci13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJyZW9yZGVyLXdvcmtzcGFjZXNAamVyLmRldiIsCiAgInZlcnNpb24iOiAyMwp9"},
-    "46": {"version": "23", "sha256": "1si2p2fxh19azf9vrg7w263bk0r87iifg01vjskfw5lw04hiwxjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc21tcjAvZ25vbWUtcmVvcmRlci13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJyZW9yZGVyLXdvcmtzcGFjZXNAamVyLmRldiIsCiAgInZlcnNpb24iOiAyMwp9"}
+    "45": {"version": "24", "sha256": "0bgpc92y1cgs20ndmr904jws82n4pgxpbs9yfw3m4h12pvbnmbbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
+    "46": {"version": "24", "sha256": "0bgpc92y1cgs20ndmr904jws82n4pgxpbs9yfw3m4h12pvbnmbbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
+    "47": {"version": "24", "sha256": "0bgpc92y1cgs20ndmr904jws82n4pgxpbs9yfw3m4h12pvbnmbbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyB3aXRoIEN0cmwrU3VwZXIrVXAvRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}
   }}
 , {"uuid": "eos-hack@endlessos.org", "name": "Hack", "pname": "hack", "description": "Add the Flip to Hack experience to the desktop", "link": "https://extensions.gnome.org/extension/3690/hack/", "shell_version_map": {
     "38": {"version": "11", "sha256": "1m45rylhv1lw7vh8zmpsfcs1fiv0ah770gk14x965mkalqgph2ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -2800,8 +2947,9 @@
     "42": {"version": "39", "sha256": "1imc5yiv2172m0j3v9isiq6cvpwh8dmqm1jiwfss22df6sy4anp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhdGVla21lZGlhL25ldHNwZWVkc2ltcGxpZmllZCIsCiAgInV1aWQiOiAibmV0c3BlZWRzaW1wbGlmaWVkQHByYXRlZWttZWRpYS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
     "43": {"version": "39", "sha256": "1imc5yiv2172m0j3v9isiq6cvpwh8dmqm1jiwfss22df6sy4anp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhdGVla21lZGlhL25ldHNwZWVkc2ltcGxpZmllZCIsCiAgInV1aWQiOiAibmV0c3BlZWRzaW1wbGlmaWVkQHByYXRlZWttZWRpYS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
     "44": {"version": "39", "sha256": "1imc5yiv2172m0j3v9isiq6cvpwh8dmqm1jiwfss22df6sy4anp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhdGVla21lZGlhL25ldHNwZWVkc2ltcGxpZmllZCIsCiAgInV1aWQiOiAibmV0c3BlZWRzaW1wbGlmaWVkQHByYXRlZWttZWRpYS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
-    "45": {"version": "42", "sha256": "06lh6lp86hrxi5bcymlfjqs8r337xgdayrxkig6khlm6l4mb2jwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhdGVla21lZGlhL25ldHNwZWVkc2ltcGxpZmllZCIsCiAgInV1aWQiOiAibmV0c3BlZWRzaW1wbGlmaWVkQHByYXRlZWttZWRpYS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogNDIKfQ=="},
-    "46": {"version": "42", "sha256": "06lh6lp86hrxi5bcymlfjqs8r337xgdayrxkig6khlm6l4mb2jwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhdGVla21lZGlhL25ldHNwZWVkc2ltcGxpZmllZCIsCiAgInV1aWQiOiAibmV0c3BlZWRzaW1wbGlmaWVkQHByYXRlZWttZWRpYS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}
+    "45": {"version": "43", "sha256": "0606qvyc7d0j1qp459i2c3cw1l7a30hml7n50y6m2n9rp4vdx0zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDQzCn0="},
+    "46": {"version": "43", "sha256": "0606qvyc7d0j1qp459i2c3cw1l7a30hml7n50y6m2n9rp4vdx0zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDQzCn0="},
+    "47": {"version": "43", "sha256": "0606qvyc7d0j1qp459i2c3cw1l7a30hml7n50y6m2n9rp4vdx0zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDQzCn0="}
   }}
 , {"uuid": "cpupower-governors@icar.github.com", "name": "CPU Power Governor", "pname": "cpu-power-governor", "description": "Enables the ability to swap between kernel governors for the CPU useful for laptops.\n\nRequires: polkit, cpupower\nGithub: https://github.com/juxuanu/cpupower-governors", "link": "https://extensions.gnome.org/extension/3727/cpu-power-governor/", "shell_version_map": {
     "38": {"version": "2", "sha256": "1hb239w4cpz6yzs3pzd3hhrwswh6w5c5xw6dqn57m26cazh843qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgdGhlIGFiaWxpdHkgdG8gc3dhcCBiZXR3ZWVuIGtlcm5lbCBnb3Zlcm5vcnMgZm9yIHRoZSBDUFUgdXNlZnVsIGZvciBsYXB0b3BzLlxuXG5SZXF1aXJlczogcG9sa2l0LCBjcHVwb3dlclxuR2l0aHViOiBodHRwczovL2dpdGh1Yi5jb20vanV4dWFudS9jcHVwb3dlci1nb3Zlcm5vcnMiLAogICJuYW1lIjogIkNQVSBQb3dlciBHb3Zlcm5vciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjcHVwb3dlci1nb3Zlcm5vcnNAaWNhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
@@ -2818,8 +2966,9 @@
     "42": {"version": "36", "sha256": "1dj98am80c82mfw7cz9mzhqnahxqpkgm7lazd2s023rs0hfx825c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDM2Cn0="},
     "43": {"version": "45", "sha256": "1ghplv7qvdh1l2r7y9wnfbgmlq2js5sifyv6jhj20mc50j0dwd59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
     "44": {"version": "45", "sha256": "1ghplv7qvdh1l2r7y9wnfbgmlq2js5sifyv6jhj20mc50j0dwd59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
-    "45": {"version": "47", "sha256": "07ar75i1lbgbby0zp9961298qcj7va6mm0l4vcizka6p3y25ag75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ3Cn0="},
-    "46": {"version": "47", "sha256": "07ar75i1lbgbby0zp9961298qcj7va6mm0l4vcizka6p3y25ag75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ3Cn0="}
+    "45": {"version": "48", "sha256": "1fh4dbncjpvf31h3yjnjklmx6m706vb98pphnyk8a5yxlwxjgjya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ4Cn0="},
+    "46": {"version": "48", "sha256": "1fh4dbncjpvf31h3yjnjklmx6m706vb98pphnyk8a5yxlwxjgjya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ4Cn0="},
+    "47": {"version": "49", "sha256": "17sylj1h6vn9r61apdbvhlryzzjzj1296b981y3bnkhby4xbmh9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9UaWxpbmctQXNzaXN0YW50IiwKICAidXVpZCI6ICJ0aWxpbmctYXNzaXN0YW50QGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogNDkKfQ=="}
   }}
 , {"uuid": "airpods-battery-status@ju.wtf", "name": "Airpods Battery status", "pname": "airpods-battery-status", "description": "Show Airpods battery level in top bar\n\n/!\\ Needs AirStatus to work: https://github.com/delphiki/AirStatus", "link": "https://extensions.gnome.org/extension/3736/airpods-battery-status/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -2836,8 +2985,9 @@
     "42": {"version": "30", "sha256": "1hzvimbdr6bd0a9ysynf5hsqlbkfnsgyqlphhnfgxa03wl6q8fk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="},
     "43": {"version": "30", "sha256": "1hzvimbdr6bd0a9ysynf5hsqlbkfnsgyqlphhnfgxa03wl6q8fk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="},
     "44": {"version": "30", "sha256": "1hzvimbdr6bd0a9ysynf5hsqlbkfnsgyqlphhnfgxa03wl6q8fk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="},
-    "45": {"version": "35", "sha256": "0dl6zrr8nwrdycf9djn9dc4nznhp26iwcwhafw7ivkg0msz6a6gf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJ2Y2hsdW0iLAogICAgInBheXBhbCI6ICJ2Y2hsdW0iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVlLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM1Cn0="},
-    "46": {"version": "35", "sha256": "0dl6zrr8nwrdycf9djn9dc4nznhp26iwcwhafw7ivkg0msz6a6gf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJ2Y2hsdW0iLAogICAgInBheXBhbCI6ICJ2Y2hsdW0iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVlLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM1Cn0="}
+    "45": {"version": "37", "sha256": "0j0hjf1882y32k764wqlhmc7gym7kyw5cj6a2wa2qwgclxz8mclx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJ2Y2hsdW0iLAogICAgInBheXBhbCI6ICJ2Y2hsdW0iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVlLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "46": {"version": "37", "sha256": "0j0hjf1882y32k764wqlhmc7gym7kyw5cj6a2wa2qwgclxz8mclx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJ2Y2hsdW0iLAogICAgInBheXBhbCI6ICJ2Y2hsdW0iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVlLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "47": {"version": "37", "sha256": "0j0hjf1882y32k764wqlhmc7gym7kyw5cj6a2wa2qwgclxz8mclx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJ2Y2hsdW0iLAogICAgInBheXBhbCI6ICJ2Y2hsdW0iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVlLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}
   }}
 , {"uuid": "compiz-alike-magic-lamp-effect@hermes83.github.com", "name": "Compiz alike magic lamp effect", "pname": "compiz-alike-magic-lamp-effect", "description": "Magic lamp effect inspired by the Compiz ones\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)", "link": "https://extensions.gnome.org/extension/3740/compiz-alike-magic-lamp-effect/", "shell_version_map": {
     "38": {"version": "17", "sha256": "0mv8glz3bxxs6gqms282ji8l375alqbwfszd6y7j0q6x9qhl6bz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
@@ -2846,8 +2996,9 @@
     "42": {"version": "17", "sha256": "0mv8glz3bxxs6gqms282ji8l375alqbwfszd6y7j0q6x9qhl6bz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "43": {"version": "17", "sha256": "0mv8glz3bxxs6gqms282ji8l375alqbwfszd6y7j0q6x9qhl6bz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "44": {"version": "17", "sha256": "0mv8glz3bxxs6gqms282ji8l375alqbwfszd6y7j0q6x9qhl6bz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "45": {"version": "19", "sha256": "1avklp4f10qdw2mzgy1pdimw7k9laqbx349ny5m3l3k3hd0l62lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbS5naXRodWIuaGVybWVzODMuY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="},
-    "46": {"version": "19", "sha256": "1avklp4f10qdw2mzgy1pdimw7k9laqbx349ny5m3l3k3hd0l62lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbS5naXRodWIuaGVybWVzODMuY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}
+    "45": {"version": "20", "sha256": "1x3h4mhpch7m5miarknga81bvmzx3v3y65k6rmaqvy36lxf3gaa7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbS5naXRodWIuaGVybWVzODMuY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "46": {"version": "20", "sha256": "1x3h4mhpch7m5miarknga81bvmzx3v3y65k6rmaqvy36lxf3gaa7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbS5naXRodWIuaGVybWVzODMuY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "47": {"version": "20", "sha256": "1x3h4mhpch7m5miarknga81bvmzx3v3y65k6rmaqvy36lxf3gaa7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbS5naXRodWIuaGVybWVzODMuY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}
   }}
 , {"uuid": "latency-monitor@gitlab.labsatho.me", "name": "Latency Monitor", "pname": "latency-monitor", "description": "A simple extension for displaying latency information using pings in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3746/latency-monitor/", "shell_version_map": {
     "38": {"version": "6", "sha256": "0k2y1qrq7irkn2c72pk4c5x4fwzaxkfp3jj7qvhzih6zmkifdzcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZGlzcGxheWluZyBsYXRlbmN5IGluZm9ybWF0aW9uIHVzaW5nIHBpbmdzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiTGF0ZW5jeSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdGVuY3ktbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3dhbGthZndhbGthL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sYXRlbmN5LW1vbml0b3IiLAogICJ1dWlkIjogImxhdGVuY3ktbW9uaXRvckBnaXRsYWIubGFic2F0aG8ubWUiLAogICJ2ZXJzaW9uIjogNgp9"}
@@ -2860,7 +3011,8 @@
     "38": {"version": "4", "sha256": "1fgv36inchycwgsykc2mqv1l6jbm4jq2rysd2paknbka14vqx37r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0L2Jsb2IvbWFzdGVyL3RvdWNocGFkX3dpbmRvd19zd2l0Y2hlciU0MGdvbnphLmNvbS9vdmVydmlld0NsZWFuZXIuanMiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2NsZWFuZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "40": {"version": "4", "sha256": "1fgv36inchycwgsykc2mqv1l6jbm4jq2rysd2paknbka14vqx37r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0L2Jsb2IvbWFzdGVyL3RvdWNocGFkX3dpbmRvd19zd2l0Y2hlciU0MGdvbnphLmNvbS9vdmVydmlld0NsZWFuZXIuanMiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2NsZWFuZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "41": {"version": "4", "sha256": "1fgv36inchycwgsykc2mqv1l6jbm4jq2rysd2paknbka14vqx37r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0L2Jsb2IvbWFzdGVyL3RvdWNocGFkX3dpbmRvd19zd2l0Y2hlciU0MGdvbnphLmNvbS9vdmVydmlld0NsZWFuZXIuanMiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2NsZWFuZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "42": {"version": "4", "sha256": "1fgv36inchycwgsykc2mqv1l6jbm4jq2rysd2paknbka14vqx37r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0L2Jsb2IvbWFzdGVyL3RvdWNocGFkX3dpbmRvd19zd2l0Y2hlciU0MGdvbnphLmNvbS9vdmVydmlld0NsZWFuZXIuanMiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2NsZWFuZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "42": {"version": "4", "sha256": "1fgv36inchycwgsykc2mqv1l6jbm4jq2rysd2paknbka14vqx37r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0L2Jsb2IvbWFzdGVyL3RvdWNocGFkX3dpbmRvd19zd2l0Y2hlciU0MGdvbnphLmNvbS9vdmVydmlld0NsZWFuZXIuanMiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2NsZWFuZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "46": {"version": "5", "sha256": "0n9kaxjdn4hymq4pjvn719n3h5bckin2f50vsdy0bx2lvw6zyvh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdG91Y2hwYWQtd2luZG93LXN3aXRjaGVyLWdub21lLWV4dC9ibG9iL21hc3Rlci90b3VjaHBhZF93aW5kb3dfc3dpdGNoZXIlNDBnb256YS5jb20vb3ZlcnZpZXdDbGVhbmVyLmpzIiwKICAidXVpZCI6ICJvdmVydmlld19jbGVhbmVyQGdvbnphLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "battery-status@atareao.es", "name": "Battery Status", "pname": "battery-status", "description": "Get information about your battery status", "link": "https://extensions.gnome.org/extension/3763/battery-status/", "shell_version_map": {
     "40": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -2880,8 +3032,9 @@
     "42": {"version": "54", "sha256": "0wflv80ayvs7hh7l6ic8if3c1fxjhc6wyii5vnz68hn505wki3p7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGR0ZXJtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
     "43": {"version": "54", "sha256": "0wflv80ayvs7hh7l6ic8if3c1fxjhc6wyii5vnz68hn505wki3p7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGR0ZXJtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
     "44": {"version": "54", "sha256": "0wflv80ayvs7hh7l6ic8if3c1fxjhc6wyii5vnz68hn505wki3p7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGR0ZXJtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
-    "45": {"version": "53", "sha256": "1lnapb61wd6aw3hkj714h8rl9jxvy840adwncjyh287jv7f5vqz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGR0ZXJtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"},
-    "46": {"version": "53", "sha256": "1lnapb61wd6aw3hkj714h8rl9jxvy840adwncjyh287jv7f5vqz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGR0ZXJtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"}
+    "45": {"version": "55", "sha256": "1gv89k4lvyih9cl42jh6ppdpdyz6xvk5bjjdr3g42306nfwyaik3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="},
+    "46": {"version": "55", "sha256": "1gv89k4lvyih9cl42jh6ppdpdyz6xvk5bjjdr3g42306nfwyaik3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="},
+    "47": {"version": "55", "sha256": "1gv89k4lvyih9cl42jh6ppdpdyz6xvk5bjjdr3g42306nfwyaik3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}
   }}
 , {"uuid": "favorites-only-dash@nahuelwexd.github.io", "name": "Favorites-only Dash", "pname": "favorites-only-dash", "description": "Show only favorite apps on Dash", "link": "https://extensions.gnome.org/extension/3789/favorites-only-dash/", "shell_version_map": {
     "38": {"version": "1", "sha256": "110h019563j33gksaq5fs0z71sz1mslq1sbsmhk9mj3qggd9vs65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgb25seSBmYXZvcml0ZSBhcHBzIG9uIERhc2giLAogICJuYW1lIjogIkZhdm9yaXRlcy1vbmx5IERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZmF2b3JpdGVzLW9ubHktZGFzaEBuYWh1ZWx3ZXhkLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}
@@ -2893,8 +3046,9 @@
     "42": {"version": "8", "sha256": "1jxhfrsyc2c1mp0965c9y1kjms768g3kv6ivnziw96i6dqppm8a1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
     "43": {"version": "8", "sha256": "1jxhfrsyc2c1mp0965c9y1kjms768g3kv6ivnziw96i6dqppm8a1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
     "44": {"version": "8", "sha256": "1jxhfrsyc2c1mp0965c9y1kjms768g3kv6ivnziw96i6dqppm8a1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
-    "45": {"version": "11", "sha256": "0b43aw6m7ad1m11li10dmyxy8rnck5fk3y52x10qgrq1z4k1fdqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "46": {"version": "11", "sha256": "0b43aw6m7ad1m11li10dmyxy8rnck5fk3y52x10qgrq1z4k1fdqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "45": {"version": "12", "sha256": "1cfk2m7w3c96i54cn6qf6f3llfcbby8ibl0sbzb7y1df561zqqqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "1cfk2m7w3c96i54cn6qf6f3llfcbby8ibl0sbzb7y1df561zqqqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "1cfk2m7w3c96i54cn6qf6f3llfcbby8ibl0sbzb7y1df561zqqqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "podman-as-docker@alberto.yomerengues.xyz", "name": "Podman and Docker", "pname": "podman-as-docker", "description": "podman extension as docker\nIn order to get it work on podman, you just need to create an alias\nSimply put: alias docker=podman\nand install podman-docker", "link": "https://extensions.gnome.org/extension/3799/podman-as-docker/", "shell_version_map": {
     "38": {"version": "1", "sha256": "18bkd6z5hm6zidh7xv8v3jvj36lmxzx4dar7nwa7nq3p51km6crz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInBvZG1hbiBleHRlbnNpb24gYXMgZG9ja2VyXG5JbiBvcmRlciB0byBnZXQgaXQgd29yayBvbiBwb2RtYW4sIHlvdSBqdXN0IG5lZWQgdG8gY3JlYXRlIGFuIGFsaWFzXG5TaW1wbHkgcHV0OiBhbGlhcyBkb2NrZXI9cG9kbWFuXG5hbmQgaW5zdGFsbCBwb2RtYW4tZG9ja2VyIiwKICAibmFtZSI6ICJQb2RtYW4gYW5kIERvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJwb2RtYW4tYXMtZG9ja2VyQGFsYmVydG8ueW9tZXJlbmd1ZXMueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}
@@ -2916,8 +3070,9 @@
     "42": {"version": "8", "sha256": "00w2wbqqkfb38r2cnhbm08jmsjgk5q5pv9jgkwx3v15qprwi0z86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "43": {"version": "8", "sha256": "00w2wbqqkfb38r2cnhbm08jmsjgk5q5pv9jgkwx3v15qprwi0z86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "44": {"version": "8", "sha256": "00w2wbqqkfb38r2cnhbm08jmsjgk5q5pv9jgkwx3v15qprwi0z86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "45": {"version": "11", "sha256": "1krfjciics6qbkx53z4a5px4yi9fxgsg9la2zkci2kwfp8by1psd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "46": {"version": "11", "sha256": "1krfjciics6qbkx53z4a5px4yi9fxgsg9la2zkci2kwfp8by1psd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "12", "sha256": "04wlgcy07ky9pcbp95csplnk3k9wqx9nlyhrr2jkcihci416z52s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "46": {"version": "12", "sha256": "04wlgcy07ky9pcbp95csplnk3k9wqx9nlyhrr2jkcihci416z52s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "47": {"version": "12", "sha256": "04wlgcy07ky9pcbp95csplnk3k9wqx9nlyhrr2jkcihci416z52s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
   }}
 , {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon (3.36-44)\n- Activities button Visibility\n- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40 and higher)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Label Visibility\n- App Menu Visibility (3.36-44)\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40 and higher)\n- Dash Visibility\n- Disable Overlay Key (40-42)\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36-40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD Position\n- OSD Visibility\n- Overview Spacing Size (40 and higher)\n- Panel Arrow Visibility (3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel icon size \n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36-41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Quick Settings Menu Visibility (43 and higher)\n- Quick Settings Dark Mode Toggle Visibility (45 and higher)\n- Ripple Box\n- Search Visibility\n- Startup Status (40-44)\n- Switcher Popup Delay\n- System Menu (Aggregate Menu) Visibility (3.36-42)\n- Take Screenshot Button in Window Menu Visibility\n- Weather Visibility\n- Window Demands Attention Focus\n- Window Maximized on Create (45 and higher)\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon (40-44)\n- Workspace Background Corner Size in Overview (40 and higher)\n- Workspace Peek (42-44)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40 and higher)\n- Workspace Switcher Size (40-44)\n- Workspace Switcher Visibility\n- Workspace Wraparound\n- World Clock Visibility", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {
     "38": {"version": "24", "sha256": "12ns0pbg16flsv8clggwf9hs2w4wmcvp6hijg6bchy7g2ahszr3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQ0KVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00NClcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQ0KVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzLTQ0KVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00NClcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDQpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00NClcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00NClcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQ0KVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
@@ -2926,8 +3081,9 @@
     "42": {"version": "26", "sha256": "1afivr0y15fl8ilx07s09zqszlhyd70rg6j2vhwn8l8f3l8j5731", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgInBhdHJlb24iOiAianVzdHBlcmZlY3Rpb24iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDI2Cn0="},
     "43": {"version": "26", "sha256": "1afivr0y15fl8ilx07s09zqszlhyd70rg6j2vhwn8l8f3l8j5731", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgInBhdHJlb24iOiAianVzdHBlcmZlY3Rpb24iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDI2Cn0="},
     "44": {"version": "26", "sha256": "1afivr0y15fl8ilx07s09zqszlhyd70rg6j2vhwn8l8f3l8j5731", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgInBhdHJlb24iOiAianVzdHBlcmZlY3Rpb24iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDI2Cn0="},
-    "45": {"version": "29", "sha256": "0b2w9zj1wi9wfix1iy08xk7d4zrfypaq46bd0j1bcl8js0002k1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJqdXN0cGVyZmVjdGlvbiIsCiAgICAicGF0cmVvbiI6ICJqdXN0cGVyZmVjdGlvbiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyOQp9"},
-    "46": {"version": "29", "sha256": "0b2w9zj1wi9wfix1iy08xk7d4zrfypaq46bd0j1bcl8js0002k1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJqdXN0cGVyZmVjdGlvbiIsCiAgICAicGF0cmVvbiI6ICJqdXN0cGVyZmVjdGlvbiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyOQp9"}
+    "45": {"version": "30", "sha256": "0y9f31j2fszkncpwh51rm88vyw8cc6sip15yp2ajalfkiw89iqk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJqdXN0cGVyZmVjdGlvbiIsCiAgICAicGF0cmVvbiI6ICJqdXN0cGVyZmVjdGlvbiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
+    "46": {"version": "30", "sha256": "0y9f31j2fszkncpwh51rm88vyw8cc6sip15yp2ajalfkiw89iqk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJqdXN0cGVyZmVjdGlvbiIsCiAgICAicGF0cmVvbiI6ICJqdXN0cGVyZmVjdGlvbiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
+    "47": {"version": "30", "sha256": "0y9f31j2fszkncpwh51rm88vyw8cc6sip15yp2ajalfkiw89iqk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJqdXN0cGVyZmVjdGlvbiIsCiAgICAicGF0cmVvbiI6ICJqdXN0cGVyZmVjdGlvbiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}
   }}
 , {"uuid": "workspaces-bar@fthx", "name": "Workspaces Bar", "pname": "workspaces-bar", "description": "NOT MAINTAINED ANYMORE\n\nReplace 'Activities' button by all current workspaces buttons. Switch workspace or toggle overview by clicking on these buttons.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/3851/workspaces-bar/", "shell_version_map": {
     "38": {"version": "13", "sha256": "0vilcgm88sb6w3x3wyil92gdsf3bwyy2ichhw1x6xidm7ggkibqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZSBvciB0b2dnbGUgb3ZlcnZpZXcgYnkgY2xpY2tpbmcgb24gdGhlc2UgYnV0dG9ucy5cblxuIFlvdSBjYW4gdXNlIG5hbWVzIGZvciB3b3Jrc3BhY2VzOiB0aGVyZSBhcmUgdHdvIHdheXMgZm9yIHRoYXQuIDEpIEVkaXQgdGhlIHN0cmluZyBhcnJheSAnb3JnLmdub21lLmRlc2t0b3Aud20ucHJlZmVyZW5jZXMud29ya3NwYWNlLW5hbWVzJyBnc2V0dGluZ3Mga2V5ICh0aHJvdWdoIGRjb25mIGVkaXRvciwgZS5nLikuIDIpIFVzZSBvZmZpY2lhbCBHTk9NRSBleHRlbnNpb24gV29ya3NwYWNlcyBJbmRpY2F0b3IncyBzZXR0aW5ncy4gWW91IGRvbid0IGhhdmUgdG8gd3JpdGUgYSBsb25nIGVub3VnaCBsaXN0OiBudW1iZXJzIGFyZSBkaXNwbGF5ZWQgaWYgbm8gd29ya3NwYWNlIG5hbWUgaXMgZGVmaW5lZC4iLAogICJuYW1lIjogIldvcmtzcGFjZXMgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -3016,15 +3172,16 @@
     "40": {"version": "4", "sha256": "1n2fnqv9mhgz9i32vbplamp8vfridh9hc2maxdl8y7nlhvjrk992", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQnV0dG9uIGluIHBhbmVsOiBzd2l0Y2ggYmV0d2VlbiBBZHdhaXRhIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4iLAogICJuYW1lIjogIkFkd2FpdGEgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYWR3YWl0YS10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR3YWl0YS10aGVtZS1zd2l0Y2hlckBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "41": {"version": "4", "sha256": "1n2fnqv9mhgz9i32vbplamp8vfridh9hc2maxdl8y7nlhvjrk992", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQnV0dG9uIGluIHBhbmVsOiBzd2l0Y2ggYmV0d2VlbiBBZHdhaXRhIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4iLAogICJuYW1lIjogIkFkd2FpdGEgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYWR3YWl0YS10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR3YWl0YS10aGVtZS1zd2l0Y2hlckBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
-, {"uuid": "fnlock-switch-tp-comp-usb-kb@goloshubov.github.io", "name": "FnLock switch (ThinkPad Compact USB Keyboard) ", "pname": "fnlock-switch-thinkpad-compact-usb-keyboard", "description": "FnLock switch for Lenovo ThinkPad Compact USB Keyboard ", "link": "https://extensions.gnome.org/extension/3939/fnlock-switch-thinkpad-compact-usb-keyboard/", "shell_version_map": {
+, {"uuid": "fnlock-switch-tp-comp-usb-kb@goloshubov.github.io", "name": "FnLock switch (ThinkPad Compact USB Keyboard)", "pname": "fnlock-switch-thinkpad-compact-usb-keyboard", "description": "FnLock switch for Lenovo ThinkPad Compact USB Keyboard", "link": "https://extensions.gnome.org/extension/3939/fnlock-switch-thinkpad-compact-usb-keyboard/", "shell_version_map": {
     "38": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "40": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "41": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "42": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "43": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "44": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "45": {"version": "11", "sha256": "0scc8z918g0ww5ljdzkwfkv52ff4gma8bj5isb9gid62lb6idiq8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "46": {"version": "11", "sha256": "0scc8z918g0ww5ljdzkwfkv52ff4gma8bj5isb9gid62lb6idiq8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "14", "sha256": "1bhhfzpd36v4j91qxwm8mdvywywxxybj2fw67cxsrkc5pnr2fmdx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCIsCiAgIm5hbWUiOiAiRm5Mb2NrIHN3aXRjaCAoVGhpbmtQYWQgQ29tcGFjdCBVU0IgS2V5Ym9hcmQpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZubG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "46": {"version": "14", "sha256": "1bhhfzpd36v4j91qxwm8mdvywywxxybj2fw67cxsrkc5pnr2fmdx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCIsCiAgIm5hbWUiOiAiRm5Mb2NrIHN3aXRjaCAoVGhpbmtQYWQgQ29tcGFjdCBVU0IgS2V5Ym9hcmQpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZubG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "47": {"version": "14", "sha256": "1bhhfzpd36v4j91qxwm8mdvywywxxybj2fw67cxsrkc5pnr2fmdx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCIsCiAgIm5hbWUiOiAiRm5Mb2NrIHN3aXRjaCAoVGhpbmtQYWQgQ29tcGFjdCBVU0IgS2V5Ym9hcmQpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZubG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}
   }}
 , {"uuid": "toggle-alacritty@itstime.tech", "name": "Toggle Alacritty", "pname": "toggle-alacritty", "description": "Toggles Alacritty window via hotkey: Alt+z\n\nIf Alacritty is not launched, attempts to start it (/usr/bin/alacritty)\n\nWorks under both Wayland and X11\n\nTo change hotkey please follow instruction in the README.md:", "link": "https://extensions.gnome.org/extension/3942/toggle-alacritty/", "shell_version_map": {
     "38": {"version": "6", "sha256": "03hz84zr05sjw20jvvhmawgi2acimlqzh3vrsp184j6d671yfv7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -3063,8 +3220,9 @@
     "42": {"version": "19", "sha256": "0h7iarczbkv24kbydrids0wdaymlrilib0jhqdmm9k11hriyg1jh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "43": {"version": "19", "sha256": "0h7iarczbkv24kbydrids0wdaymlrilib0jhqdmm9k11hriyg1jh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "44": {"version": "19", "sha256": "0h7iarczbkv24kbydrids0wdaymlrilib0jhqdmm9k11hriyg1jh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
-    "45": {"version": "24", "sha256": "14p08lcnv240bk9ibgchb74xjnsnfh4868w2qlgqpsn0fl1ba906", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDaGFybG90dGUgPGdmYXNAY3phLmxpPiIsCiAgImF1dGhvci1odG1sIjogIkNoYXJsb3R0ZSAmbHQ7PGEgaHJlZj1cIm1haWx0bzpnZmFzQGN6YS5saVwiPmdmYXNAY3phLmxpPC9hPiZndDsiLAogICJkZXNjcmlwdGlvbiI6ICJGdXp6eSBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgR25vbWUgU2VhcmNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICI8YSBocmVmPVwiaHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvQXBwcm94aW1hdGVfc3RyaW5nX21hdGNoaW5nXCI+RnV6enk8L2E+IGFwcGxpY2F0aW9uIHNlYXJjaCByZXN1bHRzIGZvciA8YSBocmVmPVwiaHR0cHM6Ly9kZXZlbG9wZXIuZ25vbWUub3JnL1NlYXJjaFByb3ZpZGVyL1wiPkdub21lIFNlYXJjaDwvYT4uIiwKICAiZW1haWwiOiAiZ2Zhc0BjemEubGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAibGljZW5zZSI6ICJHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wIiwKICAibGljZW5zZS1odG1sIjogIlRoaXMgcHJvZ3JhbSBjb21lcyB3aXRoIEFCU09MVVRFTFkgTk8gV0FSUkFOVFkuXG5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgRnV6enkgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3phcmxpZS9nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAidXVpZCI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuQ3phcmxpZS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="},
-    "46": {"version": "24", "sha256": "14p08lcnv240bk9ibgchb74xjnsnfh4868w2qlgqpsn0fl1ba906", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDaGFybG90dGUgPGdmYXNAY3phLmxpPiIsCiAgImF1dGhvci1odG1sIjogIkNoYXJsb3R0ZSAmbHQ7PGEgaHJlZj1cIm1haWx0bzpnZmFzQGN6YS5saVwiPmdmYXNAY3phLmxpPC9hPiZndDsiLAogICJkZXNjcmlwdGlvbiI6ICJGdXp6eSBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgR25vbWUgU2VhcmNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICI8YSBocmVmPVwiaHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvQXBwcm94aW1hdGVfc3RyaW5nX21hdGNoaW5nXCI+RnV6enk8L2E+IGFwcGxpY2F0aW9uIHNlYXJjaCByZXN1bHRzIGZvciA8YSBocmVmPVwiaHR0cHM6Ly9kZXZlbG9wZXIuZ25vbWUub3JnL1NlYXJjaFByb3ZpZGVyL1wiPkdub21lIFNlYXJjaDwvYT4uIiwKICAiZW1haWwiOiAiZ2Zhc0BjemEubGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAibGljZW5zZSI6ICJHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wIiwKICAibGljZW5zZS1odG1sIjogIlRoaXMgcHJvZ3JhbSBjb21lcyB3aXRoIEFCU09MVVRFTFkgTk8gV0FSUkFOVFkuXG5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgRnV6enkgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3phcmxpZS9nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAidXVpZCI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuQ3phcmxpZS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}
+    "45": {"version": "25", "sha256": "0xmc3jaj9yzw7kgfxyr31xb24bpa70lxcarrya1a66dikf6hyk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDaGFybG90dGUgPGdmYXNAY3phLmxpPiIsCiAgImF1dGhvci1odG1sIjogIkNoYXJsb3R0ZSAmbHQ7PGEgaHJlZj1cIm1haWx0bzpnZmFzQGN6YS5saVwiPmdmYXNAY3phLmxpPC9hPiZndDsiLAogICJkZXNjcmlwdGlvbiI6ICJGdXp6eSBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgR25vbWUgU2VhcmNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICI8YSBocmVmPVwiaHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvQXBwcm94aW1hdGVfc3RyaW5nX21hdGNoaW5nXCI+RnV6enk8L2E+IGFwcGxpY2F0aW9uIHNlYXJjaCByZXN1bHRzIGZvciA8YSBocmVmPVwiaHR0cHM6Ly9kZXZlbG9wZXIuZ25vbWUub3JnL1NlYXJjaFByb3ZpZGVyL1wiPkdub21lIFNlYXJjaDwvYT4uIiwKICAiZW1haWwiOiAiZ2Zhc0BjemEubGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAibGljZW5zZSI6ICJHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wIiwKICAibGljZW5zZS1odG1sIjogIlRoaXMgcHJvZ3JhbSBjb21lcyB3aXRoIEFCU09MVVRFTFkgTk8gV0FSUkFOVFkuXG5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgRnV6enkgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "46": {"version": "25", "sha256": "0xmc3jaj9yzw7kgfxyr31xb24bpa70lxcarrya1a66dikf6hyk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDaGFybG90dGUgPGdmYXNAY3phLmxpPiIsCiAgImF1dGhvci1odG1sIjogIkNoYXJsb3R0ZSAmbHQ7PGEgaHJlZj1cIm1haWx0bzpnZmFzQGN6YS5saVwiPmdmYXNAY3phLmxpPC9hPiZndDsiLAogICJkZXNjcmlwdGlvbiI6ICJGdXp6eSBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgR25vbWUgU2VhcmNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICI8YSBocmVmPVwiaHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvQXBwcm94aW1hdGVfc3RyaW5nX21hdGNoaW5nXCI+RnV6enk8L2E+IGFwcGxpY2F0aW9uIHNlYXJjaCByZXN1bHRzIGZvciA8YSBocmVmPVwiaHR0cHM6Ly9kZXZlbG9wZXIuZ25vbWUub3JnL1NlYXJjaFByb3ZpZGVyL1wiPkdub21lIFNlYXJjaDwvYT4uIiwKICAiZW1haWwiOiAiZ2Zhc0BjemEubGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAibGljZW5zZSI6ICJHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wIiwKICAibGljZW5zZS1odG1sIjogIlRoaXMgcHJvZ3JhbSBjb21lcyB3aXRoIEFCU09MVVRFTFkgTk8gV0FSUkFOVFkuXG5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgRnV6enkgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "0xmc3jaj9yzw7kgfxyr31xb24bpa70lxcarrya1a66dikf6hyk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDaGFybG90dGUgPGdmYXNAY3phLmxpPiIsCiAgImF1dGhvci1odG1sIjogIkNoYXJsb3R0ZSAmbHQ7PGEgaHJlZj1cIm1haWx0bzpnZmFzQGN6YS5saVwiPmdmYXNAY3phLmxpPC9hPiZndDsiLAogICJkZXNjcmlwdGlvbiI6ICJGdXp6eSBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgR25vbWUgU2VhcmNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICI8YSBocmVmPVwiaHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvQXBwcm94aW1hdGVfc3RyaW5nX21hdGNoaW5nXCI+RnV6enk8L2E+IGFwcGxpY2F0aW9uIHNlYXJjaCByZXN1bHRzIGZvciA8YSBocmVmPVwiaHR0cHM6Ly9kZXZlbG9wZXIuZ25vbWUub3JnL1NlYXJjaFByb3ZpZGVyL1wiPkdub21lIFNlYXJjaDwvYT4uIiwKICAiZW1haWwiOiAiZ2Zhc0BjemEubGkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAibGljZW5zZSI6ICJHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wIiwKICAibGljZW5zZS1odG1sIjogIlRoaXMgcHJvZ3JhbSBjb21lcyB3aXRoIEFCU09MVVRFTFkgTk8gV0FSUkFOVFkuXG5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgRnV6enkgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "e-ink-mode@fujimo-t.github.io", "name": "E Ink Mode", "pname": "e-ink-mode", "description": "Make desktop suitable for E Ink monitors.\n\nUnmaintenanced.\nPlease migrate to theme:\nhttps://github.com/fujimo-t/gnome-shell-theme-e-ink\nSee below to detail:\nhttps://github.com/fujimo-t/gnome-shell-extension-e-ink-mode/issues/3#issuecomment-1019159171", "link": "https://extensions.gnome.org/extension/3957/e-ink-mode/", "shell_version_map": {
     "40": {"version": "3", "sha256": "0khqna60a0vblygriiky0jzg92ib8i44i6wkr8s3vxi0bcfa2zhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZGVza3RvcCBzdWl0YWJsZSBmb3IgRSBJbmsgbW9uaXRvcnMuXG5cblVubWFpbnRlbmFuY2VkLlxuUGxlYXNlIG1pZ3JhdGUgdG8gdGhlbWU6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtdGhlbWUtZS1pbmtcblNlZSBiZWxvdyB0byBkZXRhaWw6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUvaXNzdWVzLzMjaXNzdWVjb21tZW50LTEwMTkxNTkxNzEiLAogICJuYW1lIjogIkUgSW5rIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUiLAogICJ1dWlkIjogImUtaW5rLW1vZGVAZnVqaW1vLXQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}
@@ -3077,7 +3235,8 @@
     "43": {"version": "16", "sha256": "065kl2dzf09vsyzfqx3sg8x4wz18q2azvp5lir7lrad7af2d0m93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"},
     "44": {"version": "17", "sha256": "06f5f87xix758gbixg1h9gd9jiqbwgqniw51k9qhmrz4q7134q8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "45": {"version": "19", "sha256": "0nlvn85b4qzzkmi9rxvab48lcnj1x8kac9045pfzq8qv3r8vf898", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="},
-    "46": {"version": "20", "sha256": "1rgikvjap3qy07i7dnirv01xsj9yqd887l09jq575k6bgc4sf07b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}
+    "46": {"version": "20", "sha256": "1rgikvjap3qy07i7dnirv01xsj9yqd887l09jq575k6bgc4sf07b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDIwCn0="},
+    "47": {"version": "21", "sha256": "1mhwyz08aidad16xdfrg0h6s08jsylpjgpijg3h3wpxkhrqaki37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}
   }}
 , {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {
     "38": {"version": "20", "sha256": "1lm2rvbyl7yh0cry3wrj5qn9069ka7681zgjj7nhkgizsf2xd7b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"},
@@ -3107,12 +3266,16 @@
     "42": {"version": "21", "sha256": "1pbldn51jjfq45d3bl7nfciff1mn3krl7dhiwp9hqrp3hchlassd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "43": {"version": "23", "sha256": "1nsjpjjsllrdh2k6v9h06xm656b5dbq2vpxs7kqn4p7l8b0ycav4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMwp9"},
     "45": {"version": "30", "sha256": "0bswnas2jr58f995sd6317wvy14vq0w5y8fcmrn8n36jgpf3ik5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzMAp9"},
-    "46": {"version": "32", "sha256": "035pgwb3dsdw75figyw0r82d2bfadd3sq780mmfvjfkfvb6zjaf9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IGppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzMgp9"}
+    "46": {"version": "32", "sha256": "035pgwb3dsdw75figyw0r82d2bfadd3sq780mmfvjfkfvb6zjaf9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IGppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzMgp9"},
+    "47": {"version": "34", "sha256": "0fir354m1cyz7qvp90wpmzf8nmm25zkakx0j2crzgi86iwil4nwq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IGppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzNAp9"}
   }}
 , {"uuid": "zilence@apankowski.github.com", "name": "Zilence", "pname": "zilence", "description": "Turns off notifications while sharing screen during a Zoom call", "link": "https://extensions.gnome.org/extension/3988/zilence/", "shell_version_map": {
-    "38": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "40": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "42": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "38": {"version": "5", "sha256": "1sr2lkbb7c0jglzg811z6mhmwj8mwly0vp240x86xmlx85hzika5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI4YThjNThhZmE3Mzk5Y2ZhZWIzNzczNjgwZDk5ZmM5ZmQxYTZmYzM4IiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXBhbmtvd3NraS96aWxlbmNlIiwKICAidXVpZCI6ICJ6aWxlbmNlQGFwYW5rb3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "40": {"version": "5", "sha256": "1sr2lkbb7c0jglzg811z6mhmwj8mwly0vp240x86xmlx85hzika5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI4YThjNThhZmE3Mzk5Y2ZhZWIzNzczNjgwZDk5ZmM5ZmQxYTZmYzM4IiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXBhbmtvd3NraS96aWxlbmNlIiwKICAidXVpZCI6ICJ6aWxlbmNlQGFwYW5rb3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "42": {"version": "5", "sha256": "1sr2lkbb7c0jglzg811z6mhmwj8mwly0vp240x86xmlx85hzika5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI4YThjNThhZmE3Mzk5Y2ZhZWIzNzczNjgwZDk5ZmM5ZmQxYTZmYzM4IiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXBhbmtvd3NraS96aWxlbmNlIiwKICAidXVpZCI6ICJ6aWxlbmNlQGFwYW5rb3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "44": {"version": "5", "sha256": "1sr2lkbb7c0jglzg811z6mhmwj8mwly0vp240x86xmlx85hzika5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI4YThjNThhZmE3Mzk5Y2ZhZWIzNzczNjgwZDk5ZmM5ZmQxYTZmYzM4IiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXBhbmtvd3NraS96aWxlbmNlIiwKICAidXVpZCI6ICJ6aWxlbmNlQGFwYW5rb3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "45": {"version": "6", "sha256": "1sf6mjy1fsisd8nmkjy8ax43dc8jwgvjxz6h0gllqlch7y9b0sqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI3YjBlNTE3OTk3OGE4MDU3OGFmN2Q2N2FiMWI0NjJjY2I0YzM4Njg1IiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
+    "46": {"version": "6", "sha256": "1sf6mjy1fsisd8nmkjy8ax43dc8jwgvjxz6h0gllqlch7y9b0sqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI3YjBlNTE3OTk3OGE4MDU3OGFmN2Q2N2FiMWI0NjJjY2I0YzM4Njg1IiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}
   }}
 , {"uuid": "bluetooth-battery@michalw.github.com", "name": "Bluetooth battery indicator", "pname": "bluetooth-battery", "description": "Bluetooth battery indicator", "link": "https://extensions.gnome.org/extension/3991/bluetooth-battery/", "shell_version_map": {
     "38": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"},
@@ -3121,8 +3284,9 @@
     "42": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "43": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "44": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "45": {"version": "39", "sha256": "0w7gs20x9iacal9dnvds91y9d7xi93lf8ps98aw2918yiq3gd0xm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"},
-    "46": {"version": "39", "sha256": "0w7gs20x9iacal9dnvds91y9d7xi93lf8ps98aw2918yiq3gd0xm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}
+    "45": {"version": "41", "sha256": "138gvnw7667z2412w6m5hnsmpzj02b61gpsa6vxy6v1xgcpmmg96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
+    "46": {"version": "41", "sha256": "138gvnw7667z2412w6m5hnsmpzj02b61gpsa6vxy6v1xgcpmmg96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
+    "47": {"version": "41", "sha256": "138gvnw7667z2412w6m5hnsmpzj02b61gpsa6vxy6v1xgcpmmg96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}
   }}
 , {"uuid": "gnome-extension-all-ip-addresses@havekes.eu", "name": "All IP Addresses", "pname": "all-ip-addresses", "description": "Show IP addresses for LAN, WAN IPv6 and VPN in the GNOME panel. Click on the address to cycle trough different interfaces.", "link": "https://extensions.gnome.org/extension/3994/all-ip-addresses/", "shell_version_map": {
     "38": {"version": "12", "sha256": "0sxw8igvjv2hx1d42cibxbrjdl61983s9054l0jbnvszr30jyf7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waGF2ZWtlcy9nbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3NlcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWFsbC1pcC1hZGRyZXNzZXNAaGF2ZWtlcy5ldSIsCiAgInZlcnNpb24iOiAxMgp9"},
@@ -3159,7 +3323,8 @@
     "42": {"version": "13", "sha256": "0j23i2gl956r2wffqky5vg6ca24gn3hkibhrhsvkqd87g90cjdq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxMwp9"},
     "43": {"version": "16", "sha256": "1frahic00q1dqi27vbxw8y0dz1qcfd99m1kzha1r8pyfgwd22fqv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNgp9"},
     "45": {"version": "19", "sha256": "0p8rfw2yvx7cdm43wgjgml5hisijxwjsl8d6cg1aad9m3lc8d0pl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "46": {"version": "22", "sha256": "1yvix045i0664jvkdh1zc3fgr5xwc4xipvk0n57vq0zc7sv8wwcp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMgp9"}
+    "46": {"version": "22", "sha256": "1yvix045i0664jvkdh1zc3fgr5xwc4xipvk0n57vq0zc7sv8wwcp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMgp9"},
+    "47": {"version": "24", "sha256": "1ykvm56x01dl459g2g9qx3hackvrvds185x5vhb5wi4mbpyl0qbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyNAp9"}
   }}
 , {"uuid": "alttab-mod@leleat-on-github", "name": "AltTab Mod", "pname": "alttab-mod", "description": "Add some QoL changes to the App Switcher (Alt/Super+Tab)...\n- use `WASD`, `hjkl` or the arrow keys for navigation\n- `Q` only closes the selected window instead of the entire app\n- only raise the first window instead of every instance\n- optionally: only show windows from the current workspace\n- optionally: only show windows from the current monitor\n- optionally: remove the App Switcher's delayed appearance", "link": "https://extensions.gnome.org/extension/4007/alttab-mod/", "shell_version_map": {
     "38": {"version": "6", "sha256": "1010nmdyga6lqk78vlc9r02h3kcgimlvamb7xhp5vw7i71gay4jv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -3169,7 +3334,8 @@
     "43": {"version": "14", "sha256": "0apds8yqqq5hnbjqdnsag7xrqk3jiv9k3djrahhwfgxwy0l2j0f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxNAp9"},
     "44": {"version": "14", "sha256": "0apds8yqqq5hnbjqdnsag7xrqk3jiv9k3djrahhwfgxwy0l2j0f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxNAp9"},
     "45": {"version": "18", "sha256": "1ppdz0g7sy0j0cmvp1y43p9mgsxn73cc273fmhi47i9phcp117in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
-    "46": {"version": "19", "sha256": "1rzb9445jpdka7947wcvncal6sfm0qg9mni0073qa4alncp573fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}
+    "46": {"version": "20", "sha256": "1wx4zs5c5jnmlg2fjvwh1bxjvkfxwrzy1b6kfphg6bl5qwhjd1p3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvQWx0VGFiLU1vZCIsCiAgInV1aWQiOiAiYWx0dGFiLW1vZEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDIwCn0="},
+    "47": {"version": "20", "sha256": "1wx4zs5c5jnmlg2fjvwh1bxjvkfxwrzy1b6kfphg6bl5qwhjd1p3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvQWx0VGFiLU1vZCIsCiAgInV1aWQiOiAiYWx0dGFiLW1vZEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDIwCn0="}
   }}
 , {"uuid": "personalize@Selenium-H", "name": "Personalize", "pname": "personalize", "description": "Personalize the looks of GNOME Desktop.\n\nSet the theme variant, window corner curvature and select accent color.\nThe Colors section contains colors generated from the selected accent color.\nThe color generation is not accurate. However, individual colors can be customised.\n\nNot all settings are applied automatically.\nPress Refresh button on the left of the headerbar to reload the extension \n\nCurrently, only Adwaita theme is supported. Also, Adwaita and Adwaita-dark gtk-2 themes\nmust be installed for the extension to work properly. Not all widgets are themed perfectly.", "link": "https://extensions.gnome.org/extension/4010/personalize/", "shell_version_map": {
     "38": {"version": "1", "sha256": "1rgh2zq7086ymf0222pbrx5n8q11v3f45095w4x3ikw7k12j9s0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiUGVyc29uYWxpemUgR05PTUUgdGhlbWUgYW5kIGN1c3RvbWl6ZSB0aGVtLiIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNvbmFsaXplIHRoZSBsb29rcyBvZiBHTk9NRSBEZXNrdG9wLlxuXG5TZXQgdGhlIHRoZW1lIHZhcmlhbnQsIHdpbmRvdyBjb3JuZXIgY3VydmF0dXJlIGFuZCBzZWxlY3QgYWNjZW50IGNvbG9yLlxuVGhlIENvbG9ycyBzZWN0aW9uIGNvbnRhaW5zIGNvbG9ycyBnZW5lcmF0ZWQgZnJvbSB0aGUgc2VsZWN0ZWQgYWNjZW50IGNvbG9yLlxuVGhlIGNvbG9yIGdlbmVyYXRpb24gaXMgbm90IGFjY3VyYXRlLiBIb3dldmVyLCBpbmRpdmlkdWFsIGNvbG9ycyBjYW4gYmUgY3VzdG9taXNlZC5cblxuTm90IGFsbCBzZXR0aW5ncyBhcmUgYXBwbGllZCBhdXRvbWF0aWNhbGx5LlxuUHJlc3MgUmVmcmVzaCBidXR0b24gb24gdGhlIGxlZnQgb2YgdGhlIGhlYWRlcmJhciB0byByZWxvYWQgdGhlIGV4dGVuc2lvbiBcblxuQ3VycmVudGx5LCBvbmx5IEFkd2FpdGEgdGhlbWUgaXMgc3VwcG9ydGVkLiBBbHNvLCBBZHdhaXRhIGFuZCBBZHdhaXRhLWRhcmsgZ3RrLTIgdGhlbWVzXG5tdXN0IGJlIGluc3RhbGxlZCBmb3IgdGhlIGV4dGVuc2lvbiB0byB3b3JrIHByb3Blcmx5LiBOb3QgYWxsIHdpZGdldHMgYXJlIHRoZW1lZCBwZXJmZWN0bHkuIiwKICAibmFtZSI6ICJQZXJzb25hbGl6ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzb25hbGl6ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJzdGF0dXMiOiAiICIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2VsZW5pdW0tSC9QZXJzb25hbGl6ZSIsCiAgInV1aWQiOiAicGVyc29uYWxpemVAU2VsZW5pdW0tSCIsCiAgInZlcnNpb24iOiAxCn0="}
@@ -3182,7 +3348,8 @@
     "43": {"version": "17", "sha256": "1qm0z97gslbqjabf90smlzpmwb8vb4q1v8xxx3qm44218yqzj5gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3IgaXMgc2ltaWxhciB0byBBbmRyb2lkJ3MgYmVkdGltZSBtb2RlIHdoaWNoIGNvbnZlcnRzIHRoZSBwaG9uZSBzY3JlZW4gdG8gZ3JheXNjYWxlLiBJdCBzaG91bGQgc29tZXdoYXQgbWFrZSB5b3VyIGRldmljZSBsZXNzIGFwcGVhbGluZyBhbmQgbGltaXQgdGhlIHVzYWdlIG9mIGl0IGJlZm9yZSBiZWR0aW1lLiBPbiBteSBzaWRlLCBhdCBsZWFzdCwgaXQgc3RpbGwgcmVxdWlyZXMgYSBmYWlyIGFtb3VudCBvZiBzZWxmIGNvbnRyb2wgaW4gb3JkZXIgdG8gbWFrZSB0aGF0IGhhcHBlbi5cblxuVGhlIGV4dGVuc2lvbiBoYXMgYSBuaWNlIFNldHRpbmdzIFVJIHdoZXJlIHlvdSBjYW4gY3VzdG9taXplIGl0IHRvIHlvdXIgbGlraW5nOlxuLSBTZXQgYW4gYXV0b21hdGljIHNjaGVkdWxlIGZvciB0dXJuaW5nIG9uL29mZiB0aGUgQmVkdGltZSBNb2RlXG4tIEFkZCBhbiBPbiBEZW1hbmQgYnV0dG9uIHRvIFRvcCBCYXIgb3IgYSBRdWljayBTZXR0aW5ncyB0b2dnbGUgdG8gbWFudWFsbHkgZW5hYmxlL2Rpc2FibGUgdGhlIG1vZGVcbi0gQ29udHJvbCB0aGUgT24gRGVtYW5kIGJ1dHRvbiB2aXNpYmlsaXR5LCBhcHBlYXJhbmNlIGFuZCBwb3NpdGlvbiBpbiBUb3AgQmFyXG4tIENob29zZSBhbm90aGVyIGNvbG9yIHByZXNldCBhbmQgaW50ZW5zaXR5LCBpZiB5b3UgcHJlZmVyIGEgZGlmZmVyZW50IGNvbG9yIHNjaGVtZVxuLSBDaGFuZ2UgY29sb3IgaW50ZW5zaXR5IG9uIHRoZSBmbHkgYnkgc2Nyb2xsaW5nIG92ZXIgdGhlIE9uIERlbWFuZCBidXR0b24gaW4gVG9wIEJhclxuXG5NdWx0aSBsYW5ndWFnZSBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlLCBwbGVhc2UgY2hlY2sgdGhlIEdpdEh1YiBwYWdlIGlmIHlvdSB3YW50IHRvIGhlbHAgd2l0aCB0aGUgdHJhbnNsYXRpb25zLiBTbyBmYXIsIHRoZSBleHRlbnNpb24gaXMgZnVsbHkgdHJhbnNsYXRlZCB0byBJdGFsaWFuLCBTcGFuaXNoLCBEdXRjaCwgR2VybWFuLCBDemVjaCwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW9udXRib3J0aXMvZ25vbWUtYmVkdGltZS1tb2RlIiwKICAidXVpZCI6ICJnbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "44": {"version": "17", "sha256": "1qm0z97gslbqjabf90smlzpmwb8vb4q1v8xxx3qm44218yqzj5gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3IgaXMgc2ltaWxhciB0byBBbmRyb2lkJ3MgYmVkdGltZSBtb2RlIHdoaWNoIGNvbnZlcnRzIHRoZSBwaG9uZSBzY3JlZW4gdG8gZ3JheXNjYWxlLiBJdCBzaG91bGQgc29tZXdoYXQgbWFrZSB5b3VyIGRldmljZSBsZXNzIGFwcGVhbGluZyBhbmQgbGltaXQgdGhlIHVzYWdlIG9mIGl0IGJlZm9yZSBiZWR0aW1lLiBPbiBteSBzaWRlLCBhdCBsZWFzdCwgaXQgc3RpbGwgcmVxdWlyZXMgYSBmYWlyIGFtb3VudCBvZiBzZWxmIGNvbnRyb2wgaW4gb3JkZXIgdG8gbWFrZSB0aGF0IGhhcHBlbi5cblxuVGhlIGV4dGVuc2lvbiBoYXMgYSBuaWNlIFNldHRpbmdzIFVJIHdoZXJlIHlvdSBjYW4gY3VzdG9taXplIGl0IHRvIHlvdXIgbGlraW5nOlxuLSBTZXQgYW4gYXV0b21hdGljIHNjaGVkdWxlIGZvciB0dXJuaW5nIG9uL29mZiB0aGUgQmVkdGltZSBNb2RlXG4tIEFkZCBhbiBPbiBEZW1hbmQgYnV0dG9uIHRvIFRvcCBCYXIgb3IgYSBRdWljayBTZXR0aW5ncyB0b2dnbGUgdG8gbWFudWFsbHkgZW5hYmxlL2Rpc2FibGUgdGhlIG1vZGVcbi0gQ29udHJvbCB0aGUgT24gRGVtYW5kIGJ1dHRvbiB2aXNpYmlsaXR5LCBhcHBlYXJhbmNlIGFuZCBwb3NpdGlvbiBpbiBUb3AgQmFyXG4tIENob29zZSBhbm90aGVyIGNvbG9yIHByZXNldCBhbmQgaW50ZW5zaXR5LCBpZiB5b3UgcHJlZmVyIGEgZGlmZmVyZW50IGNvbG9yIHNjaGVtZVxuLSBDaGFuZ2UgY29sb3IgaW50ZW5zaXR5IG9uIHRoZSBmbHkgYnkgc2Nyb2xsaW5nIG92ZXIgdGhlIE9uIERlbWFuZCBidXR0b24gaW4gVG9wIEJhclxuXG5NdWx0aSBsYW5ndWFnZSBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlLCBwbGVhc2UgY2hlY2sgdGhlIEdpdEh1YiBwYWdlIGlmIHlvdSB3YW50IHRvIGhlbHAgd2l0aCB0aGUgdHJhbnNsYXRpb25zLiBTbyBmYXIsIHRoZSBleHRlbnNpb24gaXMgZnVsbHkgdHJhbnNsYXRlZCB0byBJdGFsaWFuLCBTcGFuaXNoLCBEdXRjaCwgR2VybWFuLCBDemVjaCwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW9udXRib3J0aXMvZ25vbWUtYmVkdGltZS1tb2RlIiwKICAidXVpZCI6ICJnbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "45": {"version": "19", "sha256": "1128sqzphs6ij4060gc931izh9axvg8vp3hh4kdpazkdy24vv0m9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3IgaXMgc2ltaWxhciB0byBBbmRyb2lkJ3MgYmVkdGltZSBtb2RlIHdoaWNoIGNvbnZlcnRzIHRoZSBwaG9uZSBzY3JlZW4gdG8gZ3JheXNjYWxlLiBJdCBzaG91bGQgc29tZXdoYXQgbWFrZSB5b3VyIGRldmljZSBsZXNzIGFwcGVhbGluZyBhbmQgbGltaXQgdGhlIHVzYWdlIG9mIGl0IGJlZm9yZSBiZWR0aW1lLiBPbiBteSBzaWRlLCBhdCBsZWFzdCwgaXQgc3RpbGwgcmVxdWlyZXMgYSBmYWlyIGFtb3VudCBvZiBzZWxmIGNvbnRyb2wgaW4gb3JkZXIgdG8gbWFrZSB0aGF0IGhhcHBlbi5cblxuVGhlIGV4dGVuc2lvbiBoYXMgYSBuaWNlIFNldHRpbmdzIFVJIHdoZXJlIHlvdSBjYW4gY3VzdG9taXplIGl0IHRvIHlvdXIgbGlraW5nOlxuLSBTZXQgYW4gYXV0b21hdGljIHNjaGVkdWxlIGZvciB0dXJuaW5nIG9uL29mZiB0aGUgQmVkdGltZSBNb2RlXG4tIEFkZCBhbiBPbiBEZW1hbmQgYnV0dG9uIHRvIFRvcCBCYXIgb3IgYSBRdWljayBTZXR0aW5ncyB0b2dnbGUgdG8gbWFudWFsbHkgZW5hYmxlL2Rpc2FibGUgdGhlIG1vZGVcbi0gQ29udHJvbCB0aGUgT24gRGVtYW5kIGJ1dHRvbiB2aXNpYmlsaXR5LCBhcHBlYXJhbmNlIGFuZCBwb3NpdGlvbiBpbiBUb3AgQmFyXG4tIENob29zZSBhbm90aGVyIGNvbG9yIHByZXNldCBhbmQgaW50ZW5zaXR5LCBpZiB5b3UgcHJlZmVyIGEgZGlmZmVyZW50IGNvbG9yIHNjaGVtZVxuLSBDaGFuZ2UgY29sb3IgaW50ZW5zaXR5IG9uIHRoZSBmbHkgYnkgc2Nyb2xsaW5nIG92ZXIgdGhlIE9uIERlbWFuZCBidXR0b24gaW4gVG9wIEJhclxuXG5NdWx0aSBsYW5ndWFnZSBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlLCBwbGVhc2UgY2hlY2sgdGhlIEdpdEh1YiBwYWdlIGlmIHlvdSB3YW50IHRvIGhlbHAgd2l0aCB0aGUgdHJhbnNsYXRpb25zLiBTbyBmYXIsIHRoZSBleHRlbnNpb24gaXMgZnVsbHkgdHJhbnNsYXRlZCB0byBGcmVuY2gsIEl0YWxpYW4sIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIEN6ZWNoLCBSb21hbmlhbiBhbmQgRW5nbGlzaC5cblxuSWYgeW91IHdhbnQgdG8gdXNlIGEga2V5Ym9hcmQgc2hvcnRjdXQgaW4gb3JkZXIgdG8gdG9nZ2xlIHRoZSBCZWR0aW1lIE1vZGUgdGhlbiB5b3UgY2FuIHVzZSB0aGlzIGNvbW1hbmQgZm9yIHRoZSBzaG9ydGN1dDpcblxuYmFzaCAtYyAnc2NoZW1hX2lkPW9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZTsgc2NoZW1hX2Rpcj1+Ly5sb2NhbC9zaGFyZS9nbm9tZS1zaGVsbC9leHRlbnNpb25zL2dub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20vc2NoZW1hcy87IGlmIFtbICQoZ3NldHRpbmdzIC0tc2NoZW1hZGlyICRzY2hlbWFfZGlyIGdldCAkc2NoZW1hX2lkIGJlZHRpbWUtbW9kZS1hY3RpdmUpID09IHRydWUgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "46": {"version": "19", "sha256": "1128sqzphs6ij4060gc931izh9axvg8vp3hh4kdpazkdy24vv0m9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3IgaXMgc2ltaWxhciB0byBBbmRyb2lkJ3MgYmVkdGltZSBtb2RlIHdoaWNoIGNvbnZlcnRzIHRoZSBwaG9uZSBzY3JlZW4gdG8gZ3JheXNjYWxlLiBJdCBzaG91bGQgc29tZXdoYXQgbWFrZSB5b3VyIGRldmljZSBsZXNzIGFwcGVhbGluZyBhbmQgbGltaXQgdGhlIHVzYWdlIG9mIGl0IGJlZm9yZSBiZWR0aW1lLiBPbiBteSBzaWRlLCBhdCBsZWFzdCwgaXQgc3RpbGwgcmVxdWlyZXMgYSBmYWlyIGFtb3VudCBvZiBzZWxmIGNvbnRyb2wgaW4gb3JkZXIgdG8gbWFrZSB0aGF0IGhhcHBlbi5cblxuVGhlIGV4dGVuc2lvbiBoYXMgYSBuaWNlIFNldHRpbmdzIFVJIHdoZXJlIHlvdSBjYW4gY3VzdG9taXplIGl0IHRvIHlvdXIgbGlraW5nOlxuLSBTZXQgYW4gYXV0b21hdGljIHNjaGVkdWxlIGZvciB0dXJuaW5nIG9uL29mZiB0aGUgQmVkdGltZSBNb2RlXG4tIEFkZCBhbiBPbiBEZW1hbmQgYnV0dG9uIHRvIFRvcCBCYXIgb3IgYSBRdWljayBTZXR0aW5ncyB0b2dnbGUgdG8gbWFudWFsbHkgZW5hYmxlL2Rpc2FibGUgdGhlIG1vZGVcbi0gQ29udHJvbCB0aGUgT24gRGVtYW5kIGJ1dHRvbiB2aXNpYmlsaXR5LCBhcHBlYXJhbmNlIGFuZCBwb3NpdGlvbiBpbiBUb3AgQmFyXG4tIENob29zZSBhbm90aGVyIGNvbG9yIHByZXNldCBhbmQgaW50ZW5zaXR5LCBpZiB5b3UgcHJlZmVyIGEgZGlmZmVyZW50IGNvbG9yIHNjaGVtZVxuLSBDaGFuZ2UgY29sb3IgaW50ZW5zaXR5IG9uIHRoZSBmbHkgYnkgc2Nyb2xsaW5nIG92ZXIgdGhlIE9uIERlbWFuZCBidXR0b24gaW4gVG9wIEJhclxuXG5NdWx0aSBsYW5ndWFnZSBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlLCBwbGVhc2UgY2hlY2sgdGhlIEdpdEh1YiBwYWdlIGlmIHlvdSB3YW50IHRvIGhlbHAgd2l0aCB0aGUgdHJhbnNsYXRpb25zLiBTbyBmYXIsIHRoZSBleHRlbnNpb24gaXMgZnVsbHkgdHJhbnNsYXRlZCB0byBGcmVuY2gsIEl0YWxpYW4sIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIEN6ZWNoLCBSb21hbmlhbiBhbmQgRW5nbGlzaC5cblxuSWYgeW91IHdhbnQgdG8gdXNlIGEga2V5Ym9hcmQgc2hvcnRjdXQgaW4gb3JkZXIgdG8gdG9nZ2xlIHRoZSBCZWR0aW1lIE1vZGUgdGhlbiB5b3UgY2FuIHVzZSB0aGlzIGNvbW1hbmQgZm9yIHRoZSBzaG9ydGN1dDpcblxuYmFzaCAtYyAnc2NoZW1hX2lkPW9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZTsgc2NoZW1hX2Rpcj1+Ly5sb2NhbC9zaGFyZS9nbm9tZS1zaGVsbC9leHRlbnNpb25zL2dub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20vc2NoZW1hcy87IGlmIFtbICQoZ3NldHRpbmdzIC0tc2NoZW1hZGlyICRzY2hlbWFfZGlyIGdldCAkc2NoZW1hX2lkIGJlZHRpbWUtbW9kZS1hY3RpdmUpID09IHRydWUgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}
+    "46": {"version": "19", "sha256": "1128sqzphs6ij4060gc931izh9axvg8vp3hh4kdpazkdy24vv0m9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3IgaXMgc2ltaWxhciB0byBBbmRyb2lkJ3MgYmVkdGltZSBtb2RlIHdoaWNoIGNvbnZlcnRzIHRoZSBwaG9uZSBzY3JlZW4gdG8gZ3JheXNjYWxlLiBJdCBzaG91bGQgc29tZXdoYXQgbWFrZSB5b3VyIGRldmljZSBsZXNzIGFwcGVhbGluZyBhbmQgbGltaXQgdGhlIHVzYWdlIG9mIGl0IGJlZm9yZSBiZWR0aW1lLiBPbiBteSBzaWRlLCBhdCBsZWFzdCwgaXQgc3RpbGwgcmVxdWlyZXMgYSBmYWlyIGFtb3VudCBvZiBzZWxmIGNvbnRyb2wgaW4gb3JkZXIgdG8gbWFrZSB0aGF0IGhhcHBlbi5cblxuVGhlIGV4dGVuc2lvbiBoYXMgYSBuaWNlIFNldHRpbmdzIFVJIHdoZXJlIHlvdSBjYW4gY3VzdG9taXplIGl0IHRvIHlvdXIgbGlraW5nOlxuLSBTZXQgYW4gYXV0b21hdGljIHNjaGVkdWxlIGZvciB0dXJuaW5nIG9uL29mZiB0aGUgQmVkdGltZSBNb2RlXG4tIEFkZCBhbiBPbiBEZW1hbmQgYnV0dG9uIHRvIFRvcCBCYXIgb3IgYSBRdWljayBTZXR0aW5ncyB0b2dnbGUgdG8gbWFudWFsbHkgZW5hYmxlL2Rpc2FibGUgdGhlIG1vZGVcbi0gQ29udHJvbCB0aGUgT24gRGVtYW5kIGJ1dHRvbiB2aXNpYmlsaXR5LCBhcHBlYXJhbmNlIGFuZCBwb3NpdGlvbiBpbiBUb3AgQmFyXG4tIENob29zZSBhbm90aGVyIGNvbG9yIHByZXNldCBhbmQgaW50ZW5zaXR5LCBpZiB5b3UgcHJlZmVyIGEgZGlmZmVyZW50IGNvbG9yIHNjaGVtZVxuLSBDaGFuZ2UgY29sb3IgaW50ZW5zaXR5IG9uIHRoZSBmbHkgYnkgc2Nyb2xsaW5nIG92ZXIgdGhlIE9uIERlbWFuZCBidXR0b24gaW4gVG9wIEJhclxuXG5NdWx0aSBsYW5ndWFnZSBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlLCBwbGVhc2UgY2hlY2sgdGhlIEdpdEh1YiBwYWdlIGlmIHlvdSB3YW50IHRvIGhlbHAgd2l0aCB0aGUgdHJhbnNsYXRpb25zLiBTbyBmYXIsIHRoZSBleHRlbnNpb24gaXMgZnVsbHkgdHJhbnNsYXRlZCB0byBGcmVuY2gsIEl0YWxpYW4sIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIEN6ZWNoLCBSb21hbmlhbiBhbmQgRW5nbGlzaC5cblxuSWYgeW91IHdhbnQgdG8gdXNlIGEga2V5Ym9hcmQgc2hvcnRjdXQgaW4gb3JkZXIgdG8gdG9nZ2xlIHRoZSBCZWR0aW1lIE1vZGUgdGhlbiB5b3UgY2FuIHVzZSB0aGlzIGNvbW1hbmQgZm9yIHRoZSBzaG9ydGN1dDpcblxuYmFzaCAtYyAnc2NoZW1hX2lkPW9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZTsgc2NoZW1hX2Rpcj1+Ly5sb2NhbC9zaGFyZS9nbm9tZS1zaGVsbC9leHRlbnNpb25zL2dub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20vc2NoZW1hcy87IGlmIFtbICQoZ3NldHRpbmdzIC0tc2NoZW1hZGlyICRzY2hlbWFfZGlyIGdldCAkc2NoZW1hX2lkIGJlZHRpbWUtbW9kZS1hY3RpdmUpID09IHRydWUgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"},
+    "47": {"version": "20", "sha256": "1nhrz77c4p9dw16qyg9m8nz760vxhvd34x3dwnyjhj7599yhf7an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3IgaXMgc2ltaWxhciB0byBBbmRyb2lkJ3MgYmVkdGltZSBtb2RlIHdoaWNoIGNvbnZlcnRzIHRoZSBwaG9uZSBzY3JlZW4gdG8gZ3JheXNjYWxlLiBJdCBzaG91bGQgc29tZXdoYXQgbWFrZSB5b3VyIGRldmljZSBsZXNzIGFwcGVhbGluZyBhbmQgbGltaXQgdGhlIHVzYWdlIG9mIGl0IGJlZm9yZSBiZWR0aW1lLiBPbiBteSBzaWRlLCBhdCBsZWFzdCwgaXQgc3RpbGwgcmVxdWlyZXMgYSBmYWlyIGFtb3VudCBvZiBzZWxmIGNvbnRyb2wgaW4gb3JkZXIgdG8gbWFrZSB0aGF0IGhhcHBlbi5cblxuVGhlIGV4dGVuc2lvbiBoYXMgYSBuaWNlIFNldHRpbmdzIFVJIHdoZXJlIHlvdSBjYW4gY3VzdG9taXplIGl0IHRvIHlvdXIgbGlraW5nOlxuLSBTZXQgYW4gYXV0b21hdGljIHNjaGVkdWxlIGZvciB0dXJuaW5nIG9uL29mZiB0aGUgQmVkdGltZSBNb2RlXG4tIEFkZCBhbiBPbiBEZW1hbmQgYnV0dG9uIHRvIFRvcCBCYXIgb3IgYSBRdWljayBTZXR0aW5ncyB0b2dnbGUgdG8gbWFudWFsbHkgZW5hYmxlL2Rpc2FibGUgdGhlIG1vZGVcbi0gQ29udHJvbCB0aGUgT24gRGVtYW5kIGJ1dHRvbiB2aXNpYmlsaXR5LCBhcHBlYXJhbmNlIGFuZCBwb3NpdGlvbiBpbiBUb3AgQmFyXG4tIENob29zZSBhbm90aGVyIGNvbG9yIHByZXNldCBhbmQgaW50ZW5zaXR5LCBpZiB5b3UgcHJlZmVyIGEgZGlmZmVyZW50IGNvbG9yIHNjaGVtZVxuLSBDaGFuZ2UgY29sb3IgaW50ZW5zaXR5IG9uIHRoZSBmbHkgYnkgc2Nyb2xsaW5nIG92ZXIgdGhlIE9uIERlbWFuZCBidXR0b24gaW4gVG9wIEJhclxuXG5NdWx0aSBsYW5ndWFnZSBzdXBwb3J0IGlzIGFsc28gYXZhaWxhYmxlLCBwbGVhc2UgY2hlY2sgdGhlIEdpdEh1YiBwYWdlIGlmIHlvdSB3YW50IHRvIGhlbHAgd2l0aCB0aGUgdHJhbnNsYXRpb25zLiBTbyBmYXIsIHRoZSBleHRlbnNpb24gaXMgZnVsbHkgdHJhbnNsYXRlZCB0byBGcmVuY2gsIEl0YWxpYW4sIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIEN6ZWNoLCBSb21hbmlhbiBhbmQgRW5nbGlzaC5cblxuSWYgeW91IHdhbnQgdG8gdXNlIGEga2V5Ym9hcmQgc2hvcnRjdXQgaW4gb3JkZXIgdG8gdG9nZ2xlIHRoZSBCZWR0aW1lIE1vZGUgdGhlbiB5b3UgY2FuIHVzZSB0aGlzIGNvbW1hbmQgZm9yIHRoZSBzaG9ydGN1dDpcblxuYmFzaCAtYyAnc2NoZW1hX2lkPW9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZTsgc2NoZW1hX2Rpcj1+Ly5sb2NhbC9zaGFyZS9nbm9tZS1zaGVsbC9leHRlbnNpb25zL2dub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20vc2NoZW1hcy87IGlmIFtbICQoZ3NldHRpbmdzIC0tc2NoZW1hZGlyICRzY2hlbWFfZGlyIGdldCAkc2NoZW1hX2lkIGJlZHRpbWUtbW9kZS1hY3RpdmUpID09IHRydWUgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW9udXRib3J0aXMvZ25vbWUtYmVkdGltZS1tb2RlIiwKICAidXVpZCI6ICJnbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}
   }}
 , {"uuid": "spotify-controller@koolskateguy89", "name": "Spotify Controller", "pname": "spotify-controller", "description": "Control Spotify from the topbar!\n\nCredit to Marcus Heine (https://github.com/mheine) for most of the code in this extension.", "link": "https://extensions.gnome.org/extension/4013/spotify-controller/", "shell_version_map": {
     "38": {"version": "17", "sha256": "0ddhsdbichrm9wqqkb2d5ylpr1597vgfpd3rh2liil660kz72n7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNwb3RpZnktY29udHJvbGxlciIsCiAgInV1aWQiOiAic3BvdGlmeS1jb250cm9sbGVyQGtvb2xza2F0ZWd1eTg5IiwKICAidmVyc2lvbiI6IDE3Cn0="},
@@ -3213,8 +3380,9 @@
     "42": {"version": "17", "sha256": "1c5lr1z8smm2hzfqjm0npn7rhihkdbgm6hlpbqg5mzvvsw3ikbpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "43": {"version": "17", "sha256": "1c5lr1z8smm2hzfqjm0npn7rhihkdbgm6hlpbqg5mzvvsw3ikbpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "44": {"version": "17", "sha256": "1c5lr1z8smm2hzfqjm0npn7rhihkdbgm6hlpbqg5mzvvsw3ikbpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
-    "45": {"version": "23", "sha256": "0hlcrbvmvn4khspdz1lmp8njqiqkd02wlw0scqfz8cxmj0qg2pl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "46": {"version": "23", "sha256": "0hlcrbvmvn4khspdz1lmp8njqiqkd02wlw0scqfz8cxmj0qg2pl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}
+    "45": {"version": "24", "sha256": "0lb5xmqm8f0dkcndkqlz4yw9wa2gwz1zwpdqyz9dqz4aafy3igxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "46": {"version": "24", "sha256": "0lb5xmqm8f0dkcndkqlz4yw9wa2gwz1zwpdqyz9dqz4aafy3igxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "47": {"version": "24", "sha256": "0lb5xmqm8f0dkcndkqlz4yw9wa2gwz1zwpdqyz9dqz4aafy3igxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}
   }}
 , {"uuid": "get-out-of-the-way@michaelmob.com", "name": "Get Out Of The Way!", "pname": "get-out-of-the-way", "description": "Push 'Always-on-Top' windows out of the way of the focused window.", "link": "https://extensions.gnome.org/extension/4034/get-out-of-the-way/", "shell_version_map": {
     "38": {"version": "1", "sha256": "1jpjqi2l6wjn9zbgpck04gm9vbspi066chby1j6k9km6dwljfbk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1c2ggJ0Fsd2F5cy1vbi1Ub3AnIHdpbmRvd3Mgb3V0IG9mIHRoZSB3YXkgb2YgdGhlIGZvY3VzZWQgd2luZG93LiIsCiAgIm5hbWUiOiAiR2V0IE91dCBPZiBUaGUgV2F5ISIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnZXQtb3V0LW9mLXRoZS13YXlAbWljaGFlbG1vYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}
@@ -3235,8 +3403,9 @@
     "42": {"version": "6", "sha256": "12rif8ssd726c4l77p2cidmjzwjjl30x5nh8r635kkzaj5ycjgwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"},
     "43": {"version": "6", "sha256": "12rif8ssd726c4l77p2cidmjzwjjl30x5nh8r635kkzaj5ycjgwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"},
     "44": {"version": "6", "sha256": "12rif8ssd726c4l77p2cidmjzwjjl30x5nh8r635kkzaj5ycjgwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "45": {"version": "8", "sha256": "0s90zixj9bbbjkrpk6bk1mxrl8qnz794b2nghk5qzg56hwv2ydgj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"},
-    "46": {"version": "8", "sha256": "0s90zixj9bbbjkrpk6bk1mxrl8qnz794b2nghk5qzg56hwv2ydgj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"}
+    "45": {"version": "10", "sha256": "0zaamzwf6ryvq8wbb5gn1adf4hvb5diw5yir2zfbcrakbzqirywx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcXQtbWF4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h0d29sYXlvdXRzLyIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "46": {"version": "10", "sha256": "0zaamzwf6ryvq8wbb5gn1adf4hvb5diw5yir2zfbcrakbzqirywx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcXQtbWF4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h0d29sYXlvdXRzLyIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "47": {"version": "10", "sha256": "0zaamzwf6ryvq8wbb5gn1adf4hvb5diw5yir2zfbcrakbzqirywx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcXQtbWF4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h0d29sYXlvdXRzLyIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
   }}
 , {"uuid": "notification-dismiss@kronosoul.xyz", "name": "Dismiss Notifications on Right Click", "pname": "dismiss-notifications-on-right-click", "description": "Simple extension that removes notification popups when they are right clicked.", "link": "https://extensions.gnome.org/extension/4048/dismiss-notifications-on-right-click/", "shell_version_map": {
     "38": {"version": "1", "sha256": "19pdz3lg1ybmgvpahfwzzhwk8fyhm1sr3wawddz5z66i22spcgjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwubm90aWZpY2F0aW9uLWRpc21pc3MiLAogICJkZXNjcmlwdGlvbiI6ICJTaW1wbGUgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyBub3RpZmljYXRpb24gcG9wdXBzIHdoZW4gdGhleSBhcmUgcmlnaHQgY2xpY2tlZC4iLAogICJleHRlbnNpb24taWQiOiAiZ2R0b29scyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJEaXNtaXNzIE5vdGlmaWNhdGlvbnMgb24gUmlnaHQgQ2xpY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4wIiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZGlzbWlzc0Brcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}
@@ -3248,8 +3417,9 @@
     "42": {"version": "5", "sha256": "0w4xsa52l9fgf7bihq9gvr4lxvhn28d7jcdr9wb54zx8sf8gbflc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZlcnlDcmF6eURvZy9nbm9tZS1kaXNhYmxlLWdlc3R1cmVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWdlc3R1cmVzLTIwMjFAdmVyeWNyYXp5ZG9nLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
     "43": {"version": "5", "sha256": "0w4xsa52l9fgf7bihq9gvr4lxvhn28d7jcdr9wb54zx8sf8gbflc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZlcnlDcmF6eURvZy9nbm9tZS1kaXNhYmxlLWdlc3R1cmVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWdlc3R1cmVzLTIwMjFAdmVyeWNyYXp5ZG9nLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
     "44": {"version": "5", "sha256": "0w4xsa52l9fgf7bihq9gvr4lxvhn28d7jcdr9wb54zx8sf8gbflc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZlcnlDcmF6eURvZy9nbm9tZS1kaXNhYmxlLWdlc3R1cmVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWdlc3R1cmVzLTIwMjFAdmVyeWNyYXp5ZG9nLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "45": {"version": "8", "sha256": "1zhvlzsqdr9gf6p6qgzriq746zxzh55gmr8ggvp2giibcal5l92z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2hzY3JlZW4gYXBwcy4iLAogICJuYW1lIjogIkRpc2FibGUgR2VzdHVyZXMgMjAyMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmVyeUNyYXp5RG9nL2dub21lLWRpc2FibGUtZ2VzdHVyZXMiLAogICJ1dWlkIjogImRpc2FibGUtZ2VzdHVyZXMtMjAyMUB2ZXJ5Y3Jhenlkb2cuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "1zhvlzsqdr9gf6p6qgzriq746zxzh55gmr8ggvp2giibcal5l92z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2hzY3JlZW4gYXBwcy4iLAogICJuYW1lIjogIkRpc2FibGUgR2VzdHVyZXMgMjAyMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmVyeUNyYXp5RG9nL2dub21lLWRpc2FibGUtZ2VzdHVyZXMiLAogICJ1dWlkIjogImRpc2FibGUtZ2VzdHVyZXMtMjAyMUB2ZXJ5Y3Jhenlkb2cuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "9", "sha256": "04a5z3jc9m90zv5y97f0vrr6hcamhbamj45ji35ja09mqwggjdsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2hzY3JlZW4gYXBwcy4iLAogICJuYW1lIjogIkRpc2FibGUgR2VzdHVyZXMgMjAyMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZlcnlDcmF6eURvZy9nbm9tZS1kaXNhYmxlLWdlc3R1cmVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWdlc3R1cmVzLTIwMjFAdmVyeWNyYXp5ZG9nLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "04a5z3jc9m90zv5y97f0vrr6hcamhbamj45ji35ja09mqwggjdsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2hzY3JlZW4gYXBwcy4iLAogICJuYW1lIjogIkRpc2FibGUgR2VzdHVyZXMgMjAyMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZlcnlDcmF6eURvZy9nbm9tZS1kaXNhYmxlLWdlc3R1cmVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWdlc3R1cmVzLTIwMjFAdmVyeWNyYXp5ZG9nLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "04a5z3jc9m90zv5y97f0vrr6hcamhbamj45ji35ja09mqwggjdsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2hzY3JlZW4gYXBwcy4iLAogICJuYW1lIjogIkRpc2FibGUgR2VzdHVyZXMgMjAyMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZlcnlDcmF6eURvZy9nbm9tZS1kaXNhYmxlLWdlc3R1cmVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWdlc3R1cmVzLTIwMjFAdmVyeWNyYXp5ZG9nLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "pi-hole@fnxweb.com", "name": "pi-hole", "pname": "pi-hole", "description": "Status and basic controls of local Pi-Hole", "link": "https://extensions.gnome.org/extension/4051/pi-hole/", "shell_version_map": {
     "38": {"version": "1", "sha256": "0m19lv8zfhh8vqn0ln4a8g4g4hw9p6h98gb656vb0hblp5gsycfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1waS1ob2xlIiwKICAidXVpZCI6ICJwaS1ob2xlQGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
@@ -3336,8 +3506,9 @@
     "42": {"version": "19", "sha256": "0zh3vmyag819qjl2f1gnsa3aaa67z2ga10l18r9phdrvg9fh2q28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "43": {"version": "19", "sha256": "0zh3vmyag819qjl2f1gnsa3aaa67z2ga10l18r9phdrvg9fh2q28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "44": {"version": "19", "sha256": "0zh3vmyag819qjl2f1gnsa3aaa67z2ga10l18r9phdrvg9fh2q28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
-    "45": {"version": "23", "sha256": "0zbamf5a18zcs3akc4xlplzid8kbps3dnklfr4a7xwqym4s0nq89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "46": {"version": "23", "sha256": "0zbamf5a18zcs3akc4xlplzid8kbps3dnklfr4a7xwqym4s0nq89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "45": {"version": "25", "sha256": "1cz9qc6fgsi2syadrlw66ay1a9wpk2cy3ssfwbriv4a4141m7g8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sc25vdy90cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkQGxzbm93LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "46": {"version": "25", "sha256": "1cz9qc6fgsi2syadrlw66ay1a9wpk2cy3ssfwbriv4a4141m7g8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sc25vdy90cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkQGxzbm93LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "1cz9qc6fgsi2syadrlw66ay1a9wpk2cy3ssfwbriv4a4141m7g8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sc25vdy90cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkQGxzbm93LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. Nothing more.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {
     "40": {"version": "13", "sha256": "18v54y1a4qrpq2gm65z0l13p02grjzcqa1xskn1bhwdy35pdal3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25vLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJuby1vdmVydmlld0BmdGh4IiwKICAidmVyc2lvbiI6IDEzCn0="},
@@ -3346,7 +3517,8 @@
     "43": {"version": "13", "sha256": "18v54y1a4qrpq2gm65z0l13p02grjzcqa1xskn1bhwdy35pdal3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25vLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJuby1vdmVydmlld0BmdGh4IiwKICAidmVyc2lvbiI6IDEzCn0="},
     "44": {"version": "13", "sha256": "18v54y1a4qrpq2gm65z0l13p02grjzcqa1xskn1bhwdy35pdal3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25vLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJuby1vdmVydmlld0BmdGh4IiwKICAidmVyc2lvbiI6IDEzCn0="},
     "45": {"version": "16", "sha256": "0h28acslq5p10cz54bcydxrqbbx6rcrhnjnb35mgfq62qj1sih51", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBOb3RoaW5nIG1vcmUuIiwKICAibmFtZSI6ICJObyBvdmVydmlldyBhdCBzdGFydC11cCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZnRoeCIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxNgp9"},
-    "46": {"version": "17", "sha256": "0dhhpqfn423y9xh4418pvz1sfbjaqa2izq867kabkpab6zaxplyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBOb3RoaW5nIG1vcmUuIiwKICAibmFtZSI6ICJObyBvdmVydmlldyBhdCBzdGFydC11cCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZnRoeCIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxNwp9"}
+    "46": {"version": "17", "sha256": "0dhhpqfn423y9xh4418pvz1sfbjaqa2izq867kabkpab6zaxplyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBOb3RoaW5nIG1vcmUuIiwKICAibmFtZSI6ICJObyBvdmVydmlldyBhdCBzdGFydC11cCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZnRoeCIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "47": {"version": "18", "sha256": "0nhxp0i7agsjm6rvrapid5swcxccqdzffry1wa96z9blbj4rzskx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBOb3RoaW5nIG1vcmUuIiwKICAibmFtZSI6ICJObyBvdmVydmlldyBhdCBzdGFydC11cCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZnRoeCIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxOAp9"}
   }}
 , {"uuid": "notification-position@drugo.dev", "name": "Notification Banner Position", "pname": "notification-banner-position", "description": "Changes position of the notification banner from the default to the right side of the screen.", "link": "https://extensions.gnome.org/extension/4105/notification-banner-position/", "shell_version_map": {
     "38": {"version": "10", "sha256": "1z2pk42hr8p1n4949rw4avf319df4215c22rr7nqrm0cf0sa3iwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"},
@@ -3355,8 +3527,9 @@
     "42": {"version": "10", "sha256": "1z2pk42hr8p1n4949rw4avf319df4215c22rr7nqrm0cf0sa3iwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"},
     "43": {"version": "10", "sha256": "1z2pk42hr8p1n4949rw4avf319df4215c22rr7nqrm0cf0sa3iwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"},
     "44": {"version": "10", "sha256": "1z2pk42hr8p1n4949rw4avf319df4215c22rr7nqrm0cf0sa3iwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "45": {"version": "14", "sha256": "00kp68a5n8z92wxlsf08k69wxh3bjhd6xpivn5k4zwsinv3lmqxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "00kp68a5n8z92wxlsf08k69wxh3bjhd6xpivn5k4zwsinv3lmqxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "45": {"version": "15", "sha256": "0sjky430j1b6ji2gspk3sg64b74038fjmh7v28djdvxppz3iln0w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "0sjky430j1b6ji2gspk3sg64b74038fjmh7v28djdvxppz3iln0w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "0sjky430j1b6ji2gspk3sg64b74038fjmh7v28djdvxppz3iln0w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "volume_scroller@trflynn89.pm.me", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4109/volume-scroller/", "shell_version_map": {
     "38": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"},
@@ -3377,7 +3550,8 @@
     "43": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"},
     "44": {"version": "86", "sha256": "0cbgfqjwn6q9ppy19bx5qiiz9mhpj0yxgsmb3ckxrlsd71s916w6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4Ngp9"},
     "45": {"version": "88", "sha256": "1z0m08lwgl6cibzawv6b4xlw2ll16jd90wlp5kmbhw17yfn4c64y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJIb2xsb3dNYW42IgogIH0sCiAgImV4dGVuc2lvbi1pZCI6ICJjdXN0b21pemUtaWJ1cyIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbWl6ZS1pYnVzIiwKICAibmFtZSI6ICJDdXN0b21pemUgSUJ1cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaG9sbG93bWFuQG9wZW5zdXNlLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9taXplLWlidXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4OAp9"},
-    "46": {"version": "89", "sha256": "1dd26s2rgsn51gh75x2wp348s7mmfijvnyg6pli4sky9mfp22i6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJIb2xsb3dNYW42IgogIH0sCiAgImV4dGVuc2lvbi1pZCI6ICJjdXN0b21pemUtaWJ1cyIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbWl6ZS1pYnVzIiwKICAibmFtZSI6ICJDdXN0b21pemUgSUJ1cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaG9sbG93bWFuQG9wZW5zdXNlLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9taXplLWlidXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4OQp9"}
+    "46": {"version": "90", "sha256": "1wc2qz3iaslls0bc4dz2km9arf9d0k6zr159piy7baqggrsg92im", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJIb2xsb3dNYW42IgogIH0sCiAgImV4dGVuc2lvbi1pZCI6ICJjdXN0b21pemUtaWJ1cyIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbWl6ZS1pYnVzIiwKICAibmFtZSI6ICJDdXN0b21pemUgSUJ1cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaG9sbG93bWFuQG9wZW5zdXNlLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9taXplLWlidXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogOTAKfQ=="},
+    "47": {"version": "90", "sha256": "1wc2qz3iaslls0bc4dz2km9arf9d0k6zr159piy7baqggrsg92im", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJIb2xsb3dNYW42IgogIH0sCiAgImV4dGVuc2lvbi1pZCI6ICJjdXN0b21pemUtaWJ1cyIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbWl6ZS1pYnVzIiwKICAibmFtZSI6ICJDdXN0b21pemUgSUJ1cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaG9sbG93bWFuQG9wZW5zdXNlLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9taXplLWlidXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogOTAKfQ=="}
   }}
 , {"uuid": "fildemGMenu@gonza.com", "name": "Fildem global menu", "pname": "fildem-global-menu", "description": "Global menu for Gnome", "link": "https://extensions.gnome.org/extension/4114/fildem-global-menu/", "shell_version_map": {
     "38": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -3405,7 +3579,8 @@
     "43": {"version": "6", "sha256": "18vb4h3g6qmxqhg9m5r895lbxmxmgif7irxzzrsnw2m7g2ls7hli", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA2Cn0="},
     "44": {"version": "7", "sha256": "1qcllppvvyh09i20ml80v3gplgwqlhg5p6jc0r1cfcd9y91ylzh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA3Cn0="},
     "45": {"version": "8", "sha256": "05ql0533q0h0j9rid34xd5miq7w3m5gxrvz84qjr9101marf3nkm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "9", "sha256": "19211yv01a2iqlamh8kk9klg0xaaa6xj0z6gl5ijjpxr8gbsqx2z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA5Cn0="}
+    "46": {"version": "9", "sha256": "19211yv01a2iqlamh8kk9klg0xaaa6xj0z6gl5ijjpxr8gbsqx2z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "10", "sha256": "10066h02csglyy4xz974fvcd5a46z6l06siq8bqnl4rlizpkcn3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGlucGwvZGlzYWJsZS1tZW51LXN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAxMAp9"}
   }}
 , {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Espresso disables the usual auto suspend and screensaver functionality and optionally Night Light with options to show an Espresso icon in the top panel, to enable Espresso when a fullscreen application is running, to restore state across reboots, to provide notifications, to enable Espresso when specific applications are running, or to pause Night Light when Espresso is enabled or only when specific applications are running. Espresso also provides some support for docking stations including options to enable Espresso when charging and/or when docked to external monitors and to allow temporarily overriding the docking support without affecting the stored state.\n\nEspresso is a fork of the Caffeine extension.\n\nPlease leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {
     "40": {"version": "8", "sha256": "1c21nzky2sfrq8wkz26rn2gcyr81y1zb3r14pflwhl56f9bgbh0c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVzcHJlc3NvIGRpc2FibGVzIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgd2l0aCBvcHRpb25zIHRvIHNob3cgYW4gRXNwcmVzc28gaWNvbiBpbiB0aGUgdG9wIHBhbmVsLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaXMgcnVubmluZywgdG8gcmVzdG9yZSBzdGF0ZSBhY3Jvc3MgcmVib290cywgdG8gcHJvdmlkZSBub3RpZmljYXRpb25zLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBzcGVjaWZpYyBhcHBsaWNhdGlvbnMgYXJlIHJ1bm5pbmcsIG9yIHRvIHBhdXNlIE5pZ2h0IExpZ2h0IHdoZW4gRXNwcmVzc28gaXMgZW5hYmxlZCBvciBvbmx5IHdoZW4gc3BlY2lmaWMgYXBwbGljYXRpb25zIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHByb3ZpZGVzIHNvbWUgc3VwcG9ydCBmb3IgZG9ja2luZyBzdGF0aW9ucyBpbmNsdWRpbmcgb3B0aW9ucyB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBjaGFyZ2luZyBhbmQvb3Igd2hlbiBkb2NrZWQgdG8gZXh0ZXJuYWwgbW9uaXRvcnMgYW5kIHRvIGFsbG93IHRlbXBvcmFyaWx5IG92ZXJyaWRpbmcgdGhlIGRvY2tpbmcgc3VwcG9ydCB3aXRob3V0IGFmZmVjdGluZyB0aGUgc3RvcmVkIHN0YXRlLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29hZG11bmtlZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZXNwcmVzc28iLAogICJ1dWlkIjogImVzcHJlc3NvQGNvYWRtdW5rZWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -3459,8 +3634,9 @@
     "42": {"version": "19", "sha256": "0yqrjmhh1zdmg0a64ri6fw7zxx6556qiv5k2gj4i8bqrmqsc7ij6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQ0IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxOQp9"},
     "43": {"version": "19", "sha256": "0yqrjmhh1zdmg0a64ri6fw7zxx6556qiv5k2gj4i8bqrmqsc7ij6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQ0IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxOQp9"},
     "44": {"version": "19", "sha256": "0yqrjmhh1zdmg0a64ri6fw7zxx6556qiv5k2gj4i8bqrmqsc7ij6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQ0IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "45": {"version": "21", "sha256": "05dk4jh3kagq08jmgqmkmn300mrbnw426z259pgj74r51iivfnf7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDR4IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDIxCn0="},
-    "46": {"version": "21", "sha256": "05dk4jh3kagq08jmgqmkmn300mrbnw426z259pgj74r51iivfnf7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDR4IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDIxCn0="}
+    "45": {"version": "23", "sha256": "0lh6lhgh303c2pb3ss496k1likj09224y935ck1k0yzxpwdq1jnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDR4IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "46": {"version": "23", "sha256": "0lh6lhgh303c2pb3ss496k1likj09224y935ck1k0yzxpwdq1jnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDR4IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "47": {"version": "23", "sha256": "0lh6lhgh303c2pb3ss496k1likj09224y935ck1k0yzxpwdq1jnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDR4IE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnhcbi0gUmVzdG9yZXMgd2FsbHBhcGVyIG9uIHdvcmtzcGFjZXMnIHRodW1ibmFpbHMuIE5vIG1vcmUgZ3JheSBiYWNrZ3JvdW5kXG4tIFNob3cgd29ya3NwYWNlcycgdGh1bWJuYWlscyBldmVuIHdoZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlXG4tIEZpcmVmb3gncyBQSVAgKHBpY3R1cmUgaW4gcGljdHVyZSkgd2luZG93IGlzIG5vdyBkaXNwbGF5ZWQgb24gdGhlIG92ZXJ2aWV3IHNjcmVlblxuXG5BbGwgbW9kaWZpY2F0aW9ucyBjYW4gYmUgZGlzYWJsZWQgaW4gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLlxuXG5BVFRFTlRJT04hXG5BZnRlciBleHRlbnNpb24gdXBkYXRlLCBnbm9tZS1zaGVsbCByZXN0YXJ0IGlzIHJlcXVpcmVkOlxuWDExOiBBbHQrRjIgPT4gclxuV2F5bGFuZDogbG9nb3V0ID0+IGxvZ2luIiwKICAibmFtZSI6ICJHbm9tZSA0eCBVSSBJbXByb3ZlbWVudHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ25vbWUtdWktdHVuZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAyMwp9"}
   }}
 , {"uuid": "monitor-window-switcher@thefungusrocket.com", "name": "Monitor window switcher", "pname": "monitor-window-switcher", "description": "Improves the window switcher on dual (or more) monitor setups", "link": "https://extensions.gnome.org/extension/4164/monitor-window-switcher/", "shell_version_map": {
     "38": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -3474,8 +3650,9 @@
     "42": {"version": "37", "sha256": "0jsnvrics52wq50y4bslix8kbpiwbkj56mjqh6mvqxfpk2a4mx94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMiIKfQ=="},
     "43": {"version": "37", "sha256": "0jsnvrics52wq50y4bslix8kbpiwbkj56mjqh6mvqxfpk2a4mx94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMiIKfQ=="},
     "44": {"version": "37", "sha256": "0jsnvrics52wq50y4bslix8kbpiwbkj56mjqh6mvqxfpk2a4mx94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMiIKfQ=="},
-    "45": {"version": "38", "sha256": "0vrm5h0jjjw7axb73rhgklsv9fkqv7gxhk6jgxnmi4h1zznw4drj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgsCiAgInZlcnNpb24tbmFtZSI6ICI0NS4yIgp9"},
-    "46": {"version": "40", "sha256": "19f0nqjh3f3863x1sfva62f6q0rgwq9f3d17bacdn7i3583n98qx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDAsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4wIgp9"}
+    "45": {"version": "42", "sha256": "1babhljm4503vfy9wwi8rgz6ynkv8fhvq0rjb63ywprs28ji88pb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycyIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0MiwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "46": {"version": "42", "sha256": "1babhljm4503vfy9wwi8rgz6ynkv8fhvq0rjb63ywprs28ji88pb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycyIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0MiwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "47": {"version": "42", "sha256": "1babhljm4503vfy9wwi8rgz6ynkv8fhvq0rjb63ywprs28ji88pb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycyIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0MiwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="}
   }}
 , {"uuid": "hass-gshell@geoph9-on-github", "name": "Home Assistant Extension", "pname": "home-assistant-extension", "description": "A simple gnome shell extension for Home Assistant. Check the README on github for additional help!\n\nMain points:\n- You need to provide the url of your hass, a long live access token obtained from your profile page (on your hass web instance) and the entity ids of the entities you want to have as togglable.\n- In order to add some local temperature/humidity sensor, you may also provide a temperature and/or a humidity entity id (which should match the corresponding ids of your hass instance).", "link": "https://extensions.gnome.org/extension/4170/home-assistant-extension/", "shell_version_map": {
     "38": {"version": "3", "sha256": "04p2hvxyyc1zv441sv0l1dcxbdvzqp46mii3zvw0nhq8jg5pz8rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -3535,26 +3712,28 @@
     "38": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
     "40": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
-, {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {
-    "40": {"version": "31", "sha256": "1c7753fyqqh8x3hnfahpqjwiqil8kirxcfkmm7z39pl7iairs0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "41": {"version": "31", "sha256": "1c7753fyqqh8x3hnfahpqjwiqil8kirxcfkmm7z39pl7iairs0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "42": {"version": "31", "sha256": "1c7753fyqqh8x3hnfahpqjwiqil8kirxcfkmm7z39pl7iairs0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "43": {"version": "31", "sha256": "1c7753fyqqh8x3hnfahpqjwiqil8kirxcfkmm7z39pl7iairs0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "44": {"version": "31", "sha256": "1c7753fyqqh8x3hnfahpqjwiqil8kirxcfkmm7z39pl7iairs0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "45": {"version": "30", "sha256": "0bzj3b6v25s20wizyfgginzb4r8spj8hq6x5kp34paqq10ncjys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMwCn0="},
-    "46": {"version": "30", "sha256": "0bzj3b6v25s20wizyfgginzb4r8spj8hq6x5kp34paqq10ncjys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMwCn0="}
+, {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {
+    "40": {"version": "33", "sha256": "094gli4mpid3xg1pq89s1g8d6xfc1wsr520611z4v057wcrlyfd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "41": {"version": "33", "sha256": "094gli4mpid3xg1pq89s1g8d6xfc1wsr520611z4v057wcrlyfd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "42": {"version": "33", "sha256": "094gli4mpid3xg1pq89s1g8d6xfc1wsr520611z4v057wcrlyfd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "43": {"version": "33", "sha256": "094gli4mpid3xg1pq89s1g8d6xfc1wsr520611z4v057wcrlyfd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "44": {"version": "33", "sha256": "094gli4mpid3xg1pq89s1g8d6xfc1wsr520611z4v057wcrlyfd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "45": {"version": "34", "sha256": "0cbixblm43z40grwdgbzjg0sds0ix89vby26k2z68mqn9rgsgqzh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAzNAp9"},
+    "46": {"version": "34", "sha256": "0cbixblm43z40grwdgbzjg0sds0ix89vby26k2z68mqn9rgsgqzh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAzNAp9"},
+    "47": {"version": "34", "sha256": "0cbixblm43z40grwdgbzjg0sds0ix89vby26k2z68mqn9rgsgqzh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAzNAp9"}
   }}
 , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": {
     "40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
-, {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This provides a better mouse-driven workflow and can serve as an alternative to a dock.", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {
+, {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This provides a better mouse-based workflow and can be an alternative to a dock.", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {
     "40": {"version": "17", "sha256": "1k1yr4i438afqrm9m94a7y6qnxf38jcbjiq2m15v82ynrcknlzwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UiLAogICJ1dWlkIjogImhvdGVkZ2VAam9uYXRoYW4uamRvZGEuY2EiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "41": {"version": "17", "sha256": "1k1yr4i438afqrm9m94a7y6qnxf38jcbjiq2m15v82ynrcknlzwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UiLAogICJ1dWlkIjogImhvdGVkZ2VAam9uYXRoYW4uamRvZGEuY2EiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "42": {"version": "17", "sha256": "1k1yr4i438afqrm9m94a7y6qnxf38jcbjiq2m15v82ynrcknlzwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UiLAogICJ1dWlkIjogImhvdGVkZ2VAam9uYXRoYW4uamRvZGEuY2EiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "43": {"version": "17", "sha256": "1k1yr4i438afqrm9m94a7y6qnxf38jcbjiq2m15v82ynrcknlzwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UiLAogICJ1dWlkIjogImhvdGVkZ2VAam9uYXRoYW4uamRvZGEuY2EiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "44": {"version": "17", "sha256": "1k1yr4i438afqrm9m94a7y6qnxf38jcbjiq2m15v82ynrcknlzwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UiLAogICJ1dWlkIjogImhvdGVkZ2VAam9uYXRoYW4uamRvZGEuY2EiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
-    "45": {"version": "24", "sha256": "00pih39sjkk0qhp32znsh2nmm2samvpic4bz9ljdqnvnjsl1hvap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3RlZGdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDI0Cn0="},
-    "46": {"version": "24", "sha256": "00pih39sjkk0qhp32znsh2nmm2samvpic4bz9ljdqnvnjsl1hvap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3RlZGdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDI0Cn0="}
+    "45": {"version": "25", "sha256": "15p2nr75ds3bir2451jxy8cw14rli076x6j8bch4jqvbvxdg022i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgcHJvdmlkZXMgYSBiZXR0ZXIgbW91c2UtYmFzZWQgd29ya2Zsb3cgYW5kIGNhbiBiZSBhbiBhbHRlcm5hdGl2ZSB0byBhIGRvY2suIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3RlZGdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "46": {"version": "25", "sha256": "15p2nr75ds3bir2451jxy8cw14rli076x6j8bch4jqvbvxdg022i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgcHJvdmlkZXMgYSBiZXR0ZXIgbW91c2UtYmFzZWQgd29ya2Zsb3cgYW5kIGNhbiBiZSBhbiBhbHRlcm5hdGl2ZSB0byBhIGRvY2suIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3RlZGdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "15p2nr75ds3bir2451jxy8cw14rli076x6j8bch4jqvbvxdg022i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgcHJvdmlkZXMgYSBiZXR0ZXIgbW91c2UtYmFzZWQgd29ya2Zsb3cgYW5kIGNhbiBiZSBhbiBhbHRlcm5hdGl2ZSB0byBhIGRvY2suIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3RlZGdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "gnome-citeurl-search-provider@raindrum.github.io", "name": "Legal Citation Search", "pname": "gnome-citeurl-search-provider", "description": "This extension lets you look up U.S. state and federal laws and court cases by typing citations (like \"42 USC 1983\" or \"U.S. Constitution Art. I, Sec. 3\") into the search bar.\nBy default, the search supports the U.S. Code and federal constitution, as well as nearly all codified state laws and constitutions, among other sources of law. You can also add more types of citation by following the instructions on the GitHub page.", "link": "https://extensions.gnome.org/extension/4225/gnome-citeurl-search-provider/", "shell_version_map": {
     "38": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -3567,8 +3746,9 @@
     "42": {"version": "14", "sha256": "0i6qcfiv2q80161mm0fyb8xmfsc6pcjwsy1jagnxbzihqr6xpd2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vd2lyZWxlc3MtaGlkIiwKICAidXVpZCI6ICJ3aXJlbGVzcy1oaWRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "43": {"version": "14", "sha256": "0i6qcfiv2q80161mm0fyb8xmfsc6pcjwsy1jagnxbzihqr6xpd2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vd2lyZWxlc3MtaGlkIiwKICAidXVpZCI6ICJ3aXJlbGVzcy1oaWRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "44": {"version": "14", "sha256": "0i6qcfiv2q80161mm0fyb8xmfsc6pcjwsy1jagnxbzihqr6xpd2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vd2lyZWxlc3MtaGlkIiwKICAidXVpZCI6ICJ3aXJlbGVzcy1oaWRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
-    "45": {"version": "18", "sha256": "0278gcrky0id0vp5rv86k1gk03q5wkqx7i0xvlx1zzybph26yavy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vd2lyZWxlc3MtaGlkIiwKICAidXVpZCI6ICJ3aXJlbGVzcy1oaWRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
-    "46": {"version": "18", "sha256": "0278gcrky0id0vp5rv86k1gk03q5wkqx7i0xvlx1zzybph26yavy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vd2lyZWxlc3MtaGlkIiwKICAidXVpZCI6ICJ3aXJlbGVzcy1oaWRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="}
+    "45": {"version": "20", "sha256": "1al18q834f4g3rkgl6j5s4gv885zxkfp5zgnc23sr6z8br5aqbc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "46": {"version": "20", "sha256": "1al18q834f4g3rkgl6j5s4gv885zxkfp5zgnc23sr6z8br5aqbc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "47": {"version": "20", "sha256": "1al18q834f4g3rkgl6j5s4gv885zxkfp5zgnc23sr6z8br5aqbc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}
   }}
 , {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {
     "40": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -3633,8 +3813,9 @@
     "42": {"version": "32", "sha256": "1dvpl7va3gcv323i7l12jidbfmy93in1d1vr5aj6568m0gh7lxk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInN0dWFydGhheWh1cnN0IiwKICAgICJwYXlwYWwiOiAic3R1YXJ0YWhheWh1cnN0IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIkFscGhhYmV0aWNhbCBBcHAgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHBoYWJldGljYWwtYXBwLWdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAzMgp9"},
     "43": {"version": "32", "sha256": "1dvpl7va3gcv323i7l12jidbfmy93in1d1vr5aj6568m0gh7lxk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInN0dWFydGhheWh1cnN0IiwKICAgICJwYXlwYWwiOiAic3R1YXJ0YWhheWh1cnN0IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIkFscGhhYmV0aWNhbCBBcHAgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHBoYWJldGljYWwtYXBwLWdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAzMgp9"},
     "44": {"version": "32", "sha256": "1dvpl7va3gcv323i7l12jidbfmy93in1d1vr5aj6568m0gh7lxk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInN0dWFydGhheWh1cnN0IiwKICAgICJwYXlwYWwiOiAic3R1YXJ0YWhheWh1cnN0IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIkFscGhhYmV0aWNhbCBBcHAgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHBoYWJldGljYWwtYXBwLWdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAzMgp9"},
-    "45": {"version": "40", "sha256": "1kmjs7l4bwvj7qcq56dhxdcyciwjv41jvyfij9jpx8vcgv6lammj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFscGhhYmV0aWNhbGx5IG9yZGVyIHRoZSBhcHAgZ3JpZCBhbmQgZm9sZGVycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiQWxwaGFiZXRpY2FsIEFwcCBHcmlkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFscGhhYmV0aWNhbC1hcHAtZ3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDQwCn0="},
-    "46": {"version": "40", "sha256": "1kmjs7l4bwvj7qcq56dhxdcyciwjv41jvyfij9jpx8vcgv6lammj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFscGhhYmV0aWNhbGx5IG9yZGVyIHRoZSBhcHAgZ3JpZCBhbmQgZm9sZGVycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiQWxwaGFiZXRpY2FsIEFwcCBHcmlkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFscGhhYmV0aWNhbC1hcHAtZ3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDQwCn0="}
+    "45": {"version": "41", "sha256": "0y34lk2syidmy71s6crwyhq6igk9liq87din9fkqgpi1hs72n9lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFscGhhYmV0aWNhbGx5IG9yZGVyIHRoZSBhcHAgZ3JpZCBhbmQgZm9sZGVycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiQWxwaGFiZXRpY2FsIEFwcCBHcmlkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFscGhhYmV0aWNhbC1hcHAtZ3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0MQp9"},
+    "46": {"version": "41", "sha256": "0y34lk2syidmy71s6crwyhq6igk9liq87din9fkqgpi1hs72n9lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFscGhhYmV0aWNhbGx5IG9yZGVyIHRoZSBhcHAgZ3JpZCBhbmQgZm9sZGVycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiQWxwaGFiZXRpY2FsIEFwcCBHcmlkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFscGhhYmV0aWNhbC1hcHAtZ3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0MQp9"},
+    "47": {"version": "41", "sha256": "0y34lk2syidmy71s6crwyhq6igk9liq87din9fkqgpi1hs72n9lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFscGhhYmV0aWNhbGx5IG9yZGVyIHRoZSBhcHAgZ3JpZCBhbmQgZm9sZGVycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiQWxwaGFiZXRpY2FsIEFwcCBHcmlkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFscGhhYmV0aWNhbC1hcHAtZ3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0MQp9"}
   }}
 , {"uuid": "tofumenu@tofu", "name": "Tofu Menu", "pname": "tofu-menu", "description": "Quick access menu for the GNOME panel with options that help ease the workflow for newcomers and power users alike.\n\nhttps://github.com/tofutech/tofumenu", "link": "https://extensions.gnome.org/extension/4272/tofu-menu/", "shell_version_map": {
     "40": {"version": "2", "sha256": "05ndbjvvz0v1y8iq6ngqylz4z1ld6q5ibhkr5dh24wqc4wiky30v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyBtZW51IGZvciB0aGUgR05PTUUgcGFuZWwgd2l0aCBvcHRpb25zIHRoYXQgaGVscCBlYXNlIHRoZSB3b3JrZmxvdyBmb3IgbmV3Y29tZXJzIGFuZCBwb3dlciB1c2VycyBhbGlrZS5cblxuaHR0cHM6Ly9naXRodWIuY29tL3RvZnV0ZWNoL3RvZnVtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmVkb3JhLW1lbnUiLAogICJuYW1lIjogIlRvZnUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcudG9mdS5mZWRvcmEtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9mdW1lbnVAdG9mdSIsCiAgInZlcnNpb24iOiAyCn0="}
@@ -3655,7 +3836,9 @@
     "42": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"},
     "43": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"},
-    "45": {"version": "8", "sha256": "01clb2n3mabilkhflxjfb32qdgf0gcqfg2121yxgmfw5xrngxasx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1hbGFudG9ueS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5zdGFudC13b3Jrc3BhY2Utc3dpdGNoZXIiLAogICJ1dWlkIjogImluc3RhbnR3b3Jrc3BhY2Vzd2l0Y2hlckBhbWFsYW50b255Lm5ldCIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "45": {"version": "9", "sha256": "04ir53nl1z0ydgfq9kjapqprabv66jjhfbfcjcb2cspzn9gm602a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "46": {"version": "9", "sha256": "04ir53nl1z0ydgfq9kjapqprabv66jjhfbfcjcb2cspzn9gm602a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "47": {"version": "9", "sha256": "04ir53nl1z0ydgfq9kjapqprabv66jjhfbfcjcb2cspzn9gm602a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="}
   }}
 , {"uuid": "top-panel-notification-icons@5th0.github.com", "name": "Top Panel Notification Icons", "pname": "top-panel-notification-icons", "description": "Display notification icons in the Top", "link": "https://extensions.gnome.org/extension/4293/top-panel-notification-icons/", "shell_version_map": {
     "38": {"version": "1", "sha256": "0s84r45nc1kyv6sc6a9jbxv981f1ih8g2nfdzrzd33n3032f30px", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbm90aWZpY2F0aW9uIGljb25zIGluIHRoZSBUb3AiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcC1wYW5lbC1ub3RpZmljYXRpb24taWNvbnNANXRoMC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="},
@@ -3730,8 +3913,9 @@
     "42": {"version": "9", "sha256": "187rhyb4nd881v2silq6jbl7q2yjimjpx2qaajsgfrfzwd0jxy1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWxsb3dsb2NrZWRyZW1vdGVkZXNrdG9wQGthbWVucy51cyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "187rhyb4nd881v2silq6jbl7q2yjimjpx2qaajsgfrfzwd0jxy1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWxsb3dsb2NrZWRyZW1vdGVkZXNrdG9wQGthbWVucy51cyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "9", "sha256": "187rhyb4nd881v2silq6jbl7q2yjimjpx2qaajsgfrfzwd0jxy1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWxsb3dsb2NrZWRyZW1vdGVkZXNrdG9wQGthbWVucy51cyIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "45": {"version": "12", "sha256": "06wwc4jlmbl5k1ygj9n1767753sa9x2msrzjfcygshgxnv97d4lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "46": {"version": "12", "sha256": "06wwc4jlmbl5k1ygj9n1767753sa9x2msrzjfcygshgxnv97d4lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDEyCn0="}
+    "45": {"version": "14", "sha256": "1cgn9bylpq3jmb0gc8cmkfyv8lnqkpcap9frh1zahfbfigfybs9r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qaWthbWVucy9hbGxvdy1sb2NrZWQtcmVtb3RlLWRlc2t0b3AvIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDE0Cn0="},
+    "46": {"version": "14", "sha256": "1cgn9bylpq3jmb0gc8cmkfyv8lnqkpcap9frh1zahfbfigfybs9r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qaWthbWVucy9hbGxvdy1sb2NrZWQtcmVtb3RlLWRlc2t0b3AvIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDE0Cn0="},
+    "47": {"version": "14", "sha256": "1cgn9bylpq3jmb0gc8cmkfyv8lnqkpcap9frh1zahfbfigfybs9r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qaWthbWVucy9hbGxvdy1sb2NrZWQtcmVtb3RlLWRlc2t0b3AvIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDE0Cn0="}
   }}
 , {"uuid": "mumble-ping@maweil.github.com", "name": "MumblePing", "pname": "mumbleping", "description": "Displays how many users are currently online on a mumble server", "link": "https://extensions.gnome.org/extension/4341/mumbleping/", "shell_version_map": {
     "38": {"version": "5", "sha256": "0hp3c7sq1kaxagiw88gm4rsqvi9mw83r3584sh8i7chrchjzdxxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdlaWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW11bWJsZS1waW5nIiwKICAidXVpZCI6ICJtdW1ibGUtcGluZ0BtYXdlaWwuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
@@ -3765,7 +3949,9 @@
     "42": {"version": "9", "sha256": "07aiddvk4pvi2rd58g189n0yj8q1kc19zz27r5l5387ih1fj8rq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVsaWFuc2NoYWNoZXIvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogOQp9"},
     "43": {"version": "9", "sha256": "07aiddvk4pvi2rd58g189n0yj8q1kc19zz27r5l5387ih1fj8rq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVsaWFuc2NoYWNoZXIvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "9", "sha256": "07aiddvk4pvi2rd58g189n0yj8q1kc19zz27r5l5387ih1fj8rq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVsaWFuc2NoYWNoZXIvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogOQp9"},
-    "45": {"version": "10", "sha256": "0gj6m5gjng5z163fg6vjnvk8n8imlg2bcsq667lxjg380ggqkw1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bGlhbnNjaGFjaGVyL3RvcC1iYXItb3JnYW5pemVyIiwKICAidXVpZCI6ICJ0b3AtYmFyLW9yZ2FuaXplckBqdWxpYW4uZ3NlLmpzdHMueHl6IiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "12", "sha256": "19q099hnaj70zzi9iy3yz56spn61z1wjnljspmgkqx5cjxh81f3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVuZS90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "46": {"version": "12", "sha256": "19q099hnaj70zzi9iy3yz56spn61z1wjnljspmgkqx5cjxh81f3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVuZS90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "47": {"version": "12", "sha256": "19q099hnaj70zzi9iy3yz56spn61z1wjnljspmgkqx5cjxh81f3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVuZS90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
 , {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {
     "38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -3774,8 +3960,9 @@
     "42": {"version": "9", "sha256": "04xzhd69585vyif73pkn8aw4xw2kzj5w5fwj2r6lczi81i6vxaky", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
     "43": {"version": "9", "sha256": "04xzhd69585vyif73pkn8aw4xw2kzj5w5fwj2r6lczi81i6vxaky", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "9", "sha256": "04xzhd69585vyif73pkn8aw4xw2kzj5w5fwj2r6lczi81i6vxaky", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
-    "45": {"version": "12", "sha256": "1iq3wjmaczwl1l0px7i6cflhxdq8601ia02xcj8h78l28f020yis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "46": {"version": "12", "sha256": "1iq3wjmaczwl1l0px7i6cflhxdq8601ia02xcj8h78l28f020yis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
+    "45": {"version": "13", "sha256": "13l1xgib71nv79q0yfdymij0nrcnbxj8a4zmz7381adbiwhmgmpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "13", "sha256": "13l1xgib71nv79q0yfdymij0nrcnbxj8a4zmz7381adbiwhmgmpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "13l1xgib71nv79q0yfdymij0nrcnbxj8a4zmz7381adbiwhmgmpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "shell-isw@zamraky.cz", "name": "MSI Fan Control", "pname": "msi-fan-control", "description": "Use isw to change MSI laptop fan settings", "link": "https://extensions.gnome.org/extension/4363/msi-fan-control/", "shell_version_map": {
     "38": {"version": "1", "sha256": "0pl9dxwkw47r4c0f5sxjhh8bxl82r0sjlwsji7pwypkb6m0hh342", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBpc3cgdG8gY2hhbmdlIE1TSSBsYXB0b3AgZmFuIHNldHRpbmdzIiwKICAibmFtZSI6ICJNU0kgRmFuIENvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hlbGwtaXN3QHphbXJha3kuY3oiLAogICJ2ZXJzaW9uIjogMQp9"}
@@ -3784,12 +3971,14 @@
     "40": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
     "42": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
-, {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites/activate window\n- right click to close\n- middle click to rename\n- drag-and-drop to re-arrange\n- Alt-Tab to cycle\n- adjust panel width, transparency and icon size in extension settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {
+, {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites / activate window / activate previous window\n- right click to close window\n- middle click to rename window / open extension settings\n- drag-and-drop to re-arrange windows\n- mouse wheel to cycle windows\n\nUseful for large displays. Adjustable panel width, transparency and other settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {
     "40": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "41": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "42": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "43": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "45": {"version": "11", "sha256": "0l0h9qs8fas7vw6v3hlyxs0awrqp50d7as5vjhc3p87a031vsakz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}
+    "45": {"version": "14", "sha256": "1njzg5avnq7287mbckplqynq1m374g1a38sbbfj8bv7wz6rlykpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcyAvIGFjdGl2YXRlIHdpbmRvdyAvIGFjdGl2YXRlIHByZXZpb3VzIHdpbmRvd1xuLSByaWdodCBjbGljayB0byBjbG9zZSB3aW5kb3dcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZSB3aW5kb3cgLyBvcGVuIGV4dGVuc2lvbiBzZXR0aW5nc1xuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Ugd2luZG93c1xuLSBtb3VzZSB3aGVlbCB0byBjeWNsZSB3aW5kb3dzXG5cblVzZWZ1bCBmb3IgbGFyZ2UgZGlzcGxheXMuIEFkanVzdGFibGUgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgb3RoZXIgc2V0dGluZ3MiLAogICJuYW1lIjogIlZlcnRpY2FsIFdpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
+    "46": {"version": "14", "sha256": "1njzg5avnq7287mbckplqynq1m374g1a38sbbfj8bv7wz6rlykpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcyAvIGFjdGl2YXRlIHdpbmRvdyAvIGFjdGl2YXRlIHByZXZpb3VzIHdpbmRvd1xuLSByaWdodCBjbGljayB0byBjbG9zZSB3aW5kb3dcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZSB3aW5kb3cgLyBvcGVuIGV4dGVuc2lvbiBzZXR0aW5nc1xuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Ugd2luZG93c1xuLSBtb3VzZSB3aGVlbCB0byBjeWNsZSB3aW5kb3dzXG5cblVzZWZ1bCBmb3IgbGFyZ2UgZGlzcGxheXMuIEFkanVzdGFibGUgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgb3RoZXIgc2V0dGluZ3MiLAogICJuYW1lIjogIlZlcnRpY2FsIFdpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
+    "47": {"version": "14", "sha256": "1njzg5avnq7287mbckplqynq1m374g1a38sbbfj8bv7wz6rlykpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcyAvIGFjdGl2YXRlIHdpbmRvdyAvIGFjdGl2YXRlIHByZXZpb3VzIHdpbmRvd1xuLSByaWdodCBjbGljayB0byBjbG9zZSB3aW5kb3dcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZSB3aW5kb3cgLyBvcGVuIGV4dGVuc2lvbiBzZXR0aW5nc1xuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Ugd2luZG93c1xuLSBtb3VzZSB3aGVlbCB0byBjeWNsZSB3aW5kb3dzXG5cblVzZWZ1bCBmb3IgbGFyZ2UgZGlzcGxheXMuIEFkanVzdGFibGUgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgb3RoZXIgc2V0dGluZ3MiLAogICJuYW1lIjogIlZlcnRpY2FsIFdpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}
   }}
 , {"uuid": "ShutdownTimer@deminder", "name": "Shutdown Timer", "pname": "shutdowntimer", "description": "Shutdown/reboot/suspend the device after a specific time or wake with a rtc alarm.\n\nThe screen-saver will not interrupt the timer. A privileged control script may be installed to control shutdown and rtcwake as user.", "link": "https://extensions.gnome.org/extension/4372/shutdowntimer/", "shell_version_map": {
     "38": {"version": "19", "sha256": "1jagvd6a4xw0vm18qi6czfglp16bywms1y55vii2dwvb1xlm4sjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="},
@@ -3798,8 +3987,9 @@
     "42": {"version": "31", "sha256": "1w0l81g1l21f9f6ga53dlp7y1wg5s1nxz67y990ywh9sp0n4dkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "43": {"version": "44", "sha256": "1r3c87nrpbf93b5clwm54f85hnp3xpbyi9faliq7p4l69w6hfkpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA0NAp9"},
     "44": {"version": "44", "sha256": "1r3c87nrpbf93b5clwm54f85hnp3xpbyi9faliq7p4l69w6hfkpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA0NAp9"},
-    "45": {"version": "46", "sha256": "0z945326317h5yq64krvkkc075pvjdldxaxdpkklcii5hc9pkaqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RlbWluZGVyL1NodXRkb3duVGltZXIiLAogICJ1dWlkIjogIlNodXRkb3duVGltZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogNDYKfQ=="},
-    "46": {"version": "46", "sha256": "0z945326317h5yq64krvkkc075pvjdldxaxdpkklcii5hc9pkaqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RlbWluZGVyL1NodXRkb3duVGltZXIiLAogICJ1dWlkIjogIlNodXRkb3duVGltZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}
+    "45": {"version": "48", "sha256": "18hxxj44brb5ny6xirkyncwkzvnnyq7igsqxxdhy8k2lr6f1zy1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDQ4Cn0="},
+    "46": {"version": "48", "sha256": "18hxxj44brb5ny6xirkyncwkzvnnyq7igsqxxdhy8k2lr6f1zy1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDQ4Cn0="},
+    "47": {"version": "48", "sha256": "18hxxj44brb5ny6xirkyncwkzvnnyq7igsqxxdhy8k2lr6f1zy1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDQ4Cn0="}
   }}
 , {"uuid": "docker_status2@gpouilloux", "name": "Docker Integration", "pname": "docker-integration", "description": "A status menu for managing docker containers.", "link": "https://extensions.gnome.org/extension/4374/docker-integration/", "shell_version_map": {
     "40": {"version": "1", "sha256": "1ia763h3wbc3d3p9ddb1b9rg5f486y5x3m2k4pblq9f9ca9cjrdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIG1hbmFnaW5nIGRvY2tlciBjb250YWluZXJzLiIsCiAgIm5hbWUiOiAiRG9ja2VyIEludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3BvdWlsbG91eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJfc3RhdHVzMkBncG91aWxsb3V4IiwKICAidmVyc2lvbiI6IDEKfQ=="}
@@ -3866,8 +4056,9 @@
     "42": {"version": "52", "sha256": "1dc9rn040l1hxs9ihb5644cfajan6ksadrl713yfxk4cvjal74hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC1hbHQtdGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiQUFUV1MgLSBBZHZhbmNlZCBBbHQtVGFiIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hZHZhbmNlZC1hbHQtdGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MiwKICAidmVyc2lvbi1uYW1lIjogIjQ0LjkiCn0="},
     "43": {"version": "52", "sha256": "1dc9rn040l1hxs9ihb5644cfajan6ksadrl713yfxk4cvjal74hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC1hbHQtdGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiQUFUV1MgLSBBZHZhbmNlZCBBbHQtVGFiIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hZHZhbmNlZC1hbHQtdGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MiwKICAidmVyc2lvbi1uYW1lIjogIjQ0LjkiCn0="},
     "44": {"version": "52", "sha256": "1dc9rn040l1hxs9ihb5644cfajan6ksadrl713yfxk4cvjal74hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC1hbHQtdGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiQUFUV1MgLSBBZHZhbmNlZCBBbHQtVGFiIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hZHZhbmNlZC1hbHQtdGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MiwKICAidmVyc2lvbi1uYW1lIjogIjQ0LjkiCn0="},
-    "45": {"version": "55", "sha256": "0kn5ix2xr5wyv0lqvrpvdjkvnkq9kvl883mss7cpna6k02fvrqpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAoQWR2YW5jZWQgQWx0LVRhYiBXaW5kb3cgU3dpdGNoZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU1LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMiIKfQ=="},
-    "46": {"version": "55", "sha256": "0kn5ix2xr5wyv0lqvrpvdjkvnkq9kvl883mss7cpna6k02fvrqpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAoQWR2YW5jZWQgQWx0LVRhYiBXaW5kb3cgU3dpdGNoZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU1LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMiIKfQ=="}
+    "45": {"version": "57", "sha256": "1s5l3w0iq0cv9pr8rzrd88n9k86p6ll7c2g54x5n74hb4qv1mlj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaGlnaGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgQWx0K1RhYiB3aW5kb3cgYW5kIGFwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgdHlwZS10by1zZWFyY2ggbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgc2V0dGluZ3MsIHdvcmtzcGFjZSBhbmQgbW9uaXRvciBuYXZpZ2F0aW9uLCB3aW5kb3cgY29udHJvbCwgYXBwIGxhdW5jaGVyLCBhbmQgYSBtb3VzZS1jb250cm9sbGVkICdkYXNoJyBtb2RlIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAoQWR2YW5jZWQgQWx0LVRhYiBXaW5kb3cgU3dpdGNoZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NywKICAidmVyc2lvbi1uYW1lIjogIjQ3LjEiCn0="},
+    "46": {"version": "57", "sha256": "1s5l3w0iq0cv9pr8rzrd88n9k86p6ll7c2g54x5n74hb4qv1mlj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaGlnaGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgQWx0K1RhYiB3aW5kb3cgYW5kIGFwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgdHlwZS10by1zZWFyY2ggbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgc2V0dGluZ3MsIHdvcmtzcGFjZSBhbmQgbW9uaXRvciBuYXZpZ2F0aW9uLCB3aW5kb3cgY29udHJvbCwgYXBwIGxhdW5jaGVyLCBhbmQgYSBtb3VzZS1jb250cm9sbGVkICdkYXNoJyBtb2RlIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAoQWR2YW5jZWQgQWx0LVRhYiBXaW5kb3cgU3dpdGNoZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NywKICAidmVyc2lvbi1uYW1lIjogIjQ3LjEiCn0="},
+    "47": {"version": "57", "sha256": "1s5l3w0iq0cv9pr8rzrd88n9k86p6ll7c2g54x5n74hb4qv1mlj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaGlnaGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgQWx0K1RhYiB3aW5kb3cgYW5kIGFwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgdHlwZS10by1zZWFyY2ggbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgc2V0dGluZ3MsIHdvcmtzcGFjZSBhbmQgbW9uaXRvciBuYXZpZ2F0aW9uLCB3aW5kb3cgY29udHJvbCwgYXBwIGxhdW5jaGVyLCBhbmQgYSBtb3VzZS1jb250cm9sbGVkICdkYXNoJyBtb2RlIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAoQWR2YW5jZWQgQWx0LVRhYiBXaW5kb3cgU3dpdGNoZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NywKICAidmVyc2lvbi1uYW1lIjogIjQ3LjEiCn0="}
   }}
 , {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's OnScreen Keyboard more usable.\n\nFeatures:\n* Includes additional buttons: Arrow keys, Esc, Tab, Ctrl, Alt, Super, F1-12\n* Supports key combinations like `Ctrl + C`, `Alt + Tab`, `Ctrl + Shift + C`, `Super + A` etc.\n* Configurable keyboard size (landscape/portrait)\n* Statusbar indicator to toggle keyboard\n* Works in Gnome password modals\n* Works on Lock screen (see README for instructions)\n* Works on Login screen (see README for instructions)\n\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {
     "38": {"version": "9", "sha256": "15wr4p47fyp5940zwk8mzxks76z56ykyzm6zrhd2pyhkxynl9cid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIFN1cGVyLCBGMS0xMlxuKiBTdXBwb3J0cyBrZXkgY29tYmluYXRpb25zIGxpa2UgYEN0cmwgKyBDYCwgYEFsdCArIFRhYmAsIGBDdHJsICsgU2hpZnQgKyBDYCwgYFN1cGVyICsgQWAgZXRjLlxuKiBDb25maWd1cmFibGUga2V5Ym9hcmQgc2l6ZSAobGFuZHNjYXBlL3BvcnRyYWl0KVxuKiBTdGF0dXNiYXIgaW5kaWNhdG9yIHRvIHRvZ2dsZSBrZXlib2FyZFxuKiBXb3JrcyBpbiBHbm9tZSBwYXNzd29yZCBtb2RhbHNcbiogV29ya3Mgb24gTG9jayBzY3JlZW4gKHNlZSBSRUFETUUgZm9yIGluc3RydWN0aW9ucylcbiogV29ya3Mgb24gTG9naW4gc2NyZWVuIChzZWUgUkVBRE1FIGZvciBpbnN0cnVjdGlvbnMpXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMzMwL2ltcHJvdmVkLW9uc2NyZWVuLWtleWJvYXJkLyBieSBTZWJhc3RpYW5MdWVia2UuIiwKICAibmFtZSI6ICJJbXByb3ZlZCBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA5Cn0="},
@@ -3923,8 +4114,9 @@
     "42": {"version": "16", "sha256": "0w34bvz909s3sdwk1wlpzdyn0l0a1i7ifbd6r75mm2bf4ypg905k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25vbWVTbmFwRXh0ZW5zaW9ucy9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDE2Cn0="},
     "43": {"version": "16", "sha256": "0w34bvz909s3sdwk1wlpzdyn0l0a1i7ifbd6r75mm2bf4ypg905k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25vbWVTbmFwRXh0ZW5zaW9ucy9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDE2Cn0="},
     "44": {"version": "16", "sha256": "0w34bvz909s3sdwk1wlpzdyn0l0a1i7ifbd6r75mm2bf4ypg905k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25vbWVTbmFwRXh0ZW5zaW9ucy9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDE2Cn0="},
-    "45": {"version": "23", "sha256": "1apyx83isg9zlj1fa7xn22hslzszk6hqlb9hd3v64j9iag6nhwvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25vbWVTbmFwRXh0ZW5zaW9ucy9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "46": {"version": "23", "sha256": "1apyx83isg9zlj1fa7xn22hslzszk6hqlb9hd3v64j9iag6nhwvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25vbWVTbmFwRXh0ZW5zaW9ucy9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "45": {"version": "24", "sha256": "01fwc843qcgjk1rg92zspagz1i082vzjnmixi7agz7bmxplidjsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dub21lU25hcEV4dGVuc2lvbnMvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAyNAp9"},
+    "46": {"version": "24", "sha256": "01fwc843qcgjk1rg92zspagz1i082vzjnmixi7agz7bmxplidjsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dub21lU25hcEV4dGVuc2lvbnMvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAyNAp9"},
+    "47": {"version": "24", "sha256": "01fwc843qcgjk1rg92zspagz1i082vzjnmixi7agz7bmxplidjsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dub21lU25hcEV4dGVuc2lvbnMvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAyNAp9"}
   }}
 , {"uuid": "appswitcheronlyoncurrentworkspace@ermesonsampaio.com", "name": "Alt + Tab only on current workspace", "pname": "alt-tab-only-on-current-workspace", "description": "Force alt + tab to switch only in the current workspace.", "link": "https://extensions.gnome.org/extension/4443/alt-tab-only-on-current-workspace/", "shell_version_map": {
     "40": {"version": "3", "sha256": "1jl7gi45gz9fliggkwdg44rdqcirh6qxfkvc639vbw2sgmpbmcvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmNlIGFsdCArIHRhYiB0byBzd2l0Y2ggb25seSBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJBbHQgKyBUYWIgb25seSBvbiBjdXJyZW50IHdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lcm1lc29uc2FtcGFpby9hcHAtc3dpdGNoZXItb25seS1vbi1jdXJyZW50LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiYXBwc3dpdGNoZXJvbmx5b25jdXJyZW50d29ya3NwYWNlQGVybWVzb25zYW1wYWlvLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
@@ -3937,7 +4129,8 @@
     "43": {"version": "24", "sha256": "007yp741jl5n6bf1zi4h5w9zhbbm1gavzdgklmrwjj114r49dx2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogMjQsCiAgInZlcnNpb24tbmFtZSI6ICIyMC5sZWdhY3kiCn0="},
     "44": {"version": "24", "sha256": "007yp741jl5n6bf1zi4h5w9zhbbm1gavzdgklmrwjj114r49dx2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogMjQsCiAgInZlcnNpb24tbmFtZSI6ICIyMC5sZWdhY3kiCn0="},
     "45": {"version": "32", "sha256": "0s6lfmxfdnl1nk9jhvds3dc93axbl8d7xdiinqldrxy8s0xnd37j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXNlZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuRm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlICdBY3Rpdml0aWVzJyBpbmRpY2F0b3IgaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYnV0IGNhbiBiZSBlbmFibGVkIHRocm91Z2ggc2V0dGluZ3MuXG5cblRoZSBkZWZhdWx0IFRlcm1pbmFsIGFuZCBTb2Z0d2FyZSBjZW50cmUgY2FuIGFsc28gYmUgY2hhbmdlZC5cblxuIEZvcmNlIFF1aXQgd29ya3Mgb24gV2F5bGFuZCBhbmQgWG9yZyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiYXJ5YW4yMCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogMzIsCiAgInZlcnNpb24tbmFtZSI6ICIyMy4wIgp9"},
-    "46": {"version": "32", "sha256": "0s6lfmxfdnl1nk9jhvds3dc93axbl8d7xdiinqldrxy8s0xnd37j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXNlZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuRm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlICdBY3Rpdml0aWVzJyBpbmRpY2F0b3IgaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYnV0IGNhbiBiZSBlbmFibGVkIHRocm91Z2ggc2V0dGluZ3MuXG5cblRoZSBkZWZhdWx0IFRlcm1pbmFsIGFuZCBTb2Z0d2FyZSBjZW50cmUgY2FuIGFsc28gYmUgY2hhbmdlZC5cblxuIEZvcmNlIFF1aXQgd29ya3Mgb24gV2F5bGFuZCBhbmQgWG9yZyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiYXJ5YW4yMCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogMzIsCiAgInZlcnNpb24tbmFtZSI6ICIyMy4wIgp9"}
+    "46": {"version": "35", "sha256": "1w5b22r95wibj1y0r99q35fr3cpzbvw2kqdfqlrfk030wplcn6ga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXNlZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuRm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlICdBY3Rpdml0aWVzJyBpbmRpY2F0b3IgaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYnV0IGNhbiBiZSBlbmFibGVkIHRocm91Z2ggc2V0dGluZ3MuXG5cblRoZSBkZWZhdWx0IFRlcm1pbmFsIGFuZCBTb2Z0d2FyZSBjZW50cmUgY2FuIGFsc28gYmUgY2hhbmdlZC5cblxuIEZvcmNlIFF1aXQgd29ya3Mgb24gV2F5bGFuZCBhbmQgWG9yZyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiYXJ5YW4yMCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogMzUsCiAgInZlcnNpb24tbmFtZSI6ICIyMy40Igp9"},
+    "47": {"version": "35", "sha256": "1w5b22r95wibj1y0r99q35fr3cpzbvw2kqdfqlrfk030wplcn6ga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXNlZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuRm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlICdBY3Rpdml0aWVzJyBpbmRpY2F0b3IgaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYnV0IGNhbiBiZSBlbmFibGVkIHRocm91Z2ggc2V0dGluZ3MuXG5cblRoZSBkZWZhdWx0IFRlcm1pbmFsIGFuZCBTb2Z0d2FyZSBjZW50cmUgY2FuIGFsc28gYmUgY2hhbmdlZC5cblxuIEZvcmNlIFF1aXQgd29ya3Mgb24gV2F5bGFuZCBhbmQgWG9yZyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiYXJ5YW4yMCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogMzUsCiAgInZlcnNpb24tbmFtZSI6ICIyMy40Igp9"}
   }}
 , {"uuid": "rog-manager@rog", "name": "Rog Asus Manager", "pname": "rog-asus-manager", "description": "Asus ROG manager", "link": "https://extensions.gnome.org/extension/4452/rog-asus-manager/", "shell_version_map": {
     "38": {"version": "4", "sha256": "194k3qzjd05rki20ww0nv8001aiyp4ih9abv82g64058x8rmnff5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdXMgUk9HIG1hbmFnZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyb2ctbWFuYWdlciIsCiAgIm5hbWUiOiAiUm9nIEFzdXMgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb2dtYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlamFuZHJvLW1vdXJhcy9yb2ctbWFuYWdlciIsCiAgInV1aWQiOiAicm9nLW1hbmFnZXJAcm9nIiwKICAidmVyc2lvbiI6IDQKfQ=="}
@@ -3964,8 +4157,9 @@
     "42": {"version": "24", "sha256": "04gyrqdhx4rd3zl6rlfpyrff5p2wc7bqw9wc07849c557bfkhnwc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIDQzLCA0NCBcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJNZWRpYSBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZWRpYWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="},
     "43": {"version": "29", "sha256": "02asfdrc3z5834xn000x5qhb3yhm3vgr7pr15sxms8h5wcw43p40", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIDQzLCA0NCBcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9scyIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="},
     "44": {"version": "29", "sha256": "02asfdrc3z5834xn000x5qhb3yhm3vgr7pr15sxms8h5wcw43p40", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIDQzLCA0NCBcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9scyIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="},
-    "45": {"version": "36", "sha256": "0mccq5h71m41xw4wl4ja0xq1dga4iivq9nrrknnfyfhr81rca41n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="},
-    "46": {"version": "36", "sha256": "0mccq5h71m41xw4wl4ja0xq1dga4iivq9nrrknnfyfhr81rca41n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="}
+    "45": {"version": "37", "sha256": "1zs8695j46r5gyypsn1gk347fz1lm9rvjjfd2m39r4dc5z82x97q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNywKICAidmVyc2lvbi1uYW1lIjogIjIuMC4yIgp9"},
+    "46": {"version": "37", "sha256": "1zs8695j46r5gyypsn1gk347fz1lm9rvjjfd2m39r4dc5z82x97q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNywKICAidmVyc2lvbi1uYW1lIjogIjIuMC4yIgp9"},
+    "47": {"version": "37", "sha256": "1zs8695j46r5gyypsn1gk347fz1lm9rvjjfd2m39r4dc5z82x97q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNywKICAidmVyc2lvbi1uYW1lIjogIjIuMC4yIgp9"}
   }}
 , {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a button to the panel that shows information Spotify playback. For bug reports, feature requests, translation contributions, etc., please visit the extension's github page.", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {
     "38": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
@@ -3974,8 +4168,9 @@
     "42": {"version": "22", "sha256": "1vs92fcas0mzq8pl461cbph1m9yb974qmpsn6wc8r80hd6hr4znx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
     "43": {"version": "22", "sha256": "1vs92fcas0mzq8pl461cbph1m9yb974qmpsn6wc8r80hd6hr4znx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
     "44": {"version": "22", "sha256": "1vs92fcas0mzq8pl461cbph1m9yb974qmpsn6wc8r80hd6hr4znx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
-    "45": {"version": "25", "sha256": "1chp7ayp84xcr17m5cnfhd78s4wcqldr3iq58rczli47svsxwxm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="},
-    "46": {"version": "25", "sha256": "1chp7ayp84xcr17m5cnfhd78s4wcqldr3iq58rczli47svsxwxm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}
+    "45": {"version": "26", "sha256": "1r7f0dz5c0anv15dyi02b5cv5qivmm81nwxj35si7f7dbvfbc86r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"},
+    "46": {"version": "26", "sha256": "1r7f0dz5c0anv15dyi02b5cv5qivmm81nwxj35si7f7dbvfbc86r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"},
+    "47": {"version": "26", "sha256": "1r7f0dz5c0anv15dyi02b5cv5qivmm81nwxj35si7f7dbvfbc86r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}
   }}
 , {"uuid": "aws-default-profile-switcher@kevin-chappell.com", "name": "AWS Default Profile Switcher", "pname": "aws-default-profile-switcher", "description": "Gnome shell extension for quickly setting named profiles as the default", "link": "https://extensions.gnome.org/extension/4473/aws-default-profile-switcher/", "shell_version_map": {
     "38": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -4002,8 +4197,9 @@
     "42": {"version": "68", "sha256": "19rv67nmhbx58n38srmns34hsbjm7kb47kri7lv17c3ik9h0r3zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZSIsCiAgInV1aWQiOiAiZm9yZ2VAam1tYXJhbmFuLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"},
     "43": {"version": "72", "sha256": "00v2bclgr8fg8x8fz3pbdlwrdm2nfd403qvclk1px22gqf3527xy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZSIsCiAgInV1aWQiOiAiZm9yZ2VAam1tYXJhbmFuLmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"},
     "44": {"version": "72", "sha256": "00v2bclgr8fg8x8fz3pbdlwrdm2nfd403qvclk1px22gqf3527xy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZSIsCiAgInV1aWQiOiAiZm9yZ2VAam1tYXJhbmFuLmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"},
-    "45": {"version": "83", "sha256": "0ssaq983a00kvs0rwpgb9hqx8253gnphbpdhz29mcb8jxql0chnk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mb3JnZS1leHQvZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogODMKfQ=="},
-    "46": {"version": "83", "sha256": "0ssaq983a00kvs0rwpgb9hqx8253gnphbpdhz29mcb8jxql0chnk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mb3JnZS1leHQvZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogODMKfQ=="}
+    "45": {"version": "84", "sha256": "0rxy3w0a2pxgk6qk9z0myrwwlahwz980z81vjksb17kjafblhp8r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm9yZ2UtZXh0L2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDg0Cn0="},
+    "46": {"version": "84", "sha256": "0rxy3w0a2pxgk6qk9z0myrwwlahwz980z81vjksb17kjafblhp8r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm9yZ2UtZXh0L2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDg0Cn0="},
+    "47": {"version": "84", "sha256": "0rxy3w0a2pxgk6qk9z0myrwwlahwz980z81vjksb17kjafblhp8r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ZvcmdlLWV4dC9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm9yZ2UtZXh0L2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDg0Cn0="}
   }}
 , {"uuid": "autonightlight@zefty.github.io", "name": "Auto Night Light", "pname": "auto-night-light", "description": "Automatically adjust night light", "link": "https://extensions.gnome.org/extension/4482/auto-night-light/", "shell_version_map": {
     "38": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -4033,8 +4229,9 @@
     "42": {"version": "18", "sha256": "0dsr7437fnbgyz3mhdqgjz4c6cs69c4zlx18z4ibqbfjib47z1mn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzdHVhcnRoYXlodXJzdCIsCiAgICAicGF5cGFsIjogInN0dWFydGFoYXlodXJzdCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YWN5LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L3ByaXZhY3ktbWVudS1leHRlbnNpb24iLAogICJ1dWlkIjogIlByaXZhY3lNZW51QHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "43": {"version": "18", "sha256": "0dsr7437fnbgyz3mhdqgjz4c6cs69c4zlx18z4ibqbfjib47z1mn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzdHVhcnRoYXlodXJzdCIsCiAgICAicGF5cGFsIjogInN0dWFydGFoYXlodXJzdCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YWN5LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L3ByaXZhY3ktbWVudS1leHRlbnNpb24iLAogICJ1dWlkIjogIlByaXZhY3lNZW51QHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "44": {"version": "18", "sha256": "0dsr7437fnbgyz3mhdqgjz4c6cs69c4zlx18z4ibqbfjib47z1mn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzdHVhcnRoYXlodXJzdCIsCiAgICAicGF5cGFsIjogInN0dWFydGFoYXlodXJzdCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YWN5LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L3ByaXZhY3ktbWVudS1leHRlbnNpb24iLAogICJ1dWlkIjogIlByaXZhY3lNZW51QHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDE4Cn0="},
-    "45": {"version": "24", "sha256": "1w3p959rv31mv44pzjsnbai8jj2s3ldjr7366mvfpgkfw4n4fi7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51XG5OT1RFOiBUaGlzIG9ubHkgcHJvdmlkZXMgcXVpY2sgYWNjZXNzIHRvIHNldHRpbmdzLCBpdCBkb2Vzbid0IGRpcmVjdGx5IGFjY2VzcyBoYXJkd2FyZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIlByaXZhY3kgUXVpY2sgU2V0dGluZ3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpdmFjeS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "46": {"version": "24", "sha256": "1w3p959rv31mv44pzjsnbai8jj2s3ldjr7366mvfpgkfw4n4fi7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51XG5OT1RFOiBUaGlzIG9ubHkgcHJvdmlkZXMgcXVpY2sgYWNjZXNzIHRvIHNldHRpbmdzLCBpdCBkb2Vzbid0IGRpcmVjdGx5IGFjY2VzcyBoYXJkd2FyZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIlByaXZhY3kgUXVpY2sgU2V0dGluZ3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpdmFjeS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNAp9"}
+    "45": {"version": "25", "sha256": "1g4qcb9a17bbiargqlfnmv12caz20mijh92avysj0ypkmi2n6sj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51XG5OT1RFOiBUaGlzIG9ubHkgcHJvdmlkZXMgcXVpY2sgYWNjZXNzIHRvIHNldHRpbmdzLCBpdCBkb2Vzbid0IGRpcmVjdGx5IGFjY2VzcyBoYXJkd2FyZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIlByaXZhY3kgUXVpY2sgU2V0dGluZ3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpdmFjeS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "46": {"version": "25", "sha256": "1g4qcb9a17bbiargqlfnmv12caz20mijh92avysj0ypkmi2n6sj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51XG5OT1RFOiBUaGlzIG9ubHkgcHJvdmlkZXMgcXVpY2sgYWNjZXNzIHRvIHNldHRpbmdzLCBpdCBkb2Vzbid0IGRpcmVjdGx5IGFjY2VzcyBoYXJkd2FyZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIlByaXZhY3kgUXVpY2sgU2V0dGluZ3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpdmFjeS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "47": {"version": "25", "sha256": "1g4qcb9a17bbiargqlfnmv12caz20mijh92avysj0ypkmi2n6sj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwcml2YWN5IHNldHRpbmdzIHRvZ2dsZXMgdG8gdGhlIEdOT01FIHN5c3RlbSBtZW51XG5OT1RFOiBUaGlzIG9ubHkgcHJvdmlkZXMgcXVpY2sgYWNjZXNzIHRvIHNldHRpbmdzLCBpdCBkb2Vzbid0IGRpcmVjdGx5IGFjY2VzcyBoYXJkd2FyZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic3R1YXJ0aGF5aHVyc3QiLAogICAgInBheXBhbCI6ICJzdHVhcnRhaGF5aHVyc3QiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJuYW1lIjogIlByaXZhY3kgUXVpY2sgU2V0dGluZ3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHJpdmFjeS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
   }}
 , {"uuid": "hide-panel-lite@fthx", "name": "Hide Panel Lite", "pname": "hide-panel-light-version-without-hot-corner", "description": "Hide top panel except in overview.\n\nFor those who don't need a hot corner (e.g. running GNOME 40+ with three fingers gestures). Very very light extension. No options, no bugs. ;-)", "link": "https://extensions.gnome.org/extension/4496/hide-panel-light-version-without-hot-corner/", "shell_version_map": {
     "38": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -4060,8 +4257,9 @@
     "42": {"version": "18", "sha256": "13pg4lzqpa7m7qhdrqw5vlnjaqc843cxyinygg197lafgx10ya1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxOAp9"},
     "43": {"version": "18", "sha256": "13pg4lzqpa7m7qhdrqw5vlnjaqc843cxyinygg197lafgx10ya1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxOAp9"},
     "44": {"version": "18", "sha256": "13pg4lzqpa7m7qhdrqw5vlnjaqc843cxyinygg197lafgx10ya1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxOAp9"},
-    "45": {"version": "31", "sha256": "1phng3s99zh2ykk78qfl936sin5v7y5dzghrpq7q3bqxnyf6xias", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSB0b3Agc3RhdHVzIGFyZWEuIiwKICAibmFtZSI6ICJOZXBhbGkgRGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmlwbGFiLUR1dHRhL05lcGFsaV9EYXRlIiwKICAidXVpZCI6ICJuZXBhbGktZGF0ZUBiaXBsYWIiLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "46": {"version": "31", "sha256": "1phng3s99zh2ykk78qfl936sin5v7y5dzghrpq7q3bqxnyf6xias", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSB0b3Agc3RhdHVzIGFyZWEuIiwKICAibmFtZSI6ICJOZXBhbGkgRGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmlwbGFiLUR1dHRhL05lcGFsaV9EYXRlIiwKICAidXVpZCI6ICJuZXBhbGktZGF0ZUBiaXBsYWIiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}
+    "45": {"version": "33", "sha256": "0my4l5xy1jzcqf0r8zp545dv40bhwanai89w0zrgq6sqlx4zzvhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSB0b3Agc3RhdHVzIGFyZWEuIiwKICAibmFtZSI6ICJOZXBhbGkgRGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "46": {"version": "33", "sha256": "0my4l5xy1jzcqf0r8zp545dv40bhwanai89w0zrgq6sqlx4zzvhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSB0b3Agc3RhdHVzIGFyZWEuIiwKICAibmFtZSI6ICJOZXBhbGkgRGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDMzCn0="},
+    "47": {"version": "33", "sha256": "0my4l5xy1jzcqf0r8zp545dv40bhwanai89w0zrgq6sqlx4zzvhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSB0b3Agc3RhdHVzIGFyZWEuIiwKICAibmFtZSI6ICJOZXBhbGkgRGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDMzCn0="}
   }}
 , {"uuid": "clock-left@mapuut", "name": "Clock Left", "pname": "clock-left", "description": "Moves clock to left.\n\nAlso this one might suit you better: extensions.gnome.org/extension/4667/left-clock/", "link": "https://extensions.gnome.org/extension/4526/clock-left/", "shell_version_map": {
     "38": {"version": "4", "sha256": "0hvr7nmbrn7nqn3nk9p1a659yhkgja3gy9kbw18yykyqf0lbssqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIGNsb2NrIHRvIGxlZnQuXG5cbkFsc28gdGhpcyBvbmUgbWlnaHQgc3VpdCB5b3UgYmV0dGVyOiBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDY2Ny9sZWZ0LWNsb2NrLyIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjbG9jay1sZWZ0QG1hcHV1dCIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -4088,8 +4286,9 @@
     "42": {"version": "4", "sha256": "01ia6ycy4crmc7b9ckwbaqlz4kl3adj1is9036n1y1676696slhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vdDE4NDI1Ni9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXV0b2hpZGUtdm9sdW1lIiwKICAidXVpZCI6ICJhdXRvaGlkZS12b2x1bWVAdW5ib2lsZWQuaW5mbyIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "4", "sha256": "01ia6ycy4crmc7b9ckwbaqlz4kl3adj1is9036n1y1676696slhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vdDE4NDI1Ni9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXV0b2hpZGUtdm9sdW1lIiwKICAidXVpZCI6ICJhdXRvaGlkZS12b2x1bWVAdW5ib2lsZWQuaW5mbyIsCiAgInZlcnNpb24iOiA0Cn0="},
     "44": {"version": "4", "sha256": "01ia6ycy4crmc7b9ckwbaqlz4kl3adj1is9036n1y1676696slhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vdDE4NDI1Ni9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXV0b2hpZGUtdm9sdW1lIiwKICAidXVpZCI6ICJhdXRvaGlkZS12b2x1bWVAdW5ib2lsZWQuaW5mbyIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "45": {"version": "8", "sha256": "0bilgzcx86id89glf0jrk232jfmv3vxgh9la62r65l0c79ixngda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL3QxODQyNTYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWF1dG9oaWRlLXZvbHVtZSIsCiAgInV1aWQiOiAiYXV0b2hpZGUtdm9sdW1lQHVuYm9pbGVkLmluZm8iLAogICJ2ZXJzaW9uIjogOAp9"},
-    "46": {"version": "8", "sha256": "0bilgzcx86id89glf0jrk232jfmv3vxgh9la62r65l0c79ixngda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL3QxODQyNTYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWF1dG9oaWRlLXZvbHVtZSIsCiAgInV1aWQiOiAiYXV0b2hpZGUtdm9sdW1lQHVuYm9pbGVkLmluZm8iLAogICJ2ZXJzaW9uIjogOAp9"}
+    "45": {"version": "9", "sha256": "19vf671jllip4v0kb8xahqxcynfnsgi8yzixliixhxwfwzspjx1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "46": {"version": "9", "sha256": "19vf671jllip4v0kb8xahqxcynfnsgi8yzixliixhxwfwzspjx1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "47": {"version": "9", "sha256": "19vf671jllip4v0kb8xahqxcynfnsgi8yzixliixhxwfwzspjx1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDkKfQ=="}
   }}
 , {"uuid": "cloudflare@adam.gadmz", "name": "Cloudflare", "pname": "cloudflare", "description": "Warp Connect", "link": "https://extensions.gnome.org/extension/4542/cloudflare/", "shell_version_map": {
     "38": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="},
@@ -4110,8 +4309,9 @@
     "42": {"version": "27", "sha256": "0mh69mrrnc59njmzm1l4rcznw4ixcp8y4d5k9m7ckkk861lm0k1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAyNwp9"},
     "43": {"version": "27", "sha256": "0mh69mrrnc59njmzm1l4rcznw4ixcp8y4d5k9m7ckkk861lm0k1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAyNwp9"},
     "44": {"version": "27", "sha256": "0mh69mrrnc59njmzm1l4rcznw4ixcp8y4d5k9m7ckkk861lm0k1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAyNwp9"},
-    "45": {"version": "32", "sha256": "1am7657h8plcg0vvv41gps0zbfwmx8rw7khjnknn0jzyx8r8ni0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAzMgp9"},
-    "46": {"version": "32", "sha256": "1am7657h8plcg0vvv41gps0zbfwmx8rw7khjnknn0jzyx8r8ni0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAzMgp9"}
+    "45": {"version": "33", "sha256": "1whq712ir2xssqy7nfdpfwdy5h6bb1pw6540r8aa0s8pgbvx5pxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
+    "46": {"version": "33", "sha256": "1whq712ir2xssqy7nfdpfwdy5h6bb1pw6540r8aa0s8pgbvx5pxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
+    "47": {"version": "33", "sha256": "1whq712ir2xssqy7nfdpfwdy5h6bb1pw6540r8aa0s8pgbvx5pxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}
   }}
 , {"uuid": "killapp@adam.gadmz", "name": "Kill App", "pname": "kill-app", "description": "Force quit or kill application", "link": "https://extensions.gnome.org/extension/4551/kill-app/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="},
@@ -4158,8 +4358,9 @@
     "42": {"version": "9", "sha256": "0ajv1mw03pjbyyimmgbzsi4wvpfns9vb8x4w79kbwymcs0l9bh9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "0ajv1mw03pjbyyimmgbzsi4wvpfns9vb8x4w79kbwymcs0l9bh9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "9", "sha256": "0ajv1mw03pjbyyimmgbzsi4wvpfns9vb8x4w79kbwymcs0l9bh9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "45": {"version": "11", "sha256": "19x8511xpjsarz31kpy4nm4kfvlfny77avn150x19cjy9rlcx4l6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "46": {"version": "11", "sha256": "19x8511xpjsarz31kpy4nm4kfvlfny77avn150x19cjy9rlcx4l6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "12", "sha256": "0xr3vh1f88cl3xq75nlimn48s3ag5hi8kw847l58x5wvzamiqpvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "46": {"version": "12", "sha256": "0xr3vh1f88cl3xq75nlimn48s3ag5hi8kw847l58x5wvzamiqpvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "47": {"version": "12", "sha256": "0xr3vh1f88cl3xq75nlimn48s3ag5hi8kw847l58x5wvzamiqpvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4gTWlncmF0aW5nIGZyb20gV2luZG93cyBoYXMgbmV2ZXIgYmVlbiBlYXNpZXIhIiwKICAibmFtZSI6ICJBY3RpdmF0ZSBHTk9NRSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3RpdmF0ZV9nbm9tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
   }}
 , {"uuid": "huawei-wmi@apps.sdore.me", "name": "Huawei WMI controls", "pname": "huawei-wmi-controls", "description": "Control various Huawei and Honor laptops WMI functions, such as battery protection, Fn-lock, power unlock and keyboard backlight.", "link": "https://extensions.gnome.org/extension/4580/huawei-wmi-controls/", "shell_version_map": {
     "40": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -4169,7 +4370,7 @@
     "44": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "45": {"version": "13", "sha256": "1j38vy3ihkb45rplzr9dpkql5sy65xfqm6fp3j89x88lhw9ijz7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgImdldHRleHQtZG9tYWluIjogImh1YXdlaS13bWkiLAogICJuYW1lIjogIkh1YXdlaSBXTUkgY29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVhd2VpLXdtaSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
-, {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {
+, {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "ARCHIVED - Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"},
     "40": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"},
     "41": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -4190,16 +4391,18 @@
     "42": {"version": "10", "sha256": "18cs5lix4bws201vqbcrgv0icc57njqp85f66k75sqlai7jqxawf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
     "43": {"version": "10", "sha256": "18cs5lix4bws201vqbcrgv0icc57njqp85f66k75sqlai7jqxawf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
     "44": {"version": "10", "sha256": "18cs5lix4bws201vqbcrgv0icc57njqp85f66k75sqlai7jqxawf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "45": {"version": "20", "sha256": "1bvjxh48r4rql1v3nsi5j36f8k3b4q5gzzm6lac72fcxfps6plzi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="},
-    "46": {"version": "20", "sha256": "1bvjxh48r4rql1v3nsi5j36f8k3b4q5gzzm6lac72fcxfps6plzi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}
+    "45": {"version": "25", "sha256": "131f8952wqw5qbd0sha2j2mjvbdy54hvaaqzhifrcwnsh2h4kca4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "46": {"version": "25", "sha256": "131f8952wqw5qbd0sha2j2mjvbdy54hvaaqzhifrcwnsh2h4kca4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "131f8952wqw5qbd0sha2j2mjvbdy54hvaaqzhifrcwnsh2h4kca4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "Shortcuts to (1) insert a new workspace, (2) reorder workspaces and (3) reposition floating windows.", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {
     "41": {"version": "9", "sha256": "1vnraf73wvsq5kmw78gjiyn7ix4mzvfq803fhmk2781v9j5f4jgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "42": {"version": "9", "sha256": "1vnraf73wvsq5kmw78gjiyn7ix4mzvfq803fhmk2781v9j5f4jgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "1vnraf73wvsq5kmw78gjiyn7ix4mzvfq803fhmk2781v9j5f4jgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "10", "sha256": "02mkarap1bzj3znnfc2wbkjm8g1zidifbm1lcf12wxvi7b5db8i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "45": {"version": "19", "sha256": "0pks4pdq8nmk1iq1jlgr9l0xi4x5a4pxal5madwgajkrjf1mqijz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHJlcG9zaXRpb24gZmxvYXRpbmcgd2luZG93cy4iLAogICJuYW1lIjogIk5ldyBXb3Jrc3BhY2UgU2hvcnRjdXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV3d29ya3NwYWNlc2hvcnRjdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "46": {"version": "19", "sha256": "0pks4pdq8nmk1iq1jlgr9l0xi4x5a4pxal5madwgajkrjf1mqijz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHJlcG9zaXRpb24gZmxvYXRpbmcgd2luZG93cy4iLAogICJuYW1lIjogIk5ldyBXb3Jrc3BhY2UgU2hvcnRjdXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV3d29ya3NwYWNlc2hvcnRjdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiAxOQp9"}
+    "45": {"version": "23", "sha256": "0l9wkvi07rbhgivycymr3j2pplf06fyggla2m57d36m7pik3rk7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHJlcG9zaXRpb24gZmxvYXRpbmcgd2luZG93cy4iLAogICJuYW1lIjogIk5ldyBXb3Jrc3BhY2UgU2hvcnRjdXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV3d29ya3NwYWNlc2hvcnRjdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
+    "46": {"version": "23", "sha256": "0l9wkvi07rbhgivycymr3j2pplf06fyggla2m57d36m7pik3rk7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHJlcG9zaXRpb24gZmxvYXRpbmcgd2luZG93cy4iLAogICJuYW1lIjogIk5ldyBXb3Jrc3BhY2UgU2hvcnRjdXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV3d29ya3NwYWNlc2hvcnRjdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
+    "47": {"version": "23", "sha256": "0l9wkvi07rbhgivycymr3j2pplf06fyggla2m57d36m7pik3rk7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHJlcG9zaXRpb24gZmxvYXRpbmcgd2luZG93cy4iLAogICJuYW1lIjogIk5ldyBXb3Jrc3BhY2UgU2hvcnRjdXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV3d29ya3NwYWNlc2hvcnRjdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}
   }}
 , {"uuid": "p.stonham@switcheroo.org", "name": "Switcheroo", "pname": "switcheroo", "description": "Switch to the first window with the title x\n\nA very small extension to allow you to switch windows via gdbus. This is particularly useful if you are using wayland as utilities such as wmctrl won't work.\n\nSince Gnome 41 removed org.gnome.Shell.Eval for security reasons, if you ever used a command such as:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval\"var mw = global.get_window_actors().map(w=>w.meta_window).find(mw=>mw.get_title().includes('Firefox'));mw && mw.activate(0)\"\n\nthis can now be replaced with:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/switcheroo/Switcheroo --method org.switcheroo.Switcheroo.Set Firefox\n\nThis can then be assigned to a shortcut key in Gnome settings or called programmatically.", "link": "https://extensions.gnome.org/extension/4600/switcheroo/", "shell_version_map": {
     "41": {"version": "3", "sha256": "0pfjhx8pm26zpizazd2pbpfqsr8vwc6znrm1cbf4ydcyvfxsnwwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB0byB0aGUgZmlyc3Qgd2luZG93IHdpdGggdGhlIHRpdGxlIHhcblxuQSB2ZXJ5IHNtYWxsIGV4dGVuc2lvbiB0byBhbGxvdyB5b3UgdG8gc3dpdGNoIHdpbmRvd3MgdmlhIGdkYnVzLiBUaGlzIGlzIHBhcnRpY3VsYXJseSB1c2VmdWwgaWYgeW91IGFyZSB1c2luZyB3YXlsYW5kIGFzIHV0aWxpdGllcyBzdWNoIGFzIHdtY3RybCB3b24ndCB3b3JrLlxuXG5TaW5jZSBHbm9tZSA0MSByZW1vdmVkIG9yZy5nbm9tZS5TaGVsbC5FdmFsIGZvciBzZWN1cml0eSByZWFzb25zLCBpZiB5b3UgZXZlciB1c2VkIGEgY29tbWFuZCBzdWNoIGFzOlxuXG5nZGJ1cyBjYWxsIC0tc2Vzc2lvbiAtLWRlc3Qgb3JnLmdub21lLlNoZWxsIC0tb2JqZWN0LXBhdGggL29yZy9nbm9tZS9TaGVsbCAtLW1ldGhvZCBvcmcuZ25vbWUuU2hlbGwuRXZhbFwidmFyIG13ID0gZ2xvYmFsLmdldF93aW5kb3dfYWN0b3JzKCkubWFwKHc9Jmd0O3cubWV0YV93aW5kb3cpLmZpbmQobXc9Jmd0O213LmdldF90aXRsZSgpLmluY2x1ZGVzKCdGaXJlZm94JykpO213ICZhbXA7JmFtcDsgbXcuYWN0aXZhdGUoMClcIlxuXG50aGlzIGNhbiBub3cgYmUgcmVwbGFjZWQgd2l0aDpcblxuZ2RidXMgY2FsbCAtLXNlc3Npb24gLS1kZXN0IG9yZy5nbm9tZS5TaGVsbCAtLW9iamVjdC1wYXRoIC9vcmcvc3dpdGNoZXJvby9Td2l0Y2hlcm9vIC0tbWV0aG9kIG9yZy5zd2l0Y2hlcm9vLlN3aXRjaGVyb28uU2V0IEZpcmVmb3hcblxuVGhpcyBjYW4gdGhlbiBiZSBhc3NpZ25lZCB0byBhIHNob3J0Y3V0IGtleSBpbiBHbm9tZSBzZXR0aW5ncyBvciBjYWxsZWQgcHJvZ3JhbW1hdGljYWxseS4iLAogICJuYW1lIjogIlN3aXRjaGVyb28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInAuc3RvbmhhbUBzd2l0Y2hlcm9vLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}
@@ -4259,8 +4462,9 @@
     "42": {"version": "14", "sha256": "1f9qpw8hy5lppnm15jga5ka5qb4a175aqq6a5n5jm0fwn6w2v84m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "43": {"version": "14", "sha256": "1f9qpw8hy5lppnm15jga5ka5qb4a175aqq6a5n5jm0fwn6w2v84m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "44": {"version": "14", "sha256": "1f9qpw8hy5lppnm15jga5ka5qb4a175aqq6a5n5jm0fwn6w2v84m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDE0Cn0="},
-    "45": {"version": "20", "sha256": "0hpd0qrnv30z1c7qp6wzgry14wn6rzwdabwjq6ll9hwgn27f6vqi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZm9jdXMtY2hhbmdlciIsCiAgInV1aWQiOiAiZm9jdXMtY2hhbmdlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
-    "46": {"version": "20", "sha256": "0hpd0qrnv30z1c7qp6wzgry14wn6rzwdabwjq6ll9hwgn27f6vqi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZm9jdXMtY2hhbmdlciIsCiAgInV1aWQiOiAiZm9jdXMtY2hhbmdlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogMjAKfQ=="}
+    "45": {"version": "21", "sha256": "0vwgmkqkdnspq738rr7kp9vvcw67gridpigypa3qibp05j16yv29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDIxCn0="},
+    "46": {"version": "21", "sha256": "0vwgmkqkdnspq738rr7kp9vvcw67gridpigypa3qibp05j16yv29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDIxCn0="},
+    "47": {"version": "21", "sha256": "0vwgmkqkdnspq738rr7kp9vvcw67gridpigypa3qibp05j16yv29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDIxCn0="}
   }}
 , {"uuid": "no-titlebar-when-maximized@alec.ninja", "name": "No Titlebar When Maximized", "pname": "no-titlebar-when-maximized", "description": "Hides the classic title bar of maximized X.Org windows", "link": "https://extensions.gnome.org/extension/4630/no-titlebar-when-maximized/", "shell_version_map": {
     "41": {"version": "11", "sha256": "0ai3fz37ij5k6s5mjhh9934bmwxs2m3fnir26sjrdsk5b3pgrygz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlY2RvdG5pbmphL25vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkIiwKICAidXVpZCI6ICJuby10aXRsZWJhci13aGVuLW1heGltaXplZEBhbGVjLm5pbmphIiwKICAidmVyc2lvbiI6IDExCn0="},
@@ -4292,8 +4496,9 @@
     "42": {"version": "23", "sha256": "02kgp6ihg8gkkhxprxd7m9i186i0l3sy954lp6s3aq23v2ya0yn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
     "43": {"version": "23", "sha256": "02kgp6ihg8gkkhxprxd7m9i186i0l3sy954lp6s3aq23v2ya0yn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
     "44": {"version": "23", "sha256": "02kgp6ihg8gkkhxprxd7m9i186i0l3sy954lp6s3aq23v2ya0yn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "45": {"version": "25", "sha256": "1wiaxyaa8gmd4lpd92cx7rfkln1l97cmj7500sz68xqlax4cylr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
-    "46": {"version": "25", "sha256": "1wiaxyaa8gmd4lpd92cx7rfkln1l97cmj7500sz68xqlax4cylr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
+    "45": {"version": "26", "sha256": "1n7b3k3wqfpmnpf93hswgigwpvh49wzasj7y3gagrwwicgx1mhhg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "46": {"version": "26", "sha256": "1n7b3k3wqfpmnpf93hswgigwpvh49wzasj7y3gagrwwicgx1mhhg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="},
+    "47": {"version": "26", "sha256": "1n7b3k3wqfpmnpf93hswgigwpvh49wzasj7y3gagrwwicgx1mhhg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}
   }}
 , {"uuid": "notification-banner-reloaded@marcinjakubowski.github.com", "name": "Notification Banner Reloaded", "pname": "notification-banner-reloaded", "description": "Configure notification banner position and animation to your liking.\nVersion 9: Gnome 45 changes by mannjani@github\nVersion 10: mannjani@github added a test button inside prefs", "link": "https://extensions.gnome.org/extension/4651/notification-banner-reloaded/", "shell_version_map": {
     "40": {"version": "8", "sha256": "1g0aa6xclyfbcaa4rccv5cgqmc6jr41yz821wvpa2rww64djl0jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
@@ -4301,8 +4506,9 @@
     "42": {"version": "8", "sha256": "1g0aa6xclyfbcaa4rccv5cgqmc6jr41yz821wvpa2rww64djl0jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "43": {"version": "8", "sha256": "1g0aa6xclyfbcaa4rccv5cgqmc6jr41yz821wvpa2rww64djl0jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "44": {"version": "8", "sha256": "1g0aa6xclyfbcaa4rccv5cgqmc6jr41yz821wvpa2rww64djl0jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "45": {"version": "11", "sha256": "0sj7q82n5bm1iq72han5zlc7p4m9xp8v2665g8h5r50wi99ydljm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmcuXG5WZXJzaW9uIDk6IEdub21lIDQ1IGNoYW5nZXMgYnkgbWFubmphbmlAZ2l0aHViXG5WZXJzaW9uIDEwOiBtYW5uamFuaUBnaXRodWIgYWRkZWQgYSB0ZXN0IGJ1dHRvbiBpbnNpZGUgcHJlZnMiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "46": {"version": "11", "sha256": "0sj7q82n5bm1iq72han5zlc7p4m9xp8v2665g8h5r50wi99ydljm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmcuXG5WZXJzaW9uIDk6IEdub21lIDQ1IGNoYW5nZXMgYnkgbWFubmphbmlAZ2l0aHViXG5WZXJzaW9uIDEwOiBtYW5uamFuaUBnaXRodWIgYWRkZWQgYSB0ZXN0IGJ1dHRvbiBpbnNpZGUgcHJlZnMiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}
+    "45": {"version": "12", "sha256": "1j8mjliv870iszdmzpgnhy772ldcgnzydbczznc43zqblkmrp7za", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmcuXG5WZXJzaW9uIDk6IEdub21lIDQ1IGNoYW5nZXMgYnkgbWFubmphbmlAZ2l0aHViXG5WZXJzaW9uIDEwOiBtYW5uamFuaUBnaXRodWIgYWRkZWQgYSB0ZXN0IGJ1dHRvbiBpbnNpZGUgcHJlZnMiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "46": {"version": "12", "sha256": "1j8mjliv870iszdmzpgnhy772ldcgnzydbczznc43zqblkmrp7za", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmcuXG5WZXJzaW9uIDk6IEdub21lIDQ1IGNoYW5nZXMgYnkgbWFubmphbmlAZ2l0aHViXG5WZXJzaW9uIDEwOiBtYW5uamFuaUBnaXRodWIgYWRkZWQgYSB0ZXN0IGJ1dHRvbiBpbnNpZGUgcHJlZnMiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "47": {"version": "12", "sha256": "1j8mjliv870iszdmzpgnhy772ldcgnzydbczznc43zqblkmrp7za", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmcuXG5WZXJzaW9uIDk6IEdub21lIDQ1IGNoYW5nZXMgYnkgbWFubmphbmlAZ2l0aHViXG5WZXJzaW9uIDEwOiBtYW5uamFuaUBnaXRodWIgYWRkZWQgYSB0ZXN0IGJ1dHRvbiBpbnNpZGUgcHJlZnMiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
 , {"uuid": "gnome-extension-brightness@bruno.englert.gitlab.com", "name": "Adjust Display Brightness", "pname": "adjust-display-brightness", "description": "Simple GNOME extension to control displays' brightness via DDC. It requires ddcutil to be installed, I2C permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4652/adjust-display-brightness/", "shell_version_map": {
     "40": {"version": "27", "sha256": "1sdq0wlnj6dib9lgjilk8xrxzh5lk63s8n5hcgky0jqbp9qvb5s7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
@@ -4311,14 +4517,15 @@
     "43": {"version": "27", "sha256": "1sdq0wlnj6dib9lgjilk8xrxzh5lk63s8n5hcgky0jqbp9qvb5s7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
     "44": {"version": "27", "sha256": "1sdq0wlnj6dib9lgjilk8xrxzh5lk63s8n5hcgky0jqbp9qvb5s7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}
   }}
-, {"uuid": "date-menu-formatter@marcinjakubowski.github.com", "name": "Date Menu Formatter", "pname": "date-menu-formatter", "description": "Allows customization of the date display in the panel.\n\nMight be especially useful if you're using a horizontal panel which does not at all work well with the default date display.\n\nCHANGELOG\nVersion 5: added support for multiple Dash To Panel panels\nVersion 6: fixed issues on earlier Gnome Shell versions\nVersion 10: fixed clock hover style (by bomdia)\nVersion 11: Gnome 45 update by andyholmes@github\nVersion 12: added support for advanced formatters by bomdia@github\nVersion 15: added text alignment choice by bomdia@github", "link": "https://extensions.gnome.org/extension/4655/date-menu-formatter/", "shell_version_map": {
+, {"uuid": "date-menu-formatter@marcinjakubowski.github.com", "name": "Date Menu Formatter", "pname": "date-menu-formatter", "description": "Allows customization of the date display in the panel.\n\nMight be especially useful if you're using a horizontal panel which does not at all work well with the default date display.\n\nCHANGELOG\nVersion 5: added support for multiple Dash To Panel panels\nVersion 6: fixed issues on earlier Gnome Shell versions\nVersion 10: fixed clock hover style (by bomdia)\nVersion 11: Gnome 45 update by andyholmes@github\nVersion 12: added support for advanced formatters by bomdia@github\nVersion 15: added text alignment choice by bomdia@github\nVersion 16: Gnome 47 support, swatch formatter fixes by bomdia@github", "link": "https://extensions.gnome.org/extension/4655/date-menu-formatter/", "shell_version_map": {
     "40": {"version": "10", "sha256": "0scppmfd13xdzd3bs1jsl4hbihvpp25p4gn30ji8fx40rd28w662", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSkiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "41": {"version": "10", "sha256": "0scppmfd13xdzd3bs1jsl4hbihvpp25p4gn30ji8fx40rd28w662", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSkiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "42": {"version": "10", "sha256": "0scppmfd13xdzd3bs1jsl4hbihvpp25p4gn30ji8fx40rd28w662", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSkiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "43": {"version": "10", "sha256": "0scppmfd13xdzd3bs1jsl4hbihvpp25p4gn30ji8fx40rd28w662", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSkiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "44": {"version": "10", "sha256": "0scppmfd13xdzd3bs1jsl4hbihvpp25p4gn30ji8fx40rd28w662", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSkiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "45": {"version": "15", "sha256": "06h2i65r15migijh5sgdyrsmsln4k0sfi7848a048jrdas2v85ga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSlcblZlcnNpb24gMTE6IEdub21lIDQ1IHVwZGF0ZSBieSBhbmR5aG9sbWVzQGdpdGh1YlxuVmVyc2lvbiAxMjogYWRkZWQgc3VwcG9ydCBmb3IgYWR2YW5jZWQgZm9ybWF0dGVycyBieSBib21kaWFAZ2l0aHViXG5WZXJzaW9uIDE1OiBhZGRlZCB0ZXh0IGFsaWdubWVudCBjaG9pY2UgYnkgYm9tZGlhQGdpdGh1YiIsCiAgImdldHRleHQtZG9tYWluIjogImRhdGUtbWVudS1mb3JtYXR0ZXIiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "46": {"version": "15", "sha256": "06h2i65r15migijh5sgdyrsmsln4k0sfi7848a048jrdas2v85ga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSlcblZlcnNpb24gMTE6IEdub21lIDQ1IHVwZGF0ZSBieSBhbmR5aG9sbWVzQGdpdGh1YlxuVmVyc2lvbiAxMjogYWRkZWQgc3VwcG9ydCBmb3IgYWR2YW5jZWQgZm9ybWF0dGVycyBieSBib21kaWFAZ2l0aHViXG5WZXJzaW9uIDE1OiBhZGRlZCB0ZXh0IGFsaWdubWVudCBjaG9pY2UgYnkgYm9tZGlhQGdpdGh1YiIsCiAgImdldHRleHQtZG9tYWluIjogImRhdGUtbWVudS1mb3JtYXR0ZXIiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAidXVpZCI6ICJkYXRlLW1lbnUtZm9ybWF0dGVyQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
+    "45": {"version": "16", "sha256": "1syaxwffb0jy3ly6bqlrmyj27g9v6swal9hk4z2sjdz7xni7sdhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSlcblZlcnNpb24gMTE6IEdub21lIDQ1IHVwZGF0ZSBieSBhbmR5aG9sbWVzQGdpdGh1YlxuVmVyc2lvbiAxMjogYWRkZWQgc3VwcG9ydCBmb3IgYWR2YW5jZWQgZm9ybWF0dGVycyBieSBib21kaWFAZ2l0aHViXG5WZXJzaW9uIDE1OiBhZGRlZCB0ZXh0IGFsaWdubWVudCBjaG9pY2UgYnkgYm9tZGlhQGdpdGh1YiIsCiAgImdldHRleHQtZG9tYWluIjogImRhdGUtbWVudS1mb3JtYXR0ZXIiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "46": {"version": "16", "sha256": "1syaxwffb0jy3ly6bqlrmyj27g9v6swal9hk4z2sjdz7xni7sdhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSlcblZlcnNpb24gMTE6IEdub21lIDQ1IHVwZGF0ZSBieSBhbmR5aG9sbWVzQGdpdGh1YlxuVmVyc2lvbiAxMjogYWRkZWQgc3VwcG9ydCBmb3IgYWR2YW5jZWQgZm9ybWF0dGVycyBieSBib21kaWFAZ2l0aHViXG5WZXJzaW9uIDE1OiBhZGRlZCB0ZXh0IGFsaWdubWVudCBjaG9pY2UgYnkgYm9tZGlhQGdpdGh1YiIsCiAgImdldHRleHQtZG9tYWluIjogImRhdGUtbWVudS1mb3JtYXR0ZXIiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "47": {"version": "16", "sha256": "1syaxwffb0jy3ly6bqlrmyj27g9v6swal9hk4z2sjdz7xni7sdhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9uc1xuVmVyc2lvbiAxMDogZml4ZWQgY2xvY2sgaG92ZXIgc3R5bGUgKGJ5IGJvbWRpYSlcblZlcnNpb24gMTE6IEdub21lIDQ1IHVwZGF0ZSBieSBhbmR5aG9sbWVzQGdpdGh1YlxuVmVyc2lvbiAxMjogYWRkZWQgc3VwcG9ydCBmb3IgYWR2YW5jZWQgZm9ybWF0dGVycyBieSBib21kaWFAZ2l0aHViXG5WZXJzaW9uIDE1OiBhZGRlZCB0ZXh0IGFsaWdubWVudCBjaG9pY2UgYnkgYm9tZGlhQGdpdGh1YiIsCiAgImdldHRleHQtZG9tYWluIjogImRhdGUtbWVudS1mb3JtYXR0ZXIiLAogICJuYW1lIjogIkRhdGUgTWVudSBGb3JtYXR0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
   }}
 , {"uuid": "surf@diegonz.github.io", "name": "Surf", "pname": "surf", "description": "Visit URL or perform a web search with the terms provided directly from GNOME Shell", "link": "https://extensions.gnome.org/extension/4661/surf/", "shell_version_map": {
     "38": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -4330,8 +4537,9 @@
     "42": {"version": "5", "sha256": "1nnkyvppbga65dpmszv066hps12p0b5rcaimhn489x2bzhyiycn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUKfQ=="},
     "43": {"version": "9", "sha256": "14rmr9f3ln60v2p5zq02ji3k1zrxyb51sh3nhpri88rc5s3wld7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvY3VzdG9taXplLWNsb2NrLW9uLWxvY2stc2NyZWVuIiwKICAidXVpZCI6ICJDdXN0b21pemVDbG9ja09uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "7", "sha256": "0c9c08c61jm54sv80i3ffqaja1l0ji0dvw8vp774qnqfs5zih33r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvY3VzdG9taXplLWNsb2NrLW9uLWxvY2stc2NyZWVuIiwKICAidXVpZCI6ICJDdXN0b21pemVDbG9ja09uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNwp9"},
-    "45": {"version": "15", "sha256": "0fc1s3amkhp5xl6jim9lwhlbvqdfgw4n22brrwhg1340394zsyrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9taXplIENsb2NrIG9uIExvY2sgU2NyZWVuIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtY2xvY2stb24tbG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE1Cn0="},
-    "46": {"version": "15", "sha256": "0fc1s3amkhp5xl6jim9lwhlbvqdfgw4n22brrwhg1340394zsyrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9taXplIENsb2NrIG9uIExvY2sgU2NyZWVuIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtY2xvY2stb24tbG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE1Cn0="}
+    "45": {"version": "17", "sha256": "0dn4yxhz1gjqbhgvxffpk54ffj9myq24afxx8zp3lx3j12004d72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9taXplIENsb2NrIG9uIExvY2sgU2NyZWVuIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtY2xvY2stb24tbG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9jdXN0b21pemUtY2xvY2stb24tbG9jay1zY3JlZW4iLAogICJ1dWlkIjogIkN1c3RvbWl6ZUNsb2NrT25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "46": {"version": "17", "sha256": "0dn4yxhz1gjqbhgvxffpk54ffj9myq24afxx8zp3lx3j12004d72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9taXplIENsb2NrIG9uIExvY2sgU2NyZWVuIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtY2xvY2stb24tbG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9jdXN0b21pemUtY2xvY2stb24tbG9jay1zY3JlZW4iLAogICJ1dWlkIjogIkN1c3RvbWl6ZUNsb2NrT25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "47": {"version": "17", "sha256": "0dn4yxhz1gjqbhgvxffpk54ffj9myq24afxx8zp3lx3j12004d72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9taXplIENsb2NrIG9uIExvY2sgU2NyZWVuIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtY2xvY2stb24tbG9ja3NjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9jdXN0b21pemUtY2xvY2stb24tbG9jay1zY3JlZW4iLAogICJ1dWlkIjogIkN1c3RvbWl6ZUNsb2NrT25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"}
   }}
 , {"uuid": "LeftClock@adityashrivastava.tk", "name": "Left Clock", "pname": "left-clock", "description": "Replaces the activity button with clock and moves it to left side of top bar.", "link": "https://extensions.gnome.org/extension/4667/left-clock/", "shell_version_map": {
     "40": {"version": "12", "sha256": "02fv3jdmmjvyf4cyna1p7jdg3q8n5604i4ng8jq4y6ljn7insvyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSBhY3Rpdml0eSBidXR0b24gd2l0aCBjbG9jayBhbmQgbW92ZXMgaXQgdG8gbGVmdCBzaWRlIG9mIHRvcCBiYXIuIiwKICAibmFtZSI6ICJMZWZ0IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZGl0eWEtc2hyaS9MZWZ0LUNsb2NrIiwKICAidXVpZCI6ICJMZWZ0Q2xvY2tAYWRpdHlhc2hyaXZhc3RhdmEudGsiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
@@ -4372,8 +4580,9 @@
     "42": {"version": "42", "sha256": "1xyfpgdnl2fhvx0pw4f53h54smw6lj7w6pmxdp93wpz1h0mjh0ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="},
     "43": {"version": "42", "sha256": "1xyfpgdnl2fhvx0pw4f53h54smw6lj7w6pmxdp93wpz1h0mjh0ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="},
     "44": {"version": "42", "sha256": "1xyfpgdnl2fhvx0pw4f53h54smw6lj7w6pmxdp93wpz1h0mjh0ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="},
-    "45": {"version": "41", "sha256": "0sbdsxs0i8yasrrzqyyc69jjc2f67ilkhqgvcmmy4cb7k1dm7idh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="},
-    "46": {"version": "41", "sha256": "0sbdsxs0i8yasrrzqyyc69jjc2f67ilkhqgvcmmy4cb7k1dm7idh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}
+    "45": {"version": "43", "sha256": "1qm6ksfpjd9ifkj68g530r30x8kambw7z004kawjgj6b6d7yvw4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
+    "46": {"version": "43", "sha256": "1qm6ksfpjd9ifkj68g530r30x8kambw7z004kawjgj6b6d7yvw4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
+    "47": {"version": "43", "sha256": "1qm6ksfpjd9ifkj68g530r30x8kambw7z004kawjgj6b6d7yvw4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}
   }}
 , {"uuid": "babar-lite@fthx", "name": "BaBar Lite", "pname": "babar-task-bar-lite-for-gnome-40", "description": "NOT MAINTAINED ANYMORE\nPLEASE USE:\nhttps://extensions.gnome.org/extension/6556/task-up/ (Babar-like)\nOR\nhttps://extensions.gnome.org/extension/5143/dashbar/ (Dash-like)\n\nTask bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Change 'Places' label to an icon. No settings, use BaBar classic for that.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/4681/babar-task-bar-lite-for-gnome-40/", "shell_version_map": {
     "40": {"version": "2", "sha256": "163g6mabkcmf05ja4bpj7kkc0c7rs4hsf5xyfm2z4npiscjha8n7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVGFzayBiYXIuIEFwcCBncmlkLCBmYXZvcml0ZXMsIHdvcmtzcGFjZXMgYW5kIHRhc2tzIGluIHBhbmVsLiBMaWdodCBleHRlbnNpb24uXG5cbiBSZXBsYWNlICdBY3Rpdml0aWVzJyBidXR0b24gYnkgYWxsIGN1cnJlbnQgd29ya3NwYWNlcyBhbmQgYXBwcyBidXR0b25zLiBTd2l0Y2ggd29ya3NwYWNlL2FwcCBvciB0b2dnbGUgb3ZlcnZpZXcgYnkgY2xpY2tpbmcgb24gdGhlc2UgYnV0dG9ucy4gRHJhZyBhbmQgZHJvcCBmYXZvcml0ZSwgdGFzaywgZGFzaCBpdGVtIG9yIGFwcCBncmlkIGl0ZW0gdG8gYW55IHdvcmtzcGFjZSAoeW91IGNhbm5vdCByZW9yZGVyIHRhc2tzIGluc2lkZSBhIHdvcmtzcGFjZSkuIENoYW5nZSAnUGxhY2VzJyBsYWJlbCB0byBhbiBpY29uLiBObyBzZXR0aW5ncywgdXNlIEJhQmFyIGNsYXNzaWMgZm9yIHRoYXQuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJCYUJhciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9iYWJhci1saXRlIiwKICAidXVpZCI6ICJiYWJhci1saXRlQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -4387,24 +4596,27 @@
     "42": {"version": "12", "sha256": "12fdmnjsmr83q7qcl3nlmvgsw43jalnmcc9ffb8811l11gl0fxnm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "43": {"version": "12", "sha256": "12fdmnjsmr83q7qcl3nlmvgsw43jalnmcc9ffb8811l11gl0fxnm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "44": {"version": "12", "sha256": "12fdmnjsmr83q7qcl3nlmvgsw43jalnmcc9ffb8811l11gl0fxnm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "45": {"version": "17", "sha256": "02l09zii32n4l9rsgghgw5pp4ljxypzd52ji42yrwzmlnv0fhg82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
-    "46": {"version": "17", "sha256": "02l09zii32n4l9rsgghgw5pp4ljxypzd52ji42yrwzmlnv0fhg82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}
+    "45": {"version": "18", "sha256": "11i8awslgjrf5zmlscyi4vziwynl8c7gmm8fgdp5ahx98pr848kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXVzZWxlc3MtZ2FwcyIsCiAgInV1aWQiOiAidXNlbGVzcy1nYXBzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
+    "46": {"version": "18", "sha256": "11i8awslgjrf5zmlscyi4vziwynl8c7gmm8fgdp5ahx98pr848kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXVzZWxlc3MtZ2FwcyIsCiAgInV1aWQiOiAidXNlbGVzcy1nYXBzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
+    "47": {"version": "18", "sha256": "11i8awslgjrf5zmlscyi4vziwynl8c7gmm8fgdp5ahx98pr848kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXVzZWxlc3MtZ2FwcyIsCiAgInV1aWQiOiAidXNlbGVzcy1nYXBzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="}
   }}
 , {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of entered web server URLs using emojis.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {
     "40": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="},
     "42": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="},
     "43": {"version": "12", "sha256": "137wbizi57gpdp5dk38mxsi82ndrh11axj6h34spwyag000rlili", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "137wbizi57gpdp5dk38mxsi82ndrh11axj6h34spwyag000rlili", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "45": {"version": "26", "sha256": "1ymxar02jyl75kl0jw6ssflx3ir1cxh8mlvx91rmr0x3m3x5n575", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAyNgp9"},
-    "46": {"version": "26", "sha256": "1ymxar02jyl75kl0jw6ssflx3ir1cxh8mlvx91rmr0x3m3x5n575", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAyNgp9"}
+    "45": {"version": "29", "sha256": "0anrb1z726aad1ip53pmhli5l4a188s4an0ywl7nqxxnbg970m15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAyOQp9"},
+    "46": {"version": "29", "sha256": "0anrb1z726aad1ip53pmhli5l4a188s4an0ywl7nqxxnbg970m15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAyOQp9"},
+    "47": {"version": "31", "sha256": "06d7ywwp37gbnfzm3a0h06r9xmvnif4fxwf0yp6k9frmpnfav4gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDMxCn0="}
   }}
 , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {
     "41": {"version": "7", "sha256": "0bi73fpvkfj3y6f440fw5xv1294szhisa2qyzz4rwh7n4n49xhqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
     "42": {"version": "7", "sha256": "0bi73fpvkfj3y6f440fw5xv1294szhisa2qyzz4rwh7n4n49xhqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
     "43": {"version": "7", "sha256": "0bi73fpvkfj3y6f440fw5xv1294szhisa2qyzz4rwh7n4n49xhqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "0bi73fpvkfj3y6f440fw5xv1294szhisa2qyzz4rwh7n4n49xhqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
-    "45": {"version": "10", "sha256": "1yy0vaqkxj22kpn7l89ssw3168dr39ksly9hcrs5sr2adagdbl6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2hyaXN0b3BoZXItbC9mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZm9jdXMtZm9sbG93cy13b3Jrc3BhY2VAY2hyaXN0b3BoZXIubHVlYmJlbWVpZXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "46": {"version": "10", "sha256": "1yy0vaqkxj22kpn7l89ssw3168dr39ksly9hcrs5sr2adagdbl6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2hyaXN0b3BoZXItbC9mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZm9jdXMtZm9sbG93cy13b3Jrc3BhY2VAY2hyaXN0b3BoZXIubHVlYmJlbWVpZXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "11", "sha256": "0d1scq7vl0khp0ahvah566pdzgflph47bkaqx1zlwpxs0chnsz7w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "46": {"version": "11", "sha256": "0d1scq7vl0khp0ahvah566pdzgflph47bkaqx1zlwpxs0chnsz7w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "47": {"version": "11", "sha256": "0d1scq7vl0khp0ahvah566pdzgflph47bkaqx1zlwpxs0chnsz7w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1mb2xsb3dzLXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}
   }}
 , {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox, but may work with few other browsers too.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {
     "38": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -4413,8 +4625,9 @@
     "42": {"version": "6", "sha256": "1112q0wmsk142n1nq9id0hah3y3dfq9y2p65ggagyxl52yk34l6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "43": {"version": "6", "sha256": "1112q0wmsk142n1nq9id0hah3y3dfq9y2p65ggagyxl52yk34l6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "44": {"version": "6", "sha256": "1112q0wmsk142n1nq9id0hah3y3dfq9y2p65ggagyxl52yk34l6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "45": {"version": "8", "sha256": "1gwn5wgqhz2nh8icj1byv7kgs8sk16mkzmj2zf7y0svprbl5vf7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCwgYnV0IG1heSB3b3JrIHdpdGggZmV3IG90aGVyIGJyb3dzZXJzIHRvby4iLAogICJleHRlbnNpb24taWQiOiAicGlwLW9uLXRvcCIsCiAgImdldHRleHQtZG9tYWluIjogInBpcC1vbi10b3AiLAogICJuYW1lIjogIlBpUCBvbiB0b3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwLW9uLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFmb3N0YXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBpcC1vbi10b3AiLAogICJ1dWlkIjogInBpcC1vbi10b3BAcmFmb3N0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "8", "sha256": "1gwn5wgqhz2nh8icj1byv7kgs8sk16mkzmj2zf7y0svprbl5vf7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCwgYnV0IG1heSB3b3JrIHdpdGggZmV3IG90aGVyIGJyb3dzZXJzIHRvby4iLAogICJleHRlbnNpb24taWQiOiAicGlwLW9uLXRvcCIsCiAgImdldHRleHQtZG9tYWluIjogInBpcC1vbi10b3AiLAogICJuYW1lIjogIlBpUCBvbiB0b3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwLW9uLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFmb3N0YXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBpcC1vbi10b3AiLAogICJ1dWlkIjogInBpcC1vbi10b3BAcmFmb3N0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "45": {"version": "10", "sha256": "0pxridkqa6c3hsin0ig4jcjha3l6hjajldjgm5zijsl5h7gbnmjf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCwgYnV0IG1heSB3b3JrIHdpdGggZmV3IG90aGVyIGJyb3dzZXJzIHRvby4iLAogICJleHRlbnNpb24taWQiOiAicGlwLW9uLXRvcCIsCiAgImdldHRleHQtZG9tYWluIjogInBpcC1vbi10b3AiLAogICJuYW1lIjogIlBpUCBvbiB0b3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwLW9uLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "46": {"version": "10", "sha256": "0pxridkqa6c3hsin0ig4jcjha3l6hjajldjgm5zijsl5h7gbnmjf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCwgYnV0IG1heSB3b3JrIHdpdGggZmV3IG90aGVyIGJyb3dzZXJzIHRvby4iLAogICJleHRlbnNpb24taWQiOiAicGlwLW9uLXRvcCIsCiAgImdldHRleHQtZG9tYWluIjogInBpcC1vbi10b3AiLAogICJuYW1lIjogIlBpUCBvbiB0b3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwLW9uLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "47": {"version": "10", "sha256": "0pxridkqa6c3hsin0ig4jcjha3l6hjajldjgm5zijsl5h7gbnmjf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCwgYnV0IG1heSB3b3JrIHdpdGggZmV3IG90aGVyIGJyb3dzZXJzIHRvby4iLAogICJleHRlbnNpb24taWQiOiAicGlwLW9uLXRvcCIsCiAgImdldHRleHQtZG9tYWluIjogInBpcC1vbi10b3AiLAogICJuYW1lIjogIlBpUCBvbiB0b3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwLW9uLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
   }}
 , {"uuid": "roundedSystemMenuButtons@pratap.fastmail.fm", "name": "Rounded System Menu Buttons", "pname": "rounded-system-menu-buttons", "description": "Rounded System Menu Buttons", "link": "https://extensions.gnome.org/extension/4693/rounded-system-menu-buttons/", "shell_version_map": {
     "38": {"version": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
@@ -4434,8 +4647,9 @@
     "42": {"version": "9", "sha256": "06vgjcbmsg0xvrrrffafzdlj85w8fpqbin2xixk38p2w6skrh6fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "06vgjcbmsg0xvrrrffafzdlj85w8fpqbin2xixk38p2w6skrh6fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "9", "sha256": "06vgjcbmsg0xvrrrffafzdlj85w8fpqbin2xixk38p2w6skrh6fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "45": {"version": "12", "sha256": "0anzyymx6dxxdrqidy2i8kd02xgp29si7krwp6qw62yd5zsh3a7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "46": {"version": "12", "sha256": "0anzyymx6dxxdrqidy2i8kd02xgp29si7krwp6qw62yd5zsh3a7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}
+    "45": {"version": "13", "sha256": "044wwlzdxlx9zin2smhjxpygw6bz46kzs0avlf3p2659sgc2ii04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaGlnaGxpZ2h0LWZvY3VzIiwKICAidXVpZCI6ICJoaWdobGlnaHQtZm9jdXNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "46": {"version": "13", "sha256": "044wwlzdxlx9zin2smhjxpygw6bz46kzs0avlf3p2659sgc2ii04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaGlnaGxpZ2h0LWZvY3VzIiwKICAidXVpZCI6ICJoaWdobGlnaHQtZm9jdXNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "47": {"version": "13", "sha256": "044wwlzdxlx9zin2smhjxpygw6bz46kzs0avlf3p2659sgc2ii04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaGlnaGxpZ2h0LWZvY3VzIiwKICAidXVpZCI6ICJoaWdobGlnaHQtZm9jdXNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
   }}
 , {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {
     "40": {"version": "10", "sha256": "1q1y7ldiay5frw52fhfz7fs3jx3f23jkcir8ilji2hmkj64p0vkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
@@ -4443,8 +4657,9 @@
     "42": {"version": "10", "sha256": "1q1y7ldiay5frw52fhfz7fs3jx3f23jkcir8ilji2hmkj64p0vkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "43": {"version": "10", "sha256": "1q1y7ldiay5frw52fhfz7fs3jx3f23jkcir8ilji2hmkj64p0vkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "44": {"version": "10", "sha256": "1q1y7ldiay5frw52fhfz7fs3jx3f23jkcir8ilji2hmkj64p0vkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "45": {"version": "13", "sha256": "0mcllban855ccm2sy9cyqgfcpgqpi5yha55fq3rdj9y8p9srfsm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgIm5hbWUiOiAiQXdlc29tZSBUaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2Vzb21lLXRpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "46": {"version": "13", "sha256": "0mcllban855ccm2sy9cyqgfcpgqpi5yha55fq3rdj9y8p9srfsm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgIm5hbWUiOiAiQXdlc29tZSBUaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2Vzb21lLXRpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
+    "45": {"version": "14", "sha256": "1ns2wcc7idks2dz9dlckcx87hwwyi0rdyv3v647zdih5n1lwyv3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgIm5hbWUiOiAiQXdlc29tZSBUaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2Vzb21lLXRpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "46": {"version": "14", "sha256": "1ns2wcc7idks2dz9dlckcx87hwwyi0rdyv3v647zdih5n1lwyv3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgIm5hbWUiOiAiQXdlc29tZSBUaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2Vzb21lLXRpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "47": {"version": "14", "sha256": "1ns2wcc7idks2dz9dlckcx87hwwyi0rdyv3v647zdih5n1lwyv3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgIm5hbWUiOiAiQXdlc29tZSBUaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2Vzb21lLXRpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
   }}
 , {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock.\n\n New version and no prefs for 45+ (maybe coming soon).\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview and will hide when you leave the dash. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open. Scroll on the dock to change workspace. Some preferences in UI (thanks @rastersoft).\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {
     "40": {"version": "63", "sha256": "0wli9j79g06yw68b2zhljgnkvpdgvbqsb4lqwyfa4z9kgig4sjsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDYzCn0="},
@@ -4453,7 +4668,8 @@
     "43": {"version": "63", "sha256": "0wli9j79g06yw68b2zhljgnkvpdgvbqsb4lqwyfa4z9kgig4sjsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDYzCn0="},
     "44": {"version": "63", "sha256": "0wli9j79g06yw68b2zhljgnkvpdgvbqsb4lqwyfa4z9kgig4sjsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDYzCn0="},
     "45": {"version": "67", "sha256": "1clq49mzpar76kccfl4yz445jpdkbz7fib1r8vbcvsl7cbvfranf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2suXG5cbiBOZXcgdmVyc2lvbiBhbmQgbm8gcHJlZnMgZm9yIDQ1KyAobWF5YmUgY29taW5nIHNvb24pLlxuXG4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjcKfQ=="},
-    "46": {"version": "71", "sha256": "15fs0aiwck73pkxxyzk6vgigjpcmy8r3awdiiik5c37lc0swx82y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2suXG5cbiBOZXcgdmVyc2lvbiBhbmQgbm8gcHJlZnMgZm9yIDQ1KyAobWF5YmUgY29taW5nIHNvb24pLlxuXG4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNzEKfQ=="}
+    "46": {"version": "72", "sha256": "1fxdbf2gjn1xkjvlcszjh8kib5drsmcng22z7kapc52fy0sn8ddq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2suXG5cbiBOZXcgdmVyc2lvbiBhbmQgbm8gcHJlZnMgZm9yIDQ1KyAobWF5YmUgY29taW5nIHNvb24pLlxuXG4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDcyCn0="},
+    "47": {"version": "72", "sha256": "1fxdbf2gjn1xkjvlcszjh8kib5drsmcng22z7kapc52fy0sn8ddq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2suXG5cbiBOZXcgdmVyc2lvbiBhbmQgbm8gcHJlZnMgZm9yIDQ1KyAobWF5YmUgY29taW5nIHNvb24pLlxuXG4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDcyCn0="}
   }}
 , {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close open windows gracefully and save them as a session. And you can restore them when necessary manually or automatically at startup. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Restore the previous session at startup. disabled by default.\n- Save running apps and windows automatically when necessary, this will be used to restore the previous session at startup.\n- Close running apps and windows automatically before Log Out, Restart, Power Off. disabled by default.\n- Close running windows gracefully\n- Close apps with multiple windows gracefully via ydotool so you don't lose sessions of this app (See also: How to make Close by rules work)\n- Save running apps and windows manually\n- Restore a selected session at startup (See also: #9). disabled by default.\n- Restore a saved session manually\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Restore 2 column window tiling\n- Stash all supported window states so that those states will be restored after gnome shell restarts via Alt+F2 -> r or killall -3 gnome-shell.\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Remove saved session to trash\n- Search saved session by the session name fuzzily\n\nFor more information, please visit https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager/blob/feature-close-save-session-while-logout/README.md.\n\nPlease report issues on Github.", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {
     "40": {"version": "41", "sha256": "09pvlskx2z4dh7wnyf934dyfs8vkp6qfyshqi5j03i7nmfxipwkl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gUmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IHdoZW4gbmVjZXNzYXJ5LCB0aGlzIHdpbGwgYmUgdXNlZCB0byByZXN0b3JlIHRoZSBwcmV2aW91cyBzZXNzaW9uIGF0IHN0YXJ0dXAuXG4tIENsb3NlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IGJlZm9yZSBMb2cgT3V0LCBSZXN0YXJ0LCBQb3dlciBPZmYuIGRpc2FibGVkIGJ5IGRlZmF1bHQuXG4tIENsb3NlIHJ1bm5pbmcgd2luZG93cyBncmFjZWZ1bGx5XG4tIENsb3NlIGFwcHMgd2l0aCBtdWx0aXBsZSB3aW5kb3dzIGdyYWNlZnVsbHkgdmlhIHlkb3Rvb2wgc28geW91IGRvbid0IGxvc2Ugc2Vzc2lvbnMgb2YgdGhpcyBhcHAgKFNlZSBhbHNvOiBIb3cgdG8gbWFrZSBDbG9zZSBieSBydWxlcyB3b3JrKVxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBtYW51YWxseVxuLSBSZXN0b3JlIGEgc2VsZWN0ZWQgc2Vzc2lvbiBhdCBzdGFydHVwIChTZWUgYWxzbzogIzkpLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBSZXN0b3JlIGEgc2F2ZWQgc2Vzc2lvbiBtYW51YWxseVxuLSBSZXN0b3JlIHdpbmRvdyBzdGF0ZSwgaW5jbHVkaW5nIEFsd2F5cyBvbiBUb3AsIEFsd2F5cyBvbiBWaXNpYmxlIFdvcmtzcGFjZSBhbmQgbWF4aW1pemF0aW9uXG4tIFJlc3RvcmUgd2luZG93IHdvcmtzcGFjZSwgc2l6ZSBhbmQgcG9zaXRpb25cbi0gUmVzdG9yZSAyIGNvbHVtbiB3aW5kb3cgdGlsaW5nXG4tIFN0YXNoIGFsbCBzdXBwb3J0ZWQgd2luZG93IHN0YXRlcyBzbyB0aGF0IHRob3NlIHN0YXRlcyB3aWxsIGJlIHJlc3RvcmVkIGFmdGVyIGdub21lIHNoZWxsIHJlc3RhcnRzIHZpYSBBbHQrRjIgLT4gciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZC5cblxuUGxlYXNlIHJlcG9ydCBpc3N1ZXMgb24gR2l0aHViLiIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
@@ -4508,8 +4724,9 @@
     "42": {"version": "6", "sha256": "07jrp8likl7jqzhmyr1bi1kjnmqmj5qpfl07dxncz8sfligiiq1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "43": {"version": "6", "sha256": "07jrp8likl7jqzhmyr1bi1kjnmqmj5qpfl07dxncz8sfligiiq1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "44": {"version": "6", "sha256": "07jrp8likl7jqzhmyr1bi1kjnmqmj5qpfl07dxncz8sfligiiq1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "45": {"version": "8", "sha256": "0bynqyh2iknfdbq9q4r5bqi2mdi85v6zn793hbm8i582hlag4i8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZSBrZXlib2FyZCBsYXlvdXQgb24gdGhlIGxvY2sgc2NyZWVuIHRvIHRoZSBwcmltYXJ5IG9uZS5cblxuVGhpcyBpcyBhIHNtYWxsLCBzaW1wbGUgZXh0ZW5zaW9uIHRoYXQgc29sdmVzIGFuIGFubm95aW5nIGlzc3VlIGZvciB1c2VycyB3aXRoIHNldmVyYWwga2V5Ym9hcmQgbGF5b3V0cyAodW50aWwgaXQgZ2V0cyBzb2x2ZWQgdXBzdHJlYW0pLlxuXG5XaGVuZXZlciB0aGUgbG9jayBzY3JlZW4ga2lja3MgaW4sIHRoaXMgZXh0ZW5zaW9uIGNoZWNrcyBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBrZXlib2FyZCBsYXlvdXQgYW5kIHN3aXRjaGVzIGl0IHRvIHRoZSBwcmltYXJ5IG9uZSAodGhlIGZpcnN0IG9uZSBpbiB5b3VyIGxpc3Qgb2Yga2V5Ym9hcmQgbGF5b3V0cyBpbiBTZXR0aW5ncykuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "8", "sha256": "0bynqyh2iknfdbq9q4r5bqi2mdi85v6zn793hbm8i582hlag4i8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZSBrZXlib2FyZCBsYXlvdXQgb24gdGhlIGxvY2sgc2NyZWVuIHRvIHRoZSBwcmltYXJ5IG9uZS5cblxuVGhpcyBpcyBhIHNtYWxsLCBzaW1wbGUgZXh0ZW5zaW9uIHRoYXQgc29sdmVzIGFuIGFubm95aW5nIGlzc3VlIGZvciB1c2VycyB3aXRoIHNldmVyYWwga2V5Ym9hcmQgbGF5b3V0cyAodW50aWwgaXQgZ2V0cyBzb2x2ZWQgdXBzdHJlYW0pLlxuXG5XaGVuZXZlciB0aGUgbG9jayBzY3JlZW4ga2lja3MgaW4sIHRoaXMgZXh0ZW5zaW9uIGNoZWNrcyBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBrZXlib2FyZCBsYXlvdXQgYW5kIHN3aXRjaGVzIGl0IHRvIHRoZSBwcmltYXJ5IG9uZSAodGhlIGZpcnN0IG9uZSBpbiB5b3VyIGxpc3Qgb2Yga2V5Ym9hcmQgbGF5b3V0cyBpbiBTZXR0aW5ncykuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "45": {"version": "9", "sha256": "1xxpgnx7zhwrsg6zgi8d2bicgmari6q98v5l1y33kzwfdv0949cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZSBrZXlib2FyZCBsYXlvdXQgb24gdGhlIGxvY2sgc2NyZWVuIHRvIHRoZSBwcmltYXJ5IG9uZS5cblxuVGhpcyBpcyBhIHNtYWxsLCBzaW1wbGUgZXh0ZW5zaW9uIHRoYXQgc29sdmVzIGFuIGFubm95aW5nIGlzc3VlIGZvciB1c2VycyB3aXRoIHNldmVyYWwga2V5Ym9hcmQgbGF5b3V0cyAodW50aWwgaXQgZ2V0cyBzb2x2ZWQgdXBzdHJlYW0pLlxuXG5XaGVuZXZlciB0aGUgbG9jayBzY3JlZW4ga2lja3MgaW4sIHRoaXMgZXh0ZW5zaW9uIGNoZWNrcyBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBrZXlib2FyZCBsYXlvdXQgYW5kIHN3aXRjaGVzIGl0IHRvIHRoZSBwcmltYXJ5IG9uZSAodGhlIGZpcnN0IG9uZSBpbiB5b3VyIGxpc3Qgb2Yga2V5Ym9hcmQgbGF5b3V0cyBpbiBTZXR0aW5ncykuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "46": {"version": "9", "sha256": "1xxpgnx7zhwrsg6zgi8d2bicgmari6q98v5l1y33kzwfdv0949cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZSBrZXlib2FyZCBsYXlvdXQgb24gdGhlIGxvY2sgc2NyZWVuIHRvIHRoZSBwcmltYXJ5IG9uZS5cblxuVGhpcyBpcyBhIHNtYWxsLCBzaW1wbGUgZXh0ZW5zaW9uIHRoYXQgc29sdmVzIGFuIGFubm95aW5nIGlzc3VlIGZvciB1c2VycyB3aXRoIHNldmVyYWwga2V5Ym9hcmQgbGF5b3V0cyAodW50aWwgaXQgZ2V0cyBzb2x2ZWQgdXBzdHJlYW0pLlxuXG5XaGVuZXZlciB0aGUgbG9jayBzY3JlZW4ga2lja3MgaW4sIHRoaXMgZXh0ZW5zaW9uIGNoZWNrcyBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBrZXlib2FyZCBsYXlvdXQgYW5kIHN3aXRjaGVzIGl0IHRvIHRoZSBwcmltYXJ5IG9uZSAodGhlIGZpcnN0IG9uZSBpbiB5b3VyIGxpc3Qgb2Yga2V5Ym9hcmQgbGF5b3V0cyBpbiBTZXR0aW5ncykuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "47": {"version": "9", "sha256": "1xxpgnx7zhwrsg6zgi8d2bicgmari6q98v5l1y33kzwfdv0949cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZSBrZXlib2FyZCBsYXlvdXQgb24gdGhlIGxvY2sgc2NyZWVuIHRvIHRoZSBwcmltYXJ5IG9uZS5cblxuVGhpcyBpcyBhIHNtYWxsLCBzaW1wbGUgZXh0ZW5zaW9uIHRoYXQgc29sdmVzIGFuIGFubm95aW5nIGlzc3VlIGZvciB1c2VycyB3aXRoIHNldmVyYWwga2V5Ym9hcmQgbGF5b3V0cyAodW50aWwgaXQgZ2V0cyBzb2x2ZWQgdXBzdHJlYW0pLlxuXG5XaGVuZXZlciB0aGUgbG9jayBzY3JlZW4ga2lja3MgaW4sIHRoaXMgZXh0ZW5zaW9uIGNoZWNrcyBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBrZXlib2FyZCBsYXlvdXQgYW5kIHN3aXRjaGVzIGl0IHRvIHRoZSBwcmltYXJ5IG9uZSAodGhlIGZpcnN0IG9uZSBpbiB5b3VyIGxpc3Qgb2Yga2V5Ym9hcmQgbGF5b3V0cyBpbiBTZXR0aW5ncykuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}
   }}
 , {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search and switch to browser tabs using GNOME overview/ArcMenu\n\nSee following github link for installing necessary browser extension and host app!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {
     "40": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -4523,17 +4740,18 @@
     "42": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "43": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "44": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
-    "45": {"version": "26", "sha256": "050inkl5y31xgl5lgw03yd8gi7sdcclk53g64dckrmr289zl6khp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="},
-    "46": {"version": "26", "sha256": "050inkl5y31xgl5lgw03yd8gi7sdcclk53g64dckrmr289zl6khp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}
+    "45": {"version": "27", "sha256": "1d7ylpqv2yncwhjqr83khl3qh7zy02h5m8zib7bbcm0zgm9ddibr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
+    "46": {"version": "27", "sha256": "1d7ylpqv2yncwhjqr83khl3qh7zy02h5m8zib7bbcm0zgm9ddibr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
+    "47": {"version": "27", "sha256": "1d7ylpqv2yncwhjqr83khl3qh7zy02h5m8zib7bbcm0zgm9ddibr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}
   }}
-, {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNew: the menu will be too big if your resolution is way too low like 800x600 I have implemented a compact option in the settings, if you use it the menu will become a two colomn compact format and will fit even on such a low resolution.\n\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus\n\nyou'll need to restart gnome-shell after upgrades so either reboot,\nlog out and back in again, or if your using X11 then alt+F2 then run r", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {
+, {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNew: the menu will be too big if your resolution is way too low like 800x600 I have implemented a compact option in the settings, if you use it the menu will become a two colomn compact format and will fit even on such a low resolution.\n\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus\n\nIn the past you needed to restart gnome-shell after upgrades so either reboot,\nlog out and back in again, or if your using X11 then alt+F2 then run r; But that should be good now in most cases.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {
     "40": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "41": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "42": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "43": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "44": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "45": {"version": "23", "sha256": "128c5qbm3sirk3slaxqallij1zr13jf9mfc50pr7dlv42bbgh864", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAyMwp9"},
-    "46": {"version": "36", "sha256": "02fzjndpf2xzah4nd01wjnkbnhz44qysc2ipkzkz519nrmgz25vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cblRoZSBjb21tcGFjdCBtb2RlIHVzZXMgY29kZSBmcm9tIHRoZSBBcHBzIE1lbnUgYnkgZm11ZWxsbmVyXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5OZXc6IHRoZSBtZW51IHdpbGwgYmUgdG9vIGJpZyBpZiB5b3VyIHJlc29sdXRpb24gaXMgd2F5IHRvbyBsb3cgbGlrZSA4MDB4NjAwIEkgaGF2ZSBpbXBsZW1lbnRlZCBhIGNvbXBhY3Qgb3B0aW9uIGluIHRoZSBzZXR0aW5ncywgaWYgeW91IHVzZSBpdCB0aGUgbWVudSB3aWxsIGJlY29tZSBhIHR3byBjb2xvbW4gY29tcGFjdCBmb3JtYXQgYW5kIHdpbGwgZml0IGV2ZW4gb24gc3VjaCBhIGxvdyByZXNvbHV0aW9uLlxuXG5EdXRjaCBsYW5ndWFnZSBzdXBwb3J0IGFkZGVkIGJ5IFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxueW91J2xsIG5lZWQgdG8gcmVzdGFydCBnbm9tZS1zaGVsbCBhZnRlciB1cGdyYWRlcyBzbyBlaXRoZXIgcmVib290LFxubG9nIG91dCBhbmQgYmFjayBpbiBhZ2Fpbiwgb3IgaWYgeW91ciB1c2luZyBYMTEgdGhlbiBhbHQrRjIgdGhlbiBydW4gciIsCiAgImdldHRleHQtZG9tYWluIjogImhwbGlwLW1lbnUyIiwKICAibmFtZSI6ICJBbHRlcm5hdGUgTWVudSBmb3IgSHBsaXAyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhwbGlwLW1lbnUyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
+    "46": {"version": "43", "sha256": "0ijp3bcd33mg13mk743siv2mzyksxy4f6jnv06d7vsl02873466d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cblRoZSBjb21tcGFjdCBtb2RlIHVzZXMgY29kZSBmcm9tIHRoZSBBcHBzIE1lbnUgYnkgZm11ZWxsbmVyXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5OZXc6IHRoZSBtZW51IHdpbGwgYmUgdG9vIGJpZyBpZiB5b3VyIHJlc29sdXRpb24gaXMgd2F5IHRvbyBsb3cgbGlrZSA4MDB4NjAwIEkgaGF2ZSBpbXBsZW1lbnRlZCBhIGNvbXBhY3Qgb3B0aW9uIGluIHRoZSBzZXR0aW5ncywgaWYgeW91IHVzZSBpdCB0aGUgbWVudSB3aWxsIGJlY29tZSBhIHR3byBjb2xvbW4gY29tcGFjdCBmb3JtYXQgYW5kIHdpbGwgZml0IGV2ZW4gb24gc3VjaCBhIGxvdyByZXNvbHV0aW9uLlxuXG5EdXRjaCBsYW5ndWFnZSBzdXBwb3J0IGFkZGVkIGJ5IFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuSW4gdGhlIHBhc3QgeW91IG5lZWRlZCB0byByZXN0YXJ0IGdub21lLXNoZWxsIGFmdGVyIHVwZ3JhZGVzIHNvIGVpdGhlciByZWJvb3QsXG5sb2cgb3V0IGFuZCBiYWNrIGluIGFnYWluLCBvciBpZiB5b3VyIHVzaW5nIFgxMSB0aGVuIGFsdCtGMiB0aGVuIHJ1biByOyBCdXQgdGhhdCBzaG91bGQgYmUgZ29vZCBub3cgaW4gbW9zdCBjYXNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDQzCn0="}
   }}
 , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "NOT MAINTAINED ANYMORE\n\nTop dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Scroll on dock or panel changes workspace. Preferences UI.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {
     "40": {"version": "3", "sha256": "18ikbd1hxlc6rd28dnif2x74g3q9gdkgxc6jpag6qh7c51qd5klz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVG9wIGRvY2sgZm9yIEdOT01FIDQwKy4gSG92ZXIgdG9wIHBhbmVsIGFuZCBHTk9NRSBTaGVsbCBkYXNoIGFwcGVhcnMgd2l0aG91dCBvdmVydmlldy5cblxuIFNjcm9sbCBvbiBkb2NrIG9yIHBhbmVsIGNoYW5nZXMgd29ya3NwYWNlLiBQcmVmZXJlbmNlcyBVSS5cblxuIERvZXMgdXNlIG5hdGl2ZSBHTk9NRSBTaGVsbCBEYXNoLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIFBsZWFzZSByZXBvcnQgYnVncyB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRhc2ggZnJvbSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGFzaC1mcm9tLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLWZyb20tcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -4545,7 +4763,7 @@
     "41": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "42": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
   }}
-, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {
+, {"uuid": "hidedate@hidedate.com", "name": "Hide Time", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {
     "38": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "40": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "41": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -4562,8 +4780,9 @@
     "42": {"version": "9", "sha256": "00k8nh5dwvdgbax9051yn8462axpsixfa45hw77j2gnlxfkx5577", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "43": {"version": "9", "sha256": "00k8nh5dwvdgbax9051yn8462axpsixfa45hw77j2gnlxfkx5577", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "44": {"version": "9", "sha256": "00k8nh5dwvdgbax9051yn8462axpsixfa45hw77j2gnlxfkx5577", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "45": {"version": "12", "sha256": "0s1gfa4a2dc658cd5j7j8d77id3cwxxk87n6rvhkprrdgz98rwfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnlha3Vha2UtZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "46": {"version": "12", "sha256": "0s1gfa4a2dc658cd5j7j8d77id3cwxxk87n6rvhkprrdgz98rwfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnlha3Vha2UtZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDEyCn0="}
+    "45": {"version": "13", "sha256": "0kcc56iq35jmhk9j333fwgvx4a4shlfyyhd5ic5fhnyjl5zppfm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnlha3Vha2UtZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"},
+    "46": {"version": "13", "sha256": "0kcc56iq35jmhk9j333fwgvx4a4shlfyyhd5ic5fhnyjl5zppfm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnlha3Vha2UtZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"},
+    "47": {"version": "13", "sha256": "0kcc56iq35jmhk9j333fwgvx4a4shlfyyhd5ic5fhnyjl5zppfm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnlha3Vha2UtZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}
   }}
 , {"uuid": "dnf-shotcuts@rx1310", "name": "Shortcuts for DNF", "pname": "shortcuts-for-dnf", "description": "A small extension that adds buttons to the panel to check for DNF updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4758/shortcuts-for-dnf/", "shell_version_map": {
     "38": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"},
@@ -4583,12 +4802,15 @@
     "40": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="},
     "41": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
-, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {
+, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel.", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {
     "40": {"version": "7", "sha256": "1gzamsnca391c92p4gr6z5hc45s16095r6bxi9pavz4j7hmmwqza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiA3Cn0="},
     "41": {"version": "7", "sha256": "1gzamsnca391c92p4gr6z5hc45s16095r6bxi9pavz4j7hmmwqza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiA3Cn0="},
     "42": {"version": "7", "sha256": "1gzamsnca391c92p4gr6z5hc45s16095r6bxi9pavz4j7hmmwqza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiA3Cn0="},
     "43": {"version": "7", "sha256": "1gzamsnca391c92p4gr6z5hc45s16095r6bxi9pavz4j7hmmwqza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "44": {"version": "7", "sha256": "1gzamsnca391c92p4gr6z5hc45s16095r6bxi9pavz4j7hmmwqza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiA3Cn0="}
+    "44": {"version": "7", "sha256": "1gzamsnca391c92p4gr6z5hc45s16095r6bxi9pavz4j7hmmwqza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "45": {"version": "10", "sha256": "19syxcbry630rqyyz7qjzyzqi4fl54xv1xxqnzyfvw0wb9f6xzsi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtZXNzYWdlcyIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "46": {"version": "10", "sha256": "19syxcbry630rqyyz7qjzyzqi4fl54xv1xxqnzyfvw0wb9f6xzsi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtZXNzYWdlcyIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "47": {"version": "10", "sha256": "19syxcbry630rqyyz7qjzyzqi4fl54xv1xxqnzyfvw0wb9f6xzsi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtZXNzYWdlcyIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
   }}
 , {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {
     "40": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
@@ -4619,8 +4841,9 @@
     "42": {"version": "4", "sha256": "07pycv9wkri4qk1nkrqrxykrcjfd0pqj525z74kcjy8ji85n63vn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "4", "sha256": "07pycv9wkri4qk1nkrqrxykrcjfd0pqj525z74kcjy8ji85n63vn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "44": {"version": "4", "sha256": "07pycv9wkri4qk1nkrqrxykrcjfd0pqj525z74kcjy8ji85n63vn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "45": {"version": "8", "sha256": "0xnzwymyvks9xwzwn3b6pm5p0ks5i6iyqw03kljqqy0g4dkjwks4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlZmF1bHQtd29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "8", "sha256": "0xnzwymyvks9xwzwn3b6pm5p0ks5i6iyqw03kljqqy0g4dkjwks4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlZmF1bHQtd29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "45": {"version": "9", "sha256": "0hnax46fpw0128iia4s170kzysjpj3381ngx9n3nqn2l5ig9d6h6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlZmF1bHQtd29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWF0ZXVzUm9kQ29zdGEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlZmF1bHQtd29ya3NwYWNlIiwKICAidXVpZCI6ICJkZWZhdWx0LXdvcmtzcGFjZUBtYXRldXNyb2Rjb3N0YS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "46": {"version": "9", "sha256": "0hnax46fpw0128iia4s170kzysjpj3381ngx9n3nqn2l5ig9d6h6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlZmF1bHQtd29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWF0ZXVzUm9kQ29zdGEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlZmF1bHQtd29ya3NwYWNlIiwKICAidXVpZCI6ICJkZWZhdWx0LXdvcmtzcGFjZUBtYXRldXNyb2Rjb3N0YS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "47": {"version": "9", "sha256": "0hnax46fpw0128iia4s170kzysjpj3381ngx9n3nqn2l5ig9d6h6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlZmF1bHQtd29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWF0ZXVzUm9kQ29zdGEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlZmF1bHQtd29ya3NwYWNlIiwKICAidXVpZCI6ICJkZWZhdWx0LXdvcmtzcGFjZUBtYXRldXNyb2Rjb3N0YS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}
   }}
 , {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "* Alt + Mouse control window\nDetailed instructions are on the home page and in config interface. \nDisable desktop BackgroundMenu, Disable Panel dragMode. \nAdd a gap at right screen edge. \nAdd Top-Left and Top-Right corner as hot coner.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {
     "40": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
@@ -4636,8 +4859,9 @@
     "42": {"version": "15", "sha256": "1xmni6cpab37cr5sfv1bcra8nmyjm2ajrk40jfc4872skxh5axxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUsCiAgInZlcnNpb24tbmFtZSI6ICI0NC4yIgp9"},
     "43": {"version": "15", "sha256": "1xmni6cpab37cr5sfv1bcra8nmyjm2ajrk40jfc4872skxh5axxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUsCiAgInZlcnNpb24tbmFtZSI6ICI0NC4yIgp9"},
     "44": {"version": "15", "sha256": "1xmni6cpab37cr5sfv1bcra8nmyjm2ajrk40jfc4872skxh5axxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUsCiAgInZlcnNpb24tbmFtZSI6ICI0NC4yIgp9"},
-    "45": {"version": "14", "sha256": "0gsq0ggfjdpk814iacan8q54cm3w4h0dfngwpj5z100jy8ir24v9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIiCn0="},
-    "46": {"version": "14", "sha256": "0gsq0ggfjdpk814iacan8q54cm3w4h0dfngwpj5z100jy8ir24v9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIiCn0="}
+    "45": {"version": "16", "sha256": "0zav1r8dvxwh3awi9fcxyz2vlpcizwi8ihq7920v65kkjshfd7hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "46": {"version": "16", "sha256": "0zav1r8dvxwh3awi9fcxyz2vlpcizwi8ihq7920v65kkjshfd7hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "47": {"version": "16", "sha256": "0zav1r8dvxwh3awi9fcxyz2vlpcizwi8ihq7920v65kkjshfd7hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZ2VvcmdkaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV1NNIChXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"}
   }}
 , {"uuid": "compare@eexpss.gmail.com", "name": "Compare or Open", "pname": "compare-filedir-from-clip", "description": "Copy/Select two Dirs/Files from anywhere such as `nautilus` or `gnome-terminal`, and then compare them (use `meld`) or open with Ctrl-O or open with context-menu.", "link": "https://extensions.gnome.org/extension/4789/compare-filedir-from-clip/", "shell_version_map": {
     "40": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="},
@@ -4649,8 +4873,9 @@
     "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"},
     "43": {"version": "9", "sha256": "0fj1bc209l2zz8cwllxm5nadd0hmvikf9d1ydfwc25l201czl68m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "12", "sha256": "14kxvp230ls2g657yl4zxnsz1f3rn9m20ykrmqmvsjkhcmgkkq30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "45": {"version": "20", "sha256": "0ykmczg7n5rbp84ldl385ia7x88r47i7vbgpc3gy66pah7l23fih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDIwCn0="},
-    "46": {"version": "20", "sha256": "0ykmczg7n5rbp84ldl385ia7x88r47i7vbgpc3gy66pah7l23fih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDIwCn0="}
+    "45": {"version": "22", "sha256": "00d30d19j8qas7hsp666ql719i1kcprvzcr4zcd5np18iamh8yyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCIsCiAgInV1aWQiOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgInZlcnNpb24iOiAyMgp9"},
+    "46": {"version": "22", "sha256": "00d30d19j8qas7hsp666ql719i1kcprvzcr4zcd5np18iamh8yyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCIsCiAgInV1aWQiOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgInZlcnNpb24iOiAyMgp9"},
+    "47": {"version": "22", "sha256": "00d30d19j8qas7hsp666ql719i1kcprvzcr4zcd5np18iamh8yyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCIsCiAgInV1aWQiOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgInZlcnNpb24iOiAyMgp9"}
   }}
 , {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Fork of Pop COSMIC: Binds Pop Launcher on Super-Key when Pop COSMIC Extension is disabled. \n\nSince Pop!_OS moves to its own desktop enviroment (COSMIC DE) and I left linux behind me this extension will not get continued. If someone is willing to port the extension to Gnome 45, get in touch with me on the repository page on GitHub.\n\nIf you want to change the support manually, modify '~/.local/share/gnome-shell/extensions/pop-launcher-super-key@ManeLippert/metadata.json' under 'shell-version' add the desired version (e.g '44' for GNOME 44).", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {
     "38": {"version": "10", "sha256": "05qdfqiscminv560finl4qy6747n9r1n54h1yx7k648wwxb31s9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkLiBcblxuU2luY2UgUG9wIV9PUyBtb3ZlcyB0byBpdHMgb3duIGRlc2t0b3AgZW52aXJvbWVudCAoQ09TTUlDIERFKSBhbmQgSSBsZWZ0IGxpbnV4IGJlaGluZCBtZSB0aGlzIGV4dGVuc2lvbiB3aWxsIG5vdCBnZXQgY29udGludWVkLiBcblxuSWYgeW91IHdhbnQgdG8gY2hhbmdlIHRoZSBzdXBwb3J0IG1hbnVhbGx5LCBtb2RpZnkgJ34vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvcG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydC9tZXRhZGF0YS5qc29uJyB1bmRlciAnc2hlbGwtdmVyc2lvbicgYWRkIHRoZSBkZXNpcmVkIHZlcnNpb24gKGUuZyAnNDQnIGZvciBHTk9NRSA0NCkuIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDEwCn0="},
@@ -4665,8 +4890,9 @@
     "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="},
     "43": {"version": "34", "sha256": "0ii1pxbnfjjli8jj0fq1g1rlhzpbn1j9088jp0sjrxvdlrmksdzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "44": {"version": "34", "sha256": "0ii1pxbnfjjli8jj0fq1g1rlhzpbn1j9088jp0sjrxvdlrmksdzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "45": {"version": "45", "sha256": "0l7b2g7yn0cngvf0jb5qbxkr04vb7i6bc3x0cwgggamnpcqjkbs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogNDUKfQ=="},
-    "46": {"version": "45", "sha256": "0l7b2g7yn0cngvf0jb5qbxkr04vb7i6bc3x0cwgggamnpcqjkbs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogNDUKfQ=="}
+    "45": {"version": "49", "sha256": "0xz1dmvz8gklrgxrphkm62srfyvhyn85lrg5fmbzdiq96ngk8ybi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
+    "46": {"version": "49", "sha256": "0xz1dmvz8gklrgxrphkm62srfyvhyn85lrg5fmbzdiq96ngk8ybi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDQ5Cn0="},
+    "47": {"version": "49", "sha256": "0xz1dmvz8gklrgxrphkm62srfyvhyn85lrg5fmbzdiq96ngk8ybi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDQ5Cn0="}
   }}
 , {"uuid": "lock-screen-message@advendradeswanta.gitlab.com", "name": "Lock Screen Message", "pname": "lock-screen-message", "description": "Simple extension that let's you add your message to the lock screen (unlockDialog)", "link": "https://extensions.gnome.org/extension/4801/lock-screen-message/", "shell_version_map": {
     "40": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -4680,7 +4906,8 @@
     "43": {"version": "7", "sha256": "1waws1iwsk0li6x3c9l9w80kijsmfynrlp506hmq8zqqqxrh5npy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "1waws1iwsk0li6x3c9l9w80kijsmfynrlp506hmq8zqqqxrh5npy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogNwp9"},
     "45": {"version": "11", "sha256": "1r65y95rvp4a7hmbc88ggx3bhb2zlbb6mllqsq2lqb7zi6z6mm7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "46": {"version": "12", "sha256": "00756r347ihmwrnlm12ycscsz96dh5acgfli7iw479zg5s9m2knp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
+    "46": {"version": "13", "sha256": "1afj6izb621hrz66wh3aqxrv0x3nijib0vcp38iyd3s03zim82hh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L3BhbmVsLWNvcm5lcnMiLAogICJ1dWlkIjogInBhbmVsLWNvcm5lcnNAYXVuZXR4IiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "1afj6izb621hrz66wh3aqxrv0x3nijib0vcp38iyd3s03zim82hh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L3BhbmVsLWNvcm5lcnMiLAogICJ1dWlkIjogInBhbmVsLWNvcm5lcnNAYXVuZXR4IiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.\nPlease visit the GitHub repository for documentation and to report any issues.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": {
     "38": {"version": "7", "sha256": "0k5i38dp5lgmvhpi73d6ahndz31hm9alixbr3jz1sd1j0xh95mcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -4754,7 +4981,8 @@
     "43": {"version": "41", "sha256": "1kpwdir0rs086iky86c2gdfk3n9aja4xcg8s46kd7f2gv12l1sl7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgY2xpcGJvYXJkIG1hbmFnZXIgR05PTUUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU1VQRVJDSUxFWC9nbm9tZS1jbGlwYm9hcmQtaGlzdG9yeSIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWhpc3RvcnlAYWxleHNhdmVhdS5kZXYiLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
     "44": {"version": "41", "sha256": "1kpwdir0rs086iky86c2gdfk3n9aja4xcg8s46kd7f2gv12l1sl7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgY2xpcGJvYXJkIG1hbmFnZXIgR05PTUUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU1VQRVJDSUxFWC9nbm9tZS1jbGlwYm9hcmQtaGlzdG9yeSIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWhpc3RvcnlAYWxleHNhdmVhdS5kZXYiLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
     "45": {"version": "40", "sha256": "0yjm2py35rlsrdcpayaak0jqdnnpmdg6jp44fklg1ds06mnn7q4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgY2xpcGJvYXJkIG1hbmFnZXIgR05PTUUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWhpc3RvcnlAYWxleHNhdmVhdS5kZXYiLAogICJuYW1lIjogIkNsaXBib2FyZCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNsaXBib2FyZC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDQwCn0="},
-    "46": {"version": "42", "sha256": "1bp8xzwkszkr1qpd7dig7bmlckc6p65z72xr345la0kh370by4jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgY2xpcGJvYXJkIG1hbmFnZXIgR05PTUUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWhpc3RvcnlAYWxleHNhdmVhdS5kZXYiLAogICJuYW1lIjogIkNsaXBib2FyZCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNsaXBib2FyZC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDQyCn0="}
+    "46": {"version": "45", "sha256": "0nn92lv7acfb0wn5x87gfbykz60sm3q9glncx5i61ccx79yi6jwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgY2xpcGJvYXJkIG1hbmFnZXIgR05PTUUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWhpc3RvcnlAYWxleHNhdmVhdS5kZXYiLAogICJuYW1lIjogIkNsaXBib2FyZCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNsaXBib2FyZC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TVVBFUkNJTEVYL2dub21lLWNsaXBib2FyZC1oaXN0b3J5IiwKICAidXVpZCI6ICJjbGlwYm9hcmQtaGlzdG9yeUBhbGV4c2F2ZWF1LmRldiIsCiAgInZlcnNpb24iOiA0NQp9"},
+    "47": {"version": "45", "sha256": "0nn92lv7acfb0wn5x87gfbykz60sm3q9glncx5i61ccx79yi6jwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgY2xpcGJvYXJkIG1hbmFnZXIgR05PTUUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWhpc3RvcnlAYWxleHNhdmVhdS5kZXYiLAogICJuYW1lIjogIkNsaXBib2FyZCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNsaXBib2FyZC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TVVBFUkNJTEVYL2dub21lLWNsaXBib2FyZC1oaXN0b3J5IiwKICAidXVpZCI6ICJjbGlwYm9hcmQtaGlzdG9yeUBhbGV4c2F2ZWF1LmRldiIsCiAgInZlcnNpb24iOiA0NQp9"}
   }}
 , {"uuid": "strongdm@andybrown668.github.com", "name": "StrongDM", "pname": "strongdm", "description": "Access StrongDM resources", "link": "https://extensions.gnome.org/extension/4841/strongdm/", "shell_version_map": {
     "40": {"version": "3", "sha256": "02dfs597cs8zz7wwl3kqb8i9kxdi9p7ywvk22kvmy5p4gkc181j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBTdHJvbmdETSByZXNvdXJjZXMiLAogICJuYW1lIjogIlN0cm9uZ0RNIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmR5YnJvd242Njgvc3Ryb25nZG0tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLmdpdCIsCiAgInV1aWQiOiAic3Ryb25nZG1AYW5keWJyb3duNjY4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -4832,7 +5060,8 @@
     "42": {"version": "5", "sha256": "1h43w50x4g729q863hkhzkqvw13cf06w4izc9zn0fi32m5f04irw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG4gVGhpcyBpcyBub3QgYW4gb2ZmaWNpYWwgVWJ1bnR1L0Nhbm9uaWNhbCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJTbmFwIE1hbmFnZXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc25hcC1tYW5hZ2VyLWxpdGUiLAogICJ1dWlkIjogInNuYXAtbWFuYWdlci1saXRlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNQp9"},
     "43": {"version": "5", "sha256": "1h43w50x4g729q863hkhzkqvw13cf06w4izc9zn0fi32m5f04irw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG4gVGhpcyBpcyBub3QgYW4gb2ZmaWNpYWwgVWJ1bnR1L0Nhbm9uaWNhbCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJTbmFwIE1hbmFnZXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc25hcC1tYW5hZ2VyLWxpdGUiLAogICJ1dWlkIjogInNuYXAtbWFuYWdlci1saXRlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNQp9"},
     "44": {"version": "5", "sha256": "1h43w50x4g729q863hkhzkqvw13cf06w4izc9zn0fi32m5f04irw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG4gVGhpcyBpcyBub3QgYW4gb2ZmaWNpYWwgVWJ1bnR1L0Nhbm9uaWNhbCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJTbmFwIE1hbmFnZXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc25hcC1tYW5hZ2VyLWxpdGUiLAogICJ1dWlkIjogInNuYXAtbWFuYWdlci1saXRlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNQp9"},
-    "45": {"version": "7", "sha256": "19ai94lm1x9v32k32fm5aykjx4jqd8fgz9hkcvs4mnqiw8a9whrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gQWxsIHRoZSByZXN1bHRzIG9mIGFjdGlvbnMgYXJlIGRpc3BsYXllZCBpbiBHTk9NRSBUZXJtaW5hbCwgc28geW91IGNhbiBleGFjdGx5IGtub3cgd2hhdCB5b3UgYXJlIGRvaW5nIGFuZCB3aGF0IGlzIHByb2Nlc3NpbmcuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLCBubyBiYWNrZ3JvdW5kIHByb2Nlc3MsIG5vIHBlcmlvZGljIGJhY2tncm91bmQgdGFzay5cblxuIFlvdSBjYW4gZGlzYWJsZSBzbmFwcyBhdXRvIHVwZGF0ZXMgZm9yIHNvbWUgdGltZSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG4gVGhpcyBpcyBub3QgYW4gb2ZmaWNpYWwgVWJ1bnR1L0Nhbm9uaWNhbCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJTbmFwIE1hbmFnZXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "45": {"version": "7", "sha256": "19ai94lm1x9v32k32fm5aykjx4jqd8fgz9hkcvs4mnqiw8a9whrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gQWxsIHRoZSByZXN1bHRzIG9mIGFjdGlvbnMgYXJlIGRpc3BsYXllZCBpbiBHTk9NRSBUZXJtaW5hbCwgc28geW91IGNhbiBleGFjdGx5IGtub3cgd2hhdCB5b3UgYXJlIGRvaW5nIGFuZCB3aGF0IGlzIHByb2Nlc3NpbmcuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLCBubyBiYWNrZ3JvdW5kIHByb2Nlc3MsIG5vIHBlcmlvZGljIGJhY2tncm91bmQgdGFzay5cblxuIFlvdSBjYW4gZGlzYWJsZSBzbmFwcyBhdXRvIHVwZGF0ZXMgZm9yIHNvbWUgdGltZSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG4gVGhpcyBpcyBub3QgYW4gb2ZmaWNpYWwgVWJ1bnR1L0Nhbm9uaWNhbCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJTbmFwIE1hbmFnZXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "8", "sha256": "1qj6glvv14nybsh8mc49h16b8jxcpl3055ykxnf5kw41821790fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gQWxsIHRoZSByZXN1bHRzIG9mIGFjdGlvbnMgYXJlIGRpc3BsYXllZCBpbiBHTk9NRSBUZXJtaW5hbCwgc28geW91IGNhbiBleGFjdGx5IGtub3cgd2hhdCB5b3UgYXJlIGRvaW5nIGFuZCB3aGF0IGlzIHByb2Nlc3NpbmcuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLCBubyBiYWNrZ3JvdW5kIHByb2Nlc3MsIG5vIHBlcmlvZGljIGJhY2tncm91bmQgdGFzay5cblxuIFlvdSBjYW4gZGlzYWJsZSBzbmFwcyBhdXRvIHVwZGF0ZXMgZm9yIHNvbWUgdGltZSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG4gVGhpcyBpcyBub3QgYW4gb2ZmaWNpYWwgVWJ1bnR1L0Nhbm9uaWNhbCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJTbmFwIE1hbmFnZXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "move-panel@lzbz.gitlab.com", "name": "Move Panel", "pname": "move-panel", "description": "Moves panel to secondary monitor on startup, without changing the primary display. Only works on Wayland.", "link": "https://extensions.gnome.org/extension/4890/move-panel/", "shell_version_map": {
     "40": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -4845,8 +5074,9 @@
     "41": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"},
     "42": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"},
     "43": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"},
-    "45": {"version": "6", "sha256": "0hg06924jh6aqma2dlnfnj7hrrxlzwf9njrxbxr473ddqp4sxi76", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVzYWJsZS1vdmVydmlldyIsCiAgIm5hbWUiOiAiVXNhYmxlIE92ZXJ2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzYWJsZS1vdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "46": {"version": "6", "sha256": "0hg06924jh6aqma2dlnfnj7hrrxlzwf9njrxbxr473ddqp4sxi76", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVzYWJsZS1vdmVydmlldyIsCiAgIm5hbWUiOiAiVXNhYmxlIE92ZXJ2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzYWJsZS1vdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogNgp9"}
+    "45": {"version": "7", "sha256": "130b106phkf749qcldg8x6w4jww727mx33lypk358qq3k9mh6a5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy91c2FibGUtb3ZlcnZpZXciLAogICJ1dWlkIjogInVzYWJsZS1vdmVydmlld0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "46": {"version": "7", "sha256": "130b106phkf749qcldg8x6w4jww727mx33lypk358qq3k9mh6a5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy91c2FibGUtb3ZlcnZpZXciLAogICJ1dWlkIjogInVzYWJsZS1vdmVydmlld0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "47": {"version": "7", "sha256": "130b106phkf749qcldg8x6w4jww727mx33lypk358qq3k9mh6a5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy91c2FibGUtb3ZlcnZpZXciLAogICJ1dWlkIjogInVzYWJsZS1vdmVydmlld0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "speed@eexpss.gmail.com", "name": "Screen Net Speed", "pname": "screen-net-speed", "description": "* Animation net speed show on the screen. You can click it to have fun and pass the time. Can be turned on / off at any time.\nScroll Mouse on panel icon, can change the shape.", "link": "https://extensions.gnome.org/extension/4901/screen-net-speed/", "shell_version_map": {
     "40": {"version": "8", "sha256": "050w37i0w0b5wl0x1q2r9grlhn3ly2rjlmz85i6kz1wzhcphs1a8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtc3BlZWQiLAogICJ1dWlkIjogInNwZWVkQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
@@ -4866,8 +5096,9 @@
     "42": {"version": "17", "sha256": "1m6103r9hlamd5nzxqvcavssnacjxrjypby52gpgngp3aj8698sz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "43": {"version": "17", "sha256": "1m6103r9hlamd5nzxqvcavssnacjxrjypby52gpgngp3aj8698sz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "44": {"version": "17", "sha256": "1m6103r9hlamd5nzxqvcavssnacjxrjypby52gpgngp3aj8698sz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
-    "45": {"version": "23", "sha256": "111rbjsd0f5fs78micq43cmd3yrh9y4w080bn70xhsasbcpjmf6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "46": {"version": "23", "sha256": "111rbjsd0f5fs78micq43cmd3yrh9y4w080bn70xhsasbcpjmf6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}
+    "45": {"version": "24", "sha256": "1hb6raaq9pw27w04r0xychlwk46k51hqsks9jhy9xghcl4cj04v4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "46": {"version": "24", "sha256": "1hb6raaq9pw27w04r0xychlwk46k51hqsks9jhy9xghcl4cj04v4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "47": {"version": "24", "sha256": "1hb6raaq9pw27w04r0xychlwk46k51hqsks9jhy9xghcl4cj04v4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}
   }}
 , {"uuid": "gnomehub@gnome-hub.github.io", "name": "gnomehub", "pname": "gnomehub", "description": "An all in one extension which catagorizes notifications and displays system information", "link": "https://extensions.gnome.org/extension/4913/gnomehub/", "shell_version_map": {
     "38": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -4892,15 +5123,16 @@
     "43": {"version": "10", "sha256": "12hnxf90z6vc4clr2h9sp3zy764fda3rqrnzry00l1waydzcw83d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeSBhbmQgRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIHN5c3RlbSBvcGVuLiIsCiAgIm5hbWUiOiAiR2l0IE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWdpdCIsCiAgInV1aWQiOiAiZ2l0QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "44": {"version": "10", "sha256": "12hnxf90z6vc4clr2h9sp3zy764fda3rqrnzry00l1waydzcw83d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeSBhbmQgRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIHN5c3RlbSBvcGVuLiIsCiAgIm5hbWUiOiAiR2l0IE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWdpdCIsCiAgInV1aWQiOiAiZ2l0QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
   }}
-, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Media Label and Controls (Mpris Label)", "pname": "mpris-label", "description": "Display a label in your panel with the song/title/album/artist information available from an mpris compatible player. You can also control the player, raise/lower its volume, customize the label, and a lot more! This extension works with Spotify, Vlc, Rhythmbox, Firefox, Chromium, and (probably) any MPRIS compatible player.\n\nThe latest version (v31 for GNOME 43/44 and v32 for GNOME 45/46):\n- Captures UP/DOWN scroll signals, fixing a regression experienced by GNOME 46 users\n- Replaces the \"info-symbolic\" icon with an standard icon (v32 only)", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {
+, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Media Label and Controls (Mpris Label)", "pname": "mpris-label", "description": "Display a label in your panel with the song/title/album/artist information available from an mpris compatible player. You can also control the player, raise/lower its volume, customize the label, and a lot more! This extension works with Spotify, Vlc, Rhythmbox, Firefox, Chromium, and (probably) any MPRIS compatible player.", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {
     "38": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "40": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "41": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "42": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
-    "43": {"version": "31", "sha256": "058v2hv5iz4a794fncskn062cm45q0qawx0ya4d8cxibydwxrbg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "44": {"version": "31", "sha256": "058v2hv5iz4a794fncskn062cm45q0qawx0ya4d8cxibydwxrbg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "45": {"version": "32", "sha256": "08fm7d69yhh9cxid1a2c6kz5n8bbffa4rvzfgxhgvs0r5s4zbm1k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
-    "46": {"version": "32", "sha256": "08fm7d69yhh9cxid1a2c6kz5n8bbffa4rvzfgxhgvs0r5s4zbm1k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}
+    "43": {"version": "34", "sha256": "131sk2icj04y7cl44xz5xr18jxdsgfzv86dwjps6wav48zzc7drn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
+    "44": {"version": "34", "sha256": "131sk2icj04y7cl44xz5xr18jxdsgfzv86dwjps6wav48zzc7drn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
+    "45": {"version": "36", "sha256": "1wda5w5j0415hm8pcyn1h6zqj7hw1ckb3bf9iw99qgriiiryl3p1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="},
+    "46": {"version": "36", "sha256": "1wda5w5j0415hm8pcyn1h6zqj7hw1ckb3bf9iw99qgriiiryl3p1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="},
+    "47": {"version": "37", "sha256": "1l4104pd2fk15vn958l84yjkj952sql6nc999cmkwmxr6r8pa074", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01vb24tMHhmZi9nbm9tZS1tcHJpcy1sYWJlbCIsCiAgInV1aWQiOiAibXByaXNMYWJlbEBtb29uLTB4ZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}
   }}
 , {"uuid": "captivate@rensoliemans.nl", "name": "Captivate", "pname": "captivate", "description": "Activate your CapsLock button.\nUsing gnome-tweaks, remap your CapsLock to a Menu key, and then this extension works perfectly. Alternatively, choose a different key in the extension settings.\n\nDon't forget to log out and in again if you're updating the extension manually.", "link": "https://extensions.gnome.org/extension/4932/captivate/", "shell_version_map": {
     "40": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -4918,23 +5150,25 @@
     "42": {"version": "18", "sha256": "0mklxqybxnlw8jpfljyg2hapw8zgi732162ris96li0440a8h616", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "43": {"version": "18", "sha256": "0mklxqybxnlw8jpfljyg2hapw8zgi732162ris96li0440a8h616", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "44": {"version": "18", "sha256": "0mklxqybxnlw8jpfljyg2hapw8zgi732162ris96li0440a8h616", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
-    "45": {"version": "23", "sha256": "13cppvvwc77h5w5vixa23vn8k02yb19mj90h2dj02lg5xa6zpj55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "46": {"version": "23", "sha256": "13cppvvwc77h5w5vixa23vn8k02yb19mj90h2dj02lg5xa6zpj55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "45": {"version": "27", "sha256": "0gfyd8v1kq5gbh08p06z7m21n7s9sxln976h70aczfddi2w0qs2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
+    "46": {"version": "27", "sha256": "0gfyd8v1kq5gbh08p06z7m21n7s9sxln976h70aczfddi2w0qs2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
+    "47": {"version": "27", "sha256": "0gfyd8v1kq5gbh08p06z7m21n7s9sxln976h70aczfddi2w0qs2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}
   }}
 , {"uuid": "netSpeedMonitor@nidyran.github.io", "name": "Network Speed Tracker", "pname": "net-speed-monitor", "description": "Network Speed Tracker \nUsage instructions:\n1 - Right-click to easily switch between available network sources.\n2 - Left-click to toggle display modes.\n3 - Middle-click to adjust the refresh rate.", "link": "https://extensions.gnome.org/extension/4947/net-speed-monitor/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"},
     "40": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"},
     "41": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
-, {"uuid": "gradienttopbar@pshow.org", "name": "Gradient Top Bar", "pname": "gradient-top-bar", "description": "Makes GNOME's panel's background gradient. You can edit the colour scheme from the extension's settings in Gnome 45 and above.", "link": "https://extensions.gnome.org/extension/4955/gradient-top-bar/", "shell_version_map": {
+, {"uuid": "gradienttopbar@pshow.org", "name": "Gradient Top Bar", "pname": "gradient-top-bar", "description": "Makes GNOME's panel's background gradient. You can edit the colour scheme from the extension's settings in Gnome 45+.", "link": "https://extensions.gnome.org/extension/4955/gradient-top-bar/", "shell_version_map": {
     "38": {"version": "4", "sha256": "004m77f5hkg9bq9lk2cf79x9va7np37q7yv474bwg165v7a0s8v1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "40": {"version": "4", "sha256": "004m77f5hkg9bq9lk2cf79x9va7np37q7yv474bwg165v7a0s8v1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "41": {"version": "4", "sha256": "004m77f5hkg9bq9lk2cf79x9va7np37q7yv474bwg165v7a0s8v1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "42": {"version": "4", "sha256": "004m77f5hkg9bq9lk2cf79x9va7np37q7yv474bwg165v7a0s8v1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "43": {"version": "11", "sha256": "0nb4jcxhx994kgmsv0aksrjwxnw58bjw0hsijkg6bb8idm32s1pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"},
     "44": {"version": "11", "sha256": "0nb4jcxhx994kgmsv0aksrjwxnw58bjw0hsijkg6bb8idm32s1pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "45": {"version": "19", "sha256": "0afh1cjy27srrdbr9b7lj1d25a06w1sixy3j14lw251rp461dvnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJwZXRhci12IiwKICAgICJwYXlwYWwiOiAicGV0YXJ2NzMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLnBzaG93LmdyYWRpZW50dG9wYmFyIiwKICAiaGFzUHJlZnMiOiB0cnVlLAogICJpY29uIjogIi4vYXNzZXRzL2xvZ28ucG5nIiwKICAibmFtZSI6ICJHcmFkaWVudCBUb3AgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="},
-    "46": {"version": "19", "sha256": "0afh1cjy27srrdbr9b7lj1d25a06w1sixy3j14lw251rp461dvnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJwZXRhci12IiwKICAgICJwYXlwYWwiOiAicGV0YXJ2NzMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLnBzaG93LmdyYWRpZW50dG9wYmFyIiwKICAiaGFzUHJlZnMiOiB0cnVlLAogICJpY29uIjogIi4vYXNzZXRzL2xvZ28ucG5nIiwKICAibmFtZSI6ICJHcmFkaWVudCBUb3AgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDE5Cn0="}
+    "45": {"version": "20", "sha256": "0inrqgm9b85mgsifc0j3xdfx7695lsln94pp1ysac950068jrcc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUrLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAicGV0YXItdiIsCiAgICAicGF5cGFsIjogInBldGFydjczIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXRhci12L2dyYWRpZW50dG9wYmFyIiwKICAidXVpZCI6ICJncmFkaWVudHRvcGJhckBwc2hvdy5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
+    "46": {"version": "20", "sha256": "0inrqgm9b85mgsifc0j3xdfx7695lsln94pp1ysac950068jrcc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUrLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAicGV0YXItdiIsCiAgICAicGF5cGFsIjogInBldGFydjczIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXRhci12L2dyYWRpZW50dG9wYmFyIiwKICAidXVpZCI6ICJncmFkaWVudHRvcGJhckBwc2hvdy5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
+    "47": {"version": "20", "sha256": "0inrqgm9b85mgsifc0j3xdfx7695lsln94pp1ysac950068jrcc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUrLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAicGV0YXItdiIsCiAgICAicGF5cGFsIjogInBldGFydjczIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXRhci12L2dyYWRpZW50dG9wYmFyIiwKICAidXVpZCI6ICJncmFkaWVudHRvcGJhckBwc2hvdy5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}
   }}
 , {"uuid": "note@eexpss.gmail.com", "name": "note", "pname": "note", "description": "Add selected text to Note.\n- Notes automatic recognition and sort as 'Directory' 'Command' 'Clipboard'.\n- 'Directory': Mouse 1/2/3 act as 'Open in Files/Open in termianl/Paste dir'. It can be used as a temporary bookmark. And any click will change the working diretory in real time.\n- 'Command': Mouse 1/3 as 'Excute command in Terminal/Paste cmd'.\n- 'Clipboard': Mouse act as 'Paste to Clipboard(PRIMARY)'.\n- Terminal support kgx(new gnome-console) and gnome-terminal.", "link": "https://extensions.gnome.org/extension/4962/note/", "shell_version_map": {
     "42": {"version": "7", "sha256": "1niwlhls41l92g0bcllp4y4bdhn7k310514xkd36rn61pqz9b7q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzZWxlY3RlZCB0ZXh0IHRvIE5vdGUuXG4tIE5vdGVzIGF1dG9tYXRpYyByZWNvZ25pdGlvbiBhbmQgc29ydCBhcyAnRGlyZWN0b3J5JyAnQ29tbWFuZCcgJ0NsaXBib2FyZCcuXG4tICdEaXJlY3RvcnknOiBNb3VzZSAxLzIvMyBhY3QgYXMgJ09wZW4gaW4gRmlsZXMvT3BlbiBpbiB0ZXJtaWFubC9QYXN0ZSBkaXInLiBJdCBjYW4gYmUgdXNlZCBhcyBhIHRlbXBvcmFyeSBib29rbWFyay4gQW5kIGFueSBjbGljayB3aWxsIGNoYW5nZSB0aGUgd29ya2luZyBkaXJldG9yeSBpbiByZWFsIHRpbWUuXG4tICdDb21tYW5kJzogTW91c2UgMS8zIGFzICdFeGN1dGUgY29tbWFuZCBpbiBUZXJtaW5hbC9QYXN0ZSBjbWQnLlxuLSAnQ2xpcGJvYXJkJzogTW91c2UgYWN0IGFzICdQYXN0ZSB0byBDbGlwYm9hcmQoUFJJTUFSWSknLlxuLSBUZXJtaW5hbCBzdXBwb3J0IGtneChuZXcgZ25vbWUtY29uc29sZSkgYW5kIGdub21lLXRlcm1pbmFsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGUiLAogICJuYW1lIjogIm5vdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1ub3RlIiwKICAidXVpZCI6ICJub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
@@ -4955,7 +5189,9 @@
     "42": {"version": "4", "sha256": "1wsqlmgbq1jmywxj0ffswbyrjgas4wlnv9ssjv6n702wps30a700", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHNlbGlnZXIvd2luZG93LWNhbGxzLWV4dGVuZGVkIiwKICAidXVpZCI6ICJ3aW5kb3ctY2FsbHMtZXh0ZW5kZWRAaHNlbGlnZXIuZXUiLAogICJ2ZXJzaW9uIjogNAp9"},
     "43": {"version": "4", "sha256": "1wsqlmgbq1jmywxj0ffswbyrjgas4wlnv9ssjv6n702wps30a700", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHNlbGlnZXIvd2luZG93LWNhbGxzLWV4dGVuZGVkIiwKICAidXVpZCI6ICJ3aW5kb3ctY2FsbHMtZXh0ZW5kZWRAaHNlbGlnZXIuZXUiLAogICJ2ZXJzaW9uIjogNAp9"},
     "44": {"version": "4", "sha256": "1wsqlmgbq1jmywxj0ffswbyrjgas4wlnv9ssjv6n702wps30a700", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHNlbGlnZXIvd2luZG93LWNhbGxzLWV4dGVuZGVkIiwKICAidXVpZCI6ICJ3aW5kb3ctY2FsbHMtZXh0ZW5kZWRAaHNlbGlnZXIuZXUiLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "6", "sha256": "1vwr64n84lmfj9dn4n4i7yzr6wdj2xnnhvr74459s02pv28b3a5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHNlbGlnZXIvd2luZG93LWNhbGxzLWV4dGVuZGVkIiwKICAidXVpZCI6ICJ3aW5kb3ctY2FsbHMtZXh0ZW5kZWRAaHNlbGlnZXIuZXUiLAogICJ2ZXJzaW9uIjogNgp9"}
+    "45": {"version": "7", "sha256": "11yqxj0i532cpj8bjdi0l3xjglaq682abgjz6kjxwfqxcqydm8z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "46": {"version": "7", "sha256": "11yqxj0i532cpj8bjdi0l3xjglaq682abgjz6kjxwfqxcqydm8z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "47": {"version": "7", "sha256": "11yqxj0i532cpj8bjdi0l3xjglaq682abgjz6kjxwfqxcqydm8z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "Sur_Clock@medaip90.com", "name": "Sur Clock ☠️", "pname": "sur-clock", "description": "Move the clock to the left or the right of the system indicators like in MacOs.\n\n⚠️ ⚠️ ⚠️ WARNING: since \"Just Perfection\" can now do the same thing with many other functionalities, this project is no longer maintained.", "link": "https://extensions.gnome.org/extension/4977/sur-clock/", "shell_version_map": {
     "40": {"version": "4", "sha256": "02rrqs5m1452x579rdrihfnqhqyqz97lazwl2zkpqmki20qgkpqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWVkYWlQOTAvZ25vbWUtc3VyLWNsb2NrIiwKICAidXVpZCI6ICJTdXJfQ2xvY2tAbWVkYWlwOTAuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -4997,8 +5233,9 @@
     "42": {"version": "68", "sha256": "0i2p5jvs9jlpy1gzc6g3zgbjjyi41v7bahzkz6lg2bw1hpv7a363", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
     "43": {"version": "68", "sha256": "0i2p5jvs9jlpy1gzc6g3zgbjjyi41v7bahzkz6lg2bw1hpv7a363", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
     "44": {"version": "68", "sha256": "0i2p5jvs9jlpy1gzc6g3zgbjjyi41v7bahzkz6lg2bw1hpv7a363", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
-    "45": {"version": "66", "sha256": "0cjgrs83ak9dpzm8h3lm471xwik020abpm18v97z5467bswjmdqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjYKfQ=="},
-    "46": {"version": "66", "sha256": "0cjgrs83ak9dpzm8h3lm471xwik020abpm18v97z5467bswjmdqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjYKfQ=="}
+    "45": {"version": "70", "sha256": "0z8hg23gqmq7rvkr5yb8hk6nxzbnw9mxnjhdm1q9n6dd92qdvadh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcwCn0="},
+    "46": {"version": "70", "sha256": "0z8hg23gqmq7rvkr5yb8hk6nxzbnw9mxnjhdm1q9n6dd92qdvadh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcwCn0="},
+    "47": {"version": "70", "sha256": "0z8hg23gqmq7rvkr5yb8hk6nxzbnw9mxnjhdm1q9n6dd92qdvadh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcwCn0="}
   }}
 , {"uuid": "animate@eexpss.gmail.com", "name": "animate", "pname": "animate", "description": "Animated small man run through the screen. Scroll mouse can change deferent character. You can use your PNG characters instead of the original ones.", "link": "https://extensions.gnome.org/extension/4995/animate/", "shell_version_map": {
     "40": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -5009,8 +5246,9 @@
     "42": {"version": "5", "sha256": "1k1nlcpwsdmvy95y6ch40df67lgsqn3ja5qf1i2z4mw3rff3jsi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWt1bDI5L2xlZ2FjeS10aGVtZS1hdXRvLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibGVnYWN5c2NoZW1lYXV0b3N3aXRjaGVyQGpvc2hpbXVrdWwyOS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "43": {"version": "5", "sha256": "1k1nlcpwsdmvy95y6ch40df67lgsqn3ja5qf1i2z4mw3rff3jsi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWt1bDI5L2xlZ2FjeS10aGVtZS1hdXRvLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibGVnYWN5c2NoZW1lYXV0b3N3aXRjaGVyQGpvc2hpbXVrdWwyOS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "44": {"version": "5", "sha256": "1k1nlcpwsdmvy95y6ch40df67lgsqn3ja5qf1i2z4mw3rff3jsi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWt1bDI5L2xlZ2FjeS10aGVtZS1hdXRvLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibGVnYWN5c2NoZW1lYXV0b3N3aXRjaGVyQGpvc2hpbXVrdWwyOS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
-    "45": {"version": "8", "sha256": "0lm3gi33w697jd37jl9prhv4ls8plsnbk4b4pm4pza7krg12h7sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "8", "sha256": "0lm3gi33w697jd37jl9prhv4ls8plsnbk4b4pm4pza7krg12h7sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "45": {"version": "9", "sha256": "17l79rwmlyav5yrisskvf53rgwzyg93q5jhmk0zb64l3nc4zala8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWt1bDI5L2xlZ2FjeS10aGVtZS1hdXRvLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibGVnYWN5c2NoZW1lYXV0b3N3aXRjaGVyQGpvc2hpbXVrdWwyOS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "46": {"version": "9", "sha256": "17l79rwmlyav5yrisskvf53rgwzyg93q5jhmk0zb64l3nc4zala8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWt1bDI5L2xlZ2FjeS10aGVtZS1hdXRvLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibGVnYWN5c2NoZW1lYXV0b3N3aXRjaGVyQGpvc2hpbXVrdWwyOS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "47": {"version": "9", "sha256": "17l79rwmlyav5yrisskvf53rgwzyg93q5jhmk0zb64l3nc4zala8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWt1bDI5L2xlZ2FjeS10aGVtZS1hdXRvLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibGVnYWN5c2NoZW1lYXV0b3N3aXRjaGVyQGpvc2hpbXVrdWwyOS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}
   }}
 , {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "A Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflicts with Cosmic Workspace.  It prevents Cosmic Workspaces from breaking after suspend. \n\nAdded Features:\nBorder Radius \nBorder Margins\n Icon Alignment\nEtc.", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {
     "40": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
@@ -5018,13 +5256,14 @@
     "42": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="},
     "43": {"version": "23", "sha256": "1780c6zjfyl7ansicd370nf1l42xqsifp2qpyll26mhjnzyzmlqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmYW1wO2FtcDsgSWNvbiBBbGlnbm1lbnRcbkV0Yy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}
   }}
-, {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {
+, {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Imagine a Dropbox sync client but with support for over 30 cloud services, all accessible right from your top panel. This tool allows you to manage, monitor, and perform essential operations on your rclone profiles, making remote storage management a breeze. Mount remotes, monitor file changes, sync seamlessly, and navigate your storage, all in one place. Stay updated with real-time status displays for each profile and easily access event logs for a complete view of your activity. Plus, with backup and restore capabilities for your rclone configuration file, setting up multiple devices has never been simpler. Everything while keeping your data private. Unlike other programs from private companies, this tool respects your privacy, sending no information anywhere. ", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {
     "40": {"version": "10", "sha256": "1kvi1g03nd5m4d7wnkrnhms9l7pxag4n462g5qxl2q9pvn1d1v96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VybWFuenR6L2dub21lLXNoZWxsLWV4dGVuc2lvbi1yY2xvbmUtbWFuYWdlciIsCiAgInV1aWQiOiAicmNsb25lLW1hbmFnZXJAZ2VybWFuenR6LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "42": {"version": "10", "sha256": "1kvi1g03nd5m4d7wnkrnhms9l7pxag4n462g5qxl2q9pvn1d1v96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VybWFuenR6L2dub21lLXNoZWxsLWV4dGVuc2lvbi1yY2xvbmUtbWFuYWdlciIsCiAgInV1aWQiOiAicmNsb25lLW1hbmFnZXJAZ2VybWFuenR6LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "43": {"version": "10", "sha256": "1kvi1g03nd5m4d7wnkrnhms9l7pxag4n462g5qxl2q9pvn1d1v96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VybWFuenR6L2dub21lLXNoZWxsLWV4dGVuc2lvbi1yY2xvbmUtbWFuYWdlciIsCiAgInV1aWQiOiAicmNsb25lLW1hbmFnZXJAZ2VybWFuenR6LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "44": {"version": "10", "sha256": "1kvi1g03nd5m4d7wnkrnhms9l7pxag4n462g5qxl2q9pvn1d1v96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VybWFuenR6L2dub21lLXNoZWxsLWV4dGVuc2lvbi1yY2xvbmUtbWFuYWdlciIsCiAgInV1aWQiOiAicmNsb25lLW1hbmFnZXJAZ2VybWFuenR6LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "45": {"version": "13", "sha256": "19r6mly10kzym1pwvynfn8cfj5xgjaima9ns7w9h8zldrfhk3fkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgImdldHRleHQtZG9tYWluIjogInJjbG9uZS1tYW5hZ2VyIiwKICAibmFtZSI6ICJyY2xvbmUtbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yY2xvbmUtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "46": {"version": "15", "sha256": "1916ry64p55gc78bblvkmxgcbzxvgpp7vgsvv0kscpc3z4z8hwyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgImdldHRleHQtZG9tYWluIjogInJjbG9uZS1tYW5hZ2VyIiwKICAibmFtZSI6ICJyY2xvbmUtbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yY2xvbmUtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}
+    "46": {"version": "15", "sha256": "1916ry64p55gc78bblvkmxgcbzxvgpp7vgsvv0kscpc3z4z8hwyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgImdldHRleHQtZG9tYWluIjogInJjbG9uZS1tYW5hZ2VyIiwKICAibmFtZSI6ICJyY2xvbmUtbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yY2xvbmUtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="},
+    "47": {"version": "16", "sha256": "1js0nadfd2a2k6m9f4sqxwn0d9qg4397gjnkd8xyapz7amangijx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgImdldHRleHQtZG9tYWluIjogInJjbG9uZS1tYW5hZ2VyIiwKICAibmFtZSI6ICJyY2xvbmUtbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yY2xvbmUtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}
   }}
 , {"uuid": "GPU_profile_selector@lorenzo9904.gmail.com", "name": "GPU profile selector", "pname": "gpu-profile-selector", "description": "You need to install envycontrol(https://github.com/geminis3/envycontrol) to make this extension work. This is a simple gnome-shell extension which provides a simple way to switch between GPU profiles on Nvidia Optimus systems (i.e laptops with Intel + Nvidia or AMD + Nvidia configurations) in a few clicks.", "link": "https://extensions.gnome.org/extension/5009/gpu-profile-selector/", "shell_version_map": {
     "38": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -5033,8 +5272,9 @@
     "42": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
     "43": {"version": "14", "sha256": "1kj6wypjfa5clclvwnz4jym02sygknxbspmv8lv0piys1gw6n7h2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "44": {"version": "16", "sha256": "0i5y87ry7vkabd6r6036sd0kbl91j55ns9pkgbhkzf4nwa8z79h9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
-    "45": {"version": "19", "sha256": "0047wrc00bk83p2yib4pbgmr6szghjmyhlqsc2gdf60la12mg81k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
-    "46": {"version": "19", "sha256": "0047wrc00bk83p2yib4pbgmr6szghjmyhlqsc2gdf60la12mg81k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}
+    "45": {"version": "20", "sha256": "1i2fpqjq6pnafyg9k0i52rmlrkf838q7vijkx5bxffn0gvnb5df0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Mb3JlbnpvTW9yZWxsaS9HUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgInV1aWQiOiAiR1BVX3Byb2ZpbGVfc2VsZWN0b3JAbG9yZW56bzk5MDQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="},
+    "46": {"version": "20", "sha256": "1i2fpqjq6pnafyg9k0i52rmlrkf838q7vijkx5bxffn0gvnb5df0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Mb3JlbnpvTW9yZWxsaS9HUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgInV1aWQiOiAiR1BVX3Byb2ZpbGVfc2VsZWN0b3JAbG9yZW56bzk5MDQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="},
+    "47": {"version": "20", "sha256": "1i2fpqjq6pnafyg9k0i52rmlrkf838q7vijkx5bxffn0gvnb5df0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Mb3JlbnpvTW9yZWxsaS9HUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgInV1aWQiOiAiR1BVX3Byb2ZpbGVfc2VsZWN0b3JAbG9yZW56bzk5MDQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}
   }}
 , {"uuid": "username-to-activities@deserts", "name": "Replace Activities text with username", "pname": "replce-activities-text-with-username", "description": "Replace Activities text with username.\nThis is a fork of Replace Activities Text by pratap@fastmail.fm", "link": "https://extensions.gnome.org/extension/5010/replce-activities-text-with-username/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1by99cvd9jsrm7bzq0906n4pd0sd6hl5bg9ym17xdwb9nvl4aa0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXNlcnRzdHN1bmcvdXNlcm5hbWUtdG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAidXNlcm5hbWUtdG8tYWN0aXZpdGllc0BkZXNlcnRzIiwKICAidmVyc2lvbiI6IDUKfQ=="},
@@ -5047,21 +5287,23 @@
 , {"uuid": "overview-dash-hide@rokenz05.github.com", "name": "Overview Dash Hide", "pname": "overview-dash-hide", "description": "Hide dash to dock in activities overview", "link": "https://extensions.gnome.org/extension/5013/overview-dash-hide/", "shell_version_map": {
     "42": {"version": "1", "sha256": "1i0s0gjyml0q8lz08pwh1nva2yrf5vydpcrz2ncz46qvpjhik7dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgZGFzaCB0byBkb2NrIGluIGFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJuYW1lIjogIk92ZXJ2aWV3IERhc2ggSGlkZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAib3ZlcnZpZXctZGFzaC1oaWRlQHJva2VuejA1LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
-, {"uuid": "simple-message@freddez", "name": "Simple Message", "pname": "simple-message", "description": "Show a message written by the user on the top bar.", "link": "https://extensions.gnome.org/extension/5018/simple-message/", "shell_version_map": {
+, {"uuid": "simple-message@freddez", "name": "Simple Message", "pname": "simple-message", "description": "Print a custom message on the top bar.", "link": "https://extensions.gnome.org/extension/5018/simple-message/", "shell_version_map": {
     "40": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="},
     "41": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="},
     "42": {"version": "14", "sha256": "11v848619bj8dk29rz6468cc2mfkggqqz83gfqdngaksd996nxr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxNAp9"},
     "43": {"version": "14", "sha256": "11v848619bj8dk29rz6468cc2mfkggqqz83gfqdngaksd996nxr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxNAp9"},
     "44": {"version": "14", "sha256": "11v848619bj8dk29rz6468cc2mfkggqqz83gfqdngaksd996nxr0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "45": {"version": "17", "sha256": "10q9k44i65lmix5g54l2a2gcacj7hfc4ibnxb5dppjrcmfgi6krd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "46": {"version": "17", "sha256": "10q9k44i65lmix5g54l2a2gcacj7hfc4ibnxb5dppjrcmfgi6krd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDE3Cn0="}
+    "45": {"version": "19", "sha256": "1c0jx6p4bn6mmjbnpkngiib31wh16av0hyjz9s3654zcamc2iw51", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByaW50IGEgY3VzdG9tIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxOQp9"},
+    "46": {"version": "19", "sha256": "1c0jx6p4bn6mmjbnpkngiib31wh16av0hyjz9s3654zcamc2iw51", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByaW50IGEgY3VzdG9tIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxOQp9"},
+    "47": {"version": "19", "sha256": "1c0jx6p4bn6mmjbnpkngiib31wh16av0hyjz9s3654zcamc2iw51", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByaW50IGEgY3VzdG9tIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2ltcGxlLW1lc3NhZ2UiLAogICJuYW1lIjogIlNpbXBsZSBNZXNzYWdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZS1tZXNzYWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxOQp9"}
   }}
 , {"uuid": "activate-window-by-title@lucaswerkmeister.de", "name": "Activate Window By Title", "pname": "activate-window-by-title", "description": "Expose a D-Bus interface to activate a window by its title or WM_CLASS", "link": "https://extensions.gnome.org/extension/5021/activate-window-by-title/", "shell_version_map": {
     "42": {"version": "5", "sha256": "1hqm9znczhw9iq4zx8nzy5cm8wr8lwsryk4l6g634fxqs1bxny5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2Fzd2Vya21laXN0ZXIvYWN0aXZhdGUtd2luZG93LWJ5LXRpdGxlIiwKICAidXVpZCI6ICJhY3RpdmF0ZS13aW5kb3ctYnktdGl0bGVAbHVjYXN3ZXJrbWVpc3Rlci5kZSIsCiAgInZlcnNpb24iOiA1Cn0="},
     "43": {"version": "6", "sha256": "14sy0l2nwc7lr5h08q3kcjbvlmddiqdi7kqi4s15ma80hhz35mqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "44": {"version": "6", "sha256": "14sy0l2nwc7lr5h08q3kcjbvlmddiqdi7kqi4s15ma80hhz35mqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "45": {"version": "8", "sha256": "042lfzp736zany63hrvsvzcisgljnkpgz9w87w17vd3b82ls5w54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "042lfzp736zany63hrvsvzcisgljnkpgz9w87w17vd3b82ls5w54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "9", "sha256": "0yicbfrx6fjaxibbjmr7lz3087kb8zpr3ki7hnd7imzna45v45k8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2Fzd2Vya21laXN0ZXIvYWN0aXZhdGUtd2luZG93LWJ5LXRpdGxlIiwKICAidXVpZCI6ICJhY3RpdmF0ZS13aW5kb3ctYnktdGl0bGVAbHVjYXN3ZXJrbWVpc3Rlci5kZSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "0yicbfrx6fjaxibbjmr7lz3087kb8zpr3ki7hnd7imzna45v45k8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2Fzd2Vya21laXN0ZXIvYWN0aXZhdGUtd2luZG93LWJ5LXRpdGxlIiwKICAidXVpZCI6ICJhY3RpdmF0ZS13aW5kb3ctYnktdGl0bGVAbHVjYXN3ZXJrbWVpc3Rlci5kZSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "0yicbfrx6fjaxibbjmr7lz3087kb8zpr3ki7hnd7imzna45v45k8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2Fzd2Vya21laXN0ZXIvYWN0aXZhdGUtd2luZG93LWJ5LXRpdGxlIiwKICAidXVpZCI6ICJhY3RpdmF0ZS13aW5kb3ctYnktdGl0bGVAbHVjYXN3ZXJrbWVpc3Rlci5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "nano-system-monitor@eeeeeio", "name": "Nano System Monitor", "pname": "nano-system-monitor", "description": "Show current status on GNOME Shell panel\n\nbar shows CPU|memory|swap usages,then the download|upload speed and CPU temperature and fan speed\n\nDifferent colors represent different percentage states and CPU temperature\n\nplease use monospaced font for best experience", "link": "https://extensions.gnome.org/extension/5037/nano-system-monitor/", "shell_version_map": {
     "38": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -5075,8 +5317,9 @@
     "42": {"version": "5", "sha256": "0yc5yal54vcmzc2iqr950ays12338h5b2fhzjfyl5bkvm8a08sml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IZXhjei9TdGFydC1PdmVybGF5LWluLUFwcGxpY2F0aW9uLVZpZXctZm9yLUdub21lLTQwLSIsCiAgInV1aWQiOiAic3RhcnQtb3ZlcmxheS1pbi1hcHBsaWNhdGlvbi12aWV3QEhleF9jeiIsCiAgInZlcnNpb24iOiA1Cn0="},
     "43": {"version": "5", "sha256": "0yc5yal54vcmzc2iqr950ays12338h5b2fhzjfyl5bkvm8a08sml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IZXhjei9TdGFydC1PdmVybGF5LWluLUFwcGxpY2F0aW9uLVZpZXctZm9yLUdub21lLTQwLSIsCiAgInV1aWQiOiAic3RhcnQtb3ZlcmxheS1pbi1hcHBsaWNhdGlvbi12aWV3QEhleF9jeiIsCiAgInZlcnNpb24iOiA1Cn0="},
     "44": {"version": "5", "sha256": "0yc5yal54vcmzc2iqr950ays12338h5b2fhzjfyl5bkvm8a08sml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IZXhjei9TdGFydC1PdmVybGF5LWluLUFwcGxpY2F0aW9uLVZpZXctZm9yLUdub21lLTQwLSIsCiAgInV1aWQiOiAic3RhcnQtb3ZlcmxheS1pbi1hcHBsaWNhdGlvbi12aWV3QEhleF9jeiIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "45": {"version": "7", "sha256": "0w9fmlsnkbyhfff6ac4jn2fvqh8m1kaamasligcmghhcm9p39wd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IZXhjei9TdGFydC1PdmVybGF5LWluLUFwcGxpY2F0aW9uLVZpZXctZm9yLUdub21lLTQwLSIsCiAgInV1aWQiOiAic3RhcnQtb3ZlcmxheS1pbi1hcHBsaWNhdGlvbi12aWV3QEhleF9jeiIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "46": {"version": "7", "sha256": "0w9fmlsnkbyhfff6ac4jn2fvqh8m1kaamasligcmghhcm9p39wd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IZXhjei9TdGFydC1PdmVybGF5LWluLUFwcGxpY2F0aW9uLVZpZXctZm9yLUdub21lLTQwLSIsCiAgInV1aWQiOiAic3RhcnQtb3ZlcmxheS1pbi1hcHBsaWNhdGlvbi12aWV3QEhleF9jeiIsCiAgInZlcnNpb24iOiA3Cn0="}
+    "45": {"version": "8", "sha256": "0r1pkn2255fb5qsfg1gkgi3q29yl673znkb0brdmdsvkqqhskgdz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGV4Y3ovU3RhcnQtT3ZlcmxheS1pbi1BcHBsaWNhdGlvbi1WaWV3LWZvci1Hbm9tZS00MC0iLAogICJ1dWlkIjogInN0YXJ0LW92ZXJsYXktaW4tYXBwbGljYXRpb24tdmlld0BIZXhfY3oiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "0r1pkn2255fb5qsfg1gkgi3q29yl673znkb0brdmdsvkqqhskgdz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGV4Y3ovU3RhcnQtT3ZlcmxheS1pbi1BcHBsaWNhdGlvbi1WaWV3LWZvci1Hbm9tZS00MC0iLAogICJ1dWlkIjogInN0YXJ0LW92ZXJsYXktaW4tYXBwbGljYXRpb24tdmlld0BIZXhfY3oiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "0r1pkn2255fb5qsfg1gkgi3q29yl673znkb0brdmdsvkqqhskgdz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGV4Y3ovU3RhcnQtT3ZlcmxheS1pbi1BcHBsaWNhdGlvbi1WaWV3LWZvci1Hbm9tZS00MC0iLAogICJ1dWlkIjogInN0YXJ0LW92ZXJsYXktaW4tYXBwbGljYXRpb24tdmlld0BIZXhfY3oiLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "eortologio@danchris.github.io", "name": "Eortologio", "pname": "eortologio-extension", "description": "Simple gnome extension to display the greek namedays", "link": "https://extensions.gnome.org/extension/5046/eortologio-extension/", "shell_version_map": {
     "41": {"version": "6", "sha256": "0s5wgccri95gsv6alvd7cd2hsprmdap3sfpcaxa3s3apl0c0p9xf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBleHRlbnNpb24gdG8gZGlzcGxheSB0aGUgZ3JlZWsgbmFtZWRheXMiLAogICJuYW1lIjogIkVvcnRvbG9naW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuY2hyaXMvZW9ydG9sb2dpby1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImVvcnRvbG9naW9AZGFuY2hyaXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -5097,8 +5340,9 @@
     "42": {"version": "5", "sha256": "0q8x7fz5mc03dff4gx18vszsqbhcaryi9c9a1krmcm5djqnkhrq5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94cmVtYXAveHJlbWFwLWdub21lIiwKICAidXVpZCI6ICJ4cmVtYXBAazBrdWJ1bi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "43": {"version": "5", "sha256": "0q8x7fz5mc03dff4gx18vszsqbhcaryi9c9a1krmcm5djqnkhrq5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94cmVtYXAveHJlbWFwLWdub21lIiwKICAidXVpZCI6ICJ4cmVtYXBAazBrdWJ1bi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "44": {"version": "5", "sha256": "0q8x7fz5mc03dff4gx18vszsqbhcaryi9c9a1krmcm5djqnkhrq5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94cmVtYXAveHJlbWFwLWdub21lIiwKICAidXVpZCI6ICJ4cmVtYXBAazBrdWJ1bi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
-    "45": {"version": "7", "sha256": "1fix56jmvh0924vrk9sqi9ynz841zlag255paiz7b7fi61dijy1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94cmVtYXAveHJlbWFwLWdub21lIiwKICAidXVpZCI6ICJ4cmVtYXBAazBrdWJ1bi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
-    "46": {"version": "7", "sha256": "1fix56jmvh0924vrk9sqi9ynz841zlag255paiz7b7fi61dijy1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94cmVtYXAveHJlbWFwLWdub21lIiwKICAidXVpZCI6ICJ4cmVtYXBAazBrdWJ1bi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
+    "45": {"version": "8", "sha256": "0nr3zm0wf8mw5g3wzh22wa3ngp2cv0jfsx5vs2231b43hwysmvn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHJlbWFwL3hyZW1hcC1nbm9tZSIsCiAgInV1aWQiOiAieHJlbWFwQGswa3VidW4uY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "0nr3zm0wf8mw5g3wzh22wa3ngp2cv0jfsx5vs2231b43hwysmvn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHJlbWFwL3hyZW1hcC1nbm9tZSIsCiAgInV1aWQiOiAieHJlbWFwQGswa3VidW4uY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "0nr3zm0wf8mw5g3wzh22wa3ngp2cv0jfsx5vs2231b43hwysmvn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHJlbWFwL3hyZW1hcC1nbm9tZSIsCiAgInV1aWQiOiAieHJlbWFwQGswa3VidW4uY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "dollar-clp@albolea.github.com", "name": "Dollar-CLP", "pname": "dollar-clp", "description": "(USD US Dollar) converted to (CLP Peso Chileno). Updates are received every 30 seconds and are based on information provided by AwesomeAPI API, which can be consulted directly by accessing the address https://docs.awesomeapi.com.br. (based on michael.mattos's Dollar https://extensions.gnome.org/extension/4573/dollar/)", "link": "https://extensions.gnome.org/extension/5066/dollar-clp/", "shell_version_map": {
     "38": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -5161,7 +5405,8 @@
     "43": {"version": "22", "sha256": "16bsn3mpd66p3p7yz56zr0ghglj8y8cmlrvn8q8fdvvrj2srkjvf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSAnQWN0aXZpdGllcycgYnV0dG9uIHdpdGggYW4gaTMtbGlrZSB3b3Jrc3BhY2VzIGJhci5cblxuT3JpZ2luYWxseSBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEJhciBieSBmdGh4LCB0aGlzIGV4dGVuc2lvbiBncmV3IGludG8gYSBtb3JlIGNvbXByZWhlbnNpdmUgc2V0IG9mIGZlYXR1cmVzIHRvIHN1cHBvcnQgYSB3b3Jrc3BhY2UtYmFzZWQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzOlxuLSAgIEZpcnN0IGNsYXNzIHN1cHBvcnQgZm9yIHN0YXRpYyBhbmQgZHluYW1pYyB3b3Jrc3BhY2VzIGFzIHdlbGwgYXMgbXVsdGktbW9uaXRvciBzZXR1cHNcbi0gICBBZGQsIHJlbW92ZSwgYW5kIHJlbmFtZSB3b3Jrc3BhY2VzXG4tICAgUmVhcnJhbmdlIHdvcmtzcGFjZXMgdmlhIGRyYWcgYW5kIGRyb3Bcbi0gICBBdXRvbWF0aWNhbGx5IGFzc2lnbiB3b3Jrc3BhY2UgbmFtZXMgYmFzZWQgb24gc3RhcnRlZCBhcHBsaWNhdGlvbnNcbi0gICBLZXlib2FyZCBzaG9ydGN1dHMgZXh0ZW5kIGFuZCByZWZpbmUgc3lzdGVtIHNob3J0Y3V0c1xuLSAgIFNjcm9sbCB0aHJvdWdoIHdvcmtzcGFjZXMgYnkgbW91c2Ugd2hlZWwgb3ZlciB0aGUgcGFuZWxcbi0gICBDdXN0b21pemUgdGhlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNwYWNlIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcGFjZS1iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL3NwYWNlLWJhciIsCiAgInV1aWQiOiAic3BhY2UtYmFyQGx1Y2hyaW9oIiwKICAidmVyc2lvbiI6IDIyCn0="},
     "44": {"version": "22", "sha256": "16bsn3mpd66p3p7yz56zr0ghglj8y8cmlrvn8q8fdvvrj2srkjvf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSAnQWN0aXZpdGllcycgYnV0dG9uIHdpdGggYW4gaTMtbGlrZSB3b3Jrc3BhY2VzIGJhci5cblxuT3JpZ2luYWxseSBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEJhciBieSBmdGh4LCB0aGlzIGV4dGVuc2lvbiBncmV3IGludG8gYSBtb3JlIGNvbXByZWhlbnNpdmUgc2V0IG9mIGZlYXR1cmVzIHRvIHN1cHBvcnQgYSB3b3Jrc3BhY2UtYmFzZWQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzOlxuLSAgIEZpcnN0IGNsYXNzIHN1cHBvcnQgZm9yIHN0YXRpYyBhbmQgZHluYW1pYyB3b3Jrc3BhY2VzIGFzIHdlbGwgYXMgbXVsdGktbW9uaXRvciBzZXR1cHNcbi0gICBBZGQsIHJlbW92ZSwgYW5kIHJlbmFtZSB3b3Jrc3BhY2VzXG4tICAgUmVhcnJhbmdlIHdvcmtzcGFjZXMgdmlhIGRyYWcgYW5kIGRyb3Bcbi0gICBBdXRvbWF0aWNhbGx5IGFzc2lnbiB3b3Jrc3BhY2UgbmFtZXMgYmFzZWQgb24gc3RhcnRlZCBhcHBsaWNhdGlvbnNcbi0gICBLZXlib2FyZCBzaG9ydGN1dHMgZXh0ZW5kIGFuZCByZWZpbmUgc3lzdGVtIHNob3J0Y3V0c1xuLSAgIFNjcm9sbCB0aHJvdWdoIHdvcmtzcGFjZXMgYnkgbW91c2Ugd2hlZWwgb3ZlciB0aGUgcGFuZWxcbi0gICBDdXN0b21pemUgdGhlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNwYWNlIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcGFjZS1iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL3NwYWNlLWJhciIsCiAgInV1aWQiOiAic3BhY2UtYmFyQGx1Y2hyaW9oIiwKICAidmVyc2lvbiI6IDIyCn0="},
     "45": {"version": "24", "sha256": "1xmcp6292vadgwn90j4c21gid8vzq1s5h1lvspr4a78b2bb73q93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSB0b3AtcGFuZWwgd29ya3NwYWNlIGluZGljYXRvciB3aXRoIGFuIGkzLWxpa2Ugd29ya3NwYWNlcyBiYXIuXG5cbk9yaWdpbmFsbHkgYSBmb3JrIG9mIHRoZSBleHRlbnNpb24gV29ya3NwYWNlcyBCYXIgYnkgZnRoeCwgdGhpcyBleHRlbnNpb24gZ3JldyBpbnRvIGEgbW9yZSBjb21wcmVoZW5zaXZlIHNldCBvZiBmZWF0dXJlcyB0byBzdXBwb3J0IGEgd29ya3NwYWNlLWJhc2VkIHdvcmtmbG93LlxuXG5GZWF0dXJlczpcbi0gICBGaXJzdCBjbGFzcyBzdXBwb3J0IGZvciBzdGF0aWMgYW5kIGR5bmFtaWMgd29ya3NwYWNlcyBhcyB3ZWxsIGFzIG11bHRpLW1vbml0b3Igc2V0dXBzXG4tICAgQWRkLCByZW1vdmUsIGFuZCByZW5hbWUgd29ya3NwYWNlc1xuLSAgIFJlYXJyYW5nZSB3b3Jrc3BhY2VzIHZpYSBkcmFnIGFuZCBkcm9wXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG4tICAgQ3VzdG9taXplIHRoZSBhcHBlYXJhbmNlIiwKICAibmFtZSI6ICJTcGFjZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BhY2UtYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvc3BhY2UtYmFyIiwKICAidXVpZCI6ICJzcGFjZS1iYXJAbHVjaHJpb2giLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
-    "46": {"version": "27", "sha256": "1x294z9zfmi6hr2zqw94bhpih4qilr368xjvjq5x2lhkimvmxk17", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSB0b3AtcGFuZWwgd29ya3NwYWNlIGluZGljYXRvciB3aXRoIGFuIGkzLWxpa2Ugd29ya3NwYWNlcyBiYXIuXG5cbk9yaWdpbmFsbHkgYSBmb3JrIG9mIHRoZSBleHRlbnNpb24gV29ya3NwYWNlcyBCYXIgYnkgZnRoeCwgdGhpcyBleHRlbnNpb24gZ3JldyBpbnRvIGEgbW9yZSBjb21wcmVoZW5zaXZlIHNldCBvZiBmZWF0dXJlcyB0byBzdXBwb3J0IGEgd29ya3NwYWNlLWJhc2VkIHdvcmtmbG93LlxuXG5GZWF0dXJlczpcbi0gICBGaXJzdCBjbGFzcyBzdXBwb3J0IGZvciBzdGF0aWMgYW5kIGR5bmFtaWMgd29ya3NwYWNlcyBhcyB3ZWxsIGFzIG11bHRpLW1vbml0b3Igc2V0dXBzXG4tICAgQWRkLCByZW1vdmUsIGFuZCByZW5hbWUgd29ya3NwYWNlc1xuLSAgIFJlYXJyYW5nZSB3b3Jrc3BhY2VzIHZpYSBkcmFnIGFuZCBkcm9wXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG4tICAgQ3VzdG9taXplIHRoZSBhcHBlYXJhbmNlIiwKICAibmFtZSI6ICJTcGFjZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BhY2UtYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvc3BhY2UtYmFyIiwKICAidXVpZCI6ICJzcGFjZS1iYXJAbHVjaHJpb2giLAogICJ2ZXJzaW9uIjogMjcKfQ=="}
+    "46": {"version": "31", "sha256": "1c9y6xhdnh5igy76jhks8sh35p8d4lnr6fxrkk3a3glz6r5y1yc0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSB0b3AtcGFuZWwgd29ya3NwYWNlIGluZGljYXRvciB3aXRoIGFuIGkzLWxpa2Ugd29ya3NwYWNlcyBiYXIuXG5cbk9yaWdpbmFsbHkgYSBmb3JrIG9mIHRoZSBleHRlbnNpb24gV29ya3NwYWNlcyBCYXIgYnkgZnRoeCwgdGhpcyBleHRlbnNpb24gZ3JldyBpbnRvIGEgbW9yZSBjb21wcmVoZW5zaXZlIHNldCBvZiBmZWF0dXJlcyB0byBzdXBwb3J0IGEgd29ya3NwYWNlLWJhc2VkIHdvcmtmbG93LlxuXG5GZWF0dXJlczpcbi0gICBGaXJzdCBjbGFzcyBzdXBwb3J0IGZvciBzdGF0aWMgYW5kIGR5bmFtaWMgd29ya3NwYWNlcyBhcyB3ZWxsIGFzIG11bHRpLW1vbml0b3Igc2V0dXBzXG4tICAgQWRkLCByZW1vdmUsIGFuZCByZW5hbWUgd29ya3NwYWNlc1xuLSAgIFJlYXJyYW5nZSB3b3Jrc3BhY2VzIHZpYSBkcmFnIGFuZCBkcm9wXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG4tICAgQ3VzdG9taXplIHRoZSBhcHBlYXJhbmNlIiwKICAibmFtZSI6ICJTcGFjZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BhY2UtYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL3NwYWNlLWJhciIsCiAgInV1aWQiOiAic3BhY2UtYmFyQGx1Y2hyaW9oIiwKICAidmVyc2lvbiI6IDMxCn0="},
+    "47": {"version": "31", "sha256": "1c9y6xhdnh5igy76jhks8sh35p8d4lnr6fxrkk3a3glz6r5y1yc0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSB0b3AtcGFuZWwgd29ya3NwYWNlIGluZGljYXRvciB3aXRoIGFuIGkzLWxpa2Ugd29ya3NwYWNlcyBiYXIuXG5cbk9yaWdpbmFsbHkgYSBmb3JrIG9mIHRoZSBleHRlbnNpb24gV29ya3NwYWNlcyBCYXIgYnkgZnRoeCwgdGhpcyBleHRlbnNpb24gZ3JldyBpbnRvIGEgbW9yZSBjb21wcmVoZW5zaXZlIHNldCBvZiBmZWF0dXJlcyB0byBzdXBwb3J0IGEgd29ya3NwYWNlLWJhc2VkIHdvcmtmbG93LlxuXG5GZWF0dXJlczpcbi0gICBGaXJzdCBjbGFzcyBzdXBwb3J0IGZvciBzdGF0aWMgYW5kIGR5bmFtaWMgd29ya3NwYWNlcyBhcyB3ZWxsIGFzIG11bHRpLW1vbml0b3Igc2V0dXBzXG4tICAgQWRkLCByZW1vdmUsIGFuZCByZW5hbWUgd29ya3NwYWNlc1xuLSAgIFJlYXJyYW5nZSB3b3Jrc3BhY2VzIHZpYSBkcmFnIGFuZCBkcm9wXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG4tICAgQ3VzdG9taXplIHRoZSBhcHBlYXJhbmNlIiwKICAibmFtZSI6ICJTcGFjZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3BhY2UtYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL3NwYWNlLWJhciIsCiAgInV1aWQiOiAic3BhY2UtYmFyQGx1Y2hyaW9oIiwKICAidmVyc2lvbiI6IDMxCn0="}
   }}
 , {"uuid": "gnome-shellext-hide-lock@adyrosebrigg", "name": "Hide Lock item in System Menu", "pname": "hide-lock-item-in-system-menu", "description": "Hides the \"Lock\" option from the system menu dropdown in the top right.", "link": "https://extensions.gnome.org/extension/5091/hide-lock-item-in-system-menu/", "shell_version_map": {
     "42": {"version": "2", "sha256": "0ab3yc5z9yhvp21145cfgh88sby4x464argy12c80anyhf55zm79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBcIkxvY2tcIiBvcHRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUgZHJvcGRvd24gaW4gdGhlIHRvcCByaWdodC4iLAogICJuYW1lIjogIkhpZGUgTG9jayBpdGVtIGluIFN5c3RlbSBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FkeXJvc2VicmlnZy9nbm9tZS1zaGVsbGV4dC1oaWRlLWxvY2siLAogICJ1dWlkIjogImdub21lLXNoZWxsZXh0LWhpZGUtbG9ja0BhZHlyb3NlYnJpZ2ciLAogICJ2ZXJzaW9uIjogMgp9"}
@@ -5180,39 +5425,45 @@
     "42": {"version": "21", "sha256": "06hfl07q9v6r6igys09c2bk7r1jdv588nl6m1br382fl8b6g5bgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
     "43": {"version": "21", "sha256": "06hfl07q9v6r6igys09c2bk7r1jdv588nl6m1br382fl8b6g5bgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
     "44": {"version": "21", "sha256": "06hfl07q9v6r6igys09c2bk7r1jdv588nl6m1br382fl8b6g5bgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
-    "45": {"version": "33", "sha256": "019j0gskzfdh1snbhyqxhiskyqaqhszsw5flapmx6ndwcn5fjybs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgImdldHRleHQtZG9tYWluIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
-    "46": {"version": "33", "sha256": "019j0gskzfdh1snbhyqxhiskyqaqhszsw5flapmx6ndwcn5fjybs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgImdldHRleHQtZG9tYWluIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}
+    "45": {"version": "34", "sha256": "14mnd6gbi8wb1kpdipwnrr3lxl0rz4lrp7w6pf16lmc0djay3agf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgImdldHRleHQtZG9tYWluIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0aWNrbWFuXzB4MDAvZ25vbWVfc2hlbGxfZXh0ZW5zaW9uX2RvY2tlciIsCiAgInV1aWQiOiAiZG9ja2VyQHN0aWNrbWFuXzB4MDAuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="},
+    "46": {"version": "34", "sha256": "14mnd6gbi8wb1kpdipwnrr3lxl0rz4lrp7w6pf16lmc0djay3agf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgImdldHRleHQtZG9tYWluIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0aWNrbWFuXzB4MDAvZ25vbWVfc2hlbGxfZXh0ZW5zaW9uX2RvY2tlciIsCiAgInV1aWQiOiAiZG9ja2VyQHN0aWNrbWFuXzB4MDAuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="},
+    "47": {"version": "34", "sha256": "14mnd6gbi8wb1kpdipwnrr3lxl0rz4lrp7w6pf16lmc0djay3agf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgImdldHRleHQtZG9tYWluIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0aWNrbWFuXzB4MDAvZ25vbWVfc2hlbGxfZXh0ZW5zaW9uX2RvY2tlciIsCiAgInV1aWQiOiAiZG9ja2VyQHN0aWNrbWFuXzB4MDAuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="}
   }}
 , {"uuid": "reboottouefi@ubaygd.com", "name": "RebootToUEFI", "pname": "reboottouefi", "description": "Reboot system into UEFI", "link": "https://extensions.gnome.org/extension/5105/reboottouefi/", "shell_version_map": {
     "42": {"version": "14", "sha256": "1yqp2hhmcymzjyq3shwh1cld423iah9s8s3caqmjrln7vjh4syrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVWJheUdEL3JlYm9vdHRvdWVmaSIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "43": {"version": "14", "sha256": "1yqp2hhmcymzjyq3shwh1cld423iah9s8s3caqmjrln7vjh4syrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVWJheUdEL3JlYm9vdHRvdWVmaSIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "44": {"version": "14", "sha256": "1yqp2hhmcymzjyq3shwh1cld423iah9s8s3caqmjrln7vjh4syrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVWJheUdEL3JlYm9vdHRvdWVmaSIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
-    "45": {"version": "22", "sha256": "167i8z1i04b9q5isbrwd8a7n6rw6w23qc7nvck8w7qrls83cc280", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="},
-    "46": {"version": "22", "sha256": "167i8z1i04b9q5isbrwd8a7n6rw6w23qc7nvck8w7qrls83cc280", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}
+    "45": {"version": "23", "sha256": "0cdkibbqkxgzh77a85bawb73p9b2mlg3h8zmbkm0rlqmsmq4yzk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "46": {"version": "23", "sha256": "0cdkibbqkxgzh77a85bawb73p9b2mlg3h8zmbkm0rlqmsmq4yzk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "47": {"version": "23", "sha256": "0cdkibbqkxgzh77a85bawb73p9b2mlg3h8zmbkm0rlqmsmq4yzk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}
   }}
 , {"uuid": "touch-ux@dblandford.com", "name": "Touch-UX", "pname": "touch-ux", "description": "Provides a swipe up gesture bar and a status bar shortcut to force the on screen keyboard to show in scenarios that it does not automatically show when expected.", "link": "https://extensions.gnome.org/extension/5108/touch-ux/", "shell_version_map": {
     "42": {"version": "3", "sha256": "1vjchsz0jml0qaj2mz0khsagacxz1m60ypcjnymh3swrx9lj765m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgc3dpcGUgdXAgZ2VzdHVyZSBiYXIgYW5kIGEgc3RhdHVzIGJhciBzaG9ydGN1dCB0byBmb3JjZSB0aGUgb24gc2NyZWVuIGtleWJvYXJkIHRvIHNob3cgaW4gc2NlbmFyaW9zIHRoYXQgaXQgZG9lcyBub3QgYXV0b21hdGljYWxseSBzaG93IHdoZW4gZXhwZWN0ZWQuIiwKICAibmFtZSI6ICJUb3VjaC1VWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EYW5pZWwtQmxhbmRmb3JkL1RvdWNoLVVYIiwKICAidXVpZCI6ICJ0b3VjaC11eEBkYmxhbmRmb3JkLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
-, {"uuid": "display-scale-switcher@knokelmaat.gitlab.com", "name": "Display Scale Switcher", "pname": "display-scale-switcher", "description": "Quickly change the display scaling factor from the system menu.", "link": "https://extensions.gnome.org/extension/5111/display-scale-switcher/", "shell_version_map": {
+, {"uuid": "display-scale-switcher@knokelmaat.gitlab.com", "name": "Display Scale Switcher", "pname": "display-scale-switcher", "description": "Quickly change the display scaling factor from the system menu. This extension only supports the situation where a single monitor is connected.\n\nFor more features and support for multiple displays, see my newer Display Configuration Switcher extension (https://extensions.gnome.org/extension/7281/display-configuration-switcher/).", "link": "https://extensions.gnome.org/extension/5111/display-scale-switcher/", "shell_version_map": {
     "42": {"version": "1", "sha256": "14yd0xzgqvqxq1s11pbspqn1y1sqjsdgq2giqkwf8r1n2rn1wc94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="},
     "43": {"version": "3", "sha256": "0lkyfzks9l7y784rswadfg831rfqk5jknzzg5pvbjqhyk6v22cc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
     "44": {"version": "4", "sha256": "0psqqzb033nb3d296r42cxhgz5a1z7x2kr058nn71lk2x0vd26k5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "45": {"version": "6", "sha256": "09gaividimnbgpgmi6k2a47jzhmpggn0bsvvsq6fhk43mmbpqfp3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kaXNwbGF5LXNjYWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tub2tlbG1hYXQvZGlzcGxheS1zY2FsZS1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpc3BsYXktc2NhbGUtc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "7", "sha256": "12r93ax9djhxfjkv0w60f65i0d4rmndqj604fbyq621j8nk92yd7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kaXNwbGF5LXNjYWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tub2tlbG1hYXQvZGlzcGxheS1zY2FsZS1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpc3BsYXktc2NhbGUtc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "46": {"version": "8", "sha256": "18b845bimba0zhgbv511qhvqcbj4cc0sfvnv83f2wgq0yqdbkb1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiBUaGlzIGV4dGVuc2lvbiBvbmx5IHN1cHBvcnRzIHRoZSBzaXR1YXRpb24gd2hlcmUgYSBzaW5nbGUgbW9uaXRvciBpcyBjb25uZWN0ZWQuXG5cbkZvciBtb3JlIGZlYXR1cmVzIGFuZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBkaXNwbGF5cywgc2VlIG15IG5ld2VyIERpc3BsYXkgQ29uZmlndXJhdGlvbiBTd2l0Y2hlciBleHRlbnNpb24gKGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzcyODEvZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyLykuIiwKICAibmFtZSI6ICJEaXNwbGF5IFNjYWxlIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktc2NhbGUtc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tub2tlbG1hYXQvZGlzcGxheS1zY2FsZS1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpc3BsYXktc2NhbGUtc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "18b845bimba0zhgbv511qhvqcbj4cc0sfvnv83f2wgq0yqdbkb1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiBUaGlzIGV4dGVuc2lvbiBvbmx5IHN1cHBvcnRzIHRoZSBzaXR1YXRpb24gd2hlcmUgYSBzaW5nbGUgbW9uaXRvciBpcyBjb25uZWN0ZWQuXG5cbkZvciBtb3JlIGZlYXR1cmVzIGFuZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBkaXNwbGF5cywgc2VlIG15IG5ld2VyIERpc3BsYXkgQ29uZmlndXJhdGlvbiBTd2l0Y2hlciBleHRlbnNpb24gKGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzcyODEvZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyLykuIiwKICAibmFtZSI6ICJEaXNwbGF5IFNjYWxlIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktc2NhbGUtc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tub2tlbG1hYXQvZGlzcGxheS1zY2FsZS1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpc3BsYXktc2NhbGUtc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "tailscale-status@maxgallup.github.com", "name": "Tailscale Status", "pname": "tailscale-status", "description": "Manage Tailscale connections and check status from desktop read more at https://github.com/maxgallup/tailscale-status/blob/main/README.md", "link": "https://extensions.gnome.org/extension/5112/tailscale-status/", "shell_version_map": {
     "42": {"version": "32", "sha256": "1gma0x3mwyz5hdqhabk1f9x3b05ialmlxfgwjismih8b13gw2kcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
     "43": {"version": "32", "sha256": "1gma0x3mwyz5hdqhabk1f9x3b05ialmlxfgwjismih8b13gw2kcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
     "44": {"version": "32", "sha256": "1gma0x3mwyz5hdqhabk1f9x3b05ialmlxfgwjismih8b13gw2kcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
-    "45": {"version": "33", "sha256": "04phm7kfzrbn7f303cfpwd434vxszwplhjmzglscy0zg7701facs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21heGdhbGx1cC90YWlsc2NhbGUtc3RhdHVzIiwKICAidXVpZCI6ICJ0YWlsc2NhbGUtc3RhdHVzQG1heGdhbGx1cC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMzCn0="},
-    "46": {"version": "33", "sha256": "04phm7kfzrbn7f303cfpwd434vxszwplhjmzglscy0zg7701facs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21heGdhbGx1cC90YWlsc2NhbGUtc3RhdHVzIiwKICAidXVpZCI6ICJ0YWlsc2NhbGUtc3RhdHVzQG1heGdhbGx1cC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMzCn0="}
+    "45": {"version": "34", "sha256": "1fs4jby15sycyadnd098hh9vck0f9iwpyp88n8hrx5r8cf8wym7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"},
+    "46": {"version": "34", "sha256": "1fs4jby15sycyadnd098hh9vck0f9iwpyp88n8hrx5r8cf8wym7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"},
+    "47": {"version": "34", "sha256": "1fs4jby15sycyadnd098hh9vck0f9iwpyp88n8hrx5r8cf8wym7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"}
   }}
-, {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a Gnome Shell Extension that adds a Timer to the Panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {
+, {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a GNOME Shell Extension that adds a timer to your panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {
     "41": {"version": "1", "sha256": "1rmrw8nl96jficz5lmrbqxj3bama9a9q165jcz4099150brs5k6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
     "42": {"version": "9", "sha256": "1jrvwj1z5sr4cp54mb7yjp7qahrjh8yikyi8zzi6bkfkq05bcis3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "1jrvwj1z5sr4cp54mb7yjp7qahrjh8yikyi8zzi6bkfkq05bcis3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "9", "sha256": "1jrvwj1z5sr4cp54mb7yjp7qahrjh8yikyi8zzi6bkfkq05bcis3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "45": {"version": "11", "sha256": "1yhrwjj0mb4fw5rhp98ah4mccq9hcqj1hvlwxds45w3jbr3v6zxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "12", "sha256": "1cayp94qbs86z27ls26xw7lfzbpsv8b3dscha1hkjmzxfkcjvs3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFqb3J0b21WUi9zaW1wbGUtdGltZXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzaW1wbGUtdGltZXJAbWFqb3J0b212ci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "1cayp94qbs86z27ls26xw7lfzbpsv8b3dscha1hkjmzxfkcjvs3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFqb3J0b21WUi9zaW1wbGUtdGltZXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzaW1wbGUtdGltZXJAbWFqb3J0b212ci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "1cayp94qbs86z27ls26xw7lfzbpsv8b3dscha1hkjmzxfkcjvs3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFqb3J0b21WUi9zaW1wbGUtdGltZXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzaW1wbGUtdGltZXJAbWFqb3J0b212ci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "translate-assistant@atareao.es", "name": "Translate assistant", "pname": "translate-assistant", "description": "Translate with DeepL Translator", "link": "https://extensions.gnome.org/extension/5124/translate-assistant/", "shell_version_map": {
     "42": {"version": "6", "sha256": "0rql3ax7m3pr8g5h7iadl4isa2wv2wyzl9n0nihwf2js19i6ya97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3aXRoIERlZXBMIFRyYW5zbGF0b3IiLAogICJleHRlbnNpb24taWQiOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0cmFuc2xhdGUtYXNzaXN0YW50LWljb24iLAogICJuYW1lIjogIlRyYW5zbGF0ZSBhc3Npc3RhbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3RyYW5zbGF0ZS1hc3Npc3RhbnQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1hc3Npc3RhbnRAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -5233,7 +5484,8 @@
     "43": {"version": "13", "sha256": "0pp6fiza9wq170r95fasb97qw9jxd606q958xxnb9r23zrnsijnh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGFwcHMgYnV0dG9uIChsZWZ0IGNsaWNrIHRvIGVudGVyIG92ZXJ2aWV3LCByaWdodCBjbGljayB0byBzaG93IGFwcHMgb3ZlcnZpZXcpLlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIgKGxlZnQgY2xpY2sgdG8gdG9nZ2xlIG9yIGN5Y2xlLCByaWdodCBjbGljayB0byBzaG93IGFwcCBtZW51LCBtaWRkbGUgY2xpY2sgdG8gb3BlbiBuZXcgd2luZG93KS5cblxuIC0gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "44": {"version": "14", "sha256": "0d11h4agppa4f2xwz52hjy4s03p712dgivznhk72sywi4p7rz1dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGFwcHMgYnV0dG9uIChsZWZ0IGNsaWNrIHRvIGVudGVyIG92ZXJ2aWV3LCByaWdodCBjbGljayB0byBzaG93IGFwcHMgb3ZlcnZpZXcpLlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIgKGxlZnQgY2xpY2sgdG8gdG9nZ2xlIG9yIGN5Y2xlLCByaWdodCBjbGljayB0byBzaG93IGFwcCBtZW51LCBtaWRkbGUgY2xpY2sgdG8gb3BlbiBuZXcgd2luZG93KS5cblxuIC0gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2hiYXIiLAogICJ1dWlkIjogImRhc2hiYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxNAp9"},
     "45": {"version": "23", "sha256": "00p3s5bqqj8g9rjd8pcp059n6gf7hkpka4sfchp9pmlsr90yki5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gU29tZSBsaW1pdGVkIHNldHRpbmdzLlxuXG4gRmVhdHVyZXM6XG5cbiAtIEhpZGUgb3ZlcnZpZXcgYXQgc3RhcnQtdXAuXG5cbiAtIFNjcm9sbCBvbiB0YXNrYmFyIG9yIGFjdGl2aXRpZXMgdG8gY2hhbmdlIHdvcmtzcGFjZS5cblxuIC0gU2hvdyBhcHBzIGJ1dHRvbi5cblxuIC0gR05PTUUgU2hlbGwgZGFzaCBpdGVtcyBpbiB0b3AgYmFyIChsZWZ0IGNsaWNrIHRvIHRvZ2dsZSBvciBjeWNsZSwgcmlnaHQgY2xpY2sgdG8gc2hvdyBhcHAgbWVudSwgbWlkZGxlIGNsaWNrIHRvIG9wZW4gbmV3IHdpbmRvdykuXG5cbiAtIERyYWcnbidkcm9wIGZhdm9yaXRlcy5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gLS0tLS0tLS0tLVxuXG4gUGxlYXNlIHJlcG9ydCBhbnkgYnVnIG9ubHkgdGhyb3VnaCBHaXRIdWIsIEknbSBub3Qgbm90aWZpZWQgaGVyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJEYXNoQmFyIHRhc2sgYmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2hiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "46": {"version": "24", "sha256": "1kvmhfnkfcgn0jj9393h3yzj2wgv3d165ai9vcssvpp3i9ssjmb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gU29tZSBzZXR0aW5ncy5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciBvciBhY3Rpdml0aWVzIHRvIGNoYW5nZSB3b3Jrc3BhY2UuXG5cbiAtIFNob3cgYXBwcyBidXR0b24uXG5cbiAtIEdOT01FIFNoZWxsIGRhc2ggaXRlbXMgaW4gdG9wIGJhciAobGVmdCBjbGljayB0byB0b2dnbGUgb3IgY3ljbGUsIHJpZ2h0IGNsaWNrIHRvIHNob3cgYXBwIG1lbnUsIG1pZGRsZSBjbGljayB0byBvcGVuIG5ldyB3aW5kb3cpLlxuXG4gLSBEcmFnJ24nZHJvcCBmYXZvcml0ZXMuXG5cbiAtIENoYW5nZSAnUGxhY2VzJyBleHRlbnNpb24gbGFiZWwgdG8gYW4gaWNvbi5cblxuIC0tLS0tLS0tLS1cblxuIFBsZWFzZSByZXBvcnQgYW55IGJ1ZyBvbmx5IHRocm91Z2ggR2l0SHViLCBJJ20gbm90IG5vdGlmaWVkIGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRGFzaEJhciB0YXNrIGJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGFzaGJhciIsCiAgInV1aWQiOiAiZGFzaGJhckBmdGh4IiwKICAidmVyc2lvbiI6IDI0Cn0="}
+    "46": {"version": "24", "sha256": "1kvmhfnkfcgn0jj9393h3yzj2wgv3d165ai9vcssvpp3i9ssjmb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gU29tZSBzZXR0aW5ncy5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciBvciBhY3Rpdml0aWVzIHRvIGNoYW5nZSB3b3Jrc3BhY2UuXG5cbiAtIFNob3cgYXBwcyBidXR0b24uXG5cbiAtIEdOT01FIFNoZWxsIGRhc2ggaXRlbXMgaW4gdG9wIGJhciAobGVmdCBjbGljayB0byB0b2dnbGUgb3IgY3ljbGUsIHJpZ2h0IGNsaWNrIHRvIHNob3cgYXBwIG1lbnUsIG1pZGRsZSBjbGljayB0byBvcGVuIG5ldyB3aW5kb3cpLlxuXG4gLSBEcmFnJ24nZHJvcCBmYXZvcml0ZXMuXG5cbiAtIENoYW5nZSAnUGxhY2VzJyBleHRlbnNpb24gbGFiZWwgdG8gYW4gaWNvbi5cblxuIC0tLS0tLS0tLS1cblxuIFBsZWFzZSByZXBvcnQgYW55IGJ1ZyBvbmx5IHRocm91Z2ggR2l0SHViLCBJJ20gbm90IG5vdGlmaWVkIGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRGFzaEJhciB0YXNrIGJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGFzaGJhciIsCiAgInV1aWQiOiAiZGFzaGJhckBmdGh4IiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "47": {"version": "25", "sha256": "0iwhpsvnl84q53lyy9zbyhkjjh15gbkihz252fbfbi8bc669p674", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gU29tZSBzZXR0aW5ncy5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciBvciBhY3Rpdml0aWVzIHRvIGNoYW5nZSB3b3Jrc3BhY2UuXG5cbiAtIFNob3cgYXBwcyBidXR0b24uXG5cbiAtIEdOT01FIFNoZWxsIGRhc2ggaXRlbXMgaW4gdG9wIGJhciAobGVmdCBjbGljayB0byB0b2dnbGUgb3IgY3ljbGUsIHJpZ2h0IGNsaWNrIHRvIHNob3cgYXBwIG1lbnUsIG1pZGRsZSBjbGljayB0byBvcGVuIG5ldyB3aW5kb3cpLlxuXG4gLSBEcmFnJ24nZHJvcCBmYXZvcml0ZXMuXG5cbiAtIENoYW5nZSAnUGxhY2VzJyBleHRlbnNpb24gbGFiZWwgdG8gYW4gaWNvbi5cblxuIC0tLS0tLS0tLS1cblxuIFBsZWFzZSByZXBvcnQgYW55IGJ1ZyBvbmx5IHRocm91Z2ggR2l0SHViLCBJJ20gbm90IG5vdGlmaWVkIGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRGFzaEJhciB0YXNrIGJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGFzaGJhciIsCiAgInV1aWQiOiAiZGFzaGJhckBmdGh4IiwKICAidmVyc2lvbiI6IDI1Cn0="}
   }}
 , {"uuid": "extended-screen@free-bots.github.io", "name": "Extended Screen", "pname": "extended-screen", "description": "Enables Gnome's hidden extending screen feature. Available at version 42+.", "link": "https://extensions.gnome.org/extension/5146/extended-screen/", "shell_version_map": {
     "42": {"version": "3", "sha256": "0d9svp0wqawkxvaikj6jhrqjzhs3xc7w6wml57x82036b9krmv6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgR25vbWUncyBoaWRkZW4gZXh0ZW5kaW5nIHNjcmVlbiBmZWF0dXJlLiBBdmFpbGFibGUgYXQgdmVyc2lvbiA0MisuIiwKICAibmFtZSI6ICJFeHRlbmRlZCBTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyZWUtYm90cy9leHRlbmRlZC1zY3JlZW4iLAogICJ1dWlkIjogImV4dGVuZGVkLXNjcmVlbkBmcmVlLWJvdHMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -5252,8 +5504,9 @@
     "42": {"version": "7", "sha256": "0ws6q5hdgygqp9x2jrhjklidyvc7miqs4h34fll7d1947scqw6lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6Y2xvY2siLAogICJ1dWlkIjogImF6Y2xvY2tAYXpjbG9jay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "43": {"version": "7", "sha256": "0ws6q5hdgygqp9x2jrhjklidyvc7miqs4h34fll7d1947scqw6lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6Y2xvY2siLAogICJ1dWlkIjogImF6Y2xvY2tAYXpjbG9jay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "44": {"version": "7", "sha256": "0ws6q5hdgygqp9x2jrhjklidyvc7miqs4h34fll7d1947scqw6lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6Y2xvY2siLAogICJ1dWlkIjogImF6Y2xvY2tAYXpjbG9jay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "45": {"version": "11", "sha256": "1wgzgs9ch93kh1xgb2j8ahbrklkgfwnfg6ridjxbw0hld6znxsqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "46": {"version": "11", "sha256": "1wgzgs9ch93kh1xgb2j8ahbrklkgfwnfg6ridjxbw0hld6znxsqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "45": {"version": "13", "sha256": "126jwibmpx423k5yxgs53r0cj087h7mjqplcw7gxl6apmfb0w0il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6Y2xvY2siLAogICJ1dWlkIjogImF6Y2xvY2tAYXpjbG9jay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "13", "sha256": "126jwibmpx423k5yxgs53r0cj087h7mjqplcw7gxl6apmfb0w0il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6Y2xvY2siLAogICJ1dWlkIjogImF6Y2xvY2tAYXpjbG9jay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "126jwibmpx423k5yxgs53r0cj087h7mjqplcw7gxl6apmfb0w0il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6Y2xvY2siLAogICJ1dWlkIjogImF6Y2xvY2tAYXpjbG9jay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "since-indicator@atareao.es", "name": "Since Indicator", "pname": "since-indicator", "description": "A simple menubar app for GNOME Shell that tracks how long you've been using your computer uninterruptedly", "link": "https://extensions.gnome.org/extension/5158/since-indicator/", "shell_version_map": {
     "40": {"version": "4", "sha256": "009g178nkrpwhmvwwaamch3mjby03fiby7qvr0d5mp1dfrzsk3c5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmF0YXJlYW8uZXMvYXBsaWNhY2lvbi9zaW5jZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInNpbmNlLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -5269,27 +5522,30 @@
     "44": {"version": "5", "sha256": "03sgj87145x203s514dbylrvnl2l38y5h59ma723zssmf1300gvh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IiwKICAgICI0My4xIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbERlTWF0dG9zL2RvbGxhci10by1icmwiLAogICJ1dWlkIjogImRvbGxhci10by1icmwiLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {
-    "42": {"version": "8", "sha256": "15aw65xryddic62gil18wg2v6wnbr03ccpq5rwrs5vihvp1wh8fl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicG9wb3Y4OTVhIgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "43": {"version": "8", "sha256": "15aw65xryddic62gil18wg2v6wnbr03ccpq5rwrs5vihvp1wh8fl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicG9wb3Y4OTVhIgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "44": {"version": "8", "sha256": "15aw65xryddic62gil18wg2v6wnbr03ccpq5rwrs5vihvp1wh8fl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicG9wb3Y4OTVhIgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "45": {"version": "10", "sha256": "0gs9i278p458ypir0z75vdbl8bm1f4q038vhjrs09q83n00rk448", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicG9wb3Y4OTVhIgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "46": {"version": "10", "sha256": "0gs9i278p458ypir0z75vdbl8bm1f4q038vhjrs09q83n00rk448", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicG9wb3Y4OTVhIgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
+    "42": {"version": "11", "sha256": "0dx9zzz8vm2knl3hyqk7l0wb0naz741pr9hb7jfaskil3a2wg4fg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L3BvcG92ODk1IgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDExCn0="},
+    "43": {"version": "11", "sha256": "0dx9zzz8vm2knl3hyqk7l0wb0naz741pr9hb7jfaskil3a2wg4fg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L3BvcG92ODk1IgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDExCn0="},
+    "44": {"version": "11", "sha256": "0dx9zzz8vm2knl3hyqk7l0wb0naz741pr9hb7jfaskil3a2wg4fg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L3BvcG92ODk1IgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDExCn0="},
+    "45": {"version": "13", "sha256": "085vq3w4ckq37z0wyc9lksfx070fs10vwc88rjjrk221dgpnmnm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L3BvcG92ODk1IgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "13", "sha256": "085vq3w4ckq37z0wyc9lksfx070fs10vwc88rjjrk221dgpnmnm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L3BvcG92ODk1IgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "085vq3w4ckq37z0wyc9lksfx070fs10vwc88rjjrk221dgpnmnm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L3BvcG92ODk1IgogIH0sCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9ub2ExMXkiLAogICJ1dWlkIjogIm5vYTExeUBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "upower-battery@codilia.com", "name": "UPower Battery", "pname": "upower-battery", "description": "UPower Battery Indicator.", "link": "https://extensions.gnome.org/extension/5165/upower-battery/", "shell_version_map": {
     "42": {"version": "10", "sha256": "0ca4nlss4j5rmq8xaqvjxxacdhb1vlmydqp4cal77mgzk79q63nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "43": {"version": "10", "sha256": "0ca4nlss4j5rmq8xaqvjxxacdhb1vlmydqp4cal77mgzk79q63nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "44": {"version": "10", "sha256": "0ca4nlss4j5rmq8xaqvjxxacdhb1vlmydqp4cal77mgzk79q63nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "45": {"version": "20", "sha256": "1nbhhj7gc4r9584rm66lqfgb9saqsgvip7ki4mdmcp6204yf49qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "46": {"version": "20", "sha256": "1nbhhj7gc4r9584rm66lqfgb9saqsgvip7ki4mdmcp6204yf49qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}
+    "45": {"version": "21", "sha256": "0m3b146d3lqg747fns9z1mrv26vb1p2jr2q0ww9qs3msjwcjq61n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
+    "46": {"version": "21", "sha256": "0m3b146d3lqg747fns9z1mrv26vb1p2jr2q0ww9qs3msjwcjq61n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
+    "47": {"version": "21", "sha256": "0m3b146d3lqg747fns9z1mrv26vb1p2jr2q0ww9qs3msjwcjq61n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}
   }}
-, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "V-Shell (Vertical Workspaces)", "pname": "vertical-workspaces", "description": "Customize your GNOME Shell UX to suit your workflow, whether you like horizontally or vertically stacked workspaces.\n\nThe \"V\" stands for \"Variable\" and V-Shell supports vertically and horizontally oriented workspaces equally.\n\nV-Shell includes many workarounds to survive conflicts and work with Dash to Dock / Ubuntu Dock extensions and other popular extensions, but issues may occur.\nIf you encounter any problem, first check for conflicts with other extensions and then open an issue on the Github page linked below.\n\nAny feedback is greatly appreciated!\n\nV-Shell features:\n- vertical or horizontal orientation of workspaces\n- customize the overview layout, dimensions and contents\n- alternative overview modes with static workspace preview that reduces unnecessary movement on the screen\n- 4 predefined profiles with different layout and behavior that can be overwritten by your settings\n- wallpaper background with adjustable blur effect in the overview\n- dash icon size, content, icon click and scroll behavior\n- app grid dimensions, icons size, contents and behavior\n- active icons in the folder preview\n- close workspace button on workspace thumbnail\n- main panel position and visibility\n- hot corner/edge position and behavior\n- notifications, OSD and workspace switcher popup position\n- custom window attention handler behavior\n- improved app search provider with custom icon size\n- static background in the workspace switcher animation outside of the overview\n- independent workspace switching for each monitor (workaround)\n- workspace switcher popup appears even when switching workspace with a gesture\n- workspace isolated Dash\n- fixes (works around) several upstream bugs (known and reported)\n- modular structure of the V-Shell allows you to disable modules that you don't need or conflict with other extension that you like better for the task", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {
+, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "V-Shell (optional vertical workspaces)", "pname": "vertical-workspaces", "description": "Customize your GNOME Shell UX to suit your workflow, whether you like horizontally or vertically stacked workspaces. The \"V\" stands for \"Variable\".\n\nV-Shell includes many workarounds to survive conflicts and work with Dash to Dock / Ubuntu Dock extensions and other popular extensions, but issues may occur.\nIf you encounter any problem, first check for conflicts with other extensions and then open an issue on the Github page linked below.\n\nAny feedback is greatly appreciated!\n\nV-Shell features:\n- vertical or horizontal orientation of workspaces\n- customize the overview layout, dimensions and contents\n- alternative overview modes with static workspace preview that reduces unnecessary movement on the screen\n- 4 predefined profiles with different layout and behavior that can be overwritten by your settings\n- wallpaper background with adjustable blur effect in the overview\n- dash icon size, content, icon click and scroll behavior\n- app grid dimensions, icons size, contents and behavior\n- active icons in the folder preview\n- close workspace button on workspace thumbnail\n- main panel position and visibility\n- hot corner/edge position and behavior\n- notifications, OSD and workspace switcher popup position\n- custom window attention handler behavior\n- improved app search provider with custom icon size\n- static background in the workspace switcher animation outside of the overview\n- independent workspace switching for each monitor (workaround)\n- workspace switcher popup appears even when switching workspace with a gesture\n- workspace isolated Dash\n- fixes (works around) several upstream bugs (known and reported)\n- modular structure of the V-Shell allows you to disable modules that you don't need or conflict with other extension that you like better for the task", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {
     "40": {"version": "23", "sha256": "0dp7qbbcs46w1lc2v46cvhfx7r8h1jrp95mhd8wip8c7npmnr66q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cbkRlYXIgdXNlcnMsIHRoZSByZWxpYWJpbGl0eSBhbmQgc3RhYmlsaXR5IG9mIHRoaXMgZXh0ZW5zaW9uIGlzIG15IHByaW9yaXR5LCBpZiB5b3UgZW5jb3VudGVyIGFueSBwcm9ibGVtLCBmaXJzdCBjaGVjayBmb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9ucyBhbmQgdGhlbiBvcGVuIGFuIGlzc3VlIG9uIHRoZSBHaXRodWIgcGFnZSBsaW5rZWQgYmVsb3cuXG5cblYtU2hlbGwgaW5jbHVkZXMgbWFueSB3b3JrYXJvdW5kcyB0byBzdXJ2aXZlIGNvbmZsaWN0cyBhbmQgd29yayB3aXRoIERhc2ggdG8gRG9jayAvIFVidW50dSBEb2NrIGV4dGVuc2lvbnMsIGJ1dCBpc3N1ZXMgbWF5IG9jY3VyLiBJbiBhbnkgY2FzZSwgVi1TaGVsbCB3b3JrcyBiZXR0ZXIgd2l0aG91dCBEYXNoIHRvIERvY2suXG5cbkFueSBmZWVkYmFjayBpcyBncmVhdGx5IGFwcHJlY2lhdGVkLCBidXQgZG9uJ3QgZm9yZ2V0IC0gaWYgeW91IHdhbnQgbWUgdG8gd29yayBmb3IgeW91LCBiZSBuaWNlIDspXG5cblYtU2hlbGwgZmVhdHVyZXM6XG4tIHZlcnRpY2FsIG9yIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlc1xuLSBjdXN0b21pemUgdGhlIG92ZXJ2aWV3IGxheW91dCwgZGltZW5zaW9ucyBhbmQgY29udGVudHNcbi0gYWx0ZXJuYXRpdmUgb3ZlcnZpZXcgbW9kZXMgd2l0aCBzdGF0aWMgd29ya3NwYWNlIHByZXZpZXcgdGhhdCByZWR1Y2VzIHVubmVjZXNzYXJ5IG1vdmVtZW50IG9uIHRoZSBzY3JlZW5cbi0gd2FsbHBhcGVyIGJhY2tncm91bmQgd2l0aCBhZGp1c3RhYmxlIGJsdXIgZWZmZWN0IGluIHRoZSBvdmVydmlld1xuLSBkYXNoIGljb24gc2l6ZSwgY29udGVudCwgaWNvbiBjbGljayBhbmQgc2Nyb2xsIGJlaGF2aW9yXG4tIGFwcCBncmlkIGRpbWVuc2lvbnMsIGljb25zIHNpemUsIGNvbnRlbnRzIGFuZCBiZWhhdmlvclxuLSBhY3RpdmUgaWNvbnMgaW4gdGhlIGZvbGRlciBwcmV2aWV3XG4tIGNsb3NlIHdvcmtzcGFjZSBidXR0b24gb24gd29ya3NwYWNlIHRodW1ibmFpbFxuLSBtYWluIHBhbmVsIHBvc2l0aW9uIGFuZCB2aXNpYmlsaXR5XG4tIGhvdCBjb3JuZXIvZWRnZSBwb3NpdGlvbiBhbmQgYmVoYXZpb3Jcbi0gbm90aWZpY2F0aW9ucywgT1NEIGFuZCB3b3Jrc3BhY2Ugc3dpdGNoZXIgcG9wdXAgcG9zaXRpb25cbi0gY3VzdG9tIHdpbmRvdyBhdHRlbnRpb24gaGFuZGxlciBiZWhhdmlvclxuLSBpbXByb3ZlZCBhcHAgc2VhcmNoIHByb3ZpZGVyIHdpdGggY3VzdG9tIGljb24gc2l6ZVxuLSB3aW5kb3cgc2VhcmNoIHByb3ZpZGVyIGZvciBxdWljayBuYXZpZ2F0aW9uIGJldHdlZW4gd2luZG93c1xuLSByZWNlbnQgZmlsZXMgc2VhcmNoIHByb3ZpZGVyXG4tIHN0YXRpYyBiYWNrZ3JvdW5kIGluIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgYW5pbWF0aW9uIG91dHNpZGUgb2YgdGhlIG92ZXJ2aWV3XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJzIGV2ZW4gd2hlbiBzd2l0Y2hpbmcgd29ya3NwYWNlIHdpdGggYSBnZXN0dXJlXG4tIDQgcHJlZGVmaW5lZCBwcm9maWxlcyB3aXRoIGRpZmZlcmVudCBsYXlvdXQgYW5kIGJlaGF2aW9yIHRoYXQgY2FuIGJlIG92ZXJ3cml0dGVuIGJ5IHlvdXIgc2V0dGluZ3Ncbi0gZml4ZXMgKHdvcmtzIGFyb3VuZCkgc2V2ZXJhbCB1cHN0cmVhbSBidWdzIChrbm93biBhbmQgcmVwb3J0ZWQpXG4tIG1vZHVsYXIgc3RydWN0dXJlIG9mIHRoZSBWLVNoZWxsIGFsbG93cyB5b3UgdG8gZGlzYWJsZSBtb2R1bGVzIHRoYXQgeW91IGRvbid0IG5lZWQgb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9uIHRoYXQgeW91IGxpa2UgYmV0dGVyIGZvciB0aGUgdGFzayIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
     "41": {"version": "23", "sha256": "0dp7qbbcs46w1lc2v46cvhfx7r8h1jrp95mhd8wip8c7npmnr66q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cbkRlYXIgdXNlcnMsIHRoZSByZWxpYWJpbGl0eSBhbmQgc3RhYmlsaXR5IG9mIHRoaXMgZXh0ZW5zaW9uIGlzIG15IHByaW9yaXR5LCBpZiB5b3UgZW5jb3VudGVyIGFueSBwcm9ibGVtLCBmaXJzdCBjaGVjayBmb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9ucyBhbmQgdGhlbiBvcGVuIGFuIGlzc3VlIG9uIHRoZSBHaXRodWIgcGFnZSBsaW5rZWQgYmVsb3cuXG5cblYtU2hlbGwgaW5jbHVkZXMgbWFueSB3b3JrYXJvdW5kcyB0byBzdXJ2aXZlIGNvbmZsaWN0cyBhbmQgd29yayB3aXRoIERhc2ggdG8gRG9jayAvIFVidW50dSBEb2NrIGV4dGVuc2lvbnMsIGJ1dCBpc3N1ZXMgbWF5IG9jY3VyLiBJbiBhbnkgY2FzZSwgVi1TaGVsbCB3b3JrcyBiZXR0ZXIgd2l0aG91dCBEYXNoIHRvIERvY2suXG5cbkFueSBmZWVkYmFjayBpcyBncmVhdGx5IGFwcHJlY2lhdGVkLCBidXQgZG9uJ3QgZm9yZ2V0IC0gaWYgeW91IHdhbnQgbWUgdG8gd29yayBmb3IgeW91LCBiZSBuaWNlIDspXG5cblYtU2hlbGwgZmVhdHVyZXM6XG4tIHZlcnRpY2FsIG9yIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlc1xuLSBjdXN0b21pemUgdGhlIG92ZXJ2aWV3IGxheW91dCwgZGltZW5zaW9ucyBhbmQgY29udGVudHNcbi0gYWx0ZXJuYXRpdmUgb3ZlcnZpZXcgbW9kZXMgd2l0aCBzdGF0aWMgd29ya3NwYWNlIHByZXZpZXcgdGhhdCByZWR1Y2VzIHVubmVjZXNzYXJ5IG1vdmVtZW50IG9uIHRoZSBzY3JlZW5cbi0gd2FsbHBhcGVyIGJhY2tncm91bmQgd2l0aCBhZGp1c3RhYmxlIGJsdXIgZWZmZWN0IGluIHRoZSBvdmVydmlld1xuLSBkYXNoIGljb24gc2l6ZSwgY29udGVudCwgaWNvbiBjbGljayBhbmQgc2Nyb2xsIGJlaGF2aW9yXG4tIGFwcCBncmlkIGRpbWVuc2lvbnMsIGljb25zIHNpemUsIGNvbnRlbnRzIGFuZCBiZWhhdmlvclxuLSBhY3RpdmUgaWNvbnMgaW4gdGhlIGZvbGRlciBwcmV2aWV3XG4tIGNsb3NlIHdvcmtzcGFjZSBidXR0b24gb24gd29ya3NwYWNlIHRodW1ibmFpbFxuLSBtYWluIHBhbmVsIHBvc2l0aW9uIGFuZCB2aXNpYmlsaXR5XG4tIGhvdCBjb3JuZXIvZWRnZSBwb3NpdGlvbiBhbmQgYmVoYXZpb3Jcbi0gbm90aWZpY2F0aW9ucywgT1NEIGFuZCB3b3Jrc3BhY2Ugc3dpdGNoZXIgcG9wdXAgcG9zaXRpb25cbi0gY3VzdG9tIHdpbmRvdyBhdHRlbnRpb24gaGFuZGxlciBiZWhhdmlvclxuLSBpbXByb3ZlZCBhcHAgc2VhcmNoIHByb3ZpZGVyIHdpdGggY3VzdG9tIGljb24gc2l6ZVxuLSB3aW5kb3cgc2VhcmNoIHByb3ZpZGVyIGZvciBxdWljayBuYXZpZ2F0aW9uIGJldHdlZW4gd2luZG93c1xuLSByZWNlbnQgZmlsZXMgc2VhcmNoIHByb3ZpZGVyXG4tIHN0YXRpYyBiYWNrZ3JvdW5kIGluIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgYW5pbWF0aW9uIG91dHNpZGUgb2YgdGhlIG92ZXJ2aWV3XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJzIGV2ZW4gd2hlbiBzd2l0Y2hpbmcgd29ya3NwYWNlIHdpdGggYSBnZXN0dXJlXG4tIDQgcHJlZGVmaW5lZCBwcm9maWxlcyB3aXRoIGRpZmZlcmVudCBsYXlvdXQgYW5kIGJlaGF2aW9yIHRoYXQgY2FuIGJlIG92ZXJ3cml0dGVuIGJ5IHlvdXIgc2V0dGluZ3Ncbi0gZml4ZXMgKHdvcmtzIGFyb3VuZCkgc2V2ZXJhbCB1cHN0cmVhbSBidWdzIChrbm93biBhbmQgcmVwb3J0ZWQpXG4tIG1vZHVsYXIgc3RydWN0dXJlIG9mIHRoZSBWLVNoZWxsIGFsbG93cyB5b3UgdG8gZGlzYWJsZSBtb2R1bGVzIHRoYXQgeW91IGRvbid0IG5lZWQgb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9uIHRoYXQgeW91IGxpa2UgYmV0dGVyIGZvciB0aGUgdGFzayIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"},
     "42": {"version": "63", "sha256": "00ywnw9q435g0ycg5x6lkgq8k888sqsrynp17jhiwz7dmx2xr3b9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2MywKICAidmVyc2lvbi1uYW1lIjogIjQ0LjEzIgp9"},
     "43": {"version": "63", "sha256": "00ywnw9q435g0ycg5x6lkgq8k888sqsrynp17jhiwz7dmx2xr3b9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2MywKICAidmVyc2lvbi1uYW1lIjogIjQ0LjEzIgp9"},
     "44": {"version": "63", "sha256": "00ywnw9q435g0ycg5x6lkgq8k888sqsrynp17jhiwz7dmx2xr3b9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2MywKICAidmVyc2lvbi1uYW1lIjogIjQ0LjEzIgp9"},
-    "45": {"version": "65", "sha256": "0xjxi7bandf560c207b06a2mw2xbyap9x7hjjcbfj2amcyydkx7z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMy4xIgp9"},
-    "46": {"version": "65", "sha256": "0xjxi7bandf560c207b06a2mw2xbyap9x7hjjcbfj2amcyydkx7z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMy4xIgp9"}
+    "45": {"version": "70", "sha256": "183s4sjgbzzvrgq1qvg0px1lgvpi6389nr463hv695wk3q4kdmlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "46": {"version": "70", "sha256": "183s4sjgbzzvrgq1qvg0px1lgvpi6389nr463hv695wk3q4kdmlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "47": {"version": "70", "sha256": "183s4sjgbzzvrgq1qvg0px1lgvpi6389nr463hv695wk3q4kdmlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="}
   }}
 , {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": {
     "42": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
@@ -5310,8 +5566,9 @@
     "42": {"version": "4", "sha256": "02zh6hqv3l7r9m4im864hjpyhjsyblvvclinl817q6vmbbniq5f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "4", "sha256": "02zh6hqv3l7r9m4im864hjpyhjsyblvvclinl817q6vmbbniq5f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "44": {"version": "4", "sha256": "02zh6hqv3l7r9m4im864hjpyhjsyblvvclinl817q6vmbbniq5f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "45": {"version": "6", "sha256": "0baab2h9bd6qqwpcciwvk6j93aifpmnwlz03xp4ryib13hkwpsx7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2LmJldGEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21taW1vbiIsCiAgInV1aWQiOiAic3VwZXIta2V5QHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
-    "46": {"version": "6", "sha256": "0baab2h9bd6qqwpcciwvk6j93aifpmnwlz03xp4ryib13hkwpsx7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2LmJldGEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21taW1vbiIsCiAgInV1aWQiOiAic3VwZXIta2V5QHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}
+    "45": {"version": "7", "sha256": "02cxns3a9pydc7zdslqwqgvyj0f2lhwb4yf74mw5fq67n3067q54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "46": {"version": "7", "sha256": "02cxns3a9pydc7zdslqwqgvyj0f2lhwb4yf74mw5fq67n3067q54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "47": {"version": "7", "sha256": "02cxns3a9pydc7zdslqwqgvyj0f2lhwb4yf74mw5fq67n3067q54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "quick-google-meet@gmail.com", "name": "Quick Google Meet", "pname": "quick-google-meet", "description": "Quick open your personal google meet conference. This extension is not affiliated with Google", "link": "https://extensions.gnome.org/extension/5189/quick-google-meet/", "shell_version_map": {
     "42": {"version": "2", "sha256": "17c0yrnwfanfp8jmmzwk87si5g93bchp7rhf6k2srf788pcbiifr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIG9wZW4geW91ciBwZXJzb25hbCBnb29nbGUgbWVldCBjb25mZXJlbmNlLiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSIsCiAgIm5hbWUiOiAiUXVpY2sgR29vZ2xlIE1lZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWlzY2VsbGlhbi9xdWljay1nb29nbGUtbWVldCIsCiAgInV1aWQiOiAicXVpY2stZ29vZ2xlLW1lZXRAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
@@ -5337,7 +5594,8 @@
     "42": {"version": "6", "sha256": "0psshnjpqnaia7a4x2yf9k8p0vjnv01qpq5l6s7fs7d3fccl26lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWUtaW4tZGF0ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "6", "sha256": "0psshnjpqnaia7a4x2yf9k8p0vjnv01qpq5l6s7fs7d3fccl26lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWUtaW4tZGF0ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "44": {"version": "6", "sha256": "0psshnjpqnaia7a4x2yf9k8p0vjnv01qpq5l6s7fs7d3fccl26lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWUtaW4tZGF0ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiA2Cn0="},
-    "45": {"version": "8", "sha256": "16bjg62qba8bvmjpfwwhq7jp5mdsdxlpp46hyngnjhdd6aq2glmv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWUtaW4tZGF0ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "9", "sha256": "1ssjc4cimckinvayqsw1csjpq58fpmggldisvw68jyfby88jrq7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWUtaW4tZGF0ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "1ssjc4cimckinvayqsw1csjpq58fpmggldisvw68jyfby88jrq7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWUtaW4tZGF0ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "suspend-to-topbar@madebysteven.nl", "name": "Suspend button in topbar", "pname": "suspend-button-in-top-bar", "description": "Suspend your computer via a topbar button, added settings to the fork for asking to suspend or cancel. Original project: https://github.com/trofosila/suspend-to-topbar", "link": "https://extensions.gnome.org/extension/5213/suspend-button-in-top-bar/", "shell_version_map": {
     "38": {"version": "4", "sha256": "1gwf4axjwvwmlribsv6g0w1xdifdxxbr5mjjp6yl3xkz6rkbip9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN1c3BlbmQgeW91ciBjb21wdXRlciB2aWEgYSB0b3BiYXIgYnV0dG9uLCBhZGRlZCBzZXR0aW5ncyB0byB0aGUgZm9yayBmb3IgYXNraW5nIHRvIHN1c3BlbmQgb3IgY2FuY2VsLiBPcmlnaW5hbCBwcm9qZWN0OiBodHRwczovL2dpdGh1Yi5jb20vdHJvZm9zaWxhL3N1c3BlbmQtdG8tdG9wYmFyIiwKICAibmFtZSI6ICJTdXNwZW5kIGJ1dHRvbiBpbiB0b3BiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VzcGVuZC10by10b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGV2ZW5kZWpvbmdubC9zdXNwZW5kLXRvLXRvcGJhciIsCiAgInV1aWQiOiAic3VzcGVuZC10by10b3BiYXJAbWFkZWJ5c3RldmVuLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}
@@ -5352,8 +5610,9 @@
     "42": {"version": "11", "sha256": "1567wwlz3lnw48vr86q7phigdp1gyqysk7p270lnwhb7d03maqj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"},
     "43": {"version": "11", "sha256": "1567wwlz3lnw48vr86q7phigdp1gyqysk7p270lnwhb7d03maqj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"},
     "44": {"version": "11", "sha256": "1567wwlz3lnw48vr86q7phigdp1gyqysk7p270lnwhb7d03maqj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "45": {"version": "14", "sha256": "09x6kmz7a5ral965cl5anxh64sbj23vkd7vng8zzsp6gv2bq6m1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "09x6kmz7a5ral965cl5anxh64sbj23vkd7vng8zzsp6gv2bq6m1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "45": {"version": "15", "sha256": "1bddj6gz0nxp44l55sn43i21dn1iwr4d9v413srqgacygg671zkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZsZXdkZHVyL3RvcGhhdCIsCiAgInV1aWQiOiAidG9waGF0QGZmbGV3ZGR1ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "1bddj6gz0nxp44l55sn43i21dn1iwr4d9v413srqgacygg671zkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZsZXdkZHVyL3RvcGhhdCIsCiAgInV1aWQiOiAidG9waGF0QGZmbGV3ZGR1ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "1bddj6gz0nxp44l55sn43i21dn1iwr4d9v413srqgacygg671zkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZsZXdkZHVyL3RvcGhhdCIsCiAgInV1aWQiOiAidG9waGF0QGZmbGV3ZGR1ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "dash-animator@icedman.github.com", "name": "Dash Animator", "pname": "dash-to-dock-animator", "description": "Animate the icons of dash to dock", "link": "https://extensions.gnome.org/extension/5222/dash-to-dock-animator/", "shell_version_map": {
     "40": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="},
@@ -5384,14 +5643,15 @@
     "43": {"version": "14", "sha256": "0s73v3m8xb641hha7rbs4dfy944zmddi428hvaf6li6fjq81z6wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXp6YW1BbHNoYXJhZmkvaWRlYXBhZC1jb250cm9scy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImlkZWFwYWQtY29udHJvbHNAYXp6YW1hbHNoYXJhZmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "44": {"version": "14", "sha256": "0s73v3m8xb641hha7rbs4dfy944zmddi428hvaf6li6fjq81z6wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXp6YW1BbHNoYXJhZmkvaWRlYXBhZC1jb250cm9scy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImlkZWFwYWQtY29udHJvbHNAYXp6YW1hbHNoYXJhZmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}
   }}
-, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Libadwaita/Gtk4 port of Desktop Icons NG with multiple fixes and new features.\n\nIcons can be positioned anywhere on desktop or are snapped to a grid. Can make links on the Desktop. GSconnect Integration, can send files to connected devices. Drag and Drop support on to Dock, Dash, or from Dock, Dash to the Desktop.\n\nUpdated and modified code base, uses Gio menus, all translations on Weblate. All functions are asynchronous where possible. It is ported to ESM modules, supports Gnome  45 and higher.\n\nMultiple fixes and new features-\n\n* The stock gnome shell background menu can now be shown from the Gtk4 DING desktop right click menu. All shell settings can be accessed from that menu.\n* Icons can be placed on any arbitrary position. Make a mess! - icons can overlap each other etc. Neat people can keep the default behavior and have the icons always snapped to a grid. Controlled in preferences, tweaks, 'Snap to grid'. Affects the shape of icons and drag and drop behavior as well. Free positioning has trapezoidal icons, drop only works with direct overlap. Grid positioning has rectangular icons, and drag and drop works on overlap with the grid holding the icon. This behavior is consistent with other desktop environments.\n* Icons on background on overview, improved gesture switching icons appear to be on all work spaces on the background with workspace switching, with no flashing.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock, or to mounted volumes on the dock, to copy them directly.\n* Set the correct cursor with proposed action on drop on dock.\n* Drag Navigation on Dock - dragging an icon over the Gnome Files icon on the dock or mounted drives, and hovering over it for 1/2 seconds will open a Gnome Files Window. Behavior can be changed in preferences.\n* Drag Navigation - dragging an icon over a folder icon or a drive icon, and then hovering over it for one and half seconds will open that location in Gnome Files.\n* Sets correct hovering behavior during drag and drop on the Dock, enables scrolling in the dock to icons when they are hidden.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop. Pressing shift, ctr or alt while doing this will copy or move the app to Desktop, allowing launching from the desktop. Just dropping an app from the dock to the desktop will remove from Dash/Dock.\n* Follows xdg-terminal-exec to display the correct terminal in right click menus, and will launch the correct terminal, even if xdg-terminal-exec is not installed.\n* Shows the correct file manager in the right click menu and give the user the option to change the file manager.\n* Gio menus, menus display all keyboard shortcuts.\n* Uses Gtk4 AlertDialog, uses asynchronous promises for dialog's, shows button to launch URL for help and troubleshooting information.\n* Automatically zip Folders if mailing them.\n* Tool tips are now positioned correctly to not go under the dash or make it auto hide, or go over/under any gnome shell actors on the edge of the screen.\n* Right Click Menus will not go under the dock.\n* Make Links on Desktop with Alt button on Wayland. Shift, Ctr or Alt button control the effect, move, copy, drop or link. (Linking may not work on X11)\n* Copied/dropped/pasted files retain dropped position. Undo action after trashing or moving files puts icons back in the old position.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to connected mobile device.\n* Accessibility support with screen readers\n* Deals correctly with appimage files on desktop.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. However your mileage may vary on X11. Multiple bugs fixed on X11.\n\nPlease report all issues on the Gitlab link below, this page is not monitored. All known issues as well as all the features are detailed there.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {
+, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Gtk4-DING\n\nLibadwaita/Gtk4 port of Desktop Icons NG with multiple fixes and new features.\n\nIcons can be positioned anywhere on desktop or are snapped to a grid. Can make links on the Desktop. GSconnect Integration, can send files to connected devices. Drag and Drop support on to Dock, Dash, or from Dock, Dash to the Desktop.\n\nUpdated and modified code base, uses Gio menus, all translations on Weblate. All functions are asynchronous where possible. It is ported to ESM modules, supports Gnome 45 and higher.\n\nMultiple fixes and new features-\n\n* For Gnome 47, change highlighting and rubber band selection colors with accent-colors in Gnome Settings.\n* Selection rectangle with rounded corners, similar to Gnome Files aesthetic.\n* The stock gnome shell background menu can now be shown from the Gtk4 DING desktop right click menu. All shell settings can be accessed from that menu.\n* Icons can be placed on any arbitrary position. Make a mess! - icons can overlap each other etc. Neat people can keep the default behavior and have the icons always snapped to a grid. Controlled in preferences, tweaks, 'Snap to grid'. Affects the shape of icons and drag and drop behavior as well. Free positioning has trapezoidal icons, drop only works with direct overlap. Grid positioning has rectangular icons, and drag and drop works on overlap with the grid holding the icon. This behavior is consistent with other desktop environments.\n* Icons on background on overview, improved gesture switching icons appear to be on all work spaces on the background with workspace switching, with no flashing.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock, or to mounted volumes on the dock, to copy them directly.\n* Set the correct cursor with proposed action on drop on dock.\n* Drag Navigation on Dock - dragging an icon over the Gnome Files icon on the dock or mounted drives, and hovering over it for 1/2 seconds will open a Gnome Files Window. Behavior can be changed in preferences.\n* Drag Navigation - dragging an icon over a folder icon or a drive icon, and then hovering over it for one and half seconds will open that location in Gnome Files.\n* Sets correct hovering behavior during drag and drop on the Dock, enables scrolling in the dock to icons when they are hidden.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop. Pressing shift, ctr or alt while doing this will copy or move the app to Desktop, allowing launching from the desktop. Just dropping an app from the dock to the desktop will remove from Dash/Dock.\n* Follows xdg-terminal-exec to display the correct terminal in right click menus, and will launch the correct terminal, even if xdg-terminal-exec is not installed.\n* Shows the correct file manager in the right click menu and give the user the option to change the file manager.\n* Gio menus, menus display all keyboard shortcuts.\n* Uses Gtk4 AlertDialog, uses asynchronous promises for dialog's, shows button to launch URL for help and troubleshooting information.\n* Automatically zip Folders if mailing them.\n* Tool tips are now positioned correctly to not go under the dash or make it auto hide, or go over/under any gnome shell actors on the edge of the screen.\n* Right Click Menus will not go under the dock.\n* Make Links on Desktop with Alt button on Wayland. Shift, Ctr or Alt button control the effect, move, copy, drop or link. (Linking may not work on X11)\n* Copied/dropped/pasted files retain dropped position. Undo action after trashing or moving files puts icons back in the old position.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to connected mobile device.\n* Accessibility support with screen readers\n* Deals correctly with appimage files on desktop.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. However your mileage may vary on X11. Multiple bugs fixed on X11.\n\nPlease report all issues on the Gitlab link below, this page is not monitored. All known issues as well as all the features are detailed there.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {
     "40": {"version": "17", "sha256": "1d1xpjypmim6yzsscrkv1n9p7b141k9xi3mab1sz8cqic5v8401z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpYmFkd2FpdGEvR3RrNCBQb3J0IG9mIERlc2t0b3AgSWNvbnMgTkcgd2l0aCB1cGRhdGVkIGFuZCBtb2RpZmllZCBjb2RlIGJhc2UsIHVzZXMgZ2lvIG1lbnVzLCBhbGwgZnVuY3Rpb25zIGFyZSBhc3luYyB3aGVyZSBwb3NzaWJsZSwgbXVsdGlwbGUgZml4ZXMgYW5kIG5ldyBmZWF0dXJlcy1cblxuKiBOZXcgRHJhZyBOYXZpZ2F0aW9uIG9uIERvY2sgLSBkcmFnZ2luZyBhbiBpY29uIG92ZXIgdGhlIEdub21lIEZpbGVzIGljb24gb24gdGhlIGRvY2sgb3IgbW91bnRlZCBkcml2ZXMsIGFuZCBob3ZlcmluZyBvdmVyIGl0IGZvciAxLzIgc2Vjb25kIHdpbGwgb3BlbiBhIEdub21lIEZpbGVzIFdpbmRvdy5cbiogTmV3IC0gU2V0IHRoZSBjb3JyZWN0IGN1cnNvciB3aXRoIHByb3Bvc2VkIGFjdGlvbiBvbiBkcm9wIG9uIGRvY2ssIGltcHJvdmUgZHJvcCBkZXRlY3Rpb24uXG4qIE5ldyAtIERyYWcgTmF2aWdhdGlvbiAtIGRyYWdnaW5nIGFuIGljb24gb3ZlciBhIGZvbGRlciBpY29uIG9yIGEgZHJpdmUgaWNvbiwgYW5kIHRoZW4gaG92ZXJpbmcgb3ZlciBpdCBmb3IgMS8yIHNlY29uZCB3aWxsIG9wZW4gdGhhdCBsb2NhdGlvbiBpbiBHbm9tZSBGaWxlcy5cbiogTmV3IC0gRHJhZyBJY29uIG5vdyBmb3JtcyBhIGJ1bmNoIG9mIGljb25zIGlmIG11bHRpcGxlIGljb25zIGFyZSBkcmFnZ2VkLiBDb2RlIGZyb20gTmF1dGlsdXMsIHRyYW5zbGF0ZWQgdG8gZmlsZXMuXG4qIE5ldyAtIE5vdyBkZWFscyBjb3JyZWN0bHkgd2l0aCBhcHBpbWFnZSBmaWxlcyBvbiBkZXNrdG9wLlxuKiBOb3cgdXNlcyBsaWJhZHdhaXRhLlxuKiBNYWtlIExpbmtzIG9uIERlc2t0b3Agd2l0aCBBbHQgYnV0dG9uIG9uIFdheWxhbmQuIERvZXMgbm90IHdvcmsgd2l0aCBYMTEuXG4qIENvcGllZC9kcm9wcGVkL3Bhc3RlZCBmaWxlcyByZXRhaW4gZHJvcHBlZCBwb3NpdGlvbi5cbiogUmlnaHQgQ2xpY2sgTWVudXMgd2lsbCBub3QgZ28gdW5kZXIgdGhlIGRvY2suXG4qIEJldHRlciBtdWx0aSBtb25pdG9yIHN1cHBvcnQsIHByZWZlcmVuY2UgdG8gcGxhY2UgaWNvbnMgb24gbm9uIHByaW1hcnkgbW9uaXRvci5cbiogR1Njb25uZWN0IGV4dGVuc2lvbiBpbnRlZ3JhdGlvbiwgY2FuIHNlbmQgZmlsZXMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIG1vYmlsZSBkZXZpY2UuXG4qIERyYWcgYW5kIGRyb3AgRmF2b3JpdGUgYXBwcyBmcm9tIERhc2ggdG8gRG9jaywgRGFzaCB0byBQYW5lbCBkaXJlY3RseSB0byBEZXNrdG9wIG9yIHJlbW92ZSBmcm9tIGZhdm9yaXRlcy5cbiogSW1wcm92ZWQgZ2VzdHVyZSBzd2l0Y2hpbmcgb2Ygd29ya3NwYWNlcywgaWNvbnMgYXBwZWFyIHRvIGJlIG9uIGFsbCB3b3Jrc3BhY2VzIGluIG1vdmluZyB3aW5kb3dzLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBvbnRvIHRoZSBkb2NrIC0gRHJhZyBpY29ucyBmcm9tIGRlc2t0b3AgdG8gYW5kIGRyb3Agb3ZlciBhcHBsaWNhdGlvbiBpY29uIHRvIG9wZW4gdGhlbSB3aXRoIHRoZSBhcHAuIFdvcmtzIHdpdGggRGFzaCB0byBEb2NrIGFuZCBEYXNoIHRvIFBhbmVsLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gVHJhc2ggb24gRGFzaCB0byBEb2NrIG9yIHRvIG1vdW50ZWQgdm9sdW1lcyB0byBjb3B5IHRoZW0gZGlyZWN0bHkuXG4qIERpc3BsYXkgR0lNUCB0aHVtYm5haWxzLCBldmVuIGZvciBzbmFwIGFuZCBmbGF0cGFjayBpbnN0YWxscy5cblxuUGxlYXNlIHNlZSBSZWFkbWUgZm9yIGZ1bGwgZGV0YWlscyBvZiBuZXcgZmVhdHVyZXMuIFdvcmtzIGJlc3Qgb24gV2F5bGFuZC4gVGhlcmUgaXMgYSBidWcgaW4gR0pTIG9uIFgxMSwgcGxlYXNlIHNlZSBSZWFkbWUuIFRoaXMgZXh0ZW5zaW9uIG5vdyB3b3JrcyB3aXRoIHNvbWUgaGFja3MsIGV2ZW4gb24gWDExLiBIb3dldmVyIHlvdXIgbWlsZWFnZSBtYXkgdmFyeSBhbmQgdXNlIHdpdGggY2F1dGlvbiBvbiBYMTEgYW5kIHJlcG9ydCBhbnkgaXNzdWVzLlxuXG5QbGVhc2UgcmVwb3J0IGFsbCBpc3N1ZXMgb24gdGhlIGdpdGxhYiBsaW5rIGJlbG93LCB0aGlzIHBhZ2UgaXMgbm90IG1vbml0b3JlZC4gQWxsIGtub3duIGlzc3VlcyBhcmUgZGV0YWlsZWQgdGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiTGliYWR3YWl0YSwgR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"},
     "41": {"version": "17", "sha256": "1d1xpjypmim6yzsscrkv1n9p7b141k9xi3mab1sz8cqic5v8401z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpYmFkd2FpdGEvR3RrNCBQb3J0IG9mIERlc2t0b3AgSWNvbnMgTkcgd2l0aCB1cGRhdGVkIGFuZCBtb2RpZmllZCBjb2RlIGJhc2UsIHVzZXMgZ2lvIG1lbnVzLCBhbGwgZnVuY3Rpb25zIGFyZSBhc3luYyB3aGVyZSBwb3NzaWJsZSwgbXVsdGlwbGUgZml4ZXMgYW5kIG5ldyBmZWF0dXJlcy1cblxuKiBOZXcgRHJhZyBOYXZpZ2F0aW9uIG9uIERvY2sgLSBkcmFnZ2luZyBhbiBpY29uIG92ZXIgdGhlIEdub21lIEZpbGVzIGljb24gb24gdGhlIGRvY2sgb3IgbW91bnRlZCBkcml2ZXMsIGFuZCBob3ZlcmluZyBvdmVyIGl0IGZvciAxLzIgc2Vjb25kIHdpbGwgb3BlbiBhIEdub21lIEZpbGVzIFdpbmRvdy5cbiogTmV3IC0gU2V0IHRoZSBjb3JyZWN0IGN1cnNvciB3aXRoIHByb3Bvc2VkIGFjdGlvbiBvbiBkcm9wIG9uIGRvY2ssIGltcHJvdmUgZHJvcCBkZXRlY3Rpb24uXG4qIE5ldyAtIERyYWcgTmF2aWdhdGlvbiAtIGRyYWdnaW5nIGFuIGljb24gb3ZlciBhIGZvbGRlciBpY29uIG9yIGEgZHJpdmUgaWNvbiwgYW5kIHRoZW4gaG92ZXJpbmcgb3ZlciBpdCBmb3IgMS8yIHNlY29uZCB3aWxsIG9wZW4gdGhhdCBsb2NhdGlvbiBpbiBHbm9tZSBGaWxlcy5cbiogTmV3IC0gRHJhZyBJY29uIG5vdyBmb3JtcyBhIGJ1bmNoIG9mIGljb25zIGlmIG11bHRpcGxlIGljb25zIGFyZSBkcmFnZ2VkLiBDb2RlIGZyb20gTmF1dGlsdXMsIHRyYW5zbGF0ZWQgdG8gZmlsZXMuXG4qIE5ldyAtIE5vdyBkZWFscyBjb3JyZWN0bHkgd2l0aCBhcHBpbWFnZSBmaWxlcyBvbiBkZXNrdG9wLlxuKiBOb3cgdXNlcyBsaWJhZHdhaXRhLlxuKiBNYWtlIExpbmtzIG9uIERlc2t0b3Agd2l0aCBBbHQgYnV0dG9uIG9uIFdheWxhbmQuIERvZXMgbm90IHdvcmsgd2l0aCBYMTEuXG4qIENvcGllZC9kcm9wcGVkL3Bhc3RlZCBmaWxlcyByZXRhaW4gZHJvcHBlZCBwb3NpdGlvbi5cbiogUmlnaHQgQ2xpY2sgTWVudXMgd2lsbCBub3QgZ28gdW5kZXIgdGhlIGRvY2suXG4qIEJldHRlciBtdWx0aSBtb25pdG9yIHN1cHBvcnQsIHByZWZlcmVuY2UgdG8gcGxhY2UgaWNvbnMgb24gbm9uIHByaW1hcnkgbW9uaXRvci5cbiogR1Njb25uZWN0IGV4dGVuc2lvbiBpbnRlZ3JhdGlvbiwgY2FuIHNlbmQgZmlsZXMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIG1vYmlsZSBkZXZpY2UuXG4qIERyYWcgYW5kIGRyb3AgRmF2b3JpdGUgYXBwcyBmcm9tIERhc2ggdG8gRG9jaywgRGFzaCB0byBQYW5lbCBkaXJlY3RseSB0byBEZXNrdG9wIG9yIHJlbW92ZSBmcm9tIGZhdm9yaXRlcy5cbiogSW1wcm92ZWQgZ2VzdHVyZSBzd2l0Y2hpbmcgb2Ygd29ya3NwYWNlcywgaWNvbnMgYXBwZWFyIHRvIGJlIG9uIGFsbCB3b3Jrc3BhY2VzIGluIG1vdmluZyB3aW5kb3dzLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBvbnRvIHRoZSBkb2NrIC0gRHJhZyBpY29ucyBmcm9tIGRlc2t0b3AgdG8gYW5kIGRyb3Agb3ZlciBhcHBsaWNhdGlvbiBpY29uIHRvIG9wZW4gdGhlbSB3aXRoIHRoZSBhcHAuIFdvcmtzIHdpdGggRGFzaCB0byBEb2NrIGFuZCBEYXNoIHRvIFBhbmVsLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gVHJhc2ggb24gRGFzaCB0byBEb2NrIG9yIHRvIG1vdW50ZWQgdm9sdW1lcyB0byBjb3B5IHRoZW0gZGlyZWN0bHkuXG4qIERpc3BsYXkgR0lNUCB0aHVtYm5haWxzLCBldmVuIGZvciBzbmFwIGFuZCBmbGF0cGFjayBpbnN0YWxscy5cblxuUGxlYXNlIHNlZSBSZWFkbWUgZm9yIGZ1bGwgZGV0YWlscyBvZiBuZXcgZmVhdHVyZXMuIFdvcmtzIGJlc3Qgb24gV2F5bGFuZC4gVGhlcmUgaXMgYSBidWcgaW4gR0pTIG9uIFgxMSwgcGxlYXNlIHNlZSBSZWFkbWUuIFRoaXMgZXh0ZW5zaW9uIG5vdyB3b3JrcyB3aXRoIHNvbWUgaGFja3MsIGV2ZW4gb24gWDExLiBIb3dldmVyIHlvdXIgbWlsZWFnZSBtYXkgdmFyeSBhbmQgdXNlIHdpdGggY2F1dGlvbiBvbiBYMTEgYW5kIHJlcG9ydCBhbnkgaXNzdWVzLlxuXG5QbGVhc2UgcmVwb3J0IGFsbCBpc3N1ZXMgb24gdGhlIGdpdGxhYiBsaW5rIGJlbG93LCB0aGlzIHBhZ2UgaXMgbm90IG1vbml0b3JlZC4gQWxsIGtub3duIGlzc3VlcyBhcmUgZGV0YWlsZWQgdGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiTGliYWR3YWl0YSwgR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"},
     "42": {"version": "60", "sha256": "0gxn065ls150nj88zslng8lkhqfzba8lkhxyi74rpqn477ss6y9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
     "43": {"version": "60", "sha256": "0gxn065ls150nj88zslng8lkhqfzba8lkhxyi74rpqn477ss6y9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
     "44": {"version": "67", "sha256": "1bz5bs2llbklzn0wvqn300gd1g39qgdsgl5hwi1ndwd2wdl1mdbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDY3Cn0="},
-    "45": {"version": "81", "sha256": "0mqiy7dvr9yl23vvkbnlxqrbczqjkcljzkkrci1yj5d510awpx72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDgxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNzgiCn0="},
-    "46": {"version": "81", "sha256": "0mqiy7dvr9yl23vvkbnlxqrbczqjkcljzkkrci1yj5d510awpx72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDgxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNzgiCn0="}
+    "45": {"version": "88", "sha256": "1hy735y2daklijmyzv8gpsvqj5h4xmxz84cc1svfk4qs7497hpzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA4OCwKICAidmVyc2lvbi1uYW1lIjogIjg1Igp9"},
+    "46": {"version": "88", "sha256": "1hy735y2daklijmyzv8gpsvqj5h4xmxz84cc1svfk4qs7497hpzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA4OCwKICAidmVyc2lvbi1uYW1lIjogIjg1Igp9"},
+    "47": {"version": "88", "sha256": "1hy735y2daklijmyzv8gpsvqj5h4xmxz84cc1svfk4qs7497hpzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA4OCwKICAidmVyc2lvbi1uYW1lIjogIjg1Igp9"}
   }}
 , {"uuid": "fig-gnome-integration@fig.io", "name": "Fig GNOME Integration", "pname": "fig-gnome-integration", "description": "Tightly integrates Fig with GNOME shell", "link": "https://extensions.gnome.org/extension/5266/fig-gnome-integration/", "shell_version_map": {
     "41": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -5406,7 +5666,8 @@
     "43": {"version": "3", "sha256": "0zmdaqb880c3az388pc9j76pgy3yk97akps3lqib93jfbhx6302r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgZm9yIEdOT01FIERvY2s6IFxuIC0gbW92ZXMgaXQgdG9wIFxuIC0gYXV0b2hpZGUgICEhcmV2ZWFscyB1bmRlciBjdXJzb3IgcHJlc3N1cmUhISBcbiAtIHNob3dzIG9ubHkgZmF2b3JpdGVzIGFwcHMiLAogICJuYW1lIjogIkRvY2s6IFJlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hcnRpblBML0RvY2stUmVsb2FkZWQiLAogICJ1dWlkIjogImRvY2stcmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMwp9"},
     "44": {"version": "4", "sha256": "1pqc7hhpxiwvd2a2b5fj1rcd887z2a7mvxb2w8w5y8rfd15wcvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgZm9yIEdOT01FIERvY2s6IFxuIC0gbW92ZXMgaXQgdG9wIFxuIC0gYXV0b2hpZGUgICEhcmV2ZWFscyB1bmRlciBjdXJzb3IgcHJlc3N1cmUhISBcbiAtIHNob3dzIG9ubHkgZmF2b3JpdGVzIGFwcHMiLAogICJuYW1lIjogIkRvY2s6IFJlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hcnRpblBML0RvY2stUmVsb2FkZWQiLAogICJ1dWlkIjogImRvY2stcmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogNAp9"},
     "45": {"version": "5", "sha256": "0pvwm1s7zadkznrrw3n0gaym5j3kwr8c6wxgk6gnhyq40k1kgyh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgZm9yIEdOT01FIERvY2s6IFxuIC0gbW92ZXMgaXQgdG9wIFxuIC0gYXV0b2hpZGUgLS0tPiAhcmV2ZWFscyB1bmRlciBjdXJzb3IgcHJlc3N1cmUhIDwtLS0gXG4gLSBzaG93cyBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "46": {"version": "6", "sha256": "04lakwk8k4flpl05dz8dihpwg7mbg9k6i02fczy0gzb5bnr7l95l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgZm9yIEdOT01FIERvY2s6IFxuIC0gbW92ZXMgaXQgdG9wIFxuIC0gYXV0b2hpZGUgLS0tPiAhcmV2ZWFscyB1bmRlciBjdXJzb3IgcHJlc3N1cmUhIDwtLS0gXG4gLSBzaG93cyBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+    "46": {"version": "6", "sha256": "04lakwk8k4flpl05dz8dihpwg7mbg9k6i02fczy0gzb5bnr7l95l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgZm9yIEdOT01FIERvY2s6IFxuIC0gbW92ZXMgaXQgdG9wIFxuIC0gYXV0b2hpZGUgLS0tPiAhcmV2ZWFscyB1bmRlciBjdXJzb3IgcHJlc3N1cmUhIDwtLS0gXG4gLSBzaG93cyBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDYKfQ=="},
+    "47": {"version": "7", "sha256": "1jg06snxw0wdfg9hc44yvp75q5c95h0x0bzr19bn54drvkdsqgsi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgZm9yIEdOT01FIERvY2s6IFxuIC0gbW92ZXMgaXQgdG9wIFxuIC0gYXV0b2hpZGUgLS0tPiAhcmV2ZWFscyB1bmRlciBjdXJzb3IgcHJlc3N1cmUhIDwtLS0gXG4gLSBzaG93cyBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5wbC9kb2NrLXJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "shutdownbutton@asr-webdesign.fr", "name": "Add a Shutdown Button", "pname": "add-a-shutdown-button", "description": "Add power off button", "link": "https://extensions.gnome.org/extension/5272/add-a-shutdown-button/", "shell_version_map": {
     "40": {"version": "1", "sha256": "0kav86za1i9vkliwrbp86rnmvjn9pgvn1wdkqxbsxmmqhsn5awb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlciBvZmYgYnV0dG9uIiwKICAibmFtZSI6ICJBZGQgYSBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaHV0ZG93bmJ1dHRvbkBhc3Itd2ViZGVzaWduLmZyIiwKICAidmVyc2lvbiI6IDEKfQ=="},
@@ -5444,8 +5705,9 @@
     "42": {"version": "4", "sha256": "1qdd9dhfzmipdlxrpzx6kj6ykp9b8g5aj96dshjlvicqkx50qscb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKSIsCiAgIm5hbWUiOiAiQWx0K1RhYiBTY3JvbGwgV29ya2Fyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2FzcmVzY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItc2Nyb2xsLXdvcmthcm91bmQiLAogICJ1dWlkIjogImFsdC10YWItc2Nyb2xsLXdvcmthcm91bmRAbHVjYXNyZXNjay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
     "43": {"version": "4", "sha256": "1qdd9dhfzmipdlxrpzx6kj6ykp9b8g5aj96dshjlvicqkx50qscb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKSIsCiAgIm5hbWUiOiAiQWx0K1RhYiBTY3JvbGwgV29ya2Fyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2FzcmVzY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItc2Nyb2xsLXdvcmthcm91bmQiLAogICJ1dWlkIjogImFsdC10YWItc2Nyb2xsLXdvcmthcm91bmRAbHVjYXNyZXNjay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
     "44": {"version": "4", "sha256": "1qdd9dhfzmipdlxrpzx6kj6ykp9b8g5aj96dshjlvicqkx50qscb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKSIsCiAgIm5hbWUiOiAiQWx0K1RhYiBTY3JvbGwgV29ya2Fyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2FzcmVzY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItc2Nyb2xsLXdvcmthcm91bmQiLAogICJ1dWlkIjogImFsdC10YWItc2Nyb2xsLXdvcmthcm91bmRAbHVjYXNyZXNjay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "7", "sha256": "09fral39a62vy9q7qb39nssi12hw3d8pr1qfjqa1kdwdnxladp70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKS4iLAogICJuYW1lIjogIkFsdCtUYWIgU2Nyb2xsIFdvcmthcm91bmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2FzcmVzY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItc2Nyb2xsLXdvcmthcm91bmQiLAogICJ1dWlkIjogImFsdC10YWItc2Nyb2xsLXdvcmthcm91bmRAbHVjYXNyZXNjay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"},
-    "46": {"version": "7", "sha256": "09fral39a62vy9q7qb39nssi12hw3d8pr1qfjqa1kdwdnxladp70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKS4iLAogICJuYW1lIjogIkFsdCtUYWIgU2Nyb2xsIFdvcmthcm91bmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1Y2FzcmVzY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItc2Nyb2xsLXdvcmthcm91bmQiLAogICJ1dWlkIjogImFsdC10YWItc2Nyb2xsLXdvcmthcm91bmRAbHVjYXNyZXNjay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}
+    "45": {"version": "8", "sha256": "1plrc54vpinq099wb2vwbbp6zm6fxf86xlc1skdgn32yv8zns0d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKS4iLAogICJuYW1lIjogIkFsdCtUYWIgU2Nyb2xsIFdvcmthcm91bmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "1plrc54vpinq099wb2vwbbp6zm6fxf86xlc1skdgn32yv8zns0d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKS4iLAogICJuYW1lIjogIkFsdCtUYWIgU2Nyb2xsIFdvcmthcm91bmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "1plrc54vpinq099wb2vwbbp6zm6fxf86xlc1skdgn32yv8zns0d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCB0byB0aGUgYnVnIHdoZXJlIHNjcm9sbGluZyBpbiBvbmUgYXBwbGljYXRpb24gaXMgcmVwZWF0ZWQgaW4gYW5vdGhlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHRoZW0gdXNpbmcgQWx0K1RhYiAoZS5nLiwgVlMgQ29kZSBhbmQgQ2hyb21lKS4iLAogICJuYW1lIjogIkFsdCtUYWIgU2Nyb2xsIFdvcmthcm91bmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "projectmanagerforvscode@ahmafi.ir", "name": "Project Manager for VSCode", "pname": "project-manager-for-vscode", "description": "Easily open your Visual Studio Code projects from GNOME shell\n\nDisclaimer:This extension is an independent project and is not affiliated with, authorized by, sponsored by, or in any way associated with Microsoft corporation, Visual Studio Code software and GNOME Foundation.", "link": "https://extensions.gnome.org/extension/5289/project-manager-for-vscode/", "shell_version_map": {
     "42": {"version": "2", "sha256": "102iykjh5pd0qsj1m9p4nnvh20li732xbmk3jvgfl1f8dhb121x6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBvcGVuIHlvdXIgVmlzdWFsIFN0dWRpbyBDb2RlIHByb2plY3RzIGZyb20gR05PTUUgc2hlbGxcblxuRGlzY2xhaW1lcjpUaGlzIGV4dGVuc2lvbiBpcyBhbiBpbmRlcGVuZGVudCBwcm9qZWN0IGFuZCBpcyBub3QgYWZmaWxpYXRlZCB3aXRoLCBhdXRob3JpemVkIGJ5LCBzcG9uc29yZWQgYnksIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBjb3Jwb3JhdGlvbiwgVmlzdWFsIFN0dWRpbyBDb2RlIHNvZnR3YXJlIGFuZCBHTk9NRSBGb3VuZGF0aW9uLiIsCiAgIm5hbWUiOiAiUHJvamVjdCBNYW5hZ2VyIGZvciBWU0NvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWhtYWZpL2dub21lLXZzY29kZS1wcm9qZWN0cyIsCiAgInV1aWQiOiAicHJvamVjdG1hbmFnZXJmb3J2c2NvZGVAYWhtYWZpLmlyIiwKICAidmVyc2lvbiI6IDIKfQ=="}
@@ -5456,8 +5718,9 @@
     "42": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "7", "sha256": "0v28vyw6x9sy9d0gr86qqik0ywsk8bai68hy49f82jyfp39qw5qp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyYS1tby9xdWljay10b3VjaHBhZC10b2dnbGUvIiwKICAidXVpZCI6ICJxdWljay10b3VjaHBhZC10b2dnbGVAa3JhbW8uaHUiLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "0v28vyw6x9sy9d0gr86qqik0ywsk8bai68hy49f82jyfp39qw5qp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyYS1tby9xdWljay10b3VjaHBhZC10b2dnbGUvIiwKICAidXVpZCI6ICJxdWljay10b3VjaHBhZC10b2dnbGVAa3JhbW8uaHUiLAogICJ2ZXJzaW9uIjogNwp9"},
-    "45": {"version": "11", "sha256": "0yylhyv9rzwnb14qq41akywl3ddwi4x6rl4bpl0zc96iz7j0kzhn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJrcmEtbW8iCiAgfSwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyYS1tby9xdWljay10b3VjaHBhZC10b2dnbGUvIiwKICAidXVpZCI6ICJxdWljay10b3VjaHBhZC10b2dnbGVAa3JhbW8uaHUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "46": {"version": "11", "sha256": "0yylhyv9rzwnb14qq41akywl3ddwi4x6rl4bpl0zc96iz7j0kzhn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJrcmEtbW8iCiAgfSwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyYS1tby9xdWljay10b3VjaHBhZC10b2dnbGUvIiwKICAidXVpZCI6ICJxdWljay10b3VjaHBhZC10b2dnbGVAa3JhbW8uaHUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "45": {"version": "12", "sha256": "16igyaxfi0x2nisay1i4qrj7q2qj4lyka0387xhbqsrlizbbrswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJrcmEtbW8iCiAgfSwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vcXVpY2stdG91Y2hwYWQtdG9nZ2xlLyIsCiAgInV1aWQiOiAicXVpY2stdG91Y2hwYWQtdG9nZ2xlQGtyYW1vLmh1IiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "16igyaxfi0x2nisay1i4qrj7q2qj4lyka0387xhbqsrlizbbrswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJrcmEtbW8iCiAgfSwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vcXVpY2stdG91Y2hwYWQtdG9nZ2xlLyIsCiAgInV1aWQiOiAicXVpY2stdG91Y2hwYWQtdG9nZ2xlQGtyYW1vLmh1IiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "16igyaxfi0x2nisay1i4qrj7q2qj4lyka0387xhbqsrlizbbrswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJrcmEtbW8iCiAgfSwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vcXVpY2stdG91Y2hwYWQtdG9nZ2xlLyIsCiAgInV1aWQiOiAicXVpY2stdG91Y2hwYWQtdG9nZ2xlQGtyYW1vLmh1IiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "desktop-zoom@colin.kinlo.ch", "name": "Desktop Zoom", "pname": "desktop-zoom", "description": "Scroll to zoom gnome desktop.\n\nUsage: Hold Alt and Scroll\n\nCursor must not be over a window (must be over background or top bar).\nMagnifier / zoom must be enabled in accessibility.\n\nTo disable zoom after removing the extension, disable zoom in gnomes accessibility settings:\nhttps://help.gnome.org/users/gnome-help/stable/a11y-mag.html.en\n\nReport issues on GITHUB.COM", "link": "https://extensions.gnome.org/extension/5297/desktop-zoom/", "shell_version_map": {
     "42": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -5490,8 +5753,8 @@
     "41": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "42": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "43": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "45": {"version": "10", "sha256": "0b9xq4gd6hc0h1ravsymh9vh9ggylx3f13br8916ddrilq43lv7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJwb3dlci1wcm9maWxlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "46": {"version": "10", "sha256": "0b9xq4gd6hc0h1ravsymh9vh9ggylx3f13br8916ddrilq43lv7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJwb3dlci1wcm9maWxlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "11", "sha256": "06lvfnwii8xq9zxncq81ixhcvs4mn0yl7fync6a5312n3g0kdg7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJwb3dlci1wcm9maWxlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY2F1eC9wb3dlci1wcm9maWxlLWluZGljYXRvciIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3JAbGF1eC53dGYiLAogICJ1dWlkLWRldiI6ICJwb3dlci1wcm9maWxlLWluZGljYXRvci1kZXZAbGF1eC53dGYiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "46": {"version": "11", "sha256": "06lvfnwii8xq9zxncq81ixhcvs4mn0yl7fync6a5312n3g0kdg7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJwb3dlci1wcm9maWxlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY2F1eC9wb3dlci1wcm9maWxlLWluZGljYXRvciIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3JAbGF1eC53dGYiLAogICJ1dWlkLWRldiI6ICJwb3dlci1wcm9maWxlLWluZGljYXRvci1kZXZAbGF1eC53dGYiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
 , {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {
     "42": {"version": "20", "sha256": "1b0hx9h04b04ih58zk4jmj4w18gifnbhhwmmrfwc2rvnagg63mhv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDIwCn0="},
@@ -5511,11 +5774,12 @@
     "43": {"version": "7", "sha256": "0lzcd7gm3cirqxi7kafhr6pm400r8acg1kkqxyz9sa7fv5f9vvsj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NoYXJsaWVRTGUvZ25vbWUtZXh0ZW5zaW9uLWRvdHNwYWNlcyIsCiAgInV1aWQiOiAiZG90c3BhY2VzQGNoYXJsaWVxbGUiLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "0lzcd7gm3cirqxi7kafhr6pm400r8acg1kkqxyz9sa7fv5f9vvsj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NoYXJsaWVRTGUvZ25vbWUtZXh0ZW5zaW9uLWRvdHNwYWNlcyIsCiAgInV1aWQiOiAiZG90c3BhY2VzQGNoYXJsaWVxbGUiLAogICJ2ZXJzaW9uIjogNwp9"}
   }}
-, {"uuid": "window-state-manager@kishorv06.github.io", "name": "Window State Manager", "pname": "window-state-manager", "description": "Automatically remember and restore window state and position while docking and undocking.\nUseful when using Gnome with wayland in a multi-monitor setup. Some applications won't remember their location when monitors are connected or disconnected. This extension solves that problem by remembering window positions and restoring it when screen arrangement is changed.", "link": "https://extensions.gnome.org/extension/5353/window-state-manager/", "shell_version_map": {
+, {"uuid": "window-state-manager@kishorv06.github.io", "name": "Window State Manager", "pname": "window-state-manager", "description": "Automatically remember and restore window state and positions. Useful when using Gnome with wayland in a multi-monitor setup. Some applications won't remember their location when monitors are connected or disconnected. This extension solves that problem by saving window state periodically and restoring it when screen arrangement is changed.", "link": "https://extensions.gnome.org/extension/5353/window-state-manager/", "shell_version_map": {
     "42": {"version": "4", "sha256": "1h470lmidfqqs7694qf5xqxvcrdy3bcch0l6h1ddhmy7i1zdyxm5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raXNob3J2MDYvd2luZG93LXN0YXRlLW1hbmFnZXIiLAogICJ1dWlkIjogIndpbmRvdy1zdGF0ZS1tYW5hZ2VyQGtpc2hvcnYwNi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
     "43": {"version": "4", "sha256": "1h470lmidfqqs7694qf5xqxvcrdy3bcch0l6h1ddhmy7i1zdyxm5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raXNob3J2MDYvd2luZG93LXN0YXRlLW1hbmFnZXIiLAogICJ1dWlkIjogIndpbmRvdy1zdGF0ZS1tYW5hZ2VyQGtpc2hvcnYwNi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
     "44": {"version": "4", "sha256": "1h470lmidfqqs7694qf5xqxvcrdy3bcch0l6h1ddhmy7i1zdyxm5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raXNob3J2MDYvd2luZG93LXN0YXRlLW1hbmFnZXIiLAogICJ1dWlkIjogIndpbmRvdy1zdGF0ZS1tYW5hZ2VyQGtpc2hvcnYwNi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "11", "sha256": "1jb4b3sifll6ni17w1frcvcwvmka7f1462nb3kj5014y4qg714dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "12", "sha256": "0s1fl8zrlnhfmqzk0q2rkvs2xpg5fa1abq1gsxxz7fl0vy3fxdnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raXNob3J2MDYvd2luZG93LXN0YXRlLW1hbmFnZXIiLAogICJ1dWlkIjogIndpbmRvdy1zdGF0ZS1tYW5hZ2VyQGtpc2hvcnYwNi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "46": {"version": "12", "sha256": "0s1fl8zrlnhfmqzk0q2rkvs2xpg5fa1abq1gsxxz7fl0vy3fxdnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raXNob3J2MDYvd2luZG93LXN0YXRlLW1hbmFnZXIiLAogICJ1dWlkIjogIndpbmRvdy1zdGF0ZS1tYW5hZ2VyQGtpc2hvcnYwNi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
   }}
 , {"uuid": "vpn-status@peterroux.com", "name": "VPN Status", "pname": "vpn-status", "description": "A VPN Status indicator.", "link": "https://extensions.gnome.org/extension/5356/vpn-status/", "shell_version_map": {
     "38": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -5531,15 +5795,17 @@
     "42": {"version": "11", "sha256": "0jj0354bc23944svvymlq97g0fr8m1h8i1q8mrmni2ifqqq4i2p5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "43": {"version": "11", "sha256": "0jj0354bc23944svvymlq97g0fr8m1h8i1q8mrmni2ifqqq4i2p5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "44": {"version": "11", "sha256": "0jj0354bc23944svvymlq97g0fr8m1h8i1q8mrmni2ifqqq4i2p5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "45": {"version": "13", "sha256": "0i8v949w3bv88fnvgx9i0gflmf728y3q4sp24i74n8mzh5qfj6j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJuYW1lIjogIldpcmVHdWFyZC1WUE4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TSkJFUlRSQU5EL2dub21lLXdpcmVndWFyZC1leHRlbnNpb24iLAogICJ1dWlkIjogImdub21lLXdpcmVndWFyZC1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "46": {"version": "13", "sha256": "0i8v949w3bv88fnvgx9i0gflmf728y3q4sp24i74n8mzh5qfj6j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJuYW1lIjogIldpcmVHdWFyZC1WUE4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TSkJFUlRSQU5EL2dub21lLXdpcmVndWFyZC1leHRlbnNpb24iLAogICJ1dWlkIjogImdub21lLXdpcmVndWFyZC1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
+    "45": {"version": "14", "sha256": "0xj496svfk5bf6sgy9y88phwmqrmjv5r3hag9ndvwy9zj23fg01k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJuYW1lIjogIldpcmVHdWFyZC1WUE4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "46": {"version": "14", "sha256": "0xj496svfk5bf6sgy9y88phwmqrmjv5r3hag9ndvwy9zj23fg01k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJuYW1lIjogIldpcmVHdWFyZC1WUE4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "47": {"version": "14", "sha256": "0xj496svfk5bf6sgy9y88phwmqrmjv5r3hag9ndvwy9zj23fg01k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtd2lyZWd1YXJkLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJuYW1lIjogIldpcmVHdWFyZC1WUE4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
   }}
 , {"uuid": "memento-mori@paveloom", "name": "Memento Mori", "pname": "memento-mori", "description": "Make every second of your life count. Literally!\n\nThis extension adds a counter to the panel which counts down the time you have left based on your birthday and life expectancy.", "link": "https://extensions.gnome.org/extension/5365/memento-mori/", "shell_version_map": {
     "42": {"version": "7", "sha256": "1h60dmipyc7xhryccal3rc0hhv872k1ikivzw1n792scksg89zjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiA3Cn0="},
     "43": {"version": "7", "sha256": "1h60dmipyc7xhryccal3rc0hhv872k1ikivzw1n792scksg89zjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiA3Cn0="},
     "44": {"version": "7", "sha256": "1h60dmipyc7xhryccal3rc0hhv872k1ikivzw1n792scksg89zjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "45": {"version": "10", "sha256": "02bj2vhxy18p81wbypkbkxwx96g40c7ws9spkqmmv3dlmwm6ynqg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZlbG9vbS10L2dub21lLXNoZWxsLW1lbWVudG8tbW9yaSIsCiAgInV1aWQiOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "46": {"version": "10", "sha256": "02bj2vhxy18p81wbypkbkxwx96g40c7ws9spkqmmv3dlmwm6ynqg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZlbG9vbS10L2dub21lLXNoZWxsLW1lbWVudG8tbW9yaSIsCiAgInV1aWQiOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "11", "sha256": "1v5iin189hkka5bymhh9h7hhag0hpdf4incgxfawwpvw9yjkqd9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "46": {"version": "11", "sha256": "1v5iin189hkka5bymhh9h7hhag0hpdf4incgxfawwpvw9yjkqd9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "47": {"version": "11", "sha256": "1v5iin189hkka5bymhh9h7hhag0hpdf4incgxfawwpvw9yjkqd9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF2ZWxvb20tdC9nbm9tZS1zaGVsbC1tZW1lbnRvLW1vcmkiLAogICJ1dWlkIjogIm1lbWVudG8tbW9yaUBwYXZlbG9vbSIsCiAgInZlcnNpb24iOiAxMQp9"}
   }}
 , {"uuid": "external-ip-extension@ipcan.cyou", "name": "Show External IP", "pname": "show-external-ip-thisipcancyou", "description": "Displays your external IP in the Toolbar and sends a system notification if changed. \n\nThis extension is handy for those work at different locations or with different VPNs to quickly see your public IP and country. It uses the free thisipcan.cyou service to check at regular intervals and whenever computer network events occur (like switching networks or locations).", "link": "https://extensions.gnome.org/extension/5368/show-external-ip-thisipcancyou/", "shell_version_map": {
     "40": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
@@ -5562,7 +5828,9 @@
     "42": {"version": "5", "sha256": "1khamwky9f5nqy8n2pfix1jjk589f5864hqgbpznrkzcvz4rbxmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcHlidWcvTm90aWZ5RmlsdGVyLUdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZmlsdGVyQGFzeW5jbGluay5vcmciLAogICJ2ZXJzaW9uIjogNQp9"},
     "43": {"version": "5", "sha256": "1khamwky9f5nqy8n2pfix1jjk589f5864hqgbpznrkzcvz4rbxmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcHlidWcvTm90aWZ5RmlsdGVyLUdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZmlsdGVyQGFzeW5jbGluay5vcmciLAogICJ2ZXJzaW9uIjogNQp9"},
     "44": {"version": "5", "sha256": "1khamwky9f5nqy8n2pfix1jjk589f5864hqgbpznrkzcvz4rbxmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcHlidWcvTm90aWZ5RmlsdGVyLUdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZmlsdGVyQGFzeW5jbGluay5vcmciLAogICJ2ZXJzaW9uIjogNQp9"},
-    "45": {"version": "7", "sha256": "0apkh8hpjkvp5s65nydsysi723gpl3yaw9w6n6524s7n2ir41q3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy4iLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBGaWx0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWZpbHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcHlidWcvTm90aWZ5RmlsdGVyLUdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZmlsdGVyQGFzeW5jbGluay5vcmciLAogICJ2ZXJzaW9uIjogNwp9"}
+    "45": {"version": "8", "sha256": "058gbd2bcawb8q9q3r06kpc1cimk8bfrq87vqmfjl7r84nazgza5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy4iLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBGaWx0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWZpbHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "46": {"version": "8", "sha256": "058gbd2bcawb8q9q3r06kpc1cimk8bfrq87vqmfjl7r84nazgza5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy4iLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBGaWx0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWZpbHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "47": {"version": "8", "sha256": "058gbd2bcawb8q9q3r06kpc1cimk8bfrq87vqmfjl7r84nazgza5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy4iLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBGaWx0ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWZpbHRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
 , {"uuid": "evpn-assistant@xytrexl.com", "name": "ExpressVPN - EVPN Shell Assistant ( express vpn )", "pname": "evpn-shell-assistant", "description": "Allows ExpressVPN to be controlled through the GNOME shell.", "link": "https://extensions.gnome.org/extension/5385/evpn-shell-assistant/", "shell_version_map": {
     "42": {"version": "3", "sha256": "1lvdv1dv78v36j52n58hjrg2hwc3flrq9mryffdhvjb01rrxmigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBFeHByZXNzVlBOIHRvIGJlIGNvbnRyb2xsZWQgdGhyb3VnaCB0aGUgR05PTUUgc2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWV2cG4tYXNzaXN0YW50IiwKICAibmFtZSI6ICJFeHByZXNzVlBOIC0gRVZQTiBTaGVsbCBBc3Npc3RhbnQgKCBleHByZXNzIHZwbiApIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlN0dWFydCBHaWxtb3VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV2cG4tYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGphbWVzZ2lsbW91ci9ldnBuLWFzc2lzdGFudCIsCiAgInV1aWQiOiAiZXZwbi1hc3Npc3RhbnRAeHl0cmV4bC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
@@ -5573,8 +5841,9 @@
     "42": {"version": "13", "sha256": "0677akxfj5jwl1i75srkr1ylb69hydkzafim42xbq6ask7y9d19x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "43": {"version": "13", "sha256": "0677akxfj5jwl1i75srkr1ylb69hydkzafim42xbq6ask7y9d19x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "44": {"version": "13", "sha256": "0677akxfj5jwl1i75srkr1ylb69hydkzafim42xbq6ask7y9d19x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "45": {"version": "20", "sha256": "0rspavp64lvr51hjgf7gw51zcwvpp7v2k9mp3sg4bcmaqjmp96b1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
-    "46": {"version": "20", "sha256": "0rspavp64lvr51hjgf7gw51zcwvpp7v2k9mp3sg4bcmaqjmp96b1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}
+    "45": {"version": "24", "sha256": "0s5xld9qhq43qrzjwq4slh6gvgai5z47ix52c72kvcv0l7vw10bv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2h5enVzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tYXV0b3JvdGF0ZSIsCiAgInV1aWQiOiAic2NyZWVuLXJvdGF0ZUBzaHl6dXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "46": {"version": "24", "sha256": "0s5xld9qhq43qrzjwq4slh6gvgai5z47ix52c72kvcv0l7vw10bv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2h5enVzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tYXV0b3JvdGF0ZSIsCiAgInV1aWQiOiAic2NyZWVuLXJvdGF0ZUBzaHl6dXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="},
+    "47": {"version": "24", "sha256": "0s5xld9qhq43qrzjwq4slh6gvgai5z47ix52c72kvcv0l7vw10bv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2h5enVzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tYXV0b3JvdGF0ZSIsCiAgInV1aWQiOiAic2NyZWVuLXJvdGF0ZUBzaHl6dXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}
   }}
 , {"uuid": "devtools@romix.ch", "name": "Dev Tools", "pname": "dev-tools", "description": "Generate random UUID and current time in milliseconds as a shell extension.", "link": "https://extensions.gnome.org/extension/5393/dev-tools/", "shell_version_map": {
     "42": {"version": "11", "sha256": "10w3yl0x69nxp0ad4wkfniqav2k005sfmf6c9v87ys7qad8gp1zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcm9taXhjaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGV2LXRvb2xzIiwKICAidXVpZCI6ICJkZXZ0b29sc0Byb21peC5jaCIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -5597,8 +5866,9 @@
     "42": {"version": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
     "43": {"version": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
     "44": {"version": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "45": {"version": "6", "sha256": "147yzh20brw8pwacm0lvhz2kaqz321xigyx44dcd5fxrxwgd4y62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "6", "sha256": "147yzh20brw8pwacm0lvhz2kaqz321xigyx44dcd5fxrxwgd4y62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+    "45": {"version": "7", "sha256": "0clcq3csnq1wzhf9m3396n4jq2fj6as0jjzy8p9zvla9l53azz8v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFsY2tvcy9HcmFuZFRoZWZ0Rm9jdXMiLAogICJ1dWlkIjogImdyYW5kLXRoZWZ0LWZvY3VzQHphbGNrb3MuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "46": {"version": "7", "sha256": "0clcq3csnq1wzhf9m3396n4jq2fj6as0jjzy8p9zvla9l53azz8v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFsY2tvcy9HcmFuZFRoZWZ0Rm9jdXMiLAogICJ1dWlkIjogImdyYW5kLXRoZWZ0LWZvY3VzQHphbGNrb3MuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "47": {"version": "7", "sha256": "0clcq3csnq1wzhf9m3396n4jq2fj6as0jjzy8p9zvla9l53azz8v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFsY2tvcy9HcmFuZFRoZWZ0Rm9jdXMiLAogICJ1dWlkIjogImdyYW5kLXRoZWZ0LWZvY3VzQHphbGNrb3MuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QR Code", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QR Code of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QR Code and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone). \n\nFrom version 4 added a functionality to copy the QR Code to clipboard with right click on it.", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {
     "40": {"version": "10", "sha256": "0sga40ixfj8wcxm66wm2rvcyzgbdfzl7ji8hjwqa0hx1s125nv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJuYW1lIjogIldpZmkgUVIgQ29kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"},
@@ -5606,18 +5876,20 @@
     "42": {"version": "10", "sha256": "0sga40ixfj8wcxm66wm2rvcyzgbdfzl7ji8hjwqa0hx1s125nv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJuYW1lIjogIldpZmkgUVIgQ29kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "43": {"version": "10", "sha256": "0sga40ixfj8wcxm66wm2rvcyzgbdfzl7ji8hjwqa0hx1s125nv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJuYW1lIjogIldpZmkgUVIgQ29kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "44": {"version": "10", "sha256": "0sga40ixfj8wcxm66wm2rvcyzgbdfzl7ji8hjwqa0hx1s125nv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJuYW1lIjogIldpZmkgUVIgQ29kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "45": {"version": "15", "sha256": "17ilw08bwr8wdhybcvbjvyy41iaqcdqmwl18kld37dzhp1ninp8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZ2xlcnJvIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTUsCiAgInZlcnNpb24tbmFtZSI6ICIyLjIuMCIKfQ=="},
-    "46": {"version": "15", "sha256": "17ilw08bwr8wdhybcvbjvyy41iaqcdqmwl18kld37dzhp1ninp8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZ2xlcnJvIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTUsCiAgInZlcnNpb24tbmFtZSI6ICIyLjIuMCIKfQ=="}
+    "45": {"version": "16", "sha256": "0izph2vav12n2n530s7z37czgjcrpbs3d2ab97h68qfl7xfg6l9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZ2xlcnJvIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJ1dWlkIjogIndpZmlxcmNvZGVAZ2xlcnJvLnBtLm1lIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4zLjAiCn0="},
+    "46": {"version": "16", "sha256": "0izph2vav12n2n530s7z37czgjcrpbs3d2ab97h68qfl7xfg6l9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZ2xlcnJvIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJ1dWlkIjogIndpZmlxcmNvZGVAZ2xlcnJvLnBtLm1lIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4zLjAiCn0="},
+    "47": {"version": "16", "sha256": "0izph2vav12n2n530s7z37czgjcrpbs3d2ab97h68qfl7xfg6l9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZ2xlcnJvIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZmlxcmNvZGUiLAogICJ1dWlkIjogIndpZmlxcmNvZGVAZ2xlcnJvLnBtLm1lIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4zLjAiCn0="}
   }}
 , {"uuid": "eos-desktop@endlessm.com", "name": "Endless Desktop", "pname": "endless-desktop", "description": "Endless OS signature desktop", "link": "https://extensions.gnome.org/extension/5419/endless-desktop/", "shell_version_map": {
     "41": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
     "42": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
-, {"uuid": "batterytime@typeof.pw", "name": "Battery time", "pname": "battery-time", "description": "Show battery estimated remaining time", "link": "https://extensions.gnome.org/extension/5425/battery-time/", "shell_version_map": {
+, {"uuid": "batterytime@typeof.pw", "name": "Battery time", "pname": "battery-time", "description": "Show battery estimated remaining time.", "link": "https://extensions.gnome.org/extension/5425/battery-time/", "shell_version_map": {
     "43": {"version": "2", "sha256": "0hi5kxmmdypjylxyi4znry1jgm2nkvrpwisxgi19j2cw4zv97bgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUuXG5cbk5vdGU6IFRoaXMgZXh0ZW5zaW9uIG1heSBub3Qgd29yayB3aXRoIHNvbWUgb2YgZXh0ZW5zaW9ucyB0d2Vha2luZyBxdWljayBzZXR0aW5nIG1lbnUuIElmIHlvdSBlbmNvdW50ZXIgYW55IHByb2JsZW0gbGlrZSB0aGlzLCBvcGVuIGEgR2l0SHViIGlzc3VlIGFuZCBwdXQgYSBsaXN0IG9mIGVuYWJsZWQgZXh0ZW5zaW9ucy4iLAogICJuYW1lIjogIkJhdHRlcnkgdGltZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDIKfQ=="},
     "44": {"version": "2", "sha256": "0hi5kxmmdypjylxyi4znry1jgm2nkvrpwisxgi19j2cw4zv97bgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUuXG5cbk5vdGU6IFRoaXMgZXh0ZW5zaW9uIG1heSBub3Qgd29yayB3aXRoIHNvbWUgb2YgZXh0ZW5zaW9ucyB0d2Vha2luZyBxdWljayBzZXR0aW5nIG1lbnUuIElmIHlvdSBlbmNvdW50ZXIgYW55IHByb2JsZW0gbGlrZSB0aGlzLCBvcGVuIGEgR2l0SHViIGlzc3VlIGFuZCBwdXQgYSBsaXN0IG9mIGVuYWJsZWQgZXh0ZW5zaW9ucy4iLAogICJuYW1lIjogIkJhdHRlcnkgdGltZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "45": {"version": "6", "sha256": "0l2zpyrxdj55g6qhyh7wsxk5pgkavn57lvfh6n9fah5xk3gj9f13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXRpbWUtZ2V0dGV4dCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb21va2UvYmF0dGVyeV90aW1lIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGltZUB0eXBlb2YucHciLAogICJ2ZXJzaW9uIjogNgp9"},
-    "46": {"version": "6", "sha256": "0l2zpyrxdj55g6qhyh7wsxk5pgkavn57lvfh6n9fah5xk3gj9f13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXRpbWUtZ2V0dGV4dCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb21va2UvYmF0dGVyeV90aW1lIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGltZUB0eXBlb2YucHciLAogICJ2ZXJzaW9uIjogNgp9"}
+    "45": {"version": "7", "sha256": "0ghxlqr86vcr1w05axxh94phvcb1drlp3j8nigqrw3qml3yqf0lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXRpbWUtZ2V0dGV4dCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "46": {"version": "7", "sha256": "0ghxlqr86vcr1w05axxh94phvcb1drlp3j8nigqrw3qml3yqf0lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXRpbWUtZ2V0dGV4dCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "7", "sha256": "0ghxlqr86vcr1w05axxh94phvcb1drlp3j8nigqrw3qml3yqf0lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYmF0dGVyeSBlc3RpbWF0ZWQgcmVtYWluaW5nIHRpbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXRpbWUtZ2V0dGV4dCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "onedrive@diegomerida.com", "name": "One Drive Resurrect", "pname": "one-drive-resurrect", "description": "One Drive extension. This extension is not affiliated, funded, or in any way associated with Microsoft and OneDrive.", "link": "https://extensions.gnome.org/extension/5428/one-drive-resurrect/", "shell_version_map": {
     "41": {"version": "11", "sha256": "1i2l48jrwa8b1brlakdj3nk7ak67559hlm2v075g67ml8xk0ai4m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdzdHJveWVyL29uZURyaXZlIiwKICAidXVpZCI6ICJvbmVkcml2ZUBkaWVnb21lcmlkYS5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
@@ -5641,8 +5913,9 @@
     "42": {"version": "6", "sha256": "0c3l0j88bmc5lhif0jwxy0mch1wafmbk6hysyxdnf2qlkiha50ds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "43": {"version": "6", "sha256": "0c3l0j88bmc5lhif0jwxy0mch1wafmbk6hysyxdnf2qlkiha50ds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="},
     "44": {"version": "6", "sha256": "0c3l0j88bmc5lhif0jwxy0mch1wafmbk6hysyxdnf2qlkiha50ds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "45": {"version": "10", "sha256": "05ilkqaz58i7q438gysahzbmf3qaf37y1db4bq6j419n09bdmz2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9vc2Qtdm9sdW1lLW51bWJlciIsCiAgInV1aWQiOiAib3NkLXZvbHVtZS1udW1iZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "46": {"version": "10", "sha256": "05ilkqaz58i7q438gysahzbmf3qaf37y1db4bq6j419n09bdmz2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9vc2Qtdm9sdW1lLW51bWJlciIsCiAgInV1aWQiOiAib3NkLXZvbHVtZS1udW1iZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
+    "45": {"version": "11", "sha256": "0a0afslm5xf8b7sy8qm5s00i2hk7hcp19hxm9phcxfjq0jgl9g4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDExCn0="},
+    "46": {"version": "11", "sha256": "0a0afslm5xf8b7sy8qm5s00i2hk7hcp19hxm9phcxfjq0jgl9g4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDExCn0="},
+    "47": {"version": "11", "sha256": "0a0afslm5xf8b7sy8qm5s00i2hk7hcp19hxm9phcxfjq0jgl9g4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDExCn0="}
   }}
 , {"uuid": "next-up@artisticat1.github.com", "name": "Next Up", "pname": "next-up", "description": "Show your next calendar event in the status bar", "link": "https://extensions.gnome.org/extension/5465/next-up/", "shell_version_map": {
     "42": {"version": "5", "sha256": "1wcz3n15gzd9dqjv85q46r1zls87sc9sscq83qaswl7h9hxa1dq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJ0aXN0aWNhdDEvZ25vbWUtbmV4dC11cCIsCiAgInV1aWQiOiAibmV4dC11cEBhcnRpc3RpY2F0MS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="},
@@ -5656,7 +5929,8 @@
     "43": {"version": "8", "sha256": "0fs7kdffbvip03k6xqhw8y7jdqxlg6rs30zx915rr83hdkx5df37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgIm5hbWUiOiAiV2VhdGhlciBPJ0Nsb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvd2VhdGhlci1vY2xvY2siLAogICJ1dWlkIjogIndlYXRoZXJvY2xvY2tAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"},
     "44": {"version": "8", "sha256": "0fs7kdffbvip03k6xqhw8y7jdqxlg6rs30zx915rr83hdkx5df37", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgIm5hbWUiOiAiV2VhdGhlciBPJ0Nsb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvd2VhdGhlci1vY2xvY2siLAogICJ1dWlkIjogIndlYXRoZXJvY2xvY2tAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"},
     "45": {"version": "11", "sha256": "0yh6z5704vjzxbgwx1avh04z70j486c0jcl5zswral93vbd1swnq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgIm5hbWUiOiAiV2VhdGhlciBPJ0Nsb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "46": {"version": "13", "sha256": "03l5aca5wklbcpy9bnhhmnkqky7mn9s7w4g1kq72qia11k048rnq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgIm5hbWUiOiAiV2VhdGhlciBPJ0Nsb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMiIKfQ=="}
+    "46": {"version": "13", "sha256": "03l5aca5wklbcpy9bnhhmnkqky7mn9s7w4g1kq72qia11k048rnq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgIm5hbWUiOiAiV2VhdGhlciBPJ0Nsb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMiIKfQ=="},
+    "47": {"version": "14", "sha256": "1l39n47f6mhhf7297l6whzmbh1zjfgs1xr2sz3pf38x26hcairhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgIm5hbWUiOiAiV2VhdGhlciBPJ0Nsb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53ZWF0aGVyLW9jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="}
   }}
 , {"uuid": "appmenu-color-icon@arahiko-ayami.github.com", "name": "Color App Menu Icon for GNOME 40+", "pname": "color-app-menu-icon-for-gnome-40", "description": "Replace the symbolic application menu icon with the regular one. An alternative version of yanbab's extension that supports GNOME 40 and higher", "link": "https://extensions.gnome.org/extension/5473/color-app-menu-icon-for-gnome-40/", "shell_version_map": {
     "38": {"version": "3", "sha256": "1alr3q7zdlhzl1ra4rmvmzfqb0n0fxwisbnfg68yk9nix5d6kpay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyYWhpa28tYXlhbWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJlZ3VsYXItYXBwbWVudS1pY29uIiwKICAidXVpZCI6ICJhcHBtZW51LWNvbG9yLWljb25AYXJhaGlrby1heWFtaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -5676,25 +5950,29 @@
     "42": {"version": "17", "sha256": "054k5q694ssm937qfxximg2qh5zx4m2qzcffdxjm4xd39qn4bi85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "43": {"version": "17", "sha256": "054k5q694ssm937qfxximg2qh5zx4m2qzcffdxjm4xd39qn4bi85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "44": {"version": "17", "sha256": "054k5q694ssm937qfxximg2qh5zx4m2qzcffdxjm4xd39qn4bi85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "45": {"version": "27", "sha256": "142v05d9mnmphsvvf8qjcsbzcb668dh4ylymz0n5m2s5bxdzpvc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
-    "46": {"version": "27", "sha256": "142v05d9mnmphsvvf8qjcsbzcb668dh4ylymz0n5m2s5bxdzpvc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}
+    "45": {"version": "31", "sha256": "0pf2fp5q8hdkn3ciqyp1xyihjp75g9wdg0c49f798rd3qsvdzxk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "46": {"version": "31", "sha256": "0pf2fp5q8hdkn3ciqyp1xyihjp75g9wdg0c49f798rd3qsvdzxk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "47": {"version": "31", "sha256": "0pf2fp5q8hdkn3ciqyp1xyihjp75g9wdg0c49f798rd3qsvdzxk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}
   }}
 , {"uuid": "ibus-switcher@kevinhwang91.github.com", "name": "IBus Switcher", "pname": "ibus-switcher", "description": "Use d-bus to switch ibus source", "link": "https://extensions.gnome.org/extension/5497/ibus-switcher/", "shell_version_map": {
-    "45": {"version": "4", "sha256": "1na3cncy9kkdqbvhwzckbf3axrcpz1apidxvsv4s5qmg2vrjccgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBkLWJ1cyB0byBzd2l0Y2ggaWJ1cyBzb3VyY2UiLAogICJuYW1lIjogIklCdXMgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tldmluaHdhbmc5MS9nbm9tZS1zaGVsbC1pYnVzLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpYnVzLXN3aXRjaGVyQGtldmluaHdhbmc5MS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "46": {"version": "4", "sha256": "1na3cncy9kkdqbvhwzckbf3axrcpz1apidxvsv4s5qmg2vrjccgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBkLWJ1cyB0byBzd2l0Y2ggaWJ1cyBzb3VyY2UiLAogICJuYW1lIjogIklCdXMgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tldmluaHdhbmc5MS9nbm9tZS1zaGVsbC1pYnVzLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpYnVzLXN3aXRjaGVyQGtldmluaHdhbmc5MS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "45": {"version": "5", "sha256": "1qzhlfqcm6i16k0w6haxllz18w0ckgjq0jjqkpdyrqfmg3b8djhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBkLWJ1cyB0byBzd2l0Y2ggaWJ1cyBzb3VyY2UiLAogICJuYW1lIjogIklCdXMgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZXZpbmh3YW5nOTEvZ25vbWUtc2hlbGwtaWJ1cy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaWJ1cy1zd2l0Y2hlckBrZXZpbmh3YW5nOTEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "46": {"version": "5", "sha256": "1qzhlfqcm6i16k0w6haxllz18w0ckgjq0jjqkpdyrqfmg3b8djhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBkLWJ1cyB0byBzd2l0Y2ggaWJ1cyBzb3VyY2UiLAogICJuYW1lIjogIklCdXMgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZXZpbmh3YW5nOTEvZ25vbWUtc2hlbGwtaWJ1cy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaWJ1cy1zd2l0Y2hlckBrZXZpbmh3YW5nOTEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "47": {"version": "5", "sha256": "1qzhlfqcm6i16k0w6haxllz18w0ckgjq0jjqkpdyrqfmg3b8djhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBkLWJ1cyB0byBzd2l0Y2ggaWJ1cyBzb3VyY2UiLAogICJuYW1lIjogIklCdXMgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZXZpbmh3YW5nOTEvZ25vbWUtc2hlbGwtaWJ1cy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaWJ1cy1zd2l0Y2hlckBrZXZpbmh3YW5nOTEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "auto-activities@CleoMenezesJr.github.io", "name": "Auto Activities", "pname": "auto-activities", "description": "Show activities overview when there are no windows, or hide it when there are new windows.\n\nThis extension is a fork of the Auto Activities extension, its former owner transferred its repository to me.", "link": "https://extensions.gnome.org/extension/5500/auto-activities/", "shell_version_map": {
     "42": {"version": "11", "sha256": "13ck2dnx68ab9nw4lkzbq9jvxdivl1qvlf7dw58dr69s0wbrvlm1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "43": {"version": "11", "sha256": "13ck2dnx68ab9nw4lkzbq9jvxdivl1qvlf7dw58dr69s0wbrvlm1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "44": {"version": "11", "sha256": "13ck2dnx68ab9nw4lkzbq9jvxdivl1qvlf7dw58dr69s0wbrvlm1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "45": {"version": "13", "sha256": "10bkl19knlg90mnkn3xiy0xr2knf6405chypn30jc9d0vdl5j87x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLWFjdGl2aXRpZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4xIgp9"},
-    "46": {"version": "13", "sha256": "10bkl19knlg90mnkn3xiy0xr2knf6405chypn30jc9d0vdl5j87x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLWFjdGl2aXRpZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4xIgp9"}
+    "46": {"version": "13", "sha256": "10bkl19knlg90mnkn3xiy0xr2knf6405chypn30jc9d0vdl5j87x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLWFjdGl2aXRpZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAQ2xlb01lbmV6ZXNKci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4xIgp9"},
+    "47": {"version": "14", "sha256": "0mwxb26qycn6amaffqc6gvzr18s7x3l02r58s61iycgrgvbq3gfl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDbGVvTWVuZXplc0pyIiwKICAgICJrb2ZpIjogImNsZW9tZW5lemVzanIiLAogICAgInBheXBhbCI6ICJDbGVvTWVuZXplc0pyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pLWphbi1zZW5hQHByb3Rvbi5tZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLWFjdGl2aXRpZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2xlb01lbmV6ZXNKci9hdXRvLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImF1dG8tYWN0aXZpdGllc0BDbGVvTWVuZXplc0pyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="}
   }}
 , {"uuid": "quick-settings-avatar@d-go", "name": "User Avatar In Quick Settings", "pname": "user-avatar-in-quick-settings", "description": "Display the user avatar in the Quick Settings menu, part of the \"System\" settings", "link": "https://extensions.gnome.org/extension/5506/user-avatar-in-quick-settings/", "shell_version_map": {
     "43": {"version": "4", "sha256": "04khkpjilgrbqfrsd11d3f8psmqlhavjmbwp02mpa36qk9g79vvm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZC1nby9xdWljay1zZXR0aW5ncy1hdmF0YXIiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLWF2YXRhckBkLWdvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "44": {"version": "4", "sha256": "04khkpjilgrbqfrsd11d3f8psmqlhavjmbwp02mpa36qk9g79vvm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZC1nby9xdWljay1zZXR0aW5ncy1hdmF0YXIiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLWF2YXRhckBkLWdvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "45": {"version": "7", "sha256": "0v8s5j0fm1dcw40qkcq3m8sbi7kilm7v5mccgfa4bw0hv5r21gps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZC1nby9xdWljay1zZXR0aW5ncy1hdmF0YXIiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLWF2YXRhckBkLWdvIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "46": {"version": "7", "sha256": "0v8s5j0fm1dcw40qkcq3m8sbi7kilm7v5mccgfa4bw0hv5r21gps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZC1nby9xdWljay1zZXR0aW5ncy1hdmF0YXIiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLWF2YXRhckBkLWdvIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "45": {"version": "8", "sha256": "1kk5w2hq6r24iw0fcxixn7fszhprmapaywblmnhq22mw0dqlg9dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QtZ28vcXVpY2stc2V0dGluZ3MtYXZhdGFyIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdmF0YXJAZC1nbyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "46": {"version": "8", "sha256": "1kk5w2hq6r24iw0fcxixn7fszhprmapaywblmnhq22mw0dqlg9dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QtZ28vcXVpY2stc2V0dGluZ3MtYXZhdGFyIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdmF0YXJAZC1nbyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "47": {"version": "8", "sha256": "1kk5w2hq6r24iw0fcxixn7fszhprmapaywblmnhq22mw0dqlg9dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QtZ28vcXVpY2stc2V0dGluZ3MtYXZhdGFyIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdmF0YXJAZC1nbyIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
 , {"uuid": "eur-brl@jcanabarro.github.com", "name": "EUR-BRL", "pname": "eur-brl", "description": "Gnome Extension that shows the current conversion of Euro to Brazilian Reals.\n\nIt is a fork of USD-BRL https://extensions.gnome.org/extension/5371/usd-bra/", "link": "https://extensions.gnome.org/extension/5510/eur-brl/", "shell_version_map": {
     "42": {"version": "2", "sha256": "0j5wx3dawlxdal6rw7ijh17wbpakdy3qwh634ns9q65a7axqalkz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IGNvbnZlcnNpb24gb2YgRXVybyB0byBCcmF6aWxpYW4gUmVhbHMuXG5cbkl0IGlzIGEgZm9yayBvZiBVU0QtQlJMIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzUzNzEvdXNkLWJyYS8iLAogICJuYW1lIjogIkVVUi1CUkwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamNhbmFiYXJyby9FVVItQlJMIiwKICAidXVpZCI6ICJldXItYnJsQGpjYW5hYmFycm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
@@ -5708,8 +5986,9 @@
 , {"uuid": "nano-lights@chlumskyvaclav.gmail.com", "name": "Nano Lights", "pname": "nano-lights", "description": "This extension controls Nanoleaf shapes and possibly others Nanoleaf devices on your local (wifi) network. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/5519/nano-lights/", "shell_version_map": {
     "43": {"version": "4", "sha256": "0w0092hhra27d59842xgc6r01v4sfbl5p1ipvf3gbq6pam9955b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25hbm8tbGlnaHRzIiwKICAidXVpZCI6ICJuYW5vLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
     "44": {"version": "4", "sha256": "0w0092hhra27d59842xgc6r01v4sfbl5p1ipvf3gbq6pam9955b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25hbm8tbGlnaHRzIiwKICAidXVpZCI6ICJuYW5vLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "7", "sha256": "1ayij5spshhnj711dhppv4ql2gzpck5f9dsq9y8qybz7h15r0nj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYW5vLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25hbm8tbGlnaHRzIiwKICAidXVpZCI6ICJuYW5vLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
-    "46": {"version": "7", "sha256": "1ayij5spshhnj711dhppv4ql2gzpck5f9dsq9y8qybz7h15r0nj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYW5vLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25hbm8tbGlnaHRzIiwKICAidXVpZCI6ICJuYW5vLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
+    "45": {"version": "9", "sha256": "1dnll19q043gg7iyxbib6pakkjzwk1jpz8phjn4flx376b3n04i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYW5vLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9uYW5vLWxpZ2h0cyIsCiAgInV1aWQiOiAibmFuby1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "46": {"version": "9", "sha256": "1dnll19q043gg7iyxbib6pakkjzwk1jpz8phjn4flx376b3n04i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYW5vLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9uYW5vLWxpZ2h0cyIsCiAgInV1aWQiOiAibmFuby1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "47": {"version": "9", "sha256": "1dnll19q043gg7iyxbib6pakkjzwk1jpz8phjn4flx376b3n04i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYW5vLWxpZ2h0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9uYW5vLWxpZ2h0cyIsCiAgInV1aWQiOiAibmFuby1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}
   }}
 , {"uuid": "just-another-search-bar@xelad0m", "name": "Just Another Search Bar", "pname": "just-another-search-bar", "description": "Simple GNOME Shell extension for performing search queries\nfrom desktop. Some search engines are added as examples, you can add your own,\nincluding local search tools with suitable CLI", "link": "https://extensions.gnome.org/extension/5522/just-another-search-bar/", "shell_version_map": {
     "42": {"version": "13", "sha256": "1qij3yfrhqsm23lsi9p646r25w6x6vlcfimsqkbrvbvisncqi65n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gZm9yIHBlcmZvcm1pbmcgc2VhcmNoIHF1ZXJpZXNcbmZyb20gZGVza3RvcC4gU29tZSBzZWFyY2ggZW5naW5lcyBhcmUgYWRkZWQgYXMgZXhhbXBsZXMsIHlvdSBjYW4gYWRkIHlvdXIgb3duLFxuaW5jbHVkaW5nIGxvY2FsIHNlYXJjaCB0b29scyB3aXRoIHN1aXRhYmxlIENMSSIsCiAgIm5hbWUiOiAiSnVzdCBBbm90aGVyIFNlYXJjaCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLXNoZWxsLmV4dGVuc2lvbnMuanVzdC1hbm90aGVyLXNlYXJjaC1iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVsYWQwbS9qdXN0LWFub3RoZXItc2VhcmNoLWJhciIsCiAgInV1aWQiOiAianVzdC1hbm90aGVyLXNlYXJjaC1iYXJAeGVsYWQwbSIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -5718,9 +5997,10 @@
     "45": {"version": "12", "sha256": "02nial4ns2bwlahqvln85a3bsk6hjd54asdxyn6vfi4fgr95cx4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gZm9yIHBlcmZvcm1pbmcgc2VhcmNoIHF1ZXJpZXNcbmZyb20gZGVza3RvcC4gU29tZSBzZWFyY2ggZW5naW5lcyBhcmUgYWRkZWQgYXMgZXhhbXBsZXMsIHlvdSBjYW4gYWRkIHlvdXIgb3duLFxuaW5jbHVkaW5nIGxvY2FsIHNlYXJjaCB0b29scyB3aXRoIHN1aXRhYmxlIENMSSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtYW5vdGhlci1zZWFyY2gtYmFyIiwKICAibmFtZSI6ICJKdXN0IEFub3RoZXIgU2VhcmNoIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LWFub3RoZXItc2VhcmNoLWJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVsYWQwbS9qdXN0LWFub3RoZXItc2VhcmNoLWJhciIsCiAgInV1aWQiOiAianVzdC1hbm90aGVyLXNlYXJjaC1iYXJAeGVsYWQwbSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "46": {"version": "12", "sha256": "02nial4ns2bwlahqvln85a3bsk6hjd54asdxyn6vfi4fgr95cx4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gZm9yIHBlcmZvcm1pbmcgc2VhcmNoIHF1ZXJpZXNcbmZyb20gZGVza3RvcC4gU29tZSBzZWFyY2ggZW5naW5lcyBhcmUgYWRkZWQgYXMgZXhhbXBsZXMsIHlvdSBjYW4gYWRkIHlvdXIgb3duLFxuaW5jbHVkaW5nIGxvY2FsIHNlYXJjaCB0b29scyB3aXRoIHN1aXRhYmxlIENMSSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtYW5vdGhlci1zZWFyY2gtYmFyIiwKICAibmFtZSI6ICJKdXN0IEFub3RoZXIgU2VhcmNoIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LWFub3RoZXItc2VhcmNoLWJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVsYWQwbS9qdXN0LWFub3RoZXItc2VhcmNoLWJhciIsCiAgInV1aWQiOiAianVzdC1hbm90aGVyLXNlYXJjaC1iYXJAeGVsYWQwbSIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
-, {"uuid": "Noiseclapper@JordanViknar", "name": "Noiseclapper (Soundcore Life for GNOME)", "pname": "noiseclapper", "description": "Noiseclapper is a GNOME Shell extension that allows you to control the Noise Cancelling mode and the Equalizer settings of your Soundcore Life headphones right from the panel. It works as a simple, easy-to-use, desktop-compatible alternative to the official mobile application.\n\nThe following headphones are currently supported by this extension :\n- Soundcore Life P3 (Tested)\n- Soundcore Life Q35\n- Soundcore Life Q30 (Tested)\n- Soundcore Life Q20+\n- Soundcore Life Q20\n- Soundcore Life Q10\n- Soundcore Life Q10\nOthers may be supported by adding them to the extension's internal model list through a pull request.\n\nThis project is not affiliated, associated, authorized, endorsed by, or in any way officially connected with Anker, or any of its subsidiaries or its affiliates.", "link": "https://extensions.gnome.org/extension/5526/noiseclapper/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "04ryxnplygm0v3m3fljx4k9g386zkm3cicj1xlqii9fwbdqpyxnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGNvbnRyb2wgb2YgU291bmRjb3JlIExpZmUgUTMwIEhlYWRwaG9uZXMgKGFuZCBvdGhlcnMpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiTm9pc2VjbGFwcGVyIiwKICAibmFtZSI6ICJOb2lzZWNsYXBwZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm9pc2VjbGFwcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3JkYW5WaWtuYXIvTm9pc2VjbGFwcGVyIiwKICAidXVpZCI6ICJOb2lzZWNsYXBwZXJASm9yZGFuVmlrbmFyIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "3", "sha256": "04ryxnplygm0v3m3fljx4k9g386zkm3cicj1xlqii9fwbdqpyxnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGNvbnRyb2wgb2YgU291bmRjb3JlIExpZmUgUTMwIEhlYWRwaG9uZXMgKGFuZCBvdGhlcnMpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiTm9pc2VjbGFwcGVyIiwKICAibmFtZSI6ICJOb2lzZWNsYXBwZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm9pc2VjbGFwcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3JkYW5WaWtuYXIvTm9pc2VjbGFwcGVyIiwKICAidXVpZCI6ICJOb2lzZWNsYXBwZXJASm9yZGFuVmlrbmFyIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+, {"uuid": "Noiseclapper@JordanViknar", "name": "Noiseclapper - Soundcore Life for GNOME", "pname": "noiseclapper", "description": "Provides control of Soundcore Life Q30 Headphones (and others)", "link": "https://extensions.gnome.org/extension/5526/noiseclapper/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "1rqf87462rnbf17fka15q64vvggy8ff42xymi90z3qdm6k2fww24", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGNvbnRyb2wgb2YgU291bmRjb3JlIExpZmUgUTMwIEhlYWRwaG9uZXMgKGFuZCBvdGhlcnMpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiTm9pc2VjbGFwcGVyIiwKICAibmFtZSI6ICJOb2lzZWNsYXBwZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm9pc2VjbGFwcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9yZGFuVmlrbmFyL05vaXNlY2xhcHBlciIsCiAgInV1aWQiOiAiTm9pc2VjbGFwcGVyQEpvcmRhblZpa25hciIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1rqf87462rnbf17fka15q64vvggy8ff42xymi90z3qdm6k2fww24", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGNvbnRyb2wgb2YgU291bmRjb3JlIExpZmUgUTMwIEhlYWRwaG9uZXMgKGFuZCBvdGhlcnMpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiTm9pc2VjbGFwcGVyIiwKICAibmFtZSI6ICJOb2lzZWNsYXBwZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm9pc2VjbGFwcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9yZGFuVmlrbmFyL05vaXNlY2xhcHBlciIsCiAgInV1aWQiOiAiTm9pc2VjbGFwcGVyQEpvcmRhblZpa25hciIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1rqf87462rnbf17fka15q64vvggy8ff42xymi90z3qdm6k2fww24", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGNvbnRyb2wgb2YgU291bmRjb3JlIExpZmUgUTMwIEhlYWRwaG9uZXMgKGFuZCBvdGhlcnMpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiTm9pc2VjbGFwcGVyIiwKICAibmFtZSI6ICJOb2lzZWNsYXBwZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm9pc2VjbGFwcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9yZGFuVmlrbmFyL05vaXNlY2xhcHBlciIsCiAgInV1aWQiOiAiTm9pc2VjbGFwcGVyQEpvcmRhblZpa25hciIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "compact-quick-settings@gnome-shell-extensions.mariospr.org", "name": "Compact Quick Settings", "pname": "compact-quick-settings", "description": "Compact quick settings menu for GNOME 43 and newer", "link": "https://extensions.gnome.org/extension/5527/compact-quick-settings/", "shell_version_map": {
     "43": {"version": "3", "sha256": "04ffksmfc27gya24x2fj0zpax3yj1kwjdwn33a99rxpypmicvpwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBhY3QgcXVpY2sgc2V0dGluZ3MgbWVudSBmb3IgR05PTUUgNDMgYW5kIG5ld2VyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiIiwKICAibmFtZSI6ICJDb21wYWN0IFF1aWNrIFNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL2NvbXBhY3QtcXVpY2stc2V0dGluZ3MtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjb21wYWN0LXF1aWNrLXNldHRpbmdzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -5740,9 +6020,11 @@
 , {"uuid": "customreboot@nova1545", "name": "Custom Reboot", "pname": "custom-reboot", "description": "Reboot into another OS directly from GNOME.\nA expansion of https://github.com/docquantum/gnome-shell-extension-customreboot", "link": "https://extensions.gnome.org/extension/5542/custom-reboot/", "shell_version_map": {
     "43": {"version": "7", "sha256": "1xj7b97z0y5ryb5zikawlzsknk3l1zhb2xflpf28gvfbrk1gc642", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vdmExNTQ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJ1dWlkIjogImN1c3RvbXJlYm9vdEBub3ZhMTU0NSIsCiAgInZlcnNpb24iOiA3Cn0="},
     "44": {"version": "7", "sha256": "1xj7b97z0y5ryb5zikawlzsknk3l1zhb2xflpf28gvfbrk1gc642", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vdmExNTQ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJ1dWlkIjogImN1c3RvbXJlYm9vdEBub3ZhMTU0NSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "45": {"version": "10", "sha256": "1jjnd5zjhwr91ybvcm5i2a099gwy6svca6m4y3brdn05zl8jn42i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm92YTE1NDUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWN1c3RvbXJlYm9vdCIsCiAgInV1aWQiOiAiY3VzdG9tcmVib290QG5vdmExNTQ1IiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "11", "sha256": "173dcqaj6pzhhbcxp26c1bv5cn5p1l1nn38635nk0lkjs2kp6qg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob3ZhMTU0NS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3VzdG9tcmVib290IiwKICAidXVpZCI6ICJjdXN0b21yZWJvb3RAbm92YTE1NDUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "46": {"version": "11", "sha256": "173dcqaj6pzhhbcxp26c1bv5cn5p1l1nn38635nk0lkjs2kp6qg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob3ZhMTU0NS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3VzdG9tcmVib290IiwKICAidXVpZCI6ICJjdXN0b21yZWJvb3RAbm92YTE1NDUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "47": {"version": "11", "sha256": "173dcqaj6pzhhbcxp26c1bv5cn5p1l1nn38635nk0lkjs2kp6qg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob3ZhMTU0NS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3VzdG9tcmVib290IiwKICAidXVpZCI6ICJjdXN0b21yZWJvb3RAbm92YTE1NDUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
-, {"uuid": "custom-accent-colors@demiskp", "name": "Custom Accent Colors", "pname": "custom-accent-colors", "description": "A GNOME Shell Extension that provides 7 Custom Accent Colors. The selected Accent Color can be applied to GTK4/GTK3 apps and the Gnome Shell.", "link": "https://extensions.gnome.org/extension/5547/custom-accent-colors/", "shell_version_map": {
+, {"uuid": "custom-accent-colors@demiskp", "name": "Custom Accent Colors", "pname": "custom-accent-colors", "description": "A GNOME Shell Extension that provides 7 Custom Accent Colors for versions 43-46. The selected Accent Color can be applied to GTK4/GTK3 apps and the Gnome Shell.", "link": "https://extensions.gnome.org/extension/5547/custom-accent-colors/", "shell_version_map": {
     "43": {"version": "6", "sha256": "1cfmqp524m3zkw5vj6msr9pjjwwwys3mcvjipfdl875lkwdb3xg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgdXNlciB0byBjaG9vc2UgYmV0d2VlbiA5IEN1c3RvbSBBY2NlbnQgQ29sb3JzLiBUaGUgQWNjZW50IENvbG9yIGNhbiBiZSBhcHBsaWVkIHRvIEdUSzQvR1RLMyBhcHBzIGFuZCB0aGUgR25vbWUgU2hlbGwuIiwKICAibmFtZSI6ICJDdXN0b20gQWNjZW50IENvbG9ycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVtaXNrcC9jdXN0b20tYWNjZW50LWNvbG9ycyIsCiAgInV1aWQiOiAiY3VzdG9tLWFjY2VudC1jb2xvcnNAZGVtaXNrcCIsCiAgInZlcnNpb24iOiA2Cn0="},
     "44": {"version": "6", "sha256": "1cfmqp524m3zkw5vj6msr9pjjwwwys3mcvjipfdl875lkwdb3xg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgdXNlciB0byBjaG9vc2UgYmV0d2VlbiA5IEN1c3RvbSBBY2NlbnQgQ29sb3JzLiBUaGUgQWNjZW50IENvbG9yIGNhbiBiZSBhcHBsaWVkIHRvIEdUSzQvR1RLMyBhcHBzIGFuZCB0aGUgR25vbWUgU2hlbGwuIiwKICAibmFtZSI6ICJDdXN0b20gQWNjZW50IENvbG9ycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVtaXNrcC9jdXN0b20tYWNjZW50LWNvbG9ycyIsCiAgInV1aWQiOiAiY3VzdG9tLWFjY2VudC1jb2xvcnNAZGVtaXNrcCIsCiAgInZlcnNpb24iOiA2Cn0="},
     "45": {"version": "9", "sha256": "1bwz5bib4ancd0pq1vf8qbwm04p9n61lznp51izfcnf8nag5s0fv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgdXNlciB0byBjaG9vc2UgYmV0d2VlbiA5IEN1c3RvbSBBY2NlbnQgQ29sb3JzLiBUaGUgQWNjZW50IENvbG9yIGNhbiBiZSBhcHBsaWVkIHRvIEdUSzQvR1RLMyBhcHBzIGFuZCB0aGUgR25vbWUgU2hlbGwuIiwKICAibmFtZSI6ICJDdXN0b20gQWNjZW50IENvbG9ycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZW1pc2twL2N1c3RvbS1hY2NlbnQtY29sb3JzIiwKICAidXVpZCI6ICJjdXN0b20tYWNjZW50LWNvbG9yc0BkZW1pc2twIiwKICAidmVyc2lvbiI6IDkKfQ=="},
@@ -5751,7 +6033,9 @@
 , {"uuid": "dynamic-calendar-and-clocks-icons@fcusr.github.com", "name": "Dynamic Calendar, Clocks and Weather Icons", "pname": "dynamic-calendar-and-clocks-icons", "description": "Let Calendar, Clocks and Weather icons show current date, time and weather.", "link": "https://extensions.gnome.org/extension/5550/dynamic-calendar-and-clocks-icons/", "shell_version_map": {
     "43": {"version": "7", "sha256": "06z2r443n2c17s6xc4aahchyqvw765gi19pl8v9pb0w1gyywnlhz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgIm5hbWUiOiAiRHluYW1pYyBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIEljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mY3Vzci9keW5hbWljLWNhbGVuZGFyLWFuZC1jbG9ja3MtaWNvbnMiLAogICJ1dWlkIjogImR5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29uc0BmY3Vzci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "44": {"version": "7", "sha256": "06z2r443n2c17s6xc4aahchyqvw765gi19pl8v9pb0w1gyywnlhz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgIm5hbWUiOiAiRHluYW1pYyBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIEljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mY3Vzci9keW5hbWljLWNhbGVuZGFyLWFuZC1jbG9ja3MtaWNvbnMiLAogICJ1dWlkIjogImR5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29uc0BmY3Vzci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "45": {"version": "9", "sha256": "1fpiy3wjxjim7mha0v9ky5mpj5iba52cw3jls40m44bkvili2pyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29uc0BmY3Vzci5naXRodWIuY29tIiwKICAibmFtZSI6ICJEeW5hbWljIENhbGVuZGFyLCBDbG9ja3MgYW5kIFdlYXRoZXIgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvZHluYW1pYy1jYWxlbmRhci1hbmQtY2xvY2tzLWljb25zIiwKICAidXVpZCI6ICJkeW5hbWljLWNhbGVuZGFyLWFuZC1jbG9ja3MtaWNvbnNAZmN1c3IuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}
+    "45": {"version": "9", "sha256": "1fpiy3wjxjim7mha0v9ky5mpj5iba52cw3jls40m44bkvili2pyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29uc0BmY3Vzci5naXRodWIuY29tIiwKICAibmFtZSI6ICJEeW5hbWljIENhbGVuZGFyLCBDbG9ja3MgYW5kIFdlYXRoZXIgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvZHluYW1pYy1jYWxlbmRhci1hbmQtY2xvY2tzLWljb25zIiwKICAidXVpZCI6ICJkeW5hbWljLWNhbGVuZGFyLWFuZC1jbG9ja3MtaWNvbnNAZmN1c3IuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "10", "sha256": "085y5vdrpr6br8i90f5dzxbbyavvr00m0b6ddxsdacdvfsbr89a4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29uc0BmY3Vzci5naXRodWIuY29tIiwKICAibmFtZSI6ICJEeW5hbWljIENhbGVuZGFyLCBDbG9ja3MgYW5kIFdlYXRoZXIgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZjdXNyL2R5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29ucyIsCiAgInV1aWQiOiAiZHluYW1pYy1jYWxlbmRhci1hbmQtY2xvY2tzLWljb25zQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "47": {"version": "10", "sha256": "085y5vdrpr6br8i90f5dzxbbyavvr00m0b6ddxsdacdvfsbr89a4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29uc0BmY3Vzci5naXRodWIuY29tIiwKICAibmFtZSI6ICJEeW5hbWljIENhbGVuZGFyLCBDbG9ja3MgYW5kIFdlYXRoZXIgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZjdXNyL2R5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29ucyIsCiAgInV1aWQiOiAiZHluYW1pYy1jYWxlbmRhci1hbmQtY2xvY2tzLWljb25zQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
   }}
 , {"uuid": "showmethetext@Guleri24.github.com", "name": "Show Me The Text", "pname": "show-me-the-text", "description": "Shows desired text on the right side of the top bar ;-) ..........................................................                                                                                                                                            * still has a bug ... need to re-enable extension in some cases for alt text ;-)", "link": "https://extensions.gnome.org/extension/5556/show-me-the-text/", "shell_version_map": {
     "42": {"version": "4", "sha256": "09y9n9z55lb17hf3lwxjibw8v1c6sxvjf0ddfkw492ijav42cw1c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRlc2lyZWQgdGV4dCBvbiB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgdG9wIGJhciA7LSkgLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKiBzdGlsbCBoYXMgYSBidWcgLi4uIG5lZWQgdG8gcmUtZW5hYmxlIGV4dGVuc2lvbiBpbiBzb21lIGNhc2VzIGZvciBhbHQgdGV4dCA7LSkiLAogICJuYW1lIjogIlNob3cgTWUgVGhlIFRleHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvd21ldGhldGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0d1bGVyaTI0L3Nob3ctbWUtdGhlLXRleHQiLAogICJ1dWlkIjogInNob3dtZXRoZXRleHRAR3VsZXJpMjQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -5780,8 +6064,9 @@
     "42": {"version": "12", "sha256": "0whfsm0a3jfj5srb9qc87w9v2y4z68cjciz142njh89j3fs2wcv6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsaWFwYXNxdWFsaS9wb3dlci1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJwb3dlci1wcm9maWxlLXN3aXRjaGVyQGVsaWFwYXNxdWFsaS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "43": {"version": "12", "sha256": "0whfsm0a3jfj5srb9qc87w9v2y4z68cjciz142njh89j3fs2wcv6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsaWFwYXNxdWFsaS9wb3dlci1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJwb3dlci1wcm9maWxlLXN3aXRjaGVyQGVsaWFwYXNxdWFsaS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
     "44": {"version": "12", "sha256": "0whfsm0a3jfj5srb9qc87w9v2y4z68cjciz142njh89j3fs2wcv6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsaWFwYXNxdWFsaS9wb3dlci1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJwb3dlci1wcm9maWxlLXN3aXRjaGVyQGVsaWFwYXNxdWFsaS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "45": {"version": "19", "sha256": "0r9yg02rzfgbhm7mgahpdi7x28lix59d5kyd65ibmydyl94chb5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJuYW1lIjogIlBvd2VyIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG93ZXItcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "46": {"version": "19", "sha256": "0r9yg02rzfgbhm7mgahpdi7x28lix59d5kyd65ibmydyl94chb5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJuYW1lIjogIlBvd2VyIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG93ZXItcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOQp9"}
+    "45": {"version": "20", "sha256": "1rz9wwimrv1l4zj3kv4knzryrqqwz253ws56n5f56jjpxizz21i4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJuYW1lIjogIlBvd2VyIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG93ZXItcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsaWFwYXNxdWFsaS9wb3dlci1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJwb3dlci1wcm9maWxlLXN3aXRjaGVyQGVsaWFwYXNxdWFsaS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
+    "46": {"version": "20", "sha256": "1rz9wwimrv1l4zj3kv4knzryrqqwz253ws56n5f56jjpxizz21i4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJuYW1lIjogIlBvd2VyIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG93ZXItcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsaWFwYXNxdWFsaS9wb3dlci1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJwb3dlci1wcm9maWxlLXN3aXRjaGVyQGVsaWFwYXNxdWFsaS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
+    "47": {"version": "20", "sha256": "1rz9wwimrv1l4zj3kv4knzryrqqwz253ws56n5f56jjpxizz21i4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJuYW1lIjogIlBvd2VyIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG93ZXItcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsaWFwYXNxdWFsaS9wb3dlci1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJwb3dlci1wcm9maWxlLXN3aXRjaGVyQGVsaWFwYXNxdWFsaS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}
   }}
 , {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters are designed to assist both color-blind users and developers.\n\nThe menu offers correction filters as well as simulation filters that demonstrate how color-blind individuals perceive colors. Included are filters for Protanopia, Deuteranopia, and Tritanopia, with adjustable strength. Additionally, filters for desaturation, channel mix, and lightness and color inversions are available.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {
     "38": {"version": "17", "sha256": "0lgdx717xzm8fhszfvx9hqjx1kjkzlx8hs5jwrzrslif32vwjsbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
@@ -5790,14 +6075,16 @@
     "42": {"version": "17", "sha256": "0lgdx717xzm8fhszfvx9hqjx1kjkzlx8hs5jwrzrslif32vwjsbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "43": {"version": "17", "sha256": "0lgdx717xzm8fhszfvx9hqjx1kjkzlx8hs5jwrzrslif32vwjsbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "44": {"version": "17", "sha256": "0lgdx717xzm8fhszfvx9hqjx1kjkzlx8hs5jwrzrslif32vwjsbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
-    "45": {"version": "19", "sha256": "047vk0csxn4xrvb3nmcr7c68kx8p77wx51v2gbk36sglvw4p1gcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgYXJlIGRlc2lnbmVkIHRvIGFzc2lzdCBib3RoIGNvbG9yLWJsaW5kIHVzZXJzIGFuZCBkZXZlbG9wZXJzLiBUaGUgbWVudSBvZmZlcnMgY29ycmVjdGlvbiBmaWx0ZXJzIGFzIHdlbGwgYXMgc2ltdWxhdGlvbiBmaWx0ZXJzIHRoYXQgZGVtb25zdHJhdGUgaG93IGNvbG9yLWJsaW5kIGluZGl2aWR1YWxzIHBlcmNlaXZlIGNvbG9ycy4gSW5jbHVkZWQgYXJlIGZpbHRlcnMgZm9yIFByb3Rhbm9waWEsIERldXRlcmFub3BpYSwgYW5kIFRyaXRhbm9waWEsIHdpdGggYWRqdXN0YWJsZSBzdHJlbmd0aC4gQWRkaXRpb25hbGx5LCBmaWx0ZXJzIGZvciBkZXNhdHVyYXRpb24sIGNoYW5uZWwgbWl4LCBhbmQgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zIGFyZSBhdmFpbGFibGUuXG5cblByaW1hcnkgbW91c2UgYnV0dG9uIGNsaWNrIG9uIHRoZSBwYW5lbCBidXR0b24gdG9nZ2xlcyBhY3RpdmUgZmlsdGVyLCBzZWNvbmRhcnkgY2xpY2sgb3BlbnMgY29uZmlndXJhdGlvbiBtZW51LCBtaWRkbGUgY2xpY2sgdG9nZ2xlcyBoaWdoLWNvbnRyYXN0IGNvcnJlY3Rpb24gaWYgYXZhaWxhYmxlIGFuZCBzY3JvbGwgc3dpdGNoZXMgZmlsdGVycy5cblxuRGlzY3Vzc2lvbnMgYW5kIGJ1ZyByZXBvcnRzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3csIHBsZWFzZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29sb3JibGluZC1maWx0ZXJzIiwKICAibmFtZSI6ICJDb2xvcmJsaW5kIEZpbHRlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3JibGluZC1maWx0ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOSwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjAiCn0="},
-    "46": {"version": "19", "sha256": "047vk0csxn4xrvb3nmcr7c68kx8p77wx51v2gbk36sglvw4p1gcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgYXJlIGRlc2lnbmVkIHRvIGFzc2lzdCBib3RoIGNvbG9yLWJsaW5kIHVzZXJzIGFuZCBkZXZlbG9wZXJzLiBUaGUgbWVudSBvZmZlcnMgY29ycmVjdGlvbiBmaWx0ZXJzIGFzIHdlbGwgYXMgc2ltdWxhdGlvbiBmaWx0ZXJzIHRoYXQgZGVtb25zdHJhdGUgaG93IGNvbG9yLWJsaW5kIGluZGl2aWR1YWxzIHBlcmNlaXZlIGNvbG9ycy4gSW5jbHVkZWQgYXJlIGZpbHRlcnMgZm9yIFByb3Rhbm9waWEsIERldXRlcmFub3BpYSwgYW5kIFRyaXRhbm9waWEsIHdpdGggYWRqdXN0YWJsZSBzdHJlbmd0aC4gQWRkaXRpb25hbGx5LCBmaWx0ZXJzIGZvciBkZXNhdHVyYXRpb24sIGNoYW5uZWwgbWl4LCBhbmQgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zIGFyZSBhdmFpbGFibGUuXG5cblByaW1hcnkgbW91c2UgYnV0dG9uIGNsaWNrIG9uIHRoZSBwYW5lbCBidXR0b24gdG9nZ2xlcyBhY3RpdmUgZmlsdGVyLCBzZWNvbmRhcnkgY2xpY2sgb3BlbnMgY29uZmlndXJhdGlvbiBtZW51LCBtaWRkbGUgY2xpY2sgdG9nZ2xlcyBoaWdoLWNvbnRyYXN0IGNvcnJlY3Rpb24gaWYgYXZhaWxhYmxlIGFuZCBzY3JvbGwgc3dpdGNoZXMgZmlsdGVycy5cblxuRGlzY3Vzc2lvbnMgYW5kIGJ1ZyByZXBvcnRzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3csIHBsZWFzZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29sb3JibGluZC1maWx0ZXJzIiwKICAibmFtZSI6ICJDb2xvcmJsaW5kIEZpbHRlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3JibGluZC1maWx0ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOSwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjAiCn0="}
+    "45": {"version": "20", "sha256": "1cdwjdng03blzkbb9vnscn62lj24qgdw49vkf1d5jcm9cxhyjq8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgYXJlIGRlc2lnbmVkIHRvIGFzc2lzdCBib3RoIGNvbG9yLWJsaW5kIHVzZXJzIGFuZCBkZXZlbG9wZXJzLiBUaGUgbWVudSBvZmZlcnMgY29ycmVjdGlvbiBmaWx0ZXJzIGFzIHdlbGwgYXMgc2ltdWxhdGlvbiBmaWx0ZXJzIHRoYXQgZGVtb25zdHJhdGUgaG93IGNvbG9yLWJsaW5kIGluZGl2aWR1YWxzIHBlcmNlaXZlIGNvbG9ycy4gSW5jbHVkZWQgYXJlIGZpbHRlcnMgZm9yIFByb3Rhbm9waWEsIERldXRlcmFub3BpYSwgYW5kIFRyaXRhbm9waWEsIHdpdGggYWRqdXN0YWJsZSBzdHJlbmd0aC4gQWRkaXRpb25hbGx5LCBmaWx0ZXJzIGZvciBkZXNhdHVyYXRpb24sIGNoYW5uZWwgbWl4LCBhbmQgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zIGFyZSBhdmFpbGFibGUuXG5cblByaW1hcnkgbW91c2UgYnV0dG9uIGNsaWNrIG9uIHRoZSBwYW5lbCBidXR0b24gdG9nZ2xlcyBhY3RpdmUgZmlsdGVyLCBzZWNvbmRhcnkgY2xpY2sgb3BlbnMgY29uZmlndXJhdGlvbiBtZW51LCBtaWRkbGUgY2xpY2sgdG9nZ2xlcyBoaWdoLWNvbnRyYXN0IGNvcnJlY3Rpb24gaWYgYXZhaWxhYmxlIGFuZCBzY3JvbGwgc3dpdGNoZXMgZmlsdGVycy5cblxuRGlzY3Vzc2lvbnMgYW5kIGJ1ZyByZXBvcnRzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3csIHBsZWFzZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29sb3JibGluZC1maWx0ZXJzIiwKICAibmFtZSI6ICJDb2xvcmJsaW5kIEZpbHRlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3JibGluZC1maWx0ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "46": {"version": "20", "sha256": "1cdwjdng03blzkbb9vnscn62lj24qgdw49vkf1d5jcm9cxhyjq8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgYXJlIGRlc2lnbmVkIHRvIGFzc2lzdCBib3RoIGNvbG9yLWJsaW5kIHVzZXJzIGFuZCBkZXZlbG9wZXJzLiBUaGUgbWVudSBvZmZlcnMgY29ycmVjdGlvbiBmaWx0ZXJzIGFzIHdlbGwgYXMgc2ltdWxhdGlvbiBmaWx0ZXJzIHRoYXQgZGVtb25zdHJhdGUgaG93IGNvbG9yLWJsaW5kIGluZGl2aWR1YWxzIHBlcmNlaXZlIGNvbG9ycy4gSW5jbHVkZWQgYXJlIGZpbHRlcnMgZm9yIFByb3Rhbm9waWEsIERldXRlcmFub3BpYSwgYW5kIFRyaXRhbm9waWEsIHdpdGggYWRqdXN0YWJsZSBzdHJlbmd0aC4gQWRkaXRpb25hbGx5LCBmaWx0ZXJzIGZvciBkZXNhdHVyYXRpb24sIGNoYW5uZWwgbWl4LCBhbmQgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zIGFyZSBhdmFpbGFibGUuXG5cblByaW1hcnkgbW91c2UgYnV0dG9uIGNsaWNrIG9uIHRoZSBwYW5lbCBidXR0b24gdG9nZ2xlcyBhY3RpdmUgZmlsdGVyLCBzZWNvbmRhcnkgY2xpY2sgb3BlbnMgY29uZmlndXJhdGlvbiBtZW51LCBtaWRkbGUgY2xpY2sgdG9nZ2xlcyBoaWdoLWNvbnRyYXN0IGNvcnJlY3Rpb24gaWYgYXZhaWxhYmxlIGFuZCBzY3JvbGwgc3dpdGNoZXMgZmlsdGVycy5cblxuRGlzY3Vzc2lvbnMgYW5kIGJ1ZyByZXBvcnRzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3csIHBsZWFzZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29sb3JibGluZC1maWx0ZXJzIiwKICAibmFtZSI6ICJDb2xvcmJsaW5kIEZpbHRlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3JibGluZC1maWx0ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "47": {"version": "20", "sha256": "1cdwjdng03blzkbb9vnscn62lj24qgdw49vkf1d5jcm9cxhyjq8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgYXJlIGRlc2lnbmVkIHRvIGFzc2lzdCBib3RoIGNvbG9yLWJsaW5kIHVzZXJzIGFuZCBkZXZlbG9wZXJzLiBUaGUgbWVudSBvZmZlcnMgY29ycmVjdGlvbiBmaWx0ZXJzIGFzIHdlbGwgYXMgc2ltdWxhdGlvbiBmaWx0ZXJzIHRoYXQgZGVtb25zdHJhdGUgaG93IGNvbG9yLWJsaW5kIGluZGl2aWR1YWxzIHBlcmNlaXZlIGNvbG9ycy4gSW5jbHVkZWQgYXJlIGZpbHRlcnMgZm9yIFByb3Rhbm9waWEsIERldXRlcmFub3BpYSwgYW5kIFRyaXRhbm9waWEsIHdpdGggYWRqdXN0YWJsZSBzdHJlbmd0aC4gQWRkaXRpb25hbGx5LCBmaWx0ZXJzIGZvciBkZXNhdHVyYXRpb24sIGNoYW5uZWwgbWl4LCBhbmQgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zIGFyZSBhdmFpbGFibGUuXG5cblByaW1hcnkgbW91c2UgYnV0dG9uIGNsaWNrIG9uIHRoZSBwYW5lbCBidXR0b24gdG9nZ2xlcyBhY3RpdmUgZmlsdGVyLCBzZWNvbmRhcnkgY2xpY2sgb3BlbnMgY29uZmlndXJhdGlvbiBtZW51LCBtaWRkbGUgY2xpY2sgdG9nZ2xlcyBoaWdoLWNvbnRyYXN0IGNvcnJlY3Rpb24gaWYgYXZhaWxhYmxlIGFuZCBzY3JvbGwgc3dpdGNoZXMgZmlsdGVycy5cblxuRGlzY3Vzc2lvbnMgYW5kIGJ1ZyByZXBvcnRzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3csIHBsZWFzZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiY29sb3JibGluZC1maWx0ZXJzIiwKICAibmFtZSI6ICJDb2xvcmJsaW5kIEZpbHRlcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29sb3JibGluZC1maWx0ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1jb2xvcmJsaW5kLWZpbHRlcnMiLAogICJ1dWlkIjogImNvbG9yYmxpbmQtZmlsdGVyc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"}
   }}
 , {"uuid": "focused-window-dbus@flexagoon.com", "name": "Focused Window D-Bus", "pname": "focused-window-d-bus", "description": "Exposes a D-Bus method to get active window title and class", "link": "https://extensions.gnome.org/extension/5592/focused-window-d-bus/", "shell_version_map": {
     "43": {"version": "3", "sha256": "01g2a82r7rmc9d5mavd8i2x63ridf1w8pm4s32wzq8k83jdq5khr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmxleGFnb29uL2ZvY3VzZWQtd2luZG93LWRidXMiLAogICJ1dWlkIjogImZvY3VzZWQtd2luZG93LWRidXNAZmxleGFnb29uLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
     "44": {"version": "3", "sha256": "01g2a82r7rmc9d5mavd8i2x63ridf1w8pm4s32wzq8k83jdq5khr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmxleGFnb29uL2ZvY3VzZWQtd2luZG93LWRidXMiLAogICJ1dWlkIjogImZvY3VzZWQtd2luZG93LWRidXNAZmxleGFnb29uLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
-    "45": {"version": "6", "sha256": "0ha0d6iyy11y7qx2xb71dv4p927hx65jzp01w48sfbvfjf3rk3s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmxleGFnb29uL2ZvY3VzZWQtd2luZG93LWRidXMiLAogICJ1dWlkIjogImZvY3VzZWQtd2luZG93LWRidXNAZmxleGFnb29uLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="},
-    "46": {"version": "6", "sha256": "0ha0d6iyy11y7qx2xb71dv4p927hx65jzp01w48sfbvfjf3rk3s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmxleGFnb29uL2ZvY3VzZWQtd2luZG93LWRidXMiLAogICJ1dWlkIjogImZvY3VzZWQtd2luZG93LWRidXNAZmxleGFnb29uLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}
+    "45": {"version": "7", "sha256": "1ibsln5hqcpz94rf7fy4zy00wcg13zk6g80gjhrbipx5b0iiazi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZsZXhhZ29vbi9mb2N1c2VkLXdpbmRvdy1kYnVzIiwKICAidXVpZCI6ICJmb2N1c2VkLXdpbmRvdy1kYnVzQGZsZXhhZ29vbi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
+    "46": {"version": "7", "sha256": "1ibsln5hqcpz94rf7fy4zy00wcg13zk6g80gjhrbipx5b0iiazi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZsZXhhZ29vbi9mb2N1c2VkLXdpbmRvdy1kYnVzIiwKICAidXVpZCI6ICJmb2N1c2VkLXdpbmRvdy1kYnVzQGZsZXhhZ29vbi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
+    "47": {"version": "7", "sha256": "1ibsln5hqcpz94rf7fy4zy00wcg13zk6g80gjhrbipx5b0iiazi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZsZXhhZ29vbi9mb2N1c2VkLXdpbmRvdy1kYnVzIiwKICAidXVpZCI6ICJmb2N1c2VkLXdpbmRvdy1kYnVzQGZsZXhhZ29vbi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
   }}
 , {"uuid": "multimonitorswap@dvrlabs.tv", "name": "Multi Monitor Swap ", "pname": "multi-monitor-swap", "description": "Swap windows between monitors.", "link": "https://extensions.gnome.org/extension/5597/multi-monitor-swap/", "shell_version_map": {
     "40": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"},
@@ -5819,12 +6106,15 @@
     "42": {"version": "7", "sha256": "1ady0smyx0dby7wsfnycvmgpybg165mrjnndccrvg60332q2airi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGFzIHJlcG9ydGVkIGJ5IHVwb3dlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBpbmRpY2F0b3IgKHVwb3dlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWxrby9iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yQGpnb3R0aS5vcmciLAogICJ2ZXJzaW9uIjogNwp9"},
     "43": {"version": "7", "sha256": "1ady0smyx0dby7wsfnycvmgpybg165mrjnndccrvg60332q2airi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGFzIHJlcG9ydGVkIGJ5IHVwb3dlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBpbmRpY2F0b3IgKHVwb3dlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWxrby9iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yQGpnb3R0aS5vcmciLAogICJ2ZXJzaW9uIjogNwp9"}
   }}
-, {"uuid": "visualizer@sound.org", "name": "Sound Visualizer", "pname": "sound-visualizer", "description": "A Real Time Sound Visualizer Based On Gstreamer\nFor any Issues,Bugs and Suggestions please open an issue on Github", "link": "https://extensions.gnome.org/extension/5624/sound-visualizer/", "shell_version_map": {
+, {"uuid": "visualizer@sound.org", "name": "Sound Visualizer", "pname": "sound-visualizer", "description": "A Real Time Sound Visualizer Based On Gstreamer", "link": "https://extensions.gnome.org/extension/5624/sound-visualizer/", "shell_version_map": {
     "38": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "40": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "41": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "42": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "43": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "43": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "45": {"version": "8", "sha256": "1inmzyka6wcphxaj5nf49g0x1c48qm3g0v38vvsa5qv1xlvlys1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJyYWloYW4xOTk5diIKICB9LAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3JhaWhhbjIwMDAvdmlzdWFsaXplciIsCiAgInV1aWQiOiAidmlzdWFsaXplckBzb3VuZC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "1inmzyka6wcphxaj5nf49g0x1c48qm3g0v38vvsa5qv1xlvlys1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJyYWloYW4xOTk5diIKICB9LAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3JhaWhhbjIwMDAvdmlzdWFsaXplciIsCiAgInV1aWQiOiAidmlzdWFsaXplckBzb3VuZC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "1inmzyka6wcphxaj5nf49g0x1c48qm3g0v38vvsa5qv1xlvlys1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJyYWloYW4xOTk5diIKICB9LAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3JhaWhhbjIwMDAvdmlzdWFsaXplciIsCiAgInV1aWQiOiAidmlzdWFsaXplckBzb3VuZC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "device-power-indicator@ranger-ross.github.io", "name": "Device Power Indicator", "pname": "device-power-indicator", "description": "Shows device power percentage for keyboards and mice", "link": "https://extensions.gnome.org/extension/5627/device-power-indicator/", "shell_version_map": {
     "41": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -5852,8 +6142,9 @@
     "42": {"version": "5", "sha256": "1c8brmjzcgwqqz7zgim8v3dvxq7r34wwvrz1v9il59c4vsyxsn36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbWVwYXVsby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2VhdGhlci1vci1ub3QiLAogICJ1dWlkIjogIndlYXRoZXJvcm5vdEBzb21lcGF1bG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="},
     "43": {"version": "5", "sha256": "1c8brmjzcgwqqz7zgim8v3dvxq7r34wwvrz1v9il59c4vsyxsn36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbWVwYXVsby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2VhdGhlci1vci1ub3QiLAogICJ1dWlkIjogIndlYXRoZXJvcm5vdEBzb21lcGF1bG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="},
     "44": {"version": "5", "sha256": "1c8brmjzcgwqqz7zgim8v3dvxq7r34wwvrz1v9il59c4vsyxsn36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbWVwYXVsby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2VhdGhlci1vci1ub3QiLAogICJ1dWlkIjogIndlYXRoZXJvcm5vdEBzb21lcGF1bG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "45": {"version": "14", "sha256": "19f0j3hiavwq87qvm6c4cryj8h3zqs9wx2sqn0jhlyb2jh2zz0rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbiB0aGUgcGFuZWwgYW5kIGNsaWNrIHRoZSBpbmRpY2F0b3IgdG8gb3BlbiBHTk9NRSBXZWF0aGVyLiBUaGUgaW5kaWNhdG9yIHBvc2l0aW9uIGNhbiBiZSBhZGp1c3RlZCBpbiBwcmVmZXJlbmNlcyAob24gR05PTUUgNDUrKS5cblxuWW91IG5lZWQgR05PTUUgV2VhdGhlciBpbnN0YWxsZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5IGFuZCBhbiBhY3RpdmUgaW50ZXJuZXQgY29ubmVjdGlvbiB0byByZXRyaWV2ZSBhbmQgZGlzcGxheSB3ZWF0aGVyIGluZm9ybWF0aW9uLlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyb3Jub3RAc29tZXBhdWxvLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiV2VhdGhlciBvciBOb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic29tZXBhdWxvQGR1Y2suY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXJvcm5vdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQsCiAgInZlcnNpb24tbmFtZSI6ICI0NiIKfQ=="},
-    "46": {"version": "14", "sha256": "19f0j3hiavwq87qvm6c4cryj8h3zqs9wx2sqn0jhlyb2jh2zz0rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbiB0aGUgcGFuZWwgYW5kIGNsaWNrIHRoZSBpbmRpY2F0b3IgdG8gb3BlbiBHTk9NRSBXZWF0aGVyLiBUaGUgaW5kaWNhdG9yIHBvc2l0aW9uIGNhbiBiZSBhZGp1c3RlZCBpbiBwcmVmZXJlbmNlcyAob24gR05PTUUgNDUrKS5cblxuWW91IG5lZWQgR05PTUUgV2VhdGhlciBpbnN0YWxsZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5IGFuZCBhbiBhY3RpdmUgaW50ZXJuZXQgY29ubmVjdGlvbiB0byByZXRyaWV2ZSBhbmQgZGlzcGxheSB3ZWF0aGVyIGluZm9ybWF0aW9uLlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyb3Jub3RAc29tZXBhdWxvLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiV2VhdGhlciBvciBOb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic29tZXBhdWxvQGR1Y2suY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXJvcm5vdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQsCiAgInZlcnNpb24tbmFtZSI6ICI0NiIKfQ=="}
+    "45": {"version": "16", "sha256": "1118cis04v48qc503zadigg1sfyr6g4jldvmnzzslh6cgyba1wa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbiB0aGUgcGFuZWwgYW5kIGNsaWNrIHRoZSBpbmRpY2F0b3IgdG8gb3BlbiBHTk9NRSBXZWF0aGVyLiBUaGUgaW5kaWNhdG9yIHBvc2l0aW9uIGNhbiBiZSBhZGp1c3RlZCBpbiBwcmVmZXJlbmNlcyAob24gR05PTUUgNDUrKS5cblxuWW91IG5lZWQgR05PTUUgV2VhdGhlciBpbnN0YWxsZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5IGFuZCBhbiBhY3RpdmUgaW50ZXJuZXQgY29ubmVjdGlvbiB0byByZXRyaWV2ZSBhbmQgZGlzcGxheSB3ZWF0aGVyIGluZm9ybWF0aW9uLlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyb3Jub3RAc29tZXBhdWxvLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiV2VhdGhlciBvciBOb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic29tZXBhdWxvQGR1Y2suY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXJvcm5vdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbWVwYXVsby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2VhdGhlci1vci1ub3QiLAogICJ1dWlkIjogIndlYXRoZXJvcm5vdEBzb21lcGF1bG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMSIKfQ=="},
+    "46": {"version": "16", "sha256": "1118cis04v48qc503zadigg1sfyr6g4jldvmnzzslh6cgyba1wa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbiB0aGUgcGFuZWwgYW5kIGNsaWNrIHRoZSBpbmRpY2F0b3IgdG8gb3BlbiBHTk9NRSBXZWF0aGVyLiBUaGUgaW5kaWNhdG9yIHBvc2l0aW9uIGNhbiBiZSBhZGp1c3RlZCBpbiBwcmVmZXJlbmNlcyAob24gR05PTUUgNDUrKS5cblxuWW91IG5lZWQgR05PTUUgV2VhdGhlciBpbnN0YWxsZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5IGFuZCBhbiBhY3RpdmUgaW50ZXJuZXQgY29ubmVjdGlvbiB0byByZXRyaWV2ZSBhbmQgZGlzcGxheSB3ZWF0aGVyIGluZm9ybWF0aW9uLlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyb3Jub3RAc29tZXBhdWxvLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiV2VhdGhlciBvciBOb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic29tZXBhdWxvQGR1Y2suY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXJvcm5vdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbWVwYXVsby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2VhdGhlci1vci1ub3QiLAogICJ1dWlkIjogIndlYXRoZXJvcm5vdEBzb21lcGF1bG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMSIKfQ=="},
+    "47": {"version": "16", "sha256": "1118cis04v48qc503zadigg1sfyr6g4jldvmnzzslh6cgyba1wa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbiB0aGUgcGFuZWwgYW5kIGNsaWNrIHRoZSBpbmRpY2F0b3IgdG8gb3BlbiBHTk9NRSBXZWF0aGVyLiBUaGUgaW5kaWNhdG9yIHBvc2l0aW9uIGNhbiBiZSBhZGp1c3RlZCBpbiBwcmVmZXJlbmNlcyAob24gR05PTUUgNDUrKS5cblxuWW91IG5lZWQgR05PTUUgV2VhdGhlciBpbnN0YWxsZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5IGFuZCBhbiBhY3RpdmUgaW50ZXJuZXQgY29ubmVjdGlvbiB0byByZXRyaWV2ZSBhbmQgZGlzcGxheSB3ZWF0aGVyIGluZm9ybWF0aW9uLlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyb3Jub3RAc29tZXBhdWxvLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiV2VhdGhlciBvciBOb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic29tZXBhdWxvQGR1Y2suY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXJvcm5vdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbWVwYXVsby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2VhdGhlci1vci1ub3QiLAogICJ1dWlkIjogIndlYXRoZXJvcm5vdEBzb21lcGF1bG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMSIKfQ=="}
   }}
 , {"uuid": "cscotun0-ip-address@cjthedj97.github.com", "name": "cscotun0 IP Address", "pname": "cscotun0-ip-address", "description": "Show cscotun0 IP address on GNOME panel. Do not show loopback addresses (127.0.0.0/8) or other network interface IP addresses. Please install moreutils package as a dependency. Forked from https://github.com/AdamantisSpinae/gnome-extension-tun0-ip-address and modified tunnel interface it looks at.", "link": "https://extensions.gnome.org/extension/5663/cscotun0-ip-address/", "shell_version_map": {
     "40": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="},
@@ -5868,7 +6159,8 @@
     "43": {"version": "3", "sha256": "06641gq1ci4mmnsnrps1bb3372hhq6bhg4sjh31pcpdlla17dg01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21ldGVoYW4tYXJzbGFuL2dub21lLWNvbXBhY3QtdG9wLWJhciIsCiAgInV1aWQiOiAiZ25vbWUtY29tcGFjdC10b3AtYmFyQG1ldGVoYW4tYXJzbGFuLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="},
     "44": {"version": "3", "sha256": "06641gq1ci4mmnsnrps1bb3372hhq6bhg4sjh31pcpdlla17dg01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21ldGVoYW4tYXJzbGFuL2dub21lLWNvbXBhY3QtdG9wLWJhciIsCiAgInV1aWQiOiAiZ25vbWUtY29tcGFjdC10b3AtYmFyQG1ldGVoYW4tYXJzbGFuLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="},
     "45": {"version": "6", "sha256": "1hzr99sagcpyaawwwy1rsjn7qywrxl3a6w4vjr5vdqpdvrv0plkc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "7", "sha256": "0k6i6al2nbm9zv2sbmggamkg7lkalpjd76wskzfq8gyx6ah08xnq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "46": {"version": "10", "sha256": "0s3agbzgajbcjjrvs625cppqba7v19fqqs0w3ab86gb2byg2idmq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJwcmVmZXJlbmNlcyI6ICJwcmVmcy5qcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYWN0LXRvcC1iYXIiLAogICJzZXR0aW5ncy1zY2hlbWEtcGF0aCI6ICJzY2hlbWFzLyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "47": {"version": "10", "sha256": "0s3agbzgajbcjjrvs625cppqba7v19fqqs0w3ab86gb2byg2idmq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJwcmVmZXJlbmNlcyI6ICJwcmVmcy5qcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYWN0LXRvcC1iYXIiLAogICJzZXR0aW5ncy1zY2hlbWEtcGF0aCI6ICJzY2hlbWFzLyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}
   }}
 , {"uuid": "persistent-notifications@AlexeyReshetnyak", "name": "Persistent Notifications", "pname": "persistent-notifications", "description": "Never hide a new notification, except if you close it.", "link": "https://extensions.gnome.org/extension/5672/persistent-notifications/", "shell_version_map": {
     "40": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="},
@@ -5881,15 +6173,17 @@
 , {"uuid": "gnome-one-window-wonderland@jqno.nl", "name": "One Window Wonderland", "pname": "one-window-wonderland", "description": "Automatically maximizes new windows, leaving 'useless gaps' around them.\n\nFeatures:\n- Sizes and positions a new window so that it takes the full workspace, except for the gaps around it.\n- Sizes and positions a window that moves to another monitor so that it takes the full workspace, except for the gaps around it.\n- The size of the gaps is configurable.\n- You can define a list of apps that should be left alone by this extension (the 'ignore list').\n- You can define a list of apps that should forcibly be kept in place (the 'force list').\n\nNote that One Window Wonderland leaves windows alone after they've been created or moved to another monitor. You are free to resize them as you see fit, or add them to the force list to keep them in place.", "link": "https://extensions.gnome.org/extension/5696/one-window-wonderland/", "shell_version_map": {
     "43": {"version": "9", "sha256": "1azrpcg9wsf3l1rw5hxh2bj1w7xrslfrm1592kc4v27rflynvfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "9", "sha256": "1azrpcg9wsf3l1rw5hxh2bj1w7xrslfrm1592kc4v27rflynvfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"},
-    "45": {"version": "12", "sha256": "13ms5vccxf7aav8181xhlg03g6hkk45y65raxg841h35s04kmja2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "46": {"version": "12", "sha256": "13ms5vccxf7aav8181xhlg03g6hkk45y65raxg841h35s04kmja2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
+    "45": {"version": "13", "sha256": "1rqm2wrh3ax9j2p9795yy5fabd1y9i8jr48qvp7rq9lc14545008", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qcW5vL2dub21lLW9uZS13aW5kb3ctd29uZGVybGFuZC8iLAogICJ1dWlkIjogImdub21lLW9uZS13aW5kb3ctd29uZGVybGFuZEBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "46": {"version": "13", "sha256": "1rqm2wrh3ax9j2p9795yy5fabd1y9i8jr48qvp7rq9lc14545008", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qcW5vL2dub21lLW9uZS13aW5kb3ctd29uZGVybGFuZC8iLAogICJ1dWlkIjogImdub21lLW9uZS13aW5kb3ctd29uZGVybGFuZEBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "1rqm2wrh3ax9j2p9795yy5fabd1y9i8jr48qvp7rq9lc14545008", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qcW5vL2dub21lLW9uZS13aW5kb3ctd29uZGVybGFuZC8iLAogICJ1dWlkIjogImdub21lLW9uZS13aW5kb3ctd29uZGVybGFuZEBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "otp-keys@osmank3.net", "name": "OTP keys", "pname": "otp-keys", "description": "Show and copy otp keys", "link": "https://extensions.gnome.org/extension/5697/otp-keys/", "shell_version_map": {
-    "42": {"version": "21", "sha256": "1a94fmqg8rgrz0fz7m3millh9hgfa3vbw22ivffa31ifssr52a13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"},
-    "43": {"version": "21", "sha256": "1a94fmqg8rgrz0fz7m3millh9hgfa3vbw22ivffa31ifssr52a13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"},
-    "44": {"version": "21", "sha256": "1a94fmqg8rgrz0fz7m3millh9hgfa3vbw22ivffa31ifssr52a13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"},
-    "45": {"version": "23", "sha256": "07walzz7pqk8c5zh88qflq01wxvgr19bc3941x0b3mmgajgjxff1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29zbWFuazMvb3RwLWtleXMiLAogICJ1dWlkIjogIm90cC1rZXlzQG9zbWFuazMubmV0IiwKICAidmVyc2lvbiI6IDIzCn0="},
-    "46": {"version": "23", "sha256": "07walzz7pqk8c5zh88qflq01wxvgr19bc3941x0b3mmgajgjxff1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29zbWFuazMvb3RwLWtleXMiLAogICJ1dWlkIjogIm90cC1rZXlzQG9zbWFuazMubmV0IiwKICAidmVyc2lvbiI6IDIzCn0="}
+    "42": {"version": "24", "sha256": "078l15d8vwsyx16mcs5xzcnvhagpyknxpm3lrd9r8wh1afzdiscz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"},
+    "43": {"version": "24", "sha256": "078l15d8vwsyx16mcs5xzcnvhagpyknxpm3lrd9r8wh1afzdiscz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"},
+    "44": {"version": "24", "sha256": "078l15d8vwsyx16mcs5xzcnvhagpyknxpm3lrd9r8wh1afzdiscz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"},
+    "45": {"version": "25", "sha256": "0ssp0p8nd10ywsh82655j0c4y1mfv4jan174kmh1sf8p97xv7l4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "46": {"version": "25", "sha256": "0ssp0p8nd10ywsh82655j0c4y1mfv4jan174kmh1sf8p97xv7l4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "0ssp0p8nd10ywsh82655j0c4y1mfv4jan174kmh1sf8p97xv7l4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "pin-app-folders-to-dash@fcusr.github.com", "name": "Pin App Folders to Dash", "pname": "pin-app-folders-to-dash", "description": "Allow to pin app folders to dash.", "link": "https://extensions.gnome.org/extension/5709/pin-app-folders-to-dash/", "shell_version_map": {
     "43": {"version": "2", "sha256": "0wpcgr5mmh5h412an9l91xg2y0p679aa2civc3zygkvvw38zpm77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
@@ -5911,8 +6205,9 @@
 , {"uuid": "battery-indicator-icon@Deminder", "name": "Battery Indicator Icon", "pname": "battery-indicator-icon", "description": "Replace the battery indicator icon with a circle or portrait.", "link": "https://extensions.gnome.org/extension/5718/battery-indicator-icon/", "shell_version_map": {
     "43": {"version": "8", "sha256": "18nqax5gs2nrkjgndj7ikvl6hhxbpxgv355krzz36dsmw2mvzqa4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAidXVpZCI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uQERlbWluZGVyIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "44": {"version": "8", "sha256": "18nqax5gs2nrkjgndj7ikvl6hhxbpxgv355krzz36dsmw2mvzqa4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAidXVpZCI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uQERlbWluZGVyIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "45": {"version": "14", "sha256": "1fqdxvddahmgpb6am4i4gmizbxjwgvb8m2r7fiicb8q90fzr17dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAidXVpZCI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uQERlbWluZGVyIiwKICAidmVyc2lvbiI6IDE0Cn0="},
-    "46": {"version": "14", "sha256": "1fqdxvddahmgpb6am4i4gmizbxjwgvb8m2r7fiicb8q90fzr17dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAidXVpZCI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uQERlbWluZGVyIiwKICAidmVyc2lvbiI6IDE0Cn0="}
+    "45": {"version": "15", "sha256": "1bzibc4mh811aj7977s2lmhdk1r6ycj29d1kq0j62ps8640qxrln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvYmF0dGVyeS1pbmRpY2F0b3ItaWNvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3ItaWNvbkBEZW1pbmRlciIsCiAgInZlcnNpb24iOiAxNQp9"},
+    "46": {"version": "15", "sha256": "1bzibc4mh811aj7977s2lmhdk1r6ycj29d1kq0j62ps8640qxrln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvYmF0dGVyeS1pbmRpY2F0b3ItaWNvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3ItaWNvbkBEZW1pbmRlciIsCiAgInZlcnNpb24iOiAxNQp9"},
+    "47": {"version": "15", "sha256": "1bzibc4mh811aj7977s2lmhdk1r6ycj29d1kq0j62ps8640qxrln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvYmF0dGVyeS1pbmRpY2F0b3ItaWNvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3ItaWNvbkBEZW1pbmRlciIsCiAgInZlcnNpb24iOiAxNQp9"}
   }}
 , {"uuid": "clipboard-indicator@Dieg0Js.github.io", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "A minimal clipboard indicator for the gnome shell. Fork of Clipman by popov895.", "link": "https://extensions.gnome.org/extension/5721/clipboard-indicator/", "shell_version_map": {
     "40": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -5922,11 +6217,12 @@
     "44": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "Battery-Health-Charging@maniacx.github.com", "name": "Battery Health Charging", "pname": "battery-health-charging", "description": "Set battery charging threshold / charging limit / charging mode\nBattery Health Charging: An extension to maximize the battery life of laptops by setting their charging threshold or modes.\n\nCompatible with\n- Asus\n- LG\n- Samsung\n- Sony/Vaio\n- Huawei\n- Toshiba/Dynabook\n- System76\n- Lenovo (Ideapad, Legion)\n- Thinkpad\n- Panasonic\n- Fujitsu\n- Acer (dependencies: kernel module)\n- MSI (dependencies: kernel module)\n- Tuxedo (dependencies: kernel module)\n- Slimbook (dependencies: kernel module)\n- Tuxedo IntelQC71 (dependencies: kernel module)\n- XMG IntelQC71 (dependencies: kernel module)\n- Eluktronics IntelQC71 (dependencies: kernel module)\n- Purism Librem (dependencies: kernel module)\n- Gigabyte Aero/Aorus (dependencies: kernel module)\n- Dell (dependencies: custom package libsmbios)\n- Dell (dependencies: custom package Dell Command Center)\n- Apple Macbook Intel-series chip (dependencies: kernel module)\n- Apple Macbook M-series chip (dependencies: custom kernel)\n- Razer (dependencies: custom package razer-cli)\n- Framework (dependencies: kernel module)\n\nNot all models are comaptible. Please read about the compatibility and dependencies of your device on github link below.\n\nhttps://maniacx.github.io/Battery-Health-Charging/", "link": "https://extensions.gnome.org/extension/5724/battery-health-charging/", "shell_version_map": {
-    "42": {"version": "62", "sha256": "1ir740fdqddn2nfi848wvqc0hwm2fh7x578dnwdr2ymz5mblivjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="},
-    "43": {"version": "62", "sha256": "1ir740fdqddn2nfi848wvqc0hwm2fh7x578dnwdr2ymz5mblivjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="},
-    "44": {"version": "62", "sha256": "1ir740fdqddn2nfi848wvqc0hwm2fh7x578dnwdr2ymz5mblivjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="},
-    "45": {"version": "63", "sha256": "1a0fqjxzvq3plsqmygl0hmp37filajdbpwfhy85zf9awdxyb9pix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Mwp9"},
-    "46": {"version": "63", "sha256": "1a0fqjxzvq3plsqmygl0hmp37filajdbpwfhy85zf9awdxyb9pix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Mwp9"}
+    "42": {"version": "64", "sha256": "0pgigi74h2i1snnamyblgj348b95rvqwk8s4r9a0dil7dvm4ya0i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjQKfQ=="},
+    "43": {"version": "64", "sha256": "0pgigi74h2i1snnamyblgj348b95rvqwk8s4r9a0dil7dvm4ya0i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjQKfQ=="},
+    "44": {"version": "64", "sha256": "0pgigi74h2i1snnamyblgj348b95rvqwk8s4r9a0dil7dvm4ya0i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjQKfQ=="},
+    "45": {"version": "65", "sha256": "00xwlrijh2wmg1kj7x9my9xgzs836gg197c9vcjh47p5j1bxazv4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="},
+    "46": {"version": "65", "sha256": "00xwlrijh2wmg1kj7x9my9xgzs836gg197c9vcjh47p5j1bxazv4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="},
+    "47": {"version": "65", "sha256": "00xwlrijh2wmg1kj7x9my9xgzs836gg197c9vcjh47p5j1bxazv4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueS9WYWlvXG4tIEh1YXdlaVxuLSBUb3NoaWJhL0R5bmFib29rXG4tIFN5c3RlbTc2XG4tIExlbm92byAoSWRlYXBhZCwgTGVnaW9uKVxuLSBUaGlua3BhZFxuLSBQYW5hc29uaWNcbi0gRnVqaXRzdVxuLSBBY2VyIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIE1TSSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gU2xpbWJvb2sgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEVsdWt0cm9uaWNzIEludGVsUUM3MSAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcilcbi0gQXBwbGUgTWFjYm9vayBJbnRlbC1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBBcHBsZSBNYWNib29rIE0tc2VyaWVzIGNoaXAgKGRlcGVuZGVuY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVuY2llczogY3VzdG9tIHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcblxuTm90IGFsbCBtb2RlbHMgYXJlIGNvbWFwdGlibGUuIFBsZWFzZSByZWFkIGFib3V0IHRoZSBjb21wYXRpYmlsaXR5IGFuZCBkZXBlbmRlbmNpZXMgb2YgeW91ciBkZXZpY2Ugb24gZ2l0aHViIGxpbmsgYmVsb3cuXG5cbmh0dHBzOi8vbWFuaWFjeC5naXRodWIuaW8vQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmcvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}
   }}
 , {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click the power menu button to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": {
     "43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}
@@ -5980,7 +6276,8 @@
     "42": {"version": "3", "sha256": "1m1lhgyf70vidzrrcn3nyiis6dd3gb3hr6n578hbqr81kzc1hvmq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2giLAogICJ1dWlkIjogImhhc3NsZWxlc3Mtb3ZlcnZpZXctc2VhcmNoQG1lY2h0aWZzIiwKICAidmVyc2lvbiI6IDMKfQ=="},
     "43": {"version": "3", "sha256": "1m1lhgyf70vidzrrcn3nyiis6dd3gb3hr6n578hbqr81kzc1hvmq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2giLAogICJ1dWlkIjogImhhc3NsZWxlc3Mtb3ZlcnZpZXctc2VhcmNoQG1lY2h0aWZzIiwKICAidmVyc2lvbiI6IDMKfQ=="},
     "44": {"version": "3", "sha256": "1m1lhgyf70vidzrrcn3nyiis6dd3gb3hr6n578hbqr81kzc1hvmq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2giLAogICJ1dWlkIjogImhhc3NsZWxlc3Mtb3ZlcnZpZXctc2VhcmNoQG1lY2h0aWZzIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "45": {"version": "4", "sha256": "02jg64bfr2cfk5lx3zih99wrcl1ncsmaslhl4srq68zq4hrrfsi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL2hhc3NsZWxlc3Mtb3ZlcnZpZXctc2VhcmNoIiwKICAidXVpZCI6ICJoYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaEBtZWNodGlmcyIsCiAgInZlcnNpb24iOiA0Cn0="}
+    "45": {"version": "5", "sha256": "1wklkdsnz6730sscb7d9rhyj58dbfbv3zj8444q62z6zbnhkdmdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy9oYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaCIsCiAgInV1aWQiOiAiaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2hAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "1wklkdsnz6730sscb7d9rhyj58dbfbv3zj8444q62z6zbnhkdmdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy9oYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaCIsCiAgInV1aWQiOiAiaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2hAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "livecaptions@sapples.net", "name": "Live Captions Assistant", "pname": "live-captions-assistant", "description": "Provides better desktop integration for Live Captions", "link": "https://extensions.gnome.org/extension/5775/live-captions-assistant/", "shell_version_map": {
     "40": {"version": "2", "sha256": "09qd9997jdwwbi6c5jis8949k9y6s49z4yk7gqi5v7r7k3171m6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWJiMTI4L2dub21lLWxpdmUtY2FwdGlvbnMtYXNzaXN0YW50IiwKICAidXVpZCI6ICJsaXZlY2FwdGlvbnNAc2FwcGxlcy5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -5988,8 +6285,9 @@
     "42": {"version": "2", "sha256": "09qd9997jdwwbi6c5jis8949k9y6s49z4yk7gqi5v7r7k3171m6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWJiMTI4L2dub21lLWxpdmUtY2FwdGlvbnMtYXNzaXN0YW50IiwKICAidXVpZCI6ICJsaXZlY2FwdGlvbnNAc2FwcGxlcy5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"},
     "43": {"version": "2", "sha256": "09qd9997jdwwbi6c5jis8949k9y6s49z4yk7gqi5v7r7k3171m6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWJiMTI4L2dub21lLWxpdmUtY2FwdGlvbnMtYXNzaXN0YW50IiwKICAidXVpZCI6ICJsaXZlY2FwdGlvbnNAc2FwcGxlcy5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"},
     "44": {"version": "2", "sha256": "09qd9997jdwwbi6c5jis8949k9y6s49z4yk7gqi5v7r7k3171m6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWJiMTI4L2dub21lLWxpdmUtY2FwdGlvbnMtYXNzaXN0YW50IiwKICAidXVpZCI6ICJsaXZlY2FwdGlvbnNAc2FwcGxlcy5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"},
-    "45": {"version": "4", "sha256": "1cgdsqd79ssm1q8wajbfrylbx64vqzfdkjnvv1kmz86k9zcnzwni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWJiMTI4L2dub21lLWxpdmUtY2FwdGlvbnMtYXNzaXN0YW50IiwKICAidXVpZCI6ICJsaXZlY2FwdGlvbnNAc2FwcGxlcy5uZXQiLAogICJ2ZXJzaW9uIjogNAp9"},
-    "46": {"version": "4", "sha256": "1cgdsqd79ssm1q8wajbfrylbx64vqzfdkjnvv1kmz86k9zcnzwni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWJiMTI4L2dub21lLWxpdmUtY2FwdGlvbnMtYXNzaXN0YW50IiwKICAidXVpZCI6ICJsaXZlY2FwdGlvbnNAc2FwcGxlcy5uZXQiLAogICJ2ZXJzaW9uIjogNAp9"}
+    "45": {"version": "5", "sha256": "0vsff88hq5z1brxq9k6s1jzbcsjpna6lszmfzhld8fji872iq0j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FiYjEyOC9nbm9tZS1saXZlLWNhcHRpb25zLWFzc2lzdGFudCIsCiAgInV1aWQiOiAibGl2ZWNhcHRpb25zQHNhcHBsZXMubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="},
+    "46": {"version": "5", "sha256": "0vsff88hq5z1brxq9k6s1jzbcsjpna6lszmfzhld8fji872iq0j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FiYjEyOC9nbm9tZS1saXZlLWNhcHRpb25zLWFzc2lzdGFudCIsCiAgInV1aWQiOiAibGl2ZWNhcHRpb25zQHNhcHBsZXMubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="},
+    "47": {"version": "5", "sha256": "0vsff88hq5z1brxq9k6s1jzbcsjpna6lszmfzhld8fji872iq0j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FiYjEyOC9nbm9tZS1saXZlLWNhcHRpb25zLWFzc2lzdGFudCIsCiAgInV1aWQiOiAibGl2ZWNhcHRpb25zQHNhcHBsZXMubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}
   }}
 , {"uuid": "extension-poweroff-button@InkaAlicja", "name": "Poweroff and Suspend Buttons", "pname": "poweroff-and-suspend-buttons", "description": "Poweroff and suspend buttons for GNOME desktop environment", "link": "https://extensions.gnome.org/extension/5787/poweroff-and-suspend-buttons/", "shell_version_map": {
     "42": {"version": "2", "sha256": "039wpmsrzk75pc62fw2hfgjy5dv85f54fa2w76hxacc08qkqq4y1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvd2Vyb2ZmIGFuZCBzdXNwZW5kIGJ1dHRvbnMgZm9yIEdOT01FIGRlc2t0b3AgZW52aXJvbm1lbnQiLAogICJuYW1lIjogIlBvd2Vyb2ZmIGFuZCBTdXNwZW5kIEJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSW5rYUFsaWNqYS9nbm9tZS1leHRlbnNpb24tcG93ZXItYnV0dG9ucyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLXBvd2Vyb2ZmLWJ1dHRvbkBJbmthQWxpY2phIiwKICAidmVyc2lvbiI6IDIKfQ=="}
@@ -5997,14 +6295,15 @@
 , {"uuid": "smart-resize@garretpatti.github.com", "name": "Smart Resize", "pname": "smart-resize", "description": "Auto resize a window that is too large for your current screen", "link": "https://extensions.gnome.org/extension/5790/smart-resize/", "shell_version_map": {
     "43": {"version": "1", "sha256": "1n4bhfcz2m976xfdr2waw5l3m7p0cq8sxxmlc0bcklsqz0cnbx83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gcmVzaXplIGEgd2luZG93IHRoYXQgaXMgdG9vIGxhcmdlIGZvciB5b3VyIGN1cnJlbnQgc2NyZWVuIiwKICAibmFtZSI6ICJTbWFydCBSZXNpemUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FycmV0cGF0dGkvc21hcnQtcmVzaXplIiwKICAidXVpZCI6ICJzbWFydC1yZXNpemVAZ2FycmV0cGF0dGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}
   }}
-, {"uuid": "stopwatch@aliakseiz.github.com", "name": "Stopwatch", "pname": "stopwatch", "description": "Simple extension to measure time. Primary button click starts/pauses the watch, secondary button resets it.", "link": "https://extensions.gnome.org/extension/5796/stopwatch/", "shell_version_map": {
+, {"uuid": "stopwatch@aliakseiz.github.com", "name": "Stopwatch. Gnome 40-47", "pname": "stopwatch", "description": "Simple extension to measure time. Primary button click starts/pauses the watch, secondary button resets it. Automatically pauses/resumes on screen locking.", "link": "https://extensions.gnome.org/extension/5796/stopwatch/", "shell_version_map": {
     "40": {"version": "4", "sha256": "0p6n5rmvd4iibzqrak1azq60yf708i1dh4db0r3a5br22gzkvbaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuXG5BdXRvbWF0aWNhbGx5IHBhdXNlcyB3aGVuIHRoZSBzY3JlZW4gaXMgbG9ja2VkLiIsCiAgIm5hbWUiOiAiU3RvcHdhdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
     "41": {"version": "4", "sha256": "0p6n5rmvd4iibzqrak1azq60yf708i1dh4db0r3a5br22gzkvbaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuXG5BdXRvbWF0aWNhbGx5IHBhdXNlcyB3aGVuIHRoZSBzY3JlZW4gaXMgbG9ja2VkLiIsCiAgIm5hbWUiOiAiU3RvcHdhdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
     "42": {"version": "4", "sha256": "0p6n5rmvd4iibzqrak1azq60yf708i1dh4db0r3a5br22gzkvbaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuXG5BdXRvbWF0aWNhbGx5IHBhdXNlcyB3aGVuIHRoZSBzY3JlZW4gaXMgbG9ja2VkLiIsCiAgIm5hbWUiOiAiU3RvcHdhdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
     "43": {"version": "4", "sha256": "0p6n5rmvd4iibzqrak1azq60yf708i1dh4db0r3a5br22gzkvbaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuXG5BdXRvbWF0aWNhbGx5IHBhdXNlcyB3aGVuIHRoZSBzY3JlZW4gaXMgbG9ja2VkLiIsCiAgIm5hbWUiOiAiU3RvcHdhdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
     "44": {"version": "4", "sha256": "0p6n5rmvd4iibzqrak1azq60yf708i1dh4db0r3a5br22gzkvbaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuXG5BdXRvbWF0aWNhbGx5IHBhdXNlcyB3aGVuIHRoZSBzY3JlZW4gaXMgbG9ja2VkLiIsCiAgIm5hbWUiOiAiU3RvcHdhdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "9", "sha256": "1fv38k6rh6xvhdrydaif9pybnxidgjhakvwdnxgdsyg5jiwb0f7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaWFrc2Vpei9zdG9wd2F0Y2giLAogICJ1dWlkIjogInN0b3B3YXRjaEBhbGlha3NlaXouZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "46": {"version": "9", "sha256": "1fv38k6rh6xvhdrydaif9pybnxidgjhakvwdnxgdsyg5jiwb0f7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaWFrc2Vpei9zdG9wd2F0Y2giLAogICJ1dWlkIjogInN0b3B3YXRjaEBhbGlha3NlaXouZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}
+    "45": {"version": "12", "sha256": "1jn3akw783w9gmb943j9pp3p1c1811sgzwg3mzxk9kzw1zf0dsi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIEF1dG9tYXRpY2FsbHkgcGF1c2VzL3Jlc3VtZXMgb24gc2NyZWVuIGxvY2tpbmcuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "46": {"version": "12", "sha256": "1jn3akw783w9gmb943j9pp3p1c1811sgzwg3mzxk9kzw1zf0dsi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIEF1dG9tYXRpY2FsbHkgcGF1c2VzL3Jlc3VtZXMgb24gc2NyZWVuIGxvY2tpbmcuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "47": {"version": "12", "sha256": "1jn3akw783w9gmb943j9pp3p1c1811sgzwg3mzxk9kzw1zf0dsi5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gbWVhc3VyZSB0aW1lLiBQcmltYXJ5IGJ1dHRvbiBjbGljayBzdGFydHMvcGF1c2VzIHRoZSB3YXRjaCwgc2Vjb25kYXJ5IGJ1dHRvbiByZXNldHMgaXQuIEF1dG9tYXRpY2FsbHkgcGF1c2VzL3Jlc3VtZXMgb24gc2NyZWVuIGxvY2tpbmcuIiwKICAibmFtZSI6ICJTdG9wd2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovc3RvcHdhdGNoIiwKICAidXVpZCI6ICJzdG9wd2F0Y2hAYWxpYWtzZWl6LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
   }}
 , {"uuid": "vbox-applet@buba98", "name": "VirtualBox applet", "pname": "virtualbox-applet", "description": "Provide menu to run VirtualBox machines and switch between running VMs.\nIt provides options for detachable head and headless mode.\nThis is a fork of https://extensions.gnome.org/extension/1415/virtualbox-applet/ extension.", "link": "https://extensions.gnome.org/extension/5799/virtualbox-applet/", "shell_version_map": {
     "38": {"version": "4", "sha256": "0a7gmvn7lp1k89ylk1s5sl4pkzsyjkk99fm5r8khckgrxancsbdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMuXG5JdCBwcm92aWRlcyBvcHRpb25zIGZvciBkZXRhY2hhYmxlIGhlYWQgYW5kIGhlYWRsZXNzIG1vZGUuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xNDE1L3ZpcnR1YWxib3gtYXBwbGV0LyBleHRlbnNpb24uIiwKICAibmFtZSI6ICJWaXJ0dWFsQm94IGFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52Ym94LWFwcGxldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnViYTk4L3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBidWJhOTgiLAogICJ2ZXJzaW9uIjogNAp9"},
@@ -6035,15 +6334,17 @@
     "42": {"version": "21", "sha256": "0x3sax20l5g2za1ys9kqqjc5izsh9mqmal8vnlqnqncq6wwkg8s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgIm5hbWUiOiAiUGVyc2lhbiBDYWxlbmRhciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUmV6YSBNb3VzYXZpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlBlcnNpYW5DYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "43": {"version": "21", "sha256": "0x3sax20l5g2za1ys9kqqjc5izsh9mqmal8vnlqnqncq6wwkg8s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgIm5hbWUiOiAiUGVyc2lhbiBDYWxlbmRhciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUmV6YSBNb3VzYXZpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlBlcnNpYW5DYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "44": {"version": "21", "sha256": "0x3sax20l5g2za1ys9kqqjc5izsh9mqmal8vnlqnqncq6wwkg8s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgIm5hbWUiOiAiUGVyc2lhbiBDYWxlbmRhciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUmV6YSBNb3VzYXZpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlBlcnNpYW5DYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
-    "45": {"version": "26", "sha256": "1swcqfn5w66dxaivxw1wdsyvmxckpr1ssnc15rj1jjimn89kaysj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9JYW1SZXphTW91c2F2aS9wZXJzaWFuLWdub21lLWNhbGVuZGFyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGVyc2lhbi1jYWxlbmRhckBpYW1yZXphbW91c2F2aS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="},
-    "46": {"version": "26", "sha256": "1swcqfn5w66dxaivxw1wdsyvmxckpr1ssnc15rj1jjimn89kaysj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9JYW1SZXphTW91c2F2aS9wZXJzaWFuLWdub21lLWNhbGVuZGFyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGVyc2lhbi1jYWxlbmRhckBpYW1yZXphbW91c2F2aS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}
+    "45": {"version": "27", "sha256": "1mj4djiqqpj61cjgi8rma5q0xddbkj9ca5kcldf3076pyjxxjppa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSWFtUmV6YU1vdXNhdmkvcGVyc2lhbi1nbm9tZS1jYWxlbmRhci1leHRlbnNpb24iLAogICJ1dWlkIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
+    "46": {"version": "27", "sha256": "1mj4djiqqpj61cjgi8rma5q0xddbkj9ca5kcldf3076pyjxxjppa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSWFtUmV6YU1vdXNhdmkvcGVyc2lhbi1nbm9tZS1jYWxlbmRhci1leHRlbnNpb24iLAogICJ1dWlkIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="},
+    "47": {"version": "27", "sha256": "1mj4djiqqpj61cjgi8rma5q0xddbkj9ca5kcldf3076pyjxxjppa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSWFtUmV6YU1vdXNhdmkvcGVyc2lhbi1nbm9tZS1jYWxlbmRhci1leHRlbnNpb24iLAogICJ1dWlkIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}
   }}
 , {"uuid": "HeadsetControl@lauinger-clan.de", "name": "HeadsetControl", "pname": "headsetcontrol", "description": "Gnome Shell Extension to visualize headset status from HeadsetControl (https://github.com/Sapd/HeadsetControl) command line tool", "link": "https://extensions.gnome.org/extension/5823/headsetcontrol/", "shell_version_map": {
     "42": {"version": "6", "sha256": "1mdyigd5dn324ivb5bgypiq4gibjsbzm0rkcml9hi699a609736k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1IZWFkc2V0Q29udHJvbCIsCiAgInV1aWQiOiAiSGVhZHNldENvbnRyb2xAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "15", "sha256": "04as61msjqq359r1qm0d7dw7df2bcngx67pmwva8flyvzi62iavi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDE1Cn0="},
     "44": {"version": "23", "sha256": "00clk8w8p1sxsqpmwsmlgki2vvx9cjlvnzsrn9j69n1img4vbiwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tSGVhZHNldENvbnRyb2wiLAogICJ1dWlkIjogIkhlYWRzZXRDb250cm9sQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "45": {"version": "30", "sha256": "1d0v1k0g9mizc3k2qyxgl8xmq9w4rzk124vbjq2ifzircbsb6qb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1IZWFkc2V0Q29udHJvbCIsCiAgInV1aWQiOiAiSGVhZHNldENvbnRyb2xAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAzMCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjQiCn0="},
-    "46": {"version": "30", "sha256": "1d0v1k0g9mizc3k2qyxgl8xmq9w4rzk124vbjq2ifzircbsb6qb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1IZWFkc2V0Q29udHJvbCIsCiAgInV1aWQiOiAiSGVhZHNldENvbnRyb2xAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAzMCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjQiCn0="}
+    "45": {"version": "31", "sha256": "05bsyb4c847m6nmlzp8s94hp4kizw8gq9bh7ad5rc27zms87vdkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tSGVhZHNldENvbnRyb2wiLAogICJ1dWlkIjogIkhlYWRzZXRDb250cm9sQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzEsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "46": {"version": "31", "sha256": "05bsyb4c847m6nmlzp8s94hp4kizw8gq9bh7ad5rc27zms87vdkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tSGVhZHNldENvbnRyb2wiLAogICJ1dWlkIjogIkhlYWRzZXRDb250cm9sQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzEsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"},
+    "47": {"version": "31", "sha256": "05bsyb4c847m6nmlzp8s94hp4kizw8gq9bh7ad5rc27zms87vdkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tSGVhZHNldENvbnRyb2wiLAogICJ1dWlkIjogIkhlYWRzZXRDb250cm9sQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMzEsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4wIgp9"}
   }}
 , {"uuid": "true-color-window-invert@lynet101", "name": "True Color Window Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I (Fork from JackKenney, due to 2+ years of inactivity)\n\n!!!IMPORTANT!!!\nDue to changes in personal and professional life, developer lynet_101 will no longer be able to maintain this project, and the extension, as a result, is from December the 5th 2023 orphaned\n\npatch notes v3:\nFixed an issue where windows would occasionally disappear upon inversion\n\nAbout Gnome 45:\nThere will be made an effort to port this extension to gnome 45, but gnome has decided to revamp large parts of the framework used for these sorts of extensions, and as I'm a solo developer, don't expect it to be ported immediately .\n\nI apologize for any inconvenience this may cause ;(", "link": "https://extensions.gnome.org/extension/5829/true-color-invert/", "shell_version_map": {
     "38": {"version": "3", "sha256": "01hsx7mrd0z8fy797x3xn8jqjjw8a34dxj4vvf9w43zdixj5i6z4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIChGb3JrIGZyb20gSmFja0tlbm5leSwgZHVlIHRvIDIrIHllYXJzIG9mIGluYWN0aXZpdHlcblxucGF0Y2ggbm90ZXMgdjM6XG5GaXhlZCBhbiBpc3N1ZSB3aGVyZSB3aW5kb3dzIHdvdWxkIG9jY2FzaW9uYWxseSBkaXNhcHBlYXIgdXBvbiBpbnZlcnNpb25cblxuTm90ZXM6XG5BcyB0aGlzIGlzIGEgZmFpcmx5IG5ldyBhZG9wdGlvbiwgb2YgYSBmYWlybHkgb2xkIHByb2plY3QsIGV4cGVjdCBmcmVxdWVudCB1cGRhdGVzIGFuZCBidWcgcGF0Y2hlcyBpbiB0aGUgYmVnaW5uaW5nLiB0aGFuayB5b3UgZm9yIHVuZGVyc3RhbmRpbmciLAogICJuYW1lIjogIlRydWUgQ29sb3IgV2luZG93IEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bmV0MTAxL2dub21lLXRydWUtY29sb3ItaW52ZXJ0IiwKICAidXVpZCI6ICJ0cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnRAbHluZXQxMDEiLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -6074,8 +6375,8 @@
     "44": {"version": "9", "sha256": "15bl13jhxnrr1q64d9p0rh2scy3fx4bwh36n6p0dpry8dgzp8qk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpY29uIHRvIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbi4gIFxuYmFzZWQgb24gR05PTUUgZ25vbWUtc2hlbGwgYW5kIFJIRUwgZ25vbWUtc2hlbGwgcGF0Y2giLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiAmICBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3JiaXRjb3JyZWN0b24vZW5odW5jZS1hY3Rpdml0ZXMvdHJlZS9leHBlcmltZW50YWwiLAogICJ1dWlkIjogImVuaHVuY2VhY3Rpdml0aWVzZUBnaXRodWIuY29tLm9yYml0Y29ycmVjdGlvbiIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "dejaview@hedgie.tech", "name": "Dejaview", "pname": "dejaview", "description": "Show a notification with a chosen frequency", "link": "https://extensions.gnome.org/extension/5850/dejaview/", "shell_version_map": {
-    "45": {"version": "11", "sha256": "16q7x64mnd2nlg6sy8v4hxmqihzsz2gyanll11rdf7jk6rwd03h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1kZWphdmlldyIsCiAgInV1aWQiOiAiZGVqYXZpZXdAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "46": {"version": "11", "sha256": "16q7x64mnd2nlg6sy8v4hxmqihzsz2gyanll11rdf7jk6rwd03h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1kZWphdmlldyIsCiAgInV1aWQiOiAiZGVqYXZpZXdAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "46": {"version": "13", "sha256": "070aivnlb04k2a6q0lsgs65vswb2pwy5jbjd3gmmb81gsl8k72mp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1kZWphdmlldyIsCiAgInV1aWQiOiAiZGVqYXZpZXdAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "47": {"version": "13", "sha256": "070aivnlb04k2a6q0lsgs65vswb2pwy5jbjd3gmmb81gsl8k72mp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1kZWphdmlldyIsCiAgInV1aWQiOiAiZGVqYXZpZXdAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
   }}
 , {"uuid": "showappsattop@github.com.orbitcorrection", "name": "Apps at Top", "pname": "show-apps-at-top", "description": "Put show apps icon at top in Gnome default dash", "link": "https://extensions.gnome.org/extension/5853/show-apps-at-top/", "shell_version_map": {
     "40": {"version": "4", "sha256": "0h1dglr1zc4rn75hklf4h4r808683dqpwl6zp7rrg52xrb3cp1bd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBzaG93IGFwcHMgaWNvbiBhdCB0b3Agb2YgZGFzaCIsCiAgIm5hbWUiOiAiU2hvdyBBcHBzIGF0IFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3JiaXRjb3JyZWN0b24vc2hvdy1hcHBzLWF0LXRvcCIsCiAgInV1aWQiOiAic2hvd2FwcHNhdHRvcEBnaXRodWIuY29tLm9yYml0Y29ycmVjdGlvbiIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -6099,22 +6400,28 @@
     "43": {"version": "1", "sha256": "15v4d6kxnlnbayqryliy67s35zbvr6j8g1w2x6wm0w909gcwi0px", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ291dCBidXR0b24gZWFzaWx5IGFjY2Vzc2libGUgaW4gdGhlIHRvcCBwYW5lbC4gSXQgY291bGQgYmUgdXNlZnVsIGFzIGl0IHJlc3RhcnQgZ25vbWUgZXZlcnl0aW1lIHlvdSBjbGljayBpdC4iLAogICJuYW1lIjogIkxvZ291dCBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMENUMFBVQ0UtTE9HL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2dvdXQtYnV0dG9uIiwKICAidXVpZCI6ICJsb2dvdXQtYnV0dG9uQDBjdDBwdWNlLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}
   }}
 , {"uuid": "trimmer@hedgie.tech", "name": "Trimmer", "pname": "trimmer", "description": "Automatically trim the text stored in your clipboard", "link": "https://extensions.gnome.org/extension/5871/trimmer/", "shell_version_map": {
-    "45": {"version": "4", "sha256": "10xvxc124wrpdh9vbav3h4nzadrj9k3vap9gykl5xn8s3y01s43n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdHJpbSB0aGUgdGV4dCBzdG9yZWQgaW4geW91ciBjbGlwYm9hcmQiLAogICJuYW1lIjogIlRyaW1tZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJpbW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tdHJpbW1lciIsCiAgInV1aWQiOiAidHJpbW1lckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "46": {"version": "4", "sha256": "10xvxc124wrpdh9vbav3h4nzadrj9k3vap9gykl5xn8s3y01s43n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdHJpbSB0aGUgdGV4dCBzdG9yZWQgaW4geW91ciBjbGlwYm9hcmQiLAogICJuYW1lIjogIlRyaW1tZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJpbW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tdHJpbW1lciIsCiAgInV1aWQiOiAidHJpbW1lckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA0Cn0="}
+    "45": {"version": "5", "sha256": "1zzz4c638xvb1z4lj3d054dkk5v1n0b0chn8a81qvggib1yisq32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdHJpbSB0aGUgdGV4dCBzdG9yZWQgaW4geW91ciBjbGlwYm9hcmQiLAogICJuYW1lIjogIlRyaW1tZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJpbW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvZ25vbWUtZXh0ZW5zaW9uLXRyaW1tZXIiLAogICJ1dWlkIjogInRyaW1tZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "1zzz4c638xvb1z4lj3d054dkk5v1n0b0chn8a81qvggib1yisq32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdHJpbSB0aGUgdGV4dCBzdG9yZWQgaW4geW91ciBjbGlwYm9hcmQiLAogICJuYW1lIjogIlRyaW1tZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJpbW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvZ25vbWUtZXh0ZW5zaW9uLXRyaW1tZXIiLAogICJ1dWlkIjogInRyaW1tZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "1zzz4c638xvb1z4lj3d054dkk5v1n0b0chn8a81qvggib1yisq32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdHJpbSB0aGUgdGV4dCBzdG9yZWQgaW4geW91ciBjbGlwYm9hcmQiLAogICJuYW1lIjogIlRyaW1tZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJpbW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvZ25vbWUtZXh0ZW5zaW9uLXRyaW1tZXIiLAogICJ1dWlkIjogInRyaW1tZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "launcher@hedgie.tech", "name": "Launcher", "pname": "launcher", "description": "Launch scripts from a panel indicator", "link": "https://extensions.gnome.org/extension/5874/launcher/", "shell_version_map": {
-    "45": {"version": "11", "sha256": "036px47sphr958pm00hi7dw9xgc7km36rp17bmj2j82n30g6ya8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBwYW5lbCBpbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1sYXVuY2hlciIsCiAgInV1aWQiOiAibGF1bmNoZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "46": {"version": "11", "sha256": "036px47sphr958pm00hi7dw9xgc7km36rp17bmj2j82n30g6ya8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBwYW5lbCBpbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1sYXVuY2hlciIsCiAgInV1aWQiOiAibGF1bmNoZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "45": {"version": "12", "sha256": "1vfwiw97bllnrnnblvpispprnl9bdw8hiyxq63n444srvyvaqlc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBwYW5lbCBpbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tbGF1bmNoZXIiLAogICJ1dWlkIjogImxhdW5jaGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "1vfwiw97bllnrnnblvpispprnl9bdw8hiyxq63n444srvyvaqlc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBwYW5lbCBpbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tbGF1bmNoZXIiLAogICJ1dWlkIjogImxhdW5jaGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "1vfwiw97bllnrnnblvpispprnl9bdw8hiyxq63n444srvyvaqlc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBwYW5lbCBpbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tbGF1bmNoZXIiLAogICJ1dWlkIjogImxhdW5jaGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "just_shows_memory_usage@troizet.github.com", "name": "Just shows memory usage", "pname": "just-shows-memory-usage", "description": "Just shows memory usage", "link": "https://extensions.gnome.org/extension/5877/just-shows-memory-usage/", "shell_version_map": {
     "38": {"version": "2", "sha256": "1smj4fsfskdrzzh4q1hqhdwaa8bdh21x82sfmdw4gpvfwx9cpgcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
     "40": {"version": "2", "sha256": "1smj4fsfskdrzzh4q1hqhdwaa8bdh21x82sfmdw4gpvfwx9cpgcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
     "41": {"version": "2", "sha256": "1smj4fsfskdrzzh4q1hqhdwaa8bdh21x82sfmdw4gpvfwx9cpgcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
-    "42": {"version": "2", "sha256": "1smj4fsfskdrzzh4q1hqhdwaa8bdh21x82sfmdw4gpvfwx9cpgcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
+    "42": {"version": "2", "sha256": "1smj4fsfskdrzzh4q1hqhdwaa8bdh21x82sfmdw4gpvfwx9cpgcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
+    "45": {"version": "5", "sha256": "04zjkc3v25ayk34sn7kvi0gy1jr0vz1hgrjbgy1idbp6nav7iga4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXNob3dzLW1lbW9yeS11c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "46": {"version": "5", "sha256": "04zjkc3v25ayk34sn7kvi0gy1jr0vz1hgrjbgy1idbp6nav7iga4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXNob3dzLW1lbW9yeS11c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "47": {"version": "5", "sha256": "04zjkc3v25ayk34sn7kvi0gy1jr0vz1hgrjbgy1idbp6nav7iga4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXNob3dzLW1lbW9yeS11c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "copier@hedgie.tech", "name": "Copier", "pname": "copier", "description": "Copy text notes to clipboard via a panel indicator", "link": "https://extensions.gnome.org/extension/5883/copier/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "1rn3k90ik135ib8vmz2jpmdrd38z85agkgg5nvz55zhq4dxyik75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdGV4dCBub3RlcyB0byBjbGlwYm9hcmQgdmlhIGEgcGFuZWwgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1jb3BpZXIiLAogICJ1dWlkIjogImNvcGllckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA2Cn0="},
-    "46": {"version": "6", "sha256": "1rn3k90ik135ib8vmz2jpmdrd38z85agkgg5nvz55zhq4dxyik75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdGV4dCBub3RlcyB0byBjbGlwYm9hcmQgdmlhIGEgcGFuZWwgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1jb3BpZXIiLAogICJ1dWlkIjogImNvcGllckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA2Cn0="}
+    "45": {"version": "7", "sha256": "04jnbj7ifp7311wdm4mhmwkddbmrwhjndyib408js1f2q17fhllc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdGV4dCBub3RlcyB0byBjbGlwYm9hcmQgdmlhIGEgcGFuZWwgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tY29waWVyIiwKICAidXVpZCI6ICJjb3BpZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"},
+    "46": {"version": "7", "sha256": "04jnbj7ifp7311wdm4mhmwkddbmrwhjndyib408js1f2q17fhllc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdGV4dCBub3RlcyB0byBjbGlwYm9hcmQgdmlhIGEgcGFuZWwgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tY29waWVyIiwKICAidXVpZCI6ICJjb3BpZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"},
+    "47": {"version": "7", "sha256": "04jnbj7ifp7311wdm4mhmwkddbmrwhjndyib408js1f2q17fhllc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdGV4dCBub3RlcyB0byBjbGlwYm9hcmQgdmlhIGEgcGFuZWwgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tY29waWVyIiwKICAidXVpZCI6ICJjb3BpZXJAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}
   }}
 , {"uuid": "quicktext@brainstormtrooper.github.io", "name": "Quick Text", "pname": "quick-text", "description": "Quickly capture text snippets and ideas, then convert them to tasks or events", "link": "https://extensions.gnome.org/extension/5892/quick-text/", "shell_version_map": {
     "44": {"version": "8", "sha256": "09ybjnfgf4pnyj4q9xck5cs5yi0mwin47d3mbq55m25mk8sd8grm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2FwdHVyZSB0ZXh0IHNuaXBwZXRzIGFuZCBpZGVhcywgdGhlbiBjb252ZXJ0IHRoZW0gdG8gdGFza3Mgb3IgZXZlbnRzIiwKICAibmFtZSI6ICJRdWljayBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyYWluc3Rvcm10cm9vcGVyL3F1aWNrdGV4dCIsCiAgInV1aWQiOiAicXVpY2t0ZXh0QGJyYWluc3Rvcm10cm9vcGVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -6125,8 +6432,9 @@
     "42": {"version": "18", "sha256": "1cqwwynvnqpgzip4v1r52yl66x8rqd15xyjabplb9i19dibwh67a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgIm5hbWUiOiAiQXBwIEhpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcC1oaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bml0aERldi9nbm9tZS1hcHAtaGlkZXIiLAogICJ1dWlkIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "43": {"version": "18", "sha256": "1cqwwynvnqpgzip4v1r52yl66x8rqd15xyjabplb9i19dibwh67a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgIm5hbWUiOiAiQXBwIEhpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcC1oaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bml0aERldi9nbm9tZS1hcHAtaGlkZXIiLAogICJ1dWlkIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "44": {"version": "18", "sha256": "1cqwwynvnqpgzip4v1r52yl66x8rqd15xyjabplb9i19dibwh67a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgIm5hbWUiOiAiQXBwIEhpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcC1oaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bml0aERldi9nbm9tZS1hcHAtaGlkZXIiLAogICJ1dWlkIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAidmVyc2lvbiI6IDE4Cn0="},
-    "45": {"version": "20", "sha256": "1phx5bf82a0fqcm3c4savhbw0nnarbx5d0y5f2php9wwnvy92wpg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAibmFtZSI6ICJBcHAgSGlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwLWhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MeW5pdGhEZXYvZ25vbWUtYXBwLWhpZGVyIiwKICAidXVpZCI6ICJhcHAtaGlkZXJAbHluaXRoLmRldiIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "46": {"version": "20", "sha256": "1phx5bf82a0fqcm3c4savhbw0nnarbx5d0y5f2php9wwnvy92wpg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAibmFtZSI6ICJBcHAgSGlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwLWhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MeW5pdGhEZXYvZ25vbWUtYXBwLWhpZGVyIiwKICAidXVpZCI6ICJhcHAtaGlkZXJAbHluaXRoLmRldiIsCiAgInZlcnNpb24iOiAyMAp9"}
+    "45": {"version": "22", "sha256": "0w9zhwnnk9ql3bqjc0cp0byfgds4hzxy8nqyljayy9wza8s5bxin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAibmFtZSI6ICJBcHAgSGlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwLWhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHluaXRoRGV2L2dub21lLWFwcC1oaWRlciIsCiAgInV1aWQiOiAiYXBwLWhpZGVyQGx5bml0aC5kZXYiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
+    "46": {"version": "22", "sha256": "0w9zhwnnk9ql3bqjc0cp0byfgds4hzxy8nqyljayy9wza8s5bxin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAibmFtZSI6ICJBcHAgSGlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwLWhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHluaXRoRGV2L2dub21lLWFwcC1oaWRlciIsCiAgInV1aWQiOiAiYXBwLWhpZGVyQGx5bml0aC5kZXYiLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
+    "47": {"version": "22", "sha256": "0w9zhwnnk9ql3bqjc0cp0byfgds4hzxy8nqyljayy9wza8s5bxin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYXBwcyBpbiBHTk9NRSdzIGFwcCBtZW51IiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAibHluaXRoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFwcC1oaWRlckBseW5pdGguZGV2IiwKICAibmFtZSI6ICJBcHAgSGlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwLWhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHluaXRoRGV2L2dub21lLWFwcC1oaWRlciIsCiAgInV1aWQiOiAiYXBwLWhpZGVyQGx5bml0aC5kZXYiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}
   }}
 , {"uuid": "smartcard-lock@1407.org", "name": "Smartcard Lock", "pname": "smartcard-lock", "description": "This extension just locks the screen whenever a smartcard token recognized by GNOME as used for login is removed.\n\nIf nothing happens, check the FAQ available at the extension's homepage in the link below.", "link": "https://extensions.gnome.org/extension/5901/smartcard-lock/", "shell_version_map": {
     "43": {"version": "2", "sha256": "1bb6r2c9lqjx4xa6n8qj9n1pzq8v7gdxx5fsmrhd6bi60a388nm3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGp1c3QgbG9ja3MgdGhlIHNjcmVlbiB3aGVuZXZlciBhIHNtYXJ0Y2FyZCB0b2tlbiByZWNvZ25pemVkIGJ5IEdOT01FIGFzIHVzZWQgZm9yIGxvZ2luIGlzIHJlbW92ZWQuXG5cbklmIG5vdGhpbmcgaGFwcGVucywgY2hlY2sgdGhlIEZBUSBhdmFpbGFibGUgYXQgdGhlIGV4dGVuc2lvbidzIGhvbWVwYWdlIGluIHRoZSBsaW5rIGJlbG93LiIsCiAgIm5hbWUiOiAiU21hcnRjYXJkIExvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JzZWFicmEvc21hcnRjYXJkLWxvY2svIiwKICAidXVpZCI6ICJzbWFydGNhcmQtbG9ja0AxNDA3Lm9yZyIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -6139,8 +6447,9 @@
     "42": {"version": "4", "sha256": "1wfxismfsq8wc9clysfrsnv5qkvvq85m7j6p283962p29qcaln0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5jaXNsYXZvaWUvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAZnJhbmNpc2xhdm9pZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
     "43": {"version": "4", "sha256": "1wfxismfsq8wc9clysfrsnv5qkvvq85m7j6p283962p29qcaln0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5jaXNsYXZvaWUvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAZnJhbmNpc2xhdm9pZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
     "44": {"version": "4", "sha256": "1wfxismfsq8wc9clysfrsnv5qkvvq85m7j6p283962p29qcaln0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5jaXNsYXZvaWUvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAZnJhbmNpc2xhdm9pZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "9", "sha256": "05qz9q2prqp0a4jmfpkh3lhckl504pl9s6mr7af2avm8v8r883qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIFN1cHBvcnRzIGNvbmZpZ3VyaW5nIGdyYW51bGFyaXR5IChkZWZhdWx0IHN0ZXAgb2YgNSUpXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5jaXNsYXZvaWUvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAZnJhbmNpc2xhdm9pZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"},
-    "46": {"version": "9", "sha256": "05qz9q2prqp0a4jmfpkh3lhckl504pl9s6mr7af2avm8v8r883qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIFN1cHBvcnRzIGNvbmZpZ3VyaW5nIGdyYW51bGFyaXR5IChkZWZhdWx0IHN0ZXAgb2YgNSUpXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5jaXNsYXZvaWUvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAZnJhbmNpc2xhdm9pZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}
+    "45": {"version": "10", "sha256": "1c12a4hs0kcw8jmc737p5dvrxwkw18l0imfmm9la6c7n89zyya1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIFN1cHBvcnRzIGNvbmZpZ3VyaW5nIGdyYW51bGFyaXR5IChkZWZhdWx0IHN0ZXAgb2YgNSUpXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFuY2lzbGF2b2llL2dub21lLXNoZWxsLXZvbHVtZS1zY3JvbGxlciIsCiAgInV1aWQiOiAidm9sdW1lX3Njcm9sbGVyQGZyYW5jaXNsYXZvaWUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "46": {"version": "10", "sha256": "1c12a4hs0kcw8jmc737p5dvrxwkw18l0imfmm9la6c7n89zyya1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIFN1cHBvcnRzIGNvbmZpZ3VyaW5nIGdyYW51bGFyaXR5IChkZWZhdWx0IHN0ZXAgb2YgNSUpXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFuY2lzbGF2b2llL2dub21lLXNoZWxsLXZvbHVtZS1zY3JvbGxlciIsCiAgInV1aWQiOiAidm9sdW1lX3Njcm9sbGVyQGZyYW5jaXNsYXZvaWUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "47": {"version": "10", "sha256": "1c12a4hs0kcw8jmc737p5dvrxwkw18l0imfmm9la6c7n89zyya1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIFN1cHBvcnRzIGNvbmZpZ3VyaW5nIGdyYW51bGFyaXR5IChkZWZhdWx0IHN0ZXAgb2YgNSUpXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQxMDkvdm9sdW1lLXNjcm9sbGVyLyB3aGljaCBpcyBub3cgdW5mb3J0dW5hdGVseSB1bm1haW50YWluZWQvYXJjaGl2ZWQuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZnJhbmNpc2xhdm9pZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52b2x1bWUtc2Nyb2xsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFuY2lzbGF2b2llL2dub21lLXNoZWxsLXZvbHVtZS1zY3JvbGxlciIsCiAgInV1aWQiOiAidm9sdW1lX3Njcm9sbGVyQGZyYW5jaXNsYXZvaWUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}
   }}
 , {"uuid": "yks_timer@ysfsvm", "name": "YKS Timer", "pname": "yks-timer", "description": "YKS Timer extension for Gnome Shell / Fork of https://github.com/patwork/deadline-timer", "link": "https://extensions.gnome.org/extension/5910/yks-timer/", "shell_version_map": {
     "38": {"version": "5", "sha256": "04w44hicic0gv4pc1v2h17flz7g6fq85yfsj7qvff8lw6vhg26gn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllLUyBUaW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsIC8gRm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vcGF0d29yay9kZWFkbGluZS10aW1lciIsCiAgIm5hbWUiOiAiWUtTIFRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS95c2Zzdm0veWtzLXRpbWVyIiwKICAidXVpZCI6ICJ5a3NfdGltZXJAeXNmc3ZtIiwKICAidmVyc2lvbiI6IDUKfQ=="},
@@ -6180,7 +6489,8 @@
     "43": {"version": "45", "sha256": "00d8j387483znvsigd0cjm8kgzb7z4paipavpdilmdv5k14iv0wn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
     "44": {"version": "45", "sha256": "00d8j387483znvsigd0cjm8kgzb7z4paipavpdilmdv5k14iv0wn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
     "45": {"version": "48", "sha256": "0nckxx53fxyzxqhp68vdx66yrdw8z3flbd4yhrnp5hpqzkfwhakv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ4Cn0="},
-    "46": {"version": "57", "sha256": "0sp2aj8skr0q78anhszfcd4h0pnj3s78a6ng653pakhfg19jszjh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU3Cn0="}
+    "46": {"version": "67", "sha256": "0ls84kk1h8rdhkz69i9hyqgn7c33s0hs5p39wa368r9gifcjcnsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDY3Cn0="},
+    "47": {"version": "68", "sha256": "00g6cf3gfdil70lps1gnkljvys54lm18iw7cc4yhvgq0ry4h4b8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDY4Cn0="}
   }}
 , {"uuid": "soft-brightness-plus@joelkitching.com", "name": "Soft Brightness Plus", "pname": "soft-brightness-plus", "description": "Add or override the brightness slider to change the brightness via an alpha layer (and optionally stop using or cooperate with the exising backlight, if present).\nEither internal, external or all monitors can be dimmed.\nSee the GitHub page for details.\n\nNote that this extension will keep running on the lock screen, as you'd also want the brightness setting to apply to the lock screen as well. Please report on GitHub if this gives you any trouble.\n\nThis extension is a fork of the original 'Soft brightness' extension, and maintains support for new GNOME releases.", "link": "https://extensions.gnome.org/extension/5943/soft-brightness-plus/", "shell_version_map": {
     "38": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -6189,8 +6499,9 @@
     "42": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"},
     "43": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"},
     "44": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"},
-    "45": {"version": "19", "sha256": "18bc53i0p9ncqrvxbkrlqisf9p19bphf5l9ii8zj923siikzivvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2praXRjaGluZy9zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzLXBsdXNAam9lbGtpdGNoaW5nLmNvbSIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MzktNC1nNzY4ZjZiNSIsCiAgInZlcnNpb24iOiAxOQp9"},
-    "46": {"version": "19", "sha256": "18bc53i0p9ncqrvxbkrlqisf9p19bphf5l9ii8zj923siikzivvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2praXRjaGluZy9zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzLXBsdXNAam9lbGtpdGNoaW5nLmNvbSIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MzktNC1nNzY4ZjZiNSIsCiAgInZlcnNpb24iOiAxOQp9"}
+    "45": {"version": "21", "sha256": "0jy5jzwpf48vqsvkr8qwm3cq9xrmmky3cc05b0qc3cyjkfj7m5iv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qa2l0Y2hpbmcvc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJ1dWlkIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzQGpvZWxraXRjaGluZy5jb20iLAogICJ2Y3NfcmV2aXNpb24iOiAidjQwLTMtZzkzN2MyNTAiLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
+    "46": {"version": "21", "sha256": "0jy5jzwpf48vqsvkr8qwm3cq9xrmmky3cc05b0qc3cyjkfj7m5iv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qa2l0Y2hpbmcvc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJ1dWlkIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzQGpvZWxraXRjaGluZy5jb20iLAogICJ2Y3NfcmV2aXNpb24iOiAidjQwLTMtZzkzN2MyNTAiLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
+    "47": {"version": "21", "sha256": "0jy5jzwpf48vqsvkr8qwm3cq9xrmmky3cc05b0qc3cyjkfj7m5iv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qa2l0Y2hpbmcvc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJ1dWlkIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzQGpvZWxraXRjaGluZy5jb20iLAogICJ2Y3NfcmV2aXNpb24iOiAidjQwLTMtZzkzN2MyNTAiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}
   }}
 , {"uuid": "swatch-clock@okatotf.github.io", "name": "Swatch Clock", "pname": "swatch-clock", "description": "An extension which displays the Swatch Internet Time on the panel.", "link": "https://extensions.gnome.org/extension/5946/swatch-clock/", "shell_version_map": {
     "44": {"version": "2", "sha256": "131rlf6q1w6jxz95j8yf3vpi40y80p1rjax5b2mapm6ppasdlkl2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBkaXNwbGF5cyB0aGUgU3dhdGNoIEludGVybmV0IFRpbWUgb24gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiU3dhdGNoIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29rYXRvdGYvc3dhdGNoLWNsb2NrIiwKICAidXVpZCI6ICJzd2F0Y2gtY2xvY2tAb2thdG90Zi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}
@@ -6209,14 +6520,16 @@
     "44": {"version": "1", "sha256": "13ydi8pwnaqsjv3dqjycpfv2zqz71zawqaj3rdkwdzhkn8q9ra4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV2YWx1YXRlIEdKUyBzY3JpcHQgdGhyb3VnaCBEQnVzIiwKICAibmFtZSI6ICJFdmFsIEdKUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW1vdHRhbWFkby9ldmFsLWdqcyIsCiAgInV1aWQiOiAiZXZhbC1nanNAcmFtb3R0YW1hZG8uZGV2IiwKICAidmVyc2lvbiI6IDEKfQ=="}
   }}
 , {"uuid": "lineup@hedgie.tech", "name": "Lineup", "pname": "lineup", "description": "Set width for right-side panel indicators", "link": "https://extensions.gnome.org/extension/5955/lineup/", "shell_version_map": {
-    "45": {"version": "14", "sha256": "0vrnzs8981k9559jphjj50gc4jvwxlmxhh0plsx58cmmzdswpvia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCB3aWR0aCBmb3IgcmlnaHQtc2lkZSBwYW5lbCBpbmRpY2F0b3JzIiwKICAibmFtZSI6ICJMaW5ldXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGluZXVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1saW5ldXAiLAogICJ1dWlkIjogImxpbmV1cEBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "0vrnzs8981k9559jphjj50gc4jvwxlmxhh0plsx58cmmzdswpvia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCB3aWR0aCBmb3IgcmlnaHQtc2lkZSBwYW5lbCBpbmRpY2F0b3JzIiwKICAibmFtZSI6ICJMaW5ldXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGluZXVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1saW5ldXAiLAogICJ1dWlkIjogImxpbmV1cEBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "45": {"version": "15", "sha256": "1fk23n9q3ynii00sya1p80czb1ibiyjnhi6czcrxbwhz4sh7i536", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCB3aWR0aCBmb3IgcmlnaHQtc2lkZSBwYW5lbCBpbmRpY2F0b3JzIiwKICAibmFtZSI6ICJMaW5ldXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGluZXVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tbGluZXVwIiwKICAidXVpZCI6ICJsaW5ldXBAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "1fk23n9q3ynii00sya1p80czb1ibiyjnhi6czcrxbwhz4sh7i536", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCB3aWR0aCBmb3IgcmlnaHQtc2lkZSBwYW5lbCBpbmRpY2F0b3JzIiwKICAibmFtZSI6ICJMaW5ldXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGluZXVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tbGluZXVwIiwKICAidXVpZCI6ICJsaW5ldXBAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "1fk23n9q3ynii00sya1p80czb1ibiyjnhi6czcrxbwhz4sh7i536", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCB3aWR0aCBmb3IgcmlnaHQtc2lkZSBwYW5lbCBpbmRpY2F0b3JzIiwKICAibmFtZSI6ICJMaW5ldXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGluZXVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tbGluZXVwIiwKICAidXVpZCI6ICJsaW5ldXBAaGVkZ2llLnRlY2giLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "quicksettings-audio-devices-hider@marcinjahn.com", "name": "Quick Settings Audio Devices Hider", "pname": "quick-settings-audio-devices-hider", "description": "A Gnome Shell extension that allows you to hide selected output/input devices from the Quick Settings audio devices panel.\nThanks to it, your Quick Settings panel will list only those devices that you actually use making it easier to quickly switch between them.\n\nNote that this extension does not play well with the https://extensions.gnome.org/extension/5940/quick-settings-audio-panel/ extension. Its option to\"Always show microphone volume slider\" might not work when Quick Settings Audio Devices Hider is enabled. A workaround could be to install https://extensions.gnome.org/extension/5446/quick-settings-tweaker/, which has a similar functinality under the toggle \"Always show input\" under \"Input/Output\" tab.\n\nCheck out the https://extensions.gnome.org/extension/6000/quick-settings-audio-devices-renamer/ if you'd rather want to rename some device than hide it.", "link": "https://extensions.gnome.org/extension/5964/quick-settings-audio-devices-hider/", "shell_version_map": {
     "43": {"version": "10", "sha256": "0v3cg0la8hr52pwpaxpaa4jkv5b2jw101dva78gvnqc04k4hgf7g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgYWxsb3dzIHlvdSB0byBoaWRlIHNlbGVjdGVkIG91dHB1dC9pbnB1dCBkZXZpY2VzIGZyb20gdGhlIFF1aWNrIFNldHRpbmdzIGF1ZGlvIGRldmljZXMgcGFuZWwuXG5UaGFua3MgdG8gaXQsIHlvdXIgUXVpY2sgU2V0dGluZ3MgcGFuZWwgd2lsbCBsaXN0IG9ubHkgdGhvc2UgZGV2aWNlcyB0aGF0IHlvdSBhY3R1YWxseSB1c2UgbWFraW5nIGl0IGVhc2llciB0byBxdWlja2x5IHN3aXRjaCBiZXR3ZWVuIHRoZW0uXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBwbGF5IHdlbGwgd2l0aCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTk0MC9xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbC8gZXh0ZW5zaW9uLiBJdHMgb3B0aW9uIHRvXCJBbHdheXMgc2hvdyBtaWNyb3Bob25lIHZvbHVtZSBzbGlkZXJcIiBtaWdodCBub3Qgd29yayB3aGVuIFF1aWNrIFNldHRpbmdzIEF1ZGlvIERldmljZXMgSGlkZXIgaXMgZW5hYmxlZC4gQSB3b3JrYXJvdW5kIGNvdWxkIGJlIHRvIGluc3RhbGwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTQ0Ni9xdWljay1zZXR0aW5ncy10d2Vha2VyLywgd2hpY2ggaGFzIGEgc2ltaWxhciBmdW5jdGluYWxpdHkgdW5kZXIgdGhlIHRvZ2dsZSBcIkFsd2F5cyBzaG93IGlucHV0XCIgdW5kZXIgXCJJbnB1dC9PdXRwdXRcIiB0YWIuXG5cbkNoZWNrIG91dCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjAwMC9xdWljay1zZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXIvIGlmIHlvdSdkIHJhdGhlciB3YW50IHRvIHJlbmFtZSBzb21lIGRldmljZSB0aGFuIGhpZGUgaXQuIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIEhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlckBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "44": {"version": "10", "sha256": "0v3cg0la8hr52pwpaxpaa4jkv5b2jw101dva78gvnqc04k4hgf7g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgYWxsb3dzIHlvdSB0byBoaWRlIHNlbGVjdGVkIG91dHB1dC9pbnB1dCBkZXZpY2VzIGZyb20gdGhlIFF1aWNrIFNldHRpbmdzIGF1ZGlvIGRldmljZXMgcGFuZWwuXG5UaGFua3MgdG8gaXQsIHlvdXIgUXVpY2sgU2V0dGluZ3MgcGFuZWwgd2lsbCBsaXN0IG9ubHkgdGhvc2UgZGV2aWNlcyB0aGF0IHlvdSBhY3R1YWxseSB1c2UgbWFraW5nIGl0IGVhc2llciB0byBxdWlja2x5IHN3aXRjaCBiZXR3ZWVuIHRoZW0uXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBwbGF5IHdlbGwgd2l0aCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTk0MC9xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbC8gZXh0ZW5zaW9uLiBJdHMgb3B0aW9uIHRvXCJBbHdheXMgc2hvdyBtaWNyb3Bob25lIHZvbHVtZSBzbGlkZXJcIiBtaWdodCBub3Qgd29yayB3aGVuIFF1aWNrIFNldHRpbmdzIEF1ZGlvIERldmljZXMgSGlkZXIgaXMgZW5hYmxlZC4gQSB3b3JrYXJvdW5kIGNvdWxkIGJlIHRvIGluc3RhbGwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTQ0Ni9xdWljay1zZXR0aW5ncy10d2Vha2VyLywgd2hpY2ggaGFzIGEgc2ltaWxhciBmdW5jdGluYWxpdHkgdW5kZXIgdGhlIHRvZ2dsZSBcIkFsd2F5cyBzaG93IGlucHV0XCIgdW5kZXIgXCJJbnB1dC9PdXRwdXRcIiB0YWIuXG5cbkNoZWNrIG91dCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjAwMC9xdWljay1zZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXIvIGlmIHlvdSdkIHJhdGhlciB3YW50IHRvIHJlbmFtZSBzb21lIGRldmljZSB0aGFuIGhpZGUgaXQuIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIEhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlckBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
     "45": {"version": "12", "sha256": "13pjpn6kvz4ml07j7b0029kx6jaqd62qsyaywk4p69y2xakx279k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgYWxsb3dzIHlvdSB0byBoaWRlIHNlbGVjdGVkIG91dHB1dC9pbnB1dCBkZXZpY2VzIGZyb20gdGhlIFF1aWNrIFNldHRpbmdzIGF1ZGlvIGRldmljZXMgcGFuZWwuXG5UaGFua3MgdG8gaXQsIHlvdXIgUXVpY2sgU2V0dGluZ3MgcGFuZWwgd2lsbCBsaXN0IG9ubHkgdGhvc2UgZGV2aWNlcyB0aGF0IHlvdSBhY3R1YWxseSB1c2UgbWFraW5nIGl0IGVhc2llciB0byBxdWlja2x5IHN3aXRjaCBiZXR3ZWVuIHRoZW0uXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBwbGF5IHdlbGwgd2l0aCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTk0MC9xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbC8gZXh0ZW5zaW9uLiBJdHMgb3B0aW9uIHRvXCJBbHdheXMgc2hvdyBtaWNyb3Bob25lIHZvbHVtZSBzbGlkZXJcIiBtaWdodCBub3Qgd29yayB3aGVuIFF1aWNrIFNldHRpbmdzIEF1ZGlvIERldmljZXMgSGlkZXIgaXMgZW5hYmxlZC4gQSB3b3JrYXJvdW5kIGNvdWxkIGJlIHRvIGluc3RhbGwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTQ0Ni9xdWljay1zZXR0aW5ncy10d2Vha2VyLywgd2hpY2ggaGFzIGEgc2ltaWxhciBmdW5jdGluYWxpdHkgdW5kZXIgdGhlIHRvZ2dsZSBcIkFsd2F5cyBzaG93IGlucHV0XCIgdW5kZXIgXCJJbnB1dC9PdXRwdXRcIiB0YWIuXG5cbkNoZWNrIG91dCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjAwMC9xdWljay1zZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXIvIGlmIHlvdSdkIHJhdGhlciB3YW50IHRvIHJlbmFtZSBzb21lIGRldmljZSB0aGFuIGhpZGUgaXQuIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIEhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLWhpZGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLWhpZGVyQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "46": {"version": "13", "sha256": "1zl8bg98v1ll88fv7sv8gicryhzg2pgfylba3z9gsllwh4dcb565", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgYWxsb3dzIHlvdSB0byBoaWRlIHNlbGVjdGVkIG91dHB1dC9pbnB1dCBkZXZpY2VzIGZyb20gdGhlIFF1aWNrIFNldHRpbmdzIGF1ZGlvIGRldmljZXMgcGFuZWwuXG5UaGFua3MgdG8gaXQsIHlvdXIgUXVpY2sgU2V0dGluZ3MgcGFuZWwgd2lsbCBsaXN0IG9ubHkgdGhvc2UgZGV2aWNlcyB0aGF0IHlvdSBhY3R1YWxseSB1c2UgbWFraW5nIGl0IGVhc2llciB0byBxdWlja2x5IHN3aXRjaCBiZXR3ZWVuIHRoZW0uXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBwbGF5IHdlbGwgd2l0aCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTk0MC9xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbC8gZXh0ZW5zaW9uLiBJdHMgb3B0aW9uIHRvXCJBbHdheXMgc2hvdyBtaWNyb3Bob25lIHZvbHVtZSBzbGlkZXJcIiBtaWdodCBub3Qgd29yayB3aGVuIFF1aWNrIFNldHRpbmdzIEF1ZGlvIERldmljZXMgSGlkZXIgaXMgZW5hYmxlZC4gQSB3b3JrYXJvdW5kIGNvdWxkIGJlIHRvIGluc3RhbGwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTQ0Ni9xdWljay1zZXR0aW5ncy10d2Vha2VyLywgd2hpY2ggaGFzIGEgc2ltaWxhciBmdW5jdGluYWxpdHkgdW5kZXIgdGhlIHRvZ2dsZSBcIkFsd2F5cyBzaG93IGlucHV0XCIgdW5kZXIgXCJJbnB1dC9PdXRwdXRcIiB0YWIuXG5cbkNoZWNrIG91dCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjAwMC9xdWljay1zZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXIvIGlmIHlvdSdkIHJhdGhlciB3YW50IHRvIHJlbmFtZSBzb21lIGRldmljZSB0aGFuIGhpZGUgaXQuIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIEhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLWhpZGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLWhpZGVyQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
+    "46": {"version": "14", "sha256": "10brkc1ycw5p0bfc4h6h4shvmfhzk7pw1v2md1bbcwd15y6ki691", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgYWxsb3dzIHlvdSB0byBoaWRlIHNlbGVjdGVkIG91dHB1dC9pbnB1dCBkZXZpY2VzIGZyb20gdGhlIFF1aWNrIFNldHRpbmdzIGF1ZGlvIGRldmljZXMgcGFuZWwuXG5UaGFua3MgdG8gaXQsIHlvdXIgUXVpY2sgU2V0dGluZ3MgcGFuZWwgd2lsbCBsaXN0IG9ubHkgdGhvc2UgZGV2aWNlcyB0aGF0IHlvdSBhY3R1YWxseSB1c2UgbWFraW5nIGl0IGVhc2llciB0byBxdWlja2x5IHN3aXRjaCBiZXR3ZWVuIHRoZW0uXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBwbGF5IHdlbGwgd2l0aCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTk0MC9xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbC8gZXh0ZW5zaW9uLiBJdHMgb3B0aW9uIHRvXCJBbHdheXMgc2hvdyBtaWNyb3Bob25lIHZvbHVtZSBzbGlkZXJcIiBtaWdodCBub3Qgd29yayB3aGVuIFF1aWNrIFNldHRpbmdzIEF1ZGlvIERldmljZXMgSGlkZXIgaXMgZW5hYmxlZC4gQSB3b3JrYXJvdW5kIGNvdWxkIGJlIHRvIGluc3RhbGwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTQ0Ni9xdWljay1zZXR0aW5ncy10d2Vha2VyLywgd2hpY2ggaGFzIGEgc2ltaWxhciBmdW5jdGluYWxpdHkgdW5kZXIgdGhlIHRvZ2dsZSBcIkFsd2F5cyBzaG93IGlucHV0XCIgdW5kZXIgXCJJbnB1dC9PdXRwdXRcIiB0YWIuXG5cbkNoZWNrIG91dCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjAwMC9xdWljay1zZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXIvIGlmIHlvdSdkIHJhdGhlciB3YW50IHRvIHJlbmFtZSBzb21lIGRldmljZSB0aGFuIGhpZGUgaXQuIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIEhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlckBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "47": {"version": "14", "sha256": "10brkc1ycw5p0bfc4h6h4shvmfhzk7pw1v2md1bbcwd15y6ki691", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgYWxsb3dzIHlvdSB0byBoaWRlIHNlbGVjdGVkIG91dHB1dC9pbnB1dCBkZXZpY2VzIGZyb20gdGhlIFF1aWNrIFNldHRpbmdzIGF1ZGlvIGRldmljZXMgcGFuZWwuXG5UaGFua3MgdG8gaXQsIHlvdXIgUXVpY2sgU2V0dGluZ3MgcGFuZWwgd2lsbCBsaXN0IG9ubHkgdGhvc2UgZGV2aWNlcyB0aGF0IHlvdSBhY3R1YWxseSB1c2UgbWFraW5nIGl0IGVhc2llciB0byBxdWlja2x5IHN3aXRjaCBiZXR3ZWVuIHRoZW0uXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBwbGF5IHdlbGwgd2l0aCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTk0MC9xdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbC8gZXh0ZW5zaW9uLiBJdHMgb3B0aW9uIHRvXCJBbHdheXMgc2hvdyBtaWNyb3Bob25lIHZvbHVtZSBzbGlkZXJcIiBtaWdodCBub3Qgd29yayB3aGVuIFF1aWNrIFNldHRpbmdzIEF1ZGlvIERldmljZXMgSGlkZXIgaXMgZW5hYmxlZC4gQSB3b3JrYXJvdW5kIGNvdWxkIGJlIHRvIGluc3RhbGwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNTQ0Ni9xdWljay1zZXR0aW5ncy10d2Vha2VyLywgd2hpY2ggaGFzIGEgc2ltaWxhciBmdW5jdGluYWxpdHkgdW5kZXIgdGhlIHRvZ2dsZSBcIkFsd2F5cyBzaG93IGlucHV0XCIgdW5kZXIgXCJJbnB1dC9PdXRwdXRcIiB0YWIuXG5cbkNoZWNrIG91dCB0aGUgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjAwMC9xdWljay1zZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXIvIGlmIHlvdSdkIHJhdGhlciB3YW50IHRvIHJlbmFtZSBzb21lIGRldmljZSB0aGFuIGhpZGUgaXQuIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIEhpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlckBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
   }}
 , {"uuid": "workspaces-by-open-apps@favo02.github.com", "name": "Workspaces indicator by open apps", "pname": "workspaces-indicator-by-open-apps", "description": "Display a simple workspace indicator showing icons of apps open in it.\n\nFeatures:\n\n- Show a simple indicator to display workspaces and apps open in it\n- Support for drag and drop: change an application workspace just dragging its icon\n- Right/Left click to focus/minimize application, Middle click to close\n- Workspaces scrolling: change active workspace scrolling hover the indicator\n- Support for multiple monitor (for both static and dynamic workspaces)\n- Rename workspaces directly from the extension (activate in settings)\n- Hide/show GNOME default workspace indicator (former activities button)\n\nCustomization:\n\n- Indicator position\n- Mouse scroll direction (normal or inverse)\n- Activate/deactivate 'middle click to close app'\n- Activate/deactivate 'click on active workspace to overview'\n- Activate/deactivate 'click on focused application to minimize'\n- Activate/deactivate 'workspace indicator'\n- Activate/deactivate 'app indicator'\n- Customize indicator color\n- Activate/deactivate 'round borders'\n- Show/Hide workspaces names\n- Show/Hide empty workspaces\n- Customize apps on all workspaces text indicator\n- Desaturate all icons\n- No effect/Reduce opacity/Desaturate for both minimized and inactive apps\n- Limit icons per workspace\n- Group icons of same application\n- Ignore applications (with regex)\n- Spacing and Size of applications icons and labels", "link": "https://extensions.gnome.org/extension/5967/workspaces-indicator-by-open-apps/", "shell_version_map": {
     "40": {"version": "8", "sha256": "1iimby4wglgyrfx20la0kp9wdnfz3y6868n2044qvda2fbwxdx5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuVXNhZ2UgYW5kIGN1c3RvbWl6YXRpb246XG4tIFN1cHBvcnQgZm9yIGRyYWcgYW5kIGRyb3A6IGNoYW5nZSBhbiBhcHBsaWNhdGlvbiB3b3Jrc3BhY2UganVzdCBkcmFnZ2luZyBpdHMgaWNvblxuLSBSaWdodC9MZWZ0IGNsaWNrIHRvIGZvY3VzIGFwcGxpY2F0aW9uLCBNaWRkbGUgY2xpY2sgdG8gY2xvc2Vcbi0gV29ya3NwYWNlcyBzY3JvbGxpbmc6IGNoYW5nZSBhY3RpdmUgd29ya3NwYWNlIHNjcm9sbGluZyBob3ZlciB0aGUgaW5kaWNhdG9yXG4tIFRvZ2dsZSBhcHBsaWNhdGlvbiBpY29ucyBkZXNhdHVyYXRpb25cbi0gU2hvdy9IaWRlIHdvcmtzcGFjZXMgaW5kZXggbGFiZWxcbi0gU2hvdy9IaWRlIGFjdGl2ZSB3b3Jrc3BhY2UgYW5kIGZvY3VzZWQgYXBwIGluZGljYXRvclxuLSBDaGFuZ2UgaW5kaWNhdG9yIHN0eWxlIGFuZCBjb2xvclxuLSBTdXBwb3J0IGZvciBtdWx0aXBsZSBtb25pdG9yIChmb3IgYm90aCBzdGF0aWMgYW5kIGR5bmFtaWMgd29ya3NwYWNlcylcbi0gW05FVyFdIEhpZGUgZW1wdHkgd29ya3NwYWNlc1xuLSBbTkVXIV0gUmVuYW1lIHdvcmtzcGFjZXMgZGlyZWN0bHkgZnJvbSB0aGUgZXh0ZW5zaW9uIChzd2l0Y2ggd29ya3NwYWNlIHRvIGFwcGx5IG5ldyBuYW1lKVxuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIGluZGljYXRvciBieSBvcGVuIGFwcHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Zhdm8wMi93b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwcyIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1ieS1vcGVuLWFwcHNAZmF2bzAyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
@@ -6224,8 +6537,9 @@
     "42": {"version": "13", "sha256": "1qmwvsv7g5lh7yri6m8c3r18zhvr6bh2wcchlgydyzfdkdsvjpid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG5cbkN1c3RvbWl6YXRpb246XG5cbi0gSW5kaWNhdG9yIHBvc2l0aW9uXG4tIFNjcm9sbCBkaXJlY3Rpb24gKG5vcm1hbCBvciBpbnZlcnNlKVxuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICdtaWRkbGUgY2xpY2sgdG8gY2xvc2UgYXBwJ1xuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICd3b3Jrc3BhY2UgaW5kaWNhdG9yJ1xuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICdhcHAgaW5kaWNhdG9yJ1xuLSBDdXN0b21pemUgaW5kaWNhdG9yIGNvbG9yXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3JvdW5kIGJvcmRlcnMnXG4tIFNob3cvSGlkZSB3b3Jrc3BhY2VzIG5hbWVzXG4tIFNob3cvSGlkZSBlbXB0eSB3b3Jrc3BhY2VzXG4tIEN1c3RvbWl6ZSBhcHBzIG9uIGFsbCB3b3Jrc3BhY2VzIHRleHQgaW5kaWNhdG9yXG4tIERlc2F0dXJhdGUgYWxsIGljb25zXG4tIE5vIGVmZmVjdC9SZWR1Y2Ugb3BhY2l0eS9EZXNhdHVyYXRlIGZvciBib3RoIG1pbmltaXplZCBhbmQgaW5hY3RpdmUgYXBwc1xuLSBMaW1pdCBpY29ucyBwZXIgd29ya3NwYWNlXG4tIEdyb3VwIGljb25zIG9mIHNhbWUgYXBwbGljYXRpb25cbiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlcyBpbmRpY2F0b3IgYnkgb3BlbiBhcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRmF2bzAyL3dvcmtzcGFjZXMtYnktb3Blbi1hcHBzIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwc0BmYXZvMDIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
     "43": {"version": "13", "sha256": "1qmwvsv7g5lh7yri6m8c3r18zhvr6bh2wcchlgydyzfdkdsvjpid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG5cbkN1c3RvbWl6YXRpb246XG5cbi0gSW5kaWNhdG9yIHBvc2l0aW9uXG4tIFNjcm9sbCBkaXJlY3Rpb24gKG5vcm1hbCBvciBpbnZlcnNlKVxuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICdtaWRkbGUgY2xpY2sgdG8gY2xvc2UgYXBwJ1xuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICd3b3Jrc3BhY2UgaW5kaWNhdG9yJ1xuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICdhcHAgaW5kaWNhdG9yJ1xuLSBDdXN0b21pemUgaW5kaWNhdG9yIGNvbG9yXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3JvdW5kIGJvcmRlcnMnXG4tIFNob3cvSGlkZSB3b3Jrc3BhY2VzIG5hbWVzXG4tIFNob3cvSGlkZSBlbXB0eSB3b3Jrc3BhY2VzXG4tIEN1c3RvbWl6ZSBhcHBzIG9uIGFsbCB3b3Jrc3BhY2VzIHRleHQgaW5kaWNhdG9yXG4tIERlc2F0dXJhdGUgYWxsIGljb25zXG4tIE5vIGVmZmVjdC9SZWR1Y2Ugb3BhY2l0eS9EZXNhdHVyYXRlIGZvciBib3RoIG1pbmltaXplZCBhbmQgaW5hY3RpdmUgYXBwc1xuLSBMaW1pdCBpY29ucyBwZXIgd29ya3NwYWNlXG4tIEdyb3VwIGljb25zIG9mIHNhbWUgYXBwbGljYXRpb25cbiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlcyBpbmRpY2F0b3IgYnkgb3BlbiBhcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRmF2bzAyL3dvcmtzcGFjZXMtYnktb3Blbi1hcHBzIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwc0BmYXZvMDIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
     "44": {"version": "13", "sha256": "1qmwvsv7g5lh7yri6m8c3r18zhvr6bh2wcchlgydyzfdkdsvjpid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG5cbkN1c3RvbWl6YXRpb246XG5cbi0gSW5kaWNhdG9yIHBvc2l0aW9uXG4tIFNjcm9sbCBkaXJlY3Rpb24gKG5vcm1hbCBvciBpbnZlcnNlKVxuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICdtaWRkbGUgY2xpY2sgdG8gY2xvc2UgYXBwJ1xuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICd3b3Jrc3BhY2UgaW5kaWNhdG9yJ1xuLSBBY3RpdmF0ZS9kZWFjdGl2YXRlICdhcHAgaW5kaWNhdG9yJ1xuLSBDdXN0b21pemUgaW5kaWNhdG9yIGNvbG9yXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3JvdW5kIGJvcmRlcnMnXG4tIFNob3cvSGlkZSB3b3Jrc3BhY2VzIG5hbWVzXG4tIFNob3cvSGlkZSBlbXB0eSB3b3Jrc3BhY2VzXG4tIEN1c3RvbWl6ZSBhcHBzIG9uIGFsbCB3b3Jrc3BhY2VzIHRleHQgaW5kaWNhdG9yXG4tIERlc2F0dXJhdGUgYWxsIGljb25zXG4tIE5vIGVmZmVjdC9SZWR1Y2Ugb3BhY2l0eS9EZXNhdHVyYXRlIGZvciBib3RoIG1pbmltaXplZCBhbmQgaW5hY3RpdmUgYXBwc1xuLSBMaW1pdCBpY29ucyBwZXIgd29ya3NwYWNlXG4tIEdyb3VwIGljb25zIG9mIHNhbWUgYXBwbGljYXRpb25cbiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlcyBpbmRpY2F0b3IgYnkgb3BlbiBhcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRmF2bzAyL3dvcmtzcGFjZXMtYnktb3Blbi1hcHBzIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwc0BmYXZvMDIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "45": {"version": "19", "sha256": "1c140xhvh8c6smm0kfrfq2gglxc5nx4h0k88lakhidl7kikfls1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMvbWluaW1pemUgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG4tIEhpZGUvc2hvdyBHTk9NRSBkZWZhdWx0IHdvcmtzcGFjZSBpbmRpY2F0b3IgKGZvcm1lciBhY3Rpdml0aWVzIGJ1dHRvbilcblxuQ3VzdG9taXphdGlvbjpcblxuLSBJbmRpY2F0b3IgcG9zaXRpb25cbi0gTW91c2Ugc2Nyb2xsIGRpcmVjdGlvbiAobm9ybWFsIG9yIGludmVyc2UpXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ21pZGRsZSBjbGljayB0byBjbG9zZSBhcHAnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGFjdGl2ZSB3b3Jrc3BhY2UgdG8gb3ZlcnZpZXcnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGZvY3VzZWQgYXBwbGljYXRpb24gdG8gbWluaW1pemUnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3dvcmtzcGFjZSBpbmRpY2F0b3InXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2FwcCBpbmRpY2F0b3InXG4tIEN1c3RvbWl6ZSBpbmRpY2F0b3IgY29sb3Jcbi0gQWN0aXZhdGUvZGVhY3RpdmF0ZSAncm91bmQgYm9yZGVycydcbi0gU2hvdy9IaWRlIHdvcmtzcGFjZXMgbmFtZXNcbi0gU2hvdy9IaWRlIGVtcHR5IHdvcmtzcGFjZXNcbi0gQ3VzdG9taXplIGFwcHMgb24gYWxsIHdvcmtzcGFjZXMgdGV4dCBpbmRpY2F0b3Jcbi0gRGVzYXR1cmF0ZSBhbGwgaWNvbnNcbi0gTm8gZWZmZWN0L1JlZHVjZSBvcGFjaXR5L0Rlc2F0dXJhdGUgZm9yIGJvdGggbWluaW1pemVkIGFuZCBpbmFjdGl2ZSBhcHBzXG4tIExpbWl0IGljb25zIHBlciB3b3Jrc3BhY2Vcbi0gR3JvdXAgaWNvbnMgb2Ygc2FtZSBhcHBsaWNhdGlvblxuLSBJZ25vcmUgYXBwbGljYXRpb25zICh3aXRoIHJlZ2V4KVxuLSBTcGFjaW5nIGFuZCBTaXplIG9mIGFwcGxpY2F0aW9ucyBpY29ucyBhbmQgbGFiZWxzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIGluZGljYXRvciBieSBvcGVuIGFwcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlcy1pbmRpY2F0b3ItYnktb3Blbi1hcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GYXZvMDIvd29ya3NwYWNlcy1ieS1vcGVuLWFwcHMiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYnktb3Blbi1hcHBzQGZhdm8wMi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="},
-    "46": {"version": "19", "sha256": "1c140xhvh8c6smm0kfrfq2gglxc5nx4h0k88lakhidl7kikfls1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMvbWluaW1pemUgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG4tIEhpZGUvc2hvdyBHTk9NRSBkZWZhdWx0IHdvcmtzcGFjZSBpbmRpY2F0b3IgKGZvcm1lciBhY3Rpdml0aWVzIGJ1dHRvbilcblxuQ3VzdG9taXphdGlvbjpcblxuLSBJbmRpY2F0b3IgcG9zaXRpb25cbi0gTW91c2Ugc2Nyb2xsIGRpcmVjdGlvbiAobm9ybWFsIG9yIGludmVyc2UpXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ21pZGRsZSBjbGljayB0byBjbG9zZSBhcHAnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGFjdGl2ZSB3b3Jrc3BhY2UgdG8gb3ZlcnZpZXcnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGZvY3VzZWQgYXBwbGljYXRpb24gdG8gbWluaW1pemUnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3dvcmtzcGFjZSBpbmRpY2F0b3InXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2FwcCBpbmRpY2F0b3InXG4tIEN1c3RvbWl6ZSBpbmRpY2F0b3IgY29sb3Jcbi0gQWN0aXZhdGUvZGVhY3RpdmF0ZSAncm91bmQgYm9yZGVycydcbi0gU2hvdy9IaWRlIHdvcmtzcGFjZXMgbmFtZXNcbi0gU2hvdy9IaWRlIGVtcHR5IHdvcmtzcGFjZXNcbi0gQ3VzdG9taXplIGFwcHMgb24gYWxsIHdvcmtzcGFjZXMgdGV4dCBpbmRpY2F0b3Jcbi0gRGVzYXR1cmF0ZSBhbGwgaWNvbnNcbi0gTm8gZWZmZWN0L1JlZHVjZSBvcGFjaXR5L0Rlc2F0dXJhdGUgZm9yIGJvdGggbWluaW1pemVkIGFuZCBpbmFjdGl2ZSBhcHBzXG4tIExpbWl0IGljb25zIHBlciB3b3Jrc3BhY2Vcbi0gR3JvdXAgaWNvbnMgb2Ygc2FtZSBhcHBsaWNhdGlvblxuLSBJZ25vcmUgYXBwbGljYXRpb25zICh3aXRoIHJlZ2V4KVxuLSBTcGFjaW5nIGFuZCBTaXplIG9mIGFwcGxpY2F0aW9ucyBpY29ucyBhbmQgbGFiZWxzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIGluZGljYXRvciBieSBvcGVuIGFwcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlcy1pbmRpY2F0b3ItYnktb3Blbi1hcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GYXZvMDIvd29ya3NwYWNlcy1ieS1vcGVuLWFwcHMiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYnktb3Blbi1hcHBzQGZhdm8wMi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}
+    "45": {"version": "20", "sha256": "18vm4qgbm8x6gzmg1634a931a1y3p8pgg15smcqdfyj5a7jlwvf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMvbWluaW1pemUgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG4tIEhpZGUvc2hvdyBHTk9NRSBkZWZhdWx0IHdvcmtzcGFjZSBpbmRpY2F0b3IgKGZvcm1lciBhY3Rpdml0aWVzIGJ1dHRvbilcblxuQ3VzdG9taXphdGlvbjpcblxuLSBJbmRpY2F0b3IgcG9zaXRpb25cbi0gTW91c2Ugc2Nyb2xsIGRpcmVjdGlvbiAobm9ybWFsIG9yIGludmVyc2UpXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ21pZGRsZSBjbGljayB0byBjbG9zZSBhcHAnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGFjdGl2ZSB3b3Jrc3BhY2UgdG8gb3ZlcnZpZXcnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGZvY3VzZWQgYXBwbGljYXRpb24gdG8gbWluaW1pemUnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3dvcmtzcGFjZSBpbmRpY2F0b3InXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2FwcCBpbmRpY2F0b3InXG4tIEN1c3RvbWl6ZSBpbmRpY2F0b3IgY29sb3Jcbi0gQWN0aXZhdGUvZGVhY3RpdmF0ZSAncm91bmQgYm9yZGVycydcbi0gU2hvdy9IaWRlIHdvcmtzcGFjZXMgbmFtZXNcbi0gU2hvdy9IaWRlIGVtcHR5IHdvcmtzcGFjZXNcbi0gQ3VzdG9taXplIGFwcHMgb24gYWxsIHdvcmtzcGFjZXMgdGV4dCBpbmRpY2F0b3Jcbi0gRGVzYXR1cmF0ZSBhbGwgaWNvbnNcbi0gTm8gZWZmZWN0L1JlZHVjZSBvcGFjaXR5L0Rlc2F0dXJhdGUgZm9yIGJvdGggbWluaW1pemVkIGFuZCBpbmFjdGl2ZSBhcHBzXG4tIExpbWl0IGljb25zIHBlciB3b3Jrc3BhY2Vcbi0gR3JvdXAgaWNvbnMgb2Ygc2FtZSBhcHBsaWNhdGlvblxuLSBJZ25vcmUgYXBwbGljYXRpb25zICh3aXRoIHJlZ2V4KVxuLSBTcGFjaW5nIGFuZCBTaXplIG9mIGFwcGxpY2F0aW9ucyBpY29ucyBhbmQgbGFiZWxzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIGluZGljYXRvciBieSBvcGVuIGFwcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlcy1pbmRpY2F0b3ItYnktb3Blbi1hcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRmF2bzAyL3dvcmtzcGFjZXMtYnktb3Blbi1hcHBzIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwc0BmYXZvMDIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "46": {"version": "20", "sha256": "18vm4qgbm8x6gzmg1634a931a1y3p8pgg15smcqdfyj5a7jlwvf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMvbWluaW1pemUgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG4tIEhpZGUvc2hvdyBHTk9NRSBkZWZhdWx0IHdvcmtzcGFjZSBpbmRpY2F0b3IgKGZvcm1lciBhY3Rpdml0aWVzIGJ1dHRvbilcblxuQ3VzdG9taXphdGlvbjpcblxuLSBJbmRpY2F0b3IgcG9zaXRpb25cbi0gTW91c2Ugc2Nyb2xsIGRpcmVjdGlvbiAobm9ybWFsIG9yIGludmVyc2UpXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ21pZGRsZSBjbGljayB0byBjbG9zZSBhcHAnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGFjdGl2ZSB3b3Jrc3BhY2UgdG8gb3ZlcnZpZXcnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGZvY3VzZWQgYXBwbGljYXRpb24gdG8gbWluaW1pemUnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3dvcmtzcGFjZSBpbmRpY2F0b3InXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2FwcCBpbmRpY2F0b3InXG4tIEN1c3RvbWl6ZSBpbmRpY2F0b3IgY29sb3Jcbi0gQWN0aXZhdGUvZGVhY3RpdmF0ZSAncm91bmQgYm9yZGVycydcbi0gU2hvdy9IaWRlIHdvcmtzcGFjZXMgbmFtZXNcbi0gU2hvdy9IaWRlIGVtcHR5IHdvcmtzcGFjZXNcbi0gQ3VzdG9taXplIGFwcHMgb24gYWxsIHdvcmtzcGFjZXMgdGV4dCBpbmRpY2F0b3Jcbi0gRGVzYXR1cmF0ZSBhbGwgaWNvbnNcbi0gTm8gZWZmZWN0L1JlZHVjZSBvcGFjaXR5L0Rlc2F0dXJhdGUgZm9yIGJvdGggbWluaW1pemVkIGFuZCBpbmFjdGl2ZSBhcHBzXG4tIExpbWl0IGljb25zIHBlciB3b3Jrc3BhY2Vcbi0gR3JvdXAgaWNvbnMgb2Ygc2FtZSBhcHBsaWNhdGlvblxuLSBJZ25vcmUgYXBwbGljYXRpb25zICh3aXRoIHJlZ2V4KVxuLSBTcGFjaW5nIGFuZCBTaXplIG9mIGFwcGxpY2F0aW9ucyBpY29ucyBhbmQgbGFiZWxzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIGluZGljYXRvciBieSBvcGVuIGFwcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlcy1pbmRpY2F0b3ItYnktb3Blbi1hcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRmF2bzAyL3dvcmtzcGFjZXMtYnktb3Blbi1hcHBzIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwc0BmYXZvMDIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
+    "47": {"version": "20", "sha256": "18vm4qgbm8x6gzmg1634a931a1y3p8pgg15smcqdfyj5a7jlwvf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBzaW1wbGUgd29ya3NwYWNlIGluZGljYXRvciBzaG93aW5nIGljb25zIG9mIGFwcHMgb3BlbiBpbiBpdC5cblxuRmVhdHVyZXM6XG5cbi0gU2hvdyBhIHNpbXBsZSBpbmRpY2F0b3IgdG8gZGlzcGxheSB3b3Jrc3BhY2VzIGFuZCBhcHBzIG9wZW4gaW4gaXRcbi0gU3VwcG9ydCBmb3IgZHJhZyBhbmQgZHJvcDogY2hhbmdlIGFuIGFwcGxpY2F0aW9uIHdvcmtzcGFjZSBqdXN0IGRyYWdnaW5nIGl0cyBpY29uXG4tIFJpZ2h0L0xlZnQgY2xpY2sgdG8gZm9jdXMvbWluaW1pemUgYXBwbGljYXRpb24sIE1pZGRsZSBjbGljayB0byBjbG9zZVxuLSBXb3Jrc3BhY2VzIHNjcm9sbGluZzogY2hhbmdlIGFjdGl2ZSB3b3Jrc3BhY2Ugc2Nyb2xsaW5nIGhvdmVyIHRoZSBpbmRpY2F0b3Jcbi0gU3VwcG9ydCBmb3IgbXVsdGlwbGUgbW9uaXRvciAoZm9yIGJvdGggc3RhdGljIGFuZCBkeW5hbWljIHdvcmtzcGFjZXMpXG4tIFJlbmFtZSB3b3Jrc3BhY2VzIGRpcmVjdGx5IGZyb20gdGhlIGV4dGVuc2lvbiAoYWN0aXZhdGUgaW4gc2V0dGluZ3MpXG4tIEhpZGUvc2hvdyBHTk9NRSBkZWZhdWx0IHdvcmtzcGFjZSBpbmRpY2F0b3IgKGZvcm1lciBhY3Rpdml0aWVzIGJ1dHRvbilcblxuQ3VzdG9taXphdGlvbjpcblxuLSBJbmRpY2F0b3IgcG9zaXRpb25cbi0gTW91c2Ugc2Nyb2xsIGRpcmVjdGlvbiAobm9ybWFsIG9yIGludmVyc2UpXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ21pZGRsZSBjbGljayB0byBjbG9zZSBhcHAnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGFjdGl2ZSB3b3Jrc3BhY2UgdG8gb3ZlcnZpZXcnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2NsaWNrIG9uIGZvY3VzZWQgYXBwbGljYXRpb24gdG8gbWluaW1pemUnXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ3dvcmtzcGFjZSBpbmRpY2F0b3InXG4tIEFjdGl2YXRlL2RlYWN0aXZhdGUgJ2FwcCBpbmRpY2F0b3InXG4tIEN1c3RvbWl6ZSBpbmRpY2F0b3IgY29sb3Jcbi0gQWN0aXZhdGUvZGVhY3RpdmF0ZSAncm91bmQgYm9yZGVycydcbi0gU2hvdy9IaWRlIHdvcmtzcGFjZXMgbmFtZXNcbi0gU2hvdy9IaWRlIGVtcHR5IHdvcmtzcGFjZXNcbi0gQ3VzdG9taXplIGFwcHMgb24gYWxsIHdvcmtzcGFjZXMgdGV4dCBpbmRpY2F0b3Jcbi0gRGVzYXR1cmF0ZSBhbGwgaWNvbnNcbi0gTm8gZWZmZWN0L1JlZHVjZSBvcGFjaXR5L0Rlc2F0dXJhdGUgZm9yIGJvdGggbWluaW1pemVkIGFuZCBpbmFjdGl2ZSBhcHBzXG4tIExpbWl0IGljb25zIHBlciB3b3Jrc3BhY2Vcbi0gR3JvdXAgaWNvbnMgb2Ygc2FtZSBhcHBsaWNhdGlvblxuLSBJZ25vcmUgYXBwbGljYXRpb25zICh3aXRoIHJlZ2V4KVxuLSBTcGFjaW5nIGFuZCBTaXplIG9mIGFwcGxpY2F0aW9ucyBpY29ucyBhbmQgbGFiZWxzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIGluZGljYXRvciBieSBvcGVuIGFwcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlcy1pbmRpY2F0b3ItYnktb3Blbi1hcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRmF2bzAyL3dvcmtzcGFjZXMtYnktb3Blbi1hcHBzIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2VzLWJ5LW9wZW4tYXBwc0BmYXZvMDIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}
   }}
 , {"uuid": "fshyperlinks@nuclear.polygon", "name": "FS Hyperlinks", "pname": "fs-hyperlinks", "description": "Select a path to jump there (When Ctrl is down)\nAlt+J to open file or directory with default app (when its path is in clipboard)", "link": "https://extensions.gnome.org/extension/5970/fs-hyperlinks/", "shell_version_map": {
     "38": {"version": "5", "sha256": "0q6gsl75vivslv9yw8ik5pfapdz4ivvr9bmai2pjy2ls7cw9zf9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbGVjdCBhIHBhdGggdG8ganVtcCB0aGVyZSAoV2hlbiBDdHJsIGlzIGRvd24pXG5BbHQrSiB0byBvcGVuIGZpbGUgb3IgZGlyZWN0b3J5IHdpdGggZGVmYXVsdCBhcHAgKHdoZW4gaXRzIHBhdGggaXMgaW4gY2xpcGJvYXJkKSIsCiAgIm5hbWUiOiAiRlMgSHlwZXJsaW5rcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVjbGVhcnBvbHlnb24vZnNfaHlwZXJsaW5rc19nbm9tZV9leHRlbnNpb24iLAogICJ1dWlkIjogImZzaHlwZXJsaW5rc0BudWNsZWFyLnBvbHlnb24iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -6241,24 +6555,27 @@
     "42": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"},
     "43": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"},
     "44": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"},
-    "45": {"version": "148", "sha256": "1pawcn0yg0qqqahi0r1nb0rja690bzq6fsrq85al629fkbmy4s2i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQ4Cn0="},
-    "46": {"version": "148", "sha256": "1pawcn0yg0qqqahi0r1nb0rja690bzq6fsrq85al629fkbmy4s2i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQ4Cn0="}
+    "45": {"version": "155", "sha256": "09i8dyp1h4wmlp53sk3qxiirdpzf86haiksv9qp49k94vcb1hjnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTU1Cn0="},
+    "46": {"version": "155", "sha256": "09i8dyp1h4wmlp53sk3qxiirdpzf86haiksv9qp49k94vcb1hjnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTU1Cn0="}
   }}
 , {"uuid": "dim-completed-calendar-events@marcinjahn.com", "name": "Dim Completed Calendar Events", "pname": "dim-completed-calendar-events", "description": "Dim completed events in the top panel menu to easily distinguish between upcoming and past events. You can also highlight events that are ongoing.", "link": "https://extensions.gnome.org/extension/5979/dim-completed-calendar-events/", "shell_version_map": {
     "44": {"version": "3", "sha256": "0dpyrhdc70f77wv8hx7d6xnpxx13c2qfp7dbx716mqq90raij39f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLWRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLWNvbXBsZXRlZC1jYWxlbmRhci1ldmVudHNAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
     "45": {"version": "4", "sha256": "0lrqbzbrw99r758armm7gikja4jzi6wfqzsnan01lj15qbzgf64h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLWRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLWNvbXBsZXRlZC1jYWxlbmRhci1ldmVudHNAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
-    "46": {"version": "5", "sha256": "0rdp7fx18my7rdxgq35v285kzzhzrc30dyfd05i6nq3nzjpz7a08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLWRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLWNvbXBsZXRlZC1jYWxlbmRhci1ldmVudHNAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}
+    "46": {"version": "7", "sha256": "0vida7vy2pfbis1ccawr8q3lq1hj9k7hdvqbjjjmp21qjs2vdn0a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1kaW0tY29tcGxldGVkLWNhbGVuZGFyLWV2ZW50cy1leHRlbnNpb24iLAogICJ1dWlkIjogImRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "8", "sha256": "1madb1savpiwwfyli7x6g39fa5jhapr4h9pipjdk9pdb7ywqydbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLWRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLWNvbXBsZXRlZC1jYWxlbmRhci1ldmVudHNAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "cloudflare-warp-toggle@khaled.is-a.dev", "name": "Cloudflare Warp Toggle", "pname": "cloudflare-warp-toggle", "description": "Toggle cloudflare warp in quick settings.\nThis extension depends on warp-cli parsing. To quickly get started, Read the Docs: https://github.com/khaled-0/gnome-cloudflare-warp-toggle#readme  \n\nThis extension is not affiliated, funded, or in any way associated with Cloudflare.\nTo Setup warp-cli, follow the official guide: https://developers.cloudflare.com/warp-client/get-started/linux/", "link": "https://extensions.gnome.org/extension/5982/cloudflare-warp-toggle/", "shell_version_map": {
-    "43": {"version": "11", "sha256": "0mb6rxl2qq4lajj02kkl8rjl6zwa2bx9iq5lp09iwypavxc192ng", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toYWxlZC0wL2dub21lLWNsb3VkZmxhcmUtd2FycC10b2dnbGUiLAogICJ1dWlkIjogImNsb3VkZmxhcmUtd2FycC10b2dnbGVAa2hhbGVkLmlzLWEuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="},
-    "44": {"version": "11", "sha256": "0mb6rxl2qq4lajj02kkl8rjl6zwa2bx9iq5lp09iwypavxc192ng", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toYWxlZC0wL2dub21lLWNsb3VkZmxhcmUtd2FycC10b2dnbGUiLAogICJ1dWlkIjogImNsb3VkZmxhcmUtd2FycC10b2dnbGVAa2hhbGVkLmlzLWEuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="},
-    "45": {"version": "13", "sha256": "18s2gag3h9dsh93464n35dh746w2865417yca7pxqhcawasvswsa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toYWxlZC0wL2dub21lLWNsb3VkZmxhcmUtd2FycC10b2dnbGUiLAogICJ1dWlkIjogImNsb3VkZmxhcmUtd2FycC10b2dnbGVAa2hhbGVkLmlzLWEuZGV2IiwKICAidmVyc2lvbiI6IDEzCn0="},
-    "46": {"version": "13", "sha256": "18s2gag3h9dsh93464n35dh746w2865417yca7pxqhcawasvswsa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toYWxlZC0wL2dub21lLWNsb3VkZmxhcmUtd2FycC10b2dnbGUiLAogICJ1dWlkIjogImNsb3VkZmxhcmUtd2FycC10b2dnbGVAa2hhbGVkLmlzLWEuZGV2IiwKICAidmVyc2lvbiI6IDEzCn0="}
+    "43": {"version": "15", "sha256": "0f7r2jaqiyg4smz0m2hjdkgz53h8c5js3jnv966y9gnydj1s6mps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toYWxlZC0wL2dub21lLWNsb3VkZmxhcmUtd2FycC10b2dnbGUiLAogICJ1dWlkIjogImNsb3VkZmxhcmUtd2FycC10b2dnbGVAa2hhbGVkLmlzLWEuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="},
+    "44": {"version": "15", "sha256": "0f7r2jaqiyg4smz0m2hjdkgz53h8c5js3jnv966y9gnydj1s6mps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toYWxlZC0wL2dub21lLWNsb3VkZmxhcmUtd2FycC10b2dnbGUiLAogICJ1dWlkIjogImNsb3VkZmxhcmUtd2FycC10b2dnbGVAa2hhbGVkLmlzLWEuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="},
+    "45": {"version": "16", "sha256": "0qbwjrc1vgxi4k7bgkf3zz7g92h5drsc4nv6frgy87mjmxfqjr4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtdG9nZ2xlQGtoYWxlZC5pcy1hLmRldiIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "46": {"version": "16", "sha256": "0qbwjrc1vgxi4k7bgkf3zz7g92h5drsc4nv6frgy87mjmxfqjr4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtdG9nZ2xlQGtoYWxlZC5pcy1hLmRldiIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "47": {"version": "16", "sha256": "0qbwjrc1vgxi4k7bgkf3zz7g92h5drsc4nv6frgy87mjmxfqjr4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHdhcnAtY2xpIHBhcnNpbmcuIFRvIHF1aWNrbHkgZ2V0IHN0YXJ0ZWQsIFJlYWQgdGhlIERvY3M6IGh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlI3JlYWRtZSAgXG5cblRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIENsb3VkZmxhcmUuXG5UbyBTZXR1cCB3YXJwLWNsaSwgZm9sbG93IHRoZSBvZmZpY2lhbCBndWlkZTogaHR0cHM6Ly9kZXZlbG9wZXJzLmNsb3VkZmxhcmUuY29tL3dhcnAtY2xpZW50L2dldC1zdGFydGVkL2xpbnV4LyIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSBXYXJwIFRvZ2dsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGFsZWQtMC9nbm9tZS1jbG91ZGZsYXJlLXdhcnAtdG9nZ2xlIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtdG9nZ2xlQGtoYWxlZC5pcy1hLmRldiIsCiAgInZlcnNpb24iOiAxNgp9"}
   }}
 , {"uuid": "do-not-disturb-while-screen-sharing-or-recording@marcinjahn.com", "name": "Do Not Disturb While Screen Sharing Or Recording", "pname": "do-not-disturb-while-screen-sharing-or-recording", "description": "Automatically switches on the \"Do Not Disturb\" mode while screen sharing or screen recording. As soon as screen sharing/recording is over, \"Do Not Disturb\" mode will be switched back off.\nDo Not Disturb mode stops notifications from appearing on your screen to let you focus on your work. Notifications may contain sensitive content that you might not want to show to everyone while you're screen-sharing.\nNote that screen sharing will toogle \"Do Not Disturb\" only on Wayland sessions. X11 is not supported! However, screen recording toggle will work on both Wayland and X11.\nIt is likely that not all screen recording apps will trigger the extension to do its job. The extension was tested with the Gnome built-in screen recorder.", "link": "https://extensions.gnome.org/extension/5985/do-not-disturb-while-screen-sharing-or-recording/", "shell_version_map": {
     "44": {"version": "1", "sha256": "1yinlydss8zk4sk018q1jj19v9smvqg1p564p9r6m3lcf7z714bd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoZXMgb24gdGhlIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdoaWxlIHNjcmVlbiBzaGFyaW5nIG9yIHNjcmVlbiByZWNvcmRpbmcuIEFzIHNvb24gYXMgc2NyZWVuIHNoYXJpbmcvcmVjb3JkaW5nIGlzIG92ZXIsIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdpbGwgYmUgc3dpdGNoZWQgYmFjayBvZmYuXG5EbyBOb3QgRGlzdHVyYiBtb2RlIHN0b3BzIG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcgb24geW91ciBzY3JlZW4gdG8gbGV0IHlvdSBmb2N1cyBvbiB5b3VyIHdvcmsuIE5vdGlmaWNhdGlvbnMgbWF5IGNvbnRhaW4gc2Vuc2l0aXZlIGNvbnRlbnQgdGhhdCB5b3UgbWlnaHQgbm90IHdhbnQgdG8gc2hvdyB0byBldmVyeW9uZSB3aGlsZSB5b3UncmUgc2NyZWVuLXNoYXJpbmcuXG5Ob3RlIHRoYXQgc2NyZWVuIHNoYXJpbmcgd2lsbCB0b29nbGUgXCJEbyBOb3QgRGlzdHVyYlwiIG9ubHkgb24gV2F5bGFuZCBzZXNzaW9ucy4gWDExIGlzIG5vdCBzdXBwb3J0ZWQhIEhvd2V2ZXIsIHNjcmVlbiByZWNvcmRpbmcgdG9nZ2xlIHdpbGwgd29yayBvbiBib3RoIFdheWxhbmQgYW5kIFgxMS5cbkl0IGlzIGxpa2VseSB0aGF0IG5vdCBhbGwgc2NyZWVuIHJlY29yZGluZyBhcHBzIHdpbGwgdHJpZ2dlciB0aGUgZXh0ZW5zaW9uIHRvIGRvIGl0cyBqb2IuIFRoZSBleHRlbnNpb24gd2FzIHRlc3RlZCB3aXRoIHRoZSBHbm9tZSBidWlsdC1pbiBzY3JlZW4gcmVjb3JkZXIuIiwKICAibmFtZSI6ICJEbyBOb3QgRGlzdHVyYiBXaGlsZSBTY3JlZW4gU2hhcmluZyBPciBSZWNvcmRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1kby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmdAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
     "45": {"version": "2", "sha256": "119cfrskbycr0gm1yabj574dmhldcxgpw8g6vyxcvx9sxxqshf74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoZXMgb24gdGhlIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdoaWxlIHNjcmVlbiBzaGFyaW5nIG9yIHNjcmVlbiByZWNvcmRpbmcuIEFzIHNvb24gYXMgc2NyZWVuIHNoYXJpbmcvcmVjb3JkaW5nIGlzIG92ZXIsIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdpbGwgYmUgc3dpdGNoZWQgYmFjayBvZmYuXG5EbyBOb3QgRGlzdHVyYiBtb2RlIHN0b3BzIG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcgb24geW91ciBzY3JlZW4gdG8gbGV0IHlvdSBmb2N1cyBvbiB5b3VyIHdvcmsuIE5vdGlmaWNhdGlvbnMgbWF5IGNvbnRhaW4gc2Vuc2l0aXZlIGNvbnRlbnQgdGhhdCB5b3UgbWlnaHQgbm90IHdhbnQgdG8gc2hvdyB0byBldmVyeW9uZSB3aGlsZSB5b3UncmUgc2NyZWVuLXNoYXJpbmcuXG5Ob3RlIHRoYXQgc2NyZWVuIHNoYXJpbmcgd2lsbCB0b29nbGUgXCJEbyBOb3QgRGlzdHVyYlwiIG9ubHkgb24gV2F5bGFuZCBzZXNzaW9ucy4gWDExIGlzIG5vdCBzdXBwb3J0ZWQhIEhvd2V2ZXIsIHNjcmVlbiByZWNvcmRpbmcgdG9nZ2xlIHdpbGwgd29yayBvbiBib3RoIFdheWxhbmQgYW5kIFgxMS5cbkl0IGlzIGxpa2VseSB0aGF0IG5vdCBhbGwgc2NyZWVuIHJlY29yZGluZyBhcHBzIHdpbGwgdHJpZ2dlciB0aGUgZXh0ZW5zaW9uIHRvIGRvIGl0cyBqb2IuIFRoZSBleHRlbnNpb24gd2FzIHRlc3RlZCB3aXRoIHRoZSBHbm9tZSBidWlsdC1pbiBzY3JlZW4gcmVjb3JkZXIuIiwKICAibmFtZSI6ICJEbyBOb3QgRGlzdHVyYiBXaGlsZSBTY3JlZW4gU2hhcmluZyBPciBSZWNvcmRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1kby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmdAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "46": {"version": "3", "sha256": "0n3qndni29pm2r957w9a6dxknwbjkhq0ria1srfhpcsvrjcyxvrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoZXMgb24gdGhlIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdoaWxlIHNjcmVlbiBzaGFyaW5nIG9yIHNjcmVlbiByZWNvcmRpbmcuIEFzIHNvb24gYXMgc2NyZWVuIHNoYXJpbmcvcmVjb3JkaW5nIGlzIG92ZXIsIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdpbGwgYmUgc3dpdGNoZWQgYmFjayBvZmYuXG5EbyBOb3QgRGlzdHVyYiBtb2RlIHN0b3BzIG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcgb24geW91ciBzY3JlZW4gdG8gbGV0IHlvdSBmb2N1cyBvbiB5b3VyIHdvcmsuIE5vdGlmaWNhdGlvbnMgbWF5IGNvbnRhaW4gc2Vuc2l0aXZlIGNvbnRlbnQgdGhhdCB5b3UgbWlnaHQgbm90IHdhbnQgdG8gc2hvdyB0byBldmVyeW9uZSB3aGlsZSB5b3UncmUgc2NyZWVuLXNoYXJpbmcuXG5Ob3RlIHRoYXQgc2NyZWVuIHNoYXJpbmcgd2lsbCB0b29nbGUgXCJEbyBOb3QgRGlzdHVyYlwiIG9ubHkgb24gV2F5bGFuZCBzZXNzaW9ucy4gWDExIGlzIG5vdCBzdXBwb3J0ZWQhIEhvd2V2ZXIsIHNjcmVlbiByZWNvcmRpbmcgdG9nZ2xlIHdpbGwgd29yayBvbiBib3RoIFdheWxhbmQgYW5kIFgxMS5cbkl0IGlzIGxpa2VseSB0aGF0IG5vdCBhbGwgc2NyZWVuIHJlY29yZGluZyBhcHBzIHdpbGwgdHJpZ2dlciB0aGUgZXh0ZW5zaW9uIHRvIGRvIGl0cyBqb2IuIFRoZSBleHRlbnNpb24gd2FzIHRlc3RlZCB3aXRoIHRoZSBHbm9tZSBidWlsdC1pbiBzY3JlZW4gcmVjb3JkZXIuIiwKICAibmFtZSI6ICJEbyBOb3QgRGlzdHVyYiBXaGlsZSBTY3JlZW4gU2hhcmluZyBPciBSZWNvcmRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1kby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmdAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
+    "46": {"version": "3", "sha256": "0n3qndni29pm2r957w9a6dxknwbjkhq0ria1srfhpcsvrjcyxvrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoZXMgb24gdGhlIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdoaWxlIHNjcmVlbiBzaGFyaW5nIG9yIHNjcmVlbiByZWNvcmRpbmcuIEFzIHNvb24gYXMgc2NyZWVuIHNoYXJpbmcvcmVjb3JkaW5nIGlzIG92ZXIsIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdpbGwgYmUgc3dpdGNoZWQgYmFjayBvZmYuXG5EbyBOb3QgRGlzdHVyYiBtb2RlIHN0b3BzIG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcgb24geW91ciBzY3JlZW4gdG8gbGV0IHlvdSBmb2N1cyBvbiB5b3VyIHdvcmsuIE5vdGlmaWNhdGlvbnMgbWF5IGNvbnRhaW4gc2Vuc2l0aXZlIGNvbnRlbnQgdGhhdCB5b3UgbWlnaHQgbm90IHdhbnQgdG8gc2hvdyB0byBldmVyeW9uZSB3aGlsZSB5b3UncmUgc2NyZWVuLXNoYXJpbmcuXG5Ob3RlIHRoYXQgc2NyZWVuIHNoYXJpbmcgd2lsbCB0b29nbGUgXCJEbyBOb3QgRGlzdHVyYlwiIG9ubHkgb24gV2F5bGFuZCBzZXNzaW9ucy4gWDExIGlzIG5vdCBzdXBwb3J0ZWQhIEhvd2V2ZXIsIHNjcmVlbiByZWNvcmRpbmcgdG9nZ2xlIHdpbGwgd29yayBvbiBib3RoIFdheWxhbmQgYW5kIFgxMS5cbkl0IGlzIGxpa2VseSB0aGF0IG5vdCBhbGwgc2NyZWVuIHJlY29yZGluZyBhcHBzIHdpbGwgdHJpZ2dlciB0aGUgZXh0ZW5zaW9uIHRvIGRvIGl0cyBqb2IuIFRoZSBleHRlbnNpb24gd2FzIHRlc3RlZCB3aXRoIHRoZSBHbm9tZSBidWlsdC1pbiBzY3JlZW4gcmVjb3JkZXIuIiwKICAibmFtZSI6ICJEbyBOb3QgRGlzdHVyYiBXaGlsZSBTY3JlZW4gU2hhcmluZyBPciBSZWNvcmRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1kby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmdAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "47": {"version": "4", "sha256": "1rbikzbjqpmsb7afcb47hr4msd3rvsiz3iv7ia6j262kc52lj0k1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoZXMgb24gdGhlIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdoaWxlIHNjcmVlbiBzaGFyaW5nIG9yIHNjcmVlbiByZWNvcmRpbmcuIEFzIHNvb24gYXMgc2NyZWVuIHNoYXJpbmcvcmVjb3JkaW5nIGlzIG92ZXIsIFwiRG8gTm90IERpc3R1cmJcIiBtb2RlIHdpbGwgYmUgc3dpdGNoZWQgYmFjayBvZmYuXG5EbyBOb3QgRGlzdHVyYiBtb2RlIHN0b3BzIG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcgb24geW91ciBzY3JlZW4gdG8gbGV0IHlvdSBmb2N1cyBvbiB5b3VyIHdvcmsuIE5vdGlmaWNhdGlvbnMgbWF5IGNvbnRhaW4gc2Vuc2l0aXZlIGNvbnRlbnQgdGhhdCB5b3UgbWlnaHQgbm90IHdhbnQgdG8gc2hvdyB0byBldmVyeW9uZSB3aGlsZSB5b3UncmUgc2NyZWVuLXNoYXJpbmcuXG5Ob3RlIHRoYXQgc2NyZWVuIHNoYXJpbmcgd2lsbCB0b29nbGUgXCJEbyBOb3QgRGlzdHVyYlwiIG9ubHkgb24gV2F5bGFuZCBzZXNzaW9ucy4gWDExIGlzIG5vdCBzdXBwb3J0ZWQhIEhvd2V2ZXIsIHNjcmVlbiByZWNvcmRpbmcgdG9nZ2xlIHdpbGwgd29yayBvbiBib3RoIFdheWxhbmQgYW5kIFgxMS5cbkl0IGlzIGxpa2VseSB0aGF0IG5vdCBhbGwgc2NyZWVuIHJlY29yZGluZyBhcHBzIHdpbGwgdHJpZ2dlciB0aGUgZXh0ZW5zaW9uIHRvIGRvIGl0cyBqb2IuIFRoZSBleHRlbnNpb24gd2FzIHRlc3RlZCB3aXRoIHRoZSBHbm9tZSBidWlsdC1pbiBzY3JlZW4gcmVjb3JkZXIuIiwKICAibmFtZSI6ICJEbyBOb3QgRGlzdHVyYiBXaGlsZSBTY3JlZW4gU2hhcmluZyBPciBSZWNvcmRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1kby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkby1ub3QtZGlzdHVyYi13aGlsZS1zY3JlZW4tc2hhcmluZy1vci1yZWNvcmRpbmdAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "magfix@andrej.gricenko", "name": "Magfix", "pname": "magfix", "description": "Magnifier cursor shift fix.", "link": "https://extensions.gnome.org/extension/5988/magfix/", "shell_version_map": {
     "38": {"version": "3", "sha256": "1s9ril86dbbf296zi2ayflvzgvvz6r8xgj6j2k0wfmi4v2g09607", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25pZmllciBjdXJzb3Igc2hpZnQgZml4LiIsCiAgIm5hbWUiOiAiTWFnZml4IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhbmRyZWouZ3JpY2Vua29AZ21haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjMuMzguNiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHJlamdyaWNlbmtvL21hZ2ZpeCIsCiAgInV1aWQiOiAibWFnZml4QGFuZHJlai5ncmljZW5rbyIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -6273,7 +6590,7 @@
     "45": {"version": "3", "sha256": "1njbsi7ch1lh54fddm94c6ywyacvsy1pgdj38km3p5w8gg2mssf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgdGhlIExhbmd1YWdlIGluZGljYXRvciBpbiB0aGUgc3RhdHVzIGFyZWEgdG8gdXBwZXJjYXNlLiIsCiAgIm5hbWUiOiAiVXBwZXJjYXNlIExhbmd1YWdlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnVmZmVyc29sdmUvVXBwZXJjYXNlLUxhbmd1YWdlLUluZGljYXRvciIsCiAgInV1aWQiOiAidXBwZXJjYXNlLWxhbmd1YWdlLWluZGljYXRvckBidWZmZXJzb2x2ZSIsCiAgInZlcnNpb24iOiAzCn0="},
     "46": {"version": "3", "sha256": "1njbsi7ch1lh54fddm94c6ywyacvsy1pgdj38km3p5w8gg2mssf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgdGhlIExhbmd1YWdlIGluZGljYXRvciBpbiB0aGUgc3RhdHVzIGFyZWEgdG8gdXBwZXJjYXNlLiIsCiAgIm5hbWUiOiAiVXBwZXJjYXNlIExhbmd1YWdlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnVmZmVyc29sdmUvVXBwZXJjYXNlLUxhbmd1YWdlLUluZGljYXRvciIsCiAgInV1aWQiOiAidXBwZXJjYXNlLWxhbmd1YWdlLWluZGljYXRvckBidWZmZXJzb2x2ZSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
-, {"uuid": "my-hijri-date-extension@ameen-sha", "name": "Hijri Date Extension", "pname": "hijri-date-extension", "description": "Display the Hijri date in the top panel.", "link": "https://extensions.gnome.org/extension/5995/hijri-date-extension/", "shell_version_map": {
+, {"uuid": "my-hijri-date-extension@ameen-sha", "name": "Hijri Date Extension", "pname": "hijri-date-extension", "description": "Display the Hijri date in the top panel.\n\nThere can be one day difference, according to moon sightings in your area, don't rely on this for any important things. Use it for getting a rough idea of the hijri date.", "link": "https://extensions.gnome.org/extension/5995/hijri-date-extension/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1zzw95f1643y5g0xfcip0d7kpgpjkdm1dz2ai3k3y1qlg3jjgl4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIEhpanJpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkhpanJpIERhdGUgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbWVlbi1TaGEtQ2hlZXJhbmdhbi9IaWpyaS1EYXRlLUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibXktaGlqcmktZGF0ZS1leHRlbnNpb25AYW1lZW4tc2hhIiwKICAidmVyc2lvbiI6IDUKfQ=="},
     "40": {"version": "5", "sha256": "1zzw95f1643y5g0xfcip0d7kpgpjkdm1dz2ai3k3y1qlg3jjgl4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIEhpanJpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkhpanJpIERhdGUgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbWVlbi1TaGEtQ2hlZXJhbmdhbi9IaWpyaS1EYXRlLUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibXktaGlqcmktZGF0ZS1leHRlbnNpb25AYW1lZW4tc2hhIiwKICAidmVyc2lvbiI6IDUKfQ=="},
     "42": {"version": "5", "sha256": "1zzw95f1643y5g0xfcip0d7kpgpjkdm1dz2ai3k3y1qlg3jjgl4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIEhpanJpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkhpanJpIERhdGUgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbWVlbi1TaGEtQ2hlZXJhbmdhbi9IaWpyaS1EYXRlLUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibXktaGlqcmktZGF0ZS1leHRlbnNpb25AYW1lZW4tc2hhIiwKICAidmVyc2lvbiI6IDUKfQ=="}
@@ -6281,7 +6598,8 @@
 , {"uuid": "quicksettings-audio-devices-renamer@marcinjahn.com", "name": "Quick Settings Audio Devices Renamer", "pname": "quick-settings-audio-devices-renamer", "description": "It lets you change the names of your audio devices in the Quick Settings Audio Panel. This works for both speakers and microphones. It's useful when you need to switch quickly between different audio devices and their default names aren't very clear or they're a bit too explicit. This extension makes it easy to customize devices names so that, e.g. \"Speaker - Family 17h/19h HD Audio Controller\" could become just \"Laptop Speakers\". Emojis are supported as well!\n\nCheck out the https://extensions.gnome.org/extension/5964/quick-settings-audio-devices-hider/ if some device should rather be hidden than renamed", "link": "https://extensions.gnome.org/extension/6000/quick-settings-audio-devices-renamer/", "shell_version_map": {
     "44": {"version": "2", "sha256": "1gnlzgxm67iyc41vqs2scc991b3df57b9z2mfg914c5d83a2nl94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1xdWlja3NldHRpbmdzLWF1ZGlvLWRldmljZXMtcmVuYW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1yZW5hbWVyQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
     "45": {"version": "3", "sha256": "1dwbkk655a4zsd13pniprpl660qmn3mgw3zw967qzg9pr6jfi0fk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1xdWlja3NldHRpbmdzLWF1ZGlvLWRldmljZXMtcmVuYW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1yZW5hbWVyQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "4", "sha256": "1zwbbf27x2b25gizp7gp01x37xz5crpjqd8y4qzxq4rp5q6qlj0c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1xdWlja3NldHRpbmdzLWF1ZGlvLWRldmljZXMtcmVuYW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1yZW5hbWVyQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "46": {"version": "5", "sha256": "0a1jgn7h8jjx3ws7zbgvx4ylx0m1rrx9xc32gnjv0g3ng4gfr8aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJxdWlja3NldHRpbmdzLWF1ZGlvLWRldmljZXMtcmVuYW1lckBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "47": {"version": "5", "sha256": "0a1jgn7h8jjx3ws7zbgvx4ylx0m1rrx9xc32gnjv0g3ng4gfr8aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJxdWlja3NldHRpbmdzLWF1ZGlvLWRldmljZXMtcmVuYW1lckBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "cronomix@zagortenay333", "name": "Cronomix", "pname": "cronomix", "description": "All-in-one timer, stopwatch, pomodoro, alarms and todos", "link": "https://extensions.gnome.org/extension/6003/cronomix/", "shell_version_map": {
     "42": {"version": "6", "sha256": "10izaph3dg2dcqrzk4ffw10fdv41gvrggidnb236zc89437pp91j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJuYW1lIjogIkNyb25vbWl4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -6331,7 +6649,8 @@
     "43": {"version": "8", "sha256": "1p196by16zmgsy5af1jsgrm38p6vrrzh1pn2nbar6zw25pldsn8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHRvcCBiYXIgKHBhbmVsKSBvbiBkZW1hbmQgd2hpbGUgaGF2aW5nIGZ1bGwgc2NyZWVuIGNvbnRlbnQgb24gKGxpa2UgYSBZb3VUdWJlIHZpZGVvKS4gSnVzdCBob3ZlciB0aGUgbW91c2UgY3Vyc29yIHRvIHRoZSB0b3Agb2YgdGhlIHNjcmVlbiwgYW5kIHRoZSBwYW5lbCB3aWxsIHNob3cgdXAuIFRoaXMgd2F5LCB5b3UgY2FuIHF1aWNrbHkgY2hlY2sgdGhlIHRpbWUsIG9yIHN3aWNoIHNvbWUgdG9nZ2xlcy4gVGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgbWFjT1Mgb2ZmZXJzIGZvciBmdWxsIHNjcmVlbiBhcHBzLlxuXG5PbiBXYXlsYW5kLCB0byBoaWRlIHRoZSB0b3AgYmFyLCB5b3UgbmVlZCB0byBjbGljayB0aGUgcHJpbWFyeSBtb3VzZSBidXR0b24gc29tZXdoZXJlIG91dHNpZGUgb2YgdGhlIGJhci4gT24gWDExLCBqdXN0IHRha2UgdGhlIGN1cnNvciBhd2F5IGZyb20gdGhlIGJhci5cblRoaXMgZXh0ZW5zaW9uIGlzIGluY29tcGF0aWJsZSB3aXRoIEJsdXIgTXkgU2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUGVlayBUb3AgQmFyIG9uIEZ1bGxzY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcGVlay10b3AtYmFyLW9uLWZ1bGxzY3JlZW4tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZWVrLXRvcC1iYXItb24tZnVsbHNjcmVlbkBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
     "44": {"version": "8", "sha256": "1p196by16zmgsy5af1jsgrm38p6vrrzh1pn2nbar6zw25pldsn8p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHRvcCBiYXIgKHBhbmVsKSBvbiBkZW1hbmQgd2hpbGUgaGF2aW5nIGZ1bGwgc2NyZWVuIGNvbnRlbnQgb24gKGxpa2UgYSBZb3VUdWJlIHZpZGVvKS4gSnVzdCBob3ZlciB0aGUgbW91c2UgY3Vyc29yIHRvIHRoZSB0b3Agb2YgdGhlIHNjcmVlbiwgYW5kIHRoZSBwYW5lbCB3aWxsIHNob3cgdXAuIFRoaXMgd2F5LCB5b3UgY2FuIHF1aWNrbHkgY2hlY2sgdGhlIHRpbWUsIG9yIHN3aWNoIHNvbWUgdG9nZ2xlcy4gVGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgbWFjT1Mgb2ZmZXJzIGZvciBmdWxsIHNjcmVlbiBhcHBzLlxuXG5PbiBXYXlsYW5kLCB0byBoaWRlIHRoZSB0b3AgYmFyLCB5b3UgbmVlZCB0byBjbGljayB0aGUgcHJpbWFyeSBtb3VzZSBidXR0b24gc29tZXdoZXJlIG91dHNpZGUgb2YgdGhlIGJhci4gT24gWDExLCBqdXN0IHRha2UgdGhlIGN1cnNvciBhd2F5IGZyb20gdGhlIGJhci5cblRoaXMgZXh0ZW5zaW9uIGlzIGluY29tcGF0aWJsZSB3aXRoIEJsdXIgTXkgU2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUGVlayBUb3AgQmFyIG9uIEZ1bGxzY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcGVlay10b3AtYmFyLW9uLWZ1bGxzY3JlZW4tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZWVrLXRvcC1iYXItb24tZnVsbHNjcmVlbkBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
     "45": {"version": "10", "sha256": "0b9d87yizkm67clk2pk5hzsmzgm7wjjzahq11z4pcmgbsl1iw418", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHRvcCBiYXIgKHBhbmVsKSBvbiBkZW1hbmQgd2hpbGUgaGF2aW5nIGZ1bGwgc2NyZWVuIGNvbnRlbnQgb24gKGxpa2UgYSBZb3VUdWJlIHZpZGVvKS4gSnVzdCBob3ZlciB0aGUgbW91c2UgY3Vyc29yIHRvIHRoZSB0b3Agb2YgdGhlIHNjcmVlbiwgYW5kIHRoZSBwYW5lbCB3aWxsIHNob3cgdXAuIFRoaXMgd2F5LCB5b3UgY2FuIHF1aWNrbHkgY2hlY2sgdGhlIHRpbWUsIG9yIHN3aWNoIHNvbWUgdG9nZ2xlcy4gVGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgbWFjT1Mgb2ZmZXJzIGZvciBmdWxsIHNjcmVlbiBhcHBzLlxuXG5PbiBXYXlsYW5kLCB0byBoaWRlIHRoZSB0b3AgYmFyLCB5b3UgbmVlZCB0byBjbGljayB0aGUgcHJpbWFyeSBtb3VzZSBidXR0b24gc29tZXdoZXJlIG91dHNpZGUgb2YgdGhlIGJhci4gT24gWDExLCBqdXN0IHRha2UgdGhlIGN1cnNvciBhd2F5IGZyb20gdGhlIGJhci5cblRoaXMgZXh0ZW5zaW9uIGlzIGluY29tcGF0aWJsZSB3aXRoIEJsdXIgTXkgU2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUGVlayBUb3AgQmFyIG9uIEZ1bGxzY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1wZWVrLXRvcC1iYXItb24tZnVsbHNjcmVlbi1leHRlbnNpb24iLAogICJ1dWlkIjogInBlZWstdG9wLWJhci1vbi1mdWxsc2NyZWVuQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "46": {"version": "14", "sha256": "1cbcgh457k1ir370k0hvzxkns4h476v2smx10jq7z35rs91ahpd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHRvcCBiYXIgKHBhbmVsKSBvbiBkZW1hbmQgd2hpbGUgaGF2aW5nIGZ1bGwgc2NyZWVuIGNvbnRlbnQgb24gKGxpa2UgYSBZb3VUdWJlIHZpZGVvKS4gSnVzdCBob3ZlciB0aGUgbW91c2UgY3Vyc29yIHRvIHRoZSB0b3Agb2YgdGhlIHNjcmVlbiwgYW5kIHRoZSBwYW5lbCB3aWxsIHNob3cgdXAuIFRoaXMgd2F5LCB5b3UgY2FuIHF1aWNrbHkgY2hlY2sgdGhlIHRpbWUsIG9yIHN3aWNoIHNvbWUgdG9nZ2xlcy4gVGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgbWFjT1Mgb2ZmZXJzIGZvciBmdWxsIHNjcmVlbiBhcHBzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBpbmNvbXBhdGlibGUgd2l0aCBCbHVyIE15IFNoZWxsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlBlZWsgVG9wIEJhciBvbiBGdWxsc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmphaG4vZ25vbWUtcGVlay10b3AtYmFyLW9uLWZ1bGxzY3JlZW4tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZWVrLXRvcC1iYXItb24tZnVsbHNjcmVlbkBtYXJjaW5qYWhuLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "46": {"version": "15", "sha256": "1h86fm526wsj09kw9ysss3c9i27ydpizbkn7f5ygl8rpddj3pcxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHRvcCBiYXIgKHBhbmVsKSBvbiBkZW1hbmQgd2hpbGUgaGF2aW5nIGZ1bGwgc2NyZWVuIGNvbnRlbnQgb24gKGxpa2UgYSBZb3VUdWJlIHZpZGVvKS4gSnVzdCBob3ZlciB0aGUgbW91c2UgY3Vyc29yIHRvIHRoZSB0b3Agb2YgdGhlIHNjcmVlbiwgYW5kIHRoZSBwYW5lbCB3aWxsIHNob3cgdXAuIFRoaXMgd2F5LCB5b3UgY2FuIHF1aWNrbHkgY2hlY2sgdGhlIHRpbWUsIG9yIHN3aWNoIHNvbWUgdG9nZ2xlcy4gVGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgbWFjT1Mgb2ZmZXJzIGZvciBmdWxsIHNjcmVlbiBhcHBzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBpbmNvbXBhdGlibGUgd2l0aCBCbHVyIE15IFNoZWxsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlBlZWsgVG9wIEJhciBvbiBGdWxsc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXBlZWstdG9wLWJhci1vbi1mdWxsc2NyZWVuLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGVlay10b3AtYmFyLW9uLWZ1bGxzY3JlZW5AbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "1h86fm526wsj09kw9ysss3c9i27ydpizbkn7f5ygl8rpddj3pcxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHRvcCBiYXIgKHBhbmVsKSBvbiBkZW1hbmQgd2hpbGUgaGF2aW5nIGZ1bGwgc2NyZWVuIGNvbnRlbnQgb24gKGxpa2UgYSBZb3VUdWJlIHZpZGVvKS4gSnVzdCBob3ZlciB0aGUgbW91c2UgY3Vyc29yIHRvIHRoZSB0b3Agb2YgdGhlIHNjcmVlbiwgYW5kIHRoZSBwYW5lbCB3aWxsIHNob3cgdXAuIFRoaXMgd2F5LCB5b3UgY2FuIHF1aWNrbHkgY2hlY2sgdGhlIHRpbWUsIG9yIHN3aWNoIHNvbWUgdG9nZ2xlcy4gVGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgbWFjT1Mgb2ZmZXJzIGZvciBmdWxsIHNjcmVlbiBhcHBzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBpbmNvbXBhdGlibGUgd2l0aCBCbHVyIE15IFNoZWxsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlBlZWsgVG9wIEJhciBvbiBGdWxsc2NyZWVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXBlZWstdG9wLWJhci1vbi1mdWxsc2NyZWVuLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGVlay10b3AtYmFyLW9uLWZ1bGxzY3JlZW5AbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "quick@web.search", "name": "Quick Web Search", "pname": "quick-web-search", "description": "Use Super key for quick web search", "link": "https://extensions.gnome.org/extension/6051/quick-web-search/", "shell_version_map": {
     "42": {"version": "7", "sha256": "0w4irhmgdjr60lxs832a6pq3ywz6l9gd9yq5az6szqb9mv0jln5k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBTdXBlciBrZXkgZm9yIHF1aWNrIHdlYiBzZWFyY2giLAogICJuYW1lIjogIlF1aWNrIFdlYiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2t3ZWJzZWFyY2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY2hldC1idWRkeS9xdWljay13ZWItc2VhcmNoIiwKICAidXVpZCI6ICJxdWlja0B3ZWIuc2VhcmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -6341,19 +6660,22 @@
   }}
 , {"uuid": "happy-appy-hotkey@jqno.nl", "name": "Happy Appy Hotkey", "pname": "happy-appy-hotkey", "description": "Assign hotkeys to applications to give them focus or launch them\n\nFeatures:\n- Assign a hotkey to an app to:\n-- Give it focus if it's already running, or\n-- Launch it if it's not.\n- Assign a hotkey to cycle through all the apps that don't have a hotkey\n- Optionally restrict hotkeys to current workspace\n- Supports Wayland", "link": "https://extensions.gnome.org/extension/6057/happy-appy-hotkey/", "shell_version_map": {
     "44": {"version": "3", "sha256": "0fg9967jwsp24pphv1bdiz6fns2kslrg3dx4xq4q894aiwxzagrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIFN1cHBvcnRzIFdheWxhbmQiLAogICJuYW1lIjogIkhhcHB5IEFwcHkgSG90a2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtaGFwcHktYXBweS1ob3RrZXkvIiwKICAidXVpZCI6ICJoYXBweS1hcHB5LWhvdGtleUBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "45": {"version": "9", "sha256": "0byd9k12y501scfqkkq56hvmjjmll721kjx3982i4sxk4ppn4v9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1oYXBweS1hcHB5LWhvdGtleS8iLAogICJ1dWlkIjogImhhcHB5LWFwcHktaG90a2V5QGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"},
-    "46": {"version": "9", "sha256": "0byd9k12y501scfqkkq56hvmjjmll721kjx3982i4sxk4ppn4v9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1oYXBweS1hcHB5LWhvdGtleS8iLAogICJ1dWlkIjogImhhcHB5LWFwcHktaG90a2V5QGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"}
+    "45": {"version": "10", "sha256": "12q82ipqkzhaag550h1py54nj1vffrsphgv1wgdbb3znh0qykw4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtaGFwcHktYXBweS1ob3RrZXkvIiwKICAidXVpZCI6ICJoYXBweS1hcHB5LWhvdGtleUBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "46": {"version": "10", "sha256": "12q82ipqkzhaag550h1py54nj1vffrsphgv1wgdbb3znh0qykw4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtaGFwcHktYXBweS1ob3RrZXkvIiwKICAidXVpZCI6ICJoYXBweS1hcHB5LWhvdGtleUBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "47": {"version": "10", "sha256": "12q82ipqkzhaag550h1py54nj1vffrsphgv1wgdbb3znh0qykw4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtaGFwcHktYXBweS1ob3RrZXkvIiwKICAidXVpZCI6ICJoYXBweS1hcHB5LWhvdGtleUBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDEwCn0="}
   }}
 , {"uuid": "window-switcher@tbepdb", "name": "WindowSwitcher", "pname": "windowswitcher", "description": "One windows circle with Alt+tab. Another one with Super+tab(in my case instant messangers).", "link": "https://extensions.gnome.org/extension/6060/windowswitcher/", "shell_version_map": {
     "42": {"version": "2", "sha256": "1lgs3mr9384az7ybjbxpxz4dndwypz98awyg1qz8k7sfl631w3n7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbXVsdGlwbGUgd2luZG93IGJhc2VkIHN3aXRjaGVycy4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAyCn0="},
     "43": {"version": "2", "sha256": "1lgs3mr9384az7ybjbxpxz4dndwypz98awyg1qz8k7sfl631w3n7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbXVsdGlwbGUgd2luZG93IGJhc2VkIHN3aXRjaGVycy4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAyCn0="},
     "44": {"version": "2", "sha256": "1lgs3mr9384az7ybjbxpxz4dndwypz98awyg1qz8k7sfl631w3n7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbXVsdGlwbGUgd2luZG93IGJhc2VkIHN3aXRjaGVycy4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAyCn0="},
-    "45": {"version": "9", "sha256": "1ggmhcq0m968d4jg75z4c88wszf5m9jkz8p4jwf5zr5jzwn3kcin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSB3aW5kb3dzIGNpcmNsZSB3aXRoIEFsdCt0YWIuIEFub3RoZXIgb25lIHdpdGggU3VwZXIrdGFiKGluIG15IGNhc2UgaW5zdGFudCBtZXNzYW5nZXJzKS4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90YmVwZGIvd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJAdGJlcGRiIiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "46": {"version": "9", "sha256": "1ggmhcq0m968d4jg75z4c88wszf5m9jkz8p4jwf5zr5jzwn3kcin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSB3aW5kb3dzIGNpcmNsZSB3aXRoIEFsdCt0YWIuIEFub3RoZXIgb25lIHdpdGggU3VwZXIrdGFiKGluIG15IGNhc2UgaW5zdGFudCBtZXNzYW5nZXJzKS4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90YmVwZGIvd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJAdGJlcGRiIiwKICAidmVyc2lvbiI6IDkKfQ=="}
+    "45": {"version": "10", "sha256": "1gs5jxpwhgb69alwpzzdaxgk898lig8wpri9hk2l8l74ywqv20j9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSB3aW5kb3dzIGNpcmNsZSB3aXRoIEFsdCt0YWIuIEFub3RoZXIgb25lIHdpdGggU3VwZXIrdGFiKGluIG15IGNhc2UgaW5zdGFudCBtZXNzYW5nZXJzKS4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "46": {"version": "10", "sha256": "1gs5jxpwhgb69alwpzzdaxgk898lig8wpri9hk2l8l74ywqv20j9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSB3aW5kb3dzIGNpcmNsZSB3aXRoIEFsdCt0YWIuIEFub3RoZXIgb25lIHdpdGggU3VwZXIrdGFiKGluIG15IGNhc2UgaW5zdGFudCBtZXNzYW5nZXJzKS4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "47": {"version": "10", "sha256": "1gs5jxpwhgb69alwpzzdaxgk898lig8wpri9hk2l8l74ywqv20j9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSB3aW5kb3dzIGNpcmNsZSB3aXRoIEFsdCt0YWIuIEFub3RoZXIgb25lIHdpdGggU3VwZXIrdGFiKGluIG15IGNhc2UgaW5zdGFudCBtZXNzYW5nZXJzKS4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAxMAp9"}
   }}
-, {"uuid": "toggler@hedgie.tech", "name": "Toggler", "pname": "toggler", "description": "Toggle GNOME Terminal via a keyboard shortcut", "link": "https://extensions.gnome.org/extension/6063/toggler/", "shell_version_map": {
-    "45": {"version": "4", "sha256": "1kg1jj5dbxknq0685gnn7s46z5bdgzxjip2a7yq771yg7kw7qgyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBHTk9NRSBUZXJtaW5hbCB2aWEgYSBrZXlib2FyZCBzaG9ydGN1dCIsCiAgIm5hbWUiOiAiVG9nZ2xlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi10b2dnbGVyIiwKICAidXVpZCI6ICJ0b2dnbGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "46": {"version": "4", "sha256": "1kg1jj5dbxknq0685gnn7s46z5bdgzxjip2a7yq771yg7kw7qgyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBHTk9NRSBUZXJtaW5hbCB2aWEgYSBrZXlib2FyZCBzaG9ydGN1dCIsCiAgIm5hbWUiOiAiVG9nZ2xlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi10b2dnbGVyIiwKICAidXVpZCI6ICJ0b2dnbGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+, {"uuid": "toggler@hedgie.tech", "name": "Toggler", "pname": "toggler", "description": "Toggle the terminal app via a keyboard shortcut", "link": "https://extensions.gnome.org/extension/6063/toggler/", "shell_version_map": {
+    "45": {"version": "6", "sha256": "1xmir7q5jz79k60hw85jvq8pxgl651p57iksn02s015lnryjsmwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgdGVybWluYWwgYXBwIHZpYSBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAibmFtZSI6ICJUb2dnbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi10b2dnbGVyIiwKICAidXVpZCI6ICJ0b2dnbGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDYKfQ=="},
+    "46": {"version": "6", "sha256": "1xmir7q5jz79k60hw85jvq8pxgl651p57iksn02s015lnryjsmwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgdGVybWluYWwgYXBwIHZpYSBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAibmFtZSI6ICJUb2dnbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi10b2dnbGVyIiwKICAidXVpZCI6ICJ0b2dnbGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDYKfQ=="},
+    "47": {"version": "6", "sha256": "1xmir7q5jz79k60hw85jvq8pxgl651p57iksn02s015lnryjsmwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgdGVybWluYWwgYXBwIHZpYSBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAibmFtZSI6ICJUb2dnbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi10b2dnbGVyIiwKICAidXVpZCI6ICJ0b2dnbGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDYKfQ=="}
   }}
 , {"uuid": "inputmethod-shortcuts@osamu.debian.org", "name": "Input method and touchpad shortcuts", "pname": "shortcuts-to-activate-input-methods", "description": "Quick switching of input method and touchpad with user configurable shortcut binding", "link": "https://extensions.gnome.org/extension/6066/shortcuts-to-activate-input-methods/", "shell_version_map": {
     "40": {"version": "20", "sha256": "0xn4jlqg16xq61wx3nkr13k1sadm1fskixlp0qgh875pk043ly84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHN3aXRjaGluZyBvZiBpbnB1dCBtZXRob2QgYW5kIHRvdWNocGFkIHdpdGggdXNlciBjb25maWd1cmFibGUgc2hvcnRjdXQgYmluZGluZyIsCiAgIm5hbWUiOiAiSW5wdXQgbWV0aG9kIGFuZCB0b3VjaHBhZCBzaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5wdXRtZXRob2Qtc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3NhbXVhb2tpL2lucHV0bWV0aG9kLXNob3J0Y3V0cyIsCiAgInV1aWQiOiAiaW5wdXRtZXRob2Qtc2hvcnRjdXRzQG9zYW11LmRlYmlhbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
@@ -6380,13 +6702,13 @@
     "46": {"version": "7", "sha256": "1zhc78kwbh4yjfqmqsrxg5f7m8jf7adnid42rayyqgvhcgggf5dv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldywgbWF4aW1pemVkIGFuZCBmdWxsc2NyZWVuIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuRm9ya2VkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiB0byBFbXB0eSBXb3Jrc3BhY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZnVsbHNjcmVlbi10by1lbXB0eS13b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb25zYWgvZnVsbHNjcmVlbi10by1uZXctd29ya3NwYWNlIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLXRvLWVtcHR5LXdvcmtzcGFjZUBhaW9uby5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}
   }}
 , {"uuid": "fix-focus-on-workspace-switch@hiddn.github.com", "name": "Fix focus on workspace switch", "pname": "fix-focus-on-workspace-switch", "description": "When a workspace switch occurs, this extension ensures the focus is on a window located in the new workspace.\n\nThis extension is essential for a multi-monitor setup using multiple workspaces.", "link": "https://extensions.gnome.org/extension/6084/fix-focus-on-workspace-switch/", "shell_version_map": {
-    "40": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "41": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "42": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "43": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "44": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "45": {"version": "10", "sha256": "0hphxhhc0s0nwlcxjjk2ppja2xn37c1s2ij5y0x6is4yi3xiv5il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "46": {"version": "10", "sha256": "0hphxhhc0s0nwlcxjjk2ppja2xn37c1s2ij5y0x6is4yi3xiv5il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}
+    "40": {"version": "11", "sha256": "1vqv6s17rf02bvg7yrj625zq6lda57ch587047a21fn6zynq6bnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "41": {"version": "11", "sha256": "1vqv6s17rf02bvg7yrj625zq6lda57ch587047a21fn6zynq6bnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "42": {"version": "11", "sha256": "1vqv6s17rf02bvg7yrj625zq6lda57ch587047a21fn6zynq6bnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "43": {"version": "11", "sha256": "1vqv6s17rf02bvg7yrj625zq6lda57ch587047a21fn6zynq6bnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "44": {"version": "11", "sha256": "1vqv6s17rf02bvg7yrj625zq6lda57ch587047a21fn6zynq6bnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "45": {"version": "12", "sha256": "12kq9d3mxqhbb6vskxrmfxsjjkkg53m2nggx8agsivcwnp0z80wj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "46": {"version": "12", "sha256": "12kq9d3mxqhbb6vskxrmfxsjjkkg53m2nggx8agsivcwnp0z80wj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
 , {"uuid": "showip@lacodificadora.com", "name": "Show Public IP", "pname": "show-current-public-ip", "description": "Simple GNOME Shell Extension that shows your current public IP address. It's retrieved by a curl command to ip.lacodificadora.com", "link": "https://extensions.gnome.org/extension/6087/show-current-public-ip/", "shell_version_map": {
     "40": {"version": "11", "sha256": "0ij134h3nxk9lvi1zxk49n5b022gx893g41xhkpz6anci462mzz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBFeHRlbnNpb24gdGhhdCBzaG93cyB5b3VyIGN1cnJlbnQgcHVibGljIElQIGFkZHJlc3MuIEl0J3MgcmV0cmlldmVkIGJ5IGEgY3VybCBjb21tYW5kIHRvIGlwLmxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgIm5hbWUiOiAiU2hvdyBwdWJsaWMgSVAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY2FtaWxldC9zaG93LWlwLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2hvd2lwQGxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -6395,21 +6717,23 @@
     "43": {"version": "13", "sha256": "0wb5blp4kx1wasfqlwb8nh0kpcc14azm9rr5xqr4cw3wm3z2n29q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBFeHRlbnNpb24gdGhhdCBzaG93cyB5b3VyIGN1cnJlbnQgcHVibGljIElQIGFkZHJlc3MuIEl0J3MgcmV0cmlldmVkIGJ5IGEgY3VybCBjb21tYW5kIHRvIGlwLmxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgIm5hbWUiOiAiU2hvdyBQdWJsaWMgSVAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY2FtaWxldC9zaG93LWlwLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2hvd2lwQGxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
     "44": {"version": "13", "sha256": "0wb5blp4kx1wasfqlwb8nh0kpcc14azm9rr5xqr4cw3wm3z2n29q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBFeHRlbnNpb24gdGhhdCBzaG93cyB5b3VyIGN1cnJlbnQgcHVibGljIElQIGFkZHJlc3MuIEl0J3MgcmV0cmlldmVkIGJ5IGEgY3VybCBjb21tYW5kIHRvIGlwLmxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgIm5hbWUiOiAiU2hvdyBQdWJsaWMgSVAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY2FtaWxldC9zaG93LWlwLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2hvd2lwQGxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}
   }}
-, {"uuid": "smile-extension@mijorus.it", "name": "Smile - complementary extension", "pname": "smile-complementary-extension", "description": "Automatically paste Emojis from the Smile emoji picker.", "link": "https://extensions.gnome.org/extension/6096/smile-complementary-extension/", "shell_version_map": {
+, {"uuid": "smile-extension@mijorus.it", "name": "Smile - complementary extension", "pname": "smile-complementary-extension", "description": "Automatically paste Emojis from the Smile emoji picker", "link": "https://extensions.gnome.org/extension/6096/smile-complementary-extension/", "shell_version_map": {
     "42": {"version": "4", "sha256": "1nzzsm6ai8b0l8c5xvx83cspm4gzx1n6wfdrbik3g7xam06hr861", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "4", "sha256": "1nzzsm6ai8b0l8c5xvx83cspm4gzx1n6wfdrbik3g7xam06hr861", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiA0Cn0="},
     "44": {"version": "4", "sha256": "1nzzsm6ai8b0l8c5xvx83cspm4gzx1n6wfdrbik3g7xam06hr861", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "45": {"version": "8", "sha256": "1r2w9hdzp1d0x55wf6w1dwwn80cda9fg0y0adxk37qx083hkmj0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlqb3J1cy9zbWlsZS1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogInNtaWxlLWV4dGVuc2lvbkBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "1r2w9hdzp1d0x55wf6w1dwwn80cda9fg0y0adxk37qx083hkmj0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlqb3J1cy9zbWlsZS1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogInNtaWxlLWV4dGVuc2lvbkBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "10", "sha256": "0cmc56jxa87j3is8svsx3svy5i49pjgx4zc50zl790fxa3391lrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "46": {"version": "10", "sha256": "0cmc56jxa87j3is8svsx3svy5i49pjgx4zc50zl790fxa3391lrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "47": {"version": "10", "sha256": "0cmc56jxa87j3is8svsx3svy5i49pjgx4zc50zl790fxa3391lrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiAxMAp9"}
   }}
 , {"uuid": "paperwm@paperwm.github.com", "name": "PaperWM", "pname": "paperwm", "description": "Tiling window manager with a twist!\n\n PaperWM is a Gnome Shell extension which provides scrollable tiling of windows and per monitor workspaces. It's inspired by paper notebooks and tiling window managers.\n\nPlease see our github page to report issues, understand features, and learn how to configure PaperWM to your liking.", "link": "https://extensions.gnome.org/extension/6099/paperwm/", "shell_version_map": {
     "42": {"version": "101", "sha256": "1f88bvkwdvvp35ih4spxkff11n30blh043dr1xnihw8hh78bwphi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMCIKfQ=="},
     "43": {"version": "101", "sha256": "1f88bvkwdvvp35ih4spxkff11n30blh043dr1xnihw8hh78bwphi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMCIKfQ=="},
     "44": {"version": "101", "sha256": "1f88bvkwdvvp35ih4spxkff11n30blh043dr1xnihw8hh78bwphi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMCIKfQ=="},
-    "45": {"version": "121", "sha256": "1lf9m0d0prgyp5bh4mi43fqj1kzvgf7qlwv2c19civ7774hxp26q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIiwKICAgICJwYXRyZW9uIjogInZhbHBhY2tldHQiCiAgfSwKICAibmFtZSI6ICJQYXBlcldNIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhcGVyd20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMTMuNCIKfQ=="},
-    "46": {"version": "121", "sha256": "1lf9m0d0prgyp5bh4mi43fqj1kzvgf7qlwv2c19civ7774hxp26q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIiwKICAgICJwYXRyZW9uIjogInZhbHBhY2tldHQiCiAgfSwKICAibmFtZSI6ICJQYXBlcldNIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhcGVyd20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMTMuNCIKfQ=="}
+    "45": {"version": "134", "sha256": "109r204a0qp0k5gamccgxy703sl9inpj90x3zr4qwh1hshr5rpln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIgogIH0sCiAgIm5hbWUiOiAiUGFwZXJXTSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYXBlcndtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFwZXJ3bS9QYXBlcldNIiwKICAidXVpZCI6ICJwYXBlcndtQHBhcGVyd20uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMzQsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4xLjAiCn0="},
+    "46": {"version": "134", "sha256": "109r204a0qp0k5gamccgxy703sl9inpj90x3zr4qwh1hshr5rpln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIgogIH0sCiAgIm5hbWUiOiAiUGFwZXJXTSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYXBlcndtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFwZXJ3bS9QYXBlcldNIiwKICAidXVpZCI6ICJwYXBlcndtQHBhcGVyd20uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMzQsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4xLjAiCn0="},
+    "47": {"version": "134", "sha256": "109r204a0qp0k5gamccgxy703sl9inpj90x3zr4qwh1hshr5rpln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIgogIH0sCiAgIm5hbWUiOiAiUGFwZXJXTSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYXBlcndtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFwZXJ3bS9QYXBlcldNIiwKICAidXVpZCI6ICJwYXBlcndtQHBhcGVyd20uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMzQsCiAgInZlcnNpb24tbmFtZSI6ICI0Ny4xLjAiCn0="}
   }}
-, {"uuid": "lightshell@dikasp.gitlab", "name": "Light Shell", "pname": "light-shell", "description": "the missing full light style gnome shell theme you had been looking for :D\n\nNOTE: later release are merged and continue within Luminus extension. brings various improvement and dark mode integration.", "link": "https://extensions.gnome.org/extension/6102/light-shell/", "shell_version_map": {
+, {"uuid": "lightshell@dikasp.gitlab", "name": "Light Shell", "pname": "light-shell", "description": "the missing full light style gnome shell theme you had been looking for :D\n\nDeprecated with Luminus extension v46+", "link": "https://extensions.gnome.org/extension/6102/light-shell/", "shell_version_map": {
     "42": {"version": "11", "sha256": "0fqshl06w2amy8d3gw2car4rab6zqpi79dg5dr05d5swggq1vm8n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGx5IGZ1bGwgbGlnaHQgdGhlbWUgaW50byBkZWZhdWx0IGdub21lIHNoZWxsLCBpbmNsdWRpbmcgbGlnaHQgb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJMaWdodCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2xpZ2h0LXNoZWxsIiwKICAidXVpZCI6ICJsaWdodHNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "43": {"version": "10", "sha256": "09hyrcg6y1269z7fzix72g09kvvdmy40z57m8yvib8hvl9wxarfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGx5IGZ1bGwgbGlnaHQgdGhlbWUgaW50byBkZWZhdWx0IGdub21lIHNoZWxsLCBpbmNsdWRpbmcgbGlnaHQgb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJMaWdodCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2xpZ2h0LXNoZWxsIiwKICAidXVpZCI6ICJsaWdodHNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "44": {"version": "13", "sha256": "0c8prbldkrylv1mkkmkcj606sllksvdan57bf11yw1abwgqy7idm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGx5IGZ1bGwgbGlnaHQgdGhlbWUgaW50byBkZWZhdWx0IEdOT01FIFNoZWxsLCBpbmNsdWRpbmcgbGlnaHQgb3ZlcnZpZXciLAogICJuYW1lIjogIkxpZ2h0IFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbGlnaHQtc2hlbGwiLAogICJ1dWlkIjogImxpZ2h0c2hlbGxAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAxMwp9"},
@@ -6428,15 +6752,15 @@
     "44": {"version": "1", "sha256": "1194s4jh78appiqqyiyh3vilw21f5c0pyl1v9vsfsi5lhgv63h88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIFRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgd2l0aCBzdXBwb3J0IGZvciBHTk9NRSA0NC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbm9hbm5veWFuY2UtZm9yayIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UgKGZvcmspIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vYW5ub3lhbmNlLWZvcmsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIsCiAgICAiNDQuMiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ppcmthdnJiYS9ub2Fubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2UtZm9ya0B2cmJhLmRldiIsCiAgInZlcnNpb24iOiAxCn0="},
     "45": {"version": "3", "sha256": "06zz9gpy1v4cx9fzdwhmzh2ihm49vi1641gngd341lcf4m0g4syl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIFRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgd2l0aCBzdXBwb3J0IGZvciBHTk9NRSA0NS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbm9hbm5veWFuY2UtZm9yayIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UgKGZvcmspIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vYW5ub3lhbmNlLWZvcmsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamlya2F2cmJhL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZS1mb3JrQHZyYmEuZGV2IiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
-, {"uuid": "lightshellmanjaro@dikasp.gitlab", "name": "Light Shell Manjaro", "pname": "light-shell-manjaro", "description": "Unofficial Light Shell theme port for use with Manjaro's default GNOME Shell.\n\nCurrently unmaintained. Visit my gitlab for some tutorial on making your own custom Light Shell with accent color and more.", "link": "https://extensions.gnome.org/extension/6115/light-shell-manjaro/", "shell_version_map": {
+, {"uuid": "lightshellmanjaro@dikasp.gitlab", "name": "Light Shell Manjaro", "pname": "light-shell-manjaro", "description": "Unofficial Light Shell theme port for use with Manjaro's default GNOME Shell.\n\nDeprecated with Luminus extension v.47+", "link": "https://extensions.gnome.org/extension/6115/light-shell-manjaro/", "shell_version_map": {
     "42": {"version": "8", "sha256": "12qwv0lmy7v3q9cmfqw40mwyk78wl1aavlp374dg2jdsk3hh887f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgbGlnaHQgc2hlbGwgcG9ydCBmb3IgTWFuamFybyBtYWlhIHRoZW1lICh0aGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNYW5qYXJvKS4iLAogICJuYW1lIjogIkxpZ2h0IFNoZWxsIE1hbmphcm8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9saWdodC1zaGVsbCIsCiAgInV1aWQiOiAibGlnaHRzaGVsbG1hbmphcm9AZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiA4Cn0="},
     "43": {"version": "7", "sha256": "1993r6niyymypkj87fszci8yqs2z8y6q8kc3zrsaldyizs19dxkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgbGlnaHQgc2hlbGwgcG9ydCBmb3IgTWFuamFybyBtYWlhIHRoZW1lICh0aGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNYW5qYXJvKS4iLAogICJuYW1lIjogIkxpZ2h0IFNoZWxsIE1hbmphcm8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9saWdodC1zaGVsbCIsCiAgInV1aWQiOiAibGlnaHRzaGVsbG1hbmphcm9AZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiA3Cn0="},
     "44": {"version": "12", "sha256": "0vy8ki1xpjg87f65psp9q76rcw9crij1dq46f1ka19n088vggx6a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1cnJlbnRseSB1bm1haW50YWluZWQhIHZpc2l0IG15IGdpdGxhYiBmb3Igc2ltcGxlIHR1dG9yaWFsIG9uIG1ha2luZyB5b3VyIG93biBjdXN0b20gTGlnaHQgU2hlbGwgd2l0aCBhY2NlbnQgY29sb3IgYW5kIG1vcmUuIiwKICAibmFtZSI6ICJMaWdodCBTaGVsbCBNYW5qYXJvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbGlnaHQtc2hlbGwiLAogICJ1dWlkIjogImxpZ2h0c2hlbGxtYW5qYXJvQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
   }}
-, {"uuid": "lightshellubuntu@dikasp.gitlab", "name": "Light Shell Ubuntu", "pname": "light-shell-ubuntu", "description": "Unofficial Light Shell theme port for use with Ubuntu's default GNOME Shell.\n\nCurrently unmaintained! visit my gitlab for simple tutorial on making your own custom Light Shell with accent color and more.", "link": "https://extensions.gnome.org/extension/6118/light-shell-ubuntu/", "shell_version_map": {
+, {"uuid": "lightshellubuntu@dikasp.gitlab", "name": "Light Shell Ubuntu", "pname": "light-shell-ubuntu", "description": "Unofficial Light Shell theme port for use with Ubuntu's default GNOME Shell.\n\nDeprecated with Luminus extension v.47+", "link": "https://extensions.gnome.org/extension/6118/light-shell-ubuntu/", "shell_version_map": {
     "44": {"version": "4", "sha256": "1fhw7fqnaqyc8zkshrs6kwjzzqni289lq83gg70yrmib452w7b6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1cnJlbnRseSB1bm1haW50YWluZWQhIHZpc2l0IG15IGdpdGxhYiBmb3Igc2ltcGxlIHR1dG9yaWFsIG9uIG1ha2luZyB5b3VyIG93biBjdXN0b20gTGlnaHQgU2hlbGwgd2l0aCBhY2NlbnQgY29sb3IgYW5kIG1vcmUuIiwKICAibmFtZSI6ICJMaWdodCBTaGVsbCBVYnVudHUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9saWdodC1zaGVsbCIsCiAgInV1aWQiOiAibGlnaHRzaGVsbHVidW50dUBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
-, {"uuid": "blurmylightshell@dikasp.gitlab", "name": "Blur my Light Shell", "pname": "blur-my-light-shell", "description": "Light Shell version for use with Blur my Shell extension.\n\nNOTE: later release are merged and continue within Luminus extension. brings various improvement and dark mode integration.", "link": "https://extensions.gnome.org/extension/6121/blur-my-light-shell/", "shell_version_map": {
+, {"uuid": "blurmylightshell@dikasp.gitlab", "name": "Blur my Light Shell", "pname": "blur-my-light-shell", "description": "Light Shell version for use with Blur my Shell extension.\n\nDeprecated with Luminus extension v46+", "link": "https://extensions.gnome.org/extension/6121/blur-my-light-shell/", "shell_version_map": {
     "44": {"version": "4", "sha256": "19rh1137rqdlyfj309kdy21ry9dyl5apr5h2qwylf6wg7m1qa5pw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0IHNoZWxsIHBvcnQgZm9yIHVzZSB3aXRoIGJsdXIgbXkgc2hlbGwgZXh0ZW5zaW9uIChubyBuZWVkIHRvIGN1c3RvbWl6ZSBhbnl0aGluZywganVzdCBoaXQgYmx1ciBteSBzaGVsbCByZXNldCBwcmVmZXJlbmNlcyBidXR0b24gYW5kIGVuam95KS4iLAogICJuYW1lIjogIkJsdXIgbXkgTGlnaHQgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9saWdodC1zaGVsbCIsCiAgInV1aWQiOiAiYmx1cm15bGlnaHRzaGVsbEBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "45": {"version": "11", "sha256": "0x2asdav5b2jd9b4rngcq26yrv39kgvlyhscr8h4h284xd4k11gm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVEU6IGxhdGVyIHJlbGVhc2UgYXJlIG1lcmdlZCBhbmQgY29udGludWUgd2l0aGluIEx1bWludXMgZXh0ZW5zaW9uLiBicmluZ3MgdmFyaW91cyBpbXByb3ZlbWVudCBhbmQgZGFyayBtb2RlIGludGVncmF0aW9uLiIsCiAgIm5hbWUiOiAiQmx1ciBteSBMaWdodCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2xpZ2h0LXNoZWxsIiwKICAidXVpZCI6ICJibHVybXlsaWdodHNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
@@ -6450,14 +6774,16 @@
     "42": {"version": "6", "sha256": "1i11c6bq3m2hn6992lvf4kzcy8q55gs1w94li0mnvsjyr5qkdq5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuaG91c2UvdGFiLWluLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAidGFiLWluLXdvcmtzcGFjZUBqYW5ob3VzZS5sdiIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "6", "sha256": "1i11c6bq3m2hn6992lvf4kzcy8q55gs1w94li0mnvsjyr5qkdq5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuaG91c2UvdGFiLWluLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAidGFiLWluLXdvcmtzcGFjZUBqYW5ob3VzZS5sdiIsCiAgInZlcnNpb24iOiA2Cn0="},
     "44": {"version": "6", "sha256": "1i11c6bq3m2hn6992lvf4kzcy8q55gs1w94li0mnvsjyr5qkdq5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuaG91c2UvdGFiLWluLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAidGFiLWluLXdvcmtzcGFjZUBqYW5ob3VzZS5sdiIsCiAgInZlcnNpb24iOiA2Cn0="},
-    "45": {"version": "7", "sha256": "0ci7zjpkmphwp09n9wdbh54d3w1jzfp4k7rzbqj4l77gsaxpbz2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuaG91c2UvdGFiLWluLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAidGFiLWluLXdvcmtzcGFjZUBqYW5ob3VzZS5sdiIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "46": {"version": "7", "sha256": "0ci7zjpkmphwp09n9wdbh54d3w1jzfp4k7rzbqj4l77gsaxpbz2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuaG91c2UvdGFiLWluLXdvcmtzcGFjZSIsCiAgInV1aWQiOiAidGFiLWluLXdvcmtzcGFjZUBqYW5ob3VzZS5sdiIsCiAgInZlcnNpb24iOiA3Cn0="}
+    "45": {"version": "8", "sha256": "1i2q6a1bhzyaqgnfdmhgkmdw0nqd6ayyf2ffy7yqc7fmpg0wfv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phbmhvdXNlL3RhYi1pbi13b3Jrc3BhY2UiLAogICJ1dWlkIjogInRhYi1pbi13b3Jrc3BhY2VAamFuaG91c2UubHYiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "1i2q6a1bhzyaqgnfdmhgkmdw0nqd6ayyf2ffy7yqc7fmpg0wfv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phbmhvdXNlL3RhYi1pbi13b3Jrc3BhY2UiLAogICJ1dWlkIjogInRhYi1pbi13b3Jrc3BhY2VAamFuaG91c2UubHYiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "1i2q6a1bhzyaqgnfdmhgkmdw0nqd6ayyf2ffy7yqc7fmpg0wfv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW4gdGFicyBvbiBhY3RpdmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiT3BlbiBCcm93c2VyIFRhYnMgb24gQWN0aXZlIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phbmhvdXNlL3RhYi1pbi13b3Jrc3BhY2UiLAogICJ1dWlkIjogInRhYi1pbi13b3Jrc3BhY2VAamFuaG91c2UubHYiLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "tailscale@joaophi.github.com", "name": "Tailscale QS", "pname": "tailscale-qs", "description": "Add Tailscale to GNOME quick settings\n\nMake sure you set your user as tailscale operator:\nsudo tailscale set --operator=$USER", "link": "https://extensions.gnome.org/extension/6139/tailscale-qs/", "shell_version_map": {
     "43": {"version": "12", "sha256": "01s2y7r7h5j2wmbqmclqsy59kdsa24zdiif9lm4c7vsb5crpm7c1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb2FvcGhpL3RhaWxzY2FsZS1nbm9tZS1xcyIsCiAgInV1aWQiOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "01s2y7r7h5j2wmbqmclqsy59kdsa24zdiif9lm4c7vsb5crpm7c1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb2FvcGhpL3RhaWxzY2FsZS1nbm9tZS1xcyIsCiAgInV1aWQiOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "45": {"version": "15", "sha256": "1h52pb4w7fay8cgr0iywdj4isd82bf2c693f855sa95c1hamqdxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb2FvcGhpL3RhaWxzY2FsZS1nbm9tZS1xcyIsCiAgInV1aWQiOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "46": {"version": "15", "sha256": "1h52pb4w7fay8cgr0iywdj4isd82bf2c693f855sa95c1hamqdxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb2FvcGhpL3RhaWxzY2FsZS1nbm9tZS1xcyIsCiAgInV1aWQiOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
+    "45": {"version": "16", "sha256": "009kknbw9i9av910y1113lvqsf7f2nj0ib5702ah6l8ygpyfcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9hb3BoaS90YWlsc2NhbGUtZ25vbWUtcXMiLAogICJ1dWlkIjogInRhaWxzY2FsZUBqb2FvcGhpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "46": {"version": "16", "sha256": "009kknbw9i9av910y1113lvqsf7f2nj0ib5702ah6l8ygpyfcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9hb3BoaS90YWlsc2NhbGUtZ25vbWUtcXMiLAogICJ1dWlkIjogInRhaWxzY2FsZUBqb2FvcGhpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "47": {"version": "16", "sha256": "009kknbw9i9av910y1113lvqsf7f2nj0ib5702ah6l8ygpyfcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBUYWlsc2NhbGUgdG8gR05PTUUgcXVpY2sgc2V0dGluZ3NcblxuTWFrZSBzdXJlIHlvdSBzZXQgeW91ciB1c2VyIGFzIHRhaWxzY2FsZSBvcGVyYXRvcjpcbnN1ZG8gdGFpbHNjYWxlIHNldCAtLW9wZXJhdG9yPSRVU0VSIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGFpbHNjYWxlQGpvYW9waGkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVGFpbHNjYWxlIFFTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9hb3BoaS90YWlsc2NhbGUtZ25vbWUtcXMiLAogICJ1dWlkIjogInRhaWxzY2FsZUBqb2FvcGhpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
   }}
 , {"uuid": "custom-osd@neuromorph", "name": "Custom OSD", "pname": "custom-osd", "description": "Fully customize your OSD ( On Screen Display ) pop ups like Volume , Brightness or Caffeine , Lock Keys etc. \n\nUPDATE (v25, v26):\n- Profiles: New default profiles added for new users to get started\n- Vertical Position: Please note vertical position convention is changed: +50 is Top and -50 is Bottom of screen\n- Size also changed a bit so you may need to resize existing OSDs in settings\n- Square/Circle toggle option allows to get squarish/circlish shapes (as you vary Shape Shift)\n- New Special Effects: Progress Ring and Background Image (see below)\n- Gradient: New radial gradient direction and option to set end color opacity\n- Level: New level color, opacity and thickness options\n- Border: New border color, opacity and thickness options\n- Padding: New horizontal and vertical padding options\n- Shadow: New shadow color option\n- Font: Improved implementation of font attributes (font style, stretch, weight)\n- Trigger custom OSDs from command line (e.g. from a script) (see ReadMe on Github: https://github.com/neuromorph/custom-osd?tab=readme-ov-file#trigger-custom-osds-from-command-line)\n\nProgress Ring / Disk:\n- Select Sepcial Effect 'Progress Ring' in settings\n- Set 'Ring Gap from Border' and 'Level Thickness' to get a Progress Ring or Progress Disk\n- For Disk, set Gap to 100 and adjust Level. For Ring reduce Gap to 40-50 and adjust Level.\n- Combine with color / opacity styles for fg, bg, level and border\n\nBackground Image:\n- Set any image as OSD background (smaller size preferred)\n- Select Special Effect 'Background Image'\n- In 'Background Image FIle', provide path to a local file e.g. Pictures/myOsdImage.png\n\nFeatures:\n- Customize OSD position, orientation, size, numeric %,  monitor to show on, hide-delay and style \n- Select any combination of components to display: icon, text-label, level-bar, numeric %.\n- OSD components can be turned On/Off based on OSD types.\n- Special effects like Progress Ring, Gradient, Blur, Background Image etc\n- Clock OSD to show current date/time on a hotkey (default none. set hotkey in settings).\n- Create and Save multiple Settings profiles and choose one to apply (Profiles page in settings).\n- Import / Export settings profiles.\n- Share / get profile presets in github.\n\n\nTranslations : Spanish, Indonesian and French (thanks to contributors)\n", "link": "https://extensions.gnome.org/extension/6142/custom-osd/", "shell_version_map": {
     "42": {"version": "25", "sha256": "1mwpxiskdp34m1zqls3df7awwd34kmbl09g57fir54cwrddf3knn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IGN1c3RvbWl6ZSB5b3VyIE9TRCAoIE9uIFNjcmVlbiBEaXNwbGF5ICkgcG9wIHVwcyBsaWtlIFZvbHVtZSAsIEJyaWdodG5lc3Mgb3IgQ2FmZmVpbmUgLCBMb2NrIEtleXMgZXRjLiBNb3ZlLCBvcmllbnQsIHJlc2l6ZSwgbnVtZXJpYyAlLCBjaG9vc2UgbW9uaXRvciwgc2V0IGhpZGUtZGVsYXkgYW5kIHN0eWxlIHRvIG1hdGNoIHlvdXIgdGhlbWUgYW5kIGxpa2luZy4gWW91IGNhbiBhbHNvIHNlbGVjdCBhbnkgY29tYmluYXRpb24gb2YgY29tcG9uZW50cyB0byBkaXNwbGF5OiBpY29uLCB0ZXh0LWxhYmVsLCBsZXZlbC1iYXIsIG51bWVyaWMgJS4gIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS1vc2QiLAogICJuYW1lIjogIkN1c3RvbSBPU0QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLW9zZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldXJvbW9ycGgvY3VzdG9tLW9zZCIsCiAgInV1aWQiOiAiY3VzdG9tLW9zZEBuZXVyb21vcnBoIiwKICAidmVyc2lvbiI6IDI1Cn0="},
@@ -6484,8 +6810,9 @@
     "42": {"version": "1", "sha256": "1jwz2aw34j29fsj2cppfwcaarw60ggpmmj6xl36xqz6j3cnz0in6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaWRldmVzaC9zb2xhYXItZXh0ZW5zaW9uLWZvci1nbm9tZSIsCiAgInV1aWQiOiAic29sYWFyLWV4dGVuc2lvbkBzaWRldmVzaCIsCiAgInZlcnNpb24iOiAxCn0="},
     "43": {"version": "1", "sha256": "1jwz2aw34j29fsj2cppfwcaarw60ggpmmj6xl36xqz6j3cnz0in6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaWRldmVzaC9zb2xhYXItZXh0ZW5zaW9uLWZvci1nbm9tZSIsCiAgInV1aWQiOiAic29sYWFyLWV4dGVuc2lvbkBzaWRldmVzaCIsCiAgInZlcnNpb24iOiAxCn0="},
     "44": {"version": "1", "sha256": "1jwz2aw34j29fsj2cppfwcaarw60ggpmmj6xl36xqz6j3cnz0in6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaWRldmVzaC9zb2xhYXItZXh0ZW5zaW9uLWZvci1nbm9tZSIsCiAgInV1aWQiOiAic29sYWFyLWV4dGVuc2lvbkBzaWRldmVzaCIsCiAgInZlcnNpb24iOiAxCn0="},
-    "45": {"version": "4", "sha256": "129kgg2bngdak23jn8kjy9vl5393pazjir27fzq6039iyil68adb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaWRldmVzaC9zb2xhYXItZXh0ZW5zaW9uLWZvci1nbm9tZSIsCiAgInV1aWQiOiAic29sYWFyLWV4dGVuc2lvbkBzaWRldmVzaCIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "46": {"version": "4", "sha256": "129kgg2bngdak23jn8kjy9vl5393pazjir27fzq6039iyil68adb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaWRldmVzaC9zb2xhYXItZXh0ZW5zaW9uLWZvci1nbm9tZSIsCiAgInV1aWQiOiAic29sYWFyLWV4dGVuc2lvbkBzaWRldmVzaCIsCiAgInZlcnNpb24iOiA0Cn0="}
+    "45": {"version": "5", "sha256": "03f1zkkm36zmj544dknx7v3inqxqlqp8g6mkadvncgmqxmvffjpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2lkZXZlc2gvc29sYWFyLWV4dGVuc2lvbi1mb3ItZ25vbWUiLAogICJ1dWlkIjogInNvbGFhci1leHRlbnNpb25Ac2lkZXZlc2giLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "03f1zkkm36zmj544dknx7v3inqxqlqp8g6mkadvncgmqxmvffjpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2lkZXZlc2gvc29sYWFyLWV4dGVuc2lvbi1mb3ItZ25vbWUiLAogICJ1dWlkIjogInNvbGFhci1leHRlbnNpb25Ac2lkZXZlc2giLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "03f1zkkm36zmj544dknx7v3inqxqlqp8g6mkadvncgmqxmvffjpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IFNvbGFhciB0byBzdXBwb3J0IGNlcnRhaW4gZmVhdHVyZXMgb24gbm9uIFgxMSBzeXN0ZW1zIiwKICAibmFtZSI6ICJTb2xhYXIgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2lkZXZlc2gvc29sYWFyLWV4dGVuc2lvbi1mb3ItZ25vbWUiLAogICJ1dWlkIjogInNvbGFhci1leHRlbnNpb25Ac2lkZXZlc2giLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "custommagnifier@simonallen.org", "name": "Custom Magnifier", "pname": "custom-magnifier", "description": "Change GNOME magnification using KP_Subtract and KP_Add.", "link": "https://extensions.gnome.org/extension/6180/custom-magnifier/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1bb0il0fibs3yz09zlwxpz6i96vz3y1cpgzrkwkzhvjw511g2zv6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBHTk9NRSBtYWduaWZpY2F0aW9uIHVzaW5nIDxBbHQ+S1BfU3VidHJhY3QgYW5kIDxBbHQ+S1BfQWRkLiIsCiAgIm5hbWUiOiAiQ3VzdG9tIE1hZ25pZmllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21tYWduaWZpZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FyZnVua2VsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b20tbWFnbmlmaWVyIiwKICAidXVpZCI6ICJjdXN0b21tYWduaWZpZXJAc2ltb25hbGxlbi5vcmciLAogICJ2ZXJzaW9uIjogMwp9"}
@@ -6518,17 +6845,20 @@
     "43": {"version": "16", "sha256": "1gbwm8gwcrk2qslxgcb65jqgbcnlpsp4wbl655dg7wj8fa88l6ns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJoaWRlLWRvY2staW4tb3ZlcnZpZXdAcm9zbGF4IiwKICAidmVyc2lvbiI6IDE2Cn0="},
     "44": {"version": "15", "sha256": "1b998f73j74q48fwmih5cl8g7kf0015vgnns265yadws96cz2pk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3L3RyZWUvbWFpbiIsCiAgInV1aWQiOiAiaGlkZS1kb2NrLWluLW92ZXJ2aWV3QHJvc2xheCIsCiAgInZlcnNpb24iOiAxNQp9"},
     "45": {"version": "14", "sha256": "13kcvmnq41f0i8kxm8kpd3w880hq84w0ixza1sj1fv6vc8k80rhn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJoaWRlLWRvY2staW4tb3ZlcnZpZXdAcm9zbGF4IiwKICAidmVyc2lvbiI6IDE0Cn0="},
-    "46": {"version": "17", "sha256": "0fz98084c0vgk1mj0vlw1y8j75iws0jx4vi1v351kls5z96jq3vi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJoaWRlLWRvY2staW4tb3ZlcnZpZXdAcm9zbGF4IiwKICAidmVyc2lvbiI6IDE3Cn0="}
+    "46": {"version": "18", "sha256": "02x19smn0jblvhwwmg8pdsgzzjn98gz9x9g5ddw9z441mkxf8lfl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1Jvc0d0SHViL0hpZGUtZG9jay1pbi1vdmVydmlldyIsCiAgInV1aWQiOiAiaGlkZS1kb2NrLWluLW92ZXJ2aWV3QHJvc2xheCIsCiAgInZlcnNpb24iOiAxOAp9"},
+    "47": {"version": "18", "sha256": "02x19smn0jblvhwwmg8pdsgzzjn98gz9x9g5ddw9z441mkxf8lfl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1Jvc0d0SHViL0hpZGUtZG9jay1pbi1vdmVydmlldyIsCiAgInV1aWQiOiAiaGlkZS1kb2NrLWluLW92ZXJ2aWV3QHJvc2xheCIsCiAgInZlcnNpb24iOiAxOAp9"}
   }}
 , {"uuid": "light-style@gnome-shell-extensions.gcampax.github.com", "name": "Light Style", "pname": "light-style", "description": "Switch default to light style", "link": "https://extensions.gnome.org/extension/6198/light-style/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1x846d9s4knv36g0wh3zmkmpkvv14jbb15qh9pa5xwmysbpbawh7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
-    "46": {"version": "6", "sha256": "0pcqcf6lypm6hlcj73436y0bp5jl9h4syppc34bidjczq4hza1ij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}
+    "46": {"version": "6", "sha256": "0pcqcf6lypm6hlcj73436y0bp5jl9h4syppc34bidjczq4hza1ij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "47": {"version": "7", "sha256": "0jj6k2cz5r91zb24c7vfm9xa2zf92p2l3mdgd4hpv4rg821db843", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "transmission-daemon-ng@glerro.pm.me", "name": "Transmission Daemon Indicator NG", "pname": "transmission-daemon-indicator-ng", "description": "Monitor and control transmission-daemon or transmission-gtk.\nThe extension use the Transmission RPC protocol for interacting with it.\n\nFragments 2.0 user also can use this extension because it is a frontend for transmission-daemon.\n\nThis extension is only for Gnome Shell version major or equal to 43 because it use libsoup3.", "link": "https://extensions.gnome.org/extension/6204/transmission-daemon-indicator-ng/", "shell_version_map": {
     "43": {"version": "5", "sha256": "1g4dxrw7d9yik2y86l66nm50p7glyym6x0ff005kxmd42cl7dv9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc21pc3Npb24tZGFlbW9uLW5nIiwKICAidXVpZCI6ICJ0cmFuc21pc3Npb24tZGFlbW9uLW5nQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="},
     "44": {"version": "5", "sha256": "1g4dxrw7d9yik2y86l66nm50p7glyym6x0ff005kxmd42cl7dv9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc21pc3Npb24tZGFlbW9uLW5nIiwKICAidXVpZCI6ICJ0cmFuc21pc3Npb24tZGFlbW9uLW5nQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "45": {"version": "8", "sha256": "0licafb0i2xha7wwrlq33fpq9wr8fzis0mnqlv3sjg4bwiswh83s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc21pc3Npb24tZGFlbW9uLW5nIiwKICAidXVpZCI6ICJ0cmFuc21pc3Npb24tZGFlbW9uLW5nQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "8", "sha256": "0licafb0i2xha7wwrlq33fpq9wr8fzis0mnqlv3sjg4bwiswh83s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc21pc3Npb24tZGFlbW9uLW5nIiwKICAidXVpZCI6ICJ0cmFuc21pc3Npb24tZGFlbW9uLW5nQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "45": {"version": "9", "sha256": "0pb1bavj6649mvphwnl6g13y02a0fz8mqly683q41wvv7appx64r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInV1aWQiOiAidHJhbnNtaXNzaW9uLWRhZW1vbi1uZ0BnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogOSwKICAidmVyc2lvbi1uYW1lIjogIjIuMy4wIgp9"},
+    "46": {"version": "9", "sha256": "0pb1bavj6649mvphwnl6g13y02a0fz8mqly683q41wvv7appx64r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInV1aWQiOiAidHJhbnNtaXNzaW9uLWRhZW1vbi1uZ0BnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogOSwKICAidmVyc2lvbi1uYW1lIjogIjIuMy4wIgp9"},
+    "47": {"version": "9", "sha256": "0pb1bavj6649mvphwnl6g13y02a0fz8mqly683q41wvv7appx64r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInV1aWQiOiAidHJhbnNtaXNzaW9uLWRhZW1vbi1uZ0BnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogOSwKICAidmVyc2lvbi1uYW1lIjogIjIuMy4wIgp9"}
   }}
 , {"uuid": "seasonal-clock@johanbove.info", "name": "Seasonal Clock", "pname": "seasonal-clock", "description": "Displays the current Seasonal Clock hour in the Gnome panel", "link": "https://extensions.gnome.org/extension/6210/seasonal-clock/", "shell_version_map": {
     "43": {"version": "2", "sha256": "1kmxrmszrxg4fsvw4qy2npkxfbmqq0s1fki4a7gby7m0d589fa0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IFNlYXNvbmFsIENsb2NrIGhvdXIgaW4gdGhlIEdub21lIHBhbmVsIiwKICAibmFtZSI6ICJTZWFzb25hbCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9oYW5ib3ZlL3NlYXNvbmFsY2xvY2stZ25vbWUiLAogICJ1dWlkIjogInNlYXNvbmFsLWNsb2NrQGpvaGFuYm92ZS5pbmZvIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -6547,9 +6877,10 @@
 , {"uuid": "hide-network-icon@yenof.thunder", "name": "Hide Network Icon", "pname": "hide-network-icon", "description": "This extension hides the network icon.", "link": "https://extensions.gnome.org/extension/6227/hide-network-icon/", "shell_version_map": {
     "42": {"version": "2", "sha256": "0ipm0r4msyc8zrmff2r0nmyp9anwswxkq6hhdibw238pqmb77djr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhpZGVzIHRoZSBuZXR3b3JrIGljb24uIiwKICAibmFtZSI6ICJIaWRlIE5ldHdvcmsgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZS1uZXR3b3JrLWljb25AeWVub2YudGh1bmRlciIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
-, {"uuid": "bottom-overview@fthx", "name": "Bottom Overview", "pname": "bottom-overview", "description": "Overview appears when hovering the bottom of your screen.\n\n Adapted from @jdoda's Hot Edge extension.", "link": "https://extensions.gnome.org/extension/6230/bottom-overview/", "shell_version_map": {
+, {"uuid": "bottom-overview@fthx", "name": "Bottom Overview", "pname": "bottom-overview", "description": "Overview appears when hovering the bottom of your screen.", "link": "https://extensions.gnome.org/extension/6230/bottom-overview/", "shell_version_map": {
     "45": {"version": "3", "sha256": "0fw2qw65ax44yi73mvy1qkpphiarp9rnxs3ix49mlfgyk7yamc4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFwcGVhcnMgd2hlbiBob3ZlcmluZyB0aGUgYm90dG9tIG9mIHlvdXIgc2NyZWVuLlxuXG4gQWRhcHRlZCBmcm9tIEBqZG9kYSdzIEhvdCBFZGdlIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkJvdHRvbSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JvdHRvbS1vdmVydmlldyIsCiAgInV1aWQiOiAiYm90dG9tLW92ZXJ2aWV3QGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"},
-    "46": {"version": "6", "sha256": "05hk29jyca3f3kx3p3zvf5716qfv5v7dd53yalx5sa2shd17wsv3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFwcGVhcnMgd2hlbiBob3ZlcmluZyB0aGUgYm90dG9tIG9mIHlvdXIgc2NyZWVuLlxuXG4gQWRhcHRlZCBmcm9tIEBqZG9kYSdzIEhvdCBFZGdlIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkJvdHRvbSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JvdHRvbS1vdmVydmlldyIsCiAgInV1aWQiOiAiYm90dG9tLW92ZXJ2aWV3QGZ0aHgiLAogICJ2ZXJzaW9uIjogNgp9"}
+    "46": {"version": "8", "sha256": "1n3x71ry0y8488lvgqjxd0limvwn06ns3slizlpdy60dswnx65sd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFwcGVhcnMgd2hlbiBob3ZlcmluZyB0aGUgYm90dG9tIG9mIHlvdXIgc2NyZWVuLiIsCiAgIm5hbWUiOiAiQm90dG9tIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JvdHRvbS1vdmVydmlldyIsCiAgInV1aWQiOiAiYm90dG9tLW92ZXJ2aWV3QGZ0aHgiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "1n3x71ry0y8488lvgqjxd0limvwn06ns3slizlpdy60dswnx65sd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFwcGVhcnMgd2hlbiBob3ZlcmluZyB0aGUgYm90dG9tIG9mIHlvdXIgc2NyZWVuLiIsCiAgIm5hbWUiOiAiQm90dG9tIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JvdHRvbS1vdmVydmlldyIsCiAgInV1aWQiOiAiYm90dG9tLW92ZXJ2aWV3QGZ0aHgiLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "autolock-keyring@jerome-boillot.com", "name": "Auto-Lock Keyring", "pname": "auto-lock-keyring", "description": "Automatically locks the keyring following period of inactivity", "link": "https://extensions.gnome.org/extension/6236/auto-lock-keyring/", "shell_version_map": {
     "42": {"version": "1", "sha256": "1cy7l0ywap11ykqaj0pys7ghdw99ignk8xid00ljmsmfiivhc92a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbG9ja3MgdGhlIGtleXJpbmcgZm9sbG93aW5nIHBlcmlvZCBvZiBpbmFjdGl2aXR5IiwKICAibmFtZSI6ICJBdXRvLUxvY2sgS2V5cmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvbG9jay1rZXlyaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamJvaWxsb3QvYXV0b2xvY2sta2V5cmluZyIsCiAgInV1aWQiOiAiYXV0b2xvY2sta2V5cmluZ0BqZXJvbWUtYm9pbGxvdC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
@@ -6569,35 +6900,42 @@
     "42": {"version": "9", "sha256": "1832867id0z8jbd98dxfywj7k3xr4jjrdi7cblb4dhi2sii6svn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "1832867id0z8jbd98dxfywj7k3xr4jjrdi7cblb4dhi2sii6svn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "9", "sha256": "1832867id0z8jbd98dxfywj7k3xr4jjrdi7cblb4dhi2sii6svn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "45": {"version": "23", "sha256": "1jfzf9zhiz75zcp39dmikqz5wv1sp2hcpb81wj210jigmiblbkis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiAyMwp9"},
-    "46": {"version": "23", "sha256": "1jfzf9zhiz75zcp39dmikqz5wv1sp2hcpb81wj210jigmiblbkis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiAyMwp9"}
+    "45": {"version": "25", "sha256": "1jg7sixhbdayrdyj1jb8fi6b8nnp3n9fc55sch93k3vx5cdlffp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZWxpcGVmdG4vZW1vamktY29weSIsCiAgInV1aWQiOiAiZW1vamktY29weUBmZWxpcGVmdG4iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "46": {"version": "25", "sha256": "1jg7sixhbdayrdyj1jb8fi6b8nnp3n9fc55sch93k3vx5cdlffp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZWxpcGVmdG4vZW1vamktY29weSIsCiAgInV1aWQiOiAiZW1vamktY29weUBmZWxpcGVmdG4iLAogICJ2ZXJzaW9uIjogMjUKfQ=="},
+    "47": {"version": "25", "sha256": "1jg7sixhbdayrdyj1jb8fi6b8nnp3n9fc55sch93k3vx5cdlffp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZWxpcGVmdG4vZW1vamktY29weSIsCiAgInV1aWQiOiAiZW1vamktY29weUBmZWxpcGVmdG4iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
   }}
 , {"uuid": "notification-icons@muhammad_ans.github", "name": "Top Panel Notification Icons Revived", "pname": "top-panel-notification-icons-revived", "description": "Displays notifications icon in top panel", "link": "https://extensions.gnome.org/extension/6248/top-panel-notification-icons-revived/", "shell_version_map": {
-    "45": {"version": "5", "sha256": "19pkkzvkzbr6wwyd405757fjbikk65q4lvvxa82bbnpggkb6nns4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211aGFtbWFkLWFucy9ub3RpZmljYXRpb24taWNvbnMiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1pY29uc0BtdWhhbW1hZF9hbnMuZ2l0aHViIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "46": {"version": "5", "sha256": "19pkkzvkzbr6wwyd405757fjbikk65q4lvvxa82bbnpggkb6nns4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211aGFtbWFkLWFucy9ub3RpZmljYXRpb24taWNvbnMiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1pY29uc0BtdWhhbW1hZF9hbnMuZ2l0aHViIiwKICAidmVyc2lvbiI6IDUKfQ=="}
+    "45": {"version": "6", "sha256": "01rq27dm0qzdlfx27mb73b602wflv61f3x5bm3hwwanm46g8y2wv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWhhbW1hZC1hbnMvbm90aWZpY2F0aW9uLWljb25zIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24taWNvbnNAbXVoYW1tYWRfYW5zLmdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "46": {"version": "6", "sha256": "01rq27dm0qzdlfx27mb73b602wflv61f3x5bm3hwwanm46g8y2wv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWhhbW1hZC1hbnMvbm90aWZpY2F0aW9uLWljb25zIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24taWNvbnNAbXVoYW1tYWRfYW5zLmdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "47": {"version": "6", "sha256": "01rq27dm0qzdlfx27mb73b602wflv61f3x5bm3hwwanm46g8y2wv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWhhbW1hZC1hbnMvbm90aWZpY2F0aW9uLWljb25zIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24taWNvbnNAbXVoYW1tYWRfYW5zLmdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
-, {"uuid": "huanghaohhoa@163.com", "name": "Application Tabs", "pname": "application-tabs", "description": "Panel will include a different window tab for the same application that is currently launched.\n1. You can see the application window intuitively\n2. Click tab to jump to the corresponding window immediately\n3. Click the Close button to close the window", "link": "https://extensions.gnome.org/extension/6254/application-tabs/", "shell_version_map": {
-    "45": {"version": "14", "sha256": "0jc3sfwhb8l3gk1nf06ryqzahsjidjzw486cmzbbzdxnbqnn210f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIHRoZSBjb3JyZXNwb25kaW5nIHdpbmRvdyBpbW1lZGlhdGVseVxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93IiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
+, {"uuid": "huanghaohhoa@163.com", "name": "Application Tabs", "pname": "application-tabs", "description": "Panel will include a different window tab for the same application that is currently launched.\n1. You can see the application window intuitively.\n2. Click tab to jump to the corresponding window immediately or hide window for active tab.\n3. Click the Close button to close the window.\n\nIf the extension has any problems or needs improvement, you can go to the extension home page to ask questions, I will have time to check and solve them.", "link": "https://extensions.gnome.org/extension/6254/application-tabs/", "shell_version_map": {
+    "45": {"version": "17", "sha256": "08xh7l92pln5394ndzmyhypam0w66a5g85ngm94fhyv4984r8w1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIHRoZSBjb3JyZXNwb25kaW5nIHdpbmRvdyBpbW1lZGlhdGVseVxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93IiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaG9hby9hcHBfdGFicyIsCiAgInV1aWQiOiAiaHVhbmdoYW9oaG9hQDE2My5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "46": {"version": "17", "sha256": "08xh7l92pln5394ndzmyhypam0w66a5g85ngm94fhyv4984r8w1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIHRoZSBjb3JyZXNwb25kaW5nIHdpbmRvdyBpbW1lZGlhdGVseVxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93IiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaG9hby9hcHBfdGFicyIsCiAgInV1aWQiOiAiaHVhbmdoYW9oaG9hQDE2My5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}
   }}
 , {"uuid": "ping@prasanthc41m.github.com", "name": "Ping", "pname": "ping", "description": "A Ping Extension", "link": "https://extensions.gnome.org/extension/6260/ping/", "shell_version_map": {
     "44": {"version": "1", "sha256": "10s0hsrgs8p0xc1iwcjhg7x690si8pw9q5n8c881pf5lz6cs23gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmFzYW50aGM0MW0vcGluZy1leHRlbnNpb24iLAogICJ1dWlkIjogInBpbmdAcHJhc2FudGhjNDFtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
     "45": {"version": "3", "sha256": "19hl1w7w2zjjisq1hjdqp5kj6kcacz0fcrngmbv41b4179qvbsrn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhc2FudGhjNDFtL3BpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwaW5nQHByYXNhbnRoYzQxbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "4", "sha256": "01wrjj0wa80higl6n8gpjr9j6lcs9g32iv53p5q8v7l16ivyybjq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhc2FudGhjNDFtL3BpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwaW5nQHByYXNhbnRoYzQxbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "46": {"version": "4", "sha256": "01wrjj0wa80higl6n8gpjr9j6lcs9g32iv53p5q8v7l16ivyybjq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhc2FudGhjNDFtL3BpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwaW5nQHByYXNhbnRoYzQxbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "47": {"version": "6", "sha256": "0gwx65r7k39qa0dh7wkzxiqr6xn6jj8m330kd1y8iqp4sv8is5q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHJhc2FudGhjNDFtL3BpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwaW5nQHByYXNhbnRoYzQxbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}
   }}
 , {"uuid": "zen@le0.gs", "name": "Zen", "pname": "zen", "description": "Various tweaks for a more predictable Gnome shell experience", "link": "https://extensions.gnome.org/extension/6263/zen/", "shell_version_map": {
     "44": {"version": "4", "sha256": "052lyqk5zgyp4pnsljl0p8rjamz3h3vwczxdsggqnli6l1c7jw4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZhcmlvdXMgdHdlYWtzIGZvciBhIG1vcmUgcHJlZGljdGFibGUgR25vbWUgc2hlbGwgZXhwZXJpZW5jZSIsCiAgImdldHRleHQtZG9tYWluIjogInplbkBsZTAuZ3MiLAogICJuYW1lIjogIlplbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56ZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVvdGFrdS96ZW4iLAogICJ1dWlkIjogInplbkBsZTAuZ3MiLAogICJ2ZXJzaW9uIjogNAp9"},
-    "45": {"version": "7", "sha256": "19wz1is9c8jxvc37p8w6lm62ihgdnghn611lki98c7kbm7y5r2lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZhcmlvdXMgdHdlYWtzIGZvciBhIG1vcmUgcHJlZGljdGFibGUgR25vbWUgc2hlbGwgZXhwZXJpZW5jZSIsCiAgImdldHRleHQtZG9tYWluIjogInplbkBsZTAuZ3MiLAogICJuYW1lIjogIlplbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56ZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlb3Rha3UvemVuIiwKICAidXVpZCI6ICJ6ZW5AbGUwLmdzIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "46": {"version": "7", "sha256": "19wz1is9c8jxvc37p8w6lm62ihgdnghn611lki98c7kbm7y5r2lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZhcmlvdXMgdHdlYWtzIGZvciBhIG1vcmUgcHJlZGljdGFibGUgR25vbWUgc2hlbGwgZXhwZXJpZW5jZSIsCiAgImdldHRleHQtZG9tYWluIjogInplbkBsZTAuZ3MiLAogICJuYW1lIjogIlplbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56ZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlb3Rha3UvemVuIiwKICAidXVpZCI6ICJ6ZW5AbGUwLmdzIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "45": {"version": "8", "sha256": "1rvm1l459r93c1ymnl9jq1k9pjnikp6d5p51xgl8f9gd43gms26z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZhcmlvdXMgdHdlYWtzIGZvciBhIG1vcmUgcHJlZGljdGFibGUgR25vbWUgc2hlbGwgZXhwZXJpZW5jZSIsCiAgImdldHRleHQtZG9tYWluIjogInplbkBsZTAuZ3MiLAogICJuYW1lIjogIlplbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56ZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sZW90YWt1L3plbiIsCiAgInV1aWQiOiAiemVuQGxlMC5ncyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "46": {"version": "8", "sha256": "1rvm1l459r93c1ymnl9jq1k9pjnikp6d5p51xgl8f9gd43gms26z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZhcmlvdXMgdHdlYWtzIGZvciBhIG1vcmUgcHJlZGljdGFibGUgR25vbWUgc2hlbGwgZXhwZXJpZW5jZSIsCiAgImdldHRleHQtZG9tYWluIjogInplbkBsZTAuZ3MiLAogICJuYW1lIjogIlplbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56ZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sZW90YWt1L3plbiIsCiAgInV1aWQiOiAiemVuQGxlMC5ncyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "47": {"version": "8", "sha256": "1rvm1l459r93c1ymnl9jq1k9pjnikp6d5p51xgl8f9gd43gms26z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZhcmlvdXMgdHdlYWtzIGZvciBhIG1vcmUgcHJlZGljdGFibGUgR25vbWUgc2hlbGwgZXhwZXJpZW5jZSIsCiAgImdldHRleHQtZG9tYWluIjogInplbkBsZTAuZ3MiLAogICJuYW1lIjogIlplbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56ZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sZW90YWt1L3plbiIsCiAgInV1aWQiOiAiemVuQGxlMC5ncyIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
-, {"uuid": "extgrid@neuromorph", "name": "Glass Grid Extension Manager", "pname": "extensions-glass-grid", "description": "Extensions Manager : A quick overlay glass panel showing a grid to view / manage installed extensions.\n\nUpdates: \nNew theming options including 'background blur' and 'dynamic blur'. Also, navigation with mouse, touchpad, touchscreen and keyboard all are enabled. (update v3). \nFont size -+ option (update v6). Gnome 45 ported (v8). Improved performance (after v9).\nCompatibility with Blur My Shell and Desktop Cube.\n\nSuggestions are welcome.\n \n- The overlay can be quickly launched / dismissed using indicator toggle button in Panel or using a hotkey (default: Super + E). Both can be set from the Settings menu in the overlay itself.\n- The overlay will dismiss on Esc or automatically when it looses key focus. That is when you trigger open something e.g. extension preferences or when you click on some other app. \n\nHeader / Top layout: \n    - Info button: It will open an about dialog also showing brief tool guide.\n    - Settings button: Opens a menu with options for theme, Indicator button Add/Remove, launch Hotkey and font size.\n    - Theme Mode: Toggle between Dark, Neutral and Light modes.\n    - ego button: Opens extensions.gnome.org\n    - Extension app button: Launches the Extensions app.\n    - Switch: Enable / Disable all the extensions. It does not disable itself here for obvious reasons. Specifically disabling Glass Grid from its own entry in the grid will disable itself. Enabling all will enable the extensions that were enabled before you pressed Disable All.\n\nGrid Layout:\n    - Extension Name button: By default, it will open the extension preferences. If the extension has an update, it will show update-message. If the extension has an error, it will show error-message.\n    - Settings button: It will open the extension preferences. Gray button means the extension does not have preferences (so disabled).\n    - Reload button: It will reload the extension stylesheet css file(s). This is useful when you are trying to customize an extension's style.\n    - The grid layout scrolls horizontally when number of extensions are more than the page capacity. (Page Switcher popup animation included).\n    - You can use keyboard arrow keys to navigate (supports automatic pagination when key-focus moves to another page). When launched, key focus would be on the title.\n\nOther extensions: https://extensions.gnome.org/accounts/profile/neuromorph\n", "link": "https://extensions.gnome.org/extension/6269/extensions-glass-grid/", "shell_version_map": {
+, {"uuid": "extgrid@neuromorph", "name": "Glass Grid: Extension Manager", "pname": "extensions-glass-grid", "description": "A quick overlay glass panel showing a grid to view / manage installed extensions.\n \n- The overlay can be quickly launched / dismissed using indicator toggle button in Panel or using a hotkey (default: <Super>E). Both can be set from the Settings menu in the overlay itself.\n- The overlay will dismiss on Esc or automatically when it looses key focus. That is when you trigger open something e.g. extension preferences or when you click on some other app. [Note below].\n\nHeader / Top layout: \n    - Info button: It will open an about dialog also showing brief tool guide.\n    - Settings button: Opens a menu with settings for background theme, font size, Indicator button Add/Remove, launch Hotkey.\n    - Theme Mode: Toggle between Dark / Light and Neutral modes.\n    - ego button: Opens extensions.gnome.org\n    - Extension app button: Launches the Extensions app.\n    - Switch: Enable / Disable all the extensions. It does not disable itself here for obvious reasons. Specifically disabling Glass Grid from it's own entry in the grid will disable/inactivate itself. 'Enabling all' will enable the extensions that were enabled before you pressed Disable All.\n\nGrid Layout:\n    - Extension Name button: By default, it will open the extension preferences. If the extension has an update, it will show update-message. If the extension has an error, it will show error-message.\n    - Settings button: It will open the extension preferences. Gray button means the extension does not have preferences (so disabled).\n    - Reload button: It will reload the extension stylesheet css file(s). This is useful when you are trying to customize an extension's style.\n    - The grid layout scrolls horizontally when number of extensions are more than a page capacity. (Page Switcher popup animation included).\n    - You can use keyboard arrow keys to navigate (supports automatic pagination when key-focus moves to another page). When opened, key focus would be on the title.\n\nNote: This is since as a Gnome shell extension, the UI overlay is essentially transient like the panel menu. Glass grid is more persistent than the panel menu by design but less than an app window since it is not a desktop app. So think of it like the app grid in overview, to get some idea.\n", "link": "https://extensions.gnome.org/extension/6269/extensions-glass-grid/", "shell_version_map": {
     "42": {"version": "15", "sha256": "143lpy2c08ym3f1mxqqp8kya6qkx2af2gjsvifick904frjgashz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcXVpY2sgb3ZlcmxheSBnbGFzcyBwYW5lbCBzaG93aW5nIGEgZ3JpZCB0byB2aWV3IC8gbWFuYWdlIGluc3RhbGxlZCBleHRlbnNpb25zIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV4dGdyaWQiLAogICJuYW1lIjogIkV4dGVuc2lvbnMgR2xhc3MgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9nbGFzc19ncmlkIiwKICAidXVpZCI6ICJleHRncmlkQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "43": {"version": "15", "sha256": "143lpy2c08ym3f1mxqqp8kya6qkx2af2gjsvifick904frjgashz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcXVpY2sgb3ZlcmxheSBnbGFzcyBwYW5lbCBzaG93aW5nIGEgZ3JpZCB0byB2aWV3IC8gbWFuYWdlIGluc3RhbGxlZCBleHRlbnNpb25zIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV4dGdyaWQiLAogICJuYW1lIjogIkV4dGVuc2lvbnMgR2xhc3MgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9nbGFzc19ncmlkIiwKICAidXVpZCI6ICJleHRncmlkQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "44": {"version": "15", "sha256": "143lpy2c08ym3f1mxqqp8kya6qkx2af2gjsvifick904frjgashz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcXVpY2sgb3ZlcmxheSBnbGFzcyBwYW5lbCBzaG93aW5nIGEgZ3JpZCB0byB2aWV3IC8gbWFuYWdlIGluc3RhbGxlZCBleHRlbnNpb25zIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV4dGdyaWQiLAogICJuYW1lIjogIkV4dGVuc2lvbnMgR2xhc3MgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9nbGFzc19ncmlkIiwKICAidXVpZCI6ICJleHRncmlkQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
-    "45": {"version": "14", "sha256": "0jjl5alzf78yk7mf0jzy6k6k2gw2ldkvz7630mvg2np7hvgm0rzh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcXVpY2sgb3ZlcmxheSBnbGFzcyBwYW5lbCBzaG93aW5nIGEgZ3JpZCB0byB2aWV3IC8gbWFuYWdlIGluc3RhbGxlZCBleHRlbnNpb25zIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV4dGdyaWQiLAogICJuYW1lIjogIkV4dGVuc2lvbnMgR2xhc3MgR3JpZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldXJvbW9ycGgvZ2xhc3NfZ3JpZCIsCiAgInV1aWQiOiAiZXh0Z3JpZEBuZXVyb21vcnBoIiwKICAidmVyc2lvbiI6IDE0Cn0="}
+    "45": {"version": "17", "sha256": "1zss1z2ci0gjl17cp6lsnrza5pjix7z8ihi4cj3gs1qs5pwr3lfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcXVpY2sgb3ZlcmxheSBnbGFzcyBwYW5lbCBzaG93aW5nIGEgZ3JpZCB0byB2aWV3IC8gbWFuYWdlIGluc3RhbGxlZCBleHRlbnNpb25zIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV4dGdyaWQiLAogICJuYW1lIjogIkdsYXNzIEdyaWQ6IEV4dGVuc2lvbiBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldXJvbW9ycGgvZ2xhc3NfZ3JpZCIsCiAgInV1aWQiOiAiZXh0Z3JpZEBuZXVyb21vcnBoIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "46": {"version": "17", "sha256": "1zss1z2ci0gjl17cp6lsnrza5pjix7z8ihi4cj3gs1qs5pwr3lfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcXVpY2sgb3ZlcmxheSBnbGFzcyBwYW5lbCBzaG93aW5nIGEgZ3JpZCB0byB2aWV3IC8gbWFuYWdlIGluc3RhbGxlZCBleHRlbnNpb25zIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV4dGdyaWQiLAogICJuYW1lIjogIkdsYXNzIEdyaWQ6IEV4dGVuc2lvbiBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldXJvbW9ycGgvZ2xhc3NfZ3JpZCIsCiAgInV1aWQiOiAiZXh0Z3JpZEBuZXVyb21vcnBoIiwKICAidmVyc2lvbiI6IDE3Cn0="}
   }}
 , {"uuid": "AddCustomTextToWorkSpaceIndicators@pratap.fastmail.fm", "name": "Add Custom Text to Workspace Indicators", "pname": "add-custom-text-to-workspace-indicators", "description": "Add custom text to workspace indicators", "link": "https://extensions.gnome.org/extension/6272/add-custom-text-to-workspace-indicators/", "shell_version_map": {
-    "45": {"version": "13", "sha256": "09q3av0magrm4b6xzcsmhmxi24v6h4wc9xcgfc2qjzkbr3w4v42f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXN0b20gdGV4dCB0byB3b3Jrc3BhY2UgaW5kaWNhdG9ycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJBZGQgQ3VzdG9tIFRleHQgdG8gV29ya3NwYWNlIEluZGljYXRvcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAidXVpZCI6ICJBZGRDdXN0b21UZXh0VG9Xb3JrU3BhY2VJbmRpY2F0b3JzQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "46": {"version": "13", "sha256": "09q3av0magrm4b6xzcsmhmxi24v6h4wc9xcgfc2qjzkbr3w4v42f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXN0b20gdGV4dCB0byB3b3Jrc3BhY2UgaW5kaWNhdG9ycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJBZGQgQ3VzdG9tIFRleHQgdG8gV29ya3NwYWNlIEluZGljYXRvcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAidXVpZCI6ICJBZGRDdXN0b21UZXh0VG9Xb3JrU3BhY2VJbmRpY2F0b3JzQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxMwp9"}
+    "45": {"version": "14", "sha256": "15akq02i345jp4kdjxn9bdiaqxgssk79smp07map5ll361a43h72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXN0b20gdGV4dCB0byB3b3Jrc3BhY2UgaW5kaWNhdG9ycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJBZGQgQ3VzdG9tIFRleHQgdG8gV29ya3NwYWNlIEluZGljYXRvcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2FkZC1jdXN0b20tdGV4dC10by13b3Jrc3BhY2UtaW5kaWNhdG9ycyIsCiAgInV1aWQiOiAiQWRkQ3VzdG9tVGV4dFRvV29ya1NwYWNlSW5kaWNhdG9yc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "46": {"version": "14", "sha256": "15akq02i345jp4kdjxn9bdiaqxgssk79smp07map5ll361a43h72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXN0b20gdGV4dCB0byB3b3Jrc3BhY2UgaW5kaWNhdG9ycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJBZGQgQ3VzdG9tIFRleHQgdG8gV29ya3NwYWNlIEluZGljYXRvcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2FkZC1jdXN0b20tdGV4dC10by13b3Jrc3BhY2UtaW5kaWNhdG9ycyIsCiAgInV1aWQiOiAiQWRkQ3VzdG9tVGV4dFRvV29ya1NwYWNlSW5kaWNhdG9yc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "47": {"version": "14", "sha256": "15akq02i345jp4kdjxn9bdiaqxgssk79smp07map5ll361a43h72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXN0b20gdGV4dCB0byB3b3Jrc3BhY2UgaW5kaWNhdG9ycyIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJBZGQgQ3VzdG9tIFRleHQgdG8gV29ya3NwYWNlIEluZGljYXRvcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWRkLWN1c3RvbS10ZXh0LXRvLXdvcmtzcGFjZS1pbmRpY2F0b3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2FkZC1jdXN0b20tdGV4dC10by13b3Jrc3BhY2UtaW5kaWNhdG9ycyIsCiAgInV1aWQiOiAiQWRkQ3VzdG9tVGV4dFRvV29ya1NwYWNlSW5kaWNhdG9yc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
   }}
 , {"uuid": "strings@lobau.io", "name": "Strings", "pname": "strings", "description": "Quickly copy to your clipboard all kind of useful strings.\n\nDates (example)\n- Full (Thursday, May 16, 2024)\n- Short (2024-05-16)\n- ISO 8601 (2024-05-16T21:49:10.881Z)\n- Epoch (1715896175628)\n\nRandom strings (example)\n- UUID (f5195029-0fee-465b-9bda-71429f258914)\n- Hash (huWH4lzEuOlYOYbq)\n- Lorem ipsum (Tortor enim enim consectetur dui tristique.)\n- HEX Color (#E34658)\n\nNOTE: UUID and Hash are NOT cryptographic, as they rely on Math.random(). If there is a better way to do in the confine of an extension, please leave a note on the repo!", "link": "https://extensions.gnome.org/extension/6275/strings/", "shell_version_map": {
     "45": {"version": "2", "sha256": "17hi757widdxfnq6b5iaddv4w03bj4ly4wvd289wbm7lbphfrk70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbG9iYXUvc3RyaW5ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInN0cmluZ3NAbG9iYXUuaW8iLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -6606,21 +6944,24 @@
 , {"uuid": "battery-usage-wattmeter@halfmexicanhalfamazing.gmail.com", "name": "Battery Usage Wattmeter", "pname": "battery-usage-wattmeter", "description": " Shows charging/discharging consumption (+/-) in Watt next to battery percentage level.\nDefault sync reload set to 4 seconds.\nNo consumption info when battery is full.\nFork of https://github.com/wennaspeedy/batt_consumption_wattmetter", "link": "https://extensions.gnome.org/extension/6278/battery-usage-wattmeter/", "shell_version_map": {
     "43": {"version": "2", "sha256": "06kg17qp07wlpsa5gcl5ah8av6dx8cp2df87xkm39rkj58whf2fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhbGZtZXhpY2FuL2JhdHRlcnktdXNhZ2Utd2F0dG1ldGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS11c2FnZS13YXR0bWV0ZXJAaGFsZm1leGljYW5oYWxmYW1hemluZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
     "44": {"version": "2", "sha256": "06kg17qp07wlpsa5gcl5ah8av6dx8cp2df87xkm39rkj58whf2fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhbGZtZXhpY2FuL2JhdHRlcnktdXNhZ2Utd2F0dG1ldGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS11c2FnZS13YXR0bWV0ZXJAaGFsZm1leGljYW5oYWxmYW1hemluZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "45": {"version": "13", "sha256": "0cdppb28glw0657a1lavll0x2badhd0dq690z1f69sbzi987bjpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhbGZtZXhpY2FuL2JhdHRlcnktdXNhZ2Utd2F0dG1ldGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS11c2FnZS13YXR0bWV0ZXJAaGFsZm1leGljYW5oYWxmYW1hemluZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "46": {"version": "13", "sha256": "0cdppb28glw0657a1lavll0x2badhd0dq690z1f69sbzi987bjpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhbGZtZXhpY2FuL2JhdHRlcnktdXNhZ2Utd2F0dG1ldGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS11c2FnZS13YXR0bWV0ZXJAaGFsZm1leGljYW5oYWxmYW1hemluZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
+    "45": {"version": "17", "sha256": "1hz822ckgqcqly4pjbgxc312bnyfphky0cn0crhdm075cwmysbs7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9iYXR0ZXJ5LXVzYWdlLXdhdHRtZXRlci1leHRlbnNpb24iLAogICJ1dWlkIjogImJhdHRlcnktdXNhZ2Utd2F0dG1ldGVyQGhhbGZtZXhpY2FuaGFsZmFtYXppbmcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "46": {"version": "17", "sha256": "1hz822ckgqcqly4pjbgxc312bnyfphky0cn0crhdm075cwmysbs7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9iYXR0ZXJ5LXVzYWdlLXdhdHRtZXRlci1leHRlbnNpb24iLAogICJ1dWlkIjogImJhdHRlcnktdXNhZ2Utd2F0dG1ldGVyQGhhbGZtZXhpY2FuaGFsZmFtYXppbmcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
+    "47": {"version": "17", "sha256": "1hz822ckgqcqly4pjbgxc312bnyfphky0cn0crhdm075cwmysbs7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9iYXR0ZXJ5LXVzYWdlLXdhdHRtZXRlci1leHRlbnNpb24iLAogICJ1dWlkIjogImJhdHRlcnktdXNhZ2Utd2F0dG1ldGVyQGhhbGZtZXhpY2FuaGFsZmFtYXppbmcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}
   }}
 , {"uuid": "azwallpaper@azwallpaper.gitlab.com", "name": "Wallpaper Slideshow", "pname": "wallpaper-slideshow", "description": "Wallpaper slideshow extension. Optionally downloads BING wallpaper of the day.\n\nWhen first installing, make sure to set your slideshow directory in the settings.\n\nRight click on your desktop for easy access to Wallpaper Slideshow settings or to jump to the next background in queue.\n\nThe extension will detect all images in the user defined slideshow directory, randomize the order, and start a slideshow at an interval of your choice. Any file changes, additions, or deletions in the directory will be detected and the slideshow queue will update accordingly.\n\nSlideshow queue is preserved upon shutdown and will pick up from where it left off.", "link": "https://extensions.gnome.org/extension/6281/wallpaper-slideshow/", "shell_version_map": {
     "43": {"version": "7", "sha256": "0d07s6pv96aibcp26gdhg1rif5pfcw7078q1kckris0vihjyw27p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6d2FsbHBhcGVyIiwKICAidXVpZCI6ICJhendhbGxwYXBlckBhendhbGxwYXBlci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "44": {"version": "7", "sha256": "0d07s6pv96aibcp26gdhg1rif5pfcw7078q1kckris0vihjyw27p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6d2FsbHBhcGVyIiwKICAidXVpZCI6ICJhendhbGxwYXBlckBhendhbGxwYXBlci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "45": {"version": "8", "sha256": "13hzijdx6gkmqwx8hmap3s9sw3pdrhk2g4nam31aiabal84ghjmh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6d2FsbHBhcGVyIiwKICAidXVpZCI6ICJhendhbGxwYXBlckBhendhbGxwYXBlci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "13hzijdx6gkmqwx8hmap3s9sw3pdrhk2g4nam31aiabal84ghjmh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6d2FsbHBhcGVyIiwKICAidXVpZCI6ICJhendhbGxwYXBlckBhendhbGxwYXBlci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "10", "sha256": "1ifqf8qy3vla4jn53v0agw4p3r4k2and4zcbyss4pqc6k796k05c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "46": {"version": "10", "sha256": "1ifqf8qy3vla4jn53v0agw4p3r4k2and4zcbyss4pqc6k796k05c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "47": {"version": "10", "sha256": "1ifqf8qy3vla4jn53v0agw4p3r4k2and4zcbyss4pqc6k796k05c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}
   }}
 , {"uuid": "energy-rate-indicator@kaetowjj.gmail.com", "name": "Energy Rate Indicator", "pname": "energy-rate-indicator", "description": "Displays the current energy rate in the top bar.", "link": "https://extensions.gnome.org/extension/6290/energy-rate-indicator/", "shell_version_map": {
     "44": {"version": "7", "sha256": "0nyvjh579s4kicwcpxzd5n5xbn2v87p87hzbhmv771llvzhsgz1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IGVuZXJneSByYXRlIGluIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiRW5lcmd5IFJhdGUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thZXRvd2pqL0dub21lLUV4dGVuc2lvbi1FbmVyZ3ktUmF0ZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogImVuZXJneS1yYXRlLWluZGljYXRvckBrYWV0b3dqai5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
   }}
 , {"uuid": "indicator@hedgie.tech", "name": "Indicator", "pname": "indicator", "description": "Add an indicator for a custom service", "link": "https://extensions.gnome.org/extension/6293/indicator/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "1qkrfa2hzk2339ppbxccih8cczj0yzzj2ircxi0akn2hywfxjq06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpbmRpY2F0b3IgZm9yIGEgY3VzdG9tIHNlcnZpY2UiLAogICJuYW1lIjogIkluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvZ25vbWUtZXh0ZW5zaW9uLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW5kaWNhdG9yQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "3", "sha256": "1qkrfa2hzk2339ppbxccih8cczj0yzzj2ircxi0akn2hywfxjq06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpbmRpY2F0b3IgZm9yIGEgY3VzdG9tIHNlcnZpY2UiLAogICJuYW1lIjogIkluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvZ25vbWUtZXh0ZW5zaW9uLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW5kaWNhdG9yQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "45": {"version": "4", "sha256": "1mx4bvgm7y688wgj75qwxbxv7himgqjqna42pqnbwdchm6hqcpp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpbmRpY2F0b3IgZm9yIGEgY3VzdG9tIHNlcnZpY2UiLAogICJuYW1lIjogIkluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1pbmRpY2F0b3IiLAogICJ1dWlkIjogImluZGljYXRvckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1mx4bvgm7y688wgj75qwxbxv7himgqjqna42pqnbwdchm6hqcpp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpbmRpY2F0b3IgZm9yIGEgY3VzdG9tIHNlcnZpY2UiLAogICJuYW1lIjogIkluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1pbmRpY2F0b3IiLAogICJ1dWlkIjogImluZGljYXRvckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1mx4bvgm7y688wgj75qwxbxv7himgqjqna42pqnbwdchm6hqcpp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpbmRpY2F0b3IgZm9yIGEgY3VzdG9tIHNlcnZpY2UiLAogICJuYW1lIjogIkluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2dub21lLWV4dGVuc2lvbi1pbmRpY2F0b3IiLAogICJ1dWlkIjogImluZGljYXRvckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "dark-style@fthx", "name": "Dark Style", "pname": "dark-style", "description": "Switch Shell-only default to dark style. Useful for Ubuntu.\n\nNOT USEFUL ANYMORE", "link": "https://extensions.gnome.org/extension/6296/dark-style/", "shell_version_map": {
     "45": {"version": "1", "sha256": "1cx0gwbc020jwdpjysm1kabhdnip16kzsgz5l9sf8pv9lrrdmj06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBTaGVsbC1vbmx5IGRlZmF1bHQgdG8gZGFyayBzdHlsZS4gVXNlZnVsIGZvciBVYnVudHUuIiwKICAiZXh0ZW5zaW9uLWlkIjogImRhcmstc3R5bGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJEYXJrIFN0eWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhcmstc3R5bGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXJrLXN0eWxlIiwKICAidXVpZCI6ICJkYXJrLXN0eWxlQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}
@@ -6633,35 +6974,40 @@
     "44": {"version": "2", "sha256": "0yhczb1cbh39ryrk2zw5nqmda819h748pdslpm0rxn4jy3dzpn4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBzYW1lIGFzIFdvcmtzcGFjZSBJbmRpY2F0b3IsIGJ1dCBvbiB0aGUgbGVmdCBsaWtlIHN3YXl3bS5cblxuSXQgaXMgYSBmb3JrIG9mIFdvcmtzcGFjZSBJbmRpY2F0b3IgYnkgZm11ZWxsbmVyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yLWxlZnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvci1sZWZ0IiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIExlZnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3VzdGF2b210Ym9yZ2VzL2dub21lLXdvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdC5naXQiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdEBnbXRib3JnZXMuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "quake-terminal@diegodario88.github.io", "name": "Quake Terminal", "pname": "quake-terminal", "description": "Quickly launch a terminal in Quake mode using a keyboard shortcut", "link": "https://extensions.gnome.org/extension/6307/quake-terminal/", "shell_version_map": {
-    "45": {"version": "20", "sha256": "0xa9k504sny6b6d15ypx92w517y7jyqhh3r8xi87489grzyx6lgz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaWVnb2RhcmlvODgvcXVha2UtdGVybWluYWwiLAogICJ1dWlkIjogInF1YWtlLXRlcm1pbmFsQGRpZWdvZGFyaW84OC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICIxLjYuMyIKfQ=="},
-    "46": {"version": "20", "sha256": "0xa9k504sny6b6d15ypx92w517y7jyqhh3r8xi87489grzyx6lgz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaWVnb2RhcmlvODgvcXVha2UtdGVybWluYWwiLAogICJ1dWlkIjogInF1YWtlLXRlcm1pbmFsQGRpZWdvZGFyaW84OC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICIxLjYuMyIKfQ=="}
+    "45": {"version": "22", "sha256": "1ims8gs3nnx2bds5n88yy3xzvlp3v1kr404c7q898zsgpr5f8b9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29kYXJpbzg4L3F1YWtlLXRlcm1pbmFsIiwKICAidXVpZCI6ICJxdWFrZS10ZXJtaW5hbEBkaWVnb2RhcmlvODguZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS42LjQiCn0="},
+    "46": {"version": "22", "sha256": "1ims8gs3nnx2bds5n88yy3xzvlp3v1kr404c7q898zsgpr5f8b9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29kYXJpbzg4L3F1YWtlLXRlcm1pbmFsIiwKICAidXVpZCI6ICJxdWFrZS10ZXJtaW5hbEBkaWVnb2RhcmlvODguZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS42LjQiCn0="},
+    "47": {"version": "22", "sha256": "1ims8gs3nnx2bds5n88yy3xzvlp3v1kr404c7q898zsgpr5f8b9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29kYXJpbzg4L3F1YWtlLXRlcm1pbmFsIiwKICAidXVpZCI6ICJxdWFrZS10ZXJtaW5hbEBkaWVnb2RhcmlvODguZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS42LjQiCn0="}
   }}
 , {"uuid": "window-title-is-back@fthx", "name": "Window title is back", "pname": "window-title-is-back", "description": "Focused window icon + app name + title + menu in the top bar.\n\n Options in preferences UI: toggle items, colored icon, icon size.", "link": "https://extensions.gnome.org/extension/6310/window-title-is-back/", "shell_version_map": {
     "45": {"version": "26", "sha256": "16wfrl47211cpcka5brfpdijvwinb83xn37522508jqby41hccwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDI2Cn0="},
-    "46": {"version": "29", "sha256": "10ikj5nlgf18rsjn5zl0i28b2vazvzp773i90b68hf4pqizh02f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDI5Cn0="}
+    "46": {"version": "32", "sha256": "1c7z891klz4j8dnmidpmjj6qms10fdi3713zm7f04j9kw5rpypfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDMyCn0="},
+    "47": {"version": "33", "sha256": "1b58ipl7rslw0h3qsfzwyrgv78nf8rz9y374wh4na0nwh70jhkx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDMzCn0="}
   }}
 , {"uuid": "dim-background-windows@stephane-13.github.com", "name": "Dim Background Windows", "pname": "dim-background-windows", "description": "Dim windows without focus", "link": "https://extensions.gnome.org/extension/6313/dim-background-windows/", "shell_version_map": {
     "42": {"version": "14", "sha256": "1in13131acn4gwbirc2xpzadwdkfjcfpsbp4jrgd4jzl24sp3qn8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0ZXBoYW5lLTEzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaW0tYmFja2dyb3VuZC13aW5kb3dzIiwKICAidXVpZCI6ICJkaW0tYmFja2dyb3VuZC13aW5kb3dzQHN0ZXBoYW5lLTEzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "43": {"version": "14", "sha256": "1in13131acn4gwbirc2xpzadwdkfjcfpsbp4jrgd4jzl24sp3qn8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0ZXBoYW5lLTEzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaW0tYmFja2dyb3VuZC13aW5kb3dzIiwKICAidXVpZCI6ICJkaW0tYmFja2dyb3VuZC13aW5kb3dzQHN0ZXBoYW5lLTEzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
     "44": {"version": "14", "sha256": "1in13131acn4gwbirc2xpzadwdkfjcfpsbp4jrgd4jzl24sp3qn8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0ZXBoYW5lLTEzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaW0tYmFja2dyb3VuZC13aW5kb3dzIiwKICAidXVpZCI6ICJkaW0tYmFja2dyb3VuZC13aW5kb3dzQHN0ZXBoYW5lLTEzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
-    "45": {"version": "15", "sha256": "0wxq8rzdwr6g0k73p605h75gbhxa1sis21mc1g7axcja4f3hqr0r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3RlcGhhbmUtMTMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpbS1iYWNrZ3JvdW5kLXdpbmRvd3MiLAogICJ1dWlkIjogImRpbS1iYWNrZ3JvdW5kLXdpbmRvd3NAc3RlcGhhbmUtMTMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "46": {"version": "15", "sha256": "0wxq8rzdwr6g0k73p605h75gbhxa1sis21mc1g7axcja4f3hqr0r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3RlcGhhbmUtMTMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpbS1iYWNrZ3JvdW5kLXdpbmRvd3MiLAogICJ1dWlkIjogImRpbS1iYWNrZ3JvdW5kLXdpbmRvd3NAc3RlcGhhbmUtMTMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
+    "45": {"version": "16", "sha256": "07m0x7ahma7i9k25wnilrn9h6b8nlz9f8bnw4zqi2x2llha0if3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0ZXBoYW5lLTEzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaW0tYmFja2dyb3VuZC13aW5kb3dzIiwKICAidXVpZCI6ICJkaW0tYmFja2dyb3VuZC13aW5kb3dzQHN0ZXBoYW5lLTEzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "46": {"version": "16", "sha256": "07m0x7ahma7i9k25wnilrn9h6b8nlz9f8bnw4zqi2x2llha0if3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0ZXBoYW5lLTEzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaW0tYmFja2dyb3VuZC13aW5kb3dzIiwKICAidXVpZCI6ICJkaW0tYmFja2dyb3VuZC13aW5kb3dzQHN0ZXBoYW5lLTEzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="},
+    "47": {"version": "16", "sha256": "07m0x7ahma7i9k25wnilrn9h6b8nlz9f8bnw4zqi2x2llha0if3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSB3aW5kb3dzIHdpdGhvdXQgZm9jdXMiLAogICJuYW1lIjogIkRpbSBCYWNrZ3JvdW5kIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGltLWJhY2tncm91bmQtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0ZXBoYW5lLTEzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaW0tYmFja2dyb3VuZC13aW5kb3dzIiwKICAidXVpZCI6ICJkaW0tYmFja2dyb3VuZC13aW5kb3dzQHN0ZXBoYW5lLTEzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}
   }}
 , {"uuid": "hide-gnome-power-icon@siren15.github.com", "name": "Hide power button icon", "pname": "hide-power-button-icon", "description": "Hide the power icon in the quick settings area of the Gnome panel.", "link": "https://extensions.gnome.org/extension/6319/hide-power-button-icon/", "shell_version_map": {
     "44": {"version": "2", "sha256": "05x5rz1485fw6id3s18hman0clw7j5q8ff5w71ca49lkcwr5y323", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIHBvd2VyIGljb24gaW4gdGhlIHF1aWNrIHNldHRpbmdzIGFyZWEgb2YgdGhlIEdub21lIHBhbmVsLiIsCiAgIm5hbWUiOiAiSGlkZSBwb3dlciBidXR0b24gaWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaXJlbjE1L2hpZGUtZ25vbWUtcG93ZXItaWNvbiIsCiAgInV1aWQiOiAiaGlkZS1nbm9tZS1wb3dlci1pY29uQHNpcmVuMTUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
 , {"uuid": "debian-updates-indicator@glerro.pm.me", "name": "Debian Linux Updates Indicator", "pname": "debian-linux-updates-indicator", "description": "Updates indicator for Debian Linux based distributions.\n\nCheck for updates and shows also the following packages status (as in Synaptic):\n⚫ Available updates.\n⚫ New packages in repository.\n⚫ Local/Obsolete packages.\n⚫ Residual config files.\n⚫ Autoremovable packages.", "link": "https://extensions.gnome.org/extension/6322/debian-linux-updates-indicator/", "shell_version_map": {
-    "40": {"version": "11", "sha256": "07x2fwnba1iq75khr05i8783npg3h6bx6j4bdggc2636m8ibpcpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTEsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMSIKfQ=="},
-    "41": {"version": "11", "sha256": "07x2fwnba1iq75khr05i8783npg3h6bx6j4bdggc2636m8ibpcpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTEsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMSIKfQ=="},
-    "42": {"version": "11", "sha256": "07x2fwnba1iq75khr05i8783npg3h6bx6j4bdggc2636m8ibpcpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTEsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMSIKfQ=="},
-    "43": {"version": "11", "sha256": "07x2fwnba1iq75khr05i8783npg3h6bx6j4bdggc2636m8ibpcpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTEsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMSIKfQ=="},
-    "44": {"version": "11", "sha256": "07x2fwnba1iq75khr05i8783npg3h6bx6j4bdggc2636m8ibpcpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTEsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMSIKfQ=="},
-    "45": {"version": "12", "sha256": "1ikqi7llg71qxp1h9y33l4mzc7pilizcna2zypbz0ql2ymn9d8yg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTIsCiAgInZlcnNpb24tbmFtZSI6ICIyLjMuMCIKfQ=="},
-    "46": {"version": "12", "sha256": "1ikqi7llg71qxp1h9y33l4mzc7pilizcna2zypbz0ql2ymn9d8yg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTIsCiAgInZlcnNpb24tbmFtZSI6ICIyLjMuMCIKfQ=="}
+    "40": {"version": "17", "sha256": "05s1nym9kl46smclidrlw8k5khf7d4y7qk5yag136cwnkdz08ckn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMyIKfQ=="},
+    "41": {"version": "17", "sha256": "05s1nym9kl46smclidrlw8k5khf7d4y7qk5yag136cwnkdz08ckn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMyIKfQ=="},
+    "42": {"version": "17", "sha256": "05s1nym9kl46smclidrlw8k5khf7d4y7qk5yag136cwnkdz08ckn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMyIKfQ=="},
+    "43": {"version": "17", "sha256": "05s1nym9kl46smclidrlw8k5khf7d4y7qk5yag136cwnkdz08ckn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMyIKfQ=="},
+    "44": {"version": "17", "sha256": "05s1nym9kl46smclidrlw8k5khf7d4y7qk5yag136cwnkdz08ckn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICIxLjIuMyIKfQ=="},
+    "45": {"version": "16", "sha256": "1d2w2mhkyff3cx3jcaylbx12p8zifsyn9n6rmh5jbk2wk2vmc6rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGViaWFuLXVwZGF0ZXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3JAZ2xlcnJvLnBtLm1lIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi40LjIiCn0="},
+    "46": {"version": "16", "sha256": "1d2w2mhkyff3cx3jcaylbx12p8zifsyn9n6rmh5jbk2wk2vmc6rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGViaWFuLXVwZGF0ZXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3JAZ2xlcnJvLnBtLm1lIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi40LjIiCn0="},
+    "47": {"version": "16", "sha256": "1d2w2mhkyff3cx3jcaylbx12p8zifsyn9n6rmh5jbk2wk2vmc6rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGViaWFuLXVwZGF0ZXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3JAZ2xlcnJvLnBtLm1lIiwKICAidmVyc2lvbiI6IDE2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi40LjIiCn0="}
   }}
 , {"uuid": "monitor-brightness-volume@ailin.nemui", "name": "Control monitor brightness and volume with ddcutil", "pname": "control-monitor-brightness-and-volume-with-ddcutil", "description": "Brightness and volume control for monitors. Requires setting up the external ddcutil program for your user.\n\nNote: ensure that ddcutil works properly on the command line before attempting this extension.", "link": "https://extensions.gnome.org/extension/6325/control-monitor-brightness-and-volume-with-ddcutil/", "shell_version_map": {
-    "45": {"version": "7", "sha256": "1x79a61z9ximpwgcb57kvs59az3sj8c7msyapy2knmalfv19szxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiQnJpZ2h0bmVzcyBhbmQgdm9sdW1lIGNvbnRyb2wgZm9yIG1vbml0b3JzLiBSZXF1aXJlcyBzZXR0aW5nIHVwIHRoZSBleHRlcm5hbCBkZGN1dGlsIHByb2dyYW0gZm9yIHlvdXIgdXNlci5cblxuTm90ZTogZW5zdXJlIHRoYXQgZGRjdXRpbCB3b3JrcyBwcm9wZXJseSBvbiB0aGUgY29tbWFuZCBsaW5lIGJlZm9yZSBhdHRlbXB0aW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiQ29udHJvbCBtb25pdG9yIGJyaWdodG5lc3MgYW5kIHZvbHVtZSB3aXRoIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb25pdG9yLWJyaWdodG5lc3Mtdm9sdW1lLy0vaXNzdWVzIiwKICAidXVpZCI6ICJtb25pdG9yLWJyaWdodG5lc3Mtdm9sdW1lQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "46": {"version": "7", "sha256": "1x79a61z9ximpwgcb57kvs59az3sj8c7msyapy2knmalfv19szxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiQnJpZ2h0bmVzcyBhbmQgdm9sdW1lIGNvbnRyb2wgZm9yIG1vbml0b3JzLiBSZXF1aXJlcyBzZXR0aW5nIHVwIHRoZSBleHRlcm5hbCBkZGN1dGlsIHByb2dyYW0gZm9yIHlvdXIgdXNlci5cblxuTm90ZTogZW5zdXJlIHRoYXQgZGRjdXRpbCB3b3JrcyBwcm9wZXJseSBvbiB0aGUgY29tbWFuZCBsaW5lIGJlZm9yZSBhdHRlbXB0aW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiQ29udHJvbCBtb25pdG9yIGJyaWdodG5lc3MgYW5kIHZvbHVtZSB3aXRoIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb25pdG9yLWJyaWdodG5lc3Mtdm9sdW1lLy0vaXNzdWVzIiwKICAidXVpZCI6ICJtb25pdG9yLWJyaWdodG5lc3Mtdm9sdW1lQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "45": {"version": "8", "sha256": "0w8wp0i18qqvl3kcw1q0dkl75lrj4vsxwgskyfdg3fn2z3cf5wvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiQnJpZ2h0bmVzcyBhbmQgdm9sdW1lIGNvbnRyb2wgZm9yIG1vbml0b3JzLiBSZXF1aXJlcyBzZXR0aW5nIHVwIHRoZSBleHRlcm5hbCBkZGN1dGlsIHByb2dyYW0gZm9yIHlvdXIgdXNlci5cblxuTm90ZTogZW5zdXJlIHRoYXQgZGRjdXRpbCB3b3JrcyBwcm9wZXJseSBvbiB0aGUgY29tbWFuZCBsaW5lIGJlZm9yZSBhdHRlbXB0aW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiQ29udHJvbCBtb25pdG9yIGJyaWdodG5lc3MgYW5kIHZvbHVtZSB3aXRoIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAibW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "46": {"version": "8", "sha256": "0w8wp0i18qqvl3kcw1q0dkl75lrj4vsxwgskyfdg3fn2z3cf5wvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiQnJpZ2h0bmVzcyBhbmQgdm9sdW1lIGNvbnRyb2wgZm9yIG1vbml0b3JzLiBSZXF1aXJlcyBzZXR0aW5nIHVwIHRoZSBleHRlcm5hbCBkZGN1dGlsIHByb2dyYW0gZm9yIHlvdXIgdXNlci5cblxuTm90ZTogZW5zdXJlIHRoYXQgZGRjdXRpbCB3b3JrcyBwcm9wZXJseSBvbiB0aGUgY29tbWFuZCBsaW5lIGJlZm9yZSBhdHRlbXB0aW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiQ29udHJvbCBtb25pdG9yIGJyaWdodG5lc3MgYW5kIHZvbHVtZSB3aXRoIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAibW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "47": {"version": "8", "sha256": "0w8wp0i18qqvl3kcw1q0dkl75lrj4vsxwgskyfdg3fn2z3cf5wvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiQnJpZ2h0bmVzcyBhbmQgdm9sdW1lIGNvbnRyb2wgZm9yIG1vbml0b3JzLiBSZXF1aXJlcyBzZXR0aW5nIHVwIHRoZSBleHRlcm5hbCBkZGN1dGlsIHByb2dyYW0gZm9yIHlvdXIgdXNlci5cblxuTm90ZTogZW5zdXJlIHRoYXQgZGRjdXRpbCB3b3JrcyBwcm9wZXJseSBvbiB0aGUgY29tbWFuZCBsaW5lIGJlZm9yZSBhdHRlbXB0aW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiQ29udHJvbCBtb25pdG9yIGJyaWdodG5lc3MgYW5kIHZvbHVtZSB3aXRoIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL05laS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZS8tL2lzc3VlcyIsCiAgInV1aWQiOiAibW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZUBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
 , {"uuid": "network-interfaces-info@alonsogonzalezleal.com", "name": "Network Interfaces Info", "pname": "network-interfaces-info", "description": "Display Network Interfaces Information on GNOME Top Bar.", "link": "https://extensions.gnome.org/extension/6331/network-interfaces-info/", "shell_version_map": {
     "42": {"version": "3", "sha256": "1z5pxlw0p7mm18pnn2b0v9q8slxzw6iq2g41b4f4h9fbifhdmqn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgTmV0d29yayBJbnRlcmZhY2VzIEluZm9ybWF0aW9uIG9uIEdOT01FIFRvcCBCYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmV0d29yay1pbnRlcmZhY2VzLWluZm9AYWxvbnNvZ29uemFsZXpsZWFsLmNvbSIsCiAgIm5hbWUiOiAiTmV0d29yayBJbnRlcmZhY2VzIEluZm8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbG9uc29nb256YWxlemxlYWwvbmV0d29yay1pbnRlcmZhY2VzLWluZm8iLAogICJ1dWlkIjogIm5ldHdvcmstaW50ZXJmYWNlcy1pbmZvQGFsb25zb2dvbnphbGV6bGVhbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -6677,8 +7023,9 @@
     "45": {"version": "1", "sha256": "1jml9vangin17b2qdax5x45zb5mdgkq1xzk977qmpyppxd621m38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoaWxlIGdhbWVtb2RlIGlzIGFjdGl2ZSwgYW4gaWNvbiB3aWxsIGFwcGVhciBpbiB0aGUgU3lzdGVtLVNldHRpbmdzIiwKICAibmFtZSI6ICJHYW1lTW9kZSBJbmRpY2F0b3IgaW4gU3lzdGVtLVNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL1R1bmdzdG5CYWxsb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWdhbWVtb2RlLWluZGljYXRvciIsCiAgInV1aWQiOiAiZ21pbmRAdHVuZ3N0bmJhbGxvbi5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}
   }}
 , {"uuid": "windowgestures@extension.amarullz.com", "name": "Window Gestures", "pname": "window-gestures", "description": "Manage window with touchpad gestures", "link": "https://extensions.gnome.org/extension/6343/window-gestures/", "shell_version_map": {
-    "45": {"version": "7", "sha256": "0lm4fpqwf8kwllw803rgswaal19vkby6p6pbkm3b2jfimyfb4cn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3aW5kb3cgd2l0aCB0b3VjaHBhZCBnZXN0dXJlcyIsCiAgIm5hbWUiOiAiV2luZG93IEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd2dlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFydWxsei93aW5kb3dnZXN0dXJlcyIsCiAgInV1aWQiOiAid2luZG93Z2VzdHVyZXNAZXh0ZW5zaW9uLmFtYXJ1bGx6LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "46": {"version": "7", "sha256": "0lm4fpqwf8kwllw803rgswaal19vkby6p6pbkm3b2jfimyfb4cn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3aW5kb3cgd2l0aCB0b3VjaHBhZCBnZXN0dXJlcyIsCiAgIm5hbWUiOiAiV2luZG93IEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd2dlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFydWxsei93aW5kb3dnZXN0dXJlcyIsCiAgInV1aWQiOiAid2luZG93Z2VzdHVyZXNAZXh0ZW5zaW9uLmFtYXJ1bGx6LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}
+    "45": {"version": "8", "sha256": "1axyb9rcjmk48w3v2ffq20n082a051kjb6a6m68bkcbrd0hm5ica", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3aW5kb3cgd2l0aCB0b3VjaHBhZCBnZXN0dXJlcyIsCiAgIm5hbWUiOiAiV2luZG93IEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd2dlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1hcnVsbHovd2luZG93Z2VzdHVyZXMiLAogICJ1dWlkIjogIndpbmRvd2dlc3R1cmVzQGV4dGVuc2lvbi5hbWFydWxsei5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "1axyb9rcjmk48w3v2ffq20n082a051kjb6a6m68bkcbrd0hm5ica", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3aW5kb3cgd2l0aCB0b3VjaHBhZCBnZXN0dXJlcyIsCiAgIm5hbWUiOiAiV2luZG93IEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd2dlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1hcnVsbHovd2luZG93Z2VzdHVyZXMiLAogICJ1dWlkIjogIndpbmRvd2dlc3R1cmVzQGV4dGVuc2lvbi5hbWFydWxsei5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "1axyb9rcjmk48w3v2ffq20n082a051kjb6a6m68bkcbrd0hm5ica", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3aW5kb3cgd2l0aCB0b3VjaHBhZCBnZXN0dXJlcyIsCiAgIm5hbWUiOiAiV2luZG93IEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd2dlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1hcnVsbHovd2luZG93Z2VzdHVyZXMiLAogICJ1dWlkIjogIndpbmRvd2dlc3R1cmVzQGV4dGVuc2lvbi5hbWFydWxsei5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "transcode-greek@pavlidic", "name": "Transcode Greek", "pname": "transcode-greek", "description": "Searching apps both direct and transcoded name (English, Greek langs)", "link": "https://extensions.gnome.org/extension/6346/transcode-greek/", "shell_version_map": {
     "38": {"version": "1", "sha256": "0ryfi2xmdqs0r7c3jmqpsqbgszsqzsc2m6n01xs1zrai7pbxlb1h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIEdyZWVrIGxhbmdzKSIsCiAgIm5hbWUiOiAiVHJhbnNjb2RlIEdyZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZsaWRpYy9nbm9tZS1leHRlbnNpb24tdHJhbnNjb2RlLXNlYXJjaGFwcC1ncmVlayIsCiAgInV1aWQiOiAidHJhbnNjb2RlLWdyZWVrQHBhdmxpZGljIiwKICAidmVyc2lvbiI6IDEKfQ=="},
@@ -6692,13 +7039,15 @@
     "43": {"version": "3", "sha256": "19nip1ac7diznvhkh6f98zygvcng25jk39j5axhbmq7gv3pjkgk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZpZXJ0ZSBlbCBEb2xhciBBbWVyaWNhbm8gVVNEIGEgcGVzb3MgY2hpbGVub3MgQ0xQIHVzYW5kbyBsYSBhcGkgTWlJbmRpY2Fkb3IuY2wgaHR0cHM6Ly9taW5kaWNhZG9yLmNsL2FwaS9kb2xhci4iLAogICJuYW1lIjogIkRvbGFyIGEgQ0xQIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9KNGNrbi9kb2xhci1hLWNscCIsCiAgInV1aWQiOiAiZG9sYXItYS1jbHBAajRja24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
     "44": {"version": "3", "sha256": "19nip1ac7diznvhkh6f98zygvcng25jk39j5axhbmq7gv3pjkgk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZpZXJ0ZSBlbCBEb2xhciBBbWVyaWNhbm8gVVNEIGEgcGVzb3MgY2hpbGVub3MgQ0xQIHVzYW5kbyBsYSBhcGkgTWlJbmRpY2Fkb3IuY2wgaHR0cHM6Ly9taW5kaWNhZG9yLmNsL2FwaS9kb2xhci4iLAogICJuYW1lIjogIkRvbGFyIGEgQ0xQIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9KNGNrbi9kb2xhci1hLWNscCIsCiAgInV1aWQiOiAiZG9sYXItYS1jbHBAajRja24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
-, {"uuid": "disable-workspace-switcher-overlay@cleardevice", "name": "Disable workspace switcher overlay", "pname": "disable-workspace-switcher-overlay", "description": "Disable the workspace switcher popup GNOME Shell 45-46 (overlay displayed when switching between workspaces).", "link": "https://extensions.gnome.org/extension/6358/disable-workspace-switcher-overlay/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "1hcd3fjmd35cbzhnp5sl7x805mk75zfab7j0wb29gx42kk9qzmij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBHTk9NRSBTaGVsbCA0NS00NiAob3ZlcmxheSBkaXNwbGF5ZWQgd2hlbiBzd2l0Y2hpbmcgYmV0d2VlbiB3b3Jrc3BhY2VzKS4iLAogICJuYW1lIjogIkRpc2FibGUgd29ya3NwYWNlIHN3aXRjaGVyIG92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsZWFyZGV2aWNlL2dub21lLWRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJkaXNhYmxlLXdvcmtzcGFjZS1zd2l0Y2hlci1vdmVybGF5QGNsZWFyZGV2aWNlIiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "46": {"version": "2", "sha256": "1hcd3fjmd35cbzhnp5sl7x805mk75zfab7j0wb29gx42kk9qzmij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBHTk9NRSBTaGVsbCA0NS00NiAob3ZlcmxheSBkaXNwbGF5ZWQgd2hlbiBzd2l0Y2hpbmcgYmV0d2VlbiB3b3Jrc3BhY2VzKS4iLAogICJuYW1lIjogIkRpc2FibGUgd29ya3NwYWNlIHN3aXRjaGVyIG92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsZWFyZGV2aWNlL2dub21lLWRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJkaXNhYmxlLXdvcmtzcGFjZS1zd2l0Y2hlci1vdmVybGF5QGNsZWFyZGV2aWNlIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+, {"uuid": "disable-workspace-switcher-overlay@cleardevice", "name": "Disable workspace switcher animation overlay. Gnome 45, 46, 47", "pname": "disable-workspace-switcher-overlay", "description": "Disable the workspace switcher popup GNOME Shell 45, 46, 47 (overlay displayed when switching between workspaces).", "link": "https://extensions.gnome.org/extension/6358/disable-workspace-switcher-overlay/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "0i7zbc30jdg7b4c3zchrpz0anx3hkvkbpg670z274lclisbijz4m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBHTk9NRSBTaGVsbCA0NSwgNDYsIDQ3IChvdmVybGF5IGRpc3BsYXllZCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMpLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgb3ZlcmxheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsZWFyZGV2aWNlL2dub21lLWRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJkaXNhYmxlLXdvcmtzcGFjZS1zd2l0Y2hlci1vdmVybGF5QGNsZWFyZGV2aWNlIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "46": {"version": "4", "sha256": "0i7zbc30jdg7b4c3zchrpz0anx3hkvkbpg670z274lclisbijz4m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBHTk9NRSBTaGVsbCA0NSwgNDYsIDQ3IChvdmVybGF5IGRpc3BsYXllZCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMpLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgb3ZlcmxheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsZWFyZGV2aWNlL2dub21lLWRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJkaXNhYmxlLXdvcmtzcGFjZS1zd2l0Y2hlci1vdmVybGF5QGNsZWFyZGV2aWNlIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "47": {"version": "4", "sha256": "0i7zbc30jdg7b4c3zchrpz0anx3hkvkbpg670z274lclisbijz4m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBHTk9NRSBTaGVsbCA0NSwgNDYsIDQ3IChvdmVybGF5IGRpc3BsYXllZCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMpLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgb3ZlcmxheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsZWFyZGV2aWNlL2dub21lLWRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJkaXNhYmxlLXdvcmtzcGFjZS1zd2l0Y2hlci1vdmVybGF5QGNsZWFyZGV2aWNlIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
 , {"uuid": "alt-launcher@oxayotl.github.io", "name": "Alt+Tab Launcher", "pname": "alttab-launcher", "description": "Launch favorite apps from Alt+Tab (and Super+Tab) popup", "link": "https://extensions.gnome.org/extension/6361/alttab-launcher/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "17djcbwajxmxcz7zldla9jyvacbr7yxcavnf1d0qnijmy8jgga9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBmYXZvcml0ZSBhcHBzIGZyb20gQWx0K1RhYiAoYW5kIFN1cGVyK1RhYikgcG9wdXAiLAogICJuYW1lIjogIkFsdCtUYWIgTGF1bmNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL294YXlvdGwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItbGF1bmNoZXIiLAogICJ1dWlkIjogImFsdC1sYXVuY2hlckBveGF5b3RsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="},
-    "46": {"version": "3", "sha256": "17djcbwajxmxcz7zldla9jyvacbr7yxcavnf1d0qnijmy8jgga9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBmYXZvcml0ZSBhcHBzIGZyb20gQWx0K1RhYiAoYW5kIFN1cGVyK1RhYikgcG9wdXAiLAogICJuYW1lIjogIkFsdCtUYWIgTGF1bmNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL294YXlvdGwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItbGF1bmNoZXIiLAogICJ1dWlkIjogImFsdC1sYXVuY2hlckBveGF5b3RsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}
+    "45": {"version": "4", "sha256": "1gr9y5gl4k7sp8nzaa8y20xa2ha6avwlfyn1frpy7nffkiln3aqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBmYXZvcml0ZSBhcHBzIGZyb20gQWx0K1RhYiAoYW5kIFN1cGVyK1RhYikgcG9wdXAiLAogICJuYW1lIjogIkFsdCtUYWIgTGF1bmNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9veGF5b3RsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLWxhdW5jaGVyIiwKICAidXVpZCI6ICJhbHQtbGF1bmNoZXJAb3hheW90bC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "1gr9y5gl4k7sp8nzaa8y20xa2ha6avwlfyn1frpy7nffkiln3aqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBmYXZvcml0ZSBhcHBzIGZyb20gQWx0K1RhYiAoYW5kIFN1cGVyK1RhYikgcG9wdXAiLAogICJuYW1lIjogIkFsdCtUYWIgTGF1bmNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9veGF5b3RsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLWxhdW5jaGVyIiwKICAidXVpZCI6ICJhbHQtbGF1bmNoZXJAb3hheW90bC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "1gr9y5gl4k7sp8nzaa8y20xa2ha6avwlfyn1frpy7nffkiln3aqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBmYXZvcml0ZSBhcHBzIGZyb20gQWx0K1RhYiAoYW5kIFN1cGVyK1RhYikgcG9wdXAiLAogICJuYW1lIjogIkFsdCtUYWIgTGF1bmNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9veGF5b3RsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLWxhdW5jaGVyIiwKICAidXVpZCI6ICJhbHQtbGF1bmNoZXJAb3hheW90bC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "multicore-system-monitor@igrek.dev", "name": "multicore-system-monitor", "pname": "multicore-system-monitor", "description": "Show consumption of each CPU core and memory", "link": "https://extensions.gnome.org/extension/6364/multicore-system-monitor/", "shell_version_map": {
     "44": {"version": "2", "sha256": "1c7pa2afmimljxvlg93gmlvc9wj48wh8dni4kra48wh73ishv0d9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29uc3VtcHRpb24gb2YgZWFjaCBDUFUgY29yZSBhbmQgbWVtb3J5IiwKICAibmFtZSI6ICJtdWx0aWNvcmUtc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWdyZWs1MS9tdWx0aWNvcmUtbW9uaXRvciIsCiAgInV1aWQiOiAibXVsdGljb3JlLXN5c3RlbS1tb25pdG9yQGlncmVrLmRldiIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -6709,28 +7058,33 @@
     "45": {"version": "2", "sha256": "1g3mvwlg1v6g4whrnb0radqmj6vq1799z9llsv64zbldwk4w5wag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGN1cnJlbnQgZG93bmxvYWQgdXBsb2FkIHNwZWVkIG9uIHBhbmVsIFxuVGhpcyBleHRlbnNpb24gaXMgYSBHbm9tZSA0NSBhZGFwdGlvbiBvZiBOZXQgU3BlZWQgYnkgQWx5bnhaaG91IiwKICAibmFtZSI6ICJwaW5ndVhuZXRMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9fcGluZ3VYL3Bpbmd1eG5ldGxhYmVsIiwKICAidXVpZCI6ICJwaW5ndVhuZXRMYWJlbEBwaW5ndVguYVRhIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "weekstartmodifier@saccuzm.gmail.com", "name": "Week Start Modifier", "pname": "week-start-modifier", "description": "Modify starting day of the week", "link": "https://extensions.gnome.org/extension/6382/week-start-modifier/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "0pnyq1sjhl18jfmlm5a7p6x5c64ygaya3dj4pd4sn5r4w38v61vi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vZGlmeSBzdGFydGluZyBkYXkgb2YgdGhlIHdlZWsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiV2VlayBTdGFydCBNb2RpZmllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53ZWVrc3RhcnRtb2RpZmllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FjY3V6L3dlZWstc3RhcnQtbW9kaWZpZXIiLAogICJ1dWlkIjogIndlZWtzdGFydG1vZGlmaWVyQHNhY2N1em0uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "3", "sha256": "0pnyq1sjhl18jfmlm5a7p6x5c64ygaya3dj4pd4sn5r4w38v61vi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vZGlmeSBzdGFydGluZyBkYXkgb2YgdGhlIHdlZWsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiV2VlayBTdGFydCBNb2RpZmllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53ZWVrc3RhcnRtb2RpZmllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FjY3V6L3dlZWstc3RhcnQtbW9kaWZpZXIiLAogICJ1dWlkIjogIndlZWtzdGFydG1vZGlmaWVyQHNhY2N1em0uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "45": {"version": "4", "sha256": "0v4lgyh9inds2x0p6ffkahr2jb2vsk23xi3pkl5w6ps2xaxw8wfz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vZGlmeSBzdGFydGluZyBkYXkgb2YgdGhlIHdlZWsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiV2VlayBTdGFydCBNb2RpZmllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53ZWVrc3RhcnRtb2RpZmllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhY2N1ei93ZWVrLXN0YXJ0LW1vZGlmaWVyIiwKICAidXVpZCI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "0v4lgyh9inds2x0p6ffkahr2jb2vsk23xi3pkl5w6ps2xaxw8wfz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vZGlmeSBzdGFydGluZyBkYXkgb2YgdGhlIHdlZWsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiV2VlayBTdGFydCBNb2RpZmllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53ZWVrc3RhcnRtb2RpZmllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhY2N1ei93ZWVrLXN0YXJ0LW1vZGlmaWVyIiwKICAidXVpZCI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "0v4lgyh9inds2x0p6ffkahr2jb2vsk23xi3pkl5w6ps2xaxw8wfz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vZGlmeSBzdGFydGluZyBkYXkgb2YgdGhlIHdlZWsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiV2VlayBTdGFydCBNb2RpZmllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53ZWVrc3RhcnRtb2RpZmllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhY2N1ei93ZWVrLXN0YXJ0LW1vZGlmaWVyIiwKICAidXVpZCI6ICJ3ZWVrc3RhcnRtb2RpZmllckBzYWNjdXptLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "steal-my-focus-window@steal-my-focus-window", "name": "Steal my focus window", "pname": "steal-my-focus-window", "description": "Remove the 'window is ready' message and focus the window instead. This is a fork of the 'Steal My Focus' extension to add GNOME 45 support.", "link": "https://extensions.gnome.org/extension/6385/steal-my-focus-window/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "09imn1j7hx5nw1ymj3gxq4yg1vns0l279w42kcry65vcvdwx54aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgJ3dpbmRvdyBpcyByZWFkeScgbWVzc2FnZSBhbmQgZm9jdXMgdGhlIHdpbmRvdyBpbnN0ZWFkLiBUaGlzIGlzIGEgZm9yayBvZiB0aGUgJ1N0ZWFsIE15IEZvY3VzJyBleHRlbnNpb24gdG8gYWRkIEdOT01FIDQ1IHN1cHBvcnQuIiwKICAibmFtZSI6ICJTdGVhbCBteSBmb2N1cyB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3YtZGltaXRyb3YvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN0ZWFsbXlmb2N1cyIsCiAgInV1aWQiOiAic3RlYWwtbXktZm9jdXMtd2luZG93QHN0ZWFsLW15LWZvY3VzLXdpbmRvdyIsCiAgInZlcnNpb24iOiAzCn0="},
-    "46": {"version": "3", "sha256": "09imn1j7hx5nw1ymj3gxq4yg1vns0l279w42kcry65vcvdwx54aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgJ3dpbmRvdyBpcyByZWFkeScgbWVzc2FnZSBhbmQgZm9jdXMgdGhlIHdpbmRvdyBpbnN0ZWFkLiBUaGlzIGlzIGEgZm9yayBvZiB0aGUgJ1N0ZWFsIE15IEZvY3VzJyBleHRlbnNpb24gdG8gYWRkIEdOT01FIDQ1IHN1cHBvcnQuIiwKICAibmFtZSI6ICJTdGVhbCBteSBmb2N1cyB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3YtZGltaXRyb3YvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN0ZWFsbXlmb2N1cyIsCiAgInV1aWQiOiAic3RlYWwtbXktZm9jdXMtd2luZG93QHN0ZWFsLW15LWZvY3VzLXdpbmRvdyIsCiAgInZlcnNpb24iOiAzCn0="}
+    "45": {"version": "4", "sha256": "1cqra3y3cq78nd4zl06i2m92532qiib2f26w0nzzf2zpiz7r4l18", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgJ3dpbmRvdyBpcyByZWFkeScgbWVzc2FnZSBhbmQgZm9jdXMgdGhlIHdpbmRvdyBpbnN0ZWFkLiBUaGlzIGlzIGEgZm9yayBvZiB0aGUgJ1N0ZWFsIE15IEZvY3VzJyBleHRlbnNpb24gdG8gYWRkIEdOT01FIDQ1IHN1cHBvcnQuIiwKICAibmFtZSI6ICJTdGVhbCBteSBmb2N1cyB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92LWRpbWl0cm92L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zdGVhbG15Zm9jdXMiLAogICJ1dWlkIjogInN0ZWFsLW15LWZvY3VzLXdpbmRvd0BzdGVhbC1teS1mb2N1cy13aW5kb3ciLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "1cqra3y3cq78nd4zl06i2m92532qiib2f26w0nzzf2zpiz7r4l18", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgJ3dpbmRvdyBpcyByZWFkeScgbWVzc2FnZSBhbmQgZm9jdXMgdGhlIHdpbmRvdyBpbnN0ZWFkLiBUaGlzIGlzIGEgZm9yayBvZiB0aGUgJ1N0ZWFsIE15IEZvY3VzJyBleHRlbnNpb24gdG8gYWRkIEdOT01FIDQ1IHN1cHBvcnQuIiwKICAibmFtZSI6ICJTdGVhbCBteSBmb2N1cyB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92LWRpbWl0cm92L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zdGVhbG15Zm9jdXMiLAogICJ1dWlkIjogInN0ZWFsLW15LWZvY3VzLXdpbmRvd0BzdGVhbC1teS1mb2N1cy13aW5kb3ciLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "1cqra3y3cq78nd4zl06i2m92532qiib2f26w0nzzf2zpiz7r4l18", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgJ3dpbmRvdyBpcyByZWFkeScgbWVzc2FnZSBhbmQgZm9jdXMgdGhlIHdpbmRvdyBpbnN0ZWFkLiBUaGlzIGlzIGEgZm9yayBvZiB0aGUgJ1N0ZWFsIE15IEZvY3VzJyBleHRlbnNpb24gdG8gYWRkIEdOT01FIDQ1IHN1cHBvcnQuIiwKICAibmFtZSI6ICJTdGVhbCBteSBmb2N1cyB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92LWRpbWl0cm92L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zdGVhbG15Zm9jdXMiLAogICJ1dWlkIjogInN0ZWFsLW15LWZvY3VzLXdpbmRvd0BzdGVhbC1teS1mb2N1cy13aW5kb3ciLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "perma-clip@susannedev.com", "name": "Perma Clip", "pname": "perma-clip", "description": "Add up to 10 strings to clipboard permanently. Useful for quickly pasting passwords.", "link": "https://extensions.gnome.org/extension/6388/perma-clip/", "shell_version_map": {
     "42": {"version": "3", "sha256": "01pb072dy77h0047hkbnsmdsfmzcwp7mjyglp66g1yvgliawlv09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1cCB0byAxMCBzdHJpbmdzIHRvIGNsaXBib2FyZCBwZXJtYW5lbnRseS4gVXNlZnVsIGZvciBxdWlja2x5IHBhc3RpbmcgcGFzc3dvcmRzLiIsCiAgIm5hbWUiOiAiUGVybWEgQ2xpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJtYS1jbGlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RoZUdyZWdzdGVyMTExMS9wZXJtYS1jbGlwIiwKICAidXVpZCI6ICJwZXJtYS1jbGlwQHN1c2FubmVkZXYuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
 , {"uuid": "simple-workspaces-bar@null-git", "name": "Simple Workspaces Bar", "pname": "simple-workspaces-bar", "description": "Replace 'Activities' button by all current workspaces buttons. Switch workspace or toggle overview by clicking on these buttons.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.\n\nThis is a GNOME 45+ compatible fork of https://extensions.gnome.org/extension/3851/workspaces-bar/", "link": "https://extensions.gnome.org/extension/6394/simple-workspaces-bar/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "0g7ldnm718kf9qy25ssls1b5gx2rv1hq0cwig5cxsgxmirvfjfgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cblRoaXMgaXMgYSBHTk9NRSA0NSBjb21wYXRpYmxlIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzg1MS93b3Jrc3BhY2VzLWJhci8iLAogICJuYW1lIjogIlNpbXBsZSBXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbnVsbC1naXQvc2ltcGxlLXdvcmtzcGFjZXMtYmFyIiwKICAidXVpZCI6ICJzaW1wbGUtd29ya3NwYWNlcy1iYXJAbnVsbC1naXQiLAogICJ2ZXJzaW9uIjogMwp9"},
-    "46": {"version": "3", "sha256": "0g7ldnm718kf9qy25ssls1b5gx2rv1hq0cwig5cxsgxmirvfjfgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cblRoaXMgaXMgYSBHTk9NRSA0NSBjb21wYXRpYmxlIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzg1MS93b3Jrc3BhY2VzLWJhci8iLAogICJuYW1lIjogIlNpbXBsZSBXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbnVsbC1naXQvc2ltcGxlLXdvcmtzcGFjZXMtYmFyIiwKICAidXVpZCI6ICJzaW1wbGUtd29ya3NwYWNlcy1iYXJAbnVsbC1naXQiLAogICJ2ZXJzaW9uIjogMwp9"}
+    "45": {"version": "4", "sha256": "1b0f5bxacsirppbq70ms5w2vn42p83yadc77sjskly8fhj0xy27l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cblRoaXMgaXMgYSBHTk9NRSA0NSsgY29tcGF0aWJsZSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzM4NTEvd29ya3NwYWNlcy1iYXIvIiwKICAibmFtZSI6ICJTaW1wbGUgV29ya3NwYWNlcyBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9udWxsLWdpdC9zaW1wbGUtd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogInNpbXBsZS13b3Jrc3BhY2VzLWJhckBudWxsLWdpdCIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1b0f5bxacsirppbq70ms5w2vn42p83yadc77sjskly8fhj0xy27l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cblRoaXMgaXMgYSBHTk9NRSA0NSsgY29tcGF0aWJsZSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzM4NTEvd29ya3NwYWNlcy1iYXIvIiwKICAibmFtZSI6ICJTaW1wbGUgV29ya3NwYWNlcyBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9udWxsLWdpdC9zaW1wbGUtd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogInNpbXBsZS13b3Jrc3BhY2VzLWJhckBudWxsLWdpdCIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1b0f5bxacsirppbq70ms5w2vn42p83yadc77sjskly8fhj0xy27l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cblRoaXMgaXMgYSBHTk9NRSA0NSsgY29tcGF0aWJsZSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzM4NTEvd29ya3NwYWNlcy1iYXIvIiwKICAibmFtZSI6ICJTaW1wbGUgV29ya3NwYWNlcyBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9udWxsLWdpdC9zaW1wbGUtd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogInNpbXBsZS13b3Jrc3BhY2VzLWJhckBudWxsLWdpdCIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "speedinator@liam.moe", "name": "Speedinator", "pname": "speedinator", "description": "Control the speed of gnome-shell animations", "link": "https://extensions.gnome.org/extension/6397/speedinator/", "shell_version_map": {
-    "45": {"version": "5", "sha256": "1y16y9lbns8qzmqydd6c0c0dsj1h9996j3j2r7h33i1wwjz9asj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIHNwZWVkIG9mIGdub21lLXNoZWxsIGFuaW1hdGlvbnMiLAogICJuYW1lIjogIlNwZWVkaW5hdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1vZS5saWFtLnNwZWVkaW5hdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90ZWhzcXVpZGdlL3NwZWVkaW5hdG9yIiwKICAidXVpZCI6ICJzcGVlZGluYXRvckBsaWFtLm1vZSIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "46": {"version": "5", "sha256": "1y16y9lbns8qzmqydd6c0c0dsj1h9996j3j2r7h33i1wwjz9asj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIHNwZWVkIG9mIGdub21lLXNoZWxsIGFuaW1hdGlvbnMiLAogICJuYW1lIjogIlNwZWVkaW5hdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1vZS5saWFtLnNwZWVkaW5hdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90ZWhzcXVpZGdlL3NwZWVkaW5hdG9yIiwKICAidXVpZCI6ICJzcGVlZGluYXRvckBsaWFtLm1vZSIsCiAgInZlcnNpb24iOiA1Cn0="}
+    "45": {"version": "6", "sha256": "19w94nkswr9sx64j6v1b1j2gp7wr3y0f7l3c57vsn74q89rzks30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIHNwZWVkIG9mIGdub21lLXNoZWxsIGFuaW1hdGlvbnMiLAogICJuYW1lIjogIlNwZWVkaW5hdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1vZS5saWFtLnNwZWVkaW5hdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGVoc3F1aWRnZS9zcGVlZGluYXRvciIsCiAgInV1aWQiOiAic3BlZWRpbmF0b3JAbGlhbS5tb2UiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "46": {"version": "6", "sha256": "19w94nkswr9sx64j6v1b1j2gp7wr3y0f7l3c57vsn74q89rzks30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIHNwZWVkIG9mIGdub21lLXNoZWxsIGFuaW1hdGlvbnMiLAogICJuYW1lIjogIlNwZWVkaW5hdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1vZS5saWFtLnNwZWVkaW5hdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGVoc3F1aWRnZS9zcGVlZGluYXRvciIsCiAgInV1aWQiOiAic3BlZWRpbmF0b3JAbGlhbS5tb2UiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "47": {"version": "6", "sha256": "19w94nkswr9sx64j6v1b1j2gp7wr3y0f7l3c57vsn74q89rzks30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIHNwZWVkIG9mIGdub21lLXNoZWxsIGFuaW1hdGlvbnMiLAogICJuYW1lIjogIlNwZWVkaW5hdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1vZS5saWFtLnNwZWVkaW5hdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGVoc3F1aWRnZS9zcGVlZGluYXRvciIsCiAgInV1aWQiOiAic3BlZWRpbmF0b3JAbGlhbS5tb2UiLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "phi@ziyagenc.github.com", "name": "Phi: Pi-hole Indicator", "pname": "phi-pi-hole-indicator", "description": "Quickly access your beloved Pi-hole from GNOME Shell.\n\nPhi provides the following features:\n- Monitor single or multiple Pi-hole instances,\n- Enable/disable blocking,\n- Display status and main statistics,\n- Show version information of Pi-hole, and notify when there is an update.\n\nYou can also configure Phi to look for Pi-hole only in a certain network. This might be useful if your computer connects to school, work or public Wi-Fi.", "link": "https://extensions.gnome.org/extension/6400/phi-pi-hole-indicator/", "shell_version_map": {
     "44": {"version": "6", "sha256": "0mdqa357d2px0ssdwxngdvdvabvvd7hg3j8c03jwfgqp36s4mn0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpLWhvbGUgaW5kaWNhdG9yIGZvciBHTk9NRSBTaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUGhpOiBQaS1ob2xlIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veml5YWdlbmMvcGhpIiwKICAidXVpZCI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="},
-    "45": {"version": "12", "sha256": "0zvymwqqni4rsl5fcalc1bicy76mwpwd7www4f5r35ny8n9nwdqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpLWhvbGUgaW5kaWNhdG9yIGZvciBHTk9NRSBTaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUGhpOiBQaS1ob2xlIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ppeWFnZW5jL3BoaSIsCiAgInV1aWQiOiAicGhpQHppeWFnZW5jLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIsCiAgInZlcnNpb24tbmFtZSI6ICIxLjUiCn0="},
-    "46": {"version": "12", "sha256": "0zvymwqqni4rsl5fcalc1bicy76mwpwd7www4f5r35ny8n9nwdqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpLWhvbGUgaW5kaWNhdG9yIGZvciBHTk9NRSBTaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUGhpOiBQaS1ob2xlIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ppeWFnZW5jL3BoaSIsCiAgInV1aWQiOiAicGhpQHppeWFnZW5jLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIsCiAgInZlcnNpb24tbmFtZSI6ICIxLjUiCn0="}
+    "45": {"version": "13", "sha256": "1x09vs7v6rm2sy5013cgwn7v3gmhcfpyd396vxbdjipxqb1za55g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpLWhvbGUgaW5kaWNhdG9yIGZvciBHTk9NRSBTaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUGhpOiBQaS1ob2xlIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aXlhZ2VuYy9waGkiLAogICJ1dWlkIjogInBoaUB6aXlhZ2VuYy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS42Igp9"},
+    "46": {"version": "13", "sha256": "1x09vs7v6rm2sy5013cgwn7v3gmhcfpyd396vxbdjipxqb1za55g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpLWhvbGUgaW5kaWNhdG9yIGZvciBHTk9NRSBTaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUGhpOiBQaS1ob2xlIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aXlhZ2VuYy9waGkiLAogICJ1dWlkIjogInBoaUB6aXlhZ2VuYy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS42Igp9"},
+    "47": {"version": "13", "sha256": "1x09vs7v6rm2sy5013cgwn7v3gmhcfpyd396vxbdjipxqb1za55g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpLWhvbGUgaW5kaWNhdG9yIGZvciBHTk9NRSBTaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaGlAeml5YWdlbmMuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUGhpOiBQaS1ob2xlIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aXlhZ2VuYy9waGkiLAogICJ1dWlkIjogInBoaUB6aXlhZ2VuYy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS42Igp9"}
   }}
 , {"uuid": "net-label@slimani.dev", "name": "NetLabel", "pname": "netlabel", "description": "Shows current download upload speed on panel \nThis extension is a Gnome 45 adaption of Net Speed by AlynxZhou", "link": "https://extensions.gnome.org/extension/6403/netlabel/", "shell_version_map": {
     "45": {"version": "1", "sha256": "0jc219z5jmx9p5gasp25fzbhnyyl1gchq0nyxn20zp70kmzg2f7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGN1cnJlbnQgZG93bmxvYWQgdXBsb2FkIHNwZWVkIG9uIHBhbmVsIFxuVGhpcyBleHRlbnNpb24gaXMgYSBHbm9tZSA0NSBhZGFwdGlvbiBvZiBOZXQgU3BlZWQgYnkgQWx5bnhaaG91IiwKICAibmFtZSI6ICJOZXRMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tb2gtc2xpbWFuaS9uZXQtbGFiZWwiLAogICJ1dWlkIjogIm5ldC1sYWJlbEBzbGltYW5pLmRldiIsCiAgInZlcnNpb24iOiAxCn0="}
@@ -6738,15 +7092,18 @@
 , {"uuid": "update-extension@purejava.org", "name": "Fedora Linux Update Indicator", "pname": "fedora-linux-update-indicator", "description": "GNOME Shell update indicator for Fedora Linux.\n  This is based on Arch Linux Updates Indicator by Raphaël Rochet.\n  This extension is not affiliated, funded, or in any way associated with Fedora brand and Red Hat Software.", "link": "https://extensions.gnome.org/extension/6406/fedora-linux-update-indicator/", "shell_version_map": {
     "44": {"version": "8", "sha256": "1rc6431z90k7ad2bqrkqsxjwh1dwf0swkbj0r8c3df084cs62fln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS5cbiAgU2VlIFJFQURNRSBhYm91dCBHbm9tZSBDb25zb2xlIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wdXJlamF2YS9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "45": {"version": "10", "sha256": "0ww9j0ijqpa69nggq7kjkcx19qkk5cmkv2axrjk45p1c9h3jidkg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wdXJlamF2YS9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "46": {"version": "13", "sha256": "1913s6r0pskc3qjkfndiwjyd8vr8c26pdimlzf43zi4jpqq3m3yw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wdXJlamF2YS9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}
+    "46": {"version": "21", "sha256": "1cm3hwkfvmqgqm785an2wmcsa95li86h6va282mdh9kg8vrrsb20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHVyZWphdmEvZmVkb3JhLXVwZGF0ZSIsCiAgInV1aWQiOiAidXBkYXRlLWV4dGVuc2lvbkBwdXJlamF2YS5vcmciLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
+    "47": {"version": "21", "sha256": "1cm3hwkfvmqgqm785an2wmcsa95li86h6va282mdh9kg8vrrsb20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHVyZWphdmEvZmVkb3JhLXVwZGF0ZSIsCiAgInV1aWQiOiAidXBkYXRlLWV4dGVuc2lvbkBwdXJlamF2YS5vcmciLAogICJ2ZXJzaW9uIjogMjEKfQ=="}
   }}
 , {"uuid": "utc-clock@swsnr.de", "name": "UTC clock", "pname": "utc-clock", "description": "A customizable UTC clock.\n\nAdd a second clock to the bar which shows the current UTC time, in a completely customizable format.", "link": "https://extensions.gnome.org/extension/6409/utc-clock/", "shell_version_map": {
     "45": {"version": "16", "sha256": "0iyy0fyf9ry5mj7jmqpmcs9rp74hhzmdwsipzh7bwnspxsb3ldf4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY3VzdG9taXphYmxlIFVUQyBjbG9jay5cblxuQWRkIGEgc2Vjb25kIGNsb2NrIHRvIHRoZSBiYXIgd2hpY2ggc2hvd3MgdGhlIGN1cnJlbnQgVVRDIHRpbWUsIGluIGEgY29tcGxldGVseSBjdXN0b21pemFibGUgZm9ybWF0LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAic3dzbnIiCiAgfSwKICAibmFtZSI6ICJVVEMgY2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItdXRjLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi11dGMtY2xvY2sjcmVhZG1lIiwKICAidXVpZCI6ICJ1dGMtY2xvY2tAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMTYsCiAgInZlcnNpb24tbmFtZSI6ICI0NS41Igp9"},
-    "46": {"version": "14", "sha256": "03s4wa6c21jgcr2l5adqmz9mxrpq3idfpi7hp99ns9gdi24p4sln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY3VzdG9taXphYmxlIFVUQyBjbG9jay5cblxuQWRkIGEgc2Vjb25kIGNsb2NrIHRvIHRoZSBiYXIgd2hpY2ggc2hvd3MgdGhlIGN1cnJlbnQgVVRDIHRpbWUsIGluIGEgY29tcGxldGVseSBjdXN0b21pemFibGUgZm9ybWF0LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAic3dzbnIiCiAgfSwKICAibmFtZSI6ICJVVEMgY2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItdXRjLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi11dGMtY2xvY2sjcmVhZG1lIiwKICAidXVpZCI6ICJ1dGMtY2xvY2tAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMTQsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yIgp9"}
+    "46": {"version": "18", "sha256": "1qk2509r64ch0mr6iw3a3wdwx7j44issqfd84nvck2kgjl2z5zm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY3VzdG9taXphYmxlIFVUQyBjbG9jay5cblxuQWRkIGEgc2Vjb25kIGNsb2NrIHRvIHRoZSBiYXIgd2hpY2ggc2hvd3MgdGhlIGN1cnJlbnQgVVRDIHRpbWUsIGluIGEgY29tcGxldGVseSBjdXN0b21pemFibGUgZm9ybWF0LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAic3dzbnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidXRjLWNsb2NrQHN3c25yLmRlIiwKICAibmFtZSI6ICJVVEMgY2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItdXRjLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd3Nuci9nbm9tZS1zaGVsbC1leHRlbnNpb24tdXRjLWNsb2NrI3JlYWRtZSIsCiAgInV1aWQiOiAidXRjLWNsb2NrQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuNCIKfQ=="},
+    "47": {"version": "18", "sha256": "1qk2509r64ch0mr6iw3a3wdwx7j44issqfd84nvck2kgjl2z5zm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY3VzdG9taXphYmxlIFVUQyBjbG9jay5cblxuQWRkIGEgc2Vjb25kIGNsb2NrIHRvIHRoZSBiYXIgd2hpY2ggc2hvd3MgdGhlIGN1cnJlbnQgVVRDIHRpbWUsIGluIGEgY29tcGxldGVseSBjdXN0b21pemFibGUgZm9ybWF0LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAic3dzbnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidXRjLWNsb2NrQHN3c25yLmRlIiwKICAibmFtZSI6ICJVVEMgY2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItdXRjLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd3Nuci9nbm9tZS1zaGVsbC1leHRlbnNpb24tdXRjLWNsb2NrI3JlYWRtZSIsCiAgInV1aWQiOiAidXRjLWNsb2NrQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuNCIKfQ=="}
   }}
 , {"uuid": "iso8601ish@S410", "name": "ISO8601-ish Clock", "pname": "iso8601-ish-clock", "description": "Overrides Gnome's clock format with ISO8601-inspired one.\n\nClock preferences in Date & Time section of Gnome Settings are respected, in a way.\n\"Date\" and \"Seconds\" behave as usual.\n\"Week Day\" inserts ISO Week and Weekday between the date and time. E.g. \"2023-10-16 W42-1 19:45\".", "link": "https://extensions.gnome.org/extension/6413/iso8601-ish-clock/", "shell_version_map": {
-    "45": {"version": "7", "sha256": "1vfwipnffnmy0myi51ks1zpx3cy6dh1313b01jc3jz838zgkcnza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vUzQxMC9pc284NjAxaXNoIiwKICAidXVpZCI6ICJpc284NjAxaXNoQFM0MTAiLAogICJ2ZXJzaW9uIjogNwp9"},
-    "46": {"version": "7", "sha256": "1vfwipnffnmy0myi51ks1zpx3cy6dh1313b01jc3jz838zgkcnza", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vUzQxMC9pc284NjAxaXNoIiwKICAidXVpZCI6ICJpc284NjAxaXNoQFM0MTAiLAogICJ2ZXJzaW9uIjogNwp9"}
+    "45": {"version": "8", "sha256": "1i5krbini2w8qhnxmg89mp1i5fhw6b2k51y2548vgjj13b6sw7k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL1M0MTAvaXNvODYwMWlzaCIsCiAgInV1aWQiOiAiaXNvODYwMWlzaEBTNDEwIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "1i5krbini2w8qhnxmg89mp1i5fhw6b2k51y2548vgjj13b6sw7k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL1M0MTAvaXNvODYwMWlzaCIsCiAgInV1aWQiOiAiaXNvODYwMWlzaEBTNDEwIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "1i5krbini2w8qhnxmg89mp1i5fhw6b2k51y2548vgjj13b6sw7k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL1M0MTAvaXNvODYwMWlzaCIsCiAgInV1aWQiOiAiaXNvODYwMWlzaEBTNDEwIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "lu-wotd@praczet.github.com", "name": "Luxembourgish - Word Of The Day", "pname": "luxembourgish-word-of-the-day", "description": "Displays Luxembourgish's The Word of the Day. It gets them (wotds) from LOD.lu", "link": "https://extensions.gnome.org/extension/6418/luxembourgish-word-of-the-day/", "shell_version_map": {
     "44": {"version": "3", "sha256": "0mn2xbvcjzqw8h95khp1sj2jaq7mpfd53wyzfcsmcc3jv4f72ipn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEx1eGVtYm91cmdpc2gncyBUaGUgV29yZCBvZiB0aGUgRGF5LiBJdCBnZXRzIHRoZW0gKHdvdGRzKSBmcm9tIExPRC5sdSIsCiAgImdldHRleHQtZG9tYWluIjogImx1LXdvdGQiLAogICJuYW1lIjogIkx1eGVtYm91cmdpc2ggLSBXb3JkIE9mIFRoZSBEYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHUtd290ZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmFjemV0L2x1LXdvdGQiLAogICJ1dWlkIjogImx1LXdvdGRAcHJhY3pldC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -6754,7 +7111,8 @@
   }}
 , {"uuid": "disable-extension-updates@swsnr.de", "name": "Disable extension updates", "pname": "disable-extension-updates", "description": "Disable automatic extension updates in GNOME\n\nThis extension patches GNOME Shell to entirely disable updates of user-installed extensions.", "link": "https://extensions.gnome.org/extension/6424/disable-extension-updates/", "shell_version_map": {
     "45": {"version": "3", "sha256": "0k78gjqv1zb8dy0g60ij84bi12lnxddwzkkkgp75y83pk4sawqj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYXV0b21hdGljIGV4dGVuc2lvbiB1cGRhdGVzIGluIEdOT01FXG5cblRoaXMgZXh0ZW5zaW9uIHBhdGNoZXMgR05PTUUgU2hlbGwgdG8gZW50aXJlbHkgZGlzYWJsZSB1cGRhdGVzIG9mIHVzZXItaW5zdGFsbGVkIGV4dGVuc2lvbnMuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJzd3NuciIKICB9LAogICJuYW1lIjogIkRpc2FibGUgZXh0ZW5zaW9uIHVwZGF0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtZXh0ZW5zaW9uLXVwZGF0ZXMiLAogICJ1dWlkIjogImRpc2FibGUtZXh0ZW5zaW9uLXVwZGF0ZXNAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjQ1LjEiCn0="},
-    "46": {"version": "4", "sha256": "0rkxfacbjrkczjqdqi7mhxsk10967jy602clzp42i8bsd195r364", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYXV0b21hdGljIGV4dGVuc2lvbiB1cGRhdGVzIGluIEdOT01FXG5cblRoaXMgZXh0ZW5zaW9uIHBhdGNoZXMgR05PTUUgU2hlbGwgdG8gZW50aXJlbHkgZGlzYWJsZSB1cGRhdGVzIG9mIHVzZXItaW5zdGFsbGVkIGV4dGVuc2lvbnMuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJzd3NuciIKICB9LAogICJuYW1lIjogIkRpc2FibGUgZXh0ZW5zaW9uIHVwZGF0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtZXh0ZW5zaW9uLXVwZGF0ZXMiLAogICJ1dWlkIjogImRpc2FibGUtZXh0ZW5zaW9uLXVwZGF0ZXNAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogNCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjEiCn0="}
+    "46": {"version": "5", "sha256": "11w1xfw3kcg0k3gp7xj4iqp3wv7wir2njlphvp9949m4z02ry9ya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYXV0b21hdGljIGV4dGVuc2lvbiB1cGRhdGVzIGluIEdOT01FXG5cblRoaXMgZXh0ZW5zaW9uIHBhdGNoZXMgR05PTUUgU2hlbGwgdG8gZW50aXJlbHkgZGlzYWJsZSB1cGRhdGVzIG9mIHVzZXItaW5zdGFsbGVkIGV4dGVuc2lvbnMuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJzd3NuciIKICB9LAogICJuYW1lIjogIkRpc2FibGUgZXh0ZW5zaW9uIHVwZGF0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLWV4dGVuc2lvbi11cGRhdGVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWV4dGVuc2lvbi11cGRhdGVzQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDUsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yIgp9"},
+    "47": {"version": "5", "sha256": "11w1xfw3kcg0k3gp7xj4iqp3wv7wir2njlphvp9949m4z02ry9ya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYXV0b21hdGljIGV4dGVuc2lvbiB1cGRhdGVzIGluIEdOT01FXG5cblRoaXMgZXh0ZW5zaW9uIHBhdGNoZXMgR05PTUUgU2hlbGwgdG8gZW50aXJlbHkgZGlzYWJsZSB1cGRhdGVzIG9mIHVzZXItaW5zdGFsbGVkIGV4dGVuc2lvbnMuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJzd3NuciIKICB9LAogICJuYW1lIjogIkRpc2FibGUgZXh0ZW5zaW9uIHVwZGF0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLWV4dGVuc2lvbi11cGRhdGVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWV4dGVuc2lvbi11cGRhdGVzQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDUsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yIgp9"}
   }}
 , {"uuid": "soundcard-switch@xnow.me", "name": "SoundCard Switch", "pname": "soundcard-switch", "description": "Enable or disable the sound card entirely by adding or removing the sound device. Bluetooth headset not be affected.", "link": "https://extensions.gnome.org/extension/6427/soundcard-switch/", "shell_version_map": {
     "42": {"version": "7", "sha256": "05dd3rfj3589fxb3761gb1x4ilxgmkmls5ldm8c7rxj3sxzb2zm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBvciBkaXNhYmxlIHRoZSBzb3VuZCBjYXJkIGVudGlyZWx5IGJ5IGFkZGluZyBvciByZW1vdmluZyB0aGUgc291bmQgZGV2aWNlLiBCbHVldG9vdGggaGVhZHNldCBub3QgYmUgYWZmZWN0ZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic291bmRjYXJkLXN3aXRjaEB4bm93Lm1lIiwKICAibmFtZSI6ICJTb3VuZENhcmQgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veG5vdy1tZS9zb3VuZGNhcmQtc3dpdGNoLmdpdCIsCiAgInV1aWQiOiAic291bmRjYXJkLXN3aXRjaEB4bm93Lm1lIiwKICAidmVyc2lvbiI6IDcKfQ=="},
@@ -6765,24 +7123,28 @@
   }}
 , {"uuid": "appmenu-is-back@fthx", "name": "App menu is back", "pname": "app-menu-is-back", "description": "The good old original app menu. For GNOME Shell 45+.\n\n Code mostly copied from GNOME Shell code itself. For a customizable app menu, please consider 'Window title is back' extension.", "link": "https://extensions.gnome.org/extension/6433/app-menu-is-back/", "shell_version_map": {
     "45": {"version": "2", "sha256": "13iq5zn6d49cc4x5phvx3553sh59mz9zbwpqp1wyc0g6kiydyanc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBnb29kIG9sZCBvcmlnaW5hbCBhcHAgbWVudS4gRm9yIEdOT01FIFNoZWxsIDQ1Ky5cblxuIENvZGUgbW9zdGx5IGNvcGllZCBmcm9tIEdOT01FIFNoZWxsIGNvZGUgaXRzZWxmLiBGb3IgYSBjdXN0b21pemFibGUgYXBwIG1lbnUsIHBsZWFzZSBjb25zaWRlciAnV2luZG93IHRpdGxlIGlzIGJhY2snIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkFwcCBtZW51IGlzIGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hcHBtZW51LWlzLWJhY2siLAogICJ1dWlkIjogImFwcG1lbnUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "46": {"version": "3", "sha256": "0y1jw7l50r3as4lbcj7sgnfv35565qwwnsjpi6cfasgv4wwhlz92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBnb29kIG9sZCBvcmlnaW5hbCBhcHAgbWVudS4gRm9yIEdOT01FIFNoZWxsIDQ1Ky5cblxuIENvZGUgbW9zdGx5IGNvcGllZCBmcm9tIEdOT01FIFNoZWxsIGNvZGUgaXRzZWxmLiBGb3IgYSBjdXN0b21pemFibGUgYXBwIG1lbnUsIHBsZWFzZSBjb25zaWRlciAnV2luZG93IHRpdGxlIGlzIGJhY2snIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkFwcCBtZW51IGlzIGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hcHBtZW51LWlzLWJhY2siLAogICJ1dWlkIjogImFwcG1lbnUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "46": {"version": "3", "sha256": "0y1jw7l50r3as4lbcj7sgnfv35565qwwnsjpi6cfasgv4wwhlz92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBnb29kIG9sZCBvcmlnaW5hbCBhcHAgbWVudS4gRm9yIEdOT01FIFNoZWxsIDQ1Ky5cblxuIENvZGUgbW9zdGx5IGNvcGllZCBmcm9tIEdOT01FIFNoZWxsIGNvZGUgaXRzZWxmLiBGb3IgYSBjdXN0b21pemFibGUgYXBwIG1lbnUsIHBsZWFzZSBjb25zaWRlciAnV2luZG93IHRpdGxlIGlzIGJhY2snIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkFwcCBtZW51IGlzIGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hcHBtZW51LWlzLWJhY2siLAogICJ1dWlkIjogImFwcG1lbnUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "4", "sha256": "02525856chp1vb2cszxqvgjm6qbylcl4w1hkfvbcid7kpqqg9k0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBnb29kIG9sZCBvcmlnaW5hbCBhcHAgbWVudS4gRm9yIEdOT01FIFNoZWxsIDQ1Ky5cblxuIENvZGUgbW9zdGx5IGNvcGllZCBmcm9tIEdOT01FIFNoZWxsIGNvZGUgaXRzZWxmLiBGb3IgYSBjdXN0b21pemFibGUgYXBwIG1lbnUsIHBsZWFzZSBjb25zaWRlciAnV2luZG93IHRpdGxlIGlzIGJhY2snIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkFwcCBtZW51IGlzIGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hcHBtZW51LWlzLWJhY2siLAogICJ1dWlkIjogImFwcG1lbnUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
 , {"uuid": "hideclock@kevinbburns.com", "name": "Hide That Clock", "pname": "hide-that-clock", "description": "Simply hides the clock from the panel.", "link": "https://extensions.gnome.org/extension/6439/hide-that-clock/", "shell_version_map": {
     "45": {"version": "2", "sha256": "1ggbh9j95pji6g43mf4859i2sgwfzps2pkmkghgp950mkal71ajl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBoaWRlcyB0aGUgY2xvY2sgZnJvbSB0aGUgcGFuZWwuIiwKICAibmFtZSI6ICJIaWRlIFRoYXQgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5iYnVybnMvR25vbWVIaWRlQ2xvY2siLAogICJ1dWlkIjogImhpZGVjbG9ja0BrZXZpbmJidXJucy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
   }}
 , {"uuid": "panel-free@fthx", "name": "Panel Free", "pname": "panel-free", "description": "Hide top panel. Panel appears only in overview.", "link": "https://extensions.gnome.org/extension/6454/panel-free/", "shell_version_map": {
     "45": {"version": "6", "sha256": "1nzy84vrb71f1v7z6bqwfj6dm6nkg2a6a658vmdz79vmsrljidgz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsLiBQYW5lbCBhcHBlYXJzIG9ubHkgaW4gb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJQYW5lbCBGcmVlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcGFuZWwtZnJlZSIsCiAgInV1aWQiOiAicGFuZWwtZnJlZUBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "7", "sha256": "0mmcj64lrp15djpn8cv64yc2j52lxi94cn1zq6nzd9i4j0r651yk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsLiBQYW5lbCBhcHBlYXJzIG9ubHkgaW4gb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJQYW5lbCBGcmVlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcGFuZWwtZnJlZSIsCiAgInV1aWQiOiAicGFuZWwtZnJlZUBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "46": {"version": "7", "sha256": "0mmcj64lrp15djpn8cv64yc2j52lxi94cn1zq6nzd9i4j0r651yk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsLiBQYW5lbCBhcHBlYXJzIG9ubHkgaW4gb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJQYW5lbCBGcmVlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcGFuZWwtZnJlZSIsCiAgInV1aWQiOiAicGFuZWwtZnJlZUBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "8", "sha256": "18rs3b65dpca08m1yihqwcxwn6p8ss3d99vr3qhzgfx5a75wf33h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsLiBQYW5lbCBhcHBlYXJzIG9ubHkgaW4gb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJQYW5lbCBGcmVlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcGFuZWwtZnJlZSIsCiAgInV1aWQiOiAicGFuZWwtZnJlZUBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "VividShade@mozo64.github.io", "name": "VividShade: Multi-Monitor RGB Dimming Control", "pname": "vividshade-multi-monitor-rgb-dimming-control", "description": "Multimonitor dimming overlay with RGB regulation: extension adds a button with a light bulb icon to your panel. Clicking this button reveals individual sliders for each connected monitor, allowing you to adjust the dimming level. Additionally, you can toggle the color of the dimming effect and customize it using RGB sliders located at the bottom of the menu. \n\nTested with Ubuntu 22.04.3 LTS and GNOME Shell 42.9. \n\nIt is a fork of Dim Desktop 70.", "link": "https://extensions.gnome.org/extension/6463/vividshade-multi-monitor-rgb-dimming-control/", "shell_version_map": {
     "42": {"version": "1", "sha256": "0lw047iqjzmsnz19wajr73n1zprgh8r4mhh9srjkhm65k5h4gfs5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bHRpbW9uaXRvciBkaW1taW5nIG92ZXJsYXkgd2l0aCBSR0IgcmVndWxhdGlvbjogZXh0ZW5zaW9uIGFkZHMgYSBidXR0b24gd2l0aCBhIGxpZ2h0IGJ1bGIgaWNvbiB0byB5b3VyIHBhbmVsLiBDbGlja2luZyB0aGlzIGJ1dHRvbiByZXZlYWxzIGluZGl2aWR1YWwgc2xpZGVycyBmb3IgZWFjaCBjb25uZWN0ZWQgbW9uaXRvciwgYWxsb3dpbmcgeW91IHRvIGFkanVzdCB0aGUgZGltbWluZyBsZXZlbC4gQWRkaXRpb25hbGx5LCB5b3UgY2FuIHRvZ2dsZSB0aGUgY29sb3Igb2YgdGhlIGRpbW1pbmcgZWZmZWN0IGFuZCBjdXN0b21pemUgaXQgdXNpbmcgUkdCIHNsaWRlcnMgbG9jYXRlZCBhdCB0aGUgYm90dG9tIG9mIHRoZSBtZW51LiBcblxuVGVzdGVkIHdpdGggVWJ1bnR1IDIyLjA0LjMgTFRTIGFuZCBHTk9NRSBTaGVsbCA0Mi45LiBcblxuSXQgaXMgYSBmb3JrIG9mIERpbSBEZXNrdG9wIDcwLiIsCiAgIm5hbWUiOiAiVml2aWRTaGFkZTogTXVsdGktTW9uaXRvciBSR0IgRGltbWluZyBDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vem82NC9WaXZpZFNoYWRlIiwKICAidXVpZCI6ICJWaXZpZFNoYWRlQG1vem82NC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
-, {"uuid": "picture-of-the-day@swsnr.de", "name": "Picture of the Day", "pname": "picture-of-the-day", "description": "Get a picture of the day as desktop background or wallpaper.\n\nSupports the following sources: NASA Astronomy Picture of the Day (APOD), NASA Earth Observatory Image of the Day, Bing, and Wikimedia Featured Image.", "link": "https://extensions.gnome.org/extension/6469/picture-of-the-day/", "shell_version_map": {
+, {"uuid": "picture-of-the-day@swsnr.de", "name": "Picture of the Day", "pname": "picture-of-the-day", "description": "Get a picture of the day as desktop background or wallpaper.\n\nSupports the following sources: NASA Astronomy Picture of the Day (APOD), NASA Earth Observatory Image of the Day, Bing, Wikimedia Featured Image, and Simon Stålenhag artworks.", "link": "https://extensions.gnome.org/extension/6469/picture-of-the-day/", "shell_version_map": {
     "45": {"version": "25", "sha256": "0vpkz83hazvb488w8wklf4bv8vr65dgk7ib9ws2h32xrr3c3j1rc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHBpY3R1cmUgb2YgdGhlIGRheSBhcyBkZXNrdG9wIGJhY2tncm91bmQgb3Igd2FsbHBhcGVyLlxuXG5TdXBwb3J0cyB0aGUgZm9sbG93aW5nIHNvdXJjZXM6IE5BU0EgQXN0cm9ub215IFBpY3R1cmUgb2YgdGhlIERheSAoQVBPRCksIE5BU0EgRWFydGggT2JzZXJ2YXRvcnkgSW1hZ2Ugb2YgdGhlIERheSwgQmluZywgYW5kIFdpa2ltZWRpYSBGZWF0dXJlZCBJbWFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaWN0dXJlLW9mLXRoZS1kYXlAc3dzbnIuZGUiLAogICJuYW1lIjogIlBpY3R1cmUgb2YgdGhlIERheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd3Nuci1waWN0dXJlLW9mLXRoZS1kYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBpY3R1cmUtb2YtdGhlLWRheSIsCiAgInV1aWQiOiAicGljdHVyZS1vZi10aGUtZGF5QHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDI1LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDUuMTUiCn0="},
-    "46": {"version": "24", "sha256": "14bsgahjvwazrpgfr11wwsqvjna8r9h0jcipdin8lisia312l77r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHBpY3R1cmUgb2YgdGhlIGRheSBhcyBkZXNrdG9wIGJhY2tncm91bmQgb3Igd2FsbHBhcGVyLlxuXG5TdXBwb3J0cyB0aGUgZm9sbG93aW5nIHNvdXJjZXM6IE5BU0EgQXN0cm9ub215IFBpY3R1cmUgb2YgdGhlIERheSAoQVBPRCksIE5BU0EgRWFydGggT2JzZXJ2YXRvcnkgSW1hZ2Ugb2YgdGhlIERheSwgQmluZywgYW5kIFdpa2ltZWRpYSBGZWF0dXJlZCBJbWFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaWN0dXJlLW9mLXRoZS1kYXlAc3dzbnIuZGUiLAogICJuYW1lIjogIlBpY3R1cmUgb2YgdGhlIERheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zd3Nuci1waWN0dXJlLW9mLXRoZS1kYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBpY3R1cmUtb2YtdGhlLWRheSIsCiAgInV1aWQiOiAicGljdHVyZS1vZi10aGUtZGF5QHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDI0LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuMiIKfQ=="}
+    "46": {"version": "30", "sha256": "0r5g68b513y4i1nzw3irjhm62vsi0lj6b456kzgh685903hk672p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHBpY3R1cmUgb2YgdGhlIGRheSBhcyBkZXNrdG9wIGJhY2tncm91bmQgb3Igd2FsbHBhcGVyLlxuXG5TdXBwb3J0cyB0aGUgZm9sbG93aW5nIHNvdXJjZXM6IE5BU0EgQXN0cm9ub215IFBpY3R1cmUgb2YgdGhlIERheSAoQVBPRCksIE5BU0EgRWFydGggT2JzZXJ2YXRvcnkgSW1hZ2Ugb2YgdGhlIERheSwgQmluZywgV2lraW1lZGlhIEZlYXR1cmVkIEltYWdlLCBhbmQgU2ltb24gU3RcdTAwZTVsZW5oYWcgYXJ0d29ya3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicGljdHVyZS1vZi10aGUtZGF5QHN3c25yLmRlIiwKICAibmFtZSI6ICJQaWN0dXJlIG9mIHRoZSBEYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItcGljdHVyZS1vZi10aGUtZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd3Nuci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGljdHVyZS1vZi10aGUtZGF5IiwKICAidXVpZCI6ICJwaWN0dXJlLW9mLXRoZS1kYXlAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMzAsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni43Igp9"},
+    "47": {"version": "32", "sha256": "0c0nhfv6hm1m1xwsjdcabacdpls5pqzgx72magl2xck44ncm88w0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHBpY3R1cmUgb2YgdGhlIGRheSBhcyBkZXNrdG9wIGJhY2tncm91bmQgb3Igd2FsbHBhcGVyLlxuXG5TdXBwb3J0cyB0aGUgZm9sbG93aW5nIHNvdXJjZXM6IE5BU0EgQXN0cm9ub215IFBpY3R1cmUgb2YgdGhlIERheSAoQVBPRCksIE5BU0EgRWFydGggT2JzZXJ2YXRvcnkgSW1hZ2Ugb2YgdGhlIERheSwgQmluZywgV2lraW1lZGlhIEZlYXR1cmVkIEltYWdlLCBhbmQgU2ltb24gU3RcdTAwZTVsZW5oYWcgYXJ0d29ya3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicGljdHVyZS1vZi10aGUtZGF5QHN3c25yLmRlIiwKICAibmFtZSI6ICJQaWN0dXJlIG9mIHRoZSBEYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItcGljdHVyZS1vZi10aGUtZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWN0dXJlLW9mLXRoZS1kYXkiLAogICJ1dWlkIjogInBpY3R1cmUtb2YtdGhlLWRheUBzd3Nuci5kZSIsCiAgInZlcnNpb24iOiAzMiwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjEiCn0="}
   }}
 , {"uuid": "overviewnow@thesola.io", "name": "Overview Flick", "pname": "overview-flick", "description": "Flick from the right to get the Overview.\n\nThis extension was revived to GNOME 45 from the original, https://extensions.gnome.org/extension/1088/overview-now/\n\nOriginal description:\n\nThis is my first extension. Thanks, GNOME!. Based on \"Slide for Keyboard\", https://extensions.gnome.org/extension/993/slide-for-keyboard/\n\nWhy did I do this? Well, if you do a gesture with your thumb, on your touchscreen, from the right to the center, you'll get the Overview. If you do that, your thumb will be placed in the Desktop selector, so you will be able to move between desktops with your thumb. Perfect! This is also easier to trigger than the default GNOME gesture (three fingers closing).", "link": "https://extensions.gnome.org/extension/6478/overview-flick/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "14bbic6vx13vaj5xqws34mlwmvfq436al63lzvwa41hkckqyxk6s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsaWNrIGZyb20gdGhlIHJpZ2h0IHRvIGdldCB0aGUgT3ZlcnZpZXcuXG5cblRoaXMgZXh0ZW5zaW9uIHdhcyByZXZpdmVkIHRvIEdOT01FIDQ1IGZyb20gdGhlIG9yaWdpbmFsLCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMDg4L292ZXJ2aWV3LW5vdy9cblxuT3JpZ2luYWwgZGVzY3JpcHRpb246XG5cblRoaXMgaXMgbXkgZmlyc3QgZXh0ZW5zaW9uLiBUaGFua3MsIEdOT01FIS4gQmFzZWQgb24gXCJTbGlkZSBmb3IgS2V5Ym9hcmRcIiwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTkzL3NsaWRlLWZvci1rZXlib2FyZC9cblxuV2h5IGRpZCBJIGRvIHRoaXM/IFdlbGwsIGlmIHlvdSBkbyBhIGdlc3R1cmUgd2l0aCB5b3VyIHRodW1iLCBvbiB5b3VyIHRvdWNoc2NyZWVuLCBmcm9tIHRoZSByaWdodCB0byB0aGUgY2VudGVyLCB5b3UnbGwgZ2V0IHRoZSBPdmVydmlldy4gSWYgeW91IGRvIHRoYXQsIHlvdXIgdGh1bWIgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERlc2t0b3Agc2VsZWN0b3IsIHNvIHlvdSB3aWxsIGJlIGFibGUgdG8gbW92ZSBiZXR3ZWVuIGRlc2t0b3BzIHdpdGggeW91ciB0aHVtYi4gUGVyZmVjdCEgVGhpcyBpcyBhbHNvIGVhc2llciB0byB0cmlnZ2VyIHRoYW4gdGhlIGRlZmF1bHQgR05PTUUgZ2VzdHVyZSAodGhyZWUgZmluZ2VycyBjbG9zaW5nKS4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZsaWNrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoZXNvbGExMC9nbm9tZS1zaGVsbC1vdmVydmlldy1mbGljayIsCiAgInV1aWQiOiAib3ZlcnZpZXdub3dAdGhlc29sYS5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
+    "45": {"version": "3", "sha256": "12nrm5nf01xhmypqckdwiahyfs1ddpmgz751f9dg6xp2h8l2l2wn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsaWNrIGZyb20gdGhlIHJpZ2h0IHRvIGdldCB0aGUgT3ZlcnZpZXcuXG5cblRoaXMgZXh0ZW5zaW9uIHdhcyByZXZpdmVkIHRvIEdOT01FIDQ1IGZyb20gdGhlIG9yaWdpbmFsLCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMDg4L292ZXJ2aWV3LW5vdy9cblxuT3JpZ2luYWwgZGVzY3JpcHRpb246XG5cblRoaXMgaXMgbXkgZmlyc3QgZXh0ZW5zaW9uLiBUaGFua3MsIEdOT01FIS4gQmFzZWQgb24gXCJTbGlkZSBmb3IgS2V5Ym9hcmRcIiwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTkzL3NsaWRlLWZvci1rZXlib2FyZC9cblxuV2h5IGRpZCBJIGRvIHRoaXM/IFdlbGwsIGlmIHlvdSBkbyBhIGdlc3R1cmUgd2l0aCB5b3VyIHRodW1iLCBvbiB5b3VyIHRvdWNoc2NyZWVuLCBmcm9tIHRoZSByaWdodCB0byB0aGUgY2VudGVyLCB5b3UnbGwgZ2V0IHRoZSBPdmVydmlldy4gSWYgeW91IGRvIHRoYXQsIHlvdXIgdGh1bWIgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERlc2t0b3Agc2VsZWN0b3IsIHNvIHlvdSB3aWxsIGJlIGFibGUgdG8gbW92ZSBiZXR3ZWVuIGRlc2t0b3BzIHdpdGggeW91ciB0aHVtYi4gUGVyZmVjdCEgVGhpcyBpcyBhbHNvIGVhc2llciB0byB0cmlnZ2VyIHRoYW4gdGhlIGRlZmF1bHQgR05PTUUgZ2VzdHVyZSAodGhyZWUgZmluZ2VycyBjbG9zaW5nKS4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZsaWNrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGVzb2xhMTAvZ25vbWUtc2hlbGwtb3ZlcnZpZXctZmxpY2siLAogICJ1dWlkIjogIm92ZXJ2aWV3bm93QHRoZXNvbGEuaW8iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "46": {"version": "3", "sha256": "12nrm5nf01xhmypqckdwiahyfs1ddpmgz751f9dg6xp2h8l2l2wn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsaWNrIGZyb20gdGhlIHJpZ2h0IHRvIGdldCB0aGUgT3ZlcnZpZXcuXG5cblRoaXMgZXh0ZW5zaW9uIHdhcyByZXZpdmVkIHRvIEdOT01FIDQ1IGZyb20gdGhlIG9yaWdpbmFsLCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMDg4L292ZXJ2aWV3LW5vdy9cblxuT3JpZ2luYWwgZGVzY3JpcHRpb246XG5cblRoaXMgaXMgbXkgZmlyc3QgZXh0ZW5zaW9uLiBUaGFua3MsIEdOT01FIS4gQmFzZWQgb24gXCJTbGlkZSBmb3IgS2V5Ym9hcmRcIiwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTkzL3NsaWRlLWZvci1rZXlib2FyZC9cblxuV2h5IGRpZCBJIGRvIHRoaXM/IFdlbGwsIGlmIHlvdSBkbyBhIGdlc3R1cmUgd2l0aCB5b3VyIHRodW1iLCBvbiB5b3VyIHRvdWNoc2NyZWVuLCBmcm9tIHRoZSByaWdodCB0byB0aGUgY2VudGVyLCB5b3UnbGwgZ2V0IHRoZSBPdmVydmlldy4gSWYgeW91IGRvIHRoYXQsIHlvdXIgdGh1bWIgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERlc2t0b3Agc2VsZWN0b3IsIHNvIHlvdSB3aWxsIGJlIGFibGUgdG8gbW92ZSBiZXR3ZWVuIGRlc2t0b3BzIHdpdGggeW91ciB0aHVtYi4gUGVyZmVjdCEgVGhpcyBpcyBhbHNvIGVhc2llciB0byB0cmlnZ2VyIHRoYW4gdGhlIGRlZmF1bHQgR05PTUUgZ2VzdHVyZSAodGhyZWUgZmluZ2VycyBjbG9zaW5nKS4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZsaWNrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGVzb2xhMTAvZ25vbWUtc2hlbGwtb3ZlcnZpZXctZmxpY2siLAogICJ1dWlkIjogIm92ZXJ2aWV3bm93QHRoZXNvbGEuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "logoutbutton@lfarkas.org", "name": "Logout Button on Panel", "pname": "logout-button-on-panel", "description": "Add logout button to the panel (fork of https://github.com/mike10004/gnome3-extensions)", "link": "https://extensions.gnome.org/extension/6484/logout-button-on-panel/", "shell_version_map": {
     "45": {"version": "4", "sha256": "03hsy61sn051g2ykhfikxln7m09n2d1qdlskj90rrnrh4bd1slvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2dvdXQgYnV0dG9uIHRvIHRoZSBwYW5lbCAoZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vbWlrZTEwMDA0L2dub21lMy1leHRlbnNpb25zKSIsCiAgIm5hbWUiOiAiTG9nb3V0IEJ1dHRvbiBvbiBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sZmFya2FzL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2dvdXRidXR0b25AbGZhcmthcy5vcmciLAogICJ2ZXJzaW9uIjogNAp9"}
@@ -6803,7 +7165,8 @@
   }}
 , {"uuid": "toggle-proxy@wuma", "name": "Toggle Proxy", "pname": "toggle-proxy", "description": "Toggle v2ray proxy", "link": "https://extensions.gnome.org/extension/6511/toggle-proxy/", "shell_version_map": {
     "45": {"version": "2", "sha256": "0zi8s4whbbvc7s2b9pysbzbchhya97sd987mr7ggxkqpfs2r20h1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoanhzL3RvZ2dsZS1wcm94eSIsCiAgInV1aWQiOiAidG9nZ2xlLXByb3h5QHd1bWEiLAogICJ2ZXJzaW9uIjogMgp9"},
-    "46": {"version": "3", "sha256": "04d9zzz81qa288zhs6i2lb46c18lp7pqkv3fb4y06abnx5y090hq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoanhzL3RvZ2dsZS1wcm94eSIsCiAgInV1aWQiOiAidG9nZ2xlLXByb3h5QHd1bWEiLAogICJ2ZXJzaW9uIjogMwp9"}
+    "46": {"version": "4", "sha256": "02jw06sqv1mq2s14zzhmq0sg6hs8ag4lz3ig5iqfx2hvkn7niqfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGp4cy90b2dnbGUtcHJveHkiLAogICJ1dWlkIjogInRvZ2dsZS1wcm94eUB3dW1hIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "47": {"version": "4", "sha256": "02jw06sqv1mq2s14zzhmq0sg6hs8ag4lz3ig5iqfx2hvkn7niqfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGp4cy90b2dnbGUtcHJveHkiLAogICJ1dWlkIjogInRvZ2dsZS1wcm94eUB3dW1hIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
 , {"uuid": "usd-rub@rus-99-pk.github.com", "name": "USD-RUB", "pname": "usd-rub", "description": "Convert US Dollar to Russian ruble. Updates are received every 30 seconds.\n\nIt is a fork of USD-TRY. This extension uses economia.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/6514/usd-rub/", "shell_version_map": {
     "43": {"version": "2", "sha256": "1jr8w2kyby1jsmw7ycv0kang2hb8514p4lqn06h3hlm1vf5hd0zy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgVVMgRG9sbGFyIHRvIFJ1c3NpYW4gcnVibGUuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuXG5cbkl0IGlzIGEgZm9yayBvZiBVU0QtVFJZLiBUaGlzIGV4dGVuc2lvbiB1c2VzIGVjb25vbWlhLmF3ZXNvbWVhcGkuY29tLmJyIiwKICAibmFtZSI6ICJVU0QtUlVCIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydXMtOTktcGsvVVNELVJVQiIsCiAgInV1aWQiOiAidXNkLXJ1YkBydXMtOTktcGsuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -6814,8 +7177,9 @@
     "46": {"version": "9", "sha256": "129yyy3x4z5r4q5j6rwc3082n6cqg2fm4a1gszi1hpjqc7lyrgb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDkKfQ=="}
   }}
 , {"uuid": "panel-workspace-scroll@polymeilex.github.io", "name": "Panel Workspace Scroll", "pname": "panel-workspace-scroll", "description": "Switch workspace by mouse scroll on the panel.\nIn contrast to alternative extensions purpose of this one is to use the native scroll handler of gnome-shell, so workspace scroll should behave exactly the same as overview scroll or workspace indicator scroll.", "link": "https://extensions.gnome.org/extension/6523/panel-workspace-scroll/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "0m1zbdshi55y43yaz2cplzsvs6a2plwsmj941ljf7l1kzk8wipb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsIG9uIHRoZSBwYW5lbC5cbkluIGNvbnRyYXN0IHRvIGFsdGVybmF0aXZlIGV4dGVuc2lvbnMgcHVycG9zZSBvZiB0aGlzIG9uZSBpcyB0byB1c2UgdGhlIG5hdGl2ZSBzY3JvbGwgaGFuZGxlciBvZiBnbm9tZS1zaGVsbCwgc28gd29ya3NwYWNlIHNjcm9sbCBzaG91bGQgYmVoYXZlIGV4YWN0bHkgdGhlIHNhbWUgYXMgb3ZlcnZpZXcgc2Nyb2xsIG9yIHdvcmtzcGFjZSBpbmRpY2F0b3Igc2Nyb2xsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAibmFtZSI6ICJQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJtYXJ5bmN6YWtiYXJ0bG9taWVqQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9seU1laWxleC9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtd29ya3NwYWNlLXNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWwtd29ya3NwYWNlLXNjcm9sbEBwb2x5bWVpbGV4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="},
-    "46": {"version": "3", "sha256": "0m1zbdshi55y43yaz2cplzsvs6a2plwsmj941ljf7l1kzk8wipb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsIG9uIHRoZSBwYW5lbC5cbkluIGNvbnRyYXN0IHRvIGFsdGVybmF0aXZlIGV4dGVuc2lvbnMgcHVycG9zZSBvZiB0aGlzIG9uZSBpcyB0byB1c2UgdGhlIG5hdGl2ZSBzY3JvbGwgaGFuZGxlciBvZiBnbm9tZS1zaGVsbCwgc28gd29ya3NwYWNlIHNjcm9sbCBzaG91bGQgYmVoYXZlIGV4YWN0bHkgdGhlIHNhbWUgYXMgb3ZlcnZpZXcgc2Nyb2xsIG9yIHdvcmtzcGFjZSBpbmRpY2F0b3Igc2Nyb2xsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAibmFtZSI6ICJQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJtYXJ5bmN6YWtiYXJ0bG9taWVqQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9seU1laWxleC9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtd29ya3NwYWNlLXNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWwtd29ya3NwYWNlLXNjcm9sbEBwb2x5bWVpbGV4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}
+    "45": {"version": "4", "sha256": "18b1yr6ybmn97zky3mahqqaiph6jrd1wz44szppgai3caxbgpv4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsIG9uIHRoZSBwYW5lbC5cbkluIGNvbnRyYXN0IHRvIGFsdGVybmF0aXZlIGV4dGVuc2lvbnMgcHVycG9zZSBvZiB0aGlzIG9uZSBpcyB0byB1c2UgdGhlIG5hdGl2ZSBzY3JvbGwgaGFuZGxlciBvZiBnbm9tZS1zaGVsbCwgc28gd29ya3NwYWNlIHNjcm9sbCBzaG91bGQgYmVoYXZlIGV4YWN0bHkgdGhlIHNhbWUgYXMgb3ZlcnZpZXcgc2Nyb2xsIG9yIHdvcmtzcGFjZSBpbmRpY2F0b3Igc2Nyb2xsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAibmFtZSI6ICJQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJtYXJ5bmN6YWtiYXJ0bG9taWVqQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvbHlNZWlsZXgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsLXdvcmtzcGFjZS1zY3JvbGwiLAogICJ1dWlkIjogInBhbmVsLXdvcmtzcGFjZS1zY3JvbGxAcG9seW1laWxleC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "18b1yr6ybmn97zky3mahqqaiph6jrd1wz44szppgai3caxbgpv4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsIG9uIHRoZSBwYW5lbC5cbkluIGNvbnRyYXN0IHRvIGFsdGVybmF0aXZlIGV4dGVuc2lvbnMgcHVycG9zZSBvZiB0aGlzIG9uZSBpcyB0byB1c2UgdGhlIG5hdGl2ZSBzY3JvbGwgaGFuZGxlciBvZiBnbm9tZS1zaGVsbCwgc28gd29ya3NwYWNlIHNjcm9sbCBzaG91bGQgYmVoYXZlIGV4YWN0bHkgdGhlIHNhbWUgYXMgb3ZlcnZpZXcgc2Nyb2xsIG9yIHdvcmtzcGFjZSBpbmRpY2F0b3Igc2Nyb2xsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAibmFtZSI6ICJQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJtYXJ5bmN6YWtiYXJ0bG9taWVqQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvbHlNZWlsZXgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsLXdvcmtzcGFjZS1zY3JvbGwiLAogICJ1dWlkIjogInBhbmVsLXdvcmtzcGFjZS1zY3JvbGxAcG9seW1laWxleC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "18b1yr6ybmn97zky3mahqqaiph6jrd1wz44szppgai3caxbgpv4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsIG9uIHRoZSBwYW5lbC5cbkluIGNvbnRyYXN0IHRvIGFsdGVybmF0aXZlIGV4dGVuc2lvbnMgcHVycG9zZSBvZiB0aGlzIG9uZSBpcyB0byB1c2UgdGhlIG5hdGl2ZSBzY3JvbGwgaGFuZGxlciBvZiBnbm9tZS1zaGVsbCwgc28gd29ya3NwYWNlIHNjcm9sbCBzaG91bGQgYmVoYXZlIGV4YWN0bHkgdGhlIHNhbWUgYXMgb3ZlcnZpZXcgc2Nyb2xsIG9yIHdvcmtzcGFjZSBpbmRpY2F0b3Igc2Nyb2xsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAibmFtZSI6ICJQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJtYXJ5bmN6YWtiYXJ0bG9taWVqQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BvbHlNZWlsZXgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsLXdvcmtzcGFjZS1zY3JvbGwiLAogICJ1dWlkIjogInBhbmVsLXdvcmtzcGFjZS1zY3JvbGxAcG9seW1laWxleC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "todo-list@speedflyer689.github.com", "name": "Todo list", "pname": "todo-list", "description": "Adds a todo list to the notification panel", "link": "https://extensions.gnome.org/extension/6526/todo-list/", "shell_version_map": {
     "38": {"version": "3", "sha256": "06hqbrk894bi0acilq4vg5a3h3gjmkmi1jv7vmaws0bn7gzqafjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSB0b2RvIGxpc3QgdG8gdGhlIG5vdGlmaWNhdGlvbiBwYW5lbCIsCiAgIm5hbWUiOiAiVG9kbyBsaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3BlZWRmbHllcjY4OS9Hbm9tZS1Ub2RvLUxpc3QiLAogICJ1dWlkIjogInRvZG8tbGlzdEBzcGVlZGZseWVyNjg5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
@@ -6834,8 +7198,9 @@
     "42": {"version": "4", "sha256": "0kz5lq0gxj4vvy6rlhzh5hpilzjwzh2qgjbc8nyvj3wwpzrw1pfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gaW4gdGhlIFJlc3RhcnQgZGlhbG9nIHRvIHNlbGVjdCBhIHNlY29uZGFyeSBvcGVyYXRpbmcgc3lzdGVtIiwKICAibmFtZSI6ICJSZXN0YXJ0IEludG8uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LWJncmVjby1yZXN0YXJ0aW50byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vaGcuYmdyZWNvLm5ldC9yZXN0YXJ0aW50b0BiZ3JlY28ubmV0IiwKICAidXVpZCI6ICJyZXN0YXJ0aW50b0BiZ3JlY28ubmV0IiwKICAidmVyc2lvbiI6IDQsCiAgInZlcnNpb24tbmFtZSI6ICI0Mi4xLjIiCn0="}
   }}
 , {"uuid": "clown@markocic", "name": "Clown", "pname": "clown", "description": "Displays clown emoji in the panel and plays clown theme song on click", "link": "https://extensions.gnome.org/extension/6544/clown/", "shell_version_map": {
-    "45": {"version": "7", "sha256": "1lqq2jkigpgvgw04cgnqm5l16zfzhnw74n5vw1q94xqn9x7kw19p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGNsb3duIGVtb2ppIGluIHRoZSBwYW5lbCBhbmQgcGxheXMgY2xvd24gdGhlbWUgc29uZyBvbiBjbGljayIsCiAgIm5hbWUiOiAiQ2xvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmtvY2ljL2Nsb3duLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvd25AbWFya29jaWMiLAogICJ2ZXJzaW9uIjogNwp9"},
-    "46": {"version": "7", "sha256": "1lqq2jkigpgvgw04cgnqm5l16zfzhnw74n5vw1q94xqn9x7kw19p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGNsb3duIGVtb2ppIGluIHRoZSBwYW5lbCBhbmQgcGxheXMgY2xvd24gdGhlbWUgc29uZyBvbiBjbGljayIsCiAgIm5hbWUiOiAiQ2xvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmtvY2ljL2Nsb3duLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvd25AbWFya29jaWMiLAogICJ2ZXJzaW9uIjogNwp9"}
+    "45": {"version": "8", "sha256": "0sd6n8ldjldsp88ggccr37ymgdg1n4f32gxihjhzh50jlsr655pk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGNsb3duIGVtb2ppIGluIHRoZSBwYW5lbCBhbmQgcGxheXMgY2xvd24gdGhlbWUgc29uZyBvbiBjbGljayIsCiAgIm5hbWUiOiAiQ2xvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJrb2NpYy9jbG93bi1leHRlbnNpb24iLAogICJ1dWlkIjogImNsb3duQG1hcmtvY2ljIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "0sd6n8ldjldsp88ggccr37ymgdg1n4f32gxihjhzh50jlsr655pk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGNsb3duIGVtb2ppIGluIHRoZSBwYW5lbCBhbmQgcGxheXMgY2xvd24gdGhlbWUgc29uZyBvbiBjbGljayIsCiAgIm5hbWUiOiAiQ2xvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJrb2NpYy9jbG93bi1leHRlbnNpb24iLAogICJ1dWlkIjogImNsb3duQG1hcmtvY2ljIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "0sd6n8ldjldsp88ggccr37ymgdg1n4f32gxihjhzh50jlsr655pk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGNsb3duIGVtb2ppIGluIHRoZSBwYW5lbCBhbmQgcGxheXMgY2xvd24gdGhlbWUgc29uZyBvbiBjbGljayIsCiAgIm5hbWUiOiAiQ2xvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJrb2NpYy9jbG93bi1leHRlbnNpb24iLAogICJ1dWlkIjogImNsb3duQG1hcmtvY2ljIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "input-source-dbus-interface@raiden_fumo", "name": "Input source D-Bus interface", "pname": "input-source-d-bus-interface", "description": "Add D-Bus interface for changing input sources via command", "link": "https://extensions.gnome.org/extension/6547/input-source-d-bus-interface/", "shell_version_map": {
     "38": {"version": "3", "sha256": "1yj6b4ccfmk3k9bv2hp7x29dsa1ms7spq6n1xy8alaijy04jav5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcnJzY2hlci1vZi1zbGVlcGluZy9nbm9tZS1pbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2UiLAogICJ1dWlkIjogImlucHV0LXNvdXJjZS1kYnVzLWludGVyZmFjZUByYWlkZW5fZnVtbyIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -6844,19 +7209,21 @@
     "42": {"version": "3", "sha256": "1yj6b4ccfmk3k9bv2hp7x29dsa1ms7spq6n1xy8alaijy04jav5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcnJzY2hlci1vZi1zbGVlcGluZy9nbm9tZS1pbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2UiLAogICJ1dWlkIjogImlucHV0LXNvdXJjZS1kYnVzLWludGVyZmFjZUByYWlkZW5fZnVtbyIsCiAgInZlcnNpb24iOiAzCn0="},
     "43": {"version": "3", "sha256": "1yj6b4ccfmk3k9bv2hp7x29dsa1ms7spq6n1xy8alaijy04jav5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcnJzY2hlci1vZi1zbGVlcGluZy9nbm9tZS1pbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2UiLAogICJ1dWlkIjogImlucHV0LXNvdXJjZS1kYnVzLWludGVyZmFjZUByYWlkZW5fZnVtbyIsCiAgInZlcnNpb24iOiAzCn0="},
     "44": {"version": "3", "sha256": "1yj6b4ccfmk3k9bv2hp7x29dsa1ms7spq6n1xy8alaijy04jav5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcnJzY2hlci1vZi1zbGVlcGluZy9nbm9tZS1pbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2UiLAogICJ1dWlkIjogImlucHV0LXNvdXJjZS1kYnVzLWludGVyZmFjZUByYWlkZW5fZnVtbyIsCiAgInZlcnNpb24iOiAzCn0="},
-    "45": {"version": "4", "sha256": "0kf1zzf85xbx7fa0x4zdazfwylmx6mimhyncrb54l51hgrplbxxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcnJzY2hlci1vZi1zbGVlcGluZy9nbm9tZS1pbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2UiLAogICJ1dWlkIjogImlucHV0LXNvdXJjZS1kYnVzLWludGVyZmFjZUByYWlkZW5fZnVtbyIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "46": {"version": "4", "sha256": "0kf1zzf85xbx7fa0x4zdazfwylmx6mimhyncrb54l51hgrplbxxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcnJzY2hlci1vZi1zbGVlcGluZy9nbm9tZS1pbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2UiLAogICJ1dWlkIjogImlucHV0LXNvdXJjZS1kYnVzLWludGVyZmFjZUByYWlkZW5fZnVtbyIsCiAgInZlcnNpb24iOiA0Cn0="}
+    "45": {"version": "5", "sha256": "1bh799h4r0165d4rijkgsnj5k411jn3rpni84y5gg2m8nnq7lpas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJyc2NoZXItb2Ytc2xlZXBpbmcvZ25vbWUtaW5wdXQtc291cmNlLWRidXMtaW50ZXJmYWNlIiwKICAidXVpZCI6ICJpbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2VAcmFpZGVuX2Z1bW8iLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "1bh799h4r0165d4rijkgsnj5k411jn3rpni84y5gg2m8nnq7lpas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJyc2NoZXItb2Ytc2xlZXBpbmcvZ25vbWUtaW5wdXQtc291cmNlLWRidXMtaW50ZXJmYWNlIiwKICAidXVpZCI6ICJpbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2VAcmFpZGVuX2Z1bW8iLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "1bh799h4r0165d4rijkgsnj5k411jn3rpni84y5gg2m8nnq7lpas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBELUJ1cyBpbnRlcmZhY2UgZm9yIGNoYW5naW5nIGlucHV0IHNvdXJjZXMgdmlhIGNvbW1hbmQiLAogICJuYW1lIjogIklucHV0IHNvdXJjZSBELUJ1cyBpbnRlcmZhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJyc2NoZXItb2Ytc2xlZXBpbmcvZ25vbWUtaW5wdXQtc291cmNlLWRidXMtaW50ZXJmYWNlIiwKICAidXVpZCI6ICJpbnB1dC1zb3VyY2UtZGJ1cy1pbnRlcmZhY2VAcmFpZGVuX2Z1bW8iLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "rectangle@acristoffers.me", "name": "Rectangle", "pname": "rectangle", "description": "Magnet/Rectangle like manual tiling", "link": "https://extensions.gnome.org/extension/6553/rectangle/", "shell_version_map": {
     "42": {"version": "12", "sha256": "0zmy1v8jgydk6dp6a3rgq6c7yjn2whb3hxwbkxy2063qb9c2vmv4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "43": {"version": "12", "sha256": "0zmy1v8jgydk6dp6a3rgq6c7yjn2whb3hxwbkxy2063qb9c2vmv4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiAxMgp9"},
     "44": {"version": "12", "sha256": "0zmy1v8jgydk6dp6a3rgq6c7yjn2whb3hxwbkxy2063qb9c2vmv4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "45": {"version": "21", "sha256": "1fgp622i2zszlnhm7q5p807n94hb7pzb94giwz63qz3hrh5n7vv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hY3Jpc3RvZmZlcnMvZ25vbWUtcmVjdGFuZ2xlIiwKICAidXVpZCI6ICJyZWN0YW5nbGVAYWNyaXN0b2ZmZXJzLm1lIiwKICAidmVyc2lvbiI6IDIxCn0="},
-    "46": {"version": "21", "sha256": "1fgp622i2zszlnhm7q5p807n94hb7pzb94giwz63qz3hrh5n7vv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hY3Jpc3RvZmZlcnMvZ25vbWUtcmVjdGFuZ2xlIiwKICAidXVpZCI6ICJyZWN0YW5nbGVAYWNyaXN0b2ZmZXJzLm1lIiwKICAidmVyc2lvbiI6IDIxCn0="}
+    "45": {"version": "23", "sha256": "1h7y0kicajv3z6n0qn1b95rygap04l9m33ri73bnynl082sd71k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "46": {"version": "23", "sha256": "1h7y0kicajv3z6n0qn1b95rygap04l9m33ri73bnynl082sd71k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "47": {"version": "23", "sha256": "1h7y0kicajv3z6n0qn1b95rygap04l9m33ri73bnynl082sd71k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiAyMwp9"}
   }}
-, {"uuid": "task-up@fthx", "name": "Task Up", "pname": "task-up", "description": "Task bar. Handles multiple workspaces. Very light extension.\n\n Complete rewrite of BaBar task bar extension, light code only has 300 lines.\n\n Some settings.", "link": "https://extensions.gnome.org/extension/6556/task-up/", "shell_version_map": {
-    "45": {"version": "31", "sha256": "0yycjk6lyr81l9vixggy8bkchr0lbghln8i144m9py0003yw1jxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBIYW5kbGVzIG11bHRpcGxlIHdvcmtzcGFjZXMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gQ29tcGxldGUgcmV3cml0ZSBvZiBCYUJhciB0YXNrIGJhciBleHRlbnNpb24sIGxpZ2h0IGNvZGUgb25seSBoYXMgMzAwIGxpbmVzLlxuXG4gU29tZSBzZXR0aW5ncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJUYXNrIFVwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2stdXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90YXNrLXVwIiwKICAidXVpZCI6ICJ0YXNrLXVwQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "46": {"version": "33", "sha256": "1jvcmf9dfqh312335fi8g3ixs2wmm9y7lz12j1jg42g6jsblzyk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBIYW5kbGVzIG11bHRpcGxlIHdvcmtzcGFjZXMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gQ29tcGxldGUgcmV3cml0ZSBvZiBCYUJhciB0YXNrIGJhciBleHRlbnNpb24sIGxpZ2h0IGNvZGUgb25seSBoYXMgMzAwIGxpbmVzLlxuXG4gU29tZSBzZXR0aW5ncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJUYXNrIFVwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2stdXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90YXNrLXVwIiwKICAidXVpZCI6ICJ0YXNrLXVwQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}
+, {"uuid": "task-up@fthx", "name": "Task Up", "pname": "task-up", "description": "Task bar. Manage multiple workspaces. Light extension.\n\n Complete rewrite of BaBar task bar extension, light code, only 600 lines.\n Favorites menu.\n Drag and drop tasks on workspaces.\n Some settings.", "link": "https://extensions.gnome.org/extension/6556/task-up/", "shell_version_map": {
+    "46": {"version": "42", "sha256": "05nl626nss9bis6rn4h0fsqfdh7qkx0r34k92cj63q3j4w3bd4xc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBNYW5hZ2UgbXVsdGlwbGUgd29ya3NwYWNlcy4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gQ29tcGxldGUgcmV3cml0ZSBvZiBCYUJhciB0YXNrIGJhciBleHRlbnNpb24sIGxpZ2h0IGNvZGUsIG9ubHkgNjAwIGxpbmVzLlxuIEZhdm9yaXRlcyBtZW51LlxuIERyYWcgYW5kIGRyb3AgdGFza3Mgb24gd29ya3NwYWNlcy5cbiBTb21lIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlRhc2sgVXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay11cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90YXNrLXVwIiwKICAidXVpZCI6ICJ0YXNrLXVwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNDIKfQ=="},
+    "47": {"version": "42", "sha256": "05nl626nss9bis6rn4h0fsqfdh7qkx0r34k92cj63q3j4w3bd4xc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBNYW5hZ2UgbXVsdGlwbGUgd29ya3NwYWNlcy4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gQ29tcGxldGUgcmV3cml0ZSBvZiBCYUJhciB0YXNrIGJhciBleHRlbnNpb24sIGxpZ2h0IGNvZGUsIG9ubHkgNjAwIGxpbmVzLlxuIEZhdm9yaXRlcyBtZW51LlxuIERyYWcgYW5kIGRyb3AgdGFza3Mgb24gd29ya3NwYWNlcy5cbiBTb21lIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlRhc2sgVXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay11cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90YXNrLXVwIiwKICAidXVpZCI6ICJ0YXNrLXVwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNDIKfQ=="}
   }}
 , {"uuid": "workspace-switch-buttons@rajan-31", "name": "Workspace Switch Buttons", "pname": "workspace-switch-buttons", "description": "This GNOME Shell extension offers following features:\n\n- Buttons to switch to left and right workspace\n\n- Shows index of active workspace (click it for overview)\n[Can hide it in preferences]\n\n- Hides \"Activities\" button\n[Can turn this off in preferences]", "link": "https://extensions.gnome.org/extension/6562/workspace-switch-buttons/", "shell_version_map": {
     "42": {"version": "5", "sha256": "1dwj8vwl5laa4ih8vpnh4slm6nlh30bxggqsbngl6b9473szkvcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBzaG93cyBhY3RpdmUgd29ya3NwYWNlIGluZGV4LCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaC1idXR0b25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFqYW4tMzEvV29ya3NwYWNlLVN3aXRjaC1CdXR0b25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLWJ1dHRvbnNAcmFqYW4tMzEiLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -6867,37 +7234,42 @@
     "45": {"version": "2", "sha256": "056x6bg3z8vqrknyqgr8hfgd8x04nj626jxw30p3qszvazajr8bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgUmVnaW9uL0xhbmd1YWdlIFRyYXkgVG8gUXVpY2sgU2V0dGluZ3MiLAogICJuYW1lIjogInhMYW5ndWFnZVRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYTdtZWRraGFsYWYvTGFuZ1RyYXkiLAogICJ1dWlkIjogImxhbmdUcmF5QGE3bWVka2hhbGFmIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "simplebreakreminder@castillodel.com", "name": "Simple Break Reminder", "pname": "simple-break-reminder", "description": "It's important to remember to take a break", "link": "https://extensions.gnome.org/extension/6568/simple-break-reminder/", "shell_version_map": {
-    "45": {"version": "8", "sha256": "1yb861grg83vgys8s77pwiwp47xgq6qk8igcc6apm8r9hr3mfwqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgaW1wb3J0YW50IHRvIHJlbWVtYmVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiU2ltcGxlIEJyZWFrIFJlbWluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Nhc3RpbGxvRGVsL3NpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJ1dWlkIjogInNpbXBsZWJyZWFrcmVtaW5kZXJAY2FzdGlsbG9kZWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
-    "46": {"version": "8", "sha256": "1yb861grg83vgys8s77pwiwp47xgq6qk8igcc6apm8r9hr3mfwqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgaW1wb3J0YW50IHRvIHJlbWVtYmVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiU2ltcGxlIEJyZWFrIFJlbWluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Nhc3RpbGxvRGVsL3NpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJ1dWlkIjogInNpbXBsZWJyZWFrcmVtaW5kZXJAY2FzdGlsbG9kZWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "45": {"version": "9", "sha256": "0rh2h0nvmh6hmp9ydxdcl7jnjvdrrwzsnyi1bi76vvpjajyaf495", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgaW1wb3J0YW50IHRvIHJlbWVtYmVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiU2ltcGxlIEJyZWFrIFJlbWluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DYXN0aWxsb0RlbC9zaW1wbGVicmVha3JlbWluZGVyIiwKICAidXVpZCI6ICJzaW1wbGVicmVha3JlbWluZGVyQGNhc3RpbGxvZGVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "0rh2h0nvmh6hmp9ydxdcl7jnjvdrrwzsnyi1bi76vvpjajyaf495", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgaW1wb3J0YW50IHRvIHJlbWVtYmVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiU2ltcGxlIEJyZWFrIFJlbWluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DYXN0aWxsb0RlbC9zaW1wbGVicmVha3JlbWluZGVyIiwKICAidXVpZCI6ICJzaW1wbGVicmVha3JlbWluZGVyQGNhc3RpbGxvZGVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "0rh2h0nvmh6hmp9ydxdcl7jnjvdrrwzsnyi1bi76vvpjajyaf495", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgaW1wb3J0YW50IHRvIHJlbWVtYmVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiU2ltcGxlIEJyZWFrIFJlbWluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DYXN0aWxsb0RlbC9zaW1wbGVicmVha3JlbWluZGVyIiwKICAidXVpZCI6ICJzaW1wbGVicmVha3JlbWluZGVyQGNhc3RpbGxvZGVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "OnTheTop@fablevi.github.io", "name": "On The Top", "pname": "on-the-top", "description": "Always on top button in the top bar", "link": "https://extensions.gnome.org/extension/6571/on-the-top/", "shell_version_map": {
     "45": {"version": "15", "sha256": "19d723mjg08yg1n9dlas0qv03gsqvsmjy5cmq3cl05l5r0jixf77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBvbiB0b3AgYnV0dG9uIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogIk9uVGhlVG9wIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiT25UaGVUb3AiLAogICJuYW1lIjogIk9uIFRoZSBUb3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub24tdGhlLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmFibGV2aS9PblRoZVRvcCIsCiAgInV1aWQiOiAiT25UaGVUb3BAZmFibGV2aS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
     "46": {"version": "15", "sha256": "19d723mjg08yg1n9dlas0qv03gsqvsmjy5cmq3cl05l5r0jixf77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBvbiB0b3AgYnV0dG9uIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogIk9uVGhlVG9wIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiT25UaGVUb3AiLAogICJuYW1lIjogIk9uIFRoZSBUb3AiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub24tdGhlLXRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmFibGV2aS9PblRoZVRvcCIsCiAgInV1aWQiOiAiT25UaGVUb3BAZmFibGV2aS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
-, {"uuid": "openbar@neuromorph", "name": "Open Bar", "pname": "open-bar", "description": "Top Bar / Top Panel , Menus , Dash / Dock , Gnome Shell , Gtk Apps theming. Open the bar and let the colors 🍹 flow.\n\n**Please report on GitHub if something is broken due to an update or if you have any suggestions.\n\nUpdate v36:\n- Support for nixpkgs  \n- Apps window corners\n- Several fixes \n\nOpen Bar 2.0: \n- Auto-theming completely renewed. Theme Options: Dark, Light, Pastel, True-Color\n- Apply styles to Bar, Menu, Dash / Dock and rest of the shell\n- Apply accent color and style Gtk/Flatpak apps (Accent tint on Headerbar/Sidebar/Card/Dialog, Add Window Border, Corners, Traffic Light controls etc)\n- New UI for preferences/settings\n\n\nCompatibility with Extensions:\n- It should be (mostly) compatible with custom user themes and other extensions that affect the Top Panel \n- Some extensions do not use standard widget and API (i.e. 'PanelMenu.Button' and 'main.addToStatusArea') when adding indicator to Panel and fixing that makes them work correctly with Open Bar (or user themes for that matter). Refer issue #24 on GitHub.\n\n\nAuto Theming:\n- Note: If you want to save your current settings, please use Export Settings option before applying Auto-theme. You can import it back whenever needed.\n- Auto-themes will use the color palette generated from the background image.\n- Other settings will be set as selected, by the user, in the preferences tabs.\n- Styles will apply to the Top Bar, Menus and optionally to the shell.\n        \n        --- True Color     :  Palette colors as-is (biased towards dark). \n        --- Pastel Theme   :  Colors are pastelified (biased towards light).\n        --- Dark Theme     :  Colors are darkened as needed.\n        --- Light Theme    :  Colors are lightened as needed.\n\n- You can select themes separately for both Gnome Dark and Light modes. \n- Once theme is applied, you can further tweak any of the manual settings, as usual, to finetune the theme. \n- Color changes made in current mode will be saved for that mode alone. Other settings will apply to both modes.\n- There is an option for Auto-refreshing theme when background changes. This will overwrite current theme colors with newly generated ones when background is changed.\n- There are more settings in Auto-Theme. You can select if you want the secondary menu BG color to be derived from BG or auto-selected from palette. You can specify any preferred accent color or let the theme choose from the background. You can also select if foreground color should be auto-generated or use manual selection etc.\n- Since it is one size fit all solution, 'No Free Lunch' theorem applies. Not all options will work best for all backgrounds, so the additional knobs above will help you select the desired one. One of the theme combinations should work well for you at least with little bit tweaking, if needed.\n  \n\nCustomize:\n- Bar Type: Fixed, Floating or Islands / Trilands\n- Bar position, height, margin, paddings\n- Bar foreground color, font\n- Bar background color, transparency, gradient, shadow, highlights, candybar \n- Shape rectangular to pill, border width, color, neon glow\n- Menu customizations: foreground, background colors, transparency, border, shadow,  accent/selection, hover colors\netc.\n- Includes a custom color palette, under the default palette, in each color button popup. The palette is auto-generated from the desktop background.\n- Add accent hint to GTK/Flatpak apps' Headerbar, Sidebar or Card/Dialogs. Add Traffic Light controls, window border, rounded window corners (or square),  popover styles etc.\n\n\nSETTINGS NOTES:\nIf the panel/menu isn't looking right, you need to tweak some settings. There are a lot of knobs to allow for different setups/tastes. It can also make it a bit overwhelming if you are not familiar with css styles but with some experimentation it will become a lot easier. Here are brief notes:\n- BG/FG color: Background or Foreground colors. Foreground is typically text and icons.\n- Alpha: Transparency for the color. 0 is transparent while 1 is opaque.\n- Panel BG will affect the bar while Tri/Islands BG will affect the individual indicator buttons/combos (in Trilands/Islands mode).\n- Gradient goes from Start color to End color. If you want a single color fading, select same color for both with different Alphas. e.g. Setting end color alpha to 0 will form a gradient from Start color to transparent.\n- Highlight color: It is the background color upon hover or focus. You can choose to highlight with border instead.\n- Vertical padding: Controls size of highlights in Mainland/Floating. Also controls size of Islands/Trilands. Increase height if padding squeezes the text.\n- Panel Shadow: a downward shadow for the panel bar. Shadow Spread controls both shadow transparency and spread together.\n- Border: \n    = Width controls thickness (grows inwards for Islands). Adjust bar height accordingly, after setting border width.  \n    = Radius will control the shape from rectangle at radius 0 to Pill at radius close to bar height. \n    = Neon glow: adds a neon-light like glow to the border. You need dark, relatively opaque background with bright/neon colored, relatively opaque border. Neon will override Panel shadow in Mainland and Floating mode.\n - Menus: \n    = FG/BG, border, highlight are similar to above but for menus.\n    = Selected/active color is for menu items that are active e.g. Today's day in Calendar or WiFi in Quick Settings or even an active menu item with opened submenu. \n    = Shadow applies to the panel menu. Use white/bright color in dark theme and black/dark color in light theme for the effect to show and help with contrast. Using same color as menu border is also a good idea. Use the Alphas for both border and shadow to increase or reduce their effect.\n- Lastly, be a tiny bit gentler with the sliders in the settings as they modify the stylesheet behind the scene for every update.", "link": "https://extensions.gnome.org/extension/6580/open-bar/", "shell_version_map": {
+, {"uuid": "openbar@neuromorph", "name": "Open Bar", "pname": "open-bar", "description": "Top Bar / Top Panel , Menus , Dash / Dock , Gnome Shell , Gtk Apps theming . Open the bar and let the colors 🍹 flow.\n\n**Please report on GitHub if something is broken due to an update or if you have any suggestions.\n\nOpen Bar 2.0: \n- Auto-theming completely renewed. Theme Options: Dark, Light, Pastel, True-Color\n- Apply styles to Bar, Menu, Dash / Dock and rest of the shell\n- Apply accent color and style Gtk/Flatpak apps (Accent tint on Headerbar/Sidebar/Card/Dialog, Add Window Border, Corners, Traffic Light controls etc)\n- New UI for preferences/settings\n\n\nCompatibility with Extensions:\n- It should be (mostly) compatible with custom user themes and other extensions that affect the Top Panel \n- Some extensions do not use standard widget and API (i.e. 'PanelMenu.Button' and 'main.addToStatusArea') when adding indicator to Panel and fixing that makes them work correctly with Open Bar (or with user themes for that matter). Refer issue #24 on GitHub for some fixes.\n\n\nAuto Theming:\n- Note: If you want to save your current settings, please use Export Settings option before applying Auto-theme. You can import it back whenever needed.\n- Auto-themes will use the color palette generated from the desktop background image.\n- Other settings will be set as selected, by the user, in the preferences tabs.\n- Styles will apply to the Top Bar, Menus and optionally to the shell.\n        \n        --- True Color     :  Palette colors as-is (biased towards dark). \n        --- Pastel Theme   :  Colors are pastelified (biased towards light).\n        --- Dark Theme     :  Colors are darkened as needed.\n        --- Light Theme    :  Colors are lightened as needed.\n\n- You can select themes separately for both Gnome Dark and Light modes. \n- Once theme is applied, you can further tweak any of the manual settings to finetune the theme. \n- Color changes made in current mode will be saved for that mode alone. Other settings will apply to both modes.\n- There is an option for Auto-refreshing theme when background changes. This will overwrite current theme colors with newly generated ones when background is changed.\n- There are more settings in Auto-Theme. You can select if you want the secondary menu BG color to be derived from BG or auto-selected from palette. You can specify any preferred accent color or let the theme choose from the background. You can also select if foreground color should be auto-generated or use manual selection etc.\n- Since it is one size fit all solution, 'No Free Lunch' theorem applies. Not all options will work best for all backgrounds, so the additional knobs above will help you select the desired one. One of the theme combinations should work well for you at least with little bit tweaking, if needed.\n  \n\nCustomize:\n- Bar Type: Fixed, Floating or Islands / Trilands\n- Bar position, height, margin, paddings\n- Bar foreground color, font\n- Bar background color, transparency, gradient, shadow, highlights, candybar \n- Shape rectangular to pill, border width, color, neon glow\n- Menu customizations: foreground, background colors, transparency, border, shadow,  accent/selection, hover colors\netc.\n- Use any color as custom accent color\n- Includes a custom color palette, under the default palette, in each color button popup. The palette is auto-generated from the desktop background.\n- Add accent hint to GTK/Flatpak apps' Headerbar, Sidebar or Card/Dialogs. Add Traffic Light controls, window border, rounded window corners (or square),  popover styles etc.\n\n\nSETTINGS NOTES:\nIf the panel/menu isn't looking right, you need to tweak some settings. There are a lot of knobs to allow for different setups/tastes. It can also make it a bit overwhelming if you are not familiar with css styles but with some experimentation it will become a lot easier. Here are brief notes:\n- BG/FG color: Background or Foreground colors. Foreground is typically text and icons.\n- Alpha: Transparency for the color. 0 is transparent while 1 is opaque.\n- Panel BG will affect the bar while Tri/Islands BG will affect the individual indicator buttons/combos (in Trilands/Islands mode).\n- Gradient goes from Start color to End color. If you want a single color fading, select same color for both with different Alphas. e.g. Setting end color alpha to 0 will form a gradient from Start color to transparent.\n- Highlight color: It is the background color upon hover or focus. You can choose to highlight with border instead.\n- Vertical padding: Controls size of highlights in Mainland/Floating. Also controls size of Islands/Trilands. Increase bar height if padding squeezes the text.\n- Panel Shadow: a downward shadow for the panel bar. Shadow Spread controls both shadow transparency and spread together.\n- Border: \n    = Width controls thickness (grows inwards for Islands). Adjust bar height accordingly, after setting border width.  \n    = Radius will control the shape from rectangle at radius 0 to Pill at radius close to bar height. \n    = Neon glow: adds a neon-light like glow to the border. You need dark, relatively opaque background with bright/neon colored, relatively opaque border. Neon will override Panel shadow in Mainland and Floating mode.\n - Menus: \n    = FG/BG, border, highlight are similar to above but for menus.\n    = Accent/active color is for menu items that are active e.g. Today's day in Calendar or WiFi in Quick Settings or even an active menu item with opened submenu. \n    = Shadow applies to the panel menu. Use white/bright color in dark theme and black/dark color in light theme for the effect to show and help with contrast. Using same color as menu border is also a good idea. Use the Alphas for both border and shadow to increase or reduce their effect.\n- Lastly, be a tiny bit gentler with the sliders in the settings as they modify the stylesheet behind the scene for every update.", "link": "https://extensions.gnome.org/extension/6580/open-bar/", "shell_version_map": {
     "42": {"version": "34", "sha256": "1sbd0jk1kjsqq6iwmwvr6lpin4axna01fljqylhkjgknf3h2q0k6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9vcGVuYmFyIiwKICAidXVpZCI6ICJvcGVuYmFyQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "43": {"version": "34", "sha256": "1sbd0jk1kjsqq6iwmwvr6lpin4axna01fljqylhkjgknf3h2q0k6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9vcGVuYmFyIiwKICAidXVpZCI6ICJvcGVuYmFyQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "44": {"version": "34", "sha256": "1sbd0jk1kjsqq6iwmwvr6lpin4axna01fljqylhkjgknf3h2q0k6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9vcGVuYmFyIiwKICAidXVpZCI6ICJvcGVuYmFyQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "45": {"version": "36", "sha256": "1h4x0h23gyfnf95rkrw81vwljd81rfzxb4ffazgkg3ip7gx2ivqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZXVyb21vcnBoL29wZW5iYXIiLAogICJ1dWlkIjogIm9wZW5iYXJAbmV1cm9tb3JwaCIsCiAgInZlcnNpb24iOiAzNgp9"},
-    "46": {"version": "36", "sha256": "1h4x0h23gyfnf95rkrw81vwljd81rfzxb4ffazgkg3ip7gx2ivqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZXVyb21vcnBoL29wZW5iYXIiLAogICJ1dWlkIjogIm9wZW5iYXJAbmV1cm9tb3JwaCIsCiAgInZlcnNpb24iOiAzNgp9"}
+    "45": {"version": "41", "sha256": "0jr6l9an6kaskxmvjzwwsb93ip66a4pj15vvmlgg7mz7dwgpdiqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9vcGVuYmFyIiwKICAidXVpZCI6ICJvcGVuYmFyQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
+    "46": {"version": "41", "sha256": "0jr6l9an6kaskxmvjzwwsb93ip66a4pj15vvmlgg7mz7dwgpdiqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9vcGVuYmFyIiwKICAidXVpZCI6ICJvcGVuYmFyQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
+    "47": {"version": "41", "sha256": "0jr6l9an6kaskxmvjzwwsb93ip66a4pj15vvmlgg7mz7dwgpdiqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgLyBUb3AgUGFuZWwgLCBNZW51cyAsIERhc2ggLyBEb2NrICwgR25vbWUgU2hlbGwgLCBHdGsgQXBwcyB0aGVtaW5nLiBPcGVuIHRoZSBiYXIgYW5kIGxldCB0aGUgY29sb3JzIFx1ZDgzY1x1ZGY3OSBmbG93LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibmV1cm9tb3JwaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcGVuYmFyIiwKICAibmFtZSI6ICJPcGVuIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmV1cm9tb3JwaC9vcGVuYmFyIiwKICAidXVpZCI6ICJvcGVuYmFyQG5ldXJvbW9ycGgiLAogICJ2ZXJzaW9uIjogNDEKfQ=="}
   }}
 , {"uuid": "auto-power-profile@dmy3k.github.io", "name": "Auto Power Profile", "pname": "auto-power-profile", "description": "Automatically switch between power profiles based on power supply and battery status.", "link": "https://extensions.gnome.org/extension/6583/auto-power-profile/", "shell_version_map": {
     "42": {"version": "13", "sha256": "18zlai7wfsi72jifq41h31zj0mjagw21b4fy522m0hc3a22r1ypg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXkzay9hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJ1dWlkIjogImF1dG8tcG93ZXItcHJvZmlsZUBkbXkzay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "43": {"version": "13", "sha256": "18zlai7wfsi72jifq41h31zj0mjagw21b4fy522m0hc3a22r1ypg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXkzay9hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJ1dWlkIjogImF1dG8tcG93ZXItcHJvZmlsZUBkbXkzay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
     "44": {"version": "13", "sha256": "18zlai7wfsi72jifq41h31zj0mjagw21b4fy522m0hc3a22r1ypg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXkzay9hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJ1dWlkIjogImF1dG8tcG93ZXItcHJvZmlsZUBkbXkzay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "45": {"version": "14", "sha256": "0xlx3x5pfq737hqdpf8l68j5igkz9rcpwsvzila2xln71jqhzkzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RteTNrL2F1dG8tcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAiYXV0by1wb3dlci1wcm9maWxlQGRteTNrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "0xlx3x5pfq737hqdpf8l68j5igkz9rcpwsvzila2xln71jqhzkzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RteTNrL2F1dG8tcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAiYXV0by1wb3dlci1wcm9maWxlQGRteTNrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "45": {"version": "15", "sha256": "0s623rzjjwz93dkh94dmf2anw44wi2ivngiyvrr9wqjwyv1y71dv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXkzay9hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJ1dWlkIjogImF1dG8tcG93ZXItcHJvZmlsZUBkbXkzay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "0s623rzjjwz93dkh94dmf2anw44wi2ivngiyvrr9wqjwyv1y71dv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXkzay9hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJ1dWlkIjogImF1dG8tcG93ZXItcHJvZmlsZUBkbXkzay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "0s623rzjjwz93dkh94dmf2anw44wi2ivngiyvrr9wqjwyv1y71dv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXkzay9hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJ1dWlkIjogImF1dG8tcG93ZXItcHJvZmlsZUBkbXkzay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
-, {"uuid": "system-monitor-indicator@mknap.com", "name": "System Monitor Tray Indicator", "pname": "system-monitor-tray-indicator", "description": "This is a minimalist system monitor extension for GNOME Shell. It displays CPU, RAM, and Swap usage right in your GNOME Shell top bar. ", "link": "https://extensions.gnome.org/extension/6586/system-monitor-tray-indicator/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "0jja47inr6wl8d9mhxd8af8yl67hk2zpiw1m7pxymix0p8l8x82m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIENQVSBhbmQgTWVtb3J5IHVzYWdlIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIE1vbml0b3IgVHJheSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxrbmFwL2dub21lLXN5c3RlbS1tb25pdG9yLWluZGljYXRvciIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItaW5kaWNhdG9yQG1rbmFwLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
-    "46": {"version": "2", "sha256": "0jja47inr6wl8d9mhxd8af8yl67hk2zpiw1m7pxymix0p8l8x82m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIENQVSBhbmQgTWVtb3J5IHVzYWdlIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIE1vbml0b3IgVHJheSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxrbmFwL2dub21lLXN5c3RlbS1tb25pdG9yLWluZGljYXRvciIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItaW5kaWNhdG9yQG1rbmFwLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
+, {"uuid": "system-monitor-indicator@mknap.com", "name": "System Monitor Tray Indicator", "pname": "system-monitor-tray-indicator", "description": "Displays CPU and Memory usage on the top bar.", "link": "https://extensions.gnome.org/extension/6586/system-monitor-tray-indicator/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "04839jdh0mpmkjxmcdycsp4p80w5mzxrssw1an7ggdihwdh826ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIENQVSBhbmQgTWVtb3J5IHVzYWdlIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIE1vbml0b3IgVHJheSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoYWVsa25hcC9nbm9tZS1zeXN0ZW0tbW9uaXRvci1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLWluZGljYXRvckBta25hcC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "46": {"version": "3", "sha256": "04839jdh0mpmkjxmcdycsp4p80w5mzxrssw1an7ggdihwdh826ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIENQVSBhbmQgTWVtb3J5IHVzYWdlIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIE1vbml0b3IgVHJheSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoYWVsa25hcC9nbm9tZS1zeXN0ZW0tbW9uaXRvci1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLWluZGljYXRvckBta25hcC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "47": {"version": "3", "sha256": "04839jdh0mpmkjxmcdycsp4p80w5mzxrssw1an7ggdihwdh826ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIENQVSBhbmQgTWVtb3J5IHVzYWdlIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIE1vbml0b3IgVHJheSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoYWVsa25hcC9nbm9tZS1zeXN0ZW0tbW9uaXRvci1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLWluZGljYXRvckBta25hcC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "enhancedosk@cass00.github.io", "name": "Enhanced OSK", "pname": "enhanced-osk", "description": "Makes Gnome's OnScreen Keyboard more usable.\n\nFeatures:\n* Includes additional buttons: Arrow keys, Esc, Tab, Ctrl, Alt, Super, F1-12\n* Supports key combinations like `Ctrl + C`, `Alt + Tab`, `Ctrl + Shift + C`, `Super + A, Alt + F2` etc.\n* Configurable keyboard size (landscape/portrait)\n* Statusbar indicator to toggle keyboard\n* Works in Gnome password modals\n\nThis extension is a fork of https://github.com/nick-shmyrev/improved-osk-gnome-ext. Formerly known as Improved OSK.", "link": "https://extensions.gnome.org/extension/6595/enhanced-osk/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1w02yp5hpmwbpzd02y6mqyb40aksbrbp4vwqrw5y2p9d3hrzn05k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIFN1cGVyLCBGMS0xMlxuKiBTdXBwb3J0cyBrZXkgY29tYmluYXRpb25zIGxpa2UgYEN0cmwgKyBDYCwgYEFsdCArIFRhYmAsIGBDdHJsICsgU2hpZnQgKyBDYCwgYFN1cGVyICsgQSwgQWx0ICsgRjJgIGV0Yy5cbiogQ29uZmlndXJhYmxlIGtleWJvYXJkIHNpemUgKGxhbmRzY2FwZS9wb3J0cmFpdClcbiogU3RhdHVzYmFyIGluZGljYXRvciB0byB0b2dnbGUga2V5Ym9hcmRcbiogV29ya3MgaW4gR25vbWUgcGFzc3dvcmQgbW9kYWxzXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQuIEZvcm1lcmx5IGtub3duIGFzIEltcHJvdmVkIE9TSy4iLAogICJuYW1lIjogIkVuaGFuY2VkIE9TSyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYXNzMDAvZW5oYW5jZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiZW5oYW5jZWRvc2tAY2FzczAwLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
-, {"uuid": "dev-container-manager@devopsnextgenx", "name": "docker podman kind kubernetes cluster container manager", "pname": "dev-container-manager", "description": "Gnome Extension to enable cicd/container/kubernetes and cloud resource handling. you can use docker, podman and use kubernetes clusters with kind. Added resize, delete container and filter active containers.", "link": "https://extensions.gnome.org/extension/6601/dev-container-manager/", "shell_version_map": {
-    "45": {"version": "27", "sha256": "1hqcjhvg6vzaazx5p8afgahqd5hsdacdphra92rchg8p6pci922s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIEFkZGVkIHJlc2l6ZSwgZGVsZXRlIGNvbnRhaW5lciBhbmQgZmlsdGVyIGFjdGl2ZSBjb250YWluZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRldm9wc25leHRnZW54IgogIH0sCiAgIm5hbWUiOiAiZG9ja2VyIHBvZG1hbiBraW5kIGt1YmVybmV0ZXMgY2x1c3RlciBjb250YWluZXIgbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXYtY29udGFpbmVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rldm9wc25leHRnZW54L2dub21lLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRldi1jb250YWluZXItbWFuYWdlckBkZXZvcHNuZXh0Z2VueCIsCiAgInZlcnNpb24iOiAyNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC45Igp9"},
-    "46": {"version": "27", "sha256": "1hqcjhvg6vzaazx5p8afgahqd5hsdacdphra92rchg8p6pci922s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIEFkZGVkIHJlc2l6ZSwgZGVsZXRlIGNvbnRhaW5lciBhbmQgZmlsdGVyIGFjdGl2ZSBjb250YWluZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRldm9wc25leHRnZW54IgogIH0sCiAgIm5hbWUiOiAiZG9ja2VyIHBvZG1hbiBraW5kIGt1YmVybmV0ZXMgY2x1c3RlciBjb250YWluZXIgbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXYtY29udGFpbmVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rldm9wc25leHRnZW54L2dub21lLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRldi1jb250YWluZXItbWFuYWdlckBkZXZvcHNuZXh0Z2VueCIsCiAgInZlcnNpb24iOiAyNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC45Igp9"}
+, {"uuid": "dev-container-manager@devopsnextgenx", "name": "docker podman kind kubernetes ollama llama cluster container manager", "pname": "dev-container-manager", "description": "Gnome Extension to enable cicd/container/kubernetes and cloud resource handling. you can use docker, podman and use kubernetes clusters with kind. Added resize, delete container and filter active containers. You can enable Ollama as well if you have the Ollama installed on your machine. It can be useful for copilot in IDEs.\n\nView demo for the extension at: https://youtu.be/8DEHF_LYKRY", "link": "https://extensions.gnome.org/extension/6601/dev-container-manager/", "shell_version_map": {
+    "45": {"version": "37", "sha256": "05zvh8sp6jk6hbybpvaa3d851g8pfwci6al04lg5nf3jpvk3km5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIEFkZGVkIHJlc2l6ZSwgZGVsZXRlIGNvbnRhaW5lciBhbmQgZmlsdGVyIGFjdGl2ZSBjb250YWluZXJzLiBZb3UgY2FuIGVuYWJsZSBPbGxhbWEgYXMgd2VsbCBpZiB5b3UgaGF2ZSB0aGUgT2xsYW1hIGluc3RhbGxlZCBvbiB5b3VyIG1hY2hpbmUuIEl0IGNhbiBiZSB1c2VmdWwgZm9yIGNvcGlsb3QgaW4gSURFcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJkZXZvcHNuZXh0Z2VueCIKICB9LAogICJuYW1lIjogImRvY2tlciBwb2RtYW4ga2luZCBrdWJlcm5ldGVzIG9sbGFtYSBsbGFtYSBjbHVzdGVyIGNvbnRhaW5lciBtYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRldi1jb250YWluZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rldm9wc25leHRnZW54L2dub21lLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRldi1jb250YWluZXItbWFuYWdlckBkZXZvcHNuZXh0Z2VueCIsCiAgInZlcnNpb24iOiAzNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC4xMCIKfQ=="},
+    "46": {"version": "37", "sha256": "05zvh8sp6jk6hbybpvaa3d851g8pfwci6al04lg5nf3jpvk3km5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIEFkZGVkIHJlc2l6ZSwgZGVsZXRlIGNvbnRhaW5lciBhbmQgZmlsdGVyIGFjdGl2ZSBjb250YWluZXJzLiBZb3UgY2FuIGVuYWJsZSBPbGxhbWEgYXMgd2VsbCBpZiB5b3UgaGF2ZSB0aGUgT2xsYW1hIGluc3RhbGxlZCBvbiB5b3VyIG1hY2hpbmUuIEl0IGNhbiBiZSB1c2VmdWwgZm9yIGNvcGlsb3QgaW4gSURFcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJkZXZvcHNuZXh0Z2VueCIKICB9LAogICJuYW1lIjogImRvY2tlciBwb2RtYW4ga2luZCBrdWJlcm5ldGVzIG9sbGFtYSBsbGFtYSBjbHVzdGVyIGNvbnRhaW5lciBtYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRldi1jb250YWluZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rldm9wc25leHRnZW54L2dub21lLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRldi1jb250YWluZXItbWFuYWdlckBkZXZvcHNuZXh0Z2VueCIsCiAgInZlcnNpb24iOiAzNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC4xMCIKfQ=="},
+    "47": {"version": "37", "sha256": "05zvh8sp6jk6hbybpvaa3d851g8pfwci6al04lg5nf3jpvk3km5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIEFkZGVkIHJlc2l6ZSwgZGVsZXRlIGNvbnRhaW5lciBhbmQgZmlsdGVyIGFjdGl2ZSBjb250YWluZXJzLiBZb3UgY2FuIGVuYWJsZSBPbGxhbWEgYXMgd2VsbCBpZiB5b3UgaGF2ZSB0aGUgT2xsYW1hIGluc3RhbGxlZCBvbiB5b3VyIG1hY2hpbmUuIEl0IGNhbiBiZSB1c2VmdWwgZm9yIGNvcGlsb3QgaW4gSURFcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJkZXZvcHNuZXh0Z2VueCIKICB9LAogICJuYW1lIjogImRvY2tlciBwb2RtYW4ga2luZCBrdWJlcm5ldGVzIG9sbGFtYSBsbGFtYSBjbHVzdGVyIGNvbnRhaW5lciBtYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRldi1jb250YWluZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rldm9wc25leHRnZW54L2dub21lLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRldi1jb250YWluZXItbWFuYWdlckBkZXZvcHNuZXh0Z2VueCIsCiAgInZlcnNpb24iOiAzNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC4xMCIKfQ=="}
   }}
 , {"uuid": "move-to-next-screen@wosar.me", "name": "Move To Next Screen", "pname": "move-to-next-screen", "description": "Adds a keyboard shortcut to move the current window to the next screen", "link": "https://extensions.gnome.org/extension/6610/move-to-next-screen/", "shell_version_map": {
     "45": {"version": "2", "sha256": "0xmghaakrqsvpd4yw8na825djyk79ifvd3nizrr6hncb5yfb3fbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBrZXlib2FyZCBzaG9ydGN1dCB0byBtb3ZlIHRoZSBjdXJyZW50IHdpbmRvdyB0byB0aGUgbmV4dCBzY3JlZW4iLAogICJuYW1lIjogIk1vdmUgVG8gTmV4dCBTY3JlZW4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW92ZS10by1uZXh0LXNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZndvc2FyL21vdmUtdG8tbmV4dC1zY3JlZW4iLAogICJ1dWlkIjogIm1vdmUtdG8tbmV4dC1zY3JlZW5Ad29zYXIubWUiLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -6907,9 +7279,9 @@
     "45": {"version": "4", "sha256": "0zdpycnv7pk8hic84ih3nh1gb1871bv4s33x9dnl2468sv4j07k8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB0b3AgcGFuZWwgdG9nZ2xlIGZvciBhY3RpdmF0aW5nIEFsd2F5cyBvbiBUb3AgZm9yIHdpbmRvd3MuIiwKICAibmFtZSI6ICJXaW5kb3cgb24gVG9wIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS95b3VzYWZlc2FlZWQvd2luZG93LW9uLXRvcCIsCiAgInV1aWQiOiAid2luZG93LW9uLXRvcEB5b3VzYWZlc2FlZWQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "46": {"version": "4", "sha256": "0zdpycnv7pk8hic84ih3nh1gb1871bv4s33x9dnl2468sv4j07k8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB0b3AgcGFuZWwgdG9nZ2xlIGZvciBhY3RpdmF0aW5nIEFsd2F5cyBvbiBUb3AgZm9yIHdpbmRvd3MuIiwKICAibmFtZSI6ICJXaW5kb3cgb24gVG9wIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS95b3VzYWZlc2FlZWQvd2luZG93LW9uLXRvcCIsCiAgInV1aWQiOiAid2luZG93LW9uLXRvcEB5b3VzYWZlc2FlZWQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
-, {"uuid": "gmeet@pabmartine.com", "name": "GMeet", "pname": "gmeet", "description": "GNOME Shell Extension for Quick Access to Google Meet.\n\nWith this extension, you can quickly access your Google Meet bookmarks directly from the Gnome Shell panel. You can add new bookmarks, manage existing ones, and directly open Meet sessions in your browser.\n\nFeatures:\n- 'New Meet': Opens a new Google Meet session in your default browser.\n- 'Add': Allows you to add a new bookmark to your Google Meet sessions. Simply provide a name and a unique code.\n\nTo delete a bookmark, simply click on the trash icon next to each bookmark in the menu.\n\nThis extension is not affiliated, funded, or in any way associated with Google and GMeet.\n\nFor additional support, please contact the extension developer.", "link": "https://extensions.gnome.org/extension/6622/gmeet/", "shell_version_map": {
-    "45": {"version": "13", "sha256": "1yvbrl3zax5dzv26lvmjhvj07x84wm6yv22p2if1n9fqhb0ikgg8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIEV4dGVuc2lvbiBmb3IgUXVpY2sgQWNjZXNzIHRvIEdvb2dsZSBNZWV0LlxuXG5XaXRoIHRoaXMgZXh0ZW5zaW9uLCB5b3UgY2FuIHF1aWNrbHkgYWNjZXNzIHlvdXIgR29vZ2xlIE1lZXQgYm9va21hcmtzIGRpcmVjdGx5IGZyb20gdGhlIEdub21lIFNoZWxsIHBhbmVsLiBZb3UgY2FuIGFkZCBuZXcgYm9va21hcmtzLCBtYW5hZ2UgZXhpc3Rpbmcgb25lcywgYW5kIGRpcmVjdGx5IG9wZW4gTWVldCBzZXNzaW9ucyBpbiB5b3VyIGJyb3dzZXIuXG5cbkZlYXR1cmVzOlxuLSAnTmV3IE1lZXQnOiBPcGVucyBhIG5ldyBHb29nbGUgTWVldCBzZXNzaW9uIGluIHlvdXIgZGVmYXVsdCBicm93c2VyLlxuLSAnQWRkJzogQWxsb3dzIHlvdSB0byBhZGQgYSBuZXcgYm9va21hcmsgdG8geW91ciBHb29nbGUgTWVldCBzZXNzaW9ucy4gU2ltcGx5IHByb3ZpZGUgYSBuYW1lIGFuZCBhIHVuaXF1ZSBjb2RlLlxuXG5UbyBkZWxldGUgYSBib29rbWFyaywgc2ltcGx5IGNsaWNrIG9uIHRoZSB0cmFzaCBpY29uIG5leHQgdG8gZWFjaCBib29rbWFyayBpbiB0aGUgbWVudS5cblxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggR29vZ2xlIGFuZCBHTWVldC5cblxuRm9yIGFkZGl0aW9uYWwgc3VwcG9ydCwgcGxlYXNlIGNvbnRhY3QgdGhlIGV4dGVuc2lvbiBkZXZlbG9wZXIuIiwKICAibmFtZSI6ICJHTWVldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFibWFydGluZS9nbWVldCIsCiAgInV1aWQiOiAiZ21lZXRAcGFibWFydGluZS5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "46": {"version": "13", "sha256": "1yvbrl3zax5dzv26lvmjhvj07x84wm6yv22p2if1n9fqhb0ikgg8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIEV4dGVuc2lvbiBmb3IgUXVpY2sgQWNjZXNzIHRvIEdvb2dsZSBNZWV0LlxuXG5XaXRoIHRoaXMgZXh0ZW5zaW9uLCB5b3UgY2FuIHF1aWNrbHkgYWNjZXNzIHlvdXIgR29vZ2xlIE1lZXQgYm9va21hcmtzIGRpcmVjdGx5IGZyb20gdGhlIEdub21lIFNoZWxsIHBhbmVsLiBZb3UgY2FuIGFkZCBuZXcgYm9va21hcmtzLCBtYW5hZ2UgZXhpc3Rpbmcgb25lcywgYW5kIGRpcmVjdGx5IG9wZW4gTWVldCBzZXNzaW9ucyBpbiB5b3VyIGJyb3dzZXIuXG5cbkZlYXR1cmVzOlxuLSAnTmV3IE1lZXQnOiBPcGVucyBhIG5ldyBHb29nbGUgTWVldCBzZXNzaW9uIGluIHlvdXIgZGVmYXVsdCBicm93c2VyLlxuLSAnQWRkJzogQWxsb3dzIHlvdSB0byBhZGQgYSBuZXcgYm9va21hcmsgdG8geW91ciBHb29nbGUgTWVldCBzZXNzaW9ucy4gU2ltcGx5IHByb3ZpZGUgYSBuYW1lIGFuZCBhIHVuaXF1ZSBjb2RlLlxuXG5UbyBkZWxldGUgYSBib29rbWFyaywgc2ltcGx5IGNsaWNrIG9uIHRoZSB0cmFzaCBpY29uIG5leHQgdG8gZWFjaCBib29rbWFyayBpbiB0aGUgbWVudS5cblxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggR29vZ2xlIGFuZCBHTWVldC5cblxuRm9yIGFkZGl0aW9uYWwgc3VwcG9ydCwgcGxlYXNlIGNvbnRhY3QgdGhlIGV4dGVuc2lvbiBkZXZlbG9wZXIuIiwKICAibmFtZSI6ICJHTWVldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFibWFydGluZS9nbWVldCIsCiAgInV1aWQiOiAiZ21lZXRAcGFibWFydGluZS5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
+, {"uuid": "gmeet@pabmartine.com", "name": "GMeet", "pname": "gmeet", "description": "GNOME Shell Extension for Quick Access to Google Meet.\n\nWith this extension, you can quickly access your Google Meet bookmarks directly from the Gnome Shell panel. You can add new bookmarks, manage existing ones, and directly open Meet sessions in your browser.\n\nFeatures:\n- 'New': Opens a new Google Meet session in your default browser.\n- 'Add': Allows you to add a new bookmark to your Google Meet sessions. Simply provide a name and a unique code.\n\nTo delete a bookmark, simply click on the trash icon next to each bookmark in the menu.\n\nThis extension is not affiliated, funded, or in any way associated with Google and GMeet.\n\nFor additional support, please contact the extension developer.", "link": "https://extensions.gnome.org/extension/6622/gmeet/", "shell_version_map": {
+    "45": {"version": "14", "sha256": "12j9s9xjmd009ysspb6fh0ygv85pgc999ig69nkvn2rz2vvvjy3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIEV4dGVuc2lvbiBmb3IgUXVpY2sgQWNjZXNzIHRvIEdvb2dsZSBNZWV0LlxuXG5XaXRoIHRoaXMgZXh0ZW5zaW9uLCB5b3UgY2FuIHF1aWNrbHkgYWNjZXNzIHlvdXIgR29vZ2xlIE1lZXQgYm9va21hcmtzIGRpcmVjdGx5IGZyb20gdGhlIEdub21lIFNoZWxsIHBhbmVsLiBZb3UgY2FuIGFkZCBuZXcgYm9va21hcmtzLCBtYW5hZ2UgZXhpc3Rpbmcgb25lcywgYW5kIGRpcmVjdGx5IG9wZW4gTWVldCBzZXNzaW9ucyBpbiB5b3VyIGJyb3dzZXIuXG5cbkZlYXR1cmVzOlxuLSAnTmV3IE1lZXQnOiBPcGVucyBhIG5ldyBHb29nbGUgTWVldCBzZXNzaW9uIGluIHlvdXIgZGVmYXVsdCBicm93c2VyLlxuLSAnQWRkJzogQWxsb3dzIHlvdSB0byBhZGQgYSBuZXcgYm9va21hcmsgdG8geW91ciBHb29nbGUgTWVldCBzZXNzaW9ucy4gU2ltcGx5IHByb3ZpZGUgYSBuYW1lIGFuZCBhIHVuaXF1ZSBjb2RlLlxuXG5UbyBkZWxldGUgYSBib29rbWFyaywgc2ltcGx5IGNsaWNrIG9uIHRoZSB0cmFzaCBpY29uIG5leHQgdG8gZWFjaCBib29rbWFyayBpbiB0aGUgbWVudS5cblxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggR29vZ2xlIGFuZCBHTWVldC5cblxuRm9yIGFkZGl0aW9uYWwgc3VwcG9ydCwgcGxlYXNlIGNvbnRhY3QgdGhlIGV4dGVuc2lvbiBkZXZlbG9wZXIuIiwKICAibmFtZSI6ICJHTWVldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFibWFydGluZS9nbWVldCIsCiAgInV1aWQiOiAiZ21lZXRAcGFibWFydGluZS5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "46": {"version": "14", "sha256": "12j9s9xjmd009ysspb6fh0ygv85pgc999ig69nkvn2rz2vvvjy3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIEV4dGVuc2lvbiBmb3IgUXVpY2sgQWNjZXNzIHRvIEdvb2dsZSBNZWV0LlxuXG5XaXRoIHRoaXMgZXh0ZW5zaW9uLCB5b3UgY2FuIHF1aWNrbHkgYWNjZXNzIHlvdXIgR29vZ2xlIE1lZXQgYm9va21hcmtzIGRpcmVjdGx5IGZyb20gdGhlIEdub21lIFNoZWxsIHBhbmVsLiBZb3UgY2FuIGFkZCBuZXcgYm9va21hcmtzLCBtYW5hZ2UgZXhpc3Rpbmcgb25lcywgYW5kIGRpcmVjdGx5IG9wZW4gTWVldCBzZXNzaW9ucyBpbiB5b3VyIGJyb3dzZXIuXG5cbkZlYXR1cmVzOlxuLSAnTmV3IE1lZXQnOiBPcGVucyBhIG5ldyBHb29nbGUgTWVldCBzZXNzaW9uIGluIHlvdXIgZGVmYXVsdCBicm93c2VyLlxuLSAnQWRkJzogQWxsb3dzIHlvdSB0byBhZGQgYSBuZXcgYm9va21hcmsgdG8geW91ciBHb29nbGUgTWVldCBzZXNzaW9ucy4gU2ltcGx5IHByb3ZpZGUgYSBuYW1lIGFuZCBhIHVuaXF1ZSBjb2RlLlxuXG5UbyBkZWxldGUgYSBib29rbWFyaywgc2ltcGx5IGNsaWNrIG9uIHRoZSB0cmFzaCBpY29uIG5leHQgdG8gZWFjaCBib29rbWFyayBpbiB0aGUgbWVudS5cblxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggR29vZ2xlIGFuZCBHTWVldC5cblxuRm9yIGFkZGl0aW9uYWwgc3VwcG9ydCwgcGxlYXNlIGNvbnRhY3QgdGhlIGV4dGVuc2lvbiBkZXZlbG9wZXIuIiwKICAibmFtZSI6ICJHTWVldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGFibWFydGluZS9nbWVldCIsCiAgInV1aWQiOiAiZ21lZXRAcGFibWFydGluZS5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
   }}
 , {"uuid": "batt_consumption_wattmetter@zachgoldberg", "name": "Battery Time Remaining, Percentage, Watt Meter in Panel", "pname": "battery-consumption-watt-meter", "description": "Shows actual charging/discharging consumption (+/-) in Watts next to battery percentage level and/or battery time remaining.\nEnable percentage label when disabled.\nDefault sync reload set to 4 seconds.\nNo consumption info when battery is full.\nSettings: interval, percentage label (also when full), time remaining on/off, battery selection.\n Fork of https://github.com/wennaspeedy/batt_consumption_wattmetter", "link": "https://extensions.gnome.org/extension/6628/battery-consumption-watt-meter/", "shell_version_map": {
     "40": {"version": "2", "sha256": "1dzqzkm6gb4mq8hz5f6zabrn2jspanfkj192xa2bnmc7cgvnb191", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0cyBuZXh0IHRvIGJhdHRlcnkgcGVyY2VudGFnZSBsZXZlbCBhbmQvb3IgYmF0dGVyeSB0aW1lIHJlbWFpbmluZy5cbkVuYWJsZSBwZXJjZW50YWdlIGxhYmVsIHdoZW4gZGlzYWJsZWQuXG5EZWZhdWx0IHN5bmMgcmVsb2FkIHNldCB0byA0IHNlY29uZHMuXG5ObyBjb25zdW1wdGlvbiBpbmZvIHdoZW4gYmF0dGVyeSBpcyBmdWxsLlxuU2V0dGluZ3M6IGludGVydmFsLCBwZXJjZW50YWdlIGxhYmVsIChhbHNvIHdoZW4gZnVsbCksIHRpbWUgcmVtYWluaW5nIG9uL29mZiwgYmF0dGVyeSBzZWxlY3Rpb24uXG4gRm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vd2VubmFzcGVlZHkvYmF0dF9jb25zdW1wdGlvbl93YXR0bWV0dGVyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUgUmVtYWluaW5nLCBQZXJjZW50YWdlLCBXYXR0IE1ldGVyIGluIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFjaGdvbGRiZXJnL2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgInV1aWQiOiAiYmF0dF9jb25zdW1wdGlvbl93YXR0bWV0dGVyQHphY2hnb2xkYmVyZyIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -6918,20 +7290,23 @@
   }}
 , {"uuid": "proton-vpn@fthx", "name": "Proton VPN Button", "pname": "proton-vpn-button", "description": "Proton VPN button in top panel.\n\n Click on button to close/open Proton VPN app.\n\n Useful for those who don't want to use Ubuntu AppIndicators extension (Proton VPN in systray's legacy indicators).\n\n This extension is not affiliated, funded or in any way associated with Proton VPN.", "link": "https://extensions.gnome.org/extension/6631/proton-vpn-button/", "shell_version_map": {
     "45": {"version": "5", "sha256": "0lyh09ssaraz1wf0apjg0arf1xh26dn597nyq3rwcjvwcnc7hvvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBWUE4gYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBWUE4gYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gVlBOIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBWUE4uIiwKICAibmFtZSI6ICJQcm90b24gVlBOIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3Byb3Rvbi12cG4iLAogICJ1dWlkIjogInByb3Rvbi12cG5AZnRoeCIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "46": {"version": "6", "sha256": "13kgpnbnhfw95hs1m5ha77mgxhjygi33blz7kddgn4r2mrj63w2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBWUE4gYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBWUE4gYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gVlBOIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBWUE4uIiwKICAibmFtZSI6ICJQcm90b24gVlBOIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3Byb3Rvbi12cG4iLAogICJ1dWlkIjogInByb3Rvbi12cG5AZnRoeCIsCiAgInZlcnNpb24iOiA2Cn0="}
+    "46": {"version": "6", "sha256": "13kgpnbnhfw95hs1m5ha77mgxhjygi33blz7kddgn4r2mrj63w2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBWUE4gYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBWUE4gYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gVlBOIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBWUE4uIiwKICAibmFtZSI6ICJQcm90b24gVlBOIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3Byb3Rvbi12cG4iLAogICJ1dWlkIjogInByb3Rvbi12cG5AZnRoeCIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "47": {"version": "7", "sha256": "1b5mnjc3f0346cc6w6f93apnyq3hzjj731ab0i0w0qp1q2n462kr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBWUE4gYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBWUE4gYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gVlBOIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBWUE4uIiwKICAibmFtZSI6ICJQcm90b24gVlBOIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3Byb3Rvbi12cG4iLAogICJ1dWlkIjogInByb3Rvbi12cG5AZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "proton-bridge@fthx", "name": "Proton Bridge Button", "pname": "proton-bridge-button", "description": "Proton Bridge button in top panel.\n\n Click on button to close/open Proton Bridge app.\n\n Useful for those who don't want to use Ubuntu AppIndicators extension (Proton Bridge in systray's legacy indicators).\n\n This extension is not affiliated, funded or in any way associated with Proton Mail.", "link": "https://extensions.gnome.org/extension/6634/proton-bridge-button/", "shell_version_map": {
     "45": {"version": "4", "sha256": "0fa8inc6c9fc4i64vvw3x8s0vf4fp3y7gcq5jmam51q4lzbkizp5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBCcmlkZ2UgYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBCcmlkZ2UgYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gQnJpZGdlIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBNYWlsLiIsCiAgIm5hbWUiOiAiUHJvdG9uIEJyaWRnZSBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9wcm90b24tYnJpZGdlIiwKICAidXVpZCI6ICJwcm90b24tYnJpZGdlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNAp9"},
-    "46": {"version": "5", "sha256": "11p2ag21qrcs1jgc07a5k50s135npqmw8wj6pm7xxp5lgs88g8q9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBCcmlkZ2UgYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBCcmlkZ2UgYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gQnJpZGdlIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBNYWlsLiIsCiAgIm5hbWUiOiAiUHJvdG9uIEJyaWRnZSBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9wcm90b24tYnJpZGdlIiwKICAidXVpZCI6ICJwcm90b24tYnJpZGdlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNQp9"}
+    "46": {"version": "5", "sha256": "11p2ag21qrcs1jgc07a5k50s135npqmw8wj6pm7xxp5lgs88g8q9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBCcmlkZ2UgYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBCcmlkZ2UgYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gQnJpZGdlIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBNYWlsLiIsCiAgIm5hbWUiOiAiUHJvdG9uIEJyaWRnZSBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9wcm90b24tYnJpZGdlIiwKICAidXVpZCI6ICJwcm90b24tYnJpZGdlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "6", "sha256": "1crf4an0szfiqp6sqlgny7m0jvwgk1rmlgpkbifpx6kvndv4gxf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RvbiBCcmlkZ2UgYnV0dG9uIGluIHRvcCBwYW5lbC5cblxuIENsaWNrIG9uIGJ1dHRvbiB0byBjbG9zZS9vcGVuIFByb3RvbiBCcmlkZ2UgYXBwLlxuXG4gVXNlZnVsIGZvciB0aG9zZSB3aG8gZG9uJ3Qgd2FudCB0byB1c2UgVWJ1bnR1IEFwcEluZGljYXRvcnMgZXh0ZW5zaW9uIChQcm90b24gQnJpZGdlIGluIHN5c3RyYXkncyBsZWdhY3kgaW5kaWNhdG9ycykuXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFByb3RvbiBNYWlsLiIsCiAgIm5hbWUiOiAiUHJvdG9uIEJyaWRnZSBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9wcm90b24tYnJpZGdlIiwKICAidXVpZCI6ICJwcm90b24tYnJpZGdlQGZ0aHgiLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "gold-silver-price@arononak.github.io", "name": "Gold Silver Price", "pname": "gold-silver-price", "description": "Shows the current price of Gold and Silver.\n\ncurl is requried.\n\nLove this extension? give me a star on github.\n\nThis extension uses https://www.google.com/finance", "link": "https://extensions.gnome.org/extension/6643/gold-silver-price/", "shell_version_map": {
     "45": {"version": "2", "sha256": "1ingxy6i8vvf3b3gcbf74wv4d1lpxa0kk7w3pgxlnprfnr39r7mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBjdXJyZW50IHByaWNlIG9mIEdvbGQgYW5kIFNpbHZlci5cblxuY3VybCBpcyByZXF1cmllZC5cblxuTG92ZSB0aGlzIGV4dGVuc2lvbj8gZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViLlxuXG5UaGlzIGV4dGVuc2lvbiB1c2VzIGh0dHBzOi8vd3d3Lmdvb2dsZS5jb20vZmluYW5jZSIsCiAgIm5hbWUiOiAiR29sZCBTaWx2ZXIgUHJpY2UiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFyb25vbmFrQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ29sZC1zaWx2ZXItcHJpY2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnb2xkLXNpbHZlci1wcmljZUBhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}
   }}
 , {"uuid": "TouchpadOnOff@romano.rgtti.com", "name": "Touchpad On Off", "pname": "touchpad-on-off", "description": "Toggle touchpad on or off", "link": "https://extensions.gnome.org/extension/6646/touchpad-on-off/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "0wirin0nfjmsfwpxrgl9vh8zvk26jagjz8a5zbfq0sz60pyxkcag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0b3VjaHBhZCBvbiBvciBvZmYiLAogICJuYW1lIjogIlRvdWNocGFkIE9uIE9mZiIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUm9tYW5vIEdpYW5uZXR0aSA8cm9tYW5vLmdpYW5uZXR0aUBnbWFpbC5jb20+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvdWNocGFkb25vZmYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS10b3VjaHBhZC1vbm9mZiIsCiAgInV1aWQiOiAiVG91Y2hwYWRPbk9mZkByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "3", "sha256": "0wirin0nfjmsfwpxrgl9vh8zvk26jagjz8a5zbfq0sz60pyxkcag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0b3VjaHBhZCBvbiBvciBvZmYiLAogICJuYW1lIjogIlRvdWNocGFkIE9uIE9mZiIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUm9tYW5vIEdpYW5uZXR0aSA8cm9tYW5vLmdpYW5uZXR0aUBnbWFpbC5jb20+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvdWNocGFkb25vZmYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS10b3VjaHBhZC1vbm9mZiIsCiAgInV1aWQiOiAiVG91Y2hwYWRPbk9mZkByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "45": {"version": "4", "sha256": "1v29sm508rq16ywy3llj5ivphd6vcqqjz0szq0whzgdmp7qi6r0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0b3VjaHBhZCBvbiBvciBvZmYiLAogICJuYW1lIjogIlRvdWNocGFkIE9uIE9mZiIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUm9tYW5vIEdpYW5uZXR0aSA8cm9tYW5vLmdpYW5uZXR0aUBnbWFpbC5jb20+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvdWNocGFkb25vZmYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2UtdG91Y2hwYWQtb25vZmYiLAogICJ1dWlkIjogIlRvdWNocGFkT25PZmZAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1v29sm508rq16ywy3llj5ivphd6vcqqjz0szq0whzgdmp7qi6r0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0b3VjaHBhZCBvbiBvciBvZmYiLAogICJuYW1lIjogIlRvdWNocGFkIE9uIE9mZiIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUm9tYW5vIEdpYW5uZXR0aSA8cm9tYW5vLmdpYW5uZXR0aUBnbWFpbC5jb20+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvdWNocGFkb25vZmYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2UtdG91Y2hwYWQtb25vZmYiLAogICJ1dWlkIjogIlRvdWNocGFkT25PZmZAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1v29sm508rq16ywy3llj5ivphd6vcqqjz0szq0whzgdmp7qi6r0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0b3VjaHBhZCBvbiBvciBvZmYiLAogICJuYW1lIjogIlRvdWNocGFkIE9uIE9mZiIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUm9tYW5vIEdpYW5uZXR0aSA8cm9tYW5vLmdpYW5uZXR0aUBnbWFpbC5jb20+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvdWNocGFkb25vZmYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2UtdG91Y2hwYWQtb25vZmYiLAogICJ1dWlkIjogIlRvdWNocGFkT25PZmZAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
-, {"uuid": "icon-hider-updated@lx358hcl.com", "name": "Icon Hider Updated", "pname": "icon-hider-updated", "description": "Show & Hide icons from the top panel", "link": "https://extensions.gnome.org/extension/6649/icon-hider-updated/", "shell_version_map": {
+, {"uuid": "icon-hider-updated@lx358hcl.com", "name": "Icon Hider Updated", "pname": "icon-hider-updated", "description": "Show & Hide icons from the top panel", "link": "https://extensions.gnome.org/extension/6649/icon-hider-updated/", "shell_version_map": {
     "40": {"version": "9", "sha256": "10i3chc6vzsw04a5jm8p39rlkj7klz96g4979gvia7j6xfpcs1bc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgJiBIaWRlIGljb25zIGZyb20gdGhlIHRvcCBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pY29uaGlkZXJ1cGRhdGVkIiwKICAibmFtZSI6ICJJY29uIEhpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWNvbi1oaWRlci11cGRhdGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seDM1OGhjbC9saW51eGljb25oaWRlcnVwZGF0ZWQiLAogICJ1dWlkIjogImljb24taGlkZXItdXBkYXRlZEBseDM1OGhjbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
     "41": {"version": "9", "sha256": "10i3chc6vzsw04a5jm8p39rlkj7klz96g4979gvia7j6xfpcs1bc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgJiBIaWRlIGljb25zIGZyb20gdGhlIHRvcCBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pY29uaGlkZXJ1cGRhdGVkIiwKICAibmFtZSI6ICJJY29uIEhpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWNvbi1oaWRlci11cGRhdGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seDM1OGhjbC9saW51eGljb25oaWRlcnVwZGF0ZWQiLAogICJ1dWlkIjogImljb24taGlkZXItdXBkYXRlZEBseDM1OGhjbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
     "42": {"version": "9", "sha256": "10i3chc6vzsw04a5jm8p39rlkj7klz96g4979gvia7j6xfpcs1bc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgJiBIaWRlIGljb25zIGZyb20gdGhlIHRvcCBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pY29uaGlkZXJ1cGRhdGVkIiwKICAibmFtZSI6ICJJY29uIEhpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWNvbi1oaWRlci11cGRhdGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seDM1OGhjbC9saW51eGljb25oaWRlcnVwZGF0ZWQiLAogICJ1dWlkIjogImljb24taGlkZXItdXBkYXRlZEBseDM1OGhjbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
@@ -6939,41 +7314,48 @@
     "44": {"version": "9", "sha256": "10i3chc6vzsw04a5jm8p39rlkj7klz96g4979gvia7j6xfpcs1bc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgJiBIaWRlIGljb25zIGZyb20gdGhlIHRvcCBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pY29uaGlkZXJ1cGRhdGVkIiwKICAibmFtZSI6ICJJY29uIEhpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWNvbi1oaWRlci11cGRhdGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seDM1OGhjbC9saW51eGljb25oaWRlcnVwZGF0ZWQiLAogICJ1dWlkIjogImljb24taGlkZXItdXBkYXRlZEBseDM1OGhjbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}
   }}
 , {"uuid": "openweather-extension@penguin-teal.github.io", "name": "OpenWeather Refined", "pname": "openweather", "description": "Display weather for the current or a specified location. Fork of OpenWeather.\nWeather data is provided by OpenWeatherMap.org or WeatherAPI.com or VisualCrossing.com.\nIf location is set to \"My Location,\" which is the case by default on laptops, this extension will use location services and Nominatim (from OpenStreetMap.org), or infoip.io if that failed.", "link": "https://extensions.gnome.org/extension/6655/openweather/", "shell_version_map": {
-    "45": {"version": "17", "sha256": "13mkalsbp347rhwhq5957qp1aq9pl47a2m4n59n0i2pfb96aljv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tIG9yIFZpc3VhbENyb3NzaW5nLmNvbS5cbklmIGxvY2F0aW9uIGlzIHNldCB0byBcIk15IExvY2F0aW9uLFwiIHdoaWNoIGlzIHRoZSBjYXNlIGJ5IGRlZmF1bHQgb24gbGFwdG9wcywgdGhpcyBleHRlbnNpb24gd2lsbCB1c2UgbG9jYXRpb24gc2VydmljZXMgYW5kIE5vbWluYXRpbSAoZnJvbSBPcGVuU3RyZWV0TWFwLm9yZyksIG9yIGluZm9pcC5pbyBpZiB0aGF0IGZhaWxlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tb3BlbndlYXRoZXJyZWZpbmVkIiwKICAiZ2l0LXZlcnNpb24iOiAiMTM4LnIwLmc2MzY3YTExIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciBSZWZpbmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW53ZWF0aGVycmVmaW5lZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVuZ3Vpbi10ZWFsL2dub21lLW9wZW53ZWF0aGVyIiwKICAidXVpZCI6ICJvcGVud2VhdGhlci1leHRlbnNpb25AcGVuZ3Vpbi10ZWFsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNywKICAidmVyc2lvbi1uYW1lIjogIjEzOCIKfQ=="},
-    "46": {"version": "17", "sha256": "13mkalsbp347rhwhq5957qp1aq9pl47a2m4n59n0i2pfb96aljv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tIG9yIFZpc3VhbENyb3NzaW5nLmNvbS5cbklmIGxvY2F0aW9uIGlzIHNldCB0byBcIk15IExvY2F0aW9uLFwiIHdoaWNoIGlzIHRoZSBjYXNlIGJ5IGRlZmF1bHQgb24gbGFwdG9wcywgdGhpcyBleHRlbnNpb24gd2lsbCB1c2UgbG9jYXRpb24gc2VydmljZXMgYW5kIE5vbWluYXRpbSAoZnJvbSBPcGVuU3RyZWV0TWFwLm9yZyksIG9yIGluZm9pcC5pbyBpZiB0aGF0IGZhaWxlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tb3BlbndlYXRoZXJyZWZpbmVkIiwKICAiZ2l0LXZlcnNpb24iOiAiMTM4LnIwLmc2MzY3YTExIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciBSZWZpbmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW53ZWF0aGVycmVmaW5lZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVuZ3Vpbi10ZWFsL2dub21lLW9wZW53ZWF0aGVyIiwKICAidXVpZCI6ICJvcGVud2VhdGhlci1leHRlbnNpb25AcGVuZ3Vpbi10ZWFsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNywKICAidmVyc2lvbi1uYW1lIjogIjEzOCIKfQ=="}
+    "45": {"version": "18", "sha256": "1nlm4537mncndcxmbpd0dfzx62rng6yilv5xjspmvsbb4dabgk4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tIG9yIFZpc3VhbENyb3NzaW5nLmNvbS5cbklmIGxvY2F0aW9uIGlzIHNldCB0byBcIk15IExvY2F0aW9uLFwiIHdoaWNoIGlzIHRoZSBjYXNlIGJ5IGRlZmF1bHQgb24gbGFwdG9wcywgdGhpcyBleHRlbnNpb24gd2lsbCB1c2UgbG9jYXRpb24gc2VydmljZXMgYW5kIE5vbWluYXRpbSAoZnJvbSBPcGVuU3RyZWV0TWFwLm9yZyksIG9yIGluZm9pcC5pbyBpZiB0aGF0IGZhaWxlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tb3BlbndlYXRoZXJyZWZpbmVkIiwKICAiZ2l0LXZlcnNpb24iOiAiMTM4LnIxLmcyNDA2MDk4IiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciBSZWZpbmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW53ZWF0aGVycmVmaW5lZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Blbmd1aW4tdGVhbC9nbm9tZS1vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQHBlbmd1aW4tdGVhbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTgsCiAgInZlcnNpb24tbmFtZSI6ICIxMzkiCn0="},
+    "46": {"version": "18", "sha256": "1nlm4537mncndcxmbpd0dfzx62rng6yilv5xjspmvsbb4dabgk4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tIG9yIFZpc3VhbENyb3NzaW5nLmNvbS5cbklmIGxvY2F0aW9uIGlzIHNldCB0byBcIk15IExvY2F0aW9uLFwiIHdoaWNoIGlzIHRoZSBjYXNlIGJ5IGRlZmF1bHQgb24gbGFwdG9wcywgdGhpcyBleHRlbnNpb24gd2lsbCB1c2UgbG9jYXRpb24gc2VydmljZXMgYW5kIE5vbWluYXRpbSAoZnJvbSBPcGVuU3RyZWV0TWFwLm9yZyksIG9yIGluZm9pcC5pbyBpZiB0aGF0IGZhaWxlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tb3BlbndlYXRoZXJyZWZpbmVkIiwKICAiZ2l0LXZlcnNpb24iOiAiMTM4LnIxLmcyNDA2MDk4IiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciBSZWZpbmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW53ZWF0aGVycmVmaW5lZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Blbmd1aW4tdGVhbC9nbm9tZS1vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQHBlbmd1aW4tdGVhbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTgsCiAgInZlcnNpb24tbmFtZSI6ICIxMzkiCn0="},
+    "47": {"version": "18", "sha256": "1nlm4537mncndcxmbpd0dfzx62rng6yilv5xjspmvsbb4dabgk4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tIG9yIFZpc3VhbENyb3NzaW5nLmNvbS5cbklmIGxvY2F0aW9uIGlzIHNldCB0byBcIk15IExvY2F0aW9uLFwiIHdoaWNoIGlzIHRoZSBjYXNlIGJ5IGRlZmF1bHQgb24gbGFwdG9wcywgdGhpcyBleHRlbnNpb24gd2lsbCB1c2UgbG9jYXRpb24gc2VydmljZXMgYW5kIE5vbWluYXRpbSAoZnJvbSBPcGVuU3RyZWV0TWFwLm9yZyksIG9yIGluZm9pcC5pbyBpZiB0aGF0IGZhaWxlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tb3BlbndlYXRoZXJyZWZpbmVkIiwKICAiZ2l0LXZlcnNpb24iOiAiMTM4LnIxLmcyNDA2MDk4IiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciBSZWZpbmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW53ZWF0aGVycmVmaW5lZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Blbmd1aW4tdGVhbC9nbm9tZS1vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQHBlbmd1aW4tdGVhbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTgsCiAgInZlcnNpb24tbmFtZSI6ICIxMzkiCn0="}
   }}
 , {"uuid": "wallhub@sakithb.github.io", "name": "Wallhub", "pname": "wallhub", "description": "Manage wallpapers with ease", "link": "https://extensions.gnome.org/extension/6661/wallhub/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "1nqjab3hji06046x2ihg8i2izcpgxy9l7pwv4w21aq04fb2742hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FraXRoYi93YWxsaHViIiwKICAidXVpZCI6ICJ3YWxsaHViQHNha2l0aGIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIxLjEuMyIKfQ=="},
-    "46": {"version": "6", "sha256": "1nqjab3hji06046x2ihg8i2izcpgxy9l7pwv4w21aq04fb2742hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FraXRoYi93YWxsaHViIiwKICAidXVpZCI6ICJ3YWxsaHViQHNha2l0aGIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIxLjEuMyIKfQ=="}
+    "45": {"version": "7", "sha256": "1xvpq0amg0x5hja6y35yn5z62z2j1jfj8fnnr41wyz1p08inf1jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nha2l0aGIvd2FsbGh1YiIsCiAgInV1aWQiOiAid2FsbGh1YkBzYWtpdGhiLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3LAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjQiCn0="},
+    "46": {"version": "7", "sha256": "1xvpq0amg0x5hja6y35yn5z62z2j1jfj8fnnr41wyz1p08inf1jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nha2l0aGIvd2FsbGh1YiIsCiAgInV1aWQiOiAid2FsbGh1YkBzYWtpdGhiLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3LAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjQiCn0="},
+    "47": {"version": "7", "sha256": "1xvpq0amg0x5hja6y35yn5z62z2j1jfj8fnnr41wyz1p08inf1jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nha2l0aGIvd2FsbGh1YiIsCiAgInV1aWQiOiAid2FsbGh1YkBzYWtpdGhiLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3LAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjQiCn0="}
   }}
 , {"uuid": "mountMeter@dhariharan26.gmail.com", "name": "Mount Meter", "pname": "mount-meter", "description": "Easily monitor and manage your mounted removable drives, displaying sizes and highlighting the mount with the least used space in the top bar.\n\nForked and Modified extensively from Removable Drive Menu by fmuellner.\n\nNote:- \n1.The list will automatically refresh every 5 seconds to provide updated information.\n2.Any ongoing event(e.g. a file transfer) which result in changes(% used) in mount sizes will trigger the top bar indicator to highlight/flash until the file operation completes,this is intended and also partially doubles up as a file transfer operation indicator :)", "link": "https://extensions.gnome.org/extension/6664/mount-meter/", "shell_version_map": {
     "45": {"version": "3", "sha256": "0c2xlbrhjczmdqbwr8a1xnibdvhgaq23fd58g2hcw8nmp4jw0sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtb25pdG9yIGFuZCBtYW5hZ2UgeW91ciBtb3VudGVkIHJlbW92YWJsZSBkcml2ZXMsIGRpc3BsYXlpbmcgc2l6ZXMgYW5kIGhpZ2hsaWdodGluZyB0aGUgbW91bnQgd2l0aCB0aGUgbGVhc3QgdXNlZCBzcGFjZSBpbiB0aGUgdG9wIGJhci5Gb3JrZWQgYW5kIE1vZGlmaWVkIGV4dGVuc2l2ZWx5IGZyb20gUmVtb3ZhYmxlIERyaXZlIE1lbnUgYnkgZm11ZWxsbmVyIiwKICAibmFtZSI6ICJNb3VudCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaGFyaWhhcmFuLTA1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3VudC1tZXRlciIsCiAgInV1aWQiOiAibW91bnRNZXRlckBkaGFyaWhhcmFuMjYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
 , {"uuid": "Bluetooth-Battery-Meter@maniacx.github.com", "name": "Bluetooth Battery Meter", "pname": "bluetooth-battery-meter", "description": "A Gnome extension featuring indicator icons in system tray, serving as meter for Bluetooth device battery levels and providing detailed battery levels via icon/text in the Bluetooth quick settings menu.\n\nNote:\nCertain Bluetooth devices do not report battery level until Bluez's experimental features are enabled in system. Check Readme for details.", "link": "https://extensions.gnome.org/extension/6670/bluetooth-battery-meter/", "shell_version_map": {
-    "42": {"version": "17", "sha256": "0v2p26w2ps5rvp0ix6hg0cav0mk7p2b90dsja3cjpkh4r7a7c251", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "43": {"version": "17", "sha256": "0v2p26w2ps5rvp0ix6hg0cav0mk7p2b90dsja3cjpkh4r7a7c251", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "44": {"version": "17", "sha256": "0v2p26w2ps5rvp0ix6hg0cav0mk7p2b90dsja3cjpkh4r7a7c251", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "45": {"version": "18", "sha256": "10ykanz87fbq65s30a4nvrqbffvxr2yhdcbksrnq7nwyba3645na", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAidXVpZCI6ICJCbHVldG9vdGgtQmF0dGVyeS1NZXRlckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
-    "46": {"version": "18", "sha256": "10ykanz87fbq65s30a4nvrqbffvxr2yhdcbksrnq7nwyba3645na", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAidXVpZCI6ICJCbHVldG9vdGgtQmF0dGVyeS1NZXRlckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}
+    "42": {"version": "21", "sha256": "1822nzw2ci5bybhdaxk8wb1ga6vb2qizjsjjdg3s1dimdcj1ghy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="},
+    "43": {"version": "21", "sha256": "1822nzw2ci5bybhdaxk8wb1ga6vb2qizjsjjdg3s1dimdcj1ghy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="},
+    "44": {"version": "21", "sha256": "1822nzw2ci5bybhdaxk8wb1ga6vb2qizjsjjdg3s1dimdcj1ghy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="},
+    "45": {"version": "22", "sha256": "1mkaczbvq5bz1p2c1pn3ky71xvnhib5jkb9kysjjqkjxkpd1fdkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="},
+    "46": {"version": "22", "sha256": "1mkaczbvq5bz1p2c1pn3ky71xvnhib5jkb9kysjjqkjxkpd1fdkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="},
+    "47": {"version": "22", "sha256": "1mkaczbvq5bz1p2c1pn3ky71xvnhib5jkb9kysjjqkjxkpd1fdkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}
   }}
-, {"uuid": "xwayland-indicator@swsnr.de", "name": "XWayland Indicator", "pname": "xwayland-indicator", "description": "Point out X11 windows in GNOME.\n\nThis small GNOME extension shows the X11 logo in the panel if the current session uses X11 instead of wayland or if the currently focused window used xwayland.", "link": "https://extensions.gnome.org/extension/6676/xwayland-indicator/", "shell_version_map": {
+, {"uuid": "xwayland-indicator@swsnr.de", "name": "XWayland Indicator", "pname": "xwayland-indicator", "description": "Point out X11 windows in GNOME.\n\nThis small GNOME extension shows the X11 logo in the panel if the current session uses X11 instead of wayland or if the currently focused window uses xwayland.", "link": "https://extensions.gnome.org/extension/6676/xwayland-indicator/", "shell_version_map": {
     "45": {"version": "1", "sha256": "1y86189fhiw44625pkb6aj2gy0im4jdflsh8f9h4x9pc72hnfqmm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlIHdoZXRoZXIgdGhlIGZvY3VzZWQgd2luZG93IHVzZXMgWFdheWxhbmQuIiwKICAibmFtZSI6ICJYV2F5bGFuZCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXh3YXlsYW5kIiwKICAidXVpZCI6ICJ4d2F5bGFuZC1pbmRpY2F0b3JAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMSwKICAidmVyc2lvbi1uYW1lIjogIjQ1LjEiCn0="},
-    "46": {"version": "4", "sha256": "0lrizsr1gdqs8s4wc6wg65hzqkww5i6lqd51pwdmw1ff1r7m4ppc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvaW50IG91dCBYMTEgd2luZG93cyBpbiBHTk9NRS5cblxuVGhpcyBzbWFsbCBHTk9NRSBleHRlbnNpb24gc2hvd3MgdGhlIFgxMSBsb2dvIGluIHRoZSBwYW5lbCBpZiB0aGUgY3VycmVudCBzZXNzaW9uIHVzZXMgWDExIGluc3RlYWQgb2Ygd2F5bGFuZCBvciBpZiB0aGUgY3VycmVudGx5IGZvY3VzZWQgd2luZG93IHVzZWQgeHdheWxhbmQuIiwKICAibmFtZSI6ICJYV2F5bGFuZCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXh3YXlsYW5kIiwKICAidXVpZCI6ICJ4d2F5bGFuZC1pbmRpY2F0b3JAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogNCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjQiCn0="}
+    "46": {"version": "7", "sha256": "0m40n4f586ma6vlqjhqbf422zkz5p2nc0bp5kzk132v6cxj94xkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvaW50IG91dCBYMTEgd2luZG93cyBpbiBHTk9NRS5cblxuVGhpcyBzbWFsbCBHTk9NRSBleHRlbnNpb24gc2hvd3MgdGhlIFgxMSBsb2dvIGluIHRoZSBwYW5lbCBpZiB0aGUgY3VycmVudCBzZXNzaW9uIHVzZXMgWDExIGluc3RlYWQgb2Ygd2F5bGFuZCBvciBpZiB0aGUgY3VycmVudGx5IGZvY3VzZWQgd2luZG93IHVzZXMgeHdheWxhbmQuIiwKICAibmFtZSI6ICJYV2F5bGFuZCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi14d2F5bGFuZCIsCiAgInV1aWQiOiAieHdheWxhbmQtaW5kaWNhdG9yQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDcsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni43Igp9"},
+    "47": {"version": "7", "sha256": "0m40n4f586ma6vlqjhqbf422zkz5p2nc0bp5kzk132v6cxj94xkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvaW50IG91dCBYMTEgd2luZG93cyBpbiBHTk9NRS5cblxuVGhpcyBzbWFsbCBHTk9NRSBleHRlbnNpb24gc2hvd3MgdGhlIFgxMSBsb2dvIGluIHRoZSBwYW5lbCBpZiB0aGUgY3VycmVudCBzZXNzaW9uIHVzZXMgWDExIGluc3RlYWQgb2Ygd2F5bGFuZCBvciBpZiB0aGUgY3VycmVudGx5IGZvY3VzZWQgd2luZG93IHVzZXMgeHdheWxhbmQuIiwKICAibmFtZSI6ICJYV2F5bGFuZCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi14d2F5bGFuZCIsCiAgInV1aWQiOiAieHdheWxhbmQtaW5kaWNhdG9yQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDcsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni43Igp9"}
   }}
 , {"uuid": "power-profile@fthx", "name": "Power profile indicator", "pname": "power-profile-indicator", "description": "Add current power profile in panel's system icons. Very light extension.", "link": "https://extensions.gnome.org/extension/6679/power-profile-indicator/", "shell_version_map": {
     "45": {"version": "5", "sha256": "1fmz31bm2kf6rbzkib1756sg25chyxs5vbllqjzc49dalm0cla2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXJyZW50IHBvd2VyIHByb2ZpbGUgaW4gcGFuZWwncyBzeXN0ZW0gaWNvbnMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUG93ZXIgcHJvZmlsZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZUBmdGh4IiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "46": {"version": "5", "sha256": "1fmz31bm2kf6rbzkib1756sg25chyxs5vbllqjzc49dalm0cla2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXJyZW50IHBvd2VyIHByb2ZpbGUgaW4gcGFuZWwncyBzeXN0ZW0gaWNvbnMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUG93ZXIgcHJvZmlsZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZUBmdGh4IiwKICAidmVyc2lvbiI6IDUKfQ=="}
+    "46": {"version": "6", "sha256": "1rhsy3afgxmnj5kk56msixvsf3y1yxbbkwmmy89p1g7623d5v27k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXJyZW50IHBvd2VyIHByb2ZpbGUgaW4gcGFuZWwncyBzeXN0ZW0gaWNvbnMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUG93ZXIgcHJvZmlsZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZUBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="},
+    "47": {"version": "6", "sha256": "1rhsy3afgxmnj5kk56msixvsf3y1yxbbkwmmy89p1g7623d5v27k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXJyZW50IHBvd2VyIHByb2ZpbGUgaW4gcGFuZWwncyBzeXN0ZW0gaWNvbnMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUG93ZXIgcHJvZmlsZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZUBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}
   }}
 , {"uuid": "monitor@astraext.github.io", "name": "Astra Monitor", "pname": "astra-monitor", "description": "Astra Monitor is a cutting-edge, fully customizable, and performance-focused system monitoring extension for GNOME's top bar. It's an all-in-one solution for those seeking to keep a close eye on their system's performance metrics like CPU, GPU, RAM, disk usage, network statistics, and sensor readings.", "link": "https://extensions.gnome.org/extension/6682/astra-monitor/", "shell_version_map": {
-    "45": {"version": "42", "sha256": "0hyas31bv2k8dplxlv6r5a421v69qyxjf1a6zkal5i5p7ifl470z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXN0cmFFeHQvYXN0cmEtbW9uaXRvciIsCiAgInV1aWQiOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDIsCiAgInZlcnNpb24tbmFtZSI6ICIyNSIKfQ=="},
-    "46": {"version": "42", "sha256": "0hyas31bv2k8dplxlv6r5a421v69qyxjf1a6zkal5i5p7ifl470z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXN0cmFFeHQvYXN0cmEtbW9uaXRvciIsCiAgInV1aWQiOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDIsCiAgInZlcnNpb24tbmFtZSI6ICIyNSIKfQ=="}
+    "45": {"version": "46", "sha256": "0a2jhjmkgx4w4zhjf96wpf18d0h2zvcfgdyp6cjld51vx9wisy61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FzdHJhRXh0L2FzdHJhLW1vbml0b3IiLAogICJ1dWlkIjogIm1vbml0b3JAYXN0cmFleHQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMjkiCn0="},
+    "46": {"version": "46", "sha256": "0a2jhjmkgx4w4zhjf96wpf18d0h2zvcfgdyp6cjld51vx9wisy61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FzdHJhRXh0L2FzdHJhLW1vbml0b3IiLAogICJ1dWlkIjogIm1vbml0b3JAYXN0cmFleHQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMjkiCn0="},
+    "47": {"version": "46", "sha256": "0a2jhjmkgx4w4zhjf96wpf18d0h2zvcfgdyp6cjld51vx9wisy61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FzdHJhRXh0L2FzdHJhLW1vbml0b3IiLAogICJ1dWlkIjogIm1vbml0b3JAYXN0cmFleHQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMjkiCn0="}
   }}
 , {"uuid": "collector-pip@mijorus.it", "name": "Collector - complementary extension", "pname": "collector-complementary-extension", "description": "Allows the Collector window to stay always on top", "link": "https://extensions.gnome.org/extension/6685/collector-complementary-extension/", "shell_version_map": {
     "45": {"version": "1", "sha256": "0ndzxkw8rxjb3nxwyi4znhyq7j2p4yb6vj9gxfdz9hl2kcbsn1k7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgQ29sbGVjdG9yIHdpbmRvdyB0byBzdGF5IGFsd2F5cyBvbiB0b3AiLAogICJuYW1lIjogIkNvbGxlY3RvciAtIGNvbXBsZW1lbnRhcnkgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbGxlY3RvciIsCiAgInV1aWQiOiAiY29sbGVjdG9yLXBpcEBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDEKfQ=="}
   }}
 , {"uuid": "shyriiwook@madhead.me", "name": "Shyriiwook", "pname": "shyriiwook", "description": "Switch keyboard layouts programmatically", "link": "https://extensions.gnome.org/extension/6691/shyriiwook/", "shell_version_map": {
     "42": {"version": "4", "sha256": "0868jyax5hmmwrydjabdw35d49lh59msli5798zxv571xdai7kbx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBrZXlib2FyZCBsYXlvdXRzIHByb2dyYW1tYXRpY2FsbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hZGhlYWQiCiAgfSwKICAibmFtZSI6ICJTaHlyaWl3b29rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hZGhlYWQvc2h5cmlpd29vayIsCiAgInV1aWQiOiAic2h5cmlpd29va0BtYWRoZWFkLm1lIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "45": {"version": "5", "sha256": "1rcdlhavb7ws0fr1cpf7s31d496adakjl7vz2dzlikygdg1nj5hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBrZXlib2FyZCBsYXlvdXRzIHByb2dyYW1tYXRpY2FsbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hZGhlYWQiCiAgfSwKICAibmFtZSI6ICJTaHlyaWl3b29rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hZGhlYWQvc2h5cmlpd29vayIsCiAgInV1aWQiOiAic2h5cmlpd29va0BtYWRoZWFkLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}
+    "45": {"version": "6", "sha256": "1yw1n6ixh6fha6hpykfz3ags1zj907d2f762mmaiibnx4h97lc3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBrZXlib2FyZCBsYXlvdXRzIHByb2dyYW1tYXRpY2FsbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hZGhlYWQiCiAgfSwKICAibmFtZSI6ICJTaHlyaWl3b29rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWRoZWFkL3NoeXJpaXdvb2siLAogICJ1dWlkIjogInNoeXJpaXdvb2tAbWFkaGVhZC5tZSIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "46": {"version": "6", "sha256": "1yw1n6ixh6fha6hpykfz3ags1zj907d2f762mmaiibnx4h97lc3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBrZXlib2FyZCBsYXlvdXRzIHByb2dyYW1tYXRpY2FsbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIm1hZGhlYWQiCiAgfSwKICAibmFtZSI6ICJTaHlyaWl3b29rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWRoZWFkL3NoeXJpaXdvb2siLAogICJ1dWlkIjogInNoeXJpaXdvb2tAbWFkaGVhZC5tZSIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
 , {"uuid": "disable-workspace-animation@ethnarque", "name": "Disable Workspace Animation", "pname": "disable-workspace-animation", "description": "GNOME Shell 46 extension that disables the workspace animation when switching between workspaces", "link": "https://extensions.gnome.org/extension/6694/disable-workspace-animation/", "shell_version_map": {
     "45": {"version": "5", "sha256": "0awrld49kqm9avm1vsb39nmw11wfa69k4x51pij40bfchwd2l34s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIDQ2IGV4dGVuc2lvbiB0aGF0IGRpc2FibGVzIHRoZSB3b3Jrc3BhY2UgYW5pbWF0aW9uIHdoZW4gc3dpdGNoaW5nIGJldHdlZW4gd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiRGlzYWJsZSBXb3Jrc3BhY2UgQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldGhuYXJxdWUvZ25vbWUtZGlzYWJsZS13b3Jrc3BhY2UtYW5pbWF0aW9uIiwKICAidXVpZCI6ICJkaXNhYmxlLXdvcmtzcGFjZS1hbmltYXRpb25AZXRobmFycXVlIiwKICAidmVyc2lvbiI6IDUKfQ=="},
@@ -6988,37 +7370,42 @@
     "46": {"version": "3", "sha256": "1zlb0l0kj8nm4q0izs1jhyry3ld36wq2qnrn64jljf0690v0lnlf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1cm5zIG9uIEdOT01FIFNoZWxsIGRlYnVnIGxvZ2dpbmcuIiwKICAibmFtZSI6ICJFbmFibGUgRGVidWcgTG9ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvZGVidWdsb2dnaW5nIiwKICAidXVpZCI6ICJkZWJ1Z2xvZ2dpbmdAam9uYXRoYW4uamRvZGEuY2EiLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "dash-to-dock-workaround@popov895.ukr.net", "name": "Dash-To-Dock Workaround", "pname": "dash-to-dock-workaround", "description": "Quick fix for the https://bugs.launchpad.net/ubuntu/+source/gnome-shell-extension-ubuntu-dock/+bug/1961508", "link": "https://extensions.gnome.org/extension/6712/dash-to-dock-workaround/", "shell_version_map": {
-    "42": {"version": "6", "sha256": "0q1i4qivzl75ak7rmaij2gwlx8rzghch129y1jwxjgmnd180j1kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInBvcG92ODk1YSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvZGFzaC10by1kb2NrLXdvcmthcm91bmQiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay13b3JrYXJvdW5kQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "43": {"version": "6", "sha256": "0q1i4qivzl75ak7rmaij2gwlx8rzghch129y1jwxjgmnd180j1kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInBvcG92ODk1YSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvZGFzaC10by1kb2NrLXdvcmthcm91bmQiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay13b3JrYXJvdW5kQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "44": {"version": "6", "sha256": "0q1i4qivzl75ak7rmaij2gwlx8rzghch129y1jwxjgmnd180j1kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInBvcG92ODk1YSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvZGFzaC10by1kb2NrLXdvcmthcm91bmQiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay13b3JrYXJvdW5kQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "45": {"version": "7", "sha256": "0lhw1xg2avsmpgr2ri3af2mnsmhqnfhxwpmwvg3fhfsnsg5x25gf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInBvcG92ODk1YSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9kYXNoLXRvLWRvY2std29ya2Fyb3VuZCIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrLXdvcmthcm91bmRAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "46": {"version": "7", "sha256": "0lhw1xg2avsmpgr2ri3af2mnsmhqnfhxwpmwvg3fhfsnsg5x25gf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInBvcG92ODk1YSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9kYXNoLXRvLWRvY2std29ya2Fyb3VuZCIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrLXdvcmthcm91bmRAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}
+    "42": {"version": "8", "sha256": "1bvh47d949i75s0ahih3z95c2387qii0cjy5yf1x4icaf2g9gfcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvZGFzaC10by1kb2NrLXdvcmthcm91bmQiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay13b3JrYXJvdW5kQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "43": {"version": "8", "sha256": "1bvh47d949i75s0ahih3z95c2387qii0cjy5yf1x4icaf2g9gfcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvZGFzaC10by1kb2NrLXdvcmthcm91bmQiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay13b3JrYXJvdW5kQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "44": {"version": "8", "sha256": "1bvh47d949i75s0ahih3z95c2387qii0cjy5yf1x4icaf2g9gfcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvZGFzaC10by1kb2NrLXdvcmthcm91bmQiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay13b3JrYXJvdW5kQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "45": {"version": "9", "sha256": "1pa558x09g6mgrb77rkbjidn16ki4bmynlpnb225ip70h1pl68aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9kYXNoLXRvLWRvY2std29ya2Fyb3VuZCIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrLXdvcmthcm91bmRAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "1pa558x09g6mgrb77rkbjidn16ki4bmynlpnb225ip70h1pl68aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGZpeCBmb3IgdGhlIGh0dHBzOi8vYnVncy5sYXVuY2hwYWQubmV0L3VidW50dS8rc291cmNlL2dub21lLXNoZWxsLWV4dGVuc2lvbi11YnVudHUtZG9jay8rYnVnLzE5NjE1MDgiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkRhc2gtVG8tRG9jayBXb3JrYXJvdW5kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gtdG8tZG9jay13b3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9kYXNoLXRvLWRvY2std29ya2Fyb3VuZCIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrLXdvcmthcm91bmRAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "panelnote@gittymac.github.io", "name": "Panel Note", "pname": "panel-note", "description": "Add a small note to your GNOME panel", "link": "https://extensions.gnome.org/extension/6718/panel-note/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "0yr8vcnxqglgpn1p36fnj2jb2fklx7s4vcsdcd5k8jj8lakk37gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dpdHR5TWFjL1BhbmVsTm90ZSIsCiAgInV1aWQiOiAicGFuZWxub3RlQGdpdHR5bWFjLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
-    "46": {"version": "2", "sha256": "0yr8vcnxqglgpn1p36fnj2jb2fklx7s4vcsdcd5k8jj8lakk37gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dpdHR5TWFjL1BhbmVsTm90ZSIsCiAgInV1aWQiOiAicGFuZWxub3RlQGdpdHR5bWFjLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
+    "45": {"version": "3", "sha256": "1phybdwrsk9yin5yiwwvyz9rfsrrgm41y1hg014hw3cwabq4nmim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaXR0eU1hYy9QYW5lbE5vdGUiLAogICJ1dWlkIjogInBhbmVsbm90ZUBnaXR0eW1hYy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "46": {"version": "3", "sha256": "1phybdwrsk9yin5yiwwvyz9rfsrrgm41y1hg014hw3cwabq4nmim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaXR0eU1hYy9QYW5lbE5vdGUiLAogICJ1dWlkIjogInBhbmVsbm90ZUBnaXR0eW1hYy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "47": {"version": "3", "sha256": "1phybdwrsk9yin5yiwwvyz9rfsrrgm41y1hg014hw3cwabq4nmim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaXR0eU1hYy9QYW5lbE5vdGUiLAogICJ1dWlkIjogInBhbmVsbm90ZUBnaXR0eW1hYy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
-, {"uuid": "extensions-search-provider@G-dH.github.com", "name": "ESP (Extensions Search Provider)", "pname": "esp-extensions-search-provider", "description": "Search and manage installed extensions from the Activities overview.\n\nFeatures:\n- List all installed extensions using configurable search prefix\n- Quick access to extension settings without dedicated application\n- Enable, disable, remove extensions\n- Search results are expandable so you can check additional information: extension error (if any), description, homepage (click to open), uuid (click to open metadata in editor), schema id (click to open schema in the dconf Editor), installation path (click to open the folder)", "link": "https://extensions.gnome.org/extension/6721/esp-extensions-search-provider/", "shell_version_map": {
+, {"uuid": "extensions-search-provider@G-dH.github.com", "name": "ESP (Extensions Search Provider)", "pname": "esp-extensions-search-provider", "description": "Search and manage installed extensions from the Activities overview.\n\nFeatures:\n- List all installed extensions using configurable search prefix\n- Quick access to extension settings without dedicated application\n- Enable, disable, remove extensions\n- Search results are expandable by clicking the \"i\" icon, so you can get more info about each extension:\n-- extension error (if any), description, homepage (click to open)\n-- uuid (click to open metadata in editor)\n-- schema id (click to open schema in the dconf Editor)\n-- installation path (click to open the folder)", "link": "https://extensions.gnome.org/extension/6721/esp-extensions-search-provider/", "shell_version_map": {
     "42": {"version": "18", "sha256": "1ml6wg8njmsi4pkkmrqx7jx40q22qscvfk92h1ilhzfjxmp507jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="},
     "43": {"version": "18", "sha256": "1ml6wg8njmsi4pkkmrqx7jx40q22qscvfk92h1ilhzfjxmp507jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="},
     "44": {"version": "18", "sha256": "1ml6wg8njmsi4pkkmrqx7jx40q22qscvfk92h1ilhzfjxmp507jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="},
-    "45": {"version": "17", "sha256": "002c8pijldvcbgrjp35p4z7vh2vgs0vgjgxrp3za2kf4kyx0api9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2V4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXNlYXJjaC1wcm92aWRlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni42Igp9"},
-    "46": {"version": "17", "sha256": "002c8pijldvcbgrjp35p4z7vh2vgs0vgjgxrp3za2kf4kyx0api9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2V4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXNlYXJjaC1wcm92aWRlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni42Igp9"}
+    "45": {"version": "19", "sha256": "0pc18ic593z0sfra7wp9yi90qh77wf8bi5g0y3bc6sfky7g82kll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="},
+    "46": {"version": "19", "sha256": "0pc18ic593z0sfra7wp9yi90qh77wf8bi5g0y3bc6sfky7g82kll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="},
+    "47": {"version": "19", "sha256": "0pc18ic593z0sfra7wp9yi90qh77wf8bi5g0y3bc6sfky7g82kll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="}
   }}
-, {"uuid": "hide-cursor@elcste.com", "name": "Hide Cursor", "pname": "hide-cursor", "description": "Hide the mouse cursor on inactivity.\n\nFor use on Wayland, since unclutter, unclutter-xfixes and xbanish only work on X11.\n\nNote: This initial version has a hardcoded 5 second timeout. I'd like to add settings to support configuring this value, but I have no definite plans. Collaboration appreciated! (I'd also accept a contribution adding support for hiding the cursor while typing, but I don't have plans for this myself.)", "link": "https://extensions.gnome.org/extension/6727/hide-cursor/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "09bwd5sysgyzbp955kb4rqhmrf68z5v9wcpw4q44i3v6h7bvrf1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIG1vdXNlIGN1cnNvciBvbiBpbmFjdGl2aXR5LlxuXG5Gb3IgdXNlIG9uIFdheWxhbmQsIHNpbmNlIHVuY2x1dHRlciwgdW5jbHV0dGVyLXhmaXhlcyBhbmQgeGJhbmlzaCBvbmx5IHdvcmsgb24gWDExLlxuXG5Ob3RlOiBUaGlzIGluaXRpYWwgdmVyc2lvbiBoYXMgYSBoYXJkY29kZWQgNSBzZWNvbmQgdGltZW91dC4gSSdkIGxpa2UgdG8gYWRkIHNldHRpbmdzIHRvIHN1cHBvcnQgY29uZmlndXJpbmcgdGhpcyB2YWx1ZSwgYnV0IEkgaGF2ZSBubyBkZWZpbml0ZSBwbGFucy4gQ29sbGFib3JhdGlvbiBhcHByZWNpYXRlZCEgKEknZCBhbHNvIGFjY2VwdCBhIGNvbnRyaWJ1dGlvbiBhZGRpbmcgc3VwcG9ydCBmb3IgaGlkaW5nIHRoZSBjdXJzb3Igd2hpbGUgdHlwaW5nLCBidXQgSSBkb24ndCBoYXZlIHBsYW5zIGZvciB0aGlzIG15c2VsZi4pIiwKICAibmFtZSI6ICJIaWRlIEN1cnNvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxjc3RlL2hpZGUtY3Vyc29yIiwKICAidXVpZCI6ICJoaWRlLWN1cnNvckBlbGNzdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "46": {"version": "2", "sha256": "09bwd5sysgyzbp955kb4rqhmrf68z5v9wcpw4q44i3v6h7bvrf1z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIG1vdXNlIGN1cnNvciBvbiBpbmFjdGl2aXR5LlxuXG5Gb3IgdXNlIG9uIFdheWxhbmQsIHNpbmNlIHVuY2x1dHRlciwgdW5jbHV0dGVyLXhmaXhlcyBhbmQgeGJhbmlzaCBvbmx5IHdvcmsgb24gWDExLlxuXG5Ob3RlOiBUaGlzIGluaXRpYWwgdmVyc2lvbiBoYXMgYSBoYXJkY29kZWQgNSBzZWNvbmQgdGltZW91dC4gSSdkIGxpa2UgdG8gYWRkIHNldHRpbmdzIHRvIHN1cHBvcnQgY29uZmlndXJpbmcgdGhpcyB2YWx1ZSwgYnV0IEkgaGF2ZSBubyBkZWZpbml0ZSBwbGFucy4gQ29sbGFib3JhdGlvbiBhcHByZWNpYXRlZCEgKEknZCBhbHNvIGFjY2VwdCBhIGNvbnRyaWJ1dGlvbiBhZGRpbmcgc3VwcG9ydCBmb3IgaGlkaW5nIHRoZSBjdXJzb3Igd2hpbGUgdHlwaW5nLCBidXQgSSBkb24ndCBoYXZlIHBsYW5zIGZvciB0aGlzIG15c2VsZi4pIiwKICAibmFtZSI6ICJIaWRlIEN1cnNvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxjc3RlL2hpZGUtY3Vyc29yIiwKICAidXVpZCI6ICJoaWRlLWN1cnNvckBlbGNzdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+, {"uuid": "hide-cursor@elcste.com", "name": "Hide Cursor", "pname": "hide-cursor", "description": "Hide the mouse cursor on inactivity.\n\nFor use on Wayland, since unclutter, unclutter-xfixes and xbanish only work on X11.", "link": "https://extensions.gnome.org/extension/6727/hide-cursor/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "15087gcp3g8g9dhfqzxb4mmirhqaifbkk9d0mh13mwrl5m46wxqg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIG1vdXNlIGN1cnNvciBvbiBpbmFjdGl2aXR5LlxuXG5Gb3IgdXNlIG9uIFdheWxhbmQsIHNpbmNlIHVuY2x1dHRlciwgdW5jbHV0dGVyLXhmaXhlcyBhbmQgeGJhbmlzaCBvbmx5IHdvcmsgb24gWDExLlxuXG5Ob3RlOiBUaGlzIGluaXRpYWwgdmVyc2lvbiBoYXMgYSBoYXJkY29kZWQgNSBzZWNvbmQgdGltZW91dC4gSSdkIGxpa2UgdG8gYWRkIHNldHRpbmdzIHRvIHN1cHBvcnQgY29uZmlndXJpbmcgdGhpcyB2YWx1ZSwgYnV0IEkgaGF2ZSBubyBkZWZpbml0ZSBwbGFucy4gQ29sbGFib3JhdGlvbiBhcHByZWNpYXRlZCEgKEknZCBhbHNvIGFjY2VwdCBhIGNvbnRyaWJ1dGlvbiBhZGRpbmcgc3VwcG9ydCBmb3IgaGlkaW5nIHRoZSBjdXJzb3Igd2hpbGUgdHlwaW5nLCBidXQgSSBkb24ndCBoYXZlIHBsYW5zIGZvciB0aGlzIG15c2VsZi4pIiwKICAibmFtZSI6ICJIaWRlIEN1cnNvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY3N0ZS9oaWRlLWN1cnNvciIsCiAgInV1aWQiOiAiaGlkZS1jdXJzb3JAZWxjc3RlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
+    "46": {"version": "3", "sha256": "15087gcp3g8g9dhfqzxb4mmirhqaifbkk9d0mh13mwrl5m46wxqg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIG1vdXNlIGN1cnNvciBvbiBpbmFjdGl2aXR5LlxuXG5Gb3IgdXNlIG9uIFdheWxhbmQsIHNpbmNlIHVuY2x1dHRlciwgdW5jbHV0dGVyLXhmaXhlcyBhbmQgeGJhbmlzaCBvbmx5IHdvcmsgb24gWDExLlxuXG5Ob3RlOiBUaGlzIGluaXRpYWwgdmVyc2lvbiBoYXMgYSBoYXJkY29kZWQgNSBzZWNvbmQgdGltZW91dC4gSSdkIGxpa2UgdG8gYWRkIHNldHRpbmdzIHRvIHN1cHBvcnQgY29uZmlndXJpbmcgdGhpcyB2YWx1ZSwgYnV0IEkgaGF2ZSBubyBkZWZpbml0ZSBwbGFucy4gQ29sbGFib3JhdGlvbiBhcHByZWNpYXRlZCEgKEknZCBhbHNvIGFjY2VwdCBhIGNvbnRyaWJ1dGlvbiBhZGRpbmcgc3VwcG9ydCBmb3IgaGlkaW5nIHRoZSBjdXJzb3Igd2hpbGUgdHlwaW5nLCBidXQgSSBkb24ndCBoYXZlIHBsYW5zIGZvciB0aGlzIG15c2VsZi4pIiwKICAibmFtZSI6ICJIaWRlIEN1cnNvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY3N0ZS9oaWRlLWN1cnNvciIsCiAgInV1aWQiOiAiaGlkZS1jdXJzb3JAZWxjc3RlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
+    "47": {"version": "3", "sha256": "15087gcp3g8g9dhfqzxb4mmirhqaifbkk9d0mh13mwrl5m46wxqg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIG1vdXNlIGN1cnNvciBvbiBpbmFjdGl2aXR5LlxuXG5Gb3IgdXNlIG9uIFdheWxhbmQsIHNpbmNlIHVuY2x1dHRlciwgdW5jbHV0dGVyLXhmaXhlcyBhbmQgeGJhbmlzaCBvbmx5IHdvcmsgb24gWDExLlxuXG5Ob3RlOiBUaGlzIGluaXRpYWwgdmVyc2lvbiBoYXMgYSBoYXJkY29kZWQgNSBzZWNvbmQgdGltZW91dC4gSSdkIGxpa2UgdG8gYWRkIHNldHRpbmdzIHRvIHN1cHBvcnQgY29uZmlndXJpbmcgdGhpcyB2YWx1ZSwgYnV0IEkgaGF2ZSBubyBkZWZpbml0ZSBwbGFucy4gQ29sbGFib3JhdGlvbiBhcHByZWNpYXRlZCEgKEknZCBhbHNvIGFjY2VwdCBhIGNvbnRyaWJ1dGlvbiBhZGRpbmcgc3VwcG9ydCBmb3IgaGlkaW5nIHRoZSBjdXJzb3Igd2hpbGUgdHlwaW5nLCBidXQgSSBkb24ndCBoYXZlIHBsYW5zIGZvciB0aGlzIG15c2VsZi4pIiwKICAibmFtZSI6ICJIaWRlIEN1cnNvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY3N0ZS9oaWRlLWN1cnNvciIsCiAgInV1aWQiOiAiaGlkZS1jdXJzb3JAZWxjc3RlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
 , {"uuid": "windows-search-provider@G-dH.github.com", "name": "WSP (Windows Search Provider)", "pname": "wsp-windows-search-provider", "description": "Search and control windows from the Activities overview", "link": "https://extensions.gnome.org/extension/6730/wsp-windows-search-provider/", "shell_version_map": {
     "42": {"version": "14", "sha256": "11vk9mn8gn51l54j0jc2ibpd8g63gx6zg1q2whwga2b30cs04mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3dzLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="},
     "43": {"version": "14", "sha256": "11vk9mn8gn51l54j0jc2ibpd8g63gx6zg1q2whwga2b30cs04mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3dzLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="},
     "44": {"version": "14", "sha256": "11vk9mn8gn51l54j0jc2ibpd8g63gx6zg1q2whwga2b30cs04mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3dzLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="},
-    "45": {"version": "13", "sha256": "0s7dh6x1dg83xbp6jqzphi9h4r4hq0zivbgcjvfjkalwmj89y6dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJ3aW5kb3dzLXNlYXJjaC1wcm92aWRlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni42Igp9"},
-    "46": {"version": "13", "sha256": "0s7dh6x1dg83xbp6jqzphi9h4r4hq0zivbgcjvfjkalwmj89y6dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJ3aW5kb3dzLXNlYXJjaC1wcm92aWRlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni42Igp9"}
+    "45": {"version": "17", "sha256": "1khnk1h4d32jlycib5i7h6j941aqfcnb4dgll4bas4nxsaw0v38r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3dzLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="},
+    "46": {"version": "17", "sha256": "1khnk1h4d32jlycib5i7h6j941aqfcnb4dgll4bas4nxsaw0v38r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3dzLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="},
+    "47": {"version": "17", "sha256": "1khnk1h4d32jlycib5i7h6j941aqfcnb4dgll4bas4nxsaw0v38r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgY29udHJvbCB3aW5kb3dzIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIldTUCAoV2luZG93cyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3dzLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAid2luZG93cy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDcuMCIKfQ=="}
   }}
 , {"uuid": "CrazyInternetSpeedMeter@larryw3i_at_163.com", "name": "Crazy Internet Speed Meter", "pname": "crazy-internet-speed-meter", "description": "Simple and minimal internet speed meter extension for the Gnome Shell", "link": "https://extensions.gnome.org/extension/6733/crazy-internet-speed-meter/", "shell_version_map": {
-    "45": {"version": "13", "sha256": "0a86jqylwmb8l9hksw9wni0ng8jrw81b5xvi5bsvp0rl0jxxvkz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyQGxhcnJ5dzNpX2F0XzE2My5jb20iLAogICJuYW1lIjogIkNyYXp5IEludGVybmV0IFNwZWVkIE1ldGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9sYXJyeXdlaS9jcmF6eWludGVybmV0c3BlZWRtZXRlciIsCiAgInV1aWQiOiAiQ3JhenlJbnRlcm5ldFNwZWVkTWV0ZXJAbGFycnl3M2lfYXRfMTYzLmNvbSIsCiAgInZlcnNpb24iOiAxMywKICAidmVyc2lvbi1uYW1lIjogIjIwMjQwNzA2LjAxMzc1MSIKfQ=="},
-    "46": {"version": "13", "sha256": "0a86jqylwmb8l9hksw9wni0ng8jrw81b5xvi5bsvp0rl0jxxvkz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyQGxhcnJ5dzNpX2F0XzE2My5jb20iLAogICJuYW1lIjogIkNyYXp5IEludGVybmV0IFNwZWVkIE1ldGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9sYXJyeXdlaS9jcmF6eWludGVybmV0c3BlZWRtZXRlciIsCiAgInV1aWQiOiAiQ3JhenlJbnRlcm5ldFNwZWVkTWV0ZXJAbGFycnl3M2lfYXRfMTYzLmNvbSIsCiAgInZlcnNpb24iOiAxMywKICAidmVyc2lvbi1uYW1lIjogIjIwMjQwNzA2LjAxMzc1MSIKfQ=="}
+    "45": {"version": "20", "sha256": "15dwd41w2ifn1rdz462qh5qf4cv15xb07xz9802wzm1gq7x8p50j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyQGxhcnJ5dzNpX2F0XzE2My5jb20iLAogICJuYW1lIjogIkNyYXp5IEludGVybmV0IFNwZWVkIE1ldGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvbGFycnl3M2kvQ3JhenkxbnRlcm5ldFNwZWVkTWV0ZXIuZ2l0IiwKICAidXVpZCI6ICJDcmF6eUludGVybmV0U3BlZWRNZXRlckBsYXJyeXczaV9hdF8xNjMuY29tIiwKICAidmVyc2lvbiI6IDIwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMjAyNDEwMDcuMDc0NjUxIgp9"},
+    "46": {"version": "20", "sha256": "15dwd41w2ifn1rdz462qh5qf4cv15xb07xz9802wzm1gq7x8p50j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyQGxhcnJ5dzNpX2F0XzE2My5jb20iLAogICJuYW1lIjogIkNyYXp5IEludGVybmV0IFNwZWVkIE1ldGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvbGFycnl3M2kvQ3JhenkxbnRlcm5ldFNwZWVkTWV0ZXIuZ2l0IiwKICAidXVpZCI6ICJDcmF6eUludGVybmV0U3BlZWRNZXRlckBsYXJyeXczaV9hdF8xNjMuY29tIiwKICAidmVyc2lvbiI6IDIwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMjAyNDEwMDcuMDc0NjUxIgp9"},
+    "47": {"version": "20", "sha256": "15dwd41w2ifn1rdz462qh5qf4cv15xb07xz9802wzm1gq7x8p50j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyQGxhcnJ5dzNpX2F0XzE2My5jb20iLAogICJuYW1lIjogIkNyYXp5IEludGVybmV0IFNwZWVkIE1ldGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkNyYXp5SW50ZXJuZXRTcGVlZE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvbGFycnl3M2kvQ3JhenkxbnRlcm5ldFNwZWVkTWV0ZXIuZ2l0IiwKICAidXVpZCI6ICJDcmF6eUludGVybmV0U3BlZWRNZXRlckBsYXJyeXczaV9hdF8xNjMuY29tIiwKICAidmVyc2lvbiI6IDIwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMjAyNDEwMDcuMDc0NjUxIgp9"}
   }}
 , {"uuid": "inhibitionindicator@monyxie.github.io", "name": "Inhibition Indicator", "pname": "inhibition-indicator", "description": "Indicates whether the system is prevented from sleeping by programs.", "link": "https://extensions.gnome.org/extension/6736/inhibition-indicator/", "shell_version_map": {
     "45": {"version": "4", "sha256": "1j9w1qcxrlfl68k0lar23kfrnzm1s8a6n35bm8ixqz40ya7zi9dq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB3aGV0aGVyIHRoZSBzeXN0ZW0gaXMgcHJldmVudGVkIGZyb20gc2xlZXBpbmcgYnkgcHJvZ3JhbXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaW5oaWJpdGlvbmluZGljYXRvckBtb255eGllLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiSW5oaWJpdGlvbiBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5oaWJpdGlvbmluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW9ueXhpZS9pbmhpYml0aW9uaW5kaWNhdG9yIiwKICAidXVpZCI6ICJpbmhpYml0aW9uaW5kaWNhdG9yQG1vbnl4aWUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -7032,15 +7419,18 @@
   }}
 , {"uuid": "luminus-shell@dikasp.gitlab", "name": "Luminus Shell", "pname": "luminus-shell", "description": "An alternative default light theme integration.", "link": "https://extensions.gnome.org/extension/6744/luminus-shell/", "shell_version_map": {
     "45": {"version": "2", "sha256": "05qkb9ycrgbcf5iy71x6n3zf56wmx1iib101f5h307ig3a4mnlc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBmdWxsIGxpZ2h0IHN0eWxlIGludGVncmF0aW9uIGludG8gZGVmYXVsdCBnbm9tZS1zaGVsbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtc2hlbGxAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAyLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDUuMiIKfQ=="},
-    "46": {"version": "10", "sha256": "1q29pk0gcpmnndvrw69zmz2iksh6fy7pys2krd3j901inl6zrrlv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGRlZmF1bHQgbGlnaHQgdGhlbWUgaW50ZWdyYXRpb24uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0IiwKICAidXVpZCI6ICJsdW1pbnVzLXNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTAsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yLjMiCn0="}
+    "46": {"version": "11", "sha256": "05hf30872rvh0hhywm3x1xd18l0clrifmpr2p0x1g8iybpgkvyb8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGRlZmF1bHQgbGlnaHQgdGhlbWUgaW50ZWdyYXRpb24uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0IiwKICAidXVpZCI6ICJsdW1pbnVzLXNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTEsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yLjQiCn0="},
+    "47": {"version": "14", "sha256": "0m88f304c4w2g6jihamjdlnl2sdsjsjvc32pflld2sazclmvg9h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGRlZmF1bHQgbGlnaHQgdGhlbWUgaW50ZWdyYXRpb24uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0I3RoZS1sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtc2hlbGxAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAxNCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LnYyIgp9"}
   }}
-, {"uuid": "luminus-shell-y@dikasp.gitlab", "name": "Luminus Shell Y", "pname": "luminus-shell-y", "description": "An alternative default light theme integration for Blur my Shell and other transparent theming extension.\n- Replace some parts of default shell theme\n- Shell only, doesn't affect applications", "link": "https://extensions.gnome.org/extension/6747/luminus-shell-y/", "shell_version_map": {
+, {"uuid": "luminus-shell-y@dikasp.gitlab", "name": "Luminus Shell Y", "pname": "luminus-shell-y", "description": "Luminus Shell for Blur my Shell and other transparent theming extension.", "link": "https://extensions.gnome.org/extension/6747/luminus-shell-y/", "shell_version_map": {
     "45": {"version": "2", "sha256": "16wgh92pn6i94hcxykyy09km75xk6mmnsvbr0c571mhad928a5b2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBmdWxsIGxpZ2h0IHN0eWxlIGludGVncmF0aW9uIGludG8gQmx1ciBteSBTaGVsbCBleHRlbnNpb24uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIFNoZWxsIFkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtc2hlbGwteUBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDIsCiAgInZlcnNpb24tbmFtZSI6ICI0NS4yIgp9"},
-    "46": {"version": "9", "sha256": "0p8qagkcgqd84sw3d1fy06nci9n4nh9vcmq8invcsz19i5vr6kjg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGRlZmF1bHQgbGlnaHQgdGhlbWUgaW50ZWdyYXRpb24gd2l0aCB0cmFuc3BhcmVuY3kgc3VwcG9ydCAoc2hlbGwgb25seSwgZG9lc24ndCBhZmZlY3QgYXBwbGljYXRpb25zLCB1c2Ugd2l0aCBvdGhlciB0aGVtaW5nIGV4dGVuc2lvbikuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIFNoZWxsIFkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtc2hlbGwteUBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDksCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yLjIiCn0="}
+    "46": {"version": "10", "sha256": "0dcpd9x80xyn6ldmb8n46ilxr0vvcbfj7lc451d9vzkf64n2bsbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkx1bWludXMgU2hlbGwgZm9yIEJsdXIgbXkgU2hlbGwgYW5kIG90aGVyIHRyYW5zcGFyZW50IHRoZW1pbmcgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZGlrYXNwIgogIH0sCiAgIm5hbWUiOiAiTHVtaW51cyBTaGVsbCBZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0IiwKICAidXVpZCI6ICJsdW1pbnVzLXNoZWxsLXlAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAxMCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIuNCIKfQ=="},
+    "47": {"version": "12", "sha256": "0jj77ing6snv3zq1bka34rbzkz2n2iv9373ascapi0p5x7hjgwdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkx1bWludXMgU2hlbGwgZm9yIEJsdXIgbXkgU2hlbGwgYW5kIG90aGVyIHRyYW5zcGFyZW50IHRoZW1pbmcgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZGlrYXNwIgogIH0sCiAgIm5hbWUiOiAiTHVtaW51cyBTaGVsbCBZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0I3RoZS1sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtc2hlbGwteUBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDEyLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDciCn0="}
   }}
 , {"uuid": "luminus-desktop@dikasp.gitlab", "name": "Luminus Desktop", "pname": "luminus-desktop", "description": "An alternative global light theme integration.", "link": "https://extensions.gnome.org/extension/6750/luminus-desktop/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1ai9rzr0lx8myy6cqfsm4cck5l1v5yq8fwfil0rawpnzlbr6rmgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBnbG9iYWwgZnVsbCBsaWdodCBzdHlsZSBpbnRlZ3JhdGlvbiBpbnRvIGdub21lLXNoZWxsIGFuZCBHVEsgYXBwcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjQ1LjIiCn0="},
-    "46": {"version": "12", "sha256": "0nywpl5qwn0s85ib6nxaqi79z1lkxws581ww2xb1k84lbh9pchhv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGdsb2JhbCBsaWdodCB0aGVtZSBpbnRlZ3JhdGlvbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTIsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yLjMiCn0="}
+    "46": {"version": "13", "sha256": "05lj5ivq25p4xgz9nwi54xs4db13ssl9vqig2bvplbm0v5lh0aab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGdsb2JhbCBsaWdodCB0aGVtZSBpbnRlZ3JhdGlvbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yLjQiCn0="},
+    "47": {"version": "16", "sha256": "1gnmsvcini3abx4231dwfsp8h11l1gry91prqic372l4z2xmsvga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGdsb2JhbCBsaWdodCB0aGVtZSBpbnRlZ3JhdGlvbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCN0aGUtbHVtaW51cy1wcm9qZWN0IiwKICAidXVpZCI6ICJsdW1pbnVzLWRlc2t0b3BAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAxNiwKICAidmVyc2lvbi1uYW1lIjogIjQ3LnYyIgp9"}
   }}
 , {"uuid": "mypubip@snirt", "name": "MyPubIP", "pname": "mypubip", "description": "A simple extension that let the user to view and copy the public IPv4 and IPv6 address, by using ipify.org services.", "link": "https://extensions.gnome.org/extension/6765/mypubip/", "shell_version_map": {
     "45": {"version": "6", "sha256": "153q4y47xkxga06qx9lx06nknbc8d3ylr7dkywwx3062gqn6zjfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IGxldCB0aGUgdXNlciB0byB2aWV3IGFuZCBjb3B5IHRoZSBwdWJsaWMgSVB2NCBhbmQgSVB2NiBhZGRyZXNzLCBieSB1c2luZyBpcGlmeS5vcmcgc2VydmljZXMuIiwKICAibmFtZSI6ICJNeVB1YklQIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmlydC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXlwdWJpcCIsCiAgInV1aWQiOiAibXlwdWJpcEBzbmlydCIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -7066,18 +7456,21 @@
     "44": {"version": "3", "sha256": "1hbgfnflra98l31rm0vb6x6h69x6621nyyfdr653kp8f4gi4711z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBzaW1wbGUgR25vbWUtU2hlbGwgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHRyYWNrIGNyeXB0b2N1cnJlbmN5IHByaWNlcy5cblxuU3VwcG9ydGVkIHBhaXJzIGluY2x1ZGU6XG4tIEJUQy9VU0Rcbi0gQlRDL0VVUlxuLSBFVEgvVVNEXG4tIEVUSC9FVVIgIFxuXG5UaGUgZXh0ZW5zaW9uIHJlZnJlc2hlcyBwcmljZXMgZXZlcnkgNSBtaW51dGVzIHVzaW5nIHRoZSBDb2luR2Vja28gQVBJIHRvIHJldHJpZXZlIGRhdGEuIiwKICAibmFtZSI6ICJTaW1wbGUgQ3J5cHRvIFRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Hb256YWxvR29yZ29qby9Hbm9tZS1TaGVsbC1DcnlwdG8tVHJhY2tlciIsCiAgInV1aWQiOiAiY3J5cHRvLXRyYWNrZXJAZ29uZ29yZ29qby5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "Airpod-Battery-Monitor@maniacx.github.com", "name": "Airpod Battery Monitor", "pname": "airpod-battery-monitor", "description": "A Gnome extension for monitoring battery level of AirPods and Beats Bluetooth headset\n\nNote: This extension is not compatible with Bluetooth configurations in BR/EDR-only mode. Dual mode is required. Please refer to the Readme documentation for more information.\n\nhttps://maniacx.github.io/Airpod-Battery-Monitor/", "link": "https://extensions.gnome.org/extension/6778/airpod-battery-monitor/", "shell_version_map": {
-    "43": {"version": "13", "sha256": "1xn0l22lv16sahc7gxfavi9kw4jkq14lhl2d0g9d2p3f02kjc5an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9BaXJwb2QtQmF0dGVyeS1Nb25pdG9yIiwKICAidXVpZCI6ICJBaXJwb2QtQmF0dGVyeS1Nb25pdG9yQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "44": {"version": "13", "sha256": "1xn0l22lv16sahc7gxfavi9kw4jkq14lhl2d0g9d2p3f02kjc5an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9BaXJwb2QtQmF0dGVyeS1Nb25pdG9yIiwKICAidXVpZCI6ICJBaXJwb2QtQmF0dGVyeS1Nb25pdG9yQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "45": {"version": "14", "sha256": "1hqa7gs7vgwhs7mindc0xnn3g1gpqaibh1b2a8mqwh3svi9mbr5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9BaXJwb2QtQmF0dGVyeS1Nb25pdG9yIiwKICAidXVpZCI6ICJBaXJwb2QtQmF0dGVyeS1Nb25pdG9yQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
-    "46": {"version": "14", "sha256": "1hqa7gs7vgwhs7mindc0xnn3g1gpqaibh1b2a8mqwh3svi9mbr5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9BaXJwb2QtQmF0dGVyeS1Nb25pdG9yIiwKICAidXVpZCI6ICJBaXJwb2QtQmF0dGVyeS1Nb25pdG9yQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}
+    "43": {"version": "17", "sha256": "1ai850w8qi75mykfvb9zvkvd7kn8kq9mf99rn0m0vwplf4jib38y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9BaXJwb2QtQmF0dGVyeS1Nb25pdG9yIiwKICAidXVpZCI6ICJBaXJwb2QtQmF0dGVyeS1Nb25pdG9yQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "44": {"version": "17", "sha256": "1ai850w8qi75mykfvb9zvkvd7kn8kq9mf99rn0m0vwplf4jib38y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9BaXJwb2QtQmF0dGVyeS1Nb25pdG9yIiwKICAidXVpZCI6ICJBaXJwb2QtQmF0dGVyeS1Nb25pdG9yQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"},
+    "45": {"version": "18", "sha256": "063sy1m6yz9mmnpifxa58s92a7lnlldddnicvihxlm592iih85zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInV1aWQiOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
+    "46": {"version": "18", "sha256": "063sy1m6yz9mmnpifxa58s92a7lnlldddnicvihxlm592iih85zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInV1aWQiOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
+    "47": {"version": "18", "sha256": "063sy1m6yz9mmnpifxa58s92a7lnlldddnicvihxlm592iih85zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGJhdHRlcnkgbGV2ZWwgb2YgQWlyUG9kcyBhbmQgQmVhdHMgQmx1ZXRvb3RoIGhlYWRzZXRcblxuTm90ZTogVGhpcyBleHRlbnNpb24gaXMgbm90IGNvbXBhdGlibGUgd2l0aCBCbHVldG9vdGggY29uZmlndXJhdGlvbnMgaW4gQlIvRURSLW9ubHkgbW9kZS4gRHVhbCBtb2RlIGlzIHJlcXVpcmVkLiBQbGVhc2UgcmVmZXIgdG8gdGhlIFJlYWRtZSBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9uLlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0FpcnBvZC1CYXR0ZXJ5LU1vbml0b3IvIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkFpcnBvZCBCYXR0ZXJ5IE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQWlycG9kLUJhdHRlcnktTW9uaXRvciIsCiAgInV1aWQiOiAiQWlycG9kLUJhdHRlcnktTW9uaXRvckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}
   }}
-, {"uuid": "night-light-slider-updated@vilsbeg.codeberg.org", "name": "Night Light Slider Updated", "pname": "night-light-slider-updated", "description": "Kiyui's Night Light Slider updated for GNOME 45. Provides a slider in the quick settings menu to control the night light temperature. Some nice options can be set in the extension preferences menu. Original implementation: https://codeberg.org/kiyui/gnome-shell-night-light-slider-extension/", "link": "https://extensions.gnome.org/extension/6781/night-light-slider-updated/", "shell_version_map": {
-    "45": {"version": "10", "sha256": "02pdykqq1zvf674qdkzrpmxvqdi3zxppxky4n6pdndmywqdxs63x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpeXVpJ3MgTmlnaHQgTGlnaHQgU2xpZGVyIHVwZGF0ZWQgZm9yIEdOT01FIDQ1LiBQcm92aWRlcyBhIHNsaWRlciBpbiB0aGUgcXVpY2sgc2V0dGluZ3MgbWVudSB0byBjb250cm9sIHRoZSBuaWdodCBsaWdodCB0ZW1wZXJhdHVyZS4gU29tZSBuaWNlIG9wdGlvbnMgY2FuIGJlIHNldCBpbiB0aGUgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIG1lbnUuIE9yaWdpbmFsIGltcGxlbWVudGF0aW9uOiBodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1uaWdodC1saWdodC1zbGlkZXItZXh0ZW5zaW9uLyIsCiAgIm5hbWUiOiAiTmlnaHQgTGlnaHQgU2xpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlcnVwZGF0ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcvdmlsc2JlZy9uaWdodC1saWdodC1zbGlkZXItdXBkYXRlZCIsCiAgInV1aWQiOiAibmlnaHQtbGlnaHQtc2xpZGVyLXVwZGF0ZWRAdmlsc2JlZy5jb2RlYmVyZy5vcmciLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "46": {"version": "10", "sha256": "02pdykqq1zvf674qdkzrpmxvqdi3zxppxky4n6pdndmywqdxs63x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpeXVpJ3MgTmlnaHQgTGlnaHQgU2xpZGVyIHVwZGF0ZWQgZm9yIEdOT01FIDQ1LiBQcm92aWRlcyBhIHNsaWRlciBpbiB0aGUgcXVpY2sgc2V0dGluZ3MgbWVudSB0byBjb250cm9sIHRoZSBuaWdodCBsaWdodCB0ZW1wZXJhdHVyZS4gU29tZSBuaWNlIG9wdGlvbnMgY2FuIGJlIHNldCBpbiB0aGUgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIG1lbnUuIE9yaWdpbmFsIGltcGxlbWVudGF0aW9uOiBodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1uaWdodC1saWdodC1zbGlkZXItZXh0ZW5zaW9uLyIsCiAgIm5hbWUiOiAiTmlnaHQgTGlnaHQgU2xpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlcnVwZGF0ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcvdmlsc2JlZy9uaWdodC1saWdodC1zbGlkZXItdXBkYXRlZCIsCiAgInV1aWQiOiAibmlnaHQtbGlnaHQtc2xpZGVyLXVwZGF0ZWRAdmlsc2JlZy5jb2RlYmVyZy5vcmciLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
+, {"uuid": "night-light-slider-updated@vilsbeg.codeberg.org", "name": "Night Light Slider Updated", "pname": "night-light-slider-updated", "description": "Kiyui's Night Light Slider updated for GNOME >= 45. Provides a slider in the quick settings menu to control the night light temperature. Some nice options can be set in the extension preferences menu. Original implementation: https://codeberg.org/kiyui/gnome-shell-night-light-slider-extension/", "link": "https://extensions.gnome.org/extension/6781/night-light-slider-updated/", "shell_version_map": {
+    "45": {"version": "12", "sha256": "03xf3ggbg34029bs23mlyrw03jsa0k74m2ryzw717b6f3rqqyqbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpeXVpJ3MgTmlnaHQgTGlnaHQgU2xpZGVyIHVwZGF0ZWQgZm9yIEdOT01FIDQ1LiBQcm92aWRlcyBhIHNsaWRlciBpbiB0aGUgcXVpY2sgc2V0dGluZ3MgbWVudSB0byBjb250cm9sIHRoZSBuaWdodCBsaWdodCB0ZW1wZXJhdHVyZS4gU29tZSBuaWNlIG9wdGlvbnMgY2FuIGJlIHNldCBpbiB0aGUgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIG1lbnUuIE9yaWdpbmFsIGltcGxlbWVudGF0aW9uOiBodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1uaWdodC1saWdodC1zbGlkZXItZXh0ZW5zaW9uLyIsCiAgIm5hbWUiOiAiTmlnaHQgTGlnaHQgU2xpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlcnVwZGF0ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL3ZpbHNiZWcvbmlnaHQtbGlnaHQtc2xpZGVyLXVwZGF0ZWQiLAogICJ1dWlkIjogIm5pZ2h0LWxpZ2h0LXNsaWRlci11cGRhdGVkQHZpbHNiZWcuY29kZWJlcmcub3JnIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "03xf3ggbg34029bs23mlyrw03jsa0k74m2ryzw717b6f3rqqyqbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpeXVpJ3MgTmlnaHQgTGlnaHQgU2xpZGVyIHVwZGF0ZWQgZm9yIEdOT01FIDQ1LiBQcm92aWRlcyBhIHNsaWRlciBpbiB0aGUgcXVpY2sgc2V0dGluZ3MgbWVudSB0byBjb250cm9sIHRoZSBuaWdodCBsaWdodCB0ZW1wZXJhdHVyZS4gU29tZSBuaWNlIG9wdGlvbnMgY2FuIGJlIHNldCBpbiB0aGUgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIG1lbnUuIE9yaWdpbmFsIGltcGxlbWVudGF0aW9uOiBodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1uaWdodC1saWdodC1zbGlkZXItZXh0ZW5zaW9uLyIsCiAgIm5hbWUiOiAiTmlnaHQgTGlnaHQgU2xpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlcnVwZGF0ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL3ZpbHNiZWcvbmlnaHQtbGlnaHQtc2xpZGVyLXVwZGF0ZWQiLAogICJ1dWlkIjogIm5pZ2h0LWxpZ2h0LXNsaWRlci11cGRhdGVkQHZpbHNiZWcuY29kZWJlcmcub3JnIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "03xf3ggbg34029bs23mlyrw03jsa0k74m2ryzw717b6f3rqqyqbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpeXVpJ3MgTmlnaHQgTGlnaHQgU2xpZGVyIHVwZGF0ZWQgZm9yIEdOT01FIDQ1LiBQcm92aWRlcyBhIHNsaWRlciBpbiB0aGUgcXVpY2sgc2V0dGluZ3MgbWVudSB0byBjb250cm9sIHRoZSBuaWdodCBsaWdodCB0ZW1wZXJhdHVyZS4gU29tZSBuaWNlIG9wdGlvbnMgY2FuIGJlIHNldCBpbiB0aGUgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIG1lbnUuIE9yaWdpbmFsIGltcGxlbWVudGF0aW9uOiBodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1uaWdodC1saWdodC1zbGlkZXItZXh0ZW5zaW9uLyIsCiAgIm5hbWUiOiAiTmlnaHQgTGlnaHQgU2xpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlcnVwZGF0ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL3ZpbHNiZWcvbmlnaHQtbGlnaHQtc2xpZGVyLXVwZGF0ZWQiLAogICJ1dWlkIjogIm5pZ2h0LWxpZ2h0LXNsaWRlci11cGRhdGVkQHZpbHNiZWcuY29kZWJlcmcub3JnIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
-, {"uuid": "wiggle@mechtifs", "name": "Wiggle", "pname": "wiggle", "description": "Wiggle is a GNOME 45+ port/fix for the scaling effect from Jiggle with better performance. Wiggle magnifies your cursor when the mouse is moved rapidly.", "link": "https://extensions.gnome.org/extension/6784/wiggle/", "shell_version_map": {
+, {"uuid": "wiggle@mechtifs", "name": "Wiggle", "pname": "wiggle", "description": "Wiggle is a GNOME Shell extension that magnifies the cursor when the mouse is moved rapidly. It's a partial continuation of Jiggle after ESM was introduced.", "link": "https://extensions.gnome.org/extension/6784/wiggle/", "shell_version_map": {
     "45": {"version": "2", "sha256": "14vi9cd9qm6f6z1krhh6s4l8z0121aayf1jmkgaj6i52i7559cmw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpZ2dsZSBpcyBhIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0aGF0IG1hZ25pZmllcyB0aGUgY3Vyc29yIHdoZW4gdGhlIG1vdXNlIGlzIG1vdmVkIHJhcGlkbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZ2dsZSIsCiAgIm5hbWUiOiAiV2lnZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy93aWdnbGUiLAogICJ1dWlkIjogIndpZ2dsZUBtZWNodGlmcyIsCiAgInZlcnNpb24iOiAyCn0="},
-    "46": {"version": "3", "sha256": "14gwkx6z9v7ca13qdy1jad64bahqhs7dkrl1c7v4r49qvhkqg5ka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpZ2dsZSBpcyBhIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0aGF0IG1hZ25pZmllcyB0aGUgY3Vyc29yIHdoZW4gdGhlIG1vdXNlIGlzIG1vdmVkIHJhcGlkbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZ2dsZSIsCiAgIm5hbWUiOiAiV2lnZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy93aWdnbGUiLAogICJ1dWlkIjogIndpZ2dsZUBtZWNodGlmcyIsCiAgInZlcnNpb24iOiAzCn0="}
+    "46": {"version": "5", "sha256": "1gkq5s7h056p7ifki9wryfcpp1kv79lhy9nym4q1bqs7sxrl644y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpZ2dsZSBpcyBhIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0aGF0IG1hZ25pZmllcyB0aGUgY3Vyc29yIHdoZW4gdGhlIG1vdXNlIGlzIG1vdmVkIHJhcGlkbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZ2dsZSIsCiAgIm5hbWUiOiAiV2lnZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvd2lnZ2xlIiwKICAidXVpZCI6ICJ3aWdnbGVAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "1gkq5s7h056p7ifki9wryfcpp1kv79lhy9nym4q1bqs7sxrl644y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpZ2dsZSBpcyBhIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0aGF0IG1hZ25pZmllcyB0aGUgY3Vyc29yIHdoZW4gdGhlIG1vdXNlIGlzIG1vdmVkIHJhcGlkbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZ2dsZSIsCiAgIm5hbWUiOiAiV2lnZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvd2lnZ2xlIiwKICAidXVpZCI6ICJ3aWdnbGVAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "favorite-apps@venovar.tr", "name": "Favorite Apps Menu", "pname": "show-favorite-apps", "description": "This extension adds a favorite applications menu to top panel", "link": "https://extensions.gnome.org/extension/6787/show-favorite-apps/", "shell_version_map": {
     "45": {"version": "7", "sha256": "1jcqmijfzfqhvrkv5agf3hq05kri1nfh1zri0278nmwmk1b9xfhh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZHMgYSBmYXZvcml0ZSBhcHBsaWNhdGlvbnMgbWVudSBwYW5lbCB0byB0b3AgYmFyIiwKICAibmFtZSI6ICJGYXZvcml0ZSBBcHBzIE1lbnUgb24gVG9wIEJhciBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZW5mYXZhcHAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnIiwKICAidXVpZCI6ICJmYXZvcml0ZS1hcHBzQHZlbm92YXIudHIiLAogICJ2ZXJzaW9uIjogNwp9"},
@@ -7087,29 +7480,37 @@
     "42": {"version": "36", "sha256": "16isyi8r64nbzddy9pfhzkmwklvk0x9rxhiyry7arc2gvd7c09zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"},
     "43": {"version": "36", "sha256": "16isyi8r64nbzddy9pfhzkmwklvk0x9rxhiyry7arc2gvd7c09zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"},
     "44": {"version": "36", "sha256": "16isyi8r64nbzddy9pfhzkmwklvk0x9rxhiyry7arc2gvd7c09zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"},
-    "45": {"version": "37", "sha256": "01a51cffdqpzzpfdag7av5z11hsdjja21qkbsl0fsjcslxwad4fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdG90cCIsCiAgInV1aWQiOiAidG90cEBka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="},
-    "46": {"version": "37", "sha256": "01a51cffdqpzzpfdag7av5z11hsdjja21qkbsl0fsjcslxwad4fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdG90cCIsCiAgInV1aWQiOiAidG90cEBka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}
+    "45": {"version": "38", "sha256": "1l8zyhfdiv5amcwp6hqvrj29al4ym0xxhyqr69m1l82icj9x4f1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "46": {"version": "38", "sha256": "1l8zyhfdiv5amcwp6hqvrj29al4ym0xxhyqr69m1l82icj9x4f1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "47": {"version": "38", "sha256": "1l8zyhfdiv5amcwp6hqvrj29al4ym0xxhyqr69m1l82icj9x4f1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}
   }}
 , {"uuid": "better-end-session-dialog@popov895.ukr.net", "name": "Better End Session Dialog", "pname": "better-end-session-dialog", "description": "Show logout/reboot/shutdown together in the end session dialog", "link": "https://extensions.gnome.org/extension/6796/better-end-session-dialog/", "shell_version_map": {
-    "42": {"version": "12", "sha256": "08ah8w609asl8k8r00f2b3i9qbiahnggya0yh8r3iipkn6b8x8zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwb3Bvdjg5NWEiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZyIsCiAgInV1aWQiOiAiYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZ0Bwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "43": {"version": "12", "sha256": "08ah8w609asl8k8r00f2b3i9qbiahnggya0yh8r3iipkn6b8x8zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwb3Bvdjg5NWEiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZyIsCiAgInV1aWQiOiAiYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZ0Bwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "44": {"version": "12", "sha256": "08ah8w609asl8k8r00f2b3i9qbiahnggya0yh8r3iipkn6b8x8zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwb3Bvdjg5NWEiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZyIsCiAgInV1aWQiOiAiYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZ0Bwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "45": {"version": "13", "sha256": "0xyyychdfxfg3d26cxva72s7ffrng1phdjvlnh1khddnhlzszf5k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwb3Bvdjg5NWEiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
-    "46": {"version": "13", "sha256": "0xyyychdfxfg3d26cxva72s7ffrng1phdjvlnh1khddnhlzszf5k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwb3Bvdjg5NWEiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
+    "42": {"version": "27", "sha256": "1v5i2vm1wdnzgf4hnqrzwnqqglb764vmjp0lakkzvxfrhq4bpw5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1lbmQtc2Vzc2lvbi1kaWFsb2ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "43": {"version": "27", "sha256": "1v5i2vm1wdnzgf4hnqrzwnqqglb764vmjp0lakkzvxfrhq4bpw5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1lbmQtc2Vzc2lvbi1kaWFsb2ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "44": {"version": "27", "sha256": "1v5i2vm1wdnzgf4hnqrzwnqqglb764vmjp0lakkzvxfrhq4bpw5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1lbmQtc2Vzc2lvbi1kaWFsb2ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "45": {"version": "28", "sha256": "0bfj0zvf7f1abj276nskiy93d77b909mh5ck1p5nkxc7ski2yj88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1lbmQtc2Vzc2lvbi1kaWFsb2ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "46": {"version": "28", "sha256": "0bfj0zvf7f1abj276nskiy93d77b909mh5ck1p5nkxc7ski2yj88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1lbmQtc2Vzc2lvbi1kaWFsb2ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "47": {"version": "28", "sha256": "0bfj0zvf7f1abj276nskiy93d77b909mh5ck1p5nkxc7ski2yj88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1lbmQtc2Vzc2lvbi1kaWFsb2ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nIiwKICAidXVpZCI6ICJiZXR0ZXItZW5kLXNlc3Npb24tZGlhbG9nQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}
   }}
 , {"uuid": "layout-hotkeys@max.post.space.gmail.com", "name": "Layout Hotkeys", "pname": "layout-hotkeys", "description": "Add hotkeys to switch keyboard layout directly via Shift + Alt + [1-9].", "link": "https://extensions.gnome.org/extension/6804/layout-hotkeys/", "shell_version_map": {
     "45": {"version": "1", "sha256": "1w85nx17ggalvjd1lrj2dkhc1xkmvc1jv45vb2cvxvxpb7c4ji3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBob3RrZXlzIHRvIHN3aXRjaCBsYXlvdXRzIGRpcmVjdGx5IHZpYSBTaGlmdCArIEFsdCArIFsxLTldLiIsCiAgIm5hbWUiOiAiTGF5b3V0IEhvdGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGF5b3V0LWhvdGtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJEdm9yYWsvbGF5b3V0LWhvdGtleXMiLAogICJ1dWlkIjogImxheW91dC1ob3RrZXlzQG1heC5wb3N0LnNwYWNlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="},
-    "46": {"version": "2", "sha256": "0g40vq4r0p6qkx34nkhixg154rwcjkbdfqcsgcmhb730kdyypbmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBob3RrZXlzIHRvIHN3aXRjaCBrZXlib2FyZCBsYXlvdXQgZGlyZWN0bHkgdmlhIFNoaWZ0ICsgQWx0ICsgWzEtOV0uIiwKICAibmFtZSI6ICJMYXlvdXQgSG90a2V5cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXlvdXQtaG90a2V5cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NckR2b3Jhay9sYXlvdXQtaG90a2V5cyIsCiAgInV1aWQiOiAibGF5b3V0LWhvdGtleXNAbWF4LnBvc3Quc3BhY2UuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIsCiAgInZlcnNpb24tbmFtZSI6ICIyLjAiCn0="}
+    "46": {"version": "2", "sha256": "0g40vq4r0p6qkx34nkhixg154rwcjkbdfqcsgcmhb730kdyypbmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBob3RrZXlzIHRvIHN3aXRjaCBrZXlib2FyZCBsYXlvdXQgZGlyZWN0bHkgdmlhIFNoaWZ0ICsgQWx0ICsgWzEtOV0uIiwKICAibmFtZSI6ICJMYXlvdXQgSG90a2V5cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXlvdXQtaG90a2V5cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NckR2b3Jhay9sYXlvdXQtaG90a2V5cyIsCiAgInV1aWQiOiAibGF5b3V0LWhvdGtleXNAbWF4LnBvc3Quc3BhY2UuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIsCiAgInZlcnNpb24tbmFtZSI6ICIyLjAiCn0="},
+    "47": {"version": "3", "sha256": "1lwcsrgw2bwmxml01i5j3b2y14r37vlr7dq3nvy1x0jpi7sic906", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBob3RrZXlzIHRvIHN3aXRjaCBrZXlib2FyZCBsYXlvdXQgZGlyZWN0bHkgdmlhIFNoaWZ0ICsgQWx0ICsgWzEtOV0uIiwKICAibmFtZSI6ICJMYXlvdXQgSG90a2V5cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXlvdXQtaG90a2V5cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NckR2b3Jhay9sYXlvdXQtaG90a2V5cyIsCiAgInV1aWQiOiAibGF5b3V0LWhvdGtleXNAbWF4LnBvc3Quc3BhY2UuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMsCiAgInZlcnNpb24tbmFtZSI6ICIzLjAiCn0="}
   }}
 , {"uuid": "system-monitor@gnome-shell-extensions.gcampax.github.com", "name": "System Monitor", "pname": "system-monitor", "description": "Monitor system from the top bar", "link": "https://extensions.gnome.org/extension/6807/system-monitor/", "shell_version_map": {
-    "46": {"version": "3", "sha256": "0d4zncm3namqaa1clq7khi0p8s59laxk63nj9394ljcaxpwgw3sc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "46": {"version": "3", "sha256": "0d4zncm3namqaa1clq7khi0p8s59laxk63nj9394ljcaxpwgw3sc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "4", "sha256": "0la5mlnbajijrlgdwp6p9q8mbr2rvyxqal58kzizpwndjblxjd0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
-, {"uuid": "window-thumbnails@G-dH.github.com", "name": "WTMB (Window Thumbnails)", "pname": "wtmb-window-thumbnails", "description": "Allows the creation of window clones for use as Picture-in-Picture (PIP) live thumbnails", "link": "https://extensions.gnome.org/extension/6816/wtmb-window-thumbnails/", "shell_version_map": {
+, {"uuid": "window-thumbnails@G-dH.github.com", "name": "WTMB (Window Thumbnails)", "pname": "wtmb-window-thumbnails", "description": "Allows the creation of window clones for use as Picture-in-Picture (PIP) live thumbnails\n\nFeatures:\n- clone window as a resizable live thumbnail\n- minimize to a thumbnail\n- hover to show full-size clone\n- hover to hide thumbnail\n- custom default position and scale\n- remember thumbnail position for each window\n", "link": "https://extensions.gnome.org/extension/6816/wtmb-window-thumbnails/", "shell_version_map": {
     "42": {"version": "9", "sha256": "07byw17537lmy073c3vq4pzafbflnd5mm45i5sy82mh61j9i1zsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMyIKfQ=="},
     "43": {"version": "9", "sha256": "07byw17537lmy073c3vq4pzafbflnd5mm45i5sy82mh61j9i1zsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMyIKfQ=="},
     "44": {"version": "9", "sha256": "07byw17537lmy073c3vq4pzafbflnd5mm45i5sy82mh61j9i1zsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMyIKfQ=="},
-    "45": {"version": "8", "sha256": "1wlsblarwcwj2wi78vyhg5myccfyhzxxzxn71qpxj7bxiv8ggw25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3ctdGh1bWJuYWlscyIsCiAgInV1aWQiOiAid2luZG93LXRodW1ibmFpbHNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4zIgp9"},
-    "46": {"version": "8", "sha256": "1wlsblarwcwj2wi78vyhg5myccfyhzxxzxn71qpxj7bxiv8ggw25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC93aW5kb3ctdGh1bWJuYWlscyIsCiAgInV1aWQiOiAid2luZG93LXRodW1ibmFpbHNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4zIgp9"}
+    "45": {"version": "10", "sha256": "1ng761cyglh2xmqbrbva5axj35cllr3mrcy0ips3sf3crpglqvgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "46": {"version": "10", "sha256": "1ng761cyglh2xmqbrbva5axj35cllr3mrcy0ips3sf3crpglqvgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="},
+    "47": {"version": "10", "sha256": "1ng761cyglh2xmqbrbva5axj35cllr3mrcy0ips3sf3crpglqvgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMCwKICAidmVyc2lvbi1uYW1lIjogIjQ3LjAiCn0="}
+  }}
+, {"uuid": "keyboard-cat-defense@onel.github.io", "name": "Keyboard cat defense", "pname": "keyboard-cat-defense", "description": "Protect your keyboard with the most advance system. Disable the keyboard in seconds and continue using your system. The extension requires xinput as a dependency", "link": "https://extensions.gnome.org/extension/6819/keyboard-cat-defense/", "shell_version_map": {
+    "43": {"version": "4", "sha256": "05jccpjp8v81k48yfmyln2r6vn9a6y20a84kz561l4gnvjjd2089", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3RlY3QgeW91ciBrZXlib2FyZCB3aXRoIHRoZSBtb3N0IGFkdmFuY2Ugc3lzdGVtLiBEaXNhYmxlIHRoZSBrZXlib2FyZCBpbiBzZWNvbmRzIGFuZCBjb250aW51ZSB1c2luZyB5b3VyIHN5c3RlbS4gVGhlIGV4dGVuc2lvbiByZXF1aXJlcyB4aW5wdXQgYXMgYSBkZXBlbmRlbmN5IiwKICAibmFtZSI6ICJLZXlib2FyZCBjYXQgZGVmZW5zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbmVsL2tleWJvYXJkLWNhdC1kZWZlbnNlIiwKICAidXVpZCI6ICJrZXlib2FyZC1jYXQtZGVmZW5zZUBvbmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "fancy-tiling@devroamer.zen", "name": "Fancy Tiling", "pname": "fancy-tiling", "description": "FancyZones clone for GNOME", "link": "https://extensions.gnome.org/extension/6822/fancy-tiling/", "shell_version_map": {
     "45": {"version": "2", "sha256": "0fixwm1dc6hg7gcvnl4k41pqsp27zp6ksflicf9lfr88gqc4bkxj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJEZXZSb2FtZXIgPGQzdnIwYW0zckBnbWFpbC5jb20+IiwKICAiY29tbWl0IjogIjFjNzVjMTAxNTExNmZjMDAxMDFhM2MxYTcyMzBjY2QwNWE3NzU0OWUiLAogICJkZXNjcmlwdGlvbiI6ICJGYW5jeVpvbmVzIGNsb25lIGZvciBHTk9NRSIsCiAgIm5hbWUiOiAiRmFuY3kgVGlsaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RldlJvYW1lci9GYW5jeVRpbGluZyIsCiAgInV1aWQiOiAiZmFuY3ktdGlsaW5nQGRldnJvYW1lci56ZW4iLAogICJ2ZXJzaW9uIjogMgp9"}
@@ -7121,7 +7522,7 @@
     "40": {"version": "4", "sha256": "0h8lb37ic08727vw0lwk2hwxjnyk93y3l1w1q5i040da180hmpgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRpbWVyIHRvIHJlbWluZCB1c2VycyB0byB0YWtlIGJyZWFrcyBhbmQgcmVkdWNlIGV5ZSBzdHJhaW4gYnkgZm9sbG93aW5nIHRoZSAyMCcyMCcyMCBydWxlLiIsCiAgImdldHRleHQtZG9tYWluIjogIjIwMjAyMHJ1bGV0aW1lciIsCiAgIm5hbWUiOiAiMjAgMjAgMjAgUnVsZSBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaXBwb2JlcnRpMjAyMC8yMC0yMC0yMC1ydWxlLXRpbWVyIiwKICAidXVpZCI6ICIyMDIwMjBydWxldGltZXJAMjAyMDIwcnVsZXRpbWVyLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "4", "sha256": "0h8lb37ic08727vw0lwk2hwxjnyk93y3l1w1q5i040da180hmpgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRpbWVyIHRvIHJlbWluZCB1c2VycyB0byB0YWtlIGJyZWFrcyBhbmQgcmVkdWNlIGV5ZSBzdHJhaW4gYnkgZm9sbG93aW5nIHRoZSAyMCcyMCcyMCBydWxlLiIsCiAgImdldHRleHQtZG9tYWluIjogIjIwMjAyMHJ1bGV0aW1lciIsCiAgIm5hbWUiOiAiMjAgMjAgMjAgUnVsZSBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaXBwb2JlcnRpMjAyMC8yMC0yMC0yMC1ydWxlLXRpbWVyIiwKICAidXVpZCI6ICIyMDIwMjBydWxldGltZXJAMjAyMDIwcnVsZXRpbWVyLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
-, {"uuid": "geminiaiubuntu@arda.com", "name": "Gemini AI ChatBot", "pname": "gemini-ai", "description": "This Add-on is using gemini ai 1.0 pro model for chatting. \n This extensions using thisipcan.cyou for location detection and googleapis.com for gemini model \n also if you are planing to use Vertex api you should install `gcloud` as dependency (optional) \n NOTE: This extension is not affiliated, funded, or in any way associated with Google and Gemini.", "link": "https://extensions.gnome.org/extension/6834/gemini-ai/", "shell_version_map": {
+, {"uuid": "geminiaiubuntu@arda.com", "name": "Gemini AI ChatBot", "pname": "gemini-ai", "description": "This Add-on is using gemini ai 1.0 pro, 1.5 flash, 1.5 pro models for chatting. \n NOTE: This extension is not affiliated, funded, or in any way associated with Google and Gemini.", "link": "https://extensions.gnome.org/extension/6834/gemini-ai/", "shell_version_map": {
     "40": {"version": "22", "sha256": "1wjyzaim8wdsw18934fa81qm6lcqcvv87sfz8p65chrczzgpm4qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haS9ibG9iL21haW4vQ0hBTkdFUy5tZCIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
     "42": {"version": "22", "sha256": "1wjyzaim8wdsw18934fa81qm6lcqcvv87sfz8p65chrczzgpm4qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haS9ibG9iL21haW4vQ0hBTkdFUy5tZCIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
     "43": {"version": "22", "sha256": "1wjyzaim8wdsw18934fa81qm6lcqcvv87sfz8p65chrczzgpm4qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haS9ibG9iL21haW4vQ0hBTkdFUy5tZCIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="},
@@ -7137,8 +7538,9 @@
     "42": {"version": "20", "sha256": "1y6kvyg6arkp51m8ivs4hi7pisnz8bqdnywi1lgc2m7lr7r82nbl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtleXJpbmctYXV0b2xvY2siLAogICJ1dWlkIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
     "43": {"version": "20", "sha256": "1y6kvyg6arkp51m8ivs4hi7pisnz8bqdnywi1lgc2m7lr7r82nbl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtleXJpbmctYXV0b2xvY2siLAogICJ1dWlkIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
     "44": {"version": "20", "sha256": "1y6kvyg6arkp51m8ivs4hi7pisnz8bqdnywi1lgc2m7lr7r82nbl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtleXJpbmctYXV0b2xvY2siLAogICJ1dWlkIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"},
-    "45": {"version": "21", "sha256": "1whqd3xpnlsy7zcxzmnkwn0qahvnrxqnqcl70cmkfn4w60sv01ar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2V5cmluZy1hdXRvbG9jayIsCiAgInV1aWQiOiAia2V5cmluZy1hdXRvbG9ja0Bka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="},
-    "46": {"version": "21", "sha256": "1whqd3xpnlsy7zcxzmnkwn0qahvnrxqnqcl70cmkfn4w60sv01ar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2V5cmluZy1hdXRvbG9jayIsCiAgInV1aWQiOiAia2V5cmluZy1hdXRvbG9ja0Bka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}
+    "45": {"version": "22", "sha256": "1my1p560ipqbjz9nqvabwwridagqlrsm92vw4xlmsf3n4afzk3mr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtleXJpbmctYXV0b2xvY2siLAogICJ1dWlkIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"},
+    "46": {"version": "22", "sha256": "1my1p560ipqbjz9nqvabwwridagqlrsm92vw4xlmsf3n4afzk3mr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtleXJpbmctYXV0b2xvY2siLAogICJ1dWlkIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"},
+    "47": {"version": "22", "sha256": "1my1p560ipqbjz9nqvabwwridagqlrsm92vw4xlmsf3n4afzk3mr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGtleXJpbmcncyBsb2NrZWQgc3RhdGUsIGFuZCBhdXRvbWF0aWNhbGx5IGxvY2sgaXQgYWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiS2V5cmluZyBBdXRvbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5rZXlyaW5nLWF1dG9sb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtleXJpbmctYXV0b2xvY2siLAogICJ1dWlkIjogImtleXJpbmctYXV0b2xvY2tAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}
   }}
 , {"uuid": "voluble@quantiusbenignus.local", "name": "Voluble", "pname": "voluble", "description": "Let your GNOME desktop speak to you. Reads desktop notifications out-loud with human-like voice using Piper. Can be muted and respects \"Do not Disturb\".\nNow reads mouse text selection on command (ignores non-text).\nRequires the 'voluble' script, available on GitHub along with setup instructions.", "link": "https://extensions.gnome.org/extension/6849/voluble/", "shell_version_map": {
     "42": {"version": "4", "sha256": "1j6hip0gck8p4f101fx2snpxggsvvs10cb11n1v6lixv98bysz2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBsZWFzYW50LXNvdW5kaW5nLCB0YWxrYXRpdmUgYW5ub3VuY2VyIG9mIHN5c3RlbSBvciB1c2VyIG5vdGlmaWNhdGlvbnMuIEdpdmUgYSByZWFsIHZvaWNlIHRvIEdOT01FLiIsCiAgIm5hbWUiOiAiVm9sdWJsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1F1YW50aXVzQmVuaWdudXMvdm9sdWJsZSIsCiAgInV1aWQiOiAidm9sdWJsZUBxdWFudGl1c2JlbmlnbnVzLmxvY2FsIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -7153,8 +7555,9 @@
     "42": {"version": "2", "sha256": "0jz2knz5rxmx7dhxbrfgwagx6p47bs0wlr9s0ml32j27d7p61kax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogMgp9"},
     "43": {"version": "2", "sha256": "0jz2knz5rxmx7dhxbrfgwagx6p47bs0wlr9s0ml32j27d7p61kax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogMgp9"},
     "44": {"version": "2", "sha256": "0jz2knz5rxmx7dhxbrfgwagx6p47bs0wlr9s0ml32j27d7p61kax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "45": {"version": "3", "sha256": "1567484xc4dmihk49ms5d74pvfkmq1f7x2c84q23lp3crpj22l5d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXVsb2ltb24vZ25vbWUtc2NyZWVuc2hvcnQtY3V0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2NyZWVuc2hvcnQtY3V0QHBhdWxvaW1vbiIsCiAgInZlcnNpb24iOiAzCn0="},
-    "46": {"version": "3", "sha256": "1567484xc4dmihk49ms5d74pvfkmq1f7x2c84q23lp3crpj22l5d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXVsb2ltb24vZ25vbWUtc2NyZWVuc2hvcnQtY3V0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2NyZWVuc2hvcnQtY3V0QHBhdWxvaW1vbiIsCiAgInZlcnNpb24iOiAzCn0="}
+    "45": {"version": "4", "sha256": "1cph6ff9n2mlw2f7jrj29c5k6ilk4wzp24s3cgh6nsk8jz0j8wd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "1cph6ff9n2mlw2f7jrj29c5k6ilk4wzp24s3cgh6nsk8jz0j8wd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "1cph6ff9n2mlw2f7jrj29c5k6ilk4wzp24s3cgh6nsk8jz0j8wd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "streamcontroller@core447.com", "name": "StreamController Integration", "pname": "streamcontroller-integration", "description": "Allow automatic page switching in StreamController by adding a dbus interface to fetch info about the current window.", "link": "https://extensions.gnome.org/extension/6871/streamcontroller-integration/", "shell_version_map": {
     "45": {"version": "2", "sha256": "1jiyxya2nfvi647xracbfxm2il508whvrz8fhzmph7pzh86by6rw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGF1dG9tYXRpYyBwYWdlIHN3aXRjaGluZyBpbiBTdHJlYW1Db250cm9sbGVyIGJ5IGFkZGluZyBhIGRidXMgaW50ZXJmYWNlIHRvIGZldGNoIGluZm8gYWJvdXQgdGhlIGN1cnJlbnQgd2luZG93LiIsCiAgIm5hbWUiOiAiU3RyZWFtQ29udHJvbGxlciBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RyZWFtQ29udHJvbGxlci9zdHJlYW1jb250cm9sbGVyLWNvcmU0NDcuY29tIiwKICAidXVpZCI6ICJzdHJlYW1jb250cm9sbGVyQGNvcmU0NDcuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -7165,19 +7568,23 @@
     "46": {"version": "6", "sha256": "00j4985kl104pmq01jh5ch6qlgx7ag6d0nm1zi26iczxwqj7ah5w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIGFkZCBjdXN0b20gbWVudSB0byBwYW5lbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC1tZW51IiwKICAibmFtZSI6ICJhc3RyYXBpLm9zIHwgUGFuZWwgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXN0cmFwaS1vcy9zaGVsbC1leHRlbnNpb25zL3BhbmVsLW1lbnUiLAogICJ1dWlkIjogInBhbmVsLW1lbnVAYXN0cmFwaS5vcyIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
 , {"uuid": "kernel-indicator@pvizc.gitlab.com", "name": "Kernel Indicator", "pname": "kernel-indicator", "description": "Display the kernel version in the top bar", "link": "https://extensions.gnome.org/extension/6880/kernel-indicator/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "1babz6vxkz7p9422ifii5zz150hd9ain42338phy4bkp2gr5dvx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wdml6Yy9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2VybmVsLWluZGljYXRvciIsCiAgInV1aWQiOiAia2VybmVsLWluZGljYXRvckBwdml6Yy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "46": {"version": "2", "sha256": "1babz6vxkz7p9422ifii5zz150hd9ain42338phy4bkp2gr5dvx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wdml6Yy9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2VybmVsLWluZGljYXRvciIsCiAgInV1aWQiOiAia2VybmVsLWluZGljYXRvckBwdml6Yy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+    "45": {"version": "3", "sha256": "0s4b431iwgwbsbmc2fpgv9wbjyzrfqgfcqp2ml9m0dvqw3mds7vx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcHZpemMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAcHZpemMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
+    "46": {"version": "3", "sha256": "0s4b431iwgwbsbmc2fpgv9wbjyzrfqgfcqp2ml9m0dvqw3mds7vx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcHZpemMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAcHZpemMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
+    "47": {"version": "3", "sha256": "0s4b431iwgwbsbmc2fpgv9wbjyzrfqgfcqp2ml9m0dvqw3mds7vx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcHZpemMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAcHZpemMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
 , {"uuid": "arch-update-security-news@slaclau.github.io", "name": "Arch Linux Updates and Security Indicator", "pname": "arch-linux-updates-and-security-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script and arch-audit for security functionality. **\n  Can support AUR or other distros by changing command used to check for and apply updates.\n See README about Gnome Console. \n This extension was modified from https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "link": "https://extensions.gnome.org/extension/6883/arch-linux-updates-and-security-indicator/", "shell_version_map": {
     "46": {"version": "2", "sha256": "0mg83jb6llcqq8k7bijvj1vj135by7d0n5lv16j90c5m04wb4q3m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdCBhbmQgYXJjaC1hdWRpdCBmb3Igc2VjdXJpdHkgZnVuY3Rpb25hbGl0eS4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUuIFxuIFRoaXMgZXh0ZW5zaW9uIHdhcyBtb2RpZmllZCBmcm9tIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEwMTAvYXJjaGxpbnV4LXVwZGF0ZXMtaW5kaWNhdG9yLyIsCiAgImdldHRleHQtZG9tYWluIjogImFyY2gtdXBkYXRlIiwKICAibmFtZSI6ICJBcmNoIExpbnV4IFVwZGF0ZXMgYW5kIFNlY3VyaXR5IEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZS1zZWN1cml0eS1uZXdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NsYWNsYXUvYXJjaC11cGRhdGUtc2VjdXJpdHktbmV3cyIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGUtc2VjdXJpdHktbmV3c0BzbGFjbGF1LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
-, {"uuid": "counter@anubhab", "name": "Counter", "pname": "counter", "description": "Adds persistent counter to top bar. Left click counter +1, right click counter -1, and middle click resets counter to 0. Change name, alignment and index and remember TO RESTART THE EXTENSION to view your changes.", "link": "https://extensions.gnome.org/extension/6889/counter/", "shell_version_map": {
+, {"uuid": "counter@anubhab", "name": "counter", "pname": "counter", "description": "adds persistent counter to top bar. left click counter +1, right click counter -1, and middle click resets counter to 0. change name, alignment and index and remember to log out and log back in to view your changes made to name, alignment and index.", "link": "https://extensions.gnome.org/extension/6889/counter/", "shell_version_map": {
     "38": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "40": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "41": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "42": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "43": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "44": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "44": {"version": "7", "sha256": "1czx2pk4gin5vi4l3ncw3313y79y90cw8wlpzw5nqsv9jj58k333", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIExlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBDaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgVE8gUkVTVEFSVCBUSEUgRVhURU5TSU9OIHRvIHZpZXcgeW91ciBjaGFuZ2VzLiIsCiAgIm5hbWUiOiAiQ291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FudWJoYWItbWFuZGFsL3RhcC1jb3VudGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiY291bnRlckBhbnViaGFiIiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "45": {"version": "9", "sha256": "124pvkrfgxihh1y5czdm9jsaj1rqwil39gy09z3psp9ngpa7xv4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIGxlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBjaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgdG8gbG9nIG91dCBhbmQgbG9nIGJhY2sgaW4gdG8gdmlldyB5b3VyIGNoYW5nZXMgbWFkZSB0byBuYW1lLCBhbGlnbm1lbnQgYW5kIGluZGV4LiIsCiAgIm5hbWUiOiAiY291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbnViaGFiLW1hbmRhbC9jb3VudGVyIiwKICAidXVpZCI6ICJjb3VudGVyQGFudWJoYWIiLAogICJ2ZXJzaW9uIjogOQp9"},
+    "46": {"version": "9", "sha256": "124pvkrfgxihh1y5czdm9jsaj1rqwil39gy09z3psp9ngpa7xv4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIGxlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBjaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgdG8gbG9nIG91dCBhbmQgbG9nIGJhY2sgaW4gdG8gdmlldyB5b3VyIGNoYW5nZXMgbWFkZSB0byBuYW1lLCBhbGlnbm1lbnQgYW5kIGluZGV4LiIsCiAgIm5hbWUiOiAiY291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbnViaGFiLW1hbmRhbC9jb3VudGVyIiwKICAidXVpZCI6ICJjb3VudGVyQGFudWJoYWIiLAogICJ2ZXJzaW9uIjogOQp9"},
+    "47": {"version": "9", "sha256": "124pvkrfgxihh1y5czdm9jsaj1rqwil39gy09z3psp9ngpa7xv4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgcGVyc2lzdGVudCBjb3VudGVyIHRvIHRvcCBiYXIuIGxlZnQgY2xpY2sgY291bnRlciArMSwgcmlnaHQgY2xpY2sgY291bnRlciAtMSwgYW5kIG1pZGRsZSBjbGljayByZXNldHMgY291bnRlciB0byAwLiBjaGFuZ2UgbmFtZSwgYWxpZ25tZW50IGFuZCBpbmRleCBhbmQgcmVtZW1iZXIgdG8gbG9nIG91dCBhbmQgbG9nIGJhY2sgaW4gdG8gdmlldyB5b3VyIGNoYW5nZXMgbWFkZSB0byBuYW1lLCBhbGlnbm1lbnQgYW5kIGluZGV4LiIsCiAgIm5hbWUiOiAiY291bnRlciIsCiAgInByZWZzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbnViaGFiLW1hbmRhbC9jb3VudGVyIiwKICAidXVpZCI6ICJjb3VudGVyQGFudWJoYWIiLAogICJ2ZXJzaW9uIjogOQp9"}
   }}
 , {"uuid": "sleep-through-notifications@rhendric.gitlab.the_name_of_this_desktop_environment.org", "name": "Sleep Through Notifications", "pname": "sleep-through-notifications", "description": "Disable the screen-waking behavior of lock screen notifications", "link": "https://extensions.gnome.org/extension/6892/sleep-through-notifications/", "shell_version_map": {
     "45": {"version": "1", "sha256": "1zsx2q845ng31nn3qavhf2wd3n7qhghr5w1kz6wvvq3i92zf8alk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbi13YWtpbmcgYmVoYXZpb3Igb2YgbG9jayBzY3JlZW4gbm90aWZpY2F0aW9ucyIsCiAgIm5hbWUiOiAiU2xlZXAgVGhyb3VnaCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9yaGVuZHJpYy9zbGVlcC10aHJvdWdoLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInNsZWVwLXRocm91Z2gtbm90aWZpY2F0aW9uc0ByaGVuZHJpYy5naXRsYWIudGhlX25hbWVfb2ZfdGhpc19kZXNrdG9wX2Vudmlyb25tZW50Lm9yZyIsCiAgInZlcnNpb24iOiAxCn0="},
@@ -7192,33 +7599,37 @@
     "46": {"version": "4", "sha256": "0j4rhb1qvisw146qf97k6z19m76ks1nb6av4kqann88kk78hinaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIHRvcCBiYXIiLAogICJuYW1lIjogImdCaW5hcnlDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dCaW5hcnlDbG9jayIsCiAgInV1aWQiOiAiZ2JpbmFyeWNsb2NrQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "quick-lofi@eucaue", "name": "Quick Lofi", "pname": "quick-lofi", "description": "Relax to lo-fi tunes with just a click.\n\nYou need MPV and socat for this extension to work.\n\nFedora: sudo dnf install mpv socat\nUbuntu: sudo apt install mpv socat\nArch Linux: sudo pacman -S mpv socat", "link": "https://extensions.gnome.org/extension/6904/quick-lofi/", "shell_version_map": {
-    "46": {"version": "3", "sha256": "0la8s8rpfvnabp599wdrsdkzlyjw1sjvbr0jdf1ldp260famsk77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgYW5kIHNvY2F0IGZvciB0aGlzIGV4dGVuc2lvbiB0byB3b3JrLlxuXG5GZWRvcmE6IHN1ZG8gZG5mIGluc3RhbGwgbXB2IHNvY2F0XG5VYnVudHU6IHN1ZG8gYXB0IGluc3RhbGwgbXB2IHNvY2F0XG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBtcHYgc29jYXQiLAogICJuYW1lIjogIlF1aWNrIExvZmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stbG9maSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWNhdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1aWNrLWxvZmkiLAogICJ1dWlkIjogInF1aWNrLWxvZmlAZXVjYXVlIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "46": {"version": "4", "sha256": "06mp1wpbf4bkfayns0557f1mysrr9m57zrdycyqmgs0x01z8ddg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgYW5kIHNvY2F0IGZvciB0aGlzIGV4dGVuc2lvbiB0byB3b3JrLlxuXG5GZWRvcmE6IHN1ZG8gZG5mIGluc3RhbGwgbXB2IHNvY2F0XG5VYnVudHU6IHN1ZG8gYXB0IGluc3RhbGwgbXB2IHNvY2F0XG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBtcHYgc29jYXQiLAogICJuYW1lIjogIlF1aWNrIExvZmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stbG9maSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWNhdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1aWNrLWxvZmkiLAogICJ1dWlkIjogInF1aWNrLWxvZmlAZXVjYXVlIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
 , {"uuid": "mock-tray@kramo.page", "name": "Mock Tray", "pname": "mock-tray", "description": "Creates an invisible system tray (TopIcons) for apps (like MEGAsync) that won't run properly without one.", "link": "https://extensions.gnome.org/extension/6913/mock-tray/", "shell_version_map": {
     "45": {"version": "2", "sha256": "0vp951zha0d6glda9f7b7yp8cradssj477lymmspx19p0iwz7zcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYW4gaW52aXNpYmxlIHN5c3RlbSB0cmF5IChUb3BJY29ucykgZm9yIGFwcHMgKGxpa2UgTUVHQXN5bmMpIHRoYXQgd29uJ3QgcnVuIHByb3Blcmx5IHdpdGhvdXQgb25lLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAia3JhLW1vIgogIH0sCiAgIm5hbWUiOiAiTW9jayBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vbW9jay10cmF5LyIsCiAgInV1aWQiOiAibW9jay10cmF5QGtyYW1vLnBhZ2UiLAogICJ2ZXJzaW9uIjogMgp9"},
     "46": {"version": "2", "sha256": "0vp951zha0d6glda9f7b7yp8cradssj477lymmspx19p0iwz7zcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYW4gaW52aXNpYmxlIHN5c3RlbSB0cmF5IChUb3BJY29ucykgZm9yIGFwcHMgKGxpa2UgTUVHQXN5bmMpIHRoYXQgd29uJ3QgcnVuIHByb3Blcmx5IHdpdGhvdXQgb25lLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAia3JhLW1vIgogIH0sCiAgIm5hbWUiOiAiTW9jayBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vbW9jay10cmF5LyIsCiAgInV1aWQiOiAibW9jay10cmF5QGtyYW1vLnBhZ2UiLAogICJ2ZXJzaW9uIjogMgp9"}
   }}
 , {"uuid": "portforwarding-extension@SJBERTRAND.github.com", "name": "Port Forwarding Extension", "pname": "port-forwarding-extension", "description": "Extension to enable port forwarding via SSH ", "link": "https://extensions.gnome.org/extension/6919/port-forwarding-extension/", "shell_version_map": {
-    "45": {"version": "1", "sha256": "1xzj9nj12zzc34qdskrpimlcrq37nmhh7wrwvcv05x2s8slr9rjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TSkJFUlRSQU5EL3BvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="},
-    "46": {"version": "1", "sha256": "1xzj9nj12zzc34qdskrpimlcrq37nmhh7wrwvcv05x2s8slr9rjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TSkJFUlRSQU5EL3BvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}
+    "45": {"version": "6", "sha256": "183vdw460nz48s48j902l5yv374smiq8jyayazsq04xr7g1qz1bh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9wb3J0Zm9yd2FyZGluZy1leHRlbnNpb24iLAogICJ1dWlkIjogInBvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
+    "46": {"version": "6", "sha256": "183vdw460nz48s48j902l5yv374smiq8jyayazsq04xr7g1qz1bh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9wb3J0Zm9yd2FyZGluZy1leHRlbnNpb24iLAogICJ1dWlkIjogInBvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
+    "47": {"version": "6", "sha256": "183vdw460nz48s48j902l5yv374smiq8jyayazsq04xr7g1qz1bh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9wb3J0Zm9yd2FyZGluZy1leHRlbnNpb24iLAogICJ1dWlkIjogInBvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbkBTSkJFUlRSQU5ELmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "gravatar@dsheeler.net", "name": "Gravatar", "pname": "gravatar", "description": "Synchronize GNOME Shell user icon with Gravatar.\nThis extension is not affiliated, funded, or in any way associated with Automattic and Gravatar.", "link": "https://extensions.gnome.org/extension/6922/gravatar/", "shell_version_map": {
-    "46": {"version": "4", "sha256": "0f633fqlav4c8gadfw6bn0j8m51r80pgiykrzyzrrp7xxb190vbz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNocm9uaXplIEdOT01FIFNoZWxsIHVzZXIgaWNvbiB3aXRoIEdyYXZhdGFyLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQXV0b21hdHRpYyBhbmQgR3JhdmF0YXIuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkc2hlZWxlciIsCiAgICAibGliZXJhcGF5IjogImRzaGVlbGVyIiwKICAgICJwYXlwYWwiOiAiRGFuaWVsU2hlZWxlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAibmFtZSI6ICJHcmF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ncmF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kc2hlZWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAidXVpZCI6ICJncmF2YXRhckBkc2hlZWxlci5uZXQiLAogICJ2ZXJzaW9uIjogNAp9"}
+    "46": {"version": "5", "sha256": "0j4qam396adbar703rxf3aa04z99l57l6hwgva9957qqdygflsl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNocm9uaXplIEdOT01FIFNoZWxsIHVzZXIgaWNvbiB3aXRoIEdyYXZhdGFyLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQXV0b21hdHRpYyBhbmQgR3JhdmF0YXIuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkc2hlZWxlciIsCiAgICAibGliZXJhcGF5IjogImRzaGVlbGVyIiwKICAgICJwYXlwYWwiOiAiRGFuaWVsU2hlZWxlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAibmFtZSI6ICJHcmF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ncmF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kc2hlZWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAidXVpZCI6ICJncmF2YXRhckBkc2hlZWxlci5uZXQiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "6", "sha256": "1jvvcaiddxg1j0dnnh16p550pwzac8qmimv3am7blj0ji98lzf4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNocm9uaXplIEdOT01FIFNoZWxsIHVzZXIgaWNvbiB3aXRoIEdyYXZhdGFyLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQXV0b21hdHRpYyBhbmQgR3JhdmF0YXIuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkc2hlZWxlciIsCiAgICAibGliZXJhcGF5IjogImRzaGVlbGVyIiwKICAgICJwYXlwYWwiOiAiRGFuaWVsU2hlZWxlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAibmFtZSI6ICJHcmF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ncmF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kc2hlZWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAidXVpZCI6ICJncmF2YXRhckBkc2hlZWxlci5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "wechsel@transistor.local", "name": "Wechsel", "pname": "wechsel", "description": "Organise your computer by replacing user folders with symlinks to project folders.\nThis extension is the user interface for the wechsel cli tool.\n\nWechsel is a simple tool that helps you by creating individual Download, Desktop, ... folders for each project.\nIt replaces the original folders with symlinks to the folders of the current active project.\nLike this the random files you download, will be placed in the Download folder they belong to.\n\nThis Extension depends on the wechsel cli tool, which you can find here: https://github.com/JustSomeRandomUsername/wechsel", "link": "https://extensions.gnome.org/extension/6925/wechsel/", "shell_version_map": {
-    "44": {"version": "5", "sha256": "1212kva3sj9cwiq6nligk62r1am200413lhp2szw6ydj8mj8mnfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "45": {"version": "5", "sha256": "1212kva3sj9cwiq6nligk62r1am200413lhp2szw6ydj8mj8mnfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "46": {"version": "5", "sha256": "1212kva3sj9cwiq6nligk62r1am200413lhp2szw6ydj8mj8mnfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA1Cn0="}
+    "44": {"version": "6", "sha256": "0crdyx67qr0kq052jxy27sfdxzr03vv1pf8xnc8i4az473qj8d1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "45": {"version": "6", "sha256": "0crdyx67qr0kq052jxy27sfdxzr03vv1pf8xnc8i4az473qj8d1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "46": {"version": "6", "sha256": "0crdyx67qr0kq052jxy27sfdxzr03vv1pf8xnc8i4az473qj8d1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
 , {"uuid": "boostvolume@shaquib.dev", "name": "Boost Volume", "pname": "boost-volume", "description": "Boosts volume above limits", "link": "https://extensions.gnome.org/extension/6928/boost-volume/", "shell_version_map": {
     "46": {"version": "7", "sha256": "1zi0bgkvj99x5w1pgfinp83i4cr0hqf7x2wfjafdck6jzbn1qchn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJvb3N0cyB2b2x1bWUgYWJvdmUgbGltaXRzIiwKICAibmFtZSI6ICJCb29zdCBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hhcXVpYmltZGFkL2dub21lX2V4dF92b2x1bWVfYm9vc3QiLAogICJ1dWlkIjogImJvb3N0dm9sdW1lQHNoYXF1aWIuZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "media-progress@krypion17", "name": "Media Progress", "pname": "media-progress", "description": "Progress Bar for the GNOME Media Notification", "link": "https://extensions.gnome.org/extension/6940/media-progress/", "shell_version_map": {
-    "46": {"version": "15", "sha256": "1f76xwqga9zcarq8s538aywnmaqfjbykvr2hj5f2d3zcwv6jzizf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS3J5cGlvbjE3L21lZGlhLXByb2dyZXNzIiwKICAidXVpZCI6ICJtZWRpYS1wcm9ncmVzc0BrcnlwaW9uMTciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
+    "46": {"version": "15", "sha256": "1f76xwqga9zcarq8s538aywnmaqfjbykvr2hj5f2d3zcwv6jzizf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS3J5cGlvbjE3L21lZGlhLXByb2dyZXNzIiwKICAidXVpZCI6ICJtZWRpYS1wcm9ncmVzc0BrcnlwaW9uMTciLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "17", "sha256": "1fx1z2ihrgz48hzjq27lq7q8fvjwlq2fhx8q4f01ald5nh382kaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS3J5cGlvbjE3L21lZGlhLXByb2dyZXNzIiwKICAidXVpZCI6ICJtZWRpYS1wcm9ncmVzc0BrcnlwaW9uMTciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}
   }}
 , {"uuid": "autohide-battery-percentage@rukins.github.io", "name": "Autohide Battery Percentage", "pname": "autohide-battery-percentage", "description": "GNOME Shell extension to hide the battery percentage in the top panel, if the computer is plugged in or power saving is disabled", "link": "https://extensions.gnome.org/extension/6943/autohide-battery-percentage/", "shell_version_map": {
-    "45": {"version": "7", "sha256": "0v8vlkz67hshcb6c5j192xal47f5vd30l05czygngwq5gzsg0n2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBoaWRlIHRoZSBiYXR0ZXJ5IHBlcmNlbnRhZ2UgaW4gdGhlIHRvcCBwYW5lbCwgaWYgdGhlIGNvbXB1dGVyIGlzIHBsdWdnZWQgaW4gb3IgcG93ZXIgc2F2aW5nIGlzIGRpc2FibGVkIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkgUGVyY2VudGFnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J1a2lucy9hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnktcGVyY2VudGFnZUBydWtpbnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "46": {"version": "7", "sha256": "0v8vlkz67hshcb6c5j192xal47f5vd30l05czygngwq5gzsg0n2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBoaWRlIHRoZSBiYXR0ZXJ5IHBlcmNlbnRhZ2UgaW4gdGhlIHRvcCBwYW5lbCwgaWYgdGhlIGNvbXB1dGVyIGlzIHBsdWdnZWQgaW4gb3IgcG93ZXIgc2F2aW5nIGlzIGRpc2FibGVkIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkgUGVyY2VudGFnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J1a2lucy9hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnktcGVyY2VudGFnZUBydWtpbnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "45": {"version": "8", "sha256": "0gdhh44ph1xkm7bn1qmibbi47q675pyswb5ymddfzdfj398axg0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBoaWRlIHRoZSBiYXR0ZXJ5IHBlcmNlbnRhZ2UgaW4gdGhlIHRvcCBwYW5lbCwgaWYgdGhlIGNvbXB1dGVyIGlzIHBsdWdnZWQgaW4gb3IgcG93ZXIgc2F2aW5nIGlzIGRpc2FibGVkIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkgUGVyY2VudGFnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydWtpbnMvYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlIiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2VAcnVraW5zLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "46": {"version": "8", "sha256": "0gdhh44ph1xkm7bn1qmibbi47q675pyswb5ymddfzdfj398axg0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBoaWRlIHRoZSBiYXR0ZXJ5IHBlcmNlbnRhZ2UgaW4gdGhlIHRvcCBwYW5lbCwgaWYgdGhlIGNvbXB1dGVyIGlzIHBsdWdnZWQgaW4gb3IgcG93ZXIgc2F2aW5nIGlzIGRpc2FibGVkIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkgUGVyY2VudGFnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydWtpbnMvYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlIiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2VAcnVraW5zLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "47": {"version": "8", "sha256": "0gdhh44ph1xkm7bn1qmibbi47q675pyswb5ymddfzdfj398axg0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBoaWRlIHRoZSBiYXR0ZXJ5IHBlcmNlbnRhZ2UgaW4gdGhlIHRvcCBwYW5lbCwgaWYgdGhlIGNvbXB1dGVyIGlzIHBsdWdnZWQgaW4gb3IgcG93ZXIgc2F2aW5nIGlzIGRpc2FibGVkIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkgUGVyY2VudGFnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydWtpbnMvYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlIiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2VAcnVraW5zLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
 , {"uuid": "moveclock@kuvaus.org", "name": "moveclock", "pname": "moveclock", "description": "Move the clock to right side of the panel", "link": "https://extensions.gnome.org/extension/6949/moveclock/", "shell_version_map": {
     "46": {"version": "5", "sha256": "0lmvnrms8kg0cir6wkaj7sicn5ms9lx9mqh4z7pbh8gfr135n5v9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHJpZ2h0IHNpZGUgb2YgdGhlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibW92ZWNsb2NrIiwKICAibmFtZSI6ICJtb3ZlY2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW92ZWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2t1dmF1cy9tb3ZlY2xvY2siLAogICJ1dWlkIjogIm1vdmVjbG9ja0BrdXZhdXMub3JnIiwKICAidmVyc2lvbiI6IDUKfQ=="}
@@ -7228,7 +7639,8 @@
     "46": {"version": "18", "sha256": "00rd0agc7bhn6r3nd65pvxv5qj1f71a7ah0qfkkrfik7lxq6xg5x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGluZm8gYWJvdXQ6IENQVSh1c2FnZSwgY2xvY2ssIHRlbXApLCBSQU0oZnJlZSwgdXNlZCkgYW5kIE5FVCAoZG93bmxvYWQsIHVwbG9hZCkgb24gR05PTUUgU0hFTEwgU3lzdGVtIFRyYXkgKFRvcCBCYXIpXG5cblRlc3RlZCBvbiBHTk9NRSBTaGVsbCA0NlxuTWF5IFdvcmsgb24gR05PTUUgU2hlbGwgNDUiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V6eXdheS9SZXpNb24iLAogICJ1dWlkIjogInJlem1vbkBhenoubG9sIiwKICAidmVyc2lvbiI6IDE4Cn0="}
   }}
 , {"uuid": "drive-activity-indicator@marcosdalvarez.org", "name": "Drive Activity Indicator", "pname": "drive-activity-indicator", "description": "Visualize the activity of storage drives (disk activity LED simulator).", "link": "https://extensions.gnome.org/extension/6955/drive-activity-indicator/", "shell_version_map": {
-    "46": {"version": "2", "sha256": "1p2csc5jdk37qwiqb2ylkqzz3fmbmw9vqik9yv109yqk0zpzbz2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGl6ZSB0aGUgYWN0aXZpdHkgb2Ygc3RvcmFnZSBkcml2ZXMgKGRpc2sgYWN0aXZpdHkgTEVEIHNpbXVsYXRvcikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgIm5hbWUiOiAiRHJpdmUgQWN0aXZpdHkgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLWFjdGl2aXR5LWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei9kcml2ZS1hY3Rpdml0eS1pbmRpY2F0b3ItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkcml2ZS1hY3Rpdml0eS1pbmRpY2F0b3JAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+    "46": {"version": "4", "sha256": "1y1251lkzaf6cnj9ic2nd9mxk0imwsvvp3w8lafg6x945h5n0lfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGl6ZSB0aGUgYWN0aXZpdHkgb2Ygc3RvcmFnZSBkcml2ZXMgKGRpc2sgYWN0aXZpdHkgTEVEIHNpbXVsYXRvcikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgIm5hbWUiOiAiRHJpdmUgQWN0aXZpdHkgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLWFjdGl2aXR5LWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1y1251lkzaf6cnj9ic2nd9mxk0imwsvvp3w8lafg6x945h5n0lfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGl6ZSB0aGUgYWN0aXZpdHkgb2Ygc3RvcmFnZSBkcml2ZXMgKGRpc2sgYWN0aXZpdHkgTEVEIHNpbXVsYXRvcikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgIm5hbWUiOiAiRHJpdmUgQWN0aXZpdHkgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLWFjdGl2aXR5LWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZHJpdmUtYWN0aXZpdHktaW5kaWNhdG9yQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "usd-rub-er-gse@c0mr8.github.com", "name": "USD to RUB viewer", "pname": "usd-to-rub-viewer", "description": "That simple extension shows USD to Russian RUB exchange rate on the left center part of Gnome top panel. Exchange rate updates every 30 seconds. Compatible with Gnome 45-46. This extension is using economia.awesomeapi.com.br. It is a fork of usd-try.", "link": "https://extensions.gnome.org/extension/6958/usd-to-rub-viewer/", "shell_version_map": {
     "45": {"version": "4", "sha256": "1c5jdfyz2m7vn6h82qbdbc6bmi86yzxcdqa1rq55kh124cjx88kq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoYXQgc2ltcGxlIGV4dGVuc2lvbiBzaG93cyBVU0QgdG8gUnVzc2lhbiBSVUIgZXhjaGFuZ2UgcmF0ZSBvbiB0aGUgbGVmdCBjZW50ZXIgcGFydCBvZiBHbm9tZSB0b3AgcGFuZWwuIEV4Y2hhbmdlIHJhdGUgdXBkYXRlcyBldmVyeSAzMCBzZWNvbmRzLiBDb21wYXRpYmxlIHdpdGggR25vbWUgNDUtNDYuIFRoaXMgZXh0ZW5zaW9uIGlzIHVzaW5nIGVjb25vbWlhLmF3ZXNvbWVhcGkuY29tLmJyLiBJdCBpcyBhIGZvcmsgb2YgdXNkLXRyeS4iLAogICJuYW1lIjogIlVTRCB0byBSVUIgdmlld2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb21yOC9VU0QtUlVCLUVSLUdTRSIsCiAgInV1aWQiOiAidXNkLXJ1Yi1lci1nc2VAYzBtcjguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -7241,45 +7653,55 @@
     "45": {"version": "1", "sha256": "1i7ig9jpcdd7nmk5l7zvk7y5bx7yk1m7679x0awzbr84yxchyrly", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBvciBoaWRlIGNsb2NrIGZyb20gdG9wIHBhbmVsLiIsCiAgIm5hbWUiOiAiUmVtb3ZlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdWRmaXNoL0hpZGUtQ2xvY2stRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJyZW1vdmVjbG9ja0BzdWRmaXNoLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="},
     "46": {"version": "1", "sha256": "1i7ig9jpcdd7nmk5l7zvk7y5bx7yk1m7679x0awzbr84yxchyrly", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBvciBoaWRlIGNsb2NrIGZyb20gdG9wIHBhbmVsLiIsCiAgIm5hbWUiOiAiUmVtb3ZlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdWRmaXNoL0hpZGUtQ2xvY2stRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJyZW1vdmVjbG9ja0BzdWRmaXNoLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}
   }}
-, {"uuid": "wintile-beyond@GrylledCheez.xyz", "name": "WinTile-Beyond", "pname": "wintile-beyond", "description": "This is a continuation of Wintile by @FmStrat.  The original version was abandoned after Gnome 44. This version works on Gnome 45 and 46.\n\nWinTile-Beyond is a hotkey driven window tiling system for GNOME that imitates the standard Win-Arrow keys of Windows 10, allowing you to maximize, maximize to sides, or 1/4 sized to corner across a single or multiple monitors using just Super+Arrow.\n\nWinTile-Beyond also supports:\n- 1-5 columns and 1-5 rows for standard or ultrawide monitors\n- Top/bottom half support\n- Mouse preview and snapping for placing windows\n- 'Maximize' mode, which adds/removes GNOME animations\n- 'Ultrawide-only' mode, to allow standard screens to have different cols/row than ultrawides\n- Portrait screens will automatically swap columns and rows\n- Add gaps around tiles to avoid the 'crowded elevator' feeling'\n- Ctrl+Super+Arrow to grow a tile in that direction if space is available\n- Ctrl+drag to drop a tile in a specific spot\n- Ctrl+Super+drag to draw a grid for the new tile", "link": "https://extensions.gnome.org/extension/6970/wintile-beyond/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "1zld2ry18md7yjjiqmcrqw8ygy4r50lrc50cx8qga3wjcj68zpfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpblRpbGUtQmV5b25kIGlzIGEgaG90a2V5IGRyaXZlbiB3aW5kb3cgdGlsaW5nIHN5c3RlbSBmb3IgR05PTUUgdGhhdCBpbWl0YXRlcyB0aGUgc3RhbmRhcmQgV2luLUFycm93IGtleXMgb2YgV2luZG93cyAxMCwgYWxsb3dpbmcgeW91IHRvIG1heGltaXplLCBtYXhpbWl6ZSB0byBzaWRlcywgb3IgMS80IHNpemVkIHRvIGNvcm5lciBhY3Jvc3MgYSBzaW5nbGUgb3IgbXVsdGlwbGUgbW9uaXRvcnMgdXNpbmcganVzdCBTdXBlcitBcnJvdy5cblxuQXMgb2YgdjE3LCBXaW5UaWxlLUJleW9uZCBhbHNvIHN1cHBvcnRzOlxuLSAxLTUgY29sdW1ucyBhbmQgMS01IHJvd3MgZm9yIHN0YW5kYXJkIG9yIHVsdHJhd2lkZSBtb25pdG9yc1xuLSBUb3AvYm90dG9tIGhhbGYgc3VwcG9ydFxuLSBNb3VzZSBwcmV2aWV3IGFuZCBzbmFwcGluZyBmb3IgcGxhY2luZyB3aW5kb3dzXG4tICdNYXhpbWl6ZScgbW9kZSwgd2hpY2ggYWRkcy9yZW1vdmVzIEdOT01FIGFuaW1hdGlvbnNcbi0gJ1VsdHJhd2lkZS1vbmx5JyBtb2RlLCB0byBhbGxvdyBzdGFuZGFyZCBzY3JlZW5zIHRvIGhhdmUgZGlmZmVyZW50IGNvbHMvcm93IHRoYW4gdWx0cmF3aWRlc1xuLSBQb3J0cmFpdCBzY3JlZW5zIHdpbGwgYXV0b21hdGljYWxseSBzd2FwIGNvbHVtbnMgYW5kIHJvd3Ncbi0gQWRkIGdhcHMgYXJvdW5kIHRpbGVzIHRvIGF2b2lkIHRoZSAnY3Jvd2RlZCBlbGV2YXRvcicgZmVlbGluZydcbi0gQ3RybCtTdXBlcitBcnJvdyB0byBncm93IGEgdGlsZSBpbiB0aGF0IGRpcmVjdGlvbiBpZiBzcGFjZSBpcyBhdmFpbGFibGVcbi0gQ3RybCtkcmFnIHRvIGRyb3AgYSB0aWxlIGluIGEgc3BlY2lmaWMgc3BvdFxuLSBDdHJsK1N1cGVyK2RyYWcgdG8gZHJhdyBhIGdyaWQgZm9yIHRoZSBuZXcgdGlsZSIsCiAgIm5hbWUiOiAiV2luVGlsZS1CZXlvbmQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2ludGlsZS1iZXlvbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dyeWxsZWRDaGVlei93aW50aWxlLWJleW9uZCIsCiAgInV1aWQiOiAid2ludGlsZS1iZXlvbmRAR3J5bGxlZENoZWV6Lnh5eiIsCiAgInZlcnNpb24iOiAyCn0="},
-    "46": {"version": "2", "sha256": "1zld2ry18md7yjjiqmcrqw8ygy4r50lrc50cx8qga3wjcj68zpfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpblRpbGUtQmV5b25kIGlzIGEgaG90a2V5IGRyaXZlbiB3aW5kb3cgdGlsaW5nIHN5c3RlbSBmb3IgR05PTUUgdGhhdCBpbWl0YXRlcyB0aGUgc3RhbmRhcmQgV2luLUFycm93IGtleXMgb2YgV2luZG93cyAxMCwgYWxsb3dpbmcgeW91IHRvIG1heGltaXplLCBtYXhpbWl6ZSB0byBzaWRlcywgb3IgMS80IHNpemVkIHRvIGNvcm5lciBhY3Jvc3MgYSBzaW5nbGUgb3IgbXVsdGlwbGUgbW9uaXRvcnMgdXNpbmcganVzdCBTdXBlcitBcnJvdy5cblxuQXMgb2YgdjE3LCBXaW5UaWxlLUJleW9uZCBhbHNvIHN1cHBvcnRzOlxuLSAxLTUgY29sdW1ucyBhbmQgMS01IHJvd3MgZm9yIHN0YW5kYXJkIG9yIHVsdHJhd2lkZSBtb25pdG9yc1xuLSBUb3AvYm90dG9tIGhhbGYgc3VwcG9ydFxuLSBNb3VzZSBwcmV2aWV3IGFuZCBzbmFwcGluZyBmb3IgcGxhY2luZyB3aW5kb3dzXG4tICdNYXhpbWl6ZScgbW9kZSwgd2hpY2ggYWRkcy9yZW1vdmVzIEdOT01FIGFuaW1hdGlvbnNcbi0gJ1VsdHJhd2lkZS1vbmx5JyBtb2RlLCB0byBhbGxvdyBzdGFuZGFyZCBzY3JlZW5zIHRvIGhhdmUgZGlmZmVyZW50IGNvbHMvcm93IHRoYW4gdWx0cmF3aWRlc1xuLSBQb3J0cmFpdCBzY3JlZW5zIHdpbGwgYXV0b21hdGljYWxseSBzd2FwIGNvbHVtbnMgYW5kIHJvd3Ncbi0gQWRkIGdhcHMgYXJvdW5kIHRpbGVzIHRvIGF2b2lkIHRoZSAnY3Jvd2RlZCBlbGV2YXRvcicgZmVlbGluZydcbi0gQ3RybCtTdXBlcitBcnJvdyB0byBncm93IGEgdGlsZSBpbiB0aGF0IGRpcmVjdGlvbiBpZiBzcGFjZSBpcyBhdmFpbGFibGVcbi0gQ3RybCtkcmFnIHRvIGRyb3AgYSB0aWxlIGluIGEgc3BlY2lmaWMgc3BvdFxuLSBDdHJsK1N1cGVyK2RyYWcgdG8gZHJhdyBhIGdyaWQgZm9yIHRoZSBuZXcgdGlsZSIsCiAgIm5hbWUiOiAiV2luVGlsZS1CZXlvbmQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2ludGlsZS1iZXlvbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dyeWxsZWRDaGVlei93aW50aWxlLWJleW9uZCIsCiAgInV1aWQiOiAid2ludGlsZS1iZXlvbmRAR3J5bGxlZENoZWV6Lnh5eiIsCiAgInZlcnNpb24iOiAyCn0="}
+, {"uuid": "wintile-beyond@GrylledCheez.xyz", "name": "WinTile-Beyond", "pname": "wintile-beyond", "description": "This is a continuation of Wintile by @FmStrat.  The original version was abandoned after Gnome 44.\n\nWinTile-Beyond is a hotkey driven window tiling system for GNOME that imitates the standard Win-Arrow keys of Windows 10, allowing you to maximize, maximize to sides, or 1/4 sized to corner across a single or multiple monitors using just Super+Arrow.\n\nWinTile-Beyond also supports:\n- 1-5 columns and 1-5 rows for standard or ultrawide monitors\n- Top/bottom half support\n- Mouse preview and snapping for placing windows\n- 'Maximize' mode, which adds/removes GNOME animations\n- 'Ultrawide-only' mode, to allow standard screens to have different cols/row than ultrawides\n- Portrait screens will automatically swap columns and rows\n- Add gaps around tiles to avoid the 'crowded elevator' feeling'\n- Ctrl+Super+Arrow to grow a tile in that direction if space is available\n- Ctrl+drag to drop a tile in a specific spot\n- Ctrl+Super+drag to draw a grid for the new tile", "link": "https://extensions.gnome.org/extension/6970/wintile-beyond/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "1z195wc1vr8szjq61wps5hbcmkbnz9qbw3wd9a5l61gc62yc25sj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBjb250aW51YXRpb24gb2YgV2ludGlsZSBieSBARm1TdHJhdC4gIFRoZSBvcmlnaW5hbCB2ZXJzaW9uIHdhcyBhYmFuZG9uZWQgYWZ0ZXIgR25vbWUgNDQuXG5cbldpblRpbGUtQmV5b25kIGlzIGEgaG90a2V5IGRyaXZlbiB3aW5kb3cgdGlsaW5nIHN5c3RlbSBmb3IgR05PTUUgdGhhdCBpbWl0YXRlcyB0aGUgc3RhbmRhcmQgV2luLUFycm93IGtleXMgb2YgV2luZG93cyAxMCwgYWxsb3dpbmcgeW91IHRvIG1heGltaXplLCBtYXhpbWl6ZSB0byBzaWRlcywgb3IgMS80IHNpemVkIHRvIGNvcm5lciBhY3Jvc3MgYSBzaW5nbGUgb3IgbXVsdGlwbGUgbW9uaXRvcnMgdXNpbmcganVzdCBTdXBlcitBcnJvdy5cblxuV2luVGlsZS1CZXlvbmQgYWxzbyBzdXBwb3J0czpcbi0gMS01IGNvbHVtbnMgYW5kIDEtNSByb3dzIGZvciBzdGFuZGFyZCBvciB1bHRyYXdpZGUgbW9uaXRvcnNcbi0gVG9wL2JvdHRvbSBoYWxmIHN1cHBvcnRcbi0gTW91c2UgcHJldmlldyBhbmQgc25hcHBpbmcgZm9yIHBsYWNpbmcgd2luZG93c1xuLSAnTWF4aW1pemUnIG1vZGUsIHdoaWNoIGFkZHMvcmVtb3ZlcyBHTk9NRSBhbmltYXRpb25zXG4tICdVbHRyYXdpZGUtb25seScgbW9kZSwgdG8gYWxsb3cgc3RhbmRhcmQgc2NyZWVucyB0byBoYXZlIGRpZmZlcmVudCBjb2xzL3JvdyB0aGFuIHVsdHJhd2lkZXNcbi0gUG9ydHJhaXQgc2NyZWVucyB3aWxsIGF1dG9tYXRpY2FsbHkgc3dhcCBjb2x1bW5zIGFuZCByb3dzXG4tIEFkZCBnYXBzIGFyb3VuZCB0aWxlcyB0byBhdm9pZCB0aGUgJ2Nyb3dkZWQgZWxldmF0b3InIGZlZWxpbmcnXG4tIEN0cmwrU3VwZXIrQXJyb3cgdG8gZ3JvdyBhIHRpbGUgaW4gdGhhdCBkaXJlY3Rpb24gaWYgc3BhY2UgaXMgYXZhaWxhYmxlXG4tIEN0cmwrZHJhZyB0byBkcm9wIGEgdGlsZSBpbiBhIHNwZWNpZmljIHNwb3Rcbi0gQ3RybCtTdXBlcitkcmFnIHRvIGRyYXcgYSBncmlkIGZvciB0aGUgbmV3IHRpbGUiLAogICJuYW1lIjogIldpblRpbGUtQmV5b25kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbnRpbGUtYmV5b25kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3J5bGxlZENoZWV6L3dpbnRpbGUtYmV5b25kIiwKICAidXVpZCI6ICJ3aW50aWxlLWJleW9uZEBHcnlsbGVkQ2hlZXoueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "46": {"version": "3", "sha256": "1z195wc1vr8szjq61wps5hbcmkbnz9qbw3wd9a5l61gc62yc25sj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBjb250aW51YXRpb24gb2YgV2ludGlsZSBieSBARm1TdHJhdC4gIFRoZSBvcmlnaW5hbCB2ZXJzaW9uIHdhcyBhYmFuZG9uZWQgYWZ0ZXIgR25vbWUgNDQuXG5cbldpblRpbGUtQmV5b25kIGlzIGEgaG90a2V5IGRyaXZlbiB3aW5kb3cgdGlsaW5nIHN5c3RlbSBmb3IgR05PTUUgdGhhdCBpbWl0YXRlcyB0aGUgc3RhbmRhcmQgV2luLUFycm93IGtleXMgb2YgV2luZG93cyAxMCwgYWxsb3dpbmcgeW91IHRvIG1heGltaXplLCBtYXhpbWl6ZSB0byBzaWRlcywgb3IgMS80IHNpemVkIHRvIGNvcm5lciBhY3Jvc3MgYSBzaW5nbGUgb3IgbXVsdGlwbGUgbW9uaXRvcnMgdXNpbmcganVzdCBTdXBlcitBcnJvdy5cblxuV2luVGlsZS1CZXlvbmQgYWxzbyBzdXBwb3J0czpcbi0gMS01IGNvbHVtbnMgYW5kIDEtNSByb3dzIGZvciBzdGFuZGFyZCBvciB1bHRyYXdpZGUgbW9uaXRvcnNcbi0gVG9wL2JvdHRvbSBoYWxmIHN1cHBvcnRcbi0gTW91c2UgcHJldmlldyBhbmQgc25hcHBpbmcgZm9yIHBsYWNpbmcgd2luZG93c1xuLSAnTWF4aW1pemUnIG1vZGUsIHdoaWNoIGFkZHMvcmVtb3ZlcyBHTk9NRSBhbmltYXRpb25zXG4tICdVbHRyYXdpZGUtb25seScgbW9kZSwgdG8gYWxsb3cgc3RhbmRhcmQgc2NyZWVucyB0byBoYXZlIGRpZmZlcmVudCBjb2xzL3JvdyB0aGFuIHVsdHJhd2lkZXNcbi0gUG9ydHJhaXQgc2NyZWVucyB3aWxsIGF1dG9tYXRpY2FsbHkgc3dhcCBjb2x1bW5zIGFuZCByb3dzXG4tIEFkZCBnYXBzIGFyb3VuZCB0aWxlcyB0byBhdm9pZCB0aGUgJ2Nyb3dkZWQgZWxldmF0b3InIGZlZWxpbmcnXG4tIEN0cmwrU3VwZXIrQXJyb3cgdG8gZ3JvdyBhIHRpbGUgaW4gdGhhdCBkaXJlY3Rpb24gaWYgc3BhY2UgaXMgYXZhaWxhYmxlXG4tIEN0cmwrZHJhZyB0byBkcm9wIGEgdGlsZSBpbiBhIHNwZWNpZmljIHNwb3Rcbi0gQ3RybCtTdXBlcitkcmFnIHRvIGRyYXcgYSBncmlkIGZvciB0aGUgbmV3IHRpbGUiLAogICJuYW1lIjogIldpblRpbGUtQmV5b25kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbnRpbGUtYmV5b25kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3J5bGxlZENoZWV6L3dpbnRpbGUtYmV5b25kIiwKICAidXVpZCI6ICJ3aW50aWxlLWJleW9uZEBHcnlsbGVkQ2hlZXoueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "3", "sha256": "1z195wc1vr8szjq61wps5hbcmkbnz9qbw3wd9a5l61gc62yc25sj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBjb250aW51YXRpb24gb2YgV2ludGlsZSBieSBARm1TdHJhdC4gIFRoZSBvcmlnaW5hbCB2ZXJzaW9uIHdhcyBhYmFuZG9uZWQgYWZ0ZXIgR25vbWUgNDQuXG5cbldpblRpbGUtQmV5b25kIGlzIGEgaG90a2V5IGRyaXZlbiB3aW5kb3cgdGlsaW5nIHN5c3RlbSBmb3IgR05PTUUgdGhhdCBpbWl0YXRlcyB0aGUgc3RhbmRhcmQgV2luLUFycm93IGtleXMgb2YgV2luZG93cyAxMCwgYWxsb3dpbmcgeW91IHRvIG1heGltaXplLCBtYXhpbWl6ZSB0byBzaWRlcywgb3IgMS80IHNpemVkIHRvIGNvcm5lciBhY3Jvc3MgYSBzaW5nbGUgb3IgbXVsdGlwbGUgbW9uaXRvcnMgdXNpbmcganVzdCBTdXBlcitBcnJvdy5cblxuV2luVGlsZS1CZXlvbmQgYWxzbyBzdXBwb3J0czpcbi0gMS01IGNvbHVtbnMgYW5kIDEtNSByb3dzIGZvciBzdGFuZGFyZCBvciB1bHRyYXdpZGUgbW9uaXRvcnNcbi0gVG9wL2JvdHRvbSBoYWxmIHN1cHBvcnRcbi0gTW91c2UgcHJldmlldyBhbmQgc25hcHBpbmcgZm9yIHBsYWNpbmcgd2luZG93c1xuLSAnTWF4aW1pemUnIG1vZGUsIHdoaWNoIGFkZHMvcmVtb3ZlcyBHTk9NRSBhbmltYXRpb25zXG4tICdVbHRyYXdpZGUtb25seScgbW9kZSwgdG8gYWxsb3cgc3RhbmRhcmQgc2NyZWVucyB0byBoYXZlIGRpZmZlcmVudCBjb2xzL3JvdyB0aGFuIHVsdHJhd2lkZXNcbi0gUG9ydHJhaXQgc2NyZWVucyB3aWxsIGF1dG9tYXRpY2FsbHkgc3dhcCBjb2x1bW5zIGFuZCByb3dzXG4tIEFkZCBnYXBzIGFyb3VuZCB0aWxlcyB0byBhdm9pZCB0aGUgJ2Nyb3dkZWQgZWxldmF0b3InIGZlZWxpbmcnXG4tIEN0cmwrU3VwZXIrQXJyb3cgdG8gZ3JvdyBhIHRpbGUgaW4gdGhhdCBkaXJlY3Rpb24gaWYgc3BhY2UgaXMgYXZhaWxhYmxlXG4tIEN0cmwrZHJhZyB0byBkcm9wIGEgdGlsZSBpbiBhIHNwZWNpZmljIHNwb3Rcbi0gQ3RybCtTdXBlcitkcmFnIHRvIGRyYXcgYSBncmlkIGZvciB0aGUgbmV3IHRpbGUiLAogICJuYW1lIjogIldpblRpbGUtQmV5b25kIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbnRpbGUtYmV5b25kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3J5bGxlZENoZWV6L3dpbnRpbGUtYmV5b25kIiwKICAidXVpZCI6ICJ3aW50aWxlLWJleW9uZEBHcnlsbGVkQ2hlZXoueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
 , {"uuid": "remove-world-clocks@codemacabre.com", "name": "Remove World Clocks", "pname": "remove-world-clocks", "description": "GNOME shell extension to remove world clocks from the date menu", "link": "https://extensions.gnome.org/extension/6973/remove-world-clocks/", "shell_version_map": {
-    "45": {"version": "1", "sha256": "1xn0n8mckv2nr37m4rr4ml5spaq5iq7adq2vzszksc4flcblmgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byByZW1vdmUgd29ybGQgY2xvY2tzIGZyb20gdGhlIGRhdGUgbWVudSIsCiAgIm5hbWUiOiAiUmVtb3ZlIFdvcmxkIENsb2NrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kZW1hY2FicmUvcmVtb3ZlLXdvcmxkLWNsb2NrcyIsCiAgInV1aWQiOiAicmVtb3ZlLXdvcmxkLWNsb2Nrc0Bjb2RlbWFjYWJyZS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
-    "46": {"version": "1", "sha256": "1xn0n8mckv2nr37m4rr4ml5spaq5iq7adq2vzszksc4flcblmgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byByZW1vdmUgd29ybGQgY2xvY2tzIGZyb20gdGhlIGRhdGUgbWVudSIsCiAgIm5hbWUiOiAiUmVtb3ZlIFdvcmxkIENsb2NrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kZW1hY2FicmUvcmVtb3ZlLXdvcmxkLWNsb2NrcyIsCiAgInV1aWQiOiAicmVtb3ZlLXdvcmxkLWNsb2Nrc0Bjb2RlbWFjYWJyZS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}
+    "45": {"version": "2", "sha256": "1bqjca9cnrii44pir7kq9782i5x2sycmc7p3iv4v6x6hff4i9w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byByZW1vdmUgd29ybGQgY2xvY2tzIGZyb20gdGhlIGRhdGUgbWVudSIsCiAgIm5hbWUiOiAiUmVtb3ZlIFdvcmxkIENsb2NrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZGVtYWNhYnJlL3JlbW92ZS13b3JsZC1jbG9ja3MiLAogICJ1dWlkIjogInJlbW92ZS13b3JsZC1jbG9ja3NAY29kZW1hY2FicmUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "46": {"version": "2", "sha256": "1bqjca9cnrii44pir7kq9782i5x2sycmc7p3iv4v6x6hff4i9w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byByZW1vdmUgd29ybGQgY2xvY2tzIGZyb20gdGhlIGRhdGUgbWVudSIsCiAgIm5hbWUiOiAiUmVtb3ZlIFdvcmxkIENsb2NrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZGVtYWNhYnJlL3JlbW92ZS13b3JsZC1jbG9ja3MiLAogICJ1dWlkIjogInJlbW92ZS13b3JsZC1jbG9ja3NAY29kZW1hY2FicmUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "47": {"version": "2", "sha256": "1bqjca9cnrii44pir7kq9782i5x2sycmc7p3iv4v6x6hff4i9w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byByZW1vdmUgd29ybGQgY2xvY2tzIGZyb20gdGhlIGRhdGUgbWVudSIsCiAgIm5hbWUiOiAiUmVtb3ZlIFdvcmxkIENsb2NrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZGVtYWNhYnJlL3JlbW92ZS13b3JsZC1jbG9ja3MiLAogICJ1dWlkIjogInJlbW92ZS13b3JsZC1jbG9ja3NAY29kZW1hY2FicmUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "vscode-search-provider@mrmarble.github.com", "name": "VSCode Search Provider", "pname": "vscode-search-provider", "description": "Search for your vscode workspaces easily. Supports insiders and vscodium. This extension is not affiliated, funded, or in any way associated with Microsoft and vscode software.", "link": "https://extensions.gnome.org/extension/6976/vscode-search-provider/", "shell_version_map": {
-    "45": {"version": "10", "sha256": "17q9dyq15b4nczlm5gcz8gwj0wl2sp6hgpa27g7nzgxg5f0k9xd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciB2c2NvZGUgd29ya3NwYWNlcyBlYXNpbHkuIFN1cHBvcnRzIGluc2lkZXJzIGFuZCB2c2NvZGl1bS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCB2c2NvZGUgc29mdHdhcmUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtcm1hcmJsZSIKICB9LAogICJuYW1lIjogIlZTQ29kZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXJtYXJibGUvdnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAidnNjb2RlLXNlYXJjaC1wcm92aWRlckBtcm1hcmJsZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "46": {"version": "10", "sha256": "17q9dyq15b4nczlm5gcz8gwj0wl2sp6hgpa27g7nzgxg5f0k9xd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciB2c2NvZGUgd29ya3NwYWNlcyBlYXNpbHkuIFN1cHBvcnRzIGluc2lkZXJzIGFuZCB2c2NvZGl1bS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCB2c2NvZGUgc29mdHdhcmUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtcm1hcmJsZSIKICB9LAogICJuYW1lIjogIlZTQ29kZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXJtYXJibGUvdnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAidnNjb2RlLXNlYXJjaC1wcm92aWRlckBtcm1hcmJsZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}
+    "45": {"version": "11", "sha256": "06ngqprsd2ycd709k7x44rci5pibqv04l7ffm9wxhfn9hfzbsiji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciB2c2NvZGUgd29ya3NwYWNlcyBlYXNpbHkuIFN1cHBvcnRzIGluc2lkZXJzIGFuZCB2c2NvZGl1bS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCB2c2NvZGUgc29mdHdhcmUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtcm1hcmJsZSIKICB9LAogICJuYW1lIjogIlZTQ29kZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21ybWFyYmxlL3ZzY29kZS1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogInZzY29kZS1zZWFyY2gtcHJvdmlkZXJAbXJtYXJibGUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "46": {"version": "11", "sha256": "06ngqprsd2ycd709k7x44rci5pibqv04l7ffm9wxhfn9hfzbsiji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciB2c2NvZGUgd29ya3NwYWNlcyBlYXNpbHkuIFN1cHBvcnRzIGluc2lkZXJzIGFuZCB2c2NvZGl1bS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCB2c2NvZGUgc29mdHdhcmUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtcm1hcmJsZSIKICB9LAogICJuYW1lIjogIlZTQ29kZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21ybWFyYmxlL3ZzY29kZS1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogInZzY29kZS1zZWFyY2gtcHJvdmlkZXJAbXJtYXJibGUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "47": {"version": "11", "sha256": "06ngqprsd2ycd709k7x44rci5pibqv04l7ffm9wxhfn9hfzbsiji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciB2c2NvZGUgd29ya3NwYWNlcyBlYXNpbHkuIFN1cHBvcnRzIGluc2lkZXJzIGFuZCB2c2NvZGl1bS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCB2c2NvZGUgc29mdHdhcmUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtcm1hcmJsZSIKICB9LAogICJuYW1lIjogIlZTQ29kZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21ybWFyYmxlL3ZzY29kZS1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogInZzY29kZS1zZWFyY2gtcHJvdmlkZXJAbXJtYXJibGUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}
   }}
-, {"uuid": "ddc-brightness-contrast-extra-dimming@tzawezin.github.io", "name": "Monitor DDC Brightness/Contrast + Extra Dimming", "pname": "set-monitor-ddc-brightnesscontrast-extra-dimming", "description": "Control brightness and contrast with ddc and extra screen dimming with black overlay, It requires ddcutil to be installed, i2c permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/6985/set-monitor-ddc-brightnesscontrast-extra-dimming/", "shell_version_map": {
-    "40": {"version": "7", "sha256": "10zfsqssng040k2fmigib0rz7rfwr0qp5x0a66afz4sxnvzd89ii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "41": {"version": "7", "sha256": "10zfsqssng040k2fmigib0rz7rfwr0qp5x0a66afz4sxnvzd89ii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "42": {"version": "7", "sha256": "10zfsqssng040k2fmigib0rz7rfwr0qp5x0a66afz4sxnvzd89ii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "43": {"version": "7", "sha256": "10zfsqssng040k2fmigib0rz7rfwr0qp5x0a66afz4sxnvzd89ii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="},
-    "44": {"version": "7", "sha256": "10zfsqssng040k2fmigib0rz7rfwr0qp5x0a66afz4sxnvzd89ii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}
+, {"uuid": "ddc-brightness-contrast-extra-dimming@tzawezin.github.io", "name": "Monitor DDC Brightness/Contrast + Extra Dimming", "pname": "set-monitor-ddc-brightnesscontrast-extra-dimming", "description": "Control brightness and contrast with ddc and extra screen dimming with black overlay, It requires ddcutil to be installed, i2c permissions for non-root users configured.\n\nU can find installation instructions here:  https://github.com/tzawezin/gnome-ddc-brightness-contrast-extra-dimming#readme-ov-file", "link": "https://extensions.gnome.org/extension/6985/set-monitor-ddc-brightnesscontrast-extra-dimming/", "shell_version_map": {
+    "40": {"version": "16", "sha256": "1kkb4dl8v8pyfax3dlm5wh4jmsp78l2kvq2jd203zdm3vcsq00ww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "41": {"version": "16", "sha256": "1kkb4dl8v8pyfax3dlm5wh4jmsp78l2kvq2jd203zdm3vcsq00ww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "42": {"version": "16", "sha256": "1kkb4dl8v8pyfax3dlm5wh4jmsp78l2kvq2jd203zdm3vcsq00ww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "43": {"version": "16", "sha256": "1kkb4dl8v8pyfax3dlm5wh4jmsp78l2kvq2jd203zdm3vcsq00ww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "44": {"version": "16", "sha256": "1kkb4dl8v8pyfax3dlm5wh4jmsp78l2kvq2jd203zdm3vcsq00ww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90emF3ZXppbi9nbm9tZS1kZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nIiwKICAidXVpZCI6ICJkZGMtYnJpZ2h0bmVzcy1jb250cmFzdC1leHRyYS1kaW1taW5nQHR6YXdlemluLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "45": {"version": "15", "sha256": "029brss442hdn9ax96674m2j48sw3xyzvgl0f1j715nxk9wpz458", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHphd2V6aW4vZ25vbWUtZGRjLWJyaWdodG5lc3MtY29udHJhc3QtZXh0cmEtZGltbWluZyIsCiAgInV1aWQiOiAiZGRjLWJyaWdodG5lc3MtY29udHJhc3QtZXh0cmEtZGltbWluZ0B0emF3ZXppbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "46": {"version": "15", "sha256": "029brss442hdn9ax96674m2j48sw3xyzvgl0f1j715nxk9wpz458", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHphd2V6aW4vZ25vbWUtZGRjLWJyaWdodG5lc3MtY29udHJhc3QtZXh0cmEtZGltbWluZyIsCiAgInV1aWQiOiAiZGRjLWJyaWdodG5lc3MtY29udHJhc3QtZXh0cmEtZGltbWluZ0B0emF3ZXppbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="},
+    "47": {"version": "15", "sha256": "029brss442hdn9ax96674m2j48sw3xyzvgl0f1j715nxk9wpz458", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYnJpZ2h0bmVzcyBhbmQgY29udHJhc3Qgd2l0aCBkZGMgYW5kIGV4dHJhIHNjcmVlbiBkaW1taW5nIHdpdGggYmxhY2sgb3ZlcmxheSwgSXQgcmVxdWlyZXMgZGRjdXRpbCB0byBiZSBpbnN0YWxsZWQsIGkyYyBwZXJtaXNzaW9ucyBmb3Igbm9uLXJvb3QgdXNlcnMgY29uZmlndXJlZC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogIjFnaWpzMSIKICB9LAogICJuYW1lIjogIk1vbml0b3IgRERDIEJyaWdodG5lc3MvQ29udHJhc3QgKyBFeHRyYSBEaW1taW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHphd2V6aW4vZ25vbWUtZGRjLWJyaWdodG5lc3MtY29udHJhc3QtZXh0cmEtZGltbWluZyIsCiAgInV1aWQiOiAiZGRjLWJyaWdodG5lc3MtY29udHJhc3QtZXh0cmEtZGltbWluZ0B0emF3ZXppbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}
   }}
 , {"uuid": "keyboard-reset@galets", "name": "Keyboard Reset", "pname": "keyboard-reset", "description": "Reset keyboard to default layout on screensaver activation", "link": "https://extensions.gnome.org/extension/6994/keyboard-reset/", "shell_version_map": {
     "41": {"version": "4", "sha256": "0x99yzhqggzwknj1qlml3hgk6wnxw5m1i0zp7fa0gfiw6id09bc6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nYWxldHMvZ25vbWUta2V5Ym9hcmQtcmVzZXQiLAogICJ1dWlkIjogImtleWJvYXJkLXJlc2V0QGdhbGV0cyIsCiAgInZlcnNpb24iOiA0Cn0="},
     "42": {"version": "4", "sha256": "0x99yzhqggzwknj1qlml3hgk6wnxw5m1i0zp7fa0gfiw6id09bc6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nYWxldHMvZ25vbWUta2V5Ym9hcmQtcmVzZXQiLAogICJ1dWlkIjogImtleWJvYXJkLXJlc2V0QGdhbGV0cyIsCiAgInZlcnNpb24iOiA0Cn0="},
     "43": {"version": "4", "sha256": "0x99yzhqggzwknj1qlml3hgk6wnxw5m1i0zp7fa0gfiw6id09bc6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nYWxldHMvZ25vbWUta2V5Ym9hcmQtcmVzZXQiLAogICJ1dWlkIjogImtleWJvYXJkLXJlc2V0QGdhbGV0cyIsCiAgInZlcnNpb24iOiA0Cn0="},
     "44": {"version": "4", "sha256": "0x99yzhqggzwknj1qlml3hgk6wnxw5m1i0zp7fa0gfiw6id09bc6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nYWxldHMvZ25vbWUta2V5Ym9hcmQtcmVzZXQiLAogICJ1dWlkIjogImtleWJvYXJkLXJlc2V0QGdhbGV0cyIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "45": {"version": "5", "sha256": "0d8ribxhaijvh4m6bzwn657h2hp2xslfyyc998d4y1anviaav5lj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FsZXRzL2dub21lLWtleWJvYXJkLXJlc2V0IiwKICAidXVpZCI6ICJrZXlib2FyZC1yZXNldEBnYWxldHMiLAogICJ2ZXJzaW9uIjogNQp9"},
-    "46": {"version": "5", "sha256": "0d8ribxhaijvh4m6bzwn657h2hp2xslfyyc998d4y1anviaav5lj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FsZXRzL2dub21lLWtleWJvYXJkLXJlc2V0IiwKICAidXVpZCI6ICJrZXlib2FyZC1yZXNldEBnYWxldHMiLAogICJ2ZXJzaW9uIjogNQp9"}
+    "45": {"version": "6", "sha256": "0p0shsl2f2fdvdya4ic6vyqzqdz5q2d7hacz458wr2k9jviv11b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FsZXRzL2dub21lLWtleWJvYXJkLXJlc2V0IiwKICAidXVpZCI6ICJrZXlib2FyZC1yZXNldEBnYWxldHMiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "46": {"version": "6", "sha256": "0p0shsl2f2fdvdya4ic6vyqzqdz5q2d7hacz458wr2k9jviv11b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2V0IGtleWJvYXJkIHRvIGRlZmF1bHQgbGF5b3V0IG9uIHNjcmVlbnNhdmVyIGFjdGl2YXRpb24iLAogICJuYW1lIjogIktleWJvYXJkIFJlc2V0IiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FsZXRzL2dub21lLWtleWJvYXJkLXJlc2V0IiwKICAidXVpZCI6ICJrZXlib2FyZC1yZXNldEBnYWxldHMiLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
-, {"uuid": "athan@goodm4ven", "name": "AthanTimes", "pname": "athantimes", "description": "Athan is a prayer time notification in Islam. And this is a notifier Gnome extension for Linux, plus a quick reminder for the Islamic Hijri date.\n\nIt's just another fork of the original (Azan) extension by [fahrinh]; for Shell 46.\n\nImportant Changes:\n- Position is hard-coded to 'center' for a status-indicator issue. (check the repo for details)", "link": "https://extensions.gnome.org/extension/6997/athantimes/", "shell_version_map": {
-    "46": {"version": "8", "sha256": "0g7km2xm8rzp1ilchcx6i0xn27hlqmz8z20ywfk2mps8pnn73i6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MganVzdCBhbm90aGVyIGZvcmsgb2YgdGhlIG9yaWdpbmFsIGV4dGVuc2lvbiBieSBbZmFocmluaF07IGZvciBzaGVsbCA0Ni5cblxuSW1wb3J0YW50IENoYW5nZXM6XG4tIFBvc2l0aW9uIGlzIGhhcmQtY29kZWQgdG8gJ2NlbnRlcicgZm9yIGEgc3RhdHVzLWluZGljYXRvciBpc3N1ZS4gKGNoZWNrIHRoZSByZXBvIGZvciBkZXRhaWxzKSIsCiAgIm5hbWUiOiAiQXRoYW5UaW1lcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdGhhbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb29kbTR2ZW4vYXRoYW4tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdGhhbkBnb29kbTR2ZW4iLAogICJ2ZXJzaW9uIjogOAp9"}
+, {"uuid": "athan@goodm4ven", "name": "AthanTimes", "pname": "athantimes", "description": "A modified version of the original \"azan\" notifier, prayer reminder and Hijri date displayer extension by [fahrinh].\n\nKeywords: Islam, Islamic, notification, time, calendar, prayers.", "link": "https://extensions.gnome.org/extension/6997/athantimes/", "shell_version_map": {
+    "46": {"version": "8", "sha256": "0g7km2xm8rzp1ilchcx6i0xn27hlqmz8z20ywfk2mps8pnn73i6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MganVzdCBhbm90aGVyIGZvcmsgb2YgdGhlIG9yaWdpbmFsIGV4dGVuc2lvbiBieSBbZmFocmluaF07IGZvciBzaGVsbCA0Ni5cblxuSW1wb3J0YW50IENoYW5nZXM6XG4tIFBvc2l0aW9uIGlzIGhhcmQtY29kZWQgdG8gJ2NlbnRlcicgZm9yIGEgc3RhdHVzLWluZGljYXRvciBpc3N1ZS4gKGNoZWNrIHRoZSByZXBvIGZvciBkZXRhaWxzKSIsCiAgIm5hbWUiOiAiQXRoYW5UaW1lcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdGhhbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb29kbTR2ZW4vYXRoYW4tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdGhhbkBnb29kbTR2ZW4iLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "11", "sha256": "1gdh1d3wi3hfpkh2fj1m76lj1par0wg9ndq03vnayxqqy81bvhfk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kaWZpZWQgZm9yayBvZiB0aGUgb3JpZ2luYWwgZXh0ZW5zaW9uIGJ5IFtmYWhyaW5oXS4iLAogICJuYW1lIjogIkF0aGFuVGltZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXRoYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29vZG00dmVuL2F0aGFuLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXRoYW5AZ29vZG00dmVuIiwKICAidmVyc2lvbiI6IDExCn0="}
   }}
 , {"uuid": "qs-touchpad-toggle@crystal", "name": "Quick Settings Touchpad Toggle", "pname": "quick-settings-touchpad-toggle", "description": "Completely disable the touchpad from the quick settings menu.", "link": "https://extensions.gnome.org/extension/7000/quick-settings-touchpad-toggle/", "shell_version_map": {
     "43": {"version": "2", "sha256": "050299qjgfmc8dpr5mny8lfyr2vmli3rwm8kjfbi4dbmj5z66bh7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBsZXRlbHkgZGlzYWJsZSB0aGUgdG91Y2hwYWQgZnJvbSB0aGUgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIlF1aWNrIFNldHRpbmdzIFRvdWNocGFkIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2NyeXN0YWwvZ25vbWUtcXMtdG91Y2hwYWQtdG9nZ2xlIiwKICAidXVpZCI6ICJxcy10b3VjaHBhZC10b2dnbGVAY3J5c3RhbCIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
 , {"uuid": "customisablebutton@devauxcedric.ext", "name": "Customisable Button", "pname": "customisable-button", "description": "A simple customisable button allowing to start, stop and monitor a command.", "link": "https://extensions.gnome.org/extension/7003/customisable-button/", "shell_version_map": {
-    "42": {"version": "6", "sha256": "0n0wnfmq6k7i36wzkzv4qrfd96cyd55a3dpz41qlj4i8gyrn3vmw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGN1c3RvbWlzYWJsZSBidXR0b24gYWxsb3dpbmcgdG8gc3RhcnQsIHN0b3AgYW5kIG1vbml0b3IgYSBjb21tYW5kLiIsCiAgIm5hbWUiOiAiQ3VzdG9taXNhYmxlIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kZXZhdXhjZWRyaWMvY3VzdG9taXNhYmxlLWJ1dHRvbiIsCiAgInV1aWQiOiAiY3VzdG9taXNhYmxlYnV0dG9uQGRldmF1eGNlZHJpYy5leHQiLAogICJ2ZXJzaW9uIjogNgp9"}
+    "42": {"version": "8", "sha256": "05h39cxv4kjbj6m356alpz927w0c15qdb980bvbnh2cppy9njf8m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGN1c3RvbWlzYWJsZSBidXR0b24gYWxsb3dpbmcgdG8gc3RhcnQsIHN0b3AgYW5kIG1vbml0b3IgYSBjb21tYW5kLiIsCiAgIm5hbWUiOiAiQ3VzdG9taXNhYmxlIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2RldmF1eGNlZHJpYy9jdXN0b21pc2FibGUtYnV0dG9uIiwKICAidXVpZCI6ICJjdXN0b21pc2FibGVidXR0b25AZGV2YXV4Y2VkcmljLmV4dCIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "43": {"version": "8", "sha256": "05h39cxv4kjbj6m356alpz927w0c15qdb980bvbnh2cppy9njf8m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGN1c3RvbWlzYWJsZSBidXR0b24gYWxsb3dpbmcgdG8gc3RhcnQsIHN0b3AgYW5kIG1vbml0b3IgYSBjb21tYW5kLiIsCiAgIm5hbWUiOiAiQ3VzdG9taXNhYmxlIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2RldmF1eGNlZHJpYy9jdXN0b21pc2FibGUtYnV0dG9uIiwKICAidXVpZCI6ICJjdXN0b21pc2FibGVidXR0b25AZGV2YXV4Y2VkcmljLmV4dCIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "44": {"version": "8", "sha256": "05h39cxv4kjbj6m356alpz927w0c15qdb980bvbnh2cppy9njf8m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGN1c3RvbWlzYWJsZSBidXR0b24gYWxsb3dpbmcgdG8gc3RhcnQsIHN0b3AgYW5kIG1vbml0b3IgYSBjb21tYW5kLiIsCiAgIm5hbWUiOiAiQ3VzdG9taXNhYmxlIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2RldmF1eGNlZHJpYy9jdXN0b21pc2FibGUtYnV0dG9uIiwKICAidXVpZCI6ICJjdXN0b21pc2FibGVidXR0b25AZGV2YXV4Y2VkcmljLmV4dCIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
-, {"uuid": "custom-command-toggle@storageb.github.com", "name": "Custom Command Toggle", "pname": "custom-command-toggle", "description": "Run user defined terminal/shell commands and launch custom scripts using customizable quick toggle buttons.", "link": "https://extensions.gnome.org/extension/7012/custom-command-toggle/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "03rni8h1jb9i3cb1mfxpv5w89mcp2l928g96p3qlvxipx1sdnnw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYW5kIGxhdW5jaCBjdXN0b20gc2NyaXB0cyB1c2luZyBhIGN1c3RvbWl6YWJsZSBxdWljayB0b2dnbGUgYnV0dG9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiU3RvcmFnZUIiCiAgfSwKICAibmFtZSI6ICJDdXN0b20gQ29tbWFuZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TdG9yYWdlQi9jdXN0b20tY29tbWFuZC10b2dnbGUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLXRvZ2dsZUBzdG9yYWdlYi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "6", "sha256": "03rni8h1jb9i3cb1mfxpv5w89mcp2l928g96p3qlvxipx1sdnnw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYW5kIGxhdW5jaCBjdXN0b20gc2NyaXB0cyB1c2luZyBhIGN1c3RvbWl6YWJsZSBxdWljayB0b2dnbGUgYnV0dG9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiU3RvcmFnZUIiCiAgfSwKICAibmFtZSI6ICJDdXN0b20gQ29tbWFuZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TdG9yYWdlQi9jdXN0b20tY29tbWFuZC10b2dnbGUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLXRvZ2dsZUBzdG9yYWdlYi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+, {"uuid": "custom-command-toggle@storageb.github.com", "name": "Custom Command Toggle", "pname": "custom-command-toggle", "description": "Run user defined terminal/shell commands and launch custom scripts using a customizable quick toggle button.", "link": "https://extensions.gnome.org/extension/7012/custom-command-toggle/", "shell_version_map": {
+    "45": {"version": "7", "sha256": "1z9mcfagghbmz3k1h0iqfdp1nkrp8mmdw83dzhpbkd9b6xl90syv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYW5kIGxhdW5jaCBjdXN0b20gc2NyaXB0cyB1c2luZyBhIGN1c3RvbWl6YWJsZSBxdWljayB0b2dnbGUgYnV0dG9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiU3RvcmFnZUIiCiAgfSwKICAibmFtZSI6ICJDdXN0b20gQ29tbWFuZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RvcmFnZUIvY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAidXVpZCI6ICJjdXN0b20tY29tbWFuZC10b2dnbGVAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "46": {"version": "7", "sha256": "1z9mcfagghbmz3k1h0iqfdp1nkrp8mmdw83dzhpbkd9b6xl90syv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYW5kIGxhdW5jaCBjdXN0b20gc2NyaXB0cyB1c2luZyBhIGN1c3RvbWl6YWJsZSBxdWljayB0b2dnbGUgYnV0dG9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiU3RvcmFnZUIiCiAgfSwKICAibmFtZSI6ICJDdXN0b20gQ29tbWFuZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RvcmFnZUIvY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAidXVpZCI6ICJjdXN0b20tY29tbWFuZC10b2dnbGVAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "47": {"version": "7", "sha256": "1z9mcfagghbmz3k1h0iqfdp1nkrp8mmdw83dzhpbkd9b6xl90syv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYW5kIGxhdW5jaCBjdXN0b20gc2NyaXB0cyB1c2luZyBhIGN1c3RvbWl6YWJsZSBxdWljayB0b2dnbGUgYnV0dG9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiU3RvcmFnZUIiCiAgfSwKICAibmFtZSI6ICJDdXN0b20gQ29tbWFuZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RvcmFnZUIvY3VzdG9tLWNvbW1hbmQtdG9nZ2xlIiwKICAidXVpZCI6ICJjdXN0b20tY29tbWFuZC10b2dnbGVAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "fullscreen-button@domgregori.github.com", "name": "Fullscreen Button", "pname": "fullscreen-button", "description": "A button in the status bar to expand current window to fullscreen. Useful for tablets.", "link": "https://extensions.gnome.org/extension/7015/fullscreen-button/", "shell_version_map": {
     "41": {"version": "5", "sha256": "00nr3s40zvywi6vhk5hrc0pdmqw51bf77bax7mg2jrl6al37i89j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYnV0dG9uIGluIHRoZSBzdGF0dXMgYmFyIHRvIGV4cGFuZCBjdXJyZW50IHdpbmRvdyB0byBmdWxsc2NyZWVuLiBVc2VmdWwgZm9yIHRhYmxldHMuIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kb21ncmVnb3JpL2Z1bGxzY3JlZW4tYnV0dG9uIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWJ1dHRvbkBkb21ncmVnb3JpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -7290,21 +7712,26 @@
     "46": {"version": "6", "sha256": "1b29wjwligs2gsdqwf4g3lx51gr3nzs84jz9l4a8hw19wkx9qqrc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYnV0dG9uIGluIHRoZSBzdGF0dXMgYmFyIHRvIGV4cGFuZCBjdXJyZW50IHdpbmRvdyB0byBmdWxsc2NyZWVuLiBVc2VmdWwgZm9yIHRhYmxldHMuIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG9tZ3JlZ29yaS9mdWxsc2NyZWVuLWJ1dHRvbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1idXR0b25AZG9tZ3JlZ29yaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}
   }}
 , {"uuid": "gpu-switcher-supergfxctl@chikobara.github.io", "name": "GPU Supergfxctl Switch", "pname": "gpu-supergfxctl-switch", "description": "Simple GPU Profile switcher Gnome-Shell-Extension for ASUS laptops using Supergfxctl", "link": "https://extensions.gnome.org/extension/7018/gpu-supergfxctl-switch/", "shell_version_map": {
-    "46": {"version": "8", "sha256": "13244c4ff23gvpwd5lyybz401sq6y6c92a2672jjwh94ww47qjjy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHUFUgUHJvZmlsZSBzd2l0Y2hlciBHbm9tZS1TaGVsbC1FeHRlbnNpb24gZm9yIEFTVVMgbGFwdG9wcyB1c2luZyBTdXBlcmdmeGN0bCIsCiAgIm5hbWUiOiAiR1BVIFN1cGVyZ2Z4Y3RsIFN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaGlrb2JhcmEvR1BVLVN3aXRjaGVyLVN1cGVyZ2Z4Y3RsIiwKICAidXVpZCI6ICJncHUtc3dpdGNoZXItc3VwZXJnZnhjdGxAY2hpa29iYXJhLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}
+    "46": {"version": "9", "sha256": "0w13dayrw87kbrgq9yby7p6h9q5swvrlll8j3f9vcyjijx4gd99k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHUFUgUHJvZmlsZSBzd2l0Y2hlciBHbm9tZS1TaGVsbC1FeHRlbnNpb24gZm9yIEFTVVMgbGFwdG9wcyB1c2luZyBTdXBlcmdmeGN0bCIsCiAgIm5hbWUiOiAiR1BVIFN1cGVyZ2Z4Y3RsIFN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2hpa29iYXJhL0dQVS1Td2l0Y2hlci1TdXBlcmdmeGN0bCIsCiAgInV1aWQiOiAiZ3B1LXN3aXRjaGVyLXN1cGVyZ2Z4Y3RsQGNoaWtvYmFyYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"},
+    "47": {"version": "9", "sha256": "0w13dayrw87kbrgq9yby7p6h9q5swvrlll8j3f9vcyjijx4gd99k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHUFUgUHJvZmlsZSBzd2l0Y2hlciBHbm9tZS1TaGVsbC1FeHRlbnNpb24gZm9yIEFTVVMgbGFwdG9wcyB1c2luZyBTdXBlcmdmeGN0bCIsCiAgIm5hbWUiOiAiR1BVIFN1cGVyZ2Z4Y3RsIFN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2hpa29iYXJhL0dQVS1Td2l0Y2hlci1TdXBlcmdmeGN0bCIsCiAgInV1aWQiOiAiZ3B1LXN3aXRjaGVyLXN1cGVyZ2Z4Y3RsQGNoaWtvYmFyYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}
   }}
 , {"uuid": "custom-command-list@storageb.github.com", "name": "Custom Command Menu", "pname": "custom-command-list", "description": "Run user defined terminal/shell commands by selecting them from a customizable drop-down menu at the top bar.", "link": "https://extensions.gnome.org/extension/7024/custom-command-list/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "0018hk1cdlxrd8v5b3japj93n4idm1di13k3w5vj7f8zgcp8wxha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TdG9yYWdlQi9jdXN0b20tY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjdXN0b20tY29tbWFuZC1saXN0QHN0b3JhZ2ViLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "46": {"version": "3", "sha256": "0018hk1cdlxrd8v5b3japj93n4idm1di13k3w5vj7f8zgcp8wxha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TdG9yYWdlQi9jdXN0b20tY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjdXN0b20tY29tbWFuZC1saXN0QHN0b3JhZ2ViLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
+    "45": {"version": "5", "sha256": "1jskp87wfkryznn90ss04671pqlws3g8yxcx6k8z8irdq9msmh9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RvcmFnZUIvY3VzdG9tLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY3VzdG9tLWNvbW1hbmQtbGlzdEBzdG9yYWdlYi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="},
+    "46": {"version": "5", "sha256": "1jskp87wfkryznn90ss04671pqlws3g8yxcx6k8z8irdq9msmh9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RvcmFnZUIvY3VzdG9tLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY3VzdG9tLWNvbW1hbmQtbGlzdEBzdG9yYWdlYi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="},
+    "47": {"version": "5", "sha256": "1jskp87wfkryznn90ss04671pqlws3g8yxcx6k8z8irdq9msmh9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU3RvcmFnZUIvY3VzdG9tLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY3VzdG9tLWNvbW1hbmQtbGlzdEBzdG9yYWdlYi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}
   }}
 , {"uuid": "eye-on-cursor@djinnalexio.github.io", "name": "Eye on Cursor", "pname": "eye-on-cursor", "description": "Let your desktop \"keep an eye\" on your mouse! And with the included cursor indicator, keep track of your pointer's every action!\n\nTry Eye on Cursor, a fun and practical extension that gives your panel eyes that constantly follow your mouse. This quirky feature, combined with a highly customizable mouse tracker that highlights clicks, makes it easier than ever to monitor your mouse movements, ensuring your pointer gets all the attention it needs.\n\nThis extension is the latest version of 'Eye and Mouse Extended' by Alexey Lovchikov.", "link": "https://extensions.gnome.org/extension/7036/eye-on-cursor/", "shell_version_map": {
-    "45": {"version": "4", "sha256": "0854q4z1mfrrjg6cgziq8qwykgmm41wjrh7q5ckjggyvzpxrjlj2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCB5b3VyIGRlc2t0b3AgXCJrZWVwIGFuIGV5ZVwiIG9uIHlvdXIgbW91c2UhIEFuZCB3aXRoIHRoZSBpbmNsdWRlZCBjdXJzb3IgaW5kaWNhdG9yLCBrZWVwIHRyYWNrIG9mIHlvdXIgcG9pbnRlcidzIGV2ZXJ5IGFjdGlvbiFcblxuVHJ5IEV5ZSBvbiBDdXJzb3IsIGEgZnVuIGFuZCBwcmFjdGljYWwgZXh0ZW5zaW9uIHRoYXQgZ2l2ZXMgeW91ciBwYW5lbCBleWVzIHRoYXQgY29uc3RhbnRseSBmb2xsb3cgeW91ciBtb3VzZS4gVGhpcyBxdWlya3kgZmVhdHVyZSwgY29tYmluZWQgd2l0aCBhIGhpZ2hseSBjdXN0b21pemFibGUgbW91c2UgdHJhY2tlciB0aGF0IGhpZ2hsaWdodHMgY2xpY2tzLCBtYWtlcyBpdCBlYXNpZXIgdGhhbiBldmVyIHRvIG1vbml0b3IgeW91ciBtb3VzZSBtb3ZlbWVudHMsIGVuc3VyaW5nIHlvdXIgcG9pbnRlciBnZXRzIGFsbCB0aGUgYXR0ZW50aW9uIGl0IG5lZWRzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgJ0V5ZSBhbmQgTW91c2UgRXh0ZW5kZWQnIGJ5IEFsZXhleSBMb3ZjaGlrb3YuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLW9uLWN1cnNvciIsCiAgIm5hbWUiOiAiRXllIG9uIEN1cnNvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtb24tY3Vyc29yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kamlubmFsZXhpby9leWUtb24tY3Vyc29yLyIsCiAgInV1aWQiOiAiZXllLW9uLWN1cnNvckBkamlubmFsZXhpby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNCwKICAidmVyc2lvbi1uYW1lIjogIjEuMS4xIgp9"},
-    "46": {"version": "4", "sha256": "0854q4z1mfrrjg6cgziq8qwykgmm41wjrh7q5ckjggyvzpxrjlj2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCB5b3VyIGRlc2t0b3AgXCJrZWVwIGFuIGV5ZVwiIG9uIHlvdXIgbW91c2UhIEFuZCB3aXRoIHRoZSBpbmNsdWRlZCBjdXJzb3IgaW5kaWNhdG9yLCBrZWVwIHRyYWNrIG9mIHlvdXIgcG9pbnRlcidzIGV2ZXJ5IGFjdGlvbiFcblxuVHJ5IEV5ZSBvbiBDdXJzb3IsIGEgZnVuIGFuZCBwcmFjdGljYWwgZXh0ZW5zaW9uIHRoYXQgZ2l2ZXMgeW91ciBwYW5lbCBleWVzIHRoYXQgY29uc3RhbnRseSBmb2xsb3cgeW91ciBtb3VzZS4gVGhpcyBxdWlya3kgZmVhdHVyZSwgY29tYmluZWQgd2l0aCBhIGhpZ2hseSBjdXN0b21pemFibGUgbW91c2UgdHJhY2tlciB0aGF0IGhpZ2hsaWdodHMgY2xpY2tzLCBtYWtlcyBpdCBlYXNpZXIgdGhhbiBldmVyIHRvIG1vbml0b3IgeW91ciBtb3VzZSBtb3ZlbWVudHMsIGVuc3VyaW5nIHlvdXIgcG9pbnRlciBnZXRzIGFsbCB0aGUgYXR0ZW50aW9uIGl0IG5lZWRzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgJ0V5ZSBhbmQgTW91c2UgRXh0ZW5kZWQnIGJ5IEFsZXhleSBMb3ZjaGlrb3YuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLW9uLWN1cnNvciIsCiAgIm5hbWUiOiAiRXllIG9uIEN1cnNvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtb24tY3Vyc29yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kamlubmFsZXhpby9leWUtb24tY3Vyc29yLyIsCiAgInV1aWQiOiAiZXllLW9uLWN1cnNvckBkamlubmFsZXhpby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNCwKICAidmVyc2lvbi1uYW1lIjogIjEuMS4xIgp9"}
+    "45": {"version": "8", "sha256": "1vlqrifs7zk2mj4klsc1dfrh5hr6f1c0wzfyq6ljy3110s3mvhyf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCB5b3VyIGRlc2t0b3AgXCJrZWVwIGFuIGV5ZVwiIG9uIHlvdXIgbW91c2UhIEFuZCB3aXRoIHRoZSBpbmNsdWRlZCBjdXJzb3IgaW5kaWNhdG9yLCBrZWVwIHRyYWNrIG9mIHlvdXIgcG9pbnRlcidzIGV2ZXJ5IGFjdGlvbiFcblxuVHJ5IEV5ZSBvbiBDdXJzb3IsIGEgZnVuIGFuZCBwcmFjdGljYWwgZXh0ZW5zaW9uIHRoYXQgZ2l2ZXMgeW91ciBwYW5lbCBleWVzIHRoYXQgY29uc3RhbnRseSBmb2xsb3cgeW91ciBtb3VzZS4gVGhpcyBxdWlya3kgZmVhdHVyZSwgY29tYmluZWQgd2l0aCBhIGhpZ2hseSBjdXN0b21pemFibGUgbW91c2UgdHJhY2tlciB0aGF0IGhpZ2hsaWdodHMgY2xpY2tzLCBtYWtlcyBpdCBlYXNpZXIgdGhhbiBldmVyIHRvIG1vbml0b3IgeW91ciBtb3VzZSBtb3ZlbWVudHMsIGVuc3VyaW5nIHlvdXIgcG9pbnRlciBnZXRzIGFsbCB0aGUgYXR0ZW50aW9uIGl0IG5lZWRzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgJ0V5ZSBhbmQgTW91c2UgRXh0ZW5kZWQnIGJ5IEFsZXhleSBMb3ZjaGlrb3YuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLW9uLWN1cnNvciIsCiAgIm5hbWUiOiAiRXllIG9uIEN1cnNvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtb24tY3Vyc29yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGppbm5hbGV4aW8vZXllLW9uLWN1cnNvci8iLAogICJ1dWlkIjogImV5ZS1vbi1jdXJzb3JAZGppbm5hbGV4aW8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIxLjMuMSIKfQ=="},
+    "46": {"version": "8", "sha256": "1vlqrifs7zk2mj4klsc1dfrh5hr6f1c0wzfyq6ljy3110s3mvhyf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCB5b3VyIGRlc2t0b3AgXCJrZWVwIGFuIGV5ZVwiIG9uIHlvdXIgbW91c2UhIEFuZCB3aXRoIHRoZSBpbmNsdWRlZCBjdXJzb3IgaW5kaWNhdG9yLCBrZWVwIHRyYWNrIG9mIHlvdXIgcG9pbnRlcidzIGV2ZXJ5IGFjdGlvbiFcblxuVHJ5IEV5ZSBvbiBDdXJzb3IsIGEgZnVuIGFuZCBwcmFjdGljYWwgZXh0ZW5zaW9uIHRoYXQgZ2l2ZXMgeW91ciBwYW5lbCBleWVzIHRoYXQgY29uc3RhbnRseSBmb2xsb3cgeW91ciBtb3VzZS4gVGhpcyBxdWlya3kgZmVhdHVyZSwgY29tYmluZWQgd2l0aCBhIGhpZ2hseSBjdXN0b21pemFibGUgbW91c2UgdHJhY2tlciB0aGF0IGhpZ2hsaWdodHMgY2xpY2tzLCBtYWtlcyBpdCBlYXNpZXIgdGhhbiBldmVyIHRvIG1vbml0b3IgeW91ciBtb3VzZSBtb3ZlbWVudHMsIGVuc3VyaW5nIHlvdXIgcG9pbnRlciBnZXRzIGFsbCB0aGUgYXR0ZW50aW9uIGl0IG5lZWRzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgJ0V5ZSBhbmQgTW91c2UgRXh0ZW5kZWQnIGJ5IEFsZXhleSBMb3ZjaGlrb3YuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLW9uLWN1cnNvciIsCiAgIm5hbWUiOiAiRXllIG9uIEN1cnNvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtb24tY3Vyc29yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGppbm5hbGV4aW8vZXllLW9uLWN1cnNvci8iLAogICJ1dWlkIjogImV5ZS1vbi1jdXJzb3JAZGppbm5hbGV4aW8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIxLjMuMSIKfQ=="},
+    "47": {"version": "8", "sha256": "1vlqrifs7zk2mj4klsc1dfrh5hr6f1c0wzfyq6ljy3110s3mvhyf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCB5b3VyIGRlc2t0b3AgXCJrZWVwIGFuIGV5ZVwiIG9uIHlvdXIgbW91c2UhIEFuZCB3aXRoIHRoZSBpbmNsdWRlZCBjdXJzb3IgaW5kaWNhdG9yLCBrZWVwIHRyYWNrIG9mIHlvdXIgcG9pbnRlcidzIGV2ZXJ5IGFjdGlvbiFcblxuVHJ5IEV5ZSBvbiBDdXJzb3IsIGEgZnVuIGFuZCBwcmFjdGljYWwgZXh0ZW5zaW9uIHRoYXQgZ2l2ZXMgeW91ciBwYW5lbCBleWVzIHRoYXQgY29uc3RhbnRseSBmb2xsb3cgeW91ciBtb3VzZS4gVGhpcyBxdWlya3kgZmVhdHVyZSwgY29tYmluZWQgd2l0aCBhIGhpZ2hseSBjdXN0b21pemFibGUgbW91c2UgdHJhY2tlciB0aGF0IGhpZ2hsaWdodHMgY2xpY2tzLCBtYWtlcyBpdCBlYXNpZXIgdGhhbiBldmVyIHRvIG1vbml0b3IgeW91ciBtb3VzZSBtb3ZlbWVudHMsIGVuc3VyaW5nIHlvdXIgcG9pbnRlciBnZXRzIGFsbCB0aGUgYXR0ZW50aW9uIGl0IG5lZWRzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgJ0V5ZSBhbmQgTW91c2UgRXh0ZW5kZWQnIGJ5IEFsZXhleSBMb3ZjaGlrb3YuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLW9uLWN1cnNvciIsCiAgIm5hbWUiOiAiRXllIG9uIEN1cnNvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtb24tY3Vyc29yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGppbm5hbGV4aW8vZXllLW9uLWN1cnNvci8iLAogICJ1dWlkIjogImV5ZS1vbi1jdXJzb3JAZGppbm5hbGV4aW8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIxLjMuMSIKfQ=="}
   }}
 , {"uuid": "day-progress@arcaege.github.io", "name": "Day Progress", "pname": "day-progress", "description": "Displays a (somewhat) customisable progress bar of your day in the top panel to help you track your time.", "link": "https://extensions.gnome.org/extension/7042/day-progress/", "shell_version_map": {
-    "46": {"version": "11", "sha256": "0c6x9l7805hpld6ycfd528921341gdl18hll6j61rvn0hx8zkb1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgKHNvbWV3aGF0KSBjdXN0b21pc2FibGUgcHJvZ3Jlc3MgYmFyIG9mIHlvdXIgZGF5IGluIHRoZSB0b3AgcGFuZWwgdG8gaGVscCB5b3UgdHJhY2sgeW91ciB0aW1lLiIsCiAgIm5hbWUiOiAiRGF5IFByb2dyZXNzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRheS1wcm9ncmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcmNhRWdlL2RheS1wcm9ncmVzcyIsCiAgInV1aWQiOiAiZGF5LXByb2dyZXNzQGFyY2FlZ2UuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}
+    "46": {"version": "19", "sha256": "0wiiki2p7ln0qf4iy3igl62pl6hv03zplb73640vmlwbi18c6cl2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgKHNvbWV3aGF0KSBjdXN0b21pc2FibGUgcHJvZ3Jlc3MgYmFyIG9mIHlvdXIgZGF5IGluIHRoZSB0b3AgcGFuZWwgdG8gaGVscCB5b3UgdHJhY2sgeW91ciB0aW1lLiIsCiAgIm5hbWUiOiAiRGF5IFByb2dyZXNzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRheS1wcm9ncmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJjYUVnZS9kYXktcHJvZ3Jlc3MiLAogICJ1dWlkIjogImRheS1wcm9ncmVzc0BhcmNhZWdlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOQp9"},
+    "47": {"version": "19", "sha256": "0wiiki2p7ln0qf4iy3igl62pl6hv03zplb73640vmlwbi18c6cl2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgKHNvbWV3aGF0KSBjdXN0b21pc2FibGUgcHJvZ3Jlc3MgYmFyIG9mIHlvdXIgZGF5IGluIHRoZSB0b3AgcGFuZWwgdG8gaGVscCB5b3UgdHJhY2sgeW91ciB0aW1lLiIsCiAgIm5hbWUiOiAiRGF5IFByb2dyZXNzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRheS1wcm9ncmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJjYUVnZS9kYXktcHJvZ3Jlc3MiLAogICJ1dWlkIjogImRheS1wcm9ncmVzc0BhcmNhZWdlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOQp9"}
   }}
 , {"uuid": "rounded-window-corners@fxgn", "name": "Rounded Window Corners Reborn", "pname": "rounded-window-corners-reborn", "description": "Add rounded corners to all windows. Fork of the now unmaintained Rounded Window Corners extension.", "link": "https://extensions.gnome.org/extension/7048/rounded-window-corners-reborn/", "shell_version_map": {
-    "46": {"version": "3", "sha256": "1v0vmyysv9v1r9by7z40wsk3ws26bmbzza8pqy5a5krz4aa94a7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgdG8gYWxsIHdpbmRvd3MuIEZvcmsgb2YgdGhlIG5vdyB1bm1haW50YWluZWQgUm91bmRlZCBXaW5kb3cgQ29ybmVycyBleHRlbnNpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm91bmRlZC13aW5kb3ctY29ybmVyc0BmeGduIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb3VuZGVkLXdpbmRvdy1jb3JuZXJzLXJlYm9ybiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbGV4YWdvb24vcm91bmRlZC13aW5kb3ctY29ybmVycyIsCiAgInV1aWQiOiAicm91bmRlZC13aW5kb3ctY29ybmVyc0BmeGduIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "46": {"version": "7", "sha256": "1sxnf7am564v0gj9kib1dmhrxg0j3mrxb68yy35ia916viz85ykv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgdG8gYWxsIHdpbmRvd3MuIEZvcmsgb2YgdGhlIG5vdyB1bm1haW50YWluZWQgUm91bmRlZCBXaW5kb3cgQ29ybmVycyBleHRlbnNpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm91bmRlZC13aW5kb3ctY29ybmVyc0BmeGduIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb3VuZGVkLXdpbmRvdy1jb3JuZXJzLXJlYm9ybiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmxleGFnb29uL3JvdW5kZWQtd2luZG93LWNvcm5lcnMiLAogICJ1dWlkIjogInJvdW5kZWQtd2luZG93LWNvcm5lcnNAZnhnbiIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "47": {"version": "7", "sha256": "1sxnf7am564v0gj9kib1dmhrxg0j3mrxb68yy35ia916viz85ykv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgdG8gYWxsIHdpbmRvd3MuIEZvcmsgb2YgdGhlIG5vdyB1bm1haW50YWluZWQgUm91bmRlZCBXaW5kb3cgQ29ybmVycyBleHRlbnNpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm91bmRlZC13aW5kb3ctY29ybmVyc0BmeGduIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb3VuZGVkLXdpbmRvdy1jb3JuZXJzLXJlYm9ybiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmxleGFnb29uL3JvdW5kZWQtd2luZG93LWNvcm5lcnMiLAogICJ1dWlkIjogInJvdW5kZWQtd2luZG93LWNvcm5lcnNAZnhnbiIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "runandroidemulators@mateusz1913.dev", "name": "Run Android Emulators", "pname": "run-android-emulators", "description": "Run android emulators from Quick Settings", "link": "https://extensions.gnome.org/extension/7051/run-android-emulators/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1m5qprclwyjv25p4r26c6k23m2apxw6k7dzfk1108cxhmb22b9kr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biBhbmRyb2lkIGVtdWxhdG9ycyBmcm9tIFF1aWNrIFNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJ1bmFuZHJvaWRlbXVsYXRvcnMiLAogICJuYW1lIjogIlJ1biBBbmRyb2lkIEVtdWxhdG9ycyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ydW5hbmRyb2lkZW11bGF0b3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9NYXRldXN6X01lZHJlay9ydW5hbmRyb2lkZW11bGF0b3JzIiwKICAidXVpZCI6ICJydW5hbmRyb2lkZW11bGF0b3JzQG1hdGV1c3oxOTEzLmRldiIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -7313,56 +7740,64 @@
 , {"uuid": "fw-fanctrl@ayuso.me", "name": "fw-fanctrl", "pname": "fw-fanctrl", "description": "Fan Control for Framework. This extension is not affiliated, funded, or in any way associated with Framework Computer.", "link": "https://extensions.gnome.org/extension/7053/fw-fanctrl/", "shell_version_map": {
     "46": {"version": "6", "sha256": "1v0whsqxpz5pr70dylmmzwyaixnp5fpfz9hv1yj3xh7n2v4qjjh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZhbiBDb250cm9sIGZvciBGcmFtZXdvcmsuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZyYW1ld29yayBDb21wdXRlci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmdy1mYW5jdHJsQGF5dXNvLm1lIiwKICAibmFtZSI6ICJmdy1mYW5jdHJsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ3LWZhbmN0cmwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9heC9mdy1mYW5jdHJsLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnctZmFuY3RybEBheXVzby5tZSIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
-, {"uuid": "FuzzyClock@fire-man-x", "name": "Fuzzy Clock - next", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel.\n\nIt is a fork of abandoned FuzzyClock.", "link": "https://extensions.gnome.org/extension/7056/fuzzy-clock/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "1p2gpjvw7idyzm67x6i5vcw1x0vki8kf3wisxk00v556k2ql856w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC5cXG5cXG5JdCBpcyBhIGZvcmsgb2YgYWJhbmRvbmVkIEZ1enp5Q2xvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnZXMiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIC0gbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vRmlyZS1tYW4teC9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGZpcmUtbWFuLXgiLAogICJ2ZXJzaW9uIjogMgp9"},
-    "46": {"version": "2", "sha256": "1p2gpjvw7idyzm67x6i5vcw1x0vki8kf3wisxk00v556k2ql856w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC5cXG5cXG5JdCBpcyBhIGZvcmsgb2YgYWJhbmRvbmVkIEZ1enp5Q2xvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnZXMiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIC0gbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vRmlyZS1tYW4teC9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGZpcmUtbWFuLXgiLAogICJ2ZXJzaW9uIjogMgp9"}
+, {"uuid": "FuzzyClock@fire-man-x", "name": "Fuzzy Clock - next", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel.\\n\\nIt is a fork of abandoned FuzzyClock.", "link": "https://extensions.gnome.org/extension/7056/fuzzy-clock/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "02p8vj0xlqmvlgss73wfpgadya5c0h9d887dnxk7r33w8bjvkncw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC5cXG5cXG5JdCBpcyBhIGZvcmsgb2YgYWJhbmRvbmVkIEZ1enp5Q2xvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnZXMiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIC0gbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0ZpcmUtbWFuLXgvRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0BmaXJlLW1hbi14IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "46": {"version": "3", "sha256": "02p8vj0xlqmvlgss73wfpgadya5c0h9d887dnxk7r33w8bjvkncw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC5cXG5cXG5JdCBpcyBhIGZvcmsgb2YgYWJhbmRvbmVkIEZ1enp5Q2xvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnZXMiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIC0gbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0ZpcmUtbWFuLXgvRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0BmaXJlLW1hbi14IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "3", "sha256": "02p8vj0xlqmvlgss73wfpgadya5c0h9d887dnxk7r33w8bjvkncw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbC5cXG5cXG5JdCBpcyBhIGZvcmsgb2YgYWJhbmRvbmVkIEZ1enp5Q2xvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnZXMiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIC0gbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0ZpcmUtbWFuLXgvRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0BmaXJlLW1hbi14IiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
 , {"uuid": "tilingshell@ferrarodomenico.com", "name": "Tiling Shell", "pname": "tiling-shell", "description": "Extend Gnome Shell with advanced tiling window management. Supports multiple monitors, Windows 11 Snap Assistant, Fancy Zones, customised tiling layouts and more.", "link": "https://extensions.gnome.org/extension/7065/tiling-shell/", "shell_version_map": {
-    "42": {"version": "17", "sha256": "1z2v14yxm4qbzzvx3gdai71hjds5d2xcljb62c7iy5by59ffy88w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAibmFtZSI6ICJUaWxpbmcgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGlsaW5nc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kb21mZXJyL3RpbGluZ3NoZWxsIiwKICAidXVpZCI6ICJ0aWxpbmdzaGVsbEBmZXJyYXJvZG9tZW5pY28uY29tIiwKICAidmVyc2lvbiI6IDE3LAogICJ2ZXJzaW9uLW5hbWUiOiAiMTEuMSIKfQ=="},
-    "43": {"version": "17", "sha256": "1z2v14yxm4qbzzvx3gdai71hjds5d2xcljb62c7iy5by59ffy88w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAibmFtZSI6ICJUaWxpbmcgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGlsaW5nc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kb21mZXJyL3RpbGluZ3NoZWxsIiwKICAidXVpZCI6ICJ0aWxpbmdzaGVsbEBmZXJyYXJvZG9tZW5pY28uY29tIiwKICAidmVyc2lvbiI6IDE3LAogICJ2ZXJzaW9uLW5hbWUiOiAiMTEuMSIKfQ=="},
-    "44": {"version": "17", "sha256": "1z2v14yxm4qbzzvx3gdai71hjds5d2xcljb62c7iy5by59ffy88w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAibmFtZSI6ICJUaWxpbmcgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGlsaW5nc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kb21mZXJyL3RpbGluZ3NoZWxsIiwKICAidXVpZCI6ICJ0aWxpbmdzaGVsbEBmZXJyYXJvZG9tZW5pY28uY29tIiwKICAidmVyc2lvbiI6IDE3LAogICJ2ZXJzaW9uLW5hbWUiOiAiMTEuMSIKfQ=="},
-    "45": {"version": "18", "sha256": "1kddgzba6kqg7asvlbsx9fkxh27s3i8shikgzfm59b789wyi78qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAibmFtZSI6ICJUaWxpbmcgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGlsaW5nc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMTgsCiAgInZlcnNpb24tbmFtZSI6ICIxMS4xIgp9"},
-    "46": {"version": "18", "sha256": "1kddgzba6kqg7asvlbsx9fkxh27s3i8shikgzfm59b789wyi78qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAibmFtZSI6ICJUaWxpbmcgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGlsaW5nc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMTgsCiAgInZlcnNpb24tbmFtZSI6ICIxMS4xIgp9"}
+    "42": {"version": "34", "sha256": "1hyfvxqm48dyfw4825jky9hjkmxz3w54vzr264pmqf0caym12izs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGlsaW5nc2hlbGwiLAogICJuYW1lIjogIlRpbGluZyBTaGVsbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmdzaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMzQsCiAgInZlcnNpb24tbmFtZSI6ICIxNCIKfQ=="},
+    "43": {"version": "34", "sha256": "1hyfvxqm48dyfw4825jky9hjkmxz3w54vzr264pmqf0caym12izs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGlsaW5nc2hlbGwiLAogICJuYW1lIjogIlRpbGluZyBTaGVsbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmdzaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMzQsCiAgInZlcnNpb24tbmFtZSI6ICIxNCIKfQ=="},
+    "44": {"version": "34", "sha256": "1hyfvxqm48dyfw4825jky9hjkmxz3w54vzr264pmqf0caym12izs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGlsaW5nc2hlbGwiLAogICJuYW1lIjogIlRpbGluZyBTaGVsbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmdzaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMzQsCiAgInZlcnNpb24tbmFtZSI6ICIxNCIKfQ=="},
+    "45": {"version": "33", "sha256": "0m5y4y22r9fq7zpa78jy9yck1pa5ir6lg8n2i7vg2yyxfklac7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGlsaW5nc2hlbGwiLAogICJuYW1lIjogIlRpbGluZyBTaGVsbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmdzaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMzMsCiAgInZlcnNpb24tbmFtZSI6ICIxNCIKfQ=="},
+    "46": {"version": "33", "sha256": "0m5y4y22r9fq7zpa78jy9yck1pa5ir6lg8n2i7vg2yyxfklac7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGlsaW5nc2hlbGwiLAogICJuYW1lIjogIlRpbGluZyBTaGVsbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmdzaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMzMsCiAgInZlcnNpb24tbmFtZSI6ICIxNCIKfQ=="},
+    "47": {"version": "33", "sha256": "0m5y4y22r9fq7zpa78jy9yck1pa5ir6lg8n2i7vg2yyxfklac7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBjdXN0b21pc2VkIHRpbGluZyBsYXlvdXRzIGFuZCBtb3JlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRvbWZlcnIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGlsaW5nc2hlbGwiLAogICJuYW1lIjogIlRpbGluZyBTaGVsbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmdzaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvbWZlcnIvdGlsaW5nc2hlbGwiLAogICJ1dWlkIjogInRpbGluZ3NoZWxsQGZlcnJhcm9kb21lbmljby5jb20iLAogICJ2ZXJzaW9uIjogMzMsCiAgInZlcnNpb24tbmFtZSI6ICIxNCIKfQ=="}
   }}
 , {"uuid": "kando-integration@kando-menu.github.io", "name": "Kando Integration", "pname": "kando-integration", "description": "This extension is required for Kando to work on Wayland. It allows Kando to bind global shortcuts, and provides information about your currently focused application window and the position of your mouse pointer.", "link": "https://extensions.gnome.org/extension/7068/kando-integration/", "shell_version_map": {
-    "45": {"version": "4", "sha256": "08dnql29rzsn8cl531xmz88mw2q29g581lhmv1i6743y2iq9b2mx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYW5kby1tZW51IiwKICAidXVpZCI6ICJrYW5kby1pbnRlZ3JhdGlvbkBrYW5kby1tZW51LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0LAogICJ2ZXJzaW9uLW5hbWUiOiAidjAuMy4xIgp9"},
-    "46": {"version": "4", "sha256": "08dnql29rzsn8cl531xmz88mw2q29g581lhmv1i6743y2iq9b2mx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYW5kby1tZW51IiwKICAidXVpZCI6ICJrYW5kby1pbnRlZ3JhdGlvbkBrYW5kby1tZW51LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0LAogICJ2ZXJzaW9uLW5hbWUiOiAidjAuMy4xIgp9"}
+    "45": {"version": "5", "sha256": "0sxmwjcl3df9dm6vpx7fpcnzcsrhvhbyblscdpzqkffpblsxiil0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FuZG8tbWVudSIsCiAgInV1aWQiOiAia2FuZG8taW50ZWdyYXRpb25Aa2FuZG8tbWVudS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNSwKICAidmVyc2lvbi1uYW1lIjogInYwLjQuMCIKfQ=="},
+    "46": {"version": "5", "sha256": "0sxmwjcl3df9dm6vpx7fpcnzcsrhvhbyblscdpzqkffpblsxiil0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FuZG8tbWVudSIsCiAgInV1aWQiOiAia2FuZG8taW50ZWdyYXRpb25Aa2FuZG8tbWVudS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNSwKICAidmVyc2lvbi1uYW1lIjogInYwLjQuMCIKfQ=="},
+    "47": {"version": "5", "sha256": "0sxmwjcl3df9dm6vpx7fpcnzcsrhvhbyblscdpzqkffpblsxiil0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FuZG8tbWVudSIsCiAgInV1aWQiOiAia2FuZG8taW50ZWdyYXRpb25Aa2FuZG8tbWVudS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNSwKICAidmVyc2lvbi1uYW1lIjogInYwLjQuMCIKfQ=="}
   }}
-, {"uuid": "wikiartwallpaper@cankurttekin", "name": "WikiArt Wallpaper", "pname": "wikiart-wallpaper", "description": "A simple GNOME Shell extension to display WikiArt Artwork of the day. This extension is not affiliated, funded, or in any way associated with WikiArt.", "link": "https://extensions.gnome.org/extension/7071/wikiart-wallpaper/", "shell_version_map": {
-    "38": {"version": "3", "sha256": "0cfwlq7y689kawqwqrljwawyysnp1snla1lc0c44ahdq3600cjwl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9XaWtpQXJ0LVdhbGxwYXBlci1Hbm9tZSIsCiAgInV1aWQiOiAid2lraWFydHdhbGxwYXBlckBjYW5rdXJ0dGVraW4iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "40": {"version": "3", "sha256": "0cfwlq7y689kawqwqrljwawyysnp1snla1lc0c44ahdq3600cjwl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9XaWtpQXJ0LVdhbGxwYXBlci1Hbm9tZSIsCiAgInV1aWQiOiAid2lraWFydHdhbGxwYXBlckBjYW5rdXJ0dGVraW4iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "42": {"version": "3", "sha256": "0cfwlq7y689kawqwqrljwawyysnp1snla1lc0c44ahdq3600cjwl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9XaWtpQXJ0LVdhbGxwYXBlci1Hbm9tZSIsCiAgInV1aWQiOiAid2lraWFydHdhbGxwYXBlckBjYW5rdXJ0dGVraW4iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "45": {"version": "6", "sha256": "0va1mjbki2fya0ikns10z4jsjs41dqrcmml2a477ra793p4rhjhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gb25lIG9mIFdpa2lBcnRzIEFydHdvcmsgb2YgdGhlIGRheSB3aXRoIHNpbmdsZSBjbGljayEgRGlzY2xhaW1lcjogVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggV2lraUFydC4iLAogICJuYW1lIjogIldpa2lBcnQgV2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5rdXJ0dGVraW4vV2lraUFydC1XYWxscGFwZXItR25vbWUiLAogICJ1dWlkIjogIndpa2lhcnR3YWxscGFwZXJAY2Fua3VydHRla2luIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "6", "sha256": "0va1mjbki2fya0ikns10z4jsjs41dqrcmml2a477ra793p4rhjhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gb25lIG9mIFdpa2lBcnRzIEFydHdvcmsgb2YgdGhlIGRheSB3aXRoIHNpbmdsZSBjbGljayEgRGlzY2xhaW1lcjogVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggV2lraUFydC4iLAogICJuYW1lIjogIldpa2lBcnQgV2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5rdXJ0dGVraW4vV2lraUFydC1XYWxscGFwZXItR25vbWUiLAogICJ1dWlkIjogIndpa2lhcnR3YWxscGFwZXJAY2Fua3VydHRla2luIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+, {"uuid": "wikiartwallpaper@cankurttekin", "name": "WikiArt Wallpaper", "pname": "wikiart-wallpaper", "description": "A simple GNOME Shell extension to set your wallpaper to one of WikiArts Artwork of the day with single click! Disclaimer: This extension is not affiliated, funded, or in any way associated with WikiArt.", "link": "https://extensions.gnome.org/extension/7071/wikiart-wallpaper/", "shell_version_map": {
+    "38": {"version": "8", "sha256": "0siw6mdh96cd4nii3mskv2s5c1ddi3wzddhslcr4yxr0sc9chdik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1dpa2lBcnQtV2FsbHBhcGVyLUdub21lIiwKICAidXVpZCI6ICJ3aWtpYXJ0d2FsbHBhcGVyQGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "40": {"version": "8", "sha256": "0siw6mdh96cd4nii3mskv2s5c1ddi3wzddhslcr4yxr0sc9chdik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1dpa2lBcnQtV2FsbHBhcGVyLUdub21lIiwKICAidXVpZCI6ICJ3aWtpYXJ0d2FsbHBhcGVyQGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "42": {"version": "8", "sha256": "0siw6mdh96cd4nii3mskv2s5c1ddi3wzddhslcr4yxr0sc9chdik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1dpa2lBcnQtV2FsbHBhcGVyLUdub21lIiwKICAidXVpZCI6ICJ3aWtpYXJ0d2FsbHBhcGVyQGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "43": {"version": "8", "sha256": "0siw6mdh96cd4nii3mskv2s5c1ddi3wzddhslcr4yxr0sc9chdik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1dpa2lBcnQtV2FsbHBhcGVyLUdub21lIiwKICAidXVpZCI6ICJ3aWtpYXJ0d2FsbHBhcGVyQGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "44": {"version": "8", "sha256": "0siw6mdh96cd4nii3mskv2s5c1ddi3wzddhslcr4yxr0sc9chdik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1dpa2lBcnQtV2FsbHBhcGVyLUdub21lIiwKICAidXVpZCI6ICJ3aWtpYXJ0d2FsbHBhcGVyQGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "45": {"version": "11", "sha256": "0xgb4q2p5iwbnr0wxazbvqhs5pvqzn2irmhfp3bbm5yxhzh8y0m5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gb25lIG9mIFdpa2lBcnRzIEFydHdvcmsgb2YgdGhlIGRheSB3aXRoIHNpbmdsZSBjbGljayEgRGlzY2xhaW1lcjogVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggV2lraUFydC4iLAogICJuYW1lIjogIldpa2lBcnQgV2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5rdXJ0dGVraW4vV2lraUFydC1XYWxscGFwZXItR25vbWUiLAogICJ1dWlkIjogIndpa2lhcnR3YWxscGFwZXJAY2Fua3VydHRla2luIiwKICAidmVyc2lvbiI6IDExCn0="},
+    "46": {"version": "11", "sha256": "0xgb4q2p5iwbnr0wxazbvqhs5pvqzn2irmhfp3bbm5yxhzh8y0m5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gb25lIG9mIFdpa2lBcnRzIEFydHdvcmsgb2YgdGhlIGRheSB3aXRoIHNpbmdsZSBjbGljayEgRGlzY2xhaW1lcjogVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggV2lraUFydC4iLAogICJuYW1lIjogIldpa2lBcnQgV2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5rdXJ0dGVraW4vV2lraUFydC1XYWxscGFwZXItR25vbWUiLAogICJ1dWlkIjogIndpa2lhcnR3YWxscGFwZXJAY2Fua3VydHRla2luIiwKICAidmVyc2lvbiI6IDExCn0="}
   }}
 , {"uuid": "gamemodeshellextension@trsnaqe.com", "name": "GameMode Shell Extension", "pname": "gamemode-shell-extension", "description": "GameMode Status Indicator for GNOME Shell!", "link": "https://extensions.gnome.org/extension/7074/gamemode-shell-extension/", "shell_version_map": {
-    "45": {"version": "10", "sha256": "0l1dc4lgdvyn35j4m16ndk17s51l96vhpzdp7943p0diiar0cy6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbWVNb2RlIFN0YXR1cyBJbmRpY2F0b3IgZm9yIEdOT01FIFNoZWxsISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAidHJzbmFxZSIKICB9LAogICJuYW1lIjogIkdhbWVNb2RlIFNoZWxsIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lbW9kZXNoZWxsZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cnNuYXFlL2dhbWVtb2RlLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ2FtZW1vZGVzaGVsbGV4dGVuc2lvbkB0cnNuYXFlLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "46": {"version": "10", "sha256": "0l1dc4lgdvyn35j4m16ndk17s51l96vhpzdp7943p0diiar0cy6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbWVNb2RlIFN0YXR1cyBJbmRpY2F0b3IgZm9yIEdOT01FIFNoZWxsISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAidHJzbmFxZSIKICB9LAogICJuYW1lIjogIkdhbWVNb2RlIFNoZWxsIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lbW9kZXNoZWxsZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cnNuYXFlL2dhbWVtb2RlLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ2FtZW1vZGVzaGVsbGV4dGVuc2lvbkB0cnNuYXFlLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}
+    "45": {"version": "11", "sha256": "08gsarlfw0jlfsl951qdmms3hi0b6b0q6h56ggfmkmwjrg307ziy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbWVNb2RlIFN0YXR1cyBJbmRpY2F0b3IgZm9yIEdOT01FIFNoZWxsISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAidHJzbmFxZSIKICB9LAogICJuYW1lIjogIkdhbWVNb2RlIFNoZWxsIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lbW9kZXNoZWxsZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJzbmFxZS9nYW1lbW9kZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2Rlc2hlbGxleHRlbnNpb25AdHJzbmFxZS5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "46": {"version": "11", "sha256": "08gsarlfw0jlfsl951qdmms3hi0b6b0q6h56ggfmkmwjrg307ziy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbWVNb2RlIFN0YXR1cyBJbmRpY2F0b3IgZm9yIEdOT01FIFNoZWxsISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAidHJzbmFxZSIKICB9LAogICJuYW1lIjogIkdhbWVNb2RlIFNoZWxsIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lbW9kZXNoZWxsZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJzbmFxZS9nYW1lbW9kZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2Rlc2hlbGxleHRlbnNpb25AdHJzbmFxZS5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "47": {"version": "11", "sha256": "08gsarlfw0jlfsl951qdmms3hi0b6b0q6h56ggfmkmwjrg307ziy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbWVNb2RlIFN0YXR1cyBJbmRpY2F0b3IgZm9yIEdOT01FIFNoZWxsISIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAidHJzbmFxZSIKICB9LAogICJuYW1lIjogIkdhbWVNb2RlIFNoZWxsIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lbW9kZXNoZWxsZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJzbmFxZS9nYW1lbW9kZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2Rlc2hlbGxleHRlbnNpb25AdHJzbmFxZS5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
 , {"uuid": "trainfi@altonss.github.io", "name": "TrainFi", "pname": "trainfi", "description": "Display current train trip metadata when connected to onboard Wi-Fi.\nCurrently only supports SNCF TGV INOUI.\n\nFetches trip data from wifi.sncf", "link": "https://extensions.gnome.org/extension/7077/trainfi/", "shell_version_map": {
     "45": {"version": "2", "sha256": "1qhjyxvnj3p3n9x5g6qkdq9d6apnqa6p92p545jd4jaama62hrgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgY3VycmVudCB0cmFpbiB0cmlwIG1ldGFkYXRhIHdoZW4gY29ubmVjdGVkIHRvIG9uYm9hcmQgV2ktRmkuXG5DdXJyZW50bHkgb25seSBzdXBwb3J0cyBTTkNGIFRHViBJTk9VSS5cblxuRmV0Y2hlcyB0cmlwIGRhdGEgZnJvbSB3aWZpLnNuY2YiLAogICJuYW1lIjogIlRyYWluRmkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsdG9uc3MvdHJhaW5maSIsCiAgInV1aWQiOiAidHJhaW5maUBhbHRvbnNzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
     "46": {"version": "2", "sha256": "1qhjyxvnj3p3n9x5g6qkdq9d6apnqa6p92p545jd4jaama62hrgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgY3VycmVudCB0cmFpbiB0cmlwIG1ldGFkYXRhIHdoZW4gY29ubmVjdGVkIHRvIG9uYm9hcmQgV2ktRmkuXG5DdXJyZW50bHkgb25seSBzdXBwb3J0cyBTTkNGIFRHViBJTk9VSS5cblxuRmV0Y2hlcyB0cmlwIGRhdGEgZnJvbSB3aWZpLnNuY2YiLAogICJuYW1lIjogIlRyYWluRmkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsdG9uc3MvdHJhaW5maSIsCiAgInV1aWQiOiAidHJhaW5maUBhbHRvbnNzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
 , {"uuid": "toggleAudio@blackeyeprojects.de", "name": "Toggle Headphone", "pname": "toggle-headphone", "description": "Toggles between 2 pre-defined audio sources, labeled as 'headphone' and 'speaker'.", "link": "https://extensions.gnome.org/extension/7080/toggle-headphone/", "shell_version_map": {
-    "45": {"version": "5", "sha256": "0ksfy09675hyl1cv7c3v51bj47plyp2asxhdcq54rk7vmav6lvkz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgYmV0d2VlbiAyIHByZS1kZWZpbmVkIGF1ZGlvIHNvdXJjZXMsIGxhYmVsZWQgYXMgJ2hlYWRwaG9uZScgYW5kICdzcGVha2VyJy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJibGFja19leWUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgIm5hbWUiOiAiVG9nZ2xlIEhlYWRwaG9uZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGUtYXVkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JsYWNrc3RhcmV5ZS90b2dnbGVBdWRpby1ibGFja2V5ZXByb2plY3RzLmRlIiwKICAidXVpZCI6ICJ0b2dnbGVBdWRpb0BibGFja2V5ZXByb2plY3RzLmRlIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "46": {"version": "5", "sha256": "0ksfy09675hyl1cv7c3v51bj47plyp2asxhdcq54rk7vmav6lvkz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgYmV0d2VlbiAyIHByZS1kZWZpbmVkIGF1ZGlvIHNvdXJjZXMsIGxhYmVsZWQgYXMgJ2hlYWRwaG9uZScgYW5kICdzcGVha2VyJy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJibGFja19leWUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgIm5hbWUiOiAiVG9nZ2xlIEhlYWRwaG9uZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGUtYXVkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JsYWNrc3RhcmV5ZS90b2dnbGVBdWRpby1ibGFja2V5ZXByb2plY3RzLmRlIiwKICAidXVpZCI6ICJ0b2dnbGVBdWRpb0BibGFja2V5ZXByb2plY3RzLmRlIiwKICAidmVyc2lvbiI6IDUKfQ=="}
+    "45": {"version": "9", "sha256": "0yyjf4c6dv9zzgmvnrq1fxjg29km41s3w72hnyrzxi3m9jfvzjbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgYmV0d2VlbiAyIHByZS1kZWZpbmVkIGF1ZGlvIHNvdXJjZXMsIGxhYmVsZWQgYXMgJ2hlYWRwaG9uZScgYW5kICdzcGVha2VyJy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJibGFja19leWUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgIm5hbWUiOiAiVG9nZ2xlIEhlYWRwaG9uZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGUtYXVkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CbGFja3N0YXJleWUvdG9nZ2xlQXVkaW8tYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgInV1aWQiOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "0yyjf4c6dv9zzgmvnrq1fxjg29km41s3w72hnyrzxi3m9jfvzjbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgYmV0d2VlbiAyIHByZS1kZWZpbmVkIGF1ZGlvIHNvdXJjZXMsIGxhYmVsZWQgYXMgJ2hlYWRwaG9uZScgYW5kICdzcGVha2VyJy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJibGFja19leWUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgIm5hbWUiOiAiVG9nZ2xlIEhlYWRwaG9uZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGUtYXVkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CbGFja3N0YXJleWUvdG9nZ2xlQXVkaW8tYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgInV1aWQiOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "0yyjf4c6dv9zzgmvnrq1fxjg29km41s3w72hnyrzxi3m9jfvzjbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgYmV0d2VlbiAyIHByZS1kZWZpbmVkIGF1ZGlvIHNvdXJjZXMsIGxhYmVsZWQgYXMgJ2hlYWRwaG9uZScgYW5kICdzcGVha2VyJy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJibGFja19leWUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgIm5hbWUiOiAiVG9nZ2xlIEhlYWRwaG9uZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b2dnbGUtYXVkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CbGFja3N0YXJleWUvdG9nZ2xlQXVkaW8tYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgInV1aWQiOiAidG9nZ2xlQXVkaW9AYmxhY2tleWVwcm9qZWN0cy5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
-, {"uuid": "pinit@cankurttekin", "name": "Pin It", "pname": "pin-it", "description": "Pin your notes as notifications. Simply type your title, message and optionally choose icon and click Pin It to send notification to yourself.\n\nImportant: Do not put any information that you would care if lost.\nDue to the limitation on the GNOME Shell Version 45 and above, only the 3 most recent notifications are shown by per app, so notifications can disappear before you have a chance to act on them. \n\nTested on Gnome Shell 42 and 46. \n\nPlease report bugs or useful feature requests to github page below.", "link": "https://extensions.gnome.org/extension/7083/pin-it/", "shell_version_map": {
+, {"uuid": "pinit@cankurttekin", "name": "Pin It", "pname": "pin-it", "description": "GNOME Shell Extension to send yourself custom notifications. Can be used as quick reminder, to-do or anything you would want to see at your notification menu on your desktop.\nSimply type your title, message and optionally choose icon and click Pin It to send notification to yourself. \n\nImportant: Do not put any information that you would care if lost, notifications can disappear before you have a chance to act on them. \n\nPlease report bugs or useful feature requests to github page below.", "link": "https://extensions.gnome.org/extension/7083/pin-it/", "shell_version_map": {
     "38": {"version": "13", "sha256": "106kp3l6vpiqk70xa4y2xr51dp67zqx94i47zwqr6v5d93yy97jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMwp9"},
     "40": {"version": "13", "sha256": "106kp3l6vpiqk70xa4y2xr51dp67zqx94i47zwqr6v5d93yy97jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMwp9"},
     "41": {"version": "13", "sha256": "106kp3l6vpiqk70xa4y2xr51dp67zqx94i47zwqr6v5d93yy97jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMwp9"},
     "42": {"version": "13", "sha256": "106kp3l6vpiqk70xa4y2xr51dp67zqx94i47zwqr6v5d93yy97jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMwp9"},
     "43": {"version": "13", "sha256": "106kp3l6vpiqk70xa4y2xr51dp67zqx94i47zwqr6v5d93yy97jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMwp9"},
     "44": {"version": "13", "sha256": "106kp3l6vpiqk70xa4y2xr51dp67zqx94i47zwqr6v5d93yy97jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMwp9"},
-    "45": {"version": "12", "sha256": "0c3dsq4zr7smx4vljfimd0cf5i27cma4v2yjj67hy8kb837ysa4f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIER1ZSB0byB0aGUgbGltaXRhdGlvbiBvbiB0aGUgR05PTUUgU2hlbGwsIG9ubHkgdGhlIDMgbW9zdCByZWNlbnQgbm90aWZpY2F0aW9ucyBhcmUgc2hvd24gYnkgcGVyIGFwcCwgc28gbm90aWZpY2F0aW9ucyBjYW4gZGlzYXBwZWFyIGJlZm9yZSB5b3UgaGF2ZSBhIGNoYW5jZSB0byBhY3Qgb24gdGhlbShibG9ncy5nbm9tZS5vcmcpLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gZ2l0aHViIHBhZ2UgYmVsb3cuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "46": {"version": "12", "sha256": "0c3dsq4zr7smx4vljfimd0cf5i27cma4v2yjj67hy8kb837ysa4f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzaW1wbGUgbm90ZXMgdG8gdGhlIG5vdGlmaWNhdGlvbiBhcmVhLiBDbGljayBvbiB0cmF5IGljb24sIGl0IHdpbGwgc2hvdyB1cCBhIGRpYWxvZyB3aGVyZSB5b3UgY2FuIGlucHV0IHlvdXIgbm90aWZpY2F0aW9uIHRpdGxlLCBtZXNzYWdlIGFuZCBvcHRpb25hbGx5IGljb24oZGVmYXVsdCB3aWxsIGJlIHNhbWUgYXMgdGhlIGV4dGVuc2lvbiBpY29uKS4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QuIER1ZSB0byB0aGUgbGltaXRhdGlvbiBvbiB0aGUgR05PTUUgU2hlbGwsIG9ubHkgdGhlIDMgbW9zdCByZWNlbnQgbm90aWZpY2F0aW9ucyBhcmUgc2hvd24gYnkgcGVyIGFwcCwgc28gbm90aWZpY2F0aW9ucyBjYW4gZGlzYXBwZWFyIGJlZm9yZSB5b3UgaGF2ZSBhIGNoYW5jZSB0byBhY3Qgb24gdGhlbShibG9ncy5nbm9tZS5vcmcpLiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdG8gZ2l0aHViIHBhZ2UgYmVsb3cuIiwKICAibmFtZSI6ICJQaW4gSXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nhbmt1cnR0ZWtpbi9QaW5JdC1Hbm9tZS1FeHRlbnNpb24iLAogICJ1dWlkIjogInBpbml0QGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiAxMgp9"}
+    "45": {"version": "16", "sha256": "133gigrp07cwjvg7f8j4xzz9pavdgdxak0rh1bblxkzb4frgllba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbmQgeW91ciBub3RlcyBhcyBub3RpZmljYXRpb24uIFNpbXBseSB0eXBlIHlvdXIgdGl0bGUsIG1lc3NhZ2UgYW5kIG9wdGlvbmFsbHkgY2hvb3NlIGljb24gYW5kIGNsaWNrIFBpbiBJdCB0byBzZW5kIG5vdGlmaWNhdGlvbiB0byB5b3Vyc2VsZi4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QsIG5vdGlmaWNhdGlvbnMgY2FuIGRpc2FwcGVhciBiZWZvcmUgeW91IGhhdmUgYSBjaGFuY2UgdG8gYWN0IG9uIHRoZW0uIFBsZWFzZSByZXBvcnQgYnVncyBvciB1c2VmdWwgZmVhdHVyZSByZXF1ZXN0cyB0byBnaXRodWIgcGFnZSBiZWxvdy4iLAogICJuYW1lIjogIlBpbiBJdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waW5pdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1Bpbkl0LUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGluaXRAY2Fua3VydHRla2luIiwKICAidmVyc2lvbiI6IDE2Cn0="},
+    "46": {"version": "16", "sha256": "133gigrp07cwjvg7f8j4xzz9pavdgdxak0rh1bblxkzb4frgllba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbmQgeW91ciBub3RlcyBhcyBub3RpZmljYXRpb24uIFNpbXBseSB0eXBlIHlvdXIgdGl0bGUsIG1lc3NhZ2UgYW5kIG9wdGlvbmFsbHkgY2hvb3NlIGljb24gYW5kIGNsaWNrIFBpbiBJdCB0byBzZW5kIG5vdGlmaWNhdGlvbiB0byB5b3Vyc2VsZi4gSW1wb3J0YW50OiBEbyBub3QgcHV0IGFueSBpbmZvcm1hdGlvbiB0aGF0IHlvdSB3b3VsZCBjYXJlIGlmIGxvc3QsIG5vdGlmaWNhdGlvbnMgY2FuIGRpc2FwcGVhciBiZWZvcmUgeW91IGhhdmUgYSBjaGFuY2UgdG8gYWN0IG9uIHRoZW0uIFBsZWFzZSByZXBvcnQgYnVncyBvciB1c2VmdWwgZmVhdHVyZSByZXF1ZXN0cyB0byBnaXRodWIgcGFnZSBiZWxvdy4iLAogICJuYW1lIjogIlBpbiBJdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5waW5pdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1Bpbkl0LUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGluaXRAY2Fua3VydHRla2luIiwKICAidmVyc2lvbiI6IDE2Cn0="}
   }}
 , {"uuid": "sticky-notes-integration@joaocandre", "name": "Sticky Notes Integration", "pname": "sticky-notes-integration", "description": "Gnome Shell extension providing integration for Sticky Notes", "link": "https://extensions.gnome.org/extension/7092/sticky-notes-integration/", "shell_version_map": {
-    "46": {"version": "2", "sha256": "1f7zkch4sxdavkkx0bmiqwrj8wzkcn91f3wmap6l9jvvx8394zmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIGV4dGVuc2lvbiBwcm92aWRpbmcgaW50ZWdyYXRpb24gZm9yIFN0aWNreSBOb3RlcyIsCiAgIm5hbWUiOiAiU3RpY2t5IE5vdGVzIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0aWNreS1ub3Rlcy1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb2FvY2FuZHJlL3N0aWNreS1ub3Rlcy1pbnRlZ3JhdGlvbiIsCiAgInV1aWQiOiAic3RpY2t5LW5vdGVzLWludGVncmF0aW9uQGpvYW9jYW5kcmUiLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjAuMSIKfQ=="}
+    "46": {"version": "4", "sha256": "13wqifmawb5275gnmk4jbxqaaxzqyr5f59458n7r70x2imw4x4ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIGV4dGVuc2lvbiBwcm92aWRpbmcgaW50ZWdyYXRpb24gZm9yIFN0aWNreSBOb3RlcyIsCiAgIm5hbWUiOiAiU3RpY2t5IE5vdGVzIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0aWNreS1ub3Rlcy1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb2FvY2FuZHJlL3N0aWNreS1ub3Rlcy1pbnRlZ3JhdGlvbiIsCiAgInV1aWQiOiAic3RpY2t5LW5vdGVzLWludGVncmF0aW9uQGpvYW9jYW5kcmUiLAogICJ2ZXJzaW9uIjogNCwKICAidmVyc2lvbi1uYW1lIjogIjAuMS4zIgp9"}
   }}
 , {"uuid": "dock-unroll@fthx", "name": "Dock Unroll", "pname": "dock-unroll", "description": "Top panel is triggered at the top edge. Overview is triggered at the bottom edge.\n\n Click on button in top panel to turn on/off autohide top panel.\n\n Very light extension.", "link": "https://extensions.gnome.org/extension/7099/dock-unroll/", "shell_version_map": {
     "45": {"version": "6", "sha256": "0bxrh76jgkvlzh6qmq13s41bx35cj1ghi188c53fpmj8jkgpwkkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBwYW5lbCBpcyB0cmlnZ2VyZWQgYXQgdGhlIHRvcCBlZGdlLiBPdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLlxuXG4gQ2xpY2sgb24gYnV0dG9uIGluIHRvcCBwYW5lbCB0byB0dXJuIG9uL29mZiBhdXRvaGlkZSB0b3AgcGFuZWwuXG5cbiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkRvY2sgVW5yb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stdW5yb2xsIiwKICAidXVpZCI6ICJkb2NrLXVucm9sbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "6", "sha256": "0bxrh76jgkvlzh6qmq13s41bx35cj1ghi188c53fpmj8jkgpwkkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBwYW5lbCBpcyB0cmlnZ2VyZWQgYXQgdGhlIHRvcCBlZGdlLiBPdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLlxuXG4gQ2xpY2sgb24gYnV0dG9uIGluIHRvcCBwYW5lbCB0byB0dXJuIG9uL29mZiBhdXRvaGlkZSB0b3AgcGFuZWwuXG5cbiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkRvY2sgVW5yb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stdW5yb2xsIiwKICAidXVpZCI6ICJkb2NrLXVucm9sbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}
+    "46": {"version": "7", "sha256": "1101y5qsnr9wjik1iqy008vrfq65b3cy5yk26ady6ywi4kfsiccb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBwYW5lbCBpcyB0cmlnZ2VyZWQgYXQgdGhlIHRvcCBlZGdlLiBPdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLlxuXG4gQ2xpY2sgb24gYnV0dG9uIGluIHRvcCBwYW5lbCB0byB0dXJuIG9uL29mZiBhdXRvaGlkZSB0b3AgcGFuZWwuXG5cbiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkRvY2sgVW5yb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stdW5yb2xsIiwKICAidXVpZCI6ICJkb2NrLXVucm9sbEBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "7", "sha256": "1101y5qsnr9wjik1iqy008vrfq65b3cy5yk26ady6ywi4kfsiccb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBwYW5lbCBpcyB0cmlnZ2VyZWQgYXQgdGhlIHRvcCBlZGdlLiBPdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLlxuXG4gQ2xpY2sgb24gYnV0dG9uIGluIHRvcCBwYW5lbCB0byB0dXJuIG9uL29mZiBhdXRvaGlkZSB0b3AgcGFuZWwuXG5cbiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkRvY2sgVW5yb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stdW5yb2xsIiwKICAidXVpZCI6ICJkb2NrLXVucm9sbEBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "language-switch-button@valent-in", "name": "Language Switch Button", "pname": "language-switch-button", "description": "Switch input language with a single click!\n\nAlso makes language indicator uppercase.", "link": "https://extensions.gnome.org/extension/7102/language-switch-button/", "shell_version_map": {
     "42": {"version": "1", "sha256": "1r6ql1az9gzdlbmdk1f6z9khlj4963l1n2r7h579xqdzi8h1rp08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBpbnB1dCBsYW5ndWFnZSB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgIm5hbWUiOiAiTGFuZ3VhZ2UgU3dpdGNoIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ZhbGVudC1pbi9sYW5ndWFnZS1zd2l0Y2gtYnV0dG9uIiwKICAidXVpZCI6ICJsYW5ndWFnZS1zd2l0Y2gtYnV0dG9uQHZhbGVudC1pbiIsCiAgInZlcnNpb24iOiAxCn0="},
@@ -7371,14 +7806,18 @@
     "45": {"version": "2", "sha256": "0y5y373x1vxyzgh1492vxb2i7qg0j20nlzbi32fddpads9lr61gm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBpbnB1dCBsYW5ndWFnZSB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgIm5hbWUiOiAiTGFuZ3VhZ2UgU3dpdGNoIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL2xhbmd1YWdlLXN3aXRjaC1idXR0b24iLAogICJ1dWlkIjogImxhbmd1YWdlLXN3aXRjaC1idXR0b25AdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDIKfQ=="},
     "46": {"version": "2", "sha256": "0y5y373x1vxyzgh1492vxb2i7qg0j20nlzbi32fddpads9lr61gm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBpbnB1dCBsYW5ndWFnZSB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgIm5hbWUiOiAiTGFuZ3VhZ2UgU3dpdGNoIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL2xhbmd1YWdlLXN3aXRjaC1idXR0b24iLAogICJ1dWlkIjogImxhbmd1YWdlLXN3aXRjaC1idXR0b25AdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
+, {"uuid": "vscode-workspaces@prometheontechnologies.com", "name": "VSCode Workspaces", "pname": "vscode-workspaces-gnome", "description": "A VSCode/Codium Workspace management tool-set for GNOME - This extension is not affiliated, funded, or in any way associated with Microsoft and vscode software.", "link": "https://extensions.gnome.org/extension/7117/vscode-workspaces-gnome/", "shell_version_map": {
+    "45": {"version": "8", "sha256": "03h9clbcrr8hc1lz9npwanq1nmlhcmmsp7w21ls2z2c2facwj12p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlNDb2RlL0NvZGl1bSBXb3Jrc3BhY2UgbWFuYWdlbWVudCB0b29sLXNldCBmb3IgR05PTUUgLSBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIHZzY29kZSBzb2Z0d2FyZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIlphbnp5VEhFYmFyIgogIH0sCiAgIm5hbWUiOiAiVlNDb2RlIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnp5VEhFYmFyL3ZzY29kZS1uYXV0aWx1cyIsCiAgInV1aWQiOiAidnNjb2RlLXdvcmtzcGFjZXNAcHJvbWV0aGVvbnRlY2hub2xvZ2llcy5jb20iLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "03h9clbcrr8hc1lz9npwanq1nmlhcmmsp7w21ls2z2c2facwj12p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlNDb2RlL0NvZGl1bSBXb3Jrc3BhY2UgbWFuYWdlbWVudCB0b29sLXNldCBmb3IgR05PTUUgLSBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIHZzY29kZSBzb2Z0d2FyZS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIlphbnp5VEhFYmFyIgogIH0sCiAgIm5hbWUiOiAiVlNDb2RlIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudnNjb2RlLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnp5VEhFYmFyL3ZzY29kZS1uYXV0aWx1cyIsCiAgInV1aWQiOiAidnNjb2RlLXdvcmtzcGFjZXNAcHJvbWV0aGVvbnRlY2hub2xvZ2llcy5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}
+  }}
 , {"uuid": "topPanelNote@sainathmurali.github.io", "name": "Top Panel Note", "pname": "top-panel-note", "description": "A GNOME extension to display static notes in the top panel.", "link": "https://extensions.gnome.org/extension/7120/top-panel-note/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "01hj7v8p4fcpqh486fajyzxfcfg15ky9myhac875w3zr7k5q5zxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRvIGRpc3BsYXkgc3RhdGljIG5vdGVzIGluIHRoZSB0b3AgcGFuZWwuIiwKICAibmFtZSI6ICJUb3AgUGFuZWwgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpbmF0aG11cmFsaS90b3AtcGFuZWwtbm90ZS5naXQiLAogICJ1dWlkIjogInRvcFBhbmVsTm90ZUBzYWluYXRobXVyYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
-    "46": {"version": "2", "sha256": "01hj7v8p4fcpqh486fajyzxfcfg15ky9myhac875w3zr7k5q5zxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRvIGRpc3BsYXkgc3RhdGljIG5vdGVzIGluIHRoZSB0b3AgcGFuZWwuIiwKICAibmFtZSI6ICJUb3AgUGFuZWwgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpbmF0aG11cmFsaS90b3AtcGFuZWwtbm90ZS5naXQiLAogICJ1dWlkIjogInRvcFBhbmVsTm90ZUBzYWluYXRobXVyYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
+    "45": {"version": "4", "sha256": "1rjv97kvz3237yxk3kmhcx1ibk0sc5bznzvahn6v6aa5vwznpwyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRvIGRpc3BsYXkgc3RhdGljIG5vdGVzIGluIHRoZSB0b3AgcGFuZWwuIiwKICAibmFtZSI6ICJUb3AgUGFuZWwgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpbmF0aG11cmFsaS90b3AtcGFuZWwtbm90ZS5naXQiLAogICJ1dWlkIjogInRvcFBhbmVsTm90ZUBzYWluYXRobXVyYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1rjv97kvz3237yxk3kmhcx1ibk0sc5bznzvahn6v6aa5vwznpwyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRvIGRpc3BsYXkgc3RhdGljIG5vdGVzIGluIHRoZSB0b3AgcGFuZWwuIiwKICAibmFtZSI6ICJUb3AgUGFuZWwgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpbmF0aG11cmFsaS90b3AtcGFuZWwtbm90ZS5naXQiLAogICJ1dWlkIjogInRvcFBhbmVsTm90ZUBzYWluYXRobXVyYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "ram_sens@mosazghi", "name": "ram_sens", "pname": "ram_sens", "description": "Monitors ram usage.", "link": "https://extensions.gnome.org/extension/7123/ram_sens/", "shell_version_map": {
     "46": {"version": "3", "sha256": "0qwmz4jmry58fnadr3cwjkimmfccx39g3zgg5zdjwk1rsab8kh9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3JzIHJhbSB1c2FnZS4iLAogICJuYW1lIjogInJhbV9zZW5zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01vc2F6Z2hpL3JhbV9zZW5zIiwKICAidXVpZCI6ICJyYW1fc2Vuc0Btb3NhemdoaSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
-, {"uuid": "iso-clock@tweekism.fairchild.au", "name": "ISO Clock", "pname": "iso-clock", "description": "Changes the clock to an ISO date format (yyyy-mm-dd)\n\nThis is an update to S410's original 'iso8601ish' clock extension\n\nAdded support for day of the week and AM/PM display depending on what you have set in the Gnome Settings app", "link": "https://extensions.gnome.org/extension/7126/iso-clock/", "shell_version_map": {
+, {"uuid": "iso-clock@tweekism.fairchild.au", "name": "ISO Clock", "pname": "iso-clock", "description": "Changes the clock to an ISO date format (yyyy-mm-dd)\n\nSupport for 24 hour or AM/PM display, day of the week and time with or without seconds displayed based on the settings from the Gnome Settings app\n\nFor more information visit the GitHub page using the link below\n\n-- This extension is based on S410's original 'iso8601ish' clock", "link": "https://extensions.gnome.org/extension/7126/iso-clock/", "shell_version_map": {
     "45": {"version": "1", "sha256": "0bx9yikwhmdai309r07xj4nykg497566sx03iv3ypapk71957vbm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNsb2NrIHRvIGFuIElTTyBkYXRlIGZvcm1hdCAoeXl5eS1tbS1kZClcblxuVGhpcyBpcyBhbiB1cGRhdGUgdG8gUzQxMCdzIG9yaWdpbmFsICdpc284NjAxaXNoJyBjbG9jayBleHRlbnNpb25cblxuQWRkZWQgc3VwcG9ydCBmb3IgZGF5IG9mIHRoZSB3ZWVrIGFuZCBBTS9QTSBkaXNwbGF5IGRlcGVuZGluZyBvbiB3aGF0IHlvdSBoYXZlIHNldCBpbiB0aGUgR25vbWUgU2V0dGluZ3MgYXBwIiwKICAibmFtZSI6ICJJU08gQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R3ZWVraXNtL2lzby1jbG9jayIsCiAgInV1aWQiOiAiaXNvLWNsb2NrQHR3ZWVraXNtLmZhaXJjaGlsZC5hdSIsCiAgInZlcnNpb24iOiAxCn0="},
     "46": {"version": "1", "sha256": "0bx9yikwhmdai309r07xj4nykg497566sx03iv3ypapk71957vbm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGNsb2NrIHRvIGFuIElTTyBkYXRlIGZvcm1hdCAoeXl5eS1tbS1kZClcblxuVGhpcyBpcyBhbiB1cGRhdGUgdG8gUzQxMCdzIG9yaWdpbmFsICdpc284NjAxaXNoJyBjbG9jayBleHRlbnNpb25cblxuQWRkZWQgc3VwcG9ydCBmb3IgZGF5IG9mIHRoZSB3ZWVrIGFuZCBBTS9QTSBkaXNwbGF5IGRlcGVuZGluZyBvbiB3aGF0IHlvdSBoYXZlIHNldCBpbiB0aGUgR25vbWUgU2V0dGluZ3MgYXBwIiwKICAibmFtZSI6ICJJU08gQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R3ZWVraXNtL2lzby1jbG9jayIsCiAgInV1aWQiOiAiaXNvLWNsb2NrQHR3ZWVraXNtLmZhaXJjaGlsZC5hdSIsCiAgInZlcnNpb24iOiAxCn0="}
   }}
@@ -7390,21 +7829,274 @@
     "46": {"version": "3", "sha256": "0szkcznaia6dg925qrcmfh8p2vn8b0lxrilwpn4490v51ivk1f0a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIEV4dGVuc2lvbiB0byBmb3JjZSBhbm5veWluZyBub3RpZmljYXRpb25zIHRvIHJlc3BlY3QgZG8gbm90IGRpc3R1cmIgZnVuY3Rpb24uIiwKICAibmFtZSI6ICJSZXNwZWN0IERvIE5vdCBEaXN0dXJiIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlc3BlY3QtZG8tbm90LWRpc3R1cmJAZmFyb2RyaWd1ZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXJvZHJpZ3Vlc3MvcmVzcGVjdC1kby1ub3QtZGlzdHVyYiIsCiAgInV1aWQiOiAicmVzcGVjdC1kby1ub3QtZGlzdHVyYkBmYXJvZHJpZ3Vlc3MiLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "nordvpnquicktoggle@wedaxi.com", "name": "NordVPN Quick Toggle", "pname": "nordvpn-quick-toggle", "description": "GNOME extension that shows a quick toggle to connect/disconnect NordVPN.\nThis extension is not affiliated, funded, or in any way associated with NordVPN.", "link": "https://extensions.gnome.org/extension/7174/nordvpn-quick-toggle/", "shell_version_map": {
-    "45": {"version": "5", "sha256": "1l5sp7qj9fs0klfqqlw22hssa73316xj17ihg9dx5gkkx29rycl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0aGF0IHNob3dzIGEgcXVpY2sgdG9nZ2xlIHRvIGNvbm5lY3QvZGlzY29ubmVjdCBOb3JkVlBOLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTm9yZFZQTi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJub3JkdnBuLXF1aWNrLXRvZ2dsZSIsCiAgIm5hbWUiOiAiTm9yZFZQTiBRdWljayBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1dlZGF4aS9Ob3JkVlBOLVF1aWNrLVRvZ2dsZSIsCiAgInV1aWQiOiAibm9yZHZwbnF1aWNrdG9nZ2xlQHdlZGF4aS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
-    "46": {"version": "5", "sha256": "1l5sp7qj9fs0klfqqlw22hssa73316xj17ihg9dx5gkkx29rycl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0aGF0IHNob3dzIGEgcXVpY2sgdG9nZ2xlIHRvIGNvbm5lY3QvZGlzY29ubmVjdCBOb3JkVlBOLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTm9yZFZQTi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJub3JkdnBuLXF1aWNrLXRvZ2dsZSIsCiAgIm5hbWUiOiAiTm9yZFZQTiBRdWljayBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1dlZGF4aS9Ob3JkVlBOLVF1aWNrLVRvZ2dsZSIsCiAgInV1aWQiOiAibm9yZHZwbnF1aWNrdG9nZ2xlQHdlZGF4aS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}
+    "45": {"version": "8", "sha256": "1inripnndln9xzc60ggi05h7h978309cizbdvc4ngw7105vyyngl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0aGF0IHNob3dzIGEgcXVpY2sgdG9nZ2xlIHRvIGNvbm5lY3QvZGlzY29ubmVjdCBOb3JkVlBOLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTm9yZFZQTi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJub3JkdnBuLXF1aWNrLXRvZ2dsZSIsCiAgIm5hbWUiOiAiTm9yZFZQTiBRdWljayBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9XZWRheGkvTm9yZFZQTi1RdWljay1Ub2dnbGUiLAogICJ1dWlkIjogIm5vcmR2cG5xdWlja3RvZ2dsZUB3ZWRheGkuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "1inripnndln9xzc60ggi05h7h978309cizbdvc4ngw7105vyyngl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0aGF0IHNob3dzIGEgcXVpY2sgdG9nZ2xlIHRvIGNvbm5lY3QvZGlzY29ubmVjdCBOb3JkVlBOLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTm9yZFZQTi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJub3JkdnBuLXF1aWNrLXRvZ2dsZSIsCiAgIm5hbWUiOiAiTm9yZFZQTiBRdWljayBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9XZWRheGkvTm9yZFZQTi1RdWljay1Ub2dnbGUiLAogICJ1dWlkIjogIm5vcmR2cG5xdWlja3RvZ2dsZUB3ZWRheGkuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "1inripnndln9xzc60ggi05h7h978309cizbdvc4ngw7105vyyngl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0aGF0IHNob3dzIGEgcXVpY2sgdG9nZ2xlIHRvIGNvbm5lY3QvZGlzY29ubmVjdCBOb3JkVlBOLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTm9yZFZQTi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJub3JkdnBuLXF1aWNrLXRvZ2dsZSIsCiAgIm5hbWUiOiAiTm9yZFZQTiBRdWljayBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9XZWRheGkvTm9yZFZQTi1RdWljay1Ub2dnbGUiLAogICJ1dWlkIjogIm5vcmR2cG5xdWlja3RvZ2dsZUB3ZWRheGkuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "screen-rotator@bronzdragon.github.io", "name": "Screen Rotator", "pname": "screen-rotator", "description": "Allows you to quickly rotate the screen.", "link": "https://extensions.gnome.org/extension/7177/screen-rotator/", "shell_version_map": {
     "45": {"version": "2", "sha256": "1rqf6nn1bdr97h6g35082hwcadz4mrmrmxsi7hlwscls5bxs14lh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB5b3UgdG8gcXVpY2tseSByb3RhdGUgdGhlIHNjcmVlbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JlZW4tcm90YXRvciIsCiAgIm5hbWUiOiAiU2NyZWVuIFJvdGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jyb256ZHJhZ29uL3NjcmVlbi1yb3RhdG9yIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRvckBicm9uemRyYWdvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"},
     "46": {"version": "2", "sha256": "1rqf6nn1bdr97h6g35082hwcadz4mrmrmxsi7hlwscls5bxs14lh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB5b3UgdG8gcXVpY2tseSByb3RhdGUgdGhlIHNjcmVlbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JlZW4tcm90YXRvciIsCiAgIm5hbWUiOiAiU2NyZWVuIFJvdGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jyb256ZHJhZ29uL3NjcmVlbi1yb3RhdG9yIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRvckBicm9uemRyYWdvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}
   }}
-, {"uuid": "syncthing-toggle@rehhouari.github.com", "name": "Syncthing Toggle", "pname": "syncthing-toggle", "description": "A GNOME quick setting for turning on and off the Syncthing systemd service and opening the Web GUI", "link": "https://extensions.gnome.org/extension/7180/syncthing-toggle/", "shell_version_map": {
-    "46": {"version": "2", "sha256": "07r44x55krqa2c1j4xa81vkzi7als3b0g9daryzj1yj0xsg67ki6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgcXVpY2sgc2V0dGluZyBmb3IgdHVybmluZyBvbiBhbmQgb2ZmIHRoZSBTeW5jdGhpbmcgc2VydmljZSBhbmQgb3BlbmluZyB0aGUgV2ViIEdVSSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogInJlaGhvdWFyaSIKICB9LAogICJuYW1lIjogIlN5bmN0aGluZyBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nLXRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZWhob3VhcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy10b2dnbGUiLAogICJ1dWlkIjogInN5bmN0aGluZy10b2dnbGVAcmVoaG91YXJpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
+, {"uuid": "syncthing-toggle@rehhouari.github.com", "name": "Syncthing Toggle", "pname": "syncthing-toggle", "description": "A GNOME quick setting for turning on and off the Syncthing service and opening the Web GUI", "link": "https://extensions.gnome.org/extension/7180/syncthing-toggle/", "shell_version_map": {
+    "46": {"version": "3", "sha256": "0ylhj7vjcwjdql1w9pmxax7zd6bhvpv607npxznidgpv1khwhp0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgcXVpY2sgc2V0dGluZyBmb3IgdHVybmluZyBvbiBhbmQgb2ZmIHRoZSBTeW5jdGhpbmcgc2VydmljZSBhbmQgb3BlbmluZyB0aGUgV2ViIEdVSSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogInJlaGhvdWFyaSIKICB9LAogICJuYW1lIjogIlN5bmN0aGluZyBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nLXRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZWhob3VhcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy10b2dnbGUiLAogICJ1dWlkIjogInN5bmN0aGluZy10b2dnbGVAcmVoaG91YXJpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "quick-settings-resolution-and-refresh-rate@rukins.github.io", "name": "Resolution and Refresh Rate in Quick Settings", "pname": "resolution-and-refresh-rate-in-quick-settings", "description": "GNOME Shell extension to add Resolution and Refresh Rate toggle menu to Quick Settings", "link": "https://extensions.gnome.org/extension/7183/resolution-and-refresh-rate-in-quick-settings/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "0xdx076q4gaf60jx3bsrzqwm54qjp39rp1q6maf61x5n8lqbprpm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBhZGQgUmVzb2x1dGlvbiBhbmQgUmVmcmVzaCBSYXRlIHRvZ2dsZSBtZW51IHRvIFF1aWNrIFNldHRpbmdzIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIlJlc29sdXRpb24gYW5kIFJlZnJlc2ggUmF0ZSBpbiBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J1a2lucy9xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLXJlc29sdXRpb24tYW5kLXJlZnJlc2gtcmF0ZUBydWtpbnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "46": {"version": "2", "sha256": "0xdx076q4gaf60jx3bsrzqwm54qjp39rp1q6maf61x5n8lqbprpm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBhZGQgUmVzb2x1dGlvbiBhbmQgUmVmcmVzaCBSYXRlIHRvZ2dsZSBtZW51IHRvIFF1aWNrIFNldHRpbmdzIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIlJlc29sdXRpb24gYW5kIFJlZnJlc2ggUmF0ZSBpbiBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J1a2lucy9xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLXJlc29sdXRpb24tYW5kLXJlZnJlc2gtcmF0ZUBydWtpbnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+    "45": {"version": "3", "sha256": "1ld34bg6vxx7548shfwdkc76ps07n44prmk4x0y6amrp5avypz06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBhZGQgUmVzb2x1dGlvbiBhbmQgUmVmcmVzaCBSYXRlIHRvZ2dsZSBtZW51IHRvIFF1aWNrIFNldHRpbmdzIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIlJlc29sdXRpb24gYW5kIFJlZnJlc2ggUmF0ZSBpbiBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydWtpbnMvcXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGVAcnVraW5zLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="},
+    "46": {"version": "3", "sha256": "1ld34bg6vxx7548shfwdkc76ps07n44prmk4x0y6amrp5avypz06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBhZGQgUmVzb2x1dGlvbiBhbmQgUmVmcmVzaCBSYXRlIHRvZ2dsZSBtZW51IHRvIFF1aWNrIFNldHRpbmdzIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIlJlc29sdXRpb24gYW5kIFJlZnJlc2ggUmF0ZSBpbiBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydWtpbnMvcXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGVAcnVraW5zLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="},
+    "47": {"version": "3", "sha256": "1ld34bg6vxx7548shfwdkc76ps07n44prmk4x0y6amrp5avypz06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBhZGQgUmVzb2x1dGlvbiBhbmQgUmVmcmVzaCBSYXRlIHRvZ2dsZSBtZW51IHRvIFF1aWNrIFNldHRpbmdzIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIlJlc29sdXRpb24gYW5kIFJlZnJlc2ggUmF0ZSBpbiBRdWljayBTZXR0aW5ncyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydWtpbnMvcXVpY2stc2V0dGluZ3MtcmVzb2x1dGlvbi1hbmQtcmVmcmVzaC1yYXRlIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1yZXNvbHV0aW9uLWFuZC1yZWZyZXNoLXJhdGVAcnVraW5zLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}
+  }}
+, {"uuid": "text-clock@benica.dev", "name": "Text Clock", "pname": "text-clock", "description": "A simple text clock for the GNOME Shell", "link": "https://extensions.gnome.org/extension/7186/text-clock/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "10vy61i7x4dzzrslda1bc6s0hzs7ak2qxx3fgm4a42pmwvsxcq6a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHRleHQgY2xvY2sgZm9yIHRoZSBHTk9NRSBTaGVsbCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAid3RiZW5pY2EiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGV4dC1jbG9ja0BiZW5pY2EuZGV2IiwKICAibmFtZSI6ICJUZXh0IENsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRleHQtY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93dGJlbmljYS90ZXh0LWNsb2NrIiwKICAidXVpZCI6ICJ0ZXh0LWNsb2NrQGJlbmljYS5kZXYiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjEuMC4zIgp9"},
+    "46": {"version": "3", "sha256": "10vy61i7x4dzzrslda1bc6s0hzs7ak2qxx3fgm4a42pmwvsxcq6a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHRleHQgY2xvY2sgZm9yIHRoZSBHTk9NRSBTaGVsbCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAid3RiZW5pY2EiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGV4dC1jbG9ja0BiZW5pY2EuZGV2IiwKICAibmFtZSI6ICJUZXh0IENsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRleHQtY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93dGJlbmljYS90ZXh0LWNsb2NrIiwKICAidXVpZCI6ICJ0ZXh0LWNsb2NrQGJlbmljYS5kZXYiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjEuMC4zIgp9"},
+    "47": {"version": "3", "sha256": "10vy61i7x4dzzrslda1bc6s0hzs7ak2qxx3fgm4a42pmwvsxcq6a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHRleHQgY2xvY2sgZm9yIHRoZSBHTk9NRSBTaGVsbCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAid3RiZW5pY2EiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidGV4dC1jbG9ja0BiZW5pY2EuZGV2IiwKICAibmFtZSI6ICJUZXh0IENsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRleHQtY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93dGJlbmljYS90ZXh0LWNsb2NrIiwKICAidXVpZCI6ICJ0ZXh0LWNsb2NrQGJlbmljYS5kZXYiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjEuMC4zIgp9"}
   }}
 , {"uuid": "nextdns@mysticnico.github.com", "name": "NextDNS indicator", "pname": "nextdns-indicator", "description": "An indicator gnome extension for controlling next-dns cli. This extension is not affiliated, funded, or in any way associated with NextDNS.", "link": "https://extensions.gnome.org/extension/7187/nextdns-indicator/", "shell_version_map": {
     "46": {"version": "2", "sha256": "1r1n5gi111sfyzq5kdza2v1w5scm7jsxx33n21fvv5f9jcf1x3j0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2xzIHRoZSBOZXh0RE5TIHNlcnZpY2UuIiwKICAibmFtZSI6ICJOZXh0RE5TIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teXN0aWNOaWNvQ1ovbmV4dGRucy1nbm9tZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogIm5leHRkbnNAbXlzdGljbmljby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
+, {"uuid": "lazy_worker@free.com", "name": "Lazy worker", "pname": "lazy-worker", "description": "Extension the display of working day percentages", "link": "https://extensions.gnome.org/extension/7190/lazy-worker/", "shell_version_map": {
+    "43": {"version": "2", "sha256": "0v29056w4xfc22qawlg44ahv8mz17l4f6hzjjn6yzs540yf41vc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0aGUgZGlzcGxheSBvZiB3b3JraW5nIGRheSBwZXJjZW50YWdlcyIsCiAgIm5hbWUiOiAiTGF6eSB3b3JrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGF6eV93b3JrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09sZWdkNWc1Ni9MYXp5V29ya2VyRXh0ZW50aW9uIiwKICAidXVpZCI6ICJsYXp5X3dvcmtlckBmcmVlLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
+    "44": {"version": "2", "sha256": "0v29056w4xfc22qawlg44ahv8mz17l4f6hzjjn6yzs540yf41vc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0aGUgZGlzcGxheSBvZiB3b3JraW5nIGRheSBwZXJjZW50YWdlcyIsCiAgIm5hbWUiOiAiTGF6eSB3b3JrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGF6eV93b3JrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09sZWdkNWc1Ni9MYXp5V29ya2VyRXh0ZW50aW9uIiwKICAidXVpZCI6ICJsYXp5X3dvcmtlckBmcmVlLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
+  }}
+, {"uuid": "maximized-by-default@brennoflavio.com.br", "name": "Maximized by default reborn", "pname": "maximized-by-default-reborn", "description": "Make all windows maximized on start. Fork of https://github.com/aXe1/gnome-shell-extension-maximized-by-default with Gnome 46 support", "link": "https://extensions.gnome.org/extension/7196/maximized-by-default-reborn/", "shell_version_map": {
+    "46": {"version": "1", "sha256": "0jd323i9ykm0yhfd25cd6rvxw0m1avsx99l74yacfq59mv164842", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWxsIHdpbmRvd3MgbWF4aW1pemVkIG9uIHN0YXJ0LiBGb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9hWGUxL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZWQtYnktZGVmYXVsdCB3aXRoIEdub21lIDQ2IHN1cHBvcnQiLAogICJuYW1lIjogIk1heGltaXplZCBieSBkZWZhdWx0IHJlYm9ybiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVubm9mbGF2aW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplZC1ieS1kZWZhdWx0IiwKICAidXVpZCI6ICJtYXhpbWl6ZWQtYnktZGVmYXVsdEBicmVubm9mbGF2aW8uY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}
+  }}
+, {"uuid": "grownup_notifications@08.2024.ayhamalali", "name": "Grown-up notifications", "pname": "grown-up-notifications", "description": "Do not allow apps to delete their own notifications (e.g. web skype does that)", "link": "https://extensions.gnome.org/extension/7206/grown-up-notifications/", "shell_version_map": {
+    "46": {"version": "2", "sha256": "1qi2ly23by34v09p1hbxplqn8bv1ji96y1kvbfymmsnz0vvhw716", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvIG5vdCBhbGxvdyBhcHBzIHRvIGRlbGV0ZSB0aGVpciBvd24gbm90aWZpY2F0aW9ucyAoZS5nLiB3ZWIgc2t5cGUgZG9lcyB0aGF0KSIsCiAgIm5hbWUiOiAiR3Jvd24tdXAgbm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWhhbUFsLUFsaS9ncm93bnVwX25vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImdyb3dudXBfbm90aWZpY2F0aW9uc0AwOC4yMDI0LmF5aGFtYWxhbGkiLAogICJ2ZXJzaW9uIjogMgp9"}
+  }}
+, {"uuid": "notification-position@github.com", "name": "Notification Position", "pname": "notification-position", "description": "Move the notification position", "link": "https://extensions.gnome.org/extension/7209/notification-position/", "shell_version_map": {
+    "46": {"version": "1", "sha256": "1dacxdg7wjxsqx160zay2rq63haz7bxbq2i51zwnv19y93yx9rwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBaG1lZCBTaW5rZWF0IiwKICAiZGVzY3JpcHRpb24iOiAiTW92ZSB0aGUgbm90aWZpY2F0aW9uIHBvc2l0aW9uIiwKICAibmFtZSI6ICJOb3RpZmljYXRpb24gUG9zaXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWhtZWQtU2lua2VhdC9ub3RpZmljYXRpb24tcG9zaXRpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}
+  }}
+, {"uuid": "preedit-highlight-popup@nishi-yuki.github.com", "name": "Preedit Highlight Popup", "pname": "preedit-highlight-popup", "description": "Waylandセッション向け日本語入力補助ツールです。かな漢字変換時に未確定文字列を表示するポップアップを追加します。ポップアップ内では変換範囲が太字かつ下線つきで表示されるので、変換範囲の指定が簡単になります。\n\nThis extension helps you input Japanese on Wayland session. It displays preedit text in popup during conversion, and displays conversion region in bold and underline. It helps you change conversion region.", "link": "https://extensions.gnome.org/extension/7212/preedit-highlight-popup/", "shell_version_map": {
+    "46": {"version": "2", "sha256": "07p6gy8f0imypilx6kf8bxgqpi9b27h830dc9jgdshgs3sql5aib", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldheWxhbmRcdTMwYmJcdTMwYzNcdTMwYjdcdTMwZTdcdTMwZjNcdTU0MTFcdTMwNTFcdTY1ZTVcdTY3MmNcdThhOWVcdTUxNjVcdTUyOWJcdTg4ZGNcdTUyYTlcdTMwYzRcdTMwZmNcdTMwZWJcdTMwNjdcdTMwNTlcdTMwMDJcdTMwNGJcdTMwNmFcdTZmMjJcdTViNTdcdTU5MDlcdTYzZGJcdTY2NDJcdTMwNmJcdTY3MmFcdTc4YmFcdTViOWFcdTY1ODdcdTViNTdcdTUyMTdcdTMwOTJcdTg4NjhcdTc5M2FcdTMwNTlcdTMwOGJcdTMwZGRcdTMwYzNcdTMwZDdcdTMwYTJcdTMwYzNcdTMwZDdcdTMwOTJcdThmZmRcdTUyYTBcdTMwNTdcdTMwN2VcdTMwNTlcdTMwMDJcdTMwZGRcdTMwYzNcdTMwZDdcdTMwYTJcdTMwYzNcdTMwZDdcdTUxODVcdTMwNjdcdTMwNmZcdTU5MDlcdTYzZGJcdTdiYzRcdTU2ZjJcdTMwNGNcdTU5MmFcdTViNTdcdTMwNGJcdTMwNjRcdTRlMGJcdTdkZGFcdTMwNjRcdTMwNGRcdTMwNjdcdTg4NjhcdTc5M2FcdTMwNTVcdTMwOGNcdTMwOGJcdTMwNmVcdTMwNjdcdTMwMDFcdTU5MDlcdTYzZGJcdTdiYzRcdTU2ZjJcdTMwNmVcdTYzMDdcdTViOWFcdTMwNGNcdTdjMjFcdTUzNThcdTMwNmJcdTMwNmFcdTMwOGFcdTMwN2VcdTMwNTlcdTMwMDJcblxuVGhpcyBleHRlbnNpb24gaGVscHMgeW91IGlucHV0IEphcGFuZXNlIG9uIFdheWxhbmQgc2Vzc2lvbi4gSXQgZGlzcGxheXMgcHJlZWRpdCB0ZXh0IGluIHBvcHVwIGR1cmluZyBjb252ZXJzaW9uLCBhbmQgZGlzcGxheXMgY29udmVyc2lvbiByZWdpb24gaW4gYm9sZCBhbmQgdW5kZXJsaW5lLiBJdCBoZWxwcyB5b3UgY2hhbmdlIGNvbnZlcnNpb24gcmVnaW9uLiIsCiAgIm5hbWUiOiAiUHJlZWRpdCBIaWdobGlnaHQgUG9wdXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlzaGkteXVraS9wcmVlZGl0LWhpZ2hsaWdodC1wb3B1cCIsCiAgInV1aWQiOiAicHJlZWRpdC1oaWdobGlnaHQtcG9wdXBAbmlzaGkteXVraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+  }}
+, {"uuid": "restartto@tiagoporsch.github.io", "name": "Restart To", "pname": "restart-to", "description": "Adds a menu item to restart to any other EFI boot entry", "link": "https://extensions.gnome.org/extension/7215/restart-to/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "1qf9ry1vaw3hxh2i8rq80nlp2ii1chy4bmyh3ah11wyi3pwbb0fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBtZW51IGl0ZW0gdG8gcmVzdGFydCB0byBhbnkgb3RoZXIgRUZJIGJvb3QgZW50cnkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAibmFtZSI6ICJSZXN0YXJ0IFRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlhZ29wb3JzY2gvcmVzdGFydHRvIiwKICAidXVpZCI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "46": {"version": "4", "sha256": "1qf9ry1vaw3hxh2i8rq80nlp2ii1chy4bmyh3ah11wyi3pwbb0fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBtZW51IGl0ZW0gdG8gcmVzdGFydCB0byBhbnkgb3RoZXIgRUZJIGJvb3QgZW50cnkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAibmFtZSI6ICJSZXN0YXJ0IFRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlhZ29wb3JzY2gvcmVzdGFydHRvIiwKICAidXVpZCI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "47": {"version": "4", "sha256": "1qf9ry1vaw3hxh2i8rq80nlp2ii1chy4bmyh3ah11wyi3pwbb0fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBtZW51IGl0ZW0gdG8gcmVzdGFydCB0byBhbnkgb3RoZXIgRUZJIGJvb3QgZW50cnkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAibmFtZSI6ICJSZXN0YXJ0IFRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlhZ29wb3JzY2gvcmVzdGFydHRvIiwKICAidXVpZCI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+  }}
+, {"uuid": "gamebar-overlay@dekotale.github.io", "name": "GameBar Overlay", "pname": "gamebar-overlay", "description": "A fullscreen overlay widget for GNOME that displays useful information, audio controls and more.", "link": "https://extensions.gnome.org/extension/7221/gamebar-overlay/", "shell_version_map": {
+    "46": {"version": "6", "sha256": "129aqyjvzzm6nd9y935rqz9wy81bw9x9d2x8ch2z5nyc20pihkkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rla290YWxlL0dhbWVCYXItT3ZlcmxheSIsCiAgInV1aWQiOiAiZ2FtZWJhci1vdmVybGF5QGRla290YWxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "47": {"version": "6", "sha256": "129aqyjvzzm6nd9y935rqz9wy81bw9x9d2x8ch2z5nyc20pihkkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rla290YWxlL0dhbWVCYXItT3ZlcmxheSIsCiAgInV1aWQiOiAiZ2FtZWJhci1vdmVybGF5QGRla290YWxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}
+  }}
+, {"uuid": "rebootintowindows@nimz.cool", "name": "RebootIntoWindowsWithGRUB", "pname": "rebootintowindows", "description": "Reboot system into Windows with GRUB\n\nIt is a fork of RebootToUEFI.", "link": "https://extensions.gnome.org/extension/7224/rebootintowindows/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "1pgshp8w9w9cra7fvh8p71ypb6ygb6x1jangl3ka3b967qh3ir6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBXaW5kb3dzXG5cbkl0IGlzIGEgZm9yayBvZiBSZWJvb3RUb1VFRkkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290aW50b3dpbmRvd3NAbmltei5jb29sIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290SW50b1dpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qdXNuaW0vcmVib290aW50b3dpbmRvd3MiLAogICJ1dWlkIjogInJlYm9vdGludG93aW5kb3dzQG5pbXouY29vbCIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1pgshp8w9w9cra7fvh8p71ypb6ygb6x1jangl3ka3b967qh3ir6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBXaW5kb3dzXG5cbkl0IGlzIGEgZm9yayBvZiBSZWJvb3RUb1VFRkkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290aW50b3dpbmRvd3NAbmltei5jb29sIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290SW50b1dpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qdXNuaW0vcmVib290aW50b3dpbmRvd3MiLAogICJ1dWlkIjogInJlYm9vdGludG93aW5kb3dzQG5pbXouY29vbCIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1pgshp8w9w9cra7fvh8p71ypb6ygb6x1jangl3ka3b967qh3ir6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBXaW5kb3dzXG5cbkl0IGlzIGEgZm9yayBvZiBSZWJvb3RUb1VFRkkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290aW50b3dpbmRvd3NAbmltei5jb29sIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290SW50b1dpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qdXNuaW0vcmVib290aW50b3dpbmRvd3MiLAogICJ1dWlkIjogInJlYm9vdGludG93aW5kb3dzQG5pbXouY29vbCIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "firefox-profiles@arnaud.work", "name": "Firefox Profiles", "pname": "firefox-profiles", "description": "This GNOME extension makes it easy to launch Firefox with a specific profile from the indicator menu.\nThis extension is not affiliated, funded, or in any way associated with Mozilla and Firefox.", "link": "https://extensions.gnome.org/extension/7236/firefox-profiles/", "shell_version_map": {
+    "46": {"version": "1", "sha256": "17wq2ifjl23pdmzw6gyk43pymaqcx3y6xsqxid4k0mlw6i98yljb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgR05PTUUgZXh0ZW5zaW9uIG1ha2VzIGl0IGVhc3kgdG8gbGF1bmNoIEZpcmVmb3ggd2l0aCBhIHNwZWNpZmljIHByb2ZpbGUgZnJvbSB0aGUgaW5kaWNhdG9yIG1lbnUuLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTW96aWxsYSBhbmQgRmlyZWZveC4iLAogICJuYW1lIjogIkZpcmVmb3ggUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF4eXovZmlyZWZveC1wcm9maWxlcyIsCiAgInV1aWQiOiAiZmlyZWZveC1wcm9maWxlc0Bhcm5hdWQud29yayIsCiAgInZlcnNpb24iOiAxCn0="}
+  }}
+, {"uuid": "impanel-with-osk@52hertz-reunion.site", "name": "IM Panel integrated with OSK", "pname": "im-panel-integrated-with-osk", "description": "IM Panel Integrated with OSK is a GNOME Shell extension that improves the operation of input methods on touch screens by adding several features to the GNOME OnScreen Keyboard.\nThis extension is based on [input-method-panel](https://extensions.gnome.org/extension/261/kimpanel/).", "link": "https://extensions.gnome.org/extension/7239/im-panel-integrated-with-osk/", "shell_version_map": {
+    "46": {"version": "4", "sha256": "1fs6p0xl54nykf3rcsg0clj604ap63bnvlrqfpnk9rij6n3nx6ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklNIFBhbmVsIEludGVncmF0ZWQgd2l0aCBPU0sgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gdGhhdCBpbXByb3ZlcyB0aGUgb3BlcmF0aW9uIG9mIGlucHV0IG1ldGhvZHMgb24gdG91Y2ggc2NyZWVucyBieSBhZGRpbmcgc2V2ZXJhbCBmZWF0dXJlcyB0byB0aGUgR05PTUUgT25TY3JlZW4gS2V5Ym9hcmQuXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiBbaW5wdXQtbWV0aG9kLXBhbmVsXShodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yNjEva2ltcGFuZWwvKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpbXBhbmVsLXdpdGgtb3NrQDUyaGVydHotcmV1bmlvbi5zaXRlIiwKICAibmFtZSI6ICJJTSBQYW5lbCBpbnRlZ3JhdGVkIHdpdGggT1NLIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmltcGFuZWwtd2l0aC1vc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsbGVsdWphaGRyaXZlL2ltcGFuZWwtd2l0aC1vc2siLAogICJ1dWlkIjogImltcGFuZWwtd2l0aC1vc2tANTJoZXJ0ei1yZXVuaW9uLnNpdGUiLAogICJ2ZXJzaW9uIjogNAp9"}
+  }}
+, {"uuid": "system-software-info@blackredstart", "name": "System Software Info", "pname": "system-software-info", "description": "Show operating system, kernel and shell info in the top bar.", "link": "https://extensions.gnome.org/extension/7242/system-software-info/", "shell_version_map": {
+    "46": {"version": "1", "sha256": "19g31d5sxjg9rb0r04vmbxrgpdnjish8kj81wlc0mdpfczqys7sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgb3BlcmF0aW5nIHN5c3RlbSwga2VybmVsIGFuZCBzaGVsbCBpbmZvIGluIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIFNvZnR3YXJlIEluZm8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLXNvZnR3YXJlLWluZm8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYmxhY2tyZWRzdGFydHMvc3lzdGVtLXNvZnR3YXJlLWluZm8iLAogICJ1dWlkIjogInN5c3RlbS1zb2Z0d2FyZS1pbmZvQGJsYWNrcmVkc3RhcnQiLAogICJ2ZXJzaW9uIjogMQp9"}
+  }}
+, {"uuid": "session-switcher@sevos.io", "name": "SevosIO: Session Switcher", "pname": "sevosio-session-switcher", "description": "Allows session switching between users. Read instructions at https://github.com/sevos/gnome-shell-session-switcher/", "link": "https://extensions.gnome.org/extension/7254/sevosio-session-switcher/", "shell_version_map": {
+    "46": {"version": "3", "sha256": "15h5ig11d0ggbglk6mh1x020vr235lhwsf5c4c8w09dmvilg8yay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBzZXNzaW9uIHN3aXRjaGluZyBiZXR3ZWVuIHVzZXJzLiBSZWFkIGluc3RydWN0aW9ucyBhdCBodHRwczovL2dpdGh1Yi5jb20vc2V2b3MvZ25vbWUtc2hlbGwtc2Vzc2lvbi1zd2l0Y2hlci8iLAogICJuYW1lIjogIlNldm9zSU86IFNlc3Npb24gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2V2b3MvZ25vbWUtc2hlbGwtc2Vzc2lvbi1zd2l0Y2hlciIsCiAgInV1aWQiOiAic2Vzc2lvbi1zd2l0Y2hlckBzZXZvcy5pbyIsCiAgInZlcnNpb24iOiAzCn0="}
+  }}
+, {"uuid": "whoami-topbar@mikemolina.github.io", "name": "Whoami in top bar", "pname": "whoami-in-top-bar", "description": "Show the effective user ID in the top bar samely as returned by whoami command.", "link": "https://extensions.gnome.org/extension/7260/whoami-in-top-bar/", "shell_version_map": {
+    "45": {"version": "5", "sha256": "1svcif4gdyp5nhl0sq90vb3krgnszz8xp18wxajwx38qgns9fh34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGVmZmVjdGl2ZSB1c2VyIElEIGluIHRoZSB0b3AgYmFyIHNhbWVseSBhcyByZXR1cm5lZCBieSB3aG9hbWkgY29tbWFuZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aG9hbWktdG9wYmFyQG1pa2Vtb2xpbmEuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJXaG9hbWkgaW4gdG9wIGJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aG9hbWktdG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWtlbW9saW5hL3dob2FtaS10b3BiYXIiLAogICJ1dWlkIjogIndob2FtaS10b3BiYXJAbWlrZW1vbGluYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNSwKICAidmVyc2lvbi1uYW1lIjogIjMuMCIKfQ=="},
+    "46": {"version": "5", "sha256": "1svcif4gdyp5nhl0sq90vb3krgnszz8xp18wxajwx38qgns9fh34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGVmZmVjdGl2ZSB1c2VyIElEIGluIHRoZSB0b3AgYmFyIHNhbWVseSBhcyByZXR1cm5lZCBieSB3aG9hbWkgY29tbWFuZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aG9hbWktdG9wYmFyQG1pa2Vtb2xpbmEuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJXaG9hbWkgaW4gdG9wIGJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aG9hbWktdG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWtlbW9saW5hL3dob2FtaS10b3BiYXIiLAogICJ1dWlkIjogIndob2FtaS10b3BiYXJAbWlrZW1vbGluYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNSwKICAidmVyc2lvbi1uYW1lIjogIjMuMCIKfQ=="}
+  }}
+, {"uuid": "better-desktop-zoom@popov895.ukr.net", "name": "Better Desktop Zoom", "pname": "better-desktop-zoom", "description": "A better experience with the GNOME magnifier", "link": "https://extensions.gnome.org/extension/7263/better-desktop-zoom/", "shell_version_map": {
+    "42": {"version": "10", "sha256": "1nbsxgwxzha3jk8v30bkmdha7pm8clvj6jgwp7ykbxnvhg6h7vk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "43": {"version": "10", "sha256": "1nbsxgwxzha3jk8v30bkmdha7pm8clvj6jgwp7ykbxnvhg6h7vk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "44": {"version": "10", "sha256": "1nbsxgwxzha3jk8v30bkmdha7pm8clvj6jgwp7ykbxnvhg6h7vk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
+    "45": {"version": "11", "sha256": "13mfqvp5vbgxa8wn9v379l2rjp4dfn8qblw2y101nzpkm6s1aabm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "46": {"version": "11", "sha256": "13mfqvp5vbgxa8wn9v379l2rjp4dfn8qblw2y101nzpkm6s1aabm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
+    "47": {"version": "11", "sha256": "13mfqvp5vbgxa8wn9v379l2rjp4dfn8qblw2y101nzpkm6s1aabm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+  }}
+, {"uuid": "lilypad@shendrew.github.io", "name": "Lilypad: app indicator manager", "pname": "lilypad", "description": "Organize, hide, and reorder top bar icons\n- button to toggle icon visibility\n- reorder items by drag and drop\n- support for non-GTK native apps (eg. Discord, Slack)", "link": "https://extensions.gnome.org/extension/7266/lilypad/", "shell_version_map": {
+    "46": {"version": "5", "sha256": "03hzh320cin7v7l6ar2m7nz3rb1xyhzdg8syp2l3xmx4kvq821jv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaGVuZHJldy9MaWx5cGFkIiwKICAidXVpZCI6ICJsaWx5cGFkQHNoZW5kcmV3LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1LAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4wLjIiCn0="}
+  }}
+, {"uuid": "bilingual-app-search@pwa.lu", "name": "Bilingual App Search", "pname": "bilingual-app-search", "description": "Make GNOME Search look up applications in both English and your system's locale.", "link": "https://extensions.gnome.org/extension/7269/bilingual-app-search/", "shell_version_map": {
+    "46": {"version": "3", "sha256": "1c7xz4msvb4d95hip6ymn73s70f3vxl5z6y60gswr0rhdnysm3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgR05PTUUgU2VhcmNoIGxvb2sgdXAgYXBwbGljYXRpb25zIGluIGJvdGggRW5nbGlzaCBhbmQgeW91ciBzeXN0ZW0ncyBsb2NhbGUuIiwKICAibmFtZSI6ICJCaWxpbmd1YWwgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3Jhenlnb2xlbS9iaWxpbmd1YWwtYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiYmlsaW5ndWFsLWFwcC1zZWFyY2hAcHdhLmx1IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "3", "sha256": "1c7xz4msvb4d95hip6ymn73s70f3vxl5z6y60gswr0rhdnysm3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgR05PTUUgU2VhcmNoIGxvb2sgdXAgYXBwbGljYXRpb25zIGluIGJvdGggRW5nbGlzaCBhbmQgeW91ciBzeXN0ZW0ncyBsb2NhbGUuIiwKICAibmFtZSI6ICJCaWxpbmd1YWwgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3Jhenlnb2xlbS9iaWxpbmd1YWwtYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiYmlsaW5ndWFsLWFwcC1zZWFyY2hAcHdhLmx1IiwKICAidmVyc2lvbiI6IDMKfQ=="}
+  }}
+, {"uuid": "ollama-tray@fxgsell.github.com", "name": "Ollama Tray", "pname": "ollama-indicator", "description": "An indicator that let you run models with Ollama.", "link": "https://extensions.gnome.org/extension/7275/ollama-indicator/", "shell_version_map": {
+    "45": {"version": "7", "sha256": "1xk1yp72cyfqydamdif7hlnq67nd9rkh7dc4x8j148g5jbh7hn4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGluZGljYXRvciB0aGF0IGxldCB5b3UgcnVuIG1vZGVscyB3aXRoIE9sbGFtYS4iLAogICJuYW1lIjogIk9sbGFtYSBUcmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9sbGFtYS10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9meGdzZWxsL29sbGFtYS10cmF5IiwKICAidXVpZCI6ICJvbGxhbWEtdHJheUBmeGdzZWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
+    "46": {"version": "7", "sha256": "1xk1yp72cyfqydamdif7hlnq67nd9rkh7dc4x8j148g5jbh7hn4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGluZGljYXRvciB0aGF0IGxldCB5b3UgcnVuIG1vZGVscyB3aXRoIE9sbGFtYS4iLAogICJuYW1lIjogIk9sbGFtYSBUcmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9sbGFtYS10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9meGdzZWxsL29sbGFtYS10cmF5IiwKICAidXVpZCI6ICJvbGxhbWEtdHJheUBmeGdzZWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
+  }}
+, {"uuid": "display-configuration-switcher@knokelmaat.gitlab.com", "name": "Display Configuration Switcher", "pname": "display-configuration-switcher", "description": "Quickly change the display configuration from the system menu. Multiple display configurations can be saved with custom names. A display configuration contains all display settings: resolution, scaling, orientation, position...", "link": "https://extensions.gnome.org/extension/7281/display-configuration-switcher/", "shell_version_map": {
+    "46": {"version": "6", "sha256": "0a6gasvzgx6yh3bqilqpas9jd0l21rxqaf14bljx985zhvaxnfnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktY29uZmlndXJhdGlvbi1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpc3BsYXktY29uZmlndXJhdGlvbi1zd2l0Y2hlckBrbm9rZWxtYWF0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
+    "47": {"version": "6", "sha256": "0a6gasvzgx6yh3bqilqpas9jd0l21rxqaf14bljx985zhvaxnfnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktY29uZmlndXJhdGlvbi1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpc3BsYXktY29uZmlndXJhdGlvbi1zd2l0Y2hlckBrbm9rZWxtYWF0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}
+  }}
+, {"uuid": "dynamic-panel@velhlkj.com", "name": "Dynamic Panel", "pname": "dynamic-panel", "description": "Dynamic Top Panel\nOriginally inspired by the floating panel design in KDE Plasma 6, it presents a translucent floating bar effect when there are no windows nearby, and a solid panel style when windows are close. It supports Gnome's dark and light mode switching. You can set custom colors for dark and light modes respectively. And there are more settings!\n\nFloating Mode\nWhen there are no windows near the top panel, it will be in floating mode.Floating mode only has a translucent effect, no blur effect. Currently, if you want a blur effect, it is recommended to use Blur my shell's static pipeline for the panel. Blur my shell's dynamic mode will not have rounded corners, which is a problem with Blur my shell.\n\nSolid Mode\nWhen any window is close enough (almost touching) to the top panel, the top panel will become an opaque dock (same as the default in Gnome, but you can apply custom colors to it), which can better blend with maximized windows, unlike themes that are always floating and have a \"light leakage\" phenomenon.\n\nSpecial Thanks (in no particular order)\nThanks to Gonzague/Paul Fauchon's Transparent Top Bar (Adjustable transparency) for the idea, the implementation of window proximity detection largely refers to this extension\nThanks to Google Gemini for the help provided in the research and learning of Gjs\n\n👇  See what's new!  Update logs are available on GitHub Releases 👇\n\n動態頂部面板\n最初靈感來源於 KDE Plasma 6 的懸浮面板的設計，在附近沒有視窗時呈現半透明懸浮條效果，而當視窗靠近時則呈現實色面板的樣式。支援 Gnome 的暗色模式和亮色模式切換。可針對暗色和亮色模式分別設定自訂顏色。還有更多設定！\n\n懸浮模式\n當頂部面板附近沒有視窗時，會呈現懸浮模式。懸浮模式僅僅有半透明效果，沒有模糊效果，目前如果想要模糊效果，建議搭配 Blur my shell 對於面板的靜態 pipeline 使用。Blur my shell 動態模式會沒有圓角，這是 Blur my shell 的問題。\n\n實體模式\n當有任何視窗足夠靠近（幾乎接觸）頂部面板時，頂部面板將會變為不透明的停靠欄（和 Gnome 默認的一樣，但你可以對其應用自訂顏色），與最大化視窗可以更好的融合，而不像主題一樣始終懸浮會有「漏光」的現象。\n\n特別鳴謝（排名不分先後）\n感謝 Gonzague/Paul Fauchon 的 Transparent Top Bar (Adjustable transparency) 的思路，對視窗靠近的判定實現思路大量參考了此擴充功能\n感謝 Google Gemini 在研究和學習 Gjs 過程中提供的幫助\n\n👇更新日誌請到GitHub的Releases查看👇", "link": "https://extensions.gnome.org/extension/7284/dynamic-panel/", "shell_version_map": {
+    "46": {"version": "31", "sha256": "0mqb5p8c9hqlk71gsvlgry897asyyp5jiw58myy3jfr64c152wga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgZHluYW1pY2FsbHkgY2hhbmdlcyB0aGUgcGFuZWwncyBhcHBlYXJhbmNlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly93d3cudmVsaGxrai5jb20vdHcvaG9tZS9zdWJhY3Q9ZG9uYXRlIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwiLAogICJuYW1lIjogIkR5bmFtaWMgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHluYW1pYy1wYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsYWRlL2R5bmFtaWMtcGFuZWwiLAogICJ1dWlkIjogImR5bmFtaWMtcGFuZWxAdmVsaGxrai5jb20iLAogICJ2ZXJzaW9uIjogMzEsCiAgInZlcnNpb24tbmFtZSI6ICI0LjgiCn0="},
+    "47": {"version": "31", "sha256": "0mqb5p8c9hqlk71gsvlgry897asyyp5jiw58myy3jfr64c152wga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgZHluYW1pY2FsbHkgY2hhbmdlcyB0aGUgcGFuZWwncyBhcHBlYXJhbmNlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly93d3cudmVsaGxrai5jb20vdHcvaG9tZS9zdWJhY3Q9ZG9uYXRlIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwiLAogICJuYW1lIjogIkR5bmFtaWMgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHluYW1pYy1wYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsYWRlL2R5bmFtaWMtcGFuZWwiLAogICJ1dWlkIjogImR5bmFtaWMtcGFuZWxAdmVsaGxrai5jb20iLAogICJ2ZXJzaW9uIjogMzEsCiAgInZlcnNpb24tbmFtZSI6ICI0LjgiCn0="}
+  }}
+, {"uuid": "dndsched@rozefound", "name": "DnD On Time", "pname": "dnd-on-time", "description": "Set schedule for Do Not Disturb mode", "link": "https://extensions.gnome.org/extension/7287/dnd-on-time/", "shell_version_map": {
+    "46": {"version": "4", "sha256": "1kv38d8dz2ha03683lbga8n1xxmz1lspmsyz03iv6qsf6iln3pxs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBzY2hlZHVsZSBmb3IgRG8gTm90IERpc3R1cmIgbW9kZSIsCiAgIm5hbWUiOiAiRG5EIE9uIFRpbWUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG5kc2NoZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JvemVGb3VuZC9kbmRzY2hlZCIsCiAgInV1aWQiOiAiZG5kc2NoZWRAcm96ZWZvdW5kIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "47": {"version": "4", "sha256": "1kv38d8dz2ha03683lbga8n1xxmz1lspmsyz03iv6qsf6iln3pxs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBzY2hlZHVsZSBmb3IgRG8gTm90IERpc3R1cmIgbW9kZSIsCiAgIm5hbWUiOiAiRG5EIE9uIFRpbWUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG5kc2NoZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JvemVGb3VuZC9kbmRzY2hlZCIsCiAgInV1aWQiOiAiZG5kc2NoZWRAcm96ZWZvdW5kIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+  }}
+, {"uuid": "window-commander@gnikolaos.gr", "name": "Window Commander", "pname": "window-commander", "description": "Provides a D-Bus interface for managing and controlling windows, including listing, resizing, moving, and workspace management", "link": "https://extensions.gnome.org/extension/7302/window-commander/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "01hj5n271x869zl532irfpbw303fhyrmwl45fg3knhcvpn9al95z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2duaWtvbGFvcy93aW5kb3ctY29tbWFuZGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctY29tbWFuZGVyQGduaWtvbGFvcy5nciIsCiAgInZlcnNpb24iOiAzCn0="},
+    "46": {"version": "3", "sha256": "01hj5n271x869zl532irfpbw303fhyrmwl45fg3knhcvpn9al95z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2duaWtvbGFvcy93aW5kb3ctY29tbWFuZGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctY29tbWFuZGVyQGduaWtvbGFvcy5nciIsCiAgInZlcnNpb24iOiAzCn0="},
+    "47": {"version": "3", "sha256": "01hj5n271x869zl532irfpbw303fhyrmwl45fg3knhcvpn9al95z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2duaWtvbGFvcy93aW5kb3ctY29tbWFuZGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctY29tbWFuZGVyQGduaWtvbGFvcy5nciIsCiAgInZlcnNpb24iOiAzCn0="}
+  }}
+, {"uuid": "disable_switcher_popup_hover@Someone0nEarth-on-github", "name": "Disable Hover On App & Window Switcher Popups for 45+", "pname": "disable-hover-on-app-window-switcher-popups-for-45", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.\n\nBased on https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "link": "https://extensions.gnome.org/extension/7305/disable-hover-on-app-window-switcher-popups-for-45/", "shell_version_map": {
+    "45": {"version": "1", "sha256": "0wnr016337lx3918gbspr9dvfr9z19df46ij29qrqlgwrazl6sr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU29tZW9uZTBuRWFydGgvZ25vbWUtZGlzYWJsZS1zd2l0Y2hlci1wb3B1cC1ob3ZlciIsCiAgInV1aWQiOiAiZGlzYWJsZV9zd2l0Y2hlcl9wb3B1cF9ob3ZlckBTb21lb25lMG5FYXJ0aC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMQp9"},
+    "46": {"version": "1", "sha256": "0wnr016337lx3918gbspr9dvfr9z19df46ij29qrqlgwrazl6sr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU29tZW9uZTBuRWFydGgvZ25vbWUtZGlzYWJsZS1zd2l0Y2hlci1wb3B1cC1ob3ZlciIsCiAgInV1aWQiOiAiZGlzYWJsZV9zd2l0Y2hlcl9wb3B1cF9ob3ZlckBTb21lb25lMG5FYXJ0aC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMQp9"},
+    "47": {"version": "1", "sha256": "0wnr016337lx3918gbspr9dvfr9z19df46ij29qrqlgwrazl6sr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU29tZW9uZTBuRWFydGgvZ25vbWUtZGlzYWJsZS1zd2l0Y2hlci1wb3B1cC1ob3ZlciIsCiAgInV1aWQiOiAiZGlzYWJsZV9zd2l0Y2hlcl9wb3B1cF9ob3ZlckBTb21lb25lMG5FYXJ0aC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMQp9"}
+  }}
+, {"uuid": "display-adjustment@w8jcik.gitlab.com", "name": "Display Adjustment", "pname": "displays-adjustments", "description": "Offers sliders to control external displays' brightness and contrast through DDC. Extension requires ddcutil-service to be installed.\nInstallation process of ddcutil-service is quick and non-intrusive. The details can be found at https://gitlab.com/w8jcik/display-adjustment#installation-of-ddcutil-service. ddcutil-service allows more responsive communication with the displays than ddcutil.", "link": "https://extensions.gnome.org/extension/7308/displays-adjustments/", "shell_version_map": {
+    "46": {"version": "7", "sha256": "1iv1riv1bixmm5dnjp64agl21j0pqjl8glnai8kzjxz17v15sfl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9mZmVycyBzbGlkZXJzIHRvIGNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGNvbnRyYXN0IHRocm91Z2ggRERDLiBFeHRlbnNpb24gcmVxdWlyZXMgZGRjdXRpbC1zZXJ2aWNlIHRvIGJlIGluc3RhbGxlZC5cbkluc3RhbGxhdGlvbiBwcm9jZXNzIG9mIGRkY3V0aWwtc2VydmljZSBpcyBxdWljayBhbmQgbm9uLWludHJ1c2l2ZS4gVGhlIGRldGFpbHMgY2FuIGJlIGZvdW5kIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS93OGpjaWsvZGlzcGxheS1hZGp1c3RtZW50I2luc3RhbGxhdGlvbi1vZi1kZGN1dGlsLXNlcnZpY2UuIGRkY3V0aWwtc2VydmljZSBhbGxvd3MgbW9yZSByZXNwb25zaXZlIGNvbW11bmljYXRpb24gd2l0aCB0aGUgZGlzcGxheXMgdGhhbiBkZGN1dGlsLiIsCiAgIm5hbWUiOiAiRGlzcGxheSBBZGp1c3RtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS93OGpjaWsvZGlzcGxheS1hZGp1c3RtZW50IiwKICAidXVpZCI6ICJkaXNwbGF5LWFkanVzdG1lbnRAdzhqY2lrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC40Igp9"},
+    "47": {"version": "7", "sha256": "1iv1riv1bixmm5dnjp64agl21j0pqjl8glnai8kzjxz17v15sfl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9mZmVycyBzbGlkZXJzIHRvIGNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGNvbnRyYXN0IHRocm91Z2ggRERDLiBFeHRlbnNpb24gcmVxdWlyZXMgZGRjdXRpbC1zZXJ2aWNlIHRvIGJlIGluc3RhbGxlZC5cbkluc3RhbGxhdGlvbiBwcm9jZXNzIG9mIGRkY3V0aWwtc2VydmljZSBpcyBxdWljayBhbmQgbm9uLWludHJ1c2l2ZS4gVGhlIGRldGFpbHMgY2FuIGJlIGZvdW5kIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS93OGpjaWsvZGlzcGxheS1hZGp1c3RtZW50I2luc3RhbGxhdGlvbi1vZi1kZGN1dGlsLXNlcnZpY2UuIGRkY3V0aWwtc2VydmljZSBhbGxvd3MgbW9yZSByZXNwb25zaXZlIGNvbW11bmljYXRpb24gd2l0aCB0aGUgZGlzcGxheXMgdGhhbiBkZGN1dGlsLiIsCiAgIm5hbWUiOiAiRGlzcGxheSBBZGp1c3RtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS93OGpjaWsvZGlzcGxheS1hZGp1c3RtZW50IiwKICAidXVpZCI6ICJkaXNwbGF5LWFkanVzdG1lbnRAdzhqY2lrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNywKICAidmVyc2lvbi1uYW1lIjogIjAuMC40Igp9"}
+  }}
+, {"uuid": "auto-screen-brightness@popov895.ukr.net", "name": "Auto Screen Brightness", "pname": "auto-screen-brightness", "description": "Automatically switch the screen brightness depending on the power supply status", "link": "https://extensions.gnome.org/extension/7311/auto-screen-brightness/", "shell_version_map": {
+    "42": {"version": "17", "sha256": "1cy8n4prw4cz23c3dlkmsbsycypsxnq8c8ybmmcm0mdnwh4cf4gd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIHRoZSBzY3JlZW4gYnJpZ2h0bmVzcyBkZXBlbmRpbmcgb24gdGhlIHBvd2VyIHN1cHBseSBzdGF0dXMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkF1dG8gU2NyZWVuIEJyaWdodG5lc3MiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tc2NyZWVuLWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9hdXRvLXNjcmVlbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJhdXRvLXNjcmVlbi1icmlnaHRuZXNzQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "43": {"version": "17", "sha256": "1cy8n4prw4cz23c3dlkmsbsycypsxnq8c8ybmmcm0mdnwh4cf4gd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIHRoZSBzY3JlZW4gYnJpZ2h0bmVzcyBkZXBlbmRpbmcgb24gdGhlIHBvd2VyIHN1cHBseSBzdGF0dXMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkF1dG8gU2NyZWVuIEJyaWdodG5lc3MiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tc2NyZWVuLWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9hdXRvLXNjcmVlbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJhdXRvLXNjcmVlbi1icmlnaHRuZXNzQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "44": {"version": "17", "sha256": "1cy8n4prw4cz23c3dlkmsbsycypsxnq8c8ybmmcm0mdnwh4cf4gd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIHRoZSBzY3JlZW4gYnJpZ2h0bmVzcyBkZXBlbmRpbmcgb24gdGhlIHBvd2VyIHN1cHBseSBzdGF0dXMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkF1dG8gU2NyZWVuIEJyaWdodG5lc3MiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tc2NyZWVuLWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9hdXRvLXNjcmVlbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJhdXRvLXNjcmVlbi1icmlnaHRuZXNzQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "45": {"version": "18", "sha256": "1i1q5l3bh51j2ggvg6mm81f8rgihs9dgmcx324m8j0zkzf41jdb8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIHRoZSBzY3JlZW4gYnJpZ2h0bmVzcyBkZXBlbmRpbmcgb24gdGhlIHBvd2VyIHN1cHBseSBzdGF0dXMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkF1dG8gU2NyZWVuIEJyaWdodG5lc3MiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tc2NyZWVuLWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9hdXRvLXNjcmVlbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJhdXRvLXNjcmVlbi1icmlnaHRuZXNzQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
+    "46": {"version": "18", "sha256": "1i1q5l3bh51j2ggvg6mm81f8rgihs9dgmcx324m8j0zkzf41jdb8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIHRoZSBzY3JlZW4gYnJpZ2h0bmVzcyBkZXBlbmRpbmcgb24gdGhlIHBvd2VyIHN1cHBseSBzdGF0dXMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkF1dG8gU2NyZWVuIEJyaWdodG5lc3MiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tc2NyZWVuLWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9hdXRvLXNjcmVlbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJhdXRvLXNjcmVlbi1icmlnaHRuZXNzQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTgKfQ=="},
+    "47": {"version": "18", "sha256": "1i1q5l3bh51j2ggvg6mm81f8rgihs9dgmcx324m8j0zkzf41jdb8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIHRoZSBzY3JlZW4gYnJpZ2h0bmVzcyBkZXBlbmRpbmcgb24gdGhlIHBvd2VyIHN1cHBseSBzdGF0dXMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiY3VzdG9tIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9wb3Bvdjg5NSIKICB9LAogICJuYW1lIjogIkF1dG8gU2NyZWVuIEJyaWdodG5lc3MiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tc2NyZWVuLWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9hdXRvLXNjcmVlbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJhdXRvLXNjcmVlbi1icmlnaHRuZXNzQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}
+  }}
+, {"uuid": "vkeybind@00000vish", "name": "vKeyBind", "pname": "vkeybind", "description": "Gnome extension that focus, snap, switch and resize windows with keybinds.", "link": "https://extensions.gnome.org/extension/7317/vkeybind/", "shell_version_map": {
+    "46": {"version": "12", "sha256": "0rrkagkfjsnhvn0jly8qqp7jvblfcpjmglmfzxjfnyda74wds8l1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiB0aGF0IGZvY3VzLCBzbmFwLCBzd2l0Y2ggYW5kIHJlc2l6ZSB3aW5kb3dzIHdpdGgga2V5YmluZHMuIiwKICAibmFtZSI6ICJ2S2V5QmluZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52a2V5YmluZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMDAwMDB2aXNoL3ZrZXliaW5kIiwKICAidXVpZCI6ICJ2a2V5YmluZEAwMDAwMHZpc2giLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
+    "47": {"version": "12", "sha256": "0rrkagkfjsnhvn0jly8qqp7jvblfcpjmglmfzxjfnyda74wds8l1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiB0aGF0IGZvY3VzLCBzbmFwLCBzd2l0Y2ggYW5kIHJlc2l6ZSB3aW5kb3dzIHdpdGgga2V5YmluZHMuIiwKICAibmFtZSI6ICJ2S2V5QmluZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52a2V5YmluZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMDAwMDB2aXNoL3ZrZXliaW5kIiwKICAidXVpZCI6ICJ2a2V5YmluZEAwMDAwMHZpc2giLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
+  }}
+, {"uuid": "code-compete@developer-kush.github.com", "name": "Code Compete", "pname": "code-compete", "description": "Get a List and Quick Access to all Sport Coding Contests on all major platforms. This extension is using clist.by services to get the data and is not in any way affiliated with clist.by", "link": "https://extensions.gnome.org/extension/7320/code-compete/", "shell_version_map": {
+    "45": {"version": "2", "sha256": "08xzkd09151d5yj0pc81dql38wr1my9c8w8lwyani4mm9j0bqs4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIExpc3QgYW5kIFF1aWNrIEFjY2VzcyB0byBhbGwgU3BvcnQgQ29kaW5nIENvbnRlc3RzIG9uIGFsbCBtYWpvciBwbGF0Zm9ybXMuIFRoaXMgZXh0ZW5zaW9uIGlzIHVzaW5nIGNsaXN0LmJ5IHNlcnZpY2VzIHRvIGdldCB0aGUgZGF0YSBhbmQgaXMgbm90IGluIGFueSB3YXkgYWZmaWxpYXRlZCB3aXRoIGNsaXN0LmJ5IiwKICAibmFtZSI6ICJDb2RlIENvbXBldGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZlbG9wZXIta3VzaC9Db2RlLUNvbXBldGUiLAogICJ1dWlkIjogImNvZGUtY29tcGV0ZUBkZXZlbG9wZXIta3VzaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "46": {"version": "2", "sha256": "08xzkd09151d5yj0pc81dql38wr1my9c8w8lwyani4mm9j0bqs4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIExpc3QgYW5kIFF1aWNrIEFjY2VzcyB0byBhbGwgU3BvcnQgQ29kaW5nIENvbnRlc3RzIG9uIGFsbCBtYWpvciBwbGF0Zm9ybXMuIFRoaXMgZXh0ZW5zaW9uIGlzIHVzaW5nIGNsaXN0LmJ5IHNlcnZpY2VzIHRvIGdldCB0aGUgZGF0YSBhbmQgaXMgbm90IGluIGFueSB3YXkgYWZmaWxpYXRlZCB3aXRoIGNsaXN0LmJ5IiwKICAibmFtZSI6ICJDb2RlIENvbXBldGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZlbG9wZXIta3VzaC9Db2RlLUNvbXBldGUiLAogICJ1dWlkIjogImNvZGUtY29tcGV0ZUBkZXZlbG9wZXIta3VzaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "47": {"version": "2", "sha256": "08xzkd09151d5yj0pc81dql38wr1my9c8w8lwyani4mm9j0bqs4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIExpc3QgYW5kIFF1aWNrIEFjY2VzcyB0byBhbGwgU3BvcnQgQ29kaW5nIENvbnRlc3RzIG9uIGFsbCBtYWpvciBwbGF0Zm9ybXMuIFRoaXMgZXh0ZW5zaW9uIGlzIHVzaW5nIGNsaXN0LmJ5IHNlcnZpY2VzIHRvIGdldCB0aGUgZGF0YSBhbmQgaXMgbm90IGluIGFueSB3YXkgYWZmaWxpYXRlZCB3aXRoIGNsaXN0LmJ5IiwKICAibmFtZSI6ICJDb2RlIENvbXBldGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZlbG9wZXIta3VzaC9Db2RlLUNvbXBldGUiLAogICJ1dWlkIjogImNvZGUtY29tcGV0ZUBkZXZlbG9wZXIta3VzaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+  }}
+, {"uuid": "top-panel-drag@princeola.com", "name": "Panel Organizer", "pname": "panel-organizer", "description": "Allows arranging panel elements to left or right positions", "link": "https://extensions.gnome.org/extension/7329/panel-organizer/", "shell_version_map": {
+    "45": {"version": "2", "sha256": "1qwgsphfv3y46fslk01fz0zz73d69h24ag6c8v17fppm1qlgr1hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBhcnJhbmdpbmcgcGFuZWwgZWxlbWVudHMgdG8gbGVmdCBvciByaWdodCBwb3NpdGlvbnMiLAogICJuYW1lIjogIlBhbmVsIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbC1vcmdhbml6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1dGhvcmxhdXJlbi90b3AtcGFuZWwtZHJhZy1wcmluY2VvbGEuY29tIiwKICAidXVpZCI6ICJ0b3AtcGFuZWwtZHJhZ0BwcmluY2VvbGEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "46": {"version": "2", "sha256": "1qwgsphfv3y46fslk01fz0zz73d69h24ag6c8v17fppm1qlgr1hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBhcnJhbmdpbmcgcGFuZWwgZWxlbWVudHMgdG8gbGVmdCBvciByaWdodCBwb3NpdGlvbnMiLAogICJuYW1lIjogIlBhbmVsIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbC1vcmdhbml6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1dGhvcmxhdXJlbi90b3AtcGFuZWwtZHJhZy1wcmluY2VvbGEuY29tIiwKICAidXVpZCI6ICJ0b3AtcGFuZWwtZHJhZ0BwcmluY2VvbGEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+  }}
+, {"uuid": "status-icons@gnome-shell-extensions.gcampax.github.com", "name": "Status Icons", "pname": "status-icons", "description": "Show status icons in the top bar", "link": "https://extensions.gnome.org/extension/7332/status-icons/", "shell_version_map": {
+    "47": {"version": "1", "sha256": "0vs29i1jsad3wjv617hq0vrz7jvbnywmsk3rc9jjqlbbmxiw9xmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc3RhdHVzIGljb25zIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogInN0YXR1cy1pY29ucyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zdGF0dXMtaWNvbnMiLAogICJuYW1lIjogIlN0YXR1cyBJY29ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zdGF0dXMtaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic3RhdHVzLWljb25zQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}
+  }}
+, {"uuid": "penguin-ai-chatbot@coffeecionado.gitlab.io", "name": "Penguin: AI Chatbot", "pname": "penguin-ai-chatbot", "description": "A GNOME Shell extension that uses openrouter.ai services - a platform/marketplace that offers APIs to talk to LLMs. Some of these APIs are free to use, including the one used by default in the extension: Llama 3.1 8B. \n \n What can it do? Create new conversations, remember chat history after logging out, be a chatbot (powered by Llama 3.1 8B at default), use other LLMs (Using openrouter.ai)", "link": "https://extensions.gnome.org/extension/7338/penguin-ai-chatbot/", "shell_version_map": {
+    "46": {"version": "11", "sha256": "1a5zjnbhd1l6zwh8fdnx82ag97bvdpwdsdb3lh4ybqxn0khffmvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgdXNlcyBvcGVucm91dGVyLmFpIHNlcnZpY2VzIC0gYSBwbGF0Zm9ybS9tYXJrZXRwbGFjZSB0aGF0IG9mZmVycyBBUElzIHRvIHRhbGsgdG8gTExNcy4gU29tZSBvZiB0aGVzZSBBUElzIGFyZSBmcmVlIHRvIHVzZSwgaW5jbHVkaW5nIHRoZSBvbmUgdXNlZCBieSBkZWZhdWx0IGluIHRoZSBleHRlbnNpb246IExsYW1hIDMuMSA4Qi4gXG4gXG4gV2hhdCBjYW4gaXQgZG8/IC0mZ3Q7IENyZWF0ZSBuZXcgY29udmVyc2F0aW9ucywgcmVtZW1iZXIgY2hhdCBoaXN0b3J5IGFmdGVyIGxvZ2dpbmcgb3V0LCBiZSBhIGNoYXRib3QgKHBvd2VyZWQgYnkgTGxhbWEgMy4xIDhCIGF0IGRlZmF1bHQpLCB1c2Ugb3RoZXIgTExNcyAoVXNpbmcgb3BlbnJvdXRlci5haSkiLAogICJleHRlbnNpb24taWQiOiAicGVuZ3Vpbi1haS1jaGF0Ym90IiwKICAibmFtZSI6ICJQZW5ndWluOiBBSSBDaGF0Ym90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBlbmd1aW4tYWktY2hhdGJvdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL21hcnRpamFyYS5naXRsYWIuaW8vUGVuZ3Vpbi1BSS1DaGF0Ym90LWZvci1HTk9NRS8iLAogICJ1dWlkIjogInBlbmd1aW4tYWktY2hhdGJvdEBjb2ZmZWVjaW9uYWRvLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"},
+    "47": {"version": "11", "sha256": "1a5zjnbhd1l6zwh8fdnx82ag97bvdpwdsdb3lh4ybqxn0khffmvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgdXNlcyBvcGVucm91dGVyLmFpIHNlcnZpY2VzIC0gYSBwbGF0Zm9ybS9tYXJrZXRwbGFjZSB0aGF0IG9mZmVycyBBUElzIHRvIHRhbGsgdG8gTExNcy4gU29tZSBvZiB0aGVzZSBBUElzIGFyZSBmcmVlIHRvIHVzZSwgaW5jbHVkaW5nIHRoZSBvbmUgdXNlZCBieSBkZWZhdWx0IGluIHRoZSBleHRlbnNpb246IExsYW1hIDMuMSA4Qi4gXG4gXG4gV2hhdCBjYW4gaXQgZG8/IC0mZ3Q7IENyZWF0ZSBuZXcgY29udmVyc2F0aW9ucywgcmVtZW1iZXIgY2hhdCBoaXN0b3J5IGFmdGVyIGxvZ2dpbmcgb3V0LCBiZSBhIGNoYXRib3QgKHBvd2VyZWQgYnkgTGxhbWEgMy4xIDhCIGF0IGRlZmF1bHQpLCB1c2Ugb3RoZXIgTExNcyAoVXNpbmcgb3BlbnJvdXRlci5haSkiLAogICJleHRlbnNpb24taWQiOiAicGVuZ3Vpbi1haS1jaGF0Ym90IiwKICAibmFtZSI6ICJQZW5ndWluOiBBSSBDaGF0Ym90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBlbmd1aW4tYWktY2hhdGJvdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL21hcnRpamFyYS5naXRsYWIuaW8vUGVuZ3Vpbi1BSS1DaGF0Ym90LWZvci1HTk9NRS8iLAogICJ1dWlkIjogInBlbmd1aW4tYWktY2hhdGJvdEBjb2ZmZWVjaW9uYWRvLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}
+  }}
+, {"uuid": "marcs14@gmail.com", "name": "Power Tracker", "pname": "power-tracker", "description": "Tracks current power consumption\n\n- Does not use any dependency\n- Autodetects battery (BAT0, BAT1, BATT: /sys/class/power_supply)\n- You can configure refresh rate\n\nIMPORTANT.\n- This will only work with laptops. Afaik there's no simple way to track desktop power consumption\n- Power when fully charged is 0W\n- Power when charging has a plus sign\n- Power when discharging has a minus sign\n\nIf you have any issue, please report it so I can take a look at it!\nEnjoy!", "link": "https://extensions.gnome.org/extension/7341/power-tracker/", "shell_version_map": {
+    "46": {"version": "10", "sha256": "14lk6fgfishp2r7qbklmhki8p2qq0q6ky6l73g88zw5kgwq9aij6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyBjdXJyZW50IHBvd2VyIGNvbnN1bXB0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG93ZXJ0cmFja2VyIiwKICAibmFtZSI6ICJQb3dlciBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VydHJhY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUGlqdWxpL0dub21lUG93ZXJUcmFja2VyIiwKICAidXVpZCI6ICJtYXJjczE0QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "47": {"version": "10", "sha256": "14lk6fgfishp2r7qbklmhki8p2qq0q6ky6l73g88zw5kgwq9aij6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyBjdXJyZW50IHBvd2VyIGNvbnN1bXB0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG93ZXJ0cmFja2VyIiwKICAibmFtZSI6ICJQb3dlciBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvd2VydHJhY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUGlqdWxpL0dub21lUG93ZXJUcmFja2VyIiwKICAidXVpZCI6ICJtYXJjczE0QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}
+  }}
+, {"uuid": "grayscale-window@cg505.com", "name": "Grayscale Windows", "pname": "grayscale-windows", "description": "Make individual windows grayscale\nDefault shortcut is Super+G for a window and Super+Shift+G for everything\nCode is forked from the \"Invert Window Color\" extension.", "link": "https://extensions.gnome.org/extension/7344/grayscale-windows/", "shell_version_map": {
+    "46": {"version": "2", "sha256": "131fhwj8a0102jwvv79nlqg3r744gc13lcqgacjmv6cp8hkcmyy6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgaW5kaXZpZHVhbCB3aW5kb3dzIGdyYXlzY2FsZVxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitHIGZvciBhIHdpbmRvdyBhbmQgU3VwZXIrU2hpZnQrRyBmb3IgZXZlcnl0aGluZ1xuQ29kZSBpcyBmb3JrZWQgZnJvbSB0aGUgXCJJbnZlcnQgV2luZG93IENvbG9yXCIgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiR3JheXNjYWxlIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3JheXNjYWxlLXdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2c1MDUvZ25vbWUtc2hlbGwtZ3JheXNjYWxlLXdpbmRvdyIsCiAgInV1aWQiOiAiZ3JheXNjYWxlLXdpbmRvd0BjZzUwNS5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
+    "47": {"version": "2", "sha256": "131fhwj8a0102jwvv79nlqg3r744gc13lcqgacjmv6cp8hkcmyy6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgaW5kaXZpZHVhbCB3aW5kb3dzIGdyYXlzY2FsZVxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitHIGZvciBhIHdpbmRvdyBhbmQgU3VwZXIrU2hpZnQrRyBmb3IgZXZlcnl0aGluZ1xuQ29kZSBpcyBmb3JrZWQgZnJvbSB0aGUgXCJJbnZlcnQgV2luZG93IENvbG9yXCIgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiR3JheXNjYWxlIFdpbmRvd3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3JheXNjYWxlLXdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2c1MDUvZ25vbWUtc2hlbGwtZ3JheXNjYWxlLXdpbmRvdyIsCiAgInV1aWQiOiAiZ3JheXNjYWxlLXdpbmRvd0BjZzUwNS5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
+  }}
+, {"uuid": "tmux-indicator@jpasquier.github.com", "name": "Tmux Indicator", "pname": "tmux-indicator", "description": "Shows an indicator if there is at least one tmux session running. Select a session and open it in a terminal emulator.", "link": "https://extensions.gnome.org/extension/7347/tmux-indicator/", "shell_version_map": {
+    "43": {"version": "4", "sha256": "06z0w1h8ghpblzybz6aqmkf6my6iq8d0nhhkqhc0imk8a04fpcjr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFuIGluZGljYXRvciBpZiB0aGVyZSBpcyBhdCBsZWFzdCBvbmUgdG11eCBzZXNzaW9uIHJ1bm5pbmciLAogICJuYW1lIjogIlRtdXggSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRtdXgtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qcGFzcXVpZXIvZ25vbWUtdG11eC1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRtdXgtaW5kaWNhdG9yQGpwYXNxdWllci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "44": {"version": "4", "sha256": "06z0w1h8ghpblzybz6aqmkf6my6iq8d0nhhkqhc0imk8a04fpcjr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFuIGluZGljYXRvciBpZiB0aGVyZSBpcyBhdCBsZWFzdCBvbmUgdG11eCBzZXNzaW9uIHJ1bm5pbmciLAogICJuYW1lIjogIlRtdXggSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRtdXgtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qcGFzcXVpZXIvZ25vbWUtdG11eC1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRtdXgtaW5kaWNhdG9yQGpwYXNxdWllci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+  }}
+, {"uuid": "hostname-on-panel@casadasereia.net", "name": "Hostname On Panel", "pname": "hostname-on-panel", "description": "Displays the Hostname on the Gnome Panel. Helpful when working with multiport KVM switches or accessing remote hosts where it is easy to loose track of which machine you are working on.", "link": "https://extensions.gnome.org/extension/7353/hostname-on-panel/", "shell_version_map": {
+    "46": {"version": "1", "sha256": "0cd687z7ryp7qdv37j43q8vj3icvqhix91v9rl4l4ngfbz735lv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBIb3N0bmFtZSBvbiB0aGUgR25vbWUgUGFuZWwuIEhlbHBmdWwgd2hlbiB3b3JraW5nIHdpdGggbXVsdGlwb3J0IEtWVyBzd2l0Y2hlcyBvciBhY2Nlc3NpbmcgcmVtb3RlIGhvc3RzIHdoZXJlIGl0IGlzIGVhc3kgdG8gbG9vc2UgdHJhY2sgb2Ygd2hpY2ggbWFjaGluZSB5b3UgYXJlIHdvcmtpbmcgb24uIiwKICAibmFtZSI6ICJIb3N0bmFtZSBPbiBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY3J0NGV2ci9ob3N0bmFtZS1vbi1wYW5lbCIsCiAgInV1aWQiOiAiaG9zdG5hbWUtb24tcGFuZWxAY2FzYWRhc2VyZWlhLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}
+  }}
+, {"uuid": "twingate-status@eudes.es", "name": "Twingate Status", "pname": "twingate-status", "description": "Shows a status icon on the Gnome top bar indicating Twingate's connection status. Clicking on the menu entry starts or stops the connection. Requires Twingate and systemd.", "link": "https://extensions.gnome.org/extension/7359/twingate-status/", "shell_version_map": {
+    "46": {"version": "1", "sha256": "1z1mnqh6skc6602fyf1l38d799bidfvbp2sgn33czyq40xhpqmfq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgc3RhdHVzIGljb24gb24gdGhlIEdub21lIHRvcCBiYXIgaW5kaWNhdGluZyBUd2luZ2F0ZSdzIGNvbm5lY3Rpb24gc3RhdHVzLiBDbGlja2luZyBvbiB0aGUgbWVudSBlbnRyeSBzdGFydHMgb3Igc3RvcHMgdGhlIGNvbm5lY3Rpb24uIFJlcXVpcmVzIFR3aW5nYXRlIGFuZCBzeXN0ZW1kLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImV1ZGVzb2Nob2EiCiAgfSwKICAibmFtZSI6ICJUd2luZ2F0ZSBTdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVkZXMvdHdpbmdhdGUtc3RhdHVzLWdub21lIiwKICAidXVpZCI6ICJ0d2luZ2F0ZS1zdGF0dXNAZXVkZXMuZXMiLAogICJ2ZXJzaW9uIjogMQp9"}
+  }}
+, {"uuid": "background-logo@fedorahosted.org", "name": "Background Logo", "pname": "background-logo", "description": "Overlay a tasteful logo on the background to enhance the user experience", "link": "https://extensions.gnome.org/extension/7364/background-logo/", "shell_version_map": {
+    "46": {"version": "2", "sha256": "1yyb86vmbmy1z9r8vlqdp7c3bsghmsxq1pjp1wjg804dmzp52z7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJsYXkgYSB0YXN0ZWZ1bCBsb2dvIG9uIHRoZSBiYWNrZ3JvdW5kIHRvIGVuaGFuY2UgdGhlIHVzZXIgZXhwZXJpZW5jZSIsCiAgIm5hbWUiOiAiQmFja2dyb3VuZCBMb2dvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5mZWRvcmFob3N0ZWQuYmFja2dyb3VuZC1sb2dvLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcGFndXJlLmlvL2JhY2tncm91bmQtbG9nby1leHRlbnNpb24iLAogICJ1dWlkIjogImJhY2tncm91bmQtbG9nb0BmZWRvcmFob3N0ZWQub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "47": {"version": "1", "sha256": "14ph4lybsbgllmvqiw2frpnr14rh3zr6c932x4nyw8xxy61kl327", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJsYXkgYSB0YXN0ZWZ1bCBsb2dvIG9uIHRoZSBiYWNrZ3JvdW5kIHRvIGVuaGFuY2UgdGhlIHVzZXIgZXhwZXJpZW5jZSIsCiAgIm5hbWUiOiAiQmFja2dyb3VuZCBMb2dvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5mZWRvcmFob3N0ZWQuYmFja2dyb3VuZC1sb2dvLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vcGFndXJlLmlvL2JhY2tncm91bmQtbG9nby1leHRlbnNpb24iLAogICJ1dWlkIjogImJhY2tncm91bmQtbG9nb0BmZWRvcmFob3N0ZWQub3JnIiwKICAidmVyc2lvbiI6IDEKfQ=="}
+  }}
+, {"uuid": "netspeedindicator@subashghimire.info.np", "name": "Net Speed Indicator", "pname": "net-speed-indicator", "description": "This GNOME Shell extension displays the current network speed (up and down) directly on your top panel. Fork of NetSpeed.", "link": "https://extensions.gnome.org/extension/7367/net-speed-indicator/", "shell_version_map": {
+    "45": {"version": "1", "sha256": "06vh30f9jq3lzbpd7fgbp5l1llidqsxf742z7a0ah0y4pln0wf2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXR3b3JrIHNwZWVkIG9uIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV0IFNwZWVkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1B1Ymxpc2hlck5hbWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5ldC1zcGVlZCIsCiAgInV1aWQiOiAibmV0c3BlZWRpbmRpY2F0b3JAc3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEKfQ=="},
+    "46": {"version": "1", "sha256": "06vh30f9jq3lzbpd7fgbp5l1llidqsxf742z7a0ah0y4pln0wf2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXR3b3JrIHNwZWVkIG9uIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV0IFNwZWVkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1B1Ymxpc2hlck5hbWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5ldC1zcGVlZCIsCiAgInV1aWQiOiAibmV0c3BlZWRpbmRpY2F0b3JAc3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEKfQ=="},
+    "47": {"version": "1", "sha256": "06vh30f9jq3lzbpd7fgbp5l1llidqsxf742z7a0ah0y4pln0wf2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXR3b3JrIHNwZWVkIG9uIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV0IFNwZWVkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1B1Ymxpc2hlck5hbWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5ldC1zcGVlZCIsCiAgInV1aWQiOiAibmV0c3BlZWRpbmRpY2F0b3JAc3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEKfQ=="}
+  }}
+, {"uuid": "rogb@tayefi.ilia.protonmail.com", "name": "RoGB", "pname": "rogb", "description": "A GNOME extension to change ROGs' keyboard color.", "link": "https://extensions.gnome.org/extension/7370/rogb/", "shell_version_map": {
+    "46": {"version": "7", "sha256": "1qkjvwg24xk32a4im58k2h19vnxb9kjjmk3b6a04piqxl5xixg3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFtdLAogICJkZXNjcmlwdGlvbiI6ICJBIEdOT01FIGV4dGVuc2lvbiB0byBjaGFuZ2UgUk9Hcycga2V5Ym9hcmQgY29sb3IuIiwKICAiaWNvbiI6ICJpY29ucy90b3AtYmFyLWljb24ucG5nIiwKICAibmFtZSI6ICJSb0dCIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvZ2IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVGVqYXJvbWFsaXVzL1JvR0IiLAogICJ1dWlkIjogInJvZ2JAdGF5ZWZpLmlsaWEucHJvdG9ubWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
+  }}
+, {"uuid": "touchpad@gpawru", "name": "Touchpad Switcher", "pname": "touchpad-switcher", "description": "Touchpad Switcher allows you to easily toggle the touchpad on and off via the GNOME quick settings menu. It also includes an optional indicator to display the current touchpad state in the system tray.\n\nP.S. extension icon by icons8.com", "link": "https://extensions.gnome.org/extension/7373/touchpad-switcher/", "shell_version_map": {
+    "45": {"version": "5", "sha256": "1ncq5fqpq62c7jhmmfxlml45kdf8gzxr9dwgln8vr9dxdsc4r7ql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB0b3VjaHBhZCBzdGF0ZSBzd2l0Y2hlciIsCiAgImdldHRleHQtZG9tYWluIjogInRvdWNocGFkQGdwYXdydSIsCiAgIm5hbWUiOiAiVG91Y2hwYWQgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWRfZ3Bhd3J1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Bhd3J1L3RvdWNocGFkIiwKICAidXVpZCI6ICJ0b3VjaHBhZEBncGF3cnUiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "1ncq5fqpq62c7jhmmfxlml45kdf8gzxr9dwgln8vr9dxdsc4r7ql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB0b3VjaHBhZCBzdGF0ZSBzd2l0Y2hlciIsCiAgImdldHRleHQtZG9tYWluIjogInRvdWNocGFkQGdwYXdydSIsCiAgIm5hbWUiOiAiVG91Y2hwYWQgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWRfZ3Bhd3J1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Bhd3J1L3RvdWNocGFkIiwKICAidXVpZCI6ICJ0b3VjaHBhZEBncGF3cnUiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "1ncq5fqpq62c7jhmmfxlml45kdf8gzxr9dwgln8vr9dxdsc4r7ql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB0b3VjaHBhZCBzdGF0ZSBzd2l0Y2hlciIsCiAgImdldHRleHQtZG9tYWluIjogInRvdWNocGFkQGdwYXdydSIsCiAgIm5hbWUiOiAiVG91Y2hwYWQgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWRfZ3Bhd3J1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Bhd3J1L3RvdWNocGFkIiwKICAidXVpZCI6ICJ0b3VjaHBhZEBncGF3cnUiLAogICJ2ZXJzaW9uIjogNQp9"}
+  }}
+, {"uuid": "latency@mboscovich.github.io", "name": "latency", "pname": "latency", "description": "Show internet latency (ping). Also show if the internet connection is lost and if there is a DNS problem. It use google.com to do the check (IP: 8.8.8.8).", "link": "https://extensions.gnome.org/extension/7376/latency/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "0x62k6iv7sdzxc0qwn5nvbhby92lnzj3hggpgk8brdgz0m5kkig4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaW50ZXJuZXQgbGF0ZW5jeSAocGluZykuIEFsc28gc2hvdyBpZiB0aGUgaW50ZXJuZXQgY29ubmVjdGlvbiBpcyBsb3N0IGFuZCBpZiB0aGVyZSBpcyBhIEROUyBwcm9ibGVtLiBJdCB1c2UgZ29vZ2xlLmNvbSB0byBkbyB0aGUgY2hlY2sgKElQOiA4LjguOC44KS4iLAogICJuYW1lIjogImxhdGVuY3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYm9zY292aWNoL2xhdGVuY3kiLAogICJ1dWlkIjogImxhdGVuY3lAbWJvc2NvdmljaC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "0x62k6iv7sdzxc0qwn5nvbhby92lnzj3hggpgk8brdgz0m5kkig4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaW50ZXJuZXQgbGF0ZW5jeSAocGluZykuIEFsc28gc2hvdyBpZiB0aGUgaW50ZXJuZXQgY29ubmVjdGlvbiBpcyBsb3N0IGFuZCBpZiB0aGVyZSBpcyBhIEROUyBwcm9ibGVtLiBJdCB1c2UgZ29vZ2xlLmNvbSB0byBkbyB0aGUgY2hlY2sgKElQOiA4LjguOC44KS4iLAogICJuYW1lIjogImxhdGVuY3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYm9zY292aWNoL2xhdGVuY3kiLAogICJ1dWlkIjogImxhdGVuY3lAbWJvc2NvdmljaC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "0x62k6iv7sdzxc0qwn5nvbhby92lnzj3hggpgk8brdgz0m5kkig4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaW50ZXJuZXQgbGF0ZW5jeSAocGluZykuIEFsc28gc2hvdyBpZiB0aGUgaW50ZXJuZXQgY29ubmVjdGlvbiBpcyBsb3N0IGFuZCBpZiB0aGVyZSBpcyBhIEROUyBwcm9ibGVtLiBJdCB1c2UgZ29vZ2xlLmNvbSB0byBkbyB0aGUgY2hlY2sgKElQOiA4LjguOC44KS4iLAogICJuYW1lIjogImxhdGVuY3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYm9zY292aWNoL2xhdGVuY3kiLAogICJ1dWlkIjogImxhdGVuY3lAbWJvc2NvdmljaC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}
+  }}
+, {"uuid": "dm-theme-changer@lynixx01.github.com", "name": "DM Theme Changer", "pname": "dm-theme-changer", "description": "Automatically change theme styles when dark mode is enabled or disabled.", "link": "https://extensions.gnome.org/extension/7379/dm-theme-changer/", "shell_version_map": {
+    "46": {"version": "4", "sha256": "160n93cnrk70ngdf50qwkgfz818yplvvz1zkjk80n1bl521kahmy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZW1lIHN0eWxlcyB3aGVuIGRhcmsgbW9kZSBpcyBlbmFibGVkIG9yIGRpc2FibGVkLiIsCiAgIm5hbWUiOiAiRE0gVGhlbWUgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kbXRoZW1lY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHluaXh4MDEvRG1UaGVtZUNoYW5nZXIiLAogICJ1dWlkIjogImRtLXRoZW1lLWNoYW5nZXJAbHluaXh4MDEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "160n93cnrk70ngdf50qwkgfz818yplvvz1zkjk80n1bl521kahmy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIHRoZW1lIHN0eWxlcyB3aGVuIGRhcmsgbW9kZSBpcyBlbmFibGVkIG9yIGRpc2FibGVkLiIsCiAgIm5hbWUiOiAiRE0gVGhlbWUgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kbXRoZW1lY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHluaXh4MDEvRG1UaGVtZUNoYW5nZXIiLAogICJ1dWlkIjogImRtLXRoZW1lLWNoYW5nZXJAbHluaXh4MDEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "Reboot2Windows@coooolfan.com", "name": "Reboot2Windows", "pname": "reboot2windows", "description": "Reboot system into Windows", "link": "https://extensions.gnome.org/extension/7385/reboot2windows/", "shell_version_map": {
+    "46": {"version": "3", "sha256": "0dalbpxkxkc0k5nh93zd8wydq0rs1ijxwal1wdyxnmy3vahhl0dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBXaW5kb3dzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiUmVib290MldpbmRvd3NAY29vb29sZmFuLmNvbSIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIlJlYm9vdDJXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Db29vb2xmYW4vUmVib290MldpbmRvd3MiLAogICJ1dWlkIjogIlJlYm9vdDJXaW5kb3dzQGNvb29vbGZhbi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "47": {"version": "3", "sha256": "0dalbpxkxkc0k5nh93zd8wydq0rs1ijxwal1wdyxnmy3vahhl0dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBXaW5kb3dzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiUmVib290MldpbmRvd3NAY29vb29sZmFuLmNvbSIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIlJlYm9vdDJXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Db29vb2xmYW4vUmVib290MldpbmRvd3MiLAogICJ1dWlkIjogIlJlYm9vdDJXaW5kb3dzQGNvb29vbGZhbi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
+  }}
+, {"uuid": "nightscout@jeroen.wtf", "name": "Nightscout", "pname": "nightscout", "description": "Integration with Nightscout to display its data", "link": "https://extensions.gnome.org/extension/7388/nightscout/", "shell_version_map": {
+    "46": {"version": "3", "sha256": "07fnkxk8mybjwp8zfkmdi92nncfic4l194mdd6mjvs08hz4gwa4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0aW9uIHdpdGggTmlnaHRzY291dCB0byBkaXNwbGF5IGl0cyBkYXRhIiwKICAibmFtZSI6ICJOaWdodHNjb3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0c2NvdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plcm9lbnd0Zi9nbm9tZS1uaWdodHNjb3V0IiwKICAidXVpZCI6ICJuaWdodHNjb3V0QGplcm9lbi53dGYiLAogICJ2ZXJzaW9uIjogMwp9"},
+    "47": {"version": "3", "sha256": "07fnkxk8mybjwp8zfkmdi92nncfic4l194mdd6mjvs08hz4gwa4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0aW9uIHdpdGggTmlnaHRzY291dCB0byBkaXNwbGF5IGl0cyBkYXRhIiwKICAibmFtZSI6ICJOaWdodHNjb3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0c2NvdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plcm9lbnd0Zi9nbm9tZS1uaWdodHNjb3V0IiwKICAidXVpZCI6ICJuaWdodHNjb3V0QGplcm9lbi53dGYiLAogICJ2ZXJzaW9uIjogMwp9"}
+  }}
+, {"uuid": "editdesktopfiles@dannflower", "name": "Edit Desktop Files", "pname": "edit-desktop-files", "description": "Edit desktop files by right-clicking their app icon.\n\nThis extension will attempt to use the GNOME Text Editor by default. If it is not installed, or you prefer to use a different editor, this can be changed in the preferences.", "link": "https://extensions.gnome.org/extension/7397/edit-desktop-files/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "12gr770xcwkf4l7r1wg9s4a9p0g6g7w31j4nlj0fjj5pfjgj5rg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiAzCn0="},
+    "46": {"version": "3", "sha256": "12gr770xcwkf4l7r1wg9s4a9p0g6g7w31j4nlj0fjj5pfjgj5rg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiAzCn0="},
+    "47": {"version": "3", "sha256": "12gr770xcwkf4l7r1wg9s4a9p0g6g7w31j4nlj0fjj5pfjgj5rg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiAzCn0="}
+  }}
+, {"uuid": "disable-three-finger@lxp-git.github.com", "name": "Disable 3 Finger Gestures", "pname": "disable-3-finger-gestures", "description": "Disable the default three-finger touchpad gestures in GNOME.", "link": "https://extensions.gnome.org/extension/7403/disable-3-finger-gestures/", "shell_version_map": {
+    "47": {"version": "2", "sha256": "1i13xszd3fnq0gj8v1bxlmba4vfgzvmr9k2hpdlsymyq3d77y1h6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIGRlZmF1bHQgdGhyZWUtZmluZ2VyIHRvdWNocGFkIGdlc3R1cmVzIGluIEdOT01FLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSAzIEZpbmdlciBHZXN0dXJlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seHAtZ2l0L2Rpc2FibGUtdGhyZWUtZmluZ2VyIiwKICAidXVpZCI6ICJkaXNhYmxlLXRocmVlLWZpbmdlckBseHAtZ2l0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEuMC4xIgp9"}
+  }}
+, {"uuid": "spotify-controls@Sonath21", "name": "Spotify Controls + Track Info", "pname": "spotify-controls", "description": "GNOME 45+ extension that integrates Spotify playback controls directly into your GNOME top bar. This extension is not affiliated, funded, or in any way associated with Spotify.\nPatch notes on github.", "link": "https://extensions.gnome.org/extension/7406/spotify-controls/", "shell_version_map": {
+    "45": {"version": "8", "sha256": "0adcmcxs8byryq72lg7jhxw9fq3hkp4bhxgv7ig4b65l26k2lpki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIDQ1KyBleHRlbnNpb24gdGhhdCBpbnRlZ3JhdGVzIFNwb3RpZnkgcGxheWJhY2sgY29udHJvbHMgZGlyZWN0bHkgaW50byB5b3VyIEdOT01FIHRvcCBiYXIuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFNwb3RpZnkuIiwKICAiZXh0ZW5zaW9uLXR5cGUiOiAic2hlbGwtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJTcG90aWZ5IENvbnRyb2xzICsgVHJhY2sgSW5mbyIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Tb25hdGgyMS9zcG90aWZ5LWNvbnRyb2xzIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xzQFNvbmF0aDIxIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "0adcmcxs8byryq72lg7jhxw9fq3hkp4bhxgv7ig4b65l26k2lpki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIDQ1KyBleHRlbnNpb24gdGhhdCBpbnRlZ3JhdGVzIFNwb3RpZnkgcGxheWJhY2sgY29udHJvbHMgZGlyZWN0bHkgaW50byB5b3VyIEdOT01FIHRvcCBiYXIuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFNwb3RpZnkuIiwKICAiZXh0ZW5zaW9uLXR5cGUiOiAic2hlbGwtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJTcG90aWZ5IENvbnRyb2xzICsgVHJhY2sgSW5mbyIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Tb25hdGgyMS9zcG90aWZ5LWNvbnRyb2xzIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xzQFNvbmF0aDIxIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "0adcmcxs8byryq72lg7jhxw9fq3hkp4bhxgv7ig4b65l26k2lpki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIDQ1KyBleHRlbnNpb24gdGhhdCBpbnRlZ3JhdGVzIFNwb3RpZnkgcGxheWJhY2sgY29udHJvbHMgZGlyZWN0bHkgaW50byB5b3VyIEdOT01FIHRvcCBiYXIuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIFNwb3RpZnkuIiwKICAiZXh0ZW5zaW9uLXR5cGUiOiAic2hlbGwtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJTcG90aWZ5IENvbnRyb2xzICsgVHJhY2sgSW5mbyIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Tb25hdGgyMS9zcG90aWZ5LWNvbnRyb2xzIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xzQFNvbmF0aDIxIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+  }}
+, {"uuid": "suru@ryusufe.github.io", "name": "Todo, すること", "pname": "todo", "description": "The GNOME To-Do Extension is a lightweight and user-friendly extension designed to help you manage your tasks efficiently. With a minimalistic interface, it allows you to add, modify, and delete tasks effortlessly. No complicated settings, just pure productivity!", "link": "https://extensions.gnome.org/extension/7418/todo/", "shell_version_map": {
+    "46": {"version": "4", "sha256": "1l5r0vvyc3pymy65ny5xnr6pyh6r5fibd1y3kk3vda21glzwp71s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBHTk9NRSBUby1EbyBFeHRlbnNpb24gaXMgYSBsaWdodHdlaWdodCBhbmQgdXNlci1mcmllbmRseSBleHRlbnNpb24gZGVzaWduZWQgdG8gaGVscCB5b3UgbWFuYWdlIHlvdXIgdGFza3MgZWZmaWNpZW50bHkuIFdpdGggYSBtaW5pbWFsaXN0aWMgaW50ZXJmYWNlLCBpdCBhbGxvd3MgeW91IHRvIGFkZCwgbW9kaWZ5LCBhbmQgZGVsZXRlIHRhc2tzIGVmZm9ydGxlc3NseS4gTm8gY29tcGxpY2F0ZWQgc2V0dGluZ3MsIGp1c3QgcHVyZSBwcm9kdWN0aXZpdHkhIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJyeXVzdWZlIgogIH0sCiAgIm5hbWUiOiAiVG9kbywgXHUzMDU5XHUzMDhiXHUzMDUzXHUzMDY4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUnl1c3VmZS9Ub2RvLUluLUdub21lIiwKICAidXVpZCI6ICJzdXJ1QHJ5dXN1ZmUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+  }}
+, {"uuid": "kill_ports@stasrusnak.github.com", "name": "Kill Ports", "pname": "kill-ports", "description": "Extension to kill processes on a specified port for Shell Version 46", "link": "https://extensions.gnome.org/extension/7420/kill-ports/", "shell_version_map": {
+    "46": {"version": "2", "sha256": "15wpma9p2cng85xj3r2gvyk52bcqmz4y64m7319spzgihyr373xd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBraWxsIHByb2Nlc3NlcyBvbiBhIHNwZWNpZmllZCBwb3J0IiwKICAibmFtZSI6ICJLaWxsIFBvcnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0YXNydXNuYWsva2lsbF9wb3J0cyIsCiAgInV1aWQiOiAia2lsbF9wb3J0c0BzdGFzcnVzbmFrLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
+  }}
+, {"uuid": "window-desaturation@mkhl.codeberg.page", "name": "Window Desaturation", "pname": "window-desaturation", "description": "Highlight the focused window by desaturating all other windows", "link": "https://extensions.gnome.org/extension/7423/window-desaturation/", "shell_version_map": {
+    "47": {"version": "6", "sha256": "1aa4qfw6fdqqg2xa6p0sa1h76km4g6wn625v55gvgcfyfayhk8rw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodCB0aGUgZm9jdXNlZCB3aW5kb3cgYnkgZGVzYXR1cmF0aW5nIGFsbCBvdGhlciB3aW5kb3dzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LWRlc2F0dXJhdGlvbkBta2hsLmNvZGViZXJnLnBhZ2UiLAogICJuYW1lIjogIldpbmRvdyBEZXNhdHVyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWRlc2F0dXJhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL21raGwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1kZXNhdHVyYXRpb24iLAogICJ1dWlkIjogIndpbmRvdy1kZXNhdHVyYXRpb25AbWtobC5jb2RlYmVyZy5wYWdlIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+  }}
+, {"uuid": "sound-percentage@subashghimire.info.np", "name": "Sound Percentage", "pname": "sound-percentage", "description": "Display the current sound percentage in the system tray.", "link": "https://extensions.gnome.org/extension/7426/sound-percentage/", "shell_version_map": {
+    "45": {"version": "1", "sha256": "0iks80v4gvym78f97p9994b6qifwyzqhlkvr7gr7fw0lmxl9xvqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkuIiwKICAibmFtZSI6ICJTb3VuZCBwZXJjZW50YWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUHVibGlzaGVyTmFtZS9zb3VuZC1wZXJjZW50YWdlLWdzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic291bmQtcGVyY2VudGFnZUBzdWJhc2hnaGltaXJlLmluZm8ubnAiLAogICJ2ZXJzaW9uIjogMQp9"},
+    "46": {"version": "1", "sha256": "0iks80v4gvym78f97p9994b6qifwyzqhlkvr7gr7fw0lmxl9xvqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkuIiwKICAibmFtZSI6ICJTb3VuZCBwZXJjZW50YWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUHVibGlzaGVyTmFtZS9zb3VuZC1wZXJjZW50YWdlLWdzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic291bmQtcGVyY2VudGFnZUBzdWJhc2hnaGltaXJlLmluZm8ubnAiLAogICJ2ZXJzaW9uIjogMQp9"},
+    "47": {"version": "1", "sha256": "0iks80v4gvym78f97p9994b6qifwyzqhlkvr7gr7fw0lmxl9xvqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkuIiwKICAibmFtZSI6ICJTb3VuZCBwZXJjZW50YWdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUHVibGlzaGVyTmFtZS9zb3VuZC1wZXJjZW50YWdlLWdzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic291bmQtcGVyY2VudGFnZUBzdWJhc2hnaGltaXJlLmluZm8ubnAiLAogICJ2ZXJzaW9uIjogMQp9"}
+  }}
+, {"uuid": "tempomate@dmfs.org", "name": "Tempomate", "pname": "tempomate", "description": "Mindless time tracking in Jira (Server) Tempo time sheets.\n\nThis extension allows you to log your time in Tempo with three mouse clicks or less.\n\nIn addition it can remind you frequently to log your time in case you didn't.\n\nAfter installation, configure the extension with your Jira URL, user name, API token and a couple of JQL filters for the issue categories to show in the menu.\n\nOnly Jira Server is supported right now. Comment on https://github.com/dmfs/tempomate/issues/45 if you need Jira Cloud support.", "link": "https://extensions.gnome.org/extension/7438/tempomate/", "shell_version_map": {
+    "46": {"version": "7", "sha256": "1qilp2dvg50h44j2j3rk7x4ixdvkxhklndc4ffqbjj4bslkdmh1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmRsZXNzIHRpbWUgdHJhY2tpbmcgaW4gSmlyYSAoU2VydmVyKSBUZW1wbyB0aW1lIHNoZWV0cy5cblxuVGhpcyBleHRlbnNpb24gYWxsb3dzIHlvdSB0byBsb2cgeW91ciB0aW1lIGluIFRlbXBvIHdpdGggdGhyZWUgbW91c2UgY2xpY2tzIG9yIGxlc3MuXG5cbkluIGFkZGl0aW9uIGl0IGNhbiByZW1pbmQgeW91IGZyZXF1ZW50bHkgdG8gbG9nIHlvdXIgdGltZSBpbiBjYXNlIHlvdSBkaWRuJ3QuXG5cbkFmdGVyIGluc3RhbGxhdGlvbiwgY29uZmlndXJlIHRoZSBleHRlbnNpb24gd2l0aCB5b3VyIEppcmEgVVJMLCB1c2VyIG5hbWUsIEFQSSB0b2tlbiBhbmQgYSBjb3VwbGUgb2YgSlFMIGZpbHRlcnMgZm9yIHRoZSBpc3N1ZSBjYXRlZ29yaWVzIHRvIHNob3cgaW4gdGhlIG1lbnUuXG5cbk9ubHkgSmlyYSBTZXJ2ZXIgaXMgc3VwcG9ydGVkIHJpZ2h0IG5vdy4gQ29tbWVudCBvbiBodHRwczovL2dpdGh1Yi5jb20vZG1mcy90ZW1wb21hdGUvaXNzdWVzLzQ1IGlmIHlvdSBuZWVkIEppcmEgQ2xvdWQgc3VwcG9ydC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAicGF5cGFsIjogImRtZnMiCiAgfSwKICAibmFtZSI6ICJUZW1wb21hdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGVtcG9tYXRlLmRtZnMub3JnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtZnMvdGVtcG9tYXRlIiwKICAidXVpZCI6ICJ0ZW1wb21hdGVAZG1mcy5vcmciLAogICJ2ZXJzaW9uIjogNywKICAidmVyc2lvbi1uYW1lIjogIjAuNC4wIgp9"}
+  }}
+, {"uuid": "shutdown-dialogue@subashghimire.info.np", "name": "Shutdown Dialogue", "pname": "shutdown-dialogue", "description": "Shutdown Dialogue using Alt + F4", "link": "https://extensions.gnome.org/extension/7444/shutdown-dialogue/", "shell_version_map": {
+    "45": {"version": "5", "sha256": "025y3ds91byaipklx89zhvghas9w2h3r3xjf7ql252jxl1hnbb6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duIERpYWxvZ3VlIHVzaW5nIEFsdCArIEY0IiwKICAibmFtZSI6ICJTaHV0ZG93biBEaWFsb2d1ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1Ymxpc2hlcm5hbWUvc2h1dGRvd24tZGlhbG9ndWUtZ3MtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzaHV0ZG93bi1kaWFsb2d1ZUBzdWJhc2hnaGltaXJlLmluZm8ubnAiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "025y3ds91byaipklx89zhvghas9w2h3r3xjf7ql252jxl1hnbb6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duIERpYWxvZ3VlIHVzaW5nIEFsdCArIEY0IiwKICAibmFtZSI6ICJTaHV0ZG93biBEaWFsb2d1ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1Ymxpc2hlcm5hbWUvc2h1dGRvd24tZGlhbG9ndWUtZ3MtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzaHV0ZG93bi1kaWFsb2d1ZUBzdWJhc2hnaGltaXJlLmluZm8ubnAiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "025y3ds91byaipklx89zhvghas9w2h3r3xjf7ql252jxl1hnbb6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duIERpYWxvZ3VlIHVzaW5nIEFsdCArIEY0IiwKICAibmFtZSI6ICJTaHV0ZG93biBEaWFsb2d1ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1Ymxpc2hlcm5hbWUvc2h1dGRvd24tZGlhbG9ndWUtZ3MtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzaHV0ZG93bi1kaWFsb2d1ZUBzdWJhc2hnaGltaXJlLmluZm8ubnAiLAogICJ2ZXJzaW9uIjogNQp9"}
+  }}
+, {"uuid": "tracker@aliakseiz.github.com", "name": "Timer tracker. Gnome 45-47", "pname": "tracker", "description": "A simple time tracker extension.\n* Multiple timers\n* Start/Stop individual timers with one click\n* Reset individual timers or all of them at once\n* Edit name and time\n* Choose specific timers or display the total time\n* Timers are automatically saved and restored between sessions\n * Automatically pauses all active timers when the screen is locked\n* Edit timers using keyboard shortcuts (e.g., Tab, Enter, and Escape)", "link": "https://extensions.gnome.org/extension/7447/tracker/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "0w7w2j2ykm11pgv4mxfmh6j4l0kjldlyynif5g500lic0ycxil5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHRpbWUgdHJhY2tlciBleHRlbnNpb24iLAogICJuYW1lIjogIlRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovdHJhY2tlciIsCiAgInV1aWQiOiAidHJhY2tlckBhbGlha3NlaXouZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
+    "46": {"version": "3", "sha256": "0w7w2j2ykm11pgv4mxfmh6j4l0kjldlyynif5g500lic0ycxil5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHRpbWUgdHJhY2tlciBleHRlbnNpb24iLAogICJuYW1lIjogIlRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovdHJhY2tlciIsCiAgInV1aWQiOiAidHJhY2tlckBhbGlha3NlaXouZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
+    "47": {"version": "3", "sha256": "0w7w2j2ykm11pgv4mxfmh6j4l0kjldlyynif5g500lic0ycxil5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHRpbWUgdHJhY2tlciBleHRlbnNpb24iLAogICJuYW1lIjogIlRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGlha3NlaXovdHJhY2tlciIsCiAgInV1aWQiOiAidHJhY2tlckBhbGlha3NlaXouZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
+  }}
+, {"uuid": "volumeBoosr@octane-laurel", "name": "Volume Boost", "pname": "volume-boost", "description": "A toggle to Boosts volume above limits | Fork of https://github.com/shaquibimdad/gnome_ext_volume_boost", "link": "https://extensions.gnome.org/extension/7450/volume-boost/", "shell_version_map": {
+    "46": {"version": "8", "sha256": "0qs0vpz8hskvhmhncd497airskjscs0br1m02ic56ivngq1lr6in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdG9nZ2xlIHRvIEJvb3N0cyB2b2x1bWUgYWJvdmUgbGltaXRzIHwgRm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vc2hhcXVpYmltZGFkL2dub21lX2V4dF92b2x1bWVfYm9vc3QiLAogICJuYW1lIjogIlZvbHVtZSBCb29zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9ybVR1cnRsZS9nbm9tZV9leHRfdm9sdW1lX2Jvb3N0IiwKICAidXVpZCI6ICJ2b2x1bWVCb29zckBvY3RhbmUtbGF1cmVsIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "0qs0vpz8hskvhmhncd497airskjscs0br1m02ic56ivngq1lr6in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdG9nZ2xlIHRvIEJvb3N0cyB2b2x1bWUgYWJvdmUgbGltaXRzIHwgRm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vc2hhcXVpYmltZGFkL2dub21lX2V4dF92b2x1bWVfYm9vc3QiLAogICJuYW1lIjogIlZvbHVtZSBCb29zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9ybVR1cnRsZS9nbm9tZV9leHRfdm9sdW1lX2Jvb3N0IiwKICAidXVpZCI6ICJ2b2x1bWVCb29zckBvY3RhbmUtbGF1cmVsIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+  }}
+, {"uuid": "iworkspace-indicator@redscorpse.net", "name": "iWorkspace Indicator", "pname": "iworkspace-indicator", "description": "GNOME Shell extension for an **interactive** workspace indicator (GNOME-like).\n\nForked from https://gitlab.com/null-git/simple-workspaces-bar (which is forked from https://github.com/fthx/workspaces-bar).", "link": "https://extensions.gnome.org/extension/7451/iworkspace-indicator/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "1hm0kjhxxxiy0pbcxpl3qsga7lsx6q2lils7iyscpg6gcwpwjnkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiBmb3IgYW4gKippbnRlcmFjdGl2ZSoqIHdvcmtzcGFjZSBpbmRpY2F0b3IgKEdOT01FLWxpa2UpLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2dpdGxhYi5jb20vbnVsbC1naXQvc2ltcGxlLXdvcmtzcGFjZXMtYmFyICh3aGljaCBpcyBmb3JrZWQgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhcikuIiwKICAibmFtZSI6ICJpV29ya3NwYWNlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JlZHNjb3Jwc2UvaXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogIml3b3Jrc3BhY2UtaW5kaWNhdG9yQHJlZHNjb3Jwc2UubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "46": {"version": "3", "sha256": "1hm0kjhxxxiy0pbcxpl3qsga7lsx6q2lils7iyscpg6gcwpwjnkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiBmb3IgYW4gKippbnRlcmFjdGl2ZSoqIHdvcmtzcGFjZSBpbmRpY2F0b3IgKEdOT01FLWxpa2UpLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2dpdGxhYi5jb20vbnVsbC1naXQvc2ltcGxlLXdvcmtzcGFjZXMtYmFyICh3aGljaCBpcyBmb3JrZWQgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhcikuIiwKICAibmFtZSI6ICJpV29ya3NwYWNlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JlZHNjb3Jwc2UvaXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogIml3b3Jrc3BhY2UtaW5kaWNhdG9yQHJlZHNjb3Jwc2UubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "3", "sha256": "1hm0kjhxxxiy0pbcxpl3qsga7lsx6q2lils7iyscpg6gcwpwjnkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiBmb3IgYW4gKippbnRlcmFjdGl2ZSoqIHdvcmtzcGFjZSBpbmRpY2F0b3IgKEdOT01FLWxpa2UpLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2dpdGxhYi5jb20vbnVsbC1naXQvc2ltcGxlLXdvcmtzcGFjZXMtYmFyICh3aGljaCBpcyBmb3JrZWQgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhcikuIiwKICAibmFtZSI6ICJpV29ya3NwYWNlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JlZHNjb3Jwc2UvaXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogIml3b3Jrc3BhY2UtaW5kaWNhdG9yQHJlZHNjb3Jwc2UubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}
+  }}
+, {"uuid": "BrowserSearchProvider@mepowerleo10.github.io", "name": "Browser Search Provider", "pname": "browser-search-provider", "description": "Adds a search provider to Open links, Search Google, and DuckDuckGo.\n- Type a url to open it in your default browser\n- Any text is automatically matched with Google\n- To search DuckDuckGo start your search with \"d\", then space and type your query", "link": "https://extensions.gnome.org/extension/7454/browser-search-provider/", "shell_version_map": {
+    "45": {"version": "2", "sha256": "1kmllsd3nsm33jgp7gl4hmmc66z7a492y56pmvg0r4q3fdjl55bx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzZWFyY2ggcHJvdmlkZXIgdG8gT3BlbiBsaW5rcywgU2VhcmNoIEdvb2dsZSwgYW5kIER1Y2tEdWNrR28uIiwKICAibmFtZSI6ICJCcm93c2VyIFNlYXJjaCBQcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcG93ZXJsZW8xMC9HTk9NRVNoZWxsQnJvd3NlclNlYXJjaFByb3ZpZGVyIiwKICAidXVpZCI6ICJCcm93c2VyU2VhcmNoUHJvdmlkZXJAbWVwb3dlcmxlbzEwLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
+    "46": {"version": "2", "sha256": "1kmllsd3nsm33jgp7gl4hmmc66z7a492y56pmvg0r4q3fdjl55bx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzZWFyY2ggcHJvdmlkZXIgdG8gT3BlbiBsaW5rcywgU2VhcmNoIEdvb2dsZSwgYW5kIER1Y2tEdWNrR28uIiwKICAibmFtZSI6ICJCcm93c2VyIFNlYXJjaCBQcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcG93ZXJsZW8xMC9HTk9NRVNoZWxsQnJvd3NlclNlYXJjaFByb3ZpZGVyIiwKICAidXVpZCI6ICJCcm93c2VyU2VhcmNoUHJvdmlkZXJAbWVwb3dlcmxlbzEwLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="},
+    "47": {"version": "2", "sha256": "1kmllsd3nsm33jgp7gl4hmmc66z7a492y56pmvg0r4q3fdjl55bx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzZWFyY2ggcHJvdmlkZXIgdG8gT3BlbiBsaW5rcywgU2VhcmNoIEdvb2dsZSwgYW5kIER1Y2tEdWNrR28uIiwKICAibmFtZSI6ICJCcm93c2VyIFNlYXJjaCBQcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcG93ZXJsZW8xMC9HTk9NRVNoZWxsQnJvd3NlclNlYXJjaFByb3ZpZGVyIiwKICAidXVpZCI6ICJCcm93c2VyU2VhcmNoUHJvdmlkZXJAbWVwb3dlcmxlbzEwLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
+  }}
+, {"uuid": "current-monitor-window-app-switcher@thmatosbr", "name": "Current Monitor Window/App Switcher", "pname": "current-monitor-windowapp-switcher", "description": "Includes only applications from the current monitor in the Window Switcher and App Switcher", "link": "https://extensions.gnome.org/extension/7460/current-monitor-windowapp-switcher/", "shell_version_map": {
+    "45": {"version": "5", "sha256": "1c9bhd1ajndawlz4s7vdlp2qaclcjl8b6s0nf4qy0wmyhz5p8d5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY2x1ZGVzIG9ubHkgYXBwbGljYXRpb25zIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvciBpbiB0aGUgV2luZG93IFN3aXRjaGVyIGFuZCBBcHAgU3dpdGNoZXIiLAogICJuYW1lIjogIkN1cnJlbnQgTW9uaXRvciBXaW5kb3cvQXBwIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1cnJlbnQtbW9uaXRvci13aW5kb3ctYXBwLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhtYXRvc2JyL2N1cnJlbnQtbW9uaXRvci13aW5kb3ctYXBwLXN3aXRjaGVyIiwKICAidXVpZCI6ICJjdXJyZW50LW1vbml0b3Itd2luZG93LWFwcC1zd2l0Y2hlckB0aG1hdG9zYnIiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "46": {"version": "5", "sha256": "1c9bhd1ajndawlz4s7vdlp2qaclcjl8b6s0nf4qy0wmyhz5p8d5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY2x1ZGVzIG9ubHkgYXBwbGljYXRpb25zIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvciBpbiB0aGUgV2luZG93IFN3aXRjaGVyIGFuZCBBcHAgU3dpdGNoZXIiLAogICJuYW1lIjogIkN1cnJlbnQgTW9uaXRvciBXaW5kb3cvQXBwIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1cnJlbnQtbW9uaXRvci13aW5kb3ctYXBwLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhtYXRvc2JyL2N1cnJlbnQtbW9uaXRvci13aW5kb3ctYXBwLXN3aXRjaGVyIiwKICAidXVpZCI6ICJjdXJyZW50LW1vbml0b3Itd2luZG93LWFwcC1zd2l0Y2hlckB0aG1hdG9zYnIiLAogICJ2ZXJzaW9uIjogNQp9"},
+    "47": {"version": "5", "sha256": "1c9bhd1ajndawlz4s7vdlp2qaclcjl8b6s0nf4qy0wmyhz5p8d5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY2x1ZGVzIG9ubHkgYXBwbGljYXRpb25zIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvciBpbiB0aGUgV2luZG93IFN3aXRjaGVyIGFuZCBBcHAgU3dpdGNoZXIiLAogICJuYW1lIjogIkN1cnJlbnQgTW9uaXRvciBXaW5kb3cvQXBwIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1cnJlbnQtbW9uaXRvci13aW5kb3ctYXBwLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhtYXRvc2JyL2N1cnJlbnQtbW9uaXRvci13aW5kb3ctYXBwLXN3aXRjaGVyIiwKICAidXVpZCI6ICJjdXJyZW50LW1vbml0b3Itd2luZG93LWFwcC1zd2l0Y2hlckB0aG1hdG9zYnIiLAogICJ2ZXJzaW9uIjogNQp9"}
+  }}
+, {"uuid": "vuemeter-system@aldunelabs.com", "name": "VueMeter System", "pname": "vuemeter-system", "description": "System monitor showing CPU and memory usage.", "link": "https://extensions.gnome.org/extension/7469/vuemeter-system/", "shell_version_map": {
+    "46": {"version": "2", "sha256": "0169l7mi3jr1hbswd51wn7m7zs8l9nkwgradljd06390209l4yvy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtb25pdG9yIHNob3dpbmcgQ1BVIGFuZCBtZW1vcnkgdXNhZ2UuIiwKICAiZXh0ZW5zaW9uLWlkIjogInZ1ZW1ldGVyLXN5c3RlbSIsCiAgImdldHRleHQtZG9tYWluIjogInZ1ZW1ldGVyLXN5c3RlbUBhbGR1bmVsYWJzLmNvbSIsCiAgIm5hbWUiOiAiVnVlTWV0ZXIgU3lzdGVtIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImZyZWRlcmljLmJvbHR6QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52dWVtZXRlci1zeXN0ZW0iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ZyZWQ3ODI5MC92dWVtZXRlci1zeXN0ZW0iLAogICJ1dWlkIjogInZ1ZW1ldGVyLXN5c3RlbUBhbGR1bmVsYWJzLmNvbSIsCiAgInZlcnNpb24iOiAyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4wLjAiCn0="},
+    "47": {"version": "2", "sha256": "0169l7mi3jr1hbswd51wn7m7zs8l9nkwgradljd06390209l4yvy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtb25pdG9yIHNob3dpbmcgQ1BVIGFuZCBtZW1vcnkgdXNhZ2UuIiwKICAiZXh0ZW5zaW9uLWlkIjogInZ1ZW1ldGVyLXN5c3RlbSIsCiAgImdldHRleHQtZG9tYWluIjogInZ1ZW1ldGVyLXN5c3RlbUBhbGR1bmVsYWJzLmNvbSIsCiAgIm5hbWUiOiAiVnVlTWV0ZXIgU3lzdGVtIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImZyZWRlcmljLmJvbHR6QGdtYWlsLmNvbSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52dWVtZXRlci1zeXN0ZW0iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ZyZWQ3ODI5MC92dWVtZXRlci1zeXN0ZW0iLAogICJ1dWlkIjogInZ1ZW1ldGVyLXN5c3RlbUBhbGR1bmVsYWJzLmNvbSIsCiAgInZlcnNpb24iOiAyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4wLjAiCn0="}
+  }}
+, {"uuid": "lockscreen-extension@pratap.fastmail.fm", "name": "Lockscreen Extension", "pname": "lockscreen-extension", "description": "Customize GNOME's Lockscreen", "link": "https://extensions.gnome.org/extension/7472/lockscreen-extension/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "1j4k7fmn33cdpzx7l6b896ldnx1n940lfhvfac7i0h9z5wvdn2dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHTk9NRSdzIExvY2tzY3JlZW4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiTG9ja3NjcmVlbiBFeHRlbnNpb24iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2tzY3JlZW4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2xvY2tzY3JlZW4tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuLWV4dGVuc2lvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "46": {"version": "3", "sha256": "1j4k7fmn33cdpzx7l6b896ldnx1n940lfhvfac7i0h9z5wvdn2dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHTk9NRSdzIExvY2tzY3JlZW4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiTG9ja3NjcmVlbiBFeHRlbnNpb24iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2tzY3JlZW4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2xvY2tzY3JlZW4tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuLWV4dGVuc2lvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMwp9"},
+    "47": {"version": "3", "sha256": "1j4k7fmn33cdpzx7l6b896ldnx1n940lfhvfac7i0h9z5wvdn2dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHTk9NRSdzIExvY2tzY3JlZW4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIgogIH0sCiAgIm5hbWUiOiAiTG9ja3NjcmVlbiBFeHRlbnNpb24iLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2tzY3JlZW4tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2xvY2tzY3JlZW4tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuLWV4dGVuc2lvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMwp9"}
+  }}
+, {"uuid": "public-ip-address@fire-man-x", "name": "Public IP address", "pname": "public-ip-address", "description": "Shows an public IPv4 and IPv6 address.\nIt uses 'lookup.test-ipv6.com' service to get the public address.", "link": "https://extensions.gnome.org/extension/7478/public-ip-address/", "shell_version_map": {
+    "47": {"version": "4", "sha256": "0f5hdq13ary1667f6ivjzccirarmpgs1h25qmbnm7qidy22p7wds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFuIHB1YmxpYyBJUHY0IGFuZCBJUHY2IGFkZHJlc3MuXG5JdCB1c2VzICdsb29rdXAudGVzdC1pcHY2LmNvbScgc2VydmljZSB0byBnZXQgdGhlIHB1YmxpYyBhZGRyZXNzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2VzIiwKICAibmFtZSI6ICJQdWJsaWMgSVAgYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GaXJlLW1hbi14L1B1YmxpYy1JUC1hZGRyZXNzLS0tR25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwdWJsaWMtaXAtYWRkcmVzc0BmaXJlLW1hbi14IiwKICAidmVyc2lvbiI6IDQKfQ=="}
+  }}
+, {"uuid": "ethereum_gas_tracker@pulsanoracle.github.io", "name": "Ethereum Gas Price Tracker", "pname": "ethereum-gas-price-tracker", "description": "Display Ethereum gas price on the panel.\n\n It is using Etherscan (etherscan.io) service\n\nEthereum icons created by juicy_fish - Flaticon", "link": "https://extensions.gnome.org/extension/7481/ethereum-gas-price-tracker/", "shell_version_map": {
+    "45": {"version": "1", "sha256": "04s5mnaza7px1n8w950iima5vhxrgpcrvg2ys1kdwgysq4mxdksd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgRXRoZXJldW0gZ2FzIHByaWNlIG9uIHRoZSBwYW5lbC5cblxuIEl0IGlzIHVzaW5nIEV0aGVyc2NhbiAoZXRoZXJzY2FuLmlvKSBzZXJ2aWNlIiwKICAibmFtZSI6ICJFdGhlcmV1bSBHYXMgUHJpY2UgVHJhY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHVsc2Fub3JhY2xlL2dub21lX3NoZWxsX2V0aGVyZXVtX2dhc190cmFja2VyIiwKICAidXVpZCI6ICJldGhlcmV1bV9nYXNfdHJhY2tlckBwdWxzYW5vcmFjbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="},
+    "46": {"version": "1", "sha256": "04s5mnaza7px1n8w950iima5vhxrgpcrvg2ys1kdwgysq4mxdksd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgRXRoZXJldW0gZ2FzIHByaWNlIG9uIHRoZSBwYW5lbC5cblxuIEl0IGlzIHVzaW5nIEV0aGVyc2NhbiAoZXRoZXJzY2FuLmlvKSBzZXJ2aWNlIiwKICAibmFtZSI6ICJFdGhlcmV1bSBHYXMgUHJpY2UgVHJhY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHVsc2Fub3JhY2xlL2dub21lX3NoZWxsX2V0aGVyZXVtX2dhc190cmFja2VyIiwKICAidXVpZCI6ICJldGhlcmV1bV9nYXNfdHJhY2tlckBwdWxzYW5vcmFjbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}
+  }}
 ]
diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 97270194bdb0..eae7d0db0b7e 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-gsconnect";
-  version = "57";
+  version = "58";
 
   outputs = [ "out" "installedTests" ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    hash = "sha256-0o5CEkdFPL7bZkHIA/zFWB8sY1OYROl4P3rl24+lze0=";
+    hash = "sha256-bpy4G+f3NJ2iVsycPluV+98at0G2wlp7t5cPEMGM90s=";
   };
 
   patches = [
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
     description = "KDE Connect implementation for Gnome Shell";
     homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki";
     license = licenses.gpl2Plus;
-    maintainers = teams.gnome.members;
+    maintainers = teams.gnome.members ++ [ maintainers.doronbehar ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
index cb4e9ff85caa..a391784e7f38 100644
--- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix
+++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-pop-shell";
-  version = "unstable-2024-04-04";
+  version = "1.2.0-unstable-2024-10-09";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "shell";
-    rev = "cfa0c55e84b7ce339e5ce83832f76fee17e99d51";
-    hash = "sha256-IQJtTMYCkKyjqDKoR35qsgQkvXIrGLq+qtMDOTkvy08=";
+    rev = "e25621e2595eb5235ecb1a41167d1324a2b2a297";
+    hash = "sha256-PPJofRzzbH1zcnKtQ/3ulErvN4pAJMo/igzdq1zT06s=";
   };
 
   nativeBuildInputs = [ glib gjs typescript ];
diff --git a/pkgs/desktops/gnome/extensions/update-extensions.py b/pkgs/desktops/gnome/extensions/update-extensions.py
index ef6687a06f73..2d44c130e951 100755
--- a/pkgs/desktops/gnome/extensions/update-extensions.py
+++ b/pkgs/desktops/gnome/extensions/update-extensions.py
@@ -22,6 +22,7 @@ supported_versions = {
     "44": "44",
     "45": "45",
     "46": "46",
+    "47": "47",
 }
 
 # Some type alias to increase readability of complex compound types
diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
index 9bba0d914c7a..9e8d6b20f295 100644
--- a/pkgs/desktops/lomiri/development/u1db-qt/default.nix
+++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
@@ -10,6 +10,7 @@
   pkg-config,
   qtbase,
   qtdeclarative,
+  qttools,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+    "doc"
     "examples"
   ];
 
@@ -56,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     qtdeclarative # qmlplugindump
+    qttools # qdoc
   ];
 
   buildInputs = [
@@ -66,8 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeCheckInputs = [ dbus-test-runner ];
 
   cmakeFlags = [
-    # Needs qdoc, see https://github.com/NixOS/nixpkgs/pull/245379
-    (lib.cmakeBool "BUILD_DOCS" false)
+    (lib.cmakeBool "BUILD_DOCS" true)
   ];
 
   dontWrapQtApps = true;
@@ -101,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Qt5 binding and QtQuick2 plugin for U1DB";
     homepage = "https://gitlab.com/ubports/development/core/u1db-qt";
+    changelog = "https://gitlab.com/ubports/development/core/u1db-qt/-/blob/${finalAttrs.version}/ChangeLog";
     license = lib.licenses.lgpl3Only;
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;
diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
index 35eccd897157..8493e89f8f15 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
@@ -1,15 +1,18 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, testers
-, cmake
-, dbus
-, dbus-test-runner
-, pkg-config
-, qtbase
-, qtdeclarative
-, validatePkgConfig
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  testers,
+  cmake,
+  dbus,
+  dbus-test-runner,
+  doxygen,
+  pkg-config,
+  qtbase,
+  qtdeclarative,
+  qttools,
+  validatePkgConfig,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,20 +29,27 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+    "doc"
   ];
 
   postPatch = ''
     # Queries QMake for broken Qt variable: '/build/qtbase-/$(out)/$(qtQmlPrefix)'
     substituteInPlace qml/Lomiri/Action/CMakeLists.txt \
-      --replace 'exec_program(''${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)' 'set(QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")'
+      --replace-fail 'exec_program(''${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)' 'set(QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")'
+
+    # Fix section labels
+    substituteInPlace documentation/qml/pages/* \
+      --replace-warn '\part' '\section1'
   '';
 
   strictDeps = true;
 
   nativeBuildInputs = [
     cmake
+    doxygen
     pkg-config
     qtdeclarative
+    qttools # qdoc
     validatePkgConfig
   ];
 
@@ -55,10 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "GENERATE_DOCUMENTATION" true)
     # Use vendored libhud2, TODO package libhud2 separately?
     (lib.cmakeBool "use_libhud2" false)
-    # QML docs need qdoc, https://github.com/NixOS/nixpkgs/pull/245379
-    (lib.cmakeBool "GENERATE_DOCUMENTATION" false)
   ];
 
   dontWrapQtApps = true;
@@ -82,8 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.lgpl3Only;
     maintainers = teams.lomiri.members;
     platforms = platforms.linux;
-    pkgConfigModules = [
-      "lomiri-action-qt-1"
-    ];
+    pkgConfigModules = [ "lomiri-action-qt-1" ];
   };
 })
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 8767534d368f..d0bedb67bd52 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -1,36 +1,46 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, substituteAll
-, testers
-, dbus-test-runner
-, dpkg
-, gdb
-, glib
-, lttng-ust
-, perl
-, pkg-config
-, python3
-, qmake
-, qtbase
-, qtdeclarative
-, qtfeedback
-, qtgraphicaleffects
-, qtpim
-, qtquickcontrols2
-, qtsvg
-, qtsystems
-, suru-icon-theme
-, validatePkgConfig
-, wrapQtAppsHook
-, xvfb-run
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  substituteAll,
+  testers,
+  dbus-test-runner,
+  dpkg,
+  gdb,
+  glib,
+  lttng-ust,
+  perl,
+  pkg-config,
+  python3,
+  qmake,
+  qtbase,
+  qtdeclarative,
+  qtfeedback,
+  qtgraphicaleffects,
+  qtpim,
+  qtquickcontrols2,
+  qtsvg,
+  qtsystems,
+  qttools,
+  suru-icon-theme,
+  validatePkgConfig,
+  wrapQtAppsHook,
+  xvfb-run,
 }:
 
 let
   listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;
-  qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [ qtbase qtpim qtsvg ];
-  qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [ qtdeclarative qtfeedback qtgraphicaleffects ];
+  qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [
+    qtbase
+    qtpim
+    qtsvg
+  ];
+  qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [
+    qtdeclarative
+    qtfeedback
+    qtgraphicaleffects
+  ];
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-toolkit";
@@ -43,10 +53,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I=";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   patches = [
     ./2001-Mark-problematic-tests.patch
+
     (substituteAll {
       src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
       name = "2002-Nixpkgs-versioned-QML-path.patch";
@@ -67,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace apicheck/apicheck.pro \
       --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
 
+    substituteInPlace documentation/documentation.pro \
+      --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
+      --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
+
     # Causes redefinition error with our own fortify hardening
     sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
 
@@ -105,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python3
     qmake
+    qttools # qdoc, qhelpgenerator
     validatePkgConfig
     wrapQtAppsHook
   ];
@@ -133,8 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   qmakeFlags = [
-    # docs require Qt5's qdoc, which we don't have before https://github.com/NixOS/nixpkgs/pull/245379
-    "CONFIG+=no_docs"
     # Ubuntu UITK compatibility, for older / not-yet-migrated applications
     "CONFIG+=ubuntu-uitk-compat"
     "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}"
@@ -201,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "QML components to ease the creation of beautiful applications in QML";
     longDescription = ''
       This project consists of a set of QML components to ease the creation of beautiful applications in QML for Lomiri.
@@ -219,9 +237,12 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit";
     changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/${finalAttrs.version}/ChangeLog";
-    license = with licenses; [ gpl3Only cc-by-sa-30 ];
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
+    license = with lib.licenses; [
+      gpl3Only
+      cc-by-sa-30
+    ];
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
     pkgConfigModules = [
       "LomiriGestures"
       "LomiriMetrics"
diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index dd2f6d3ab23e..a2bb44340024 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -1,30 +1,32 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, testers
-, cmake
-, cmake-extras
-, dbus-test-runner
-, gettext
-, glib
-, gsettings-qt
-, gtest
-, libapparmor
-, libnotify
-, lomiri-api
-, lomiri-app-launch
-, lomiri-download-manager
-, lomiri-ui-toolkit
-, pkg-config
-, properties-cpp
-, qtbase
-, qtdeclarative
-, qtfeedback
-, qtgraphicaleffects
-, validatePkgConfig
-, wrapGAppsHook3
-, xvfb-run
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  testers,
+  cmake,
+  cmake-extras,
+  dbus-test-runner,
+  gettext,
+  glib,
+  gsettings-qt,
+  gtest,
+  libapparmor,
+  libnotify,
+  lomiri-api,
+  lomiri-app-launch,
+  lomiri-download-manager,
+  lomiri-ui-toolkit,
+  pkg-config,
+  properties-cpp,
+  qtbase,
+  qtdeclarative,
+  qtfeedback,
+  qtgraphicaleffects,
+  qttools,
+  validatePkgConfig,
+  wrapGAppsHook3,
+  xvfb-run,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+    "doc"
     "examples"
   ];
 
@@ -64,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     pkg-config
     qtdeclarative # qmlplugindump
+    qttools # qdoc
     validatePkgConfig
     wrapGAppsHook3
   ];
@@ -90,9 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     xvfb-run
   ];
 
-  checkInputs = [
-    gtest
-  ];
+  checkInputs = [ gtest ];
 
   dontWrapQtApps = true;
 
@@ -100,17 +102,27 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "GSETTINGS_COMPILE" true)
     (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-    (lib.cmakeBool "ENABLE_DOC" false) # needs Qt5 qdoc: https://github.com/NixOS/nixpkgs/pull/245379
+    (lib.cmakeBool "ENABLE_DOC" true)
     (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it
   ];
 
-  preBuild = let
-    listToQtVar = list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list;
-  in ''
-    # Executes qmlplugindump
-    export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix}
-    export QML2_IMPORT_PATH=${listToQtVar [ qtdeclarative lomiri-ui-toolkit qtfeedback qtgraphicaleffects ] qtbase.qtQmlPrefix}
-  '';
+  preBuild =
+    let
+      listToQtVar =
+        list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list;
+    in
+    ''
+      # Executes qmlplugindump
+      export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix}
+      export QML2_IMPORT_PATH=${
+        listToQtVar [
+          qtdeclarative
+          lomiri-ui-toolkit
+          qtfeedback
+          qtgraphicaleffects
+        ] qtbase.qtQmlPrefix
+      }
+    '';
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
@@ -145,7 +157,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://gitlab.com/ubports/development/core/lomiri-content-hub";
     changelog = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ gpl3Only lgpl3Only ];
+    license = with lib.licenses; [
+      gpl3Only
+      lgpl3Only
+    ];
     mainProgram = "lomiri-content-hub-service";
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 6174bd9c54b0..acd5647a625d 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -1,28 +1,29 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, fetchpatch
-, gitUpdater
-, testers
-, boost
-, cmake
-, cmake-extras
-, dbus
-, dbus-test-runner
-# Needs qdoc, https://github.com/NixOS/nixpkgs/pull/245379
-, withDocumentation ? false
-, doxygen
-, glog
-, graphviz
-, gtest
-, lomiri-api
-, pkg-config
-, python3
-, qtbase
-, qtdeclarative
-, validatePkgConfig
-, wrapQtAppsHook
-, xvfb-run
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  gitUpdater,
+  testers,
+  boost,
+  cmake,
+  cmake-extras,
+  dbus,
+  dbus-test-runner,
+  withDocumentation ? true,
+  doxygen,
+  glog,
+  graphviz,
+  gtest,
+  lomiri-api,
+  pkg-config,
+  python3,
+  qtbase,
+  qtdeclarative,
+  qttools,
+  validatePkgConfig,
+  wrapQtAppsHook,
+  xvfb-run,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,9 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDocumentation [
-    "doc"
-  ];
+  ] ++ lib.optionals withDocumentation [ "doc" ];
 
   patches = [
     # This change seems incomplete, potentially breaks things on systems that don't use AppArmor mediation
@@ -69,15 +68,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    validatePkgConfig
-    wrapQtAppsHook
-  ] ++ lib.optionals withDocumentation [
-    doxygen
-    graphviz
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+      validatePkgConfig
+      wrapQtAppsHook
+    ]
+    ++ lib.optionals withDocumentation [
+      doxygen
+      graphviz
+      qttools # qdoc
+    ];
 
   buildInputs = [
     boost
@@ -95,9 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     xvfb-run
   ];
 
-  checkInputs = [
-    gtest
-  ];
+  checkInputs = [ gtest ];
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_DOC" withDocumentation)
@@ -106,11 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_WERROR" false)
   ];
 
-  makeTargets = [
-    "all"
-  ] ++ lib.optionals withDocumentation [
-    "doc"
-  ];
+  makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
@@ -127,13 +123,13 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Performs uploads and downloads from a centralized location";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager";
     changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${finalAttrs.version}/ChangeLog";
-    license = licenses.lgpl3Only;
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3Only;
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
     pkgConfigModules = [
       "ldm-common"
       "lomiri-download-manager-client"
diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
index 41d5e81611e4..58ca6d208779 100644
--- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
@@ -28,6 +28,7 @@
   python3,
   qtdeclarative,
   qtbase,
+  qttools,
   validatePkgConfig,
 }:
 
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     intltool
     pkg-config
     qtdeclarative
+    qttools # qdoc
     validatePkgConfig
   ];
 
@@ -106,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "GSETTINGS_COMPILE" true)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
     (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # just in case something needs it
-    (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379
+    (lib.cmakeBool "BUILD_DOC" true)
   ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index 7629da2cbb84..d26ae0780da2 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -1,31 +1,32 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, fetchpatch
-, gitUpdater
-, testers
-, cmake
-, cmake-extras
-, dbus
-, dbus-test-runner
-, glib
-, gtest
-, intltool
-, json-glib
-, libapparmor
-, libxkbcommon
-, lomiri-app-launch
-, lomiri-ui-toolkit
-, makeWrapper
-, pkg-config
-, python3
-, qtbase
-, qtdeclarative
-, qtwayland
-, runtimeShell
-, sqlite
-, systemd
-, wrapQtAppsHook
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  gitUpdater,
+  testers,
+  cmake,
+  cmake-extras,
+  dbus,
+  dbus-test-runner,
+  glib,
+  gtest,
+  intltool,
+  json-glib,
+  libapparmor,
+  libxkbcommon,
+  lomiri-app-launch,
+  lomiri-ui-toolkit,
+  makeWrapper,
+  pkg-config,
+  python3,
+  qtbase,
+  qtdeclarative,
+  qtwayland,
+  runtimeShell,
+  sqlite,
+  systemd,
+  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+    "lib"
   ];
 
   patches = [
@@ -51,21 +53,33 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/sunweaver/lomiri-url-dispatcher/-/commit/ebdd31b9640ca243e90bc7b8aca7951085998bd8.patch";
       hash = "sha256-g4EohB3oDcWK4x62/3r/g6CFxqb7/rdK51+E/Fji1Do=";
     })
+
+    # Make lomiri-url-dispatcher-gui wrappable
+    # Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/28 merged & in release
+    (fetchpatch {
+      url = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/commit/6512937e2b388ad1350072b8ed3b4140439b2321.patch";
+      hash = "sha256-P1A3hi8l7fJWFjGeK5hWYl8BoZMzRfo44MUTeM7vG2A=";
+    })
   ];
 
-  postPatch = ''
-    substituteInPlace data/CMakeLists.txt \
-      --replace "\''${SYSTEMD_USER_UNIT_DIR}" "\''${CMAKE_INSTALL_LIBDIR}/systemd/user"
+  postPatch =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
 
-    substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
-      --replace "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
+      substituteInPlace gui/lomiri-url-dispatcher-gui.desktop.in.in \
+        --replace-fail '@CMAKE_INSTALL_FULL_DATADIR@/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg' 'lomiri-url-dispatcher-gui'
 
-    # Update URI handler database whenever new url-handler is installed system-wide
-    substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
-      --replace '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
-  '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
-    patchShebangs tests/test-sql.sh
-  '';
+      substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
+        --replace-fail "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
+
+      # Update URI handler database whenever new url-handler is installed system-wide
+      substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
+        --replace-fail '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
+    ''
+    + lib.optionalString finalAttrs.finalPackage.doCheck ''
+      patchShebangs tests/test-sql.sh
+    '';
 
   strictDeps = true;
 
@@ -75,11 +89,16 @@ stdenv.mkDerivation (finalAttrs: {
     intltool
     makeWrapper
     pkg-config
-    (python3.withPackages (ps: with ps; [
-      setuptools
-    ] ++ lib.optionals finalAttrs.finalPackage.doCheck [
-      python-dbusmock
-    ]))
+    (python3.withPackages (
+      ps:
+      with ps;
+      [
+        setuptools
+      ]
+      ++ lib.optionals finalAttrs.finalPackage.doCheck [
+        python-dbusmock
+      ]
+    ))
     wrapQtAppsHook
   ];
 
@@ -104,8 +123,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DLOCAL_INSTALL=ON"
-    "-Denable_mirclient=OFF"
+    (lib.cmakeBool "LOCAL_INSTALL" true)
+    (lib.cmakeBool "enable_mirclient" false)
   ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -116,34 +135,25 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   preFixup = ''
-    substituteInPlace $out/bin/lomiri-url-dispatcher-dump \
-      --replace '/bin/sh' '${runtimeShell}'
+    substituteInPlace $out/bin/lomiri-url-dispatcher-{dump,gui} \
+      --replace-fail '/bin/sh' '${runtimeShell}'
 
     wrapProgram $out/bin/lomiri-url-dispatcher-dump \
       --prefix PATH : ${lib.makeBinPath [ sqlite ]}
 
-    # Move from qmlscene call in desktop file to easier-to-wrap script
-    guiScript=$out/bin/lomiri-url-dispatcher-gui
-    guiExec=$(grep 'Exec=' $out/share/applications/lomiri-url-dispatcher-gui.desktop | cut -d'=' -f2-)
-
-    cat <$guiScript
-    #!${runtimeShell}
-    $guiExec
-    EOF
-    chmod +x $guiScript
-
     mkdir -p $out/share/icons/hicolor/scalable/apps
     ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/
 
-    substituteInPlace $out/share/applications/lomiri-url-dispatcher-gui.desktop \
-      --replace "Exec=$guiExec" "Exec=$(basename $guiScript)" \
-      --replace "Icon=$out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg" "Icon=lomiri-url-dispatcher-gui"
-
     # Calls qmlscene from PATH, needs Qt plugins & QML components
     qtWrapperArgs+=(
       --prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]}
     )
-    wrapQtApp $guiScript
+    wrapQtApp $out/bin/lomiri-url-dispatcher-gui
+  '';
+
+  postFixup = ''
+    moveToOutput share $out
+    moveToOutput libexec $out
   '';
 
   passthru = {
@@ -151,17 +161,20 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Lomiri operating environment service for requesting URLs to be opened";
     longDescription = ''
-       Allows applications to request a URL to be opened and handled by another
-       process without seeing the list of other applications on the system or
-       starting them inside its own Application Confinement.
+      Allows applications to request a URL to be opened and handled by another
+      process without seeing the list of other applications on the system or
+      starting them inside its own Application Confinement.
     '';
     homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher";
-    license = with licenses; [ lgpl3Only gpl3Only ];
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
+    license = with lib.licenses; [
+      lgpl3Only
+      gpl3Only
+    ];
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
     pkgConfigModules = [
       "lomiri-url-dispatcher"
     ];
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 3efd526cb6bd..059a2531fbbe 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -29,6 +29,7 @@ let
     lxqt-session = callPackage ./lxqt-session {};
     lxqt-sudo = callPackage ./lxqt-sudo {};
     lxqt-themes = callPackage ./lxqt-themes {};
+    lxqt-wayland-session = callPackage ./lxqt-wayland-session {};
     pavucontrol-qt = callPackage ./pavucontrol-qt {};
     qtermwidget = callPackage ./qtermwidget {};
 
@@ -114,6 +115,7 @@ let
       lxqt-session
       lxqt-sudo
       lxqt-themes
+      lxqt-wayland-session
       pavucontrol-qt
 
       ### CORE 2
diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index 62504bb33b54..5c4ac79a2d82 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdbusmenu-lxqt";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-fwYvU62NCmJ6HNrOqHPWKDas7LE1XF3squ0CBEFkNkk=";
+    hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 694c4452b45a..6bfd1bafb536 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -15,7 +15,7 @@
 , qttools
 , wrapQtAppsHook
 , gitUpdater
-, version ? "2.0.2"
+, version ? "2.1.0"
 , qtx11extras ? null
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     rev = version;
     hash = {
       "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
-      "2.0.2" = "sha256-Ntj+yixGGGgL8ylRv2IJsWtapxE71JNl9cC9K0JToNU=";
+      "2.1.0" = "sha256-yH3lyOpmDWjA3bV6msjw7fShs1HnAFOmkGer2Z9N/Tg=";
     }."${version}";
   };
 
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 430c33c03605..83ed1106ff40 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblxqt";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds=";
+    hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 5de096ee29e1..ebb4baa05ddd 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -7,7 +7,7 @@
 , lxqt-build-tools
 , wrapQtAppsHook
 , gitUpdater
-, version ? "4.0.1"
+, version ? "4.1.0"
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     rev = version;
     hash = {
       "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
-      "4.0.1" = "sha256-h8uHIB0KuSHQVHI61h5BmpvpJHumloHMKN3GabH66EM=";
+      "4.1.0" = "sha256-Efn08a8MkR459Ww0WiEb5GXKgQzJwKupIdL2TySpivE=";
     }."${version}";
   };
 
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
index daaad022edf5..09b8450740ad 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsysstat";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-2rdhw67TPvy/QmyzbtStgiIuIgZ7ZSt07xjCvOywKF4=";
+    hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 6d0248e3e594..4a6013f6eb1a 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lximage-qt";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-I0DyC8i+OnHxHcpp/xPsKjr3UgvUHlVO8h9Tjhg7Pg8=";
+    hash = "sha256-08HEPTbZw4CCq3A9KxMKeT/X1notXwsV1sSSgtRFPO0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 73b49561d886..eaf0d808df08 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-about";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Y0OF4W0quQEet/QvntwGwFqaqJDDUchWYRh+OWZDS8w=";
+    hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index e83b1788dc3a..b194f6e09f6a 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-admin";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Ps+XiCA6OmnsYj0D+pxpvRxfIZfRGFBbZ0t/IPZjlv8=";
+    hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 9cef42cdb629..0dabe275542c 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-archiver";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
     rev = version;
-    hash = "sha256-32Wq0Faphu0uSG0RdOqrDD/igrNaP6l1mtuV+HcsdcQ=";
+    hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 418738f5853b..7c1a96cfe784 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
 , perl
 , wrapQtAppsHook
 , gitUpdater
-, version ? "2.0.0"
+, version ? "2.1.0"
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     rev = version;
     hash = {
       "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-      "2.0.0" = "sha256-ZFvnIumP03Mp+4OHPe1yMVsSYhMmYUY1idJGCAy5IhA=";
+      "2.1.0" = "sha256-fZ5DbXnYm6oWDZdwiw2DpWFQMYd7VZ4oKkGIzQkaV94=";
     }."${version}";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 3eb1c3a1013f..a7a5d7df7191 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-config";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U=";
+    hash = "sha256-zAJD1p0iJUEN+pOW1nyVKrCBfew/uqVNqw9aCFq+JY4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index df6972bd80e1..8079df71267e 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-globalkeys";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-24alERAnzlU/ZwIlRy9B+58zjRnF9eXunWeEO/lDVxM=";
+    hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 84b4882f3643..da2e76105939 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-menu-data";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-CNY23xdFiDQKKJf9GccwDOuBWXwfc7WNI7vMv/zOM9U=";
+    hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 70cb087fcc15..a88f3317b3ea 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-notificationd";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-qmBHeXKBJD97Me2zNSn7bNr0UrObGmvj8Pn19GQGktI=";
+    hash = "sha256-Iu3U036ebh9lMxCn1gt29nCQxs7N2ZLQHfg9HP3FSm0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index e3e8d52977f1..2a42933d5c49 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-openssh-askpass";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-poTOXVvVUdM6m1mHBgQGS+mVHu6O4iBKQRs0JwpU8X0=";
+    hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 7d6da7e65f9f..100f1e537dfe 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-panel";
-  version = "2.0.1";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-m+LUG7hnkIJj48HJIy6pMyv3YZ/RfuSXbdBKJ9mi764=";
+    hash = "sha256-IlT7qXWMKFkmHNjXJYivawd4HnOBzILtIE6XaM/ZvkM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 9484a8e4b16d..3d7ca3ec68a7 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-policykit";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-oYKvQBilpD2RLhN1K6qgRNNAfohCOqmBrKcWy1fXZT8=";
+    hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index f9fae3718f6f..dd46c72fdd90 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-wtqVUXYQWIPhvHj7Ig9qR6sglCRQzcxG192DM3xq/mA=";
+    hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index a496274c73b3..687846ba2e25 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -12,7 +12,7 @@
 , qtsvg
 , qttools
 , wrapQtAppsHook
-, version ? "2.0.0"
+, version ? "2.1.0"
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     rev = version;
     hash = {
       "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
-      "2.0.0" = "sha256-o5iD4VzsbN81lwDZJuFj8Ugg1RP752M4unu3J5/h8g8=";
+      "2.1.0" = "sha256-F171IgAhRXJ9sTt8VVDVO9hrmyHbCElsskdDmFr3HB0=";
     }."${version}";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 0ea4ab9dce0f..fd2b586778a5 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-runner";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-r9rz6rJX60+1/+Wd5APobyZRioXzD1xveFIMToTvpXQ=";
+    hash = "sha256-NsAlaoWMvisRZ04KkrQzwi5B2eXnaHqg0HtYG4NKLcs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index cdfd234a14d7..2519954c9dca 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-session";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-IgpGtIVTcSs0O3jEniIuyIAyKBSkwN/jpGL6yZg3AVo=";
+    hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index f1fc740c7186..91fd56c211f7 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-sudo";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-kDcOHqHuAyHTQ7ccsCelPOBieXdRLloEvSMjq9PIa30=";
+    hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index f4283c1927ea..50b814724c51 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-themes";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-bAdwC1YrXCT4eJUafTK6kcfQ/YnMbBLHyyWvsBLIisA=";
+    hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
new file mode 100644
index 000000000000..21f4ef2548d9
--- /dev/null
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  kwindowsystem,
+  liblxqt,
+  libqtxdg,
+  lxqt-build-tools,
+  pkg-config,
+  qtsvg,
+  qttools,
+  xdg-user-dirs,
+  xkeyboard_config,
+  gitUpdater,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "lxqt-wayland-session";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "lxqt";
+    repo = "lxqt-wayland-session";
+    rev = version;
+    hash = "sha256-5WdfwJ89HWlXL6y9Lpgs7H3mbN/wbf+9VbP9ERPasBM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    lxqt-build-tools
+    pkg-config
+    qttools
+  ];
+
+  buildInputs = [
+    kwindowsystem
+    liblxqt
+    libqtxdg
+    qtsvg
+    xdg-user-dirs
+  ];
+
+  postPatch = ''
+    substituteInPlace startlxqtwayland.in \
+      --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules
+
+    substituteInPlace configurations/{labwc/autostart,lxqt-hyprland.conf,lxqt-wayfire.ini} \
+      --replace-fail /usr/share/lxqt/wallpapers $out/share/lxqt/wallpapers
+  '';
+
+  dontWrapQtApps = true;
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
+    homepage = "https://github.com/lxqt/lxqt-wayland-session";
+    description = "Files needed for the LXQt Wayland Session";
+    license = with lib.licenses; [
+      bsd3
+      cc-by-sa-40
+      gpl2Only
+      gpl3Only
+      lgpl21Only
+      mit
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.lxqt.members;
+  };
+}
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 3b7c5f55f548..254ab75ed921 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , libSM
 , libXdmcp
@@ -19,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obconf-qt";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "obconf-qt";
     rev = version;
-    hash = "sha256-uF90v56BthEts/Jy+a6kH2b1QFHCtft4ZLxyi/K/Vnc=";
+    hash = "sha256-C7s312DeLiustPBBY4OdjYvN7X6noktLA8LuhlOaVRo=";
   };
 
   nativeBuildInputs = [
@@ -46,22 +45,14 @@ stdenv.mkDerivation rec {
     qtwayland
   ];
 
-  patches = [
-    (fetchpatch {
-      name = "obconf-qt.port-to-qt6";
-      url = "https://patch-diff.githubusercontent.com/raw/lxqt/obconf-qt/pull/230.patch";
-      hash = "sha256-XLt8+/4oMXeli07qTAGc73U9RD1fGYqxTX0QdhuXpII=";
-    })
-  ];
-
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/obconf-qt";
     description = "Qt port of obconf, the Openbox configuration tool";
     mainProgram = "obconf-qt";
-    license = licenses.gpl2Plus;
-    platforms = with platforms; unix;
-    maintainers = teams.lxqt.members;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = lib.teams.lxqt.members;
   };
 }
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 208d741a9a61..0244300f3ed2 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol-qt";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-dhFVVqJIX40oiHCcnG1166RsllXtfaO7MqM6ZNizjQQ=";
+    hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 2b52e53755e5..e375c20791c7 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcmanfm-qt";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-PyCtcn+QHwX/iy85A3y7Phf8ogdSRrwtXrJYGxrjyLM=";
+    hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index a162c7f21d44..c3cb608538a5 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qps";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Jit1CdFZyhKOjNytTBH9T4NqqmhxoifXGgPUyVdzJ+4=";
+    hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index 0155fdf5322a..1ca75acdc36c 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-KGghNa1tvxDFd9kEElCx9BoLfwnbeX5UvoksyPBfEjc=";
+    hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 30fe20ebeefe..90b1a561bdf2 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -7,7 +7,7 @@
 , lxqt-build-tools
 , wrapQtAppsHook
 , gitUpdater
-, version ? "2.0.1"
+, version ? "2.1.0"
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     rev = version;
     hash = {
       "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
-      "2.0.1" = "sha256-dqKsYAtoJgtXYL/MI3/p3N5kzxC7JfyO4Jn6YMhaV78=";
+      "2.1.0" = "sha256-I8fVggCi9qN+Jpqb/EC5/DfwuhGF55trbPESZQWPZ5M=";
     }."${version}";
   };
 
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index 5243b6e6ef22..4e1b5b4144d8 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtxdg-tools";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-w9pFHG+q2oT33Lfg88MUzfWSyvHUgC0Fi2V8XcueJ/Q=";
+    hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index a7e65d746b60..fa132756edcf 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "screengrab";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-PMe2NyIoc12n4l/oWPi3GL6pemuHyxL2HFBLTIyD690=";
+    hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index f88f32fb11fc..4e63d967ffbc 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-lxqt";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-zXZ0Un56uz1hKoPvZitJgQpJ7ko0LrSSFxl+agiqZ4A=";
+    hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
index 57a7a6c8995a..586d6f21e160 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
+++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
@@ -1,9 +1,3 @@
-xdtEnvHook() {
-    addToSearchPath ACLOCAL_PATH $1/share/aclocal
-}
-
-envHooks+=(xdtEnvHook)
-
 xdtAutogenPhase() {
     mkdir -p m4
     NOCONFIGURE=1 xdt-autogen
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
index c76800fea4fc..db7614394cb6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
@@ -23,11 +23,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "xfce4-weather-plugin";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ZdQK/3hjVQhYqfnStgVPJ8aaPn5xKZF4WYf5pzu6h2s=";
+    sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
index e3a189adf220..6fa2eb007134 100644
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
 , stdenv, writeScript, lib }:
 let
-  version = "0.52.0";
+  version = "1.1.0";
   owner = "erlang-ls";
   repo = "erlang_ls";
   deps = import ./rebar-deps.nix {
@@ -16,6 +16,15 @@ let
           substituteInPlace rebar.config --replace ", warnings_as_errors" ""
           '';
       });
+      json_polyfill = super.json_polyfill.overrideAttrs (_: {
+        # When compiling with erlang >= 27, the json_polyfill rebar script will
+        # delete the json.beam file as it's not needed. However, we need to
+        # adjust this path as the nix build will put the beam file under `ebin`
+        # instead of `$REBAR_DEPS_DIR/json_polyfill/ebin`.
+        postPatch = ''
+          substituteInPlace rebar.config.script --replace "{erlc_compile, \"rm \\\"\$REBAR_DEPS_DIR/json_polyfill/ebin/json.beam\\\"\"}" "{erlc_compile, \"rm \\\"ebin/json.beam\\\"\"}"
+          '';
+      });
     });
   };
 in
@@ -24,7 +33,7 @@ rebar3Relx {
   inherit version;
   src = fetchFromGitHub {
     inherit owner repo;
-    hash = "sha256-tV7M8y0R+BN5ATxM03K0/gtHgITI9KxtvA7o0ft8RuE=";
+    hash = "sha256-MSDBU+blsAdeixaHMMXmeMJ+9Yrzn3HekE8KbIc/Guo=";
     rev = version;
   };
   releaseType = "escript";
diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
index 6a6ef5b3747c..76ac0b9581bd 100644
--- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
+++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
@@ -26,11 +26,11 @@ let
     };
     quickrand = builder {
       name = "quickrand";
-      version = "2.0.1";
+      version = "2.0.7";
       src = fetchHex {
         pkg = "quickrand";
-        version = "2.0.1";
-        sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY=";
+        version = "2.0.7";
+        sha256 = "sha256-uKy/iaIkvCF8MHDKi+vG6yNtvn+XZ5k7J0CE6gRNNfA=";
       };
       beamDeps = [ ];
     };
@@ -46,11 +46,11 @@ let
     };
     katana_code = builder {
       name = "katana_code";
-      version = "0.2.1";
+      version = "2.1.1";
       src = fetchHex {
         pkg = "katana_code";
-        version = "0.2.1";
-        sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI=";
+        version = "2.1.1";
+        sha256 = "sha256-BoDzNSW5qILm9NMCJRixXEb2SL17Db6GkAmA/hwpFAQ=";
       };
       beamDeps = [ ];
     };
@@ -115,13 +115,23 @@ let
       };
       beamDeps = [ katana_code ];
     };
+    json_polyfill = builder {
+      name = "json_polyfill";
+      version = "0.1.4";
+      src = fetchHex {
+        pkg = "json_polyfill";
+        version = "0.1.4";
+        sha256 = "sha256-SMOX7iVH+kWe3gGjDsDoVxer7TAQhnpj7qrF8gMnQwM=";
+      };
+      beamDeps = [ ];
+    };
     jsx = builder {
       name = "jsx";
-      version = "3.0.0";
+      version = "2.10.0";
       src = fetchHex {
         pkg = "jsx";
-        version = "3.0.0";
-        sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0=";
+        version = "2.10.0";
+        sha256 = "sha256-moPjcEgHKYAWlo21Bvn60PAn3jdUbrg4s64QZMOgrWI=";
       };
       beamDeps = [ ];
     };
@@ -138,11 +148,11 @@ let
     };
     erlfmt = builder {
       name = "erlfmt";
-      version = "1.3.0";
+      version = "1.5.0";
       src = fetchHex {
         pkg = "erlfmt";
-        version = "1.3.0";
-        sha256 = "sha256-KoSqHrovT8190x1cV+neK8JwXdoY2kVT8n33EUz6oFI=";
+        version = "1.5.0";
+        sha256 = "sha256-OTOkDPvnkK2U5bZQs2iB3nBFYxkmPBR5tVbpr9vYDHU=";
       };
       beamDeps = [ ];
     };
@@ -158,11 +168,11 @@ let
     };
     elvis_core = builder {
       name = "elvis_core";
-      version = "1.3.1";
+      version = "3.2.5";
       src = fetchHex {
         pkg = "elvis_core";
-        version = "1.3.1";
-        sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk=";
+        version = "3.2.5";
+        sha256 = "sha256-NNkhjwuAclEZA79sy/WesXZd7Pxz/MaDO6XIlZ2384M=";
       };
       beamDeps = [ katana_code zipper ];
     };
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
deleted file mode 100644
index 2dad47c08abc..000000000000
--- a/pkgs/development/compilers/ats2/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib, stdenv, fetchurl, gmp
-, withEmacsSupport ? true
-, withContrib ? true }:
-
-let
-  versionPkg = "0.4.2";
-
-  contrib = fetchurl {
-    url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz";
-    hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c=";
-  };
-
-  postInstallContrib = lib.optionalString withContrib
-  ''
-    local contribDir=$out/lib/ats2-postiats-*/ ;
-    mkdir -p $contribDir ;
-    tar -xzf "${contrib}" --strip-components 1 -C $contribDir ;
-  '';
-
-  postInstallEmacs = lib.optionalString withEmacsSupport
-  ''
-    local siteLispDir=$out/share/emacs/site-lisp/ats2 ;
-    mkdir -p $siteLispDir ;
-    install -m 0644 -v ./utils/emacs/*.el $siteLispDir ;
-  '';
-in
-
-stdenv.mkDerivation rec {
-  pname = "ats2";
-  version = versionPkg;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz";
-    hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM=";
-  };
-
-  postPatch = lib.optionalString stdenv.cc.isClang ''
-    sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
-  '';
-
-  buildInputs = [ gmp ];
-
-  # Disable parallel build, errors:
-  #  *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'.  Stop.
-  enableParallelBuilding = false;
-
-  makeFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "CCOMP=${stdenv.cc.targetPrefix}cc"
-  ];
-
-  setupHook =
-    let
-      hookFiles = [ ./setup-hook.sh ] ++ lib.optional withContrib ./setup-contrib-hook.sh;
-    in
-      builtins.toFile "setupHook.sh"
-      (lib.concatMapStringsSep "\n" builtins.readFile hookFiles);
-
-  postInstall = postInstallContrib + postInstallEmacs;
-
-  meta = with lib; {
-    description = "Functional programming language with dependent types";
-    homepage    = "http://www.ats-lang.org";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.unix;
-    maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ];
-  };
-}
diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix
index 6dd49281bb81..2b75299dd81e 100644
--- a/pkgs/development/compilers/ballerina/default.nix
+++ b/pkgs/development/compilers/ballerina/default.nix
@@ -1,6 +1,6 @@
 { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
 let
-  version = "2201.9.2";
+  version = "2201.10.1";
   codeName = "swan-lake";
 in stdenv.mkDerivation {
   pname = "ballerina";
@@ -8,7 +8,7 @@ in stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
-    hash = "sha256-J73fai5mPPNHk/wux4nhX3KsalxWER8nMqWovWgm6WA=";
+    hash = "sha256-gKxJnoNWYE3ozQ0JvMgHgrg/DCkvFnJqZAecgqvJGq8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix
deleted file mode 100644
index c68b5fe06547..000000000000
--- a/pkgs/development/compilers/ciao/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "ciao";
-  version = "1.23.0-m1";
-  src = fetchFromGitHub {
-    owner = "ciao-lang";
-    repo = "ciao";
-    rev = "v${version}";
-    sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0=";
-  };
-
-  configurePhase = ''
-    ./ciao-boot.sh configure --instype=global --prefix=$prefix
-  '';
-
-  buildPhase = ''
-    ./ciao-boot.sh build
-  '';
-
-  installPhase = ''
-    ./ciao-boot.sh install
-  '';
-
-  meta = with lib; {
-    homepage = "https://ciao-lang.org/";
-    description = "General purpose, multi-paradigm programming language in the Prolog family";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ suhr ];
-    platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin
-  };
-}
diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix
deleted file mode 100644
index c3f16b447e2f..000000000000
--- a/pkgs/development/compilers/circt/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ stdenv
-, lib
-, cmake
-, coreutils
-, python3
-, git
-, fetchFromGitHub
-, ninja
-, lit
-, z3
-, gitUpdater
-, callPackage
-}:
-
-let
-  pythonEnv = python3.withPackages (ps: [ ps.psutil ]);
-  circt-llvm = callPackage ./circt-llvm.nix { };
-in
-stdenv.mkDerivation rec {
-  pname = "circt";
-  version = "1.87.0";
-  src = fetchFromGitHub {
-    owner = "llvm";
-    repo = "circt";
-    rev = "firtool-${version}";
-    hash = "sha256-buWpoym57YxyHJySYaektAUmuSRXMS+YBwtjWpoV1Vg=";
-    fetchSubmodules = true;
-  };
-
-  requiredSystemFeatures = [ "big-parallel" ];
-
-  nativeBuildInputs = [ cmake ninja git pythonEnv z3 ];
-  buildInputs = [ circt-llvm ];
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DMLIR_DIR=${circt-llvm.dev}/lib/cmake/mlir"
-
-    # LLVM_EXTERNAL_LIT is executed by python3, the wrapped bash script will not work
-    "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped"
-    "-DCIRCT_LLHD_SIM_ENABLED=OFF"
-  ];
-
-  # There are some tests depending on `clang-tools` to work. They are activated only when detected
-  # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these
-  # tests work. Because
-  #
-  # 1. The absolute paths of binaries used in tests are resolved in configure phase.
-  # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`,
-  #    which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in
-  #    `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths.
-  #    https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue.
-  #
-  # As a temporary fix, we disabled these tests when using clang stdenv
-  # cannot use lib.optionalString as it creates an empty string, disabling all tests
-  LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null;
-
-  preConfigure = ''
-    find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \;
-    # circt uses git to check its version, but when cloned on nix it can't access git.
-    # So this hard codes the version.
-    substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}"
-  '';
-
-  doCheck = true;
-  checkTarget = "check-circt check-circt-integration";
-
-  outputs = [ "out" "lib" "dev" ];
-
-  # Copy circt-llvm's postFixup stage so that it can make all our dylib references
-  # absolute as well.
-  #
-  # We don't need `postPatch` because circt seems to be automatically inheriting
-  # the config somehow, presumably via. `-DMLIR_DIR`.
-  postFixup = circt-llvm.postFixup;
-
-  postInstall = ''
-    moveToOutput lib "$lib"
-  '';
-
-  passthru = {
-    updateScript = gitUpdater {
-      rev-prefix = "firtool-";
-    };
-    llvm = circt-llvm;
-  };
-
-  meta = {
-    description = "Circuit IR compilers and tools";
-    homepage = "https://circt.org/";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ sharzy pineapplehunter sequencer ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix
deleted file mode 100644
index 4e6e7ad43416..000000000000
--- a/pkgs/development/compilers/computecpp/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib, stdenv
-, fetchzip
-, pkg-config
-, autoPatchelfHook
-, installShellFiles
-, ocl-icd
-, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "computecpp";
-  version = "2.11.0";
-
-  src = fetchzip {
-    url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
-    hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY=";
-    stripRoot = true;
-  };
-
-  dontStrip = true;
-
-  buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ];
-  nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ];
-
-  installPhase = ''
-    runHook preInstall
-
-    find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \;
-    find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \;
-    find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \;
-    find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \;
-    find ./include -type f -exec install -D -m 0644 {} -t $out/include \;
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    isClang = true;
-  };
-
-  meta = with lib; {
-    description =
-      "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards";
-    homepage = "https://www.codeplay.com/products/computesuite/computecpp";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ davidtwco ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix
index 7f2054e3e0c1..b2fc4fdc01ee 100644
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@@ -1,24 +1,24 @@
-let version = "3.5.3"; in
+let version = "3.5.4"; in
 { fetchurl }: {
   versionUsed = version;
   "${version}-x86_64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    sha256 = "1z6hl6pqsg2l7pfchzr5dk90b2dchidhwnnnc4q5dzz0xjikqrvx";
+    sha256 = "0x4kjkgva143g0d07rcz9zd9dfmsr9zfhrx4kj9z0ap9s3rv6vdh";
   };
   "${version}-aarch64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    sha256 = "12rzl1nm1y0q5ff9p8gslki4cz37y3bdn8p2s3x2nc81bdda4gn7";
+    sha256 = "00iw0nsxhq4aas717b0vhcz3hlwrpyixbgkf9sksqk2x1w798if0";
   };
   "${version}-aarch64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    sha256 = "1rp54g8di8j715n955wdr6i0pcrx2dn73qmvmrisyahi0qjrk0py";
+    sha256 = "1v437zpksk0jhib6vhpcbvv715mv32zmwby8b3p9qd3k67fn87d9";
   };
   "${version}-x86_64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    sha256 = "001mpb3fniamlmnqmhxdpbvp8crdvnf6sam13vvfmnr6na1fpxil";
+    sha256 = "0rv9rp8g5blhncqwciymhxh3z2832yp54lphxgsvkmm9y8s5w34d";
   };
   "${version}-i686-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-    sha256 = "0z9qjx2b2rmiqyqww0a5slj0pi1k8sn4fjihkn53im65rhhqra2y";
+    sha256 = "02kv119swcp7y4n3yb2i5a4dagjpf0zq3b3an1apahj5zn6ak41g";
   };
 }
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
deleted file mode 100644
index ed35bec87c06..000000000000
--- a/pkgs/development/compilers/dtc/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ stdenv
-, lib
-, fetchzip
-, meson
-, ninja
-, flex
-, bison
-, pkg-config
-, which
-, pythonSupport ? false
-, python ? null
-, swig
-, libyaml
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtc";
-  version = "1.7.1";
-
-  src = fetchzip {
-    url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-Zl2bOGDJIe/bhMFNsy969JYCYqtXTOzgb+bbOlKqOco=";
-  };
-
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    flex
-    bison
-    pkg-config
-    which
-  ] ++ lib.optionals pythonSupport [
-    python
-    python.pkgs.setuptools-scm
-    swig
-  ];
-
-  buildInputs = [ libyaml ];
-
-  postPatch = ''
-    patchShebangs setup.py
-  '';
-
-  # Required for installation of Python library and is innocuous otherwise.
-  env.DESTDIR = "/";
-
-  mesonAutoFeatures = "auto";
-  mesonFlags = [
-    (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
-    (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
-  ];
-
-  doCheck =
-    # Checks are broken on aarch64 darwin
-    # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436
-    !stdenv.hostPlatform.isDarwin &&
-    # Checks are broken when building statically on x86_64 linux with musl
-    # One of the test tries to build a shared library and this causes the linker:
-    # x86_64-unknown-linux-musl-ld: /nix/store/h9gcvnp90mpniyx2v0d0p3s06hkx1v2p-x86_64-unknown-linux-musl-gcc-13.3.0/lib/gcc/x86_64-unknown-linux-musl/13.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
-    # x86_64-unknown-linux-musl-ld: failed to set dynamic section sizes: bad value
-    !stdenv.hostPlatform.isStatic &&
-
-    # we must explicitly disable this here so that mesonFlags receives
-    # `-Dtests=disabled`; without it meson will attempt to run
-    # hostPlatform binaries during the configurePhase.
-    (with stdenv; buildPlatform.canExecute hostPlatform);
-
-  meta = with lib; {
-    description = "Device Tree Compiler";
-    homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
-    license = licenses.gpl2Plus; # dtc itself is GPLv2, libfdt is dual GPL/BSD
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.unix;
-    mainProgram = "dtc";
-  };
-})
diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix
index 1ab549727663..60c72eb623fa 100644
--- a/pkgs/development/compilers/elm/packages/lamdera/default.nix
+++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix
@@ -8,16 +8,16 @@ let
   arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
   hashes =
     {
-      "x86_64-linux" = "8534ff055073490719ed05be847bebef46250ebb7af1d72bdaa4fc115c6dcea3";
-      "aarch64-linux" = "01397ce50cb0ad1dac18e4e0f7ab490bbf41a1c23d06a1946eec689e7811085b";
-      "x86_64-darwin" = "46305fb0de9fd7685fdf7cf175ad965d5320f76d4b5f2de2f9dc8403c8127d52";
-      "aarch64-darwin" = "b1e3d7bd624cdff0522bd71dc5825fa98b4eed1eae064df55a86a40b554ce0d1";
+      "x86_64-linux" = "15a69bfa98155651749e31c68d05a04fcf48bdccb86bce77b7c8872f545cecfa";
+      "aarch64-linux" = "68a16bbbd2ed0ee19c36112a4c2d0abca66cf17465747e55adf2596b0921f8d7";
+      "x86_64-darwin" = "af2c63a60a689091a01bfd212e0ce141a6d7ba61d34a585d8f83159d0ed39c6f";
+      "aarch64-darwin" = "06f9f7fdcbb392a0a8a5034baf915d2b95b2876255aa8df8397ddafd1e540b7a";
     };
 in
 
 stdenv.mkDerivation rec {
   pname = "lamdera";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}";
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 2d94880976d7..7779bbbc670b 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   llvmEnv = symlinkJoin {
     name = "emscripten-llvm-${version}";
-    paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ];
+    paths = with llvmPackages; [ clang-unwrapped (lib.getLib clang-unwrapped)  lld llvm ];
   };
 
   nodeModules = buildNpmPackage {
diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix
deleted file mode 100644
index fa414937b12b..000000000000
--- a/pkgs/development/compilers/erg/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, makeWrapper
-, python3
-, which
-, stdenv
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "erg";
-  version = "0.6.45";
-
-  src = fetchFromGitHub {
-    owner = "erg-lang";
-    repo = "erg";
-    rev = "v${version}";
-    hash = "sha256-P6AIe3IadY64ydGShlRmgZ1pITiAA8G59Oe8P2ktDqM=";
-  };
-
-  cargoHash = "sha256-5h/0MqaRmjFkeg50Y7WpEDl+VWpR0d4NnqIzoZHeKZ8=";
-
-  nativeBuildInputs = [
-    makeWrapper
-    python3
-    which
-  ];
-
-  buildFeatures = [ "full" ];
-
-  env = {
-    BUILD_DATE = "1970/01/01 00:00:00";
-    CASE_SENSITIVE = lib.boolToString (!stdenv.hostPlatform.isDarwin);
-    GIT_HASH_SHORT = src.rev;
-  };
-
-  # TODO(figsoda): fix tests
-  doCheck = false;
-
-  # the build script is impure and also assumes we are in a git repository
-  postPatch = ''
-    rm crates/erg_common/build.rs
-  '';
-
-  preBuild = ''
-    export HOME=$(mktemp -d)
-    export CARGO_ERG_PATH=$HOME/.erg
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share
-    mv "$CARGO_ERG_PATH" $out/share/erg
-
-    wrapProgram $out/bin/erg \
-      --set-default ERG_PATH $out/share/erg
-  '';
-
-  meta = with lib; {
-    description = "Statically typed language that can deeply improve the Python ecosystem";
-    mainProgram = "erg";
-    homepage = "https://github.com/erg-lang/erg";
-    changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}";
-    license = with licenses; [ asl20 mit ];
-    maintainers = with maintainers; [ figsoda ];
-  };
-}
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index ba2eeada5e46..4cd1dd9ab2f0 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   LCL_PLATFORM = if withQt then "qt5" else "gtk2";
 
   NIX_LDFLAGS = lib.concatStringsSep " " ([
-    "-L${stdenv.cc.cc.lib}/lib"
+    "-L${lib.getLib stdenv.cc.cc}/lib"
     "-lX11"
     "-lXext"
     "-lXi"
diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 0e89cbd615ce..874a43a75f82 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -7,13 +7,6 @@
 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.versionOlder version "10";
 in
 
 originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
@@ -27,20 +20,11 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
 
     if test "$staticCompiler" = "1"; then
         EXTRA_LDFLAGS="-static"
-    ${
-      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
+    elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then
+        EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
+    else
+        EXTRA_LDFLAGS=""
+    fi
 
     # GCC interprets empty paths as ".", which we don't want.
     if test -z "''${CPATH-}"; then unset CPATH; fi
@@ -74,24 +58,14 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
                 extraLDFlags=("-L/usr/lib64" "-L/usr/lib")
                 libc_libdir="/usr/lib"
             fi
-            ${
-              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 -a prefixExtraLDFlags=()
+            prefixExtraLDFlags=("-L$libc_libdir")
+            nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post}
+            if test "''${!nixDontSetRpathVar-}" != "1"; then
+                prefixExtraLDFlags+=("-rpath" "$libc_libdir")
+            fi
+            extraLDFlags=("''${prefixExtraLDFlags[@]}" "''${extraLDFlags[@]}")
+            for i in "''${extraLDFlags[@]}"; do
                 declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i"
             done
         done
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 104851930213..25d4f1f53bae 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -5,7 +5,7 @@
 , threadsCross
 , version
 
-, binutils, gmp, mpfr, libmpc, isl
+, apple-sdk, binutils, gmp, mpfr, libmpc, isl
 
 , enableLTO
 , enableMultilib
@@ -112,7 +112,11 @@ let
     ]
     ++ lib.optionals (!withoutTargetLibc) [
       (if libcCross == null
-       then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"
+       then (
+        # GCC will search for the headers relative to SDKROOT on Darwin, so it will find them in the store.
+        if targetPlatform.isDarwin then "--with-native-system-header-dir=/usr/include"
+        else "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"
+       )
        else "--with-native-system-header-dir=${lib.getDev libcCross}${libcCross.incdir or "/include"}")
       # gcc builds for cross-compilers (build != host) or cross-built
       # gcc (host != target) always apply the offset prefix to disentangle
@@ -132,7 +136,8 @@ let
       #
       # We pick "/" path to effectively avoid sysroot offset and make it work
       # as a native case.
-      "--with-build-sysroot=/"
+      # Darwin requires using the SDK as the sysroot for `SDKROOT` to work correctly.
+      "--with-build-sysroot=${if targetPlatform.isDarwin then apple-sdk.sdkroot else "/"}"
       # Same with the stdlibc++ headers embedded in the gcc output
       "--with-gxx-include-dir=${placeholder "out"}/include/c++/${version}/"
     ]
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index f7e2e06bb79a..d5d59adabb74 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -34,6 +34,7 @@
 , nukeReferences
 , callPackage
 , majorMinorVersion
+, apple-sdk
 , cctools
 , darwin
 }:
@@ -105,6 +106,7 @@ let
       ;
       # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc${majorVersion}.cc.override)" | jq '.[]' --raw-output'
       inherit
+        apple-sdk
         binutils
         buildPackages
         cargo
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
index 2f031e6fbf4a..03e4facd0198 100644
--- a/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -298,6 +298,20 @@ stdenv.mkDerivation (rec {
       url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch";
       hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s=";
     })
+
+    # Backport part of  to 8.10.7
+    # The change we are interested in is that Cabal no longer sets include-dirs
+    # for the GHCi library delegating to the system search path or (in our case)
+    # cc-wrapper. Without this patch, the target libffi ends up in there (which
+    # we provide via --with-ffi-includes) which breaks bootstrapping e.g. when
+    # cross compiling GHC. Without include-dirs, cc-wrapper and splicing will
+    # correctly pick the suitable libffi out of the build environment.
+    (fetchpatch {
+      name = "ghci-no-libffi-include.patch";
+      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/b2721819f391ab49871271283f32df54810c4387.patch";
+      sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9";
+      includes = [ "libraries/ghci/ghci.cabal.in" ];
+    })
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release
     (fetchpatch {
diff --git a/pkgs/development/compilers/ghc/9.8.3.nix b/pkgs/development/compilers/ghc/9.8.3.nix
new file mode 100644
index 000000000000..ce77308f9212
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.8.3.nix
@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.8.3";
+  sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70";
+}
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 43a8310836ad..b062a2d514d4 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -10,6 +10,7 @@
 
 { lib
 , stdenv
+, stdenvNoCC
 , pkgsBuildTarget
 , pkgsHostTarget
 , buildPackages
@@ -218,6 +219,8 @@
         ++ lib.optionals (lib.elem version [ "9.8.1" "9.8.2" ]) [
           ../../tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch
         ];
+
+      stdenv = stdenvNoCC;
     }
 
   # GHC's build system hadrian built from the GHC-to-build's source tree
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 73808dc431a9..8830b8d179b2 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,11 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.11.20240410";
-  rev = "1b1a92bd25c3f7249cf922c5dbf4415d2de44a36";
-  sha256 = "sha256-2HdhxhVrKn8c/ZOGYoYThqXpod2OPiGXgH+mAV69Ip0=";
-  # The STM benchmark contains chanbench.hs and ChanBench.hs causing a hash
-  # mismatch on case insensitive filesystems. See also
-  # https://gitlab.haskell.org/ghc/packages/stm/-/issues/2
-  postFetch = ''
-    rm -rf "$out/libraries/stm/bench"
-  '';
+  version = "9.11.20240423";
+  rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6";
+  sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9";
 }
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index 650e46ff51b1..a8454ba56f3b 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -5,6 +5,7 @@
 , git
 , pkg-config
 , openssl
+, erlang
 , Security
 , nix-update-script
 , SystemConfiguration
@@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ git pkg-config ];
 
-  buildInputs = [ openssl ] ++
+  buildInputs = [ openssl erlang ] ++
     lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ];
 
   cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo=";
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
deleted file mode 100644
index 5c39c5d5c1f0..000000000000
--- a/pkgs/development/compilers/glslang/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, bison
-, cmake
-, jq
-, python3
-, spirv-headers
-, spirv-tools
-}:
-stdenv.mkDerivation rec {
-  pname = "glslang";
-  version = "14.3.0";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "glslang";
-    rev = version;
-    hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA=";
-  };
-
-  outputs = [ "bin" "out" "dev" ];
-
-  # These get set at all-packages, keep onto them for child drvs
-  passthru = {
-    spirv-tools = spirv-tools;
-    spirv-headers = spirv-headers;
-  };
-
-  nativeBuildInputs = [ cmake python3 bison jq ];
-
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
-
-  postPatch = ''
-    cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
-    ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
-  '';
-
-  # This is a dirty fix for lib/cmake/SPIRVTargets.cmake:51 which includes this directory
-  postInstall = ''
-    mkdir -p $dev/include/External
-    moveToOutput lib/pkgconfig "''${!outputDev}"
-    moveToOutput lib/cmake "''${!outputDev}"
-  '';
-
-  # Fix the paths in .pc, even though it's unclear if these .pc are really useful.
-  postFixup = ''
-    substituteInPlace $dev/lib/pkgconfig/*.pc \
-      --replace-fail '=''${prefix}//' '=/' \
-      --replace-fail "includedir=$dev/$dev" "includedir=$dev"
-
-    # add a symlink for backwards compatibility
-    ln -s $bin/bin/glslang $bin/bin/glslangValidator
-  '';
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Khronos reference front-end for GLSL and ESSL";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.ralith ];
-  };
-}
diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix
index a87d57b9c748..4bb68cb2d3e8 100644
--- a/pkgs/development/compilers/go/1.22.nix
+++ b/pkgs/development/compilers/go/1.22.nix
@@ -4,8 +4,7 @@
 , tzdata
 , substituteAll
 , iana-etc
-, Security
-, Foundation
+, apple-sdk_11
 , xcbuild
 , mailcap
 , buildPackages
@@ -47,11 +46,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.22.8";
+  version = "1.22.9";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-3xLCPr8Z3qD0v0aiLL7aSj7Kb0dPMYOQzndJdCeEQLg=";
+    hash = "sha256-6Bo2L1Gu4hJXIrAY5GcU5qBVoZVCg0FMD5N+c3AT2yI=";
   };
 
   strictDeps = true;
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
     ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
-  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
+  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ];
 
   depsBuildTarget = lib.optional isCross targetCC;
 
diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 80bba9cb5332..229d19ff06e7 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -4,8 +4,7 @@
 , tzdata
 , substituteAll
 , iana-etc
-, Security
-, Foundation
+, apple-sdk_11
 , xcbuild
 , mailcap
 , buildPackages
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
     ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
-  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
+  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ];
 
   depsBuildTarget = lib.optional isCross targetCC;
 
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
index f5b18d196ff5..6db4e4312f29 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
@@ -112,7 +112,7 @@ let
     buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib # libasound.so wanted by lib/libjsound.so
       fontconfig
-      stdenv.cc.cc.lib # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc) # libstdc++.so.6
       xorg.libX11
       xorg.libXext
       xorg.libXi
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
index 2c8220d89a0a..39b4136698c7 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation ({
     ++ extraNativeBuildInputs;
 
   buildInputs = [
-    stdenv.cc.cc.lib # libstdc++.so.6
+    (lib.getLib stdenv.cc.cc) # libstdc++.so.6
     zlib
     libxcrypt-legacy # libcrypt.so.1 (default is .2 now)
   ]
diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix
deleted file mode 100644
index 52c278a1bd30..000000000000
--- a/pkgs/development/compilers/inklecate/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, stdenv
-, buildDotnetModule
-, dotnetCorePackages
-, fetchFromGitHub
-}:
-
-buildDotnetModule rec {
-  pname = "inklecate";
-  version = "1.1.1";
-
-  src = fetchFromGitHub {
-    owner = "inkle";
-    repo = "ink";
-    rev = "v${version}";
-    hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
-  };
-
-  buildInputs = [ stdenv.cc.cc.lib ];
-
-  projectFile = "inklecate/inklecate.csproj";
-  nugetDeps = ./deps.nix;
-  executables = [ "inklecate" ];
-
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
-
-  meta = with lib; {
-    description = "Compiler for ink, inkle's scripting language";
-    mainProgram = "inklecate";
-    longDescription = ''
-      Inklecate is a command-line compiler for ink, inkle's open source
-      scripting language for writing interactive narrative
-    '';
-    homepage = "https://www.inklestudios.com/ink/";
-    downloadPage = "https://github.com/inkle/ink/";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    badPlatforms = platforms.aarch64;
-    maintainers = with maintainers; [ shreerammodi ];
-  };
-}
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 2aa173fdde24..c98712f5d964 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub
-, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
+, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb
   # the default test target is sse4, but that is not supported by all Hydra agents
 , testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
 }:
 
 stdenv.mkDerivation rec {
   pname   = "ispc";
-  version = "1.24.0";
+  version = "1.25.3";
 
   dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
 
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
     owner  = pname;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q=";
+    sha256 = "sha256-baTJNfhOSYfJJnrutkW06AIMXpVP3eBpEes0GSI1yGY=";
   };
 
-  nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ];
+  nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
 
   buildInputs = with llvmPackages; [
     libllvm libclang openmp ncurses
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       echo "================================"
       echo
       (cd ../
-       PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log
+       PATH=${llvmPackages.clang}/bin:$PATH python scripts/run_tests.py -t $target --non-interactive --verbose --file=test_output.log
        fgrep -q "No new fails"  test_output.log || exit 1)
     done
   '';
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
     "-DISPC_INCLUDE_UTILS=OFF"
     ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE"))
     ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE"))
-  ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [
-    "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix
deleted file mode 100644
index c9e9b34e6ee0..000000000000
--- a/pkgs/development/compilers/javacard-devkit/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook
-, pcsclite
-}:
-
-stdenv.mkDerivation rec {
-  pname = "javacard-devkit";
-  version = "2.2.2";
-  uscoreVersion = builtins.replaceStrings ["."] ["_"] version;
-
-  src = requireFile {
-    name = "java_card_kit-${uscoreVersion}-linux.zip";
-    url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/"
-        + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR";
-    sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2";
-  };
-
-  nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ];
-  buildInputs = [ pcsclite ];
-
-  zipPrefix = "java_card_kit-${uscoreVersion}";
-
-  sourceRoot = ".";
-  unpackCmd = ''
-    unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x
-  '';
-
-  installPhase = ''
-    mkdir -p "$out/share/$pname"
-    cp -rt "$out/share/$pname" api_export_files
-    cp -rt "$out" lib
-
-    for i in bin/*; do
-      case "$i" in
-        *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";;
-        *) target="$out/bin/$(basename "$i")"
-           install -vD "$i" "$target"
-           sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target"
-           wrapProgram "$target" \
-             --set JAVA_HOME "$JAVA_HOME" \
-             --prefix CLASSPATH : "$out/share/$pname/api_export_files"
-           ;;
-      esac
-    done
-
-    makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \
-      --prefix CLASSPATH : "$out/lib/api.jar"
-  '';
-
-  meta = {
-    description = "Official development kit by Oracle for programming for the Java Card platform";
-    longDescription = ''
-      This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform.
-
-      Instructions for usage:
-
-      First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug):
-          javacardc -source 1.5 -target 1.5 [MyJavaFile].java
-      Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb):
-          CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu
-      Finally, convert the '.class' file into a '.cap':
-          converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version]
-      For more details, please refer to the documentation by Oracle
-    '';
-    homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.ekleog ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 4e2754def4de..352cf8313d67 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -199,7 +199,7 @@ let
             ({ substituteAll, libclang }: substituteAll
               {
                 src = ./lldb/resource-dir.patch;
-                clangLibDir = "${libclang.lib}/lib";
+                clangLibDir = "${lib.getLib libclang}/lib";
               })
             { };
         in
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 5c9662c24d58..45b8090d8214 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -72,9 +72,7 @@ let
       # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7
       "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen"
       "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen"
-    ]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
-      "-DCLANG_DEFAULT_CXX_STDLIB=ON"
-    ] ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm"
+    ]) ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm"
       ++ devExtraCmakeFlags;
 
     postPatch = ''
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index cce348b3ef50..241fad158c3c 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -7,10 +7,11 @@
 , src ? null
 , monorepoSrc ? null
 , runCommand
+, apple-sdk
+, apple-sdk_10_13
 , cmake
 , ninja
 , python3
-, xcbuild
 , libllvm
 , libcxx
 , linuxHeaders
@@ -40,12 +41,20 @@ let
   # 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;
-  noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic;
+  inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows;
+  noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows;
 
   baseName = "compiler-rt";
   pname = baseName + lib.optionalString (haveLibc) "-libc";
 
+  # Sanitizers require 10.13 or newer. Instead of disabling them for most x86_64-darwin users,
+  # build them with a newer SDK and the default (10.12) deployment target.
+  apple-sdk' =
+    if lib.versionOlder (lib.getVersion apple-sdk) "10.13" then
+      apple-sdk_10_13.override { enableBootstrap = true; }
+    else
+      apple-sdk.override { enableBootstrap = true; };
+
   src' = if monorepoSrc != null then
     runCommand "${baseName}-src-${version}" {} (''
       mkdir -p "$out"
@@ -69,22 +78,29 @@ stdenv.mkDerivation ({
 
   nativeBuildInputs = [ cmake ]
     ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
-    ++ [ python3 libllvm.dev ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun;
+    ++ [ python3 libllvm.dev ];
   buildInputs =
     lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders
-    ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include;
+    ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include
+    # Adding the bootstrap SDK to `buildInputs` on static builds  propagates it, breaking `xcrun`.
+    # This can be removed once the minimum SDK >10.12 on x86_64-darwin.
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic) [ apple-sdk' ];
 
-  env.NIX_CFLAGS_COMPILE = toString ([
-    "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
-  ] ++ lib.optionals (!haveLibc) [
-    # The compiler got stricter about this, and there is a usellvm patch below
-    # which patches out the assert include causing an implicit definition of
-    # assert. It would be nicer to understand why compiler-rt thinks it should
-    # be able to #include  in the first place; perhaps it's in the
-    # wrong, or perhaps there is a way to provide an assert.h.
-    "-Wno-error=implicit-function-declaration"
-  ]);
+  env = {
+    NIX_CFLAGS_COMPILE = toString ([
+      "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
+    ] ++ lib.optionals (!haveLibc) [
+      # The compiler got stricter about this, and there is a usellvm patch below
+      # which patches out the assert include causing an implicit definition of
+      # assert. It would be nicer to understand why compiler-rt thinks it should
+      # be able to #include  in the first place; perhaps it's in the
+      # wrong, or perhaps there is a way to provide an assert.h.
+      "-Wno-error=implicit-function-declaration"
+    ]);
+  } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
+    # Work around clang’s trying to invoke unprefixed-ld on Darwin when `-target` is passed.
+    NIX_CFLAGS_LINK = "--ld-path=${stdenv.cc.bintools}/bin/${stdenv.cc.targetPrefix}ld";
+  };
 
   cmakeFlags = [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
@@ -127,33 +143,30 @@ stdenv.mkDerivation ({
     "-DCOMPILER_RT_OS_DIR=baremetal"
   ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) (lib.optionals (lib.versionAtLeast release_version "16") [
     "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo"
+  ] ++ lib.optionals (!haveLibcxx) [
+    # Darwin fails to detect that the compiler supports the `-g` flag when there is no libc++ during the
+    # compiler-rt bootstrap, which prevents compiler-rt from building. The `-g` flag is required by the
+    # Darwin support, so force it to be enabled during the first stage of the compiler-rt bootstrap.
+    "-DCOMPILER_RT_HAS_G_FLAG=ON"
   ] ++ [
-    "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
+    "-DDARWIN_macosx_CACHED_SYSROOT=${apple-sdk'.sdkroot}"
+    "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=${lib.versions.majorMinor (lib.getVersion apple-sdk)}"
     "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
     "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
+    "-DSANITIZER_MIN_OSX_VERSION=${stdenv.hostPlatform.darwinMinVersion}"
   ] ++ lib.optionals (lib.versionAtLeast release_version "15") [
     # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin:
     # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153
     "-DCOMPILER_RT_ENABLE_IOS=OFF"
-  ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [
-    "-DSANITIZER_MIN_OSX_VERSION=10.10"
-  ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [
+  ]) ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [
     "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF"
   ] ++ devExtraCmakeFlags;
 
   outputs = [ "out" "dev" ];
 
-  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
-  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
-  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
-  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
-  # a flag and turn the flag off during the stdenv build.
   postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace cmake/config-ix.cmake \
-      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
   '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") ''
     substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \
       --replace "" ""
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 2f47f1a583c5..1826215ba3ef 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -355,7 +355,7 @@ let
       mkExtraBuildCommands0 = cc: ''
         rsrc="$out/resource-root"
         mkdir "$rsrc"
-        ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc"
+        ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc"
         echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
       '';
       mkExtraBuildCommandsBasicRt =
@@ -540,6 +540,29 @@ let
               libllvmLibdir = "${tools.libllvm.lib}/lib";
             })
           ]
+          # Backport version logic from Clang 16. This is needed by the following patch.
+          ++ lib.optional (lib.versions.major metadata.release_version == "15") (fetchpatch {
+            name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch";
+            url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1";
+            includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
+            stripLen = 1;
+            hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs=";
+          })
+          # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17.
+          # This is needed by newer SDKs (14+).
+          ++
+            lib.optional
+              (
+                lib.versionAtLeast (lib.versions.major metadata.release_version) "15"
+                && lib.versionOlder (lib.versions.major metadata.release_version) "17"
+              )
+              (fetchpatch {
+                name = "clang-darwin-An-OS-version-preprocessor-define.patch";
+                url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1";
+                includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
+                stripLen = 1;
+                hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";
+              })
           ++ lib.optional (lib.versions.major metadata.release_version == "18") (fetchpatch {
             name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch";
             url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch";
@@ -626,7 +649,7 @@ let
                 { substituteAll, libclang }:
                 (substituteAll {
                   src = metadata.getVersionFile "lldb/resource-dir.patch";
-                  clangLibDir = "${libclang.lib}/lib";
+                  clangLibDir = "${lib.getLib libclang}/lib";
                 }).overrideAttrs
                   (_: _: { name = "resource-dir.patch"; })
               ) { };
@@ -764,16 +787,20 @@ let
           bintools = bintools';
           extraPackages =
             [ targetLlvmLibraries.compiler-rt-no-libc ]
-            ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
-              targetLlvmLibraries.libunwind
-            ];
+            ++ lib.optionals
+              (
+                !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
+              )
+              [
+                targetLlvmLibraries.libunwind
+              ];
           extraBuildCommands =
             lib.optionalString (lib.versions.major metadata.release_version == "13") (
               ''
                 echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
                 echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
               ''
-              + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+              + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isDarwin) ''
                 echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
                 echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
               ''
@@ -794,7 +821,7 @@ let
               "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
             ]
             ++ lib.optional (
-              !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
+              !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
             ) "--unwindlib=libunwind"
             ++ lib.optional (
               !stdenv.targetPlatform.isWasm
@@ -803,7 +830,7 @@ let
             ) "-lunwind"
             ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
           nixSupport.cc-ldflags = lib.optionals (
-            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
+            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
           ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
         }
       );
@@ -991,14 +1018,11 @@ let
         let
           # temp rename to avoid infinite recursion
           stdenv =
-            if args.stdenv.hostPlatform.useLLVM or false then
+            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+            if args.stdenv.hostPlatform.isDarwin then
+              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
+            else if args.stdenv.hostPlatform.useLLVM or false then
               overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-            else if
-              lib.versionAtLeast metadata.release_version "16"
-              && args.stdenv.hostPlatform.isDarwin
-              && args.stdenv.hostPlatform.isStatic
-            then
-              overrideCC args.stdenv buildLlvmTools.clangNoCompilerRtWithLibc
             else
               args.stdenv;
         in
@@ -1017,10 +1041,10 @@ let
         patches = compiler-rtPatches;
         doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
         stdenv =
-          if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then
-            stdenv
+          # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt
           else
-            # TODO: make this branch unconditional next rebuild
             overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
       };
 
@@ -1102,7 +1126,11 @@ let
                 )
                 # https://github.com/llvm/llvm-project/issues/64226
                 (metadata.getVersionFile "libcxx/0001-darwin-10.12-mbstate_t-fix.patch");
-          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
+          stdenv =
+            if stdenv.hostPlatform.isDarwin then
+              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
+            else
+              overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
         }
         // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {
           # TODO: remove this, causes LLVM 13 packages rebuild.
diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix
index 17c687f88394..d4b727bd50d2 100644
--- a/pkgs/development/compilers/llvm/common/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix
@@ -61,7 +61,8 @@ let
   ]) ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [
+    # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -91,6 +92,9 @@ let
     "-DLIBCXX_ENABLE_THREADS=OFF"
     "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
     "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
+  ] ++ lib.optionals stdenv.hostPlatform.isWindows [
+    # https://github.com/llvm/llvm-project/issues/55245
+    "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON"
   ] ++ lib.optionals (!enableShared) [
     "-DLIBCXX_ENABLE_SHARED=OFF"
   ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [
diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index 38bc91977c36..1e2233790738 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -24,6 +24,8 @@
 , patches ? [ ]
 , enableManpages ? false
 , devExtraCmakeFlags ? [ ]
+, apple-sdk_11
+, darwinMinVersionHook
 , ...
 }:
 
@@ -90,33 +92,16 @@ stdenv.mkDerivation (rec {
     # buildInputs cc-wrapper will set up rpath correctly for us.
     (lib.getLib libclang)
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.libobjc
-    darwin.apple_sdk.libs.xpc
-    darwin.apple_sdk.frameworks.Foundation
     darwin.bootstrap_cmds
-    darwin.apple_sdk.frameworks.Carbon
-    darwin.apple_sdk.frameworks.Cocoa
   ]
-  # The older libSystem used on x86_64 macOS is missing the
-  # `` header which `lldb` uses.
-  #
-  # We copy this header over from macOS 10.12 SDK.
-  #
-  # See here for context:
-  # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
-  ++ lib.optional
+  ++ lib.optionals
     (
       stdenv.targetPlatform.isDarwin
         && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
-        && (lib.versionAtLeast release_version "15")
-    )
-    (
-      runCommand "bsm-audit-session-header" { } ''
-        install -Dm444 \
-          "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \
-          "$out/include/bsm/audit_session.h"
-      ''
-    );
+    ) [
+    apple-sdk_11
+    (darwinMinVersionHook "10.15")
+  ];
 
   hardeningDisable = [ "format" ];
 
@@ -130,7 +115,7 @@ stdenv.mkDerivation (rec {
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
   ] ++ lib.optionals (lib.versionAtLeast release_version "17") [
-    "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}"
+    "-DCLANG_RESOURCE_DIR=../../../../${lib.getLib libclang}"
   ] ++ lib.optionals enableManpages ([
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index fc139c703774..bd384108408c 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -17,6 +17,7 @@
   # TODO: Can this memory corruption bug still occur?
   # 
 , enableGoldPlugin ? libbfd.hasPluginAPI
+, ld64
 , libbfd
 , libpfm
 , libxml2
@@ -46,6 +47,11 @@
 let
   inherit (lib) optional optionals optionalString;
 
+  # Is there a better way to do this? Darwin wants to disable tests in the first
+  # LLVM rebuild, but overriding doesn’t work when building libc++, libc++abi,
+  # and libunwind. It also wants to disable LTO in the first rebuild.
+  isDarwinBootstrap = lib.getName stdenv == "bootstrap-stage-xclang-stdenv-darwin";
+
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version));
 
@@ -66,7 +72,7 @@ let
   #
   # So, we "manually" assemble one python derivation for the package to depend
   # on, taking into account whether checks are enabled or not:
-  python = if doCheck then
+  python = if doCheck && !isDarwinBootstrap then
     # Note that we _explicitly_ ask for a python interpreter for our host
     # platform here; the splicing that would ordinarily take care of this for
     # us does not seem to work once we use `withPackages`.
@@ -95,14 +101,14 @@ let
   patches' = patches ++ lib.optionals enablePolly pollyPatches;
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
 
   src = src';
   patches = patches';
 
   sourceRoot = if lib.versionOlder release_version "13" then null
-    else "${src.name}/${pname}";
+    else "${finalAttrs.src.name}/${pname}";
 
   outputs = [ "out" "lib" "dev" "python" ];
 
@@ -346,13 +352,13 @@ stdenv.mkDerivation (rec {
     ];
   in flagsForLlvmConfig ++ [
     "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
-    "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_ENABLE_DUMP=ON"
     (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo)
-  ] ++ optionals (!doCheck) [
+  ] ++ optionals (!finalAttrs.finalPackage.doCheck) [
     "-DLLVM_INCLUDE_TESTS=OFF"
   ] ++ optionals stdenv.hostPlatform.isStatic [
     # Disables building of shared libs, -fPIC is still injected by cc-wrapper
@@ -432,7 +438,7 @@ stdenv.mkDerivation (rec {
     cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
   '');
 
-  inherit doCheck;
+  doCheck = !isDarwinBootstrap && doCheck;
 
   checkTarget = "check-all";
 
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index b40efbd32741..38795426bea2 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -105,7 +105,9 @@ stdenv.mkDerivation (args // {
   # sequential order among them as a single rule.
   makefile = ./Makefile.nixpkgs;
   buildFlags = if useNativeCompilers
-    then ["nixpkgs_world_bootstrap_world_opt"]
+    then [(if lib.versionOlder version "5.2"
+      then "nixpkgs_world_bootstrap_world_opt"
+      else "defaultentry")]
     else ["nixpkgs_world"];
   buildInputs = optional (lib.versionOlder version "4.07") ncurses
     ++ optionals useX11 [ libX11 xorgproto ];
diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix
index 1f8079908999..5e7805a31b30 100644
--- a/pkgs/development/compilers/open-watcom/bin.nix
+++ b/pkgs/development/compilers/open-watcom/bin.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
+{ lib, stdenvNoCC, fetchurl, qemu, writeScript, writeScriptBin, ncurses, bash, coreutils, unixtools }:
 
 let
 
@@ -48,41 +48,6 @@ let
     exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET"
   '';
 
-  # Do a scripted installation of OpenWatcom with its original installer.
-  #
-  # If maintaining this expect script turns out to be too much of a
-  # hassle, we can switch to just using `unzip' on the installer and
-  # the correct file permissions manually.
-  performInstall = writeScriptBin "performInstall" ''
-    #!${expect}/bin/expect -f
-
-    spawn [lindex $argv 0]
-
-    # Wait for button saying "I agree" with escape sequences.
-    expect "gree"
-
-    # Navigate to "I Agree!" and hit enter.
-    send "\t\t\n"
-
-    expect "Install Open Watcom"
-
-    # Where do we want to install to.
-    send "$env(out)\n"
-
-    expect "will be installed"
-
-    # Select Full Installation, Next
-    send "fn"
-
-    expect "Setup will now copy"
-
-    # Next
-    send "n"
-
-    expect "completed successfully"
-    send "\n"
-  '';
-
 in
 stdenvNoCC.mkDerivation rec {
   pname = "${passthru.prettyName}-unwrapped";
@@ -93,7 +58,7 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p";
   };
 
-  nativeBuildInputs = [ wrapInPlace performInstall ];
+  nativeBuildInputs = [ wrapInPlace unixtools.script ];
 
   dontUnpack = true;
   dontConfigure = true;
@@ -104,7 +69,9 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   installPhase = ''
-    performInstall ./install-bin-unwrapped
+    # Command line options to do an unattended install are documented in
+    # https://github.com/open-watcom/open-watcom-v2/blob/master/bld/setupgui/setup.txt
+    script -c "./install-bin-unwrapped -dDstDir=$out -dFullInstall=1 -i"
 
     for e in $(find $out/binl -type f -executable); do
       echo "Wrapping $e"
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
deleted file mode 100644
index a5110cb24d27..000000000000
--- a/pkgs/development/compilers/openjdk/11.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ stdenv, lib, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  major = "11";
-  minor = "0";
-  update = "23";
-  build = "9";
-
-  # 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}.${minor}.${update}+${build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jdk${major}u";
-      rev = "jdk-${version}";
-      sha256 = "sha256-6y6wge8ZuSKBpb5QNihvAlD4Pv/0d3AQCPOkxUm/sJk=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      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 && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap.patch
-      ./fix-library-path-jdk11.patch
-
-      # Fix build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk10.patch
-    ];
-
-    preConfigure = ''
-      chmod +x configure
-      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-    '';
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-harfbuzz=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-      "--disable-warnings-as-errors"
-    ]
-    # 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.hostPlatform.isx86_64 "--with-jvm-features=zgc"
-    ++ lib.optional headless "--enable-headless-only"
-    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    # Workaround for
-    # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
-    # when building jtreg
-    env.NIX_CFLAGS_COMPILE = "-Wformat";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -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" ];
-
-    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 < $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/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch
rename to pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
rename to pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
new file mode 100644
index 000000000000..8683cdecba3d
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-H/VmT6NYbbZBba7Js8xk+epVZ2kLfvlwTNgg5SQ4ljA=",
+  "owner": "openjdk",
+  "repo": "jdk11u",
+  "rev": "jdk-11.0.24+8"
+}
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
deleted file mode 100644
index d0c954d1b023..000000000000
--- a/pkgs/development/compilers/openjdk/17.nix
+++ /dev/null
@@ -1,209 +0,0 @@
-{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
-, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
-, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
-, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  version = {
-    feature = "17";
-    interim = ".0.11";
-    build = "9";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk17-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}+${version.build}";
-      sha256 = "sha256-aO4iSc9MklW/4q9U86WEfiiWnlq6iZSbxzq2fbsqd0A=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      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 && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      ./ignore-LegalNoticeFilePlugin-jdk17.patch
-      ./fix-library-path-jdk17.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";
-      })
-
-      # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
-      # This is applied anywhere to prevent patchrot.
-      (fetchurl {
-        url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
-        sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
-      })
-
-      # Fix build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-
-      # 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
-    ];
-
-    postPatch = ''
-      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-harfbuzz=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--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}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -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 = [ "images" ];
-
-    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
-
-      # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-      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 < $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 -u | 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/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch
rename to pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch
diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch
rename to pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch
rename to pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch
rename to pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch
diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json
new file mode 100644
index 000000000000..546e2fff8a19
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/17/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-9UB1H3gd+b4wWxOMgsdDPgX/IGWNORKk1gMsSjYoZMw=",
+  "owner": "openjdk",
+  "repo": "jdk17u",
+  "rev": "jdk-17.0.12+7"
+}
diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix
deleted file mode 100644
index 7a650fa4a30f..000000000000
--- a/pkgs/development/compilers/openjdk/21.nix
+++ /dev/null
@@ -1,195 +0,0 @@
-{ stdenv, lib, fetchurl, fetchpatch, 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, openjdk21-bootstrap
-, ensureNewerSourcesForZipFilesHook
-, setJavaClassPath
-# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
-# which should be fixable, this is a no-rebuild workaround for GHC.
-, headless ? stdenv.targetPlatform.isGhcjs
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  version = {
-    feature = "21";
-    interim = ".0.3";
-    build = "9";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk21-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}+${version.build}";
-      hash = "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
-    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 && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk21.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      ./ignore-LegalNoticeFilePlugin-jdk18.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 build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    postPatch = ''
-      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-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--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 stdenv.hostPlatform.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 && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -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 = [ "images" ];
-
-    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
-
-      # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-      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 < $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 -u | 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/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch b/pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch
rename to pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch
diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch b/pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch
rename to pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
new file mode 100644
index 000000000000..d0db28246a84
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-+xpQtQ1IQ7btVWnENT9XS5A/2VP101/+XR3BMo8BqYI=",
+  "owner": "openjdk",
+  "repo": "jdk21u",
+  "rev": "jdk-21.0.4+7"
+}
diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix
deleted file mode 100644
index b022e492e3f9..000000000000
--- a/pkgs/development/compilers/openjdk/22.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, fetchFromGitHub
-, 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
-, openjdk22-bootstrap
-, ensureNewerSourcesForZipFilesHook
-, setJavaClassPath
-  # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
-  # which should be fixable, this is a no-rebuild workaround for GHC.
-, headless ? stdenv.targetPlatform.isGhcjs
-, enableJavaFX ? false
-, openjfx
-, enableGtk ? true
-, gtk3
-, glib
-, writeShellScript
-, versionCheckHook
-}:
-
-let
-
-  # Java version format:
-  # $FEATURE.$INTERIM.$UPDATE.$PATCH
-  # See
-  # https://openjdk.org/jeps/223
-  # https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/lang/Runtime.Version.html
-  featureVersion = "22";
-  info = builtins.getAttr featureVersion (lib.importJSON ./info.json);
-  version = info.version;
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; };
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "openjdk" + lib.optionalString headless "-headless";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "openjdk";
-    repo = info.repo;
-    rev = "jdk-${version}";
-    hash = info.hash;
-  };
-
-  nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
-  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 && enableGtk) [
-    gtk3
-    glib
-  ];
-
-  patches = [
-    ./fix-java-home-jdk21.patch
-    ./read-truststore-from-env-jdk10.patch
-    ./currency-date-range-jdk10.patch
-    ./increase-javadoc-heap-jdk13.patch
-    ./ignore-LegalNoticeFilePlugin-jdk18.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 build for gnumake-4.4.1:
-    #   https://github.com/openjdk/jdk/pull/12992
-    (fetchpatch {
-      name = "gnumake-4.4.1";
-      url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-      hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-    })
-  ] ++ lib.optionals (!headless && enableGtk) [
-    ./swing-use-gtk-jdk13.patch
-  ];
-
-  postPatch = ''
-    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" ];
-
-
-  # https://openjdk.org/groups/build/doc/building.html
-  configureFlags = [
-    "--with-boot-jdk=${openjdk-bootstrap.home}"
-    "--with-version-string=${version}"
-    "--with-vendor-version-string=(nix)"
-    "--enable-unlimited-crypto"
-    "--with-native-debug-symbols=internal"
-    "--with-libjpeg=system"
-    "--with-giflib=system"
-    "--with-libpng=system"
-    "--with-zlib=system"
-    "--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}";
-
-  separateDebugInfo = true;
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  NIX_LDFLAGS = toString (lib.optionals (!headless) [
-    "-lfontconfig"
-    "-lcups"
-    "-lXinerama"
-    "-lXrandr"
-    "-lmagic"
-  ] ++ lib.optionals (!headless && enableGtk) [
-    "-lgtk-3"
-    "-lgio-2.0"
-  ]);
-
-  # -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 = [ "images" ];
-
-  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
-
-    # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-    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 < $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 -u | 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 = __curPos;
-  meta = import ./meta.nix lib featureVersion;
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgram = "${placeholder "out"}/bin/java";
-
-  doInstallCheck = true;
-
-  passthru = {
-    updateScript =
-      let
-        java-json = fetchurl {
-          url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar";
-          hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0=";
-        };
-      in
-      writeShellScript "update-java" ''
-        ${finalAttrs.finalPackage}/bin/java \
-          -cp ${java-json} \
-          ${./JavaUpdater.java} \
-          22 pkgs/development/compilers/openjdk/info.json
-      '';
-
-    home = "${finalAttrs.finalPackage}/lib/openjdk";
-
-    inherit gtk3;
-  };
-})
diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json
new file mode 100644
index 000000000000..b47426326ecd
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/23/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-lcLnWAiskWindOqWmOWiIHiYKXGSJZK4d20k19QZfrE=",
+  "owner": "openjdk",
+  "repo": "jdk23u",
+  "rev": "jdk-23-ga"
+}
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
deleted file mode 100644
index b77b058e2cac..000000000000
--- a/pkgs/development/compilers/openjdk/8.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, lndir, bash, cpio, file, which, unzip, zip
-, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
-, libjpeg, giflib
-, openjdk8-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableGtk ? true, gtk2, glib
-}:
-
-let
-
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture = {
-    i686-linux = "i386";
-    x86_64-linux = "amd64";
-    aarch64-linux = "aarch64";
-    powerpc64le-linux = "ppc64le";
-  }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}");
-
-  update = "412";
-  build = "ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk8-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk8 = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "8u${update}-${build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jdk8u";
-      rev = "jdk${version}";
-      sha256 = "sha256-o+H5n5p6JG1giJj9OADgMbQPaoKMzLMFquKH536SHhM=";
-    };
-    outputs = [ "out" "jre" ];
-
-    nativeBuildInputs = [ pkg-config lndir unzip ];
-    buildInputs = [
-      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 && enableGtk) [
-      gtk2 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk8.patch
-      ./read-truststore-from-env-jdk8.patch
-      ./currency-date-range-jdk8.patch
-      ./fix-library-path-jdk8.patch
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk8.patch
-    ];
-
-    # Hotspot cares about the host(!) version otherwise
-    DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
-
-    preConfigure = ''
-      chmod +x configure
-      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-      substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
-      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
-    '';
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-update-version=${update}"
-      "--with-build-number=${build}"
-      "--with-milestone=fcs"
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--disable-freetype-bundling"
-      "--with-zlib=system"
-      "--with-giflib=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--disable-headful";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = toString ([
-      # glibc 2.24 deprecated readdir_r so we need this
-      # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
-      "-Wno-error=deprecated-declarations"
-    ] ++ lib.optionals stdenv.cc.isGNU [
-      # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
-      # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
-      "-fno-lifetime-dse"
-      "-fno-delete-null-pointer-checks"
-      "-std=gnu++98"
-      "-Wno-error"
-    ]);
-
-    NIX_LDFLAGS= toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-x11-2.0" "-lgio-2.0"
-    ]);
-
-    # -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" ];
-
-    doCheck = false; # fails with "No rule to make target 'y'."
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/j2sdk-image $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 $out/lib/openjdk/sample
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
-        rm $out/lib/openjdk/jre/bin/policytool
-        rm $out/lib/openjdk/bin/{policytool,appletviewer}
-      ''}
-
-      # Move the JRE to a separate output
-      mkdir -p $jre/lib/openjdk
-      mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
-      mkdir $out/lib/openjdk/jre
-      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
-
-      # Make sure cmm/*.pf are not symlinks:
-      # https://youtrack.jetbrains.com/issue/IDEA-147272
-      rm -rf $out/lib/openjdk/jre/lib/cmm
-      ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
-
-      # Setup fallback fonts
-      ${lib.optionalString (!headless) ''
-        mkdir -p $jre/lib/openjdk/jre/lib/fonts
-        ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
-      ''}
-
-      # Remove duplicate binaries.
-      for i in $(cd $out/lib/openjdk/bin && echo *); do
-        if [ "$i" = java ]; then continue; fi
-        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
-          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
-        fi
-      done
-
-      # Generate certificates.
-      (
-        cd $jre/lib/openjdk/jre/lib/security
-        rm cacerts
-        perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
-      )
-
-      ln -s $out/lib/openjdk/bin $out/bin
-      ln -s $jre/lib/openjdk/jre/bin $jre/bin
-      ln -s $jre/lib/openjdk/jre $out/jre
-    '';
-
-    propagatedBuildInputs = [ setJavaClassPath ];
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
-      # properly.
-      mkdir -p $jre/nix-support
-      printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat < $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 = [ openjdk8-bootstrap ];
-
-    meta = with lib; {
-      homepage = "http://openjdk.java.net/";
-      license = licenses.gpl2;
-      description = "Open-source Java Development Kit";
-      maintainers = with maintainers; [ edwtjo ];
-      platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
-      mainProgram = "java";
-      # Broken for musl at 2024-01-17. Tracking issue:
-      # https://github.com/NixOS/nixpkgs/issues/281618
-      # error: ‘isnanf’ was not declared in this scope
-      broken = stdenv.hostPlatform.isMusl;
-    };
-
-    passthru = {
-      inherit architecture;
-      home = "${openjdk8}/lib/openjdk";
-      inherit gtk2;
-    };
-  };
-in openjdk8
diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/pkgs/development/compilers/openjdk/8/generate-cacerts.pl
similarity index 100%
rename from pkgs/development/compilers/openjdk/generate-cacerts.pl
rename to pkgs/development/compilers/openjdk/8/generate-cacerts.pl
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json
new file mode 100644
index 000000000000..47ad1dc0596a
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/8/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-uMo1DIkji+FPTbFRwURXybkLE5xv+teSClWP9RfAvfo=",
+  "owner": "openjdk",
+  "repo": "jdk8u",
+  "rev": "jdk8u422-ga"
+}
diff --git a/pkgs/development/compilers/openjdk/JavaUpdater.java b/pkgs/development/compilers/openjdk/JavaUpdater.java
deleted file mode 100644
index 32dddf2fabc7..000000000000
--- a/pkgs/development/compilers/openjdk/JavaUpdater.java
+++ /dev/null
@@ -1,181 +0,0 @@
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.net.http.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public class JavaUpdater {
-
-  record GitHubResult(Optional latestVersion, Optional next) {
-  }
-
-  record JsonInfo(String repo, String version, String hash) {
-    public JsonInfo(JSONObject json) {
-      this(json.getString("repo"), json.getString("version"), json.getString("hash"));
-    }
-
-    public String toJsonString(String featureVersion) {
-      return """
-        \s "%s": {
-        \s   "version": "%s",
-        \s   "repo":    "%s",
-        \s   "hash":    "%s"
-        \s }\
-        """.formatted(featureVersion, version, repo, hash);
-    }
-  }
-
-  // Parses the GitHub Link header
-  public static Optional getNextLink(HttpHeaders headers) {
-    var linkHeader = headers.map().get("Link");
-    if (linkHeader == null || linkHeader.isEmpty()) return null;
-
-    var links = linkHeader.getFirst();
-    var linksRegex = Pattern.compile("<(.+)>;\\s*rel=\"next\"");
-    return Pattern.compile(",")
-      .splitAsStream(links)
-      .map(x -> linksRegex.matcher(x).results()
-        .map(g -> g.group(1))
-        .findFirst()
-      )
-      .filter(Optional::isPresent)
-      .map(Optional::orElseThrow)
-      .findFirst();
-  }
-
-  // HTTP request helper, sets GITHUB_TOKEN if present
-  private static HttpRequest NewGithubRequest(String url) {
-    var token = System.getenv().get("GITHUB_TOKEN");
-    var builder = HttpRequest.newBuilder()
-      .uri(URI.create(url));
-    if (token != null)
-      builder.setHeader("Authorization", "Bearer " + token);
-    return builder.build();
-  }
-
-  private static GitHubResult getLatestTag(String url) {
-    var request = NewGithubRequest(url);
-
-    var response =
-      HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString())
-        .join();
-
-    var json = new JSONArray(response.body());
-
-    Optional version = StreamSupport.stream(json.spliterator(), false)
-      .map(JSONObject.class::cast)
-      .map(x -> x.getString("name").replaceFirst("jdk-", ""))
-      .filter(x -> x.contains("-ga"))
-      .max(Comparator.comparing(Runtime.Version::parse));
-
-    return new GitHubResult(version, getNextLink(response.headers()));
-  }
-
-  public String findNewerVersion() {
-    var url = Optional.of("https://api.github.com/repos/openjdk/" + getRepo() + "/tags?per_page=100");
-    String version = getCurrentVersion();
-    do {
-      GitHubResult response = getLatestTag(url.orElseThrow());
-      if (response.latestVersion.isPresent() && response.latestVersion.orElseThrow().equals(version)) {
-        return null;
-      }
-
-      String latestVersion = Stream.of(version, response.latestVersion.orElse(version))
-        .max(Comparator.comparing(Runtime.Version::parse)).orElseThrow();
-
-      if (latestVersion != version)
-        return latestVersion;
-
-      url = response.next;
-    } while (url.isPresent());
-    return null;
-  }
-
-
-  private static String prettyPrint(JSONObject json) {
-
-    Iterable iterable = () -> json.keys();
-
-    return StreamSupport
-      .stream(iterable.spliterator(), false)
-      .sorted(Comparator.reverseOrder())
-      .map(majorVersion -> (new JsonInfo(json.getJSONObject(majorVersion))).toJsonString(majorVersion))
-      .collect(
-        Collectors.joining(",\n", "{\n", "\n}")
-      );
-  }
-
-  public void updateJsonInfo(String newVersion) {
-    try {
-      JSONObject json = getJsonInfo();
-      var info = json.getJSONObject(featureNumber);
-      info.put("version", newVersion);
-      info.put("hash", nixHash(newVersion));
-
-      try (PrintWriter out = new PrintWriter(infoJsonPath)) {
-        out.println(prettyPrint(json));
-      }
-
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private String nixHash(String version) {
-    try {
-      var process = new ProcessBuilder("nix", "flake", "prefetch",
-        "--extra-experimental-features", "'nix-command flakes'",
-        "--json", "github:openjdk/" + getRepo() + "/jdk-" + version).start();
-
-      var json = new JSONObject(new String(process.getInputStream().readAllBytes()));
-      process.waitFor();
-      return json.getString("hash");
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private final String featureNumber;
-  private final String infoJsonPath;
-  private final JSONObject jsonInfo;
-
-  public String getCurrentVersion() {
-    return this.jsonInfo.getJSONObject(this.featureNumber).getString("version");
-  }
-
-  public String getRepo() {
-    return this.jsonInfo.getJSONObject(this.featureNumber).getString("repo");
-  }
-
-  public JSONObject getJsonInfo() {
-    try {
-      String infoStr = Files.readString(Path.of(this.infoJsonPath));
-      return new JSONObject(infoStr);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public JavaUpdater(String featureNumber, String infoJsonPath) {
-    this.featureNumber = featureNumber;
-    this.infoJsonPath = infoJsonPath;
-    this.jsonInfo = getJsonInfo();
-  }
-
-  public static void main(String[] args) {
-    var updater = new JavaUpdater(args[0], args[1]);
-    String newerVersion = updater.findNewerVersion();
-    if (newerVersion != null) {
-      updater.updateJsonInfo(newerVersion);
-    }
-  }
-}
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
deleted file mode 100644
index e58888cc9ed8..000000000000
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, runCommand, fetchurl, zlib
-
-, version
-}:
-
-assert stdenv.hostPlatform.libc == "glibc";
-
-let
-  fetchboot = version: arch: sha256: fetchurl {
-    name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz";
-    url  = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz";
-    inherit sha256;
-  };
-
-  src = if stdenv.hostPlatform.system == "x86_64-linux" then
-    (if version == "10"    then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
-    else if version == "8" then fetchboot "8"  "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
-    else throw "No bootstrap jdk for version ${version}")
-  else if stdenv.hostPlatform.system == "i686-linux" then
-    (if version == "10"    then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
-    else if version == "8" then fetchboot "8"  "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
-    else throw "No bootstrap for version")
-  else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}";
-
-  bootstrap = runCommand "openjdk-bootstrap" {
-    passthru.home = "${bootstrap}/lib/openjdk";
-  } ''
-    tar xvf ${src}
-    mv openjdk-bootstrap $out
-
-    LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')"
-
-    find "$out" -type f -print0 | while IFS= read -r -d "" elf; do
-      isELF "$elf" || continue
-      patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true
-      patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true
-    done
-  '';
-in bootstrap
diff --git a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch
deleted file mode 100644
index 7bf8b2b16744..000000000000
--- a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Taken from https://build.opensuse.org/package/view_file/Java:Factory/java-15-openjdk/openjdk-glibc234.patch
-
---- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-04-09 11:36:58.000000000 +0200
-+++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-08-26 15:42:52.326232581 +0200
-@@ -67,8 +67,17 @@
-   longjmp(context, 1);
- }
- 
-+static char* altstack = NULL;
-+
- void set_signal_handler() {
--  static char altstack[SIGSTKSZ];
-+  if (altstack == NULL) {
-+    // Dynamically allocated in case SIGSTKSZ is not constant
-+    altstack = malloc(SIGSTKSZ);
-+    if (altstack == NULL) {
-+      fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
-+      exit(7);
-+    }
-+  }
- 
-   stack_t ss = {
-     .ss_size = SIGSTKSZ,
-
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
new file mode 100644
index 000000000000..0d03be2a95cf
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -0,0 +1,666 @@
+{
+  featureVersion,
+
+  lib,
+  stdenv,
+
+  fetchurl,
+  fetchpatch,
+
+  pkg-config,
+  autoconf,
+  lndir,
+  unzip,
+  ensureNewerSourcesForZipFilesHook,
+
+  cpio,
+  file,
+  which,
+  zip,
+  perl,
+  zlib,
+  cups,
+  freetype,
+  harfbuzz,
+  alsa-lib,
+  libjpeg,
+  giflib,
+  libpng,
+  lcms2,
+  libX11,
+  libICE,
+  libXext,
+  libXrender,
+  libXtst,
+  libXt,
+  libXi,
+  libXinerama,
+  libXcursor,
+  libXrandr,
+  fontconfig,
+
+  setJavaClassPath,
+
+  versionCheckHook,
+
+  bash,
+  liberation_ttf,
+  cacert,
+
+  nixpkgs-openjdk-updater,
+
+  # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
+  # which should be fixable, this is a no-rebuild workaround for GHC.
+  headless ? lib.versionAtLeast featureVersion "21" && stdenv.targetPlatform.isGhcjs,
+
+  enableJavaFX ? false,
+  openjfx17,
+  openjfx21,
+  openjfx23,
+  openjfx_jdk ?
+    {
+      "17" = openjfx17;
+      "21" = openjfx21;
+      "23" = openjfx23;
+    }
+    .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
+
+  enableGtk ? true,
+  gtk3,
+  gtk2,
+  glib,
+
+  temurin-bin-8,
+  temurin-bin-11,
+  temurin-bin-17,
+  temurin-bin-21,
+  temurin-bin-23,
+  jdk-bootstrap ?
+    {
+      "8" = temurin-bin-8;
+      "11" = temurin-bin-11;
+      "17" = temurin-bin-17;
+      "21" = temurin-bin-21;
+      "23" = temurin-bin-23;
+    }
+    .${featureVersion},
+}:
+
+let
+  sourceFile = ./. + "/${featureVersion}/source.json";
+  source = nixpkgs-openjdk-updater.openjdkSource {
+    inherit sourceFile;
+    featureVersionPrefix = tagPrefix + featureVersion;
+  };
+
+  atLeast11 = lib.versionAtLeast featureVersion "11";
+  atLeast17 = lib.versionAtLeast featureVersion "17";
+  atLeast21 = lib.versionAtLeast featureVersion "21";
+  atLeast23 = lib.versionAtLeast featureVersion "23";
+
+  tagPrefix = if atLeast11 then "jdk-" else "jdk";
+  # TODO: Merge these `lib.removePrefix` calls once update scripts have
+  # been run.
+  version = lib.removePrefix tagPrefix (lib.removePrefix "refs/tags/" source.src.rev);
+  versionSplit =
+    # TODO: Remove `-ga` logic once update scripts have been run.
+    builtins.match (if atLeast11 then "(.+)[-+](.+)" else "(.+)-b?(.+)") version;
+  versionBuild = lib.elemAt versionSplit 1;
+
+  # The JRE 8 libraries are in directories that depend on the CPU.
+  architecture =
+    if atLeast11 then
+      ""
+    else
+      {
+        i686-linux = "i386";
+        x86_64-linux = "amd64";
+        aarch64-linux = "aarch64";
+        powerpc64le-linux = "ppc64le";
+      }
+      .${stdenv.system} or (throw "Unsupported platform ${stdenv.system}");
+
+  jdk-bootstrap' = jdk-bootstrap.override {
+    # when building a headless jdk, also bootstrap it with a headless jdk
+    gtkSupport = !headless;
+  };
+in
+
+assert lib.assertMsg (lib.pathExists sourceFile)
+  "OpenJDK ${featureVersion} is not a supported version";
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "openjdk" + lib.optionalString headless "-headless";
+  inherit version;
+
+  outputs =
+    [
+      "out"
+    ]
+    ++ lib.optionals (!atLeast11) [
+      "jre"
+    ];
+
+  inherit (source) src;
+
+  patches =
+    [
+      (
+        if atLeast21 then
+          ./21/patches/fix-java-home-jdk21.patch
+        else if atLeast11 then
+          ./11/patches/fix-java-home-jdk10.patch
+        else
+          ./8/patches/fix-java-home-jdk8.patch
+      )
+      (
+        if atLeast11 then
+          ./11/patches/read-truststore-from-env-jdk10.patch
+        else
+          ./8/patches/read-truststore-from-env-jdk8.patch
+      )
+    ]
+    ++ lib.optionals (!atLeast23) [
+      (
+        if atLeast11 then
+          ./11/patches/currency-date-range-jdk10.patch
+        else
+          ./8/patches/currency-date-range-jdk8.patch
+      )
+    ]
+    ++ lib.optionals atLeast11 [
+      (
+        if atLeast17 then
+          ./17/patches/increase-javadoc-heap-jdk13.patch
+        else
+          ./11/patches/increase-javadoc-heap.patch
+      )
+    ]
+    ++ lib.optionals atLeast17 [
+      (
+        if atLeast21 then
+          ./21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
+        else
+          ./17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
+      )
+    ]
+    ++ lib.optionals (!atLeast21) [
+      (
+        if atLeast17 then
+          ./17/patches/fix-library-path-jdk17.patch
+        else if atLeast11 then
+          ./11/patches/fix-library-path-jdk11.patch
+        else
+          ./8/patches/fix-library-path-jdk8.patch
+      )
+    ]
+    ++ lib.optionals (atLeast17 && !atLeast23) [
+      # -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 (featureVersion == "17") [
+      # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
+      # This is applied anywhere to prevent patchrot.
+      (fetchurl {
+        url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
+        sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
+      })
+    ]
+    ++ lib.optionals atLeast11 [
+      # Fix build for gnumake-4.4.1:
+      #   https://github.com/openjdk/jdk/pull/12992
+      (fetchpatch {
+        name = "gnumake-4.4.1";
+        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
+        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
+      })
+    ]
+    ++ lib.optionals (featureVersion == "17") [
+      # 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) [
+      (
+        if atLeast17 then
+          ./17/patches/swing-use-gtk-jdk13.patch
+        else if atLeast11 then
+          ./11/patches/swing-use-gtk-jdk10.patch
+        else
+          ./8/patches/swing-use-gtk-jdk8.patch
+      )
+    ];
+
+  nativeBuildInputs =
+    [
+      pkg-config
+    ]
+    ++ lib.optionals atLeast11 [
+      autoconf
+    ]
+    ++ lib.optionals (!atLeast11) [
+      lndir
+    ]
+    ++ [
+      unzip
+    ]
+    ++ lib.optionals atLeast21 [
+      ensureNewerSourcesForZipFilesHook
+    ];
+
+  buildInputs =
+    [
+      # TODO: Many of these should likely be in `nativeBuildInputs`.
+      cpio
+      file
+      which
+      zip
+      perl
+      zlib
+      cups
+      freetype
+    ]
+    ++ lib.optionals (atLeast11 && !atLeast21) [
+      harfbuzz
+    ]
+    ++ [
+      alsa-lib
+      libjpeg
+      giflib
+    ]
+    ++ lib.optionals atLeast11 [
+      libpng
+      zlib # duplicate
+      lcms2
+    ]
+    ++ [
+      libX11
+      libICE
+    ]
+    ++ lib.optionals (!atLeast11) [
+      libXext
+    ]
+    ++ [
+      libXrender
+    ]
+    ++ lib.optionals atLeast11 [
+      libXext
+    ]
+    ++ [
+      libXtst
+      libXt
+      libXtst # duplicate
+      libXi
+      libXinerama
+      libXcursor
+      libXrandr
+      fontconfig
+      jdk-bootstrap'
+    ]
+    ++ lib.optionals (!headless && enableGtk) [
+      (if atLeast11 then gtk3 else gtk2)
+      glib
+    ];
+
+  propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ];
+
+  nativeInstallCheckInputs = lib.optionals atLeast23 [
+    versionCheckHook
+  ];
+
+  # 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
+  ${if atLeast17 then "configurePlatforms" else null} = [
+    "build"
+    "host"
+  ];
+
+  # https://openjdk.org/groups/build/doc/building.html
+  configureFlags =
+    [
+      "--with-boot-jdk=${jdk-bootstrap'.home}"
+    ]
+    ++ (
+      if atLeast23 then
+        [
+          "--with-version-string=${version}"
+          "--with-vendor-version-string=(nix)"
+        ]
+      else if atLeast11 then
+        lib.optionals atLeast17 [
+          "--with-version-build=${versionBuild}"
+          "--with-version-opt=nixos"
+        ]
+        ++ [
+          "--with-version-pre="
+        ]
+      else
+        [
+          "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}"
+          "--with-build-number=${versionBuild}"
+          "--with-milestone=fcs"
+        ]
+    )
+    ++ [
+      "--enable-unlimited-crypto"
+      "--with-native-debug-symbols=internal"
+    ]
+    ++ lib.optionals (!atLeast21) (
+      if atLeast11 then
+        [
+          "--with-freetype=system"
+          "--with-harfbuzz=system"
+        ]
+      else
+        [
+          "--disable-freetype-bundling"
+        ]
+    )
+    ++ (
+      if atLeast11 then
+        [
+          "--with-libjpeg=system"
+          "--with-giflib=system"
+          "--with-libpng=system"
+          "--with-zlib=system"
+          "--with-lcms=system"
+        ]
+      else
+        [
+          "--with-zlib=system"
+          "--with-giflib=system"
+        ]
+    )
+    ++ [
+      "--with-stdc++lib=dynamic"
+    ]
+    ++ lib.optionals (featureVersion == "11") [
+      "--disable-warnings-as-errors"
+    ]
+    # OpenJDK 11 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 (atLeast11 && 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++"
+    ]
+    # This probably shouldn’t apply to OpenJDK 21; see
+    # b7e68243306833845cbf92e2ea1e0cf782481a51 which removed it for
+    # versions 15 through 20.
+    ++ lib.optional (
+      (featureVersion == "11" || featureVersion == "21") && stdenv.hostPlatform.isx86_64
+    ) "--with-jvm-features=zgc"
+    ++ lib.optional headless (if atLeast11 then "--enable-headless-only" else "--disable-headful")
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx_jdk}";
+
+  buildFlags = if atLeast17 then [ "images" ] else [ "all" ];
+
+  separateDebugInfo = true;
+
+  # -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;
+
+  env =
+    {
+      NIX_CFLAGS_COMPILE =
+        if atLeast17 then
+          "-Wno-error"
+        else if atLeast11 then
+          # Workaround for
+          # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
+          # when building jtreg
+          "-Wformat"
+        else
+          lib.concatStringsSep " " (
+            [
+              # glibc 2.24 deprecated readdir_r so we need this
+              # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+              "-Wno-error=deprecated-declarations"
+            ]
+            ++ lib.optionals stdenv.cc.isGNU [
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+              # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+              "-fno-lifetime-dse"
+              "-fno-delete-null-pointer-checks"
+              "-std=gnu++98"
+              "-Wno-error"
+            ]
+          );
+
+      NIX_LDFLAGS = lib.concatStringsSep " " (
+        lib.optionals (!headless) [
+          "-lfontconfig"
+          "-lcups"
+          "-lXinerama"
+          "-lXrandr"
+          "-lmagic"
+        ]
+        ++ lib.optionals (!headless && enableGtk) [
+          (if atLeast11 then "-lgtk-3" else "-lgtk-x11-2.0")
+          "-lgio-2.0"
+        ]
+      );
+    }
+    // lib.optionalAttrs (!atLeast11) {
+      # OpenJDK 8 Hotspot cares about the host(!) version otherwise
+      DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
+    };
+
+  ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java";
+
+  ${if !atLeast11 then "doCheck" else null} = false; # fails with "No rule to make target 'y'."
+
+  doInstallCheck = atLeast23;
+
+  ${if atLeast17 then "postPatch" else null} = ''
+    chmod +x configure
+    patchShebangs --build configure
+  '';
+
+  ${if !atLeast17 then "preConfigure" else null} =
+    ''
+      chmod +x configure
+      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
+    ''
+    + lib.optionalString (!atLeast11) ''
+      substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
+      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out/lib
+
+      mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $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
+    ''
+    + lib.optionalString atLeast17 ''
+
+      # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
+    ''
+    + lib.optionalString atLeast11 ''
+      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 (!atLeast11) " $out/lib/openjdk/sample"}
+      ${lib.optionalString headless (
+        if atLeast11 then
+          ''
+            rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+          ''
+        else
+          ''
+            rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
+            rm $out/lib/openjdk/jre/bin/policytool
+            rm $out/lib/openjdk/bin/{policytool,appletviewer}
+          ''
+      )}
+    ''
+    + lib.optionalString (!atLeast11) ''
+
+      # Move the JRE to a separate output
+      mkdir -p $jre/lib/openjdk
+      mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
+      mkdir $out/lib/openjdk/jre
+      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+      # Make sure cmm/*.pf are not symlinks:
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      rm -rf $out/lib/openjdk/jre/lib/cmm
+      ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
+      # Setup fallback fonts
+      ${lib.optionalString (!headless) ''
+        mkdir -p $jre/lib/openjdk/jre/lib/fonts
+        ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+      ''}
+
+      # Remove duplicate binaries.
+      for i in $(cd $out/lib/openjdk/bin && echo *); do
+        if [ "$i" = java ]; then continue; fi
+        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+        fi
+      done
+
+      # Generate certificates.
+      (
+        cd $jre/lib/openjdk/jre/lib/security
+        rm cacerts
+        perl ${./8/generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+      )
+    ''
+    + ''
+
+      ln -s $out/lib/openjdk/bin $out/bin
+    ''
+    + lib.optionalString (!atLeast11) ''
+      ln -s $jre/lib/openjdk/jre/bin $jre/bin
+      ln -s $jre/lib/openjdk/jre $out/jre
+    '';
+
+  preFixup =
+    (
+      if atLeast11 then
+        ''
+          # 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
+        ''
+      else
+        ''
+          # Propagate the setJavaClassPath setup hook from the JRE so that
+          # any package that depends on the JRE has $CLASSPATH set up
+          # properly.
+          mkdir -p $jre/nix-support
+          printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
+        ''
+    )
+    + ''
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat < $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 {} \+ | ${
+        if atLeast17 then "sort -u" else "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
+  '';
+
+  # TODO: The OpenJDK 8 derivation got this wrong.
+  disallowedReferences = [
+    (if atLeast11 then jdk-bootstrap' else jdk-bootstrap)
+  ];
+
+  passthru =
+    {
+      home = "${finalAttrs.finalPackage}/lib/openjdk";
+      inherit jdk-bootstrap;
+      inherit (source) updateScript;
+    }
+    // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; })
+    // lib.optionalAttrs (!atLeast23) {
+      inherit architecture;
+    };
+
+  meta = {
+    description = "Open-source Java Development Kit";
+    homepage = "https://openjdk.java.net/";
+    license = lib.licenses.gpl2Only;
+    maintainers =
+      with lib.maintainers;
+      [
+        edwtjo
+        infinidoge
+      ]
+      ++ lib.teams.java.members;
+    mainProgram = "java";
+    platforms =
+      [
+        "i686-linux"
+        "x86_64-linux"
+        "aarch64-linux"
+      ]
+      ++ lib.optionals atLeast11 [
+        "armv7l-linux"
+        "armv6l-linux"
+        "powerpc64le-linux"
+      ]
+      ++ lib.optionals atLeast17 [
+        "riscv64-linux"
+      ];
+    # OpenJDK 8 was broken for musl at 2024-01-17. Tracking issue:
+    # https://github.com/NixOS/nixpkgs/issues/281618
+    # error: ‘isnanf’ was not declared in this scope
+    broken = !atLeast11 && stdenv.hostPlatform.isMusl;
+  };
+})
diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json
deleted file mode 100644
index d55f95f799ae..000000000000
--- a/pkgs/development/compilers/openjdk/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "22": {
-    "version": "22.0.2-ga",
-    "repo":    "jdk22u",
-    "hash":    "sha256-Zo1LOumkt9zTaPqbDcRL8lVJMqVle0QqzThtIz0JRNo="
-  },
-  "21": {
-    "version": "21.0.3-ga",
-    "repo":    "jdk21u",
-    "hash":    "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE="
-  }
-}
diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix
deleted file mode 100644
index aac54417e2a8..000000000000
--- a/pkgs/development/compilers/openjdk/make-bootstrap.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ runCommand, openjdk, nukeReferences }:
-
-runCommand "${openjdk.name}-bootstrap.tar.xz" {} ''
-  mkdir -pv openjdk-bootstrap/lib
-
-  # Do a deep copy of the openjdk
-  cp -vrL ${openjdk.home} openjdk-bootstrap/lib
-
-  # Includes are needed for building the native jvm
-  cp -vrL ${openjdk}/include openjdk-bootstrap
-
-  # The binaries are actually stored in the openjdk lib
-  ln -sv lib/openjdk/bin openjdk-bootstrap/bin
-  find . -name libjli.so
-  (cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;)
-
-  chmod -R +w openjdk-bootstrap
-
-  # Remove components we don't need
-  find openjdk-bootstrap -name \*.diz -exec rm {} \;
-  find openjdk-bootstrap -name \*.ttf -exec rm {} \;
-  find openjdk-bootstrap -name \*.gif -exec rm {} \;
-  find openjdk-bootstrap -name src.zip -exec rm {} \;
-  rm -rf openjdk-bootstrap/lib/openjdk/jre/bin
-
-  # Remove all of the references to the native nix store
-  find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs
-
-  # Create the output tarball
-  tar cv openjdk-bootstrap | xz > $out
-''
diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix
deleted file mode 100644
index 04ed684eefab..000000000000
--- a/pkgs/development/compilers/openjdk/meta.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-lib: version: with lib; {
-  homepage = "https://openjdk.java.net/";
-  license = licenses.gpl2Only;
-  description = "Open-source Java Development Kit";
-  maintainers = with maintainers; [ edwtjo infinidoge ];
-  platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ];
-  mainProgram = "java";
-  knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" "19" "20" ]) [
-    "This OpenJDK version has reached its end of life."
-  ];
-}
diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix
deleted file mode 100644
index d43ffc8b6862..000000000000
--- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
-, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
-, ffmpeg-headless, python3, ruby
-, withMedia ? true
-, withWebKit ? false
-}:
-
-let
-  pname = "openjfx-modular-sdk";
-  major = "17";
-  update = ".0.11";
-  build = "-ga";
-  repover = "${major}${update}${build}";
-  jdk = openjdk17_headless;
-  gradle = gradle_7;
-
-in stdenv.mkDerivation {
-  inherit pname;
-  version = "${major}${update}${build}";
-
-  src = fetchFromGitHub {
-    owner = "openjdk";
-    repo = "jfx${major}u";
-    rev = repover;
-    sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw=";
-  };
-
-  patches = [
-    ../backport-ffmpeg-6-support-jfx11.patch
-    ../backport-ffmpeg-7-support-jfx11.patch
-  ];
-
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg-headless ];
-  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
-
-  dontUseCmakeConfigure = true;
-
-  config = writeText "gradle.properties" ''
-    CONF = Release
-    JDK_HOME = ${jdk.home}
-    COMPILE_MEDIA = ${lib.boolToString withMedia}
-    COMPILE_WEBKIT = ${lib.boolToString withWebKit}
-  '';
-
-  postPatch = ''
-    # Add missing includes for gcc-13 for webkit build:
-    sed -e '1i #include ' \
-      -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \
-         modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
-
-    substituteInPlace modules/javafx.web/src/main/native/Source/JavaScriptCore/offlineasm/parser.rb \
-      --replace-fail "File.exists?" "File.exist?"
-
-    ln -s $config gradle.properties
-  '';
-
-  mitmCache = gradle.fetchDeps {
-    attrPath = "openjfx${major}";
-    pkg = pkgs."openjfx${major}".override { withWebKit = true; };
-    data = ./deps.json;
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  preBuild = ''
-    export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
-    export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
-  '';
-
-  enableParallelBuilding = false;
-
-  gradleBuildTask = "sdk";
-
-  installPhase = ''
-    cp -r build/modular-sdk $out
-  '';
-
-  stripDebugList = [ "." ];
-
-  postFixup = ''
-    # Remove references to bootstrap.
-    export openjdkOutPath='${jdk.outPath}'
-    find "$out" -name \*.so | while read lib; do
-      new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
-      patchelf --set-rpath "$new_refs" "$lib"
-    done
-  '';
-
-  disallowedReferences = [ jdk gradle.jdk ];
-
-  meta = with lib; {
-    homepage = "http://openjdk.java.net/projects/openjfx/";
-    license = licenses.gpl2;
-    description = "Next-generation Java client toolkit";
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix
deleted file mode 100644
index 5266f5d8072f..000000000000
--- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ stdenv, lib, pkgs, fetchFromGitHub, writeText
-, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
-, libXxf86vm, glib, alsa-lib, ffmpeg, python3, ruby
-, withMedia ? true
-, withWebKit ? false
-}:
-
-let
-  pname = "openjfx-modular-sdk";
-  major = "21";
-  update = ".0.3";
-  build = "-ga";
-  repover = "${major}${update}${build}";
-  jdk = openjdk21_headless;
-  gradle = gradle_7;
-
-in stdenv.mkDerivation {
-  inherit pname;
-  version = "${major}${update}${build}";
-
-  src = fetchFromGitHub {
-    owner = "openjdk";
-    repo = "jfx21u";
-    rev = repover;
-    hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=";
-  };
-
-  patches = [
-    ../backport-ffmpeg-7-support-jfx21.patch
-  ];
-
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
-  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
-
-  dontUseCmakeConfigure = true;
-
-  config = writeText "gradle.properties" ''
-    CONF = Release
-    JDK_HOME = ${jdk.home}
-    COMPILE_MEDIA = ${lib.boolToString withMedia}
-    COMPILE_WEBKIT = ${lib.boolToString withWebKit}
-  '';
-
-  postPatch = ''
-    # Add missing includes for gcc-13 for webkit build:
-    sed -e '1i #include ' \
-      -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \
-         modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
-
-    ln -s $config gradle.properties
-  '';
-
-  mitmCache = gradle.fetchDeps {
-    attrPath = "openjfx${major}";
-    pkg = pkgs."openjfx${major}".override { withWebKit = true; };
-    data = ./deps.json;
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  preBuild = ''
-    export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
-    export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
-  '';
-
-  enableParallelBuilding = false;
-
-  gradleBuildTask = "sdk";
-
-  installPhase = ''
-    cp -r build/modular-sdk $out
-  '';
-
-  stripDebugList = [ "." ];
-
-  postFixup = ''
-    # Remove references to bootstrap.
-    export openjdkOutPath='${jdk.outPath}'
-    find "$out" -name \*.so | while read lib; do
-      new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
-      patchelf --set-rpath "$new_refs" "$lib"
-    done
-  '';
-
-  disallowedReferences = [ jdk gradle.jdk ];
-
-  meta = with lib; {
-    homepage = "https://openjdk.org/projects/openjfx/";
-    license = licenses.gpl2Classpath;
-    description = "Next-generation Java client toolkit";
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix
deleted file mode 100644
index 5dde07c2d022..000000000000
--- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ stdenv
-, lib
-, pkgs
-, fetchFromGitHub
-, fetchpatch2
-, writeText
-, openjdk21_headless
-, gradle
-, pkg-config
-, perl
-, cmake
-, gperf
-, gtk2
-, gtk3
-, libXtst
-, libXxf86vm
-, glib
-, alsa-lib
-, ffmpeg
-, python3
-, ruby
-, withMedia ? true
-, withWebKit ? false
-}:
-
-let
-  pname = "openjfx-modular-sdk";
-  major = "22";
-  update = ".0.2";
-  build = "-ga";
-  repover = "${major}${update}${build}";
-  jdk = openjdk21_headless;
-
-in stdenv.mkDerivation {
-  inherit pname;
-  version = "${major}${update}${build}";
-
-  src = fetchFromGitHub {
-    owner = "openjdk";
-    repo = "jfx22u";
-    rev = repover;
-    hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g=";
-  };
-
-  patches = [
-    # 8338701: Provide media support for libavcodec version 61
-    # 
-    (fetchpatch2 {
-      url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1";
-      hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM=";
-    })
-  ];
-
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
-  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
-
-  dontUseCmakeConfigure = true;
-
-  config = writeText "gradle.properties" ''
-    CONF = Release
-    JDK_HOME = ${jdk.home}
-    COMPILE_MEDIA = ${lib.boolToString withMedia}
-    COMPILE_WEBKIT = ${lib.boolToString withWebKit}
-  '';
-
-  postPatch = ''
-    ln -s $config gradle.properties
-  '';
-
-  mitmCache = gradle.fetchDeps {
-    attrPath = "openjfx${major}";
-    pkg = pkgs."openjfx${major}".override { withWebKit = true; };
-    data = ./deps.json;
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  preBuild = ''
-    export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
-    export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
-  '';
-
-  enableParallelBuilding = false;
-
-  gradleBuildTask = "sdk";
-
-  installPhase = ''
-    cp -r build/modular-sdk $out
-  '';
-
-  stripDebugList = [ "." ];
-
-  postFixup = ''
-    # Remove references to bootstrap.
-    export openjdkOutPath='${jdk.outPath}'
-    find "$out" -name \*.so | while read lib; do
-      new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
-      patchelf --set-rpath "$new_refs" "$lib"
-    done
-  '';
-
-  disallowedReferences = [ jdk gradle.jdk ];
-
-  meta = with lib; {
-    homepage = "https://openjdk.org/projects/openjfx/";
-    license = licenses.gpl2Classpath;
-    description = "Next-generation Java client toolkit";
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
deleted file mode 100644
index 459bfce50988..000000000000
--- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-source $stdenv/setup
-
-echo "Unpacking distribution"
-unzip ${src} || true
-
-# set the dynamic linker of unpack200, necessary for construct script
-echo "patching unpack200"
-patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
-
-echo "constructing JDK and JRE installations"
-if test -z "$installjdk"; then
-  sh ${construct} . tmp-linux-jdk tmp-linux-jre
-  mkdir -p $out
-  cp -R tmp-linux-jre/* $out
-else
-  sh ${construct} . $out tmp-linux-jre
-fi
-
-echo "removing files at top level of installation"
-for file in $out/*
-do
-  if test -f $file ; then
-    rm $file
-  fi
-done
-rm -rf $out/docs
-
-# construct the rpath
-rpath=
-for i in $libraries; do
-    rpath=$rpath${rpath:+:}$i/lib
-done
-
-if test -z "$installjdk"; then
-  jrePath=$out
-else
-  jrePath=$out/jre
-fi
-
-if test -n "$jce"; then
-  unzip $jce
-  cp -v jce/*.jar $jrePath/lib/security
-fi
-
-rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
-
-# set all the dynamic linkers
-find $out -type f -perm -0100 \
-    -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-    --set-rpath "$rpath" {} \;
-
-find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
-if test -z "$pluginSupport"; then
-    rm -f $out/bin/javaws
-fi
-
-mkdir $jrePath/lib/$architecture/plugins
-ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins
-
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
deleted file mode 100644
index d03419e96570..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ /dev/null
@@ -1,190 +0,0 @@
-{ productVersion
-, patchVersion
-, sha256
-, jceName
-, sha256JCE
-}:
-
-{ swingSupport ? true
-, lib, stdenv
-, requireFile
-, makeWrapper
-, unzip
-, file
-, xorg ? null
-, installjdk ? true
-, pluginSupport ? true
-, installjce ? false
-, config
-, glib
-, libxml2
-, ffmpeg
-, libxslt
-, libGL
-, freetype
-, fontconfig
-, gtk2
-, pango
-, cairo
-, alsa-lib
-, atk
-, gdk-pixbuf
-, setJavaClassPath
-}:
-
-assert swingSupport -> xorg != null;
-
-let
-
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture = {
-    i686-linux    = "i386";
-    x86_64-linux  = "amd64";
-    armv7l-linux  = "arm";
-    aarch64-linux = "aarch64";
-  }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
-
-  jce =
-    if installjce then
-      requireFile {
-        name = jceName;
-        url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";
-        sha256 = sha256JCE;
-      }
-    else
-      "";
-
-  rSubPaths = [
-    "lib/${architecture}/jli"
-    "lib/${architecture}/server"
-    "lib/${architecture}/xawt"
-    "lib/${architecture}"
-  ];
-
-in
-
-let result = stdenv.mkDerivation rec {
-  pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin";
-  version = "${productVersion}u${patchVersion}";
-
-  src =
-    let
-      platformName = {
-        i686-linux    = "linux-i586";
-        x86_64-linux  = "linux-x64";
-        armv7l-linux  = "linux-arm32-vfp-hflt";
-        aarch64-linux = "linux-aarch64";
-      }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
-    in requireFile {
-      name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
-      url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html";
-      sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
-    };
-
-  nativeBuildInputs = [ file makeWrapper ]
-    ++ lib.optional installjce unzip;
-
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase = ''
-    cd ..
-
-    if test -z "$installjdk"; then
-      mv $sourceRoot/jre $out
-    else
-      mv $sourceRoot $out
-    fi
-
-    shopt -s extglob
-    for file in $out/!(*src.zip)
-    do
-      if test -f $file ; then
-        rm $file
-      fi
-    done
-
-    if test -n "$installjdk"; then
-      for file in $out/jre/*
-      do
-        if test -f $file ; then
-          rm $file
-        fi
-      done
-    fi
-
-    if test -z "$installjdk"; then
-      jrePath=$out
-    else
-      jrePath=$out/jre
-    fi
-
-    if test -n "${jce}"; then
-      unzip ${jce}
-      cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security
-    fi
-
-    if test -z "$pluginSupport"; then
-      rm -f $out/bin/javaws
-      if test -n "$installjdk"; then
-        rm -f $out/jre/bin/javaws
-      fi
-    fi
-
-    mkdir $jrePath/lib/${architecture}/plugins
-    ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
-
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <> $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-  '';
-
-  postFixup = ''
-    rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
-
-    # set all the dynamic linkers
-    find $out -type f -perm -0100 \
-        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$rpath" {} \;
-
-    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
-    # Oracle Java Mission Control needs to know where libgtk-x11 and related is
-    if test -n "$installjdk" -a -x $out/bin/jmc; then
-      wrapProgram "$out/bin/jmc" \
-          --suffix-each LD_LIBRARY_PATH ':' "$rpath"
-    fi
-  '';
-
-  inherit installjdk pluginSupport;
-
-  /**
-   * libXt is only needed on amd64
-   */
-  libraries =
-    [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
-    lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc];
-
-  rpath = lib.strings.makeLibraryPath libraries;
-
-  passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-
-  passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
-
-  passthru.home = result;
-
-  passthru.architecture = architecture;
-
-  meta = with lib; {
-    license = licenses.unfree;
-    platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
-    mainProgram = "java";
-  };
-
-}; in result
diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
deleted file mode 100644
index a232b796a068..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib, stdenv
-, requireFile
-, xorg
-, zlib
-, freetype
-, alsa-lib
-, setJavaClassPath
-}:
-
-let result = stdenv.mkDerivation rec {
-  pname = "oraclejdk";
-  version = "11.0.10";
-
-  src = requireFile {
-    name = "jdk-${version}_linux-x64_bin.tar.gz";
-    url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html";
-    sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2";
-  };
-
-  installPhase = ''
-    mv ../$sourceRoot $out
-
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <> $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-  '';
-
-  postFixup = ''
-    rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}"
-
-    for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
-      patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
-      patchelf --set-rpath   "$rpath"                                    "$f" || true
-    done
-
-    for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
-      if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
-    done
-  '';
-
-  passthru.jre = result;
-  passthru.home = result;
-
-  dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
-
-  meta = with lib; {
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-  };
-}; in result
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
deleted file mode 100644
index 206df75b9ebf..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-import ./jdk-linux-base.nix {
-  productVersion = "8";
-  patchVersion = "281";
-  sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0=";
-  sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY=";
-  sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM=";
-  sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM=";
-  jceName = "jce_policy-8.zip";
-  sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
-}
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 19eec9d5db40..99c0b6a99a25 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-reason";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchurl {
     url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
-    hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4=";
+    hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/compilers/rust/1_81.nix b/pkgs/development/compilers/rust/1_81.nix
deleted file mode 100644
index b433504c8154..000000000000
--- a/pkgs/development/compilers/rust/1_81.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-# New rust versions should first go to staging.
-# Things to check after updating:
-# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
-#    i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
-#    This testing can be also done by other volunteers as part of the pull
-#    request review, in case platforms cannot be covered.
-# 2. The LLVM version used for building should match with rust upstream.
-#    Check the version number in the src/llvm-project git submodule in:
-#    https://github.com/rust-lang/rust/blob//.gitmodules
-# 3. Firefox and Thunderbird should still build on x86_64-linux.
-
-{
-  stdenv,
-  lib,
-  newScope,
-  callPackage,
-  CoreFoundation,
-  Security,
-  SystemConfiguration,
-  pkgsBuildTarget,
-  pkgsBuildBuild,
-  pkgsBuildHost,
-  pkgsTargetTarget,
-  makeRustPlatform,
-  wrapRustcWith,
-  llvmPackages_18,
-  llvm_18,
-  wrapCCWith,
-  overrideCC,
-  fetchpatch,
-}@args:
-let
-  llvmSharedFor =
-    pkgSet:
-    pkgSet.llvmPackages_18.libllvm.override (
-      {
-        enableSharedLibraries = true;
-      }
-      // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
-        # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
-        stdenv = pkgSet.stdenv.override {
-          allowedRequisites = null;
-          cc = pkgSet.llvmPackages_18.clangUseLLVM;
-        };
-      }
-    );
-in
-import ./default.nix
-  {
-    rustcVersion = "1.81.0";
-    rustcSha256 = "hyRI/r3/MuUMPJCn4V+bstsTHRPFiP6QcbDtiIN8z6c=";
-
-    llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
-    llvmSharedForHost = llvmSharedFor pkgsBuildHost;
-    llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
-
-    # For use at runtime
-    llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; };
-
-    # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
-    llvmPackages =
-      if (stdenv.targetPlatform.useLLVM or false) then
-        callPackage (
-          {
-            pkgs,
-            bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
-            bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
-          }:
-          let
-            llvmPackages = llvmPackages_18;
-
-            setStdenv =
-              pkg:
-              pkg.override {
-                stdenv = stdenv.override {
-                  allowedRequisites = null;
-                  cc = llvmPackages.clangUseLLVM;
-                };
-              };
-          in
-          rec {
-            inherit (llvmPackages) bintools;
-
-            libunwind = setStdenv llvmPackages.libunwind;
-            llvm = setStdenv llvmPackages.llvm;
-
-            libcxx = llvmPackages.libcxx.override {
-              stdenv = stdenv.override {
-                allowedRequisites = null;
-                cc = llvmPackages.clangNoLibcxx;
-                hostPlatform = stdenv.hostPlatform // {
-                  useLLVM = !stdenv.hostPlatform.isDarwin;
-                };
-              };
-              inherit libunwind;
-            };
-
-            clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; };
-
-            stdenv = overrideCC args.stdenv clangUseLLVM;
-          }
-        ) { }
-      else
-        llvmPackages_18;
-
-    # Note: the version MUST be one version prior to the version we're
-    # building
-    bootstrapVersion = "1.80.1";
-
-    # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
-    bootstrapHashes = {
-      i686-unknown-linux-gnu = "1bc0ce998dcf070994ad46292637c5c7368f4bdf1cec1a08baa43af74926be54";
-      x86_64-unknown-linux-gnu = "9eedaea9719914a0f4673899aa11693607f25486569913fcca5905ef1da784ec";
-      x86_64-unknown-linux-musl = "5b38cc33ed789e15542ee4cbff6fbb11a61d8946b2b1e9e6843386abed398737";
-      arm-unknown-linux-gnueabihf = "f07a757846bcc74404380312d7dec4342be887da20e1d5101aaa4cc14d222eb4";
-      armv7-unknown-linux-gnueabihf = "1daaf1944f0ba08ae1fcded8698742fdc6ae00027981c5900ea066214137a99d";
-      aarch64-unknown-linux-gnu = "4ae791da82be6e7223f4f6cd477799624481aa1011e17c37753a57d257f89198";
-      aarch64-unknown-linux-musl = "929d85092b64f69196e8fba2c88ce7a11dd6e4ccd583e4e3363591af041c400f";
-      x86_64-apple-darwin = "4fcc0dad8b47066e13877e2839760ef1f40754a90a8fe83ecd4a1f14bf63c71a";
-      aarch64-apple-darwin = "170ea11a424d67bbf16df3a4788e0d844ced00490e44c18c366304db1ef8ca6d";
-      powerpc64le-unknown-linux-gnu = "0eb2b3efc93cad3baf4653357a4a8a2d5a963ae80dbce8955e1bb4f60e02c659";
-      riscv64gc-unknown-linux-gnu = "1c1a70a6a38fb9483d77a330a957ccd436be83d8033a9023fc742ccd8e3ef5ca";
-      s390x-unknown-linux-gnu = "ca7f0ede6ec61c9f8bb5ac239c2fd14c1db3b164c58abc934851186489d247df";
-      x86_64-unknown-freebsd = "d7f4f66c3cc97616bcd37d9f63ed14c3c22c72a467f308453df2f1b128ffe0bc";
-    };
-
-    selectRustPackage = pkgs: pkgs.rust_1_81;
-
-    rustcPatches = [
-      (fetchpatch {
-        name = "fix-fastCross.patch";
-        url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch";
-        excludes = [ "src/bootstrap/src/core/build_steps/dist.rs" ];
-        hash = "sha256-t8tW0eUZVJu6jUaXo41ZoPblNKisdL6ueoNLaf9Vhog=";
-      })
-    ];
-  }
-
-  (
-    builtins.removeAttrs args [
-      "llvmPackages_18"
-      "llvm_18"
-      "wrapCCWith"
-      "overrideCC"
-      "fetchpatch"
-    ]
-  )
diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_82.nix
new file mode 100644
index 000000000000..8e74e8c3a3e6
--- /dev/null
+++ b/pkgs/development/compilers/rust/1_82.nix
@@ -0,0 +1,148 @@
+# New rust versions should first go to staging.
+# Things to check after updating:
+# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
+#    i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
+#    This testing can be also done by other volunteers as part of the pull
+#    request review, in case platforms cannot be covered.
+# 2. The LLVM version used for building should match with rust upstream.
+#    Check the version number in the src/llvm-project git submodule in:
+#    https://github.com/rust-lang/rust/blob//.gitmodules
+# 3. Firefox and Thunderbird should still build on x86_64-linux.
+
+{
+  stdenv,
+  lib,
+  newScope,
+  callPackage,
+  CoreFoundation,
+  Security,
+  SystemConfiguration,
+  pkgsBuildTarget,
+  pkgsBuildBuild,
+  pkgsBuildHost,
+  pkgsHostTarget,
+  pkgsTargetTarget,
+  makeRustPlatform,
+  wrapRustcWith,
+  llvmPackages_18,
+  llvm_18,
+  wrapCCWith,
+  overrideCC,
+  fetchpatch,
+}@args:
+let
+  llvmSharedFor =
+    pkgSet:
+    pkgSet.llvmPackages_18.libllvm.override (
+      {
+        enableSharedLibraries = true;
+      }
+      // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+        # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
+        stdenv = pkgSet.stdenv.override {
+          allowedRequisites = null;
+          cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM;
+        };
+      }
+    );
+in
+import ./default.nix
+  {
+    rustcVersion = "1.82.0";
+    rustcSha256 = "fFP0UJ7aGE4XTvprp9XutYZYVobOjt78eBorEafPUSo=";
+
+    llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
+    llvmSharedForHost = llvmSharedFor pkgsBuildHost;
+    llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
+
+    # For use at runtime
+    llvmShared = llvmSharedFor pkgsHostTarget;
+
+    # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
+    llvmPackages =
+      if (stdenv.targetPlatform.useLLVM or false) then
+        callPackage (
+          {
+            pkgs,
+            bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
+            bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
+          }:
+          let
+            llvmPackages = llvmPackages_18;
+
+            setStdenv =
+              pkg:
+              pkg.override {
+                stdenv = stdenv.override {
+                  allowedRequisites = null;
+                  cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM;
+                };
+              };
+          in
+          rec {
+            inherit (llvmPackages) bintools;
+
+            libunwind = setStdenv llvmPackages.libunwind;
+            llvm = setStdenv llvmPackages.llvm;
+
+            libcxx = llvmPackages.libcxx.override {
+              stdenv = stdenv.override {
+                allowedRequisites = null;
+                cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx;
+                hostPlatform = stdenv.hostPlatform // {
+                  useLLVM = !stdenv.hostPlatform.isDarwin;
+                };
+              };
+              inherit libunwind;
+            };
+
+            clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; };
+
+            stdenv = overrideCC args.stdenv clangUseLLVM;
+          }
+        ) { }
+      else
+        llvmPackages_18;
+
+    # Note: the version MUST be one version prior to the version we're
+    # building
+    bootstrapVersion = "1.81.0";
+
+    # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
+    bootstrapHashes = {
+      i686-unknown-linux-gnu = "0ab6ff2da7218220a2fb6e9538f5582c5d27448e91ff6ea2e296b2aee2b5e2d9";
+      x86_64-unknown-linux-gnu = "4ca7c24e573dae2f382d8d266babfddc307155e1a0a4025f3bc11db58a6cab3e";
+      x86_64-unknown-linux-musl = "2a0829c842425ab316a63adb0d604421be1c4df332388ac26d63aef47e857c12";
+      arm-unknown-linux-gnueabihf = "0da7b4a3b760fa514ba5e1a731fd212f1d082468f118f19e852136a30d2c0253";
+      armv7-unknown-linux-gnueabihf = "5a8d799a09cc605ea3a88dc43bd348bd6335847a0b71ba8e73b40968a0a7bf6f";
+      aarch64-unknown-linux-gnu = "ef4da9c1ecd56bbbb36f42793524cce3062e6a823ae22cb679a945c075c7755b";
+      aarch64-unknown-linux-musl = "fab9a1a69e61326399becab2571381b079ee42f2b648d862b0c3df05004dc864";
+      x86_64-apple-darwin = "f74d8ad24cc3cbfb825da98a08d98319565e4d18ec2c3e9503bf0a33c81ba767";
+      aarch64-apple-darwin = "60a41dea4ae0f4006325745a6400e6fdc3e08ad3f924fac06f04c238cf23f4ec";
+      powerpc64le-unknown-linux-gnu = "bf98b27de08a2fd5a2202a2b621b02bfde2a6fde397df2a735d018aeffcdc5e2";
+      riscv64gc-unknown-linux-gnu = "664e7a50c03848afc86d579a9cbf82cd0b2291a97776f7f81cee9bbf9fc1f648";
+      s390x-unknown-linux-gnu = "e0450ff125cadd3813c7888f5ca42f78e68df13c212b12d5eac3325062632723";
+      x86_64-unknown-freebsd = "b96ebbc043058eedebccd20f1d01e64f2241107665fe2336e6927966d8b9d8d3";
+    };
+
+    selectRustPackage = pkgs: pkgs.rust_1_82;
+
+    rustcPatches = [
+      (fetchpatch {
+        name = "fix-fastCross.patch";
+        url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch";
+        hash = "sha256-lFc48AMoGf4LCP65IsXS5rEB9eYacTP8ADftQkj8zkg=";
+      })
+    ];
+  }
+
+  (
+    builtins.removeAttrs args [
+      "llvmPackages_18"
+      "llvm_18"
+      "wrapCCWith"
+      "overrideCC"
+      "fetchpatch"
+      "pkgsHostTarget"
+    ]
+  )
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index f22add43a6d8..0e999407c9d0 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -172,7 +172,7 @@ in stdenv.mkDerivation (finalAttrs: {
   ] ++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # https://github.com/rust-lang/rust/issues/92173
     "--set rust.jemalloc"
-  ] ++ optionals useLLVM [
+  ] ++ optionals (useLLVM && !stdenv.targetPlatform.isFreeBSD) [
     # https://github.com/NixOS/nixpkgs/issues/311930
     "--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}"
     "--enable-use-libcxx"
@@ -262,7 +262,7 @@ in stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ openssl ]
     ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Security zlib ]
     ++ optional (!withBundledLLVM) llvmShared.lib
-    ++ optional (useLLVM && !withBundledLLVM) [
+    ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [
       llvmPackages.libunwind
       # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
       (runCommandLocal "libunwind-libgcc" {} ''
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index b50928ce05f3..34632bf4b50d 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -16,12 +16,12 @@ let
     };
     # By unofficial and very loose convention we keep the latest version of
     # SBCL, and the previous one in case someone quickly needs to roll back.
-    "2.4.8" = {
-      sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw=";
-    };
     "2.4.9" = {
       sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI=";
     };
+    "2.4.10" = {
+      sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg=";
+    };
   };
   # 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/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index c74ee850f4a5..8e8cf798db4f 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -6,7 +6,7 @@
 , coreutils
 , gnugrep
 , perl
-, ninja
+, ninja_1_11
 , pkg-config
 , clang
 , bintools
@@ -30,38 +30,29 @@
 # Darwin-specific
 , substituteAll
 , fixDarwinDylibNames
-, runCommandLocal
 , xcbuild
 , cctools # libtool
 , sigtool
 , DarwinTools
-, CoreServices
-, Foundation
-, Combine
-, MacOSX-SDK
-, CLTools_Executables
+, apple-sdk_13
+, darwinMinVersionHook
 }:
 
 let
+  apple-sdk_swift = apple-sdk_13; # Use the SDK that was available when Swift shipped.
+
+  deploymentVersion =
+    if lib.versionOlder (targetPlatform.darwinMinVersion or "0") "10.15" then
+      "10.15"
+    else
+      targetPlatform.darwinMinVersion;
+
   python3 = python3Packages.python.withPackages (p: [ p.setuptools ]); # python 3.12 compat.
 
   inherit (stdenv) hostPlatform targetPlatform;
 
   sources = callPackage ../sources.nix { };
 
-  # Tools invoked by swift at run-time.
-  runtimeDeps = lib.optionals stdenv.hostPlatform.isDarwin [
-    # libtool is used for static linking. This is part of cctools, but adding
-    # that as a build input puts an unwrapped linker in PATH, and breaks
-    # builds. This small derivation exposes just libtool.
-    # NOTE: The same applies to swift-driver, but that is currently always
-    # invoked via the old `swift` / `swiftc`. May change in the future.
-    (runCommandLocal "libtool" { } ''
-      mkdir -p $out/bin
-      ln -s ${cctools}/bin/libtool $out/bin/libtool
-    '')
-  ];
-
   # There are apparently multiple naming conventions on Darwin. Swift uses the
   # xcrun naming convention. See `configure_sdk_darwin` calls in CMake files.
   swiftOs = if targetPlatform.isDarwin
@@ -158,7 +149,9 @@ let
     # NOTE: @prog@ needs to be filled elsewhere.
   };
   swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams ''
-    substituteAll '${../wrapper/wrapper.sh}' "$out"
+    # Make empty to avoid adding the SDK’s modules in the bootstrap wrapper. Otherwise, the SDK conflicts with the
+    # shims the wrapper tries to build.
+    darwinMinVersion="" substituteAll '${../wrapper/wrapper.sh}' "$out"
   '';
   makeSwiftcWrapper = writeShellScriptBin "nix-swift-make-swift-wrapper" ''
     set -euo pipefail
@@ -179,15 +172,32 @@ let
     name = "apple-swift-core";
     dontUnpack = true;
 
+    buildInputs = [ apple-sdk_swift ];
+
     installPhase = ''
       mkdir -p $out/lib/swift
       cp -r \
-        "${MacOSX-SDK}/usr/lib/swift/Swift.swiftmodule" \
-        "${MacOSX-SDK}/usr/lib/swift/libswiftCore.tbd" \
+        "$SDKROOT/usr/lib/swift/Swift.swiftmodule" \
+        "$SDKROOT/usr/lib/swift/CoreFoundation.swiftmodule" \
+        "$SDKROOT/usr/lib/swift/Dispatch.swiftmodule" \
+        "$SDKROOT/usr/lib/swift/ObjectiveC.swiftmodule" \
+        "$SDKROOT/usr/lib/swift/libswiftCore.tbd" \
+        "$SDKROOT/usr/lib/swift/libswiftCoreFoundation.tbd" \
+        "$SDKROOT/usr/lib/swift/libswiftDispatch.tbd" \
+        "$SDKROOT/usr/lib/swift/libswiftFoundation.tbd" \
+        "$SDKROOT/usr/lib/swift/libswiftObjectiveC.tbd" \
         $out/lib/swift/
     '';
   };
 
+  # https://github.com/NixOS/nixpkgs/issues/327836
+  # Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions).
+  # Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`.
+  # Until we find out the exact cause, follow [swift upstream][1], pin ninja to version
+  # 1.11.1.
+  # [1]: https://github.com/swiftlang/swift/pull/72989
+  ninja = ninja_1_11;
+
 in stdenv.mkDerivation {
   pname = "swift";
   inherit (sources) version;
@@ -210,6 +220,7 @@ in stdenv.mkDerivation {
       sigtool # codesign
       DarwinTools # sw_vers
       fixDarwinDylibNames
+      cctools.libtool
     ];
 
   buildInputs = [
@@ -222,11 +233,16 @@ in stdenv.mkDerivation {
       libuuid
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreServices
-      Foundation
-      Combine
+      apple-sdk_swift
+      (darwinMinVersionHook deploymentVersion)
     ];
 
+  # Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`.
+  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
+    apple-sdk_swift
+    (darwinMinVersionHook deploymentVersion)
+  ];
+
   # This is a partial reimplementation of our setup hook. Because we reuse
   # the Swift wrapper for the Swift build itself, we need to do some of the
   # same preparation.
@@ -399,9 +415,6 @@ in stdenv.mkDerivation {
     mkdir -p ../build
     cd ../build
     export SWIFT_BUILD_ROOT="$PWD"
-
-    # Most builds set a target, but LLDB doesn't. Harmless on non-Darwin.
-    export MACOSX_DEPLOYMENT_TARGET=10.15
   '';
 
   # These steps are derived from doing a normal build with.
@@ -452,14 +465,10 @@ in stdenv.mkDerivation {
     buildProject llvm llvm-project/llvm
 
     '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Add appleSwiftCore to the search paths. We can't simply add it to
-    # buildInputs, because it is potentially an older stdlib than the one we're
-    # building. We have to remove it again after the main Swift build, or later
-    # build steps may fail. (Specific case: Concurrency backdeploy uses the
-    # Sendable protocol, which appears to not be present in the macOS 11 SDK.)
+    # Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures.
     OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE"
     OLD_NIX_LDFLAGS="$NIX_LDFLAGS"
-    export NIX_SWIFTFLAGS_COMPILE+=" -I ${appleSwiftCore}/lib/swift"
+    export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift"
     export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift"
     '' + ''
 
@@ -491,6 +500,7 @@ in stdenv.mkDerivation {
       -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing
       -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents}
       -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"}
+      -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion}
     "
     buildProject swift
 
@@ -506,12 +516,6 @@ in stdenv.mkDerivation {
     # which requires a special signature.
     #
     # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin.
-    #
-    # NOTE: On Darwin, we only want ncurses in the linker search path, because
-    # headers are part of libsystem. Adding its headers to the search path
-    # causes strange mixing and errors. Note that libedit propagates ncurses,
-    # so we add both manually here, instead of relying on setup hooks.
-    # TODO: Find a better way to prevent this conflict.
     cmakeFlags="
       -GNinja
       -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc
@@ -529,11 +533,11 @@ in stdenv.mkDerivation {
       ${lib.optionalString stdenv.hostPlatform.isDarwin ''
       -DLLDB_USE_SYSTEM_DEBUGSERVER=ON
       ''}
-      -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include
-      -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary}
-      -DCURSES_INCLUDE_DIRS=${if stdenv.hostPlatform.isDarwin then "/var/empty" else ncurses.dev}/include
-      -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary}
-      -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary}
+      -DLibEdit_INCLUDE_DIRS=${lib.getInclude libedit}/include
+      -DLibEdit_LIBRARIES=${lib.getLib libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary}
+      -DCURSES_INCLUDE_DIRS=${lib.getInclude ncurses}/include
+      -DCURSES_LIBRARIES=${lib.getLib ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary}
+      -DPANEL_LIBRARIES=${lib.getLib ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary}
     ";
     buildProject lldb llvm-project/lldb
 
@@ -586,7 +590,7 @@ in stdenv.mkDerivation {
       -DSWIFT_DEST_ROOT=$out
       -DSWIFT_HOST_VARIANT_SDK=OSX
 
-      -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=10.15
+      -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion}
       -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0
       -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0
       -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0
@@ -668,12 +672,6 @@ in stdenv.mkDerivation {
     # just copying the 3 symlinks inside to smaller closures.
     mkdir $lib/lib/swift/clang
     cp -P ${clang}/resource-root/* $lib/lib/swift/clang/
-
-    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Install required library for ObjC interop.
-    # TODO: Is there no source code for this available?
-    cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc
-    ''}
   '';
 
   preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -713,7 +711,10 @@ in stdenv.mkDerivation {
     done
 
     wrapProgram $out/bin/swift-frontend \
-      --prefix PATH : ${lib.makeBinPath runtimeDeps}
+      --prefix PATH : ${lib.makeBinPath [ cctools.libtool ]}
+
+    # Needs to be propagated by the compiler not by its dev output.
+    moveToOutput nix-support/propagated-target-target-deps "$out"
   '';
 
   passthru = {
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 76db695b08c3..3ddd48399b1a 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -5,6 +5,7 @@
 , llvmPackages
 , llvmPackages_15
 , overrideCC
+, overrideLibcxx
 }:
 
 let
@@ -15,7 +16,11 @@ let
     callPackage = newScope self;
 
     # Current versions of Swift on Darwin require macOS SDK 10.15 at least.
-    # Re-export this so we can rely on the minimum Swift SDK elsewhere.
+    # The Swift compiler propagates the 13.3 SDK and a 10.15 deployment target.
+    # Packages that need a newer version can add it to their build inputs
+    # to use it (as normal).
+
+    # This SDK is included for compatibility with existing packages.
     apple_sdk = pkgs.darwin.apple_sdk_11_0;
 
     # Swift builds its own Clang for internal use. We wrap that clang with a
@@ -24,43 +29,24 @@ let
     # we'll often run into compilation errors.
     #
     # The following selects the correct Clang version, matching the version
-    # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`.
-    clang = if pkgs.stdenv.hostPlatform.isDarwin
-      then
-        swiftLlvmPackages.clang.override rec {
-          libc = apple_sdk.Libsystem;
-          bintools = pkgs.bintools.override { inherit libc; };
-          # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the
-          # default Darwin stdenv. Using the default libc++ avoids issues (such as crashes)
-          # that can happen when a Swift application dynamically links different versions
-          # of libc++ and libc++abi than libraries it links are using.
-          inherit (llvmPackages) libcxx;
-        }
-      else
-        swiftLlvmPackages.clang;
+    # used in Swift.
+    inherit (swiftLlvmPackages) clang;
 
     # Overrides that create a useful environment for swift packages, allowing
-    # packaging with `swiftPackages.callPackage`. These are similar to
-    # `apple_sdk_11_0.callPackage`, with our clang on top.
+    # packaging with `swiftPackages.callPackage`.
     inherit (clang) bintools;
-    stdenv = overrideCC pkgs.stdenv clang;
-    darwin = pkgs.darwin.overrideScope (_: prev: {
-      inherit apple_sdk;
-      inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
-      CF = apple_sdk.CoreFoundation // { __attrsFailEvaluation = true; };
-      __attrsFailEvaluation = true;
-    });
-    xcodebuild = pkgs.xcbuild.override {
-      inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
-      inherit stdenv;
-      sdkVer = "10.15";
-    };
-    xcbuild = xcodebuild;
+    stdenv =
+      let
+        stdenv' = overrideCC pkgs.stdenv clang;
+      in
+      # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the
+      # default clang’s stdenv. Using the default libc++ avoids issues (such as crashes)
+      # that can happen when a Swift application dynamically links different versions
+      # of libc++ and libc++abi than libraries it links are using.
+      if stdenv'.cc.libcxx != null then overrideLibcxx stdenv' else stdenv';
 
     swift-unwrapped = callPackage ./compiler {
       inherit (darwin) DarwinTools sigtool;
-      inherit (apple_sdk) MacOSX-SDK CLTools_Executables;
-      inherit (apple_sdk.frameworks) CoreServices Foundation Combine;
     };
 
     swiftNoSwiftDriver = callPackage ./wrapper {
@@ -69,11 +55,11 @@ let
     };
 
     Dispatch = if stdenv.hostPlatform.isDarwin
-      then null # part of libsystem
+      then null # part of apple-sdk
       else callPackage ./libdispatch { swift = swiftNoSwiftDriver; };
 
     Foundation = if stdenv.hostPlatform.isDarwin
-      then apple_sdk.frameworks.Foundation
+      then null # part of apple-sdk
       else callPackage ./foundation { swift = swiftNoSwiftDriver; };
 
     # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of
diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix
index b8d8d2fe7bba..48718527965c 100644
--- a/pkgs/development/compilers/swift/swiftpm/default.nix
+++ b/pkgs/development/compilers/swift/swiftpm/default.nix
@@ -17,6 +17,7 @@
 , makeWrapper
 , DarwinTools # sw_vers
 , cctools # vtool
+, darwinMinVersionHook
 , xcbuild
 , CryptoKit
 , LocalAuthentication
@@ -113,13 +114,6 @@ let
         fi
       '';
 
-    preConfigure = (attrs.preConfigure or "")
-      + ''
-        # Builds often don't set a target, and our default minimum macOS deployment
-        # target on x86_64-darwin is too low. Harmless on non-Darwin.
-        export MACOSX_DEPLOYMENT_TARGET=10.15.4
-      '';
-
     postInstall = (attrs.postInstall or "")
       + lib.optionalString stdenv.hostPlatform.isDarwin ''
         # The install name of libraries is incorrectly set to lib/ (via our
@@ -362,7 +356,7 @@ let
       swift-driver
       swift-system
       swift-tools-support-core
-    ];
+    ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ];
 
     cmakeFlags = [
       "-DUSE_CMAKE_INSTALL=ON"
@@ -392,7 +386,7 @@ in stdenv.mkDerivation (commonAttrs // {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       CryptoKit
       LocalAuthentication
-    ];
+  ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ];
 
   configurePhase = generated.configure + ''
     # Functionality provided by Xcode XCTest, but not available in
@@ -411,9 +405,6 @@ in stdenv.mkDerivation (commonAttrs // {
   '';
 
   buildPhase = ''
-    # Required to link with swift-corelibs-xctest on Darwin.
-    export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12
-
     TERM=dumb swift-build -c release
   '';
 
diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix
index 0c7e0f8cbcf8..2bf8ef60ebf3 100644
--- a/pkgs/development/compilers/swift/wrapper/default.nix
+++ b/pkgs/development/compilers/swift/wrapper/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation (swift._wrapperParams // {
     swiftStaticModuleSubdir swiftStaticLibSubdir;
   swiftDriver = lib.optionalString useSwiftDriver "${swift-driver}/bin/swift-driver";
 
+  env.darwinMinVersion = lib.optionalString stdenv.targetPlatform.isDarwin (
+    stdenv.targetPlatform.darwinMinVersion
+  );
+
   passAsFile = [ "buildCommand" ];
   buildCommand = ''
     mkdir -p $out/bin $out/nix-support
@@ -48,6 +52,13 @@ stdenv.mkDerivation (swift._wrapperParams // {
     ln -s ${swift.lib}/lib $out/lib
 
     substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
+
+    # Propagate any propagated inputs from the unwrapped Swift compiler, if any.
+    if [ -e "$swift/nix-support" ]; then
+      for input in "$swift/nix-support/"*propagated*; do
+        cp "$input" "$out/nix-support/$(basename "$input")"
+      done
+    fi
   '';
 
   passthru = {
diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh
index 5cd5d8da8819..3079bb182b1a 100644
--- a/pkgs/development/compilers/swift/wrapper/wrapper.sh
+++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh
@@ -156,6 +156,14 @@ if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then
     source $cc_wrapper/nix-support/add-flags.sh
 fi
 
+# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set,
+# which is a signal that we're targeting darwin. (Copied from add-flags in libc but tailored for Swift).
+if [ "@darwinMinVersion@" ]; then
+    # Make sure the wrapped Swift compiler can find the overlays in the SDK.
+    NIX_SWIFTFLAGS_COMPILE+=" -I $SDKROOT/usr/lib/swift"
+    NIX_LDFLAGS_@suffixSalt@+=" -L $SDKROOT/usr/lib/swift"
+fi
+
 if [[ "$isCxx" = 1 ]]; then
     if [[ "$cxxInclude" = 1 ]]; then
         NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@"
diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py
index adeca0b73326..a5c5d6f9ffb8 100755
--- a/pkgs/development/compilers/temurin-bin/generate-sources.py
+++ b/pkgs/development/compilers/temurin-bin/generate-sources.py
@@ -6,7 +6,7 @@ import re
 import requests
 import sys
 
-feature_versions = (8, 11, 17, 21, 22)
+feature_versions = (8, 11, 17, 21, 23)
 oses = ("mac", "linux", "alpine-linux")
 types = ("jre", "jdk")
 impls = ("hotspot",)
diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
index 886c92ba2e38..836b282b0e49 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
@@ -69,7 +69,7 @@ let
       sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
       description = "${brand-name}, prebuilt OpenJDK binary";
       platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
-      maintainers = with maintainers; [ taku0 ];
+      maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members;
       inherit knownVulnerabilities;
       mainProgram = "java";
     };
diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
index 6f591a7e86f5..8363905118f8 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
@@ -19,6 +19,6 @@ in
   jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
   jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
 
-  jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; };
-  jre-22 = common { sourcePerArch = sources.jre.openjdk22; };
+  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
+  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
 }
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
index 29cdf778f541..b166d3c0738b 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
@@ -59,7 +59,7 @@ let
       alsa-lib # libasound.so wanted by lib/libjsound.so
       fontconfig
       freetype
-      stdenv.cc.cc.lib # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc) # libstdc++.so.6
       xorg.libX11
       xorg.libXext
       xorg.libXi
@@ -127,7 +127,7 @@ let
       sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
       description = "${brand-name}, prebuilt OpenJDK binary";
       platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
-      maintainers = with maintainers; [ taku0 ];
+      maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members;
       inherit knownVulnerabilities;
       mainProgram = "java";
     };
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix
index e05c5d40ae08..2c633f150fdb 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix
@@ -20,6 +20,6 @@ in
   jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
   jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
 
-  jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; };
-  jre-22 = common { sourcePerArch = sources.jre.openjdk22; };
+  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
+  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
 }
diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json
index 23d7305ea774..9443eb45f401 100644
--- a/pkgs/development/compilers/temurin-bin/sources.json
+++ b/pkgs/development/compilers/temurin-bin/sources.json
@@ -6,102 +6,62 @@
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "b45c467be52fe11ffd9bf69b3a035068134b305053874de4f3b3c5e5e1419659",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
-          }
-        },
-        "openjdk16": {
-          "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"
+            "build": "8",
+            "sha256": "ae988c72eeb2d78bb729a3387601ce0ea84305734ebdbe95d276f39952a8e019",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           }
         },
         "openjdk17": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "839326b5b4b3e4ac2edc3b685c8ab550f9b6d267eddf966323c801cb21e3e018",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          }
-        },
-        "openjdk18": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "1",
-            "sha256": "478c8f56dec7378ed8c687e8d7d0fbf729973c62c497cfc8cf58bd621849d764",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          }
-        },
-        "openjdk19": {
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
             "build": "7",
-            "sha256": "e2d971400ad2db25ad43ea6fa2058b269c0236e3977986dcdee2097da301beb2",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          }
-        },
-        "openjdk20": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
+            "sha256": "6d274a292a717a6f8d00a3ed0695497405c5c634c27fec1692dd13784f6ff6fa",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "9",
-            "sha256": "0f68a9122054149861f6ce9d1b1c176bbe30dd76b36b74c916ba897c12e9d970",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "849c6d5a62a1f3dc2a3d2d7be07ffda089d35b862f6160b2a288c0408c2d8be8",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "8e861638bf6b08c6d5837de6dc929930550928ec5fcc81b9fa7e8296afd0f9c0",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "8fa232fc9de5a861c1a6b0cbdc861d0b0a2bdbdd27da53d991802a460a7f0973",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           }
         },
-        "openjdk22": {
+        "openjdk23": {
           "aarch64": {
-            "build": "8",
-            "sha256": "86a7b47c9277f2fd063ec910616b3676d86553ab7d23aa3bd365e51a57be1dc5",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "7e842c9b8a44a5a21d83a3e38ae3b141cfbdb429dde70ff264d3da4bff44e1c7",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "d226e44b3513942db855df9a8737d848f64069848970d4cfd35ee3c38f2525c1",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_alpine-linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "bff4c78f30d8d173e622bf2f40c36113df47337fc6d1ee5105ed2459841165aa",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           }
         },
         "openjdk8": {
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "409091665e5f8cf678938bbbc0d377122ef8bad7b1c97a0f809da054db956e51",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "525a7731331cad502b9293ccb4ac2b13e85516736e98a57cb27c2767005188e1",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           }
         }
       },
@@ -110,92 +70,62 @@
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "6972a6251bc88d6fbb64a188557cf165f1c415ded550d2a280bbcbc4272caff1",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "0ac795729cc11f47323a71713eac2a5b22d4615fd9b66c8766f964c03fb6e160",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           }
         },
         "openjdk17": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "b5dffd0be08c464d9c3903e2947508c1a5c21804ea1cff5556991a2a47d617d8",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          }
-        },
-        "openjdk18": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "1",
-            "sha256": "ad23309a82e690f769037b1e6417022f588702d214da533289f116bba0f61f4e",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          }
-        },
-        "openjdk19": {
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
             "build": "7",
-            "sha256": "6c0ce0ead2e7ce3e0f06b9578447499c8bd0509306c95fcd81dbecb634228933",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          }
-        },
-        "openjdk20": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
+            "sha256": "63bae276cc322532b451ae7473127c92a75db16cc95473577f133cd09349822a",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "9",
-            "sha256": "54e8618da373258654fe788d509f087d3612de9e080eb6831601069dbc8a4b2b",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "f9410264235861deaf30f97bec80870cf3bc38b1d8e57d897d8bb1f706ae6705",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "b3e7170deab11a7089fe8e14f9f398424fd86db085f745dad212f6cfc4121df6",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "0dfd0ebab44d777f65bceaff7f79e8e0b9deb74a5eb166922483f1864bcf2052",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           }
         },
-        "openjdk22": {
+        "openjdk23": {
           "aarch64": {
-            "build": "8",
-            "sha256": "6cac56dde6793d887deea101cfff283dc5f285e1118c21cbd1c4cb69f1072e55",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "858aa6b255164e535e2fd6cc8dfbf129327a9126ebb9e8f24115c2089efd36f3",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "e7c26ad00e3ded356b8c4b20b184ccf5bd63ccdccabde8d4a892389f178f1d5b",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_alpine-linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "7acbc972b0dd84ca10ec6f192b20e76445a22f4c5558e1657ff393e4868e9343",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_alpine-linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           }
         },
         "openjdk8": {
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "c82962d7378d1fd415db594fce6ec047939e9fab5301fa4407cd7faea9ea7e31",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "9a7a939638b9cdaa8e1a119b8f21bfdd4cb2390b8a47cc27ccf9effc90f4b437",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           }
         }
       }
@@ -204,546 +134,332 @@
       "jdk": {
         "openjdk11": {
           "aarch64": {
-            "build": "9",
-            "sha256": "e00476a7be3c4adfa9b3d55d30768967fd246a8352e518894e183fa444d4d3ce",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "04e21301fedc76841fb03929ac6cacfbbda30b5693acfd515a8f34d4a0cdeb28",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "armv6l": {
-            "build": "9",
-            "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "armv7l": {
-            "build": "9",
-            "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "9",
-            "sha256": "f56068bb64c6bf858894f75c2bc261f54db32932422eb07527f36ae40046e9a0",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "4dfdc498938a159c592a2f094576f09c94999e17327c1f5ff81794694992054d",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "23e47ea7a3015be3240f21185fd902adebdcf76530757c9b482c7eb5bd3417c2",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
-          }
-        },
-        "openjdk16": {
-          "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"
+            "build": "8",
+            "sha256": "0e71a01563a5c7b9988a168b0c4ce720a6dff966b3c27bb29d1ded461ff71d0e",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           }
         },
         "openjdk17": {
           "aarch64": {
-            "build": "9",
-            "sha256": "a900acf3ae56b000afc35468a083b6d6fd695abec87a8abdb02743d5c72f6d6d",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "armv6l": {
-            "build": "9",
-            "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "armv7l": {
-            "build": "9",
-            "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "9",
-            "sha256": "44bdd662c3b832cfe0b808362866b8d7a700dd60e6e39716dee97211d35c230f",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "riscv64": {
             "build": "7",
             "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a",
             "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz",
             "version": "17.0.12"
-          }
-        },
-        "openjdk18": {
-          "aarch64": {
-            "build": "1",
-            "sha256": "262be608e266fd76d7496af83b2832be853c3aaf7460d6a4da198cd40db74553",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "armv6l": {
-            "build": "1",
-            "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "armv7l": {
-            "build": "1",
-            "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "1",
-            "sha256": "030261a2189a8f773fda543a85ab9beb4c430bf81ca5be37cf6cb970b5ccbb03",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "1",
-            "sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          }
-        },
-        "openjdk19": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
           },
           "vmType": "hotspot",
           "x86_64": {
             "build": "7",
-            "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          }
-        },
-        "openjdk20": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "36",
-            "sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
-            "version": "20.0.0"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
+            "sha256": "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "9",
-            "sha256": "7d3ab0e8eba95bd682cfda8041c6cb6fa21e09d0d9131316fd7c96c78969de31",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "9",
-            "sha256": "9a1079d7f0fc72951fdc9a0029e49a15f6ba114683aee626f882ee2c761f1d57",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "riscv64": {
             "build": "7",
             "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da",
             "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz",
             "version": "21.0.4"
-          }
-        },
-        "openjdk22": {
-          "aarch64": {
-            "build": "8",
-            "sha256": "d8488fa1e4e8c1e318cef4c0fc3842a7f15a4cf52b27054663bb94471f54b3fa",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "8",
-            "sha256": "4113606ba65044a3cbd7678e1c0d41881d24a2441c8ab8b658b4ac58da624de5",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "7",
+            "sha256": "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
+          }
+        },
+        "openjdk23": {
+          "aarch64": {
+            "build": "37",
+            "sha256": "e8043d1bd9c4f42c5cf7883aca1fc3ef6bcccf4a664f378818ac0fd4fb987b7e",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
+          },
+          "packageType": "jdk",
+          "powerpc64le": {
+            "build": "37",
+            "sha256": "4d3b0609c783dea1f6a899bfc8c84b4000d1f48f39e2489d70050bbf2c7f7d9c",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           },
           "riscv64": {
-            "build": "9",
-            "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz",
-            "version": "22.0.2"
+            "build": "37",
+            "sha256": "d401699a92469de7bfb72909c1d11019537a0a2c21af01a8dce1831f09ef5165",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_riscv64_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
+          },
+          "vmType": "hotspot",
+          "x86_64": {
+            "build": "37",
+            "sha256": "630c4f3870056e7e005736ec1edc34ee63a9b45e2027582c52f53a9bf44314b8",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           }
         },
         "openjdk8": {
           "aarch64": {
-            "build": "8",
-            "sha256": "3504d748a93f23cac8c060bd33231bd51e90dcb620f38dadc6239b6cd2a5011c",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "af98a839ec238106078bd360af9e405dc6665c05ee837178ed13b92193681923",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "armv6l": {
-            "build": "8",
-            "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "armv7l": {
-            "build": "8",
-            "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "8",
-            "sha256": "6b7ed7996788075e182dd33349288346240fbce540e50fd77aecfc309a5ada19",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "78fbd7b01204cdf90bcb3f9fe6a8e9432bdaa75776fa333aa9cbcb5a79de34cd",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "b9884a96f78543276a6399c3eb8c2fd8a80e6b432ea50e87d3d12d495d1d2808",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "4c6056f6167fae73ace7c3080b78940be5c87d54f5b08894b3517eed1cbb2c06",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           }
         }
       },
       "jre": {
         "openjdk11": {
           "aarch64": {
-            "build": "9",
-            "sha256": "7290ace47a030d89ea023c28e7aa555c9da72b4194f73b39ec9d058011bf06dd",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "armv6l": {
-            "build": "9",
-            "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "armv7l": {
-            "build": "9",
-            "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "9",
-            "sha256": "3b3fbd324620fd914bd8462e292124493fcf846fd69195c4b9a231131dc68d5f",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "8ee351314182df93fbad96139bb74b97814944d66197896e388404a1ecfa06b3",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "786a72296189ba8e43999532aa73730d87ec1fce558eb3c4e98b611b423375e3",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           }
         },
         "openjdk17": {
           "aarch64": {
-            "build": "9",
-            "sha256": "ccfa23c25790475c84df983cc5f729b94c04d9ea9863912deb15c6266782cf16",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "9dfe4c56463690ae67d22268980d8861eb46b907d7914f8f2e6fc7b25778c8ec",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "armv6l": {
-            "build": "9",
-            "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "armv7l": {
-            "build": "9",
-            "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "9",
-            "sha256": "884b5cb817e50010b4d0a3252afb6a80db18995af19bbd16a37348b2c37949bc",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
+            "build": "7",
+            "sha256": "2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "riscv64": {
             "build": "7",
             "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9",
             "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz",
             "version": "17.0.12"
-          }
-        },
-        "openjdk18": {
-          "aarch64": {
-            "build": "1",
-            "sha256": "e11e00438c2f6f79f86ff1ca2b015913b0e16bd9491953a082d5c786402cb50a",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "armv6l": {
-            "build": "1",
-            "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "armv7l": {
-            "build": "1",
-            "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "1",
-            "sha256": "2298504c99b4c15f620f70415215e481766d2b2f784d066206eed8c583922f8f",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "1",
-            "sha256": "74f602ab5abaa554859a5e92a65e5bb6e23c2d4165228299c7f54ed56dbc5959",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_linux_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          }
-        },
-        "openjdk19": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "3653f9e5ad21e4744e5a655e243fba2895651029bee23f3d2366d5debc41a736",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "a30203431c7c21602227d39368c5af6e7abd19000d6da5562de7f3f5c57cbad5",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
           },
           "vmType": "hotspot",
           "x86_64": {
             "build": "7",
-            "sha256": "7386e10c74f00a4382be0540bc0494854804ad79427d8a50ac77a4c7208ff348",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_linux_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          }
-        },
-        "openjdk20": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "36",
-            "sha256": "a1c5a16d5a438ce7da4563cd51ff6778cdf62331c00a3096ab2388a916e076d2",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jre_ppc64le_linux_hotspot_20_36.tar.gz",
-            "version": "20.0.0"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
+            "sha256": "0e8088d7a3a7496faba7ac8787db09dc0264c2bc6f568ea8024fd775a783e13c",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "9",
-            "sha256": "c7c31bc6f5ab4c4b6f4559e11c2fa9541ae6757ab8da6dd85c29163913bd9238",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "9",
-            "sha256": "aa628c6accc9d075b7b0f2bff6487f8ca0b8f057af31842a85fc8b363e1e10f3",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "riscv64": {
             "build": "7",
             "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237",
             "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz",
             "version": "21.0.4"
-          }
-        },
-        "openjdk22": {
-          "aarch64": {
-            "build": "8",
-            "sha256": "8e5996a2bbae2da9797cff5a62cb2080965e08fd66de24673b29a8e481ec769e",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "8",
-            "sha256": "7df4a10fab324181a6c9e8b1e2a45042b8d30490f0fdb937a536f6cd17c907ef",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "7",
+            "sha256": "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
+          }
+        },
+        "openjdk23": {
+          "aarch64": {
+            "build": "37",
+            "sha256": "ec45f4f9a4a98d8a0af24b508ca84a411ea88fac8abb8ad2cfca85cb3902ab5d",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
+          },
+          "packageType": "jre",
+          "powerpc64le": {
+            "build": "37",
+            "sha256": "9120876c35b904ac041c5a021330a6f11d4e6c7537ce28bdbb7170b944673435",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_ppc64le_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           },
           "riscv64": {
-            "build": "9",
-            "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz",
-            "version": "22.0.2"
+            "build": "37",
+            "sha256": "ca32d942ef5357fb948604cd8aea5c597130cf7fdf6ddee267b4aa99406ee471",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_riscv64_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
+          },
+          "vmType": "hotspot",
+          "x86_64": {
+            "build": "37",
+            "sha256": "9c3c3d42ffb2603b328b7154fc9eb449ef87488b3cbeb24a497d46677c7fd44d",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_linux_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           }
         },
         "openjdk8": {
           "aarch64": {
-            "build": "8",
-            "sha256": "17550a6a4ddf71ac81ba8f276467bc58f036c123c0f1bafcafd69f70e3e49cf5",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "8fbefff2c578f73d95118d830347589ddc9aa84510200a5a5001901c2dea4810",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_aarch64_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "armv6l": {
-            "build": "8",
-            "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "armv7l": {
-            "build": "8",
-            "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "8",
-            "sha256": "d3157230c01b320e47ad6df650e83b15f8f76294d0df9f1c03867d07fe2883c9",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "2991edbedee448c0f1edf131beca84b415dac64ea97365b9bfd85bc2f39893bb",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_ppc64le_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "a8d994332a2ff15d48bf04405c3b2f6bd331a928dd96639b15e62891f7172363",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "0ac516cc1eadffb4cd3cfc9736a33d58ea6a396bf85729036c973482f7c063d9",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_linux_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           }
         }
       }
@@ -752,258 +468,152 @@
       "jdk": {
         "openjdk11": {
           "aarch64": {
-            "build": "9",
-            "sha256": "49122443bdeab2c9f468bd400f58f85a9ea462846faa79084fd6fd786d9b492d",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "8bcbb98e293fb3c4d5cae3539f240ed478fae85962311fccd4c628ebad3a90e4",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "4dbd21d9a0311d321f5886eda50c3086026ed61d02e1a85f7b8c2e9ad557bf03",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
-          }
-        },
-        "openjdk16": {
-          "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"
+            "build": "8",
+            "sha256": "07a1be21f45f0951db05516e57602c414295c51a920f7e9b6ddeaa325d619b28",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           }
         },
         "openjdk17": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "09a162c58dd801f7cfacd87e99703ed11fb439adc71cfa14ceb2d3194eaca01c",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "f8b96724618f4df557c47f11048d1084e98ed3eb87f0dbd5b84f768a80c3348e",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          }
-        },
-        "openjdk18": {
-          "aarch64": {
-            "build": "1",
-            "sha256": "c5ec423f52d8f3aa632941f29fd289f2e31dce5fe6f3abed9b72bd374f54cd41",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "1",
-            "sha256": "2ed916b0c9d197a6bf71b76e84d94125023c2609e0a9b22c64553eff5c9c29c1",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_mac_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          }
-        },
-        "openjdk19": {
           "aarch64": {
             "build": "7",
-            "sha256": "c419330cc8d6b9974d3bf1937f8f0e747c34c469afd5c546831d35aa19e03d49",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
+            "sha256": "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
             "build": "7",
-            "sha256": "f59d4157b3b53a35e72db283659d47f14aecae0ff5936d5f8078000504299da6",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          }
-        },
-        "openjdk20": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
+            "sha256": "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "9",
-            "sha256": "b6be6a9568be83695ec6b7cb977f4902f7be47d74494c290bc2a5c3c951e254f",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "dcf69a21601d9b1b25454bbad4f0f32784bb42cdbe4063492e15a851b74cb61e",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "f777103aab94330d14a29bd99f3a26d60abbab8e2c375cec9602746096721a7c",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_mac_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "e368e5de7111aa88e6bbabeff6f4c040772b57fb279cc4e197b51654085bbc18",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           }
         },
-        "openjdk22": {
+        "openjdk23": {
           "aarch64": {
-            "build": "8",
-            "sha256": "80d6fa75e87280202ae7660139870fe50f07fca9dc6c4fbd3f2837cbd70ec902",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "411934ca9ede95671afc1e7e1d9c8912c43247c7e4fba97730f20c0875287d44",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_mac_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "9445952d4487451af024a9a3f56373df76fbd928d9ff9186988aa27be2e4f10c",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_mac_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "0b4b14f7cb44cab89083fb72beafa6d4f12ee6722bf682e5dd026dab12cc8d23",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_mac_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           }
         },
         "openjdk8": {
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "fd62491f7634c1cbed7557d6b21db7ef4818fbc0e63e678110d9d92cbea4ad8c",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "14e93cac142c4e7734aab53d1e9f44ef2851cf1cc4657918abccdf99e78c8bad",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           }
         }
       },
       "jre": {
         "openjdk11": {
           "aarch64": {
-            "build": "9",
-            "sha256": "8ecc59f0bda845717cecbc6025c4c7fcc26d6ffe48824b8f7a5db024216c5fb4",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "809c13c1c3abefe09c8396b18d6dd64837f30bf7bda7cbe317c6567bcd161d7a",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "9855769dddc3f3b5a1fb530ce953025b1f7b3fac861628849b417676b1310b1f",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.23_9.tar.gz",
-            "version": "11.0.23"
+            "build": "8",
+            "sha256": "764d30489541ae088d2d0a75d46524ec35797dcdbe4a11b6bfbaee7957d8f77e",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.24_8.tar.gz",
+            "version": "11.0.24"
           }
         },
         "openjdk17": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "003d3e0a65a2f0633b8bfed42be133724b490acb323c174c708d3a446d5fc660",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "232c40bebd6ddbb673862e86e7e6e09bcfe399e5a53c8a6b77bf1ceab8edefd0",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.11_9.tar.gz",
-            "version": "17.0.11"
-          }
-        },
-        "openjdk18": {
-          "aarch64": {
-            "build": "1",
-            "sha256": "071f073efb9550838bc02e429ef972f9450b477360f803dd1cf19096ca41182e",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_mac_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "1",
-            "sha256": "3629e3dc9dbab7ed13070fbea3a827030acdd62afa557496e88a6d01f9300474",
-            "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_mac_hotspot_18.0.2.1_1.tar.gz",
-            "version": "18.0.2"
-          }
-        },
-        "openjdk19": {
           "aarch64": {
             "build": "7",
-            "sha256": "1cd53e60478912fe5f2095313821e90c4926e74ff60a4aa9d99fc2ec912411c1",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
+            "sha256": "5c1cb2cbd2ef3f2b529e2733d0ab55381e10c4c3607f4d62f2bf12f0942198bf",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
             "build": "7",
-            "sha256": "33a37be7a5d7a6003595eeee6d09e47abfa1a1065a4da9a6f592b4b09cfcea19",
-            "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_mac_hotspot_19.0.2_7.tar.gz",
-            "version": "19.0.2"
-          }
-        },
-        "openjdk20": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "81b475ab029ab224b2c711ccdfa9c25e0300539faad342a4ceefd33772fb38b4",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "565d62faac325c098670705fb26a5cc3d4af0a25e86444ddd643f779ad2a3417",
-            "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.2_9.tar.gz",
-            "version": "20.0.2"
+            "sha256": "331aceddc402263c5e47529234965927573ead684ea2b7a0358fbb6c279c1510",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.12_7.tar.gz",
+            "version": "17.0.12"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "9",
-            "sha256": "8df56361b834c4681ef304ae9dc8406ce3d79c8572d2d6c2fefcbea55be7d86b",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "14b39c00ec0ec6e0c465f784261449d0a1c4256b3b15c63c222397ccb31758aa",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "9",
-            "sha256": "d7fc89c196ed03deb8a98f6599e1b2e78859ec8ec752142549cd3710f3e1a025",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.3_9.tar.gz",
-            "version": "21.0.3"
+            "build": "7",
+            "sha256": "f67f17413d012672da11163dd73600e0d92eef6f6ff27c6ae25523bd9df74222",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz",
+            "version": "21.0.4"
           }
         },
-        "openjdk22": {
+        "openjdk23": {
           "aarch64": {
-            "build": "8",
-            "sha256": "73a8a0270534db7b4760399f41c573fd1cff5f86f4e68b08988afee0df814889",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_mac_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "2c96b006080906951fb0ddae8e23ca3ef2bd327b77cac84b4302b8d84c7014f5",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_mac_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "d21e84edc1d7cc58fc04bcd9a214b71bf85e8ea348f8659197be3383afcb2b9a",
-            "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_mac_hotspot_22.0.1_8.tar.gz",
-            "version": "22.0.1"
+            "build": "37",
+            "sha256": "1f41755494c45a8a88dfed926251f478544c0e51a71a011314fc282e915f804f",
+            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_mac_hotspot_23_37.tar.gz",
+            "version": "23.0.0"
           }
         },
         "openjdk8": {
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "8",
-            "sha256": "1237e4f4238211d9137eec838e5d7cabdc9d93d41001cf41f6de3a4eb90884ef",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_mac_hotspot_8u412b08.tar.gz",
-            "version": "8.0.412"
+            "build": "5",
+            "sha256": "814a1e262c10cb3f056adbdb20396564fe9ea0f039a863bae6b648f7680b30cc",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jre_x64_mac_hotspot_8u422b05.tar.gz",
+            "version": "8.0.422"
           }
         }
       }
diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix
index 386322780cca..339a2abb7fa5 100644
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/pkgs/development/compilers/tinygo/default.nix
@@ -28,13 +28,13 @@ in
 
 buildGoModule rec {
   pname = "tinygo";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "tinygo-org";
     repo = "tinygo";
     rev = "v${version}";
-    hash = "sha256-YqjMk7EF/fyOhsMLcG56FGHfOZSdaFhUbiiHk+SXajY=";
+    hash = "sha256-jntixwHGg9buWQuu9I47DHUxK1xJbDRHxRMEwKoOhHo=";
     fetchSubmodules = true;
     # The public hydra server on `hydra.nixos.org` is configured with
     # `max_output_size` of 3GB. The purpose of this `postFetch` step
@@ -45,7 +45,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-cTqrvh0w3KQg3P1lCfAez0kqAMBJHQbqS3sx8uqGvEs=";
+  vendorHash = "sha256-aY1gX++Dc5/G6VFXnP7sBdekk2IKHlenOC0erlB/Quw=";
 
   patches = [
     ./0001-GNUmakefile.patch
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
deleted file mode 100644
index ea5582375abd..000000000000
--- a/pkgs/development/compilers/z88dk/default.nix
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  stdenv,
-  unzip,
-  libxml2,
-  gmp,
-  m4,
-  uthash,
-  which,
-  pkg-config,
-  perl,
-  perlPackages,
-  fetchurl,
-}:
-
-let
-  # Perl packages used by this project.
-  # TODO: put these into global perl-packages.nix once this is submitted.
-  ObjectTinyRW = perlPackages.buildPerlPackage {
-    pname = "Object-Tiny-RW";
-    version = "1.07";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz";
-      hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs=";
-    };
-    meta = {
-      description = "A date object with as little code as possible (and rw accessors)";
-      license = with lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
-
-  IteratorSimple = perlPackages.buildPerlPackage {
-    pname = "Iterator-Simple";
-    version = "0.07";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz";
-      hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q=";
-    };
-    meta = {
-      description = "Simple iterator and utilities";
-      license = with lib.licenses; [ artistic1 gpl2Only ];
-    };
-  };
-
-  IteratorSimpleLookahead = perlPackages.buildPerlPackage {
-    pname = "Iterator-Simple-Lookahead";
-    version = "0.09";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz";
-      hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw=";
-    };
-    propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [
-      ClassAccessor
-    ]);
-    meta = {
-      description = "Simple iterator with lookahead and unget";
-      license = with lib.licenses; [ artistic1 gpl2Only ];
-    };
-  };
-
-  AsmPreproc = perlPackages.buildPerlPackage {
-    pname = "Asm-Preproc";
-    version = "1.03";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz";
-      hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M=";
-    };
-    propagatedBuildInputs = [
-        IteratorSimple
-        IteratorSimpleLookahead
-      ] ++ (with perlPackages; [
-        TextTemplate
-        DataDump
-        FileSlurp
-      ]);
-    meta = {
-      description = "Preprocessor to be called from an assembler";
-      license = with lib.licenses; [ artistic1 gpl2Only ];
-    };
-  };
-
-  CPUZ80Assembler = perlPackages.buildPerlPackage {
-    pname = "CPU-Z80-Assembler";
-    version = "2.25";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz";
-      hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU=";
-    };
-    buildInputs = [ AsmPreproc ] ++ (with perlPackages; [
-        CaptureTiny
-        RegexpTrie
-        PathTiny
-        ClassAccessor
-      ]);
-    meta = {
-      description = "Functions to assemble a set of Z80 assembly instructions";
-      license = with lib.licenses; [ artistic1 gpl2Only ];
-    };
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "z88dk";
-  version = "2.3";
-
-  src = fetchFromGitHub {
-    owner = "z88dk";
-    repo = "z88dk";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44=";
-    fetchSubmodules = true;
-  };
-
-  postPatch = ''
-    # we dont rely on build.sh :
-    export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite
-    export ZCCCFG=$PWD/lib/config/
-
-    # we don't want to build zsdcc since it required network (svn)
-    # we test in checkPhase
-    substituteInPlace Makefile \
-      --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
-      --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
-
-    # rc2014.lib not created, making corresponding tests fail. Comment out.
-    substituteInPlace  test/suites/make.config \
-      --replace 'zcc +rc2014'            '#zcc +rc2014' \
-      --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000'
-
-    # The following tests don't pass.
-    rm src/z80asm/t/issue_0341.t
-    rm src/z80asm/t/z80asm_lib.t
-  '';
-
-  # Parallel building is not working yet with the upstream Makefiles.
-  # Explicitly switch this off for now.
-  enableParallelBuilding = false;
-
-  doCheck = true;
-  checkPhase = ''
-    # Need to build libs first, Makefile deps not fully defined
-    make libs      $makeFlags
-    make testsuite $makeFlags
-    make -k test   $makeFlags
-  '';
-
-  short_rev = builtins.substring 0 7 finalAttrs.src.rev;
-  makeFlags = [
-    "git_rev=${finalAttrs.short_rev}"
-    "version=${finalAttrs.version}"
-    "PREFIX=$(out)"
-    "git_count=0"
-  ];
-
-  nativeBuildInputs = [
-    which
-    unzip
-    m4
-    perl
-    pkg-config
-
-    # Local perl packages
-    AsmPreproc
-    CPUZ80Assembler
-    ObjectTinyRW
-  ] ++ (with perlPackages; [
-    CaptureTiny
-    DataHexDump
-    ModernPerl
-    PathTiny
-    RegexpCommon
-    TestHexDifferences
-    TextDiff
-    RegexpTrie
-  ]);
-
-  buildInputs = [
-    libxml2
-    uthash
-    gmp
-  ];
-
-  preInstall = ''
-    mkdir -p $out/{bin,share}
-  '';
-
-  installTargets = [
-    "libs"
-    "install"
-  ];
-
-  meta = with lib; {
-    homepage = "https://www.z88dk.org";
-    description = "z80 Development Kit";
-    license = licenses.clArtistic;
-    maintainers = [ maintainers.siraben ];
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix
index afe33634820c..ce4d15629b81 100644
--- a/pkgs/development/compilers/zulu/11.nix
+++ b/pkgs/development/compilers/zulu/11.nix
@@ -8,35 +8,35 @@ callPackage ./common.nix ({
   # Note that the latest build may differ by platform
   dists = {
     x86_64-linux = {
-      zuluVersion = "11.70.15";
-      jdkVersion = "11.0.22";
+      zuluVersion = "11.74.15";
+      jdkVersion = "11.0.24";
       hash =
-        if enableJavaFX then "sha256-FxTHgng7/oDY3n3qy8j1ztbpBQeoGcEBJbEXqaE4Zr4="
-        else "sha256-V41ZRrJtkle3joKhwoID5bvWkN5I4gFjmbEnTD7no8U=";
+        if enableJavaFX then "sha256-eP2BCD77uRmukd48+pDlIlhos9RjL9VYx8tpQdq2uNo="
+        else "sha256-p6rA5pqZv2Sho+yW8IFJrAaaW72q766SLuOnRl/ZGLM=";
     };
 
     aarch64-linux = {
-      zuluVersion = "11.70.15";
-      jdkVersion = "11.0.22";
+      zuluVersion = "11.74.15";
+      jdkVersion = "11.0.24";
       hash =
-        if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
-        else "sha256-u6XWMXAArUhMMb6j3KFOhkIxpVYR1oYLF0Wde7/tI0k=";
+        if enableJavaFX then "sha256-nAUjPk9gktO0UJk7gAKygq+ztSJY5wk+EoG1LgJidJ8="
+        else "sha256-T0c+YwfEZcA3iJmBriyzxBM2SECcczG25XVApIlgM+E=";
     };
 
     x86_64-darwin = {
-      zuluVersion = "11.70.15";
-      jdkVersion = "11.0.22";
+      zuluVersion = "11.74.15";
+      jdkVersion = "11.0.24";
       hash =
-        if enableJavaFX then "sha256-JkJZwk+D28wHWqwUoLo7WW5ypwTrT5biSoP+70YI3eQ="
-        else "sha256-ca/ttkPe2tbcm1ruguDgPsxKWbEdKcICsKCDXaup9N4=";
+        if enableJavaFX then "sha256-hanQw2FWbqsmGR1WixbM0BNWGeXmS2vt9tbaaEY7D1c="
+        else "sha256-CH6pVui0PInHMt+AJOE0T2hrAmEcLFRJvmR4KZuanaw=";
     };
 
     aarch64-darwin = {
-      zuluVersion = "11.70.15";
-      jdkVersion = "11.0.22";
+      zuluVersion = "11.74.15";
+      jdkVersion = "11.0.24";
       hash =
-        if enableJavaFX then "sha256-bAgH4lCxPvvFOeif5gI2aoLt1aC4EXPzb2YmiS9bQsU="
-        else "sha256-PWQOF+P9djZarjAJaE3I0tuI1E4H/9584VN04BMzmvM=";
+        if enableJavaFX then "sha256-WbzpfPgoT3CTazKBnI1Fg+q+YQP6MwCWkon6VOeLZsA="
+        else "sha256-+KxFgHbBDxN1O3NCAzqqBztxXveYAjrPFVuoFL/2dRQ=";
     };
   };
 } // builtins.removeAttrs args [ "callPackage" ])
diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix
index 74e00df88c68..3e94e824d55d 100644
--- a/pkgs/development/compilers/zulu/17.nix
+++ b/pkgs/development/compilers/zulu/17.nix
@@ -8,35 +8,35 @@ callPackage ./common.nix ({
   # Note that the latest build may differ by platform
   dists = {
     x86_64-linux = {
-      zuluVersion = "17.48.15";
-      jdkVersion = "17.0.10";
+      zuluVersion = "17.52.17";
+      jdkVersion = "17.0.12";
       hash =
-        if enableJavaFX then "sha256-YvuD/n84+DARPm+38TxIUB727SIhASFo+WX9+PtJqyw="
-        else "sha256-VyhNob2G1Tq/WCKT0g0Y//f+JD2hWgj6QU9idfvUj+I=";
+        if enableJavaFX then "sha256-qKpkvk7/IEnlOJoy7An0AVGUXWkWeuuiQzqKKE/+Ec4="
+        else "sha256-JCRcjQzkkV2G5wsoi13psbTHjxCtuw5rqT4pEAOarRk=";
     };
 
     aarch64-linux = {
-      zuluVersion = "17.48.15";
-      jdkVersion = "17.0.10";
+      zuluVersion = "17.52.17";
+      jdkVersion = "17.0.12";
       hash =
-        if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
-        else "sha256-9OZl8ruaLvjdpg42fC3IM5mC/9lmshCppNfUuz/Sf8E=";
+        if enableJavaFX then "sha256-mpTM/43oyDsOnoZM8AW1Z7EFTznnPAnYoC+T6csc8Fw="
+        else "sha256-uIz2D5WjqySy5lobuvWp3kFTGsBKhXzT56QgCGyXwSY=";
     };
 
     x86_64-darwin = {
-      zuluVersion = "17.48.15";
-      jdkVersion = "17.0.10";
+      zuluVersion = "17.52.17";
+      jdkVersion = "17.0.12";
       hash =
-        if enableJavaFX then "sha256-VOIcFtjQiYsA4AiP1TCa0Q76Ew5FdeJCICwsYGU+Dnw="
-        else "sha256-huSKGvOnrEUAiE2MJbdHWtF2saeLGaQkZllXzDo8o+g=";
+        if enableJavaFX then "sha256-jb1oPmRzlYUMONovdsHowlC44X3/PFZ8KilxSsR924U="
+        else "sha256-8VlGFUhCn3NE2A42xi69KzZqu0RoGOV1ZYj8oaqCnTc=";
     };
 
     aarch64-darwin = {
-      zuluVersion = "17.48.15";
-      jdkVersion = "17.0.10";
+      zuluVersion = "17.52.17";
+      jdkVersion = "17.0.12";
       hash =
-        if enableJavaFX then "sha256-fxBDhHMeL5IP4eRw9ykXrRRh7Nl9DnvDB1YLaQwFHLg="
-        else "sha256-kuEiHSkb4WFtPB3m0A968LPZw7Wl0sKquhbzDF8vQS8=";
+        if enableJavaFX then "sha256-rEILTKTpX8DEoOGhlrhbxpcCyF2+QrjW92h0ox9ezp0="
+        else "sha256-RZ3hNQQFE+spTT9lFHLjmkolSkpHDg2Hvro6xi7uNww=";
     };
   };
 } // builtins.removeAttrs args [ "callPackage" ])
diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix
index db2d3a397871..9e86e0bc748b 100644
--- a/pkgs/development/compilers/zulu/21.nix
+++ b/pkgs/development/compilers/zulu/21.nix
@@ -8,35 +8,35 @@ callPackage ./common.nix ({
   # Note that the latest build may differ by platform
   dists = {
     x86_64-linux = {
-      zuluVersion = "21.32.17";
-      jdkVersion = "21.0.2";
+      zuluVersion = "21.36.17";
+      jdkVersion = "21.0.4";
       hash =
-        if enableJavaFX then "sha256-CEM2lMjyZLWS1tBcS1tBTUxBwAyzW3vrpRWFVVSFVGY="
-        else "sha256-Wtcw++5rtJv/8QvznoQ5LnKNiRA9NHSn5d7w/RNLMAo=";
+        if enableJavaFX then "sha256-Q2bdM0/a2t5aBRCIzXBlhXamf8N7wdSUsK5VhaU9DcY="
+        else "sha256-MY0MLtPIdvt+oslSlFzc997PtSZMpRrs4VnmNaxT1UQ=";
     };
 
     aarch64-linux = {
-      zuluVersion = "21.32.17";
-      jdkVersion = "21.0.2";
+      zuluVersion = "21.36.17";
+      jdkVersion = "21.0.4";
       hash =
-        if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
-        else "sha256-zn3xr11EqfRVYXxLiJFEP74+Syacd32Lgu1m93Fnz+A=";
+        if enableJavaFX then "sha256-BzNEcDrQo5yOWnEsJxw9JfXYdZGN6/wxnTDB0qC1i/0="
+        else "sha256-2jwtfbM2cLz2ZTJEGut/M9zw0ifI2v5841zuZ/aCnEw=";
     };
 
     x86_64-darwin = {
-      zuluVersion = "21.32.17";
-      jdkVersion = "21.0.2";
+      zuluVersion = "21.36.17";
+      jdkVersion = "21.0.4";
       hash =
-        if enableJavaFX then "sha256-CbEKa9Z/ItFqVM4BqsWXyRf5ejQZXPK8OqkULr9Cpqk="
-        else "sha256-Otj+KI61fZdcJ4auRToDaqRuR6sqw9gVOOuuKlTTwCU=";
+        if enableJavaFX then "sha256-H3gM2XCCcuUxlAEzX6IO7Cp6NtH85PYHlH54k5XvNAc="
+        else "sha256-XOdaaiR8cCm3TEynz29g/SstaM4eiVb7RI0phDFrX+o=";
     };
 
     aarch64-darwin = {
-      zuluVersion = "21.32.17";
-      jdkVersion = "21.0.2";
+      zuluVersion = "21.36.17";
+      jdkVersion = "21.0.4";
       hash =
-        if enableJavaFX then "sha256-PK+cafgQsnK6acuQxun4IUiyYHQJsBfUawwfGV8OCfQ="
-        else "sha256-6CYFFt6LYGYUIqcl8d8sNu+Ij2+zU5NWawDnMl2z0E4=";
+        if enableJavaFX then "sha256-lLAb8MABo95A5WcayBLNvsBSdVFptnO4EmhX2gjo6r8="
+        else "sha256-vCdQ+BoWbMbpwwroqrpU8lOoyOydjPwEpVX+IHEse/8=";
     };
   };
 } // builtins.removeAttrs args [ "callPackage" ])
diff --git a/pkgs/development/compilers/zulu/22.nix b/pkgs/development/compilers/zulu/22.nix
deleted file mode 100644
index 93891d6511c7..000000000000
--- a/pkgs/development/compilers/zulu/22.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ callPackage
-, enableJavaFX ? false
-, ...
-}@args:
-
-callPackage ./common.nix ({
-  # Details from https://www.azul.com/downloads/?version=java-22-lts&package=jdk
-  # Note that the latest build may differ by platform
-  dists = {
-    x86_64-linux = {
-      zuluVersion = "22.28.91";
-      jdkVersion = "22.0.0";
-      hash =
-        if enableJavaFX then "sha256-+qUrZ+GlspSP3RLTAbgEtFm0B0fzX/VD1WUl6mk2c/0="
-        else "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ=";
-    };
-
-    aarch64-linux = {
-      zuluVersion = "22.28.91";
-      jdkVersion = "22.0.0";
-      hash =
-        if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
-        else "sha256-3RLNNEbMk5wAZsQmbQj/jpx9iTL/yr9N3wL4t7m6c+s=";
-    };
-
-    x86_64-darwin = {
-      zuluVersion = "22.28.91";
-      jdkVersion = "22.0.0";
-      hash =
-        if enableJavaFX then "sha256-QkFwbc2YFEWb5rddhH4a+zmtsrXxUBSuS8yg9qUb728="
-        else "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw=";
-    };
-
-    aarch64-darwin = {
-      zuluVersion = "22.28.91";
-      jdkVersion = "22.0.0";
-      hash =
-        if enableJavaFX then "sha256-256UP6MtUReQYqCKVt0ThN9BVDyKLAMXQTdpcDB9t24="
-        else "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0=";
-    };
-  };
-} // builtins.removeAttrs args [ "callPackage" ])
diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix
new file mode 100644
index 000000000000..3208944f981f
--- /dev/null
+++ b/pkgs/development/compilers/zulu/23.nix
@@ -0,0 +1,42 @@
+{ callPackage
+, enableJavaFX ? false
+, ...
+}@args:
+
+callPackage ./common.nix ({
+  # Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk
+  # Note that the latest build may differ by platform
+  dists = {
+    x86_64-linux = {
+      zuluVersion = "23.28.85";
+      jdkVersion = "23.0.0";
+      hash =
+        if enableJavaFX then "sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA="
+        else "sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA=";
+    };
+
+    aarch64-linux = {
+      zuluVersion = "23.28.85";
+      jdkVersion = "23.0.0";
+      hash =
+        if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
+        else "sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M=";
+    };
+
+    x86_64-darwin = {
+      zuluVersion = "23.28.85";
+      jdkVersion = "23.0.0";
+      hash =
+        if enableJavaFX then "sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4="
+        else "sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw=";
+    };
+
+    aarch64-darwin = {
+      zuluVersion = "23.28.85";
+      jdkVersion = "23.0.0";
+      hash =
+        if enableJavaFX then "sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ="
+        else "sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc=";
+    };
+  };
+} // builtins.removeAttrs args [ "callPackage" ])
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index 05411149da68..175519bb8ab4 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -8,35 +8,35 @@ callPackage ./common.nix ({
   # Note that the latest build may differ by platform
   dists = {
     x86_64-linux = {
-      zuluVersion = "8.76.0.17";
-      jdkVersion = "8.0.402";
+      zuluVersion = "8.80.0.17";
+      jdkVersion = "8.0.422";
       hash =
-        if enableJavaFX then "sha256-29aDAu8WVYQFSpMUFq4gG64BBz/ei/VDMg72xrpB9w4="
-        else "sha256-34DI6O7T8iqDHsX63S3xk+BKDu8IHRRWNvtxpsnUJEk=";
+        if enableJavaFX then "sha256-Ls2sHCtP9htBIDwq5fNDRA3/bGN0bzaMp6nNkjU1zx8="
+        else "sha256-YNxnNOFvTc0S3jt4F3UREi2196W7wSBmwieNJl7qamo=";
     };
 
     aarch64-linux = {
-      zuluVersion = "8.74.0.17";
-      jdkVersion = "8.0.392";
+      zuluVersion = "8.80.0.17";
+      jdkVersion = "8.0.422";
       hash =
-        if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
-        else "sha256-xESdKEmfkiE657X/xclwsJR5M+P72BpWErtAcYMcK0Y=";
+        if enableJavaFX then "sha256-aVBleFrj4OpUJh82rM8XQGy9SzGqjaeOBo20nAbtpJo="
+        else "sha256-C5ebWtKAyKexOuEf4yM1y5tQZ2ICxREObwvMrcz5TXE=";
     };
 
     x86_64-darwin = {
-      zuluVersion = "8.76.0.17";
-      jdkVersion = "8.0.402";
+      zuluVersion = "8.80.0.17";
+      jdkVersion = "8.0.422";
       hash =
-        if enableJavaFX then "sha256-oqFpKeWwfiXr3oX78LGvAyDGAAS2GON2gAm6fHGH7Ow="
-        else "sha256-edZqDEsydQCDEwC1ZCDF/MjWVTnuQNWcKR2k/RjaIEI=";
+        if enableJavaFX then "sha256-7NB0OH194nZdpIGyX8gLxJzjJdi2UIxmGsGI5M0yqJ4="
+        else "sha256-vyB1Fepnpwsi9KjwFjEF+YbiCgmqZcirZu0zmRAp8PA=";
     };
 
     aarch64-darwin = {
-      zuluVersion = "8.76.0.17";
-      jdkVersion = "8.0.402";
+      zuluVersion = "8.80.0.17";
+      jdkVersion = "8.0.422";
       hash =
-        if enableJavaFX then "sha256-UCWRXCz4v381IWzWPDYzwJwbhsmZOYxKPLGJBQGjPmc="
-        else "sha256-0VPlOuNB39gDnU+pK0DGTSUjTHTtYoxaRg3YD2LyLXg=";
+        if enableJavaFX then "sha256-JuQkY923tizx5HQo4WC3YCk75a4qHJYNRFKpZ8XES58="
+        else "sha256-Q/hU2ICVwmJehrXmACm4/X48ULTqM6WSc55JDVgkBvM=";
     };
   };
 } // builtins.removeAttrs args [ "callPackage" ])
diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix
index f1d0f43325f4..6b20c71c5438 100644
--- a/pkgs/development/compilers/zulu/common.nix
+++ b/pkgs/development/compilers/zulu/common.nix
@@ -155,15 +155,16 @@ let
       home = jdk;
     };
 
-    meta = (import ../openjdk/meta.nix lib version) // {
+    meta = {
       description = "Certified builds of OpenJDK";
       longDescription = ''
         Certified builds of OpenJDK that can be deployed across multiple
         operating systems, containers, hypervisors and Cloud platforms.
       '';
       homepage = "https://www.azul.com/products/zulu/";
+      license = lib.licenses.gpl2Only;
       mainProgram = "java";
-      maintainers = [ ];
+      maintainers = [ ] ++ lib.teams.java.members;
       platforms = builtins.attrNames dists;
       sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ];
     };
diff --git a/pkgs/development/coq-modules/ExtLib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix
new file mode 100644
index 000000000000..398185396f3a
--- /dev/null
+++ b/pkgs/development/coq-modules/ExtLib/default.nix
@@ -0,0 +1,39 @@
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+mkCoqDerivation rec {
+  pname = "coq-ext-lib";
+  inherit version;
+  defaultVersion = with lib.versions; lib.switch coq.coq-version [
+    { case = range "8.14" "8.20"; out = "0.12.2"; }
+    { case = range "8.11" "8.19"; out = "0.12.0"; }
+    { case = range "8.8" "8.16"; out = "0.11.6"; }
+    { case = range "8.8" "8.14"; out = "0.11.4"; }
+    { case = range "8.8" "8.13"; out = "0.11.3"; }
+    { case = "8.7";              out = "0.9.7"; }
+    { case = "8.6";              out = "0.9.5"; }
+    { case = "8.5";              out = "0.9.4"; }
+  ] null;
+  release."0.12.2".sha256 = "sha256-lSTlbpkSuAY6B9cqofXSlDk2VchtqfZpRQ0+y/BAbEY=";
+  release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo=";
+  release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c=";
+  release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k=";
+  release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY=";
+  release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7";
+  release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3";
+  release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42";
+  release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6";
+  release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb";
+  release."0.11.1".sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5";
+  release."0.10.2".sha256 = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f";
+  release."0.10.1".sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95";
+  release."0.10.0".sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a";
+  release."0.9.7".sha256  = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag";
+  release."0.9.5".sha256  = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg";
+  release."0.9.4".sha256  = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0";
+  releaseRev = v: "v${v}";
+
+  meta = {
+    description = "Collection of theories and plugins that may be useful in other Coq developments";
+    maintainers = with lib.maintainers; [ jwiegley ptival ];
+  };
+}
diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix
index 693b1b260c1e..78d788b96295 100644
--- a/pkgs/development/coq-modules/ITree/default.nix
+++ b/pkgs/development/coq-modules/ITree/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }:
+{ lib, mkCoqDerivation, coq, version ? null , paco, ExtLib }:
 
 mkCoqDerivation rec {
   pname = "InteractionTrees";
@@ -15,7 +15,7 @@ mkCoqDerivation rec {
   release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
   release."3.2.0".sha256 = "sha256-10ckCAqSQ0I3CZKlSllI1obOgWVxDagTd7eyhrl1xpE=";
   releaseRev = v: "${v}";
-  propagatedBuildInputs = [ coq-ext-lib paco ];
+  propagatedBuildInputs = [ ExtLib paco ];
   meta = {
     description = "Library for Representing Recursive and Impure Programs in Coq";
     maintainers = with lib.maintainers; [ larsr ];
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index d9a0182c2659..16f4eedb5cca 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
+{ lib, mkCoqDerivation, coq, ssreflect, ExtLib, simple-io, version ? null }:
 
 let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev"; in
 (mkCoqDerivation {
@@ -47,7 +47,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev"
   mlPlugin = true;
   nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
   propagatedBuildInputs = [ ssreflect ]
-    ++ lib.optionals recent [ coq-ext-lib simple-io ];
+    ++ lib.optionals recent [ ExtLib simple-io ];
   extraInstallFlags = [ "-f Makefile.coq" ];
 
   enableParallelBuilding = false;
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
deleted file mode 100644
index 4ec805e8f028..000000000000
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, mkCoqDerivation, coq, version ? null }:
-
-mkCoqDerivation rec {
-  pname = "coq-ext-lib";
-  owner = "coq-ext-lib";
-  inherit version;
-  defaultVersion = with lib.versions; lib.switch coq.coq-version [
-    { case = range "8.14" "8.20"; out = "0.12.1"; }
-    { case = range "8.11" "8.19"; out = "0.12.0"; }
-    { case = range "8.8" "8.16"; out = "0.11.6"; }
-    { case = range "8.8" "8.14"; out = "0.11.4"; }
-    { case = range "8.8" "8.13"; out = "0.11.3"; }
-    { case = "8.7";              out = "0.9.7"; }
-    { case = "8.6";              out = "0.9.5"; }
-    { case = "8.5";              out = "0.9.4"; }
-  ] null;
-  release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo=";
-  release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c=";
-  release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k=";
-  release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY=";
-  release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7";
-  release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3";
-  release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42";
-  release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6";
-  release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb";
-  release."0.11.1".sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5";
-  release."0.10.2".sha256 = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f";
-  release."0.10.1".sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95";
-  release."0.10.0".sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a";
-  release."0.9.7".sha256  = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag";
-  release."0.9.5".sha256  = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg";
-  release."0.9.4".sha256  = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0";
-  releaseRev = v: "v${v}";
-
-  meta = {
-    description = "Collection of theories and plugins that may be useful in other Coq developments";
-    maintainers = with lib.maintainers; [ jwiegley ptival ];
-  };
-}
diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix
index a39e8a99509c..a8e925e98f04 100644
--- a/pkgs/development/coq-modules/iris/default.nix
+++ b/pkgs/development/coq-modules/iris/default.nix
@@ -6,6 +6,7 @@ mkCoqDerivation rec {
   owner = "iris";
   inherit version;
   defaultVersion = with lib.versions; lib.switch coq.coq-version [
+    { case = range "8.19" "8.20"; out = "4.3.0"; }
     { case = range "8.18" "8.19"; out = "4.2.0"; }
     { case = range "8.16" "8.18"; out = "4.1.0"; }
     { case = range "8.13" "8.17"; out = "4.0.0"; }
@@ -13,6 +14,7 @@ mkCoqDerivation rec {
     { case = range "8.11" "8.13"; out = "3.4.0"; }
     { case = range "8.9"  "8.10"; out = "3.3.0"; }
   ] null;
+  release."4.3.0".sha256 = "sha256-3qhjiFI+A3I3fD8rFfJL5Hek77wScfn/FNNbDyGqA1k=";
   release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM=";
   release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo=";
   release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg=";
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 97f2add33aae..58c51c150e37 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -54,7 +54,7 @@ let
   packages = {
     "classical" = [];
     "reals" = [ "classical" ];
-    "altreals" = [ "reals" ];
+    "experimental-reals" = [ "reals" ];
     "analysis" = [ "reals" ];
     "reals-stdlib" = [ "reals" ];
     "analysis-stdlib" = [ "analysis" "reals-stdlib" ];
@@ -62,11 +62,13 @@ let
 
   mathcomp_ = package: let
       classical-deps = [ mathcomp.algebra mathcomp-finmap ];
+      experimental-reals-deps = [ mathcomp-bigenough ];
       analysis-deps = [ mathcomp.field mathcomp-bigenough ];
       intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
       pkgpath = lib.switch package [
         { case = "single"; out = "."; }
         { case = "analysis"; out = "theories"; }
+        { case = "experimental-reals"; out = "experimental_reals"; }
         { case = "reals-stdlib"; out = "reals_stdlib"; }
         { case = "analysis-stdlib"; out = "analysis_stdlib"; }
       ] package;
@@ -80,6 +82,7 @@ let
         propagatedBuildInputs =
           intra-deps
           ++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps
+          ++ lib.optionals (lib.elem package [ "experimental-reals" "single" ]) experimental-reals-deps
           ++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps;
 
         preBuild = ''
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index c79261aa174f..9452ac977b6f 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -38,15 +38,28 @@ let
   };
   releaseRev = v: "v${v}";
 
-  # list of core metacoq packages sorted by dependency order
-  packages = if lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev"
-     then [ "utils" "common" "template-coq" "pcuic" "safechecker" "template-pcuic" "erasure" "quotation" "safechecker-plugin" "erasure-plugin" "all" ]
-     else [ "template-coq" "pcuic" "safechecker" "erasure" "all" ];
+  # list of core metacoq packages and their dependencies
+  packages = {
+    "utils"              = [];
+    "common"             = [ "utils" ];
+    "template-coq"       = [ "common" ];
+    "pcuic"              = if (lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev")
+                           then [ "common" ]
+                           else [ "template-coq" ];
+    "safechecker"        = [ "pcuic" ];
+    "template-pcuic"     = [ "template-coq" "pcuic" ];
+    "erasure"            = [ "safechecker" "template-pcuic" ];
+    "quotation"          = [ "template-coq" "pcuic" "template-pcuic" ];
+    "safechecker-plugin" = [ "template-pcuic" "safechecker" ];
+    "erasure-plugin"     = [ "template-pcuic" "erasure" ];
+    "translations"       = [ "template-coq" ];
+    "all"                = [ "safechecker-plugin" "erasure-plugin" "translations" "quotation" ];
+  };
 
   template-coq = metacoq_ "template-coq";
 
   metacoq_ = package: let
-      metacoq-deps = lib.optionals (package != "single") (map metacoq_ (lib.head (lib.splitList (lib.pred.equal package) packages)));
+      metacoq-deps = lib.optionals (package != "single") (map metacoq_ packages.${package});
       pkgpath = if package == "single" then "./" else "./${package}";
       pname = if package == "all" then "metacoq" else "metacoq-${package}";
       pkgallMake = ''
@@ -81,7 +94,7 @@ let
 
         configurePhase = lib.optionalString (package == "all") pkgallMake + ''
           touch ${pkgpath}/metacoq-config
-        '' + lib.optionalString (lib.elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) ''
+        '' + lib.optionalString (lib.elem package ["erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin" "translations"]) ''
           echo  "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config
         '' + lib.optionalString (package == "single") ''
           ./configure.sh local
@@ -97,7 +110,7 @@ let
           maintainers = with lib.maintainers; [ cohencyril ];
         };
       } // lib.optionalAttrs (package != "single")
-        { passthru = lib.genAttrs packages metacoq_; })
+        { passthru = lib.mapAttrs (package: deps: metacoq_ package) packages; })
       ).overrideAttrs (o:
         let requiresOcamlStdlibShims = lib.versionAtLeast o.version "1.0-8.16" ||
                                        (o.version == "dev" && (lib.versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ;
@@ -105,6 +118,14 @@ let
           {
             propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
           });
-  in derivation;
+      # utils, common, template-pcuic, quotation, safechecker-plugin, and erasure-plugin
+      # packages didn't exist before 1.2, so bulding nothing in that case
+      patched-derivation = derivation.overrideAttrs (o:
+        lib.optionalAttrs (o.pname != null &&
+          lib.elem package [ "utils" "common" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin" ] &&
+          o.version != null && o.version != "dev" && lib.versions.isLt "1.2" o.version)
+        { patchPhase = ""; configurePhase = ""; preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; }
+      );
+  in patched-derivation;
 in
 metacoq_ (if single then "single" else "all")
diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix
index 292e7e369b61..b66baa5358ce 100644
--- a/pkgs/development/coq-modules/parsec/default.nix
+++ b/pkgs/development/coq-modules/parsec/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }:
+{ lib, mkCoqDerivation, coq, ceres, ExtLib, version ? null }:
 
 mkCoqDerivation {
 
@@ -6,7 +6,7 @@ mkCoqDerivation {
   repo = "coq-parsec";
   owner = "liyishuai";
 
-  propagatedBuildInputs = [ ceres coq-ext-lib ];
+  propagatedBuildInputs = [ ceres ExtLib ];
   releaseRev = (v: "v${v}");
 
   inherit version;
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index e3fa7036a866..1c96922b2efd 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }:
+{ lib, callPackage, mkCoqDerivation, coq, ExtLib, version ? null }:
 
 (mkCoqDerivation {
   pname = "simple-io";
@@ -16,7 +16,7 @@
   release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
   mlPlugin = true;
   nativeBuildInputs = [ coq.ocamlPackages.cppo ];
-  propagatedBuildInputs = [ coq-ext-lib ]
+  propagatedBuildInputs = [ ExtLib ]
   ++ (with coq.ocamlPackages; [ ocaml findlib ocamlbuild ]);
 
   doCheck = true;
diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix
index 1215acaed5a1..509aac763b16 100644
--- a/pkgs/development/coq-modules/stdpp/default.nix
+++ b/pkgs/development/coq-modules/stdpp/default.nix
@@ -6,6 +6,7 @@ mkCoqDerivation rec {
   domain = "gitlab.mpi-sws.org";
   owner = "iris";
   defaultVersion = with lib.versions; lib.switch coq.coq-version [
+    { case = range "8.19" "8.20"; out = "1.11.0"; }
     { case = range "8.18" "8.19"; out = "1.10.0"; }
     { case = range "8.16" "8.18"; out = "1.9.0"; }
     { case = range "8.13" "8.17"; out = "1.8.0"; }
@@ -13,6 +14,7 @@ mkCoqDerivation rec {
     { case = range "8.11" "8.13"; out = "1.5.0"; }
     { case = range "8.8" "8.10";  out = "1.4.0"; }
   ] null;
+  release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k=";
   release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I=";
   release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI=";
   release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU=";
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index f5d1c250cfca..43d2bece88c9 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -36,6 +36,7 @@ let
         cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.
       '';
       license = lib.licenses.bsd3;
+      platforms = [ "x86_64-linux" ];
       maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;
     };
   };
diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix
index ed9c57f3d00c..97e05957d3ed 100644
--- a/pkgs/development/cuda-modules/cuda-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix
@@ -73,6 +73,7 @@ backendStdenv.mkDerivation (finalAttrs: {
     description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
     # CUDA itself is proprietary, but these sample apps are not.
     license = lib.licenses.bsd3;
+    platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;
   };
 })
diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
index eccc7c2d216f..26f4f1b972ae 100644
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix
@@ -215,7 +215,7 @@ backendStdenv.mkDerivation (finalAttrs: {
     # one that is compatible with the rest of nixpkgs, even when
     # nvcc forces us to use an older gcc
     # NB: We don't actually know if this is the right thing to do
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   # Picked up by autoPatchelf
diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix
index 6d43f107563a..1dfc54e9c3c6 100644
--- a/pkgs/development/embedded/fpga/ecpdap/default.nix
+++ b/pkgs/development/embedded/fpga/ecpdap/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/adamgreig/ecpdap";
     license = licenses.asl20;
-    maintainers = with maintainers; [ expipiplus1 ];
+    maintainers = [];
   };
 }
 
diff --git a/pkgs/development/emilua-plugins/beast/default.nix b/pkgs/development/emilua-plugins/beast/default.nix
index 245170cae710..9b28bed49ac3 100644
--- a/pkgs/development/emilua-plugins/beast/default.nix
+++ b/pkgs/development/emilua-plugins/beast/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (self: {
   pname = "emilua_beast";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "beast";
     rev = "v${self.version}";
-    hash = "sha256-HvfEigHJTZelPvHFk22PWxkTFEajHJXfiCndxXHVgq8=";
+    hash = "sha256-8pHL0ut221LvFwb/o1GuLV3gIDw5LSeqxqIa9eaQjXY=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix
index 77390e52340b..7fb8d10997e1 100644
--- a/pkgs/development/gnuradio-modules/grnet/default.nix
+++ b/pkgs/development/gnuradio-modules/grnet/default.nix
@@ -8,7 +8,7 @@
 , boost
 , logLib
 , python
-, swig
+, swig3
 , mpir
 , gmp
 , doxygen
@@ -78,7 +78,7 @@ mkDerivation {
     pybind11
     numpy
   ] else [
-    swig
+    swig3
     thrift
     python.pkgs.thrift
   ]);
diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix
index 9f184b7be7fb..af7a018f4798 100644
--- a/pkgs/development/gnuradio-modules/gsm/default.nix
+++ b/pkgs/development/gnuradio-modules/gsm/default.nix
@@ -4,7 +4,7 @@
 , cmake
 , pkg-config
 , cppunit
-, swig
+, swig3
 , boost
 , logLib
 , python
@@ -27,7 +27,7 @@ mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
 
diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix
index 62db654270b9..27c846c44af5 100644
--- a/pkgs/development/gnuradio-modules/limesdr/default.nix
+++ b/pkgs/development/gnuradio-modules/limesdr/default.nix
@@ -5,7 +5,7 @@
 , thrift
 , cmake
 , pkg-config
-, swig
+, swig3
 , python
 , logLib
 , mpir
@@ -38,7 +38,7 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
   buildInputs = [
diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix
index 0900ca943b97..34cd04aff4ea 100644
--- a/pkgs/development/gnuradio-modules/nacl/default.nix
+++ b/pkgs/development/gnuradio-modules/nacl/default.nix
@@ -4,7 +4,7 @@
 , cmake
 , pkg-config
 , cppunit
-, swig
+, swig3
 , boost
 , logLib
 , python
@@ -26,7 +26,7 @@ mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
 
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index 663ffafd7f3b..aae85f02ab74 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -14,7 +14,7 @@
 , thrift
 , fftwFloat
 , python
-, swig
+, swig3
 , uhd
 , icu
 , airspy
@@ -85,7 +85,7 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
   ] ++ lib.optionals (gnuradio.hasFeature "python-support") [
       (if (gnuradio.versionAttr.major == "3.7") then
         python.pkgs.cheetah
diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix
index 9a6f2ccbbad4..5b9a20042cb9 100644
--- a/pkgs/development/gnuradio-modules/rds/default.nix
+++ b/pkgs/development/gnuradio-modules/rds/default.nix
@@ -4,7 +4,7 @@
 , gnuradio
 , cmake
 , pkg-config
-, swig
+, swig3
 , python
 , logLib
 , mpir
@@ -50,7 +50,7 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
 
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index 55894a0ea2a9..3e925417d644 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2024-05-20";
+  version = "unstable-2024-10-17";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/79b73778680e2ae27302dce430beee302299f496.tar.gz";
-    sha256 = "0xjrnf9x1f4jl4bsxc6kv5q7rsbn3vs0ddidj9qf6mzzzqxq14p3";
+    url = "https://github.com/NixOS/cabal2nix/archive/b8eb82f8bc907b42dfb463cab62e49fbe2fff997.tar.gz";
+    sha256 = "1fxqigr002ssgz1l62rc7k04q4q0hwcl2wqy7l2shylxqf7yfcd6";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ac803a879211..030b8a4d4379 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -27,14 +27,14 @@ self: super: {
     Cabal-syntax = self.Cabal-syntax_3_10_3_0;
   } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
     # Use process core package when possible
-    process = self.process_1_6_22_0;
+    process = self.process_1_6_24_0;
   }));
 
   Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({
     Cabal-syntax = self.Cabal-syntax_3_12_1_0;
   } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
     # Use process core package when possible
-    process = self.process_1_6_22_0;
+    process = self.process_1_6_24_0;
   }));
 
   # hackage-security == 0.6.2.6 has a wider support range in theory, but it only
@@ -411,7 +411,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0j037sis64gnrll7ajg48cvzzvxqsrhj7vnhiwcqv8wbmbfv0avn";
+      sha256 = "sha256-hPZTcl3kWeUnSVYOE1W+FDwR3LYg6gaJfEBIY6VSfxY=";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash
@@ -724,7 +724,6 @@ self: super: {
   nats-queue = dontCheck super.nats-queue;
   netpbm = dontCheck super.netpbm;
   network = dontCheck super.network;
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1; # package is missing files for test
   network-dbus = dontCheck super.network-dbus;
   notcpp = dontCheck super.notcpp;
   ntp-control = dontCheck super.ntp-control;
@@ -1811,10 +1810,6 @@ self: super: {
   # tests seem to require a different version of hspec-core
   hspec-contrib = dontCheck super.hspec-contrib;
 
-  # github.com/ucsd-progsys/liquidhaskell/issues/1729
-  liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; };
-  Diff_0_3_4 = dontCheck super.Diff_0_3_4;
-
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
 
@@ -1865,6 +1860,12 @@ self: super: {
   # 2024-03-02: vty <5.39 - https://github.com/reflex-frp/reflex-ghci/pull/33
   reflex-ghci = assert super.reflex-ghci.version == "0.2.0.1"; doJailbreak super.reflex-ghci;
 
+  # 2024-09-18: transformers <0.5  https://github.com/reflex-frp/reflex-gloss/issues/6
+  reflex-gloss = assert super.reflex-gloss.version == "0.2"; doJailbreak super.reflex-gloss;
+
+  # 2024-09-18: primitive <0.8  https://gitlab.com/Kritzefitz/reflex-gi-gtk/-/merge_requests/20
+  reflex-gi-gtk = assert super.reflex-gi-gtk.version == "0.2.0.1"; doJailbreak super.reflex-gi-gtk;
+
   # Due to tests restricting base in 0.8.0.0 release
   http-media = doJailbreak super.http-media;
 
@@ -1914,9 +1915,8 @@ self: super: {
     sha256 = "sha256-kFV6CcwKdMq+qSgyc+eIApnaycq5A++pEEVr2A9xvts=";
   }) super.pipes-aeson;
 
-  # Needs bytestring 0.11
-  # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/pull/17
-  pipes-http = doJailbreak super.pipes-http;
+  # 2024-09-18: transformers <0.6  https://github.com/Gabriella439/Haskell-Pipes-Extras-Library/pull/19
+  pipes-extras = assert super.pipes-extras.version == "1.0.15"; doJailbreak super.pipes-extras;
 
   moto-postgresql = appendPatches [
     # https://gitlab.com/k0001/moto/-/merge_requests/3
@@ -2002,6 +2002,14 @@ self: super: {
   # Test suite fails, upstream not reachable for simple fix (not responsive on github)
   vivid-osc = dontCheck super.vivid-osc;
   vivid-supercollider = dontCheck super.vivid-supercollider;
+  vivid = overrideCabal (drv: assert drv.version == "0.5.2.0"; {
+    # 2024-10-18: Some library dependency must have stopped
+    # re-exporting 'void', so now it needs an extra import line.
+    # Fixed in 0.5.2.1.
+    postPatch = ''
+      sed -i '/) where/a import Control.Monad (void)' Vivid/GlobalState.hs
+    '';
+  }) super.vivid;
 
   # Test suite does not compile.
   feed = dontCheck super.feed;
@@ -2109,12 +2117,6 @@ self: super: {
   # https://github.com/serokell/haskell-crypto/issues/25
   crypto-sodium = dontCheck super.crypto-sodium;
 
-  taskell = super.taskell.override {
-    # Does not support brick >= 1.0
-    # https://github.com/smallhadroncollider/taskell/issues/125
-    brick = self.brick_0_70_1;
-  };
-
   # Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum
   ghc-bignum = super.ghc-bignum or self.mkDerivation {
     pname = "ghc-bignum";
@@ -2220,17 +2222,6 @@ self: super: {
     revision = null;
   } super.llvm-hs-pure);
 
-  # * Fix build failure by picking patch from 8.5, we need
-  #   this version of sbv for petrinizer
-  # * Pin version of crackNum that still exposes its library
-  sbv_7_13 = appendPatch (fetchpatch {
-      url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch";
-      sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
-    })
-    (super.sbv_7_13.override {
-      crackNum = self.crackNum_2_4;
-    });
-
   # Too strict bounds on dimensional
   # https://github.com/enomsg/science-constants-dimensional/pull/1
   science-constants-dimensional = doJailbreak super.science-constants-dimensional;
@@ -2239,17 +2230,23 @@ self: super: {
   # https://github.com/merijn/paramtree/issues/4
   paramtree = dontCheck super.paramtree;
 
-  # Too strict version bounds on haskell-gi
-  # https://github.com/owickstrom/gi-gtk-declarative/issues/100
-  gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;
+  # 2024-09-18: Make compatible with haskell-gi 0.26.10
+  # https://github.com/owickstrom/gi-gtk-declarative/pull/118
+  gi-gtk-declarative = overrideCabal (drv: assert drv.version == "0.7.1"; {
+    jailbreak = true;
+    postPatch = ''
+      sed -i '1 i {-# LANGUAGE FlexibleContexts #-}' \
+        src/GI/Gtk/Declarative/Widget/Conversions.hs
+    '';
+  }) super.gi-gtk-declarative;
   gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;
 
   gi-gtk_4 = self.gi-gtk_4_0_9;
   gi-gtk_4_0_9 = doDistribute (super.gi-gtk_4_0_9.override {
     gi-gdk = self.gi-gdk_4;
   });
-  gi-gdk_4 = self.gi-gdk_4_0_8;
-  gi-gdk_4_0_8 = doDistribute super.gi-gdk_4_0_8;
+  gi-gdk_4 = self.gi-gdk_4_0_9;
+  gi-gdk_4_0_9 = doDistribute super.gi-gdk_4_0_9;
   # GSK is only used for GTK 4.
   gi-gsk = super.gi-gsk.override {
     gi-gdk = self.gi-gdk_4;
@@ -2531,9 +2528,12 @@ self: super: {
   # 2024-03-02: base <=4.18.0.0  https://github.com/srid/url-slug/pull/2
   url-slug = doJailbreak super.url-slug;
 
-  glirc = doJailbreak (super.glirc.override {
-    vty = self.vty_5_35_1;
-  });
+  glirc = super.glirc.override {
+    vty = self.vty_6_2;
+    vty-unix = super.vty-unix.override {
+      vty = self.vty_6_2;
+    };
+  };
 
   # Too strict bounds on text and tls
   # https://github.com/barrucadu/irc-conduit/issues/54
@@ -2839,18 +2839,32 @@ self: super: {
   postgrest = lib.pipe super.postgrest [
     # 2023-12-20: New version needs extra dependencies
     (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ])
-    # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580
+    # 2022-12-02: Too strict bounds.
     doJailbreak
     # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
     (overrideSrc rec {
-      version = "12.0.2";
+      version = "12.0.3";
       src = pkgs.fetchFromGitHub {
         owner = "PostgREST";
         repo = "postgrest";
         rev = "v${version}";
-        hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to=";
+        hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY=";
       };
     })
+    # 2024-11-03: Needed for the patch below. Can be dropped after updating to 12.2+.
+    (appendPatches [
+      (fetchpatch {
+        url = "https://github.com/PostgREST/postgrest/commit/d311fb17c46ad2ab9064c7aba1954d3500ef0e54.patch";
+        hash = "sha256-O/bBm93V6GIPSB5dwhNUFgX3vXA01LPJapZQoeJmbIU=";
+      })
+    ])
+    # 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+.
+    (appendPatches [
+      (fetchpatch {
+        url = "https://github.com/PostgREST/postgrest/commit/c045b261c4f7d2c2514e858120950be6b3ddfba8.patch";
+        hash = "sha256-6SeteL5sb+/K1y3f9XL7yNzXDdD1KQp91RNP4kutSLE=";
+      })
+    ])
   ];
 
   # Too strict bounds on hspec < 2.11
@@ -2942,13 +2956,6 @@ self: super: {
     hash = "sha256-zugyUpEq/iVkxghrvguL95+lJDEpE8MLvZivken0p24=";
   }) super.nix-serve-ng;
 
-  # Needs a matching version of ipython-kernel and a
-  # ghc-syntax-highlighter compatible with a newer ghc-lib-parser it
-  # transitively pulls in
-  ihaskell = super.ihaskell.overrideScope (self: super: {
-    ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
-  });
-
   # 2024-01-24: support optparse-applicative 0.18
   niv = appendPatches [
     (fetchpatch {
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 6e7f7ef47b87..e931a60ada41 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -300,6 +300,13 @@ self: super: ({
     __darwinAllowLocalNetworking = true;
   });
 
+  # network requires `IP_RECVTOS`, which was added in 10.15.
+  network =
+    if lib.versionOlder (lib.getVersion pkgs.apple-sdk) "10.15" then
+      addBuildDepend pkgs.apple-sdk_10_15 super.network
+    else
+      super.network;
+
   foldl = overrideCabal (drv: {
     postPatch = ''
       # This comment has been inserted, so the derivation hash changes, forcing
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 4272012f27a3..6fd85c971e23 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -86,10 +86,6 @@ self: super: {
   # cabal2spec needs a recent version of Cabal
   cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
 
-  # https://github.com/pikajude/stylish-cabal/issues/12
-  stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; }));
-  haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0;
-
   # ghc versions prior to 8.8.x needs additional dependency to compile successfully.
   ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex;
 
@@ -99,8 +95,6 @@ self: super: {
   # vector 0.12.2 indroduced doctest checks that don’t work on older compilers
   vector = dontCheck super.vector;
 
-  mmorph = super.mmorph_1_1_3;
-
   # https://github.com/haskellari/time-compat/issues/23
   time-compat = dontCheck super.time-compat;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
index 972cbc4c7e03..dcb91d08add0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
@@ -61,7 +61,6 @@ self: super: {
   # Upgrade to accommodate new core library versions, where the authors have
   # already made the relevant changes.
   aeson = doDistribute self.aeson_2_2_3_0;
-  apply-refact = doDistribute self.apply-refact_0_14_0_0;
   attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0;
   auto-update = super.auto-update_0_2_1;
   extensions = doDistribute self.extensions_0_1_0_2;
@@ -112,12 +111,11 @@ self: super: {
 
   bitvec = doJailbreak super.bitvec; # primitive <0.9
 
-  apply-refact_0_14_0_0 = doJailbreak super.apply-refact_0_14_0_0; # ghc-exactprint <1.9
-  retrie = doJailbreak super.retrie; # base <4.20, ghc<9.9, ghc-exactprint<1.9
-
   hashable_1_4_7_0 = doJailbreak super.hashable_1_4_7_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck
   hashable_1_5_0_0 = doJailbreak super.hashable_1_5_0_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck
 
+  broadcast-chan = doJailbreak super.broadcast-chan; # base <4.19  https://github.com/merijn/broadcast-chan/pull/19
+
   #
   # Test suite issues
   #
@@ -128,7 +126,7 @@ self: super: {
   primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.*
   bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45
   hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38
-  warp = pkgs.haskell.lib.dontCheck super.warp_3_4_1; # test suite assumes it can freely call curl
+  warp = pkgs.haskell.lib.dontCheck super.warp_3_4_2; # test suite assumes it can freely call curl
 
   haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;})));
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
index 7e89ea668e02..fb7115d6bbd2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
@@ -118,6 +118,7 @@ self: super: {
   string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1
   inflections = doJailbreak super.inflections; # text >=0.2 && <2.1
   universe-some = doJailbreak super.universe-some; # th-abstraction < 0.7
+  broadcast-chan = doJailbreak super.broadcast-chan; # base <4.19  https://github.com/merijn/broadcast-chan/pull/19
 
   #
   # Test suite issues
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index ba659b51711e..6d8bc6ad3b76 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -1224,7 +1224,6 @@ broken-packages:
   - dead-code-detection # failure in job https://hydra.nixos.org/build/233205957 at 2023-09-02
   - Deadpan-DDP # failure in job https://hydra.nixos.org/build/233221990 at 2023-09-02
   - dead-simple-json # failure in job https://hydra.nixos.org/build/233204301 at 2023-09-02
-  - dear-imgui # failure in job https://hydra.nixos.org/build/233238246 at 2023-09-02
   - debugger-hs # failure in job https://hydra.nixos.org/build/233206302 at 2023-09-02
   - debug-me # failure in job https://hydra.nixos.org/build/233213991 at 2023-09-02
   - debug-trace-file # failure in job https://hydra.nixos.org/build/233231840 at 2023-09-02
@@ -1844,6 +1843,7 @@ broken-packages:
   - fraxl # failure in job https://hydra.nixos.org/build/233219345 at 2023-09-02
   - freckle-kafka # failure in job https://hydra.nixos.org/build/269673466 at 2024-08-19
   - freddy # failure in job https://hydra.nixos.org/build/233208999 at 2023-09-02
+  - free-alacarte # failure in job https://hydra.nixos.org/build/275141793 at 2024-10-21
   - free-applicative-t # failure in job https://hydra.nixos.org/build/252715728 at 2024-03-16
   - free-concurrent # failure in job https://hydra.nixos.org/build/233257070 at 2023-09-02
   - free-foil # failure in job https://hydra.nixos.org/build/265268910 at 2024-07-14
@@ -1938,7 +1938,6 @@ broken-packages:
   - gearhash # failure in job https://hydra.nixos.org/build/252728216 at 2024-03-16
   - gelatin # failure in job https://hydra.nixos.org/build/233249394 at 2023-09-02
   - gemcap # failure in job https://hydra.nixos.org/build/233202506 at 2023-09-02
-  - gemini-server # failure in job https://hydra.nixos.org/build/252717988 at 2024-03-16
   - gemmula-altera # failure in job https://hydra.nixos.org/build/252721416 at 2024-03-16
   - gemstone # failure in job https://hydra.nixos.org/build/233202246 at 2023-09-02
   - gender # failure in job https://hydra.nixos.org/build/233235712 at 2023-09-02
@@ -2053,7 +2052,6 @@ broken-packages:
   - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02
   - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31
   - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02
-  - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02
   - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02
   - gi-gtksource # failure in job https://hydra.nixos.org/build/233215342 at 2023-09-02
   - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02
@@ -2321,6 +2319,7 @@ broken-packages:
   - HarmTrace-Base # failure in job https://hydra.nixos.org/build/233213843 at 2023-09-02
   - haroonga # failure in job https://hydra.nixos.org/build/233226376 at 2023-09-02
   - harp # failure in job https://hydra.nixos.org/build/252730015 at 2024-03-16
+  - harpie # failure in job https://hydra.nixos.org/build/275138146 at 2024-10-21
   - harpy # failure in job https://hydra.nixos.org/build/233225779 at 2023-09-02
   - harvest-api # failure in job https://hydra.nixos.org/build/233213054 at 2023-09-02
   - hasbolt-extras # failure in job https://hydra.nixos.org/build/233211734 at 2023-09-02
@@ -3186,7 +3185,6 @@ broken-packages:
   - ip-quoter # failure in job https://hydra.nixos.org/build/233234581 at 2023-09-02
   - iptables-helpers # failure in job https://hydra.nixos.org/build/233198949 at 2023-09-02
   - IPv6DB # failure in job https://hydra.nixos.org/build/233199983 at 2023-09-02
-  - irc-core # failure in job https://hydra.nixos.org/build/233242138 at 2023-09-02
   - irc-dcc # failure in job https://hydra.nixos.org/build/233230181 at 2023-09-02
   - Irc # failure in job https://hydra.nixos.org/build/233230852 at 2023-09-02
   - irc-fun-types # failure in job https://hydra.nixos.org/build/233255910 at 2023-09-02
@@ -3290,6 +3288,7 @@ broken-packages:
   - json-syntax # failure in job https://hydra.nixos.org/build/233250639 at 2023-09-02
   - json-to-haskell # failure in job https://hydra.nixos.org/build/252711573 at 2024-03-16
   - json-tools # failure in job https://hydra.nixos.org/build/233247019 at 2023-09-02
+  - json-to-type # failure in job https://hydra.nixos.org/build/275143966 at 2024-10-21
   - json-tracer # failure in job https://hydra.nixos.org/build/233196632 at 2023-09-02
   - jsontsv # failure in job https://hydra.nixos.org/build/233234129 at 2023-09-02
   - jsonxlsx # failure in job https://hydra.nixos.org/build/233201772 at 2023-09-02
@@ -3339,6 +3338,7 @@ broken-packages:
   - keenser # failure in job https://hydra.nixos.org/build/233200021 at 2023-09-02
   - keera-hails-reactivevalues # failure in job https://hydra.nixos.org/build/233258391 at 2023-09-02
   - keid-render-basic # failure in job https://hydra.nixos.org/build/233258215 at 2023-09-02
+  - keid-ui-dearimgui # failure in job https://hydra.nixos.org/build/275828030 at 2024-10-21
   - keiretsu # failure in job https://hydra.nixos.org/build/233195563 at 2023-09-02
   - kempe # failure in job https://hydra.nixos.org/build/233221290 at 2023-09-02
   - kesha # failure in job https://hydra.nixos.org/build/233215581 at 2023-09-02
@@ -3418,7 +3418,6 @@ broken-packages:
   - language-elm # failure in job https://hydra.nixos.org/build/233214012 at 2023-09-02
   - language-fortran # failure in job https://hydra.nixos.org/build/233205480 at 2023-09-02
   - language-gcl # failure in job https://hydra.nixos.org/build/233218957 at 2023-09-02
-  - language-gemini # failure in job https://hydra.nixos.org/build/233211812 at 2023-09-02
   - language-go # failure in job https://hydra.nixos.org/build/233194866 at 2023-09-02
   - language-guess # failure in job https://hydra.nixos.org/build/233257420 at 2023-09-02
   - language-hcl # failure in job https://hydra.nixos.org/build/233212998 at 2023-09-02
@@ -3831,6 +3830,7 @@ broken-packages:
   - minicurl # failure in job https://hydra.nixos.org/build/252710787 at 2024-03-16
   - miniforth # failure in job https://hydra.nixos.org/build/233220853 at 2023-09-02
   - minilens # failure in job https://hydra.nixos.org/build/233191347 at 2023-09-02
+  - minion-openapi3 # failure in job https://hydra.nixos.org/build/275140771 at 2024-10-21
   - minions # failure in job https://hydra.nixos.org/build/233246840 at 2023-09-02
   - miniplex # failure in job https://hydra.nixos.org/build/233241976 at 2023-09-02
   - ministg # failure in job https://hydra.nixos.org/build/233214109 at 2023-09-02
@@ -3858,6 +3858,7 @@ broken-packages:
   - mmzk-typeid # failure in job https://hydra.nixos.org/build/233258612 at 2023-09-02
   - Mobile-Legends-Hack-Cheats # failure in job https://hydra.nixos.org/build/233194849 at 2023-09-02
   - mockazo # failure in job https://hydra.nixos.org/build/233234923 at 2023-09-02
+  - mockcat # failure in job https://hydra.nixos.org/build/275146693 at 2024-10-21
   - mock-httpd # failure in job https://hydra.nixos.org/build/233191481 at 2023-09-02
   - mock-time # failure in job https://hydra.nixos.org/build/252737870 at 2024-03-16
   - modbus-tcp # failure in job https://hydra.nixos.org/build/233230661 at 2023-09-02
@@ -4439,6 +4440,7 @@ broken-packages:
   - partial-records # failure in job https://hydra.nixos.org/build/233205143 at 2023-09-02
   - partial-semigroup-hedgehog # failure in job https://hydra.nixos.org/build/252731350 at 2024-03-16
   - partly # failure in job https://hydra.nixos.org/build/233229003 at 2023-09-02
+  - paseto # failure in job https://hydra.nixos.org/build/275145626 at 2024-10-21
   - passage # failure in job https://hydra.nixos.org/build/233192945 at 2023-09-02
   - passman-core # failure in job https://hydra.nixos.org/build/233217997 at 2023-09-02
   - passman # failure in job https://hydra.nixos.org/build/233234939 at 2023-09-02
@@ -4527,16 +4529,19 @@ broken-packages:
   - phasechange # failure in job https://hydra.nixos.org/build/233254293 at 2023-09-02
   - phaser # failure in job https://hydra.nixos.org/build/233250604 at 2023-09-02
   - phkdf # failure in job https://hydra.nixos.org/build/255669790 at 2024-04-16
+  - phladiprelio-general-datatype # failure in job https://hydra.nixos.org/build/275139962 at 2024-10-21
   - phoityne # failure in job https://hydra.nixos.org/build/233195238 at 2023-09-02
   - phoityne-vscode # failure in job https://hydra.nixos.org/build/233190938 at 2023-09-02
   - phone-metadata # failure in job https://hydra.nixos.org/build/233256096 at 2023-09-02
   - phone-numbers # failure in job https://hydra.nixos.org/build/233217584 at 2023-09-02
   - phone-push # failure in job https://hydra.nixos.org/build/233246934 at 2023-09-02
   - phonetic-languages-constaints # failure in job https://hydra.nixos.org/build/233232580 at 2023-09-02
+  - phonetic-languages-phonetics-basics # failure in job https://hydra.nixos.org/build/275143090 at 2024-10-21
   - phonetic-languages-simplified-generalized-examples-array # failure in job https://hydra.nixos.org/build/233245242 at 2023-09-02
   - phonetic-languages-simplified-generalized-properties-array # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248983 at 2023-10-21
   - phonetic-languages-simplified-properties-array # failure in job https://hydra.nixos.org/build/233195530 at 2023-09-02
   - phonetic-languages-simplified-properties-array-old # failure in job https://hydra.nixos.org/build/233258258 at 2023-09-02
+  - phonetic-languages-ukrainian-array # failure in job https://hydra.nixos.org/build/275138098 at 2024-10-21
   - phonetic-languages-vector # failure in job https://hydra.nixos.org/build/233258156 at 2023-09-02
   - photoname # failure in job https://hydra.nixos.org/build/252736965 at 2024-03-16
   - phraskell # failure in job https://hydra.nixos.org/build/233202906 at 2023-09-02
@@ -4571,7 +4576,6 @@ broken-packages:
   - pipes-cereal # failure in job https://hydra.nixos.org/build/233195413 at 2023-09-02
   - pipes-core # failure in job https://hydra.nixos.org/build/233213024 at 2023-09-02
   - pipes-errors # failure in job https://hydra.nixos.org/build/233214912 at 2023-09-02
-  - pipes-extras # failure in job https://hydra.nixos.org/build/252732291 at 2024-03-16
   - pipes-interleave # failure in job https://hydra.nixos.org/build/233247428 at 2023-09-02
   - pipes-io # failure in job https://hydra.nixos.org/build/233243253 at 2023-09-02
   - pipes-kafka # failure in job https://hydra.nixos.org/build/252727228 at 2024-03-16
@@ -4652,6 +4656,7 @@ broken-packages:
   - polyglot # failure in job https://hydra.nixos.org/build/233218267 at 2023-09-02
   - polynom # failure in job https://hydra.nixos.org/build/233237353 at 2023-09-02
   - polynomial # failure in job https://hydra.nixos.org/build/233242131 at 2023-09-02
+  - polysemy-blockfrost # failure in job https://hydra.nixos.org/build/275144296 at 2024-10-21
   - polysemy-keyed-state # failure in job https://hydra.nixos.org/build/233224142 at 2023-09-02
   - polysemy-kvstore # failure in job https://hydra.nixos.org/build/233229745 at 2023-09-02
   - polysemy-managed # failure in job https://hydra.nixos.org/build/233221190 at 2023-09-02
@@ -5029,11 +5034,8 @@ broken-packages:
   - reflex-dom-svg # failure in job https://hydra.nixos.org/build/233193544 at 2023-09-02
   - reflex-external-ref # failure in job https://hydra.nixos.org/build/233215834 at 2023-09-02
   - reflex-gadt-api # failure in job https://hydra.nixos.org/build/260124380 at 2024-05-19
-  - reflex-gi-gtk # failure in job https://hydra.nixos.org/build/253683412 at 2024-03-31
-  - reflex-gloss # failure in job https://hydra.nixos.org/build/234457448 at 2023-09-13
   - reflex-jsx # failure in job https://hydra.nixos.org/build/233207137 at 2023-09-02
   - reflex-orphans # failure in job https://hydra.nixos.org/build/233249128 at 2023-09-02
-  - reflex-sdl2 # failure in job https://hydra.nixos.org/build/233233947 at 2023-09-02
   - reflex-test-host # failure in job https://hydra.nixos.org/build/233220665 at 2023-09-02
   - reflex-transformers # failure in job https://hydra.nixos.org/build/233243647 at 2023-09-02
   - ref-mtl # failure in job https://hydra.nixos.org/build/233260152 at 2023-09-02
@@ -5945,6 +5947,7 @@ broken-packages:
   - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02
   - tasty-checklist # failure in job https://hydra.nixos.org/build/252710481 at 2024-03-16
   - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02
+  - tasty-flaky # failure in job https://hydra.nixos.org/build/275140265 at 2024-10-21
   - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04
   - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02
   - tasty-mgolden # failure in job https://hydra.nixos.org/build/233248196 at 2023-09-02
@@ -6322,6 +6325,7 @@ broken-packages:
   - uhttpc # failure in job https://hydra.nixos.org/build/233232481 at 2023-09-02
   - ui-command # failure in job https://hydra.nixos.org/build/233223762 at 2023-09-02
   - ukrainian-phonetics-basic-array-bytestring # failure in job https://hydra.nixos.org/build/233228787 at 2023-09-02
+  - ukrainian-phonetics-basic-array # failure in job https://hydra.nixos.org/build/275136298 at 2024-10-21
   - unac-bindings # failure in job https://hydra.nixos.org/build/236686523 at 2023-10-04
   - unamb-custom # failure in job https://hydra.nixos.org/build/233197458 at 2023-09-02
   - unbeliever # failure in job https://hydra.nixos.org/build/233221256 at 2023-09-02
@@ -6501,7 +6505,6 @@ broken-packages:
   - visibility # failure in job https://hydra.nixos.org/build/233206672 at 2023-09-02
   - visual-prof # failure in job https://hydra.nixos.org/build/233250080 at 2023-09-02
   - vitrea # failure in job https://hydra.nixos.org/build/233252038 at 2023-09-02
-  - vivid # failure in job https://hydra.nixos.org/build/252716916 at 2024-03-16
   - vk-aws-route53 # failure in job https://hydra.nixos.org/build/233250126 at 2023-09-02
   - VKHS # failure in job https://hydra.nixos.org/build/233246557 at 2023-09-02
   - vowpal-utils # failure in job https://hydra.nixos.org/build/233251505 at 2023-09-02
@@ -6832,6 +6835,7 @@ broken-packages:
   - yesod-vend # failure in job https://hydra.nixos.org/build/233227545 at 2023-09-02
   - YFrob # failure in job https://hydra.nixos.org/build/233197612 at 2023-09-02
   - yggdrasil # failure in job https://hydra.nixos.org/build/233229923 at 2023-09-02
+  - yggdrasil-schema # failure in job https://hydra.nixos.org/build/275135174 at 2024-10-21
   - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02
   - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02
   - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index af90ccd1bbbb..667a79adb859 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -39,29 +39,18 @@ default-package-overrides:
 
 
 extra-packages:
-  - Cabal-syntax == 3.6.*               # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8
   - Cabal == 3.2.*                      # Used for packages needing newer Cabal on ghc 8.6 and 8.8
-  - Cabal == 3.6.*                      # used for packages needing newer Cabal on ghc 8.10 and 9.0
+  - Cabal-syntax == 3.6.*               # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8
   - Cabal-syntax == 3.8.*               # version required for ormolu and fourmolu on ghc 9.2 and 9.0
-  - Cabal-syntax == 3.10.*              # version required for cabal-install and other packages
-  - Cabal == 3.10.*                     # version required for cabal-install and other packages
-  - directory == 1.3.7.*                # required to build cabal-install 3.10.* with GHC 9.2
-  - Diff < 0.4                          # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
+  - Cabal-syntax == 3.10.*
+  - Cabal == 3.10.*
+  - Cabal == 3.12.*                     # version required for cabal-install and other packages
+  - Cabal-syntax == 3.12.*              # version required for cabal-install and other packages
   - aeson < 2                           # required by pantry-0.5.2
   - apply-refact == 0.9.*               # 2022-12-12: needed for GHC < 9.2
   - apply-refact == 0.11.*              # 2023-02-02: needed for hls-hlint-plugin on GHC 9.2
   - attoparsec == 0.13.*                # 2022-02-23: Needed to compile elm for now
-  - base16-bytestring < 1               # required for cabal-install etc.
-  - basement < 0.0.15                   # 2022-08-30: last version to support GHC < 8.10
-  - brick == 0.70.*                     # 2022-08-13: needed by taskell
-  - brittany == 0.13.1.2                # 2022-09-20: needed for hls on ghc 8.8
-  - crackNum < 3.0                      # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
-  - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
-  - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
-  - doctest == 0.18.*                   # 2021-11-19: closest to stackage version for GHC 9.*
-  - foundation < 0.0.29                 # 2022-08-30: last version to support GHC < 8.10
   - ghc-api-compat == 8.10.7            # 2022-02-17: preserve for GHC 8.10.7
-  - ghc-api-compat == 8.6               # 2021-09-07: preserve for GHC 8.8.4
   - ghc-exactprint == 0.6.*             # 2022-12-12: needed for GHC < 9.2
   - ghc-exactprint == 1.5.*             # 2023-03-30: needed for GHC == 9.2
   - ghc-exactprint == 1.6.*             # 2023-03-30: needed for GHC == 9.4
@@ -73,36 +62,24 @@ extra-packages:
   - ghc-lib-parser == 9.8.*             # 2024-05-19: preserve for GHC 9.8
   - ghc-lib-parser-ex == 9.2.*          # 2022-07-13: preserve for GHC 8.10, 9.0
   - ghc-lib-parser-ex == 9.8.*          # 2024-05-19: preserve for GHC 9.8
-  - ghc-syntax-highlighter == 0.0.10.*  # 2023-11-20:
-  - gi-soup == 2.4.28                   # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages)
-  - haddock == 2.23.*                   # required on GHC < 8.10.x
-  - haddock-api == 2.23.*               # required on GHC < 8.10.x
-  - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
   - happy == 1.19.12                    # for ghcjs
   - hashable == 1.4.7.0                 # allows GHC 9.10
-  - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
   - ansi-wl-pprint >= 0.6 && < 0.7      # 2024-03-23: required for ghcjs
-  - hlint == 3.2.8                      # 2022-09-21: needed for hls on ghc 8.8
   - hlint == 3.4.1                      # 2022-09-21: needed for hls with ghc-lib-parser 9.2
   - hnix-store-core < 0.7               # 2023-12-11: required by hnix-store-remote 0.6
-  - hpack == 0.36.0                     # 2024-07-27: required for stack-2.15.7 to match upstream stack release
   - hspec < 2.8                         # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-core < 2.8                    # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-megaparsec == 2.2.0           # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS
   - hspec-meta < 2.8                    # 2022-12-07: Needed for elmPackages.elm / hspec-discover
-  - hspec-golden == 0.1.*               # 2022-04-07: Needed for elm-format
   - http2 < 3.3                         # 2023-08-24: Needed for twain 
   - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
   - language-docker == 11.0.0           # required by hadolint 2.12.0, 2022-11-16
   - language-javascript == 0.7.0.0      # required by purescript
-  - lens-aeson < 1.2                    # 2022-12-17: For aeson < 2.0 compat
   - lsp == 2.1.0.0                      # 2024-02-28: need for dhall-lsp-server unstable
   - lsp-types == 2.0.2.0                # 2024-02-28: need for dhall-lsp-server unstable
   - lsp < 2.5                           # 2024-07-08: need for koka
   - lsp-types < 2.2                     # 2024-07-08: need for koka
-  - mmorph == 1.1.3                     # Newest working version of mmorph on ghc 8.6.5. needed for hls
-  - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
   - optparse-applicative < 0.16         # needed for niv-0.2.19
   - fourmolu == 0.14.0.0                # 2023-11-13: for ghc-lib-parser 9.6 compat
   - fourmolu == 0.15.0.0                # 2024-07-07: for ghc 9.8 compat
@@ -110,13 +87,8 @@ extra-packages:
   - ormolu == 0.7.2.0                   # 2023-11-13: for ghc-lib-parser 9.6 compat
   - ormolu == 0.7.4.0                   # 2024-07-07: for ghc 9.8 compat
   - primitive-unlifted == 0.1.3.1       # 2024-03-16: Needed for hls on ghc 9.2
-  - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
-  - sbv == 7.13                         # required for pkgs.petrinizer
   - stylish-haskell == 0.14.4.0         # 2022-09-19: needed for hls on ghc 9.2
-  - tasty-hspec == 1.1.6                # 2022-04-07: Needed for elm-format
   - text == 2.0.2                       # 2023-09-14: Needed for elm (which is currently on ghc-8.10)
-  - th-abstraction < 0.6                # 2023-09-11: needed for aeson-2.2.0.0
-  - vty == 5.35.1                       # 2022-07-08: needed for glirc-2.39.0.1
   - warp < 3.3.31                       # 2024-03-20: for twain, which requires http2 3.0.3
   - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
   - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
@@ -136,6 +108,8 @@ extra-packages:
   - singletons-th == 3.3                # 2024-06-28: preserve for GHC 9.8
   - singletons-base == 3.3              # 2024-06-28: preserve for GHC 9.8
   - tls < 2.1.0                         # 2024-07-19: requested by darcs == 2.18.3
+  - extensions == 0.1.0.2               # 2024-10-20: for GHC 9.10/Cabal 3.12
+  - network-run == 0.4.0                # 2024-10-20: for GHC 9.10/network == 3.1.*
 
 package-maintainers:
   abbradar:
@@ -212,6 +186,7 @@ package-maintainers:
   bdesham:
     - pinboard-notes-backup
   cdepillabout:
+    - cloudy
     - password
     - password-instances
     - pretty-simple
@@ -249,16 +224,6 @@ package-maintainers:
     - tlynx
     - xmonad
     - xmonad-contrib
-  expipiplus1:
-    - VulkanMemoryAllocator
-    - autoapply
-    - exact-real
-    - language-c
-    - orbits
-    - update-nix-fetchgit
-    - vector-sized
-    - vulkan
-    - vulkan-utils
   erictapen:
     - hakyll
   evenbrenden:
@@ -677,6 +642,8 @@ package-maintainers:
     - minio-hs
     - smtp-mail
     - pdftotext
+  wolfgangwalther:
+    - postgrest
 
 unsupported-platforms:
   Allure:                                       [ platforms.darwin ]
@@ -744,10 +711,7 @@ unsupported-platforms:
   mpi-hs-cereal:                                [ aarch64-linux, platforms.darwin ]
   mpi-hs-store:                                 [ aarch64-linux, platforms.darwin ]
   mplayer-spot:                                 [ aarch64-linux, platforms.darwin ]
-  monomer:                                      [ platforms.darwin ] # depends on mesa
-  monomer-hagrid:                               [ platforms.darwin ] # depends on mesa
   mptcp-pm:                                     [ platforms.darwin ]
-  nanovg:                                       [ platforms.darwin ] # depends on mesa
   netlink:                                      [ platforms.darwin ]
   network-unexceptional:                        [ platforms.darwin ] # depends on posix-api
   notifications-tray-icon:                      [ platforms.darwin ] # depends on gi-dbusmenu
@@ -765,7 +729,6 @@ unsupported-platforms:
   reactive-balsa:                               [ platforms.darwin ] # depends on alsa-core
   reflex-dom-fragment-shader-canvas:            [ platforms.darwin, aarch64-linux ]
   reflex-localize-dom:                          [ platforms.darwin, aarch64-linux ]
-  rsi-break:                                    [ platforms.darwin ] # depends on monomer
   rtlsdr:                                       [ platforms.darwin ]
   rubberband:                                   [ platforms.darwin ]
   SDL-mixer:                                    [ platforms.darwin ] # depends on mesa
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 4384b2254f46..235261802442 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 22.33
+# Stackage LTS 22.36
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -16,7 +16,7 @@ default-package-overrides:
   - adjunctions ==4.4.2
   - adler32 ==0.1.2.0
   - aern2-mp ==0.2.15.1
-  - aern2-real ==0.2.15
+  - aern2-real ==0.2.15.1
   - aeson ==2.1.2.1
   - aeson-attoparsec ==0.0.0
   - aeson-casing ==0.2.0.0
@@ -480,7 +480,7 @@ default-package-overrides:
   - binary-shared ==0.8.3
   - binary-tagged ==0.3.1
   - bindings-DSL ==1.0.25
-  - bindings-GLFW ==3.3.9.1
+  - bindings-GLFW ==3.3.9.2
   - bindings-libzip ==1.0.1
   - bindings-uname ==0.1
   - BiobaseEnsembl ==0.2.0.1
@@ -563,11 +563,11 @@ default-package-overrides:
   - bytesmith ==0.3.11.1
   - bytestring-builder ==0.10.8.2.0
   - bytestring-conversion ==0.3.2
-  - bytestring-lexing ==0.5.0.12
+  - bytestring-lexing ==0.5.0.14
   - bytestring-strict-builder ==0.4.5.7
   - bytestring-to-vector ==0.3.0.1
   - bytestring-tree-builder ==0.2.7.12
-  - bytestring-trie ==0.2.7.3
+  - bytestring-trie ==0.2.7.5
   - bz2 ==1.0.1.2
   - bzip2-clib ==1.0.8
   - bzlib ==0.5.2.0
@@ -575,7 +575,7 @@ default-package-overrides:
   - c14n ==0.1.0.3
   - c2hs ==0.28.8
   - cabal2spec ==2.7.1
-  - cabal-appimage ==0.4.0.4
+  - cabal-appimage ==0.4.0.5
   - cabal-clean ==0.2.20230609
   - cabal-debian ==5.2.3
   - cabal-doctest ==1.0.10
@@ -627,7 +627,7 @@ default-package-overrides:
   - Chart-cairo ==1.9.4.1
   - Chart-diagrams ==1.9.5.1
   - chart-svg ==0.5.2.0
-  - ChasingBottoms ==1.3.1.14
+  - ChasingBottoms ==1.3.1.15
   - check-email ==1.0.2
   - checkers ==0.6.0
   - checksum ==0.0.0.1
@@ -705,7 +705,7 @@ default-package-overrides:
   - composite-xstep ==0.1.0.0
   - composition ==1.0.2.2
   - composition-extra ==2.1.0
-  - composition-prelude ==3.0.0.2
+  - composition-prelude ==3.0.1.0
   - concise ==0.1.0.1
   - concurrency ==1.11.0.3
   - concurrent-extra ==0.7.0.12
@@ -713,7 +713,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1.1
   - concurrent-supply ==0.1.8
   - cond ==0.5.1
-  - conduit ==1.3.5
+  - conduit ==1.3.6
   - conduit-aeson ==0.1.1.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.3
@@ -901,7 +901,7 @@ default-package-overrides:
   - diagrams-postscript ==1.5.1.1
   - diagrams-rasterific ==1.4.2.3
   - diagrams-solve ==0.1.3
-  - diagrams-svg ==1.4.3.1
+  - diagrams-svg ==1.4.3.2
   - dice ==0.1.1
   - di-core ==1.0.4
   - dictionary-sharing ==0.1.0.0
@@ -922,7 +922,7 @@ default-package-overrides:
   - discrimination ==0.5
   - disk-free-space ==0.1.0.1
   - distributed-closure ==0.5.0.0
-  - distributed-static ==0.3.10
+  - distributed-static ==0.3.11
   - distribution-opensuse ==1.1.4
   - distributive ==0.6.2.1
   - diversity ==0.8.1.0
@@ -934,7 +934,7 @@ default-package-overrides:
   - dns ==4.2.0
   - dockerfile ==0.2.0
   - doclayout ==0.4.0.1
-  - doctemplates ==0.11
+  - doctemplates ==0.11.0.1
   - doctest ==0.22.6
   - doctest-discover ==0.2.0.0
   - doctest-driver-gen ==0.3.0.8
@@ -989,7 +989,7 @@ default-package-overrides:
   - elerea ==2.9.0
   - elf ==0.31
   - eliminators ==0.9.3
-  - elm-bridge ==0.8.3
+  - elm-bridge ==0.8.4
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - elm-street ==0.2.2.1
@@ -1000,12 +1000,12 @@ default-package-overrides:
   - elynx-tools ==0.7.2.2
   - elynx-tree ==0.7.2.2
   - emacs-module ==0.2.1
-  - email-validate ==2.3.2.20
+  - email-validate ==2.3.2.21
   - emojis ==0.1.4.1
   - enclosed-exceptions ==1.0.3
   - ENIG ==0.0.1.0
   - entropy ==0.4.1.10
-  - enummapset ==0.7.2.0
+  - enummapset ==0.7.3.0
   - enumset ==0.1
   - enum-subset-generate ==0.1.0.1
   - enum-text ==0.5.3.0
@@ -1048,7 +1048,7 @@ default-package-overrides:
   - exp-pairs ==0.2.1.0
   - express ==1.0.16
   - extended-reals ==0.2.4.0
-  - extensible ==0.9
+  - extensible ==0.9.1
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
   - extra ==1.7.16
@@ -1068,7 +1068,7 @@ default-package-overrides:
   - fast-digits ==0.3.2.0
   - fast-logger ==3.2.3
   - fast-math ==1.0.2
-  - fast-myers-diff ==0.0.0
+  - fast-myers-diff ==0.0.1
   - fb ==2.1.1.1
   - fcf-family ==0.2.0.1
   - fclabels ==2.0.5.1
@@ -1123,8 +1123,8 @@ default-package-overrides:
   - focus ==1.0.3.2
   - focuslist ==0.1.1.0
   - foldable1-classes-compat ==0.1
-  - fold-debounce ==0.2.0.11
-  - foldl ==1.4.16
+  - fold-debounce ==0.2.0.12
+  - foldl ==1.4.17
   - folds ==0.7.8
   - FontyFruity ==0.5.3.5
   - force-layout ==0.4.0.6
@@ -1154,7 +1154,7 @@ default-package-overrides:
   - funcmp ==1.9
   - function-builder ==0.3.0.1
   - functor-classes-compat ==2.0.0.2
-  - fused-effects ==1.1.2.2
+  - fused-effects ==1.1.2.3
   - fusion-plugin ==0.2.7
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
@@ -1188,7 +1188,7 @@ default-package-overrides:
   - genvalidity-appendful ==0.1.0.0
   - genvalidity-bytestring ==1.0.0.1
   - genvalidity-case-insensitive ==0.0.0.1
-  - genvalidity-containers ==1.0.0.1
+  - genvalidity-containers ==1.0.0.2
   - genvalidity-criterion ==1.1.0.0
   - genvalidity-hspec ==1.0.0.3
   - genvalidity-hspec-aeson ==1.0.0.0
@@ -1253,7 +1253,7 @@ default-package-overrides:
   - gi-gdk ==3.0.29
   - gi-gdkpixbuf ==2.0.32
   - gi-gdkx11 ==3.0.16
-  - gi-gio ==2.0.34
+  - gi-gio ==2.0.35
   - gi-glib ==2.0.30
   - gi-gmodule ==2.0.6
   - gi-gobject ==2.0.31
@@ -1283,7 +1283,7 @@ default-package-overrides:
   - gl ==0.9
   - glabrous ==2.0.6.3
   - glasso ==0.1.0
-  - GLFW-b ==3.3.9.0
+  - GLFW-b ==3.3.9.1
   - glib ==0.13.11.0
   - glib-stopgap ==0.1.0.0
   - Glob ==0.10.2
@@ -1343,12 +1343,12 @@ default-package-overrides:
   - hashing ==0.1.1.0
   - hashmap ==1.3.3
   - hashtables ==1.3.1
-  - haskell-gi ==0.26.10
-  - haskell-gi-base ==0.26.6
+  - haskell-gi ==0.26.11
+  - haskell-gi-base ==0.26.8
   - haskell-gi-overloading ==1.0
   - haskell-lexer ==1.1.1
   - HaskellNet ==0.6.1.2
-  - haskell-src ==1.0.4
+  - haskell-src ==1.0.4.1
   - haskell-src-exts ==1.23.1
   - haskell-src-exts-simple ==1.23.0.0
   - haskell-src-exts-util ==0.2.5
@@ -1397,7 +1397,7 @@ default-package-overrides:
   - heterocephalus ==1.0.5.7
   - hetzner ==0.6.0.0
   - hex ==0.2.0
-  - hexml ==0.3.4
+  - hexml ==0.3.5
   - hexml-lens ==0.2.2
   - hexpat ==0.20.13
   - hex-text ==0.1.0.9
@@ -1476,7 +1476,7 @@ default-package-overrides:
   - hslua-classes ==2.3.1
   - hslua-cli ==1.4.3
   - hslua-core ==2.3.2
-  - hslua-list ==1.1.1
+  - hslua-list ==1.1.3
   - hslua-marshalling ==2.3.1
   - hslua-module-doclayout ==1.1.1.2
   - hslua-module-path ==1.1.1
@@ -1490,7 +1490,7 @@ default-package-overrides:
   - hslua-typing ==0.1.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.7.7
+  - HsOpenSSL ==0.11.7.8
   - HsOpenSSL-x509-system ==0.1.0.4
   - hspec ==2.11.9
   - hspec-api ==2.11.9
@@ -1541,7 +1541,7 @@ default-package-overrides:
   - http-client-restricted ==0.1.0
   - http-client-tls ==0.3.6.3
   - http-common ==0.8.3.4
-  - http-conduit ==2.3.8.3
+  - http-conduit ==2.3.9
   - http-date ==0.0.11
   - http-directory ==0.1.10
   - http-download ==0.2.1.0
@@ -1668,7 +1668,7 @@ default-package-overrides:
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
   - isocline ==1.0.9
-  - isomorphism-class ==0.1.0.12
+  - isomorphism-class ==0.1.1
   - ixset-typed ==0.5.1.0
   - ixset-typed-binary-instance ==0.1.0.2
   - ixset-typed-hashable-instance ==0.1.0.2
@@ -1691,7 +1691,7 @@ default-package-overrides:
   - jsonifier ==0.2.1.3
   - jsonpath ==0.3.0.0
   - json-rpc ==1.0.4
-  - json-stream ==0.4.5.3
+  - json-stream ==0.4.6.0
   - JuicyPixels ==3.3.9
   - JuicyPixels-extra ==0.6.0
   - JuicyPixels-scale-dct ==0.1.2
@@ -1700,7 +1700,7 @@ default-package-overrides:
   - jwt ==0.11.0
   - kan-extensions ==5.2.6
   - kansas-comet ==0.4.2
-  - katip ==0.8.8.0
+  - katip ==0.8.8.2
   - katip-logstash ==0.1.0.2
   - katip-wai ==0.1.2.4
   - kazura-queue ==0.1.0.4
@@ -1827,7 +1827,7 @@ default-package-overrides:
   - lpeg ==1.0.4
   - LPFP-core ==1.1.1
   - lrucache ==1.2.0.1
-  - lua ==2.3.2
+  - lua ==2.3.3
   - lua-arbitrary ==1.0.1.1
   - lucid2 ==0.0.20240424
   - lucid ==2.11.20230408
@@ -1973,7 +1973,7 @@ default-package-overrides:
   - monoid-subclasses ==1.2.5.1
   - monoid-transformer ==0.0.4
   - monomer ==1.6.0.1
-  - mono-traversable ==1.0.17.0
+  - mono-traversable ==1.0.20.0
   - mono-traversable-instances ==0.1.1.0
   - mono-traversable-keys ==0.3.0
   - more-containers ==0.2.2.2
@@ -2050,7 +2050,7 @@ default-package-overrides:
   - network-multicast ==0.3.2
   - network-run ==0.2.8
   - network-simple ==0.4.5
-  - network-transport ==0.5.7
+  - network-transport ==0.5.8
   - network-uri ==2.6.4.2
   - network-wait ==0.2.0.0
   - newtype ==0.2.2.0
@@ -2099,7 +2099,7 @@ default-package-overrides:
   - ofx ==0.4.4.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.4
-  - om-elm ==2.0.0.6
+  - om-elm ==2.0.0.7
   - once ==0.4
   - one-liner ==2.1
   - one-liner-instances ==0.1.3.0
@@ -2153,7 +2153,7 @@ default-package-overrides:
   - pandoc-cli ==3.1.11.1
   - pandoc-dhall-decoder ==0.1.0.1
   - pandoc-lua-engine ==0.2.1.2
-  - pandoc-lua-marshal ==0.2.7.1
+  - pandoc-lua-marshal ==0.2.8
   - pandoc-plot ==1.8.0
   - pandoc-server ==0.1.0.5
   - pandoc-throw ==0.1.0.0
@@ -2164,7 +2164,7 @@ default-package-overrides:
   - parallel ==3.2.2.0
   - parallel-io ==0.3.5
   - parameterized ==0.5.0.0
-  - parameterized-utils ==2.1.8.0
+  - parameterized-utils ==2.1.9.0
   - park-bench ==0.1.1.0
   - parseargs ==0.2.0.9
   - parsec-class ==1.0.1.0
@@ -2214,11 +2214,11 @@ default-package-overrides:
   - perfect-hash-generator ==1.0.0
   - persistable-record ==0.6.0.6
   - persistable-types-HDBC-pg ==0.0.3.5
-  - persistent ==2.14.6.2
+  - persistent ==2.14.6.3
   - persistent-discover ==0.1.0.7
   - persistent-iproute ==0.2.5
   - persistent-lens ==1.0.0
-  - persistent-mongoDB ==2.13.0.1
+  - persistent-mongoDB ==2.13.1.0
   - persistent-mtl ==0.5.1
   - persistent-mysql ==2.13.1.5
   - persistent-pagination ==0.1.1.2
@@ -2356,7 +2356,7 @@ default-package-overrides:
   - pureMD5 ==2.1.4
   - purescript-bridge ==0.15.0.0
   - purview ==0.2.0.2
-  - pusher-http-haskell ==2.1.0.17
+  - pusher-http-haskell ==2.1.0.18
   - pvar ==1.0.0.0
   - pwstore-fast ==2.4.4
   - PyF ==0.11.3.0
@@ -2403,7 +2403,7 @@ default-package-overrides:
   - Ranged-sets ==0.4.0
   - ranges ==0.2.4
   - range-set-list ==0.1.3.1
-  - rank1dynamic ==0.4.1
+  - rank1dynamic ==0.4.2
   - rank2classes ==1.5.3.1
   - Rasterific ==0.7.5.4
   - rasterific-svg ==0.3.3.2
@@ -2477,7 +2477,7 @@ default-package-overrides:
   - resolv ==0.2.0.2
   - resource-pool ==0.4.0.0
   - resourcet ==1.3.0
-  - rest-rewrite ==0.4.3
+  - rest-rewrite ==0.4.4
   - result ==0.2.6.0
   - retry ==0.9.3.1
   - rex ==0.6.2
@@ -2511,7 +2511,7 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - run-st ==0.1.3.3
   - rvar ==0.3.0.2
-  - rzk ==0.7.4
+  - rzk ==0.7.5
   - s3-signer ==0.5.0.0
   - safe ==0.3.21
   - safe-coloured-text ==0.2.0.2
@@ -2535,7 +2535,7 @@ default-package-overrides:
   - sampling ==0.3.5
   - sandi ==0.5
   - sandwich ==0.2.2.0
-  - sandwich-hedgehog ==0.1.3.0
+  - sandwich-hedgehog ==0.1.3.1
   - sandwich-quickcheck ==0.1.0.7
   - sandwich-slack ==0.1.2.0
   - sandwich-webdriver ==0.2.3.1
@@ -2574,41 +2574,41 @@ default-package-overrides:
   - seqalign ==0.2.0.4
   - seqid ==0.6.3
   - seqid-streams ==0.7.2
-  - sequence-formats ==1.8.1.0
+  - sequence-formats ==1.8.1.1
   - sequenceTools ==1.5.3.1
   - serialise ==0.2.6.1
-  - servant ==0.20.1
-  - servant-auth ==0.4.1.0
-  - servant-auth-client ==0.4.1.1
-  - servant-auth-docs ==0.2.10.1
-  - servant-auth-server ==0.4.8.0
-  - servant-auth-swagger ==0.2.10.2
+  - servant ==0.20.2
+  - servant-auth ==0.4.2.0
+  - servant-auth-client ==0.4.2.0
+  - servant-auth-docs ==0.2.11.0
+  - servant-auth-server ==0.4.9.0
+  - servant-auth-swagger ==0.2.11.0
   - servant-blaze ==0.9.1
   - servant-checked-exceptions ==2.2.0.1
   - servant-checked-exceptions-core ==2.2.0.1
-  - servant-client ==0.20
-  - servant-client-core ==0.20
-  - servant-conduit ==0.16
-  - servant-docs ==0.13
+  - servant-client ==0.20.2
+  - servant-client-core ==0.20.2
+  - servant-conduit ==0.16.1
+  - servant-docs ==0.13.1
   - servant-elm ==0.7.3
   - servant-exceptions ==0.2.1
   - servant-exceptions-server ==0.2.1
-  - servant-foreign ==0.16
-  - servant-http-streams ==0.20
+  - servant-foreign ==0.16.1
+  - servant-http-streams ==0.20.2
   - servant-JuicyPixels ==0.3.1.1
   - servant-lucid ==0.9.0.6
-  - servant-machines ==0.16
+  - servant-machines ==0.16.1
   - servant-multipart ==0.12.1
   - servant-multipart-api ==0.12.1
   - servant-multipart-client ==0.12.2
   - servant-openapi3 ==2.0.1.6
-  - servant-pipes ==0.16
+  - servant-pipes ==0.16.1
   - servant-rate-limit ==0.2.0.0
   - servant-rawm ==1.0.0.0
-  - servant-server ==0.20
+  - servant-server ==0.20.2
   - servant-static-th ==1.0.0.0
   - servant-subscriber ==0.7.0.0
-  - servant-swagger ==1.2
+  - servant-swagger ==1.2.1
   - servant-swagger-ui ==0.3.5.5.0.0
   - servant-swagger-ui-core ==0.3.5
   - servant-swagger-ui-redoc ==0.3.4.1.22.3
@@ -2671,13 +2671,13 @@ default-package-overrides:
   - singletons-th ==3.2
   - Sit ==0.2023.8.3
   - sitemap-gen ==0.1.0.0
-  - size-based ==0.1.3.2
+  - size-based ==0.1.3.3
   - sized ==1.1.0.2
   - skein ==1.0.9.4
   - skews ==0.1.0.3
   - skip-var ==0.1.1.0
-  - skylighting ==0.14.2
-  - skylighting-core ==0.14.2
+  - skylighting ==0.14.3
+  - skylighting-core ==0.14.3
   - skylighting-format-ansi ==0.1
   - skylighting-format-blaze-html ==0.1.1.2
   - skylighting-format-context ==0.1.0.2
@@ -2818,7 +2818,7 @@ default-package-overrides:
   - sydtest-rabbitmq ==0.1.0.0
   - sydtest-servant ==0.2.0.2
   - sydtest-typed-process ==0.0.0.0
-  - sydtest-wai ==0.2.0.1
+  - sydtest-wai ==0.2.0.2
   - sydtest-webdriver ==0.0.0.1
   - sydtest-webdriver-screenshot ==0.0.0.2
   - sydtest-webdriver-yesod ==0.0.0.1
@@ -2914,7 +2914,7 @@ default-package-overrides:
   - text-ansi ==0.3.0.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.7.2
-  - text-builder-dev ==0.3.4.4
+  - text-builder-dev ==0.3.5
   - text-builder-linear ==0.1.3
   - text-conversions ==0.3.1.1
   - text-format ==0.3.2.1
@@ -3033,7 +3033,7 @@ default-package-overrides:
   - twitter-types ==0.11.0
   - twitter-types-lens ==0.11.0
   - typecheck-plugin-nat-simple ==0.1.0.9
-  - typed-process ==0.2.11.1
+  - typed-process ==0.2.12.0
   - typed-uuid ==0.2.0.0
   - type-equality ==1.0.1
   - type-errors ==0.2.0.2
@@ -3095,7 +3095,7 @@ default-package-overrides:
   - universe-reverse-instances ==1.1.1
   - universe-some ==1.2.1
   - universum ==1.8.2.1
-  - unix-bytestring ==0.4.0.1
+  - unix-bytestring ==0.4.0.2
   - unix-compat ==0.7.2
   - unix-time ==0.4.15
   - unjson ==0.15.4
@@ -3127,7 +3127,7 @@ default-package-overrides:
   - validity-aeson ==0.2.0.5
   - validity-bytestring ==0.4.1.1
   - validity-case-insensitive ==0.0.0.0
-  - validity-containers ==0.5.0.4
+  - validity-containers ==0.5.0.5
   - validity-network-uri ==0.0.0.1
   - validity-path ==0.4.0.1
   - validity-persistent ==0.0.0.0
@@ -3207,7 +3207,7 @@ default-package-overrides:
   - wai-websockets ==3.0.1.2
   - wakame ==0.1.0.0
   - warp ==3.3.31
-  - warp-tls ==3.4.6
+  - warp-tls ==3.4.7
   - wave ==0.2.1
   - wcwidth ==0.0.2
   - webdriver ==0.12.0.0
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 721cb18a8475..9fef480d2c11 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -732,6 +732,7 @@ dont-distribute-packages:
  - cabal-cargs
  - cabal-fix
  - cabal-query
+ - cabal-scaffold
  - cabal-test
  - cabal2arch
  - cabalmdvrpm
@@ -964,14 +965,14 @@ dont-distribute-packages:
  - copilot-cbmc
  - copilot-frp-sketch
  - copilot-language
- - copilot-language_3_20
+ - copilot-language_4_0
  - copilot-libraries
- - copilot-libraries_3_20
+ - copilot-libraries_4_0
  - copilot-sbv
  - copilot-theorem
- - copilot-theorem_3_20
+ - copilot-theorem_4_0
  - copilot-verifier
- - copilot_3_20
+ - copilot_4_0
  - corenlp-parser
  - coroutine-enumerator
  - coroutine-iteratee
@@ -988,7 +989,7 @@ dont-distribute-packages:
  - cqrs-test
  - cqrs-testkit
  - crackNum
- - crackNum_3_12
+ - crackNum_3_14
  - craft
  - craftwerk-cairo
  - craftwerk-gtk
@@ -1162,7 +1163,7 @@ dont-distribute-packages:
  - distribution-plot
  - dixi
  - dl-fedora
- - dl-fedora_1_1
+ - dl-fedora_1_2
  - dmenu-pkill
  - dmenu-pmount
  - dmenu-search
@@ -1469,8 +1470,6 @@ dont-distribute-packages:
  - gelatin-gl
  - gelatin-sdl2
  - gelatin-shaders
- - gemini-router
- - gemini-textboard
  - gencheck
  - generic-accessors
  - generic-override-aeson
@@ -1501,7 +1500,6 @@ dont-distribute-packages:
  - gi-cairo-again
  - gi-ges
  - gi-gstpbutils
- - gi-gtk-declarative-app-simple
  - git-config
  - git-fmt
  - git-gpush
@@ -1511,6 +1509,7 @@ dont-distribute-packages:
  - gitdo
  - github-data
  - github-webhook-handler-snap
+ - github-workflow-commands
  - gitlib-cross
  - gitlib-s3
  - gitson
@@ -1521,7 +1520,6 @@ dont-distribute-packages:
  - glazier-react
  - glazier-react-examples
  - glazier-react-widget
- - glirc
  - global
  - global-config
  - glome-hs
@@ -1796,6 +1794,7 @@ dont-distribute-packages:
  - gtk2hs-cast-gtksourceview2
  - gtkimageview
  - gtkrsync
+ - gtvm-hs
  - guarded-rewriting
  - guess-combinator
  - h3spec
@@ -1823,7 +1822,6 @@ dont-distribute-packages:
  - hackage2twitter
  - hackmanager
  - haddock
- - haddock_2_23_1
  - haddocset
  - hadoop-tools
  - haggis
@@ -2440,7 +2438,6 @@ dont-distribute-packages:
  - keera-hails-reactivelenses
  - keera-posture
  - keid-resource-gltf
- - keid-ui-dearimgui
  - kerry
  - kevin
  - key-vault
@@ -2463,6 +2460,7 @@ dont-distribute-packages:
  - kubernetes-client
  - kure-your-boilerplate
  - kurita
+ - kvitable_1_1_0_1
  - laborantin-hs
  - labsat
  - labyrinth
@@ -3051,6 +3049,10 @@ dont-distribute-packages:
  - peyotls
  - peyotls-codec
  - pg-entity
+ - phladiprelio-general-shared
+ - phladiprelio-general-simple
+ - phladiprelio-ukrainian-shared
+ - phladiprelio-ukrainian-simple
  - phonetic-languages-common
  - phonetic-languages-constraints
  - phonetic-languages-examples
@@ -3547,7 +3549,6 @@ dont-distribute-packages:
  - serv
  - serv-wai
  - servant-aeson-generics-typescript
- - servant-auth-client_0_4_2_0
  - servant-auth-hmac
  - servant-auth-token
  - servant-auth-token-acid
@@ -3811,7 +3812,7 @@ dont-distribute-packages:
  - sydtest-webdriver-screenshot_0_1_0_0
  - sydtest-webdriver-yesod
  - sydtest-yesod
- - sydtest_0_17_0_0
+ - sydtest_0_18_0_0
  - sylvia
  - symantic-atom
  - symantic-http-demo
@@ -4012,6 +4013,7 @@ dont-distribute-packages:
  - ukrainian-phonetics-basic
  - unagi-bloomfilter
  - unbound
+ - unbound-generics-unify
  - unbound-kind-generics
  - unfoldable-restricted
  - uni-events
@@ -4170,7 +4172,7 @@ dont-distribute-packages:
  - werewolf-slack
  - wgpu-hs
  - what4
- - what4_1_6
+ - what4_1_6_2
  - wheb-mongo
  - wheb-redis
  - wheb-strapped
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 0b7264e175db..28fd6880eb6c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -188,27 +188,27 @@ self: super: builtins.intersectAttrs super {
       hledger-web = installHledgerExtraFiles "" (hledgerWebTestFix super.hledger-web);
       hledger-ui = installHledgerExtraFiles "" super.hledger-ui;
 
-      hledger_1_34 = installHledgerExtraFiles "embeddedfiles"
-        (doDistribute (super.hledger_1_34.override {
-          hledger-lib = self.hledger-lib_1_34;
+      hledger_1_40 = installHledgerExtraFiles "embeddedfiles"
+        (doDistribute (super.hledger_1_40.override {
+          hledger-lib = self.hledger-lib_1_40;
         }));
-      hledger-ui_1_34 = installHledgerExtraFiles ""
-        (doDistribute (super.hledger-ui_1_34.override {
-          hledger = self.hledger_1_34;
-          hledger-lib = self.hledger-lib_1_34;
+      hledger-ui_1_40 = installHledgerExtraFiles ""
+        (doDistribute (super.hledger-ui_1_40.override {
+          hledger = self.hledger_1_40;
+          hledger-lib = self.hledger-lib_1_40;
         }));
-      hledger-web_1_34 = installHledgerExtraFiles "" (hledgerWebTestFix
-        (doDistribute (super.hledger-web_1_34.override {
-          hledger = self.hledger_1_34;
-          hledger-lib = self.hledger-lib_1_34;
+      hledger-web_1_40 = installHledgerExtraFiles "" (hledgerWebTestFix
+        (doDistribute (super.hledger-web_1_40.override {
+          hledger = self.hledger_1_40;
+          hledger-lib = self.hledger-lib_1_40;
         })));
     }
   ) hledger
     hledger-web
     hledger-ui
-    hledger_1_34
-    hledger-ui_1_34
-    hledger-web_1_34
+    hledger_1_40
+    hledger-ui_1_40
+    hledger-web_1_40
     ;
 
   cufft = overrideCabal (drv: {
@@ -376,6 +376,9 @@ self: super: builtins.intersectAttrs super {
   mustache = dontCheck super.mustache;
   arch-web = dontCheck super.arch-web;
 
+  # Tries accessing the GitHub API
+  github-app-token = dontCheck super.github-app-token;
+
   # The curl executable is required for withApplication tests.
   warp = addTestToolDepend pkgs.curl super.warp;
   warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30;
@@ -1117,6 +1120,22 @@ self: super: builtins.intersectAttrs super {
     (dontCheckIf (!pkgs.postgresql.doCheck))
   ];
 
+  cloudy =
+    pkgs.lib.pipe
+      super.cloudy
+      [
+        # The code-path that generates the optparse-applicative completions uses
+        # the HOME directory, so that must be set in order to generate completions.
+        # https://github.com/cdepillabout/cloudy/issues/10
+        ( overrideCabal (oldAttrs: {
+            postInstall = ''
+                export HOME=$TMPDIR
+              '' + (oldAttrs.postInstall or "");
+          })
+        )
+        (self.generateOptparseApplicativeCompletions ["cloudy"])
+      ];
+
   # Wants running postgresql database accessible over ip, so postgresqlTestHook
   # won't work (or would need to patch test suite).
   domaindriven-core = dontCheck super.domaindriven-core;
@@ -1368,11 +1387,12 @@ self: super: builtins.intersectAttrs super {
       gi-javascriptcore
       gi-webkit2webextension
       gi-gtk_4_0_9
-      gi-gdk_4_0_8
+      gi-gdk_4_0_9
       gi-gsk
       gi-adwaita
       sdl2-ttf
       sdl2
+      dear-imgui
       ;
 
     webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 92c2451a5df1..14afa3dfe6b4 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,6 +34,8 @@ in
 , version, revision ? null
 , sha256 ? null
 , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
+, sourceRoot ? null
+, setSourceRoot ? null
 , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
 , buildTarget ? ""
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
@@ -825,6 +827,8 @@ stdenv.mkDerivation ({
          ;
 
 }
+// optionalAttrs (args ? sourceRoot)             { inherit sourceRoot; }
+// optionalAttrs (args ? setSourceRoot)          { inherit setSourceRoot; }
 // optionalAttrs (args ? preCompileBuildDriver)  { inherit preCompileBuildDriver; }
 // optionalAttrs (args ? postCompileBuildDriver) { inherit postCompileBuildDriver; }
 // optionalAttrs (args ? preUnpack)              { inherit preUnpack; }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8439316bbc99..6e73461e51e5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -820,8 +820,8 @@ self: {
      }:
      mkDerivation {
        pname = "Agda";
-       version = "2.7.0";
-       sha256 = "005rsk46b7rl516n58cfzg5aqzqwb1gkz7wpz2lqg0qlrlw0jyh0";
+       version = "2.7.0.1";
+       sha256 = "13pn0mbxyfy04fcdl68l2m36b40hwk8iwpkqdfad3xsf9l5ddxil";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -1170,8 +1170,8 @@ self: {
      }:
      mkDerivation {
        pname = "AsyncRattus";
-       version = "0.2.0.1";
-       sha256 = "0ay2j22x0awmlqvskwzslv637jqac5byf0pkmy4ymfmgkhpay9sn";
+       version = "0.2.0.2";
+       sha256 = "07m3iksjqs5zkm4vxjjlmamhj7lq3hal4yxsmv2zci0bq2ak7qs7";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base containers ghc ghc-boot hashtables simple-affine-space
@@ -2887,26 +2887,6 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "Cabal_3_6_3_0" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, mtl, parsec, pretty, process, text
-     , time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "Cabal";
-       version = "3.6.3.0";
-       sha256 = "0xxbciinap6938jldj16009s4rqjdd9dbbjvnjzgzs58sj4gx89g";
-       setupHaskellDepends = [ mtl parsec ];
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         mtl parsec pretty process text time transformers unix
-       ];
-       doCheck = false;
-       description = "A framework for packaging Haskell software";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "Cabal_3_10_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers
      , deepseq, directory, filepath, mtl, parsec, pretty, process, text
@@ -2947,6 +2927,26 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "Cabal_3_14_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers
+     , deepseq, directory, filepath, mtl, parsec, pretty, process, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "3.14.0.0";
+       sha256 = "0pfvw4r4xdnis34k4pz987283g2r5gv3akxnfp7s3jgxffd7nm94";
+       setupHaskellDepends = [ mtl parsec ];
+       libraryHaskellDepends = [
+         array base bytestring Cabal-syntax containers deepseq directory
+         filepath mtl parsec pretty process time transformers unix
+       ];
+       doCheck = false;
+       description = "A framework for packaging Haskell software";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -3043,6 +3043,25 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "Cabal-syntax_3_14_0_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, mtl, parsec, pretty, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "Cabal-syntax";
+       version = "3.14.0.0";
+       sha256 = "0c9gwm9za13zvrwbq2lgzfcw6r42r2pwc424qk3vjnv4kazrni5x";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         mtl parsec pretty text time transformers
+       ];
+       libraryToolDepends = [ alex ];
+       description = "A library for working with .cabal files";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "CabalSearch" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HDBC
      , HDBC-sqlite3, process, unix
@@ -3206,6 +3225,8 @@ self: {
        pname = "Chart";
        version = "1.9.5";
        sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc";
+       revision = "1";
+       editedCabalFile = "0gi758fccq3674sxzs5qcdlyjivh78lzin5k4cb15d3gscjakkhk";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
@@ -3222,6 +3243,8 @@ self: {
        pname = "Chart-cairo";
        version = "1.9.4.1";
        sha256 = "0x10l9y38bscx88n849k9ybn7axp4j9hlivc1jv9wwvv4gqw5jr7";
+       revision = "1";
+       editedCabalFile = "193liy309yb9dnlfzfrc2kis0g8mj6ni1pqfr4kpn860r1m5gr5b";
        libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
@@ -3240,6 +3263,8 @@ self: {
        pname = "Chart-diagrams";
        version = "1.9.5.1";
        sha256 = "1pk2fsmjl2dsabzpdwk3190nw0nwy581c4qsl93npx764qcxkp7q";
+       revision = "1";
+       editedCabalFile = "0s2c4qrmy21y7cmsq24g67fw1q5vsspda8bz2ybp6117crnzw817";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
@@ -3347,26 +3372,6 @@ self: {
      }) {};
 
   "ChasingBottoms" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
-     , syb
-     }:
-     mkDerivation {
-       pname = "ChasingBottoms";
-       version = "1.3.1.14";
-       sha256 = "0rmpi7n0b9spvx84645z2zcnnvg75s40zl05c8iigzciyjax3v5y";
-       revision = "1";
-       editedCabalFile = "12ndnigvq4bhw65ia2ahy741krph0p1w50d8q9irw3ggaic9ijry";
-       libraryHaskellDepends = [
-         base containers mtl QuickCheck random syb
-       ];
-       testHaskellDepends = [
-         array base containers mtl QuickCheck random syb
-       ];
-       description = "For testing partial and infinite values";
-       license = lib.licenses.mit;
-     }) {};
-
-  "ChasingBottoms_1_3_1_15" = callPackage
     ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
      , syb
      }:
@@ -3382,7 +3387,6 @@ self: {
        ];
        description = "For testing partial and infinite values";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CheatSheet" = callPackage
@@ -4844,24 +4848,6 @@ self: {
        broken = true;
      }) {};
 
-  "Diff_0_3_4" = callPackage
-    ({ mkDerivation, array, base, directory, pretty, process
-     , QuickCheck, test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "Diff";
-       version = "0.3.4";
-       sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp";
-       libraryHaskellDepends = [ array base pretty ];
-       testHaskellDepends = [
-         array base directory pretty process QuickCheck test-framework
-         test-framework-quickcheck2
-       ];
-       description = "O(ND) diff algorithm in haskell";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "Diff" = callPackage
     ({ mkDerivation, array, base, directory, pretty, process
      , QuickCheck, test-framework, test-framework-quickcheck2
@@ -7131,8 +7117,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLFW-b";
-       version = "3.3.9.0";
-       sha256 = "12n75mh0szw43y1fqsf95cbwvqy9gmmq7h3lii7gs02mv45fysrc";
+       version = "3.3.9.1";
+       sha256 = "0slj4a12y8n3api71kshfnhnqxd4zaf020lm1050bq0jsx35pja6";
        libraryHaskellDepends = [ array base bindings-GLFW deepseq ];
        testHaskellDepends = [
          array base bindings-GLFW deepseq HUnit test-framework
@@ -11514,20 +11500,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.7.7";
-       sha256 = "0aza9w7ny1aangaspg4wkzhy0s26ngvfdq4zrd24iha1d9qh4nq8";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring network time ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       description = "Partial OpenSSL binding for Haskell";
-       license = lib.licenses.publicDomain;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_7_8" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
      mkDerivation {
        pname = "HsOpenSSL";
@@ -11539,7 +11511,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Partial OpenSSL binding for Haskell";
        license = lib.licenses.publicDomain;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
@@ -13990,10 +13961,8 @@ self: {
      }:
      mkDerivation {
        pname = "MIP";
-       version = "0.1.1.0";
-       sha256 = "03gzwg0hzgij9hpxxfsrdxx2cknfy9fr9h1w1na04bmzpai1sl40";
-       revision = "2";
-       editedCabalFile = "03kjzsyd3sy9iipdnac5ddpkq6v1cfpj0wh00r3yvcjgrk99ycip";
+       version = "0.1.2.0";
+       sha256 = "0klbcqzi7iq0fffci9mq98smx0wksij4cfmg09v7k37dhs958mgd";
        libraryHaskellDepends = [
          base bytestring bytestring-encoding case-insensitive containers
          data-default-class extended-reals filepath intern lattices
@@ -14113,6 +14082,18 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "Mantissa" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "Mantissa";
+       version = "0.1.0.0";
+       sha256 = "1xi8pc9gz6j1bvz77mgfh6xw39dbxb6hjrfqj3kx5d702j1y8b9l";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "Reals in the interval [0,1), as machine words";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "Map" = callPackage
     ({ mkDerivation, base, containers, either-both, filtrable
      , smallcheck, tasty, tasty-smallcheck, util
@@ -14368,8 +14349,8 @@ self: {
     ({ mkDerivation, base, directory, process }:
      mkDerivation {
        pname = "MicroCabal";
-       version = "0.2.0.0";
-       sha256 = "1i5y0xkq0ac74yrjmk9s2vjlgbiscz0d6b1kll42mbk6adkfd02x";
+       version = "0.2.1.1";
+       sha256 = "0yln9inja3m624qqpslws8jxk4x27v0yy7pc7p7915c15lxnpy68";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory process ];
@@ -14384,15 +14365,15 @@ self: {
      }:
      mkDerivation {
        pname = "MicroHs";
-       version = "0.9.17.0";
-       sha256 = "00dvbpdpbx1dh44rixsw16gb748bdxiizdivnl3i4v9826hfx8x0";
+       version = "0.9.18.0";
+       sha256 = "1w1aazbsl80xk6kxmkcii6y33i42hw64bhjwcn62grh5xb220hag";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base deepseq directory ghc-prim haskeline process text time
        ];
-       description = "A compiler for Haskell";
+       description = "A small compiler for Haskell";
        license = lib.licenses.asl20;
        mainProgram = "mhs";
      }) {};
@@ -16898,8 +16879,8 @@ self: {
     ({ mkDerivation, base, containers, diagrams-lib, hspec }:
      mkDerivation {
        pname = "PenroseKiteDart";
-       version = "1.0.0";
-       sha256 = "068r77shs4j5vhwdzwwxq0c3ajx0nhrm8apdb8j2h5kb0s3yav5y";
+       version = "1.1.0";
+       sha256 = "0m1wigw2n2cp1cgbj615xrzqq81yaaprdrfnpd7qilnzijrp0biq";
        libraryHaskellDepends = [ base containers diagrams-lib ];
        testHaskellDepends = [ base containers diagrams-lib hspec ];
        benchmarkHaskellDepends = [ base containers diagrams-lib ];
@@ -19060,6 +19041,8 @@ self: {
        pname = "SVGFonts";
        version = "1.8.0.1";
        sha256 = "0r3z7i7x56qvhyc51jlq084c1biy9xn72nm19mw116gx49rm32k9";
+       revision = "1";
+       editedCabalFile = "0w4bcmfja0spjwfiysa6xzvr6k1f2b8qp5r57b9138zrcllzkrap";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
@@ -20044,6 +20027,8 @@ self: {
        pname = "Sit";
        version = "0.2023.8.3";
        sha256 = "1psmfgh1bklx52az1097n23nzfjnab002dcqrq140jqhnpfw7ynr";
+       revision = "1";
+       editedCabalFile = "0f2dwl2p9xms7qxsnsf18hmywvlsz96gb6zdzc2nmcr367vqkkcd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -22275,7 +22260,6 @@ self: {
        badPlatforms = [
          "i686-linux" "armv7l-linux"
        ] ++ lib.platforms.darwin;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "WAVE" = callPackage
@@ -26027,14 +26011,36 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "aern2-mp_0_2_16_0" = callPackage
+    ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec
+     , integer-logarithms, mixed-types-num, QuickCheck, reflection
+     , regex-tdfa, template-haskell
+     }:
+     mkDerivation {
+       pname = "aern2-mp";
+       version = "0.2.16.0";
+       sha256 = "1q9rc53zj49yfn5ap8khx8gvgphw7dr86agi77xaj1d0d97x35pi";
+       libraryHaskellDepends = [
+         base cdar-mBound collect-errors deepseq hspec integer-logarithms
+         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
+       ];
+       testHaskellDepends = [
+         base cdar-mBound collect-errors deepseq hspec integer-logarithms
+         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
+       ];
+       description = "Multi-precision ball (interval) arithmetic";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "aern2-real" = callPackage
     ({ mkDerivation, aern2-mp, base, collect-errors, hspec
      , integer-logarithms, mixed-types-num, QuickCheck
      }:
      mkDerivation {
        pname = "aern2-real";
-       version = "0.2.15";
-       sha256 = "0r3b2m728dwsyj5qcy7pczmbvcnb7712jj830pssy2065d1ws2rx";
+       version = "0.2.15.1";
+       sha256 = "0vil86s8cmigdk8wss0kxa74p4bw6f56lmxi9x0gm62xnj63awvg";
        libraryHaskellDepends = [
          aern2-mp base collect-errors hspec integer-logarithms
          mixed-types-num QuickCheck
@@ -26047,6 +26053,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "aern2-real_0_2_16_0" = callPackage
+    ({ mkDerivation, aern2-mp, base, collect-errors, hspec
+     , integer-logarithms, mixed-types-num, QuickCheck
+     }:
+     mkDerivation {
+       pname = "aern2-real";
+       version = "0.2.16.0";
+       sha256 = "14rdjkqpmk4f7135ssn03b7bqbakixx0hrrx742dc379pjq57k7d";
+       libraryHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
+       testHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
+       description = "Real numbers as convergent sequences of intervals";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "aeson_1_5_6_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat
      , base-compat-batteries, base-orphans, base16-bytestring
@@ -27351,6 +27378,32 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "aftovolio" = callPackage
+    ({ mkDerivation, async, base, cli-arguments, containers, deepseq
+     , directory, intermediate-structures, lists-flines, minmax
+     , mmsyn2-array, monoid-insertleft, quantizer, rev-scientific
+     , rhythmic-sequences
+     }:
+     mkDerivation {
+       pname = "aftovolio";
+       version = "0.2.1.0";
+       sha256 = "18z69rzzzfkf4mivjzz9g5h4l1c7lc8s1dnsa6d1xwafhbc2mp2h";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base cli-arguments containers deepseq directory
+         intermediate-structures lists-flines minmax mmsyn2-array
+         monoid-insertleft quantizer rev-scientific rhythmic-sequences
+       ];
+       executableHaskellDepends = [
+         async base cli-arguments containers deepseq directory
+         intermediate-structures lists-flines minmax mmsyn2-array
+         monoid-insertleft quantizer rev-scientific rhythmic-sequences
+       ];
+       description = "An AFTOVolio implementation for creating texts with special phonetic / prosodic properties";
+       license = lib.licenses.mit;
+     }) {};
+
   "afv" = callPackage
     ({ mkDerivation, base, bytestring, directory, language-c, mtl
      , process, yices
@@ -27506,18 +27559,20 @@ self: {
 
   "agda2hs" = callPackage
     ({ mkDerivation, aeson, Agda, base, bytestring, containers, deepseq
-     , directory, filepath, haskell-src-exts, mtl, syb, text
-     , unordered-containers, yaml
+     , directory, filepath, haskell-src-exts, monad-control, mtl, syb
+     , text, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "agda2hs";
-       version = "1.2";
-       sha256 = "0xd9ngvymr1wix1hhf6i3qm2sc1n2zgf6gpc2ss4plhbaw60idpx";
+       version = "1.3";
+       sha256 = "0vifmyqyhsjib3yqdxj59qlxh22wmbz7vbj1z0axwfpvy5mhvidk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson Agda base bytestring containers deepseq directory filepath
-         haskell-src-exts mtl syb text unordered-containers yaml
+         haskell-src-exts monad-control mtl syb text transformers
+         unordered-containers yaml
        ];
        description = "Compiling Agda code to readable Haskell";
        license = lib.licenses.bsd3;
@@ -28265,8 +28320,8 @@ self: {
      }:
      mkDerivation {
        pname = "alfred-margaret";
-       version = "2.1.0.0";
-       sha256 = "1k4qmj15wlk7mdmi2nv3a3wyykf4fgjsdkjpvzkwd26zd3aasl9c";
+       version = "2.1.0.2";
+       sha256 = "1pn15w5avqlsy4yj6n08kgvqq7l24p1vz3daq7djjvqxlrkgcmnx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38760,8 +38815,8 @@ self: {
      }:
      mkDerivation {
        pname = "apple";
-       version = "0.2.0.0";
-       sha256 = "0si1yqwplmxggfd4gifakk9hy2fwycgb4m6vhmzwpx08gjwdls08";
+       version = "0.3.0.0";
+       sha256 = "09vhpv00xaavfjq3wx4361mhfi92mbhcvqcwvb55aad9dd6x4x63";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -38783,7 +38838,7 @@ self: {
        ];
        testToolDepends = [ cpphs ];
        benchmarkHaskellDepends = [
-         base bytestring criterion erf hypergeometric statistics
+         base bytestring criterion deepseq erf hypergeometric statistics
        ];
        doHaddock = false;
        description = "Apple array language compiler";
@@ -40255,12 +40310,14 @@ self: {
        broken = true;
      }) {inherit (pkgs) arpack;};
 
-  "array_0_5_7_0" = callPackage
+  "array_0_5_8_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "array";
-       version = "0.5.7.0";
-       sha256 = "155ka0ax0z0niwgy68cnrh3zd75a5xw1i6wvaaqk0sszgxqr6myh";
+       version = "0.5.8.0";
+       sha256 = "0sz6cm7p8n7kh8xyn0lpl7g6g744r57v9c2d827ng3b0mkb2s0is";
+       revision = "1";
+       editedCabalFile = "0j8lbxf3wliz3cal5zp9bh0ifisn0kncadg98fnlav5ls8rmby8n";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = lib.licenses.bsd3;
@@ -42233,6 +42290,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "atomic-write_0_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , hspec-discover, temporary, text, unix-compat
+     }:
+     mkDerivation {
+       pname = "atomic-write";
+       version = "0.2.1.0";
+       sha256 = "0fdmh8rk5mvc356gi31d4lh49cgqafg364wc34i05q9zlx2fvka4";
+       libraryHaskellDepends = [
+         base bytestring directory filepath temporary text unix-compat
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec temporary text unix-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Atomically write to a file";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "atomo" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hashable, haskeline, hint, mtl, parsec, pretty
@@ -43339,7 +43416,6 @@ self: {
        description = "Template Haskell to automatically pass values to functions";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "autodocodec" = callPackage
@@ -46357,21 +46433,6 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "base16-bytestring_0_1_1_7" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim }:
-     mkDerivation {
-       pname = "base16-bytestring";
-       version = "0.1.1.7";
-       sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj";
-       revision = "3";
-       editedCabalFile = "1lrxqhbjsml0q1ahpcx7p0xjy6bj1m6qzjwmv841r5r8jrm2a880";
-       libraryHaskellDepends = [ base bytestring ghc-prim ];
-       testHaskellDepends = [ base bytestring ];
-       description = "Fast base16 (hex) encoding and decoding for ByteStrings";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "base16-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
      , QuickCheck, test-framework, test-framework-hunit
@@ -46782,20 +46843,6 @@ self: {
        broken = true;
      }) {};
 
-  "basement_0_0_14" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "basement";
-       version = "0.0.14";
-       sha256 = "01kk3z0c48c2jhni8ba165zxzm4sljy18r97cad1yd897qjsy2mv";
-       revision = "2";
-       editedCabalFile = "16q5ilgblwhdhwxq8p76dp3c3gm55b6scgswx863zpjyca5avaif";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Foundation scrap box of array & string";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "basement" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -47695,8 +47742,8 @@ self: {
        pname = "beam-migrate";
        version = "0.5.2.1";
        sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc";
-       revision = "1";
-       editedCabalFile = "0cc0pbll3w08c3birv8isfvn8a6yd0i837gmkl12lh0gvshqph82";
+       revision = "2";
+       editedCabalFile = "0788nzixn3fnm57vw5s69rwc3qmw0rr1d46lqwzxdsxqzcywq644";
        libraryHaskellDepends = [
          aeson base beam-core bytestring containers deepseq dependent-map
          dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl
@@ -49722,8 +49769,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.3.9.1";
-       sha256 = "0j0vka9i2b8nl3xyfx3wzhhyyx0zqd4gxd25rrna5k0wvnqk27w5";
+       version = "3.3.9.2";
+       sha256 = "1ydlxnxgh2m9xlsizimchdf8iyr78w9dx8165ni0cwi1szw8955x";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [
          libGL libX11 libXcursor libXext libXfixes libXi libXinerama
@@ -50533,34 +50580,35 @@ self: {
   "binrep" = callPackage
     ({ mkDerivation, base, bytestring, bytezap, deepseq, defun-core
      , flatparse, gauge, generic-data-functions, generic-random
-     , generic-type-asserts, generic-type-functions, hspec
+     , generic-type-asserts, generic-type-functions, ghc-bignum, hspec
      , hspec-discover, parser-combinators, QuickCheck
-     , quickcheck-instances, refined1, strongweak, text, text-icu
-     , type-level-bytestrings
+     , quickcheck-instances, rerefined, strongweak, text
+     , text-builder-linear, text-icu, type-level-bytestrings
+     , type-level-show
      }:
      mkDerivation {
        pname = "binrep";
-       version = "0.8.0";
-       sha256 = "1bsncrkxixp28ffmm2dgfpai3nv8cq0db3fdy11y6gi7rri7g8cj";
+       version = "1.0.0";
+       sha256 = "1m81r00b8wh1sz6y5jk0vgpj7ljp1fafb5zggc77zy77fak7fc7b";
        libraryHaskellDepends = [
          base bytestring bytezap deepseq defun-core flatparse
          generic-data-functions generic-type-asserts generic-type-functions
-         parser-combinators refined1 strongweak text text-icu
-         type-level-bytestrings
+         ghc-bignum parser-combinators rerefined strongweak text
+         text-builder-linear text-icu type-level-bytestrings type-level-show
        ];
        testHaskellDepends = [
          base bytestring bytezap deepseq defun-core flatparse
          generic-data-functions generic-random generic-type-asserts
-         generic-type-functions hspec parser-combinators QuickCheck
-         quickcheck-instances refined1 strongweak text text-icu
-         type-level-bytestrings
+         generic-type-functions ghc-bignum hspec parser-combinators
+         QuickCheck quickcheck-instances rerefined strongweak text
+         text-builder-linear text-icu type-level-bytestrings type-level-show
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bytestring bytezap deepseq defun-core flatparse gauge
          generic-data-functions generic-type-asserts generic-type-functions
-         parser-combinators refined1 strongweak text text-icu
-         type-level-bytestrings
+         ghc-bignum parser-combinators rerefined strongweak text
+         text-builder-linear text-icu type-level-bytestrings type-level-show
        ];
        description = "Encode precise binary representations directly in types";
        license = lib.licenses.mit;
@@ -51913,8 +51961,8 @@ self: {
        pname = "bitwise";
        version = "1.0.0.1";
        sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
-       revision = "9";
-       editedCabalFile = "1xc1p66ykfz59v4dh84pg4fzdlmibix68qn1cn33k04xrlyfnnl0";
+       revision = "10";
+       editedCabalFile = "07m37y6g4lr9idjr88q92khla4zddkgvxlq097ilahdapxfhb9m9";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -52822,8 +52870,8 @@ self: {
      }:
      mkDerivation {
        pname = "blockfrost-api";
-       version = "0.11.0.0";
-       sha256 = "1lqbpjzvz5rc3bkfgk09mgz6p99cxy19yx2azyshb37xxiaj8www";
+       version = "0.12.1.0";
+       sha256 = "0v3v42qlwiq9vmxb7n9y0sx6fpj58l367a28mrhjkagj3skh1m08";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default-class deriving-aeson
          lens safe-money servant servant-docs servant-multipart-api
@@ -52846,8 +52894,8 @@ self: {
      }:
      mkDerivation {
        pname = "blockfrost-client";
-       version = "0.8.0.1";
-       sha256 = "19qziw3n75ilrhdgi982dwcz29dmfp4wzbrz99p2b1lfd0ir10lj";
+       version = "0.9.1.0";
+       sha256 = "14pgfkpp3k1vnci718w7hcn4wmj81lbwdw14kmixb31haqajvn6n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52986,30 +53034,32 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "bloodhound_0_22_0_0" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , errors, exceptions, generic-random, hashable, hspec, http-client
-     , http-types, microlens, microlens-aeson, mtl, network-uri
+  "bloodhound_0_23_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-optics, base, blaze-builder
+     , bytestring, containers, doctest, errors, exceptions
+     , generic-random, hashable, hspec, hspec-discover, http-client
+     , http-types, microlens, mtl, network-uri, optics, optics-core
      , pretty-simple, QuickCheck, quickcheck-properties, scientific
-     , semigroups, semver, temporary, text, time, transformers
-     , unix-compat, unordered-containers, vector
+     , template-haskell, temporary, text, time, unix-compat
+     , unordered-containers, vector, versions
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.22.0.0";
-       sha256 = "0w96zrv2rrhwiahf2x619l2ivqrj5jnih5ck216wrnzj6axlh9j4";
+       version = "0.23.0.0";
+       sha256 = "0rbvjjjjdx86sg3pi04isb46ifip0m9kmrk9pyn3b49xng5nfk85";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers exceptions hashable
-         http-client http-types mtl network-uri scientific semigroups semver
-         text time transformers unordered-containers vector
+         http-client http-types mtl network-uri optics-core scientific
+         template-haskell text time unordered-containers vector versions
        ];
        testHaskellDepends = [
-         aeson base blaze-builder bytestring containers errors exceptions
-         generic-random hashable hspec http-client http-types microlens
-         microlens-aeson mtl network-uri pretty-simple QuickCheck
-         quickcheck-properties scientific semigroups semver temporary text
-         time transformers unix-compat unordered-containers vector
+         aeson aeson-optics base bytestring containers doctest errors
+         exceptions generic-random hspec hspec-discover http-client
+         http-types microlens mtl optics pretty-simple QuickCheck
+         quickcheck-properties temporary text time unix-compat vector
+         versions
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Elasticsearch client library for Haskell";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -53240,10 +53290,8 @@ self: {
     ({ mkDerivation, bluefin-internal }:
      mkDerivation {
        pname = "bluefin";
-       version = "0.0.7.0";
-       sha256 = "1nr6kcckhz3k7nfzavjf24c655ccin0fnyxl238asic01h1d1bny";
-       revision = "1";
-       editedCabalFile = "1z6y9m8ikhy1h9hjvb3dccpqb567svzavl42i9s74aiybz3gs2gv";
+       version = "0.0.8.0";
+       sha256 = "16gzb82lrxhw4s1b1gmq03k094lfpczsls8csv02l77bkipjmfh8";
        libraryHaskellDepends = [ bluefin-internal ];
        description = "The Bluefin effect system";
        license = lib.licenses.mit;
@@ -53274,8 +53322,10 @@ self: {
      }:
      mkDerivation {
        pname = "bluefin-internal";
-       version = "0.0.7.0";
-       sha256 = "1p6fz1nd4976ibb23ni8fdrp9i47m29gfq9v77rlp6biqappjakv";
+       version = "0.0.8.0";
+       sha256 = "1knhqll525qn74zbyqxn6k8d1zbb974h1qh92qpc7r3bqp5v576p";
+       revision = "1";
+       editedCabalFile = "1j27hka5sm5vld2mgvw238c4bg6ys7mzfjskdmdvbxs5yn6ywqpr";
        libraryHaskellDepends = [
          async base monad-control transformers transformers-base
          unliftio-core
@@ -54956,33 +55006,6 @@ self: {
        broken = true;
      }) {};
 
-  "brick_0_70_1" = callPackage
-    ({ mkDerivation, base, bytestring, config-ini, containers
-     , contravariant, data-clist, deepseq, directory, dlist, exceptions
-     , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
-     , template-haskell, text, text-zipper, transformers, unix, vector
-     , vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.70.1";
-       sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring config-ini containers contravariant data-clist
-         deepseq directory dlist exceptions filepath microlens microlens-mtl
-         microlens-th stm template-haskell text text-zipper transformers
-         unix vector vty word-wrap
-       ];
-       testHaskellDepends = [
-         base containers microlens QuickCheck vector
-       ];
-       description = "A declarative terminal user interface library";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "brick" = callPackage
     ({ mkDerivation, base, bimap, bytestring, config-ini, containers
      , data-clist, deepseq, directory, exceptions, filepath, microlens
@@ -55308,41 +55331,6 @@ self: {
        broken = true;
      }) {};
 
-  "brittany_0_13_1_2" = callPackage
-    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
-     , containers, czipwith, data-tree-print, deepseq, directory, extra
-     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
-     , monad-memo, mtl, multistate, parsec, pretty, random, safe
-     , semigroups, strict, syb, text, transformers, uniplate, unsafe
-     , yaml
-     }:
-     mkDerivation {
-       pname = "brittany";
-       version = "0.13.1.2";
-       sha256 = "1pa8qgsild3zl56sdmbsllka64k05jk2p16ij3bdla4rbfw96z5g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths monad-memo mtl multistate pretty random
-         safe semigroups strict syb text transformers uniplate unsafe yaml
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec
-         pretty safe semigroups strict syb text transformers uniplate unsafe
-         yaml
-       ];
-       description = "Haskell source code formatter";
-       license = lib.licenses.agpl3Only;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "brittany";
-       broken = true;
-     }) {};
-
   "brittany" = callPackage
     ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
      , containers, czipwith, data-tree-print, deepseq, directory, extra
@@ -57497,24 +57485,6 @@ self: {
      }) {};
 
   "bytestring-lexing" = callPackage
-    ({ mkDerivation, base, bytestring, tasty, tasty-quickcheck
-     , tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "bytestring-lexing";
-       version = "0.5.0.12";
-       sha256 = "09g5x7jwz9kby578rlj8c6f6zi0pzs169rsqd1vsn3q9gimkpj3j";
-       revision = "1";
-       editedCabalFile = "0zpqxy4n8mkf6ccmc3jb6ggrqmw9csh1nj08wwq196np28jsbkdv";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-quickcheck tasty-smallcheck
-       ];
-       description = "Efficiently parse and produce common integral and fractional numbers";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "bytestring-lexing_0_5_0_14" = callPackage
     ({ mkDerivation, base, bytestring, tasty, tasty-quickcheck
      , tasty-smallcheck
      }:
@@ -57528,7 +57498,6 @@ self: {
        ];
        description = "Efficiently parse and produce common integral and fractional numbers";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring-mmap" = callPackage
@@ -57741,27 +57710,6 @@ self: {
      }) {};
 
   "bytestring-trie" = callPackage
-    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
-     , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "bytestring-trie";
-       version = "0.2.7.3";
-       sha256 = "0cxhsczvfn0cxh4mmhv70rskrc023gy0gl57xiggbf64ng5c60f7";
-       libraryHaskellDepends = [ base binary bytestring deepseq ];
-       testHaskellDepends = [
-         base binary bytestring deepseq QuickCheck smallcheck tasty
-         tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [
-         base binary bytestring criterion deepseq QuickCheck
-       ];
-       description = "An efficient finite map from bytestrings to values";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "bytestring-trie_0_2_7_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, criterion, deepseq
      , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck
@@ -57780,7 +57728,6 @@ self: {
        ];
        description = "An efficient finite map from bytestrings to values";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring-typenats" = callPackage
@@ -57883,8 +57830,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytezap";
-       version = "1.3.1";
-       sha256 = "1d7icd2wxbmraw3qf4vmxlvc6pnl3c9z0ilm39f013sb5i9vsz5x";
+       version = "1.6.0";
+       sha256 = "1vavs3n1dlp37pc613m2n3427b9mc91nxw8wj27la45pzdx2k808";
        libraryHaskellDepends = [
          base bytestring defun-core generic-type-functions primitive text
          type-level-bytestrings
@@ -58348,6 +58295,8 @@ self: {
        pname = "cabal-add";
        version = "0.1";
        sha256 = "1szbi0z8yf98641rwnj856gcfsvvflxwrfxraxy6rl60m7i0mab1";
+       revision = "1";
+       editedCabalFile = "0zwinjbnw4a191c951wwavbh6x6f300l0kgv53fiffxfn66x9w6f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58368,17 +58317,6 @@ self: {
      }) {};
 
   "cabal-appimage" = callPackage
-    ({ mkDerivation, base, Cabal, filepath }:
-     mkDerivation {
-       pname = "cabal-appimage";
-       version = "0.4.0.4";
-       sha256 = "02d1cdhcqk4mpx0wy9rxfr9wsh1a7pjjdq5l1p2r5l5f0rnhkrbs";
-       libraryHaskellDepends = [ base Cabal filepath ];
-       description = "Cabal support for creating AppImage applications";
-       license = lib.licenses.agpl3Only;
-     }) {};
-
-  "cabal-appimage_0_4_0_5" = callPackage
     ({ mkDerivation, base, Cabal, filepath }:
      mkDerivation {
        pname = "cabal-appimage";
@@ -58387,7 +58325,6 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ];
        description = "Cabal support for creating AppImage applications";
        license = lib.licenses.agpl3Only;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cabal-audit" = callPackage
@@ -58431,8 +58368,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "2.5.0";
-       sha256 = "0ddd6yc9ii7ibw7263aq455hwk50ggij28ycjvfi9p4cl6npp1f9";
+       version = "2.6.0";
+       sha256 = "0y4xj4irhppwsg3ljy6yzscfjdj7gh2prsiia51y8ma6gm87sjsy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58529,8 +58466,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "1.5.0";
-       sha256 = "0dmhxrg8d7ajhfg85s7p6py9fywqbrnbd5z9i6mbh3f6cyc9hqak";
+       version = "1.6.0";
+       sha256 = "1kn21l5w838db558nijblar6i3z5jkh12d6l1yccxmd70lrb39vv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58988,6 +58925,8 @@ self: {
        pname = "cabal-hoogle";
        version = "3.10.0.0";
        sha256 = "0plvb2xg112brxq3ribwhpq8wfmdr43bn8yfcazvy86d6h2bgyyn";
+       revision = "1";
+       editedCabalFile = "0hkknwh6cbd61hxvariphrkyr9n3lgw3qzdq82gk1w0rqj14yhd4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59199,8 +59138,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.14.0";
-       sha256 = "0ab6j4svnchw741spi1b4zsdiwr7hvl141dn30ggqq6lkn32icwm";
+       version = "0.15.0";
+       sha256 = "0m8p6pb92iqdaad319d4x09fmlhjvwhrfj81z7s0qnmfm77597af";
        libraryHaskellDepends = [
          base Cabal lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -59472,6 +59411,39 @@ self: {
        mainProgram = "cabal-rpm";
      }) {};
 
+  "cabal-scaffold" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, case-insensitive, conduit, containers, dlist
+     , exceptions, foldable1-classes-compat, foldl, generic-lens
+     , githash, http-conduit, http-types, lens, lens-aeson, mustache
+     , optparse-applicative, path, path-io, project-template
+     , regex-applicative-text, replace-attoparsec, rio, rio-orphans
+     , safe-exceptions, streaming, streaming-attoparsec
+     , streaming-bytestring, strict, template-haskell, text, time
+     , transformers, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "cabal-scaffold";
+       version = "0.1.0.0";
+       sha256 = "0wmy4083ajrw5y5jyi46xw08hsrmbj9fzzwsi7wkcq5wwffcfxlp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring case-insensitive
+         conduit containers dlist exceptions foldable1-classes-compat foldl
+         generic-lens githash http-conduit http-types lens lens-aeson
+         mustache optparse-applicative path path-io project-template
+         regex-applicative-text replace-attoparsec rio rio-orphans
+         safe-exceptions streaming streaming-attoparsec streaming-bytestring
+         strict template-haskell text time transformers unordered-containers
+         yaml
+       ];
+       executableHaskellDepends = [ base ];
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "cabal-scaffold";
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -62453,6 +62425,8 @@ self: {
        pname = "cassava-th";
        version = "0.1.0.0";
        sha256 = "1vq64yl6g3knk0vl1100q4w2hiz5pxharx1c6kf3xflcc2252cxh";
+       revision = "1";
+       editedCabalFile = "1z1rqg1xgsq1y14wv3r3hc621xm0080jkn55xnnx6clw14f3i82k";
        libraryHaskellDepends = [
          base bytestring cassava template-haskell text vector
        ];
@@ -67608,8 +67582,8 @@ self: {
        pname = "cli-extras";
        version = "0.2.1.0";
        sha256 = "1lg0ssbh2qhjjc31ins29ddy4lkzwxhlm3r9vcy1jk8al5aqa03f";
-       revision = "1";
-       editedCabalFile = "0fcybjf8zqzzjzfc5205plzphzk7z5v9p8nadqq7lp7m10ggjasc";
+       revision = "2";
+       editedCabalFile = "1x2wwph80zw9010cb9vhna9j4z5js1r1c3z5xxw3996z5x0s13jc";
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring containers exceptions
          io-streams lens logging-effect monad-logger monad-loops mtl process
@@ -67628,6 +67602,8 @@ self: {
        pname = "cli-git";
        version = "0.2.0.1";
        sha256 = "09i3v77xhdfsmvq7c10plxnqmq2wn8gxc16za4h96s7pnvn8bppv";
+       revision = "1";
+       editedCabalFile = "0rcl9n3mqry9mdc413zbbzz0vhk03khbgipc9nljlbyk5w2ihqsc";
        libraryHaskellDepends = [
          base cli-extras containers data-default exceptions lens
          logging-effect megaparsec mtl text which
@@ -67645,8 +67621,8 @@ self: {
        pname = "cli-nix";
        version = "0.2.0.0";
        sha256 = "02350jvbgapxn14zx0knzyxmdlrq2yk460wiw9p8aq860f299bzh";
-       revision = "1";
-       editedCabalFile = "1plh0js8lnl2xw3dv5z57ap8g4c9j2n1bzskn993fpgafqlw5mcb";
+       revision = "2";
+       editedCabalFile = "0bg07ix77bd5yz6m2y2dcaqbgby5s2d5p0dzp4kgmg4fsw011mnm";
        libraryHaskellDepends = [
          base cli-extras data-default exceptions lens logging-effect mtl
          text which
@@ -68255,6 +68231,39 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "cloudy" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest
+     , containers, deepseq, directory, doctest, file-embed, filepath
+     , from-sum, http-api-data, http-client-tls, http-media, network
+     , network-bsd, optparse-applicative, parsec, pretty-simple, process
+     , QuickCheck, random, servant, servant-client, servant-client-core
+     , sqlite-simple, tasty, tasty-hunit, template-haskell, text, time
+     , unix, uuid, yaml
+     }:
+     mkDerivation {
+       pname = "cloudy";
+       version = "0.1.0.1";
+       sha256 = "0vx3bf4vlybpy452mzn9swgclxfa7flnn0x0gj2vlcn14cdbh27w";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory file-embed
+         filepath from-sum http-api-data http-client-tls http-media network
+         network-bsd optparse-applicative parsec pretty-simple process
+         random servant servant-client servant-client-core sqlite-simple
+         text time unix uuid yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest QuickCheck tasty tasty-hunit template-haskell
+       ];
+       description = "CLI tool to easily spin up and control compute instances in various cloud environments";
+       license = lib.licenses.bsd3;
+       mainProgram = "cloudy";
+       maintainers = [ lib.maintainers.cdepillabout ];
+     }) {};
+
   "cloudyfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , datetime, filepath, HFuse, HTTP, regex-base, regex-tdfa, tagsoup
@@ -70964,6 +70973,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commonmark_0_2_6_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, parsec, tasty
+     , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers
+     , unicode-data, unicode-transforms
+     }:
+     mkDerivation {
+       pname = "commonmark";
+       version = "0.2.6.1";
+       sha256 = "0wwh0smqdmyb1qa992d0jva24yml4lxmmwr3av3c8s0xh3z7vkpv";
+       libraryHaskellDepends = [
+         base bytestring containers parsec text transformers unicode-data
+         unicode-transforms
+       ];
+       testHaskellDepends = [
+         base parsec tasty tasty-hunit tasty-quickcheck text
+         unicode-transforms
+       ];
+       benchmarkHaskellDepends = [ base tasty-bench text ];
+       description = "Pure Haskell commonmark parser";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "commonmark-cli" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark
      , commonmark-extensions, commonmark-pandoc, containers, mtl
@@ -71021,6 +71053,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commonmark-pandoc_0_2_2_2" = callPackage
+    ({ mkDerivation, base, commonmark, commonmark-extensions
+     , pandoc-types, text
+     }:
+     mkDerivation {
+       pname = "commonmark-pandoc";
+       version = "0.2.2.2";
+       sha256 = "0lbs0gjxa02gsm08n65fqglpsi5h2gd5nh0k2nzm01xsqs304h76";
+       libraryHaskellDepends = [
+         base commonmark commonmark-extensions pandoc-types text
+       ];
+       description = "Bridge between commonmark and pandoc AST";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "commonmark-simple" = callPackage
     ({ mkDerivation, aeson, base, commonmark, commonmark-extensions
      , commonmark-pandoc, containers, megaparsec, pandoc-types, parsec
@@ -72225,8 +72273,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "3.0.0.2";
-       sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305";
+       version = "3.0.1.0";
+       sha256 = "068wpnviarwf3q0g8zy9sfgjarz7v73vdfapg3ji8n3xdcb24iwg";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = lib.licenses.bsd3;
@@ -72994,8 +73042,8 @@ self: {
        pname = "concurrent-utilities";
        version = "0.2.0.2";
        sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi";
-       revision = "2";
-       editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15";
+       revision = "3";
+       editedCabalFile = "1s10s1fawbm805kdk33q8q9bhqgghimxg4hni301zj17v2wxzsir";
        libraryHaskellDepends = [ base ];
        description = "More utilities and broad-used datastructures for concurrency";
        license = lib.licenses.bsd3;
@@ -73151,32 +73199,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , split, text, transformers, unix, unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.3.5";
-       sha256 = "0bbq3hr0y4hyia8dbqibfpg5q5zr2ici5hngv38y6hycxvhd7c1b";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec mwc-random transformers vector
-       ];
-       description = "Streaming data processing library";
-       license = lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, mono-traversable, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, silently
@@ -73200,7 +73222,6 @@ self: {
        ];
        description = "Streaming data processing library";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conduit-aeson" = callPackage
@@ -74151,8 +74172,8 @@ self: {
        pname = "config-value";
        version = "0.8.3";
        sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w";
-       revision = "6";
-       editedCabalFile = "0l4yw8g1f7isr2nj6s4awfm37b4j5pz2pn0wnzwdbain3az4d51v";
+       revision = "7";
+       editedCabalFile = "0bzrsy2qlz6ylml38q905rcw2lg0khz6iqr67hhcihbgwgazrrsj";
        libraryHaskellDepends = [ array base containers pretty text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
@@ -76197,15 +76218,15 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "copilot_3_20" = callPackage
+  "copilot_4_0" = callPackage
     ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language
      , copilot-libraries, copilot-prettyprinter, copilot-theorem
      , directory, filepath, optparse-applicative
      }:
      mkDerivation {
        pname = "copilot";
-       version = "3.20";
-       sha256 = "057m56qg4wsqv17hs086ci0nw0r44y3baj9h8w3f4ij2p30zl71n";
+       version = "4.0";
+       sha256 = "1vkwrrsl2xlga5imv2w54k71bl8i1qxz53d6frwpnv64hq0g8lrz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76219,21 +76240,21 @@ self: {
      }) {};
 
   "copilot-bluespec" = callPackage
-    ({ mkDerivation, base, copilot-core, directory, filepath, HUnit
-     , ieee754, language-bluespec, pretty, process, QuickCheck, random
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , unix
+    ({ mkDerivation, base, copilot-core, directory, extra, filepath
+     , HUnit, ieee754, language-bluespec, pretty, process, QuickCheck
+     , random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, unix
      }:
      mkDerivation {
        pname = "copilot-bluespec";
-       version = "3.20";
-       sha256 = "0nss9cnhl8dvjnfgkfvhryiib74c5fg6wlfpivrphrbv6jj5pd78";
+       version = "4.0";
+       sha256 = "1255x4bfwsv305gw0crwm64n32znbzg3g07rly66j56p6dil9dw6";
        libraryHaskellDepends = [
          base copilot-core directory filepath language-bluespec pretty
        ];
        testHaskellDepends = [
-         base copilot-core directory HUnit ieee754 pretty process QuickCheck
-         random test-framework test-framework-hunit
+         base copilot-core directory extra HUnit ieee754 pretty process
+         QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2 unix
        ];
        description = "A compiler for Copilot targeting FPGAs";
@@ -76266,7 +76287,7 @@ self: {
        broken = true;
      }) {};
 
-  "copilot-c99_3_20" = callPackage
+  "copilot-c99_4_0" = callPackage
     ({ mkDerivation, base, copilot-core, directory, filepath, HUnit
      , language-c99, language-c99-simple, mtl, pretty, process
      , QuickCheck, random, test-framework, test-framework-hunit
@@ -76274,8 +76295,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-c99";
-       version = "3.20";
-       sha256 = "0vb4hh72y2l4fwh9p13xj2wf1p8wrssmv9zikz91mpiszcmcl5s4";
+       version = "4.0";
+       sha256 = "1gnkcwqamc63fw64d5vcjxsffjhgz627p0rs4lnjn2wpqj23ms3b";
        libraryHaskellDepends = [
          base copilot-core directory filepath language-c99
          language-c99-simple mtl pretty
@@ -76324,14 +76345,14 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "copilot-core_3_20" = callPackage
+  "copilot-core_4_0" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "copilot-core";
-       version = "3.20";
-       sha256 = "0ndd6xngcgifk7gklf1r9rzyxvdqxn1zp24wg59wn63l3vqlmrg5";
+       version = "4.0";
+       sha256 = "0gwl08ib42if8lrwkhd81vpx46yqbl2k1qwwf3ar90b6pnhczyhk";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -76377,14 +76398,14 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "copilot-interpreter_3_20" = callPackage
+  "copilot-interpreter_4_0" = callPackage
     ({ mkDerivation, base, copilot-core, copilot-prettyprinter, pretty
      , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "copilot-interpreter";
-       version = "3.20";
-       sha256 = "11lxrghfhw3n1nz3rjmrahslnl10cywaafmaf6w32mzwbz5hlix9";
+       version = "4.0";
+       sha256 = "16ylwz3zplzrgz1z0894022ikmh9zywqsjhczayl65gi4aphi925";
        libraryHaskellDepends = [ base copilot-core pretty ];
        testHaskellDepends = [
          base copilot-core copilot-prettyprinter pretty QuickCheck
@@ -76418,7 +76439,7 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "copilot-language_3_20" = callPackage
+  "copilot-language_4_0" = callPackage
     ({ mkDerivation, array, base, containers, copilot-core
      , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl
      , pretty, QuickCheck, test-framework, test-framework-hunit
@@ -76426,8 +76447,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-language";
-       version = "3.20";
-       sha256 = "12ihidjin19y72ajyn1in4cnqk63v2ifhsb312y3l9biwqlbqd0l";
+       version = "4.0";
+       sha256 = "1mkf3p5arwdjxwyjflisdmc1xdz0x5p6iarh544ngpwks72j6j7d";
        libraryHaskellDepends = [
          array base containers copilot-core copilot-interpreter
          copilot-theorem data-reify mtl
@@ -76462,15 +76483,15 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "copilot-libraries_3_20" = callPackage
+  "copilot-libraries_4_0" = callPackage
     ({ mkDerivation, base, containers, copilot-interpreter
      , copilot-language, copilot-theorem, mtl, parsec, QuickCheck
      , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "copilot-libraries";
-       version = "3.20";
-       sha256 = "0pz42yryjcmmr4rzgy2x9h70v3an0py4wi79sx5yvn6d203h1b0h";
+       version = "4.0";
+       sha256 = "0zgw4pg0kdq5c4xqpf51wpkxj1sxhyif71j103kdc4ca1wwqhjbr";
        libraryHaskellDepends = [
          base containers copilot-language mtl parsec
        ];
@@ -76494,12 +76515,12 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "copilot-prettyprinter_3_20" = callPackage
+  "copilot-prettyprinter_4_0" = callPackage
     ({ mkDerivation, base, copilot-core, pretty }:
      mkDerivation {
        pname = "copilot-prettyprinter";
-       version = "3.20";
-       sha256 = "13kxhismy1ajqzwv4da8qn96xhpx8pnbgbcd7zn35j8fmidfbrmz";
+       version = "4.0";
+       sha256 = "17vw8h6c0x1x7giwkzqrg2sndw9qp7ninh6lcydzlcn77ma9i0z2";
        libraryHaskellDepends = [ base copilot-core pretty ];
        description = "A prettyprinter of Copilot Specifications";
        license = lib.licenses.bsd3;
@@ -76547,7 +76568,7 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "copilot-theorem_3_20" = callPackage
+  "copilot-theorem_4_0" = callPackage
     ({ mkDerivation, base, bimap, bv-sized, containers, copilot-core
      , copilot-prettyprinter, data-default, directory, libBF, mtl, panic
      , parameterized-utils, parsec, pretty, process, QuickCheck, random
@@ -76556,8 +76577,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-theorem";
-       version = "3.20";
-       sha256 = "1d9ivlqyknmlic5v2spl4ak72cf3mk35ljx9sbrps4rxchij807a";
+       version = "4.0";
+       sha256 = "149irgw76s2cfv8491ys8i1gmad23z2c5vjiklgmz0h25b49aix3";
        libraryHaskellDepends = [
          base bimap bv-sized containers copilot-core copilot-prettyprinter
          data-default directory libBF mtl panic parameterized-utils parsec
@@ -76584,8 +76605,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-verifier";
-       version = "3.20";
-       sha256 = "0dszrayv3i7cvwdnllqnp3xlmnqy836fb0mghf8q6x9r6c8vi91s";
+       version = "4.0";
+       sha256 = "00ahja1qdvnmr7ddl13b1m9l21k8qqmkr44ml2vpwb7i7l4h65z1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77911,22 +77932,6 @@ self: {
        broken = true;
      }) {crack = null;};
 
-  "crackNum_2_4" = callPackage
-    ({ mkDerivation, array, base, FloatingHex }:
-     mkDerivation {
-       pname = "crackNum";
-       version = "2.4";
-       sha256 = "1fa9rlknmilc8rnm7yvmjrbc9jydpvk30gj7lq79nqbifig6229a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ array base FloatingHex ];
-       executableHaskellDepends = [ array base FloatingHex ];
-       description = "Crack various integer, floating-point data formats";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "crackNum";
-     }) {};
-
   "crackNum" = callPackage
     ({ mkDerivation, base, directory, filepath, libBF, process, sbv
      , tasty, tasty-golden
@@ -77946,14 +77951,14 @@ self: {
        mainProgram = "crackNum";
      }) {};
 
-  "crackNum_3_12" = callPackage
+  "crackNum_3_14" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, ghc, libBF
      , process, sbv, tasty, tasty-golden
      }:
      mkDerivation {
        pname = "crackNum";
-       version = "3.12";
-       sha256 = "1d1hn24c9xdnb19h8c0nakq7825q0gv4b4pxbf8cpwjsspb155wm";
+       version = "3.14";
+       sha256 = "03k2inklgilnqf57h7py3h9mr0zg8wb7fagv8lb0pjxzw02c4qms";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78798,6 +78803,8 @@ self: {
        pname = "crucible";
        version = "0.7.1";
        sha256 = "1c9a8km88ngxghn35f6wnaddm534ixmz1iciyn0whl0xmp27f4zv";
+       revision = "1";
+       editedCabalFile = "1zixmd0qg2x4pg996safdpq3njrd9qafm9w1bh27j1pqbarl9m0i";
        libraryHaskellDepends = [
          async base bimap bv-sized containers exceptions fgl hashable json
          lens mtl panic parameterized-utils prettyprinter template-haskell
@@ -78825,6 +78832,8 @@ self: {
        pname = "crucible-llvm";
        version = "0.7";
        sha256 = "0v4d3c971w6acka4s1lg9iai55ghk054hkkka5jbinyhhymmaf0k";
+       revision = "1";
+       editedCabalFile = "11h69y7s8smlrir6gvxijpg3k4laafznypw5786vsrkhvxr91mxk";
        libraryHaskellDepends = [
          attoparsec base bv-sized bytestring containers crucible
          crucible-symio extra itanium-abi lens llvm-pretty mtl
@@ -80388,27 +80397,21 @@ self: {
   "csv-conduit" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
      , conduit, conduit-extra, containers, data-default, directory
-     , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl
-     , ordered-containers, primitive, resourcet, semigroups
-     , test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector
+     , exceptions, HUnit, ordered-containers, primitive, resourcet
+     , test-framework, test-framework-hunit, text, transformers, vector
      }:
      mkDerivation {
        pname = "csv-conduit";
-       version = "0.7.3.0";
-       sha256 = "1xh11h4qibjcv8b0rk5mwdzww183kpjqzl3x22rbfryjvrp0n07w";
-       revision = "1";
-       editedCabalFile = "18dad4w8i2jma39flmzrjpxjvnkzcb8fnhxm67rl9iv3b6ip86ng";
+       version = "1.0.0.1";
+       sha256 = "16falqdvm94dr4fjb9dndax1vj50amf1ns95x0hribww0vp85w8c";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring conduit
-         conduit-extra containers data-default exceptions ghc-prim mmorph
-         monad-control mtl ordered-containers primitive resourcet semigroups
-         text transformers unordered-containers vector
+         conduit-extra containers data-default exceptions ordered-containers
+         primitive resourcet text transformers vector
        ];
        testHaskellDepends = [
-         base bytestring conduit containers directory HUnit mtl
-         ordered-containers primitive test-framework test-framework-hunit
-         text transformers vector
+         base bytestring conduit containers directory HUnit
+         ordered-containers test-framework test-framework-hunit text vector
        ];
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
        license = lib.licenses.bsd3;
@@ -83059,8 +83062,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-effects";
-       version = "0.1.1.0";
-       sha256 = "0ypwb4618hjsvsdrwb1xbdq427g1bfc5dm9xibjbm2yrami16qr2";
+       version = "0.1.2.0";
+       sha256 = "1gx04k8rsk2qcq74ya44w0249vfb8n3qqwc3bj95askm4nr7nfl6";
        libraryHaskellDepends = [
          base data-default data-effects-core data-effects-th lens text these
          time
@@ -83097,8 +83100,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-effects-th";
-       version = "0.1.1.0";
-       sha256 = "0xs8n5f6v3dani9j2rpl75d8bx02295aimy0fh714qqwg1cmiml6";
+       version = "0.1.2.0";
+       sha256 = "05jzplb3vxxhy8ham7v8w3n943fng3fk8v1pa09vbv68k3r1p14w";
        libraryHaskellDepends = [
          base containers data-default data-effects-core either extra
          formatting infinite-list lens mtl template-haskell text
@@ -83114,13 +83117,13 @@ self: {
      }) {};
 
   "data-elevator" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, hspec, inspection-testing, primitive }:
      mkDerivation {
        pname = "data-elevator";
-       version = "0.1.0.2";
-       sha256 = "109vff7i8jrz3n6748hj8vf1x4a8r91d2p1cwmcgs0rad536zl0m";
+       version = "0.2";
+       sha256 = "0fvj6bd86vdxmfwq36pcj810mbl3wc0lipw50ddzdcypsixr21gq";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec inspection-testing primitive ];
        description = "Coerce between unlifted boxed and lifted types";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
@@ -85146,7 +85149,7 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
-  "dbus_1_3_6" = callPackage
+  "dbus_1_3_7" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, containers
      , criterion, deepseq, directory, exceptions, extra, filepath, lens
      , network, parsec, process, QuickCheck, random, resourcet, split
@@ -85155,8 +85158,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "1.3.6";
-       sha256 = "1hz2qz9lsqs00c2xcdf9p32mg3ycq5p25g859xys9wwqcxvspcq6";
+       version = "1.3.7";
+       sha256 = "0yjsgabcihy8gzzckh5ipy5bwspw3pg3ghj3in6mzlkyqj1hx964";
        libraryHaskellDepends = [
          base bytestring cereal conduit containers deepseq exceptions
          filepath lens network parsec random split template-haskell text
@@ -85738,8 +85741,8 @@ self: {
      }:
      mkDerivation {
        pname = "dear-imgui";
-       version = "2.3.0";
-       sha256 = "0dq1k2v57b2fvrmsxmkr02zyia3bndq2xl6c4avyn6jpr2pfak4l";
+       version = "2.3.1";
+       sha256 = "0pj973isqpnrg8zd4w5z50abd90cd4dnhdpy5i5ai8k24ak5mkp1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85752,8 +85755,6 @@ self: {
        doHaddock = false;
        description = "Haskell bindings for Dear ImGui";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) SDL2; inherit (pkgs) glew;};
 
   "debian" = callPackage
@@ -86297,14 +86298,14 @@ self: {
        mainProgram = "deeplearning_demonstration";
      }) {};
 
-  "deepseq_1_5_0_0" = callPackage
-    ({ mkDerivation, array, base, ghc-prim }:
+  "deepseq_1_5_1_0" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.5.0.0";
-       sha256 = "12w6zflnkgn757psx1ips3fh3yxscil5x0jil6gir3dj9279mwd0";
-       libraryHaskellDepends = [ array base ghc-prim ];
-       testHaskellDepends = [ array base ghc-prim ];
+       version = "1.5.1.0";
+       sha256 = "0yz1b3c4fpa1pknwd64fba37wbr7mxzawd0han2ifq70mgiqfkiz";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base ghc-prim ];
        description = "Deep evaluation of data structures";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -86423,8 +86424,8 @@ self: {
        pname = "defaultable-map";
        version = "1.0.2";
        sha256 = "0s70fwnh6r41hlr7hzv5rwiw8m0rrlj8v1bar09fq3gzqmhrpbqw";
-       revision = "1";
-       editedCabalFile = "15m4cl51g2nn6v3my7c4awnqvrqyvain08l8kr5yqqjmll8bwbvl";
+       revision = "2";
+       editedCabalFile = "0dncpans6gwzpfx71lq36hf8viqw5f50vhh91k116lkgnxc5fzn9";
        libraryHaskellDepends = [ base containers deepseq semigroupoids ];
        description = "Applicative maps";
        license = lib.licenses.bsd3;
@@ -87151,21 +87152,6 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "dependent-map_0_2_4_0" = callPackage
-    ({ mkDerivation, base, containers, dependent-sum }:
-     mkDerivation {
-       pname = "dependent-map";
-       version = "0.2.4.0";
-       sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx";
-       revision = "1";
-       editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
-       libraryHaskellDepends = [ base containers dependent-sum ];
-       description = "Dependent finite maps (partial dependent products)";
-       license = "unknown";
-       hydraPlatforms = lib.platforms.none;
-       maintainers = [ lib.maintainers.alexfmpe ];
-     }) {};
-
   "dependent-map" = callPackage
     ({ mkDerivation, base, constraints-extras, containers
      , dependent-sum
@@ -87213,21 +87199,6 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "dependent-sum_0_4" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "dependent-sum";
-       version = "0.4";
-       sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8";
-       revision = "1";
-       editedCabalFile = "01l176qjk728kyjbmwanjw2avx14bkrr34ncs5daxrifw6wq00w7";
-       libraryHaskellDepends = [ base ];
-       description = "Dependent sum type";
-       license = lib.licenses.publicDomain;
-       hydraPlatforms = lib.platforms.none;
-       maintainers = [ lib.maintainers.alexfmpe ];
-     }) {};
-
   "dependent-sum" = callPackage
     ({ mkDerivation, base, constraints-extras, some }:
      mkDerivation {
@@ -88327,6 +88298,8 @@ self: {
        pname = "dhall";
        version = "1.42.1";
        sha256 = "0n4773s7l9sfqi00fnh4h92mpifbh0m6vsvpghg834c0jx2gm36f";
+       revision = "1";
+       editedCabalFile = "04q42qhfc346ml0vxrxwcxrwn0j4wrbbi8ll17ml2pkgr28krdnh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -88397,8 +88370,8 @@ self: {
        pname = "dhall-bash";
        version = "1.0.41";
        sha256 = "09jz39lnahjzp4f7mfkc68gkb1whqi3v781wqp4w1nrdq8b97sra";
-       revision = "1";
-       editedCabalFile = "0l324739f5x9d48c0lfrn5is19hsc2cnh0psswsnzyy4chsw87fg";
+       revision = "2";
+       editedCabalFile = "1lvm16gc3anyrs167kcvgdn6dh8ygxwjsgf87p3c0ldmnxlvp13j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88445,6 +88418,8 @@ self: {
        pname = "dhall-csv";
        version = "1.0.4";
        sha256 = "1kmrkjc2r5l1q2hc2xq83c25zrfm7w4av0jc06ilxklf4i1kvy4b";
+       revision = "1";
+       editedCabalFile = "10kmbhaly9z95614x3jfmqkswa249dlmr302wng0dpmw1mxqzz2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88477,8 +88452,8 @@ self: {
        pname = "dhall-docs";
        version = "1.0.11";
        sha256 = "0i9czz2p2kv5mw7mnbpqq9nl86aqyp4z0yy115q3nfasl5ys6jlq";
-       revision = "1";
-       editedCabalFile = "04i3v73hgyq57a6010wkd7xhmafy8xxc5vsl9km2r3wqy7505fj9";
+       revision = "2";
+       editedCabalFile = "0wsi3nslijmf0p7j3k7j1g3zzj6y31d0vyqhr74856v4k3757p4a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -88546,8 +88521,8 @@ self: {
        pname = "dhall-json";
        version = "1.7.12";
        sha256 = "1ynm347ccqgh2jmnq9mwj3mc3zd81pwqja5ivdwxkjw08d1wsj6a";
-       revision = "2";
-       editedCabalFile = "0yii9bknd19l65z56zlsxsf4kzbnhygr9dl6bkzy991qsp8155yy";
+       revision = "3";
+       editedCabalFile = "1v21yb69aa6hzg6rhwhi6x61nrk35bbhl8pw1dikbw73s95c9f0j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88599,6 +88574,8 @@ self: {
        pname = "dhall-lsp-server";
        version = "1.1.3";
        sha256 = "1vcdjsqd0falcx48fa58qilnwh70h6cinxbkh2rfmlhvfgmramc8";
+       revision = "1";
+       editedCabalFile = "07x2q58dzr7qn116rx12wpi3jsgz3f5rpxmilk0x1zj1jiwznyxg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88628,8 +88605,8 @@ self: {
        pname = "dhall-nix";
        version = "1.1.26";
        sha256 = "1xgmmfp6bi3mnd9l335ks6xcgpfy2s2kgpcygi7i7p41f795zgma";
-       revision = "1";
-       editedCabalFile = "1bjy0ngvlg9a6b1bsms894qr23axqzg4xgjb1d0hmdyrvkhniwxq";
+       revision = "2";
+       editedCabalFile = "06ixc19hp4n78cg0jlg74gdbz5ngni2a6w8768i946s7sglgcfa3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88655,8 +88632,8 @@ self: {
        pname = "dhall-nixpkgs";
        version = "1.0.10";
        sha256 = "09p1zfssqab3p3x3ngidfkf31kk5kvcx8krjiyf18vmq9fn75mm5";
-       revision = "1";
-       editedCabalFile = "19dj1npbcib00zxhiphqg1icbwx9m3qbhcgbp7bciarymy3cqxc3";
+       revision = "2";
+       editedCabalFile = "0hk6ndmaf8fcmvi9m414a8pl6q6ykqd1mng8pcmak5b184b61961";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88680,8 +88657,8 @@ self: {
        pname = "dhall-openapi";
        version = "1.0.6";
        sha256 = "0jx905x17lfwb316hx6mwiwr647688nwwcikv5iadv2qr9s04yc9";
-       revision = "1";
-       editedCabalFile = "1xzzrgjajpr49bi6lpi2hys9la9646mi4f8wp3md5fim305l19pb";
+       revision = "2";
+       editedCabalFile = "0bda2n7yfjxb98kj497v5vy9xgwc4l5i6imp53c7gxvbf2fnjlnc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88833,8 +88810,8 @@ self: {
        pname = "dhall-toml";
        version = "1.0.3";
        sha256 = "0d99msfbd9dxhjh2bc5bnzwn4c5n4viv3q0n4p1mx2rw67jyra80";
-       revision = "1";
-       editedCabalFile = "1v0ibk5zr1nifxvy445xph3w134dmcxki5wnw63nrf2vdn7zjby5";
+       revision = "2";
+       editedCabalFile = "1vl04lq1fgxcdf1p97wbbwx1rl4lijvxiihg62vwz18v193fxfr2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88860,8 +88837,8 @@ self: {
        pname = "dhall-yaml";
        version = "1.2.12";
        sha256 = "1sh802maai9vxfrjd0w4k9cv4pklhkxid1s5xdbagywcaqdhk272";
-       revision = "2";
-       editedCabalFile = "1wbfyi950kpy1ppd1dq465y9amjc47bvzwjiffsbp8azq5j45bx6";
+       revision = "3";
+       editedCabalFile = "05dl461p5acqn9mlw08mvk3vspgk79k34v6m1wag0g7f3b34c5w4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89250,8 +89227,8 @@ self: {
        pname = "diagrams-canvas";
        version = "1.4.1.2";
        sha256 = "165iwjvx17ym5qsrxsj7va4kmmifg8nay1qq7mbyp3crvfvkfgv2";
-       revision = "1";
-       editedCabalFile = "1cj3ckny5xgsr624d1zc4z9kdfw9lfpc4vfzza9nn3jzy3px8z7l";
+       revision = "2";
+       editedCabalFile = "1hmbcr20pwdfd26xr9dx6gdcmzsw1p7k8avgjcvqa4n9p8ykcrqp";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -89273,8 +89250,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.5.1";
        sha256 = "0whp2p9m7pcb2sgyr8rvhf518f18w5i0vxziganw7qj6ijn9kdyb";
-       revision = "1";
-       editedCabalFile = "08bqpgqcsbiqq1zc07sy6n5k5nyhf63hsrds759fqbr6hb9zwxsx";
+       revision = "2";
+       editedCabalFile = "000ybzwi9cj7p6j21xhkby1sg13ph55qmc6j05cw8j5n1a6c1mv5";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -89319,6 +89296,8 @@ self: {
        pname = "diagrams-gi-cairo";
        version = "1.4.2";
        sha256 = "0k6fw1vvqa4pra4czd90n7i7h1vf6hn08a4jip1xbqkf57d89bn6";
+       revision = "1";
+       editedCabalFile = "1r1ph8nc7xgh3by63dsamkvhi6bvw1bgvhnc8f664iiziaj9p08a";
        libraryHaskellDepends = [
          array base bytestring colour containers diagrams-core diagrams-lib
          filepath gi-cairo gi-cairo-connector gi-cairo-render gi-pango
@@ -89339,8 +89318,8 @@ self: {
        pname = "diagrams-graphviz";
        version = "1.4.1.1";
        sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40";
-       revision = "5";
-       editedCabalFile = "11kl8sgm3g722wqf734adh5lkhrbpm9cryj19g7zipjg9lgns9q6";
+       revision = "6";
+       editedCabalFile = "1h0y3dv8707yvk1g0hmyb6knzahyzyxqmabkih4wyq5cz1zjmh1n";
        libraryHaskellDepends = [
          base containers diagrams-lib fgl graphviz split
        ];
@@ -89443,8 +89422,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-input";
-       version = "0.1.3";
-       sha256 = "1ia8anpmzgdz4087m75x7pcb2hmfs2jilgxlchrcc1vk417z5a6l";
+       version = "0.1.3.1";
+       sha256 = "1xnpgw1dkfa28l03g5cp24khzmb96vv6ws985sxi472ig76ygfwd";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder blaze-markup
          bytestring colour conduit conduit-extra containers css-text
@@ -89548,8 +89527,8 @@ self: {
        pname = "diagrams-pgf";
        version = "1.4.2.1";
        sha256 = "1778sjjvggq5ks73489y76f4z0cvzkn9ixn176fm8kf8swaf82ja";
-       revision = "1";
-       editedCabalFile = "0j2hkmhkbqywsc4vkpn2jvh37hdw1lwphlfvid1f90ayq2npc6p0";
+       revision = "2";
+       editedCabalFile = "1ri4jyw2cxcypcayp9w1wrv4ms2p28zjz80129x9f72mkf3ds6gk";
        libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -89671,27 +89650,6 @@ self: {
      }) {};
 
   "diagrams-svg" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, colour
-     , containers, diagrams-core, diagrams-lib, filepath, hashable
-     , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
-     , semigroups, split, svg-builder, text
-     }:
-     mkDerivation {
-       pname = "diagrams-svg";
-       version = "1.4.3.1";
-       sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237";
-       revision = "7";
-       editedCabalFile = "1njcpdk5amymnlp8dq6r8cgj3gm0rqhhi68jywqc5zcscmr77l2m";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring colour containers diagrams-core
-         diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
-         optparse-applicative semigroups split svg-builder text
-       ];
-       description = "SVG backend for diagrams drawing EDSL";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-svg_1_4_3_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, filepath, hashable
      , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
@@ -89708,7 +89666,6 @@ self: {
        ];
        description = "SVG backend for diagrams drawing EDSL";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -90942,21 +90899,6 @@ self: {
        broken = true;
      }) {};
 
-  "directory_1_3_7_1" = callPackage
-    ({ mkDerivation, base, filepath, time, unix }:
-     mkDerivation {
-       pname = "directory";
-       version = "1.3.7.1";
-       sha256 = "1z8frwbr0kdk47x3xasq7ifzcrwl7ryh1aqgf202xv4cakb8a9yw";
-       revision = "2";
-       editedCabalFile = "142wr326wma17cjmdh8z02rwxc76712bky1f46vqr33g1wdsqyxj";
-       libraryHaskellDepends = [ base filepath time unix ];
-       testHaskellDepends = [ base filepath time unix ];
-       description = "Platform-agnostic library for filesystem operations";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "directory_1_3_8_5" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
@@ -91817,10 +91759,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.7.6";
-       sha256 = "0kfgz8nrg8pdnw56msdkdlc1y894giz6jmgss6gxmhrr929rsnlz";
-       revision = "3";
-       editedCabalFile = "0fnanh4yl1z7v8bqlj8q3r0cgbpllv1md9l1hhi73alpn5fmdwc7";
+       version = "0.7.7";
+       sha256 = "03ki3p9hanwlgsd4yii2v2hyw736pbj7839yqbl2ja66vkgfhajw";
+       revision = "1";
+       editedCabalFile = "1xrbhcn1l46zv25snlxdchyiy7ijb03pyzndqdwz885dkqapwvd4";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -91844,8 +91786,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-async";
-       version = "0.2.7";
-       sha256 = "138gjlsw5r6nsm609kq25wg1nxad34ag9ysa4m0f5rbf8fb0mmm6";
+       version = "0.2.8";
+       sha256 = "0zgdkgsbi0909galmkzg8iw7yhf0qji32aijjdsrn3gfy43hnr4c";
+       revision = "1";
+       editedCabalFile = "161vvls4000gg4jh5yr2rc11m4zpbphws12v35hhnd4gn4jh2jrn";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          exceptions fingertree hashable mtl stm time transformers
@@ -91896,8 +91840,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-client-server";
-       version = "0.2.5.1";
-       sha256 = "15wd3nb68igg7izjb1zzcdcgsh8a9akhfw41arzdp7xcwp6prxy7";
+       version = "0.2.6.0";
+       sha256 = "0mb0awlq60hgjmm6bjzvd86a5kb919q8rx8mbl155q2gbvwvpj4b";
+       revision = "1";
+       editedCabalFile = "0mf4zvl6k4h5alcvryiarr9wrlqc3w4rlaxdxk54srdg34cmvn87";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras exceptions
@@ -91935,7 +91881,7 @@ self: {
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , containers, data-accessor, deepseq, distributed-process
      , distributed-process-client-server, distributed-process-extras
-     , distributed-process-supervisor, distributed-process-tests
+     , distributed-process-supervisor, distributed-process-systest
      , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl
      , network, network-transport, network-transport-tcp, QuickCheck
      , rematch, stm, test-framework, test-framework-hunit
@@ -91944,10 +91890,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-execution";
-       version = "0.1.2.2";
-       sha256 = "1dgpvgip2ji36jfrmxp818b2mz1fvh77l4l64m3ayljf75mwmgwz";
-       revision = "2";
-       editedCabalFile = "18kq0ldz2lci5f2dx98m67gch7539yj7fyaxrqjgk0h2dsc7klfg";
+       version = "0.1.3.0";
+       sha256 = "0cr29ca19yfxhq42l5iyh6q29ymdl40cw2mxzms3mfw6p1qgn16z";
+       revision = "1";
+       editedCabalFile = "04lwlb6iflh0l12ghr8hza7yjxg0kqq58k9250h20gh6xacgdrz4";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -91957,7 +91903,7 @@ self: {
        testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-extras
-         distributed-process-tests distributed-static fingertree ghc-prim
+         distributed-process-systest distributed-static fingertree ghc-prim
          hashable HUnit mtl network network-transport network-transport-tcp
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
@@ -91979,8 +91925,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.3.5";
-       sha256 = "0yva1ydm34fjvzn1z3jfb436d1m3d54fzs3kxqzgsf1nwxpz25rk";
+       version = "0.3.6";
+       sha256 = "12xghaimlkw9kh2ha9mr722fmikf9rscxkp92acagzxsw9pyspqz";
+       revision = "1";
+       editedCabalFile = "0a4ayr8cx35r491a2m2yapg7sd9890jx1x1gdaghv6an6p33qjc9";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process exceptions
          fingertree hashable mtl stm time transformers unordered-containers
@@ -92168,8 +92116,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-simplelocalnet";
-       version = "0.3.1";
-       sha256 = "06p7cynv7z4h62srzq99fi5v23v66g93k77wb6xiv0va83nqa0xr";
+       version = "0.3.2";
+       sha256 = "11d3268na8fdx5v55fhgw3d5lnclmhgrqf29j7x3kpsi1ynn9a3z";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          exceptions network network-multicast network-transport
@@ -92194,8 +92142,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-supervisor";
-       version = "0.2.1";
-       sha256 = "1cawbyz0nnx0kad1pqi1815nvdcvsap68j5a4ksdg8h8rlkvm05q";
+       version = "0.2.2";
+       sha256 = "015pk8px0g3l1h1bj59ns8nlwmrirbqmwq7l9mqdqp05vpjr4npm";
+       revision = "1";
+       editedCabalFile = "0srf56yl1fr67y0zvd3mqn50qbi7rj2n93pf2zlgnpmllgq4ww3s";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-process distributed-process-client-server
@@ -92217,18 +92167,18 @@ self: {
 
   "distributed-process-systest" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
-     , distributed-process, distributed-static, HUnit, network
-     , network-transport, random, rematch, stm, test-framework
+     , distributed-process, distributed-static, exceptions, HUnit
+     , network, network-transport, random, rematch, stm, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "distributed-process-systest";
-       version = "0.1.1";
-       sha256 = "13hi9swkjk0mgj7by810hgnf985mxngf9sxdskn3a9k6l16l6wx1";
+       version = "0.3.2";
+       sha256 = "04n6i81vgfalmhlwqb6pi20c62zrcymrpmj2n1v0i4qr9f7v2in8";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
-         distributed-static HUnit network network-transport random rematch
-         stm test-framework test-framework-hunit
+         distributed-static exceptions HUnit network network-transport
+         random rematch stm test-framework test-framework-hunit
        ];
        description = "Cloud Haskell Test Support";
        license = lib.licenses.bsd3;
@@ -92331,8 +92281,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-static";
-       version = "0.3.10";
-       sha256 = "1nkgs2rw1wk2rfr8xnpgk0ir9dkqv8b4bw78rrn6pmy7mg26mi6r";
+       version = "0.3.11";
+       sha256 = "0h9psda6bc8sq1gc8rdkgljs4hh4973bhsg9bzgvwqx26rdwvs7h";
+       revision = "1";
+       editedCabalFile = "1ifq0rls8rp8p1xmynzb7rx5vmqwi6jxb65lmv0z244d2b35d3x3";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq rank1dynamic
        ];
@@ -92602,8 +92554,8 @@ self: {
      }:
      mkDerivation {
        pname = "djot";
-       version = "0.1.2.1";
-       sha256 = "1lkfbxhzfcqpv0nj6kkbfhlskxb85ql72z3w1ivcw3prxs3skaza";
+       version = "0.1.2.2";
+       sha256 = "17fqnzacnnraij9lwca25761sn5gaxjd42vnpmd397fdzd5dm6fh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92647,7 +92599,7 @@ self: {
        mainProgram = "dl-fedora";
      }) {};
 
-  "dl-fedora_1_1" = callPackage
+  "dl-fedora_1_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra
      , filepath, http-client, http-client-tls, http-directory
      , http-types, optparse-applicative, regex-posix, simple-cmd
@@ -92655,8 +92607,8 @@ self: {
      }:
      mkDerivation {
        pname = "dl-fedora";
-       version = "1.1";
-       sha256 = "0mc0sdc6l2aq1vzz8lqxq9v88350rsv15xqn0q7mg1n255xbiclh";
+       version = "1.2";
+       sha256 = "16zbqvcxn1p663mhnwgcf01nxsxl4nppw5sahmfy3jg8is4wibsk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93406,6 +93358,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "doclayout_0_5" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, emojis, mtl
+     , safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "doclayout";
+       version = "0.5";
+       sha256 = "15i4mz93lvli2hwny1jrw7pq00xwjldm2xdxwlhsgpnr8l142c5h";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base containers emojis mtl safe text ];
+       testHaskellDepends = [
+         base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck
+         text
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq emojis mtl text
+       ];
+       description = "A prettyprinting library for laying out text documents";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "docopt" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , HUnit, parsec, split, template-haskell, text
@@ -93475,8 +93449,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctemplates";
-       version = "0.11";
-       sha256 = "0ssld40km4nf0r8fxgj9w0z8yfy8yiyyfcgxarhwx60f0dzhq270";
+       version = "0.11.0.1";
+       sha256 = "1ysmd7dl12gh4a1ci9g6qfwz2836dqb22g5l5q9941dac4c4al0i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers doclayout filepath mtl parsec safe scientific
@@ -93493,37 +93467,6 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "doctest_0_18_2" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit
-     , mockery, process, QuickCheck, setenv, silently, stringbuilder
-     , syb, transformers
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.18.2";
-       sha256 = "0c48dpxa8i3q5xh2shd2p2xxhrsy7wdil6dg4mayr3lkk1dlwbfp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory exceptions filepath
-         ghc ghc-paths process syb transformers
-       ];
-       executableHaskellDepends = [
-         base base-compat code-page deepseq directory exceptions filepath
-         ghc ghc-paths process syb transformers
-       ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory exceptions filepath
-         ghc ghc-paths hspec hspec-core HUnit mockery process QuickCheck
-         setenv silently stringbuilder syb transformers
-       ];
-       description = "Test interactive Haskell examples";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "doctest";
-     }) {};
-
   "doctest" = callPackage
     ({ mkDerivation, base, code-page, containers, deepseq, directory
      , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core
@@ -93552,7 +93495,7 @@ self: {
        mainProgram = "doctest";
      }) {};
 
-  "doctest_0_22_9" = callPackage
+  "doctest_0_22_10" = callPackage
     ({ mkDerivation, base, code-page, containers, deepseq, directory
      , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core
      , hspec-discover, HUnit, mockery, process, QuickCheck, silently
@@ -93560,8 +93503,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.22.9";
-       sha256 = "182952jr58hz83ckmbc33nwx9ndad808d8cn9z0ay7ds6p11i46s";
+       version = "0.22.10";
+       sha256 = "0ylckg8mzfkv25a3yymfv8yal05ypr1qrx99qv4xakzpn8149m46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94230,24 +94173,25 @@ self: {
      , case-insensitive, containers, dormouse-uri, hedgehog, hspec
      , hspec-discover, hspec-hedgehog, http-api-data, http-client
      , http-client-tls, http-types, mtl, safe-exceptions, scientific
-     , streamly, streamly-bytestring, template-haskell, text, vector
+     , streamly, streamly-bytestring, streamly-core, template-haskell
+     , text, vector
      }:
      mkDerivation {
        pname = "dormouse-client";
-       version = "0.2.1.0";
-       sha256 = "09qkmlgfq0p2d7amil9af6zbd3p2ayhziv8sr152zim4g0v2nmmk";
+       version = "0.3.0.0";
+       sha256 = "07vn6przka6ffa1kab1f1yrkqdxhg3bzjggv9pf5lslf0i94zza9";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive containers
          dormouse-uri http-api-data http-client http-client-tls http-types
-         mtl safe-exceptions streamly streamly-bytestring template-haskell
-         text
+         mtl safe-exceptions streamly streamly-bytestring streamly-core
+         template-haskell text
        ];
        testHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive containers
          dormouse-uri hedgehog hspec hspec-discover hspec-hedgehog
          http-api-data http-client http-client-tls http-types mtl
          safe-exceptions scientific streamly streamly-bytestring
-         template-haskell text vector
+         streamly-core template-haskell text vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "Simple, type-safe and testable HTTP client";
@@ -94263,8 +94207,8 @@ self: {
      }:
      mkDerivation {
        pname = "dormouse-uri";
-       version = "0.2.0.0";
-       sha256 = "1b19167xprw9f4ivpfl0sdk2gs2ai6jxk25wyy7xlvzq2fn5q6sd";
+       version = "0.3.0.0";
+       sha256 = "1z6c4n2zrrxakj82w6hghn1srg8clnps7kng9j2rf9s6iqxqwhfz";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers http-types
          safe-exceptions template-haskell text
@@ -98959,8 +98903,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-bridge";
-       version = "0.8.3";
-       sha256 = "0rcpcal9b4i293smgry74wznz15b6vga31l00z3h4vll96r62g9s";
+       version = "0.8.4";
+       sha256 = "1f16inr64xhsb2h9gbqlr1a38j3xqsw33v2xlr7k33yr2plss12y";
        libraryHaskellDepends = [ aeson base template-haskell ];
        testHaskellDepends = [
          aeson base containers hspec QuickCheck text
@@ -99352,23 +99296,21 @@ self: {
 
   "elm2nix" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
-     , bytestring, containers, data-default, directory, filepath, here
-     , mtl, optparse-applicative, process, req, text, transformers
-     , unordered-containers
+     , bytestring, containers, here, optparse-applicative, process, text
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "elm2nix";
-       version = "0.3.1";
-       sha256 = "05jnn1wwarq877azw5ba222gcs4g3zijxq7lr2i21088kbl2wcg9";
+       version = "0.4.0";
+       sha256 = "0cdfpcbxancw52mavpv9993lbjshcfv07cjzabdghncn3j3g6q1k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base binary bytestring containers data-default
-         directory filepath here mtl process req text transformers
-         unordered-containers
+         aeson async base binary bytestring containers here process text
+         transformers unordered-containers
        ];
        executableHaskellDepends = [
-         ansi-wl-pprint base directory here optparse-applicative
+         ansi-wl-pprint base here optparse-applicative
        ];
        testHaskellDepends = [ base ];
        description = "Turn your Elm project into buildable Nix project";
@@ -99796,8 +99738,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-validate";
-       version = "2.3.2.20";
-       sha256 = "0k92hb8nn35ggp1lnqzp1s57znmhnabml217f41zdv8y1khfh3fc";
+       version = "2.3.2.21";
+       sha256 = "132ijz65csl1ki32nhw3d95x9vzl3lc22z2zhivv1yqh30lfpfgq";
        libraryHaskellDepends = [
          attoparsec base bytestring template-haskell
        ];
@@ -100762,10 +100704,8 @@ self: {
      }:
      mkDerivation {
        pname = "enummapset";
-       version = "0.7.2.0";
-       sha256 = "00n6nifk5hlp85mv0g68jpx9w19hx1cxqhbf7pqlm5m5f99y29m2";
-       revision = "1";
-       editedCabalFile = "14l25k5jy8lvc936cja46b1zfgmmd9yk1rqqrnznv2xl7xdj8725";
+       version = "0.7.3.0";
+       sha256 = "0w3hvypj14j7k8kfzrahyv7v35yj60jjyjv4klvnbw05a10hbj3l";
        libraryHaskellDepends = [ aeson base containers deepseq ];
        testHaskellDepends = [
          aeson array base containers deepseq ghc-prim HUnit QuickCheck
@@ -100987,8 +100927,8 @@ self: {
      }:
      mkDerivation {
        pname = "eo-phi-normalizer";
-       version = "1.0.0";
-       sha256 = "01952w59d4w0d0d4nk7lydjz75w6b1qsh662grd3z44ahd3zhyy7";
+       version = "1.1.0";
+       sha256 = "1xzi0dgk9fac2v1g1g0i5cq19kq97crmq0903bx3m2cn22v4la40";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal process PyF ];
@@ -103711,7 +103651,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic";
        license = lib.licenses.mit;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "exact-real-positional" = callPackage
@@ -105088,10 +105027,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.9";
-       sha256 = "06zmc71r4cqglkv3av38djbkakvw9zxc3901xi2h65fwxn4npvnc";
-       revision = "2";
-       editedCabalFile = "19d0w4ifmjlkw7i36ah9xqcy3b9na7hcjnvj6grk5iqnlmkz6six";
+       version = "0.9.1";
+       sha256 = "1kp407jnfl0p086x06s43b30gvq9haixf3r8q2sz90v6gdzbjmvb";
        libraryHaskellDepends = [
          aeson base bytestring cassava comonad constraints deepseq ghc-prim
          hashable incremental membership prettyprinter primitive profunctors
@@ -105303,6 +105240,35 @@ self: {
        mainProgram = "extensions";
      }) {};
 
+  "extensions_0_1_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, colourista, containers
+     , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog
+     , optparse-applicative, parsec, text
+     }:
+     mkDerivation {
+       pname = "extensions";
+       version = "0.1.0.3";
+       sha256 = "1fks1yfdk0zjc1vccj3nr6li09j64cq6b6x9s5mi8qrsv5igbzlm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath ghc-boot-th
+         parsec text
+       ];
+       executableHaskellDepends = [
+         base colourista containers directory filepath optparse-applicative
+         text
+       ];
+       testHaskellDepends = [
+         base bytestring containers ghc-boot-th hedgehog hspec
+         hspec-hedgehog text
+       ];
+       description = "Parse Haskell Language Extensions";
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "extensions";
+     }) {};
+
   "external-sort" = callPackage
     ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }:
      mkDerivation {
@@ -105354,8 +105320,8 @@ self: {
      }:
      mkDerivation {
        pname = "extism-pdk";
-       version = "1.0.0.1";
-       sha256 = "0gsc1ygrylgq85cbnj4chxikqx0gv7g10nzgmciwkimby94sl64r";
+       version = "1.1.0.0";
+       sha256 = "0bnhi02f3m9shsn1x2vn7rpjaii72sb6lrsw9njzk743ap23d1kr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106261,12 +106227,12 @@ self: {
      }) {};
 
   "fast-myers-diff" = callPackage
-    ({ mkDerivation, base, dlist, hspec, text, vector }:
+    ({ mkDerivation, base, deepseq, dlist, hspec, text, vector }:
      mkDerivation {
        pname = "fast-myers-diff";
-       version = "0.0.0";
-       sha256 = "0biyv3x889c536dcb9ylglidlpi32v861586yhsjszshmpj38iz3";
-       libraryHaskellDepends = [ base dlist text vector ];
+       version = "0.0.1";
+       sha256 = "12flhvdjhkw0iyrcwzjnqkiml698hgv203kl76qy778n59x9hvp7";
+       libraryHaskellDepends = [ base deepseq dlist text vector ];
        testHaskellDepends = [ base hspec text vector ];
        description = "A fast implementation of the Myers diff algorithm";
        license = lib.licenses.mit;
@@ -107269,8 +107235,8 @@ self: {
      }:
      mkDerivation {
        pname = "fedora-composes";
-       version = "0.2";
-       sha256 = "1q8k41gsrf77dwv4a1kbvh0l949ashph8n08fv0n3b8xys4nl59x";
+       version = "0.2.1";
+       sha256 = "0y8cmjmdab3rnjvddxnsjyc28hcqv52a7c2f5505vxw0wz0x57bx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107382,8 +107348,8 @@ self: {
      }:
      mkDerivation {
        pname = "fedora-repoquery";
-       version = "0.7";
-       sha256 = "1jpnmfm1pj4d078941hapd7ww975cy032d8jdkbparnv847nvd2n";
+       version = "0.7.1";
+       sha256 = "1jz8v914s7janr6xyk6sf2c0fxfw2c5d7shc08ks62qlvg8qbs8c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108200,6 +108166,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "fgl_5_8_3_0" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , microbench, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "fgl";
+       version = "5.8.3.0";
+       sha256 = "1hb3mgqqz67qwfw2893bslj4mkhs4g0y51c6zpc6r2h6caqibjm4";
+       libraryHaskellDepends = [
+         array base containers deepseq transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base deepseq microbench ];
+       description = "Martin Erwig's Functional Graph Library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fgl-arbitrary" = callPackage
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
@@ -111627,8 +111611,8 @@ self: {
      }:
      mkDerivation {
        pname = "fold-debounce";
-       version = "0.2.0.11";
-       sha256 = "1i5lbzw2y43ppxk0kaqjap0dxyxpx5vqsvqxb2wqfkm3z8v63cy8";
+       version = "0.2.0.12";
+       sha256 = "1swlbsgqw6zhqr3rssbl2dmkkh81rw8qykz437py7r652p8plza3";
        libraryHaskellDepends = [
          base data-default-class stm stm-delay time
        ];
@@ -111710,30 +111694,6 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, criterion, doctest, hashable, primitive
-     , profunctors, random, semigroupoids, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.4.16";
-       sha256 = "18bbhz0bjxb30ni9m9nm4aj8klakkd2fbjaymg8j3f0kdki3isj9";
-       revision = "1";
-       editedCabalFile = "1p628vf9s2ypblfsc5i1vb9xchy6big5nggcqns9xznncvpp23zc";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant hashable primitive
-         profunctors random semigroupoids text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Composable, streaming, and efficient left folds";
-       license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.Gabriella439 ];
-     }) {};
-
-  "foldl_1_4_17" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, doctest, hashable, primitive
      , profunctors, random, semigroupoids, text, transformers
@@ -111752,7 +111712,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion profunctors ];
        description = "Composable, streaming, and efficient left folds";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = [ lib.maintainers.Gabriella439 ];
      }) {};
 
@@ -112647,8 +112606,8 @@ self: {
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.15.1";
-       sha256 = "0h3wq3i18hy3w06dzk4l1w5vf3vzx24lyjznrplkbya6kc5y4kpp";
+       version = "0.16.3";
+       sha256 = "153zalj2d50w7gazsnc2i0530x1l12w5ppwn86q92xp5j56kij96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112834,20 +112793,6 @@ self: {
        mainProgram = "foscam-sort";
      }) {};
 
-  "foundation_0_0_28" = callPackage
-    ({ mkDerivation, base, basement, gauge, ghc-prim }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.28";
-       sha256 = "06hsh40qwmy2nfkrd9m8lfhi6arziixdw9pn379m6a7cga2vjcnh";
-       libraryHaskellDepends = [ base basement ghc-prim ];
-       testHaskellDepends = [ base basement ];
-       benchmarkHaskellDepends = [ base basement gauge ];
-       description = "Alternative prelude with batteries and no dependencies";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "foundation" = callPackage
     ({ mkDerivation, base, basement, gauge, ghc-prim }:
      mkDerivation {
@@ -113371,46 +113316,45 @@ self: {
      , autodocodec-openapi3, base, bcp47, Blammo, Blammo-wai, bugsnag
      , bytestring, case-insensitive, cassava, conduit, conduit-extra
      , containers, cookie, datadog, doctest, ekg-core, exceptions, extra
-     , faktory, freckle-env, freckle-http, freckle-otel, Glob, hashable
-     , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent
+     , faktory, freckle-env, freckle-exception, freckle-http
+     , freckle-otel, freckle-prelude, Glob, hs-opentelemetry-api
+     , hs-opentelemetry-instrumentation-persistent
      , hs-opentelemetry-instrumentation-wai, hs-opentelemetry-sdk, hspec
      , hspec-core, hspec-expectations-lifted, hspec-junit-formatter
-     , http-client, http-types, immortal, lens, monad-control
-     , monad-logger-aeson, monad-validate, MonadRandom, mtl
-     , nonempty-containers, openapi3, path-pieces, persistent
-     , persistent-postgresql, postgresql-simple, primitive, QuickCheck
-     , resource-pool, resourcet, safe, scientist, semigroupoids
-     , template-haskell, text, time, transformers, transformers-base
-     , typed-process, unliftio, unordered-containers, vector, wai
-     , wai-extra, yaml, yesod-core, yesod-test
+     , http-client, http-types, HUnit, immortal, lens, monad-control
+     , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3
+     , path-pieces, persistent, persistent-postgresql, postgresql-simple
+     , primitive, QuickCheck, resource-pool, resourcet, scientist
+     , semigroupoids, template-haskell, text, time, transformers
+     , transformers-base, typed-process, unliftio, unordered-containers
+     , vector, wai, wai-extra, yaml, yesod-core, yesod-test
      }:
      mkDerivation {
        pname = "freckle-app";
-       version = "1.20.0.1";
-       sha256 = "1lzs43japwnkn4gaxamnsjchimc2v2w8fkjb90j1jjvw1dnnaj8h";
+       version = "1.20.2.1";
+       sha256 = "09j74p9mxhxz689c9i46474d23hp5p1xmfz2l4pbfh8wfg91bb5a";
        libraryHaskellDepends = [
          aeson annotated-exception autodocodec autodocodec-openapi3 base
          bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava
          conduit conduit-extra containers cookie datadog doctest ekg-core
-         exceptions extra faktory freckle-env freckle-http freckle-otel Glob
-         hashable hs-opentelemetry-api
+         exceptions extra faktory freckle-env freckle-exception freckle-http
+         freckle-otel freckle-prelude Glob hs-opentelemetry-api
          hs-opentelemetry-instrumentation-persistent
          hs-opentelemetry-instrumentation-wai hs-opentelemetry-sdk hspec
          hspec-core hspec-expectations-lifted hspec-junit-formatter
-         http-client http-types immortal lens monad-control
-         monad-logger-aeson monad-validate MonadRandom mtl
-         nonempty-containers openapi3 path-pieces persistent
-         persistent-postgresql postgresql-simple primitive QuickCheck
-         resource-pool resourcet safe scientist semigroupoids
-         template-haskell text time transformers transformers-base
-         typed-process unliftio unordered-containers vector wai wai-extra
-         yaml yesod-core yesod-test
+         http-client http-types HUnit immortal lens monad-control
+         monad-validate MonadRandom mtl nonempty-containers openapi3
+         path-pieces persistent persistent-postgresql postgresql-simple
+         primitive QuickCheck resource-pool resourcet scientist
+         semigroupoids template-haskell text time transformers
+         transformers-base typed-process unliftio unordered-containers
+         vector wai wai-extra yaml yesod-core yesod-test
        ];
        testHaskellDepends = [
-         aeson async base Blammo bugsnag bytestring cassava conduit
-         hs-opentelemetry-api hspec http-types monad-validate
-         nonempty-containers postgresql-simple QuickCheck vector wai
-         wai-extra
+         aeson annotated-exception async base Blammo bugsnag bytestring
+         cassava conduit hs-opentelemetry-api hspec http-types HUnit
+         monad-validate nonempty-containers postgresql-simple QuickCheck
+         vector wai wai-extra
        ];
        description = "Haskell application toolkit used at Freckle";
        license = lib.licenses.mit;
@@ -113614,14 +113558,21 @@ self: {
      }) {};
 
   "free-alacarte" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, hspec, QuickCheck, relude, tasty
+     , tasty-hspec, text, time
+     }:
      mkDerivation {
        pname = "free-alacarte";
-       version = "1.0.0.2";
-       sha256 = "1zshviy7a1apyg6v24qmf65dg2jh6c7ix0vpp1xi6ahkhcqbsnip";
+       version = "1.0.0.7";
+       sha256 = "033h3ghq7ibq74har4mv4njpwl6c6gndibq1qhlgx3x82ymxkgpk";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck relude tasty tasty-hspec text time
+       ];
        description = "Free monads based on intuitions from the Data types à la Carte";
-       license = lib.licenses.gpl3Only;
+       license = lib.licenses.lgpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-algebras" = callPackage
@@ -114392,15 +114343,15 @@ self: {
 
   "fresnel" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, fused-effects
-     , hashable, profunctors, QuickCheck, template-haskell, transformers
-     , unordered-containers
+     , hashable, profunctors, QuickCheck, semigroupoids
+     , template-haskell, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "fresnel";
-       version = "0.0.0.3";
-       sha256 = "1gimnk2f3b183xfr33lp52mwhr9q8hbpp72hgqir48phawkicrca";
+       version = "0.1.0.1";
+       sha256 = "02d8d4m4msx7hxmp337zig07cvq7sci31f9x429w19bj43sp9j7g";
        libraryHaskellDepends = [
-         base containers hashable profunctors transformers
+         base containers hashable profunctors semigroupoids transformers
          unordered-containers
        ];
        testHaskellDepends = [
@@ -114417,8 +114368,8 @@ self: {
     ({ mkDerivation, base, fresnel, fused-effects }:
      mkDerivation {
        pname = "fresnel-fused-effects";
-       version = "0.0.0.0";
-       sha256 = "1img08a29q1s5zydk9hkggsq874hvqj44f0vjmxdr36j5r72v4kz";
+       version = "0.0.0.1";
+       sha256 = "00608jnm2p2r8c1b9p6khrxwgs29cclax24pbslx4xqv1fghgl4y";
        libraryHaskellDepends = [ base fresnel fused-effects ];
        description = "fresnel/fused-effects integration";
        license = lib.licenses.bsd3;
@@ -114765,8 +114716,8 @@ self: {
      }:
      mkDerivation {
        pname = "fs-api";
-       version = "0.3.0.0";
-       sha256 = "1l8rs0r6vbjb06qb5cd2qc9b8lb4cd0n159907q5s5zvm9nfgmd1";
+       version = "0.3.0.1";
+       sha256 = "0yjfldwmxqg4fgcymyb9bb9axwsfsnldnxxfmk54spkmiab8kr49";
        libraryHaskellDepends = [
          base bytestring containers deepseq digest directory filepath
          io-classes primitive safe-wild-cards text unix unix-bytestring
@@ -114797,21 +114748,22 @@ self: {
     ({ mkDerivation, base, base16-bytestring, bifunctors, bytestring
      , containers, fs-api, generics-sop, io-classes, mtl, pretty-show
      , primitive, QuickCheck, quickcheck-state-machine, random
-     , safe-wild-cards, strict-stm, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text
+     , safe-wild-cards, tasty, tasty-hunit, tasty-quickcheck, temporary
+     , text
      }:
      mkDerivation {
        pname = "fs-sim";
-       version = "0.3.0.0";
-       sha256 = "0wphs3i5f400i313qgii0z76mk3xqvzr5swnmhyc67kcl50l807q";
+       version = "0.3.0.1";
+       sha256 = "1r094vpwpmq3956zs2yqvpliz0aq0wb71pnw566kcxm1rvv91wjr";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers fs-api io-classes mtl
-         primitive QuickCheck safe-wild-cards strict-stm text
+         primitive QuickCheck safe-wild-cards text
        ];
        testHaskellDepends = [
          base bifunctors bytestring containers fs-api generics-sop
-         pretty-show primitive QuickCheck quickcheck-state-machine random
-         strict-stm tasty tasty-hunit tasty-quickcheck temporary text
+         io-classes pretty-show primitive QuickCheck
+         quickcheck-state-machine random tasty tasty-hunit tasty-quickcheck
+         temporary text
        ];
        description = "Simulated file systems";
        license = lib.licenses.asl20;
@@ -115630,13 +115582,15 @@ self: {
      }:
      mkDerivation {
        pname = "functor-monad";
-       version = "0.1.1.0";
-       sha256 = "027g26wr9lsasgrfw641i6zpvv23w7489d7wbljxnp6fnkfhxn30";
+       version = "0.1.1.1";
+       sha256 = "0rjc6ziwvvvlzhf50dx9zml75i647rzd5g4g3bf7nl0q51r4z063";
        libraryHaskellDepends = [
          adjunctions auto-lift-classes base bifunctors comonad day-comonoid
          free free-applicative-t kan-extensions transformers
        ];
-       testHaskellDepends = [ base free transformers ];
+       testHaskellDepends = [
+         base comonad free kan-extensions transformers
+       ];
        description = "FFunctor: functors on (the usual) Functors";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -115870,28 +115824,6 @@ self: {
      }) {};
 
   "fused-effects" = callPackage
-    ({ mkDerivation, base, containers, hedgehog, hedgehog-fn
-     , inspection-testing, markdown-unlit, tasty-bench, transformers
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "fused-effects";
-       version = "1.1.2.2";
-       sha256 = "00m1lnn8zsb6iniyjmmbgiz7kd5c5kl7rxqqxlc2dkb4hpyrm4v5";
-       revision = "1";
-       editedCabalFile = "0ckc63n04kjlk4m3zjz0ynsc0b4rvz6ikpxcrbx8p9lj132ck6d7";
-       libraryHaskellDepends = [ base transformers unliftio-core ];
-       testHaskellDepends = [
-         base containers hedgehog hedgehog-fn inspection-testing
-         transformers
-       ];
-       testToolDepends = [ markdown-unlit ];
-       benchmarkHaskellDepends = [ base tasty-bench transformers ];
-       description = "A fast, flexible, fused effect system";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "fused-effects_1_1_2_3" = callPackage
     ({ mkDerivation, base, containers, hedgehog, hedgehog-fn
      , inspection-testing, markdown-unlit, tasty-bench, transformers
      , unliftio-core
@@ -115909,7 +115841,6 @@ self: {
        benchmarkHaskellDepends = [ base tasty-bench transformers ];
        description = "A fast, flexible, fused effect system";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fused-effects-exceptions" = callPackage
@@ -115980,8 +115911,8 @@ self: {
     ({ mkDerivation, base, fused-effects, random, transformers }:
      mkDerivation {
        pname = "fused-effects-random";
-       version = "1.1.0.0";
-       sha256 = "0krcyx4hhvkxh0rbfwxb52xgb4rl45dflyx3aw8xryp6wn9my770";
+       version = "1.1.0.1";
+       sha256 = "1s259n2iq96rqhzh1vg9m0cpqyfh0ljjgrzw62b4ixm9c39vvw5n";
        libraryHaskellDepends = [ base fused-effects random transformers ];
        description = "Random number generation for fused-effects";
        license = lib.licenses.bsd3;
@@ -116120,8 +116051,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.25.21";
-       sha256 = "1qhidm4vlpqh99mk6nn0kx95wbfhkkjy0dfcfvblkp03ckg0qbhm";
+       version = "0.25.22";
+       sha256 = "12x8n953l5j3msh95vbf94yh5yfw9x80grms2r59i3k6vg32bx01";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116156,8 +116087,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark-data";
-       version = "1.1.0.1";
-       sha256 = "1i1npxiij2crgc5vbyqd9j786yh8a6gkshiys1cjwlzj30hm95n3";
+       version = "1.1.1.0";
+       sha256 = "010q8mbyy320vw785phczmdjdv55w5i7mdd6q04949lzfzxi3w0f";
        libraryHaskellDepends = [
          base binary bytestring bytestring-to-vector containers half
          megaparsec mtl scientific text vector vector-binary-instances
@@ -117729,7 +117660,6 @@ self: {
        ];
        description = "A simple Happstack-style Gemini router";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gemini-server" = callPackage
@@ -117748,8 +117678,6 @@ self: {
        ];
        description = "A lightweight server for the Gemini protocol";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "gemini-textboard" = callPackage
@@ -117772,7 +117700,6 @@ self: {
        ];
        description = "A barebones textboard for the Gemini protocol";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "gemini-textboard";
      }) {};
 
@@ -119162,8 +119089,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "1.0.0.1";
-       sha256 = "155ri2ncwcjx2gl3mimfkafqdf33mzkk1188dk97wbzg0rpq69ip";
+       version = "1.0.0.2";
+       sha256 = "1087c37r829drixvs6cnl7irxph35nspims4ig20dqxg3g0zpx54";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -120272,22 +120199,6 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {deriveConstants = null; genprimopcode = null;};
 
-  "ghc-api-compat_8_6" = callPackage
-    ({ mkDerivation, ghc }:
-     mkDerivation {
-       pname = "ghc-api-compat";
-       version = "8.6";
-       sha256 = "1pxnb5qrf9fz7ghy68xvpdc44fh2kz3f9i5cn66ch7k0ah8j2w3s";
-       revision = "1";
-       editedCabalFile = "01i6h8358n148nzjx6k774d2i2hm6dhgpx162ppkmwmim17f3zyn";
-       libraryHaskellDepends = [ ghc ];
-       doHaddock = false;
-       description = "GHC-API compatibility helpers";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
   "ghc-api-compat_8_10_7" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -122051,6 +121962,8 @@ self: {
        pname = "ghc-tags-pipes";
        version = "0.1.1.0";
        sha256 = "1ajgqhnch20zfrslmng3hbmn3p9hcsd3d6b02yq6qv8rlxrl9nxn";
+       revision = "1";
+       editedCabalFile = "0r40shzvq4ps4nhp4yhw76wnkm07k711gqzdbrilig4vv0r82x89";
        libraryHaskellDepends = [
          attoparsec base bytestring ghc-tags-core mtl pipes pipes-attoparsec
          pipes-bytestring text
@@ -122702,8 +122615,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-javascript";
-       version = "0.9.9.2";
-       sha256 = "19011y6rnaa6mcch64gxpi1gzv6yp8ma2nxi6k6wp6myyfia57wh";
+       version = "0.9.9.3";
+       sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg";
        description = "DOM library using JSFFI and GHCJS";
        license = lib.licenses.mit;
        platforms = [ "javascript-ghcjs" ];
@@ -123361,7 +123274,7 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gdk_4_0_8" = callPackage
+  "gi-gdk_4_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -123369,8 +123282,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "4.0.8";
-       sha256 = "1izl25parszwm9nayn0w9zvmic9bsfcfl1jiasnj11pmzzllyryc";
+       version = "4.0.9";
+       sha256 = "0c43wxbq4g41j107gnh8gyxjsws223p7kkm46hihjvs8pcxrab94";
        setupHaskellDepends = [
          base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango
          haskell-gi
@@ -123508,8 +123421,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.34";
-       sha256 = "0y01d4758lx6qchwgvqzjwgj00r3fqwpwxjm80wq7gdh0nnwwaz3";
+       version = "2.0.35";
+       sha256 = "07b4gg1wbb5mz63xpvjjdbdp0z9wci5jckr1gr0qxrizyc3vv2vi";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -123880,8 +123793,6 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-gtk-declarative-app-simple" = callPackage
@@ -123903,7 +123814,6 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gi-gtk-hs" = callPackage
@@ -124135,7 +124045,7 @@ self: {
   "gi-javascriptcore_6_0_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , javascriptcoregtk, text, transformers
+     , text, transformers, webkitgtk_6_0
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -124146,12 +124056,12 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ javascriptcoregtk ];
+       libraryPkgconfigDepends = [ webkitgtk_6_0 ];
        description = "JavaScriptCore bindings";
        license = lib.licenses.lgpl21Only;
        badPlatforms = lib.platforms.darwin;
        hydraPlatforms = lib.platforms.none;
-     }) {javascriptcoregtk = null;};
+     }) {inherit (pkgs) webkitgtk_6_0;};
 
   "gi-json" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -124358,28 +124268,6 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) libsecret;};
 
-  "gi-soup_2_4_28" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, libsoup, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-soup";
-       version = "2.4.28";
-       sha256 = "157yvfwhyvl58va533n0hz509204aszxqspd62x92b6mlf5fxyqk";
-       setupHaskellDepends = [
-         base Cabal gi-gio gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ libsoup ];
-       description = "Libsoup bindings";
-       license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
-     }) {inherit (pkgs) libsoup;};
-
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -124471,7 +124359,7 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
      , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers, webkitgtk_4_0
+     , haskell-gi-overloading, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-webkit";
@@ -124486,11 +124374,11 @@ self: {
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+       libraryPkgconfigDepends = [ webkitgtk ];
        description = "WebKit bindings";
        license = lib.licenses.lgpl21Only;
        hydraPlatforms = lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk_4_0;};
+     }) {webkitgtk = null;};
 
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -124966,8 +124854,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "10.20240831";
-       sha256 = "1ly9iirr0669i5aq3k1lf60sg5z3p08kn4jnvnjcx0l114b67q3j";
+       version = "10.20240927";
+       sha256 = "116nfcsnnbqcsv7azgrpk24p9nib8zbj96lg51c7xf7fp441xs9k";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks"
          "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser"
@@ -125251,6 +125139,27 @@ self: {
        mainProgram = "git-mediate";
      }) {};
 
+  "git-mediate_1_1_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-compat, containers, Diff
+     , directory, filepath, generic-data, mtl, optparse-applicative
+     , process, split, unix-compat
+     }:
+     mkDerivation {
+       pname = "git-mediate";
+       version = "1.1.0";
+       sha256 = "090i7ghxihmn8zb0phaaw8xmkqy62rwr4awskh2rc1njpg6s29kq";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal base base-compat containers Diff directory filepath
+         generic-data mtl optparse-applicative process split unix-compat
+       ];
+       description = "Tool to help resolving git conflicts";
+       license = lib.licenses.gpl2Only;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "git-mediate";
+     }) {};
+
   "git-monitor" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , gitlib, gitlib-libgit2, lifted-async, logging, old-locale
@@ -125520,6 +125429,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "github-app-token" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, dotenv, hspec
+     , http-conduit, http-types, jwt, markdown-unlit
+     , monoidal-containers, path, semigroups, text, time, unliftio
+     }:
+     mkDerivation {
+       pname = "github-app-token";
+       version = "0.0.3.0";
+       sha256 = "0w5fk6dms063qma11dib4spfmgbzs8nabjp8cdlgwlx9lvwnax3z";
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types jwt
+         monoidal-containers path semigroups text time unliftio
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory dotenv hspec http-conduit
+         http-types markdown-unlit text time unliftio
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Generate an installation access token for a GitHub App";
+       license = lib.licenses.mit;
+     }) {};
+
   "github-backup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, mtl, network
@@ -125786,6 +125717,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "github-workflow-commands" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hspec
+     , hspec-junit-formatter, lens, markdown-unlit, MonadRandom, text
+     }:
+     mkDerivation {
+       pname = "github-workflow-commands";
+       version = "0.0.1.0";
+       sha256 = "19w1q7ak2prlnmv0npgczmr2f76v16lgl9xnm88xvgijjcn3g52y";
+       libraryHaskellDepends = [
+         base bytestring containers lens MonadRandom text
+       ];
+       testHaskellDepends = [
+         base hspec hspec-junit-formatter lens markdown-unlit
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "GitHub Actions workflow commands";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "githud" = callPackage
     ({ mkDerivation, base, bytestring, daemons, data-default, directory
      , filelock, mtl, network, parsec, process, tasty, tasty-hunit
@@ -126620,7 +126571,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "glirc";
      }) {};
 
@@ -127384,22 +127334,21 @@ self: {
      }) {};
 
   "gnome-keyring" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, gnome-keyring
-     , libgnome-keyring, text, time
+    ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring, text
+     , time
      }:
      mkDerivation {
        pname = "gnome-keyring";
        version = "0.3.1.1";
        sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b";
        libraryHaskellDepends = [ base bytestring text time ];
-       librarySystemDepends = [ gnome-keyring ];
+       librarySystemDepends = [ libgnome-keyring ];
        libraryPkgconfigDepends = [ libgnome-keyring ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
        license = lib.licenses.gpl3Only;
        badPlatforms = lib.platforms.darwin;
-     }) {inherit (pkgs) gnome-keyring; 
-         inherit (pkgs) libgnome-keyring;};
+     }) {inherit (pkgs) libgnome-keyring;};
 
   "gnomevfs" = callPackage
     ({ mkDerivation, array, base, containers, glib, gnome-vfs
@@ -127501,8 +127450,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnutls";
-       version = "0.3";
-       sha256 = "1v8haxpj2pfx3fjbjfp16r9488l9gj7ih26g978ampb5nwnq3gry";
+       version = "0.3.1";
+       sha256 = "0yjs39v0dzygfw00fzsjmcfgvv9vk44aqhkshn54ddnhvpdqx76p";
        libraryHaskellDepends = [
          base bytestring transformers unexceptionalio-trans
        ];
@@ -130069,6 +130018,30 @@ self: {
        mainProgram = "goldplate";
      }) {};
 
+  "goldplate_0_2_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff
+     , directory, filepath, Glob, optparse-applicative, process
+     , regex-pcre-builtin, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "goldplate";
+       version = "0.2.2.1";
+       sha256 = "09z937azq3n736gn1sgdy7bxw4nvgsrqicgxdh7x79qng7ks035w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty async base bytestring Diff directory filepath
+         Glob optparse-applicative process regex-pcre-builtin text
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ aeson base bytestring process ];
+       description = "A lightweight golden test runner";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "goldplate";
+     }) {};
+
   "gooey" = callPackage
     ({ mkDerivation, base, renderable, transformers, varying }:
      mkDerivation {
@@ -132266,8 +132239,8 @@ self: {
      }:
      mkDerivation {
        pname = "greskell";
-       version = "2.0.3.0";
-       sha256 = "17njclgkdawnm7hyjv12f2bar93ak9nysfx82igvb6qdp0213a91";
+       version = "2.0.3.1";
+       sha256 = "14sch5i757zg9zih7gz6s7qdkl0lrzra27qksxwk6bqbkrzdgw95";
        libraryHaskellDepends = [
          aeson base exceptions greskell-core hashable semigroups text
          transformers unordered-containers vector
@@ -132289,8 +132262,8 @@ self: {
      }:
      mkDerivation {
        pname = "greskell-core";
-       version = "1.0.0.1";
-       sha256 = "1pjsx1cjm18k2x0h2b80y7qv666c2w5w2gz49qi0vdhx1kgrnzvr";
+       version = "1.0.0.2";
+       sha256 = "0byq7c26qsi19pbgp5wcaj7a0zvkljc678cjn92x8axi36y8ph8x";
        libraryHaskellDepends = [
          aeson base bytestring containers hashable scientific semigroups
          text unordered-containers uuid vector
@@ -132313,8 +132286,8 @@ self: {
      }:
      mkDerivation {
        pname = "greskell-websocket";
-       version = "1.0.0.1";
-       sha256 = "1r9bs5aswh4kxsmwylpizp2b9xiwljic5h18k6qr9i2hgmpshqcn";
+       version = "1.0.0.2";
+       sha256 = "0liqgmkgivryyrgvc8k76qz62r5x482838rm4jg3diigp1mq2kxj";
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring greskell-core
          hashtables safe-exceptions stm text unordered-containers uuid
@@ -133840,6 +133813,32 @@ self: {
        broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
+  "gtvm-hs" = callPackage
+    ({ mkDerivation, aeson, base, binrep, bytestring, containers
+     , exceptions, generic-data-functions, mtl, optparse-applicative
+     , path, polysemy, rerefined, strongweak, symparsec, text, yaml
+     }:
+     mkDerivation {
+       pname = "gtvm-hs";
+       version = "1.0.0";
+       sha256 = "05ghp2fadfmr7qsdvz2xj0wlg620l4h2fazwdfkv55126q7n190i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binrep containers exceptions generic-data-functions mtl
+         path polysemy strongweak symparsec text yaml
+       ];
+       executableHaskellDepends = [
+         aeson base binrep bytestring containers exceptions
+         generic-data-functions mtl optparse-applicative path polysemy
+         rerefined strongweak symparsec text yaml
+       ];
+       description = "Various tools for reversing and using assets from Golden Time: Vivid Memories";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "gtvm-hs";
+     }) {};
+
   "guarded-allocation" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -134466,7 +134465,7 @@ self: {
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
      , bz2, conduit, conduit-extra, containers, criterion
-     , crypto-cipher-types, cryptonite, errors, hashable
+     , crypto-cipher-types, crypton, errors, hashable
      , incremental-parser, ixset-typed, lens, memory, monad-loops
      , nettle, network-uri, openpgp-asciiarmor, prettyprinter
      , QuickCheck, quickcheck-instances, resourcet, split, tasty
@@ -134475,12 +134474,12 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.9.8";
-       sha256 = "1ibd9hah5y2qqpmfv5dk9iys3fnixw9blp855mjhfwpikgn3xypq";
+       version = "2.10.0";
+       sha256 = "1k8c4qwkn4nb9kz3zmlpkjdrmzygk9dc2fms8k8rgqlnz7l61ch5";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
          binary binary-conduit bytestring bz2 conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
+         containers crypto-cipher-types crypton errors hashable
          incremental-parser ixset-typed lens memory monad-loops nettle
          network-uri openpgp-asciiarmor prettyprinter resourcet split text
          time time-locale-compat transformers unliftio-core
@@ -134489,7 +134488,7 @@ self: {
        testHaskellDepends = [
          aeson attoparsec base base16-bytestring bifunctors binary
          binary-conduit bytestring bz2 conduit conduit-extra containers
-         crypto-cipher-types cryptonite errors hashable incremental-parser
+         crypto-cipher-types crypton errors hashable incremental-parser
          ixset-typed lens memory monad-loops nettle network-uri
          prettyprinter QuickCheck quickcheck-instances resourcet split tasty
          tasty-hunit tasty-quickcheck text time time-locale-compat
@@ -134498,7 +134497,7 @@ self: {
        benchmarkHaskellDepends = [
          aeson attoparsec base base16-bytestring bifunctors binary
          binary-conduit bytestring bz2 conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite errors hashable
+         criterion crypto-cipher-types crypton errors hashable
          incremental-parser ixset-typed lens memory monad-loops nettle
          network-uri prettyprinter resourcet split text time
          time-locale-compat transformers unliftio-core unordered-containers
@@ -135496,8 +135495,8 @@ self: {
        pname = "hackage-security";
        version = "0.6.2.6";
        sha256 = "0sfvd5y9v01bjsxsrf446ldcqf56arzr94jk2zsvj49yddbn2hif";
-       revision = "3";
-       editedCabalFile = "04prkqrqfdynf7l5p9zdy802gp78cizc1ljskqn8qq3yzcj3x13n";
+       revision = "4";
+       editedCabalFile = "0d7znfvp5b2fqck7bcrhh8a2y21az1bryf0c8gp21j1crrq1lcd7";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          Cabal-syntax containers cryptohash-sha256 directory ed25519
@@ -135805,22 +135804,6 @@ self: {
        broken = true;
      }) {};
 
-  "haddock_2_23_1" = callPackage
-    ({ mkDerivation, base, filepath, haddock-api, haddock-test }:
-     mkDerivation {
-       pname = "haddock";
-       version = "2.23.1";
-       sha256 = "129lwai4609f910h7yhmmm1rbqzjla9rcg5dpzqihydsjyw5ii1s";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base haddock-api ];
-       testHaskellDepends = [ base filepath haddock-test ];
-       description = "A documentation-generation tool for Haskell libraries";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "haddock";
-     }) {};
-
   "haddock" = callPackage
     ({ mkDerivation, base, filepath, haddock-api, haddock-test }:
      mkDerivation {
@@ -135837,32 +135820,6 @@ self: {
        mainProgram = "haddock";
      }) {};
 
-  "haddock-api_2_23_1" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library
-     , hspec, hspec-discover, QuickCheck, transformers, xhtml
-     }:
-     mkDerivation {
-       pname = "haddock-api";
-       version = "2.23.1";
-       sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath ghc
-         ghc-boot ghc-paths haddock-library transformers xhtml
-       ];
-       testHaskellDepends = [
-         array base bytestring containers deepseq directory filepath ghc
-         ghc-boot ghc-paths haddock-library hspec QuickCheck transformers
-         xhtml
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A documentation-generation tool for Haskell libraries";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
   "haddock-api" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, exceptions, filepath, ghc, ghc-boot, ghc-boot-th
@@ -135923,27 +135880,6 @@ self: {
        broken = true;
      }) {};
 
-  "haddock-library_1_7_0" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
-     , hspec, hspec-discover, parsec, QuickCheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.7.0";
-       sha256 = "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7";
-       libraryHaskellDepends = [
-         base bytestring containers parsec text transformers
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring containers deepseq hspec parsec
-         QuickCheck text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Library exposing some functionality of Haddock";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "haddock-library" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, directory
      , filepath, hspec, hspec-discover, optparse-applicative, parsec
@@ -136550,8 +136486,8 @@ self: {
        pname = "hakyll";
        version = "4.16.2.2";
        sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941";
-       revision = "1";
-       editedCabalFile = "10ifx60yb8fi9y8xmqb446nzgqs5r0jh0cbrwkm2iy8valb8z63x";
+       revision = "2";
+       editedCabalFile = "15457i7cjr2khv3ipis013cm11hinxr5r0s32bgmmbbdqi1g1y2s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -138634,15 +138570,13 @@ self: {
      }) {};
 
   "happstack-static-routing" = callPackage
-    ({ mkDerivation, base, containers, happstack-server, list-tries
-     , transformers
-     }:
+    ({ mkDerivation, base, containers, happstack-server, list-tries }:
      mkDerivation {
        pname = "happstack-static-routing";
-       version = "0.7.0.0";
-       sha256 = "0k2rdn2bvqmmnf46xqmczaaq6l0vx5mm7c2q5mr9kjr1g9gq53gh";
+       version = "0.7.0.1";
+       sha256 = "050zdxx1fp7yi1dfp3ls5cmqd435bqnj9ian77yi1sbdlk558a0a";
        libraryHaskellDepends = [
-         base containers happstack-server list-tries transformers
+         base containers happstack-server list-tries
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
        license = lib.licenses.bsd3;
@@ -138732,6 +138666,23 @@ self: {
        mainProgram = "happy";
      }) {};
 
+  "happy_2_0_2" = callPackage
+    ({ mkDerivation, array, base, containers, happy-lib, mtl, process
+     }:
+     mkDerivation {
+       pname = "happy";
+       version = "2.0.2";
+       sha256 = "0gp8fwn0k4vdz4g3s00jrh0n4g1arvpp6ps4f5xljqd1x1sjxxgp";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ array base containers happy-lib mtl ];
+       testHaskellDepends = [ base process ];
+       description = "Happy is a parser generator for Haskell";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "happy";
+     }) {};
+
   "happy-arbitrary" = callPackage
     ({ mkDerivation, aeson, alex, array, base, bytestring, containers
      , data-fix, extra, file-embed, groom, happy, hspec, hspec-discover
@@ -138785,6 +138736,19 @@ self: {
        broken = true;
      }) {};
 
+  "happy-lib" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, transformers }:
+     mkDerivation {
+       pname = "happy-lib";
+       version = "2.0.2";
+       sha256 = "0ki1yn2m7fadsj1vjfskc2py7s6sgkhhzbs4l3ykbmgxkskvza29";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ array base containers mtl transformers ];
+       doHaddock = false;
+       description = "Happy is a parser generator for Haskell implemented using this library";
+       license = lib.licenses.bsd2;
+     }) {};
+
   "happy-meta" = callPackage
     ({ mkDerivation, array, base, containers, fail, happy
      , haskell-src-meta, mtl, template-haskell
@@ -139108,6 +139072,26 @@ self: {
        broken = true;
      }) {};
 
+  "harpie" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, doctest-parallel
+     , first-class-families, prettyprinter, QuickCheck
+     , quickcheck-instances, random, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "harpie";
+       version = "0.1.0.0";
+       sha256 = "11jdq7d1zx17qa2i1nvg6iysm56plikwk5bkq32xjbjq28yb0jhs";
+       libraryHaskellDepends = [
+         adjunctions base distributive first-class-families prettyprinter
+         QuickCheck quickcheck-instances random vector vector-algorithms
+       ];
+       testHaskellDepends = [ base doctest-parallel ];
+       description = "Haskell array programming";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "harpy" = callPackage
     ({ mkDerivation, array, base, containers, disassembler, mtl, parsec
      , pretty, template-haskell
@@ -139508,6 +139492,22 @@ self: {
        mainProgram = "hash-addressed";
      }) {};
 
+  "hash-cons" = callPackage
+    ({ mkDerivation, async, base, hashable, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "hash-cons";
+       version = "0.1.0.0";
+       sha256 = "04rdgc8lyf2byvjx5p3g06vcwjc6g0bh9qgk08c304p4q6rrijv4";
+       libraryHaskellDepends = [ base hashable ];
+       testHaskellDepends = [
+         async base hashable tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Opportunistic hash-consing data structure";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "hash-store" = callPackage
     ({ mkDerivation, base, base16-bytestring, blake2, bytestring
      , directory, filepath
@@ -139719,6 +139719,8 @@ self: {
        pname = "hashed-storage";
        version = "0.5.11";
        sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
+       revision = "1";
+       editedCabalFile = "05jbnj9mijyai8g1ppkk5v52f4cvybkpki4wcqkm4nlgddyy0lx2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140932,8 +140934,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.26.10";
-       sha256 = "1njgrs1rqngw128z8dvc69l3v9bpr4apa153anmg1cjv8ji91rqm";
+       version = "0.26.11";
+       sha256 = "0raf97k9w0794i1viv0xqcpwp6ahpqdja11a4d5qk80r811rc5iw";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal attoparsec base bytestring Cabal containers directory
@@ -140946,12 +140948,35 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
+  "haskell-gi_0_26_12" = callPackage
+    ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, containers, directory, doctest, filepath, glib
+     , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
+     , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.26.12";
+       sha256 = "0qq2c5s7w0vaa01rpwv02qjrr1sd618vy2k25l55nb0hxzf9z3zi";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         ansi-terminal attoparsec base bytestring Cabal containers directory
+         filepath haskell-gi-base mtl pretty-show process regex-tdfa safe
+         text transformers xdg-basedir xml-conduit
+       ];
+       libraryPkgconfigDepends = [ glib gobject-introspection ];
+       testHaskellDepends = [ base doctest process ];
+       description = "Generate Haskell bindings for GObject Introspection capable libraries";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.26.6";
-       sha256 = "101ksx4nfacl2k3pf75iycvyk5yrjsp5jmqj0368sk7v5ppdw669";
+       version = "0.26.8";
+       sha256 = "19sp8yi9inxq7vqw6zpf2rlk56algxajkf8gyl0iqbx95kb4x1bb";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -141720,10 +141745,8 @@ self: {
     ({ mkDerivation, array, base, happy, pretty, syb }:
      mkDerivation {
        pname = "haskell-src";
-       version = "1.0.4";
-       sha256 = "1spkhv83hy5v1lxs44l3w53vk8zj7gnx42c40hrkj4fcz6apdiwb";
-       revision = "1";
-       editedCabalFile = "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb";
+       version = "1.0.4.1";
+       sha256 = "1fgg7wriwan4bfgmwan8q8mryrcdcikksjr26a9fpi7csccbwhv0";
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
@@ -144394,18 +144417,19 @@ self: {
   "hasmtlib" = callPackage
     ({ mkDerivation, array, attoparsec, base, bitvec, bytestring
      , containers, data-default, dependent-map, finite-typelits, lens
-     , mtl, smtlib-backends, smtlib-backends-process, some, text
-     , unordered-containers, utf8-string, vector-sized
+     , lifted-base, monad-control, mtl, smtlib-backends
+     , smtlib-backends-process, some, text, unordered-containers
+     , utf8-string, vector-sized
      }:
      mkDerivation {
        pname = "hasmtlib";
-       version = "2.6.1";
-       sha256 = "004dic90jsf65z6y8zv0ik3bb9ln1zw5b42kgdm5a4cg97q02fy2";
+       version = "2.7.1";
+       sha256 = "0bp183vdhc93sb8nhph3mvcl3v6f7x7hkqbj6ihmrgv2ipvykha1";
        libraryHaskellDepends = [
          array attoparsec base bitvec bytestring containers data-default
-         dependent-map finite-typelits lens mtl smtlib-backends
-         smtlib-backends-process some text unordered-containers utf8-string
-         vector-sized
+         dependent-map finite-typelits lens lifted-base monad-control mtl
+         smtlib-backends smtlib-backends-process some text
+         unordered-containers utf8-string vector-sized
        ];
        description = "A monad for interfacing with external SMT solvers";
        license = lib.licenses.gpl3Only;
@@ -144488,7 +144512,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hasql_1_8_0_2" = callPackage
+  "hasql_1_8_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, dlist, hashable, hashtables, hspec, hspec-discover
@@ -144499,8 +144523,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1.8.0.2";
-       sha256 = "0dgvbvvkn7d5khz5p97ndbw6j72zram986yn6m519ng3c30d51q9";
+       version = "1.8.1.1";
+       sha256 = "11k4c4rm77j575nzvizmb0ym1zzjrhbrflayzlb7yjkvjn4m2hww";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-strict-builder
          contravariant dlist hashable hashtables iproute mtl
@@ -144782,8 +144806,8 @@ self: {
        pname = "hasql-listen-notify";
        version = "0.1.0.1";
        sha256 = "00pcbps2hdjd3i1xxsfgai81hgzc24cpj8n1iqg4xf7pd2c6cps4";
-       revision = "2";
-       editedCabalFile = "0lhn9axmzn9ps5s919yxhzl4fj35m0n1jizl8flbz2mn062z5w26";
+       revision = "3";
+       editedCabalFile = "1kln7wzfagcv7nq4a9lkgbc2dc2qxsxc47f8m45afra39grq9mw7";
        libraryHaskellDepends = [
          base bytestring hasql mtl postgresql-libpq text
        ];
@@ -145239,8 +145263,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction-io";
-       version = "0.2.7.0";
-       sha256 = "1z7xi1akm4cd2gzgmihv62mza253n4qxfbvcgd7117zb8mvyn6mz";
+       version = "0.2.8.0";
+       sha256 = "13zrr0shici3cpx0slhsb0qrvxj5sd5zr1dfnvg32gwkg91nqvgb";
        libraryHaskellDepends = [
          base bytestring bytestring-tree-builder exceptions hasql mtl
          resourcet safe-exceptions transformers unliftio-core
@@ -146846,8 +146870,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdf5";
-       version = "1.8.12";
-       sha256 = "07hcb2hld6wh5d8av77rzj1pr3gj5xpnk4364ks7xr38hx6lmiz3";
+       version = "1.8.13";
+       sha256 = "1xi2y1f2z19j12f8ggakvwji9y0v56q45c5mlg27ds0aih4y2rmz";
        libraryHaskellDepends = [
          base bindings-DSL bytestring libffi lifted-base monad-control
          primitive tagged transformers vector
@@ -147682,8 +147706,8 @@ self: {
        pname = "hedgehog-classes";
        version = "0.2.5.4";
        sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz";
-       revision = "3";
-       editedCabalFile = "1fgvv1bmipai8dh8vin92lzi642n5c8vynmvi3wfi4mynlacm5zb";
+       revision = "5";
+       editedCabalFile = "19jxkb9dszkvch4cd30n4nsp36p86xdbgqbliqv836m2qwayjmyp";
        libraryHaskellDepends = [
          aeson base binary comonad containers hedgehog pretty-show primitive
          semirings silently transformers vector wl-pprint-annotated
@@ -148126,8 +148150,8 @@ self: {
      }:
      mkDerivation {
        pname = "heftia";
-       version = "0.3.0.0";
-       sha256 = "1brmn77ihnx2a7w64ikw9n8ym4gkaw7zkz5ycrc5dfzsl9ai220s";
+       version = "0.3.1.0";
+       sha256 = "09kvmpfkb88mgh3vvx78dn719ipifknav2b602l65ah7bwwn962n";
        libraryHaskellDepends = [
          base constraints data-effects extensible free kan-extensions
          membership mtl singletons-base singletons-th transformers
@@ -148148,8 +148172,8 @@ self: {
      }:
      mkDerivation {
        pname = "heftia-effects";
-       version = "0.3.0.0";
-       sha256 = "00lgnsnyn0rwhgnzfdq6kq5wxcs3w6d6awcj65kikhp9ysnv0j5n";
+       version = "0.3.1.0";
+       sha256 = "1kdhhzw3kcpkjl5f4li6w3kygppj57bpscgdcxygy34cflgy4pdc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149759,18 +149783,6 @@ self: {
      }) {};
 
   "hexml" = callPackage
-    ({ mkDerivation, base, bytestring, extra }:
-     mkDerivation {
-       pname = "hexml";
-       version = "0.3.4";
-       sha256 = "0amy5gjk1sqj5dq8a8gp7d3z9wfhcflhxkssijnklnfn5s002x4k";
-       libraryHaskellDepends = [ base bytestring extra ];
-       testHaskellDepends = [ base bytestring ];
-       description = "XML subset DOM parser";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "hexml_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
@@ -149780,7 +149792,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "XML subset DOM parser";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hexml-lens" = callPackage
@@ -149813,8 +149824,8 @@ self: {
        pname = "hexpat";
        version = "0.20.13";
        sha256 = "1l9zfp69r3xaxi2znjwpcrx7xckcqvaahv2c0qgkqq61a7ka1qa6";
-       revision = "2";
-       editedCabalFile = "1c3v93rmddyvsjpnc7lyhjhv4rki7rl6s3x2rm449vhc4i8ykhcg";
+       revision = "3";
+       editedCabalFile = "1y5dxv4pc408di2v7dx4cn9fy987ihahqws1qka1qkwc99dmqbkc";
        libraryHaskellDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
@@ -151825,6 +151836,51 @@ self: {
        mainProgram = "hindent";
      }) {};
 
+  "hindent_6_2_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, Cabal, containers
+     , criterion, deepseq, Diff, directory, exceptions, filepath
+     , ghc-lib-parser, ghc-lib-parser-ex, hspec, monad-loops, mtl
+     , optparse-applicative, path, path-io, regex-tdfa, split, syb
+     , transformers, unicode-show, utf8-string, yaml
+     }:
+     mkDerivation {
+       pname = "hindent";
+       version = "6.2.0";
+       sha256 = "05bpsp11cka1l6gmbvsp0fgya8ydx2lh38d3wgq309jf2vmri800";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         async base bytestring Cabal containers deepseq directory exceptions
+         filepath ghc-lib-parser ghc-lib-parser-ex monad-loops mtl
+         optparse-applicative path path-io regex-tdfa split syb transformers
+         unicode-show utf8-string yaml
+       ];
+       executableHaskellDepends = [
+         async base bytestring Cabal containers directory exceptions
+         filepath ghc-lib-parser ghc-lib-parser-ex monad-loops mtl
+         optparse-applicative path path-io regex-tdfa split syb transformers
+         unicode-show utf8-string yaml
+       ];
+       testHaskellDepends = [
+         async base bytestring Cabal containers Diff directory exceptions
+         filepath ghc-lib-parser ghc-lib-parser-ex hspec monad-loops mtl
+         optparse-applicative path path-io regex-tdfa split syb transformers
+         unicode-show utf8-string yaml
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring Cabal containers criterion deepseq directory
+         exceptions filepath ghc-lib-parser ghc-lib-parser-ex monad-loops
+         mtl optparse-applicative path path-io regex-tdfa split syb
+         transformers unicode-show utf8-string yaml
+       ];
+       doHaddock = false;
+       description = "Extensible Haskell pretty printer";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "hindent";
+     }) {};
+
   "hindley-milner" = callPackage
     ({ mkDerivation, base, containers, data-fix, hspec, mtl
      , transformers
@@ -151995,21 +152051,6 @@ self: {
        maintainers = [ lib.maintainers.poscat ];
      }) {};
 
-  "hinotify_0_3_9" = callPackage
-    ({ mkDerivation, async, base, containers, directory, unix }:
-     mkDerivation {
-       pname = "hinotify";
-       version = "0.3.9";
-       sha256 = "16fzql0s34my9k1ib4rdjf9fhhijkmmbrvi148f865m51160wj7j";
-       revision = "1";
-       editedCabalFile = "0df5pak0586626k3ryzg2lb26ys562l3i94jr9vpa0krs8iia209";
-       libraryHaskellDepends = [ async base containers directory unix ];
-       testHaskellDepends = [ base directory ];
-       description = "Haskell binding to inotify";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "hinotify" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , unix
@@ -153224,7 +153265,7 @@ self: {
        ];
      }) {};
 
-  "hledger_1_34" = callPackage
+  "hledger_1_40" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, data-default, Decimal, Diff, directory, extra
      , filepath, githash, hashable, haskeline, hledger-lib, lucid
@@ -153235,8 +153276,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.34";
-       sha256 = "08ygx4aavimxzmyvb9303xds455vs72jvkbrj41nca8357118j3z";
+       version = "1.40";
+       sha256 = "189lbp9dmg9kxik5zg7nk6jm8h5p8hpq1z01zsj8c29x8b8md7b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153514,36 +153555,36 @@ self: {
        license = lib.licenses.gpl3Only;
      }) {};
 
-  "hledger-lib_1_34" = callPackage
+  "hledger-lib_1_40" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base
      , base-compat, blaze-markup, bytestring, call-stack, cassava
      , cassava-megaparsec, cmdargs, colour, containers, data-default
      , Decimal, deepseq, directory, doclayout, doctest, extra
-     , file-embed, filepath, Glob, hashtables, megaparsec, microlens
-     , microlens-th, mtl, pager, parser-combinators, pretty-simple
-     , regex-tdfa, safe, tabular, tasty, tasty-hunit, template-haskell
-     , terminal-size, text, text-ansi, time, timeit, transformers
-     , uglymemo, unordered-containers, utf8-string
+     , file-embed, filepath, Glob, hashtables, lucid, megaparsec
+     , microlens, microlens-th, mtl, pager, parser-combinators
+     , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit
+     , template-haskell, terminal-size, text, text-ansi, time, timeit
+     , transformers, uglymemo, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.34";
-       sha256 = "0789zyz5lbd67mphr8qq8wryni6dkf3759ah9fb7cm2wr5wwvd85";
+       version = "1.40";
+       sha256 = "05kap7kgjlh3y7j6ld0jqih21ad7acxd9cv18h0gb7kbwn7qm8vi";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal array base base-compat
          blaze-markup bytestring call-stack cassava cassava-megaparsec
          cmdargs colour containers data-default Decimal deepseq directory
-         doclayout extra file-embed filepath Glob hashtables megaparsec
-         microlens microlens-th mtl pager parser-combinators pretty-simple
-         regex-tdfa safe tabular tasty tasty-hunit template-haskell
-         terminal-size text text-ansi time timeit transformers uglymemo
-         unordered-containers utf8-string
+         doclayout extra file-embed filepath Glob hashtables lucid
+         megaparsec microlens microlens-th mtl pager parser-combinators
+         pretty-simple regex-tdfa safe tabular tasty tasty-hunit
+         template-haskell terminal-size text text-ansi time timeit
+         transformers uglymemo unordered-containers utf8-string
        ];
        testHaskellDepends = [
          aeson aeson-pretty ansi-terminal array base base-compat
          blaze-markup bytestring call-stack cassava cassava-megaparsec
          cmdargs colour containers data-default Decimal deepseq directory
-         doclayout doctest extra file-embed filepath Glob hashtables
+         doclayout doctest extra file-embed filepath Glob hashtables lucid
          megaparsec microlens microlens-th mtl pager parser-combinators
          pretty-simple regex-tdfa safe tabular tasty tasty-hunit
          template-haskell terminal-size text text-ansi time timeit
@@ -153632,7 +153673,7 @@ self: {
        maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
-  "hledger-ui_1_34" = callPackage
+  "hledger-ui_1_40" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs
      , containers, data-default, directory, doclayout, extra, filepath
      , fsnotify, githash, hledger, hledger-lib, megaparsec, microlens
@@ -153641,10 +153682,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.34";
-       sha256 = "0w80bl6m98hsjzdpj5vjd768qs32vf8vdqzg6srh2z3pl36pjiki";
-       revision = "1";
-       editedCabalFile = "09ipwnyswhgx3jg9fp5b22qwk8xph9h80806l73s4rzk9h6nhh7x";
+       version = "1.40";
+       sha256 = "0rvijrnmkc21nllqcbkn6fh51ifp1n1p8qgmckfp5pngqg40vvnz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153719,7 +153758,7 @@ self: {
        maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
-  "hledger-web_1_34" = callPackage
+  "hledger-web_1_40" = callPackage
     ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup
      , bytestring, case-insensitive, clientsession, cmdargs, conduit
      , conduit-extra, containers, data-default, Decimal, directory
@@ -153732,8 +153771,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.34";
-       sha256 = "1h39gjpdddnyryig4713pq9ipixzavr0mb7wlmzr5sbzqmnshbds";
+       version = "1.40";
+       sha256 = "1dsvsgdan7f8zc0z9x4zri2q6ccajvqpjpv18zj488ihknshiwgq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153856,34 +153895,6 @@ self: {
        license = lib.licenses.mit;
      }) {inherit (pkgs) libsass;};
 
-  "hlint_3_2_8" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
-     , containers, cpphs, data-default, directory, extra, file-embed
-     , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex
-     , hscolour, process, refact, text, transformers, uniplate
-     , unordered-containers, utf8-string, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hlint";
-       version = "3.2.8";
-       sha256 = "14nvq71kn1lhqx02r69f949p33rhxi466fwmxj9g0wd5191jawrs";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring cmdargs containers cpphs
-         data-default directory extra file-embed filepath filepattern
-         ghc-lib-parser ghc-lib-parser-ex hscolour process refact text
-         transformers uniplate unordered-containers utf8-string vector yaml
-       ];
-       executableHaskellDepends = [ base ];
-       description = "Source code suggestions";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "hlint";
-       maintainers = [ lib.maintainers.maralorn ];
-     }) {};
-
   "hlint_3_4_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, data-default, deriving-aeson, directory, extra
@@ -157421,7 +157432,7 @@ self: {
   "hopenpgp-tools" = callPackage
     ({ mkDerivation, aeson, alex, array, base, base16-bytestring
      , binary, binary-conduit, bytestring, conduit, conduit-extra
-     , containers, cryptonite, directory, errors, fgl, graphviz, happy
+     , containers, crypton, directory, errors, fgl, graphviz, happy
      , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed
      , lens, memory, monad-loops, mtl, openpgp-asciiarmor
      , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
@@ -157430,13 +157441,13 @@ self: {
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.23.8";
-       sha256 = "009l8c4zzbmh8q8x9f7zj21ysvma03ksxdknjfcb7z189mafb2qm";
+       version = "0.23.10";
+       sha256 = "0aaf0k26i5zjnijhnyng7jyhx6qdq2fdzq4idlmj3va386rfm2as";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson array base base16-bytestring binary binary-conduit bytestring
-         conduit conduit-extra containers cryptonite directory errors fgl
+         conduit conduit-extra containers crypton directory errors fgl
          graphviz hOpenPGP http-client http-client-tls http-types
          ixset-typed lens memory monad-loops mtl openpgp-asciiarmor
          optparse-applicative prettyprinter prettyprinter-ansi-terminal
@@ -158181,48 +158192,6 @@ self: {
        mainProgram = "hp2pretty";
      }) {};
 
-  "hpack_0_36_0" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, crypton, deepseq, directory, filepath, Glob, hspec
-     , hspec-discover, http-client, http-client-tls, http-types, HUnit
-     , infer-license, interpolate, mockery, mtl, pretty, QuickCheck
-     , scientific, template-haskell, temporary, text, transformers
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.36.0";
-       sha256 = "0ypaagr7a5bvziybbzr3b4lixs3dv6fdkjj3lq7h71z51wd4xpm0";
-       revision = "1";
-       editedCabalFile = "1zh5rsf38xmwp7lf80iifrhnkl80lri4xzlhz2n5df3vc0dqzya8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers crypton deepseq
-         directory filepath Glob http-client http-client-tls http-types
-         infer-license mtl pretty scientific text transformers
-         unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers crypton deepseq
-         directory filepath Glob http-client http-client-tls http-types
-         infer-license mtl pretty scientific text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers crypton deepseq
-         directory filepath Glob hspec http-client http-client-tls
-         http-types HUnit infer-license interpolate mockery mtl pretty
-         QuickCheck scientific template-haskell temporary text transformers
-         unordered-containers vector yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A modern format for Haskell packages";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "hpack";
-     }) {};
-
   "hpack" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, crypton, deepseq, directory, filepath, Glob, hspec
@@ -163085,14 +163054,27 @@ self: {
     ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }:
      mkDerivation {
        pname = "hslua-list";
-       version = "1.1.1";
-       sha256 = "0p70rvvpkq598qpmyccyv6v44rh2glrl8l6vhk7kmy5k4g5gi39n";
+       version = "1.1.3";
+       sha256 = "1ipmf3rpc3ndc23zjmyjmy9lx0q53pm6bjwsgidbqxi4rxsbddqw";
        libraryHaskellDepends = [ base bytestring hslua-core ];
        testHaskellDepends = [ base hslua-core tasty tasty-lua ];
        description = "Opinionated, but extensible Lua list type";
        license = lib.licenses.mit;
      }) {};
 
+  "hslua-list_1_1_4" = callPackage
+    ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }:
+     mkDerivation {
+       pname = "hslua-list";
+       version = "1.1.4";
+       sha256 = "0lyrk95nnsdwi3zfaf4blvih49002wy5hxjj7l49ryc93padkvyk";
+       libraryHaskellDepends = [ base bytestring hslua-core ];
+       testHaskellDepends = [ base hslua-core tasty tasty-lua ];
+       description = "Opinionated, but extensible Lua list type";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hslua-marshalling" = callPackage
     ({ mkDerivation, base, bytestring, containers, hslua-core
      , lua-arbitrary, mtl, QuickCheck, quickcheck-instances, tasty
@@ -163122,6 +163104,8 @@ self: {
        pname = "hslua-module-doclayout";
        version = "1.1.1.2";
        sha256 = "1bgs6p20maqdwmqjv8nqsmlk63sjhb54icqs7d1kxsk8k9hh65qg";
+       revision = "1";
+       editedCabalFile = "0nxb6hm71v9lk9622z4kf30aasdr3m6b13maq8zd496i45msi4v4";
        libraryHaskellDepends = [ base doclayout hslua text ];
        testHaskellDepends = [
          base doclayout hslua tasty tasty-hunit tasty-lua text
@@ -163130,6 +163114,23 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hslua-module-doclayout_1_2_0" = callPackage
+    ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
+     , tasty-lua, text
+     }:
+     mkDerivation {
+       pname = "hslua-module-doclayout";
+       version = "1.2.0";
+       sha256 = "1x3znkdz1l8p8gsvazz85936p107xscsaah1ac3padyiswhair1j";
+       libraryHaskellDepends = [ base doclayout hslua text ];
+       testHaskellDepends = [
+         base doclayout hslua tasty tasty-hunit tasty-lua text
+       ];
+       description = "Lua module wrapping Text.DocLayout.";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hslua-module-path" = callPackage
     ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling
      , hslua-packaging, tasty, tasty-hunit, tasty-lua, text
@@ -164034,25 +164035,6 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "hspec-golden_0_1_0_3" = callPackage
-    ({ mkDerivation, base, directory, hspec, hspec-core
-     , optparse-applicative, silently
-     }:
-     mkDerivation {
-       pname = "hspec-golden";
-       version = "0.1.0.3";
-       sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory hspec-core ];
-       executableHaskellDepends = [ base directory optparse-applicative ];
-       testHaskellDepends = [ base directory hspec hspec-core silently ];
-       description = "Golden tests for hspec";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "hgold";
-     }) {};
-
   "hspec-golden" = callPackage
     ({ mkDerivation, ansi-terminal, base, directory, filepath, hspec
      , hspec-core, hspec-discover, optparse-applicative, silently
@@ -164333,8 +164315,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-need-env";
-       version = "0.1.0.10";
-       sha256 = "13ms7ifdszwgmvvv1lbyqs53l86li0k639f3f9blfkz3lk3qx2kn";
+       version = "0.1.0.11";
+       sha256 = "1hsrrpp3dq47sr7khdd2cliyhwhiinjhkzg612nqxcz0whs00sgh";
        libraryHaskellDepends = [ base hspec-core hspec-expectations ];
        testHaskellDepends = [ base hspec hspec-core setenv transformers ];
        testToolDepends = [ hspec-discover ];
@@ -166190,8 +166172,8 @@ self: {
     ({ mkDerivation, base, http-api-data, text }:
      mkDerivation {
        pname = "htmx";
-       version = "0.1.0.1";
-       sha256 = "06wnjhjgimggfhl2510lxwabqr5hdzb7yqlbmv9mi01c50q6idam";
+       version = "0.1.0.2";
+       sha256 = "1nc3v9gc3xvjj25djzhr5kii7cxf17mwshdipx2d2b95sngmp6yq";
        libraryHaskellDepends = [ base http-api-data text ];
        description = "Use htmx with various haskell libraries";
        license = lib.licenses.mit;
@@ -166203,8 +166185,8 @@ self: {
     ({ mkDerivation, base, htmx, lucid2, text }:
      mkDerivation {
        pname = "htmx-lucid";
-       version = "0.2.0.0";
-       sha256 = "1ilr1xarmavzfcy53asazk64gkww7wsjsmz0jyrbr4qj076dqj36";
+       version = "0.2.0.1";
+       sha256 = "0746z1y7w4x2qnraii23z5r1swdwdx07lz6ymjm1z3ia1m6zfz78";
        libraryHaskellDepends = [ base htmx lucid2 text ];
        description = "Use htmx with lucid";
        license = lib.licenses.mit;
@@ -166215,8 +166197,8 @@ self: {
     ({ mkDerivation, base, htmx, htmx-lucid, lucid2, servant, text }:
      mkDerivation {
        pname = "htmx-servant";
-       version = "0.2.0.1";
-       sha256 = "0vwj3d34ada0iskjr4k7a75x6hf750b71acjphnwddpqf233mfla";
+       version = "0.2.0.2";
+       sha256 = "0v6y6rpb5cwx7mbkkri8yqzikpfqzznblix3i1vag9crfydd8nq5";
        libraryHaskellDepends = [
          base htmx htmx-lucid lucid2 servant text
        ];
@@ -166778,8 +166760,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-rustls";
-       version = "0.0.1.0";
-       sha256 = "1yx93cfvn8zqvsrl2bg6zv12acvmbz2d66wyhb7w53jib7gwzk8z";
+       version = "0.0.2.0";
+       sha256 = "03cl1nbbdjqnmk6yrzxf8sj8nr9zdkm5byvz300pp5ixgvvmnl05";
        libraryHaskellDepends = [
          base bytestring http-client network resourcet rustls text
        ];
@@ -166887,36 +166869,6 @@ self: {
      }) {};
 
   "http-conduit" = callPackage
-    ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base
-     , blaze-builder, bytestring, case-insensitive, conduit
-     , conduit-extra, cookie, crypton-connection, data-default-class
-     , hspec, http-client, http-client-tls, http-types, HUnit, mtl
-     , network, resourcet, streaming-commons, temporary, text, time, tls
-     , transformers, unliftio, unliftio-core, utf8-string, wai
-     , wai-conduit, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "http-conduit";
-       version = "2.3.8.3";
-       sha256 = "1x6pvpcjndxm26plk29v5nfz19rnci4fjzbamidpjaidi990jlba";
-       libraryHaskellDepends = [
-         aeson attoparsec attoparsec-aeson base bytestring conduit
-         conduit-extra http-client http-client-tls http-types mtl resourcet
-         transformers unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson attoparsec-aeson base blaze-builder bytestring
-         case-insensitive conduit conduit-extra cookie crypton-connection
-         data-default-class hspec http-client http-types HUnit network
-         resourcet streaming-commons temporary text time tls transformers
-         unliftio utf8-string wai wai-conduit warp warp-tls
-       ];
-       doCheck = false;
-       description = "HTTP client package with conduit interface and HTTPS support";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "http-conduit_2_3_9" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base
      , blaze-builder, bytestring, case-insensitive, conduit
      , conduit-extra, cookie, crypton-connection, data-default-class
@@ -166944,7 +166896,6 @@ self: {
        doCheck = false;
        description = "HTTP client package with conduit interface and HTTPS support";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -169847,18 +169798,18 @@ self: {
      , network, polysemy, polysemy-log, polysemy-plugin, polysemy-time
      , prettyprinter, process, resourcet, stm, tasty, tasty-discover
      , tasty-hedgehog, temporary, testcontainers, text, time
-     , transformers, unliftio, yaml
+     , transformers, ulid, unliftio, yaml
      }:
      mkDerivation {
        pname = "hw-polysemy";
-       version = "0.2.14.2";
-       sha256 = "08cllz3vm444yzvds9b5057l235gs5ardy9x9fbkagdryids6afp";
+       version = "0.2.14.11";
+       sha256 = "1a71d98arml7qbq1374b4shkxv366f5w0agg4k6c89605h2zmfwl";
        libraryHaskellDepends = [
          aeson aeson-pretty async base binary bytestring contravariant Diff
          directory exceptions filepath generic-lens ghc-prim http-conduit
          lens mtl network polysemy polysemy-log polysemy-plugin
          polysemy-time prettyprinter process resourcet stm temporary
-         testcontainers text time transformers unliftio yaml
+         testcontainers text time transformers ulid unliftio yaml
        ];
        testHaskellDepends = [
          amazonka-s3 base filepath generic-lens lens polysemy polysemy-log
@@ -170879,21 +170830,21 @@ self: {
 
   "hydra" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , directory, filepath, hspec, hspec-discover, HsYAML, HUnit
+     , directory, filepath, hspec, hspec-discover, HsYAML, HUnit, mtl
      , QuickCheck, scientific, split, text, vector
      }:
      mkDerivation {
        pname = "hydra";
-       version = "0.5.1";
-       sha256 = "0jg4dailiw0h8img3syhkxdzdlh3z11lya5azaqf0ki5kwh349n8";
+       version = "0.8.0";
+       sha256 = "1zbr11xabk4va286084wxyx49fmc3xc3wqfrx4h80mwqx9w5gr8b";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring containers directory filepath
-         HsYAML scientific split text vector
+         HsYAML mtl scientific split text vector
        ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring containers directory filepath
-         hspec hspec-discover HsYAML HUnit QuickCheck scientific split text
-         vector
+         hspec hspec-discover HsYAML HUnit mtl QuickCheck scientific split
+         text vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "Type-aware transformations for data and programs";
@@ -171788,17 +171739,16 @@ self: {
 
   "iCalendar" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring
-     , case-insensitive, containers, data-default, mime, mtl, network
+     , case-insensitive, containers, data-default, mime, mtl
      , network-uri, old-locale, parsec, text, time
      }:
      mkDerivation {
        pname = "iCalendar";
-       version = "0.4.0.5";
-       sha256 = "1s1pnwbp6bnsyswrw4vz8hr33jrfd4xs8vnpvrh57a75jdskgsn0";
+       version = "0.4.1.0";
+       sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive containers
-         data-default mime mtl network network-uri old-locale parsec text
-         time
+         data-default mime mtl network-uri old-locale parsec text time
        ];
        description = "iCalendar data types, parser, and printer";
        license = lib.licenses.bsd3;
@@ -173422,18 +173372,19 @@ self: {
   "imm" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit, base
      , beam-core, beam-sqlite, blaze-html, blaze-markup, bytestring
-     , chronos, co-log, conduit, containers, dhall, directory, filepath
-     , http-client, http-types, microlens, mime-mail, monad-time
-     , optparse-applicative, parsec, parsers, pipes, pipes-bytestring
-     , pipes-http, prettyprinter, prettyprinter-ansi-terminal, refined
-     , relude, rss-conduit, safe, safe-exceptions, sqlite-simple, stm
-     , stm-chans, streamly, text, time, timerep, typed-process
-     , typerep-map, uri-bytestring, xml-conduit, xml-types
+     , chronos, conduit, containers, dhall, directory, fast-logger
+     , filepath, http-client, http-types, microlens, mime-mail
+     , monad-time, optparse-applicative, parsec, parsers, pipes
+     , pipes-bytestring, pipes-http, prettyprinter
+     , prettyprinter-ansi-terminal, refined, relude, req, rss-conduit
+     , safe, safe-exceptions, sqlite-simple, stm, stm-chans, streamly
+     , streamly-core, text, time, timerep, typed-process, uri-bytestring
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "imm";
-       version = "2.1.1.0";
-       sha256 = "1w3kypakf8zqz8r44r9bx0z5v4wxvhnf446jzarawn9fg7yigcqn";
+       version = "2.1.3.0";
+       sha256 = "02m8jylzj0lwfcs51c99kfbabblb2r3ds4whrqr1sg8yhm4w8lhc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -173446,12 +173397,12 @@ self: {
        ];
        executableHaskellDepends = [
          aeson async base beam-core beam-sqlite blaze-html blaze-markup
-         bytestring chronos co-log conduit containers dhall directory
+         bytestring chronos conduit containers dhall directory fast-logger
          filepath http-types microlens mime-mail monad-time
          optparse-applicative pipes pipes-bytestring pipes-http
-         prettyprinter prettyprinter-ansi-terminal refined relude safe
-         safe-exceptions sqlite-simple stm stm-chans streamly text time
-         typed-process typerep-map uri-bytestring xml-conduit xml-types
+         prettyprinter prettyprinter-ansi-terminal refined relude req safe
+         safe-exceptions sqlite-simple stm stm-chans streamly streamly-core
+         text time typed-process uri-bytestring xml-conduit xml-types
        ];
        description = "Execute arbitrary actions for each item from RSS/Atom feeds";
        license = lib.licenses.cc0;
@@ -176260,8 +176211,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "intermediate-structures";
-       version = "0.1.1.0";
-       sha256 = "1jx9zhb1gwj79v6wh7536awqfnym1a3px9shcjrzz9br37ybiw8v";
+       version = "0.1.2.0";
+       sha256 = "1wf6g0a1pz6xiixqnkrdjlb2xr4ck2vab9vd0w6kp0pbhqc6qysp";
        libraryHaskellDepends = [ base ];
        description = "Some simple functions to deal with transformations from structures to other ones, basically lists";
        license = lib.licenses.mit;
@@ -176618,8 +176569,8 @@ self: {
     ({ mkDerivation, base, hedgehog, transformers }:
      mkDerivation {
        pname = "interval-functor";
-       version = "0.0.0.0";
-       sha256 = "0fkpqav61s47mjvfkhbg2hrx6p78v3jrs6vjj75aixccfg4k8n43";
+       version = "0.0.0.1";
+       sha256 = "0nvv9axfin3lmcbq0d5vhzd00gpz5hy2rczhz69jrvxm7wg0y0wi";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hedgehog ];
        description = "Intervals of functors";
@@ -176945,6 +176896,8 @@ self: {
        pname = "invertible-grammar";
        version = "0.1.3.5";
        sha256 = "01g4lf31hgv8dqabmabkp6zld6v2l3a2mv9wcgyfxghfrd6dspdw";
+       revision = "1";
+       editedCabalFile = "04xlxfqhyapb2wzzzfvzk6pr11w4rfqyi1axvsk1mxlrihyvl6yy";
        libraryHaskellDepends = [
          base bifunctors containers mtl prettyprinter profunctors semigroups
          tagged template-haskell text transformers
@@ -177851,8 +177804,6 @@ self: {
        testHaskellDepends = [ base hashable HUnit text ];
        description = "IRC core library for glirc";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-ctcp" = callPackage
@@ -178426,8 +178377,8 @@ self: {
      }:
      mkDerivation {
        pname = "isomorphism-class";
-       version = "0.1.0.12";
-       sha256 = "1ffcjf2lic1mvvxfrfi0cc9qnz5qh73yjd3dsaq5p0h0amp8gppr";
+       version = "0.1.1";
+       sha256 = "1hq78k8msarpxlzdf5rmv6spkbbr2kvp4jjrp2klixzr3hd2ybnk";
        libraryHaskellDepends = [
          base bytestring containers hashable primitive text
          unordered-containers vector
@@ -179918,8 +179869,8 @@ self: {
        pname = "javelin";
        version = "0.1.2.0";
        sha256 = "12xzs05dkkbn93yh1f5l7m64j3rifcz9qnd5nqqd62cj6nic10xl";
-       revision = "1";
-       editedCabalFile = "03pdxr80s9ah2yv3kxs76r1dz0j75zvcaylskm203c3cqg1f7scx";
+       revision = "2";
+       editedCabalFile = "11aizybgmbvmpjax3lsa99c1jib09sgg85g5xpws7qfggmrwj0h0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181841,8 +181792,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-spec";
-       version = "0.5.0.1";
-       sha256 = "19kbipnr0v5pg95bvjc2j8wznyri9i0mb2ldx5zp9a1x5kmifwm7";
+       version = "1.1.0.0";
+       sha256 = "1mv0k9z1zqhklq6pqpx73b9f5wlcqnl0hj5h4n5i2qq6w2bwpi1g";
        libraryHaskellDepends = [
          aeson base containers scientific text time vector
        ];
@@ -181862,8 +181813,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-spec-elm";
-       version = "0.4.0.3";
-       sha256 = "13gwqcgi08wc0zjx5vd5sx83rqp2nlh6wiyzh8idagv4f3xnm174";
+       version = "0.4.0.5";
+       sha256 = "17gna98c9x3zf7pc3yc1908si1v5l7vy5avrpc2gkdwnjaq6daq6";
        libraryHaskellDepends = [
          base bound containers elm-syntax json-spec mtl text
        ];
@@ -181881,8 +181832,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-spec-elm-servant";
-       version = "0.4.1.1";
-       sha256 = "0g81dzs512rmgzk6h817d04sdacbdhd19j2qkmihlj6xzjd3gmbf";
+       version = "0.4.2.2";
+       sha256 = "1l2ykpjb8xv80sb7y08al3yxxvix8a55r5cg7f0sqyfkamyvqh8i";
        libraryHaskellDepends = [
          base bound containers directory elm-syntax filepath http-types
          json-spec json-spec-elm mtl prettyprinter process servant text
@@ -181904,8 +181855,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-spec-openapi";
-       version = "0.3.1.1";
-       sha256 = "1dq93wscynxzkknwwad7alvi6n7908j7nzzgz7q5753wbxwqj5yp";
+       version = "1.0.0.0";
+       sha256 = "1ail9zydaq68iiyha8gnc0z4gf8ra9kmn11p6x3ammv66mw9vpsr";
        libraryHaskellDepends = [
          aeson base insert-ordered-containers json-spec lens openapi3 text
        ];
@@ -181941,8 +181892,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.5.3";
-       sha256 = "0jysj25x98kw5326a0n08bygm70yc4l1y9ajyf1bca8003m5smvx";
+       version = "0.4.6.0";
+       sha256 = "0w59673565sjhcal7rk69v79fz5hal4fr8xj9jg3w7n3z5f849ym";
        libraryHaskellDepends = [
          aeson base bytestring containers primitive scientific text
          unordered-containers vector
@@ -182022,6 +181973,43 @@ self: {
        broken = true;
      }) {};
 
+  "json-to-type" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, GenericPretty, hashable, lens, mtl
+     , optparse-applicative, pretty, process, QuickCheck
+     , run-haskell-module, scientific, smallcheck, template-haskell
+     , text, uniplate, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "json-to-type";
+       version = "4.0.1";
+       sha256 = "0hpki40mvmc3hla3y9hw1w5mfk96ickgm6lmyrnc79n272i7ygm5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers data-default filepath GenericPretty hashable
+         lens mtl pretty process QuickCheck run-haskell-module scientific
+         smallcheck template-haskell text uniplate unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         lens mtl optparse-applicative pretty process scientific
+         template-haskell text uniplate unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath GenericPretty
+         hashable lens mtl optparse-applicative pretty process QuickCheck
+         scientific smallcheck template-haskell text uniplate
+         unordered-containers vector
+       ];
+       description = "Automatic type declaration for JSON input data";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "json-to-type";
+       broken = true;
+     }) {};
+
   "json-togo" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base
      , bytestring, scientific, text, transformers, unordered-containers
@@ -182377,6 +182365,8 @@ self: {
        pname = "jsonpath";
        version = "0.3.0.0";
        sha256 = "10a2wbkhdg2x61qpfvb4cl89plhvwy5nc5qqqs5jnll7kg4cabyi";
+       revision = "1";
+       editedCabalFile = "0k13cdhcpkh605i5pgb0vbg9q0xkq8gjm2pja4kfij4z41ila9ix";
        libraryHaskellDepends = [
          aeson base megaparsec scientific text unordered-containers vector
        ];
@@ -183515,42 +183505,6 @@ self: {
      }) {};
 
   "katip" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , bytestring, containers, criterion, deepseq, directory, either
-     , filepath, hostname, microlens, microlens-th, monad-control, mtl
-     , old-locale, quickcheck-instances, regex-tdfa, resourcet
-     , safe-exceptions, scientific, semigroups, stm, string-conv, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, time, time-locale-compat, transformers, transformers-base
-     , transformers-compat, unix, unliftio-core, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "katip";
-       version = "0.8.8.0";
-       sha256 = "0p8xxbjfw7jcsbxdvypn3594f44wf6qizyrzmg1vvscqchqfaykl";
-       libraryHaskellDepends = [
-         aeson async auto-update base bytestring containers either hostname
-         microlens microlens-th monad-control mtl old-locale resourcet
-         safe-exceptions scientific semigroups stm string-conv
-         template-haskell text time transformers transformers-base
-         transformers-compat unix unliftio-core unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory microlens
-         quickcheck-instances regex-tdfa safe-exceptions stm tasty
-         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
-         time time-locale-compat unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         aeson async base blaze-builder criterion deepseq directory filepath
-         safe-exceptions text time transformers unix
-       ];
-       description = "A structured logging framework";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "katip_0_8_8_2" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
      , filepath, hostname, microlens, microlens-th, monad-control, mtl
@@ -183584,7 +183538,6 @@ self: {
        ];
        description = "A structured logging framework";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "katip-datadog" = callPackage
@@ -183822,6 +183775,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "katip-wai_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, case-insensitive
+     , clock, containers, hspec, hspec-discover, http-client, http-types
+     , katip, network, stm, text, time, uuid, wai, warp
+     }:
+     mkDerivation {
+       pname = "katip-wai";
+       version = "0.2.0.0";
+       sha256 = "0n5p0sh961lsj86anx2bpnhhbcaf7y9kvhchqkd18aaw5s899yr3";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive clock containers http-types
+         katip network text time uuid wai
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring containers hspec http-client http-types
+         katip stm text uuid wai warp
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "WAI middleware for logging request and response info through katip";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "katt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers
      , directory, errors, filepath, lens, mtl, parsec, text, url, wreq
@@ -184540,25 +184516,23 @@ self: {
      , cryptohash-md5, derive-storable, derive-storable-plugin
      , file-embed, foldl, geomancy, geomancy-layout, GLFW-b, ktx-codec
      , neat-interpolation, optparse-applicative, optparse-simple
-     , resourcet, rio, rio-app, serialise, spirv-reflect-ffi
+     , resourcet, rio, rio-app, serialise, spirv-enum, spirv-reflect-ffi
      , spirv-reflect-types, StateVar, tagged, template-haskell, text
      , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils
      , VulkanMemoryAllocator, zstd
      }:
      mkDerivation {
        pname = "keid-core";
-       version = "0.1.9.0";
-       sha256 = "0gx8hgn52a3hsirna09zn3j8amplp6kp5r8y4wzdr1fz03abas7d";
-       revision = "1";
-       editedCabalFile = "0wk745437iyyd247q3b8kgdqnysbzcsikbf60cvf3x2ycs8hlb4m";
+       version = "0.1.9.1";
+       sha256 = "0chyw6l1vzjdgn5mwfp39g2fhsxqs61xyxva2apvbk1xj8qm955g";
        libraryHaskellDepends = [
          base binary bytestring containers cryptohash-md5 derive-storable
          derive-storable-plugin file-embed foldl geomancy geomancy-layout
          GLFW-b ktx-codec neat-interpolation optparse-applicative
-         optparse-simple resourcet rio rio-app serialise spirv-reflect-ffi
-         spirv-reflect-types StateVar tagged template-haskell text
-         transformers unagi-chan unliftio vector vulkan vulkan-utils
-         VulkanMemoryAllocator zstd
+         optparse-simple resourcet rio rio-app serialise spirv-enum
+         spirv-reflect-ffi spirv-reflect-types StateVar tagged
+         template-haskell text transformers unagi-chan unliftio vector
+         vulkan vulkan-utils VulkanMemoryAllocator zstd
        ];
        description = "Core parts of Keid engine";
        license = lib.licenses.bsd3;
@@ -184571,8 +184545,8 @@ self: {
      }:
      mkDerivation {
        pname = "keid-frp-banana";
-       version = "0.1.2.0";
-       sha256 = "1yaj6mjwqwa99v74bkn42r06l8gxw7cfydwyi013jfgxrjk0kn4l";
+       version = "0.1.2.1";
+       sha256 = "1zjw8ckzylwxyz8l5s2z62h2s5cpbcasrdbl94gvcx2mrwx1a4yw";
        libraryHaskellDepends = [
          base geomancy geomancy-layout keid-core reactive-banana resourcet
          rio these vulkan
@@ -184663,8 +184637,8 @@ self: {
      }:
      mkDerivation {
        pname = "keid-ui-dearimgui";
-       version = "0.1.3.0";
-       sha256 = "07l35z43524gsp65nc7ipg93hdz1ssfd8mm3ifw7qpgc829vp9vl";
+       version = "0.1.3.1";
+       sha256 = "196w7mwj6wr95p88ij1zadz4908ivrqx5nwgrkc6hqybc4pa7ygh";
        libraryHaskellDepends = [
          base binary bytestring dear-imgui GLFW-b keid-core resourcet rio
          rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator
@@ -184673,6 +184647,7 @@ self: {
        license = lib.licenses.bsd3;
        platforms = [ "x86_64-linux" ];
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "keiretsu" = callPackage
@@ -184867,11 +184842,12 @@ self: {
     ({ mkDerivation, aeson, base, containers, HUnit, text }:
      mkDerivation {
        pname = "keuringsdienst";
-       version = "1.0.0.5";
-       sha256 = "1n44yr8r0gassyidr7ika4p421295a8c1z66m0dkm2aqw82hcim3";
+       version = "1.0.2.0";
+       sha256 = "156z9wxm62s70y83a51lxpjy3c2x0skq2p3jdjdkpwgqa0i7m7yr";
        libraryHaskellDepends = [ aeson base containers text ];
        testHaskellDepends = [ aeson base containers HUnit text ];
-       license = lib.licenses.gpl3Only;
+       description = "Data validation in Haskell that is composable, made easy and clean";
+       license = lib.licenses.lgpl3Only;
      }) {};
 
   "kevin" = callPackage
@@ -185645,10 +185621,8 @@ self: {
      }:
      mkDerivation {
        pname = "kmonad";
-       version = "0.4.2";
-       sha256 = "1d9l16b9srxkkpj61fbz06gxz3y200yn146sdv7h2bbxnjdswia2";
-       revision = "2";
-       editedCabalFile = "1djchj9c64p0fy3ahzkx3z9wg9dg7pjya3mb6z3wmhjvym8iavvv";
+       version = "0.4.3";
+       sha256 = "1wd55wx24sbgyq5laibmgn1agdq69333s9j7n44hs47a7hfxdvlv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185656,7 +185630,7 @@ self: {
          template-haskell time unix unliftio
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec rio ];
        testToolDepends = [ hspec-discover ];
        description = "Advanced keyboard remapping utility";
        license = lib.licenses.mit;
@@ -185975,8 +185949,8 @@ self: {
      }:
      mkDerivation {
        pname = "kontrakcja-templates";
-       version = "0.12";
-       sha256 = "1asmsk3d4wqmiqsxnhaknmnrplrwq6cx6p7n7859rl6x7ac0fjg0";
+       version = "0.12.0.1";
+       sha256 = "0606qgrhnxm7a4fzh3jy0074vc61c95svfprq4p7i0i8n66v11h9";
        libraryHaskellDepends = [
          base containers directory exceptions HStringTemplate html json
          monad-control mtl time transformers transformers-base
@@ -186431,6 +186405,25 @@ self: {
        license = lib.licenses.isc;
      }) {};
 
+  "kvitable_1_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, html-parse, lucid, microlens
+     , named-text, sayable, tasty, tasty-hunit, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "kvitable";
+       version = "1.1.0.1";
+       sha256 = "1zb2s4fkcsa097x1ch02j6z5k1ya733f74rrs85hcrr8vm1hdgc0";
+       libraryHaskellDepends = [
+         base containers lucid microlens named-text sayable text
+       ];
+       testHaskellDepends = [
+         base html-parse microlens tasty tasty-hunit template-haskell text
+       ];
+       description = "Key/Value Indexed Table container and formatting library";
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "kyotocabinet" = callPackage
     ({ mkDerivation, base, bytestring, cereal, kyotocabinet }:
      mkDerivation {
@@ -187871,7 +187864,6 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "language-c-comments" = callPackage
@@ -188323,8 +188315,6 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hspec-hedgehog text ];
        description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-glsl" = callPackage
@@ -189707,8 +189697,8 @@ self: {
      }:
      mkDerivation {
        pname = "launchdarkly-server-sdk";
-       version = "4.1.0";
-       sha256 = "072ppl47rdvcsliij7swdhzlskq30xdwvj5ag2a7060ax5pv23v2";
+       version = "4.2.0";
+       sha256 = "1ip40njah6i25v7wzkd5vpw9gs43dinb1x8ri8mhdn430h30mr05";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash exceptions extra generic-lens hashtables http-client
@@ -191164,25 +191154,6 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "lens-aeson_1_1_3" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, lens
-     , scientific, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "lens-aeson";
-       version = "1.1.3";
-       sha256 = "05jyn6rn0anhgfmk754gmmpcy5jv3ki213z4v243n9jvdjdlg7ms";
-       revision = "1";
-       editedCabalFile = "0l1hkkpp4blkhmbpswl6lqww6wpfm327f8knq1lskhnisbnfmj2j";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring lens scientific text
-         unordered-containers vector
-       ];
-       description = "Law-abiding lenses for aeson";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "lens-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, lens, scientific, text
      , text-short, unordered-containers, vector
@@ -191692,6 +191663,39 @@ self: {
        maintainers = [ lib.maintainers.rvl ];
      }) {};
 
+  "lentil_1_5_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, csv, deepseq, directory, dlist
+     , filemanip, filepath, hspec, hspec-discover, megaparsec, mtl
+     , natural-sort, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, regex-tdfa, semigroups
+     , terminal-progress-bar, text
+     }:
+     mkDerivation {
+       pname = "lentil";
+       version = "1.5.7.0";
+       sha256 = "1xd68cfpq78w778j36d6hxsbi7cjdbsaab6ay0ian4b5a0qwnpic";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring csv deepseq directory dlist filemanip filepath
+         megaparsec mtl natural-sort optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal regex-tdfa semigroups
+         terminal-progress-bar text
+       ];
+       testHaskellDepends = [
+         base bytestring csv deepseq directory dlist filemanip filepath
+         hspec megaparsec mtl natural-sort optparse-applicative
+         prettyprinter prettyprinter-ansi-terminal regex-tdfa semigroups
+         terminal-progress-bar text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "frugal issue tracker";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "lentil";
+       maintainers = [ lib.maintainers.rvl ];
+     }) {};
+
   "lenz" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, hs-functors
      , transformers
@@ -192833,28 +192837,30 @@ self: {
 
   "librarian" = callPackage
     ({ mkDerivation, base, containers, dhall, directory, easy-file
-     , Glob, hspec, hspec-core, hspec-discover, optparse-applicative
-     , pretty-show, regexpr, temporary
+     , either, Glob, hspec, hspec-core, hspec-discover
+     , optparse-applicative, pretty-show, regexpr, temporary, text, time
      }:
      mkDerivation {
        pname = "librarian";
-       version = "0.1.0.0";
-       sha256 = "0w3g6dq4kalniaxspj6zs4ghn9dyazkjga2vad4zb9cwr8i9vh2w";
+       version = "0.1.0.1";
+       sha256 = "16q7pfxklf29k2l644mjiff9jkfkjdb1zcqv0f6aynl15xvwc72v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers dhall directory easy-file Glob pretty-show regexpr
+         base containers directory easy-file Glob pretty-show regexpr time
+       ];
+       executableHaskellDepends = [
+         base dhall directory either optparse-applicative text time
        ];
-       executableHaskellDepends = [ base dhall optparse-applicative ];
        testHaskellDepends = [
          base containers directory easy-file Glob hspec hspec-core
-         hspec-discover temporary
+         hspec-discover temporary time
        ];
        testToolDepends = [ hspec-discover ];
        description = "Move/rename according a set of rules";
        license = lib.licenses.isc;
        hydraPlatforms = lib.platforms.none;
-       mainProgram = "librarian";
+       mainProgram = "librarian-exe";
      }) {};
 
   "librato" = callPackage
@@ -193534,6 +193540,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "lifted-async_0_10_2_6" = callPackage
+    ({ mkDerivation, async, base, constraints, deepseq, HUnit
+     , lifted-base, monad-control, mtl, tasty, tasty-bench
+     , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
+     }:
+     mkDerivation {
+       pname = "lifted-async";
+       version = "0.10.2.6";
+       sha256 = "1sh11zpmmxbkf00j6k0k858yhxpn7fckvw3d5yynkw263pz1hrzn";
+       libraryHaskellDepends = [
+         async base constraints lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [
+         async base HUnit lifted-base monad-control mtl tasty
+         tasty-expected-failure tasty-hunit tasty-th
+       ];
+       benchmarkHaskellDepends = [ async base deepseq tasty-bench ];
+       description = "Run lifted IO operations asynchronously and wait for their results";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "lifted-base" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
      , test-framework, test-framework-hunit, transformers
@@ -193659,6 +193687,8 @@ self: {
        pname = "lifx-lan";
        version = "0.8.3";
        sha256 = "0077wdyrfz20lrd55lzv3bd1ab9cckppkm1gyzp1g23b8xwdayz5";
+       revision = "1";
+       editedCabalFile = "04956hhmg3cng3q4q26pbqy0lcrn5cv6wb57philixjsl4jlzrgp";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring colour composition containers
          extra monad-loops mtl network random safe text time transformers
@@ -195714,8 +195744,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-tries";
-       version = "0.6.7";
-       sha256 = "110y66kkbi6m55b3ba7p1r25xnf6n59yz2kdp4qf6s8c7a5i0wzh";
+       version = "0.6.7.1";
+       sha256 = "1wg247946hn79l4z7h35j304b867fs55b43l19jhkhqi86k4q5y2";
        libraryHaskellDepends = [ base binary containers dlist ];
        testHaskellDepends = [
          base binary ChasingBottoms HUnit QuickCheck template-haskell
@@ -196013,6 +196043,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "little-logger_3_0_0" = callPackage
+    ({ mkDerivation, base, directory, monad-logger, mtl, optics, tasty
+     , tasty-hunit, temporary, text, unliftio-core
+     }:
+     mkDerivation {
+       pname = "little-logger";
+       version = "3.0.0";
+       sha256 = "1ckhkv6pj0sbjs7kn11jb8x5v4ilm8rx51mmi84zyzmxfkrpamwf";
+       libraryHaskellDepends = [
+         base monad-logger mtl optics text unliftio-core
+       ];
+       testHaskellDepends = [
+         base directory monad-logger mtl optics tasty tasty-hunit temporary
+         text unliftio-core
+       ];
+       description = "Basic logging based on monad-logger";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "little-rio" = callPackage
     ({ mkDerivation, base, exceptions, little-logger, microlens, mtl
      , primitive, resourcet, unliftio-core
@@ -196029,6 +196079,23 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "little-rio_3_0_0" = callPackage
+    ({ mkDerivation, base, exceptions, little-logger, mtl, optics
+     , primitive, resourcet, unliftio-core
+     }:
+     mkDerivation {
+       pname = "little-rio";
+       version = "3.0.0";
+       sha256 = "1jkpcwsxrg142jb58vqhchnlhz7x7krr8hf3grycgxrzw2hnw10j";
+       libraryHaskellDepends = [
+         base exceptions little-logger mtl optics primitive resourcet
+         unliftio-core
+       ];
+       description = "When you need just the RIO monad";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "live-sequencer" = callPackage
     ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi
      , concurrent-split, containers, data-accessor
@@ -196560,6 +196627,8 @@ self: {
        pname = "llvm-pretty";
        version = "0.12.1.0";
        sha256 = "113avpn33gyh65yd0bbfwni044ih5vcbnv8l43siy8a4asp0xfwi";
+       revision = "1";
+       editedCabalFile = "0b7k8br3m9jb3zsh983zb7a2x85jn1z2dxxisc7jhjzvhb3xd9my";
        libraryHaskellDepends = [
          base containers microlens microlens-th monadLib parsec pretty syb
          template-haskell th-abstraction
@@ -197675,10 +197744,8 @@ self: {
      }:
      mkDerivation {
        pname = "logic-TPTP";
-       version = "0.5.0.0";
-       sha256 = "0sqzf332c7zdwkdi1346dxljrdammiz1vc332j85487nb0ypnxwi";
-       revision = "4";
-       editedCabalFile = "012aqairsbxqrl0ak5i11wqr1rcdpwi5m4f5nww8glxi3jglnnyb";
+       version = "0.5.1.0";
+       sha256 = "1s3r85zw5ci5mg9rrik351xxi5k8cszlpdanwpxyrinjd3y6j01i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198315,8 +198382,8 @@ self: {
      }:
      mkDerivation {
        pname = "looper";
-       version = "0.3.0.0";
-       sha256 = "01ap0kscxq90zl9rdmgmlfh1dky95r7fmnivzic045ck57bshl2n";
+       version = "0.3.0.1";
+       sha256 = "0kcy4pr7z6ppqgnxbssp597qyjgcm25pdhbhzxjp0n205nywiz11";
        libraryHaskellDepends = [ base opt-env-conf text time unliftio ];
        testHaskellDepends = [
          base opt-env-conf opt-env-conf-test sydtest unliftio
@@ -199185,20 +199252,6 @@ self: {
      }) {};
 
   "lua" = callPackage
-    ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }:
-     mkDerivation {
-       pname = "lua";
-       version = "2.3.2";
-       sha256 = "0c9pq728ipcgmmxw58ab9p0lgcqqb2gf8dlscvgg52pb3q4qqamf";
-       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ lua5_4 ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
-       description = "Lua, an embeddable scripting language";
-       license = lib.licenses.mit;
-     }) {inherit (pkgs) lua5_4;};
-
-  "lua_2_3_3" = callPackage
     ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }:
      mkDerivation {
        pname = "lua";
@@ -199210,7 +199263,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Lua, an embeddable scripting language";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) lua5_4;};
 
   "lua-arbitrary" = callPackage
@@ -199320,8 +199372,8 @@ self: {
        pname = "lucid";
        version = "2.11.20230408";
        sha256 = "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g";
-       revision = "1";
-       editedCabalFile = "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs";
+       revision = "2";
+       editedCabalFile = "13hfdk1xj1fi0fd9crylvvzfr52z79j941im654jv50a3667lxfj";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers hashable mmorph mtl text
          transformers
@@ -199487,6 +199539,8 @@ self: {
        pname = "lucid2";
        version = "0.0.20240424";
        sha256 = "1ccpcbq84y53dxna700rfn6gaxn6xywqfdn27xpvbrl79w5x5p1j";
+       revision = "1";
+       editedCabalFile = "0xggpzcbzrbnd7f0rbjcsri914wwwy8qh256wrq41jswsrb00bkp";
        libraryHaskellDepends = [
          base bytestring containers mtl text transformers
        ];
@@ -199649,8 +199703,8 @@ self: {
        pname = "lumberjack";
        version = "1.0.3.0";
        sha256 = "05a4gvc47448crb0yn0fwi3y9bwdqlmnch839hljwpyamqvqwi8q";
-       revision = "1";
-       editedCabalFile = "1dj6mw8jbxczmqxwyiqqqz7lsi4586bbgv16m4ji14zmm84z2ad3";
+       revision = "2";
+       editedCabalFile = "1szaa11cdmdb8i2hpj0hl8cpwhkbk7s2iwq0hpck75as0xiqk36z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -199779,8 +199833,8 @@ self: {
        pname = "lvmlib";
        version = "1.1";
        sha256 = "1lr2qr817mb8qb7b3wvry9jpj3wjphj5s60rn3dyqibx8gny36bg";
-       revision = "1";
-       editedCabalFile = "0bhgq85nsmyr14lmv1jihacsijsn48smfjymgc4myd6pvaa2f84k";
+       revision = "2";
+       editedCabalFile = "1zy8lh3a4gjfxglhyd561608jdxd1v8hgjwp8mi3hszj7i2ylkym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200224,22 +200278,22 @@ self: {
 
   "macaroon-shop" = callPackage
     ({ mkDerivation, base, bytes, bytestring, cereal, containers
-     , cryptonite, hedgehog, memory, saltine, transformers
+     , crypton, hedgehog, memory, saltine, transformers
      }:
      mkDerivation {
        pname = "macaroon-shop";
-       version = "0.1.0.0";
-       sha256 = "087b83l3bdx1mk79bxqcwckbjdz7idi0m73dcrjiv5b4q5rjr8rs";
+       version = "0.1.0.1";
+       sha256 = "1d03s3mj9h582amlvgz648ygc9g9bzj5ri668kk5pkif6wbr138d";
        libraryHaskellDepends = [
-         base bytes bytestring cereal containers cryptonite memory saltine
+         base bytes bytestring cereal containers crypton memory saltine
          transformers
        ];
        testHaskellDepends = [
-         base bytes bytestring cereal containers cryptonite hedgehog memory
+         base bytes bytestring cereal containers crypton hedgehog memory
          saltine transformers
        ];
        description = "A toolkit for working with macaroons";
-       license = lib.licenses.isc;
+       license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -202772,6 +202826,8 @@ self: {
        pname = "matchable-th";
        version = "0.2";
        sha256 = "1v2r38r59wk699nsql3mw7z83gm1snvnci146ply34za7i42zp54";
+       revision = "1";
+       editedCabalFile = "17mdf8bsq9s2w4bl76zink0k55my43a3702f0zfxgqy5p2b09pkw";
        libraryHaskellDepends = [
          base bifunctors matchable template-haskell th-abstraction
        ];
@@ -203788,6 +203844,33 @@ self: {
        maintainers = [ lib.maintainers.dschrempf ];
      }) {};
 
+  "mcmc_0_8_3_0" = callPackage
+    ({ mkDerivation, ad, aeson, async, base, bytestring, circular
+     , containers, covariance, criterion, directory, dirichlet
+     , fixed-vector, hmatrix, hspec, log-domain, math-functions
+     , microlens, mwc-random, parallel, primitive, random, splitmix
+     , statistics, time, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "mcmc";
+       version = "0.8.3.0";
+       sha256 = "1p4j59wzzbrn5xy64pcg42g2qicski3j16prpm082sags0pv3i7r";
+       libraryHaskellDepends = [
+         ad aeson async base bytestring circular containers covariance
+         directory dirichlet hmatrix log-domain math-functions microlens
+         mwc-random parallel primitive random splitmix statistics time
+         transformers vector zlib
+       ];
+       testHaskellDepends = [ base hspec random statistics ];
+       benchmarkHaskellDepends = [
+         aeson base criterion fixed-vector math-functions random vector
+       ];
+       description = "Sample from a posterior using Markov chain Monte Carlo";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = [ lib.maintainers.dschrempf ];
+     }) {};
+
   "mcmc-samplers" = callPackage
     ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random
      , primitive, statistics
@@ -204962,8 +205045,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory-hexstring";
-       version = "1.0.0.0";
-       sha256 = "1sm7jj75mv8p7f33h619zm10xbzyjg1jds87cg36mrj8hfb32q48";
+       version = "1.0.1.0";
+       sha256 = "0jwkikrv3pkhvxhq2bm675hiivx18m2p89x5irn3hn6mz85p08hq";
        libraryHaskellDepends = [
          aeson base bytestring memory scale template-haskell text
        ];
@@ -204989,6 +205072,25 @@ self: {
        broken = true;
      }) {};
 
+  "mempack" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, criterion, FailT
+     , flat, hspec, mtl, QuickCheck, random, serialise, store, text
+     }:
+     mkDerivation {
+       pname = "mempack";
+       version = "0.1.0.0";
+       sha256 = "1ay2d0ag2gsqh2j0pgq34fk6lqdb09g01mh510p9g787l89mx7hy";
+       libraryHaskellDepends = [ base bytestring FailT mtl text ];
+       testHaskellDepends = [
+         base bytestring FailT hspec mtl QuickCheck random
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cereal criterion flat serialise store
+       ];
+       description = "Short description";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "memscript" = callPackage
     ({ mkDerivation, base, haskeline, transformers }:
      mkDerivation {
@@ -207267,6 +207369,120 @@ self: {
        maintainers = [ lib.maintainers.mpscholten ];
      }) {};
 
+  "minion" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , case-insensitive, containers, exceptions, filepath, http-api-data
+     , http-media, http-types, string-conversions, text, transformers
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "minion";
+       version = "0.1.0.1";
+       sha256 = "1mfrcs7v6r9ws3dhpac3g4zhcnr2ylp9mcncsas17wg21jlhzqfb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring case-insensitive
+         containers exceptions filepath http-api-data http-media http-types
+         string-conversions text transformers wai
+       ];
+       executableHaskellDepends = [ base warp ];
+       description = "A Haskell introspectable web router";
+       license = lib.licenses.mit;
+     }) {};
+
+  "minion-conduit" = callPackage
+    ({ mkDerivation, base, binary, bytestring, conduit, http-types
+     , minion, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "minion-conduit";
+       version = "0.1.0.0";
+       sha256 = "06g30mqiajrn39lch9c4phm0zai6ni9hbnbq741mgbggkyszxqvs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring conduit http-types minion text wai
+       ];
+       executableHaskellDepends = [ base warp ];
+       description = "Minion conduit support";
+       license = lib.licenses.mit;
+       mainProgram = "minion-conduit-example";
+     }) {};
+
+  "minion-htmx" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, minion, text }:
+     mkDerivation {
+       pname = "minion-htmx";
+       version = "0.1.0.0";
+       sha256 = "11zgxfplizkvbrrakx678xj49xyckbjqgb6iz4jrrjjls148ffp4";
+       libraryHaskellDepends = [ base bytestring http-types minion text ];
+       description = "Minion HTMX support";
+       license = lib.licenses.mit;
+     }) {};
+
+  "minion-jwt" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-types, jose, minion
+     , mtl, text, time, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "minion-jwt";
+       version = "0.1.0.0";
+       sha256 = "1f9gfrwachf4ibmvj2129vpzl6qaxn5lbhsf2y0yydj63k5wc7mb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-types jose minion mtl text time
+         transformers wai
+       ];
+       executableHaskellDepends = [ base warp ];
+       description = "Minion JWT support";
+       license = lib.licenses.mit;
+       mainProgram = "minion-jwt-example";
+     }) {};
+
+  "minion-openapi3" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , case-insensitive, directory, file-embed-lzma, filepath
+     , http-api-data, http-types, insert-ordered-containers, lens
+     , minion, minion-wai-extra, openapi3, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "minion-openapi3";
+       version = "0.1.0.0";
+       sha256 = "03rqqx8dy6sk8ryp2a0ykw67rxj531sw12vzpnz8f17vw90x5npp";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring case-insensitive
+         directory file-embed-lzma filepath http-api-data http-types
+         insert-ordered-containers lens minion minion-wai-extra openapi3
+         template-haskell text
+       ];
+       description = "Minion openapi3 support";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "minion-wai-extra" = callPackage
+    ({ mkDerivation, base, binary, bytestring, http-media, http-types
+     , minion, resourcet, string-conversions, text, transformers, wai
+     , wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "minion-wai-extra";
+       version = "0.1.0.0";
+       sha256 = "0mi6kqha1k4ln0l7kcl373mn4r5f80y1ih3s1a6y8k7y87rcx3c8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring http-media http-types minion resourcet
+         string-conversions text transformers wai wai-extra
+       ];
+       executableHaskellDepends = [ base warp ];
+       description = "Minion wrappers for wai-extra";
+       license = lib.licenses.mit;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -207926,6 +208142,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "mixed-types-num_0_6_2" = callPackage
+    ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck
+     , QuickCheck, smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.6.2";
+       sha256 = "0nrbvnvzrfpxrxgg6mnd3jadhhx390cffqz1zrvcw9b2qzdk6i6b";
+       libraryHaskellDepends = [
+         base collect-errors hspec hspec-smallcheck QuickCheck smallcheck
+         template-haskell
+       ];
+       testHaskellDepends = [
+         base collect-errors hspec hspec-smallcheck QuickCheck smallcheck
+       ];
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mixpanel-client" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec
      , hspec-discover, http-client, http-client-tls, markdown-unlit
@@ -208138,21 +208374,6 @@ self: {
        maintainers = [ lib.maintainers.mpscholten ];
      }) {};
 
-  "mmorph_1_1_3" = callPackage
-    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
-     mkDerivation {
-       pname = "mmorph";
-       version = "1.1.3";
-       sha256 = "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr";
-       libraryHaskellDepends = [
-         base mtl transformers transformers-compat
-       ];
-       description = "Monad morphisms";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       maintainers = [ lib.maintainers.Gabriella439 ];
-     }) {};
-
   "mmorph" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
@@ -208609,15 +208830,23 @@ self: {
      }) {};
 
   "mockcat" = callPackage
-    ({ mkDerivation, base, hspec, mtl, template-haskell, text }:
+    ({ mkDerivation, base, hspec, mtl, template-haskell, text
+     , transformers
+     }:
      mkDerivation {
        pname = "mockcat";
-       version = "0.3.1.0";
-       sha256 = "1akg2r96qxqpis3m0xrnaxi26c0nvwr91f3yczai0pzhrp6887g4";
-       libraryHaskellDepends = [ base mtl template-haskell text ];
-       testHaskellDepends = [ base hspec mtl template-haskell text ];
+       version = "0.5.1.0";
+       sha256 = "08z3v6wvm42hgjsl5diqmv4m8j6idxnwy37w9fph8i22a2kf5hn8";
+       libraryHaskellDepends = [
+         base mtl template-haskell text transformers
+       ];
+       testHaskellDepends = [
+         base hspec mtl template-haskell text transformers
+       ];
        description = "Mock library for test in Haskell";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "mockery" = callPackage
@@ -211194,14 +211423,14 @@ self: {
 
   "mono-traversable" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
-     , gauge, hashable, hspec, HUnit, mwc-random, QuickCheck, split
-     , text, transformers, unordered-containers, vector
-     , vector-algorithms
+     , gauge, hashable, hspec, hspec-discover, HUnit, mwc-random
+     , QuickCheck, split, text, transformers, unordered-containers
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "1.0.17.0";
-       sha256 = "0byk9hc2yh95hnhlx1r7h7i42h4dnlm3kwqksb9kaqxwc2wgkn15";
+       version = "1.0.20.0";
+       sha256 = "0i9mz79nhsci3ichqzwnqq3llip7vblk4q98b3ydmcll7jayl8g6";
        libraryHaskellDepends = [
          base bytestring containers hashable split text transformers
          unordered-containers vector vector-algorithms
@@ -211210,6 +211439,7 @@ self: {
          base bytestring containers foldl hspec HUnit QuickCheck text
          transformers unordered-containers vector
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bytestring containers deepseq gauge mwc-random text vector
        ];
@@ -211477,8 +211707,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoidmap";
-       version = "0.0.1.5";
-       sha256 = "18698w7ibyjj3xbzfxh58djdrgi4dg1524g47n9pws8m04kgah2l";
+       version = "0.0.1.6";
+       sha256 = "15p32jm7pl7vpda65nyps9lbw0i32z9lp8zn3yg87480dab2jsqa";
        libraryHaskellDepends = [
          base containers deepseq groups monoid-subclasses
          nonempty-containers nothunks
@@ -211567,7 +211797,6 @@ self: {
        ];
        description = "A GUI library for writing native Haskell applications";
        license = lib.licenses.bsd3;
-       badPlatforms = lib.platforms.darwin;
        mainProgram = "dev-test-app";
      }) {inherit (pkgs) glew;};
 
@@ -211618,7 +211847,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A datagrid widget for the Monomer library";
        license = lib.licenses.mit;
-       badPlatforms = lib.platforms.darwin;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -212923,11 +213151,13 @@ self: {
      }:
      mkDerivation {
        pname = "mpd-current-json";
-       version = "1.3.2.0";
-       sha256 = "04kwmfjc28y2j0wfgcf9m7qfh7vwa2cvzfsy2hpplyg5ji2ds11a";
+       version = "2.1.0.0";
+       sha256 = "0ici761fvhcl82gnsrzmab529rfwx990qv6qappk4wqvn0d1dvm2";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ aeson base libmpd ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring libmpd
+       ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring libmpd optparse-applicative
        ];
@@ -217102,8 +217332,8 @@ self: {
      }:
      mkDerivation {
        pname = "named-text";
-       version = "1.2.0.0";
-       sha256 = "017snabd25b06zgzdagpribqk3mbgd4y4npjf2d6vwzfi5mlcs4z";
+       version = "1.2.1.0";
+       sha256 = "079nlyhvwdbihlbxdskk8ny4kia7jz7fnw29y2jp576b4470zrgl";
        libraryHaskellDepends = [
          aeson base deepseq hashable prettyprinter sayable text
        ];
@@ -217386,7 +217616,6 @@ self: {
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
        license = lib.licenses.isc;
-       badPlatforms = lib.platforms.darwin;
      }) {inherit (pkgs) freetype; inherit (pkgs) glew; 
          inherit (pkgs) libGL; inherit (pkgs) libGLU; 
          inherit (pkgs.xorg) libX11;};
@@ -219016,25 +219245,6 @@ self: {
        broken = true;
      }) {};
 
-  "network_2_6_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
-     , test-framework-hunit, unix
-     }:
-     mkDerivation {
-       pname = "network";
-       version = "2.6.3.1";
-       sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p";
-       revision = "1";
-       editedCabalFile = "1mfwybinwdfb05pvlg3hkiql4pazp9rp1agz777ijj44njkgn416";
-       libraryHaskellDepends = [ base bytestring unix ];
-       testHaskellDepends = [
-         base bytestring doctest HUnit test-framework test-framework-hunit
-       ];
-       description = "Low-level networking interface";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "network" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit, QuickCheck, temporary
@@ -219054,14 +219264,14 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "network_3_2_2_0" = callPackage
+  "network_3_2_4_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit, QuickCheck, stm, temporary
      }:
      mkDerivation {
        pname = "network";
-       version = "3.2.2.0";
-       sha256 = "033zcj1ibrw49h4rbkhbznyz0na25zyaihh2m35wqlkgji3lkc7g";
+       version = "3.2.4.0";
+       sha256 = "16xpkjcp3k22sr7aby35xf5arh0rkq330g70dqaw29v7hb87fw1c";
        libraryHaskellDepends = [ base bytestring deepseq directory stm ];
        testHaskellDepends = [
          base bytestring directory hspec HUnit QuickCheck temporary
@@ -219801,6 +220011,18 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "network-run_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, network, time-manager }:
+     mkDerivation {
+       pname = "network-run";
+       version = "0.4.1";
+       sha256 = "1yl2y910s7b4a31anifl5agba88fwgn4k7958k56nk37hjwj0aq8";
+       libraryHaskellDepends = [ base bytestring network time-manager ];
+       description = "Simple network runner library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "network-server" = callPackage
     ({ mkDerivation, base, network, unix }:
      mkDerivation {
@@ -219977,10 +220199,10 @@ self: {
      }:
      mkDerivation {
        pname = "network-transport";
-       version = "0.5.7";
-       sha256 = "163n3dl56vrmw4pdq66lb80ybjh58lqr85j69hpqwr24c46gjqk7";
+       version = "0.5.8";
+       sha256 = "141qsnxmj2iaclnimilygi4wrxn9hymjf1g7dq32hgswp60yzklx";
        revision = "1";
-       editedCabalFile = "1z9k8i5j01ajhashmy1kkwq6bqcwvi48j6d3n57i4bglfdz8s31z";
+       editedCabalFile = "0nf7jxr7xcdx7rslqrpn4b4k5x35s3j9i2wvzgz0mg6mfdifllp2";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
@@ -220032,8 +220254,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-transport-inmemory";
-       version = "0.5.4";
-       sha256 = "0557xhsswlypnxfvw5x3add29dai29ybi1g129mzkz0pi1wddxiq";
+       version = "0.5.41";
+       sha256 = "1h3fi1qyybjbr7ph4l2j0p8hgypk9j3jarr1c6365mr73m9wbwji";
        libraryHaskellDepends = [
          base bytestring containers data-accessor network-transport stm
        ];
@@ -220051,8 +220273,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-transport-tcp";
-       version = "0.8.4";
-       sha256 = "141l1i8knh0b8wspq0zf2530z89bziiv13zw2s36drxg6inq6rcl";
+       version = "0.8.5";
+       sha256 = "1ppdi8j4whg86mplq3nkz8ll7d927drzj238bj9d1ym9izbprjjj";
        libraryHaskellDepends = [
          async base bytestring containers data-accessor network
          network-transport uuid
@@ -220070,8 +220292,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-transport-tests";
-       version = "0.3.2";
-       sha256 = "1w3cxiap0p8kgxs4jghvhfzpa6bazpha4s6zgabd80cw3gcmf5lf";
+       version = "0.3.3";
+       sha256 = "1x6gqv09nhqf2ynk3wx308gnwd2qqx7v54vsrlxn27vhajc105jl";
        libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl network-transport
          random
@@ -220893,8 +221115,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "1.2.4.1";
-       sha256 = "120jk2d2yip9vd4r0s9b7z7ykh67i921svspn2kc7v5vwx95xn3w";
+       version = "1.2.6.1";
+       sha256 = "1xvhmvlcs10ibn0i2hrphp168gkygsxkbzbdmzp72pn8lhnjsgvd";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export template-haskell
        ];
@@ -220905,19 +221127,20 @@ self: {
   "ngx-export-tools-extra" = callPackage
     ({ mkDerivation, aeson, array, async, base, base64, binary
      , bytestring, case-insensitive, containers, ede
-     , enclosed-exceptions, http-client, http-client-brread-timeout
-     , http-client-tls, http-types, network, ngx-export
-     , ngx-export-tools, pcre-heavy, pcre-light, prettyprinter, resolv
-     , safe, safe-exceptions, snap-core, snap-server, template-haskell
-     , text, time, trifecta, unordered-containers
+     , enclosed-exceptions, hashable, http-client
+     , http-client-brread-timeout, http-client-tls, http-types, network
+     , ngx-export, ngx-export-tools, pcre-heavy, pcre-light
+     , prettyprinter, resolv, safe, safe-exceptions, snap-core
+     , snap-server, template-haskell, text, time, trifecta
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ngx-export-tools-extra";
-       version = "1.2.9.1";
-       sha256 = "0mafzhc6lnari85ng2iw025nhyvwsqkaamxf6jlkkm45k9zsa59y";
+       version = "1.2.11";
+       sha256 = "0aj78jb6vl4vl50z8qz2hjrid36wgrnfsgcmqsxm4pg1ph7bqkd0";
        libraryHaskellDepends = [
          aeson array async base base64 binary bytestring case-insensitive
-         containers ede enclosed-exceptions http-client
+         containers ede enclosed-exceptions hashable http-client
          http-client-brread-timeout http-client-tls http-types network
          ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter
          resolv safe safe-exceptions snap-core snap-server template-haskell
@@ -225048,8 +225271,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogma-cli";
-       version = "1.4.0";
-       sha256 = "096p2xx99d00p0qnrclnwdb4dq5wp1i2idz7wj1g7ccz3h26rm2z";
+       version = "1.4.1";
+       sha256 = "1r9yj862azfg4xngp0ghr9i6zawdaw4gkqb4nl6dpalsc7w0lx8w";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ogma-core optparse-applicative ];
@@ -225063,21 +225286,21 @@ self: {
      }) {};
 
   "ogma-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, filepath, HUnit, IfElse
-     , mtl, ogma-extra, ogma-language-c, ogma-language-cocospec
+    ({ mkDerivation, aeson, base, bytestring, filepath, HUnit, mtl
+     , ogma-extra, ogma-language-c, ogma-language-cocospec
      , ogma-language-copilot, ogma-language-jsonspec, ogma-language-smv
      , ogma-spec, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "ogma-core";
-       version = "1.4.0";
-       sha256 = "03bbdqq69jqxfdaihykxxds4vcfvc6bydwkyz8zsanvsi5ifwza5";
+       version = "1.4.1";
+       sha256 = "1g2696iip5sshwgpf9rq769ivqrxc5km1rq0b2q50y91qfh583c9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring filepath IfElse mtl ogma-extra
-         ogma-language-c ogma-language-cocospec ogma-language-copilot
-         ogma-language-jsonspec ogma-language-smv ogma-spec
+         aeson base bytestring filepath mtl ogma-extra ogma-language-c
+         ogma-language-cocospec ogma-language-copilot ogma-language-jsonspec
+         ogma-language-smv ogma-spec
        ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -225094,8 +225317,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogma-extra";
-       version = "1.4.0";
-       sha256 = "1lg9xph8hsb9jfxvyka6hqb9n9ijw4da29girjf6y16cf7ras3j0";
+       version = "1.4.1";
+       sha256 = "0mipcd5pyi0qxcsb0nhcb57rz7c64m2d36jq08sfvnfa161nhkx9";
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath
        ];
@@ -225112,8 +225335,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogma-language-c";
-       version = "1.4.0";
-       sha256 = "0bvsm9d65akrv67n9l9j0j0b6bpxddhj2fgzp4jrjw07dcqsfwpi";
+       version = "1.4.1";
+       sha256 = "0pnpafz2zmzylq7gzgpzx9358h2lfy3hhpz5wz0fiihh8rfakjgd";
        setupHaskellDepends = [ base BNFC Cabal process ];
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
@@ -225131,8 +225354,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogma-language-cocospec";
-       version = "1.4.0";
-       sha256 = "1n2i2zxcci5ys0z00h28ndqyl7ay0i200y5krxnarwy5b28xcjnf";
+       version = "1.4.1";
+       sha256 = "16j2pqjymr03xkjc5fy2c0hp6c21j557c86ymhlmisy4hkd18195";
        setupHaskellDepends = [ base BNFC Cabal process ];
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
@@ -225148,8 +225371,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ogma-language-copilot";
-       version = "1.4.0";
-       sha256 = "16ybs7c1404c1hsmrimqs9lx0m5d24kvqjd99ljmk4vw4hb686if";
+       version = "1.4.1";
+       sha256 = "0v2nw4mk891faayhvww2qjlrxfcqsgy2ha9zagaby2mfb5q1avh9";
        libraryHaskellDepends = [ base ];
        description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints";
        license = "unknown";
@@ -225203,8 +225426,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogma-language-jsonspec";
-       version = "1.4.0";
-       sha256 = "0xrdnbsdm2a06r3n7i19bb9dcgssgb9fcly5c7rx7p4744lli3as";
+       version = "1.4.1";
+       sha256 = "1bl4ypyj3q6xy1dnfpywbii51521vf5la19jmy82scql9vs9y8rm";
        libraryHaskellDepends = [
          aeson base bytestring jsonpath megaparsec ogma-spec text
        ];
@@ -225220,8 +225443,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogma-language-smv";
-       version = "1.4.0";
-       sha256 = "1f2afvxdjgkgdc64w0f455fb4r9w43nbsjjm4q2s4lhqhrf7qqa9";
+       version = "1.4.1";
+       sha256 = "0jwsqamnqnvy2id1js61a2xkxr5vj6w5xlpfqh0m1qqsgp2qg5kw";
        setupHaskellDepends = [ base BNFC Cabal process ];
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
@@ -225237,8 +225460,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ogma-spec";
-       version = "1.4.0";
-       sha256 = "01lgymsrvkh75jjssxbn5wzw3d51fpc27ngf6pfmrkbd7fx39287";
+       version = "1.4.1";
+       sha256 = "0a0fdx1hpvncyaxsalknkwv8ms2a0p9giazgpkrikr4p14rb771k";
        libraryHaskellDepends = [ base ];
        description = "Ogma: Runtime Monitor translator: JSON Frontend";
        license = "unknown";
@@ -225488,25 +225711,6 @@ self: {
      }) {};
 
   "om-elm" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , http-types, safe, safe-exceptions, template-haskell, text, unix
-     , wai
-     }:
-     mkDerivation {
-       pname = "om-elm";
-       version = "2.0.0.6";
-       sha256 = "1gjrnrl3gvjg85ldgih7zi4sv53vrfl28jymn4z70xnpna7lvph9";
-       libraryHaskellDepends = [
-         base bytestring Cabal containers directory http-types safe
-         safe-exceptions template-haskell text unix wai
-       ];
-       description = "Haskell utilities for building embedded Elm programs";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "om-elm_2_0_0_7" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , http-types, safe, safe-exceptions, template-haskell, text, unix
      , wai
@@ -226199,6 +226403,36 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_10_4_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, dotenv, hspec
+     , hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, scientific
+     , semigroups, text, time, time-compat, time-locale-compat
+     , transformers, uuid-types, void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.10.4.0";
+       sha256 = "16sj1kim44g93cnxkw26hp203ib7pkyzscalk5rfnlz409s1jhp9";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors scientific semigroups text time-compat
+         time-locale-compat transformers uuid-types void
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers contravariant dotenv hspec
+         hspec-discover multiset postgresql-simple product-profunctors
+         profunctors QuickCheck semigroups text time time-compat
+         transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -227912,8 +228146,8 @@ self: {
      }:
      mkDerivation {
        pname = "opt-env-conf";
-       version = "0.5.0.1";
-       sha256 = "1x0zb436yrcvihr6g7g7gz2w0nhlbv3nqgf0rmaa3clp72a272rk";
+       version = "0.5.1.0";
+       sha256 = "024qqi8gfha21ch54dja0rrmcqalmxn6qgxypzvmqzxdmv1fcwjh";
        libraryHaskellDepends = [
          aeson autodocodec autodocodec-nix autodocodec-schema
          autodocodec-yaml base containers hashable mtl path path-io
@@ -228491,7 +228725,6 @@ self: {
        ];
        description = "Types and functions for Kepler orbits";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "orc" = callPackage
@@ -229704,8 +229937,8 @@ self: {
     ({ mkDerivation, base, containers, pa-prelude }:
      mkDerivation {
        pname = "pa-error-tree";
-       version = "0.1.0.0";
-       sha256 = "0ffnz0642kqkjancq5smjal6ap59p4jc8c8zr0qhv7wdbs83sbgq";
+       version = "0.1.1.0";
+       sha256 = "0qp63q5jcal4vd31lhyiz0vb5nmrjv9n2pxw0jl2avnpmbhsg7kd";
        libraryHaskellDepends = [ base containers pa-prelude ];
        description = "Collect a tree of errors and pretty-print";
        license = lib.licenses.bsd3;
@@ -229718,8 +229951,8 @@ self: {
      }:
      mkDerivation {
        pname = "pa-field-parser";
-       version = "0.3.0.0";
-       sha256 = "0myd5zcxz7cx731a9ymqnny34k2gjav7x7053f358r5dymmjp32j";
+       version = "0.3.1.0";
+       sha256 = "1wh4pki488id333kvd5k1zmr7pv2dxb2461w9bvmp6x0311hwkmb";
        libraryHaskellDepends = [
          aeson aeson-better-errors attoparsec base case-insensitive
          containers pa-error-tree pa-prelude scientific semigroupoids
@@ -229731,18 +229964,18 @@ self: {
 
   "pa-json" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty, base
-     , base64-bytestring, bytestring, containers, pa-error-tree
-     , pa-field-parser, pa-label, pa-prelude, scientific, text, time
-     , vector
+     , base64-bytestring, bytestring, containers, mono-traversable
+     , pa-error-tree, pa-field-parser, pa-label, pa-prelude, scientific
+     , text, time, vector
      }:
      mkDerivation {
        pname = "pa-json";
-       version = "0.3.0.0";
-       sha256 = "0fwjv244kbbc9zixf64654fwdykk8h4qc7iv7w7l08bywmjrgrs5";
+       version = "0.4.0.0";
+       sha256 = "19h8irg3lyaa5ilgk3f7w0bfa9fvcamh79z6faqchnc5lhb7akgw";
        libraryHaskellDepends = [
          aeson aeson-better-errors aeson-pretty base base64-bytestring
-         bytestring containers pa-error-tree pa-field-parser pa-label
-         pa-prelude scientific text time vector
+         bytestring containers mono-traversable pa-error-tree
+         pa-field-parser pa-label pa-prelude scientific text time vector
        ];
        description = "Our JSON parsers/encoders";
        license = lib.licenses.bsd3;
@@ -229752,8 +229985,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "pa-label";
-       version = "0.1.1.0";
-       sha256 = "10v107ck2c9vq09qcmh652f0w33c68xfbn1fcg042mh41j8860dl";
+       version = "0.1.2.0";
+       sha256 = "03y2cn6yy06xcpnjs5zc8hd8iba4k44wrrncl7ksplg8j3iank1x";
        libraryHaskellDepends = [ base ];
        description = "Labels, and labelled tuples and enums (GHC >9.2)";
        license = lib.licenses.bsd3;
@@ -229761,17 +229994,17 @@ self: {
 
   "pa-prelude" = callPackage
     ({ mkDerivation, base, bytestring, containers, error, exceptions
-     , mtl, profunctors, PyF, scientific, semigroupoids
+     , foldl, ghc-boot, mtl, profunctors, PyF, scientific, semigroupoids
      , template-haskell, text, these, validation-selective, vector
      }:
      mkDerivation {
        pname = "pa-prelude";
-       version = "0.2.0.0";
-       sha256 = "00gkyypa17ic2s019jmrxwjaylnfryn6nlg20ky1iip935y5y0b8";
+       version = "0.3.0.0";
+       sha256 = "0x4z94l62c7vgm0ya7bddxhzih07fb1kkjl0j0f6k64a42w67w00";
        libraryHaskellDepends = [
-         base bytestring containers error exceptions mtl profunctors PyF
-         scientific semigroupoids template-haskell text these
-         validation-selective vector
+         base bytestring containers error exceptions foldl ghc-boot mtl
+         profunctors PyF scientific semigroupoids template-haskell text
+         these validation-selective vector
        ];
        description = "The Possehl Analytics Prelude";
        license = lib.licenses.bsd3;
@@ -230488,8 +230721,8 @@ self: {
        pname = "palette";
        version = "0.3.0.3";
        sha256 = "11d3011j680nhd0r2b29fhirld2vijwynwbgv8i5v1q7lgrb92az";
-       revision = "1";
-       editedCabalFile = "01fjw8i5m7d4zml2rd7nwpdlnxwasdfxglm3shgpk004gfk7lw1i";
+       revision = "2";
+       editedCabalFile = "1kc2va4x50lrgril36vc3dm5j42464m675jbadw7p31hg4vriqc3";
        libraryHaskellDepends = [
          array base colour containers MonadRandom
        ];
@@ -230620,7 +230853,7 @@ self: {
        ];
      }) {};
 
-  "pandoc_3_3" = callPackage
+  "pandoc_3_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -230639,8 +230872,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "3.3";
-       sha256 = "1vf6syw75ijdwig5b8nry65qwdl90wi4d9rxmpgkdvqbxs0y3fk2";
+       version = "3.4";
+       sha256 = "0kwq6xpycd5sv5h6mbiv08imnzzsgchvyxx5hzscha4kkk2hr0nw";
        configureFlags = [ "-f-trypandoc" ];
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
@@ -230762,14 +230995,14 @@ self: {
        maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
-  "pandoc-cli_3_3" = callPackage
+  "pandoc-cli_3_4" = callPackage
     ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine
      , pandoc-server, safe, temporary, text, wai-extra, warp
      }:
      mkDerivation {
        pname = "pandoc-cli";
-       version = "3.3";
-       sha256 = "1nalsmf7j6gab05mql80l3n7i675ghf05n93jji5k4pvby45nria";
+       version = "3.4";
+       sha256 = "0qrgjx1q7g80lx98580q3w4pddmh2qqpxkmg005hmdmp6hqvd30s";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -230811,8 +231044,8 @@ self: {
        pname = "pandoc-crossref";
        version = "0.3.17.1";
        sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb";
-       revision = "2";
-       editedCabalFile = "00x3nqlrp872wq2alaahkiv34ifj36bs2ql0n4vn2h19wlg1f578";
+       revision = "3";
+       editedCabalFile = "14zqqrv5mgd8kdnis2k97ydcbi2rr77cq09z918lwcfcx7dxsl6w";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -231150,7 +231383,7 @@ self: {
        license = lib.licenses.gpl2Plus;
      }) {};
 
-  "pandoc-lua-engine_0_3_1" = callPackage
+  "pandoc-lua-engine_0_3_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, citeproc, containers
      , data-default, directory, doclayout, doctemplates, exceptions
      , filepath, hslua, hslua-module-doclayout, hslua-module-path
@@ -231161,8 +231394,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-lua-engine";
-       version = "0.3.1";
-       sha256 = "1k2r7l3a970zink3dnw5xrgfn9sy9ysqa6j2mz2l631v5qsg075q";
+       version = "0.3.2";
+       sha256 = "0lh533m3xvr8c29mazdb09b7w7ivrlscc5dxzmrfnkwkr0friw8c";
        libraryHaskellDepends = [
          aeson base bytestring citeproc containers data-default doclayout
          doctemplates exceptions hslua hslua-module-doclayout
@@ -231186,8 +231419,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-lua-marshal";
-       version = "0.2.7.1";
-       sha256 = "1yg1hv2xaw2yr036xc6bp2dd0dr4kw1g6ss9a8ahxs8kd670myxw";
+       version = "0.2.8";
+       sha256 = "0z58mn895hhgkl9lww2zxc0zrpqdnf6m8bpvxfdsh8az0sxgsgba";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions hslua hslua-list
          hslua-marshalling pandoc-types safe text
@@ -231201,6 +231434,29 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "pandoc-lua-marshal_0_2_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
+     , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck
+     , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "pandoc-lua-marshal";
+       version = "0.2.9";
+       sha256 = "04qqjh1f1dp912j5fgvj6sd3ky5cf0hngr0bl37178yikr3mm2k1";
+       libraryHaskellDepends = [
+         aeson base bytestring containers exceptions hslua hslua-list
+         hslua-marshalling pandoc-types safe text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers exceptions hslua hslua-list
+         hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit
+         tasty-lua tasty-quickcheck text
+       ];
+       description = "Use pandoc types in Lua";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "pandoc-markdown-ghci-filter" = callPackage
     ({ mkDerivation, aeson, base, containers, ghcid, pandoc
      , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -231310,6 +231566,38 @@ self: {
        mainProgram = "pandoc-plot";
      }) {};
 
+  "pandoc-plot_1_9_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, gitrev, hashable, hspec-expectations
+     , lifted-async, lifted-base, mtl, optparse-applicative, pandoc
+     , pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec
+     , tasty-hunit, template-haskell, text, typed-process, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-plot";
+       version = "1.9.1";
+       sha256 = "0d6lknjnlzg4a7sx311kpdi94yq7fp19lhvwbsf7rvc3ykx0hjm3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hashable lifted-async lifted-base mtl pandoc pandoc-types
+         shakespeare tagsoup template-haskell text typed-process yaml
+       ];
+       executableHaskellDepends = [
+         base directory filepath gitrev optparse-applicative pandoc
+         pandoc-types template-haskell text typed-process
+       ];
+       testHaskellDepends = [
+         base containers directory filepath hspec-expectations pandoc-types
+         tasty tasty-hspec tasty-hunit text
+       ];
+       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "pandoc-plot";
+     }) {};
+
   "pandoc-pyplot" = callPackage
     ({ mkDerivation, base, containers, data-default-class, deepseq
      , directory, filepath, hashable, hspec, hspec-expectations, mtl
@@ -231391,7 +231679,7 @@ self: {
        license = lib.licenses.gpl2Plus;
      }) {};
 
-  "pandoc-server_0_1_0_7" = callPackage
+  "pandoc-server_0_1_0_8" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, data-default, doctemplates, pandoc, pandoc-types
      , servant-server, skylighting, text, unicode-collation, wai
@@ -231399,8 +231687,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-server";
-       version = "0.1.0.7";
-       sha256 = "1nrcb1r4gjgpw2vgz32dn7h1qinx1lxnlbq7cf1wggm86ac7jz3a";
+       version = "0.1.0.8";
+       sha256 = "1ffsbi1ik0lx06xj1ffr2zpn4a9wn8lsawyhak77nqaih93336a5";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers data-default
          doctemplates pandoc pandoc-types servant-server skylighting text
@@ -232537,10 +232825,8 @@ self: {
      }:
      mkDerivation {
        pname = "parameterized-utils";
-       version = "2.1.8.0";
-       sha256 = "026lrdnw5rjvny380rmrzpwhmcfgp551whbk0mnx2y2q6ij0sjfm";
-       revision = "2";
-       editedCabalFile = "1kk13926s885fxss2hz6h438k526s8agnhg8v199qam862f16yhh";
+       version = "2.1.9.0";
+       sha256 = "15yn958adkivyg7qbbbi20ja8smcdjyslkk3mxswl0r0bfgz2y70";
        libraryHaskellDepends = [
          base base-orphans constraints containers deepseq ghc-prim hashable
          hashtables indexed-traversable lens mtl profunctors
@@ -233683,6 +233969,32 @@ self: {
        broken = true;
      }) {};
 
+  "paseto" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
+     , basement, binary, bytestring, containers, crypton, deepseq
+     , hedgehog, memory, mtl, parsec, text, time, transformers-except
+     }:
+     mkDerivation {
+       pname = "paseto";
+       version = "0.1.0.0";
+       sha256 = "1pcs4p5zxnwdxbvizmiy9cwf57rn0l4yq95yxsfa9zsi0bk9df6f";
+       revision = "2";
+       editedCabalFile = "01vn6hhqrzlri78kp51fvgfq0ajilcpicr79jdhjbinksxxjaapx";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring basement binary
+         bytestring containers crypton deepseq memory mtl parsec text time
+         transformers-except
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring containers crypton hedgehog
+         memory mtl text time transformers-except
+       ];
+       description = "Platform-Agnostic Security Tokens";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "passage" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath
      , GraphSCC, monadLib, mwc-random, pretty, primitive, process
@@ -233956,8 +234268,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.12.0.0";
-       sha256 = "0a903f34y1a3aipff2c4zl86smxgi8agbawkgdd6ac7px4zdz4sv";
+       version = "0.12.0.1";
+       sha256 = "0mpafb16k4jh00ff07qgrqnpyshd8iwpsaaijzijl11sfildxy05";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -233986,8 +234298,8 @@ self: {
      }:
      mkDerivation {
        pname = "patch";
-       version = "0.0.8.2";
-       sha256 = "15r2sjlpvp22iwd7qa1lqdq7n8nvqv2klvzrlm3phqq3j5n5x5y5";
+       version = "0.0.8.3";
+       sha256 = "0x7n18wq7mcy0rd9b5jvxynn800xk9wwa4idfa370v8c9vypvq0c";
        libraryHaskellDepends = [
          base commutative-semigroups constraints-extras containers
          dependent-map dependent-sum indexed-traversable lens
@@ -234061,29 +234373,6 @@ self: {
        broken = true;
      }) {};
 
-  "path_0_9_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
-     , filepath, genvalidity, genvalidity-hspec, genvalidity-property
-     , hashable, hspec, mtl, QuickCheck, template-haskell, text
-     , validity
-     }:
-     mkDerivation {
-       pname = "path";
-       version = "0.9.0";
-       sha256 = "14h811rrydpiwi1rdi5wmcdlcq2qjld3iv92p4czqf08a7lxaz4g";
-       libraryHaskellDepends = [
-         aeson base deepseq exceptions filepath hashable template-haskell
-         text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath genvalidity genvalidity-hspec
-         genvalidity-property hspec mtl QuickCheck template-haskell validity
-       ];
-       description = "Support for well-typed paths";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "path" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
      , filepath, genvalidity, genvalidity-hspec, genvalidity-property
@@ -236245,44 +236534,6 @@ self: {
      }) {};
 
   "persistent" = callPackage
-    ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base
-     , base64-bytestring, blaze-html, bytestring, conduit, containers
-     , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data
-     , lift-type, monad-logger, mtl, path-pieces, QuickCheck
-     , quickcheck-instances, resource-pool, resourcet, scientific
-     , shakespeare, silently, template-haskell, text, th-lift-instances
-     , time, transformers, unliftio, unliftio-core, unordered-containers
-     , vault, vector
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.14.6.2";
-       sha256 = "1i76jnq6vv8qc1xcp5jg5n0033q8s5fhrja1f4v606q7jz9fiilg";
-       libraryHaskellDepends = [
-         aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html
-         bytestring conduit containers deepseq fast-logger http-api-data
-         lift-type monad-logger mtl path-pieces resource-pool resourcet
-         scientific silently template-haskell text th-lift-instances time
-         transformers unliftio unliftio-core unordered-containers vault
-         vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers deepseq fast-logger hspec http-api-data
-         monad-logger mtl path-pieces QuickCheck quickcheck-instances
-         resource-pool resourcet scientific shakespeare silently
-         template-haskell text th-lift-instances time transformers unliftio
-         unliftio-core unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq file-embed template-haskell text
-       ];
-       description = "Type-safe, multi-backend data serialization";
-       license = lib.licenses.mit;
-       maintainers = [ lib.maintainers.psibi ];
-     }) {};
-
-  "persistent_2_14_6_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base
      , base64-bytestring, blaze-html, bytestring, conduit, containers
      , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data
@@ -236317,7 +236568,6 @@ self: {
        ];
        description = "Type-safe, multi-backend data serialization";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = [ lib.maintainers.psibi ];
      }) {};
 
@@ -236421,8 +236671,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-documentation";
-       version = "0.1.0.4";
-       sha256 = "0ib56hz4q83knw6lqdbfcflnpwd0x8381p67yibmnbyn9p5b6r1q";
+       version = "0.1.0.5";
+       sha256 = "032mfnsz5kpy1022gc2w9y0g4fjhqwq07zb2r8arjdhzzhbirwk2";
        libraryHaskellDepends = [
          base containers mtl persistent template-haskell text
        ];
@@ -236623,10 +236873,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mongoDB";
-       version = "2.13.0.1";
-       sha256 = "1ck74kpzkz623c43qb8r1cjq8chi2p721vx95zrpciz8jm496235";
-       revision = "4";
-       editedCabalFile = "01zfwp8jyr65sc3mijv1a8x0zs4csmr71nn6ksr9d18p3lpd9zz8";
+       version = "2.13.1.0";
+       sha256 = "08zal5arbclq6z05i5nz31yqiny2vgj0ky94bqff1jp72ly32rp3";
        libraryHaskellDepends = [
          aeson base bson bytestring cereal conduit http-api-data mongoDB
          network path-pieces persistent resource-pool resourcet text time
@@ -237355,6 +237603,8 @@ self: {
        pname = "pg-entity";
        version = "0.0.4.4";
        sha256 = "0xbsys4h6p84m3vh076v5cjrmf2v9yl8d44zaknfxbjc8ssfbmh2";
+       revision = "2";
+       editedCabalFile = "19firm055d3j9gw8cf6qb6n2jy5jgs287mcgmskbcj78fs1a9g62";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -237794,6 +238044,8 @@ self: {
        libraryHaskellDepends = [ base containers quantizer ];
        description = "Extended functionality of PhLADiPreLiO";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "phladiprelio-general-shared" = callPackage
@@ -237807,6 +238059,7 @@ self: {
        ];
        description = "A shared by different general implementations of the PhLADiPreLiO functionality";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "phladiprelio-general-simple" = callPackage
@@ -237835,6 +238088,7 @@ self: {
        ];
        description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "phladiprelio-rhythmicity-shared" = callPackage
@@ -237873,6 +238127,7 @@ self: {
        ];
        description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "phladiprelio-ukrainian-simple" = callPackage
@@ -237913,6 +238168,7 @@ self: {
        ];
        description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "phladiprelioUkr";
      }) {};
 
@@ -238190,7 +238446,9 @@ self: {
        ];
        description = "A library for working with generalized phonetic languages usage";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "pldPL";
+       broken = true;
      }) {};
 
   "phonetic-languages-plus" = callPackage
@@ -238581,7 +238839,9 @@ self: {
        ];
        description = "Prepares Ukrainian text to be used as a PhLADiPreLiO text";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "unconcatUkr";
+       broken = true;
      }) {};
 
   "phonetic-languages-vector" = callPackage
@@ -239905,17 +240165,15 @@ self: {
        pname = "pipes-extras";
        version = "1.0.15";
        sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82";
-       revision = "8";
-       editedCabalFile = "1lh58slrw21gm799zp963k34ypcqhxz36j15qzhh1nh5zazasq8m";
+       revision = "9";
+       editedCabalFile = "00wd0vp60dma62mxxxaj1njcsyz9pazy2j3zpvfppr7zphckhq6p";
        libraryHaskellDepends = [ base foldl lens pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
        description = "Extra utilities for pipes";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = [ lib.maintainers.Gabriella439 ];
-       broken = true;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -240929,6 +241187,18 @@ self: {
        mainProgram = "place-cursor-at";
      }) {inherit (pkgs.xorg) libXinerama;};
 
+  "placeholder" = callPackage
+    ({ mkDerivation, base, filepath, ghc-prim, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "placeholder";
+       version = "0";
+       sha256 = "0b6irf7nhr2p5w2wh4fvwaa8ajh45vdnnpqwrwxz7ladfmfbw2r9";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base filepath ghc-prim tasty tasty-hunit ];
+       description = "placeholder definitions for TODO and unimplemented";
+       license = "(BSD-2-Clause OR Apache-2.0)";
+     }) {};
+
   "placeholders" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -242725,6 +242995,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Polysemy wrapper around the Blockfrost client";
        license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-check" = callPackage
@@ -245710,6 +245982,7 @@ self: {
        description = "REST API for any Postgres database";
        license = lib.licenses.mit;
        mainProgram = "postgrest";
+       maintainers = [ lib.maintainers.wolfgangwalther ];
      }) {};
 
   "postgrest-ws" = callPackage
@@ -247420,8 +247693,8 @@ self: {
        pname = "prettyprinter-graphviz";
        version = "1.1.0.0";
        sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm";
-       revision = "1";
-       editedCabalFile = "1q8mp6rzb9l6jm8bc902si99ns2nw3vzimqvzwhxbkxf4ljdzqwq";
+       revision = "2";
+       editedCabalFile = "0rrh7rkwv3rbd974ylwvsm8wdjk40i7sp95vjqq49zm68l3h6094";
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "A prettyprinter backend for graphviz";
        license = lib.licenses.bsd3;
@@ -247451,10 +247724,8 @@ self: {
     ({ mkDerivation, base, lucid, prettyprinter, text }:
      mkDerivation {
        pname = "prettyprinter-lucid";
-       version = "0.1.0.1";
-       sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh";
-       revision = "3";
-       editedCabalFile = "01ngq4fx3d5xpy0kxfragajjp746dhighsvmcyjwyb65w1z8fflq";
+       version = "0.2.0.1";
+       sha256 = "1kmbqywn15djxsxb98qrrn9cfdpvmq8x4h29fzdx76bsv5zrlvvk";
        libraryHaskellDepends = [ base lucid prettyprinter text ];
        description = "A prettyprinter backend for lucid";
        license = lib.licenses.bsd3;
@@ -248473,12 +248744,12 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "process_1_6_22_0" = callPackage
+  "process_1_6_24_0" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, unix }:
      mkDerivation {
        pname = "process";
-       version = "1.6.22.0";
-       sha256 = "1yv8pk2g8d5wrw3306ar76fzgd6iyra9ci0syjl0b4pmwxff41ps";
+       version = "1.6.24.0";
+       sha256 = "1fl1y0zc4dsifw1f5nkmy18l46i8wlkcq9h8jp2cm4gzww8x92qy";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        description = "Process libraries";
        license = lib.licenses.bsd3;
@@ -252128,15 +252399,15 @@ self: {
 
   "pusher-http-haskell" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-client-tls
+     , crypton, hashable, hspec, http-client, http-client-tls
      , http-types, memory, QuickCheck, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "2.1.0.17";
-       sha256 = "1fmnhx9hlxajdbyq71v28b0sc7phgx2h7spi2s5viihpnxzwp3rk";
+       version = "2.1.0.18";
+       sha256 = "08wc8agnxfalixc7d4zlwsh3swanyfgg74180lm4v5i2q6s5jxy4";
        libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
+         aeson base base16-bytestring bytestring crypton hashable
          http-client http-client-tls http-types memory text time
          unordered-containers
        ];
@@ -252790,6 +253061,23 @@ self: {
        mainProgram = "qnap-decrypt";
      }) {};
 
+  "qq-bytes" = callPackage
+    ({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover
+     , tasty-hedgehog, tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "qq-bytes";
+       version = "1.0.0.0";
+       sha256 = "0b5fkysx2pfn0kyn433gizcrjwy354rx067fvn22l8ag6i6clp5z";
+       libraryHaskellDepends = [ base bytestring template-haskell ];
+       testHaskellDepends = [
+         base bytestring hedgehog tasty tasty-hedgehog tasty-hunit
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "QuasiQuoter for byte sequence";
+       license = lib.licenses.asl20;
+     }) {};
+
   "qq-literals" = callPackage
     ({ mkDerivation, base, network-uri, template-haskell }:
      mkDerivation {
@@ -252893,6 +253181,23 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "qrcode-core_0_9_10" = callPackage
+    ({ mkDerivation, base, binary, bytestring, case-insensitive
+     , containers, dlist, primitive, text, vector
+     }:
+     mkDerivation {
+       pname = "qrcode-core";
+       version = "0.9.10";
+       sha256 = "117xsv0p2l6nwbl0a7qwip1cnix4x6gljl12w11pzrqmvrhgilx2";
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive containers dlist primitive
+         text vector
+       ];
+       description = "QR code library in pure Haskell";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "qrcode-juicypixels" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels
      , qrcode-core, text, vector
@@ -252909,6 +253214,23 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "qrcode-juicypixels_0_8_6" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels
+     , qrcode-core, text, vector
+     }:
+     mkDerivation {
+       pname = "qrcode-juicypixels";
+       version = "0.8.6";
+       sha256 = "0i17wcv570x4a9cg0cdkzz4g86jwgfx68sg62bbvw7zwyc00bpma";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring JuicyPixels qrcode-core text
+         vector
+       ];
+       description = "Converts a qrcode-core image to JuicyPixels";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "qsem" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -253185,8 +253507,8 @@ self: {
      }:
      mkDerivation {
        pname = "quantizer";
-       version = "0.3.1.0";
-       sha256 = "1pd3cqz73nvdf9i7fg11q1yjm699n11shxan60iv2v57q6kryjw4";
+       version = "0.4.0.0";
+       sha256 = "1hbxkl5hl88wrbd8jsx3sh7nb9in5rsd3f2cd43qxmpvda62m8rb";
        libraryHaskellDepends = [
          base minmax monoid-insertleft uniqueness-periods-vector-stats
        ];
@@ -253973,8 +254295,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-quid";
-       version = "0.0.1.4";
-       sha256 = "1s1pqqs0v22vigq913v7qjqx95xmfrfg46khiac5qp982swz9vnv";
+       version = "0.0.1.5";
+       sha256 = "0w54yxwmrf228q0bi3cymlfm2gbv098i0yfpm8xqp6wl5afm5291";
        libraryHaskellDepends = [
          base containers deepseq extra hashable QuickCheck text
        ];
@@ -254126,7 +254448,7 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-state-machine_0_10_0" = callPackage
+  "quickcheck-state-machine_0_10_1" = callPackage
     ({ mkDerivation, array, base, base-compat, bifunctors, bytestring
      , containers, directory, doctest, exceptions, filelock, filepath
      , generics-sop, graphviz, hashable, hashtables, http-client
@@ -254140,8 +254462,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-state-machine";
-       version = "0.10.0";
-       sha256 = "09xm7lc24ps4il2x5gbl01643zp5j26ps6r2jxw05n8859flp4lq";
+       version = "0.10.1";
+       sha256 = "03ignyi3db1hciwjk03xvwd1ls53sszm4j3398vdw97s53d5li7l";
        libraryHaskellDepends = [
          base base-compat bytestring containers directory exceptions
          filepath generics-sop graphviz MemoTrie mtl pretty pretty-show
@@ -254944,6 +255266,22 @@ self: {
        broken = true;
      }) {};
 
+  "r-tree" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, random, tasty-bench, weigh
+     }:
+     mkDerivation {
+       pname = "r-tree";
+       version = "1.0.0.0";
+       sha256 = "1p8wc66wvxrqcw9akgzmzzf88hrm69s0ma87zxyp1h1pirbn3s9j";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq hspec random ];
+       benchmarkHaskellDepends = [
+         base deepseq random tasty-bench weigh
+       ];
+       description = "R-/R*-trees";
+       license = lib.licenses.mit;
+     }) {};
+
   "r3x-haskell-sdk" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
      , case-insensitive, containers, cookie, http-types, mtl, regex-pcre
@@ -255122,8 +255460,8 @@ self: {
      }:
      mkDerivation {
        pname = "radix-tree";
-       version = "1.0.0.1";
-       sha256 = "0jzr4zhznxh45pivsa6falk4pbcizm7bx1kfb108a8bx00i4s885";
+       version = "1.0.0.2";
+       sha256 = "19i156s1b9n5vmzjjbd8z7jix95km0xx7fzrig1gx712yaf9x7rh";
        libraryHaskellDepends = [
          base bytestring deepseq primitive template-haskell text
        ];
@@ -256120,8 +256458,8 @@ self: {
      }:
      mkDerivation {
        pname = "rank1dynamic";
-       version = "0.4.1";
-       sha256 = "19x2w44f31589vf4s428m7g3dz75qykr7mv599rf3gls4zjx781r";
+       version = "0.4.2";
+       sha256 = "15v36c1h19gr1a9klz4qyzyizak2r8pnbybb5xl8nyaz0ib0hgf6";
        libraryHaskellDepends = [ base binary ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -256632,14 +256970,14 @@ self: {
        broken = true;
      }) {};
 
-  "rattletrap_13_0_3" = callPackage
+  "rattletrap_13_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , containers, filepath, http-client, http-client-tls, text
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "13.0.3";
-       sha256 = "0rs1hskmx13ahcqg6dxx46nc0pijc14d8bikjsdm1y17z2wzidcm";
+       version = "13.1.0";
+       sha256 = "0niqx3yv215xc2pcy1hnfxrmqqclmz4h33swm8wnf1ddwajh3q9d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -257045,8 +257383,8 @@ self: {
      }:
      mkDerivation {
        pname = "rds-data";
-       version = "0.0.0.2";
-       sha256 = "1gfqxffl7fncmwriyrc328imkv98vwls4jdva5klgaw3gwrq1l2x";
+       version = "0.0.0.10";
+       sha256 = "15kxk1k59b97nbs1kj2j8gy473bdzmzv7684kr3vwhd0mjwg69z2";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -259259,8 +259597,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.9.3.0";
-       sha256 = "1hhh3ca0pcrnrzbn83vb7wzp6iq45vabzgchwh6b6b0mr3ckqrlk";
+       version = "0.9.3.1";
+       sha256 = "04vgr8a98k5iqc0lc8asvh785pn9fzhx1v8vl6ghq6k5hy9mgigq";
        libraryHaskellDepends = [
          base bifunctors commutative-semigroups comonad constraints
          constraints-extras containers data-default dependent-map
@@ -259758,9 +260096,7 @@ self: {
        ];
        description = "Helper functions to use reflex with gi-gtk";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "reflex-gi-gtk-example";
-       broken = true;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -259776,8 +260112,6 @@ self: {
        ];
        description = "An reflex interface for gloss";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -259978,9 +260312,7 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "reflex-sdl2-exe";
-       broken = true;
      }) {};
 
   "reflex-test-host" = callPackage
@@ -262696,7 +263028,7 @@ self: {
        maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
-  "req_3_13_3" = callPackage
+  "req_3_13_4" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, containers, crypton-connection
      , data-default-class, exceptions, hspec, hspec-core, hspec-discover
@@ -262707,8 +263039,8 @@ self: {
      }:
      mkDerivation {
        pname = "req";
-       version = "3.13.3";
-       sha256 = "162hqajwdnkpl0hylkzf33jxh68nyq1bnsyp3wi6h394phrgniy3";
+       version = "3.13.4";
+       sha256 = "0s80kl29b7d35v044yvkfa6ja40k4sm3wh26qpnscqzv2n6w8zzk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -262953,8 +263285,8 @@ self: {
      }:
      mkDerivation {
        pname = "rerefined";
-       version = "0.5.1";
-       sha256 = "0n775yxclxpnw0nf6g0ai6pdmckvw5v8rw03fss51mq1y9xw8dcg";
+       version = "0.6.0";
+       sha256 = "0msawph4qcl3ch2821bq1kfjmzkxl6vkhglcp6glimkcsmkbabyv";
        libraryHaskellDepends = [
          base mono-traversable QuickCheck template-haskell text
          text-builder-linear type-level-show
@@ -263499,32 +263831,6 @@ self: {
      }) {};
 
   "rest-rewrite" = callPackage
-    ({ mkDerivation, base, containers, graphviz, hashable, monad-loops
-     , mtl, parsec, process, QuickCheck, text, time
-     , unordered-containers, z3
-     }:
-     mkDerivation {
-       pname = "rest-rewrite";
-       version = "0.4.3";
-       sha256 = "0rvqagskkibwadqdkfqqjp0vrdxfn1hnb6g27ps7h160knygaa1d";
-       revision = "1";
-       editedCabalFile = "0m0m3brlxx945lrr34wpmn5jgzdpw9ck0qxj23s8av4rlh1a9hx1";
-       libraryHaskellDepends = [
-         base containers hashable monad-loops mtl parsec process QuickCheck
-         text time unordered-containers
-       ];
-       testHaskellDepends = [
-         base containers hashable mtl QuickCheck text time
-         unordered-containers
-       ];
-       testSystemDepends = [ graphviz z3 ];
-       doHaddock = false;
-       description = "Rewriting library with online termination checking";
-       license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.tbidne ];
-     }) {inherit (pkgs) graphviz; inherit (pkgs) z3;};
-
-  "rest-rewrite_0_4_4" = callPackage
     ({ mkDerivation, base, containers, graphviz, hashable, monad-loops
      , mtl, parsec, process, QuickCheck, text, time
      , unordered-containers, z3
@@ -263545,7 +263851,6 @@ self: {
        doHaddock = false;
        description = "Rewriting library with online termination checking";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = [ lib.maintainers.tbidne ];
      }) {inherit (pkgs) graphviz; inherit (pkgs) z3;};
 
@@ -267123,7 +267428,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Let your mind know that your hands need a rest!";
        license = lib.licenses.bsd2;
-       badPlatforms = lib.platforms.darwin;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -267660,16 +267964,17 @@ self: {
 
   "rustls" = callPackage
     ({ mkDerivation, async, base, bytestring, containers
-     , derive-storable, directory, filepath, hedgehog, network, process
-     , resourcet, rustls, stm, tasty, tasty-hedgehog, tasty-hunit
-     , temporary, text, transformers
+     , derive-storable, directory, filepath, hedgehog, mtl, network
+     , process, resourcet, rustls, stm, tasty, tasty-hedgehog
+     , tasty-hunit, temporary, text, transformers
      }:
      mkDerivation {
        pname = "rustls";
-       version = "0.1.0.0";
-       sha256 = "19gv5cc0c3mnl40h5z1qnxrdhshiikmpmlyljv27jx2vk4i4vqib";
+       version = "0.2.0.0";
+       sha256 = "1scgp17hfmnzfccpaqih0smq3v34n217wsc5p7xdqgyhxwsj1bqg";
        libraryHaskellDepends = [
-         base bytestring derive-storable network resourcet text transformers
+         base bytestring containers derive-storable mtl network resourcet
+         text transformers
        ];
        librarySystemDepends = [ rustls ];
        testHaskellDepends = [
@@ -267772,43 +268077,6 @@ self: {
      }) {};
 
   "rzk" = callPackage
-    ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC
-     , bytestring, Cabal, co-log-core, data-default-class, directory
-     , doctest, filepath, Glob, happy, hspec, hspec-discover, lens, lsp
-     , lsp-types, mtl, optparse-generic, process, QuickCheck, stm
-     , template-haskell, text, with-utf8, yaml
-     }:
-     mkDerivation {
-       pname = "rzk";
-       version = "0.7.4";
-       sha256 = "1n7dk24pbllr1xxr3klqxh5nq2pcjchygdr0xvhd2yla7w5hjhv5";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal process ];
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring co-log-core
-         data-default-class directory filepath Glob lens lsp lsp-types mtl
-         stm template-haskell text yaml
-       ];
-       libraryToolDepends = [ alex BNFC happy ];
-       executableHaskellDepends = [
-         array base bifunctors bytestring directory Glob mtl
-         optparse-generic template-haskell text with-utf8 yaml
-       ];
-       executableToolDepends = [ alex BNFC happy ];
-       testHaskellDepends = [
-         array base bifunctors bytestring directory doctest Glob hspec
-         hspec-discover mtl QuickCheck template-haskell text yaml
-       ];
-       testToolDepends = [ alex BNFC happy hspec-discover ];
-       description = "An experimental proof assistant for synthetic ∞-categories";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       mainProgram = "rzk";
-       broken = true;
-     }) {};
-
-  "rzk_0_7_5" = callPackage
     ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC
      , bytestring, Cabal, co-log-core, data-default-class, directory
      , doctest, filepath, Glob, happy, hspec, hspec-discover, lens, lsp
@@ -269319,21 +269587,21 @@ self: {
      }) {};
 
   "sandwich-hedgehog" = callPackage
-    ({ mkDerivation, base, free, hedgehog, monad-control, mtl
-     , safe-exceptions, sandwich, string-interpolate, text, time, vty
+    ({ mkDerivation, base, exceptions, free, hedgehog, sandwich
+     , string-interpolate, text, time, unliftio, vty
      , wl-pprint-annotated
      }:
      mkDerivation {
        pname = "sandwich-hedgehog";
-       version = "0.1.3.0";
-       sha256 = "0wf16y9a8savdviyr29dpji9ij26zcn3jrsf297ywrlbd00n7g1h";
+       version = "0.1.3.1";
+       sha256 = "0pidk7xlgdm9sad9zskqbmyhn0mlmz6vyygg4vfr2cqbnfkms502";
        libraryHaskellDepends = [
-         base free hedgehog monad-control mtl safe-exceptions sandwich
-         string-interpolate text time vty wl-pprint-annotated
+         base exceptions free hedgehog sandwich string-interpolate text time
+         unliftio vty wl-pprint-annotated
        ];
        testHaskellDepends = [
-         base free hedgehog monad-control mtl safe-exceptions sandwich
-         string-interpolate text time vty wl-pprint-annotated
+         base exceptions free hedgehog sandwich string-interpolate text time
+         unliftio vty wl-pprint-annotated
        ];
        description = "Sandwich integration with Hedgehog";
        license = lib.licenses.bsd3;
@@ -269823,8 +270091,8 @@ self: {
      }:
      mkDerivation {
        pname = "sayable";
-       version = "1.2.4.0";
-       sha256 = "0hqcpcgzwv4q7vxdhnf3lffhlnrr4ykpz330n1ip0qnys483yz8r";
+       version = "1.2.5.0";
+       sha256 = "05jf2423l85vwc98fxib9ahlq9w4zhan4912jmfk86gvhsd35hls";
        libraryHaskellDepends = [
          base bytestring containers exceptions prettyprinter
          template-haskell text th-abstraction
@@ -269913,37 +270181,6 @@ self: {
        mainProgram = "sbp2udp";
      }) {};
 
-  "sbv_7_13" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , crackNum, deepseq, directory, doctest, filepath, generic-deriving
-     , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
-     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck
-     , template-haskell, time, z3
-     }:
-     mkDerivation {
-       pname = "sbv";
-       version = "7.13";
-       sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
-       revision = "1";
-       editedCabalFile = "0gn00bgvy9v4wiica7psrzmxbbp0fiiknrxmdy55z9k2ycpvw7la";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base containers crackNum deepseq directory filepath
-         generic-deriving ghc mtl pretty process QuickCheck random syb
-         template-haskell time
-       ];
-       testHaskellDepends = [
-         base bytestring containers crackNum directory doctest filepath Glob
-         hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
-         tasty-quickcheck template-haskell
-       ];
-       testSystemDepends = [ z3 ];
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {inherit (pkgs) z3;};
-
   "sbv" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , deepseq, directory, filepath, libBF, mtl, pretty, process
@@ -270169,8 +270406,8 @@ self: {
      }:
      mkDerivation {
        pname = "scale";
-       version = "1.0.0.0";
-       sha256 = "1c1khgy83402lqfqdvq5amf9pgn5a6m4m5zmqkkw6iw0wbjw7p3a";
+       version = "1.0.1.0";
+       sha256 = "19cnzd316qbzxdjgia35l1yay1qpc6x10sgpfbv58yr4z65s01rx";
        libraryHaskellDepends = [
          base bitvec bytestring cereal data-default generics-sop memory
          template-haskell text vector
@@ -273278,8 +273515,8 @@ self: {
      }:
      mkDerivation {
        pname = "semilattices";
-       version = "0.0.0.7";
-       sha256 = "1m9sqm4nq8d8rraqfqfwbn91412aqqq4gg9754lnq9crns75df11";
+       version = "0.0.0.8";
+       sha256 = "05dmnszyxssbjzw6f7qwq3slzd913afn562f2rnc54q9719xyybn";
        libraryHaskellDepends = [ base containers unordered-containers ];
        testHaskellDepends = [
          base doctest QuickCheck quickcheck-instances
@@ -273843,29 +274080,6 @@ self: {
      }) {};
 
   "sequence-formats" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
-     , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
-     , pipes-bytestring, pipes-safe, pipes-zlib, tasty, tasty-hunit
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "sequence-formats";
-       version = "1.8.1.0";
-       sha256 = "105kxxczmdq6k2mnfsr5k6ixnlcllkhk9w70c5jcf96wz4gm6ydz";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers errors exceptions foldl
-         lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
-         pipes-zlib transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec pipes pipes-safe tasty
-         tasty-hunit transformers vector
-       ];
-       description = "A package with basic parsing utilities for several Bioinformatic data formats";
-       license = lib.licenses.gpl3Only;
-     }) {};
-
-  "sequence-formats_1_8_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
      , pipes-bytestring, pipes-safe, pipes-zlib, tasty, tasty-hunit
@@ -273886,7 +274100,6 @@ self: {
        ];
        description = "A package with basic parsing utilities for several Bioinformatic data formats";
        license = lib.licenses.gpl3Only;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sequenceTools" = callPackage
@@ -274256,35 +274469,6 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
-     , bytestring, case-insensitive, constraints, deepseq, hspec
-     , hspec-discover, http-api-data, http-media, http-types, mmorph
-     , mtl, network-uri, QuickCheck, quickcheck-instances
-     , singleton-bool, sop-core, string-conversions, tagged, text
-     , transformers, vault
-     }:
-     mkDerivation {
-       pname = "servant";
-       version = "0.20.1";
-       sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl";
-       revision = "5";
-       editedCabalFile = "1lp44k8vsjwscjc5palvr930pznrm40adqksm3jcmhjsq63xmmji";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat bifunctors bytestring
-         case-insensitive constraints deepseq http-api-data http-media
-         http-types mmorph mtl network-uri QuickCheck singleton-bool
-         sop-core string-conversions tagged text transformers vault
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring hspec http-media mtl QuickCheck
-         quickcheck-instances string-conversions text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A family of combinators for defining webservices APIs";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant_0_20_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, constraints, containers, deepseq, hspec
      , hspec-discover, http-api-data, http-media, http-types, mmorph
@@ -274308,7 +274492,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -274410,23 +274593,6 @@ self: {
      }) {};
 
   "servant-auth" = callPackage
-    ({ mkDerivation, aeson, base, containers, jose, lens, servant, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-auth";
-       version = "0.4.1.0";
-       sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd";
-       revision = "9";
-       editedCabalFile = "0vdci6ckk0qq48wpsxqm09azb2fap6av2vnafzkyhfj8knk49jyh";
-       libraryHaskellDepends = [
-         aeson base containers jose lens servant text unordered-containers
-       ];
-       description = "Authentication combinators for servant";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, containers, jose, lens, servant, text
      , unordered-containers
      }:
@@ -274439,36 +274605,9 @@ self: {
        ];
        description = "Authentication combinators for servant";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-auth-client" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , hspec-discover, http-client, http-types, jose, QuickCheck
-     , servant, servant-auth, servant-auth-server, servant-client
-     , servant-client-core, servant-server, time, transformers, wai
-     , warp
-     }:
-     mkDerivation {
-       pname = "servant-auth-client";
-       version = "0.4.1.1";
-       sha256 = "1fs00p15hz2lqspby2xg6h0zxmlljm6wgi0wk73a4gavyg26dgqq";
-       revision = "5";
-       editedCabalFile = "1dbq1451jj49hbjfrdhr47k3rpwj825rbvj3f79w75rzyl3hyg75";
-       libraryHaskellDepends = [
-         base bytestring containers servant servant-auth servant-client-core
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec http-client http-types jose QuickCheck
-         servant servant-auth servant-auth-server servant-client
-         servant-server time transformers wai warp
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "servant-client/servant-auth compatibility";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-client_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , hspec-discover, http-client, http-types, jose, QuickCheck
      , servant, servant-auth, servant-auth-server, servant-client
@@ -274490,7 +274629,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-client/servant-auth compatibility";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -274526,30 +274664,6 @@ self: {
      }) {};
 
   "servant-auth-docs" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec
-     , hspec-discover, lens, QuickCheck, servant, servant-auth
-     , servant-docs, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "servant-auth-docs";
-       version = "0.2.10.1";
-       sha256 = "03dnh6x0y34npmv9w2f3hc9r1brlzf2rki6c6ngvwb3dvichhykv";
-       revision = "3";
-       editedCabalFile = "12irngkv4irmjkmarnpyfknq9iwz9xigcgldmg6y9sscjjv7xh7r";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base lens servant servant-auth servant-docs
-       ];
-       testHaskellDepends = [
-         base doctest hspec lens QuickCheck servant servant-auth
-         servant-docs template-haskell text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "servant-docs/servant-auth compatibility";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-docs_0_2_11_0" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec
      , hspec-discover, lens, QuickCheck, servant, servant-auth
      , servant-docs, template-haskell, text
@@ -274569,7 +274683,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -274610,38 +274723,6 @@ self: {
      }) {};
 
   "servant-auth-server" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, case-insensitive, cookie, data-default-class, entropy
-     , hspec, hspec-discover, http-client, http-types, jose, lens
-     , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck
-     , servant, servant-auth, servant-server, tagged, text, time
-     , transformers, unordered-containers, wai, warp, wreq
-     }:
-     mkDerivation {
-       pname = "servant-auth-server";
-       version = "0.4.8.0";
-       sha256 = "0drny9m2js619pkxxa1mxji5x4r46kpv3qnmswyrb3kc0ck5c2af";
-       revision = "6";
-       editedCabalFile = "0rvb6jwjmkdrbc2q92si19arf5gi80x3m1g67354bncdaa81n81z";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         case-insensitive cookie data-default-class entropy http-types jose
-         lens memory monad-time mtl servant servant-auth servant-server
-         tagged text time unordered-containers wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson mtl QuickCheck servant servant-auth
-         servant-server text time transformers wai warp wreq
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "servant-server/servant-auth compatibility";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "servant-auth-server_0_4_9_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, case-insensitive, cookie, data-default-class, entropy
      , hspec, hspec-discover, http-client, http-types, jose, lens
@@ -274672,28 +274753,6 @@ self: {
      }) {};
 
   "servant-auth-swagger" = callPackage
-    ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
-     , servant, servant-auth, servant-swagger, swagger2, text
-     }:
-     mkDerivation {
-       pname = "servant-auth-swagger";
-       version = "0.2.10.2";
-       sha256 = "0f4sn0xlsq8lcnyj0q978bamfav6jmfkkccrg2k5l7rndif4nmwg";
-       revision = "3";
-       editedCabalFile = "0cvs7qwjdbr1f6n49pwjkq1cmkhya658207cmi8b70ghm5wvqfgi";
-       libraryHaskellDepends = [
-         base lens servant servant-auth servant-swagger swagger2 text
-       ];
-       testHaskellDepends = [
-         base hspec lens QuickCheck servant servant-auth servant-swagger
-         swagger2 text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "servant-swagger/servant-auth compatibility";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-swagger_0_2_11_0" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
      , servant, servant-auth, servant-swagger, swagger2, text
      }:
@@ -274711,7 +274770,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -275014,38 +275072,6 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , deepseq, entropy, exceptions, hspec, hspec-discover
-     , http-api-data, http-client, http-media, http-types, HUnit
-     , kan-extensions, markdown-unlit, monad-control, mtl, network
-     , QuickCheck, semigroupoids, servant, servant-client-core
-     , servant-server, sop-core, stm, text, time, transformers
-     , transformers-base, transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.20";
-       sha256 = "0xmjqc54yq5akhw5ydbx5k0c1pnrryma8nczwyzvwx4vazrk0pbn";
-       revision = "6";
-       editedCabalFile = "0a2ix2r0fwdjfpd74sbgksiadzp1x8l5dm66k0g51dvj0v64njcn";
-       libraryHaskellDepends = [
-         base base-compat bytestring containers deepseq exceptions
-         http-client http-media http-types kan-extensions monad-control mtl
-         semigroupoids servant servant-client-core stm text time
-         transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring entropy hspec http-api-data
-         http-client http-types HUnit kan-extensions markdown-unlit mtl
-         network QuickCheck servant servant-client-core servant-server
-         sop-core stm text transformers transformers-compat wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "Automatic derivation of querying functions for servant";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-client_0_20_2" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , deepseq, entropy, exceptions, hspec, hspec-discover
      , http-api-data, http-client, http-media, http-types, HUnit
@@ -275073,35 +275099,9 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-client-core" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
-     , bytestring, constraints, containers, deepseq, exceptions, free
-     , hspec, hspec-discover, http-media, http-types, network-uri
-     , QuickCheck, safe, servant, sop-core, template-haskell, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "servant-client-core";
-       version = "0.20";
-       sha256 = "012bdf3c44bqzb0ycns4pcxb0zidqqn7lpzz9316kiwy0wb4jx56";
-       revision = "4";
-       editedCabalFile = "10zypw7b7p3b3hb293ik44n45c9s875jnr919ramfx3bpiqchb5g";
-       libraryHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring constraints
-         containers deepseq exceptions free http-media http-types
-         network-uri safe servant sop-core template-haskell text
-         transformers
-       ];
-       testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
-       testToolDepends = [ hspec-discover ];
-       description = "Core functionality and class for client function generation for servant APIs";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-client-core_0_20_2" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, constraints, containers, deepseq, exceptions, free
      , hspec, hspec-discover, http-media, http-types, network-uri
@@ -275120,7 +275120,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-client-js" = callPackage
@@ -275193,28 +275192,6 @@ self: {
      }) {};
 
   "servant-conduit" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, conduit
-     , http-client, http-media, mtl, resourcet, servant, servant-client
-     , servant-server, unliftio-core, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-conduit";
-       version = "0.16";
-       sha256 = "037vqqq5k2jm6s7gg2shb6iyvjfblsr41ifjpryfxmsib669vs9f";
-       revision = "2";
-       editedCabalFile = "0vxil0jr3iv4a9bf1rvy7qpbmffic1ga8drm6yl6csd64n4a3jvn";
-       libraryHaskellDepends = [
-         base bytestring conduit mtl resourcet servant unliftio-core
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring conduit http-client http-media
-         resourcet servant servant-client servant-server wai warp
-       ];
-       description = "Servant Stream support for conduit";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-conduit_0_16_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, conduit
      , http-client, http-media, mtl, resourcet, servant, servant-client
      , servant-server, unliftio-core, wai, warp
@@ -275232,7 +275209,6 @@ self: {
        ];
        description = "Servant Stream support for conduit";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-csharp" = callPackage
@@ -275318,37 +275294,6 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , case-insensitive, hashable, http-media, http-types, lens, servant
-     , string-conversions, tasty, tasty-golden, tasty-hunit, text
-     , transformers, universe-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
-       version = "0.13";
-       sha256 = "0i91my86bcnn0jckf2qlfyx1zfbg8w6959v7iim60s3mdx9yjp67";
-       revision = "4";
-       editedCabalFile = "16m0glwz8x4k8cjp14jz9gq68q30wmz37qx39f3b4qrh3924hnsm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         hashable http-media http-types lens servant string-conversions text
-         universe-base unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base base-compat lens servant string-conversions tasty
-         tasty-golden tasty-hunit transformers
-       ];
-       description = "generate API docs for your servant webservice";
-       license = lib.licenses.bsd3;
-       mainProgram = "greet-docs";
-     }) {};
-
-  "servant-docs_0_13_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, hashable, http-media, http-types, lens, servant
      , string-conversions, tasty, tasty-golden, tasty-hunit, text
@@ -275374,7 +275319,6 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "greet-docs";
      }) {};
 
@@ -275498,19 +275442,15 @@ self: {
      }) {};
 
   "servant-event-stream" = callPackage
-    ({ mkDerivation, base, binary, http-media, lens, pipes
-     , servant-foreign, servant-js, servant-pipes, servant-server, text
-     , wai-extra
+    ({ mkDerivation, base, bytestring, http-media, lens
+     , servant-foreign, servant-server, text
      }:
      mkDerivation {
        pname = "servant-event-stream";
-       version = "0.2.1.0";
-       sha256 = "1bs4gjw7xaai5hxcv0dy7fmvx26ysmcqnaly5vriwkz45k1rhlj9";
-       revision = "2";
-       editedCabalFile = "1s6si9php8im45yh0r9slgw7sz8c0jk2i4c93a5qbjr0mzz9k2va";
+       version = "0.3.0.1";
+       sha256 = "1nd9v3dmpnqwj63psm6zikgcd635fc80a7bhn0azzlgi551s5kf2";
        libraryHaskellDepends = [
-         base binary http-media lens pipes servant-foreign servant-js
-         servant-pipes servant-server text wai-extra
+         base bytestring http-media lens servant-foreign servant-server text
        ];
        testHaskellDepends = [ base ];
        description = "Servant support for Server-Sent events";
@@ -275597,25 +275537,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, hspec-discover
-     , http-types, lens, servant, text
-     }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.16";
-       sha256 = "15pir0x7dcyjmw71g4w00qgvcxyvhbkywzc3bvvaaprk5bjb3bmv";
-       revision = "4";
-       editedCabalFile = "0nm2nkivil7yh66syvw1a41g1lif75h7wc07rh9bnl7ncqfvdnal";
-       libraryHaskellDepends = [
-         base base-compat http-types lens servant text
-       ];
-       testHaskellDepends = [ base hspec servant ];
-       testToolDepends = [ hspec-discover ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_16_1" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -275630,7 +275551,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-gdp" = callPackage
@@ -275801,42 +275721,6 @@ self: {
      }) {};
 
   "servant-http-streams" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring
-     , case-insensitive, containers, deepseq, entropy, exceptions, hspec
-     , hspec-discover, http-api-data, http-common, http-media
-     , http-streams, http-types, HUnit, io-streams, kan-extensions
-     , markdown-unlit, monad-control, mtl, network, QuickCheck
-     , semigroupoids, servant, servant-client-core, servant-server, stm
-     , text, time, transformers, transformers-base, transformers-compat
-     , wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-http-streams";
-       version = "0.20";
-       sha256 = "1pakvvw8m7dkwf8zfrh2gan1hs5zp4mgnn4bp0wiy49mc3zzlxwi";
-       revision = "6";
-       editedCabalFile = "0sq87z14wijr0dv0yclbz9k7g4plfjq8bqcn5wi7wq0h3ak7fzzg";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive containers deepseq
-         exceptions http-common http-media http-streams http-types
-         io-streams kan-extensions monad-control mtl semigroupoids servant
-         servant-client-core text time transformers transformers-base
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring deepseq entropy hspec
-         http-api-data http-streams http-types HUnit kan-extensions
-         markdown-unlit mtl network QuickCheck servant servant-client-core
-         servant-server stm text transformers transformers-compat wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "Automatic derivation of querying functions for servant";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "servant-http-streams_0_20_2" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, containers, deepseq, entropy, exceptions, hspec
      , hspec-discover, http-api-data, http-common, http-media
@@ -275964,10 +275848,8 @@ self: {
     ({ mkDerivation, aeson, base, http-media, servant, text }:
      mkDerivation {
        pname = "servant-jsonrpc";
-       version = "1.1.1";
-       sha256 = "0x5anjs6r7xgd2aqvs3fw4jr9yjz92a7pwa5ydpz63ijw2784j9z";
-       revision = "1";
-       editedCabalFile = "013m5rxs6cl75lhkj4p81jwsrmpywcd1cf7pkxq4kblg3in8bgy0";
+       version = "1.2.0";
+       sha256 = "1w92snxlypdf9qhm2bmbig864k67iz5avz98pw1yk9q2jggnd7ha";
        libraryHaskellDepends = [ aeson base http-media servant text ];
        description = "JSON-RPC messages and endpoints";
        license = lib.licenses.bsd3;
@@ -275981,10 +275863,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jsonrpc-client";
-       version = "1.1.0";
-       sha256 = "0d18qajwpq6np0a61i5qm1z7iwvqrmgixg627diwr1xh4ws1ij8d";
-       revision = "2";
-       editedCabalFile = "0khfc661yxsnv2vrxcqfj892r3w2ngx3n8mngmrywl0217wh2s87";
+       version = "1.2.0";
+       sha256 = "1vws0nga5hv5fzlipf1xdr2pj08jjpvpzjlr1q992gsr8q4xm7kn";
        libraryHaskellDepends = [
          aeson base servant servant-client-core servant-jsonrpc
        ];
@@ -275999,8 +275879,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jsonrpc-server";
-       version = "2.1.2";
-       sha256 = "0gbmpv1j4za01vwrygngbcs1pzjbfmc043yy57rq0yzvbcm1bmh7";
+       version = "2.2.0";
+       sha256 = "0ayga850zvkkl85lmmmlpxi4kpw1ny8irdb7ky5ssmrix8slkqx1";
        libraryHaskellDepends = [
          aeson base containers servant servant-jsonrpc servant-server
        ];
@@ -276073,26 +275953,6 @@ self: {
      }) {};
 
   "servant-machines" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, http-client
-     , http-media, machines, mtl, servant, servant-client
-     , servant-server, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-machines";
-       version = "0.16";
-       sha256 = "0c2cz96m9lbzr318i4vpy55y37xagh7sf1g0hvxbsvwhnzqa4532";
-       revision = "2";
-       editedCabalFile = "0nrrrh73bryg9xh025zdmk1kdmnm0kzrisbyhxrmqc514ayzkrr8";
-       libraryHaskellDepends = [ base bytestring machines mtl servant ];
-       testHaskellDepends = [
-         base base-compat bytestring http-client http-media machines servant
-         servant-client servant-server wai warp
-       ];
-       description = "Servant Stream support for machines";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-machines_0_16_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, http-client
      , http-media, machines, mtl, servant, servant-client
      , servant-server, wai, warp
@@ -276108,7 +275968,6 @@ self: {
        ];
        description = "Servant Stream support for machines";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-match" = callPackage
@@ -276436,29 +276295,6 @@ self: {
      }) {};
 
   "servant-pipes" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, http-client
-     , http-media, monad-control, mtl, pipes, pipes-bytestring
-     , pipes-safe, servant, servant-client, servant-server, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-pipes";
-       version = "0.16";
-       sha256 = "00n2rmv4aar49247is2sgy58nal64lv05zci9lhkbgmmmi1hqd10";
-       revision = "2";
-       editedCabalFile = "1xm1mi12qmwwxy3yqm6ys37q33f8hvq2sqyrvqw9rilkiqs2w8yr";
-       libraryHaskellDepends = [
-         base bytestring monad-control mtl pipes pipes-safe servant
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring http-client http-media pipes
-         pipes-bytestring pipes-safe servant servant-client servant-server
-         wai warp
-       ];
-       description = "Servant Stream support for pipes";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-pipes_0_16_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, http-client
      , http-media, monad-control, mtl, pipes, pipes-bytestring
      , pipes-safe, servant, servant-client, servant-server, wai, warp
@@ -276477,7 +276313,6 @@ self: {
        ];
        description = "Servant Stream support for pipes";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-polysemy" = callPackage
@@ -277011,46 +276846,6 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
-     , bytestring, constraints, containers, directory, exceptions
-     , filepath, hspec, hspec-discover, hspec-wai, http-api-data
-     , http-media, http-types, monad-control, mtl, network, network-uri
-     , QuickCheck, resourcet, safe, servant, should-not-typecheck
-     , sop-core, string-conversions, tagged, temporary, text
-     , transformers, transformers-base, transformers-compat, wai
-     , wai-app-static, wai-extra, warp, word8
-     }:
-     mkDerivation {
-       pname = "servant-server";
-       version = "0.20";
-       sha256 = "1gp8pslk2sspi5vzrl1nimndpif7jhgzlffi2mzf1ap1bdwgxchk";
-       revision = "6";
-       editedCabalFile = "1n70k1n65lyqx4lhbmg1gw5mfl584smlyaxzrllmp9flh50z64nf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat base64-bytestring bytestring constraints
-         containers exceptions filepath http-api-data http-media http-types
-         monad-control mtl network network-uri resourcet servant sop-core
-         string-conversions tagged text transformers transformers-base wai
-         wai-app-static word8
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat servant text wai warp
-       ];
-       testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring directory hspec
-         hspec-wai http-types mtl QuickCheck resourcet safe servant
-         should-not-typecheck sop-core string-conversions temporary text
-         transformers transformers-compat wai wai-extra
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A family of combinators for defining webservices APIs and serving them";
-       license = lib.licenses.bsd3;
-       mainProgram = "greet";
-     }) {};
-
-  "servant-server_0_20_2" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, constraints, containers, directory, exceptions
      , filepath, hspec, hspec-discover, hspec-wai, http-api-data
@@ -277082,7 +276877,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "greet";
      }) {};
 
@@ -277220,6 +277014,34 @@ self: {
        broken = true;
      }) {};
 
+  "servant-static-th_1_0_0_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , directory, filepath, hspec, hspec-wai, http-media, semigroups
+     , servant, servant-blaze, servant-server, tasty, tasty-hspec
+     , tasty-hunit, template-haskell, text, wai
+     }:
+     mkDerivation {
+       pname = "servant-static-th";
+       version = "1.0.0.1";
+       sha256 = "0pxzv2v5wlf906lxk778m3jvb2ax46x5z122x32a9a0n0s8pppik";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers directory filepath http-media
+         semigroups servant servant-blaze servant-server template-haskell
+         text
+       ];
+       testHaskellDepends = [
+         base blaze-html bytestring directory filepath hspec hspec-wai
+         servant servant-blaze servant-server tasty tasty-hspec tasty-hunit
+         wai
+       ];
+       description = "Embed a directory of static files in your Servant server";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "servant-streaming" = callPackage
     ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }:
      mkDerivation {
@@ -277361,36 +277183,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , Cabal, cabal-doctest, directory, doctest, filepath, hspec
-     , hspec-discover, http-media, insert-ordered-containers, lens
-     , lens-aeson, QuickCheck, servant, singleton-bool, swagger2
-     , template-haskell, text, time, unordered-containers, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.2";
-       sha256 = "1dim4vlsd9zcz3ra0qwvb4hlbj0iarxygz78ksw8nbvqgbym3zjh";
-       revision = "4";
-       editedCabalFile = "0qvd4p0g8djj67g7c4nh2y9z4x6k778y3037w2m4622412fvyyfv";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring hspec http-media
-         insert-ordered-containers lens QuickCheck servant singleton-bool
-         swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat directory doctest filepath hspec lens
-         lens-aeson QuickCheck servant swagger2 template-haskell text time
-         utf8-string vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , Cabal, cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -277416,7 +277208,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-swagger-tags" = callPackage
@@ -278047,8 +277838,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-persistent";
-       version = "2.0.2";
-       sha256 = "19jsswwc38514fqg2asshsvx1x3zx930887k63my4dmidyvvqmwd";
+       version = "2.0.3";
+       sha256 = "1f6zpxi16frs6jn1dx2kzk0cacw549pg2id2z6vqxkc5fw98iswq";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
@@ -278789,8 +278580,8 @@ self: {
      }:
      mkDerivation {
        pname = "sgf";
-       version = "0.1.3.2";
-       sha256 = "051w1sswj1k2br011q0g6zzvkvwxahkgfn4cpkkrdwz8xm1jb9al";
+       version = "0.1.3.3";
+       sha256 = "0wxmyv00gphyd7alq79g4vvdkdsmp204pcx300vqvgf6b6ydn1an";
        libraryHaskellDepends = [
          base containers encoding extensible-exceptions mtl parsec split
          time transformers
@@ -280946,8 +280737,8 @@ self: {
        pname = "sign";
        version = "0.4.4";
        sha256 = "1z9csfbl5h4cprvykszn81xncsry7fama2y3gbgnqr7mq15qziq7";
-       revision = "2";
-       editedCabalFile = "1si2x4ip4lqh9zj249f1rsslzxxj94arww63bqaha2zkg25sfykz";
+       revision = "3";
+       editedCabalFile = "1yrpjv01zhshi0ri3kn8sclvyry85raxgfggxqg9pab73vqwfz79";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -282854,6 +282645,21 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "singletons-default" = callPackage
+    ({ mkDerivation, base, data-default-class, singletons
+     , singletons-base
+     }:
+     mkDerivation {
+       pname = "singletons-default";
+       version = "0.1.0.7";
+       sha256 = "1rdz61hvv95l33rdv1afhrfjwdpznwik2d4q1z7wl6c8h6dl2wx1";
+       libraryHaskellDepends = [
+         base data-default-class singletons singletons-base
+       ];
+       description = "An optional type with type level default";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "singletons-presburger" = callPackage
     ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl
      , reflection, singletons, singletons-base
@@ -283189,10 +282995,8 @@ self: {
      }:
      mkDerivation {
        pname = "size-based";
-       version = "0.1.3.2";
-       sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42";
-       revision = "1";
-       editedCabalFile = "1h4ig2pqw5spg5mdgwd73q4banvk3kyk7q76pkhy8n0mnwpa51ck";
+       version = "0.1.3.3";
+       sha256 = "1xc31iy57v9hm97hhr26ws2wwsf56gczwnq7q8ckiy5pgw6fmr1g";
        libraryHaskellDepends = [
          base dictionary-sharing template-haskell testing-type-modifiers
        ];
@@ -283684,8 +283488,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.14.2";
-       sha256 = "1xbjmxpcqhnfjhma3bq539y3a3jnry75qrfw7d113gvrwsx39njl";
+       version = "0.14.3";
+       sha256 = "025b9qvah2qi2lff97m9hjnz8808c49sbzg3215s6524arhciv59";
        configureFlags = [ "-fexecutable" ];
        isLibrary = true;
        isExecutable = true;
@@ -283711,8 +283515,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.14.2";
-       sha256 = "0ja6pjkz49p9r6h0lajf2nfq55sbmda57n1v7jbw1xzh3fcdvqrn";
+       version = "0.14.3";
+       sha256 = "02y4vzakmdk24k3dysdh7wzrb597cmxzppxxlw3jd2lbyqw7yzlm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -285292,8 +285096,8 @@ self: {
      }:
      mkDerivation {
        pname = "smtpbz";
-       version = "1.0.1";
-       sha256 = "1zxcr4md1r9dlg14a3b6ywqnir6jx95qsffwv2f08k2mkifm82w3";
+       version = "1.1.0";
+       sha256 = "04fr5w139bvi3wdx7ynxkgmb5z34a7wpa4znrhh6vjq2hykxi4nk";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
@@ -289166,15 +288970,16 @@ self: {
      }) {};
 
   "spirv-reflect-ffi" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, spirv-reflect-types, text
-     , vector
+    ({ mkDerivation, base, bytestring, c2hs, spirv-enum
+     , spirv-reflect-types, text, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "spirv-reflect-ffi";
-       version = "0.2";
-       sha256 = "1pz2nlc4l6clmwwqmn95lfa50ii0524grfxs1c3ycbd8qi16n6q4";
+       version = "0.3";
+       sha256 = "1fh7xwqlc9diz3v4byz5iknndf5hm83mzb7awcn012ac55d3gz3x";
        libraryHaskellDepends = [
-         base bytestring spirv-reflect-types text vector
+         base bytestring spirv-enum spirv-reflect-types text vector
+         vector-algorithms
        ];
        libraryToolDepends = [ c2hs ];
        description = "C-library loader for spirv-reflect tool";
@@ -289182,26 +288987,26 @@ self: {
      }) {};
 
   "spirv-reflect-types" = callPackage
-    ({ mkDerivation, base, containers, text, vector }:
+    ({ mkDerivation, base, containers, spirv-enum, text, vector }:
      mkDerivation {
        pname = "spirv-reflect-types";
-       version = "0.2";
-       sha256 = "0j002p01kgk3avzvq7p391k7bll74fxg01mqlbk4mjyc7plvz87a";
-       libraryHaskellDepends = [ base containers text vector ];
+       version = "0.3";
+       sha256 = "0sg46268a52qkhql50rm3rkgikg8ygrxhxb4qhrx09xpqqngxhzz";
+       libraryHaskellDepends = [ base containers spirv-enum text vector ];
        description = "Data types from spirv-reflect tool";
        license = lib.licenses.bsd3;
      }) {};
 
   "spirv-reflect-yaml" = callPackage
-    ({ mkDerivation, base, bytestring, HsYAML, spirv-reflect-types
-     , text, vector
+    ({ mkDerivation, base, bytestring, HsYAML, spirv-enum
+     , spirv-reflect-types, text, vector
      }:
      mkDerivation {
        pname = "spirv-reflect-yaml";
-       version = "0.2";
-       sha256 = "0zgr0mfwxf485ka706y67h6vjp6d307fwirfff87gsh0lip7199b";
+       version = "0.3";
+       sha256 = "1bi1c6ykzs6pbls7r21ipx29dinn7m9lqn94lwf7j2c901nk53s1";
        libraryHaskellDepends = [
-         base bytestring HsYAML spirv-reflect-types text vector
+         base bytestring HsYAML spirv-enum spirv-reflect-types text vector
        ];
        description = "YAML loader for spirv-reflect tool";
        license = lib.licenses.bsd3;
@@ -290030,8 +289835,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite-easy";
-       version = "1.1.0.0";
-       sha256 = "12x89y3hsy51ydb8lnawws9cbqyj9x98mk3pwm5pc62pcwy947yi";
+       version = "1.1.0.1";
+       sha256 = "04f83krzb5a806dszhhnyhrxpvh6qr00579cq6h4bhz6bk54ivrz";
        libraryHaskellDepends = [
          base bytestring direct-sqlite migrant-core mtl resource-pool text
          unliftio-core
@@ -291719,13 +291524,13 @@ self: {
      , hspec-expectations-lifted, hspec-golden, http-types, lens
      , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck
      , resourcet, rio, semigroups, text, text-metrics, time
-     , transformers, typed-process, unliftio, unordered-containers, uuid
-     , yaml
+     , transformers, typed-process, unix, unliftio, unordered-containers
+     , uuid, yaml
      }:
      mkDerivation {
        pname = "stackctl";
-       version = "1.7.0.0";
-       sha256 = "1v0c2kzkwkd85hq4ffr4pm438lxa5ylg2amcxhz6y6fc8853ihcv";
+       version = "1.7.2.0";
+       sha256 = "1wpm5bklwxsy8kqk3r4srd50b66jbky0v4wyzqpyjkdh0qn080w8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -291735,7 +291540,7 @@ self: {
          containers envparse errors exceptions extra filepath Glob lens
          lens-aeson monad-logger mtl optparse-applicative QuickCheck
          resourcet rio semigroups text text-metrics time transformers
-         typed-process unliftio unordered-containers uuid yaml
+         typed-process unix unliftio unordered-containers uuid yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -294181,6 +293986,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring_0_3_3" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim
+     , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit
+     , tasty-smallcheck, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.3.3";
+       sha256 = "15v1r8fw2w9a6ivg3f83pqfs9q5ik27vjbk2wvpd8vlmw210idnv";
+       libraryHaskellDepends = [
+         base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet
+         streaming transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring resourcet smallcheck streaming tasty tasty-hunit
+         tasty-smallcheck transformers
+       ];
+       description = "Fast, effectful byte streams";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "streaming-cassava" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck
      , quickcheck-instances, streaming, streaming-bytestring, text
@@ -294514,19 +294341,20 @@ self: {
      }) {};
 
   "streaming-utils" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
-     , http-client-tls, json-stream, mtl, network, network-simple, pipes
-     , resourcet, streaming, streaming-bytestring, streaming-commons
-     , transformers, zlib
+    ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base
+     , bytestring, http-client, http-client-tls, json-stream, mtl
+     , network, network-simple, pipes, resourcet, streaming
+     , streaming-bytestring, streaming-commons, transformers, zlib
      }:
      mkDerivation {
        pname = "streaming-utils";
-       version = "0.2.5.0";
-       sha256 = "1zaq0vk4bzn27w56nxx56fij9cxk7pz5vf2xvglxkj6xip1w63fz";
+       version = "0.2.6.0";
+       sha256 = "0dpd58fpib9g6chfqkfj29v691gi7mq4czwapwhfjsmmd6rghb01";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring http-client http-client-tls
-         json-stream mtl network network-simple pipes resourcet streaming
-         streaming-bytestring streaming-commons transformers
+         aeson attoparsec attoparsec-aeson base bytestring http-client
+         http-client-tls json-stream mtl network network-simple pipes
+         resourcet streaming streaming-bytestring streaming-commons
+         transformers
        ];
        libraryPkgconfigDepends = [ zlib ];
        description = "http, attoparsec, pipes and other utilities for the streaming libraries";
@@ -294733,6 +294561,8 @@ self: {
        pname = "streamly-fsnotify";
        version = "2.1.0.2";
        sha256 = "1firr8rbdi39qpwj7d5p8bzavsr37cy9jwgd93yss708msx3n0cl";
+       revision = "1";
+       editedCabalFile = "0mk5f6i3lk6napip8rkkny97yn5y1acq44wzpsjfnnw1w4sv50f2";
        libraryHaskellDepends = [
          base exceptions filepath fsnotify semirings streamly streamly-core
          text time
@@ -295259,10 +295089,8 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "strict-mutable-base";
-       version = "1.0.0.0";
-       sha256 = "06d46902d79ryg7yy2zc973mgjdr3rc2i486xs6f8lhnrlwq9v3n";
-       revision = "1";
-       editedCabalFile = "1nqhm00lr9ashsjd38dwax2mn228kqjqshqx39plsjnf25kri5xq";
+       version = "1.1.0.0";
+       sha256 = "1zwh7v8v0vkxg7kv7zjpxp40iyfqwj6kix05f2k32faav0kx3qzz";
        libraryHaskellDepends = [ base deepseq ];
        description = "Strict variants of mutable data types from base";
        license = lib.licenses.bsd3;
@@ -295542,6 +295370,8 @@ self: {
        pname = "string-interpolate";
        version = "0.3.4.0";
        sha256 = "13hb3spabggr6gsn9xhwpwldjvpl2l7z4lgssis82c40n108b0w8";
+       revision = "1";
+       editedCabalFile = "164afgw0mxnyx5vjwshxphzkw1c4wqm93f3r89rwa5f3w93js7d2";
        libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta split
          template-haskell text text-conversions utf8-string
@@ -296193,8 +296023,8 @@ self: {
      }:
      mkDerivation {
        pname = "strongweak";
-       version = "0.8.0";
-       sha256 = "1nws2lkbjfr11jx5ns8qmmik63n158n4abdb1bgmkzkby8621f08";
+       version = "0.9.1";
+       sha256 = "0bq9vamnzidmcbapn6lc6vyz3lk2m0ld475z6a311xr5x0d70vad";
        libraryHaskellDepends = [
          base rerefined text text-builder-linear vector vector-sized
        ];
@@ -298654,21 +298484,21 @@ self: {
        license = "unknown";
      }) {};
 
-  "sydtest_0_17_0_0" = callPackage
+  "sydtest_0_18_0_0" = callPackage
     ({ mkDerivation, async, autodocodec, base, bytestring, containers
-     , dlist, fast-myers-diff, filepath, MonadRandom, mtl, opt-env-conf
-     , path, path-io, pretty-show, QuickCheck, quickcheck-io, random
-     , random-shuffle, safe, safe-coloured-text
+     , deepseq, dlist, fast-myers-diff, filepath, MonadRandom, mtl
+     , opt-env-conf, path, path-io, pretty-show, QuickCheck
+     , quickcheck-io, random, random-shuffle, safe, safe-coloured-text
      , safe-coloured-text-terminfo, stm, svg-builder, text, vector
      }:
      mkDerivation {
        pname = "sydtest";
-       version = "0.17.0.0";
-       sha256 = "1l8ji5qny7wq6n10ys1mxclqbzk54g3fsdi99pjb9sigd99s550n";
+       version = "0.18.0.0";
+       sha256 = "1krm952vqp79gw761d5f90jq30f6n9vih64ay73xacv5nzms5x5l";
        libraryHaskellDepends = [
-         async autodocodec base bytestring containers dlist fast-myers-diff
-         filepath MonadRandom mtl opt-env-conf path path-io pretty-show
-         QuickCheck quickcheck-io random random-shuffle safe
+         async autodocodec base bytestring containers deepseq dlist
+         fast-myers-diff filepath MonadRandom mtl opt-env-conf path path-io
+         pretty-show QuickCheck quickcheck-io random random-shuffle safe
          safe-coloured-text safe-coloured-text-terminfo stm svg-builder text
          vector
        ];
@@ -299016,8 +298846,8 @@ self: {
      }:
      mkDerivation {
        pname = "sydtest-wai";
-       version = "0.2.0.1";
-       sha256 = "0fmgn8g9ka275qkanzrlqr4wqwjcq2a99yvkh4jz53vspyiml78q";
+       version = "0.2.0.2";
+       sha256 = "03nm64vfpvb54m2ngsgwrprgw00ysxiwbb332yvk5w0rb1p4bfg1";
        libraryHaskellDepends = [
          base bytestring case-insensitive http-client http-types mtl network
          sydtest text time wai warp
@@ -302776,8 +302606,8 @@ self: {
     ({ mkDerivation, base, containers, filepath, hpc, tasty }:
      mkDerivation {
        pname = "tasty-coverage";
-       version = "0.1.3.0";
-       sha256 = "00yzx1qw4bcdpa55ldjk2f284z2i46xlp8l6a9jpwcxndwv48raa";
+       version = "0.1.4.0";
+       sha256 = "0jj7lx44vsvwhkvpxmsf2lc8i0yks6d9c28hqnhrmqp53vamqp23";
        libraryHaskellDepends = [ base containers filepath hpc tasty ];
        description = "Ingredient for tasty which generates per-test coverage reports";
        license = lib.licenses.bsd3;
@@ -302859,6 +302689,20 @@ self: {
        broken = true;
      }) {};
 
+  "tasty-flaky" = callPackage
+    ({ mkDerivation, base, retry, tagged, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "tasty-flaky";
+       version = "0.1.0.0";
+       sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87";
+       libraryHaskellDepends = [ base retry tagged tasty ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Handle flaky Tasty-based tests";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tasty-focus" = callPackage
     ({ mkDerivation, base, tagged, tasty, tasty-expected-failure
      , tasty-hunit
@@ -302990,25 +302834,6 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "tasty-hspec_1_1_6" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-hspec";
-       version = "1.1.6";
-       sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl";
-       revision = "1";
-       editedCabalFile = "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj";
-       libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck tasty tasty-quickcheck
-         tasty-smallcheck
-       ];
-       description = "Hspec support for the Tasty test framework";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "tasty-hspec" = callPackage
     ({ mkDerivation, base, hspec, hspec-api, hspec-core, QuickCheck
      , tasty, tasty-quickcheck, tasty-smallcheck
@@ -303528,6 +303353,31 @@ self: {
        license = lib.licenses.isc;
      }) {};
 
+  "tasty-sugar_2_2_2_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , hedgehog, kvitable, logict, microlens, mtl, optparse-applicative
+     , parallel, pretty-show, prettyprinter, raw-strings-qq, tasty
+     , tasty-hedgehog, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-sugar";
+       version = "2.2.2.0";
+       sha256 = "1ac9ciqlrq25ipqnjssk3288gnpsi6y9ia8s0f3d6dvcv73593rb";
+       libraryHaskellDepends = [
+         base containers directory filemanip filepath kvitable logict
+         microlens mtl optparse-applicative parallel prettyprinter tasty
+         text
+       ];
+       testHaskellDepends = [
+         base filepath hedgehog logict pretty-show prettyprinter
+         raw-strings-qq tasty tasty-hedgehog tasty-hunit text transformers
+       ];
+       doHaddock = false;
+       description = "Tests defined by Search Using Golden Answer References";
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -304748,14 +304598,14 @@ self: {
   "templatise" = callPackage
     ({ mkDerivation, base, bytestring, Cabal-syntax, directory
      , exceptions, extra, filepath, hspec, http-client, http-conduit
-     , MissingH, monad-logger, mtl, network-uri, optparse-applicative
-     , parsec, process, regex-tdfa, tasty, tasty-golden, tasty-hspec
-     , temporary, text, time
+     , monad-logger, mtl, network-uri, optparse-applicative, parsec
+     , process, regex-tdfa, tasty, tasty-golden, tasty-hspec, temporary
+     , text, time
      }:
      mkDerivation {
        pname = "templatise";
-       version = "0.1.6.0";
-       sha256 = "07dp87h0hn77ccg8acnfpki1yvxx4h1h6nqdjfxwc0kwji1svzia";
+       version = "0.1.7.0";
+       sha256 = "127gi12sisi3xpqp8wp0bl8vvxdbgdy3cw9mvcg7qqzmkhz914x2";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -304766,9 +304616,9 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative ];
        testHaskellDepends = [
-         base bytestring Cabal-syntax directory filepath hspec MissingH
-         monad-logger mtl network-uri optparse-applicative process tasty
-         tasty-golden tasty-hspec temporary text time
+         base bytestring Cabal-syntax directory filepath hspec monad-logger
+         mtl network-uri optparse-applicative process tasty tasty-golden
+         tasty-hspec temporary text time
        ];
        doHaddock = false;
        description = "You can use template.hs to create a new Haskell GitHub repository.";
@@ -305334,8 +305184,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle }:
      mkDerivation {
        pname = "tensort";
-       version = "1.0.1.2";
-       sha256 = "1hg647gjx24g38vnnkg61i9i42dinf27j3rr80wqm6wrkl7jzxvd";
+       version = "1.0.1.3";
+       sha256 = "0xl99n3d2v202j0jc8vydzjkyshnlym9fkzdgn2p9sfbqq652y29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl random random-shuffle ];
@@ -305780,8 +305630,8 @@ self: {
      }:
      mkDerivation {
        pname = "tesla";
-       version = "0.7.4.0";
-       sha256 = "0zzybsb711x2bxbj99j507b6x7jhmxlhl690w9zzxzyk87pahkjv";
+       version = "0.7.5.0";
+       sha256 = "0vrims4lx6kg9rfq9d1v35vlj51lgpv3a4gdd7i8dk99sqqa9dyw";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring casing containers
          cryptonite exceptions finite-typelits generic-deriving http-client
@@ -306589,15 +306439,15 @@ self: {
        license = lib.licenses.gpl2Only;
      }) {};
 
-  "texmath_0_12_8_9" = callPackage
+  "texmath_0_12_8_11" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty
      , tasty-golden, text, typst-symbols, xml
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.12.8.9";
-       sha256 = "0qm68ib9immfykf5p7jkk3l8h4ifss8ys7k8ppzaaygagc4s8zpw";
+       version = "0.12.8.11";
+       sha256 = "0yyxr5bdl1shsp3ir9d9a2hwah3cz6p3pvak27k4fvk1idisds7z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -306620,10 +306470,8 @@ self: {
      }:
      mkDerivation {
        pname = "texrunner";
-       version = "0.0.1.3";
-       sha256 = "0lck7b6gw217jabgz2sa3r32i7yxm35hx32jn0s86dbckc2xqili";
-       revision = "1";
-       editedCabalFile = "1z719yygpzr8lsdvyldq1dca7lffll4wlbv7mkm7phyks6zfdn1m";
+       version = "0.0.2";
+       sha256 = "1y6nixdinki8iq2nwwppx5kh24w0kap0x7n3kjhmvbrqjpy03pmv";
        libraryHaskellDepends = [
          attoparsec base bytestring directory filepath io-streams mtl
          process semigroups temporary
@@ -306801,8 +306649,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder-dev";
-       version = "0.3.4.4";
-       sha256 = "13n6dp385xhm7f533lr4nivhgwai2pdslz7b3ywq7m0dv249p6l9";
+       version = "0.3.5";
+       sha256 = "1mg503a73jl5bpjp7npqadq1lj0sfc1krpqw1s4zybfn70n49vah";
        libraryHaskellDepends = [
          base bytestring deferred-folds isomorphism-class QuickCheck
          quickcheck-instances split text time transformers
@@ -307249,6 +307097,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "text-metrics_0_3_3" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, hspec
+     , primitive, QuickCheck, text, vector, weigh
+     }:
+     mkDerivation {
+       pname = "text-metrics";
+       version = "0.3.3";
+       sha256 = "0gl5xxagdgs32m5xh58zlgwnysg0i19m31gg2lpm58x9d1bal81k";
+       libraryHaskellDepends = [ base containers primitive text vector ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
+       description = "Calculate various string metrics efficiently";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "text-normal" = callPackage
     ({ mkDerivation, base, deepseq, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
@@ -313841,12 +313705,12 @@ self: {
        mainProgram = "Benchmark";
      }) {};
 
-  "transformers_0_6_1_1" = callPackage
+  "transformers_0_6_1_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.6.1.1";
-       sha256 = "09fpjawkixgm3xpas89wkpkn1jfpxz035crnp97if2hh1y759ll1";
+       version = "0.6.1.2";
+       sha256 = "1db1gr4dkz1gi5q3fvqlv83qg5r5x89cmk8y9affa3n433xmrn1z";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = lib.licenses.bsd3;
@@ -314769,8 +314633,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, mtl }:
      mkDerivation {
        pname = "tree-traversals";
-       version = "0.1.2.0";
-       sha256 = "1l31l43dv7gkv35qfh7vf6v9ar864s4kilki2nwniipdfbyrmjwd";
+       version = "0.1.3.0";
+       sha256 = "0dbdqf7rrv3x4vsinxfhzf9bv28pndxsmjramw5m67ipqyw9hcxs";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
@@ -316914,6 +316778,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "twobitreader" = callPackage
+    ({ mkDerivation, base, bytestring, directory, mmap
+     , optparse-applicative, primitive, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "twobitreader";
+       version = "1.0";
+       sha256 = "1ri51q8jfmbkcpbd84mdnvgc168fcz56rkj9xzrd87g2sp1b7850";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring mmap primitive unordered-containers
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative zlib
+       ];
+       description = "reader for the 2bit file format";
+       license = lib.licenses.bsd3;
+       mainProgram = "twobit";
+     }) {};
+
   "tx" = callPackage
     ({ mkDerivation, base, bytestring, cereal, safecopy, stm
      , transformers
@@ -318108,27 +317993,6 @@ self: {
      }) {};
 
   "typed-process" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
-     , hspec-discover, process, stm, temporary, transformers
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "typed-process";
-       version = "0.2.11.1";
-       sha256 = "0j21v5ijnxkpwn9hng6achjypr1hnpfxkmjfvqssq6ynj6hdvifm";
-       libraryHaskellDepends = [
-         async base bytestring process stm transformers unliftio-core
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring bytestring hspec process stm temporary
-         transformers unliftio-core
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Run external processes, with strong typing of streams";
-       license = lib.licenses.mit;
-     }) {};
-
-  "typed-process_0_2_12_0" = callPackage
     ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
      , hspec-discover, process, stm, temporary, transformers
      , unliftio-core
@@ -318147,7 +318011,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Run external processes, with strong typing of streams";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "typed-process-effectful" = callPackage
@@ -318170,6 +318033,23 @@ self: {
        broken = true;
      }) {};
 
+  "typed-range" = callPackage
+    ({ mkDerivation, base, Cabal, free, optics-core, parsec, QuickCheck
+     , random, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "typed-range";
+       version = "0.1.0.1";
+       sha256 = "154khj9y9d8q11q3q3n6scfb9ilcnibmfz5vkwnqjq3sagnb2m3z";
+       libraryHaskellDepends = [ base free optics-core parsec ];
+       testHaskellDepends = [
+         base Cabal free optics-core parsec QuickCheck random test-framework
+         test-framework-quickcheck2
+       ];
+       description = "An efficient and versatile typed range library";
+       license = lib.licenses.mit;
+     }) {};
+
   "typed-session" = callPackage
     ({ mkDerivation, base, containers, fused-effects
      , fused-effects-random, io-classes, io-sim, random
@@ -318177,8 +318057,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-session";
-       version = "0.2.0.1";
-       sha256 = "1xi0ys8hhqa2jkdwm0a6r92lwcl4lqcnvi61yqci9vc41rpcazhj";
+       version = "0.3.0.1";
+       sha256 = "1qaas8lp1yyvj2rg8hgfj1hwbnk8z6mav008ajqv6zzmqbdnk8x6";
        libraryHaskellDepends = [
          base containers io-classes template-haskell
          typed-session-state-algorithm
@@ -318199,8 +318079,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-session-state-algorithm";
-       version = "0.4.2.1";
-       sha256 = "0gzzqg0jcnlbm0v4zmbjl379qzwmb93hg1ph8ibp55zxr98chk4z";
+       version = "0.5.0.0";
+       sha256 = "0mi40ab1xnz4al9f787ydwaz8y8qjq4i0x2sij08jv2i5l7dlr0x";
        libraryHaskellDepends = [
          base containers fused-effects megaparsec parser-combinators
          prettyprinter
@@ -318446,12 +318326,13 @@ self: {
      }) {};
 
   "typelits-printf" = callPackage
-    ({ mkDerivation, base, symbols, text }:
+    ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "typelits-printf";
-       version = "0.2.0.0";
-       sha256 = "1a2ahf8imbk8zff2i7cfag2irax8qdd4r6vb00hil34i67p980ij";
-       libraryHaskellDepends = [ base symbols text ];
+       version = "0.3.0.0";
+       sha256 = "1m02plqcqfd2bxfwdkdyc4dvimlga691jiqcswyd05lrs7p2dyid";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base hspec ];
        description = "Type-safe printf from parsing GHC TypeLits Symbol";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -318574,8 +318455,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.11.0.1";
-       sha256 = "15zyjckgyk30v2753pfrvnvqhfdrpv39mc7vbfv66igcg7r9scm1";
+       version = "0.11.1.1";
+       sha256 = "0zg4wwp5asnzz0n2yhrqb825dldr57m1j6w0l3sdxsi4jmibs4bj";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          template-haskell text th-data-compat th-strict-compat transformers
@@ -318788,7 +318669,7 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "typst_0_5_0_5" = callPackage
+  "typst_0_6" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, cassava
      , containers, directory, filepath, mtl, ordered-containers, parsec
      , pretty, pretty-show, regex-tdfa, scientific, tasty, tasty-golden
@@ -318796,8 +318677,8 @@ self: {
      }:
      mkDerivation {
        pname = "typst";
-       version = "0.5.0.5";
-       sha256 = "0515z5hi4w89h5dd7bl54zq28k5jzr4r3xnz4k6q2cnahx3b9pa9";
+       version = "0.6";
+       sha256 = "092pdx7qkrvxb0gz316aylgayzlkc3scw8dj5jkf4riq8gc3h7x1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -319422,6 +319303,8 @@ self: {
        ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "ukrainian-phonetics-basic-array-bytestring" = callPackage
@@ -319675,6 +319558,21 @@ self: {
        broken = true;
      }) {};
 
+  "unbound-generics-unify" = callPackage
+    ({ mkDerivation, base, containers, transformers, unbound-generics
+     }:
+     mkDerivation {
+       pname = "unbound-generics-unify";
+       version = "0.1.1";
+       sha256 = "1khf5n7c57d92mh5hqw2ahnwzs8bijw529aq768kd8kki0qhrxc9";
+       libraryHaskellDepends = [
+         base containers transformers unbound-generics
+       ];
+       description = "Unification based on unbound-generics";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "unbound-kind-generics" = callPackage
     ({ mkDerivation, base, kind-generics, kind-generics-th
      , unbound-generics
@@ -319838,8 +319736,8 @@ self: {
      }:
      mkDerivation {
        pname = "uncertain";
-       version = "0.4.0.0";
-       sha256 = "1v7q6ajyqx3m06w2iy6dxkbfk6f3878zmii892k4m5a0hzi82x0c";
+       version = "0.4.0.1";
+       sha256 = "16c7x256p4ymmj80yzd7wvgiapysxzpil81vbydwh1vcxijyxjw3";
        libraryHaskellDepends = [
          ad base base-compat containers free mwc-random primitive
          transformers
@@ -319850,6 +319748,30 @@ self: {
        broken = true;
      }) {};
 
+  "unclogging" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, chronos
+     , colourista, fused-effects, kan-extensions, tasty, tasty-hunit
+     , template-haskell, text, unliftio
+     }:
+     mkDerivation {
+       pname = "unclogging";
+       version = "0.1.0.2";
+       sha256 = "1w38pifsff5c2p22afnnw6c6n5qxivyvbdciy5z0d46q7nxqgysr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring chronos colourista fused-effects
+         kan-extensions template-haskell text unliftio
+       ];
+       executableHaskellDepends = [ aeson async base unliftio ];
+       testHaskellDepends = [
+         aeson base fused-effects tasty tasty-hunit unliftio
+       ];
+       description = "a library which implements easy, concurrent and pretty logging";
+       license = lib.licenses.agpl3Plus;
+       mainProgram = "unclogging";
+     }) {};
+
   "unconstrained" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -320714,8 +320636,8 @@ self: {
        pname = "union";
        version = "0.1.2";
        sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3";
-       revision = "8";
-       editedCabalFile = "0rm4nm47arflmbqngzq9ajri8f43wgplzrk9qfvjm6ag12vnjrl5";
+       revision = "9";
+       editedCabalFile = "11h6qk4gnnlprrgi9cnpcbklwqnjsvk97h9gbp7ka4ib78xgxr84";
        libraryHaskellDepends = [
          base deepseq hashable profunctors tagged vinyl
        ];
@@ -321600,19 +321522,6 @@ self: {
      }) {};
 
   "unix-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "unix-bytestring";
-       version = "0.4.0.1";
-       sha256 = "013if0qmbm491hjc4ha455whw3gwxwpws351cjhpalz8a6yh479j";
-       revision = "1";
-       editedCabalFile = "00qlidmxjap1y6m51m06m7xnmid3yrs8iki1rqmwp2pjx0lfwsxd";
-       libraryHaskellDepends = [ base bytestring ];
-       description = "Unix/Posix-specific functions for ByteStrings";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "unix-bytestring_0_4_0_2" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "unix-bytestring";
@@ -321621,7 +321530,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Unix/Posix-specific functions for ByteStrings";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix-compat" = callPackage
@@ -322047,6 +321955,8 @@ self: {
        pname = "unlit";
        version = "0.4.0.0";
        sha256 = "05am6mngvwj3a4mnwf1x3wbb2fvh3lj9jc5cvbmi269zhkjcv7j8";
+       revision = "2";
+       editedCabalFile = "0nqvrb9mjv77nx3gky576lf5ah1iwn1sjwwpy9a9za6pvz8dzjvv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory text ];
@@ -322578,9 +322488,7 @@ self: {
        description = "A program to update fetchgit values in Nix expressions";
        license = lib.licenses.bsd3;
        mainProgram = "update-nix-fetchgit";
-       maintainers = [
-         lib.maintainers.expipiplus1 lib.maintainers.sorki
-       ];
+       maintainers = [ lib.maintainers.sorki ];
      }) {};
 
   "update-repos" = callPackage
@@ -323699,8 +323607,8 @@ self: {
      }:
      mkDerivation {
        pname = "utxorpc";
-       version = "0.0.9.0";
-       sha256 = "1n86awygbq0gf9bl35hhsx0wxwnyk63ydxkz6i93dbbp22lfnmgc";
+       version = "0.0.10.0";
+       sha256 = "0y1v4a8shg05mphcly4n77qf8a3jp43girc9kf3302p8sjgx2zv2";
        libraryHaskellDepends = [
          base proto-lens proto-lens-protobuf-types proto-lens-runtime
        ];
@@ -324719,8 +324627,8 @@ self: {
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.5.0.4";
-       sha256 = "1qw5p60dr54d2wh49y6x33hbks4d74m8pr5zygblzk0y70warqld";
+       version = "0.5.0.5";
+       sha256 = "0bvvfvbi98p16n9xmyfvb9qypp3r3kwqdqrni6fd19cjmvyg9g2p";
        libraryHaskellDepends = [ base containers validity ];
        description = "Validity instances for containers";
        license = lib.licenses.mit;
@@ -326012,7 +325920,6 @@ self: {
        ];
        description = "Size tagged vectors";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "vector-sized_1_6_1" = callPackage
@@ -326032,7 +325939,6 @@ self: {
        description = "Size tagged vectors";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "vector-space" = callPackage
@@ -327305,8 +327211,6 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "vivid-osc" = callPackage
@@ -327663,44 +327567,6 @@ self: {
        broken = true;
      }) {inherit (pkgs) vte;};
 
-  "vty_5_35_1" = callPackage
-    ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
-     , bytestring, Cabal, containers, deepseq, directory, filepath
-     , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
-     , parallel, parsec, QuickCheck, quickcheck-assertions, random
-     , smallcheck, stm, string-qq, terminfo, test-framework
-     , test-framework-hunit, test-framework-smallcheck, text
-     , transformers, unix, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.35.1";
-       sha256 = "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k";
-       revision = "1";
-       editedCabalFile = "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base binary blaze-builder bytestring containers
-         deepseq directory filepath hashable microlens microlens-mtl
-         microlens-th mtl parallel parsec stm terminfo text transformers
-         unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       description = "A simple terminal UI library";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "vty" = callPackage
     ({ mkDerivation, base, binary, blaze-builder, bytestring, deepseq
      , directory, filepath, microlens, microlens-mtl, microlens-th, mtl
@@ -327889,7 +327755,6 @@ self: {
        badPlatforms = [
          "i686-linux" "armv7l-linux"
        ] ++ lib.platforms.darwin;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
@@ -327923,7 +327788,6 @@ self: {
        description = "Utils for the vulkan package";
        license = lib.licenses.bsd3;
        badPlatforms = lib.platforms.darwin;
-       maintainers = [ lib.maintainers.expipiplus1 ];
      }) {};
 
   "waargonaut" = callPackage
@@ -330344,7 +330208,7 @@ self: {
        maintainers = [ lib.maintainers.alexfmpe ];
      }) {};
 
-  "warp_3_4_1" = callPackage
+  "warp_3_4_2" = callPackage
     ({ mkDerivation, array, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, crypton-x509, directory
      , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client
@@ -330354,10 +330218,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.4.1";
-       sha256 = "0f4cs9qb3cpagryijzw46r5y5bd2srvb4b3phffydj5aim253jfp";
-       revision = "1";
-       editedCabalFile = "08jsdv1858cdmsraf489zmv4y0zpd47fr0qnwqd27acjnavpcwf7";
+       version = "3.4.2";
+       sha256 = "0b7f5darsa7n2bwlnj46xrgwbrb46yl62qyrcq84hvdpq2sfnxdl";
        libraryHaskellDepends = [
          array auto-update base bsb-http-chunked bytestring case-insensitive
          containers crypton-x509 ghc-prim hashable http-date http-types
@@ -330486,8 +330348,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.4.6";
-       sha256 = "0m5k2n7sdyb1g1r6ddwv2k75jgrhxwcgn3dbj42d1kjwvpiq03j8";
+       version = "3.4.7";
+       sha256 = "0lc8abjqs7j52qnfsaljjngxxzxja6d3bk4q796ahcikk10id1cf";
        libraryHaskellDepends = [
          base bytestring data-default-class network recv streaming-commons
          tls tls-session-manager unliftio wai warp
@@ -331277,8 +331139,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "1.0.0.0";
-       sha256 = "0bnamwvdxl3i1p8bflnhaxxpn0bqcnf174gwplqjkxdc9pzfhiig";
+       version = "1.0.1.0";
+       sha256 = "09l820lmgyvfpiqc57qx1kc355lxjalb4ijbk4dv0qi8px9pasvz";
        libraryHaskellDepends = [
          base web3-ethereum web3-polkadot web3-provider
        ];
@@ -331293,8 +331155,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3-bignum";
-       version = "1.0.0.0";
-       sha256 = "140qv8y6b63by81z0k5by8vqr7x0gc106a67r35qbhdfmbhv71n0";
+       version = "1.0.1.0";
+       sha256 = "1h0r9sw9i7p9k91rl461nx1hss8s1s8i9iwilmp2dy0k4f50rzps";
        libraryHaskellDepends = [
          base cereal memory memory-hexstring scale wide-word
        ];
@@ -331333,30 +331195,30 @@ self: {
      }) {};
 
   "web3-ethereum" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, exceptions
-     , generics-sop, hspec, hspec-contrib, hspec-discover
-     , hspec-expectations, jsonrpc-tinyclient, machines, memory
-     , memory-hexstring, microlens, microlens-aeson, mtl, OneTuple
-     , relapse, tagged, template-haskell, text, transformers, vinyl
-     , web3-crypto, web3-solidity
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring
+     , data-default, exceptions, generics-sop, hspec, hspec-contrib
+     , hspec-discover, hspec-expectations, jsonrpc-tinyclient, machines
+     , memory, memory-hexstring, microlens, microlens-aeson, mtl
+     , OneTuple, relapse, tagged, template-haskell, text, transformers
+     , vinyl, web3-crypto, web3-solidity
      }:
      mkDerivation {
        pname = "web3-ethereum";
-       version = "1.0.0.0";
-       sha256 = "1vsvxhl6w6hjiv6b61sn8f2bnj6p55b4qyvblrfpk60k7pqq774c";
+       version = "1.0.1.0";
+       sha256 = "1cd69g5wp7faq9hz1kvwp15y3v0wc3h5cpq0vbdbbaq8q7xg09yy";
        libraryHaskellDepends = [
-         aeson base bytestring data-default exceptions generics-sop
+         aeson aeson-casing base bytestring data-default exceptions
+         generics-sop jsonrpc-tinyclient machines memory memory-hexstring
+         microlens microlens-aeson mtl OneTuple relapse tagged
+         template-haskell text transformers vinyl web3-crypto web3-solidity
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring data-default exceptions
+         generics-sop hspec hspec-contrib hspec-discover hspec-expectations
          jsonrpc-tinyclient machines memory memory-hexstring microlens
          microlens-aeson mtl OneTuple relapse tagged template-haskell text
          transformers vinyl web3-crypto web3-solidity
        ];
-       testHaskellDepends = [
-         aeson base bytestring data-default exceptions generics-sop hspec
-         hspec-contrib hspec-discover hspec-expectations jsonrpc-tinyclient
-         machines memory memory-hexstring microlens microlens-aeson mtl
-         OneTuple relapse tagged template-haskell text transformers vinyl
-         web3-crypto web3-solidity
-       ];
        testToolDepends = [ hspec-discover ];
        description = "Ethereum support for Haskell Web3 library";
        license = lib.licenses.asl20;
@@ -331383,29 +331245,29 @@ self: {
      }) {};
 
   "web3-polkadot" = callPackage
-    ({ mkDerivation, aeson, animalcase, base, base58-bytestring
-     , bytestring, containers, cryptonite, generics-sop, hspec
-     , hspec-contrib, hspec-discover, hspec-expectations
-     , hspec-expectations-json, jsonrpc-tinyclient, memory
-     , memory-hexstring, microlens, microlens-mtl, microlens-th, mtl
-     , parsec, scale, text, web3-bignum, web3-crypto
+    ({ mkDerivation, aeson, base, base58-bytestring, bytestring, cases
+     , containers, crypton, generics-sop, hspec, hspec-contrib
+     , hspec-discover, hspec-expectations, hspec-expectations-json
+     , jsonrpc-tinyclient, memory, memory-hexstring, microlens
+     , microlens-mtl, microlens-th, mtl, parsec, scale, text
+     , web3-bignum, web3-crypto
      }:
      mkDerivation {
        pname = "web3-polkadot";
-       version = "1.0.0.0";
-       sha256 = "0sx9lj7px6m5ag4bk4imllh4bmy7kfgkfy1zb9hqjkdmjwn2i2w5";
+       version = "1.0.1.0";
+       sha256 = "13bqv3npvqd93dqk7bxaqqfrzrn0q2ndsnlsc4awx0x5vssw0hdj";
        libraryHaskellDepends = [
-         aeson animalcase base base58-bytestring bytestring containers
-         cryptonite generics-sop jsonrpc-tinyclient memory memory-hexstring
-         microlens microlens-mtl microlens-th mtl parsec scale text
-         web3-bignum web3-crypto
+         aeson base base58-bytestring bytestring cases containers crypton
+         generics-sop jsonrpc-tinyclient memory memory-hexstring microlens
+         microlens-mtl microlens-th mtl parsec scale text web3-bignum
+         web3-crypto
        ];
        testHaskellDepends = [
-         aeson animalcase base base58-bytestring bytestring containers
-         cryptonite generics-sop hspec hspec-contrib hspec-discover
-         hspec-expectations hspec-expectations-json jsonrpc-tinyclient
-         memory memory-hexstring microlens microlens-mtl microlens-th mtl
-         parsec scale text web3-bignum web3-crypto
+         aeson base base58-bytestring bytestring cases containers crypton
+         generics-sop hspec hspec-contrib hspec-discover hspec-expectations
+         hspec-expectations-json jsonrpc-tinyclient memory memory-hexstring
+         microlens microlens-mtl microlens-th mtl parsec scale text
+         web3-bignum web3-crypto
        ];
        testToolDepends = [ hspec-discover ];
        description = "Polkadot support for Haskell Web3 library";
@@ -331419,8 +331281,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3-provider";
-       version = "1.0.0.0";
-       sha256 = "03c892xj7yxwbb4r1vpqzwgsf4fyk9389rqivpr6bwklnx9230ic";
+       version = "1.0.1.0";
+       sha256 = "1nmqsdcxh4cgdw0bpfaf9d64cnlwgg7qms66dfd3givwfb5bsb0d";
        libraryHaskellDepends = [
          async base data-default exceptions http-client jsonrpc-tinyclient
          mtl network text transformers websockets
@@ -331438,8 +331300,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3-solidity";
-       version = "1.0.0.0";
-       sha256 = "1n5jf9vdxps8sxcaa3k2a4m3qn5w3kphvvn7f4jy0dh0zkr7i5nm";
+       version = "1.0.1.0";
+       sha256 = "1gy7w0cqxk2nzd5p1cncwv60ldm2g81ydyfmj0640h2h0v4d8r9k";
        libraryHaskellDepends = [
          aeson base basement bytestring cereal data-default generics-sop
          memory memory-hexstring microlens OneTuple parsec tagged
@@ -332060,7 +331922,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
-       description = "JavaScriptCore FFI from webkitgtk_4_0";
+       description = "JavaScriptCore FFI from webkitgtk";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
@@ -332075,7 +331937,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkitgtk_4_0 ];
-       description = "JavaScriptCore FFI from webkitgtk_4_0";
+       description = "JavaScriptCore FFI from webkitgtk";
        license = lib.licenses.bsd3;
        badPlatforms = lib.platforms.darwin;
      }) {inherit (pkgs) webkitgtk_4_0;};
@@ -332083,7 +331945,7 @@ self: {
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
      , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
-     , webkitgtk_4_0
+     , webkitgtk
      }:
      mkDerivation {
        pname = "webkitgtk3";
@@ -332094,27 +331956,27 @@ self: {
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+       libraryPkgconfigDepends = [ webkitgtk ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
        license = lib.licenses.lgpl21Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) webkitgtk_4_0;};
+     }) {webkitgtk = null;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
        version = "0.14.2.1";
        sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
-       description = "JavaScriptCore FFI from webkitgtk_4_0";
+       libraryPkgconfigDepends = [ webkitgtk ];
+       description = "JavaScriptCore FFI from webkitgtk";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk_4_0;};
+     }) {webkitgtk = null;};
 
   "webmention" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, either
@@ -332862,7 +332724,7 @@ self: {
        mainProgram = "quickstart";
      }) {};
 
-  "what4_1_6" = callPackage
+  "what4_1_6_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, bifunctors, bimap
      , BoundedChan, bv-sized, bytestring, concurrent-extra, config-value
      , containers, contravariant, deepseq, deriving-compat, directory
@@ -332878,8 +332740,8 @@ self: {
      }:
      mkDerivation {
        pname = "what4";
-       version = "1.6";
-       sha256 = "123p9h1fajwf5brv9qbs9kx7w7wwrl6md0arpjsj7klrz14qnn5j";
+       version = "1.6.2";
+       sha256 = "1qvlm4ib40f0y3gcxljx6vrsx8wcqsgnky2231a7y3wr121r2ffz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -332963,6 +332825,8 @@ self: {
        pname = "which";
        version = "0.2.0.2";
        sha256 = "08w398rm86slizy3fqb1rfd926zycajfnzx0sa1awrnbh2kjfx6m";
+       revision = "1";
+       editedCabalFile = "1nr7bjggjallp1kxaq2675mqa35w5h228agxkkmw8y4kssikp7wg";
        libraryHaskellDepends = [ base shelly template-haskell text ];
        description = "Determine the full path to an executable";
        license = lib.licenses.bsd3;
@@ -333215,8 +333079,8 @@ self: {
      }:
      mkDerivation {
        pname = "wikimusic-api-spec";
-       version = "1.2.0.0";
-       sha256 = "11jfj3z3b47hc3dfm7zfxxdgspzm0yisc0ihrplnjb9rrc0vva9b";
+       version = "1.2.1.2";
+       sha256 = "12b44xwav5m4vkm8lvsza7p50dg05x9d062xcgswp14p9myb4g6i";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath keys mtl openapi3 relude
          servant servant-openapi3 servant-rate-limit servant-server text
@@ -333302,8 +333166,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind";
-       version = "0.1.2.9";
-       sha256 = "1jnknyf3lwc0bk50llpqh3mpvn78h36f6h359z9sbwacxpsr8526";
+       version = "0.1.2.10";
+       sha256 = "1dav43i4cz0dag0qqm6cmisbkazp9jf0qaczsh3p5542rzla4bkg";
        libraryHaskellDepends = [
          base containers semigroups text transformers
        ];
@@ -333323,8 +333187,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-indicator";
-       version = "1.0.0.1";
-       sha256 = "0r9850zk2gmx492palbam6nl5ym9ml5lpgx0c1jyvpbn3caqgxas";
+       version = "1.0.0.2";
+       sha256 = "0bkwzn7b7j9npxzcdng53zmrlgzc6z072yr3prn6yq8pxrqr1wfz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async base containers gi-gdk gi-glib gi-gtk text transformers
@@ -333341,8 +333205,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-task-x11";
-       version = "0.2.0.3";
-       sha256 = "1agrwh4sgajyqs655p5ppz2vamp6xf5h5sckqb83zzjvn8i293dk";
+       version = "0.2.0.4";
+       sha256 = "0yv8w5sfcxjkhb4i5lnnpq89sd0dnbbq2jgcp5sazmvf465v7wls";
        libraryHaskellDepends = [
          base text transformers wild-bind wild-bind-indicator wild-bind-x11
        ];
@@ -333359,8 +333223,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.2.0.15";
-       sha256 = "14yxm16cqmmrx6sag8xjnwzwhcyqbmpx0vhslny2r0b5bmnjn2dn";
+       version = "0.2.0.16";
+       sha256 = "183rrdpqg0hkikwgckk415x1i98k8la19p2lgjzcihikj7xm6h26";
        libraryHaskellDepends = [
          base containers fold-debounce mtl semigroups stm text transformers
          wild-bind X11
@@ -333877,8 +333741,8 @@ self: {
        pname = "wizards";
        version = "1.0.3";
        sha256 = "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85";
-       revision = "2";
-       editedCabalFile = "0bnqz6slm3hr98ihhlkmivcd12bda6lf0j7l6dfdz30fl4xqpijl";
+       revision = "3";
+       editedCabalFile = "0ra3vbxiasm7277zyxpvqpij2nf4lgc1rsv91b00cpp3bs4rhxyb";
        libraryHaskellDepends = [
          base containers control-monad-free haskeline mtl transformers
        ];
@@ -336600,6 +336464,8 @@ self: {
        pname = "xls";
        version = "0.1.3";
        sha256 = "1qjkmcy41yj5izcj24jjwj1jvlg4cfg4g96zgc3jv4rfyr1n1892";
+       revision = "1";
+       editedCabalFile = "05xjv2l4i39fi4mhcr7w1wkl0a3lc7n40mnh3fq645hfik63nd62";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -342341,6 +342207,31 @@ self: {
        broken = true;
      }) {};
 
+  "yggdrasil-schema" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , directory, filepath, hspec, keys, mtl, neat-interpolation, optics
+     , optparse-applicative, QuickCheck, random, relude, sqlite-simple
+     , tasty, tasty-hspec, text, time, uuid
+     }:
+     mkDerivation {
+       pname = "yggdrasil-schema";
+       version = "1.0.0.5";
+       sha256 = "0d83cymxcx9n9fcaqybcfmv074zs0sgm7a99jzc1qp6kz2jqqjwy";
+       libraryHaskellDepends = [
+         aeson async base bytestring containers directory filepath keys mtl
+         neat-interpolation optics optparse-applicative random relude
+         sqlite-simple text time uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring containers directory filepath hspec
+         keys mtl neat-interpolation optics optparse-applicative QuickCheck
+         random relude sqlite-simple tasty tasty-hspec text time uuid
+       ];
+       license = lib.licenses.lgpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "yhccore" = callPackage
     ({ mkDerivation, base, containers, mtl, pretty, uniplate }:
      mkDerivation {
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
deleted file mode 100644
index 9cdd21a6b955..000000000000
--- a/pkgs/development/interpreters/chibi/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  version = "0.11";
-  pname = "chibi-scheme";
-
-  src = fetchFromGitHub {
-    owner = "ashinn";
-    repo = "chibi-scheme";
-    rev = version;
-    sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    make install PREFIX="$out"
-  '';
-
-  fixupPhase = ''
-    wrapProgram "$out/bin/chibi-scheme" \
-      --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \
-      ${lib.optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"}
-
-    for f in chibi-doc chibi-ffi snow-chibi; do
-      substituteInPlace "$out/bin/$f" \
-        --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
-    done
-  '';
-
-  meta = {
-    homepage = "https://github.com/ashinn/chibi-scheme";
-    description = "Small Footprint Scheme for use as a C Extension Language";
-    platforms = lib.platforms.all;
-    license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.DerGuteMoritz ];
-  };
-}
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
deleted file mode 100644
index ba597c6e7135..000000000000
--- a/pkgs/development/interpreters/groovy/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  unzip,
-  which,
-  makeWrapper,
-  installShellFiles,
-  jdk,
-  copyDesktopItems,
-  makeDesktopItem,
-}:
-
-# at runtime, need jdk
-
-stdenv.mkDerivation rec {
-  pname = "groovy";
-  version = "4.0.22";
-
-  src = fetchurl {
-    url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip";
-    sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc=";
-  };
-
-  nativeBuildInputs = [
-    makeWrapper
-    unzip
-    installShellFiles
-    copyDesktopItems
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "groovy";
-      desktopName = "Groovy Console";
-      exec = "groovyConsole";
-      icon = "groovy";
-      comment = meta.description;
-      terminal = false;
-      startupNotify = false;
-      categories = [ "Development" ];
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    rm bin/*.bat
-
-    mkdir -p $out
-    mkdir -p $out/share/doc/groovy
-
-    #Install icons
-    mkdir -p $out/share/icons
-    mv bin/groovy.ico $out/share/icons/
-
-    #Install Completion
-    for p in grape groovy{,doc,c,sh,Console}; do
-      installShellCompletion --cmd $p --bash bin/''${p}_completion
-    done
-    rm bin/*_completion
-
-    mv {bin,conf,grooid,lib} $out
-    mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy
-
-    sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy
-
-    for p in grape java2groovy groovy{,doc,c,sh,Console}; do
-      wrapProgram $out/bin/$p \
-        --set JAVA_HOME "${jdk}" \
-        --prefix PATH ":" "${jdk}/bin"
-    done
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Agile dynamic language for the Java Platform";
-    homepage = "http://groovy-lang.org/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
deleted file mode 100644
index 157ad76e6f8a..000000000000
--- a/pkgs/development/interpreters/jython/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre }:
-
-stdenv.mkDerivation rec {
-  pname = "jython";
-
-  version = "2.7.3";
-
-  src = fetchurl {
-    url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
-    sha256 = "sha256-2n89gpsUi8+oawWdyWTjqFVv7bAhCWyNsH4wxm+qubQ=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-     mkdir -pv $out/bin
-     cp $src $out/jython.jar
-     makeWrapper ${jre}/bin/java $out/bin/jython --add-flags "-jar $out/jython.jar"
-  '';
-
-  meta = {
-    description = "Python interpreter written in Java";
-    mainProgram = "jython";
-    homepage = "https://jython.org/";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.psfl;
-    platforms = jre.meta.platforms;
-  };
-}
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index 0f7b65df95ef..082fa879e2f7 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -169,6 +169,7 @@ stdenv.mkDerivation (finalAttrs:
       management with incremental garbage collection, making it ideal
       for configuration, scripting, and rapid prototyping.
     '';
+    mainProgram = "lua";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
deleted file mode 100644
index 667c797cd093..000000000000
--- a/pkgs/development/interpreters/maude/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
-, libsigsegv, gmpxx, cln, yices
-# passthru.tests
-, tamarin-prover
-}:
-
-let
-  version = "3.3.1";
-in
-
-stdenv.mkDerivation {
-  pname = "maude";
-  inherit version;
-
-  src = fetchurl {
-    url = "https://github.com/SRI-CSL/Maude/archive/refs/tags/Maude${version}.tar.gz";
-    sha256 = "ueM8qi3fLogWT8bA+ZyBnd9Zr9oOKuoiu2YpG6o5J1E=";
-  };
-
-  nativeBuildInputs = [ flex bison unzip makeWrapper ];
-  buildInputs = [
-    ncurses buddy tecla gmpxx libsigsegv cln yices
-  ];
-
-  hardeningDisable = [ "stackprotector" ] ++
-    lib.optionals stdenv.hostPlatform.isi686 [ "pic" "fortify" ];
-
-  # Fix for glibc-2.34, see
-  # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4
-  configureFlags = [ "--without-libsigsegv" ];
-
-  # Certain tests (in particular, Misc/fileTest) expect us to build in a subdirectory
-  # We'll use the directory Opt/ as suggested in INSTALL
-  preConfigure = ''
-    mkdir Opt; cd Opt
-    configureFlagsArray=(
-      --datadir="$out/share/maude"
-      TECLA_LIBS="-ltecla -lncursesw"
-      LIBS="-lcln"
-      CFLAGS="-O3" CXXFLAGS="-O3"
-    )
-  '';
-  configureScript = "../configure";
-
-  doCheck = true;
-
-  postInstall = ''
-    for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
-  '';
-
-  passthru.tests = {
-    # tamarin-prover only supports specific versions of maude explicitly
-    inherit tamarin-prover;
-  };
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://maude.cs.illinois.edu/";
-    description = "High-level specification language";
-    mainProgram = "maude";
-    license = lib.licenses.gpl2Plus;
-
-    longDescription = ''
-      Maude is a high-performance reflective language and system
-      supporting both equational and rewriting logic specification and
-      programming for a wide range of applications. Maude has been
-      influenced in important ways by the OBJ3 language, which can be
-      regarded as an equational logic sublanguage. Besides supporting
-      equational specification and programming, Maude also supports
-      rewriting logic computation.
-    '';
-
-    platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.peti ];
-  };
-}
diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix
deleted file mode 100644
index bde0104e6c1b..000000000000
--- a/pkgs/development/interpreters/nelua/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, luaPackages, unstableGitUpdater }:
-
-stdenv.mkDerivation rec {
-  pname = "nelua";
-  version = "0-unstable-2024-09-22";
-
-  src = fetchFromGitHub {
-    owner = "edubart";
-    repo = "nelua-lang";
-    rev = "ff7a42c275239933f6e615b2ad2e6a8d507afe7b";
-    hash = "sha256-SQg7Z9Ag+UwIhrjgobAEiVEGu/GgFZKw3lquu4/4rHI=";
-  };
-
-  postPatch = ''
-    substituteInPlace lualib/nelua/version.lua \
-      --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \
-      --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'"
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  nativeCheckInputs = [ luaPackages.luacheck ];
-
-  doCheck = true;
-
-  passthru.updateScript = unstableGitUpdater {
-    # no releases, only stale "latest" tag
-    hardcodeZeroVersion = true;
-  };
-
-  meta = with lib; {
-    description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code";
-    homepage = "https://nelua.io/";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch
new file mode 100644
index 000000000000..9f9e1e96f619
--- /dev/null
+++ b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch
@@ -0,0 +1,57 @@
+From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001
+From: Andrei Horodniceanu 
+Date: Wed, 4 Sep 2024 12:46:44 +0300
+Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale
+
+Signed-off-by: Andrei Horodniceanu 
+---
+ AUTHORS  |  1 +
+ locale.c | 16 ++++++++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/AUTHORS b/AUTHORS
+index b2e0bf2043a9..b196b93bda13 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -103,6 +103,7 @@ Andreas König                  
+ Andreas Marienborg             
+ Andreas Schwab                 
+ Andreas Voegele                
++Andrei Horodniceanu            
+ Andrei Yelistratov             
+ Andrej Borsenkow               
+ Andrew Bettison                
+diff --git a/locale.c b/locale.c
+index 168b94914318..d764b4b3c11e 100644
+--- a/locale.c
++++ b/locale.c
+@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+      * categories into our internal indices. */
+     if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) {
+ 
++#    ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT
+         /* Use this array, initialized by a config.h constant */
+         int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT;
+         STATIC_ASSERT_STMT(   C_ARRAY_LENGTH(lc_all_category_positions)
+@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+             map_LC_ALL_position_to_index[i] =
+                               get_category_index(lc_all_category_positions[i]);
+         }
++#    else
++        /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and
++         * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on
++         * systems with only a C locale during ./Configure.  Assume that this
++         * can only happen as part of some sort of bootstrapping so allow
++         * compilation to succeed by ignoring correctness.
++         */
++        for (unsigned int i = 0;
++             i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index);
++             i++)
++        {
++            map_LC_ALL_position_to_index[i] = 0;
++        }
++#    endif
++
+     }
+ 
+     LOCALE_UNLOCK;
diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index b10ba2b1f283..d23eb7355d6a 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -67,6 +67,9 @@ stdenv.mkDerivation (rec {
     ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch
     ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch
 
+    # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569
+    ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch
+
     ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
     ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index cc7d87038a7d..43dbc2ce033d 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.3.12";
-    hash = "sha256-gHYzSWzNs3CokFRY24K9ZzZumKbVlyiRS3l7h+nK7L8=";
+    version = "8.3.13";
+    hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 3c1f17048c37..e5abb6760978 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,10 +4,10 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.0beta3";
+      version = "8.4.0RC4";
       phpSrc = fetchurl {
-        url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz";
-        hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw=";
+        url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz";
+        hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA=";
       };
     }
   );
diff --git a/pkgs/development/interpreters/php/fix-paths-php84.patch b/pkgs/development/interpreters/php/fix-paths-php84.patch
index 294d13569af7..12a392bc973c 100644
--- a/pkgs/development/interpreters/php/fix-paths-php84.patch
+++ b/pkgs/development/interpreters/php/fix-paths-php84.patch
@@ -13,15 +13,16 @@ index e46acf0928..ee8e5a88f8 100644
  
    AS_VAR_IF([GETTEXT_DIR],,
      [AC_MSG_ERROR([Cannot locate header file libintl.h])])
-diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
---- a/sapi/apache2handler/config.m4	2018-11-07 15:35:23.000000000 +0000
-+++ b/sapi/apache2handler/config.m4	2018-11-27 00:32:28.000000000 +0000
-@@ -66,7 +66,7 @@
-     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
-   fi
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index e335721f19..a5087e1320 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
+   AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],
+     [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
  
--  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
 +  APXS_LIBEXECDIR="$prefix/modules"
-   if test -z `$APXS -q SYSCONFDIR`; then
+   if test -z $($APXS -q SYSCONFDIR); then
      INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 4d8e03695de3..0d2ebd009731 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -11,7 +11,7 @@
 , tcl ? null, tk ? null, tclPackages, libX11 ? null, x11Support ? false
 , zlib
 , self
-, configd, coreutils
+, coreutils
 , autoreconfHook
 , python-setup-hook
 # Some proprietary libs assume UCS2 unicode, especially on darwin :(
@@ -239,8 +239,7 @@ let
   buildInputs =
     lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ]
-    ++ lib.optionals x11Support [ tcl tk libX11 ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && configd != null) configd;
+    ++ lib.optionals x11Support [ tcl tk libX11 ];
   nativeBuildInputs =
     [ autoreconfHook ]
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 32f27a242125..f9da42de0b1c 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -25,7 +25,7 @@
 
 # platform-specific dependencies
 , bash
-, configd
+, apple-sdk_11
 , darwin
 , windows
 
@@ -178,11 +178,12 @@ let
     bluez
   ] ++ optionals enableFramework [
     darwin.apple_sdk.frameworks.Cocoa
+  ] ++ optionals stdenv.hostPlatform.isDarwin [
+    # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default.
+    apple-sdk_11
   ] ++ optionals stdenv.hostPlatform.isMinGW [
     windows.dlfcn
     windows.mingw_w64_pthreads
-  ] ++ optionals stdenv.hostPlatform.isDarwin [
-    configd
   ] ++ optionals tzdataSupport [
     tzdata
   ] ++ optionals withGdbm [
@@ -362,9 +363,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     (enableFeature enableGIL "gil")
   ] ++ optionals enableOptimizations [
     "--enable-optimizations"
-  ] ++ optionals (stdenv.hostPlatform.isDarwin && configd == null) [
-    # Make conditional on Darwin for now to avoid causing Linux rebuilds.
-    "py_cv_module__scproxy=n/a"
   ] ++ optionals (sqlite != null) [
     "--enable-loadable-sqlite-extensions"
   ] ++ optionals (libxcrypt != null) [
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index b936ea1e222a..5fd049a9e964 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
       sourceVersion = {
         major = "3";
         minor = "12";
-        patch = "6";
+        patch = "7";
         suffix = "";
       };
-      hash = "sha256-GZllgpjPL7g33/7Y/zwDPvDJjvIM9zxdX2a+1auJaXw=";
+      hash = "sha256-JIh7kuKv1KKsYCQZrUtZY3L2esmwdxkPRZq6OQ+vVVA=";
     };
   };
 
@@ -38,7 +38,6 @@ in {
       suffix = ".8"; # ActiveState's Python 2 extended support
     };
     hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI=";
-    inherit (darwin) configd;
     inherit passthruFun;
   };
 
@@ -51,7 +50,6 @@ in {
       suffix = "";
     };
     hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww=";
-    inherit (darwin) configd;
     inherit passthruFun;
   };
 
@@ -64,7 +62,6 @@ in {
       suffix = "";
     };
     hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk=";
-    inherit (darwin) configd;
     inherit passthruFun;
   };
 
@@ -77,13 +74,11 @@ in {
       suffix = "";
     };
     hash = "sha256-B6Q1bpEpAOYaFcsJSaBsSgUBLiE+zWtOhND2equ+43I=";
-    inherit (darwin) configd;
     inherit passthruFun;
   };
 
   python312 = callPackage ./cpython ({
     self = __splicedPackages.python312;
-    inherit (darwin) configd;
     inherit passthruFun;
   } // sources.python312);
 
@@ -96,7 +91,6 @@ in {
       suffix = "";
     };
     hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0=";
-    inherit (darwin) configd;
     inherit passthruFun;
   };
   # Minimal versions of Python (built without optional dependencies)
@@ -109,7 +103,6 @@ in {
     readline = null;
     ncurses = null;
     gdbm = null;
-    configd = null;
     sqlite = null;
     tzdata = null;
     libffi = libffiBoot; # without test suite
@@ -142,8 +135,6 @@ in {
     db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
     python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
     inherit passthruFun;
-    inherit (darwin) libunwind;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   pypy39 = callPackage ./pypy {
@@ -159,8 +150,6 @@ in {
     db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
     python = __splicedPackages.pypy27;
     inherit passthruFun;
-    inherit (darwin) libunwind;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   pypy310 = __splicedPackages.pypy39.override {
diff --git a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh
index af9ed60a038d..437ca46ff97c 100644
--- a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh
@@ -1,7 +1,7 @@
 # Setup hook to use in case a conda binary package is installed
 echo "Sourcing conda install hook"
 
-condaInstallPhase(){
+condaInstallPhase() {
     echo "Executing condaInstallPhase"
     runHook preInstall
 
@@ -10,11 +10,11 @@ condaInstallPhase(){
     # or multiple top level directories.
     siteDir=@pythonSitePackages@
     if [ -e ./site-packages ]; then
-      mkdir -p $out/$siteDir
-      cp -r ./site-packages/* $out/$siteDir
+        mkdir -p $out/$siteDir
+        cp -r ./site-packages/* $out/$siteDir
     else
-      cp -r . $out
-      rm $out/env-vars
+        cp -r . $out
+        rm $out/env-vars
     fi
 
     runHook postInstall
diff --git a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh
index 6204c13b7221..b9d13fe1ee10 100644
--- a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh
@@ -1,7 +1,7 @@
 # Setup hook to use in case a conda binary package is fetched
 echo "Sourcing conda unpack hook"
 
-condaUnpackPhase(){
+condaUnpackPhase() {
     echo "Executing condaUnpackPhase"
     runHook preUnpack
 
diff --git a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
index c8ed3dee83ba..25d099bfc5ef 100644
--- a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
@@ -1,13 +1,13 @@
 # Setup hook to use in case an egg is fetched
 echo "Sourcing egg setup hook"
 
-eggUnpackPhase(){
+eggUnpackPhase() {
     echo "Executing eggUnpackPhase"
     runHook preUnpack
 
     cp "$src" "$(stripHash "$src")"
 
-#     runHook postUnpack # Calls find...?
+    # runHook postUnpack # Calls find...?
     echo "Finished executing eggUnpackPhase"
 }
 
diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
index 9de4c7d1dd0d..3d70de729f2d 100644
--- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
@@ -10,13 +10,13 @@ pipBuildPhase() {
     mkdir -p dist
     echo "Creating a wheel..."
     @pythonInterpreter@ -m pip wheel \
-       --verbose \
-       --no-index \
-       --no-deps \
-       --no-clean \
-       --no-build-isolation \
-       --wheel-dir dist \
-       $pipBuildFlags .
+        --verbose \
+        --no-index \
+        --no-deps \
+        --no-clean \
+        --no-build-isolation \
+        --wheel-dir dist \
+        $pipBuildFlags .
     echo "Finished creating a wheel..."
 
     runHook postBuild
@@ -29,12 +29,12 @@ pipShellHook() {
 
     # Long-term setup.py should be dropped.
     if [ -e pyproject.toml ]; then
-      tmp_path=$(mktemp -d)
-      export PATH="$tmp_path/bin:$PATH"
-      export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
-      mkdir -p "$tmp_path/@pythonSitePackages@"
-      @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \
-         --no-build-isolation >&2
+        tmp_path=$(mktemp -d)
+        export PATH="$tmp_path/bin:$PATH"
+        export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
+        mkdir -p "$tmp_path/@pythonSitePackages@"
+        @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \
+            --no-build-isolation >&2
     fi
 
     runHook postShellHook
diff --git a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh
index 2d925742daa7..f6d60be35d21 100644
--- a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh
@@ -5,14 +5,14 @@ pypaInstallPhase() {
     echo "Executing pypaInstallPhase"
     runHook preInstall
 
-    pushd dist > /dev/null
+    pushd dist >/dev/null
 
     for wheel in *.whl; do
         @pythonInterpreter@ -m installer --prefix "$out" "$wheel"
         echo "Successfully installed $wheel"
     done
 
-    popd > /dev/null
+    popd >/dev/null
 
     export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
 
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index a9e82674c5f8..fd61fd14043d 100644
--- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -18,11 +18,11 @@ function _concatSep {
     echo "$result"
 }
 
-function _pytestComputeDisabledTestsString () {
+function _pytestComputeDisabledTestsString() {
     declare -a tests
     local tests=($1)
     local prefix="not "
-    prefixed=( "${tests[@]/#/$prefix}" )
+    prefixed=("${tests[@]/#/$prefix}")
     result=$(_concatSep "and" prefixed)
     echo "$result"
 }
@@ -35,7 +35,7 @@ function pytestCheckPhase() {
     args=" -m pytest"
     if [ -n "$disabledTests" ]; then
         disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}")
-      args+=" -k \""$disabledTestsString"\""
+        args+=" -k \""$disabledTestsString"\""
     fi
 
     if [ -n "${disabledTestPaths-}" ]; then
@@ -43,11 +43,11 @@ function pytestCheckPhase() {
     fi
 
     for path in ${disabledTestPaths[@]}; do
-      if [ ! -e "$path" ]; then
-        echo "Disabled tests path \"$path\" does not exist. Aborting"
-        exit 1
-      fi
-      args+=" --ignore=\"$path\""
+        if [ ! -e "$path" ]; then
+            echo "Disabled tests path \"$path\" does not exist. Aborting"
+            exit 1
+        fi
+        args+=" --ignore=\"$path\""
     done
     args+=" ${pytestFlagsArray[@]}"
     eval "@pythonCheckInterpreter@ $args"
diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
index f4ef271ac1b2..591060aca6d0 100644
--- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
@@ -1,7 +1,7 @@
 # Setup hook for checking whether Python imports succeed
 echo "Sourcing python-imports-check-hook.sh"
 
-pythonImportsCheckPhase () {
+pythonImportsCheckPhase() {
     echo "Executing pythonImportsCheckPhase"
 
     if [ -n "$pythonImportsCheck" ]; then
@@ -12,7 +12,7 @@ pythonImportsCheckPhase () {
             pythonImportsCheckOutput=$python
         fi
         export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH"
-        ( cd $pythonImportsCheckOutput && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" )
+        (cd $pythonImportsCheckOutput && @pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))')
     fi
 }
 
diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
index 37479d9d4111..5c5b840e05c3 100644
--- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
@@ -8,7 +8,7 @@ pythonNamespacesHook() {
         echo "Enforcing PEP420 namespace: ${namespace}"
 
         # split namespace into segments. "azure.mgmt" -> "azure mgmt"
-        IFS='.' read -ra pathSegments <<< $namespace
+        IFS='.' read -ra pathSegments <<<$namespace
         constructedPath=$out/@pythonSitePackages@
 
         # Need to remove the __init__.py at each namespace level
@@ -49,4 +49,3 @@ pythonNamespacesHook() {
 if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then
     postFixupHooks+=(pythonNamespacesHook)
 fi
-
diff --git a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh
index 7ac8c2d5cc72..b64a44b650b3 100644
--- a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh
@@ -6,7 +6,7 @@ echo "Sourcing python-recompile-bytecode-hook.sh"
 # Note this effectively duplicates `python-remove-bin-bytecode`, but long-term
 # this hook should be removed again.
 
-pythonRecompileBytecodePhase () {
+pythonRecompileBytecodePhase() {
     # TODO: consider other outputs than $out
 
     items="$(find "$out" -name "@bytecodeName@")"
diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
index 7fd1b52a04bf..7da5c0b0ac27 100644
--- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
@@ -89,7 +89,7 @@ pythonRelaxDepsHook() {
         _pythonRelaxDeps $metadata_file
         _pythonRemoveDeps $metadata_file
 
-        if (( "${NIX_DEBUG:-0}" >= 1 )); then
+        if (("${NIX_DEBUG:-0}" >= 1)); then
             echo "pythonRelaxDepsHook: resulting METADATA for '$wheel':"
             cat $metadata_file
         fi
diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
index d67c0c557353..7e49251306e8 100644
--- a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
@@ -5,10 +5,10 @@ echo "Sourcing python-remove-bin-bytecode-hook.sh"
 # It may happen there are executables with a .py extension for which
 # bytecode is generated. This hook removes that bytecode.
 
-pythonRemoveBinBytecodePhase () {
+pythonRemoveBinBytecodePhase() {
     if [ -d "$out/bin" ]; then
-      rm -rf "$out/bin/__pycache__"                 # Python 3
-      find "$out/bin" -type f -name "*.pyc" -delete # Python 2
+        rm -rf "$out/bin/__pycache__"                 # Python 3
+        find "$out/bin" -type f -name "*.pyc" -delete # Python 2
     fi
 }
 
diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh
index 0f32a6ec0e82..6825b5f4db04 100644
--- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh
@@ -9,15 +9,15 @@ buildSphinxPhase() {
     local __sphinxRoot=""
     runHook preBuildSphinx
 
-    if [[ -n "${sphinxRoot:-}" ]] ; then  # explicit root
-        if ! [[ -f "${sphinxRoot}/conf.py" ]] ; then
+    if [[ -n "${sphinxRoot:-}" ]]; then # explicit root
+        if ! [[ -f "${sphinxRoot}/conf.py" ]]; then
             echo 2>&1 "$sphinxRoot/conf.py: no such file"
             exit 1
         fi
         __sphinxRoot=$sphinxRoot
     else
-        for candidate in doc docs doc/source docs/source ; do
-            if [[ -f "$candidate/conf.py" ]] ; then
+        for candidate in doc docs doc/source docs/source; do
+            if [[ -f "$candidate/conf.py" ]]; then
                 echo "Sphinx documentation found in $candidate"
                 __sphinxRoot=$candidate
                 break
@@ -25,7 +25,7 @@ buildSphinxPhase() {
         done
     fi
 
-    if [[ -z "${__sphinxRoot}" ]] ; then
+    if [[ -z "${__sphinxRoot}" ]]; then
         echo 2>&1 "Sphinx documentation not found, use 'sphinxRoot' variable"
         exit 1
     fi
diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
index 1fcc0bbd4b13..958bfe98ee69 100644
--- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
@@ -3,14 +3,14 @@ venvShellHook() {
     runHook preShellHook
 
     if [ -d "${venvDir}" ]; then
-      echo "Skipping venv creation, '${venvDir}' already exists"
-      source "${venvDir}/bin/activate"
+        echo "Skipping venv creation, '${venvDir}' already exists"
+        source "${venvDir}/bin/activate"
     else
-      echo "Creating new venv environment in path: '${venvDir}'"
-      @pythonInterpreter@ -m venv "${venvDir}"
+        echo "Creating new venv environment in path: '${venvDir}'"
+        @pythonInterpreter@ -m venv "${venvDir}"
 
-      source "${venvDir}/bin/activate"
-      runHook postVenvCreation
+        source "${venvDir}/bin/activate"
+        runHook postVenvCreation
     fi
 
     runHook postShellHook
diff --git a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
index fca808a933ba..d15ec0412c25 100644
--- a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
@@ -1,14 +1,14 @@
 # Setup hook to use in case a wheel is fetched
 echo "Sourcing wheel setup hook"
 
-wheelUnpackPhase(){
+wheelUnpackPhase() {
     echo "Executing wheelUnpackPhase"
     runHook preUnpack
 
     mkdir -p dist
     cp "$src" "dist/$(stripHash "$src")"
 
-#     runHook postUnpack # Calls find...?
+    # runHook postUnpack # Calls find...?
     echo "Finished executing wheelUnpackPhase"
 }
 
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 4e8199af56b3..b850c79be87a 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, substituteAll, fetchurl
 , zlibSupport ? true, zlib
-, bzip2, pkg-config, libffi, libunwind, Security
+, bzip2, pkg-config, libffi, darwin
 , sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11
 , gdbm, db, xz, python-setup-hook
 , optimizationLevel ? "jit", boehmgc
@@ -64,7 +64,7 @@ in with passthru; stdenv.mkDerivation rec {
   ] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [
     boehmgc
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libunwind Security
+   darwin.libutil
   ];
 
   # Remove bootstrap python from closure
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index ea270b3a7051..383a175ef3cd 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -307,8 +307,8 @@ in {
   };
 
   ruby_3_2 = generic {
-    version = rubyVersion "3" "2" "4" "";
-    hash = "sha256-xys8XDBILcoYsPhoyQdfP0fYFo6vYm1OaCzltZyFhpI=";
+    version = rubyVersion "3" "2" "5" "";
+    hash = "sha256-7wYQtJj2D7XP13tRrbPBD0yo7ZoXy4fGHlvqMUrDShY=";
     cargoHash = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";
   };
 
diff --git a/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch b/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch
deleted file mode 100644
index 91f221e19680..000000000000
--- a/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 9fbfdb59fb07..68e404be0ea8 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -7,18 +7,17 @@
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
-  version = "3.5.16";
+  version = "3.5.21";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-f9EN6eXpMzIbYrjxGUJWrmRwO6JUHKuR7DEkSgGNkBI=";
+    hash = "sha256-lZs+SIaYaXXYXQsCEXeQiD5TuNBRUp326s/mR0XvMWA=";
   };
 
   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 = ''
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 344d00703164..eeca83414a6c 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -26,11 +26,11 @@ mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ cmake pkg-config qttools ];
+  nativeBuildInputs = [ cmake pkg-config qttools ]
+    ++ lib.optionals useSCEL [ emacs ];
 
   buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib
-    ++ lib.optional useSCEL emacs;
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index f75b5bed48ca..46b687557920 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -1,29 +1,26 @@
-{ stdenv
-, lib
-, rustPlatform
-, fetchFromGitHub
-, llvmPackages
-, libffi
-, libxml2
-, CoreFoundation
-, SystemConfiguration
-, Security
-, withLLVM ? false
-, withSinglepass ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64)
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  llvmPackages,
+  libffi,
+  libxml2,
+  withLLVM ? true,
+  withSinglepass ? true,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmer";
-  version = "4.4.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-zKo7d7LAfdGb7hC8RK7YH4lhk7RbivS+hNZDyQyHYM8=";
+    hash = "sha256-tfAGPBc36o5/XtVZ8IW6SFr+iWOkFzVTfe9jI4PpuA0=";
   };
 
-  cargoHash = "sha256-tajvVMRfBHefU0kVro830HeJSdgJEKPmEQm7X0+4+Kc=";
+  cargoHash = "sha256-zvQJpAjZNfa54se2xaRPWCWoCWsWw1btaHYrWlyUIZY=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
@@ -33,10 +30,6 @@ rustPlatform.buildRustPackage rec {
     llvmPackages.llvm
     libffi
     libxml2
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreFoundation
-    SystemConfiguration
-    Security
   ];
 
   # check references to `compiler_features` in Makefile on update
@@ -46,18 +39,21 @@ rustPlatform.buildRustPackage rec {
     "static-artifact-create"
     "wasmer-artifact-load"
     "static-artifact-load"
-  ]
-  ++ lib.optional withLLVM "llvm"
-  ++ lib.optional withSinglepass "singlepass";
+  ] ++ lib.optional withLLVM "llvm" ++ lib.optional withSinglepass "singlepass";
 
-  cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ];
+  cargoBuildFlags = [
+    "--manifest-path"
+    "lib/cli/Cargo.toml"
+    "--bin"
+    "wasmer"
+  ];
 
-  env.LLVM_SYS_150_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
+  env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
 
   # Tests are failing due to `Cannot allocate memory` and other reasons
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Universal WebAssembly Runtime";
     mainProgram = "wasmer";
     longDescription = ''
@@ -67,10 +63,12 @@ rustPlatform.buildRustPackage rec {
       x86 and ARM devices.
     '';
     homepage = "https://wasmer.io/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Br1ght0ne shamilton nickcao ];
-    # error: multiple fields are never read
-    #    --> lib/compiler-llvm/src/translator/intrinsics.rs:141:9
-    broken = withLLVM;
+    license = lib.licenses.mit;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [
+      Br1ght0ne
+      shamilton
+      nickcao
+    ];
   };
 }
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index ee0585e59106..691f017ec646 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "26.0.0";
+  version = "26.0.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-zcAYF/accq0Z0aKZLquFY+iDs1uh57sbZ/zXGqZ3KZI=";
+    hash = "sha256-Q7f35Y3ZZ7BHLwmdsa0I5gtlNMObscVD/3jKrVetGnA=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-ufojfTrChL363AX/W8hT3pJYeYijqJ7azECuUGGmBx0=";
+  cargoHash = "sha256-kaE+LoqnWPZcM9H5FM7SRPRq2J78yrL5zWdV2klVLDU=";
   cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index e7d26606f271..3c0ba58041a4 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cgal";
-  version = "5.6.1";
+  version = "5.6.2";
 
   src = fetchurl {
     url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
-    hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc=";
+    hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4=";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/abseil-cpp/202407.nix b/pkgs/development/libraries/abseil-cpp/202407.nix
index 49e18c271e64..51056ff86d9d 100644
--- a/pkgs/development/libraries/abseil-cpp/202407.nix
+++ b/pkgs/development/libraries/abseil-cpp/202407.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , gtest
 , static ? stdenv.hostPlatform.isStatic
@@ -18,6 +19,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=";
   };
 
+  patches = [
+    # Don't match -Wnon-virtual-dtor in the "flags are needed to suppress
+    # Needed to cleanly apply the #1738 fix below.
+    # https://github.com/abseil/abseil-cpp/issues/1737
+    (fetchpatch {
+      url = "https://github.com/abseil/abseil-cpp/commit/9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5.patch";
+      hash = "sha256-PTNmNJMk42Omwek0ackl4PjxifDP/+GaUitS60l+VB0=";
+    })
+
+    # Fix shell option group handling in pkgconfig files
+    # https://github.com/abseil/abseil-cpp/pull/1738
+    (fetchpatch {
+      url = "https://github.com/abseil/abseil-cpp/commit/bd0c9c58cac4463d96b574de3097422bb78215a8.patch";
+      hash = "sha256-fB9pvkyNBXoDKLrVaNwliqrWEPTa2Y6OJMe2xgl5IBc=";
+    })
+  ];
+
   cmakeFlags = [
     "-DABSL_BUILD_TEST_HELPERS=ON"
     "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
diff --git a/pkgs/development/libraries/accounts-qml-module/default.nix b/pkgs/development/libraries/accounts-qml-module/default.nix
index 858f9c0d57b8..2ac4663652f9 100644
--- a/pkgs/development/libraries/accounts-qml-module/default.nix
+++ b/pkgs/development/libraries/accounts-qml-module/default.nix
@@ -1,19 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, accounts-qt
-, dbus-test-runner
-, pkg-config
-, qmake
-, qtbase
-, qtdeclarative
-, signond
-, xvfb-run
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  unstableGitUpdater,
+  accounts-qt,
+  dbus-test-runner,
+  pkg-config,
+  qmake,
+  qtbase,
+  qtdeclarative,
+  qttools,
+  signond,
+  xvfb-run,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "accounts-qml-module";
-  version = "0.7-unstable-2022-10-28";
+  version = "0.7-unstable-2023-10-28";
 
   src = fetchFromGitLab {
     owner = "accounts-sso";
@@ -22,17 +25,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZpnkZauowLPBnO3DDDtG/x07XoQGVNqEF8AQB5TZK84=";
   };
 
-  postPatch = ''
-    substituteInPlace src/src.pro \
-      --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \
-      --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+  outputs = [
+    "out"
+    "doc"
+  ];
 
-    # Don't install test binary
-    sed -i tests/tst_plugin.pro \
-      -e '/TARGET = tst_plugin/a INSTALLS -= target'
-  '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-    sed -i accounts-qml-module.pro -e '/tests/d'
-  '';
+  postPatch =
+    ''
+      substituteInPlace src/src.pro \
+        --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \
+        --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+
+      # Find qdoc
+      substituteInPlace doc/doc.pri \
+        --replace-fail 'QDOC = $$[QT_INSTALL_BINS]/qdoc' 'QDOC = qdoc'
+
+      # Don't install test binary
+      sed -i tests/tst_plugin.pro \
+        -e '/TARGET = tst_plugin/a INSTALLS -= target'
+    ''
+    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+      sed -i accounts-qml-module.pro -e '/tests/d'
+    '';
 
   # QMake can't find Qt modules in buildInputs
   strictDeps = false;
@@ -41,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     qmake
     qtdeclarative # qmlplugindump
+    qttools # qdoc
   ];
 
   buildInputs = [
@@ -57,11 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  qmakeFlags = [
-    # Needs qdoc, https://github.com/NixOS/nixpkgs/pull/245379
-    "CONFIG+=no_docs"
-  ];
-
   postConfigure = ''
     make qmake_all
   '';
@@ -78,11 +88,19 @@ stdenv.mkDerivation (finalAttrs: {
     export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
   '';
 
-  meta = with lib; {
+  postFixup = ''
+    moveToOutput share/accounts-qml-module/doc $doc
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "VERSION_";
+  };
+
+  meta = {
     description = "QML bindings for libaccounts-qt + libsignon-qt";
     homepage = "https://gitlab.com/accounts-sso/accounts-qml-module";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index cd098ae825c2..ac3f9ca951fd 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    (lib.strings.enableFeature stdenv.hostPlatform.isLinux "platform")
+    (lib.enableFeature stdenv.hostPlatform.isLinux "platform")
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
     "--enable-examples=no"
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     "--x-includes=${lib.getDev libX11}/include"
diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/development/libraries/amf-headers/default.nix
deleted file mode 100644
index 04f2e6c1385b..000000000000
--- a/pkgs/development/libraries/amf-headers/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "amf-headers";
-  version = "1.4.34";
-
-  src = fetchFromGitHub {
-    owner = "GPUOpen-LibrariesAndSDKs";
-    repo = "AMF";
-    rev = "v${version}";
-    sha256 = "sha256-AASoThCzyFharXrprUalOMufz/DDtzlc97q/dQk7B6Y=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/include/AMF
-    cp -r amf/public/include/* $out/include/AMF
-  '';
-
-  meta = with lib; {
-    description = "Headers for The Advanced Media Framework (AMF)";
-    homepage = "https://github.com/GPUOpen-LibrariesAndSDKs/AMF";
-    license = licenses.mit;
-    maintainers = with maintainers; [ devusb ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix
index 4079f6278235..2a0601a8875e 100644
--- a/pkgs/development/libraries/aribb25/default.nix
+++ b/pkgs/development/libraries/aribb25/default.nix
@@ -1,12 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, fetchpatch
-, autoreconfHook
-, pkg-config
-, pcsclite
-, PCSC
-, xcbuild
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  autoreconfHook,
+  pkg-config,
+  pcsclite,
+  PCSC,
 }:
 
 stdenv.mkDerivation rec {
@@ -26,26 +26,30 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
-  buildInputs = if stdenv.hostPlatform.isDarwin then [ PCSC ] else [ pcsclite ];
-
-  patches = let
-    url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff";
-  in [
-    (fetchpatch {
-      name = "make-cli-pipes-work-1.patch";
-      url = url "0425184dbf3fdaf59854af5f530da88b2196a57b";
-      sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd";
-    })
-    (fetchpatch {
-      name = "make-cli-pipes-work-2.patch";
-      url = url "cebabeab2bda065dca1c9f033b42d391be866d86";
-      sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28";
-    })
   ];
 
-  buildFlags =
-    lib.optional stdenv.hostPlatform.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
+  buildInputs =
+    lib.optionals stdenv.hostPlatform.isDarwin [ PCSC ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-deprecated-non-prototype";
+
+  patches =
+    let
+      url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff";
+    in
+    [
+      (fetchpatch {
+        name = "make-cli-pipes-work-1.patch";
+        url = url "0425184dbf3fdaf59854af5f530da88b2196a57b";
+        sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd";
+      })
+      (fetchpatch {
+        name = "make-cli-pipes-work-2.patch";
+        url = url "cebabeab2bda065dca1c9f033b42d391be866d86";
+        sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28";
+      })
+    ];
 
   meta = with lib; {
     description = "Sample implementation of the ARIB STD-B25 standard";
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
deleted file mode 100644
index 4ca364ad9f8d..000000000000
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, gobject-introspection
-, buildPackages
-, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
-, gsettings-desktop-schemas
-, makeWrapper
-, dbus
-, glib
-, dconf
-, libX11
-, libxml2
-, libXtst
-, libXi
-, libXext
-, gnome
-, systemd
-, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
-}:
-
-stdenv.mkDerivation rec {
-  pname = "at-spi2-core";
-  version = "2.52.0";
-
-  outputs = [ "out" "dev" ];
-  separateDebugInfo = true;
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-CsP8gyDI0B+hR8Jyun+gOAY4nGsD08QG0II+MONf9as=";
-  };
-
-  nativeBuildInputs = [
-    glib
-    meson
-    ninja
-    pkg-config
-    makeWrapper
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    libX11
-    libxml2
-    # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
-    libXtst
-    libXi
-    # libXext is a transitive dependency of libXi
-    libXext
-  ] ++ lib.optionals systemdSupport [
-    # libsystemd is a needed for dbus-broker support
-    systemd
-  ];
-
-  # In atspi-2.pc dbus-1 glib-2.0
-  # In atk.pc gobject-2.0
-  propagatedBuildInputs = [
-    dbus
-    glib
-  ];
-
-  # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
-  doCheck = false;
-
-  mesonFlags = [
-    # Provide dbus-daemon fallback when it is not already running when
-    # at-spi2-bus-launcher is executed. This allows us to avoid
-    # including the entire dbus closure in libraries linked with
-    # the at-spi2-core libraries.
-    "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon"
-  ] ++ lib.optionals systemdSupport [
-    # Same as the above, but for dbus-broker
-    "-Ddbus_broker=/run/current-system/sw/bin/dbus-broker-launch"
-  ] ++ lib.optionals (!systemdSupport) [
-    "-Duse_systemd=false"
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-      versionPolicy = "odd-unstable";
-    };
-  };
-
-  postFixup = ''
-    # Cannot use wrapGAppsHook'due to a dependency cycle
-    wrapProgram $out/libexec/at-spi-bus-launcher \
-      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
-  '';
-
-  meta = with lib; {
-    description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
-    homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core";
-    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]);
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 2f44827af95f..364ba305d5c1 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -35,6 +35,19 @@ let
       hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs=";
     };
 
+    bassmidi = {
+      h = "bassmidi.h";
+      version = "2.4.15.3";
+      so = {
+        i686_linux = "libs/x86/libbassmidi.so";
+        x86_64-linux = "libs/x86_64/libbassmidi.so";
+        armv7l-linux = "libs/armhf/libbassmidi.so";
+        aarch64-linux = "libs/aarch64/libbassmidi.so";
+      };
+      url = "https://web.archive.org/web/20240501180447/http://www.un4seen.com/files/bassmidi24-linux.zip";
+      hash = "sha256-HrF1chhGk32bKN3jwal44Tz/ENGe/zORsrLPeGAv1OE=";
+    };
+
     bassmix = {
       h = "bassmix.h";
       version = "2.4.12";
diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix
index 500533ce8203..fe301ae859ba 100644
--- a/pkgs/development/libraries/audio/libopenmpt/default.nix
+++ b/pkgs/development/libraries/audio/libopenmpt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libopenmpt";
-  version = "0.7.9";
+  version = "0.7.10";
 
   outputs = [ "out" "dev" "bin" ];
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
-    hash = "sha256-A4bpGNddeX551bFO3QhHFl2LNZ6YEe9XZSwKNWot/PQ=";
+    hash = "sha256-CTcTwcECT08QxHeaZs6yr1H7fJCKnpn+uJLQQBkiC6E=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 099c3ca42793..a3bf187dd9c2 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -7,6 +7,10 @@
   pkg-config,
   meson,
   ninja,
+  sphinxygen,
+  doxygen,
+  sphinx,
+  python3Packages,
 
   # runtime
   lv2,
@@ -40,11 +44,13 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
+    sphinxygen
+    doxygen
+    sphinx
+    python3Packages.sphinx-lv2-theme
   ];
 
   mesonFlags = [
-    # docs require sphinxygen
-    (mesonEnable "docs" false)
     (mesonEnable "gtk2" withGtk2)
     (mesonEnable "gtk3" withGtk3)
     (mesonEnable "qt5" withQt5)
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
deleted file mode 100644
index 0806364a7f67..000000000000
--- a/pkgs/development/libraries/babl/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, gi-docgen
-, gobject-introspection
-, lcms2
-, vala
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "babl";
-  version = "0.1.108";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchurl {
-    url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Jt7+neqresTQ4HbKtJwqDW69DfDDH9IJklpfB+3uFHU=";
-  };
-
-  patches = [
-    # Allow overriding path to dev output that will be hardcoded e.g. in pkg-config file.
-    ./dev-prefix.patch
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gi-docgen
-    gobject-introspection
-    vala
-  ];
-
-  buildInputs = [
-    lcms2
-  ];
-
-  mesonFlags = [
-    "-Dprefix-dev=${placeholder "dev"}"
-  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    # Docs are opt-out in native but opt-in in cross builds.
-    "-Dwith-docs=true"
-    "-Denable-gir=true"
-  ];
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  meta = with lib; {
-    description = "Image pixel format conversion library";
-    mainProgram = "babl";
-    homepage = "https://gegl.org/babl/";
-    changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${replaceStrings [ "." ] [ "_" ] finalAttrs.version}/NEWS";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 9c6fb3e67203..94ee8c236423 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -181,6 +181,8 @@ stdenv.mkDerivation {
     cat << EOF >> user-config.jam
     using clang-darwin : : ${stdenv.cc.targetPrefix}c++
       : "-rpath $out/lib/"
+        $AR
+        $RANLIB
       ;
     EOF
   ''
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 976144b1b5ca..8d11ee2b7937 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -6,6 +6,7 @@
   docutils,
   bzip2,
   zlib,
+  jitterentropy,
   darwin,
   static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
 }:
@@ -56,7 +57,10 @@ let
             CoreServices
             Security
           ]
-        );
+        )
+        ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+          jitterentropy
+        ];
 
       buildTargets =
         [ "cli" ]
@@ -81,6 +85,9 @@ let
         ]
         ++ lib.optionals stdenv.hostPlatform.isAarch64 [
           "--cpu=aarch64"
+        ]
+        ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+          "--enable-modules=jitter_rng"
         ];
 
       configurePhase = ''
@@ -117,8 +124,8 @@ let
 in
 {
   botan3 = common {
-    version = "3.5.0";
-    hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8=";
+    version = "3.6.1";
+    hash = "sha256-fLhXXYjSMsdxdHadf54ku0REQWBYWYbuvWbnScuakIk=";
     # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again
     patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ];
   };
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
deleted file mode 100644
index 9180457a3165..000000000000
--- a/pkgs/development/libraries/caf/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
-
-stdenv.mkDerivation rec {
-  pname = "actor-framework";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "actor-framework";
-    repo = "actor-framework";
-    rev = version;
-    hash = "sha256-ANtqGFctgOAynDiZS9tmWRASVpB2RqRTG7JSXZIDmP8=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ openssl ];
-
-  cmakeFlags = [
-    "-DCAF_ENABLE_EXAMPLES:BOOL=OFF"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation";
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-  checkTarget = "test";
-
-  meta = with lib; {
-    description = "Open source implementation of the actor model in C++";
-    homepage = "http://actor-framework.org/";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ bobakker tobim ];
-  };
-}
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
deleted file mode 100644
index cdf994442d37..000000000000
--- a/pkgs/development/libraries/cairo/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3
-, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib
-, x11Support? !stdenv.hostPlatform.isDarwin || true, libXext, libXrender
-, gobjectSupport ? true, glib
-, xcbSupport ? x11Support, libxcb
-, darwin
-, testers
-}:
-
-let
-  inherit (lib) optional optionals;
-in stdenv.mkDerivation (finalAttrs: let
-  inherit (finalAttrs) pname version;
-in {
-  pname = "cairo";
-  version = "1.18.2";
-
-  src = fetchurl {
-    url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
-    hash = "sha256-piubtCQl6ETMPW3d4EP/Odur7dFULrpXout5+FiJ1Fo=";
-  };
-
-  outputs = [ "out" "dev" "devdoc" ];
-  outputBin = "dev"; # very small
-  separateDebugInfo = true;
-
-  nativeBuildInputs = [
-    gtk-doc
-    meson
-    ninja
-    pkg-config
-    python3
-  ];
-
-  buildInputs = [
-    docbook_xsl
-  ] ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-    CoreGraphics
-    CoreText
-    ApplicationServices
-    Carbon
-  ]);
-
-  propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ]
-    ++ optionals x11Support [ libXext libXrender ]
-    ++ optionals xcbSupport [ libxcb ]
-    ++ optional gobjectSupport glib
-    ; # TODO: maybe liblzo but what would it be for here?
-
-  mesonFlags = [
-    "-Dgtk_doc=true"
-
-    # error: #error config.h must be included before this header
-    "-Dsymbol-lookup=disabled"
-
-    # Only used in tests, causes a dependency cycle
-    "-Dspectre=disabled"
-
-    (lib.mesonEnable "glib" gobjectSupport)
-    (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
-    (lib.mesonEnable "xlib" x11Support)
-    (lib.mesonEnable "xcb" xcbSupport)
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    "--cross-file=${builtins.toFile "cross-file.conf" ''
-      [properties]
-      ipc_rmid_deferred_release = ${
-        {
-          linux = "true";
-          freebsd = "true";
-          netbsd = "false";
-        }.${stdenv.hostPlatform.parsed.kernel.name} or
-          (throw "Unknown value for ipc_rmid_deferred_release")
-      }
-    ''}"
-  ];
-
-  preConfigure = ''
-    patchShebangs version.py
-  '';
-
-  enableParallelBuilding = true;
-
-  doCheck = false; # fails
-
-  postInstall = ''
-    # Work around broken `Requires.private' that prevents Freetype
-    # `-I' flags to be propagated.
-    sed -i "$out/lib/pkgconfig/cairo.pc" \
-        -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g'
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin glib.flattenInclude;
-
-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-
-  meta = with lib; {
-    description = "2D graphics library with support for multiple output devices";
-    mainProgram = "cairo-trace";
-    longDescription = ''
-      Cairo is a 2D graphics library with support for multiple output
-      devices.  Currently supported output targets include the X
-      Window System, XCB, Quartz, Win32, image buffers, PostScript,
-      PDF, and SVG file output.
-
-      Cairo is designed to produce consistent output on all output
-      media while taking advantage of display hardware acceleration
-      when available (e.g., through the X Render Extension).
-    '';
-    homepage = "http://cairographics.org/";
-    license = with licenses; [ lgpl2Plus mpl10 ];
-    pkgConfigModules = [
-      "cairo-pdf"
-      "cairo-ps"
-      "cairo-svg"
-    ] ++ lib.optional gobjectSupport "cairo-gobject";
-    platforms = platforms.all;
-  };
-})
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 1aed26cec87d..9342000c864b 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -7,16 +7,18 @@
 
 stdenv.mkDerivation rec {
   pname = "capstone";
-  version = "5.0.1";
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "capstone-engine";
     repo = "capstone";
     rev = version;
-    sha256 = "sha256-kKmL5sae9ruWGu1gas1mel9qM52qQOD+zLj8cRE3isg=";
+    hash = "sha256-LZ10czBn5oaKMHQ8xguC6VZa7wvEgPRu6oWt/22QaDs=";
   };
 
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ] ++ lib.optionals stdenv.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index c7d2296d9629..b005dc3f8116 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    hash = "sha256-U9hv6DaqN5eCMcAQdfFPqWpsbqDFxRQixELSGbNlc0g=";
+    hash = "sha256-Zt53Qtry99RAheeh7V24Csg/aMW25DT/3CN/h+BaeoM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix
deleted file mode 100644
index c8fe78d0462f..000000000000
--- a/pkgs/development/libraries/curlpp/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl }:
-
-stdenv.mkDerivation rec {
-  pname = "curlpp";
-  version = "0.8.1";
-  src = fetchFromGitHub {
-    owner = "jpbarrette";
-    repo = "curlpp";
-    rev = "v${version}";
-    sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk";
-  };
-
-  buildInputs = [ curl ];
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    homepage = "https://www.curlpp.org/";
-    description = "C++ wrapper around libcURL";
-    mainProgram = "curlpp-config";
-    license = licenses.mit;
-    maintainers = with maintainers; [ CrazedProgrammer ];
-  };
-}
diff --git a/pkgs/development/libraries/eglexternalplatform/default.nix b/pkgs/development/libraries/eglexternalplatform/default.nix
deleted file mode 100644
index 50e276372274..000000000000
--- a/pkgs/development/libraries/eglexternalplatform/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "eglexternalplatform";
-  version = "1.1";
-
-  src = fetchFromGitHub {
-    owner = "Nvidia";
-    repo = "eglexternalplatform";
-    rev = "7c8f8e2218e46b1a4aa9538520919747f1184d86";
-    sha256 = "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb";
-  };
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/include/
-    cp interface/* $out/include/
-
-    substituteInPlace eglexternalplatform.pc \
-      --replace "/usr/include/EGL" "$out/include"
-    install -Dm644 {.,$out/share/pkgconfig}/eglexternalplatform.pc
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "EGL External Platform interface";
-    homepage = "https://github.com/NVIDIA/eglexternalplatform";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ hedning ];
-  };
-}
diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix
deleted file mode 100644
index f13b1a167e23..000000000000
--- a/pkgs/development/libraries/elpa/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook
-, perl, mpi, blas, lapack, scalapack, openssh
-# CPU optimizations
-, avxSupport ? stdenv.hostPlatform.avxSupport
-, avx2Support ? stdenv.hostPlatform.avx2Support
-, avx512Support ? stdenv.hostPlatform.avx512Support
-, config
-# Enable NIVIA GPU support
-# Note, that this needs to be built on a system with a GPU
-# present for the tests to succeed.
-, enableCuda ? config.cudaSupport
-# type of GPU architecture
-, nvidiaArch ? "sm_60"
-, cudaPackages
-} :
-
-assert blas.isILP64 == lapack.isILP64;
-assert blas.isILP64 == scalapack.isILP64;
-
-stdenv.mkDerivation rec {
-  pname = "elpa";
-  version = "2024.05.001";
-
-  passthru = { inherit (blas) isILP64; };
-
-  src = fetchurl {
-    url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz";
-    sha256 = "sha256-nK9Bo+YA4vb0zhkxvVQYUXna3pwXFVbQybQbvGlA8vY=";
-  };
-
-  patches = [
-    # Use a plain name for the pkg-config file
-    ./pkg-config.patch
-  ];
-
-  postPatch = ''
-    patchShebangs ./fdep/fortran_dependencies.pl
-    patchShebangs ./test-driver
-
-    # Fix the test script generator
-    substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}'
-  '';
-
-  outputs = [ "out" "doc" "man" "dev" ];
-
-  nativeBuildInputs = [ autoreconfHook perl ]
-    ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
-
-  buildInputs = [ mpi blas lapack scalapack ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_cudart
-      cudaPackages.libcublas
-    ];
-
-  preConfigure = ''
-    export FC="mpifort"
-    export CC="mpicc"
-    export CXX="mpicxx"
-    export CPP="cpp"
-
-    # These need to be set for configure to succeed
-    export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 "
-      + lib.optionalString avxSupport "-mavx "
-      + lib.optionalString avx2Support "-mavx2 -mfma "
-      + lib.optionalString avx512Support "-mavx512"}"
-
-    export CFLAGS=$FCFLAGS
-  '';
-
-  configureFlags = [
-    "--with-mpi"
-    "--enable-openmp"
-    "--without-threading-support-check-during-build"
-  ] ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support"
-    ++ lib.optional (!avxSupport) "--disable-avx"
-    ++ lib.optional (!avx2Support) "--disable-avx2"
-    ++ lib.optional (!avx512Support) "--disable-avx512"
-    ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse"
-    ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse-assembly"
-    ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly"
-    ++ lib.optionals enableCuda [  "--enable-nvidia-gpu" "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}" ];
-
-  enableParallelBuilding = true;
-
-  doCheck = !enableCuda;
-
-  nativeCheckInputs = [ mpiCheckPhaseHook openssh ];
-  preCheck = ''
-    #patchShebangs ./
-
-    # Run dual threaded
-    export OMP_NUM_THREADS=2
-
-    # Reduce test problem sizes
-    export TEST_FLAGS="1500 50 16"
-  '';
-
-  meta = with lib; {
-    description = "Eigenvalue Solvers for Petaflop-Applications";
-    homepage = "https://elpa.mpcdf.mpg.de/";
-    license = licenses.lgpl3Only;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.markuskowa ];
-  };
-}
diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
deleted file mode 100644
index b7f766825106..000000000000
--- a/pkgs/development/libraries/faudio/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, SDL2}:
-
-#TODO: tests
-
-stdenv.mkDerivation rec {
-  pname = "faudio";
-  version = "24.10";
-
-  src = fetchFromGitHub {
-    owner = "FNA-XNA";
-    repo = "FAudio";
-    rev = version;
-    sha256 = "sha256-BUR/zFYOaEoa4pUUgzIcrWrpDX4AP9cySIelralb/t0=";
-  };
-
-  nativeBuildInputs = [cmake];
-
-  buildInputs = [ SDL2 ];
-
-  meta = with lib; {
-    description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library";
-    homepage = "https://github.com/FNA-XNA/FAudio";
-    changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}";
-    license = licenses.zlib;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.marius851000 ];
-  };
-}
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index c88566d2e7ac..eac16d659dac 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -34,8 +34,8 @@ let
   };
 
   v7 = {
-    version = "7.0.2";
-    hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
+    version = "7.1";
+    hash = "sha256-erTkv156VskhYEJWjpWFvHjmcr2hr6qgUi28Ho8NFYk=";
   };
 in
 
diff --git a/pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch b/pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch
new file mode 100644
index 000000000000..998c4d97f617
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch
@@ -0,0 +1,10 @@
+diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
+index 869376dd18..d9348ee837 100644
+--- a/tests/fate/ffmpeg.mak
++++ b/tests/fate/ffmpeg.mak
+@@ -266,4 +266,4 @@
+ 
+ # test matching by stream disposition
+ fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy
+-FATE_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition
++FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 28a08cb0d2f5..313a1066e4f3 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -37,6 +37,7 @@
 , withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding
 , withAom ? withHeadlessDeps # AV1 reference encoder
 , withAppKit ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AppKit framework
+, withAribb24 ? withFullDeps # ARIB text and caption decoding
 , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
 , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering
 , withAudioToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AudioToolbox
@@ -46,6 +47,7 @@
 , withBs2b ? withFullDeps # bs2b DSP library
 , withBzlib ? withHeadlessDeps
 , withCaca ? withFullDeps # Textual display (ASCII art)
+, withCdio ? withFullDeps && withGPL # Audio CD grabbing
 , withCelt ? withHeadlessDeps # CELT decoder
 , withChromaprint ? withFullDeps # Audio fingerprinting
 , withCodec2 ? withFullDeps # codec2 en/decoding
@@ -135,14 +137,15 @@
 , withXcbShape ? withFullDeps # X11 grabbing shape rendering
 , withXcbShm ? withFullDeps # X11 grabbing shm communication
 , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering
-, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding
-, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding
+, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding
+, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken # MPEG-5 EVC encoding
 , withXlib ? withFullDeps # Xlib support
 , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers
 , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists
 , withZimg ? withHeadlessDeps
 , withZlib ? withHeadlessDeps
 , withZmq ? withFullDeps # Message passing
+, withZvbi ? withFullDeps # Teletext support
 
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
@@ -225,6 +228,7 @@
 , alsa-lib
 , amf
 , amf-headers
+, aribb24
 , avisynthplus
 , bzip2
 , celt
@@ -252,6 +256,8 @@
 , libbluray
 , libbs2b
 , libcaca
+, libcdio
+, libcdio-paranoia
 , libdc1394
 , libdrm
 , libdvdnav
@@ -325,6 +331,7 @@
 , zeromq4
 , zimg
 , zlib
+, zvbi
 /*
  *  Darwin frameworks
  */
@@ -457,16 +464,9 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
       })
     ]
-    ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [
-      (fetchpatch2 {
-        # Will likely be obsolete in >7.0
-        name = "fate_avoid_dependency_on_samples";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834";
-        hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I=";
-      })
-    ]
-    ++ optionals (lib.versionAtLeast version "7.0") [
+    ++ optionals (lib.versionAtLeast version "7.1") [
       ./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch
+      ./fix-fate-ffmpeg-spec-disposition-7.1.patch
 
       # Expose a private API for Chromium / Qt WebEngine.
       (fetchpatch2 {
@@ -561,6 +561,7 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withAmf "amf")
     (enableFeature withAom "libaom")
     (enableFeature withAppKit "appkit")
+    (enableFeature withAribb24 "libaribb24")
   ] ++ optionals (versionAtLeast version "6.1") [
     (enableFeature withAribcaption "libaribcaption")
   ] ++ [
@@ -572,6 +573,7 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withBs2b "libbs2b")
     (enableFeature withBzlib "bzlib")
     (enableFeature withCaca "libcaca")
+    (enableFeature withCdio "libcdio")
     (enableFeature withCelt "libcelt")
     (enableFeature withChromaprint "chromaprint")
     (enableFeature withCodec2 "libcodec2")
@@ -690,6 +692,7 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withZimg "libzimg")
     (enableFeature withZlib "zlib")
     (enableFeature withZmq "libzmq")
+    (enableFeature withZvbi "libzvbi")
     /*
      * Developer flags
      */
@@ -733,6 +736,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withAmf [ amf-headers ]
   ++ optionals withAom [ libaom ]
   ++ optionals withAppKit [ AppKit ]
+  ++ optionals withAribb24 [ aribb24 ]
   ++ optionals withAribcaption [ libaribcaption ]
   ++ optionals withAss [ libass ]
   ++ optionals withAudioToolbox [ AudioToolbox ]
@@ -742,6 +746,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withBs2b [ libbs2b ]
   ++ optionals withBzlib [ bzip2 ]
   ++ optionals withCaca [ libcaca ]
+  ++ optionals withCdio [ libcdio libcdio-paranoia ]
   ++ optionals withCelt [ celt ]
   ++ optionals withChromaprint [ chromaprint ]
   ++ optionals withCodec2 [ codec2 ]
@@ -828,6 +833,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withZimg [ zimg ]
   ++ optionals withZlib [ zlib ]
   ++ optionals withZmq [ zeromq4 ]
+  ++ optionals withZvbi [ zvbi ]
   ;
 
   buildFlags = [ "all" ]
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
deleted file mode 100644
index fa86bc4a18c9..000000000000
--- a/pkgs/development/libraries/freetds/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
-, openssl
-, odbcSupport ? true, unixODBC ? null }:
-
-assert odbcSupport -> unixODBC != null;
-
-# Work is in progress to move to cmake so revisit that later
-
-stdenv.mkDerivation rec {
-  pname = "freetds";
-  version = "1.4.22";
-
-  src = fetchurl {
-    url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
-    hash   = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE=";
-  };
-
-  buildInputs = [
-    openssl
-  ] ++ lib.optional odbcSupport unixODBC;
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-  meta = with lib; {
-    description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
-    homepage    = "https://www.freetds.org";
-    changelog   = "https://github.com/FreeTDS/freetds/releases/tag/v${version}";
-    license     = licenses.lgpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
deleted file mode 100644
index 814224a44fbe..000000000000
--- a/pkgs/development/libraries/freetype/default.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, buildPackages
-, pkgsHostHost
-, pkg-config
-, which
-, makeWrapper
-, zlib
-, bzip2
-, brotli
-, libpng
-, gnumake
-, glib
-
-, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
-  # LCD filtering is also known as ClearType and covered by several Microsoft patents.
-  # This option allows it to be disabled. See http://www.freetype.org/patents.html.
-  useEncumberedCode ? true
-
-  # for passthru.tests
-, cairo
-, fontforge
-, ghostscript
-, graphicsmagick
-, gtk3
-, harfbuzz
-, imagemagick
-, pango
-, poppler
-, python3
-, qt5
-, texmacs
-, ttfautohint
-, testers
-}:
-
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "freetype";
-  version = "2.13.3";
-
-  src = let inherit (finalAttrs) pname version; in fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-BVA1BmbUJ8dNrrhdWse7NTrLpfdpVjlZlTEanG8GMok=";
-  };
-
-  propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype
-
-  # dependence on harfbuzz is looser than the reverse dependence
-  nativeBuildInputs = [ pkg-config which ]
-    ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper
-    # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-    ++ lib.optional (!stdenv.hostPlatform.isLinux) gnumake;
-
-  patches = [
-    ./enable-table-validation.patch
-  ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch;
-
-  outputs = [ "out" "dev" ];
-
-  configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ];
-
-  # native compiler to generate building tool
-  CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
-
-  # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-std=gnu99"
-    + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  postInstall = glib.flattenInclude
-    # pkgsCross.mingwW64.pkg-config doesn't build
-    # makeWrapper doesn't cross-compile to windows #120726
-    + ''
-    substituteInPlace $dev/bin/freetype-config \
-      --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
-  '' + lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
-
-    wrapProgram "$dev/bin/freetype-config" \
-      --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
-  '';
-
-  passthru.tests = {
-    inherit
-      cairo
-      fontforge
-      ghostscript
-      graphicsmagick
-      gtk3
-      harfbuzz
-      imagemagick
-      pango
-      poppler
-      texmacs
-      ttfautohint;
-    inherit (python3.pkgs) freetype-py;
-    inherit (qt5) qtbase;
-    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-  };
-
-  meta = with lib; {
-    description = "Font rendering engine";
-    mainProgram = "freetype-config";
-    longDescription = ''
-      FreeType is a portable and efficient library for rendering fonts. It
-      supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR
-      fonts. It has a bytecode interpreter and has an automatic hinter called
-      autofit which can be used instead of hinting instructions included in
-      fonts.
-    '';
-    homepage = "https://www.freetype.org/";
-    changelog = "https://gitlab.freedesktop.org/freetype/freetype/-/raw/VER-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}/docs/CHANGES";
-    license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
-    platforms = platforms.all;
-    pkgConfigModules = [ "freetype2" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-})
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
deleted file mode 100644
index 691b826e3af5..000000000000
--- a/pkgs/development/libraries/fribidi/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib, stdenv
-, buildPackages
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, fixDarwinDylibNames
-, python3
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "fribidi";
-  version = "1.0.15";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
-  src = fetchurl {
-    url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-C7x/9jO/ogiuMtfjac9afSDV0lV6CwZ8mqmLy/mWdYc=";
-  };
-
-  postPatch = ''
-    patchShebangs test
-  '';
-
-  nativeBuildInputs = [ meson ninja pkg-config ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
-  doCheck = true;
-  nativeCheckInputs = [ python3 ];
-
-  passthru.tests = {
-    pkg-config = testers.hasPkgConfigModules {
-      package = finalAttrs.finalPackage;
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/fribidi/fribidi";
-    description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
-    mainProgram = "fribidi";
-    license = licenses.lgpl21;
-    platforms = platforms.unix;
-    pkgConfigModules = [ "fribidi" ];
-  };
-})
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 841e0808d433..7743f1e9e98d 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -94,6 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch";
       sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls=";
     })
+    (fetchpatch {
+      name = "arrow-18.patch";
+      url = "https://github.com/OSGeo/gdal/commit/9a8c5c031404bbc81445291bad128bc13766cafa.patch";
+      sha256 = "sha256-tF46DmF7ZReqY8ACTTPXohWLsRn8lVxhKF1s+r254KM=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 50ad7bdd9fd6..ca099da02354 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     "-DGDCM_USE_VTK=ON"
   ] ++ lib.optionals enablePython [
     "-DGDCM_WRAP_PYTHON:BOOL=ON"
-    "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}"
+    "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}/python_gdcm"
   ];
 
   nativeBuildInputs = [
@@ -66,6 +66,13 @@ stdenv.mkDerivation rec {
     libiconv
   ] ++ lib.optionals enablePython [ swig python ];
 
+  postInstall = lib.optionalString enablePython ''
+    substitute \
+      ${./python_gdcm.egg-info} \
+      $out/${python.sitePackages}/python_gdcm-${version}.egg-info \
+      --subst-var-by GDCM_VER "${version}"
+  '';
+
   disabledTests = [
     # require networking:
     "TestEcho"
@@ -77,6 +84,8 @@ stdenv.mkDerivation rec {
     "TestSCUValidation"
     # errors because 3 classes not wrapped:
     "TestWrapPython"
+    # AttributeError: module 'gdcm' has no attribute 'UIDGenerator_SetRoot'; maybe a wrapping regression:
+    "TestUIDGeneratorPython"
   ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
     "TestRescaler2"
   ];
diff --git a/pkgs/development/libraries/gdcm/python_gdcm.egg-info b/pkgs/development/libraries/gdcm/python_gdcm.egg-info
new file mode 100644
index 000000000000..d0b2e21f091d
--- /dev/null
+++ b/pkgs/development/libraries/gdcm/python_gdcm.egg-info
@@ -0,0 +1,5 @@
+Metadata-Version: 2.1
+Name: python-gdcm
+Version: @GDCM_VER@
+Summary: C++ library for DICOM medical files wrapped for Python using SWIG
+Platform: UNKNOWN
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
deleted file mode 100644
index 17266481b27a..000000000000
--- a/pkgs/development/libraries/geis/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchurl
-, pkg-config
-, python3Packages
-, wrapGAppsHook3
-, atk
-, dbus
-, evemu
-, frame
-, gdk-pixbuf
-, gobject-introspection
-, grail
-, gtk3
-, xorg
-, pango
-, xorgserver
-}:
-
-
-stdenv.mkDerivation rec {
-  pname = "geis";
-  version = "2.2.17";
-
-  src = fetchurl {
-    url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz";
-    sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
-  };
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare";
-
-  hardeningDisable = [ "format" ];
-
-  pythonPath = with python3Packages;
-    [ pygobject3  ];
-
-  nativeBuildInputs = [ pkg-config wrapGAppsHook3 python3Packages.wrapPython gobject-introspection ];
-  buildInputs = [ atk dbus evemu frame gdk-pixbuf grail
-    gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
-  ];
-
-  patchPhase = ''
-    substituteInPlace python/geis/geis_v2.py --replace \
-      "ctypes.util.find_library(\"geis\")" "'$out/lib/libgeis.so'"
-  '';
-
-  preFixup = ''
-    buildPythonPath "$out $pythonPath"
-    gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
-  '';
-
-  meta = with lib; {
-    description = "Library for input gesture recognition";
-    homepage = "https://launchpad.net/geis";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
deleted file mode 100644
index 832ae945aa2c..000000000000
--- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git i/data/meson.build w/data/meson.build
-index 6ac2a11..73f433b 100644
---- i/data/meson.build
-+++ w/data/meson.build
-@@ -1,6 +1,6 @@
- if get_option('enable-backend')
-     conf = configuration_data()
--    conf.set('sysconfdir', sysconfdir)
-+    conf.set('sysconfdir', sysconfdir_install)
- 
-     if get_option('demo-agent')
-         conf.set('demo_agent', 'geoclue-demo-agent;')
-@@ -8,7 +8,7 @@ if get_option('enable-backend')
-         conf.set('demo_agent', '')
-     endif
- 
--    conf_dir = join_paths(sysconfdir, 'geoclue')
-+    conf_dir = join_paths(sysconfdir_install, 'geoclue')
-     configure_file(output: 'geoclue.conf',
-                    input: 'geoclue.conf.in',
-                    configuration: conf,
-@@ -17,7 +17,7 @@ if get_option('enable-backend')
-     conf = configuration_data()
-     conf.set('libexecdir', libexecdir)
-     conf.set('dbus_srv_user', get_option('dbus-srv-user'))
--    conf.set('sysconfdir', sysconfdir)
-+    conf.set('sysconfdir', sysconfdir_install)
- 
-     confd_dir = join_paths(conf_dir, 'conf.d')
-     install_emptydir(confd_dir)
-@@ -37,7 +37,7 @@ if get_option('enable-backend')
-     # DBus Service policy file
-     dbus_service_dir = get_option('dbus-sys-dir')
-     if dbus_service_dir == ''
--        dbus_service_dir = join_paths(sysconfdir, 'dbus-1', 'system.d')
-+        dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d')
-     endif
-     configure_file(output: 'org.freedesktop.GeoClue2.conf',
-                    input: 'org.freedesktop.GeoClue2.conf.in',
-diff --git i/demo/meson.build w/demo/meson.build
-index 1427fbe..2623f16 100644
---- i/demo/meson.build
-+++ w/demo/meson.build
-@@ -54,7 +54,7 @@ if get_option('demo-agent')
-                                    install_dir: desktop_dir)
- 
-     # Also install in the autostart directory.
--    autostart_dir = join_paths(sysconfdir, 'xdg', 'autostart')
-+    autostart_dir = join_paths(sysconfdir_install, 'xdg', 'autostart')
-     meson.add_install_script('install-file.py',
-                              desktop_file.full_path(),
-                              autostart_dir)
-diff --git i/meson.build w/meson.build
-index 220ae2b..dbf6458 100644
---- i/meson.build
-+++ w/meson.build
-@@ -12,7 +12,11 @@ gclue_api_version='2.0'
- datadir = join_paths(get_option('prefix'), get_option('datadir'))
- includedir = join_paths(get_option('prefix'), get_option('includedir'))
- libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
--sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
-+if get_option('sysconfdir_install') != ''
-+  sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
-+else
-+  sysconfdir_install = get_option('sysconfdir')
-+endif
- localedir = join_paths(datadir, 'locale')
- 
- header_dir = 'libgeoclue-' + gclue_api_version
-@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w
- conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new')
- conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/')
- conf.set_quoted('LOCALEDIR', localedir)
--conf.set_quoted('SYSCONFDIR', sysconfdir)
-+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
- conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
- conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
- conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
-diff --git i/meson_options.txt w/meson_options.txt
-index 5b8c42d..945dfd5 100644
---- i/meson_options.txt
-+++ w/meson_options.txt
-@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
- option('dbus-srv-user',
-        type: 'string', value: 'root',
-        description: 'The user (existing) as which the service will run')
-+option('sysconfdir_install',
-+       type: 'string', value: '',
-+       description: 'sysconfdir to use during installation')
- option('mozilla-api-key',
-        type: 'string', value: 'geoclue',
-        description: 'Your API key for Mozilla Location Service')
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
deleted file mode 100644
index 84fa20f8efad..000000000000
--- a/pkgs/development/libraries/geoclue/default.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, intltool
-, meson
-, mesonEmulatorHook
-, ninja
-, pkg-config
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_412
-, glib
-, json-glib
-, libsoup_3
-, libnotify
-, gdk-pixbuf
-, modemmanager
-, avahi
-, glib-networking
-, python3
-, wrapGAppsHook3
-, gobject-introspection
-, vala
-, withDemoAgent ? false
-}:
-
-stdenv.mkDerivation rec {
-  pname = "geoclue";
-  version = "2.7.0";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    owner = "geoclue";
-    repo = "geoclue";
-    rev = version;
-    hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc=";
-  };
-
-  patches = [
-    ./add-option-for-installation-sysconfdir.patch
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-    meson
-    ninja
-    wrapGAppsHook3
-    python3
-    vala
-    gobject-introspection
-    # devdoc
-    gtk-doc
-    docbook-xsl-nons
-    docbook_xml_dtd_412
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    mesonEmulatorHook
-  ];
-
-  buildInputs = [
-    glib
-    json-glib
-    libsoup_3
-    avahi
-  ] ++ lib.optionals withDemoAgent [
-    libnotify gdk-pixbuf
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    modemmanager
-  ];
-
-  propagatedBuildInputs = [
-    glib
-    glib-networking
-  ];
-
-  mesonFlags = [
-    "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
-    "-Ddemo-agent=${lib.boolToString withDemoAgent}"
-    "--sysconfdir=/etc"
-    "-Dsysconfdir_install=${placeholder "out"}/etc"
-    "-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c"
-    "-Ddbus-srv-user=geoclue"
-    "-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-D3g-source=false"
-    "-Dcdma-source=false"
-    "-Dmodem-gps-source=false"
-    "-Dnmea-source=false"
-  ];
-
-  postPatch = ''
-    chmod +x demo/install-file.py
-    patchShebangs demo/install-file.py
-  '';
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin && withDemoAgent;
-    description = "Geolocation framework and some data providers";
-    homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
-    maintainers = with maintainers; [ raskin mimame ];
-    platforms = with platforms; linux ++ darwin;
-    license = licenses.lgpl2Plus;
-  };
-}
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 0518a40c2930..2a69b5702172 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -19,7 +19,16 @@ stdenv.mkDerivation rec {
     # fix reproducibile output, in particular in the grub2 build
     # https://savannah.gnu.org/bugs/index.php?59658
     ./0001-msginit-Do-not-use-POT-Creation-Date.patch
-  ];
+  ]
+    # An accidental inclusion in https://marc.info/?l=glibc-alpha&m=150511271003225&w=2
+    # resulted in a getcwd prototype to be added in when it isn't needed.
+    # Clang does not like this unless the "overridable" attribute was appied.
+    # Since we don't need to redeclare getcwd, we can just remove it.
+    #
+    # Issue: https://github.com/NixOS/nixpkgs/issues/348658
+    # Fixed in https://github.com/autotools-mirror/gettext/commit/cb2c1486336462c8180f487221181ee798b0e73e
+    # Remove in 0.22.5 upgrade.
+    ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-getcwd-clang.patch;
 
   outputs = [ "out" "man" "doc" "info" ];
 
diff --git a/pkgs/development/libraries/gettext/fix-getcwd-clang.patch b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch
new file mode 100644
index 000000000000..ae253b3cd0ec
--- /dev/null
+++ b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch
@@ -0,0 +1,63 @@
+From cb2c1486336462c8180f487221181ee798b0e73e Mon Sep 17 00:00:00 2001
+From: Bruno Haible 
+Date: Thu, 9 Feb 2023 16:58:20 +0100
+Subject: [PATCH] Fix compilation errors with ISO C 23 compilers.
+
+* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the
+system header files.
+* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility.
+---
+ gettext-runtime/intl/dcigettext.c | 5 +----
+ gettext-runtime/intl/gettextP.h   | 7 +------
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
+index e7cb9b962..666a624b0 100644
+--- a/gettext-runtime/intl/dcigettext.c
++++ b/gettext-runtime/intl/dcigettext.c
+@@ -1,5 +1,5 @@
+ /* Implementation of the internal dcigettext function.
+-   Copyright (C) 1995-2020 Free Software Foundation, Inc.
++   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+@@ -139,13 +139,10 @@ extern int errno;
+ # define tfind __tfind
+ #else
+ # if !defined HAVE_GETCWD
+-char *getwd ();
+ #  define getcwd(buf, max) getwd (buf)
+ # else
+ #  if VMS
+ #   define getcwd(buf, max) (getcwd) (buf, max, 0)
+-#  else
+-char *getcwd ();
+ #  endif
+ # endif
+ # ifndef HAVE_STPCPY
+diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
+index bb00555ee..536e8bd43 100644
+--- a/gettext-runtime/intl/gettextP.h
++++ b/gettext-runtime/intl/gettextP.h
+@@ -1,5 +1,5 @@
+ /* Header describing internals of libintl library.
+-   Copyright (C) 1995-2020 Free Software Foundation, Inc.
++   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+    Written by Ulrich Drepper , 1995.
+ 
+    This program is free software: you can redistribute it and/or modify
+@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname,
+ # define SWAP(i) bswap_32 (i)
+ #else
+ static inline nls_uint32
+-# ifdef __cplusplus
+ SWAP (nls_uint32 i)
+-# else
+-SWAP (i)
+-     nls_uint32 i;
+-# endif
+ {
+   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
+ }
+
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
deleted file mode 100644
index b6cae32e92f8..000000000000
--- a/pkgs/development/libraries/gjs/default.nix
+++ /dev/null
@@ -1,153 +0,0 @@
-{ fetchurl
-, lib
-, stdenv
-, meson
-, mesonEmulatorHook
-, ninja
-, pkg-config
-, gnome
-, gtk3
-, atk
-, gobject-introspection
-, spidermonkey_115
-, pango
-, cairo
-, readline
-, libsysprof-capture
-, glib
-, libxml2
-, dbus
-, gdk-pixbuf
-, harfbuzz
-, makeWrapper
-, which
-, xvfb-run
-, nixosTests
-, installTests ? true
-}:
-
-let
-  testDeps = [
-    gtk3 atk pango.out gdk-pixbuf harfbuzz glib.out
-  ];
-in stdenv.mkDerivation (finalAttrs: {
-  pname = "gjs";
-  version = "1.80.2";
-
-  outputs = [ "out" "dev" "installedTests" ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-E145xaxZEJYjPlV8/ld9ZAk/UFRBHUfLLiFLrX1Bmb0=";
-  };
-
-  patches = [
-    # Hard-code various paths
-    ./fix-paths.patch
-
-    # Allow installing installed tests to a separate output.
-    ./installed-tests-path.patch
-
-    # Disable introspection test in installed tests
-    # (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1)
-    ./disable-introspection-test.patch
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    makeWrapper
-    which # for locale detection
-    libxml2 # for xml-stripblanks
-    dbus # for dbus-run-session
-    gobject-introspection
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    mesonEmulatorHook
-  ];
-
-  buildInputs = [
-    cairo
-    readline
-    libsysprof-capture
-    spidermonkey_115
-  ];
-
-  nativeCheckInputs = [
-    xvfb-run
-  ] ++ testDeps;
-
-  propagatedBuildInputs = [
-    glib
-  ];
-
-  mesonFlags = [
-    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [
-    "-Dprofiler=disabled"
-  ];
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  postPatch = ''
-    patchShebangs build/choose-tests-locale.sh
-    substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
-  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
-    substituteInPlace installed-tests/js/meson.build \
-      --replace "'Encoding'," "#'Encoding',"
-  '';
-
-  preCheck = ''
-    # Our gobject-introspection patches make the shared library paths absolute
-    # in the GIR files. When running tests, the library is not yet installed,
-    # though, so we need to replace the absolute path with a local one during build.
-    # We are using a symlink that will be overridden during installation.
-    mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
-    ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
-    ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
-    ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so
-    ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
-    ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
-  '';
-
-  postInstall = ''
-    # TODO: make the glib setup hook handle moving the schemas in other outputs.
-    installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/gjs-${finalAttrs.version}"
-    mkdir -p "$installedTestsSchemaDatadir"
-    mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir"
-  '';
-
-  postFixup = lib.optionalString installTests ''
-    wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \
-      --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
-      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}"
-  '';
-
-  checkPhase = ''
-    runHook preCheck
-    xvfb-run -s '-screen 0 800x600x24' \
-      meson test --print-errorlogs
-    runHook postCheck
-  '';
-
-  separateDebugInfo = stdenv.hostPlatform.isLinux;
-
-  passthru = {
-    tests = {
-      installed-tests = nixosTests.installed-tests.gjs;
-    };
-
-    updateScript = gnome.updateScript {
-      packageName = "gjs";
-      versionPolicy = "odd-unstable";
-    };
-  };
-
-  meta = with lib; {
-    description = "JavaScript bindings for GNOME";
-    homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
-    license = licenses.lgpl2Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch
deleted file mode 100644
index 09cd8eaff434..000000000000
--- a/pkgs/development/libraries/gjs/installed-tests-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/installed-tests/meson.build b/installed-tests/meson.build
-index 04c7910f..9647908c 100644
---- a/installed-tests/meson.build
-+++ b/installed-tests/meson.build
-@@ -1,7 +1,7 @@
- ### Installed tests ############################################################
- 
--installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name()
--installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
-+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
-+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
- 
- # Simple shell script tests #
- 
-diff --git a/meson.build b/meson.build
-index 9ab29475..42ffe07f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp',
-     install_dir: get_option('datadir') / api_name / 'lsan')
- 
- if get_option('installed_tests')
--    schemadir = abs_datadir / 'glib-2.0' / 'schemas'
-+    schemadir = get_option('installed_test_prefix') / 'share' / 'glib-2.0' / 'schemas'
-     install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir)
-     meson.add_install_script('build/compile-gschemas.py', schemadir)
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index 825ba77a..21f0323c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
-     description: 'Skip tests that need a display connection')
- option('verbose_logs', type: 'boolean', value: false,
-     description: 'Enable extra log messages that may decrease performance (not allowed in release builds)')
-+option('installed_test_prefix', type: 'string', value: '',
-+    description: 'Prefix for installed tests')
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index f44b6385b8f1..d12b1be1b5b4 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -2,7 +2,6 @@
 , lib
 , stdenv
 , fetchurl
-, fetchpatch
 , gettext
 , meson
 , ninja
@@ -23,6 +22,8 @@
 , makeHardcodeGsettingsPatch
 , testers
 , gobject-introspection
+, libsystemtap
+, libsysprof-capture
 , mesonEmulatorHook
 , withIntrospection ?
   stdenv.hostPlatform.emulatorAvailable buildPackages &&
@@ -33,19 +34,6 @@
 assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null;
 
 let
-  # Some packages don't get "Cflags" from pkg-config correctly
-  # and then fail to build when directly including like .
-  # This is intended to be run in postInstall of any package
-  # which has $out/include/ containing just some disjunct directories.
-  flattenInclude = ''
-    for dir in "''${!outputInclude}"/include/*; do
-      cp -r "$dir"/* "''${!outputInclude}/include/"
-      rm -r "$dir"
-      ln -s . "$dir"
-    done
-    ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
-  '';
-
   gobject-introspection' = buildPackages.gobject-introspection.override {
     propagateFullGlib = false;
     # Avoid introducing cairo, which enables gobjectSupport by default.
@@ -57,24 +45,25 @@ let
                   else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a"
                   else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll"
                   else "2.0-0.lib";
+
+  systemtap' = buildPackages.linuxPackages.systemtap.override { withStap = false; };
+  withDtrace =
+    lib.meta.availableOn stdenv.buildPlatform systemtap' &&
+    # dtrace support requires sys/sdt.h header
+    lib.meta.availableOn stdenv.hostPlatform libsystemtap;
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.80.4";
+  version = "2.82.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08=";
+    hash = "sha256-R4Y0RAv1LuTsRCjVWHhzmMC+awQ8UhvrMIM0s9tEiaY=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
     ./darwin-compilation.patch
-    # FIXME: remove when https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4088 is merged and is in the tagged release
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/glib/-/commit/9d0988ca62ee96e09aa76abbd65ff192cfce6858.patch";
-      hash = "sha256-JrR3Ba6L+3M0Nt8DgHmPG8uKtx7hOgUp7np08ATIzjA=";
-    })
   ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     ./quark_init_on_demand.patch
     ./gobject_init_on_demand.patch
@@ -99,9 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
 
     # GLib contains many binaries used for different purposes;
     # we will install them to different outputs:
-    # 1. Tools for desktop environment ($bin)
+    # 1. Tools for desktop environment and introspection ($bin)
     #    * gapplication (non-darwin)
     #    * gdbus
+    #    * gi-compile-repository
+    #    * gi-decompile-typelib
+    #    * gi-inspect-typelib
     #    * gio
     #    * gio-launch-desktop (symlink to $out)
     #    * gsettings
@@ -126,9 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     # and by default meson installs in to $out/share/gdb/auto-load
     # which does not help
     ./gdb_script.patch
-
-    # glib assumes that `RTLD_LOCAL` is defined to `0`, which is true on Linux and FreeBSD but not on Darwin.
-    ./gmodule-rtld_local.patch
   ];
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
@@ -137,11 +126,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     finalAttrs.setupHook
+    libsysprof-capture
     pcre2
   ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
     bash gnum4 # install glib-gettextize and m4 macros for other apps to use
   ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
     elfutils
+  ] ++ lib.optionals withDtrace [
+    libsystemtap
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     libselinux
     util-linuxMinimal # for libmount
@@ -171,12 +163,17 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection'
   ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     mesonEmulatorHook
+  ] ++ lib.optionals withDtrace [
+    systemtap' # for dtrace
   ];
 
   propagatedBuildInputs = [ zlib libffi gettext libiconv ];
 
   mesonFlags = [
+    "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315
     "-Ddocumentation=true" # gvariant specification can be built without gi-docgen
+    (lib.mesonEnable "dtrace" withDtrace)
+    (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled
     "-Dnls=enabled"
     "-Ddevbindir=${placeholder "dev"}/bin"
     (lib.mesonEnable "introspection" withIntrospection)
@@ -306,7 +303,6 @@ stdenv.mkDerivation (finalAttrs: {
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
 
-    inherit flattenInclude;
     updateScript = gnome.updateScript {
       packageName = "glib";
       versionPolicy = "odd-unstable";
diff --git a/pkgs/development/libraries/glib/gmodule-rtld_local.patch b/pkgs/development/libraries/glib/gmodule-rtld_local.patch
deleted file mode 100644
index abbf19d70b20..000000000000
--- a/pkgs/development/libraries/glib/gmodule-rtld_local.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index 6d1c5fab7..b21773bca 100644
---- a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -136,7 +136,7 @@ _g_module_open (const gchar *file_name,
-   
-   lock_dlerror ();
-   handle = dlopen (file_name,
--		   (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
-+		   (bind_local ? RTLD_LOCAL : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
-   if (!handle)
-     {
-       const gchar *message = fetch_dlerror (TRUE);
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch
index b32fccb8379f..078fc6a7f342 100644
--- a/pkgs/development/libraries/glib/split-dev-programs.patch
+++ b/pkgs/development/libraries/glib/split-dev-programs.patch
@@ -183,10 +183,10 @@ index 2129aaf8a..da8462428 100644
    install_tag : 'bin-devel',
    dependencies : [libglib_dep, libgobject_dep])
  
-diff --git a/meson_options.txt b/meson_options.txt
+diff --git a/meson.options b/meson.options
 index 69a2135bc..cfe14bb09 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
+--- a/meson.options
++++ b/meson.options
 @@ -4,6 +4,11 @@ option('runtime_libdir',
         description : 'install runtime libraries relative to libdir',
         deprecated: true)
diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix
index 7662e5f7f190..0427280fcc42 100644
--- a/pkgs/development/libraries/glibmm/2.68.nix
+++ b/pkgs/development/libraries/glibmm/2.68.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glibmm";
-  version = "2.80.0";
+  version = "2.82.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-U5sKKeFalmdsTwWUVBJQVmxcpE2l1Nh6NzL6LQeQnko=";
+    hash = "sha256-OGhM/zFyc2FcZ7j6mAbxYpnVHlUG2bkJuuFbWJ+pnLY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix
deleted file mode 100644
index d565b6ab79c4..000000000000
--- a/pkgs/development/libraries/gnome-desktop/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, substituteAll
-, pkg-config
-, libxslt
-, ninja
-, gnome
-, gtk3
-, gtk4
-, glib
-, gettext
-, libxml2
-, xkeyboard_config
-, libxkbcommon
-, isocodes
-, meson
-, wayland
-, libseccomp
-, systemd
-, udev
-, bubblewrap
-, gobject-introspection
-, gtk-doc
-, docbook-xsl-nons
-, gsettings-desktop-schemas
-, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-desktop";
-  version = "44.0";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-QsdzdF2EuhS8HPHExvRgYUiAOlzTN5QcY5ZHlfPFnUI=";
-  };
-
-  patches = lib.optionals stdenv.hostPlatform.isLinux [
-    (substituteAll {
-      src = ./bubblewrap-paths.patch;
-      bubblewrap_bin = "${bubblewrap}/bin/bwrap";
-      inherit (builtins) storeDir;
-    })
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    meson
-    ninja
-    gettext
-    libxslt
-    libxml2
-    gobject-introspection
-    gtk-doc
-    docbook-xsl-nons
-    glib
-  ];
-
-  buildInputs = [
-    xkeyboard_config
-    libxkbcommon # for xkbregistry
-    isocodes
-    gtk3
-    gtk4
-    glib
-  ] ++ lib.optionals withSystemd [
-    systemd
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    bubblewrap
-    wayland
-    libseccomp
-    udev
-  ];
-
-  propagatedBuildInputs = [
-    gsettings-desktop-schemas
-  ];
-
-  mesonFlags = [
-    "-Dgtk_doc=true"
-    "-Ddesktop_docs=false"
-    (lib.mesonEnable "systemd" withSystemd)
-  ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-    "-Dudev=disabled"
-  ];
-
-  separateDebugInfo = stdenv.hostPlatform.isLinux;
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-desktop";
-    };
-  };
-
-  meta = with lib; {
-    description = "Library with common API for various GNOME modules";
-    homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop";
-    license = with licenses; [ gpl2Plus lgpl2Plus ];
-    platforms = platforms.unix;
-    maintainers = teams.gnome.members;
-  };
-}
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
deleted file mode 100644
index 8a1773612f2d..000000000000
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, pkg-config
-, vala
-, glib
-, meson
-, ninja
-, libxslt
-, gtk4
-, enableBackend ? stdenv.hostPlatform.isLinux
-, json-glib
-, libadwaita
-, librest_1_0
-, libxml2
-, libsecret
-, gtk-doc
-, gobject-introspection
-, gettext
-, glib-networking
-, libsoup_3
-, docbook-xsl-nons
-, docbook_xml_dtd_412
-, gnome
-, gcr_4
-, libkrb5
-, gvfs
-, dbus
-, wrapGAppsHook4
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gnome-online-accounts";
-  version = "3.50.4";
-
-  outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MMoTA4zXpp1bay1TZD+6ZUjRcSuSXwwhbzEzw2y/d3M=";
-  };
-
-  mesonFlags = [
-    "-Dfedora=false" # not useful in NixOS or for NixOS users.
-    "-Dgoabackend=${lib.boolToString enableBackend}"
-    "-Dgtk_doc=${lib.boolToString enableBackend}"
-    "-Dman=${lib.boolToString enableBackend}"
-    "-Dwebdav=true"
-  ];
-
-  nativeBuildInputs = [
-    dbus # used for checks and pkg-config to install dbus service/s
-    docbook_xml_dtd_412
-    docbook-xsl-nons
-    gettext
-    gobject-introspection
-    gtk-doc
-    libxslt
-    meson
-    ninja
-    pkg-config
-    vala
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    gcr_4
-    glib
-    glib-networking
-    gtk4
-    libadwaita
-    gvfs # OwnCloud, Google Drive
-    json-glib
-    libkrb5
-    librest_1_0
-    libxml2
-    libsecret
-    libsoup_3
-  ];
-
-  separateDebugInfo = true;
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      versionPolicy = "odd-unstable";
-      packageName = "gnome-online-accounts";
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://gitlab.gnome.org/GNOME/gnome-online-accounts";
-    description = "Single sign-on framework for GNOME";
-    platforms = platforms.unix;
-    license = licenses.lgpl2Plus;
-    maintainers = teams.gnome.members;
-  };
-})
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index a76764a49a91..925db88c9d01 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -40,7 +40,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gobject-introspection";
-  version = "1.80.1";
+  version = "1.82.0";
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz";
-    hash = "sha256-od98Qk4VvaGrY5wA6QUbmt9c6hqeUS+KYDtTzRmbxtg=";
+    hash = "sha256-D1pMGQhCS/JrxB6TYRaMNjaFCA+9uHoZbIkchAHKLwk=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
deleted file mode 100644
index aa449b86e795..000000000000
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ lib, stdenv
-, fetchurl
-, substituteAll
-, meson
-, ninja
-, pkg-config
-, gettext
-, gperf
-, glib
-, sqlite
-, libarchive
-, libdmapsharing
-, libsoup_3
-, gnome
-, libxml2
-, lua5_4
-, liboauth
-, libmediaart
-, grilo
-, gst_all_1
-, gnome-online-accounts
-, gmime
-, gom
-, json-glib
-, avahi
-, tracker
-, dleyna-server
-, itstool
-, totem-pl-parser
-}:
-
-stdenv.mkDerivation rec {
-  pname = "grilo-plugins";
-  version = "0.3.16";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs=";
-  };
-
-  patches = [
-    # grl-chromaprint requires the following GStreamer elements:
-    # * fakesink (gstreamer)
-    # * playbin (gst-plugins-base)
-    # * chromaprint (gst-plugins-bad)
-    (substituteAll {
-      src = ./chromaprint-gst-plugins.patch;
-      load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
-        gstreamer
-        gst-plugins-base
-        gst-plugins-bad
-      ]);
-    })
-  ];
-
-  strictDeps = true;
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gettext
-    itstool
-    gperf # for lua-factory
-    glib # glib-compile-resources
-  ];
-
-  buildInputs = [
-    grilo
-    libxml2
-    # libgdata
-    lua5_4
-    liboauth
-    sqlite
-    gnome-online-accounts
-    totem-pl-parser
-    libarchive
-    libdmapsharing
-    libsoup_3
-    gmime
-    gom
-    json-glib
-    avahi
-    libmediaart
-    tracker
-    dleyna-server
-    gst_all_1.gstreamer
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-      versionPolicy = "none";
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins";
-    description = "Collection of plugins for the Grilo framework";
-    maintainers = teams.gnome.members;
-    license = licenses.lgpl21Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 948048895700..1dd516ec99cf 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -19,11 +19,19 @@
 , arrow-cpp
 }:
 
+# This package should be updated together with all related python grpc packages
+# to ensure compatibility.
+# nixpkgs-update: no auto update
 stdenv.mkDerivation rec {
   pname = "grpc";
   version = "1.66.1"; # N.B: if you change this, please update:
-    # pythonPackages.grpcio-tools
+    # pythonPackages.grpcio
+    # pythonPackages.grpcio-channelz
+    # pythonPackages.grpcio-health-checking
+    # pythonPackages.grpcio-reflection
     # pythonPackages.grpcio-status
+    # pythonPackages.grpcio-testing
+    # pythonPackages.grpcio-tools
 
   src = fetchFromGitHub {
     owner = "grpc";
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
deleted file mode 100644
index c33011f4b01d..000000000000
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ lib, stdenv
-, fetchurl
-, pkg-config
-, glib
-, gobject-introspection
-, buildPackages
-, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
-, meson
-, ninja
-  # just for passthru
-, gnome
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gsettings-desktop-schemas";
-  version = "46.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-STpGoRYbY4jVeqcvYyp5zpbELV/70dCwD0luxYdvhXU=";
-  };
-
-  strictDeps = true;
-  depsBuildBuild = [ pkg-config ];
-  nativeBuildInputs = [
-    glib
-    meson
-    ninja
-    pkg-config
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
-  ];
-
-  mesonFlags = [
-    (lib.mesonBool "introspection" withIntrospection)
-  ];
-
-  preInstall = ''
-    # Meson installs the schemas to share/glib-2.0/schemas
-    # We add the override file there too so it will be compiled and later moved by
-    # glib's setup hook.
-    mkdir -p $out/share/glib-2.0/schemas
-    cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF
-      # These paths are supposed to refer to gnome-backgrounds
-      # but since we do not use FHS, they are broken.
-      # And we do not want to hardcode the correct paths
-      # since then every GTK app would pull in gnome-backgrounds.
-      # Let’s just override the broken paths so that people are not confused.
-      [org.gnome.desktop.background]
-      picture-uri='''
-      picture-uri-dark='''
-
-      [org.gnome.desktop.screensaver]
-      picture-uri='''
-    EOF
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas";
-    description = "Collection of GSettings schemas for settings shared by various components of a desktop";
-    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members;
-  };
-}
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
deleted file mode 100644
index 5905fdff7e48..000000000000
--- a/pkgs/development/libraries/gsm/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchurl
-, # Compile statically (support for packages that look for the static object)
-  staticSupport ? stdenv.hostPlatform.isStatic
-}:
-
-let
-  inherit (stdenv.hostPlatform) isDarwin;
-  inherit (lib) optional optionalString;
-in
-
-stdenv.mkDerivation rec {
-  pname = "gsm";
-  version = "1.0.22";
-
-  src = fetchurl {
-    url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz";
-    sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw=";
-  };
-
-  patchPhase = ''
-    substituteInPlace Makefile \
-      --replace "= gcc " "?= gcc "
-    # Fix include directory
-    sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
-  '' + optionalString (!staticSupport) (
-    (if isDarwin then  ''
-      # Build dylib on Darwin
-      sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile
-      sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile
-    '' else ''
-      # Build ELF shared object by default
-      sed -e 's,libgsm.a,libgsm.so,' -i Makefile
-      sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
-    '') + ''
-      # Remove line that is unused when building shared libraries
-      sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
-    ''
-  );
-
-  makeFlags = [
-    "SHELL=${stdenv.shell}"
-    "INSTALL_ROOT=$(out)"
-  ] ++ optional stdenv.cc.isClang "CC=clang";
-
-  preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}";
-
-  parallelBuild = false;
-
-  meta = with lib; {
-    description = "Lossy speech compression codec";
-    homepage    = "https://www.quut.com/gsm/";
-    license     = licenses.bsd2;
-    maintainers = with maintainers; [ codyopel raskin ];
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch
deleted file mode 100644
index 6200dca189f8..000000000000
--- a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d6dd1c286eb57fbf968510318cafc94888b98de Mon Sep 17 00:00:00 2001
-From: OPNA2608 
-Date: Sun, 13 Jun 2021 21:56:03 +0200
-Subject: [PATCH] Darwin build fix
-
----
- gspell/Makefile.am | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/gspell/Makefile.am b/gspell/Makefile.am
-index 69ee421..7c58973 100644
---- a/gspell/Makefile.am
-+++ b/gspell/Makefile.am
-@@ -161,6 +162,12 @@ gspell_private_headers += \
- gspell_private_c_files += \
- 	gspell-osx.c
- 
-+libgspell_core_la_CFLAGS += \
-+	-xobjective-c
-+
-+libgspell_core_la_LDFLAGS += \
-+	-framework Cocoa
-+
- endif # OS_OSX
- 
- if HAVE_INTROSPECTION
--- 
-2.29.3
-
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
deleted file mode 100644
index 3e3ca2d59135..000000000000
--- a/pkgs/development/libraries/gspell/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv
-, lib
-, buildPackages
-, fetchurl
-, pkg-config
-, libxml2
-, autoreconfHook
-, gtk-doc
-, glib
-, gtk3
-, enchant2
-, icu
-, vala
-, gobject-introspection
-, gnome
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gspell";
-  version = "1.12.2";
-
-  outputs = [ "out" "dev" ];
-  outputBin = "dev";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "tOmTvYJ+TOtqdwsbXolQ/OO+nIsrDL6yL9+ZKAjdITk=";
-  };
-
-  patches = [
-    # Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149
-    # Dropped the GTK_MAC_* changes since gtk-mac-integration is not needed since 1.12.1
-    ./0001-Darwin-build-fix.patch
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    vala
-    gobject-introspection
-    libxml2
-    autoreconfHook
-    gtk-doc
-    glib
-  ];
-
-  buildInputs = [
-    gtk3
-    icu
-    vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN)
-  ];
-
-  propagatedBuildInputs = [
-    # required for pkg-config
-    enchant2
-  ];
-
-  configureFlags = [
-    "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
-    "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums"
-    "PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen"
-    "--enable-introspection=yes"
-    "--enable-vala=yes"
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-      versionPolicy = "none";
-    };
-  };
-
-  meta = with lib; {
-    description = "Spell-checking library for GTK applications";
-    mainProgram = "gspell-app1";
-    homepage = "https://gitlab.gnome.org/GNOME/gspell";
-    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index c42b6f958092..e353edd59333 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -12,6 +12,8 @@
 , glib
 , gnome
 , gssdp-tools
+, buildPackages
+, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -36,10 +38,12 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
+    glib
+    python3
+  ] ++ lib.optionals withIntrospection [
     gobject-introspection
     vala
     gi-docgen
-    python3
   ];
 
   buildInputs = [
@@ -51,8 +55,10 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
     "-Dsniffer=false"
+    (lib.mesonBool "gtk_doc" withIntrospection)
+    (lib.mesonBool "introspection" withIntrospection)
+    (lib.mesonBool "vapi" withIntrospection)
   ];
 
   # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 487f6659051e..26a708546bb0 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -32,6 +32,9 @@
 , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
 }:
 
+let
+  hasElfutils = lib.meta.availableOn stdenv.hostPlatform elfutils;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer";
   version = "1.24.7";
@@ -81,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     bash-completion
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     libcap
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+  ] ++ lib.optionals hasElfutils [
     elfutils
   ] ++ lib.optionals withLibunwind [
     libunwind
@@ -102,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "introspection" withIntrospection)
     (lib.mesonEnable "doc" enableDocumentation)
     (lib.mesonEnable "libunwind" withLibunwind)
-    (lib.mesonEnable "libdw" withLibunwind)
+    (lib.mesonEnable "libdw" (withLibunwind && hasElfutils))
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index df6c944de8d7..786f449054bc 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -61,6 +61,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs \
       scripts/extract-release-date-from-doap-file.py
+
+    # Hack for https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3800
+    substituteInPlace ges/ges-frame-composition-meta.c \
+      --replace-fail "GstFrameCompositionApi" "GESFrameCompositionApi"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix
deleted file mode 100644
index 69af8b31872e..000000000000
--- a/pkgs/development/libraries/gtk-frdp/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, meson
-, ninja
-, pkg-config
-, vala
-, gobject-introspection
-, glib
-, gtk3
-, freerdp3
-, fuse3
-, unstableGitUpdater
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gtk-frdp";
-  version = "3.37.1-unstable-2024-03-01";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = pname;
-    rev = "11e9fcbee8ca5ec70456dd5b616b2560d7f73adc";
-    sha256 = "2e/bAZFRTbBU4ZfgMFHiN9JwVm4qXSRtirPvbC3oT5s=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    vala
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-    gtk3
-    freerdp3
-    fuse3
-  ];
-
-  passthru = {
-    updateScript = unstableGitUpdater {
-      tagPrefix = "v";
-    };
-  };
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DTARGET_OS_IPHONE=0"
-    "-DTARGET_OS_WATCH=0"
-  ]);
-
-  meta = with lib; {
-    homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp";
-    description = "RDP viewer widget for GTK";
-    maintainers = teams.gnome.members;
-    license = licenses.lgpl3Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 7f3717c8a525..984ab02bf645 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -34,7 +34,7 @@
 , gsettings-desktop-schemas
 , sassc
 , trackerSupport ? stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform)
-, tracker
+, tinysparql
 , x11Support ? stdenv.hostPlatform.isLinux
 , waylandSupport ? stdenv.hostPlatform.isLinux
 , libGL
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     AppKit
   ] ++ lib.optionals trackerSupport [
-    tracker
+    tinysparql
   ];
   #TODO: colord?
 
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index 8b3ef020bd28..8a79a06560fc 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -4,6 +4,7 @@
 , substituteAll
 , fetchurl
 , pkg-config
+, docutils
 , gettext
 , graphene
 , gi-docgen
@@ -33,11 +34,10 @@
 , gst_all_1
 , sassc
 , trackerSupport ? stdenv.hostPlatform.isLinux
-, tracker
+, tinysparql
 , x11Support ? stdenv.hostPlatform.isLinux
 , waylandSupport ? stdenv.hostPlatform.isLinux
 , libGL
-# experimental and can cause crashes in inspector
 , vulkanSupport ? stdenv.hostPlatform.isLinux
 , shaderc
 , vulkan-loader
@@ -50,11 +50,12 @@
 , cupsSupport ? stdenv.hostPlatform.isLinux
 , compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
 , cups
-, AppKit
-, Cocoa
 , libexecinfo
 , broadwaySupport ? true
 , testers
+, apple-sdk
+, apple-sdk_10_15
+, darwinMinVersionHook
 }:
 
 let
@@ -69,7 +70,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4";
-  version = "4.14.5";
+  version = "4.16.3";
 
   outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
   outputBin = "dev";
@@ -81,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-    hash = "sha256-VUfyufAGsTOZPgcLh8F4BOBR79o5E/6soRCPor5B4k0=";
+    hash = "sha256-LsU+B9GMnwA7OeSmqDgFTZJZ4Ei2xMBdgMDQWqch2UQ=";
   };
 
   depsBuildBuild = [
@@ -89,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    docutils # for rst2man, rst2html5
     gettext
     gobject-introspection
     makeWrapper
@@ -130,10 +132,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXi
     libXrandr
     libXrender
-  ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AppKit
-  ] ++ lib.optionals trackerSupport [
-    tracker
+  ]) ++ lib.optionals trackerSupport [
+    tinysparql
   ] ++ lib.optionals waylandSupport [
     libGL
     wayland
@@ -142,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXinerama
   ] ++ lib.optionals cupsSupport [
     cups
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
   ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     libexecinfo
   ];
@@ -164,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
     # Required for GSettings schemas at runtime.
     # Will be picked up by wrapGAppsHook4.
     gsettings-desktop-schemas
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (darwinMinVersionHook "10.15")
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin
+                   && lib.versionOlder apple-sdk.version "10.15") [
+      apple-sdk_10_15
   ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix
deleted file mode 100644
index 14df22925dc0..000000000000
--- a/pkgs/development/libraries/gtk4-layer-shell/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_43
-, wayland-protocols
-, wayland-scanner
-, wayland
-, gtk4
-, gobject-introspection
-, vala
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gtk4-layer-shell";
-  version = "1.0.3";
-
-  outputs = [ "out" "dev" "devdoc" ];
-  outputBin = "devdoc";
-
-  src = fetchFromGitHub {
-    owner = "wmww";
-    repo = "gtk4-layer-shell";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI=";
-  };
-
-  strictDeps = true;
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gobject-introspection
-    gtk-doc
-    docbook-xsl-nons
-    docbook_xml_dtd_43
-    vala
-    wayland-scanner
-    wayland-protocols
-  ];
-
-  buildInputs = [
-    wayland
-    gtk4
-  ];
-
-  mesonFlags = [
-    "-Ddocs=true"
-    "-Dexamples=true"
-  ];
-
-  meta = with lib; {
-    description = "Library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4";
-    mainProgram = "gtk4-layer-demo";
-    license = licenses.mit;
-    maintainers = with maintainers; [ donovanglover ];
-    platforms = platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix
index 64ec9e9ac2c9..c1b0be342f80 100644
--- a/pkgs/development/libraries/gtkmm/4.x.nix
+++ b/pkgs/development/libraries/gtkmm/4.x.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkmm";
-  version = "4.14.0";
+  version = "4.16.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-k1CgREt0TKPcaVhuvRtnB1IJIrbZ9PIyEDzmA6Jx7No=";
+    hash = "sha256-OyP9Or+PsiOwDpmDtgEK8tuA44yJq2mUuLYjCqhdYPk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index a57881ff5532..e034bff9e576 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtksourceview";
-  version = "5.12.1";
+  version = "5.14.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
-    hash = "sha256-hMgqrZhcWq2ufOp4BJBKdjQeyCsmjUZZTBpHjzm0LB8=";
+    hash = "sha256-AJhi6HuSnaWnJOzgefAfjO4p50eXoeysNJ9YwVo8vFg=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix
index 9d90624aae6d..46714e2e25bd 100644
--- a/pkgs/development/libraries/gupnp/1.6.nix
+++ b/pkgs/development/libraries/gupnp/1.6.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gupnp";
-  version = "1.6.6";
+  version = "1.6.7";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-ydxQ6MeLN5LRsObFxfUsk+k0XT2uKJHjEamTpXT1oE8=";
+    hash = "sha256-SmHYpainJw5gzpz+lmHMT6Mm8EWmVxjS64/2iv2++AU=";
   };
 
   depsBuildBuild = [
@@ -51,6 +51,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  mesonCheckFlags = [
+    # The service-proxy test takes 28s on ofborg, which is too close to the time limit.
+    "--timeout-multiplier" "2"
+  ];
+
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     moveToOutput "share/doc" "$devdoc"
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
deleted file mode 100644
index 3e75bdecaecd..000000000000
--- a/pkgs/development/libraries/gusb/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, substituteAll
-, meson
-, ninja
-, pkg-config
-, gobject-introspection
-, gi-docgen
-, python3
-, glib
-, libusb1
-, json-glib
-, vala
-, hwdata
-, umockdev
-}:
-
-let
-  pythonEnv = python3.pythonOnBuildForHost.withPackages (ps: with ps; [
-    setuptools
-  ]);
-in
-stdenv.mkDerivation rec {
-  pname = "gusb";
-  version = "0.4.9";
-
-  outputs = [ "bin" "out" "dev" "devdoc" ];
-
-  src = fetchFromGitHub {
-    owner = "hughsie";
-    repo = "libgusb";
-    rev = "refs/tags/${version}";
-    hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs=";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./fix-python-path.patch;
-      python = "${pythonEnv}/bin/python3";
-    })
-  ];
-
-  strictDeps = true;
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gobject-introspection
-    gi-docgen
-    vala
-  ];
-
-  # all required in gusb.pc
-  propagatedBuildInputs = [
-    glib
-    libusb1
-    json-glib
-  ];
-
-  mesonFlags = [
-    (lib.mesonBool "tests" doCheck)
-    (lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids")
-  ];
-
-  checkInputs = [
-    umockdev
-  ];
-
-  doCheck = false; # tests try to access USB
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  meta = with lib; {
-    description = "GLib libusb wrapper";
-    mainProgram = "gusbcmd";
-    homepage = "https://github.com/hughsie/libgusb";
-    license = licenses.lgpl21;
-    maintainers = [ maintainers.marcweber ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
deleted file mode 100644
index 4b4da283dd89..000000000000
--- a/pkgs/development/libraries/gvfs/default.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, substituteAll
-, gettext
-, dbus
-, glib
-, udevSupport ? stdenv.hostPlatform.isLinux
-, libgudev
-, udisks2
-, libgcrypt
-, libcap
-, polkit
-, libgphoto2
-, avahi
-, libarchive
-, fuse3
-, libcdio
-, libxml2
-, libsoup_3
-, libxslt
-, docbook_xsl
-, docbook_xml_dtd_42
-, samba
-, libmtp
-, gnomeSupport ? false
-, gnome
-, gcr_4
-, glib-networking
-, gnome-online-accounts
-, wrapGAppsHook3
-, libimobiledevice
-, libbluray
-, libcdio-paranoia
-, libnfs
-, openssh
-, libsecret
-, libgdata
-, libmsgraph
-, python3
-, gsettings-desktop-schemas
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gvfs";
-  version = "1.54.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VJCPThC18cIx6QMwyMFbfyHyu2EPGUwDSzOON5xQjjw=";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./hardcode-ssh-path.patch;
-      ssh_program = "${lib.getBin openssh}/bin/ssh";
-    })
-  ];
-
-  postPatch = ''
-    patchShebangs test
-  '';
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    python3
-    pkg-config
-    gettext
-    wrapGAppsHook3
-    libxslt
-    docbook_xsl
-    docbook_xml_dtd_42
-  ];
-
-  buildInputs = [
-    glib
-    libgcrypt
-    dbus
-    libgphoto2
-    avahi
-    libarchive
-    libimobiledevice
-    libbluray
-    libnfs
-    libxml2
-    gsettings-desktop-schemas
-    libsoup_3
-  ] ++ lib.optionals udevSupport [
-    libgudev
-    udisks2
-    fuse3
-    libcdio
-    samba
-    libmtp
-    libcap
-    polkit
-    libcdio-paranoia
-  ] ++ lib.optionals gnomeSupport [
-    gcr_4
-    glib-networking # TLS support
-    gnome-online-accounts
-    libsecret
-    libgdata
-    libmsgraph
-  ];
-
-  mesonFlags = [
-    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
-    "-Dtmpfilesdir=no"
-  ] ++ lib.optionals (!udevSupport) [
-    "-Dgudev=false"
-    "-Dudisks2=false"
-    "-Dfuse=false"
-    "-Dcdda=false"
-    "-Dsmb=false"
-    "-Dmtp=false"
-    "-Dadmin=false"
-    "-Dgphoto2=false"
-    "-Dlibusb=false"
-    "-Dlogind=false"
-  ] ++ lib.optionals (!gnomeSupport) [
-    "-Dgcr=false"
-    "-Dgoa=false"
-    "-Dkeyring=false"
-    "-Dgoogle=false"
-    "-Donedrive=false"
-  ] ++ lib.optionals (avahi == null) [
-    "-Ddnssd=false"
-  ] ++ lib.optionals (samba == null) [
-    # Xfce don't want samba
-    "-Dsmb=false"
-  ];
-
-  doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
-  doInstallCheck = finalAttrs.finalPackage.doCheck;
-
-  separateDebugInfo = true;
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gvfs";
-      versionPolicy = "odd-unstable";
-    };
-  };
-
-  meta = with lib; {
-    description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-    maintainers = teams.gnome.members;
-  };
-})
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index c85790408bdd..d31e57b6c228 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hivex";
-  version = "1.3.23";
+  version = "1.3.24";
 
   src = fetchurl {
     url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz";
-    hash = "sha256-QM9UhPFclGciWfs7makL7285DmPzelKhwGgIogFqa70=";
+    hash = "sha256-pS+kXOzJp4rbLShgXWgmHk8f1FFKd4pUcwE9LMyKGTw=";
   };
 
   patches = [ ./hivex-syms.patch ];
diff --git a/pkgs/development/libraries/intel-vaapi-driver/default.nix b/pkgs/development/libraries/intel-vaapi-driver/default.nix
deleted file mode 100644
index 9f9e2f2bbd40..000000000000
--- a/pkgs/development/libraries/intel-vaapi-driver/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, autoreconfHook, gnum4, pkg-config, python3, wayland-scanner
-, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
-, enableHybridCodec ? false, vaapi-intel-hybrid
-, enableGui ? true
-}:
-
-stdenv.mkDerivation rec {
-  pname = "intel-vaapi-driver";
-  version = "2.4.1";
-
-  src = fetchFromGitHub {
-    owner  = "intel";
-    repo   = "intel-vaapi-driver";
-    rev    = version;
-    sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp";
-  };
-
-  # Set the correct install path:
-  LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri";
-
-  postInstall = lib.optionalString enableHybridCodec ''
-    ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/
-  '';
-
-  configureFlags = [
-    (lib.enableFeature enableGui "x11")
-    (lib.enableFeature enableGui "wayland")
-  ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
-
-  nativeBuildInputs = [
-    autoreconfHook gnum4 pkg-config python3 wayland-scanner
-  ];
-
-  buildInputs = [ intel-gpu-tools libdrm libva ]
-    ++ lib.optionals enableGui [ libX11 libXext libGL wayland ]
-    ++ lib.optional enableHybridCodec vaapi-intel-hybrid;
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://01.org/linuxmedia";
-    license = licenses.mit;
-    description = "VA-API user mode driver for Intel GEN Graphics family";
-    longDescription = ''
-      This VA-API video driver backend provides a bridge to the GEN GPUs through
-      the packaging of buffers and commands to be sent to the i915 driver for
-      exercising both hardware and shader functionality for video decode,
-      encode, and processing.
-      VA-API is an open-source library and API specification, which provides
-      access to graphics hardware acceleration capabilities for video
-      processing. It consists of a main library and driver-specific acceleration
-      backends for each supported hardware vendor.
-    '';
-    platforms = [ "x86_64-linux" "i686-linux" ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
-  };
-}
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
deleted file mode 100644
index 0b9b316f4433..000000000000
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, gettext, python3, testers }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "iso-codes";
-  version = "4.16.0";
-
-  src = fetchurl {
-    url = with finalAttrs; "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz";
-    sha256 = "sha256-fJkPw5oFl1vtsBdeP/Cfw4MEiBX2i0Yqu/BVqAMuZsw=";
-  };
-
-  nativeBuildInputs = [ gettext python3 ];
-
-  enableParallelBuilding = true;
-
-  passthru.tests = {
-    pkg-config = testers.hasPkgConfigModules {
-      package = finalAttrs.finalPackage;
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://salsa.debian.org/iso-codes-team/iso-codes";
-    description = "Various ISO codes packaged as XML files";
-    license = licenses.lgpl21;
-    platforms = platforms.all;
-    pkgConfigModules = [ "iso-codes" ];
-  };
-})
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
deleted file mode 100644
index 160388f97b51..000000000000
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  version = "2.16.1";
-  pname = "commons-io";
-
-  src = fetchurl {
-    url    = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "sha256-4+YYSDyCHwUwlw71nAnGy4g9GOl1Z8qr3gHQEyv8EPo=";
-  };
-
-  installPhase = ''
-    tar xf ${src}
-    mkdir -p $out/share/java
-    cp *.jar $out/share/java/
-  '';
-
-  meta = {
-    homepage    = "https://commons.apache.org/proper/commons-io";
-    description = "Library of utilities to assist with developing IO functionality";
-    maintainers = with lib.maintainers; [ copumpkin ];
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license     = lib.licenses.asl20;
-    platforms = with lib.platforms; unix;
-  };
-}
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
deleted file mode 100644
index 16b80fece30b..000000000000
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  version = "3.15.0";
-  pname = "commons-lang";
-
-  src = fetchurl {
-    url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz";
-    hash = "sha256-XaI6ajKIA5NiY9UuZJdMCuZ2kIT3cbitpMXJj33lyE4=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-    tar xf ${finalAttrs.src}
-    mkdir -p $out/share/java
-    cp *.jar $out/share/java/
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Provides additional methods to manipulate standard Java library classes";
-    homepage = "https://commons.apache.org/proper/commons-lang";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ copumpkin ];
-    platforms = with lib.platforms; unix;
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-  };
-})
diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix
deleted file mode 100644
index f7debe8a7bdc..000000000000
--- a/pkgs/development/libraries/java/commons/logging/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{lib, stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  pname = "commons-logging";
-  version = "1.3.1";
-
-  src = fetchurl {
-    url    = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz";
-    sha256 = "sha256-mM85vfWDc88fNwwflvnRvoh/tb+jDH3o+96RZa9Sp7w=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/java
-    cp commons-logging-*.jar $out/share/java/
-  '';
-
-  meta = {
-    description = "Wrapper around a variety of logging API implementations";
-    homepage = "https://commons.apache.org/proper/commons-logging";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
-  };
-}
-
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
deleted file mode 100644
index 8f7282df0bb2..000000000000
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, ant
-, jdk
-, stripJavaArchivesHook
-}:
-
-stdenv.mkDerivation {
-  pname = "hydra-ant-logger";
-  version = "2010.2";
-
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "hydra-ant-logger";
-    rev = "dae3224f4ed42418d3492bdf5bee4f825819006f";
-    hash = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc=";
-  };
-
-  nativeBuildInputs = [
-    ant
-    jdk
-    stripJavaArchivesHook
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    mkdir lib
-    ant
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preBuild
-    install -Dm644 *.jar -t $out/share/java
-    runHook postBuild
-  '';
-
-  meta = {
-    homepage = "https://github.com/NixOS/hydra-ant-logger";
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
deleted file mode 100644
index dd469d3762c0..000000000000
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ ffmpeg_6-full
-, fetchFromGitHub
-, fetchpatch
-, lib
-}:
-
-let
-  version = "6.0.1-8";
-in
-
-(ffmpeg_6-full.override {
-  inherit version; # Important! This sets the ABI.
-  source = fetchFromGitHub {
-    owner = "jellyfin";
-    repo = "jellyfin-ffmpeg";
-    rev = "v${version}";
-    hash = "sha256-29g3BUdNcFEGjHkc/1qxOGazIfg0DLDIwoiDCI/aEKc=";
-  };
-}).overrideAttrs (old: {
-  pname = "jellyfin-ffmpeg";
-
-  # Clobber upstream patches as they don't apply to the Jellyfin fork
-  patches = [
-    (fetchpatch {
-      name = "fix_build_failure_due_to_libjxl_version_to_new";
-      url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2";
-      hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU=";
-    })
-  ];
-
-  configureFlags = old.configureFlags ++ [
-    "--extra-version=Jellyfin"
-    "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067
-  ];
-
-  postPatch = ''
-    for file in $(cat debian/patches/series); do
-      patch -p1 < debian/patches/$file
-    done
-
-    ${old.postPatch or ""}
-  '';
-
-  meta = with lib; {
-    description = "${old.meta.description} (Jellyfin fork)";
-    homepage = "https://github.com/jellyfin/jellyfin-ffmpeg";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ justinas ];
-    pkgConfigModules = [ "libavutil" ];
-  };
-})
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
deleted file mode 100644
index 3e5656ba7874..000000000000
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "jitterentropy";
-  version = "3.6.0";
-
-  src = fetchFromGitHub {
-    owner = "smuellerDD";
-    repo = "jitterentropy-library";
-    rev = "v${version}";
-    hash = "sha256-CPvgc/W5Z2OfbP9Lp2tQevUQZr+xlh6q5r5Fp2WUHhg=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  enableParallelBuilding = true;
-  hardeningDisable = [ "fortify" ]; # avoid warnings
-
-  # prevent jitterentropy from builtin strip to allow controlling this from the derivation's
-  # settings. Also fixes a strange issue, where this strip may fail when cross-compiling.
-  installFlags = [
-    "INSTALL_STRIP=install"
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  meta = with lib; {
-    description = "Provides a noise source using the CPU execution timing jitter";
-    homepage = "https://github.com/smuellerDD/jitterentropy-library";
-    changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md";
-    license = with licenses; [ bsd3 /* OR */ gpl2Only ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ johnazoidberg c0bw3b ];
-  };
-}
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
deleted file mode 100644
index 9a04f8b1f4ef..000000000000
--- a/pkgs/development/libraries/json-glib/default.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, glib
-, meson
-, ninja
-, nixosTests
-, pkg-config
-, gettext
-, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
-, buildPackages
-, gobject-introspection
-, gi-docgen
-, libxslt
-, fixDarwinDylibNames
-, gnome
-}:
-
-stdenv.mkDerivation rec {
-  pname = "json-glib";
-  version = "1.8.0";
-
-  outputs = [ "out" "dev" "installedTests" ]
-    ++ lib.optional withIntrospection "devdoc";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "l+9euSyoEQOa1Qpl8GYz8armR5J4kwe+cXB5XYsxlFQ=";
-  };
-
-  patches = [
-    # Add option for changing installation path of installed tests.
-    ./meson-add-installed-tests-prefix-option.patch
-  ];
-
-  strictDeps = true;
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gettext
-    glib
-    libxslt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    fixDarwinDylibNames
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
-    gi-docgen
-  ];
-
-  propagatedBuildInputs = [
-    glib
-  ];
-
-  mesonFlags = [
-    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-    (lib.mesonEnable "introspection" withIntrospection)
-    (lib.mesonEnable "gtk_doc" withIntrospection)
-  ];
-
-  # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
-  # it should be a build-time dep for build
-  # TODO: send upstream
-  postPatch = ''
-    substituteInPlace doc/meson.build \
-      --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \
-      --replace "'gi-docgen', req" "'gi-docgen', native:true, req"
-  '';
-
-  doCheck = true;
-
-  postFixup = ''
-    # Move developer documentation to devdoc output.
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    if [[ -d "$out/share/doc" ]]; then
-        find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
-          | while IFS= read -r -d ''' file; do
-            moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
-        done
-    fi
-  '';
-
-  passthru = {
-    tests = {
-      installedTests = nixosTests.installed-tests.json-glib;
-    };
-
-    updateScript = gnome.updateScript {
-      packageName = pname;
-      versionPolicy = "odd-unstable";
-    };
-  };
-
-  meta = with lib; {
-    description = "Library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
-    homepage = "https://gitlab.gnome.org/GNOME/json-glib";
-    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members;
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
deleted file mode 100644
index ff09a0115587..000000000000
--- a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
-index 1eb56c8..dca444e 100644
---- a/json-glib/tests/meson.build
-+++ b/json-glib/tests/meson.build
-@@ -21,8 +21,9 @@ test_data = [
-   'stream-load.json',
- ]
- 
--installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name)
--installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name)
-+installed_test_prefix = get_option('installed_test_prefix')
-+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name)
-+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name)
- 
- install_data(test_data, install_dir: installed_test_bindir)
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 5a96998..383aa6c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,6 @@ option('tests',
- option('nls',
-        type: 'feature', value: 'auto', yield: true,
-        description: 'Enable native language support (translations)')
-+option('installed_test_prefix',
-+       description: 'Prefix for installed tests',
-+       type: 'string')
diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix
index bd51a9a1245e..34b064d29412 100644
--- a/pkgs/development/libraries/libadwaita/default.nix
+++ b/pkgs/development/libraries/libadwaita/default.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.5.3";
+  version = "1.6.1";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc"; # demo app
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     rev = finalAttrs.version;
-    hash = "sha256-NCQCd/QnJg2fEI6q5ys8HQXinGnKaoxhMUHd8rwxAmk=";
+    hash = "sha256-oCTMMKpI7XqpK37SGXgQFNqCZyTuuIE6TOz/k5nUNGU=";
   };
 
   depsBuildBuild = [
@@ -93,7 +93,9 @@ stdenv.mkDerivation (finalAttrs: {
       # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme.
       # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name.
       # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12
-      "XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}"
+      #
+      # The "Validate docs" test looks for various GIR dependencies, thus preserve the existing paths.
+      "XDG_DATA_DIRS=$XDG_DATA_DIRS:${glib.getSchemaDataDirPath gsettings-desktop-schemas}"
 
       # Tests need a cache directory
       "HOME=$TMPDIR"
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
deleted file mode 100644
index 99a847af0b87..000000000000
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, openssl }:
-
-stdenv.mkDerivation rec {
-  pname = "libamqpcpp";
-  version = "4.3.26";
-
-  src = fetchFromGitHub {
-    owner = "CopernicaMarketingSoftware";
-    repo = "AMQP-CPP";
-    rev = "v${version}";
-    sha256 = "sha256-lHkYoppJ/wo6RRE6V4iN6JXz5OoErJUl4IyrwiCB9FM=";
-  };
-
-  buildInputs = [ openssl ];
-
-  patches = [ ./libamqpcpp-darwin.patch ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "Library for communicating with a RabbitMQ server";
-    homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP";
-    license = licenses.asl20;
-    maintainers = [ maintainers.mjp ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
deleted file mode 100644
index 7679aefe5b95..000000000000
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, pkg-config
-, gtk-doc
-, docbook_xml_dtd_43
-, python3
-, gobject-introspection
-, glib
-, udev
-, kmod
-, parted
-, cryptsetup
-, lvm2
-, util-linux
-, libbytesize
-, libndctl
-, nss
-, volume_key
-, libxslt
-, docbook_xsl
-, gptfdisk
-, libyaml
-, autoconf-archive
-, thin-provisioning-tools
-, makeBinaryWrapper
-, e2fsprogs
-, libnvme
-, keyutils
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libblockdev";
-  version = "3.1.1";
-
-  src = fetchFromGitHub {
-    owner = "storaged-project";
-    repo = "libblockdev";
-    rev = "${finalAttrs.version}-1";
-    hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ=";
-  };
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  postPatch = ''
-    patchShebangs scripts
-  '';
-
-  nativeBuildInputs = [
-    autoconf-archive
-    autoreconfHook
-    docbook_xsl
-    docbook_xml_dtd_43
-    gobject-introspection
-    gtk-doc
-    libxslt
-    makeBinaryWrapper
-    pkg-config
-    python3
-  ];
-
-  buildInputs = [
-    cryptsetup
-    e2fsprogs
-    glib
-    gptfdisk
-    keyutils
-    kmod
-    libbytesize
-    libndctl
-    libnvme
-    libyaml
-    lvm2
-    nss
-    parted
-    udev
-    util-linux
-    volume_key
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \
-      ${lib.makeBinPath [ thin-provisioning-tools ]}
-  '';
-
-  meta = {
-    changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst";
-    description = "Library for manipulating block devices";
-    homepage = "http://storaged.org/libblockdev/";
-    license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils
-    maintainers = with lib.maintainers; [ johnazoidberg ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index ce83c3c22cd4..9595efc1c1b9 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -31,7 +31,7 @@
 
 let
   gl_rpath = lib.makeLibraryPath [
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
   ];
 
   rpath = lib.makeLibraryPath [
diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix
deleted file mode 100644
index 7cfa864fc06f..000000000000
--- a/pkgs/development/libraries/libchewing/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, sqlite, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "libchewing";
-  version = "unstable-2020-06-27";
-
-  src = fetchFromGitHub {
-    owner = "chewing";
-    repo = "libchewing";
-    rev = "452f6221fbad90c0706a3963b17e226216e40dd7";
-    sha256 = "sha256-w3/K2O/CU+XVzqzVCYJyq1vLgToN6iIUhJ9J7ia4p9E=";
-  };
-
-  buildInputs = [ sqlite ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    description = "Intelligent Chinese phonetic input method";
-    homepage = "https://chewing.im/";
-    license = licenses.lgpl21Only;
-    maintainers = [ maintainers.ericsagnes ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix
deleted file mode 100644
index 7d6896efa639..000000000000
--- a/pkgs/development/libraries/libdatovka/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, stdenv
-, autoreconfHook
-, pkg-config
-, fetchurl
-, expat
-, gpgme
-, libgcrypt
-, libxml2
-, libxslt
-, gnutls
-, curl
-, docbook_xsl
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libdatovka";
-  version = "0.6.2";
-
-  src = fetchurl {
-    url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";
-    sha256 = "sha256-4JFPlEpSFv5t3p/NGq0cfn+neJj2M0BNWWd6nlCjHE0=";
-  };
-
-  patches = [
-    ./libdatovka-deprecated-fn-curl.patch
-  ];
-
-  configureFlags = [
-    "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"
-  ];
-
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
-  buildInputs = [ expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ];
-
-  meta = with lib; {
-    description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
-    homepage = "https://gitlab.nic.cz/datovka/libdatovka";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.ovlach ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
index 5f62f8b70647..56589f8cf8df 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdeflate";
-  version = "1.21";
+  version = "1.22";
 
   src = fetchFromGitHub {
     owner = "ebiggers";
     repo = "libdeflate";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-JsPvftpl9drmhlNdqorr92q7dnYzXpIIO8prMPPGHFk=";
+    hash = "sha256-KpKY0A1cRV9XR1WrE15Eewf2fDWwIFGjQm/fFCnBDrg=";
   };
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ];
diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix
deleted file mode 100644
index 373fae4876b1..000000000000
--- a/pkgs/development/libraries/libdex/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, gi-docgen
-, gobject-introspection
-, meson
-, ninja
-, pkg-config
-, vala
-, glib
-, liburing
-, gnome
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libdex";
-  version = "0.6.1";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0XbeZXhXHjKowLYDtqWhP6X4f7a1RCV1s47FrxaxepI=";
-  };
-
-  nativeBuildInputs = [
-    gi-docgen
-    gobject-introspection
-    meson
-    ninja
-    pkg-config
-    vala
-  ];
-
-  buildInputs = [
-    glib
-    liburing
-  ];
-
-  mesonFlags = [
-    "-Ddocs=true"
-  ];
-
-  doCheck = true;
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  passthru.updateScript = gnome.updateScript {
-    packageName = "libdex";
-    versionPolicy = "odd-unstable";
-  };
-
-  meta = with lib; {
-    description = "Library supporting deferred execution for GNOME and GTK";
-    homepage = "https://gitlab.gnome.org/GNOME/libdex";
-    maintainers = teams.gnome.members;
-    platforms = platforms.linux ++ platforms.darwin;
-    license = licenses.lgpl21Plus;
-  };
-})
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
deleted file mode 100644
index abd8185eae2a..000000000000
--- a/pkgs/development/libraries/libevdev/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, python3 }:
-
-stdenv.mkDerivation rec {
-  pname = "libevdev";
-  version = "1.13.2";
-
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-PsqGps5VuB1bzpEGN/xFHIu+NzsflpjzdcfxrQ3jrEg=";
-  };
-
-  nativeBuildInputs = [ python3 ];
-
-  meta = with lib; {
-    description = "Wrapper library for evdev devices";
-    homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.amorsillo ];
-  };
-}
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
deleted file mode 100644
index 3c1b14eaf909..000000000000
--- a/pkgs/development/libraries/libfprint/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ lib, stdenv
-, fetchFromGitLab
-, pkg-config
-, meson
-, python3
-, ninja
-, gusb
-, pixman
-, glib
-, nss
-, gobject-introspection
-, cairo
-, libgudev
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_43
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libfprint";
-  version = "1.94.6";
-  outputs = [ "out" "devdoc" ];
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    owner = "libfprint";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8=";
-  };
-
-  postPatch = ''
-    patchShebangs \
-      tests/test-runner.sh \
-      tests/unittest_inspector.py \
-      tests/virtual-image.py \
-      tests/umockdev-test.py \
-      tests/test-generated-hwdb.sh
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    meson
-    ninja
-    gtk-doc
-    docbook-xsl-nons
-    docbook_xml_dtd_43
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    gusb
-    pixman
-    glib
-    nss
-    cairo
-    libgudev
-  ];
-
-  mesonFlags = [
-    "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
-    # Include virtual drivers for fprintd tests
-    "-Ddrivers=all"
-    "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
-  ];
-
-  nativeInstallCheckInputs = [
-    (python3.withPackages (p: with p; [ pygobject3 ]))
-  ];
-
-  # We need to run tests _after_ install so all the paths that get loaded are in
-  # the right place.
-  doCheck = false;
-
-  doInstallCheck = true;
-
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    ninjaCheckPhase
-
-    runHook postInstallCheck
-  '';
-
-  meta = with lib; {
-    homepage = "https://fprint.freedesktop.org/";
-    description = "Library designed to make it easy to add support for consumer fingerprint readers";
-    license = licenses.lgpl21Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
-  };
-}
diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix
deleted file mode 100644
index 34eea1047413..000000000000
--- a/pkgs/development/libraries/libgbinder/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, glib, libglibutil }:
-
-stdenv.mkDerivation rec {
-  pname = "libgbinder";
-  version = "1.1.40";
-
-  src = fetchFromGitHub {
-    owner = "mer-hybris";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-bv3UeL5xx28N/fSG1BeUSbbSvDaNgehpnx2OzIIaSXw=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    glib
-    libglibutil
-  ];
-
-  postPatch = ''
-    # Fix pkg-config and ranlib names for cross-compilation
-    substituteInPlace Makefile \
-      --replace "pkg-config" "$PKG_CONFIG" \
-      --replace "ranlib" "$RANLIB"
-  '';
-
-  makeFlags = [
-    "LIBDIR=$(out)/lib"
-    "INSTALL_INCLUDE_DIR=$(dev)/include/gbinder"
-    "INSTALL_PKGCONFIG_DIR=$(dev)/lib/pkgconfig"
-  ];
-
-  installTargets = [ "install" "install-dev" ];
-
-  postInstall = ''
-    sed -i -e "s@includedir=/usr@includedir=$dev@g" $dev/lib/pkgconfig/$pname.pc
-    sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags libglibutil) @g" $dev/lib/pkgconfig/$pname.pc
-  '';
-
-  meta = {
-    description = "GLib-style interface to binder";
-    homepage = "https://github.com/mer-hybris/libgbinder";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ mcaju ];
-  };
-}
diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix
deleted file mode 100644
index 59434902d78d..000000000000
--- a/pkgs/development/libraries/libglibutil/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, glib }:
-
-stdenv.mkDerivation rec {
-  pname = "libglibutil";
-  version = "1.0.79";
-
-  src = fetchFromGitHub {
-    owner = "sailfishos";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    glib
-  ];
-
-  postPatch = ''
-    # Fix pkg-config name for cross-compilation
-    substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG"
-  '';
-
-  makeFlags = [
-    "LIBDIR=$(out)/lib"
-    "INSTALL_INCLUDE_DIR=$(dev)/include/gutil"
-    "INSTALL_PKGCONFIG_DIR=$(dev)/lib/pkgconfig"
-  ];
-
-  installTargets = [ "install" "install-dev" ];
-
-  postInstall = ''
-    sed -i -e "s@includedir=/usr@includedir=$dev@g" $dev/lib/pkgconfig/$pname.pc
-    sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags glib-2.0) @g" $dev/lib/pkgconfig/$pname.pc
-  '';
-
-  meta = {
-    description = "Library of glib utilities";
-    homepage = "https://git.sailfishos.org/mer-core/libglibutil";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ mcaju ];
-  };
-}
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
deleted file mode 100644
index 1880b8310fce..000000000000
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config
-, enable-tools ? true }:
-
-stdenv.mkDerivation rec {
-  pname = "libgpiod";
-  version = "2.1.3";
-
-  src = fetchurl {
-    url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
-    hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0=";
-  };
-
-  nativeBuildInputs = [
-    autoconf-archive
-    pkg-config
-    autoreconfHook
-  ];
-
-  configureFlags = [
-    "--enable-tools=${if enable-tools then "yes" else "no"}"
-    "--enable-bindings-cxx"
-  ];
-
-  meta = with lib; {
-    description = "C library and tools for interacting with the linux GPIO character device";
-    longDescription = ''
-      Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
-      the character device instead. This library encapsulates the ioctl calls and
-      data structures behind a straightforward API.
-    '';
-    homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";
-    license = with licenses; [
-      lgpl21Plus # libgpiod
-      lgpl3Plus # C++ bindings
-    ] ++ lib.optional enable-tools gpl2Plus;
-    maintainers = [ maintainers.expipiplus1 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix
deleted file mode 100644
index b07051358be0..000000000000
--- a/pkgs/development/libraries/libgweather/default.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, libxml2
-, json-glib
-, glib
-, gettext
-, libsoup_3
-, gi-docgen
-, gobject-introspection
-, python3
-, tzdata
-, geocode-glib_2
-, vala
-, gnome
-, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libgweather";
-  version = "4.4.2";
-
-  outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-puQntHcK2kiUXzqpBq9xD8gzz/DULfkfGCgwJ0DXlOw=";
-  };
-
-  patches = [
-    # Headers depend on glib but it is only listed in Requires.private,
-    # which does not influence Cflags on non-static builds in nixpkgs’s
-    # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly.
-    ./fix-pkgconfig.patch
-  ];
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gettext
-    glib
-    (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
-  ] ++ lib.optionals withIntrospection [
-    gi-docgen
-    gobject-introspection
-    vala
-  ];
-
-  buildInputs = [
-    glib
-    libsoup_3
-    libxml2
-    json-glib
-    geocode-glib_2
-  ];
-
-  mesonFlags = [
-    "-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
-    (lib.mesonBool "introspection" withIntrospection)
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-Dc_args=-D_DARWIN_C_SOURCE"
-  ];
-
-  postPatch = ''
-    patchShebangs build-aux/meson/gen_locations_variant.py
-
-    # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
-    # it should be a build-time dep for build
-    # TODO: send upstream
-    substituteInPlace doc/meson.build \
-      --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \
-      --replace "'gi-docgen', req" "'gi-docgen', native:true, req"
-
-    # gir works for us even when cross-compiling
-    # TODO: send upstream because downstream users can use the option to disable gir if they don't have it working
-    substituteInPlace libgweather/meson.build \
-      --replace "g_ir_scanner.found() and not meson.is_cross_build()" "g_ir_scanner.found()"
-  '';
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-      versionPolicy = "odd-unstable";
-      # Version 40.alpha preceded version 4.0.
-      freeze = "40.alpha";
-    };
-  };
-
-  meta = with lib; {
-    description = "Library to access weather information from online services for numerous locations";
-    homepage = "https://gitlab.gnome.org/GNOME/libgweather";
-    license = licenses.gpl2Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
deleted file mode 100644
index 52084508620c..000000000000
--- a/pkgs/development/libraries/libivykis/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }:
-
-stdenv.mkDerivation rec {
-  pname = "libivykis";
-
-  version = "0.43.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "sha256-x9Kxi9k0Ln7f0T4OOKaNv+qm0x6S4+Z3K6o5Qp3+u58=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = [ file protobufc ];
-
-  meta = with lib; {
-    homepage = "https://libivykis.sourceforge.net/";
-    description = ''
-      A thin wrapper over various OS'es implementation of I/O readiness
-      notification facilities
-    '';
-    license = licenses.zlib;
-    maintainers = [ ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix
deleted file mode 100644
index 0c1a6f34370a..000000000000
--- a/pkgs/development/libraries/libjxl/default.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ stdenv, lib, fetchFromGitHub
-, brotli
-, cmake
-, giflib
-, gperftools
-, gtest
-, libhwy
-, libjpeg
-, libpng
-, libwebp
-, gdk-pixbuf
-, openexr_3
-, pkg-config
-, makeWrapper
-, zlib
-, asciidoc
-, graphviz
-, doxygen
-, python3
-, lcms2
-, enablePlugins ? true
-}:
-
-let
-  loadersPath = "${gdk-pixbuf.binaryDir}/jxl-loaders.cache";
-in
-
-stdenv.mkDerivation rec {
-  pname = "libjxl";
-  version = "0.10.3";
-
-  outputs = [ "out" "dev" ];
-
-  src = fetchFromGitHub {
-    owner = "libjxl";
-    repo = "libjxl";
-    rev = "v${version}";
-    hash = "sha256-zk/fI1C26K5WC9QBfzS6MqPT9PiR4wmWURjOOIiNsg4=";
-    # There are various submodules in `third_party/`.
-    fetchSubmodules = true;
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    gdk-pixbuf
-    makeWrapper
-    asciidoc
-    doxygen
-    python3
-  ];
-
-  depsBuildBuild = [
-    graphviz
-  ];
-
-  # Functionality not currently provided by this package
-  # that the cmake build can apparently use:
-  #     OpenGL/GLUT (for Examples -> comparison with sjpeg)
-  #     viewer (see `cmakeFlags`)
-  #     plugins like for GDK and GIMP (see `cmakeFlags`)
-
-  # Vendored libraries:
-  # `libjxl` currently vendors many libraries as git submodules that they
-  # might patch often (e.g. test/gmock, see
-  # https://github.com/NixOS/nixpkgs/pull/103160#discussion_r519487734).
-  # When it has stabilised in the future, we may want to tell the build
-  # to use use nixpkgs system libraries.
-
-  # As of writing, libjxl does not point out all its dependencies
-  # conclusively in its README or otherwise; they can best be determined
-  # by checking the CMake output for "Could NOT find".
-  buildInputs = [
-    lcms2
-    giflib
-    gperftools # provides `libtcmalloc`
-    gtest
-    libjpeg
-    libpng
-    libwebp
-    gdk-pixbuf
-    openexr_3
-    zlib
-  ];
-
-  propagatedBuildInputs = [
-    brotli
-    libhwy
-  ];
-
-  cmakeFlags = [
-    # For C dependencies like brotli, which are dynamically linked,
-    # we want to use the system libraries, so that we don't have to care about
-    # installing their .so files generated by this build.
-    # The other C++ dependencies are statically linked in, so there
-    # using the vendorered ones is easier.
-    "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON"
-
-    # Use our version of highway, though it is still statically linked in
-    "-DJPEGXL_FORCE_SYSTEM_HWY=ON"
-
-    # Use our version of gtest
-    "-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
-
-    # TODO: Update this package to enable this (overridably via an option):
-    # Viewer tools for evaluation.
-    # "-DJPEGXL_ENABLE_VIEWERS=ON"
-  ] ++ lib.optionals enablePlugins [
-    # Enable plugins, such as:
-    # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files
-    # * the `gimp` one, which allows GIMP to load jpeg-xl files
-    "-DJPEGXL_ENABLE_PLUGINS=ON"
-  ] ++ lib.optionals stdenv.hostPlatform.isStatic [
-    "-DJPEGXL_STATIC=ON"
-  ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-    "-DJPEGXL_FORCE_NEON=ON"
-  ];
-
-  postPatch = ''
-    substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \
-      --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl"
-  '';
-
-  postInstall = lib.optionalString enablePlugins ''
-    GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \
-    GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \
-      gdk-pixbuf-query-loaders --update-cache
-  ''
-  # Cross-compiled gdk-pixbuf doesn't support thumbnailers
-  + lib.optionalString (enablePlugins && stdenv.hostPlatform == stdenv.buildPlatform) ''
-    mkdir -p "$out/bin"
-    makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \
-      --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"
-  '';
-
-  CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee";
-
-  # FIXME x86_64-darwin:
-  # https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690
-  doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64);
-
-  meta = with lib; {
-    homepage = "https://github.com/libjxl/libjxl";
-    description = "JPEG XL image format reference implementation";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ nh2 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix
deleted file mode 100644
index 222d8320026d..000000000000
--- a/pkgs/development/libraries/libkrun/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, cargo
-, pkg-config
-, glibc
-, openssl
-, libepoxy
-, libdrm
-, pipewire
-, virglrenderer
-, libkrunfw
-, llvmPackages
-, rustc
-, withGpu ? false
-, withSound ? false
-, withNet ? false
-, sevVariant ? false
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libkrun";
-  version = "1.9.5";
-
-  src = fetchFromGitHub {
-    owner = "containers";
-    repo = "libkrun";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-fVL49g71eyfYyeXI4B1qRNM90fBKjHeq0I4poz1pdME=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit (finalAttrs) src;
-    hash = "sha256-MW4/iB2NsCj0s9Q/h/PoCIIaDfZ/iqw+FGrsJmVR0lw=";
-  };
-
-  nativeBuildInputs = [
-    llvmPackages.clang
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-  ] ++ lib.optional (sevVariant || withGpu) pkg-config;
-
-  buildInputs = [
-    (libkrunfw.override { inherit sevVariant; })
-    glibc
-    glibc.static
-  ] ++ lib.optionals withGpu [ libepoxy libdrm virglrenderer ]
-    ++ lib.optional withSound pipewire
-    ++ lib.optional sevVariant openssl;
-
-  env.LIBCLANG_PATH = "${llvmPackages.clang-unwrapped.lib}/lib/libclang.so";
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ] ++ lib.optional withGpu "GPU=1"
-    ++ lib.optional withSound "SND=1"
-    ++ lib.optional withNet "NET=1"
-    ++ lib.optional sevVariant "SEV=1";
-
-  postInstall = ''
-    mkdir -p $dev/lib/pkgconfig
-    mv $out/lib64/pkgconfig $dev/lib/pkgconfig
-    mv $out/include $dev/include
-  '';
-
-  meta = with lib; {
-    description = "Dynamic library providing Virtualization-based process isolation capabilities";
-    homepage = "https://github.com/containers/libkrun";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao RossComputerGuy ];
-    platforms = libkrunfw.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
deleted file mode 100644
index 1ec57144b1a0..000000000000
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }:
-
-stdenv.mkDerivation rec {
-  pname = "libnatspec";
-  version = "0.3.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/natspec/${pname}-${version}.tar.bz2";
-    sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  buildInputs = [ popt ];
-
-  propagatedBuildInputs = [ libiconv ];
-
-  meta = with lib; {
-    homepage = "https://natspec.sourceforge.net/";
-    description = "Library intended to smooth national specificities in using of programs";
-    mainProgram = "natspec";
-    platforms = platforms.unix;
-    license = licenses.lgpl21;
-  };
-}
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
deleted file mode 100644
index c424879a8191..000000000000
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnfnetlink, libmnl }:
-
-stdenv.mkDerivation rec {
-  pname = "libnetfilter_conntrack";
-  version = "1.0.9";
-
-  src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-Z72d9J/jTouCFE9t+5OzIPOEqOpZcn6S/40YtfS1eag=";
-  };
-
-  patches = [
-    # Fix Musl build.
-    (fetchpatch {
-      url = "https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824";
-      sha256 = "00rp82jrx5ygcw8la3c7bv7sigw9qzbn956dk71qjx981a2g2kqk";
-    })
-  ];
-
-  hardeningDisable = [ "trivialautovarinit" ];
-
-  buildInputs = [ libmnl ];
-  propagatedBuildInputs = [ libnfnetlink ];
-  nativeBuildInputs = [ pkg-config ];
-
-  meta = with lib; {
-    description = "Userspace library providing an API to the in-kernel connection tracking state table";
-    longDescription = ''
-      libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
-      in-kernel connection tracking state table. The library libnetfilter_conntrack has been
-      previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used
-      by conntrack-tools among many other applications
-    '';
-    homepage = "https://netfilter.org/projects/libnetfilter_conntrack/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
deleted file mode 100644
index 1da5bf5a6de5..000000000000
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }:
-
-stdenv.mkDerivation rec {
-  version = "1.2.7";
-  pname = "libnftnl";
-
-  src = fetchurl {
-    url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
-    hash = "sha256-kSJ3T5aAk9XAus3dZ95IDzH6QHNAWn/AWKNLDzh67LM=";
-  };
-
-  configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version";
-
-  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/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz ] ++ teams.helsinki-systems.members;
-  };
-}
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
deleted file mode 100644
index 0270050cd001..000000000000
--- a/pkgs/development/libraries/libngspice/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, flex
-, bison
-, fftw
-, withNgshared ? true
-, libXaw
-, libXext
-, llvmPackages
-, readline
-}:
-
-stdenv.mkDerivation rec {
-  pname = "${lib.optionalString withNgshared "lib"}ngspice";
-  version = "43";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
-    hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk=";
-  };
-
-  nativeBuildInputs = [
-    flex
-    bison
-  ];
-
-  buildInputs = [
-    fftw
-    readline
-  ] ++ lib.optionals (!withNgshared) [
-    libXaw
-    libXext
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.openmp
-  ];
-
-  configureFlags = lib.optionals withNgshared [
-    "--with-ngshared"
-  ] ++ [
-    "--enable-xspice"
-    "--enable-cider"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "Next Generation Spice (Electronic Circuit Simulator)";
-    mainProgram = "ngspice";
-    homepage = "http://ngspice.sourceforge.net";
-    license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
-    maintainers = with maintainers; [ bgamari rongcuid ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix
deleted file mode 100644
index 7a9e0580e37e..000000000000
--- a/pkgs/development/libraries/libnixxml/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}:
-
-stdenv.mkDerivation {
-  pname = "libnixxml";
-  version = "unstable-2020-06-25";
-
-  src = fetchFromGitHub {
-    owner = "svanderburg";
-    repo = "libnixxml";
-    rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a";
-    sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
-  };
-
-  prePatch = ''
-    # Remove broken test
-    substituteInPlace tests/draw/Makefile.am \
-      --replace "draw-wrong.sh" ""
-    rm tests/draw/draw-wrong.sh
-
-    # Fix bash path
-    substituteInPlace scripts/nixexpr2xml.in \
-      --replace "/bin/bash" "${bash}/bin/bash"
-  '';
-
-  preAutoreconf = ''
-    # Copied from bootstrap script
-    ln -s README.md README
-    mkdir -p config
-  '';
-
-  configureFlags = [ "--with-gd" "--with-glib" ];
-  CFLAGS = "-Wall";
-
-  strictDeps = true;
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    getopt
-    libxslt
-  ];
-  buildInputs = [
-    bash
-    libxml2
-    gd.dev
-    glib
-    nix
-  ];
-  nativeCheckInputs = [
-    nix
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "XML-based Nix-friendly data integration library";
-    homepage = "https://github.com/svanderburg/libnixxml";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tomberek ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix
deleted file mode 100644
index 416fe1b29e55..000000000000
--- a/pkgs/development/libraries/libpanel/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  meson,
-  ninja,
-  pkg-config,
-  gobject-introspection,
-  vala,
-  gi-docgen,
-  glib,
-  gtk4,
-  libadwaita,
-  gnome,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libpanel";
-  version = "1.6.0";
-
-  outputs = [
-    "out"
-    "dev"
-    "devdoc"
-  ];
-
-  outputBin = "dev";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-t3NJSjxpMANFzY4nAnRI0RiRgwJswTeAL4hkF8bqMLY=";
-  };
-
-  strictDeps = true;
-
-  depsBuildBuild = [ pkg-config ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gobject-introspection
-    vala
-    gi-docgen
-    gtk4 # gtk4-update-icon-cache
-  ];
-
-  buildInputs = [
-    glib
-    gtk4
-    libadwaita
-  ];
-
-  mesonFlags = [ (lib.mesonBool "install-examples" true) ];
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript { packageName = pname; };
-  };
-
-  meta = with lib; {
-    description = "Dock/panel library for GTK 4";
-    mainProgram = "libpanel-example";
-    homepage = "https://gitlab.gnome.org/GNOME/libpanel";
-    license = licenses.lgpl3Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix
index f223231eaf0b..5b7b4e71591e 100644
--- a/pkgs/development/libraries/libpeas/2.x.nix
+++ b/pkgs/development/libraries/libpeas/2.x.nix
@@ -7,23 +7,24 @@
 , gobject-introspection
 , meson
 , ninja
+, vala
 , gjs
 , glib
 , lua5_1
 , python3
-, spidermonkey_115
+, spidermonkey_128
 , gnome
 }:
 
 stdenv.mkDerivation rec {
   pname = "libpeas";
-  version = "2.0.3";
+  version = "2.0.5";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-OeO1B8KdLQHfE0XpszgP16nQrrWy5lfTjmwr6lAj5fA=";
+    hash = "sha256-N28vc9cxtU4T3bqx2Rtjgs9qmAUk3vRN9irdFUid5t0=";
   };
 
   patches = [
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
+    vala
   ];
 
   buildInputs = [
@@ -55,7 +57,7 @@ stdenv.mkDerivation rec {
     lua5_1.pkgs.lgi
     python3
     python3.pkgs.pygobject3
-    spidermonkey_115
+    spidermonkey_128
   ];
 
   propagatedBuildInputs = [
@@ -65,6 +67,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=true"
+    "-Dvapi=true"
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix
index 616b5de5deb6..9bf0d59907be 100644
--- a/pkgs/development/libraries/libphonenumber/default.nix
+++ b/pkgs/development/libraries/libphonenumber/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "8.13.45";
+  version = "8.13.48";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oR6AvhB99LBNCtbGsCMghDGriTEzqVSEKfzdQyj+g6E=";
+    hash = "sha256-EFrw3pW2uLpzEDMsW251rsB5rvC31eLYQBqYOgGt1Ug=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 59b2966711dd..436b4d7ecfbe 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libproxy";
-  version = "0.5.7";
+  version = "0.5.9";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libproxy";
     repo = "libproxy";
     rev = finalAttrs.version;
-    hash = "sha256-VKVazLkmm1BZeGxrQmkpHors27bki0l8US3ZGI6OR0w=";
+    hash = "sha256-Z70TjLk5zulyYMAK+uMDhpsdvLa6m25pY8jahUA6ASE=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
deleted file mode 100644
index 15a8cef8b49f..000000000000
--- a/pkgs/development/libraries/libpsl/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  autoreconfHook,
-  docbook_xsl,
-  docbook_xml_dtd_43,
-  gtk-doc,
-  lzip,
-  libidn2,
-  libunistring,
-  libxslt,
-  pkg-config,
-  python3,
-  buildPackages,
-  publicsuffix-list,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libpsl";
-  version = "0.21.5";
-
-  src = fetchurl {
-    url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz";
-    hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0=";
-  };
-
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    # bin/psl-make-dafsa brings a large runtime closure through python3
-    ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin";
-
-  nativeBuildInputs = [
-    autoreconfHook
-    docbook_xsl
-    docbook_xml_dtd_43
-    gtk-doc
-    lzip
-    pkg-config
-    libxslt
-  ];
-
-  buildInputs = [
-    libidn2
-    libunistring
-    libxslt
-  ] ++ lib.optional (!stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isWindows) python3;
-
-  propagatedBuildInputs = [
-    publicsuffix-list
-  ];
-
-  postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
-    patchShebangs src/psl-make-dafsa
-  '';
-
-  preAutoreconf = ''
-    gtkdocize
-  '';
-
-  configureFlags = [
-    # "--enable-gtk-doc"
-    "--enable-man"
-    "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
-    "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
-    "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
-    "PYTHON=${lib.getExe buildPackages.python3}"
-  ];
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "C library for the Publix Suffix List";
-    longDescription = ''
-      libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
-      is a domain name under which Internet users can directly register own
-      names. Browsers and other web clients can use it to avoid privacy-leaking
-      "supercookies" and "super domain" certificates, for highlighting parts of
-      the domain in a user interface or sorting domain lists by site.
-    '';
-    homepage = "https://rockdaboot.github.io/libpsl/";
-    changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS";
-    license = licenses.mit;
-    maintainers = [ maintainers.c0bw3b ];
-    mainProgram = "psl";
-    platforms = platforms.unix ++ platforms.windows;
-    pkgConfigModules = [ "libpsl" ];
-  };
-}
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
deleted file mode 100644
index d8e9f1f5a2f5..000000000000
--- a/pkgs/development/libraries/libraw/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, lcms2
-, pkg-config
-
-# for passthru.tests
-, deepin
-, freeimage
-, hdrmerge
-, imagemagick
-, python3
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libraw";
-  version = "0.21.2";
-
-  src = fetchFromGitHub {
-    owner = "LibRaw";
-    repo = "LibRaw";
-    rev = version;
-    hash = "sha256-p9CmOCulvV7+KKn1lXwpcysOo0+mD5UgPqy2ki0cIFE=";
-  };
-
-  outputs = [ "out" "lib" "dev" "doc" ];
-
-  propagatedBuildInputs = [ lcms2 ];
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-  enableParallelBuilding = true;
-
-  passthru.tests = {
-    inherit imagemagick hdrmerge freeimage;
-    inherit (deepin) deepin-image-viewer;
-    inherit (python3.pkgs) rawkit;
-  };
-
-  meta = with lib; {
-    description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
-    homepage = "https://www.libraw.org/";
-    license = with licenses; [ cddl lgpl2Plus ];
-    platforms = platforms.unix;
-  };
-}
-
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 5024f36ff248..3d7a8bf8e5ba 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -113,11 +113,8 @@ stdenv.mkDerivation (finalAttrs: {
     ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders
   '';
 
-  # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK
-  # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually.
-  env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
-    NIX_LDFLAGS = "-lobjc";
-  };
+  # librsvg only links Foundation, but it also requiers libobjc.
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-lobjc"; };
 
   preConfigure = ''
     PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"
diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix
deleted file mode 100644
index f449c5e1c1b7..000000000000
--- a/pkgs/development/libraries/libshumate/default.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, gi-docgen
-, meson
-, ninja
-, pkg-config
-, vala
-, gobject-introspection
-, gperf
-, glib
-, cairo
-, sqlite
-, libsoup_3
-, gtk4
-, libsysprof-capture
-, json-glib
-, protobufc
-, xvfb-run
-, gnome
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libshumate";
-  version = "1.2.3";
-
-  outputs = [ "out" "dev" "devdoc" ];
-  outputBin = "devdoc"; # demo app
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TMbNc/bYcVX2J2arY+WqzEc72aDONZBpMqz8g56WTAw=";
-  };
-
-  depsBuildBuild = [
-    # required to find native gi-docgen when cross compiling
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    gi-docgen
-    meson
-    ninja
-    pkg-config
-    vala
-    gobject-introspection
-    gperf
-  ];
-
-  buildInputs = [
-    glib
-    cairo
-    sqlite
-    libsoup_3
-    gtk4
-    libsysprof-capture
-    json-glib
-    protobufc
-  ];
-
-  nativeCheckInputs = [
-    xvfb-run
-  ];
-
-  mesonFlags = [
-    "-Ddemos=true"
-  ];
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  checkPhase = ''
-    runHook preCheck
-
-    env \
-      HOME="$TMPDIR" \
-      GTK_A11Y=none \
-      xvfb-run meson test --print-errorlogs
-
-    runHook postCheck
-  '';
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput share/doc/libshumate-1.0 "$devdoc"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "libshumate";
-    };
-  };
-
-  meta = with lib; {
-    description = "GTK toolkit providing widgets for embedded maps";
-    mainProgram = "shumate-demo";
-    homepage = "https://gitlab.gnome.org/GNOME/libshumate";
-    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
deleted file mode 100644
index 803189719272..000000000000
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, makeFontsConf
-, nix-update-script
-, testers
-, autoreconfHook
-, docSupport ? true
-, doxygen
-, graphviz
-, libexsid
-, libgcrypt
-, perl
-, pkg-config
-, unittest-cpp
-, xa
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libsidplayfp";
-  version = "2.9.0";
-
-  src = fetchFromGitHub {
-    owner = "libsidplayfp";
-    repo = "libsidplayfp";
-    rev = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-m1bbbtNJvoY6l2+jMbEN/dR9V7LZ4f1lHHGnn0F4bmU=";
-  };
-
-  outputs = [
-    "out"
-  ] ++ lib.optionals docSupport [
-    "doc"
-  ];
-
-  postPatch = ''
-    patchShebangs .
-  '';
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    autoreconfHook
-    perl
-    pkg-config
-    xa
-  ] ++ lib.optionals docSupport [
-    doxygen
-    graphviz
-  ];
-
-  buildInputs = [
-    libexsid
-    libgcrypt
-  ];
-
-  checkInputs = [
-    unittest-cpp
-  ];
-
-  enableParallelBuilding = true;
-
-  configureFlags = [
-    (lib.strings.enableFeature true "hardsid")
-    (lib.strings.withFeature true "gcrypt")
-    (lib.strings.withFeature true "exsid")
-    (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
-  ];
-
-  # Make Doxygen happy with the setup, reduce log noise
-  FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; });
-
-  preBuild = ''
-    # Reduce noise from fontconfig during doc building
-    export XDG_CACHE_HOME=$TMPDIR
-  '';
-
-  buildFlags = [
-    "all"
-  ] ++ lib.optionals docSupport [
-    "doc"
-  ];
-
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-
-  postInstall = lib.optionalString docSupport ''
-    mkdir -p $doc/share/doc/libsidplayfp
-    mv docs/html $doc/share/doc/libsidplayfp/
-  '';
-
-  passthru = {
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Library to play Commodore 64 music derived from libsidplay2";
-    longDescription = ''
-      libsidplayfp is a C64 music player library which integrates
-      the reSID SID chip emulation into a cycle-based emulator
-      environment, constantly aiming to improve emulation of the
-      C64 system and the SID chips.
-    '';
-    homepage = "https://github.com/libsidplayfp/libsidplayfp";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ ramkromberg OPNA2608 ];
-    platforms = platforms.all;
-    pkgConfigModules = [
-      "libsidplayfp"
-      "libstilview"
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix
deleted file mode 100644
index 54360cad4ed9..000000000000
--- a/pkgs/development/libraries/libsnark/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }:
-
-stdenv.mkDerivation rec {
-  pname = "libsnark";
-  version = "unstable-2018-01-15";
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
-
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ];
-
-  src = fetchFromGitHub {
-    rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
-    owner           = "scipr-lab";
-    repo            = "libsnark";
-    sha256          = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca";
-    fetchSubmodules = true;
-  };
-
-  meta = with lib; {
-    description = "C++ library for zkSNARKs";
-    homepage = "https://github.com/scipr-lab/libsnark";
-    license = licenses.mit;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-  };
-}
diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index b0588373dee3..2aff5ca60377 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsoup";
-  version = "3.4.4";
+  version = "3.6.0";
 
   outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-KRxncl827ZDqQ+//JQZLacWi0ZgUiEd8BcSBo7Swxao=";
+    sha256 = "sha256-YpWfeR6OhEL4wTztrIxJGdePkSDVu1MBvmel5TMYtKM=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/libspelling/default.nix b/pkgs/development/libraries/libspelling/default.nix
deleted file mode 100644
index 874e9eff22c4..000000000000
--- a/pkgs/development/libraries/libspelling/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, meson
-, ninja
-, pkg-config
-, gobject-introspection
-, vala
-, gi-docgen
-, glib
-, gtk4
-, gtksourceview5
-, enchant
-, icu
-, nix-update-script
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libspelling";
-  version = "0.2.1";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "chergert";
-    repo = "libspelling";
-    rev = version;
-    hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gobject-introspection
-    vala
-    gi-docgen
-  ];
-
-  buildInputs = [
-    glib
-    gtk4
-    gtksourceview5
-    enchant
-    icu
-  ];
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    description = "Spellcheck library for GTK 4";
-    homepage = "https://gitlab.gnome.org/chergert/libspelling";
-    license = licenses.lgpl21Plus;
-    changelog = "https://gitlab.gnome.org/chergert/libspelling/-/raw/${version}/NEWS";
-    maintainers = with maintainers; [ chuangzhu ];
-  };
-}
diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix
deleted file mode 100644
index d8746f72f3b5..000000000000
--- a/pkgs/development/libraries/libspf2/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
-
-stdenv.mkDerivation rec {
-  pname = "libspf2";
-  version = "2.2.13";
-
-  src = fetchFromGitHub {
-    owner = "helsinki-systems";
-    repo = "libspf2";
-    rev = "v${version}";
-    hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-  strictDeps = true;
-
-  postPatch = ''
-    # disable static bins compilation
-    sed -i \
-      -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
-      -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
-      -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
-      -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am
-  '';
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Implementation of the Sender Policy Framework for SMTP " +
-                  "authorization (Helsinki Systems fork)";
-    homepage = "https://github.com/helsinki-systems/libspf2";
-    license = with licenses; [ lgpl21Plus bsd2 ];
-    maintainers = with maintainers; [ pacien ] ++ teams.helsinki-systems.members;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libspnav/configure-socket-path.patch b/pkgs/development/libraries/libspnav/configure-socket-path.patch
deleted file mode 100644
index 9a8ef0d49811..000000000000
--- a/pkgs/development/libraries/libspnav/configure-socket-path.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/spnav.c b/spnav.c
-index f9e10f8..27149f7 100644
---- a/spnav.c
-+++ b/spnav.c
-@@ -36,7 +36,7 @@ OF SUCH DAMAGE.
- #include 
- #include "spnav.h"
- 
--#define SPNAV_SOCK_PATH "/var/run/spnav.sock"
-+#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock"
- 
- #ifdef USE_X11
- #include 
-@@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail;
- /* AF_UNIX socket used for alternative communication with daemon */
- static int sock = -1;
- 
-+static char *spath = NULL;
-+
-+static char *socket_path()
-+{
-+	char *xdg_runtime_dir;
-+	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+		if ( spath == NULL ) {
-+			spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
-+			if ( spath != NULL ) {
-+				sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
-+			}
-+		}
-+		if(access(spath, F_OK) != -1){
-+			return spath;
-+		}
-+	}
-+	return DEFAULT_SPNAV_SOCK_PATH;
-+}
- 
- int spnav_open(void)
- {
-@@ -92,7 +110,7 @@ int spnav_open(void)
- 
- 	memset(&addr, 0, sizeof addr);
- 	addr.sun_family = AF_UNIX;
--	strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path));
-+	strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path));
- 
- 
- 	if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix
deleted file mode 100644
index 6a60bdb7f090..000000000000
--- a/pkgs/development/libraries/libspnav/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, libX11, fixDarwinDylibNames }:
-
-stdenv.mkDerivation rec {
-  version = "0.2.3";
-  pname = "libspnav";
-
-  src = fetchFromGitHub {
-    owner = "FreeSpacenav";
-    repo = "libspnav";
-    rev = "${pname}-${version}";
-    sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba";
-  };
-
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs = [ libX11 ];
-
-  patches = [
-    # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock
-    # to allow for a user service
-    ./configure-socket-path.patch
-  ];
-
-  configureFlags = [ "--disable-debug"];
-  makeFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "AR=${stdenv.cc.targetPrefix}ar"
-  ];
-
-  preInstall = ''
-    mkdir -p $out/{lib,include}
-  '';
-
-  meta = with lib; {
-    homepage = "https://spacenav.sourceforge.net/";
-    description = "Device driver and SDK for 3Dconnexion 3D input devices";
-    longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ sohalt ];
-  };
-}
diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix
deleted file mode 100644
index 53ebe6f18e41..000000000000
--- a/pkgs/development/libraries/libsurvive/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, libglut
-, lapack
-, libusb1
-, blas
-, zlib
-, eigen
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libsurvive";
-  version = "1.01";
-
-  src = fetchFromGitHub {
-    owner = "cntools";
-    repo = pname;
-    rev = "v${version}";
-    # Fixes 'Unknown CMake command "cnkalman_generate_code"'
-    fetchSubmodules = true;
-    hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  buildInputs = [
-    libglut
-    lapack
-    libusb1
-    blas
-    zlib
-    eigen
-  ];
-
-  # https://github.com/cntools/libsurvive/issues/272
-  postPatch = ''
-    substituteInPlace survive.pc.in \
-      libs/cnkalman/cnkalman.pc.in libs/cnkalman/libs/cnmatrix/cnmatrix.pc.in \
-      --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
-  '';
-
-  meta = with lib; {
-    description = "Open Source Lighthouse Tracking System";
-    homepage = "https://github.com/cntools/libsurvive";
-    license = licenses.mit;
-    maintainers = with maintainers; [ expipiplus1 prusnak ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix
deleted file mode 100644
index 8290cee53a47..000000000000
--- a/pkgs/development/libraries/libsystemtap/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchgit
-, gettext
-, python3
-, elfutils
-}:
-
-stdenv.mkDerivation {
-  pname = "libsystemtap";
-  version = "5.1";
-
-  src = fetchgit {
-    url = "git://sourceware.org/git/systemtap.git";
-    rev = "release-5.1";
-    hash = "sha256-3rhDllsgYGfh1gb5frUrlkzdz57A6lcvBELtgvb5Q7M=";
-  };
-
-  dontBuild = true;
-
-  nativeBuildInputs = [ gettext python3 elfutils ];
-
-  installPhase = ''
-    mkdir -p $out/include
-    cp -r includes/* $out/include/
-  '';
-
-  meta = with lib; {
-    description = "Statically defined probes development files";
-    homepage = "https://sourceware.org/systemtap/";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = [ lib.maintainers.farlion ];
-  };
-}
diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix
deleted file mode 100644
index 0c075406dee2..000000000000
--- a/pkgs/development/libraries/libticonv/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, pkg-config
-, autoreconfHook
-, glib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libticonv";
-  version = "1.1.5";
-  src = fetchurl {
-    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
-    sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    glib
-  ];
-
-  configureFlags = [
-    "--enable-iconv"
-  ];
-
-  meta = with lib; {
-    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
-    description = "This library is part of the TiLP framework";
-    homepage = "http://lpg.ticalc.org/prj_tilp/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ siraben luc65r ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 8d1d36344d7e..7f9aac48e725 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , autoconf
 , automake
+, darwin
 , libtool
 , pkg-config
 , pkgsStatic
@@ -86,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ automake autoconf libtool pkg-config ];
 
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
+
   preConfigure = ''
     LIBTOOLIZE=libtoolize ./autogen.sh
   '';
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
deleted file mode 100644
index c750d2a25551..000000000000
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, gettext
-, vala
-, libcap_ng
-, libvirt
-, libxml2
-, buildPackages
-, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
-, gobject-introspection
-, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
-, gtk-doc
-, docbook-xsl-nons
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libvirt-glib";
-  version = "5.0.0";
-
-  outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc";
-
-  src = fetchurl {
-    url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz";
-    sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gettext
-    vala
-    gobject-introspection
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
-  ] ++ lib.optionals withDocs [
-    gtk-doc
-    docbook-xsl-nons
-  ];
-
-  buildInputs = [
-    libvirt
-    libxml2
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libcap_ng
-  ];
-
-  strictDeps = true;
-
-  # The build system won't let us build with docs or introspection
-  # unless we're building natively, but will still do a mandatory
-  # check for the dependencies for those things unless we explicitly
-  # disable the options.
-  mesonFlags = [
-    (lib.mesonEnable "docs" withDocs)
-    (lib.mesonEnable "introspection" withIntrospection)
-  ];
-
-  meta = with lib; {
-    description = "Library for working with virtual machines";
-    longDescription = ''
-      libvirt-glib wraps libvirt to provide a high-level object-oriented API better
-      suited for glib-based applications, via three libraries:
-
-      - libvirt-glib    - GLib main loop integration & misc helper APIs
-      - libvirt-gconfig - GObjects for manipulating libvirt XML documents
-      - libvirt-gobject - GObjects for managing libvirt objects
-    '';
-    homepage = "https://libvirt.org/";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index f6e5807f6958..b1e565266f86 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -34,7 +34,7 @@
 , stdenv
 , substituteAll
 , xhtml1
-, yajl
+, json_c
 , writeScript
 , nixosTests
 
@@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
   # NOTE: You must also bump:
   # 
   # SysVirt in 
-  version = "10.5.0";
+  version = "10.9.0";
 
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8=";
+    hash = "sha256-LYQYA5UIKYs+8rSNZDymmrxuTWsgmukP5Y17lGB5UQs=";
     fetchSubmodules = true;
   };
 
@@ -163,6 +163,9 @@ stdenv.mkDerivation rec {
     sed -i '/qemuvhostusertest/d' tests/meson.build
     sed -i '/qemuxml2xmltest/d' tests/meson.build
     sed -i '/domaincapstest/d' tests/meson.build
+    # virshtest frequently times out on Darwin
+    substituteInPlace tests/meson.build \
+      --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)"
   '' + lib.optionalString enableXen ''
     # Has various hardcoded paths that don't exist outside of a Xen dom0.
     sed -i '/libxlxml2domconfigtest/d' tests/meson.build
@@ -202,7 +205,7 @@ stdenv.mkDerivation rec {
     python3
     readline
     xhtml1
-    yajl
+    json_c
   ] ++ lib.optionals isLinux [
     acl
     attr
@@ -312,7 +315,7 @@ stdenv.mkDerivation rec {
       (feat "ssh_proxy" isLinux)
       (feat "tests" true)
       (feat "udev" isLinux)
-      (feat "yajl" true)
+      (feat "json_c" true)
 
       (driver "ch" isLinux)
       (driver "esx" true)
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
deleted file mode 100644
index f788a7f59b9c..000000000000
--- a/pkgs/development/libraries/libwebp/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
-, threadingSupport ? true # multi-threading
-, openglSupport ? false, libglut, libGL, libGLU # OpenGL (required for vwebp)
-, pngSupport ? true, libpng # PNG image format
-, jpegSupport ? true, libjpeg # JPEG image format
-, tiffSupport ? true, libtiff # TIFF image format
-, gifSupport ? true, giflib # GIF image format
-, alignedSupport ? false # Force aligned memory operations
-, swap16bitcspSupport ? false # Byte swap for 16bit color spaces
-, experimentalSupport ? false # Experimental code
-, libwebpmuxSupport ? true # Build libwebpmux
-, libwebpdemuxSupport ? true # Build libwebpdemux
-, libwebpdecoderSupport ? true # Build libwebpdecoder
-
-# for passthru.tests
-, gd
-, graphicsmagick
-, haskellPackages
-, imagemagick
-, imlib2
-, libjxl
-, opencv
-, python3
-, vips
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libwebp";
-  version = "1.4.0";
-
-  src = fetchFromGitHub {
-    owner  = "webmproject";
-    repo   = pname;
-    rev    = "v${version}";
-    hash   = "sha256-OR/VzKNn3mnwjf+G+RkEGAaaKrhVlAu1e2oTRwdsPj8=";
-  };
-
-  configureFlags = [
-    (lib.enableFeature threadingSupport "threading")
-    (lib.enableFeature openglSupport "gl")
-    (lib.enableFeature pngSupport "png")
-    (lib.enableFeature jpegSupport "jpeg")
-    (lib.enableFeature tiffSupport "tiff")
-    (lib.enableFeature gifSupport "gif")
-    (lib.enableFeature alignedSupport "aligned")
-    (lib.enableFeature swap16bitcspSupport "swap-16bit-csp")
-    (lib.enableFeature experimentalSupport "experimental")
-    (lib.enableFeature libwebpmuxSupport "libwebpmux")
-    (lib.enableFeature libwebpdemuxSupport "libwebpdemux")
-    (lib.enableFeature libwebpdecoderSupport "libwebpdecoder")
-  ];
-
-  nativeBuildInputs = [ autoreconfHook libtool ];
-  buildInputs = [ ]
-    ++ lib.optionals openglSupport [ libglut libGL libGLU ]
-    ++ lib.optionals pngSupport [ libpng ]
-    ++ lib.optionals jpegSupport [ libjpeg ]
-    ++ lib.optionals tiffSupport [ libtiff ]
-    ++ lib.optionals gifSupport [ giflib ];
-
-  enableParallelBuilding = true;
-
-  passthru.tests = {
-    inherit gd graphicsmagick imagemagick imlib2 libjxl opencv vips;
-    inherit (python3.pkgs) pillow imread;
-    haskell-webp = haskellPackages.webp;
-  };
-
-  meta = with lib; {
-    description = "Tools and library for the WebP image format";
-    homepage = "https://developers.google.com/speed/webp/";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ ajs124 ];
-  };
-}
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index 2f535930ed03..25b2be3db4a2 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , meson
 , mesonEmulatorHook
 , ninja
@@ -23,25 +22,16 @@
 
 stdenv.mkDerivation rec {
   pname = "libwnck";
-  version = "43.0";
+  version = "43.1";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "kFvNuFhH1rj4hh5WswzW3GHq5n7O9M2ZSp+SWiaiwf4=";
+    sha256 = "Y0tFh7c2ekk9OBjEtXdA2sBhU8+PJc1k9a8WtlfdaEU=";
   };
 
-  patches = [
-    # bamfdaemon crashes with libwnck3 43.0
-    # https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libwnck/-/commit/6ceb684442eb26e3bdb8a38bf52264ad55f96a7b.patch";
-      sha256 = "/1wCnElCrZB7XTDW/l3dxMKZ9czGnukbGu4/aQStoXE=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index 3d2df9259a54..d4e743ee2855 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wpebackend-fdo";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchurl {
     url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz";
-    sha256 = "k8l2aumGTurq7isKdPIsvKCN9CwaG9tVsIbyUo44DTg=";
+    sha256 = "sha256-EBIYQllahQKR2z6C89sLmYTfB5Ai04bOQsK4UIFZ3Gw=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix
deleted file mode 100644
index b5128c1180e4..000000000000
--- a/pkgs/development/libraries/libxlsxwriter/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, minizip
-, python3
-, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libxlsxwriter";
-  version = "1.1.8";
-
-  src = fetchFromGitHub {
-    owner = "jmcnamara";
-    repo = "libxlsxwriter";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-GtH8324whOUizGZTzQtD53WTy4BNPnpTSkCX/iOIolQ=";
-  };
-
-  buildInputs = [
-    minizip
-    zlib
-  ];
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "USE_SYSTEM_MINIZIP=1"
-  ];
-
-  # TEST 428/429 worksheet:worksheet_table15 *** buffer overflow detected ***: terminated
-  hardeningDisable = [ "fortify3" ];
-
-  doCheck = true;
-
-  nativeCheckInputs = [
-    python3.pkgs.pytest
-  ];
-
-  checkTarget = "test";
-
-  meta = with lib; {
-    description = "C library for creating Excel XLSX files";
-    homepage = "https://libxlsxwriter.github.io/";
-    changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${src.rev}/Changes.txt";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ dotlambda ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 94a5280181ec..dba5f247bc85 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mapnik";
-  version = "4.0.2";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
     rev = "v${version}";
-    hash = "sha256-U5QQ7I7ZBNlMm74Vpvv8lvJ4EefM3+jHURFAP03Lmvw=";
+    hash = "sha256-BDddxaMgUv1q3zceiAOorSpT7GH1xt3PotrdJg4/j+E=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock
deleted file mode 100644
index 437f13e5e786..000000000000
--- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock
+++ /dev/null
@@ -1,6253 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-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 = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
-dependencies = [
- "cfg-if",
- "cipher 0.4.4",
- "cpufeatures",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.9",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
-dependencies = [
- "cfg-if",
- "getrandom 0.2.9",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android_log-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "anstream"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is-terminal",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
-dependencies = [
- "anstyle",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
-
-[[package]]
-name = "anymap2"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
-
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "askama"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139"
-dependencies = [
- "askama_derive",
- "askama_escape",
- "askama_shared",
-]
-
-[[package]]
-name = "askama_derive"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71"
-dependencies = [
- "askama_shared",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "askama_escape"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
-
-[[package]]
-name = "askama_shared"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0"
-dependencies = [
- "askama_escape",
- "mime",
- "mime_guess",
- "nom",
- "proc-macro2",
- "quote",
- "serde",
- "syn 1.0.109",
- "toml 0.5.11",
-]
-
-[[package]]
-name = "assert-json-diff"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "assert_matches"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
-
-[[package]]
-name = "assign"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
-
-[[package]]
-name = "async-channel"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-compression"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
-dependencies = [
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
-dependencies = [
- "async-lock",
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite",
- "log",
- "parking",
- "polling",
- "rustix",
- "slab",
- "socket2",
- "waker-fn",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
-dependencies = [
- "event-listener",
-]
-
-[[package]]
-name = "async-process"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
-dependencies = [
- "async-io",
- "async-lock",
- "autocfg",
- "blocking",
- "cfg-if",
- "event-listener",
- "futures-lite",
- "rustix",
- "signal-hook",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
-dependencies = [
- "async-channel",
- "async-global-executor",
- "async-io",
- "async-lock",
- "async-process",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "async-task"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
-
-[[package]]
-name = "async-trait"
-version = "0.1.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "atomic"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "axum"
-version = "0.6.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "113713495a32dd0ab52baf5c10044725aa3aec00b31beda84218e469029b72a3"
-dependencies = [
- "async-trait",
- "axum-core",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "sync_wrapper",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "backoff"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
-dependencies = [
- "futures-core",
- "getrandom 0.2.9",
- "instant",
- "pin-project-lite",
- "rand 0.8.5",
- "tokio",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide 0.6.2",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "benchmarks"
-version = "1.0.0"
-dependencies = [
- "criterion",
- "matrix-sdk-crypto",
- "matrix-sdk-sled",
- "matrix-sdk-test",
- "pprof",
- "ruma",
- "serde_json",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813"
-
-[[package]]
-name = "bitmaps"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
-
-[[package]]
-name = "blake3"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if",
- "constant_time_eq",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "blocking"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
-dependencies = [
- "async-channel",
- "async-lock",
- "async-task",
- "atomic-waker",
- "fastrand",
- "futures-lite",
- "log",
-]
-
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
-[[package]]
-name = "bumpalo"
-version = "3.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
-
-[[package]]
-name = "bytemuck"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "bytesize"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5"
-
-[[package]]
-name = "camino"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "cbc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
-dependencies = [
- "cipher 0.4.4",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha20"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "zeroize",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
-dependencies = [
- "aead",
- "chacha20",
- "cipher 0.3.0",
- "poly1305",
- "zeroize",
-]
-
-[[package]]
-name = "checked_int_cast"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
-
-[[package]]
-name = "chrono"
-version = "0.4.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "time 0.1.45",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_derive 3.2.18",
- "clap_lex 0.2.4",
- "indexmap",
- "once_cell",
- "strsim",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap"
-version = "4.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62"
-dependencies = [
- "clap_builder",
- "clap_derive 4.2.0",
- "once_cell",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749"
-dependencies = [
- "anstream",
- "anstyle",
- "bitflags 1.3.2",
- "clap_lex 0.4.1",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
-
-[[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",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "concurrent-queue"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
-
-[[package]]
-name = "const_format"
-version = "0.2.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e"
-dependencies = [
- "const_format_proc_macros",
-]
-
-[[package]]
-name = "const_format_proc_macros"
-version = "0.2.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b"
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-
-[[package]]
-name = "cpp_demangle"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c76f98bdfc7f66172e6c7065f981ebb576ffc903fe4c0561d9f0c2509226dc6"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "criterion"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
-dependencies = [
- "anes",
- "atty",
- "cast",
- "ciborium",
- "clap 3.2.23",
- "criterion-plot",
- "futures",
- "itertools",
- "lazy_static",
- "num-traits",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "tokio",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ctor"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b"
-dependencies = [
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "ctr"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
-dependencies = [
- "cipher 0.4.4",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "serde",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
-dependencies = [
- "cfg-if",
- "hashbrown",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.7",
-]
-
-[[package]]
-name = "deadpool"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e"
-dependencies = [
- "async-trait",
- "deadpool-runtime",
- "num_cpus",
- "retain_mut",
- "tokio",
-]
-
-[[package]]
-name = "deadpool-runtime"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1"
-dependencies = [
- "tokio",
-]
-
-[[package]]
-name = "deadpool-sqlite"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026821eaacbce25ff0d54405e4421d71656fcae3e4a9323461280fcda6dbc7d"
-dependencies = [
- "deadpool",
- "deadpool-sync",
- "rusqlite",
-]
-
-[[package]]
-name = "deadpool-sync"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1bea344b64b32537fde6e0f0179b1ede34d435636719dd40fe6a0f28218a61c"
-dependencies = [
- "deadpool",
-]
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "uuid",
-]
-
-[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
-name = "der"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
-dependencies = [
- "const-oid",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer 0.10.4",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "serde",
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "rand 0.7.3",
- "serde",
- "serde_bytes",
- "sha2 0.9.9",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "example-appservice-autojoin"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk-appservice",
- "tokio",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "example-autojoin"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "example-command-bot"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "example-cross-signing-bootstrap"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "example-custom-events"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dirs",
- "matrix-sdk",
- "serde",
- "tokio",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "example-emoji-verification"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap 4.2.4",
- "futures",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "example-get-profiles"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "example-getting-started"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dirs",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "example-image-bot"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk",
- "mime",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "example-login"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "example-persist-session"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dirs",
- "matrix-sdk",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "tokio",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "example-timeline"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap 4.2.4",
- "futures",
- "matrix-sdk",
- "tokio",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "extension-trait"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "eyeball"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1015c5225a75e0ab3d325e934456d92fdd57f440e8c81d09018878d4f651cd46"
-dependencies = [
- "futures-core",
- "readlock",
-]
-
-[[package]]
-name = "eyeball-im"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e6dff0ac9894dcc183064377dfeb4137bcffa9f9ec3dbc10f8e7fba34c0ac7"
-dependencies = [
- "futures-core",
- "imbl",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fdeflate"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "findshlibs"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
-dependencies = [
- "cc",
- "lazy_static",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
-dependencies = [
- "crc32fast",
- "miniz_oxide 0.6.2",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs-err"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-
-[[package]]
-name = "futures-task"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
-[[package]]
-name = "futures-util"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gif"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
-[[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.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gloo-utils"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5"
-dependencies = [
- "js-sys",
- "serde",
- "serde_json",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "goblin"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
-dependencies = [
- "log",
- "plain",
- "scroll",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.6",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
-dependencies = [
- "hashbrown",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-
-[[package]]
-name = "hkdf"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.6",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "http"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-types"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
-dependencies = [
- "anyhow",
- "async-channel",
- "base64 0.13.1",
- "futures-lite",
- "http",
- "infer",
- "pin-project-lite",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "serde_qs",
- "serde_urlencoded",
- "url",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "hyper"
-version = "0.14.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
-dependencies = [
- "http",
- "hyper",
- "rustls",
- "tokio",
- "tokio-rustls",
-]
-
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "gif 0.11.4",
- "jpeg-decoder 0.1.22",
- "num-iter",
- "num-rational 0.3.2",
- "num-traits",
- "png 0.16.8",
- "scoped_threadpool",
- "tiff 0.6.1",
-]
-
-[[package]]
-name = "image"
-version = "0.24.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "gif 0.12.0",
- "jpeg-decoder 0.3.0",
- "num-rational 0.4.1",
- "num-traits",
- "png 0.17.8",
- "tiff 0.8.1",
-]
-
-[[package]]
-name = "imbl"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2806b69cd9f4664844027b64465eacb444c67c1db9c778e341adff0c25cdb0d"
-dependencies = [
- "bitmaps",
- "imbl-sized-chunks",
- "rand_core 0.6.4",
- "rand_xoshiro",
- "serde",
- "version_check",
-]
-
-[[package]]
-name = "imbl-sized-chunks"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
-dependencies = [
- "bitmaps",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexed_db_futures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfbcff6ae46750b15cc594bfd277b188cbddcfdc1817848f97f03f26f8625b9e"
-dependencies = [
- "cfg-if",
- "js-sys",
- "uuid",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown",
- "serde",
-]
-
-[[package]]
-name = "indoc"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
-
-[[package]]
-name = "infer"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
-
-[[package]]
-name = "inferno"
-version = "0.11.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc"
-dependencies = [
- "ahash 0.8.3",
- "indexmap",
- "is-terminal",
- "itoa",
- "log",
- "num-format",
- "once_cell",
- "quick-xml",
- "rgb",
- "str_stack",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "block-padding",
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
-dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
-dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
-dependencies = [
- "rayon",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-dependencies = [
- "rayon",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "js_int"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "js_option"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "konst"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4"
-dependencies = [
- "konst_macro_rules",
- "konst_proc_macros",
-]
-
-[[package]]
-name = "konst_macro_rules"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
-
-[[package]]
-name = "konst_proc_macros"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "984e109462d46ad18314f10e392c286c3d47bce203088a09012de1015b45b737"
-
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.142"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
- "value-bag",
-]
-
-[[package]]
-name = "log-panics"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f"
-dependencies = [
- "backtrace",
- "log",
-]
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "markup5ever"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
-dependencies = [
- "log",
- "phf 0.10.1",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
-
-[[package]]
-name = "matrix-pickle"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b18185b3f64cc8d44840dbf92d92aeb05c1ef97094f51a32c1afd36a4415d225"
-dependencies = [
- "matrix-pickle-derive",
- "thiserror",
-]
-
-[[package]]
-name = "matrix-pickle-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef08fbb48d0d5125d3885e422c426b5be84067c63ceb5d8b32f9130143f5b81"
-dependencies = [
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "matrix-sdk"
-version = "0.6.2"
-dependencies = [
- "anyhow",
- "anymap2",
- "assert_matches",
- "async-stream",
- "async-trait",
- "backoff",
- "bytes",
- "bytesize",
- "chrono",
- "ctor 0.2.0",
- "dashmap",
- "dirs",
- "event-listener",
- "eyeball",
- "eyeball-im",
- "eyre",
- "futures",
- "futures-core",
- "futures-util",
- "getrandom 0.2.9",
- "gloo-timers",
- "http",
- "hyper",
- "image 0.24.6",
- "imbl",
- "indexmap",
- "matrix-sdk-base",
- "matrix-sdk-common",
- "matrix-sdk-indexeddb",
- "matrix-sdk-sled",
- "matrix-sdk-test",
- "mime",
- "mime_guess",
- "once_cell",
- "pin-project-lite",
- "rand 0.8.5",
- "reqwest",
- "ruma",
- "serde",
- "serde_html_form",
- "serde_json",
- "tempfile",
- "thiserror",
- "tokio",
- "tower",
- "tracing",
- "tracing-subscriber",
- "url",
- "uuid",
- "wasm-bindgen-test",
- "wiremock",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-appservice"
-version = "0.1.0"
-dependencies = [
- "axum",
- "dashmap",
- "http",
- "http-body",
- "hyper",
- "matrix-sdk",
- "matrix-sdk-test",
- "regex",
- "ruma",
- "serde",
- "serde_html_form",
- "serde_json",
- "serde_yaml",
- "thiserror",
- "tokio",
- "tower",
- "tracing",
- "tracing-subscriber",
- "url",
- "wiremock",
-]
-
-[[package]]
-name = "matrix-sdk-base"
-version = "0.6.1"
-dependencies = [
- "assert_matches",
- "assign",
- "async-stream",
- "async-trait",
- "bitflags 2.2.1",
- "ctor 0.2.0",
- "dashmap",
- "eyeball",
- "futures",
- "futures-core",
- "futures-util",
- "http",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-store-encryption",
- "matrix-sdk-test",
- "once_cell",
- "ruma",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "wasm-bindgen-test",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-common"
-version = "0.6.0"
-dependencies = [
- "futures-core",
- "futures-util",
- "gloo-timers",
- "instant",
- "matrix-sdk-test",
- "ruma",
- "serde",
- "serde_json",
- "tokio",
- "wasm-bindgen-futures",
- "wasm-bindgen-test",
-]
-
-[[package]]
-name = "matrix-sdk-crypto"
-version = "0.6.0"
-dependencies = [
- "aes",
- "anyhow",
- "assert_matches",
- "async-std",
- "async-trait",
- "atomic",
- "base64 0.21.0",
- "bs58",
- "byteorder",
- "cfg-if",
- "ctor 0.2.0",
- "ctr",
- "dashmap",
- "event-listener",
- "eyeball",
- "futures",
- "futures-core",
- "futures-util",
- "hmac",
- "http",
- "indoc",
- "itertools",
- "matrix-sdk-common",
- "matrix-sdk-qrcode",
- "matrix-sdk-test",
- "olm-rs",
- "pbkdf2",
- "proptest",
- "rand 0.8.5",
- "rmp-serde",
- "ruma",
- "serde",
- "serde_json",
- "sha2 0.10.6",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tracing",
- "tracing-subscriber",
- "vodozemac",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-crypto-ffi"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assert_matches",
- "base64 0.21.0",
- "futures-util",
- "hmac",
- "http",
- "js_int",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-sqlite",
- "pbkdf2",
- "rand 0.8.5",
- "ruma",
- "serde",
- "serde_json",
- "sha2 0.10.6",
- "tempfile",
- "thiserror",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "uniffi",
- "vodozemac",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-crypto-js"
-version = "0.1.0-alpha.0"
-dependencies = [
- "anyhow",
- "console_error_panic_hook",
- "futures-util",
- "http",
- "js-sys",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-indexeddb",
- "matrix-sdk-qrcode",
- "ruma",
- "serde_json",
- "tracing",
- "tracing-subscriber",
- "vodozemac",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-crypto-nodejs"
-version = "0.6.0"
-dependencies = [
- "http",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-sled",
- "matrix-sdk-sqlite",
- "napi",
- "napi-build",
- "napi-derive",
- "ruma",
- "serde_json",
- "tracing-subscriber",
- "vodozemac",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-ffi"
-version = "0.2.0"
-dependencies = [
- "anyhow",
- "base64 0.21.0",
- "extension-trait",
- "eyeball",
- "eyeball-im",
- "futures-core",
- "futures-util",
- "log-panics",
- "matrix-sdk",
- "matrix-sdk-sled",
- "matrix-sdk-sqlite",
- "mime",
- "once_cell",
- "opentelemetry",
- "opentelemetry-otlp",
- "ruma",
- "sanitize-filename-reader-friendly",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tracing",
- "tracing-android",
- "tracing-core",
- "tracing-opentelemetry",
- "tracing-subscriber",
- "uniffi",
- "url",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-indexeddb"
-version = "0.2.0"
-dependencies = [
- "anyhow",
- "assert_matches",
- "async-trait",
- "base64 0.21.0",
- "dashmap",
- "getrandom 0.2.9",
- "gloo-utils",
- "indexed_db_futures",
- "js-sys",
- "matrix-sdk-base",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-store-encryption",
- "matrix-sdk-test",
- "ruma",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tracing",
- "uuid",
- "wasm-bindgen",
- "wasm-bindgen-test",
- "web-sys",
-]
-
-[[package]]
-name = "matrix-sdk-integration-testing"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assign",
- "ctor 0.2.0",
- "matrix-sdk",
- "once_cell",
- "tempfile",
- "tokio",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "matrix-sdk-qrcode"
-version = "0.4.0"
-dependencies = [
- "base64 0.21.0",
- "byteorder",
- "image 0.23.14",
- "qrcode",
- "ruma-common",
- "thiserror",
- "vodozemac",
-]
-
-[[package]]
-name = "matrix-sdk-sled"
-version = "0.2.0"
-dependencies = [
- "assert_matches",
- "async-stream",
- "async-trait",
- "dashmap",
- "fs_extra",
- "futures-core",
- "futures-util",
- "glob",
- "matrix-sdk-base",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-store-encryption",
- "matrix-sdk-test",
- "once_cell",
- "ruma",
- "serde",
- "serde_json",
- "sled",
- "tempfile",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "matrix-sdk-sqlite"
-version = "0.1.0"
-dependencies = [
- "assert_matches",
- "async-stream",
- "async-trait",
- "ctor 0.2.0",
- "dashmap",
- "deadpool-sqlite",
- "fs_extra",
- "futures-core",
- "futures-util",
- "glob",
- "matrix-sdk-base",
- "matrix-sdk-common",
- "matrix-sdk-crypto",
- "matrix-sdk-store-encryption",
- "matrix-sdk-test",
- "once_cell",
- "rmp-serde",
- "ruma",
- "rusqlite",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "vodozemac",
-]
-
-[[package]]
-name = "matrix-sdk-store-encryption"
-version = "0.2.0"
-dependencies = [
- "anyhow",
- "blake3",
- "chacha20poly1305",
- "displaydoc",
- "getrandom 0.2.9",
- "hmac",
- "pbkdf2",
- "rand 0.8.5",
- "rmp-serde",
- "serde",
- "serde_json",
- "sha2 0.10.6",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "matrix-sdk-test"
-version = "0.6.0"
-dependencies = [
- "http",
- "matrix-sdk-test-macros",
- "once_cell",
- "ruma",
- "serde",
- "serde_json",
- "tokio",
- "wasm-bindgen-test",
-]
-
-[[package]]
-name = "matrix-sdk-test-macros"
-version = "0.3.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minimal-lexical"
-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.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "napi"
-version = "2.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b29acdc6cc5c918c3eabd51d241b1c6dfa8914f3552fcfd76e1d7536934581"
-dependencies = [
- "bitflags 2.2.1",
- "ctor 0.2.0",
- "napi-derive",
- "napi-sys",
- "once_cell",
- "tokio",
-]
-
-[[package]]
-name = "napi-build"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
-
-[[package]]
-name = "napi-derive"
-version = "2.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787"
-dependencies = [
- "convert_case",
- "napi-derive-backend",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "napi-derive-backend"
-version = "1.0.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925"
-dependencies = [
- "convert_case",
- "once_cell",
- "proc-macro2",
- "quote",
- "regex",
- "semver",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "napi-sys"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "nix"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "static_assertions",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec",
- "itoa",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg",
- "num-integer",
- "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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi 0.2.6",
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.30.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "olm-rs"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6c2c7054110ce4d7b4756d7b7fe507fea9413968ad0ef8f1d043d504aec725"
-dependencies = [
- "getrandom 0.2.9",
- "olm-sys",
- "serde",
- "serde_json",
- "zeroize",
-]
-
-[[package]]
-name = "olm-sys"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2afecf25624989021f9f0f157f7152102fd147b89445d08449739f216002d339"
-dependencies = [
- "cmake",
- "fs_extra",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
-
-[[package]]
-name = "oorandom"
-version = "11.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ea2d98598bf9ada7ea6ee8a30fb74f9156b63bbe495d64ec2b87c269d2dda3"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "992bac49bdbab4423199c654a5515bd2a6c6a23bf03f2dd3bdb7e5ae6259bc69"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "opentelemetry"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e"
-dependencies = [
- "opentelemetry_api",
- "opentelemetry_sdk",
-]
-
-[[package]]
-name = "opentelemetry-http"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d"
-dependencies = [
- "async-trait",
- "bytes",
- "http",
- "opentelemetry_api",
- "reqwest",
-]
-
-[[package]]
-name = "opentelemetry-otlp"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde"
-dependencies = [
- "async-trait",
- "futures",
- "futures-util",
- "http",
- "opentelemetry",
- "opentelemetry-http",
- "opentelemetry-proto",
- "prost",
- "reqwest",
- "thiserror",
- "tokio",
- "tonic",
-]
-
-[[package]]
-name = "opentelemetry-proto"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28"
-dependencies = [
- "futures",
- "futures-util",
- "opentelemetry",
- "prost",
- "tonic",
- "tonic-build",
-]
-
-[[package]]
-name = "opentelemetry_api"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22"
-dependencies = [
- "fnv",
- "futures-channel",
- "futures-util",
- "indexmap",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "thiserror",
-]
-
-[[package]]
-name = "opentelemetry_sdk"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113"
-dependencies = [
- "async-trait",
- "crossbeam-channel",
- "dashmap",
- "fnv",
- "futures-channel",
- "futures-executor",
- "futures-util",
- "once_cell",
- "opentelemetry_api",
- "percent-encoding",
- "rand 0.8.5",
- "thiserror",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.7",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest 0.10.6",
- "hmac",
- "password-hash",
- "sha2 0.10.6",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
-dependencies = [
- "phf_macros",
- "phf_shared 0.11.1",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
-dependencies = [
- "phf_shared 0.11.1",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
-dependencies = [
- "phf_generator 0.11.1",
- "phf_shared 0.11.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs7"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7364e6d0e236473de91e042395d71e0e64715f99a60620b014a4a4c7d1619b"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
-[[package]]
-name = "plotters"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
-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.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide 0.7.1",
-]
-
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "poly1305"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "pprof"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059"
-dependencies = [
- "backtrace",
- "cfg-if",
- "criterion",
- "findshlibs",
- "inferno",
- "libc",
- "log",
- "nix",
- "once_cell",
- "parking_lot 0.12.1",
- "smallvec",
- "symbolic-demangle",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "prettyplease"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit",
-]
-
-[[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.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proptest"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "lazy_static",
- "num-traits",
- "quick-error",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_xorshift",
- "regex-syntax 0.6.29",
- "unarray",
-]
-
-[[package]]
-name = "prost"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
-dependencies = [
- "bytes",
- "heck",
- "itertools",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn 1.0.109",
- "tempfile",
- "which",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "pulldown-cmark"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
-dependencies = [
- "bitflags 1.3.2",
- "memchr",
- "unicase",
-]
-
-[[package]]
-name = "qrcode"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f"
-dependencies = [
- "checked_int_cast",
- "image 0.23.14",
-]
-
-[[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.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.9",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
-dependencies = [
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_xoshiro"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
-dependencies = [
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rayon"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "readlock"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5b7f359207e69e1395440120fa3b07c59bb92c4ec077804cd10d7ebbe4c01a"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom 0.2.9",
- "redox_syscall 0.2.16",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.7.1",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
-
-[[package]]
-name = "reqwest"
-version = "0.11.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
-dependencies = [
- "async-compression",
- "base64 0.21.0",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls",
- "tokio-socks",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "retain_mut"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
-
-[[package]]
-name = "rgb"
-version = "0.8.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e"
-dependencies = [
- "byteorder",
- "rmp",
- "serde",
-]
-
-[[package]]
-name = "ruma"
-version = "0.8.2"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "assign",
- "js_int",
- "js_option",
- "ruma-appservice-api",
- "ruma-client-api",
- "ruma-common",
- "ruma-federation-api",
- "ruma-push-gateway-api",
-]
-
-[[package]]
-name = "ruma-appservice-api"
-version = "0.8.1"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "js_int",
- "ruma-common",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "ruma-client-api"
-version = "0.16.2"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "assign",
- "bytes",
- "http",
- "js_int",
- "js_option",
- "maplit",
- "ruma-common",
- "serde",
- "serde_html_form",
- "serde_json",
-]
-
-[[package]]
-name = "ruma-common"
-version = "0.11.3"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "base64 0.21.0",
- "bytes",
- "form_urlencoded",
- "getrandom 0.2.9",
- "html5ever",
- "http",
- "indexmap",
- "js-sys",
- "js_int",
- "js_option",
- "konst",
- "percent-encoding",
- "phf 0.11.1",
- "pulldown-cmark",
- "rand 0.8.5",
- "regex",
- "ruma-identifiers-validation",
- "ruma-macros",
- "serde",
- "serde_html_form",
- "serde_json",
- "thiserror",
- "tracing",
- "url",
- "uuid",
- "wildmatch",
-]
-
-[[package]]
-name = "ruma-federation-api"
-version = "0.7.1"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "js_int",
- "ruma-common",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "ruma-identifiers-validation"
-version = "0.9.1"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "js_int",
- "thiserror",
-]
-
-[[package]]
-name = "ruma-macros"
-version = "0.11.3"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "once_cell",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "ruma-identifiers-validation",
- "serde",
- "syn 1.0.109",
- "toml 0.7.3",
-]
-
-[[package]]
-name = "ruma-push-gateway-api"
-version = "0.7.1"
-source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945"
-dependencies = [
- "js_int",
- "ruma-common",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "rusqlite"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a"
-dependencies = [
- "bitflags 1.3.2",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "smallvec",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustix"
-version = "0.37.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
-dependencies = [
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
-dependencies = [
- "base64 0.21.0",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
-
-[[package]]
-name = "ryu"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "sanitize-filename-reader-friendly"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b750e71aac86f4b238844ac9416e7339a8de1225eb1ebe5fba89890f634c46bf"
-dependencies = [
- "const_format",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "scoped-tls"
-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.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
-
-[[package]]
-name = "scroll"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.160"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.160"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "serde_html_form"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53192e38d5c88564b924dbe9b60865ecbb71b81d38c4e61c817cffd3e36ef696"
-dependencies = [
- "form_urlencoded",
- "indexmap",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.96"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_qs"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.9.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
-
-[[package]]
-name = "siphasher"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-
-[[package]]
-name = "slab"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "sled"
-version = "0.34.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
-dependencies = [
- "crc32fast",
- "crossbeam-epoch",
- "crossbeam-utils",
- "fs2",
- "fxhash",
- "libc",
- "log",
- "parking_lot 0.11.2",
-]
-
-[[package]]
-name = "sliding-sync-integration-test"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assert_matches",
- "eyeball",
- "eyeball-im",
- "futures",
- "matrix-sdk",
- "matrix-sdk-integration-testing",
- "tokio",
- "uuid",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spki"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
-dependencies = [
- "der",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "str_stack"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
-
-[[package]]
-name = "string_cache"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot 0.12.1",
- "phf_shared 0.10.0",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "symbolic-common"
-version = "10.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737"
-dependencies = [
- "debugid",
- "memmap2",
- "stable_deref_trait",
- "uuid",
-]
-
-[[package]]
-name = "symbolic-demangle"
-version = "10.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489"
-dependencies = [
- "cpp_demangle",
- "rustc-demangle",
- "symbolic-common",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "tempfile"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
-dependencies = [
- "cfg-if",
- "fastrand",
- "redox_syscall 0.3.5",
- "rustix",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
-[[package]]
-name = "thiserror"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tiff"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437"
-dependencies = [
- "jpeg-decoder 0.1.22",
- "miniz_oxide 0.4.4",
- "weezl",
-]
-
-[[package]]
-name = "tiff"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
-dependencies = [
- "flate2",
- "jpeg-decoder 0.3.0",
- "weezl",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
-dependencies = [
- "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
-[[package]]
-name = "time-macros"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
-dependencies = [
- "time-core",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-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.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
-dependencies = [
- "autocfg",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "pin-project-lite",
- "socket2",
- "tokio-macros",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
-dependencies = [
- "either",
- "futures-util",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tonic"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.13.1",
- "bytes",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "prost-derive",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
-dependencies = [
- "prettyplease",
- "proc-macro2",
- "prost-build",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap",
- "pin-project",
- "pin-project-lite",
- "rand 0.8.5",
- "slab",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-android"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12612be8f868a09c0ceae7113ff26afe79d81a24473a393cb9120ece162e86c0"
-dependencies = [
- "android_log-sys",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-opentelemetry"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de"
-dependencies = [
- "once_cell",
- "opentelemetry",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "time 0.3.20",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "unarray"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "uniffi"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "anyhow",
- "camino",
- "clap 3.2.23",
- "uniffi_bindgen",
- "uniffi_build",
- "uniffi_core",
- "uniffi_macros",
-]
-
-[[package]]
-name = "uniffi-bindgen"
-version = "0.1.0"
-dependencies = [
- "uniffi",
-]
-
-[[package]]
-name = "uniffi_bindgen"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "anyhow",
- "askama",
- "camino",
- "fs-err",
- "glob",
- "goblin",
- "heck",
- "once_cell",
- "paste",
- "serde",
- "serde_json",
- "toml 0.5.11",
- "uniffi_meta",
- "uniffi_testing",
- "weedle2",
-]
-
-[[package]]
-name = "uniffi_build"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "anyhow",
- "camino",
- "uniffi_bindgen",
-]
-
-[[package]]
-name = "uniffi_checksum_derive"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "uniffi_core"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "anyhow",
- "bytes",
- "camino",
- "cargo_metadata",
- "log",
- "once_cell",
- "paste",
- "static_assertions",
-]
-
-[[package]]
-name = "uniffi_macros"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "bincode",
- "camino",
- "fs-err",
- "once_cell",
- "proc-macro2",
- "quote",
- "serde",
- "syn 1.0.109",
- "toml 0.5.11",
- "uniffi_build",
- "uniffi_meta",
-]
-
-[[package]]
-name = "uniffi_meta"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "anyhow",
- "bytes",
- "serde",
- "siphasher",
- "uniffi_checksum_derive",
- "uniffi_core",
-]
-
-[[package]]
-name = "uniffi_testing"
-version = "0.23.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "anyhow",
- "camino",
- "cargo_metadata",
- "fs-err",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "uuid"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
-dependencies = [
- "getrandom 0.2.9",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "value-bag"
-version = "1.0.0-alpha.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor 0.1.26",
- "version_check",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vodozemac"
-version = "0.3.0"
-source = "git+https://github.com/matrix-org/vodozemac?rev=fb609ca1e4df5a7a818490ae86ac694119e41e71#fb609ca1e4df5a7a818490ae86ac694119e41e71"
-dependencies = [
- "aes",
- "arrayvec",
- "base64 0.13.1",
- "cbc",
- "ed25519-dalek",
- "hkdf",
- "hmac",
- "matrix-pickle",
- "pkcs7",
- "prost",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "sha2 0.10.6",
- "subtle",
- "thiserror",
- "x25519-dalek",
- "zeroize",
-]
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
-[[package]]
-name = "walkdir"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
-
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
-dependencies = [
- "console_error_panic_hook",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "wasm-command-bot"
-version = "0.1.0"
-dependencies = [
- "console_error_panic_hook",
- "matrix-sdk",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "weedle2"
-version = "4.0.0"
-source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "wildmatch"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
-
-[[package]]
-name = "winnow"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "wiremock"
-version = "0.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c"
-dependencies = [
- "assert-json-diff",
- "async-trait",
- "base64 0.21.0",
- "deadpool",
- "futures",
- "futures-timer",
- "http-types",
- "hyper",
- "log",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "tokio",
-]
-
-[[package]]
-name = "x25519-dalek"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "serde",
- "zeroize",
-]
-
-[[package]]
-name = "xshell"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaad2035244c56da05573d4d7fda5f903c60a5f35b9110e157a14a1df45a9f14"
-dependencies = [
- "xshell-macros",
-]
-
-[[package]]
-name = "xshell-macros"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4916a4a3cad759e499a3620523bf9545cc162d7a06163727dde97ce9aaa4cf39"
-
-[[package]]
-name = "xtask"
-version = "0.1.0"
-dependencies = [
- "camino",
- "clap 4.2.4",
- "fs_extra",
- "serde",
- "serde_json",
- "uniffi",
- "uniffi_bindgen",
- "xshell",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock
new file mode 100644
index 000000000000..9dba9d42911d
--- /dev/null
+++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock
@@ -0,0 +1,2309 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
+[[package]]
+name = "anyhow"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "as_variant"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f"
+
+[[package]]
+name = "assign"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
+
+[[package]]
+name = "async-trait"
+version = "0.1.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitmaps"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
+
+[[package]]
+name = "blake3"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const_panic"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "typenum",
+]
+
+[[package]]
+name = "ctor"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b"
+dependencies = [
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
+ "serde",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "date_header"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d"
+
+[[package]]
+name = "deadpool"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490"
+dependencies = [
+ "async-trait",
+ "deadpool-runtime",
+ "num_cpus",
+ "tokio",
+]
+
+[[package]]
+name = "deadpool-runtime"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1"
+dependencies = [
+ "tokio",
+]
+
+[[package]]
+name = "deadpool-sqlite"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8010e36e12f3be22543a5e478b4af20aeead9a700dd69581a5e050a070fc22c"
+dependencies = [
+ "deadpool",
+ "deadpool-sync",
+ "rusqlite",
+]
+
+[[package]]
+name = "deadpool-sync"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04"
+dependencies = [
+ "deadpool-runtime",
+]
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid",
+ "der_derive",
+ "flagset",
+ "zeroize",
+]
+
+[[package]]
+name = "der_derive"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyeball"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb"
+dependencies = [
+ "futures-core",
+ "readlock",
+ "tracing",
+]
+
+[[package]]
+name = "eyeball-im"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d"
+dependencies = [
+ "futures-core",
+ "imbl",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
+[[package]]
+name = "flagset"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[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-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f"
+dependencies = [
+ "hashbrown",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[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 = "imbl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085"
+dependencies = [
+ "bitmaps",
+ "imbl-sized-chunks",
+ "rand_core",
+ "rand_xoshiro",
+ "version_check",
+]
+
+[[package]]
+name = "imbl-sized-chunks"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
+dependencies = [
+ "bitmaps",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+ "serde",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "js_int"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "js_option"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "konst"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7"
+dependencies = [
+ "const_panic",
+ "konst_kernel",
+ "typewit",
+]
+
+[[package]]
+name = "konst_kernel"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5"
+dependencies = [
+ "typewit",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "log"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "matrix-pickle"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826"
+dependencies = [
+ "matrix-pickle-derive",
+ "thiserror",
+]
+
+[[package]]
+name = "matrix-pickle-derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "matrix-sdk-base"
+version = "0.7.0"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472"
+dependencies = [
+ "as_variant",
+ "async-trait",
+ "bitflags",
+ "eyeball",
+ "eyeball-im",
+ "futures-util",
+ "matrix-sdk-common",
+ "matrix-sdk-store-encryption",
+ "once_cell",
+ "ruma",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "matrix-sdk-common"
+version = "0.7.0"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472"
+dependencies = [
+ "async-trait",
+ "futures-core",
+ "futures-util",
+ "gloo-timers",
+ "instant",
+ "ruma",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "matrix-sdk-crypto"
+version = "0.7.1"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472"
+dependencies = [
+ "aes",
+ "as_variant",
+ "async-trait",
+ "bs58",
+ "byteorder",
+ "cbc",
+ "cfg-if",
+ "ctr",
+ "eyeball",
+ "futures-core",
+ "futures-util",
+ "hkdf",
+ "hmac",
+ "itertools",
+ "js_option",
+ "matrix-sdk-common",
+ "matrix-sdk-qrcode",
+ "pbkdf2",
+ "rand",
+ "rmp-serde",
+ "ruma",
+ "serde",
+ "serde_json",
+ "sha2",
+ "subtle",
+ "thiserror",
+ "time",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+ "vodozemac",
+ "zeroize",
+]
+
+[[package]]
+name = "matrix-sdk-crypto-nodejs"
+version = "0.0.0"
+dependencies = [
+ "ahash",
+ "http",
+ "matrix-sdk-common",
+ "matrix-sdk-crypto",
+ "matrix-sdk-sqlite",
+ "napi",
+ "napi-build",
+ "napi-derive",
+ "serde_json",
+ "tracing-subscriber",
+ "zeroize",
+]
+
+[[package]]
+name = "matrix-sdk-qrcode"
+version = "0.7.0"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472"
+dependencies = [
+ "byteorder",
+ "qrcode",
+ "ruma-common",
+ "thiserror",
+ "vodozemac",
+]
+
+[[package]]
+name = "matrix-sdk-sqlite"
+version = "0.7.0"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472"
+dependencies = [
+ "async-trait",
+ "deadpool-sqlite",
+ "itertools",
+ "matrix-sdk-base",
+ "matrix-sdk-crypto",
+ "matrix-sdk-store-encryption",
+ "rmp-serde",
+ "ruma",
+ "rusqlite",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vodozemac",
+]
+
+[[package]]
+name = "matrix-sdk-store-encryption"
+version = "0.7.0"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472"
+dependencies = [
+ "base64",
+ "blake3",
+ "chacha20poly1305",
+ "hmac",
+ "pbkdf2",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_json",
+ "sha2",
+ "thiserror",
+ "zeroize",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "napi"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e"
+dependencies = [
+ "bitflags",
+ "ctor",
+ "napi-derive",
+ "napi-sys",
+ "once_cell",
+ "tokio",
+]
+
+[[package]]
+name = "napi-build"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
+
+[[package]]
+name = "napi-derive"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367"
+dependencies = [
+ "cfg-if",
+ "convert_case",
+ "napi-derive-backend",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "napi-derive-backend"
+version = "1.0.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
+dependencies = [
+ "convert_case",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "semver",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "napi-sys"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs7"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d79178be066405e0602bf3035946edef6b11b3f9dde46dfe5f8bfd7dea4b77e7"
+dependencies = [
+ "der",
+ "spki",
+ "x509-cert",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "platforms"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
+
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+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",
+ "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.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "qrcode"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d"
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_xoshiro"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "readlock"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2"
+
+[[package]]
+name = "regex"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.3.6",
+ "regex-syntax 0.7.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.4",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+
+[[package]]
+name = "rmp"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
+[[package]]
+name = "ruma"
+version = "0.10.1"
+source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66"
+dependencies = [
+ "assign",
+ "js_int",
+ "js_option",
+ "ruma-client-api",
+ "ruma-common",
+ "ruma-events",
+ "web-time",
+]
+
+[[package]]
+name = "ruma-client-api"
+version = "0.18.0"
+source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66"
+dependencies = [
+ "as_variant",
+ "assign",
+ "bytes",
+ "date_header",
+ "http",
+ "js_int",
+ "js_option",
+ "maplit",
+ "ruma-common",
+ "ruma-events",
+ "serde",
+ "serde_html_form",
+ "serde_json",
+ "thiserror",
+ "url",
+ "web-time",
+]
+
+[[package]]
+name = "ruma-common"
+version = "0.13.0"
+source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66"
+dependencies = [
+ "as_variant",
+ "base64",
+ "bytes",
+ "form_urlencoded",
+ "getrandom",
+ "http",
+ "indexmap",
+ "js-sys",
+ "js_int",
+ "konst",
+ "percent-encoding",
+ "rand",
+ "regex",
+ "ruma-identifiers-validation",
+ "ruma-macros",
+ "serde",
+ "serde_html_form",
+ "serde_json",
+ "thiserror",
+ "time",
+ "tracing",
+ "url",
+ "uuid",
+ "web-time",
+ "wildmatch",
+]
+
+[[package]]
+name = "ruma-events"
+version = "0.28.1"
+source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66"
+dependencies = [
+ "as_variant",
+ "indexmap",
+ "js_int",
+ "js_option",
+ "percent-encoding",
+ "regex",
+ "ruma-common",
+ "ruma-identifiers-validation",
+ "ruma-macros",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+ "url",
+ "wildmatch",
+]
+
+[[package]]
+name = "ruma-identifiers-validation"
+version = "0.9.5"
+source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66"
+dependencies = [
+ "js_int",
+ "thiserror",
+]
+
+[[package]]
+name = "ruma-macros"
+version = "0.13.0"
+source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "ruma-identifiers-validation",
+ "serde",
+ "syn 2.0.66",
+ "toml",
+]
+
+[[package]]
+name = "rusqlite"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d"
+dependencies = [
+ "bitflags",
+ "fallible-iterator",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "semver"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+dependencies = [
+ "serde",
+]
+
+[[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 2.0.66",
+]
+
+[[package]]
+name = "serde_html_form"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c"
+dependencies = [
+ "form_urlencoded",
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+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.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
+dependencies = [
+ "backtrace",
+ "num_cpus",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.7",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.11",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "time",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "typewit"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "uuid"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+dependencies = [
+ "getrandom",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "vodozemac"
+version = "0.6.0"
+source = "git+https://github.com/matrix-org/vodozemac/?rev=4ef989c6a8eba0bc809e285a081c56320a9bbf1e#4ef989c6a8eba0bc809e285a081c56320a9bbf1e"
+dependencies = [
+ "aes",
+ "arrayvec",
+ "base64",
+ "cbc",
+ "chacha20poly1305",
+ "curve25519-dalek",
+ "ed25519-dalek",
+ "getrandom",
+ "hkdf",
+ "hmac",
+ "matrix-pickle",
+ "pkcs7",
+ "prost",
+ "rand",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "sha2",
+ "subtle",
+ "thiserror",
+ "x25519-dalek",
+ "zeroize",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "web-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wildmatch"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "winnow"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f495880723d0999eb3500a9064d8dbcf836460b24c17df80ea7b5794053aac"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "x25519-dalek"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+dependencies = [
+ "curve25519-dalek",
+ "rand_core",
+ "serde",
+ "zeroize",
+]
+
+[[package]]
+name = "x509-cert"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94"
+dependencies = [
+ "const-oid",
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix
index e92dccd640f5..1ffe479c4ff2 100644
--- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix
+++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix
@@ -1,13 +1,76 @@
-import ./generic.nix {
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cargo,
+  rustPlatform,
+  rustc,
+  napi-rs-cli,
+  nodejs,
+  libiconv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "matrix-sdk-crypto-nodejs";
   version = "0.1.0-beta.3";
-  hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";
-  outputHashes = {
-    "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";
+
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "matrix-rust-sdk";
+    rev = "${pname}-v${version}";
+    hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";
   };
-  cargoLock = ./Cargo-beta.3.lock;
+
   patches = [
     # This is needed because two versions of indexed_db_futures are present (which will fail to vendor, see https://github.com/rust-lang/cargo/issues/10310).
     # (matrix-sdk-crypto-nodejs doesn't use this dependency, we only need to remove it to vendor the dependencies successfully.)
     ./remove-duplicate-dependency.patch
   ];
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo-beta.3.lock;
+    outputHashes = {
+      "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";
+    };
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+    napi-rs-cli
+    nodejs
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    cd bindings/${pname}
+    npm run release-build --offline
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"
+    mkdir -p "$outPath"
+    cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients";
+    homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs";
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      winter
+      dandellion
+    ];
+    inherit (nodejs.meta) platforms;
+  };
 }
diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix
index 9955e2af84b9..093d3d7a2133 100644
--- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix
+++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix
@@ -1,11 +1,72 @@
-import ./generic.nix {
-  version = "0.1.0-beta.6";
-  hash = "sha256-0oLk7yq/XELS0GkeZj7PxY3KKXfzws0djF3KmxYisY0=";
-  outputHashes = {
-    "ruma-0.8.2" = "sha256-bKvcElIVugj+gZZhPFPGfCqva4fo1IqW/e9gf+q/Tfw=";
-    "uniffi-0.23.0" = "sha256-4WUp3PQm3ZgqHNMvz9+PBtNAeiq6m4PBViwXpQDglLk=";
-    "vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE=";
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cargo,
+  rustPlatform,
+  rustc,
+  napi-rs-cli,
+  nodejs,
+  libiconv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "matrix-sdk-crypto-nodejs";
+  version = "0.2.0-beta.1";
+
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "matrix-rust-sdk-crypto-nodejs";
+    rev = "v${version}";
+    hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "matrix-sdk-base-0.7.0" = "sha256-nCiG4T/MB7gvGrmadKOEbh8+54081PHee9Bm8oY/nl0=";
+      "ruma-0.10.1" = "sha256-Yc5RKk4aRjNIoQsMl30fFehTDCkRO9VvenAvLoVHzXo=";
+      "vodozemac-0.6.0" = "sha256-jJgrJJ0SFcy2oRRZ3ubuKnM2pLO8Tx6NyXordWJjz8o=";
+    };
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+    napi-rs-cli
+    nodejs
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run release-build --offline
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"
+    mkdir -p "$outPath"
+    cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients";
+    homepage = "https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs";
+    changelog = "https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs/blob/main/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      winter
+      dandellion
+    ];
+    inherit (nodejs.meta) platforms;
   };
-  cargoLock = ./Cargo-beta.6.lock;
-  patches = [];
 }
diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix
deleted file mode 100644
index c0b068499cd3..000000000000
--- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ version, hash, outputHashes, cargoLock, patches }:
-
-{ lib, stdenv, fetchFromGitHub
-, cargo, rustPlatform, rustc, napi-rs-cli, nodejs, libiconv
-}:
-
-stdenv.mkDerivation rec {
-  pname = "matrix-sdk-crypto-nodejs";
-  inherit version patches;
-
-  src = fetchFromGitHub {
-    owner = "matrix-org";
-    repo = "matrix-rust-sdk";
-    rev = "${pname}-v${version}";
-    inherit hash;
-  };
-
-
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = cargoLock;
-    inherit outputHashes;
-  };
-
-  nativeBuildInputs = [
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-    napi-rs-cli
-    nodejs
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    cd bindings/${pname}
-    npm run release-build --offline
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"
-    mkdir -p "$outPath"
-    cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients";
-    homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ winter ];
-    inherit (nodejs.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/memstream/default.nix b/pkgs/development/libraries/memstream/default.nix
index 90505a56a931..7877718e6d35 100644
--- a/pkgs/development/libraries/memstream/default.nix
+++ b/pkgs/development/libraries/memstream/default.nix
@@ -9,13 +9,18 @@ stdenv.mkDerivation rec {
     sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail 'cc' '$(CC)'
+  '';
+
   dontConfigure = true;
 
   postBuild = ''
     $AR rcs libmemstream.a memstream.o
   '';
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 0261d4839054..b7c90f36db74 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "24.2.4";
+  version = "24.2.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-pgyvgMHImWO+b4vpCCe4+zOI98XCqcG8NRWpIcImGUk=";
+    hash = "sha256-GghJVjR9NrlNLAd8c1lG8E6/WECqO+Ti3F6JRMgd2jQ=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f5d44ff4623a..fb5f6b1d817c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -170,7 +170,7 @@ in stdenv.mkDerivation {
 
   # Needed to discover llvm-config for cross
   preConfigure = ''
-    PATH=${llvmPackages.libllvm.dev}/bin:$PATH
+    PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH
   '';
 
   mesonFlags = [
@@ -204,7 +204,7 @@ in stdenv.mkDerivation {
     # Enable Intel RT stuff when available
     (lib.mesonBool "install-intel-clc" true)
     (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
-    (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib")
+    (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")
 
     # Clover, old OpenCL frontend
     (lib.mesonOption "gallium-opencl" "icd")
diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix
deleted file mode 100644
index ffc6665af42a..000000000000
--- a/pkgs/development/libraries/minizip-ng/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, gtest
-, pkg-config
-, zlib
-, bzip2
-, xz
-, zstd
-, openssl
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "minizip-ng";
-  version = "4.0.3";
-
-  src = fetchFromGitHub {
-    owner = "zlib-ng";
-    repo = "minizip-ng";
-    rev = finalAttrs.version;
-    hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ zlib bzip2 xz zstd openssl ];
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
-    "-DMZ_OPENSSL=ON"
-    "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
-    "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
-    "-DMZ_LIB_SUFFIX='-ng'"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # missing header file
-    "-DMZ_LIBCOMP=OFF"
-  ];
-
-  postInstall = ''
-    # make lib findable as libminizip-ng even if compat is enabled
-    for ext in so dylib a ; do
-      if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then
-        ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext
-      fi
-    done
-    if [ ! -e $out/include/minizip-ng ]; then
-      ln -s $out/include $out/include/minizip-ng
-    fi
-  '';
-
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-  nativeCheckInputs = [ gtest ];
-  enableParallelChecking = false;
-
-  meta = with lib; {
-    description = "Fork of the popular zip manipulation library found in the zlib distribution";
-    homepage = "https://github.com/zlib-ng/minizip-ng";
-    license = licenses.zlib;
-    maintainers = with maintainers; [ gebner ris ];
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 2a4e89d7f3df..0ee09d2416cd 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -9,6 +9,7 @@
 , enableStatic ? stdenv.hostPlatform.isStatic
 , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
 , mouseSupport ? false, gpm
+, withTermlib ? false
 , unicodeSupport ? true
 , testers
 , binlore
@@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional (!withCxx) "--without-cxx"
     ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
     ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
+    ++ lib.optional withTermlib "--with-termlib"
     ++ lib.optionals stdenv.hostPlatform.isWindows [
       "--enable-sp-funcs"
       "--enable-term-driver"
diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix
deleted file mode 100644
index dbed519662fe..000000000000
--- a/pkgs/development/libraries/neatvnc/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, aml
-, ffmpeg
-, gnutls
-, libjpeg_turbo
-, mesa
-, pixman
-, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "neatvnc";
-  version = "0.8.1";
-
-  src = fetchFromGitHub {
-    owner = "any1";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg=";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-  ];
-
-  buildInputs = [
-    aml
-    ffmpeg
-    gnutls
-    libjpeg_turbo
-    mesa
-    pixman
-    zlib
-  ];
-
-  mesonFlags = [
-    (lib.mesonBool "tests" true)
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "VNC server library";
-    longDescription = ''
-      This is a liberally licensed VNC server library that's intended to be
-      fast and neat. Goals:
-      - Speed
-      - Clean interface
-      - Interoperability with the Freedesktop.org ecosystem
-    '';
-    inherit (src.meta) homepage;
-    changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nickcao ];
-  };
-}
diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 143bb32a5677..a6c5e3dd4c2b 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.105";
-  hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ=";
+  version = "3.106";
+  hash = "sha256-j8B5RgEdBbtqPmIUniNF8ToGPIrPJ8gVTMplcv72fD0=";
 }
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index 786a11f48204..aa8f6a16c442 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvidia-vaapi-driver";
-  version = "0.0.12";
+  version = "0.0.13";
 
   src = fetchFromGitHub {
     owner = "elFarto";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ETdHbPI3rZR4026rOT5K9/pjKTZxD5+RioKzUVGMwsA=";
+    sha256 = "sha256-KeOg9VvPTqIo0qB+dcU915yTztvFxo1jJcHHpsmMmfk=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
deleted file mode 100644
index 831c8a4e2afd..000000000000
--- a/pkgs/development/libraries/odpic/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
-
-let
-  version = "5.3.0";
-  libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
-
-in
-stdenv.mkDerivation {
-  inherit version;
-
-  pname = "odpic";
-
-  src = fetchFromGitHub {
-    owner = "oracle";
-    repo = "odpi";
-    rev = "v${version}";
-    sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA=";
-  };
-
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-
-  buildInputs = [ oracle-instantclient ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ];
-
-  dontPatchELF = true;
-  makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];
-
-  postFixup = ''
-    ${lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''}
-    ${lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-      install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''}
-  '';
-
-  meta = with lib; {
-    description = "Oracle ODPI-C library";
-    homepage = "https://oracle.github.io/odpi/";
-    maintainers = with maintainers; [ mkazulak ];
-    license = licenses.asl20;
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
-    hydraPlatforms = [ ];
-  };
-}
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 0643fabdd8c6..2a4007c3ce71 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -112,9 +112,9 @@ let
 in
 {
   ogre_14 = common {
-    version = "14.3.0";
-    hash = "sha256-SQ0Ij04W/KgonHDLFEPFDhXb/TDkT8I6W8J7hz3gtrg=";
-    # https://github.com/OGRECave/ogre/blob/v14.3.0/Components/Overlay/CMakeLists.txt
+    version = "14.3.1";
+    hash = "sha256-rr8tetBfFdZPVvN3fYRWltf8/e6oLcLL0uhHKWanuVA=";
+    # https://github.com/OGRECave/ogre/blob/v14.3.1/Components/Overlay/CMakeLists.txt
     imguiVersion = "1.91.2";
     imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI=";
   };
diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix
deleted file mode 100644
index a4d2f115cc67..000000000000
--- a/pkgs/development/libraries/opencl-clang/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ lib
-, stdenv
-, applyPatches
-, fetchFromGitHub
-, cmake
-, git
-, llvmPackages_14
-, spirv-llvm-translator
-, buildWithPatches ? true
-}:
-
-let
-  addPatches = component: pkg: pkg.overrideAttrs (oldAttrs: {
-    postPatch = oldAttrs.postPatch or "" + ''
-      for p in ${passthru.patchesOut}/${component}/*; do
-        patch -p1 -i "$p"
-      done
-    '';
-  });
-
-  llvmPkgs = llvmPackages_14;
-  inherit (llvmPkgs) llvm;
-  spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
-  libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang;
-
-  passthru = rec {
-    spirv-llvm-translator = spirv-llvm-translator';
-    llvm = addPatches "llvm" llvmPkgs.llvm;
-    libclang = addPatches "clang" llvmPkgs.libclang;
-
-    clang-unwrapped = libclang.out;
-    clang = llvmPkgs.clang.override {
-      cc = clang-unwrapped;
-    };
-
-    patchesOut = stdenv.mkDerivation {
-      pname = "opencl-clang-patches";
-      inherit version src;
-      # Clang patches assume the root is the llvm root dir
-      # but clang root in nixpkgs is the clang sub-directory
-      postPatch = ''
-        for filename in patches/clang/*.patch; do
-          substituteInPlace "$filename" \
-            --replace "a/clang/" "a/" \
-            --replace "b/clang/" "b/"
-        done
-      '';
-
-      installPhase = ''
-        [ -d patches ] && cp -r patches/ $out || mkdir $out
-        mkdir -p $out/clang $out/llvm
-      '';
-    };
-  };
-
-  version = "14.0.0-unstable-2024-07-09";
-  src = applyPatches {
-    src = fetchFromGitHub {
-      owner = "intel";
-      repo = "opencl-clang";
-      # https://github.com/intel/opencl-clang/compare/ocl-open-140
-      rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc";
-      hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8=";
-    };
-
-    patches = [
-      # Build script tries to find Clang OpenCL headers under ${llvm}
-      # Work around it by specifying that directory manually.
-      ./opencl-headers-dir.patch
-    ];
-
-    postPatch = ''
-      # fix not be able to find clang from PATH
-      substituteInPlace cl_headers/CMakeLists.txt \
-        --replace " NO_DEFAULT_PATH" ""
-    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Uses linker flags that are not supported on Darwin.
-      sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt
-      substituteInPlace CMakeLists.txt \
-        --replace '-Wl,--no-undefined' ""
-    '';
-  };
-in
-
-stdenv.mkDerivation {
-  pname = "opencl-clang";
-  inherit version src;
-
-  nativeBuildInputs = [ cmake git llvm.dev ];
-
-  buildInputs = [ libclang llvm spirv-llvm-translator' ];
-
-  cmakeFlags = [
-    "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}"
-    "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/"
-
-    "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF"
-    "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}"
-  ];
-
-  inherit passthru;
-
-  meta = with lib; {
-    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 = [ ];
-    platforms = platforms.all;
-    # error: invalid value 'CL3.0' in '-cl-std=CL3.0'
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-}
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
deleted file mode 100644
index b13dc2bb8dd7..000000000000
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, hashcat
-, ocl-icd
-, tesseract
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "opencl-headers";
-  version = "2023.12.14";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "OpenCL-Headers";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  passthru.tests = {
-    inherit ocl-icd tesseract hashcat;
-    pkg-config = testers.hasPkgConfigModules {
-      package = finalAttrs.finalPackage;
-      moduleNames = [ "OpenCL-Headers" ];
-    };
-  };
-
-  meta = with lib; {
-    description = "Khronos OpenCL headers version ${finalAttrs.version}";
-    homepage = "https://www.khronos.org/registry/cl/";
-    license = licenses.asl20;
-    platforms = platforms.unix ++ platforms.windows;
-    maintainers = [ ];
-  };
-})
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index 56562f771698..65666cd7d6f2 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -5,6 +5,7 @@
 , imath
 , libdeflate
 , pkg-config
+, libjxl
 , pkgsCross
 }:
 
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.hostPlatform.isAarch32;
 
   passthru.tests = {
+    inherit libjxl;
     musl = pkgsCross.musl64.openexr_3;
   };
 
diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix
index 51c1f255c326..4decdf16d38b 100644
--- a/pkgs/development/libraries/openimageio/default.nix
+++ b/pkgs/development/libraries/openimageio/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openimageio";
-  version = "2.5.15.0";
+  version = "2.5.16.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     rev = "v${version}";
-    hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio=";
+    hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo=";
   };
 
   # Workaround broken zlib version detecion in CMake < 3.37.
diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix
new file mode 100644
index 000000000000..a65bb286ae2e
--- /dev/null
+++ b/pkgs/development/libraries/openvdb/11.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  fetchFromGitHub,
+  openvdb,
+}:
+
+openvdb.overrideAttrs (old: rec {
+  name = "${old.pname}-${version}";
+  version = "11.0.0";
+  src = fetchFromGitHub {
+    owner = "AcademySoftwareFoundation";
+    repo = "openvdb";
+    rev = "v${version}";
+    sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
+  };
+  meta = old.meta // {
+    license = lib.licenses.mpl20;
+  };
+})
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index 72d2d7dce0c8..d7718eb1eee4 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec
 {
   pname = "openvdb";
-  version = "11.0.0";
+  version = "12.0.0";
 
   outputs = [ "out" "dev" ];
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
     rev = "v${version}";
-    sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
+    sha256 = "sha256-S2uvzDCrTxAmvUMJr5PChcYTqhIHvRZbOfQLtUvzypI=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec
     homepage = "https://www.openvdb.org";
     maintainers = [ maintainers.guibou ];
     platforms = platforms.unix;
-    license = licenses.mpl20;
+    license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix
deleted file mode 100644
index 98129c5944d1..000000000000
--- a/pkgs/development/libraries/openvino/default.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{ lib
-, gcc12Stdenv
-, fetchFromGitHub
-, fetchurl
-, cudaSupport ? opencv.cudaSupport or false
-
-# build
-, scons
-, addDriverRunpath
-, autoPatchelfHook
-, cmake
-, git
-, libarchive
-, patchelf
-, pkg-config
-, python3Packages
-, shellcheck
-
-# runtime
-, flatbuffers
-, level-zero
-, libusb1
-, libxml2
-, ocl-icd
-, opencv
-, protobuf
-, pugixml
-, snappy
-, tbb_2021_5
-, cudaPackages
-}:
-
-let
-  inherit (lib)
-    cmakeBool
-  ;
-
-  stdenv = gcc12Stdenv;
-
-  # prevent scons from leaking in the default python version
-  scons' = scons.override { inherit python3Packages; };
-
-  tbbbind_version = "2_5";
-  tbbbind = fetchurl {
-    url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz";
-    hash = "sha256-Tr8wJGUweV8Gb7lhbmcHxrF756ZdKdNRi1eKdp3VTuo=";
-  };
-
-  python = python3Packages.python.withPackages (ps: with ps; [
-    cython
-    pybind11
-    setuptools
-    sphinx
-    wheel
-  ]);
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "openvino";
-  version = "2024.2.0";
-
-  src = fetchFromGitHub {
-    owner = "openvinotoolkit";
-    repo = "openvino";
-    rev = "refs/tags/${version}";
-    fetchSubmodules = true;
-    hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4=";
-  };
-
-  outputs = [
-    "out"
-    "python"
-  ];
-
-  nativeBuildInputs = [
-    addDriverRunpath
-    autoPatchelfHook
-    cmake
-    git
-    libarchive
-    patchelf
-    pkg-config
-    python
-    scons'
-    shellcheck
-  ] ++ lib.optionals cudaSupport [
-    cudaPackages.cuda_nvcc
-  ];
-
-  postPatch = ''
-    mkdir -p temp/tbbbind_${tbbbind_version}
-    pushd temp/tbbbind_${tbbbind_version}
-    bsdtar -xf ${tbbbind}
-    echo "${tbbbind.url}" > ie_dependency.info
-    popd
-  '';
-
-  dontUseSconsCheck = true;
-  dontUseSconsBuild = true;
-  dontUseSconsInstall = true;
-
-  cmakeFlags = [
-    "-Wno-dev"
-    "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake"
-    "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}"
-    "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/"
-    "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"
-    "-DPython_EXECUTABLE=${python.interpreter}"
-
-    (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
-    (cmakeBool "NCC_SYLE" false)
-    (cmakeBool "BUILD_TESTING" false)
-    (cmakeBool "ENABLE_CPPLINT" false)
-    (cmakeBool "ENABLE_TESTING" false)
-    (cmakeBool "ENABLE_SAMPLES" false)
-
-    # features
-    (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64)
-    (cmakeBool "ENABLE_JS" false)
-    (cmakeBool "ENABLE_LTO" true)
-    (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false)
-    (cmakeBool "ENABLE_OPENCV" true)
-    (cmakeBool "ENABLE_PYTHON" true)
-
-    # system libs
-    (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true)
-    (cmakeBool "ENABLE_SYSTEM_OPENCL" true)
-    (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false)
-    (cmakeBool "ENABLE_SYSTEM_PUGIXML" true)
-    (cmakeBool "ENABLE_SYSTEM_SNAPPY" true)
-    (cmakeBool "ENABLE_SYSTEM_TBB" true)
-  ];
-
-  autoPatchelfIgnoreMissingDeps = [
-    "libngraph_backend.so"
-  ];
-
-  buildInputs = [
-    flatbuffers
-    level-zero
-    libusb1
-    libxml2
-    ocl-icd
-    opencv.cxxdev
-    pugixml
-    snappy
-    tbb_2021_5
-  ] ++ lib.optionals cudaSupport [
-    cudaPackages.cuda_cudart
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    mkdir -p $python
-    mv $out/python/* $python/
-    rmdir $out/python
-  '';
-
-  postFixup = ''
-    # Link to OpenCL
-    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addDriverRunpath "$lib"
-    done
-  '';
-
-  meta = with lib; {
-    description = "OpenVINO™ Toolkit repository";
-    longDescription = ''
-      This toolkit allows developers to deploy pre-trained deep learning models through a high-level C++ Inference Engine API integrated with application logic.
-
-      This open source version includes several components: namely Model Optimizer, nGraph and Inference Engine, as well as CPU, GPU, MYRIAD,
-      multi device and heterogeneous plugins to accelerate deep learning inferencing on Intel® CPUs and Intel® Processor Graphics.
-      It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*.
-    '';
-    homepage = "https://docs.openvinotoolkit.org/";
-    license = with licenses; [ asl20 ];
-    platforms = platforms.all;
-    broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk
-    maintainers = with maintainers; [ tfmoraes ];
-  };
-}
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
deleted file mode 100644
index 4d6a605bf084..000000000000
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-, fixDarwinDylibNames
-, unzip
-, libaio
-, makeWrapper
-, odbcSupport ? true
-, unixODBC
-}:
-
-assert odbcSupport -> unixODBC != null;
-
-let
-  inherit (lib) optional optionals optionalString;
-
-  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
-
-  # assemble list of components
-  components = [ "basic" "sdk" "sqlplus" "tools" ] ++ optional odbcSupport "odbc";
-
-  # determine the version number, there might be different ones per architecture
-  version = {
-    x86_64-linux = "21.10.0.0.0";
-    aarch64-linux = "19.10.0.0.0";
-    x86_64-darwin = "19.8.0.0.0";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  directory = {
-    x86_64-linux = "2110000";
-    aarch64-linux = "191000";
-    x86_64-darwin = "198000";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  # hashes per component and architecture
-  hashes = {
-    x86_64-linux = {
-      basic = "sha256-uo0QBOmx7TQyroD+As60IhjEkz//+0Cm1tWvLI3edaE=";
-      sdk = "sha256-TIBFi1jHLJh+SUNFvuL7aJpxh61hG6gXhFIhvdPgpts=";
-      sqlplus = "sha256-mF9kLjhZXe/fasYDfmZrYPL2CzAp3xDbi624RJDA4lM=";
-      tools = "sha256-ay8ynzo1fPHbCg9GoIT5ja//iZPIZA2yXI/auVExiRY=";
-      odbc = "sha256-3M6/cEtUrIFzQay8eHNiLGE+L0UF+VTmzp4cSBcrzlk=";
-    };
-    aarch64-linux = {
-      basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY=";
-      sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw=";
-      sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q=";
-      tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M=";
-      odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms=";
-    };
-    x86_64-darwin = {
-      basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc=";
-      sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw=";
-      sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk=";
-      tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU=";
-      odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY=";
-    };
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  # rels per component and architecture, optional
-  rels = { }.${stdenv.hostPlatform.system} or { };
-
-  # convert platform to oracle architecture names
-  arch = {
-    x86_64-linux = "linux.x64";
-    aarch64-linux = "linux.arm64";
-    x86_64-darwin = "macos.x64";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  shortArch = {
-    x86_64-linux = "linux";
-    aarch64-linux = "linux";
-    x86_64-darwin = "mac";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  # calculate the filename of a single zip file
-  srcFilename = component: arch: version: rel:
-    "instantclient-${component}-${arch}-${version}" +
-    (optionalString (rel != "") "-${rel}") +
-    "dbru.zip"; # ¯\_(ツ)_/¯
-
-  # fetcher for the non clickthrough artifacts
-  fetcher = srcFilename: hash: fetchurl {
-    url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/${directory}/${srcFilename}";
-    sha256 = hash;
-  };
-
-  # assemble srcs
-  srcs = map
-    (component:
-      (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or ""))
-    components;
-
-  pname = "oracle-instantclient";
-  extLib = stdenv.hostPlatform.extensions.sharedLibrary;
-in
-stdenv.mkDerivation {
-  inherit pname version srcs;
-
-  buildInputs = [ stdenv.cc.cc.lib ]
-    ++ optional stdenv.hostPlatform.isLinux libaio
-    ++ optional odbcSupport unixODBC;
-
-  nativeBuildInputs = [ makeWrapper unzip ]
-    ++ optional stdenv.hostPlatform.isLinux autoPatchelfHook
-    ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-
-  outputs = [ "out" "dev" "lib" ];
-
-  unpackCmd = "unzip $curSrc";
-
-  installPhase = ''
-    mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib
-    install -Dm755 {adrci,genezi,uidrvci,sqlplus,exp,expdp,imp,impdp} $out/bin
-
-    # cp to preserve symlinks
-    cp -P *${extLib}* $lib/lib
-
-    install -Dm644 *.jar $out/share/java
-    install -Dm644 sdk/include/* $out/include
-    install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo
-
-    # provide alias
-    ln -sfn $out/bin/sqlplus $out/bin/sqlplus64
-  '';
-
-  postFixup = optionalString stdenv.hostPlatform.isDarwin ''
-    for exe in "$out/bin/"* ; do
-      if [ ! -L "$exe" ]; then
-        install_name_tool -add_rpath "$lib/lib" "$exe"
-      fi
-    done
-  '';
-
-  meta = with lib; {
-    description = "Oracle instant client libraries and sqlplus CLI";
-    longDescription = ''
-      Oracle instant client provides access to Oracle databases (OCI,
-      OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus
-      command line SQL client.
-    '';
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
-    maintainers = with maintainers; [ dylanmtaylor ];
-    hydraPlatforms = [ ];
-  };
-}
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 4b442a0ff900..fcdf8f27f981 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pango";
-  version = "1.52.2";
+  version = "1.54.0";
 
   outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-0Adq/gEIKBS4U97smfk0ns5fLOg5CLjlj/c2tB94qWs=";
+    hash = "sha256-ip7tdQIe5zTX/A/fOmXDu6Ud/v5K5RqbQUpgxwstHtg=";
   };
 
   depsBuildBuild = [
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   mesonFlags = [
-    (lib.mesonBool "gtk_doc" withIntrospection)
+    (lib.mesonBool "documentation" withIntrospection)
     (lib.mesonEnable "introspection" withIntrospection)
     (lib.mesonEnable "xft" x11Support)
   ];
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 7b26f3f12fca..f15a7dfe4490 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/stevenlovegrove/Pangolin";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.expipiplus1 ];
+    maintainers = [];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix
index 3b513b889937..92acaf32c09c 100644
--- a/pkgs/development/libraries/pangomm/2.48.nix
+++ b/pkgs/development/libraries/pangomm/2.48.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pangomm";
-  version= "2.52.0";
+  version= "2.54.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-NKE0EmpkhP8S93Q1jDbsxE0OnfCU4bg3ltl3S7fSSUc=";
+    hash = "sha256-Slsf0bfEehr0UnfqgrWr6sqOCPsQon2qY5TPiNdOes8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 84be326dd553..6d5a19409b69 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -4,6 +4,7 @@
 , python3
 , meson
 , ninja
+, elogind
 , systemd
 , enableSystemd ? true # enableSystemd=false maintained by maintainers.qyliss.
 , pkg-config
@@ -120,7 +121,7 @@ stdenv.mkDerivation(finalAttrs: {
     ncurses
     readline
     sbc
-  ] ++ (if enableSystemd then [ systemd ] else [ udev ])
+  ] ++ (if enableSystemd then [ systemd ] else [ elogind udev ])
   ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ])
   ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ldacbt) ldacbt
   ++ lib.optional zeroconfSupport avahi
@@ -146,6 +147,7 @@ stdenv.mkDerivation(finalAttrs: {
     (lib.mesonEnable "avahi" zeroconfSupport)
     (lib.mesonEnable "gstreamer" true)
     (lib.mesonEnable "gstreamer-device-provider" true)
+    (lib.mesonOption "logind-provider" (if enableSystemd then "libsystemd" else "libelogind"))
     (lib.mesonEnable "systemd" enableSystemd)
     (lib.mesonEnable "systemd-system-service" enableSystemd)
     (lib.mesonEnable "udev" (!enableSystemd))
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
deleted file mode 100644
index dbf742ab81f2..000000000000
--- a/pkgs/development/libraries/pixman/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, libpng
-, glib /*just passthru*/
-
-# for passthru.tests
-, cairo
-, qemu
-, scribus
-, tigervnc
-, wlroots_0_17
-, wlroots_0_18
-, xwayland
-
-, gitUpdater
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "pixman";
-  version = "0.43.4";
-
-  src = fetchurl {
-    urls = with finalAttrs; [
-      "mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
-      "https://cairographics.org/releases/${pname}-${version}.tar.gz"
-    ];
-    hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY=";
-  };
-
-  # Raise test timeout, 120s can be slightly exceeded on slower hardware
-  postPatch = ''
-    substituteInPlace test/meson.build \
-      --replace-fail 'timeout : 120' 'timeout : 240'
-  '';
-
-  separateDebugInfo = !stdenv.hostPlatform.isStatic;
-
-  nativeBuildInputs = [ meson ninja pkg-config ];
-
-  buildInputs = [ libpng ];
-
-  # Default "enabled" value attempts to enable CPU features on all
-  # architectures and requires used to disable them:
-  #   https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
-  mesonAutoFeatures = "auto";
-  mesonFlags = [
-    "-Diwmmxt=disabled"
-  ]
-  # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
-  ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";
-
-  preConfigure = ''
-    # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62
-    export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES))
-  '';
-
-  enableParallelBuilding = true;
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  postInstall = glib.flattenInclude;
-
-  passthru = {
-    tests = {
-      inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland;
-      pkg-config = testers.hasPkgConfigModules {
-        package = finalAttrs.finalPackage;
-      };
-    };
-    updateScript = gitUpdater {
-      url = "https://gitlab.freedesktop.org/pixman/pixman.git";
-      rev-prefix = "pixman-";
-    };
-  };
-
-  meta = with lib; {
-    homepage = "http://pixman.org";
-    description = "Low-level library for pixel manipulation";
-    license = licenses.mit;
-    platforms = platforms.all;
-    pkgConfigModules = [ "pixman-1" ];
-  };
-})
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 6d338b0f67e0..9b06dea56b6b 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   nativeBuildInputs = [ pkg-config which ];
-  buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib ];
+  buildInputs = [ libjack2 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ];
 
   configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   # not sure why, but all the headers seem to be installed by the make install
   installPhase = ''
     make install
-  '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+  '' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform alsa-lib) ''
     # fixup .pc file to find alsa library
     sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
   '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
deleted file mode 100644
index a3ccff5c1093..000000000000
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, lapack
-, which
-, gfortran
-, blas
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "qrupdate";
-  version = "1.1.5";
-
-  src = fetchFromGitHub {
-    owner = "mpimd-csc";
-    repo = "qrupdate-ng";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-dHxLPrN00wwozagY2JyfZkD3sKUD2+BcnbjNgZepzFg=";
-  };
-
-  cmakeFlags = assert (blas.isILP64 == lapack.isILP64); [
-    "-DCMAKE_Fortran_FLAGS=${toString ([
-      "-std=legacy"
-    ] ++ lib.optionals blas.isILP64 [
-      # If another application intends to use qrupdate compiled with blas with
-      # 64 bit support, it should add this to it's FFLAGS as well. See (e.g):
-      # https://savannah.gnu.org/bugs/?50339
-      "-fdefault-integer-8"
-    ])}"
-  ];
-
-  # https://github.com/mpimd-csc/qrupdate-ng/issues/4
-  patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-    ./disable-zch1dn-test.patch
-  ];
-
-  doCheck = true;
-
-  nativeBuildInputs = [
-    cmake
-    which
-    gfortran
-  ];
-  buildInputs = [
-    blas
-    lapack
-  ];
-
-  meta = with lib; {
-    description = "Library for fast updating of qr and cholesky decompositions";
-    homepage = "https://github.com/mpimd-csc/qrupdate-ng";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ doronbehar ];
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 2f57b1c62de4..240e914241ed 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -250,23 +250,15 @@ let
         inherit bison cups harfbuzz libGL;
         withGtk3 = !stdenv.hostPlatform.isDarwin; inherit dconf gtk3;
         inherit developerBuild decryptSslTraffic;
-        inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth
-          CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit;
-        libobjc = darwin.apple_sdk_11_0.objc4;
-        xcbuild = darwin.apple_sdk_11_0.xcodebuild;
       };
 
       qt3d = callPackage ../modules/qt3d.nix {};
       qtcharts = callPackage ../modules/qtcharts.nix {};
-      qtconnectivity = callPackage ../modules/qtconnectivity.nix {
-        inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth;
-      };
+      qtconnectivity = callPackage ../modules/qtconnectivity.nix { };
       qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {};
       qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
       qtdoc = callPackage ../modules/qtdoc.nix {};
-      qtgamepad = callPackage ../modules/qtgamepad.nix {
-        inherit (darwin.apple_sdk_11_0.frameworks) GameController;
-      };
+      qtgamepad = callPackage ../modules/qtgamepad.nix { };
       qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
       qtimageformats = callPackage ../modules/qtimageformats.nix {};
       qtlocation = callPackage ../modules/qtlocation.nix {};
@@ -278,9 +270,7 @@ let
       qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
       qtpim = callPackage ../modules/qtpim.nix {};
       qtpositioning = callPackage ../modules/qtpositioning.nix {};
-      qtpurchasing = callPackage ../modules/qtpurchasing.nix {
-        inherit (darwin.apple_sdk_11_0.frameworks) Foundation StoreKit;
-      };
+      qtpurchasing = callPackage ../modules/qtpurchasing.nix { };
       qtquick1 = null;
       qtquick3d = callPackage ../modules/qtquick3d.nix { };
       qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
@@ -309,28 +299,15 @@ let
         #   starting with clang 16. Patches are available upstream that can be backported.
         # Because the first error is non-trivial to fix and suppressing it risks future breakage,
         # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary.
-        stdenv =
-          let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
-          in if stdenv'.hostPlatform.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
+        stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
         inherit (srcs.qtwebengine) version;
+        inherit (darwin) bootstrap_cmds;
         python = python3;
-        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
-          ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication
-          MediaPlayer MediaAccessibility SecurityInterface Vision CoreML OpenDirectory Accelerate;
-        libobjc = darwin.apple_sdk_11_0.objc4;
       };
       qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
-      qtwebkit = callPackage ../modules/qtwebkit.nix {
-        inherit (darwin) ICU;
-        inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
-      };
+      qtwebkit = callPackage ../modules/qtwebkit.nix { };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
-      qtwebview = callPackage ../modules/qtwebview.nix {
-        inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation WebKit;
-      };
+      qtwebview = callPackage ../modules/qtwebview.nix { };
       qtx11extras = callPackage ../modules/qtx11extras.nix {};
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 7aef466b7937..0dadaeeaf916 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -4,8 +4,7 @@
 , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3
 , which
   # darwin support
-, libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, AVFoundation, Carbon, Cocoa, CoreAudio, CoreBluetooth
-, CoreLocation, CoreServices, DiskArbitration, Foundation, OpenGL, MetalKit, IOKit
+, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_14, xcbuild
 
 , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite
 , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb
@@ -38,6 +37,13 @@ let
     if isLinux
     then "linux-generic-g++"
     else throw "Please add a qtPlatformCross entry for ${plat.config}";
+
+  # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 14.x.
+  # Note that Qt propagates the 10.14 SDK instead of the 10.13 SDK to make sure that applications linked to Qt
+  # support automatic dark mode on x86_64-darwin (see: https://developer.apple.com/documentation/appkit/nsappearancecustomization/choosing_a_specific_appearance_for_your_macos_app).
+  propagatedAppleSDK = if lib.versionOlder (lib.getVersion apple-sdk) "10.14" then apple-sdk_10_14 else apple-sdk;
+  propagatedMinVersionHook = darwinMinVersionHook "10.13";
+  buildAppleSDK = apple-sdk_14;
 in
 
 stdenv.mkDerivation (finalAttrs: ({
@@ -56,10 +62,8 @@ stdenv.mkDerivation (finalAttrs: ({
     pcre2
   ] ++ (
     if stdenv.hostPlatform.isDarwin then [
-      # TODO: move to buildInputs, this should not be propagated.
-      AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth
-      CoreLocation CoreServices DiskArbitration Foundation OpenGL
-      libobjc libiconv MetalKit IOKit
+      propagatedAppleSDK
+      propagatedMinVersionHook
     ] else [
       dbus glib udev
 
@@ -80,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: ({
       [ libinput ]
       ++ lib.optional withGtk3 gtk3
     )
+    ++ lib.optional stdenv.isDarwin buildAppleSDK
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysqlSupport) libmysqlclient
@@ -141,15 +146,13 @@ stdenv.mkDerivation (finalAttrs: ({
     patchShebangs ./bin
   '' + (
     if stdenv.hostPlatform.isDarwin then ''
-        sed -i \
-            -e 's|/usr/bin/xcode-select|xcode-select|' \
-            -e 's|/usr/bin/xcrun|xcrun|' \
-            -e 's|/usr/bin/xcodebuild|xcodebuild|' \
-            -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
-            ./configure
-            substituteInPlace ./mkspecs/common/mac.conf \
-                --replace "/System/Library/Frameworks/OpenGL.framework/" "${OpenGL}/Library/Frameworks/OpenGL.framework/" \
-                --replace "/System/Library/Frameworks/AGL.framework/" "${AGL}/Library/Frameworks/AGL.framework/"
+      substituteInPlace configure \
+        --replace-fail '/usr/bin/xcode-select' '${lib.getBin xcbuild}/bin/xcode-select' \
+        --replace-fail '/usr/bin/xcrun' '${lib.getBin xcbuild}/bin/xcrun' \
+        --replace-fail '/System/Library/Frameworks/Cocoa.framework' "$SDKROOT/System/Library/Frameworks/Cocoa.framework"
+      substituteInPlace ./mkspecs/common/mac.conf \
+        --replace-fail "/System/Library/Frameworks/OpenGL.framework/" "$SDKROOT/System/Library/Frameworks/OpenGL.framework/" \
+        --replace-fail "/System/Library/Frameworks/AGL.framework/" "$SDKROOT/System/Library/Frameworks/AGL.framework/"
     '' else lib.optionalString libGLSupported ''
       sed -i mkspecs/common/linux.conf \
           -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \
diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
index d61619613eba..77f1fa38c300 100644
--- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
@@ -1,4 +1,4 @@
-{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez, IOBluetooth }:
+{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
 
 qtModule {
   pname = "qtconnectivity";
@@ -6,8 +6,6 @@ qtModule {
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    IOBluetooth
   ];
   outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
index c83e41be2af8..09fd6490eeb4 100644
--- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
@@ -1,9 +1,8 @@
-{ lib, stdenv, qtModule, qtbase, qtdeclarative, GameController, pkg-config }:
+{ qtModule, qtbase, qtdeclarative, pkg-config }:
 
 qtModule {
   pname = "qtgamepad";
-  propagatedBuildInputs = [ qtbase qtdeclarative ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin GameController;
+  propagatedBuildInputs = [ qtbase qtdeclarative ];
   nativeBuildInputs = [ pkg-config ];
   outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix b/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix
index 3c1661c7b000..10df01285a4f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix
@@ -1,14 +1,6 @@
-{ stdenv
-, lib
-, qtModule
-, qtbase
-, qtdeclarative
-, StoreKit
-, Foundation
-}:
+{ qtModule, qtbase, qtdeclarative }:
 
 qtModule {
   pname = "qtpurchasing";
   propagatedBuildInputs = [ qtbase qtdeclarative ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation StoreKit ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 787c0632ea0c..18d9d7459feb 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -20,11 +20,7 @@
 , systemd
 , enableProprietaryCodecs ? true
 , gn
-, cctools, libobjc, libpm, libunwind, sandbox, xnu
-, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit
-, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
-, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate
-, cups, openbsm, xcbuild, writeScriptBin
+, apple-sdk_13, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin
 , ffmpeg ? null
 , lib, stdenv
 , version ? null
@@ -55,7 +51,8 @@ let
 
 in
 
-qtModule ({
+# Override the SDK because Qt WebEngine doesn’t seem to build using the 14.4 SDK.
+(qtModule.override { apple-sdk_for_qt = apple-sdk_13; }) ({
   pname = "qtwebengine";
   nativeBuildInputs = [
     bison flex git gperf ninja pkg-config (python.withPackages(ps: [ ps.html5lib ])) which gn nodejs
@@ -65,7 +62,7 @@ qtModule ({
     pkgsBuildBuild.pkg-config
     (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
     pkg-config-wrapped-without-prefix
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin [ bootstrap_cmds xcbuild ];
   doCheck = true;
   outputs = [ "bin" "dev" "out" ];
 
@@ -158,22 +155,6 @@ qtModule ({
     substituteInPlace src/buildtools/config/mac_osx.pri \
       --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
 
-    # Following is required to prevent a build error:
-    # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it
-    substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
-      --replace '$sysroot/usr' "${xnu}"
-
-    # Apple has some secret stuff they don't share with OpenBSM
-    substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \
-      --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]"
-    substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \
-      --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]"
-
-    # ld: warning: directory not found for option '-L/nix/store/...-xcodebuild-0.1.2-pre/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/lib'
-    # ld: fatal warning(s) induced error (-fatal_warnings)
-    substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \
-      --replace "-Wl,-fatal_warnings" ""
-
     # Use system ffmpeg
     echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri
     echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri
@@ -257,40 +238,10 @@ qtModule ({
 
   # FIXME These dependencies shouldn't be needed but can't find a way
   # around it. Chromium pulls this in while bootstrapping GN.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libobjc
-    cctools
-
-    # frameworks
-    ApplicationServices
-    AVFoundation
-    Foundation
-    ForceFeedback
-    GameController
-    AppKit
-    ImageCaptureCore
-    CoreBluetooth
-    IOBluetooth
-    CoreWLAN
-    Quartz
-    Cocoa
-    LocalAuthentication
-    MediaPlayer
-    MediaAccessibility
-    SecurityInterface
-    Vision
-    CoreML
-    OpenDirectory
-    Accelerate
-
-    openbsm
-    libunwind
-  ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     cups
-    libpm
-    sandbox
 
     # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
     # to get some information about the host platform.
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 3382bca0f982..555635c79522 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -3,7 +3,6 @@
 , fontconfig, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1, cmake
 , bison, flex, gdb, gperf, perl, pkg-config, python3, ruby
-, ICU, OpenGL
 }:
 
 let
@@ -24,8 +23,7 @@ qtModule {
   pname = "qtwebkit";
   propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ]
     ++ lib.optional stdenv.hostPlatform.isDarwin qtmultimedia;
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ ICU OpenGL ];
+  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ];
   nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ];
 
   cmakeFlags = [ "-DPORT=Qt" ]
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
index 9b1a290ece01..0ff65fa676ca 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
@@ -1,12 +1,8 @@
-{ lib, stdenv, qtModule, qtdeclarative, qtwebengine, CoreFoundation, WebKit }:
+{ lib, stdenv, qtModule, qtdeclarative, qtwebengine }:
 
 qtModule {
   pname = "qtwebview";
   propagatedBuildInputs = [ qtdeclarative qtwebengine ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreFoundation
-    WebKit
-  ];
   outputs = [ "out" "dev" "bin" ];
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework WebKit";
 }
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index c2e329b1f11f..ee59ee76d9e9 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -2,6 +2,8 @@
 , stdenv
 , buildPackages
 , mkDerivation
+, apple-sdk_14
+, apple-sdk_for_qt ? apple-sdk_14
 , perl
 , qmake
 , patches
@@ -23,6 +25,11 @@ mkDerivation (args // {
   inherit pname version src;
   patches = (args.patches or []) ++ (patches.${pname} or []);
 
+  buildInputs =
+    args.buildInputs or [ ]
+    # Per https://doc.qt.io/qt-5/macos.html#supported-versions
+    ++ lib.optionals stdenv.isDarwin [ apple-sdk_for_qt ];
+
   nativeBuildInputs =
     (args.nativeBuildInputs or []) ++ [
       perl qmake
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 1ee93acfe485..e090744bc463 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -10,7 +10,9 @@
 , gst_all_1
 , libglvnd
 , darwin
-, overrideSDK
+, apple-sdk_15
+, apple-sdk_12
+, darwinMinVersionHook
 , buildPackages
 , python3
 , config
@@ -26,24 +28,30 @@ let
     let
       callPackage = self.newScope ({
         inherit (self) qtModule;
-        inherit srcs python3;
-        stdenv =
-          if stdenv.hostPlatform.isDarwin
-          then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "12.3"; }
-          else stdenv;
+        inherit srcs python3 stdenv;
       });
+
+      # Per .
+      # This should reflect the lowest “Target Platform” and the
+      # highest “Build Environment”.
+      apple-sdk_qt = apple-sdk_15;
+      darwinDeploymentTargetDeps = [
+        apple-sdk_12
+        (darwinMinVersionHook "12.0")
+      ];
     in
     {
 
       inherit callPackage srcs;
 
-      qtModule = callPackage ./qtModule.nix { };
+      qtModule = callPackage ./qtModule.nix {
+        inherit apple-sdk_qt;
+      };
 
       qtbase = callPackage ./modules/qtbase.nix {
         withGtk3 = !stdenv.hostPlatform.isMinGW;
+        inherit apple-sdk_qt darwinDeploymentTargetDeps;
         inherit (srcs.qtbase) src version;
-        inherit (darwin.apple_sdk_12_3.frameworks)
-          AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit;
         patches = [
           ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
           ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch
@@ -55,20 +63,19 @@ let
           ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
           ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
           ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch
-          # Revert "macOS: Silence warning about supporting secure state restoration"
-          # fix build with macOS sdk < 12.0
-          (fetchpatch2 {
-            url = "https://github.com/qt/qtbase/commit/fc1549c01445bb9c99d3ba6de8fa9da230614e72.patch";
-            revert = true;
-            hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
-          })
-
           # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116
           # FIXME: remove for 6.8.1
           (fetchpatch2 {
             url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch";
             hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI=";
           })
+
+          # Backport patch to fix plugin loading through symlinks
+          # FIXME: remove for 6.8.1
+          (fetchpatch2 {
+            url = "https://github.com/qt/qtbase/commit/e25150ca29437ab315e3686aa801b8636e201e2a.patch";
+            hash = "sha256-8WOjjffI48Vlx7gQIiOzfUtPloLys5lf06RQi1lsTys=";
+          })
         ];
       };
       env = callPackage ./qt-env.nix { };
@@ -119,9 +126,7 @@ let
       qt3d = callPackage ./modules/qt3d.nix { };
       qt5compat = callPackage ./modules/qt5compat.nix { };
       qtcharts = callPackage ./modules/qtcharts.nix { };
-      qtconnectivity = callPackage ./modules/qtconnectivity.nix {
-        inherit (darwin.apple_sdk_12_3.frameworks) IOBluetooth PCSC;
-      };
+      qtconnectivity = callPackage ./modules/qtconnectivity.nix { };
       qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
       qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
       qtdoc = callPackage ./modules/qtdoc.nix { };
@@ -134,7 +139,6 @@ let
       qtlottie = callPackage ./modules/qtlottie.nix { };
       qtmultimedia = callPackage ./modules/qtmultimedia.nix {
         inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
-        inherit (darwin.apple_sdk_12_3.frameworks) VideoToolbox;
       };
       qtmqtt = callPackage ./modules/qtmqtt.nix { };
       qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
@@ -143,9 +147,7 @@ let
       qtserialbus = callPackage ./modules/qtserialbus.nix { };
       qtserialport = callPackage ./modules/qtserialport.nix { };
       qtshadertools = callPackage ./modules/qtshadertools.nix { };
-      qtspeech = callPackage ./modules/qtspeech.nix {
-        inherit (darwin.apple_sdk_12_3.frameworks) Cocoa;
-      };
+      qtspeech = callPackage ./modules/qtspeech.nix { };
       qtquick3d = callPackage ./modules/qtquick3d.nix { };
       qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
       qtquickeffectmaker = callPackage ./modules/qtquickeffectmaker.nix { };
@@ -159,30 +161,10 @@ let
       qtwayland = callPackage ./modules/qtwayland.nix { };
       qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
       qtwebengine = callPackage ./modules/qtwebengine.nix {
-        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;
-        inherit (darwin.apple_sdk_12_3) libpm libunwind;
-        inherit (darwin.apple_sdk_12_3.libs) sandbox;
-        inherit (darwin.apple_sdk_12_3.frameworks)
-          AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback
-          GameController ImageCaptureCore LocalAuthentication
-          MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz
-          ReplayKit SecurityInterface Vision;
-        qtModule = callPackage
-          ({ qtModule }: qtModule.override {
-            stdenv =
-              if stdenv.hostPlatform.isDarwin
-              then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; }
-              else stdenv;
-          })
-          { };
-        xcbuild = buildPackages.xcbuild.override {
-          productBuildVer = "20A2408";
-        };
+        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds;
       };
       qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
-      qtwebview = callPackage ./modules/qtwebview.nix {
-        inherit (darwin.apple_sdk_12_3.frameworks) WebKit;
-      };
+      qtwebview = callPackage ./modules/qtwebview.nix { };
 
       wrapQtAppsHook = callPackage
         ({ makeBinaryWrapper }: makeSetupHook
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index f9c36c4311e9..78365891d6fb 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -67,15 +67,9 @@
 , unixODBCDrivers
   # darwin
 , moveBuildTree
+, apple-sdk_qt
+, darwinDeploymentTargetDeps
 , xcbuild
-, AGL
-, AVFoundation
-, AppKit
-, Contacts
-, CoreBluetooth
-, EventKit
-, GSS
-, MetalKit
   # mingw
 , pkgsBuildBuild
   # optional dependencies
@@ -161,16 +155,8 @@ stdenv.mkDerivation rec {
     xorg.libXtst
     xorg.xcbutilcursor
     libepoxy
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AGL
-    AVFoundation
-    AppKit
-    Contacts
-    CoreBluetooth
-    EventKit
-    GSS
-    MetalKit
-  ] ++ lib.optionals libGLSupported [
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinDeploymentTargetDeps
+  ++ lib.optionals libGLSupported [
     libGL
   ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
     vulkan-headers
@@ -181,9 +167,8 @@ stdenv.mkDerivation rec {
     at-spi2-core
   ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [
     libinput
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-    AppKit
-    CoreBluetooth
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_qt
   ]
   ++ lib.optional withGtk3 gtk3
   ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
@@ -242,6 +227,7 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\"";
 
   outputs = [ "out" "dev" ];
+  separateDebugInfo = true;
 
   moveToDev = false;
 
diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
index 126920dd5051..8a48c8490435 100644
--- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
@@ -5,8 +5,6 @@
 , qtdeclarative
 , bluez
 , pkg-config
-, IOBluetooth
-, PCSC
 }:
 
 qtModule {
@@ -16,8 +14,5 @@ qtModule {
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    IOBluetooth
-    PCSC
   ];
 }
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
index 1472aff537df..42f5bfd76b88 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
@@ -31,6 +31,12 @@ qtModule {
       url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch";
       hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c=";
     })
+    # Backport patch to fix Kirigami applications crashing
+    # FIXME: remove for 6.8.1
+    (fetchpatch2 {
+      url = "https://github.com/qt/qtdeclarative/commit/0ae3697cf40bcd3ae1de20621abad17cf6c5f52d.patch";
+      hash = "sha256-YuTHqHCWOsqUOATfaAZRxPSwMsFNylxoqnqCeW5kPjs=";
+    })
   ];
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
index 8cdabc32b657..ae02112475f0 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
@@ -21,7 +21,6 @@
 , elfutils
 , libunwind
 , orc
-, VideoToolbox
 , pkgsBuildBuild
 }:
 
@@ -34,13 +33,10 @@ qtModule {
     ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];
   propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]
     ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ];
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ];
 
   patches = [
     ../patches/fix-qtgui-include-incorrect-case.patch
-    # Remove new constants since macOS 12+, since we build Qt with the macOS 11 SDK
-    ../patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch
   ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
     ../patches/qtmultimedia-windows-no-uppercase-libs.patch
     ../patches/qtmultimedia-windows-resolve-function-name.patch
diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
index 3fbfa6e5d90d..828f34bb72b9 100644
--- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
@@ -7,13 +7,11 @@
 , flite
 , alsa-lib
 , speechd-minimal
-, Cocoa
 }:
 
 qtModule {
   pname = "qtspeech";
   nativeBuildInputs = [ pkg-config ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd-minimal ];
-  propagatedBuildInputs = [ qtbase qtmultimedia ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
+  propagatedBuildInputs = [ qtbase qtmultimedia ];
 }
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
index 11a70e53bfcd..c97dd0377981 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@@ -21,6 +21,7 @@
 , libXtst
 , libxshmfence
 , libXi
+, cups
 , fontconfig
 , freetype
 , harfbuzz
@@ -64,31 +65,6 @@
 , bootstrap_cmds
 , cctools
 , xcbuild
-, AGL
-, AVFoundation
-, Accelerate
-, Cocoa
-, CoreLocation
-, CoreML
-, ForceFeedback
-, GameController
-, ImageCaptureCore
-, LocalAuthentication
-, MediaAccessibility
-, MediaPlayer
-, MetalKit
-, Network
-, OpenDirectory
-, Quartz
-, ReplayKit
-, SecurityInterface
-, Vision
-, openbsm
-, libunwind
-, cups
-, libpm
-, sandbox
-, xnu
 }:
 
 qtModule {
@@ -167,8 +143,6 @@ qtModule {
       --replace "AppleClang" "Clang"
     substituteInPlace cmake/Functions.cmake \
       --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
-    substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
-      --replace "\$sysroot/usr" "${xnu}"
   '';
 
   cmakeFlags = [
@@ -197,7 +171,7 @@ qtModule {
   ] ++ lib.optionals enableProprietaryCodecs [
     "-DQT_FEATURE_webengine_proprietary_codecs=ON"
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}"
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0" # Per Qt 6’s deployment target (why doesn’t the hook work?)
   ];
 
   propagatedBuildInputs = [
@@ -272,36 +246,10 @@ qtModule {
 
     libkrb5
     mesa
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AGL
-    AVFoundation
-    Accelerate
-    Cocoa
-    CoreLocation
-    CoreML
-    ForceFeedback
-    GameController
-    ImageCaptureCore
-    LocalAuthentication
-    MediaAccessibility
-    MediaPlayer
-    MetalKit
-    Network
-    OpenDirectory
-    Quartz
-    ReplayKit
-    SecurityInterface
-    Vision
-
-    openbsm
-    libunwind
   ];
 
   buildInputs = [
     cups
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libpm
-    sandbox
   ];
 
   requiredSystemFeatures = [ "big-parallel" ];
@@ -310,13 +258,14 @@ qtModule {
     export NINJAFLAGS="-j$NIX_BUILD_CORES"
   '';
 
+  # Debug info is too big to link with LTO.
+  separateDebugInfo = false;
+
   meta = with lib; {
     description = "Web engine based on the Chromium web browser";
     platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ];
     # This build takes a long time; particularly on slow architectures
     # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz
     timeout = 24 * 3600;
-    # Not compatible with macOS 11 without massive patching
-    broken = stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "12";
   };
 }
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix
index dfc2da1df555..149ccc2a7ea1 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix
@@ -3,12 +3,10 @@
 , qtModule
 , qtdeclarative
 , qtwebengine
-, WebKit
 }:
 
 qtModule {
   pname = "qtwebview";
   propagatedBuildInputs = [ qtdeclarative ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit ];
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ];
 }
diff --git a/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch b/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch
deleted file mode 100644
index 3196a6e4158c..000000000000
--- a/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/multimedia/darwin/qdarwinmediadevices.mm b/src/multimedia/darwin/qdarwinmediadevices.mm
-index b0a108935..881066928 100644
---- a/src/multimedia/darwin/qdarwinmediadevices.mm
-+++ b/src/multimedia/darwin/qdarwinmediadevices.mm
-@@ -42,7 +42,7 @@ static AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode)
-     const AudioObjectPropertyAddress propertyAddress = {
-         selector,
-         kAudioObjectPropertyScopeGlobal,
--        kAudioObjectPropertyElementMain,
-+        kAudioObjectPropertyElementMaster,
-     };
- 
-     if (auto audioDevice = getAudioObject(kAudioObjectSystemObject, propertyAddress,
-@@ -77,7 +77,7 @@ static QList availableAudioDevices(QAudioDevice::Mode mode)
- 
-     const AudioObjectPropertyAddress audioDevicesPropertyAddress = {
-         kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal,
--        kAudioObjectPropertyElementMain
-+        kAudioObjectPropertyElementMaster
-     };
- 
-     if (auto audioDevices = getAudioData(
-@@ -130,11 +130,11 @@ static OSStatus audioDeviceChangeListener(AudioObjectID id, UInt32,
- 
- static constexpr AudioObjectPropertyAddress listenerAddresses[] = {
-     { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal,
--      kAudioObjectPropertyElementMain },
-+      kAudioObjectPropertyElementMaster },
-     { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
--      kAudioObjectPropertyElementMain },
-+      kAudioObjectPropertyElementMaster },
-     { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal,
--      kAudioObjectPropertyElementMain }
-+      kAudioObjectPropertyElementMaster }
- };
- 
- static void setAudioListeners(QDarwinMediaDevices &instance)
-diff --git a/src/multimedia/darwin/qmacosaudiodatautils_p.h b/src/multimedia/darwin/qmacosaudiodatautils_p.h
-index 8cc2f8440..5cd6fced2 100644
---- a/src/multimedia/darwin/qmacosaudiodatautils_p.h
-+++ b/src/multimedia/darwin/qmacosaudiodatautils_p.h
-@@ -44,7 +44,7 @@ void printUnableToReadWarning(const char *logName, AudioObjectID objectID, const
- 
- inline static AudioObjectPropertyAddress
- makePropertyAddress(AudioObjectPropertySelector selector, QAudioDevice::Mode mode,
--                    AudioObjectPropertyElement element = kAudioObjectPropertyElementMain)
-+                    AudioObjectPropertyElement element = kAudioObjectPropertyElementMaster)
- {
-     return { selector,
-              mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput
diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix
index ef5aa994ce90..610649497ba8 100644
--- a/pkgs/development/libraries/qt-6/qtModule.nix
+++ b/pkgs/development/libraries/qt-6/qtModule.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, apple-sdk_qt
 , cmake
 , ninja
 , perl
@@ -19,7 +20,9 @@ stdenv.mkDerivation (args // {
   inherit pname version src;
   patches = args.patches or patches.${pname} or [ ];
 
-  buildInputs = args.buildInputs or [ ];
+  buildInputs =
+    args.buildInputs or [ ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_qt ];
   nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
   propagatedBuildInputs =
@@ -29,6 +32,7 @@ stdenv.mkDerivation (args // {
   moveToDev = false;
 
   outputs = args.outputs or [ "out" "dev" ];
+  separateDebugInfo = args.separateDebugInfo or true;
 
   dontWrapQtApps = args.dontWrapQtApps or true;
 }) // {
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 3d44f556a0ff..20b8ea9b43db 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -1,34 +1,35 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, cmake
-, qmake
-, qtbase
-, qtsvg
-, qtx11extras ? null
-, kwindowsystem ? null
-, qtwayland
-, libX11
-, libXext
-, qttools
-, wrapQtAppsHook
-, gitUpdater
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  qmake,
+  qtbase,
+  qtsvg,
+  qtx11extras ? null, # Qt 5 only
+  kwindowsystem,
+  qtwayland,
+  libX11,
+  libXext,
+  qttools,
+  wrapQtAppsHook,
+  gitUpdater,
 
-, qt6Kvantum ? null
+  qt6Kvantum ? null,
 }:
 let
   isQt5 = lib.versionOlder qtbase.version "6";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "Kvantum";
     rev = "V${finalAttrs.version}";
-    hash = "sha256-1aeXcN9DwPE8CoaxCqCNL9UEcRHJdaKxS7Ivjp3YNN8=";
+    hash = "sha256-x2XsJ26y9y6IF9aY0fmAcvO4zmwLjvE2Lfvzw+GqchM=";
   };
 
   nativeBuildInputs = [
@@ -38,14 +39,18 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qtbase
-    qtsvg
-    libX11
-    libXext
-    kwindowsystem
-  ] ++ lib.optionals isQt5 [ qtx11extras ]
-    ++ lib.optionals (!isQt5) [ qtwayland ];
+  buildInputs =
+    [
+      qtbase
+      qtsvg
+      libX11
+      libXext
+    ]
+    ++ lib.optionals isQt5 [ qtx11extras ]
+    ++ lib.optionals (!isQt5) [
+      kwindowsystem
+      qtwayland
+    ];
 
   sourceRoot = "${finalAttrs.src.name}/Kvantum";
 
@@ -78,11 +83,14 @@ stdenv.mkDerivation (finalAttrs: {
     rev-prefix = "V";
   };
 
-  meta = with lib; {
+  meta = {
     description = "SVG-based Qt5 theme engine plus a config tool and extra themes";
     homepage = "https://github.com/tsujan/Kvantum";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo Scrumplex ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      romildo
+      Scrumplex
+    ];
   };
 })
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index a3a633af6c94..acdb76cc52b2 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -13,28 +13,27 @@
 , runCommand
 , python3
 , quarto
-, extraPythonPackages ? ps: with ps; []
+, extraPythonPackages ? ps: []
 , sysctl
 }:
 
 stdenv.mkDerivation (final: {
   pname = "quarto";
-  version = "1.5.57";
+  version = "1.6.33";
+
   src = fetchurl {
     url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
-    sha256 = "sha256-ZBjv/Z98il8EMZe88fMKSi1YjeOZ8jEh7OxYDKUTMpY=";
+    hash = "sha256-0qCQswtBC8R1Q7pHLhJtqCncllqgXo1t9pG97VwCtAI=";
   };
 
+  patches = [
+    ./deno2.patch
+  ];
+
   nativeBuildInputs = [
     makeWrapper
   ];
 
-  postPatch = ''
-    # Compat for Deno >=1.26
-    substituteInPlace bin/quarto.js \
-      --replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];'
-  '';
-
   dontStrip = true;
 
   preFixup = ''
diff --git a/pkgs/development/libraries/quarto/deno2.patch b/pkgs/development/libraries/quarto/deno2.patch
new file mode 100644
index 000000000000..1ece9ae95450
--- /dev/null
+++ b/pkgs/development/libraries/quarto/deno2.patch
@@ -0,0 +1,149 @@
+diff --git a/bin/quarto.js b/bin/quarto.js
+index f854281..0b78f6e 100644
+--- a/bin/quarto.js
++++ b/bin/quarto.js
+@@ -28511,7 +28511,7 @@ function jupyterHubServicePrefix() {
+     return Deno.env.get("JUPYTERHUB_SERVICE_PREFIX");
+ }
+ function isInteractiveTerminal() {
+-    return Deno.isatty(Deno.stderr.rid);
++    return Deno.stderr.isTerminal();
+ }
+ function isInteractiveSession() {
+     return isRStudio() || isInteractiveTerminal() || isVSCodeOutputChannel();
+@@ -83562,7 +83562,7 @@ function writeFileToStdout(file) {
+     });
+     const contents = readAllSync(df);
+     writeAllSync1(Deno.stdout, contents);
+-    Deno.close(df.rid);
++    df.close();
+ }
+ function clearLine() {
+     info(ansi.eraseLine.cursorLeft(), {
+@@ -96154,6 +96154,7 @@ class ParserBase {
+ class SAXParser extends ParserBase {
+     _listeners = {};
+     _controller;
++    _encoding;
+     fireListeners(event) {
+         const [name, ...args] = event;
+         const list = this._listeners[name] || [];
+@@ -96189,33 +96190,23 @@ class SAXParser extends ParserBase {
+     write(chunk, controller) {
+         try {
+             this._controller = controller;
+-            this.chunk = new TextDecoder().decode(chunk);
++            this.chunk = new TextDecoder(this._encoding).decode(chunk);
+             this.run();
+         } finally{
+             this._controller = undefined;
+         }
+     }
+-    getStream() {
+-        return new WritableStream(this);
+-    }
+-    getWriter() {
+-        const streamWriter = this.getStream().getWriter();
+-        return {
+-            async write (p) {
+-                await streamWriter.ready;
+-                await streamWriter.write(p);
+-                return p.length;
+-            }
+-        };
+-    }
+-    async parse(source) {
++    async parse(source, encoding) {
++        this._encoding = encoding;
+         if (typeof source === 'string') {
+             this.chunk = source;
+             this.run();
+         } else if (source instanceof Uint8Array) {
+             this.write(source);
+         } else {
+-            await Deno.copy(source, this.getWriter());
++            await source.pipeThrough(new TextDecoderStream(this._encoding)).pipeTo(new WritableStream({
++                write: (str)=>this.parse(str, encoding)
++            }));
+         }
+     }
+     on(event, listener) {
+@@ -96326,8 +96317,7 @@ async function readSitemap(sitemapPath) {
+         }
+     });
+     const reader = await Deno.open(sitemapPath);
+-    await parser.parse(reader);
+-    reader.close();
++    await parser.parse(reader.readable);
+     return urlset;
+ }
+ function writeSitemap(sitemapPath, urlset, draftMode) {
+@@ -98407,21 +98397,21 @@ async function generateFeed(feed, feedItems, path) {
+             feed,
+             escape: __VIRTUAL_FILE172
+         });
+-        await Deno.write(feedFile.rid, textEncoder.encode(preamble));
++        await feedFile.write(textEncoder.encode(preamble));
+         for (const feedItem of feedItems){
+             const item = renderEjs(resourcePath("projects/website/listing/feed/item.ejs.md"), {
+                 item: feedItem,
+                 escape: __VIRTUAL_FILE172
+             });
+-            await Deno.write(feedFile.rid, textEncoder.encode(item));
++            await feedFile.write(textEncoder.encode(item));
+         }
+         const postamble = renderEjs(resourcePath("projects/website/listing/feed/postamble.ejs.md"), {
+             feed,
+             escape: __VIRTUAL_FILE172
+         });
+-        await Deno.write(feedFile.rid, textEncoder.encode(postamble));
++        await feedFile.write(textEncoder.encode(postamble));
+     } finally{
+-        Deno.close(feedFile.rid);
++        feedFile.close();
+     }
+ }
+ function prepareItems(items, options) {
+@@ -112277,7 +112267,7 @@ async function renderForPublish(render, providerName, type, title, siteUrl) {
+ }
+ function stageDocumentPublish(title, publishFiles) {
+     const publishDir = globalTempContext().createDir();
+-    const stagedFiles = window.structuredClone(publishFiles);
++    const stagedFiles = globalThis.structuredClone(publishFiles);
+     stagedFiles.baseDir = publishDir;
+     for (const file of publishFiles.files){
+         const src = join2(publishFiles.baseDir, file);
+@@ -126377,33 +126367,6 @@ function reportPeformanceMetrics() {
+     console.log("Performance metrics");
+     console.log("Quarto:");
+     console.log(JSON.stringify(quartoPerformanceMetrics(), null, 2));
+-    console.log();
+-    console.log("Deno:");
+-    const denoMetrics = JSON.parse(JSON.stringify(Deno.metrics()));
+-    denoMetrics.ops = Object.fromEntries(Object.entries(denoMetrics.ops).map(([key, opMetrics])=>{
+-        for (const key of Object.keys(opMetrics)){
+-            if (opMetrics[key] === 0) {
+-                delete opMetrics[key];
+-            }
+-        }
+-        return [
+-            key,
+-            opMetrics
+-        ];
+-    }).filter(([_key, opMetrics])=>Object.keys(opMetrics).length > 0).map(([key, opMetrics])=>{
+-        if (opMetrics.opsDispatched === opMetrics.opsDispatchedSync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedSync || opMetrics.opsDispatched === opMetrics.opsDispatchedAsync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedAsync) {
+-            return [
+-                key,
+-                opMetrics.opsDispatched
+-            ];
+-        } else {
+-            return [
+-                key,
+-                opMetrics
+-            ];
+-        }
+-    }));
+-    console.log(JSON.stringify(denoMetrics, null, 2));
+ }
+ async function mainRunner(runner) {
+     try {
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
deleted file mode 100644
index c3de38398084..000000000000
--- a/pkgs/development/libraries/quickder/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, python3
-, cmake
-, doxygen
-, graphviz
-, quickmem
-, arpa2common
-, arpa2cm
-, ensureNewerSourcesForZipFilesHook
-}:
-
-stdenv.mkDerivation rec {
-  pname = "quickder";
-  version = "1.7.1";
-
-  src = fetchFromGitLab {
-    owner = "arpa2";
-    repo = "quick-der";
-    rev = "v${version}";
-    hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    graphviz
-    ensureNewerSourcesForZipFilesHook
-  ];
-
-  buildInputs = [
-    arpa2cm
-    arpa2common
-    (python3.withPackages (ps: with ps; [
-      asn1ate
-      colored
-      pyparsing
-      setuptools
-      six
-    ]))
-    quickmem
-  ];
-
-
-  postPatch = ''
-    substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
-  '';
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Quick (and Easy) DER, a Library for parsing ASN.1";
-    homepage = "https://gitlab.com/arpa2/quick-der/";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ leenaars ];
-  };
-}
diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix
index 85282afb15b5..190a13e15a27 100644
--- a/pkgs/development/libraries/qwlroots/default.nix
+++ b/pkgs/development/libraries/qwlroots/default.nix
@@ -20,19 +20,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qwlroots";
-  version = "0.1.0";
+  version = "0.3.0-wlroots0.17-0.18";
 
   src = fetchFromGitHub {
     owner = "vioken";
     repo = "qwlroots";
     rev = finalAttrs.version;
-    hash = "sha256-ev4oCKR43XaYNTavj9XI3RAtB6RFprChpBFsrA2nVsM=";
+    hash = "sha256-ObXegiJ4LT8bTUxNVJ9wBKN5oILWPDYTsuCy+OCsh3k=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
     wayland-scanner
   ];
 
@@ -58,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6"))
   ];
 
+  dontWrapQtApps = true;
+
   meta = {
     description = "Qt and QML bindings for wlroots";
     homepage = "https://github.com/vioken/qwlroots";
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
deleted file mode 100644
index 8e72b7748d65..000000000000
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, doxygen
-, graphviz
-, gtest
-, valgrind
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "rapidjson";
-  version = "unstable-2024-04-09";
-
-  outputs = [
-    "out"
-    "doc"
-  ];
-
-  src = fetchFromGitHub {
-    owner = "Tencent";
-    repo = "rapidjson";
-    rev = "ab1842a2dae061284c0a62dca1cc6d5e7e37e346";
-    hash = "sha256-kAGVJfDHEUV2qNR1LpnWq3XKBJy4hD3Swh6LX5shJpM=";
-  };
-
-  patches = [
-    ./use-nixpkgs-gtest.patch
-    # https://github.com/Tencent/rapidjson/issues/2214
-    ./suppress-valgrind-failures.patch
-  ];
-
-  postPatch = ''
-    for f in doc/Doxyfile.*; do
-      substituteInPlace $f \
-        --replace-fail "WARN_IF_UNDOCUMENTED   = YES" "WARN_IF_UNDOCUMENTED   = NO"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    graphviz
-  ];
-
-  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.hostPlatform.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 Madouura tobim ];
-  };
-})
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
deleted file mode 100644
index 5c1b7d1dab0a..000000000000
--- a/pkgs/development/libraries/raylib/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, fetchpatch
-, mesa
-, libGLU
-, glfw
-, libX11
-, libXi
-, libXcursor
-, libXrandr
-, libXinerama
-, alsaSupport ? stdenv.hostPlatform.isLinux
-, alsa-lib
-, pulseSupport ? stdenv.hostPlatform.isLinux
-, libpulseaudio
-, sharedLib ? true
-, includeEverything ? true
-, raylib-games
-, darwin
-, autoPatchelfHook
-}:
-let
-  inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "raylib";
-  version = "5.0";
-
-  src = fetchFromGitHub {
-    owner = "raysan5";
-    repo = "raylib";
-    rev = finalAttrs.version;
-    hash = "sha256-gEstNs3huQ1uikVXOW4uoYnIDr5l8O9jgZRTX1mkRww=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-
-  buildInputs = [ glfw ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa libXi libXcursor libXrandr libXinerama ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional pulseSupport libpulseaudio;
-
-  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ];
-
-  # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
-  cmakeFlags = [
-    "-DUSE_EXTERNAL_GLFW=ON"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DCUSTOMIZE_BUILD=1"
-  ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
-  ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
-
-  passthru.tests = [ raylib-games ];
-
-  patches = [
-    # Patch version in CMakeLists.txt to 5.0.0
-    # The library author doesn't use cmake, so when updating this package please
-    # check that the resulting library extension matches the package version
-    # and remove/update this patch
-    (fetchpatch {
-      url = "https://github.com/raysan5/raylib/commit/032cc497ca5aaca862dc926a93c2a45ed8017737.patch";
-      hash = "sha256-qsX5AwyQaGoRsbdszOO7tUF9dR+AkEFi4ebNkBVHNEY=";
-    })
-  ];
-
-  # fix libasound.so/libpulse.so not being found
-  appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [
-    (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio))
-  ];
-
-  meta = with lib; {
-    description = "Simple and easy-to-use library to enjoy videogames programming";
-    homepage = "https://www.raylib.com/";
-    license = licenses.zlib;
-    maintainers = [ ];
-    platforms = platforms.all;
-    changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
-  };
-})
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
deleted file mode 100644
index 569752ceaa81..000000000000
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which, curl }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "rdkafka";
-  version = "2.5.3";
-
-  src = fetchFromGitHub {
-    owner = "confluentinc";
-    repo = "librdkafka";
-    rev = "refs/tags/v${finalAttrs.version}";
-    sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg=";
-  };
-
-  nativeBuildInputs = [ pkg-config python3 which ];
-
-  buildInputs = [ zlib zstd openssl curl ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
-
-  postPatch = ''
-    patchShebangs .
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "librdkafka - Apache Kafka C/C++ client library";
-    homepage = "https://github.com/confluentinc/librdkafka";
-    license = licenses.bsd2;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ commandodev ];
-  };
-})
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
deleted file mode 100644
index fb4cc16cd7eb..000000000000
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, ninja
-, bzip2
-, lz4
-, snappy
-, zlib
-, zstd
-, windows
-, enableJemalloc ? false
-, jemalloc
-, enableLiburing ? stdenv.hostPlatform.isLinux
-, liburing
-, enableShared ? !stdenv.hostPlatform.isStatic
-, sse42Support ? stdenv.hostPlatform.sse4_2Support
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "rocksdb";
-  version = "9.6.1";
-
-  src = fetchFromGitHub {
-    owner = "facebook";
-    repo = "rocksdb";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Df5X3sL4dRP9TwwfoB3645nlru6eQhFD1LKPCXHrofU=";
-  };
-
-  patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch;
-
-  nativeBuildInputs = [ cmake ninja ];
-
-  propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ];
-
-  buildInputs = lib.optional enableJemalloc jemalloc
-    ++ lib.optional enableLiburing liburing
-    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
-
-  outputs = [
-    "out"
-    "tools"
-  ];
-
- env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
-   "-faligned-allocation"
- ]);
-
-  cmakeFlags = [
-    "-DPORTABLE=1"
-    "-DWITH_JEMALLOC=${if enableJemalloc then "1" else "0"}"
-    "-DWITH_LIBURING=${if enableLiburing then "1" else "0"}"
-    "-DWITH_JNI=0"
-    "-DWITH_BENCHMARK_TOOLS=0"
-    "-DWITH_TESTS=1"
-    "-DWITH_TOOLS=0"
-    "-DWITH_CORE_TOOLS=1"
-    "-DWITH_BZ2=1"
-    "-DWITH_LZ4=1"
-    "-DWITH_SNAPPY=1"
-    "-DWITH_ZLIB=1"
-    "-DWITH_ZSTD=1"
-    "-DWITH_GFLAGS=0"
-    "-DUSE_RTTI=1"
-    "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere
-    (lib.optional sse42Support "-DFORCE_SSE42=1")
-    "-DFAIL_ON_WARNINGS=NO"
-  ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
-
-  # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
-  hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format";
-
-  postPatch = lib.optionalString (lib.versionOlder finalAttrs.version "8") ''
-    # Fix gcc-13 build failures due to missing  and
-    #  includes, fixed upstyream sice 8.x
-    sed -e '1i #include ' -i db/compaction/compaction_iteration_stats.h
-    sed -e '1i #include ' -i table/block_based/data_block_hash_index.h
-    sed -e '1i #include ' -i util/string_util.h
-    sed -e '1i #include ' -i include/rocksdb/utilities/checkpoint.h
-  '' + lib.optionalString (lib.versionOlder finalAttrs.version "7") ''
-    # Fix gcc-13 build failures due to missing  and
-    #  includes, fixed upstyream sice 7.x
-    sed -e '1i #include ' -i third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
-  '';
-
-  preInstall = ''
-    mkdir -p $tools/bin
-    cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {}
-  '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
-    ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {}
-  '';
-
-  # Old version doesn't ship the .pc file, new version puts wrong paths in there.
-  postFixup = ''
-    if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then
-      substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \
-        --replace '="''${prefix}//' '="/'
-    fi
-  '';
-
-  meta = with lib; {
-    homepage = "https://rocksdb.org";
-    description = "Library that provides an embeddable, persistent key-value store for fast storage";
-    changelog = "https://github.com/facebook/rocksdb/raw/v${finalAttrs.version}/HISTORY.md";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ adev magenbluten ];
-  };
-})
diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix
deleted file mode 100644
index 5af6eff378d9..000000000000
--- a/pkgs/development/libraries/s2n-tls/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, openssl
-, nix
-}:
-
-stdenv.mkDerivation rec {
-  pname = "s2n-tls";
-  version = "1.5.1";
-
-  src = fetchFromGitHub {
-    owner = "aws";
-    repo = "s2n-tls";
-    rev = "v${version}";
-    hash = "sha256-BHDMYOHidwF6ssqSnpokXc/OwGrQNoUVb0/ubwhyiDM=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  outputs = [ "out" "dev" ];
-
-  buildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror
-  ] ++ lib.optionals stdenv.hostPlatform.isMips64 [
-    # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609
-    "-DS2N_NO_PQ=ON"
-  ];
-
-  propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
-
-  postInstall = ''
-    # Glob for 'shared' or 'static' subdir
-    for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do
-      substituteInPlace "$f" \
-        --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
-    done
-  '';
-
-  passthru.tests = {
-    inherit nix;
-  };
-
-  meta = with lib; {
-    description = "C99 implementation of the TLS/SSL protocols";
-    homepage = "https://github.com/aws/s2n-tls";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ orivej ];
-  };
-}
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index 50ec95ee2f8f..72a9c747eeb4 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -171,7 +171,7 @@ let
     pname = "libasi";
     buildInputs = [
       libusb1
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
     meta = with lib; {
@@ -182,7 +182,7 @@ let
 
   libastroasis = buildIndi3rdParty {
     pname = "libastroasis";
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     nativeBuildInputs = [ autoPatchelfHook ];
     meta = with lib; {
       license = licenses.unfreeRedistributable;
@@ -193,7 +193,7 @@ let
   libatik = buildIndi3rdParty {
     pname = "libatik";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
       systemd
       libdc1394
@@ -247,7 +247,7 @@ let
   libinovasdk = buildIndi3rdParty {
     pname = "libinovasdk";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
@@ -348,7 +348,7 @@ let
     '';
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
       systemd
     ];
@@ -377,7 +377,7 @@ let
     cmakeFlags = [ "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" ];
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
@@ -404,7 +404,7 @@ let
   libricohcamerasdk = buildIndi3rdParty {
     pname = "libricohcamerasdk";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
@@ -447,7 +447,7 @@ let
   libsvbony = buildIndi3rdParty {
     pname = "libsvbony";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
index ebc853c369b5..68f60e295347 100644
--- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
+++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
@@ -15,13 +15,13 @@ assert !blas.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "simple-dftd3";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "dftd3";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-gN8uBc/Fk5U7wlBX1tkAWdxN9UW1Dv11GvaIBkEyBJw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Yisqd31SHMBuhZ4+VwKlkSW+gjqLttcbKzKjGvez+xE=";
   };
 
   nativeBuildInputs = [ gfortran meson ninja pkg-config ];
diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix
deleted file mode 100644
index 34f9c4db39cc..000000000000
--- a/pkgs/development/libraries/science/math/dbcsr/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, mpiCheckPhaseHook
-, pkg-config
-, fypp
-, gfortran
-, blas
-, lapack
-, python3
-, libxsmm
-, mpi
-, openssh
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbcsr";
-  version = "2.7.0";
-
-  src = fetchFromGitHub {
-    owner = "cp2k";
-    repo = "dbcsr";
-    rev = "v${version}";
-    hash = "sha256-QEO7f27DLsCvKXgFJnneHs1kO+5V9xiURpbQuGg1P0M=";
-  };
-
-  postPatch = ''
-    patchShebangs .
-
-    # Force build of shared library, otherwise just static.
-    substituteInPlace src/CMakeLists.txt \
-      --replace 'add_library(dbcsr ''${DBCSR_SRCS})' 'add_library(dbcsr SHARED ''${DBCSR_SRCS})' \
-      --replace 'add_library(dbcsr_c ''${DBCSR_C_SRCS})' 'add_library(dbcsr_c SHARED ''${DBCSR_C_SRCS})'
-
-    # Avoid calling the fypp wrapper script with python again. The nix wrapper took care of that.
-    substituteInPlace cmake/fypp-sources.cmake \
-      --replace 'COMMAND ''${Python_EXECUTABLE} ''${FYPP_EXECUTABLE}' 'COMMAND ''${FYPP_EXECUTABLE}'
-  '';
-
-  nativeBuildInputs = [
-    gfortran
-    python3
-    cmake
-    pkg-config
-    fypp
-  ];
-
-  buildInputs = [ blas lapack libxsmm ];
-
-  propagatedBuildInputs = [ mpi ];
-
-  cmakeFlags = [
-    "-DUSE_OPENMP=ON"
-    "-DUSE_SMM=libxsmm"
-    "-DWITH_C_API=ON"
-    "-DBUILD_TESTING=ON"
-    "-DTEST_OMP_THREADS=2"
-    "-DTEST_MPI_RANKS=2"
-    "-DENABLE_SHARED=ON"
-    "-DUSE_MPI=ON"
-  ];
-
-  checkInputs = [
-    openssh
-    mpiCheckPhaseHook
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Distributed Block Compressed Sparse Row matrix library";
-    license = licenses.gpl2Only;
-    homepage = "https://github.com/cp2k/dbcsr";
-    maintainers = [ maintainers.sheepforce ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix
deleted file mode 100644
index 5eaa3cf54915..000000000000
--- a/pkgs/development/libraries/science/math/libamplsolver/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, substitute, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "libamplsolver";
-  version = "20211109";
-
-  src = fetchurl {
-    url = "https://ampl.com/netlib/ampl/solvers.tgz";
-    sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM=";
-  };
-
-  patches = [
-    (substitute {
-      src = ./libamplsolver-sharedlib.patch;
-      substitutions = [ "--replace" "@sharedlibext@" "${stdenv.hostPlatform.extensions.sharedLibrary}" ];
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    pushd sys.$(uname -m).$(uname -s)
-    install -D -m 0644 *.h -t $out/include
-    install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib
-    install -D -m 0644 *.a -t $out/lib
-    popd
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib
-  '' + ''
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Library of routines that help solvers work with AMPL";
-    homepage = "https://ampl.com/netlib/ampl/";
-    license = [ licenses.mit ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ aanderse ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index ee24908eb512..8cbe481207e2 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -23,7 +23,7 @@ let
   device = if cudaSupport then "cuda" else "cpu";
   srcs = import ./binary-hashes.nix version;
   unavailable = throw "libtorch is not available for this platform";
-  libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else stdenv.cc.cc.lib;
+  libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else (lib.getLib stdenv.cc.cc);
 in stdenv.mkDerivation {
   inherit version;
   pname = "libtorch";
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
   '';
 
   postFixup = let
-    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
+    rpath = lib.makeLibraryPath [ stdenv.cc.cc ];
   in lib.optionalString stdenv.hostPlatform.isLinux ''
     find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting rpath for $lib..."
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
deleted file mode 100644
index 857b438d22ad..000000000000
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "openlibm";
-  version = "0.8.3";
-
-  src = fetchFromGitHub {
-    owner = "JuliaLang";
-    repo = "openlibm";
-    rev = "v${version}";
-    sha256 = "sha256-WSf4mcZXiEL3nKTLQh3Oi1MxeH9MOFRe7DU5zFT2aQE=";
-  };
-
-  makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
-
-  meta = {
-    description = "High quality system independent, portable, open source libm implementation";
-    homepage = "https://openlibm.org/";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ttuegel ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix
deleted file mode 100644
index 45d5fc5b1f9b..000000000000
--- a/pkgs/development/libraries/science/math/osi/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, gfortran, pkg-config
-, blas, zlib, bzip2, coin-utils
-, withGurobi ? false, gurobi
-, withCplex ? false, cplex }:
-
-stdenv.mkDerivation rec {
-  pname = "osi";
-  version = "0.108.10";
-
-  src = fetchFromGitHub {
-    owner = "coin-or";
-    repo = "Osi";
-    rev = "releases/${version}";
-    hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ=";
-  };
-
-  buildInputs =
-    [ blas zlib bzip2 coin-utils ]
-    ++ lib.optional withGurobi gurobi
-    ++ lib.optional withCplex cplex;
-  nativeBuildInputs = [ gfortran pkg-config ];
-  configureFlags =
-    lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ]
-    ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ];
-
-  NIX_LDFLAGS =
-    lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}";
-
-  # Compile errors
-  env.NIX_CFLAGS_COMPILE = "-Wno-cast-qual";
-  hardeningDisable = [ "format" ];
-
-  enableParallelBuilding = true;
-
-  passthru = { inherit withGurobi withCplex; };
-
-  meta = with lib; {
-    description = "Abstract base class to a generic linear programming (LP) solver";
-    homepage = "https://github.com/coin-or/Osi";
-    license = licenses.epl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix
index 39b5660494d2..3ac61e5c2b36 100644
--- a/pkgs/development/libraries/science/math/p4est-sc/default.nix
+++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix
@@ -1,14 +1,13 @@
 { lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook
 , autoreconfHook, pkg-config
 , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true
-, mpi, openssh, zlib
+, mpi, zlib
 }:
 
 let
   dbg = lib.optionalString debugEnable "-dbg";
   debugEnable = p4est-sc-debugEnable;
   mpiSupport = p4est-sc-mpiSupport;
-  isOpenmpi = mpiSupport && mpi.pname == "openmpi";
 in
 stdenv.mkDerivation {
   pname = "p4est-sc${dbg}";
@@ -24,9 +23,7 @@ stdenv.mkDerivation {
 
   strictDeps = true;
   nativeBuildInputs = [ autoreconfHook pkg-config ];
-  propagatedNativeBuildInputs = lib.optional mpiSupport mpi
-    ++ lib.optional isOpenmpi openssh
-  ;
+  propagatedNativeBuildInputs = lib.optional mpiSupport mpi ;
   propagatedBuildInputs = [ zlib ];
   inherit debugEnable mpiSupport;
 
@@ -49,7 +46,6 @@ stdenv.mkDerivation {
 
   nativeCheckInputs = lib.optionals mpiSupport [
     mpiCheckPhaseHook
-    openssh
   ];
 
   # disallow Darwin checks due to prototype incompatibility of qsort_r
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
deleted file mode 100644
index f7b4ba6738d1..000000000000
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
-, openssh, mpiCheckPhaseHook, mpi, blas, lapack
-} :
-
-assert blas.isILP64 == lapack.isILP64;
-
-stdenv.mkDerivation rec {
-  pname = "scalapack";
-  version = "2.2.1";
-
-  src = fetchFromGitHub {
-    owner = "Reference-ScaLAPACK";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4=";
-  };
-
-  passthru = { inherit (blas) isILP64; };
-
-  __structuredAttrs = true;
-
-  # upstream patch, remove with next release
-  patches = [ (fetchpatch {
-    name = "gcc-10";
-    url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch";
-    sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp";
-  })];
-
-  # Required to activate ILP64.
-  # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19
-  postPatch = lib.optionalString passthru.isILP64 ''
-    sed -i 's/INTSZ = 4/INTSZ = 8/g'   TESTING/EIG/* TESTING/LIN/*
-    sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/*
-
-    # These tests are not adapted to ILP64
-    sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt
-  '';
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ cmake ];
-  nativeCheckInputs = [ openssh mpiCheckPhaseHook ];
-  buildInputs = [ blas lapack ];
-  propagatedBuildInputs = [ mpi ];
-  hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ];
-
-  # xslu and xsllt tests seem to time out on x86_64-darwin.
-  # this line is left so those who force installation on x86_64-darwin can still build
-  doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin);
-
-  preConfigure = ''
-    cmakeFlagsArray+=(
-      -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
-      -DLAPACK_LIBRARIES="-llapack"
-      -DBLAS_LIBRARIES="-lblas"
-      -DCMAKE_Fortran_COMPILER=${lib.getDev mpi}/bin/mpif90
-      -DCMAKE_C_FLAGS="${lib.concatStringsSep " " [
-            "-Wno-implicit-function-declaration"
-            (lib.optionalString passthru.isILP64 "-DInt=long")
-      ]}"
-      ${lib.optionalString passthru.isILP64 ''-DCMAKE_Fortran_FLAGS="-fdefault-integer-8"''}
-      )
-  '';
-
-  # Increase individual test timeout from 1500s to 10000s because hydra's builds
-  # sometimes fail due to this
-  checkFlags = [ "ARGS=--timeout 10000" ];
-
-  postFixup = ''
-    # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated
-    # cmake file will thus look for the library in the dev output instead of out.
-    # Use the absolute path to $out instead to fix the issue.
-    substituteInPlace  $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \
-      --replace "\''${_IMPORT_PREFIX}" "$out"
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.netlib.org/scalapack/";
-    description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ costrouc markuskowa gdinh ];
-    # xslu and xsllt tests fail on x86 darwin
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
-  };
-}
diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix
deleted file mode 100644
index 6e12e19d596a..000000000000
--- a/pkgs/development/libraries/sentry-native/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, curl
-, breakpad
-, pkg-config
-}:
-
-stdenv.mkDerivation rec {
-  pname = "sentry-native";
-  version = "0.7.10";
-
-  src = fetchFromGitHub {
-    owner = "getsentry";
-    repo = "sentry-native";
-    rev = version;
-    hash = "sha256-1Pro2BXflitUGVbzvjwdSFqwWM/EeuDC3eHEj+7qwm8=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    curl
-    breakpad
-  ];
-
-  cmakeBuildType = "RelWithDebInfo";
-
-  cmakeFlags = [
-    "-DSENTRY_BREAKPAD_SYSTEM=On"
-    "-DSENTRY_BACKEND=breakpad"
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/getsentry/sentry-native";
-    description = "Sentry SDK for C, C++ and native applications";
-    changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ wheelsandmetal daniel-fahey ];
-  };
-}
diff --git a/pkgs/development/libraries/sonivox/default.nix b/pkgs/development/libraries/sonivox/default.nix
deleted file mode 100644
index 3ad01725966c..000000000000
--- a/pkgs/development/libraries/sonivox/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "sonivox";
-  version = "3.6.12";
-
-  src = fetchFromGitHub {
-    owner = "pedrolcl";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-df3EwscTF9n1fazz5Oa3FIXgWXHruhJBzMt8Y+ELP94=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    homepage = "https://github.com/pedrolcl/sonivox";
-    description = "MIDI synthesizer library";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
deleted file mode 100644
index 8326a71041da..000000000000
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "spirv-headers";
-  version = "1.3.290.0";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "SPIRV-Headers";
-    rev = "vulkan-sdk-${version}";
-    hash = "sha256-c9ruBCnf9PNJz030bfRhHwyqju6T8YCRx+efKCEYgSo=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    description = "Machine-readable components of the Khronos SPIR-V Registry";
-    homepage = "https://github.com/KhronosGroup/SPIRV-Headers";
-    license = licenses.mit;
-    maintainers = [ maintainers.ralith ];
-  };
-}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ecc0982f2bff..63e2572614fa 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -2,7 +2,7 @@
 , updateAutotoolsGnuConfigScriptsHook
 
 # for tests
-, python3Packages, sqldiff, sqlite-analyzer, tracker
+, python3Packages, sqldiff, sqlite-analyzer, tinysparql
 
 # uses readline & ncurses for a better interactive experience if set to true
 , interactive ? false
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   passthru = {
     tests = {
       inherit (python3Packages) sqlalchemy;
-      inherit sqldiff sqlite-analyzer tracker;
+      inherit sqldiff sqlite-analyzer tinysparql;
     };
 
     updateScript = gitUpdater {
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix
deleted file mode 100644
index 91a41ac35298..000000000000
--- a/pkgs/development/libraries/stfl/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchurl, ncurses, libiconv }:
-
-stdenv.mkDerivation rec {
-  pname = "stfl";
-  version = "0.24";
-
-  src = fetchurl {
-    url = "http://www.clifford.at/stfl/stfl-${version}.tar.gz";
-    sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl";
-  };
-
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-
-  buildInputs = [ ncurses libiconv ];
-
-  # Silence warnings related to use of implicitly declared library functions and implicit ints.
-  # TODO: Remove and/or fix with patches the next time this package is updated.
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=implicit-function-declaration"
-      "-Wno-error=implicit-int"
-    ];
-  };
-
-  preBuild = ''
-    sed -i s/gcc/cc/g Makefile
-    sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -i s/-soname/-install_name/ Makefile
-  ''
-  # upstream builds shared library unconditionally. Also, it has no
-  # support for cross-compilation.
-  + lib.optionalString stdenv.hostPlatform.isStatic ''
-    sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile
-    sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile
-    sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile
-    sed -i '/install -m 644 libstfl.so./d' Makefile
-    sed -i '/ln -fs libstfl.so./d' Makefile
-  '' ;
-
-  installPhase = ''
-    DESTDIR=$out prefix=\"\" make install
-  ''
-  # some programs rely on libstfl.so.0 to be present, so link it
-  + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
-    ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0
-  '';
-
-  meta = {
-    homepage = "http://www.clifford.at/stfl/";
-    description = "Library which implements a curses-based widget set for text terminals";
-    maintainers = with lib.maintainers; [ lovek323 ];
-    license = lib.licenses.lgpl3;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix
deleted file mode 100644
index 624d239fa35c..000000000000
--- a/pkgs/development/libraries/swiftshader/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, stdenv, fetchgit, python3, cmake, jq }:
-
-stdenv.mkDerivation rec {
-  pname = "swiftshader";
-  version = "2023-09-11";
-
-  src = fetchgit {
-    url = "https://swiftshader.googlesource.com/SwiftShader";
-    rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa";
-    hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI=";
-    # Remove 1GB of test files to get under Hydra output limit
-    postFetch = ''
-      rm -r $out/third_party/llvm-project/llvm/test
-      rm -r $out/third_party/json/test
-      rm -r $out/third_party/cppdap/third_party/json/test
-      rm -r $out/third_party/llvm-project/clang/test
-    '';
-  };
-
-  nativeBuildInputs = [ cmake python3 jq ];
-
-  # Make sure we include the drivers and icd files in the output as the cmake
-  # generated install command only puts in the spirv-tools stuff.
-  installPhase = ''
-    runHook preInstall
-
-    #
-    # Vulkan driver
-    #
-    vk_so_path="$out/lib/libvk_swiftshader.so"
-    mkdir -p "$(dirname "$vk_so_path")"
-    mv Linux/libvk_swiftshader.so "$vk_so_path"
-
-    vk_icd_json="$out/share/vulkan/icd.d/vk_swiftshader_icd.json"
-    mkdir -p "$(dirname "$vk_icd_json")"
-    jq ".ICD.library_path = \"$vk_so_path\"" "$vk_icd_json"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description =
-      "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API";
-    homepage = "https://opensource.google/projects/swiftshader";
-    license = licenses.asl20;
-    # Should be possible to support Darwin by changing the install phase with
-    # 's/Linux/Darwin/' and 's/so/dylib/' or something similar.
-    platforms = with platforms; linux;
-    maintainers = with maintainers; [ expipiplus1 ];
-  };
-}
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
deleted file mode 100644
index cbdb542dbfd9..000000000000
--- a/pkgs/development/libraries/symengine/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, gmp
-, flint
-, mpfr
-, libmpc
-, withShared ? true
-}:
-
-stdenv.mkDerivation rec {
-  pname = "symengine";
-  version = "0.12.0";
-
-  src = fetchFromGitHub {
-    owner = "symengine";
-    repo = "symengine";
-    rev = "v${version}";
-    hash = "sha256-SfifujR2VM1OlPN0ZRUC3hWImXO/8PuiyrBdpyNoKW4=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ gmp flint mpfr libmpc ];
-
-  cmakeFlags = [
-    "-DWITH_FLINT=ON"
-    "-DINTEGER_CLASS=flint"
-    "-DWITH_SYMENGINE_THREAD_SAFE=yes"
-    "-DWITH_MPC=yes"
-    "-DBUILD_FOR_DISTRIBUTION=yes"
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not?
-    "-DBUILD_TESTS=OFF"
-  ] ++ lib.optionals withShared [
-    "-DBUILD_SHARED_LIBS=ON"
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Fast symbolic manipulation library";
-    homepage = "https://github.com/symengine/symengine";
-    platforms = platforms.unix ++ platforms.windows;
-    license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
-  };
-
-}
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
deleted file mode 100644
index e328a4c0f632..000000000000
--- a/pkgs/development/libraries/tdlib/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }:
-
-stdenv.mkDerivation {
-  pname = "tdlib";
-  version = "1.8.37";
-
-  src = fetchFromGitHub {
-    owner = "tdlib";
-    repo = "td";
-
-    # The tdlib authors do not set tags for minor versions, but
-    # external programs depending on tdlib constrain the minor
-    # version, hence we set a specific commit with a known version.
-    rev = "21e5ce0e977fe012e0cee4e6fcfe704b47b00774";
-    hash = "sha256-gQFsdc/FXjuA1WdZ6iF7KxLQX/7+r1I5FcdEAyJSaqU=";
-  };
-
-  buildInputs = [ gperf openssl readline zlib ];
-  nativeBuildInputs = [ cmake ];
-
-  # https://github.com/tdlib/td/issues/1974
-  postPatch = ''
-    substituteInPlace CMake/GeneratePkgConfig.cmake \
-      --replace 'function(generate_pkgconfig' \
-                'include(GNUInstallDirs)
-                 function(generate_pkgconfig' \
-      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
-      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
-  '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-    sed -i "/vptr/d" test/CMakeLists.txt
-  '';
-
-  meta = with lib; {
-    description = "Cross-platform library for building Telegram clients";
-    homepage = "https://core.telegram.org/tdlib/";
-    license = [ licenses.boost ];
-    platforms = platforms.unix;
-    maintainers = [ maintainers.vyorkin ];
-  };
-}
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
deleted file mode 100644
index e1510fca92a6..000000000000
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, dbus-glib
-, glib
-, python3
-, pkg-config
-, libxslt
-, gobject-introspection
-, vala
-, glibcLocales
-}:
-
-stdenv.mkDerivation rec {
-  pname = "telepathy-glib";
-  version = "0.24.2";
-
-  outputs = [ "out" "dev" ];
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
-    sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A=";
-  };
-
-  strictDeps = true;
-  nativeBuildInputs = [
-    pkg-config
-    libxslt
-    gobject-introspection
-    vala
-    python3
-  ];
-
-  buildInputs = [
-    glibcLocales
-  ];
-
-  propagatedBuildInputs = [
-    dbus-glib
-    glib
-  ];
-
-  configureFlags = [
-    "--enable-vala-bindings"
-  ];
-
-  LC_ALL = "en_US.UTF-8";
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
-  '';
-
-  meta = with lib; {
-    homepage = "https://telepathy.freedesktop.org";
-    platforms = platforms.unix;
-    license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
-  };
-}
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
deleted file mode 100644
index d75bbdd542fe..000000000000
--- a/pkgs/development/libraries/tracker/default.nix
+++ /dev/null
@@ -1,184 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, gettext
-, meson
-, mesonEmulatorHook
-, ninja
-, pkg-config
-, asciidoc
-, gobject-introspection
-, buildPackages
-, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
-, vala
-, python3
-, gi-docgen
-, graphviz
-, libxml2
-, glib
-, wrapGAppsNoGuiHook
-, sqlite
-, libstemmer
-, gnome
-, icu
-, libuuid
-, libsoup
-, libsoup_3
-, json-glib
-, avahi
-, systemd
-, dbus
-, writeText
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tracker";
-  version = "3.7.3";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchurl {
-    url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-qz1KUJN+BMXteEb227mZ4pCYGUAvOJylku5rd90o0fk=";
-  };
-
-  strictDeps = true;
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    asciidoc
-    gettext
-    glib
-    wrapGAppsNoGuiHook
-    gi-docgen
-    graphviz
-    (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ]))
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
-    vala
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    mesonEmulatorHook
-  ];
-
-  buildInputs = [
-    glib
-    libxml2
-    sqlite
-    icu
-    libsoup
-    libsoup_3
-    libuuid
-    json-glib
-    avahi
-    libstemmer
-    dbus
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    systemd
-  ];
-
-  nativeCheckInputs = [
-    dbus
-  ];
-
-  mesonFlags = [
-    "-Ddocs=true"
-    (lib.mesonEnable "introspection" withIntrospection)
-    (lib.mesonEnable "vapi" withIntrospection)
-    (lib.mesonBool "test_utils" withIntrospection)
-  ] ++ (
-    let
-      # https://gitlab.gnome.org/GNOME/tracker/-/blob/master/meson.build#L159
-      crossFile = writeText "cross-file.conf" ''
-        [properties]
-        sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}'
-      '';
-    in
-    [
-      "--cross-file=${crossFile}"
-    ]
-  ) ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-    "-Dsystemd_user_services=false"
-  ];
-
-  doCheck =
-    # https://gitlab.gnome.org/GNOME/tracker/-/issues/402
-    !stdenv.hostPlatform.isDarwin
-    # https://gitlab.gnome.org/GNOME/tracker/-/issues/398
-    && !stdenv.hostPlatform.is32bit;
-
-  postPatch = ''
-    chmod +x \
-      docs/reference/libtracker-sparql/embed-files.py \
-      docs/reference/libtracker-sparql/generate-svgs.sh
-    patchShebangs \
-      utils/data-generators/cc/generate \
-      docs/reference/libtracker-sparql/embed-files.py \
-      docs/reference/libtracker-sparql/generate-svgs.sh
-  '';
-
-  preCheck =
-    let
-      linuxDot0 = lib.optionalString stdenv.hostPlatform.isLinux ".0";
-      darwinDot0 = lib.optionalString stdenv.hostPlatform.isDarwin ".0";
-      extension = stdenv.hostPlatform.extensions.sharedLibrary;
-    in
-    ''
-      # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file
-      export HOME=$(mktemp -d)
-
-      # Our gobject-introspection patches make the shared library paths absolute
-      # in the GIR files. When running functional tests, the library is not yet installed,
-      # though, so we need to replace the absolute path with a local one during build.
-      # We are using a symlink that will be overridden during installation.
-      mkdir -p $out/lib
-      ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0${darwinDot0}${extension} $out/lib/libtracker-sparql-3.0${darwinDot0}${extension}${linuxDot0}
-    '';
-
-  checkPhase = ''
-    runHook preCheck
-
-    dbus-run-session \
-      --config-file=${dbus}/share/dbus-1/session.conf \
-      meson test \
-        --timeout-multiplier 2 \
-        --print-errorlogs
-
-    runHook postCheck
-  '';
-
-  postCheck = ''
-    # Clean up out symlinks
-    rm -r $out/lib
-  '';
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = finalAttrs.pname;
-    };
-    tests.pkg-config = testers.hasPkgConfigModules {
-      package = finalAttrs.finalPackage;
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://tracker.gnome.org/";
-    description = "Desktop-neutral user information store, search tool and indexer";
-    mainProgram = "tracker3";
-    maintainers = teams.gnome.members;
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    pkgConfigModules = [ "tracker-sparql-3.0" "tracker-testutils-3.0" ];
-  };
-})
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
deleted file mode 100644
index f2e2e27b35d7..000000000000
--- a/pkgs/development/libraries/unibilium/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }:
-
-stdenv.mkDerivation rec {
-  pname = "unibilium";
-  version = "2.1.1";
-
-  src = fetchFromGitHub {
-    owner = "neovim";
-    repo = "unibilium";
-    rev = "v${version}";
-    sha256 = "sha256-A/WECvma7u/Mmecvzi0cP168dt4v+zwC8CiFBkqWezA=";
-  };
-
-  makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ];
-
-  strictDeps = true;
-
-  nativeBuildInputs = [ pkg-config perl libtool ];
-  buildInputs = [ ncurses ];
-
-  meta = with lib; {
-    description = "Very basic terminfo library";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ pSub ];
-  };
-}
diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix
deleted file mode 100644
index 8b172ebb45d7..000000000000
--- a/pkgs/development/libraries/usrsctp/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "usrsctp";
-  version = "0.9.5.0";
-
-  src = fetchFromGitHub {
-    owner = "sctplab";
-    repo = "usrsctp";
-    rev = version;
-    sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9";
-  };
-
-  patches = [
-    # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype
-    # errors. These issues are fixed in the master branch, but a new release with them has not
-    # been made. The following patch can be dropped once a release has been made.
-    ./clang-fix-build.patch
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  # https://github.com/sctplab/usrsctp/issues/662
-  postPatch = ''
-    substituteInPlace usrsctplib/CMakeLists.txt \
-      --replace '$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
-      --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/sctplab/usrsctp";
-    description = "Portable SCTP userland stack";
-    maintainers = with maintainers; [ misuzu ];
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix
deleted file mode 100644
index 60ae45d2cd8e..000000000000
--- a/pkgs/development/libraries/utf8cpp/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "utf8cpp";
-  version = "4.0.5";
-
-  src = fetchFromGitHub {
-    owner = "nemtrif";
-    repo = "utfcpp";
-    rev = "v${version}";
-    fetchSubmodules = true;
-    hash = "sha256-Z27/31obVErsmW1b1SVcr45nKlFu01RqqpTMwS0LqJ8=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    homepage = "https://github.com/nemtrif/utfcpp";
-    changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}";
-    description = "UTF-8 with C++ in a Portable Way";
-    license = licenses.boost;
-    maintainers = with maintainers; [ jobojeha ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
deleted file mode 100644
index 479758ed6dee..000000000000
--- a/pkgs/development/libraries/vte/default.nix
+++ /dev/null
@@ -1,141 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, gettext
-, pkg-config
-, meson
-, ninja
-, gnome
-, glib
-, gtk3
-, gtk4
-, gtkVersion ? "3"
-, gobject-introspection
-, vala
-, python3
-, gi-docgen
-, libxml2
-, gnutls
-, gperf
-, pango
-, pcre2
-, cairo
-, fribidi
-, lz4
-, icu
-, systemd
-, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
-, nixosTests
-, blackbox-terminal
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vte";
-  version = "0.76.3";
-
-  outputs = [ "out" "dev" ]
-    ++ lib.optional (gtkVersion != null) "devdoc";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-9njpTAVvN3/QAhIUrf9UUMsXLpoIsWCREYHd/3t9XWA=";
-  };
-
-  patches = [
-    # VTE needs a small patch to work with musl:
-    # https://gitlab.gnome.org/GNOME/vte/issues/72
-    # Taken from https://git.alpinelinux.org/aports/tree/community/vte3
-    (fetchpatch {
-      name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
-      url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
-      hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    gettext
-    gobject-introspection
-    gperf
-    libxml2
-    meson
-    ninja
-    pkg-config
-    vala
-    python3
-    gi-docgen
-  ];
-
-  buildInputs = [
-    cairo
-    fribidi
-    gnutls
-    pango # duplicated with propagatedBuildInputs to support gtkVersion == null
-    pcre2
-    lz4
-    icu
-  ] ++ lib.optionals systemdSupport [
-    systemd
-  ];
-
-  # Required by vte-2.91.pc.
-  propagatedBuildInputs = lib.optionals (gtkVersion != null) [
-    (assert (gtkVersion == "3" || gtkVersion == "4");
-    if gtkVersion == "3" then gtk3 else gtk4)
-    glib
-    pango
-  ];
-
-  mesonFlags = [
-    "-Ddocs=true"
-    (lib.mesonBool "gtk3" (gtkVersion == "3"))
-    (lib.mesonBool "gtk4" (gtkVersion == "4"))
-  ] ++ lib.optionals (!systemdSupport) [
-    "-D_systemd=false"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # -Bsymbolic-functions is not supported on darwin
-    "-D_b_symbolic_functions=false"
-  ];
-
-  # error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
-  env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument"
-    ++ lib.optional stdenv.cc.isClang "-Wno-cast-function-type-strict");
-
-  postPatch = ''
-    patchShebangs perf/*
-    patchShebangs src/parser-seq.py
-    patchShebangs src/modes.py
-  '';
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "vte";
-      versionPolicy = "odd-unstable";
-    };
-    tests = {
-      inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal;
-      blackbox-terminal = blackbox-terminal.override { sixelSupport = true; };
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://www.gnome.org/";
-    description = "Library implementing a terminal emulator widget for GTK";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members;
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 647fac3bb552..d48dc790424a 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, cmake, ninja }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.3.290.0";
+  version = "1.3.296.0";
 
   # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or
   # later the build fails as:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-goxA3Wg3u5hNCz54tWMJnFaS0JGVjphy14Ng/sAK/EM=";
+    hash = "sha256-u/40rOQyYbQza0aYbechLdKhYM1DgoMKkxauW2zZ/w0=";
   };
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
deleted file mode 100644
index 3c002d197ff5..000000000000
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libX11, libxcb
-, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath
-, testers }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vulkan-loader";
-  version = "1.3.290.0";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "Vulkan-Loader";
-    rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-z26xvp7bKaOQAXF+/Sk24Syuw3N9QXc6sk2vlQwceJ8=";
-  };
-
-  patches = [ ./fix-pkgconfig.patch ]
-    ++ lib.optionals stdenv.hostPlatform.is32bit [
-      # Backport patch to support 64-bit inodes on 32-bit systems
-      # FIXME: remove in next update
-      (fetchpatch {
-        url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch";
-        hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0=";
-      })
-    ];
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ vulkan-headers ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libXrandr wayland ];
-
-  cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
-    ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
-    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
-
-  outputs = [ "out" "dev" ];
-
-  doInstallCheck = true;
-
-  installCheckPhase = ''
-    grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || {
-      echo vulkan-headers include directory not found in pkg-config file
-      exit 1
-    }
-  '';
-
-  passthru = {
-    tests.pkg-config = testers.hasPkgConfigModules {
-      package = finalAttrs.finalPackage;
-    };
-  };
-
-  meta = with lib; {
-    description = "LunarG Vulkan loader";
-    homepage    = "https://www.lunarg.com";
-    platforms   = platforms.unix ++ platforms.windows;
-    license     = licenses.asl20;
-    maintainers = [ maintainers.ralith ];
-    broken = finalAttrs.version != vulkan-headers.version;
-    pkgConfigModules = [ "vulkan" ];
-  };
-})
diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix
deleted file mode 100644
index 060f609c8566..000000000000
--- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vulkan-utility-libraries";
-  version = "1.3.290.0";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "Vulkan-Utility-Libraries";
-    rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-dzX2xePUkjL4G+IMwPCUgFs1iKsqwZScQQBDt5toUzc=";
-  };
-
-  nativeBuildInputs = [ cmake python3 ];
-  buildInputs = [ vulkan-headers ];
-
-  meta = with lib; {
-    description = "Set of utility libraries for Vulkan";
-    homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries";
-    platforms = platforms.all;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao ];
-  };
-})
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 79aaa69696df..76976be200b5 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -2,12 +2,12 @@
 , pkg-config
 , meson, ninja, wayland-scanner
 , python3, wayland
-, testers
+, gitUpdater, testers
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland-protocols";
-  version = "1.37";
+  version = "1.38";
 
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform &&
   # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    hash = "sha256-pw6b6STy6GiOaCTc6vYYj6rNWuIY36yNCj0JdiEe8yY=";
+    hash = "sha256-/xcpLAUVnSsgzmys/kLX4xooGY+hQpp2mwOvfDhYHb4=";
   };
 
   postPatch = lib.optionalString finalAttrs.doCheck ''
@@ -45,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
     pkgConfigModules = [ "wayland-protocols" ];
   };
 
+  passthru.updateScript = gitUpdater {
+    url = "https://gitlab.freedesktop.org/wayland/wayland-protocols.git";
+  };
   passthru.version = finalAttrs.version;
   passthru.tests.pkg-config = testers.hasPkgConfigModules {
     package = finalAttrs.finalPackage;
diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix
index 15ece6b3b01b..d3ae7273fae8 100644
--- a/pkgs/development/libraries/waylib/default.nix
+++ b/pkgs/development/libraries/waylib/default.nix
@@ -1,47 +1,32 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , pkg-config
 , wayland-scanner
 , wrapQtAppsHook
 , qtbase
-, qtquick3d
+, qtdeclarative
 , qwlroots
 , wayland
 , wayland-protocols
 , wlr-protocols
 , pixman
 , libdrm
-, nixos-artwork
+, libinput
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waylib";
-  version = "0.1.1";
+  version = "0.3.0-alpha";
 
   src = fetchFromGitHub {
     owner = "vioken";
     repo = "waylib";
     rev = finalAttrs.version;
-    hash = "sha256-3IdrChuXQyQGhJ/7kTqmkV0PyuSNP53Y0Po01Fc9Qi0=";
+    hash = "sha256-5IWe8VFpLwDSja4to/ugVS80s5+bcAbM6/fg1HPP52Q=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-build-on-qt-6_7.patch";
-      url = "https://github.com/vioken/waylib/commit/09875ebedb074089ec57e71cbc8d8011f555be70.patch";
-      hash = "sha256-ulXlLxn7TOlXSl4N5mjXCy3PJhxVeyDwbwKeV9J/FSI=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace examples/tinywl/OutputDelegate.qml \
-      --replace "/usr/share/wallpapers/deepin/desktop.jpg" \
-                "${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png"
-  '';
-
   depsBuildBuild = [
     # To find wayland-scanner
     pkg-config
@@ -51,36 +36,30 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     wayland-scanner
-    wrapQtAppsHook
   ];
 
   buildInputs = [
     qtbase
-    qtquick3d
+    qtdeclarative
+    qwlroots
     wayland
     wayland-protocols
     wlr-protocols
     pixman
     libdrm
-  ];
-
-  propagatedBuildInputs = [
-    qwlroots
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "INSTALL_TINYWL" true)
+    libinput
   ];
 
   strictDeps = true;
 
-  outputs = [ "out" "dev" "bin" ];
+  dontWrapQtApps = true;
+
+  outputs = [ "out" "dev" ];
 
   meta = {
     description = "Wrapper for wlroots based on Qt";
     homepage = "https://github.com/vioken/waylib";
     license = with lib.licenses; [ gpl3Only lgpl3Only asl20 ];
-    outputsToInstall = [ "out" ];
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ rewine ];
   };
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index e4c6afce8a61..5a47eda36425 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, clangStdenv
 , buildPackages
 , runCommand
 , fetchurl
@@ -72,27 +72,28 @@
 , enableGeoLocation ? true
 , enableExperimental ? false
 , withLibsecret ? true
-, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, systemdSupport ? lib.meta.availableOn clangStdenv.hostPlatform systemd
 , testers
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.46.1";
+  version = "2.46.3";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   # https://github.com/NixOS/nixpkgs/issues/153528
   # Can't be linked within a 4GB address space.
-  separateDebugInfo = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.is32bit;
+  separateDebugInfo = clangStdenv.hostPlatform.isLinux && !clangStdenv.hostPlatform.is32bit;
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KhT6rDWa/5QdC8REPrVTfjcCvK8xawoSng5l8/+OqsA=";
+    hash = "sha256-heCfpv+f6klni6mXXbxk6jJCgz+Pin1qiTey8pL8so0=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isLinux [
+  patches = lib.optionals clangStdenv.hostPlatform.isLinux [
     (substituteAll {
       src = ./fix-bubblewrap-paths.patch;
       inherit (builtins) storeDir;
@@ -100,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preConfigure = lib.optionalString (clangStdenv.hostPlatform != clangStdenv.buildPlatform) ''
     # Ignore gettext in cmake_prefix_path so that find_program doesn't
     # pick up the wrong gettext. TODO: Find a better solution for
     # this, maybe make cmake not look up executables in
@@ -123,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     gi-docgen
     glib # for gdbus-codegen
     unifdef
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+  ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     wayland-scanner
   ];
 
@@ -159,14 +160,14 @@ stdenv.mkDerivation (finalAttrs: {
     p11-kit
     sqlite
     woff2
-  ] ++ lib.optionals stdenv.hostPlatform.isBigEndian [
+  ] ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
     # https://bugs.webkit.org/show_bug.cgi?id=274032
     fontconfig
     freetype
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
     libedit
     readline
-  ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") (
+  ] ++ lib.optional (clangStdenv.hostPlatform.isDarwin && lib.versionOlder clangStdenv.hostPlatform.darwinSdkVersion "11.0") (
     # this can likely be removed as:
     # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one."
     # but the package is marked broken on darwin so unable to test
@@ -178,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
     runCommand "webkitgtk_headers" { } ''
       install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
     ''
-  ) ++ lib.optionals stdenv.hostPlatform.isLinux [
+  ) ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     libseccomp
     libmanette
     wayland
@@ -211,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: {
       "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
       "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
       "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
-    ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [
       # Have to be explicitly specified when cross.
       # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
       "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
       "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
       "-DENABLE_GAMEPAD=OFF"
       "-DENABLE_GTKDOC=OFF"
       "-DENABLE_MINIBROWSER=OFF"
@@ -255,6 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = teams.gnome.members;
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = clangStdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 0bfb9c6326aa..adde4f0c3420 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ xapian perl pcre2 zlib libmagic ];
   nativeBuildInputs = [ pkg-config ];
 
+  postInstall = ''
+    mkdir -p $out/share/omega
+    cp -r templates $out/share/omega
+  '';
+
   meta = with lib; {
     description = "Indexer and CGI search front-end built on Xapian library";
     homepage = "https://xapian.org/";
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
deleted file mode 100644
index 15e09d69b6f6..000000000000
--- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, fontconfig
-, glib
-, gnome
-, gnome-desktop
-, gsettings-desktop-schemas
-, gtk4
-, libadwaita
-, libjxl
-, librsvg
-, meson
-, ninja
-, pkg-config
-, wayland
-, wayland-scanner
-, webp-pixbuf-loader
-, wrapGAppsHook4
-, xdg-desktop-portal
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xdg-desktop-portal-gnome";
-  version = "46.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tcZeol6Eg1AtAzphO+bca3GIOsB/Gj5HStGAScR9FtY=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    wayland-scanner
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    fontconfig
-    glib
-    gsettings-desktop-schemas # settings exposed by settings portal
-    gtk4
-    libadwaita
-    gnome-desktop
-    xdg-desktop-portal
-    wayland # required by GTK 4
-  ];
-
-  mesonFlags = [
-    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
-  ];
-
-  postInstall = ''
-    # Pull in WebP and JXL support for gnome-backgrounds.
-    # In postInstall to run before gappsWrapperArgsHook.
-    export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
-      extraLoaders = [
-        libjxl
-        librsvg
-        webp-pixbuf-loader
-      ];
-    }}"
-  '';
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "xdg-desktop-portal-gnome";
-    };
-  };
-
-  meta = with lib; {
-    description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment";
-    homepage = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome";
-    maintainers = teams.gnome.members;
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-  };
-})
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
deleted file mode 100644
index d36804c6bce8..000000000000
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  autoreconfHook,
-  pkg-config,
-  xalanc,
-  xercesc,
-  openssl,
-  darwin,
-}:
-
-let
-  inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xml-security-c";
-  version = "2.0.4";
-
-  src = fetchgit {
-    url = "https://git.shibboleth.net/git/cpp-xml-security";
-    rev = finalAttrs.version;
-    hash = "sha256-60A6LqUUGmoZMmIvhuZWjrZl6utp7WLhPe738oNd/AA=";
-  };
-
-  configureFlags = [
-    "--with-openssl"
-    "--with-xerces"
-    "--with-xalan"
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs =
-    [
-      xalanc
-      xercesc
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreFoundation
-      CoreServices
-      SystemConfiguration
-    ];
-
-  meta = {
-    homepage = "https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario";
-    description = "C++ Implementation of W3C security standards for XML";
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.jagajaga ];
-  };
-})
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
deleted file mode 100644
index 0d95e8f34b71..000000000000
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv
-, fetchurl
-, autoreconfHook
-, jre
-, openssl
-, pkg-config
-# We depend on ZooKeeper for the Jute compiler.
-, zookeeper
-}:
-
-stdenv.mkDerivation rec {
-  pname = "zookeeper_mt";
-  version = lib.getVersion zookeeper;
-
-  src = fetchurl {
-    url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
-    hash = "sha512-G6Yw9HBF43QCw8FTLnJ7boCjUYwaQVQAT4wXqUowSlzox1cUPH5+8ZYMBxToJCbr0ppmz22t0uKsHRUI/IDAPQ==";
-  };
-
-  sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    jre
-  ];
-
-  buildInputs = [
-    openssl
-    zookeeper
-  ];
-
-  # Generate the C marshallers/unmarshallers for the Jute-encoded
-  # definitions.
-  preConfigure = ''
-    mkdir generated
-    cd generated
-    java -cp ${zookeeper}/lib/${zookeeper.pname}-jute-${version}.jar \
-        org.apache.jute.compiler.generated.Rcc -l c \
-        ../../../zookeeper-jute/src/main/resources/zookeeper.jute
-    cd ..
-  '';
-
-  configureFlags = [
-    # We're not going to start test servers in the sandbox anyway.
-    "--without-cppunit"
-  ];
-
-  meta = with lib; {
-    homepage = "https://zookeeper.apache.org";
-    description = "Apache Zookeeper";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ commandodev ztzg ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index a7cded6a9758..8074651f393c 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2515,14 +2515,14 @@ buildLuarocksPackage {
 lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "lze";
-  version = "0.1.4-1";
+  version = "0.4.4-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lze-0.1.4-1.rockspec";
-    sha256 = "0j2ll2kcqmk7m78x4bwwm47hr0n8kgz027c4l2yhyfw747s70z1h";
+    url    = "mirror://luarocks/lze-0.4.4-1.rockspec";
+    sha256 = "1qky68bg003d0n57pfb04l4q5sxbwp54kpbwdrwln6qnwbb93fcy";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/BirdeeHub/lze/archive/v0.1.4.zip";
-    sha256 = "1rr8bsxvv53mhkvmc8vb1l6jvbrfzngr3kq8wj3gvpima3jdk1za";
+    url    = "https://github.com/BirdeeHub/lze/archive/v0.4.4.zip";
+    sha256 = "18g865sii3k09dk7ynhy37m27br3lwy003zl1x0fgqpnqd47114j";
   };
 
   disabled = luaOlder "5.1";
@@ -3406,14 +3406,14 @@ buildLuarocksPackage {
 toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }:
 buildLuarocksPackage {
   pname = "toml-edit";
-  version = "0.5.0-1";
+  version = "0.6.1-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/toml-edit-0.5.0-1.rockspec";
-    sha256 = "1d80s6jcdw7ny52vda7lx4xccmavnl7sji1bcchmbc7krbf6s7v0";
+    url    = "mirror://luarocks/toml-edit-0.6.1-1.rockspec";
+    sha256 = "0crvmigffka3n7583r1a7fgcjfq5b0819a7d155q50m52b7afc4z";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.5.0.zip";
-    sha256 = "0cfsp9h7kjm52mrjf42jrp3np7akql8ynlnvq32m2ayshjdsdx6q";
+    url    = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.1.zip";
+    sha256 = "03gxfj2km4j08cx8yv70wvzwynnlwai6cdprrxnbf76mwy877hpg";
   };
 
   disabled = luaOlder "5.1";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 4f99dec11a40..5e9adc307a2a 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -831,7 +831,7 @@ in
 
     cargoDeps = rustPlatform.fetchCargoTarball {
       src = oa.src;
-      hash = "sha256-2WN5RoM1G2SE6H3g5pmEQvOoSCoaw3xMG8cDdfU2DAo=";
+      hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E=";
     };
 
     NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin
diff --git a/pkgs/development/lua-modules/toml.patch b/pkgs/development/lua-modules/toml.patch
deleted file mode 100644
index e04fc5d630f9..000000000000
--- a/pkgs/development/lua-modules/toml.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab3884c..c0fd356 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,32 +38,23 @@ include(FetchContent)
- 
- FetchContent_Declare(
- 	${TOML++}
--	GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
--	GIT_SHALLOW ON
--    GIT_SUBMODULES ""
--	GIT_TAG "v3.3.0"
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_Declare(
- 	${SOL2}
--	GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
--	GIT_SHALLOW ON
--    GIT_SUBMODULES ""
--	GIT_TAG "v3.3.0"
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_Declare(
- 	${MAGIC_ENUM}
--	GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
--	GIT_SHALLOW ON
--    GIT_SUBMODULES ""
--	GIT_TAG "v0.8.2"
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_GetProperties(${TOML++})
- if(NOT ${TOML++}_POPULATED)
-     message(STATUS "Cloning ${TOML++}")
--	FetchContent_Populate(${TOML++}) 
-+	FetchContent_Populate(${TOML++})
-     FetchContent_MakeAvailable(${TOML++})
- endif()
- 
-@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
-     find_package(Lua)
- endif()
- 
--include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
-+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC)
- 
- set(SOURCES
-     src/toml.cpp
-@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES})
- 
- if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- 	target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib)
--else() 
--    target_link_libraries(toml.lua ${LUA_LIBRARIES})    
-+else()
-+    target_link_libraries(toml.lua ${LUA_LIBRARIES})
- endif()
- 
- if (LINK_FLAGS)
diff --git a/pkgs/development/lua-modules/zip.patch b/pkgs/development/lua-modules/zip.patch
deleted file mode 100644
index c3f88f451e8d..000000000000
--- a/pkgs/development/lua-modules/zip.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile	2007-10-30 01:59:10.000000000 +0300
-+++ b/Makefile	2014-09-18 11:04:53.176320021 +0400
-@@ -6,10 +6,6 @@
-
- include $(CONFIG)
-
--ifeq "$(LUA_VERSION_NUM)" "500"
--COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
--endif
--
- SRCS= src/lua$T.c
- OBJS= src/lua$T.o $(COMPAT_O)
-
-@@ -19,9 +15,6 @@
- src/$(LIBNAME): $(OBJS)
- 	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
-
--$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
--	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
--
- install: src/$(LIBNAME)
- 	mkdir -p $(LUA_LIBDIR)
- 	cp src/$(LIBNAME) $(LUA_LIBDIR)
diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix
index 610434dfe624..476913f0e7ca 100644
--- a/pkgs/development/misc/juce/default.nix
+++ b/pkgs/development/misc/juce/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     freetype # libfreetype.so
     curl # libcurl.so
-    stdenv.cc.cc.lib # libstdc++.so libgcc_s.so
+    (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
     pcre # libpcre2.pc
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib # libasound.so
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index f9490ac1d2bf..644017a886da 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-newlib-retargetable-locking"
   ]);
 
+  enableParallelBuilding = true;
   dontDisableStatic = true;
 
   # apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66
diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix
index 3c05fa8634c2..b2d89ed741b5 100644
--- a/pkgs/development/mobile/androidenv/cmdline-tools.nix
+++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix
@@ -18,14 +18,14 @@ deployAndroidPackage {
     # Wrap all scripts that require JAVA_HOME
     find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do
       if grep -q "JAVA_HOME" $program; then
-        wrapProgram $program  --prefix PATH : ${pkgs.jdk11}/bin \
+        wrapProgram $program  --prefix PATH : ${pkgs.jdk17}/bin \
           --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT
       fi
     done
 
     # Wrap sdkmanager script
     wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \
-      --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \
+      --prefix PATH : ${lib.makeBinPath [ pkgs.jdk17 ]} \
       --add-flags "--sdk_root=$ANDROID_SDK_ROOT"
 
     # Patch all script shebangs
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index b9c11cb46e97..f72fa0c8bd4a 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -12,7 +12,7 @@ deployAndroidPackage rec {
   nativeBuildInputs = [ makeWrapper ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
   autoPatchelfIgnoreMissingDeps = [ "*" ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ];
+  buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ];
 
   patchElfBnaries = ''
     # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 4ed98e7a7d7f..05542ae6dc02 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -3,7 +3,7 @@
 deployAndroidPackage {
   inherit package os;
   nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc.lib pkgs.zlib pkgs.ncurses5 ];
+  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ];
 
   patchInstructions = lib.optionalString (os == "linux") ''
     addAutoPatchelfSearchPath $packageBaseDir/lib64
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 9690d08633ac..6d1dcd366593 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -71,6 +71,7 @@ mapAliases {
   inherit (pkgs) clean-css-cli; # added 2023-08-18
   inherit (pkgs) clubhouse-cli; # added 2023-08-18
   inherit (pkgs) coc-clangd; # added 2024-06-29
+  inherit (pkgs) coc-css; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-pyright; # added 2024-07-14
@@ -208,6 +209,7 @@ mapAliases {
   inherit (pkgs) web-ext; # added 2023-08-20
   inherit (pkgs) wrangler; # added 2024-07-01
   inherit (pkgs) write-good; # added 2023-08-20
+  inherit (pkgs) yalc; # added 2024-06-29
   inherit (pkgs) yaml-language-server; # added 2023-09-05
   inherit (pkgs) yarn; # added 2024-08-13
   inherit (pkgs) yo; # added 2023-08-20
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index e20a4f7e929a..d5de56d929ba 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -27,7 +27,6 @@
 , "cdktf-cli"
 , "clipboard-cli"
 , "coc-cmake"
-, "coc-css"
 , "coc-docker"
 , "coc-emmet"
 , "coc-eslint"
@@ -237,5 +236,4 @@
 , "webtorrent-cli"
 , "wring"
 , "@yaegassy/coc-nginx"
-, "yalc"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 9c79d64b7fa1..94112fd7dd24 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -38322,15 +38322,6 @@ let
         sha512 = "KCfK3Vi2F+PH1klYauoQzg81GQ8/GGjQRKYY6tRnpQUPKTs/1gBZSRWtTEd7jGdSn1LZL7gpAmJT+BcS55k2XQ==";
       };
     };
-    "npm-packlist-2.2.2" = {
-      name = "npm-packlist";
-      packageName = "npm-packlist";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz";
-        sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==";
-      };
-    };
     "npm-packlist-8.0.2" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
@@ -60484,23 +60475,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-css = nodeEnv.buildNodePackage {
-    name = "coc-css";
-    packageName = "coc-css";
-    version = "2.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-css/-/coc-css-2.1.0.tgz";
-      sha512 = "4DG6chaAQg5pQ4B4WLff04+AzKrQo9+WRDJIl0j0Mmcx7IOPP4QE+m00mDuyowsw4eZvaQ/Mc8bwtg5MbPdIcQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Css extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-docker = nodeEnv.buildNodePackage {
     name = "coc-docker";
     packageName = "coc-docker";
@@ -84809,65 +84783,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  yalc = nodeEnv.buildNodePackage {
-    name = "yalc";
-    packageName = "yalc";
-    version = "1.0.0-pre.53";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/yalc/-/yalc-1.0.0-pre.53.tgz";
-      sha512 = "tpNqBCpTXplnduzw5XC+FF8zNJ9L/UXmvQyyQj7NKrDNavbJtHvzmZplL5ES/RCnjX7JR7W9wz5GVDXVP3dHUQ==";
-    };
-    dependencies = [
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."chalk-4.1.2"
-      sources."cliui-7.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."detect-indent-6.1.0"
-      sources."emoji-regex-8.0.0"
-      sources."escalade-3.2.0"
-      sources."fs-extra-8.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."get-caller-file-2.0.5"
-      sources."glob-7.2.3"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."ignore-5.3.2"
-      sources."ignore-walk-3.0.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-2.0.0"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."jsonfile-4.0.0"
-      sources."minimatch-3.1.2"
-      sources."npm-bundled-1.1.2"
-      sources."npm-normalize-package-bin-1.0.1"
-      sources."npm-packlist-2.2.2"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."require-directory-2.1.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-7.2.0"
-      sources."universalify-0.1.2"
-      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.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Work with npm/yarn packages locally like a boss.";
-      homepage = "https://github.com/whitecolor/yalc";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
 }
diff --git a/pkgs/development/ocaml-modules/backoff/default.nix b/pkgs/development/ocaml-modules/backoff/default.nix
index 5f8f7a12d79b..75ee51ede5c7 100644
--- a/pkgs/development/ocaml-modules/backoff/default.nix
+++ b/pkgs/development/ocaml-modules/backoff/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   pname = "backoff";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchurl {
     url = "https://github.com/ocaml-multicore/backoff/releases/download/${version}/backoff-${version}.tbz";
-    hash = "sha256-EaSseCKekNE03gaNiqh5Y11r8TF9XulR9AZboPWMIwA=";
+    hash = "sha256-AL6jEbInsbwKVYedpNzjix/YRHtOTizxk6aVNzesnwM=";
   };
 
   doCheck = true;
@@ -20,5 +20,5 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-  minimalOCamlVersion = "4.13";
+  minimalOCamlVersion = "4.12";
 }
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 00ee104ad209..bcc67a6f6ebf 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -17,13 +17,13 @@
 
 buildDunePackage rec {
   pname = "dns";
-  version = "9.0.0";
+  version = "9.1.0";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    hash = "sha256-HvXwTLVKw0wHV+xftL/z+yNA6UjxUTSdo/cC+s3qy/Y=";
+    hash = "sha256-jz7JWs8U9XQhm1RAponq4azCpJyx2KBm+bI6esaPRPA=";
   };
 
   propagatedBuildInputs = [ fmt logs ptime domain-name gmap ipaddr lru duration metrics base64 ohex ];
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 90b737eb2215..64c6b54eb73f 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -17,13 +17,13 @@
 
 buildDunePackage rec {
   pname = "eliom";
-  version = "11.0.0";
+  version = "11.0.1";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "eliom";
     rev = version;
-    hash = "sha256-RgIK3xkKdX+zOurhML4370rsO4blJrWoEla09Nfe9Mw=";
+    hash = "sha256-SUzfJ1R/J0jKaMC0wmXB+sNfG1VfFaFbDJql1OPdRpg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 9afe4ac9182d..29ee03b9df04 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -18,6 +18,7 @@ let camlp5 = p5.override { legacy = true; }; in
 let fetched = coqPackages.metaFetch ({
     release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA=";
     release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4=";
+    release."1.18.2".sha256 = "sha256-usOYukHQ/h4YBxlhYrAkMTVjNm97hq4IArI9bvDzy/k=";
     release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0=";
     release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo=";
     release."1.15.2".sha256 = "sha256-+sQYQiN3n+dlzXzi5opOjhkJZqpkNwlHZcUjaUM6+xQ=";
diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix
index fa089d11767a..d5c1cb39cfc5 100644
--- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix
+++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix
@@ -16,13 +16,13 @@
 
 buildDunePackage rec {
   pname = "http-mirage-client";
-  version = "0.0.7";
+  version = "0.0.8";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
-    hash = "sha256-GKPJKVtHEbt8L922y/G1oewqGVBO4f313XadzImMtFM=";
+    hash = "sha256-/1eguh2dYLDVNW+XWNKcwm5IgQWfEFUuQRYS205Ox+c=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 773b0ea81eba..e8cf9e4f85ba 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -4,7 +4,7 @@
 
 buildDunePackage rec {
   pname = "lwt";
-  version = "5.7.0";
+  version = "5.8.0";
 
   minimalOCamlVersion = "4.08";
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
     owner = "ocsigen";
     repo = "lwt";
     rev = version;
-    hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs=";
+    hash = "sha256-GX5CSJuTajvZJ0TgG95aHeOCBi2B9Aw2URLZRCdp91A=";
   };
 
   nativeBuildInputs = [ cppo ];
diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix
index a9a393faf5d9..b0896d2fd6a7 100644
--- a/pkgs/development/ocaml-modules/mm/default.nix
+++ b/pkgs/development/ocaml-modules/mm/default.nix
@@ -4,7 +4,7 @@
 
 buildDunePackage rec {
   pname = "mm";
-  version = "0.8.5";
+  version = "0.8.6";
 
   duneVersion = "3";
 
@@ -14,7 +14,7 @@ buildDunePackage rec {
     owner = "savonet";
     repo = "ocaml-mm";
     rev = "v${version}";
-    sha256 = "sha256-/83coQdUoaa1+5yapF/joV87uYpVsmWU7LH867Vmmo0=";
+    sha256 = "sha256-ME6Naza7OvZ/63zEjrPeKq5JwMoMfV2fpkCuZdtCZ/c=";
   };
 
   buildInputs = [ dune-configurator ];
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index ff53efb9d9a4..902a1dbeefc7 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-mtime";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz";
-    sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs=";
+    sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg=";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index c475cc7a97d0..a8a998299a95 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "3.6.8";
+  version = "3.6.9";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
-    hash = "sha256-mCIeXsvpea/iFuJkvearu6wr804qFPCcH4WOaUKYC9k=";
+    hash = "sha256-NcelYCcDPooOP7GfWr2m27GDikKiMqezcvRfFmBzlYY=";
   };
 
   checkInputs = [ alcotest ];
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 5e3c76be1a33..137589308e2b 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -2,7 +2,7 @@
 
 buildDunePackage rec {
   pname = "ocf";
-  version = "0.8.0";
+  version = "0.9.0";
   duneVersion = "3";
   minimalOCamlVersion = "4.03";
   src = fetchFromGitLab {
@@ -10,7 +10,7 @@ buildDunePackage rec {
     owner = "zoggy";
     repo = "ocf";
     rev = version;
-    sha256 = "sha256:00ap3q5yjqmpk87lxqv1j2wkc7583ynhjr1jjrfn9r0j2h9pfd60";
+    sha256 = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA=";
   };
 
   propagatedBuildInputs = [ yojson ];
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index bc849fa1ece3..b64a5301fc32 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -3,7 +3,7 @@
   if lib.versionAtLeast ocaml.version "4.07"
   then if lib.versionAtLeast ocaml.version "4.08"
   then if lib.versionAtLeast ocaml.version "4.11"
-  then "0.32.1" else "0.24.0" else "0.15.0" else "0.13.0"
+  then "0.33.0" else "0.24.0" else "0.15.0" else "0.13.0"
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
 , stdlib-shims, ocaml-migrate-parsetree-2
 }:
@@ -67,6 +67,10 @@ let param = {
     sha256 = "sha256-nbrYvLHItPPfP1i8pgpe0j2GUx8No0tBlshr1YXAnX8=";
     min_version = "4.07";
   };
+  "0.33.0" = {
+    sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo=";
+    min_version = "4.07";
+  };
 }."${version}"; in
 
 if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index 1f23194582a0..7110a66c8f60 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -11,12 +11,12 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
   "ptime is not available for OCaml ${ocaml.version}"
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.1.0";
+  version = "1.2.0";
   pname = "ocaml${ocaml.version}-ptime";
 
   src = fetchurl {
     url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
-    hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE=";
+    hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/res/default.nix b/pkgs/development/ocaml-modules/res/default.nix
index 779a3c3d8a5f..b7a4edd69f8e 100644
--- a/pkgs/development/ocaml-modules/res/default.nix
+++ b/pkgs/development/ocaml-modules/res/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "res";
-  version = "5.0.1";
+  version = "5.0.2";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz";
-    hash = "sha256-rSrDMQBfnbWAr2LuajP3fveOtOwLyRbKPkaTKsnocQ4=";
+    hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU=";
   };
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/semaphore-compat/default.nix b/pkgs/development/ocaml-modules/semaphore-compat/default.nix
index a686ef42e708..adbff78d5945 100644
--- a/pkgs/development/ocaml-modules/semaphore-compat/default.nix
+++ b/pkgs/development/ocaml-modules/semaphore-compat/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   pname = "semaphore-compat";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz";
-    sha256 = "139c5rxdp4dg1jcwyyxvhxr8213l1xdl2ab0mc288rfcppsiyxrb";
+    sha256 = "sha256-4CnZ2vX17IPpnlA7CNeuxZEKfA5HFoeQvwH0tCKNRnY=";
   };
 
   useDune2 = true;
@@ -14,7 +14,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "Compatibility Semaphore module";
     homepage = "https://github.com/mirage/semaphore-compat";
-    license = licenses.lgpl21Only;
+    license = with licenses; [ lgpl21Plus ocamlLgplLinkingException ];
     maintainers = [ maintainers.sternenseemann ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff b/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff
deleted file mode 100644
index baad34ce08b5..000000000000
--- a/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/elf_locations.ml b/src/elf_locations.ml
-index a08b359..0db9274 100644
---- a/src/elf_locations.ml
-+++ b/src/elf_locations.ml
-@@ -37,7 +37,8 @@ let resolve_from_dwarf t ~program_counter =
-     | Some section ->
-       let body = Owee_buf.cursor (Owee_elf.section_body t.map section) in
-       let rec aux () =
--        match Owee_debug_line.read_chunk body with
-+        let pointers_to_other_sections = Owee_elf.debug_line_pointers t.map t.sections in
-+        match Owee_debug_line.read_chunk body ~pointers_to_other_sections with
-         | None -> ()
-         | Some (header, chunk) ->
-           (* CR-soon mshinwell: fix owee .mli to note that [state] is
diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix
index 6849056d2ded..0fc9048a09ce 100644
--- a/pkgs/development/ocaml-modules/theora/default.nix
+++ b/pkgs/development/ocaml-modules/theora/default.nix
@@ -2,7 +2,7 @@
 
 buildDunePackage rec {
   pname = "theora";
-  version = "0.4.0";
+  version = "0.4.1";
 
   duneVersion = "3";
 
@@ -10,7 +10,7 @@ buildDunePackage rec {
     owner = "savonet";
     repo = "ocaml-theora";
     rev = "v${version}";
-    hash = "sha256-VN1XYqxMCO0W9tMTqSAwWKv7GErTtRZgnC2SnmmV7+k=";
+    hash = "sha256-2FXB5BOBRQhnpEmdlYBdZZXuXW9K+1cu7akJQDuDAMc=";
   };
 
   buildInputs = [ dune-configurator ];
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index 1395a37c69d3..0e4b1cf83e2c 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -7,7 +7,7 @@ else
 
 let
   pname = "tsdl";
-  version = "1.0.0";
+  version = "1.1.0";
   webpage = "https://erratique.ch/software/${pname}";
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE=";
+    hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix
index 2ed284fe6079..381ec3734243 100644
--- a/pkgs/development/php-packages/couchbase/default.nix
+++ b/pkgs/development/php-packages/couchbase/default.nix
@@ -5,6 +5,7 @@
   libcouchbase,
   zlib,
   substituteAll,
+  php,
 }:
 let
   pname = "couchbase";
@@ -40,5 +41,6 @@ buildPecl {
     license = licenses.asl20;
     homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
     maintainers = teams.php.members;
+    broken = lib.versionAtLeast php.version "8.3";
   };
 }
diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix
index b250db4a3003..0a56b3f0e774 100644
--- a/pkgs/development/php-packages/openswoole/default.nix
+++ b/pkgs/development/php-packages/openswoole/default.nix
@@ -5,6 +5,7 @@
   valgrind,
   pcre2,
   fetchFromGitHub,
+  php,
 }:
 
 let
@@ -34,5 +35,6 @@ buildPecl {
       You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.
     '';
     maintainers = teams.php.members;
+    broken = lib.versionAtLeast php.version "8.4";
   };
 }
diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix
index b5d89ee6a0d2..e571c746f652 100644
--- a/pkgs/development/php-packages/phalcon/default.nix
+++ b/pkgs/development/php-packages/phalcon/default.nix
@@ -33,5 +33,6 @@ buildPecl rec {
     license = licenses.bsd3;
     homepage = "https://phalcon.io";
     maintainers = teams.php.members ++ [ maintainers.krzaczek ];
+    broken = lib.versionAtLeast php.version "8.4";
   };
 }
diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix
index e30fc51cfd8b..ffa163168286 100644
--- a/pkgs/development/php-packages/psysh/default.nix
+++ b/pkgs/development/php-packages/psysh/default.nix
@@ -19,7 +19,7 @@ let
   composerLock = fetchurl {
     name = "composer.lock";
     url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock";
-    hash = "sha256-ur6mzla3uXeFL6aEHAPdpxGdvcgzOgTLW/CKPbNqeCg=";
+    hash = "sha256-PQDWShzvTY8yF+OUPVJAV0HMx0/KnA03TDhZUM7ppXw=";
   };
 in
 php.buildComposerProject2 (finalAttrs: {
@@ -45,7 +45,7 @@ php.buildComposerProject2 (finalAttrs: {
       composer update --lock --no-install
     '';
 
-    vendorHash = "sha256-mW276lzOTCY68EnvSVR+tD+gh3Y61GrWchVJHDZ4dpg=";
+    vendorHash = "sha256-tKy2A3dGGmZZzZF0JxtG6NYMfG/paQsuxAO1y3GfCsA=";
   };
 
   meta = {
diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index 6cc399be10dc..7b52c838f473 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -33,5 +33,6 @@ buildPecl {
     homepage = "https://www.swoole.com";
     license = lib.licenses.asl20;
     maintainers = lib.teams.php.members;
+    broken = lib.versionAtLeast php.version "8.4";
   };
 }
diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 84ac38f6c4b8..56fff995095e 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   fetchFromGitHub,
 }:
 
@@ -29,5 +30,6 @@ buildPecl {
     homepage = "https://xdebug.org/";
     license = lib.licenses.php301;
     maintainers = lib.teams.php.members;
+    broken = lib.versionAtLeast php.version "8.4";
   };
 }
diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix
index 4706c97c9bc4..99c6253d0977 100644
--- a/pkgs/development/python-modules/a2wsgi/default.nix
+++ b/pkgs/development/python-modules/a2wsgi/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "a2wsgi";
-  version = "1.10.4";
+  version = "1.10.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UOgaxVqmCfosZm5CuswlxCTIiEzmBy8afpAhFLfuXWM=";
+    hash = "sha256-zkYv9+HarAvFcYPG+ADwmnHCp6mN3VzeyhSePqvzM44=";
   };
 
   nativeBuildInputs = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 4b1bfa910981..870131a4fb54 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -1,9 +1,9 @@
 {
-  buildPythonPackage,
   lib,
+  buildPythonPackage,
   fetchPypi,
   setuptools,
-  six,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -11,21 +11,24 @@ buildPythonPackage rec {
   version = "2.1.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-eCB5DvuzFnOc3otOGTVyQ/w2CKFSAkKIUT3ZaNfZWf8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
 
   # checks use bazel; should be revisited
   doCheck = false;
 
+  pythonImportsCheck = [ "absl" ];
+
   meta = {
     description = "Abseil Python Common Libraries";
     homepage = "https://github.com/abseil/abseil-py";
+    changelog = "https://github.com/abseil/abseil-py/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index bcbd29bcc963..ea8efbcad1b1 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -12,6 +12,7 @@
   setuptools,
 
   # dependencies
+  huggingface-hub,
   numpy,
   packaging,
   psutil,
@@ -30,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "accelerate";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XVJqyhDSUPQDHdaB6GDxHhuC6EWCSZNArjzyLpvhQHI=";
+    hash = "sha256-GBNe4zomy8dmfvYrk/9Q77Z6r+JJA+2dgAhJx2opqAc=";
   };
 
   buildInputs = [ llvmPackages.openmp ];
@@ -45,6 +46,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
+    huggingface-hub
     numpy
     packaging
     psutil
@@ -113,6 +115,31 @@ buildPythonPackage rec {
       "test_init_trackers"
       "test_log"
       "test_log_with_tensor"
+
+      # After enabling MPS in pytorch, these tests started failing
+      "test_accelerated_optimizer_step_was_skipped"
+      "test_auto_wrap_policy"
+      "test_autocast_kwargs"
+      "test_automatic_loading"
+      "test_backward_prefetch"
+      "test_can_resume_training"
+      "test_can_resume_training_checkpoints_relative_path"
+      "test_can_resume_training_with_folder"
+      "test_can_unwrap_model_fp16"
+      "test_checkpoint_deletion"
+      "test_cpu_offload"
+      "test_cpu_ram_efficient_loading"
+      "test_grad_scaler_kwargs"
+      "test_invalid_registration"
+      "test_map_location"
+      "test_mixed_precision"
+      "test_mixed_precision_buffer_autocast_override"
+      "test_project_dir"
+      "test_project_dir_with_config"
+      "test_sharding_strategy"
+      "test_state_dict_type"
+      "test_with_save_limit"
+      "test_with_scheduler"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
       # RuntimeError: torch_shm_manager: execl failed: Permission denied
diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix
index 334a10de460b..550fd5f9db30 100644
--- a/pkgs/development/python-modules/adjusttext/default.nix
+++ b/pkgs/development/python-modules/adjusttext/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "adjusttext";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,15 +21,15 @@ buildPythonPackage rec {
     owner = "Phlya";
     repo = "adjusttext";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2EaFKvRdFPGnDlO8owjP1vCIY1hTQ3tep5oXV/JeU9M=";
+    hash = "sha256-WMWT2os3ADQOc1ogoCFKBEWnb6/CxgtiWmY45bYomks=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     packaging
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     matplotlib
     numpy
     scipy
diff --git a/pkgs/development/python-modules/aerosandbox/default.nix b/pkgs/development/python-modules/aerosandbox/default.nix
index f108219b6b08..17bf01626067 100644
--- a/pkgs/development/python-modules/aerosandbox/default.nix
+++ b/pkgs/development/python-modules/aerosandbox/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aerosandbox";
-  version = "4.2.5";
+  version = "4.2.6";
   format = "wheel";
 
   src = fetchPypi {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
     python = "py3";
     dist = "py3";
-    hash = "sha256-9WxeXmcOZpKpNn8r6REudQlDRXavym52tvKajYJIfXA=";
+    hash = "sha256-jS1Eh/+2WXZkQC4pt1Rwvw7plJC1NFFC08gqzEyGir4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix
index 385ec7ed5259..d74c96288335 100644
--- a/pkgs/development/python-modules/aesara/default.nix
+++ b/pkgs/development/python-modules/aesara/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "aesara";
-  version = "2.9.3";
+  version = "2.9.4";
   pyproject = true;
 
   # Python 3.12 is not supported: https://github.com/aesara-devs/aesara/issues/1520
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "aesara-devs";
     repo = "aesara";
     rev = "refs/tags/rel-${version}";
-    hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI=";
+    hash = "sha256-V34uP50TfH6cLU7nWOx+8oXY1QawtaoIaKQpbLnz7eo=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/aetcd/default.nix b/pkgs/development/python-modules/aetcd/default.nix
index 77cd49ad8029..bc8fc1ce325e 100644
--- a/pkgs/development/python-modules/aetcd/default.nix
+++ b/pkgs/development/python-modules/aetcd/default.nix
@@ -5,6 +5,7 @@
   grpcio,
   protobuf,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -29,22 +30,23 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace-fail "setuptools_scm==6.3.2" "setuptools_scm"
-    substituteInPlace setup.cfg \
-      --replace-fail "--cov=aetcd" ""
   '';
 
-  nativeBuildInputs = [
+  pythonRelaxDeps = [ "protobuf" ];
+
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     grpcio
     protobuf
   ];
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytest-mock
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix
index eb1702d32709..8c9ef8be3c58 100644
--- a/pkgs/development/python-modules/agent-py/default.nix
+++ b/pkgs/development/python-modules/agent-py/default.nix
@@ -1,33 +1,33 @@
 {
   aiohttp,
   buildPythonPackage,
-  fetchPypi,
-  isPy3k,
+  fetchFromGitHub,
   lib,
-  python,
-  requests,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "agent-py";
-  version = "0.0.23";
-  format = "setuptools";
+  version = "0.0.24";
+  pyproject = true;
 
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz";
+  src = fetchFromGitHub {
+    owner = "ispysoftware";
+    repo = "agent-py";
+    rev = "refs/tags/agent-py.${version}";
+    hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE=";
   };
 
-  propagatedBuildInputs = [
-    requests
-    aiohttp
-  ];
+  build-system = [ setuptools ];
 
-  checkPhase = ''
-    ${python.interpreter} tests/test_agent.py
-  '';
+  dependencies = [ aiohttp ];
+
+  doCheck = false; # only test is outdated
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "agent" ];
 
   meta = with lib; {
     description = "Python wrapper around the Agent REST API";
diff --git a/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch b/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch
new file mode 100644
index 000000000000..feaddc465032
--- /dev/null
+++ b/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch
@@ -0,0 +1,31 @@
+From d20c7039316ea7c76da86963b266d3c34001b9f7 Mon Sep 17 00:00:00 2001
+From: Marcel 
+Date: Sat, 2 Nov 2024 21:13:37 +0100
+Subject: [PATCH] setup: remove nose, coverage
+
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b880f27..7a47360 100644
+--- a/setup.py
++++ b/setup.py
+@@ -70,7 +70,7 @@ setup(
+         'Programming Language :: Python :: 3',
+         'Programming Language :: Python :: 3.6'
+     ],
+-    setup_requires=["nose", "coverage", "mock"],
++    setup_requires=["mock"],
+     install_requires=["py-radix==0.10.0"] + (
+         ["future", "ipaddress"] if sys.version_info.major == 2 else []
+     ),
+@@ -78,5 +78,4 @@ setup(
+     entry_points={'console_scripts':
+                   ['aggregate6 = aggregate6.aggregate6:main']},
+     data_files = [('man/man7', ['aggregate6.7'])],
+-    test_suite='nose.collector'
+ )
+-- 
+2.44.1
+
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
new file mode 100644
index 000000000000..2be5f07a85ac
--- /dev/null
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  py-radix-sr,
+  pytestCheckHook,
+  mock,
+}:
+
+buildPythonPackage rec {
+  pname = "aggregate6";
+  version = "1.0.12";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "job";
+    repo = "aggregate6";
+    rev = version;
+    hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0=";
+  };
+
+  patches = [ ./0001-setup-remove-nose-coverage.patch ];
+
+  # py-radix-sr is a fork, with fixes
+  postPatch = ''
+    substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ py-radix-sr ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+  ];
+
+  pythonImportsCheck = [ "aggregate6" ];
+
+  meta = {
+    description = "IPv4 and IPv6 prefix aggregation tool";
+    mainProgram = "aggregate6";
+    homepage = "https://github.com/job/aggregate6";
+    license = with lib.licenses; [ bsd2 ];
+    maintainers = lib.teams.wdz.members ++ (with lib.maintainers; [ marcel ]);
+  };
+}
diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix
index 63c849e3537b..2f81eb4ccc4d 100644
--- a/pkgs/development/python-modules/ahocorasick-rs/default.nix
+++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix
@@ -1,11 +1,13 @@
 {
   lib,
   buildPythonPackage,
+  pythonOlder,
   fetchPypi,
   rustPlatform,
   pytestCheckHook,
   pyahocorasick,
   hypothesis,
+  typing-extensions,
   pytest-benchmark,
 }:
 
@@ -32,6 +34,8 @@ buildPythonPackage rec {
     cargoSetupHook
   ];
 
+  dependencies = lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+
   nativeCheckInputs = [
     pytest-benchmark
     pytestCheckHook
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 04c11fd603bf..3fb23cba1ce0 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.125";
+  version = "9.2.127";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ytwhCSlkp38Fff+bB/ep/FvY63vy/Gqxt+wMMziK0eY=";
+    hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix
index 5e5499e2bcaa..685e50650602 100644
--- a/pkgs/development/python-modules/aioairzone-cloud/default.nix
+++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone-cloud";
-  version = "0.6.7";
+  version = "0.6.10";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioairzone-cloud";
     rev = "refs/tags/${version}";
-    hash = "sha256-6M80Qm5stk3wsZ55wcrJc8Y/TDd5zLWwiOhKj+5FQHs=";
+    hash = "sha256-H78vlCGJhIE1/utX4Dh1vssOwYnQxCytsEs+hpOPVtM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 8884f0ef904f..9caf6af5bbbf 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -9,14 +9,16 @@
   poetry-core,
   pyjwt,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   syrupy,
+  tzlocal,
 }:
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2024.10.0";
+  version = "2024.10.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,14 +27,13 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     rev = "refs/tags/${version}";
-    hash = "sha256-qWXFkz1yIpSDGFilVZK0n+hEUs7osfO+2xfknr2cOZY=";
+    hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk=";
   };
 
   postPatch = ''
     # Upstream doesn't set a version
     substituteInPlace pyproject.toml \
-      --replace-fail 'version = "0.0.0"' 'version = "${version}"' \
-      --replace-fail "--cov" ""
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
   '';
 
   build-system = [ poetry-core ];
@@ -42,11 +43,13 @@ buildPythonPackage rec {
     ical
     mashumaro
     pyjwt
+    tzlocal
   ];
 
   nativeCheckInputs = [
     freezegun
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
     syrupy
   ];
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 40a5adfd3c23..c21b2e2ad4dc 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiobotocore";
-  version = "2.13.1";
+  version = "2.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,18 +30,16 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiobotocore";
     rev = "refs/tags/${version}";
-    hash = "sha256-tSxCRms/YstYXWCJWirzhf87ZH4WUav/n7QfMvBwj2s=";
+    hash = "sha256-kPSkvvXBBwnWrdf0jmDNiTG6T1qpm5pNcPDHpnMFdmc=";
   };
 
   # Relax version constraints: aiobotocore works with newer botocore versions
   # the pinning used to match some `extras_require` we're not using.
-  postPatch = ''
-    sed -i "s/'botocore>=.*'/'botocore'/" setup.py
-  '';
+  pythonRelaxDeps = [ "botocore" ];
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     aioitertools
     botocore
diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix
index c79904c5d05f..a3cdc57503be 100644
--- a/pkgs/development/python-modules/aiocomelit/default.nix
+++ b/pkgs/development/python-modules/aiocomelit/default.nix
@@ -6,38 +6,35 @@
   fetchFromGitHub,
   pint,
   poetry-core,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "aiocomelit";
-  version = "0.9.1";
+  version = "0.10.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aiocomelit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3r9DyvzqtQ88VwKCghAC9nn5kXbBzbR8drTFTnWC/bM=";
+    hash = "sha256-5XyCc/OMFA99qwVjsVLCA4NedvcDBSSBzG8TvSg4sk0=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=aiocomelit --cov-report=term-missing:skip-covered" ""
-  '';
+  build-system = [ poetry-core ];
 
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
+    colorlog
     pint
   ];
 
   nativeCheckInputs = [
-    colorlog
+    pytest-cov-stub
     pytestCheckHook
   ];
 
@@ -46,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to control Comelit Simplehome";
     homepage = "https://github.com/chemelli74/aiocomelit";
-    changelog = "https://github.com/chemelli74/aiocomelit/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/chemelli74/aiocomelit/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index b374d2e51930..7b8bc059e731 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -18,7 +18,7 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "vxgmichel";
     repo = "aioconsole";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gexVeMlDRxZXcBi/iIYPip0DZIKvxCxKmTd+9jm0ud8=";
+    hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
index 16989e989305..f7fde19dc644 100644
--- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix
+++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
@@ -39,6 +39,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
   pythonImportsCheck = [ "aiodhcpwatcher" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index 90dcca8a4c2c..d81acb340b7f 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -8,16 +8,17 @@
   fetchFromGitHub,
   ifaddr,
   netifaces,
+  poetry-core,
   pyroute2,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aiodiscover";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,12 +27,12 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "aiodiscover";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+DcROb6jR0veD3oSKgyJHUi1VtCT54yBKvVqir5y+R4=";
+    hash = "sha256-A12YeNIm9Pv4zpzaejTk8VvLzKLHxZV2EzVpchLX1k8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     async-timeout
     aiodns
     cached-ipaddress
@@ -43,6 +44,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 4d6f597fb2a9..461fe2c4ff43 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "27.0.0";
+  version = "27.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2FA0QleMJG69vhyC85tO4ZAY0U8qPIdyJROHKxC35GM=";
+    hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8=";
   };
 
   build-system = [
@@ -70,6 +70,11 @@ buildPythonPackage rec {
     "test_start_connection_can_only_increase_buffer_size_to_262144"
   ];
 
+  disabledTestPaths = [
+    # benchmarking requires pytest-codespeed
+    "tests/test_bluetooth_benchmarks.py"
+  ];
+
   pythonImportsCheck = [ "aioesphomeapi" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix
index 0ed8b3fa7a34..0f9b5966805e 100644
--- a/pkgs/development/python-modules/aiofile/default.nix
+++ b/pkgs/development/python-modules/aiofile/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aiofile" ];
 
   disabledTests = [
-    # Tests (SystemError) fails randomly during nix-review
+    # Tests (SystemError) fails randomly during nixpkgs-review
     "test_async_open_fp"
     "test_async_open_iter_chunked"
     "test_async_open_iter_chunked"
diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
index a80581bc3088..8334a339d2eb 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
@@ -11,19 +11,19 @@
 
 buildPythonPackage rec {
   pname = "aiofiles";
-  version = "23.2.1";
-  format = "pyproject";
+  version = "24.1.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "Tinche";
-    repo = pname;
+    repo = "aiofiles";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EbRQD/AoTMWAlPOMWmD0UdFjRyjt5MUBkJtcydUCdHM=";
+    hash = "sha256-uDKDMSNbMIlAaifpEBh1+q2bdZNUia8pPb30IOIgOAE=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -45,6 +45,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "File support for asyncio";
     homepage = "https://github.com/Tinche/aiofiles";
-    license = with licenses; [ asl20 ];
+    changelog = "https://github.com/Tinche/aiofiles/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix
index 13b51bf8ad21..a67453821a8d 100644
--- a/pkgs/development/python-modules/aioflo/default.nix
+++ b/pkgs/development/python-modules/aioflo/default.nix
@@ -15,34 +15,29 @@
 buildPythonPackage rec {
   pname = "aioflo";
   version = "2021.11.0";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "bachya";
-    repo = pname;
-    rev = version;
+    repo = "aioflo";
+    rev = "refs/tags/${version}";
     hash = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ=";
   };
 
   patches = [
-    # This patch removes references to setuptools and wheel that are no longer
-    # necessary and changes poetry to poetry-core, so that we don't need to add
-    # unnecessary nativeBuildInputs.
-    #
-    #   https://github.com/bachya/aioflo/pull/65
-    #
     (fetchpatch {
+      # Clean-up, https://github.com/bachya/aioflo/pull/65
       name = "clean-up-build-dependencies.patch";
       url = "https://github.com/bachya/aioflo/commit/f38d3f6427777ab0eeb56177943679e2570f0634.patch";
       hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4=";
     })
   ];
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [ aiohttp ];
 
   __darwinAllowLocalNetworking = true;
 
@@ -55,10 +50,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aioflo" ];
 
+  disabledTests = [
+    # test is out-dated
+    "test_system_modes"
+  ];
+
   meta = with lib; {
     description = "Python library for Flo by Moen Smart Water Detectors";
     homepage = "https://github.com/bachya/aioflo";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/bachya/aioflo/releases/tag/${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index 9c0021c0a723..afd1bcd6258f 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -28,16 +28,16 @@
 
 buildPythonPackage rec {
   pname = "aiogram";
-  version = "3.13.1";
+  version = "3.14.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "aiogram";
     repo = "aiogram";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uTFh1ncIPF9SmAEVGeBnXEKrYzgifZan1sxk5UiG92U=";
+    hash = "sha256-SEq88e5MLNqssJhxPPwI2ZdpNdTCBomNpI0xmbmz3Pw=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index 9ff8b61feed8..51b923c86df6 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiohappyeyeballs";
-  version = "2.3.6";
+  version = "2.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "aiohappyeyeballs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3cin755WD3e75l+mm//KG+g2UEkHvdYYEFvkJ9j9D6s=";
+    hash = "sha256-ZHxAup3Qf+ejW5Lz9ucuiWAQAwSG0Rf5giPSwk9A0ww=";
   };
 
   outputs = [
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     "doc"
   ];
 
-  nativeBuildInputs = [ poetry-core ] ++ optional-dependencies.docs;
+  build-system = [ poetry-core ] ++ optional-dependencies.docs;
 
   optional-dependencies = {
     docs = [
diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix
index 969e72889da6..2f906fef1954 100644
--- a/pkgs/development/python-modules/aiohasupervisor/default.nix
+++ b/pkgs/development/python-modules/aiohasupervisor/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "aiohasupervisor";
-  version = "0.1.0";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Jq9cSdMMXVgRHhQK1LuGwVR6GBTIrw3th7y9huRSQjM=";
+    hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index eb6524e1d2fb..1887ed1cebf1 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "3.2.4";
+  version = "3.2.6";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = "aiohomekit";
     rev = "refs/tags/${version}";
-    hash = "sha256-9TvpdsWmNXz7UAh0BCgjdRWLKCP2FdE8TIjvyDXydLU=";
+    hash = "sha256-2mo7huHnac17FzBK0z1iCFOTkTUBohvOVUJ1226w7Ks=";
   };
 
   build-system = [ poetry-core ];
@@ -49,8 +49,6 @@ buildPythonPackage rec {
     zeroconf
   ];
 
-  doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0";
-
   nativeCheckInputs = [
     pytest-aiohttp
     pytestCheckHook
@@ -61,17 +59,6 @@ buildPythonPackage rec {
     "tests/test_ip_pairing.py"
   ];
 
-  disabledTests = [
-    # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties'
-    "test_discover_find_one_unpaired"
-    "test_find_device_id_case_lower"
-    "test_find_device_id_case_upper"
-    "test_discover_missing_csharp"
-    "test_discover_csharp_case"
-    "test_discover_device_id_case_lower"
-    "test_discover_device_id_case_upper"
-  ];
-
   pythonImportsCheck = [ "aiohomekit" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
index 6f3116938465..e7e1812db0ff 100644
--- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix
+++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-client-cache";
-  version = "0.11.1";
+  version = "0.12.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "aiohttp_client_cache";
     inherit version;
-    hash = "sha256-MuY60hAkD4Ik8+Encv5TrBAs8kx88Y3bhqy7n9+eS28=";
+    hash = "sha256-5g/oFhNrWx1m87trJyq4HZeFTqHk2bVwhaNgQmln0mU=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix
index eb275e0af22e..43ffc4d3c249 100644
--- a/pkgs/development/python-modules/aiohttp-remotes/default.nix
+++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix
@@ -2,8 +2,8 @@
   lib,
   aiohttp,
   buildPythonPackage,
-  fetchPypi,
-  flit,
+  fetchFromGitHub,
+  flit-core,
   pytest-aiohttp,
   pytest-cov-stub,
   pytestCheckHook,
@@ -13,20 +13,26 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-remotes";
-  version = "1.2.0";
-  format = "pyproject";
+  version = "1.3.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    pname = "aiohttp_remotes";
-    inherit version;
-    sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c";
+  src = fetchFromGitHub {
+    owner = "aio-libs";
+    repo = "aiohttp-remotes";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/bcYrpZfO/sXc0Tcpr67GBqCu4ZSAVmUj9kzupIHHnM=";
   };
 
-  nativeBuildInputs = [ flit ];
+  build-system = [
+    flit-core
+  ];
 
-  propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ typing-extensions ];
+  dependencies = [
+    aiohttp
+    typing-extensions
+  ];
 
   nativeCheckInputs = [
     pytest-aiohttp
@@ -36,12 +42,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiohttp_remotes" ];
 
-  pytestFlagsArray = [
-    "-W"
-    "ignore::DeprecationWarning"
-    "--asyncio-mode=auto"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index 9a4820ccf2e4..a742c77d1504 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     aiohttp
     attrs
     python-socks
-  ];
+  ] ++ python-socks.optional-dependencies.asyncio;
 
   # Checks needs internet access
   doCheck = false;
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 255294df0aa8..7988785382a4 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.10.5";
+  version = "3.10.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiohttp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HN2TJ8hVbClakV3ldTOn3wbrhCuf2Qn9EjWCSlSyJpw=";
+    hash = "sha256-ksvGRzar1Gp+86WrRFwyHoEdthyzvaAbyubdIhON/sk=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix
index 886346f92bbe..5bf409ed276e 100644
--- a/pkgs/development/python-modules/aiojellyfin/default.nix
+++ b/pkgs/development/python-modules/aiojellyfin/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "aiojellyfin";
-  version = "0.10.0";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Jc2k";
     repo = "aiojellyfin";
-    rev = "v${version}";
-    hash = "sha256-D4/DlhCeeI4CggW7KGauZ57fHY92JM/kZSUODyNVcNg=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-A+uvM1/7HntRMIdknfHr0TMGIjHk7BCwsZopXdVoEO8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix
index 8ee952feb39f..4d976b0819cf 100644
--- a/pkgs/development/python-modules/aiojobs/default.nix
+++ b/pkgs/development/python-modules/aiojobs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiojobs";
-  version = "1.2.1";
+  version = "1.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiojobs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LwFXb/SHP6bbqPg1tqYwE03FKHf4Mv1PPOxnPdESH0I=";
+    hash = "sha256-FNc71YyAjtR+hd0UOqFAy6XW0PwHSlM76C3ecPM5vsU=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix
index 4727fa2b46a5..97e7f60eadf5 100644
--- a/pkgs/development/python-modules/aiomodernforms/default.nix
+++ b/pkgs/development/python-modules/aiomodernforms/default.nix
@@ -34,6 +34,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # https://github.com/wonderslug/aiomodernforms/issues/273
+    "test_connection_error"
+    "test_empty_response"
+  ];
+
   pythonImportsCheck = [ "aiomodernforms" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index f9c952ac6da9..d38b0f88960c 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiortm";
-  version = "0.9.21";
+  version = "0.9.25";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiortm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jRsriLdSLrX8TzU4DgUKGmazN9hYbWPjE383VCulNgU=";
+    hash = "sha256-rw86RzP8AI+zWchC9c01vdedc6r4gfF5A8DltWW5YRY=";
   };
 
   pythonRelaxDeps = [ "typer" ];
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index 26d02803c4d7..53cfadb2118a 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  fetchpatch,
   flit-core,
   pygments,
   pytestCheckHook,
@@ -12,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aiorun";
-  version = "2023.7.2";
+  version = "2024.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,18 +20,9 @@ buildPythonPackage rec {
     owner = "cjrh";
     repo = "aiorun";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs=";
+    hash = "sha256-7wgsj44sX2Be/QyvG7KgQ/xSgsr+WPh7eeROeICSHGw=";
   };
 
-  patches = [
-    # Raise flit-core version constrains
-    (fetchpatch {
-      # https://github.com/cjrh/aiorun/pull/85
-      url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch";
-      hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk=";
-    })
-  ];
-
   build-system = [ flit-core ];
 
   dependencies = [ pygments ];
@@ -42,7 +32,6 @@ buildPythonPackage rec {
     uvloop
   ];
 
-  # allow for writable directory for darwin
   preBuild = ''
     export HOME=$TMPDIR
   '';
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index a7d2a5349852..34f6b0d45677 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   aiohttp,
+  aioresponses,
   bluetooth-data-tools,
   buildPythonPackage,
   fetchFromGitHub,
@@ -15,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "11.4.2";
+  version = "12.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     rev = "refs/tags/${version}";
-    hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0=";
+    hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0=";
   };
 
   build-system = [ setuptools ];
@@ -38,6 +39,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    aioresponses
     pytest-asyncio
     pytestCheckHook
   ];
@@ -48,7 +50,7 @@ buildPythonPackage rec {
     description = "Python library to control Shelly";
     homepage = "https://github.com/home-assistant-libs/aioshelly";
     changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix
index 922d60f4c33c..d67a770f18fd 100644
--- a/pkgs/development/python-modules/aioskybell/default.nix
+++ b/pkgs/development/python-modules/aioskybell/default.nix
@@ -47,6 +47,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # aiohttp compat issues
+    "test_get_devices"
+    "test_errors"
+    "test_async_change_setting"
+  ];
+
   pythonImportsCheck = [ "aioskybell" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index 5f587ef0159c..415eeaeb271e 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiosql";
-  version = "10.4";
+  version = "12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "nackjicholson";
     repo = "aiosql";
     rev = "refs/tags/${version}";
-    hash = "sha256-TETZxIbC7pdak3m1rBwDg7L1yah/bin6iOZD/uANh48=";
+    hash = "sha256-Ouk1bzoczkUeYG0JKOgleLuyu9ll2y17AN7gsUI3SRo=";
   };
 
   sphinxRoot = "docs/source";
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index e6dd777a466e..08cbff77d200 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aioswitcher";
-  version = "4.1.0";
+  version = "4.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "TomerFi";
     repo = "aioswitcher";
     rev = "refs/tags/${version}";
-    hash = "sha256-iWEmKyg20qCww/Q+HjOj4Owp26xgY1kXQHVkmxFPfr4=";
+    hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix
index cfebe114b4ce..126661bc1e17 100644
--- a/pkgs/development/python-modules/aiovlc/default.nix
+++ b/pkgs/development/python-modules/aiovlc/default.nix
@@ -8,13 +8,12 @@
   pytest-timeout,
   pytestCheckHook,
   pythonOlder,
-  rich,
   typer,
 }:
 
 buildPythonPackage rec {
   pname = "aiovlc";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,22 +22,21 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiovlc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2YG/m/z2xHUep2VJuCQs4+gGHUolj/u3kycpYZmUyBs=";
+    hash = "sha256-NnctcSgEHWEJUB0yDrSYMochh20CfT5jgtcALKmDjdo=";
   };
 
   build-system = [ poetry-core ];
 
-  dependencies = [
-    rich
-    typer
-  ];
+  optional-dependencies = {
+    cli = [ typer ];
+  };
 
   nativeCheckInputs = [
     pytest-asyncio
     pytest-cov-stub
     pytest-timeout
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiovlc" ];
 
diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix
index fc5b91f13a1b..c7665fc0ba6c 100644
--- a/pkgs/development/python-modules/aiovodafone/default.nix
+++ b/pkgs/development/python-modules/aiovodafone/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aiovodafone";
-  version = "0.6.1";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "chemelli74";
     repo = "aiovodafone";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZBy3lo7rb361aysi2ezryd5H47r6sgSqmYNeAI+wXeQ=";
+    hash = "sha256-BVuDnIp9K+f4jZPPfCABMD+fpPXDQE6/RWTZ8k7ftMI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix
index 85af5993d8e4..2cbebe9352ec 100644
--- a/pkgs/development/python-modules/aiowithings/default.nix
+++ b/pkgs/development/python-modules/aiowithings/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiowithings";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-withings";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pTDHbnL5MfcsQFiaRnKTDAoJ1JwwxRUTB6fQsXjIFl0=";
+    hash = "sha256-OCdnHV2g6v5uPjtva9K3AtxEkY3oWSHJbZrhlinQU2Y=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 285c643038d7..31058f42ba2b 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -6,7 +6,7 @@
   setuptools,
   pytestCheckHook,
   numpy,
-  opencv4,
+  opencv-python,
   stringzilla,
 }:
 
@@ -24,13 +24,13 @@ buildPythonPackage rec {
     hash = "sha256-GwT7Py7pKbpHxx4avj37/hRjSJXdH5uBU11nCITysVw=";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
+  pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
-    opencv4
+    opencv-python
     stringzilla
   ];
 
diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix
index a613b6340754..327bde178777 100644
--- a/pkgs/development/python-modules/albumentations/default.nix
+++ b/pkgs/development/python-modules/albumentations/default.nix
@@ -11,7 +11,7 @@
   albucore,
   eval-type-backport,
   numpy,
-  opencv4,
+  opencv-python,
   pydantic,
   pyyaml,
   scikit-image,
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     ./dont-check-for-updates.patch
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
+  pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];
 
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     albucore
     eval-type-backport
     numpy
-    opencv4
+    opencv-python
     pydantic
     pyyaml
     scikit-image
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 4d41cc11a636..f56ce509b5ce 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.13.1";
+  version = "1.13.3";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-STLIVYv2jy7pK5u8uCGGccYnBk1bCJOUN69td9wF5ZU=";
+    hash = "sha256-IDUDEXQVVh4gOqFFQXQGQ6YR9kFRfwIJ/K5j6foJ8aI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index f195c3b080ba..e34910b67aca 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -2,56 +2,57 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-
-  # Runtime dependencies
   hatchling,
-  toolz,
-  numpy,
-  jsonschema,
-  typing-extensions,
-  pandas,
-  jinja2,
-  packaging,
-
-  # Build, dev and test dependencies
-  anywidget,
   ipython,
+  ipywidgets,
+  jinja2,
+  jsonschema,
+  narwhals,
+  numpy,
+  packaging,
+  pandas,
+  polars,
+  pytest-xdist,
   pytestCheckHook,
+  pythonOlder,
+  toolz,
+  typing-extensions,
   vega-datasets,
-  sphinx,
 }:
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "5.3.0";
-  format = "pyproject";
+  version = "5.4.1";
+  pyproject = true;
+
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "altair-viz";
     repo = "altair";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VGtH+baIKObJY8/44JCyKi+XrIddSqOtpNeMCO+8o9M=";
+    hash = "sha256-7C51ACaBuNtOSXqLpuCI5bnLyE9U64vNXlD4/msPq2k=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jinja2
     jsonschema
+    narwhals
     numpy
     packaging
     pandas
     toolz
-  ] ++ lib.optional (pythonOlder "3.11") typing-extensions;
+  ] ++ lib.optional (pythonOlder "3.14") typing-extensions;
 
   nativeCheckInputs = [
-    anywidget
     ipython
-    sphinx
-    vega-datasets
+    ipywidgets
+    polars
+    pytest-xdist
     pytestCheckHook
+    vega-datasets
   ];
 
   pythonImportsCheck = [ "altair" ];
diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index e79be265ba46..ebb79d5e9ba9 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -31,6 +31,13 @@ buildPythonPackage rec {
     hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail \
+        "pdm-backend~=2.3.0" \
+        "pdm-backend>=2.3.0"
+  '';
+
   nativeBuildInputs = [ git ];
   build-system = [ pdm-backend ];
 
diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix
index a595a57a5ed0..8dd6dc28eeec 100644
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ancp-bids";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "ANCPLabOldenburg";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-c6X1gCYAezgZQP6xfQPfKW8V35F1cnTdbryEp3sZ4jw=";
+    hash = "sha256-bfHphFecPHKoVow8v+20LuQt6X1BGGtoTK4T9vhIkSc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix
index c277a6e28993..d07c2530a450 100644
--- a/pkgs/development/python-modules/androidtv/default.nix
+++ b/pkgs/development/python-modules/androidtv/default.nix
@@ -9,23 +9,26 @@
   pure-python-adb,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "androidtv";
-  version = "0.0.73";
-  format = "setuptools";
+  version = "0.0.75";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "JeffLIrion";
     repo = "python-androidtv";
-    rev = "v${version}";
-    hash = "sha256-FJUTJfS9jiC7KDf6XcGVRNXf75bVUOBPZe8y9M39Uak=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2WFfGGEZkM3fWyTo5P6H3ha04Qyx2OiYetlGWv0jXac=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     adb-shell
     async-timeout
     pure-python-adb
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 5d59445244aa..68f100536e5e 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.125";
+  version = "9.2.127";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-srQhZ5eDTelqN2JEoXKpFT2MOy+6v0HhwSRBOU+0qUk=";
+    hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix
index 8b133595ebbd..3cc5eaf4b693 100644
--- a/pkgs/development/python-modules/annexremote/default.nix
+++ b/pkgs/development/python-modules/annexremote/default.nix
@@ -3,26 +3,23 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "annexremote";
-  version = "1.6.5";
+  version = "1.6.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Lykos153";
     repo = "AnnexRemote";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8WAa5EO5n/dccNW0TUwFgcRjvDFt8QfpHIX2arM4HGc=";
+    hash = "sha256-RShDcqAjG+ujGzWu5S9za24WSsIWctqi3nWQ8EU4DTo=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix
index 064de3b127ad..84d32152864b 100644
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@@ -10,36 +10,38 @@
   bindep,
   buildPythonPackage,
 }:
+
 buildPythonPackage rec {
   pname = "ansible-builder";
-  version = "3.0.1";
-  format = "pyproject";
+  version = "3.1.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk=";
+    pname = "ansible_builder";
+    inherit version;
+    hash = "sha256-0txXPianvVCV6YrrN+6bALyfUAWr6nFH10IpwPNCb8s=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
-  ];
-
-  buildInputs = [ bindep ];
-
-  propagatedBuildInputs = [
-    podman
-    jsonschema
-    requirements-parser
-    pyyaml
-  ];
-
   patchPhase = ''
     # the upper limits of setuptools are unnecessary
     # See https://github.com/ansible/ansible-builder/issues/639
     sed -i 's/, <=[0-9.]*//g' pyproject.toml
   '';
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  buildInputs = [ bindep ];
+
+  dependencies = [
+    podman
+    jsonschema
+    requirements-parser
+    pyyaml
+  ];
+
   meta = with lib; {
     description = "Ansible execution environment builder";
     homepage = "https://ansible-builder.readthedocs.io/en/stable/";
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index fc0e5f9ab36e..42b60a1b59f3 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -30,12 +30,12 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.17.4";
+  version = "2.17.5";
 
   src = fetchPypi {
     pname = "ansible_core";
     inherit version;
-    hash = "sha256-RKHzAHZ5ZTa6JFXK0Y025ihw8E5jLjyi6+lw176s8k0=";
+    hash = "sha256-rn9R/RPcnVfJvNQ+8j+cJVyo8Y9LXAARpPm3JNksWo4=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 03d7e6c23519..6f8e44822ba1 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -22,7 +22,7 @@
 
 let
   pname = "ansible";
-  version = "10.2.0";
+  version = "10.4.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -32,7 +32,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iqBim6js7WRl4s60kCnpPTN8Sm/Fo+bpiCXCWN1qcFc=";
+    hash = "sha256-XBIEiDGmaQ/IZd/gPcirYcO6CLXQGySaFrJHrZmmC8A=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix
index 3f0ecc839a9b..e722d504d61f 100644
--- a/pkgs/development/python-modules/ansitable/default.nix
+++ b/pkgs/development/python-modules/ansitable/default.nix
@@ -7,29 +7,31 @@
   colored,
   pytestCheckHook,
   numpy,
+  pandas,
 }:
 
 buildPythonPackage rec {
   pname = "ansitable";
-  version = "0.10.0";
+  version = "0.11.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ehPPpZ9C/Nrly9WoJJfZtv2YfZ9MEcQsKtuxNpcJe7U=";
+    hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ colored ];
+  dependencies = [ colored ];
 
   pythonImportsCheck = [ "ansitable" ];
 
   nativeCheckInputs = [
     pytestCheckHook
     numpy
+    pandas
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index d2655fa2a1e1..298bd4d7e33c 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.4.0";
+  version = "4.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "anyio";
     rev = "refs/tags/${version}";
-    hash = "sha256-Sz/wWOT59T7LOAq68fBujgkTaY9ydMsIoSxeP3fBaoY=";
+    hash = "sha256-aC/+46SWrpt+4MtvrqZq4gljWb3Kgps2r2/CeN0JfHE=";
   };
 
   build-system = [ setuptools-scm ];
@@ -78,10 +78,19 @@ buildPythonPackage rec {
     "'not network'"
   ];
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # PermissionError: [Errno 1] Operation not permitted: '/dev/console'
-    "test_is_block_device"
-  ];
+  disabledTests =
+    [
+      # TypeError: __subprocess_run() got an unexpected keyword argument 'umask'
+      "test_py39_arguments"
+      # AttributeError: 'module' object at __main__ has no attribute '__file__'
+      "test_nonexistent_main_module"
+      #  3 second timeout expired
+      "test_keyboardinterrupt_during_test"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # PermissionError: [Errno 1] Operation not permitted: '/dev/console'
+      "test_is_block_device"
+    ];
 
   disabledTestPaths = [
     # lots of DNS lookups
diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index f1ad42c81d9c..f41771016676 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -49,14 +49,14 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.56.0";
+  version = "2.59.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SD+93duc3vTIlS/LPOuzXeiUSpwX+GNrqW3GTJMVgKY=";
+    hash = "sha256-JeVYfXAx/GBGXQKAt6pSpnxH83oyeDylEY12EDzMxnw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix
index dff911c89dae..d3e71a5f9051 100644
--- a/pkgs/development/python-modules/appdirs/default.nix
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -2,21 +2,34 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pythonOlder,
+  setuptools,
+  unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "appdirs";
   version = "1.4.4";
-  format = "setuptools";
+  pypoject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41";
+    hash = "sha256-fV0BZ7KxuoIWR2Fq9Gp0nRxlN0DdDSQVEA/ibiev30E=";
   };
 
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  pythonImportsCheck = [ "appdirs" ];
+
   meta = {
     description = "Python module for determining appropriate platform-specific dirs";
     homepage = "https://github.com/ActiveState/appdirs";
+    changelog = "https://github.com/ActiveState/appdirs/releases/tag/${version}";
     license = lib.licenses.mit;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/appimage/default.nix b/pkgs/development/python-modules/appimage/default.nix
new file mode 100644
index 000000000000..c8de232e73c4
--- /dev/null
+++ b/pkgs/development/python-modules/appimage/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "appimage";
+  version = "1.0.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "ssh-mitm";
+    repo = "appimage";
+    rev = "refs/tags/${version}";
+    hash = "sha256-d8LwZ4iZ+fwFaBP/IFoKImI/TsYtVD0rllbYN9XP/es=";
+  };
+
+  build-system = [ hatchling ];
+
+  # Module has no test
+  doCheck = false;
+
+  pythonImportsCheck = [ "appimage" ];
+
+  meta = {
+    description = "AppImage start scripts";
+    homepage = "https://github.com/ssh-mitm/appimage";
+    changelog = "https://github.com/ssh-mitm/appimage/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index a23669676306..7b0f033ec87f 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.125";
+  version = "9.2.127";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-e1ndjrr62wpTkhPAYnfbObdx0YO8jMp09ymgszsivO4=";
+    hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 7ecdc1bb8a93..0b5c3cbcf1e1 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -1,87 +1,160 @@
 {
-  gui ? true,
+  lib,
   buildPythonPackage,
   fetchFromGitHub,
-  lib,
-  sphinx,
-  lxml,
+
+  setuptools,
+  setuptools-scm,
+
+  certifi,
+  filelock,
   isodate,
+  lxml,
   numpy,
   openpyxl,
-  tkinter ? null,
-  py3to2,
-  isPy3k,
-  python,
-  ...
+  pyparsing,
+  python-dateutil,
+  regex,
+
+  gui ? true,
+  tkinter,
+
+  pycryptodome,
+  pg8000,
+  pymysql,
+  pyodbc,
+  rdflib,
+  holidays,
+  pytz,
+  tinycss2,
+  graphviz,
+  cheroot,
+  cherrypy,
+  tornado,
+
+  sphinxHook,
+  sphinx-autodoc2,
+  myst-parser,
+  sphinx-copybutton,
+  furo,
+
+  pytestCheckHook,
+  boto3,
 }:
 
 buildPythonPackage rec {
   pname = "arelle${lib.optionalString (!gui) "-headless"}";
-  version = "18.3";
-  format = "setuptools";
+  version = "2.30.25";
+  pyproject = true;
 
-  disabled = !isPy3k;
-
-  # Releases are published at http://arelle.org/download/ but sadly no
-  # tags are published on github.
   src = fetchFromGitHub {
     owner = "Arelle";
     repo = "Arelle";
-    rev = "edgr${version}";
-    sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xzTrFie97HDIqPZ4nzCh+0p/w0bTK12cS0FSsuIi7tY=";
   };
+
   outputs = [
     "out"
     "doc"
   ];
-  patches = [ ./tests.patch ];
-  postPatch = "rm testParser2.py";
-  nativeBuildInputs = [
-    sphinx
-    py3to2
+
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail \
+        'requires = ["setuptools~=73.0", "wheel~=0.44", "setuptools_scm[toml]~=8.1"]' \
+        'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]'
+
+    # Darwin currently doesn't have the native `_decimal` module
+    # Instead, we'll use the wrapper `decimal` module that can fall back to python based implementation
+    # These lines can be removed after https://github.com/NixOS/nixpkgs/pull/354125 hits master
+    substituteInPlace arelle/Validate{DuplicateFacts,XbrlCalcs}.py tests/unit_tests/arelle/test_{xmlvalidate,validatexbrlcalcs}.py  \
+        --replace-fail 'from _decimal import' 'from decimal import'
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
   ];
-  propagatedBuildInputs = [
-    lxml
+
+  dependencies = [
+    certifi
+    filelock
     isodate
+    lxml
     numpy
     openpyxl
+    pyparsing
+    python-dateutil
+    regex
   ] ++ lib.optionals gui [ tkinter ];
 
-  # arelle-gui is useless without gui dependencies, so delete it when !gui.
-  postInstall =
-    lib.optionalString (!gui) ''
-      find $out/bin -name "*arelle-gui*" -delete
-    ''
-    +
-      # By default, not the entirety of the src dir is copied. This means we don't
-      # copy the `images` dir, which is needed for the gui version.
-      lib.optionalString (gui) ''
-        targetDir=$out/${python.sitePackages}
-        cp -vr $src/arelle $targetDir
-      '';
+  optional-dependencies = {
+    crypto = [ pycryptodome ];
+    db = [
+      pg8000
+      pymysql
+      pyodbc
+      rdflib
+    ];
+    efm = [
+      holidays
+      pytz
+    ];
+    esef = [ tinycss2 ];
+    objectmaker = [ graphviz ];
+    webserver = [
+      cheroot
+      cherrypy
+      tornado
+    ];
+  };
 
-  # Documentation
-  postBuild = ''
-    (cd apidocs && make html && cp -r _build $doc)
+  nativeBuildInputs = [
+    # deps for docs
+    sphinxHook
+    sphinx-autodoc2
+    myst-parser
+    sphinx-copybutton
+    furo
+  ];
+
+  # the arelleGUI executable doesn't work when the gui option is false
+  postInstall = lib.optionalString (!gui) ''
+    find $out/bin -name "*arelleGUI*" -delete
   '';
 
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+    boto3
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  checkPhase = ''
-    py.test
+  preCheck = ''
+    export HOME=$(mktemp -d)
   '';
 
-  meta = with lib; {
-    description =
-      ''
-        An open source facility for XBRL, the eXtensible Business Reporting
-        Language supporting various standards, exposed through a Python or
-        REST API''
-      + lib.optionalString gui " and a graphical user interface";
+  disabledTestPaths =
+    [
+      "tests/integration_tests"
+    ]
+    ++ lib.optionals (!gui) [
+      # these tests import tkinter
+      "tests/unit_tests/arelle/test_updater.py"
+      "tests/unit_tests/arelle/test_import.py"
+    ];
+
+  meta = {
+    description = "Open source XBRL platform";
+    longDescription = ''
+      An open source facility for XBRL, the eXtensible Business Reporting
+      Language supporting various standards, exposed through a Python or
+      REST API ${lib.optionalString gui " and a graphical user interface"}.
+    '';
     mainProgram = "arelle";
     homepage = "http://arelle.org/";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ roberth ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      tomasajt
+      roberth
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/arelle/tests.patch b/pkgs/development/python-modules/arelle/tests.patch
deleted file mode 100644
index e34cda99b251..000000000000
--- a/pkgs/development/python-modules/arelle/tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git c/arelle/CntlrProfiler.py i/arelle/CntlrProfiler.py
-index a64bb1b..dc0299d 100644
---- c/arelle/CntlrProfiler.py
-+++ i/arelle/CntlrProfiler.py
-@@ -1,5 +1,6 @@
-
--import Cntlr, ModelManager, FileSource, time
-+from arelle import Cntlr, ModelManager, FileSource
-+import time
- from optparse import OptionParser
- import cProfile
- import gettext
-diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py
-index 12dbbbb..c0e98c3 100644
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 969acd0b1c45..d8a96b231c03 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -9,19 +9,19 @@
 
 buildPythonPackage rec {
   pname = "argcomplete";
-  version = "3.4.0";
+  version = "3.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "kislyuk";
-    repo = pname;
+    repo = "argcomplete";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4JMyBixc6LcSdpvvLmK4nyyqZMK2kuFcPU7OXhJLpoc=";
+    hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
@@ -32,10 +32,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "argcomplete" ];
 
   meta = with lib; {
-    changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst";
     description = "Bash tab completion for argparse";
-    downloadPage = "https://github.com/kislyuk/argcomplete";
     homepage = "https://kislyuk.github.io/argcomplete/";
+    changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst";
+    downloadPage = "https://github.com/kislyuk/argcomplete";
     license = licenses.asl20;
     maintainers = with maintainers; [ womfoo ];
   };
diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix
index 258e69f44bda..b373fb558972 100644
--- a/pkgs/development/python-modules/array-api-compat/default.nix
+++ b/pkgs/development/python-modules/array-api-compat/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "array-api-compat";
-  version = "1.9";
+  version = "1.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "data-apis";
     repo = "array-api-compat";
     rev = "refs/tags/${version}";
-    hash = "sha256-azd98kJtW8QKizfOr670pyr44BHNkWCO7BMFg3zr23g=";
+    hash = "sha256-X6y6hX/HdkiLZkj9AOEYsZOlYhR7wUt9kQjHfMfWqIc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 6e936c6635ed..9d640100a1ff 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "3.2.0";
+  version = "3.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "asdf-format";
     repo = "asdf";
     rev = "refs/tags/${version}";
-    hash = "sha256-r+cEv6g7fq3I/h2mlszzJRQcazy7qP9pg0hfYG/Sa9E=";
+    hash = "sha256-2ugrByX2eSac68RGc4mhPiYP8qnYoPwbhrMmvUr2FYg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 200dc13e989f..5bf0ab7dfe04 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "3.2.2"; # Check whether the version is compatible with pylint
+  version = "3.3.4"; # Check whether the version is compatible with pylint
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "PyCQA";
     repo = "astroid";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Fc/AjMOz9D9SgkxXvMAhvJcZtj9BsPykg0DX4hEqdB8=";
+    hash = "sha256-/VpGniyKzFToDNSnnbYvpUFJjx0Rx9N7x56BJnR0lpk=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix
index e1cdd1febe46..62c728f2f931 100644
--- a/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/pkgs/development/python-modules/astropy-iers-data/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "astropy-iers-data";
-  version = "0.2024.06.17.00.31.35";
+  version = "0.2024.9.23.0.31.43";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "astropy";
     repo = "astropy-iers-data";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hFlDXnxhKuhlCFrF+Uip3Xjc9Jt8UFJcDCST90BmAlg=";
+    hash = "sha256-PGr8meqVs9l15+k5DHmcPcGK96ydN0nRUOBVfvCtRUg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index c6a7f9fea08b..8315d4454280 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   fetchPypi,
-  fetchpatch,
   buildPythonPackage,
   pythonOlder,
 
   # build time
   astropy-extension-helpers,
   cython,
-  jinja2,
-  oldest-supported-numpy,
+  setuptools,
   setuptools-scm,
-  wheel,
+
   # testing
   pytestCheckHook,
   stdenv,
@@ -28,39 +26,29 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "6.1.1";
+  version = "6.1.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8"; # according to setup.cfg
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5cb0XZEcMKy41VbH+O2ZSuxxsQjmHu5QZ/AK8eTjYTg=";
+    hash = "sha256-NhVY4rCTqZvr5p8f1H+shqGSYHpMFu05ugqACyq2DDQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "drop-usage-known-bad-actor-cdn.patch";
-      url = "https://github.com/astropy/astropy/commit/d329cb38e49584ad0ff5244fd2fff74cfa1f92f1.patch";
-      hash = "sha256-+DbDwYeyR+mMDLRB4jiyol/5WO0LwqSCCEwjgflxoTk=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "numpy>=2.0.0"  "numpy"
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     astropy-extension-helpers
     cython
-    jinja2
-    oldest-supported-numpy
+    setuptools
     setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     astropy-iers-data
     numpy
     packaging
@@ -87,10 +75,6 @@ buildPythonPackage rec {
     # https://github.com/astropy/astropy/issues/15441
     "TestUnifiedOutputRegistry"
 
-    # fail due to pytest>=8
-    # https://github.com/astropy/astropy/issues/15960#issuecomment-1913654471
-    "test_distortion_header"
-
     # flaky
     "test_timedelta_conversion"
     # More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392
@@ -99,6 +83,9 @@ buildPythonPackage rec {
     "test_datetime_to_timedelta"
 
     "test_datetime_difference_agrees_with_timedelta_no_hypothesis"
+
+    # SAMPProxyError 1: 'Timeout expired!'
+    "TestStandardProfile.test_main"
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_sidereal_lat_independent" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index d1719497d7ba..a19d99c2f8ac 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.40.0";
+  version = "0.41.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     rev = "refs/tags/${version}";
-    hash = "sha256-KaX1TNP6IP2wAijR2y9cqI+Pyc+Ygk3LqKwu5Yrv5LM=";
+    hash = "sha256-36pMEyLnyl8PS8ZVt+yNdpJGAVpoWTxfTxr+WQw/Go8=";
   };
 
   pythonRelaxDeps = [ "defusedxml" ];
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index f2c341a3b593..460ab2684ec9 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -2,19 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
   python-socks,
   pythonOlder,
-  setuptools,
   tldextract,
   whodap,
 }:
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "1.1.4";
+  version = "1.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,21 +23,16 @@ buildPythonPackage rec {
     owner = "pogzyb";
     repo = "asyncwhois";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BjHGp94vad5qTvffiU8ZEOxYeXNzQHlNq1SaxviYfps=";
+    hash = "sha256-y5JmAbrk9qJeNYejNcz5nI5bghaetUw1xkD8qgwOkao=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "python-socks[asyncio]" "python-socks"
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     python-socks
     tldextract
     whodap
-  ];
+  ] ++ python-socks.optional-dependencies.asyncio;
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -68,7 +63,7 @@ buildPythonPackage rec {
     description = "Python module for retrieving WHOIS information";
     homepage = "https://github.com/pogzyb/asyncwhois";
     changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
index f858eb07be9a..6bb934508214 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "atom";
-  version = "0.10.5";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "nucleic";
     repo = "atom";
     rev = "refs/tags/${version}";
-    hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM=";
+    hash = "sha256-3Xk4CM8Cnkc0lIdjJUYs/6UTqqpPALrUa3DpKD40og8=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index 96d6b5d0c96a..80da6cfefa31 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -4,29 +4,29 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
+  substituteAll,
   hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "attrs";
-  version = "23.2.0";
+  version = "24.2.0";
   disabled = pythonOlder "3.7";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-k13DtSnCYvbPduUId9NaS9PB3hlP1B9HoreujxmXHzA=";
+    hash = "sha256-XPsbkUi1sIZWm67APyDXtr87ysyaQr6/h/+qyjYvY0Y=";
   };
 
   patches = [
-    # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs
-    ./remove-hatch-plugins.patch
+    (substituteAll {
+      # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs
+      src = ./remove-hatch-plugins.patch;
+      inherit version;
+    })
   ];
 
-  postPatch = ''
-    substituteAllInPlace pyproject.toml
-  '';
-
   nativeBuildInputs = [ hatchling ];
 
   outputs = [
diff --git a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch
index cf743ba9ee05..b5b8889338aa 100644
--- a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch
+++ b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch
@@ -1,5 +1,5 @@
 diff --git a/pyproject.toml b/pyproject.toml
-index 1c72fc2..ae45740 100644
+index 93b3f40..e34ff5d 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -1,7 +1,7 @@
@@ -11,7 +11,7 @@ index 1c72fc2..ae45740 100644
  build-backend = "hatchling.build"
  
  
-@@ -26,7 +26,8 @@ classifiers = [
+@@ -27,7 +27,8 @@ classifiers = [
    "Typing :: Typed",
  ]
  dependencies = ["importlib_metadata;python_version<'3.8'"]
@@ -21,10 +21,11 @@ index 1c72fc2..ae45740 100644
  
  [project.optional-dependencies]
  tests-mypy = [
-@@ -70,54 +71,9 @@ Funding = "https://github.com/sponsors/hynek"
+@@ -76,54 +77,9 @@ GitHub = "https://github.com/python-attrs/attrs"
+ Funding = "https://github.com/sponsors/hynek"
  Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi"
  
- 
+-
 -[tool.hatch.version]
 -source = "vcs"
 -raw-options = { local_scheme = "no-local-version" }
@@ -64,15 +65,14 @@ index 1c72fc2..ae45740 100644
 -
 ----
 -
--[Full changelog](https://www.attrs.org/en/stable/changelog.html)
+-[Full changelog →](https://www.attrs.org/en/stable/changelog.html)
 -"""
 -
 -# Point sponsor image URLs to versions.
 -[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]]
--pattern = '\/latest\/_static/sponsors'
--replacement = '/$HFPR_VERSION/_static/sponsors'
+-pattern = 'docs\/_static\/sponsors'
+-replacement = 'https://www.attrs.org/en/$HFPR_VERSION/_static/sponsors'
 -
--
- [tool.pytest.ini_options]
- addopts = ["-ra", "--strict-markers", "--strict-config"]
- xfail_strict = true
+ [[tool.sponcon.sponsors]]
+ title = "Variomedia AG"
+ url = "https://www.variomedia.de/"
diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix
index c6afff489d65..50b7f6602fe5 100644
--- a/pkgs/development/python-modules/autarco/default.nix
+++ b/pkgs/development/python-modules/autarco/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "autarco";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-autarco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM=";
+    hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk=";
   };
 
   pythonRelaxDeps = [ "orjson" ];
diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix
index 2b7569d8f745..e8be58101302 100644
--- a/pkgs/development/python-modules/autograd/default.nix
+++ b/pkgs/development/python-modules/autograd/default.nix
@@ -2,37 +2,36 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
   numpy,
-  future,
+  pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "autograd";
-  version = "1.6.2";
-  format = "setuptools";
+  version = "1.7.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hzHgigxOOJ2GlaQAcq2kUSZBwRO2ys6PTPvo636a7es=";
+    hash = "sha256-3nQ/02jW31I803MF3NFxhhqXUqFESTZ30sn1pWmD/y8=";
   };
 
-  propagatedBuildInputs = [
-    numpy
-    future
-  ];
+  build-system = [ hatchling ];
 
-  # Currently, the PyPI tarball doesn't contain the tests. When that has been
-  # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404
-  doCheck = false;
+  dependencies = [ numpy ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "autograd" ];
 
   meta = with lib; {
-    homepage = "https://github.com/HIPS/autograd";
     description = "Compute derivatives of NumPy code efficiently";
+    homepage = "https://github.com/HIPS/autograd";
+    changelog = "https://github.com/HIPS/autograd/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];
   };
diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix
new file mode 100644
index 000000000000..5a2dbd5d8c30
--- /dev/null
+++ b/pkgs/development/python-modules/automower-ble/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  bleak,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "automower-ble";
+  version = "0.2.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "alistair23";
+    repo = "AutoMower-BLE";
+    rev = "refs/tags/${version}";
+    hash = "sha256-BWfRXz78e1Xq0fNOGJ2IFnjNqfH3oD5VIGMxyCPtEUw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ bleak ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "automower_ble" ];
+
+  meta = {
+    description = "Module to connect to Husqvarna Automower Connect";
+    homepage = "https://github.com/alistair23/AutoMower-BLE";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 4088b131d4e3..57a377ada235 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "autopep8";
-  version = "2.0.4-unstable-2023-10-27";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hhatto";
     repo = "autopep8";
-    rev = "af7399d90926f2fe99a71f15197a08fa197f73a1";
-    hash = "sha256-psGl9rXxTQGHyXf1VskJ/I/goVH5hRRP5bUXQdaT/8M=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index ec07daa2880c..512377ff053c 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -10,25 +10,19 @@
 
 buildPythonPackage rec {
   pname = "avro";
-  version = "1.11.3";
+  version = "1.12.0";
   pyproject = true;
 
-  # distutils usage: https://github.com/search?q=repo%3Aapache%2Favro%20distutils&type=code
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-M5O7UTn5zweR0gV1bOHjmltYWGr1sVPWo7WhmWEOnRc=";
+    hash = "sha256-ytnFOyPO7Wmceva93O1C4sVy/WtAjCV6fU/E6M8uLWs=";
   };
 
-  postPatch = lib.optionalString (!pythonOlder "3.12") ''
-    substituteInPlace avro/test/test_tether_word_count.py \
-      --replace-fail 'distutils' 'setuptools._distutils'
-  '';
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ];
-
-  nativeBuildInputs = [ setuptools ];
+  dependencies = lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   nativeCheckInputs = [ pytest7CheckHook ];
 
@@ -43,10 +37,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python serialization and RPC framework";
-    mainProgram = "avro";
     homepage = "https://github.com/apache/avro";
     changelog = "https://github.com/apache/avro/releases/tag/release-${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ zimbatm ];
+    mainProgram = "avro";
   };
 }
diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 808530221781..aaae9c534eb7 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "avwx-engine";
-  version = "1.9.0";
+  version = "1.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "avwx-rest";
     repo = "avwx-engine";
     rev = "refs/tags/${version}";
-    hash = "sha256-CUnUz2SsXtWaqGzaB1PH+EoHqebSue6e8GXhRZRcXLs=";
+    hash = "sha256-gDhZlrxiIyj15nxMBFFzuCAHtkDfqYowDZc5g4pQ+i8=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix
index 42c51ed2f806..bec43cbf2dbe 100644
--- a/pkgs/development/python-modules/aw-client/default.nix
+++ b/pkgs/development/python-modules/aw-client/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aw-client";
-  version = "0.5.13";
+  version = "0.5.14";
 
   format = "pyproject";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ActivityWatch";
     repo = "aw-client";
     rev = "v${version}";
-    sha256 = "sha256-A9f1Wj4F6qRvCVj3iRQvsnILewJK1L5tfI2MnAXZ4nY=";
+    sha256 = "sha256-HTyhQz/RaNdCtJIV6YHEd6Yhu9VRJ8E9XdN7NcoO8ao=";
   };
 
   disabled = pythonOlder "3.8";
diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index 97257d6108ff..c95866a9b584 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.50.0";
+  version = "1.51.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GXpyO+Qd6NP5yxWn1kw34x+P5uyR0rcNlzwivT6eHdE=";
+    hash = "sha256-9EmhOehkXf6aUu6GLhzE0nkfyx+8ovv+Hr7w7DszXTg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index c36c24553ece..c1ccbc754242 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -12,13 +12,14 @@
   pytestCheckHook,
   pythonOlder,
   pyyaml,
+  setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.89.0";
-  format = "setuptools";
+  version = "1.91.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -26,7 +27,7 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "serverless-application-model";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wqM3n99lD0s/E9nd55q19Us31XgFtU/bBYJR1HTnnvk=";
+    hash = "sha256-jcRpn9STkfg1xTwYzkpoYyuG0Hrv0XnbW1h6+SxzEjA=";
   };
 
   postPatch = ''
@@ -34,7 +35,9 @@ buildPythonPackage rec {
     rm pytest.ini
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     boto3
     jsonschema
     pydantic
diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix
index f0d274ef85ae..ec033ec962b3 100644
--- a/pkgs/development/python-modules/ax-platform/default.nix
+++ b/pkgs/development/python-modules/ax-platform/default.nix
@@ -1,35 +1,42 @@
 {
   lib,
+  botorch,
   buildPythonPackage,
   fetchFromGitHub,
-  botorch,
+  hypothesis,
   ipywidgets,
   jinja2,
+  jupyter,
+  mercurial,
   pandas,
   plotly,
-  setuptools,
-  setuptools-scm,
-  typeguard,
-  hypothesis,
-  mercurial,
   pyfakefs,
-  pytestCheckHook,
-  yappi,
   pyre-extensions,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools-scm,
+  setuptools,
+  sqlalchemy,
+  typeguard,
+  yappi,
 }:
 
 buildPythonPackage rec {
   pname = "ax-platform";
-  version = "0.4.1";
+  version = "0.4.3";
   pyproject = true;
 
+  disabled = pythonOlder "3.10";
+
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "ax";
     rev = "refs/tags/${version}";
-    hash = "sha256-ygMMMKY5XsoQGp9yUMFAQqkSUlXNBJCb8xgGE10db4U=";
+    hash = "sha256-jmBjrtxqg4Iu3Qr0HRqjVfwURXzbJaGm+DBFNHYk/vA=";
   };
 
+  env.ALLOW_BOTORCH_LATEST = "1";
+
   build-system = [
     setuptools
     setuptools-scm
@@ -45,7 +52,10 @@ buildPythonPackage rec {
     pyre-extensions
   ];
 
-  env.ALLOW_BOTORCH_LATEST = "1";
+  optional-dependencies = {
+    mysql = [ sqlalchemy ];
+    notebook = [ jupyter ];
+  };
 
   nativeCheckInputs = [
     hypothesis
@@ -53,20 +63,23 @@ buildPythonPackage rec {
     pyfakefs
     pytestCheckHook
     yappi
-  ];
-  pytestFlagsArray = [
-    "--ignore=ax/benchmark"
-    "--ignore=ax/runners/tests/test_torchx.py"
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  disabledTestPaths = [
+    "ax/benchmark"
+    "ax/runners/tests/test_torchx.py"
     # requires pyre_extensions
-    "--ignore=ax/telemetry/tests"
-    "--ignore=ax/core/tests/test_utils.py"
-    "--ignore=ax/early_stopping/tests/test_strategies.py"
+    "ax/telemetry/tests"
+    "ax/core/tests/test_utils.py"
+    "ax/early_stopping/tests/test_strategies.py"
     # broken with sqlalchemy 2
-    "--ignore=ax/service/tests/test_ax_client.py"
-    "--ignore=ax/service/tests/test_scheduler.py"
-    "--ignore=ax/service/tests/test_with_db_settings_base.py"
-    "--ignore=ax/storage"
+    "ax/core/tests/test_experiment.py"
+    "ax/service/tests/test_ax_client.py"
+    "ax/service/tests/test_scheduler.py"
+    "ax/service/tests/test_with_db_settings_base.py"
+    "ax/storage"
   ];
+
   disabledTests = [
     # exact comparison of floating points
     "test_optimize_l0_homotopy"
@@ -77,13 +90,14 @@ buildPythonPackage rec {
     # uses torch.equal
     "test_convert_observations"
   ];
+
   pythonImportsCheck = [ "ax" ];
 
-  meta = with lib; {
-    changelog = "https://github.com/facebook/Ax/releases/tag/${version}";
-    description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments";
+  meta = {
+    description = "Platform for understanding, managing, deploying, and automating adaptive experiments";
     homepage = "https://ax.dev/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ veprbl ];
+    changelog = "https://github.com/facebook/Ax/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix
index e0a316317ef3..766e8ff1026a 100644
--- a/pkgs/development/python-modules/axis/default.nix
+++ b/pkgs/development/python-modules/axis/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "axis";
-  version = "62";
+  version = "63";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Kane610";
     repo = "axis";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ey0yt+AIbMO74brHepnCFtekDS4XscTKswshlTrS41A=";
+    hash = "sha256-XqNzYd7WgSDho3jyCHF1lDZWWpBEZFqGFmVOAUlm50o=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
index 462a9f1130b4..df170b4e7992 100644
--- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
+++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "ayla-iot-unofficial";
-  version = "1.4.2";
+  version = "1.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rewardone";
     repo = "ayla-iot-unofficial";
     rev = "refs/tags/v${version}";
-    hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc=";
+    hash = "sha256-y2SjnM48OYyXhBxLHE8R9di4ErORUgS87m/FKs21NLU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index 14fa56f4958d..c79f8bb18305 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -20,7 +20,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.30.2";
+  version = "1.31.0";
   pname = "azure-core";
   pyproject = true;
 
@@ -29,8 +29,9 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-oU3CEO/NYIghqkctn7jo0DXSm2iZOBkUe8KQqKwiRHI=";
+    pname = "azure_core";
+    inherit version;
+    hash = "sha256-ZWoN1h4YabFQa3xqOzHWLxWYSxpXPWMm9qovPkEjKEs=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix
index 6f89cacb08bd..b6c9eea8be3a 100644
--- a/pkgs/development/python-modules/azure-identity/default.nix
+++ b/pkgs/development/python-modules/azure-identity/default.nix
@@ -7,25 +7,31 @@
   cryptography,
   msal,
   msal-extensions,
+  typing-extensions,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-identity";
-  version = "1.17.0";
-  format = "setuptools";
+  version = "1.18.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-oRaPIjstf6OWg2K3iv/RV6Hzdy8xCozc6IPMUVxsiZg=";
+    pname = "azure_identity";
+    inherit version;
+    hash = "sha256-9WdXmmXYky+pE8du3fMwUQGhXlcnpeSqXfZJoPVT1MM=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-core
     cryptography
     msal
     msal-extensions
+    typing-extensions
   ];
 
   pythonImportsCheck = [ "azure.identity" ];
@@ -36,7 +42,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Microsoft Azure Identity Library for Python";
-    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_${version}/sdk/identity/azure-identity/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ kamadorueda ];
diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 9fc23174d60d..d933f721da39 100644
--- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
@@ -11,20 +11,20 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-appconfiguration";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw=";
-    extension = "zip";
+    pname = "azure_mgmt_appconfiguration";
+    inherit version;
+    hash = "sha256-BZbwnn54Qb6R3eHIGBNBALv6EkSG4GiJ0jndWHdEtHw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     azure-common
     azure-mgmt-core
     isodate
diff --git a/pkgs/development/python-modules/azure-mgmt-automation/default.nix b/pkgs/development/python-modules/azure-mgmt-automation/default.nix
new file mode 100644
index 000000000000..8de27d0b7fcc
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-automation/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  msrest,
+  azure-common,
+  azure-mgmt-core,
+}:
+
+buildPythonPackage rec {
+  pname = "azure-mgmt-automation";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    hash = "sha256-pJ0tQT/vVwEMs2Fh5bwFZgG418bQW9PLBaE1Eu8pHh4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    msrest
+    azure-common
+    azure-mgmt-core
+  ];
+
+  # has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "azure.mgmt.automation" ];
+
+  meta = with lib; {
+    description = "This is the Microsoft Azure Automation Client Library";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/automation/azure-mgmt-automation";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-automation_${version}/sdk/automation/azure-mgmt-automation/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ wfdewith ];
+  };
+}
diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 876c7f25fdec..305f98a6459d 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "32.0.0";
+  version = "32.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_containerservice";
     inherit version;
-    hash = "sha256-zLWHR52Kk+x49xYlkK3ILk+6TeduStw0GfM60iXvspI=";
+    hash = "sha256-rxOS1MT1F0tbt+OyjpITfSmPOt1U5AJ3LfKvzPEmO6A=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index b166ab5ea0f7..3fda65ab7524 100644
--- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
@@ -1,43 +1,48 @@
 {
   lib,
-  buildPythonPackage,
-  fetchPypi,
-  msrest,
-  msrestazure,
   azure-common,
   azure-mgmt-core,
+  buildPythonPackage,
+  fetchPypi,
+  isodate,
+  pythonOlder,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-dns";
-  version = "8.1.0";
-  format = "setuptools";
+  version = "8.2.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
-    hash = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A=";
+    pname = "azure_mgmt_dns";
+    inherit version;
+    hash = "sha256-Ynueo98L94qJWsrcUUjeyEwomAY7+qv/+LFLqpg7WW4=";
   };
 
-  propagatedBuildInputs = [
-    msrest
-    msrestazure
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     azure-mgmt-core
+    isodate
+    typing-extensions
   ];
 
   # this is still needed for when the version is overrided
   pythonNamespaces = [ "azure.mgmt" ];
 
-  # has no tests
+  # Tests are only available in the mono-repo
   doCheck = false;
 
   meta = with lib; {
     description = "This is the Microsoft Azure DNS Management Client Library";
-    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-dns";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-dns_${version}/sdk/network/azure-mgmt-dns/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [
-      maxwilson
-    ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 0a5ca8dcfefc..dfe2a9772b89 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -11,14 +11,15 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-netapp";
-  version = "13.2.0";
+  version = "13.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-31wzzDeQrs04AL8Qsz050RY/AllvXwy+8Ng+QbUihjo=";
+    pname = "azure_mgmt_netapp";
+    inherit version;
+    hash = "sha256-N0Fnnigw6sk5M2Cx9T2CtMAe0S64WN73shukkWMkiEk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index 6e622d51794d..997d52e12897 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -1,35 +1,33 @@
 {
   lib,
-  azure-common,
   azure-core,
   buildPythonPackage,
   fetchPypi,
   isodate,
-  msrest,
   pythonOlder,
   typing-extensions,
-  uamqp,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-servicebus";
-  version = "7.12.2";
-  format = "setuptools";
+  version = "7.12.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pqPF957VvvEB2ePjyYahA7IA4mxJU8R6UvVSx1fkXso=";
+    pname = "azure_servicebus";
+    inherit version;
+    hash = "sha256-PwdZcxrSIRxo60sh5byimCf31v8Ccr3H7vEDwcE/gyI=";
   };
 
-  propagatedBuildInputs = [
-    azure-common
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-core
     isodate
-    msrest
     typing-extensions
-    uamqp
   ];
 
   # Tests require dev-tools
@@ -39,7 +37,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Microsoft Azure Service Bus Client Library";
-    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicebus/azure-servicebus";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-servicebus_${version}/sdk/servicebus/azure-servicebus/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ maxwilson ];
diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index fa2876123e97..9ee0c634a554 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -6,22 +6,26 @@
   fetchPypi,
   isodate,
   pythonOlder,
+  setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "azure-storage-blob";
-  version = "12.20.0";
-  format = "setuptools";
+  version = "12.23.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7rkSVuQdS1ubrWqH/QqK3gfdWKpSNE4sjSdG4noBfTs=";
+    pname = "azure_storage_blob";
+    inherit version;
+    hash = "sha256-pYflTU450qJ711EJ2xZP+iBY/hlAYeVEbFqJvKkYJy8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-core
     cryptography
     isodate
diff --git a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
new file mode 100644
index 000000000000..03dcddfe569d
--- /dev/null
+++ b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  azure-core,
+  azure-storage-blob,
+  isodate,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "azure-storage-file-datalake";
+  version = "12.17.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Azure";
+    repo = "azure-sdk-for-python";
+    rev = "refs/tags/azure-storage-file-datalake_${version}";
+    hash = "sha256-FT51a7yuSMLJSnMFK9N09Rc8p/uaoYCcj9WliSvY6UA=";
+  };
+
+  sourceRoot = "${src.name}/sdk/storage/azure-storage-file-datalake";
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    azure-core
+    azure-storage-blob
+    isodate
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    aio = [ azure-core ] ++ azure-core.optional-dependencies.aio;
+  };
+
+  pythonImportsCheck = [ "azure.storage.filedatalake" ];
+
+  # require devtools_testutils which is a internal package for azure-sdk
+  doCheck = false;
+
+  meta = {
+    description = "Microsoft Azure File DataLake Storage Client Library for Python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-datalake";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix
index 7b56d75ddd03..df3a868e2e85 100644
--- a/pkgs/development/python-modules/b2sdk/default.nix
+++ b/pkgs/development/python-modules/b2sdk/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "b2sdk";
-  version = "2.4.0";
+  version = "2.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Backblaze";
     repo = "b2-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SaoQzP7vtzVWmkUTw0vCeneeSMTmBTIr5kiMXGcgm9g=";
+    hash = "sha256-oS037l5pQW/z4GX5+hb/mCUA219cGHE7lyiG8aos21k=";
   };
 
   build-system = [ pdm-backend ];
@@ -71,6 +71,7 @@ buildPythonPackage rec {
     "test_files_headers"
     "test_large_file"
     "test_file_info_b2_attributes"
+    "test_sync_folder"
   ];
 
   pythonImportsCheck = [ "b2sdk" ];
diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix
index de68774a358b..0499c1f52c94 100644
--- a/pkgs/development/python-modules/babel/default.nix
+++ b/pkgs/development/python-modules/babel/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "babel";
-  version = "2.15.0";
+  version = "2.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ja8OJl0FdovGx6MUzxMh6aEjr8MozGNcGGIqLzCgRBM=";
+    hash = "sha256-0fNVTKJmBf4XPz3gxl91D1pC+SRJm/E03mQjWCKY4xY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix
index cc64639537e1..cfaad9242396 100644
--- a/pkgs/development/python-modules/babelfont/default.nix
+++ b/pkgs/development/python-modules/babelfont/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "babelfont";
-  version = "3.0.5";
+  version = "3.0.6";
   pyproject = true;
 
   # PyPI source tarballs omit tests, fetch from Github instead
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "simoncozens";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-9PEOkkm7qH4ExiJJKrTZX5Ph/urtOyFsy7jjtFepncU=";
+    hash = "sha256-kbL6z5610A41bfbDm0nyyh1tv+7SeXx8vvXxwLcTZL0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix
index ab10ba66639d..8794cd387c54 100644
--- a/pkgs/development/python-modules/bc-detect-secrets/default.nix
+++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "bc-detect-secrets";
-  version = "1.5.17";
+  version = "1.5.18";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "bridgecrewio";
     repo = "detect-secrets";
     rev = "refs/tags/${version}";
-    hash = "sha256-5a9emduaH69v59MbpWn9Yx35lgt9b1ie5nVBnl84VuU=";
+    hash = "sha256-5PGEpdCMS9AerX9GZDFen7nhwPY393g1zo9Th9lUOE0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index ee51533e6e3a..89ff93e94309 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "bcrypt";
-  version = "4.1.3";
+  version = "4.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LuFd10n1lS/j8EMND/a3QILhWcUDMqFBPVG1aJzwZiM=";
+    hash = "sha256-z2nq9Rhf1Y8mj4BbUFzjH5ufwtZLN2ZCFk6SRFQMEiE=";
   };
 
   cargoRoot = "src/_bcrypt";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-Uag1pUuis5lpnus2p5UrMLa4HP7VQLhKxR5TEMfpK0s=";
+    hash = "sha256-dOS9A3pTwXYkzPFFNh5emxJw7pSdDyY+mNIoHdwNdmg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix
index f9382892a51d..0059210356b9 100644
--- a/pkgs/development/python-modules/beartype/default.nix
+++ b/pkgs/development/python-modules/beartype/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
+  hatchling,
   pytestCheckHook,
   pythonOlder,
   typing-extensions,
@@ -10,17 +10,17 @@
 
 buildPythonPackage rec {
   pname = "beartype";
-  version = "0.18.5";
-  format = "setuptools";
+  version = "0.19.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Jk3cLx2p7JT/Y5FB++M9IuEqn3WqhjuDtwRv//E4GSc=";
+    hash = "sha256-3kLfwbpcNxD95sMALjvSytI27U0qq+h2NFqwtCNKZXM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index e75685b74768..cbfea2399312 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "bellows";
-  version = "0.40.6";
+  version = "0.42.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "bellows";
     rev = "refs/tags/${version}";
-    hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys=";
+    hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index f7d480485c69..b8a5dbb48d35 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -74,7 +74,7 @@
 }:
 
 let
-  version = "1.3.3";
+  version = "1.3.7";
   aws = [ fs-s3fs ];
   grpc = [
     grpcio
@@ -128,7 +128,7 @@ buildPythonPackage {
     owner = "bentoml";
     repo = "BentoML";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PjmXPSPukLJ+iCpBdUynhcWCfFqplmdsgj0LYpodE/c=";
+    hash = "sha256-98SVW7f/Yn+NMfS6UIicQcoatMSm4XSJzbuJ0S/p3sg=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix
index dab6fcd1d4f2..a65c4d330715 100644
--- a/pkgs/development/python-modules/betamax/default.nix
+++ b/pkgs/development/python-modules/betamax/default.nix
@@ -2,26 +2,46 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pytestCheckHook,
+  pythonOlder,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "betamax";
   version = "0.9.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
 
-  doCheck = false;
+  dependencies = [ requests ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "betamax" ];
+
+  disabledTestPaths = [
+    # Tests require network access
+    "tests/integration/test_hooks.py"
+    "tests/integration/test_placeholders.py"
+    "tests/integration/test_record_modes.py"
+    "tests/integration/test_unicode.py"
+    "tests/regression/test_gzip_compression.py"
+    "tests/regression/test_requests_2_11_body_matcher.py"
+  ];
 
   meta = with lib; {
-    homepage = "https://betamax.readthedocs.org/en/latest/";
-    description = "VCR imitation for requests";
+    description = "A VCR imitation for requests";
+    homepage = "https://betamax.readthedocs.org/";
+    changelog = "https://github.com/betamaxpy/betamax/blob/${version}/HISTORY.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ pSub ];
   };
diff --git a/pkgs/development/python-modules/better-exceptions/default.nix b/pkgs/development/python-modules/better-exceptions/default.nix
new file mode 100644
index 000000000000..622292c9bf40
--- /dev/null
+++ b/pkgs/development/python-modules/better-exceptions/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "better-exceptions";
+  version = "0.3.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "better_exceptions";
+    inherit version;
+    hash = "sha256-5Oa8GERNXwTm6JSxA4Hl6SHT1UQkBBgWLH21fp6zRTs=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "better_exceptions" ];
+
+  # As noted by @WolfangAukang, some check files need to be disabled because of various errors, same with some tests.
+  # After disabling and running the build, no tests are collected.
+  doCheck = false;
+
+  meta = {
+    description = "Pretty and more helpful exceptions in Python, automatically";
+    homepage = "https://github.com/qix-/better-exceptions";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.alex-nt ];
+  };
+}
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
index f954d7c4ab67..3162ba276cf7 100644
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "bids-validator";
-  version = "1.14.6";
+  version = "1.14.7.post0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "bids_validator";
     inherit version;
-    hash = "sha256-3ytrXRqq1h00zK0ElPLtc84wgoJa2jGVTE4UwlONSFw=";
+    hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix
index 8adb7b664894..0d6cfd6f3bf3 100644
--- a/pkgs/development/python-modules/bilibili-api-python/default.nix
+++ b/pkgs/development/python-modules/bilibili-api-python/default.nix
@@ -14,7 +14,6 @@
   pyyaml,
   qrcode,
   qrcode-terminal,
-  requests,
   rsa,
   setuptools,
   setuptools-scm,
@@ -23,12 +22,13 @@
 }:
 buildPythonPackage rec {
   pname = "bilibili-api-python";
-  version = "16.2.0";
+  version = "16.3.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ecv9lzp2L13seBosahgnglaZP8YZCD/13nlTPP8LCs0=";
+    pname = "bilibili_api_python";
+    inherit version;
+    hash = "sha256-mwhyFc3b1qA7W76gaBcAup+Wca6gQAdRwZJaZXOHqCw=";
   };
 
   postPatch = ''
@@ -51,7 +51,6 @@ buildPythonPackage rec {
     brotli
     httpx
     qrcode
-    requests
     apscheduler
     rsa
     pillow
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index da526eeba18d..8958095a9cd4 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "bimmer-connected";
-  version = "0.16.3";
+  version = "0.16.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "bimmerconnected";
     repo = "bimmer_connected";
     rev = "refs/tags/${version}";
-    hash = "sha256-IrGOhUnWTtCI5juFFuNdWSWxeFr7s8bRNT8sUludGo0=";
+    hash = "sha256-1Ef+8G30LdMtmOKOPoN3Xa7yhlHLBQvwoiPHJazu3c4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 024bd4d2dea3..c5b8160bf7ef 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -20,19 +20,20 @@
   pyqtgraph,
   pyqt5,
   pytestCheckHook,
+  yaffshiv,
   visualizationSupport ? false,
 }:
 
 buildPythonPackage rec {
   pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
-  version = "2.4.2";
+  version = "2.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OSPG";
     repo = "binwalk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IFq/XotW3bbf3obWXRK6Nw1KQDqyFHb4tcA09Twg8SQ=";
+    hash = "sha256-kabibUMh5HyAJCXOyZo3QSNIVz8fER4Xivuv9E3CfEE=";
   };
 
   build-system = [ setuptools ];
@@ -49,6 +50,7 @@ buildPythonPackage rec {
       squashfsTools
       xz
       pycrypto
+      yaffshiv
     ]
     ++ lib.optionals visualizationSupport [
       matplotlib
diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix
index fcb3bbe926d1..49808c6ee686 100644
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@@ -8,37 +8,20 @@
   numpy,
   pandas,
   pytestCheckHook,
-  fetchpatch2,
 }:
 
 buildPythonPackage rec {
   pname = "biopandas";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BioPandas";
     repo = "biopandas";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1c78baBBsDyvAWrNx5mZI/Q75wyXv0DAwAdWm3EwX/I=";
+    hash = "sha256-dUeGjDDz9VA1NrFLGKy0ebaa+MU4c1tHi5YYkAspLRk=";
   };
 
-  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 ];
diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 9bfc4a89784f..90dde389144e 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -1,31 +1,34 @@
 {
   lib,
+  torch,
+  symlinkJoin,
   buildPythonPackage,
   fetchFromGitHub,
-  python,
-  pythonOlder,
+  cmake,
   setuptools,
-  wheel,
-  torch,
   scipy,
-  symlinkJoin,
 }:
 
 let
   pname = "bitsandbytes";
-  version = "0.43.1";
+  version = "0.44.1";
 
-  inherit (torch) cudaCapabilities cudaPackages cudaSupport;
-  inherit (cudaPackages) backendStdenv cudaVersion;
+  inherit (torch) cudaPackages cudaSupport;
+  inherit (cudaPackages) cudaVersion;
+
+  cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion);
 
   # NOTE: torchvision doesn't use cudnn; torch does!
   #   For this reason it is not included.
   cuda-common-redist = with cudaPackages; [
-    cuda_cccl # 
-    libcublas # cublas_v2.h
+    (lib.getDev cuda_cccl) # 
+    (lib.getDev libcublas) # cublas_v2.h
+    (lib.getLib libcublas)
     libcurand
     libcusolver # cusolverDn.h
-    libcusparse # cusparse.h
+    (lib.getDev libcusparse) # cusparse.h
+    (lib.getLib libcusparse) # cusparse.h
+    (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
   ];
 
   cuda-native-redist = symlinkJoin {
@@ -33,7 +36,9 @@ let
     paths =
       with cudaPackages;
       [
-        cuda_cudart # cuda_runtime.h cuda_runtime_api.h
+        (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
+        (lib.getLib cuda_cudart)
+        (lib.getStatic cuda_cudart)
         cuda_nvcc
       ]
       ++ cuda-common-redist;
@@ -48,47 +53,55 @@ buildPythonPackage {
   inherit pname version;
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "TimDettmers";
     repo = "bitsandbytes";
     rev = "refs/tags/${version}";
-    hash = "sha256-GFbFKPdV96DXPA+PZO4h0zdBclN670fb0PGv4QPHWHU=";
+    hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib"
-      substituteInPlace bitsandbytes/cuda_setup/main.py  \
-        --replace "binary_path = package_dir / self.binary_name"  \
-                  "binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name"
-    ''
-    + lib.optionalString torch.cudaSupport ''
-      substituteInPlace bitsandbytes/cuda_setup/main.py  \
-        --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib"
-    '';
-
-  CUDA_HOME = "${cuda-native-redist}";
-
-  preBuild =
-    if torch.cudaSupport then
-      with torch.cudaPackages;
-      let
-        cudaVersion = lib.concatStrings (lib.splitVersion torch.cudaPackages.cudaMajorMinorVersion);
-      in
-      ''make CUDA_VERSION=${cudaVersion} cuda${cudaMajorVersion}x''
-    else
-      ''make CUDA_VERSION=CPU cpuonly'';
+  # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.
+  # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionnally.
+  # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not.
+  # Also, hardcode the path to the previously built library instead of relying on
+  # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too.
+  #
+  # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for cuda version `xx.y`.
+  # This upstream convention could change at some point and thus break the following patch.
+  postPatch = lib.optionalString cudaSupport ''
+    substituteInPlace bitsandbytes/cextension.py \
+      --replace-fail "if cuda_specs:" "if True:" \
+      --replace-fail \
+        "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \
+        "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'"
+  '';
 
   nativeBuildInputs = [
+    cmake
+    cudaPackages.cuda_nvcc
+  ];
+
+  build-system = [
     setuptools
-    wheel
-  ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ];
+  ];
 
-  buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ];
+  buildInputs = lib.optionals cudaSupport [ cuda-redist ];
 
-  propagatedBuildInputs = [
+  cmakeFlags = [
+    (lib.cmakeFeature "COMPUTE_BACKEND" (if cudaSupport then "cuda" else "cpu"))
+  ];
+  CUDA_HOME = "${cuda-native-redist}";
+  NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [
+    "-I${cuda-native-redist}/include"
+    "-L${cuda-native-redist}/lib"
+  ];
+
+  preBuild = ''
+    make -j $NIX_BUILD_CORES
+    cd .. # leave /build/source/build
+  '';
+
+  dependencies = [
     scipy
     torch
   ];
@@ -97,11 +110,11 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "bitsandbytes" ];
 
-  meta = with lib; {
+  meta = {
     description = "8-bit CUDA functions for PyTorch";
     homepage = "https://github.com/TimDettmers/bitsandbytes";
     changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }
diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index f2648124c05c..f0cdcf2c2ea4 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "black";
-  version = "24.4.2";
+  version = "24.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yHK1MFfwAAhdpmoZxV1o9vjdysJkI5KtOjVYeEBvvU0=";
+    hash = "sha256-JQCUVCC2eEw4ue6IWvA59edHHvKEqwP6Nezd5GiM2D8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
new file mode 100644
index 000000000000..e3ca43c8cd22
--- /dev/null
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -0,0 +1,109 @@
+{
+  lib,
+  pkgs,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pygobject3,
+  libblockdev,
+  bytesize,
+  pyudev,
+  dbus-python,
+  util-linux,
+  kmod,
+  libndctl,
+  nvme-cli,
+  dosfstools,
+  e2fsprogs,
+  hfsprogs,
+  xfsprogs,
+  f2fs-tools,
+  ntfs3g,
+  btrfs-progs,
+  reiserfsprogs,
+  mdadm,
+  lvm2,
+  gfs2-utils,
+  cryptsetup,
+  multipath-tools,
+  dracut,
+  stratisd,
+}:
+
+let
+  libblockdevPython = (libblockdev.override { python3 = python; }).python;
+in
+buildPythonPackage rec {
+  pname = "blivet";
+  version = "3.10.1";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "storaged-project";
+    repo = "blivet";
+    rev = "blivet-${version}";
+    hash = "sha256-Ooc63mf03ZO7zxm8s/Tm8jSQg5LWyKnHAqbyvn1UHB8=";
+  };
+
+  postPatch = ''
+    find blivet -name '*.py' | while IFS= read -r i ; do
+      substituteInPlace "$i" \
+        --replace \
+          'gi.require_version("BlockDev",' \
+          'import gi.repository
+    gi.require_version("GIRepository", "2.0")
+    from gi.repository import GIRepository
+    GIRepository.Repository.prepend_search_path("${libblockdev}/lib/girepository-1.0")
+    gi.require_version("BlockDev",'
+    done
+  '';
+
+  propagatedBuildInputs = [
+    pygobject3
+    libblockdevPython
+    bytesize
+    pyudev
+    dbus-python
+    util-linux
+    kmod
+    libndctl
+    nvme-cli
+    pkgs.systemd
+    dosfstools
+    e2fsprogs
+    hfsprogs
+    xfsprogs
+    f2fs-tools
+    ntfs3g
+    btrfs-progs
+    reiserfsprogs
+    mdadm
+    lvm2
+    gfs2-utils
+    cryptsetup
+    multipath-tools
+    dracut
+    stratisd
+  ];
+
+  pythonImportsCheck = [ "blivet" ];
+
+  # Even unit tests require a system D-Bus.
+  # TODO: Write a NixOS VM test?
+  doCheck = false;
+
+  # Fails with: TypeError: don't know how to make test from:
+  # 
+  dontUseSetuptoolsCheck = true;
+
+  meta = {
+    description = "Python module for system storage configuration";
+    homepage = "https://github.com/storaged-project/blivet";
+    license = [
+      lib.licenses.gpl2Plus
+      lib.licenses.lgpl2Plus
+    ];
+    maintainers = with lib.maintainers; [ cybershadow ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 6e986b20840f..9cf2ca34a2f7 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "bloodyad";
-  version = "2.0.7";
+  version = "2.0.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "CravateRouge";
     repo = "bloodyAD";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FfEOpu23dSanWQLw1c5TbYiD2oNT0voqJV0QvW2wksQ=";
+    hash = "sha256-GpBhLFjae/RSB5qllYCaVsCCqVu9wxxqAGywShbW1/s=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index db948e8098bc..f72a50eb26d3 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -19,6 +19,7 @@
   # propagates
   msgpack,
   ndindex,
+  numexpr,
   numpy,
   py-cpuinfo,
   rich,
@@ -31,21 +32,25 @@
 
 buildPythonPackage rec {
   pname = "blosc2";
-  version = "2.5.1";
+  version = "2.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "python-blosc2";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yBgnNJU1q+FktIkpQn74LuRP19Ta/fNC60Z8TxzlWPk=";
+    hash = "sha256-2aLfyd+/I8cy9OqdU4yNXY/bkf0AdXu+hZPLDdM3g5g=";
   };
 
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy>=2.0.0" "numpy"
     substituteInPlace requirements-runtime.txt \
       --replace "pytest" ""
   '';
 
+  pythonRelaxDeps = [ "numpy" ];
+
   nativeBuildInputs = [
     cmake
     cython
@@ -65,6 +70,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     msgpack
     ndindex
+    numexpr
     numpy
     py-cpuinfo
     rich
diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix
index 9be58802c5e3..79442baf25b4 100644
--- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix
+++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix
@@ -34,7 +34,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  pythonImportsCheck = [ "bof" ];
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  # Race condition, https://github.com/secdev/scapy/pull/4558
+  # pythonImportsCheck = [ "bof" ];
 
   disabledTests = [
     # Tests are using netcat and cat to do UDP connections
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 62c537e8de7a..f53d8396c6e0 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -46,14 +46,14 @@
 buildPythonPackage rec {
   pname = "bokeh";
   # update together with panel which is not straightforward
-  version = "3.5.2";
+  version = "3.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-A6VKZ9tne4iBg0JxxiCngbODrlk69cPqIUkWR1REDQc=";
+    hash = "sha256-ADLcHnatCXsHYm5RWEaF/0jGVIH7qq0QVmOxBGFlhno=";
   };
 
   src_test = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index a9a437af05ff..6ca2997257c9 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "boltztrap2";
-  version = "24.1.1";
+  version = "24.9.4";
 
   pyproject = true;
   build-system = [ setuptools ];
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "BoltzTraP2";
     inherit version;
-    hash = "sha256-kgv4lPBxcBmRKihaTwPRz8bHTWAWUOGZADtJUb3y+C4=";
+    hash = "sha256-BfGR7sY0E9r+RXA1fC9uy1GXC+EFV1RKOvMyvGcf+aE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix
index de4224d13ee7..83f534e71345 100644
--- a/pkgs/development/python-modules/boost-histogram/default.nix
+++ b/pkgs/development/python-modules/boost-histogram/default.nix
@@ -3,31 +3,46 @@
   fetchPypi,
   buildPythonPackage,
   pythonOlder,
+  cmake,
+  pybind11,
+  nanobind,
+  ninja,
+  setuptools-scm,
   boost,
   numpy,
   pytestCheckHook,
   pytest-benchmark,
-  setuptools-scm,
+  scikit-build-core,
 }:
 
 buildPythonPackage rec {
   pname = "boost-histogram";
-  version = "1.4.1";
-  format = "setuptools";
+  version = "1.5.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "boost_histogram";
     inherit version;
-    hash = "sha256-lxRvc19GfVBpdqBH8/I3zlmECpUv0jH19DH4l/sAbN0=";
+    hash = "sha256-BiPwEObFLl0Bh2dyOVloYJDbB/ww8NHYR1tdZjxd2yw=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [ cmake ];
+
+  dontUseCmakeConfigure = true;
+
+  build-system = [
+    pybind11
+    nanobind
+    ninja
+    scikit-build-core
+    setuptools-scm
+  ];
 
   buildInputs = [ boost ];
 
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index fae0b5ff4fd3..d9c249fef4ad 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.34.160";
+  version = "1.35.29";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-xrHf6zyuZz7tWW8BQJM54uC5VaUkGhbO5p8pMD2bN94=";
+    hash = "sha256-bl8IL3zQKL3zv8V8nbO3hOD27CIysQSChZqRnWzWv8k=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 98d8dc30c64f..5f57bbc0042e 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -1,14 +1,19 @@
 {
   lib,
-  botocore,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  botocore,
   jmespath,
+  s3transfer,
+
+  # tests
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
-  s3transfer,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -16,22 +21,18 @@ buildPythonPackage rec {
   inherit (botocore) version; # N.B: botocore, boto3, awscli needs to be updated in lockstep, bump botocore version for updating these.
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "boto";
     repo = "boto3";
     rev = "refs/tags/${version}";
-    hash = "sha256-4WP5E8LuuxWZi8DK8yOpvyy6isSfB4eFcbctkTEd3As=";
+    hash = "sha256-b08tC8EA6iW0O/7rseD9pTkKh/cJ2fe3xJZkEqxS6VI=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   pythonRelaxDeps = [ "s3transfer" ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     botocore
     jmespath
     s3transfer
@@ -53,16 +54,16 @@ buildPythonPackage rec {
     crt = [ botocore.optional-dependencies.crt ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "AWS SDK for Python";
     homepage = "https://github.com/boto/boto3";
     changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
       Python, which allows Python developers to write software that makes use of
       services like Amazon S3 and Amazon EC2.
     '';
-    maintainers = with maintainers; [ anthonyroussel ];
+    maintainers = with lib.maintainers; [ anthonyroussel ];
   };
 }
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 980ab4873062..119c5345ef93 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  poetry-core,
+  setuptools,
   pythonOlder,
   types-awscrt,
   typing-extensions,
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.34.160";
+  version = "1.35.29";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,10 +18,10 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-kAlT8/km0gVQV3ZTX9ExBH74lRlzTx5TZdA+y67FPNk=";
+    hash = "sha256-QNTPX8Un+604G+GM+DdADW8WiogOJu55TIwE+go+YsU=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [
     types-awscrt
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 974846ebd287..501ca538b4e8 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -3,34 +3,35 @@
   awscrt,
   buildPythonPackage,
   fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   jmespath,
+  python-dateutil,
+  urllib3,
+
+  # tests
   jsonschema,
   pytestCheckHook,
-  python-dateutil,
-  pythonOlder,
-  setuptools,
-  urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.35.29"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.35.30"; # N.B: if you change this, change boto3 and awscli to a matching version
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TtKKsDZ1uwCKKQxFLF3deqpdTj+hkSqtvfkwV+6ENis=";
+    hash = "sha256-q1NQ6KUOSNNx+i1RfWXCmkDEN4jLmhU4f5PqxaI98P0=";
   };
 
   pythonRelaxDeps = [ "urllib3" ];
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jmespath
     python-dateutil
     urllib3
@@ -55,11 +56,11 @@ buildPythonPackage rec {
     crt = [ awscrt ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Low-level interface to a growing number of Amazon Web Services";
     homepage = "https://github.com/boto/botocore";
     changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ anthonyroussel ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ anthonyroussel ];
   };
 }
diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index 7a860437c1b8..9970378d3741 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "botorch";
-  version = "0.11.3";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "botorch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AtRU5KC8KlkxMCU0OUAHDFK7BsPO3TbRmmzDGV7+yVk=";
+    hash = "sha256-CKlerCUadObpPq4jQAiFDBOZMHZ4QccAKQz30OFe64E=";
   };
 
   build-system = [
@@ -58,6 +58,11 @@ buildPythonPackage rec {
     ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [
       # stuck tests on hydra
       "test_moo_predictive_entropy_search"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.isAarch64) [
+      # Numerical error slightly above threshold
+      # AssertionError: Tensor-likes are not close!
+      "test_model_list_gpytorch_model"
     ];
 
   pythonImportsCheck = [ "botorch" ];
@@ -65,11 +70,11 @@ buildPythonPackage rec {
   # needs lots of undisturbed CPU time or prone to getting stuck
   requiredSystemFeatures = [ "big-parallel" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/pytorch/botorch/blob/${src.rev}/CHANGELOG.md";
     description = "Bayesian Optimization in PyTorch";
     homepage = "https://botorch.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [ veprbl ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix
index 2b7bff14c007..d1d69f252daa 100644
--- a/pkgs/development/python-modules/bottle/default.nix
+++ b/pkgs/development/python-modules/bottle/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "bottle";
-  version = "0.12.25";
+  version = "0.13.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4anJSXCubXELP7RSYpTf64byy0qB7/OkuY3ED7Dl4CE=";
+    hash = "sha256-pIhS3HoFE1PT5N491VkM0l3jcLz9lKciN1YeMUzrDIg=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix
index e4ad37696e25..923c4d0ced49 100644
--- a/pkgs/development/python-modules/bpycv/default.nix
+++ b/pkgs/development/python-modules/bpycv/default.nix
@@ -8,7 +8,7 @@
   fetchFromGitHub,
   fetchPypi,
   minexr,
-  opencv4,
+  opencv-python,
   requests,
   runCommand,
   zcs,
@@ -29,14 +29,10 @@ buildPythonPackage rec {
     minexr
     zcs
     requests
-    opencv4
+    opencv-python
     boxx
   ];
 
-  postPatch = ''
-    sed -i 's/opencv-python//g' requirements.txt
-  '';
-
   # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 4564364bfe5e..27fef0c6a5b9 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -46,6 +46,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # tests fail with sphinx 7.4.x
+    "tests/test_renderer.py"
+  ];
+
   pythonImportsCheck = [ "breathe" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix
index c6a31766078b..a0021585cfc5 100644
--- a/pkgs/development/python-modules/brian2/default.nix
+++ b/pkgs/development/python-modules/brian2/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "brian2";
-  version = "2.7.0";
+  version = "2.7.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d9GDWp8CGIjeprWf4TtchVd36gmo36HBRkBOLaRXbpo=";
+    hash = "sha256-mp1xo6ooYm21s6FYcegQdsHmVgH81usV9IfIM0GM7lc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix
index eb38597a222f..feb21946c0ec 100644
--- a/pkgs/development/python-modules/bring-api/default.nix
+++ b/pkgs/development/python-modules/bring-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bring-api";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "miaucl";
     repo = "bring-api";
     rev = "refs/tags/${version}";
-    hash = "sha256-eXT7H2GGNpSo58eK5f6b5eLWYgjxEV8iLgaVTpkt9EU=";
+    hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix
index 1ad855c1a11a..5d3bf14d7506 100644
--- a/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/pkgs/development/python-modules/bsdiff4/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bsdiff4";
-  version = "1.2.4";
+  version = "1.2.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc=";
+    hash = "sha256-zdg/gg7Ljx72ek5fCxUsYdMnyver81qpp2NBORWyE2g=";
   };
 
   pythonImportsCheck = [ "bsdiff4" ];
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index e6d92d31f3e5..2ba7e1e848d4 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -12,15 +12,14 @@
 
 buildPythonPackage rec {
   pname = "btrees";
-  version = "6.0";
+  version = "6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "BTrees";
-    inherit version;
-    hash = "sha256-9puM3TNDThPhgCFruCrgt80x+t+3zFWWlcs3MZyjX/A=";
+    inherit pname version;
+    hash = "sha256-4YdG+GQYaaIPRTKMm1+X3GxxoRlZYDVq72O3X1yNRF8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 869440098f1d..4267e09fd538 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildPythonPackage,
   numpy,
+  pyparsing,
   cython,
   zlib,
   python-lzo,
@@ -13,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bx-python";
-  version = "0.12.0";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bxlab";
     repo = "bx-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZpZjh7OXdUY7rd692h7VYHzC3qCrDKFme6r+wuG7GP4=";
+    hash = "sha256-I5yc8i9xoievaZbgwHSQQSVvs1VnNa66Q883T4dCYYw=";
   };
 
   postPatch = ''
@@ -37,7 +38,10 @@ buildPythonPackage rec {
 
   buildInputs = [ zlib ];
 
-  dependencies = [ numpy ];
+  dependencies = [
+    numpy
+    pyparsing
+  ];
 
   nativeCheckInputs = [
     python-lzo
diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix
index de17cb4106b4..b00a6b5df4ef 100644
--- a/pkgs/development/python-modules/cached-ipaddress/default.nix
+++ b/pkgs/development/python-modules/cached-ipaddress/default.nix
@@ -8,11 +8,12 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  propcache,
 }:
 
 buildPythonPackage rec {
   pname = "cached-ipaddress";
-  version = "0.6.0";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "cached-ipaddress";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wF5GBQCmKHo3sX4lYA9/wS69x4fFNNh08VG3qMp9UKs=";
+    hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo=";
   };
 
   build-system = [
@@ -30,6 +31,8 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  dependencies = [ propcache ];
+
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index c5098463552f..55a083807c79 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -3,29 +3,25 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-
-  # build-system
   setuptools,
-
-  # tests
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "cachetools";
-  version = "5.3.2";
+  version = "5.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "tkem";
-    repo = pname;
+    repo = "cachetools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CmyAW9uV63OV/zZsWwZkXOWbHfHAJdYFGJsRhpqQ1f4=";
+    hash = "sha256-WG9PiUMVGaEXXHKbtOFEGjLiSbNnpSI2fXCogpGj1PI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -35,7 +31,7 @@ buildPythonPackage rec {
     description = "Extensible memoizing collections and decorators";
     homepage = "https://github.com/tkem/cachetools";
     changelog = "https://github.com/tkem/cachetools/blob/v${version}/CHANGELOG.rst";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index fc1bad68f3aa..e040c536c54e 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "cachier";
-  version = "3.1.1";
+  version = "3.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "python-cachier";
     repo = "cachier";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LVGdPBDPj3c7eyOMt+JM0WynkJjmxzgsBlsfQCa8Wv0=";
+    hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg=";
   };
 
   pythonRemoveDeps = [ "setuptools" ];
diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index 4e4dff898424..2fa525773a63 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "cantools";
-  version = "39.4.5";
+  version = "39.4.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WU8q6A3q24xrCOjhMi1C4lj0DULIDWiG2E4BQ/kLWiM=";
+    hash = "sha256-kzgDr+l96R2ScFOwJ+KhZeTOiRq/jkLWtAmnt9/vqA0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix
index e735871268e5..e869c9567d63 100644
--- a/pkgs/development/python-modules/capstone/default.nix
+++ b/pkgs/development/python-modules/capstone/default.nix
@@ -4,7 +4,6 @@
   capstone,
   stdenv,
   setuptools,
-  fetchpatch,
 }:
 
 buildPythonPackage rec {
@@ -13,15 +12,6 @@ buildPythonPackage rec {
 
   src = capstone.src;
   sourceRoot = "${src.name}/bindings/python";
-  patches = [
-    # Drop distutils in python binding (PR 2271)
-    (fetchpatch {
-      name = "drop-distutils-in-python-binding.patch";
-      url = "https://github.com/capstone-engine/capstone/commit/d63211e3acb64fceb8b1c4a0d804b4b027f4ef71.patch";
-      hash = "sha256-zUGeFmm3xH5dzfPJE8nnHwqwFBrsZ7w8LBJAy20/3RI=";
-      stripLen = 2;
-    })
-  ];
 
   # libcapstone.a is not built with BUILD_SHARED_LIBS. For some reason setup.py
   # checks if it exists but it is not really needed. Most likely a bug in setup.py.
@@ -42,8 +32,10 @@ buildPythonPackage rec {
 
   checkPhase = ''
     mv capstone capstone.hidden
-    patchShebangs test_*
-    make check
+    pushd tests
+      patchShebangs test_*
+      make -f ../Makefile check
+    popd
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 5f7659b61346..79059c7d53f5 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -1,55 +1,50 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
+  cython,
   fetchpatch,
   fetchPypi,
-  cython,
-  setuptools-scm,
+  fontconfig,
+  gdal,
   geos,
-  proj,
   matplotlib,
   numpy,
-  pyproj,
-  pyshp,
-  shapely,
   owslib,
   pillow,
-  gdal,
-  scipy,
-  fontconfig,
+  proj,
+  pyproj,
+  pyshp,
   pytest-mpl,
   pytestCheckHook,
+  pythonOlder,
+  scipy,
+  setuptools-scm,
+  shapely,
 }:
 
 buildPythonPackage rec {
   pname = "cartopy";
-  version = "0.23.0";
+  version = "0.24.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  format = "setuptools";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
-    inherit version;
-    pname = "Cartopy";
-    hash = "sha256-Ix83s1cB8rox2UlZzKdebaBMLuo6fxTOHHXuOw6udnY=";
+    inherit pname version;
+    hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0=";
   };
 
-  patches = [
-    # Some tests in the 0.23.0 release are failing due to missing network markers. Revisit after update.
-    (fetchpatch {
-      name = "mnt-add-missing-needs-network-markers.patch";
-      url = "https://github.com/SciTools/cartopy/commit/2403847ea69c3d95e899ad5d0cab32ac6017df0e.patch";
-      hash = "sha256-aGBUX4jFn7GgoqmHVC51DmS+ga3GcQGKfkut++x67Q0=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy>=2.0.0rc1" "numpy"
+  '';
+
+  build-system = [ setuptools-scm ];
 
   nativeBuildInputs = [
     cython
     geos # for geos-config
     proj
-    setuptools-scm
   ];
 
   buildInputs = [
@@ -57,7 +52,7 @@ buildPythonPackage rec {
     proj
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     matplotlib
     numpy
     pyproj
@@ -101,9 +96,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Process geospatial data to create maps and perform analyses";
-    mainProgram = "feature_download";
-    license = licenses.lgpl3Plus;
     homepage = "https://scitools.org.uk/cartopy/docs/latest/";
+    changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}";
+    license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ ];
+    mainProgram = "feature_download";
   };
 }
diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix
index af6f0a3d0cef..3b9166d70096 100644
--- a/pkgs/development/python-modules/cashews/default.nix
+++ b/pkgs/development/python-modules/cashews/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "cashews";
-  version = "7.2.0";
+  version = "7.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Krukov";
     repo = "cashews";
     rev = "refs/tags/${version}";
-    hash = "sha256-7T9M8ioeTjW7OmcHyxZ6awNfp9kVU8Hi+Lgy17jXxK4=";
+    hash = "sha256-GS6QnWCVUgxj5uiH13jUDvRBadAB0xcZd4pb0+4q6gk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 2e48750ccb1e..b3bd55484b0f 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   cbor2,
   fetchFromGitHub,
+  fetchpatch2,
   exceptiongroup,
   hatchling,
   hatch-vcs,
@@ -11,6 +12,7 @@
   immutables,
   motor,
   msgpack,
+  msgspec,
   orjson,
   pytest-xdist,
   pytestCheckHook,
@@ -23,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "cattrs";
-  version = "23.2.3";
+  version = "24.1.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -32,9 +34,27 @@ buildPythonPackage rec {
     owner = "python-attrs";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-zWM5zmZr2EiJb/4Dc6KjDL89p0C1V0Dsz949byz5OVM=";
+    hash = "sha256-LSP8a/JduK0h9GytfbN7/CjFlnGGChaa3VbbCHQ3AFE=";
   };
 
+  patches = [
+    # https://github.com/python-attrs/cattrs/pull/576
+    (fetchpatch2 {
+      name = "attrs-24_2-compatibility1.patch";
+      url = "https://github.com/python-attrs/cattrs/commit/2d37226ff19506e23bbc291125a29ce514575819.patch";
+      excludes = [
+        "pyproject.toml"
+        "pdm.lock"
+      ];
+      hash = "sha256-nbk7rmOFk42DXYdOgw4Oe3gl3HbxNEtaJ7ZiVSBb3YA=";
+    })
+    (fetchpatch2 {
+      name = "attrs-24_2-compatibility2.patch";
+      url = "https://github.com/python-attrs/cattrs/commit/4bd6dde556042241c6381e1993cedd6514921f58.patch";
+      hash = "sha256-H1xSAYjvVUI8/jON3LWg2F2TlSxejf6TU1jpCeqly6I=";
+    })
+  ];
+
   nativeBuildInputs = [
     hatchling
     hatch-vcs
@@ -53,6 +73,7 @@ buildPythonPackage rec {
     immutables
     motor
     msgpack
+    msgspec
     orjson
     pytest-xdist
     pytestCheckHook
@@ -87,6 +108,9 @@ buildPythonPackage rec {
     "test_orjson"
     # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception
     "test_tomlkit"
+    # msgspec causes a segmentation fault for some reason
+    "test_simple_classes"
+    "test_msgspec_json_converter"
   ];
 
   pythonImportsCheck = [ "cattr" ];
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index aee2824d2926..a376fd413d47 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -10,6 +10,7 @@
 
   # tests
   hypothesis,
+  pytest-cov-stub,
   pytestCheckHook,
 }:
 
@@ -25,12 +26,7 @@ buildPythonPackage rec {
     hash = "sha256-HFM8UN3oa+8caVBgIFSg/6PDduiw4gx7j1sQh5P2mD4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov" ""
-  '';
-
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
@@ -39,6 +35,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     hypothesis
+    pytest-cov-stub
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix
index 38c643cd10a4..05be12f05226 100644
--- a/pkgs/development/python-modules/cdcs/default.nix
+++ b/pkgs/development/python-modules/cdcs/default.nix
@@ -44,6 +44,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "cdcs" ];
 
+  disabledTests = [
+    # Test is out-dated
+    "test_head"
+  ];
+
   meta = with lib; {
     description = "Python client for performing REST calls to configurable data curation system (CDCS) databases";
     homepage = "https://github.com/usnistgov/pycdcs";
diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix
index 0e6d7f5b868f..2635818a9b37 100644
--- a/pkgs/development/python-modules/celery-redbeat/default.nix
+++ b/pkgs/development/python-modules/celery-redbeat/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "celery-redbeat";
-  version = "2.1.0";
+  version = "2.2.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "sibson";
     repo = "redbeat";
-    rev = "v${version}";
-    hash = "sha256-WW/OYa7TWEKkata1eULir29wHaCnavBJebn4GrBzmWY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-lAEbhRTp0jYrCgHaTvPrl+lW1NRezmmTqAnUmLdpVwY=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix
index 1717a573a9d0..8e3f51299081 100644
--- a/pkgs/development/python-modules/certbot-dns-google/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-google/default.nix
@@ -28,9 +28,8 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [
     "-o cache_dir=$(mktemp -d)"
-
-    # Monitor https://github.com/certbot/certbot/issues/9606 for a solution
-    "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'"
+    # https://github.com/certbot/certbot/issues/9988
+    "-Wignore::DeprecationWarning"
   ];
 
   meta = certbot.meta // {
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 8709b0507e44..f04d2b2a793b 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -45,9 +45,9 @@ buildPythonPackage rec {
 
   postPatch = "cd ${pname}";  # using sourceRoot would interfere with patches
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     configargparse
     acme
     configobj
@@ -71,7 +71,11 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
-  pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
+  pytestFlagsArray = [
+    "-o cache_dir=$(mktemp -d)"
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
 
   makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ];
 
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index e72fc1b07e45..8665e8f7b7b1 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2024.07.04";
+  version = "2024.08.30";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "python-certifi";
     rev = version;
-    hash = "sha256-ArJB19tPpwTT1LjYo8OF1+Mo//l8FaMHTpvSvlfve3Q=";
+    hash = "sha256-E3Ykb7KLWWVlJ8kFGC9X/6I1SlyNxUXUPb3xN8CwlHI=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix
index 908edc32db69..911de68d4182 100644
--- a/pkgs/development/python-modules/certipy/default.nix
+++ b/pkgs/development/python-modules/certipy/default.nix
@@ -1,29 +1,44 @@
 {
   lib,
   buildPythonPackage,
+  cryptography,
   fetchPypi,
-  pyopenssl,
+  flask,
+  pytestCheckHook,
+  pythonOlder,
+  requests,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "certipy";
-  version = "0.1.3";
-  format = "setuptools";
+  version = "0.2.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n980gqpzh0fm58h3i4mi2i10wgj606lscm1r5sk60vbf6vh8mv9";
+    hash = "sha256-DA6nslJItC+5MPMBc6eMAp5rpn4u+VmMpEcNiXXJy7Y=";
   };
 
-  propagatedBuildInputs = [ pyopenssl ];
+  build-system = [ setuptools-scm ];
 
-  doCheck = false; # no tests were included
+  dependencies = [ cryptography ];
+
+  nativeCheckInputs = [
+    flask
+    pytestCheckHook
+    requests
+  ];
+
+  pythonImportsCheck = [ "certipy" ];
 
   meta = with lib; {
+    description = "Utility to create and sign CAs and certificates";
     homepage = "https://github.com/LLNL/certipy";
-    description = "wrapper for pyOpenSSL";
-    mainProgram = "certipy";
     license = licenses.bsd3;
     maintainers = with maintainers; [ isgy ];
+    mainProgram = "certipy";
   };
 }
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index d0325a5c21ea..dad77f086a45 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -2,6 +2,7 @@
   lib,
   aws-sam-translator,
   buildPythonPackage,
+  defusedxml,
   fetchFromGitHub,
   jschema-to-python,
   jsonpatch,
@@ -15,13 +16,14 @@
   pyyaml,
   regex,
   sarif-om,
+  setuptools,
   sympy,
 }:
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "0.87.7";
-  format = "setuptools";
+  version = "1.18.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -29,10 +31,12 @@ buildPythonPackage rec {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-em6Vi9zIn8ikmcHVbljA1vr+R3t8ZpJ57p3Ix3bqMYU=";
+    hash = "sha256-e06ytX1scIsmw/SezIVVnGn0day1l6kQ/wb05E8O7h0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aws-sam-translator
     jschema-to-python
     jsonpatch
@@ -46,11 +50,26 @@ buildPythonPackage rec {
     sympy
   ];
 
+  optional-dependencies = {
+    graph = [ pydot ];
+    junit = [ junit-xml ];
+    sarif = [
+      jschema-to-python
+      sarif-om
+    ];
+    full = [
+      jschema-to-python
+      junit-xml
+      pydot
+      sarif-om
+    ];
+  };
+
   nativeCheckInputs = [
+    defusedxml
     mock
-    pydot
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export PATH=$out/bin:$PATH
@@ -68,6 +87,8 @@ buildPythonPackage rec {
     "test_override_parameters"
     "test_positional_template_parameters"
     "test_template_config"
+    # Assertion error
+    "test_build_graph"
   ];
 
   pythonImportsCheck = [ "cfnlint" ];
diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix
index 0b461c3b803a..303addccd06e 100644
--- a/pkgs/development/python-modules/cgal/default.nix
+++ b/pkgs/development/python-modules/cgal/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "cgal";
-  version = "6.0.post202410011635";
+  version = "6.0.1.post202410241521";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "cgal-swig-bindings";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KXcXykL/m+A5dCDc+f8j7GgVeQahAOaZ/+LLKHyqbS4=";
+    hash = "sha256-MnUsl4ozMamKcQ13TV6mtoG7VKq8BuiDSIVq1RPn2rs=";
   };
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix
index 81f990fe75bb..b8d6cfcafc2e 100644
--- a/pkgs/development/python-modules/chess/default.nix
+++ b/pkgs/development/python-modules/chess/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "chess";
-  version = "1.11.0";
+  version = "1.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "niklasf";
     repo = "python-${pname}";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+YNEm1QppXeeIjOKfCSQoQmuSzBsW4ws0ej/whjTAPg=";
+    hash = "sha256-OAYQ/XtM4AHfbpA+gVa/AjB3tyMtvgykpHc39WaU2CI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix
index 980f02b4229d..27369e9d76c7 100644
--- a/pkgs/development/python-modules/chispa/default.nix
+++ b/pkgs/development/python-modules/chispa/default.nix
@@ -5,11 +5,12 @@
   poetry-core,
   pythonOlder,
   setuptools,
+  prettytable,
 }:
 
 buildPythonPackage rec {
   pname = "chispa";
-  version = "0.10.0";
+  version = "0.10.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,12 +19,15 @@ buildPythonPackage rec {
     owner = "MrPowers";
     repo = "chispa";
     rev = "refs/tags/v${version}";
-    hash = "sha256-r3/Uae/Bu/+ZpWt19jetfIRpew1hBB24WWQRJIcYqFs=";
+    hash = "sha256-WPtn8YGlj67MEy2onxoU5SctQ7NcvTImaU0VgMoz2B4=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ setuptools ];
+  dependencies = [
+    setuptools
+    prettytable
+  ];
 
   # Tests require a spark installation
   doCheck = false;
diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index f1105a0f4980..f562bbcaf709 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -52,7 +52,7 @@
 
 buildPythonPackage rec {
   pname = "chromadb";
-  version = "0.5.11";
+  version = "0.5.18";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -61,13 +61,13 @@ buildPythonPackage rec {
     owner = "chroma-core";
     repo = "chroma";
     rev = "refs/tags/${version}";
-    hash = "sha256-qE8eX97khcQa2JS9ZuJ1j3/pduXcQGyuVyvsnvKaemo=";
+    hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-zciqOK5EkvxX3ctkGdkAppOQAW4CJ554PZsw2ctrdG0=";
+    hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w=";
   };
 
   pythonRelaxDeps = [
@@ -149,6 +149,8 @@ buildPythonPackage rec {
     # Tests are laky / timing sensitive
     "test_fastapi_server_token_authn_allows_when_it_should_allow"
     "test_fastapi_server_token_authn_rejects_when_it_should_reject"
+    # Issue with event loop
+    "test_http_client_bw_compatibility"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 4c20d01f302f..c2e85c1f238d 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -89,10 +89,15 @@ buildPythonPackage rec {
     "cirq/_version_test.py"
   ];
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [
-    # https://github.com/quantumlib/Cirq/issues/5924
-    "test_prepare_two_qubit_state_using_sqrt_iswap"
-  ];
+  disabledTests =
+    [
+      # Assertion error
+      "test_parameterized_cphase"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+      # https://github.com/quantumlib/Cirq/issues/5924
+      "test_prepare_two_qubit_state_using_sqrt_iswap"
+    ];
 
   meta = with lib; {
     description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits";
diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix
index 68dfea58f94f..124e5cd8d987 100644
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai";
-  version = "10.8.0";
+  version = "10.8.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-dRhFZACfdMW0cIBDVUOSGDl5fai0gFXDPyfDil+itwQ=";
+    hash = "sha256-/fHNRFtxyNa9VdEi5wQ+YA+9mFv3ZpRFJQnWkuxQd5I=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 7f3bba21a536..1b474003ad60 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.125";
+  version = "9.2.127";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UYB7QnrUtVGeWv0SiEOuOhb53AbcijghIh+DIWwLsE4=";
+    hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index cba5e356d48a..c87cad4fade9 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -18,14 +18,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.125";
+  version = "9.2.127";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-22srtaY8CWT+XqnSZpMndBEVe20rDL+2LpJr9MByyLU=";
+    hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1=";
   };
 in
 buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Xe9tOt94kSKsP0Xc8K0OaeyiUKFUkujZt9AsamgKwBw=";
+    hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix
index ebb626aabf8c..03263e7fed21 100644
--- a/pkgs/development/python-modules/click-odoo-contrib/default.nix
+++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix
@@ -12,12 +12,13 @@
 
 buildPythonPackage rec {
   pname = "click-odoo-contrib";
-  version = "1.18.1";
+  version = "1.19";
   format = "pyproject";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-3gusvy3d6kgmyBY+bmXB6lbWk7qxJIuHALZtug1WLzo=";
+    pname = "click_odoo_contrib";
+    inherit version;
+    hash = "sha256-Tg3C/mdgkB1TtQZaUOX4ZjpD3InI8CxoNUSfotRqbg0=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
index 117e5c0c4196..515bbbe509d5 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchFromGitea,
   flake8,
   click,
   pyyaml,
@@ -12,14 +12,15 @@
 
 buildPythonPackage rec {
   pname = "clickclick";
-  version = "1.2.2";
+  version = "20.10.2";
   format = "setuptools";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitea {
+    domain = "codeberg.org";
     owner = "hjacobs";
     repo = "python-clickclick";
     rev = version;
-    sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0";
+    hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw=";
   };
 
   nativeCheckInputs = [
@@ -38,7 +39,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Click command line utilities";
-    homepage = "https://github.com/hjacobs/python-clickclick/";
+    homepage = "https://codeberg.org/hjacobs/python-clickclick/";
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix
index 4640b71cee04..f338744bbae9 100644
--- a/pkgs/development/python-modules/clickhouse-connect/default.nix
+++ b/pkgs/development/python-modules/clickhouse-connect/default.nix
@@ -24,7 +24,7 @@
 }:
 buildPythonPackage rec {
   pname = "clickhouse-connect";
-  version = "0.7.12";
+  version = "0.8.0";
 
   format = "setuptools";
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     repo = "clickhouse-connect";
     owner = "ClickHouse";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UJSg/ADxVsO4xuym8NGjbgQafWmu7J3Is2hKvObYhU8=";
+    hash = "sha256-Jx+lbCs1zsU11D76COIiMxwqHlYKC1DOMegM4RsQkVg=";
   };
 
   nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index 8c642edda242..133277a0a228 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -4,46 +4,46 @@
   pythonOlder,
   fetchFromGitHub,
   flit-core,
-  importlib-metadata,
   typing-extensions,
-  cloudpathlib,
   azure-storage-blob,
+  azure-storage-file-datalake,
   google-cloud-storage,
   boto3,
   psutil,
   pydantic,
-  pytest7CheckHook,
+  pytestCheckHook,
   pytest-cases,
-  pytest-cov,
+  pytest-cov-stub,
   pytest-xdist,
   python-dotenv,
   shortuuid,
+  tenacity,
 }:
 
 buildPythonPackage rec {
   pname = "cloudpathlib";
-  version = "0.18.1";
+  version = "0.19.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "drivendataorg";
     repo = "cloudpathlib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0=";
+    hash = "sha256-VjoQc9nzwcMh9kiqWXsJNE5X7e7/sVGId5jgFTLZQy4=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
-    importlib-metadata
-    typing-extensions
-  ];
+  dependencies = lib.optional (pythonOlder "3.11") typing-extensions;
 
   optional-dependencies = {
-    all = [ cloudpathlib ];
-    azure = [ azure-storage-blob ];
+    all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3;
+    azure = [
+      azure-storage-blob
+      azure-storage-file-datalake
+    ];
     gs = [ google-cloud-storage ];
     s3 = [ boto3 ];
   };
@@ -51,18 +51,16 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cloudpathlib" ];
 
   nativeCheckInputs = [
-    azure-storage-blob
-    boto3
-    google-cloud-storage
     psutil
     pydantic
-    pytest7CheckHook
+    pytestCheckHook
     pytest-cases
-    pytest-cov
+    pytest-cov-stub
     pytest-xdist
     python-dotenv
     shortuuid
-  ];
+    tenacity
+  ] ++ optional-dependencies.all;
 
   meta = with lib; {
     description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage";
diff --git a/pkgs/development/python-modules/cmsdials/default.nix b/pkgs/development/python-modules/cmsdials/default.nix
index eaf436af2eed..25788393515e 100644
--- a/pkgs/development/python-modules/cmsdials/default.nix
+++ b/pkgs/development/python-modules/cmsdials/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cmsdials";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cms-DQM";
     repo = "dials-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tV802rz8V9zkjxOoGDXuYGD9FNWjdPb3Grp2khwxC9I=";
+    hash = "sha256-/5XgNPtjJgJEOaqvq7Z7XCXh2n+DbZqFbqnZddxxFpc=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index b477d447c562..b1dec7aab5de 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.8.1";
+  version = "1.9.1";
   format = "setuptools";
 
   # pypi source doesn't include tests
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "cocotb";
     repo = "cocotb";
     rev = "refs/tags/v${version}";
-    hash = "sha256-B7SePM8muEL3KFVOY7+OAgQVIRvTs6k29xASK9lgCB4=";
+    hash = "sha256-+pS+y9rmyJ4laDK5evAtoqr5D0GuHGaX6DpK1qtumnA=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index 9c28b1abc040..a7a7758656ae 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.11.1";
+  version = "5.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-3fYc0jOfmQ8wnKb5JZY+fXoN+8dXhJi5bj2TJHJaOEo=";
+    hash = "sha256-0Y/zSw2pdrwsYpBctiV/tVf2xPhf3jG7c18frSjBass=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index 02228f5f2fc0..ecc629fe13a4 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "configobj";
-  version = "5.0.8";
+  version = "5.0.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "DiffSK";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-t3Q0FEBibkAM5PAG4fjXwNH/71RqSSDj/Mn27ri0iDU=";
+    hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 6e6e38f0b3af..00f6079d4b3c 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "configparser";
-  version = "7.0.0";
+  version = "7.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "configparser";
     rev = "refs/tags/v${version}";
-    hash = "sha256-OqlmAmBt4x+cJtK89dxsU7+Vn9wmGR9Djc59/ewHSxs=";
+    hash = "sha256-6B1I/kS60opMDpCzy2tnlnV65Qo500G0zPHP1I5TDWA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index b0098ded880c..ecdcd5759349 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -13,12 +13,13 @@
   rdkafka,
   requests,
   requests-mock,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "confluent-kafka";
-  version = "2.4.0";
-  format = "setuptools";
+  version = "2.5.3";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -26,23 +27,29 @@ buildPythonPackage rec {
     owner = "confluentinc";
     repo = "confluent-kafka-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JlPWh46WjY4GHRKtamB+qigVvVzvbRagbigyCol6lfg=";
+    hash = "sha256-b9RTz4wUtDzGkoeB0cp5vbZEBk8jSw2JiXEx6tUuPVw=";
   };
 
   buildInputs = [ rdkafka ];
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
 
   optional-dependencies = {
     avro = [
       avro
       fastavro
+      requests
     ];
     json = [
       jsonschema
       pyrsistent
+      requests
     ];
-    protobuf = [ protobuf ];
+    protobuf = [
+      protobuf
+      requests
+    ];
+    schema-registry = [ requests ];
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix
index 3da148baf4df..cd1a76e840a6 100644
--- a/pkgs/development/python-modules/consolekit/default.nix
+++ b/pkgs/development/python-modules/consolekit/default.nix
@@ -12,12 +12,12 @@
 }:
 buildPythonPackage rec {
   pname = "consolekit";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Dqi84qeUGirw4z1ay3burLeHESeNK2DDPtPnpJzD/Qw=A";
+    hash = "sha256-TU5sufqJ0znCD/QOidrT7jB1NCXJ1p8Z7FPFNPp97qg=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix
index dca06fcf55d6..c19fb148e56b 100644
--- a/pkgs/development/python-modules/consonance/default.nix
+++ b/pkgs/development/python-modules/consonance/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
+  setuptools,
   dissononce,
   python-axolotl-curve25519,
   transitions,
@@ -14,14 +15,14 @@
 buildPythonPackage rec {
   pname = "consonance";
   version = "0.1.5";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "consonance";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ=";
   };
 
@@ -34,7 +35,15 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  env = {
+    # make protobuf compatible with old versions
+    # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     dissononce
     python-axolotl-curve25519
     transitions
@@ -47,10 +56,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "consonance" ];
 
-  meta = with lib; {
+  meta = {
     description = "WhatsApp's handshake implementation using Noise Protocol";
     homepage = "https://github.com/tgalal/consonance";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix
index 4d668412f674..de2f96a8a93d 100644
--- a/pkgs/development/python-modules/contourpy/default.nix
+++ b/pkgs/development/python-modules/contourpy/default.nix
@@ -27,7 +27,7 @@
 let
   contourpy = buildPythonPackage rec {
     pname = "contourpy";
-    version = "1.2.1";
+    version = "1.3.0";
     format = "pyproject";
 
     disabled = pythonOlder "3.8";
@@ -36,17 +36,18 @@ let
       owner = "contourpy";
       repo = "contourpy";
       rev = "refs/tags/v${version}";
-      hash = "sha256-Qd6FC7SgFyC/BvOPWVkr2ZfKVMVAknLlidNRq3zcWU0=";
+      hash = "sha256-QvAIV2Y8H3oPZCF5yaqy2KWfs7aMyRX6aAU5t8E9Vpo=";
     };
 
     nativeBuildInputs = [
       meson
-      meson-python
       ninja
       pybind11
     ];
 
-    propagatedBuildInputs = [ numpy ];
+    build-system = [ meson-python ];
+
+    dependencies = [ numpy ];
 
     passthru.optional-depdendencies = {
       bokeh = [
diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix
index 3941911ac620..8037c9c1085a 100644
--- a/pkgs/development/python-modules/courlan/default.nix
+++ b/pkgs/development/python-modules/courlan/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "courlan";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OGjziBIvKwnRVIAgQ/6S39YsPqenAOquirwFGYz4vCU=";
+    hash = "sha256-EIWKtoZHCjsdh0jXuIGZYHyU5066PIredZukqVdtNm4=";
   };
 
   # Tests try to write to /tmp directly. use $TMPDIR instead.
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 7e366cf49725..f708ae1dcea5 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.5.3";
+  version = "7.6.1";
   pyproject = true;
 
   # uses f strings
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BK78pRkNHcelOkwaWn+FaIETBteo7iMcQvtpIVVxlE8=";
+    hash = "sha256-lTUQ37exKradIBNaBmI5fwd8WbHmN5p2jpfFnYUu5R0=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix
index f15b250c6b53..27d8dabd7af0 100644
--- a/pkgs/development/python-modules/cron-descriptor/default.nix
+++ b/pkgs/development/python-modules/cron-descriptor/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cron-descriptor";
-  version = "1.4.4";
+  version = "1.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Salamek";
     repo = "cron-descriptor";
     rev = "refs/tags/${version}";
-    hash = "sha256-NKAfNwIRnND4ume27CSPJoib9DysbpdD905SNP+wx0A=";
+    hash = "sha256-ElYma6RH2u1faIgOvGpMQA26dSIibWcO4mWU6NAA5PQ=";
   };
 
   # remove tests_require, as we don't do linting anyways
diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix
index 2ecb45c3a73a..f924a13dc253 100644
--- a/pkgs/development/python-modules/cronsim/default.nix
+++ b/pkgs/development/python-modules/cronsim/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "cronsim";
-  version = "2.5";
+  version = "2.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "cuu508";
     repo = "cronsim";
     rev = "refs/tags/${version}";
-    hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg=";
+    hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 1d1e43a03165..63f6bf2850e7 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -24,21 +24,21 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "43.0.0"; # Also update the hash in vectors.nix
+  version = "43.0.1"; # Also update the hash in vectors.nix
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uIB1raLVGqnxgoNTLJ9g5yFwBBu6iNfzfknLsQJ1KZ4=";
+    hash = "sha256-ID6Sp1cW2M+0kdxHx54X0NkgfM/8vLNfWY++RjrjRE0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-TEQy8PrIaZshiBFTqR/OJp3e/bVM1USjcmpDYcjPJPM=";
+    hash = "sha256-wiAHM0ucR1X7GunZX8V0Jk2Hsi+dVdGgDKqcYjSdD7Q=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index d0f635df8b9e..4f296b036265 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-XJ0JpzLVQzzt4VQqluzXCoDhIq8EfudAS83x88y45wI=";
+    hash = "sha256-aKD8GP4nswnpM6KTpU8zVreKFMFSB+lsn/hWga8FCd4=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 8435c1e988dd..e0f3e8311db1 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -42,7 +42,7 @@ let
 in
 buildPythonPackage rec {
   pname = "cupy";
-  version = "13.2.0";
+  version = "13.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -50,8 +50,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cupy";
     repo = "cupy";
-    rev = "v13.2.0";
-    hash = "sha256-vZAtpIZztmsYeJeuq7yl7kgZse2azrIM3efHDmUswJI=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-eQZwOGCaWZ4b0JCHZlrPHVQVXQwSkibHb02j0czAMt8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index bb0e353d4d57..38a11e353d74 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -7,29 +7,33 @@
   curl-impersonate-chrome,
   cffi,
   certifi,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.7.1";
+  version = "0.7.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "yifeikong";
+    owner = "lexiforest";
     repo = "curl_cffi";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fVmZ5DKgkjnO1CPYVSa9qei26B0mXqZMtVGhtNGfEpY=";
+    hash = "sha256-s8P/7erdAeGZuykUrgpCcm0a4ym3Y8F6kKFXoDXsOdQ=";
   };
 
   patches = [ ./use-system-libs.patch ];
   buildInputs = [ curl-impersonate-chrome ];
 
-  format = "pyproject";
-  build-system = [ setuptools ];
+  build-system = [
+    cffi
+    setuptools
+  ];
 
-  nativeBuildInputs = [ cffi ];
-  propagatedBuildInputs = [
+  dependencies = [
     cffi
     certifi
+    typing-extensions
   ];
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix
index 5cbd7ab56bf4..c4b0dce62587 100644
--- a/pkgs/development/python-modules/cvss/default.nix
+++ b/pkgs/development/python-modules/cvss/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "cvss";
-  version = "3.2";
+  version = "3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "RedHatProductSecurity";
     repo = "cvss";
     rev = "refs/tags/v${version}";
-    hash = "sha256-r4IWaOEZUX+3wW47rX8+lsixIjr14zAaXfFIFcbLVMM=";
+    hash = "sha256-+8aKNPcHFPcDyBvOO9QCVb1OIbpQHAEeJgt8fob0+lM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index d8e05e3e70fe..ea2d9d1b0ca6 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "cx-freeze";
-  version = "7.2.0";
+  version = "7.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,15 +22,14 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cx_freeze";
     inherit version;
-    hash = "sha256-xX9xAbTTUTJGSx7IjLiUjDt8W07OS7NUwWCRWJyzNYM=";
+    hash = "sha256-6bLEvWjr9PuZtq8v8oHA5TewSa7pSIBcxKAo4XGKvGo=";
   };
 
   postPatch = ''
     sed -i /patchelf/d pyproject.toml
     # Build system requirements
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=65.6.3,<71" "setuptools" \
-      --replace-fail "wheel>=0.42.0,<=0.43.0" "wheel"
+      --replace-fail "setuptools>=70.1,<75" "setuptools"
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix
index 2d6a079f1d60..54754299e488 100644
--- a/pkgs/development/python-modules/cxxheaderparser/default.nix
+++ b/pkgs/development/python-modules/cxxheaderparser/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cxxheaderparser";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robotpy";
     repo = "cxxheaderparser";
     rev = version;
-    hash = "sha256-Gf7O1jFICLUcN0z4WYQmh7co2AxdzJY+tdXzu/AdG/g=";
+    hash = "sha256-oUZI5mPTc+/FkXimZ6ZnjOC9wk3sPuQRTFjVv3lgqg4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 5948f958438e..703a139ed7ff 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "2.9.9";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gU/oqFrOzA6PQTwwGS9si19F+LIondO3MozNDwPDtgs=";
+    hash = "sha256-aTFas+3+veky+pyz2T1SytMNGwxlF9dAc3E03PKqvrM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 68e3b299c0b4..2ce92a1786b7 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "cython";
-  version = "3.0.11";
+  version = "3.0.11-1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cython";
     repo = "cython";
-    rev = version;
-    hash = "sha256-ZyDNv95eS9YrVHIh5C/Xq8OvfX1cnI3f9GjA+OfaONA=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-P2k21uNC6X+R6a1dWAIspGnUc6JwAzRXUleVfZG+vqY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix
new file mode 100644
index 000000000000..5410f4d2ab2e
--- /dev/null
+++ b/pkgs/development/python-modules/daltonlens/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  setuptools-git,
+  numpy,
+  pillow,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "daltonlens";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-git
+  ];
+
+  dependencies = [
+    numpy
+    pillow
+  ];
+
+  pythonImportsCheck = [
+    "daltonlens"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests/"
+  ];
+
+  disabledTestPaths = [
+    "tests/test_generate.py"
+  ];
+
+  meta = {
+    description = "R&D companion package for the desktop application DaltonLens";
+    homepage = "https://github.com/DaltonLens/DaltonLens-Python";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index 8f14ceb76e1f..18bf0952ca2b 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -71,6 +71,8 @@ buildPythonPackage rec {
     "test_from_text"
     # ValueError: not a ROOT file: first four bytes...
     "test_basic_root_works"
+    # Flaky. https://github.com/dask-contrib/dask-awkward/issues/506.
+    "test_distance_behavior"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
index 4598356713e6..5f66528967e0 100644
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = "dask-expr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7c0P+UTdjyOPdj0AM38TysNdbegT6N1iKKg6Kdgu8jI=";
+    hash = "sha256-HHoUQ6LfrlUnZNvvbPbQbNW6WLabGa88RsC9M8hlARI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
index 7f06b59df3e2..bd2f6ba83cfa 100644
--- a/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "databricks-connect";
-  version = "11.3.33";
+  version = "11.3.40";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KcqJ2B2df85H/VIx4ToX0pJ7rYbjDRp3eR7jAFW67do=";
+    hash = "sha256-rSuW/6fSro1pAxDj2tZ+EYvO0zf0yCWXNaS9Ls7xJfw=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix
index b48284aae321..2c3243a11576 100644
--- a/pkgs/development/python-modules/databricks-sql-connector/default.nix
+++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix
@@ -16,12 +16,11 @@
   thrift,
   requests,
   urllib3,
-  fetchpatch,
 }:
 
 buildPythonPackage rec {
   pname = "databricks-sql-connector";
-  version = "3.3.0";
+  version = "3.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -30,19 +29,12 @@ buildPythonPackage rec {
     owner = "databricks";
     repo = "databricks-sql-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs=";
+    hash = "sha256-8q5qWN+i2mGbzXvkop/G6mjZegzZ/6kr1Fl7FaHwLYA=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-pandas.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch";
-      sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek=";
-    })
-  ];
-
   pythonRelaxDeps = [
     "pyarrow"
+    "thrift"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 96ac76d17530..9badd981aed4 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -8,6 +8,7 @@
   libiconv,
   numpy,
   protobuf,
+  protoc,
   pyarrow,
   Security,
   SystemConfiguration,
@@ -55,6 +56,7 @@ buildPythonPackage rec {
   nativeBuildInputs = with rustPlatform; [
     cargoSetupHook
     maturinBuildHook
+    protoc
   ];
 
   buildInputs =
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index 14779ee62cab..20147a78fb60 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "datasets";
-  version = "2.20.0";
+  version = "2.21.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-9mB4RXJVkmaK+fLEmyZAdf64YKGoAhE3RzMoj4/8K98=";
+    hash = "sha256-b84Y7PixZUG1VXW11Q4fKxEcsWJjpXEHZIYugf2MSUU=";
   };
 
   # remove pyarrow<14.0.1 vulnerability fix
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 29cf78eeed88..dbc9828c5803 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -6,17 +6,19 @@
   asgi-csrf,
   click,
   click-default-group,
+  flexcache,
+  flexparser,
+  httpx,
+  hupper,
   itsdangerous,
   janus,
   jinja2,
-  hupper,
   mergedeep,
-  pint,
+  platformdirs,
   pluggy,
-  python-baseconv,
   pyyaml,
+  typing-extensions,
   uvicorn,
-  httpx,
   pytestCheckHook,
   pytest-asyncio,
   pytest-timeout,
@@ -30,8 +32,8 @@
 
 buildPythonPackage rec {
   pname = "datasette";
-  version = "0.64.8";
-  format = "setuptools";
+  version = "0.65";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -39,7 +41,7 @@ buildPythonPackage rec {
     owner = "simonw";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Nt/e0j1mF5Qkpp/dRa9W7En1WoGD2MsR3iREv9IQu5E=";
+    hash = "sha256-POdw2vB0D2B5SyrC/HkFqlsMlWtbdC3cRM/cfDhv7Z4=";
   };
 
   postPatch = ''
@@ -47,23 +49,31 @@ buildPythonPackage rec {
       --replace '"pytest-runner"' ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [
+    "pip"
+    "setuptools"
+  ];
+
+  dependencies = [
     aiofiles
     asgi-csrf
     asgiref
     click
     click-default-group
+    flexcache
+    flexparser
     httpx
     hupper
     itsdangerous
     janus
     jinja2
     mergedeep
-    pint
+    platformdirs
     pluggy
-    python-baseconv
     pyyaml
-    setuptools
+    typing-extensions
     uvicorn
   ];
 
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index c7e3237a1f65..7940e62cb371 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "datashader";
-  version = "0.16.2";
+  version = "0.16.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eJmXm0wa26a0/S6GyqP175TE5qsjTLtzBspr/iQ/xN8=";
+    hash = "sha256-nQBAx4h/elpe3TdMKXQC/SCKYr9oReh2MbVPA7muR50=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index ce94c14f45ed..b116a6e8f1b8 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -1,15 +1,16 @@
 {
   lib,
+  agate,
   buildPythonPackage,
+  dbt-common,
   fetchFromGitHub,
   hatchling,
-  agate,
-  dbt-common,
   mashumaro,
   protobuf,
+  pytestCheckHook,
+  pythonOlder,
   pytz,
   typing-extensions,
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -17,6 +18,8 @@ buildPythonPackage rec {
   version = "1.7.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-adapters";
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 9b037341b490..66ff5dc526ef 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -25,32 +25,33 @@
   pytestCheckHook,
   pytest-mock,
   pytest-xdist,
-  numpy,
 }:
 
 buildPythonPackage rec {
   pname = "dbt-common";
-  version = "1.11.0";
+  version = "1.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-common";
-    # Unfortunatly, upstream doesn't tag commits on GitHub, and the pypi source
+    # Unfortunately, upstream doesn't tag commits on GitHub, and the pypi source
     # doesn't include tests. TODO: Write an update script that will detect the
     # version from `dbt_common/__about__.py`.
-    rev = "ed11c6ceb4f29d4a79489469309d9ce9dd1757e6";
-    hash = "sha256-JA6hFQwF7h1tXyCxBVKGgyevdTxyYeN3I/Bwy9uoC0Y=";
+    rev = "5a401a9e8dd46e4582ac4edd2883e34714e77530";
+    hash = "sha256-SIMg6ewnE6kY+drqcPlYrxt1XlWBurZU62FI/QnHAHY=";
   };
 
-  build-system = [
-    hatchling
+  patches = [
+    # https://github.com/dbt-labs/dbt-common/pull/211
+    ./protobuf_5.patch
   ];
 
+  build-system = [ hatchling ];
+
   pythonRelaxDeps = [
-    "protobuf"
     "agate"
     "deepdiff"
   ];
@@ -75,12 +76,14 @@ buildPythonPackage rec {
     pytest-xdist
     pytest-mock
   ];
+
   disabledTests = [
     # Assertion errors (TODO: Notify upstream)
     "test_create_print_json"
     "test_events"
     "test_extra_dict_on_event"
   ];
+
   pythonImportsCheck = [ "dbt_common" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/dbt-common/protobuf_5.patch b/pkgs/development/python-modules/dbt-common/protobuf_5.patch
new file mode 100644
index 000000000000..4573011301ef
--- /dev/null
+++ b/pkgs/development/python-modules/dbt-common/protobuf_5.patch
@@ -0,0 +1,113 @@
+From f7c480139015cb8746f3fa751dc72b788d0ce8a0 Mon Sep 17 00:00:00 2001
+From: Eric Hauser 
+Date: Sat, 19 Oct 2024 15:52:16 -0600
+Subject: [PATCH] upgrade protobuf to >=5,<6
+
+---
+ dbt_common/events/base_types.py |  7 +++++--
+ dbt_common/events/functions.py  |  2 +-
+ dbt_common/events/types_pb2.py  | 18 ++++++++++++++----
+ pyproject.toml                  |  4 ++--
+ 4 files changed, 22 insertions(+), 9 deletions(-)
+
+diff --git a/dbt_common/events/base_types.py b/dbt_common/events/base_types.py
+index 781b2a0e..2f11e4c7 100644
+--- a/dbt_common/events/base_types.py
++++ b/dbt_common/events/base_types.py
+@@ -91,15 +91,18 @@ def __getattr__(self, key):
+ 
+     def to_dict(self):
+         return MessageToDict(
+-            self.pb_msg, preserving_proto_field_name=True, including_default_value_fields=True
++            self.pb_msg,
++            preserving_proto_field_name=True,
++            always_print_fields_with_no_presence=True,
+         )
+ 
+     def to_json(self) -> str:
+         return MessageToJson(
+             self.pb_msg,
+             preserving_proto_field_name=True,
+-            including_default_value_fields=True,
++            always_print_fields_with_no_presence=True,
+             indent=None,
++            sort_keys=True,
+         )
+ 
+     def level_tag(self) -> EventLevel:
+diff --git a/dbt_common/events/functions.py b/dbt_common/events/functions.py
+index 4e055aa4..86d68237 100644
+--- a/dbt_common/events/functions.py
++++ b/dbt_common/events/functions.py
+@@ -97,7 +97,7 @@ def msg_to_dict(msg: EventMsg) -> dict:
+         msg_dict = MessageToDict(
+             msg,
+             preserving_proto_field_name=True,
+-            including_default_value_fields=True,  # type: ignore
++            always_print_fields_with_no_presence=True,
+         )
+     except Exception as exc:
+         event_type = type(msg).__name__
+diff --git a/dbt_common/events/types_pb2.py b/dbt_common/events/types_pb2.py
+index 6574462e..1a3b91a5 100644
+--- a/dbt_common/events/types_pb2.py
++++ b/dbt_common/events/types_pb2.py
+@@ -1,12 +1,22 @@
+ # -*- coding: utf-8 -*-
+ # Generated by the protocol buffer compiler.  DO NOT EDIT!
++# NO CHECKED-IN PROTOBUF GENCODE
+ # source: types.proto
+-# Protobuf Python Version: 4.25.2
++# Protobuf Python Version: 5.28.2
+ """Generated protocol buffer code."""
+ from google.protobuf import descriptor as _descriptor
+ from google.protobuf import descriptor_pool as _descriptor_pool
++from google.protobuf import runtime_version as _runtime_version
+ from google.protobuf import symbol_database as _symbol_database
+ from google.protobuf.internal import builder as _builder
++_runtime_version.ValidateProtobufRuntimeVersion(
++    _runtime_version.Domain.PUBLIC,
++    5,
++    28,
++    2,
++    '',
++    'types.proto'
++)
+ # @@protoc_insertion_point(imports)
+ 
+ _sym_db = _symbol_database.Default()
+@@ -20,9 +30,9 @@
+ _globals = globals()
+ _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'types_pb2', _globals)
+-if _descriptor._USE_C_DESCRIPTORS == False:
+-  DESCRIPTOR._options = None
+-  _globals['_EVENTINFO_EXTRAENTRY']._options = None
++if not _descriptor._USE_C_DESCRIPTORS:
++  DESCRIPTOR._loaded_options = None
++  _globals['_EVENTINFO_EXTRAENTRY']._loaded_options = None
+   _globals['_EVENTINFO_EXTRAENTRY']._serialized_options = b'8\001'
+   _globals['_EVENTINFO']._serialized_start=62
+   _globals['_EVENTINFO']._serialized_end=335
+diff --git a/pyproject.toml b/pyproject.toml
+index 2e40385c..c2878d15 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -36,7 +36,7 @@ dependencies = [
+   "Jinja2>=3.1.3,<4",
+   "mashumaro[msgpack]>=3.9,<4.0",
+   "pathspec>=0.9,<0.13",
+-  "protobuf>=4.0.0,<5.0.0",
++  "protobuf>=5.0,<6.0",
+   "python-dateutil>=2.0,<3.0",
+   "requests<3.0.0",  # needs to match dbt-core
+   "typing-extensions>=4.4,<5.0",
+@@ -52,7 +52,7 @@ lint = [
+     "pytest>=7.3,<8.0",  # needed for linting tests
+     "types-Jinja2>=2.11,<3.0",
+     "types-jsonschema>=4.17,<5.0",
+-    "types-protobuf>=4.24,<5.0",
++    "types-protobuf>=5.0,<6.0",
+     "types-python-dateutil>=2.8,<3.0",
+     "types-PyYAML>=6.0,<7.0",
+     "types-requests"
diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 1174274e3a98..aa57d59ee42f 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   version = "1.8.8";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
@@ -47,11 +47,13 @@ buildPythonPackage rec {
     "protobuf"
     "agate"
     "click"
+    "dbt-common"
     "dbt-semantic-interfaces"
+    "logbook"
     "mashumaro"
     "networkx"
-    "logbook"
     "pathspec"
+    "protobuf"
     "urllib3"
   ];
 
diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix
index 552207472c4d..89358afbf5f0 100644
--- a/pkgs/development/python-modules/dbus-fast/default.nix
+++ b/pkgs/development/python-modules/dbus-fast/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "dbus-fast";
-  version = "2.24.0";
+  version = "2.24.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "dbus-fast";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8M2SRyAkuxNbwT5NRN6cwJ82OtprfBZXi9Yqwh1NLVY=";
+    hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk=";
   };
 
   # The project can build both an optimized cython version and an unoptimized
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index cce50d3b7e51..d9b3dfce72a5 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.8.7";
+  version = "1.8.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JFVhEAfdSfl2ACfXLMdoO/1otdif9bHialdQXucTM5A=";
+    hash = "sha256-zkNV+tFRAxTdl+lCPD4XYI1Oz0dVyX4GGuNdfzy2sJU=";
   };
 
   patches =
@@ -73,13 +73,12 @@ buildPythonPackage rec {
       })
     ];
 
-  # Remove pre-compiled "attach" libraries and recompile for host platform
-  # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
+  # Compile attach library for host platform
+  # Derived from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
   preBuild = ''
     (
         set -x
         cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
-        rm *.so *.dylib *.dll *.exe *.pdb
         $CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${
           {
             "x86_64-linux" = "-shared -o attach_linux_amd64.so";
diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
new file mode 100644
index 000000000000..92a88b601507
--- /dev/null
+++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
@@ -0,0 +1,93 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  certifi,
+  docling-core,
+  platformdirs,
+  pluggy,
+  pydantic,
+  pydantic-settings,
+  python-dateutil,
+  python-dotenv,
+  requests,
+  six,
+  tabulate,
+  tqdm,
+  typer,
+  urllib3,
+  anyio,
+  fastapi,
+  uvicorn,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "deepsearch-toolkit";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "deepsearch-toolkit";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-7XiI/VtXX4lRMreqUh6hJvdIULGvsCEdrd+zV5Jrne0=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    certifi
+    docling-core
+    platformdirs
+    pluggy
+    pydantic
+    pydantic-settings
+    python-dateutil
+    python-dotenv
+    requests
+    six
+    tabulate
+    tqdm
+    typer
+    urllib3
+  ];
+
+  pythonRelaxDeps = [
+    "urllib3"
+  ];
+
+  optional-dependencies = rec {
+    all = api;
+    api = [
+      anyio
+      fastapi
+      uvicorn
+    ];
+  };
+
+  pythonImportsCheck = [
+    "deepsearch"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Tests require the creation of a deepsearch profile
+    "test_project_listing"
+    "test_system_info"
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/deepsearch-toolkit/blob/${src.rev}/CHANGELOG.md";
+    description = "Interact with the Deep Search platform for new knowledge explorations and discoveries";
+    homepage = "https://github.com/DS4SD/deepsearch-toolkit";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index e0b4b3907c37..78d31ec97224 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   httpx,
   poetry-core,
+  pytest-cov-stub,
   pytest-mock,
   pytest-vcr,
   pytestCheckHook,
@@ -14,35 +15,29 @@
 
 buildPythonPackage rec {
   pname = "deezer-python";
-  version = "7.0.0";
+  version = "7.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "browniebroke";
     repo = "deezer-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-V4M6qRTa7XKbl962Z3y70+v3YCeW65VjeSIv/1Oxnws=";
+    hash = "sha256-d+cN6f6jw8D+noxyYl/TpDAkeTb8Krt+r0/Ai65cvdU=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=deezer" ""
-  '';
-
   build-system = [ poetry-core ];
 
-  dependencies = [
-    httpx
-    tornado
-  ];
+  dependencies = [ httpx ];
 
   nativeCheckInputs = [
     environs
+    pytest-cov-stub
     pytest-mock
     pytest-vcr
     pytestCheckHook
+    tornado
   ];
 
   pythonImportsCheck = [ "deezer" ];
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index 8cc15b7210c7..37336cddb4a7 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -7,12 +7,12 @@
   pythonOlder,
   nix-update-script,
   setuptools,
-  paup,
+  paup-cli,
   paupIntegration ? false,
 }:
 
 let
-  paupPath = if paupIntegration then lib.getExe paup else "NONE";
+  paupPath = if paupIntegration then lib.getExe paup-cli else "NONE";
 in
 buildPythonPackage rec {
   pname = "dendropy";
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 771e615eca46..4c668367fb00 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -6,6 +6,7 @@
   buildPythonPackage,
   defusedxml,
   fetchFromGitHub,
+  fetchpatch2,
   ftfy,
   httpx,
   netifaces,
@@ -31,6 +32,14 @@ buildPythonPackage rec {
     hash = "sha256-/K2pz3B4H205grDeuMWZmEeA4wJqKhP0XdpmbqFguTM=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "pytest-httpx-compat.patch";
+      url = "https://github.com/ol-iver/denonavr/commit/5320aadae91135a8c208c83d82688ddf26eb6498.patch";
+      hash = "sha256-F9R5GJ1XK3lHWLY+OgzKu3+xCosK3nX4EII9J1jhlys=";
+    })
+  ];
+
   pythonRelaxDeps = [ "defusedxml" ];
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix
index da12ca39dbd0..d88de025c3fe 100644
--- a/pkgs/development/python-modules/devolo-plc-api/default.nix
+++ b/pkgs/development/python-modules/devolo-plc-api/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "protobuf>=4.22.0" "protobuf"
+      --replace-fail "protobuf>=4.22.0" "protobuf"
   '';
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -53,6 +53,11 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  disabledTests = [
+    # pytest-httpx compat issue
+    "test_wrong_password_type"
+  ];
+
   pythonImportsCheck = [ "devolo_plc_api" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 218db0fe558d..7197be7d2336 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -10,6 +10,7 @@
   setuptools-changelog-shortener,
   setuptools,
   tomli,
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -41,6 +42,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "devpi_common" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     homepage = "https://github.com/devpi/devpi";
     description = "Utilities jointly used by devpi-server and devpi-client";
diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix
index 0e12fe09c775..a3b123f84302 100644
--- a/pkgs/development/python-modules/dicom2nifti/default.nix
+++ b/pkgs/development/python-modules/dicom2nifti/default.nix
@@ -8,6 +8,8 @@
   nibabel,
   numpy,
   pydicom,
+  pylibjpeg,
+  pylibjpeg-libjpeg,
   scipy,
   setuptools,
 }:
@@ -37,16 +39,16 @@ buildPythonPackage rec {
     scipy
   ];
 
-  # python-gdcm just builds the python interface provided by the "gdcm" package, so
-  # we should be able to replace "python-gdcm" with "gdcm" but this doesn't work
-  # (similar to https://github.com/NixOS/nixpkgs/issues/84774)
   postPatch = ''
-    substituteInPlace setup.py --replace-fail "python-gdcm" ""
     substituteInPlace tests/test_generic.py --replace-fail "from common" "from dicom2nifti.common"
     substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic"
   '';
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pylibjpeg
+    pylibjpeg-libjpeg
+  ];
 
   pythonImportsCheck = [ "dicom2nifti" ];
 
diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix
index 6887f8a13ac7..f00a973275cd 100644
--- a/pkgs/development/python-modules/dict2xml/default.nix
+++ b/pkgs/development/python-modules/dict2xml/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "dict2xml";
-  version = "1.7.5";
+  version = "1.7.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "delfick";
     repo = "python-dict2xml";
     rev = "refs/tags/release-${version}";
-    hash = "sha256-GNvG1VFz/qkkTrKleMrq8n6kcIYtfhUlQMyCqH9uQzw=";
+    hash = "sha256-5GnIVpG2xHKYv27sSjjmm8JsZ1YR9Mvc3SqE4SnE84o=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix
index 5dc3bbd3554a..111cf8aa2a83 100644
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@@ -42,6 +42,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "protobuf"
     "python-bidi"
+    "youseedee"
   ];
 
   build-system = [
diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix
index e7e736927ea0..7b4c38096f23 100644
--- a/pkgs/development/python-modules/diffusers/default.nix
+++ b/pkgs/development/python-modules/diffusers/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "diffusers";
-  version = "0.30.0";
+  version = "0.30.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "diffusers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fry16HDAjpuosSHSDDm/Y5dTNkpsGM6S33hOJ3n2x7M=";
+    hash = "sha256-/3lHJdsNblKb6xX03OluSCApMK3EXJbRLboBk8CjobE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix
index 8ba90f4d8ac5..319239b24123 100644
--- a/pkgs/development/python-modules/digi-xbee/default.nix
+++ b/pkgs/development/python-modules/digi-xbee/default.nix
@@ -9,13 +9,14 @@
 
 buildPythonPackage rec {
   pname = "digi-xbee";
-  version = "1.4.1";
+  version = "1.5.0";
   format = "setuptools";
   disabled = isPy27;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "3b10e749431f406d80c189d872f4673b8d3cd510f7b411f817780a0e72499cd2";
+    pname = "digi_xbee";
+    inherit version;
+    hash = "sha256-amUrhHIpeRHuShD0cxb2sbbRTpJQZ9/b8otsa1Bo+bI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index 790cb9ce0cd6..33f0ccd2acca 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "dill";
-  version = "0.3.8";
+  version = "0.3.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "uqfoundation";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-r65JgQH+5raiRX8NYELUB9B0zLy4z606EkFJaNpapNc=";
+    hash = "sha256-p+W0ppNMfSgplKsQjaTnTrMvQ5poF/E/xSzsiLf9h58=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix
index 451f4c6578f6..a59b541282be 100644
--- a/pkgs/development/python-modules/dinghy/default.nix
+++ b/pkgs/development/python-modules/dinghy/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "dinghy";
-  version = "1.3.2";
+  version = "1.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "nedbat";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0U08QHQuNm7qaxhU8sNxeN0fZ4S8N0RYRsWjFUqhZSU=";
+    hash = "sha256-fn8SRzhFJyyr2Wr9/cp8Sm6kbVARq2LEeKSE0HU9V74=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix
index d1f9fdd4209c..6ef4d2494502 100644
--- a/pkgs/development/python-modules/dipy/default.nix
+++ b/pkgs/development/python-modules/dipy/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  meson-python,
   packaging,
   cython,
   numpy,
@@ -10,33 +11,43 @@
   h5py,
   nibabel,
   tqdm,
+  trx-python,
 }:
 
 buildPythonPackage rec {
   pname = "dipy";
-  version = "1.7.0";
-  format = "setuptools";
+  version = "1.9.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "dipy";
-    repo = pname;
+    repo = "dipy";
     rev = "refs/tags/${version}";
-    hash = "sha256-sfqCK2r9Io1gDDHL9s9R37J0h9KcOQML3B2zJx2+QuA=";
+    hash = "sha256-6cpxuk2PL43kjQ+6UGiUHUXC7pC9OlW9kZvGOdEXyzw=";
   };
 
-  nativeBuildInputs = [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy==" "numpy>="
+  '';
+
+  build-system = [
     cython
+    meson-python
+    numpy
     packaging
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     scipy
     h5py
     nibabel
+    packaging
     tqdm
+    trx-python
   ];
 
   # disable tests for now due to:
@@ -53,7 +64,6 @@ buildPythonPackage rec {
     "dipy.reconst"
     "dipy.io"
     "dipy.viz"
-    "dipy.boots"
     "dipy.data"
     "dipy.utils"
     "dipy.segment"
diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix
index 66526a2d0975..43a1a1d0e655 100644
--- a/pkgs/development/python-modules/directv/default.nix
+++ b/pkgs/development/python-modules/directv/default.nix
@@ -32,6 +32,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    #  ValueError: Host '#' cannot contain '#' (at position 0)
+    "test_client_error"
+  ];
+
   pythonImportsCheck = [ "directv" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix
index aa3434a05089..72ecda8521c4 100644
--- a/pkgs/development/python-modules/dirty-equals/default.nix
+++ b/pkgs/development/python-modules/dirty-equals/default.nix
@@ -13,23 +13,24 @@
 let
   dirty-equals = buildPythonPackage rec {
     pname = "dirty-equals";
-    version = "0.7.1-post0";
-    format = "pyproject";
+    version = "0.8.0";
+    pyproject = true;
 
     disabled = pythonOlder "3.8";
 
     src = fetchFromGitHub {
       owner = "samuelcolvin";
-      repo = pname;
+      repo = "dirty-equals";
       rev = "refs/tags/v${version}";
-      hash = "sha256-U6DNluthDgxzh6IOaKrN/JhX4u+ztY/jVp9IKh0iP34=";
+      hash = "sha256-DZuzZ8cLYpVdivMh+zNJKpHe+0fpxM3ulKiCpN2S6co=";
     };
 
-    nativeBuildInputs = [ hatchling ];
+    build-system = [ hatchling ];
 
-    propagatedBuildInputs = [ pytz ];
+    dependencies = [ pytz ];
 
     doCheck = false;
+
     passthru.tests.pytest = dirty-equals.overrideAttrs { doCheck = true; };
 
     nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix
index e854feb88a2f..e6f208d1b436 100644
--- a/pkgs/development/python-modules/dissect-btrfs/default.nix
+++ b/pkgs/development/python-modules/dissect-btrfs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-btrfs";
-  version = "1.4";
+  version = "1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.btrfs";
     rev = "refs/tags/${version}";
-    hash = "sha256-cQC9lY80JOgLJZpNCwpvDldWjfbbI14uc9q/miAOBGM=";
+    hash = "sha256-k5GckcnWsXM6WC129zLXjUxNVcNRmLPp72gSUJBtExo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix
index a303691f3dd8..a9f020a0c7c5 100644
--- a/pkgs/development/python-modules/dissect-util/default.nix
+++ b/pkgs/development/python-modules/dissect-util/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-util";
-  version = "3.17";
+  version = "3.18";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.util";
     rev = "refs/tags/${version}";
-    hash = "sha256-uCmHvpZ5/TjUb9A8+GhaTAAEfCM9LxQdUDPWAvd7P7w=";
+    hash = "sha256-w7anXPlZZgGtpGhBuu+sA7mz02QgpUdePyJp7f03jOA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix
index 0fb8e92a7cfe..06903d466c50 100644
--- a/pkgs/development/python-modules/dissect-volume/default.nix
+++ b/pkgs/development/python-modules/dissect-volume/default.nix
@@ -42,6 +42,7 @@ buildPythonPackage rec {
     # gzip.BadGzipFile: Not a gzipped file
     "test_ddf_read"
     "test_dm_thin"
+    "test_lvm"
     "test_lvm_mirro"
     "test_lvm_thin"
     "test_lvm"
diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix
index 4e0a2d10d26e..64c721824bb9 100644
--- a/pkgs/development/python-modules/distutils/default.nix
+++ b/pkgs/development/python-modules/distutils/default.nix
@@ -5,6 +5,8 @@
   setuptools-scm,
   setuptools,
   python,
+  jaraco-collections,
+  jaraco-functools,
   jaraco-envs,
   jaraco-path,
   jaraco-text,
@@ -22,12 +24,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "distutils";
-    rev = "813ab9868b353991ec7324eb09619ee5beb9183f";
-    hash = "sha256-/YtITDuZlTJRisqsQ6SrgRRUrqLZpj+k3drrouURZlc=";
+    rev = "378984e02edae91d5f49425da8436f8dd9152b8a"; # correlate commit from setuptools version
+    hash = "sha256-31sPPVY6tr+OwpiFiaKw82KyhDNBVW3Foea49dCa6pA=";
   };
 
   build-system = [ setuptools-scm ];
 
+  dependencies = [ jaraco-functools ];
+
   postInstall = ''
     rm -r $out/${python.sitePackages}/distutils
     ln -s ${setuptools}/${python.sitePackages}/setuptools/_distutils $out/${python.sitePackages}/distutils
@@ -36,6 +40,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "distutils" ];
 
   nativeCheckInputs = [
+    jaraco-collections
     jaraco-envs
     jaraco-path
     jaraco-text
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index aee96dfd6cc7..542950750d62 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -10,16 +10,16 @@
 
 buildPythonPackage rec {
   pname = "dj-database-url";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "dj-database-url";
     rev = "refs/tags/v${version}";
-    hash = "sha256-i2btutob+5R+FFPlGwRSNF01MTfxVop8xaePDHxnqLE=";
+    hash = "sha256-Q0A9wA/k1xObw0e8+9qVTfpxBNL4W9rXisi0ge+R3DM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix
index 8b12a79aea2e..35e3d880da4d 100644
--- a/pkgs/development/python-modules/django-admin-datta/default.nix
+++ b/pkgs/development/python-modules/django-admin-datta/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "django-admin-datta";
-  version = "1.0.10";
+  version = "1.0.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VV7mb3501aZVuXUqzVqQYUttvkYa4pAECYWn7HksOmI=";
+    hash = "sha256-jcX0PKyE2gHfaVJhXRvshJuZMfRJTloqIncNBLp3auc=";
   };
 
   propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix
index 95772d937b6c..44a680f4f3dc 100644
--- a/pkgs/development/python-modules/django-cachalot/default.nix
+++ b/pkgs/development/python-modules/django-cachalot/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-cachalot";
-  version = "2.6.3";
+  version = "2.7.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "noripyt";
     repo = "django-cachalot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-q4w2goxdDqivGVZCRDGOvYARbzmx6P8Gnw9YlYn9Few=";
+    hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/django-cte/default.nix b/pkgs/development/python-modules/django-cte/default.nix
new file mode 100644
index 000000000000..1ccf00d9aaea
--- /dev/null
+++ b/pkgs/development/python-modules/django-cte/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  unittestCheckHook,
+  setuptools,
+  django,
+}:
+
+buildPythonPackage rec {
+  pname = "django-cte";
+  version = "1.3.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dimagi";
+    repo = "django-cte";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # Require Database connection
+    "test_cte_queryset"
+    "test_experimental_left_outer_join"
+    "test_explain"
+    "test_left_outer_join_on_empty_result_set_cte"
+    "test_named_ctes"
+    "test_named_simple_ctes"
+    "test_non_cte_subquery"
+    "test_outerref_in_cte_query"
+    "test_simple_cte_query"
+    "test_update_cte_query"
+    "test_update_with_subquery"
+    "test_heterogeneous_filter_in_cte"
+    "test_raw_cte_sql"
+    "test_alias_as_subquery"
+    "test_alias_change_in_annotation"
+    "test_attname_should_not_mask_col_name"
+    "test_pickle_recursive_cte_queryset"
+    "test_recursive_cte_query"
+    "test_recursive_cte_reference_in_condition"
+    "test_union_with_first"
+    "test_union_with_select_related_and_first"
+    "test_union_with_select_related_and_order"
+  ];
+
+  pythonImportsCheck = [ "django_cte" ];
+
+  meta = {
+    description = "Common Table Expressions (CTE) for Django";
+    homepage = "https://github.com/dimagi/django-cte";
+    changelog = "https://github.com/dimagi/django-cte/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
new file mode 100644
index 000000000000..55664730b5e7
--- /dev/null
+++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  elasticsearch-dsl,
+  django,
+  pythonOlder,
+  elastic-transport,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "django-elasticsearch-dsl";
+  version = "8.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "django-es";
+    repo = "django-elasticsearch-dsl";
+    rev = "refs/tags/${version}";
+    hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    elasticsearch-dsl
+    elastic-transport
+  ];
+
+  # Tests require running Elasticsearch daemon
+  doCheck = false;
+
+  pythonImportsCheck = [ "django_elasticsearch_dsl" ];
+
+  meta = {
+    description = "Wrapper around elasticsearch-dsl-py for Django models";
+    homepage = "https://github.com/sabricot/django-elasticsearch-dsl";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
index 214a5ed4ddd0..fd6fdb0b47c5 100644
--- a/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -2,20 +2,26 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-gravatar2";
-  version = "1.4.4";
-  format = "setuptools";
+  version = "1.4.5";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vn921fb6jjx7rf5dzhy66rkb71nwmh9ydd0xs9ys72icw4jh4y8";
+    pname = "django_gravatar2";
+    inherit version;
+    hash = "sha256-LbtWRl45Xdizkg1AF+J6R1aRLMKtmxG6SM8UOHGoA2Q=";
   };
 
+  build-system = [ setuptools ];
+
   doCheck = false;
 
+  pythonImportsCheck = [ "django_gravatar" ];
+
   meta = with lib; {
     description = "Essential Gravatar support for Django";
     homepage = "https://github.com/twaddington/django-gravatar";
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index f74215dd1e8d..1ee1380b48f4 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -1,32 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
-
-  # build dependencies
-  setuptools,
-  setuptools-scm,
-
-  # dependencies
   django,
-  packaging,
-
-  # tests
   elasticsearch,
+  fetchPypi,
   geopy,
+  packaging,
   pysolr,
   python-dateutil,
+  pythonOlder,
   requests,
+  setuptools-scm,
+  setuptools,
+  stdenv,
   whoosh,
 }:
 
 buildPythonPackage rec {
   pname = "django-haystack";
   version = "3.3.0";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "django_haystack";
@@ -40,12 +35,16 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [ django ];
-  propagatedBuildInputs = [ packaging ];
+
+  dependencies = [ packaging ];
 
   optional-dependencies = {
     elasticsearch = [ elasticsearch ];
   };
 
+  # tests fail and get stuck on darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   nativeCheckInputs = [
     geopy
     pysolr
@@ -54,7 +53,6 @@ buildPythonPackage rec {
     whoosh
   ] ++ optional-dependencies.elasticsearch;
 
-
   checkPhase = ''
     runHook preCheck
     python test_haystack/run_tests.py
@@ -64,6 +62,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pluggable search for Django";
     homepage = "http://haystacksearch.org/";
+    changelog = "https://github.com/django-haystack/django-haystack/releases/tag/v${version}";
     license = licenses.bsd3;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index 097a90f821bc..a0568b478ce2 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -1,59 +1,44 @@
 {
   lib,
   fetchFromGitHub,
-  fetchNpmDeps,
   buildPythonPackage,
   nix-update-script,
 
   # build-system
   flit-gettext,
   flit-scm,
-  nodejs,
-  npmHooks,
 
   # dependencies
   django,
 
   # tests
+  pytest-cov-stub,
   pytest-django,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-hijack";
-  version = "3.6.1";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-hijack";
     repo = "django-hijack";
     rev = "refs/tags/${version}";
-    hash = "sha256-xnRVoCs+TyAbvFSBD58MJhwLw7ecKpMFuWewAgmnzqk=";
-  };
-
-  postPatch = ''
-    sed -i "/addopts/d" pyproject.toml
-
-  # missing integrity hashes for yocto-queue, yargs-parser
-    cp ${./package-lock.json} package-lock.json
-  '';
-
-  npmDeps = fetchNpmDeps {
-    inherit src postPatch;
-    hash = "sha256-npAFpdqGdttE4facBimS/y2SqwnCvOHJhd60SPR/IaA=";
+    hash = "sha256-WQ6s5s4Gccog78++tZX2IZ1605OHGhYSb2aTuU7LyBc=";
   };
 
   build-system = [
     flit-gettext
     flit-scm
-    nodejs
-    npmHooks.npmConfigHook
   ];
 
   dependencies = [ django ];
 
   nativeCheckInputs = [
     pytestCheckHook
+    pytest-cov-stub
     pytest-django
   ];
 
diff --git a/pkgs/development/python-modules/django-hijack/package-lock.json b/pkgs/development/python-modules/django-hijack/package-lock.json
deleted file mode 100644
index 74de400e4d82..000000000000
--- a/pkgs/development/python-modules/django-hijack/package-lock.json
+++ /dev/null
@@ -1,7875 +0,0 @@
-{
-  "name": "django-hijack",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "django-hijack",
-      "version": "1.0.0",
-      "license": "MIT",
-      "devDependencies": {
-        "jest": "*",
-        "jest-environment-jsdom": "*",
-        "standard": "*",
-        "stylelint": "*",
-        "stylelint-config-standard-scss": "*",
-        "stylelint-scss": "*"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.24.7",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
-      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz",
-      "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helpers": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
-      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.24.7",
-        "@babel/helper-validator-option": "^7.24.7",
-        "browserslist": "^4.22.2",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
-      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
-      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
-      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
-      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
-      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
-      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
-      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
-      "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
-      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
-      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "node_modules/@csstools/css-parser-algorithms": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.0.tgz",
-      "integrity": "sha512-qvBMcOU/uWFCH/VO0MYe0AMs0BGMWAt6FTryMbFIKYtZtVnqTZtT8ktv5o718llkaGZWomJezJZjq3vJDHeJNQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-tokenizer": "^2.3.2"
-      }
-    },
-    "node_modules/@csstools/css-tokenizer": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.2.tgz",
-      "integrity": "sha512-0xYOf4pQpAaE6Sm2Q0x3p25oRukzWQ/O8hWVvhIt9Iv98/uu053u2CGm/g3kJ+P0vOYTAYzoU8Evq2pg9ZPXtw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      }
-    },
-    "node_modules/@csstools/media-query-list-parser": {
-      "version": "2.1.12",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.12.tgz",
-      "integrity": "sha512-t1/CdyVJzOQUiGUcIBXRzTAkWTFPxiPnoKwowKW2z9Uj78c2bBWI/X94BeVfUwVq1xtCjD7dnO8kS6WONgp8Jw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^2.7.0",
-        "@csstools/css-tokenizer": "^2.3.2"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
-      "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.13"
-      }
-    },
-    "node_modules/@dual-bundle/import-meta-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
-      "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/reporters": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.7.0",
-        "jest-config": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-resolve-dependencies": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/environment": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-      "dev": true,
-      "dependencies": {
-        "expect": "^29.7.0",
-        "jest-snapshot": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^29.6.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@sinonjs/fake-timers": "^10.0.2",
-        "@types/node": "*",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "jest-mock": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-      "dev": true,
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^6.0.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "v8-to-istanbul": "^9.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^2.0.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.2"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^3.0.0"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
-      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.7"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-      "dev": true
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jsdom": {
-      "version": "20.0.1",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
-      "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/tough-cookie": "*",
-        "parse5": "^7.0.0"
-      }
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "20.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true
-    },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "dev": true
-    },
-    "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "deprecated": "Use your platform's native atob() and btoa() methods instead",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
-      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
-      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.1.0",
-        "acorn-walk": "^8.0.2"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array.prototype.findlast": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
-      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
-      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.toreversed": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz",
-      "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
-      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.3",
-        "es-errors": "^1.3.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "dev": true,
-      "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/babel-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/transform": "^29.7.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.6.3",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-      "dev": true,
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.23.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
-      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001629",
-        "electron-to-chromium": "^1.4.796",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.16"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/builtins": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
-      "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.0.0"
-      }
-    },
-    "node_modules/builtins/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001639",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz",
-      "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
-      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
-      "dev": true
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-      "dev": true
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/cosmiconfig/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
-      "bin": {
-        "create-jest": "bin/create-jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz",
-      "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12 || >=16"
-      }
-    },
-    "node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
-    },
-    "node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-      "dev": true,
-      "peerDependencies": {
-        "babel-plugin-macros": "^3.1.0"
-      },
-      "peerDependenciesMeta": {
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "deprecated": "Use your platform's native DOMException instead",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.815",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz",
-      "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==",
-      "dev": true
-    },
-    "node_modules/emittery": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
-      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.3",
-        "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.3",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.7",
-        "iterator.prototype": "^1.1.2",
-        "safe-array-concat": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
-      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^8.0.1",
-        "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
-        "eslint-plugin-promise": "^6.0.0"
-      }
-    },
-    "node_modules/eslint-config-standard-jsx": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
-      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^8.8.0",
-        "eslint-plugin-react": "^7.28.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
-      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.15.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-n": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
-      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
-      "dev": true,
-      "dependencies": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.11.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-n/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz",
-      "integrity": "sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.34.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz",
-      "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.8",
-        "array.prototype.findlast": "^1.2.5",
-        "array.prototype.flatmap": "^1.3.2",
-        "array.prototype.toreversed": "^1.1.2",
-        "array.prototype.tosorted": "^1.1.4",
-        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.19",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.8",
-        "object.fromentries": "^2.0.8",
-        "object.hasown": "^1.1.4",
-        "object.values": "^1.2.0",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.5",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.11"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.9.1"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dev": true,
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-      "dev": true
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "node_modules/html-tags": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
-      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-async-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
-      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
-      "dev": true,
-      "dependencies": {
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
-      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
-      "dev": true,
-      "dependencies": {
-        "which-typed-array": "^1.1.14"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
-      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "reflect.getprototypeof": "^1.0.4",
-        "set-function-name": "^2.0.1"
-      }
-    },
-    "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-circus": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^1.0.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.7.0",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^29.7.0",
-        "pure-rand": "^6.0.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-jest": "^29.7.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dev": true,
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-environment-jsdom": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/jsdom": "^20.0.0",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jsdom": "^20.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-mock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-      "dev": true,
-      "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.7.0",
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.7.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
-      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "acorn": "^8.8.1",
-        "acorn-globals": "^7.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.2",
-        "decimal.js": "^10.4.2",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
-        "parse5": "^7.1.1",
-        "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0",
-        "ws": "^8.11.0",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.31.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.31.0.tgz",
-      "integrity": "sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ==",
-      "dev": true
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/type-fest": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-      "dev": true
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
-      "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz",
-      "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
-      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.groupby": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
-      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz",
-      "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dev": true,
-      "dependencies": {
-        "entities": "^4.4.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz",
-      "integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "engines": {
-        "node": ">=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
-      }
-    },
-    "node_modules/postcss-scss": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
-      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.29"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
-      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/prop-types/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pure-rand": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ]
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
-    },
-    "node_modules/reflect.getprototypeof": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
-      "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.1",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
-        "which-builtin-type": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "define-properties": "^1.2.1",
-        "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/saxes": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=v12.22.7"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/set-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
-      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "eslint": "^8.41.0",
-        "eslint-config-standard": "17.1.0",
-        "eslint-config-standard-jsx": "^11.0.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-react": "^7.32.2",
-        "standard-engine": "^15.0.0",
-        "version-guard": "^1.1.1"
-      },
-      "bin": {
-        "standard": "bin/cmd.cjs"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/standard-engine": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
-      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.6",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
-      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.7",
-        "regexp.prototype.flags": "^1.5.2",
-        "set-function-name": "^2.0.2",
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
-      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/stylelint": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz",
-      "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/stylelint"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/stylelint"
-        }
-      ],
-      "dependencies": {
-        "@csstools/css-parser-algorithms": "^2.6.3",
-        "@csstools/css-tokenizer": "^2.3.1",
-        "@csstools/media-query-list-parser": "^2.1.11",
-        "@csstools/selector-specificity": "^3.1.1",
-        "@dual-bundle/import-meta-resolve": "^4.1.0",
-        "balanced-match": "^2.0.0",
-        "colord": "^2.9.3",
-        "cosmiconfig": "^9.0.0",
-        "css-functions-list": "^3.2.2",
-        "css-tree": "^2.3.1",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^9.0.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.1.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.3.1",
-        "ignore": "^5.3.1",
-        "imurmurhash": "^0.1.4",
-        "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.31.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^13.2.0",
-        "micromatch": "^4.0.7",
-        "normalize-path": "^3.0.0",
-        "picocolors": "^1.0.1",
-        "postcss": "^8.4.38",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^7.0.0",
-        "postcss-selector-parser": "^6.1.0",
-        "postcss-value-parser": "^4.2.0",
-        "resolve-from": "^5.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^7.1.0",
-        "supports-hyperlinks": "^3.0.0",
-        "svg-tags": "^1.0.0",
-        "table": "^6.8.2",
-        "write-file-atomic": "^5.0.1"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.mjs"
-      },
-      "engines": {
-        "node": ">=18.12.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz",
-      "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/stylelint"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/stylelint"
-        }
-      ],
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^16.1.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended-scss": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.0.0.tgz",
-      "integrity": "sha512-HDvpoOAQ1RpF+sPbDOT2Q2/YrBDEJDnUymmVmZ7mMCeNiFSdhRdyGEimBkz06wsN+HaFwUh249gDR+I9JR7Onw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.9",
-        "stylelint-config-recommended": "^14.0.0",
-        "stylelint-scss": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3",
-        "stylelint": "^16.0.2"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylelint-config-standard": {
-      "version": "36.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz",
-      "integrity": "sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/stylelint"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/stylelint"
-        }
-      ],
-      "dependencies": {
-        "stylelint-config-recommended": "^14.0.1"
-      },
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^16.1.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-13.1.0.tgz",
-      "integrity": "sha512-Eo5w7/XvwGHWkeGLtdm2FZLOMYoZl1omP2/jgFCXyl2x5yNz7/8vv4Tj6slHvMSSUNTaGoam/GAZ0ZhukvalfA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended-scss": "^14.0.0",
-        "stylelint-config-standard": "^36.0.0"
-      },
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3",
-        "stylelint": "^16.3.1"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylelint-scss": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.3.2.tgz",
-      "integrity": "sha512-pNk9mXOVKkQtd+SROPC9io8ISSgX+tOVPhFdBE+LaKQnJMLdWPbGKAGYv4Wmf/RrnOjkutunNTN9kKMhkdE5qA==",
-      "dev": true,
-      "dependencies": {
-        "known-css-properties": "^0.31.0",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^16.0.2"
-      }
-    },
-    "node_modules/stylelint/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/file-entry-cache": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz",
-      "integrity": "sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/stylelint/node_modules/flat-cache": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz",
-      "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.3.1",
-        "keyv": "^4.5.4"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/stylelint/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/stylelint/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/write-file-atomic": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
-      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-      "dev": true
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/table": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
-      "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
-      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.4.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
-      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
-    },
-    "node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
-      "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/version-guard": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz",
-      "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.48"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
-      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
-      "dev": true,
-      "dependencies": {
-        "function.prototype.name": "^1.1.5",
-        "has-tostringtag": "^1.0.0",
-        "is-async-function": "^2.0.0",
-        "is-date-object": "^1.0.5",
-        "is-finalizationregistry": "^1.0.2",
-        "is-generator-function": "^1.0.10",
-        "is-regex": "^1.1.4",
-        "is-weakref": "^1.0.2",
-        "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-collection": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
-      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-      "dev": true,
-      "dependencies": {
-        "is-map": "^2.0.3",
-        "is-set": "^2.0.3",
-        "is-weakmap": "^2.0.2",
-        "is-weakset": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
-}
diff --git a/pkgs/development/python-modules/django-json-widget/default.nix b/pkgs/development/python-modules/django-json-widget/default.nix
new file mode 100644
index 000000000000..c42f778d61a6
--- /dev/null
+++ b/pkgs/development/python-modules/django-json-widget/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  pythonOlder,
+  setuptools,
+  python,
+  pytestCheckHook,
+  pytest-django,
+}:
+
+buildPythonPackage rec {
+  pname = "django-json-widget";
+  version = "2.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "jmrivas86";
+    repo = "django-json-widget";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GY6rYY//n8kkWCJZk6OY+EOBv62ocNovNmE/ai8VCn4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
+
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
+
+  pythonImportCheck = [ "django_json_widget" ];
+
+  meta = {
+    description = "Alternative widget that makes it easy to edit the jsonfield field of django";
+    homepage = "https://github.com/jmrivas86/django-json-widget";
+    changelog = "https://github.com/jmrivas86/django-json-widget/blob/v${version}/CHANGELOG.rst";
+    # Contradictory license specifications
+    # https://github.com/jmrivas86/django-json-widget/issues/93
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index d139e4666842..9a10d0bcf355 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -21,15 +21,17 @@
 
 buildPythonPackage rec {
   pname = "django-mailman3";
-  version = "1.3.12";
+  version = "1.3.15";
   pyproject = true;
 
   src = fetchPypi {
     pname = "django_mailman3";
     inherit version;
-    hash = "sha256-MnQlT5ElNnStLUKyOXnI7ZDDaBwfp+h9tbOC+cwB0es=";
+    hash = "sha256-+ZFrJpy5xdW6Yde/XEvxoAN8+TSQdiI0PfjZ7bHG0Rs=";
   };
 
+  pythonRelaxDeps = [ "django-allauth" ];
+
   build-system = [ pdm-backend ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
new file mode 100644
index 000000000000..c0ed1e4f287b
--- /dev/null
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  setuptools,
+  pyotp,
+  fido2,
+  qrcode,
+  python,
+}:
+
+buildPythonPackage rec {
+  pname = "django-mfa3";
+  version = "0.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "xi";
+    repo = "django-mfa3";
+    rev = "refs/tags/${version}";
+    hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    pyotp
+    fido2
+    qrcode
+  ];
+
+  # qrcode 8.0 not supported yet
+  # See https://github.com/xi/django-mfa3/pull/14
+  pythonRelaxDeps = [ "qrcode" ];
+
+  checkPhase = ''
+    ${python.interpreter} -m django test --settings tests.settings
+  '';
+
+  meta = {
+    description = "Multi factor authentication for Django";
+    homepage = "https://github.com/xi/django-mfa3";
+    changelog = "https://github.com/xi/django-mfa3/blob/${src.rev}/CHANGES.md";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix
index 9e7da31291a7..ad365b7062f3 100644
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@@ -3,26 +3,37 @@
   buildPythonPackage,
   fetchPypi,
   django,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-multiselectfield";
-  version = "0.1.12";
-  format = "setuptools";
+  version = "0.1.13";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1ygra8s394d1szgj7yawlca17q08hygsrzvq2k3k48zvd0awg96h";
+    pname = "django_multiselectfield";
+    inherit version;
+    hash = "sha256-Q31yYy9MDKQWlRkXYyUpw9HUK2K7bDwD4zlvpQJlvpQ=";
   };
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
 
   # No tests
   doCheck = false;
 
+  pythonImportsCheck = [ "multiselectfield" ];
+
   meta = {
-    description = "django-multiselectfield";
+    description = "Multiple Choice model field for Django";
     homepage = "https://github.com/goinnn/django-multiselectfield";
-    license = lib.licenses.lgpl3;
+    changelog = "https://github.com/goinnn/django-multiselectfield/blob/master/CHANGES.rst";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index ae4a56d8790b..30007c812b3c 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 
   # propagates
   django,
@@ -11,6 +12,7 @@
 
   # tests
   djangorestframework,
+  pytest-cov-stub,
   pytest-django,
   pytest-mock,
   pytestCheckHook,
@@ -18,35 +20,34 @@
 
 buildPythonPackage rec {
   pname = "django-oauth-toolkit";
-  version = "2.4.0";
-  format = "setuptools";
+  version = "3.0.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
-    repo = pname;
+    repo = "django-oauth-toolkit";
     rev = "refs/tags/${version}";
-    hash = "sha256-nfLjjVp+6OsjFdJHUZ2gzZic/E/sCklj+YeFyb/EZdw=";
+    hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY=";
   };
 
-  postPatch = ''
-    sed -i '/cov/d' tox.ini
-  '';
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     django
     jwcrypto
     oauthlib
     requests
   ];
 
-  pythonRelaxDeps = [ "django" ];
-
-  DJANGO_SETTINGS_MODULE = "tests.settings";
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
 
   # xdist is disabled right now because it can cause race conditions on high core machines
   # https://github.com/jazzband/django-oauth-toolkit/issues/1300
   nativeCheckInputs = [
     djangorestframework
+    pytest-cov-stub
     pytest-django
     # pytest-xdist
     pytest-mock
@@ -58,10 +59,11 @@ buildPythonPackage rec {
     "test_response_when_auth_server_response_return_404"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "OAuth2 goodies for the Djangonauts";
     homepage = "https://github.com/jazzband/django-oauth-toolkit";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ mmai ];
+    changelog = "https://github.com/jazzband/django-oauth-toolkit/django-filer/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ mmai ];
   };
 }
diff --git a/pkgs/development/python-modules/django-parler/default.nix b/pkgs/development/python-modules/django-parler/default.nix
index b963f709a4d3..73e52c187cca 100644
--- a/pkgs/development/python-modules/django-parler/default.nix
+++ b/pkgs/development/python-modules/django-parler/default.nix
@@ -5,12 +5,13 @@
   fetchFromGitHub,
   pythonOlder,
   python,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-parler";
   version = "2.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -21,7 +22,16 @@ buildPythonPackage rec {
     hash = "sha256-tRGifFPCXF3aa3PQWKw3tl1H1TY+lgcChUP1VdwG1cE=";
   };
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
+
+  # Disable failing test: article.tests.AdminArticleTestCase.test_admin_add
+  # AssertionError: '
Ajout de Article (Hollandais)
' not found in ...
+  # https://github.com/django-parler/django-parler/issues/358
+  preCheck = lib.optionalString (lib.versionAtLeast django.version "5.0") ''
+    rm example/article/tests.py
+  '';
 
   checkPhase = ''
     runHook preCheck
@@ -29,11 +39,11 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple Django model translations without nasty hacks";
     homepage = "https://github.com/django-parler/django-parler";
     changelog = "https://github.com/django-parler/django-parler/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ derdennisop ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ derdennisop ];
   };
 }
diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix
new file mode 100644
index 000000000000..69af00e6d0ff
--- /dev/null
+++ b/pkgs/development/python-modules/django-pgactivity/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  django,
+  psycopg,
+}:
+
+buildPythonPackage rec {
+  pname = "django-pgactivity";
+  version = "1.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Opus10";
+    repo = "django-pgactivity";
+    rev = "refs/tags/${version}";
+    hash = "sha256-jOpm/vYy3Ubi+NfvARH19ozZMUgyGD/ZztqxKNvAoLQ=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    django
+    psycopg
+  ];
+
+  pythonImportsCheck = [ "pgactivity" ];
+
+  meta = {
+    description = "View, filter, and kill Postgres queries";
+    homepage = "https://github.com/Opus10/django-pgactivity";
+    changelog = "https://github.com/Opus10/django-pgactivity/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix
new file mode 100644
index 000000000000..06ca731c76be
--- /dev/null
+++ b/pkgs/development/python-modules/django-pglock/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  django,
+  django-pgactivity,
+}:
+
+buildPythonPackage rec {
+  pname = "django-pglock";
+  version = "1.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Opus10";
+    repo = "django-pglock";
+    rev = "refs/tags/${version}";
+    hash = "sha256-KCB00W3sUyEERgK/DfDPl051uFkc0IRdbOJusUVs5SA=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    django
+    django-pgactivity
+  ];
+
+  pythonImportsCheck = [ "pglock" ];
+
+  meta = {
+    description = "Postgres advisory locks, table locks, and blocking lock management";
+    homepage = "https://github.com/Opus10/django-pglock";
+    changelog = "https://github.com/Opus10/django-pglock/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix
index 94249cebd94c..6d84ad60fe38 100644
--- a/pkgs/development/python-modules/django-redis/default.nix
+++ b/pkgs/development/python-modules/django-redis/default.nix
@@ -14,6 +14,7 @@
 
   # testing
   pkgs,
+  pytest-cov-stub,
   pytest-django,
   pytest-mock,
   pytestCheckHook,
@@ -33,11 +34,7 @@ buildPythonPackage rec {
     hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc=";
   };
 
-  postPatch = ''
-    sed -i '/-cov/d' setup.cfg
-  '';
-
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   propagatedBuildInputs = [
     django
@@ -52,9 +49,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "django_redis" ];
 
-  DJANGO_SETTINGS_MODULE = "tests.settings.sqlite";
-
   preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings.sqlite
+
     ${pkgs.redis}/bin/redis-server &
     REDIS_PID=$!
   '';
@@ -64,10 +61,11 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
+    pytest-cov-stub
     pytest-django
     pytest-mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
index eb6fcafac1d0..b62c60d70372 100644
--- a/pkgs/development/python-modules/django-rest-registration/default.nix
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "django-rest-registration";
-  version = "0.8.3";
+  version = "0.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "apragacz";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RDegK+1A01kfpit3LX+ToViqPlTiZ3dIve38ea7lNxE=";
+    hash = "sha256-EaS1qN7GpfPPeSLwwQdVWSRO2dv0DG5LD7vnXckz4Bg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix
index 9d795c934647..2c0328883703 100644
--- a/pkgs/development/python-modules/django-reversion/default.nix
+++ b/pkgs/development/python-modules/django-reversion/default.nix
@@ -9,19 +9,20 @@
 
 buildPythonPackage rec {
   pname = "django-reversion";
-  version = "5.0.12";
+  version = "5.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-wEfMmanxukqubbicOsJDR41t6Y7Ipgxwc/zIddicXNs=";
+    pname = "django_reversion";
+    inherit version;
+    hash = "sha256-MwmCHltvzu3M5raXXxqcf6tq58fQ4SdqkONFlG+g3Lg=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ django ];
+  dependencies = [ django ];
 
   # Tests assume the availability of a mysql/postgresql database
   doCheck = false;
diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix
index 0825ee658b93..dc7372d59c16 100644
--- a/pkgs/development/python-modules/django-silk/default.nix
+++ b/pkgs/development/python-modules/django-silk/default.nix
@@ -25,16 +25,16 @@
 
 buildPythonPackage rec {
   pname = "django-silk";
-  version = "5.2.0";
+  version = "5.3.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-silk";
     rev = "refs/tags/${version}";
-    hash = "sha256-wSQ0yV9+UyjgsaQGNn+MdeUkx9eeRqaHvDpUxIGRmGM=";
+    hash = "sha256-teDvQzNmzCOWdPOqlm2GRhhlilOjM+VAcfOXPw/Rq44=";
   };
 
   # "test_time_taken" tests aren't suitable for reproducible execution, but Django's
diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix
index 05f2ebeb1c27..ef55f085d2be 100644
--- a/pkgs/development/python-modules/django-soft-delete/default.nix
+++ b/pkgs/development/python-modules/django-soft-delete/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "django-soft-delete";
-  version = "1.0.13";
+  version = "1.0.14";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RDwApUwG0jb/iAbDJgJD13XMU2WB1zd8J4UICxBBzh0=";
+    hash = "sha256-Qo31bqT7sT9C1PdS8R8qUXqjGsPRtFDmt4xMXV2d/Ds=";
   };
 
   dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix
index 1014efc09e65..161012236047 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/pkgs/development/python-modules/django-storages/default.nix
@@ -15,6 +15,8 @@
   pythonOlder,
   rsa,
   setuptools,
+  pynacl,
+  fetchpatch,
 }:
 
 buildPythonPackage rec {
@@ -31,9 +33,19 @@ buildPythonPackage rec {
     hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  patches = [
+    # Add Moto 5 support
+    # https://github.com/jschneier/django-storages/pull/1464
+    (fetchpatch {
+      url = "https://github.com/jschneier/django-storages/commit/e1aedcf2d137f164101d31f2f430f1594eedd78c.patch";
+      hash = "sha256-jSb/uJ0RXvPsXl+WUAzAgDvJl9Y3ad2F30X1SbsCc04=";
+      name = "add_moto_5_support.patch";
+    })
+  ];
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
 
   optional-dependencies = {
     azure = [ azure-storage-blob ];
@@ -52,26 +64,24 @@ buildPythonPackage rec {
     rsa
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
+  checkInputs = [ pynacl ];
+
   pythonImportsCheck = [ "storages" ];
 
   env.DJANGO_SETTINGS_MODULE = "tests.settings";
 
   disabledTests = [
     # AttributeError: 'str' object has no attribute 'universe_domain'
+    # https://github.com/jschneier/django-storages/issues/1463
     "test_storage_save_gzip"
   ];
 
-  disabledTestPaths = [
-    # ImportError: cannot import name 'mock_s3' from 'moto'
-    "tests/test_s3.py"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Collection of custom storage backends for Django";
     changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst";
     downloadPage = "https://github.com/jschneier/django-storages/";
     homepage = "https://django-storages.readthedocs.io";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ mmai ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mmai ];
   };
 }
diff --git a/pkgs/development/python-modules/django-tenants/default.nix b/pkgs/development/python-modules/django-tenants/default.nix
new file mode 100644
index 000000000000..f759a1458205
--- /dev/null
+++ b/pkgs/development/python-modules/django-tenants/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+  psycopg,
+}:
+
+buildPythonPackage rec {
+  pname = "django-tenants";
+  version = "3.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "django-tenants";
+    repo = "django-tenants";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QdEONKVFW/DWBjXWRTG+ahvirw9BP8M6PztUMZGZ33Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    psycopg
+  ];
+
+  pythonImportsCheck = [ "django_tenants" ];
+
+  meta = {
+    description = "Django tenants using PostgreSQL Schemas";
+    homepage = "https://github.com/django-tenants/django-tenants";
+    changelog = "https://github.com/django-tenants/django-tenants/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index 39be46703e68..456cae7155a9 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.2";
+  version = "5.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-HQt7et2PBG5rPCFCl64CIr+jTpty0a5IxJ0rKP6QCBM=";
+    hash = "sha256-TqOVe+QkwNx/SpI/6X/AQaqLHk3LDSupoRl3RKL6kac=";
   };
 
   patches =
diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
index 4356d8226235..60991060b328 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
@@ -4,18 +4,19 @@
   fetchFromGitHub,
   django-guardian,
   djangorestframework,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "djangorestframework-guardian2";
-  version = "0.5.0";
-  format = "setuptools";
+  version = "0.7.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "johnthagen";
     repo = "django-rest-framework-guardian2";
-    rev = "v${version}";
-    hash = "sha256-aW20xEmVTAgwayWMJsabmyKNW65NftJyQANtT6JV74U=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk=";
   };
 
   postPatch = ''
@@ -23,7 +24,9 @@ buildPythonPackage rec {
     patchShebangs manage.py
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     django-guardian
     djangorestframework
   ];
diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix
index 383a0ba7981b..28a8b717d4f8 100644
--- a/pkgs/development/python-modules/dm-control/default.nix
+++ b/pkgs/development/python-modules/dm-control/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "dm-control";
-  version = "1.0.24";
+  version = "1.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "dm_control";
     rev = "refs/tags/${version}";
-    hash = "sha256-DnU3u7h/sPCjKLTFppAuPcY8CC0PNdFIlmeGd4xgy3M=";
+    hash = "sha256-eP85aKECvIu8nxPcSjc3PcCR9sWeTmaVJ7gBtVis0PY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index d1d0d61398de..fa2a2565e916 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "dnspython";
-  version = "2.6.1";
+  version = "2.7.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6PD5wjp7fLmd7WTmw6bz5wHXj1DFXgArg53qciXP98w=";
+    hash = "sha256-zpxDLtoNyRz2GKXO3xpOFCZRGWu80sgOie1akH5c+vE=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix
index 68c9377d3bff..1fcdb4f8f701 100644
--- a/pkgs/development/python-modules/doc8/default.nix
+++ b/pkgs/development/python-modules/doc8/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "doc8";
-  version = "1.1.1";
+  version = "1.1.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2XqT6PWi78RxOggEZX3trYN0XMpM0diN6Rhvd/l3YAQ=";
+    hash = "sha256-EiXzAUThzJfjiNuvf+PpltKJdHOlOm2uJo3d4hw1S5g=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
new file mode 100644
index 000000000000..b790ca13ab86
--- /dev/null
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  jsonref,
+  jsonschema,
+  pandas,
+  pillow,
+  pydantic,
+  tabulate,
+  jsondiff,
+  requests,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "docling-core";
+  version = "2.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "docling-core";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yNsmMAeR1sbZsddpjMFWZy2UAbIWWiZmdW4/lwLvCbM=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    jsonref
+    jsonschema
+    pandas
+    pillow
+    pydantic
+    tabulate
+  ];
+
+  pythonImportsCheck = [
+    "docling_core"
+  ];
+
+  nativeCheckInputs = [
+    jsondiff
+    pytestCheckHook
+    requests
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/docling-core/blob/${version}/CHANGELOG.md";
+    description = "Python library to define and validate data types in Docling";
+    homepage = "https://github.com/DS4SD/docling-core";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix
new file mode 100644
index 000000000000..dbd7b4e819ec
--- /dev/null
+++ b/pkgs/development/python-modules/docling-ibm-models/default.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  huggingface-hub,
+  jsonlines,
+  lxml,
+  mean-average-precision,
+  numpy,
+  opencv-python-headless,
+  pillow,
+  torch,
+  torchvision,
+  tqdm,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "docling-ibm-models";
+  version = "2.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "docling-ibm-models";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-vSEW1+mFTjUvjjUOoX3aGgT/y8iwP3JGIZaPh9RbX5I=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    huggingface-hub
+    jsonlines
+    lxml
+    mean-average-precision
+    numpy
+    opencv-python-headless
+    pillow
+    torch
+    torchvision
+    tqdm
+  ];
+
+  pythonRelaxDeps = [
+    "lxml"
+    "mean_average_precision"
+    "torchvision"
+  ];
+
+  pythonImportsCheck = [
+    "docling_ibm_models"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Requires network access
+    "test_layoutpredictor"
+    "test_tf_predictor"
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.rev}/CHANGELOG.md";
+    description = "Docling IBM models";
+    homepage = "https://github.com/DS4SD/docling-ibm-models";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
new file mode 100644
index 000000000000..745d010ed1b5
--- /dev/null
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  cxxopts,
+  poetry-core,
+  pybind11,
+  tabulate,
+  zlib,
+  nlohmann_json,
+  utf8cpp,
+  libjpeg,
+  qpdf,
+  loguru-cpp,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "docling-parse";
+  version = "2.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "docling-parse";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pZJ7lneg4ftAoWS5AOflkkKCwZGF4TJIuqDjq4W4VBw=";
+  };
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  build-system = [
+    poetry-core
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp";
+
+  buildInputs = [
+    pybind11
+    cxxopts
+    libjpeg
+    loguru-cpp
+    nlohmann_json
+    qpdf
+    utf8cpp
+    zlib
+  ];
+
+  env.USE_SYSTEM_DEPS = true;
+
+  cmakeFlags = [
+    "-DUSE_SYSTEM_DEPS=True"
+  ];
+
+  dependencies = [
+    tabulate
+  ];
+
+  pythonImportsCheck = [
+    "docling_parse"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/docling-parse/blob/${src.rev}/CHANGELOG.md";
+    description = "Simple package to extract text with coordinates from programmatic PDFs";
+    homepage = "https://github.com/DS4SD/docling-parse";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix
index 464552809ddb..5df0b3daf56c 100644
--- a/pkgs/development/python-modules/docplex/default.nix
+++ b/pkgs/development/python-modules/docplex/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "docplex";
-  version = "2.27.239";
+  version = "2.28.240";
   pyproject = true;
 
   # No source available from official repo
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ug5+jDBBbamqd0JebzHvjLZoTRRPYWQiJl6g8BK0aMQ=";
+    hash = "sha256-wN5AfjP4cJu0zZG27+uW/Yi/7L3OLK7FGvt5JTveb/U=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index b0ae8cfcea08..1c6034c8e2e4 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "doorbirdpy";
-  version = "3.0.5";
+  version = "3.0.8";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "klikini";
     repo = "doorbirdpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-SVkprX9fMy1uGixsxsE7gbUJndvl+V/kle3Rq34S6Hs=";
+    hash = "sha256-UayXJhfiiwB2aXCa5V1U/LnNiV7KX4lpIG9hNG6iCm0=";
   };
 
   build-system = [ setuptools ];
@@ -35,11 +35,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # connection error on mock host
-    "test_info_auth_fails"
-  ];
-
   pythonImportsCheck = [ "doorbirdpy" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix
index b02da84182f7..6e7ff2f8afc8 100644
--- a/pkgs/development/python-modules/dramatiq/default.nix
+++ b/pkgs/development/python-modules/dramatiq/default.nix
@@ -10,25 +10,28 @@
   pylibmc,
   pytestCheckHook,
   redis,
+  setuptools,
   watchdog,
   watchdog-gevent,
 }:
 
 buildPythonPackage rec {
   pname = "dramatiq";
-  version = "1.17.0";
-  format = "setuptools";
+  version = "1.17.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "Bogdanp";
     repo = "dramatiq";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xKHTBo2AirxDXe/CLSqo++3AgxP4pVkGTNdgS5CCZ3c=";
+    hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4=";
   };
 
-  propagatedBuildInputs = [ prometheus-client ];
+  build-system = [ setuptools ];
+
+  dependencies = [ prometheus-client ];
 
   optional-dependencies = {
     all = [
diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix
index e2f2c295a37a..8a919a74a6c9 100644
--- a/pkgs/development/python-modules/drms/default.nix
+++ b/pkgs/development/python-modules/drms/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "drms";
-  version = "0.7.1";
+  version = "0.8.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2VtAGRx0OnYdATK/ngNhffmQDjZfELYeTTPCdfkHAAc=";
+    hash = "sha256-LgHu7mTgiL3n2lVaOhppdWfQiM0CFkK+6z6eBkLxmKY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix
index a8481e78c744..7021d576bab4 100644
--- a/pkgs/development/python-modules/dtw-python/default.nix
+++ b/pkgs/development/python-modules/dtw-python/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dtw-python";
-  version = "1.4.4";
+  version = "1.5.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "DynamicTimeWarping";
     repo = "dtw-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9+0NxQAvhVeH9RcBPTr1CjIjTqTsiUz68UIne5dErvw=";
+    hash = "sha256-Q2TffroAGS6DeU5hUE/M2Luuxa5VfU+wxbGdfhcioSA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix
index cf5b3ed3568d..6c77fc97c016 100644
--- a/pkgs/development/python-modules/duckdb-engine/default.nix
+++ b/pkgs/development/python-modules/duckdb-engine/default.nix
@@ -9,6 +9,7 @@
   duckdb,
   hypothesis,
   pandas,
+  pyarrow,
   poetry-core,
   pytest-remotedata,
   snapshottest,
@@ -18,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "duckdb-engine";
-  version = "0.13.2";
+  version = "0.13.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +28,7 @@ buildPythonPackage rec {
     repo = "duckdb_engine";
     owner = "Mause";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zao8kzzQbnjwJqjHyqDkgmXa3E9nlBH2W0wh7Kjk/qw=";
+    hash = "sha256-B9vh8OILmRZKKznBbEkkm3zlAwGwMGdiuc378msiywE=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -48,6 +49,7 @@ buildPythonPackage rec {
     pandas
     pytest-remotedata
     typing-extensions
+    pyarrow
   ] ++ lib.optionals (pythonOlder "3.12") [
     # requires wasmer which is broken for python 3.12
     # https://github.com/wasmerio/wasmer-python/issues/778
diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index ca69dba4338f..f46263cc70b2 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   pythonOlder,
   setuptools,
-  pyreqwest-impersonate,
+  primp,
 
   # Optional dependencies
   lxml,
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "duckduckgo-search";
-  version = "6.1.12";
+  version = "6.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,14 +22,14 @@ buildPythonPackage rec {
     owner = "deedy5";
     repo = "duckduckgo_search";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HidBPd69Fihx6+fGifil0PSZ7lGfW+qStzma8Npfmes=";
+    hash = "sha256-5AuPAv78ePrnCr5L4CfIu/fq7Ha19zC78zg8JLu3U2A=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     click
-    pyreqwest-impersonate
+    primp
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index 3ee9866f98c5..e565ae8b85d3 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dunamai";
-  version = "1.21.1";
+  version = "1.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = "dunamai";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dsL1MhlL1Yjj06D0z2FzZ53Frfp4U+5dXA9vPjU+pvY=";
+    hash = "sha256-oOchPGBRHf3PT1Ynci56CF/eW4TkRVPV9inVNX2QQrk=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 973231836767..902e3e3428bb 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "3.16.6";
+  version = "3.16.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc-data";
     rev = "refs/tags/${version}";
-    hash = "sha256-2KYAFNCh6QfGdTzHE5LCumWoi+DM4t857qg6LrFO5x4=";
+    hash = "sha256-HT+IcfUA1QMkWhQKNwjKexzG04WJj+WTyHV+15DDoCI=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index ee197c22044c..9e572eb3d964 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -57,7 +57,7 @@
 
 buildPythonPackage rec {
   pname = "dvc";
-  version = "3.55.2";
+  version = "3.56.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -66,7 +66,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc";
     rev = "refs/tags/${version}";
-    hash = "sha256-yNnOSYh4lCefTnIgNstsKaRbrPCgSiWEgKeF66KD66k=";
+    hash = "sha256-9TV+YQ9UFgqr3IoM0indUYa48O+mhfNxzAI56UtB3+Y=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index 9c801e132f8b..9af1c37cbd33 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -2,42 +2,63 @@
   lib,
   buildPythonPackage,
   django,
-  fetchPypi,
+  fetchFromGitHub,
   pillow,
   pythonOlder,
   reportlab,
   svglib,
+  pytestCheckHook,
+  pytest-django,
+  setuptools,
+  testfixtures,
 }:
 
 buildPythonPackage rec {
   pname = "easy-thumbnails";
-  version = "2.8.5";
-  format = "setuptools";
+  version = "2.10.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-fk6RJgn8m2Czof72VX7BXd+cT5RiZ6kuaSDf1N12XjU=";
+  src = fetchFromGitHub {
+    owner = "SmileyChris";
+    repo = "easy-thumbnails";
+    rev = "refs/tags/${version}";
+    hash = "sha256-8JTHYQIBbu/4fknK2ZEQeDSgaxKGDfflxumcFMpaGQk=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     django
     pillow
-    svglib
     reportlab
+    svglib
   ];
 
-  # Tests require a Django instance which is setup
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-django
+  ];
+
+  checkInputs = [ testfixtures ];
+
+  disabledTests = [
+    # AssertionError: 'ERROR' != 'INFO'
+    "test_postprocessor"
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE="easy_thumbnails.tests.settings"
+  '';
 
   pythonImportsCheck = [ "easy_thumbnails" ];
 
-  meta = with lib; {
+  meta = {
     description = "Easy thumbnails for Django";
     homepage = "https://github.com/SmileyChris/easy-thumbnails";
     changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.onny ];
   };
 }
diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix
index 6daec8eb775d..b6be5dbc540c 100644
--- a/pkgs/development/python-modules/ecos/default.nix
+++ b/pkgs/development/python-modules/ecos/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "ecos";
-  version = "2.0.13";
+  version = "2.0.14";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,10 +20,15 @@ buildPythonPackage rec {
     owner = "embotech";
     repo = "ecos-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3NcZBZ7fnwiMelGssa74b5PgmXmNZhP4etNRpyrCkpo=";
+    hash = "sha256-nfu1FicWr233r+VHxkQf1vqh2y4DGymJRmik8RJYJkA=";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy >= 2.0.0" numpy
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix
index f6b18b372149..e4c6fcbfdaba 100644
--- a/pkgs/development/python-modules/editdistpy/default.nix
+++ b/pkgs/development/python-modules/editdistpy/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "editdistpy";
-  version = "0.1.4";
+  version = "0.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "mammothb";
     repo = "editdistpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-OSJXiuJtZ4w1IiRaZQZH2DDxA0AGoRHp0BKXdysff0Y=";
+    hash = "sha256-kTaJkx1fdd2Rl4uhzxdZAFP/ArsM0qTPweJ1jlUcjxQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 307e5da468a2..cb4fcf18f263 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "eigenpy";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = false; # Built with cmake
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "eigenpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ac667pEKXcbLLzCVGKYpyCQO805qhCEf8dCnC4QwxBs=";
+    hash = "sha256-9hKYCCKgPn1IJDezX/ARJHr5+0ridmGd1b3k/ZaVRG0=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/einx/default.nix b/pkgs/development/python-modules/einx/default.nix
new file mode 100644
index 000000000000..0f181b5051aa
--- /dev/null
+++ b/pkgs/development/python-modules/einx/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  wheel,
+  numpy,
+  sympy,
+  frozendict,
+}:
+
+buildPythonPackage rec {
+  pname = "einx";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fferflo";
+    repo = "einx";
+    rev = "v${version}";
+    hash = "sha256-lbcf47h1tW1fj94NLG4iJPEs6ziGPkcX1Q+wn59PvS8=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    numpy
+    sympy
+    frozendict
+  ];
+
+  pythonImportsCheck = [
+    "einx"
+  ];
+
+  meta = {
+    description = "Universal Tensor Operations in Einstein-Inspired Notation for Python";
+    homepage = "https://github.com/fferflo/einx";
+    changelog = "https://github.com/fferflo/einx/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ happysalada ];
+  };
+}
diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix
index 4f569fc29a53..2e333376bb93 100644
--- a/pkgs/development/python-modules/elastic-transport/default.nix
+++ b/pkgs/development/python-modules/elastic-transport/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "elastic-transport";
-  version = "8.13.1";
+  version = "8.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "elastic";
     repo = "elastic-transport-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zxx5BvqQf5ipaOANKpThWUTsfhDkNMJqUejAWH68wpo=";
+    hash = "sha256-5bNsJd0td3aQR+PvDBHg0/f+qPyt/ckWmeDrQJzxhYY=";
   };
 
   postPatch = ''
@@ -77,6 +77,7 @@ buildPythonPackage rec {
     "test_debug_logging_no_body"
     "test_httpbin"
     "test_sniffed_nodes_added_to_pool"
+    "test_async_transport_httpbin"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index bd9b460356cb..4c5abd162b56 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -1,28 +1,39 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
   elasticsearch,
+  fetchPypi,
   python-dateutil,
-  six,
+  pythonOlder,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "elasticsearch-dsl";
-  version = "8.14.0";
-  format = "setuptools";
+  version = "8.15.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc=";
+    pname = "elasticsearch_dsl";
+    inherit version;
+    hash = "sha256-QAX6Gr71wK3FJmiWwxd9Dpj/WsSWA8Nt2pBY1hb3klc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     elasticsearch
     python-dateutil
-    six
+    typing-extensions
   ];
 
+  optional-dependencies = {
+    async = [ elasticsearch ] ++ elasticsearch.optional-dependencies.async;
+  };
+
   # ImportError: No module named test_elasticsearch_dsl
   # Tests require a local instance of elasticsearch
   doCheck = false;
@@ -35,6 +46,7 @@ buildPythonPackage rec {
       the official low-level client (elasticsearch-py).
     '';
     homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py";
+    changelog = "https://github.com/elastic/elasticsearch-dsl-py/blob/v${version}/Changelog.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ desiderius ];
   };
diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 68621f96c151..9133ae2d9694 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -2,36 +2,36 @@
   lib,
   aiohttp,
   buildPythonPackage,
-  certifi,
   elastic-transport,
   fetchPypi,
+  hatchling,
+  orjson,
+  pyarrow,
   pythonOlder,
   requests,
-  urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "elasticsearch";
-  version = "8.14.0";
-  format = "setuptools";
+  version = "8.15.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs=";
+    hash = "sha256-QMDTEvit+L3IF5W8FqC1Rt31RMsfkOgpokTkeAxNv9g=";
   };
 
-  nativeBuildInputs = [ elastic-transport ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
-    urllib3
-    certifi
-  ];
+  dependencies = [ elastic-transport ];
 
   optional-dependencies = {
     requests = [ requests ];
     async = [ aiohttp ];
+    orjson = [ orjson ];
+    pyarrow = [ pyarrow ];
   };
 
   pythonImportsCheck = [ "elasticsearch" ];
diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index 3428dfbff8b6..662c36e6709b 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -4,25 +4,25 @@
   buildPythonPackage,
   elastic-transport,
   fetchPypi,
+  hatchling,
   orjson,
   pythonOlder,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "elasticsearch8";
-  version = "8.14.0";
+  version = "8.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JiiJSjdWAocHvQ9RCGTUJD05hoSE23LYxvzMlELJUfM=";
+    hash = "sha256-DLxNuA25hQ5p1I2QSrrpLid6EI/0hmaF+zFYE1pS2SE=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [ elastic-transport ];
 
diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index d2d661cb3b0f..cd29238f4bbd 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "elevenlabs";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-puYRVPWMNV+nOHwa//hZQAq1pAkNeU5CFjlMls9C7MM=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0fkt2Z05l95b2S+xoyyy9VGAUZDI1SM8kdcP1PCrUg8=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index 0a0bb89d89bd..91140f18a26e 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "2.13.0";
+  version = "2.13.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "carpedm20";
     repo = "emoji";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FTQTbp5Ud3CyqkAiGvY8hBOKnvFR29CgZPbz4eZp/ik=";
+    hash = "sha256-1oFzuIA2HFoBw50HHYi8bGZTAAeC6fesSnLReuXUZcM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix
index 018e0240ca65..347a8145ba24 100644
--- a/pkgs/development/python-modules/empy/default.nix
+++ b/pkgs/development/python-modules/empy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "empy";
-  version = "4.1";
+  version = "4.2";
   format = "setuptools";
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c=";
+    hash = "sha256-hvFeHal0Pnmi6bLLrPGhPQt/sYNbYlTrJTyXi3Iof08=";
   };
   pythonImportsCheck = [ "em" ];
   meta = with lib; {
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index d08c69cee9e5..9a7c3955d0e1 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "enaml";
-  version = "0.17.0";
+  version = "0.18.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "nucleic";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-DYLDQ9QwdK/a8eY0bFX31UNgxm8FUOaeNAnisFcyFNI=";
+    hash = "sha256-XwBvPABg4DomI5JNuqaRTINsPgjn8h67rO/ZkSRQ39o=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix
index f997ff471ef9..e50716358b98 100644
--- a/pkgs/development/python-modules/es-client/default.nix
+++ b/pkgs/development/python-modules/es-client/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "es-client";
-  version = "8.14.4";
+  version = "8.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "untergeek";
     repo = "es_client";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CJhiSDmIlhTWV7LLWd2ZCzuj5cWXwgh0lkKJvhmaDFw=";
+    hash = "sha256-t/d+aZ11JU9vhZIRkZcsahW8HzEkxbgIc5Zua4WPMjg=";
   };
 
   pythonRelaxDeps = true;
@@ -69,6 +69,8 @@ buildPythonPackage rec {
     "test_multiple_hosts_raises"
     "test_non_dict_passed"
     "test_skip_version_check"
+    # Test wants to handle credentials
+    "test_logging_options_from_config_file"
     # es_client.exceptions.ConfigurationError: Must populate both username and password, or leave both empty
     "test_exit_if_not_master "
   ];
diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix
index e105afb48ae4..366306d6302c 100644
--- a/pkgs/development/python-modules/etcd3/default.nix
+++ b/pkgs/development/python-modules/etcd3/default.nix
@@ -11,12 +11,13 @@
   pytestCheckHook,
   six,
   tenacity,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "etcd3";
   version = "0.12.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kragniz";
@@ -25,7 +26,15 @@ buildPythonPackage rec {
     hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  env = {
+    # make protobuf compatible with old versions
+    # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
+  dependencies = [
     grpcio
     protobuf
     six
@@ -49,10 +58,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "etcd3" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python client for the etcd API v3";
     homepage = "https://github.com/kragniz/python-etcd3";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ moraxyc ];
   };
 }
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 24f9ef57ed68..88bb8a599aba 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.35.2";
+  version = "0.37.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eventlet";
     repo = "eventlet";
-    rev = "v${version}";
-    hash = "sha256-jMbCxqIn9f9+16rFwpQdkBHj6NwTNkQxnSVV4qQ1fjM=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-R/nRHsz4z4phG51YYDwkGqvnXssGoiJxIPexuhAf0BI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index c39354ac24cc..4c2fcebe39a9 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "exceptiongroup";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "exceptiongroup";
     rev = "refs/tags/${version}";
-    hash = "sha256-87HmZsbsoV7QPHux50sYsFY2RaIc3627dH3WAwqXfQU=";
+    hash = "sha256-k88+9FpB/aBun73SnsN6GsBceSUekT8Ig1XBt3hO4ok=";
   };
 
   nativeBuildInputs = [ flit-scm ];
diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix
index ba846ebbab32..8001dadabb5e 100644
--- a/pkgs/development/python-modules/expiring-dict/default.nix
+++ b/pkgs/development/python-modules/expiring-dict/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "expiring-dict";
-  version = "1.1.0";
+  version = "1.1.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PEBK2x5DaUaMt+Ub+8nEcNfi6GPv4qHHXU7XBtDc4aY=";
+    hash = "sha256-J3lC7cYNWxI0V8GkaGmMlJI9v6yNQLJjuSHATmlA3Ak=";
   };
 
   propagatedBuildInputs = [ sortedcontainers ];
diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix
index 45959765581f..5fd8e5ff6df7 100644
--- a/pkgs/development/python-modules/extract-msg/default.nix
+++ b/pkgs/development/python-modules/extract-msg/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "extract-msg";
-  version = "0.50.1";
+  version = "0.52.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "TeamMsgExtractor";
     repo = "msg-extractor";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MWqJYdv+P87n5KtrtSJnyY59uuLtHL9EG8WyYRdfSTw=";
+    hash = "sha256-4jvzZkGa/xI5Sl9TBIm/BD3tGl+MZvwir6m/zrvA4tQ=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix
index 350ff622f6c2..6d9ff4548eb4 100644
--- a/pkgs/development/python-modules/extractcode/default.nix
+++ b/pkgs/development/python-modules/extractcode/default.nix
@@ -10,13 +10,14 @@
   pythonOlder,
   setuptools-scm,
   six,
+  setuptools,
   typecode,
 }:
 
 buildPythonPackage rec {
   pname = "extractcode";
   version = "31.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -33,9 +34,9 @@ buildPythonPackage rec {
 
   dontConfigure = true;
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     typecode
     patch
     extractcode-libarchive
@@ -67,16 +68,18 @@ buildPythonPackage rec {
     "test_patch_info_patch_patches_windows_plugin_explorer_patch"
     # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]]
     "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch"
+    # extractcode.libarchive2.ArchiveErrorRetryable: Damaged tar archive
+    "test_extract_python_testtar_tar_archive_with_special_files"
   ];
 
   pythonImportsCheck = [ "extractcode" ];
 
   meta = with lib; {
     description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library";
-    mainProgram = "extractcode";
-    homepage = "https://github.com/nexB/extractcode";
-    changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}";
+    homepage = "https://github.com/aboutcode-org/extractcode";
+    changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = [ ];
+    mainProgram = "extractcode";
   };
 }
diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix
index 516eb08e4f46..8c92b3dbed46 100644
--- a/pkgs/development/python-modules/facedancer/default.nix
+++ b/pkgs/development/python-modules/facedancer/default.nix
@@ -1,37 +1,57 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  isPy3k,
+  fetchFromGitHub,
+  pythonOlder,
   pyusb,
   pyserial,
+  prompt-toolkit,
+  libusb1,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "facedancer";
-  version = "2019.3.2";
-  format = "setuptools";
+  version = "3.0.4";
+  pyproject = true;
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1zhwnlfksblgp54njd9gjsrr5ibg12cx1x9xxcqkcdfhn3m2kmm0";
+  src = fetchFromGitHub {
+    owner = "greatscottgadgets";
+    repo = "facedancer";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Cl6cohelJkpr2Nokfwwm7GQIg7ZipPL3v44JVWsHUNI=";
   };
 
-  disabled = !isPy3k;
-
-  propagatedBuildInputs = [
-    pyusb
-    pyserial
-  ];
-
-  preBuild = ''
-    echo "$version" > VERSION
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  meta = with lib; {
-    description = "library for emulating usb devices";
-    homepage = "https://greatscottgadgets.com/greatfet/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ mog ];
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pyusb
+    pyserial
+    prompt-toolkit
+    libusb1
+  ];
+
+  pythonImportsCheck = [
+    "facedancer"
+  ];
+
+  meta = {
+    changelog = "https://github.com/greatscottgadgets/facedancer/releases/tag/${version}";
+    description = "Implement your own USB device in Python, supported by a hardware peripheral such as Cynthion or GreatFET";
+    homepage = "https://github.com/greatscottgadgets/facedancer";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      mog
+      carlossless
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/factory-boy/default.nix b/pkgs/development/python-modules/factory-boy/default.nix
index 8b93fec4f8d9..b7362eb13913 100644
--- a/pkgs/development/python-modules/factory-boy/default.nix
+++ b/pkgs/development/python-modules/factory-boy/default.nix
@@ -9,42 +9,44 @@
   mongoengine,
   pytestCheckHook,
   pythonOlder,
+  mongomock,
   sqlalchemy,
   sqlalchemy-utils,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "factory-boy";
-  version = "3.3.0";
-  format = "setuptools";
+  version = "3.3.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "factory_boy";
     inherit version;
-    hash = "sha256-vHbZfRplu9mEKm1yKIIJjrVJ7I7hCB+fsuj/KfDDAPE=";
+    hash = "sha256-gxeqUonN/EX5yuVw/rB6YXcxbILjTRTfPC4fIvJqvvA=";
   };
 
-  postPatch = ''
-    substituteInPlace tests/test_version.py \
-      --replace '"3.2.1.dev0")' '"${version}")'
-  '';
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ faker ];
+  dependencies = [ faker ];
 
   nativeCheckInputs = [
     django
     flask
     flask-sqlalchemy
     mongoengine
+    mongomock
     pytestCheckHook
     sqlalchemy
     sqlalchemy-utils
   ];
 
-  # Checks for MongoDB requires an a running DB
-  disabledTests = [ "MongoEngineTestCase" ];
+  disabledTests = [
+    # Test checks for MongoDB requires an a running DB
+    "MongoEngineTestCase"
+  ];
 
   disabledTestPaths = [
     # incompatible with latest flask-sqlalchemy
@@ -57,7 +59,7 @@ buildPythonPackage rec {
     description = "Python package to create factories for complex objects";
     homepage = "https://github.com/rbarrois/factory_boy";
     changelog = "https://github.com/FactoryBoy/factory_boy/blob/${version}/docs/changelog.rst";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix
index 138c7ab0980d..3d15da8d064b 100644
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -27,22 +27,25 @@ buildPythonPackage rec {
     sed -i '/addopts/d' pytest.ini
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs =
-    [ ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
+  dependencies =
+    lib.optionals (pythonOlder "3.10") [ importlib-resources ]
     ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "fake_useragent" ];
 
-  meta = with lib; {
+  disabledTests = lib.optionals (pythonOlder "3.12") [
+    "test_utils_load_pkg_resource_fallback"
+  ];
+
+  meta = {
+    changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}";
     description = "Up to date simple useragent faker with real world database";
     homepage = "https://github.com/hellysmile/fake-useragent";
-    changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ evanjs ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ evanjs ];
   };
 }
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index babcc2423d35..504589a33ca3 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "faker";
-  version = "25.8.0";
+  version = "25.9.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "Faker";
     inherit version;
-    hash = "sha256-vexfL7BX0kTr724O0xj+pNy98yw6GgEHZvxF9daPxo0=";
+    hash = "sha256-ypSENgCkCJqROUAj/vAUu0H+5Qn4xL7vFTABg3PncPs=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 4aa0af9aa8db..4a98f804f9cb 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -12,12 +12,13 @@
   pytestCheckHook,
   pythonOlder,
   redis,
+  redis-server,
   sortedcontainers,
 }:
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.23.5";
+  version = "2.25.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gwTOtwBOHl6FNL0ekOq2rewwT/XoQ31+cyxU/OCBOTA=";
+    hash = "sha256-HjId4SueqkbC319Eel8G85ZOj72ZKEVEH2D8V/GfXi4=";
   };
 
   build-system = [ poetry-core ];
@@ -53,6 +54,17 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "fakeredis" ];
 
+  pytestFlagsArray = [ "-m 'not slow'" ];
+
+  preCheck = ''
+    ${lib.getExe' redis-server "redis-server"} --port 6390 &
+    REDIS_PID=$!
+  '';
+
+  postCheck = ''
+    kill $REDIS_PID
+  '';
+
   disabledTests = [
     # AssertionError
     "test_command"
diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
index a9ce3ef4a451..0eec5c5cb6e0 100644
--- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "faraday-agent-parameters-types";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "faraday_agent_parameters_types";
     inherit version;
-    hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w=";
+    hash = "sha256-9+scGbRITK25XLJOMsMzPj/y5Wi05mB0dcXDhon9Cf4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix
index 620b992fb202..ede86f1341e8 100644
--- a/pkgs/development/python-modules/fastai/default.nix
+++ b/pkgs/development/python-modules/fastai/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "fastai";
-  version = "2.7.15";
+  version = "2.7.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8swg/RjN9exzjMVtKdVN51iH1IrRX501z1DDjTqFaSM=";
+    hash = "sha256-g1UwIkdXO5X9jx5zgjbTYBkA0CEDgCKY9rhz8qXU2Io=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix
index bfbfa0509a21..071b1cd0c9cf 100644
--- a/pkgs/development/python-modules/fastapi-cli/default.nix
+++ b/pkgs/development/python-modules/fastapi-cli/default.nix
@@ -13,25 +13,27 @@
 
 let self = buildPythonPackage rec {
   pname = "fastapi-cli";
-  version = "0.0.4";
+  version = "0.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "fastapi-cli";
-    rev = version;
-    hash = "sha256-eWvZn7ZeLnQZAvGOzY77o6oO5y+QV2cx+peBov9YpJE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-hUS9zkDJJB51X+e31RvyxcGAP8j4oulAPFAvEMPiIn8=";
   };
 
   build-system = [ pdm-backend ];
 
-  dependencies = [ typer ];
+  dependencies = [
+    typer
+    uvicorn
+  ] ++ uvicorn.optional-dependencies.standard;
 
   optional-dependencies = {
     standard = [
-      fastapi
       uvicorn
-    ];
+    ] ++ uvicorn.optional-dependencies.standard;
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix
index c5ca2e98e2b0..103376e4ad40 100644
--- a/pkgs/development/python-modules/fastapi-sso/default.nix
+++ b/pkgs/development/python-modules/fastapi-sso/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi-sso";
-  version = "0.15.0";
+  version = "0.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "tomasvotava";
     repo = "fastapi-sso";
     rev = "refs/tags/${version}";
-    hash = "sha256-jSUogf2Dup8k4BOQAXJwg8R96Blgieg82/X/n1TLnL0=";
+    hash = "sha256-CkYAF2GmVCooyHt3Tua6ClYMbgyLosqSa8z/zkV2eIE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 81e51b02150f..1f29059bba72 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -16,6 +16,7 @@
   # tests
   dirty-equals,
   flask,
+  inline-snapshot,
   passlib,
   pyjwt,
   pytest-asyncio,
@@ -39,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.112.0";
+  version = "0.115.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -48,7 +49,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = "fastapi";
     rev = "refs/tags/${version}";
-    hash = "sha256-M09yte0BGC5w3AZSwDUr9qKUrotqVklO8mwyms9B95Y=";
+    hash = "sha256-TewFTbYdWIHcgRH+YNxNEUZVlaUn2aTZ0YFmDPrPZl4=";
   };
 
   build-system = [ pdm-backend ];
@@ -86,6 +87,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     dirty-equals
     flask
+    inline-snapshot
     passlib
     pyjwt
     pytestCheckHook
diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix
index ec14d3b0dfd3..42ae02fea649 100644
--- a/pkgs/development/python-modules/faster-whisper/default.nix
+++ b/pkgs/development/python-modules/faster-whisper/default.nix
@@ -35,8 +35,8 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
-    "tokenizers"
     "av"
+    "tokenizers"
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix
index 447dbb8e0f24..158050a9af77 100644
--- a/pkgs/development/python-modules/ffcv/default.nix
+++ b/pkgs/development/python-modules/ffcv/default.nix
@@ -6,7 +6,7 @@
   lib,
   libjpeg,
   numba,
-  opencv4,
+  opencv-python,
   pandas,
   pkg-config,
   pytorch-pfn-extras,
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace-fail "'assertpy'," "" \
       --replace-fail "'fastargs'," "" \
-      --replace-fail "'opencv-python'," "" \
       --replace-fail "'psutil'," "" \
   '';
 
@@ -48,7 +47,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libjpeg ];
   propagatedBuildInputs = [
-    opencv4
+    opencv-python
     numba
     pandas
     pytorch-pfn-extras
diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix
index 518687e15d7e..d847ee08e9ed 100644
--- a/pkgs/development/python-modules/fhir-py/default.nix
+++ b/pkgs/development/python-modules/fhir-py/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fhir-py";
-  version = "2.0.4";
+  version = "2.0.11";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "beda-software";
     repo = "fhir-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WDYDQqeNwt4cKEgF+HqMOuEwUezS10YUOZp+eAui6nM=";
+    hash = "sha256-ts4BT/YVfejyemEy8B9aAJuA9h1a5F/SoIAkDVem7mQ=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 7edfa503f2e9..3aa7faeae458 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   hatch-vcs,
   hatchling,
+  pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -11,26 +12,34 @@
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.15.1";
-  format = "pyproject";
+  version = "3.16.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WKJUmv354C4Qcg6qTURw9WOG16b3Lt19BZYzevjtetg=";
+    hash = "sha256-wkn7/NXbR+Xi1tYhmOVlR17mXkgx4lYcjjE/p+uWFDU=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytest-mock
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "filelock" ];
+
+  disabledTestPaths = [
+    # Circular dependency with virtualenv
+    "tests/test_virtualenv.py"
+  ];
+
   meta = with lib; {
     changelog = "https://github.com/tox-dev/py-filelock/releases/tag/${version}";
     description = "Platform independent file lock for Python";
diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index f63a5a37324c..deaaf1fd1adf 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -13,7 +13,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.1.0";
+  version = "4.2.0";
   pname = "fints";
   pyproject = true;
 
@@ -23,14 +23,10 @@ buildPythonPackage rec {
     owner = "raphaelm";
     repo = "python-fints";
     rev = "v${version}";
-    hash = "sha256-1k6ZeYlv0vxNkqQse9vi/NT6ag3DJONKCWB594LvER0=";
+    hash = "sha256-BM57Ov36DEJVH5DBm/mJife16iaFfjlQrF0IXRziM2A=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "enum-tools~=0.9.0" ""
-    sed -i "/document_enum/d" fints/formals.py
-  '';
+  pythonRemoveDeps = [ "enum-tools" ];
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index 64efa21f8ced..b5e02f5b7c6b 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "flask-appbuilder";
-  version = "4.5.0";
+  version = "4.5.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Flask-AppBuilder";
     inherit version;
-    hash = "sha256-CoQ5/pOR1xy71koUm1uwTJDLTDROTjJQMW9ZcgtzV50=";
+    hash = "sha256-S2EmfYgCmZFZUcbNEghW4Qc0TO6KEb6DJyXCH5vcX1k=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index 130c767c39f4..c0239f2a6c86 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -6,6 +6,7 @@
   setuptools,
   setuptools-scm,
   flask,
+  flask-caching,
   zstandard,
   brotli,
   brotlicffi,
@@ -13,7 +14,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.15";
+  version = "1.17";
   pname = "flask-compress";
   pyproject = true;
 
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "colour-science";
     repo = "flask-compress";
     rev = "refs/tags/v${version}";
-    hash = "sha256-J7d/OIUsDWM6DoXS0P4EOE3k6txXKm6m4Yq/EJk6FRE=";
+    hash = "sha256-87fjJxaS7eJbOkSUljnhqFIeahoS4L2tAOhmv4ryVUM=";
   };
 
   build-system = [
@@ -34,7 +35,10 @@ buildPythonPackage rec {
     zstandard
   ] ++ lib.optionals (!isPyPy) [ brotli ] ++ lib.optionals isPyPy [ brotlicffi ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    flask-caching
+  ];
 
   pythonImportsCheck = [ "flask_compress" ];
 
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index b9d62fcbd8e0..cd788642dd5c 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "flask-cors";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corydolphin";
     repo = "flask-cors";
     rev = "refs/tags/${version}";
-    hash = "sha256-ISot5KglCjfbJNsnveDLK44vVaapHRAFdS+1tOd08pw=";
+    hash = "sha256-I1iCnUT0+ZThf+c9Vm9GgH5hYL/pcBReOjKJGRNsRrg=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
index 6c256c496835..68ce1cd451ed 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -25,9 +25,9 @@ buildPythonPackage rec {
     hash = "sha256-GQLkt/CJf/QI8emvlW8xSRziGnncwfMSxBccW0Bb8I0=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     flask
     marshmallow
   ];
diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index ca27a3292c05..5b25b9fc610e 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -59,6 +59,9 @@ buildPythonPackage rec {
     # Broke in werkzeug 2.3 upgrade
     "test_media_types_method"
     "test_media_types_q"
+    # time shenanigans
+    "test_iso8601_date_field_with_offset"
+    "test_rfc822_date_field_with_offset"
   ];
 
   pythonImportsCheck = [ "flask_restful" ];
diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix
index 675afdcb2b38..b1ef27fb3c67 100644
--- a/pkgs/development/python-modules/flask-session-captcha/default.nix
+++ b/pkgs/development/python-modules/flask-session-captcha/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "flask-session-captcha";
-  version = "1.4.2";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Tethik";
     repo = "flask-session-captcha";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hf6ifTrsWvgvUHFAPdS8ns8aKN02zquLGCq5ouQF0ck=";
+    hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 4f93bd4f8ea5..9ee281ed5dba 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -21,26 +21,31 @@
   # checks
   cloudpickle,
   einops,
+  flaxlib,
   keras,
-  pytest-xdist,
   pytestCheckHook,
+  pytest-xdist,
+  sphinx,
   tensorflow,
   treescope,
 
   # optional-dependencies
   matplotlib,
+
+  writeScript,
+  tomlq,
 }:
 
 buildPythonPackage rec {
   pname = "flax";
-  version = "0.9.0";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flax";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iDWuUJKO7V4QrbVsS4ALgy6fbllOC43o7W4mhjtZ9xc=";
+    hash = "sha256-+URbQGnmqmSNgucEyWvI5DMnzXjpmJzLA+Pho2lX+S4=";
   };
 
   build-system = [
@@ -69,9 +74,11 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     cloudpickle
     einops
+    flaxlib
     keras
-    pytest-xdist
     pytestCheckHook
+    pytest-xdist
+    sphinx
     tensorflow
     treescope
   ];
@@ -108,6 +115,14 @@ buildPythonPackage rec {
     "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ...
   ];
 
+  passthru = {
+    updateScript = writeScript "update.sh" ''
+      nix-update flax # does not --build by default
+      nix-build . -A flax.src # src is essentially a passthru
+      nix-update flaxlib --version="$(${lib.getExe tomlq} =5.2",' ""
+    # webcolors API change, https://github.com/Danielhiversen/flux_led/issues/401
+    substituteInPlace flux_led/utils.py \
+      --replace-fail "CSS2_HEX_TO_NAMES.values()" 'names("css2")' \
+      --replace-fail "CSS21_HEX_TO_NAMES.values()" 'names("css21")' \
+      --replace-fail "CSS3_HEX_TO_NAMES.values()" 'names("css3")' \
+      --replace-fail "HTML4_HEX_TO_NAMES.values()" 'names("html4")'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     async-timeout
     webcolors
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pytest-runner>=5.2",' ""
-  '';
-
   pytestFlagsArray = [ "tests.py" ];
 
   pythonImportsCheck = [ "flux_led" ];
 
+  # disabledTests = [
+  #   # AttributeError: module 'webcolors' has no attribute 'CSS2_HEX_TO_NAMES'
+  #   "test_get_color_names_list"
+  # ];
+
   meta = with lib; {
     description = "Python library to communicate with the flux_led smart bulbs";
-    mainProgram = "flux_led";
     homepage = "https://github.com/Danielhiversen/flux_led";
     changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ colemickens ];
     platforms = platforms.linux;
+    mainProgram = "flux_led";
   };
 }
diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix
index 489a86fd002a..5d7a30fdfa50 100644
--- a/pkgs/development/python-modules/fontbakery/default.nix
+++ b/pkgs/development/python-modules/fontbakery/default.nix
@@ -47,14 +47,14 @@
 
 buildPythonPackage rec {
   pname = "fontbakery";
-  version = "0.12.9";
+  version = "0.12.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8=";
+    hash = "sha256-+9O7cAE6CUATvybG22qULNNHi94zSGqU9UjhvrF9R8k=";
   };
 
   env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix
index e37bdd0ade4d..95392c1aa5b6 100644
--- a/pkgs/development/python-modules/fontmath/default.nix
+++ b/pkgs/development/python-modules/fontmath/default.nix
@@ -10,15 +10,14 @@
 
 buildPythonPackage rec {
   pname = "fontmath";
-  version = "0.9.3";
+  version = "0.9.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "fontMath";
-    inherit version;
-    hash = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw=";
+    inherit pname version;
+    hash = "sha256-H9kZDJ14ThMFw8SXcbkdkQ8kakt8RO3iGcmaB+167aQ=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index d8eb655b4924..21a89983447e 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -21,33 +21,23 @@
 
 buildPythonPackage rec {
   pname = "fontparts";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "fontParts";
-    inherit version;
-    hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA=";
+    inherit pname version;
+    hash = "sha256-d41ZVJOiCPITRjgGajBZh2JhnV345yPTCiTEGJzPoQ0=";
     extension = "zip";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # replace remaining usage of assertEquals for Python 3.12 support
-      # https://github.com/robotools/fontParts/pull/720
-      url = "https://github.com/robotools/fontParts/commit/d7484cd98051aa1588683136da0bb99eac31523b.patch";
-      hash = "sha256-maoUgbmXY/RC4TUZI4triA9OIfB4T98qjUaQ94uhsbg=";
-    })
-  ];
-
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs =
+  dependencies =
     [
       booleanoperations
       defcon
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 6898f34cb133..555c9cb9bf7b 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.53.1";
+  version = "4.54.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "fonttools";
     repo = "fonttools";
     rev = "refs/tags/${version}";
-    hash = "sha256-9fxC6OKXZkhih3BFyBqO4t6sKXyarYfFIqBk+WOSiRY=";
+    hash = "sha256-iYd3EiziaLR7zS0UQAje0QfShNfnhHPdH2+noCQ2yto=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/free-proxy/default.nix b/pkgs/development/python-modules/free-proxy/default.nix
index 4d67d2896149..8db5b1483af7 100644
--- a/pkgs/development/python-modules/free-proxy/default.nix
+++ b/pkgs/development/python-modules/free-proxy/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "free-proxy";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jundymek";
     repo = "free-proxy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5eYioshdqUC5QWHqMIU6+GvInihSOJxWvMlJ/xad/3I=";
+    hash = "sha256-8SxKGGifQTU0CUrtUQUtrmeq+Do4GIqNUWAdCt++eUA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 9e49e8c420c8..84afd730f495 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -6,23 +6,26 @@
   pytestCheckHook,
   requests,
   segno,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "1.13.2";
-  format = "setuptools";
+  version = "1.14.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "kbr";
-    repo = pname;
+    repo = "fritzconnection";
     rev = "refs/tags/${version}";
-    hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI=";
+    hash = "sha256-1LLfSEOKqUIhWIR/RQEG0Bp41d908hAKDlslJlWCHys=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   optional-dependencies = {
     qr = [ segno ];
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index e0c07195df49..9d1fded19c1b 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -1,56 +1,50 @@
 {
   lib,
-  glibcLocales,
+  stdenv,
+  appdirs,
   buildPythonPackage,
   fetchPypi,
+  glibcLocales,
+  mock,
+  psutil,
+  pyftpdlib,
+  pytestCheckHook,
+  pythonAtLeast,
+  pythonOlder,
+  pytz,
   setuptools,
   six,
-  appdirs,
-  scandir ? null,
-  backports_os ? null,
-  typing ? null,
-  pytz,
-  enum34,
-  pyftpdlib,
-  psutil,
-  mock,
-  pythonAtLeast,
-  isPy3k,
-  pytestCheckHook,
-  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "fs";
   version = "2.4.16";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ glibcLocales ];
 
-  # strong cycle with parameterized
-  doCheck = false;
+  dependencies = [
+    six
+    appdirs
+    pytz
+    setuptools
+  ];
+
   nativeCheckInputs = [
     pyftpdlib
     mock
     psutil
     pytestCheckHook
   ];
-  propagatedBuildInputs =
-    [
-      six
-      appdirs
-      pytz
-      setuptools
-    ]
-    ++ lib.optionals (!isPy3k) [ backports_os ]
-    ++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
-    ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]
-    ++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
 
   LC_ALL = "en_US.utf-8";
 
@@ -58,6 +52,9 @@ buildPythonPackage rec {
     HOME=$(mktemp -d)
   '';
 
+  # strong cycle with parameterized
+  doCheck = false;
+
   pytestFlagsArray = [ "--ignore=tests/test_opener.py" ];
 
   disabledTests =
@@ -77,6 +74,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Filesystem abstraction";
     homepage = "https://github.com/PyFilesystem/pyfilesystem2";
+    changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ lovek323 ];
     platforms = platforms.unix;
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index d51041828a64..ec5aca9062a6 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -1,11 +1,11 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
 
   # build-system
-  poetry-core,
+  hatchling,
 
   # dependencies
   wcwidth,
@@ -17,17 +17,19 @@
 
 buildPythonPackage rec {
   pname = "ftfy";
-  version = "6.2.3";
+  version = "6.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ebUFmI8p1XelipBpr+dVU6AqRuQt5gkcBmDNxngSutw=";
+  src = fetchFromGitHub {
+    owner = "rspeer";
+    repo = "python-ftfy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-TmwDJeUDcF+uOB2X5tMmnf9liCI9rP6dYJVmJoaqszo=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [ wcwidth ];
 
@@ -42,12 +44,8 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
-  disabledTestPaths = [
-    # Calls poetry and fails to match output exactly
-    "tests/test_cli.py"
-  ];
-
   meta = with lib; {
+    changelog = "https://github.com/rspeer/python-ftfy/blob/${src.rev}/CHANGELOG.md";
     description = "Given Unicode text, make its representation consistent and possibly less broken";
     mainProgram = "ftfy";
     homepage = "https://github.com/LuminosoInsight/python-ftfy";
diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix
index 26eab2292967..36e2f47663ed 100644
--- a/pkgs/development/python-modules/furo/default.nix
+++ b/pkgs/development/python-modules/furo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "furo";
-  version = "2024.5.6";
+  version = "2024.8.6";
   format = "wheel";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     inherit pname version format;
     dist = "py3";
     python = "py3";
-    hash = "sha256-SQoA0IwKN+zJDeA66SJ+jrXW9/dQ7fmAfzmKK98jWN4=";
+    hash = "sha256-bNl8WLR4E9NhnmPpCBFpiA++Mx8MqIPIcf8fPxGBT1w=";
   };
 
 
diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix
index 6e33666d6951..01c858c72906 100644
--- a/pkgs/development/python-modules/fusepy/default.nix
+++ b/pkgs/development/python-modules/fusepy/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # be able to find libfuse in /usr/local/lib.
   patchPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace fuse.py --replace \
-      "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'"
+      "find_library('fuse')" "'${lib.getLib pkgs.fuse}/lib/libfuse.so'"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index d5ba3d6ad82c..24bf6109e8ac 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/erfanoabdi/gbinder-python";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ mcaju ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix
deleted file mode 100644
index 7dd4d3a2c126..000000000000
--- a/pkgs/development/python-modules/gbulb/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools-scm,
-  pygobject3,
-  pytestCheckHook,
-  gtk3,
-  gobject-introspection,
-}:
-
-buildPythonPackage rec {
-  pname = "gbulb";
-  version = "0.6.5";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "beeware";
-    repo = "gbulb";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-03Ott+V3Y4+Y72Llsug5coqG3C+pjAdLkPYbaY/6Uow=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "==" ">="
-  '';
-
-  build-system = [ setuptools-scm ];
-
-  dependencies = [ pygobject3 ];
-
-  buildInputs = [ gtk3 ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    gobject-introspection
-  ];
-
-  disabledTests = [
-    "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing
-  ];
-
-  pythonImportsCheck = [ "gbulb" ];
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "GLib implementation of PEP 3156";
-    homepage = "https://github.com/beeware/gbulb";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ marius851000 ];
-  };
-}
diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 84e5eea81583..a6aad3f63261 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "0.5.28";
+  version = "0.5.29";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TAPuP0VFhKuWDzko/+Upq6GDGZJO9y6GuuV6GsSqi2I=";
+    hash = "sha256-sV5V+D0K02qmP9Z0WqYSvNsKTeXkdrY9CsRtvYq1JcE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 61ce59689b64..c13babd7e4d9 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -1,9 +1,10 @@
 {
   lib,
   buildPythonPackage,
-  cython,
+  cython_0,
+  oldest-supported-numpy,
+  setuptools,
   fetchPypi,
-  fetchpatch,
   mock,
   numpy,
   scipy,
@@ -15,29 +16,24 @@
 
 buildPythonPackage rec {
   pname = "gensim";
-  version = "4.3.2";
-  format = "setuptools";
+  version = "4.3.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  # C code generated with CPython3.12 does not work cython_0.
+  disabled = !(pythonOlder "3.12");
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-maxq9v/UBoLnAVXtn5Lsv0OE1Z+1CvEg00PqXuGzCKs=";
+    hash = "sha256-hIUgdqaj2I19rFviReJMIcO4GbVl4UwbYfo+Xudtz1c=";
   };
 
-  patches = [
-    # https://github.com/piskvorky/gensim/pull/3524
-    # Import deprecated scipy.linalg.triu from numpy.triu. remove on next update
-    (fetchpatch {
-      name = "scipi-linalg-triu-fix.patch";
-      url = "https://github.com/piskvorky/gensim/commit/ad68ee3f105fc37cf8db333bfb837fe889ff74ac.patch";
-      hash = "sha256-Ij6HvVD8M2amzcjihu5bo8Lk0iCPl3iIq0lcOnI6G2s=";
-    })
+  build-system = [
+    cython_0
+    oldest-supported-numpy
+    setuptools
   ];
 
-  nativeBuildInputs = [ cython ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     smart-open
     numpy
     scipy
@@ -49,6 +45,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pythonRelaxDeps = [
+    "scipy"
+  ];
+
   pythonImportsCheck = [ "gensim" ];
 
   # Test setup takes several minutes
diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix
index 45b9545397ab..d7440c5c43e8 100644
--- a/pkgs/development/python-modules/geoip2/default.nix
+++ b/pkgs/development/python-modules/geoip2/default.nix
@@ -3,15 +3,16 @@
   aiohttp,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
-  setuptools-scm,
+  h11,
   maxminddb,
   mocket,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
-  requests,
   requests-mock,
+  requests,
+  setuptools-scm,
+  setuptools,
   urllib3,
 }:
 
@@ -40,6 +41,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    h11
     mocket
     requests-mock
     pytestCheckHook
diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix
index 95084d373e82..21bfb3f5da39 100644
--- a/pkgs/development/python-modules/gflanguages/default.nix
+++ b/pkgs/development/python-modules/gflanguages/default.nix
@@ -44,6 +44,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    regex
     uharfbuzz
     youseedee
   ];
diff --git a/pkgs/development/python-modules/gfsubsets/default.nix b/pkgs/development/python-modules/gfsubsets/default.nix
index ff2db29a1eb2..ade037605dc2 100644
--- a/pkgs/development/python-modules/gfsubsets/default.nix
+++ b/pkgs/development/python-modules/gfsubsets/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "gfsubsets";
-  version = "2024.5.9";
+  version = "2024.9.25";
   gitTag = "v2024.02.05";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OgpdcOJWX0o0Hy6LjRsxsZMAVWgKziM+bqe/FfJniZY=";
+    hash = "sha256-jEuIBNQ89Le3Rbk0W4PLl9LE7rP0IcE6RAzyfhZb7lY=";
   };
 
   pyproject = true;
diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix
index 64b96698cc62..c3cb68d64fc0 100644
--- a/pkgs/development/python-modules/gguf/default.nix
+++ b/pkgs/development/python-modules/gguf/default.nix
@@ -6,23 +6,25 @@
   poetry-core,
   pythonOlder,
   tqdm,
+  pyyaml,
 }:
 buildPythonPackage rec {
   pname = "gguf";
-  version = "0.9.1";
+  version = "0.10.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9ecJh+FbGcVF9qn3UztAM/swYzDrHzxclf0osUw/0zs=";
+    hash = "sha256-UqMO8mMotBn/xH2SafxYDCOO3xyKGbXqFDwyPgSgOME=";
   };
 
   dependencies = [
     numpy
     poetry-core
     tqdm
+    pyyaml
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 7778ecd9ca88..e84c2321aaee 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -65,9 +65,11 @@ buildPythonPackage rec {
 
   disabledTests = [
     # KeyError and AssertionError
+    "test_annex_keys"
+    "test_batchjson_metadata"
+    "test_file_tree"
     "test_jsonprocess_annex_metadata_batch"
     "test_process_annex_metadata_batch"
-    "test_batchjson_metadata"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/git-dummy/default.nix b/pkgs/development/python-modules/git-dummy/default.nix
new file mode 100644
index 000000000000..2fffa2d6e06c
--- /dev/null
+++ b/pkgs/development/python-modules/git-dummy/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  installShellFiles,
+  setuptools,
+  gitpython,
+  typer,
+  pydantic-settings,
+}:
+
+buildPythonPackage rec {
+  pname = "git-dummy";
+  version = "0.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "initialcommit-com";
+    repo = "git-dummy";
+    rev = "v${version}";
+    hash = "sha256-viybxn2J7SO7NgSvjwlP+tgtm+H6QrACafIy82d9XEk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    gitpython
+    typer
+    pydantic-settings
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall =
+    # https://github.com/NixOS/nixpkgs/issues/308283
+    lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd git-dummy \
+        --bash <($out/bin/git-dummy --show-completion bash) \
+        --fish <($out/bin/git-dummy --show-completion fish) \
+        --zsh <($out/bin/git-dummy --show-completion zsh)
+    '';
+
+  meta = {
+    homepage = "https://github.com/initialcommit-com/git-dummy";
+    description = "Generate dummy Git repositories populated with the desired number of commits, branches, and structure";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ mathiassven ];
+  };
+}
diff --git a/pkgs/development/python-modules/glad2/default.nix b/pkgs/development/python-modules/glad2/default.nix
index f5aeb9925431..c2eb38490cc5 100644
--- a/pkgs/development/python-modules/glad2/default.nix
+++ b/pkgs/development/python-modules/glad2/default.nix
@@ -3,19 +3,22 @@
   buildPythonPackage,
   fetchPypi,
   jinja2,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "glad2";
-  version = "2.0.6";
-  format = "setuptools";
+  version = "2.0.8";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CGFa7TIZ6hx3WEvVlh2CO6sib4rDgx0JrfZcb6h3+Ow=";
+    hash = "sha256-uEB5ufpATzcXG5Yb3R2NohNw5sgY3vuEgcWz/j1kNto=";
   };
 
-  propagatedBuildInputs = [ jinja2 ];
+  build-system = [ setuptools ];
+
+  dependencies = [ jinja2 ];
 
   # no python tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index bceb44eb0b6f..0f0f22280579 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   httpx,
   poetry-core,
   pytest-asyncio,
@@ -24,6 +25,14 @@ buildPythonPackage rec {
     hash = "sha256-QAnwFX53jf7yWWa308/XTARNw5Qeo9K2zfD+6+HiFuM=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "pytest-httpx-compat.patch";
+      url = "https://github.com/home-assistant-ecosystem/python-glances-api/commit/f193472a25469e7e4b946f9a1c3a7a95949c6c04.patch";
+      hash = "sha256-hFeWv2WdbdeoaHgAOmwtBwWwPLjJzyurTZDV98qR7F8=";
+    })
+  ];
+
   build-system = [ poetry-core ];
 
   dependencies = [ httpx ];
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 6f6256650872..97297e657ff4 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.41.0";
+  version = "3.45.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-FQO1D960mg0G/zYMo4J5MtJbPID4oE8UWNpTPKWtsic=";
+    hash = "sha256-EBYhT2RLHjvSwnSMbx+Xo3Fmxc9jttEPeljjlKbQd8Q=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index f490c9328fb1..895e9f1ab25e 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "glyphslib";
-  version = "6.8.2";
+  version = "6.9.0";
 
   format = "pyproject";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "googlefonts";
     repo = "glyphsLib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AcAk9lFueIWYsDK1ESSK6D0/i1qW7udDfUa1pFRqGQs=";
+    hash = "sha256-NanqjZZkxrhPaBsR+FrARvsO3vdT2MYnWFtkO0hpbQg=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix
new file mode 100644
index 000000000000..8d110afbbee3
--- /dev/null
+++ b/pkgs/development/python-modules/go2rtc-client/default.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  aiohttp,
+  aioresponses,
+  awesomeversion,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  mashumaro,
+  orjson,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  syrupy,
+  webrtc-models,
+}:
+
+buildPythonPackage rec {
+  pname = "go2rtc-client";
+  version = "0.1.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.12";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "python-go2rtc-client";
+    rev = "refs/tags/${version}";
+    hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
+  pythonRelaxDeps = [ "orjson" ];
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    awesomeversion
+    mashumaro
+    orjson
+    webrtc-models
+  ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "go2rtc_client" ];
+
+  meta = {
+    description = "Module for interacting with go2rtc";
+    homepage = "https://github.com/home-assistant-libs/python-go2rtc-client";
+    changelog = "https://github.com/home-assistant-libs/python-go2rtc-client/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
index 662631c36fb2..9cb6cbd74966 100644
--- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
+++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
@@ -17,14 +17,15 @@
 
 buildPythonPackage rec {
   pname = "google-ai-generativelanguage";
-  version = "0.6.7";
+  version = "0.6.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6eLvojtiwxGPhkFu75zEgBkjDScVxVWsYfnh6oBQMTI=";
+    pname = "google_ai_generativelanguage";
+    inherit version;
+    hash = "sha256-b6ZCyWTYcoAG/n6HcQJvwLWZrg6+r4PK9VCUHo5pNFU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 3cb93fc57419..90cbc2f43753 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -14,14 +14,15 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "2.135.0";
+  version = "2.147.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-tVKigSPtlUkwNWmNuA6O14yRBqi0IuY6F1FQubVbcE4=";
+    pname = "google_api_python_client";
+    inherit version;
+    hash = "sha256-6GTCz2HTTADwUni4vbcrk7b6NPDenq1R0gQ187Zfkb4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index ea25b7f2a6b6..35dd5b86b9fb 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -27,14 +27,15 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.30.0";
+  version = "2.35.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-q2MKEyD2cgkJrXan29toQc31xmsyjWkAJ+SGe9+xZog=";
+    pname = "google_auth";
+    inherit version;
+    hash = "sha256-9MZO1OAejotkbvNMAY+L8zON8MjjfYs7ukDn9XSjJ4o=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
index 3f4a7b9e52ff..c67815b9d7ab 100644
--- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
+++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-artifact-registry";
-  version = "1.11.5";
+  version = "1.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_artifact_registry";
     inherit version;
-    hash = "sha256-lNWDbgu9DDNRSh7cC1TfiYvy237bH16QduskPzQt9Mg=";
+    hash = "sha256-XuPps4IBJxIfF+9qmqDYzZDw3BOrZeVUznk/3af33XQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 5451d1857a65..82018221e002 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -30,14 +30,15 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery";
-  version = "3.25.0";
+  version = "3.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Wyr/MgWoVEgRF0NoNq4UA/EfJZTmgQqYiGr9V+2ihQk=";
+    pname = "google_cloud_bigquery";
+    inherit version;
+    hash = "sha256-7b3HiL7qZZ4EwK9/5NzW2RVTRLmJUaDVBVvS8V2kuiM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix
index 7535e9f3f8c1..83e5ae9ea3d9 100644
--- a/pkgs/development/python-modules/google-cloud-compute/default.nix
+++ b/pkgs/development/python-modules/google-cloud-compute/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-compute";
-  version = "1.19.2";
+  version = "1.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_compute";
     inherit version;
-    hash = "sha256-P86Cq+FOdvqqgSNNmnvh5jSy7Yon9V/u/PKxRkZ/f6s=";
+    hash = "sha256-q32xYqLCWV+tpJKgBnAV3DDjWCxPFOTtbMdDNyHIcp0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 34e3ab0ceae1..480bf6f76d87 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "5.11.0";
+  version = "5.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_dataproc";
     inherit version;
-    hash = "sha256-6jiAOYf9eBjRMyQ9tvR3EWfnqk1MfYIUTm98Plnfkhg=";
+    hash = "sha256-S1jXIPAgxONTeKKeqHzoKGr2Mes7w4LMvL/zncAZnik=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 15bbab8155a3..8c8b720c097d 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.22.0";
+  version = "3.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_dlp";
     inherit version;
-    hash = "sha256-SabiX00pD91acxz83PdkDnPynLp5L9MAqKGY/IIUDAU=";
+    hash = "sha256-NKH24p2jfjhbs73jHB/lWDk5P1Uin/Mp5TANR3fquzg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index 0b3f31b643b7..e0d771425c65 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -3,30 +3,40 @@
   buildPythonPackage,
   fetchPypi,
   google-api-core,
+  google-auth,
+  grpc-google-iam-v1,
   libcst,
   mock,
   proto-plus,
+  protobuf,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-iam";
-  version = "2.15.0";
-  format = "setuptools";
+  version = "2.15.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6TgaGCPlFi9owoBI/xowe6Og5Tja9getfUHP47dWpvA=";
+    pname = "google_cloud_iam";
+    inherit version;
+    hash = "sha256-CbE12Wuiz2+Ap+2AEUNuidJYjouyPNYUXEdjAvSHGoI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     google-api-core
+    google-auth
+    grpc-google-iam-v1
     libcst
     proto-plus
+    protobuf
   ] ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
@@ -47,8 +57,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "IAM Service Account Credentials API client library";
-    homepage = "https://github.com/googleapis/python-iam";
-    changelog = "https://github.com/googleapis/python-iam/releases/tag/v${version}";
+    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-v${version}/packages/google-cloud-iam/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ austinbutler ];
   };
diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index 4cd4dc257fda..73ece34efc16 100644
--- a/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -39,6 +39,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  # including_default_value_fields was deprecated, the new version is called
+  # always_print_fields_with_no_presence
+  postPatch = ''
+    substituteInPlace "tests/unit/gapic/iot_v1/test_device_manager.py" \
+      --replace-fail "including_default_value_fields" "always_print_fields_with_no_presence"
+    substituteInPlace "google/cloud/iot_v1/services/device_manager/transports/rest.py" \
+      --replace-fail "including_default_value_fields" "always_print_fields_with_no_presence"
+  '';
+
   disabledTests = [
     # requires credentials
     "test_list_device_registries"
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index dae730accaa8..df1d6704dacb 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -5,9 +5,11 @@
   google-api-core,
   google-cloud-testutils,
   grpc-google-iam-v1,
-  grpcio,
   grpcio-status,
+  grpcio,
   libcst,
+  opentelemetry-api,
+  opentelemetry-sdk,
   proto-plus,
   protobuf,
   pytest-asyncio,
@@ -18,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.23.1";
+  version = "2.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-4f3nm1tktyEpCvTAIpB6/LuDUS2S9OXDNMORz7sCKss=";
+    hash = "sha256-Kg/RYQDBbHE3Q45G1M42y++kvXnPk8h3aruf3oPPWQQ=";
   };
 
   build-system = [ setuptools ];
@@ -37,6 +39,8 @@ buildPythonPackage rec {
     grpcio
     grpcio-status
     libcst
+    opentelemetry-api
+    opentelemetry-sdk
     proto-plus
     protobuf
   ] ++ google-api-core.optional-dependencies.grpc;
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index d5a4d97cf7ce..9d0f35e4f330 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -18,23 +18,22 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "2.17.0";
+  version = "2.18.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-STeKv/VO9la1Lcpe8PLrqaqD3CsscseHFLA6GpX+k4g=";
+    pname = "google_cloud_storage";
+    inherit version;
+    hash = "sha256-qves1wza2fJ00pMyZz/KuYcI0OH03OtaU1aq7wavTZk=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-  ];
-
   pythonRelaxDeps = [ "google-auth" ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     google-auth
     google-cloud-core
     google-resumable-media
@@ -53,21 +52,22 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # Disable tests which require credentials and network access
   disabledTests = [
+    # Disable tests which require credentials and network access
     "create"
     "download"
     "get"
     "post"
-    "upload"
+    "test_anonymous_client_access_to_public_bucket"
     "test_build_api_url"
     "test_ctor_mtls"
+    "test_ctor_w_api_endpoint_override"
+    "test_ctor_w_custom_endpoint_use_auth"
     "test_hmac_key_crud"
     "test_list_buckets"
     "test_open"
-    "test_anonymous_client_access_to_public_bucket"
-    "test_ctor_w_custom_endpoint_use_auth"
-    "test_ctor_w_api_endpoint_override"
+    "test_set_api_request_attr"
+    "upload"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix
index fc6bcf95b4a2..c4dd1040ff64 100644
--- a/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
@@ -1,27 +1,33 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
   cffi,
   crc32c,
+  fetchFromGitHub,
   pytestCheckHook,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-crc32c";
-  version = "1.5.0";
-  format = "setuptools";
+  version = "1.6.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-crc32c";
-    rev = "v${version}";
-    hash = "sha256-Tx7UBIwKzSBbpuqdqGiXTbmBE+1MDRknVe3Zee0UHKQ=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-uGW4gWIpTVQ+f52WBA9H+K3+sHNa4JdgO9qi1Ds7WEU=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ crc32c ];
 
-  propagatedBuildInputs = [ cffi ];
+  dependencies = [ cffi ];
 
   LDFLAGS = "-L${crc32c}/lib";
   CFLAGS = "-I${crc32c}/include";
@@ -34,8 +40,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "google_crc32c" ];
 
   meta = with lib; {
-    homepage = "https://github.com/googleapis/python-crc32c";
     description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm";
+    homepage = "https://github.com/googleapis/python-crc32c";
+    changelog = "https://github.com/googleapis/python-crc32c/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ freezeboy ];
   };
diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index 0c2664caa51c..6bdda8efbc1d 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "google-nest-sdm";
-  version = "6.1.0";
+  version = "6.1.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "python-google-nest-sdm";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE=";
+    hash = "sha256-F/vpyg3EYgKCsq/0yL3uP+1azu8bbHOMsf85Yabl0KQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix
index bf55a48543a2..d8ea529bb1d8 100644
--- a/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -11,21 +11,25 @@
   pytestCheckHook,
   pythonOlder,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-resumable-media";
-  version = "2.7.1";
-  format = "setuptools";
+  version = "2.7.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6uRRp7LizbqqD9LrAMyKHuXpXha1VZc1nLw9J9fZDjM=";
+    pname = "google_resumable_media";
+    inherit version;
+    hash = "sha256-UoCu1GKfK2C4R7DUL5hX/Uk1wRryZnRN8z2AdMrpL+A=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     google-auth
     google-crc32c
   ];
diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix
index eb4d8e5944ae..5dcbe2d2ed84 100644
--- a/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix
@@ -2,24 +2,28 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
   grpc,
   protobuf,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
-  version = "1.63.1";
+  version = "1.65.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-xkQvegprKoA2lFfXnmZyu33LqriOCEgwJJfj7IB4Cmo=";
+    pname = "googleapis_common_protos";
+    inherit version;
+    hash = "sha256-M0op0Hzdw6oB3uSYj5r9mykW7i/0nWt1cVXcDRl4UsA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     grpc
     protobuf
   ];
@@ -38,6 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Common protobufs used in Google APIs";
     homepage = "https://github.com/googleapis/python-api-common-protos";
+    changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix
index cb449dc56d61..4cdf9ccfb4e4 100644
--- a/pkgs/development/python-modules/gpytorch/default.nix
+++ b/pkgs/development/python-modules/gpytorch/default.nix
@@ -2,51 +2,46 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
+  jaxtyping,
   linear-operator,
+  mpmath,
   scikit-learn,
+  scipy,
   setuptools,
   setuptools-scm,
-  wheel,
   torch,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "gpytorch";
-  version = "1.12";
-  format = "pyproject";
+  version = "1.13";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cornellius-gp";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-8W0QSiXl+C86m5yaI9KfGN92uA2VGjGwQt6DI/1NaQE=";
+    hash = "sha256-jdEJdUFIyM7TTKUHY8epjyZCGolH8nrr7FCyfw+x56s=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/cornellius-gp/gpytorch/pull/2545
-      name = "scipy-1.14-compatibility.patch";
-      url = "https://github.com/cornellius-gp/gpytorch/commit/2562be472521b8aec366de2619e3130a96fab982.patch";
-      excludes = [ "setup.py" ];
-      hash = "sha256-znOFpN6go2iIxP24VjJLKF3Laxcr4xV/IyP2y36g4QY=";
-    })
-  ];
-
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "jaxtyping" ];
+
+  dependencies = [
+    jaxtyping
     linear-operator
+    mpmath
     scikit-learn
+    scipy
     torch
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "gpytorch" ];
 
@@ -56,6 +51,7 @@ buildPythonPackage rec {
     # flaky numerical tests
     "test_classification_error"
     "test_matmul_matrix_broadcast"
+    "test_optimization_optimal_error"
     # https://github.com/cornellius-gp/gpytorch/issues/2396
     "test_t_matmul_matrix"
   ];
diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix
index 1a664c0e936e..f6067dab3b6d 100644
--- a/pkgs/development/python-modules/gql/default.nix
+++ b/pkgs/development/python-modules/gql/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "graphql-python";
-    repo = pname;
+    repo = "gql";
     rev = "refs/tags/v${version}";
     hash = "sha256-jm0X+X8gQyQYn03gT14bdr79+Wd5KL9ryvrU/0VUtEU=";
   };
@@ -88,44 +88,37 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
-  pytestFlagsArray = [ "--asyncio-mode=auto" ];
+  pytestFlagsArray = [
+    "--asyncio-mode=auto"
+    "-m 'not online'"
+  ];
 
   disabledTests = [
     # Tests requires network access
+    "test_async_client_validation_fetch_schema_from_server_valid_query"
     "test_execute_result_error"
+    "test_get_introspection_query_ast"
+    "test_header_query"
+    "test_hero_name_query"
     "test_http_transport"
+    "test_named_query"
+    "test_query_with_variable"
   ];
 
   disabledTestPaths = [
     # Exclude linter tests
     "gql-checker/tests/test_flake8_linter.py"
     "gql-checker/tests/test_pylama_linter.py"
-    # Tests require network access
-    "tests/custom_scalars/test_money.py"
-    "tests/test_aiohttp.py"
-    "tests/test_appsync_http.py"
-    "tests/test_appsync_websockets.py"
-    "tests/test_async_client_validation.py"
-    "tests/test_graphqlws_exceptions.py"
-    "tests/test_graphqlws_subscription.py"
-    "tests/test_phoenix_channel_exceptions.py"
-    "tests/test_phoenix_channel_exceptions.py"
-    "tests/test_phoenix_channel_query.py"
-    "tests/test_phoenix_channel_subscription.py"
-    "tests/test_requests.py"
-    "tests/test_websocket_exceptions.py"
-    "tests/test_websocket_query.py"
-    "tests/test_websocket_subscription.py"
   ];
 
   pythonImportsCheck = [ "gql" ];
 
   meta = with lib; {
     description = "GraphQL client in Python";
-    mainProgram = "gql-cli";
     homepage = "https://github.com/graphql-python/gql";
     changelog = "https://github.com/graphql-python/gql/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
+    mainProgram = "gql-cli";
   };
 }
diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix
index e632650a40a6..09c3473a2038 100644
--- a/pkgs/development/python-modules/grad-cam/default.nix
+++ b/pkgs/development/python-modules/grad-cam/default.nix
@@ -6,7 +6,7 @@
   setuptools,
   matplotlib,
   numpy,
-  opencv4,
+  opencv-python,
   pillow,
   scikit-learn,
   torch,
@@ -17,21 +17,16 @@
 
 buildPythonPackage rec {
   pname = "grad-cam";
-  version = "1.5.2";
+  version = "1.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WhC3QjMDh4E8NnO8SyCtg9rFgDJkYP6/xdWNcTvlKFU=";
+    hash = "sha256-q9PcG836Az+2o1XqeKNh0+z9GN9UGinmGyOAhD5B3Zw=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements.txt\
-      --replace "opencv-python" "opencv"
-  '';
-
   nativeBuildInputs = [
   ];
 
@@ -46,7 +41,7 @@ buildPythonPackage rec {
   dependencies = [
     matplotlib
     numpy
-    opencv4
+    opencv-python
     pillow
     scikit-learn
     torchvision
diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix
index abceb8b1c5c0..d35698c9f77e 100644
--- a/pkgs/development/python-modules/gradio-pdf/default.nix
+++ b/pkgs/development/python-modules/gradio-pdf/default.nix
@@ -11,16 +11,16 @@
 
 buildPythonPackage rec {
   pname = "gradio-pdf";
-  version = "0.0.15";
-  format = "pyproject";
+  version = "0.0.17";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "gradio_pdf";
     inherit version;
-    hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4=";
+    hash = "sha256-LoVcwE7eGcK5Nc6qKTnrnI+rNlsDbekhKUP+Fzq2SQ8=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatch-requirements-txt
     hatchling
@@ -36,10 +36,10 @@ buildPythonPackage rec {
   # tested in `gradio`
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Python library for easily interacting with trained machine learning models";
     homepage = "https://pypi.org/project/gradio-pdf/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pbsds ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pbsds ];
   };
 }
diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix
index d07f962b2668..aa869e445c54 100644
--- a/pkgs/development/python-modules/gradio/client.nix
+++ b/pkgs/development/python-modules/gradio/client.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "gradio-client";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     # not to be confused with @gradio/client@${version}
     rev = "refs/tags/gradio_client@${version}";
     sparseCheckout = [ "client/python" ];
-    hash = "sha256-UZQWguUN3l0cj2wb2f7A61RTLy9nPYcIEwHIo+F1kR0=";
+    hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk=";
   };
   prePatch = ''
     cd client/python
@@ -108,10 +108,11 @@ buildPythonPackage rec {
     extraArgs = [ "--version-regex" "gradio_client@(.*)" ];
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.gradio.app/";
+    changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio_client@${version}";
     description = "Lightweight library to use any Gradio app as an API";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pbsds ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pbsds ];
   };
 }
diff --git a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py
index eb2385bca8d6..a34ee1bbcd87 100644
--- a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py
+++ b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py
@@ -28,6 +28,8 @@ def pytest_runtest_makereport(item, call):
         for exc in iterate_exc_chain(call.excinfo.value):
             if isinstance(exc, NixNetworkAccessDeniedError):
                 tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."
+            if isinstance(exc, socket.gaierror):
+                tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."
             if isinstance(exc, httpx.ConnectError):
                 tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."
             if isinstance(exc, FileNotFoundError):  # gradio specific
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index 2a75ac5ed6e4..1b9e20496f6d 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -64,15 +64,15 @@
 
 buildPythonPackage rec {
   pname = "gradio";
-  version = "4.44.1";
-  format = "pyproject";
+  version = "5.1.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   # We use the Pypi release, since it provides prebuilt webui assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-popSSYrGtj+IZO+Ev3hmpw59B+vpE+35IeHSo3CK1a4=";
+    hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM=";
   };
 
   # fix packaging.ParserSyntaxError, which can't handle comments
@@ -83,7 +83,11 @@ buildPythonPackage rec {
     rm -rf venv/
   '';
 
-  pythonRelaxDeps = [ "tomlkit" ];
+  pythonRelaxDeps = [
+    "tomlkit"
+    "aiofiles"
+    "markupsafe"
+  ];
 
   pythonRemoveDeps = [
     # our package is presented as a binary, not a python lib - and
@@ -91,7 +95,7 @@ buildPythonPackage rec {
     "ruff"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-requirements-txt
     hatch-fancy-pypi-readme
@@ -168,6 +172,7 @@ buildPythonPackage rec {
   disabledTests = [
     # Actually broken
     "test_mount_gradio_app"
+    "test_processing_utils_backwards_compatibility" # type error
 
     # requires network, it caught our xfail exception
     "test_error_analytics_successful"
@@ -280,14 +285,16 @@ buildPythonPackage rec {
         pythonRemoveDeps = (old.pythonRemoveDeps or [ ]) ++ [ "gradio-client" ];
         doInstallCheck = false;
         doCheck = false;
+        preCheck = "";
         pythonImportsCheck = null;
         dontCheckRuntimeDeps = true;
       });
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.gradio.app/";
+    changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio@${version}";
     description = "Python library for easily interacting with trained machine learning models";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pbsds ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pbsds ];
   };
 }
diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index 7986f0cd3246..57043658c744 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "graphql-core";
-  version = "3.2.3";
+  version = "3.2.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "graphql-python";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-LtBbHA5r6/YNh2gKX0+NqQjrpKuMioyOYWT0R59SIL4=";
+    hash = "sha256-LWmUrkYZuyzQ89Z3dXrce1xk3NODXrHWvWG9zAYTUi0=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix
index c6a72fc6ee34..7833df472eb7 100644
--- a/pkgs/development/python-modules/graspologic/default.nix
+++ b/pkgs/development/python-modules/graspologic/default.nix
@@ -42,7 +42,11 @@ buildPythonPackage rec {
     poetry-dynamic-versioning
   ];
 
-  pythonRelaxDeps = [ "scipy" ];
+  pythonRelaxDeps = [
+    "beartype"
+    "hyppo"
+    "scipy"
+  ];
 
   dependencies = [
     anytree
@@ -83,8 +87,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://graspologic-org.github.io/graspologic";
     description = "Package for graph statistical algorithms";
+    homepage = "https://graspologic-org.github.io/graspologic";
+    changelog = "https://github.com/graspologic-org/graspologic/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ bcdarwin ];
   };
diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix
index bca215084c16..ec2a4dac5028 100644
--- a/pkgs/development/python-modules/great-tables/default.nix
+++ b/pkgs/development/python-modules/great-tables/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "great-tables";
-  version = "0.11.1";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "great-tables";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IlukgnhOT8NF1WxRJCnNuNEI31DByWoNzbk/x458atA=";
+    hash = "sha256-+n8s8cmsQizEUuRGzFrOxhWL0C9OQO506msiHD58jGQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 2ea828cd4174..2dd2b9d8fa43 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -16,20 +16,15 @@
 let
   greenlet = buildPythonPackage rec {
     pname = "greenlet";
-    version = "3.0.3";
+    version = "3.1.1";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-QzdEQjUyWVVM4zWZ2otpLVqpb4l21WfUut8mM3H75JE=";
+      hash = "sha256-TOOsbNtq33lGR11+8xd3wm2UvMw3fgcKeYa9LVxRVGc=";
     };
 
-    patches = [
-      # https://github.com/python-greenlet/greenlet/pull/396
-      ./python-3.13-compat.patch
-    ];
-
-    nativeBuildInputs = [ setuptools ];
+    build-system = [ setuptools ];
 
     # tests in passthru, infinite recursion via objgraph/graphviz
     doCheck = false;
diff --git a/pkgs/development/python-modules/greenlet/python-3.13-compat.patch b/pkgs/development/python-modules/greenlet/python-3.13-compat.patch
deleted file mode 100644
index 9f5488b831d3..000000000000
--- a/pkgs/development/python-modules/greenlet/python-3.13-compat.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-Port of https://github.com/python-greenlet/greenlet/pull/396
-
-From 94979488f841fcb41bd2bd3b80b5c0b011af4c94 Mon Sep 17 00:00:00 2001
-From: Victor Stinner 
-Date: Wed, 14 Feb 2024 16:37:42 +0100
-Subject: [PATCH 1/5] Fix #392: Port to Python 3.13
-
-* Replace C_RECURSION_LIMIT with Py_C_RECURSION_LIMIT.
-* Add Py_C_RECURSION_LIMIT for Python 3.12 and older.
-* Disable GREENLET_USE_CFRAME on Python 3.13.
-* Define Py_BUILD_CORE to include pycore_frame.h.
----
- src/greenlet/TPythonState.cpp            | 10 +++++++---
- src/greenlet/greenlet_cpython_compat.hpp | 13 +++++++++++--
- src/greenlet/greenlet_greenlet.hpp       |  1 +
- 3 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp
-index 465d4174..c0dbf703 100644
---- a/src/greenlet/TPythonState.cpp
-+++ b/src/greenlet/TPythonState.cpp
-@@ -130,11 +130,13 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept
- #if GREENLET_PY311
-   #if GREENLET_PY312
-     this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
--    this->c_recursion_depth = C_RECURSION_LIMIT - tstate->c_recursion_remaining;
-+    this->c_recursion_depth = Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining;
-   #else // not 312
-     this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
-   #endif // GREENLET_PY312
-+  #if GREENLET_USE_CFRAME
-     this->current_frame = tstate->cframe->current_frame;
-+  #endif
-     this->datastack_chunk = tstate->datastack_chunk;
-     this->datastack_top = tstate->datastack_top;
-     this->datastack_limit = tstate->datastack_limit;
-@@ -199,12 +201,14 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept
- #if GREENLET_PY311
-   #if GREENLET_PY312
-     tstate->py_recursion_remaining = tstate->py_recursion_limit - this->py_recursion_depth;
--    tstate->c_recursion_remaining = C_RECURSION_LIMIT - this->c_recursion_depth;
-+    tstate->c_recursion_remaining = Py_C_RECURSION_LIMIT - this->c_recursion_depth;
-     this->unexpose_frames();
-   #else // \/ 3.11
-     tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth;
-   #endif // GREENLET_PY312
-+  #if GREENLET_USE_CFRAME
-     tstate->cframe->current_frame = this->current_frame;
-+  #endif
-     tstate->datastack_chunk = this->datastack_chunk;
-     tstate->datastack_top = this->datastack_top;
-     tstate->datastack_limit = this->datastack_limit;
-@@ -238,7 +242,7 @@ void PythonState::set_initial_state(const PyThreadState* const tstate) noexcept
- #if GREENLET_PY312
-     this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-     // XXX: TODO: Comment from a reviewer:
--    //     Should this be ``C_RECURSION_LIMIT - tstate->c_recursion_remaining``?
-+    //     Should this be ``Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining``?
-     // But to me it looks more like that might not be the right
-     // initialization either?
-     this->c_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp
-index cdc1617f..c0fb94c5 100644
---- a/src/greenlet/greenlet_cpython_compat.hpp
-+++ b/src/greenlet/greenlet_cpython_compat.hpp
-@@ -12,19 +12,24 @@
- 
- #if PY_VERSION_HEX >= 0x30A00B1
- #    define GREENLET_PY310 1
-+#else
-+#    define GREENLET_PY310 0
-+#endif
-+
- /*
- Python 3.10 beta 1 changed tstate->use_tracing to a nested cframe member.
- See https://github.com/python/cpython/pull/25276
- We have to save and restore this as well.
-+
-+Python 3.13 removed PyThreadState.cframe (GH-108035).
- */
-+#if GREENLET_PY310 && PY_VERSION_HEX < 0x30D0000
- #    define GREENLET_USE_CFRAME 1
- #else
- #    define GREENLET_USE_CFRAME 0
--#    define GREENLET_PY310 0
- #endif
- 
- 
--
- #if PY_VERSION_HEX >= 0x30B00A4
- /*
- Greenlet won't compile on anything older than Python 3.11 alpha 4 (see
-@@ -124,4 +129,8 @@ static inline void PyThreadState_LeaveTracing(PyThreadState *tstate)
- }
- #endif
- 
-+#if !defined(Py_C_RECURSION_LIMIT) && defined(C_RECURSION_LIMIT)
-+#  define Py_C_RECURSION_LIMIT C_RECURSION_LIMIT
-+#endif
-+
- #endif /* GREENLET_CPYTHON_COMPAT_H */
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index d52ce1fd..6da6841f 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -23,6 +23,7 @@ using greenlet::refs::BorrowedGreenlet;
- #endif
- 
- #if GREENLET_PY312
-+#  define Py_BUILD_CORE
- #  include "internal/pycore_frame.h"
- #endif
- 
-
-From 00611d7567d09869973fe314f60575674cc877d8 Mon Sep 17 00:00:00 2001
-From: Victor Stinner 
-Date: Mon, 3 Jun 2024 10:55:14 +0200
-Subject: [PATCH 3/5] Support delete_later
-
----
- src/greenlet/TPythonState.cpp            | 14 ++++++++++++--
- src/greenlet/greenlet.cpp                |  4 ++++
- src/greenlet/greenlet_cpython_compat.hpp |  6 ++++++
- src/greenlet/greenlet_greenlet.hpp       |  4 ++++
- 4 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp
-index c0dbf703..bfb40cac 100644
---- a/src/greenlet/TPythonState.cpp
-+++ b/src/greenlet/TPythonState.cpp
-@@ -18,7 +18,11 @@ PythonState::PythonState()
- #else
-     ,recursion_depth(0)
- #endif
-+#if GREENLET_PY313
-+    ,delete_later(nullptr)
-+#else
-     ,trash_delete_nesting(0)
-+#endif
- #if GREENLET_PY311
-     ,current_frame(nullptr)
-     ,datastack_chunk(nullptr)
-@@ -145,7 +149,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept
-     Py_XDECREF(frame);  // PyThreadState_GetFrame gives us a new
-                         // reference.
-     this->_top_frame.steal(frame);
--  #if GREENLET_PY312
-+  #if GREENLET_PY313
-+    this->delete_later = Py_XNewRef(tstate->delete_later);
-+  #elif GREENLET_PY312
-     this->trash_delete_nesting = tstate->trash.delete_nesting;
-   #else // not 312
-     this->trash_delete_nesting = tstate->trash_delete_nesting;
-@@ -213,7 +219,11 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept
-     tstate->datastack_top = this->datastack_top;
-     tstate->datastack_limit = this->datastack_limit;
-     this->_top_frame.relinquish_ownership();
--  #if GREENLET_PY312
-+  #if GREENLET_PY313
-+    Py_XDECREF(tstate->delete_later);
-+    tstate->delete_later = this->delete_later;
-+    Py_CLEAR(this->delete_later);
-+  #elif GREENLET_PY312
-     tstate->trash.delete_nesting = this->trash_delete_nesting;
-   #else // not 3.12
-     tstate->trash_delete_nesting = this->trash_delete_nesting;
-diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp
-index 5a9818e8..dfc748a8 100644
---- a/src/greenlet/greenlet.cpp
-+++ b/src/greenlet/greenlet.cpp
-@@ -1328,6 +1328,7 @@ mod_enable_optional_cleanup(PyObject* UNUSED(module), PyObject* flag)
-     Py_RETURN_NONE;
- }
- 
-+#if !GREENLET_PY313
- PyDoc_STRVAR(mod_get_tstate_trash_delete_nesting_doc,
-              "get_tstate_trash_delete_nesting() -> Integer\n"
-              "\n"
-@@ -1343,6 +1344,7 @@ mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module))
-     return PyLong_FromLong(tstate->trash_delete_nesting);
- #endif
- }
-+#endif
- 
- static PyMethodDef GreenMethods[] = {
-     {"getcurrent",
-@@ -1356,7 +1358,9 @@ static PyMethodDef GreenMethods[] = {
-     {"get_total_main_greenlets", (PyCFunction)mod_get_total_main_greenlets, METH_NOARGS, mod_get_total_main_greenlets_doc},
-     {"get_clocks_used_doing_optional_cleanup", (PyCFunction)mod_get_clocks_used_doing_optional_cleanup, METH_NOARGS, mod_get_clocks_used_doing_optional_cleanup_doc},
-     {"enable_optional_cleanup", (PyCFunction)mod_enable_optional_cleanup, METH_O, mod_enable_optional_cleanup_doc},
-+#if !GREENLET_PY313
-     {"get_tstate_trash_delete_nesting", (PyCFunction)mod_get_tstate_trash_delete_nesting, METH_NOARGS, mod_get_tstate_trash_delete_nesting_doc},
-+#endif
-     {NULL, NULL} /* Sentinel */
- };
- 
-diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp
-index c0fb94c5..ce5fd882 100644
---- a/src/greenlet/greenlet_cpython_compat.hpp
-+++ b/src/greenlet/greenlet_cpython_compat.hpp
-@@ -55,6 +55,12 @@ Greenlet won't compile on anything older than Python 3.11 alpha 4 (see
- #    define GREENLET_PY312 0
- #endif
- 
-+#if PY_VERSION_HEX >= 0x30D0000
-+#    define GREENLET_PY313 1
-+#else
-+#    define GREENLET_PY313 0
-+#endif
-+
- #ifndef Py_SET_REFCNT
- /* Py_REFCNT and Py_SIZE macros are converted to functions
- https://bugs.python.org/issue39573 */
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 6da6841f..fbfdfbfc 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -111,7 +111,11 @@ namespace greenlet
- #else
-         int recursion_depth;
- #endif
-+#if GREENLET_PY313
-+        PyObject *delete_later;
-+#else
-         int trash_delete_nesting;
-+#endif
- #if GREENLET_PY311
-         _PyInterpreterFrame* current_frame;
-         _PyStackChunk* datastack_chunk;
-
-From b65558ec962d3d81ae09787ebca8686d233e2a4c Mon Sep 17 00:00:00 2001
-From: Victor Stinner 
-Date: Wed, 5 Jun 2024 12:04:21 +0200
-Subject: [PATCH 4/5] Fix current_frame
-
----
- src/greenlet/TPythonState.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp
-index bfb40cac..82eb34f0 100644
---- a/src/greenlet/TPythonState.cpp
-+++ b/src/greenlet/TPythonState.cpp
-@@ -138,7 +138,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept
-   #else // not 312
-     this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
-   #endif // GREENLET_PY312
--  #if GREENLET_USE_CFRAME
-+  #if GREENLET_PY313
-+    this->current_frame = tstate->current_frame;
-+  #elif GREENLET_USE_CFRAME
-     this->current_frame = tstate->cframe->current_frame;
-   #endif
-     this->datastack_chunk = tstate->datastack_chunk;
-@@ -212,7 +214,9 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept
-   #else // \/ 3.11
-     tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth;
-   #endif // GREENLET_PY312
--  #if GREENLET_USE_CFRAME
-+  #if GREENLET_PY313
-+    tstate->current_frame = this->current_frame;
-+  #elif GREENLET_USE_CFRAME
-     tstate->cframe->current_frame = this->current_frame;
-   #endif
-     tstate->datastack_chunk = this->datastack_chunk;
-
-From b7cfc1748766cac351fe5fca32fa7c8cacdea2ae Mon Sep 17 00:00:00 2001
-From: Victor Stinner 
-Date: Wed, 5 Jun 2024 12:17:28 +0200
-Subject: [PATCH 5/5] Update tests
-
----
- src/greenlet/tests/test_greenlet.py       | 4 +++-
- src/greenlet/tests/test_greenlet_trash.py | 9 +++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/greenlet/tests/test_greenlet.py b/src/greenlet/tests/test_greenlet.py
-index 51849cd6..259707ae 100644
---- a/src/greenlet/tests/test_greenlet.py
-+++ b/src/greenlet/tests/test_greenlet.py
-@@ -471,7 +471,9 @@ def creator():
-         # Unfortunately, this doesn't actually clear the references, they're in the
-         # fast local array.
-         if not wait_for_cleanup:
--            result[0].gr_frame.f_locals.clear()
-+            # f_locals has no clear method in Python 3.13
-+            if hasattr(result[0].gr_frame.f_locals, 'clear'):
-+                result[0].gr_frame.f_locals.clear()
-         else:
-             self.assertIsNone(result[0].gr_frame)
- 
-diff --git a/src/greenlet/tests/test_greenlet_trash.py b/src/greenlet/tests/test_greenlet_trash.py
-index 8d9716e9..2bce8fd0 100644
---- a/src/greenlet/tests/test_greenlet_trash.py
-+++ b/src/greenlet/tests/test_greenlet_trash.py
-@@ -29,8 +29,17 @@
- 
- import unittest
- 
-+try:
-+    from greenlet._greenlet import get_tstate_trash_delete_nesting
-+except ImportError:
-+    get_tstate_trash_delete_nesting = None
-+
-+
- class TestTrashCanReEnter(unittest.TestCase):
- 
-+    # Python 3.13 has not "trash delete nesting" anymore (but "delete later")
-+    @unittest.skipIf(get_tstate_trash_delete_nesting is None,
-+                     'need get_tstate_trash_delete_nesting()')
-     def test_it(self):
-         # Try several times to trigger it, because it isn't 100%
-         # reliable.
diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index f6539af40f5f..78b823296725 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "gremlinpython";
-  version = "3.7.1";
+  version = "3.7.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "apache";
     repo = "tinkerpop";
     rev = "refs/tags/${version}";
-    hash = "sha256-2viZXksHNFynOm6+1Vo2a8xrXl4pQcAxAVgehp5y6us=";
+    hash = "sha256-Yc0l3kE+6dM9v4QUZPFpm/yjDCrqVO35Vy5srEjAExE=";
   };
 
   sourceRoot = "${src.name}/gremlin-python/src/main/python";
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 4d5662509e06..75c3ade1b51d 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -7,6 +7,9 @@
   protobuf,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-channelz";
   version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index e7b6f49f158b..c96b71d3f5fc 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -6,6 +6,9 @@
   protobuf,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-health-checking";
   version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 35fb1faaeaef..c37492ccf476 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -7,6 +7,9 @@
   protobuf,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-reflection";
   version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index e72822cbd68d..1d203369e10b 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -8,9 +8,12 @@
   pythonOlder,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.66.1";
+  version = "1.66.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_status";
     inherit version;
-    hash = "sha256-s/fTTMxG2D/qUmHuo3hhdEWfdjwx9uNPHSTrptUV0CQ=";
+    hash = "sha256-+1XLtcLmcGL3pNXJnkidB0+1fphnjVw8ZpKi102J6a4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index cabad7a8cfbe..0d38efffbc14 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -8,6 +8,9 @@
   setuptools,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-testing";
   version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index a61999ef5b78..c256496573fd 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -7,15 +7,18 @@
   setuptools,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.66.1";
+  version = "1.66.2";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "grpcio_tools";
     inherit version;
-    hash = "sha256-UFX/6EDqj1BcMDeL4Cr7Tb7LM0gOVU3r4Qtj1rL2QcM=";
+    hash = "sha256-SjbgeRPSa6XM/SaFumPKl/JrCMJJ0syedN2jfvpJ1+Q=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 5dc26d50be2b..ed425b7125df 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -16,14 +16,17 @@
   zlib,
 }:
 
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio";
   format = "setuptools";
-  version = "1.64.1";
+  version = "1.66.2";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jVHdHFnV+g80JmuAo4BewpofJkJcKlRzYTP22H/Eloo=";
+    hash = "sha256-VjWIxYe3XDS5KLxChUjlsA6jjEaXIYGk2Ldbp+PyQjE=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 034300b2b318..b6c427894587 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "gspread";
-  version = "6.1.3";
+  version = "6.1.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "burnash";
     repo = "gspread";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZMzgIRLwMXvJ+JIz3BUps7CTaV/MhfjZYqkEbgHQh+A=";
+    hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix
index 754d7109c692..cb153aab3b64 100644
--- a/pkgs/development/python-modules/guidance/default.nix
+++ b/pkgs/development/python-modules/guidance/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "guidance";
-  version = "0.1.11";
+  version = "0.1.16";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "guidance-ai";
     repo = "guidance";
     rev = "refs/tags/${version}";
-    hash = "sha256-dvIJeSur3DdNBhrEPNPghxqmDEEig59Iz83LWksim6U=";
+    hash = "sha256-dPakdT97cuLv4OwdaUFncopD5X6uXGyUjwzqn9fxnhU=";
   };
 
   nativeBuildInputs = [ pybind11 ];
diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index 5ff6a5f37243..3026e968846f 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "guidata";
-  version = "3.6.3";
+  version = "3.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "guidata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KfeA6XNbzHZM4dyvAYlPOQIwWHwFT3Akj34zmgf8tb8=";
+    hash = "sha256-Qao10NyqFLysx/9AvORX+EIrQlnQJQhSYkVHeTwIutQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index cc43f6d6dff2..1af2e93f7bc6 100644
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "h5netcdf";
-  version = "1.3.0";
+  version = "1.4.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oXHAJ9rrNLJMJKO2MEGVuOq7tvEMdIJW7Tz+GYBjg88=";
+    hash = "sha256-6VnDtb08p5Zc5fQ4Ok4Dj/y1UDTGPXkYKb0zpaw4qWI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 14f7532f8c56..cd60ecd9100a 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,13 +1,12 @@
 {
   lib,
   fetchPypi,
-  fetchpatch,
   buildPythonPackage,
   pythonOlder,
   setuptools,
   numpy,
   hdf5,
-  cython_0,
+  cython,
   pkgconfig,
   mpi4py ? null,
   openssh,
@@ -23,7 +22,7 @@ let
   mpiSupport = hdf5.mpiSupport;
 in
 buildPythonPackage rec {
-  version = "3.11.0";
+  version = "3.12.1";
   pname = "h5py";
   pyproject = true;
 
@@ -31,30 +30,24 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-e36PeAcqLt7IfJg28l80ID/UkqRHVwmhi0F6M8+yH6k=";
+    hash = "sha256-Mm1wtT0xuqYfALiqX5XC/LliGj7oNl13DFUaE9u8v98=";
   };
 
-  patches = [
-    # Unlock an overly strict locking of mpi4py version (seems not to be necessary).
-    # See also: https://github.com/h5py/h5py/pull/2418/files#r1589372479
-    ./mpi4py-requirement.patch
-    # Fix 16-bit float dtype and tests on darwin (remove in next release)
-    (fetchpatch {
-      url = "https://github.com/h5py/h5py/commit/a27a1f49ce92d985e14b8a24fa80d30e5174add2.patch";
-      hash = "sha256-7TcmNSJucknq+Vnv4ViT6S0nWeH1+krarWxq6WXLYEA=";
-    })
-  ];
-
-  # avoid strict pinning of numpy, can't be replaced with pythonRelaxDepsHook,
-  # see: https://github.com/NixOS/nixpkgs/issues/327941
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "numpy >=2.0.0rc1" "numpy"
-  '';
   pythonRelaxDeps = [ "mpi4py" ];
 
-  HDF5_DIR = "${hdf5}";
-  HDF5_MPI = if mpiSupport then "ON" else "OFF";
+  # avoid strict pinning of numpy and mpi4py, can't be replaced with
+  # pythonRelaxDepsHook, see: https://github.com/NixOS/nixpkgs/issues/327941
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy >=2.0.0, <3" "numpy"
+    substituteInPlace setup.py \
+      --replace-fail "mpi4py ==3.1.6" "mpi4py"
+  '';
+
+  env = {
+    HDF5_DIR = "${hdf5}";
+    HDF5_MPI = if mpiSupport then "ON" else "OFF";
+  };
 
   postConfigure = ''
     # Needed to run the tests reliably. See:
@@ -64,15 +57,16 @@ buildPythonPackage rec {
 
   preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc";
 
-  nativeBuildInputs = [
-    cython_0
+  build-system = [
+    cython
+    numpy
     pkgconfig
     setuptools
   ];
 
   buildInputs = [ hdf5 ] ++ lib.optional mpiSupport mpi;
 
-  propagatedBuildInputs =
+  dependencies =
     [ numpy ]
     ++ lib.optionals mpiSupport [
       mpi4py
diff --git a/pkgs/development/python-modules/h5py/mpi4py-requirement.patch b/pkgs/development/python-modules/h5py/mpi4py-requirement.patch
deleted file mode 100644
index b32e804ebe5f..000000000000
--- a/pkgs/development/python-modules/h5py/mpi4py-requirement.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index b1463422..7f0c7b10 100755
---- a/setup.py
-+++ b/setup.py
-@@ -47,7 +47,7 @@ if setup_configure.mpi_enabled():
-     # incompatible with newer setuptools.
-     RUN_REQUIRES.append('mpi4py >=3.1.1')
-     SETUP_REQUIRES.append("mpi4py ==3.1.1; python_version<'3.11'")
--    SETUP_REQUIRES.append("mpi4py ==3.1.4; python_version>='3.11'")
-+    SETUP_REQUIRES.append("mpi4py >=3.1.4; python_version>='3.11'")
- 
- # Set the environment variable H5PY_SETUP_REQUIRES=0 if we need to skip
- # setup_requires for any reason.
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index e8d1537b58ba..c765c22428ff 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ha-ffmpeg";
-  version = "3.2.1";
+  version = "3.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "ha-ffmpeg";
     rev = "refs/tags/${version}";
-    hash = "sha256-Yu23kRChPbq/9sKvu9uY4qtKXX7CVNagZX9Z6ZzDqcw=";
+    hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix
index 980dc0726991..44548561b349 100644
--- a/pkgs/development/python-modules/habitipy/default.nix
+++ b/pkgs/development/python-modules/habitipy/default.nix
@@ -12,15 +12,14 @@
 
 buildPythonPackage rec {
   pname = "habitipy";
-  version = "0.3.1";
+  version = "0.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ASMfreaK";
     repo = "habitipy";
-    # TODO: https://github.com/ASMfreaK/habitipy/issues/27
-    rev = "faaca8840575fe8b807bf17acea6266d5ce92a99";
-    hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix
index a23e54ff53fd..fb5757ae114f 100644
--- a/pkgs/development/python-modules/habluetooth/default.nix
+++ b/pkgs/development/python-modules/habluetooth/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "habluetooth";
-  version = "3.4.0";
+  version = "3.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "habluetooth";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qmb7hfrcKWSs1dkyozuTPsVbI0cjVAJ9Em0JIIKsyck=";
+    hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index b9f8513459f4..4fd81b39ee74 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2024.10.14";
+  version = "2024.10.17";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = "hahomematic";
     rev = "refs/tags/${version}";
-    hash = "sha256-1AOSKFcLzJn8nlFHj0Bl/XH6nvJRvGMmJoBFJjRRkVA=";
+    hash = "sha256-7VCmZcs2WtS9rlWby40dZGXcFY8E+3q+QH2URJkOLLQ=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix
index d8b9ff2441d0..6aab63e498fa 100644
--- a/pkgs/development/python-modules/hakuin/default.nix
+++ b/pkgs/development/python-modules/hakuin/default.nix
@@ -3,24 +3,27 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   jinja2,
   nltk,
-  setuptools,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "hakuin";
-  version = "0-unstable-2024-03-31";
+  version = "0.1.10";
   pyproject = true;
 
+  disabled = pythonOlder "3.11";
+
   src = fetchFromGitHub {
     owner = "pruzko";
     repo = "hakuin";
-    rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772";
-    hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-l5YnGRPUZUQqOaRvQd4l4eowWGpuPBignjkDDT9q7fg=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp
diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index 8c7ae2b3bc2c..533a6d040a8b 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -13,24 +13,27 @@
   pytest-timeout,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   zeroconf,
 }:
 
 buildPythonPackage rec {
   pname = "hap-python";
-  version = "4.9.1";
-  format = "setuptools";
+  version = "4.9.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "ikalchev";
     repo = "HAP-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-nnh8PSEcuPN1qGuInJ7uYe83zdne8axbTrHd4g1xoJs=";
+    hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     async-timeout
     chacha20poly1305-reuseable
     cryptography
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index deefc97b31ac..bfe31c016bc3 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -17,26 +17,26 @@
   setuptools,
   snitun,
   syrupy,
+  webrtc-models,
   xmltodict,
 }:
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.82.0";
+  version = "0.83.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = "hass-nabucasa";
     rev = "refs/tags/${version}";
-    hash = "sha256-hRhRXpiIPrI3umOhsVWLwkSwtEfwevC3fNvJElhKy+I=";
+    hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo=";
   };
 
   pythonRelaxDeps = [ "acme" ];
 
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -49,6 +49,7 @@ buildPythonPackage rec {
     pycognito
     pyjwt
     snitun
+    webrtc-models
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix
index 0d8aaa732636..c5d12912633e 100644
--- a/pkgs/development/python-modules/haystack-ai/default.nix
+++ b/pkgs/development/python-modules/haystack-ai/default.nix
@@ -91,14 +91,14 @@
 
 buildPythonPackage rec {
   pname = "haystack-ai";
-  version = "2.2.3";
+  version = "2.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deepset-ai";
     repo = "haystack";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vaZ8bn36Eezf3/SnJ6ao0CvFZaHrpgbX+nM0IOqG2oo=";
+    hash = "sha256-9lhAiM9uqa6CLb8A59mPVffA1Bnfs4A37/+kKA94cCQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix
index 646e6a636cce..0a424e7424bd 100644
--- a/pkgs/development/python-modules/hcs-utils/default.nix
+++ b/pkgs/development/python-modules/hcs-utils/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "hcs-utils";
-  version = "2.0";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "hcs_utils";
     inherit version;
-    hash = "sha256-4sKcSgSYz+bFYKdOEQh3UsKrCANqX3RnchRpn2EyuBM=";
+    hash = "sha256-a2xO+hdyJQjgIEcjtmDZLicyz2kzKRjtpEhge5yaa7M=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index e56d4fd17123..31b060c56d54 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "hdbscan";
-  version = "0.8.37";
+  version = "0.8.38.post1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3EeHE0DRhT5WnF2Pb4/IB+nDEx7dKRafx3pHBnSqibA=";
+    hash = "sha256-X726L/tamai1L6KRVljO1r7Vn00NX0CxxnNkbJKKrAs=";
   };
 
   pythonRemoveDeps = [ "cython" ];
diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix
index 698bf15e02ec..eb4596e89bd8 100644
--- a/pkgs/development/python-modules/heudiconv/default.nix
+++ b/pkgs/development/python-modules/heudiconv/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "heudiconv";
-  version = "1.1.6";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hCHG5zpoEx4w7Jq842RWwMtsn5NskPq/Wahp4neOun4=";
+    hash = "sha256-qrDYl6hB8BPJz3VKl7jklDaAafsCf1M+3VgFbnGxCTU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
index 25ed4d5d9505..2a4c67d100b4 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "hg-git";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "hg_git";
     inherit version;
-    hash = "sha256-BZzcElZa0pMBSGXSiSB+d+YFhJMM5PAdT2Txq5qLZCU=";
+    hash = "sha256-lqnCi4MjdPVCIXdYAIDGdRY5zcU5QPrSHzy+NKysMtc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index 976961d2164b..5c1fdda9484f 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -5,7 +5,6 @@
   fetchPypi,
   xcbuild,
   cython_0,
-  libusb1,
   udev,
   darwin,
 }:
@@ -23,10 +22,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   propagatedBuildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libusb1
-      udev
-    ]
+    lib.optionals stdenv.hostPlatform.isLinux [ udev ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
@@ -36,13 +32,6 @@ buildPythonPackage rec {
       ]
     );
 
-  # Fix the USB backend library lookup
-  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
-    libusb=${libusb1.dev}/include/libusb-1.0
-    test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-    sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-  '';
-
   pythonImportsCheck = [ "hid" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix
index 646ba22abda5..7f1d6d1eb243 100644
--- a/pkgs/development/python-modules/highdicom/default.nix
+++ b/pkgs/development/python-modules/highdicom/default.nix
@@ -22,7 +22,7 @@ let
 in
 buildPythonPackage rec {
   pname = "highdicom";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "MGHComputationalPathology";
     repo = "highdicom";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw=";
+    hash = "sha256-WXNmkaAdbjyPdNtjV6vpxUWGtdPLvrMr5t/5aMKGSLc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix
index a87c5fb7c2d4..9b3cb4002750 100644
--- a/pkgs/development/python-modules/hikari-lightbulb/default.nix
+++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "hikari-lightbulb";
-  version = "2.3.5";
+  version = "2.3.5.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tandemdude";
     repo = "hikari-lightbulb";
-    rev = version;
-    hash = "sha256-gqbbex2xj48LZqW4bVSPDW1UZEFVeOHbNQVM6nhpl1Y=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-sxBrOgMgUcPjqtNuuq5+NfyxR5V812dfHnGoO9DhdXU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix
index 709b9cde7f49..92a26c231d0c 100644
--- a/pkgs/development/python-modules/hikari/default.nix
+++ b/pkgs/development/python-modules/hikari/default.nix
@@ -16,13 +16,13 @@
 }:
 buildPythonPackage rec {
   pname = "hikari";
-  version = "2.0.0.dev126";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "hikari-py";
     repo = "hikari";
-    rev = version;
-    hash = "sha256-KpF9P92IciILV7zlYTCgtMqhudT9uOR2SQJdWDtxYaA=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-/A3D3nG1lSCQU92dM+6YroxWlGKrv47ntkZaJZTAJUA=";
     # The git commit is part of the `hikari.__git_sha1__` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index d9a6917ae5d8..4125f1c19817 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -4,14 +4,17 @@
   fetchFromGitHub,
   pythonOlder,
 
-  # tested using
+  # build-system
+  setuptools,
+
+  # tests
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "hiredis";
-  version = "2.3.2";
-  format = "setuptools";
+  version = "2.4.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -20,9 +23,11 @@ buildPythonPackage rec {
     repo = "hiredis-py";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    hash = "sha256-7hTGXHNECy+dSsop0ULsNZvGFecCIEv+q46s7t/K7k8=";
+    hash = "sha256-PnCSf7ZEPNtweQEnWTHCCVCvg5QGxGeBSAZCFHOziDQ=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "hiredis" ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix
index 063bc93b6aa8..521762308c4b 100644
--- a/pkgs/development/python-modules/hist/default.nix
+++ b/pkgs/development/python-modules/hist/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "hist";
-  version = "2.7.3";
+  version = "2.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+fm1aAmxkLtUZph4nMDX0ECTT8UUHSdjxuSdZegdvAs=";
+    hash = "sha256-Cj5gLdHSchvX8iKfRWcJ3eMj9vdJUvE7pOWYbDJ193s=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 56458ceee14d..926ecee1b3f0 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.59";
+  version = "0.60";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     rev = "refs/tags/v${version}";
-    hash = "sha256-g7ldsWqVWM1FtOB2gFrCuATD5PthZhbelKT4NV6Rovg=";
+    hash = "sha256-Ws+SSzQyfPjjwkXYT1plRtuhMATQYCvH3AKG8llWCGo=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index 5f1963bcdc38..dfadc6952ea4 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "holoviews";
-  version = "1.19.0";
+  version = "1.19.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yrFSL3WptGN3+TZLZ1vv15gS4iAFlxRHCljiFHXVMbo=";
+    hash = "sha256-uehejAcnWkVsDvjQa8FX0Cs37/Zvs2AqoS9chvCEhlw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
index 04e71d133e19..6d54eb16104c 100644
--- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
@@ -1,23 +1,22 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  home-assistant-chip-wheels,
   aenum,
   dacite,
 }:
 
 buildPythonPackage rec {
   pname = "home-assistant-chip-clusters";
-  version = "2024.7.0";
+  inherit (home-assistant-chip-wheels) version;
   format = "wheel";
 
-  src = fetchPypi {
-    inherit format version;
-    pname = "home_assistant_chip_clusters";
-    dist = "py3";
-    python = "py3";
-    hash = "sha256-1yR8Z+R16u099XtxPasmocFbdQPH1Rr6sqngNpWmuWE=";
-  };
+  src = home-assistant-chip-wheels;
+
+  # format=wheel needs src to be a wheel not a folder of wheels
+  preUnpack = ''
+    src=($src/home_assistant_chip_clusters*.whl)
+  '';
 
   propagatedBuildInputs = [
     aenum
@@ -38,6 +37,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = teams.home-assistant.members;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 }
diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
index c9c18a722d1c..229f6867d38c 100644
--- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
@@ -1,70 +1,35 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
-  fetchPypi,
   pythonOlder,
-
-  # build
-  autoPatchelfHook,
-
-  # runtime
-  glib,
-  libnl,
-
-  # propagates
   aenum,
+  home-assistant-chip-wheels,
   coloredlogs,
   construct,
   cryptography,
   dacite,
-  ecdsa,
-  rich,
-  pyyaml,
-  ipdb,
   deprecation,
+  ecdsa,
+  ipdb,
   mobly,
   pygobject3,
+  pyyaml,
+  rich,
 }:
 
 buildPythonPackage rec {
   pname = "home-assistant-chip-core";
-  version = "2024.7.0";
+  inherit (home-assistant-chip-wheels) version;
   format = "wheel";
 
   disabled = pythonOlder "3.7";
 
-  src =
-    let
-      system =
-        {
-          "aarch64-linux" = {
-            name = "aarch64";
-            hash = "sha256-omEYZXAqkB5+trALBTqJ8SBGasTHD2mT2km6FizBvS8=";
-          };
-          "x86_64-linux" = {
-            name = "x86_64";
-            hash = "sha256-mTMXCpYRon8SqZB+0+P4IM+NUUOKBfxjf/NmLTElB+A=";
-          };
-        }
-        .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
-    in
-    fetchPypi {
-      pname = "home_assistant_chip_core";
-      inherit version format;
-      dist = "cp37";
-      python = "cp37";
-      abi = "abi3";
-      platform = "manylinux_2_31_${system.name}";
-      hash = system.hash;
-    };
+  src = home-assistant-chip-wheels;
 
-  nativeBuildInputs = [ autoPatchelfHook ];
-
-  buildInputs = [
-    glib
-    libnl
-  ];
+  # format=wheel needs src to be a wheel not a folder of wheels
+  preUnpack = ''
+    src=($src/home_assistant_chip_core*.whl)
+  '';
 
   propagatedBuildInputs = [
     aenum
@@ -79,7 +44,7 @@ buildPythonPackage rec {
     deprecation
     mobly
     pygobject3
-  ];
+  ] ++ home-assistant-chip-wheels.propagatedBuildInputs;
 
   pythonNamespaces = [
     "chip"
@@ -104,10 +69,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = teams.home-assistant.members;
-    platforms = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 }
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
new file mode 100644
index 000000000000..caec0be06cbf
--- /dev/null
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -0,0 +1,289 @@
+{
+  appdirs,
+  appnope,
+  black,
+  build,
+  clang-tools,
+  click,
+  colorama,
+  coloredlogs,
+  coverage,
+  cryptography,
+  diskcache,
+  fetchFromGitHub,
+  glib,
+  gn,
+  googleapis-common-protos,
+  google-cloud-storage,
+  ipython,
+  jinja2,
+  json5,
+  jsonschema,
+  lark,
+  lib,
+  libnl,
+  mobly,
+  mypy,
+  mypy-extensions,
+  mypy-protobuf,
+  ninja,
+  openssl,
+  packaging,
+  parameterized,
+  pip-tools,
+  pkg-config,
+  prompt-toolkit,
+  protobuf,
+  psutil,
+  ptpython,
+  pyelftools,
+  pygments,
+  pykwalify,
+  pylint,
+  pyperclip,
+  pyserial,
+  python3,
+  python-daemon,
+  pyyaml,
+  requests,
+  setuptools,
+  six,
+  sphinx,
+  sphinx-argparse,
+  sphinx-design,
+  stdenv,
+  stringcase,
+  toml,
+  tornado,
+  types-protobuf,
+  types-pyyaml,
+  types-requests,
+  types-setuptools,
+  watchdog,
+  websockets,
+  wheel,
+  yapf,
+  zap-chip,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "home-assistant-chip-wheels";
+  version = "2024.9.0";
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "chip-wheels";
+    rev = version;
+    fetchSubmodules = false;
+    leaveDotGit = true;
+    hash = "sha256-T0G6mxb/5wFOxPLL92Ay34oP+9Xvk9w0YV9VSzWJuzw=";
+    postFetch = ''
+      cd $out
+      # Download connectedhomeip.
+      git fetch
+      git reset --hard HEAD
+      git submodule update --init --depth 1 connectedhomeip
+
+      # Initialize only necessary submodules.
+      cd connectedhomeip
+      ${python3}/bin/python3 scripts/checkout_submodules.py --platform linux --shallow
+
+      # Keep the output deterministic.
+      cd $out
+      # in case python decided to leave a .pyc file, for example
+      git clean -fxd
+      rm -rf .git/
+    '';
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gn
+    pkg-config
+    ninja
+    clang-tools
+    zap-chip
+    # gdbus-codegen
+    glib
+    python3
+    # dependencies of build scripts
+    click
+    jinja2
+    lark
+    setuptools
+    stringcase
+    build
+    pip-tools
+    black
+    yapf
+  ];
+
+  propagatedBuildInputs = [
+    openssl
+    glib
+    libnl
+  ];
+
+  postPatch = ''
+    cd connectedhomeip
+    export HOME=$(mktemp -d)
+
+    patchShebangs --build scripts
+
+    for patch in ../*.patch; do
+      patch -p1 < $patch
+    done
+
+    # unpin dependencies
+    # there are many files to modify, in different formats
+    sed -i 's/==.*$//' third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/virtualenv_setup/python_base_requirements.txt
+    sed -i 's/==[^;]*//' scripts/setup/constraints.txt
+    sed -i 's/\(^ \+[a-zA-Z0-9-]*\)[=~><]=[^;]*/\1/' third_party/pigweed/repo/pw_protobuf_compiler/py/setup.cfg third_party/pigweed/repo/pw_protobuf/py/setup.cfg third_party/pigweed/repo/pw_protobuf_compiler/py/setup.cfg
+    # remove a few dependencies not packaged in nixpkgs and which are apparently
+    # not needed to build the python bindings of chip
+    sed -i -e '/sphinxcontrib-mermaid/d' -e '/types-six/d' -e '/types-pygment/d' -e '/types-pyserial/d' third_party/pigweed/repo/*/py/setup.cfg
+
+    # obtained by running a build in nix-shell with internet access
+    cp ${./pigweed_environment.gni} build_overrides/pigweed_environment.gni
+
+    # some code is generated by a templating tool (zap-cli)
+    scripts/codepregen.py ./zzz_pregenerated/
+  '';
+
+  # the python parts of the build system work as follows
+  # gn calls pigweed to read a dozen different files to generate
+  # a file looking like requirements.txt. It then calls pip
+  # to install this computed list of dependencies into a virtualenv.
+  # Of course, pip fails in the sandbox, because it cannot download
+  # the python packages.
+  # The documented way of doing offline builds is to create a folder
+  # with wheel files for all dependencies and point pip to it
+  # via its configuration file or environment variables.
+  # https://pigweed.dev/python_build.html#installing-offline
+  # The wheel of a python package foo is available as foo.dist.
+  # So that would be easy, but we also need wheels for transitive dependencies.
+  # the function saturateDependencies below computes this transitive closure.
+  #
+  # yes this list of dependencies contains both build tools and proper dependencies.
+  env.PIP_NO_INDEX = "1";
+  env.PIP_FIND_LINKS =
+    let
+      dependencies = [
+        appdirs
+        appnope
+        black
+        build
+        colorama
+        coloredlogs
+        coverage
+        click
+        cryptography
+        diskcache
+        googleapis-common-protos
+        google-cloud-storage
+        ipython
+        jinja2
+        json5
+        jsonschema
+        lark
+        mobly
+        mypy
+        mypy-extensions
+        mypy-protobuf
+        packaging
+        parameterized
+        pip-tools
+        prompt-toolkit
+        protobuf
+        psutil
+        ptpython
+        pyelftools
+        pygments
+        pykwalify
+        pylint
+        pyperclip
+        pyserial
+        python-daemon
+        pyyaml
+        requests
+        setuptools
+        six
+        sphinx
+        sphinx-argparse
+        sphinx-design
+        stringcase
+        toml
+        tornado
+        types-protobuf
+        types-pyyaml
+        types-requests
+        types-setuptools
+        watchdog
+        websockets
+        wheel
+        yapf
+      ];
+      depListToAttrs =
+        list:
+        builtins.listToAttrs (
+          map (dep: {
+            name = dep.name;
+            value = dep;
+          }) list
+        );
+      saturateDependencies =
+        deps:
+        let
+          before = deps;
+          new = lib.mergeAttrsList (
+            map (dep: depListToAttrs (dep.propagatedBuildInputs or [ ])) (lib.attrValues before)
+          );
+          after = before // new;
+        in
+        if lib.attrNames before != lib.attrNames after then saturateDependencies after else before;
+      saturateDependencyList = list: lib.attrValues (saturateDependencies (depListToAttrs list));
+      saturatedDependencyList = lib.filter (drv: drv ? dist) (saturateDependencyList dependencies);
+    in
+    lib.concatMapStringsSep " " (dep: "file://${dep.dist}") saturatedDependencyList;
+
+  gnFlags = [
+    ''chip_project_config_include_dirs=["//.."]''
+    ''chip_crypto="openssl"''
+    ''enable_rtti=true''
+    ''chip_config_memory_debug_checks=false''
+    ''chip_config_memory_debug_dmalloc=false''
+    ''chip_mdns="minimal"''
+    ''chip_minmdns_default_policy="libnl"''
+    ''chip_python_version="${lib.versions.majorMinor python3.version}"''
+    ''chip_python_platform_tag="any"''
+    ''chip_python_package_prefix="home-assistant-chip"''
+    ''custom_toolchain="custom"''
+    ''target_cc="${stdenv.cc.targetPrefix}cc"''
+    ''target_cxx="${stdenv.cc.targetPrefix}c++"''
+    ''target_ar="${stdenv.cc.targetPrefix}ar"''
+  ];
+
+  preBuild = ''
+    export NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags glib-2.0) -O2 -Wno-error"
+    export NIX_CFLAGS_LINK="$($PKG_CONFIG --libs gio-2.0) $($PKG_CONFIG --libs gobject-2.0) $($PKG_CONFIG --libs glib-2.0)"
+  '';
+
+  ninjaFlags = [ "chip-repl" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r controller/python $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Python wheels for APIs and tools related to CHIP";
+    homepage = "https://github.com/home-assistant-libs/chip-wheels";
+    changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = lib.teams.home-assistant.members;
+  };
+
+}
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/pigweed_environment.gni b/pkgs/development/python-modules/home-assistant-chip-wheels/pigweed_environment.gni
new file mode 100644
index 000000000000..df404dacf394
--- /dev/null
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/pigweed_environment.gni
@@ -0,0 +1,12 @@
+# This file is automatically generated by Pigweed's environment setup. Do not
+# edit it manually or check it in.
+
+# Relative paths are interpreted with respect to this file, which helps
+# determine the correct path even if the source root changes.
+declare_args() {
+  pw_env_setup_CIPD_ARM = get_path_info("../.environment/cipd/packages/arm", "abspath")
+  pw_env_setup_CIPD_PIGWEED = get_path_info("../.environment/cipd/packages/pigweed", "abspath")
+  pw_env_setup_CIPD_PYTHON = get_path_info("../.environment/cipd/packages/python", "abspath")
+  pw_env_setup_CIPD_ZAP = get_path_info("../.environment/cipd/packages/zap", "abspath")
+  pw_env_setup_VIRTUAL_ENV = get_path_info("../.environment/pigweed-venv", "abspath")
+}
diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index dacb9e2dcaaf..baf3e4581e58 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "hstspreload";
-  version = "2024.10.1";
+  version = "2024.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "sethmlarson";
     repo = "hstspreload";
     rev = "refs/tags/${version}";
-    hash = "sha256-so693xMgVb7pUoin3oYT26F02/C5KeVCuPQjOAJ6axQ=";
+    hash = "sha256-Gm0jZbJwVdoU19gkTuzJ9Mop1qsPDboTg53Yiocb3Rc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix
index f5327c0edb40..fc965bbae573 100644
--- a/pkgs/development/python-modules/htseq/default.nix
+++ b/pkgs/development/python-modules/htseq/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   swig,
   cython,
   matplotlib,
@@ -15,25 +14,16 @@
 }:
 buildPythonPackage rec {
   pname = "htseq";
-  version = "2.0.4";
+  version = "2.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "htseq";
     repo = "htseq";
     rev = "release_${version}";
-    hash = "sha256-7ocrmuj9LOtPz9XbI5rKGcdE5JbFz/pZh00Nie65XxE=";
+    hash = "sha256-i83BY7/p98/pfYzebolNW/6yNwtb2R5ARCSG3rAq2/M=";
   };
 
-  patches = [
-    # https://github.com/htseq/htseq/pull/84
-    (fetchpatch {
-      name = "replace-distutils-with-sysconfig.patch";
-      url = "https://github.com/htseq/htseq/commit/f0f1e464ee9aee56f0b44f905e7b3355b0bb8f29.patch";
-      hash = "sha256-yDYkXCPy+YFgnk1rnXwCB998aZwVd5nJeejZIgeEzAo=";
-    })
-  ];
-
   nativeBuildInputs = [ swig ];
 
   build-system = [
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 979fe3b3ef51..9883280006ed 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "1.0.5";
+  version = "1.0.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,15 +33,15 @@ buildPythonPackage rec {
     owner = "encode";
     repo = "httpcore";
     rev = "refs/tags/${version}";
-    hash = "sha256-05jYLrBiPRg1qQEz8mRvYJKHFsfneh7z9yHIXuYYa5o=";
+    hash = "sha256-sF/ymIoEnqWRX9b8knojIw+ySci/obXSttaNJLb+/nE=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-fancy-pypi-readme
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     certifi
     h11
   ];
diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index 86b4e4e51224..c5d776302319 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "httpie";
-  version = "3.2.3";
+  version = "3.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "httpie";
     repo = "httpie";
     rev = "refs/tags/${version}";
-    hash = "sha256-ogUqhMVY1fm+hKCMFYqfYsqHX+Gj6y8CMOUsxA3q29g=";
+    hash = "sha256-uZKkUUrPPnLHPHL8YrZgfsyCsSOR0oZ2eFytiV0PIUY=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/httpx-oauth/default.nix b/pkgs/development/python-modules/httpx-oauth/default.nix
new file mode 100644
index 000000000000..1be59926112d
--- /dev/null
+++ b/pkgs/development/python-modules/httpx-oauth/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fastapi,
+  fetchFromGitHub,
+  hatchling,
+  hatch-regex-commit,
+  httpx,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytest-mock,
+  pytestCheckHook,
+  respx,
+}:
+
+buildPythonPackage rec {
+  pname = "httpx-oauth";
+  version = "0.15.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "frankie567";
+    repo = "httpx-oauth";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-f3X3kSw7elTScCA3bNggwXyyHORre6Xzup/D0kgn4DQ=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-regex-commit
+  ];
+
+  dependencies = [ httpx ];
+
+  nativeCheckInputs = [
+    fastapi
+    pytest-asyncio
+    pytest-cov-stub
+    pytest-mock
+    pytestCheckHook
+    respx
+  ];
+
+  pythonImportsCheck = [ "httpx_oauth" ];
+
+  meta = with lib; {
+    description = "Async OAuth client using HTTPX";
+    homepage = "https://github.com/frankie567/httpx-oauth";
+    changelog = "https://github.com/frankie567/httpx-oauth/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix
index 97d65fafa3f2..4d46ed9b4588 100644
--- a/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/pkgs/development/python-modules/httpx-socks/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "httpx-socks";
-  version = "0.9.1";
+  version = "0.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,16 +31,16 @@ buildPythonPackage rec {
     owner = "romis2012";
     repo = "httpx-socks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA=";
+    hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     httpx
     httpcore
     python-socks
-  ];
+  ] ++ python-socks.optional-dependencies.asyncio;
 
   optional-dependencies = {
     asyncio = [ async-timeout ];
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 0a32af68bab9..f4572167049f 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -27,11 +27,12 @@
   pytest-trio,
   trustme,
   uvicorn,
+  zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "httpx";
-  version = "0.27.0";
+  version = "0.27.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -40,10 +41,10 @@ buildPythonPackage rec {
     owner = "encode";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-13EnSzrCkseK6s6Yz9OpLzqo/2PTFiB31m5fAIJLoZg=";
+    hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatchling
   ];
@@ -57,14 +58,15 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    http2 = [ h2 ];
-    socks = [ socksio ];
     brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
     cli = [
       click
       rich
       pygments
     ];
+    http2 = [ h2 ];
+    socks = [ socksio ];
+    zstd = [ zstandard ];
   };
 
   # trustme uses pyopenssl
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 4c2a46563665..00fab837e3ce 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.26.1";
+  version = "0.26.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg=";
+    hash = "sha256-F2E8P0Hq3Ee+RXUEN4t2JtfBtK36aMsHQCnid9VWdLk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index dbc0bdf1caef..e8fba82004d1 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "humanize";
-  version = "4.10.0";
+  version = "4.11.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "python-humanize";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-zzasFAaWH284IEnWwWKvCL1lt/ItNfdbWhq1K30gSPU=";
+    hash = "sha256-C6u7t7RedInHJtN4yHli22Wc7llnrxn4YeKssyQ+hS4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix
index 7e8d4ff033b7..8eb7b4567459 100644
--- a/pkgs/development/python-modules/huum/default.nix
+++ b/pkgs/development/python-modules/huum/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "huum";
-  version = "0.7.10";
+  version = "0.7.11";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "frwickst";
     repo = "pyhuum";
     rev = "refs/tags/${version}";
-    hash = "sha256-INW6d/Zc5UZZOgN6wW+Xbm/wH1K/V6bviu3mID1R+BY=";
+    hash = "sha256-anYVrisn68EFpMsZXQb4PMsDKpRzUomoaJpOFtYVzhc=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 4379303f3dba..efada0d391d0 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.108.5";
+  version = "6.112.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "hypothesis-python-${version}";
-    hash = "sha256-APZTI7AxbtLT+2mkxUapr1sPcq4ViMXy1J6g0I30s5A=";
+    hash = "sha256-KVi4BAgrswvhZxArYVnYQ6ksvCf84aSEZbJcRSlwsZE=";
   };
 
   # I tried to package sphinx-selective-exclude, but it throws
diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index c53c3c2e3670..fa40d34c8a82 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -45,6 +45,8 @@ buildPythonPackage rec {
   disabledTests = [
     # super slow
     "test_source_code_from_libcst_node_type"
+    # https://github.com/Zac-HD/hypothesmith/issues/38
+    "test_black_autoformatter_from_grammar"
   ];
 
   pythonImportsCheck = [ "hypothesmith" ];
diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix
index 2d3f2563ad01..5288be1c30a3 100644
--- a/pkgs/development/python-modules/hyppo/default.nix
+++ b/pkgs/development/python-modules/hyppo/default.nix
@@ -1,31 +1,32 @@
 {
   lib,
-  buildPythonPackage,
-  pythonOlder,
-  fetchFromGitHub,
-  setuptools,
-  pytestCheckHook,
   autograd,
+  buildPythonPackage,
+  fetchFromGitHub,
+  future,
+  matplotlib,
   numba,
   numpy,
+  pytestCheckHook,
+  pythonOlder,
   scikit-learn,
   scipy,
-  matplotlib,
   seaborn,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "hyppo";
-  version = "0.4.0";
+  version = "0.5.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "neurodata";
-    repo = pname;
+    repo = "hyppo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QRE3oSxTEobTQ/7DzCAUOdjzIZmWUn9bgPmJWj6JuZg=";
+    hash = "sha256-bYxqYSOOifQE3gbw8vNk/A13D5TPx7ERSgFvRHMXKGM=";
   };
 
   # some of the doctests (4/21) are broken, e.g. unbound variables, nondeterministic with insufficient tolerance, etc.
@@ -36,8 +37,9 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     autograd
+    future
     numba
     numpy
     scikit-learn
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index de07c1d262df..ac33fe0bc15d 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -57,7 +57,6 @@ let
   testBackends = [
     "duckdb"
     "sqlite"
-    "datafusion"
   ];
 
   ibisTestingData = fetchFromGitHub {
@@ -66,7 +65,7 @@ let
     repo = "testing-data";
     # https://github.com/ibis-project/ibis/blob/9.5.0/nix/overlay.nix#L20-L26
     rev = "b26bd40cf29004372319df620c4bbe41420bb6f8";
-    sha256 = "sha256-1fenQNQB+Q0pbb0cbK2S/UIwZDE4PXXG15MH3aVbyLU=";
+    hash = "sha256-1fenQNQB+Q0pbb0cbK2S/UIwZDE4PXXG15MH3aVbyLU=";
   };
 in
 
@@ -92,9 +91,20 @@ buildPythonPackage rec {
       url = "https://github.com/ibis-project/ibis/commit/a54eceabac1d6592e9f6ab0ca7749e37a748c2ad.patch";
       hash = "sha256-j5BPYVqnEF9GQV5N3/VhFUCdsEwAIOQC0KfZ5LNBSRg=";
     })
+
+    # remove after the 10.0 release
+    (fetchpatch {
+      name = "ibis-framework-arrow-18.patch";
+      url = "https://github.com/ibis-project/ibis/commit/5dc549b22c2eca29a11a31fb29deef7c1466a204.patch";
+      hash = "sha256-4i/g2uixdlkbE6x659wzZJ91FZpzwOVkF6ZeXkiCP3I=";
+      excludes = [
+        "poetry.lock"
+        "requirements-dev.txt"
+      ];
+    })
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
     poetry-dynamic-versioning
   ];
@@ -102,7 +112,7 @@ buildPythonPackage rec {
   dontBypassPoetryDynamicVersioning = true;
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = lib.head (lib.strings.splitString "-" version);
 
-  propagatedBuildInputs = [
+  dependencies = [
     atpublic
     parsy
     python-dateutil
@@ -128,12 +138,9 @@ buildPythonPackage rec {
     pytest-xdist
   ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends;
 
-  dontUsePytestXdist = true;
-
   pytestFlagsArray = [
     "-m"
-    # tpcds and tpch are slow, so disable them
-    "'not tpcds and not tpch and (${lib.concatStringsSep " or " testBackends} or core)'"
+    "'${lib.concatStringsSep " or " testBackends} or core'"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 81ce3ddee218..f301901ef5f7 100644
--- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -14,14 +14,15 @@
 
 buildPythonPackage rec {
   pname = "ibm-cloud-sdk-core";
-  version = "3.20.1";
+  version = "3.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nE1JIlYlJ5O3L7FQD5L+JvLnVs7nq4Ff6dmHvgXjj0M=";
+    pname = "ibm_cloud_sdk_core";
+    inherit version;
+    hash = "sha256-G3LvZ13f/aJbCMQ7hLi25U0rXiGvHhvT6FB6LSVxpUQ=";
   };
 
   pythonRelaxDeps = [ "requests" ];
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index e44da7b58abe..a3fff70db1b4 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "idna";
-  version = "3.7";
+  version = "3.10";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ao/zqt8GCcH9J42OowiSmUEqeoub0AXdCLn4KFvLXPw=";
+    hash = "sha256-EvZcm0cKvabcNc+OY8xXSxxSsR3yyGAwrwrAmwGxPqk=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index 80acaeb1f10d..c9b5183e4f9e 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     # ifcopenshell needs stdc++
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     boost179
     cgal
     eigen
diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix
index fa92484160e1..280770b8a63e 100644
--- a/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -5,7 +5,7 @@
   numpy,
   scikit-image,
   lib,
-  opencv4,
+  opencv-python,
 }:
 
 buildPythonPackage rec {
@@ -18,14 +18,12 @@ buildPythonPackage rec {
     sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
     scikit-image
-    opencv4
+    opencv-python
   ];
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix
index 782aab2360d4..c53243e48f00 100644
--- a/pkgs/development/python-modules/imagehash/default.nix
+++ b/pkgs/development/python-modules/imagehash/default.nix
@@ -2,41 +2,52 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
   numpy,
-  six,
-  scipy,
   pillow,
+  pytestCheckHook,
+  pythonOlder,
   pywavelets,
+  scipy,
+  setuptools,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "imagehash";
-  version = "4.3.1";
-  format = "setuptools";
+  version = "4.3.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "JohannesBuchner";
     repo = "imagehash";
-    rev = "v${version}";
-    hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     numpy
-    six
     scipy
     pillow
     pywavelets
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    six
+  ];
+
+  pythonImportsCheck = [ "imagehash" ];
 
   meta = with lib; {
     description = "Python Perceptual Image Hashing Module";
-    mainProgram = "find_similar_images.py";
     homepage = "https://github.com/JohannesBuchner/imagehash";
+    changelog = "https://github.com/JohannesBuchner/imagehash/releases/tag/v${version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ e1mo ];
+    mainProgram = "find_similar_images.py";
   };
 }
diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix
index 2204450bed74..9727da3837f6 100644
--- a/pkgs/development/python-modules/imantics/default.nix
+++ b/pkgs/development/python-modules/imantics/default.nix
@@ -4,7 +4,7 @@
   lib,
   setuptools,
   numpy,
-  opencv4,
+  opencv-python,
   lxml,
   xmljson,
   pytestCheckHook,
@@ -22,13 +22,11 @@ buildPythonPackage rec {
     sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
-    opencv4
+    opencv-python
     lxml
     xmljson
   ];
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 21a9f2607e83..c6c0f3f43897 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "imap-tools";
-  version = "1.7.3";
+  version = "1.7.4";
 
   disabled = pythonOlder "3.5";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "ikvk";
     repo = "imap_tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-orzU5jTFTj8O1zYDUDJYbXGpfZ60Egz0/eUttvej08k=";
+    hash = "sha256-2qSmnJnjwXNysUh0xeXshLZklCIOd92aM3gXtL8JhlI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 6be9824a37a1..4bed24b4bdae 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "import-expression";
-  version = "2.0.0";
+  version = "2.1.0.post1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "import_expression";
     inherit version;
-    hash = "sha256-Biw7dIOPKbDcqYJSCyeqC/seREcVihSZuaKNFfgjTew=";
+    hash = "sha256-mclYGeuISXUDrOS1mhpVgDp1439KnHAwzHKIbRtdibQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index c5de999be223..2d6164d53d8c 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -15,23 +15,23 @@
 
 buildPythonPackage rec {
   pname = "importlib-metadata";
-  version = "7.1.0";
-  format = "pyproject";
+  version = "8.5.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "importlib_metadata";
     inherit version;
-    hash = "sha256-t4k4uSbujV8CD8R3LUhwRYBaVd260uzyHG1gk43H/NI=";
+    hash = "sha256-cVImVvCrrOHQcrnlSBpI8HwTjgDwecOMj4g4I/nCa9c=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools # otherwise cross build fails
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     toml
     zipp
   ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix
index eea1111ff05e..b9f05dda461c 100644
--- a/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/pkgs/development/python-modules/importlib-resources/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "importlib-resources";
-  version = "6.4.0";
+  version = "6.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "importlib_resources";
     inherit version;
-    hash = "sha256-zbK0U7gEbKTjeY6x2E88zhRGoOjnte9O+2APGfw5gUU=";
+    hash = "sha256-mAhiodFsnhR6WWA2d/oqpf2CuH8iO2y4cGlbz86DAGU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 50d7deb1660b..bfff7bcd5cb7 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "inflect";
-  version = "7.3.1";
+  version = "7.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "jaraco";
     repo = "inflect";
     rev = "refs/tags/v${version}";
-    hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs=";
+    hash = "sha256-3I5AdMuxwKtztnrF0lbvBIUxfqn0WlY2Pv6GYitFrA8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index 37e365781573..bf9f8fe408dd 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -7,8 +7,9 @@
   dirty-equals,
   executing,
   fetchFromGitHub,
+  hatchling,
   hypothesis,
-  poetry-core,
+  pydantic,
   pyright,
   pytest-subtests,
   pytest-xdist,
@@ -18,11 +19,12 @@
   time-machine,
   toml,
   types-toml,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "inline-snapshot";
-  version = "0.10.2";
+  version = "0.13.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -31,24 +33,29 @@ buildPythonPackage rec {
     owner = "15r10nk";
     repo = "inline-snapshot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-19rvhqYkM3QiD0La5TRi/2uKza8HW/bnXeGAhOZ/bgs=";
+    hash = "sha256-hwt/EFYedrml0x58Rd1AjqrIlELAXp1ku8v7glhCebE=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
-  dependencies = [
-    asttokens
-    black
-    click
-    executing
-    rich
-    toml
-    types-toml
-  ];
+  dependencies =
+    [
+      asttokens
+      black
+      click
+      executing
+      rich
+      typing-extensions
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [
+      types-toml
+      toml
+    ];
 
   nativeCheckInputs = [
     dirty-equals
     hypothesis
+    pydantic
     pyright
     pytest-subtests
     pytest-xdist
diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix
index 63db32d65b53..331b98809bef 100644
--- a/pkgs/development/python-modules/inquirer/default.nix
+++ b/pkgs/development/python-modules/inquirer/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "inquirer";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "magmax";
     repo = "python-inquirer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-M4EgQ/DX00CtAXRNvXoVKVWxj1jRpnNdG4qxOv20/MI=";
+    hash = "sha256-vIW/rD22PFND9EPjS0YPbIauKgh9KHh1gXf1L8g/f10=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix
index 4b4787d0a418..41be9460fded 100644
--- a/pkgs/development/python-modules/insightface/default.nix
+++ b/pkgs/development/python-modules/insightface/default.nix
@@ -7,6 +7,7 @@
   fetchPypi,
   insightface,
   matplotlib,
+  mxnet,
   numpy,
   onnx,
   onnxruntime,
@@ -45,6 +46,7 @@ buildPythonPackage rec {
     albumentations
     easydict
     matplotlib
+    mxnet # used in insightface/commands/rec_add_mask_param.py
     numpy
     onnx
     onnxruntime
@@ -58,20 +60,26 @@ buildPythonPackage rec {
     tqdm
   ];
 
+  # aarch64-linux tries to get cpu information from /sys, which isn't available
+  # inside the nix build sandbox.
+  dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux";
+
+  passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") {
+    version = testers.testVersion {
+      package = insightface;
+      command = "insightface-cli --help";
+      # Doesn't support --version but we still want to make sure the cli is executable
+      # and returns the help output
+      version = "help";
+    };
+  };
+
   pythonImportsCheck = [
     "insightface"
     "insightface.app"
     "insightface.data"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = insightface;
-    command = "insightface-cli --help";
-    # Doesn't support --version but we still want to make sure the cli is executable
-    # and returns the help output
-    version = "help";
-  };
-
   doCheck = false; # Upstream has no tests
 
   meta = {
@@ -80,7 +88,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/deepinsight/insightface";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ oddlama ];
-    # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
-    broken = stdenv.system == "aarch64-linux";
   };
 }
diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index b6b51142e80e..af7c9581e7eb 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -24,19 +24,20 @@
   jinja2,
   pytest-asyncio,
   pytestCheckHook,
+  python-dotenv,
   redis,
 }:
 
 buildPythonPackage rec {
   pname = "instructor";
-  version = "1.5.0";
+  version = "1.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jxnl";
     repo = "instructor";
     rev = "refs/tags/${version}";
-    hash = "sha256-UrLbKDaQu2ioQHqKKS8SdRTpQj+Z0w+bcLrRuZT3DC0=";
+    hash = "sha256-L/7oErXu0U2G20pFfEReSKAK3P1BseybnPHazA7w6cM=";
   };
 
   pythonRelaxDeps = [
@@ -67,6 +68,7 @@ buildPythonPackage rec {
     jinja2
     pytest-asyncio
     pytestCheckHook
+    python-dotenv
     redis
   ];
 
@@ -89,9 +91,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    broken = lib.versionOlder pydantic.version "2"; # ImportError: cannot import name 'TypeAdapter' from 'pydantic'
     description = "Structured outputs for llm";
     homepage = "https://github.com/jxnl/instructor";
-    changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}";
+    changelog = "https://github.com/jxnl/instructor/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mic92 ];
     mainProgram = "instructor";
diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix
index 445774979df7..d7ad922cf538 100644
--- a/pkgs/development/python-modules/invisible-watermark/default.nix
+++ b/pkgs/development/python-modules/invisible-watermark/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  opencv4,
+  opencv-python,
   torch,
   onnx,
   onnxruntime,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [
-      opencv4
+      opencv-python
       torch
       pillow
       pywavelets
@@ -42,8 +42,6 @@ buildPythonPackage rec {
     ];
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace 'opencv-python>=4.1.0.25' 'opencv'
     substituteInPlace imwatermark/rivaGan.py --replace \
       'You can install it with pip: `pip install onnxruntime`.' \
       'You can install it with an override: `python3Packages.invisible-watermark.override { withOnnx = true; };`.'
diff --git a/pkgs/development/python-modules/iosbackup/default.nix b/pkgs/development/python-modules/iosbackup/default.nix
new file mode 100644
index 000000000000..41904c36336c
--- /dev/null
+++ b/pkgs/development/python-modules/iosbackup/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  nskeyedunarchiver,
+  pycrypto,
+}:
+
+buildPythonPackage rec {
+  pname = "iosbackup";
+  version = "0.9.925";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "iOSbackup";
+    hash = "sha256-M1Rakknls/qq3x7ngv5r3823D64N77oazuM2pl+T0co=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pycrypto
+    nskeyedunarchiver
+  ];
+
+  pythonImportsCheck = [ "iOSbackup" ];
+
+  meta = {
+    description = "Reads and extracts files from password-encrypted iOS backups";
+    homepage = "https://github.com/avibrazil/iOSbackup";
+    license = lib.licenses.lgpl2Only;
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index c7408868ad91..d81577d40bbf 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -11,18 +11,19 @@
   pythonOlder,
   pytz,
   setuptools-scm,
+  importlib-resources,
 }:
 
 buildPythonPackage rec {
   pname = "irc";
-  version = "20.4.3";
+  version = "20.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dXguOB679BBEP3kU/XTKF/vcRBTRTUjaVhSZ6wlY0AI=";
+    hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -34,10 +35,12 @@ buildPythonPackage rec {
     jaraco-stream
     jaraco-text
     pytz
-  ];
+  ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  __darwinAllowLocalNetworking = true;
+
   pythonImportsCheck = [ "irc" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix
index 61e835890c32..9d193a2dbd64 100644
--- a/pkgs/development/python-modules/iterm2/default.nix
+++ b/pkgs/development/python-modules/iterm2/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "iterm2";
-  version = "2.7";
+  version = "2.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA=";
+    hash = "sha256-kNPobWr12VXDGZk8g1LPPpPHoMkZ7Ysq1VGnQrh+iJs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix
index 5b08f94e984d..128592ba047d 100644
--- a/pkgs/development/python-modules/jaraco-collections/default.nix
+++ b/pkgs/development/python-modules/jaraco-collections/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "jaraco-collections";
-  version = "5.0.1";
-  format = "pyproject";
+  version = "5.1.0";
+  pyproject = true;
 
   src = fetchPypi {
-    pname = "jaraco.collections";
+    pname = "jaraco_collections";
     inherit version;
-    hash = "sha256-gIYxsXS4Sk4qWSSQ1i9i38FdgEeg9xVyYJjcQ7gabPo=";
+    hash = "sha256-DkgpQJ05rRikCqZ1T+4nZ/TZcwxLpm3J34nx0nVplMI=";
   };
 
   postPatch = ''
@@ -24,12 +24,12 @@ buildPythonPackage rec {
     sed -i "/'jaraco.text',/d" setup.cfg
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jaraco-classes
     jaraco-text
   ];
diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix
index c0ea092b0fc1..6021e74f4c69 100644
--- a/pkgs/development/python-modules/jaraco-context/default.nix
+++ b/pkgs/development/python-modules/jaraco-context/default.nix
@@ -9,21 +9,21 @@
 
 buildPythonPackage rec {
   pname = "jaraco-context";
-  version = "5.3.0";
-  format = "pyproject";
+  version = "6.0.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.context";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Caj51qBLHbuiey023iLc+N2M8QiJKH8G/Pzu1v3AToU=";
+    hash = "sha256-WXZX2s9Qehp0F3bSv2c5lGxhhn6HKFkABbtYKizG1/8=";
   };
 
   pythonNamespaces = [ "jaraco" ];
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   dependencies = lib.optionals (pythonOlder "3.12") [ backports-tarfile ];
 
diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix
index 4af7e125b83d..bbc107fdda4f 100644
--- a/pkgs/development/python-modules/jaraco-functools/default.nix
+++ b/pkgs/development/python-modules/jaraco-functools/default.nix
@@ -1,31 +1,43 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchPypi,
+  jaraco-classes,
   more-itertools,
-  setuptools,
+  pytestCheckHook,
   setuptools-scm,
+  setuptools,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "jaraco-functools";
-  version = "4.0.1";
+  version = "4.1.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchPypi {
     pname = "jaraco_functools";
     inherit version;
-    hash = "sha256-0z+nZTdMBhG1L4s6eV+JAIaaqIyEdp1NF0bNaPsow+g=";
+    hash = "sha256-cPfg4q4HZJjiElYjJegFIE/Akte0wX4OhslZ4klwGp0=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [ more-itertools ];
+  dependencies = [ more-itertools ];
 
-  doCheck = false;
+  nativeCheckInputs = [
+    jaraco-classes
+    pytestCheckHook
+  ];
+
+  # test is flaky on darwin
+  disabledTests = if stdenv.isDarwin then [ "test_function_throttled" ] else null;
 
   pythonNamespaces = [ "jaraco" ];
 
@@ -34,6 +46,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Additional functools in the spirit of stdlib's functools";
     homepage = "https://github.com/jaraco/jaraco.functools";
+    changelog = "https://github.com/jaraco/jaraco.functools/blob/v${version}/NEWS.rst";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/jaraco-stream/default.nix b/pkgs/development/python-modules/jaraco-stream/default.nix
index a516bf33b0b3..33b0ea2e9d33 100644
--- a/pkgs/development/python-modules/jaraco-stream/default.nix
+++ b/pkgs/development/python-modules/jaraco-stream/default.nix
@@ -1,24 +1,42 @@
 {
+  lib,
   buildPythonPackage,
   fetchPypi,
+  more-itertools,
+  pytestCheckHook,
+  pythonOlder,
   setuptools-scm,
-  six,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "jaraco-stream";
-  version = "3.0.3";
-  format = "setuptools";
+  version = "3.0.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    pname = "jaraco.stream";
+    pname = "jaraco_stream";
     inherit version;
-    sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441";
+    sha256 = "sha256-4rxQKOch7SzIUrluyaM/K3Zk6bLb+H7vvmF9EmZBk0s=";
   };
 
+  build-system = [ setuptools-scm ];
+
+  propagatedBuildInputs = [ more-itertools ];
+
   pythonNamespaces = [ "jaraco" ];
 
-  doCheck = false;
-  buildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ six ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "jaraco.stream" ];
+
+  meta = with lib; {
+    description = "Module with routines for handling streaming data";
+    homepage = "https://github.com/jaraco/jaraco.stream";
+    changelog = "https://github.com/jaraco/jaraco.stream/blob/v${version}/NEWS.rst";
+    license = licenses.mit;
+    maintainers = [ ];
+  };
 }
diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix
index 5ff8b117eb80..06dc0fef613a 100644
--- a/pkgs/development/python-modules/jaraco-text/default.nix
+++ b/pkgs/development/python-modules/jaraco-text/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "jaraco-text";
-  version = "3.12.1";
+  version = "3.14.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jaraco_text";
     inherit version;
-    hash = "sha256-tplJH50HS0/q/f2gQH+lu8XYP0hWB6AS6TRyuhYfaEM=";
+    hash = "sha256-7RTk33dT5A/e88oOtT9r6fXvl0gYBult4mw6cunCk/Y=";
   };
 
   pythonNamespaces = [ "jaraco" ];
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index a08264849770..5b7fb2d88a93 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -189,7 +189,7 @@ buildPythonPackage {
     lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
     ++ lib.optionals cudaSupport [ autoAddDriverRunpath ];
   # Dynamic link dependencies
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   # jaxlib contains shared libraries that open other shared libraries via dlopen
   # and these implicit dependencies are not recognized by ldd or
diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index e67d04be02c1..c4574b6ea00e 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "jedi-language-server";
-  version = "0.41.4";
+  version = "0.42.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "pappasam";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RDLwL9AZ3G8CzVwDtWqFFZNH/ulpHeFBhglbWNv/ZIk=";
+    hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
index 739a0937a4aa..9fb7c6ccbd3b 100644
--- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -2,34 +2,39 @@
   lib,
   buildPythonPackage,
   certifi,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
+  setuptools,
   requests,
   urllib3,
   websocket-client,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "jellyfin-apiclient-python";
-  version = "1.9.2";
-  format = "setuptools";
+  version = "1.10.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-vMzZeoiWli3HjM8Dqr5RhNfR7gcjPqoXG3b/aNNlx2Q=";
+  src = fetchFromGitHub {
+    owner = "jellyfin";
+    repo = "jellyfin-apiclient-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-H1FqypNuVIZ17cFdNDEmmKICswxJkUGq2LhlingbCVk=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     certifi
     requests
     urllib3
     websocket-client
   ];
 
-  # Module has no test
-  doCheck = false;
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "jellyfin_apiclient_python" ];
 
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 6e4cb647e865..a1ac389acdee 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "6.3.0";
+  version = "6.4.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RD9VQFlwLJ3TiReKty+q056CjsOnSD2J2bpASmqHIEM=";
+    hash = "sha256-Re7rNAcm0cpSx1tmSzTjfDlW7y236lzFKFjVw0uUTmw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock
index d19633c580b9..c18b820841c1 100644
--- a/pkgs/development/python-modules/jiter/Cargo.lock
+++ b/pkgs/development/python-modules/jiter/Cargo.lock
@@ -23,9 +23,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bencher"
@@ -47,13 +47,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.104"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
+ "shlex",
 ]
 
 [[package]]
@@ -64,9 +64,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "codspeed"
-version = "2.6.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089"
+checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97"
 dependencies = [
  "colored",
  "libc",
@@ -75,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-bencher-compat"
-version = "2.6.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceaba84ea2634603a0f199c07fa39ff4dda61f89a3f9149fb89b035bc317b671"
+checksum = "025afeee31b5b589484a884c7eb92bf80e0a5420bc4cb1f00d3a08c000211558"
 dependencies = [
  "bencher",
  "codspeed",
@@ -107,7 +107,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "fuzz"
-version = "0.5.0"
+version = "0.6.1"
 dependencies = [
  "indexmap",
  "jiter",
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 
 [[package]]
 name = "heck"
@@ -143,9 +143,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -165,7 +165,7 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jiter"
-version = "0.5.0"
+version = "0.6.1"
 dependencies = [
  "ahash",
  "bencher",
@@ -184,7 +184,7 @@ dependencies = [
 
 [[package]]
 name = "jiter-python"
-version = "0.5.0"
+version = "0.6.1"
 dependencies = [
  "jiter",
  "pyo3",
@@ -192,9 +192,9 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -237,9 +237,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -252,6 +252,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -291,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "paste"
@@ -303,24 +309,24 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.22.0"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1962a33ed2a201c637fc14a4e0fd4e06e6edfdeee6a5fede0dab55507ad74cf7"
+checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -337,19 +343,20 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.0"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7164b2202753bd33afc7f90a10355a719aa973d1f94502c50d06f3488bc420"
+checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
 dependencies = [
  "once_cell",
+ "python3-dll-a",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.0"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6424906ca49013c0829c5c1ed405e20e2da2dc78b82d198564880a704e6a7b7"
+checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -357,9 +364,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.0"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b2f19e153122d64afd8ce7aaa72f06a00f52e34e1d1e74b6d71baea396460a"
+checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -369,9 +376,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.0"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd698c04cac17cf0fe63d47790ab311b8b25542f5cb976b65c374035c50f1eef"
+checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -381,10 +388,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.36"
+name = "python3-dll-a"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -403,18 +419,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -423,16 +439,23 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "indexmap",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -447,9 +470,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -464,15 +487,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unindent"
@@ -482,9 +505,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
 
 [[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 = "wasi"
diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix
index 4f23966dcc16..5aed4511b50c 100644
--- a/pkgs/development/python-modules/jiter/default.nix
+++ b/pkgs/development/python-modules/jiter/default.nix
@@ -6,18 +6,19 @@
   libiconv,
   dirty-equals,
   pytestCheckHook,
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
   pname = "jiter";
-  version = "0.5.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "jiter";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EgovddXbwutLaVkosdbJ2Y3BpEms+RoeaO8ghBRNdio=";
+    hash = "sha256-XYOdy7jduPak8XBL2hdAQfBxrmPq/nyzNlA4RygCtK0=";
   };
 
   postPatch = ''
@@ -41,6 +42,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
+
   meta = {
     description = "Fast iterable JSON parser";
     homepage = "https://github.com/pydantic/jiter/";
diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index 1a7ef06797b9..a99b356ad5e1 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,21 +8,24 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.27.2";
+  version = "0.29.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
-    rev = "refs/tags/${version}";
-    hash = "sha256-NYY76sIp4XirVifOPOs6iEzP93ERzNIHAvpgU4+fi24=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-EP8uaH9vbpbgWtQTm+c2mbO2h1t6aK1ENpVw/Dkx2/U=";
   };
 
   build-system = [ setuptools ];
 
   nativeBuildInputs = [ pytestCheckHook ];
 
-  disabledTestPaths = [ "tests/test_performance.py" ];
+  disabledTestPaths = [
+    "tests/test_performance.py"
+    "tests/test_coverage.py"
+  ];
 
   pythonImportsCheck = [ "json_repair" ];
 
diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix
index fd8fb22ac0ea..b5ac94fb0009 100644
--- a/pkgs/development/python-modules/json5/default.nix
+++ b/pkgs/development/python-modules/json5/default.nix
@@ -1,31 +1,37 @@
 {
+  lib,
   buildPythonPackage,
   fetchFromGitHub,
-  lib,
   pytestCheckHook,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "json5";
-  version = "0.9.14";
-  format = "setuptools";
+  version = "0.9.25";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "dpranke";
     repo = "pyjson5";
-    rev = "v${version}";
-    hash = "sha256-cshP1kraLENqWuQTlm4HPAP/0ywRRLFOJI8mteWcjR4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2JAZHayPyi2RI4apODQ9QDXSUI8n54SwQAxZiBhuJrE=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "json5" ];
 
   meta = with lib; {
-    homepage = "https://github.com/dpranke/pyjson5";
     description = "Python implementation of the JSON5 data format";
-    mainProgram = "pyjson5";
+    homepage = "https://github.com/dpranke/pyjson5";
     license = licenses.asl20;
     maintainers = with maintainers; [ veehaitch ];
+    mainProgram = "pyjson5";
   };
 }
diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix
index 5b5f67ce5264..2ddfd381f64d 100644
--- a/pkgs/development/python-modules/jsondiff/default.nix
+++ b/pkgs/development/python-modules/jsondiff/default.nix
@@ -1,25 +1,43 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  pyyaml,
+
+  # tests
+  hypothesis,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "jsondiff";
-  version = "2.0.0";
-  format = "setuptools";
+  version = "2.2.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q=";
+  src = fetchFromGitHub {
+    owner = "xlwings";
+    repo = "jsondiff";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0EnI7f5t7Ftl/8UcsRdA4iVQ78mxvPucCJjFJ8TMwww=";
   };
 
-  postPatch = ''
-    sed -e "/'jsondiff=jsondiff.cli:main_deprecated',/d" -i setup.py
-  '';
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  # No tests
-  doCheck = false;
+  dependencies = [ pyyaml ];
+
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
 
   meta = {
     description = "Diff JSON and JSON-like structures in Python";
diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index dfb40be4bb61..c64949de233c 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "jsonpickle";
-  version = "3.2.1";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S212QJdBmfes+QNSlTZbWhpxqREJ7/oVuhcPu0jPhxw=";
+    hash = "sha256-q0Z+YB5bGhzXbxgZ0BR5UWXaBxdE7zC/N4bpvFSd4lo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index cc0adcaffc16..1cbae4a0b4ef 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -29,27 +29,27 @@
 
 buildPythonPackage rec {
   pname = "jsonschema";
-  version = "4.22.0";
-  format = "pyproject";
+  version = "4.23.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WyLUNKRZNRGa+ZBVLIYuXW1WTo9mASBrMFph/fZhorc=";
+    hash = "sha256-1xSX/vJjUaMyZTN/p3/+uCQj8+ohKDzZRnuwOZkma8Q=";
   };
 
   postPatch = ''
     patchShebangs json/bin/jsonschema_suite
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs =
+  dependencies =
     [
       attrs
       jsonschema-specifications
@@ -93,9 +93,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Implementation of JSON Schema validation";
-    mainProgram = "jsonschema";
     homepage = "https://github.com/python-jsonschema/jsonschema";
+    changelog = "https://github.com/python-jsonschema/jsonschema/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ domenkozar ];
+    mainProgram = "jsonschema";
   };
 }
diff --git a/pkgs/development/python-modules/jupysql-plugin/default.nix b/pkgs/development/python-modules/jupysql-plugin/default.nix
index 40ddfaab803f..4ca16978ac1b 100644
--- a/pkgs/development/python-modules/jupysql-plugin/default.nix
+++ b/pkgs/development/python-modules/jupysql-plugin/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "jupysql-plugin";
-  version = "0.4.4";
+  version = "0.4.5";
 
   pyproject = true;
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jupysql_plugin";
     inherit version;
-    hash = "sha256-kuaKknbc00nLGwCUsULgUFT52yoptUH2mnUyGYbYYKk=";
+    hash = "sha256-cIXheImO4BL00zn101ZDIzKl2qkIDsTNswZOCs54lNY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix
index 350c2e43c8f2..01fa1c0f3163 100644
--- a/pkgs/development/python-modules/jupysql/default.nix
+++ b/pkgs/development/python-modules/jupysql/default.nix
@@ -84,6 +84,21 @@ buildPythonPackage rec {
   disabledTests = [
     # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
     "test_resultset_polars_dataframe"
+    # all of these are broken with later versions of duckdb; see
+    # https://github.com/ploomber/jupysql/issues/1030
+    "test_resultset_getitem"
+    "test_resultset_dict"
+    "test_resultset_len"
+    "test_resultset_dicts"
+    "test_resultset_dataframe"
+    "test_resultset_csv"
+    "test_resultset_str"
+    "test_resultset_repr_html_when_feedback_is_2"
+    "test_resultset_repr_html_with_reduced_feedback"
+    "test_invalid_operation_error"
+    "test_resultset_config_autolimit_dict"
+    # fails due to strict warnings
+    "test_calling_legacy_plotting_functions_displays_warning"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
index 82778299c799..e05209dd80d5 100644
--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "jupyter-client";
-  version = "8.6.2";
+  version = "8.6.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jupyter_client";
     inherit version;
-    hash = "sha256-K9oU1V7lulhVKoxTrkPSFa2YaIU0iSE/N9oGDO1U2N8=";
+    hash = "sha256-NbOglHxKbp1Ynrl9fUzV6Q+RDucxAWEfASg3Mr1tlBk=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
new file mode 100644
index 000000000000..2e571e222c25
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  hatch-jupyter-builder,
+  jupyter-collaboration,
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter-collaboration-ui";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "jupyter_collaboration_ui";
+    inherit version;
+    hash = "sha256-hTyUmLzRvexNTZxTv4Mbflm+OTW9j0HReLpAJuk/WnY=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail ', "jupyterlab>=4.0.0"' ""
+  '';
+
+  build-system = [
+    hatchling
+    hatch-jupyter-builder
+  ];
+
+  pythonImportsCheck = [ "jupyter_collaboration_ui" ];
+
+  # no tests
+  doCheck = false;
+
+  passthru.tests = jupyter-collaboration.tests;
+
+  meta = {
+    description = "JupyterLab/Jupyter Notebook 7+ extension providing user interface integration for real time collaboration";
+    homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-collaboration-ui";
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.jupyter.members;
+  };
+}
diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix
index 0489550cfc68..4f6e29fee66d 100644
--- a/pkgs/development/python-modules/jupyter-collaboration/default.nix
+++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix
@@ -4,73 +4,42 @@
   fetchPypi,
 
   # build-system
-  hatch-jupyter-builder,
-  hatch-nodejs-version,
   hatchling,
-  jupyterlab,
 
   # dependencies
-  jsonschema,
-  jupyter-events,
-  jupyter-server,
-  jupyter-server-fileid,
-  jupyter-ydoc,
-  pycrdt,
-  pycrdt-websocket,
+  jupyter-collaboration-ui,
+  jupyter-docprovider,
+  jupyter-server-ydoc,
 
   # tests
-  pytest-jupyter,
-  pytestCheckHook,
-  websockets,
+  callPackage,
 }:
 
 buildPythonPackage rec {
   pname = "jupyter-collaboration";
-  version = "2.1.4";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jupyter_collaboration";
     inherit version;
-    hash = "sha256-YT3wrTQ8imuTK8zeJbwscHtawtqspf1oItGzMMfg5io=";
+    hash = "sha256-eewAsh/EI8DV4FNWgjEhT61RUbaYE6suOAny4bf1CCw=";
   };
 
-  postPatch = ''
-    sed -i "/^timeout/d" pyproject.toml
-  '';
-
-  build-system = [
-    hatch-jupyter-builder
-    hatch-nodejs-version
-    hatchling
-    jupyterlab
-  ];
+  build-system = [ hatchling ];
 
   dependencies = [
-    jsonschema
-    jupyter-events
-    jupyter-server
-    jupyter-server-fileid
-    jupyter-ydoc
-    pycrdt
-    pycrdt-websocket
-  ];
-
-  nativeCheckInputs = [
-    pytest-jupyter
-    pytestCheckHook
-    websockets
+    jupyter-collaboration-ui
+    jupyter-docprovider
+    jupyter-server-ydoc
   ];
 
   pythonImportsCheck = [ "jupyter_collaboration" ];
 
-  preCheck = ''
-    export HOME=$TEMP
-  '';
+  # no tests
+  doCheck = false;
 
-  pytestFlagsArray = [ "-Wignore::DeprecationWarning" ];
-
-  __darwinAllowLocalNetworking = true;
+  passthru.tests = callPackage ./test.nix { };
 
   meta = {
     description = "JupyterLab Extension enabling Real-Time Collaboration";
diff --git a/pkgs/development/python-modules/jupyter-collaboration/test.nix b/pkgs/development/python-modules/jupyter-collaboration/test.nix
new file mode 100644
index 000000000000..044b923a723d
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-collaboration/test.nix
@@ -0,0 +1,39 @@
+{
+  stdenvNoCC,
+  fetchFromGitHub,
+  jupyter-collaboration,
+  pytest-jupyter,
+  pytestCheckHook,
+  websockets,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "jupyter-collaboration-test";
+  inherit (jupyter-collaboration) version;
+
+  src = fetchFromGitHub {
+    owner = "jupyterlab";
+    repo = "jupyter-collaboration";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-6hDYB1uC0WraB37s9EKLJF7jyFu0B3xLocuLYyKj4hs=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "timeout = 300" ""
+  '';
+
+  installPhase = ''
+    touch $out
+  '';
+
+  env.HOME = "$TMPDIR";
+
+  doCheck = true;
+
+  nativeCheckInputs = [
+    jupyter-collaboration
+    pytest-jupyter
+    pytestCheckHook
+    websockets
+  ];
+})
diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix
new file mode 100644
index 000000000000..d32dc1b31140
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  hatch-jupyter-builder,
+  jupyter-collaboration,
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter-docprovider";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "jupyter_docprovider";
+    inherit version;
+    hash = "sha256-EcO3GqdbhRxawHwfSnjOHfFmYjpZy2NuuGc5CSW/xlY=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail ', "jupyterlab>=4.0.0"' ""
+  '';
+
+  build-system = [
+    hatchling
+    hatch-jupyter-builder
+  ];
+
+  pythonImportsCheck = [ "jupyter_docprovider" ];
+
+  # no tests
+  doCheck = false;
+
+  passthru.tests = jupyter-collaboration.tests;
+
+  meta = {
+    description = "JupyterLab/Jupyter Notebook 7+ extension integrating collaborative shared models";
+    homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-docprovider";
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.jupyter.members;
+  };
+}
diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix
index b4220824ae93..622e923d1c27 100644
--- a/pkgs/development/python-modules/jupyter-packaging/default.nix
+++ b/pkgs/development/python-modules/jupyter-packaging/default.nix
@@ -47,6 +47,8 @@ buildPythonPackage rec {
     pytest-timeout
   ];
 
+  pytestFlagsArray = [ "-Wignore::DeprecationWarning" ];
+
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix
new file mode 100644
index 000000000000..1e988383621b
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  jsonschema,
+  jupyter-events,
+  jupyter-server,
+  jupyter-server-fileid,
+  jupyter-ydoc,
+  pycrdt,
+  pycrdt-websocket,
+  jupyter-collaboration,
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter-server-ydoc";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "jupyter_server_ydoc";
+    inherit version;
+    hash = "sha256-MBdSTB2gaIFbdIyPHr5+wI7aBH/Fl85ywSWxgAmjkek=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    jsonschema
+    jupyter-events
+    jupyter-server
+    jupyter-server-fileid
+    jupyter-ydoc
+    pycrdt
+    pycrdt-websocket
+  ];
+
+  pythonImportsCheck = [ "jupyter_server_ydoc" ];
+
+  # no tests
+  doCheck = false;
+
+  passthru.tests = jupyter-collaboration.tests;
+
+  meta = {
+    description = "Jupyter-server extension integrating collaborative shared models";
+    homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-server-ydoc";
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.jupyter.members;
+  };
+}
diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix
index cc5769b7c759..89fc4fe88bf5 100644
--- a/pkgs/development/python-modules/jupyter-sphinx/default.nix
+++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix
@@ -44,6 +44,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # https://github.com/jupyter/jupyter-sphinx/issues/280"
+    "test_builder_priority"
+  ];
+
   preCheck = ''
     export HOME=$TMPDIR
   '';
diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix
index 4bb08e6ed9a5..5fa69f424fbd 100644
--- a/pkgs/development/python-modules/jupyter-ydoc/default.nix
+++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "jupyter-ydoc";
-  version = "2.1.2";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jupyter_ydoc";
     inherit version;
-    hash = "sha256-yYnIm0s9ljtYQJVzKJcimNTVSDTtjzz3Zo3WE9OfKsw=";
+    hash = "sha256-nPOU7nxpVSh+6tERJq2DYIOpyjze8uJyIdxN/gW7arE=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
index c4da40729c0f..79c5c99ff99e 100644
--- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
@@ -1,32 +1,52 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
   jupyterhub,
   ldap3,
-  fetchPypi,
+  traitlets,
+  pytestCheckHook,
+  pytest-asyncio,
 }:
 
 buildPythonPackage rec {
   pname = "jupyterhub-ldapauthenticator";
-  version = "1.3.2";
-  format = "setuptools";
+  version = "2.0.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b";
+  src = fetchFromGitHub {
+    owner = "jupyterhub";
+    repo = "ldapauthenticator";
+    rev = "refs/tags/${version}";
+    hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k=";
   };
 
-  # No tests implemented
-  doCheck = false;
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jupyterhub
     ldap3
+    traitlets
+  ];
+
+  pythonImportsCheck = [ "ldapauthenticator" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # touch the socket
+    "test_allow_config"
+    "test_ldap_auth"
   ];
 
   meta = with lib; {
     description = "Simple LDAP Authenticator Plugin for JupyterHub";
     homepage = "https://github.com/jupyterhub/ldapauthenticator";
+    changelog = "https://github.com/jupyterhub/ldapauthenticator/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
index c40866fd3d82..ebcbfb71d7c5 100644
--- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub-systemdspawner";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "jupyterhub";
     repo = "systemdspawner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2Pxswa472umovHBUVTIX1l+Glj6bzzgBLsu+p4IA6jA=";
+    hash = "sha256-obM8HGCHsisRV1+kHMWdA7d6eb6awwPMBuDUAf3k0uI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 76fbe01ae3d1..5fb9cc969b59 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -42,7 +42,7 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub";
-  version = "5.1.0";
+  version = "5.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -51,12 +51,12 @@ buildPythonPackage rec {
     owner = "jupyterhub";
     repo = "jupyterhub";
     rev = "refs/tags/${version}";
-    hash = "sha256-3L83FLhLCdTgOuFRgRMbz316cYbai0Z+hJwxXUCYB2Y=";
+    hash = "sha256-zOWcXpByJRzI9sTjTl+w/vo99suKOEN0TvPn1ZWlNmc=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-b7j6iGYXrwco4YruqRPEEi4yWRF6otTUD2jKCEPcLTE=";
+    hash = "sha256-My7WUAqIvOrbbVTxSnA6a5NviM6u95+iyykx1xbudpw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index c539c052d4b5..1ab347130ae1 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-git";
-  version = "0.50.1";
+  version = "0.50.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jupyterlab_git";
     inherit version;
-    hash = "sha256-v08Go/vCsquE6l1SMmqg4LjM9OmjNX+jGKEZVg4cak0=";
+    hash = "sha256-zu/chWMsr0maBItDRFnQO15iFmWAHp23GXvUhvXTNDM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix
index f4e0ab5f1250..6023df467420 100644
--- a/pkgs/development/python-modules/keep/default.nix
+++ b/pkgs/development/python-modules/keep/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "keep";
-  version = "2.10.1";
+  version = "2.11";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3abbe445347711cecd9cbb80dab4a0777418972fc14a14e9387d0d2ae4b6adb7";
+    sha256 = "sha256-Brwvu/Zevr8sOE3KAwakDDzVMc2VoFxIb1orXAes2U0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 45166fb322b2..b18c84866227 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "25.4.0";
+  version = "25.4.1";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "jaraco";
     repo = "keyring";
     rev = "refs/tags/v${version}";
-    hash = "sha256-B1uU4INod2iSXIftPlDOr7mzWPY3FTpLhUuInl1Hg/M=";
+    hash = "sha256-5MK7f6/e8ZJ7azm5WX8T2+/6R3P3Y8XaN7jze2MgiJA=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index 24322524eb93..5496c062acde 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "kiwisolver";
-  version = "1.4.5";
+  version = "1.4.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw=";
+    hash = "sha256-mJP/gb1xB/e2hdMBfMZYParbT8JuSoiDUN9TDkGYCmA=";
   };
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 696860862b11..1d04da99d071 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -19,8 +19,10 @@
   pythonOlder,
   pyyaml,
   redis,
+  setuptools,
   sqlalchemy,
   typing-extensions,
+  tzdata,
   urllib3,
   vine,
 }:
@@ -28,22 +30,22 @@
 buildPythonPackage rec {
   pname = "kombu";
   version = "5.4.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-7vVy3S/Z/GFLN1gOPK6v3Vr0bB7/Mef7qJE4zbQG8s8=";
   };
 
-  propagatedBuildInputs =
-    [
-      amqp
-      vine
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]
-    ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
+  build-system = [ setuptools ];
+
+  propagatedBuildInputs = [
+    amqp
+    tzdata
+    vine
+  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   optional-dependencies = {
     msgpack = [ msgpack ];
@@ -79,6 +81,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Disable pyro4 test
     "test_driver_version"
+    # AssertionError: assert [call('WATCH'..., 'test-tag')] ==...
+    "test_global_keyprefix_transaction"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix
index 013ccbd9010f..93a783bdba7c 100644
--- a/pkgs/development/python-modules/kornia/default.nix
+++ b/pkgs/development/python-modules/kornia/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "kornia";
-  version = "0.7.3";
+  version = "0.7.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-iEg27b2JVLtAYLFncaSqIh5FyvmmitKAKP7Tl0WWNdk=";
+    hash = "sha256-Ecps1KniiL1WOGk+i/UAVuXJ2W7cgHSzAKCkZokyWIM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index a263fa60c152..f589399afa14 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.11.0";
+  version = "1.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "LacusCore";
     rev = "refs/tags/v${version}";
-    hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0=";
+    hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock
index 9fd06f89770b..b3a01fc8f1df 100644
--- a/pkgs/development/python-modules/lancedb/Cargo.lock
+++ b/pkgs/development/python-modules/lancedb/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -127,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "arbitrary"
@@ -161,6 +161,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76"
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
 [[package]]
 name = "arrow"
 version = "52.2.0"
@@ -307,7 +313,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "lexical-core",
  "num",
  "serde",
@@ -385,9 +391,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
 dependencies = [
  "flate2",
  "futures-core",
@@ -447,7 +453,7 @@ dependencies = [
  "derive_builder",
  "futures",
  "rand",
- "reqwest 0.12.7",
+ "reqwest",
  "reqwest-eventsource",
  "secrecy",
  "serde",
@@ -476,18 +482,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -519,15 +525,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.6"
+version = "1.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc"
+checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -593,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-dynamodb"
-version = "1.45.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f"
+checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -616,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-kms"
-version = "1.43.0"
+version = "1.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f7cb482caa5444d445c94417b9c74e49a849beb09ede4f2f4c3c15f8157387"
+checksum = "e33590e8d45206fdc4273ded8a1f292bcceaadd513037aa790fc67b237bc30ee"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -638,9 +644,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.49.0"
+version = "1.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e518950d4ac43508c8bfc2fe4e24b0752d99eab80134461d5e162dcda0214b55"
+checksum = "e2f2a62020f3e06f9b352b2a23547f6e1d110b6bf1e18a6b588ae36114eaf6e2"
 dependencies = [
  "ahash",
  "aws-credential-types",
@@ -673,9 +679,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.42.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e"
+checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -695,9 +701,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.43.0"
+version = "1.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364"
+checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -717,9 +723,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.42.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce"
+checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -852,9 +858,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87"
+checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -896,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.6"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605"
+checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b"
 dependencies = [
  "base64-simd",
  "bytes",
@@ -1113,13 +1119,13 @@ dependencies = [
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1130,9 +1136,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "bytes-utils"
@@ -1162,7 +1168,7 @@ dependencies = [
  "byteorder",
  "gemm",
  "half",
- "memmap2 0.9.4",
+ "memmap2 0.9.5",
  "num-traits",
  "num_cpus",
  "rand",
@@ -1232,9 +1238,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
 dependencies = [
  "jobserver",
  "libc",
@@ -1586,7 +1592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
 dependencies = [
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1616,7 +1622,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1627,7 +1633,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1644,10 +1650,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "datafusion"
-version = "40.0.0"
+name = "dashmap"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "datafusion"
+version = "41.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb"
 dependencies = [
  "ahash",
  "arrow",
@@ -1657,24 +1677,26 @@ dependencies = [
  "async-trait",
  "bytes",
  "chrono",
- "dashmap",
+ "dashmap 6.1.0",
+ "datafusion-catalog",
  "datafusion-common",
  "datafusion-common-runtime",
  "datafusion-execution",
  "datafusion-expr",
  "datafusion-functions",
  "datafusion-functions-aggregate",
- "datafusion-functions-array",
+ "datafusion-functions-nested",
  "datafusion-optimizer",
  "datafusion-physical-expr",
  "datafusion-physical-expr-common",
+ "datafusion-physical-optimizer",
  "datafusion-physical-plan",
  "datafusion-sql",
  "futures",
  "glob",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "num_cpus",
@@ -1683,7 +1705,7 @@ dependencies = [
  "paste",
  "pin-project-lite",
  "rand",
- "sqlparser 0.47.0",
+ "sqlparser 0.49.0",
  "tempfile",
  "tokio",
  "url",
@@ -1691,10 +1713,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "datafusion-common"
-version = "40.0.0"
+name = "datafusion-catalog"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367"
+checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529"
+dependencies = [
+ "arrow-schema",
+ "async-trait",
+ "datafusion-common",
+ "datafusion-execution",
+ "datafusion-expr",
+ "datafusion-physical-plan",
+]
+
+[[package]]
+name = "datafusion-common"
+version = "41.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c"
 dependencies = [
  "ahash",
  "arrow",
@@ -1708,27 +1744,27 @@ dependencies = [
  "libc",
  "num_cpus",
  "object_store",
- "sqlparser 0.47.0",
+ "sqlparser 0.49.0",
 ]
 
 [[package]]
 name = "datafusion-common-runtime"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352"
+checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1"
 dependencies = [
  "tokio",
 ]
 
 [[package]]
 name = "datafusion-execution"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e"
+checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1"
 dependencies = [
  "arrow",
  "chrono",
- "dashmap",
+ "dashmap 6.1.0",
  "datafusion-common",
  "datafusion-expr",
  "futures",
@@ -1743,9 +1779,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-expr"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68"
+checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2"
 dependencies = [
  "ahash",
  "arrow",
@@ -1755,18 +1791,19 @@ dependencies = [
  "datafusion-common",
  "paste",
  "serde_json",
- "sqlparser 0.47.0",
+ "sqlparser 0.49.0",
  "strum",
  "strum_macros 0.26.4",
 ]
 
 [[package]]
 name = "datafusion-functions"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f"
+checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb"
 dependencies = [
  "arrow",
+ "arrow-buffer",
  "base64 0.22.1",
  "chrono",
  "datafusion-common",
@@ -1784,9 +1821,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-aggregate"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77"
+checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb"
 dependencies = [
  "ahash",
  "arrow",
@@ -1797,14 +1834,14 @@ dependencies = [
  "datafusion-physical-expr-common",
  "log",
  "paste",
- "sqlparser 0.47.0",
+ "sqlparser 0.49.0",
 ]
 
 [[package]]
-name = "datafusion-functions-array"
-version = "40.0.0"
+name = "datafusion-functions-nested"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831"
+checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1819,13 +1856,14 @@ dependencies = [
  "itertools 0.12.1",
  "log",
  "paste",
+ "rand",
 ]
 
 [[package]]
 name = "datafusion-optimizer"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3"
+checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1834,7 +1872,7 @@ dependencies = [
  "datafusion-expr",
  "datafusion-physical-expr",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "paste",
@@ -1843,9 +1881,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-expr"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5"
+checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4"
 dependencies = [
  "ahash",
  "arrow",
@@ -1863,7 +1901,7 @@ dependencies = [
  "half",
  "hashbrown 0.14.5",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "paste",
@@ -1873,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-expr-common"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536"
+checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6"
 dependencies = [
  "ahash",
  "arrow",
@@ -1886,10 +1924,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "datafusion-physical-plan"
-version = "40.0.0"
+name = "datafusion-physical-optimizer"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a"
+checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0"
+dependencies = [
+ "datafusion-common",
+ "datafusion-execution",
+ "datafusion-physical-expr",
+ "datafusion-physical-plan",
+]
+
+[[package]]
+name = "datafusion-physical-plan"
+version = "41.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe"
 dependencies = [
  "ahash",
  "arrow",
@@ -1909,7 +1959,7 @@ dependencies = [
  "futures",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "once_cell",
@@ -1921,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-sql"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889"
+checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1932,7 +1982,7 @@ dependencies = [
  "datafusion-expr",
  "log",
  "regex",
- "sqlparser 0.47.0",
+ "sqlparser 0.49.0",
  "strum",
 ]
 
@@ -1984,38 +2034,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "derive_builder"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
 dependencies = [
  "derive_builder_macro",
 ]
 
 [[package]]
 name = "derive_builder_core"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "derive_builder_macro"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2058,7 +2108,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2151,7 +2201,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2163,7 +2213,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2342,9 +2392,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2356,6 +2406,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -2398,9 +2454,9 @@ dependencies = [
 
 [[package]]
 name = "fsst"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26212c1db7eee3ec0808bd99107cf62ba4d3edd3489df601e2d0c73c5d739aec"
+checksum = "6b1d2a2da56a2bf2dea67567e50c066c9323db26c78d9051b98e552b236f15fe"
 dependencies = [
  "rand",
 ]
@@ -2413,9 +2469,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2428,9 +2484,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2438,15 +2494,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2455,9 +2511,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -2476,26 +2532,26 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
@@ -2505,9 +2561,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2664,9 +2720,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -2697,7 +2753,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2716,7 +2772,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2754,6 +2810,17 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2883,9 +2950,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2969,7 +3036,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
@@ -2979,22 +3046,25 @@ dependencies = [
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
- "hyper 0.14.30",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3005,7 +3075,6 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -3021,9 +3090,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3071,12 +3140,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -3124,9 +3193,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
@@ -3217,18 +3286,18 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lance"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a427160737dd74d2d4f566f3111027edc63927106541d173459d010209371c42"
+checksum = "4c4a02330c306f5cdb4ae1f54f413f81710fe2bb8d0f09e10898f16ff28906ae"
 dependencies = [
  "arrow",
  "arrow-arith",
@@ -3246,7 +3315,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "datafusion",
  "datafusion-functions",
  "datafusion-physical-expr",
@@ -3285,9 +3354,9 @@ dependencies = [
 
 [[package]]
 name = "lance-arrow"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f1cfebe08c64b1edabe9b6ccd6f8ea1bc6349d0870d47f2db8cdadf02ab8e2"
+checksum = "164a8935b3b093f5e7a4935de8e115ac738d193bf3fe94aa0e9ea3a0f5f5c30d"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -3303,9 +3372,9 @@ dependencies = [
 
 [[package]]
 name = "lance-core"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243aa2323dee6fcab6bb9bb3a21ae8f040c98a5de9bbfb7ab8484a036176185a"
+checksum = "b02e4e248390e11b092e546fb1117d50b0d278b178b82d8438cda26eb65edd75"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -3341,9 +3410,9 @@ dependencies = [
 
 [[package]]
 name = "lance-datafusion"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a69d039f93a43477245b51a8f1ce58a1f41485f8ded946f53031a11ded8c97"
+checksum = "e7a7597b224cf428762187f7b70d775b7e29d65b90c9df82e677de85e88f165a"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3368,10 +3437,11 @@ dependencies = [
 
 [[package]]
 name = "lance-encoding"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b713e49ce6039d0ca0f88e8ded66ee64d89c42f85107bc9e684fbff41386a65"
+checksum = "b7cf8fa33073f9ad592638f522103eca150594e4648721e7c17a308334d9ccdd"
 dependencies = [
+ "arrayref",
  "arrow",
  "arrow-arith",
  "arrow-array",
@@ -3380,6 +3450,7 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "arrow-select",
+ "bytemuck",
  "bytes",
  "fsst",
  "futures",
@@ -3390,10 +3461,12 @@ dependencies = [
  "lance-core",
  "log",
  "num-traits",
+ "paste",
  "prost",
  "prost-build",
  "prost-types",
  "rand",
+ "seq-macro",
  "snafu",
  "tokio",
  "tracing",
@@ -3402,9 +3475,9 @@ dependencies = [
 
 [[package]]
 name = "lance-file"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0eaebd40c77f8f06a0cbadcd07f9344aea616dcd4d8712f6cad81c2eda14d5"
+checksum = "d21247b1f8579ebf0d7f938d930c0c89d2b35cd503fc3b94adfb8bf5eb40acc3"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -3438,9 +3511,9 @@ dependencies = [
 
 [[package]]
 name = "lance-index"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ad5a42b9a4909749ee62fc94c64d19259c2aadca7c8446f42ee8e9c7a097d3"
+checksum = "fecf46eef5a2d4b1a44b2d01b98fb45e7923fe9471d8d2f907f485e12dddac4e"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3491,9 +3564,9 @@ dependencies = [
 
 [[package]]
 name = "lance-io"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f334f2c279f80f19803141cf7f98c6b82e6ace3c7f75c8740f1df7a73bb720"
+checksum = "48071e1d45f4dda04d8660d6378a7e23825faae46b4717170dbf1fd0ba583e2c"
 dependencies = [
  "arrow",
  "arrow-arith",
@@ -3532,9 +3605,9 @@ dependencies = [
 
 [[package]]
 name = "lance-linalg"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fa019770a0afb287360a4ea919cff482371ad43318607d1e797534c819bf356"
+checksum = "5944b11e2fef3b992c5609eb20b6336de622f468c2ae4d40f746498f910551f5"
 dependencies = [
  "arrow-array",
  "arrow-ord",
@@ -3557,9 +3630,9 @@ dependencies = [
 
 [[package]]
 name = "lance-table"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fa39bede133d578431db3f77b0c2c63fcaff12a088000648014c27266830a2"
+checksum = "98106c7a29e810cb08b943bc3039a706577183366ffc27a4933c3a12e3a8334c"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3598,9 +3671,9 @@ dependencies = [
 
 [[package]]
 name = "lance-testing"
-version = "0.17.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4eae0993cda6130cfd75d3d9d11830dd4ec8d4c66cf81def939837c419d4bc"
+checksum = "4cdadadeae5c76fc70b0345ea2248f9ce4b7944d7b0df5db9385f7c0d30fcac6"
 dependencies = [
  "arrow-array",
  "arrow-schema",
@@ -3611,7 +3684,7 @@ dependencies = [
 
 [[package]]
 name = "lancedb"
-version = "0.10.0-beta.1"
+version = "0.11.0-beta.1"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3632,10 +3705,13 @@ dependencies = [
  "candle-nn",
  "candle-transformers",
  "chrono",
+ "datafusion-common",
  "datafusion-physical-plan",
  "futures",
  "half",
  "hf-hub",
+ "http 1.1.0",
+ "http-body 1.0.1",
  "lance",
  "lance-datafusion",
  "lance-encoding",
@@ -3645,6 +3721,7 @@ dependencies = [
  "lance-testing",
  "lazy_static",
  "log",
+ "moka",
  "num-traits",
  "object_store",
  "pin-project",
@@ -3653,7 +3730,7 @@ dependencies = [
  "rand",
  "random_word",
  "regex",
- "reqwest 0.11.27",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_with",
@@ -3668,7 +3745,7 @@ dependencies = [
 
 [[package]]
 name = "lancedb-jni"
-version = "0.4.18"
+version = "0.10.0"
 dependencies = [
  "arrow",
  "arrow-schema",
@@ -3684,7 +3761,7 @@ dependencies = [
 
 [[package]]
 name = "lancedb-node"
-version = "0.10.0-beta.1"
+version = "0.11.0-beta.1"
 dependencies = [
  "arrow-array",
  "arrow-ipc",
@@ -3709,7 +3786,7 @@ dependencies = [
 
 [[package]]
 name = "lancedb-nodejs"
-version = "0.0.0"
+version = "0.11.0-beta.1"
 dependencies = [
  "arrow-ipc",
  "futures",
@@ -3722,13 +3799,12 @@ dependencies = [
 
 [[package]]
 name = "lancedb-python"
-version = "0.13.0"
+version = "0.14.0"
 dependencies = [
  "arrow",
  "env_logger 0.10.2",
  "futures",
  "lancedb",
- "lzma-sys",
  "pin-project",
  "pyo3",
  "pyo3-asyncio-0-21",
@@ -3814,9 +3890,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libloading"
@@ -3884,27 +3960,27 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
 name = "lz4"
-version = "1.27.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.11.0"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -3992,9 +4068,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
  "stable_deref_trait",
@@ -4104,7 +4180,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4143,9 +4219,9 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
 
 [[package]]
 name = "napi"
-version = "2.16.10"
+version = "2.16.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04409e8c2d61995696e44d2181b79b68c1dd41f7e24a17cde60bbd9f54ddddef"
+checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd"
 dependencies = [
  "bitflags 2.6.0",
  "ctor",
@@ -4172,7 +4248,7 @@ dependencies = [
  "napi-derive-backend",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4187,7 +4263,7 @@ dependencies = [
  "quote",
  "regex",
  "semver 1.0.23",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4394,7 +4470,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4405,9 +4481,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -4431,9 +4507,9 @@ dependencies = [
  "percent-encoding",
  "quick-xml",
  "rand",
- "reqwest 0.12.7",
+ "reqwest",
  "ring",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "snafu",
@@ -4445,9 +4521,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oneshot"
@@ -4500,7 +4576,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4628,7 +4704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -4671,22 +4747,22 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4713,9 +4789,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "planus"
@@ -4821,7 +4897,7 @@ dependencies = [
  "comfy-table",
  "either",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "num-traits",
  "once_cell",
  "polars-arrow",
@@ -4919,7 +4995,7 @@ dependencies = [
  "either",
  "hashbrown 0.14.5",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "memchr",
  "num-traits",
  "polars-arrow",
@@ -5063,11 +5139,11 @@ dependencies = [
  "ahash",
  "bytemuck",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "num-traits",
  "once_cell",
  "polars-error",
- "raw-cpuid 11.1.0",
+ "raw-cpuid 11.2.0",
  "rayon",
  "smartstring",
  "stacker",
@@ -5093,9 +5169,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -5119,7 +5195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
  "proc-macro2",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5133,9 +5209,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
 dependencies = [
  "unicode-ident",
 ]
@@ -5167,7 +5243,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.77",
+ "syn 2.0.79",
  "tempfile",
 ]
 
@@ -5181,7 +5257,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5307,7 +5383,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5320,7 +5396,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config 0.21.2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5341,9 +5417,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.36.1"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
  "serde",
@@ -5360,7 +5436,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -5377,7 +5453,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "slab",
  "thiserror",
  "tinyvec",
@@ -5483,9 +5559,9 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5544,14 +5620,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5569,9 +5645,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5581,9 +5657,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5598,60 +5674,20 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.12.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
 dependencies = [
  "async-compression",
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
-dependencies = [
  "base64 0.22.1",
  "bytes",
+ "encoding_rs",
  "futures-core",
  "futures-util",
  "h2 0.4.6",
@@ -5660,25 +5696,29 @@ dependencies = [
  "http-body-util",
  "hyper 1.4.1",
  "hyper-rustls 0.27.3",
+ "hyper-tls",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.13",
- "rustls-native-certs 0.7.3",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.14",
+ "rustls-native-certs 0.8.0",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls 0.26.0",
  "tokio-util",
  "tower-service",
@@ -5702,7 +5742,7 @@ dependencies = [
  "mime",
  "nom",
  "pin-project-lite",
- "reqwest 0.12.7",
+ "reqwest",
  "thiserror",
 ]
 
@@ -5820,9 +5860,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
 dependencies = [
  "log",
  "once_cell",
@@ -5845,19 +5885,6 @@ dependencies = [
  "security-framework",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.1.3",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.0"
@@ -5865,7 +5892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -5882,19 +5909,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
 
 [[package]]
 name = "rustls-webpki"
@@ -5950,9 +5976,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -6021,9 +6047,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6076,7 +6102,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6114,15 +6140,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -6132,14 +6158,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6200,9 +6226,9 @@ dependencies = [
 
 [[package]]
 name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "siphasher"
@@ -6341,9 +6367,9 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.47.0"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25"
+checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e"
 dependencies = [
  "log",
  "sqlparser_derive",
@@ -6357,7 +6383,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6443,7 +6469,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6456,7 +6482,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6478,9 +6504,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6498,12 +6524,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.1"
@@ -6521,7 +6541,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6554,20 +6574,20 @@ dependencies = [
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6604,7 +6624,7 @@ dependencies = [
  "lru",
  "lz4_flex",
  "measure_time",
- "memmap2 0.9.4",
+ "memmap2 0.9.5",
  "num_cpus",
  "once_cell",
  "oneshot",
@@ -6740,9 +6760,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand 2.1.1",
@@ -6762,22 +6782,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6892,7 +6912,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6921,7 +6941,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-pki-types",
  "tokio",
 ]
@@ -6958,36 +6978,15 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "toml_datetime",
  "winnow",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -7013,7 +7012,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -7027,9 +7026,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
 
 [[package]]
 name = "try-lock"
@@ -7064,9 +7063,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
@@ -7076,9 +7075,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -7103,15 +7102,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode_categories"
@@ -7142,7 +7141,7 @@ dependencies = [
  "log",
  "native-tls",
  "once_cell",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -7240,9 +7239,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7251,24 +7250,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -7278,9 +7277,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7288,28 +7287,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -7320,9 +7319,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7330,9 +7329,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -7633,23 +7632,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
-[[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 = "wyz"
 version = "0.5.1"
@@ -7691,7 +7680,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "synstructure",
 ]
 
@@ -7713,7 +7702,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -7733,7 +7722,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "synstructure",
 ]
 
@@ -7753,7 +7742,7 @@ dependencies = [
  "crc32fast",
  "crossbeam-utils",
  "displaydoc",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "num_enum",
  "thiserror",
 ]
diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix
index e1dcbd2a1a22..950a67d1d334 100644
--- a/pkgs/development/python-modules/lancedb/default.nix
+++ b/pkgs/development/python-modules/lancedb/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   darwin,
   libiconv,
+  openssl,
   pkg-config,
   protobuf,
   attrs,
@@ -28,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "lancedb";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lancedb";
     rev = "refs/tags/python-v${version}";
-    hash = "sha256-6E20WgyoEALdxmiOfgq89dCkqovvIMzc/wy+kvjDWwU=";
+    hash = "sha256-lw2tZ26Py6JUxuetaokJKnxOv/WoLK4spxssLKxvxJA=";
   };
 
   buildAndTestSubdir = "python";
@@ -50,13 +51,14 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     pkg-config
+    protobuf
     rustPlatform.cargoSetupHook
   ];
 
   buildInputs =
     [
       libiconv
-      protobuf
+      openssl
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
@@ -96,14 +98,21 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "-m 'not slow'" ];
 
-  disabledTests = [
-    # require tantivy which is not packaged in nixpkgs
-    "test_basic"
+  disabledTests =
+    [
+      # require tantivy which is not packaged in nixpkgs
+      "test_basic"
 
-    # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size'
-    # https://github.com/lancedb/lancedb/issues/1539
-    "test_polars"
-  ];
+      # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size'
+      # https://github.com/lancedb/lancedb/issues/1539
+      "test_polars"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # fail with darwin sandbox
+      "test_async_remote_db"
+      "test_http_error"
+      "test_retry_error"
+    ];
 
   disabledTestPaths = [
     # touch the network
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 7e65e82eefeb..0ec1aec1d3d2 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-aws";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
     rev = "refs/tags/v${version}";
-    hash = "sha256-P9CfAVpKh7djhUQc3DyyJTWqs9RbrTeLyynLei0x00o=";
+    hash = "sha256-LHhyEkgu1sjOk4E4WMy4vYGyikqdVD3WvRPjoAP1CfA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
index 9bf287ea2c34..84e899b288f1 100644
--- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
+++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-azure-dynamic-sessions==${version}";
-    hash = "sha256-tgvoOSr4tpi+tFBan+kw8FZUfUJHcQXv9e1nyeGP0so=";
+    hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
   };
 
   sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions";
@@ -74,6 +74,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/azure-dynamic-sessions";
     changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-azure-dynamic-sessions==${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index c27c61afe939..cccbca601e32 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -38,21 +38,24 @@
 
 buildPythonPackage rec {
   pname = "langchain-community";
-  version = "0.3.3";
+  version = "0.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-community==${version}";
-    hash = "sha256-xWr4v+4gL8LAegqerQc1SdAynPk5X8qLlPF211+OBvY=";
+    rev = "refs/tags/langchain-core==${version}";
+    hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
   };
 
   sourceRoot = "${src.name}/libs/community";
 
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "pydantic-settings" ];
+  pythonRelaxDeps = [
+    "pydantic-settings"
+    "tenacity"
+  ];
 
   dependencies = [
     aiohttp
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 49ad6cf3c7a1..8bdc7ededc7b 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-core";
-  version = "0.3.12";
+  version = "0.3.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-core==${version}";
-    hash = "sha256-WWzEIP/JirA4btYVy4+U7PSg6S8VnkZqxPLgLriWbTY=";
+    hash = "sha256-lSXAqjjnihuucTZOSwQJk8gtrtFbUOTHN4J587iLKy0=";
   };
 
   sourceRoot = "${src.name}/libs/core";
@@ -143,6 +143,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core";
     changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index 91866b412112..074f87ee135e 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-huggingface";
-  version = "0.1.0";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-huggingface==${version}";
-    hash = "sha256-ESWhhjWjCbBV/3KjeSwEQzvK6os1mmc3at+8gonfGt4=";
+    hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
   };
 
   sourceRoot = "${src.name}/libs/partners/huggingface";
@@ -80,6 +80,9 @@ buildPythonPackage rec {
     description = "An integration package connecting Huggingface related classes and LangChain";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/huggingface";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 0a064621887c..0c1422bbeb59 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -65,6 +65,9 @@ buildPythonPackage rec {
     description = "Integration package connecting MongoDB and LangChain";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/mongodb";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 29c16ce6ee4a..e58b03a7d2cd 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-openai";
-  version = "0.2.3";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-openai==${version}";
-    hash = "sha256-ENQOKvp9XJTTC34UoNO4LLvcBwfFRcbOAvX/qtzln6k=";
+    hash = "sha256-Gm7MAOuG+kYQ3TRTRdQXJ+HcoUz+iL9j+pTXz+zAySg=";
   };
 
   sourceRoot = "${src.name}/libs/partners/openai";
@@ -96,6 +96,9 @@ buildPythonPackage rec {
     description = "Integration package connecting OpenAI and LangChain";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/openai";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-standard-tests/default.nix b/pkgs/development/python-modules/langchain-standard-tests/default.nix
index 3bec0ee76be3..34a7b5c2adcc 100644
--- a/pkgs/development/python-modules/langchain-standard-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-standard-tests/default.nix
@@ -21,12 +21,11 @@
 
 buildPythonPackage rec {
   pname = "langchain-standard-tests";
-  version = "0.1.1";
   pyproject = true;
 
   # this is an internal library, so there are no tags
   # sync source with langchain-core for easy updates
-  inherit (langchain-core) src;
+  inherit (langchain-core) src version;
   sourceRoot = "${src.name}/libs/standard-tests";
 
   build-system = [ poetry-core ];
@@ -51,6 +50,9 @@ buildPythonPackage rec {
     description = "Build context-aware reasoning applications";
     homepage = "https://github.com/langchain-ai/langchain";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index a19f3ceb7d7e..aed23439349e 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -17,23 +17,21 @@
 
 buildPythonPackage rec {
   pname = "langchain-text-splitters";
-  version = "0.3.0";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain-text-splitters==${version}";
-    hash = "sha256-Z0UAUhOjC0wgCY/f1aWsnjFyOPYz/6JnloEKT6b6Ii0=";
+    hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
   };
 
   sourceRoot = "${src.name}/libs/text-splitters";
 
   build-system = [ poetry-core ];
 
-  dependencies = [
-    langchain-core
-  ];
+  dependencies = [ langchain-core ];
 
   pythonImportsCheck = [ "langchain_text_splitters" ];
 
@@ -54,6 +52,9 @@ buildPythonPackage rec {
     description = "LangChain utilities for splitting into chunks a wide variety of text documents";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ fab ];
+    maintainers = with lib.maintainers; [
+      fab
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 3d0ae4b72f48..ad7821606b96 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -12,6 +12,7 @@
 
   # dependencies
   aiohttp,
+  httpx-sse,
   langchain-core,
   langchain-text-splitters,
   langsmith,
@@ -42,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.4";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     rev = "refs/tags/langchain==${version}";
-    hash = "sha256-MRpXR4nQDobzofhzkU5Y2OiEsi+VdjCcF/vcxcG/144=";
+    hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
   };
 
   sourceRoot = "${src.name}/libs/langchain";
@@ -62,6 +63,7 @@ buildPythonPackage rec {
 
   dependencies = [
     aiohttp
+    httpx-sse
     langchain-core
     langchain-text-splitters
     langsmith
diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index 2a76b9e8e8dd..8319c140be52 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "langfuse";
-  version = "2.51.5";
+  version = "2.53.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2zcEpSXpW67ltB87LIqH6+DCKvNK1gstJU+/JHDJoPE=";
+    hash = "sha256-uhbCLDjOU13KAJcCXz03IPNICG5ZI16KIShY2sXPkp4=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
new file mode 100644
index 000000000000..b40afc694f52
--- /dev/null
+++ b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  langgraph-checkpoint,
+  aiosqlite,
+  duckdb,
+  pytest-asyncio,
+  pytestCheckHook,
+  langgraph-sdk,
+  poetry-core,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "langgraph-checkpoint-duckdb";
+  version = "2.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "langchain-ai";
+    repo = "langgraph";
+    rev = "refs/tags/checkpointduckdb==${version}";
+    hash = "sha256-wSrlFBfTcTgyE46uwv9GCyxRT1xVafgWyP2g87KUTAU=";
+  };
+
+  sourceRoot = "${src.name}/libs/checkpoint-duckdb";
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiosqlite
+    duckdb
+    langgraph-checkpoint
+  ];
+
+  pythonImportsCheck = [ "langgraph.checkpoint.duckdb" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [ "test_basic_store_ops" ]; # depends on networking
+
+  passthru = {
+    updateScript = langgraph-sdk.updateScript;
+  };
+
+  meta = {
+    changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}";
+    description = "Library with a DuckDB implementation of LangGraph checkpoint saver";
+    homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      drupol
+      sarahec
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 0161609fdd08..ce958ca954f2 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-postgres";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "langchain-ai";
     repo = "langgraph";
     rev = "refs/tags/checkpointpostgres==${version}";
-    hash = "sha256-5gKgCd0hl2iPLBfh94n8kMojECknhd0r+W4gt3m4g+M=";
+    hash = "sha256-E3gdHWUYelR/xI3Cv3T2uVwsyt+tOkw9MjX7I2RAuiQ=";
   };
 
   postgresqlTestSetupPost = ''
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 3bf88e24f998..9d4df9530640 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-sqlite";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "langchain-ai";
     repo = "langgraph";
     rev = "refs/tags/checkpointsqlite==${version}";
-    hash = "sha256-aG7kHdlOkrjfYcdDWwCum0mQvWNMlF2CcEDlkzbv4Zw=";
+    hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint-sqlite";
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index b895ab501eb1..eccfbe11935c 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "langchain-ai";
     repo = "langgraph";
     rev = "refs/tags/checkpoint==${version}";
-    hash = "sha256-BDuc6PpziOFIsPpDets7OM2Z+VJ6ekxKpkAuoavDdmI=";
+    hash = "sha256-Mjo6NJ6vYb2E7nk0D/2M7jzr39xRvRRhUZE4tP247to=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint";
diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 2a488218994f..e2fa8f480fd8 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "0.1.33";
+  version = "0.1.35";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     rev = "refs/tags/sdk==${version}";
-    hash = "sha256-oSkF82AvIycGaw0Pb2tldtvjyG9HkXPlSE6onRbDDPE=";
+    hash = "sha256-HWUGRoe5S0HPfOEbqUnFYLVrHe3SJtk3U8cy1JON050=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";
@@ -48,6 +48,7 @@ buildPythonPackage rec {
       nix-update --commit --version-regex '(.*)' python3Packages.langgraph
       nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk
       nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint
+      nix-update --commit --version-regex 'checkpointduckdb==(.*)' python3Packages.langgraph-checkpoint-duckdb
       nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres
       nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite
     '';
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 6ddb731aab37..3750ff262179 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -17,6 +17,7 @@
   dataclasses-json,
   grandalf,
   httpx,
+  langgraph-checkpoint-duckdb,
   langgraph-checkpoint-postgres,
   langgraph-checkpoint-sqlite,
   langsmith,
@@ -34,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "0.2.39";
+  version = "0.2.43";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     rev = "refs/tags/${version}";
-    hash = "sha256-VZRGlE3MSOzur1TWC6swQjf/o5M62LsYncx2g8dtS+o=";
+    hash = "sha256-8xTjWBq6GSl6X2IId3roS3ZNM/h76EGPitS08YQ4e7Y=";
   };
 
   postgresqlTestSetupPost = ''
@@ -70,6 +71,7 @@ buildPythonPackage rec {
     dataclasses-json
     grandalf
     httpx
+    langgraph-checkpoint-duckdb
     langgraph-checkpoint-postgres
     langgraph-checkpoint-sqlite
     langsmith
@@ -112,9 +114,7 @@ buildPythonPackage rec {
     "tests/test_pregel.py"
   ];
 
-  passthru = {
-    updateScript = langgraph-sdk.updateScript;
-  };
+  passthru.updateScript = langgraph-sdk.updateScript;
 
   meta = {
     description = "Build resilient language agents as graphs";
diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 2a9d8446fb55..83c78c9bbc07 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -8,16 +8,17 @@
   poetry-core,
 
   # dependencies
+  httpx,
   orjson,
   pydantic,
   requests,
+  requests-toolbelt,
 
   # tests
   anthropic,
   dataclasses-json,
   fastapi,
   freezegun,
-  httpx,
   instructor,
   pytest-asyncio,
   pytestCheckHook,
@@ -27,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.1.129";
+  version = "0.1.137";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GIWDGr6zd/YaSgcSrIw0a1Ul9RxdmtJBMTEbGapudtw=";
+    hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -44,9 +45,11 @@ buildPythonPackage rec {
   build-system = [ poetry-core ];
 
   dependencies = [
+    httpx
     orjson
     pydantic
     requests
+    requests-toolbelt
   ];
 
   nativeCheckInputs = [
@@ -54,7 +57,6 @@ buildPythonPackage rec {
     dataclasses-json
     fastapi
     freezegun
-    httpx
     instructor
     pytest-asyncio
     pytestCheckHook
diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix
index 30cdce6885cf..152cdd92598e 100644
--- a/pkgs/development/python-modules/lark/default.nix
+++ b/pkgs/development/python-modules/lark/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "lark";
-  version = "1.1.9";
+  version = "1.2.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
     rev = "refs/tags/${version}";
-    hash = "sha256-pWLKjELy10VNumpBHjBYCO2TltKsZx1GhQcGMHsYJNk=";
+    hash = "sha256-02NX/2bHTYSVTDLLudJmEU2DcQNn0Ke+5ayilKLlwqA=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/latexrestricted/default.nix b/pkgs/development/python-modules/latexrestricted/default.nix
index 1abc58cbd3cc..dfccf69e0563 100644
--- a/pkgs/development/python-modules/latexrestricted/default.nix
+++ b/pkgs/development/python-modules/latexrestricted/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "latexrestricted";
-  version = "0.5.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PwhVKgoXujiLC+3FPAtUdvBEgeNwD6aBK+I5p8xeLwo=";
+    hash = "sha256-/N5eC32OVN6qxWZAwAUlCIrMV2ARitiX3gaCPiSCRHs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix
index 4a6c983e75ab..e6c5fcda855c 100644
--- a/pkgs/development/python-modules/layoutparser/default.nix
+++ b/pkgs/development/python-modules/layoutparser/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   # build inputs
   numpy,
-  opencv4,
+  opencv-python,
   scipy,
   pandas,
   pillow,
@@ -54,14 +54,9 @@ buildPythonPackage {
     hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "opencv-python" "opencv"
-  '';
-
   propagatedBuildInputs = [
     numpy
-    opencv4
+    opencv-python
     scipy
     pandas
     pillow
diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix
index 310d407fa70a..206f6720f634 100644
--- a/pkgs/development/python-modules/lcn-frontend/default.nix
+++ b/pkgs/development/python-modules/lcn-frontend/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "lcn-frontend";
-  version = "0.1.7";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "lcn_frontend";
     inherit version;
-    hash = "sha256-S/7NUduAiekQ5CDOw8JRCTO9mbvLW6MmB/n8iQQPkok=";
+    hash = "sha256-GParXVKAbYI8zjBWjf7+uBCpMzLszp2nMxXhJkf4Ln4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix
new file mode 100644
index 000000000000..5df616e5f8d6
--- /dev/null
+++ b/pkgs/development/python-modules/leaone-ble/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  bluetooth-data-tools,
+  bluetooth-sensor-state-data,
+  buildPythonPackage,
+  fetchFromGitHub,
+  home-assistant-bluetooth,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  sensor-state-data,
+}:
+
+buildPythonPackage rec {
+  pname = "leaone-ble";
+  version = "0.1.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "bluetooth-devices";
+    repo = "leaone-ble";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    bluetooth-data-tools
+    bluetooth-sensor-state-data
+    home-assistant-bluetooth
+    sensor-state-data
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "leaone_ble" ];
+
+  meta = {
+    description = "Bluetooth parser for LeaOne devices";
+    homepage = "https://github.com/bluetooth-devices/leaone-ble";
+    changelog = "https://github.com/bluetooth-devices/leaone-ble/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index dab384316fb7..09e7f36d7f86 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -4,32 +4,34 @@
   cmake,
   cython,
   fetchFromGitHub,
+  ninja,
   pytestCheckHook,
   pythonOlder,
   rapidfuzz,
   rapidfuzz-cpp,
-  scikit-build,
+  scikit-build-core,
 }:
 
 buildPythonPackage rec {
   pname = "levenshtein";
-  version = "0.25.1";
+  version = "0.26.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "Levenshtein";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ye2XQL/ZQPlA4dy3tlr03WyGhfl7SaOXMt10cWHnW5o=";
+    hash = "sha256-uLOOAmJ8Y0z+tuIIOSnI8qZoZ+IA2+tNBX1lDCvc8+A=";
     fetchSubmodules = true; # # for vendored `rapidfuzz-cpp`
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cmake
     cython
-    scikit-build
+    ninja
+    scikit-build-core
   ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix
index 980109e499b6..40133e8d7079 100644
--- a/pkgs/development/python-modules/libmambapy/default.nix
+++ b/pkgs/development/python-modules/libmambapy/default.nix
@@ -22,14 +22,14 @@
 }:
 buildPythonPackage rec {
   pname = "libmambapy";
-  version = "2024.09.20";
+  version = "2024.09.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     rev = "refs/tags/${version}";
-    hash = "sha256-/mfZEfpB4CQ2f8zyzYbnjvBgK4VEPngTNQJT4Oh62Qs=";
+    hash = "sha256-65XyIlIiUxLGoj11p9fNjauknlVyHPmaTK3LxY+XRV4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix
index 628f2ab1922f..642b67cdac31 100644
--- a/pkgs/development/python-modules/librespot/default.nix
+++ b/pkgs/development/python-modules/librespot/default.nix
@@ -6,7 +6,9 @@
   protobuf,
   pycryptodomex,
   pyogg,
+  pythonOlder,
   requests,
+  setuptools,
   websocket-client,
   zeroconf,
 }:
@@ -14,7 +16,9 @@
 buildPythonPackage rec {
   pname = "librespot";
   version = "0.0.9";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "kokarare1212";
@@ -23,10 +27,13 @@ buildPythonPackage rec {
     hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM=";
   };
 
+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
   pythonRelaxDeps = true;
 
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     defusedxml
     protobuf
     pycryptodomex
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 6dbb2c867112..d2a4acd7277e 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "10.5.0";
+  version = "10.9.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     rev = "v${version}";
-    hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI=";
+    hash = "sha256-/kjpB19X90btIewW+hjLjLagJvI5X2oIHXpcSZVtu2I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 7e2233034389..c94dbe57e0fa 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -10,16 +10,16 @@
 
 buildPythonPackage rec {
   pname = "license-expression";
-  version = "30.3.1";
+  version = "30.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
-    owner = "nexB";
+    owner = "aboutcode-org";
     repo = "license-expression";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+hINYDfUrNsCmXOIa4XO/ML1fJoB8/n6iQ4UGdw5ClE=";
+    hash = "sha256-RAgGg0Xekcw5H13YHmkgfL7eybK+4tA8EAvVTuWFRck=";
   };
 
   dontConfigure = true;
@@ -34,8 +34,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Utility library to parse, normalize and compare License expressions";
-    homepage = "https://github.com/nexB/license-expression";
-    changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst";
+    homepage = "https://github.com/aboutcode-org/license-expression";
+    changelog = "https://github.com/aboutcode-org/license-expression/blob/v${version}/CHANGELOG.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix
index ec823cf5fbf4..1543ce87a885 100644
--- a/pkgs/development/python-modules/lifelines/default.nix
+++ b/pkgs/development/python-modules/lifelines/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "lifelines";
-  version = "0.29.0";
+  version = "0.30.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "CamDavidsonPilon";
     repo = "lifelines";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9ZmecbFjUnWGNf4P3yphiMqG+/ktOYyvMtoZ6sEp1xY=";
+    hash = "sha256-rbt0eON8Az5jDvj97RDn3ppWyjbrSa/xumbwhq21g6g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index b7b634d38b1e..d1f78b740643 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -90,6 +90,12 @@ buildPythonPackage rec {
     async-etcd = [ aetcd ];
   };
 
+  env = {
+    # make protobuf compatible with old versions
+    # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
   doCheck = pythonOlder "3.12"; # SystemError in protobuf
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 4c19f6e772c9..3e53e25e0b1d 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "limnoria";
-  version = "2024.5.30";
+  version = "2024.8.26";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uKJMeC1dXhQp1CGbtdnqmELFO64VWblhABGfpKHGCZQ=";
+    hash = "sha256-X1Nvm7bccwHn9KIKQuRb+mLzUwEdeiLNkzyxKa2Jk8Y=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/linear-operator/default.nix b/pkgs/development/python-modules/linear-operator/default.nix
index ab402c37aa79..e32b3f2c8f7b 100644
--- a/pkgs/development/python-modules/linear-operator/default.nix
+++ b/pkgs/development/python-modules/linear-operator/default.nix
@@ -9,35 +9,36 @@
   setuptools-scm,
   torch,
   typeguard,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "linear-operator";
-  version = "0.5.2";
-  format = "pyproject";
+  version = "0.5.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cornellius-gp";
     repo = "linear_operator";
     rev = "refs/tags/v${version}";
-    hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI=";
+    hash = "sha256-fKDVaHyaneV6MafJd/RT2InZO5cuYoC36YgzQhfIH8g=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jaxtyping
     scipy
     torch
     typeguard
   ];
 
-  pythonRelaxDeps = [ "typeguard" ];
+  pythonRelaxDeps = [
+    "jaxtyping"
+    "typeguard"
+  ];
 
   pythonImportsCheck = [ "linear_operator" ];
 
@@ -46,6 +47,7 @@ buildPythonPackage rec {
   disabledTests = [
     # flaky numerical tests
     "test_matmul_matrix_broadcast"
+    "test_solve_matrix_broadcast"
     "test_svd"
   ];
 
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index c05d3bbc75a2..e98a78f9bc1d 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -6,6 +6,7 @@
   setuptools,
   requests,
   polling,
+  deprecated,
   pytestCheckHook,
   mock,
   httpretty,
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "5.16.0";
+  version = "5.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     owner = "linode";
     repo = "python-linode-api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-B90BfuAqyncJPIvcni7bthiwSfmeL9CqeTYT1/y5TNY=";
+    hash = "sha256-f9v9xhlOfSCKEWHmzi/tpoMIXccGwA6isoAAIZOf3r4=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -31,6 +32,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     requests
     polling
+    deprecated
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix
index bce9db1f7ec3..a70b9ba08f73 100644
--- a/pkgs/development/python-modules/lit/default.nix
+++ b/pkgs/development/python-modules/lit/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "lit";
-  version = "18.1.7";
+  version = "18.1.8";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ld2b4mvcxtoDrqPsRWxpRetaCdveVI01AL/5uO1HY7s=";
+    hash = "sha256-R8F0oYaUGugw8E3tdqNERgC+Z9Xl+4KCw3g/umccTts=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 8b19dd4915a0..89f32222a762 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -37,7 +37,7 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.47.0";
+  version = "1.51.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     owner = "BerriAI";
     repo = "litellm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-onFBSClB+FDbpc7VYkm2jks8G6L/LGsZq9tyFW+uHZc=";
+    hash = "sha256-jC5BiD4JFfsiyNOSlY6rH6l3Dk6AKKXJ8+Q6MTGYTpM=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix
index b4c4eb4ac3c2..a349c0ded16d 100644
--- a/pkgs/development/python-modules/littleutils/default.nix
+++ b/pkgs/development/python-modules/littleutils/default.nix
@@ -3,20 +3,27 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "littleutils";
-  version = "0.2.2";
-  format = "setuptools";
+  version = "0.2.4";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5srjpCA+Uw1RyWZ+0xD/47GUjyh249aWBbPeS32WkW8=";
+    hash = "sha256-x4NbAQIM7ULikRGLfXj7FrwtmhtPP0LzyzeHu02lPRk=";
   };
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   # Module has no tests
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index fe99fe37a9c2..1da515654a97 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud";
-  version = "0.1.2";
+  version = "0.1.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_cloud";
     inherit version;
-    hash = "sha256-fIB0fpp/MtS3OcLV1K3XNR+DbZLmM9asA/pAGJbTMJc=";
+    hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index 782d908b7333..be4eef72fa7e 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.11.16";
+  version = "0.11.20";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     rev = "refs/tags/v${version}";
-    hash = "sha256-t4hQMlORpdWXkbKQhVSxD/pdxFtu+sJ4FQQxIXLoH94=";
+    hash = "sha256-r4xedtxoYv6CcxtDrgwau9LY3kOBg3jXlQm1g59L7x4=";
   };
 
   sourceRoot = "${src.name}/${pname}";
@@ -63,6 +63,8 @@ buildPythonPackage rec {
     cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/
   '';
 
+  pythonRelaxDeps = [ "tenacity" ];
+
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -127,6 +129,8 @@ buildPythonPackage rec {
     # Tests require network access
     "test_from_namespaced_persist_dir"
     "test_from_persist_dir"
+    # asyncio.exceptions.InvalidStateError: invalid state
+    "test_workflow_context_to_dict_mid_run"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index 62fe9f466002..9b16410ab4f4 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neo4j";
-  version = "0.3.2";
+  version = "0.3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neo4j";
     inherit version;
-    hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0=";
+    hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix
index f51ae416bb1d..5ab6bd06bba3 100644
--- a/pkgs/development/python-modules/llama-index-legacy/default.nix
+++ b/pkgs/development/python-modules/llama-index-legacy/default.nix
@@ -20,6 +20,8 @@ buildPythonPackage rec {
     hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY=";
   };
 
+  pythonRelaxDeps = [ "tenacity" ];
+
   build-system = [ poetry-core ];
 
   dependencies = [ llama-index-core ];
diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
index 7967890cb317..04bb0ddd0caa 100644
--- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.3.3";
+  version = "0.3.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-J54Z9tWb81DcIIDVzaXqa9JkKd576gvGdMoiTDoTOII=";
+    hash = "sha256-Vt9uGIcIGvRSL57DK+LUYy2NTyYZ9yqnHqYJZiMeVKA=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 2f3e86094708..3ac980fd6ac3 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.2.12";
+  version = "0.2.16";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-RyG8GnZcyfiWuSgku07RTyicGfwVdlpmgJB4slY6dBE=";
+    hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo=";
   };
 
   pythonRemoveDeps = [
diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
index fc9f3a108eff..333780fc2f68 100644
--- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-multi-modal-llms-openai";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_multi_modal_llms_openai";
     inherit version;
-    hash = "sha256-xyBc/Zoj4iAdtSfKP4+l70+yYKtsmxXnkWNjCpFu4Vk=";
+    hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix
index e25ec90e1fef..7a12cf4bf4ab 100644
--- a/pkgs/development/python-modules/llama-index-readers-file/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-file";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_file";
     inherit version;
-    hash = "sha256-x/kgdISfxZsQBJ1JakrlJmmr/LFZoZnZoROFKi/tcLg=";
+    hash = "sha256-SEWfkJYLhjc3FHtm7YOv7JzomE+O2iVhttJQAhQ2XbI=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
index 6ab0835a135c..629d27c8e554 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-chroma";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_chroma";
     inherit version;
-    hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw=";
+    hash = "sha256-3vFadjVLtGWLFrrbklN6cudmJz1eVmsFdUYQBdpThH8=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
index b45bfd7c0bd5..92fe05098613 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-qdrant";
-  version = "0.3.0";
+  version = "0.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_qdrant";
     inherit version;
-    hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I=";
+    hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 7eabf44f7f79..bc8719d4de36 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.5.7";
+  version = "0.5.12";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-sqKdvOMrmTQvuULRwhCr7w7qV99vJmZimQOe96kx/v8=";
+    hash = "sha256-4kFgbPNXRCXfdsD10BoxqVx5LG+++AqvcvjtZEi9FxU=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 7f3f07250ae5..568c57683215 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -10,6 +10,7 @@
   openai,
   pip,
   pluggy,
+  puremagic,
   pydantic,
   python-ulid,
   pyyaml,
@@ -21,7 +22,7 @@
 let
   llm = buildPythonPackage rec {
     pname = "llm";
-    version = "0.16";
+    version = "0.17.1";
     pyproject = true;
 
     build-system = [ setuptools ];
@@ -32,7 +33,7 @@ let
       owner = "simonw";
       repo = "llm";
       rev = "refs/tags/${version}";
-      hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE=";
+      hash = "sha256-6OO0SIIxChM5HRJoUM4CYGbsINmc3i+iyL/oahLHhrY=";
     };
 
     patches = [ ./001-disable-install-uninstall-commands.patch ];
@@ -43,6 +44,7 @@ let
       openai
       pip
       pluggy
+      puremagic
       pydantic
       python-ulid
       pyyaml
diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index 4ebb8c0b4185..5f1174763f1a 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "3.5.0";
+  version = "3.7.2";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "localstack_ext";
     inherit version;
-    hash = "sha256-tJNgNqCzlebbDOOgkScOKaf04bLTVIjP+BaFiDLo/Gs=";
+    hash = "sha256-gd+HyZnezgtKrSKJOYtxUZHTPMrrpKWQHGvaIs9FyVs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix
index 637e411ea65e..a48d8abefa86 100644
--- a/pkgs/development/python-modules/localstack/default.nix
+++ b/pkgs/development/python-modules/localstack/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "localstack";
-  version = "3.6.0";
+  version = "3.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MAECVYO6+1JqSZN8PFvHcMWizeYBUnU+7o7l48uwpv4=";
+    hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA=";
   };
 
   build-system = [ setuptools ];
@@ -77,5 +77,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/localstack/localstack";
     license = licenses.asl20;
     maintainers = [ ];
+    mainProgram = "localstack";
   };
 }
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index 1043325e1033..e9615872fdaf 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -12,15 +12,14 @@
 
 buildPythonPackage rec {
   pname = "m2crypto";
-  version = "0.41.0";
+  version = "0.42.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "M2Crypto";
-    inherit version;
-    hash = "sha256-OhNYx+6EkEbZF4Knd/F4a/AnocHVG1+vjxlDW/w/FJU=";
+    inherit pname version;
+    hash = "sha256-QrYt8sr2IxYbHWQ6cjVGTC/ioxBQSevEmKbUfcCPZLQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
index bf8b990fe0d9..761e7deff0e9 100644
--- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
@@ -4,23 +4,28 @@
   fetchPypi,
   setuptools,
   autobahn,
-  mock,
   twisted,
-  pythonOlder,
-  pythonAtLeast,
+  python,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "magic-wormhole-transit-relay";
-  version = "0.2.1";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4=";
+    hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow=";
   };
 
+  postPatch = ''
+    # Passing the environment to twistd is necessary to preserve Python's site path.
+    substituteInPlace src/wormhole_transit_relay/test/test_backpressure.py --replace-fail \
+      'reactor.spawnProcess(proto, exe, args)' \
+      'reactor.spawnProcess(proto, exe, args, None)'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -33,19 +38,21 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    mock
     twisted
   ];
 
   __darwinAllowLocalNetworking = true;
 
+  postCheck = ''
+    # Avoid collision with twisted's plugin cache (#164775).
+    rm "$out/${python.sitePackages}/twisted/plugins/dropin.cache"
+  '';
+
   meta = {
     description = "Transit Relay server for Magic-Wormhole";
     homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay";
     changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.mjoerg ];
-    # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-transit-relay/issues/35
-    broken = pythonOlder "3.7" || pythonAtLeast "3.12";
   };
 }
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 5abdff45c6d1..87404ab5b21e 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   setuptools,
@@ -36,12 +36,14 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.16.0";
+  version = "0.17.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-FObBRomNvaem0ZAmJiOmlBmVU2Pn5DTWSq0tIz1tlMk=";
+  src = fetchFromGitHub {
+    owner = "magic-wormhole";
+    repo = "magic-wormhole";
+    rev = "refs/tags/${version}";
+    hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4=";
   };
 
   postPatch =
@@ -81,8 +83,12 @@ buildPythonPackage rec {
   nativeCheckInputs =
     # For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies,
     # which are not yet supported with this version.
-    lib.optionals (!magic-wormhole-mailbox-server.meta.broken) [ magic-wormhole-mailbox-server ]
-    ++ lib.optionals (!magic-wormhole-transit-relay.meta.broken) [ magic-wormhole-transit-relay ]
+    lib.optionals
+      (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay.meta.broken)
+      [
+        magic-wormhole-mailbox-server
+        magic-wormhole-transit-relay
+      ]
     ++ [
       mock
       pytestCheckHook
@@ -101,10 +107,10 @@ buildPythonPackage rec {
         "src/wormhole/test/dilate/test_full.py"
         "src/wormhole/test/test_args.py"
         "src/wormhole/test/test_cli.py"
+        "src/wormhole/test/test_transit.py"
         "src/wormhole/test/test_wormhole.py"
         "src/wormhole/test/test_xfer_util.py"
-      ]
-    ++ lib.optionals magic-wormhole-transit-relay.meta.broken [ "src/wormhole/test/test_transit.py" ];
+      ];
 
   postInstall = ''
     install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
index 5a3084ae84cf..226fe1878de2 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -4,33 +4,45 @@
   python,
   glibcLocales,
   fetchFromGitHub,
+  pytest-cov-stub,
+  pytestCheckHook,
+  setuptools,
   six,
-  simplejson,
 }:
 
 buildPythonPackage rec {
   pname = "mail-parser";
-  version = "3.15.0";
-  format = "setuptools";
+  version = "4.0.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SpamScope";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw";
+    repo = "mail-parser";
+    rev = "refs/tags/${version}";
+    hash = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w=";
   };
 
   LC_ALL = "en_US.utf-8";
 
   nativeBuildInputs = [ glibcLocales ];
-  propagatedBuildInputs = [
-    simplejson
+
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [ "ipaddress" ];
+
+  dependencies = [
     six
   ];
 
+  pythonImportsCheck = [ "mailparser" ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
   # Taken from .travis.yml
-  checkPhase = ''
-    ${python.interpreter} tests/test_main.py
+  postCheck = ''
     ${python.interpreter} -m mailparser -v
     ${python.interpreter} -m mailparser -h
     ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j
diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix
index 4b0aeca1431b..f6cb1a2a2330 100644
--- a/pkgs/development/python-modules/mailsuite/default.nix
+++ b/pkgs/development/python-modules/mailsuite/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mailsuite";
-  version = "1.9.15";
+  version = "1.9.16";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-R4nAphydamZojQR7pro5Y3dZg3nYK0+X5lFBMJUpCfw=";
+    hash = "sha256-rfavOOivttXXmdA/Nl3jUmXIUQrjxDDZ8cHcNIJQL6U=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix
index 6a727d666f59..dfbf49de3da6 100644
--- a/pkgs/development/python-modules/makefun/default.nix
+++ b/pkgs/development/python-modules/makefun/default.nix
@@ -13,20 +13,20 @@
 
 buildPythonPackage rec {
   pname = "makefun";
-  version = "1.15.4";
+  version = "1.15.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-n5uZBOfDl3WTdKiPTFd4H7qypFjex430s+5ics2fsBA=";
+    hash = "sha256-JrxjRCphgvt17+2LUXQd0tHbLxdr7Ixk4gpYYla48Uk=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "pytest-runner" ""
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools>=39.2,<72"' '"setuptools"'
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
diff --git a/pkgs/development/python-modules/mando/default.nix b/pkgs/development/python-modules/mando/default.nix
index 9d60bf3eddb8..d6b8055a730c 100644
--- a/pkgs/development/python-modules/mando/default.nix
+++ b/pkgs/development/python-modules/mando/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "mando";
-  version = "0.7.1";
+  version = "0.8.2";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "rubik";
     repo = "mando";
     rev = "v${version}";
-    hash = "sha256-Ylrrfo57jqGuWEqCa5RyTT9AagBpUvAfviHkyJPFv08=";
+    hash = "sha256-FuQZ53ojrQO++0TN0C3hk0LXH+mcfRqtGq8VvfYDufg=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix
index 9c520c0bde76..e1d349a8e848 100644
--- a/pkgs/development/python-modules/manim-slides/default.nix
+++ b/pkgs/development/python-modules/manim-slides/default.nix
@@ -15,7 +15,7 @@
   jinja2,
   lxml,
   numpy,
-  opencv4,
+  opencv-python,
   pillow,
   pydantic,
   pydantic-extra-types,
@@ -52,8 +52,6 @@ buildPythonPackage rec {
     hatch-fancy-pypi-readme
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   pythonRelaxDeps = [
     "rtoml"
     "qtpy"
@@ -67,7 +65,7 @@ buildPythonPackage rec {
       jinja2
       lxml
       numpy
-      opencv4
+      opencv-python
       pillow
       pydantic
       pydantic-extra-types
diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index d96b03dfd35a..8ebb32020b1f 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -12,12 +12,8 @@
   texliveInfraOnly,
 
   click,
-  click-default-group,
   cloup,
-  colour,
-  grpcio,
-  grpcio-tools,
-  importlib-metadata,
+  decorator,
   isosurfaces,
   jupyterlab,
   manimpango,
@@ -25,6 +21,7 @@
   moderngl,
   moderngl-window,
   networkx,
+  notebook,
   numpy,
   pillow,
   pycairo,
@@ -37,6 +34,7 @@
   srt,
   svgelements,
   tqdm,
+  typing-extensions,
   watchdog,
 }:
 
@@ -188,7 +186,7 @@ buildPythonPackage rec {
     hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
 
@@ -205,20 +203,18 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" ""
+
+    substituteInPlace manim/_config/default.cfg \
+      --replace "ffmpeg_executable = ffmpeg" "ffmpeg_executable = ${lib.getExe ffmpeg}"
   '';
 
   buildInputs = [ cairo ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
-    click-default-group
     cloup
-    colour
-    grpcio
-    grpcio-tools
-    importlib-metadata
+    decorator
     isosurfaces
-    jupyterlab
     manimpango
     mapbox-earcut
     moderngl
@@ -236,9 +232,19 @@ buildPythonPackage rec {
     srt
     svgelements
     tqdm
+    typing-extensions
     watchdog
   ];
 
+  optional-dependencies = {
+    jupyterlab = [
+      jupyterlab
+      notebook
+    ];
+    # TODO package dearpygui
+    # gui = [ dearpygui ];
+  };
+
   makeWrapperArgs = [
     "--prefix"
     "PATH"
diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix
index 6a1876ed6376..9197d44043e8 100644
--- a/pkgs/development/python-modules/manimpango/default.nix
+++ b/pkgs/development/python-modules/manimpango/default.nix
@@ -3,44 +3,46 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  python,
   pkg-config,
+  setuptools,
   pango,
   cython,
   AppKit,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "manimpango";
-  version = "0.5.0";
-  format = "setuptools";
+  version = "0.6.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "ManimCommunity";
-    repo = pname;
+    repo = "manimpango";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EBSbvjQyQIXOzvQMbuTwOoV8xSAOYDlCBZ56NLneuQI=";
+    hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
 
-  propagatedBuildInputs = [ cython ];
+  build-system = [
+    setuptools
+    cython
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov --no-cov-on-fail" ""
-  '';
-
-  preBuild = ''
-    ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace
+  preCheck = ''
+    rm -r manimpango
   '';
 
   pythonImportsCheck = [ "manimpango" ];
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 07bf6ae8c078..3d135bd357f0 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -2,13 +2,17 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
-  setuptools,
+
+  # build-system
+  hatchling,
+
+  # dependencies
   click,
   docutils,
   itsdangerous,
   jedi,
   markdown,
+  narwhals,
   packaging,
   psutil,
   pygments,
@@ -19,25 +23,25 @@
   uvicorn,
   websockets,
   pyyaml,
-  pytestCheckHook,
+
+  # tests
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.9.1";
+  version = "0.9.14";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
+  # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7sG6i1WusNuCpuaojFXhSfPWCA2/nzHXvMF29ApGTDg=";
+    hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
-  # ruff is not packaged as a python module in nixpkgs
-  pythonRemoveDeps = [ "ruff" ];
+  pythonRelaxDeps = [ "websockets" ];
 
   dependencies = [
     click
@@ -45,6 +49,7 @@ buildPythonPackage rec {
     itsdangerous
     jedi
     markdown
+    narwhals
     packaging
     psutil
     pygments
@@ -57,17 +62,21 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
   pythonImportsCheck = [ "marimo" ];
 
-  meta = with lib; {
+  # The pypi archive does not contain tests so we do not use `pytestCheckHook`
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
     description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps";
     homepage = "https://github.com/marimo-team/marimo";
     changelog = "https://github.com/marimo-team/marimo/releases/tag/${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "marimo";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       akshayka
       dmadisetti
     ];
diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix
index b6d8fa20ba6c..12a3fcac60c6 100644
--- a/pkgs/development/python-modules/markdownify/default.nix
+++ b/pkgs/development/python-modules/markdownify/default.nix
@@ -2,26 +2,32 @@
   lib,
   beautifulsoup4,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  setuptools-scm,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "markdownify";
-  version = "0.12.1";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-H7CMYYsw4O56MaObmY9EoY+yirJU9V9K8GttNaIXnic=";
+  src = fetchFromGitHub {
+    owner = "matthewwithanm";
+    repo = "python-markdownify";
+    rev = "refs/tags/${version}";
+    hash = "sha256-EqQ4DKIGaMNivw9cWCSP/Mh+1YxyTaHGPYRjGxPFOnA=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     beautifulsoup4
diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix
new file mode 100644
index 000000000000..d5aaf83d76c0
--- /dev/null
+++ b/pkgs/development/python-modules/marko/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pdm-backend,
+  pygments,
+  objprint,
+  python-slugify,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "marko";
+  version = "2.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "frostming";
+    repo = "marko";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KqdBYmlVs00atXy7MSsriRBnL7w13io2oFZ0IyJ2Om4=";
+  };
+
+  build-system = [
+    pdm-backend
+  ];
+
+  optional-dependencies = {
+    codehilite = [
+      pygments
+    ];
+    repr = [
+      objprint
+    ];
+    toc = [
+      python-slugify
+    ];
+  };
+
+  pythonImportsCheck = [
+    "marko"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ optional-dependencies.toc ++ optional-dependencies.codehilite;
+
+  meta = {
+    changelog = "https://github.com/frostming/marko/blob/${src.rev}/CHANGELOG.md";
+    description = "Markdown parser with high extensibility";
+    homepage = "https://github.com/frostming/marko";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 5b4a039ae280..ede8b745c0f7 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
 
   # build-system
@@ -19,18 +19,19 @@
 
 buildPythonPackage rec {
   pname = "markupsafe";
-  version = "2.1.5";
+  version = "3.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    pname = "MarkupSafe";
-    inherit version;
-    hash = "sha256-0oPTeokLpMGuc/+t+ARkNcdue8Ike7tjwAvRpwnGVEs=";
+  src = fetchFromGitHub {
+    owner = "pallets";
+    repo = "markupsafe";
+    rev = "refs/tags/${version}";
+    hash = "sha256-YMvEfrIwGy5Ug4EjkiWOlijEWltWSjJGDrpseH86778=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -46,7 +47,7 @@ buildPythonPackage rec {
   };
 
   meta = with lib; {
-    changelog = "https://markupsafe.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${
+    changelog = "https://markupsafe.palletsprojects.com/page/changes/#version-${
       replaceStrings [ "." ] [ "-" ] version
     }";
     description = "Implements a XML/HTML/XHTML Markup safe string";
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 587e81985532..ae7e59177af8 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -7,13 +7,13 @@
   marshmallow,
   packaging,
   sqlalchemy,
-  pytest-lazy-fixture,
+  pytest-lazy-fixtures,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "marshmallow-sqlalchemy";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "marshmallow_sqlalchemy";
     inherit version;
-    hash = "sha256-IKDy/N1b3chkRPoBRh8X+bahKo3dTKjJs0/i8uNdAKI=";
+    hash = "sha256-KrCS2iadr6igXVGlhAmvcajSGDlYukcUMSfdI54DWdg=";
   };
 
   build-system = [ flit-core ];
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "marshmallow_sqlalchemy" ];
 
   nativeCheckInputs = [
-    pytest-lazy-fixture
+    pytest-lazy-fixtures
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index 0cab2ca8dd70..2b28c29da244 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "mashumaro";
-  version = "3.13.1";
+  version = "3.14";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,12 +27,12 @@ buildPythonPackage rec {
     owner = "Fatal1ty";
     repo = "mashumaro";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Km3RuDU77L3N2RQBhpcEztOjYtQhTXFZoGKu70g5EPU=";
+    hash = "sha256-0THj22KdMvD5O3dNwXKxs2wRIJziPmojLo4BPa3fZ3Y=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ typing-extensions ];
+  dependencies = [ typing-extensions ];
 
   optional-dependencies = {
     orjson = [ orjson ];
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index 0ebcc212617b..2e7af7b89b1f 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -5,13 +5,14 @@
   fetchFromGitHub,
   cmake,
   setuptools,
-  darwin,
   libX11,
   libXt,
   libGL,
   openimageio,
   imath,
   python,
+  darwinMinVersionHook,
+  apple-sdk_14,
 }:
 
 buildPythonPackage rec {
@@ -37,13 +38,10 @@ buildPythonPackage rec {
       openimageio
       imath
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        OpenGL
-        Cocoa
-      ]
-    )
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_14
+      (darwinMinVersionHook "10.15")
+    ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       libX11
       libXt
@@ -53,9 +51,8 @@ buildPythonPackage rec {
   cmakeFlags = [
     (lib.cmakeBool "MATERIALX_BUILD_OIIO" true)
     (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true)
-    # don't build MSL shader back-end on x86_x64-darwin, as it requires a newer SDK with metal support
     (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (
-      stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin)
+      stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin
     ))
   ];
 
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index d91c96e6dd74..f07acb53dc69 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -89,7 +89,7 @@ let
 in
 
 buildPythonPackage rec {
-  version = "3.9.1";
+  version = "3.9.2";
   pname = "matplotlib";
   pyproject = true;
 
@@ -97,7 +97,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3gaxm425XdM9DcF8kmx8nr7Z9XIHS2+sT2UGimgU0BA=";
+    hash = "sha256-lqtDkGJpymSmNmk0EG+gFTRFSmnkcbe/PXkIOYGqq5I=";
   };
 
   env.XDG_RUNTIME_DIR = "/tmp";
diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
index d7cf61de83b7..91b5772901db 100644
--- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix
+++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "mdformat-mkdocs";
-  version = "3.0.0";
+  version = "3.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "KyleKing";
     repo = "mdformat-mkdocs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE=";
+    hash = "sha256-MO/YMvvpsEarc8CjELByHUqR5xFtYqhkKkJrFy0PNvU=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix
index 730b78a7b42d..7287175c665b 100644
--- a/pkgs/development/python-modules/mdit-py-plugins/default.nix
+++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "mdit-py-plugins";
-  version = "0.4.1";
+  version = "0.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "executablebooks";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-xIbP2zHvHWV+2wW17i78vxc5npCvRBYP6QuL/mCBIww=";
+    hash = "sha256-aY2DMLh1OkWVcN6A29FLba1ETerf/EOqSjHVpsdE21M=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/mean-average-precision/default.nix b/pkgs/development/python-modules/mean-average-precision/default.nix
new file mode 100644
index 000000000000..24a4d65aaf67
--- /dev/null
+++ b/pkgs/development/python-modules/mean-average-precision/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  pandas,
+}:
+
+buildPythonPackage rec {
+  pname = "mean-average-precision";
+  version = "2024.01.05.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bes-dev";
+    repo = "mean_average_precision";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qo160L+oJsHERVOV0qdiRIZPMjvSlUmMTrAzThfrQSs=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+    pandas
+  ];
+
+  pythonImportsCheck = [
+    "mean_average_precision"
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Mean Average Precision for Object Detection";
+    homepage = "https://github.com/bes-dev/mean_average_precision";
+    changelog = "https://github.com/bes-dev/mean_average_precision/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/medallion/default.nix b/pkgs/development/python-modules/medallion/default.nix
new file mode 100644
index 000000000000..04972dc1eb06
--- /dev/null
+++ b/pkgs/development/python-modules/medallion/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  flask,
+  flask-httpauth,
+  pytz,
+  six,
+  pymongo,
+}:
+
+buildPythonPackage rec {
+  pname = "medallion";
+  version = "3.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "oasis-open";
+    repo = "cti-taxii-server";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    flask
+    flask-httpauth
+    pymongo
+    pytz
+    six
+  ];
+
+  pythonImportsCheck = [ "medallion" ];
+
+  meta = with lib; {
+    description = "Minimal implementation of a TAXII 2.1 Server in Python";
+    homepage = "https://medallion.readthedocs.io/en/latest/";
+    changelog = "https://github.com/oasis-open/cti-taxii-server/blob/v${version}/CHANGES.txt";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ PapayaJackal ];
+  };
+}
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 1608a5e67ec9..ab8e238dc6d0 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -18,7 +18,6 @@
   harminv,
   libctl,
   libGDSII,
-  openssh,
   guile,
   python,
   numpy,
@@ -124,7 +123,6 @@ buildPythonPackage rec {
   */
   nativeCheckInputs = [
     mpiCheckPhaseHook
-    openssh
   ];
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index 59252dddc7c1..c0e12faa851f 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.31.5";
+  version = "0.31.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "meilisearch";
     repo = "meilisearch-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-br+FnUnwDt64dvZAMEK/oqESCWZuOUt9Lp9HGcIPqxc=";
+    hash = "sha256-YMKspKryhcxecIDLg3PiKHJoRtQBsIi8N//ZtAMBvMg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/melnor-bluetooth/default.nix b/pkgs/development/python-modules/melnor-bluetooth/default.nix
new file mode 100644
index 000000000000..649433f99795
--- /dev/null
+++ b/pkgs/development/python-modules/melnor-bluetooth/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  aioconsole,
+  bleak-retry-connector,
+  bleak,
+  buildPythonPackage,
+  deprecated,
+  fetchFromGitHub,
+  freezegun,
+  poetry-core,
+  poetry-dynamic-versioning,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  syrupy,
+  tzdata,
+  tzlocal,
+}:
+
+buildPythonPackage rec {
+  pname = "melnor-bluetooth";
+  version = "0.0.25";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "vanstinator";
+    repo = "melnor-bluetooth";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-BQKXQrPT/+qm9cRO7pfScPwW0iwdhliTfX4XJ/kRQG0=";
+  };
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    aioconsole
+    bleak
+    bleak-retry-connector
+    deprecated
+    tzdata
+    tzlocal
+  ];
+
+  nativeCheckInputs = [
+    freezegun
+    pytest-asyncio
+    pytestCheckHook
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "melnor_bluetooth" ];
+
+  meta = {
+    description = "Module to interact with Melnor and Eden bluetooth watering timers";
+    homepage = "https://github.com/vanstinator/melnor-bluetooth";
+    changelog = "https://github.com/vanstinator/melnor-bluetooth/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/mercadopago/default.nix b/pkgs/development/python-modules/mercadopago/default.nix
index 2a760b321eff..4f5ba6fe2c44 100644
--- a/pkgs/development/python-modules/mercadopago/default.nix
+++ b/pkgs/development/python-modules/mercadopago/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mercadopago";
-  version = "2.2.1";
+  version = "2.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mercadopago";
     repo = "sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-ABxYGYUBOzeOSE0yK8jym+ldinDUCTpqO165OWhszgs=";
+    hash = "sha256-u4/e/shfTyrucf+uj5nqAkeugX9JZjXBrNtoOkpff8c=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix
index d8a195f5f724..b205fe8496a4 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/pkgs/development/python-modules/mesa/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mesa";
-  version = "2.3.0";
+  version = "2.4.0";
   format = "setuptools";
 
   # According to their docs, this library is for Python 3+.
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mesa";
     inherit version;
-    hash = "sha256-wXHCyUk05Ez4ye5a1rKXCyKPZMK7bR7xZ5rpD5mEaUw=";
+    hash = "sha256-FlQlyNvtMXRSFT3kMwCEAjAH4b+ZCsxliUiPgbRsSgc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index b285141cf06a..e2bc68074ee4 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.3";
+  version = "2.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-6U/oAVqzNsKFgNtQPzDovoWR23J0Ax0ssCIUjjRVeR4=";
+    hash = "sha256-A1C+xkQFjoEMKyz9S7T/GzZYrcznpi/9yjBmue1Ahu4=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix
index b837f49c08c6..a10bbafb9d43 100644
--- a/pkgs/development/python-modules/meteoswiss-async/default.nix
+++ b/pkgs/development/python-modules/meteoswiss-async/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
     hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4=";
   };
 
+  pythonRelaxDeps = [ "aiohttp" ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
new file mode 100644
index 000000000000..ef2012371dd3
--- /dev/null
+++ b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "microsoft-security-utilities-secret-masker";
+  version = "1.0.0b3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "microsoft_security_utilities_secret_masker";
+    inherit version;
+    hash = "sha256-0EVIIwxno70stGCyjnH+bKwWj0jwbXapadnKR732c0M=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  pythonImportsCheck = [
+    "microsoft_security_utilities_secret_masker"
+  ];
+
+  meta = {
+    description = "A tool for detecting and masking secrets";
+    homepage = "https://pypi.org/project/microsoft-security-utilities-secret-masker/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix
index 3f372790702a..7aedc6cd2155 100644
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@@ -5,12 +5,13 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "millheater";
-  version = "0.11.8";
-  format = "setuptools";
+  version = "0.12.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.10";
 
@@ -18,10 +19,12 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pymill";
     rev = "refs/tags/${version}";
-    hash = "sha256-BSrnUhe6SFtalUGldC24eJTqJAF5FdUWo3rwWNT1uCw=";
+    hash = "sha256-8PrTypJuWNuFz1NZLuyqOpWFsN5OLshj7S10YgcGusQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     async-timeout
   ];
diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
index 423f3401da68..00c54bde3245 100644
--- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix
+++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mindsdb-evaluator";
-  version = "0.0.13";
+  version = "0.0.15";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mindsdb_evaluator";
     inherit version;
-    hash = "sha256-SW3GYe9ykbs6ZViScdAgwiBAP9ix4v1VbSm/kJK2jDA=";
+    hash = "sha256-/3xRPrKzYAdSlY+sQxwCUzKhf3NJBSyWG2Q0ZKb6v3U=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 2cf9cd45c03c..51b70234dde1 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "minio";
-  version = "7.2.9";
+  version = "7.2.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "minio";
     repo = "minio-py";
     rev = "refs/tags/${version}";
-    hash = "sha256-ObbU0skqNBebkmX5gtJ9/QHlSZFB3tvaFnitmD+lKBc=";
+    hash = "sha256-vPIMYaCt2f1OXPUtaw0OXMEADHNCv4DxpueZSyJiYqA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix
index e208daa625ef..58c74cd3cad1 100644
--- a/pkgs/development/python-modules/mirakuru/default.nix
+++ b/pkgs/development/python-modules/mirakuru/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -13,18 +14,23 @@
 
 buildPythonPackage rec {
   pname = "mirakuru";
-  version = "2.5.2";
+  version = "2.5.3";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "ClearcodeHQ";
     repo = "mirakuru";
     rev = "refs/tags/v${version}";
-    hash = "sha256-I1TKP0ESuBMTcReZf0tryjvGpSpwzofwmOiQqhyr6Zg=";
+    hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ=";
   };
 
+  patches = [
+    # https://github.com/ClearcodeHQ/mirakuru/pull/810
+    ./tmpdir.patch
+  ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [ psutil ];
@@ -37,6 +43,20 @@ buildPythonPackage rec {
   ];
   pythonImportsCheck = [ "mirakuru" ];
 
+  # Necessary for the tests to pass on Darwin with sandbox enabled.
+  __darwinAllowLocalNetworking = true;
+
+  # Those are failing in the darwin sandbox with:
+  # > ps: %mem: requires entitlement
+  # > ps: vsz: requires entitlement
+  # > ps: rss: requires entitlement
+  # > ps: time: requires entitlement
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_forgotten_stop"
+    "test_mirakuru_cleanup"
+    "test_daemons_killing"
+  ];
+
   meta = with lib; {
     homepage = "https://pypi.org/project/mirakuru";
     description = "Process orchestration tool designed for functional and integration tests";
diff --git a/pkgs/development/python-modules/mirakuru/tmpdir.patch b/pkgs/development/python-modules/mirakuru/tmpdir.patch
new file mode 100644
index 000000000000..2fd6fcfd2741
--- /dev/null
+++ b/pkgs/development/python-modules/mirakuru/tmpdir.patch
@@ -0,0 +1,19 @@
+--- a/tests/executors/test_unixsocket_executor.py
++++ b/tests/executors/test_unixsocket_executor.py
+@@ -4,6 +4,7 @@ Some of these tests run ``nc``: when running Debian, make sure the
+ ``netcat-openbsd`` package is used, not ``netcat-traditional``.
+ """
+ 
++import os
+ import sys
+ 
+ import pytest
+@@ -12,7 +13,7 @@ from mirakuru import TimeoutExpired
+ from mirakuru.unixsocket import UnixSocketExecutor
+ from tests import TEST_SOCKET_SERVER_PATH
+ 
+-SOCKET_PATH = "/tmp/mirakuru.sock"
++SOCKET_PATH = os.path.join(os.getenv("TMPDIR", "/tmp"), "mirakuru.sock")
+ 
+ SOCKET_SERVER_CMD = f"{sys.executable} {TEST_SOCKET_SERVER_PATH} {SOCKET_PATH}"
+ 
diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 45b5018b784a..29fea1295d23 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.14";
+  version = "0.3.18";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Gacn3EjyNq5LtjfbCczO+fqlq6+KgzxFs4d/K2xttHE=";
+    hash = "sha256-dSG8yBeutd2loIuoeLC1B3bC9kIeVitK3jD1J27E0SM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix
index 92ced96774e0..4e985885890a 100644
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -13,22 +12,20 @@
   pandas,
   scipy,
 
-  # checks
+  # tests
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mizani";
-  version = "0.12.2";
+  version = "0.13.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "mizani";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8=";
+    hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
index 26afc10604c5..0f489b4c14c5 100644
--- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-git-revision-date-localized-plugin";
-  version = "1.2.7";
+  version = "1.2.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "timvink";
     repo = "mkdocs-git-revision-date-localized-plugin";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dzFxNAVBQ5a4opdxSz42VCns49DlZyrglUaQTzfLnW8=";
+    hash = "sha256-1SuENREPkU9W5ldMIXDCALLMx0AiTs4dNYJYjrkaegc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
index dd0c300ab175..c0286491927c 100644
--- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix
+++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-jupyter";
-  version = "0.25.0";
+  version = "0.25.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mkdocs_jupyter";
     inherit version;
-    hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU=";
+    hash = "sha256-DpJy/0lH4OxoPJJCOkv7QqJkd8EDqxpquCd+LcyPev4=";
   };
 
   pythonRelaxDeps = [ "nbconvert" ];
diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index 47b9e1bf4e67..efb5e612e0a7 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocstrings-python";
-  version = "1.12.0";
+  version = "1.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "python";
     rev = "refs/tags/${version}";
-    hash = "sha256-Dwh1MQuOjN/quxKlOMIadZ5MR8BrS/s6l4mwSBTfXQE=";
+    hash = "sha256-dc9RXbrwZS/7eAF0BrGS2kJxG62rB5RLxf3yNZ6+g4Q=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index b04eddabc5ff..ab01d055627f 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -80,10 +80,21 @@ buildPythonPackage rec {
     hash = "sha256-7W1gpVgJSN/iXoW987eCHfcOeE3D/ZJ2W/eilDdzOww=";
   };
 
-  build-system = [
-    setuptools
+  # Remove currently broken dependency `shap`, a model explainability package.
+  # This seems quite unprincipled especially with tests not being enabled,
+  # but not mlflow has a 'skinny' install option which does not require `shap`.
+  pythonRemoveDeps = [ "shap" ];
+  pythonRelaxDeps = [
+    "gunicorn"
+    "importlib-metadata"
+    "packaging"
+    "protobuf"
+    "pytz"
+    "pyarrow"
   ];
 
+  build-system = [ setuptools ];
+
   dependencies = [
     alembic
     cachetools
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 614aed274ba0..ac90ebb89808 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -28,13 +28,13 @@ let
 in
 buildPythonPackage rec {
   pname = "mlx";
-  version = "0.15.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "ml-explore";
     repo = "mlx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+vgHEt+L91YJLpQo4bps+Rnm/TS1PAPXNohdICGK6GE=";
+    hash = "sha256-eFKjCrutqrmhZKzRrLq5nYl0ieqLvoXpbnTxA1NEhWo=";
   };
 
   pyproject = true;
diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index f31daa71f443..78d3198e4155 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   setuptools,
@@ -41,6 +42,21 @@ buildPythonPackage rec {
     hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "mmengine-torch-2.5-compat.patch";
+      url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch";
+      hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A=";
+    })
+    (fetchpatch2 {
+      # Bug reported upstream in https://github.com/open-mmlab/mmengine/issues/1575
+      # PR: https://github.com/open-mmlab/mmengine/pull/1589
+      name = "adapt-to-pytest-breaking-change";
+      url = "https://patch-diff.githubusercontent.com/raw/open-mmlab/mmengine/pull/1589.patch";
+      hash = "sha256-lyKf1GCLOPMpDttJ4s9hbATIGCVkiQhtyLfH9WzMWrw=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -55,7 +71,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    # bitsandbytes (broken as of 2024-07-06)
+    bitsandbytes
     coverage
     dvclive
     lion-pytorch
@@ -68,7 +84,7 @@ buildPythonPackage rec {
 
   preCheck =
     ''
-      export HOME=$TMPDIR
+      export HOME=$(mktemp -d)
     ''
     # Otherwise, the backprop hangs forever. More precisely, this exact line:
     # https://github.com/open-mmlab/mmengine/blob/02f80e8bdd38f6713e04a872304861b02157905a/tests/test_runner/test_activation_checkpointing.py#L46
@@ -86,14 +102,6 @@ buildPythonPackage rec {
     "tests/test_runner/test_activation_checkpointing.py"
     # missing dependencies
     "tests/test_visualizer/test_vis_backend.py"
-    # Tests are outdated (runTest instead of run_test)
-    "mmengine/testing/_internal"
-    "tests/test_dist/test_dist.py"
-    "tests/test_dist/test_utils.py"
-    "tests/test_hooks/test_sync_buffers_hook.py"
-    "tests/test_model/test_wrappers/test_model_wrapper.py"
-    "tests/test_optim/test_optimizer/test_optimizer.py"
-    "tests/test_optim/test_optimizer/test_optimizer_wrapper.py"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix
index 8b4b66ce4fca..3493806d5fe4 100644
--- a/pkgs/development/python-modules/mne-python/default.nix
+++ b/pkgs/development/python-modules/mne-python/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "mne-python";
-  version = "1.7.1";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "mne-tools";
     repo = "mne-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-piCFynpKh7gTWIGh2g0gJICLS+eg/0XAxaDkyu7v5vs=";
+    hash = "sha256-WPRTX8yB4oP/L5DjSq9M6WOmHJDpQv0sAbuosp7ZGVw=";
   };
 
   postPatch = ''
@@ -40,12 +40,12 @@ buildPythonPackage rec {
       --replace-fail "--cov-branch" ""
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     scipy
     matplotlib
@@ -74,8 +74,10 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
-    # Fails due to changes in Numpy types
-    "mne.stats._adjacency.combine_adjacency"
+    # requires qtbot which is unmaintained/not in Nixpkgs:
+    "test_plotting_scalebars"
+    # tries to write a datetime object to hdf5, which fails:
+    "test_hitachi_basic"
   ];
 
   pythonImportsCheck = [ "mne" ];
diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix
index dc76a6d6ea09..c4d400cae107 100644
--- a/pkgs/development/python-modules/mobly/default.nix
+++ b/pkgs/development/python-modules/mobly/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -47,6 +48,13 @@ buildPythonPackage rec {
     pytz
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # cannot access /usr/bin/pgrep from the sandbox
+    "test_stop_standing_subproc"
+    "test_stop_standing_subproc_and_descendants"
+    "test_stop_standing_subproc_without_pipe"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/mock-ssh-server/default.nix b/pkgs/development/python-modules/mock-ssh-server/default.nix
index abf911588ba2..72fef03db247 100644
--- a/pkgs/development/python-modules/mock-ssh-server/default.nix
+++ b/pkgs/development/python-modules/mock-ssh-server/default.nix
@@ -4,23 +4,26 @@
   fetchFromGitHub,
   paramiko,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "mock-ssh-server";
   version = "0.9.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "carletes";
-    repo = pname;
+    repo = "mock-ssh-server";
     rev = "refs/tags/${version}";
     hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo=";
   };
 
-  propagatedBuildInputs = [ paramiko ];
+  build-system = [ setuptools ];
+
+  dependencies = [ paramiko ];
 
   # Tests are running into a timeout on Hydra, they work locally
   doCheck = false;
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index eef43dc79fd8..b80549db4c13 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -26,6 +26,7 @@
   httpx,
   psutil,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   redis,
   redis-server,
@@ -36,12 +37,12 @@
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.12.8";
+  version = "3.13.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-++zGXLtQ01srmF0EqUFqaxh+mnNzW8IzYG1RzNGTXkw=";
+    hash = "sha256-GFzIDSE+09L4RC5w4h3fqgq9lkyOVjq5JN++ZNbHWc8=";
   };
 
   nativeBuildInputs = [ hatchling ];
@@ -66,6 +67,7 @@ buildPythonPackage rec {
       httpx
       psutil
       pytest-asyncio
+      pytest-cov-stub
       pytestCheckHook
       redis
       requests
diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix
index 709a358c368c..4a5dc1a60be1 100644
--- a/pkgs/development/python-modules/mockito/default.nix
+++ b/pkgs/development/python-modules/mockito/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "mockito";
-  version = "1.5.0";
+  version = "1.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-A2Eo2n2vLaiaC2N71zMh6ZL/ZbqKOYdsojPuwX63fo8=";
+    hash = "sha256-QFYkCRcVzDlU4vo5zFDlCNWXeNTS+1bI23v6X1k9MwM=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix
index 47c167237836..04f94f5810cf 100644
--- a/pkgs/development/python-modules/modelcif/default.nix
+++ b/pkgs/development/python-modules/modelcif/default.nix
@@ -3,34 +3,33 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  wheel,
   ihm,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "modelcif";
-  version = "1.1";
+  version = "1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihmwg";
     repo = "python-modelcif";
     rev = "refs/tags/${version}";
-    hash = "sha256-HUS9MW6jbwjK3I6egmmsH+Bx+nNgszWc3t3QRo/EWpc=";
+    hash = "sha256-sduhRLtuJ/0BNsqmrhCr0lSrLMaOfE+TCWN4zj62aCQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [ ihm ];
+  dependencies = [ ihm ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
     # require network access
+    "test_associated_example"
     "test_validate_mmcif_example"
     "test_validate_modbase_example"
   ];
diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix
index d190facc17e7..1119f0b7993c 100644
--- a/pkgs/development/python-modules/monai/default.nix
+++ b/pkgs/development/python-modules/monai/default.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   pythonOlder,
   ninja,
-  ignite,
   numpy,
+  packaging,
   pybind11,
   torch,
   which,
@@ -14,41 +14,38 @@
 
 buildPythonPackage rec {
   pname = "monai";
-  version = "1.3.2";
+  version = "1.4.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "Project-MONAI";
     repo = "MONAI";
     rev = "refs/tags/${version}";
-    hash = "sha256-wm4n3FuIXbE99RRLsGnZDeHtR/Tmj6C0s29pvflZg+o=";
+    hash = "sha256-PovYyRLgoYwxqGeCBpWxX/kdClYtYK1bgy8yRa9eue8=";
+    # note: upstream consistently seems to modify the tag shortly after release,
+    # so best to wait a few days before updating
   };
 
-  patches = [
-    (fetchpatch {
-      name = "remove-distutils";
-      url = "https://github.com/Project-MONAI/MONAI/commit/87862f0d5730d42d282e779fc1450f18b4869863.patch";
-      hash = "sha256-wApYfugDPWcuxwmd91peNqc0+l+SoMlT8hhx99oI2Co=";
-    })
-  ];
-
   preBuild = ''
     export MAX_JOBS=$NIX_BUILD_CORES;
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     ninja
     which
   ];
+
   buildInputs = [ pybind11 ];
-  propagatedBuildInputs = [
+
+  dependencies = [
     numpy
+    packaging
     torch
-    ignite
   ];
 
-  BUILD_MONAI = 1;
+  env.BUILD_MONAI = 1;
 
   doCheck = false; # takes too long; tries to download data
 
diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
index 9dd7ff86968b..c548add2b7ce 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mongoengine";
-  version = "0.28.2";
+  version = "0.29.1";
   format = "setuptools";
   disabled = isPy27;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "MongoEngine";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-5wcviRqUTOKqaeusHxS4Er3LD1BpTMW02Tip3d4zAPM=";
+    hash = "sha256-trWCKmCa+q+qtzF0HKCZMnko1cvvpwJvczLFuKtB83E=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix
index 8c74f998f820..608422286622 100644
--- a/pkgs/development/python-modules/mongomock/default.nix
+++ b/pkgs/development/python-modules/mongomock/default.nix
@@ -2,29 +2,35 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  hatch-vcs,
+  hatchling,
   packaging,
-  pbr,
   pytestCheckHook,
   pythonOlder,
+  pytz,
   sentinels,
 }:
 
 buildPythonPackage rec {
   pname = "mongomock";
-  version = "4.1.2";
-  format = "setuptools";
+  version = "4.2.0.post1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30=";
+    hash = "sha256-kkHSzscnS5c22+jtrLGVKP9mrzs3ebMk157MQgEifzE=";
   };
 
-  nativeBuildInputs = [ pbr ];
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     packaging
+    pytz
     sentinels
   ];
 
@@ -33,8 +39,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "mongomock" ];
 
   meta = with lib; {
-    homepage = "https://github.com/mongomock/mongomock";
     description = "Fake pymongo stub for testing simple MongoDB-dependent code";
+    homepage = "https://github.com/mongomock/mongomock";
+    changelog = "https://github.com/mongomock/mongomock/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ gador ];
   };
diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix
index 799f788d6f12..817a553581d4 100644
--- a/pkgs/development/python-modules/monzopy/default.nix
+++ b/pkgs/development/python-modules/monzopy/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "monzopy";
-  version = "1.3.2";
+  version = "1.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "JakeMartin-ICL";
     repo = "monzopy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9Gj0312NOumoIWN/ES+dgPL3IblgvBSCPZA97OKuhZQ=";
+    hash = "sha256-yO0mdqdoRdyl6BDT1vBuTh83zECck3atQtdtWhQCh9s=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index ea2b3c43509d..602c2399fa8f 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "more-itertools";
-  version = "10.3.0";
+  version = "10.5.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5dk+9BEiT7zvNmpujdxMV4G8Y1nUNBKmXdWWTkYRFGM=";
+    hash = "sha256-VIK/73hJwl3Dxt1Tphc65HldoqQagPrqZwDZ9YRsXaY=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index d7e31fa4af6e..948d74284584 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -17,15 +17,15 @@
 
 buildPythonPackage rec {
   pname = "morecantile";
-  version = "5.4.2";
+  version = "6.0.0";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "developmentseed";
     repo = "morecantile";
-    rev = version;
-    hash = "sha256-kUAde+6IUu95tFHFCB6kWoYsRf9GxR+gRJki/tvhIaY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-l+fQQXOrhqRanB695nR4okfmPYP05NdrGOvgG+jK2uo=";
   };
 
   nativeBuildInputs = [ flit ];
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 96e633f4c465..99a1f58beb1c 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,57 +1,50 @@
 {
   lib,
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-
-  # build-system
-  setuptools,
-
-  # dependencies
-  boto3,
-  botocore,
-  cryptography,
-  jinja2,
-  python-dateutil,
-  requests,
-  responses,
-  werkzeug,
-  xmltodict,
-
-  # optional-dependencies
   antlr4-python3-runtime,
   aws-xray-sdk,
+  boto3,
+  botocore,
+  buildPythonPackage,
   cfn-lint,
-  flask,
-  flask-cors,
+  crc32c,
+  cryptography,
   docker,
+  fetchPypi,
+  flask-cors,
+  flask,
+  freezegun,
   graphql-core,
+  jinja2,
   joserfc,
-  jsonpath-ng,
   jsondiff,
+  jsonpath-ng,
   multipart,
   openapi-spec-validator,
   py-partiql-parser,
   pyparsing,
-  pyyaml,
-
-  # tests
-  freezegun,
-  pytestCheckHook,
   pytest-order,
   pytest-xdist,
+  pytestCheckHook,
+  python-dateutil,
+  pythonOlder,
+  pyyaml,
+  requests,
+  responses,
+  setuptools,
+  werkzeug,
+  xmltodict,
 }:
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "5.0.15";
+  version = "5.0.16";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V6qMKvQXzGSg3f5j5bzRrakPUHm3PN0fdMTp+zChp+Y=";
+    hash = "sha256-9K+xdqlkzXpw2pvF4FPUMQlhTOPKsmBEvLtTYQQ13/Q=";
   };
 
   build-system = [ setuptools ];
@@ -69,7 +62,6 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    # non-exhaustive list of extras, that was cobbled together for testing
     all = [
       antlr4-python3-runtime
       aws-xray-sdk
@@ -83,21 +75,111 @@ buildPythonPackage rec {
       jsonpath-ng
       multipart
       openapi-spec-validator
-      pyparsing
       py-partiql-parser
+      pyparsing
+      pyyaml
+      setuptools
+    ];
+    proxy = [
+      antlr4-python3-runtime
+      aws-xray-sdk
+      cfn-lint
+      docker
+      graphql-core
+      joserfc
+      jsondiff
+      jsonpath-ng
+      multipart
+      openapi-spec-validator
+      py-partiql-parser
+      pyparsing
+      pyyaml
+      setuptools
+    ];
+    server = [
+      antlr4-python3-runtime
+      aws-xray-sdk
+      cfn-lint
+      docker
+      flask
+      flask-cors
+      graphql-core
+      joserfc
+      jsondiff
+      jsonpath-ng
+      openapi-spec-validator
+      py-partiql-parser
+      pyparsing
       pyyaml
       setuptools
     ];
     cognitoidp = [ joserfc ];
+    apigateway = [
+      pyyaml
+      joserfc
+      openapi-spec-validator
+    ];
+    apigatewayv2 = [
+      pyyaml
+      openapi-spec-validator
+    ];
+    cloudformation = [
+      aws-xray-sdk
+      cfn-lint
+      docker
+      graphql-core
+      joserfc
+      jsondiff
+      openapi-spec-validator
+      py-partiql-parser
+      pyparsing
+      pyyaml
+      setuptools
+    ];
+    dynamodb = [
+      docker
+      py-partiql-parser
+    ];
+    dynamodbstreams = [
+      docker
+      py-partiql-parser
+    ];
+    events = [ jsonpath-ng ];
+    glue = [ pyparsing ];
+    iotdata = [ jsondiff ];
+    resourcegroupstaggingapi = [
+      cfn-lint
+      docker
+      graphql-core
+      joserfc
+      jsondiff
+      openapi-spec-validator
+      py-partiql-parser
+      pyparsing
+      pyyaml
+    ];
+    s3 = [
+      pyyaml
+      py-partiql-parser
+    ];
+    stepfunctions = [
+      antlr4-python3-runtime
+      jsonpath-ng
+    ];
+    s3crc32c = [
+      pyyaml
+      py-partiql-parser
+      crc32c
+    ];
   };
 
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [
     freezegun
-    pytestCheckHook
     pytest-order
     pytest-xdist
+    pytestCheckHook
   ] ++ optional-dependencies.all;
 
   # Some tests depend on AWS credentials environment variables to be set.
@@ -111,36 +193,44 @@ buildPythonPackage rec {
     # Matches upstream configuration, presumably due to expensive setup/teardown.
     "--dist"
     "loadscope"
+  ];
 
+  disabledTests = [
     # Fails at local name resolution
-    "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header"
-    "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins"
-    "--deselect=tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks::test_create_multipart"
-    "--deselect=tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests"
-    "--deselect=tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests"
+    "test_with_custom_request_header"
+    "test_s3_server_post_cors_multiple_origins"
+    "test_create_multipart"
+    "test_aws_and_http_requests"
+    "test_http_requests"
 
     # Fails at resolving google.com
-    "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination"
-    "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination"
+    "test_put_record_http_destination"
+    "test_put_record_batch_http_destination"
 
     # Fails at resolving s3.amazonaws.com
-    "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_wildcard_urls"
-    "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_specific_url"
-    "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_entire_service"
+    "test_passthrough_calls_for_wildcard_urls"
+    "test_passthrough_calls_for_specific_url"
+    "test_passthrough_calls_for_entire_service"
 
     # Download recordings returns faulty JSON
-    "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on"
-    "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off"
+    "test_ec2_instance_creation_recording_on"
+    "test_ec2_instance_creation__recording_off"
 
     # Connection Reset by Peer, when connecting to localhost:5678
-    "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay"
+    "test_replay"
 
     # Flaky under parallel execution
-    "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get"
-    "--deselect=tests/test_core/test_moto_api.py::TestModelDataResetForClassDecorator::test_should_find_bucket"
+    "test_cloudformation_server_get"
+    "test_should_find_bucket"
 
     # AssertionError: assert ResourceWarning not in [, ]
-    "--deselect=ests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks::test_delete_object_with_version"
+    "test_delete_object_with_version"
+
+    # KeyError beucase of ap-southeast-5-apse5-az
+    "test_zoneId_in_availability_zones"
+
+    # Parameter validation fails
+    "test_conditional_write"
   ];
 
   disabledTestPaths = [
@@ -165,7 +255,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "Allows your tests to easily mock out AWS Services";
+    description = "Module to allow your tests to easily mock out AWS Services";
     homepage = "https://github.com/getmoto/moto";
     changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix
index 1a8aa99a3679..1d003b77fa3a 100644
--- a/pkgs/development/python-modules/motor/default.nix
+++ b/pkgs/development/python-modules/motor/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "motor";
-  version = "3.5.1";
+  version = "3.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "mongodb";
     repo = "motor";
     rev = "refs/tags/${version}";
-    hash = "sha256-mg31FzMF0xEEhfLKAdF2pzEkULESFFGaXnE0uospXqE=";
+    hash = "sha256-fSHb39C4WaQVt7jT714kxwkpUw3mV9jNgkdUyVnD+S4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix
index 053b922c148b..f84ad7a37a86 100644
--- a/pkgs/development/python-modules/mozart-api/default.nix
+++ b/pkgs/development/python-modules/mozart-api/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "mozart-api";
-  version = "3.4.1.8.8";
+  version = "4.1.1.116.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mozart_api";
     inherit version;
-    hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc=";
+    hash = "sha256-QVh1MplzUL0LO3gPvxC/5uJjFoK57j2WdT2oMsneIkA=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index dd6781fbfa2c..e8d3ac8be8ac 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -5,7 +5,6 @@
   cython,
   setuptools,
   mpi,
-  openssh,
   pytestCheckHook,
   mpiCheckPhaseHook,
 }:
@@ -35,7 +34,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    openssh
     mpiCheckPhaseHook
   ];
   doCheck = true;
diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 7fa2d3fccf0e..bfbaabb54505 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.30.0";
+  version = "1.31.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tL8AhQCS5GUVfYFO+iShj3iChMmkeUkQJNYpAwheovs=";
+    hash = "sha256-LE8YnPnMjwDIAEX2bTm3wPPtRYc/09Hyr58i2y4S/0s=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index 8824d519544c..a6c4893007b0 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -1,26 +1,28 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
+  cython,
   borgbackup,
 }:
 
 buildPythonPackage rec {
   pname = "msgpack";
-  version = "1.0.8";
-  format = "setuptools";
+  version = "1.1.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-lcArDifnBuSNDlQm0XEMp44PBijW6J1bWluRpfEidPM=";
+  src = fetchFromGitHub {
+    owner = "msgpack";
+    repo = "msgpack-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yKQcQi0oSJ33gzsx1Q6ME3GbuSaHR091n7maU6F5QlU=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [ cython ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -32,6 +34,10 @@ buildPythonPackage rec {
     inherit borgbackup;
   };
 
+  preBuild = ''
+    make cython
+  '';
+
   meta = with lib; {
     description = "MessagePack serializer implementation";
     homepage = "https://github.com/msgpack/msgpack-python";
diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index c2e9a8b653d0..717c03e50ea6 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-core";
-  version = "1.1.5";
+  version = "1.1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cyqhNpV3gowSDmZhdI3NbbJ1VOwnrJTXZYR/rYNnFVE=";
+    hash = "sha256-W1tttt4jWGftW8zzklHV3SrAyugi6XZv0PYGs3T5gZ4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index b5cc00a669fc..b851ad6c8ece 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.11.0";
+  version = "1.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SBQ99NJFVwsqyExadw/jvToeZuUzi7+/wQxS8YMwrNM=";
+    hash = "sha256-RB5DxcddMmByWZ4XA/SaIVVxPXdqSRCUbTeWIR5YW2g=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix
index 087ee01fdc55..83e1314a5501 100644
--- a/pkgs/development/python-modules/msprime/default.nix
+++ b/pkgs/development/python-modules/msprime/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "msprime";
-  version = "1.3.1";
+  version = "1.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-s/Ys1RatLkPIQS6h8kKsrRvJOTkc/pyqGWJYdOLjSDU=";
+    hash = "sha256-2K55gHYWf2Mrj9fszVCJ+qqEyQNMppQi+IZCX5SlsBs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix
index b94269a4a3b8..8be69129140f 100644
--- a/pkgs/development/python-modules/mss/default.nix
+++ b/pkgs/development/python-modules/mss/default.nix
@@ -3,27 +3,63 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
+  stdenv,
+  substituteAll,
+
+  # build-system
+  hatchling,
+
+  # native dependencies
+  xorg,
+
+  # tests
+  lsof,
+  pillow,
+  pytest-cov-stub,
+  pytest,
+  pyvirtualdisplay,
+  xvfb-run,
 }:
 
 buildPythonPackage rec {
   pname = "mss";
-  version = "9.0.1";
-  format = "setuptools";
+  version = "9.0.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bre5AIzydCiBH6M66zXzM024Hj98wt1J7HxuWpSznxI=";
+    hash = "sha256-yWpOxzIk2n2yK8B+88+qGPi4aQDRhy4pETu87wCToh4=";
   };
 
-  prePatch = ''
-    # By default it attempts to build Windows-only functionality
-    rm src/mss/windows.py
-  '';
+  patches = lib.optionals stdenv.isLinux [
+    (substituteAll {
+      src = ./linux-paths.patch;
+      x11 = "${xorg.libX11}/lib/libX11.so";
+      xfixes = "${xorg.libXfixes}/lib/libXfixes.so";
+      xrandr = "${xorg.libXrandr}/lib/libXrandr.so";
+    })
+  ];
 
-  # Skipping tests due to most relying on DISPLAY being set
-  doCheck = false;
+  build-system = [ hatchling ];
+
+  doCheck = stdenv.isLinux;
+
+  nativeCheckInputs = [
+    lsof
+    pillow
+    pytest-cov-stub
+    pytest
+    pyvirtualdisplay
+    xvfb-run
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    xvfb-run pytest -k "not test_grab_with_tuple and not test_grab_with_tuple_percents and not test_resource_leaks"
+    runHook postCheck
+  '';
 
   pythonImportsCheck = [ "mss" ];
 
diff --git a/pkgs/development/python-modules/mss/linux-paths.patch b/pkgs/development/python-modules/mss/linux-paths.patch
new file mode 100644
index 000000000000..e8727d80b20f
--- /dev/null
+++ b/pkgs/development/python-modules/mss/linux-paths.patch
@@ -0,0 +1,17 @@
+diff --git a/src/mss/linux.py b/src/mss/linux.py
+index 6dac52b..c90bd93 100644
+--- a/src/mss/linux.py
++++ b/src/mss/linux.py
+@@ -185,9 +185,9 @@ class XWindowAttributes(Structure):
+ 
+ 
+ _ERROR = {}
+-_X11 = find_library("X11")
+-_XFIXES = find_library("Xfixes")
+-_XRANDR = find_library("Xrandr")
++_X11 = "@x11@"
++_XFIXES = "@xfixes@"
++_XRANDR = "@xrandr@"
+ 
+ 
+ @CFUNCTYPE(c_int, POINTER(Display), POINTER(XErrorEvent))
diff --git a/pkgs/development/python-modules/mtcnn/default.nix b/pkgs/development/python-modules/mtcnn/default.nix
index 1c25eeab5e1f..a82f386c6e5d 100644
--- a/pkgs/development/python-modules/mtcnn/default.nix
+++ b/pkgs/development/python-modules/mtcnn/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  opencv4,
+  opencv-python,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -28,7 +28,6 @@ buildPythonPackage {
     substituteInPlace setup.py \
       --replace-fail "setup, setuptools" "setup, find_packages"\
       --replace-fail "setuptools.find_packages" "find_packages"\
-      --replace-fail "opencv-python>=4.1.0" ""\
       --replace-fail "keras>=2.0.0" ""\
       --replace-fail "tests_require=['nose']," ""
   '';
@@ -36,7 +35,7 @@ buildPythonPackage {
   build-system = [ setuptools ];
 
   dependencies = [
-    opencv4
+    opencv-python
     tensorflow
   ];
 
diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix
index 75b2b9e6a020..41396500a9fd 100644
--- a/pkgs/development/python-modules/mujoco/default.nix
+++ b/pkgs/development/python-modules/mujoco/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   # in the project's CI.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-26zb79/ixZh6XmMpn0KSCEr6jyl6SNI4ih1uUwlx6Hw=";
+    hash = "sha256-CJHREBSY5zft9UsKmniB0P4sGKSls1cUDdl1TZE2rUM=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix
index 312699ecda41..46ccd9bfa8f3 100644
--- a/pkgs/development/python-modules/multipart/default.nix
+++ b/pkgs/development/python-modules/multipart/default.nix
@@ -1,28 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  setuptools,
+  fetchFromGitHub,
+  flit-core,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "multipart";
-  version = "0.2.5";
+  version = "1.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-+piDjUDJZ7sZWJYmoPuKXEDEId2i/r4bA1H89ibiRlE=";
+  src = fetchFromGitHub {
+    owner = "defnull";
+    repo = "multipart";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-RaHAV1LapYf0zRW7cxxbe7ysAJ5xB6EvF1bsCbCWS0U=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ flit-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "multipart" ];
 
   meta = {
+    changelog = "https://github.com/defnull/multipart/blob/${src.rev}/README.rst#changelog";
     description = "Parser for multipart/form-data";
     homepage = "https://github.com/defnull/multipart";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix
index 41b4a720fc50..fbd798d3f419 100644
--- a/pkgs/development/python-modules/multiscale-spatial-image/default.nix
+++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix
@@ -9,7 +9,6 @@
   python-dateutil,
   spatial-image,
   xarray,
-  xarray-datatree,
   zarr,
   dask-image,
   fsspec,
@@ -23,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "multiscale-spatial-image";
-  version = "1.0.1";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +31,7 @@ buildPythonPackage rec {
     owner = "spatial-image";
     repo = "multiscale-spatial-image";
     rev = "refs/tags/v${version}";
-    hash = "sha256-s/88N8IVkj+9MZYAtEJSpmmDdjIxf4S6U5gYr86Ikrw=";
+    hash = "sha256-oxxPXzItM7uXtyLoLyUHVf4YOoAYvI40kU7lVgp4gAg=";
   };
 
   build-system = [ hatchling ];
@@ -43,7 +42,6 @@ buildPythonPackage rec {
     python-dateutil
     spatial-image
     xarray
-    xarray-datatree
     zarr
   ];
 
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 1bdc53e90d01..4a81bbe55954 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   mock,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   requests,
@@ -12,7 +13,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.10.1";
+  version = "0.11.0";
   pname = "mwclient";
   format = "setuptools";
 
@@ -21,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwclient";
     repo = "mwclient";
-    rev = "v${version}";
-    sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-qnWVQEG1Ri0z4RYmmG/fxYrlIFFf/6PnP5Dnv0cZb5I=";
   };
 
   propagatedBuildInputs = [
@@ -33,15 +34,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mock
+    pytest-cov-stub
     pytestCheckHook
     responses
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace " --cov mwclient test" ""
-  '';
-
   pythonImportsCheck = [ "mwclient" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix
index e592420111d6..ed1b59ddb32e 100644
--- a/pkgs/development/python-modules/mwoauth/default.nix
+++ b/pkgs/development/python-modules/mwoauth/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mwoauth";
-  version = "0.3.8";
+  version = "0.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CNr07auqD5WoRfmOVwfecxaoODqWJfIK52iwNZkcNqw=";
+    hash = "sha256-IuNAPnSOcBRvjszBQw/lQsn5xP9nfv9CSlLmRPbY98U=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index 9ee368551103..3b9f692d7205 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -2,6 +2,8 @@
   lib,
   buildPythonPackage,
   pkgs,
+  setuptools,
+  distutils,
   requests,
   numpy,
   graphviz,
@@ -12,16 +14,23 @@
 
 buildPythonPackage {
   inherit (pkgs.mxnet) pname version src;
+  pyproject = true;
 
-  format = "setuptools";
+  build-system = [ setuptools ];
 
   buildInputs = [ pkgs.mxnet ];
-  propagatedBuildInputs = [
+
+  dependencies = [
+    distutils
     requests
     numpy
     graphviz
   ];
 
+  pythonRelaxDeps = [
+    "graphviz"
+  ];
+
   LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ];
 
   doCheck = !isPy3k;
@@ -29,9 +38,7 @@ buildPythonPackage {
   postPatch = ''
     # Required to support numpy >=1.24 where np.bool is removed in favor of just bool
     substituteInPlace python/mxnet/numpy/utils.py \
-      --replace "bool = onp.bool" "bool = bool"
-    substituteInPlace python/setup.py \
-      --replace "graphviz<0.9.0," "graphviz"
+      --replace-fail "bool = onp.bool" "bool = bool"
   '';
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0704af815623..d900824c4867 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -62,8 +62,8 @@ rec {
       "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE=";
 
   mypy-boto3-amp =
-    buildMypyBoto3Package "amp" "1.35.0"
-      "sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw=";
+    buildMypyBoto3Package "amp" "1.35.53"
+      "sha256-kPQ6DAbf1hEmDyDu8SFAL4WwTrmhEkNsg3ndEbhgJvg=";
 
   mypy-boto3-amplify =
     buildMypyBoto3Package "amplify" "1.35.41"
@@ -134,8 +134,8 @@ rec {
       "sha256-HK2Eh7uNihu+st+A51z+3uYlPacOkpp7Ic3+xIWHhJ0=";
 
   mypy-boto3-appsync =
-    buildMypyBoto3Package "appsync" "1.35.12"
-      "sha256-mHIUStFvFUTvHYWdZUNcIIOI//vNACI0veXXNLAAOVY=";
+    buildMypyBoto3Package "appsync" "1.35.52"
+      "sha256-KT61EeM5e0ZioxRrWW0EbKdmDuEgsWbuZoWz9FGLIt0=";
 
   mypy-boto3-arc-zonal-shift =
     buildMypyBoto3Package "arc-zonal-shift" "1.35.0"
@@ -150,8 +150,8 @@ rec {
       "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0=";
 
   mypy-boto3-autoscaling =
-    buildMypyBoto3Package "autoscaling" "1.35.45"
-      "sha256-HQLkmsxLESKVXzNW+60XFLhYTT6oDeNFsm6WGNP1cgk=";
+    buildMypyBoto3Package "autoscaling" "1.35.56"
+      "sha256-UmJt7Yp7Nf5M/PV6c077GMYVdKbFT9XGV/o6Y7HSbs0=";
 
   mypy-boto3-autoscaling-plans =
     buildMypyBoto3Package "autoscaling-plans" "1.35.0"
@@ -166,8 +166,8 @@ rec {
       "sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI=";
 
   mypy-boto3-batch =
-    buildMypyBoto3Package "batch" "1.35.0"
-      "sha256-LVwSfDll7H0xxvF6b2wlqr/gQ5nR4oqtev4ZT4hgJX0=";
+    buildMypyBoto3Package "batch" "1.35.57"
+      "sha256-1tWJD780ioswhtdCB1ETlRwEVExCJbwjtLcDg1x/HG0=";
 
   mypy-boto3-billingconductor =
     buildMypyBoto3Package "billingconductor" "1.35.0"
@@ -194,8 +194,8 @@ rec {
       "sha256-BAHAhOT7WanSavOe4iNVeJ0I4+QW2Ymn6C915sTQbwU=";
 
   mypy-boto3-chime-sdk-media-pipelines =
-    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.0"
-      "sha256-eXgK8DJugHC1r9qPVK5ajdr/ppDnfxBHxB0tSld0icw=";
+    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.57"
+      "sha256-VmHywaRFz8GJW/wde6ULj6iDfMH8+qDcoH6FamN77Dg=";
 
   mypy-boto3-chime-sdk-meetings =
     buildMypyBoto3Package "chime-sdk-meetings" "1.35.0"
@@ -210,8 +210,8 @@ rec {
       "sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.35.0"
-      "sha256-+RAqaRHKax8sUaOoIaaT+HvW/EGir2daS+aqDWNoDwA=";
+    buildMypyBoto3Package "cleanrooms" "1.35.56"
+      "sha256-9klgPrVKNaG6PWOIZkvsXNP98+TOgJfVPT5aPV3SDtI=";
 
   mypy-boto3-cloud9 =
     buildMypyBoto3Package "cloud9" "1.35.0"
@@ -266,8 +266,8 @@ rec {
       "sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw=";
 
   mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.35.49"
-      "sha256-KsO/4MFJA3J53FMrbodO8bIw8FV3PmwZOaADxoo5bjI=";
+    buildMypyBoto3Package "codebuild" "1.35.55"
+      "sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas=";
 
   mypy-boto3-codecatalyst =
     buildMypyBoto3Package "codecatalyst" "1.35.0"
@@ -338,8 +338,8 @@ rec {
       "sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.35.33"
-      "sha256-I0bSjAcWbx0Y8SUoFbXxAamxTqwaBh96CdUhhZiwhn0=";
+    buildMypyBoto3Package "connect" "1.35.52"
+      "sha256-Y9vBiRNCWaZBjKUyxWVEwsws6pFBdXJBKe6jEiH9AhU=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.35.0"
@@ -382,8 +382,8 @@ rec {
       "sha256-JlarWblBOzB64JV7866QjxIWqQH17qH4Lcig2g7WsAw=";
 
   mypy-boto3-datasync =
-    buildMypyBoto3Package "datasync" "1.35.0"
-      "sha256-lUzOmIoPNgEbJC54tre1m5ddhca05GyTSPOG4uIfumk=";
+    buildMypyBoto3Package "datasync" "1.35.52"
+      "sha256-KPDVvfCr9qffzjjyxhI49YIDVzNraiarljFaJLfsbeI=";
 
   mypy-boto3-dax =
     buildMypyBoto3Package "dax" "1.35.0"
@@ -422,8 +422,8 @@ rec {
       "sha256-gRSlQ63BPat6gxy+jZP/vtZIn6a4fXN0tx6oPvvgROo=";
 
   mypy-boto3-docdb-elastic =
-    buildMypyBoto3Package "docdb-elastic" "1.35.0"
-      "sha256-bmhGGMR9x0QKFl2p0p4xhxtE+A5PZQ/HO1FdLuAgLtI=";
+    buildMypyBoto3Package "docdb-elastic" "1.35.54"
+      "sha256-LMkXVrDNmfJPB5rl32i4OQSm0Q5gqdpV7PR4vNe0iIQ=";
 
   mypy-boto3-drs =
     buildMypyBoto3Package "drs" "1.35.0"
@@ -434,8 +434,8 @@ rec {
       "sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.35.24"
-      "sha256-Vb+Jeh0ONUV57bBQAfS8T0crlFK63Z2ySHbDG98/cqE=";
+    buildMypyBoto3Package "dynamodb" "1.35.54"
+      "sha256-qzd/6OxI0XBt8Z1s5bzlRbM27o/O1ZDfR98uqsH69sA=";
 
   mypy-boto3-dynamodbstreams =
     buildMypyBoto3Package "dynamodbstreams" "1.35.0"
@@ -446,8 +446,8 @@ rec {
       "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.35.48"
-      "sha256-c/tutPhvyGNt2Fv666k9f7mprhInCwyAU2L6p7Rg6Nc=";
+    buildMypyBoto3Package "ec2" "1.35.52"
+      "sha256-nvj7AYDTPDNLpAOcWOl5vGbtfEscLDwhVHTdCtK9X5g=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.35.0"
@@ -462,16 +462,16 @@ rec {
       "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.35.48"
-      "sha256-DtA+mCac6gbO17U2XuFm+QMDbGh9sbTRIIKh/GeAkCM=";
+    buildMypyBoto3Package "ecs" "1.35.52"
+      "sha256-hSTuuzjGARNBBmT+s1tzQKZLz7nIYttbtCb1w+cgqWQ=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.35.0"
       "sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.35.45"
-      "sha256-Dl9pCZc5WX6HC0LbXznGrpSc32KtPvHNMFD9Ru8Ay6k=";
+    buildMypyBoto3Package "eks" "1.35.57"
+      "sha256-efYfxn51rtR6LCnAU3k7ct78OuNnSecGSwYi0OIidt8=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.35.38"
@@ -494,8 +494,8 @@ rec {
       "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI=";
 
   mypy-boto3-elbv2 =
-    buildMypyBoto3Package "elbv2" "1.35.39"
-      "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc=";
+    buildMypyBoto3Package "elbv2" "1.35.53"
+      "sha256-MQYmmlnrK7sbbO9AiVavD79ImyUZIMavuHz/rn1gTTs=";
 
   mypy-boto3-emr =
     buildMypyBoto3Package "emr" "1.35.39"
@@ -534,8 +534,8 @@ rec {
       "sha256-KQqb3NdsN8SloK7kIbJoy5I3zhO5CUr9rB8ZqtVLaDc=";
 
   mypy-boto3-firehose =
-    buildMypyBoto3Package "firehose" "1.35.0"
-      "sha256-7ibqWrvc1mwCDzsm/tqha/2Y2EbfxTpsf7omIZg/EbM=";
+    buildMypyBoto3Package "firehose" "1.35.57"
+      "sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM=";
 
   mypy-boto3-fis =
     buildMypyBoto3Package "fis" "1.35.12"
@@ -574,8 +574,8 @@ rec {
       "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.35.25"
-      "sha256-hWpxnfHPaCUlxFg/3vNhluQnc2IHYoNVq9owH3D2eME=";
+    buildMypyBoto3Package "glue" "1.35.53"
+      "sha256-eUXh24klobdPHgxu3Wjg638PeAu3ArlO3tsxewthfDo=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.35.0"
@@ -594,8 +594,8 @@ rec {
       "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.35.39"
-      "sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE=";
+    buildMypyBoto3Package "guardduty" "1.35.55"
+      "sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.35.0"
@@ -674,8 +674,8 @@ rec {
       "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k=";
 
   mypy-boto3-iotfleetwise =
-    buildMypyBoto3Package "iotfleetwise" "1.35.38"
-      "sha256-vkQmyoPMcf2ZBnJ1TJba2uNJL3GaVVZI9h3R75C3uR8=";
+    buildMypyBoto3Package "iotfleetwise" "1.35.51"
+      "sha256-ZfS7CCrU0ZJipWUuyle1uws3IgN27XWOOwR4SAAO+zg=";
 
   mypy-boto3-iotsecuretunneling =
     buildMypyBoto3Package "iotsecuretunneling" "1.35.0"
@@ -726,8 +726,8 @@ rec {
       "sha256-lBZ9MJQsuM0vRyrDcelDXTIhP9sex6CjnRjYY3qjIdE=";
 
   mypy-boto3-keyspaces =
-    buildMypyBoto3Package "keyspaces" "1.35.0"
-      "sha256-ZtixXownfAnqUfNY53sVGbDZTQ2Q+Hhzgs1Txuyn3gM=";
+    buildMypyBoto3Package "keyspaces" "1.35.52"
+      "sha256-R3DERqUmmKGjXyJROJDYU+JTIzmrjiXmYCau0rpWujQ=";
 
   mypy-boto3-kinesis =
     buildMypyBoto3Package "kinesis" "1.35.26"
@@ -766,12 +766,12 @@ rec {
       "sha256-oGpeVJ4uuNUAIsZwc2k0QKLtzLSHC+ULM1f3Pcm+ZPk=";
 
   mypy-boto3-lakeformation =
-    buildMypyBoto3Package "lakeformation" "1.35.0"
-      "sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU=";
+    buildMypyBoto3Package "lakeformation" "1.35.55"
+      "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.35.49"
-      "sha256-7TPYB348lSMXAxZuDR2uhGCyUA6zqFiKDvBQuh3M5uE=";
+    buildMypyBoto3Package "lambda" "1.35.57"
+      "sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.35.0"
@@ -810,8 +810,8 @@ rec {
       "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.35.49"
-      "sha256-P5uX/Vi4vQb5UweIVkoHt2J7r4fkBnnLHldaRHmya58=";
+    buildMypyBoto3Package "logs" "1.35.54"
+      "sha256-RnHt15tR/cGO0w9mLYbCW0T82fyhVsJbBkfxSwDZItw=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.35.0"
@@ -878,8 +878,8 @@ rec {
       "sha256-ur1A0iPMGgfI0XNSOiXX4VF5nR6XJcnpk0KM62Ujp/0=";
 
   mypy-boto3-mediapackagev2 =
-    buildMypyBoto3Package "mediapackagev2" "1.35.33"
-      "sha256-KUiz6fz0AZVZNFo6FpsfMYZHEFIXHzrvsSbulUWhARQ=";
+    buildMypyBoto3Package "mediapackagev2" "1.35.50"
+      "sha256-kvY0A+v7yJ/NUiqy8HnA4EmGOnbqlQI8lj70S4k5+dk=";
 
   mypy-boto3-mediastore =
     buildMypyBoto3Package "mediastore" "1.35.0"
@@ -950,8 +950,8 @@ rec {
       "sha256-Epx+p5M+3x0plFaXdc8Rsz+p18ZnxbNlr4IhH5STvZM=";
 
   mypy-boto3-network-firewall =
-    buildMypyBoto3Package "network-firewall" "1.35.0"
-      "sha256-41zAgq4F07hIl7I6S+M7ngxdFOKjmUB3BFhncLel7ZI=";
+    buildMypyBoto3Package "network-firewall" "1.35.52"
+      "sha256-i4h13QqDO65bSTlxdt5hN6iXag578jc3Mv7bOHBZkpQ=";
 
   mypy-boto3-networkmanager =
     buildMypyBoto3Package "networkmanager" "1.35.0"
@@ -970,12 +970,12 @@ rec {
       "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.35.0"
-      "sha256-AQLU4or4flXLxTrZJy0XHIn9MFRTmgHjUWjLzuP2pXA=";
+    buildMypyBoto3Package "opensearch" "1.35.52"
+      "sha256-6a9zygN6Al1yEaOwUvO2Hq/swESKrLW315diz/sgH6c=";
 
   mypy-boto3-opensearchserverless =
-    buildMypyBoto3Package "opensearchserverless" "1.35.2"
-      "sha256-df8udPQOjXo5GEo6Gk5G6oKx7pBW4c0A82wkC1PA0BI=";
+    buildMypyBoto3Package "opensearchserverless" "1.35.52"
+      "sha256-d7SehQ8mnD17WsZhucdKnEE2v+sI/cdoaMhYCBkj7nY=";
 
   mypy-boto3-opsworks =
     buildMypyBoto3Package "opsworks" "1.35.0"
@@ -1042,8 +1042,8 @@ rec {
       "sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw=";
 
   mypy-boto3-pinpoint-sms-voice-v2 =
-    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.43"
-      "sha256-Wiue58JJyi8Td4H+byVkmjUEkuZdM4zeyJ4CAwk/+Z8=";
+    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.57"
+      "sha256-pjvecs9LfkOQXiobtZ/OQVMKXGl/ATMy7ZiRjNJFclQ=";
 
   mypy-boto3-pipes =
     buildMypyBoto3Package "pipes" "1.35.43"
@@ -1074,8 +1074,8 @@ rec {
       "sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs=";
 
   mypy-boto3-quicksight =
-    buildMypyBoto3Package "quicksight" "1.35.43"
-      "sha256-rcIdJWamEYS6M/aLO9oLe2vwyipzNra5cIrt1pFWn5Y=";
+    buildMypyBoto3Package "quicksight" "1.35.56"
+      "sha256-wiAo7FwQYo4oL8qiE3KOlpeuo4uOCacLZwBf5vel88M=";
 
   mypy-boto3-ram =
     buildMypyBoto3Package "ram" "1.35.0"
@@ -1086,24 +1086,24 @@ rec {
       "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.35.46"
-      "sha256-A8cp4wbpd3E91PdxYV5F0V76YN5TEJKw4OVBMXKJZNI=";
+    buildMypyBoto3Package "rds" "1.35.50"
+      "sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.35.28"
       "sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw=";
 
   mypy-boto3-redshift =
-    buildMypyBoto3Package "redshift" "1.35.41"
-      "sha256-+BwE/phcHGdn8RLD46/gzTKH9g6+AMt5dF8WyRmMTUI=";
+    buildMypyBoto3Package "redshift" "1.35.52"
+      "sha256-quOZw+mVY3pNXvhWRN4eU9LySeFsrJzSK6FwS0h5Z3E=";
 
   mypy-boto3-redshift-data =
-    buildMypyBoto3Package "redshift-data" "1.35.10"
-      "sha256-LP5RjvMCfCsFD6z/0mIZJEWN3y+z35aZzboz6KaFlZQ=";
+    buildMypyBoto3Package "redshift-data" "1.35.51"
+      "sha256-wCF9VqKH8GBgmKHsJZfAbNefu/zLw2piSJpuOaQ4nMo=";
 
   mypy-boto3-redshift-serverless =
-    buildMypyBoto3Package "redshift-serverless" "1.35.0"
-      "sha256-uHY9c+p407QBVS18N0lEshdB1mXV+LONhTXSIr+NiV4=";
+    buildMypyBoto3Package "redshift-serverless" "1.35.52"
+      "sha256-/7yPEPa19Vyhfsb/WBrSXid/VlOwdaqu2SugU4GccDI=";
 
   mypy-boto3-rekognition =
     buildMypyBoto3Package "rekognition" "1.35.0"
@@ -1114,8 +1114,8 @@ rec {
       "sha256-zqBEwEnaCrmUl9xRlYOQHFSwZcXR1zj42Pd0Lik9SIQ=";
 
   mypy-boto3-resource-explorer-2 =
-    buildMypyBoto3Package "resource-explorer-2" "1.35.25"
-      "sha256-49Ysavsq6tDUQAcJiP4GQkt5zgBz36qufByA88bltco=";
+    buildMypyBoto3Package "resource-explorer-2" "1.35.56"
+      "sha256-b6H2qsCgpX9j7yWWtPTV2CcPbtXit4HLaCH8YwAJH1A=";
 
   mypy-boto3-resource-groups =
     buildMypyBoto3Package "resource-groups" "1.35.30"
@@ -1134,8 +1134,8 @@ rec {
       "sha256-Ss85x4OJ+RtOmP7LzIIMcikxjMvMyi3VUT9WLvxODSM=";
 
   mypy-boto3-route53 =
-    buildMypyBoto3Package "route53" "1.35.4"
-      "sha256-gPor5Roaoo3i0zJa4xXIIb1SOar80KQvVi5h003vGZM=";
+    buildMypyBoto3Package "route53" "1.35.52"
+      "sha256-O6P/xxxzAxBhmm5MTsK162moBRno/EhdUvrF12ZQR18=";
 
   mypy-boto3-route53-recovery-cluster =
     buildMypyBoto3Package "route53-recovery-cluster" "1.35.0"
@@ -1166,16 +1166,16 @@ rec {
       "sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.35.12"
-      "sha256-GpZ3lr2WenLA+FNOBnot9X7DQKtmxWxvP85bTM5l1+g=";
+    buildMypyBoto3Package "s3control" "1.35.55"
+      "sha256-9gTlb+iIU+IT+2jAIU7l62gN4VenI4JLaTEFJCbgiAc=";
 
   mypy-boto3-s3outposts =
     buildMypyBoto3Package "s3outposts" "1.35.0"
       "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.35.32"
-      "sha256-Wz0q0r66Fd6d/T25BiY+AwvLqlihrHEE16gTBydQk0o=";
+    buildMypyBoto3Package "sagemaker" "1.35.53"
+      "sha256-Vj7lAt1eU47vE7XZ95QJBe95302681tJuy4nw02Bibc=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0"
@@ -1254,8 +1254,8 @@ rec {
       "sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw=";
 
   mypy-boto3-sesv2 =
-    buildMypyBoto3Package "sesv2" "1.35.41"
-      "sha256-DUotfO7GlrWHOU8LuhbmF4U2oywMW48JzYomlXYS8Tg=";
+    buildMypyBoto3Package "sesv2" "1.35.53"
+      "sha256-jIxFFcXYJgwxH78gnMHxIaQWeF88DT7tH1pukUEpDc4=";
 
   mypy-boto3-shield =
     buildMypyBoto3Package "shield" "1.35.0"
@@ -1322,12 +1322,12 @@ rec {
       "sha256-aTKMQz0w0d0WOWHGU3HIqSb3z6PvbuSqtX+saBIIRog=";
 
   mypy-boto3-stepfunctions =
-    buildMypyBoto3Package "stepfunctions" "1.35.46"
-      "sha256-crU3Xc5EkSSrhBqNVS/LIQa4ssiMNtI1gNoCvhBedWs=";
+    buildMypyBoto3Package "stepfunctions" "1.35.54"
+      "sha256-LueUCqK9oEYZfilqW6nA58zFNQtQn9eog/BmfBg+O/4=";
 
   mypy-boto3-storagegateway =
-    buildMypyBoto3Package "storagegateway" "1.35.18"
-      "sha256-RiAqxt45cMOkbGjWVWufiqZcCKQm++RE3FOdZ5BFkuE=";
+    buildMypyBoto3Package "storagegateway" "1.35.50"
+      "sha256-60qxUQtbi+Dl2osn7zkSmpTuXf8DjTKDa3XXVsJynKE=";
 
   mypy-boto3-sts =
     buildMypyBoto3Package "sts" "1.35.0"
@@ -1346,8 +1346,8 @@ rec {
       "sha256-72VjJGOWAphFUZfMxzSaYyycUtoL1St08G/SAEhDriQ=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.35.18"
-      "sha256-p/jKkj4a1vUkgfmUAkKY6nbDKKaBNAJeuFOea7Uvq7M=";
+    buildMypyBoto3Package "synthetics" "1.35.56"
+      "sha256-QRYicbaZ/2a7aXB42v9WrHR56O4A+4eEnoaoo7OMaGc=";
 
   mypy-boto3-textract =
     buildMypyBoto3Package "textract" "1.35.0"
@@ -1378,8 +1378,8 @@ rec {
       "sha256-j9ZU1UHzKNo1+gb+uUYiMTIwjGi9OEg0jAmKGx+mGno=";
 
   mypy-boto3-verifiedpermissions =
-    buildMypyBoto3Package "verifiedpermissions" "1.35.30"
-      "sha256-wOoPXyHx/yCdGtLFLFyO9WJLSx0XyIiwMWMLff3v25U=";
+    buildMypyBoto3Package "verifiedpermissions" "1.35.55"
+      "sha256-ptQXmGLaWRtOqAL3iunKubP5gQHHAezQAubG3Z3m6BI=";
 
   mypy-boto3-voice-id =
     buildMypyBoto3Package "voice-id" "1.35.0"
@@ -1418,8 +1418,8 @@ rec {
       "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ=";
 
   mypy-boto3-workmail =
-    buildMypyBoto3Package "workmail" "1.35.0"
-      "sha256-1hjejKCAu9pNPzJ0gaz8mbyQLFkzEUB0mO7g7Da06mk=";
+    buildMypyBoto3Package "workmail" "1.35.52"
+      "sha256-bYfSCYypmTs/NVbLtazSZBgWWotLl+t0B7vm1tdaiZI=";
 
   mypy-boto3-workmailmessageflow =
     buildMypyBoto3Package "workmailmessageflow" "1.35.0"
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 465d7895009d..e43f0e1bd1a2 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   gitUpdater,
   pythonAtLeast,
   pythonOlder,
@@ -45,6 +46,15 @@ buildPythonPackage rec {
     rev = "refs/tags/v${version}";
     hash = "sha256-5gfqIBtI/G5HARYdXHjYNYNRxeNgrk9dnpSgvMSu9bw=";
   };
+
+  patches = [
+    (fetchpatch2 {
+      name = "python3.12.7-compat.patch";
+      url = "https://github.com/python/mypy/commit/1a2c8e2a4df21532e4952191cad74ae50083f4ad.patch";
+      hash = "sha256-GBQPTkdoLeErjbRUjZBFEwvCcN/WzC3OYVvou6M+f80=";
+    })
+  ];
+
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index c17dfe1510e0..ceec033bb047 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -20,23 +20,21 @@
 }:
 buildPythonPackage rec {
   pname = "myst-parser";
-  version = "3.0.1";
+  version = "4.0.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-TKo1lanZNM+XrOKZ0ZmtlhEPoAYQUspkyHXZm1wNTFE=";
+    hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978=";
   };
 
-  nativeBuildInputs = [
-    flit-core
-  ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     docutils
     jinja2
     mdit-py-plugins
@@ -59,6 +57,7 @@ buildPythonPackage rec {
     # sphinx 7.4 compat
     "test_gettext"
     "test_gettext_additional_targets"
+    "test_amsmath"
   ];
 
   pythonImportsCheck = [ "myst_parser" ];
diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
new file mode 100644
index 000000000000..52ef9d3ba733
--- /dev/null
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  # cudf,
+  dask,
+  dask-expr,
+  duckdb,
+  fetchFromGitHub,
+  hatchling,
+  hypothesis,
+  # modin,
+  pandas,
+  polars,
+  pyarrow,
+  pytest-env,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "narwhals";
+  version = "1.9.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "narwhals-dev";
+    repo = "narwhals";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KUtmkDaHPaJ917/hVhJrt+x64JJYm06fyDfCV2nSa3s=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  optional-dependencies = {
+    # cudf = [ cudf ];
+    dask = [
+      dask
+      dask-expr
+    ];
+    # modin = [ modin ];
+    pandas = [ pandas ];
+    polars = [ polars ];
+    pyarrow = [ pyarrow ];
+  };
+
+  nativeCheckInputs = [
+    duckdb
+    hypothesis
+    pytest-env
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "narwhals" ];
+
+  pytestFlagsArray = [
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
+  meta = {
+    description = "Lightweight and extensible compatibility layer between dataframe libraries";
+    homepage = "https://github.com/narwhals-dev/narwhals";
+    changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix
index dc03557da251..9c4ce4387e20 100644
--- a/pkgs/development/python-modules/ndindex/default.nix
+++ b/pkgs/development/python-modules/ndindex/default.nix
@@ -5,6 +5,7 @@
 
   # build-system
   cython,
+  setuptools,
 
   # optional
   numpy,
@@ -13,21 +14,25 @@
   hypothesis,
   pytest-cov-stub,
   pytestCheckHook,
+  sympy,
 }:
 
 buildPythonPackage rec {
   pname = "ndindex";
-  version = "1.8";
-  format = "setuptools";
+  version = "1.9.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "ndindex";
     rev = "refs/tags/${version}";
-    hash = "sha256-F52ly3NkrZ0H9XoomMqmWfLl+8X0z26Yx67DB8DUqyU=";
+    hash = "sha256-5S4HN5MFLgURImwFsyyTOxDhrZJ5Oe+Ln/TA/bsCsek=";
   };
 
-  nativeBuildInputs = [ cython ];
+  build-system = [
+    cython
+    setuptools
+  ];
 
   postPatch = ''
     substituteInPlace pytest.ini \
@@ -38,10 +43,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ndindex" ];
 
+  preCheck = ''
+    cd $out
+  '';
+
   nativeCheckInputs = [
     hypothesis
     pytest-cov-stub
     pytestCheckHook
+    sympy
   ] ++ optional-dependencies.arrays;
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index 4e36e2dc37ec..0aa2309df04b 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "neo4j";
-  version = "5.25.0";
+  version = "5.26.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-aGUfyfN85JNOQSnnM+zep07cmLqq9YN1bc7UyH3uFWg=";
+    hash = "sha256-4rvs313MU4EXqpnxRZPKy5Z64OJmQnsWRq9T0MIoaOo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
index 4d127053d5c3..27dd562480d2 100644
--- a/pkgs/development/python-modules/netbox-reorder-rack/default.nix
+++ b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox-reorder-rack";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-0572pj1OA08Zxl4vhMmFHvQA/K24hG/GhKEbo+hbW5Q=";
   };
 
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 911ea8afefd9..056949ef2f97 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -1,53 +1,57 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
-  fetchPypi,
-  isPyPy,
-  python,
-  oldest-supported-numpy,
-  setuptools,
-  wheel,
   certifi,
-  numpy,
-  zlib,
-  netcdf,
-  hdf5,
-  curl,
-  libjpeg,
-  cython,
   cftime,
+  curl,
+  cython,
+  fetchPypi,
+  hdf5,
+  isPyPy,
+  libjpeg,
+  netcdf,
+  numpy,
+  oldest-supported-numpy,
+  python,
+  pythonOlder,
+  setuptools-scm,
+  stdenv,
+  wheel,
+  zlib,
 }:
 
 buildPythonPackage rec {
   pname = "netcdf4";
-  version = "1.6.5";
-  format = "pyproject";
+  version = "1.7.1.post2";
+  pyproject = true;
 
-  disabled = isPyPy;
+  disabled = isPyPy || pythonOlder "3.8";
 
   src = fetchPypi {
-    pname = "netCDF4";
-    inherit version;
-    hash = "sha256-gkiB0KrP3lvZgtat7dhXQlnIVVN4HnuD4M6CuJC/oO8=";
+    inherit pname version;
+    hash = "sha256-N9VX42ZUiJ1wIBkr+1b51fk4lMsymX64N65YbFOP17Y=";
   };
 
-  nativeBuildInputs = [
+  postPatch = ''
+    sed -i "/numpy>=/d" pyproject.toml
+  '';
+
+  build-system = [
     cython
     oldest-supported-numpy
-    setuptools
+    setuptools-scm
     wheel
   ];
 
   propagatedBuildInputs = [
     certifi
     cftime
+    curl
+    hdf5
+    libjpeg
+    netcdf
     numpy
     zlib
-    netcdf
-    hdf5
-    curl
-    libjpeg
   ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix
new file mode 100644
index 000000000000..379e1efc14dd
--- /dev/null
+++ b/pkgs/development/python-modules/netifaces2/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  rustPlatform,
+  fetchFromGitHub,
+  pythonOlder,
+  pytestCheckHook,
+}:
+let
+  pname = "netifaces2";
+  version = "0.0.22";
+
+  src = fetchFromGitHub {
+    owner = "SamuelYvon";
+    repo = "netifaces-2";
+    rev = "refs/tags/V${version}";
+    hash = "sha256-XO3HWq8FOVzvpbK8mIBOup6hFMnhDpqOK/5bPziPZQ8=";
+  };
+in
+buildPythonPackage {
+  inherit pname version src;
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit pname version src;
+    hash = "sha256-dkqI0P61ciGqPtBc/6my7osaxxO9pEgovZhlpo1HdkU=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "netifaces" ];
+
+  meta = {
+    description = "Portable network interface information";
+    homepage = "https://github.com/SamuelYvon/netifaces-2";
+    license = with lib.licenses; [ mit ];
+    platforms = with lib.platforms; unix ++ windows;
+    maintainers = with lib.maintainers; [ pluiedev ];
+  };
+}
diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix
index 868de524a05e..9af5bca959ef 100644
--- a/pkgs/development/python-modules/netmiko/default.nix
+++ b/pkgs/development/python-modules/netmiko/default.nix
@@ -2,33 +2,33 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-
-  # build-system
-  poetry-core,
-
-  # dependencies
   ntc-templates,
   paramiko,
+  poetry-core,
   pyserial,
+  pythonOlder,
   pyyaml,
   scp,
+  setuptools,
   textfsm,
 }:
 
 buildPythonPackage rec {
   pname = "netmiko";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2pD2798ztBQOts1/InJ3PCzhRPp0rDTV7KwbTUYH8fs=";
+    hash = "sha256-Jf8SN5dqo/8srPBJSTFGOMiZIgoWdb0CnjGwfOIM47Y=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "poetry==1.3.2" "poetry-core" \
-      --replace "poetry.masonry.api" "poetry.core.masonry.api"
+      --replace-fail "poetry>=1.6.1" "poetry-core" \
+      --replace-fail "poetry.masonry.api" "poetry.core.masonry.api"
   '';
 
   nativeBuildInputs = [ poetry-core ];
@@ -39,15 +39,19 @@ buildPythonPackage rec {
     pyserial
     pyyaml
     scp
+    setuptools
     textfsm
   ];
 
-  # tests require closed-source pyats and genie packages
+  # Tests require closed-source pyats and genie packages
   doCheck = false;
 
+  pythonImportsCheck = [ "netmiko" ];
+
   meta = with lib; {
     description = "Multi-vendor library to simplify Paramiko SSH connections to network devices";
     homepage = "https://github.com/ktbyers/netmiko/";
+    changelog = "https://github.com/ktbyers/netmiko/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ maintainers.astro ];
   };
diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix
index 30197c168339..e457b9c79b4c 100644
--- a/pkgs/development/python-modules/niaaml/default.nix
+++ b/pkgs/development/python-modules/niaaml/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  loguru,
   niapy,
   numpy,
   pandas,
@@ -10,6 +11,7 @@
   pythonOlder,
   scikit-learn,
   toml-adapt,
+  typer,
 }:
 
 buildPythonPackage rec {
@@ -34,10 +36,12 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    loguru
     niapy
     numpy
     pandas
     scikit-learn
+    typer
   ];
 
   # create scikit-learn and niapy deps version consistent
diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix
index f7cfecd8a5c1..575ee5043044 100644
--- a/pkgs/development/python-modules/niapy/default.nix
+++ b/pkgs/development/python-modules/niapy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "niapy";
-  version = "2.3.1";
+  version = "2.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "NiaOrg";
     repo = "NiaPy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA=";
+    hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix
index 946d129e95c4..6e80edf9ba4d 100644
--- a/pkgs/development/python-modules/nice-go/default.nix
+++ b/pkgs/development/python-modules/nice-go/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "nice-go";
-  version = "0.3.9";
+  version = "0.3.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "IceBotYT";
     repo = "nice-go";
     rev = "refs/tags/${version}";
-    hash = "sha256-Gb6VDHADtqmVXMPwic0NokWm5GmhTpy7g+o/rYxrBZk=";
+    hash = "sha256-LPH6U0D/JSi8zASlirfkNgfWOh/ArPHoccniNjy2hJc=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix
index 6ec520c3ae47..12500e9fe854 100644
--- a/pkgs/development/python-modules/notion-client/default.nix
+++ b/pkgs/development/python-modules/notion-client/default.nix
@@ -43,6 +43,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "notion_client" ];
 
+  disabledTests = [
+    # requires network access
+    "test_api_http_response_error"
+  ];
+
   meta = with lib; {
     description = "Python client for the official Notion API";
     homepage = "https://github.com/ramnes/notion-sdk-py";
diff --git a/pkgs/development/python-modules/nskeyedunarchiver/default.nix b/pkgs/development/python-modules/nskeyedunarchiver/default.nix
new file mode 100644
index 000000000000..ed4e5ac35f5c
--- /dev/null
+++ b/pkgs/development/python-modules/nskeyedunarchiver/default.nix
@@ -0,0 +1,29 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "nskeyedunarchiver";
+  version = "1.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "NSKeyedUnArchiver";
+    hash = "sha256-OZWPGH8ggYYKxeg6CGyft6ZM9Yx/43z7YylzXlQcTVg=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "NSKeyedUnArchiver" ];
+
+  meta = {
+    description = "Unserializes plist data into a usable Python dict";
+    homepage = "https://github.com/avibrazil/NSKeyedUnArchiver";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}
diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index 7f04ae4bf414..403d5ea16051 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -2,85 +2,68 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchpatch,
   fetchPypi,
+  python,
+  pythonOlder,
+
+  # build-system
   setuptools,
   setuptools-scm,
   cython,
-  numpy,
-  msgpack,
   py-cpuinfo,
+
+  # dependencies
+  numpy,
+
+  # tests
+  msgpack,
   pytestCheckHook,
-  python,
-  pythonOlder,
+  importlib-metadata,
 }:
 
 buildPythonPackage rec {
   pname = "numcodecs";
-  version = "0.12.1";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BdkaQzcz5+7yaNfoDsImoCMtokQolhSo84JpAa7BCY4=";
+    hash = "sha256-o883iB3wiY86nA1Ed9+IEz/oUYW//le6MbzC+iB3Cbw=";
   };
 
-  patches = [
-    # https://github.com/zarr-developers/numcodecs/pull/487
-    (fetchpatch {
-      name = "fix-tests.patch";
-      url = "https://github.com/zarr-developers/numcodecs/commit/4896680087d3ff1f959401c51cf5aea0fd56554e.patch";
-      hash = "sha256-+lMWK5IsNzJ7H2SmLckgxbSSRIIcC7FtGYSBKQtuo+Y=";
-    })
-  ];
-
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
     cython
     py-cpuinfo
   ];
 
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   optional-dependencies = {
     msgpack = [ msgpack ];
     # zfpy = [ zfpy ];
   };
 
-  preBuild =
-    if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then
-      ''
-        export DISABLE_NUMCODECS_AVX2=
-      ''
-    else
-      null;
+  preBuild = lib.optionalString (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) ''
+    export DISABLE_NUMCODECS_AVX2=1
+  '';
 
   nativeCheckInputs = [
     pytestCheckHook
     msgpack
+    importlib-metadata
   ];
 
+  # https://github.com/NixOS/nixpkgs/issues/255262
   pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ];
 
-  disabledTests = [
-    "test_backwards_compatibility"
-
-    "test_encode_decode"
-    "test_legacy_codec_broken"
-    "test_bytes"
-
-    # ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (3,) + inhomogeneous part.
-    # with numpy 1.24
-    "test_non_numpy_inputs"
-  ];
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/zarr-developers/numcodecs";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     description = "Buffer compression and transformation codecs for use in data storage and communication applications";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ doronbehar ];
   };
 }
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index f54dcb03b526..3681e0d9c73a 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -1,35 +1,50 @@
 {
   lib,
   buildPythonPackage,
+  dos2unix,
   fetchPypi,
+  fetchpatch2,
   numpy,
   pytestCheckHook,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.10.0";
+  version = "2.10.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yJ6TB1JjnfBAU5FgMm2PmahBWbvqQZQ6uOlgWR7arvA=";
+    hash = "sha256-m7qZ01SmXxoAiri4fwfYRATGaOZrq2JN9ba1NzQDz4E=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/pydata/numexpr/pull/491
+      name = "fix-test.patch";
+      url = "https://github.com/pydata/numexpr/commit/2c7bb85e117147570db5619ed299497a42af9f54.patch";
+      hash = "sha256-cv2logZ8dKeWNB5+bPmPfpfiWaV7k8+2sE9lZa+dUsA=";
+    })
+  ];
+
+  prePatch = ''
+    dos2unix numexpr/tests/test_numexpr.py
+  '';
+
   # patch for compatibility with numpy < 2.0
   # see more details, https://numpy.org/devdocs/numpy_2_0_migration_guide.html#c-api-changes
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "numpy>=2.0.0rc1" "numpy"
+      --replace-fail "numpy>=2.0.0" "numpy"
     sed -i "1i#define PyDataType_SET_ELSIZE(descr, elsize)" numexpr/interpreter.cpp
     sed -i "1i#define PyDataType_ELSIZE(descr) ((descr)->elsize)" numexpr/interpreter.cpp
   '';
 
+  nativeBuildInputs = [ dos2unix ];
+
   build-system = [
     setuptools
-    wheel
     numpy
   ];
 
diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix
index 2bd7a44903fa..795f24e5eefa 100644
--- a/pkgs/development/python-modules/numpy/1.nix
+++ b/pkgs/development/python-modules/numpy/1.nix
@@ -155,7 +155,11 @@ buildPythonPackage rec {
 
   # https://github.com/numpy/numpy/issues/24548
   disabledTests =
-    lib.optionals stdenv.hostPlatform.isi686 [
+    [
+      # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0
+      "test_api_importable"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isi686 [
       "test_new_policy" # AssertionError: assert False
       "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
       "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index de318ba8ae67..5acc21db4538 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -140,7 +140,11 @@ buildPythonPackage rec {
   ];
 
   disabledTests =
-    lib.optionals (pythonAtLeast "3.13") [
+    [
+      # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0
+      "test_api_importable"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
       # https://github.com/numpy/numpy/issues/26713
       "test_iter_refcount"
     ]
diff --git a/pkgs/development/python-modules/objprint/default.nix b/pkgs/development/python-modules/objprint/default.nix
new file mode 100644
index 000000000000..f7721b6afac8
--- /dev/null
+++ b/pkgs/development/python-modules/objprint/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "objprint";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gaogaotiantian";
+    repo = "objprint";
+    rev = "refs/tags/${version}";
+    hash = "sha256-+OS034bikrKy4F27b6ic97fHTW6rSMxQ0dx4caF6cUM=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "objprint" ];
+
+  meta = {
+    description = "Library that can print Python objects in human readable format";
+    homepage = "https://github.com/gaogaotiantian/objprint";
+    changelog = "https://github.com/gaogaotiantian/objprint/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix
index ce9d31be5aa0..0af451607af3 100644
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/pkgs/development/python-modules/onnx/default.nix
@@ -8,9 +8,6 @@
   pybind11,
   setuptools,
 
-  # nativeBuildInputs
-  protobuf-core,
-
   # buildInputs
   abseil-cpp,
   protobuf,
@@ -48,10 +45,6 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  nativeBuildInputs = [
-    protobuf-core # `protoc` required
-  ];
-
   buildInputs = [
     abseil-cpp
     gtestStatic
diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix
index 94cc0b881351..87d83797fbfd 100644
--- a/pkgs/development/python-modules/onnxconverter-common/default.nix
+++ b/pkgs/development/python-modules/onnxconverter-common/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   numpy,
   packaging,
   protobuf,
@@ -14,7 +15,7 @@ buildPythonPackage rec {
   pname = "onnxconverter-common";
   version = "1.14.0";
 
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
@@ -23,7 +24,13 @@ buildPythonPackage rec {
     hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [ "protobuf" ];
+
+  dependencies = [
     numpy
     packaging
     protobuf
diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix
index 88d54404cf1f..1e62aef80a26 100644
--- a/pkgs/development/python-modules/open-meteo/default.nix
+++ b/pkgs/development/python-modules/open-meteo/default.nix
@@ -8,6 +8,7 @@
   orjson,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
 }:
@@ -29,8 +30,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Upstream doesn't set a version for the pyproject.toml
     substituteInPlace pyproject.toml \
-      --replace "0.0.0" "${version}" \
-      --replace "--cov" ""
+      --replace-fail "0.0.0" "${version}" \
   '';
 
   nativeBuildInputs = [ poetry-core ];
@@ -44,9 +44,15 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # aiohttp api breakage
+    "test_timeout"
+  ];
+
   pythonImportsCheck = [ "open_meteo" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/opencv-python/default.nix b/pkgs/development/python-modules/opencv-python/default.nix
new file mode 100644
index 000000000000..ee875421a96c
--- /dev/null
+++ b/pkgs/development/python-modules/opencv-python/default.nix
@@ -0,0 +1,14 @@
+{
+  mkPythonMetaPackage,
+  opencv4,
+}:
+
+mkPythonMetaPackage {
+  pname = "opencv-python";
+  inherit (opencv4) version;
+  dependencies = [ opencv4 ];
+  optional-dependencies = opencv4.optional-dependencies or { };
+  meta = {
+    inherit (opencv4.meta) description homepage;
+  };
+}
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 7fdf319f9e61..602cdd29e825 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "openpyxl";
-  version = "3.1.2";
+  version = "3.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,12 +24,12 @@ buildPythonPackage rec {
     owner = "openpyxl";
     repo = "openpyxl";
     rev = "refs/tags/${version}";
-    hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0=";
+    hash = "sha256-vp+TIWcHCAWlDaBcmC7w/kV7DZTZpa6463NusaJmqKo=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ et-xmlfile ];
+  dependencies = [ et-xmlfile ];
 
   nativeCheckInputs = [
     lxml
@@ -42,6 +42,7 @@ buildPythonPackage rec {
     "-W"
     "ignore::DeprecationWarning"
   ];
+
   disabledTests =
     [
       # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 2d5db38d963a..a54f14c99602 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "3.8.0";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
     rev = "v${version}";
-    hash = "sha256-eV5xDFRQi0m95pL6e2phvblUbh5GEJ1ru1a62TnbGNk=";
+    hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix
index 8c0991ee7e4d..48ac9a55aedc 100644
--- a/pkgs/development/python-modules/openrgb-python/default.nix
+++ b/pkgs/development/python-modules/openrgb-python/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "openrgb-python";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hzuLNbMuF4LR8fkS6ByULdF37qYwL9smaVAP2G2E+Us=";
+    hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix
new file mode 100644
index 000000000000..9878366a7250
--- /dev/null
+++ b/pkgs/development/python-modules/openslide/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  openslide,
+  pillow,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "openslide";
+  version = "1.3.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "openslide";
+    repo = "openslide-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GokWpRuon8lnxNzxsYGYrQBQDhGPxl8HDaO7fR+2Ldo=";
+  };
+
+  postPatch = ''
+    substituteInPlace openslide/lowlevel.py \
+      --replace-fail "return cdll.LoadLibrary(name)" "return cdll.LoadLibrary(f'${lib.getLib openslide}/lib/{name}')"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ pillow ];
+
+  pythonImportsCheck = [ "openslide" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''rm -rf openslide/'';
+
+  meta = {
+    description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images";
+    homepage = "https://github.com/openslide/openslide-python";
+    changelog = "https://github.com/openslide/openslide-python/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix
index 28680e26b091..775467ef30a6 100644
--- a/pkgs/development/python-modules/openstep-plist/default.nix
+++ b/pkgs/development/python-modules/openstep-plist/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "openstep-plist";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "openstep_plist";
     inherit version;
-    hash = "sha256-Au6taO+57Ost4slTlwc86A/ImFXZerZRab2S/ENo5PI=";
+    hash = "sha256-RTpWzfU0xvQtJJNNLtf5W8d8PRqKy8GIGkqgYafWAaI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix
index fdaa41d289ef..08d5458968c8 100644
--- a/pkgs/development/python-modules/opentelemetry-api/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-api/default.nix
@@ -14,7 +14,7 @@
 let
   self = buildPythonPackage rec {
     pname = "opentelemetry-api";
-    version = "1.26.0";
+    version = "1.27.0";
     pyproject = true;
 
     disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ let
       owner = "open-telemetry";
       repo = "opentelemetry-python";
       rev = "refs/tags/v${version}";
-      hash = "sha256-slb1ZKGnfJRZiBh++S20en7U6RckspHHuMohHOz2Hts=";
+      hash = "sha256-5m6VGdt90Aw6ODUWG7A7b0kV8FsDtg+oPkNUKRbzDX4=";
     };
 
     sourceRoot = "${src.name}/opentelemetry-api";
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
index 8c8ae9534ae6..73845247a0c2 100644
--- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "opentelemetry-instrumentation";
-  version = "0.47b0";
+  version = "0.48b0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "open-telemetry";
     repo = "opentelemetry-python-contrib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XtJ4u891vI7wDtReoucm+qk3BkKJ+aZrYy7zfxmqfgk=";
+    hash = "sha256-RsOOCDbxT0e0WGfI8Ibv6E51ei+sTg07F8d+30+JrVU=";
   };
 
   sourceRoot = "${src.name}/opentelemetry-instrumentation";
diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix
index 8fcaf2a3b516..ee972ff524d9 100644
--- a/pkgs/development/python-modules/opentelemetry-proto/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix
@@ -16,6 +16,8 @@ buildPythonPackage {
 
   sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto";
 
+  pythonRelaxDeps = [ "protobuf" ];
+
   build-system = [ hatchling ];
 
   dependencies = [ protobuf ];
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 7315865b75c2..f44a712aaf80 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -51,13 +51,14 @@ in
 
 buildPythonPackage rec {
   pname = "openusd";
-  version = "24.05";
+  version = "24.08";
+  pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
     rev = "refs/tags/v${version}";
-    hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0=";
+    hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE=";
   };
 
   stdenv =
@@ -65,13 +66,12 @@ buildPythonPackage rec {
 
   outputs = [ "out" ] ++ lib.optional withDocs "doc";
 
-  format = "other";
-
   patches = [
     (fetchpatch {
       name = "port-to-embree-4.patch";
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch";
-      hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw=";
+      # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266
+      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1";
+      hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI=";
     })
   ];
 
@@ -175,7 +175,10 @@ buildPythonPackage rec {
       for interchange between graphics applications.
     '';
     homepage = "https://openusd.org/";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ shaddydc ];
+    license = lib.licenses.tost;
+    maintainers = with lib.maintainers; [
+      shaddydc
+      gador
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 265adff8273d..7c3d47dffe03 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.8.4";
+  version = "0.8.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "opower";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UwiEUHLeGK7WsQ8RPmHAjPVXgFf6N5upJIKMp54NSjs=";
+    hash = "sha256-3GzShdYNfaBxu1azPW8eUR5rDn8rrGiE/MhTmwzLOg8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix
index 801c1b49841a..131d11d310c4 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/pkgs/development/python-modules/opt-einsum/default.nix
@@ -1,39 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchpatch,
   fetchPypi,
-  setuptools,
+  hatch-fancy-pypi-readme,
+  hatch-vcs,
+  hatchling,
   numpy,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
-  version = "3.3.0";
+  version = "3.4.0";
   pname = "opt-einsum";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "opt_einsum";
     inherit version;
-    hash = "sha256-WfZHX3e7w33PfNdIUZwOxgci6R5jyhFOaIIcDFSkZUk=";
+    hash = "sha256-lspy8biG0UgkE0h4NJgZTFd/owqPqsEIWGsU8bpEc6w=";
   };
 
-  patches = [
-    # https://github.com/dgasmith/opt_einsum/pull/208
-    (fetchpatch {
-      name = "python312-compatibility.patch";
-      url = "https://github.com/dgasmith/opt_einsum/commit/0beacf96923bbb2dd1939a9c59398a38ce7a11b1.patch";
-      hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A=";
-    })
+  build-system = [
+    hatch-fancy-pypi-readme
+    hatch-vcs
+    hatchling
   ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix
index 987b41dfaa2d..62343729fed9 100644
--- a/pkgs/development/python-modules/oras/default.nix
+++ b/pkgs/development/python-modules/oras/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "oras";
-  version = "0.1.30";
+  version = "0.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "oras-project";
     repo = "oras-py";
     rev = "refs/tags/${version}";
-    hash = "sha256-qdWGqa5W+WI+lQ2TDZUuJF7PSmkc1Kv7UbWL6+Rfyio=";
+    hash = "sha256-fylc6uKQs+jbssY8PRo/o4EnBxDcvupjEWmr5ypZbrY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 9fd8fe941adb..98ce76ed1480 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "orjson";
-  version = "3.10.6";
+  version = "3.10.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,13 +40,13 @@ buildPythonPackage rec {
     owner = "ijl";
     repo = "orjson";
     rev = "refs/tags/${version}";
-    hash = "sha256-K3wCzwaGOsaiCm2LW4Oc4XOnp6agrdTxCxqEIMq0fuU=";
+    hash = "sha256-+ofDblSbaG8CjRXFfF0QFpq2yGmLF/2yILqk2m8PSl8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-SNdwqb47dJ084TMNsm2Btks1UCDerjSmSrQQUiGbx50=";
+    hash = "sha256-MACmdptHmnifBTfB5s+CY6npAOFIrh0zvrIImYghGsw=";
   };
 
   maturinBuildFlags = [ "--interpreter ${python.executable}" ];
diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix
index bb65573eee64..6c2634bb56c1 100644
--- a/pkgs/development/python-modules/ormar/default.nix
+++ b/pkgs/development/python-modules/ormar/default.nix
@@ -145,5 +145,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/collerek/ormar/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ andreasfelix ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix
index 0bbfc103b041..f296d8307106 100644
--- a/pkgs/development/python-modules/osc-sdk-python/default.nix
+++ b/pkgs/development/python-modules/osc-sdk-python/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "osc-sdk-python";
-  version = "0.29.0";
+  version = "0.30.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "outscale";
     repo = "osc-sdk-python";
-    rev = "v${version}";
-    hash = "sha256-WtKG2ujEGUW0nhYWxfYDkxicN/uEqBxKCh9FcCfjmHM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-HOYIt4kLKAR8zYmIhjLQoibL3qp9uruFKgkgfnmZOfc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index d3dbb48df72f..ef8db9f8b297 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -16,28 +16,35 @@
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "0.6.7";
+  version = "0.6.7.post1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-O3ARmFV6SZxg67U9fyUBkGSFXHMvTz+84gVdeJ5Tph0=";
+    hash = "sha256-VUqhDcqEgZeLTTNOKCAfJO0Y8pTFqENQziAiqLePTXI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy >= 2.0.0" numpy
+  '';
+
   dontUseCmakeConfigure = true;
 
   nativeBuildInputs = [
     cmake
+    numpy
     oldest-supported-numpy
     setuptools-scm
   ];
 
-  pythonRelaxDeps = [ "scipy" ];
+  pythonRelaxDeps = [
+    "scipy"
+  ];
 
   propagatedBuildInputs = [
-    future
     numpy
     qdldl
     scipy
diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 53f7f9f24e07..4d2d4f24071e 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -2,46 +2,48 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-
   lxml,
-  pyproj,
+  pytest-cov-stub,
   pytestCheckHook,
   python-dateutil,
   pythonOlder,
-  pytz,
   pyyaml,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "owslib";
-  version = "0.31.0";
-  format = "setuptools";
+  version = "0.32.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "geopython";
     repo = "OWSLib";
-    rev = version;
-    hash = "sha256-vjJsLavVOqTTrVtYbtA0G+nl0HanKeGtzNFFj92Frw8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk=";
   };
 
   postPatch = ''
     substituteInPlace tox.ini \
-      --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" ""
+      --replace-fail " --doctest-modules --doctest-glob 'tests/**/*.txt'" ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     lxml
-    pyproj
     python-dateutil
-    pytz
     pyyaml
     requests
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "owslib" ];
 
@@ -51,10 +53,15 @@ buildPythonPackage rec {
   '';
 
   pytestFlagsArray = [
-    # disable tests which require network access
+    # Disable tests which require network access
     "-m 'not online'"
   ];
 
+  disabledTestPaths = [
+    # Tests requires network access
+    "tests/test_ogcapi_connectedsystems_osh.py"
+  ];
+
   meta = with lib; {
     description = "Client for Open Geospatial Consortium web service interface standards";
     homepage = "https://www.osgeo.org/projects/owslib/";
diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix
index 50bdaff9db6f..4f7cc686d9e6 100644
--- a/pkgs/development/python-modules/packvers/default.nix
+++ b/pkgs/development/python-modules/packvers/default.nix
@@ -6,23 +6,26 @@
   pyparsing,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "packvers";
   version = "21.5";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "nexB";
-    repo = pname;
+    repo = "packvers";
     rev = "refs/tags/${version}";
     hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE=";
   };
 
-  propagatedBuildInputs = [ pyparsing ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pyparsing ];
 
   nativeCheckInputs = [
     pretend
@@ -31,9 +34,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "packvers" ];
 
+  disabledTests = [
+    # Failed: DID NOT RAISE 
+    "test_invalid_file_urls"
+  ];
+
   meta = with lib; {
     description = "Module for version handling of modules";
-    homepage = "https://github.com/nexB/dparse2";
+    homepage = "https://github.com/aboutcode-org/packvers";
     changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst";
     license = with licenses; [
       asl20 # and
diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix
index ee429fb164d0..7149360304a8 100644
--- a/pkgs/development/python-modules/paddle2onnx/default.nix
+++ b/pkgs/development/python-modules/paddle2onnx/default.nix
@@ -9,7 +9,7 @@
 }:
 let
   pname = "paddle2onnx";
-  version = "1.2.4";
+  version = "1.2.9";
   format = "wheel";
   pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
   src = fetchPypi {
@@ -18,7 +18,7 @@ let
     python = pyShortVersion;
     abi = pyShortVersion;
     platform = "manylinux_2_12_x86_64.manylinux2010_x86_64";
-    hash = "sha256-2muP4Y1zvqYVxvN6I9wjdMY+YE2d0nRmIwFFI/BsIKE=";
+    hash = "sha256-52U6F2UGteEOV7muLB2vfDHazb0sTy/17Il39kA5XZs=";
   };
 in
 buildPythonPackage {
diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index fe2ad63e0e6b..6cca9b459556 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -10,7 +10,7 @@
   lmdb,
   lxml,
   numpy,
-  opencv4,
+  opencv-python,
   openpyxl,
   pdf2docx,
   pillow,
@@ -27,7 +27,7 @@
 }:
 
 let
-  version = "2.7.5";
+  version = "2.8.1";
 in
 buildPythonPackage {
   pname = "paddleocr";
@@ -38,7 +38,7 @@ buildPythonPackage {
     owner = "PaddlePaddle";
     repo = "PaddleOCR";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8mnSV4ga6G2cbYCX84XJRFiLCoXstTAtqvg9QqVN6GI=";
+    hash = "sha256-TLNpb+CwLKvtmPppDuUbGyJorhmkVVW01J61+XUICYk=";
   };
 
   patches = [
@@ -58,7 +58,6 @@ buildPythonPackage {
   pythonRemoveDeps = [
     "imgaug"
     "visualdl"
-    "opencv-python"
     "opencv-contrib-python"
   ];
 
@@ -71,7 +70,7 @@ buildPythonPackage {
     lmdb
     lxml
     numpy
-    opencv4
+    opencv-python
     openpyxl
     pdf2docx
     pillow
diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix
index 5f02936d9252..746beca0a9cf 100644
--- a/pkgs/development/python-modules/pamela/default.nix
+++ b/pkgs/development/python-modules/pamela/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pamela";
-  version = "1.1.0";
+  version = "1.2.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4=";
+    hash = "sha256-DqbiqZ3e2Md4OkoG8tMfW9ytiU15EB6PCTIuOHo0qs8=";
   };
 
   postUnpack = ''
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index abf91dc56aae..9c707351f209 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -3,14 +3,12 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
   pythonOlder,
 
   # build-system
   cython,
   meson-python,
   meson,
-  oldest-supported-numpy,
   pkg-config,
   versioneer,
   wheel,
@@ -66,7 +64,7 @@
 let
   pandas = buildPythonPackage rec {
     pname = "pandas";
-    version = "2.2.2";
+    version = "2.2.3";
     pyproject = true;
 
     disabled = pythonOlder "3.9";
@@ -75,29 +73,25 @@ let
       owner = "pandas-dev";
       repo = "pandas";
       rev = "refs/tags/v${version}";
-      hash = "sha256-+zQKrsJmP3FJeOiYwNH1u96+/ECDHQF39evzur3cKjc=";
+      hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME=";
     };
 
     postPatch = ''
       substituteInPlace pyproject.toml \
-        --replace-fail "Cython==3.0.5" "Cython>=3.0.5" \
         --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \
         --replace-fail "meson==1.2.1" "meson>=1.2.1" \
-        --replace-fail "numpy>=2.0.0rc1" "numpy"
+        --replace-fail "numpy>=2.0" "numpy"
     '';
 
-    nativeBuildInputs =
-      [
-        cython
-        meson-python
-        meson
-        numpy
-        pkg-config
-        versioneer
-        wheel
-      ]
-      ++ versioneer.optional-dependencies.toml
-      ++ lib.optionals (pythonOlder "3.12") [ oldest-supported-numpy ];
+    nativeBuildInputs = [
+      cython
+      meson-python
+      meson
+      numpy
+      pkg-config
+      versioneer
+      wheel
+    ] ++ versioneer.optional-dependencies.toml;
 
     enableParallelBuilding = true;
 
diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index d37aa9bdc684..ab7927abbc28 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "panel";
-  version = "1.4.4";
+  version = "1.5.1";
 
   format = "wheel";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # tries to fetch even more artifacts
   src = fetchPypi {
     inherit pname version format;
-    hash = "sha256-tJu5Z2VnsMBzC/aTSMBXJHCAgRrsVjZN1Pz7qA5eCaA=";
+    hash = "sha256-cglT8X3x6tb5ewWluKdTNDi4lFUQqeJQIBSmHGAGDmI=";
     dist = "py3";
     python = "py3";
   };
diff --git a/pkgs/development/python-modules/panphon/default.nix b/pkgs/development/python-modules/panphon/default.nix
index 10c7e50099a7..6190a4bc9ad2 100644
--- a/pkgs/development/python-modules/panphon/default.nix
+++ b/pkgs/development/python-modules/panphon/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "panphon";
-  version = "0.21.1";
+  version = "0.21.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Zgug40R1my1BPOoV9iOkbzouMKeQsc0YYFmBIoypDqk=";
+    hash = "sha256-FpYHbkEeQzyPfbpigZ1EMNlzLLFWB/wNcGHYFYiEE2k=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index b72f2d9fa22c..ca46a101158b 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -11,15 +11,15 @@
   mock,
   pyasn1,
   pynacl,
-  pytestCheckHook,
   pytest-relaxed,
-  six,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "paramiko";
   version = "3.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -35,11 +35,12 @@ buildPythonPackage rec {
     })
   ];
 
+  build-system = [ setuptools ];
+
   dependencies = [
     bcrypt
     cryptography
-    pyasn1
-    six
+    pynacl
   ];
 
   optional-dependencies = {
@@ -47,10 +48,7 @@ buildPythonPackage rec {
       pyasn1
       gssapi
     ];
-    ed25519 = [
-      pynacl
-      bcrypt
-    ];
+    ed25519 = [ ];
     invoke = [ invoke ];
   };
 
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 712cce60a5e6..8b5149011112 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -1,46 +1,37 @@
 {
   lib,
   buildPythonPackage,
-  fetchpatch,
-  fetchPypi,
-  setuptools,
-  numpy,
-  scipy,
-  six,
   decorator,
+  fetchFromGitHub,
+  numpy,
   pytestCheckHook,
+  pythonOlder,
+  scipy,
+  setuptools,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "paramz";
-  version = "0.9.5";
+  version = "0.9.6";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a";
-  };
+  disabled = pythonOlder "3.7";
 
-  patches = [
-    (fetchpatch {
-      name = "remove-deprecated-numpy-uses";
-      url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch";
-      hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA=";
-    })
-    (fetchpatch {
-      name = "_raveled_index_for.patch";
-      url = "https://github.com/sods/paramz/pull/40/commits/dd68a81cfd28edb48354c6a9b493ef711f00fb5b.patch";
-      hash = "sha256-nbnW3lYJDT1WXko3Y28YyELhO0QIAA1Tx0CJ57T1Nq0=";
-    })
-  ];
+  src = fetchFromGitHub {
+    owner = "sods";
+    repo = "paramz";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-SWmx70G5mm3eUmH2UIEmg5C7u9VDHiFw5aYCIr8UjPs=";
+  };
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
+    decorator
     numpy
     scipy
     six
-    decorator
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -64,11 +55,18 @@ buildPythonPackage rec {
     "paramz/tests/verbose_optimize_tests.py"
   ];
 
+  disabledTests = [
+    # TypeError: arrays to stack must be passed as a "sequence" type such as list...
+    "test_raveled_index"
+    "test_regular_expression_misc"
+  ];
+
   pythonImportsCheck = [ "paramz" ];
 
   meta = with lib; {
     description = "Parameterization framework for parameterized model creation and handling";
     homepage = "https://github.com/sods/paramz";
+    changelog = "https://github.com/sods/paramz/releases/tag/v${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bcdarwin ];
   };
diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index 07696140e7b3..61ec964340d4 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -41,14 +41,14 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "8.12.0";
+  version = "8.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mscc3TRMYuaTqrrxGPCVVKa2fg5sXwK/BglpbvLXbLc=";
+    hash = "sha256-Z2KF8jv/D/SvwQWd1PGSlsAfowmYOd5CvvcC4kVuLos=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index ee1eaa064505..7bbd361cb2b1 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -8,6 +8,7 @@
   pytestCheckHook,
   pythonOlder,
   pytest-xdist,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -22,6 +23,8 @@ buildPythonPackage rec {
     hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ";
   };
 
+  dependencies = [ setuptools ];
+
   optional-dependencies = {
     argon2 = [ argon2-cffi ];
     bcrypt = [ bcrypt ];
diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix
index 1298fa3a1e26..cf0d81c7bd9e 100644
--- a/pkgs/development/python-modules/patch-ng/default.nix
+++ b/pkgs/development/python-modules/patch-ng/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.18.0"; # note: `conan` package may require a hardcoded one
+  version = "1.18.1"; # note: `conan` package may require a hardcoded one
   format = "setuptools";
   pname = "patch-ng";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-2gZ2KNbV/Z3FpV6rN5UdRr2VZhtyGfqzZLcRNmq8xpA=";
+    sha256 = "sha256-Uv1G7kb2yGZ2kmgsH9cTTtxlotLQhOvsHSlaYIf8ApE=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix
index d7f28f166a05..d99c52a1861e 100644
--- a/pkgs/development/python-modules/path/default.nix
+++ b/pkgs/development/python-modules/path/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "path";
-  version = "16.14.0";
+  version = "16.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-26qn79RgL9a6jYKJDceCPWnl3nQKboQtmRmw+q8rao4=";
+    hash = "sha256-pqbZFskQ3Bfg3ciDNYdWxaM9G2299dbehlVPOZBTr1g=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix
index c1a8c632cbc6..accc436e7968 100644
--- a/pkgs/development/python-modules/pathlib-abc/default.nix
+++ b/pkgs/development/python-modules/pathlib-abc/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pathlib-abc";
-  version = "0.1.1";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pathlib_abc";
     inherit version;
-    hash = "sha256-CE573ZGbD3d0kUqeZM2GobOYYPgfeB3XJCWGMfKRWr4=";
+    hash = "sha256-gROV0nk6HGdf95wyRtPWtBoPlqOhR5wulsVrClFAIic=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pathvalidate/default.nix b/pkgs/development/python-modules/pathvalidate/default.nix
index 773f9372edbc..be229401f035 100644
--- a/pkgs/development/python-modules/pathvalidate/default.nix
+++ b/pkgs/development/python-modules/pathvalidate/default.nix
@@ -3,22 +3,22 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
-  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "pathvalidate";
-  version = "3.2.0";
-  format = "pyproject";
+  version = "3.2.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XoN4z2cSv/Z/vnqDB9mfqMGgyyiqR3BW+Pw3Tw3/JK0=";
+    hash = "sha256-9dB7HiN0GHBAYSofzSvLKRn42xgN8lTJWBu5C/kDN30=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools-scm ];
 
   # Requires `pytest-md-report`, causing infinite recursion.
   doCheck = false;
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
index fa0ae199bd74..578b64208adc 100644
--- a/pkgs/development/python-modules/patool/default.nix
+++ b/pkgs/development/python-modules/patool/default.nix
@@ -38,15 +38,15 @@ let
 in
 buildPythonPackage rec {
   pname = "patool";
-  version = "2.1.1";
+  version = "2.4.0";
   format = "setuptools";
 
   #pypi doesn't have test data
   src = fetchFromGitHub {
     owner = "wummel";
     repo = pname;
-    rev = "upstream/${version}";
-    hash = "sha256-B2P6JldMOAxr4WS+wST+kRVvEm41zH3Nh5LLKoFOws4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-dWyC8uTVUb06liNcJaG4oK9wqIDmwAl6i6cg4XRRRdQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix
index 3e30415a54a3..b54cde4adde3 100644
--- a/pkgs/development/python-modules/pdf2docx/default.nix
+++ b/pkgs/development/python-modules/pdf2docx/default.nix
@@ -9,7 +9,7 @@
   fire,
   fonttools,
   numpy,
-  opencv4,
+  opencv-python-headless,
   tkinter,
   python-docx,
   setuptools,
@@ -34,8 +34,6 @@ buildPythonPackage {
     setuptools
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   preBuild = "echo '${version}' > version.txt";
 
   dependencies = [
@@ -43,7 +41,7 @@ buildPythonPackage {
     fire
     fonttools
     numpy
-    opencv4
+    opencv-python-headless
     python-docx
   ];
 
diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix
index 536b8a98a296..98c6b451ee6f 100644
--- a/pkgs/development/python-modules/pdm-backend/default.nix
+++ b/pkgs/development/python-modules/pdm-backend/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pdm-backend";
-  version = "2.3.3";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-backend";
     rev = "refs/tags/${version}";
-    hash = "sha256-gM8Sx6nMiq84e3sLJn35shF2jy6Ce1qPlERi2XpS89k=";
+    hash = "sha256-YQavUP3RaZns9byli54feVtG92Stozr3T66WouQwF+s=";
   };
 
   env.PDM_BUILD_SCM_VERSION = version;
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index e1c9505b40df..422f427c6ed6 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "peewee";
-  version = "3.17.6";
+  version = "3.17.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = "peewee";
     rev = "refs/tags/${version}";
-    hash = "sha256-HluoCXblqwaOb+gtAhvaYshTj9CtHoegn0QUaq0V+eA=";
+    hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 9f77c7546ac1..0472bf106c50 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -29,6 +29,8 @@
   watchfiles,
 
   # tests
+  beautifulsoup4,
+  lxml,
   mock,
   pytestCheckHook,
   pytest-xdist,
@@ -36,7 +38,7 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "4.9.1";
+  version = "4.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -45,7 +47,7 @@ buildPythonPackage rec {
     owner = "getpelican";
     repo = "pelican";
     rev = "refs/tags/${version}";
-    hash = "sha256-nz2OnxJ4mGgnafz4Xp8K/BTyVgXNpNYqteNL1owP8Hk=";
+    hash = "sha256-RWzOMp3H0QbZyGsXd8cakeRqZhVH7d6ftxZHBA4cPSA=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -58,9 +60,7 @@ buildPythonPackage rec {
       --replace "'git'" "'${git}/bin/git'"
   '';
 
-  nativeBuildInputs = [
-    pdm-backend
-  ];
+  build-system = [ pdm-backend ];
 
   pythonRelaxDeps = [ "unidecode" ];
 
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     typogrify
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     blinker
     docutils
     feedgenerator
@@ -84,13 +84,19 @@ buildPythonPackage rec {
     tzdata
     unidecode
     watchfiles
-  ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
+  ];
+
+  optional-dependencies = {
+    markdown = [ markdown ];
+  };
 
   nativeCheckInputs = [
+    beautifulsoup4
+    lxml
     mock
+    pandoc
     pytest-xdist
     pytestCheckHook
-    pandoc
   ];
 
   pytestFlagsArray = [
@@ -104,6 +110,10 @@ buildPythonPackage rec {
     "test_custom_generation_works"
     "test_custom_locale_generation_works"
     "test_deprecated_attribute"
+    # AttributeError
+    "test_wp_custpost_true_dirpage_false"
+    "test_can_toggle_raw_html_code_parsing"
+    "test_dirpage_directive_for_page_kind"
   ];
 
   env.LC_ALL = "en_US.UTF-8";
@@ -122,6 +132,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Static site generator that requires no database or server-side logic";
     homepage = "https://getpelican.com/";
+    changelog = "https://github.com/getpelican/pelican/blob/${version}/docs/changelog.rst";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [
       offline
diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 59892262e697..060e3ff8ef72 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "persim";
-  version = "0.3.5";
+  version = "0.3.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qyly3kIx9HQ7zDT0SfUlsqZGqibdXsfW1dL9HNpQZJg=";
+    hash = "sha256-dvcpj7ekbNvsc2+FSXfx4Xlt3y1pdO2n2FnKKEf032Q=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 644ac8d2e517..18fc8b244fbb 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -16,19 +16,24 @@
 
 buildPythonPackage rec {
   pname = "persistent";
-  version = "6.0";
+  version = "6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CDZQwP/ty4gDKJY8KUuVEaArawXkIec3p9Vfnu2I+18=";
+    hash = "sha256-qhfm5ISXONCAcG6+bHnsjbD0qyyHl1+bNCSer3qWWGc=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<74" "setuptools"
+  '';
+
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     zope-interface
     zope-deferredimport
   ]
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 2df4dd4b8ff0..f5cb793b6c50 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.12.1";
+  version = "2.20.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KBD9sRqtQT02RfyXurUiGy28bucB7l/irF/fPmVeGwc=";
+    hash = "sha256-JvZiVb/qzkILBaALrCU2rldUgSgSD1eo4AqMPgEdJ50=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index 02a11e0f01a7..0efd11578651 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -2,22 +2,22 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pytest-cov-stub,
+  pytest,
   pythonOlder,
   setuptools,
-  pytest,
-  pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "pglast";
-  version = "6.2";
+  version = "6.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mGP7o52Wun6AdE2jMAJBmLR10EmN50qzbMzB06BFXMg=";
+    hash = "sha256-NMM/O7SIunsfh1aSKArAmcXQR638HwBFrMjva+muDt8=";
   };
 
   build-system = [ setuptools ];
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/lelit/pglast";
     description = "PostgreSQL Languages AST and statements prettifier";
+    homepage = "https://github.com/lelit/pglast";
     changelog = "https://github.com/lelit/pglast/blob/v${version}/CHANGES.rst";
     license = licenses.gpl3Plus;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix
index 7f1c482977a3..df957c92c686 100644
--- a/pkgs/development/python-modules/pgsanity/default.nix
+++ b/pkgs/development/python-modules/pgsanity/default.nix
@@ -20,6 +20,9 @@ buildPythonPackage rec {
     unittestCheckHook
     postgresql
   ];
+
+  unittestFlagsArray = [ "test" ];
+
   propagatedBuildInputs = [ postgresql ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix
index 114a16888632..7a0deabae3c0 100644
--- a/pkgs/development/python-modules/phonemizer/default.nix
+++ b/pkgs/development/python-modules/phonemizer/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "phonemizer";
-  version = "3.2.1";
+  version = "3.3.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Bo+F+FqKmtxjijeHrqyvcaU+R1eLEtdzwJdDNQDNiSs=";
+    hash = "sha256-Xgw4Ei7/4LMxok5nSv8laHTs4WnXCpzxEgM3tW+OPQw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 8df6d6fc3d90..17d232e97f7e 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -4,20 +4,23 @@
   fetchPypi,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.13.39";
-  format = "setuptools";
+  version = "8.13.46";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-23yklw0gayBWIxEFMAdTsaWyKfQ0FvjCswEOY/u2jXc=";
+    hash = "sha256-lL8Yupclu2ho0pRzsT947wHiWFxctWHsAgC+dnbndFI=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pytestFlagsArray = [ "tests/*.py" ];
diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index 38b239651b7c..3e7629a31335 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "phonopy";
-  version = "2.24.3";
+  version = "2.28.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VHtifCC28GKIE+0oz1wMgmZ9G6+rT8nF0PG6tYkhjG8=";
+    hash = "sha256-3BxFOT/nXuK++epTghrQxDm19JTMJm33D4uSQ/KS+aE=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix
index dec5ef583222..f81ba4f5ec4d 100644
--- a/pkgs/development/python-modules/photutils/default.nix
+++ b/pkgs/development/python-modules/photutils/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "photutils";
-  version = "2.0.0";
+  version = "2.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "astropy";
     repo = "photutils";
     rev = "refs/tags/${version}";
-    hash = "sha256-slrg1iByOhW1jiSG7nKHWj0ZSOP8v3LhCCr+DLLspKM=";
+    hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix
index 49dd8b2c3c4d..5c8bf351b525 100644
--- a/pkgs/development/python-modules/piccolo-theme/default.nix
+++ b/pkgs/development/python-modules/piccolo-theme/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "piccolo-theme";
-  version = "0.23.0";
+  version = "0.24.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
  src = fetchPypi {
     pname = "piccolo_theme";
     inherit version;
-    hash = "sha256-jlnKZK2wuEM+n+3Y59U6+LyQJRBUwQAn0NarAGlNdx0=";
+    hash = "sha256-Cc9w9Lttuk680UlmVQwpIznBHZMclTMiHNPb/+sdG9k=";
   };
 
   dependencies = [ sphinx ];
diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix
index 5c8488b9f17c..be57d452680b 100644
--- a/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/pkgs/development/python-modules/pillow-heif/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   cmake,
@@ -29,24 +28,16 @@
 
 buildPythonPackage rec {
   pname = "pillow-heif";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bigcat88";
     repo = "pillow_heif";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fKh4UbTVj74YxH2vvL24DNmMxg10GSYAmduwuRneE+0=";
+    hash = "sha256-+HQvDf5aovUtZ++BoD22B012N32A+7++O/jbpkIVQws=";
   };
 
-  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
   '';
@@ -55,9 +46,10 @@ buildPythonPackage rec {
     cmake
     nasm
     pkg-config
-    setuptools
   ];
 
+  build-system = [ setuptools ];
+
   dontUseCmakeConfigure = true;
 
   buildInputs = [
@@ -74,7 +66,7 @@ buildPythonPackage rec {
     RELEASE_FULL_FLAG = 1;
   };
 
-  propagatedBuildInputs = [ pillow ];
+  dependencies = [ pillow ];
 
   pythonImportsCheck = [ "pillow_heif" ];
 
diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix
index 7aebaf432c00..a55d6d6740e6 100644
--- a/pkgs/development/python-modules/pillow-jpls/default.nix
+++ b/pkgs/development/python-modules/pillow-jpls/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
 
   pypaBuildFlags = [
     "-C"
-    "cmake.args='--preset=sysdeps'"
+    "cmake.args=--preset=sysdeps"
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix
index 38ec710a14f4..a22aa39aa82e 100644
--- a/pkgs/development/python-modules/pinecone-client/default.nix
+++ b/pkgs/development/python-modules/pinecone-client/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pinecone-client";
-  version = "4.1.1";
+  version = "4.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pinecone_client";
     inherit version;
-    hash = "sha256-sueMKd5QwYDb/nXhXwjIfsGjpPG8ayvh8Myu4atENPo=";
+    hash = "sha256-+onGBXkuyU3jbUyVhSULR7C2Q0B0VwU+yokAhCS+YoE=";
   };
 
   pythonRelaxDeps = [ "urllib3" ];
diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index 5b7e66f6916c..559fc84fc3de 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pipdeptree";
-  version = "2.23.1";
+  version = "2.23.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,9 +25,16 @@ buildPythonPackage rec {
     owner = "tox-dev";
     repo = "pipdeptree";
     rev = "refs/tags/${version}";
-    hash = "sha256-yEiehHcJcVC0hjb9NFgsrSxmAsxNki8HNGKk8dEk75s=";
+    hash = "sha256-wK3RaVq5PwDVAKotkDVEeAMImJxJVN1GceyoKBGBkOY=";
   };
 
+  postPatch = ''
+    # only set to ensure py3.13 compat
+    # https://github.com/tox-dev/pipdeptree/pull/406
+    substituteInPlace pyproject.toml \
+      --replace-fail '"pip>=24.2"' '"pip"'
+  '';
+
   build-system = [
     hatchling
     hatch-vcs
diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix
index b080d9f6b627..aab3ba2d8c8f 100644
--- a/pkgs/development/python-modules/pixel-font-builder/default.nix
+++ b/pkgs/development/python-modules/pixel-font-builder/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pixel-font-builder";
-  version = "0.0.26";
+  version = "0.0.28";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pixel_font_builder";
     inherit version;
-    hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8=";
+    hash = "sha256-2dWouHAldkjPqn/87q2/a47cCFUdf8Kw6tuMUGT/XDc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index f94b8382274d..e99565720026 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -13,15 +13,16 @@
 
 buildPythonPackage rec {
   pname = "pkg-about";
-  version = "1.1.5";
+  version = "1.1.8";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "pkg_about";
+    inherit version;
     extension = "zip";
-    hash = "sha256-B5u+iJuqHtv4BlGhdWqYxBfS89/S01OXmLyDOQraHfo=";
+    hash = "sha256-GVV3l0rU8gkxedOiMVVAt0bEqCtyO+1LSHxIKjBlbPk=";
   };
 
   # tox is listed in build requirements but not actually used to build
diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 4a91f11da2a2..89ec53073e43 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "4.2.2";
+  version = "4.3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "platformdirs";
     repo = "platformdirs";
     rev = "refs/tags/${version}";
-    hash = "sha256-WsHB+Si8RnJ9b8dYA9m7YRin3UYdJlL1v6/v8SExXtY=";
+    hash = "sha256-Zo1fEqiUbrI3pbVp3ndjV8gd+sbcGgUm1PJhQudmiMQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix
index e27e2a33ca30..08462f56a616 100644
--- a/pkgs/development/python-modules/playwright/default.nix
+++ b/pkgs/development/python-modules/playwright/default.nix
@@ -76,7 +76,10 @@ buildPythonPackage rec {
     setuptools
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ];
 
-  pythonRelaxDeps = [ "pyee" ];
+  pythonRelaxDeps = [
+    "greenlet"
+    "pyee"
+  ];
 
   propagatedBuildInputs = [
     greenlet
diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 5cf06d322fd1..6b2be979b101 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,16 +22,16 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.26.2";
+  version = "1.27.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JSgWOHMwjxStwMxRe4sFYLeRRgOkfWXlIpqeDfGDSNQ=";
+    hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index f94ac77898f3..4490f4c5855e 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -2,31 +2,34 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  geopandas,
+
+  # build-system
+  setuptools-scm,
+
+  # dependencies
   matplotlib,
   mizani,
   pandas,
   patsy,
-  pytestCheckHook,
-  pythonOlder,
-  scikit-misc,
   scipy,
-  setuptools-scm,
   statsmodels,
+
+  # tests
+  geopandas,
+  pytestCheckHook,
+  scikit-misc,
 }:
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.13.6";
+  version = "0.14.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg=";
+    hash = "sha256-K2Feqg3UiffZ4izYzrCW+iu7dH61sItOUVtwvzTMth0=";
   };
 
   postPatch = ''
@@ -36,8 +39,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  pythonRelaxDeps = [ "mizani" ];
-
   dependencies = [
     matplotlib
     mizani
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index d786be3c6f35..8bfa57692252 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.4.3";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    hash = "sha256-eeytJ9X2ChcQDbAfTUPokMl/qKVSU6PUuI/a30xJ6WU=";
+    hash = "sha256-WcoHK8UZ7qOVoUBCSoTDZ+6fC568AyXFCBys/7sjJx8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index 17a49034d20d..e3a0ffe1e75c 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pythonOlder,
   build,
   git,
@@ -16,26 +15,18 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "1.9.0";
-  format = "pyproject";
+  version = "1.9.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
-    repo = pname;
-    rev = version;
-    hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw=";
+    repo = "poetry-core";
+    rev = "refs/tags/${version}";
+    hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "python-3.12.6.patch";
-      url = "https://github.com/python-poetry/poetry-core/commit/bd1ce358dec403c66e62176b11bfad77a51aacfd.patch";
-      hash = "sha256-dl2xTsn0nNAGJKNmgNPXlaeJOs1gNfDeQMJnD7EnKB4=";
-    })
-  ];
-
   nativeCheckInputs = [
     build
     git
diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
index 690a155d056e..7071303df807 100644
--- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "poetry-dynamic-versioning";
-  version = "1.4.0";
+  version = "1.4.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-dhAqDRMRcIYUluYgBlhyPPDZTnLlDrhcAOnT0dHk3Mo=";
+    hash = "sha256-2iC665bOCr5JEcuypgr57bHSRYc3PuetJ9uPvFLsgZM=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock
index 94a0a87e3d8c..37d2c8c3717e 100644
--- a/pkgs/development/python-modules/polars/Cargo.lock
+++ b/pkgs/development/python-modules/polars/Cargo.lock
@@ -1,22 +1,16 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -36,7 +30,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "const-random",
  "getrandom",
  "once_cell",
  "version_check",
@@ -102,9 +95,9 @@ checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "apache-avro"
@@ -134,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "arboard"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
 dependencies = [
  "clipboard-win",
  "log",
@@ -164,9 +157,9 @@ checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76"
 
 [[package]]
 name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -174,51 +167,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "arrow-array"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c"
-dependencies = [
- "ahash",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "chrono",
- "half",
- "hashbrown",
- "num",
-]
-
-[[package]]
-name = "arrow-buffer"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1"
-dependencies = [
- "bytes",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-data"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5"
-dependencies = [
- "arrow-buffer",
- "arrow-schema",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-schema"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8"
-
 [[package]]
 name = "arrow2"
 version = "0.17.4"
@@ -241,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -252,24 +200,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -295,9 +243,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "avro-schema"
@@ -317,9 +265,9 @@ dependencies = [
 
 [[package]]
 name = "aws-config"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697"
+checksum = "8191fb3091fa0561d1379ef80333c3c7191c6f0435d986e85821bcf7acbd1126"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -347,9 +295,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9"
+checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -359,15 +307,16 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.4.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6"
+checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
  "aws-smithy-async",
  "aws-smithy-eventstream",
  "aws-smithy-http",
+ "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
@@ -419,9 +368,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.39.0"
+version = "1.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81"
+checksum = "0b90cfe6504115e13c41d3ea90286ede5aa14da294f3fe077027a6e83850843c"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -441,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.40.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74"
+checksum = "167c0fad1f212952084137308359e8e4c4724d1c643038ce163f06de9662c1d0"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -463,9 +412,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.39.0"
+version = "1.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574"
+checksum = "2cb5f98188ec1435b68097daa2a37d74b9d17c9caa799466338a8d1544e71b9d"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -486,9 +435,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.3"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be"
+checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -547,9 +496,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.4"
+version = "0.60.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858"
+checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -558,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.9"
+version = "0.60.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e"
+checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -598,9 +547,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.6.3"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225"
+checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -642,9 +591,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.2"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8"
+checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b"
 dependencies = [
  "base64-simd",
  "bytes",
@@ -668,9 +617,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.60.8"
+version = "0.60.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55"
+checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
 dependencies = [
  "xmlparser",
 ]
@@ -691,17 +640,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -822,17 +771,6 @@ dependencies = [
  "alloc-stdlib",
 ]
 
-[[package]]
-name = "built"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
-dependencies = [
- "cargo-lock",
- "chrono",
- "git2",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
@@ -841,9 +779,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -856,7 +794,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -867,9 +805,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "bytes-utils"
@@ -881,18 +819,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "cargo-lock"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72"
-dependencies = [
- "semver",
- "serde",
- "toml",
- "url",
-]
-
 [[package]]
 name = "casey"
 version = "0.4.0"
@@ -919,9 +845,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.14"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
 dependencies = [
  "jobserver",
  "libc",
@@ -998,18 +924,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -1072,31 +998,11 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
-[[package]]
-name = "const-random"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom",
- "once_cell",
- "tiny-keccak",
-]
-
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "core-foundation"
@@ -1125,9 +1031,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
  "libc",
 ]
@@ -1402,7 +1308,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1433,9 +1339,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
 [[package]]
 name = "ethnum"
@@ -1473,13 +1379,13 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1497,6 +1403,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign_vec"
 version = "0.1.0"
@@ -1578,7 +1490,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1646,22 +1558,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "git2"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
 
 [[package]]
 name = "glob"
@@ -1726,7 +1625,6 @@ checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
  "cfg-if",
  "crunchy",
- "num-traits",
 ]
 
 [[package]]
@@ -1735,7 +1633,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
  "serde",
 ]
 
@@ -1757,6 +1655,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+ "rayon",
+ "serde",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1863,9 +1774,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -1941,16 +1852,16 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.12",
- "rustls-native-certs 0.7.2",
+ "rustls 0.23.13",
+ "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -1959,9 +1870,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1972,16 +1883,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2012,12 +1922,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -2035,9 +1945,9 @@ checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 
 [[package]]
 name = "is-terminal"
@@ -2135,75 +2045,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[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.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libflate"
@@ -2245,22 +2091,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
 dependencies = [
  "core2",
- "hashbrown",
+ "hashbrown 0.14.5",
  "rle-decode-fast",
 ]
 
-[[package]]
-name = "libgit2-sys"
-version = "0.17.0+1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
 [[package]]
 name = "libloading"
 version = "0.8.5"
@@ -2268,7 +2102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2297,18 +2131,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "libz-sys"
-version = "1.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -2337,24 +2159,23 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "lz4"
-version = "1.26.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.10.0"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -2428,15 +2249,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -2511,20 +2323,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -2560,28 +2358,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2707,9 +2483,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
  "memchr",
 ]
@@ -2735,7 +2511,7 @@ dependencies = [
  "rand",
  "reqwest",
  "ring",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "snafu",
@@ -2747,9 +2523,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "oorandom"
@@ -2803,16 +2582,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "parquet-format-safe"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f"
-dependencies = [
- "async-trait",
- "futures",
-]
-
 [[package]]
 name = "parse-zoneinfo"
 version = "0.3.1"
@@ -2866,26 +2635,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.76",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -2910,9 +2659,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "planus"
@@ -2925,9 +2674,9 @@ dependencies = [
 
 [[package]]
 name = "plotters"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -2938,15 +2687,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
@@ -2957,7 +2706,6 @@ version = "0.43.1"
 dependencies = [
  "ahash",
  "apache-avro",
- "arrow-buffer",
  "avro-schema",
  "either",
  "ethnum",
@@ -2986,10 +2734,6 @@ name = "polars-arrow"
 version = "0.43.1"
 dependencies = [
  "ahash",
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
  "async-stream",
  "atoi",
  "atoi_simd",
@@ -3007,7 +2751,7 @@ dependencies = [
  "flate2",
  "futures",
  "getrandom",
- "hashbrown",
+ "hashbrown 0.15.0",
  "hex",
  "indexmap",
  "itoa",
@@ -3023,7 +2767,7 @@ dependencies = [
  "proptest",
  "rand",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "ryu",
  "sample-arrow2",
  "sample-std",
@@ -3032,6 +2776,7 @@ dependencies = [
  "simdutf8",
  "streaming-iterator",
  "strength_reduce",
+ "strum_macros",
  "tokio",
  "tokio-util",
  "version_check",
@@ -3070,7 +2815,6 @@ name = "polars-core"
 version = "0.43.1"
 dependencies = [
  "ahash",
- "arrow-array",
  "bincode",
  "bitflags",
  "bytemuck",
@@ -3078,7 +2822,8 @@ dependencies = [
  "chrono-tz",
  "comfy-table",
  "either",
- "hashbrown",
+ "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "indexmap",
  "ndarray",
  "num-traits",
@@ -3095,6 +2840,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
+ "strum_macros",
  "thiserror",
  "version_check",
  "xxhash-rust",
@@ -3132,6 +2878,8 @@ version = "0.43.1"
 dependencies = [
  "ahash",
  "bitflags",
+ "hashbrown 0.15.0",
+ "num-traits",
  "once_cell",
  "polars-arrow",
  "polars-compute",
@@ -3140,6 +2888,7 @@ dependencies = [
  "polars-json",
  "polars-ops",
  "polars-plan",
+ "polars-row",
  "polars-time",
  "polars-utils",
  "rayon",
@@ -3169,7 +2918,7 @@ dependencies = [
  "fs4",
  "futures",
  "glob",
- "hashbrown",
+ "hashbrown 0.15.0",
  "home",
  "itoa",
  "memchr",
@@ -3186,6 +2935,7 @@ dependencies = [
  "polars-schema",
  "polars-time",
  "polars-utils",
+ "pyo3",
  "rayon",
  "regex",
  "reqwest",
@@ -3209,7 +2959,7 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "fallible-streaming-iterator",
- "hashbrown",
+ "hashbrown 0.15.0",
  "indexmap",
  "itoa",
  "num-traits",
@@ -3282,7 +3032,7 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "either",
- "hashbrown",
+ "hashbrown 0.15.0",
  "hex",
  "indexmap",
  "jsonpath_lib_polars_vendor",
@@ -3299,8 +3049,10 @@ dependencies = [
  "rand_distr",
  "rayon",
  "regex",
+ "regex-syntax 0.8.5",
  "serde",
  "serde_json",
+ "strum_macros",
  "unicode-reverse",
  "version_check",
 ]
@@ -3318,14 +3070,14 @@ dependencies = [
  "fallible-streaming-iterator",
  "flate2",
  "futures",
- "hashbrown",
+ "hashbrown 0.15.0",
  "lz4",
  "lz4_flex",
  "num-traits",
- "parquet-format-safe",
  "polars-arrow",
  "polars-compute",
  "polars-error",
+ "polars-parquet-format",
  "polars-utils",
  "rand",
  "serde",
@@ -3336,6 +3088,15 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "polars-parquet-format"
+version = "2.10.0"
+source = "git+https://github.com/pola-rs/parquet-format#b96e00d2b054739ee02da06987bcd7f44b82a4ef"
+dependencies = [
+ "async-trait",
+ "futures",
+]
+
 [[package]]
 name = "polars-pipe"
 version = "0.43.1"
@@ -3344,7 +3105,7 @@ dependencies = [
  "crossbeam-queue",
  "enum_dispatch",
  "futures",
- "hashbrown",
+ "hashbrown 0.15.0",
  "num-traits",
  "polars-arrow",
  "polars-compute",
@@ -3374,9 +3135,10 @@ dependencies = [
  "ciborium",
  "either",
  "futures",
- "hashbrown",
+ "hashbrown 0.15.0",
  "libloading",
  "memmap2",
+ "num-traits",
  "once_cell",
  "percent-encoding",
  "polars-arrow",
@@ -3417,8 +3179,10 @@ dependencies = [
  "polars",
  "polars-core",
  "polars-error",
+ "polars-expr",
  "polars-io",
  "polars-lazy",
+ "polars-mem-engine",
  "polars-ops",
  "polars-parquet",
  "polars-plan",
@@ -3517,6 +3281,7 @@ dependencies = [
  "polars-utils",
  "regex",
  "serde",
+ "strum_macros",
 ]
 
 [[package]]
@@ -3527,13 +3292,14 @@ dependencies = [
  "bytemuck",
  "bytes",
  "compact_str",
- "hashbrown",
+ "hashbrown 0.15.0",
  "indexmap",
  "libc",
  "memmap2",
  "num-traits",
  "once_cell",
  "polars-error",
+ "pyo3",
  "rand",
  "raw-cpuid",
  "rayon",
@@ -3545,9 +3311,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -3585,7 +3351,7 @@ dependencies = [
  "rand",
  "rand_chacha",
  "rand_xorshift",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "unarray",
 ]
 
@@ -3614,18 +3380,17 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "py-polars"
-version = "1.7.1"
+version = "1.12.0"
 dependencies = [
- "built",
  "jemallocator",
  "libc",
  "mimalloc",
@@ -3683,7 +3448,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3696,20 +3461,20 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "quad-rand"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
+checksum = "b76f1009795ca44bb5aaae8fd3f18953e209259c33d9b059b1f53d58ab7511db"
 
 [[package]]
 name = "quick-xml"
-version = "0.36.1"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
  "serde",
@@ -3728,16 +3493,16 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
  "bytes",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "socket2",
  "thiserror",
  "tokio",
@@ -3754,7 +3519,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "slab",
  "thiserror",
  "tinyvec",
@@ -3763,15 +3528,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
 dependencies = [
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3844,9 +3609,9 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
  "bitflags",
 ]
@@ -3894,14 +3659,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags",
 ]
@@ -3923,30 +3688,30 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -3963,15 +3728,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -3983,7 +3748,7 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.4.1",
- "hyper-rustls 0.27.2",
+ "hyper-rustls 0.27.3",
  "hyper-util",
  "ipnet",
  "js-sys",
@@ -3993,9 +3758,9 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.12",
- "rustls-native-certs 0.7.2",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.13",
+ "rustls-native-certs 0.8.0",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -4065,18 +3830,18 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags",
  "errno",
@@ -4099,14 +3864,14 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
 dependencies = [
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.6",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
@@ -4125,12 +3890,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -4147,19 +3912,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
 
 [[package]]
 name = "rustls-webpki"
@@ -4173,9 +3937,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4251,11 +4015,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4303,9 +4067,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4316,15 +4080,12 @@ name = "semver"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -4340,20 +4101,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "indexmap",
  "itoa",
@@ -4362,15 +4123,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4432,14 +4184,13 @@ dependencies = [
 
 [[package]]
 name = "simd-json"
-version = "0.13.10"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa"
+checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91"
 dependencies = [
  "ahash",
  "getrandom",
  "halfbrown",
- "lexical-core",
  "once_cell",
  "ref-cast",
  "serde",
@@ -4450,9 +4201,9 @@ dependencies = [
 
 [[package]]
 name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "siphasher"
@@ -4549,15 +4300,15 @@ dependencies = [
 
 [[package]]
 name = "stacker"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.36.1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4603,7 +4354,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4625,9 +4376,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4645,9 +4396,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.31.3"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d"
+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4670,9 +4421,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -4683,22 +4434,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4731,15 +4482,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -4767,9 +4509,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4790,7 +4532,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4809,16 +4551,16 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4828,61 +4570,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -4908,7 +4595,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4953,7 +4640,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4970,21 +4657,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -5000,15 +4687,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unindent"
@@ -5051,9 +4738,9 @@ dependencies = [
 
 [[package]]
 name = "value-trait"
-version = "0.8.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4"
+checksum = "bcaa56177466248ba59d693a048c0959ddb67f1151b963f904306312548cf392"
 dependencies = [
  "float-cmp",
  "halfbrown",
@@ -5061,12 +4748,6 @@ dependencies = [
  "ryu",
 ]
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -5126,7 +4807,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
@@ -5160,7 +4841,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5173,9 +4854,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -5264,7 +4945,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5275,7 +4956,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5317,19 +4998,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -5391,12 +5059,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -5409,12 +5071,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -5433,12 +5089,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -5451,12 +5101,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -5481,12 +5125,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -5499,15 +5137,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "x11rb"
 version = "0.13.1"
@@ -5555,7 +5184,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.79",
 ]
 
 [[package]]
diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index a1eeda11a3af..e552bd6941cc 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -2,98 +2,304 @@
   lib,
   stdenv,
   buildPythonPackage,
-  rustPlatform,
+  cargo,
   cmake,
-  libiconv,
+  darwin,
   fetchFromGitHub,
+  pkg-config,
+  pkgs, # zstd hidden by python3Packages.zstd
+  pytestCheckHook,
+  pytest-codspeed ? null, # Not in Nixpkgs
+  pytest-cov,
+  pytest-xdist,
+  pytest-benchmark,
+  rustc,
+  rustPlatform,
+  runCommand,
+
+  mimalloc,
   jemalloc,
   rust-jemalloc-sys,
-  darwin,
+  # Another alternative is to try `mimalloc`
+  polarsMemoryAllocator ? mimalloc, # polarsJemalloc,
+  polarsJemalloc ?
+    let
+      jemalloc' = rust-jemalloc-sys.override {
+        jemalloc = jemalloc.override {
+          # "libjemalloc.so.2: cannot allocate memory in static TLS block"
+
+          # https://github.com/pola-rs/polars/issues/5401#issuecomment-1300998316
+          disableInitExecTls = true;
+        };
+      };
+    in
+    assert builtins.elem "--disable-initial-exec-tls" jemalloc'.configureFlags;
+    jemalloc',
+
+  polars,
+  python,
 }:
 
 let
-  rust-jemalloc-sys' = rust-jemalloc-sys.override {
-    jemalloc = jemalloc.override { disableInitExecTls = true; };
-  };
+  version = "1.12.0";
+
+  # Hide symbols to prevent accidental use
+  rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys";
+  jemalloc = throw "polars: use polarsMemoryAllocator over jemalloc";
 in
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "polars";
-  version = "1.7.1";
-  pyproject = true;
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pola-rs";
     repo = "polars";
-    rev = "refs/tags/py-${version}";
-    hash = "sha256-vbligrFrCd7BiPV8n1iRIlurPNirJKOiD4/P5qEpirg=";
+    rev = "py-${version}";
+    hash = "sha256-q//vt8FvVKY9N/BOIoOwxaSB/F/tNX1Zl/9jd0AzSH4=";
   };
 
-  # Cargo.lock file is sometimes behind actual release which throws an error,
-  # thus the `sed` command
-  # Make sure to check that the right substitutions are made when updating the package
-  preBuild = ''
-    #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock
+  # Do not type-check assertions because some of them use unstable features (`is_none_or`)
+  postPatch = ''
+    while IFS= read -r -d "" path ; do
+      sed -i 's \(\s*\)debug_assert! \1#[cfg(debug_assertions)]\n\1debug_assert! ' "$path"
+    done < <( find -iname '*.rs' -print0 )
   '';
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw=";
+      "polars-parquet-format-2.10.0" = "sha256-iB3KZ72JSp7tJCLn9moukpDEGf9MUos04rIQ9rDGWfI=";
     };
   };
 
-  buildAndTestSubdir = "py-polars";
+  requiredSystemFeatures = [ "big-parallel" ];
 
-  # Revisit this whenever package or Rust is upgraded
-  RUSTC_BOOTSTRAP = 1;
+  build-system = [ rustPlatform.maturinBuildHook ];
 
-  # trick taken from the polars repo since there seems to be a problem
-  # with simd enabled with our stable rust (instead of nightly).
-  maturinBuildFlags = [
-    "--no-default-features"
-    "--all-features"
+  nativeBuildInputs = [
+    cargo
+    pkg-config
+    cmake # libz-ng-sys
+    rustPlatform.cargoSetupHook
+    rustPlatform.cargoBuildHook
+    rustPlatform.cargoInstallHook
+    rustc
   ];
 
+  buildInputs =
+    [
+      polarsMemoryAllocator
+      (pkgs.__splicedPackages.zstd or pkgs.zstd)
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.AppKit
+      darwin.apple_sdk.frameworks.IOKit
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  env = {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+
+    # https://github.com/NixOS/nixpkgs/blob/5c38beb516f8da3a823d94b746dd3bf3c6b9bbd7/doc/languages-frameworks/rust.section.md#using-community-maintained-rust-toolchains-using-community-maintained-rust-toolchains
+    # https://discourse.nixos.org/t/nixpkgs-rustplatform-and-nightly/22870
+    RUSTC_BOOTSTRAP = true;
+
+    # Several `debug_assert!` statements use the unstable `Option::is_none_or` method
+    RUSTFLAGS = lib.concatStringsSep " " (
+      [
+        "-Cdebug_assertions=n"
+      ]
+      ++ lib.optionals (polarsMemoryAllocator.pname == "mimalloc") [
+        "--cfg use_mimalloc"
+      ]
+    );
+    RUST_BACKTRACE = true;
+  };
+
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs =
-    [
-      # needed for libz-ng-sys
-      # TODO: use pkgs.zlib-ng
-      cmake
-    ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-      maturinBuildHook
-    ]);
+  maturinBuildFlags = [
+    "-m"
+    "py-polars/Cargo.toml"
+  ];
 
-  buildInputs =
-    [ rust-jemalloc-sys' ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.SystemConfiguration
+  postInstall = ''
+    # Move polars.abi3.so -> polars.so
+    local polarsSo=""
+    local soName=""
+    while IFS= read -r -d "" p ; do
+      polarsSo=$p
+      soName="$(basename "$polarsSo")"
+      [[ "$soName" == polars.so ]] && break
+    done < <( find "$out" -iname "polars*.so" -print0 )
+    [[ -z "''${polarsSo:-}" ]] && echo "polars.so not found" >&2 && exit 1
+    if [[ "$soName" != polars.so ]] ; then
+      mv "$polarsSo" "$(dirname "$polarsSo")/polars.so"
+    fi
+  '';
+
+  pythonImportsCheck = [
+    "polars"
+  ];
+
+  passthru.tests.dynloading-1 =
+    runCommand "polars-dynloading-1"
+      {
+        nativeBuildInputs = [
+          (python.withPackages (ps: [
+            ps.pyarrow
+            polars
+          ]))
+        ];
+      }
+      ''
+        ((LD_DEBUG=libs python) |& tee $out | tail) << \EOF
+        import pyarrow
+        import polars
+        EOF
+        touch $out
+      '';
+  passthru.tests.dynloading-2 =
+    runCommand "polars-dynloading-2"
+      {
+        nativeBuildInputs = [
+          (python.withPackages (ps: [
+            ps.pyarrow
+            polars
+          ]))
+        ];
+        failureHook = ''
+          sed "s/^/    /" $out >&2
+        '';
+      }
+      ''
+        ((LD_DEBUG=libs python) |& tee $out | tail) << \EOF
+        import polars
+        import pyarrow
+        EOF
+      '';
+  passthru.tests.pytest = stdenv.mkDerivation {
+    pname = "${polars.pname}-pytest";
+
+    inherit (polars) version src;
+
+    requiredSystemFeatures = [ "big-parallel" ];
+
+    sourceRoot = "source/py-polars";
+    postPatch = ''
+      for f in * ; do
+        [[ "$f" == "tests" ]] || \
+        [[ "$f" == "pyproject.toml" ]] || \
+        rm -rf "$f"
+      done
+      for pat in "__pycache__" "*.pyc" ; do
+        find -iname "$pat" -exec rm "{}" ";"
+      done
+    '';
+    dontConfigure = true;
+    dontBuild = true;
+
+    doCheck = true;
+    checkPhase = "pytestCheckPhase";
+    nativeBuildInputs = [
+      (python.withPackages (ps: [
+        polars
+        ps.aiosqlite
+        ps.altair
+        ps.boto3
+        ps.deltalake
+        ps.flask
+        ps.flask-cors
+        ps.fsspec
+        ps.gevent
+        ps.hypothesis
+        ps.jax
+        ps.jaxlib
+        (ps.kuzu or null)
+        ps.moto
+        ps.nest-asyncio
+        ps.numpy
+        ps.openpyxl
+        ps.pandas
+        ps.pyarrow
+        ps.pydantic
+        (ps.pyiceberg or null)
+        ps.sqlalchemy
+        ps.torch
+        ps.xlsx2csv
+        ps.xlsxwriter
+        ps.zstandard
+        ps.cloudpickle
+      ]))
+    ];
+    nativeCheckInputs = [
+      pytestCheckHook
+      pytest-codspeed
+      pytest-cov
+      pytest-xdist
+      pytest-benchmark
     ];
 
-  # nativeCheckInputs = [
-  #   pytestCheckHook
-  #   fixtures
-  #   graphviz
-  #   matplotlib
-  #   networkx
-  #   numpy
-  #   pydot
-  # ];
+    pytestFlagsArray = [
+      "-n auto"
+      "--dist loadgroup"
+      ''-m "slow or not slow"''
+    ];
+    disabledTests = [
+      "test_read_kuzu_graph_database" # kuzu
+      "test_read_database_cx_credentials" # connectorx
 
-  pythonImportsCheck = [ "polars" ];
+      # adbc_driver_.*
+      "test_write_database_append_replace"
+      "test_write_database_create"
+      "test_write_database_create_quoted_tablename"
+      "test_write_database_adbc_temporary_table"
+      "test_write_database_create"
+      "test_write_database_append_replace"
+      "test_write_database_errors"
+      "test_write_database_errors"
+      "test_write_database_create_quoted_tablename"
+
+      # Internet access:
+      "test_read_web_file"
+
+      # Untriaged
+      "test_pickle_lazyframe_nested_function_udf"
+      "test_serde_udf"
+      "test_hash_struct"
+    ];
+    disabledTestPaths = [
+      "tests/benchmark"
+      "tests/docs"
+
+      "tests/unit/io/test_iceberg.py" # Package pyiceberg
+      "tests/unit/io/test_spreadsheet.py" # Package fastexcel
+
+      # Wrong altair version
+      "tests/unit/operations/namespaces/test_plot.py"
+
+      # adbc
+      "tests/unit/io/database/test_read.py"
+
+      # Untriaged
+      "tests/unit/cloud/test_prepare_cloud_plan.py"
+      "tests/unit/io/cloud/test_cloud.py"
+    ];
+
+    installPhase = "touch $out";
+  };
 
   meta = {
-    description = "Fast multi-threaded DataFrame library";
+    description = "Dataframes powered by a multithreaded, vectorized query engine, written in Rust";
     homepage = "https://github.com/pola-rs/polars";
-    changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ happysalada ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      happysalada
+      SomeoneSerge
+    ];
+    mainProgram = "polars";
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix
index be7697d0d6ab..9e244b696ece 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/pkgs/development/python-modules/portalocker/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "portalocker";
-  version = "2.8.2";
+  version = "2.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KwNap4KORsWOmzE5DuHxabmOEGarELmmqGH+fiXuTzM=";
+    hash = "sha256-7xv4ROh4qwiu5+QBhBVuEVHyKPEDqlxr0HJMwzCWD48=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix
index cf4e6803391b..fdd93de663bf 100644
--- a/pkgs/development/python-modules/posthog/default.nix
+++ b/pkgs/development/python-modules/posthog/default.nix
@@ -1,45 +1,44 @@
 {
   lib,
+  backoff,
   buildPythonPackage,
   fetchFromGitHub,
-  # build inputs
-  requests,
-  six,
-  monotonic,
-  backoff,
-  python-dateutil,
-  # check inputs
-  pytestCheckHook,
-  mock,
   freezegun,
+  mock,
+  monotonic,
+  pytestCheckHook,
+  python-dateutil,
+  requests,
+  setuptools,
+  six,
 }:
-let
+
+buildPythonPackage rec {
   pname = "posthog";
-  version = "3.5.2";
-in
-buildPythonPackage {
-  inherit pname version;
-  format = "setuptools";
+  version = "3.7.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PostHog";
     repo = "posthog-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DhTX28j8RcEONEVIRoYHBk63Qw1Wff9qdQ/Ymbb9xHE=";
+    hash = "sha256-1evqG/rdHBs0bAHM+bIHyT4tFE6tAE+aJyu5r0QqAMk=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
+    backoff
+    monotonic
+    python-dateutil
     requests
     six
-    monotonic
-    backoff
-    python-dateutil
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
-    mock
     freezegun
+    mock
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "posthog" ];
@@ -47,12 +46,14 @@ buildPythonPackage {
   disabledTests = [
     "test_load_feature_flags_wrong_key"
     # Tests require network access
+    "test_excepthook"
     "test_request"
+    "test_trying_to_use_django_integration"
     "test_upload"
   ];
 
   meta = with lib; {
-    description = "Official PostHog python library";
+    description = "Module for interacting with PostHog";
     homepage = "https://github.com/PostHog/posthog-python";
     changelog = "https://github.com/PostHog/posthog-python/releases/tag/v${version}";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix
index ffcf9616cb59..43c30cd6d574 100644
--- a/pkgs/development/python-modules/pox/default.nix
+++ b/pkgs/development/python-modules/pox/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pox";
-  version = "0.3.4";
+  version = "0.3.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FubsqE8b7DgoIQsGsFKt8EzyqyDCL9b77194Mgyab+0=";
+    hash = "sha256-gSDuTJTpUObgSD4FCk8OVgduWQugqa3RlSTCVL0jwtE=";
   };
 
   # Test sare failing the sandbox
diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix
index a2672cc5e45e..b9616b0c9230 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/pkgs/development/python-modules/ppft/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ppft";
-  version = "1.7.6.8";
+  version = "1.7.6.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dqQpp9e3TE10P226g1HljWK2Qy7WXfn+IEeQFg2rmW0=";
+    hash = "sha256-cxYcZ0dOqdgdBLza0WbTmc/z8ITV0twh691GwHW7wmU=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index c2e34a316578..cab8bc38092f 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "7.8.0";
+  version = "7.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "praw-dev";
     repo = "praw";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA=";
+    hash = "sha256-jxF7rlMwKIKwyYv35vYWAdtClsVhnIkywoyMQeggGBc=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 53143aa47fbf..b5cecedd6388 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -12,24 +12,24 @@
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.10.1";
-  format = "pyproject";
+  version = "3.11.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "prettytable";
     rev = "refs/tags/${version}";
-    hash = "sha256-S23nUCA2WTxnCKKKFrtN9HYjP0SHUBPPsVNAc4SYlVg=";
+    hash = "sha256-LtphoD5gCMgWgDcFghinq9zjUD69XudEeGIToqqmVPs=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [ wcwidth ];
+  dependencies = [ wcwidth ];
 
   nativeCheckInputs = [
     pytest-lazy-fixtures
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
new file mode 100644
index 000000000000..97db576116cd
--- /dev/null
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  pytest,
+  runCommand,
+  boringssl,
+  libiconv,
+  SystemConfiguration,
+  patchelf,
+  gcc-unwrapped,
+  python,
+}:
+
+let
+  # boring-sys expects the static libraries in build/ instead of lib/
+  boringssl-wrapper = runCommand "boringssl-wrapper" { } ''
+    mkdir $out
+    cd $out
+    ln -s ${boringssl.out}/lib build
+    ln -s ${boringssl.dev}/include include
+  '';
+in
+buildPythonPackage rec {
+  pname = "primp";
+  version = "0.6.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "deedy5";
+    repo = "primp";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-wCD99eEU4RW8kUJY72cXhJh5124PVd6kJt+HZjm/hFI=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-iY6TSc7GU6OWVUpW6qpwH4g9/eGKhP/YZ5PQoO8NmVc=";
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  # TODO: Can we improve this?
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
+    ${lib.getExe patchelf} --add-rpath ${lib.getLib gcc-unwrapped.lib} --add-needed libstdc++.so.6 $out/${python.sitePackages}/primp/primp.abi3.so
+  '';
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    SystemConfiguration
+  ];
+
+  env.BORING_BSSL_PATH = boringssl-wrapper;
+
+  optional-dependencies = {
+    dev = [ pytest ];
+  };
+
+  # Test use network
+  doCheck = false;
+
+  pythonImportsCheck = [ "primp" ];
+
+  meta = {
+    changelog = "https://github.com/deedy5/primp/releases/tag/${version}";
+    description = "PRIMP (Python Requests IMPersonate). The fastest python HTTP client that can impersonate web browsers.";
+    homepage = "https://github.com/deedy5/primp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 314f55047593..b10e37b9d461 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "progressbar2";
-  version = "4.4.2";
+  version = "4.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-P9ouDGBpNgCmWFp4TJ07xOHaxX6Z4TP4wPXIzz3zdKI=";
+    hash = "sha256-ZmLLYkiG7THrlNr2HidYO1FE68c4Ohe64Hb49PWQiPs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix
index c66dd4499ee4..caa4e679ea71 100644
--- a/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "prompt-toolkit";
-  version = "3.0.47";
+  version = "3.0.48";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "prompt_toolkit";
     inherit version;
-    hash = "sha256-Hhspy1gICx5p8gfIk6GnvxbRJ6XDDJ0Xolpdd3kuU2A=";
+    hash = "sha256-1mI6sEd6gN905ka9vJNiEUP1yvEEIGqikpTVPeGgPZA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 31b4a8f60f72..228f8140fbe6 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -3,6 +3,7 @@
   fetchPypi,
   lib,
   setuptools,
+  protobuf,
 }:
 
 buildPythonPackage rec {
@@ -17,6 +18,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  propagatedNativeBuildInputs = [
+    protobuf
+  ];
+
   # the pypi source archive does not ship tests
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index 4679e894e008..df174a125588 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "proxy-py";
-  version = "2.4.5";
+  version = "2.4.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "abhinavsingh";
     repo = "proxy.py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pn4YYGntG9C8mhECb7PYgN5wwicdlPcZu6Xn2M3iIKA=";
+    hash = "sha256-VQjK4wNOuUk3KhlvSlDbyclC+RUjeEIVvPN+bKq0fFc=";
   };
 
   postPatch = ''
@@ -62,6 +62,8 @@ buildPythonPackage rec {
     requests
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   preCheck = ''
     export HOME=$(mktemp -d);
   '';
@@ -77,6 +79,8 @@ buildPythonPackage rec {
     "test_gen_public_key"
     # Tests run into a timeout
     "integration"
+    # Crashes
+    "test_grout"
   ];
 
   pythonImportsCheck = [ "proxy" ];
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 7d7692018e80..3338ad86ce2e 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -35,13 +35,13 @@
 
 let
   pname = "psycopg";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Udysl00lB6rxmQByME6PI3KL4tlzIZ0/CZNWLVKssS8=";
+    hash = "sha256-vcUZvQeD5MnEM02phk73I9dpf0Eug95V7Rspi0s6S2M=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 136e9e800609..826e97b476c4 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20241023";
+  version = "1.0.2.20241102";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WQs4DJygcyOTzDZHlbjW+uZAna5oswDDk4NwgS/Vr1c=";
+    hash = "sha256-dNnGnAybp11y8WGSvXiP0MNFRmw5TQgnrVBQGqwsDSQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix
index 8b7c70dc79eb..ce5216428dd7 100644
--- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix
+++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pulsectl-asyncio";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "mhthies";
     repo = "pulsectl-asyncio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VmogNphVZNJSUKUqp7xADRl78Ooofhl1YYrtYz5MBYc=";
+    hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix
index ca59412c74d7..888ffca9a13d 100644
--- a/pkgs/development/python-modules/pulumi-aws/default.nix
+++ b/pkgs/development/python-modules/pulumi-aws/default.nix
@@ -13,9 +13,7 @@ buildPythonPackage rec {
   pname = "pulumi-aws";
   # Version is independant of pulumi's.
   version = "6.54.1";
-
   pyproject = true;
-  build-system = [ setuptools ];
 
   disabled = pythonOlder "3.8";
 
@@ -28,7 +26,9 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/sdk/python";
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     parver
     pulumi
     semver
diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix
index 7353649c5a56..1f835c0f9325 100644
--- a/pkgs/development/python-modules/pulumi/default.nix
+++ b/pkgs/development/python-modules/pulumi/default.nix
@@ -65,5 +65,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/pulumi/pulumi";
     license = licenses.asl20;
     maintainers = with maintainers; [ teto ];
+    # https://github.com/pulumi/pulumi/issues/16828
+    broken = versionAtLeast protobuf.version "5";
   };
 }
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 1731d2cd0730..e9237152d0a0 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "pvlib";
-  version = "0.11.0";
+  version = "0.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iLMcRNwH8ENa8eLV3crAZ+bOFZFyUanycDZvYem9AVs=";
+    hash = "sha256-0C29pRXyvlTv0uMoOVJ8D4Lp+ZAotGBWX6ytBorIV0o=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix
index 199011b934b1..0a7ad4b872cb 100644
--- a/pkgs/development/python-modules/py-aosmith/default.nix
+++ b/pkgs/development/python-modules/py-aosmith/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "py-aosmith";
-  version = "1.0.8";
+  version = "1.0.10";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "bdr99";
     repo = "py-aosmith";
     rev = "refs/tags/${version}";
-    hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28=";
+    hash = "sha256-6wgPj3e3nbv0LM4qgZsj70F4nKy9LmY3RCvs++n1KbE=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix
index 311d4fdac065..dd4837ed3cb9 100644
--- a/pkgs/development/python-modules/py-desmume/default.nix
+++ b/pkgs/development/python-modules/py-desmume/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "py-desmume";
-  version = "0.0.6";
+  version = "0.0.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "SkyTemple";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-AgUdILCqpmuVI3uMSdGl+lIfUVXnIo/egm/48FMRF3M=";
+    hash = "sha256-aH7f/BI89VLUGqwA8Y7ThSpmKxWffYRETT/+EjPVTg8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix
new file mode 100644
index 000000000000..7f983cf534c5
--- /dev/null
+++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  bleak-retry-connector,
+  bleak,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "py-improv-ble-client";
+  version = "1.0.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "py-improv-ble-client";
+    rev = "refs/tags/${version}";
+    hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools~=65.6" "setuptools" \
+      --replace-fail "wheel~=0.37.1" "wheel"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    bleak
+    bleak-retry-connector
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "improv_ble_client" ];
+
+  meta = {
+    description = "Module to provision devices which implement Improv via BLE";
+    homepage = "https://github.com/home-assistant-libs/py-improv-ble-client";
+    changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix
index 114c1814007d..3a7bb3244536 100644
--- a/pkgs/development/python-modules/py-opensonic/default.nix
+++ b/pkgs/development/python-modules/py-opensonic/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "py-opensonic";
-  version = "5.2.0";
+  version = "5.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "khers";
     repo = "py-opensonic";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8QhYzGZ9b2pyzhl5vyAWhjxtvF/vaEa6Qcw+RBGzkTQ=";
+    hash = "sha256-lVErs5f2LoCrMNr+f8Bm2Q6xQRNuisloqyRHchYTukk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/py3langid/default.nix b/pkgs/development/python-modules/py3langid/default.nix
index 248a3bfa2088..b4e001b20a24 100644
--- a/pkgs/development/python-modules/py3langid/default.nix
+++ b/pkgs/development/python-modules/py3langid/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "py3langid";
-  version = "0.2.2";
+  version = "0.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tN4B2tfnAfKdIWoJNeheCWzIZ1kD0j6oRFsrtfCQuW8=";
+    hash = "sha256-CodaAxpYqvnb2nu4KF/XXoAae9J2IW/6vgN5AdS0Sew=";
   };
 
   propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index d762008e2ff2..5090946a1268 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "py3status";
-  version = "3.58";
+  version = "3.59";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SJScEz9WsqB0jRAHmUHpmnAbuqnRnHUUgc1rDN0tScw=";
+    hash = "sha256-3m/34xfPpe8T4yicbTtQtTqfq5Zz2T0AZl8fCKRg/CE=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix
index 9b5b39489313..df3d22aaf0ca 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/pkgs/development/python-modules/pyaml/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pyaml";
-  version = "24.7.0";
+  version = "24.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XQ/fnmgQNvsmOng9Apj8OvWApuKmzxozFP/EjcPZHMs=";
+    hash = "sha256-543uiw1P7Va7n6EainhY5vreHscKmhIs7mc276w+abU=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 3a3ee228bcc8..bc9181ab54f0 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "pyannote-audio";
-  version = "3.3.0";
+  version = "3.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "pyannote";
     repo = "pyannote-audio";
     rev = "refs/tags/${version}";
-    hash = "sha256-AFBT6vpOgEIqEn778TWJ04gai7UOyfOeZdmtliYJLvs=";
+    hash = "sha256-85whRoc3JoDSE4DqivY/3hfvLHcvgsubR/DLCPtLEP0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix
index 7c7b4b360070..32f1a6b9736c 100644
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   setuptools,
   pyasn1,
   pytestCheckHook,
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyasn1-modules";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,9 +20,18 @@ buildPythonPackage rec {
     owner = "pyasn1";
     repo = "pyasn1-modules";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UJycVfj08+3zjHPji5Qlh3yqeS30dEwu1pyrN1yo1Vc=";
+    hash = "sha256-7tCmhADC8LuswonL4QQ01/DD0RzeRLFJrsU49On4fqY=";
   };
 
+  patches = [
+    # Stop using pyasn1.compat.octets, https://github.com/pyasn1/pyasn1-modules/pull/22
+    (fetchpatch {
+      name = "pyasn1-compat.patch";
+      url = "https://github.com/pyasn1/pyasn1-modules/commit/079c176eb00ed7352c9696efa12a0577beeecd71.patch";
+      hash = "sha256-k/7P0RnhK57BUFZFFBDyFvroFF9lhonNhD/XXNGoiMk=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ pyasn1 ];
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index 4c9f519fe28a..a12b1ff8bb55 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyasn1";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OjWrLEte+Y4X397IqwdARvvaduKBxacGzNgjKM/I9kw=";
+    hash = "sha256-b1gNK92ENlOAgwrPRVUPJRFGn2c8tKWuOFejFwEosDQ=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 3ffed8bd8acd..43432a2d1428 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -25,12 +25,13 @@
   srptools,
   stdenv,
   tabulate,
+  tinytag,
   zeroconf,
 }:
 
 buildPythonPackage rec {
   pname = "pyatv";
-  version = "0.15.1";
+  version = "0.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -39,7 +40,7 @@ buildPythonPackage rec {
     owner = "postlund";
     repo = "pyatv";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8ODhDuc4jaLtrLZYd1yJlpYygO6KaguyR/yLWb/rMR4=";
+    hash = "sha256-yjPbSTmHoKnVwNArZw5mGf3Eh4Ei1+DkY9y2XRRy4YA=";
   };
 
   postPatch = ''
@@ -77,6 +78,7 @@ buildPythonPackage rec {
     requests
     srptools
     tabulate
+    tinytag
     zeroconf
   ];
 
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 6972373eea32..5af9c6561a0d 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -1,33 +1,42 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pybase64";
-  version = "1.3.2";
-  format = "setuptools";
+  version = "1.4.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Mu+ZPFWCHayavXZ+5GVqUBOy7YvxElyruufoTSuZEDg=";
+  src = fetchFromGitHub {
+    owner = "mayeut";
+    repo = "pybase64";
+    rev = "refs/tags/v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I=";
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
   pythonImportsCheck = [ "pybase64" ];
 
-  meta = with lib; {
+  meta = {
     description = "Fast Base64 encoding/decoding";
     mainProgram = "pybase64";
     homepage = "https://github.com/mayeut/pybase64";
-    changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}";
-    license = licenses.bsd2;
+    changelog = "https://github.com/mayeut/pybase64/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 3d150e82a501..80db75b9551a 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "pybids";
-  version = "0.16.5";
+  version = "0.17.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5MAp5CYlOh1WxsXOE/LHVNm/K4VGFaLKWaaKYwKjQIM=";
+    hash = "sha256-4MpFXGh2uOHCjMa213CF6QzKCyEQNiN1moyNolEcySQ=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 750ee618f9d2..8c09e3ff61c6 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -50,14 +50,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pybind11";
-  version = "2.13.5";
+  version = "2.13.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
-    rev = "v${version}";
-    hash = "sha256-cpxhrTFihA+gWmX62a+EQF3lccUyvu+d1MU2IC/CN6Q=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 4f4859e007c3..6eac9f1b72d3 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pycairo";
-  version = "1.26.0";
+  version = "1.27.0";
 
   disabled = pythonOlder "3.6";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pygobject";
     repo = "pycairo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AUnMPsGFkCgVKUdQfym35ZqrA48wq31BNsvc2puoCl8=";
+    hash = "sha256-P9AC8+WlokAxoy6KTJqAz7kOYK/FQVjIKWuj8jQw2OA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix
index 631bebd566bf..78dc831ccc65 100644
--- a/pkgs/development/python-modules/pyclip/default.nix
+++ b/pkgs/development/python-modules/pyclip/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     mainProgram = "pyclip";
     homepage = "https://github.com/spyoungtech/pyclip";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mcaju ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix
index edde76cd28d8..d016c8bd7003 100644
--- a/pkgs/development/python-modules/pyclipper/default.nix
+++ b/pkgs/development/python-modules/pyclipper/default.nix
@@ -2,27 +2,26 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
+  setuptools,
   setuptools-scm,
   cython,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pyclipper";
-  version = "1.3.0.post5";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "1.3.0.post6";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fonttools";
-    repo = pname;
+    repo = "pyclipper";
     rev = "refs/tags/${version}";
-    hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q=";
+    hash = "sha256-s2D0ipDatAaF7A1RYOKyI31nkfc/WL3vHWsAMbo+WcY=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
+    setuptools
     setuptools-scm
     cython
   ];
diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix
index 97b7d7d48c8d..e40731c554f0 100644
--- a/pkgs/development/python-modules/pycookiecheat/default.nix
+++ b/pkgs/development/python-modules/pycookiecheat/default.nix
@@ -14,16 +14,16 @@
 
 buildPythonPackage rec {
   pname = "pycookiecheat";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "n8henrie";
     repo = "pycookiecheat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-x568e4M7fz93hq0y06Grz9GlrjGV38GxWd+PhNiAyBY=";
+    hash = "sha256-jOyTfh2ZhKW/pMU7T5tfxaM0l/g59N+mirnbc0FLPbQ=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index 67bbfa1c3d97..4372afb0efe1 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   unittestCheckHook,
   pythonOlder,
 }:
@@ -9,13 +10,15 @@
 buildPythonPackage rec {
   pname = "pycparser";
   version = "2.22";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ unittestCheckHook ];
   disabled = pythonOlder "3.8";
 
diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix
index a5bd2ee07467..e885e0895a28 100644
--- a/pkgs/development/python-modules/pycron/default.nix
+++ b/pkgs/development/python-modules/pycron/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  poetry-core,
   arrow,
   delorean,
   pendulum,
@@ -13,17 +13,17 @@
 
 buildPythonPackage rec {
   pname = "pycron";
-  version = "3.0.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kipe";
     repo = "pycron";
-    rev = version;
-    hash = "sha256-+67yU2o31SdgnV3CtiEkLHDltQYgosnqxEuO51rGE4o=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-t53u18lCk6tF4Hr/BrEM2gWG+QOFIEkjyEKNXIr3ibs=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     arrow
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 5f9334ebb1ee..2d18e7110a7b 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -4,30 +4,48 @@
   buildPythonPackage,
   isPyPy,
   fetchPypi,
+  fetchpatch,
   pythonOlder,
   curl,
   openssl,
   bottle,
   pytestCheckHook,
   flaky,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pycurl";
   version = "7.45.3";
-  format = "setuptools";
-  disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
+  pyproject = true;
+
+  disabled = isPyPy || pythonOlder "3.8"; # https://github.com/pycurl/pycurl/issues/208
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-jCRxr5B5rXmOFkXsCw09QiPbaHN50X3TanBjdEn4HWs=";
   };
 
+  patches = [
+    # Don't use -flat_namespace on macOS
+    # https://github.com/pycurl/pycurl/pull/855 remove on next update
+    (fetchpatch {
+      name = "no_flat_namespace.patch";
+      url = "https://github.com/pycurl/pycurl/commit/7deb85e24981e23258ea411dcc79ca9b527a297d.patch";
+      hash = "sha256-tk0PQy3cHyXxFnoVYNQV+KD/07i7AUYHNJnrw6H8tHk=";
+    })
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   preConfigure = ''
-    substituteInPlace setup.py --replace '--static-libs' '--libs'
+    substituteInPlace setup.py \
+      --replace-fail '--static-libs' '--libs'
     export PYCURL_SSL_LIBRARY=openssl
   '';
 
+  build-system = [ setuptools ];
+
   buildInputs = [
     curl
     openssl
@@ -35,12 +53,10 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ curl ];
 
-  __darwinAllowLocalNetworking = true;
-
   nativeCheckInputs = [
     bottle
-    pytestCheckHook
     flaky
+    pytestCheckHook
   ];
 
   pytestFlagsArray = [
@@ -52,6 +68,8 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
+  pythonImportsCheck = [ "pycurl" ];
+
   disabledTests =
     [
       # tests that require network access
@@ -76,6 +94,10 @@ buildPythonPackage rec {
       "test_request_with_verifypeer"
       # https://github.com/pycurl/pycurl/issues/836
       "test_proxy_tlsauth"
+      # AssertionError: 'Москва' != '\n...
+      "test_encoded_unicode_header"
+      # https://github.com/pycurl/pycurl/issues/856
+      "test_multi_info_read"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
       # Fatal Python error: Segmentation fault
@@ -83,8 +105,12 @@ buildPythonPackage rec {
     ];
 
   meta = with lib; {
-    homepage = "http://pycurl.io/";
     description = "Python Interface To The cURL library";
+    homepage = "http://pycurl.io/";
+    changelog =
+      "https://github.com/pycurl/pycurl/blob/REL_"
+      + replaceStrings [ "." ] [ "_" ] version
+      + "/ChangeLog";
     license = with licenses; [
       lgpl2Only
       mit
diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index 77d339525878..716d9584b0d6 100644
--- a/pkgs/development/python-modules/pydantic-core/default.nix
+++ b/pkgs/development/python-modules/pydantic-core/default.nix
@@ -18,14 +18,14 @@
 let
   pydantic-core = buildPythonPackage rec {
     pname = "pydantic-core";
-    version = "2.20.1";
+    version = "2.23.4";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "pydantic";
       repo = "pydantic-core";
       rev = "refs/tags/v${version}";
-      hash = "sha256-iFyCFkFzvTL6es3L96pyq/s6SS7h1mn+bS0SPcsxXxA=";
+      hash = "sha256-WSSwiqmdQN4zB7fqaniHyh4SHmrGeDHdCGpiSJZT7Mg=";
     };
 
     patches = [ ./01-remove-benchmark-flags.patch ];
@@ -33,7 +33,7 @@ let
     cargoDeps = rustPlatform.fetchCargoTarball {
       inherit src;
       name = "${pname}-${version}";
-      hash = "sha256-4v4g9/8ZsQUqkwA29/S/BXn2Ea4eSOnMhEbhDvsGuQU=";
+      hash = "sha256-dX3wDnKQLmC+FabC0van3czkQLRcrBbtp9b90PgepZs=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix
index b9da2b299ecf..588ed7b5312e 100644
--- a/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
@@ -46,6 +47,14 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all;
 
+  disabledTests = [
+    # outdated jsonschema fixture
+    "test_json_schema"
+  ];
+
+  # PermissionError accessing '/etc/localtime'
+  disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_pendulum_dt.py" ];
+
   meta = with lib; {
     changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.rev}/HISTORY.md";
     description = "Extra Pydantic types";
diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix
index 86dd243ac6ae..6c17b126a805 100644
--- a/pkgs/development/python-modules/pydantic-settings/default.nix
+++ b/pkgs/development/python-modules/pydantic-settings/default.nix
@@ -14,7 +14,7 @@
 let
   self = buildPythonPackage rec {
     pname = "pydantic-settings";
-    version = "2.3.4";
+    version = "2.5.2";
     pyproject = true;
 
     disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ let
       owner = "pydantic";
       repo = "pydantic-settings";
       rev = "refs/tags/v${version}";
-      hash = "sha256-tLF7LvsXryhbThaNl6koM0bGM8EOaA+aH2fGqzR8GKE=";
+      hash = "sha256-VkvkF7tJfFknYCXz7tq1578ebW79Ovx1tOFO8o8wK/I=";
     };
 
     build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 5ee65602794b..9e008f9565e1 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -20,6 +20,7 @@
   cloudpickle,
   email-validator,
   dirty-equals,
+  jsonschema,
   pytestCheckHook,
   pytest-mock,
   eval-type-backport,
@@ -28,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "pydantic";
-  version = "2.8.2";
+  version = "2.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +38,7 @@ buildPythonPackage rec {
     owner = "pydantic";
     repo = "pydantic";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9Tbm5Y1wSPa3lTdI8y95csYHua7nKUIYAfxSn+3J5zI=";
+    hash = "sha256-Eb/9k9bNizRyGhjbW/LAE/2R0Ino4DIRDy5ZrQuzJ7o=";
   };
 
   buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
@@ -61,6 +62,7 @@ buildPythonPackage rec {
     [
       cloudpickle
       dirty-equals
+      jsonschema
       pytest-mock
       pytestCheckHook
       rich
diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
new file mode 100644
index 000000000000..6fabf92f5f84
--- /dev/null
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  mock,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  zeroconf,
+}:
+
+buildPythonPackage rec {
+  pname = "pydeako";
+  version = "0.5.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "DeakoLights";
+    repo = "pydeako";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ zeroconf ];
+
+  # Module has no tests
+  #doCheck = false;
+
+  nativeCheckInputs = [
+    mock
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pydeako" ];
+
+  meta = {
+    description = "Module used to discover and communicate with Deako devices over the network locally";
+    homepage = "https://github.com/DeakoLights/pydeako";
+    changelog = "https://github.com/DeakoLights/pydeako/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix
index 996fce70df66..29a250160add 100644
--- a/pkgs/development/python-modules/pydexcom/default.nix
+++ b/pkgs/development/python-modules/pydexcom/default.nix
@@ -2,32 +2,32 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatch-vcs,
+  hatchling,
   pythonOlder,
   requests,
-  setuptools,
-  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "pydexcom";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "gagebenne";
     repo = "pydexcom";
     rev = "refs/tags/${version}";
-    hash = "sha256-gMUdVdO2Yy41Nl+mn9dEegb6/IRBwoBviPhuz3CMfS8=";
+    hash = "sha256-cf3AhqaA5aij2NCeFqruoeE0ovJSgZgEnVHcE3iXJ1s=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
+  build-system = [
+    hatchling
+    hatch-vcs
   ];
 
-  propagatedBuildInputs = [ requests ];
+  dependencies = [ requests ];
 
   # Tests are interacting with the Dexcom API
   doCheck = false;
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Python API to interact with Dexcom Share service";
     homepage = "https://github.com/gagebenne/pydexcom";
     changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pydicom-seg/default.nix b/pkgs/development/python-modules/pydicom-seg/default.nix
index 9f06d7b44dd0..35dd22e94538 100644
--- a/pkgs/development/python-modules/pydicom-seg/default.nix
+++ b/pkgs/development/python-modules/pydicom-seg/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   pythonOlder,
-  pytestCheckHook,
+  pytest7CheckHook,
   poetry-core,
   jsonschema,
   numpy,
@@ -15,7 +15,7 @@
 buildPythonPackage rec {
   pname = "pydicom-seg";
   version = "0.4.1";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -38,18 +38,16 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "jsonschema" ];
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jsonschema
     numpy
     pydicom
     simpleitk
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest7CheckHook ];
 
   pythonImportsCheck = [ "pydicom_seg" ];
 
diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix
index a360b48083ea..a72dcdefabb8 100644
--- a/pkgs/development/python-modules/pydrive2/default.nix
+++ b/pkgs/development/python-modules/pydrive2/default.nix
@@ -17,23 +17,22 @@
 
 buildPythonPackage rec {
   pname = "pydrive2";
-  version = "1.19.0";
+  version = "1.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    pname = "PyDrive2";
-    inherit version;
-    hash = "sha256-Ia6n2idjXCw/cFDgICBhkfOwMFxlUDFebo491Sb4tTE=";
+    inherit pname version;
+    hash = "sha256-Foum622DybCC8FvIy5Xuk85iOJ2ztVn/DnabW7iysQo=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     google-api-python-client
     oauth2client
     pyopenssl
diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix
index d74657c16784..c7351b52fb52 100644
--- a/pkgs/development/python-modules/pydsdl/default.nix
+++ b/pkgs/development/python-modules/pydsdl/default.nix
@@ -2,33 +2,35 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pydsdl";
-  version = "1.18.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "1.22.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OpenCyphal";
-    repo = pname;
+    repo = "pydsdl";
     rev = "refs/tags/${version}";
-    hash = "sha256-sn7KoJmJbr7Y+N9PAXyhJnts/hW+Gi06nrHj5VIDZMU=";
+    hash = "sha256-Q6Zt7qiFZvTK2pF4nWfHbjwQHZffzKOad6X/HQ94EUo=";
   };
 
+  build-system = [ setuptools ];
+
   # allow for writable directory for darwin
   preBuild = ''
     export HOME=$TMPDIR
   '';
 
-  # Module doesn't contain tests
-  doCheck = false;
-
   pythonImportsCheck = [ "pydsdl" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "pydsdl/_test.py" ];
+
   meta = with lib; {
     description = "Library to process Cyphal DSDL";
     longDescription = ''
diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix
index 84167f4ae58d..1e2489afa191 100644
--- a/pkgs/development/python-modules/pyenvisalink/default.nix
+++ b/pkgs/development/python-modules/pyenvisalink/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyenvisalink";
-  version = "4.7";
+  version = "4.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b5v/7+B/yyCnKrWCs0scAuIgV1wSLk6cVa57n+HncUw=";
+    hash = "sha256-IgYOlH0mYqhRLTO3McBAstChqYWHQkwuOVPL8gKdcTo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index fa555cff881b..e353a3ceadae 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.41";
+  version = "0.2.54";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-QwMD7V1BSmFBZ7mazo7TnuZijm8MC/M/oKMV4nh1v5A=";
+    hash = "sha256-TJ2cjYadXqaX31UXY99/pCeH0T2nFj83AiLdX0SMC3U=";
   };
 
   build-system = [ setuptools ];
@@ -35,8 +35,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library to fetch the most recent exploit-database";
-    homepage = "https://github.com/GoVanguard/pyExploitDb";
-    changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md";
+    homepage = "https://github.com/Hackman238/pyExploitDb";
+    changelog = "https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 0486b2b7f665..1bfef336848b 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pyfakefs";
-  version = "5.5.0";
+  version = "5.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dEiqoHFC+JLQpOtSpe0yBqnwLGWZ5obNl9YkwYl5wVQ=";
+    hash = "sha256-elSbMoZaqX2LplOChak4FpQdm3NZvilUrGDsNrJ36Hk=";
   };
 
   postPatch =
diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix
index 1ce5d605f020..ec974f24f6e9 100644
--- a/pkgs/development/python-modules/pyfibaro/default.nix
+++ b/pkgs/development/python-modules/pyfibaro/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyfibaro";
-  version = "0.7.8";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rappenze";
     repo = "pyfibaro";
     rev = "refs/tags/${version}";
-    hash = "sha256-gid+qbl4RgT47zC5i1Usw2Zco+jb2LJeeMkKvni/aDM=";
+    hash = "sha256-7hn5iFuN86sdqLi5MIEwBYLYbPg7J1BbADHYdjYBCNA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index 4dd6aa9b6dd6..93bfb7a8ec36 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   stdenv,
+  setuptools,
   boost,
   freetype,
   ftgl,
@@ -12,29 +13,30 @@
 }:
 
 let
-
   pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
 in
-
 buildPythonPackage rec {
   pname = "pyftgl";
   version = "0.4b";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "umlaeute";
-    repo = "${pname}-${version}";
-    rev = version;
-    sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
+    repo = "pyftgl";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-mbzXpIPMNe6wfwaAAw/Ri8xaW6Z6kuNUhFFyzsiW7Is=";
   };
 
-  postPatch = ''
-    sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py
-  '';
+  build-system = [ setuptools ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_COMPILE = "-L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries";
-  };
+  postPatch =
+    ''
+      substituteInPlace setup.py \
+        --replace-fail boost_python boost_python${pythonVersion}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
+    '';
 
   buildInputs = [
     boost
@@ -44,8 +46,8 @@ buildPythonPackage rec {
     libGL
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python bindings for FTGL (FreeType for OpenGL)";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix
index 5f5ba161f5e7..d3a4dcfac3ed 100644
--- a/pkgs/development/python-modules/pyfxa/default.nix
+++ b/pkgs/development/python-modules/pyfxa/default.nix
@@ -12,24 +12,23 @@
   pythonOlder,
   requests,
   responses,
-  setuptools,
-  six,
+  hatchling,
+  parameterized,
 }:
 
 buildPythonPackage rec {
   pname = "pyfxa";
-  version = "0.7.8";
+  version = "0.7.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "PyFxA";
-    inherit version;
-    hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4=";
+    inherit pname version;
+    hash = "sha256-dTsWFWaqX6YypNJz9WSlcxJlYOstmTu2ZgOG3RPSViw=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     cryptography
@@ -37,8 +36,6 @@ buildPythonPackage rec {
     pybrowserid
     pyjwt
     requests
-    setuptools # imports pkg_resources
-    six
   ];
 
   nativeCheckInputs = [
@@ -46,6 +43,7 @@ buildPythonPackage rec {
     mock
     responses
     pytestCheckHook
+    parameterized
   ];
 
   pythonImportsCheck = [ "fxa" ];
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index 7f7c72eb518d..2eef6797cbf5 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pythonOlder,
 
   # build-system
   setuptools,
@@ -20,22 +21,24 @@
 
 buildPythonPackage rec {
   pname = "pygal";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bF2jPxBB6LMMvJgPijSRDZ7cWEuDMkApj2ol32VCUok=";
+    hash = "sha256-wKDzTlvBwBl1wr+4NCrVIeKTrULlJWmd0AxNelLBS3E=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace pytest-runner ""
+      --replace-fail pytest-runner ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ importlib-metadata ];
+  dependencies = [ importlib-metadata ];
 
   optional-dependencies = {
     lxml = [ lxml ];
@@ -45,7 +48,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pyquery
     pytestCheckHook
-  ] ++ optional-dependencies.png;
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     # necessary on darwin to pass the testsuite
@@ -53,12 +56,12 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    description = "Module for dynamic SVG charting";
+    homepage = "http://www.pygal.org";
     changelog = "https://github.com/Kozea/pygal/blob/${version}/docs/changelog.rst";
     downloadPage = "https://github.com/Kozea/pygal";
-    description = "Sexy and simple python charting";
-    mainProgram = "pygal_gen.py";
-    homepage = "http://www.pygal.org";
     license = licenses.lgpl3Plus;
     maintainers = [ ];
+    mainProgram = "pygal_gen.py";
   };
 }
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 5c9e2432c822..80c0d153b72d 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -24,11 +24,13 @@
   SDL2_mixer,
   SDL2_ttf,
   numpy,
+
+  pygame-gui,
 }:
 
 buildPythonPackage rec {
   pname = "pygame-ce";
-  version = "2.5.1";
+  version = "2.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +39,7 @@ buildPythonPackage rec {
     owner = "pygame-community";
     repo = "pygame-ce";
     rev = "refs/tags/${version}";
-    hash = "sha256-bt/6ukXZU79CWFqov9JON9ktQ/c4NKLxhX4Jif3Enxs=";
+    hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY=";
     # Unicode file cause different checksums on HFS+ vs. other filesystems
     postFetch = "rm -rf $out/docs/reST";
   };
@@ -67,10 +69,10 @@ buildPythonPackage rec {
     ''
       # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
       substituteInPlace pyproject.toml \
-        --replace-fail '"cython<=3.0.10",' '"cython",' \
-        --replace-fail '"meson<=1.5.0",' '"meson",' \
-        --replace-fail '"sphinx<=7.2.6",' "" \
-        --replace-fail '"ninja<=1.11.1.1",' ""
+        --replace-fail '"meson<=1.5.1",' '"meson",' \
+        --replace-fail '"ninja<=1.11.1.1",' "" \
+        --replace-fail '"cython<=3.0.11",' '"cython",' \
+        --replace-fail '"sphinx<=7.2.6",' ""
       substituteInPlace buildconfig/config_{unix,darwin}.py \
         --replace-fail 'from distutils' 'from setuptools._distutils'
       substituteInPlace src_py/sysfont.py \
@@ -151,12 +153,16 @@ buildPythonPackage rec {
     "pygame.version"
   ];
 
-  meta = with lib; {
+  passthru.tests = {
+    inherit pygame-gui;
+  };
+
+  meta = {
     description = "Pygame Community Edition (CE) - library for multimedia application built on SDL";
     homepage = "https://pyga.me/";
     changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ pbsds ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.pbsds ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 5906a6f9a9cb..6c8261a06b3a 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  stdenv,
   buildPythonPackage,
   nix-update-script,
   fetchFromGitHub,
@@ -53,6 +54,11 @@ buildPythonPackage rec {
     "test_process_event_text_ctrl_v_select_range"
     "test_process_event_text_ctrl_a"
     "test_process_event_text_ctrl_x"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails to determine "/" as an existing path
+    # https://github.com/MyreMylar/pygame_gui/issues/644
+    "test_process_event"
   ];
 
   disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ];
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 94efd4227e2e..4c035988ae4b 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "pygame";
-  version = "2.5.2";
+  version = "2.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The documentation
     # has such files and will be removed.
-    hash = "sha256-+gRv3Rim+2aL2uhPPGfVD0QDgB013lTf6wPx8rOwgXg=";
+    hash = "sha256-wNXcmH0IIuAOoomIdmhAPxe4TiEzes3Kq+Vth2r4/IA=";
     postFetch = "rm -rf $out/docs/reST";
   };
 
@@ -65,15 +65,9 @@ buildPythonPackage rec {
         ]) buildInputs
       );
     })
-    # Skip tests that should be disabled without video driver
-    ./skip-surface-tests.patch
 
-    # removes distutils unbreaking py312, part of https://github.com/pygame/pygame/pull/4211
-    (fetchpatch {
-      name = "remove-distutils.patch";
-      url = "https://github.com/pygame/pygame/commit/6038e7d6583a7a25fcc6e15387cf6240e427e5a7.patch";
-      hash = "sha256-HxcYjjhsu/Y9HiK9xDvY4X5dgWPP4XFLxdYGXC6tdWM=";
-    })
+    # mixer queue test returns busy queue when it shouldn't
+    ./skip-mixer-test.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pygame/skip-mixer-test.patch b/pkgs/development/python-modules/pygame/skip-mixer-test.patch
new file mode 100644
index 000000000000..3a316ca41c50
--- /dev/null
+++ b/pkgs/development/python-modules/pygame/skip-mixer-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/mixer_test.py b/test/mixer_test.py
+index 0b11c5a3..2d5b2cd5 100644
+--- a/test/mixer_test.py
++++ b/test/mixer_test.py
+@@ -809,6 +809,7 @@ class ChannelTypeTest(unittest.TestCase):
+         with self.assertRaisesRegex(pygame.error, "mixer not initialized"):
+             channel.unpause()
+ 
++    @unittest.skip("call to get_busy() returns true")
+     def test_queue(self):
+         """
+         Ensure the Channel.queue() works correctly
diff --git a/pkgs/development/python-modules/pygame/skip-surface-tests.patch b/pkgs/development/python-modules/pygame/skip-surface-tests.patch
deleted file mode 100644
index 21d9c9060f3b..000000000000
--- a/pkgs/development/python-modules/pygame/skip-surface-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/test/surface_test.py b/test/surface_test.py
-index 5ce78b6e..8b8f7ed5 100644
---- a/test/surface_test.py
-+++ b/test/surface_test.py
-@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(
-+        os.environ.get("SDL_VIDEODRIVER") == "dummy",
-+        'requires a non-"dummy" SDL_VIDEODRIVER',
-+    )
-     def test_convert_init(self):
-         """Ensure initialization exceptions are raised
-         for surf.convert()."""
-@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(
-+        os.environ.get("SDL_VIDEODRIVER") == "dummy",
-+        'requires a non-"dummy" SDL_VIDEODRIVER',
-+    )
-     def test_convert_alpha_init(self):
-         """Ensure initialization exceptions are raised
-         for surf.convert_alpha()."""
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index db08e6efe974..f9310c711e5f 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.15.0";
+  version = "1.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pjVSX/x0EoZp3i9jRgqUydVgljSkh1wKr85RD97sF6w=";
+    hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI=";
   };
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix
index 2afcae3d3bb4..48831497a082 100644
--- a/pkgs/development/python-modules/pyglm/default.nix
+++ b/pkgs/development/python-modules/pyglm/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyglm";
-  version = "2.7.1-rev1";
+  version = "2.7.2-rev1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Zuzu-Typ";
     repo = "PyGLM";
     rev = "refs/tags/${version}";
-    hash = "sha256-MA/NoeKv6yxXL9A36SBqU7GNuPbCKDvxpOkWP8OmED4=";
+    hash = "sha256-vQ4g2bBr6xV36DYrszcJnaJ8lj1uD1KyUblSL4u+U/E=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix
index 11bd26ee9531..634788bdf9a1 100644
--- a/pkgs/development/python-modules/pygmars/default.nix
+++ b/pkgs/development/python-modules/pygmars/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "pygmars";
-  version = "0.8.1";
+  version = "0.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "pygmars";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA=";
+    hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU=";
   };
 
   dontConfigure = true;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python lexing and parsing library";
     homepage = "https://github.com/nexB/pygmars";
-    changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}";
+    changelog = "https://github.com/aboutcode-org/pygmars/blob/v${version}/CHANGELOG.rst";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index 73960fec7b17..7bba01e4e44e 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   pythonOlder,
   buildPythonPackage,
   fetchFromGitHub,
@@ -19,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pygmt";
-  version = "0.11.0";
+  version = "0.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,12 +27,12 @@ buildPythonPackage rec {
     owner = "GenericMappingTools";
     repo = "pygmt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DbewB/lP44bpNSQ4ht7n0coS2Ml7qmEU4CP91p5YtZg=";
+    hash = "sha256-DO9KUlmt5EV+ioOSQ/BOcx4pP409f94dzmFwqK2MwMY=";
   };
 
   postPatch = ''
     substituteInPlace pygmt/clib/loading.py \
-      --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")"
+      --replace-fail "env.get(\"GMT_LIBRARY_PATH\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")"
   '';
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix
index d4a9b4f81036..90e0bb9ba185 100644
--- a/pkgs/development/python-modules/pygobject-stubs/default.nix
+++ b/pkgs/development/python-modules/pygobject-stubs/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pygobject-stubs";
-  version = "2.11.0";
+  version = "2.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "pygobject";
     repo = "pygobject-stubs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HOAG5c0fjF6RzULc1IDk7hRSlKTqtdXEM6acyJeV0DE=";
+    hash = "sha256-Y9tqfv2DP2daxxafcQAtxH33pR3FHE8av0PkzEcs0RU=";
   };
 
   build-system = [ setuptools ];
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "PEP 561 Typing Stubs for PyGObject";
     homepage = "https://github.com/pygobject/pygobject-stubs";
-    changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/pygobject/pygobject-stubs/blob/v${version}/CHANGELOG.md";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ hacker1024 ];
   };
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 1f4592c7ddcf..88dfb1e1abb3 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -18,20 +18,20 @@
 
 buildPythonPackage rec {
   pname = "pygobject";
-  version = "3.48.2";
+  version = "3.50.0";
 
   outputs = [
     "out"
     "dev"
   ];
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-B5SutKm+MaCSrCBiG19U7CgPkYWUPTKLEFza5imK0ac=";
+    hash = "sha256-jYNudbWogdRX7hYiyuSjK826KKC6ViGTrbO7tHJHIhI=";
   };
 
   depsBuildBuild = [ pkg-config ];
diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix
index a2d4a41c80ae..8ef39af5c314 100644
--- a/pkgs/development/python-modules/pygtail/default.nix
+++ b/pkgs/development/python-modules/pygtail/default.nix
@@ -2,25 +2,27 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pygtail";
-  version = "0.8.0";
-  format = "setuptools";
+  version = "0.14.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bgreenlee";
-    repo = pname;
+    repo = "pygtail";
     rev = version;
-    sha256 = "1f8qlijiwn10jxg1bsi6q42fznbg8rw039yaxfh6rzbaj2gaxbz1";
+    hash = "sha256-TlXTlxeGDd+elGpMjxcJCmRuJmp5k9xj6MrViRzcST4=";
   };
 
-  # remove at next bump, tag is one commit early for 0.8.0
-  postPatch = ''
-    substituteInPlace pygtail/core.py \
-      --replace 0.7.0 0.8.0
-  '';
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "pygtail" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Library for reading log file lines that have not been read";
diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
index 7161ad2fcfb6..ade8cac689ea 100644
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyhepmc";
-  version = "2.13.2";
+  version = "2.13.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "scikit-hep";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-M18Bq6WrAINpgPx5+uh8dufPBxIklRHpbBWUYMC8v10=";
+    hash = "sha256-86LDk0G9ckbV+/pNtLJa9EsA6plxerKI3ygxq680IKo=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix
index 72b4c432de08..48726ee97260 100644
--- a/pkgs/development/python-modules/pyhomeworks/default.nix
+++ b/pkgs/development/python-modules/pyhomeworks/default.nix
@@ -20,7 +20,8 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools~=69.2.0" "setuptools"
+      --replace-fail "setuptools~=69.2.0" "setuptools" \
+      --replace-fail ', "wheel~=0.43.0"' ""
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
index c3bfee647617..92900abd88f1 100644
--- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller-hooks-contrib";
-  version = "2024.8";
+  version = "2024.9";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyinstaller_hooks_contrib";
     inherit version;
-    hash = "sha256-KbaNh4q3OelnBVtWqT65tY5SnVsFT7q3ovK6z4DO8+I=";
+    hash = "sha256-R5OGnzcNHcSAbBAe/SiQ48PnA0Z9jSe7Wj2wBev7AI0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix
index c7b770f1b418..b76b5bc2440a 100644
--- a/pkgs/development/python-modules/pyinstaller/default.nix
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -1,36 +1,40 @@
 {
-  lib
-, buildPythonPackage
-, fetchPypi
-, setuptools
-, zlib
-, altgraph
-, packaging
-, pyinstaller-hooks-contrib
-, testers
-, pyinstaller
-, glibc
-, binutils
-, macholib
-, installShellFiles
-, stdenv
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # native dependencies
+  zlib,
+
+  # dependencies
+  altgraph,
+  macholib,
+  packaging,
+  pyinstaller-hooks-contrib,
+
+  # tests
+  binutils,
+  glibc,
+  pyinstaller,
+  testers,
 }:
 
 buildPythonPackage rec {
   pname = "pyinstaller";
-  version = "6.9.0";
+  version = "6.11.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9KdcVS+swuKjcPHkIrlxteXNtAWP84zqAjWqIfwLN48=";
+    hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8=";
   };
 
-
   build-system = [ setuptools ];
 
-  nativeBuildInputs = [ installShellFiles ];
-
   buildInputs = [ zlib.dev ];
 
   dependencies = [
@@ -41,13 +45,15 @@ buildPythonPackage rec {
   ];
 
   makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
-    "--prefix" "PATH" ":"  (lib.makeBinPath [ glibc binutils ])
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      glibc
+      binutils
+    ])
   ];
 
-  postInstall = ''
-    installManPage doc/pyinstaller.1 doc/pyi-makespec.1
-  '';
-
   pythonImportsCheck = [ "PyInstaller" ];
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/development/python-modules/pylance/Cargo.lock b/pkgs/development/python-modules/pylance/Cargo.lock
index 781104da1ac5..b0871f8c68c4 100644
--- a/pkgs/development/python-modules/pylance/Cargo.lock
+++ b/pkgs/development/python-modules/pylance/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "arc-swap"
@@ -90,9 +90,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -150,7 +150,7 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "half",
- "hashbrown",
+ "hashbrown 0.14.5",
  "num",
 ]
 
@@ -347,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
 dependencies = [
  "bzip2",
  "flate2",
@@ -467,7 +467,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -504,13 +504,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -536,15 +536,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.6"
+version = "1.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc"
+checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -609,9 +609,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-dynamodb"
-version = "1.45.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f"
+checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -632,9 +632,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.42.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e"
+checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -654,9 +654,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.43.0"
+version = "1.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364"
+checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -676,9 +676,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.42.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce"
+checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -816,9 +816,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.6"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605"
+checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b"
 dependencies = [
  "base64-simd",
  "bytes",
@@ -1024,9 +1024,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "bytes-utils"
@@ -1092,9 +1092,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
 dependencies = [
  "jobserver",
  "libc",
@@ -1332,7 +1332,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -1340,9 +1354,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e"
+checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb"
 dependencies = [
  "ahash",
  "arrow",
@@ -1354,24 +1368,26 @@ dependencies = [
  "bytes",
  "bzip2",
  "chrono",
- "dashmap",
+ "dashmap 6.1.0",
+ "datafusion-catalog",
  "datafusion-common",
  "datafusion-common-runtime",
  "datafusion-execution",
  "datafusion-expr",
  "datafusion-functions",
  "datafusion-functions-aggregate",
- "datafusion-functions-array",
+ "datafusion-functions-nested",
  "datafusion-optimizer",
  "datafusion-physical-expr",
  "datafusion-physical-expr-common",
+ "datafusion-physical-optimizer",
  "datafusion-physical-plan",
  "datafusion-sql",
  "flate2",
  "futures",
  "glob",
  "half",
- "hashbrown",
+ "hashbrown 0.14.5",
  "indexmap",
  "itertools 0.12.1",
  "log",
@@ -1393,10 +1409,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "datafusion-common"
-version = "40.0.0"
+name = "datafusion-catalog"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367"
+checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529"
+dependencies = [
+ "arrow-schema",
+ "async-trait",
+ "datafusion-common",
+ "datafusion-execution",
+ "datafusion-expr",
+ "datafusion-physical-plan",
+]
+
+[[package]]
+name = "datafusion-common"
+version = "41.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c"
 dependencies = [
  "ahash",
  "arrow",
@@ -1405,7 +1435,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "hashbrown",
+ "hashbrown 0.14.5",
  "instant",
  "libc",
  "num_cpus",
@@ -1416,26 +1446,26 @@ dependencies = [
 
 [[package]]
 name = "datafusion-common-runtime"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352"
+checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1"
 dependencies = [
  "tokio",
 ]
 
 [[package]]
 name = "datafusion-execution"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e"
+checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1"
 dependencies = [
  "arrow",
  "chrono",
- "dashmap",
+ "dashmap 6.1.0",
  "datafusion-common",
  "datafusion-expr",
  "futures",
- "hashbrown",
+ "hashbrown 0.14.5",
  "log",
  "object_store",
  "parking_lot",
@@ -1446,9 +1476,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-expr"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68"
+checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2"
 dependencies = [
  "ahash",
  "arrow",
@@ -1465,11 +1495,12 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f"
+checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb"
 dependencies = [
  "arrow",
+ "arrow-buffer",
  "base64 0.22.1",
  "blake2",
  "blake3",
@@ -1477,7 +1508,7 @@ dependencies = [
  "datafusion-common",
  "datafusion-execution",
  "datafusion-expr",
- "hashbrown",
+ "hashbrown 0.14.5",
  "hex",
  "itertools 0.12.1",
  "log",
@@ -1491,9 +1522,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-aggregate"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77"
+checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb"
 dependencies = [
  "ahash",
  "arrow",
@@ -1508,10 +1539,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "datafusion-functions-array"
-version = "40.0.0"
+name = "datafusion-functions-nested"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831"
+checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1526,13 +1557,14 @@ dependencies = [
  "itertools 0.12.1",
  "log",
  "paste",
+ "rand",
 ]
 
 [[package]]
 name = "datafusion-optimizer"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3"
+checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1540,7 +1572,7 @@ dependencies = [
  "datafusion-common",
  "datafusion-expr",
  "datafusion-physical-expr",
- "hashbrown",
+ "hashbrown 0.14.5",
  "indexmap",
  "itertools 0.12.1",
  "log",
@@ -1550,9 +1582,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-expr"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5"
+checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4"
 dependencies = [
  "ahash",
  "arrow",
@@ -1568,7 +1600,7 @@ dependencies = [
  "datafusion-expr",
  "datafusion-physical-expr-common",
  "half",
- "hashbrown",
+ "hashbrown 0.14.5",
  "hex",
  "indexmap",
  "itertools 0.12.1",
@@ -1580,23 +1612,35 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-expr-common"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536"
+checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6"
 dependencies = [
  "ahash",
  "arrow",
  "datafusion-common",
  "datafusion-expr",
- "hashbrown",
+ "hashbrown 0.14.5",
  "rand",
 ]
 
 [[package]]
-name = "datafusion-physical-plan"
-version = "40.0.0"
+name = "datafusion-physical-optimizer"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a"
+checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0"
+dependencies = [
+ "datafusion-common",
+ "datafusion-execution",
+ "datafusion-physical-expr",
+ "datafusion-physical-plan",
+]
+
+[[package]]
+name = "datafusion-physical-plan"
+version = "41.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe"
 dependencies = [
  "ahash",
  "arrow",
@@ -1615,7 +1659,7 @@ dependencies = [
  "datafusion-physical-expr-common",
  "futures",
  "half",
- "hashbrown",
+ "hashbrown 0.14.5",
  "indexmap",
  "itertools 0.12.1",
  "log",
@@ -1628,9 +1672,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-sql"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889"
+checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1645,9 +1689,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion-substrait"
-version = "40.0.0"
+version = "41.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434e52fbff22e6e04e6c787f603a6aba4961a7e249a29c743c5d4f609ec2dcef"
+checksum = "bf0a0055aa98246c79f98f0d03df11f16cb7adc87818d02d4413e3f3cdadbbee"
 dependencies = [
  "arrow-buffer",
  "async-recursion",
@@ -1874,9 +1918,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1909,7 +1953,7 @@ dependencies = [
 
 [[package]]
 name = "fsst"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "rand",
 ]
@@ -1922,9 +1966,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1937,9 +1981,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1947,15 +1991,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1964,9 +2008,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -1998,32 +2042,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2062,9 +2106,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -2143,6 +2187,12 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2266,9 +2316,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2352,7 +2402,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
@@ -2362,9 +2412,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2375,7 +2425,6 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -2391,9 +2440,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2424,12 +2473,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -2475,9 +2524,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
@@ -2561,7 +2610,7 @@ dependencies = [
 
 [[package]]
 name = "lance"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-arith",
@@ -2579,7 +2628,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "datafusion",
  "datafusion-functions",
  "datafusion-physical-expr",
@@ -2619,7 +2668,7 @@ dependencies = [
 
 [[package]]
 name = "lance-arrow"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -2635,7 +2684,7 @@ dependencies = [
 
 [[package]]
 name = "lance-core"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -2671,7 +2720,7 @@ dependencies = [
 
 [[package]]
 name = "lance-datafusion"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -2697,7 +2746,7 @@ dependencies = [
 
 [[package]]
 name = "lance-datagen"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -2712,8 +2761,9 @@ dependencies = [
 
 [[package]]
 name = "lance-encoding"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
+ "arrayref",
  "arrow",
  "arrow-arith",
  "arrow-array",
@@ -2722,6 +2772,7 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "arrow-select",
+ "bytemuck",
  "bytes",
  "fsst",
  "futures",
@@ -2732,10 +2783,12 @@ dependencies = [
  "lance-core",
  "log",
  "num-traits",
+ "paste",
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-types 0.12.6",
  "rand",
+ "seq-macro",
  "snafu",
  "tokio",
  "tracing",
@@ -2744,7 +2797,7 @@ dependencies = [
 
 [[package]]
 name = "lance-file"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -2778,7 +2831,7 @@ dependencies = [
 
 [[package]]
 name = "lance-index"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -2829,7 +2882,7 @@ dependencies = [
 
 [[package]]
 name = "lance-io"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-arith",
@@ -2868,7 +2921,7 @@ dependencies = [
 
 [[package]]
 name = "lance-linalg"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow-array",
  "arrow-ord",
@@ -2891,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "lance-table"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3006,9 +3059,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libm"
@@ -3064,7 +3117,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -3130,9 +3183,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
@@ -3352,9 +3405,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -3380,7 +3433,7 @@ dependencies = [
  "rand",
  "reqwest",
  "ring",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "snafu",
@@ -3392,9 +3445,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oneshot"
@@ -3494,7 +3547,7 @@ dependencies = [
  "flate2",
  "futures",
  "half",
- "hashbrown",
+ "hashbrown 0.14.5",
  "lz4_flex",
  "num",
  "num-bigint",
@@ -3629,22 +3682,22 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3672,9 +3725,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
@@ -3709,9 +3762,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -3745,7 +3798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
  "proc-macro2",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3816,7 +3869,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-types 0.12.6",
  "regex",
- "syn 2.0.77",
+ "syn 2.0.79",
  "tempfile",
 ]
 
@@ -3843,7 +3896,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3877,7 +3930,7 @@ dependencies = [
 
 [[package]]
 name = "pylance"
-version = "0.17.0"
+version = "0.18.2"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3964,7 +4017,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3977,7 +4030,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3998,9 +4051,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.36.1"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
  "serde",
@@ -4017,7 +4070,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -4034,7 +4087,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4155,9 +4208,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -4175,9 +4228,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4187,9 +4240,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4204,9 +4257,9 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "regress"
@@ -4214,15 +4267,15 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
  "memchr",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4243,9 +4296,9 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.13",
- "rustls-native-certs 0.7.3",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.14",
+ "rustls-native-certs 0.8.0",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -4366,9 +4419,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
 dependencies = [
  "log",
  "once_cell",
@@ -4391,19 +4444,6 @@ dependencies = [
  "security-framework",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.1.3",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.0"
@@ -4411,7 +4451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -4428,19 +4468,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
 
 [[package]]
 name = "rustls-webpki"
@@ -4486,9 +4525,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -4523,7 +4562,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4557,9 +4596,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4597,7 +4636,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4608,7 +4647,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4632,7 +4671,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4805,9 +4844,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "sqlparser"
-version = "0.47.0"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25"
+checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e"
 dependencies = [
  "log",
  "sqlparser_derive",
@@ -4821,7 +4860,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4867,7 +4906,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4889,7 +4928,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "syn 2.0.77",
+ "syn 2.0.79",
  "typify",
  "walkdir",
 ]
@@ -4913,9 +4952,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5086,9 +5125,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
 dependencies = [
  "filetime",
  "libc",
@@ -5103,9 +5142,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand 2.1.1",
@@ -5154,22 +5193,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5273,7 +5312,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5292,7 +5331,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5321,27 +5360,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -5367,7 +5385,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5418,9 +5436,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
 
 [[package]]
 name = "try-lock"
@@ -5469,7 +5487,7 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "syn 2.0.77",
+ "syn 2.0.79",
  "thiserror",
  "unicode-ident",
 ]
@@ -5487,7 +5505,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.77",
+ "syn 2.0.79",
  "typify-impl",
 ]
 
@@ -5502,9 +5520,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
@@ -5514,24 +5532,24 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unindent"
@@ -5561,7 +5579,7 @@ dependencies = [
  "flate2",
  "log",
  "once_cell",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-pki-types",
  "url",
  "webpki-roots",
@@ -5677,7 +5695,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
@@ -5711,7 +5729,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5724,9 +5742,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -5747,9 +5765,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -6037,7 +6055,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 1563bcf88dd4..1fba795132bf 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.17.0";
+  version = "0.18.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     rev = "refs/tags/v${version}";
-    hash = "sha256-E+29CbVNbzmrQnBZt0860IvL4xYZqzE+uzSuKDwgxzg=";
+    hash = "sha256-CIIZbeRrraTqWronkspDpBVP/Z4JVoaiS5iBIXfsZGg=";
   };
 
   buildAndTestSubdir = "python";
@@ -55,6 +55,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     pkg-config
+    protobuf # for protoc
     rustPlatform.cargoSetupHook
   ];
 
diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
index 892e24c62122..62a5f7e81318 100644
--- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pylibjpeg-libjpeg";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "pydicom";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-iU40QdAY5931YM3h3P+WCbiBfX88iVi2QdUvZLptsFs=";
+    hash = "sha256-g4dGIGHo0J+F0KTVA6yjgfwiYVn6iU69jgHhvEQGwOc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 9076d39d83f6..9b98543b3004 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "3.2.5";
+  version = "3.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "pylint-dev";
     repo = "pylint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-b3KkSgTmN6ojMJaVQGwvHIa41M2eZS9prxcL5peX/xU=";
+    hash = "sha256-cnMYHHtIRxIySfZV0jTn+OFji+72cOReyNNDiJ9pbAg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 303d7680e8d3..2b133f061bf3 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "pymatgen";
-  version = "2024.7.18";
+  version = "2024.9.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,9 +40,14 @@ buildPythonPackage rec {
     owner = "materialsproject";
     repo = "pymatgen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LL3cZO3LkmBuGGcO7dhO2Wtgqx9nxLureFpC8EqvS3M";
+    hash = "sha256-o76bGItldcLfgZ5KDw2uL0GJvyljQJEwISR0topVR44=";
   };
 
+  prePatch = ''
+    # Upstream switched to building against numpy2 but should still be compatible with numpy1
+    substituteInPlace pyproject.toml --replace-fail "numpy>=2.1.0" "numpy>=1.26.0"
+  '';
+
   build-system = [ setuptools ];
 
   nativeBuildInputs = [
@@ -87,20 +92,6 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
-  disabledTests = [
-    # presumably won't work with our dir layouts
-    "test_egg_sources_txt_is_complete"
-    # borderline precision failure
-    "test_thermal_conductivity"
-    # AssertionError
-    "test_dict_functionality"
-    "test_mean_field"
-    "test_potcar_not_found"
-    "test_read_write_lobsterin"
-    "test_snl"
-    "test_unconverged"
-  ];
-
   pythonImportsCheck = [ "pymatgen" ];
 
   meta = with lib; {
@@ -109,6 +100,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ psyanticy ];
-    broken = true; # tests segfault. that's bad.
   };
 }
diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index beb8ab6461ef..7b145228b4cf 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.41";
+  version = "2.4.42";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7TIlzphdBhA6qyUa/Ig9BKmKHW21xzmV595MqssfZs0=";
+    hash = "sha256-3+BECLV0JeJlOKa0vZd/dyObyM5hiGF0VnsaJD98PXY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix
index bc5292e6d15e..b68bf1c6ef16 100644
--- a/pkgs/development/python-modules/pymbolic/default.nix
+++ b/pkgs/development/python-modules/pymbolic/default.nix
@@ -1,18 +1,23 @@
 {
   lib,
+  astunparse,
   buildPythonPackage,
-  fetchPypi,
   fetchpatch,
+  fetchPypi,
+  immutabledict,
   matchpy,
+  numpy,
   pytestCheckHook,
   pythonOlder,
   pytools,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pymbolic";
   version = "2022.2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -29,24 +34,34 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ pytools ];
-
-  nativeCheckInputs = [
-    matchpy
-    pytestCheckHook
-  ];
-
   postPatch = ''
     # pytest is a test requirement not a run-time one
       substituteInPlace setup.py \
         --replace '"pytest>=2.3",' ""
   '';
 
+  build-system = [ setuptools ];
+
+  dependencies = [
+    astunparse
+    immutabledict
+    pytools
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    matchpy = [ matchpy ];
+    numpy = [ numpy ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+
   pythonImportsCheck = [ "pymbolic" ];
 
   meta = with lib; {
     description = "Package for symbolic computation";
     homepage = "https://documen.tician.de/pymbolic/";
+    changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix
index b4978a83621d..f843876f7000 100644
--- a/pkgs/development/python-modules/pymc/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "pymc";
-  version = "5.17.0";
+  version = "5.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymc-devs";
     repo = "pymc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vElS6f46xVvK+p5/IvjgCI4wMZlBe3Q5ZaQUie1yLJw=";
+    hash = "sha256-rH6sh05rSrhakcfdc+BSR37kQYO/QEPuw8hHMZZGwdE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix
index ecc913b075b1..f447d15e45af 100644
--- a/pkgs/development/python-modules/pymdstat/default.nix
+++ b/pkgs/development/python-modules/pymdstat/default.nix
@@ -2,27 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  python,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pymdstat";
-  version = "0.4.2";
-  format = "setuptools";
+  version = "0.4.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
-    repo = pname;
+    repo = "pymdstat";
     rev = "v${version}";
-    sha256 = "01hj8vyd9f7610sqvzphpr033rvnazbwvl11gi18ia3yqlnlncp0";
+    hash = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE=";
   };
 
-  checkPhase = ''
-    ${python.interpreter} $src/unitest.py
-  '';
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "pymdstat" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "unitest.py" ];
+
   meta = with lib; {
     description = "Pythonic library to parse Linux /proc/mdstat file";
     homepage = "https://github.com/nicolargo/pymdstat";
diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix
index 7c07ff13e5fc..18be89f33a66 100644
--- a/pkgs/development/python-modules/pymee/default.nix
+++ b/pkgs/development/python-modules/pymee/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pymee";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "FreshlyBrewedCode";
     repo = "pymee";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4XKd0lZ6RAsG2zXjKMUeST6cNcg+SjT371gxLIhxkAA=";
+    hash = "sha256-VNKIA/1juhkn11nkW52htvE4daXJoySeEyevWbboUek=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index bb0fb022d2ef..d1243d08bf4b 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "3.6.9";
+  version = "3.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "pymodbus-dev";
     repo = "pymodbus";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI=";
+    hash = "sha256-y+WNXYqKkr8WQUNSmcWNRjF6yWkxD+l6++K1fiBOHek=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index c64d22d66cb9..97487b91d90d 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "4.8.0";
+  version = "4.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "pymongo";
-    hash = "sha256-RU8ilYdXRNxw8YgeSy65nNrQCKM1dLyKrxIFMPZsDN4=";
+    hash = "sha256-t/LTQ5Cs9g4inDADfRRz/PafRTbNf0j294wMkxxhxQU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix
index 50bccf006ab5..86eb3e81b294 100644
--- a/pkgs/development/python-modules/pymoo/default.nix
+++ b/pkgs/development/python-modules/pymoo/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "pymoo";
-  version = "0.6.0.1";
+  version = "0.6.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anyoptimization";
     repo = "pymoo";
-    rev = version;
-    hash = "sha256-+qtW7hfSo266n1SRzAgHIu99W5Sl+NYbKOHXv/JI9IA=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-CbeJwv51lu4cABgGieqy/8DCDJCb8wOPPVqUHk8Jb7E=";
   };
 
   pymoo_data = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix
index b75c7e8b5af1..a75ac083f7b8 100644
--- a/pkgs/development/python-modules/pympler/default.nix
+++ b/pkgs/development/python-modules/pympler/default.nix
@@ -3,45 +3,42 @@
   stdenv,
   bottle,
   buildPythonPackage,
-  fetchpatch,
   fetchPypi,
   pytestCheckHook,
   pythonAtLeast,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pympler";
-  version = "1.0.1";
+  version = "1.1";
+  pyproject = true;
 
   src = fetchPypi {
-    pname = "Pympler";
-    inherit version;
-    sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa";
+    inherit pname version;
+    hash = "sha256-HqqGfLiZLCGEMPFwj9rM2lPfBkFE0cVlax5vHuYABCQ=";
   };
 
-  patches = [
-    # Fixes a TypeError on Python 3.11
-    # (see https://github.com/pympler/pympler/issues/148)
-    # https://github.com/pympler/pympler/pull/149
-    (fetchpatch {
-      name = "Pympler-python-3.11-compat.patch";
-      url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch";
-      hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U=";
-    })
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
+  build-system = [ setuptools ];
 
   # There is a version of bottle bundled with Pympler, but it is broken on
   # Python 3.11. Fortunately, Pympler will preferentially import an external
   # bottle if it is available, so we make it an explicit dependency.
-  propagatedBuildInputs = [ bottle ];
+  dependencies = [ bottle ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests =
     [
       # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)'
       # https://github.com/pympler/pympler/issues/134
       "test_repr_function"
+      # Stuck
+      "test_locals"
+      "test_globals"
+      "test_traceback"
+      "test_otracker_diff"
+      "test_stracker_store_summary"
     ]
     ++ lib.optionals (pythonAtLeast "3.11") [
       # https://github.com/pympler/pympler/issues/148
@@ -54,7 +51,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Tool to measure, monitor and analyze memory behavior";
-    homepage = "https://pythonhosted.org/Pympler/";
+    homepage = "https://github.com/pympler/pympler";
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix
index e234606d1c86..02e3f670f1c9 100644
--- a/pkgs/development/python-modules/pymssql/default.nix
+++ b/pkgs/development/python-modules/pymssql/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "pymssql";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8DTka1aAYdFxSPHe3qZI+dX2tzQOjP/g7bqhcTy0q6s=";
+    hash = "sha256-3e4VxMGT4UyS/izXIMqb4duh4PQXgkA4C49fbwDaBMY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index cd556861748c..781fa2bd24e8 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -4,6 +4,7 @@
   botocore,
   buildPythonPackage,
   fetchFromGitHub,
+  freezegun,
   pytest-env,
   pytest-mock,
   pytestCheckHook,
@@ -14,8 +15,8 @@
 
 buildPythonPackage rec {
   pname = "pynamodb";
-  version = "6.0.0";
-  format = "setuptools";
+  version = "6.0.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     owner = "pynamodb";
     repo = "PynamoDB";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ag/ivZ2SDYX0kwXbExt3kE/pMJgfoGc6gWoy+Rr6GTw=";
+    hash = "sha256-OcrES+1F95KjhRXpEukzbuDfTXU4hyJqxGjD1xMcdKE=";
   };
 
   build-system = [ setuptools ];
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    freezegun
     pytest-env
     pytest-mock
     pytestCheckHook
diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix
index 2066dc3ec02b..70a5a432af1a 100644
--- a/pkgs/development/python-modules/pynecil/default.nix
+++ b/pkgs/development/python-modules/pynecil/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pynecil";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tr4nt0r";
     repo = "pynecil";
     rev = "refs/tags/v${version}";
-    hash = "sha256-57TPgEC7NY75iVj31tdpCOrXUOcsFBy/4XltEHxlNFk=";
+    hash = "sha256-ZltGA3O6DDOiOddKHMalqmOYrp3IbhAGN7wGfPBP2aA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index 7082611f6716..9e92fab07151 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "7.2.0";
+  version = "7.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU=";
+    hash = "sha256-UJIbCcsQzKmFeH8gvfxFVN4ovT7eCnSHBsCCooInm/E=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
index c17df5386938..5a2ff7cd0cd9 100644
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -4,44 +4,40 @@
   fetchFromGitHub,
   setuptools,
   msgpack,
+  isPyPy,
   greenlet,
   pythonOlder,
-  isPyPy,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pynvim";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "pynvim";
     rev = "refs/tags/${version}";
-    hash = "sha256-3LqgKENFzdfCjMlD6Xzv5W23yvIkNMUYo2+LlzKZ3cc=";
+    hash = "sha256-YVAWu+i2pElq8OhibSqh9ogk+xWDRCZT4niDF/oMnzY=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace " + pytest_runner" ""
-  '';
+  build-system = [ setuptools ];
 
-  buildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ msgpack ] ++ lib.optionals (!isPyPy) [ greenlet ];
+  dependencies =
+    [ msgpack ]
+    ++ lib.optionals (!isPyPy) [ greenlet ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
   # Tests require pkgs.neovim which we cannot add because of circular dependency
   doCheck = false;
 
   pythonImportsCheck = [ "pynvim" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python client for Neovim";
     homepage = "https://github.com/neovim/pynvim";
     changelog = "https://github.com/neovim/pynvim/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index ec66d35900d9..64c692a2d945 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "pyogrio";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c=";
   };
 
diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix
index 6b316dd72cc7..4076913dc9e5 100644
--- a/pkgs/development/python-modules/pyopenweathermap/default.nix
+++ b/pkgs/development/python-modules/pyopenweathermap/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyopenweathermap";
-  version = "0.1.1";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     repo = "pyopenweathermap";
     # https://github.com/freekode/pyopenweathermap/issues/2
     rev = "refs/tags/v${version}";
-    hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ=";
+    hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix
index 19fe009ced11..68b7d44064ed 100644
--- a/pkgs/development/python-modules/pyosmium/default.nix
+++ b/pkgs/development/python-modules/pyosmium/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "pyosmium";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7" || isPyPy;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "osmcode";
     repo = "pyosmium";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qi4GsjQVe2nIcvQThAlxQu3kUdWhRuJFHVPjKbMBxdM=";
+    hash = "sha256-pW2w/M4P4DtGhnTy72w0wjMtpLtSgvYGaemme/rRrwM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index ac2e1be377f0..171bf42ab203 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyparsing";
-  version = "3.1.2";
+  version = "3.1.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pyparsing";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A=";
+    hash = "sha256-caHkwMFL1IFCQ+yZTp9o4yXfemoPx1xL4Nvb85oJzEI=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index b9176cc76dbe..9666821f8692 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -28,16 +28,18 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "5.0.0";
+  version = "5.1.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "py-pdf";
     repo = "pypdf";
     rev = "refs/tags/${version}";
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-omnNC1mzph59aqrXqLCuCk0LgzfJv/JhbQRrAgRhAIg=";
+    hash = "sha256-ziJTYl7MQUCE8US0yeiq6BPDVbBsxWhti0NyiDnKtfE=";
   };
 
   outputs = [
@@ -45,29 +47,20 @@ buildPythonPackage rec {
     "doc"
   ];
 
-  nativeBuildInputs = [
-    flit-core
-
-    # docs
-    sphinxHook
-    sphinx-rtd-theme
-    myst-parser
-  ];
-
-  patches = [
-    (fetchpatch2 {
-      # Mark test_increment_writer as enable_socket (https://github.com/py-pdf/pypdf/pull/2867)
-      url = "https://github.com/py-pdf/pypdf/commit/d974d5c755a7b65f3b9c68c5742afdbc0c1693f6.patch";
-      hash = "sha256-4xiCAStP615IktTUgk31JbIxkxx8d6PQdu8Nfmhc1jo=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "--disable-socket" ""
   '';
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  build-system = [ flit-core ];
+
+  nativeBuildInputs = [
+    sphinxHook
+    sphinx-rtd-theme
+    myst-parser
+  ];
+
+  dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
 
   optional-dependencies = rec {
     full = crypto ++ image;
diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index 563f0311ee94..6202ae3156cf 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -13,11 +13,13 @@
   watchdog,
   webtest,
   wheel,
+  build,
+  importlib-resources,
 }:
 
 buildPythonPackage rec {
   pname = "pypiserver";
-  version = "2.0.1";
+  version = "2.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +28,7 @@ buildPythonPackage rec {
     owner = "pypiserver";
     repo = "pypiserver";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Eh/3URt7pcJhoDDLRP8iHyjlPsE5E9M/0Hixqi5YNdg=";
+    hash = "sha256-5GJthS3kWOyWvYW+mYnIcNKD3fgSVexABZ+DpVh7qkE=";
   };
 
   build-system = [
@@ -38,7 +40,7 @@ buildPythonPackage rec {
   dependencies = [
     distutils
     pip
-  ];
+  ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
 
   optional-dependencies = {
     passlib = [ passlib ];
@@ -51,6 +53,7 @@ buildPythonPackage rec {
     setuptools
     twine
     webtest
+    build
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index 0013a3dbe726..d3f663f08172 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pyprecice";
-  version = "3.1.1";
+  version = "3.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "precice";
     repo = "python-bindings";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qeDWj03Uo0Kf75MN0eI+DBwa94v7GRe6+FKYtVOM6vs=";
+    hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix
index 746fd660e0d2..2ec956f7da40 100644
--- a/pkgs/development/python-modules/pyproject-api/default.nix
+++ b/pkgs/development/python-modules/pyproject-api/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "pyproject-api";
-  version = "1.7.1";
+  version = "1.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "tox-dev";
     repo = "pyproject-api";
     rev = "refs/tags/${version}";
-    hash = "sha256-TQ6cRkGnZpNchu+eL8gyUYbzp/7NWhG+LWeI8Hq52ok=";
+    hash = "sha256-zFV44xqbwe1QsIVurvsjqY+zxC+X2hCljZ5u70kNTSU=";
   };
 
   outputs = [
@@ -67,6 +67,8 @@ buildPythonPackage rec {
   disabledTests = [
     # requires eol python2 interpreter
     "test_can_build_on_python_2"
+    # different formatting for version specifier
+    "test_setuptools_prepare_metadata_for_build_wheel"
   ];
 
   pythonImportsCheck = [ "pyproject_api" ];
diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix
index 28db88a18cf8..180886e462d0 100644
--- a/pkgs/development/python-modules/pyproject-hooks/default.nix
+++ b/pkgs/development/python-modules/pyproject-hooks/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pyproject-hooks";
-  version = "1.0.0";
+  version = "1.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi rec {
     pname = "pyproject_hooks";
     inherit version;
-    hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU=";
+    hash = "sha256-HoWb1cQPrpRIZC3Yca30WeXiCEGG6NLCp5qCTJcNofg=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix
index ce8daa6c2887..892d43038bb7 100644
--- a/pkgs/development/python-modules/pyqldb/default.nix
+++ b/pkgs/development/python-modules/pyqldb/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyqldb";
-  version = "3.2.3";
+  version = "3.2.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-qldb-driver-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TyIXvk3ZJn5J2SBFDTPJpSnGFOFheXIqR2daL5npOk8=";
+    hash = "sha256-u8wI8ThD/BA+WI62OvNFmYvcqr018wgrh+5J+p2A6hM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix
index ef00791037b3..867d0b58c04a 100644
--- a/pkgs/development/python-modules/pyqt-builder/default.nix
+++ b/pkgs/development/python-modules/pyqt-builder/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pyqt-builder";
-  version = "1.16.2";
+  version = "1.16.4";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "pyqt_builder";
     inherit version;
-    hash = "sha256-v3I823zSPSUS4qzae8a4HwD7BczF6aiEa9NNR1FM3bk=";
+    hash = "sha256-RRXkGuN5vi5U+IqJ7PR81uTKxD6GLEq/3hg4nCZmr98=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix
index e066b9258411..9f11804f2cf0 100644
--- a/pkgs/development/python-modules/pyquery/default.nix
+++ b/pkgs/development/python-modules/pyquery/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pyquery";
-  version = "2.0.0";
+  version = "2.0.1";
   disabled = pythonOlder "3.7";
 
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lj6NTpAmL/bY3sBy6pcoXcN0ovacrXd29AgqvPah2K4=";
+    hash = "sha256-AZS7JwaxLQN9sSxRko/p67NrctnnGVZdq6WmxZUyL68=";
   };
 
   # https://github.com/gawel/pyquery/issues/248
diff --git a/pkgs/development/python-modules/pyramid-multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix
index 2bf668f94e35..71017e270bec 100644
--- a/pkgs/development/python-modules/pyramid-multiauth/default.nix
+++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyramid-multiauth";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "pyramid_multiauth";
     rev = "refs/tags/${version}";
-    hash = "sha256-+Aa+Vc4qCqDe/W5m/RBpYAyOMJkBv+ZGSqElJlkHqs4=";
+    hash = "sha256-Bz53iCGsl6WZASIvBQ1pFfcGLra82vA2OLWjhLVdkrw=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index 3564c0bd1aea..d30f96b67d66 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -9,18 +9,20 @@
   plaster,
   plaster-pastedeploy,
   repoze-lru,
+  setuptools,
   translationstring,
   venusian,
   webob,
   zope-deprecation,
   zope-interface,
   pythonOlder,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyramid";
   version = "2.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -29,12 +31,15 @@ buildPythonPackage rec {
     hash = "sha256-NyE4pzjkIWU1zHbczm7d1aGqypUTDyNU+4NCZMBvGN4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     hupper
     pastedeploy
     plaster
     plaster-pastedeploy
     repoze-lru
+    setuptools # for pkg_resources
     translationstring
     venusian
     webob
@@ -45,6 +50,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     webtest
     zope-component
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "pyramid" ];
diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix
index bebc20c63e96..a1b7c05a31ee 100644
--- a/pkgs/development/python-modules/pyrdfa3/default.nix
+++ b/pkgs/development/python-modules/pyrdfa3/default.nix
@@ -11,25 +11,27 @@
 
 buildPythonPackage rec {
   pname = "pyrdfa3";
-  version = "3.6.2";
+  version = "3.6.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit version;
-    pname = "pyRdfa3";
-    hash = "sha256-c2gdq5V/YJAWlnZziLlWpXaccwvEUdpv+y8ONvGDFMI=";
+    inherit pname version;
+    hash = "sha256-ZHEtGkvyGCllKzlxW62m58A7zxnLSfliwZCjj0YXIkM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     rdflib
     html5lib
     requests
   ];
 
+  # Module has no tests
+  doCheck = false;
+
   pythonImportsCheck = [ "pyRdfa" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pyre-extensions/default.nix b/pkgs/development/python-modules/pyre-extensions/default.nix
index 3a51946a81d7..aa5f70da4a91 100644
--- a/pkgs/development/python-modules/pyre-extensions/default.nix
+++ b/pkgs/development/python-modules/pyre-extensions/default.nix
@@ -9,7 +9,7 @@
 }:
 let
   pname = "pyre-extensions";
-  version = "0.0.30";
+  version = "0.0.31";
 in
 buildPythonPackage {
   inherit pname version;
@@ -18,8 +18,9 @@ buildPythonPackage {
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-unkjxIbgia+zehBiOo9K6C1zz/QkJtcRxIrwcOW8MbI=";
+    inherit version;
+    pname = "pyre_extensions";  # changed pname on 0.0.31?
+    hash = "sha256-lFgG3TMCeFbPbkHJxK2s/6srVpk/h2L/TqeCb5XbBIE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix
deleted file mode 100644
index 33e5958430d1..000000000000
--- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  rustPlatform,
-  pytest,
-  runCommand,
-  boringssl,
-  libiconv,
-  SystemConfiguration,
-}:
-
-let
-  # boring-sys expects the static libraries in build/ instead of lib/
-  boringssl-wrapper = runCommand "boringssl-wrapper" { } ''
-    mkdir $out
-    cd $out
-    ln -s ${boringssl.out}/lib build
-    ln -s ${boringssl.dev}/include include
-  '';
-in
-buildPythonPackage rec {
-  pname = "pyreqwest-impersonate";
-  version = "0.4.9";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "deedy5";
-    repo = "pyreqwest_impersonate";
-    rev = "v${version}";
-    hash = "sha256-U22NNYN8p3IQIAVb6dOrErFvuJ5m5yXi2ELbyuaNlFc=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    name = "${pname}-${version}";
-    hash = "sha256-rj9tfOzhzfWBoxBGlTXHAmiH5qxyoLnHhlEijy/q+Ws=";
-  };
-
-  nativeBuildInputs = [
-    rustPlatform.bindgenHook
-    rustPlatform.cargoSetupHook
-    rustPlatform.maturinBuildHook
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    SystemConfiguration
-  ];
-
-  env.BORING_BSSL_PATH = boringssl-wrapper;
-
-  optional-dependencies = {
-    dev = [ pytest ];
-  };
-
-  # Test use network
-  doCheck = false;
-
-  pythonImportsCheck = [ "pyreqwest_impersonate" ];
-
-  meta = {
-    description = "HTTP client that can impersonate web browsers (Chrome/Edge/OkHttp/Safari), mimicking their headers and TLS/JA3/JA4/HTTP2 fingerprints";
-    homepage = "https://github.com/deedy5/pyreqwest_impersonate";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
-  };
-}
diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix
index 5b2856984cbe..0921aa790e80 100644
--- a/pkgs/development/python-modules/pysatochip/default.nix
+++ b/pkgs/development/python-modules/pysatochip/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   certifi,
   cryptography,
   ecdsa,
@@ -13,22 +13,17 @@
 
 buildPythonPackage rec {
   pname = "pysatochip";
-  version = "0.14.2";
+  version = "0.15.1";
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-+Z3D6ITZouhLbEotvJ9MDfg6QOhjGVKrLi1QL1kOdkE=";
+  src = fetchFromGitHub {
+    owner = "toporin";
+    repo = "pysatochip";
+    rev = "v${version}";
+    hash = "sha256-7wA9erk2OA1FyNSzOSWJzjyp9QeYq6C+YA8B0Dk2iQE=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "cryptography==3.3.2" "cryptography" \
-      --replace "ecdsa==0.15" "ecdsa" \
-      --replace "pyopenssl==20.0.0" "pyopenssl"
-  '';
-
   propagatedBuildInputs = [
     cryptography
     ecdsa
diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix
index 6e738b07d3dc..127ca5bb96c2 100644
--- a/pkgs/development/python-modules/pyscaffold/default.nix
+++ b/pkgs/development/python-modules/pyscaffold/default.nix
@@ -32,13 +32,12 @@
 
 buildPythonPackage rec {
   pname = "pyscaffold";
-  version = "4.5";
+  version = "4.6";
   pyproject = true;
 
   src = fetchPypi {
-    pname = "PyScaffold";
-    inherit version;
-    hash = "sha256-2En5ouFb3PFl4Z+Wg18LF+Gi1Z1MVhxEW4J6CB3m0mI=";
+    inherit pname version;
+    hash = "sha256-QIW43pIAufMZ32+Op5lyiPFZqOSyhLBi2bKk1qnBI0w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 4582cc185203..a5b4d28b4a7d 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -18,14 +18,14 @@ in
 
 buildPythonPackage rec {
   pname = "pyscard";
-  version = "2.0.9";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pyscard";
     rev = "refs/tags/${version}";
-    hash = "sha256-DO4Ea+mlrWPpOLI8Eki+03UnsOXEhN2PAl0+gdN5sTo=";
+    hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
   };
 
   build-system = [ setuptools ];
@@ -37,36 +37,31 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   postPatch =
-    if withApplePCSC then
-      ''
-        substituteInPlace smartcard/scard/winscarddll.c \
-          --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \
-                    "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
-      ''
-    else
-      ''
-        substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG"
-        substituteInPlace smartcard/scard/winscarddll.c \
-          --replace-fail "libpcsclite.so.1" \
-                    "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
-      '';
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
+    ''
+    + (
+      if withApplePCSC then
+        ''
+          substituteInPlace src/smartcard/scard/winscarddll.c \
+            --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \
+                      "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
+        ''
+      else
+        ''
+          substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
+          substituteInPlace src/smartcard/scard/winscarddll.c \
+            --replace-fail "libpcsclite.so.1" \
+                      "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
+        ''
+    );
 
-  preCheck = ''
-    # remove src module, so tests use the installed module instead
-    rm -r smartcard
-  '';
-
-  disabledTests = [
-    # AssertionError
-    "test_hresult"
-    "test_low_level"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Smartcard library for python";
     homepage = "https://pyscard.sourceforge.io/";
     changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ layus ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ layus ];
   };
 }
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index 2a3ff3c5ad34..41da67e108e2 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -11,11 +11,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "pyside2";
-  version = "5.15.14";
+  version = "5.15.15";
 
   src = fetchurl {
     url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
-    hash = "sha256-MmURlPamt7zkLwTmixQBrSCH5HiaTI8/uGSehhicY3I=";
+    hash = "sha256-IdaBiwZINLCFARgOSIkOX9h98vs3afgMWBQ0V/VIxAg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 088f4e785af6..652e84d9a366 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   cmake,
   cups,
   ninja,
@@ -57,7 +58,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit (shiboken6) version src;
 
-  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
+  sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/pyside6";
+
+  patches = [
+    # Manual backport of https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=cacc9c5803a6dec820dd46211a836453183c8dab
+    # to fit our structure.
+    # FIXME: remove for 6.8.1
+    ./fix-installing-docs.patch
+  ];
 
   # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
   # reside in the same directory as QtCore.framework, which is not true for Nix.
@@ -79,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds."
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib";
+    LLVM_INSTALL_DIR = "${lib.getLib llvmPackages.libclang}/lib";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyside6/fix-installing-docs.patch b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch
new file mode 100644
index 000000000000..4d8178f153e6
--- /dev/null
+++ b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch
@@ -0,0 +1,25 @@
+--- a/cmake/Macros/PySideModules.cmake
++++ b/cmake/Macros/PySideModules.cmake
+@@ -176,6 +176,14 @@ macro(create_pyside_module)
+         set(${module_NAME}_glue_dependency ${${module_NAME}_glue})
+     endif()
+ 
++    # Install module doc files.
++    set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst")
++    set(${module_name}_doc_dependency "")
++    if(EXISTS ${${module_NAME}_doc})
++        install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc)
++        set(${module_NAME}_doc_dependency ${${module_NAME}_doc})
++    endif()
++
+     # Install standalone glue files into typesystems subfolder, so that the resolved relative
+     # paths remain correct.
+     if (module_GLUE_SOURCES)
+@@ -245,6 +253,7 @@ macro(create_pyside_module)
+                         DEPENDS ${total_type_system_files}
+                                 ${module_GLUE_SOURCES}
+                                 ${${module_NAME}_glue_dependency}
++                                ${${module_NAME}_doc_dependency}
+                         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                         COMMENT "Running generator for ${module_NAME}...")
+ 
\ No newline at end of file
diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
index 3e61476c977a..eceaf8893813 100644
--- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-backend-elasticsearch";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-backend-elasticsearch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7XecgpZ2DQr2f/Ge7skbielK7qwuGoy/KAoxzNvk9w4=";
+    hash = "sha256-6T3OnT6Row2dUmQ3xOu/00vcjD75+rfBSP7WyM4sQqA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
index 2e2249fd9c54..5c689f81c0d6 100644
--- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-backend-opensearch";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-backend-opensearch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VEMt9CKbhPRj1182WcLOqF9JOEzorrz9Yyqp0+FAA88=";
+    hash = "sha256-whAvUgjPdZ0ePt0LkREJxJnLacNyQDWupdAinK3kJww=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix
index c8f3ca8bb96e..f8ce981e1d38 100644
--- a/pkgs/development/python-modules/pysnooper/default.nix
+++ b/pkgs/development/python-modules/pysnooper/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pysnooper";
-  version = "1.2.0";
+  version = "1.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "PySnooper";
-    hash = "sha256-gQZp4WKiUKBm2GYuVzrbxa93DpN8W1V48ou3NV0chZs=";
+    hash = "sha256-2DLd8myARAqUVrOmZNr/lX9zfnMTxAt2JQ69tczbajE=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix
index f69e18f43137..1a7c541daea0 100644
--- a/pkgs/development/python-modules/pysnow/default.nix
+++ b/pkgs/development/python-modules/pysnow/default.nix
@@ -9,6 +9,7 @@
   poetry-core,
   python-magic,
   pytz,
+  six,
   pytestCheckHook,
   requests-oauthlib,
 }:
@@ -25,6 +26,8 @@ buildPythonPackage rec {
     hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY=";
   };
 
+  pythonRelaxDeps = [ "requests-oauthlib" ];
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
@@ -32,6 +35,7 @@ buildPythonPackage rec {
     ijson
     python-magic
     pytz
+    six
     requests-oauthlib
   ];
 
@@ -54,6 +58,10 @@ buildPythonPackage rec {
       --replace 'ijson = "^2.5.1"' 'ijson = "*"' \
       --replace 'pytz = "^2019.3"' 'pytz = "*"' \
       --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"'
+
+    # https://github.com/rbw/pysnow/pull/201 doesn't apply via fetchpatch, so we recreate it
+    substituteInPlace tests/test_client.py tests/test_oauth_client.py tests/test_params_builder.py tests/test_resource.py \
+      --replace-fail "self.assertEquals" "self.assertEqual"
   '';
 
   pythonImportsCheck = [ "pysnow" ];
diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix
index 2db75c3f2820..b9612be0978c 100644
--- a/pkgs/development/python-modules/pysol-cards/default.nix
+++ b/pkgs/development/python-modules/pysol-cards/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pysol-cards";
-  version = "0.16.0";
+  version = "0.18.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "pysol_cards";
-    hash = "sha256-C4fKez+ZFVzM08/XOfc593RNb4GYIixtSToDSj1FcMM=";
+    hash = "sha256-KRlurdUaVKe/hT0K7LoWiFOQOiSAO4VUcT6Mf8xzLCw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix
index 0ea9ceb5eca9..5a9a711f2815 100644
--- a/pkgs/development/python-modules/pysolr/default.nix
+++ b/pkgs/development/python-modules/pysolr/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pysolr";
-  version = "3.9.0";
+  version = "3.10.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f";
+    sha256 = "sha256-EntKLdFpI0rLFYZkOmzR4+lLkXkh5pv1adeyoqoO9Ak=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index 93078d91dad9..e06ab2932483 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "3.5.1";
+  version = "3.5.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3WVp5Uc2Xq3E+Ie/V/FT5NWCpoxLSQ3kddVbmYFmSRA=";
+    hash = "sha256-aLfMDAxXCn2GRPSfQNLahwmwHTDJEmzIz5O0+E89l0c=";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index 401ccbe27097..e1b716245a5d 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyspnego";
-  version = "0.10.2";
+  version = "0.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "jborean93";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-60aIRrhRynbuuFZzzBhJTlmU74CWuao8jWhr126cPrc=";
+    hash = "sha256-8u4gAIM2HZiDooUoIM0zAUq6IJkJHMzr16p42v6ekBQ=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix
index e78c7f36d81e..8c04887f758c 100644
--- a/pkgs/development/python-modules/pysuez/default.nix
+++ b/pkgs/development/python-modules/pysuez/default.nix
@@ -10,26 +10,21 @@
 
 buildPythonPackage rec {
   pname = "pysuez";
-  version = "0.2.0";
+  version = "0.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
-    owner = "ooii";
+    owner = "jb101010-2";
     repo = "pySuez";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace ", 'datetime'" ""
-  '';
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     regex
     requests
   ];
@@ -42,8 +37,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to get water consumption data from Suez";
     mainProgram = "pysuez";
-    homepage = "https://github.com/ooii/pySuez";
-    changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}";
+    homepage = "https://github.com/jb101010-2/pySuez";
+    changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 7c5b303c70a8..a5da6bc33006 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.50.1";
+  version = "0.51.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-GA5BioH1z8N6I65q+7vSHM/eetN5dXSMZZ2hoQ8+0QA=";
+    hash = "sha256-Ti+3f6UGn/A9MdLJVUT9hnAiS8Ce6D8FrSryrGxMV6s=";
   };
 
   build-system = [ setuptools ];
@@ -40,11 +40,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # mismatch in expected data structure
-    "test_parse_advertisement_data_curtain"
-  ];
-
   pythonImportsCheck = [ "switchbot" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix
index 33671fb43314..f12ac02bdb92 100644
--- a/pkgs/development/python-modules/pysyncobj/default.nix
+++ b/pkgs/development/python-modules/pysyncobj/default.nix
@@ -3,22 +3,25 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pysyncobj";
-  version = "0.3.12";
-  format = "setuptools";
+  version = "0.3.13";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "bakwc";
     repo = "PySyncObj";
-    rev = "refs/tags/${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-ZWzvvv13g/iypm+MIl5q0Y8ekqzZEY5upSTPk3MFTPI=";
   };
 
+  build-system = [ setuptools ];
+
   # Tests require network features
   doCheck = false;
 
@@ -26,10 +29,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python library for replicating your class";
-    mainProgram = "syncobj_admin";
     homepage = "https://github.com/bakwc/PySyncObj";
-    changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/bakwc/PySyncObj/releases/tag/v${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "syncobj_admin";
   };
 }
diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix
index 13e41ed77a5e..0e396cd4f85c 100644
--- a/pkgs/development/python-modules/pytado/default.nix
+++ b/pkgs/development/python-modules/pytado/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytado";
-  version = "0.17.6";
+  version = "0.17.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "wmalgadey";
     repo = "PyTado";
     rev = "refs/tags/${version}";
-    hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE=";
+    hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 1cc1d8f5d180..7cec1417bfc8 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.30";
+  version = "3.3.32";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zSeDeGD/78bIoKm6B8BN4qWQE1ivNgyvnrGtgsekM3M=";
+    hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix
new file mode 100644
index 000000000000..260b9634b311
--- /dev/null
+++ b/pkgs/development/python-modules/pytask/default.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchFromGitHub,
+  hatchling,
+  hatch-vcs,
+  attrs,
+  click,
+  click-default-group,
+  networkx,
+  optree,
+  packaging,
+  pluggy,
+  rich,
+  sqlalchemy,
+  universal-pathlib,
+  pytestCheckHook,
+  nbmake,
+  pexpect,
+  pytest-xdist,
+  syrupy,
+  git,
+  tomli,
+}:
+buildPythonPackage rec {
+  pname = "pytask";
+  version = "0.5.1";
+  pyproject = true;
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "pytask-dev";
+    repo = "pytask";
+    rev = "v${version}";
+    hash = "sha256-b+sS+l0Rp5bb8Dh6UBv3xHYTYKFp3dD5AuLqxB3n6Go=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
+    attrs
+    click
+    click-default-group
+    networkx
+    optree
+    packaging
+    pluggy
+    rich
+    sqlalchemy
+    universal-pathlib
+  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    git
+    nbmake
+    pexpect
+    pytest-xdist
+    syrupy
+  ];
+
+  # The test suite runs the installed command for e2e tests
+  preCheck = ''
+    export PATH="$PATH:$out/bin";
+  '';
+
+  disabledTests = [
+    # This accesses the network
+    "test_download_file"
+    # Racy
+    "test_more_nested_pytree_and_python_node_as_return_with_names"
+  ];
+
+  meta = with lib; {
+    description = "Workflow management system that facilitates reproducible data analyses";
+    homepage = "https://github.com/pytask-dev/pytask";
+    changelog = "https://github.com/pytask-dev/pytask/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ erooke ];
+  };
+}
diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix
index 2b97ceb8fb0d..7fa18fb19491 100644
--- a/pkgs/development/python-modules/pytautulli/default.nix
+++ b/pkgs/development/python-modules/pytautulli/default.nix
@@ -27,11 +27,11 @@ buildPythonPackage rec {
     # Upstream is releasing with the help of a CI to PyPI, GitHub releases
     # are not in their focus
     substituteInPlace setup.py \
-      --replace 'version="main",' 'version="${version}",'
+      --replace-fail 'version="main",' 'version="${version}",'
 
     # yarl 1.9.4 requires ports to be ints
     substituteInPlace pytautulli/models/host_configuration.py \
-      --replace "str(self.port)" "int(self.port)"
+      --replace-fail "str(self.port)" "int(self.port)"
   '';
 
   propagatedBuildInputs = [ aiohttp ];
@@ -43,7 +43,10 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
-  pytestFlagsArray = [ "--asyncio-mode=auto" ];
+  disabledTests = [
+    # api url mismatch (port missing)
+    "test_api_url"
+  ];
 
   pythonImportsCheck = [ "pytautulli" ];
 
diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix
index 8741af9da335..d74ffcb45d2a 100644
--- a/pkgs/development/python-modules/pytest-cases/default.nix
+++ b/pkgs/development/python-modules/pytest-cases/default.nix
@@ -11,21 +11,22 @@
 
 buildPythonPackage rec {
   pname = "pytest-cases";
-  version = "3.8.5";
+  version = "3.8.6";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ySBUGHhHp9MNirZwn7FnCoMOThkjS+cAyFyWttcQLBY=";
+    pname = "pytest_cases";
+    inherit version;
+    hash = "sha256-XCTgqwy2+OgCpGm3llkGozPTuruHRYbrxW9+LL4afEQ=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     decopatch
     makefun
   ];
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 71e6e66c5b5b..63032480164a 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -7,17 +7,18 @@
   setuptools-scm,
   django-configurations,
   pytest,
-  pytest-xdist,
   pytestCheckHook,
 }:
+
 buildPythonPackage rec {
   pname = "pytest-django";
-  version = "4.8.0";
+  version = "4.9.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-XQVP4BHFbzsQ+Xj0Go77Llrfx+aA7zb7VxraHyR3nZA=";
+    pname = "pytest_django";
+    inherit version;
+    hash = "sha256-i/e8NYya5vb8UbbOuxkP4gISGW5oBxIfEb1qOwNCgxQ=";
   };
 
   build-system = [
@@ -31,23 +32,18 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     django-configurations
-    pytest-xdist
+    # pytest-xidst causes random errors in the form of: django.db.utils.OperationalError: no such table: app_item
     pytestCheckHook
   ];
 
   preCheck = ''
     # bring pytest_django_test module into PYTHONPATH
-    export PYTHONPATH="$(pwd):$PYTHONPATH"
+    export PYTHONPATH="$PWD:$PYTHONPATH"
 
     # test the lightweight sqlite flavor
     export DJANGO_SETTINGS_MODULE="pytest_django_test.settings_sqlite"
   '';
 
-  disabledTests = [
-    # AttributeError: type object 'TestLiveServer' has no attribute '_test_settings_before_run'
-    "test_settings_restored"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
@@ -55,5 +51,6 @@ buildPythonPackage rec {
     description = "Pytest plugin for testing of Django applications";
     homepage = "https://pytest-django.readthedocs.org/en/latest/";
     license = licenses.bsd3;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix
index c013b583a012..e2a4f0e4a8ab 100644
--- a/pkgs/development/python-modules/pytest-env/default.nix
+++ b/pkgs/development/python-modules/pytest-env/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-env";
-  version = "1.1.3";
+  version = "1.1.5";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "pytest_env";
     inherit version;
-    hash = "sha256-/NfcI7tx79PTVjK94bvl7oyNxEidZhf7AQZ0iA2WIWs=";
+    hash = "sha256-kSCYQKoOQzhQc6xGSlVK0pR8wv1mOp3r+I0DsB4Mwc8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index 152223f2ea5c..3bed5314cfb9 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpserver";
-  version = "1.0.10";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "csernazs";
     repo = "pytest-httpserver";
     rev = "refs/tags/${version}";
-    hash = "sha256-KCsZs4MGENByF/wB+aj3yvMp7lssHNVKx8jLhDQ1u4k=";
+    hash = "sha256-BkdbCrpZKjHYikZk1mL4iSGe5gRjWUVN/w222QkmFLQ=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index 59a5a76e2eb5..032631ca3bde 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpx";
-  version = "0.30.0";
+  version = "0.32.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Colin-b";
     repo = "pytest_httpx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JfyqeOCHNHO4IEHVrh47TdWvb8lcy/1Prqnfphs0ufM=";
+    hash = "sha256-YwpNwtSTyCd78Q4zjvdCoXxpFd1XItcV5dq/O9z1dMw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
index 236e6dad3bfe..66a267be113e 100644
--- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-lazy-fixtures";
-  version = "1.0.7";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dev-petrov";
     repo = "pytest-lazy-fixtures";
-    rev = version;
-    hash = "sha256-BOKUg5HPBQfteKOEsdZ30h/hWbVZPuHMhtGXF3KfMXg=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-2gaGIv4vfMdhLXQeYMbbx9B6tIsCGw4rytaO8bfRuEI=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index 8549d394b984..009615455970 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -5,26 +5,31 @@
   fetchPypi,
   werkzeug,
   pythonOlder,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-localserver";
-  version = "0.8.1";
-  format = "setuptools";
+  version = "0.9.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ZlacNP7zGldQsW7/0c0SiKepC1kVXQBef5FqzNPe5PE=";
+    pname = "pytest_localserver";
+    inherit version;
+    hash = "sha256-+voCggk37n050B11D9Bc6xl/xfPIlfgbysOCbbCQh+0=";
   };
 
-  propagatedBuildInputs = [
-    aiosmtpd
-    werkzeug
-  ];
+  build-system = [ setuptools-scm ];
 
-  # all tests access network: does not work in sandbox
+  dependencies = [ werkzeug ];
+
+  optional-dependencies = {
+    smtp = [ aiosmtpd ];
+  };
+
+  # All tests access network: does not work in sandbox
   doCheck = false;
 
   pythonImportsCheck = [ "pytest_localserver" ];
diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix
index fd26b16b6508..d5bfa4402cbe 100644
--- a/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -2,52 +2,58 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   setuptools-scm,
   pytest,
   jinja2,
   matplotlib,
+  packaging,
   pillow,
-  pytest7CheckHook,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-mpl";
-  version = "0.16.1";
-  format = "setuptools";
+  version = "0.17.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk=";
+    hash = "sha256-++8F1+ZktLM0UvtpisGI5SJ5HzJ9405+o329/p1SysY=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jinja2
     matplotlib
+    packaging
     pillow
   ];
 
-  nativeCheckInputs = [ pytest7CheckHook ];
-
-  disabledTests = [
-    # Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee
-    "test_hash_fails"
-    "test_hash_missing"
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTestPaths = [
     # Following are broken since at least a1548780dbc79d76360580691dc1bb4af4e837f6
     "tests/subtests/test_subtest.py"
   ];
 
+  # need to set MPLBACKEND=agg for headless matplotlib for darwin
+  # https://github.com/matplotlib/matplotlib/issues/26292
+  # The default tolerance is too strict in our build environment
+  # https://github.com/matplotlib/pytest-mpl/pull/9
+  # https://github.com/matplotlib/pytest-mpl/issues/225
   preCheck = ''
-    export HOME=$(mktemp -d)
-    mkdir -p $HOME/.config/matplotlib
-    echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
-    ln -s $HOME/.config/matplotlib $HOME/.matplotlib
+    export MPLBACKEND=agg
+    substituteInPlace pytest_mpl/plugin.py \
+      --replace-fail "DEFAULT_TOLERANCE = 2" "DEFAULT_TOLERANCE = 10"
+    substituteInPlace tests/test_pytest_mpl.py \
+      --replace-fail "DEFAULT_TOLERANCE = 10 if WIN else 2" "DEFAULT_TOLERANCE = 10"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix
index 664e0609080d..ee0bd0220226 100644
--- a/pkgs/development/python-modules/pytest-subtests/default.nix
+++ b/pkgs/development/python-modules/pytest-subtests/default.nix
@@ -17,14 +17,15 @@
 
 buildPythonPackage rec {
   pname = "pytest-subtests";
-  version = "0.12.1";
+  version = "0.13.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-1mBdy4hkfgt8GInQJ/jvHBfXosYJJ+v9wJx7DYEgR20=";
+    pname = "pytest_subtests";
+    inherit version;
+    hash = "sha256-mJ448PHAG8fGsuBNt9n9hZ2zXXfCwaQwyDGnDL8/3i0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index ddfcf7c3d720..986c7aef8f0e 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,12 +29,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "8.3.2";
+  version = "8.3.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wTI0XRLOVRJCyHJp3oEkg/W8yHzbtHIuSEh7oZT5/c4=";
+    hash = "sha256-cLmBB71kgwinlSsG5sqaULxmC+IY1TwlfMH8lP2hAYE=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index cb2185845e65..6dfdab632d04 100644
--- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
@@ -2,22 +2,34 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-axolotl-curve25519";
   version = "0.4.1.post2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3";
   };
 
-  meta = with lib; {
+  patches = [
+    # https://github.com/tgalal/python-axolotl-curve25519/pull/26
+    (fetchpatch {
+      url = "https://github.com/tgalal/python-axolotl-curve25519/commit/901f4fb12e1290b72fbd26ea1f40755b079fa241.patch";
+      hash = "sha256-hdhaOysRXI9q5D9e/bfy0887bpEFSvUyrbl32nBgteQ=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  meta = {
     homepage = "https://github.com/tgalal/python-axolotl-curve25519";
     description = "Curve25519 with ed25519 signatures";
-    maintainers = with maintainers; [ abbradar ];
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers; [ abbradar ];
+    license = lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index b6312d2c0178..42e9abe85c3b 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -6,9 +6,10 @@
   backoff,
   buildPythonPackage,
   fetchFromGitHub,
+  mashumaro,
+  orjson,
   packaging,
   poetry-core,
-  mashumaro,
   pytest-asyncio,
   pytest-cov-stub,
   pytest-mock,
@@ -19,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "python-bsblan";
-  version = "0.6.2";
+  version = "0.6.4";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -28,7 +29,7 @@ buildPythonPackage rec {
     owner = "liudger";
     repo = "python-bsblan";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/rdYCd5eyFqW96XaIzQOhsApzcTkrI46Gt226sLTLUQ=";
+    hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI=";
   };
 
   postPatch = ''
@@ -43,8 +44,9 @@ buildPythonPackage rec {
     aiohttp
     async-timeout
     backoff
-    packaging
     mashumaro
+    orjson
+    packaging
     yarl
   ];
 
diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix
index 019fd93c4a00..d762c5f0ed69 100644
--- a/pkgs/development/python-modules/python-can/default.nix
+++ b/pkgs/development/python-modules/python-can/default.nix
@@ -9,6 +9,7 @@
   parameterized,
   msgpack,
   pyserial,
+  pytest-cov-stub,
   pytest-timeout,
   pytestCheckHook,
   pythonOlder,
@@ -32,14 +33,11 @@ buildPythonPackage rec {
     hash = "sha256-p3B1LWSygDX0UhIx4XhXv15H7Hwn9UB20jFIPDZnuNs=";
   };
 
-  postPatch = ''
-    substituteInPlace tox.ini \
-      --replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" ""
-  '';
+  pythonRelaxDeps = [ "msgpack" ];
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     msgpack
     packaging
     typing-extensions
@@ -56,6 +54,7 @@ buildPythonPackage rec {
     future
     hypothesis
     parameterized
+    pytest-cov-stub
     pytest-timeout
     pytestCheckHook
   ] ++ optional-dependencies.serial;
diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix
index 55522bc960b5..c89cd3d07bda 100644
--- a/pkgs/development/python-modules/python-crontab/default.nix
+++ b/pkgs/development/python-modules/python-crontab/default.nix
@@ -10,19 +10,20 @@
 
 buildPythonPackage rec {
   pname = "python-crontab";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9OoWBdJFM7Z/p6Y07ybLWaXy55VPbmd9LXoiKZWaL8g=";
+    pname = "python_crontab";
+    inherit version;
+    hash = "sha256-QAZ9HdOa3jRgsq2FV8dlFRTNOFHe//9hxcYOEifFw2s=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ python-dateutil ];
+  dependencies = [ python-dateutil ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index 9092a49d7690..d39f44084d50 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   runCommand,
 
   # build-system
@@ -30,16 +31,29 @@ let
 in
 buildPythonPackage rec {
   pname = "python-dbusmock";
-  version = "0.31.1";
+  version = "0.32.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-DdV78o089Jkc7mSsGvlJgVpv8kPpMILo7lC6EbLxkxg=";
+    hash = "sha256-TOs6wAZDcSD1eP+Hbj78YXoAtKbReC5di5QSpQdwp8E=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "musl.patch";
+      url = "https://github.com/martinpitt/python-dbusmock/commit/1a8d8722068ef7e5f061336047a72d1a0f253b98.patch";
+      hash = "sha256-0j3UXsTMDh1+UolkmoLQXlwHXve81yKiGJ7gDWNZVPY=";
+    })
+    (fetchpatch {
+      name = "os-release.patch";
+      url = "https://github.com/martinpitt/python-dbusmock/commit/4b99cff50e8c741f20aef4527b27ccdb2a4053d2.patch";
+      hash = "sha256-Xcovv44JeuTvPAtXWJvWE+MxlyloClSJGKZz+C3P5bE=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
index b4626a8d02db..4433e441b6cb 100644
--- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
+++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "python-homeassistant-analytics";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-homeassistant-analytics";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo=";
+    hash = "sha256-vyJseIYFmbxUYieZB0r3Z3j6/ZHmgs7ONa5YKQTwAXw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix
index 2e644fa1dc82..af7cd125befb 100644
--- a/pkgs/development/python-modules/python-ipmi/default.nix
+++ b/pkgs/development/python-modules/python-ipmi/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "python-ipmi";
-  version = "0.5.5";
+  version = "0.5.7";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "kontron";
     repo = "python-ipmi";
     rev = "refs/tags/${version}";
-    hash = "sha256-G5FcFHtyN8bXMjj/yfJgzcfmV1mxQ9lu3GM3XMeTWVU=";
+    hash = "sha256-vwjVUkTeVC1On1I1BtM0kBbne6CbX/6Os1+HA8WN9jU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 51772d90f942..796b3e601f38 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "python-kasa";
-  version = "0.7.5";
+  version = "0.7.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "python-kasa";
     repo = "python-kasa";
     rev = "refs/tags/${version}";
-    hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs=";
+    hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix
index ebb042b848ec..97e8967e8fd6 100644
--- a/pkgs/development/python-modules/python-ldap/default.nix
+++ b/pkgs/development/python-modules/python-ldap/default.nix
@@ -13,12 +13,12 @@
   openldap,
   cyrus_sasl,
 
-  # dependencies
   pyasn1,
   pyasn1-modules,
 
   # tests
   pytestCheckHook,
+  jaraco-functools,
 }:
 
 buildPythonPackage rec {
@@ -50,7 +50,10 @@ buildPythonPackage rec {
     pyasn1-modules
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    jaraco-functools
+    pytestCheckHook
+  ];
 
   preCheck = ''
     # Needed by tests to setup a mockup ldap server.
@@ -68,10 +71,11 @@ buildPythonPackage rec {
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   meta = with lib; {
-    changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}";
     description = "Python modules for implementing LDAP clients";
     downloadPage = "https://github.com/python-ldap/python-ldap";
     homepage = "https://www.python-ldap.org/";
+    changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}";
     license = licenses.psfl;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
index 3efb6a31b201..37ccb0932569 100644
--- a/pkgs/development/python-modules/python-linkplay/default.nix
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-linkplay";
-  version = "0.0.16";
+  version = "0.0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Velleman";
     repo = "python-linkplay";
     rev = "refs/tags/v${version}";
-    hash = "sha256-YjsRjzkYac3IDuAq5s73INELNfWO6EhU5BMM7xQO7pk=";
+    hash = "sha256-TJ5QWt5bCDy9L4EShf1rW1TDIrF0LfeThEv9PiCPEp8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-lorem/default.nix b/pkgs/development/python-modules/python-lorem/default.nix
new file mode 100644
index 000000000000..e60991c79357
--- /dev/null
+++ b/pkgs/development/python-modules/python-lorem/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "python-lorem";
+  version = "1.3.0.post3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "python_lorem";
+    hash = "sha256-Vw1TKheXg+AkhksnmWUfdIo+Jt7X7m1pS2f0Kfe8pv0=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "lorem"
+  ];
+
+  meta = {
+    description = "Pythonic lorem ipsum generator";
+    homepage = "https://github.com/JarryShaw/lorem";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix
index 8a736730ef54..11ac0d27545e 100644
--- a/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/pkgs/development/python-modules/python-matter-server/default.nix
@@ -14,7 +14,6 @@
   aiorun,
   async-timeout,
   coloredlogs,
-  dacite,
   orjson,
   home-assistant-chip-clusters,
 
@@ -92,7 +91,6 @@ buildPythonPackage rec {
     aiorun
     async-timeout
     coloredlogs
-    dacite
     orjson
     home-assistant-chip-clusters
   ];
@@ -119,12 +117,6 @@ buildPythonPackage rec {
       export PYTHONPATH=${pythonEnv}/${python.sitePackages}
     '';
 
-  pytestFlagsArray = [
-    # Upstream theymselves limit the test scope
-    # https://github.com/home-assistant-libs/python-matter-server/blob/main/.github/workflows/test.yml#L65
-    "tests/server"
-  ];
-
   meta = with lib; {
     changelog = "https://github.com/home-assistant-libs/python-matter-server/releases/tag/${version}";
     description = "Python server to interact with Matter";
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index 3703e1275762..12b1e19f2c5b 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "python-multipart";
-  version = "0.0.9";
+  version = "0.0.12";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_multipart";
     inherit version;
-    hash = "sha256-A/VGiMZj8beXcQXwIQQ7B5MVHkyxwanUoR/BPWIsQCY=";
+    hash = "sha256-BF4fmNcZwc4IXtf34e+djMyMAroCtVZtX3UhQQztWMs=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix
index f0a0277eb48c..e5ed4cd9b2b3 100644
--- a/pkgs/development/python-modules/python-musicpd/default.nix
+++ b/pkgs/development/python-modules/python-musicpd/default.nix
@@ -7,16 +7,15 @@
 
 buildPythonPackage rec {
   pname = "python-musicpd";
-  version = "0.9.0";
+  version = "0.9.1";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname;
+    pname = "python_musicpd";
     inherit version;
-    hash = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco=";
+    hash = "sha256-zKjazEIxja6/tPWFXQhEYlLd1Jl8py9wirKsoDXeGu4=";
   };
 
-  pyproject = true;
-
   build-system = [ setuptools ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix
index 590ec69df624..6f8d8785cbcb 100644
--- a/pkgs/development/python-modules/python-on-whales/default.nix
+++ b/pkgs/development/python-modules/python-on-whales/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "python-on-whales";
-  version = "0.69.0";
+  version = "0.73.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,12 +21,12 @@ buildPythonPackage rec {
     owner = "gabrieldemarmiesse";
     repo = "python-on-whales";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2ZrbiHvcYwerhGQmtC/903W/WpuqgYqapRzLpu30sRs=";
+    hash = "sha256-i2lctR5V4hF/cS46d+TW73iKZ+2G/UwiHMNbtP/Z7xo=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     pydantic
     requests
     tqdm
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   ];
 
   doCheck = false; # majority of tests require Docker and/or network access
+
   pythonImportsCheck = [ "python_on_whales" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix
index ee782b7362a7..bb388ab450db 100644
--- a/pkgs/development/python-modules/python-osc/default.nix
+++ b/pkgs/development/python-modules/python-osc/default.nix
@@ -12,15 +12,16 @@
 
 buildPythonPackage rec {
   pname = "python-osc";
-  version = "1.8.3";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo=";
+    pname = "python_osc";
+    inherit version;
+    hash = "sha256-q1D2axoZ79W/9yLyarZFDfGc3YS6ho8IyaM+fHhRRFY=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "pythonosc" ];
 
diff --git a/pkgs/development/python-modules/python-poppler/default.nix b/pkgs/development/python-modules/python-poppler/default.nix
new file mode 100644
index 000000000000..85609035f009
--- /dev/null
+++ b/pkgs/development/python-modules/python-poppler/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  pytestCheckHook,
+  setuptools,
+  meson-python,
+  ninja,
+  meson,
+  poppler,
+  pkg-config,
+  pybind11,
+}:
+
+buildPythonPackage rec {
+  pname = "python-poppler";
+  version = "0.4.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "python_poppler";
+    hash = "sha256-5spcI+wCNQvyzvhaa/nxsmF5ZDbbR4F2+dJPsU7uzGo=";
+  };
+
+  patches = [
+    # Prevent Meson from downloading pybind11, use system version instead
+    ./use_system_pybind11.patch
+  ];
+
+  build-system = [ meson-python ];
+
+  buildInputs = [ pybind11 ];
+
+  nativeBuildInputs = [
+    ninja
+    pkg-config
+  ];
+
+  propagatedBuildInputs = [ poppler ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportCheck = [ "poppler" ];
+
+  meta = {
+    description = "Python binding to poppler-cpp";
+    homepage = "https://github.com/cbrunet/python-poppler";
+    changelog = "https://cbrunet.net/python-poppler/changelog.html";
+    # Contradictory license definition
+    # https://github.com/cbrunet/python-poppler/issues/90
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch b/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch
new file mode 100644
index 000000000000..a84d26e85a23
--- /dev/null
+++ b/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index c1ac57a..1d1ad1f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,7 +13,6 @@ poppler_dep = dependency('poppler-cpp', version: '>=0.26.0')
+ python_mod = import('python')
+ python3 = python_mod.find_installation('python3', pure: false)
+ 
+-pybind11_proj = subproject('pybind11')
+-pybind11_dep = pybind11_proj.get_variable('pybind11_dep')
++pybind11_dep = dependency('pybind11')
+ 
+ subdir('src')
diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 1385f887bd12..9cfebbbbaa90 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.6.1";
+  version = "2.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "humbertogontijo";
     repo = "python-roborock";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI=";
+    hash = "sha256-sPG3AqVrv+BiB+copgaghWDT/Rb/WU0R+Y8Z2J6l+7E=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix
index fcbd2f98060c..80422b7cf258 100644
--- a/pkgs/development/python-modules/python-snap7/default.nix
+++ b/pkgs/development/python-modules/python-snap7/default.nix
@@ -9,8 +9,8 @@
 
 buildPythonPackage rec {
   pname = "python-snap7";
-  version = "1.3";
-  format = "setuptools";
+  version = "1.4.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -18,17 +18,17 @@ buildPythonPackage rec {
     owner = "gijzelaerr";
     repo = "python-snap7";
     rev = "refs/tags/${version}";
-    hash = "sha256-90WwgqPHsHbuQUY49cSQblN1jfoLydiG0dm1aMF/NCA=";
+    hash = "sha256-CqLG5/U2k7WdZL5LfcFAnV1Q8HcIU7l36gi51lgB39s=";
   };
 
-  propagatedBuildInputs = [ setuptools ];
-
   prePatch = ''
     substituteInPlace snap7/common.py \
       --replace "lib_location = None" "lib_location = '${snap7}/lib/libsnap7.so'"
   '';
 
-  # Tests require root privileges to open privilaged ports
+  build-system = [ setuptools ];
+
+  # Tests require root privileges to open privileged ports
   doCheck = false;
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix
index 806f067173df..eb6e12df362c 100644
--- a/pkgs/development/python-modules/python-snappy/default.nix
+++ b/pkgs/development/python-modules/python-snappy/default.nix
@@ -10,12 +10,13 @@
 
 buildPythonPackage rec {
   pname = "python-snappy";
-  version = "0.7.1";
+  version = "0.7.3";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-G8KdNiEdRLufBPPXzPuurrvC9ittQPT8Tt0fsWvFLBM=";
+    pname = "python_snappy";
+    inherit version;
+    hash = "sha256-QCFsG637LTiseB7LFiodDsQPjul0fmELz+/fp5SGzuM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index 0796ea2b3c96..41664ad7d9eb 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -10,6 +10,7 @@
   pytest-trio,
   pythonOlder,
   pytestCheckHook,
+  setuptools,
   trio,
   trustme,
   yarl,
@@ -17,8 +18,8 @@
 
 buildPythonPackage rec {
   pname = "python-socks";
-  version = "2.4.4";
-  format = "setuptools";
+  version = "2.5.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.6.2";
 
@@ -28,15 +29,24 @@ buildPythonPackage rec {
     owner = "romis2012";
     repo = "python-socks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-c1fjSHi7LvaOeZwTOTSY/ZVr27/j03CdAra1PSa9Jt0=";
+    hash = "sha256-8qh7ohErK10RlVh4Zi1jBVmafWkGmLcGZsTDqE3dldY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     trio
     curio
     async-timeout
   ];
 
+  optional-dependencies = {
+    asyncio = lib.optionals (pythonOlder "3.11") [ async-timeout ];
+    trio = [ trio ];
+    curio = [ curio ];
+    anyio = [ anyio ];
+  };
+
   doCheck = false; # requires tiny_proxy module
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index b664291e2c85..2cc7a7c95595 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "21.6";
+  version = "21.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "python-telegram-bot";
     repo = "python-telegram-bot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FwAlceRqQfTjCCi+Mqrf0LCxSZD4mV/CVN6YPs947c4=";
+    hash = "sha256-I8pSUL1nR1x+WUBYK31RlwFE/ATh2tCteYNWEg8XQjg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/python-youtube/default.nix b/pkgs/development/python-modules/python-youtube/default.nix
index 3b48fde0c3e9..660a97ec891d 100644
--- a/pkgs/development/python-modules/python-youtube/default.nix
+++ b/pkgs/development/python-modules/python-youtube/default.nix
@@ -12,14 +12,14 @@
 }:
 buildPythonPackage rec {
   pname = "python-youtube";
-  version = "0.9.4";
+  version = "0.9.6";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "sns-sdks";
     repo = "python-youtube";
     rev = "refs/tags/v${version}";
-    hash = "sha256-OesJfnXI1w2d5moJyqvrWU3sCxDaqnk1bAhtK6SPjFw=";
+    hash = "sha256-IuVnXVe54D0g+7S+AuTGtBlwcmxHpkk1e9Vt8laEV2c=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix
index 9119f1a27268..765db395d0bc 100644
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   pytestCheckHook,
   pycparser,
@@ -13,17 +13,20 @@
 
 let
   pname = "pythonnet";
-  version = "3.0.3";
-  src = fetchPypi {
-    pname = "pythonnet";
-    inherit version;
-    hash = "sha256-jUsulxWKAjh1+GR0WKWPOIF/T+Oa9gq91rDYrfHXfnU=";
+  version = "3.0.4";
+  src = fetchFromGitHub {
+    owner = "pythonnet";
+    repo = "pythonnet";
+    rev = "v${version}";
+    hash = "sha256-QdgcBFQDFxmFxuXsDlHcu+L/VWw2aKfyWDqPrawyhOs=";
   };
 
   # This buildDotnetModule is used only to get nuget sources, the actual
   # build is done in `buildPythonPackage` below.
   dotnet-build = buildDotnetModule {
     inherit pname version src;
+    projectFile = "src/runtime/Python.Runtime.csproj";
+    testProjectFile = "src/testing/Python.Test.csproj";
     nugetDeps = ./deps.nix;
   };
 in
@@ -59,14 +62,6 @@ buildPythonPackage {
     psutil # needed for memory leak tests
   ];
 
-  # Perform dotnet restore based on the nuget-source
-  preConfigure = ''
-    dotnet restore \
-      -p:ContinuousIntegrationBuild=true \
-      -p:Deterministic=true \
-      --source "$nugetSource"
-  '';
-
   # Rerun this when updating to refresh Nuget dependencies
   passthru.fetch-deps = dotnet-build.fetch-deps;
 
diff --git a/pkgs/development/python-modules/pythonnet/deps.nix b/pkgs/development/python-modules/pythonnet/deps.nix
index 2cbc3430b432..e58bb47b7447 100644
--- a/pkgs/development/python-modules/pythonnet/deps.nix
+++ b/pkgs/development/python-modules/pythonnet/deps.nix
@@ -3,949 +3,139 @@
 
 { fetchNuGet }:
 [
-  (fetchNuGet {
-    pname = "BenchmarkDotNet";
-    version = "0.13.1";
-    sha256 = "1kgypxfp34vjy9kvqq8csznsjbnv37pp4r0457i5l1j6zrsm76rp";
-  })
-  (fetchNuGet {
-    pname = "BenchmarkDotNet.Annotations";
-    version = "0.13.1";
-    sha256 = "0fizarpvdajwcvfhd45c35xrnrci5rbn5ksf3zvlw4q300hnlsir";
-  })
-  (fetchNuGet {
-    pname = "CommandLineParser";
-    version = "2.4.3";
-    sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55";
-  })
-  (fetchNuGet {
-    pname = "Iced";
-    version = "1.8.0";
-    sha256 = "12cgd9p3jm81wd7m8bp3pm20gmrmbad2hcwzynhz644h3062nn24";
-  })
   (fetchNuGet {
     pname = "Lost.Compat.NullabilityAttributes";
     version = "0.0.4";
-    sha256 = "1h8m1n4x1p69xh86ia1rf4dcr17w965fpxws7d3458r4w1wl143a";
+    hash = "sha256-apBAeeAko0JGO5r364pJ/ITMGnE5qGgQ7Mnc0IkNFcE=";
   })
   (fetchNuGet {
     pname = "Microsoft.Build.Tasks.Git";
     version = "1.1.1";
-    sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.CodeAnalysis.Analyzers";
-    version = "2.6.1";
-    sha256 = "1plk343h9fyxg08b9bcnlqyaq00cbnc1v73pj9nbcyphmgf5bqfp";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.CodeAnalysis.Common";
-    version = "2.10.0";
-    sha256 = "1l690xqrhmkasns5ghz0vqj8n2xyl5yrwan5gs52hwfxdwahqaaj";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.CodeAnalysis.CSharp";
-    version = "2.10.0";
-    sha256 = "0saabsr81crawdzs2cnzyjp5cgg2hk5k6q7n0i0pxghswb0m4dxk";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.CodeCoverage";
-    version = "16.11.0";
-    sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.CodeCoverage";
-    version = "17.0.0";
-    sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.CodeCoverage";
-    version = "17.6.2";
-    sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g";
+    hash = "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0=";
   })
   (fetchNuGet {
     pname = "Microsoft.CSharp";
     version = "4.7.0";
-    sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Diagnostics.NETCore.Client";
-    version = "0.2.61701";
-    sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Diagnostics.Runtime";
-    version = "1.1.126102";
-    sha256 = "0w7jcxkd4cix6dbh0szawilmykjmdc1rqysllrpwb7ivrxzazypn";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Diagnostics.Tracing.TraceEvent";
-    version = "2.0.61";
-    sha256 = "0gq51l4yyyn8dir6w41im9fwhw9r6jz6n7jm4zhmvvway5ijbcac";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.DotNet.InternalAbstractions";
-    version = "1.0.0";
-    sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.DotNet.PlatformAbstractions";
-    version = "2.1.0";
-    sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy";
+    hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=";
   })
   (fetchNuGet {
     pname = "Microsoft.Net.Compilers.Toolset";
     version = "4.0.1";
-    sha256 = "08njbdnmjzjd6phys94w0di3vcxfq7pniad6s3jc5f65r9s1f0w2";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NET.Test.Sdk";
-    version = "16.11.0";
-    sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NET.Test.Sdk";
-    version = "17.0.0";
-    sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NET.Test.Sdk";
-    version = "17.6.2";
-    sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NETCore.Platforms";
-    version = "1.0.1";
-    sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr";
+    hash = "sha256-ggMXdMrFuMLk0KapaO/BrrM9YgOcJO3hNU1+WW1b0iI=";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Platforms";
     version = "1.1.0";
-    sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NETCore.Targets";
-    version = "1.0.1";
-    sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p";
+    hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Targets";
     version = "1.1.0";
-    sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NETFramework.ReferenceAssemblies";
-    version = "1.0.0";
-    sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NETFramework.ReferenceAssemblies.net461";
-    version = "1.0.0";
-    sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NETFramework.ReferenceAssemblies.net472";
-    version = "1.0.0";
-    sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc";
+    hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=";
   })
   (fetchNuGet {
     pname = "Microsoft.SourceLink.Common";
     version = "1.1.1";
-    sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg";
+    hash = "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY=";
   })
   (fetchNuGet {
     pname = "Microsoft.SourceLink.GitHub";
     version = "1.1.1";
-    sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.TestPlatform.ObjectModel";
-    version = "16.11.0";
-    sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.TestPlatform.ObjectModel";
-    version = "17.6.2";
-    sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.TestPlatform.TestHost";
-    version = "16.11.0";
-    sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.TestPlatform.TestHost";
-    version = "17.6.2";
-    sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Win32.Primitives";
-    version = "4.3.0";
-    sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Win32.Registry";
-    version = "4.3.0";
-    sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Win32.Registry";
-    version = "4.5.0";
-    sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q";
-  })
-  (fetchNuGet {
-    pname = "NETStandard.Library";
-    version = "2.0.0";
-    sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy";
+    hash = "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU=";
   })
   (fetchNuGet {
     pname = "NETStandard.Library";
     version = "2.0.3";
-    sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y";
-  })
-  (fetchNuGet {
-    pname = "Newtonsoft.Json";
-    version = "13.0.1";
-    sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb";
-  })
-  (fetchNuGet {
-    pname = "Newtonsoft.Json";
-    version = "9.0.1";
-    sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r";
+    hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=";
   })
   (fetchNuGet {
     pname = "NonCopyableAnalyzer";
     version = "0.7.0";
-    sha256 = "1jry36p53fkk3fn9pawgg7qiv79j30y0kvd4xrnd58d7zg7zzdj0";
-  })
-  (fetchNuGet {
-    pname = "NuGet.Frameworks";
-    version = "5.0.0";
-    sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr";
-  })
-  (fetchNuGet {
-    pname = "NuGet.Frameworks";
-    version = "6.5.0";
-    sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj";
-  })
-  (fetchNuGet {
-    pname = "NUnit";
-    version = "3.12.0";
-    sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2";
-  })
-  (fetchNuGet {
-    pname = "NUnit";
-    version = "3.13.3";
-    sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6";
-  })
-  (fetchNuGet {
-    pname = "NUnit3TestAdapter";
-    version = "3.16.1";
-    sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9";
-  })
-  (fetchNuGet {
-    pname = "NUnit3TestAdapter";
-    version = "3.17.0";
-    sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6";
-  })
-  (fetchNuGet {
-    pname = "NUnit3TestAdapter";
-    version = "4.5.0";
-    sha256 = "1srx1629s0k1kmf02nmz251q07vj6pv58mdafcr5dr0bbn1fh78i";
-  })
-  (fetchNuGet {
-    pname = "Perfolizer";
-    version = "0.2.1";
-    sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Collections";
-    version = "4.3.0";
-    sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Diagnostics.Tools";
-    version = "4.3.0";
-    sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Diagnostics.Tracing";
-    version = "4.3.0";
-    sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Globalization";
-    version = "4.3.0";
-    sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x";
+    hash = "sha256-QLb/z/unodJs7qTtCTwYMp0d8XmPq5usG3O6Ua4ZPss=";
   })
   (fetchNuGet {
     pname = "runtime.any.System.IO";
     version = "4.3.0";
-    sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x";
+    hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=";
   })
   (fetchNuGet {
     pname = "runtime.any.System.Reflection";
     version = "4.3.0";
-    sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Reflection.Extensions";
-    version = "4.3.0";
-    sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33";
+    hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=";
   })
   (fetchNuGet {
     pname = "runtime.any.System.Reflection.Primitives";
     version = "4.3.0";
-    sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Resources.ResourceManager";
-    version = "4.3.0";
-    sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl";
+    hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=";
   })
   (fetchNuGet {
     pname = "runtime.any.System.Runtime";
     version = "4.3.0";
-    sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Runtime.Handles";
-    version = "4.3.0";
-    sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Runtime.InteropServices";
-    version = "4.3.0";
-    sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19";
+    hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
   })
   (fetchNuGet {
     pname = "runtime.any.System.Text.Encoding";
     version = "4.3.0";
-    sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";
-  })
-  (fetchNuGet {
-    pname = "runtime.any.System.Text.Encoding.Extensions";
-    version = "4.3.0";
-    sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8";
+    hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=";
   })
   (fetchNuGet {
     pname = "runtime.any.System.Threading.Tasks";
     version = "4.3.0";
-    sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va";
-  })
-  (fetchNuGet {
-    pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d";
-  })
-  (fetchNuGet {
-    pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59";
-  })
-  (fetchNuGet {
-    pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
+    hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=";
   })
   (fetchNuGet {
     pname = "runtime.native.System";
     version = "4.3.0";
-    sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
-  })
-  (fetchNuGet {
-    pname = "runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
-  })
-  (fetchNuGet {
-    pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3";
-  })
-  (fetchNuGet {
-    pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf";
-  })
-  (fetchNuGet {
-    pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3";
-  })
-  (fetchNuGet {
-    pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn";
-  })
-  (fetchNuGet {
-    pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3";
-  })
-  (fetchNuGet {
-    pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy";
-  })
-  (fetchNuGet {
-    pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
-    version = "4.3.0";
-    sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5";
-  })
-  (fetchNuGet {
-    pname = "runtime.unix.Microsoft.Win32.Primitives";
-    version = "4.3.0";
-    sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id";
-  })
-  (fetchNuGet {
-    pname = "runtime.unix.System.Diagnostics.Debug";
-    version = "4.3.0";
-    sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5";
-  })
-  (fetchNuGet {
-    pname = "runtime.unix.System.IO.FileSystem";
-    version = "4.3.0";
-    sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix";
+    hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
   })
   (fetchNuGet {
     pname = "runtime.unix.System.Private.Uri";
     version = "4.3.0";
-    sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk";
-  })
-  (fetchNuGet {
-    pname = "runtime.unix.System.Runtime.Extensions";
-    version = "4.3.0";
-    sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p";
-  })
-  (fetchNuGet {
-    pname = "System.AppContext";
-    version = "4.1.0";
-    sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
-  })
-  (fetchNuGet {
-    pname = "System.AppContext";
-    version = "4.3.0";
-    sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya";
-  })
-  (fetchNuGet {
-    pname = "System.Buffers";
-    version = "4.3.0";
-    sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy";
-  })
-  (fetchNuGet {
-    pname = "System.Buffers";
-    version = "4.4.0";
-    sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19";
-  })
-  (fetchNuGet {
-    pname = "System.Collections";
-    version = "4.0.11";
-    sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
-  })
-  (fetchNuGet {
-    pname = "System.Collections";
-    version = "4.3.0";
-    sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
-  })
-  (fetchNuGet {
-    pname = "System.Collections.Concurrent";
-    version = "4.3.0";
-    sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8";
-  })
-  (fetchNuGet {
-    pname = "System.Collections.Immutable";
-    version = "1.5.0";
-    sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";
-  })
-  (fetchNuGet {
-    pname = "System.Collections.NonGeneric";
-    version = "4.3.0";
-    sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
-  })
-  (fetchNuGet {
-    pname = "System.Collections.Specialized";
-    version = "4.3.0";
-    sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
-  })
-  (fetchNuGet {
-    pname = "System.ComponentModel";
-    version = "4.3.0";
-    sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
-  })
-  (fetchNuGet {
-    pname = "System.ComponentModel.EventBasedAsync";
-    version = "4.3.0";
-    sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7";
-  })
-  (fetchNuGet {
-    pname = "System.ComponentModel.Primitives";
-    version = "4.3.0";
-    sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
-  })
-  (fetchNuGet {
-    pname = "System.ComponentModel.TypeConverter";
-    version = "4.3.0";
-    sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
-  })
-  (fetchNuGet {
-    pname = "System.Console";
-    version = "4.3.0";
-    sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.Debug";
-    version = "4.0.11";
-    sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.Debug";
-    version = "4.3.0";
-    sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.FileVersionInfo";
-    version = "4.3.0";
-    sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.Process";
-    version = "4.3.0";
-    sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.StackTrace";
-    version = "4.3.0";
-    sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.Tools";
-    version = "4.0.1";
-    sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.Tools";
-    version = "4.3.0";
-    sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
-  })
-  (fetchNuGet {
-    pname = "System.Diagnostics.Tracing";
-    version = "4.3.0";
-    sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
-  })
-  (fetchNuGet {
-    pname = "System.Dynamic.Runtime";
-    version = "4.0.11";
-    sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
-  })
-  (fetchNuGet {
-    pname = "System.Dynamic.Runtime";
-    version = "4.3.0";
-    sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
-  })
-  (fetchNuGet {
-    pname = "System.Globalization";
-    version = "4.0.11";
-    sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
-  })
-  (fetchNuGet {
-    pname = "System.Globalization";
-    version = "4.3.0";
-    sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
-  })
-  (fetchNuGet {
-    pname = "System.Globalization.Extensions";
-    version = "4.3.0";
-    sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
-  })
-  (fetchNuGet {
-    pname = "System.IO";
-    version = "4.1.0";
-    sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
+    hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
   })
   (fetchNuGet {
     pname = "System.IO";
     version = "4.3.0";
-    sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
-  })
-  (fetchNuGet {
-    pname = "System.IO.Compression";
-    version = "4.3.0";
-    sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
-  })
-  (fetchNuGet {
-    pname = "System.IO.FileSystem";
-    version = "4.0.1";
-    sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
-  })
-  (fetchNuGet {
-    pname = "System.IO.FileSystem";
-    version = "4.3.0";
-    sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
-  })
-  (fetchNuGet {
-    pname = "System.IO.FileSystem.Primitives";
-    version = "4.0.1";
-    sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
-  })
-  (fetchNuGet {
-    pname = "System.IO.FileSystem.Primitives";
-    version = "4.3.0";
-    sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
-  })
-  (fetchNuGet {
-    pname = "System.Linq";
-    version = "4.1.0";
-    sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
-  })
-  (fetchNuGet {
-    pname = "System.Linq";
-    version = "4.3.0";
-    sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
-  })
-  (fetchNuGet {
-    pname = "System.Linq.Expressions";
-    version = "4.1.0";
-    sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
-  })
-  (fetchNuGet {
-    pname = "System.Linq.Expressions";
-    version = "4.3.0";
-    sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
-  })
-  (fetchNuGet {
-    pname = "System.Management";
-    version = "4.5.0";
-    sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr";
-  })
-  (fetchNuGet {
-    pname = "System.Memory";
-    version = "4.5.3";
-    sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a";
-  })
-  (fetchNuGet {
-    pname = "System.Numerics.Vectors";
-    version = "4.4.0";
-    sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba";
-  })
-  (fetchNuGet {
-    pname = "System.ObjectModel";
-    version = "4.0.12";
-    sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
+    hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=";
   })
   (fetchNuGet {
     pname = "System.Private.Uri";
     version = "4.3.0";
-    sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection";
-    version = "4.1.0";
-    sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
+    hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
   })
   (fetchNuGet {
     pname = "System.Reflection";
     version = "4.3.0";
-    sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Emit";
-    version = "4.0.1";
-    sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
+    hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=";
   })
   (fetchNuGet {
     pname = "System.Reflection.Emit";
     version = "4.3.0";
-    sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Emit.ILGeneration";
-    version = "4.0.1";
-    sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
+    hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=";
   })
   (fetchNuGet {
     pname = "System.Reflection.Emit.ILGeneration";
     version = "4.3.0";
-    sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Emit.Lightweight";
-    version = "4.0.1";
-    sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Emit.Lightweight";
-    version = "4.3.0";
-    sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Extensions";
-    version = "4.0.1";
-    sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Extensions";
-    version = "4.3.0";
-    sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Metadata";
-    version = "1.6.0";
-    sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.Primitives";
-    version = "4.0.1";
-    sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";
+    hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=";
   })
   (fetchNuGet {
     pname = "System.Reflection.Primitives";
     version = "4.3.0";
-    sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.TypeExtensions";
-    version = "4.1.0";
-    sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
-  })
-  (fetchNuGet {
-    pname = "System.Reflection.TypeExtensions";
-    version = "4.3.0";
-    sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
-  })
-  (fetchNuGet {
-    pname = "System.Resources.ResourceManager";
-    version = "4.0.1";
-    sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi";
-  })
-  (fetchNuGet {
-    pname = "System.Resources.ResourceManager";
-    version = "4.3.0";
-    sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime";
-    version = "4.1.0";
-    sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
+    hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=";
   })
   (fetchNuGet {
     pname = "System.Runtime";
     version = "4.3.0";
-    sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.CompilerServices.Unsafe";
-    version = "4.5.2";
-    sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.Extensions";
-    version = "4.1.0";
-    sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.Extensions";
-    version = "4.3.0";
-    sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.Handles";
-    version = "4.0.1";
-    sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.Handles";
-    version = "4.3.0";
-    sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.InteropServices";
-    version = "4.1.0";
-    sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.InteropServices";
-    version = "4.3.0";
-    sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
-  })
-  (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.Runtime.Numerics";
-    version = "4.3.0";
-    sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.Serialization.Primitives";
-    version = "4.1.1";
-    sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
-  })
-  (fetchNuGet {
-    pname = "System.Security.AccessControl";
-    version = "4.5.0";
-    sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Cryptography.Algorithms";
-    version = "4.3.0";
-    sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Cryptography.Encoding";
-    version = "4.3.0";
-    sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Cryptography.Primitives";
-    version = "4.3.0";
-    sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Cryptography.X509Certificates";
-    version = "4.3.0";
-    sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Principal.Windows";
-    version = "4.5.0";
-    sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86";
-  })
-  (fetchNuGet {
-    pname = "System.Text.Encoding";
-    version = "4.0.11";
-    sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+    hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=";
   })
   (fetchNuGet {
     pname = "System.Text.Encoding";
     version = "4.3.0";
-    sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
-  })
-  (fetchNuGet {
-    pname = "System.Text.Encoding.CodePages";
-    version = "4.3.0";
-    sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv";
-  })
-  (fetchNuGet {
-    pname = "System.Text.Encoding.Extensions";
-    version = "4.0.11";
-    sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
-  })
-  (fetchNuGet {
-    pname = "System.Text.Encoding.Extensions";
-    version = "4.3.0";
-    sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
-  })
-  (fetchNuGet {
-    pname = "System.Text.RegularExpressions";
-    version = "4.1.0";
-    sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
-  })
-  (fetchNuGet {
-    pname = "System.Text.RegularExpressions";
-    version = "4.3.0";
-    sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
-  })
-  (fetchNuGet {
-    pname = "System.Threading";
-    version = "4.0.11";
-    sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
-  })
-  (fetchNuGet {
-    pname = "System.Threading";
-    version = "4.3.0";
-    sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.Tasks";
-    version = "4.0.11";
-    sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
+    hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=";
   })
   (fetchNuGet {
     pname = "System.Threading.Tasks";
     version = "4.3.0";
-    sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.Tasks.Extensions";
-    version = "4.0.0";
-    sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.Tasks.Extensions";
-    version = "4.3.0";
-    sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.Tasks.Extensions";
-    version = "4.5.2";
-    sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.Tasks.Parallel";
-    version = "4.3.0";
-    sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.Thread";
-    version = "4.3.0";
-    sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4";
-  })
-  (fetchNuGet {
-    pname = "System.Threading.ThreadPool";
-    version = "4.3.0";
-    sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1";
-  })
-  (fetchNuGet {
-    pname = "System.ValueTuple";
-    version = "4.5.0";
-    sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.ReaderWriter";
-    version = "4.0.11";
-    sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.ReaderWriter";
-    version = "4.3.0";
-    sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.XDocument";
-    version = "4.0.11";
-    sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.XDocument";
-    version = "4.3.0";
-    sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.XmlDocument";
-    version = "4.3.0";
-    sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.XPath";
-    version = "4.3.0";
-    sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.XPath.XDocument";
-    version = "4.3.0";
-    sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn";
-  })
-  (fetchNuGet {
-    pname = "System.Xml.XPath.XmlDocument";
-    version = "4.3.0";
-    sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm";
+    hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=";
   })
 ]
diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix
index 1eb3e3e2aedc..8888d8d1e1e3 100644
--- a/pkgs/development/python-modules/pythonqwt/default.nix
+++ b/pkgs/development/python-modules/pythonqwt/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pythonqwt";
-  version = "0.12.7";
+  version = "0.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "PythonQwt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Am7XYumq9PAOmT2ZTC+AAE4VM6/yNF11WLXoTFSbDh4=";
+    hash = "sha256-apvUilKx6Xl2PluvmQVW5Lkoub2He/75EdYv10jMR+k=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix
index c1fce200011b..2146c8c02245 100644
--- a/pkgs/development/python-modules/pythran/default.nix
+++ b/pkgs/development/python-modules/pythran/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     (substituteAll {
       src = ./0001-hardcode-path-to-libgomp.patch;
       gomp = "${
-        if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib
+        if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc)
       }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
   ];
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 1b7af821ade9..fe2802278269 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pytibber";
-  version = "0.30.3";
+  version = "0.30.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pyTibber";
     rev = "refs/tags/${version}";
-    hash = "sha256-4MkREdeYqAA+MpM9JQyiVVDPpefVTNT0x0ptR33K6yU=";
+    hash = "sha256-kk5i477xLzKePNs1B4lUjKxS4HlA5FCw7pImnESh9Y8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix
index b749a805eb27..2e3a5f4afbc3 100644
--- a/pkgs/development/python-modules/pytomorrowio/default.nix
+++ b/pkgs/development/python-modules/pytomorrowio/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # aiohttp 3.10.6 compat
+    "test_errors"
+  ];
+
   pythonImportsCheck = [ "pytomorrowio" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 6f276f104f9e..5eb1d0fdb601 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -2,30 +2,37 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
-  decorator,
   numpy,
   platformdirs,
-  typing-extensions,
   pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2024.1.6";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "2024.1.14";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-u9t1BrCWakShd8XlVWdb7OHmXhW7sRFPNwsiPgaTIrk=";
+    hash = "sha256-OeW7r4H6Qy5oi4LdCYAhLRj5eyPlGox6/nWSJJ/kCrE=";
   };
 
-  propagatedBuildInputs = [
-    decorator
-    numpy
+  build-system = [ setuptools ];
+
+  dependencies = [
     platformdirs
-  ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    numpy = [ numpy ];
+    # siphash = [ siphash ];
+  };
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -35,9 +42,18 @@ buildPythonPackage rec {
     "pytools.lex"
   ];
 
+  disabledTests = [
+    # siphash is not available
+    "test_class_hashing"
+    "test_dataclass_hashing"
+    "test_datetime_hashing"
+    "test_hash_function"
+  ];
+
   meta = {
-    homepage = "https://github.com/inducer/pytools/";
     description = "Miscellaneous Python lifesavers";
+    homepage = "https://github.com/inducer/pytools/";
+    changelog = "https://github.com/inducer/pytools/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ artuuge ];
   };
diff --git a/pkgs/development/python-modules/pytorch-bench/default.nix b/pkgs/development/python-modules/pytorch-bench/default.nix
new file mode 100644
index 000000000000..e705028b1db8
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch-bench/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  colorama,
+  matplotlib,
+  numpy,
+  pynvml,
+  torch,
+  torchprofile,
+}:
+
+buildPythonPackage {
+  pname = "pytorch-bench";
+  version = "unstable-2024-07-18";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "MaximeGloesener";
+    repo = "torch-benchmark";
+    rev = "405a3fc2d147b43b4c1f7edb7aca0a60ba343ac5";
+    hash = "sha256-KU3dAf97A6lkMNTKRay23BMFQfn1ReAFNaJ0kG2RfnA=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    colorama
+    matplotlib
+    numpy
+    pynvml
+    torch
+    torchprofile
+  ];
+
+  pythonImportsCheck = [
+    "pytorch_bench"
+  ];
+
+  meta = {
+    description = "Benchmarking tool for torch";
+    homepage = "https://github.com/MaximeGloesener/torch-benchmark";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index 19678c01938e..6c110d8fb35e 100644
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "pytorch-metric-learning";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = isPy27;
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "KevinMusgrave";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g=";
+    hash = "sha256-mxAl4GMyAWtvocc68Ac3z1+W13k9OOK7aQFfB7X0f9c=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix
new file mode 100644
index 000000000000..2a92a51ec8bf
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch3d/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  wheel,
+  torch,
+  iopath,
+  cudaPackages,
+  config,
+  cudaSupport ? config.cudaSupport,
+}:
+
+assert cudaSupport -> torch.cudaSupport;
+
+buildPythonPackage rec {
+  pname = "pytorch3d";
+  version = "0.7.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "facebookresearch";
+    repo = "pytorch3d";
+    rev = "V${version}";
+    hash = "sha256-DEEWWfjwjuXGc0WQInDTmtnWSIDUifyByxdg7hpdHlo=";
+  };
+
+  nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  build-system = [
+    setuptools
+    wheel
+  ];
+  dependencies = [
+    torch
+    iopath
+  ];
+  buildInputs = [ (lib.getOutput "cxxdev" torch) ];
+
+  env =
+    {
+      FORCE_CUDA = cudaSupport;
+    }
+    // lib.optionalAttrs cudaSupport {
+      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+    };
+
+  pythonImportsCheck = [ "pytorch3d" ];
+
+  passthru.tests.rotations-cuda =
+    cudaPackages.writeGpuTestPython { libraries = ps: [ ps.pytorch3d ]; }
+      ''
+        import pytorch3d.transforms as p3dt
+
+        M = p3dt.random_rotations(n=10, device="cuda")
+        assert "cuda" in M.device.type
+        angles = p3dt.matrix_to_euler_angles(M, "XYZ")
+        assert "cuda" in angles.device.type
+        assert angles.shape == (10, 3), angles.shape
+        print(angles)
+      '';
+
+  meta = {
+    description = "FAIR's library of reusable components for deep learning with 3D data";
+    homepage = "https://github.com/facebookresearch/pytorch3d";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      pbsds
+      SomeoneSerge
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix
index e2e8c0c81e24..6b048aa8195a 100644
--- a/pkgs/development/python-modules/pytransportnswv2/default.nix
+++ b/pkgs/development/python-modules/pytransportnswv2/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pytransportnswv2";
-  version = "0.4.0";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LbFBzC7kGa2qz+XQZDmjhE2FhmScesx5jtLtkV0hlg8=";
+    hash = "sha256-hpbq1Krv+DklSXBMJsyRZd8d0yj+vaRjlu2pu6sLV0Y=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 26f0e096cce6..acebbd90ef9f 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.125";
+  version = "9.2.127";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BgMOPR1Uat/IBCeY16A6kuSEPqs0vjP9Ili7cqqU5Qg=";
+    hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyvicare-neo/default.nix b/pkgs/development/python-modules/pyvicare-neo/default.nix
deleted file mode 100644
index 5980fca223f2..000000000000
--- a/pkgs/development/python-modules/pyvicare-neo/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  authlib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  lib,
-  poetry-core,
-  pytestCheckHook,
-  requests,
-  types-requests,
-}:
-
-buildPythonPackage rec {
-  pname = "pyvicare-neo";
-  version = "0.3.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "CFenner";
-    repo = "PyViCare";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-QjFrBf58uM5OProKsesyY43MuE1MnIVIVqs5rWUTmes=";
-  };
-
-  build-system = [ poetry-core ];
-
-  propagatedBuildInputs = [
-    authlib
-    requests
-    types-requests
-  ];
-
-  pythonImportsCheck = [ "PyViCare" ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = {
-    changelog = "https://github.com/CFenner/PyViCare/releases/tag/v${version}";
-    description = "Library to communicate with the Viessmann ViCare API";
-    homepage = "https://github.com/CFenner/PyViCare";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix
new file mode 100644
index 000000000000..2d60fc3af1f2
--- /dev/null
+++ b/pkgs/development/python-modules/pyvicare/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  authlib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  requests,
+  pytest-cov-stub,
+  pytestCheckHook,
+  simplejson,
+}:
+
+buildPythonPackage rec {
+  pname = "pyvicare";
+  version = "2.35.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openviess";
+    repo = "PyViCare";
+    rev = "refs/tags/${version}";
+    hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.1.0"' 'version = "${version}"'
+  '';
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    authlib
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "PyViCare" ];
+
+  meta = with lib; {
+    changelog = "https://github.com/openviess/PyViCare/releases/tag/${version}";
+    description = "Python Library to access Viessmann ViCare API";
+    homepage = "https://github.com/somm15/PyViCare";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 7fc07f20a61a..8a428bce2e09 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -1,33 +1,33 @@
 {
+  lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
-  fetchFromGitHub,
-  pytestCheckHook,
-  glib,
-  vips,
   cffi,
-  pkgconfig, # from pythonPackages
+  fetchFromGitHub,
+  glib,
   pkg-config, # from pkgs
-  lib,
+  pkgconfig, # from pythonPackages
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  vips,
 }:
 
 buildPythonPackage rec {
   pname = "pyvips";
-  version = "2.2.1";
-  format = "setuptools";
+  version = "2.2.3";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "pyvips";
-    rev = "v${version}";
-    hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U=";
   };
 
   nativeBuildInputs = [
-    pkgconfig
     pkg-config
   ];
 
@@ -36,7 +36,12 @@ buildPythonPackage rec {
     vips
   ];
 
-  propagatedBuildInputs = [ cffi ];
+  build-system = [
+    pkgconfig
+    setuptools
+  ];
+
+  dependencies = [ cffi ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
index 0574c5706338..fcbb8c0de00b 100644
--- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix
+++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
@@ -1,16 +1,28 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchPypi,
+  substituteAll,
+  xorg,
+
+  # build-system
+  setuptools,
+
+  # tests
   easyprocess,
+  entrypoint2,
+  pillow,
+  psutil,
+  pytest-xdist,
+  pytestCheckHook,
+  vncdo,
 }:
 
 buildPythonPackage rec {
   pname = "pyvirtualdisplay";
   version = "3.0";
-  format = "setuptools";
-
-  propagatedBuildInputs = [ easyprocess ];
+  pyproject = true;
 
   src = fetchPypi {
     pname = "PyVirtualDisplay";
@@ -18,8 +30,30 @@ buildPythonPackage rec {
     hash = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk=";
   };
 
-  # requires X server
-  doCheck = false;
+  patches = lib.optionals stdenv.isLinux [
+    (substituteAll {
+      src = ./paths.patch;
+      xauth = lib.getExe xorg.xauth;
+      xdpyinfo = lib.getExe xorg.xdpyinfo;
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  doCheck = stdenv.isLinux;
+
+  nativeCheckInputs = [
+    easyprocess
+    entrypoint2
+    pillow
+    psutil
+    pytest-xdist
+    pytestCheckHook
+    (vncdo.overridePythonAttrs { doCheck = false; })
+    xorg.xorgserver
+    xorg.xmessage
+    xorg.xvfb
+  ];
 
   meta = with lib; {
     description = "Python wrapper for Xvfb, Xephyr and Xvnc";
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/paths.patch b/pkgs/development/python-modules/pyvirtualdisplay/paths.patch
new file mode 100644
index 000000000000..d447cd622802
--- /dev/null
+++ b/pkgs/development/python-modules/pyvirtualdisplay/paths.patch
@@ -0,0 +1,35 @@
+diff --git a/pyvirtualdisplay/abstractdisplay.py b/pyvirtualdisplay/abstractdisplay.py
+index dd93943..c694209 100644
+--- a/pyvirtualdisplay/abstractdisplay.py
++++ b/pyvirtualdisplay/abstractdisplay.py
+@@ -242,7 +242,7 @@ class AbstractDisplay(object):
+ 
+             try:
+                 xdpyinfo = subprocess.Popen(
+-                    ["xdpyinfo"],
++                    ["@xdpyinfo@"],
+                     env=self._env(),
+                     stdout=subprocess.PIPE,
+                     stderr=subprocess.PIPE,
+diff --git a/pyvirtualdisplay/xauth.py b/pyvirtualdisplay/xauth.py
+index ce0f804..7734e21 100644
+--- a/pyvirtualdisplay/xauth.py
++++ b/pyvirtualdisplay/xauth.py
+@@ -14,7 +14,7 @@ def is_installed():
+     """
+     try:
+         xauth = subprocess.Popen(
+-            ["xauth", "-V"],
++            ["@xauth@", "-V"],
+             # env=self._env(),
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE,
+@@ -43,7 +43,7 @@ def call(*args):
+     Call xauth with the given args.
+     """
+     xauth = subprocess.Popen(
+-        ["xauth"] + list(args),
++        ["@xauth@"] + list(args),
+         # env=self._env(),
+         stdout=subprocess.PIPE,
+         stderr=subprocess.PIPE,
diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
index 149b9fb57fd8..e3350c4e624d 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pywavelets";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,12 +20,12 @@ buildPythonPackage rec {
     owner = "PyWavelets";
     repo = "pywt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Dr6LWGVlYGDD21l1RQ7elScovcen5uuFdJJXe3deB5o=";
+    hash = "sha256-oWAF8YDvb0SdlRzSjG2BNEekBkvR3U6KQ+e2FoIs+tw=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail '"numpy>=2.0.0rc1,<2.3",' ""
+      --replace-fail "numpy>=2.0.0" "numpy"
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index db508d3e5ef9..96b1213ca514 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pywebview";
-  version = "5.0.5";
+  version = "5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "r0x0r";
     repo = "pywebview";
     rev = "refs/tags/${version}";
-    hash = "sha256-Mep4r5OujsefXFQA09OospqnzgQ3xn8HHdZFKNo3oM4=";
+    hash = "sha256-PNnsqb+gyeFfQwMFj7cYaiv54cZ+H5IF9+DS9RN/qB4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index a0495c9b0674..e47570dd9b06 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -15,7 +15,6 @@
 
   # checks
   pytestCheckHook,
-  python,
   pythonOlder,
   tornado,
   libsodium,
@@ -25,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "pyzmq";
-  version = "26.0.3";
+  version = "26.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-26fZ8uBH36K8o7AfT4SqUkZyUgPWKE43kPLKFfumtAo=";
+    hash = "sha256-BwZywlhYHI5PZAtRWSl1gKmXSwJgQ71KsEcL6e0yTx8=";
   };
 
   build-system = [
@@ -60,13 +59,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "zmq" ];
 
-  pytestFlagsArray = [
-    "$out/${python.sitePackages}/zmq/tests/" # Folder with tests
-    # pytest.ini is missing in pypi's sdist
-    # https://github.com/zeromq/pyzmq/issues/1853#issuecomment-1592731986
-    "--asyncio-mode auto"
-    "--ignore=$out/lib/python3.12/site-packages/zmq/tests/test_mypy.py"
-  ];
+  preCheck = ''
+    rm -r zmq
+  '';
 
   disabledTests = [
     # Tests hang
diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix
index d39d2b48ef24..27371dc2bbd6 100644
--- a/pkgs/development/python-modules/pyzx/default.nix
+++ b/pkgs/development/python-modules/pyzx/default.nix
@@ -38,7 +38,10 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  pythonRelaxDeps = [ "ipywidgets" ];
+  pythonRelaxDeps = [
+    "ipywidgets"
+    "lark"
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix
index bae26634aa2a..550ce775a572 100644
--- a/pkgs/development/python-modules/qbittorrent-api/default.nix
+++ b/pkgs/development/python-modules/qbittorrent-api/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "qbittorrent-api";
-  version = "2024.9.67";
+  version = "2024.10.68";
   pyproject = true;
 
   src = fetchPypi {
     pname = "qbittorrent_api";
     inherit version;
-    hash = "sha256-+NfttxsUzNVg0YL6H0ULeDb/xobMvUeGwWY/egN9aWY=";
+    hash = "sha256-nOw/XtHx21njbXAr1fXSuRdn2UY2yoGkJqlZVXLkf3o=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix
index 18bd47bf5bf7..62c404ff9720 100644
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-aer";
-  version = "0.13.3";
+  version = "0.15.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = "qiskit-aer";
     rev = "refs/tags/${version}";
-    hash = "sha256-xE5P4o6/I8Y/trK0e8GQ0oAOAyMvYWfzyuVvAoZExwk=";
+    hash = "sha256-TrGoeyn6K5MGtkenEE9zz4S1xdOthskdRykzppfkZag=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 84d68da4b937..9b0ca55c8eb0 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -33,7 +33,7 @@ in
 buildPythonPackage rec {
   pname = "qiskit";
   # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
-  version = "1.0.1";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = "qiskit";
     rev = "refs/tags/${version}";
-    hash = "sha256-Cjfn+9h8W08FcAlVC7b7O8Z+VGx5UeHosSgYJin/evE=";
+    hash = "sha256-QbJcpJAtMMfJF71moQ1kEqP2lnZXmg69Zk2mjCJDg/Q=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 858785307a47..fcda25cc9ff2 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "5.6.0";
+  version = "5.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "qtconsole";
     rev = "refs/tags/${version}";
-    hash = "sha256-V82tGAmpvfGeUoewtJXXsBBXx2HNcV9/IMJxJg3bJL8=";
+    hash = "sha256-esCt7UQ0va/FJ0gdSrcc/k/FgyBVqKy7ttrN6E6mx+E=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/qudida/default.nix b/pkgs/development/python-modules/qudida/default.nix
index 7e0bac314b25..6900eef961c7 100644
--- a/pkgs/development/python-modules/qudida/default.nix
+++ b/pkgs/development/python-modules/qudida/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   numpy,
-  opencv4,
+  opencv-python,
   pythonOlder,
   scikit-learn,
   typing-extensions,
@@ -21,12 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg=";
   };
 
-
-  pythonRemoveDeps = [ "opencv-python" ];
-
   propagatedBuildInputs = [
     numpy
-    opencv4
+    opencv-python
     scikit-learn
     typing-extensions
   ];
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 12b6c1b9e9d9..4907fd550759 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "qutip";
-  version = "5.0.2";
+  version = "5.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,9 +29,15 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-lMPzgmUaoEQB5TzmqEJFiFTuS3AGpyMMjPHlPUKTLvk=";
+    hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
   };
 
+  postPatch = ''
+    # build-time constriant, used to ensure forward and backward compat
+    substituteInPlace pyproject.toml setup.cfg \
+      --replace-fail "numpy>=2.0.0" "numpy"
+  '';
+
   nativeBuildInputs = [
     cython_0
     setuptools
diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix
index 007368986c82..6a9baf65e6a6 100644
--- a/pkgs/development/python-modules/radon/default.nix
+++ b/pkgs/development/python-modules/radon/default.nix
@@ -45,6 +45,10 @@ buildPythonPackage rec {
     colorama
   ];
 
+  pythonRelaxDeps = [
+    "mando"
+  ];
+
   optional-dependencies = {
     toml = [ tomli ];
   };
diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
index 5739ca88b3b0..49ec5f4a5b8b 100644
--- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
+++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
@@ -10,7 +10,7 @@
 
   setuptools,
   pyclipper,
-  opencv4,
+  opencv-python,
   numpy,
   six,
   shapely,
@@ -90,7 +90,7 @@ buildPythonPackage {
 
   dependencies = [
     pyclipper
-    opencv4
+    opencv-python
     numpy
     six
     shapely
@@ -99,9 +99,6 @@ buildPythonPackage {
     onnxruntime
   ];
 
-  # Remove because we have adopted the `opencv4` as an attribute name.
-  pythonRemoveDeps = [ "opencv-python" ];
-
   pythonImportsCheck = [ "rapidocr_onnxruntime" ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index ce6bb19ef5a5..30dd05cffbdd 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -15,6 +15,7 @@
   click-plugins,
   cligj,
   cython,
+  fsspec,
   gdal,
   hypothesis,
   ipython,
@@ -32,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.3.11";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -41,17 +42,13 @@ buildPythonPackage rec {
     owner = "rasterio";
     repo = "rasterio";
     rev = "refs/tags/${version}";
-    hash = "sha256-Yh3n2oyARf7LAtJU8Oa3WWc+oscl7e2N7jpW0v1uTVk=";
+    hash = "sha256-A8o8FYuhlzL6Wl6sfB7D2KRAKZl28E6K2AdUik9zmgs=";
   };
 
   postPatch = ''
-    # remove useless import statement requiring distutils to be present at the runtime
-    substituteInPlace rasterio/rio/calc.py \
-      --replace-fail "from distutils.version import LooseVersion" ""
-
     # relax numpy dependency
     substituteInPlace pyproject.toml \
-      --replace-fail "numpy>=2.0.0,<3.0" "numpy"
+      --replace-fail "numpy>=2" "numpy"
   '';
 
   nativeBuildInputs = [
@@ -81,6 +78,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     boto3
+    fsspec
     hypothesis
     packaging
     pytestCheckHook
@@ -97,6 +95,10 @@ buildPythonPackage rec {
   disabledTests = [
     # flaky
     "test_outer_boundless_pixel_fidelity"
+    # network access
+    "test_issue1982"
+    "test_opener_fsspec_http_fs"
+    "test_fsspec_http_msk_sidecar"
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ];
 
   pythonImportsCheck = [ "rasterio" ];
diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix
index b966e0a319be..dbeb62305b59 100644
--- a/pkgs/development/python-modules/ratarmountcore/default.nix
+++ b/pkgs/development/python-modules/ratarmountcore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "ratarmountcore";
-  version = "0.7.2";
+  version = "0.15.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mxmlnkn";
     repo = "ratarmount";
-    rev = "core-v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-2LPGKdofx2ID8BU0dZhGiZ3tUkd+niEVGvTSBFX4InU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix
index b9d80f945c25..29c4f5d0bd2d 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/pkgs/development/python-modules/readchar/default.nix
@@ -7,13 +7,14 @@
   setuptools,
 
   # tests
+  pytest-cov-stub,
   pytestCheckHook,
   pexpect,
 }:
 
 buildPythonPackage rec {
   pname = "readchar";
-  version = "4.0.6";
+  version = "4.2.0";
   pyproject = true;
 
   # Don't use wheels on PyPI
@@ -21,32 +22,33 @@ buildPythonPackage rec {
     owner = "magmax";
     repo = "python-${pname}";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XowLJ9YAHhP9nInFVYtoLEOmlWBRWQX259vwm9SVVZU=";
+    hash = "sha256-xha3bGuDYt4gLcK3x62ym+zCAQVyZjlV1HyKh8kHe64=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov=readchar" "" \
-      --replace "attr: readchar.__version__" "${version}"
+    # Tags on GitHub still have a postfix (-dev0)
+    sed -i 's/\(version = "\)[^"]*\(".*\)/\1${version}\2/' pyproject.toml
     # run Linux tests on Darwin as well
     # see https://github.com/magmax/python-readchar/pull/99 for why this is not upstreamed
     substituteInPlace tests/linux/conftest.py \
       --replace 'sys.platform.startswith("linux")' 'sys.platform.startswith(("darwin", "linux"))'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "readchar" ];
 
   nativeCheckInputs = [
+    pytest-cov-stub
     pytestCheckHook
     pexpect
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/magmax/python-readchar";
     description = "Python library to read characters and key strokes";
+    homepage = "https://github.com/magmax/python-readchar";
+    changelog = "https://github.com/magmax/python-readchar/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = [ maintainers.mmahut ];
+    maintainers = with maintainers; [ mmahut ];
   };
 }
diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix
index 2ffce823140c..f2642aff1c2c 100644
--- a/pkgs/development/python-modules/readme-renderer/default.nix
+++ b/pkgs/development/python-modules/readme-renderer/default.nix
@@ -13,15 +13,15 @@
 
 buildPythonPackage rec {
   pname = "readme-renderer";
-  version = "43.0";
+  version = "44.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     pname = "readme_renderer";
     inherit version;
-    hash = "sha256-GBjdKBQIE1Ce7tjWJof3zU97rZDU21hgAcXcCdT94xE=";
+    hash = "sha256-hxIDTqu/poBcrPFAK07rKnMCj3LRFm1vXLf5wEfF0eE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix
index de3e2f377d88..0b4776b0f383 100644
--- a/pkgs/development/python-modules/recurring-ical-events/default.nix
+++ b/pkgs/development/python-modules/recurring-ical-events/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "recurring-ical-events";
-  version = "3.3.2";
+  version = "3.3.3";
 
   disabled = pythonOlder "3.8";
 
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niccokunzmann";
     repo = "python-recurring-ical-events";
-    rev = "v${version}";
-    hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-gEatTTpRiqtDAn+JtoJuVHPYKmEkc5saw3hy4ZYZfX8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix
index c3f6455c725d..089e3c72ec16 100644
--- a/pkgs/development/python-modules/redis-om/default.nix
+++ b/pkgs/development/python-modules/redis-om/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "redis-om";
-  version = "0.3.2";
+  version = "0.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "redis";
     repo = "redis-om-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw=";
+    hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 8cee5fa57311..8ad583fcf7b1 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "redis";
-  version = "5.0.6";
+  version = "5.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OEc818Y4mtPkSpH0w+r2vLip90YAfym/T7IIJP8LIZc=";
+    hash = "sha256-9smXUh/tuuUzhzB8XQv3hNmswo2fHQWKvqxWbsTb7XI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix
index 3e7063e42ecc..89159a4f80c1 100644
--- a/pkgs/development/python-modules/referencing/default.nix
+++ b/pkgs/development/python-modules/referencing/default.nix
@@ -15,7 +15,7 @@
 let
   self = buildPythonPackage rec {
     pname = "referencing";
-    version = "0.34.0";
+    version = "0.35.1";
     pyproject = true;
 
     disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ let
       repo = "referencing";
       rev = "refs/tags/v${version}";
       fetchSubmodules = true;
-      hash = "sha256-Vx+WVgt09I04Z/sIYsLLtPCwuo5wW0Z2o2OTH2V17UY=";
+      hash = "sha256-Ix0cpdOs7CtersdfW9daF/+BEJaV/na1WRTlYywUJV8=";
     };
 
     build-system = [
diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index 49b893a9b2bb..866aa775b7f5 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -8,16 +8,16 @@
 
 buildPythonPackage rec {
   pname = "reflex-chakra";
-  version = "0.6.1";
+  version = "0.6.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex-chakra";
     rev = "refs/tags/v${version}";
-    hash = "sha256-nmZ41V/1TbslAQIkJQLgdLfWS2qSVrAnVqbv8sajL5c=";
+    hash = "sha256-VMFCaJh7HA/bsOV1ONuPJCzhzpQrcppOnPIcIIpeaSs=";
   };
 
   pythonRemoveDeps = [
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 4434ff860134..bc1a60eea098 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2024.5.15";
+  version = "2024.9.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0+4C2eX0gsyDCRNKke6qy90iYboRGw/vN0jutJE+aiw=";
+    hash = "sha256-bBiMMH6EM7y2PcGRUCLetVO0IDpwci/FQsNjvxIKAf0=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index 95bdca651be5..716162be03a4 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "reikna";
-  version = "0.8.0";
+  version = "0.9.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI=";
+    hash = "sha256-uzIoGCkIINgmO+r0vAzmihS14GWv5ygakMz3tKIG3zA=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index dedab0bbc95e..6f978a397a3a 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -8,8 +8,11 @@
 
   # propagates
   cbor2,
+  colorama,
   python-dateutil,
   pyyaml,
+  rich-argparse,
+  ruamel-yaml,
   tomlkit,
   u-msgpack-python,
 
@@ -19,26 +22,25 @@
 
 buildPythonPackage rec {
   pname = "remarshal";
-  version = "0.17.1";
-  format = "pyproject";
+  version = "0.20.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbohdan";
-    repo = pname;
+    repo = "remarshal";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA=";
+    hash = "sha256-Fy+K0fM+vjZp8u7C0ElFa1xQM/CIMqFALe42gZRBNOs=";
   };
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
+  build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "pytest" ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     cbor2
+    colorama
     python-dateutil
     pyyaml
+    rich-argparse
+    ruamel-yaml
     tomlkit
     u-msgpack-python
   ];
diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix
index 03914c36dba2..0e1a5d7fb9e6 100644
--- a/pkgs/development/python-modules/renson-endura-delta/default.nix
+++ b/pkgs/development/python-modules/renson-endura-delta/default.nix
@@ -25,12 +25,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'pytest-runner'" ""
+      --replace-fail "'pytest-runner'" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ requests ];
+  dependencies = [ requests ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index bdbf3209d74e..a42a2b432e6a 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.10.0";
+  version = "0.10.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-SuNY+H21rjO+iotDJymLI7JccQRoMnLX/YL05wQqlmc=";
+    hash = "sha256-7dRwZKthEAtVvOsKUXgkCE5zwUtcJgSJZiaHXJwZ+9w=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix
deleted file mode 100644
index d5df17ae89fd..000000000000
--- a/pkgs/development/python-modules/repocheck/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-}:
-
-buildPythonPackage rec {
-  pname = "repocheck";
-  version = "2015-08-05";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81";
-    rev = "ee48d0e88d3f5814d24a8d1f22d5d83732824688";
-    repo = "repocheck";
-    owner = "kynikos";
-  };
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Check the status of code repositories under a root directory";
-    mainProgram = "repocheck";
-    license = licenses.gpl3Plus;
-  };
-}
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 186b02c60375..4a1991adefdf 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -18,7 +18,7 @@ let
 in
 buildPythonPackage rec {
   pname = "reportlab";
-  version = "4.2.2";
+  version = "4.2.4";
   pyproject = true;
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dl7svdaEkcVpR+KcOLi2m4NO5du90vt0CfCOvevwRCg=";
+    hash = "sha256-oAtXKS4VanvahO3zHWDCVXgVMHbI+5YzHQxZ7d2gUsg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 615234474a6a..c5b24010d3de 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   pytest-asyncio,
   pytest-httpserver,
   pytestCheckHook,
@@ -19,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "responses";
-  version = "0.25.0";
+  version = "0.25.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,17 +29,9 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-FHtuZ6NUmCveAJOXEajfTLRMR8W1Jz/pjFKdE6PHW2g=";
+    hash = "sha256-+iRrmRAe8RWcts2LMFvykroQ5sL7+hW6Wrs7Kd1mzBM=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # adds missing pytest asyncio markers
-      url = "https://github.com/getsentry/responses/commit/d5e7402f1782692d04742562370abaca8d54a972.patch";
-      hash = "sha256-A/DYSKvuangolkcQX4k/uom//AQ9in7BsTmVtlCqmXQ=";
-    })
-  ];
-
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix
index 0089f23077d9..7455eb58eeb3 100644
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/pkgs/development/python-modules/restrictedpython/default.nix
@@ -21,6 +21,11 @@ buildPythonPackage rec {
     hash = "sha256-gbYpJHE9vSgJF/zq7K8hD+96Sd3fGgjIwhSjYT++tCU=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<74" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix
index 8edcfa9fbd95..061394e5fc3f 100644
--- a/pkgs/development/python-modules/rich-argparse/default.nix
+++ b/pkgs/development/python-modules/rich-argparse/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "rich-argparse";
-  version = "1.5.2";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "hamdanal";
     repo = "rich-argparse";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI=";
+    hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index c9c29a1287be..34913e526d78 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -19,6 +19,7 @@
   attrs,
   pytestCheckHook,
   setuptools,
+  which,
 
   # for passthru.tests
   enrich,
@@ -29,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "13.7.1";
+  version = "13.8.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -38,7 +39,7 @@ buildPythonPackage rec {
     owner = "Textualize";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-7LvmPrCpHfPEfJ1r8IFnQhYkBstvtIrWYhGwcchlc0s=";
+    hash = "sha256-k+a64GDGzRDprvJz7s9Sm4z8jDV5TZ+CZLMgXKXXonM=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -56,6 +57,7 @@ buildPythonPackage rec {
     attrs
     pytestCheckHook
     setuptools
+    which
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix
index 2b573e439dd1..5d90f66de655 100644
--- a/pkgs/development/python-modules/ring-doorbell/default.nix
+++ b/pkgs/development/python-modules/ring-doorbell/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "ring-doorbell";
-  version = "0.9.8";
+  version = "0.9.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "ring_doorbell";
     inherit version;
-    hash = "sha256-3OSD+L6+mZkkm0OU09hAFyEAxJZ3YA1+lRm2DjQ7Dl0=";
+    hash = "sha256-BxddSIADkXNbsAohWtAv93x685vCTj9FyKfwSUemY+I=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];
diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index 88e126d4d5cc..99c7f3d12df8 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "rio-tiler";
-  version = "6.7.0";
+  version = "7.0.1";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "cogeotiff";
     repo = "rio-tiler";
     rev = "refs/tags/${version}";
-    hash = "sha256-i70Bh7RHPgLLaqBo9vHRrJylsNE3Ly3xJq9j12Ch58E=";
+    hash = "sha256-E8gKXPj1n9HZ+zvQPcG28+2Vuif4B6NBhtuS009x6rU=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix
index 10a6c15d3cf1..0f8111f089ac 100644
--- a/pkgs/development/python-modules/rioxarray/default.nix
+++ b/pkgs/development/python-modules/rioxarray/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "rioxarray";
-  version = "0.17.0";
+  version = "0.18.1";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "corteva";
     repo = "rioxarray";
     rev = "refs/tags/${version}";
-    hash = "sha256-mOXyfkreQ55vWmPCG2U/ijcKZqzHoQQLfKArSh2fDmA=";
+    hash = "sha256-0YsGu8JuYrb6lWuC3RQ4jCkulxxFpnd0eaRajCwtFHo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
index 93a6308099c8..8507883ff81e 100644
--- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
@@ -5,37 +5,37 @@
   jsonschema,
   pytestCheckHook,
   python-dateutil,
-  python-socketio,
   pythonOlder,
   requests,
+  setuptools,
+  typing-extensions,
   websocket-client,
 }:
 
 buildPythonPackage rec {
   pname = "ripe-atlas-cousteau";
   version = "2.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
-    repo = pname;
+    repo = "ripe-atlas-cousteau";
     rev = "refs/tags/v${version}";
     hash = "sha256-z8ZXOiCVYughrbmXfnwtks7NPmYpII2BA0+8mr1cdSQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "websocket-client~=1.3.1" "websocket-client"
-  '';
+  pythonRelaxDeps = [ "websocket-client" ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     python-dateutil
     requests
-    python-socketio
+    typing-extensions
     websocket-client
-  ] ++ python-socketio.optional-dependencies.client;
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix
index 318282f763a0..d67de41c6d75 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/pkgs/development/python-modules/ripser/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "ripser";
-  version = "0.6.8";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-J5ctOvGtmg/e2ls7fN59LR4AbHedC9gKk6f8jIDIoFI=";
+    hash = "sha256-3Mr6+XrSOVvGbLN25fvg9vJkNyspj9CT5BBxMsH3lIQ=";
   };
 
   nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix
index eaaf3eff9faf..9d45400b7dc7 100644
--- a/pkgs/development/python-modules/roadlib/default.nix
+++ b/pkgs/development/python-modules/roadlib/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "roadlib";
-  version = "0.26.0";
+  version = "0.27.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qh+xVBqQ/bkXl7Xa6w+SIkQRwIUW5ut4yosGko+8xrY=";
+    hash = "sha256-k2ePgxWLbDGjMNfA/cQabSx98FRVrsdV9WANXuIGD+E=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix
index 87db63bab3a8..688d1902fc2c 100644
--- a/pkgs/development/python-modules/roadrecon/default.nix
+++ b/pkgs/development/python-modules/roadrecon/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "roadrecon";
-  version = "1.4.0";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OEftVwU30tLP091Z5CIl67hkjjcqY+Qo04/wHZlbuFc=";
+    hash = "sha256-hDIMDNmvGQAcpPMet31MbuJtOU2JCrbLlpAu19skNVg=";
   };
 
   pythonRelaxDeps = [ "flask" ];
diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix
index d390acea281d..c1e2803a6dc7 100644
--- a/pkgs/development/python-modules/roadtx/default.nix
+++ b/pkgs/development/python-modules/roadtx/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "roadtx";
-  version = "1.8.2";
+  version = "1.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BJYBQBxgYbozY0rPgxpiduUxb6wEFBJxXY8TRVlLz5M=";
+    hash = "sha256-TtmpqNlDRsjGPhWPhqDw/ApvR9lK6cSlu/HGntgZ68A=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix
index 53908cb4db73..eba60378a796 100644
--- a/pkgs/development/python-modules/ropgadget/default.nix
+++ b/pkgs/development/python-modules/ropgadget/default.nix
@@ -2,14 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   capstone,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "ropgadget";
-  version = "7.4";
-  format = "setuptools";
+  version = "7.5";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -17,10 +18,12 @@ buildPythonPackage rec {
     owner = "JonathanSalwan";
     repo = "ROPgadget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6m8opcTM4vrK+VCPXxNhZttUq6YmS8swLUDhjyfinWE=";
+    hash = "sha256-n7nVtR2HMAZeeSX/hNtDzmpEsnHbgDNO5gdzmPrgSuk=";
   };
 
-  propagatedBuildInputs = [ capstone ];
+  build-system = [ setuptools ];
+
+  dependencies = [ capstone ];
 
   # Test suite is working with binaries
   doCheck = false;
diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix
index d436f19a45eb..6c8be8f8f5b7 100644
--- a/pkgs/development/python-modules/rtfde/default.nix
+++ b/pkgs/development/python-modules/rtfde/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [ "lark" ];
+
   dependencies = [
     lark
     oletools
@@ -39,15 +41,15 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "RTFDE" ];
 
   disabledTests = [
-    # Content mismatch
-    "test_bin_data_captured"
+    # Malformed encapsulated RTF discovered
+    "test_encoded_bytes_stay_encoded_character"
   ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}";
     description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies";
     homepage = "https://github.com/seamustuohy/RTFDE";
-    changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix
index 994cd103c18f..a93caf9aab83 100644
--- a/pkgs/development/python-modules/rtmixer/default.nix
+++ b/pkgs/development/python-modules/rtmixer/default.nix
@@ -2,6 +2,7 @@
   fetchFromGitHub,
   buildPythonPackage,
   isPy27,
+  setuptools,
   cython,
   portaudio,
   cffi,
@@ -12,22 +13,28 @@
 
 buildPythonPackage rec {
   pname = "rtmixer";
-  version = "0.1.4";
-  format = "setuptools";
+  version = "0.1.7";
+  pyproject = true;
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "spatialaudio";
     repo = "python-rtmixer";
     rev = "refs/tags/${version}";
-    hash = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0=";
+    hash = "sha256-K5w6XWnDdA5HrzDOMhqinlxrg/09AF6c5CWZEsfVHb4=";
     fetchSubmodules = true;
   };
 
-  buildInputs = [ portaudio ];
-  nativeBuildInputs = [ cython ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  buildInputs = [ portaudio ];
+
+  nativeBuildInputs = [
+    cython
+    cffi
+  ];
+
+  dependencies = [
     cffi
     pa-ringbuffer
     sounddevice
diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix
index 3f17b45e2d20..d2ee15fa36b1 100644
--- a/pkgs/development/python-modules/rustworkx/default.nix
+++ b/pkgs/development/python-modules/rustworkx/default.nix
@@ -4,6 +4,7 @@
   cargo,
   rustPlatform,
   rustc,
+  setuptools,
   setuptools-rust,
   numpy,
   fixtures,
@@ -12,40 +13,50 @@
   libiconv,
   stdenv,
   lib,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "rustworkx";
-  version = "0.14.2";
-  format = "setuptools";
+  version = "0.15.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Qiskit";
-    repo = pname;
+    repo = "rustworkx";
     rev = version;
-    hash = "sha256-gck5X6J4Yg5it/YCBsk/yZ5qXg/iwCEbyDIKfBTRxHM=";
+    hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-FNCa5pshcnsYpjlz6yDITe2k0cHLTybj3rF34qrsRVU=";
+    hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE=";
   };
 
   nativeBuildInputs = [
-    setuptools-rust
     rustPlatform.cargoSetupHook
     cargo
     rustc
   ];
 
+  build-system = [
+    setuptools
+    setuptools-rust
+  ];
+
   buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
-  checkInputs = [
+  nativeCheckInputs = [
     fixtures
     networkx
+    pytestCheckHook
     testtools
   ];
 
+  preCheck = ''
+    rm -r rustworkx
+  '';
+
   pythonImportsCheck = [ "rustworkx" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index bd53e3b3ef2b..7035c15615e7 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2024.6.1";
+  version = "2024.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bCEG1sNPv7uI49IMbzVyiW1e49NRKJZpYwHCGjxUG+o=";
+    hash = "sha256-ZJNwWrtQN01reZT5YW0nrb3YohnIY1EAvcKGOC79kfU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 2ae837fa6e40..262f1ff3673f 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.10";
+  version = "1.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UloQJ5B10XXPbwsktVZzjcW7BLW8wCAw3wGmAkSl6wc=";
+    hash = "sha256-6r8roHMJ4s/+mGiPeMVZ9wagdXNJQ3+tUFZ/7T+NQBc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 582ddd93f0f2..6f437dd9f219 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.232.2";
+  version = "2.232.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-q0JxQi1kUnp5L/hexxpGhR4t0v53l8iVuc9H6N0K6Y4=";
+    hash = "sha256-6kGxmgkR/1ih2V49C9aEUBBCJS6s1Jbev80FDnJtHFg=";
   };
 
   build-system = [
@@ -53,6 +53,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "attrs"
     "boto3"
     "cloudpickle"
     "importlib-metadata"
diff --git a/pkgs/development/python-modules/sarif-tools/default.nix b/pkgs/development/python-modules/sarif-tools/default.nix
index c499d021447d..b75379c06af2 100644
--- a/pkgs/development/python-modules/sarif-tools/default.nix
+++ b/pkgs/development/python-modules/sarif-tools/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   poetry-core,
   jsonpath-ng,
+  jsonschema,
   jinja2,
   python,
   python-docx,
@@ -15,32 +16,33 @@
 
 buildPythonPackage rec {
   pname = "sarif-tools";
-  version = "3.0.0";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "sarif-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MYwhewUTZ3Wl93p6bN3+bHqtXz+BAlAhte+JaetPQYU=";
+    hash = "sha256-VGdl4WBdIiCWPGfFxqcG4XlbLh0uiLQXdrhUa2OxaVY=";
   };
 
   disabled = pythonOlder "3.8";
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
-    jsonpath-ng
+  dependencies = [
     jinja2
+    jsonpath-ng
+    matplotlib
     python
     python-docx
-    matplotlib
     pyyaml
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    jsonschema
+    pytestCheckHook
+  ];
 
   pythonRelaxDeps = [ "python-docx" ];
 
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index 7040e8d57256..159a2dc7090a 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -39,7 +39,7 @@ in
 
 buildPythonPackage rec {
   pname = "scalene";
-  version = "1.5.45";
+  version = "1.5.46";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     owner = "plasma-umass";
     repo = "scalene";
     rev = "v${version}";
-    hash = "sha256-0DhoLsXv2tUEkynMkoA14pNxF6GGLe30bfUOii7+PYE=";
+    hash = "sha256-G+fX0D70aGOmXr/SqaBKkOz3CEHpGqClFFdTeOzRpaw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 6e1ab5aad6e3..77eb9ea5195a 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "scapy";
-  version = "2.5.0";
+  version = "2.6.0";
   format = "setuptools";
 
   disabled = isPyPy;
@@ -40,8 +40,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "secdev";
     repo = "scapy";
-    rev = "v${version}";
-    hash = "sha256-xJlovcxUQOQHfOU0Jgin/ayd2T5fOyeN4Jg0DbLHoeU=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-k/wfY5nq/txdiqj5gyHT9FSjnFzazDBawE3+aNe9zrQ=";
   };
 
   patches = [ ./find-library.patch ];
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index e90abc94768c..ff6e5c978465 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -22,21 +22,21 @@
 
 buildPythonPackage rec {
   pname = "schema-salad";
-  version = "8.5.20240503091721";
+  version = "8.7.20241021092521";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "schema_salad";
     rev = "refs/tags/${version}";
-    hash = "sha256-VbEIkWzg6kPnJWqbvlfsD83oS0VQasGQo+pUIPiGjhU=";
+    hash = "sha256-1V73y+sp94QwoCz8T2LCMnf5iq8MtL9cvrhF949R+08=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "black>=19.10b0,<23.12" "black>=19.10b0"
+      --replace-fail "mypy[mypyc]==1.12.1" "mypy"
   '';
 
   build-system = [ setuptools-scm ];
@@ -57,11 +57,6 @@ 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 ] ++ optional-dependencies.pycodegen;
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix
index 793627bb3c61..02a70e00ecec 100644
--- a/pkgs/development/python-modules/schwifty/default.nix
+++ b/pkgs/development/python-modules/schwifty/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "schwifty";
-  version = "2024.8.1";
+  version = "2024.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XWdB0yGYKxz2PJVNbXpNnsG/SaF3ysZn8JjrDn/rZ7w=";
+    hash = "sha256-rO6fUCFYfCVPxfd+vvzWL+sMDDqA/qRSPUUTB90E8zA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/scienceplots/default.nix b/pkgs/development/python-modules/scienceplots/default.nix
new file mode 100644
index 000000000000..b6421ce40a87
--- /dev/null
+++ b/pkgs/development/python-modules/scienceplots/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  matplotlib,
+}:
+
+buildPythonPackage rec {
+  pname = "SciencePlots";
+  version = "2.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-2NGX40EPh+va0LnCZeqrWWCU+wgtlxI+g19rwygAq1Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ matplotlib ];
+
+  pythonImportsCheck = [ "scienceplots" ];
+
+  doCheck = false; # no tests
+
+  meta = with lib; {
+    description = "Matplotlib styles for scientific plotting";
+    homepage = "https://github.com/garrettj403/SciencePlots";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kilimnik ];
+  };
+}
diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index 7068063a8cb5..afba3e93ddbd 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -2,9 +2,11 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
   setuptools,
   cython,
   oldest-supported-numpy,
+
   requests,
   decorator,
   natsort,
@@ -12,22 +14,24 @@
   pandas,
   scipy,
   h5py,
-  hdmedians,
   biom-format,
+  statsmodels,
+  patsy,
+
   python,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "scikit-bio";
-  version = "0.6.0";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-bio";
     repo = "scikit-bio";
     rev = "refs/tags/${version}";
-    hash = "sha256-v8/r52pJpMi34SekPQBf7CqRbs+ZEyPR3WO5RBB7uKg=";
+    hash = "sha256-1L3AemXVqfgBDlRZorG7+8qt3f1Bm8L+Se+OwqEWwI4=";
   };
 
   build-system = [
@@ -44,8 +48,9 @@ buildPythonPackage rec {
     pandas
     scipy
     h5py
-    hdmedians
     biom-format
+    statsmodels
+    patsy
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -53,6 +58,11 @@ buildPythonPackage rec {
   # only the $out dir contains the built cython extensions, so we run the tests inside there
   pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ];
 
+  disabledTestPaths = [
+    # don't know why, but this segfaults
+    "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py"
+  ];
+
   pythonImportsCheck = [ "skbio" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index f5c54e856e24..9a3501a71957 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "scikit-build";
-  version = "0.18.0";
+  version = "0.18.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,14 +32,14 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "scikit_build";
     inherit version;
-    hash = "sha256-caE69GfRo4UQw0lHhuLttz6tU+qSK95uUZ3FNyqmUJY=";
+    hash = "sha256-pBUqxaCE1JnCineXvgYo2DZsM24vsOGgY+sy5V78uOc=";
   };
 
   patches = [
     (fetchpatch2 {
-      name = "setuptools-70.2.0-compat.patch";
-      url = "https://github.com/scikit-build/scikit-build/commit/7005897053bc5c71d823c36bbd89bd43121670f1.patch";
-      hash = "sha256-YGNCS1AXnqHQMd40CDePVNAzLe5gQ/nJxASAZafsxK8=";
+      name = "setuptools-75.0-compat.patch";
+      url = "https://github.com/scikit-build/scikit-build/commit/3992485c67331097553ec8f54233c4c295943f70.patch";
+      hash = "sha256-U34UY+m6RE3c3UN/jGHuR+sRUqTGmG7dT52NWCY7nIE=";
     })
   ];
 
diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix
index 57cc5902ed73..f7fac9f6394f 100644
--- a/pkgs/development/python-modules/scikit-fmm/default.nix
+++ b/pkgs/development/python-modules/scikit-fmm/default.nix
@@ -9,27 +9,27 @@
 
 buildPythonPackage rec {
   pname = "scikit-fmm";
-  version = "2024.5.29";
+  version = "2024.9.16";
   pyproject = true;
 
   src = fetchPypi {
     pname = "scikit_fmm";
     inherit version;
-    hash = "sha256-sy7J5UKXhuL5K8zr3lBulUMekwNlBFfC8C2VzguVTUE=";
+    hash = "sha256-q6hqteXv600iH7xpCKHgRLkJYSpy9hIf/QnlsYI+jh4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "oldest-supported-numpy" "numpy"
-  '';
-
   build-system = [ meson-python ];
 
   dependencies = [ numpy ];
 
   checkPhase = ''
+    runHook preCheck
+    # "Do not run the tests from the source directory"
     mkdir testdir; cd testdir
-    ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())"
+    (set -x
+      ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())"
+    )
+    runHook postCheck
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 6eb9bc428949..b04e02faa6e3 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -35,7 +35,7 @@ let
   installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
   self = buildPythonPackage rec {
     pname = "scikit-image";
-    version = "0.22.0";
+    version = "0.24.0";
     format = "pyproject";
 
     disabled = pythonOlder "3.8";
@@ -44,14 +44,14 @@ let
       owner = "scikit-image";
       repo = "scikit-image";
       rev = "refs/tags/v${version}";
-      hash = "sha256-M18y5JBPf3DR7SlJcCf82nG2MzwILg2w1AhJMzZXslg=";
+      hash = "sha256-zhW7P2ss7n9LXRXiBMsifxCGGKXgZFbGLl3K4u4xzfE=";
     };
 
     postPatch = ''
       patchShebangs skimage/_build_utils/{version,cythoner}.py
 
       substituteInPlace pyproject.toml \
-        --replace "numpy==" "numpy>="
+        --replace "numpy>=2.0.0rc1" "numpy"
     '';
 
     nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index eeba3f116d9d..6766ceca847e 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "1.5.0";
+  version = "1.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,12 +32,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "scikit_learn";
     inherit version;
-    hash = "sha256-eJ49sBx1DtbUlvott9UGN4V7RR5XvK6GO/9wfBJHvvc=";
+    hash = "sha256-tCN+17P90KSIJ5LmjvJUXVuqUKyju0WqffRoE4rY+U0=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "numpy>=2.0.0rc2" "numpy"
+      --replace-fail "numpy>=2" "numpy"
 
     substituteInPlace meson.build --replace-fail \
       "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \
diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix
index 5b6e9f347b3c..cf6ff0ad5474 100644
--- a/pkgs/development/python-modules/scikit-misc/default.nix
+++ b/pkgs/development/python-modules/scikit-misc/default.nix
@@ -7,24 +7,21 @@
   git,
   meson-python,
   pkg-config,
-  blas,
-  lapack,
   numpy,
   setuptools,
-  wheel,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "scikit-misc";
-  version = "0.3.1";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "scikit-misc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2L30hvKbFqIGlSEbzc1HvHybBqDGldJfZoUpqJJOv2Q=";
+    hash = "sha256-w6RHmVxJjLx9ov2LxXvicxmY8jixfkIRfbfVnV2yhOU=";
   };
 
   postPatch = ''
@@ -32,8 +29,8 @@ buildPythonPackage rec {
 
     # unbound numpy and disable coverage testing in pytest
     substituteInPlace pyproject.toml \
-      --replace 'numpy==' 'numpy>=' \
-      --replace 'addopts = "' '#addopts = "'
+      --replace-fail 'numpy>=2.0' 'numpy' \
+      --replace-fail 'addopts = "' '#addopts = "'
 
     # provide a version to use when git fails to get the tag
     [[ -f skmisc/_version.py ]] || \
@@ -41,27 +38,19 @@ buildPythonPackage rec {
   '';
 
   nativeBuildInputs = [
-    cython
     gfortran
     git
+    pkg-config
+  ];
+
+  build-system = [
+    cython
     meson-python
     numpy
-    pkg-config
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [ numpy ];
-
-  buildInputs = [
-    blas
-    lapack
-  ];
-
-  mesonFlags = [
-    "-Dblas=${blas.pname}"
-    "-Dlapack=${lapack.pname}"
-  ];
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index 78e58877d516..85539eabeff6 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "scikit-survival";
-  version = "0.22.2";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DpyGdQwN4VgGYmdREJlPB6NWiVWu8Ur4ExbysxADMr8=";
+    hash = "sha256-JFI3SDOK74vQdoUOStYlc4e0VHps97KjV3a1NQSN6E0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index 72c9d14e9106..05e32bef804b 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "selenium";
-  version = "4.24.0";
+  version = "4.25.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     repo = "selenium";
     # check if there is a newer tag with or without -python suffix
     rev = "refs/tags/selenium-${version}";
-    hash = "sha256-AsQr9kGv2dxkiFzptDA0D27OXZjYj7oDKz2oEQ2qW7s=";
+    hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY=";
   };
 
   patches = [ ./dont-build-the-selenium-manager.patch ];
diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix
similarity index 100%
rename from pkgs/tools/security/semgrep/common.nix
rename to pkgs/development/python-modules/semgrep/common.nix
diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix
new file mode 100644
index 000000000000..939454a71975
--- /dev/null
+++ b/pkgs/development/python-modules/semgrep/default.nix
@@ -0,0 +1,143 @@
+{ lib
+, callPackage
+, fetchFromGitHub
+, semgrep-core
+, buildPythonPackage
+, pythonPackages
+
+, pytestCheckHook
+, git
+}:
+
+# testing locally post build:
+# ./result/bin/semgrep scan --metrics=off --config 'r/generic.unicode.security.bidi.contains-bidirectional-characters'
+
+let
+  common = import ./common.nix { inherit lib; };
+  semgrepBinPath = lib.makeBinPath [ semgrep-core ];
+in
+buildPythonPackage rec {
+  pname = "semgrep";
+  inherit (common) version;
+  src = fetchFromGitHub {
+    owner = "semgrep";
+    repo = "semgrep";
+    rev = "v${version}";
+    hash = common.srcHash;
+  };
+
+  # prepare a subset of the submodules as we only need a handful
+  # and there are many many submodules total
+  postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList
+    (
+      path: submodule: ''
+        # substitute ${path}
+        # remove git submodule placeholder
+        rm -r ${path}
+        # link submodule
+        ln -s ${submodule}/ ${path}
+      ''
+    )
+    passthru.submodulesSubset)) + ''
+    cd cli
+  '';
+
+  # tell cli/setup.py to not copy semgrep-core into the result
+  # this means we can share a copy of semgrep-core and avoid an issue where it
+  # copies the binary but doesn't retain the executable bit
+  SEMGREP_SKIP_BIN = true;
+
+  pythonRelaxDeps = [
+    "boltons"
+    "glom"
+  ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    attrs
+    boltons
+    colorama
+    click
+    click-option-group
+    glom
+    requests
+    rich
+    ruamel-yaml
+    tqdm
+    packaging
+    jsonschema
+    wcmatch
+    peewee
+    defusedxml
+    urllib3
+    typing-extensions
+    python-lsp-jsonrpc
+    tomli
+  ];
+
+  doCheck = true;
+
+  nativeCheckInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [
+    flaky
+    pytest-snapshot
+    pytest-mock
+    pytest-freezegun
+    types-freezegun
+  ]);
+
+  disabledTestPaths = [
+    "tests/default/e2e"
+    "tests/default/e2e-pro"
+    "tests/default/e2e-pysemgrep"
+  ];
+
+  disabledTests = [
+    # requires networking
+    "test_send"
+    # requires networking
+    "test_parse_exclude_rules_auto"
+    # many child tests require networking to download files
+    "TestConfigLoaderForProducts"
+    # doesn't start flaky plugin correctly
+    "test_debug_performance"
+  ];
+
+  preCheck = ''
+    # tests need a home directory
+    export HOME="$(mktemp -d)"
+
+    # tests need access to `semgrep-core`
+    export OLD_PATH="$PATH"
+    export PATH="$PATH:${semgrepBinPath}"
+
+    # we're in cli
+    # replace old semgrep with wrapped one
+    rm ./bin/semgrep
+    ln -s $out/bin/semgrep ./bin/semgrep
+  '';
+
+  postCheck = ''
+    export PATH="$OLD_PATH"
+    unset OLD_PATH
+  '';
+
+  # since we stop cli/setup.py from finding semgrep-core and copying it into
+  # the result we need to provide it on the PATH
+  preFixup = ''
+    makeWrapperArgs+=(--prefix PATH : ${semgrepBinPath})
+  '';
+
+  postInstall = ''
+    chmod +x $out/bin/{,py}semgrep
+  '';
+
+  passthru = {
+    inherit common semgrep-core;
+    submodulesSubset = lib.mapAttrs (k: args: fetchFromGitHub args) common.submodules;
+    updateScript = ./update.sh;
+  };
+
+  meta = common.meta // {
+    description = common.meta.description + " - cli";
+    inherit (semgrep-core.meta) platforms;
+  };
+}
diff --git a/pkgs/tools/security/semgrep/semgrep-core.nix b/pkgs/development/python-modules/semgrep/semgrep-core.nix
similarity index 100%
rename from pkgs/tools/security/semgrep/semgrep-core.nix
rename to pkgs/development/python-modules/semgrep/semgrep-core.nix
diff --git a/pkgs/tools/security/semgrep/update.sh b/pkgs/development/python-modules/semgrep/update.sh
similarity index 100%
rename from pkgs/tools/security/semgrep/update.sh
rename to pkgs/development/python-modules/semgrep/update.sh
diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix
index f497e2fef41c..fe777922e226 100644
--- a/pkgs/development/python-modules/send2trash/default.nix
+++ b/pkgs/development/python-modules/send2trash/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "send2trash";
-  version = "1.8.2";
+  version = "1.8.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "hsoft";
     repo = "send2trash";
     rev = "refs/tags/${version}";
-    hash = "sha256-p0Pd9g+nLoT+oruthwjBn2E9rznvcx35VmzOAce2iTY=";
+    hash = "sha256-3RbKfluKOvl+sGJldtAt2bVfcasVKjCqVxmF6hVwh+Y=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix
index 54e7d1c2b368..11991b9ef17d 100644
--- a/pkgs/development/python-modules/sense-energy/default.nix
+++ b/pkgs/development/python-modules/sense-energy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "sense-energy";
-  version = "0.13.2";
+  version = "0.13.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "scottbonline";
     repo = "sense";
     rev = "refs/tags/${version}";
-    hash = "sha256-HE0bMcxfzfaMLDepjwDwV8AXQ3Q/bQt6SqHt7m/UY9I=";
+    hash = "sha256-k1W84c0odpYv0vI2u2zqfWGJXSpYJRSwfFyXACMto7s=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix
index e8fb3446dd95..2281fdcd60fd 100644
--- a/pkgs/development/python-modules/sensorpush-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpush-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "sensorpush-ble";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "sensorpush-ble";
     rev = "refs/tags/v${version}";
-    hash = "sha256-etsrXJn6n9yL0vhiZNnTepCcau50X0t2wPrhZ9R7XL4=";
+    hash = "sha256-T2sjzQoWWRGAKiMDN29jZ7jZ5/i75qpNCiuVB7VEhJw=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/sensoterra/default.nix b/pkgs/development/python-modules/sensoterra/default.nix
new file mode 100644
index 000000000000..a592bd652fc3
--- /dev/null
+++ b/pkgs/development/python-modules/sensoterra/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "sensoterra";
+  version = "2.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # Test require network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "sensoterra" ];
+
+  meta = {
+    description = "Query Sensoterra probes using the Customer API";
+    homepage = "https://gitlab.com/sensoterra/public/python";
+    changelog = "https://gitlab.com/sensoterra/public/python/-/blob/main/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 14c1db340348..e3d542906a71 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -63,14 +63,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.14.0";
+  version = "2.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-VrrzM81O3tG2GveP8Eq9kxVPSok7JIj3XjGOauGIlxY=";
+    hash = "sha256-jrApaDZ+R/bMOqOuQZguP9ySt6nKJeJYNpJTNTxq3no=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix
index 707a404a9025..094c66d1c4a0 100644
--- a/pkgs/development/python-modules/setuptools-dso/default.nix
+++ b/pkgs/development/python-modules/setuptools-dso/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "setuptools-dso";
-  version = "2.10";
+  version = "2.11";
   pyproject = true;
 
   src = fetchPypi {
     pname = "setuptools_dso";
     inherit version;
-    hash = "sha256-sjAZ9enOw3vF3zqXNbhu45SM5/sv2kIwfKC6SWJdG0Q=";
+    hash = "sha256-lT5mp0TiHbvkrXPiK5/uLke65znya8Y6s3RzpFuXVFY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 89ece83ec054..e9152ab0c561 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -17,26 +17,26 @@
 
 buildPythonPackage rec {
   pname = "setuptools-rust";
-  version = "1.9.0";
+  version = "1.10.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-cE3wlI8uTMYMJZatboQOpnn09D5Y7UrQwYV4ByQOq5Y=";
+    pname = "setuptools_rust";
+    inherit version;
+    hash = "sha256-15A1/FTN+TQunt9LAJSR7KsGw6ZSs3w8E3x7qFVH0+Y=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     semantic-version
     setuptools
-    typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [ "setuptools_rust" ];
 
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 7882a9363860..8b53de0a4890 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -10,19 +10,18 @@
 
 buildPythonPackage rec {
   pname = "setuptools";
-  version = "72.1.0";
+  version = "75.1.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "setuptools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3Hm9HxJdSmyhHtDZeMF76HaR17vZwZWYYhS6Z0nA8rU=";
+    hash = "sha256-ZvhXfusayUHHFXl7ZBksFhxTi1p+Va6qAwq7Fo7Tg/s=";
   };
 
   patches = [
     ./tag-date.patch
-    ./setuptools-distutils-C++.patch
   ];
 
   nativeBuildInputs = [ wheel ];
diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
deleted file mode 100644
index 10eae862de8a..000000000000
--- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
-index 7b812fd05..c122a4318 100644
---- a/setuptools/_distutils/cygwinccompiler.py
-+++ b/setuptools/_distutils/cygwinccompiler.py
-@@ -99,14 +99,18 @@ class CygwinCCompiler(UnixCCompiler):
-         self.cxx = os.environ.get('CXX', 'g++')
- 
-         self.linker_dll = self.cc
-+        self.linker_dll_cxx = self.cxx
-         shared_option = "-shared"
- 
-         self.set_executables(
-             compiler=f'{self.cc} -mcygwin -O -Wall',
-             compiler_so=f'{self.cc} -mcygwin -mdll -O -Wall',
-+            compiler_so_cxx=f'{self.cxx} -mcygwin -mdll -O -Wall',
-             compiler_cxx=f'{self.cxx} -mcygwin -O -Wall',
-             linker_exe=f'{self.cc} -mcygwin',
-             linker_so=(f'{self.linker_dll} -mcygwin {shared_option}'),
-+            linker_exe_cxx=f'{self.cxx} -mcygwin',
-+            linker_so_cxx=(f'{self.cxx} -mcygwin {shared_option}'),
-         )
- 
-         # Include the appropriate MSVC runtime library if Python was built
-@@ -138,9 +142,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else:  # for other files use the C-compiler
-             try:
--                self.spawn(
--                    self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs
--                )
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                                   extra_postargs)
-+                else:
-+                    self.spawn(
-+                        self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -276,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(
-             compiler=f'{self.cc} -O -Wall',
-             compiler_so=f'{self.cc} -shared -O -Wall',
-+            compiler_so_cxx=f'{self.cxx} -mdll -O -Wall',
-             compiler_cxx=f'{self.cxx} -O -Wall',
-             linker_exe=f'{self.cc}',
-             linker_so=f'{self.linker_dll} {shared_option}',
-+            linker_exe_cxx=f'{self.cxx}',
-+            linker_so_cxx=f'{self.linker_dll_cxx} {shared_option}',
-         )
- 
-     def runtime_library_dir_option(self, dir):
-diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
-index 7ebe67687..a995edf80 100644
---- a/setuptools/_distutils/sysconfig.py
-+++ b/setuptools/_distutils/sysconfig.py
-@@ -304,6 +304,7 @@ def customize_compiler(compiler):  # noqa: C901
-             cflags,
-             ccshared,
-             ldshared,
-+            ldcxxshared,
-             shlib_suffix,
-             ar,
-             ar_flags,
-@@ -313,11 +314,14 @@ def customize_compiler(compiler):  # noqa: C901
-             'CFLAGS',
-             'CCSHARED',
-             'LDSHARED',
-+            'LDCXXSHARED',
-             'SHLIB_SUFFIX',
-             'AR',
-             'ARFLAGS',
-         )
- 
-+        cxxflags = cflags
-+
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-             if 'LDSHARED' not in os.environ and ldshared.startswith(cc):
-@@ -329,19 +333,27 @@ def customize_compiler(compiler):  # noqa: C901
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"  # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = cflags + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -350,13 +362,17 @@ def customize_compiler(compiler):  # noqa: C901
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-+            linker_so_cxx=ldcxxshared,
-             linker_exe=cc,
-+            linker_exe_cxx=cxx,
-             archiver=archiver,
-         )
- 
-diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
-index 7e68596b2..7214dbd20 100644
---- a/setuptools/_distutils/unixccompiler.py
-+++ b/setuptools/_distutils/unixccompiler.py
-@@ -118,9 +118,12 @@ class UnixCCompiler(CCompiler):
-         'preprocessor': None,
-         'compiler': ["cc"],
-         'compiler_so': ["cc"],
--        'compiler_cxx': ["cc"],
-+        'compiler_cxx': ["c++"],
-+        'compiler_so_cxx': ["c++"],
-         'linker_so': ["cc", "-shared"],
-+        'linker_so_cxx': ["c++", "-shared"],
-         'linker_exe': ["cc"],
-+        'linker_exe_cxx': ["c++", "-shared"],
-         'archiver': ["ar", "-cr"],
-         'ranlib': None,
-     }
-@@ -187,8 +190,13 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs)
-+        compiler_so_cxx = compiler_fixup(self.compiler_so_cxx, cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [ src, '-o', obj] +
-+                               extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -256,7 +264,8 @@ class UnixCCompiler(CCompiler):
-                 # building an executable or linker_so (with shared options)
-                 # when building a shared library.
-                 building_exe = target_desc == CCompiler.EXECUTABLE
--                linker = (self.linker_exe if building_exe else self.linker_so)[:]
-+                linker = (self.linker_exe if building_exe else (self.linker_so_cxx if
-+                              target_lang == "c++" else self.linker_so))[:]
- 
-                 if target_lang == "c++" and self.compiler_cxx:
-                     env, linker_ne = _split_env(linker)
diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index 655e93f4e964..06ae4cd49b4d 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "sh";
-  version = "2.0.6";
+  version = "2.0.7";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "amoffat";
     repo = "sh";
     rev = "refs/tags/${version}";
-    hash = "sha256-c4Ms4ydcW7LgmAI1WuYD74nzILuY/Xg+JePJe0q5AQQ=";
+    hash = "sha256-O0jS/hO31ou9h0xsMSKAy76vEELjryaHKbvdfzYevJc=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix
index e2b3deaa9230..14d7ca023884 100644
--- a/pkgs/development/python-modules/shap/default.nix
+++ b/pkgs/development/python-modules/shap/default.nix
@@ -13,7 +13,6 @@
   matplotlib,
   numba,
   numpy,
-  oldest-supported-numpy,
   opencv4,
   pandas,
   pyspark,
@@ -31,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "shap";
-  version = "0.45.1";
+  version = "0.46.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,16 +39,21 @@ buildPythonPackage rec {
     owner = "slundberg";
     repo = "shap";
     rev = "refs/tags/v${version}";
-    hash = "sha256-REMAubT9WRe0exfhO4UCLt3FFQHq4HApHnI6i2F/V1o=";
+    hash = "sha256-qW36/Xw5oaYKmaMfE5euzkED9CKkjl2O55aO0OpCkfI=";
   };
 
-  nativeBuildInputs = [
-    oldest-supported-numpy
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy>=2.0" "numpy"
+  '';
+
+  build-system = [
+    numpy
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cloudpickle
     numba
     numpy
diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix
index 06f058b03275..a23ddc53b33e 100644
--- a/pkgs/development/python-modules/shazamio/default.nix
+++ b/pkgs/development/python-modules/shazamio/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "shazamio";
-  version = "0.5.1";
+  version = "0.6.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dotX12";
     repo = "ShazamIO";
     rev = "refs/tags/${version}";
-    hash = "sha256-nzKvEoh1DrZegoRNqOCh9Qm+7B7uQ9dEH75mVueGxZI=";
+    hash = "sha256-PYA7HUm++4r4kwezyPi3mWRRGF47qHjz2nHUZmVYk/I=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index f49739d57c37..911f68900789 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -13,16 +13,16 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.8";
+  version = "6.8.0.2";
 
   src = fetchurl {
     # https://download.qt.io/official_releases/QtForPython/shiboken6/
     # FIXME: inconsistent version numbers in directory name and tarball?
-    url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}.0-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-XAWtOufnJ51tudyUpG6woF/Qk1NzCfdDnDhnG9clUZA=";
+    url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-6.8.0.2-src/pyside-setup-everywhere-src-6.8.0.tar.xz";
+    hash = "sha256-Ghohmo8yfjQNJYJ1+tOp8mG48EvFcEF0fnPdatJStOE=";
   };
 
-  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
+  sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/shiboken6";
 
   patches = [ ./fix-include-qt-headers.patch ];
 
diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix
index cf5b9504012e..433858761261 100644
--- a/pkgs/development/python-modules/signxml/default.nix
+++ b/pkgs/development/python-modules/signxml/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "signxml";
-  version = "3.2.2";
+  version = "4.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     owner = "XML-Security";
     repo = "signxml";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs=";
+    hash = "sha256-ZpboU0N8dD03yHSboMpC+TJvp16StM45Qhn0Hv9+6fg=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     certifi
     cryptography
     lxml
diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
index 7498a29ee104..9aafd726976e 100644
--- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix
+++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "sigstore-rekor-types";
-  version = "0.0.11";
+  version = "0.0.13";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "trailofbits";
     repo = "sigstore-rekor-types";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns=";
+    hash = "sha256-vZNzNu0Ks0Xp/v406jVqPV9FuHgXORMa7NzmXeWoa+Q=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index b8d70a31b7aa..644ae86eb5d8 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.19.2";
+  version = "3.19.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-+HHtU6sxxwISciLxiwa5m1zj7h/SLDmRxOZNqW5FQSY=";
+    hash = "sha256-M6ohYhw7xvZiNVm9uhotvPHeVsBOwYjDpj2sfXAzf0U=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix
index 3cd1ddface07..191fbb5df796 100644
--- a/pkgs/development/python-modules/simplemma/default.nix
+++ b/pkgs/development/python-modules/simplemma/default.nix
@@ -1,34 +1,49 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
-
+  setuptools,
+  marisa-trie,
+  platformdirs,
+  pytest,
+  pytest-cov-stub,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "simplemma";
-  version = "1.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  version = "1.1.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adbar";
     repo = "simplemma";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lhk6QrBg0m8orYHphnP+YiCnJFE44buyp3NQbz0U550=";
+    hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY=";
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  build-system = [
+    setuptools
+  ];
+
+  optional-dependencies = {
+    marisa-trie = [
+      marisa-trie
+      platformdirs
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "simplemma" ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency";
     homepage = "https://github.com/adbar/simplemma";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/siphashc/default.nix b/pkgs/development/python-modules/siphashc/default.nix
index 639f06ead5f1..5b8b11142d33 100644
--- a/pkgs/development/python-modules/siphashc/default.nix
+++ b/pkgs/development/python-modules/siphashc/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "siphashc";
-  version = "2.4.1";
+  version = "2.5";
   pyproject = true;
   build-system = [ setuptools ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ptNpy7VkUXHbjvdir6v+eYOmtQ/j8XPXq4lj7ceS/5s=";
+    sha256 = "sha256-o7zGnOM96+C0I98iSYzua2MB8TP1okdw/m9O9I2DK00=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix
index 438072e9b072..277aa4961f3d 100644
--- a/pkgs/development/python-modules/sipyco/default.nix
+++ b/pkgs/development/python-modules/sipyco/default.nix
@@ -2,31 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  setuptools,
   pytestCheckHook,
   numpy,
 }:
 
 buildPythonPackage rec {
   pname = "sipyco";
-  version = "1.4";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "1.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "sipyco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sEYWtp11piUIa8YyuTOdFIIJ2GfcrUb+HEzPVKr4hW8=";
+    hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w=";
   };
 
-  propagatedBuildInputs = [ numpy ];
+  build-system = [ setuptools ];
+
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "sipyco" ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Simple Python Communications - used by the ARTIQ experimental control package";
     mainProgram = "sipyco_rpctool";
diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix
index 8e27202ad838..308ecd70de06 100644
--- a/pkgs/development/python-modules/skia-pathops/default.nix
+++ b/pkgs/development/python-modules/skia-pathops/default.nix
@@ -10,6 +10,7 @@
   fetchPypi,
   gn,
   pytestCheckHook,
+  cctools,
   xcodebuild,
   ApplicationServices,
   OpenGL,
@@ -53,11 +54,16 @@ buildPythonPackage rec {
           EOF
         '';
 
-  nativeBuildInputs = [
-    cython
-    ninja
-    setuptools-scm
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
+  nativeBuildInputs =
+    [
+      cython
+      ninja
+      setuptools-scm
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools.libtool
+      xcodebuild
+    ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     ApplicationServices
diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix
index eb99c9240a56..921cbf4b2089 100644
--- a/pkgs/development/python-modules/skrl/default.nix
+++ b/pkgs/development/python-modules/skrl/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "skrl";
-  version = "1.1.0";
+  version = "1.3.0";
   pyproject = true;
   disabled = pythonOlder "3.6";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Toni-SM";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-JsE8QQNOqvFQylrPuHEjejOTeQL652rM0EteAfLyeVI=";
+    hash = "sha256-kKkAdQymmgJ9V+73nYi4MhOSJvrO2jwJ2BUYhUGPHe0=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix
index ace86514b22a..9b533254b46f 100644
--- a/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/pkgs/development/python-modules/slack-bolt/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "slack-bolt";
-  version = "1.18.1";
+  version = "1.20.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "slackapi";
     repo = "bolt-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UwVStemFVA4hgqnSpCKpQGwLYG+p5z7MwFXXnIhrvNk=";
+    hash = "sha256-wDiRQ44ei59I8/2JXv2j9VQFthdyS7sSEZLS7trhdp0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/smarthab/default.nix b/pkgs/development/python-modules/smarthab/default.nix
index 4060a3a92a91..44bde1243e8c 100644
--- a/pkgs/development/python-modules/smarthab/default.nix
+++ b/pkgs/development/python-modules/smarthab/default.nix
@@ -3,20 +3,23 @@
   buildPythonPackage,
   fetchPypi,
   aiohttp,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "smarthab";
   version = "0.21";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "SmartHab";
     inherit version;
-    sha256 = "bf929455a2f7cc1e275b331de73d983587138a8d9179574988ba05fa152d3ccf";
+    hash = "sha256-v5KUVaL3zB4nWzMd5z2YNYcTio2ReVdJiLoF+hUtPM8=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # no tests on PyPI, no tags on GitLab
   doCheck = false;
diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix
index e51744b9f507..fb0ec8e4da24 100644
--- a/pkgs/development/python-modules/smartypants/default.nix
+++ b/pkgs/development/python-modules/smartypants/default.nix
@@ -11,8 +11,8 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.1";
   pname = "smartypants";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = isPyPy;
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "leohemsted";
     repo = "smartypants.py";
-    rev = "v${version}";
-    sha256 = "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-V1rV1B8jVADkS0NhnDkoVz8xxkqrsIHb1mP9m5Z94QI=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [
     docutils
@@ -47,9 +47,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python with the SmartyPants";
-    mainProgram = "smartypants";
     homepage = "https://github.com/leohemsted/smartypants.py";
+    changelog = "https://github.com/leohemsted/smartypants.py/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ dotlambda ];
+    mainProgram = "smartypants";
   };
 }
diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix
index 68405f52beff..f33a64fcaa8d 100644
--- a/pkgs/development/python-modules/smbprotocol/default.nix
+++ b/pkgs/development/python-modules/smbprotocol/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "smbprotocol";
-  version = "1.12.0";
+  version = "1.14.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jborean93";
     repo = "smbprotocol";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1huM+/WDrVJsB4ARh6fB6rLFOe9IqSQWr/A78FAk/Ag=";
+    hash = "sha256-9J6p3rJeD6ZTOiumUQ7XX7nHI4mC3Sf+Gc+Fw2vwVk4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix
index a31cb56a3a36..da71e6b5b7b7 100644
--- a/pkgs/development/python-modules/smhi-pkg/default.nix
+++ b/pkgs/development/python-modules/smhi-pkg/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "smhi-pkg";
-  version = "1.0.17";
+  version = "1.0.18";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "joysoftware";
     repo = "pypi_smhi";
     rev = "refs/tags/${version}";
-    hash = "sha256-dJh44JGWy3VafTnwwxWcr5cXClmzY1YuySy1RJzOak8=";
+    hash = "sha256-ygjlUEQpyHjIO1QLB+MrijWQr84v3v+RdlcRwi9H/cs=";
   };
 
   propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index 26942b6d9118..3e94b4c31d3c 100644
--- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "snowflake-sqlalchemy";
-  version = "1.5.3";
+  version = "1.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eRkew/6/syvP/s1m8qfdVhvVcTRepLzL9BzB+1wGgv8=";
+    hash = "sha256-eSzekowNHTBxS4iwQE3oHtKXp3RcvMJT3NqXP2V1k4I=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sorl-thumbnail/default.nix b/pkgs/development/python-modules/sorl-thumbnail/default.nix
index de3fd466ec6e..161c8119cb93 100644
--- a/pkgs/development/python-modules/sorl-thumbnail/default.nix
+++ b/pkgs/development/python-modules/sorl-thumbnail/default.nix
@@ -10,17 +10,18 @@
 
 buildPythonPackage rec {
   pname = "sorl-thumbnail";
-  version = "12.10.0";
+  version = "12.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-3pWkkhf9/s7SIvo86qAdMS7i+KrVa6NNbHDy3umoSTg=";
+    pname = "sorl_thumbnail";
+    inherit version;
+    hash = "sha256-GRuJwn7LQLXCo1VJ1VfRfEhBxq/0ObLhe5OLke6kY7M=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix
index fa777afe1f41..6fd5c0b67494 100644
--- a/pkgs/development/python-modules/soundcloud-v2/default.nix
+++ b/pkgs/development/python-modules/soundcloud-v2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "soundcloud-v2";
-  version = "1.5.4";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cnM70Yz9xw3TPqGk8VYAag6u1nLjQS2kS7xRBJtFodU=";
+    hash = "sha256-RiUTFGwP/J7HKcHGFvT3Kw3NM/gUeMZCB/Jl8HLngkM=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix
index b5583765da31..ae4e101f5f64 100644
--- a/pkgs/development/python-modules/soupsieve/default.nix
+++ b/pkgs/development/python-modules/soupsieve/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "soupsieve";
-  version = "2.5";
+  version = "2.6";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VmPVp7O/ru4LxDcuf8SPnP9JQLPuxUpkUcxSmfEJdpA=";
+    hash = "sha256-4uaEF3d681nsZdqsEFdASjyKVFW7irw28amGarGlGrs=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/soxr/cmake-nanobind.patch b/pkgs/development/python-modules/soxr/cmake-nanobind.patch
new file mode 100644
index 000000000000..2f527e7a1692
--- /dev/null
+++ b/pkgs/development/python-modules/soxr/cmake-nanobind.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb701aa..6cb4b02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,11 @@ find_package(Python 3.9
+     REQUIRED COMPONENTS Interpreter Development.Module
+     OPTIONAL_COMPONENTS Development.SABIModule)
+ 
++execute_process(
++  COMMAND "${Python_EXECUTABLE}" -m nanobind --cmake_dir
++  OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NB_DIR)
++list(APPEND CMAKE_PREFIX_PATH "${NB_DIR}")
++
+ find_package(nanobind CONFIG REQUIRED)
+ 
+ if (USE_SYSTEM_LIBSOXR)
diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index 841ba83259f7..9095dcb7ae7f 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -2,51 +2,68 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonOlder,
 
   # build-system
-  cython,
-  numpy,
-  oldest-supported-numpy,
+  cmake,
+  nanobind,
+  ninja,
+  scikit-build-core,
   setuptools,
   setuptools-scm,
-  gnutar,
+  typing-extensions,
 
-  # native
+  # native dependencies
   libsoxr,
 
+  # dependencies
+  numpy,
+
   # tests
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "soxr";
-  version = "0.3.7";
-  format = "pyproject";
+  version = "0.5.0.post1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dofuuz";
     repo = "python-soxr";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    hash = "sha256-HGtoMfMQ5/2iEIFtik7mCrSxFnLXkSSx2W8wBul0+jk=";
+    hash = "sha256-Fpayc+MOpDUCdpoyJaIqSbMzuO0jYb6UN5ARFaxxOHk=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "SYS_LIBSOXR = False" "SYS_LIBSOXR = True"
-  '';
+  patches = [ ./cmake-nanobind.patch ];
 
   nativeBuildInputs = [
-    cython
-    gnutar
-    numpy
-    oldest-supported-numpy
-    setuptools
-    setuptools-scm
+    cmake
+    ninja
   ];
 
+  dontUseCmakeConfigure = true;
+
+  pypaBuildFlags = [
+    "--config=cmake.define.USE_SYSTEM_LIBSOXR=ON"
+  ];
+
+  build-system =
+    [
+      scikit-build-core
+      nanobind
+      setuptools
+      setuptools-scm
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [
+      typing-extensions
+    ];
+
   buildInputs = [ libsoxr ];
 
+  dependencies = [ numpy ];
+
   pythonImportsCheck = [ "soxr" ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix
index 259383492a25..48314a348209 100644
--- a/pkgs/development/python-modules/spatialmath-python/default.nix
+++ b/pkgs/development/python-modules/spatialmath-python/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
@@ -10,18 +11,12 @@
   numpy,
   scipy,
   typing-extensions,
-  coverage,
-  flake8,
-  pytest,
-  pytest-timeout,
-  pytest-xvfb,
-  sympy,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "spatialmath-python";
-  version = "1.1.10";
+  version = "1.1.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,17 +24,19 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "spatialmath_python";
     inherit version;
-    hash = "sha256-7h29RHCrxdexpabtxMQx/7RahQmCDGHhdJ1WETvtfYg=";
+    hash = "sha256-BhIB4VapnARkzyhps8xRWnQTAlRB8aVPDpNuN/FNezo=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     oldest-supported-numpy
     setuptools
   ];
 
   pythonRemoveDeps = [ "pre-commit" ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "matplotlib" ];
+
+  dependencies = [
     ansitable
     matplotlib
     numpy
@@ -47,21 +44,17 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  optional-dependencies = {
-    dev = [
-      coverage
-      flake8
-      pytest
-      pytest-timeout
-      pytest-xvfb
-      sympy
-    ];
-  };
-
   pythonImportsCheck = [ "spatialmath" ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTestPaths = [
+    # tests hang
+    "tests/test_spline.py"
+  ];
+
+  env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg";
+
   meta = with lib; {
     description = "Provides spatial maths capability for Python";
     homepage = "https://pypi.org/project/spatialmath-python/";
diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix
index 670f1e004aae..309d7a6af048 100644
--- a/pkgs/development/python-modules/speechbrain/default.nix
+++ b/pkgs/development/python-modules/speechbrain/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "speechbrain";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "speechbrain";
     repo = "speechbrain";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5ZMS1g74G4w83kNrXyt9IUsXe5uYS1qC+MwleQrjhTY=";
+    hash = "sha256-Un7RPxMq1sD7uD3jcw3Bjp+Oo8ld+XC5g2I89gF6jxs=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index ee20791679c0..d53493b0a992 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -17,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "speechrecognition";
-  version = "3.10.4";
+  version = "3.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "Uberi";
     repo = "speech_recognition";
     rev = "refs/tags/${version}";
-    hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4=";
+    hash = "sha256-5DZ5QhaYpVtd+AX5OSYD3cM+37Ez0+EL5a+zJ+X/uNg=";
   };
 
   postPatch = ''
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
+    audio = [ pyaudio ];
     whisper-api = [ openai ];
     whisper-local = [
       openai-whisper
@@ -57,7 +58,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pocketsphinx
-  ] ++ optional-dependencies.whisper-local ++ optional-dependencies.whisper-api;
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "speech_recognition" ];
 
diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix
index 8a88c346dbac..5bc24ba7ec93 100644
--- a/pkgs/development/python-modules/sphinx-argparse/default.nix
+++ b/pkgs/development/python-modules/sphinx-argparse/default.nix
@@ -2,32 +2,31 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pytestCheckHook,
+  flit-core,
   sphinx,
+  pytestCheckHook,
+  lxml,
 }:
 
 buildPythonPackage rec {
   pname = "sphinx-argparse";
-  version = "0.4.0";
-  format = "setuptools";
+  version = "0.5.2";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "sphinx_argparse";
     inherit version;
-    hash = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek=";
+    hash = "sha256-5TUvj6iUtvtv2gSYuiip+NQ1lx70u8GmycZBTnZE8DI=";
   };
 
-  postPatch = ''
-    # Fix tests for python-3.10 and add 3.10 to CI matrix
-    # Should be fixed in versions > 0.3.1
-    # https://github.com/ashb/sphinx-argparse/pull/3
-    substituteInPlace sphinxarg/parser.py \
-      --replace "if action_group.title == 'optional arguments':" "if action_group.title == 'optional arguments' or action_group.title == 'options':"
-  '';
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [ sphinx ];
+  dependencies = [ sphinx ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    lxml
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "sphinxarg" ];
 
diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix
index b802384ae133..33314d868f6d 100644
--- a/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -8,6 +8,7 @@
 
   # dependencies
   colorama,
+  httpx,
   sphinx,
   starlette,
   uvicorn,
@@ -20,20 +21,21 @@
 
 buildPythonPackage rec {
   pname = "sphinx-autobuild";
-  version = "2024.04.16";
+  version = "2024.09.19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sphinx-doc";
     repo = "sphinx-autobuild";
     rev = "refs/tags/${version}";
-    hash = "sha256-5HgRqt2ZTGcQ6X2sZN0gRfahmwlqpDbae5gOnGa02L0=";
+    hash = "sha256-azSQ524iXWeW7D1NgpWErFL4K0TBZ8ib6lRr1J246h4=";
   };
 
   build-system = [ flit-core ];
 
   dependencies = [
     colorama
+    httpx
     sphinx
     starlette
     uvicorn
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index 7d3030c7226a..a5bd5406b0cc 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -11,27 +11,29 @@
 
 let
   pname = "sphinx-autodoc-typehints";
-  version = "2.1.1";
+  version = "2.4.4";
 in
 
 buildPythonPackage {
   inherit pname version;
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "sphinx_autodoc_typehints";
     inherit version;
-    hash = "sha256-AHK2X1qygYwinW1sLMmTdwr1XTa7e/sWAB4vzk0UiAw=";
+    hash = "sha256-50NRLaWLZ6BleaFGJ5imkHZkq3dGB1ikMjSt6sNQr78=";
   };
 
-  nativeBuildInputs = [
+  pythonRelaxDeps = [ "sphinx" ];
+
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [ sphinx ];
+  dependencies = [ sphinx ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
new file mode 100644
index 000000000000..9442a660bc38
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+
+  flit-core,
+
+  astroid,
+  typing-extensions,
+  typer,
+
+  pytestCheckHook,
+  pytest-regressions,
+  sphinx,
+  defusedxml,
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-autodoc2";
+  version = "0.5.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "sphinx-extensions2";
+    repo = "sphinx-autodoc2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Wu079THK1mHVilD2Fx9dIzuIOOYOXpo/EMxVczNutCI=";
+  };
+
+  build-system = [ flit-core ];
+
+  dependencies = [
+    astroid
+    typing-extensions
+
+    # cli deps
+    typer
+  ] ++ typer.optional-dependencies.standard;
+
+  preCheck = ''
+    # make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0
+    substituteInPlace tests/test_render.py --replace-fail \
+        'from sphinx.testing.util import path as sphinx_path' \
+        'sphinx_path = Path'
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-regressions
+    sphinx
+    defusedxml
+  ];
+
+  disabledTests = [
+    # some generated files differ in newer versions of Sphinx
+    "test_sphinx_build_directives"
+  ];
+
+  pythonImportsCheck = [ "autodoc2" ];
+
+  meta = {
+    changelog = "https://github.com/sphinx-extensions2/sphinx-autodoc2/releases/tag/v${version}";
+    homepage = "https://github.com/sphinx-extensions2/sphinx-autodoc2";
+    description = "Sphinx extension that automatically generates API documentation for your Python packages";
+    license = lib.licenses.mit;
+    mainProgram = "autodoc2";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix
index 371be354dc70..2c3b0820b552 100644
--- a/pkgs/development/python-modules/sphinx-automodapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "sphinx-automodapi";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
   disabled = pythonOlder "3.7";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "astropy";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Suu81pWUIwIgp/iTaYambuYRTkC7njP6n5RWZscugnk=";
+    hash = "sha256-YTaoGBYQvuUbMYe4FKmtgxcAxeesU/ruVXPOjZXGLGU=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
new file mode 100644
index 000000000000..47689da31158
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
@@ -0,0 +1,33 @@
+{
+  buildPythonPackage,
+  lib,
+  fetchFromGitLab,
+  setuptools,
+  sphinx,
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-lv2-theme";
+  version = "1.4.2";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "LV2";
+    repo = "sphinx_lv2_theme";
+    rev = "v${version}";
+    hash = "sha256-x3h2hOQIyzOmnh58WMHjuOARdML1sDiVAf7m0YghhJ4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ sphinx ];
+
+  pythonImportsCheck = [ "sphinx_lv2_theme" ];
+
+  meta = {
+    description = "Sphinx theme in the style of the LV2 plugin";
+    homepage = "https://gitlab.com/lv2/sphinx_lv2_theme";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ samueltardieu ];
+  };
+}
diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix
index 918282c97679..f2ad32e67a43 100644
--- a/pkgs/development/python-modules/sphinx-sitemap/default.nix
+++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix
@@ -5,11 +5,12 @@
   setuptools,
   sphinx,
   sphinx-pytest,
+  defusedxml,
   pytestCheckHook,
 }:
 let
   pname = "sphinx-sitemap";
-  version = "2.5.1";
+  version = "2.6.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -19,7 +20,7 @@ buildPythonPackage {
     owner = "jdillard";
     repo = "sphinx-sitemap";
     rev = "refs/tags/v${version}";
-    hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk=";
+    hash = "sha256-RERa+/MVug2OQ/FAXS4LOQHB4eEuIW2rwcdZUOrr6g8=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -29,6 +30,7 @@ buildPythonPackage {
   nativeCheckInputs = [
     pytestCheckHook
     sphinx-pytest
+    defusedxml
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 16e2a81e5043..dc79c8b664e5 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -4,7 +4,6 @@
   pythonAtLeast,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   isPyPy,
 
   # build-system
@@ -29,6 +28,7 @@
   sphinxcontrib-serializinghtml,
   sphinxcontrib-websupport,
   tomli,
+  typing-extensions,
 
   # check phase
   defusedxml,
@@ -40,8 +40,9 @@
 
 buildPythonPackage rec {
   pname = "sphinx";
-  version = "7.3.7";
-  format = "pyproject";
+  version = "7.4.7";
+  pyproject = true;
+
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
@@ -55,17 +56,9 @@ buildPythonPackage rec {
       mv tests/roots/test-images/{testimäge,testimæge}.png
       sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst}
     '';
-    hash = "sha256-XGGRWEvd1SbQsK8W5yxDzBd5hlvXcDzr8t5Qa6skH/M=";
+    hash = "sha256-/5zH9IdLmTGnn5MY4FFSuZOIeF/x1L9Ga/wp57XrAQo=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "python-3.13-compat.patch";
-      url = "https://github.com/sphinx-doc/sphinx/commit/3496de62b743942115acb486cf35dfcc102586c3.patch";
-      hash = "sha256-5VBPOQeGyj3a8VBq4hc9S/eKaeVZeGCTNislwgsauZo=";
-    })
-  ];
-
   build-system = [ flit-core ];
 
   dependencies =
@@ -99,6 +92,7 @@ buildPythonPackage rec {
     html5lib
     pytestCheckHook
     pytest-xdist
+    typing-extensions
   ];
 
   preCheck = ''
@@ -121,6 +115,8 @@ buildPythonPackage rec {
       "test_class_alias_having_doccomment"
       "test_class_alias_for_imported_object_having_doccomment"
       "test_decorators"
+      # Assertion error
+      "test_gettext_literalblock_additional"
       # requires cython_0, but fails miserably on 3.11
       "test_cython"
       # Could not fetch remote image: http://localhost:7777/sphinx.png
diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index dbd91f0e5da6..6e88e523b901 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -1,34 +1,51 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
+  setuptools,
+  docutils,
+  importlib-metadata,
   oset,
   pybtex,
   pybtex-docutils,
   sphinx,
+  sphinx-autoapi,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-bibtex";
-  version = "2.6.2";
-  format = "setuptools";
+  version = "2.6.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9IevaUM28ov7fWoXBwlTp9JkvsQwAKI3lyQnT1+NcK4=";
+  src = fetchFromGitHub {
+    owner = "mcmtroffaes";
+    repo = "sphinxcontrib-bibtex";
+    rev = "refs/tags/${version}";
+    hash = "sha256-cqz5Jamtlflo5rFhWPCPlYoymApUtXPG4oTRjfDI+WY=";
   };
 
-  propagatedBuildInputs = [
-    oset
-    pybtex
-    pybtex-docutils
-    sphinx
-  ];
+  build-system = [ setuptools ];
 
-  doCheck = false;
+  dependencies =
+    [
+      docutils
+      oset
+      pybtex
+      pybtex-docutils
+      sphinx
+    ]
+    ++ lib.optionals (pythonOlder "3.10") [
+      importlib-metadata
+    ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    sphinx-autoapi
+  ];
 
   pythonImportsCheck = [ "sphinxcontrib.bibtex" ];
 
diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
index 69b237b0452b..3279faae0128 100644
--- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-htmlhelp";
-  version = "2.0.5";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sphinxcontrib_htmlhelp";
     inherit version;
-    hash = "sha256-Dch2N9XeU91e7DpqAXU7HM+ZSUvXVqr+zXS0+p5ykBU=";
+    hash = "sha256-yeKRas6KrWTME6DSM+4iMX8rkCW5zzKVJJ+phcxwguk=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
index 402432dd1e49..755deb678526 100644
--- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-qthelp";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sphinxcontrib_qthelp";
     inherit version;
-    hash = "sha256-BT3tw4gjqApyCagIYLFrci6eAgnjL+qYyQ5OZiRYjtY=";
+    hash = "sha256-2z+PoQeJx6jnbRc8IzZL3w682USZaanmo90xuLdGnwM=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix
index 777c134ce196..54308db1a8b0 100644
--- a/pkgs/development/python-modules/spotifyaio/default.nix
+++ b/pkgs/development/python-modules/spotifyaio/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "spotifyaio";
-  version = "0.7.1";
+  version = "0.8.7";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-spotify";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L5S7adnOOJQ0b+yUcL8rw9XkZS0meN2gN1Bi2WYOJks=";
+    hash = "sha256-8CvXh3lU6CWOIFyfKQv4TX4R9O9BzwEu/Cua0MRdma4=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 46bf6bb70bb2..c0511c2fc6a7 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "3.0.0";
+  version = "3.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spyder-ide";
     repo = "spyder-kernels";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oyPgujvaj2tqouZKuMVDq3gxm0GNrKmeUWqUFUkEMB4=";
+    hash = "sha256-OWdm4ytF9evqMEOOASssMag6QuJq2MwqmIZ+4et5IoI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 6c18f7e382e8..dfd9a79aeb38 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -3,6 +3,11 @@
   buildPythonPackage,
   fetchPypi,
 
+  # nativeBuildInputs
+
+  # build-system
+  setuptools,
+
   # dependencies
   aiohttp,
   asyncssh,
@@ -40,7 +45,6 @@
   rope,
   rtree,
   scipy,
-  setuptools,
   spyder-kernels,
   superqt,
   textdistance,
@@ -51,18 +55,21 @@
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "6.0.1";
+  version = "6.0.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cJeC6ICRWIu+YU3m673ntHVEpNbCJeGZ3lrSK3fYsTA=";
+    hash = "sha256-mPUrAYFn3k5NQrsk7B2aPFnkAxKSKC4I97DnFPK1pvM=";
   };
 
   patches = [ ./dont-clear-pythonpath.patch ];
 
-  build-system = [
+  nativeBuildInputs = [
     pyqtwebengine.wrapQtAppsHook
+  ];
+
+  build-system = [
     setuptools
   ];
 
diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
index 1adb1c21d046..66a1e659b5a1 100644
--- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  aiosqlite,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -11,16 +12,16 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy-mixins";
-  version = "2.0.5";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "absent1706";
-    repo = pname;
+    repo = "sqlalchemy-mixins";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI=";
+    hash = "sha256-0uB3x7RQSNEq3DyTSiOIGajwPQQEBjXK8HOyuXCNa/E=";
   };
 
   build-system = [ setuptools ];
@@ -30,7 +31,10 @@ buildPythonPackage rec {
     sqlalchemy
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    aiosqlite
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "sqlalchemy_mixins" ];
 
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index 1cf2d9418e98..ec8f69958be3 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -1,55 +1,52 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-
-  # runtime
-  importlib-metadata,
-  sqlalchemy,
-
-  # optionals
-  babel,
   arrow,
-  pendulum,
-  #, intervals
-  phonenumbers,
-  passlib,
+  babel,
   colour,
-  python-dateutil,
-  furl,
   cryptography,
-
-  # tests
-  pytestCheckHook,
-  pygments,
-  jinja2,
   docutils,
+  fetchFromGitHub,
   flexmock,
+  furl,
+  # intervals,
+  jinja2,
+  passlib,
+  pendulum,
+  pg8000,
+  phonenumbers,
   psycopg2,
   psycopg2cffi,
-  pg8000,
-  pytz,
-  backports-zoneinfo,
+  pygments,
   pymysql,
   pyodbc,
-
+  pytestCheckHook,
+  python-dateutil,
+  pythonOlder,
+  pytz,
+  setuptools,
+  sqlalchemy,
 }:
 
 buildPythonPackage rec {
   pname = "sqlalchemy-utils";
-  version = "0.41.2";
-  format = "setuptools";
+  version = "0.42.2";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit version;
-    pname = "SQLAlchemy-Utils";
-    hash = "sha256-vFmcjDszGeU85sXDxHESC9Ml0AcftvOKEOkk49B7mZA=";
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "kvesteri";
+    repo = "sqlalchemy-utils";
+    rev = "refs/tags/${version}";
+    hash = "sha256-jC8onlCiuzpMlJ3EzpzCnQ128xpkLzrZEuGWQv7pvVE=";
   };
 
   patches = [ ./skip-database-tests.patch ];
 
-  propagatedBuildInputs = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  build-system = [ setuptools ];
+
+  propagatedBuildInputs = [ sqlalchemy ];
 
   optional-dependencies = {
     babel = [ babel ];
@@ -82,20 +79,24 @@ buildPythonPackage rec {
     ++ lib.optionals (pythonOlder "3.12") [
       # requires distutils, which were removed in 3.12
       psycopg2cffi
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
+    ];
 
-  pytestFlagsArray = [
-    "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice"
-    "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop"
-    "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop"
-    "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG3::test_create_and_drop"
+  disabledTests = [
+    "test_create_database_twice"
+    "test_create_and_drop"
   ];
 
+  pytestFlagsArray = [
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
+  pythonImportsCheck = [ "sqlalchemy_utils" ];
+
   meta = with lib; {
-    changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}";
-    homepage = "https://github.com/kvesteri/sqlalchemy-utils";
     description = "Various utility functions and datatypes for SQLAlchemy";
+    homepage = "https://github.com/kvesteri/sqlalchemy-utils";
+    changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ eadwu ];
   };
diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix
index 69c91cf65c0c..18b2a0c43983 100644
--- a/pkgs/development/python-modules/sqlparse/default.nix
+++ b/pkgs/development/python-modules/sqlparse/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "sqlparse";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cU0KSTLAWdFhifWO9UEewih6Q2DxfN0O3S0J1MUIfJM=";
+    hash = "sha256-u2tN9GVlXvMyVI4k8I4gWvyBuauGyxxFZXp/8XOjoA4=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix
index 6ac658f7ef79..e3c9c04fe6d3 100644
--- a/pkgs/development/python-modules/srp/default.nix
+++ b/pkgs/development/python-modules/srp/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "srp";
-  version = "1.0.21";
+  version = "1.0.22";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hmgTvPUhGJoVY+bKMRK29U/fclpBCi2+u28NhLgqHx0=";
+    hash = "sha256-8zDQ7HOH4qyFd0h7FkljFV1KAxvKbiAk8bCTDrkrql0=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/ssort/default.nix b/pkgs/development/python-modules/ssort/default.nix
index 71a950b98bd7..6a60f6ab1e53 100644
--- a/pkgs/development/python-modules/ssort/default.nix
+++ b/pkgs/development/python-modules/ssort/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ssort";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bwhmather";
     repo = "ssort";
     rev = "refs/tags/${version}";
-    hash = "sha256-P/FUayCC7KfXjtzclTPLhLw5o0bV4L98tes69w+038o=";
+    hash = "sha256-TINktjuTdyRYkqIs3Jyv6vobSBqV1iPoHrG36sBHah8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 21551a5786da..c68e0f515ce5 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "starlette";
-  version = "0.37.2";
+  version = "0.39.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = "starlette";
     rev = "refs/tags/${version}";
-    hash = "sha256-GiCN1sfhLu9i19d2OcLZrlY8E64DFrFh+ITRSvLaxdE=";
+    hash = "sha256-sAvtqeyfyMf+xt78bqlaNYW9xYYCFkiW45OVlI9itgg=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index d917d3ebf735..f08c9613fc34 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -16,19 +16,19 @@
 
 buildPythonPackage rec {
   pname = "statsmodels";
-  version = "0.14.2";
+  version = "0.14.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iQVQFHrTqBzaJPC6GlxAIa3BYBCAvQDhka581v7s1q0=";
+    hash = "sha256-7PNQJkP6k6q+XwvfI477WWCVF8TWCoEWMtMfzc6GwtI=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "numpy>=2.0.0rc1,<3" "numpy"
+      --replace-fail "numpy>=2.0.0,<3" "numpy"
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix
index 9d1cda9a761f..1b5ca74cc77b 100644
--- a/pkgs/development/python-modules/stim/default.nix
+++ b/pkgs/development/python-modules/stim/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "stim";
-  version = "1.13.0";
+  version = "1.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "quantumlib";
     repo = "Stim";
     rev = "refs/tags/v${version}";
-    hash = "sha256-anJvDHLZ470iNw0U7hq9xGBacDgqYO9ZcmmdCt9pefg=";
+    hash = "sha256-Tx+4FfkMShzTP1QEQVwHEz3FZ5pz3uXK2mlJFLNlTas=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix
index 4ca5ee040a75..16898cb624d4 100644
--- a/pkgs/development/python-modules/stix2-patterns/default.nix
+++ b/pkgs/development/python-modules/stix2-patterns/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  antlr4_9,
   antlr4-python3-runtime,
   buildPythonPackage,
   fetchFromGitHub,
@@ -23,15 +24,10 @@ buildPythonPackage rec {
     hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>="
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
-    antlr4-python3-runtime
+    (antlr4-python3-runtime.override { antlr4 = antlr4_9; })
     six
   ];
 
@@ -39,14 +35,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "stix2patterns" ];
 
-  disabledTestPaths = [
-    # Exception: Could not deserialize ATN with version  (expected 4)
-    "stix2patterns/test/v20/test_inspector.py"
-    "stix2patterns/test/v21/test_inspector.py"
-    "stix2patterns/test/v20/test_validator.py"
-    "stix2patterns/test/v21/test_validator.py"
-  ];
-
   meta = with lib; {
     description = "Validate patterns used to express cyber observable content in STIX Indicators";
     mainProgram = "validate-patterns";
diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix
new file mode 100644
index 000000000000..26622eea45b5
--- /dev/null
+++ b/pkgs/development/python-modules/stix2/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  haversine,
+  medallion,
+  pytz,
+  rapidfuzz,
+  requests,
+  simplejson,
+  stix2-patterns,
+  taxii2-client,
+}:
+
+buildPythonPackage rec {
+  pname = "stix2";
+  version = "3.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "oasis-open";
+    repo = "cti-python-stix2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pytz
+    requests
+    simplejson
+    stix2-patterns
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    haversine
+    medallion
+    rapidfuzz
+    taxii2-client
+  ];
+
+  disabledTests = [
+    # flaky tests
+    "test_graph_equivalence_with_filesystem_source"
+    "test_graph_similarity_with_filesystem_source"
+    "test_object_similarity_prop_scores"
+  ];
+
+  pythonImportsCheck = [ "stix2" ];
+
+  meta = with lib; {
+    description = "Produce and consume STIX 2 JSON content";
+    homepage = "https://stix2.readthedocs.io/en/latest/";
+    changelog = "https://github.com/oasis-open/cti-python-stix2/blob/v${version}/CHANGELOG";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ PapayaJackal ];
+  };
+}
diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index d7698c977d0a..fea218cbc29d 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -1,7 +1,6 @@
 {
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   lib,
   mock,
   packaging,
@@ -14,32 +13,16 @@
 
 buildPythonPackage rec {
   pname = "stone";
-  version = "3.3.6";
+  version = "3.3.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
-  patches = [
-    # fix distutils issue
-    # fix versions in tests to conform pep 440
-    # See https://github.com/dropbox/stone/pull/334
-    (fetchpatch {
-      name = "no-distutils.patch";
-      url = "https://github.com/dropbox/stone/commit/f772d8d3b7e2ce62b14b4fb208a478bc8e54c7f2.patch";
-      hash = "sha256-SH4gG5S13n/pXppm62LvH9poGfeQGGonW7bkzdYh73Q=";
-    })
-    (fetchpatch {
-      name = "fix-test-pep-440.patch";
-      url = "https://github.com/dropbox/stone/commit/f36de56b1f87eae61829258b2f16aa8319bbcc5c.patch";
-      hash = "sha256-sBJukNk02RmQQza1qhLAkyx1OJRck0/zQOeRaXD9tkY=";
-    })
-  ];
-
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "stone";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Og0hUUCCd9wRdHUhZBl62rDAunP2Bph5COsCw/T1kUA=";
+    hash = "sha256-W+wRVWPaAzhdHMVE54GEJC/YJqYZVJhwFDWWSMKUPdw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix
index 6a2cb56f1161..9da9317464f8 100644
--- a/pkgs/development/python-modules/stookwijzer/default.nix
+++ b/pkgs/development/python-modules/stookwijzer/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "stookwijzer";
-  version = "1.4.10";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fwestenberg";
     repo = "stookwijzer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uvmv35rdmqfr+psGQdnb3g2q72qCx4ew3gJdGeun6W8=";
+    hash = "sha256-QZyuzOAz/VAThgZdhOGeOLvC+2wtp1mgCXzIekBm/Xs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix
index f35593ecd95b..bcf10fe99a2a 100644
--- a/pkgs/development/python-modules/stravalib/default.nix
+++ b/pkgs/development/python-modules/stravalib/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "stravalib";
-  version = "2.0";
+  version = "2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "stravalib";
     repo = "stravalib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uF29fK+ZSSO688zKYYiSEygBUJZ6NBcvdgGgz3I1I6Q=";
+    hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index f104df7af0e9..b17589b562ab 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -10,7 +10,6 @@
   email-validator,
   fastapi,
   fetchFromGitHub,
-  fetchpatch,
   flask,
   freezegun,
   graphql-core,
@@ -45,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.237.3";
+  version = "0.243.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -54,18 +53,9 @@ buildPythonPackage rec {
     owner = "strawberry-graphql";
     repo = "strawberry";
     rev = "refs/tags/${version}";
-    hash = "sha256-w9ADHKpYijUtN/tB9ANN2ebTMNw8wvqMuYP9fNkisQw=";
+    hash = "sha256-m+KaUd0rl0RRZzVPI+ldwW77YGLq45egkV5vYYz4dW8=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/strawberry-graphql/strawberry/pull/2199
-      name = "switch-to-poetry-core.patch";
-      url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch";
-      hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "--emoji" "" \
@@ -161,7 +151,6 @@ buildPythonPackage rec {
     "tests/schema/extensions/"
     "tests/schema/test_dataloaders.py"
     "tests/schema/test_lazy/"
-    "tests/starlite/"
     "tests/test_dataloaders.py"
     "tests/utils/test_pretty_print.py"
     "tests/websockets/test_graphql_transport_ws.py"
diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 7fc432e3ea19..e806a6cc5895 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -13,20 +13,20 @@
 
 buildPythonPackage rec {
   pname = "stringzilla";
-  version = "3.10.5";
+  version = "3.10.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
     rev = "refs/tags/v${version}";
-    hash = "sha256-E7w6s813OGCld/GRTHMbjVAReTGb37HlB687gP9N9FA=";
+    hash = "sha256-36W7/PL8nRty8cHuMoTr73tQ4uvtjkwP9lyzNLCuhv0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-36LN9AoAWA//pldmQZtKMrck4EoGUW9G2vzdsRw08SA=";
+    hash = "sha256-qa03Jd0MMtDwkp2E81MacRMbzD/O7E29BT0tc2OjLiY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 9ba1a5c1b941..038794ea14e4 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "11.1.0";
+  version = "11.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H6xmDcwwFCaMr8lKRevqxm8adSNl9gAZ0iY+DB4Plls=";
+    hash = "sha256-TFPWHXtZYHAyS/pdchWEMUX+VGbkiXPYKKq0GtIJtc4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index f8d9015b2840..03d5e87e8e4c 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -2,6 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
   numpy,
   scipy,
   numba,
@@ -14,8 +16,8 @@
 
 buildPythonPackage rec {
   pname = "stumpy";
-  version = "1.12.0";
-  format = "setuptools";
+  version = "1.13.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -23,10 +25,15 @@ buildPythonPackage rec {
     owner = "TDAmeritrade";
     repo = "stumpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rVl3tIx8iWx2mnaix3V5YnfWWdPBTP8+K2JJKTfctDA=";
+    hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     numpy
     scipy
     numba
@@ -47,10 +54,11 @@ buildPythonPackage rec {
     "tests/test_core.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Library that can be used for a variety of time series data mining tasks";
+    changelog = "https://github.com/TDAmeritrade/stumpy/blob/${src.rev}/CHANGELOG.md";
     homepage = "https://github.com/TDAmeritrade/stumpy";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 23347af0ff45..d9eb7d949f12 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -84,10 +84,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
-    # Too many tests fail ever since a certain python-updates merge, see:
-    # https://github.com/Diaoul/subliminal/issues/1062 . Disabling tests
-    # alltogether may produce a not completly failing executable, but that
-    # executable apparently isn't able to download subtitles at all.
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix
index 1035f42bff84..1677ab112926 100644
--- a/pkgs/development/python-modules/sudachidict/default.nix
+++ b/pkgs/development/python-modules/sudachidict/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "WorksApplications";
     repo = "SudachiDict";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xJ/iPywOZA2kzHaVU43Bc8TUboj3OpDg1kLFMIc/T90=";
+    hash = "sha256-axa7eQ0jTo8GXJA5lwcvMyZLw9T573yeSo9xuvIm/gY=";
   };
 
   sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index 8c4688807d26..cc7c01702c3d 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "sunpy";
-  version = "5.1.4";
+  version = "5.1.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y+tw1I+C6wDFlJvObWrOhisrryQCeXulkwFyRCuAgTA=";
+    hash = "sha256-V8w+ErYVKoAPv6X3eh4rUZ5TKti9Z46A1JAdIjabs8k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix
index 9f9cca8b929d..093970206927 100644
--- a/pkgs/development/python-modules/svg-path/default.nix
+++ b/pkgs/development/python-modules/svg-path/default.nix
@@ -1,7 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   pillow,
   pytestCheckHook,
   pythonOlder,
@@ -9,16 +10,20 @@
 
 buildPythonPackage rec {
   pname = "svg.path";
-  version = "6.2";
-  format = "setuptools";
+  version = "6.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso=";
+  src = fetchFromGitHub {
+    owner = "regebro";
+    repo = "svg.path";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qes6cKw/Ok0WgcPO/NPuREVNUbnlhm82jF90dK7Ay8U=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     pillow
     pytestCheckHook
@@ -34,6 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "SVG path objects and parser";
     homepage = "https://github.com/regebro/svg.path";
+    changelog = "https://github.com/regebro/svg.path/blob/${version}/CHANGES.txt";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix
index 16893b3f6e64..abea3479d15b 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   cython,
   cmake,
   symengine,
@@ -14,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "symengine";
-  version = "0.11.0";
+  version = "0.13.0";
 
   build-system = [ setuptools ];
   pyproject = true;
@@ -23,23 +22,13 @@ buildPythonPackage rec {
     owner = "symengine";
     repo = "symengine.py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uUMcNnynE2itIwc7IGFwxveqLRL8f4dAAcaD6FUWJaY=";
+    hash = "sha256-PJUzA86SGCnDpqU9j/dr3PlM9inyi8SQX0HGqPQ9wQw=";
   };
 
   env = {
     SymEngine_DIR = "${symengine}";
   };
 
-  patches = [
-    # Distutils has been removed in python 3.12
-    # See https://github.com/symengine/symengine.py/pull/478
-    (fetchpatch {
-      name = "no-distutils.patch";
-      url = "https://github.com/symengine/symengine.py/pull/478/commits/e72006d5f7425cd50c54b22766e0ed4bcd2dca85.patch";
-      hash = "sha256-kGJRGkBgxOfI1wf88JwnSztkOYd1wvg62H7wA6CcYEQ=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace setup.py \
       --replace-fail "'cython>=0.29.24'" "'cython'"
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index c9978724763b..a05d13f466ee 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.12.1";
+  version = "1.13.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KHewP5mM2MCPB80N5bdnEZzT70DQn0HDDXIvZoaw+4g=";
+    hash = "sha256-sn/SxlMOCrOeJ1/JtoOJU2flHV2pG6qNPWTbJWX+xNk=";
   };
 
   nativeCheckInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/symspellpy/default.nix b/pkgs/development/python-modules/symspellpy/default.nix
index ea823e6f204b..e52fd3cc24fc 100644
--- a/pkgs/development/python-modules/symspellpy/default.nix
+++ b/pkgs/development/python-modules/symspellpy/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "symspellpy";
-  version = "6.7.7";
+  version = "6.7.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "mammothb";
     repo = "symspellpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-D8xdMCy4fSff3nuS2sD2QHWk0869AlFDE+lFRvayYDQ=";
+    hash = "sha256-ZnkZE7v4o0o6iPdkjCycDgVdLhsE3Vn1uuGT7o0F86I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index 60cf1380d560..edc31d3fada2 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "syrupy";
-  version = "4.7.1";
+  version = "4.7.2";
   pyproject = true;
 
   disabled = lib.versionOlder python.version "3.8.1";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "syrupy-project";
     repo = "syrupy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dTUugNqzaMuKV6ZwxRSf9df7tsnmZUBhgqwgGxBhirw=";
+    hash = "sha256-akYUsstepkDrRXqp1DY6wEeXMMlLNcCqitnWpjcAurg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix
index 910fd59d0683..f4c0658260f8 100644
--- a/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/pkgs/development/python-modules/tableauserverclient/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "tableauserverclient";
-  version = "0.33";
+  version = "0.34";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7yj/Ey3mIR2GZ0gtNkrrtoKEmuA5LihZlM9qPhbROQw=";
+    hash = "sha256-0I0HLPCrA5LoGOnspIDeAp5x7jzR4S9dWitpGw0AzbA=";
   };
 
   postPatch = ''
@@ -35,12 +35,12 @@ buildPythonPackage rec {
     "urllib3"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     versioneer
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     defusedxml
     requests
     packaging
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index e7f22b68f39f..7dc18cefc481 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -14,6 +14,7 @@
   packaging,
   setuptools,
   sphinx,
+  typing-extensions,
   # Test inputs
   python,
   pytest,
@@ -22,17 +23,17 @@
 
 buildPythonPackage rec {
   pname = "tables";
-  version = "3.9.2";
+  version = "3.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1HAmPC5QxLfIY1oNmawf8vnnBMJNceX6M8RSnn0K2cM=";
+    hash = "sha256-SqB6xzS5wDe66vRK7GTskCrSR/V4EbWfMMTjHTHxJs8=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     blosc2
     cython
     setuptools
@@ -47,12 +48,13 @@ buildPythonPackage rec {
     lzo
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     blosc2
     py-cpuinfo
     numpy
     numexpr
     packaging # uses packaging.version at runtime
+    typing-extensions
   ];
 
   # When doing `make distclean`, ignore docs
@@ -83,6 +85,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytest ];
 
   preCheck = ''
+    export HOME=$(mktemp -d)
     cd ..
   '';
 
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 5e601845b4cc..40de44127087 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "tatsu";
-  version = "5.12.1";
+  version = "5.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "neogeny";
     repo = "TatSu";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dY+hvNwYrkKko9A5yRT0EWYlvVu3OrhJMzk/8cjzuUo=";
+    hash = "sha256-FRNQz3JtsFw1nch+ffGMzZF1+gq7XifPok9qsUiRPs8=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix
index 92a389512cad..6fd45eef85eb 100644
--- a/pkgs/development/python-modules/taxi/default.nix
+++ b/pkgs/development/python-modules/taxi/default.nix
@@ -3,30 +3,29 @@
   buildPythonPackage,
   fetchFromGitHub,
   appdirs,
-  requests,
   click,
-  setuptools,
+  flit-core,
   pytestCheckHook,
   freezegun,
 }:
 
 buildPythonPackage rec {
   pname = "taxi";
-  version = "6.2.0";
-  format = "setuptools";
+  version = "6.3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sephii";
     repo = "taxi";
     rev = version;
-    hash = "sha256-wtLlO/W+39kTPjb2U6c54bxWxAQB7CxGxBh8gur+RCQ=";
+    hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ flit-core ];
+
+  dependencies = [
     appdirs
-    requests
     click
-    setuptools
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix
deleted file mode 100644
index c706a7b7dad7..000000000000
--- a/pkgs/development/python-modules/telegram/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "telegram";
-  version = "0.0.1";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl";
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/liluo/telegram";
-    description = "Telegram APIs";
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
index b349c470f8fe..ab0a973a86e1 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -5,6 +5,7 @@
   openssl,
   rsa,
   pyaes,
+  cryptg,
   pythonOlder,
   setuptools,
   pytest-asyncio,
@@ -13,40 +14,51 @@
 
 buildPythonPackage rec {
   pname = "telethon";
-  version = "1.26.1";
-  format = "pyproject";
+  version = "1.37.0";
+  pyproject = true;
+
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "LonamiWebs";
     repo = "Telethon";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RxnC+PVSnLeCZ1xap6n6CjpeA8Ig6oLGiB0LDxqUmsA=";
+    hash = "sha256-P7FP+Wqi3dqbBCFpI9aCDvK4k3mWv8076RO6MXg+jFQ=";
   };
 
   patchPhase = ''
-    substituteInPlace telethon/crypto/libssl.py --replace \
+    substituteInPlace telethon/crypto/libssl.py --replace-fail \
       "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'"
   '';
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    rsa
-    pyaes
+  build-system = [
+    setuptools
   ];
 
+  dependencies = [
+    pyaes
+    rsa
+  ];
+
+  optional-dependencies = {
+    cryptg = [ cryptg ];
+  };
+
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [ "tests/telethon" ];
+  disabledTests = [
+    # https://github.com/LonamiWebs/Telethon/issues/4254
+    "test_all_methods_present"
+    "test_private_get_extension"
+  ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/LonamiWebs/Telethon";
     description = "Full-featured Telegram client library for Python 3";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nyanloutre ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nyanloutre ];
   };
 }
diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix
index 83d9ccfb885c..f00ce991ea3e 100644
--- a/pkgs/development/python-modules/templateflow/default.nix
+++ b/pkgs/development/python-modules/templateflow/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "templateflow";
-  version = "24.1.0";
+  version = "24.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "templateflow";
     repo = "python-client";
     rev = "refs/tags/${version}";
-    hash = "sha256-UxYJnKOqIIf10UW5xJ7MrFHtZY5WNVi5oZgdozj65Z8=";
+    hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
new file mode 100644
index 000000000000..3f85d86e7f7e
--- /dev/null
+++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  celery,
+}:
+
+buildPythonPackage rec {
+  pname = "tenant-schemas-celery";
+  version = "3.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "maciej-gol";
+    repo = "tenant-schemas-celery";
+    rev = "refs/tags/${version}";
+    hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ celery ];
+
+  pythonImportsCheck = [ "tenant_schemas_celery" ];
+
+  meta = {
+    description = "Celery application implementation that allows celery tasks to cooperate with multi-tenancy provided by django-tenant-schemas and django-tenants packages";
+    homepage = "https://github.com/maciej-gol/tenant-schemas-celery";
+    changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index a168fba1abdb..50735de6ffdf 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1257";
+  version = "3.0.1262";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-HjOU8gn1T6TXnAd0fM8dgc3tz8hUgyHzsQjgISYD1qE=";
+    hash = "sha256-4OySojZI2efUkeZAmUxOPQ/yEnOd7PA6cuOJPNv4bNU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index 2c09edbf60a4..918df0bb1c91 100644
--- a/pkgs/development/python-modules/tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "tensorboard";
-  version = "2.17.0";
+  version = "2.18.0";
   format = "wheel";
   disabled = pythonOlder "3.9";
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     inherit pname version format;
     dist = "py3";
     python = "py3";
-    hash = "sha256-hZpJmpsftooFiFiWRIZicQC3H8shZGhhxh0xhGpkePs=";
+    hash = "sha256-EHykghdF9z4q76AsUP9wqbaU8595CxHm9oL30yZ0Xqs=";
   };
 
 
diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 15a8115c2036..fb0f9d589b39 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -49,14 +49,14 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-datasets";
-  version = "4.9.4";
+  version = "4.9.6";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "datasets";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HY/atBEWeEJgBNxEapq9jPFoZbFof2AHEDAiJa/lYAE=";
+    hash = "sha256-2zR1b/Zkj3hcwiVK7wdxix3taNgFFOxqy7fSge6dAIk=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
index 14a1d00dc450..88f1bbe52a89 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/default.nix
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-metadata";
-  version = "1.14.0";
+  version = "1.15.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "metadata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZfX25CaV+tZVdas+n7O6Gqv1GxOP1iwippIXxfhcOfg=";
+    hash = "sha256-f3bkDTy45uwqVJaXFb0Dmaj9U1lJTP5R5Ej1yzobEV4=";
   };
 
   patches = [ ./build.patch ];
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index c187737eeead..7a5127582a64 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -154,7 +154,7 @@ buildPythonPackage {
       ];
 
       libpaths = [
-        stdenv.cc.cc.lib
+        (lib.getLib stdenv.cc.cc)
         zlib
       ];
 
diff --git a/pkgs/development/python-modules/term-image/default.nix b/pkgs/development/python-modules/term-image/default.nix
new file mode 100644
index 000000000000..a0a194b47a3c
--- /dev/null
+++ b/pkgs/development/python-modules/term-image/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+  pillow,
+  requests,
+  urwid,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "term-image";
+  version = "0.7.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AnonymouX47";
+    repo = "term-image";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-uA04KHKLXW0lx1y5brpCDARLac4/C8VmVinVMkEtTdM=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    requests
+    pillow
+  ];
+
+  optional-dependencies = {
+    urwid = [ urwid ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ optional-dependencies.urwid;
+
+  disabledTestPaths = [
+    # test_url needs online access
+    "tests/test_image/test_url.py"
+  ];
+
+  pythonImportsCheck = [ "term_image" ];
+
+  meta = {
+    description = "Display images in the terminal with python";
+    homepage = "https://github.com/AnonymouX47/term-image";
+    changelog = "https://github.com/AnonymouX47/term-image/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ liff ];
+  };
+}
diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix
index 8677ae389af6..b5ce22702ae0 100644
--- a/pkgs/development/python-modules/tesla-powerwall/default.nix
+++ b/pkgs/development/python-modules/tesla-powerwall/default.nix
@@ -38,6 +38,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # yarl compat issue https://github.com/jrester/tesla_powerwall/issues/68
+    "test_parse_endpoint"
+  ];
+
   pytestFlagsArray = [ "tests/unit" ];
 
   pythonImportsCheck = [ "tesla_powerwall" ];
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 2c293c5d7bd4..870e88e426fd 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "3.12.1";
+  version = "3.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "zabuldon";
     repo = "teslajsonpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kUuvzjQBHWy3Si/Ha9M01ijv4QyQwK/g5gyhd7/lIdA=";
+    hash = "sha256-chUW7aa99KzYyn8qVDX4GK8eI8MoP8+TKRx9PI+0ZKE=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix
new file mode 100644
index 000000000000..1154f0380442
--- /dev/null
+++ b/pkgs/development/python-modules/teslemetry-stream/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+}:
+
+buildPythonPackage rec {
+  pname = "teslemetry-stream";
+  version = "0.4.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Teslemetry";
+    repo = "python-teslemetry-stream";
+    rev = "v${version}";
+    hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [ "teslemetry_stream" ];
+
+  meta = {
+    changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v${version}";
+    description = "Python library for the Teslemetry Streaming API";
+    homepage = "https://github.com/Teslemetry/python-teslemetry-stream";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix
new file mode 100644
index 000000000000..127c6f453a92
--- /dev/null
+++ b/pkgs/development/python-modules/textstat/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pyphen,
+  pytestCheckHook,
+  pytest,
+}:
+buildPythonPackage rec {
+  version = "0.7.4";
+  pname = "textstat";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "textstat";
+    repo = "textstat";
+    rev = version;
+    hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest
+  ];
+
+  dependencies = [
+    setuptools
+    pyphen
+  ];
+
+  pythonImportsCheck = [
+    "textstat"
+  ];
+
+  pytestFlagsArray = [
+    "test.py"
+  ];
+
+  meta = {
+    description = "Python package to calculate readability statistics of a text object";
+    homepage = "https://textstat.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix
index 0b269d0ff3d7..657eac221a47 100644
--- a/pkgs/development/python-modules/thinqconnect/default.nix
+++ b/pkgs/development/python-modules/thinqconnect/default.nix
@@ -10,8 +10,8 @@
 }:
 
 buildPythonPackage rec {
-  pname = "pythinqconnect";
-  version = "0.9.7-unstable-2024-09-09";
+  pname = "thinqconnect";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,9 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thinq-connect";
     repo = "pythinqconnect";
-    # https://github.com/thinq-connect/pythinqconnect/issues/1
-    rev = "39d535a2a5d1067a110eea37ae92002d0793b7e9";
-    hash = "sha256-+nQAUqg5rB2eJgPBJJR8NsQ1O2Wb4UsbBQVPir1jyAU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-8TDpoV2FNWzcHwXaEDyt5mRCbmFdtfuIYJK7OqXAgvg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix
index 14ae9cca78ce..ae97c9a34732 100644
--- a/pkgs/development/python-modules/threadpoolctl/default.nix
+++ b/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "threadpoolctl";
-  version = "3.4.0";
+  version = "3.5.0";
 
   disabled = pythonOlder "3.6";
   format = "pyproject";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "joblib";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-nWaBhiFw76azx6dV4I18XodiUnHiLb0gNNhXks6iHIg=";
+    hash = "sha256-XFgiCfcHwzjsjPDKask1X4JHTx1xeHfIFeSJWtbgJmU=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix
index 4052080fc351..e3301d3ab4cc 100644
--- a/pkgs/development/python-modules/thrift/default.nix
+++ b/pkgs/development/python-modules/thrift/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "thrift";
-  version = "0.20.0";
+  version = "0.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TdZi6t9riuvopBcpUnvWmt9s6qKoaBy+9k0Sc7Po/ro=";
+    hash = "sha256-Xm98UPk26/oj6SQimvyV6yGfjI5agyAt1KORJEgD5AI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index a9cfbc082c90..e76ff173317c 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "tiledb";
-  version = "0.26.2";
+  version = "0.32.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB-Py";
     rev = "refs/tags/${version}";
-    hash = "sha256-8c1l4zoD44SjaOUXlFUSho/y7oMNOEVM9ZlnRs1irV8=";
+    hash = "sha256-9UgT09KnCqQ7ip7sSp64Yy8Pstf1GCOVYOG0WM2P840=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix
index 17d3827f4853..c519c457df47 100644
--- a/pkgs/development/python-modules/time-machine/default.nix
+++ b/pkgs/development/python-modules/time-machine/default.nix
@@ -5,30 +5,29 @@
   pythonAtLeast,
   pythonOlder,
   setuptools,
-  backports-zoneinfo,
   python-dateutil,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "time-machine";
-  version = "2.14.2";
+  version = "2.15.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "adamchainz";
-    repo = pname;
-    rev = version;
-    hash = "sha256-u5RxNv+hsL+0yxtiWeYHtmMQY7bvb8WY7ipouj+IZJ8=";
+    repo = "time-machine";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0WYmkrMMeCkBYxy2qGovdxftzrYW9x/3tdeBcYC47Z0=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     python-dateutil
-  ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -45,9 +44,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "time_machine" ];
 
   meta = with lib; {
-    changelog = "https://github.com/adamchainz/time-machine/blob/${src.rev}/CHANGELOG.rst";
     description = "Travel through time in your tests";
     homepage = "https://github.com/adamchainz/time-machine";
+    changelog = "https://github.com/adamchainz/time-machine/blob/${src.rev}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index e161c5495f59..3d58e0c755b3 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2024071000";
+  version = "2024092600";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     rev = "refs/tags/${version}";
-    hash = "sha256-xt2IdF7V8NUW9nUg8x7XbMHLWir6CHAQcRIiH6ejV5M=";
+    hash = "sha256-ybqC0FUrTyTO2UfS/bCAUdzKtcK06wTeLv1Mv/R8RS0=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock
deleted file mode 100644
index 476c2cabfae1..000000000000
--- a/pkgs/development/python-modules/tokenizers/Cargo.lock
+++ /dev/null
@@ -1,1153 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cc"
-version = "1.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
-dependencies = [
- "derive_builder_core",
- "syn",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "env_filter"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "esaxx-rs"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.159"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "macro_rules_attribute"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13"
-dependencies = [
- "macro_rules_attribute-proc_macro",
- "paste",
-]
-
-[[package]]
-name = "macro_rules_attribute-proc_macro"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568"
-
-[[package]]
-name = "matrixmultiply"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "monostate"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e"
-dependencies = [
- "monostate-impl",
- "serde",
-]
-
-[[package]]
-name = "monostate-impl"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ndarray"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
-dependencies = [
- "matrixmultiply",
- "num-complex",
- "num-integer",
- "num-traits",
- "rawpointer",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "numpy"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec170733ca37175f5d75a5bea5911d6ff45d2cd52849ce98b685394e4f2f37f4"
-dependencies = [
- "libc",
- "ndarray",
- "num-complex",
- "num-integer",
- "num-traits",
- "pyo3",
- "rustc-hash",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "onig"
-version = "6.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "once_cell",
- "onig_sys",
-]
-
-[[package]]
-name = "onig_sys"
-version = "69.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
-
-[[package]]
-name = "portable-atomic"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "pyo3"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "parking_lot",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
-dependencies = [
- "heck",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-cond"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9"
-dependencies = [
- "either",
- "itertools 0.11.0",
- "rayon",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustix"
-version = "0.38.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "serde"
-version = "1.0.210"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.210"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.128"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "spm_precompiled"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326"
-dependencies = [
- "base64",
- "nom",
- "serde",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "syn"
-version = "2.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
-name = "tempfile"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokenizers"
-version = "0.20.0-dev.0"
-dependencies = [
- "aho-corasick",
- "derive_builder",
- "esaxx-rs",
- "getrandom",
- "indicatif",
- "itertools 0.12.1",
- "lazy_static",
- "log",
- "macro_rules_attribute",
- "monostate",
- "onig",
- "paste",
- "rand",
- "rayon",
- "rayon-cond",
- "regex",
- "regex-syntax",
- "serde",
- "serde_json",
- "spm_precompiled",
- "thiserror",
- "unicode-normalization-alignments",
- "unicode-segmentation",
- "unicode_categories",
-]
-
-[[package]]
-name = "tokenizers-python"
-version = "0.20.0-dev.0"
-dependencies = [
- "env_logger",
- "itertools 0.12.1",
- "libc",
- "ndarray",
- "numpy",
- "pyo3",
- "rayon",
- "serde",
- "serde_json",
- "tempfile",
- "tokenizers",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unicode-normalization-alignments"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "unindent"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-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.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index ce8e034b8ce0..0a357801915c 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -74,17 +74,25 @@ let
 in
 buildPythonPackage rec {
   pname = "tokenizers";
-  version = "0.20.1";
+  version = "0.20.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "tokenizers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QTe1QdmJHSoosNG9cCJS7uQNdoMwgL+CJHQQUX5VtSY=";
+    hash = "sha256-NPH++kPPaSPR3jm6mfh+4aep6stj0I4bA24kFtaJSKU=";
   };
 
-  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    hash = "sha256-S2AfsKBtitEfprp9vjTyCl772IBe/wqwqYVnnAEK3LE=";
+  };
 
   sourceRoot = "${src.name}/bindings/python";
   maturinBuildFlags = [ "--interpreter ${python.executable}" ];
diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 85f9ed273b7d..8c47693a5829 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -13,15 +13,15 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.12.5";
-  format = "pyproject";
+  version = "0.13.2";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
+    hash = "sha256-//X+WahylbJ4q9Mb7JLBXZvEoGiFqxK86lLHERk5Lnk=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pyyaml
diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix
index 005c9f375455..766baff5d3cc 100644
--- a/pkgs/development/python-modules/torch-tb-profiler/default.nix
+++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix
@@ -1,32 +1,34 @@
 {
+  lib,
   buildPythonPackage,
   fetchFromGitHub,
-  lib,
   pandas,
   pytestCheckHook,
-  torch,
+  setuptools,
   tensorboard,
+  torch,
   torchvision,
 }:
-
 let
-  version = "0.3.1";
+  version = "0.4.0";
   repo = fetchFromGitHub {
     owner = "pytorch";
     repo = "kineto";
-    rev = "v${version}";
-    hash = "sha256-Yg001XzOPDmz9wEP2b7Ggz/uU6x5PFzaaBeUBwWKFS0=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nAtqGCv8q3Tati3NOGWWLb+gXdvO3qmECeC1WG2Mt3M=";
   };
 in
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "torch_tb_profiler";
   inherit version;
-  format = "setuptools";
+  pyproject = true;
 
   # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830.
   src = "${repo}/tb_plugin";
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     pandas
     tensorboard
   ];
@@ -43,14 +45,18 @@ buildPythonPackage rec {
     "test_tensorboard_end2end"
     "test_tensorboard_with_path_prefix"
     "test_tensorboard_with_symlinks"
+    "test_autograd_api"
+    "test_profiler_api_with_record_shapes_memory_stack"
+    "test_profiler_api_without_record_shapes_memory_stack"
+    "test_profiler_api_without_step"
   ];
 
   pythonImportsCheck = [ "torch_tb_profiler" ];
 
-  meta = with lib; {
+  meta = {
     description = "PyTorch Profiler TensorBoard Plugin";
     homepage = "https://github.com/pytorch/kineto";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ samuela ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ samuela ];
   };
 }
diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index e5231fb746e7..15daafba6f71 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -35,7 +35,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.5.0";
+  version = "2.5.1";
 in
 buildPythonPackage {
   inherit version;
diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix
index 17416b27170a..cd936d54ad72 100644
--- a/pkgs/development/python-modules/torch/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/binary-hashes.nix
@@ -7,66 +7,66 @@
 
 version:
 builtins.getAttr version {
-  "2.5.0" = {
+  "2.5.1" = {
     x86_64-linux-39 = {
-      name = "torch-2.5.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-Z3RdahkVnJ436sN6HAicTZ9ZTNcsIV2mFN9A/OEw3Sc=";
+      name = "torch-2.5.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-1oG4vj/cLNQREjENs8OQT3xqCaeuKNBCrgrzrwHI/No=";
     };
     x86_64-linux-310 = {
-      name = "torch-2.5.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-uLcj9Hqgb9/rGnqsXf+PpZlL+qT9PK0GAbvw1bHBUEk=";
+      name = "torch-2.5.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-nd4w85nKIhN0Vcyk1HFA37f0F24tFqlyn8BE7r+tsTo=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.5.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl";
-      hash = "sha256-Xj9Ke6gSUXwsFlmFe1GV8oeiiPvQUKWr+TEeA9vhoos=";
+      name = "torch-2.5.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp311-cp311-linux_x86_64.whl";
+      hash = "sha256-aylm7emv/i/WngdlaRynI+yHDgw0x3YfTVuOMYOD/a8=";
     };
     x86_64-linux-312 = {
-      name = "torch-2.5.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl";
-      hash = "sha256-EcKB2WiMNu3tBq6PYNa5fgEIMe+upKSyJErUNn4jLtc=";
+      name = "torch-2.5.1-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp312-cp312-linux_x86_64.whl";
+      hash = "sha256-v2SEv+W8T5KkoaG/VTBBUF4ZqRH3FwZTMOsGGv4OFNc=";
     };
     aarch64-darwin-39 = {
-      name = "torch-2.5.0-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-7YScLRFY+FkflMFEeO4cPeq8H0OKAD1VwFdGJMAWJ/E=";
+      name = "torch-2.5.1-cp39-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp39-none-macosx_11_0_arm64.whl";
+      hash = "sha256-gEZ2i39tNbhdEBtLOMuoqi881RlSvEwGpJWA8s5oIpE=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.5.0-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-uK9pC351HUG9Je8uqkauNUqngTgOHk006wMb+oP0tRI=";
+      name = "torch-2.5.1-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp310-none-macosx_11_0_arm64.whl";
+      hash = "sha256-I9Biv3B3aj0E2+dNuVDbKlJF4bpPJyCKh/DXQ7DQboY=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.5.0-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-2nchfs0y5UxiSXmVR+7aEF67qow8dFtZGlMg4rwkNYU=";
+      name = "torch-2.5.1-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp311-none-macosx_11_0_arm64.whl";
+      hash = "sha256-MfjDlmCWL5rk7uyZXjBJtUkutzYN1PBzd2WO9Nco+kw=";
     };
     aarch64-darwin-312 = {
-      name = "torch-2.5.0-cp312-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-none-macosx_11_0_arm64.whl";
-      hash = "sha256-w6vjoAPA1XgGUi9z1euXdmg2onTYCcnKPrPnXSSIvz4=";
+      name = "torch-2.5.1-cp312-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp312-none-macosx_11_0_arm64.whl";
+      hash = "sha256-jHEt9hEBlk6xGRCoRlFAEfC29ZIMVdv1Z7/4o0Fj1bE=";
     };
     aarch64-linux-39 = {
-      name = "torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      hash = "sha256-5CMassS3SgvmnicQ4/kRAs55yuCeb7saYe9yRsUHA+Q=";
+      name = "torch-2.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      hash = "sha256-x09z2hefp+qiFnqwtJPyZ65IGmwAckniZ0y9C69KXME=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      hash = "sha256-UPz/n1ucUQL5+PXLPRK9TZ8SZmUOS4wU9QpexYnh7qU=";
+      name = "torch-2.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      hash = "sha256-JpsQw0Qwqo6WQ9vgNdxSXEqbHWcc09vI7Lyu0oCuMi0=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      hash = "sha256-IFoOy/hfTHhXz99Paw4HMWvZKe2SSCVp6PRSRABVmIQ=";
+      name = "torch-2.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      hash = "sha256-1bMgPxkbxAeDyZSI0ud23Pk6xDGllJHWJ6HKWzriCyI=";
     };
     aarch64-linux-312 = {
-      name = "torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
-      hash = "sha256-V+B/GKTe9Sz+UETKqGG8PeRJcXn67iNvO5V7Qn/80OQ=";
+      name = "torch-2.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+      hash = "sha256-NtG+mSgbb2Atljm9CvPuAAbnqrFvZxjYb3CdOVtvJiw=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index cd43c04d67d4..578976fbb189 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -35,7 +35,7 @@
   removeReferencesTo,
 
   # Build inputs
-  darwin,
+  apple-sdk_13,
   numactl,
 
   # dependencies
@@ -223,7 +223,7 @@ in
 buildPythonPackage rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
-  version = "2.5.0";
+  version = "2.5.1";
   pyproject = true;
 
   outputs = [
@@ -239,7 +239,7 @@ buildPythonPackage rec {
     repo = "pytorch";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    hash = "sha256-z41VAN4l/6hyHsxNOnJORy5EQK93kSMkDHRVQrdxv7k=";
+    hash = "sha256-17lgAcqJN+vir+Zvffy5cXRmNjd5Y80ev8b8pOj9F+g=";
   };
 
   patches =
@@ -364,6 +364,9 @@ buildPythonPackage rec {
   # NB technical debt: building without NNPACK as workaround for missing `six`
   USE_NNPACK = 0;
 
+  # Explicitly enable MPS for Darwin
+  USE_MPS = setBool stdenv.hostPlatform.isDarwin;
+
   cmakeFlags =
     [
       # (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true)
@@ -519,9 +522,7 @@ buildPythonPackage rec {
     ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Accelerate
-      darwin.apple_sdk.frameworks.CoreServices
-      darwin.libobjc
+      apple-sdk_13
     ]
     ++ lib.optionals tritonSupport [ _tritonEffective ]
     ++ lib.optionals MPISupport [ mpi ]
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index f03dd8e46043..297be21cf59d 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.5.0";
+  version = "2.5.1";
   format = "wheel";
 
   src =
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index ec859738d3ed..7ae70136b171 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,66 +7,66 @@
 
 version:
 builtins.getAttr version {
-  "2.5.0" = {
+  "2.5.1" = {
     x86_64-linux-39 = {
-      name = "torchaudio-2.5.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-EPFw0hJ5l68BebIfOHjJiR54Sx5VtWNsHRnfq1tSYlU=";
+      name = "torchaudio-2.5.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-rHPCnEhWhGO+vGC0srILAdLt3bH1E15mFT8a+F458/0=";
     };
     x86_64-linux-310 = {
-      name = "torchaudio-2.5.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-PV0jpAEMHbJGhC+ahhHNK4teEQ1dR3jME9pZfvfDqV8=";
+      name = "torchaudio-2.5.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-CXWT7fMvCoRQq6eCK4CX0vJHb+lsCrmTMdEsNHADGAs=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.5.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl";
-      hash = "sha256-Y+Qe6UgenV9ViG2tBHPsTuIhKl5Ruc1lU/2dWKYvZ+E=";
+      name = "torchaudio-2.5.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp311-cp311-linux_x86_64.whl";
+      hash = "sha256-6Yk43MROuquL2DeVRXhM/d/COuF3hziUSLf/mRjcPfk=";
     };
     x86_64-linux-312 = {
-      name = "torchaudio-2.5.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl";
-      hash = "sha256-qSgxhlE7+HATg8a8w+1tYk2kK7/WLzHHJrmulH9R7zc=";
+      name = "torchaudio-2.5.1-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp312-cp312-linux_x86_64.whl";
+      hash = "sha256-mQJZjgMwrurQvBVFg3gE6yaFSbm0zkGuPKUbI4SQTok=";
     };
     aarch64-darwin-39 = {
-      name = "torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-hVc/ZtwJSX0oK79Abo8rA+WSnrO9wfdqnZvEZkTUB7E=";
+      name = "torchaudio-2.5.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-pAoOSyOFZKGb8TjGTVk8e1LZfIc3hD2F1soJIWJBrmY=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-q2m9/rRDQVnhaKSiwWGNHWWloUqR0X0hJW6pYPM0Bf0=";
+      name = "torchaudio-2.5.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-kBKR13Cu6x9Rkgu1qnP/gum38mNUo8e5DYD/C06aUEQ=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-mC7ASUonx/Pn5oyRzJLm4a1vhv7e7sYnCWBRMJYysUk=";
+      name = "torchaudio-2.5.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-cAU1Sqfdqe+QjhPCVm7h/gvW1/W64Fg7XlMBbNIp/DQ=";
     };
     aarch64-darwin-312 = {
-      name = "torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-yDXadxcBsG++jhnOZD1eWH/TheX02PFAVRzgSQCxuWs=";
+      name = "torchaudio-2.5.1-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-8cv9/Ru9++conUenTzb/bF2HwyBWBiAv71p/tpP2HPA=";
     };
     aarch64-linux-39 = {
-      name = "torchaudio-2.5.0-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-linux_aarch64.whl";
-      hash = "sha256-qr+MTOkZwuJKzklkHqQpNgAYgWNxo9RwQn/AKrERVsU=";
+      name = "torchaudio-2.5.1-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp39-cp39-linux_aarch64.whl";
+      hash = "sha256-0pNJlElV6wYed0/k2e6kaBxbyf9C6jmod/jxTeHk7QA=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.5.0-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-linux_aarch64.whl";
-      hash = "sha256-nf7tzvPkMBDz7C2ATI9i/kmrCe8cGeZzYyWTlmGik70=";
+      name = "torchaudio-2.5.1-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp310-cp310-linux_aarch64.whl";
+      hash = "sha256-mzhyxd1QgL5jIpCNYjZVgaHdklDj3W1HurP1sIVKXR8=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.5.0-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-linux_aarch64.whl";
-      hash = "sha256-w1IB79KCRBUtbtvekndcEPOfWl2TRiAvB7FVTceNJaI=";
+      name = "torchaudio-2.5.1-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp311-cp311-linux_aarch64.whl";
+      hash = "sha256-S6JHaacr1oaQP+rxBAyJXXEK8v+80l7nqXlO4oVWGyY=";
     };
     aarch64-linux-312 = {
-      name = "torchaudio-2.5.0-cp312-cp312-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-linux_aarch64.whl";
-      hash = "sha256-WTJY8z3h+hbr5XGMlxfa82lUYNSKAYgZSlxXSnEIOMs=";
+      name = "torchaudio-2.5.1-cp312-cp312-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp312-cp312-linux_aarch64.whl";
+      hash = "sha256-a7ZUFkBfQOALIHASV8FudJO/3XGI4C6HzFs4nDHBDCw=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index 4b11fe0dc6c1..ea07d68df4b7 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -76,14 +76,14 @@ let
 in
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.5.0";
+  version = "2.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "audio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Swh+HnkGRzjQFt9mYO+qBq4BDTbmLGSkOrN2ZUQdNUI=";
+    hash = "sha256-BRn4EZ7bIujGA6b/tdMu9yDqJNEaf/f1Kj45aLHC/JI=";
   };
 
   patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ];
diff --git a/pkgs/development/python-modules/torchprofile/default.nix b/pkgs/development/python-modules/torchprofile/default.nix
new file mode 100644
index 000000000000..a040283e9b14
--- /dev/null
+++ b/pkgs/development/python-modules/torchprofile/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  torch,
+  torchvision,
+}:
+
+buildPythonPackage rec {
+  pname = "torchprofile";
+  version = "0.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "zhijian-liu";
+    repo = "torchprofile";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-6vxZHQwBjKpy288wcANdJ9gmvIOZloLv+iN76TtqYAI=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "torchvision"
+  ];
+
+  dependencies = [
+    numpy
+    torch
+    torchvision
+  ];
+
+  pythonImportsCheck = [
+    "torchprofile"
+  ];
+
+  meta = {
+    changelog = "https://github.com/zhijian-liu/torchprofile/releases/tag/v${version}";
+    description = "General and accurate MACs / FLOPs profiler for PyTorch models";
+    homepage = "https://github.com/zhijian-liu/torchprofile";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index e2f0ea2bed6d..68b48711de37 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -23,7 +23,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.20.0";
+  version = "0.20.1";
 in
 buildPythonPackage {
   inherit version;
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 1ca7c229c683..ae7b3b798517 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -7,66 +7,66 @@
 
 version:
 builtins.getAttr version {
-  "0.20.0" = {
+  "0.20.1" = {
     x86_64-linux-39 = {
-      name = "torchvision-0.20.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-UP9Puz3JlN21FK7WvZLJDMF1sWjGWYg4014qxTqaCos=";
+      name = "torchvision-0.20.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-C/Tizgi8dJVzTcVAlTxlmQ5C67fJ7Sfi/3lRVLrvXMA=";
     };
     x86_64-linux-310 = {
-      name = "torchvision-0.20.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-k5Ni8WH31mqPKrExODqzeZhFjjCO4sYsnRzSdR37KEI=";
+      name = "torchvision-0.20.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-OgVeTpBAsSmHjVfDnbVfEX+XWJn/MN1wyPJiHZEXDb4=";
     };
     x86_64-linux-311 = {
-      name = "torchvision-0.20.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp311-cp311-linux_x86_64.whl";
-      hash = "sha256-O0R4ODFuAqqSFSklZbp5wT0//rBjGgkAxby4uB7iJtc=";
+      name = "torchvision-0.20.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp311-cp311-linux_x86_64.whl";
+      hash = "sha256-pffrXvIvNKfRj8vCe2wB993lzVMN8xHNvdMRafkcvZg=";
     };
     x86_64-linux-312 = {
-      name = "torchvision-0.20.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp312-cp312-linux_x86_64.whl";
-      hash = "sha256-hGajClfLUfO0GtC+QKxc8/GijZMnMKHEEWyD0yHQfjw=";
+      name = "torchvision-0.20.1-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp312-cp312-linux_x86_64.whl";
+      hash = "sha256-0QU+xQVFSefawmE7FRv/4yPzySSTnSlt9NfTSSWq860=";
     };
     aarch64-darwin-39 = {
-      name = "torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-anDIHqUGjdex40Dr6rtlNkV22LmBlFTP34EikM8D5Fo=";
+      name = "torchvision-0.20.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-LNWEBpeLgTGIz06RNbIYd1tX4LuG1KiPAzmHS4oiSBk=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-8WTVRZZRhv/WYBTjSpZnBtEshBmDAt1GdIyuRZhGCaQ=";
+      name = "torchvision-0.20.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-SHj++5bvKT0GwnIQkYrcg8OZ2fqvNM2lpj4Sn3cjKPE=";
     };
     aarch64-darwin-311 = {
-      name = "torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-oV3mJmo2vNENifbz17pOLdVnp6Ct1hbrxuZa6iB5Dl0=";
+      name = "torchvision-0.20.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-NEsznhXmu7We4HAHcmFtCv79IJkgx2KxYENo2MNFgyI=";
     };
     aarch64-darwin-312 = {
-      name = "torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-rA7bpTT7BxsrA6L9XLv5t8JZiW0XodDYMLPFt9+uB4I=";
+      name = "torchvision-0.20.1-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-GjElb/lF1k8Aa7MGgTp8laUx/ha/slNcg33UwQRTPXo=";
     };
     aarch64-linux-39 = {
-      name = "torchvision-0.20.0-cp39-cp39-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-linux_aarch64.whl";
-      hash = "sha256-jWzqirC/cuy3GwfND+g26s9aX6mPZinSJhIS6Ql3uWM=";
+      name = "torchvision-0.20.1-cp39-cp39-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp39-cp39-linux_aarch64.whl";
+      hash = "sha256-q8uABd6Nw5Pb0TEOy2adxoq2ZLkQevbWmKY0HR0/LDw=";
     };
     aarch64-linux-310 = {
-      name = "torchvision-0.20.0-cp310-cp310-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-linux_aarch64.whl";
-      hash = "sha256-4IT1Dsvb56nML8UeoDZ641/eRuhKlkv0BGyxx/634+Y=";
+      name = "torchvision-0.20.1-cp310-cp310-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp310-cp310-linux_aarch64.whl";
+      hash = "sha256-dfik1RpZPEurbJv311vdiGkbAKU7B2VmeLxVo6dT3XM=";
     };
     aarch64-linux-311 = {
-      name = "torchvision-0.20.0-cp311-cp311-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-linux_aarch64.whl";
-      hash = "sha256-Vdf0PvkS68TaS7pzoLvzh9OKa+nNUhZ5wPQFb5Vktpg=";
+      name = "torchvision-0.20.1-cp311-cp311-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp311-cp311-linux_aarch64.whl";
+      hash = "sha256-pA12Y0WSdjnaMixpOTTl+RsboiGIRscQS4aN6iMUzo4=";
     };
     aarch64-linux-312 = {
-      name = "torchvision-0.20.0-cp312-cp312-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-linux_aarch64.whl";
-      hash = "sha256-+NAhNIms+xODafJFWmiTiAwZSoGV44HBn4crJ38mVMM=";
+      name = "torchvision-0.20.1-cp312-cp312-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp312-cp312-linux_aarch64.whl";
+      hash = "sha256-n4U7pEl6xGkYFa1BtSPuI89bpPh7HOhp1wQFLiM8qLc=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 06aa3932f5a7..7ec3e7858b56 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -26,7 +26,7 @@ let
   inherit (cudaPackages) backendStdenv;
 
   pname = "torchvision";
-  version = "0.20.0";
+  version = "0.20.1";
 in
 buildPythonPackage {
   inherit pname version;
@@ -35,7 +35,7 @@ buildPythonPackage {
     owner = "pytorch";
     repo = "vision";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aQ1HhWtkhA2EYPCV2vEW10kcP0m0TLNsgjA0Yiwpm9U=";
+    hash = "sha256-BXvi4LoO2LZtNSE8lvFzcN4H2nN2fRg5/s7KRci7rMM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 4c358cce9012..0d9997af8b3b 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "4.15.1";
+  version = "4.18.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "tox";
     rev = "refs/tags/${version}";
-    hash = "sha256-BLOxyvcC3ngQDVSMaw/NfLVbFkIHbTmhUOOVBqlcK/Q=";
+    hash = "sha256-p3pghGQwCBIvkFI6pYuzoGSwAwfaz4vKpteh8nhXOhE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index cf5f7f344012..fe5a361f9d8b 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -23,23 +23,20 @@ let
 in
 buildPythonPackage rec {
   pname = "tpm2-pytss";
-  version = "2.2.1";
+  version = "2.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uPFUc0IvN39ZxyF9zRR5FlzOYt+jOTTsl2oni68unv4=";
+    hash = "sha256-IAcRKTeWVvXzw7wW02RhJnKxR9gRkftOufn/n77khBA=";
   };
 
   patches =
     [
       # Fix hardcoded `fapi-config.json` configuration path
       ./fapi-config.patch
-      # Backport for https://github.com/tpm2-software/tpm2-pytss/pull/576
-      # This is likely to be dropped with the next major release (>= 2.3)
-      ./pr576-backport.patch
     ]
     ++ lib.optionals isCross [
       # pytss will regenerate files from headers of tpm2-tss.
diff --git a/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch b/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch
deleted file mode 100644
index ee04701f3931..000000000000
--- a/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Backport for https://github.com/tpm2-software/tpm2-pytss/pull/576 on 2.2.1
-
-diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py
-index 6ca9b64..a7529b3 100644
---- a/scripts/prepare_headers.py
-+++ b/scripts/prepare_headers.py
-@@ -32,6 +32,7 @@ def remove_common_guards(s):
- 
-     # Restructure #defines with ...
-     s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\) \(.*?\)\)", "\g<1>...", s)
-+    s = re.sub("(#define [A-Za-z0-9_]+) +\(\(\(.*?\) .*\)", "\g<1>...", s)
-     s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\).*?\) ", "\g<1>...", s)
-     s = re.sub(
-         "(#define [A-Za-z0-9_]+) .*\n.*?.*\)\)", "\g<1>...", s, flags=re.MULTILINE
-diff --git a/src/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
-index 42030c5..f9d8c34 100644
---- a/src/tpm2_pytss/internal/crypto.py
-+++ b/src/tpm2_pytss/internal/crypto.py
-@@ -25,6 +25,7 @@ from cryptography.hazmat.backends import default_backend
- from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature
- from typing import Tuple, Type, Any
- import secrets
-+import inspect
- import sys
- 
- _curvetable = (
-diff --git a/test/test_encoding.py b/test/test_encoding.py
-index 1f58562..8cf4b51 100644
---- a/test/test_encoding.py
-+++ b/test/test_encoding.py
-@@ -1406,7 +1406,7 @@ class ToolsTest(TSS2_BaseTest):
-     def test_tools_decode_tpm2b_name(self):
-         if not self.has_tools:
-             self.skipTest("tools not in path")
--        key = ec.generate_private_key(ec.SECP256R1).public_key()
-+        key = ec.generate_private_key(ec.SECP256R1()).public_key()
-         kb = key.public_bytes(
-             serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo
-         )
-diff --git a/test/test_fapi.py b/test/test_fapi.py
-index f702fc9..6b77c66 100644
---- a/test/test_fapi.py
-+++ b/test/test_fapi.py
-@@ -13,7 +13,7 @@ from cryptography.hazmat.primitives.asymmetric.padding import PSS
- 
- from tpm2_pytss import *
- 
--from tpm2_pytss.internal.utils import is_bug_fixed, _lib_version_atleast
-+from tpm2_pytss.internal.utils import is_bug_fixed
- 
- from .TSS2_BaseTest import TpmSimulator
- from tpm2_pytss.TSS2_Exception import TSS2_Exception
-@@ -614,8 +614,7 @@ class Common:
-         self.fapi.sign(key_path, b"\x22" * 32)
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+        not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-         reason="tpm2-tss bug, see #2084",
-     )
-     def test_write_authorize_nv(self, esys):
-@@ -662,8 +661,7 @@ class Common:
-             self.fapi.quote(path=key_path, pcrs=[7, 9])
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+        not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-         reason="tpm2-tss bug, see #2084",
-     )
-     def test_authorize_policy(self, sign_key):
-@@ -728,9 +726,7 @@ class Common:
-             self.fapi.quote(path=key_path, pcrs=[7, 9])
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2"),
--        reason="tpm2-tss bug, see #2080",
-+        not is_bug_fixed(fixed_in="3.2"), reason="tpm2-tss bug, see #2080"
-     )
-     def test_policy_signed(self, cryptography_key):
-         # create external signing key used by the signing authority external to the TPM
-@@ -792,10 +788,6 @@ class Common:
-         with pytest.raises(TSS2_Exception):
-             self.fapi.sign(path=key_path, digest=b"\x11" * 32)
- 
--    @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170"),
--        reason="issue on master branch.",
--    )
-     def test_policy_branched(self):
-         pcr_index = 15
-         pcr_data = b"ABCDEF"
-@@ -913,8 +905,7 @@ class Common:
-         self.fapi.delete(path=nv_path)
- 
-     @pytest.mark.skipif(
--        _lib_version_atleast("tss2-fapi", "4.0.1-170")
--        or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+        not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-         reason="tpm2-tss bug, see #2089",
-     )
-     def test_policy_action(self):
-diff --git a/test/test_policy.py b/test/test_policy.py
-index f18aa8a..5f56e21 100644
---- a/test/test_policy.py
-+++ b/test/test_policy.py
-@@ -47,7 +47,7 @@ class TestPolicy(TSS2_EsapiTest):
-         super().setUp()
-         self._has_secp192r1 = True
-         try:
--            ec.generate_private_key(ec.SECP192R1)
-+            ec.generate_private_key(ec.SECP192R1())
-         except Exception:
-             self._has_secp192r1 = False
- 
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 4c3e8230fba7..7da990f0b8de 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.66.4";
+  version = "4.66.5";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5Nk2yd6HJ5KPO+YHlZDpfZq/6NOaWQvmeOtZGf/Bhrs=";
+    hash = "sha256-4QIK7y5QlnAtigJax9FrFXcnnJ1j+DdbYwg+ml8Py60=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix
index 06d380df90fd..7617a5f87dab 100644
--- a/pkgs/development/python-modules/trafilatura/default.nix
+++ b/pkgs/development/python-modules/trafilatura/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "trafilatura";
-  version = "1.12.1";
+  version = "1.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iYkdtkbdhNmPs0ovrte6hMIuVJAAe1h9BZkDbTUWR2A=";
+    hash = "sha256-TJyxQ09+E+8LFstE7h1E6EUj7HJolAuVWcN05+/8mpY=";
   };
 
   # Patch out gui cli because it is not supported in this packaging and
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 944ccabe161e..746b27514632 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -58,14 +58,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.46.0";
+  version = "4.46.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-R+uHo98K+uOXbxE4Axam/FONZgeFyyPfe0IZiOCpFF4=";
+    hash = "sha256-5bYjgrW2ITJ/bc8BP/tWjzwLrLQHgvKSVyUCNsRniFM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix
index 89bc4a2fde54..f76c4d946e76 100644
--- a/pkgs/development/python-modules/translate-toolkit/default.nix
+++ b/pkgs/development/python-modules/translate-toolkit/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "translate-toolkit";
-  version = "3.13.2";
+  version = "3.13.4";
 
   pyproject = true;
   build-system = [ setuptools-scm ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "translate_toolkit";
     inherit version;
-    hash = "sha256-95zIAelFSNK5+f1GY8DUgHPDQBS5K+9ULjXaSaa0wWM=";
+    hash = "sha256-d0q4xpN37xeLSmQMBrDGZlGjAj4hHfkazGUHzl89UHI=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix
index 71a4b2778ba7..cc2db015a14b 100644
--- a/pkgs/development/python-modules/transmission-rpc/default.nix
+++ b/pkgs/development/python-modules/transmission-rpc/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  setuptools,
   pytestCheckHook,
   pythonOlder,
   python-dotenv,
@@ -14,8 +14,8 @@
 
 buildPythonPackage rec {
   pname = "transmission-rpc";
-  version = "7.0.3";
-  format = "pyproject";
+  version = "7.0.11";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     owner = "Trim21";
     repo = "transmission-rpc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HthWeFInolNEs7RNA773DJjhGvl1rfDhvhO8WwRwuuY=";
+    hash = "sha256-t07TuLLHfbxvWh+7854OMigfGC8jHzvpd4QO3v0M15I=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     typing-extensions
   ];
@@ -44,6 +44,7 @@ buildPythonPackage rec {
 
   disabledTests = [
     # Tests require a running Transmission instance
+    "test_groups"
     "test_real"
   ];
 
diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix
deleted file mode 100644
index 0b6875390be0..000000000000
--- a/pkgs/development/python-modules/transmissionrpc/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  six,
-}:
-
-buildPythonPackage rec {
-  pname = "transmissionrpc";
-  version = "0.11";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60";
-  };
-
-  propagatedBuildInputs = [ six ];
-
-  # no tests
-  doCheck = false;
-  pythonImportsCheck = [ "transmissionrpc" ];
-
-  meta = with lib; {
-    description = "Python implementation of the Transmission bittorent client RPC protocol";
-    homepage = "https://pypi.python.org/pypi/transmissionrpc/";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix
index 4ca4ec1d7b81..ece3a6900804 100644
--- a/pkgs/development/python-modules/tree-sitter-python/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-python/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-python";
-  version = "0.21.0";
+  version = "0.23.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter-python";
     rev = "v${version}";
-    hash = "sha256-ZQ949GbgzZ/W667J+ekvQbs4bGnbDO+IWejivhxPZXM=";
+    hash = "sha256-cOBG2xfFJ0PpR1RIKW1GeeNeOBA9DAP/N4RXRGYp3yw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index fdaa03554433..92a9c1f00a71 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter";
-  version = "0.22.3";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tree-sitter";
     repo = "py-tree-sitter";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4lxE8oDFE0X7YAnB72PKIaHIqovWSM5QnFo0grPAtKU=";
+    hash = "sha256-OMCiHX1ZK9MknUcscEMg1Oie0qFpPQ9lMn8m/D0QF7g=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 730156a52731..96bf8cbcf491 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.5.1";
+  version = "4.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LoUXn9vuHocqoA1CpbKGBaBTApaIV6gyGk36Q5ByWxw=";
+    hash = "sha256-FlsS8omMPo3smaLtBexcg+r6L8gVC6jDD4s6YvaTQz8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix
index 7c8f0cbaa28b..821cd770caaf 100644
--- a/pkgs/development/python-modules/trio-asyncio/default.nix
+++ b/pkgs/development/python-modules/trio-asyncio/default.nix
@@ -45,6 +45,8 @@ buildPythonPackage rec {
     # RuntimeWarning: Can't run the Python asyncio tests because they're not installed
     "-W"
     "ignore::RuntimeWarning"
+    "-W"
+    "ignore::DeprecationWarning"
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 968d67b27adb..a29bcd842401 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -36,7 +36,7 @@ let
 in
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.25.0";
+  version = "0.26.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "python-trio";
     repo = "trio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JQ493U4WINOG6ob4IzfNQt5Lgs3DmEM2BDwbae7Bvsw=";
+    hash = "sha256-Vlm6lEMKKfwmhbeefPjxm3vz1zFRUEGOCHXLcZKQcIo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/trx-python/default.nix b/pkgs/development/python-modules/trx-python/default.nix
new file mode 100644
index 000000000000..556cf6118ec9
--- /dev/null
+++ b/pkgs/development/python-modules/trx-python/default.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cython,
+  setuptools,
+  setuptools-scm,
+  deepdiff,
+  nibabel,
+  numpy,
+  pytestCheckHook,
+  psutil,
+}:
+
+buildPythonPackage rec {
+  pname = "trx-python";
+  version = "0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tee-ar-ex";
+    repo = "trx-python";
+    rev = "refs/tags/${version}";
+    hash = "sha256-gKPgP3GJ7QY0Piylk5L0HxnscRCREP1Hm5HZufL2h5g=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    deepdiff
+    nibabel
+    numpy
+  ];
+
+  pythonImportsCheck = [ "trx" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    psutil
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  pytestFlagsArray = [ "trx/tests" ];
+
+  disabledTestPaths = [
+    # access to network
+    "trx/tests/test_memmap.py"
+    "trx/tests/test_io.py"
+  ];
+
+  meta = {
+    description = "Python implementation of the TRX file format";
+    homepage = "https://github.com/tee-ar-ex/trx-python";
+    changelog = "https://github.com/tee-ar-ex/trx-python/releases/tag/${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index b12ef6e9061e..c51766df6c90 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "trytond";
-  version = "7.2.6";
+  version = "7.2.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Vz1bYIwhvH8SHZnmv9ZuaoOnNe378gtIWK2UQDBQxas=";
+    hash = "sha256-Bzt9m7oqjJXlGdaHaMfIEi1fkwRjkT9sT4+U1FCwaAE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix
index 045385e9fa1b..3b8b7d75c447 100644
--- a/pkgs/development/python-modules/tsfresh/default.nix
+++ b/pkgs/development/python-modules/tsfresh/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  stdenv,
   pythonOlder,
   requests,
   numpy,
@@ -27,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "tsfresh";
-  version = "0.20.2";
+  version = "0.20.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -36,7 +37,7 @@ buildPythonPackage rec {
     owner = "blue-yonder";
     repo = "tsfresh";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UTra+RAQnrv61NQ86xGYrUVYiycUAWhN/45F6/0ZvPI=";
+    hash = "sha256-Lw70PDiRVPiTzpnbfKSo7jjfBitCePSy15QL0z7+bMg=";
   };
 
   patches = [
@@ -45,7 +46,7 @@ buildPythonPackage rec {
     ./remove-pytest-coverage-flags.patch
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     numpy
     pandas
@@ -71,25 +72,34 @@ buildPythonPackage rec {
     pandas-datareader
   ];
 
-  disabledTests = [
-    # touches network
-    "test_relevant_extraction"
-    "test_characteristics_downloaded_robot_execution_failures"
-    "test_index"
-    "test_binary_target_is_default"
-    "test_characteristics_downloaded_robot_execution_failures"
-    "test_extraction_runs_through"
-    "test_multilabel_target_on_request"
-  ];
+  disabledTests =
+    [
+      # touches network
+      "test_relevant_extraction"
+      "test_characteristics_downloaded_robot_execution_failures"
+      "test_index"
+      "test_binary_target_is_default"
+      "test_characteristics_downloaded_robot_execution_failures"
+      "test_extraction_runs_through"
+      "test_multilabel_target_on_request"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted
+      # may require extra privileges on darwin
+      "test_local_dask_cluster_extraction_one_worker"
+      "test_local_dask_cluster_extraction_two_worker"
+      "test_dask_cluster_extraction_one_worker"
+      "test_dask_cluster_extraction_two_workers"
+    ];
 
   pythonImportsCheck = [ "tsfresh" ];
 
-  meta = with lib; {
+  meta = {
     description = "Automatic extraction of relevant features from time series";
     mainProgram = "run_tsfresh";
     homepage = "https://github.com/blue-yonder/tsfresh";
     changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mbalatsko ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }
diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix
index 0299fea08e5a..775284b8990b 100644
--- a/pkgs/development/python-modules/tskit/default.nix
+++ b/pkgs/development/python-modules/tskit/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "tskit";
-  version = "0.5.7";
+  version = "0.5.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yD+2W1tzzi+5wFoZrqNe+jJLpWyx6ZILBgKivDE+wiM=";
+    hash = "sha256-Wq7ar96w5hdAyKMMvK4zjYln74RmX1l/VhvS++CN+Xk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix
index bf1379dd2bcc..53a0566eaaf2 100644
--- a/pkgs/development/python-modules/ttls/default.nix
+++ b/pkgs/development/python-modules/ttls/default.nix
@@ -2,33 +2,29 @@
   lib,
   aiohttp,
   buildPythonPackage,
-  colour,
   fetchFromGitHub,
   poetry-core,
   pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "ttls";
-  version = "1.8.3";
-  format = "pyproject";
+  version = "1.9.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "jschlyter";
-    repo = pname;
+    repo = "ttls";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1RctamOSnpZ+bcfwnCsj4OAR7KYzf0XQtSe7MTFMGy4=";
+    hash = "sha256-itGXZbQZ+HYpiwySLeGN3mPy3fgsxx0A9byOxIVpRBc=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
-    colour
-    setuptools
   ];
 
   # Module has no tests
diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix
index e22190ff82d9..b4297f30fb97 100644
--- a/pkgs/development/python-modules/ttp-templates/default.nix
+++ b/pkgs/development/python-modules/ttp-templates/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "ttp-templates";
-  version = "0.3.6";
+  version = "0.3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
index c831f7a0108c..d24bc3fecede 100644
--- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
+++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
@@ -9,14 +9,14 @@
 }:
 let
   pname = "tuya-device-sharing-sdk";
-  version = "0.1.9";
+  version = "0.2.1";
 in
 buildPythonPackage {
   inherit pname version;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mBKR+ttBo0VF33pEmYdjbyM4bGgyDiYexIIsf8mXZW4=";
+    hash = "sha256-cuLJfCIQmnySCN1yezxyqtFmnTUdhD9tY9sBYNh9iUI=";
   };
 
   # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 2002f84439d4..0542cd1c9fd5 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  fetchpatch2,
   fetchPypi,
   pythonOlder,
   importlib-metadata,
@@ -13,21 +14,42 @@
   rfc3986,
   setuptools-scm,
   urllib3,
+  build,
+  pretend,
+  pytest-socket,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "5.1.0";
+  version = "5.1.1";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TXR3DIjE/K+BNNKmqdhj5A8IJV/32OKss8u9V9Jfbp0=";
+    hash = "sha256-mqCCUTnAKzQ02RNUXHuEeiHINeEVl/UlWELUV9ojIts=";
   };
 
+  patches = [
+    # pkginfo>=1.11 compatibility patches
+    # https://github.com/pypa/twine/pull/1123
+    (fetchpatch2 {
+      name = "pkginfo-1_11-compatibility-test.patch";
+      url = "https://github.com/pypa/twine/commit/a3206073b87a8e939cf699777882ebfaced689a0.patch";
+      hash = "sha256-gLN7gJsVng/LFfsrAHjJlqFZTu0wSdeBfnUN+UnLSFk=";
+    })
+    (fetchpatch2 {
+      name = "pkginfo-1_11-compatibility-source.patch";
+      url = "https://github.com/pypa/twine/commit/03e3795659b44f263f527b0467680b238c8fbacc.patch";
+      hash = "sha256-Ne9+G8hMVbklKtcZLiBw29Skz5VO5x2F7yu/KozKgN8=";
+    })
+  ];
+
   nativeBuildInputs = [ setuptools-scm ];
 
+  pythonRelaxDeps = [ "pkginfo" ];
+
   propagatedBuildInputs = [
     importlib-metadata
     keyring
@@ -40,8 +62,12 @@ buildPythonPackage rec {
     urllib3
   ];
 
-  # Requires network
-  doCheck = false;
+  nativeCheckInputs = [
+    build
+    pretend
+    pytest-socket
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "twine" ];
 
diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 4b3015922146..7ea26fb78da1 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -6,6 +6,7 @@
   click,
   click-option-group,
   fetchPypi,
+  hatch-vcs,
   hatchling,
   hypothesis,
   jinja2,
@@ -15,10 +16,9 @@
   tomli,
   typing-extensions,
 }:
-
 buildPythonPackage rec {
   pname = "typed-settings";
-  version = "24.3.0";
+  version = "24.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "typed_settings";
     inherit version;
-    hash = "sha256-x1ojSSZNrKkBHKE9dWw7NzX/G6ggRYRIQ5MMahwL1Ps=";
+    hash = "sha256-HCVwXiKrvAvPQXU5rD5wxflPBBcB+oqcWriJizdOMS8=";
   };
 
   build-system = [ hatchling ];
@@ -53,6 +53,8 @@ buildPythonPackage rec {
     pydantic = [ pydantic ];
   };
 
+  nativeBuildInputs = [ hatch-vcs ];
+
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 74bb969473a7..3c92fb408ecf 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -6,6 +6,7 @@
   coverage,
   fetchPypi,
   pdm-backend,
+  procps,
   pytest-sugar,
   pytest-xdist,
   pytestCheckHook,
@@ -17,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "typer";
-  version = "0.12.3";
+  version = "0.12.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SecxMUgdgEKI72JZjZehzu8wWJBapTahE0+QiRujVII=";
+    hash = "sha256-9ZLwib7cyOwbl0El1khRApw7GvFF8ErKZNaUEPDJtyI=";
   };
 
   nativeBuildInputs = [ pdm-backend ];
@@ -48,6 +49,8 @@ buildPythonPackage rec {
     pytest-sugar
     pytest-xdist
     pytestCheckHook
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    procps
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index bbf905dcb82c..a783600fc5de 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.21.5";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs=";
+    hash = "sha256-P9Ht6skj0ZVsDpB8lz+4O9pGW+rn8FRxazcbKT+bX9w=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix
index 46f98100ac75..a4027dc808f7 100644
--- a/pkgs/development/python-modules/types-dateutil/default.nix
+++ b/pkgs/development/python-modules/types-dateutil/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-dateutil";
-  version = "2.9.0.20240316";
+  version = "2.9.0.20240906";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types-python-dateutil";
     inherit version;
-    hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI=";
+    hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix
index fd1d57700de5..62e73587ae75 100644
--- a/pkgs/development/python-modules/types-docutils/default.nix
+++ b/pkgs/development/python-modules/types-docutils/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-docutils";
-  version = "0.21.0.20240423";
+  version = "0.21.0.20240907";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dxbsbGi1F5t7oXOMrOLxMm5k359Et6sI2ZBNMsI/wV8=";
+    hash = "sha256-XdKqXi4G/PoJACC8QRVHm03SjaMymrcIVj7imJS9PA0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix
index c47eaf243b4b..fadbfb610b19 100644
--- a/pkgs/development/python-modules/types-pillow/default.nix
+++ b/pkgs/development/python-modules/types-pillow/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "types-pillow";
-  version = "10.2.0.20240520";
+  version = "10.2.0.20240822";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "types-Pillow";
-    hash = "sha256-EwuXkZVGX6HhZ22OgcnHwwMZ6OlbEvrpRejw1SUhMQc=";
+    hash = "sha256-VZ+1Ki75kcMm5KDSCsyzu2Onuo1A60k+DssDELpS8NM=";
   };
 
   # Modules doesn't have tests
diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index 74629872dce7..885cfe353e24 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-protobuf";
-  version = "5.27.0.20240626";
+  version = "5.28.0.20240924";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aDuhQEO63meF4/k3p0mPJDs3iBqRrI2BuSAuz4sZHpw=";
+    hash = "sha256-0YGviiVuWpHOjVrbU0luiA79kUTH1USD42UzMrYClvA=";
   };
 
   propagatedBuildInputs = [ types-futures ];
diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix
index 2ba7ec577d6d..09eebdcab054 100644
--- a/pkgs/development/python-modules/types-psycopg2/default.nix
+++ b/pkgs/development/python-modules/types-psycopg2/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-psycopg2";
-  version = "2.9.21.20240417";
+  version = "2.9.21.20240819";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Bdslb0pFn7IaQmuOf8oGVsNTkQX/Agjq9r2vQGo4cIc=";
+    hash = "sha256-Tta0dGTWN0+mTl47I0zqD3EOchI6RZbWerULdBWoRmY=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix
index 60457be769c0..1df09d2fb578 100644
--- a/pkgs/development/python-modules/types-pyopenssl/default.nix
+++ b/pkgs/development/python-modules/types-pyopenssl/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-pyopenssl";
-  version = "24.1.0.20240425";
+  version = "24.1.0.20240722";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types-pyOpenSSL";
     inherit version;
-    hash = "sha256-Cn6CYmwZg9yNxZKSvyBlSlHDw4gby7mzN8HabjLwIE4=";
+    hash = "sha256-R5E7RnigHYefUDoSBERoIh7YV2JjwVQNywSEyiGwjDk=";
   };
 
   propagatedBuildInputs = [ cryptography ];
diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix
index a84b7e22b810..43dda7067fe7 100644
--- a/pkgs/development/python-modules/types-python-dateutil/default.nix
+++ b/pkgs/development/python-modules/types-python-dateutil/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-python-dateutil";
-  version = "2.9.0.20240316";
+  version = "2.9.0.20240906";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI=";
+    hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix
index 99006754e304..31fe7ac1de19 100644
--- a/pkgs/development/python-modules/types-pyyaml/default.nix
+++ b/pkgs/development/python-modules/types-pyyaml/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "types-pyyaml";
-  version = "6.0.12.20240311";
+  version = "6.0.12.20240917";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types-PyYAML";
     inherit version;
-    hash = "sha256-qeDw+I3INXObDBylHukNBMoqiXpxr3nemuxfOMsKU0I=";
+    hash = "sha256-0UBahvlXZoIjTvg7y05v/3yTBcix+61eC81Pfb3JxYc=";
   };
 
   # Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix
index 79728a451fe6..5878c4bd88a6 100644
--- a/pkgs/development/python-modules/types-redis/default.nix
+++ b/pkgs/development/python-modules/types-redis/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "types-redis";
-  version = "4.6.0.20240425";
+  version = "4.6.0.20240903";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lAKhDukx0kH9/MBFkuv3pmHXu5Ko3qYxJ58NisvPOiI=";
+    hash = "sha256-S6saN42/I8LJXDcN/biajwM5V8T9GlP+5xtSnBgv4Ag=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index ed5295ea0d97..124bcfe8874f 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.32.0.20240914";
+  version = "2.32.0.20241016";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KFDheNs5Gdm/gJ5DTu9luknQ5+M6yS1Yj0peKV//1AU=";
+    hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix
index 1db9bc7323bd..bb2211a43dfb 100644
--- a/pkgs/development/python-modules/types-s3transfer/default.nix
+++ b/pkgs/development/python-modules/types-s3transfer/default.nix
@@ -2,21 +2,24 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  poetry-core,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "types-s3transfer";
-  version = "0.10.1";
+  version = "0.10.2";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchPypi {
     pname = "types_s3transfer";
     inherit version;
-    hash = "sha256-AhVMzkZSgoetdq0aAVOEDgSSI5oIh+iDNGbsz4S5jaA=";
+    hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ setuptools ];
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index 0c5bcbbb5c48..d5b91eb17203 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-setuptools";
-  version = "70.0.0.20240524";
+  version = "75.1.0.20240917";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4x/ue50V71OYBSZXmsYImzrlGgBaKBrPlxeOkKxxr/Y=";
+    hash = "sha256-EvEqFl5+04PzHe9wXlwPocJiFd1GawrzS9BC99UzH1U=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix
index 357bb8d1094a..d222c05650dd 100644
--- a/pkgs/development/python-modules/typical/default.nix
+++ b/pkgs/development/python-modules/typical/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "typical";
-  version = "2.8.1";
+  version = "2.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "seandstewart";
     repo = "typical";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2t9Jhdy9NmYBNzdtjjgUnoK2RDEUsAvDkYMcBRzEcmI=";
+    hash = "sha256-RS4hJ7NufClroRPRO3EyHwDaMgg0s0F7D/mqcBr8O18=";
   };
 
   pythonRelaxDeps = [ "pendulum" ];
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index 198df9570b68..7ef57e00a0e8 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tzdata";
-  version = "2024.1";
+  version = "2024.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JnQSD42JGQl1HDirzf04asCloRJ5VPvDMq9rXOrgfv0=";
+    hash = "sha256-fYXMQW6TguaQlbe99K/Z44gEGKJBP+7HBp1TPWtOMcw=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch
deleted file mode 100644
index ed177797da0c..000000000000
--- a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx
-index b99647c..479cc9c 100644
---- a/src/message_receiver.pyx
-+++ b/src/message_receiver.pyx
-@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase):
- 
- #### Callbacks (context is a MessageReceiver instance)
- 
--cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state):
-+cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state):
-     if context != NULL:
-         context_pyobj = context
-         if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback
diff --git a/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch b/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch
deleted file mode 100644
index ad2186543f3c..000000000000
--- a/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 52ab2095649b5951e6af77f68954209473296983 Mon Sep 17 00:00:00 2001
-From: Sandro 
-Date: Sat, 16 Jan 2021 15:54:05 +0100
-Subject: [PATCH] Fix finding apple libraries
-
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
- 
-
-(rejected by upstream in https://github.com/Azure/azure-c-shared-utility/pull/499,
-seems problem it's solving is nixpkgs-specific)
-
-diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
-index 7bbfa6f3f..3567b18bc 100644
---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
-+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
-@@ -120,8 +120,9 @@ endif()
- 
- if(${use_applessl})
-     # MACOSX only has native tls and open ssl, so use the native apple tls
--    find_library(cf_foundation Foundation)
-+    find_library(cf_foundation CoreFoundation)
-     find_library(cf_network CFNetwork)
-+    find_library(cf_security Security)
- endif()
- 
- if(${no_logging})
-@@ -581,7 +582,7 @@ endif()
- 
- 
- if(${use_applessl})
--    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network})
-+    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network} ${cf_security})
- endif()
- 
- if(WIN32)
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 89063357a565..122ecccb046b 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -3,8 +3,9 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  cython_0,
+  fetchpatch2,
+  setuptools,
+  cython,
   certifi,
   CFNetwork,
   cmake,
@@ -17,41 +18,23 @@
 
 buildPythonPackage rec {
   pname = "uamqp";
-  version = "1.6.8";
-  format = "setuptools";
+  version = "1.6.11";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-uamqp-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L4E7nnsVZ/VrOM0t4KtztU9ALmtGfi1vDzUi0ogtZOc=";
+    hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE=";
   };
 
-  patches =
-    lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      ./darwin-azure-c-shared-utility-corefoundation.patch
-    ]
-    ++ [
-      (fetchpatch {
-        name = "CVE-2024-25110.patch";
-        url = "https://github.com/Azure/azure-uamqp-c/commit/30865c9ccedaa32ddb036e87a8ebb52c3f18f695.patch";
-        stripLen = 1;
-        extraPrefix = "src/vendor/azure-uamqp-c/";
-        hash = "sha256-igzZqTLUUyuNcpCUbYHI4RXmWxg+7EC/yyD4DBurR2M=";
-      })
-      (fetchpatch {
-        name = "CVE-2024-27099.patch";
-        url = "https://github.com/Azure/azure-uamqp-c/commit/2ca42b6e4e098af2d17e487814a91d05f6ae4987.patch";
-        stripLen = 1;
-        extraPrefix = "src/vendor/azure-uamqp-c/";
-        # other files are just tests which aren't run from the python
-        # builder anyway
-        includes = [ "src/vendor/azure-uamqp-c/src/link.c" ];
-        hash = "sha256-EqDfG1xAz5CG8MssSSrz8Yrje5qwF8ri1Kdw+UUu5ms=";
-      })
-      # Fix incompatible function pointer conversion error with clang 16.
-      ./clang-fix-incompatible-function-pointer-conversion.patch
-    ];
+  patches = [
+    (fetchpatch2 {
+      name = "fix-clang16-compatibility.patch";
+      url = "https://github.com/Azure/azure-uamqp-python/commit/bd6d9ef5a8bca3873e1e66218fd09ca787b8064e.patch";
+      hash = "sha256-xtnIVjB71EPJp/QjLQWctcSDds5s6n4ut+gnvp3VMlM=";
+    })
+  ];
 
   postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) ''
     # force darwin aarch64 to use openssl instead of applessl, removing
@@ -69,9 +52,13 @@ buildPythonPackage rec {
       src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
   '';
 
+  build-system = [
+    cython
+    setuptools
+  ];
+
   nativeBuildInputs = [
     cmake
-    cython_0
   ];
 
   buildInputs =
@@ -82,7 +69,7 @@ buildPythonPackage rec {
       Security
     ];
 
-  propagatedBuildInputs = [ certifi ];
+  dependencies = [ certifi ];
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
index 731da3b75fbe..a151ba1f1d80 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "uarray";
-  version = "0.8.8";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = pname;
-    rev = version;
-    hash = "sha256-wTKqOw64b+/kdZpSYLwCJATOuo807BWCtVHB4pH58fY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix
index a510f0f468aa..1c506a92b6da 100644
--- a/pkgs/development/python-modules/ucsmsdk/default.nix
+++ b/pkgs/development/python-modules/ucsmsdk/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ucsmsdk";
-  version = "0.9.20";
+  version = "0.9.21";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "CiscoUcs";
     repo = "ucsmsdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk=";
+    hash = "sha256-iqwU42Im4/YyxefkJZ8Zn5CddjUzuZk/7zjLD/0pHm4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index cd438f890d50..22ea350cf303 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -7,34 +7,44 @@
   cu2qu,
   defcon,
   fetchPypi,
+  fetchpatch2,
   fontmath,
   fonttools,
   pytestCheckHook,
   pythonOlder,
   setuptools-scm,
   skia-pathops,
+  syrupy,
   ufolib2,
 }:
 
 buildPythonPackage rec {
   pname = "ufo2ft";
-  version = "3.2.8";
+  version = "3.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HSD66FbCxZyACRq7b8p2uizoO4ZqPAn1O8BFoi1/Mkc=";
+    hash = "sha256-lw5mLcVw1NFT1c/AOcMyo2a8aGOyxFG+ZAU6Ggnssko=";
   };
 
-  nativeBuildInputs = [
+  patches = [
+    (fetchpatch2 {
+      # update syrupy snapshots
+      url = "https://github.com/googlefonts/ufo2ft/commit/7a3edb2e4202cf388e3ffe31b5b3783dbb392db2.patch";
+      hash = "sha256-YEgUgrtgH3PBZlt+xoJme+oPRuDMwq7M/4cJ3JbeuyU=";
+    })
+  ];
+
+  build-system = [
     setuptools-scm
   ];
 
   pythonRelaxDeps = [ "cffsubr" ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cu2qu
     fontmath
     fonttools
@@ -46,7 +56,10 @@ buildPythonPackage rec {
     skia-pathops
   ] ++ fonttools.optional-dependencies.lxml ++ fonttools.optional-dependencies.ufo;
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    syrupy
+  ];
 
   disabledTests = [
     # Do not depend on skia.
diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix
index de30a7809166..b4d7fa157605 100644
--- a/pkgs/development/python-modules/uharfbuzz/default.nix
+++ b/pkgs/development/python-modules/uharfbuzz/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   pythonOlder,
   cython,
+  pkgconfig,
   setuptools,
   setuptools-scm,
   pytestCheckHook,
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "uharfbuzz";
-  version = "0.39.0";
+  version = "0.41.0";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -23,11 +24,17 @@ buildPythonPackage rec {
     repo = "uharfbuzz";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    hash = "sha256-I4fCaomq26FdkpiJdj+zyrbdqdynnD2hIutYTuTFvQs=";
+    hash = "sha256-N/Vprr1lJmDLUzf+aX374YbJhDuHOpPzNeYXpLOANeI=";
   };
 
-  nativeBuildInputs = [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools >= 36.4, < 72.2" setuptools
+  '';
+
+  build-system = [
     cython
+    pkgconfig
     setuptools
     setuptools-scm
   ];
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 45cf6ce2e967..9278ad563162 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -39,7 +39,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "6.3.1";
+  version = "6.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     rev = "refs/tags/v${version}";
-    hash = "sha256-42rxRD3mXgMLz3mADF0ksDLpw2di5MyVL7+6iW41nI8=";
+    hash = "sha256-+BHxcwQhx4lOqS0ATk1PjLbyTu7xQakM3HMrydXeGUc=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 9fbe57c250e9..9d91c6d94ffa 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -5,6 +5,7 @@
   colorcet,
   datashader,
   fetchFromGitHub,
+  setuptools,
   holoviews,
   matplotlib,
   numba,
@@ -12,7 +13,6 @@
   pandas,
   pynndescent,
   pytestCheckHook,
-  pythonOlder,
   scikit-image,
   scikit-learn,
   scipy,
@@ -24,19 +24,19 @@
 
 buildPythonPackage rec {
   pname = "umap-learn";
-  version = "0.5.6";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  version = "0.5.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lmcinnes";
     repo = "umap";
     rev = "refs/tags/release-${version}";
-    hash = "sha256-fqYl8T53BgCqsquY6RJHqpDFsdZA0Ihja69E/kG3YGU=";
+    hash = "sha256-hPYmRDSeDa4JWGekUVq3CWf5NthHTpMpyuUQ1yIkVAE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     numba
     numpy
     pynndescent
@@ -91,6 +91,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Uniform Manifold Approximation and Projection";
     homepage = "https://github.com/lmcinnes/umap";
+    changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${version}";
     license = licenses.bsd3;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix
index a672feebf5ee..7bc806314a72 100644
--- a/pkgs/development/python-modules/unicode-rbnf/default.nix
+++ b/pkgs/development/python-modules/unicode-rbnf/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "unicode-rbnf";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "unicode-rbnf";
-    rev = "v${version}";
-    hash = "sha256-PquPoiaO1rEDMz7jaN9MUB0UQGH07M0O9mlrUCsfhm4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-dAoDO707qmdDzCbi7EWNaM9txdBV46NlLkOs7xyycz0=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix
index d7e9f274d3d5..793cbc7428a0 100644
--- a/pkgs/development/python-modules/unidata-blocks/default.nix
+++ b/pkgs/development/python-modules/unidata-blocks/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "unidata-blocks";
-  version = "0.0.13";
+  version = "0.0.15";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "unidata_blocks";
     inherit version;
-    hash = "sha256-JQwKMEhDdvvsnXI6QsV2TcuB3mw5NcALbi5kM5xl/Pw=";
+    hash = "sha256-dPVJjA+udN6hD8v+pp59/SsHHCwmJLVRYuCDBQIGJQk=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index b09942f1beec..025eec125099 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -14,6 +14,7 @@
   coloredlogs,
   crc,
   libgpiod,
+  pyserial-asyncio-fast,
   typing-extensions,
   zigpy,
 
@@ -26,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "universal-silabs-flasher";
-  version = "0.0.22";
+  version = "0.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "universal-silabs-flasher";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fAz5dhHO5A0pSH6IYcVwNWPxqsNn3urXqnp8GudOrBA=";
+    hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM=";
   };
 
   postPatch = ''
@@ -56,6 +57,7 @@ buildPythonPackage rec {
     click
     coloredlogs
     crc
+    pyserial-asyncio-fast
     typing-extensions
     zigpy
   ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ];
diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix
index b619b5b70e45..b773ea48f99a 100644
--- a/pkgs/development/python-modules/unstructured-inference/default.nix
+++ b/pkgs/development/python-modules/unstructured-inference/default.nix
@@ -6,7 +6,7 @@
   layoutparser,
   python-multipart,
   huggingface-hub,
-  opencv,
+  opencv-python,
   onnxruntime,
   transformers,
   detectron2,
@@ -23,27 +23,22 @@
 
 buildPythonPackage rec {
   pname = "unstructured-inference";
-  version = "0.7.24";
+  version = "0.7.37";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-inference";
     rev = "refs/tags/${version}";
-    hash = "sha256-AxQHTUgE4CyiinT7HEh6fvbw+uVi7lKUgfOc1KZOezU=";
+    hash = "sha256-2k7gFlBUevVnz2A5pvUE4eIGmXwEr5s4F8BbX6j5lzc=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements/base.in \
-      --replace "opencv-python" "opencv"
-  '';
-
   propagatedBuildInputs =
     [
       layoutparser
       python-multipart
       huggingface-hub
-      opencv
+      opencv-python
       onnxruntime
       transformers
       detectron2
diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix
index 7e82256d3917..616afc78bcd4 100644
--- a/pkgs/development/python-modules/upass/default.nix
+++ b/pkgs/development/python-modules/upass/default.nix
@@ -4,21 +4,24 @@
   fetchFromGitHub,
   pyperclip,
   urwid,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "upass";
-  version = "0.2.1";
-  format = "setuptools";
+  version = "0.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kwpolska";
     repo = "upass";
     rev = "v${version}";
-    sha256 = "0bgplq07dmlld3lp6jag1w055glqislfgwwq2k7cb2bzjgvysdnj";
+    hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     pyperclip
     urwid
   ];
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 3fae3b0b70f0..943bed05fb02 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -6,6 +6,7 @@
 
   # build-system
   hatchling,
+  hatch-vcs,
 
   # optional-dependencies
   brotli,
@@ -24,15 +25,18 @@
 let
   self = buildPythonPackage rec {
     pname = "urllib3";
-    version = "2.2.2";
+    version = "2.2.3";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-3VBUhVSaelUoM9peYGNjnQ0XfATyO8OGTkHl3F9hIWg=";
+      hash = "sha256-59gUqB2tgebK8uyf3tsoTsyccwdrYmVFR8xkzNyuJuk=";
     };
 
-    nativeBuildInputs = [ hatchling ];
+    build-system = [
+      hatchling
+      hatch-vcs
+    ];
 
     optional-dependencies = {
       brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 49402d76d745..0094bb972a91 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "2.6.15";
+  version = "2.6.16";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "urwid";
     repo = "urwid";
     rev = "refs/tags/${version}";
-    hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c=";
+    hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix
index b42c5c8f6aa1..d6d2b53731c7 100644
--- a/pkgs/development/python-modules/us/default.nix
+++ b/pkgs/development/python-modules/us/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "us";
-  version = "3.1.1";
+  version = "3.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-40eWPo0kocp0N69EP6aFkXdoR7UMhlDY7w61NILnBcI=";
+    hash = "sha256-yyI+hTk9zFFx6tDdISutxH+WZ7I3AP6j5+pfMQ1UUzg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix
index 3b4cd7a0bd23..714bb5a630b0 100644
--- a/pkgs/development/python-modules/ush/default.nix
+++ b/pkgs/development/python-modules/ush/default.nix
@@ -4,20 +4,25 @@
   fetchFromGitHub,
   pytestCheckHook,
   six,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "ush";
-  version = "3.1.0";
-  format = "setuptools";
+  version = "4.1.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tarruda";
     repo = "python-ush";
     rev = version;
-    hash = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo=";
+    hash = "sha256-a6ICbd8647DRtuHl2vs64bsChUjlpuWHV1ipBdFA600=";
   };
 
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "ush" ];
+
   nativeCheckInputs = [
     pytestCheckHook
     six
diff --git a/pkgs/development/python-modules/uuid6/default.nix b/pkgs/development/python-modules/uuid6/default.nix
new file mode 100644
index 000000000000..709f7156e645
--- /dev/null
+++ b/pkgs/development/python-modules/uuid6/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "uuid6";
+  version = "2024.7.10";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A=";
+  };
+
+  # https://github.com/oittaa/uuid6-python/blob/e647035428d984452b9906b75bb007198533dfb1/setup.py#L12-L19
+  env.GITHUB_REF = "refs/tags/${version}";
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "test/"
+  ];
+
+  disabledTestPaths = [
+    "test/test_uuid6.py"
+  ];
+
+  pythonImportsCheck = [
+    "uuid6"
+  ];
+
+  meta = {
+    description = "New time-based UUID formats which are suited for use as a database key";
+    homepage = "https://github.com/oittaa/uuid6-python";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+}
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index f81acc469a3d..f0d29c6381a8 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.29.0";
+  version = "0.31.0";
   disabled = pythonOlder "3.8";
 
   pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = "uvicorn";
     rev = "refs/tags/${version}";
-    hash = "sha256-D0FdZxaDB+9N/7p73GF8qw0UwbXTQrKc1WOgy9UltxA=";
+    hash = "sha256-Au8+8l8JfOUeLDxN2UONP0W+fsb38QCAunblmxJdGus=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 15c35549bff7..8ef7730047d5 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -6,7 +6,7 @@
   fetchPypi,
 
   # build-system
-  cython_0,
+  cython,
   setuptools,
 
   # native dependencies
@@ -22,18 +22,18 @@
 
 buildPythonPackage rec {
   pname = "uvloop";
-  version = "0.20.0";
+  version = "0.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RgPKcUp1T8jZsZfjJdslsuoEU4Xoo60F00Y95yX99Gk=";
+    hash = "sha256-O/ErD9poRHgGp62Ee/pZFhMXcnXTW2ckse5XP6o3BOM=";
   };
 
   build-system = [
-    cython_0
+    cython
     setuptools
   ];
 
diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix
index 1664916710d5..180296b11374 100644
--- a/pkgs/development/python-modules/validators/default.nix
+++ b/pkgs/development/python-modules/validators/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "validators";
-  version = "0.33.0";
+  version = "0.34.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "python-validators";
     repo = "validators";
     rev = "refs/tags/${version}";
-    hash = "sha256-eLujcm2MD1mPjROrBTg9TfU9wts16Jgb+ouNXFHsFZ0=";
+    hash = "sha256-1QKo6nidaHeKCbti/xALbgylHYbtBUJlWrjhNtdx8kU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index 7851df4a2971..e0a4e1353a57 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "vdirsyncer";
-  version = "0.19.2";
+  version = "0.19.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/QWM7quCk0WaBGbNmw5Ks7OUYsbgiaDwrDfDB0INgro=";
+    hash = "sha256-5DeFH+uYXew1RGVPj5z23RCbCwP34ZlWCGYDCS/+so8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 1acb25ddf809..0645e6d7e8b8 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  fetchpatch,
   fetchPypi,
   pythonOlder,
   altair,
@@ -17,25 +16,16 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "4.0.0";
+  version = "4.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-v1/8taHdN1n9+gy7L+g/wAJ2x9FwYCaxZiEdFqLct1Y=";
+    hash = "sha256-8lrmhCvwczqBpiQRCkPjmiYsJPHEFnZab/Azkh+i7ls=";
   };
 
-  patches = [
-    # https://github.com/vega/ipyvega/pull/507
-    (fetchpatch {
-      name = "replace-poetry-with-poetry-core.patch";
-      url = "https://github.com/vega/ipyvega/commit/1a5028ee5d54e24b9650b66685f54c42b72c7899.patch";
-      hash = "sha256-W8UmMit7DJGKCM9+/OSRLTuRvC0ZR42AP/b/frVEvsk=";
-    })
-  ];
-
   nativeBuildInputs = [
     poetry-core
   ];
diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 9abbf8bba33b..05dc14a79557 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -20,7 +20,7 @@
 buildPythonPackage rec {
   pname = "versioningit";
   version = "3.1.2";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -29,13 +29,16 @@ buildPythonPackage rec {
     hash = "sha256-Tbg+2Z9WsH2DlAvuNEXKRsoSDRO2swTNtftE5apO3sA=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs =
+  dependencies =
     [ packaging ]
     ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
     ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
+  # AttributeError: type object 'CaseDetails' has no attribute 'model_validate_json'
+  doCheck = lib.versionAtLeast pydantic.version "2";
+
   nativeCheckInputs = [
     pytestCheckHook
     build
diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix
index e822dacb633a..7b06fe7a8252 100644
--- a/pkgs/development/python-modules/vharfbuzz/default.nix
+++ b/pkgs/development/python-modules/vharfbuzz/default.nix
@@ -2,27 +2,35 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
+  setuptools-scm,
   fonttools,
   uharfbuzz,
 }:
 
 buildPythonPackage rec {
   pname = "vharfbuzz";
-  version = "0.3.0";
-  format = "setuptools";
+  version = "0.3.1";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bBKmVvLuc/CtQF+TSri8ngglnj4QCh77FV+JHPzsFAI=";
+    hash = "sha256-zFVw8Nxh7cRJNk/S7D3uiIGShBMiZ/JeuSdX4hN94kc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     fonttools
     uharfbuzz
   ];
 
   # Package has no tests.
   doCheck = false;
+
   pythonImportsCheck = [ "vharfbuzz" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix
index 262c109325d9..ed37faf4bb1f 100644
--- a/pkgs/development/python-modules/videocr/default.nix
+++ b/pkgs/development/python-modules/videocr/default.nix
@@ -5,7 +5,7 @@
   setuptools,
   levenshtein,
   pytesseract,
-  opencv4,
+  opencv-python,
   fuzzywuzzy,
 }:
 
@@ -24,14 +24,13 @@ buildPythonPackage rec {
   dependencies = [
     levenshtein
     pytesseract
-    opencv4
+    opencv-python
     fuzzywuzzy
   ];
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-fail "python-Levenshtein" "Levenshtein" \
-      --replace-fail "opencv-python" "opencv"
+      --replace-fail "python-Levenshtein" "Levenshtein"
     substituteInPlace videocr/constants.py \
       --replace-fail "master" "main"
     substituteInPlace videocr/video.py \
diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix
index 27cb972bb780..d3824b2c36a3 100644
--- a/pkgs/development/python-modules/viewstate/default.nix
+++ b/pkgs/development/python-modules/viewstate/default.nix
@@ -8,15 +8,15 @@
 
 buildPythonPackage rec {
   pname = "viewstate";
-  version = "0.4.3";
+  version = "0.6.0";
   format = "setuptools";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "yuvadm";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 6e7904dbe3cd..660859b95769 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.26.2";
+  version = "20.26.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gr8PTuu7eNNt2u4Cg9Q/5XNrU4gLiozc03OQoHrDdBw=";
+    hash = "sha256-KArt4JoqXDF+QJoAEC5wd8ZDLFo48O+TjmQ4BaetLEg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index 59119f85cd2b..7bb87b98bc56 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -5,30 +5,32 @@
   funcy,
   intervaltree,
   pefile,
-  typing-extensions,
-  vivisect,
   pytest-sugar,
   pytestCheckHook,
   python-flirt,
+  pythonOlder,
+  setuptools-scm,
+  typing-extensions,
+  vivisect,
 }:
+
 buildPythonPackage rec {
   pname = "viv-utils";
-  version = "0.7.10";
-  format = "setuptools";
+  version = "0.7.11";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "viv-utils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pQAe4QuOcx5MG+slJkf4UU38TGt4pU0uVZr+vtwsWgM=";
+    hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "==" ">="
-  '';
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     funcy
     intervaltree
     pefile
@@ -47,6 +49,8 @@ buildPythonPackage rec {
     };
   };
 
+  pythonImportsCheck = [ "viv_utils" ];
+
   meta = with lib; {
     description = "Utilities for working with vivisect";
     homepage = "https://github.com/williballenthin/viv-utils";
diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index e99a473b48a6..06b15686ec24 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -12,31 +12,35 @@
   pythonOlder,
   withGui ? false,
   wrapQtAppsHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "vivisect";
-  version = "1.1.1";
-  format = "setuptools";
+  version = "1.2.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-URRBEZelw4s43zqtb/GrLxIksvrqHbqQWntT9jVonhU=";
+    hash = "sha256-zBWrVBub48rYBg7k9CDmgCWPpPz3R38/mtUCM1P3Mpk=";
   };
 
   pythonRelaxDeps = [
     "cxxfilt"
+    "msgpack"
     "pyasn1"
     "pyasn1-modules"
   ];
 
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [
     wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     pyasn1
     pyasn1-modules
     cxxfilt
@@ -53,7 +57,7 @@ buildPythonPackage rec {
     wrapQtApp $out/bin/vivbin
   '';
 
-  # requires another repo for test files
+  # Tests requires another repo for test files
   doCheck = false;
 
   pythonImportsCheck = [ "vivisect" ];
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index fa5b9d848152..0d554e5a5491 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -58,7 +58,7 @@ in
 
 buildPythonPackage rec {
   pname = "vllm";
-  version = "0.5.3.post1";
+  version = "0.6.2";
   pyproject = true;
 
   stdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     owner = "vllm-project";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-++DK2Y2zz+1KrEcdQc5XFrSjc7fCwMD2DQ/RqY7PoFU=";
+    hash = "sha256-zUkqAPPhDRdN9rDQ2biCl1B+trV0xIHXub++v9zsQGo=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix
index 1799598a2a6b..04e0eb2ede82 100644
--- a/pkgs/development/python-modules/voip-utils/default.nix
+++ b/pkgs/development/python-modules/voip-utils/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "voip-utils";
-  version = "0.1.0";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "voip-utils";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-/DBBTL+t0VQJL43HgXGdhMHMKr8uBEkJ7Mf7Xp1mwhU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 558d47529b68..5dbf58739c75 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "vowpalwabbit";
-  version = "9.9.0";
+  version = "9.10.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YCg2EI4rhEMwcVEzx9ES8Z3CoCddeUFVk4lZ0nuQJUc=";
+    hash = "sha256-Yyqm3MlW6UL+bCufFfzWg9mBBQNhLxR+g++ZrQ6qM/E=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix
index 37baf7f80f34..1cde8424418c 100644
--- a/pkgs/development/python-modules/vulcan-api/default.nix
+++ b/pkgs/development/python-modules/vulcan-api/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "vulcan-api";
-  version = "2.3.2";
+  version = "2.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "kapi2289";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ebWKcRxAAkHVqV2RaftIHBRJe/TYSUxS+5Utxb0yhtw=";
+    hash = "sha256-RtB67Pme/qtKG0T3rzm0OeewNZPg2e3aebL5YnSWWFQ=";
   };
 
   pythonRemoveDeps = [ "faust-cchardet" ];
diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix
index 9a08899a4b2b..1ad75b5cc3e9 100644
--- a/pkgs/development/python-modules/vulture/default.nix
+++ b/pkgs/development/python-modules/vulture/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   pint,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -12,27 +13,23 @@
 
 buildPythonPackage rec {
   pname = "vulture";
-  version = "2.11";
+  version = "2.13";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8Pu2C85lEarYfuBzbFAkVnN0kKgtkZpE5tkiYss18cI=";
+    hash = "sha256-eCSL9Y9er/zCreMGFB6tc/Q3M5lQ+ABF3Of4sHjloao=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace " --cov vulture --cov-report=html --cov-report=term --cov-report=xml --cov-append" ""
-  '';
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     pint
+    pytest-cov-stub
     pytestCheckHook
     toml
   ];
@@ -41,10 +38,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Finds unused code in Python programs";
-    mainProgram = "vulture";
     homepage = "https://github.com/jendrikseipp/vulture";
     changelog = "https://github.com/jendrikseipp/vulture/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ mcwitt ];
+    mainProgram = "vulture";
   };
 }
diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix
index 78d8db46b6d0..f5bbaddb6c34 100644
--- a/pkgs/development/python-modules/wadllib/default.nix
+++ b/pkgs/development/python-modules/wadllib/default.nix
@@ -2,32 +2,35 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  isPy3k,
   setuptools,
   lazr-uri,
 }:
 
 buildPythonPackage rec {
   pname = "wadllib";
-  version = "1.3.6";
-  format = "setuptools";
+  version = "2.0.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "acd9ad6a2c1007d34ca208e1da6341bbca1804c0e6850f954db04bdd7666c5fc";
+    hash = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc=";
   };
 
-  propagatedBuildInputs = [
-    setuptools
+  build-system = [ setuptools ];
+
+  dependencies = [
     lazr-uri
   ];
 
-  doCheck = isPy3k;
+  pythonImportsCheck = [ "wadllib" ];
+
+  # pypi tarball has no tests
+  doCheck = false;
 
   meta = with lib; {
     description = "Navigate HTTP resources using WADL files as guides";
     homepage = "https://launchpad.net/wadllib";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix
index ae55189f99c6..6c4fed94b591 100644
--- a/pkgs/development/python-modules/wagtail/default.nix
+++ b/pkgs/development/python-modules/wagtail/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "wagtail";
-  version = "6.2";
+  version = "6.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WQhujKGBsQ8nSxE5JFAFBN7W/BaCTBl283w8vd0QDSQ=";
+    hash = "sha256-UGrCtZ2uhQaa51S0W8E7kcvYbpLU9dZjZYdzsO16Frk=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
index 976037f92889..e5513ff4ac9a 100644
--- a/pkgs/development/python-modules/walrus/default.nix
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -1,18 +1,18 @@
 {
   lib,
-  pkgs,
   buildPythonPackage,
   fetchFromGitHub,
+  pkgs,
   pythonOlder,
   redis,
+  setuptools,
   unittestCheckHook,
-  fetchpatch,
 }:
 
 buildPythonPackage rec {
   pname = "walrus";
-  version = "0.9.3";
-  format = "setuptools";
+  version = "0.9.4";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -20,20 +20,12 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = "walrus";
     rev = "refs/tags/${version}";
-    hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc=";
+    hash = "sha256-cvoRiaGGTpZWfSE6DDT6GwDmc/TC/Z/E76Qy9Zzkpsw=";
   };
 
-  patches = [
-    # distutils has been deprecated, this wraps its import inside a try-catch
-    # and fallsback to a fallback import.
-    # Should not be necessary in future versions.
-    (fetchpatch {
-      url = "https://github.com/coleifer/walrus/commit/79e20c89aa4015017ef8a3e0b5c27ca2731dc9b2.patch";
-      hash = "sha256-hCpvki6SV3KYhicjjUMP4VrKMEerMjq2n1BgozXKDO8=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ redis ];
+  dependencies = [ redis ];
 
   nativeCheckInputs = [ unittestCheckHook ];
 
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index e68d2acbf130..f9c205f3c725 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -2,41 +2,37 @@
   lib,
   stdenv,
   buildPythonPackage,
-  CoreServices,
   eventlet,
   fetchPypi,
   flaky,
+  pytest-cov-stub,
   pytest-timeout,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
+  apple-sdk_11,
 }:
 
 buildPythonPackage rec {
   pname = "watchdog";
-  version = "4.0.1";
+  version = "4.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7rqs9nT6JVEeiGcCjSgeYC7mUABFtX9DsId4CC9/i0Q=";
+    hash = "sha256-tN+7bEkiG+RTViPqRHSk1u4KnO9KgLIMKNtNhYtk4nA=";
   };
 
-  # force kqueue on x86_64-darwin, because our api version does
-  # not support fsevents
-  patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
-    ./force-kqueue.patch
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
   optional-dependencies.watchmedo = [ pyyaml ];
 
   nativeCheckInputs = [
     eventlet
     flaky
+    pytest-cov-stub
     pytest-timeout
     pytestCheckHook
   ] ++ optional-dependencies.watchmedo;
diff --git a/pkgs/development/python-modules/watchdog/force-kqueue.patch b/pkgs/development/python-modules/watchdog/force-kqueue.patch
deleted file mode 100644
index d4a0f4e6a00e..000000000000
--- a/pkgs/development/python-modules/watchdog/force-kqueue.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 337e4be..55ef9a6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -38,7 +38,7 @@ _apple_devices = ("appletv", "iphone", "ipod", "ipad", "watch")
- is_macos = sys.platform == "darwin" and not machine().lower().startswith(_apple_devices)
- 
- ext_modules = []
--if is_macos or os.getenv("FORCE_MACOS_MACHINE", "0") == "1":
-+if False:
-     ext_modules = [
-         Extension(
-             name="_watchdog_fsevents",
-diff --git a/tests/utils.py b/tests/utils.py
-index 00dcf40..9fbc42a 100644
---- a/tests/utils.py
-+++ b/tests/utils.py
-@@ -15,8 +15,6 @@ Emitter: Type[EventEmitter]
- if sys.platform.startswith("linux"):
-     from watchdog.observers.inotify import InotifyEmitter as Emitter
-     from watchdog.observers.inotify import InotifyFullEmitter
--elif sys.platform.startswith("darwin"):
--    from watchdog.observers.fsevents import FSEventsEmitter as Emitter
- elif sys.platform.startswith("win"):
-     from watchdog.observers.read_directory_changes import WindowsApiEmitter as Emitter
- elif sys.platform.startswith(("dragonfly", "freebsd", "netbsd", "openbsd", "bsd")):
diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix
index ab2f3c730ea5..16987cee2cd1 100644
--- a/pkgs/development/python-modules/weasel/default.nix
+++ b/pkgs/development/python-modules/weasel/default.nix
@@ -39,9 +39,7 @@ buildPythonPackage rec {
     "typer"
   ];
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     cloudpathlib
@@ -70,10 +68,10 @@ buildPythonPackage rec {
 
   meta = {
     description = "Small and easy workflow system";
-    mainProgram = "weasel";
     homepage = "https://github.com/explosion/weasel/";
     changelog = "https://github.com/explosion/weasel/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "weasel";
   };
 }
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 2652a524678c..bc6c57e94083 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "weasyprint";
-  version = "62.2";
+  version = "62.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "weasyprint";
-    hash = "sha256-oIrEAOEZGdmW12vsqjMWDXwaxVuhYGKMQs51hldMGlE=";
+    hash = "sha256-jYaA1zL3+g/LxYdpKlpcsJXDUlYnBmkY1uIDy/Qrf80=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 506aa956bda6..e059e5bcabb7 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.8.0";
+  version = "4.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "weaviate";
     repo = "weaviate-python-client";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JVn9Xhq7MJD+o6DA/EaW1NNnvsjjqyW+pmFctuQStgo=";
+    hash = "sha256-HSLU9OQMEOCwgxtLj20yJ0Xo9c6SVfMhfVT/F5du17A=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix
index 21c7af1cfdbc..6f8287733b58 100644
--- a/pkgs/development/python-modules/webargs/default.nix
+++ b/pkgs/development/python-modules/webargs/default.nix
@@ -2,7 +2,8 @@
   buildPythonPackage,
   fetchPypi,
   lib,
-  isPy27,
+  pythonAtLeast,
+  flit-core,
   marshmallow,
   pytestCheckHook,
   pytest-aiohttp,
@@ -19,18 +20,17 @@
 
 buildPythonPackage rec {
   pname = "webargs";
-  version = "8.4.0";
-  format = "setuptools";
-  disabled = isPy27;
+  version = "8.6.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6pk2ghSkzmE5JL6Z1x21jCaWMele/0+gm3NU5S3ABqU=";
+    hash = "sha256-uNCYq5K9dMZZ7KcFr6MdaBR18hjLFcHlcnH6IQPAVHo=";
   };
 
-  pythonImportsCheck = [ "webargs" ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [ marshmallow ];
+  dependencies = [ marshmallow ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -46,6 +46,8 @@ buildPythonPackage rec {
     aiohttp
   ];
 
+  pythonImportsCheck = [ "webargs" ];
+
   meta = with lib; {
     description = "Declarative parsing and validation of HTTP request objects, with built-in support for popular web frameworks";
     homepage = "https://github.com/marshmallow-code/webargs";
diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix
index 93f2030755c0..4d24df46c213 100644
--- a/pkgs/development/python-modules/webcolors/default.nix
+++ b/pkgs/development/python-modules/webcolors/default.nix
@@ -9,17 +9,17 @@
 
 buildPythonPackage rec {
   pname = "webcolors";
-  version = "1.13";
-  format = "pyproject";
+  version = "24.8.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wiW2dMg/qSO+k9I1MwzgMANz0CiFzvIyOIE7DVZoMEo=";
+    hash = "sha256-CLB68oagG80w1YOnrK32KVg9H3m/7yfdLCxcJjgXJ30=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ unittestCheckHook ];
 
diff --git a/pkgs/development/python-modules/webexpythonsdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix
new file mode 100644
index 000000000000..fb14d7ab164c
--- /dev/null
+++ b/pkgs/development/python-modules/webexpythonsdk/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pyjwt,
+  pythonOlder,
+  requests,
+  requests-toolbelt,
+  poetry-core,
+  poetry-dynamic-versioning,
+}:
+
+buildPythonPackage rec {
+  pname = "webexpythonsdk";
+  version = "2.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "CiscoDevNet";
+    repo = "WebexPythonSDK";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ=";
+  };
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    pyjwt
+    requests
+    requests-toolbelt
+  ];
+
+  # Tests require a Webex Teams test domain
+  doCheck = false;
+
+  pythonImportsCheck = [ "webexpythonsdk" ];
+
+  meta = with lib; {
+    description = "Python module for Webex Teams APIs";
+    homepage = "https://github.com/WebexCommunity/WebexPythonSDK";
+    changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix
index 373f06b6d046..30eeb64d83a1 100644
--- a/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/pkgs/development/python-modules/webexteamssdk/default.nix
@@ -2,34 +2,41 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  future,
   pyjwt,
   pythonOlder,
   requests,
   requests-toolbelt,
-  poetry-core,
-  poetry-dynamic-versioning,
+  setuptools,
+  versioneer,
 }:
 
 buildPythonPackage rec {
   pname = "webexteamssdk";
-  version = "2.0.1";
+  version = "1.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "CiscoDevNet";
     repo = "webexteamssdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ=";
+    hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo=";
   };
 
+  postPatch = ''
+    # Remove vendorized versioneer
+    rm versioneer.py
+  '';
+
   build-system = [
-    poetry-core
-    poetry-dynamic-versioning
+    setuptools
+    versioneer
   ];
 
   dependencies = [
+    future
     pyjwt
     requests
     requests-toolbelt
@@ -38,13 +45,13 @@ buildPythonPackage rec {
   # Tests require a Webex Teams test domain
   doCheck = false;
 
-  pythonImportsCheck = [ "webexpythonsdk" ];
+  pythonImportsCheck = [ "webexteamssdk" ];
 
   meta = with lib; {
     description = "Python module for Webex Teams APIs";
     homepage = "https://github.com/CiscoDevNet/webexteamssdk";
     changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
-    license = licenses.mit;
+    license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix
index 1c9b23853f9c..a8f24fa0a1fe 100644
--- a/pkgs/development/python-modules/weblate-language-data/default.nix
+++ b/pkgs/development/python-modules/weblate-language-data/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "weblate-language-data";
-  version = "2024.8";
+  version = "2024.13";
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_language_data";
     inherit version;
-    hash = "sha256-JwX3mDq6AbWorqc3nYlm1oySvzuu3IV6iBeS0ezx83U=";
+    hash = "sha256-fAT3dI3Tbu329BWaal/n4ka0JSVDzPrJLnzL7/LRjhs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix
new file mode 100644
index 000000000000..5b2524dc0bc5
--- /dev/null
+++ b/pkgs/development/python-modules/webrtc-models/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  mashumaro,
+  orjson,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "webrtc-models";
+  version = "0.2.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.12";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "python-webrtc-models";
+    rev = "refs/tags/${version}";
+    hash = "sha256-6fVcp9kWr5nV4wOKov3ObqyPJo+u3jN443qv++sJ0TQ=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
+  pythonRelaxDeps = [ "orjson" ];
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    mashumaro
+    orjson
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "webrtc_models" ];
+
+  meta = {
+    description = "WebRTC models as Python dataclasses with mashumaro";
+    homepage = "https://github.com/home-assistant-libs/python-webrtc-models";
+    changelog = "https://github.com/home-assistant-libs/python-webrtc-models/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix
index 3df09891253d..45f2d805aa40 100644
--- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix
+++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "webrtc-noise-gain";
-  version = "1.2.4";
+  version = "1.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "webrtc-noise-gain";
-    rev = "v${version}";
-    hash = "sha256-ALRdj9zBcx05DcSKjAI0oEPruTD/p+pQ0kcqqyHl37A=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GbdG2XM11zgPk2VZ0mu7qMv256jaMyJDHdBCBUnynMY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
index b69dfcb58509..dbaae49890b5 100644
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   version = "1.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "websocket_client";
@@ -21,9 +21,14 @@ buildPythonPackage rec {
     hash = "sha256-Mjnfn0TaYy+WASRygF1AojKBqZECfOEdL0Wm8krEw9o=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ python-socks ];
+  optional-dependencies = {
+    optional = [
+      python-socks
+      # wsaccel is not available at the moment
+    ];
+  };
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -31,10 +36,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Websocket client for Python";
-    mainProgram = "wsdump";
     homepage = "https://github.com/websocket-client/websocket-client";
     changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "wsdump";
   };
 }
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 918cb54ae5a6..658d69ea942d 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -10,19 +10,19 @@
 
 buildPythonPackage rec {
   pname = "websockets";
-  version = "12.0";
+  version = "13.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "aaugustin";
-    repo = pname;
+    repo = "websockets";
     rev = "refs/tags/${version}";
-    hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg=";
+    hash = "sha256-Y0HDZw+H7l8+ywLLzFk66GNDCI0uWOZYypG86ozLo7c=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   patchPhase =
     ''
@@ -52,6 +52,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ unittestCheckHook ];
 
+  preCheck = ''
+    # https://github.com/python-websockets/websockets/issues/1509
+    export WEBSOCKETS_TESTS_TIMEOUT_FACTOR=100
+  '';
+
   # Tests fail on Darwin with `OSError: AF_UNIX path too long`
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index 15a36b3dc8f1..da51af3e701b 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -3,7 +3,7 @@
   beautifulsoup4,
   buildPythonPackage,
   fetchPypi,
-  fetchpatch,
+  setuptools,
   pastedeploy,
   pyquery,
   pytestCheckHook,
@@ -16,27 +16,19 @@
 
 buildPythonPackage rec {
   pname = "webtest";
-  version = "3.0.0";
-  format = "setuptools";
+  version = "3.0.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    pname = "WebTest";
-    inherit version;
-    hash = "sha256-VL2WlyWDjZhhqfon+Nlx950nXZSuJV9cUB9Tu22ZKes=";
+    inherit pname version;
+    hash = "sha256-STtcgC+JSKZbXjoa1bJSTuXhq2DNcT2aPaO42ggsBv4=";
   };
 
-  patches = [
-    (fetchpatch {
-      # Replace deprecated unittest aliases for Python 3.12
-      name = "webtest-python312-compat.patch";
-      url = "https://github.com/Pylons/webtest/commit/d82ec5bd2cf3c7109a1d49ad9fa802ae1eae1763.patch";
-      hash = "sha256-hSwxAxAI3Eo28I8S+r2k/hFG8TlzrVYup3MuTsE+xXk=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     six
     waitress
diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index bdbd57513c56..a3380e20b553 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect-mqtt";
-  version = "0.48.4";
+  version = "0.49.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ=";
+    hash = "sha256-jTScDPTj7aIQcGuL2g8MvuYln6iaj6abEyCfd8vvT2I=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix
index e644d156edb0..d8823b927bb0 100644
--- a/pkgs/development/python-modules/west/default.nix
+++ b/pkgs/development/python-modules/west/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   buildPythonPackage,
+  setuptools,
   colorama,
-  configobj,
   fetchPypi,
   packaging,
   pykwalify,
@@ -12,19 +12,20 @@
 
 buildPythonPackage rec {
   pname = "west";
-  version = "1.2.0";
-  format = "setuptools";
+  version = "1.3.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tB5RrJA5OUT5wB974nAA1LMpYVt+0HT7DvaTtGRoEpc=";
+    hash = "sha256-iTIANL6HCZ0W519HYKwNHtZ+iXiSjkaKuZPj+6DP6S8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     colorama
-    configobj
     packaging
     pyyaml
     pykwalify
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 754223e49adf..4c7a5b3dc288 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "wheel";
-  version = "0.43.0";
+  version = "0.44.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pypa";
-    repo = pname;
+    repo = "wheel";
     rev = "refs/tags/${version}";
-    hash = "sha256-cATYN7GtS1l3GxcqBl95RsBTuszWoFB9CtuRgUSL0/A=";
+    hash = "sha256-IFJ411H5nItR8gA5R0AYXFs3n6e1SLo2VoMOqgvDnnk=";
     postFetch = ''
       cd $out
       mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \
diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix
index 9f6e763a149a..8fe5daca8738 100644
--- a/pkgs/development/python-modules/whenever/default.nix
+++ b/pkgs/development/python-modules/whenever/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "whenever";
-  version = "0.6.9";
+  version = "0.6.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,12 +29,12 @@ buildPythonPackage rec {
     owner = "ariebovenberg";
     repo = "whenever";
     rev = "refs/tags/${version}";
-    hash = "sha256-Y2+ZQhQpUf747OlzhQRdT1B3jZgCr0BViJ6ujPJWo3w=";
+    hash = "sha256-fvLqdjbTuQ732qeVUu1f3dXXlFOuP9FGexEt4gZe0aI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-B1weEmW+Q7VxwnLxv9QH75I6IgEICTd70ci/I14ehLY=";
+    hash = "sha256-KWB0PRYKiGNBUKYZn8bCHUjh+oFe818PgKtPdNy1CZA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix
index 346083ef81a1..ad550eafe520 100644
--- a/pkgs/development/python-modules/whispers/default.nix
+++ b/pkgs/development/python-modules/whispers/default.nix
@@ -13,12 +13,14 @@
   pytestCheckHook,
   pythonOlder,
   pyyaml,
+  wrapt,
+  semgrep,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "whispers";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +29,7 @@ buildPythonPackage rec {
     owner = "adeptex";
     repo = "whispers";
     rev = "refs/tags/${version}";
-    hash = "sha256-YPfTe2txQY/sVEIGSMTA1b3Ye3j8qT+YdWp3AVqpdLI=";
+    hash = "sha256-tjDog8+oWTNuK1eK5qUEFspiilB0riUSTX5ugTIiP3M=";
   };
 
   postPatch = ''
@@ -35,6 +37,12 @@ buildPythonPackage rec {
       --replace-fail '"pytest-runner"' ""
   '';
 
+  pythonRelaxDeps = [
+    "lxml"
+    "pyyaml"
+    "semgrep"
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -46,6 +54,8 @@ buildPythonPackage rec {
     luhn
     lxml
     pyyaml
+    wrapt
+    semgrep
   ];
 
   nativeCheckInputs = [
@@ -53,7 +63,16 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # pinning tests highly sensitive to semgrep version
+    "tests/unit/plugins/test_semgrep.py"
+  ];
+
   preCheck = ''
+    # pinning test highly sensitive to semgrep version
+    substituteInPlace tests/unit/test_main.py \
+      --replace-fail '("--ast", 421),' ""
+
     # Some tests need the binary available in PATH
     export PATH=$out/bin:$PATH
   '';
diff --git a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix
new file mode 100644
index 000000000000..4d48ed10846f
--- /dev/null
+++ b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  sqlalchemy,
+  wtforms,
+}:
+
+buildPythonPackage rec {
+  pname = "wtforms-sqlalchemy";
+  version = "0.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "wtforms";
+    repo = "wtforms-sqlalchemy";
+    rev = version;
+    hash = "sha256-uR09LYfcyre+AC2TTEIhpjSI7y4Yo0GJ20smkzo5PRY=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    sqlalchemy
+    wtforms
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "wtforms_sqlalchemy" ];
+
+  meta = {
+    description = "WTForms integration for SQLAlchemy";
+    homepage = "https://github.com/wtforms/wtforms-sqlalchemy";
+    changelog = "https://github.com/wtforms/wtforms-sqlalchemy/blob/${version}/CHANGES.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
index 99cd521f6c5c..fc509b20132b 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "wtforms";
-  version = "3.1.2";
+  version = "3.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "wtforms";
     repo = "wtforms";
     rev = "refs/tags/${version}";
-    hash = "sha256-L6DmB7iVpJR775oRxuEkCKWlUJnmw8VPZTr2dZbqeEc=";
+    hash = "sha256-jwjP/wkk8MdNJbPE8MlkrH4DyR304Ju41nN4lMo3jFs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/xarray-datatree/default.nix b/pkgs/development/python-modules/xarray-datatree/default.nix
deleted file mode 100644
index 1d99f300cb7b..000000000000
--- a/pkgs/development/python-modules/xarray-datatree/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  check-manifest,
-  setuptools,
-  setuptools-scm,
-  packaging,
-  pytestCheckHook,
-  xarray,
-  zarr,
-}:
-
-buildPythonPackage rec {
-  pname = "datatree";
-  version = "0.0.14";
-  pyproject = true;
-
-  disabled = pythonOlder "3.9";
-
-  src = fetchFromGitHub {
-    owner = "xarray-contrib";
-    repo = "datatree";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-C6+WcHc2+sftJ5Yyh/9TTIHhAEwhAqSsSkaDwtq7J90=";
-  };
-
-  build-system = [
-    check-manifest
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies = [
-    packaging
-    xarray
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    zarr
-  ];
-
-  pythonImportsCheck = [ "datatree" ];
-
-  disabledTests = [
-    # output formatting issue, likely due to underlying library version difference:
-    "test_diff_node_data"
-  ];
-
-  meta = with lib; {
-    description = "Tree-like hierarchical data structure for xarray";
-    homepage = "https://xarray-datatree.readthedocs.io";
-    changelog = "https://github.com/xarray-contrib/datatree/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bcdarwin ];
-  };
-}
diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix
index b82a8a8cd79f..db1b1c5504b1 100644
--- a/pkgs/development/python-modules/xarray-einstats/default.nix
+++ b/pkgs/development/python-modules/xarray-einstats/default.nix
@@ -14,34 +14,40 @@
 
 buildPythonPackage rec {
   pname = "xarray-einstats";
-  version = "0.7.0";
-  format = "pyproject";
+  version = "0.8.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "arviz-devs";
-    repo = pname;
+    repo = "xarray-einstats";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aljjwgBJp341aQN3g1PoZPj+46x21Eu+svG1yzURhJE=";
+    hash = "sha256-XvxsyH8cwsA9B36uhM1Pr5XaNd0d0/nEamA4axdJe24=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     scipy
     xarray
   ];
 
-  nativeCheckInputs = [
-    einops
-    numba
-    pytestCheckHook
-  ];
+  optional-dependencies = {
+    einops = [ einops ];
+    numba = [ numba ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "xarray_einstats" ];
 
+  disabledTests = [
+    # TypeError
+    "test_pinv"
+  ];
+
   meta = with lib; {
     description = "Stats, linear algebra and einops for xarray";
     homepage = "https://github.com/arviz-devs/xarray-einstats";
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 2696b2574326..96540a3484b6 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "2024.09.0";
+  version = "2024.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "pydata";
     repo = "xarray";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZrqdpzcNjZMxET355PRWQaUPjvFm+m2y71F7qt8DCjg=";
+    hash = "sha256-s5MvHp2OkomD3xNYzj9oKlVLMgHZDQRBJM6vgOAv1jQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/xboxapi/default.nix b/pkgs/development/python-modules/xboxapi/default.nix
index b100259cea6b..3441760693ab 100644
--- a/pkgs/development/python-modules/xboxapi/default.nix
+++ b/pkgs/development/python-modules/xboxapi/default.nix
@@ -2,23 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  requests,
   pytestCheckHook,
+  requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "xboxapi";
   version = "2.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mKeRix";
     repo = "xboxapi-python";
-    rev = version;
-    sha256 = "10mhvallkwf5lw91hj5rv16sziqhhjq7sgcgr28sqqnlgjnyazdd";
+    rev = "refs/tags/${version}";
+    hash = "sha256-rX3lrXzUYqyRyI89fbCEEMevTdi5SBgSp8XxSanasII=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -27,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python XBOX One API wrapper";
     homepage = "https://github.com/mKeRix/xboxapi-python";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix
index fa8aa9860de3..5c376c3db440 100644
--- a/pkgs/development/python-modules/xdg-base-dirs/default.nix
+++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Implementation of the XDG Base Directory Specification in Python";
     homepage = "https://github.com/srstevenson/xdg-base-dirs";
-    changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${src.rev}";
+    changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${version}";
     license = licenses.isc;
     maintainers = with maintainers; [ figsoda ];
   };
diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 69c7583c9eac..b23be6f21314 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -5,6 +5,7 @@
   pythonOlder,
   fetchFromGitHub,
   which,
+  setuptools,
   # runtime dependencies
   numpy,
   torch,
@@ -29,25 +30,27 @@
 }:
 let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
-  version = "0.0.23.post1";
+  version = "0.0.28.post3";
 in
 buildPythonPackage {
   pname = "xformers";
   inherit version;
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "xformers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY=";
+    hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw=";
     fetchSubmodules = true;
   };
 
   patches = [ ./0001-fix-allow-building-without-git.patch ];
 
+  build-system = [ setuptools ];
+
   preBuild = ''
     cat << EOF > ./xformers/version.py
     # noqa: C801
@@ -81,7 +84,7 @@ buildPythonPackage {
     which
   ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]);
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     torch
   ];
@@ -115,7 +118,7 @@ buildPythonPackage {
   ];
 
   meta = with lib; {
-    description = "XFormers: A collection of composable Transformer building blocks";
+    description = "Collection of composable Transformer building blocks";
     homepage = "https://github.com/facebookresearch/xformers";
     changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index eeb1b6ce3373..76db9d97263a 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -3,7 +3,6 @@
   arabic-reshaper,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   html5lib,
   pillow,
   pyhanko,
@@ -19,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "xhtml2pdf";
-  version = "0.2.15";
+  version = "0.2.16";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,25 +27,14 @@ buildPythonPackage rec {
     owner = "xhtml2pdf";
     repo = "xhtml2pdf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JXxh/n1kUsy3O4P/6WTfa5p+mYy/t4ZBUhlHp+ypoQc=";
+    hash = "sha256-sva1Oqz4FsLz/www8IPVxol3D0hx5F5hQ0I/rSRP9sE=";
   };
 
-  patches = [
-    # https://github.com/xhtml2pdf/xhtml2pdf/pull/754
-    (fetchpatch2 {
-      name = "reportlab-compat.patch";
-      url = "https://github.com/xhtml2pdf/xhtml2pdf/commit/1252510bd23b833b45b4d252aeac62c1eb51eeef.patch";
-      hash = "sha256-9Fkn086uh2biabmiChbBna8Q4lJV/604yX1ng9j5TGs=";
-    })
-  ];
-
-  nativeBuildInputs = [
+  build-system = [
     setuptools
   ];
 
-  pythonRelaxDeps = [ "reportlab" ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     arabic-reshaper
     html5lib
     pillow
@@ -71,12 +59,12 @@ buildPythonPackage rec {
     "xhtml2pdf.pisa"
   ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
     description = "PDF generator using HTML and CSS";
     homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
-    changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
     mainProgram = "xhtml2pdf";
+    maintainers = with lib.maintainers; [ drupol ];
   };
 }
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 89323aa8d720..eb3472bce0f9 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -14,16 +14,16 @@
 
 buildPythonPackage rec {
   pname = "xknx";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "XKNX";
     repo = "xknx";
     rev = "refs/tags/${version}";
-    hash = "sha256-hgCmzWncHTsvfVeU/ePpu59THtmuLlqeCO11/L4BRvM=";
+    hash = "sha256-FLGOY7IUdLvRbwSWUYbJl0VzOCJVwiG+2C+CjFAqI6g=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 8f6dd390ad7a..1119a300b541 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "3.23.2";
+  version = "3.24.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "ietf-tools";
     repo = "xml2rfc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KL3kIntydUAOS7qGq6ZDrShEcyME1Qwf2VjM/9mw96Q=";
+    hash = "sha256-cymClLsXPeuWsRMbFJHO55ASzEbau++XvYoBsquDv+Y=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 660f520c246b..6f10a4962c31 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xmlschema";
-  version = "3.4.2";
+  version = "3.4.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0x8nk8F+kg5SSDQI4dOnv67ilyN4z2MZ5phPC3PW4WQ=";
+    hash = "sha256-7RA9lQwuty8aZghwTKNbU+oL+BATH2FVIRQBe9fIpHI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix
index 96c32ac9349a..e83779c85a80 100644
--- a/pkgs/development/python-modules/xsdata/default.nix
+++ b/pkgs/development/python-modules/xsdata/default.nix
@@ -19,16 +19,16 @@
 
 buildPythonPackage rec {
   pname = "xsdata";
-  version = "24.9";
+  version = "24.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "tefra";
     repo = "xsdata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wQSrdAS4E6AmpP+pKviFomLrcSHLROhTWHg/hYGTaeQ=";
+    hash = "sha256-hyNC9VcWkGnOYm6BpXgH3RzmHTqBVmQoADvcEvgF6yg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix
index 3108d6f4ef5f..66a162f4f266 100644
--- a/pkgs/development/python-modules/xxhash/default.nix
+++ b/pkgs/development/python-modules/xxhash/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "xxhash";
-  version = "3.4.1";
+  version = "3.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-A3nWzx/5h81CFgmiZM4CXnTzRuPhRd0QbAzC4+w/mak=";
+    hash = "sha256-hPLK3flRycv43C4iqJ1Mz12GORrGQY/oHjxn0M9gtF8=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix
index 634914a18c30..2120be04acc9 100644
--- a/pkgs/development/python-modules/yappi/default.nix
+++ b/pkgs/development/python-modules/yappi/default.nix
@@ -5,28 +5,33 @@
   gevent,
   python,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "yappi";
-  version = "1.6.0";
-  format = "setuptools";
+  version = "1.6.4";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sumerc";
-    repo = pname;
+    repo = "yappi";
     rev = "refs/tags/${version}";
-    hash = "sha256-zA4apOGyrbjBOxUKBARiKmmM9rSVFVGWsDpOaItOoLU=";
+    hash = "sha256-3lGbFDu7sk83KrSHo6qZxHT2dxPWtT8yfXXQO1GbteU=";
   };
 
   patches = [ ./tests.patch ];
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ gevent ];
 
   checkPhase = ''
+    runHook preCheck
     ${python.interpreter} run_tests.py
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "yappi" ];
diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix
index 3bf6ba1b7546..87cd9ffcee7f 100644
--- a/pkgs/development/python-modules/yaramod/default.nix
+++ b/pkgs/development/python-modules/yaramod/default.nix
@@ -5,10 +5,10 @@
   fetchFromGitHub,
   pytestCheckHook,
   libxcrypt,
-  pythonOlder,
   gtest,
   pybind11,
   nlohmann_json,
+  setuptools,
 }:
 
 let
@@ -21,16 +21,14 @@ let
 in
 buildPythonPackage rec {
   pname = "yaramod";
-  version = "4.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "4.0.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "avast";
-    repo = pname;
+    repo = "yaramod";
     rev = "refs/tags/v${version}";
-    hash = "sha256-YbsNFtDk5u5UyTsS1aGKUv/HWYxEwERinZ3G84/mC9o=";
+    hash = "sha256-EkGG3J84mTFnor1YX9B1TyjvW6mCCF/AH904DaVX+VU=";
   };
 
   postPatch = ''
@@ -48,12 +46,16 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cmake
     pog
-    gtest
   ];
 
-  setupPyBuildFlags = [ "--with-unit-tests" ];
+  build-system = [ setuptools ];
 
-  checkInputs = [ pytestCheckHook ];
+  env.ENV_YARAMOD_BUILD_WITH_UNIT_TESTS = true;
+
+  nativeCheckInputs = [
+    gtest
+    pytestCheckHook
+  ];
 
   pytestFlagsArray = [ "tests/" ];
 
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 0fd0f0ae6898..356e3f792639 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -1,45 +1,43 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
   cython,
   expandvars,
   setuptools,
   idna,
   multidict,
-  typing-extensions,
+  pytest-cov-stub,
   pytest-xdist,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.9.4";
+  version = "1.13.1";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Vm24ZxfPgIC5m1iwg7dzqQiuQPBmgeh+WJqXb6+CRr8=";
+  src = fetchFromGitHub {
+    owner = "aio-libs";
+    repo = "yarl";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-I6/c5Q6/SRw8PIW4rPLKhVRVPRIC+n+Cz+UrKn5Pv/0=";
   };
 
-  postPatch = ''
-    sed -i '/cov/d' pytest.ini
-  '';
-
-  nativeBuildInputs = [
+  build-system = [
     cython
     expandvars
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     idna
     multidict
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];
 
   preCheck = ''
     # don't import yarl from ./ so the C extension is available
@@ -47,6 +45,7 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
+    pytest-cov-stub
     pytest-xdist
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix
index e66d8fc3cd45..40ad8de8ef30 100644
--- a/pkgs/development/python-modules/yaspin/default.nix
+++ b/pkgs/development/python-modules/yaspin/default.nix
@@ -11,21 +11,25 @@
 
 buildPythonPackage rec {
   pname = "yaspin";
-  version = "3.0.1";
-  format = "pyproject";
+  version = "3.1.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pavdmyt";
-    repo = pname;
+    repo = "yaspin";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cYTCJyHZ9yNg6BfpZ+g3P0yMWFhYUxgYtlbANNgfohQ=";
+    hash = "sha256-4IWaAPqzGri7V8X2gL607F5GlWfIFDlBBpDwSe4sz9I=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ termcolor ];
+  dependencies = [ termcolor ];
+
+  pythonRelaxDeps = [
+    "termcolor"
+  ];
 
   nativeCheckInputs = [
     pytest-xdist
diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix
index bbf2a0605cc2..5fcd36765519 100644
--- a/pkgs/development/python-modules/yattag/default.nix
+++ b/pkgs/development/python-modules/yattag/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "yattag";
-  version = "1.15.2";
+  version = "1.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qtn1QL0i3FA+W1UGzEeFb6zwgapx/TX3JzcbY+HkAr8=";
+    hash = "sha256-CXgke5dU2fRONwPGQ3Srn6hy0Y3pWsV3L9/dPD8NBwY=";
   };
 
   pythonImportsCheck = [ "yattag" ];
diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix
index 74be2546c623..334261463c62 100644
--- a/pkgs/development/python-modules/ydata-profiling/default.nix
+++ b/pkgs/development/python-modules/ydata-profiling/default.nix
@@ -1,54 +1,59 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, pytestCheckHook
-, dacite
-, htmlmin
-, imagehash
-, jinja2
-, matplotlib
-, multimethod
-, numba
-, numpy
-, pandas
-, phik
-, pyarrow
-, pydantic
-, pyyaml
-, requests
-, scipy
-, seaborn
-, statsmodels
-, tqdm
-, typeguard
-, visions
-, wordcloud
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  pytestCheckHook,
+  dacite,
+  htmlmin,
+  imagehash,
+  jinja2,
+  matplotlib,
+  multimethod,
+  numba,
+  numpy,
+  pandas,
+  phik,
+  pyarrow,
+  pydantic,
+  pyyaml,
+  requests,
+  scipy,
+  setuptools,
+  seaborn,
+  statsmodels,
+  tqdm,
+  typeguard,
+  visions,
+  wordcloud,
 }:
 
 buildPythonPackage rec {
   pname = "ydata-profiling";
-  version = "4.11.0";
+  version = "4.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ydataai";
-    repo = pname;
+    repo = "ydata-profiling";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA=";
+    hash = "sha256-G1qW6HcJi176nfxOBGBK2tLyY/Nnz9STYpZWluWvhP0=";
   };
 
   preBuild = ''
     echo ${version} > VERSION
   '';
 
+  build-system = [ setuptools ];
+
   pythonRelaxDeps = [
+    "imagehash"
     "scipy"
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dacite
     htmlmin
     imagehash
@@ -72,9 +77,10 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     pyarrow
+    pytestCheckHook
   ];
+
   disabledTestPaths = [
     # needs Spark:
     "tests/backends/spark_backend"
@@ -84,6 +90,7 @@ buildPythonPackage rec {
     "tests/unit/test_dataset_schema.py"
     "tests/unit/test_modular.py"
   ];
+
   disabledTests = [
     # try to download data:
     "test_decorator"
@@ -92,9 +99,7 @@ buildPythonPackage rec {
     "test_urls"
   ];
 
-  pythonImportsCheck = [
-    "ydata_profiling"
-  ];
+  pythonImportsCheck = [ "ydata_profiling" ];
 
   meta = with lib; {
     description = "Create HTML profiling reports from Pandas DataFrames";
diff --git a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch
index 73aadac9a3de..a1bc6fd92cc6 100644
--- a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch
+++ b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch
@@ -1,16 +1,33 @@
 diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py
-index d2aeab3..c706277 100644
+index 8db9c5f..9ad6618 100644
 --- a/lib/youseedee/__init__.py
 +++ b/lib/youseedee/__init__.py
-@@ -29,10 +29,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip"
- 
+@@ -38,12 +38,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip"
  
  def ucd_dir():
--    ucddir = os.path.expanduser("~/.youseedee")
--    if not os.path.isdir(ucddir):
+     """Return the directory where Unicode data is stored"""
+-    ucddir = expanduser("~/.youseedee")
+-    try:
 -        os.mkdir(ucddir)
+-    except FileExistsError:
+-        pass
 -    return ucddir
 +    return "@ucd_dir@"
  
  
+ def up_to_date():
+@@ -65,14 +60,6 @@ def up_to_date():
+ 
  def ensure_files():
+     """Ensure the Unicode data files are downloaded and up to date, and download them if not"""
+-    if not os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")):
+-        download_files()
+-    if not up_to_date():
+-        # Remove the zip if it exists
+-        zip_path = os.path.join(ucd_dir(), "UCD.zip")
+-        if os.path.isfile(zip_path):
+-            os.unlink(zip_path)
+-        download_files()
+     return
+ 
+ 
diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix
index afecf5a932c6..e35be6b56568 100644
--- a/pkgs/development/python-modules/youseedee/default.nix
+++ b/pkgs/development/python-modules/youseedee/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   fetchPypi,
   substituteAll,
+  setuptools,
+  setuptools-scm,
   filelock,
   requests,
   unicode-character-database,
@@ -10,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "youseedee";
-  version = "0.5.3";
-  format = "setuptools";
+  version = "0.6.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hQkI8kdropLiO86LXDy6eQma3FEg48gLldU7bFg9dzI=";
+    hash = "sha256-9w6yr28zq0LgOvMp5fCFaHGOwK4wbbDo/g1jH4Uky0E=";
   };
 
   patches = [
@@ -27,7 +29,12 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     filelock
     requests
   ];
@@ -35,7 +42,7 @@ buildPythonPackage rec {
   # Package has no unit tests, but we can check an example as per README.rst:
   checkPhase = ''
     runHook preCheck
-    python -m youseedee 0x078A | grep -q "'Block': 'Thaana'"
+    python -m youseedee 0x078A | grep -qE "Block\s+Thaana"
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index 06612b963230..75b05e352d0e 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -26,13 +26,19 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "yowsup";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
   };
 
   pythonRelaxDeps = true;
   pythonRemoveDeps = [ "argparse" ];
 
+  env = {
+    # make protobuf compatible with old versions
+    # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -45,11 +51,11 @@ buildPythonPackage rec {
     six
   ] ++ lib.optionals (!pythonOlder "3.12") [ pyasyncore ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/tgalal/yowsup";
     description = "Python WhatsApp library";
     mainProgram = "yowsup-cli";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index 131aef003b2d..cc38c78b3c48 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -1,47 +1,56 @@
 {
   lib,
-  asciitree,
   buildPythonPackage,
-  fasteners,
   fetchPypi,
-  numcodecs,
-  msgpack,
-  numpy,
-  pytestCheckHook,
   pythonOlder,
+
+  # build-system
   setuptools-scm,
+
+  # dependencies
+  asciitree,
+  numpy,
+  fasteners,
+  numcodecs,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "zarr";
-  version = "2.18.2";
+  version = "2.18.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-m7OTuKCjj7Eh27kTsEfXXbKN6YkPbWRKIXpzz0rnT0c=";
+    hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     asciitree
     numpy
     fasteners
     numcodecs
   ] ++ numcodecs.optional-dependencies.msgpack;
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "zarr" ];
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of chunked, compressed, N-dimensional arrays for Python";
     homepage = "https://github.com/zarr-developers/zarr";
     changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
   };
 }
diff --git a/pkgs/development/python-modules/zcbor/default.nix b/pkgs/development/python-modules/zcbor/default.nix
index 7ff878f490d8..cec36ddc61fa 100644
--- a/pkgs/development/python-modules/zcbor/default.nix
+++ b/pkgs/development/python-modules/zcbor/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "zcbor";
-  version = "0.8.1";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-U3Y/r3tBhzK6bGnMxdqKzS7bLHyAzgpGZ5PVK9pw7Pk=";
+    hash = "sha256-dm/gPFQaeQOrz5tcqqgCt4d4dh188QVjL4r8isXgiWY=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 67bee46658f6..139d4ba8ea54 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -22,13 +22,14 @@
   requests-toolbelt,
   requests-file,
   requests-mock,
+  setuptools,
   xmlsec,
 }:
 
 buildPythonPackage rec {
   pname = "zeep";
-  version = "4.2.1";
-  format = "setuptools";
+  version = "4.3.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -36,10 +37,12 @@ buildPythonPackage rec {
     owner = "mvantellingen";
     repo = "python-zeep";
     rev = "refs/tags/${version}";
-    hash = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY=";
+    hash = "sha256-Bt0QqzJMKPXV91hZYETy9DKoQAELUWlYIh8w/IFTE8E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     attrs
     defusedxml
     isodate
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index b06ccc46b0ad..e9910213140e 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.135.0";
+  version = "0.136.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jstasiak";
     repo = "python-zeroconf";
     rev = "refs/tags/${version}";
-    hash = "sha256-3zUY9zOmC2avR7rO5O22lqqEY5ql612fRutbGl7SYKs=";
+    hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 05040663a579..8946613f81b9 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.122";
+  version = "0.0.124";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha-device-handlers";
     rev = "refs/tags/${version}";
-    hash = "sha256-/xxMcZPwIL76F+E3Rp0/VtzFOrk7e4i1knf/OIAf+48=";
+    hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 1847b2c49d8e..2da990de3650 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.34";
+  version = "0.0.37";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     rev = "refs/tags/${version}";
-    hash = "sha256-or4mZpfcVl7fTf8O1vBxEeeJvhYNgrlV+FClrzQG/lg=";
+    hash = "sha256-PY4TJIG5NtJdQuQYmoZG3NgcH3WfCkpkcoJTbJ5jdr0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index 04b8efb6f27f..edbba6c73050 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   pyserial,
   pyserial-asyncio,
   pytest-asyncio,
@@ -14,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-deconz";
-  version = "0.23.3";
+  version = "0.24.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,20 +22,13 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k=";
+    hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/zigpy/zigpy-deconz/commit/86fdcd6be824f12ce3bf88b40217a6224cbf5a89.patch";
-      hash = "sha256-iqpTSJPBMSBZXg5EVXXupxIFRsGCNuxU/oNHZ2VT0Jc=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "setuptools-git-versioning<2"' "" \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 0a3c11635f48..449632991f89 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-xbee";
-  version = "0.20.2";
+  version = "0.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy-xbee";
     rev = "refs/tags/${version}";
-    hash = "sha256-d5TOX2sKA2E6b6KHvAdhxEknD6fOF4qRjCMpBKEsicA=";
+    hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index fc7d291bd2a9..a48feefb0730 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.13.1";
+  version = "0.13.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy-zigate";
     rev = "refs/tags/${version}";
-    hash = "sha256-Mwccb0OQgSknH8prbFejkGRVI7ii/r9D87aRyQrGgWs=";
+    hash = "sha256-MlAX7dcRZziMYCpG64OemZ8czwvDXpdoRaDVo1sUCno=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 98a7661f0483..628a688f0875 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-znp";
-  version = "0.12.4";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4=";
+    hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 9edb65707b9f..f20c1a004406 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.67.0";
+  version = "0.71.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-06RKvKOXMhq6LwKSk451cR7EUW+78AZzWsrqSMgq02E=";
+    hash = "sha256-ctlbCtUiwLFlxja9F6Fz7m9FP/lJLS+7/+gWlMTo+1s=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix
index 07185aa568f4..273606c8f3a6 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/pkgs/development/python-modules/zipp/default.nix
@@ -11,14 +11,14 @@
 let
   zipp = buildPythonPackage rec {
     pname = "zipp";
-    version = "3.19.2";
+    version = "3.20.2";
     format = "pyproject";
 
     disabled = pythonOlder "3.7";
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-vx3PZFD4c6E+lSopUEiHyJ5t51BiCeWxvMNGATXU3hk=";
+      hash = "sha256-vJ6yb0UG/aAbgbzeDKeBA7bmL5kbOB/sglQ1yDbtvCk=";
     };
 
     nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix
index b8f054c27840..fbc7038a49de 100644
--- a/pkgs/development/python-modules/zipstream-ng/default.nix
+++ b/pkgs/development/python-modules/zipstream-ng/default.nix
@@ -4,12 +4,13 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "zipstream-ng";
-  version = "1.7.1";
-  format = "setuptools";
+  version = "1.8.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -17,9 +18,11 @@ buildPythonPackage rec {
     owner = "pR0Ps";
     repo = "zipstream-ng";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BYQse+DlyLUH9CofRfGrPUZjP7E8AP/wpirvJmSRfow=";
+    hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "zipstream" ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index e9d90b93e4b9..6b0b0a97b584 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -3,25 +3,41 @@
   buildPythonPackage,
   pythonOlder,
   fetchPypi,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "4.0";
-  format = "setuptools";
+  version = "4.1.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6FutlWDWCSpjW+vueKQ7DxySamaRK+OQ6IyrZvTewYA=";
+    hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg=";
   };
 
-  # fails..
-  doCheck = false;
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "setuptools<74" "setuptools"
+  '';
+
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "zodbpickle" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  # fails..
+  disabledTests = [
+    "test_dump"
+    "test_dumps"
+    "test_load"
+    "test_loads"
+  ];
+
   meta = with lib; {
     description = "Fork of Python's pickle module to work with ZODB";
     homepage = "https://github.com/zopefoundation/zodbpickle";
diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix
index 958470fde845..cb204cc57753 100644
--- a/pkgs/development/python-modules/zope-proxy/default.nix
+++ b/pkgs/development/python-modules/zope-proxy/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "zope-proxy";
-  version = "5.2";
+  version = "5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "zope.proxy";
     inherit version;
-    hash = "sha256-93fVbCqy/PQNAmraHmfx45z2MY497rmhzVCH/MsfKG4=";
+    hash = "sha256-rSTSjrxq3p++vgzEvcTsUNHe5BpFPjMa/SoSYL6Wdgg=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
index e76b19f95c41..e902ea024198 100644
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "zstandard";
-  version = "0.22.0";
+  version = "0.23.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-giajPFQry1TNa9CjZgZ7YQtBcTtkyavsG8RTPWn1HnA=";
+    hash = "sha256-stjGLQjnJV9o96dAuuhbPJuOVGa6qcv39X8c3grGvAk=";
   };
 
   propagatedNativeBuildInputs = [ cffi ];
diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/python2-modules/README.md
new file mode 100644
index 000000000000..2d3a7cbb2b8e
--- /dev/null
+++ b/pkgs/development/python2-modules/README.md
@@ -0,0 +1,7 @@
+# Python 2 is Not Supported
+
+Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2 based package, you can include that package in your own local repository.
+
+Some packages may continue to be maintained for internal use by nixpkgs, but they should not be used by new public packages.
+
+For more details, see [Issue #201859](https://github.com/NixOS/nixpkgs/pull/201859).
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 708192d930ca..a7dfb55aba28 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -340,6 +340,7 @@ let
     animation = [ pkgs.which ];
     Apollonius = with pkgs; [ pkg-config gmp.dev mpfr.dev ];
     arrow = with pkgs; [ pkg-config cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ intltool ];
+    alcyon = with pkgs; [ cmake which ];
     audio = [ pkgs.portaudio ];
     BayesSAE = [ pkgs.gsl ];
     BayesVarSel = [ pkgs.gsl ];
@@ -425,6 +426,7 @@ let
     magick = [ pkgs.imagemagick.dev ];
     ModelMetrics = lib.optional stdenv.hostPlatform.isDarwin pkgs.llvmPackages.openmp;
     mvabund = [ pkgs.gsl ];
+    mcrPioda = [ pkgs.gsl ];
     mwaved = [ pkgs.fftw.dev ];
     mzR = with pkgs; [ zlib netcdf ];
     nanonext = with pkgs; [ mbedtls nng ];
@@ -455,6 +457,7 @@ let
     RcppGSL = [ pkgs.gsl ];
     RcppZiggurat = [ pkgs.gsl ];
     reprex = [ pkgs.which ];
+    resultant = with pkgs; [ gmp.dev mpfr.dev pkg-config ];
     rgdal = with pkgs; [ proj.dev gdal ];
     Rhisat2 = [ pkgs.which pkgs.hostname ];
     gdalcubes = [ pkgs.pkg-config ];
@@ -579,6 +582,7 @@ let
     RcppCWB = [ pkgs.pkg-config pkgs.pcre2 ];
     redux = [ pkgs.pkg-config ];
     rswipl = with pkgs; [ cmake pkg-config ];
+    scorematchingad = [ pkgs.cmake ];
     rrd = [ pkgs.pkg-config ];
     surveyvoi = [ pkgs.pkg-config ];
     Rbwa = [ pkgs.zlib.dev ];
@@ -643,9 +647,10 @@ let
     gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ];
     rsbml = [ pkgs.libsbml ];
     SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev];
+    ravetools = with pkgs; [ pkg-config fftw.dev];
     specklestar = [ pkgs.fftw.dev ];
     cartogramR = [ pkgs.fftw.dev ];
-    jqr = [ pkgs.jq.lib ];
+    jqr = [ pkgs.jq.out ];
     kza = [ pkgs.pkg-config ];
     igraph = with pkgs; [ gmp libxml2.dev glpk ];
     interpolation = [ pkgs.gmp ];
@@ -670,6 +675,7 @@ let
     Cairo = [ pkgs.pkg-config ];
     CLVTools = [ pkgs.gsl ];
     excursions = [ pkgs.gsl ];
+    OpenCL = with pkgs; [ opencl-clhpp ocl-icd ];
     gpuMagic = [ pkgs.ocl-icd ];
     JMcmprsk = [ pkgs.gsl ];
     KSgeneral = [ pkgs.fftw.dev ];
@@ -801,7 +807,7 @@ let
     sphereTessellation = with pkgs; [ gmp.dev mpfr.dev ];
     vapour = with pkgs; [ proj.dev gdal ];
     MedianaDesigner = [ pkgs.zlib.dev ];
-    ChemmineOB = [ pkgs.eigen ];
+    ChemmineOB = with pkgs; [ eigen openbabel ];
     DGP4LCF = [ pkgs.lapack pkgs.blas ];
   };
 
@@ -1049,10 +1055,11 @@ let
     });
 
     timeless = old.timeless.overrideAttrs (attrs: {
+      preConfigure = "patchShebangs configure";
       cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
         src = attrs.src;
         sourceRoot = "timeless/src/rust";
-        hash = "sha256-n0/52CV3NzWe7T3N6VoaURMxWrnqeYaUMPKkUy+LRQs=";
+        hash = "sha256-AccuRY3lfTXzaMnaYieKCEJErKo5132oSXgILbFhePI=";
       };
 
       cargoRoot = "src/rust";
@@ -1084,6 +1091,12 @@ let
         '';
     });
 
+    alcyon = old.alcyon.overrideAttrs (attrs: {
+      configureFlags = [
+        "--enable-force-openmp"
+      ];
+    });
+
     sf = old.sf.overrideAttrs (attrs: {
       configureFlags = [
         "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib"
@@ -1582,29 +1595,26 @@ let
       PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
     });
 
-    ChemmineOB = let
-      # R package doesn't compile with the latest (unstable) version.
-      # Override from nixpkgs-23.11
-      openbabel3 = pkgs.openbabel.overrideAttrs (attrs: {
-        version = "3.1.1";
-        src = pkgs.fetchFromGitHub {
-          owner = "openbabel";
-          repo = "openbabel";
-          rev = "openbabel-${lib.replaceStrings ["."] ["-"] attrs.version}";
-          sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY=";
-        };
-      });
-    in
-    old.ChemmineOB.overrideAttrs (attrs: {
+    ChemmineOB = old.ChemmineOB.overrideAttrs (attrs: {
       # pkg-config knows openbabel-3 without the .0
       # Eigen3 is also looked for in the wrong location
+      # pointer was changed in newer version of openbabel:
+      #   https://github.com/openbabel/openbabel/commit/305a6fd3183540e4a8ae1d79d10bf1860e6aa373
       postPatch = ''
         substituteInPlace configure \
           --replace-fail openbabel-3.0 openbabel-3
         substituteInPlace src/Makevars.in \
           --replace-fail "-I/usr/include/eigen3" "-I${pkgs.eigen}/include/eigen3"
+        substituteInPlace src/ChemmineOB.cpp \
+          --replace-fail "obsharedptr<" "std::shared_ptr<"
       '';
-      buildInputs = attrs.buildInputs ++ [openbabel3];
+
+      # copied from fastnlo-toolkit:
+      # None of our currently packaged versions of swig are C++17-friendly
+      # Use a workaround from https://github.com/swig/swig/issues/1538
+      env = (attrs.env or { }) // {
+        NIX_CFLAGS_COMPILE = (attrs.env.NIX_CFLAGS_COMPILE or "") + lib.optionalString stdenv.hostPlatform.isDarwin " -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES";
+      };
     });
 
     ps = old.ps.overrideAttrs (attrs: {
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 36e770b05d0b..f358d47e2193 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -20,14 +20,14 @@
 { 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, lerc, buildRubyGem
+, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl
+, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, 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
 , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
 , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml
-, cargo, rustc, rustPlatform
+, cargo, rustc, rustPlatform, libsysprof-capture
 , autoSignDarwinBinariesHook
 }@args:
 
@@ -71,13 +71,13 @@ in
   cairo = attrs: {
     nativeBuildInputs = [ pkg-config ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp];
+    buildInputs = [ cairo expat glib libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ];
   };
 
   cairo-gobject = attrs: {
     nativeBuildInputs = [ pkg-config ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ];
+    buildInputs = [ cairo expat libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ];
   };
 
   charlock_holmes = attrs: {
@@ -257,7 +257,7 @@ in
   gio2 = attrs: {
     nativeBuildInputs = [ pkg-config gobject-introspection ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol ];
+    buildInputs = [ glib libsysprof-capture pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol ];
   };
 
   gitlab-markup = attrs: { meta.priority = 1; };
@@ -346,29 +346,7 @@ in
   glib2 = attrs: {
     nativeBuildInputs = [ pkg-config ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs = [ gtk2 pcre2 ];
-  };
-
-  gtk2 = attrs: {
-    nativeBuildInputs = [
-      binutils pkg-config
-    ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-      util-linux libselinux libsepol
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    propagatedBuildInputs = [
-      atk
-      gdk-pixbuf
-      fribidi
-      gobject-introspection
-      gtk2
-      harfbuzz
-      libdatrie
-      libthai
-      pcre pcre2
-      xorg.libpthreadstubs
-      xorg.libXdmcp
-    ];
-    dontStrip = stdenv.hostPlatform.isDarwin;
+    buildInputs = [ glib libsysprof-capture pcre2 ];
   };
 
   gtk3 = attrs: {
@@ -390,8 +368,8 @@ in
       harfbuzz
       lerc
       libdatrie
+      libsysprof-capture
       libthai
-      pcre
       pcre2
       xorg.libpthreadstubs
       xorg.libXdmcp
@@ -403,9 +381,9 @@ in
   };
 
   gobject-introspection = attrs: {
-    nativeBuildInputs = [ pkg-config pcre2 ]
+    nativeBuildInputs = [ pkg-config ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib ];
+    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib pcre2 libsysprof-capture ];
   };
 
   gollum = attrs: {
@@ -653,15 +631,10 @@ in
   pango = attrs: {
     nativeBuildInputs = [
       pkg-config
-      fribidi
-      harfbuzz
-      pcre pcre2
-      xorg.libpthreadstubs
-      xorg.libXdmcp
     ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs = [ libdatrie libthai ]
+    buildInputs = [ libdatrie libthai fribidi harfbuzz libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ]
       ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ];
-    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gtk2 ];
+    propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 ];
   };
 
   patron = attrs: {
diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index 1b995df6d485..a99f1f589264 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -1,14 +1,14 @@
 { lib, skawarePackages, skalibs }:
 
 let
-  version = "2.9.6.0";
+  version = "2.9.6.1";
 
 in skawarePackages.buildPackage {
   inherit version;
 
   pname = "execline";
   # ATTN: also check whether there is a new manpages version
-  sha256 = "uion6Xxetr18pqCYeokl5ERlpb6ZbaoNGPj+yjfXVxo=";
+  sha256 = "sha256-dpGdYvLeTbGsSzpZ7rPg4JtivN2a3ROuPy2tJvjw5co=";
 
   # Maintainer of manpages uses following versioning scheme: for every
   # upstream $version he tags manpages release as ${version}.1, and,
@@ -17,7 +17,7 @@ in skawarePackages.buildPackage {
   manpages = skawarePackages.buildManPages {
     pname = "execline-man-pages";
     version = "2.9.6.0.1";
-    sha256 = "0lyX3rIUZ2JqWioRSm22uDS+q9ONkwIZxfR5E2pSDC4=";
+    sha256 = "sha256-0lyX3rIUZ2JqWioRSm22uDS+q9ONkwIZxfR5E2pSDC4=";
     description = "Port of the documentation for the execline suite to mdoc";
     maintainers = [ lib.maintainers.sternenseemann ];
   };
diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 8af02e348312..f473135c70c5 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "skalibs";
-  version = "2.14.2.0";
-  sha256 = "sha256-3f7Fcw5bLxnQOB7Pf3lrOabkcyNr2grY03dqP+ewfkM=";
+  version = "2.14.3.0";
+  sha256 = "sha256-oUqlWMmwmwYvoWrOxiOyyPk9afXLpNB/bQxYkTBmxCc=";
 
   description = "Set of general-purpose C programming libraries";
 
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index af7420b7f4f5..a865f6fdbca2 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.269";
+  version = "3.2.283";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-bpXKSyuPhKby8pCQUrH6H9H5za5R8FsKnoqsm8P4zek=";
+    hash = "sha256-9izC3O5e6GY/4OLkFLnUOoiFSnxdaS22qPSD3uYXSOE=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];
@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     "cyclonedx-python-lib"
     "dpath"
     "igraph"
+    "importlib-metadata"
     "license-expression"
     "networkx"
     "openai"
@@ -44,9 +45,7 @@ python3.pkgs.buildPythonApplication rec {
     "pycep-parser"
   ];
 
-  build-system = with python3.pkgs; [
-    setuptools-scm
-  ];
+  build-system = with python3.pkgs; [ setuptools-scm ];
 
   dependencies = with python3.pkgs; [
     aiodns
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
deleted file mode 100644
index 1173e8752bc1..000000000000
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }:
-
-stdenvNoCC.mkDerivation rec {
-  version = "10.18.2";
-  pname = "checkstyle";
-
-  src = fetchurl {
-    url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-VRbCJ+XYJLBrD90tMkJmevOu07t7K8LvcZ96NSjflb4=";
-  };
-
-  nativeBuildInputs = [ makeBinaryWrapper ];
-  buildInputs = [ jre ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    runHook preInstall
-    install -D $src $out/checkstyle/checkstyle-all.jar
-    makeWrapper ${jre}/bin/java $out/bin/checkstyle \
-      --add-flags "-jar $out/checkstyle/checkstyle-all.jar"
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Checks Java source against a coding standard";
-    mainProgram = "checkstyle";
-    longDescription = ''
-      checkstyle is a development tool to help programmers write Java code that
-      adheres to a coding standard. By default it supports the Sun Code
-      Conventions, but is highly configurable.
-    '';
-    homepage = "https://checkstyle.org/";
-    changelog = "https://checkstyle.org/releasenotes.html#Release_${version}";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ pSub ];
-    platforms = jre.meta.platforms;
-  };
-}
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
deleted file mode 100644
index 632d2c4a9153..000000000000
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk17, curl }:
-
-stdenv.mkDerivation rec {
-  pname = "codeql";
-  version = "2.19.1";
-
-  dontConfigure = true;
-  dontBuild = true;
-  dontStrip = true;
-
-  src = fetchzip {
-    url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-OUfNlaGNJDRkg5OGVPakB2TfEP4GFNVVFpXKW8SBpfM=";
-  };
-
-  nativeBuildInputs = [
-    zlib
-    xorg.libX11
-    xorg.libXext
-    xorg.libXi
-    xorg.libXtst
-    xorg.libXrender
-    freetype
-    jdk17
-    stdenv.cc.cc.lib
-    curl
-  ];
-
-  installPhase = ''
-    # codeql directory should not be top-level, otherwise,
-    # it'll include /nix/store to resolve extractors.
-    mkdir -p $out/{codeql,bin}
-    cp -R * $out/codeql/
-
-    ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so
-
-    # many of the codeql extractors use CODEQL_DIST + CODEQL_PLATFORM to
-    # resolve java home, so to be able to create databases, we want to make
-    # sure that they point somewhere sane/usable since we can not autopatch
-    # the codeql packaged java dist, but we DO want to patch the extractors
-    # as well as the builders which are ELF binaries for the most part
-    rm -rf $out/codeql/tools/linux64/java
-    ln -s ${jdk17} $out/codeql/tools/linux64/java
-
-    ln -s $out/codeql/codeql $out/bin/
-  '';
-
-  meta = with lib; {
-    description = "Semantic code analysis engine";
-    homepage = "https://codeql.github.com";
-    maintainers = [ maintainers.dump_stack ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    license = licenses.unfree;
-  };
-}
diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index 6248c08360df..cb8d4f2eafac 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "apko";
-  version = "0.19.1";
+  version = "0.19.6";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4=";
+    hash = "sha256-zcAV+6GdytdUsVxJCNIhfeVGjWFZ2/mgmwpIXTFLEhk=";
     # 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;
@@ -24,7 +24,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk=";
+  vendorHash = "sha256-vQjsKQ49ksea5GZXEd7XjGkN0IoW2HQekyQL5fmwCTc=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
deleted file mode 100644
index bc28ff15db2e..000000000000
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-  git,
-  testers,
-  aws-sam-cli,
-  nix-update-script,
-  enableTelemetry ? false,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "aws-sam-cli";
-  version = "1.120.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "aws";
-    repo = "aws-sam-cli";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns=";
-  };
-
-  build-system = with python3.pkgs; [ setuptools ];
-
-  pythonRelaxDeps = [
-    "aws-lambda-builders"
-    "aws-sam-translator"
-    "boto3-stubs"
-    "cfn-lint"
-    "cookiecutter"
-    "docker"
-    "jsonschema"
-    "pyopenssl"
-    "requests"
-    "rich"
-    "ruamel-yaml"
-    "tomlkit"
-    "tzlocal"
-    "watchdog"
-  ];
-
-  dependencies =
-    with python3.pkgs;
-    [
-      aws-lambda-builders
-      aws-sam-translator
-      boto3
-      boto3-stubs
-      cfn-lint
-      chevron
-      click
-      cookiecutter
-      dateparser
-      docker
-      flask
-      jsonschema
-      pyopenssl
-      pyyaml
-      requests
-      rich
-      ruamel-yaml
-      tomlkit
-      typing-extensions
-      tzlocal
-      watchdog
-    ]
-    ++ (with python3.pkgs.boto3-stubs.optional-dependencies; [
-      apigateway
-      cloudformation
-      ecr
-      iam
-      kinesis
-      lambda
-      s3
-      schemas
-      secretsmanager
-      signer
-      sqs
-      stepfunctions
-      sts
-      xray
-    ]);
-
-  postFixup = ''
-    # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272
-    wrapProgram $out/bin/sam \
-      --set SAM_CLI_TELEMETRY ${if enableTelemetry then "1" else "0"} \
-      --prefix PATH : $out/bin:${lib.makeBinPath [ git ]}
-  '';
-
-  nativeCheckInputs = with python3.pkgs; [
-    filelock
-    flaky
-    jaraco-text
-    parameterized
-    psutil
-    pytest-timeout
-    pytest-xdist
-    pytestCheckHook
-  ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-    export PATH="$PATH:$out/bin:${lib.makeBinPath [ git ]}"
-  '';
-
-  pytestFlagsArray = [
-    "tests"
-    # Disable warnings
-    "-W"
-    "ignore::DeprecationWarning"
-  ];
-
-  disabledTestPaths = [
-    # Disable tests that requires networking or complex setup
-    "tests/end_to_end"
-    "tests/integration"
-    "tests/regression"
-    "tests/smoke"
-    "tests/unit/lib/telemetry"
-    "tests/unit/hook_packages/terraform/hooks/prepare/"
-    "tests/unit/lib/observability/cw_logs/"
-    "tests/unit/lib/build_module/"
-    # Disable flaky tests
-    "tests/unit/lib/samconfig/test_samconfig.py"
-  ];
-
-  disabledTests = [
-    # Disable flaky tests
-    "test_update_stage"
-    "test_delete_deployment"
-    "test_request_with_no_data"
-    "test_import_should_succeed_for_a_defined_hidden_package_540_pkg_resources_py2_warn"
-  ];
-
-  pythonImportsCheck = [ "samcli" ];
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = aws-sam-cli;
-      command = "sam --version";
-    };
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--version-regex"
-        "^v([0-9.]+)$"
-      ];
-    };
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  meta = with lib; {
-    description = "CLI tool for local development and testing of Serverless applications";
-    homepage = "https://github.com/aws/aws-sam-cli";
-    changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    mainProgram = "sam";
-    maintainers = with maintainers; [
-      lo1tuma
-      anthonyroussel
-    ];
-  };
-}
diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix
index 126eaf1ec68e..18b80555833e 100644
--- a/pkgs/development/tools/azure-static-sites-client/default.nix
+++ b/pkgs/development/tools/azure-static-sites-client/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     libkrb5
     lttng-ust
     openssl
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
   ];
 
diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix
deleted file mode 100644
index 496dcbb5dfb8..000000000000
--- a/pkgs/development/tools/bazel-gazelle/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ buildGoModule
-, fetchFromGitHub
-, lib
-}:
-
-buildGoModule rec {
-  pname = "bazel-gazelle";
-  version = "0.39.0";
-
-  src = fetchFromGitHub {
-    owner = "bazelbuild";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-T1Kd6C0eDvogFjeDuCMp/EjetblQ1Hjww+C4dUGNq3E=";
-  };
-
-  vendorHash = null;
-
-  doCheck = false;
-
-  subPackages = [ "cmd/gazelle" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/bazelbuild/bazel-gazelle";
-    description = ''
-      Gazelle is a Bazel build file generator for Bazel projects. It natively
-      supports Go and protobuf, and it may be extended to support new languages
-      and custom rule sets.
-    '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kalbasit ];
-    mainProgram = "gazelle";
-  };
-}
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
deleted file mode 100644
index f8300db3c064..000000000000
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-  testers,
-  bazel-watcher,
-}:
-
-buildGoModule rec {
-  pname = "bazel-watcher";
-  version = "0.25.3";
-
-  src = fetchFromGitHub {
-    owner = "bazelbuild";
-    repo = "bazel-watcher";
-    rev = "v${version}";
-    hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM=";
-  };
-
-  vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU=";
-
-  CGO_ENABLED = "0";
-  ldflags = [
-    "-s"
-    "-X main.Version=${version}"
-  ];
-
-  subPackages = [ "cmd/ibazel" ];
-
-  passthru = {
-    tests.version = testers.testVersion { package = bazel-watcher; };
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/bazelbuild/bazel-watcher";
-    description = "Tools for building Bazel targets when source files change";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kalbasit ];
-    mainProgram = "ibazel";
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
deleted file mode 100644
index 1c149e72190c..000000000000
--- a/pkgs/development/tools/bazelisk/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "bazelisk";
-  version = "1.22.0";
-
-  src = fetchFromGitHub {
-    owner = "bazelbuild";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-KD8lh3N9GFlht+HtcuE3i20noVha0lT21a5pSS3zbTw=";
-  };
-
-  vendorHash = "sha256-zoiQ69y0EicH9Jq2XYn+fttKHZY64GD4m/Edk+kle9M=";
-
-  doCheck = false;
-
-  ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ];
-
-  meta = with lib; {
-    description = "User-friendly launcher for Bazel";
-    mainProgram = "bazelisk";
-    longDescription = ''
-      BEWARE: This package does not work on NixOS.
-    '';
-    homepage = "https://github.com/bazelbuild/bazelisk";
-    changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ elasticdog ];
-  };
-}
diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix
deleted file mode 100644
index e870371c0ebe..000000000000
--- a/pkgs/development/tools/bloom/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, yaml-cpp
-, qtbase
-, qtsvg
-, wrapQtAppsHook
-, qttools
-, libusb1
-, php
-, hidapi
-, procps
-}:
-
-stdenv.mkDerivation rec {
-  pname = "bloom";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "bloombloombloom";
-    repo = "Bloom";
-    rev = "v${version}";
-    hash = "sha256-ZZfclZwxsCgApUII79bJVyT5V/dF9jm7l8ynRWCh0UU=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    php
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    hidapi
-    libusb1
-    procps
-    qtbase
-    qtsvg
-    qttools
-    yaml-cpp
-  ];
-
-  postPatch = ''
-    sed -i 's|/usr|${placeholder "out"}|' cmake/Installing.cmake
-  '';
-
-  meta = {
-    description = "Debug interface for AVR-based embedded systems development on GNU/Linux";
-    homepage = "https://bloom.oscillate.io/";
-    license = lib.licenses.lgpl3Only;
-    maintainers = [ ];
-    mainProgram = "bloom";
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
deleted file mode 100644
index fe8f1a4682fe..000000000000
--- a/pkgs/development/tools/boost-build/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, bison
-# boost derivation to use for the src and version.
-# This is used by the boost derivation to build
-# a b2 matching their version (by overriding this
-# argument). Infinite recursion is not an issue
-# since we only look at src and version of boost.
-, useBoost ? {}
-}:
-
-let
-  defaultVersion = "4.4.1";
-in
-
-stdenv.mkDerivation {
-  pname = "boost-build";
-  version =
-    if useBoost ? version
-    then "boost-${useBoost.version}"
-    else defaultVersion;
-
-  src = useBoost.src or (fetchFromGitHub {
-    owner = "boostorg";
-    repo = "build";
-    rev = defaultVersion;
-    sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54";
-  });
-
-  # b2 is in a subdirectory of boost source tarballs
-  postUnpack = lib.optionalString (useBoost ? src) ''
-    sourceRoot="$sourceRoot/tools/build"
-  '';
-
-  patches = useBoost.boostBuildPatches or []
-    ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch;
-
-  # Upstream defaults to gcc on darwin, but we use clang.
-  postPatch = ''
-    substituteInPlace src/build-system.jam \
-    --replace "default-toolset = darwin" "default-toolset = clang-darwin"
-  '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") ''
-    patchShebangs --build src/engine/build.sh
-  '';
-
-  nativeBuildInputs = [
-    bison
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    ./bootstrap.sh
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    ./b2 ${lib.optionalString (stdenv.cc.isClang) "toolset=clang "}install --prefix="$out"
-
-    # older versions of b2 created this symlink,
-    # which we want to support building via useBoost.
-    test -e "$out/bin/bjam" || ln -s b2 "$out/bin/bjam"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.boost.org/build/";
-    license = lib.licenses.boost;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ivan-tkatchev ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
deleted file mode 100644
index 5e00d302ac4c..000000000000
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  pname = "ant";
-  version = "1.10.11";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  src = fetchurl {
-    url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
-    sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz";
-  };
-
-  contrib = fetchurl {
-    url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2";
-    sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn";
-  };
-
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/lib/ant
-      mv * $out/lib/ant/
-
-      # Get rid of the manual (35 MiB).  Maybe we should put this in a
-      # separate output.  Keep the antRun script since it's vanilla sh
-      # and needed for the  task (but since we set ANT_HOME to
-      # a weird value, we have to move antRun to a weird location).
-      # Get rid of the other Ant scripts since we provide our own.
-      mv $out/lib/ant/bin/antRun $out/bin/
-      rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
-      mkdir $out/lib/ant/bin
-      mv $out/bin/antRun $out/lib/ant/bin/
-
-      # Install ant-contrib.
-      unpackFile $contrib
-      cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/
-
-      cat >> $out/bin/ant <&2
-              exit 1
-          fi
-      fi
-
-      if [ -z \$NIX_JVM ]; then
-          if [ -e \$JAVA_HOME/bin/java ]; then
-              NIX_JVM=\$JAVA_HOME/bin/java
-          elif [ -e \$JAVA_HOME/bin/gij ]; then
-              NIX_JVM=\$JAVA_HOME/bin/gij
-          else
-              NIX_JVM=java
-          fi
-      fi
-
-      LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
-
-      exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
-          -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
-          org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
-          -cp "\$CLASSPATH" "\$@"
-      EOF
-
-      chmod +x $out/bin/ant
-    ''; # */
-
-  meta = {
-    homepage = "https://ant.apache.org/";
-    description = "Java-based build tool";
-    mainProgram = "ant";
-
-    longDescription = ''
-      Apache Ant is a Java-based build tool.  In theory, it is kind of like
-      Make, but without Make's wrinkles.
-
-      Why another build tool when there is already make, gnumake, nmake, jam,
-      and others? Because all those tools have limitations that Ant's
-      original author couldn't live with when developing software across
-      multiple platforms.  Make-like tools are inherently shell-based -- they
-      evaluate a set of dependencies, then execute commands not unlike what
-      you would issue in a shell.  This means that you can easily extend
-      these tools by using or writing any program for the OS that you are
-      working on.  However, this also means that you limit yourself to the
-      OS, or at least the OS type such as Unix, that you are working on.
-
-      Ant is different.  Instead of a model where it is extended with
-      shell-based commands, Ant is extended using Java classes.  Instead of
-      writing shell commands, the configuration files are XML-based, calling
-      out a target tree where various tasks get executed.  Each task is run
-      by an object that implements a particular Task interface.
-    '';
-
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.asl20;
-    maintainers = [ ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
deleted file mode 100644
index b6db8634c06e..000000000000
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ stdenv
-, fetchurl
-, autoPatchelfHook
-, installShellFiles
-, makeWrapper
-, jre
-, lib
-, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "bloop";
-  version = "2.0.3";
-
-  platform =
-    if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "x86_64-pc-linux"
-    else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "x86_64-apple-darwin"
-    else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "aarch64-apple-darwin"
-    else throw "unsupported platform";
-
-  bloop-bash = fetchurl {
-    url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";
-    sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";
-  };
-
-  bloop-fish = fetchurl {
-    url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";
-    sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";
-  };
-
-  bloop-zsh = fetchurl {
-    url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";
-    sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";
-  };
-
-  bloop-binary = fetchurl rec {
-    url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
-    sha256 =
-      if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-aEsEXGaKi+wziNAuuX3s/LWB6/fIjon9NF3w9c/lTUE="
-      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-dEVWDwFVsg1eqrAAfuuR5FUFyAt44ev7UP7zxByzW14="
-      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-0rYdivIas6ECwGPm3bACMzHhS+yxQNLtEPxPQAXkSg0="
-      else throw "unsupported platform";
-  };
-
-  dontUnpack = true;
-  nativeBuildInputs = [ installShellFiles makeWrapper ]
-    ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-  buildInputs = [ stdenv.cc.cc.lib zlib ];
-  propagatedBuildInputs = [ jre ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped
-
-    makeWrapper $out/.bloop-wrapped $out/bin/bloop
-
-    #Install completions
-    installShellCompletion --name bloop --bash ${bloop-bash}
-    installShellCompletion --name _bloop --zsh ${bloop-zsh}
-    installShellCompletion --name bloop.fish --fish ${bloop-fish}
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://scalacenter.github.io/bloop/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.asl20;
-    description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
-    mainProgram = "bloop";
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
-    maintainers = with maintainers; [ agilesteel kubukoz tomahna ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
deleted file mode 100644
index f9bb2457a4fa..000000000000
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, git
-, pkg-config
-, xcbuild
-, python3
-, zlib
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "conan";
-  version = "2.5.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "conan-io";
-    repo = "conan";
-    rev = "refs/tags/${version}";
-    hash = "sha256-4GCLmPEoCX1Cw+H6Bo1KA4+9GX35HgONAmMF/WNX6ag=";
-  };
-
-  nativeBuildInputs = with python3.pkgs; [
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    bottle
-    colorama
-    python-dateutil
-    distro
-    fasteners
-    jinja2
-    patch-ng
-    pluginbase
-    pygments
-    pyjwt
-    pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152
-    pyyaml
-    requests
-    tqdm
-    urllib3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    idna
-    cryptography
-    pyopenssl
-  ];
-
-  nativeCheckInputs = [
-    git
-    pkg-config
-    zlib
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-    xcbuild.xcrun
-  ] ++ (with python3.pkgs; [
-    mock
-    parameterized
-    pytest-xdist
-    pytestCheckHook
-    webtest
-  ]);
-
-  __darwinAllowLocalNetworking = true;
-
-  pythonImportsCheck = [
-    "conan"
-  ];
-
-  pytestFlagsArray = [
-    "-n"
-    "$NIX_BUILD_CORES"
-  ];
-
-  disabledTests = [
-    # Tests require network access
-    "TestFTP"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Rejects paths containing nix
-    "test_conditional_os"
-    # Requires Apple Clang
-    "test_detect_default_compilers"
-    "test_detect_default_in_mac_os_using_gcc_as_default"
-    # Incompatible with darwin.xattr and xcbuild from nixpkgs
-    "test_dot_files"
-    "test_xcrun"
-    "test_xcrun_in_required_by_tool_requires"
-    "test_xcrun_in_tool_requires"
-  ];
-
-  disabledTestPaths = [
-    # Requires cmake, meson, autotools, apt-get, etc.
-    "test/functional/command/new_test.py"
-    "test/functional/command/test_install_deploy.py"
-    "test/functional/graph/test_transitive_build_scripts.py"
-    "test/functional/layout/test_editable_cmake.py"
-    "test/functional/layout/test_editable_cmake_components.py"
-    "test/functional/layout/test_in_subfolder.py"
-    "test/functional/layout/test_source_folder.py"
-    "test/functional/test_local_recipes_index.py"
-    "test/functional/test_profile_detect_api.py"
-    "test/functional/toolchains/"
-    "test/functional/tools/scm/test_git.py"
-    "test/functional/tools/system/package_manager_test.py"
-    "test/functional/tools_versions_test.py"
-    "test/functional/util/test_cmd_args_to_string.py"
-    "test/integration/command/runner_test.py"
-    "test/integration/command/user_test.py"
-    "test/integration/command_v2/list_test.py"
-    "test/performance/test_large_graph.py"
-    "test/unittests/tools/env/test_env_files.py"
-  ];
-
-  meta = with lib; {
-    description = "Decentralized and portable C/C++ package manager";
-    mainProgram = "conan";
-    homepage = "https://conan.io";
-    changelog = "https://github.com/conan-io/conan/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ HaoZeke ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
deleted file mode 100644
index c3af8fe72dd0..000000000000
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix args {
-  # Note: Please use the recommended version for Chromium stabe, i.e. from
-  # /pkgs/applications/networking/browsers/chromium/upstream-info.nix
-  rev = "df98b86690c83b81aedc909ded18857296406159";
-  revNum = "2168"; # git describe $rev --match initial-commit | cut -d- -f3
-  version = "2024-05-13";
-  sha256 = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=";
-}
diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix
deleted file mode 100644
index 4fc2fd6b53b8..000000000000
--- a/pkgs/development/tools/build-managers/gn/generic.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv, lib, fetchgit, fetchpatch, cctools, darwin, writeText
-, ninja, python3
-, ...
-}:
-
-{ rev, revNum, version, sha256 }:
-
-let
-  revShort = builtins.substring 0 7 rev;
-  lastCommitPosition = writeText "last_commit_position.h" ''
-    #ifndef OUT_LAST_COMMIT_POSITION_H_
-    #define OUT_LAST_COMMIT_POSITION_H_
-
-    #define LAST_COMMIT_POSITION_NUM ${revNum}
-    #define LAST_COMMIT_POSITION "${revNum} (${revShort})"
-
-    #endif  // OUT_LAST_COMMIT_POSITION_H_
-  '';
-
-in stdenv.mkDerivation {
-  pname = "gn-unstable";
-  inherit version;
-
-  src = fetchgit {
-    # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
-    url = "https://gn.googlesource.com/gn";
-    inherit rev sha256;
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "LFS64.patch";
-      url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT";
-      decode = "base64 -d";
-      hash = "sha256-/kh8t/Ip1EG2OIhydS//st/C80KJ4P31vGx7j8QpFh0=";
-    })
-  ];
-
-  nativeBuildInputs = [ ninja python3 ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin; with apple_sdk.frameworks; [
-    libobjc
-    cctools
-
-    # frameworks
-    ApplicationServices
-    Foundation
-    AppKit
-  ]);
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  buildPhase = ''
-    python build/gen.py --no-last-commit-position
-    ln -s ${lastCommitPosition} out/last_commit_position.h
-    ninja -j $NIX_BUILD_CORES -C out gn
-  '';
-
-  installPhase = ''
-    install -vD out/gn "$out/bin/gn"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = with lib; {
-    description = "Meta-build system that generates build files for Ninja";
-    mainProgram = "gn";
-    homepage = "https://gn.googlesource.com/gn";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ stesie matthewbauer primeos ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gn/rev1924.nix b/pkgs/development/tools/build-managers/gn/rev1924.nix
deleted file mode 100644
index 1b17328f2e09..000000000000
--- a/pkgs/development/tools/build-managers/gn/rev1924.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix args {
-  rev = "24e2f7df92641de0351a96096fb2c490b2436bb8";
-  revNum = "1924"; # git describe HEAD --match initial-commit | cut -d- -f3
-  version = "2021-08-08";
-  sha256 = "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl";
-}
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 52800a8694f0..5f34894e8dc3 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -23,7 +23,11 @@ rec {
         "x86_64-darwin"
         "x86_64-linux"
         "x86_64-windows"
-      ]
+      ],
+
+      # Extra attributes to be merged into the resulting derivation's
+      # meta attribute.
+      meta ? {}
     }:
 
     { lib
@@ -108,7 +112,7 @@ rec {
         for variant in "" "-ncurses5" "-ncurses6"; do
           autoPatchelfInJar \
             $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \
-            "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}"
+            "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}"
         done
 
         # The file-events library _seems_ to follow the native-platform version, but
@@ -116,7 +120,7 @@ rec {
         fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)"
         autoPatchelfInJar \
           $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \
-          "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+          "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
 
         # The scanner doesn't pick up the runtime dependency in the jar.
         # Manually add a reference where it will be found.
@@ -170,9 +174,9 @@ rec {
           binaryNativeCode
         ];
         license = licenses.asl20;
-        maintainers = with maintainers; [ lorenzleutgeb liff ];
+        maintainers = with maintainers; [ lorenzleutgeb liff ] ++ lib.teams.java.members;
         mainProgram = "gradle";
-      };
+      } // meta;
     });
 
   # NOTE: Default JDKs that are hardcoded below must be LTS versions
@@ -191,12 +195,6 @@ rec {
     defaultJava = jdk17;
   };
 
-  gradle_6 = gen {
-    version = "6.9.4";
-    hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo=";
-    defaultJava = jdk11;
-  };
-
   wrapGradle = {
       lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook, nix-update-script
     }:
diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix
index 96e46a0d98fd..51959fa69f38 100644
--- a/pkgs/development/tools/build-managers/gradle/update-deps.nix
+++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix
@@ -1,6 +1,7 @@
 { lib
 , runtimeShell
 , srcOnly
+, stdenvNoCC
 , writeTextFile
 , writeShellScript
 , path
@@ -38,6 +39,8 @@ let
   source = srcOnly (pkg.overrideAttrs (old: {
     mitmCache = "";
     gradleInitScript = ./init-deps.gradle;
+
+    stdenv = old.stdenv or stdenvNoCC;
   }));
   sourceDrvPath = builtins.unsafeDiscardOutputDependency source.drvPath;
   nixShellKeep = lib.concatMapStringsSep " " (x: "--keep ${x}") keep;
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 092f8efe785c..9c642123ee4d 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Tool that helps simplify the build process for developing projects across multiple platforms";
     homepage = "https://wiki.qt.io/Qbs";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ expipiplus1 ];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json
index de1dd7c0f4d0..75e494e5cfd7 100644
--- a/pkgs/development/tools/build-managers/scala-cli/sources.json
+++ b/pkgs/development/tools/build-managers/scala-cli/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "1.5.0",
+  "version": "1.5.1",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "1samfkiw4rgfw36sqd85nrn0v050jy9mca3qvn46wfxczrf3sjvj"
+      "sha256": "0cb7g5vzwbdcyndfg6i8aavmvxis444sz5kza228cyj9w4ydffv6"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "02zpqffprf1hf68jhr9h7panqr110ip0fyv42lgqpj6rbhlxi371"
+      "sha256": "0kmz4nxpcn7ms60d28xjx5h1af8ygibw89mip7mcbmrcapbm3kcv"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "1lfrcz2khabyww52ji03p034k3h6zrmgzxgy1zw78r5z2s984w4f"
+      "sha256": "1v7sah8fs87vq5a10812l78prkn34bwbrywfjqsv5180hzlpck3w"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "15rlzgg2innaifixwqy4w2lxg2ab9pi11s2fx1c053ylhbbbz3v1"
+      "sha256": "0rj75q3nmh7wry7apii5yirxdsgrq1lhwmylakck1gn9wqnbc53s"
     }
   }
 }
diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix
index 073ca4ac017f..537509a83b31 100644
--- a/pkgs/development/tools/build-managers/xmake/default.nix
+++ b/pkgs/development/tools/build-managers/xmake/default.nix
@@ -4,25 +4,22 @@
   fetchurl,
   fetchpatch,
   CoreServices,
+  nix-update-script,
 }:
 stdenv.mkDerivation rec {
   pname = "xmake";
-  version = "2.9.5";
+  version = "2.9.6";
   src = fetchurl {
     url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
-    hash = "sha256-A/61eH4i+rjdQEGew9hKvTWrzZ+KGyTEiMfrVx1nJMg=";
+    hash = "sha256-R/bvywD5DJigLDlflztNVb3TqP5FJnbc5XtVwFV1loY=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "xmake-fix-configure-compatibility.patch";
-      url = "https://github.com/xmake-io/xmake/commit/2a1220727a367e753b92131577ab0c2fd974bff8.patch";
-      hash = "sha256-xknlyydHvdwqTl975VQogKozT8nAp5+gPZQuRl1yXKE=";
-    })
-  ];
-
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Cross-platform build utility based on Lua";
     homepage = "https://xmake.io";
diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
deleted file mode 100644
index 355233493c66..000000000000
--- a/pkgs/development/tools/buildkit/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "buildkit";
-  version = "0.16.0";
-
-  src = fetchFromGitHub {
-    owner = "moby";
-    repo = "buildkit";
-    rev = "v${version}";
-    hash = "sha256-rAl2lPcm4JSRO9xVrZctGpWoi/JNZ5uUHDIZKd70+M8=";
-  };
-
-  vendorHash = null;
-
-  subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "cmd/buildkitd" ];
-
-  ldflags = [ "-s" "-w" "-X github.com/moby/buildkit/version.Version=${version}" "-X github.com/moby/buildkit/version.Revision=${src.rev}" ];
-
-  doCheck = false;
-
-  meta = {
-    description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
-    homepage = "https://github.com/moby/buildkit";
-    changelog = "https://github.com/moby/buildkit/releases/tag/v${version}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ developer-guy vdemeester ];
-    mainProgram = "buildctl";
-  };
-}
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
deleted file mode 100644
index 98051df100a7..000000000000
--- a/pkgs/development/tools/conftest/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-}:
-
-buildGoModule rec {
-  pname = "conftest";
-  version = "0.55.0";
-
-  src = fetchFromGitHub {
-    owner = "open-policy-agent";
-    repo = "conftest";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A=";
-  };
-  vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU=";
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}"
-  ];
-
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  preCheck = ''
-    export HOME="$(mktemp -d)"
-  '';
-
-  postInstall = ''
-    installShellCompletion --cmd conftest \
-      --bash <($out/bin/conftest completion bash) \
-      --fish <($out/bin/conftest completion fish) \
-      --zsh <($out/bin/conftest completion zsh)
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    export HOME="$(mktemp -d)"
-    $out/bin/conftest --version | grep ${version} > /dev/null
-  '';
-
-  meta = with lib; {
-    description = "Write tests against structured configuration data";
-    mainProgram = "conftest";
-    downloadPage = "https://github.com/open-policy-agent/conftest";
-    homepage = "https://www.conftest.dev";
-    changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${version}";
-    license = licenses.asl20;
-    longDescription = ''
-      Conftest helps you write tests against structured configuration data.
-      Using Conftest you can write tests for your Kubernetes configuration,
-      Tekton pipeline definitions, Terraform code, Serverless configs or any
-      other config files.
-
-      Conftest uses the Rego language from Open Policy Agent for writing the
-      assertions. You can read more about Rego in 'How do I write policies' in
-      the Open Policy Agent documentation.
-    '';
-    maintainers = with maintainers; [ jk yurrriq ];
-  };
-}
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
deleted file mode 100644
index 4a297442e0fc..000000000000
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused
-, makeWrapper, nix, nixfmt-classic, openjdk, writeScript, nixosTests, jq, cacert
-, curl }:
-
-stdenv.mkDerivation rec {
-  pname = "jenkins";
-  version = "2.462.3";
-
-  src = fetchurl {
-    url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
-    hash = "sha256-PlO1KoFkBeOxCtB/HEjNDLXLP4kyB+9/neKEFYBrk8E=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p "$out/bin" "$out/share" "$out/webapps"
-
-    cp "$src" "$out/webapps/jenkins.war"
-
-    # Create the `jenkins-cli` command.
-    ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \
-      && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar"
-
-    makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \
-      --add-flags "-jar $out/share/jenkins-cli.jar"
-  '';
-
-  passthru = {
-    tests = { inherit (nixosTests) jenkins jenkins-cli; };
-
-    updateScript = writeScript "update.sh" ''
-      #!${stdenv.shell}
-      set -o errexit
-      PATH=${
-        lib.makeBinPath [
-          cacert
-          common-updater-scripts
-          coreutils
-          curl
-          git
-          gnused
-          jq
-          nix
-          nixfmt-classic
-        ]
-      }
-
-      core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)"
-      oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"')
-
-      version="$(jq -r .version <<<$core_json)"
-      sha256="$(jq -r .sha256 <<<$core_json)"
-      hash="$(nix hash to-sri --type sha256 "$sha256")"
-
-      if [ ! "$oldVersion" = "$version" ]; then
-        update-source-version jenkins "$version" "$hash"
-        nixpkgs="$(git rev-parse --show-toplevel)"
-        default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix"
-        nixfmt "$default_nix"
-      else
-        echo "jenkins is already up-to-date"
-      fi
-    '';
-  };
-
-  meta = with lib; {
-    description = "Extendable open source continuous integration server";
-    homepage = "https://jenkins.io/";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.mit;
-    maintainers = with maintainers;
-      [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members;
-    changelog = "https://www.jenkins.io/changelog-stable/#v${version}";
-    mainProgram = "jenkins-cli";
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix
deleted file mode 100644
index ccd57d05895c..000000000000
--- a/pkgs/development/tools/ctlptl/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
-
-buildGoModule rec {
-  pname = "ctlptl";
-  version = "0.8.34";
-
-  src = fetchFromGitHub {
-    owner = "tilt-dev";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY=";
-  };
-
-  vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs=";
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  subPackages = [ "cmd/ctlptl" ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X main.version=${version}"
-  ];
-
-  postInstall = ''
-    installShellCompletion --cmd ctlptl \
-      --bash <($out/bin/ctlptl completion bash) \
-      --fish <($out/bin/ctlptl completion fish) \
-      --zsh <($out/bin/ctlptl completion zsh)
-  '';
-
-  meta = with lib; {
-    description = "CLI for declaratively setting up local Kubernetes clusters";
-    homepage = "https://github.com/tilt-dev/ctlptl";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ svrana ];
-  };
-}
diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix
deleted file mode 100644
index a16fbaddc2c9..000000000000
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ buildGoModule
-, clickhouse-backup
-, fetchFromGitHub
-, lib
-, testers
-}:
-
-buildGoModule rec {
-  pname = "clickhouse-backup";
-  version = "2.6.2";
-
-  src = fetchFromGitHub {
-    owner = "Altinity";
-    repo = "clickhouse-backup";
-    rev = "v${version}";
-    hash = "sha256-t9sRhcNKFvTTysornYf/7JQ7mkasTunnzKR4pYCAOk0=";
-  };
-
-  vendorHash = "sha256-n3rlijycZ5qZtR/e+Z/UPCcr47p4wN3kFgfWr+73WAQ=";
-
-  ldflags = [
-    "-X main.version=${version}"
-  ];
-
-  postConfigure = ''
-    export CGO_ENABLED=0
-  '';
-
-  passthru.tests.version = testers.testVersion {
-    package = clickhouse-backup;
-  };
-
-  meta = with lib; {
-    description = "Tool for easy ClickHouse backup and restore using object storage for backup files";
-    mainProgram = "clickhouse-backup";
-    homepage = "https://github.com/Altinity/clickhouse-backup";
-    license = licenses.mit;
-    maintainers = with maintainers; [ devusb ];
-  };
-}
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
deleted file mode 100644
index 2d0ca3e7681c..000000000000
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-}:
-
-buildGoModule rec {
-  pname = "dbmate";
-  version = "2.21.0";
-
-  src = fetchFromGitHub {
-    owner = "amacneil";
-    repo = "dbmate";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-RX8ocfXHoo1imjx7SRml6Ao6KjNK7xp43pVmth2zfPc=";
-  };
-
-  vendorHash = "sha256-lov0Ye+pmI5eyILepN87okZDDA9OPz4cTzK1KluHQuI=";
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Database migration tool";
-    mainProgram = "dbmate";
-    homepage = "https://github.com/amacneil/dbmate";
-    changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ manveru ];
-  };
-}
diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix
deleted file mode 100644
index b7ae5487d215..000000000000
--- a/pkgs/development/tools/database/pgweb/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, testers
-, pgweb
-}:
-
-buildGoModule rec {
-  pname = "pgweb";
-  version = "0.16.1";
-
-  src = fetchFromGitHub {
-    owner = "sosedoff";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-lQc1ELeH2i9tate47rdHxFnvjQQUdg1B0CXcr5YGC+g=";
-  };
-
-  postPatch = ''
-    # Disable tests require network access.
-    rm -f pkg/client/{client,dump}_test.go
-  '';
-
-  vendorHash = "sha256-Jpvf6cST3kBvYzCQLoJ1fijUC/hP1ouptd2bQZ1J/Lo=";
-
-  ldflags = [ "-s" "-w" ];
-
-  checkFlags =
-    let
-      skippedTests = [
-        # There is a `/tmp/foo` file on the test machine causing the test case to fail on macOS
-        "TestParseOptions"
-      ];
-    in
-    [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ];
-
-    passthru.tests.version = testers.testVersion {
-      version = "v${version}";
-      package = pgweb;
-      command = "pgweb --version";
-    };
-
-  meta = with lib; {
-    changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}";
-    description = "Web-based database browser for PostgreSQL";
-    longDescription = ''
-      A simple postgres browser that runs as a web server. You can view data,
-      run queries and examine tables and indexes.
-    '';
-    homepage = "https://sosedoff.github.io/pgweb/";
-    license = licenses.mit;
-    mainProgram = "pgweb";
-    maintainers = with maintainers; [ zupo luisnquin ];
-  };
-}
diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock
index 7c4c52dda162..bb37bb4c275a 100644
--- a/pkgs/development/tools/database/prisma-engines/Cargo.lock
+++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock
@@ -30,9 +30,9 @@ dependencies = [
 
 [[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",
  "getrandom 0.2.11",
@@ -41,15 +41,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.0.3"
@@ -214,15 +205,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "atomic-shim"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -368,7 +350,7 @@ dependencies = [
  "enumflags2",
  "indoc 2.0.3",
  "insta",
- "query-engine-metrics",
+ "prisma-metrics",
  "query-engine-tests",
  "query-tests-setup",
  "regex",
@@ -447,7 +429,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "base64 0.13.1",
  "bitvec",
  "chrono",
@@ -512,9 +494,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cast"
@@ -543,11 +525,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
 dependencies = [
- "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -1101,7 +1083,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.8",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -1226,11 +1208,11 @@ dependencies = [
  "expect-test",
  "futures",
  "js-sys",
- "metrics 0.18.1",
  "napi",
  "napi-derive",
  "once_cell",
  "pin-project",
+ "prisma-metrics",
  "quaint",
  "serde",
  "serde-wasm-bindgen",
@@ -1631,7 +1613,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot 0.12.1",
+ "parking_lot",
 ]
 
 [[package]]
@@ -1781,15 +1763,6 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash 0.7.8",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1805,7 +1778,7 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -1890,7 +1863,7 @@ dependencies = [
  "ipconfig",
  "lru-cache",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
  "rand 0.8.5",
  "resolv-conf",
  "smallvec",
@@ -2138,15 +2111,6 @@ dependencies = [
  "yaml-rust",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "ipconfig"
 version = "0.3.2"
@@ -2444,15 +2408,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2500,91 +2455,47 @@ dependencies = [
 
 [[package]]
 name = "metrics"
-version = "0.18.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
 dependencies = [
- "ahash 0.7.8",
- "metrics-macros",
-]
-
-[[package]]
-name = "metrics"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2"
-dependencies = [
- "ahash 0.7.8",
- "metrics-macros",
+ "ahash 0.8.11",
+ "portable-atomic",
 ]
 
 [[package]]
 name = "metrics-exporter-prometheus"
-version = "0.10.0"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66"
+checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6"
 dependencies = [
- "hyper",
- "indexmap 1.9.3",
- "ipnet",
- "metrics 0.19.0",
- "metrics-util 0.13.0",
- "parking_lot 0.11.2",
+ "base64 0.22.1",
+ "indexmap 2.2.2",
+ "metrics",
+ "metrics-util",
  "quanta",
  "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "metrics-macros"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]
 
 [[package]]
 name = "metrics-util"
-version = "0.12.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a9e83b833e1d2e07010a386b197c13aa199bbd0fca5cf69bfa147972db890a"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
 dependencies = [
- "aho-corasick 0.7.20",
- "atomic-shim",
+ "aho-corasick",
  "crossbeam-epoch",
  "crossbeam-utils",
- "hashbrown 0.11.2",
- "indexmap 1.9.3",
- "metrics 0.18.1",
+ "hashbrown 0.14.5",
+ "indexmap 2.2.2",
+ "metrics",
  "num_cpus",
  "ordered-float",
- "parking_lot 0.11.2",
  "quanta",
  "radix_trie",
  "sketches-ddsketch",
 ]
 
-[[package]]
-name = "metrics-util"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50"
-dependencies = [
- "atomic-shim",
- "crossbeam-epoch",
- "crossbeam-utils",
- "hashbrown 0.11.2",
- "metrics 0.19.0",
- "num_cpus",
- "parking_lot 0.11.2",
- "quanta",
- "sketches-ddsketch",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -2620,9 +2531,9 @@ dependencies = [
 
 [[package]]
 name = "mobc"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eb49dc5d193287ff80e72a86f34cfb27aae562299d22fea215e06ea1059dd3"
+checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f"
 dependencies = [
  "async-trait",
  "futures-channel",
@@ -2630,7 +2541,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "log",
- "metrics 0.18.1",
+ "metrics",
  "thiserror",
  "tokio",
  "tracing",
@@ -2721,15 +2632,16 @@ dependencies = [
  "mongodb",
  "mongodb-client",
  "pretty_assertions",
+ "prisma-metrics",
  "prisma-value",
  "psl",
  "query-connector",
- "query-engine-metrics",
  "query-structure",
  "rand 0.8.5",
  "regex",
  "serde",
  "serde_json",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -2883,9 +2795,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.15.1"
+version = "2.16.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43792514b0c95c5beec42996da0c1b39265b02b75c97baa82d163d3ef55cbfa7"
+checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b"
 dependencies = [
  "bitflags 2.4.0",
  "ctor",
@@ -2905,9 +2817,9 @@ checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b"
 
 [[package]]
 name = "napi-derive"
-version = "2.15.0"
+version = "2.16.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7622f0dbe0968af2dacdd64870eee6dee94f93c989c841f1ad8f300cf1abd514"
+checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1"
 dependencies = [
  "cfg-if",
  "convert_case 0.6.0",
@@ -2919,9 +2831,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.59"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec514d65fce18a959be55e7f683ac89c6cb850fb59b09e25ab777fd5a4a8d9e"
+checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe"
 dependencies = [
  "convert_case 0.6.0",
  "once_cell",
@@ -2934,9 +2846,9 @@ dependencies = [
 
 [[package]]
 name = "napi-sys"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b"
+checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3"
 dependencies = [
  "libloading 0.8.1",
 ]
@@ -3217,9 +3129,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "2.10.0"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
+checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
 dependencies = [
  "num-traits",
 ]
@@ -3248,17 +3160,6 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -3266,21 +3167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.8",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -3515,10 +3402,16 @@ dependencies = [
  "plotters-backend",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
 [[package]]
 name = "postgres-native-tls"
 version = "0.5.0"
-source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3"
+source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65"
 dependencies = [
  "native-tls",
  "tokio",
@@ -3528,10 +3421,10 @@ dependencies = [
 
 [[package]]
 name = "postgres-protocol"
-version = "0.6.4"
-source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3"
+version = "0.6.7"
+source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
  "byteorder",
  "bytes",
  "fallible-iterator 0.2.0",
@@ -3545,8 +3438,8 @@ dependencies = [
 
 [[package]]
 name = "postgres-types"
-version = "0.2.4"
-source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3"
+version = "0.2.8"
+source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65"
 dependencies = [
  "bit-vec",
  "bytes",
@@ -3616,6 +3509,27 @@ dependencies = [
  "structopt",
 ]
 
+[[package]]
+name = "prisma-metrics"
+version = "0.1.0"
+dependencies = [
+ "derive_more",
+ "expect-test",
+ "futures",
+ "metrics",
+ "metrics-exporter-prometheus",
+ "metrics-util",
+ "once_cell",
+ "parking_lot",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-futures",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "prisma-schema-build"
 version = "0.1.0"
@@ -3842,7 +3756,6 @@ dependencies = [
  "indoc 0.3.6",
  "itertools 0.12.0",
  "lru-cache",
- "metrics 0.18.1",
  "mobc",
  "mysql_async",
  "names 0.11.0",
@@ -3853,6 +3766,7 @@ dependencies = [
  "percent-encoding",
  "postgres-native-tls",
  "postgres-types",
+ "prisma-metrics",
  "quaint-test-macros",
  "quaint-test-setup",
  "regex",
@@ -3866,7 +3780,7 @@ dependencies = [
  "tokio-postgres",
  "tokio-util 0.7.8",
  "tracing",
- "tracing-core",
+ "tracing-futures",
  "url",
  "uuid",
  "ws_stream_tungstenite",
@@ -3898,16 +3812,15 @@ dependencies = [
 
 [[package]]
 name = "quanta"
-version = "0.9.3"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
 dependencies = [
  "crossbeam-utils",
  "libc",
- "mach",
  "once_cell",
  "raw-cpuid",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "web-sys",
  "winapi",
 ]
@@ -3926,6 +3839,7 @@ dependencies = [
  "query-structure",
  "serde",
  "serde_json",
+ "telemetry",
  "thiserror",
  "user-facing-errors",
  "uuid",
@@ -3942,6 +3856,7 @@ dependencies = [
  "crossbeam-channel",
  "crosstarget-utils",
  "cuid",
+ "derive_more",
  "enumflags2",
  "futures",
  "indexmap 2.2.2",
@@ -3950,13 +3865,14 @@ dependencies = [
  "once_cell",
  "opentelemetry",
  "petgraph 0.4.13",
+ "prisma-metrics",
  "psl",
  "query-connector",
- "query-engine-metrics",
  "query-structure",
  "schema",
  "serde",
  "serde_json",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -3983,17 +3899,18 @@ dependencies = [
  "mongodb-query-connector",
  "opentelemetry",
  "opentelemetry-otlp",
+ "prisma-metrics",
  "psl",
  "quaint",
  "query-connector",
  "query-core",
- "query-engine-metrics",
  "request-handlers",
  "serde",
  "serde_json",
  "serial_test",
  "sql-query-connector",
  "structopt",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -4028,6 +3945,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sql-query-connector",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -4047,12 +3965,13 @@ dependencies = [
  "connection-string",
  "napi",
  "opentelemetry",
+ "prisma-metrics",
  "psl",
  "query-connector",
  "query-core",
- "query-engine-metrics",
  "serde",
  "serde_json",
+ "telemetry",
  "thiserror",
  "tracing",
  "tracing-futures",
@@ -4064,24 +3983,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "query-engine-metrics"
-version = "0.1.0"
-dependencies = [
- "expect-test",
- "metrics 0.18.1",
- "metrics-exporter-prometheus",
- "metrics-util 0.12.1",
- "once_cell",
- "parking_lot 0.12.1",
- "serde",
- "serde_json",
- "tokio",
- "tracing",
- "tracing-futures",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "query-engine-node-api"
 version = "0.1.0"
@@ -4096,17 +3997,18 @@ dependencies = [
  "napi-build",
  "napi-derive",
  "opentelemetry",
+ "prisma-metrics",
  "psl",
  "quaint",
  "query-connector",
  "query-core",
  "query-engine-common",
- "query-engine-metrics",
  "query-structure",
  "request-handlers",
  "serde",
  "serde_json",
  "sql-query-connector",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -4132,9 +4034,9 @@ dependencies = [
  "itertools 0.12.0",
  "once_cell",
  "paste",
+ "prisma-metrics",
  "prisma-value",
  "psl",
- "query-engine-metrics",
  "query-test-macros",
  "query-tests-setup",
  "serde_json",
@@ -4168,6 +4070,7 @@ dependencies = [
  "serde-wasm-bindgen",
  "serde_json",
  "sql-query-connector",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -4224,12 +4127,12 @@ dependencies = [
  "nom",
  "once_cell",
  "parse-hyperlinks",
+ "prisma-metrics",
  "psl",
  "qe-setup",
  "quaint",
  "query-core",
  "query-engine",
- "query-engine-metrics",
  "query-structure",
  "regex",
  "request-handlers",
@@ -4237,6 +4140,7 @@ dependencies = [
  "serde_json",
  "sql-query-connector",
  "strip-ansi-escapes",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -4388,11 +4292,11 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "10.7.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
 ]
 
 [[package]]
@@ -4426,15 +4330,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
@@ -4444,13 +4339,22 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.4.0",
+]
+
 [[package]]
 name = "regex"
 version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
- "aho-corasick 1.0.3",
+ "aho-corasick",
  "memchr",
  "regex-automata 0.4.5",
  "regex-syntax 0.8.2",
@@ -4471,7 +4375,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
- "aho-corasick 1.0.3",
+ "aho-corasick",
  "memchr",
  "regex-syntax 0.8.2",
 ]
@@ -4521,6 +4425,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sql-query-connector",
+ "telemetry",
  "thiserror",
  "tracing",
  "url",
@@ -5069,7 +4974,7 @@ dependencies = [
  "futures",
  "lazy_static",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot",
  "serial_test_derive",
 ]
 
@@ -5187,9 +5092,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
 [[package]]
 name = "sketches-ddsketch"
-version = "0.1.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
 
 [[package]]
 name = "slab"
@@ -5202,9 +5107,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
@@ -5328,6 +5233,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
+ "telemetry",
  "thiserror",
  "tokio",
  "tracing",
@@ -5608,6 +5514,36 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "telemetry"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "crossbeam-channel",
+ "crosstarget-utils",
+ "cuid",
+ "derive_more",
+ "enumflags2",
+ "futures",
+ "indexmap 2.2.2",
+ "itertools 0.12.0",
+ "lru 0.7.8",
+ "once_cell",
+ "opentelemetry",
+ "prisma-metrics",
+ "psl",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-futures",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+ "uuid",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.7.1"
@@ -5820,7 +5756,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
@@ -5861,8 +5797,8 @@ dependencies = [
 
 [[package]]
 name = "tokio-postgres"
-version = "0.7.7"
-source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3"
+version = "0.7.12"
+source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65"
 dependencies = [
  "async-trait",
  "byteorder",
@@ -5871,15 +5807,17 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot",
  "percent-encoding",
  "phf",
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
+ "rand 0.8.5",
  "socket2 0.5.7",
  "tokio",
  "tokio-util 0.7.8",
+ "whoami",
 ]
 
 [[package]]
@@ -6197,7 +6135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "rand 0.8.5",
+ "rand 0.3.23",
  "static_assertions",
 ]
 
@@ -6446,12 +6384,6 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -6459,20 +6391,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
+name = "wasite"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -6497,9 +6436,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6507,9 +6446,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6520,9 +6459,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-logger"
@@ -6581,6 +6520,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "whoami"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+dependencies = [
+ "redox_syscall 0.5.7",
+ "wasite",
+ "web-sys",
+]
+
 [[package]]
 name = "widestring"
 version = "1.0.2"
diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index a991bce5abc4..7208dfb869ae 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -13,13 +13,13 @@
 # function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "5.21.1";
+  version = "5.22.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    hash = "sha256-zVGnAFvxBRh7YGXET8YjDI+qXay6StgG618mRfpc4kw=";
+    hash = "sha256-aCzm7pEsgbZ4ZNir3DLNnUlmiydOpLNcW2FpIQ44B6E=";
   };
 
   # Use system openssl.
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
       "cuid-1.3.2" = "sha256-qBu1k/dJiA6rWBwk4nOOqouIneD9h2TTBT8tvs0TDfA=";
       "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4=";
       "mysql_async-0.31.3" = "sha256-2wOupQ/LFV9pUifqBLwTvA0tySv+XWbxHiqs7iTzvvg=";
-      "postgres-native-tls-0.5.0" = "sha256-4CftieImsG2mBqpoJFfyq0R2yd2EyQX4oddAwyXMDZc=";
+      "postgres-native-tls-0.5.0" = "sha256-pzMPNZzlvMaQqBu/V3ExPYVnoIaALeUaYJ4oo/hY9lA=";
       "mongodb-3.0.0" = "sha256-1WQgY0zSZhFjt1nrLYTUBrpqBxpCCgKRSeGJLtkE6pw=";
     };
   };
@@ -44,13 +44,6 @@ rustPlatform.buildRustPackage rec {
     protobuf
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
 
-  # FIXME: fix this upstream and remove this patch with the next version update.
-  postPatch = ''
-    file=libs/user-facing-errors/src/schema_engine.rs
-    echo "#![allow(dead_code)]" | cat - $file > $file.new
-    mv $file.new $file
-  '';
-
   preBuild = ''
     export OPENSSL_DIR=${lib.getDev openssl}
     export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib
diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix
deleted file mode 100644
index 008eba559b11..000000000000
--- a/pkgs/development/tools/database/prqlc/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, sqlite
-, zlib
-, stdenv
-, darwin
-, python3
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "prqlc";
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "prql";
-    repo = "prql";
-    rev = version;
-    hash = "sha256-XW0LnBt4gSuLQ8AjNTh6Rsd11x/dh45CQe818EZKRRs=";
-  };
-
-  cargoHash = "sha256-BecxuAOW+znKNe0s+UDPiqJ84BZU1P+f16Q53I4eXkI=";
-
-  nativeBuildInputs = [
-    pkg-config
-    rustPlatform.bindgenHook
-  ];
-
-  buildInputs =
-    [
-      openssl
-      sqlite
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.CoreFoundation
-      darwin.apple_sdk.frameworks.CoreServices
-      darwin.apple_sdk.frameworks.Security
-    ];
-
-  env = {
-    PYO3_PYTHON = "${python3}/bin/python3";
-  };
-
-  # we are only interested in the prqlc binary
-  postInstall = ''
-    rm -r $out/bin/compile-files $out/bin/mdbook-prql $out/lib
-  '';
-
-  meta = with lib; {
-    description = "CLI for the PRQL compiler - a simple, powerful, pipelined SQL replacement";
-    homepage = "https://github.com/prql/prql";
-    changelog = "https://github.com/prql/prql/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dit7ya ];
-  };
-}
diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix
deleted file mode 100644
index 9bd1cca620e9..000000000000
--- a/pkgs/development/tools/database/sqlcl/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "sqlcl";
-  version = "24.2.0.180.1721";
-
-  src = fetchurl {
-    url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
-    hash = "sha256-22cLWfeEqJm48KeUDDIMOnPu/R8oEAtBNBn3slfMGAE=";
-  };
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  unpackCmd = "unzip $curSrc";
-
-  installPhase = ''
-    mkdir -p $out/libexec
-    mv * $out/libexec/
-
-    makeWrapper $out/libexec/bin/sql $out/bin/sqlcl \
-      --set JAVA_HOME ${jdk.home} \
-      --chdir "$out/libexec/bin"
-  '';
-
-  meta = with lib; {
-    description = "Oracle's Oracle DB CLI client";
-    longDescription = ''
-      Oracle SQL Developer Command Line (SQLcl) is a free command line
-      interface for Oracle Database. It allows you to interactively or batch
-      execute SQL and PL/SQL. SQLcl provides in-line editing, statement
-      completion, and command recall for a feature-rich experience, all while
-      also supporting your previously written SQL*Plus scripts.
-    '';
-    homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/";
-    license = licenses.unfreeRedistributable;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ misterio77 ];
-  };
-})
diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix
deleted file mode 100644
index 15c0542de096..000000000000
--- a/pkgs/development/tools/database/sqlcmd/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, lib
-, sqlcmd
-, testers
-}:
-
-buildGoModule rec {
-  pname = "sqlcmd";
-  version = "1.8.0";
-
-  src = fetchFromGitHub {
-    repo = "go-sqlcmd";
-    owner = "microsoft";
-    rev = "v${version}";
-    sha256 = "sha256-QW8cDGXaj/10Y9UsU3WLalnFkf1+2ZBrFpf0Y5eTPUQ=";
-  };
-
-  vendorHash = "sha256-DgIn01nUIX1+JigC1Jr5ZqG3tAYiOPUm6md/TdcD2U4=";
-  proxyVendor = true;
-
-  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
-
-  subPackages = [ "cmd/modern" ];
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  postInstall = ''
-    mv $out/bin/modern $out/bin/sqlcmd
-
-    installShellCompletion --cmd sqlcmd \
-      --bash <($out/bin/sqlcmd completion bash) \
-      --fish <($out/bin/sqlcmd completion fish) \
-      --zsh <($out/bin/sqlcmd completion zsh)
-  '';
-
-  passthru.tests.version = testers.testVersion {
-    package = sqlcmd;
-    command = "sqlcmd --version";
-    inherit version;
-  };
-
-  meta = {
-    description = "Command line tool for working with Microsoft SQL Server, Azure SQL Database, and Azure Synapse";
-    mainProgram = "sqlcmd";
-    homepage = "https://github.com/microsoft/go-sqlcmd";
-    changelog = "https://github.com/microsoft/go-sqlcmd/releases/tag/v${version}";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ratsclub ];
-  };
-}
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
deleted file mode 100644
index 655156c176c6..000000000000
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
-
-let
-  version = "20.4.0.379.2205";
-
-  desktopItem = makeDesktopItem {
-    name = "sqldeveloper";
-    exec = "sqldeveloper";
-    icon = "sqldeveloper";
-    desktopName = "Oracle SQL Developer";
-    genericName = "Oracle SQL Developer";
-    comment = "Oracle's Oracle DB GUI client";
-    categories = [ "Development" ];
-  };
-in
-  stdenv.mkDerivation {
-
-  inherit version;
-  pname = "sqldeveloper";
-
-  src = requireFile rec {
-    name = "sqldeveloper-${version}-no-jre.zip";
-    url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html";
-    message = ''
-      This Nix expression requires that ${name} already be part of the store. To
-      obtain it you need to
-
-      - navigate to ${url}
-      - make sure that it says "Version ${version}" above the list of downloads
-        - if it does not, click on the "Previous Version" link below the downloads
-          and repeat until the version is correct. This is necessarry because as the
-          time of this writing there exists no permanent link for the current version
-          yet.
-          Also consider updating this package yourself (you probably just need to
-          change the `version` variable and update the sha256 to the one of the
-          new file) or opening an issue at the nixpkgs repo.
-      - accept the license agreement
-      - download the file listed under "Other Platforms"
-      - sign in or create an oracle account if neccessary
-
-      and then add the file to the Nix store using either:
-
-        nix-store --add-fixed sha256 ${name}
-
-      or
-
-        nix-prefetch-url --type sha256 file:///path/to/${name}
-    '';
-    sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
-  };
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  unpackCmd = "unzip $curSrc";
-
-  installPhase = ''
-    mkdir -p $out/libexec $out/share/{applications,pixmaps}
-    mv * $out/libexec/
-
-    mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png
-    cp ${desktopItem}/share/applications/* $out/share/applications
-
-    makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \
-      --set JAVA_HOME ${jdk.home} \
-      --chdir "$out/libexec/sqldeveloper/bin"
-  '';
-
-  meta = with lib; {
-    description = "Oracle's Oracle DB GUI client";
-    longDescription = ''
-      Oracle SQL Developer is a free integrated development environment that
-      simplifies the development and management of Oracle Database in both
-      traditional and Cloud deployments. SQL Developer offers complete
-      end-to-end development of your PL/SQL applications, a worksheet for
-      running queries and scripts, a DBA console for managing the database,
-      a reports interface, a complete data modeling solution, and a migration
-      platform for moving your 3rd party databases to Oracle.
-    '';
-    homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/";
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ardumont ];
-  };
-}
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index bd23f523276a..31d538597e51 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "squirrel-sql";
-  version = "4.7.1";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
-    sha256 = "sha256-Y7eG2otbLjtXvs3mRXWL8jJywuhBQ9i/MfWJXvkxnuU=";
+    sha256 = "sha256-uQuzh9CyGNJsbYvQiQAYmIyBgpIzXALg8dTFB1USkr0=";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index b24300558958..ef2584ab99e9 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -5,17 +5,18 @@
   glibcLocales,
   python3,
   fetchPypi,
+  nix-update-script,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "devpi-client";
-  version = "7.1.0";
+  version = "7.2.0";
   pyproject = true;
 
   src = fetchPypi {
-    pname = "devpi_client";
+    pname = "devpi-client";
     inherit version;
-    hash = "sha256-NwbhrojxOJSpDvMk0MbAGCbjmS8z2g1ynW6zzgVvy/M=";
+    hash = "sha256-wUM2hFjDh4unvuah2bQY4uZZVxo4VmFPWNdriigmnXs=";
   };
 
   build-system = with python3.pkgs; [
@@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "devpi" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Client for devpi, a pypi index server and packaging meta tool";
     homepage = "http://doc.devpi.net";
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index c1dfc4841931..e32f0702e2aa 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,5 @@
 { lib, fetchFromGitHub, buildPythonApplication
+, gitUpdater
 , pythonOlder
 , aiohttp
 , appdirs
@@ -29,7 +30,7 @@
 
 buildPythonApplication rec {
   pname = "devpi-server";
-  version = "6.10.0";
+  version = "6.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -38,7 +39,7 @@ buildPythonApplication rec {
     owner = "devpi";
     repo = "devpi";
     rev = "server-${version}";
-    hash = "sha256-JqYWWItdAgtUtiYSqxUd40tT7ON4oHiDA4/3Uhb01b8=";
+    hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA=";
   };
 
   sourceRoot = "${src.name}/server";
@@ -116,6 +117,11 @@ buildPythonApplication rec {
     };
   };
 
+  # devpi uses a monorepo for server,common,client and web
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "server-";
+  };
+
   meta = with lib;{
     homepage = "http://doc.devpi.net";
     description = "Github-style pypi index server and packaging meta tool";
diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
index 0d30fc4f3800..1859249eb0f3 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -1,28 +1,30 @@
 { lib
 , buildPythonApplication
 , fetchFromGitHub
-, pythonOlder
+, setuptools
 }:
 buildPythonApplication rec {
   pname = "djhtml";
-  version = "3.0.6";
-
-  format = "setuptools";
-  disabled = pythonOlder "3.7";
+  version = "3.0.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rtts";
-    repo = pname;
+    repo = "djhtml";
     rev = "refs/tags/${version}";
-    hash = "sha256-3bviLyTLpHcAUWAaAmNZukWBDwFs8yFOAxl2bSk9GNY=";
+    hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "djhtml" ];
 
   meta = with lib; {
     homepage = "https://github.com/rtts/djhtml";
     description = "Django/Jinja template indenter";
+    changelog = "https://github.com/rtts/djhtml/releases/tag/${version}";
     license = licenses.gpl3Plus;
     maintainers = [ ];
+    mainProgram = "djhtml";
   };
 }
diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix
deleted file mode 100644
index afd694d4d7de..000000000000
--- a/pkgs/development/tools/documentation/antora/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, buildNpmPackage, fetchFromGitLab }:
-
-buildNpmPackage rec {
-  pname = "antora";
-  version = "3.1.9";
-
-  src = fetchFromGitLab {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8=";
-  };
-
-  npmDepsHash = "sha256-ngreuitwUcIDVF6vW7fZA1OaVxr9fv7s0IjCErXlcxg=";
-
-  # This is to stop tests from being ran, as some of them fail due to trying to query remote repositories
-  postPatch = ''
-    substituteInPlace package.json --replace \
-      '"_mocha"' '""'
-  '';
-
-  postInstall = ''
-    mkdir -p $out/bin
-    ln -s $out/lib/node_modules/antora-build/packages/cli/bin/antora $out/bin/antora
-  '';
-
-  meta = with lib; {
-    description = "Modular documentation site generator. Designed for users of Asciidoctor";
-    mainProgram = "antora";
-    homepage = "https://antora.org";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.ehllie ];
-  };
-}
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 39f1d1011b33..6835c8a6263e 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -43,7 +43,7 @@ let
       ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = optional (versionOlder version "30.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "31.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher = vers: tag: hash: fetchurl {
@@ -97,7 +97,7 @@ let
     xorg.libxkbfile
     pango
     pciutils
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
     systemd
   ]
     ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ]
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 2ed339ff7943..e6f6c9f38f11 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -56,35 +56,35 @@
     },
     "31": {
         "hashes": {
-            "aarch64-darwin": "dec23ecc15f4d0503163c5f65f59114127ce6d2518af8e6547ea787372575fcb",
-            "aarch64-linux": "1911b1cef253d68fead45432e93740223c686ebc11c931bdd08439ec88030cfd",
-            "armv7l-linux": "957d888d016270b658fb558f6e2061ffaa7f71c9d2b1c73c4f122342519ba741",
-            "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88",
-            "x86_64-darwin": "4d5d21963bf833ccc25edbc2e8e884f408e24c2a39b53f1d0c30f4017ac2ba8a",
-            "x86_64-linux": "86b3794aba055e84f23cba5d8319ca9f23a05385d2c06fe7d78d24d2bb356b67"
+            "aarch64-darwin": "d275eebc7cdaa1374e18ca97fe864767642203d89a0c66a49ed2e37acd11ff1c",
+            "aarch64-linux": "b67eb45065b3045041ccca358a9b608ff2fce9eb08ab45085b43c69790476e21",
+            "armv7l-linux": "58a257d20535933982ed27b5b58a79222e7b95b8fd24e057c06140755a03be10",
+            "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj",
+            "x86_64-darwin": "1d64ae2924c92ee56bbd195076e125c80cc9cb47ebd88700600a504f212c3057",
+            "x86_64-linux": "bab1b66aa54d3d32e98c1b298a8c5ef38a2adb6205b697e34ea5fa1aec7727aa"
         },
-        "version": "31.6.0"
+        "version": "31.7.2"
     },
     "32": {
         "hashes": {
-            "aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259",
-            "aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342",
-            "armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc",
-            "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
-            "x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907",
-            "x86_64-linux": "4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185"
+            "aarch64-darwin": "c3fd68b5bdf0346c99b7c6bf41804dcaa74701847f5bbc58d25c261d33056967",
+            "aarch64-linux": "5587eeed9c507fc0f62006cb5206b37cd335d34ad0ae692d1c44b8009e2c0ab7",
+            "armv7l-linux": "cd44653e3602136a9dabef1db9305df8b1a24e77ace24f0cccbeed1fc041ce2c",
+            "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi",
+            "x86_64-darwin": "4ee209cdf27df4af79fad026a24b3df120ff9c89c2bdbc68ab5478fa7f32f5d7",
+            "x86_64-linux": "0b515f5ba76e919540af17251a4ce4bc355fdb497fcd7bd47d689872a1aae82c"
         },
-        "version": "32.2.1"
+        "version": "32.2.2"
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "75f3267e5517bb35cbfc11f2d5673947cfa8a510dc3a78c46356a948650027f2",
-            "aarch64-linux": "6c321b5f8f8fc694c09f6c904ad0a40a0eff1b84b2b771f6eae292e197e3a8c1",
-            "armv7l-linux": "d54e4820ab965acaa21940e15b79278fdbff4df083f162cd2a192541cf5a7063",
-            "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f",
-            "x86_64-darwin": "945a07cec9eb2bdfa6a7ae6971f1df564447a5eeea3d533abae3ef5eac1966a1",
-            "x86_64-linux": "497ff71b2cacfc0a001fcfd3d852fd758e20604622ddfa2932dc32074c48af66"
+            "aarch64-darwin": "2d31f140b1a6cfa6efb509e644dee5830601e4d73d47539a8af20d57e8ae7b12",
+            "aarch64-linux": "43157d520ff6094ef7c390e49d1eec1ba58a488e150114c08e7157fb321fca7b",
+            "armv7l-linux": "1cb4a8422addfbb109a26f3cb4f406d793e5f04617bdc34b825dd17d84045906",
+            "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c",
+            "x86_64-darwin": "4bf99f30f124b447ef3b178e5ba0cdfe1faefa6a725bcde76a35eb26a50d4333",
+            "x86_64-linux": "933dc1eae3f2db67912b3ab056fd15a7ca3e1328fe8dd6a1f5266c5a063b1121"
         },
-        "version": "33.0.0"
+        "version": "33.0.2"
     }
 }
diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix
index 1eb1a8d870b8..6ee587b26ef9 100644
--- a/pkgs/development/tools/electron/chromedriver/generic.nix
+++ b/pkgs/development/tools/electron/chromedriver/generic.nix
@@ -51,7 +51,7 @@ let
     src = fetcher version (get tags platform) (get hashes platform);
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       glib
       xorg.libxcb
       nspr
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 55e31c5b1641..2ff177f3567a 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,35 +23,35 @@
     },
     "31": {
         "hashes": {
-            "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f",
-            "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9",
-            "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2",
-            "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88",
-            "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a",
-            "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402"
+            "aarch64-darwin": "e49778b48b971b06e965aa2a3cd07194a4c4c1f66e3a3565e97f21a94865fea8",
+            "aarch64-linux": "9a28b5402e88b74657e2e89eeafbeedc9fed3ec1f36f408ddeef12871042278d",
+            "armv7l-linux": "465f71ab1385c3538f10d1d463fc482be04ab3e53b0a31291e124f1b88d175ca",
+            "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj",
+            "x86_64-darwin": "8ede4560f070f8d7e08e1c71f4135c10b164a077befe255110b957d32b865db5",
+            "x86_64-linux": "b3d19e86d5fc4d49c7e340282e421590ee1a81d6a75fdf4aea85b36e2c39d8a9"
         },
-        "version": "31.6.0"
+        "version": "31.7.2"
     },
     "32": {
         "hashes": {
-            "aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec",
-            "aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00",
-            "armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7",
-            "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
-            "x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b",
-            "x86_64-linux": "2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297"
+            "aarch64-darwin": "0ed199847a33fafa4482e1a49e5e8394f09a433eb5f2e638e25faac80ce2d435",
+            "aarch64-linux": "fb6f143eaff79c7096a8c2164d8b30dcd564056e1b9ec7e30b1290d8c5ec2b10",
+            "armv7l-linux": "15350e535ed59660f3d2082d13231a56f847f3e3deaeb05c3fd714629322492c",
+            "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi",
+            "x86_64-darwin": "af52397c32446f114619d5cd2ec6d83748095a0cd6a5c0c95479397e4ed30be5",
+            "x86_64-linux": "05a35b7b2d77012bef8c9920cec87f4356aff191aa7009ffaa2e8e3cfac888e4"
         },
-        "version": "32.2.1"
+        "version": "32.2.2"
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "c0717f7dc5a2e3f99688389e643e9dc2e513a948df537abadc24230e1c93a1a3",
-            "aarch64-linux": "32887c18a8acb0d36eba6e3d9d9f763dda9155f98a948958b446681b9da63ed3",
-            "armv7l-linux": "c52961bcc5d2764d8a144a4fc2b9c25e904c8345deec9253dcaca7d560508a56",
-            "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f",
-            "x86_64-darwin": "13086ff2417512f9c87982857e67f25ee05f55e3bb18b5d373264c153a50e166",
-            "x86_64-linux": "b07f166b53bdf64282e8ba73bf6a6bc86844dd38c183ee7ecbad5d281ee380ea"
+            "aarch64-darwin": "31b21d4f0798b0a91e7b41fd354c8d6b64345668db2948a8b0ebe9dc33992102",
+            "aarch64-linux": "d79008c5024612d94bb03c20c753fc93e66cbc49fa4d56438e249b1e3bfb4d68",
+            "armv7l-linux": "b2afa0b00e88dd5bb5bffafa8ffbb0501fbcc0bb7d67eacda46026bf92d92590",
+            "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c",
+            "x86_64-darwin": "aeeca15c1925c57fa91f71b56781270549eb4cd7a82ed423335cb5a2e92fa0b0",
+            "x86_64-linux": "ace2073bfe2e9c340255b6a33ad2df61070e002bea645ce522b63a466428bd5e"
         },
-        "version": "33.0.0"
+        "version": "33.0.2"
     }
 }
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 15675c7d87da..bd4843edbcca 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -49,14 +49,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
 
   src = null;
 
-  patches = base.patches ++ lib.optional (lib.versionOlder info.version "30")
-    (substituteAll {
-      # disable a component that requires CIPD blobs
-      name = "disable-screen-ai.patch";
-      src = ./disable-screen-ai.patch;
-      inherit (info) version;
-    })
-  ;
+  patches = base.patches;
 
   unpackPhase = ''
     runHook preUnpack
@@ -174,9 +167,6 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
     dawn_use_built_dxc = false;
     v8_enable_private_mapping_fork_optimization = true;
     v8_expose_public_symbols = true;
-  } // lib.optionalAttrs (lib.versionOlder info.version "31") {
-    use_perfetto_client_library = false;
-  } // lib.optionalAttrs (lib.versionAtLeast info.version "31") {
     enable_dangling_raw_ptr_feature_flag = false;
     clang_unsafe_buffers_paths = "";
     enterprise_cloud_content_analysis = false;
@@ -203,7 +193,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
       libPath = lib.makeLibraryPath [
         libnotify
         pipewire
-        stdenv.cc.cc.lib
+        stdenv.cc.cc
         libsecret
         libpulseaudio
         speechd-minimal
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 046de00cf35e..e08754d49d4f 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1,921 +1,4 @@
 {
-    "30": {
-        "chrome": "124.0.6367.243",
-        "chromium": {
-            "deps": {
-                "gn": {
-                    "hash": "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=",
-                    "rev": "22581fb46c0c0c9530caa67149ee4dd8811063cf",
-                    "url": "https://gn.googlesource.com/gn",
-                    "version": "2024-03-14"
-                }
-            },
-            "version": "124.0.6367.243"
-        },
-        "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=",
-        "deps": {
-            "src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=",
-                "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                "rev": "124.0.6367.243",
-                "url": "https://chromium.googlesource.com/chromium/src.git"
-            },
-            "src/chrome/test/data/perf/canvas_bench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
-            },
-            "src/chrome/test/data/perf/frame_rate/content": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
-                "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
-                "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
-            },
-            "src/chrome/test/data/xr/webvr_info": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
-                "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
-                "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
-            },
-            "src/docs/website": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-2WyiSqza9Mp2G8KHUnrzfikC7hGcUTLu4/W9AD6Zdi4=",
-                "rev": "02057aa20e0dd4598967e3daf2f25c815962ef1c",
-                "url": "https://chromium.googlesource.com/website.git"
-            },
-            "src/electron": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-LkDhMO6FOS/8WgAQBs3HZ8ujkS4yBtVJR7ARxEiJIME=",
-                "owner": "electron",
-                "repo": "electron",
-                "rev": "v30.5.1"
-            },
-            "src/media/cdm/api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
-                "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28",
-                "url": "https://chromium.googlesource.com/chromium/cdm.git"
-            },
-            "src/net/third_party/quiche/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-BJ3CCKFHOcIgIqnYxfjfOqbRhnt9ycrZfAFRZOLPYZQ=",
-                "rev": "9f8738892edd83219d2f83fdd73c7c14d5dbb80d",
-                "url": "https://quiche.googlesource.com/quiche.git"
-            },
-            "src/third_party/accessibility_test_framework/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
-                "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-                "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
-            },
-            "src/third_party/angle": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=",
-                "rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59",
-                "url": "https://chromium.googlesource.com/angle/angle.git"
-            },
-            "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-eQvZmm6aAsI+z++SMM9i/SsREjikIjMLpedzw57eKyA=",
-                "rev": "ec9827528085fcffca353c8d941ec20e3de7aaea",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
-            },
-            "src/third_party/angle/third_party/glmark2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=",
-                "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
-                "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
-            },
-            "src/third_party/angle/third_party/rapidjson/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
-                "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
-                "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
-            },
-            "src/third_party/anonymous_tokens/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ZKvfil6V4PexxVl/UCW/mUINlCHBTrZnhTB0UhTW0PQ=",
-                "rev": "321a40ba18a083feccb8ae2f99a8676bb1702676",
-                "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
-            },
-            "src/third_party/beto-core/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=",
-                "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8",
-                "url": "https://beto-core.googlesource.com/beto-core.git"
-            },
-            "src/third_party/boringssl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-RiDdH26xzoAD2NdTNKDraco9p2jKHXJxbRWI3pUhI78=",
-                "rev": "4fa4804c8ab4521079af62dba5260a99c34b8a29",
-                "url": "https://boringssl.googlesource.com/boringssl.git"
-            },
-            "src/third_party/breakpad/breakpad": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=",
-                "rev": "76788faa4ef163081f82273bfca7fae8a734b971",
-                "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
-            },
-            "src/third_party/cast_core/public/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=",
-                "rev": "71f51fd6fa45fac73848f65421081edd723297cd",
-                "url": "https://chromium.googlesource.com/cast_core/public"
-            },
-            "src/third_party/catapult": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-HhpP5OeGF9in2XEoZMfMCIAFHAqlDvJpfSWa8JfGWzM=",
-                "rev": "9128ec6d34905512199f953bc60ff75ca29d0cf2",
-                "url": "https://chromium.googlesource.com/catapult.git"
-            },
-            "src/third_party/ced/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
-                "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
-                "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
-            },
-            "src/third_party/chromium-variations": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YwnqJynhunMvIduUcJ1/nBLabe/WS4RDox+XLMYMA2c=",
-                "rev": "e78e275e34f94fdf333245137878f0f6482db67d",
-                "url": "https://chromium.googlesource.com/chromium-variations.git"
-            },
-            "src/third_party/clang-format/script": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=",
-                "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
-            },
-            "src/third_party/cld_3/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
-                "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
-                "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
-            },
-            "src/third_party/colorama/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                "url": "https://chromium.googlesource.com/external/colorama.git"
-            },
-            "src/third_party/content_analysis_sdk/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
-                "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
-                "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
-            },
-            "src/third_party/cpu_features/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
-                "rev": "936b9ab5515dead115606559502e3864958f7f6e",
-                "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
-            },
-            "src/third_party/cpuinfo/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9QRj4OA1qWlZujVJ6Z9x3190taVjTCZocM/272eepIs=",
-                "rev": "aa4b2163b99ac9534194520f70b93eeefb0b3b4e",
-                "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
-            },
-            "src/third_party/crc32c/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=",
-                "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6",
-                "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
-            },
-            "src/third_party/cros-components/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-w2VosAdg+GtalFaGxDB8FB2w7498PMudsXxX4SpJqYE=",
-                "rev": "a254b37189cf97cfc76634644e58be511aefb69a",
-                "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
-            },
-            "src/third_party/cros_system_api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-dFp4Hy7fldUjXxUTtcyRXdt7zpIP2lchzDKkk0b+iko=",
-                "rev": "9a51dc89c4f21362e858b20a6a7cc8adfd7c7238",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
-            },
-            "src/third_party/crossbench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=",
-                "rev": "acbea986f40578f43c88239c78c797f61842e642",
-                "url": "https://chromium.googlesource.com/crossbench.git"
-            },
-            "src/third_party/dav1d/libdav1d": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=",
-                "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d",
-                "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
-            },
-            "src/third_party/dawn": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=",
-                "rev": "e04b03f714994b7a747b5472da4ffae9e6e38938",
-                "url": "https://dawn.googlesource.com/dawn.git"
-            },
-            "src/third_party/dawn/third_party/dxc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=",
-                "rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b",
-                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
-            },
-            "src/third_party/dawn/third_party/dxheaders": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
-                "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
-                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
-            },
-            "src/third_party/dawn/third_party/glfw": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=",
-                "rev": "62e175ef9fae75335575964c845a302447c012c7",
-                "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
-            },
-            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
-                "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
-            },
-            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
-                "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
-            },
-            "src/third_party/dawn/third_party/webgpu-cts": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-VTYTdvBNxqRzYjEx5ml4LnkDEUGpyvssSzDOndHyYgU=",
-                "rev": "3e45aee0b16dc724a79a0feb0490e2ddb06c9f0d",
-                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
-            },
-            "src/third_party/depot_tools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YmjhwOjqCRxDhC7P+aRoNN+Vokl7hB4s6hDNFS5gLYo=",
-                "rev": "9c43bc14f1a7404fd4b6f744050d553acca557bf",
-                "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
-            },
-            "src/third_party/devtools-frontend/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-FVYUoK3KWlIjQTWlNkjmnzJDfpRkEZ9sFWTr4GdOUJw=",
-                "rev": "694ad4ed3c55195acd701950d2b2528880e9201e",
-                "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
-            },
-            "src/third_party/dom_distiller_js/dist": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
-                "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
-                "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
-            },
-            "src/third_party/eigen3/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=",
-                "rev": "2a9055b50ed22101da7d77e999b90ed50956fe0b",
-                "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
-            },
-            "src/third_party/electron_node": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=",
-                "owner": "nodejs",
-                "repo": "node",
-                "rev": "v20.16.0"
-            },
-            "src/third_party/emoji-segmenter/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=",
-                "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e",
-                "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
-            },
-            "src/third_party/engflow-reclient-configs": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                "owner": "EngFlow",
-                "repo": "reclient-configs",
-                "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
-            },
-            "src/third_party/expat/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=",
-                "rev": "441f98d02deafd9b090aea568282b28f66a50e36",
-                "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
-            },
-            "src/third_party/farmhash/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
-                "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
-                "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
-            },
-            "src/third_party/ffmpeg": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5ynDd2wQ3QtS6SM2X+j3hTKB9aVhGrjoIlGSzy43K8Q=",
-                "rev": "52d8ef3799b2f16b66351dd0972bb0bcee1648ac",
-                "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
-            },
-            "src/third_party/flac": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
-            },
-            "src/third_party/flatbuffers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=",
-                "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5",
-                "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
-            },
-            "src/third_party/fontconfig/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                "url": "https://chromium.googlesource.com/external/fontconfig.git"
-            },
-            "src/third_party/fp16/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
-            },
-            "src/third_party/freetype-testing/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=",
-                "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
-                "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
-            },
-            "src/third_party/freetype/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-FtFRJaxyp7vo4EPBiqx05OsKo1UA1g/h+9BjuoijLFA=",
-                "rev": "f42ce25563b73fed0123d18a2556b9ba01d2c76b",
-                "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
-            },
-            "src/third_party/fuzztest/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-utl9uwFqMqDW9ll9/3lh3rfjmPHlv5sx/enQuPffQZ8=",
-                "rev": "bddcd9f77ba0a81a99ce50bcadf5149efe545df0",
-                "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
-            },
-            "src/third_party/fxdiv/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
-            },
-            "src/third_party/gemmlowp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
-            },
-            "src/third_party/google_benchmark/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=",
-                "rev": "344117638c8ff7e239044fd0fa7085839fc03021",
-                "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
-            },
-            "src/third_party/googletest/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-mNYS3k2fAc7Q6GlpnO7pkXSkGHfUH1MXuZXkCmwG4q4=",
-                "rev": "c231e6f5b152029dbd5fa4a9e0c04095035aec3f",
-                "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
-            },
-            "src/third_party/grpc/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
-                "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
-                "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
-            },
-            "src/third_party/harfbuzz-ng/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=",
-                "rev": "155015f4bec434ecc2f94621665844218f05ce51",
-                "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
-            },
-            "src/third_party/highway/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=",
-                "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a",
-                "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
-            },
-            "src/third_party/hunspell_dictionaries": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
-            },
-            "src/third_party/icu": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=",
-                "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f",
-                "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
-            },
-            "src/third_party/jsoncpp/source": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
-                "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
-                "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
-            },
-            "src/third_party/leveldatabase/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=",
-                "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea",
-                "url": "https://chromium.googlesource.com/external/leveldb.git"
-            },
-            "src/third_party/libFuzzer/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=",
-                "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
-            },
-            "src/third_party/libaddressinput/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
-                "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
-                "url": "https://chromium.googlesource.com/external/libaddressinput.git"
-            },
-            "src/third_party/libaom/source/libaom": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-zgtNjrQE+fzr8Aye0rAkQR5enzfacCAsRbC3crUrMQ4=",
-                "rev": "158761dfb40e77f3a54c3b14a596112837baa24b",
-                "url": "https://aomedia.googlesource.com/aom.git"
-            },
-            "src/third_party/libavif/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-moVf7i0gZ/KW53ACcVIWKWNL0oAimOSU1m5IdQHz6z8=",
-                "rev": "43ec9ace31c6ca11efddddb61b94b744450d46e2",
-                "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
-            },
-            "src/third_party/libavifinfo/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=",
-                "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a",
-                "url": "https://aomedia.googlesource.com/libavifinfo.git"
-            },
-            "src/third_party/libc++/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-k2bSS8OhVyd0/metFpwFvRCWYOaLEU0Md4AW50GpGTM=",
-                "rev": "80307e66e74bae927fb8709a549859e777e3bf0b",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
-            },
-            "src/third_party/libc++abi/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AdyX58sg//O2e76HAcRC5DcuiTsd68QS4mNVkPv0Vck=",
-                "rev": "ec88f0ab262c5f2426dbf138b92ee9ae5961e431",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
-            },
-            "src/third_party/libdrm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=",
-                "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
-            },
-            "src/third_party/libgav1/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tB9Wzjs4Sct7QendDMKkaEE4ddD6ptnNCmj1yYKcQSc=",
-                "rev": "f9a93151adf7203c6ab90f3c94bbd5972b7967b8",
-                "url": "https://chromium.googlesource.com/codecs/libgav1.git"
-            },
-            "src/third_party/libipp/libipp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
-            },
-            "src/third_party/libjpeg_turbo": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=",
-                "rev": "9b894306ec3b28cea46e84c32b56773a98c483da",
-                "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
-            },
-            "src/third_party/liblouis/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                "url": "https://chromium.googlesource.com/external/liblouis-github.git"
-            },
-            "src/third_party/libphonenumber/dist": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
-                "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
-                "url": "https://chromium.googlesource.com/external/libphonenumber.git"
-            },
-            "src/third_party/libprotobuf-mutator/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
-                "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
-                "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
-            },
-            "src/third_party/libsrtp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=",
-                "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a",
-                "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
-            },
-            "src/third_party/libsync/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
-            },
-            "src/third_party/libunwind/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=",
-                "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
-            },
-            "src/third_party/libvpx/source/libvpx": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5IsUUvhcKKiWJFetS29+S7Wiz5JwqRZGK2t2ehld/M4=",
-                "rev": "19832b1702d5b0adf616a0e080abd5207c8445b5",
-                "url": "https://chromium.googlesource.com/webm/libvpx.git"
-            },
-            "src/third_party/libwebm/source": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=",
-                "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da",
-                "url": "https://chromium.googlesource.com/webm/libwebm.git"
-            },
-            "src/third_party/libwebp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=",
-                "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760",
-                "url": "https://chromium.googlesource.com/webm/libwebp.git"
-            },
-            "src/third_party/libyuv": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=",
-                "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275",
-                "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
-            },
-            "src/third_party/lss": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
-                "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
-                "url": "https://chromium.googlesource.com/linux-syscall-support.git"
-            },
-            "src/third_party/material_color_utilities/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
-                "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
-                "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
-            },
-            "src/third_party/minigbm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
-            },
-            "src/third_party/nan": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                "owner": "nodejs",
-                "repo": "nan",
-                "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
-            },
-            "src/third_party/nasm": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
-                "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
-                "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
-            },
-            "src/third_party/nearby/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YotKuKutnjuphwiElfQO6qpoNLhZGP6bqWZnW3Zv6QI=",
-                "rev": "33e682f24427a0eb634bd3186fe3c6fd96bd6768",
-                "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
-            },
-            "src/third_party/neon_2_sse/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=",
-                "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
-                "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
-            },
-            "src/third_party/openh264/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=",
-                "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7",
-                "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
-            },
-            "src/third_party/openscreen/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=",
-                "rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780",
-                "url": "https://chromium.googlesource.com/openscreen"
-            },
-            "src/third_party/openscreen/src/buildtools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-SBorO59kMSnskcp3oP5lrGQg+9cr/Ymey2aZGlRTgu0=",
-                "rev": "0ac67b7cef80e421283f633ee9c2ce652f6e42cc",
-                "url": "https://chromium.googlesource.com/chromium/src/buildtools"
-            },
-            "src/third_party/openscreen/src/third_party/tinycbor/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
-                "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
-                "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
-            },
-            "src/third_party/ots/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
-            },
-            "src/third_party/pdfium": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=",
-                "rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc",
-                "url": "https://pdfium.googlesource.com/pdfium.git"
-            },
-            "src/third_party/perfetto": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-FeI+nAa5N8mQoA8gDSmWn6nw6TSPhDGwJI8/7r/5z1c=",
-                "rev": "a66020f87046d8934c22e20acb2bb8a91901ce8e",
-                "url": "https://android.googlesource.com/platform/external/perfetto.git"
-            },
-            "src/third_party/protobuf-javascript/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
-                "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
-                "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
-            },
-            "src/third_party/pthreadpool/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=",
-                "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
-            },
-            "src/third_party/pyelftools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
-            },
-            "src/third_party/pywebsocket3/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
-                "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
-                "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
-            },
-            "src/third_party/quic_trace/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=",
-                "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc",
-                "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
-            },
-            "src/third_party/re2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gB6vW6UJ60LrrGeNP6NKAcirIK6jgZjHRc6TA+pNXAQ=",
-                "rev": "6598a8ecd57724c8c7d43b2fca8eb9f9969ce57c",
-                "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
-            },
-            "src/third_party/ruy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-cwmKQJpR+7lp+dq8fGu6U8A+qmkXz6SlWvAdhBkKZOw=",
-                "rev": "587c2cf8b11d3c32fa26887063eda3171a3d353e",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
-            },
-            "src/third_party/securemessage/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
-            },
-            "src/third_party/skia": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=",
-                "rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826",
-                "url": "https://skia.googlesource.com/skia.git"
-            },
-            "src/third_party/smhasher/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
-                "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
-                "url": "https://chromium.googlesource.com/external/smhasher.git"
-            },
-            "src/third_party/snappy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
-                "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
-                "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
-            },
-            "src/third_party/speedometer/v3.0": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
-                "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
-                "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-            },
-            "src/third_party/sqlite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-TsrSvL76H7SFhJWgHqyl8Y/BhAcnI9oaT2tUT6Ktan4=",
-                "rev": "f51e3fa404f5853650525549c78d7489a7f457b3",
-                "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
-            },
-            "src/third_party/squirrel.mac": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                "owner": "Squirrel",
-                "repo": "Squirrel.Mac",
-                "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
-            },
-            "src/third_party/squirrel.mac/vendor/Mantle": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                "owner": "Mantle",
-                "repo": "Mantle",
-                "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
-            },
-            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                "owner": "ReactiveCocoa",
-                "repo": "ReactiveObjC",
-                "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
-            },
-            "src/third_party/swiftshader": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tU0maePvL35JIVKFm+9hmPYDM81szLNYqUJyTKMHT0k=",
-                "rev": "bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca",
-                "url": "https://swiftshader.googlesource.com/SwiftShader.git"
-            },
-            "src/third_party/text-fragments-polyfill/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
-                "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
-                "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
-            },
-            "src/third_party/tflite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Iqun3uMTCjGzHxUDeTCrvZufNtobnbqYVPDt7ZJ06wM=",
-                "rev": "55bc062601e4ee5a4efa834a84ae5c5ec6b28306",
-                "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
-            },
-            "src/third_party/ukey2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
-            },
-            "src/third_party/vulkan-deps": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-MokWdjOP8Mc5hmoRrSXHXkobMPWbbmMzAMBOOoKG3gk=",
-                "rev": "3cebaae6743688201c8aa9b3694bba6948f0fa68",
-                "url": "https://chromium.googlesource.com/vulkan-deps"
-            },
-            "src/third_party/vulkan-deps/glslang/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-lP+N1d6jE+Cj5ofomgMEhbA6VbH5eKw83mY6zNIOfNk=",
-                "rev": "9f37ad360ea1c32162f0cc1799b1b292594fc771",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
-            },
-            "src/third_party/vulkan-deps/spirv-cross/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
-            },
-            "src/third_party/vulkan-deps/spirv-headers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4=",
-                "rev": "8b246ff75c6615ba4532fe4fde20f1be090c3764",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
-            },
-            "src/third_party/vulkan-deps/spirv-tools/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/Cldtx75V+z3FuColEqwweyZHEqR2NaIj1Ha/vPoCsc=",
-                "rev": "c6615779ef8a1eb5ef48fef77bf3eb2cf4f5438d",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
-            },
-            "src/third_party/vulkan-deps/vulkan-headers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4=",
-                "rev": "577baa05033cf1d9236b3d078ca4b3269ed87a2b",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
-            },
-            "src/third_party/vulkan-deps/vulkan-loader/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4=",
-                "rev": "61a9c50248e09f3a0e0be7ce6f8bb1663855f979",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
-            },
-            "src/third_party/vulkan-deps/vulkan-tools/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9qs0oS6W7x/1Z+wlFt91bqF09oxoloNPtjjH9mECJFk=",
-                "rev": "733fd2b522918f81f9c4669350dafd066f99c5d5",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
-            },
-            "src/third_party/vulkan-deps/vulkan-utility-libraries/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0=",
-                "rev": "a4140c5fd47dcf3a030726a60b293db61cfb54a3",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
-            },
-            "src/third_party/vulkan-deps/vulkan-validation-layers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Bcm5yMo7JL/E6YZetlabkA0mkEFxbWriYNd8tRtgx5k=",
-                "rev": "5b8af92af052c83444ac560ff1e28c1c322424ef",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
-            },
-            "src/third_party/vulkan_memory_allocator": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
-                "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-                "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
-            },
-            "src/third_party/wayland-protocols/gtk": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
-                "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
-                "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
-            },
-            "src/third_party/wayland-protocols/kde": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
-                "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
-                "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
-            },
-            "src/third_party/wayland-protocols/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=",
-                "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5",
-                "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-            },
-            "src/third_party/wayland/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YSo1DznmcaYSUcJl/3voVSfZfuLokAFQt6F3M1Iat28=",
-                "rev": "c35d1a3d1c0a1735afe5eb227cb826faa878ec19",
-                "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
-            },
-            "src/third_party/webdriver/pylib": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
-            },
-            "src/third_party/webgl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=",
-                "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed",
-                "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
-            },
-            "src/third_party/webgpu-cts/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/duXwmqanyI2KEnV5izvr0kE8tJNI1F1jMMIY0ylLH8=",
-                "rev": "addbf812fd750dc8cebbd63732e7ce54a763fbee",
-                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
-            },
-            "src/third_party/webrtc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-USSfh+vUFrWnXYvZIORRb4AEGNSCPub2cNqEdZD9mKM=",
-                "rev": "a55ff9e83e4592010969d428bee656bace8cbc3b",
-                "url": "https://webrtc.googlesource.com/src.git"
-            },
-            "src/third_party/weston/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
-                "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
-                "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
-            },
-            "src/third_party/wuffs/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
-                "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
-                "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
-            },
-            "src/third_party/xdg-utils": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
-            },
-            "src/third_party/xnnpack/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Cmw+rj805YTnnCwy2Zwzi2ZW4sdX5JWjTnBaUB6+YyU=",
-                "rev": "7e696d941310a528dd2d6fbee3d499d19b24746d",
-                "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
-            },
-            "src/third_party/zstd/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hWfYKiTzkmeiUTgNrSYXOFauusSVceVhD04Hgk69CK4=",
-                "rev": "621a263fb2e6c2175fbd489e5d77ee8038baa2b2",
-                "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
-            },
-            "src/tools/page_cycler/acid3": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
-                "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
-                "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
-            },
-            "src/v8": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=",
-                "rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757",
-                "url": "https://chromium.googlesource.com/v8/v8.git"
-            }
-        },
-        "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c",
-        "modules": "123",
-        "node": "20.16.0",
-        "version": "30.5.1"
-    },
     "31": {
         "chrome": "126.0.6478.234",
         "chromium": {
@@ -964,10 +47,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-dw2WLjkHCt/uYXT+eZpaJ1bdB6DdMcJLjnscREp4YU8=",
+                "hash": "sha256-OlnSVTCfhl8Gl6DHG6JBi/x0G9cXar1KC3mfxcZ3y1Y=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v31.6.0"
+                "rev": "v31.7.2"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -1211,10 +294,10 @@
             },
             "src/third_party/electron_node": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=",
+                "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=",
                 "owner": "nodejs",
                 "repo": "node",
-                "rev": "v20.17.0"
+                "rev": "v20.18.0"
             },
             "src/third_party/emoji-segmenter/src": {
                 "fetcher": "fetchFromGitiles",
@@ -1852,10 +935,10 @@
                 "url": "https://chromium.googlesource.com/v8/v8.git"
             }
         },
-        "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194",
+        "electron_yarn_hash": "0mkq703idswn1qdmrm21ra58pa69hz79hyhaqnigyc854qf4k6w2",
         "modules": "125",
-        "node": "20.17.0",
-        "version": "31.6.0"
+        "node": "20.18.0",
+        "version": "31.7.2"
     },
     "32": {
         "chrome": "128.0.6613.186",
@@ -1905,10 +988,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=",
+                "hash": "sha256-RrQMeFf3notm96BJJgctXU/0azABY4axQ8VIEQsG4Gk=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v32.2.1"
+                "rev": "v32.2.2"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -2796,10 +1879,10 @@
         "electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9",
         "modules": "128",
         "node": "20.18.0",
-        "version": "32.2.1"
+        "version": "32.2.2"
     },
     "33": {
-        "chrome": "130.0.6723.44",
+        "chrome": "130.0.6723.59",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2809,15 +1892,15 @@
                     "version": "2024-09-09"
                 }
             },
-            "version": "130.0.6723.44"
+            "version": "130.0.6723.59"
         },
         "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=",
         "deps": {
             "src": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-zCyzVI6qbI1qTT0QBpVxLgNF5+L/Ym8WF6175/hv9k0=",
+                "hash": "sha256-8AsyUWYjYNczlybVCsvR5YEaL+Ak4Sth7ZA5n6gUjss=",
                 "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                "rev": "130.0.6723.44",
+                "rev": "130.0.6723.59",
                 "url": "https://chromium.googlesource.com/chromium/src.git"
             },
             "src/chrome/test/data/perf/canvas_bench": {
@@ -2846,10 +1929,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-8Y6jzjaLseSR4JPurofSG8Bs0m7wJucn4cwIc+z89sM=",
+                "hash": "sha256-0Ftjs2hvO7ySECm9U3JFOBtb/VgEHchTfnAoo45sOj8=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v33.0.0"
+                "rev": "v33.0.2"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -2877,8 +1960,8 @@
             },
             "src/third_party/angle": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-B/xH9kMuOcExMyp5wtk/CeJtUogmnwmMpfaTDpE3pio=",
-                "rev": "3cabe8c25ad30b0761ee74bc4d9f455cb5ba84c7",
+                "hash": "sha256-k9moMf40yao+FxWT6c/JBu0z/oI+U26LnqUwoweA0SU=",
+                "rev": "21e4b689c009a93f66d61989a713d52bceaf2979",
                 "url": "https://chromium.googlesource.com/angle/angle.git"
             },
             "src/third_party/angle/third_party/VK-GL-CTS/src": {
@@ -3075,8 +2158,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-GUpeszdPsCfN+RSg6vRTyfxwD0/TEtWmBEIcIUwYhBg=",
-                "rev": "88446977cb017f143f1ff6963d384b05a4414f54",
+                "hash": "sha256-brsMWPV8xleRMMUnrONL23kJyy3C98p59nPkGCMUTM0=",
+                "rev": "b99303161bf24247ed677a5be454dab24ebdced5",
                 "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
             },
             "src/third_party/dom_distiller_js/dist": {
@@ -3749,6 +2832,6 @@
         "electron_yarn_hash": "0x3hk02diq4ss2405m44r4nb144h213vqr5hr4gmy04p6drk76qv",
         "modules": "130",
         "node": "20.18.0",
-        "version": "33.0.0"
+        "version": "33.0.2"
     }
 }
diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 14ccfe6d84a3..81e00691ae12 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -182,18 +182,16 @@ class GitilesRepo(Repo):
     def __init__(self, url: str, rev: str) -> None:
         super().__init__()
         self.fetcher = "fetchFromGitiles"
-        # self.fetcher = 'fetchgit'
         self.args = {
             "url": url,
             "rev": rev,
-            # "fetchSubmodules": "false",
         }
 
         if url == "https://chromium.googlesource.com/chromium/src.git":
             self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; "
             self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; "
             self.args["postFetch"] += "rm -r $out/content/test/data; "
-            self.args["postFetch"] += "rm -r $out/courgette/testdata; "
+            self.args["postFetch"] += "rm -rf $out/courgette/testdata; "
             self.args["postFetch"] += "rm -r $out/extensions/test/data; "
             self.args["postFetch"] += "rm -r $out/media/test/data; "
 
diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix
deleted file mode 100644
index 336bdcdf5229..000000000000
--- a/pkgs/development/tools/espup/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, installShellFiles
-, bzip2
-, openssl
-, xz
-, zstd
-, stdenv
-, darwin
-, testers
-, espup
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "espup";
-  version = "0.12.2";
-
-  src = fetchFromGitHub {
-    owner = "esp-rs";
-    repo = "espup";
-    rev = "v${version}";
-    hash = "sha256-7rxT3Stbfec7oxZOBN87lICmq+V8OZMCXb5F6Ca6jS4=";
-  };
-
-  cargoHash = "sha256-GfoM2ngwnovQdbiEUQrkrrMpq4fo37VVOmnkK/5l+C8=";
-
-  nativeBuildInputs = [
-    pkg-config
-    installShellFiles
-  ];
-
-  buildInputs = [
-    bzip2
-    openssl
-    xz
-    zstd
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreFoundation
-    darwin.apple_sdk.frameworks.Security
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
-
-  env = {
-    OPENSSL_NO_VENDOR = true;
-    ZSTD_SYS_USE_PKG_CONFIG = true;
-  };
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  checkFlags = [
-    # makes network calls
-    "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version"
-  ];
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd espup \
-      --bash <($out/bin/espup completions bash) \
-      --fish <($out/bin/espup completions fish) \
-      --zsh <($out/bin/espup completions zsh)
-  '';
-
-  passthru.tests.version = testers.testVersion {
-    package = espup;
-  };
-
-  meta = with lib; {
-    description = "Tool for installing and maintaining Espressif Rust ecosystem";
-    homepage = "https://github.com/esp-rs/espup/";
-    license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ knightpp beeb ];
-    mainProgram = "espup";
-  };
-}
diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix
deleted file mode 100644
index a5f325ebdab8..000000000000
--- a/pkgs/development/tools/fnlfmt/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }:
-
-stdenv.mkDerivation rec {
-  pname = "fnlfmt";
-  version = "0.3.2";
-
-  src = fetchFromSourcehut {
-    owner = "~technomancy";
-    repo = "fnlfmt";
-    rev = "refs/tags/${version}";
-    hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk=";
-  };
-
-  nativeBuildInputs = [ luaPackages.fennel ];
-
-  buildInputs = [ lua ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    echo "#!${lua}/bin/lua" > fnlfmt
-    ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt
-    chmod +x fnlfmt
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -D ./fnlfmt $out/bin/fnlfmt
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Formatter for Fennel";
-    homepage = "https://git.sr.ht/~technomancy/fnlfmt";
-    license = licenses.lgpl3Plus;
-    platforms = lua.meta.platforms;
-    maintainers = with maintainers; [ chiroptical ];
-    mainProgram = "fnlfmt";
-  };
-}
diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix
deleted file mode 100644
index 0735e283d6db..000000000000
--- a/pkgs/development/tools/garble/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv
-, buildGoModule
-, fetchFromGitHub
-, lib
-, git
-}:
-buildGoModule rec {
-  pname = "garble";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "burrowers";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8=";
-  };
-
-  vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4=";
-
-  # Used for some of the tests.
-  nativeCheckInputs = [git];
-
-  preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-    # The test assumex amd64 assembly
-    rm testdata/script/asm.txtar
-  '';
-
-  meta = {
-    description = "Obfuscate Go code by wrapping the Go toolchain";
-    homepage = "https://github.com/burrowers/garble/";
-    maintainers = with lib.maintainers; [ davhau ];
-    license = lib.licenses.bsd3;
-    broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin
-  };
-}
diff --git a/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/pkgs/development/tools/gauge/plugins/dotnet/default.nix
index 2b79004073ec..dbac34acdac7 100644
--- a/pkgs/development/tools/gauge/plugins/dotnet/default.nix
+++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix
@@ -12,7 +12,7 @@ makeGaugePlugin {
   releasePrefix = "gauge-dotnet-";
   isCrossArch = true;
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   meta = {
     description = "Gauge plugin that lets you write tests in C#";
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
deleted file mode 100644
index 4584650436c2..000000000000
--- a/pkgs/development/tools/ginkgo/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, ginkgo }:
-
-buildGoModule rec {
-  pname = "ginkgo";
-  version = "2.20.2";
-
-  src = fetchFromGitHub {
-    owner = "onsi";
-    repo = "ginkgo";
-    rev = "v${version}";
-    sha256 = "sha256-/emP4U2s7/hYJZCJ+TdE5sM45q0C8OrrIFreSupq3ig=";
-  };
-  vendorHash = "sha256-6HlCj2Wq+lH6OQxG18fCMj1eC2Xy++IQx35nCAtHQ/U=";
-
-  # integration tests expect more file changes
-  # types tests are missing CodeLocation
-  excludedPackages = [ "integration" "types" ];
-
-  __darwinAllowLocalNetworking = true;
-
-  passthru.tests.version = testers.testVersion {
-    package = ginkgo;
-    command = "ginkgo version";
-  };
-
-  meta = with lib; {
-    homepage = "https://onsi.github.io/ginkgo/";
-    changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md";
-    description = "Modern Testing Framework for Go";
-    mainProgram = "ginkgo";
-    longDescription = ''
-      Ginkgo is a testing framework for Go designed to help you write expressive
-      tests. It is best paired with the Gomega matcher library. When combined,
-      Ginkgo and Gomega provide a rich and expressive DSL
-      (Domain-specific Language) for writing tests.
-
-      Ginkgo is sometimes described as a "Behavior Driven Development" (BDD)
-      framework. In reality, Ginkgo is a general purpose testing framework in
-      active use across a wide variety of testing contexts: unit tests,
-      integration tests, acceptance test, performance tests, etc.
-    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ saschagrunert jk ];
-  };
-}
diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix
deleted file mode 100644
index 3fb6aed7f031..000000000000
--- a/pkgs/development/tools/glamoroustoolkit/default.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-{ lib
-, stdenv
-, fetchzip
-, fetchurl
-, patchelf
-, wrapGAppsHook3
-, cairo
-, dbus
-, fontconfig
-, freetype
-, glib
-, gtk3
-, libX11
-, libXcursor
-, libXext
-, libXi
-, libXrandr
-, libXrender
-, libgit2
-, libglvnd
-, libuuid
-, libxcb
-, harfbuzz
-, libsoup_3
-, webkitgtk_4_1
-, zenity
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "glamoroustoolkit";
-  version = "1.1.4";
-
-  src = fetchzip {
-    url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
-    stripRoot = false;
-    hash = "sha256-/p/oCE1fmlPjy1Xg36rsczZ74L0M7qWsdcFm6cHPVVY=";
-  };
-
-  nativeBuildInputs = [
-    wrapGAppsHook3
-  ];
-
-  sourceRoot = ".";
-
-  dontConfigure = true;
-  dontBuild = true;
-  dontPatchELF = true;
-  dontStrip = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -d $out/bin $out/lib
-    cp -r $src/bin $src/lib $out/
-    cp ${./GlamorousToolkit-GetImage} $out/bin/GlamorousToolkit-GetImage
-
-    runHook postInstall
-  '';
-
-  preFixup = let
-    libPath = lib.makeLibraryPath [
-      cairo
-      dbus
-      fontconfig
-      freetype
-      glib
-      gtk3
-      libX11
-      libXcursor
-      libXext
-      libXi
-      libXrandr
-      libXrender
-      libglvnd
-      libuuid
-      libxcb
-      harfbuzz        # libWebView.so
-      libsoup_3       # libWebView.so
-      webkitgtk_4_1   # libWebView.so
-      stdenv.cc.cc.lib
-    ];
-    binPath = lib.makeBinPath [
-      zenity          # File selection dialog
-    ];
-  in ''
-    chmod +x $out/lib/*.so
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${libPath}:$out/lib" \
-      $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli
-    patchelf --shrink-rpath \
-      $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli
-    patchelf \
-      --set-rpath "${libPath}:$out/lib" \
-      $out/lib/*.so
-    patchelf --shrink-rpath $out/lib/*.so
-    #
-    # shrink-rpath gets it wrong for the following libraries,
-    # restore the full rpath.
-    #
-    patchelf \
-      --set-rpath "${libPath}:$out/lib" \
-      $out/lib/libPharoVMCore.so \
-      $out/lib/libWinit.so \
-      $out/lib/libPixels.so
-    patchelf --set-rpath $out/lib $out/lib/libssl.so
-
-    ln -s $out/lib/libcrypto.so $out/lib/libcrypto.so.1.1
-    ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2
-    rm $out/lib/libgit2.so
-    ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1
-
-    gappsWrapperArgs+=(
-      --prefix PATH : ${binPath}
-    )
-  '';
-
-  meta = {
-    homepage = "https://gtoolkit.com";
-    description = "GlamorousToolkit Development Environment";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.akgrant43 ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/development/tools/go-jet/default.nix
deleted file mode 100644
index 34b8c5ef1d3c..000000000000
--- a/pkgs/development/tools/go-jet/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "go-jet";
-  version = "2.11.1";
-
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = "jet";
-    rev = "v${version}";
-    sha256 = "sha256-1ntvvbSIqeANZhz/FKXP9cD8UVs9luMHa8pgvc6RsqE=";
-  };
-
-  vendorHash = "sha256-7jcUSzz/EI30PUK41u4FUUAzzl/PUKvE46A/nYwx134=";
-
-  subPackages = [ "cmd/jet" ];
-
-  tags = [
-    "mysql"
-    "golang"
-    "postgres"
-    "sql"
-    "database"
-    "code-generator"
-    "sqlite"
-    "postgresql"
-    "mariadb"
-    "sql-query"
-    "codegenerator"
-    "typesafe"
-    "sql-builder"
-    "datamapper"
-    "code-completion"
-    "sql-queries"
-    "cockroachdb"
-    "sql-query-builder"
-    "sqlbuilder"
-    "typesafety"
-  ];
-
-  postPatch = ''
-    # removing the tests which depend on external data
-    rm -rf tests/{sqlite,postgres,mysql}
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/go-jet/jet";
-    description = "Type safe SQL builder with code generation and automatic query result data mapping";
-    maintainers = with maintainers; [ mrityunjaygr8 ];
-    license = licenses.asl20;
-    mainProgram = "jet";
-  };
-}
diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix
deleted file mode 100644
index 61cc59d4a811..000000000000
--- a/pkgs/development/tools/go-mockery/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, go-mockery, runCommand, go }:
-
-buildGoModule rec {
-  pname = "go-mockery";
-  version = "2.46.0";
-
-  src = fetchFromGitHub {
-    owner = "vektra";
-    repo = "mockery";
-    rev = "v${version}";
-    sha256 = "sha256-qPE4hzdu5soGVfw6mLJLWvjiXxdkUAT+kpOCWMO1sL8=";
-  };
-
-  preCheck = ''
-    substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version}
-    substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version}
-  '';
-
-  ldflags = [
-    "-s" "-w"
-    "-X" "github.com/vektra/mockery/v2/pkg/logging.SemVer=v${version}"
-  ];
-
-  CGO_ENABLED = false;
-
-  proxyVendor = true;
-  vendorHash = "sha256-1SzdVM1Ncpym6bPg1aSyfoAM1YiUGal3Glw0paz+buk=";
-
-  subPackages = [ "." ];
-
-  passthru.tests = {
-    generateMock = runCommand "${pname}-test" {
-      nativeBuildInputs = [ go-mockery ];
-      buildInputs = [ go ];
-    } ''
-      if [[ $(mockery --version) != *"${version}"* ]]; then
-        echo "Error: program version does not match package version"
-        exit 1
-      fi
-
-      export HOME=$TMPDIR
-
-      cat < foo.go
-      package main
-
-      type Foo interface {
-        Bark() string
-      }
-      EOF
-
-      mockery --name Foo --dir .
-
-      if [[ ! -f "mocks/Foo.go" ]]; then
-        echo "Error: mocks/Foo.go was not generated by ${pname}"
-        exit 1
-      fi
-
-      touch $out
-    '';
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/vektra/mockery";
-    description = "Mock code autogenerator for Golang";
-    maintainers = with maintainers; [ fbrs ];
-    mainProgram = "mockery";
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix
index 8dcee1b730dd..9a1bfe9ded9e 100644
--- a/pkgs/development/tools/hotdoc/default.nix
+++ b/pkgs/development/tools/hotdoc/default.nix
@@ -101,8 +101,8 @@ buildPythonApplication rec {
     substituteInPlace hotdoc/extensions/c/c_extension.py \
       --replace "shutil.which('llvm-config')" 'True' \
       --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \
-      --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \
-      --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"'
+      --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \
+      --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"'
   '';
 
   # Make pytest run from a temp dir to have it pick up installed package for cmark
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix
index 584b8856e89f..e368d608d593 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp bin/iaca $out/bin/
     cp lib/* $out/lib
   '';
-  preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in ''
+  preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc gcc ]; in ''
     patchelf \
         --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \
         --set-rpath $out/lib:"${libPath}" \
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
deleted file mode 100644
index 1443ca78371a..000000000000
--- a/pkgs/development/tools/jq/default.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, removeReferencesTo
-, autoreconfHook
-, bison
-, onigurumaSupport ? true
-, oniguruma
-}:
-
-stdenv.mkDerivation rec {
-  pname = "jq";
-  version = "1.7.1";
-
-  # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages
-  src = fetchurl {
-    url = "https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
-    hash = "sha256-R4ycoSn9LjRD/icxS0VeIR4NjGC8j/ffcDhz3u7lgMI=";
-  };
-
-  outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
-
-  # https://github.com/jqlang/jq/issues/2871
-  postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD ''
-    substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" ""
-  '';
-
-  # Upstream script that writes the version that's eventually compiled
-  # and printed in `jq --help` relies on a .git directory which our src
-  # doesn't keep.
-  preConfigure = ''
-    echo "#!/bin/sh" > scripts/version
-    echo "echo ${version}" >> scripts/version
-    patchShebangs scripts/version
-  '';
-
-  # paranoid mode: make sure we never use vendored version of oniguruma
-  # Note: it must be run after automake, or automake will complain
-  preBuild = ''
-    rm -r ./modules/oniguruma
-  '';
-
-  buildInputs = lib.optionals onigurumaSupport [ oniguruma ];
-  nativeBuildInputs = [ removeReferencesTo autoreconfHook bison ];
-
-  # Darwin requires _REENTRANT be defined to use functions like `lgamma_r`.
-  # Otherwise, configure will detect that they’re in libm, but the build will fail
-  # with clang 16+ due to calls to undeclared functions.
-  # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release).
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
-    "-D_REENTRANT=1"
-    "-D_DARWIN_C_SOURCE=1"
-  ]);
-
-  configureFlags = [
-    "--bindir=\${bin}/bin"
-    "--sbindir=\${bin}/bin"
-    "--datadir=\${doc}/share"
-    "--mandir=\${man}/share/man"
-  ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no"
-  # jq is linked to libjq:
-  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
-
-  # Break the dependency cycle: $dev refers to $bin via propagated-build-outputs, and
-  # $bin refers to $dev because of https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100
-  postFixup = ''
-    remove-references-to -t "$dev" "$bin/bin/jq"
-  '';
-
-  doInstallCheck = true;
-  installCheckTarget = "check";
-
-  postInstallCheck = ''
-    $bin/bin/jq --help >/dev/null
-    $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null
-  '';
-
-  passthru = { inherit onigurumaSupport; };
-
-  meta = with lib; {
-    description = "Lightweight and flexible command-line JSON processor";
-    homepage = "https://jqlang.github.io/jq/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ raskin artturin ncfavier ];
-    platforms = platforms.unix;
-    downloadPage = "https://jqlang.github.io/jq/download/";
-    mainProgram = "jq";
-  };
-}
diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix
deleted file mode 100644
index b9add5050a74..000000000000
--- a/pkgs/development/tools/jql/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "jql";
-  version = "7.2.0";
-
-  src = fetchFromGitHub {
-    owner = "yamafaktory";
-    repo = pname;
-    rev = "jql-v${version}";
-    hash = "sha256-UyZ7unIbKRn/5WsoYxkHWQ5k0Tb5NcC+UGpiyvpShBo=";
-  };
-
-  cargoHash = "sha256-gJQsap31twigZT5n5w7oHATdNf0DfqoNfdS7cMU/hiA=";
-
-  meta = with lib; {
-    description = "JSON Query Language CLI tool built with Rust";
-    homepage = "https://github.com/yamafaktory/jql";
-    changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}";
-    license = with licenses; [ asl20 mit ];
-    maintainers = with maintainers; [ akshgpt7 figsoda ];
-    mainProgram = "jql";
-  };
-}
diff --git a/pkgs/development/tools/kafka-delta-ingest/Cargo.lock b/pkgs/development/tools/kafka-delta-ingest/Cargo.lock
deleted file mode 100644
index 53bbe80ada05..000000000000
--- a/pkgs/development/tools/kafka-delta-ingest/Cargo.lock
+++ /dev/null
@@ -1,2898 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf"
-
-[[package]]
-name = "arrow"
-version = "6.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46cb449d481a6b13ea4e82e9fc662ea3e29cb5dc0a310fc42e27592cef3cb611"
-dependencies = [
- "bitflags",
- "chrono",
- "csv",
- "flatbuffers",
- "hex",
- "indexmap",
- "lazy_static",
- "lexical-core",
- "multiversion",
- "num 0.4.0",
- "rand",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681b971236e0f76b20fcafca0236b8718c9186ee778d67cd78bd5f28fd85427f"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "backtrace"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base-x"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "3.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71cb90ade945043d3d53597b2fc359bb063db8ade2bcffe7997351d0756e9d50"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cc"
-version = "1.0.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "serde",
- "time 0.1.43",
- "winapi",
-]
-
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap"
-version = "3.0.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
- "indexmap",
- "lazy_static",
- "os_str_bytes",
- "strsim 0.10.0",
- "termcolor",
- "textwrap 0.14.2",
- "vec_map",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.0.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "const_fn"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-dependencies = [
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "debugid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba"
-dependencies = [
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "deltalake"
-version = "0.4.1"
-source = "git+https://github.com/delta-io/delta-rs.git?rev=cba4e3d316c56c65dc1cb660dc7e6d380ddd3a6b#cba4e3d316c56c65dc1cb660dc7e6d380ddd3a6b"
-dependencies = [
- "anyhow",
- "arrow",
- "async-trait",
- "bytes",
- "cfg-if 1.0.0",
- "chrono",
- "clap 3.0.0-beta.4",
- "env_logger",
- "errno",
- "futures",
- "glibc_version",
- "lazy_static",
- "libc",
- "log",
- "maplit",
- "parquet",
- "parquet-format",
- "percent-encoding",
- "regex",
- "rusoto_core",
- "rusoto_credential",
- "rusoto_dynamodb",
- "rusoto_s3",
- "rusoto_sts",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
- "uuid",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "deunicode"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690"
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "dipstick"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "596c026d3f177d5ef10f5ac01f9a9a2db64aa5c79730267d5a727b6d22db0566"
-dependencies = [
- "atomic_refcell",
- "crossbeam-channel",
- "lazy_static",
- "log",
- "minreq",
- "num 0.2.1",
- "parking_lot 0.10.2",
- "time 0.1.43",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "errno"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
-dependencies = [
- "gcc",
- "libc",
-]
-
-[[package]]
-name = "flatbuffers"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4c5738bcd7fad10315029c50026f83c9da5e4a21f8ed66826f43e0e2bde5f6"
-dependencies = [
- "bitflags",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811"
-dependencies = [
- "cfg-if 1.0.0",
- "crc32fast",
- "libc",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
-dependencies = [
- "autocfg",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
-
-[[package]]
-name = "futures-task"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
-
-[[package]]
-name = "futures-util"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
-dependencies = [
- "autocfg",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "gcc"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gimli"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
-
-[[package]]
-name = "glibc_version"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803ff7635f1ab4e2c064b68a0c60da917d3d18dc8d086130f689d62ce4f1c33e"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac",
- "digest",
-]
-
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
-]
-
-[[package]]
-name = "http"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
-
-[[package]]
-name = "httpdate"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "integer-encoding"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f"
-
-[[package]]
-name = "ipnet"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "jmespatch"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acf91a732ade34d8eda2dee9500a051833f14f0d3d10d77c149845d6ac6a5f0"
-dependencies = [
- "lazy_static",
- "serde",
- "serde_json",
- "slug",
-]
-
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "kafka-delta-ingest"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "arrow",
- "async-trait",
- "base64",
- "chrono",
- "clap 3.0.0-beta.4",
- "deltalake",
- "dipstick",
- "env_logger",
- "futures",
- "jmespatch",
- "lazy_static",
- "log",
- "maplit",
- "parquet",
- "parquet-format",
- "rdkafka",
- "rusoto_core",
- "rusoto_credential",
- "rusoto_s3",
- "sentry",
- "serde",
- "serde_json",
- "serial_test",
- "strum",
- "strum_macros",
- "tempfile",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "utime",
- "uuid",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lexical-core"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32c80337884d5044fe54e9c1b8d64b92de67e10d9312e472a8ff6d6ea849daf"
-dependencies = [
- "lexical-parse-float",
- "lexical-parse-integer",
- "lexical-util",
- "lexical-write-float",
- "lexical-write-integer",
-]
-
-[[package]]
-name = "lexical-parse-float"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a01c82cb851a33bb46cacc44c3ad5e7b39ea3b8d22ade21646221df58e45f"
-dependencies = [
- "lexical-parse-integer",
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-parse-integer"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c92badda8cc0fc4f3d3cc1c30aaefafb830510c8781ce4e8669881f3ed53ac"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-util"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff669ccaae16ee33af90dc51125755efed17f1309626ba5c12052512b11e291"
-dependencies = [
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-float"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93601479eae2b41ad465e1f813ea98780069ef1d69063145e76c1bd108ab769"
-dependencies = [
- "lexical-util",
- "lexical-write-integer",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-integer"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece956492e0e40fd95ef8658a34d53a3b8c2015762fdcaaff2167b28de1f56ef"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
-
-[[package]]
-name = "libz-sys"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "lz4"
-version = "1.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
-dependencies = [
- "libc",
- "lz4-sys",
-]
-
-[[package]]
-name = "lz4-sys"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[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 = "minreq"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f7db7a675c4b46b8842105b9371d6151e95fbbecd9b0e54dc2ea814397d2cc"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "mio"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "multiversion"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373"
-dependencies = [
- "multiversion-macros",
-]
-
-[[package]]
-name = "multiversion-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "num"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
-dependencies = [
- "num-complex 0.2.4",
- "num-integer",
- "num-iter",
- "num-rational 0.2.4",
- "num-traits",
-]
-
-[[package]]
-name = "num"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
-dependencies = [
- "num-bigint",
- "num-complex 0.4.0",
- "num-integer",
- "num-iter",
- "num-rational 0.4.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
-dependencies = [
- "autocfg",
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
-dependencies = [
- "derivative",
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "object"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
-
-[[package]]
-name = "openssl-src"
-version = "111.16.0+1.1.1l"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-float"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
-
-[[package]]
-name = "parking_lot"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-dependencies = [
- "lock_api 0.3.4",
- "parking_lot_core 0.7.2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api 0.4.5",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
-dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
- "libc",
- "redox_syscall 0.1.57",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall 0.2.10",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parquet"
-version = "6.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479de475fbb7abf51e39cde69da3cc902d13a6fcb9259993f98688325e6a1ee7"
-dependencies = [
- "arrow",
- "base64",
- "brotli",
- "byteorder",
- "chrono",
- "clap 2.33.3",
- "flate2",
- "lz4",
- "num-bigint",
- "parquet-format",
- "rand",
- "serde_json",
- "snap",
- "thrift",
- "zstd",
-]
-
-[[package]]
-name = "parquet-format"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5bc6b23543b5dedc8f6cce50758a35e5582e148e0cfa26bd0cacd569cda5b71"
-dependencies = [
- "thrift",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
-dependencies = [
- "thiserror",
- "toml",
-]
-
-[[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",
- "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-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rdkafka"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af78bc431a82ef178c4ad6db537eb9cc25715a8591d27acc30455ee7227a76f4"
-dependencies = [
- "futures",
- "libc",
- "log",
- "rdkafka-sys",
- "serde",
- "serde_derive",
- "serde_json",
- "slab",
- "tokio",
-]
-
-[[package]]
-name = "rdkafka-sys"
-version = "4.0.0+1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54f24572851adfeb525fdc4a1d51185898e54fed4e8d8dba4fadb90c6b4f0422"
-dependencies = [
- "libc",
- "libz-sys",
- "num_enum",
- "openssl-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
-dependencies = [
- "getrandom",
- "redox_syscall 0.2.10",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51c732d463dd300362ffb44b7b125f299c23d2990411a4253824630ebc7467fb"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log",
- "mime",
- "native-tls",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded 0.7.0",
- "tokio",
- "tokio-native-tls",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rusoto_core"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02aff20978970d47630f08de5f0d04799497818d16cafee5aec90c4b4d0806cf"
-dependencies = [
- "async-trait",
- "base64",
- "bytes",
- "crc32fast",
- "futures",
- "http",
- "hyper",
- "hyper-tls",
- "lazy_static",
- "log",
- "rusoto_credential",
- "rusoto_signature",
- "rustc_version 0.2.3",
- "serde",
- "serde_json",
- "tokio",
- "xml-rs",
-]
-
-[[package]]
-name = "rusoto_credential"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e91e4c25ea8bfa6247684ff635299015845113baaa93ba8169b9e565701b58e"
-dependencies = [
- "async-trait",
- "chrono",
- "dirs-next",
- "futures",
- "hyper",
- "serde",
- "serde_json",
- "shlex",
- "tokio",
- "zeroize",
-]
-
-[[package]]
-name = "rusoto_dynamodb"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f26af40f36409cb8fae3069690f78f638f747b55c7b90f338d5ed36016b0cda"
-dependencies = [
- "async-trait",
- "bytes",
- "futures",
- "rusoto_core",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "rusoto_s3"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abc3f56f14ccf91f880b9a9c2d0556d8523e8c155041c54db155b384a1dd1119"
-dependencies = [
- "async-trait",
- "bytes",
- "futures",
- "rusoto_core",
- "xml-rs",
-]
-
-[[package]]
-name = "rusoto_signature"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486e6b1673ab3e0ba1ded284fb444845fe1b7f41d13989a54dd60f62a7b2baa"
-dependencies = [
- "base64",
- "bytes",
- "futures",
- "hex",
- "hmac",
- "http",
- "hyper",
- "log",
- "md5",
- "percent-encoding",
- "pin-project-lite",
- "rusoto_credential",
- "rustc_version 0.2.3",
- "serde",
- "sha2",
- "time 0.2.27",
- "tokio",
-]
-
-[[package]]
-name = "rusoto_sts"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f93005e0c3b9e40a424b50ca71886d2445cc19bb6cdac3ac84c2daff482eb59"
-dependencies = [
- "async-trait",
- "bytes",
- "chrono",
- "futures",
- "rusoto_core",
- "serde_urlencoded 0.6.1",
- "xml-rs",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.4",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "security-framework"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "sentry"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "546b9b6f76c26c60ffbcf0b7136e15169fe13d43949b4aadb7c1edc1c3f3a26f"
-dependencies = [
- "httpdate",
- "reqwest",
- "sentry-backtrace",
- "sentry-contexts",
- "sentry-core",
- "sentry-panic",
- "tokio",
-]
-
-[[package]]
-name = "sentry-backtrace"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd0cba2aff36ac98708f7a6e7abbdde82dbaf180d5870c41084dc1b473648b9"
-dependencies = [
- "backtrace",
- "lazy_static",
- "regex",
- "sentry-core",
-]
-
-[[package]]
-name = "sentry-contexts"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bacf1c62427c6c97b896640d0c4dd204bbd3b79dd192d7cb40891aa5ee11d58"
-dependencies = [
- "hostname",
- "lazy_static",
- "libc",
- "regex",
- "rustc_version 0.4.0",
- "sentry-core",
- "uname",
-]
-
-[[package]]
-name = "sentry-core"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a957270c9a430218f8031c866493061a27e35a70250e9527f093563a33ce6b"
-dependencies = [
- "chrono",
- "lazy_static",
- "rand",
- "sentry-types",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "sentry-panic"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692bf989f0c99f025e33d7f58e62822c3771f56d189698c66dcc863122255d95"
-dependencies = [
- "sentry-backtrace",
- "sentry-core",
-]
-
-[[package]]
-name = "sentry-types"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd2266fee014a86e250e98e389191ecd23be546b5c42b6a2fb9af2972fadac"
-dependencies = [
- "chrono",
- "debugid",
- "serde",
- "serde_json",
- "thiserror",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.130"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.130"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
-dependencies = [
- "dtoa",
- "itoa",
- "serde",
- "url",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serial_test"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"
-dependencies = [
- "lazy_static",
- "parking_lot 0.11.2",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-
-[[package]]
-name = "sha2"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3"
-dependencies = [
- "block-buffer",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
- "opaque-debug",
-]
-
-[[package]]
-name = "shlex"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
-
-[[package]]
-name = "slug"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373"
-dependencies = [
- "deunicode",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
-
-[[package]]
-name = "snap"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451"
-
-[[package]]
-name = "socket2"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
-
-[[package]]
-name = "strum_macros"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "rand",
- "redox_syscall 0.2.10",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
-[[package]]
-name = "thrift"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b"
-dependencies = [
- "byteorder",
- "integer-encoding",
- "log",
- "ordered-float",
- "threadpool",
-]
-
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb",
- "time-macros",
- "version_check",
- "winapi",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"
-dependencies = [
- "autocfg",
- "bytes",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "once_cell",
- "parking_lot 0.11.2",
- "pin-project-lite",
- "signal-hook-registry",
- "tokio-macros",
- "winapi",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
-
-[[package]]
-name = "tracing"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "typenum"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
-
-[[package]]
-name = "uname"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utime"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91baa0c65eabd12fcbdac8cc35ff16159cab95cae96d0222d6d0271db6193cef"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
-
-[[package]]
-name = "web-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "winreg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
-
-[[package]]
-name = "zeroize"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd"
-
-[[package]]
-name = "zstd"
-version = "0.9.0+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "4.1.1+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "1.6.1+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33"
-dependencies = [
- "cc",
- "libc",
-]
diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix
deleted file mode 100644
index a5fea071b48e..000000000000
--- a/pkgs/development/tools/kafka-delta-ingest/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, pkg-config
-, openssl
-, perl
-, rdkafka
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "kafka-delta-ingest";
-  version = "unstable-2021-12-08";
-
-  src = fetchFromGitHub {
-    owner = "delta-io";
-    repo = pname;
-    rev = "c48c854145b5aab1b8f36cc04978880794a2273c";
-    sha256 = "sha256-q0jOVZlxMHIhnc8y2N8o7Sl5Eg7DfJ96kXrPIV8RD1Y=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    perl
-  ];
-
-  buildFeatures = [ "dynamic-linking" ];
-
-  buildInputs = [
-    openssl
-    rdkafka
-  ];
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "deltalake-0.4.1" = "sha256-0v3n+qMbBhw53qPuZdhGSO+aqc6j8T577fnyEIQmPDU=";
-    };
-  };
-
-  # many tests seem to require a running kafka instance
-  doCheck = false;
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Highly efficient daemon for streaming data from Kafka into Delta Lake";
-    mainProgram = "kafka-delta-ingest";
-    homepage = "https://github.com/delta-io/kafka-delta-ingest";
-    license = licenses.asl20;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
deleted file mode 100644
index 1dc7b205e0d9..000000000000
--- a/pkgs/development/tools/ktlint/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gnused }:
-
-stdenv.mkDerivation rec {
-  pname = "ktlint";
-  version = "1.3.1";
-
-  src = fetchurl {
-    url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
-    sha256 = "sha256-qfkjvlj70yZwoX8Lcpsd+ASviC+ldAIWV0HLJuVEDKE=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    install -Dm755 $src $out/bin/ktlint
-  '';
-
-  postFixup = ''
-    wrapProgram $out/bin/ktlint --prefix PATH : "${lib.makeBinPath [ jre_headless gnused ]}"
-  '';
-
-  meta = with lib; {
-    description = "Anti-bikeshedding Kotlin linter with built-in formatter";
-    homepage = "https://ktlint.github.io/";
-    license = licenses.mit;
-    platforms = jre_headless.meta.platforms;
-    changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md";
-    maintainers = with maintainers; [ tadfisher SubhrajyotiSen ];
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    mainProgram = "ktlint";
-  };
-}
diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix
deleted file mode 100644
index 9212f2a1da3f..000000000000
--- a/pkgs/development/tools/kubeswitch/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  testers,
-  kubeswitch,
-  installShellFiles,
-}:
-
-buildGoModule rec {
-  pname = "kubeswitch";
-  version = "0.9.1";
-
-  src = fetchFromGitHub {
-    owner = "danielfoehrKn";
-    repo = "kubeswitch";
-    rev = version;
-    hash = "sha256-cvMTuiXSpx+ZicN1P3JjGExzW7d51nN1YIpsGArXHzw=";
-  };
-
-  vendorHash = null;
-
-  subPackages = [ "cmd/main.go" ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}"
-    "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01"
-  ];
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  postInstall = ''
-    mv $out/bin/main $out/bin/switcher
-    for shell in bash zsh fish; do
-      $out/bin/switcher --cmd switcher completion $shell > switcher.$shell
-      installShellCompletion --$shell switcher.$shell
-    done
-  '';
-
-  passthru.tests.version = testers.testVersion { package = kubeswitch; };
-
-  meta = {
-    changelog = "https://github.com/danielfoehrKn/kubeswitch/releases/tag/${version}";
-    description = "Kubectx for operators, a drop-in replacement for kubectx";
-    license = lib.licenses.asl20;
-    homepage = "https://github.com/danielfoehrKn/kubeswitch";
-    maintainers = with lib.maintainers; [ bryanasdev000 ];
-    mainProgram = "switcher";
-  };
-}
diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix
deleted file mode 100644
index d01732da1212..000000000000
--- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "beancount-language-server";
-  version = "1.3.5";
-
-  src = fetchFromGitHub {
-    owner = "polarmutex";
-    repo = "beancount-language-server";
-    rev = "v${version}";
-    hash = "sha256-Z8Gc3QbnFGzF1mNjlbazz7OiDpQxY3HcaBKd32XjQCY=";
-  };
-
-  cargoHash = "sha256-WMrh4toFqd+G30ZZxC+kT/Q07gn+3p80oKECASD48wc=";
-
-  doInstallCheck = true;
-  postInstallCheck = ''
-    $out/bin/beancount-language-server --help > /dev/null
-  '';
-
-  meta = with lib; {
-    description = "Language Server Protocol (LSP) for beancount files";
-    mainProgram = "beancount-language-server";
-    homepage = "https://github.com/polarmutex/beancount-language-server";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ polarmutex ];
-  };
-}
diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix
index 122ebea7c0f3..0cb1e7884097 100644
--- a/pkgs/development/tools/language-servers/ccls/default.nix
+++ b/pkgs/development/tools/language-servers/ccls/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ccls";
-  version = "0.20240505";
+  version = "0.20241108";
 
   src = fetchFromGitHub {
     owner = "MaskRay";
     repo = "ccls";
     rev = version;
-    sha256 = "sha256-YZeP6sHYLNvlf49mvtymxHuH1lmIkqcanpqVMzeLeFQ=";
+    sha256 = "sha256-0hZ4VnscnKYBrXy58IjeoeDxja1oNq0mNaQGPmej5BA=";
   };
 
   nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];
diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix
index f3b40cfae31f..88bde6ddfec8 100644
--- a/pkgs/development/tools/language-servers/lua-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lua-language-server";
-  version = "3.11.1";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "luals";
     repo = "lua-language-server";
     rev = finalAttrs.version;
-    hash = "sha256-ZYaiSBSnO9lPb/5pYa0OiL0KParuMb4/jIBtE3S/Ruo=";
+    hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU=";
     fetchSubmodules = true;
   };
 
@@ -39,6 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
       # this feature is not used in lua-language-server
       sed -i /filewatch/d 3rd/bee.lua/test/test.lua
 
+      # flaky tests on linux
+      # https://github.com/LuaLS/lua-language-server/issues/2926
+      sed -i /load-relative-library/d test/tclient/init.lua
+
       pushd 3rd/luamake
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix
deleted file mode 100644
index 408bb69f64b6..000000000000
--- a/pkgs/development/tools/language-servers/zls/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, zig_0_13
-, callPackage
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "zls";
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "zigtools";
-    repo = "zls";
-    rev = finalAttrs.version;
-    fetchSubmodules = true;
-    hash = "sha256-vkFGoKCYUk6B40XW2T/pdhir2wzN1kpFmlLcoLwJx1U=";
-  };
-
-  zigBuildFlags = [
-    "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in"
-  ];
-
-  nativeBuildInputs = [
-    zig_0_13.hook
-  ];
-
-  postPatch = ''
-    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
-  '';
-
-  meta = {
-    description = "Zig LSP implementation + Zig Language Server";
-    mainProgram = "zls";
-    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 _0x5a4 ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix
deleted file mode 100644
index 0b6ec3252ef5..000000000000
--- a/pkgs/development/tools/mblock-mlink/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook }:
-
-stdenv.mkDerivation rec {
-  pname = "mblock-mlink";
-  version = "1.2.0";
-
-  src = fetchurl {
-    url = "https://dl.makeblock.com/mblock5/linux/mLink-${version}-amd64.deb";
-    sha256 = "sha256-KLxj81ZjbEvhhaz0seNB4WXX5ybeZ7/WcT1dGfdWle0=";
-  };
-
-  unpackPhase = ''
-    ${dpkg}/bin/dpkg -x $src $out
-  '';
-
-  buildInputs = [
-    stdenv.cc.cc.lib
-  ];
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  installPhase = ''
-    mv $out/usr/local/makeblock $out/usr/makeblock
-    rmdir $out/usr/local
-    mkdir -p $out/bin
-    echo $out/usr/makeblock/mLink/mnode $out/usr/makeblock/mLink/app.js > $out/bin/mlink
-    chmod +x $out/bin/mlink
-  '';
-
-  meta = with lib; {
-    description = "Driver for mBlock web version";
-    homepage = "https://mblock.makeblock.com/en-us/download/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ maintainers.mausch ];
-  };
-}
diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix
deleted file mode 100644
index 318f1a7ff1e1..000000000000
--- a/pkgs/development/tools/melange/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-}:
-
-buildGoModule rec {
-  pname = "melange";
-  version = "0.11.3";
-
-  src = fetchFromGitHub {
-    owner = "chainguard-dev";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-+G6lSG3iaKWC1SU0cyeU1sU8r9VBUwwtU7D/yjZmu04=";
-    # 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;
-    postFetch = ''
-      cd "$out"
-      git rev-parse HEAD > $out/COMMIT
-      # in format of 0000-00-00T00:00:00Z
-      date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
-      find "$out" -name .git -print0 | xargs -0 rm -rf
-    '';
-  };
-
-  vendorHash = "sha256-GNY1ez7qC2aaEm8WAQqGy4vWZEZFQhze15r3QQZBNzA=";
-
-  subPackages = [ "." ];
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}"
-    "-X sigs.k8s.io/release-utils/version.gitTreeState=clean"
-  ];
-
-  # ldflags based on metadata from git and source
-  preBuild = ''
-    ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)"
-    ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
-  '';
-
-  postInstall = ''
-    installShellCompletion --cmd melange \
-      --bash <($out/bin/melange completion bash) \
-      --fish <($out/bin/melange completion fish) \
-      --zsh <($out/bin/melange completion zsh)
-  '';
-
-  doInstallCheck = true;
-
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out/bin/melange --help
-    $out/bin/melange version 2>&1 | grep "v${version}"
-
-    runHook postInstallCheck
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/chainguard-dev/melange";
-    changelog = "https://github.com/chainguard-dev/melange/blob/${src.rev}/NEWS.md";
-    description = "Build APKs from source code";
-    mainProgram = "melange";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ developer-guy ];
-  };
-}
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 3a9b9ae53276..f6535569abf7 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -5,13 +5,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "minizinc-ide";
-  version = "2.8.6";
+  version = "2.8.7";
 
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
     rev = version;
-    hash = "sha256-B164KCY06SQRxv4eD9yuCKyGRRrMZfJRuaQ+OEmQC5k=";
+    hash = "sha256-mlLW7RHwO+VHWJdKhDjIWYoRpdTrt7QpPKp0EiHGkEs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch b/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch
deleted file mode 100644
index c2452414fc7d..000000000000
--- a/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001
-From: Alan Modra 
-Date: Mon, 21 Feb 2022 10:58:57 +1030
-Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel
-
-Commit b25f942e18d6 made .machine more strict.  Weaken it again.
-
-	* config/tc-ppc.c (ppc_machine): Treat an early .machine specially,
-	keeping sticky options to work around gcc bugs.
----
- gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
-index 054f9c72161..89bc7d3f9b9 100644
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED)
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
--	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+		 initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+		  && (info->frchainP->frch_root != info->frchainP->frch_last
-+		      || info->frchainP->frch_root->fr_type != rs_fill
-+		      || info->frchainP->frch_root->fr_fix != 0))
-+		break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+				   sec == NULL ? &sticky : &machine_sticky,
-+				   cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
--- 
-2.31.1
diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix
deleted file mode 100644
index c2812c2e1209..000000000000
--- a/pkgs/development/tools/misc/d-spy/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ stdenv
-, lib
-, desktop-file-utils
-, fetchurl
-, glib
-, gettext
-, gtk4
-, libadwaita
-, meson
-, ninja
-, pkg-config
-, wrapGAppsHook4
-, gnome
-}:
-
-stdenv.mkDerivation rec {
-  pname = "d-spy";
-  version = "1.10.0";
-
-  outputs = [ "out" "lib" "dev" ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz";
-    hash = "sha256-VVgSucZUBVHaWZ7oFHiArTkVuTyH4XV7bRz9kKDgXlM=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    desktop-file-utils
-    wrapGAppsHook4
-    gettext
-    glib
-  ];
-
-  buildInputs = [
-    glib
-    gtk4
-    libadwaita
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "d-spy";
-      versionPolicy = "odd-unstable";
-    };
-  };
-
-  meta = with lib; {
-    description = "D-Bus exploration tool";
-    mainProgram = "d-spy";
-    homepage = "https://gitlab.gnome.org/GNOME/d-spy";
-    license = with licenses; [
-      lgpl3Plus # library
-      gpl3Plus # app
-    ];
-    maintainers = teams.gnome.members;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/development/tools/misc/deheader/default.nix
deleted file mode 100644
index d562ec98b6d1..000000000000
--- a/pkgs/development/tools/misc/deheader/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib
-, stdenv
-, python3
-, xmlto
-, docbook-xsl-nons
-, fetchFromGitLab
-, installShellFiles
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deheader";
-  version = "1.10";
-  outputs = [ "out" "man" ];
-
-  src = fetchFromGitLab {
-    owner = "esr";
-    repo = "deheader";
-    rev = version;
-    hash = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs=";
-  };
-
-  buildInputs = [ python3 ];
-
-  nativeBuildInputs = [ xmlto docbook-xsl-nons installShellFiles ];
-
-  # With upstream Makefile, xmlto is called without "--skip-validation". It
-  # makes it require a lot of dependencies, yet ultimately it fails
-  # nevertheless in attempt to fetch something from SourceForge.
-  #
-  # Need to set "foundMakefile" so "make check" tests are run.
-  buildPhase = ''
-    runHook preBuild
-
-    xmlto man --skip-validation deheader.xml
-    patchShebangs ./deheader
-    foundMakefile=1
-
-    runHook postBuild
-  '';
-
-  doCheck = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 ./deheader -t $out/bin
-    installManPage ./deheader.1
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Tool to find and optionally remove unneeded includes in C or C++ source files";
-    mainProgram = "deheader";
-    longDescription = ''
-      This tool takes a list of C or C++ sourcefiles and generates a report
-      on which #includes can be omitted from them -- the test, for each foo.c
-      or foo.cc or foo.cpp, is simply whether 'rm foo.o; make foo.o' returns a
-      zero status. Optionally, with the -r option, the unneeded headers are removed.
-      The tool also reports on headers required for strict portability.
-    '';
-    homepage = "http://catb.org/~esr/deheader";
-    changelog = "https://gitlab.com/esr/deheader/-/blob/master/NEWS.adoc";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ kaction ];
-
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index ac1bd1627d1c..f936ae7c89eb 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -15,7 +15,7 @@
    # $debugdir:$datadir/auto-load are whitelisted by default by GDB
    "$debugdir" "$datadir/auto-load"
    # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
-   targetPackages.stdenv.cc.cc.lib
+   (lib.getLib targetPackages.stdenv.cc.cc)
   ]
 , writeScript
 }:
@@ -30,11 +30,11 @@ assert pythonSupport -> python3 != null;
 
 stdenv.mkDerivation rec {
   pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only";
-  version = "15.1";
+  version = "15.2";
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}-${version}.tar.xz";
-    hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI=";
+    hash = "sha256-gzUMzTW1taDLprM0xBKU6paBWMVzlAkE8AuS92NFMU0=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
deleted file mode 100644
index fa128cf3cb5c..000000000000
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib, buildGoModule, fetchFromGitLab, python3 }:
-buildGoModule rec {
-  pname = "loccount";
-  version = "2.15";
-
-  src = fetchFromGitLab {
-    owner = "esr";
-    repo = "loccount";
-    rev = version;
-    hash = "sha256-IRDwxz/InF4okyfAzbK0PzZz+HMUwv5LgRthUUy3rus=";
-  };
-
-  vendorHash = null;
-
-  excludedPackages = "tests";
-
-  nativeBuildInputs = [ python3 ];
-
-  ldflags = [ "-s" "-w" ];
-
-  preBuild = ''
-    patchShebangs --build tablegen.py
-
-    go generate
-  '';
-
-  meta = with lib; {
-    description = "Re-implementation of sloccount in Go";
-    mainProgram = "loccount";
-    longDescription = ''
-      loccount is a re-implementation of David A. Wheeler's sloccount tool
-      in Go.  It is faster and handles more different languages. Because
-      it's one source file in Go, it is easier to maintain and extend than the
-      multi-file, multi-language implementation of the original.
-
-      The algorithms are largely unchanged and can be expected to produce
-      identical numbers for languages supported by both tools.  Python is
-      an exception; loccount corrects buggy counting of single-quote multiline
-      literals in sloccount 2.26.
-    '';
-    homepage = "https://gitlab.com/esr/loccount";
-    downloadPage = "https://gitlab.com/esr/loccount/tree/master";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ calvertvl ];
-  };
-}
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
deleted file mode 100644
index 9355144733ec..000000000000
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences, freebsd, ed }:
-
-let
-  dialect = lib.last (lib.splitString "-" stdenv.hostPlatform.system);
-in
-
-stdenv.mkDerivation rec {
-  pname = "lsof";
-  version = "4.99.3";
-
-  src = fetchFromGitHub {
-    owner = "lsof-org";
-    repo = "lsof";
-    rev = version;
-    hash = "sha256-XW3l+E9D8hgI9jGJGKkIAKa8O9m0JHgZhEASqg4gYuw=";
-  };
-
-  postPatch = ''
-    patchShebangs --build lib/dialects/*/Mksrc
-    # Do not re-build version.h in every 'make' to allow nuke-refs below.
-    # We remove phony 'FRC' target that forces rebuilds:
-    #   'version.h: FRC ...' is translated to 'version.h: ...'.
-    sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/'
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -i 's|lcurses|lncurses|g' Configure
-  '';
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ nukeReferences perl which ed ];
-  buildInputs = [ ncurses ];
-
-  # Stop build scripts from searching global include paths
-  LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include";
-  configurePhase = let genericFlags = "LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB";
-    linuxFlags = lib.optionalString stdenv.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD";
-    freebsdFlags = lib.optionalString stdenv.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys";
-    in "${genericFlags} ${linuxFlags} ${freebsdFlags} ./Configure -n ${dialect}";
-
-  preBuild = ''
-    for filepath in $(find dialects/${dialect} -type f); do
-      sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath
-    done
-
-    # Wipe out development-only flags from CFLAGS embedding
-    make version.h
-    nuke-refs version.h
-  '';
-
-  installPhase = ''
-    # Fix references from man page https://github.com/lsof-org/lsof/issues/66
-    substituteInPlace Lsof.8 \
-      --replace ".so ./00DIALECTS" "" \
-      --replace ".so ./version" ".ds VN ${version}"
-    mkdir -p $out/bin $out/man/man8
-    cp Lsof.8 $out/man/man8/lsof.8
-    cp lsof $out/bin
-  '';
-
-  meta = {
-    homepage = "https://github.com/lsof-org/lsof";
-    description = "Tool to list open files";
-    mainProgram = "lsof";
-    longDescription = ''
-      List open files. Can show what process has opened some file,
-      socket (IPv6/IPv4/UNIX local), or partition (by opening a file
-      from it).
-    '';
-    license = lib.licenses.purdueBsd;
-    maintainers = with lib.maintainers; [ dezgeg ];
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix
deleted file mode 100644
index 3fd8c3eeaa94..000000000000
--- a/pkgs/development/tools/misc/netcoredbg/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ lib, clangStdenv, stdenv, cmake, autoPatchelfHook, fetchFromGitHub, dotnetCorePackages, buildDotnetModule, netcoredbg, testers }:
-let
-  pname = "netcoredbg";
-  build = "1031";
-  release = "3.1.0";
-  version = "${release}-${build}";
-  hash = "sha256-/ScV6NPGOun47D88e7BLisSOipeQWdUbYaEryrlPbHg=";
-
-  coreclr-version = "v8.0.7";
-  coreclr-src = fetchFromGitHub {
-    owner = "dotnet";
-    repo = "runtime";
-    rev = coreclr-version;
-    hash = "sha256-vxyhZ1Z5TB/2jpF4qiXTpUj1hKeqV7xPgG1BJYOLIko=";
-  };
-
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-
-  src = fetchFromGitHub {
-    owner = "Samsung";
-    repo = pname;
-    rev = version;
-    inherit hash;
-  };
-
-  unmanaged = clangStdenv.mkDerivation {
-    inherit src pname version;
-
-    nativeBuildInputs = [ cmake dotnet-sdk ];
-
-    hardeningDisable = [ "strictoverflow" ];
-
-    preConfigure = ''
-      export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-    '';
-
-    cmakeFlags = [
-      "-DCORECLR_DIR=${coreclr-src}/src/coreclr"
-      "-DDOTNET_DIR=${dotnet-sdk}"
-      "-DBUILD_MANAGED=0"
-    ];
-  };
-
-  managed = buildDotnetModule {
-    inherit pname version src dotnet-sdk;
-
-    projectFile = "src/managed/ManagedPart.csproj";
-    nugetDeps = ./deps.nix;
-
-    # include platform-specific dbgshim binary in nugetDeps
-    dotnetFlags = [ "-p:UseDbgShimDependency=true" ];
-    executables = [ ];
-
-    # this passes RID down to dotnet build command
-    # and forces dotnet to include binary dependencies in the output (libdbgshim)
-    selfContainedBuild = true;
-  };
-in
-stdenv.mkDerivation {
-  inherit pname version;
-  # managed brings external binaries (libdbgshim.*)
-  # include source here so that autoPatchelfHook can do it's job
-  src = managed;
-
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ];
-  installPhase = ''
-    mkdir -p $out/share/netcoredbg $out/bin
-    cp ${unmanaged}/* $out/share/netcoredbg
-    cp ./lib/netcoredbg/* $out/share/netcoredbg
-    # darwin won't work unless we link all files
-    ln -s $out/share/netcoredbg/* "$out/bin/"
-  '';
-
-  passthru = {
-    inherit (managed) fetch-deps;
-    tests.version = testers.testVersion {
-      package = netcoredbg;
-      command = "netcoredbg --version";
-      version = "NET Core debugger ${release}";
-    };
-  };
-
-  meta = with lib; {
-    description = "Managed code debugger with MI interface for CoreCLR";
-    homepage = "https://github.com/Samsung/netcoredbg";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    mainProgram = "netcoredbg";
-    maintainers = with maintainers; [ leo60228 konradmalik ];
-  };
-}
diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix
deleted file mode 100644
index d71155bd6711..000000000000
--- a/pkgs/development/tools/misc/pest-ide-tools/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, nix-update-script
-, pkg-config
-, openssl
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "pest-ide-tools";
-  version = "0.3.11";
-  cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
-
-  src = fetchFromGitHub {
-    owner = "pest-parser";
-    repo = "pest-ide-tools";
-    rev = "v${version}";
-    sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ=";
-  };
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "IDE support for Pest, via the LSP";
-    homepage = "https://pest.rs";
-    license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ nickhu ];
-    mainProgram = "pest-language-server";
-  };
-}
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
deleted file mode 100644
index d4f17fb595d0..000000000000
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-# Saleae logic analyzer software
-#
-# Suggested udev rules to be able to access the Logic device without being root:
-#   SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666"
-#   SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666"
-#
-# In NixOS, simply add this package to services.udev.packages.
-
-{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
-, fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
-, freetype, libXinerama, libxcb, zlib, pciutils
-, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL
-}:
-
-let
-
-  libPath = lib.makeLibraryPath [
-    glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
-    libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib
-    dbus libGL
-  ];
-
-in
-
-assert stdenv.hostPlatform.system == "x86_64-linux";
-
-stdenv.mkDerivation rec {
-  pname = "saleae-logic";
-  version = "1.2.18";
-
-  src = fetchurl {
-    name = "saleae-logic-${version}-64bit.zip";
-    url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
-    sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "saleae-logic";
-    exec = "saleae-logic";
-    icon = ""; # the package contains no icon
-    comment = "Software for Saleae logic analyzers";
-    desktopName = "Saleae Logic";
-    genericName = "Logic analyzer";
-    categories = [ "Development" ];
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  installPhase = ''
-    # Copy prebuilt app to $out
-    mkdir "$out"
-    cp -r * "$out"
-
-    # Patch it
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
-    for bin in "$out/Logic"              \
-               "$out/libQt5Widgets.so.5" \
-               "$out/libQt5Gui.so.5"     \
-               "$out/libQt5Core.so.5"    \
-               "$out/libQt5Network.so.5" ; do
-        patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin"
-    done
-
-    patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so"
-
-    # Build the LD_PRELOAD library that makes Logic work from a read-only directory
-    mkdir -p "$out/lib"
-    gcc -shared -fPIC -DOUT=\"$out\" "${./preload.c}" -o "$out/lib/preload.so" -ldl
-
-    # Make wrapper script that uses the LD_PRELOAD library
-    mkdir -p "$out/bin"
-    cat > "$out/bin/saleae-logic" << EOF
-    #!${runtimeShell}
-    export LD_PRELOAD="$out/lib/preload.so"
-    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
-    export PATH="${pciutils}/bin:\$PATH"
-    exec "$out/Logic" "\$@"
-    EOF
-    chmod a+x "$out"/bin/saleae-logic
-
-    # Copy the generated .desktop file
-    mkdir -p "$out/share/applications"
-    cp "$desktopItem"/share/applications/* "$out/share/applications/"
-
-    # Install provided udev rules
-    mkdir -p "$out/etc/udev/rules.d"
-    cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/"
-  '';
-
-  meta = with lib; {
-    description = "Software for Saleae logic analyzers";
-    homepage = "https://www.saleae.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/development/tools/misc/scip/default.nix
deleted file mode 100644
index f31673a12f73..000000000000
--- a/pkgs/development/tools/misc/scip/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, testers
-, scip
-}:
-
-buildGoModule rec {
-  pname = "scip";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "sourcegraph";
-    repo = "scip";
-    rev = "v${version}";
-    hash = "sha256-o7DWSFd3rPSAOmhTvtI9X0tySNhDL7Jh7iDW8eIYn3w=";
-  };
-
-  vendorHash = "sha256-iFlbZvbj30UpgxJdndpLYcUZSTLQAO2MqJGb/6hO8Uc=";
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X=main.Reproducible=true"
-  ];
-
-  # update documentation to fix broken test
-  postPatch = ''
-    substituteInPlace docs/CLI.md \
-      --replace 0.3.0 0.3.1
-  '';
-
-  passthru.tests = {
-    version = testers.testVersion {
-      package = scip;
-      version = "v${version}";
-    };
-  };
-
-  meta = with lib; {
-    description = "SCIP Code Intelligence Protocol CLI";
-    mainProgram = "scip";
-    homepage = "https://github.com/sourcegraph/scip";
-    changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
-  };
-}
diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/development/tools/misc/segger-ozone/default.nix
deleted file mode 100644
index 8109c1e42a36..000000000000
--- a/pkgs/development/tools/misc/segger-ozone/default.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-, fontconfig
-, freetype
-, libICE
-, libSM
-, libX11
-, libXcursor
-, libXfixes
-, libXrandr
-, libXrender
-}:
-
-stdenv.mkDerivation rec {
-  pname = "segger-ozone";
-  version = "3.30b";
-
-  src = {
-    x86_64-linux = fetchurl {
-      url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_x86_64.tgz";
-      hash = "sha256-W8Fo0q58pAn1aB92CjYARcN3vMLEguvsyozsS7VRArQ=";
-    };
-    i686-linux = fetchurl {
-      url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_i386.tgz";
-      hash = "sha256-Xq/69lwF2Ll5VdkYMDNRtc0YUUvWc+XR0FHJXxOLNQ4=";
-    };
-  }.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    fontconfig
-    freetype
-    libICE
-    libSM
-    libX11
-    libXcursor
-    libXfixes
-    libXrandr
-    libXrender
-    stdenv.cc.cc.lib
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    mv Lib lib
-    mv * $out
-    ln -s $out/Ozone $out/bin
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "J-Link Debugger and Performance Analyzer";
-    longDescription = ''
-      Ozone is a cross-platform debugger and performance analyzer for J-Link
-      and J-Trace.
-
-        - Stand-alone graphical debugger
-        - Debug output of any tool chain and IDE 1
-        - C/C++ source level debugging and assembly instruction debugging
-        - Debug information windows for any purpose: disassembly, memory,
-          globals and locals, (live) watches, CPU and peripheral registers
-        - Source editor to fix bugs immediately
-        - High-speed programming of the application into the target
-        - Direct use of J-Link built-in features (Unlimited Flash
-          Breakpoints, Flash Download, Real Time Terminal, Instruction Trace)
-        - Scriptable project files to set up everything automatically
-          - New project wizard to ease the basic configuration of new projects
-
-      1 Ozone has been tested with the output of the following compilers:
-      GCC, Clang, ARM, IAR. Output of other compilers may be supported but is
-      not guaranteed to be.
-    '';
-    homepage = "https://www.segger.com/products/development-tools/ozone-j-link-debugger";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = [ maintainers.bmilanov ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
-  };
-}
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
deleted file mode 100644
index f0f0eb7113c4..000000000000
--- a/pkgs/development/tools/misc/strace/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater, elfutils }:
-
-stdenv.mkDerivation rec {
-  pname = "strace";
-  version = "6.11";
-
-  src = fetchurl {
-    url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U=";
-  };
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ perl ];
-
-  enableParallelBuilding = true;
-
-  # libunwind for -k.
-  # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
-  # The build will silently fall back and -k will not work on RISC-V.
-  buildInputs = [ libunwind ]
-    # -kk
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
-
-  configureFlags = [ "--enable-mpers=check" ]
-    ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function";
-
-  passthru.updateScript = gitUpdater {
-    # No nicer place to find latest release.
-    url = "https://github.com/strace/strace.git";
-    rev-prefix = "v";
-  };
-
-  meta = with lib; {
-    homepage = "https://strace.io/";
-    description = "System call tracer for Linux";
-    license =  with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ globin ma27 qyliss ];
-    mainProgram = "strace";
-  };
-}
diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix
deleted file mode 100644
index a0f6527d05e9..000000000000
--- a/pkgs/development/tools/misc/terser/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ buildNpmPackage, fetchFromGitHub, lib }:
-
-buildNpmPackage rec {
-  pname = "terser";
-  version = "5.31.3";
-
-  src = fetchFromGitHub {
-    owner = "terser";
-    repo = "terser";
-    rev = "v${version}";
-    hash = "sha256-7B6dRulnSPD5s2w4nTXBPxJUCRvKD9++/Y1BMNm2ZwM=";
-  };
-
-  npmDepsHash = "sha256-FMd2bbMHzo38/zJuOlpzGtRPwuoxmZJF/XF2KgTP2ak=";
-
-  meta = with lib; {
-    description = "JavaScript parser, mangler and compressor toolkit for ES6+";
-    mainProgram = "terser";
-    homepage = "https://terser.org";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ talyz ];
-  };
-}
diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix
index ae1046318cd5..1c215819a9a2 100644
--- a/pkgs/development/tools/misc/texinfo/packages.nix
+++ b/pkgs/development/tools/misc/texinfo/packages.nix
@@ -102,7 +102,7 @@ in
     patches = [ ./fix-glibc-2.34.patch ];
   };
   texinfo7 = buildTexinfo {
-    version = "7.1";
-    hash = "sha256-3u7J8Z8VngRv34rSIjGYGAbawzLMNy8cdjUErYKzCVM=";
+    version = "7.1.1";
+    hash = "sha256-Ma435GKDUpQythvuHOAe0AkNWZ5gb8aincofd8dqbII=";
   };
 }
diff --git a/pkgs/development/tools/misc/tyson/default.nix b/pkgs/development/tools/misc/tyson/default.nix
deleted file mode 100644
index 2809c881c945..000000000000
--- a/pkgs/development/tools/misc/tyson/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-}:
-
-buildGoModule rec {
-  pname = "tyson";
-  version = "0.1.1";
-
-  src = fetchFromGitHub {
-    owner = "jetpack-io";
-    repo = "tyson";
-    rev = "v${version}";
-    hash = "sha256-c4ROLn+BSX7v/4C9/IeU6HiE2YvnqDuXXGp2iZhAVk4=";
-  };
-
-  vendorHash = "sha256-NhDv7oH8LK/vebwjs55tsCCWVhbZZd15z5ewOF5z9+Y=";
-
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  ldflags = [ "-s" "-w" ];
-
-  postInstall = ''
-    installShellCompletion --cmd tyson \
-      --bash <($out/bin/tyson completion bash) \
-      --fish <($out/bin/tyson completion fish) \
-      --zsh <($out/bin/tyson completion zsh)
-  '';
-
-  meta = with lib; {
-    description = "TypeScript as a configuration language";
-    mainProgram = "tyson";
-    homepage = "https://github.com/jetpack-io/tyson";
-    changelog = "https://github.com/jetpack-io/tyson/releases/tag/${src.rev}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
-  };
-}
diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix
index c4589eefb4de..c4f5d4e051c6 100644
--- a/pkgs/development/tools/misc/yakut/default.nix
+++ b/pkgs/development/tools/misc/yakut/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   };
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     click
     coloredlogs
     psutil
diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix
deleted file mode 100644
index e3ba759beb16..000000000000
--- a/pkgs/development/tools/moq/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ buildGoModule, fetchFromGitHub, lib }:
-
-buildGoModule rec {
-  pname = "moq";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "matryer";
-    repo = "moq";
-    rev = "v${version}";
-    sha256 = "sha256-7egB+0JLHUbPc21XBC18M4m4fPqy1Qon3N9Fwkcmico=";
-  };
-
-  vendorHash = "sha256-Kp0mRLmOlV3UpYSQJoc54tYU78sg+RZ5qy/1ime7j7w=";
-
-  subPackages = [ "." ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X main.Version=${version}"
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/matryer/moq";
-    description = "Interface mocking tool for go generate";
-    mainProgram = "moq";
-    longDescription = ''
-      Moq is a tool that generates a struct from any interface. The struct can
-      be used in test code as a mock of the interface.
-    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ anpryl ];
-  };
-}
diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix
index 79ceb8a0aadd..79f8f638c08c 100644
--- a/pkgs/development/tools/mysql-shell/8.nix
+++ b/pkgs/development/tools/mysql-shell/8.nix
@@ -5,9 +5,8 @@
 , fetchurl
 , git
 , cctools
-, DarwinTools
+, darwin
 , makeWrapper
-, CoreServices
 , bison
 , openssl
 , protobuf
@@ -34,8 +33,8 @@
 let
   pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
 
-  mysqlShellVersion = "8.4.1";
-  mysqlServerVersion = "8.4.1";
+  mysqlShellVersion = "8.4.3";
+  mysqlServerVersion = "8.4.3";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql-shell";
@@ -44,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
   srcs = [
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-20Hxl9cXDFTX7cDQyaJzDCJfSvBeztD2S+z5u2wRAT4=";
+      hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-wTwoaoaCrTQqaqgE35Sg8zn8HqjsjQowbtgMZTpkYQU=";
+      hash = "sha256-rO+cAfQzUobMrTLGHRbaXsG+vMcjVTtDoZwmyok+dS4=";
     })
   ];
 
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
 
   buildInputs = [
     curl
@@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     antlr.runtime.cpp
   ] ++ pythonDeps
   ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
 
   preConfigure = ''
     # Build MySQL
diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix
index 14ff96542c46..573245955006 100644
--- a/pkgs/development/tools/mysql-shell/innovation.nix
+++ b/pkgs/development/tools/mysql-shell/innovation.nix
@@ -5,9 +5,8 @@
 , fetchurl
 , git
 , cctools
-, DarwinTools
+, darwin
 , makeWrapper
-, CoreServices
 , bison
 , openssl
 , protobuf
@@ -34,8 +33,8 @@
 let
   pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
 
-  mysqlShellVersion = "9.0.1";
-  mysqlServerVersion = "9.0.1";
+  mysqlShellVersion = "9.1.0";
+  mysqlServerVersion = "9.1.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql-shell-innovation";
@@ -44,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
   srcs = [
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-GPpl8epq6nHkGP4FSFUtmijeaOK4vDupU2WZ60WaZgY=";
+      hash = "sha256-UsNnUjm/2dPIMiT/IAKqbihvq5e/WytcoahcnDR3Zvw=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-F77W+cY1X29p4DIA1JOxJ6jAKT+8Qz4LkHh91MASlE0=";
+      hash = "sha256-YHlM/heqV8vQnIGxwEESXx+wRVr++TFjSb00tPwBb2s=";
     })
   ];
 
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
 
   buildInputs = [
     curl
@@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     antlr.runtime.cpp
   ] ++ pythonDeps
   ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
 
   preConfigure = ''
     # Build MySQL
diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix
deleted file mode 100644
index 6249685b503b..000000000000
--- a/pkgs/development/tools/neil/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, makeWrapper
-, babashka
-}:
-
-stdenv.mkDerivation rec {
-  pname = "neil";
-  version = "0.3.66";
-
-  src = fetchFromGitHub {
-    owner = "babashka";
-    repo = "neil";
-    rev = "v${version}";
-    sha256 = "sha256-Gh4bhJh5ZB2ZEp3cx1D/r1qyc5SLdQ7RGGR12UaFW/k=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    install -D neil $out/bin/neil
-    wrapProgram $out/bin/neil \
-      --prefix PATH : "${lib.makeBinPath [ babashka ]}"
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/babashka/neil";
-    description = "CLI to add common aliases and features to deps.edn-based projects";
-    mainProgram = "neil";
-    license = licenses.mit;
-    platforms = babashka.meta.platforms;
-    maintainers = with maintainers; [ jlesquembre ];
-  };
-}
diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix
deleted file mode 100644
index c9d422781827..000000000000
--- a/pkgs/development/tools/nest-cli/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ buildNpmPackage
-, darwin
-, fetchFromGitHub
-, lib
-, python3
-, stdenv
-}:
-
-buildNpmPackage rec {
-  pname = "nest-cli";
-  version = "10.4.5";
-
-  src = fetchFromGitHub {
-    owner = "nestjs";
-    repo = pname;
-    rev = version;
-    hash = "sha256-F/Oi7ra+UE4YKXHZalH5qFk4coaGfHRpWaxamYunRuw=";
-  };
-
-  npmDepsHash = "sha256-6yh8TKfq3fuq4QcnA4uM49/G0Kp1sccRyTcV5s9dVck=";
-
-  env = {
-    npm_config_build_from_source = true;
-  };
-
-  nativeBuildInputs = [
-    python3
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreServices
-  ];
-
-  meta = with lib; {
-    description = "CLI tool for Nest applications";
-    homepage = "https://nestjs.com";
-    license = licenses.mit;
-    mainProgram = "nest";
-    maintainers = [ maintainers.ehllie ];
-  };
-}
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
deleted file mode 100644
index e6fc96038ff8..000000000000
--- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/Makefile.conf	2014-05-19 16:53:09.263564921 +0200
-+++ new/Makefile.conf	2014-05-19 16:53:42.213152994 +0200
-@@ -1,6 +1,6 @@
- 
- # Where binaries are installed:
--BINDIR := `dirname  \`which ocamlc\``
-+BINDIR := $(out)/bin
- 
- ####
- 
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
deleted file mode 100644
index bd5102e038a2..000000000000
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ buildDotnetModule
-, dotnetCorePackages
-, fetchFromGitHub
-, lib
-, stdenv
-, runCommand
-, expect
-}:
-let
-  inherit (dotnetCorePackages) sdk_8_0 runtime_6_0;
-in
-let finalPackage = buildDotnetModule rec {
-  pname = "omnisharp-roslyn";
-  version = "1.39.12";
-
-  src = fetchFromGitHub {
-    owner = "OmniSharp";
-    repo = "omnisharp-roslyn";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
-  };
-
-  projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
-  nugetDeps = ./deps.nix;
-
-  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ];
-  dotnet-runtime = sdk_8_0;
-
-  dotnetInstallFlags = [ "--framework net6.0" ];
-  dotnetBuildFlags = [ "--framework net6.0" "--no-self-contained" ];
-  dotnetFlags = [
-    # These flags are set by the cake build.
-    "-property:PackageVersion=${version}"
-    "-property:AssemblyVersion=${version}.0"
-    "-property:FileVersion=${version}.0"
-    "-property:InformationalVersion=${version}"
-    "-property:RuntimeFrameworkVersion=${runtime_6_0.version}"
-    "-property:RollForward=LatestMajor"
-  ];
-
-  postPatch = ''
-    # Relax the version requirement
-    rm global.json
-
-    # Patch the project files so we can compile them properly
-    for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
-      substituteInPlace $project \
-        --replace 'win7-x64;win7-x86;win10-arm64' 'linux-x64;linux-arm64;osx-x64;osx-arm64'
-    done
-  '';
-
-  useDotnetFromEnv = true;
-  executables = [ "OmniSharp" ];
-
-  passthru.tests = let
-    with-sdk = sdk: runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
-      { nativeBuildInputs = [ finalPackage sdk expect ]; meta.timeout = 60; } ''
-      HOME=$TMPDIR
-      expect <<"EOF"
-        spawn OmniSharp
-        expect_before timeout {
-          send_error "timeout!\n"
-          exit 1
-        }
-        expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
-        expect "{\"Event\":\"started\","
-        send \x03
-        expect eof
-        catch wait result
-        exit [lindex $result 3]
-      EOF
-      touch $out
-    '';
-  in {
-    # Make sure we can run OmniSharp with any supported SDK version, as well as without
-    with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0;
-    with-net7-sdk = with-sdk dotnetCorePackages.sdk_7_0;
-    with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
-    no-sdk = with-sdk null;
-  };
-
-  meta = {
-    description = "OmniSharp based on roslyn workspaces";
-    homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
-    sourceProvenance = with lib.sourceTypes; [
-      fromSource
-      binaryNativeCode # dependencies
-    ];
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ tesq0 ericdallo corngood mdarocha ];
-    mainProgram = "OmniSharp";
-  };
-}; in finalPackage
diff --git a/pkgs/development/tools/omnisharp-roslyn/updater.sh b/pkgs/development/tools/omnisharp-roslyn/updater.sh
deleted file mode 100755
index 10868fbd0992..000000000000
--- a/pkgs/development/tools/omnisharp-roslyn/updater.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
-# shellcheck shell=bash
-
-set -euo pipefail
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
-
-if [[ "$new_version" == "$old_version" ]]; then
-  echo "Already up to date!"
-  exit 0
-fi
-
-cd ../../../..
-update-source-version omnisharp-roslyn "${new_version//v}"
-
-$(nix-build -A omnisharp-roslyn.fetch-deps --no-out-link)
diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
deleted file mode 100644
index e7e53652fe29..000000000000
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ lib
-, stdenv
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-
-, enableWasmEval ? false
-}:
-
-assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs";
-
-buildGoModule rec {
-  pname = "open-policy-agent";
-  version = "0.69.0";
-
-  src = fetchFromGitHub {
-    owner = "open-policy-agent";
-    repo = "opa";
-    rev = "v${version}";
-    hash = "sha256-AEh6HBDLQYptBw68SQurPuWADxL5x5OirtJGQ+UKXdU=";
-  };
-
-  vendorHash = null;
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  subPackages = [ "." ];
-
-  ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/opa/version.Version=${version}" ];
-
-  tags = lib.optional enableWasmEval (
-    builtins.trace
-      ("Warning: enableWasmEval breaks reproducability, "
-        + "ensure you need wasm evaluation. "
-        + "`opa build` does not need this feature.")
-      "opa_wasm");
-
-  checkFlags = lib.optionals (!enableWasmEval) [
-    "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages"
-  ];
-
-  preCheck = ''
-    # Feed in all but the e2e tests for testing
-    # This is because subPackages above limits what is built to just what we
-    # want but also limits the tests
-    # Also avoid wasm tests on darwin due to wasmtime-go build issues
-    getGoDirs() {
-      go list ./... | grep -v -e e2e ${lib.optionalString stdenv.hostPlatform.isDarwin "-e wasm"}
-    }
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra
-    rm server/server_test.go
-  '';
-
-  postInstall = ''
-    installShellCompletion --cmd opa \
-      --bash <($out/bin/opa completion bash) \
-      --fish <($out/bin/opa completion fish) \
-      --zsh <($out/bin/opa completion zsh)
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out/bin/opa --help
-    $out/bin/opa version | grep "Version: ${version}"
-
-    ${lib.optionalString enableWasmEval ''
-      # If wasm is enabled verify it works
-      $out/bin/opa eval -t wasm 'trace("hello from wasm")'
-    ''}
-
-    runHook postInstallCheck
-  '';
-
-  meta = with lib; {
-    mainProgram = "opa";
-    homepage = "https://www.openpolicyagent.org";
-    changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md";
-    description = "General-purpose policy engine";
-    longDescription = ''
-      The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies
-      policy enforcement across the stack. OPA provides a high-level declarative language that let’s you specify policy
-      as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies
-      in microservices, Kubernetes, CI/CD pipelines, API gateways, and more.
-    '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lewo jk ];
-  };
-}
diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix
deleted file mode 100644
index 5feddddb90b6..000000000000
--- a/pkgs/development/tools/oxlint/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, rust-jemalloc-sys
-, stdenv
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "oxlint";
-  version = "0.5.2";
-
-  src = fetchFromGitHub {
-    owner = "web-infra-dev";
-    repo = "oxc";
-    rev = "oxlint_v${version}";
-    hash = "sha256-rjp1k3cnDSr/hKXNru7XQ6n5Wz97j2EULnHwg3HAm3g=";
-  };
-
-  cargoHash = "sha256-3IebdIKw3lV+Qy6F7ZgWMchPLzrluGSeWTV9l5to8iM=";
-
-  buildInputs = [
-    rust-jemalloc-sys
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  cargoBuildFlags = [ "--bin=oxlint" ];
-  cargoTestFlags = cargoBuildFlags;
-
-  meta = with lib; {
-    description = "Suite of high-performance tools for JavaScript and TypeScript written in Rust";
-    homepage = "https://github.com/web-infra-dev/oxc";
-    changelog = "https://github.com/web-infra-dev/oxc/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
-    mainProgram = "oxlint";
-  };
-}
diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix
deleted file mode 100644
index 6751e7db17d0..000000000000
--- a/pkgs/development/tools/parsing/spicy/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, makeWrapper
-, python3
-, bison
-, flex
-, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "spicy";
-  version = "1.11.2";
-
-  strictDeps = true;
-
-  src = fetchFromGitHub {
-    owner = "zeek";
-    repo = "spicy";
-    rev = "v${version}";
-    hash = "sha256-cWK/LdV73VkiUpXyK+M7AotD7ucmNvh3HOzpxtCfGQM=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    bison
-    cmake
-    flex
-    makeWrapper
-    python3
-  ];
-
-  buildInputs = [
-    flex
-    zlib
-  ];
-
-  postPatch = ''
-    patchShebangs scripts tests/scripts
-  '';
-
-  cmakeFlags = [
-    "-DHILTI_DEV_PRECOMPILE_HEADERS=OFF"
-  ];
-
-  preFixup = ''
-    for b in $out/bin/*
-      do wrapProgram "$b" --prefix PATH : "${lib.makeBinPath [ bison flex ]}"
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/zeek/spicy";
-    description = "C++ parser generator for dissecting protocols & files";
-    longDescription = ''
-      Spicy is a parser generator that makes it easy to create robust C++
-      parsers for network protocols, file formats, and more. Spicy is a bit
-      like a "yacc for protocols", but it's much more than that: It's an
-      all-in-one system enabling developers to write attributed grammars that
-      describe both syntax and semantics of an input format using a single,
-      unified language. Think of Spicy as a domain-specific scripting language
-      for all your parsing needs.
-    '';
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ tobim ];
-  };
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index add955177922..87915de31ec4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -27,13 +27,13 @@ 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.23.0";
-  hash = "sha256-QNi2u6/jtiMo1dLYoA8Ev1OvZfa8mXCMibSD70J4vVI=";
+  version = "0.24.3";
+  hash = "sha256-2Pg4D1Pf1Ex6ykXouAJvD1NVfg5CH4rCQcSTAJmYwd4=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     inherit hash;
     fetchSubmodules = true;
   };
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  cargoHash = "sha256-H4baEmGsQx+W9EXblt8R1CTYfkgR+dQDAsIwPVsqR68=";
+  cargoHash = "sha256-0ZoXf0eV3kmHaRoHcWrVEgoWnYNBsY9GiFfy84H+0mc=";
 
   buildInputs =
     lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ];
@@ -133,6 +133,8 @@ rustPlatform.buildRustPackage {
     sed -e 's/playground,//' \
         -e 's/playground::serve(&grammar_path.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \
         -i cli/src/main.rs
+    sed -e 's/playground::serve(.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \
+        -i cli/src/main.rs
   '';
 
   # Compile web assembly with emscripten. The --debug flag prevents us from
@@ -169,7 +171,7 @@ rustPlatform.buildRustPackage {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/tree-sitter/tree-sitter";
     description = "Parser generator tool and an incremental parsing library";
     mainProgram = "tree-sitter";
@@ -185,7 +187,7 @@ rustPlatform.buildRustPackage {
       * Robust enough to provide useful results even in the presence of syntax errors
       * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ Profpatsch ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Profpatsch ];
   };
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index c9faf8a788f8..d4a5de263d2a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -82,6 +82,7 @@
   tree-sitter-r = lib.importJSON ./tree-sitter-r.json;
   tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json;
   tree-sitter-rego = lib.importJSON ./tree-sitter-rego.json;
+  tree-sitter-river = lib.importJSON ./tree-sitter-river.json;
   tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json;
   tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json;
   tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index 12a4b4378010..e3a6f4b9e12a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/uyha/tree-sitter-cmake",
-  "rev": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71",
-  "date": "2024-06-20T12:32:15+07:00",
-  "path": "/nix/store/ldbzx710y8wy6dwca0hh8l4aa3cihbr2-tree-sitter-cmake",
-  "sha256": "10lj4f0h8bcbyl03rxgfhizj4vn6fz47jw6clfjz0c1ayxzql9av",
-  "hash": "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI=",
+  "rev": "f2569dd1fce0f252097a25bcbcb9ed8898840310",
+  "date": "2024-10-07T08:54:29Z",
+  "path": "/nix/store/8wbih7ylzajm44r4wxpr376r8r1jhbpy-tree-sitter-cmake",
+  "sha256": "1vy9qrvnmbyah8zb2lg2vwmwilh8byzlyxkwdd2ww5yg651izs1d",
+  "hash": "sha256-LegfQzHPF85Fa3x2T79fCNLIK9/iUbE+gsqvanfGye8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 6fc1c58f6646..ff2f413a9953 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/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": "30f973c2244f0bff444186185f475c3bd76bc3a5",
-  "date": "2024-09-02T20:54:34-04:00",
-  "path": "/nix/store/rmnzl3zg6jpqcxlya59xgyvwq53kabk3-tree-sitter-cpp",
-  "sha256": "0jd6rprbcbc6bd5rppxw21vlg8sv2h8f9bpby45bbb8w3n7ysjmg",
-  "hash": "sha256-r0rtjx0crbUK8euu5BAUW6NHdxC835tLW4YttvLNpkk=",
+  "rev": "30d2fa385735378388a55917e2910965fce19748",
+  "date": "2024-09-22T21:23:40-04:00",
+  "path": "/nix/store/4lkh62dqx3mgs2k7hncp8892y00xakih-tree-sitter-cpp",
+  "sha256": "0sm8wbnc6allavcc1jrsdd6q59vp53j76kccrv9j4c74dfc1bc9v",
+  "hash": "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
index aeb72e594ba2..60fcf5a46ec4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/joelspadin/tree-sitter-devicetree",
-  "rev": "05f12c50cdaafcd8969c9c712245f51a0611df23",
-  "date": "2024-03-15T23:40:59-05:00",
-  "path": "/nix/store/rlbnn034jn2vb5bg06ynrsc6xyxs9sa0-tree-sitter-devicetree",
-  "sha256": "1iw1az1xm3nlq61365lrj8prhx8417ha4f82a90hwfpb58dnf30m",
-  "hash": "sha256-FQxnGyrrOg5BUgI5ouAJBHWYL5KZFjOCwdSO2sNXgcc=",
+  "rev": "07a647c8fb70e6b06379a60526721e3141aa2fd2",
+  "date": "2024-09-26T18:03:23-05:00",
+  "path": "/nix/store/xcv8715lvqg6ncs5z4idzzx4klprl0ca-tree-sitter-devicetree",
+  "sha256": "13rm15p9mrdklys0d720xy386pnvirxxjswg0wi1m87hs8i49qns",
+  "hash": "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
index cbd66be8cf2c..9d04a9f924d9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/elixir-lang/tree-sitter-elixir",
-  "rev": "ac7b59b312ae5c8cc487d10366e11bda2393e31c",
-  "date": "2024-09-06T23:39:25+07:00",
-  "path": "/nix/store/nf8lwh6gamwzqnc7mvjy1mh2khx5ijcf-tree-sitter-elixir",
-  "sha256": "1kciqsj1z8f5bq46jyqscwqa94hqcdwwclg0v0i4ggn6jyxkwq41",
-  "hash": "sha256-gWA+u5fGvkci2OBRxnljGJKkMGcae2kIXsWhH6TGkc0=",
+  "rev": "ef124b83a3f3572b0af23db4efae3f8de06a15e1",
+  "date": "2024-09-28T16:06:03+07:00",
+  "path": "/nix/store/ra2sdascd7h53icvbyh8wv0y2l9pr6pb-tree-sitter-elixir",
+  "sha256": "08nqlhw5c43b92agh7y2mlw27bjsz6qc3dgqa8vxr5gysgqlmxp5",
+  "hash": "sha256-5fZK8dP+ldw3Uvi1wbD5Wq4jOK3CH/iUSGsQVjik2CI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
index c29e2b152a9b..6b62fc988b0f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/stadelmanma/tree-sitter-fortran",
-  "rev": "8f842945abefb76b9a68c0835619b37060b8f098",
-  "date": "2024-08-27T18:09:38-04:00",
-  "path": "/nix/store/j9q4x7llgyq4vc2pri7rqxjvl98anggl-tree-sitter-fortran",
-  "sha256": "1x20nldx2vi113dsy44g1dmayi0cpnm2vlhq9blbycm0cwal0xgf",
-  "hash": "sha256-7nVAFWegMr/oShjSLaq9DESvaguPEK/bCCFu0Ru1QPQ=",
+  "rev": "4a593dda9cbc050a6686187249f8350ceea292ce",
+  "date": "2024-09-26T12:07:02-04:00",
+  "path": "/nix/store/yvw262lh24nbz37mvwlxmxgqij0y74yp-tree-sitter-fortran",
+  "sha256": "1ss12vmg9ibwgz7wk2fmmghy1xw3rv29bn8fd7lr361j6p587h8y",
+  "hash": "sha256-HsGDyjUymJHpaQ7ZlcTOg/fg4avVicnPf3zF9OoWQes=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
index 44c6d89e2914..0d0dbc08924e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/gleam-lang/tree-sitter-gleam",
-  "rev": "2012f294baacf30e7a62414754021284377366c6",
-  "date": "2024-03-04T16:19:15-05:00",
-  "path": "/nix/store/2ms5f9sylr9v23pgw428dr8gqap4859m-tree-sitter-gleam",
-  "sha256": "06xlh4al14h81qr88n60ndy54sfnj0wh20cm3x5pha6llg3dzqsv",
-  "hash": "sha256-W+PfxqPUKHhLH5UBATmQ1mlSfLPAWIQyDgiSQBWBtBs=",
+  "rev": "57c9951b290c8084d7c60b0aee7a2b30986ea031",
+  "date": "2024-09-26T08:29:11-05:00",
+  "path": "/nix/store/zgyi05wljzz1c264mx4lf62629lfkq4z-tree-sitter-gleam",
+  "sha256": "1jcamn09jgna2jyhfali3x74dp9bsp8h4ylkq24hhlyfkfsszqw9",
+  "hash": "sha256-ieOvtZvOUwiJwJN6AtHVK91GTh+RKge9FMo+mYCtisk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 7181aeea0db7..86172703b343 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/IndianBoy42/tree-sitter-just",
-  "rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21",
-  "date": "2024-07-30T00:40:16-04:00",
-  "path": "/nix/store/20pg64wfg1rrl33prc91z19gbpq0cai1-tree-sitter-just",
-  "sha256": "1a5n6f6ig1qsrac46w5z6ib28kifhaqz23amhf79ws7yva3i4lhi",
-  "hash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=",
+  "rev": "390cec48bf04b5bb4e87e8ebc35a06ca3f7051cf",
+  "date": "2024-10-12T11:54:49-05:00",
+  "path": "/nix/store/wbplh7k0xa63pzld09nk6vdljlpc96fg-tree-sitter-just",
+  "sha256": "0r5xjx0v0fsghmin689ib39y682kk87374n2r8vq5xqdkv7m8gix",
+  "hash": "sha256-PT5Uz54N94I3ysKSMw6aUyDj01gxIWNjhU87sEGXvWQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json
index 4fbad29a92d4..e63f2032140e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/benwilliamgraham/tree-sitter-llvm",
-  "rev": "1b96e58faf558ce057d4dc664b904528aee743cb",
-  "date": "2023-09-08T15:05:51-04:00",
-  "path": "/nix/store/hifa2i7b634kl47ldahvryj4n5fm3gwk-tree-sitter-llvm",
-  "sha256": "1sl3i37vzwbyn5ac12lrccmny0dg814my848cb25xdp8n47s5q7l",
-  "hash": "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o=",
+  "rev": "c14cb839003348692158b845db9edda201374548",
+  "date": "2024-10-07T15:28:34-07:00",
+  "path": "/nix/store/aravnn08ip3zggkbww6ap73xb5zvrf6g-tree-sitter-llvm",
+  "sha256": "1fh5nq7war87zrphlv5v2g55gmsbhyv3385va7k1y8gh3czg0x9g",
+  "hash": "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
index c89064cce770..614ac8c59836 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nickel-lang/tree-sitter-nickel",
-  "rev": "43433d8477b24cd13acaac20a66deda49b7e2547",
-  "date": "2024-06-04T11:09:57+01:00",
-  "path": "/nix/store/w51rb76j8kcqn49bjnb4a7wgxpa5ld72-tree-sitter-nickel",
-  "sha256": "0lad31wly0m1kri7c6kk4kqkql8746idiwkyi1lay64y5yxv8j7l",
-  "hash": "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE=",
+  "rev": "ddaa2bc22355effd97c0d6b09ff5962705c6368d",
+  "date": "2024-10-01T17:50:53+02:00",
+  "path": "/nix/store/gwlzg1pxrb75s7bqza2g94d9ad30j20f-tree-sitter-nickel",
+  "sha256": "1dzjrn4lrdr0ncx9s5lkzb066dhpscs3jn63jabmgyv3wbh3kgcc",
+  "hash": "sha256-jL054OJj+1eXksNYOTTTFzZjwPqTFp06syC3TInN8rc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 3494856f8a38..df4b224a6314 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/cstrahan/tree-sitter-nix",
-  "rev": "ceaf10eb2ae877175d58e6304f83ec6f4d704295",
-  "date": "2024-09-16T10:29:29Z",
-  "path": "/nix/store/khfiac3n03vh4r2aw5p3vmbp3449zv3z-tree-sitter-nix",
-  "sha256": "00wmm5nnm8qa08dxqaq1p3k728fqgijnmhgg8wg24shy6g5gqiyw",
-  "hash": "sha256-3Ef8yjMeaiIeR+/BamV82CFx5rgBK9wbAgqjam2plQM=",
+  "rev": "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3",
+  "date": "2024-10-12T02:22:35Z",
+  "path": "/nix/store/as4bh1khg5ymrdvzb9sb3d3d3nh4z2v7-tree-sitter-nix",
+  "sha256": "05jq1ssazilajk5s0i3zfy1jhx0qvpwjwf7cjp8z87n5qpirx3vr",
+  "hash": "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index 025b38ddf2ff..5b4701aa3986 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "0bb9a602d9bc94b66fab96ce51d46a5a227ab76c",
-  "date": "2024-06-13T06:25:15-05:00",
-  "path": "/nix/store/z06sq7pwdmabw0jrhx221aj0xjjgz48g-tree-sitter-nu",
-  "sha256": "1bfhrvm984vqjgmlbi1kq91ywxp3mpz0mb8csg3zsfhkj8xa5483",
-  "hash": "sha256-A5GiOpITOv3H0wytCv6t43buQ8IzxEXrk3gTlOrO0K0=",
+  "rev": "e3b4c967937cad628dca09bd098cd780d8288750",
+  "date": "2024-09-26T09:06:33-05:00",
+  "path": "/nix/store/b0dxxkkj4zqclhm2l6s8n8sqndzzsw49-tree-sitter-nu",
+  "sha256": "1652pyb888lbi4g7g6jh9bkqasm2zjch8d4ir2m90f6pl12c2nqf",
+  "hash": "sha256-DlvBRKDXOJCqyJE0BJn8omqF50pQmnceiYsihJa/opg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
index d769f351e21d..c983defb998c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ocaml",
-  "rev": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae",
-  "date": "2024-03-23T14:49:30+01:00",
-  "path": "/nix/store/p4awlsbz7b3xlbr9l785l7vi1rnxgxlr-tree-sitter-ocaml",
-  "sha256": "04vscg6lkhdnzs15r1yqwwmc2lj73x4h3nf4mfpkwq6g870i04wj",
-  "hash": "sha256-khMQwUHPYD6vq8TZAUkfR1LBKufYh1yC/rbBSc1jehM=",
+  "rev": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e",
+  "date": "2024-09-27T01:35:53+02:00",
+  "path": "/nix/store/aaq21ki5ds4l85ymww8yb04g6jwrmclm-tree-sitter-ocaml",
+  "sha256": "144b8wdlxyzwmbi7x8flxvs8v8b2p92xy70fvrsp417dj8k8s5cc",
+  "hash": "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index c7006cd0fe3d..149336a19090 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "a1e0befae61715d9e162529b3c2bfd961d183613",
-  "date": "2024-09-02T16:13:56-04:00",
-  "path": "/nix/store/j71y2xpajnpq7pp0rv2h0lb0w55vcjg2-tree-sitter-php",
-  "sha256": "1zpnnmrsgmb802m2zjdnfxz41fq475qk7n2pnjsbc5n61k81dgga",
-  "hash": "sha256-6r0W0AzGFra0tFfYM3E5BLtAfne2yS+qAGjVp3O19v4=",
+  "rev": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644",
+  "date": "2024-10-01T08:28:55-05:00",
+  "path": "/nix/store/nhhbb50wrzyqmqar66gynmc44qgrk2ws-tree-sitter-php",
+  "sha256": "0gblhb2cvl740pjccjqxkvdd9shq7f1grzz7qqv7knjvmzhdw858",
+  "hash": "sha256-qCDe4K9b2nk2xuf//II7GOrU2p4dS8bkBeTQzcSCdD0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
index 52fedbf7a4cc..a53b5c2e17c2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/leo60228/tree-sitter-pioasm",
-  "rev": "924aadaf5dea2a6074d72027b064f939acf32e20",
-  "date": "2021-08-27T17:22:56-04:00",
-  "path": "/nix/store/nhxzw33vljxh5i90d0fb5nzdfjp5h9bl-tree-sitter-pioasm",
-  "sha256": "1lxvgc0zkd2sv8dxp2fy6b1k3gqrbkxgqy25lw9sbd4kij7463m2",
-  "hash": "sha256-og5DjoyTtKUTp0V4/PpcGb8xwzLeidsb2lq0+QF7u9M=",
+  "rev": "afece58efdb30440bddd151ef1347fa8d6f744a9",
+  "date": "2024-10-11T21:14:24-04:00",
+  "path": "/nix/store/zhxnnjc6a8bc7dwvb7i20dxbjrv9fnj3-tree-sitter-pioasm",
+  "sha256": "0gz5632nlhi085sn5yh968qpyk17shifkhz9mai92g73byaahjxd",
+  "hash": "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
new file mode 100644
index 000000000000..9b98afddeef0
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/grafana/tree-sitter-river",
+  "rev": "eafcdc5147f985fea120feb670f1df7babb2f79e",
+  "date": "2023-11-22T14:48:13+01:00",
+  "path": "/nix/store/6wwv45dv3lgyzng2hryadamp061yzx4i-tree-sitter-river",
+  "sha256": "0acgxdgdffya5jc8d9ck2xrac0gi41w1a85cm91vwbm1xwxqh6vy",
+  "hash": "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
index a83d9b23b034..ebf0c40e5579 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-  "rev": "affa4389186b6939d89673e1e9d2b28364f5ca6f",
-  "date": "2024-04-30T09:37:18+02:00",
-  "path": "/nix/store/jhngv28bin50xqq7b898mq55s8mzmvr9-tree-sitter-supercollider",
-  "sha256": "02jbkx3679b5z78fdn62yr1ax7lr4mlcrdq0fs378alx8hm9704g",
-  "hash": "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo=",
+  "rev": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7",
+  "date": "2024-09-21T12:39:28+02:00",
+  "path": "/nix/store/c94cwr855ai3b48ajw7nkxgrk6bs2n88-tree-sitter-supercollider",
+  "sha256": "051m7anq0w14qaj271x5ic4ilamrijx5f8np2g8kpgbkxmjc0v8v",
+  "hash": "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index b9f7b8103f18..32997568a47c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "0524da9e1f14b9b7d7d6d36608293f85a550b263",
-  "date": "2024-09-03T22:47:13+02:00",
-  "path": "/nix/store/6zjn6rh5mm32cislyl1bi2ad0fxsk297-tree-sitter-templ",
-  "sha256": "1lxpmp6a00l7rykrgxqdsvsm9iijz4ik3im1xd4gy92zqsj4k8g0",
-  "hash": "sha256-4KFJpMZfJP9I66HGMSP5MsZU9dYN95enz4cCoMytt9M=",
+  "rev": "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88",
+  "date": "2024-10-13T13:44:06+02:00",
+  "path": "/nix/store/2qw76ygi99kpygl7v49syy6v7n81fii2-tree-sitter-templ",
+  "sha256": "10zgbql8z1rnn7wm5gm8z9mfpp0rzm0pnidjj8d8crn4l2b55kl9",
+  "hash": "sha256-ic5SlqDEZoYakrJFe0H9GdzravqovlL5sTaHjyhe74M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index 35dc26733ba9..444e95e3bdab 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/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": "200f9dab6b23f3b9bb8f67fc811221517f56c373",
-  "date": "2024-05-17T17:21:16-04:00",
-  "path": "/nix/store/lgxqyxs5l3nilj6a1caznwgmd7fpfc4k-tree-sitter-tlaplus",
-  "sha256": "0wab31x1p74xgd32yx0jydkz0cay0pwbi8h105apqihv3pxrk350",
-  "hash": "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E=",
+  "rev": "b9e3978f363b3f8884c886a01d15e41bd14d30bd",
+  "date": "2024-09-28T09:39:52-04:00",
+  "path": "/nix/store/cl7xp08fmz23bzn67lzj9ygwzp5fwgz6-tree-sitter-tlaplus",
+  "sha256": "02igqk23gfh5ffdbcdngri769dcr1yd5pcla8vvgwlrgnh1j4bf4",
+  "hash": "sha256-xC0iA7QvU/72RoqyW5oPmbVkTszPNraacwW6N8TELwo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
index 5cbf4b7440de..daede42ece96 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/maxxnino/tree-sitter-zig",
-  "rev": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd",
-  "date": "2024-06-28T17:20:16+07:00",
-  "path": "/nix/store/3j7bnhlb5nka1c7sr965pblr2qrdsrn3-tree-sitter-zig",
-  "sha256": "1ix401wq0raz8sxp88r6wkkzrv6653yk5fi604i026yrm04n9br0",
-  "hash": "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc=",
+  "rev": "a80a6e9be81b33b182ce6305ae4ea28e29211bd5",
+  "date": "2024-10-13T11:52:27+07:00",
+  "path": "/nix/store/7vjvw01f5f8w2czz7n25pxl85zn3b6ys-tree-sitter-zig",
+  "sha256": "0fdf0hcvss7b2rl6wl2rbh6mm43ghfswygz4qv52fb94dxnl0x53",
+  "hash": "sha256-o3RAbW8kLSfKxuQ/z7WDb5BaDVxZUG5oFutovRkErjk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index aa1504f57c7b..3c45e4b74089 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -83,6 +83,12 @@ let
     "tree-sitter-fluent"
     # to unblock my update
     "csharp-tree-sitter"
+    # (experimental) java bindings to the Tree-sitter parsing library
+    "java-tree-sitter"
+    # go bindings to the Tree-sitter parsing library
+    "go-tree-sitter"
+    # kotlin bindings to the Tree-sitter parsing library
+    "kotlin-tree-sitter"
 
     # Non-grammar repositories
     ".github"
@@ -445,6 +451,10 @@ let
       orga = "glehmann";
       repo = "tree-sitter-earthfile";
     };
+    "tree-sitter-river" = {
+      orga = "grafana";
+      repo = "tree-sitter-river";
+    };
   };
 
   allGrammars =
diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
deleted file mode 100644
index 3265936c4377..000000000000
--- a/pkgs/development/tools/pipenv/default.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-{ lib
-, stdenv
-, python3
-, fetchFromGitHub
-, installShellFiles
-, pipenv
-, runCommand
-}:
-
-with python3.pkgs;
-
-let
-
-  runtimeDeps = ps: with ps; [
-    certifi
-    setuptools
-    pip
-    virtualenv
-    virtualenv-clone
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isAndroid [
-    pyjnius
-  ];
-
-  pythonEnv = python3.withPackages runtimeDeps;
-
-in buildPythonApplication rec {
-  pname = "pipenv";
-  version = "2024.1.0";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "pypa";
-    repo = "pipenv";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-rfQIDGYBA2dc01AgW+qMBFQ+ETrOysNkgyKqeQeD/3A=";
-  };
-
-  env.LC_ALL = "en_US.UTF-8";
-
-  nativeBuildInputs = [
-    installShellFiles
-    setuptools
-    wheel
-  ];
-
-  postPatch = ''
-    # pipenv invokes python in a subprocess to create a virtualenv
-    # and to call setup.py.
-    # It would use sys.executable, which in our case points to a python that
-    # does not have the required dependencies.
-    substituteInPlace pipenv/utils/virtualenv.py \
-      --replace "sys.executable" "'${pythonEnv.interpreter}'"
-  '';
-
-  propagatedBuildInputs = runtimeDeps python3.pkgs;
-
-  preCheck = ''
-    export HOME="$TMPDIR"
-  '';
-
-  nativeCheckInputs = [
-    mock
-    pytestCheckHook
-    pytest-xdist
-    pytz
-    requests
-  ];
-
-  disabledTests = [
-    # this test wants access to the internet
-    "test_download_file"
-  ];
-
-  disabledTestPaths = [
-    # many of these tests want access to the internet
-    "tests/integration"
-  ];
-
-  passthru.tests = {
-    verify-venv-patch = runCommand "${pname}-test-verify-venv-patch" {} ''
-      export PIPENV_VENV_IN_PROJECT=1
-
-      # "pipenv install" should be able to create a venv
-      ${pipenv}/bin/pipenv install
-
-       # the venv exists
-      [ -d .venv ]
-
-      touch $out
-    '';
-  };
-
-  postInstall = ''
-    installShellCompletion --cmd pipenv \
-      --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \
-      --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \
-      --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv)
-  '';
-
-  meta = with lib; {
-    description = "Python Development Workflow for Humans";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ berdario ];
-  };
-}
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 4e4753eff8cd..596c4c73d991 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -12,8 +12,8 @@ let
       hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY=";
     };
     "9" = {
-      version = "9.12.2";
-      hash = "sha256-LvblR7CwfYQdYFJA3OTWNWd4MRSM0w9tVkuPT5KPc9I=";
+      version = "9.12.3";
+      hash = "sha256-JCNXcsxKyCpiYnzUf4NMcmZ6LOh3mahG7E6OVV4tS4s=";
     };
   };
 
diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix
index 1739897096d7..ad04b7314820 100644
--- a/pkgs/development/tools/profiling/sysprof/capture.nix
+++ b/pkgs/development/tools/profiling/sysprof/capture.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     "-Dtools=false"
     "-Dtests=false"
     "-Dexamples=false"
+    "-Dpolkit-agent=disabled" # only useful for sysprof-cli
   ];
 
   meta = sysprof.meta // {
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 7359fbb136fb..b13883474363 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sysprof";
-  version = "46.0";
+  version = "47.0";
 
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-c6p+deurPk4JRqBacj335u5CSeO56ITbo1UAq6Kh0XY=";
+    hash = "sha256-dCTGKUNGYGVCiMBCSJmMNX0c6H7hVZ/UTfGYCZLvXfU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index a2895a095422..c6595db224ef 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -1,6 +1,7 @@
 { lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper
 , cpio, elfutils, kernel, gnumake, python3
 , nixosTests
+, withStap ? true # avoid cyclic dependency with glib
 }:
 
 let
@@ -33,7 +34,7 @@ let
 
   pypkgs = with python3.pkgs; makePythonPath [ pyparsing ];
 
-in runCommand "systemtap-${kernel.version}-${version}" {
+in runCommand "systemtap-${version}" {
   inherit stapBuild;
   nativeBuildInputs = [ makeWrapper ];
   passthru.tests = { inherit (nixosTests.systemtap) linux_default linux_latest; };
@@ -43,15 +44,16 @@ in runCommand "systemtap-${kernel.version}-${version}" {
     license = lib.licenses.gpl2;
     platforms = lib.systems.inspect.patterns.isGnu;
   };
-} ''
+} (''
   mkdir -p $out/bin
   for bin in $stapBuild/bin/*; do
     ln -s $bin $out/bin
   done
   rm $out/bin/stap $out/bin/dtrace
+  makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \
+    --prefix PYTHONPATH : ${pypkgs}
+'' + lib.optionalString withStap ''
   makeWrapper $stapBuild/bin/stap $out/bin/stap \
     --add-flags "--sysroot ${sysroot}" \
     --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]}
-  makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \
-    --prefix PYTHONPATH : ${pypkgs}
-''
+'')
diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix
deleted file mode 100644
index bf055522254a..000000000000
--- a/pkgs/development/tools/pscale/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, lib
-, pscale
-, testers
-}:
-
-buildGoModule rec {
-  pname = "pscale";
-  version = "0.209.0";
-
-  src = fetchFromGitHub {
-    owner = "planetscale";
-    repo = "cli";
-    rev = "v${version}";
-    sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8=";
-  };
-
-  vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40=";
-
-  ldflags = [
-    "-s" "-w"
-    "-X main.version=v${version}"
-    "-X main.commit=v${version}"
-    "-X main.date=unknown"
-  ];
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  postInstall = ''
-    installShellCompletion --cmd pscale \
-      --bash <($out/bin/pscale completion bash) \
-      --fish <($out/bin/pscale completion fish) \
-      --zsh <($out/bin/pscale completion zsh)
-  '';
-
-  __darwinAllowLocalNetworking = true;
-
-  passthru.tests.version = testers.testVersion {
-    package = pscale;
-  };
-
-  meta = with lib; {
-    description = "CLI for PlanetScale Database";
-    mainProgram = "pscale";
-    changelog = "https://github.com/planetscale/cli/releases/tag/v${version}";
-    homepage = "https://www.planetscale.com/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pimeys kashw2 ];
-  };
-}
diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix
deleted file mode 100644
index 9ed9a85ad54e..000000000000
--- a/pkgs/development/tools/pypi-mirror/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ fetchFromGitHub
-, lib
-, python3
-}:
-python3.pkgs.buildPythonApplication rec {
-  pname = "pypi-mirror";
-  version = "5.2.0";
-
-  src = fetchFromGitHub {
-    owner = "montag451";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-bvnOieNs8pCDKuCSJx88vRxFPcOGWUj/i3mNS6E/nok=";
-  };
-
-  pythonImportsCheck = [ "pypi_mirror" ];
-
-  meta = with lib; {
-    description = "Script to create a partial PyPI mirror";
-    mainProgram = "pypi-mirror";
-    homepage = "https://github.com/montag451/pypi-mirror";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kamadorueda ];
-  };
-}
diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix
deleted file mode 100644
index 4b4f81056e38..000000000000
--- a/pkgs/development/tools/rain/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, testers
-, rain
-}:
-
-buildGoModule rec {
-  pname = "rain";
-  version = "1.16.1";
-
-  src = fetchFromGitHub {
-    owner = "aws-cloudformation";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-J0ZRJ05MDO92Oa/82FPM69Xrge1ATHF4kgNUd5YISFc=";
-  };
-
-  vendorHash = "sha256-M5LbB71fcEhXoDFd17TSruzl9y9tqiQpREwV/ZgvdQ4=";
-
-  subPackages = [ "cmd/rain" ];
-
-  ldflags = [ "-s" "-w" ];
-
-  passthru.tests.version = testers.testVersion {
-    package = rain;
-    command = "rain --version";
-    version = "v${version}";
-  };
-
-  meta = with lib; {
-    description = "Development workflow tool for working with AWS CloudFormation";
-    mainProgram = "rain";
-    homepage = "https://github.com/aws-cloudformation/rain";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jiegec ];
-  };
-}
diff --git a/pkgs/development/tools/rcodesign/default.nix b/pkgs/development/tools/rcodesign/default.nix
deleted file mode 100644
index a110611ab4a9..000000000000
--- a/pkgs/development/tools/rcodesign/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rcodesign";
-  version = "0.22.0";
-
-  src = fetchFromGitHub {
-    owner = "indygreg";
-    repo = "apple-platform-rs";
-    rev = "apple-codesign/${version}";
-    hash = "sha256-ndbDBGtTOfHHUquKrETe4a+hB5Za9samlnXwVGVvWy4=";
-  };
-
-  cargoHash = "sha256-cpQBdxTw/ge4VtzjdL2a2xgSeCT22fMIjuKu5UEedhI=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk_11_0.frameworks.Security
-  ];
-
-  cargoBuildFlags = [
-    # Only build the binary we want
-    "--bin"
-    "rcodesign"
-  ];
-
-  checkFlags = [
-    # Does network IO
-    "--skip=ticket_lookup::test::lookup_ticket"
-  ];
-
-  meta = with lib; {
-    description = "Cross-platform CLI interface to interact with Apple code signing";
-    mainProgram = "rcodesign";
-    longDescription = ''
-      rcodesign provides various commands to interact with Apple signing,
-      including signing and notarizing binaries, generating signing
-      certificates, and verifying existing signed binaries.
-
-      For more information, refer to the [documentation](https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html).
-    '';
-    homepage = "https://github.com/indygreg/apple-platform-rs";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ euank ];
-  };
-}
diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix
deleted file mode 100644
index d60a81ea85fb..000000000000
--- a/pkgs/development/tools/reindeer/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, stdenv
-, libiconv
-, darwin
-, nix-update-script
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "reindeer";
-  version = "2024.09.30.00";
-
-  src = fetchFromGitHub {
-    owner = "facebookincubator";
-    repo = "reindeer";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-MGOT9fG5scZzHZ1mgqBE3GfhOnTRyPjD2kibbCteUjc=";
-  };
-
-  cargoHash = "sha256-es2jdfVSufXdUxHbQ4MYPPmsnnxT7DTcoCi10YhW/7I=";
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.CoreServices
-    ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules";
-    mainProgram = "reindeer";
-    homepage = "https://github.com/facebookincubator/reindeer";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ nickgerace ];
-  };
-}
-
diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix
deleted file mode 100644
index 3a66444f345c..000000000000
--- a/pkgs/development/tools/relic/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, testers
-, relic
-}:
-
-buildGoModule rec {
-  pname = "relic";
-  version = "8.0.1";
-
-  src = fetchFromGitHub {
-    owner = "sassoftware";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo=";
-  };
-
-  vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY=";
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X=main.version=${version}"
-    "-X=main.commit=${src.rev}"
-  ];
-
-  passthru.tests = {
-    version = testers.testVersion {
-      package = relic;
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/sassoftware/relic";
-    description = "Service and a tool for adding digital signatures to operating system packages for Linux and Windows";
-    mainProgram = "relic";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ strager ];
-  };
-}
diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix
index 51daef23b527..4f65c853da4a 100644
--- a/pkgs/development/tools/replay-io/default.nix
+++ b/pkgs/development/tools/replay-io/default.nix
@@ -8,7 +8,7 @@ in rec {
     version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz"
       metadata.recordreplay.url);
     nativeBuildInputs = [ autoPatchelfHook ];
-    buildInputs = [ stdenv.cc.cc.lib openssl zlib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) openssl zlib ];
 
     src = (fetchzip metadata.recordreplay);
     dontBuild = true;
@@ -73,7 +73,7 @@ in rec {
     version = builtins.head
       (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url);
     nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
     src = (fetchurl metadata.replay-node);
     dontUnpack = true;
@@ -114,7 +114,7 @@ in rec {
     };
 
     nativeBuildInputs = [ makeWrapper ];
-    buildInputs = [ stdenv.cc.cc.lib nodejs ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) nodejs ];
     dontBuild = true;
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 4e9f750520f9..85c04d53e801 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -23,15 +23,15 @@
 }:
 
 let
-  buildNum = "2024-06-26-1341";
+  buildNum = "2024-09-26-1411";
 in
 stdenv.mkDerivation {
   pname = "rgp";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchurl {
     url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
-    hash = "sha256-mpm4hxWyunq6Z6kdSuk4jqnYOTuLFVe+XzXZvHJPf/Q=";
+    hash = "sha256-mgIFDStgat4E+67TaSLrcwgWTu7zLf7Nkn6zBlgeVcQ=";
   };
 
   nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 462eb6022c5a..1e2af744f9bc 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,4 +1,4 @@
-{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }:
+{ lib, rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }:
 let
   clang = rust-bindgen-unwrapped.clang;
   self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}"
@@ -6,7 +6,7 @@ let
       #for substituteAll
       inherit bash;
       unwrapped = rust-bindgen-unwrapped;
-      libclang = clang.cc.lib;
+      libclang = (lib.getLib clang.cc);
       meta = rust-bindgen-unwrapped.meta // {
         longDescription = rust-bindgen-unwrapped.meta.longDescription + ''
           This version of bindgen is wrapped with the required compiler flags
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index a862878c9f7a..a45754a6b70c 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE=";
 
-  buildInputs = [ clang.cc.lib ];
+  buildInputs = [ (lib.getLib clang.cc) ];
 
   preConfigure = ''
-    export LIBCLANG_PATH="${clang.cc.lib}/lib"
+    export LIBCLANG_PATH="${lib.getLib clang.cc}/lib"
   '';
 
   doCheck = true;
diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix
deleted file mode 100644
index 772461683bf3..000000000000
--- a/pkgs/development/tools/rust/cargo-cross/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-cross";
-  version = "0.2.5";
-
-  src = fetchFromGitHub {
-    owner = "cross-rs";
-    repo = "cross";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38=";
-  };
-
-  cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c=";
-
-  checkFlags = [
-    "--skip=docker::shared::tests::directories::test_host"
-  ];
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Zero setup cross compilation and cross testing";
-    homepage = "https://github.com/cross-rs/cross";
-    changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ otavio ];
-    mainProgram = "cross";
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix
index 70c9a377f00c..b5e73fd9e0df 100644
--- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix
+++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix
@@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [
     # uses internet
     "--skip non_existent_http_link --skip working_http_check"
+    # makes assumption about HTML paths that changed in rust 1.82.0
+    "--skip simple_project::it_checks_okay_project_correctly"
+    "--skip cli_args::it_passes_arguments_through_to_cargo"
   ] ++ lib.optional (stdenv.hostPlatform.system != "x86_64-linux")
     # assumes the target is x86_64-unknown-linux-gnu
     "--skip simple_project::it_checks_okay_project_correctly";
diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix
deleted file mode 100644
index 5a14ac34252d..000000000000
--- a/pkgs/development/tools/rust/cargo-leptos/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ darwin
-, fetchFromGitHub
-, lib
-, rustPlatform
-, stdenv
-}:
-let
-  inherit (darwin.apple_sdk.frameworks)
-    CoreServices
-    SystemConfiguration
-    Security;
-  inherit (lib) optionals;
-  inherit (stdenv.hostPlatform) isDarwin;
-in
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-leptos";
-  version = "0.2.20";
-
-  src = fetchFromGitHub {
-    owner = "leptos-rs";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-45zus+mNOiWWbuF50XpMwc1B6Uoy5E1kUQmtdGVc46g=";
-  };
-
-  cargoHash = "sha256-54CRNSDWdqD582Vv6d8snYEJrpkQ2Cvp8sjgQ6BcvHY=";
-
-  buildInputs = optionals isDarwin [
-    SystemConfiguration
-    Security
-    CoreServices
-  ];
-
-  # https://github.com/leptos-rs/cargo-leptos#dependencies
-  buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise
-  doCheck = false; # Check phase tries to query crates.io
-
-  meta = with lib; {
-    description = "Build tool for the Leptos web framework";
-    mainProgram = "cargo-leptos";
-    homepage = "https://github.com/leptos-rs/cargo-leptos";
-    changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ benwis ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix
deleted file mode 100644
index 3e567af66173..000000000000
--- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-llvm-lines";
-  version = "0.4.40";
-
-  src = fetchFromGitHub {
-    owner = "dtolnay";
-    repo = pname;
-    rev = version;
-    hash = "sha256-FyPq2+Smx4ZbJG13TKUHlyAANU4JbpAAUxisH9c4Aq8=";
-  };
-
-  cargoHash = "sha256-AH27+WrWguFpZFIq3N8Wb1Nlwbof6tgX0W4AtwMtoVw=";
-
-  meta = with lib; {
-    description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
-    mainProgram = "cargo-llvm-lines";
-    homepage = "https://github.com/dtolnay/cargo-llvm-lines";
-    changelog = "https://github.com/dtolnay/cargo-llvm-lines/releases/tag/${src.rev}";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ figsoda matthiasbeyer ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix
deleted file mode 100644
index 4ee8ec165f5e..000000000000
--- a/pkgs/development/tools/rust/cargo-mobile2/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, git
-, darwin
-, makeWrapper
-}:
-
-let
-  inherit (darwin.apple_sdk.frameworks) CoreServices;
-  pname = "cargo-mobile2";
-  version = "0.17.3";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
-  src = fetchFromGitHub {
-    owner = "tauri-apps";
-    repo = pname;
-    rev = "cargo-mobile2-v${version}";
-    hash = "sha256-DOV4QjtjOH1420KH70kkISo9lNbcjbnAn34MnAJWYvQ=";
-  };
-
-  # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
-  # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
-  # sourceRoot = "${src.name}/tooling/cli";
-
-  cargoHash = "sha256-aC6IxamPHRZ1V6ZTiXGVSt4YIa+GPK/j6IWh86JOrV8=";
-
-  preBuild = ''
-    mkdir -p $out/share/
-    # during the install process tauri-mobile puts templates and commit information in CARGO_HOME
-    export CARGO_HOME=$out/share/
-  '';
-
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
-  nativeBuildInputs = [ pkg-config git makeWrapper ];
-
-  preFixup = ''
-    for bin in $out/bin/cargo-*; do
-      wrapProgram $bin \
-        --set CARGO_HOME "$out/share"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Rust on mobile made easy!";
-    homepage = "https://tauri.app/";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ happysalada ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix
deleted file mode 100644
index da236481f45d..000000000000
--- a/pkgs/development/tools/rust/cargo-modules/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-modules";
-  version = "0.16.8";
-
-  src = fetchFromGitHub {
-    owner = "regexident";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-F1hVKktU9zhdxXWhpLgymehJQlOX6WbXL2cqQGB+Y5k=";
-  };
-
-  cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreServices
-  ];
-
-  checkFlags = [
-    "--skip=cfg_test::smoke"
-    "--skip=colors::ansi::smoke"
-    "--skip=colors::plain::smoke"
-    "--skip=colors::truecolor::smoke"
-    "--skip=focus_on::glob_path::smoke"
-    "--skip=focus_on::self_path::smoke"
-    "--skip=focus_on::simple_path::smoke"
-    "--skip=focus_on::use_tree::smoke"
-    "--skip=functions::function_body"
-    "--skip=functions::function_inputs"
-    "--skip=functions::function_outputs"
-    "--skip=max_depth::depth_2::smoke"
-    "--skip=selection::no_fns::smoke"
-    "--skip=selection::no_modules::smoke"
-    "--skip=selection::no_traits::smoke"
-    "--skip=selection::no_types::smoke"
-    "--skip=fields::enum_fields"
-    "--skip=fields::struct_fields"
-    "--skip=fields::tuple_fields"
-    "--skip=fields::union_fields"
-  ];
-
-  meta = with lib; {
-    description = "Cargo plugin for showing a tree-like overview of a crate's modules";
-    mainProgram = "cargo-modules";
-    homepage = "https://github.com/regexident/cargo-modules";
-    changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md";
-    license = with licenses; [ mpl20 ];
-    maintainers = with maintainers; [ figsoda rvarago matthiasbeyer ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-risczero/default.nix b/pkgs/development/tools/rust/cargo-risczero/default.nix
deleted file mode 100644
index bf61c32cf778..000000000000
--- a/pkgs/development/tools/rust/cargo-risczero/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, stdenv
-, fetchCrate
-, rustPlatform
-, pkg-config
-, openssl
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-risczero";
-  version = "0.17.0";
-
-  src = fetchCrate {
-    inherit pname version;
-    hash = "sha256-UXCZ4l45zcyn2AnfDW6dNdEnXCWL2waNwDTbermgS6M=";
-  };
-
-  cargoHash = "sha256-KkV+ZQAPegbeZKj3ixDSFQEyKwkKeMYceSc27xGtQms=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  # The tests require network access which is not available in sandboxed Nix builds.
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Cargo extension to help create, manage, and test RISC Zero projects";
-    mainProgram = "cargo-risczero";
-    homepage = "https://risczero.com";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ cameronfyfe ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix
deleted file mode 100644
index 8e04ed2bc9f8..000000000000
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-sweep";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    owner = "holmgr";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
-  };
-
-  cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro=";
-
-  checkFlags = [
-    # Requires a rustup toolchain to be installed.
-    "--skip check_toolchain_listing_on_multiple_projects"
-  ];
-
-  meta = with lib; {
-    description = "Cargo subcommand for cleaning up unused build files generated by Cargo";
-    mainProgram = "cargo-sweep";
-    homepage = "https://github.com/holmgr/cargo-sweep";
-    license = licenses.mit;
-    maintainers = with maintainers; [ xrelkd matthiasbeyer ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix
deleted file mode 100644
index b85112f75538..000000000000
--- a/pkgs/development/tools/rust/cargo-tally/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, rustPlatform, fetchCrate, stdenv, darwin }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-tally";
-  version = "1.0.48";
-
-  src = fetchCrate {
-    inherit pname version;
-    hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls=";
-  };
-
-  cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
-    DiskArbitration
-    Foundation
-    IOKit
-  ]);
-
-  meta = with lib; {
-    description = "Graph the number of crates that depend on your crate over time";
-    mainProgram = "cargo-tally";
-    homepage = "https://github.com/dtolnay/cargo-tally";
-    changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ figsoda matthiasbeyer ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix
deleted file mode 100644
index cc6427400304..000000000000
--- a/pkgs/development/tools/rust/cargo-update/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib
-, rustPlatform
-, fetchCrate
-, cmake
-, installShellFiles
-, pkg-config
-, ronn
-, stdenv
-, curl
-, libgit2
-, libssh2
-, openssl
-, zlib
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-update";
-  version = "15.0.0";
-
-  src = fetchCrate {
-    inherit pname version;
-    hash = "sha256-2Z/fRd80qZi61KO07gx3Jdnslxv1KUCubv9bIUmjGKU=";
-  };
-
-  cargoHash = "sha256-v5rsFzox1x2pf/LilZy/YI985sL5Pigm2GGaCWWjB7s=";
-
-  nativeBuildInputs = [
-    cmake
-    installShellFiles
-    pkg-config
-    ronn
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    curl
-  ];
-
-  buildInputs = [
-    libgit2
-    libssh2
-    openssl
-    zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    curl
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  postBuild = ''
-    # Man pages contain non-ASCII, so explicitly set encoding to UTF-8.
-    HOME=$TMPDIR \
-    RUBYOPT="-E utf-8:utf-8" \
-      ronn -r --organization="cargo-update developers" man/*.md
-  '';
-
-  postInstall = ''
-    installManPage man/*.1
-  '';
-
-  env = {
-    LIBGIT2_NO_VENDOR = 1;
-  };
-
-  meta = with lib; {
-    description = "Cargo subcommand for checking and applying updates to installed executables";
-    homepage = "https://github.com/nabijaczleweli/cargo-update";
-    changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor matthiasbeyer ];
-  };
-}
diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
index d2ef93622786..a481d649e576 100644
--- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-zigbuild";
-  version = "0.19.3";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "messense";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-fVsYQjv+DjGCWv/dAk8S8GcEtDIdaxb1yXAqCpTm0sQ=";
+    hash = "sha256-b1TzMqX+mt14rhOLQQHnHYN69peEfXGpyM4rR6EcxbU=";
   };
 
-  cargoHash = "sha256-R5jv8hFHdhS6MoU5oHleN5B7k2RPX7GhJMwym8kYAYY=";
+  cargoHash = "sha256-NWP8jaQz4KzsZFFR9WAvdlecUI3ogPNN4pcyCUBSq6E=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch b/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch
new file mode 100644
index 000000000000..85baa4fd03e0
--- /dev/null
+++ b/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/profile.rs b/tests/profile.rs
+index 69433a2..596829d 100644
+--- a/tests/profile.rs
++++ b/tests/profile.rs
+@@ -1,6 +1,7 @@
+ use cbindgen::*;
+ 
+ use serial_test::serial;
++use std::env;
+ use std::path::{Path, PathBuf};
+ use std::process::Command;
+ 
+@@ -17,7 +18,12 @@ fn build_using_lib(config: fn(Builder) -> Builder) -> tempfile::TempDir {
+         .tempdir()
+         .expect("Creating tmp dir failed");
+ 
+-    std::env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path());
++    unsafe {
++        env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path());
++        env::remove_var("CARGO_BUILD_TARGET");
++        // ^ avoid unexpected change of layout of the target directory;
++        // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html
++    }
+     let builder = Builder::new()
+         .with_config(Config::from_file(expand_dep_test_dir.join("cbindgen.toml")).unwrap())
+         .with_crate(expand_dep_test_dir);
+@@ -45,6 +51,9 @@ fn build_using_bin(extra_args: &[&str]) -> tempfile::TempDir {
+     Command::new(cbindgen_path)
+         .current_dir(expand_dep_test_dir)
+         .env("CARGO_EXPAND_TARGET_DIR", tmp_dir.path())
++        .env_remove("CARGO_BUILD_TARGET")
++        // ^ avoid unexpected change of layout of the target directory;
++        // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html
+         .args(extra_args)
+         .output()
+         .expect("build should succeed");
+@@ -87,6 +96,19 @@ fn bin_default_uses_debug_build() {
+     assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]);
+ }
+ 
++#[test]
++fn bin_ignore_cargo_build_target_in_tests() {
++    unsafe {
++        env::set_var("CARGO_BUILD_TARGET", "x86_64-unknown-linux-gnu");
++    }
++    assert_eq!(
++        env::var("CARGO_BUILD_TARGET"),
++        Ok("x86_64-unknown-linux-gnu".into())
++    );
++    // ^ this env var should be ignored:
++    bin_default_uses_debug_build();
++}
++
+ #[test]
+ fn bin_explicit_debug_build() {
+     let target_dir = build_using_bin(&["--profile", "debug"]);
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index ff4cfdf9ef86..fa3b9fb98b78 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -23,6 +23,12 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XTGHHD5Qw3mr+lkPKOXyqb0K3sEENW8Sf0n9mtrFFXI=";
   };
 
+  patches = [
+    # open PR: https://github.com/mozilla/cbindgen/pull/1010
+    # see also: https://github.com/NixOS/nixpkgs/pull/298108
+    ./1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch
+  ];
+
   cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 6d3c5434e20a..4a5972a4018e 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
       };
       aarch64-darwin = passthru.sources.x86_64-darwin;
     };
+    updateScript = ./update.sh;
   };
 
   src = passthru.sources.${stdenv.hostPlatform.system}
diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix
deleted file mode 100644
index 925fc8d5b29d..000000000000
--- a/pkgs/development/tools/scenic-view/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }:
-let
-  jdk = openjdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux {
-    enableJavaFX = true;
-    openjfx = openjfx.override { withWebKit = true; };
-  });
-
-  pname = "scenic-view";
-  version = "11.0.2";
-
-  src = fetchFromGitHub {
-    owner = "JonathanGiles";
-    repo = pname;
-    rev = version;
-    sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";
-  };
-
-  gradle = gradle_7;
-
-  desktopItem = makeDesktopItem {
-    name = pname;
-    desktopName = pname;
-    exec = pname;
-    comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications.";
-    mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ];
-    categories = [ "Development" ];
-  };
-
-in stdenv.mkDerivation rec {
-  inherit pname version src;
-  nativeBuildInputs = [ gradle makeWrapper ];
-
-  mitmCache = gradle.fetchDeps {
-    inherit pname;
-    data = ./deps.json;
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  doCheck = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share/${pname}
-    cp build/libs/scenicview.jar $out/share/${pname}/${pname}.jar
-    makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar"
-
-    runHook postInstall
-  '';
-
-  desktopItems = [ desktopItem ];
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications";
-    mainProgram = "scenic-view";
-    longDescription = ''
-      A JavaFX application designed to make it simple to understand the current state of your application scenegraph
-      and to also easily manipulate properties of the scenegraph without having to keep editing your code.
-      This lets you find bugs and get things pixel perfect without having to do the compile-check-compile dance.
-    '';
-    homepage = "https://github.com/JonathanGiles/scenic-view/";
-    sourceProvenance = with sourceTypes; [
-      fromSource
-      binaryBytecode  # deps
-    ];
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wirew0rm ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
deleted file mode 100644
index 40764df42280..000000000000
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
-
-stdenv.mkDerivation rec {
-  pname = "spirv-tools";
-  version = "1.3.290.0";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "SPIRV-Tools";
-    rev = "vulkan-sdk-${version}";
-    hash = "sha256-5swjNHeJpsCDkUVBL1uFqAzOPFzCESsYtDfRkno2bN4=";
-  };
-
-  # The cmake options are sufficient for turning on static building, but not
-  # for disabling shared building, just trim the shared lib from the CMake
-  # description
-  patches = lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch;
-
-  nativeBuildInputs = [ cmake python3 ];
-
-  cmakeFlags = [
-    "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}"
-    # Avoid blanket -Werror to evade build failures on less
-    # tested compilers.
-    "-DSPIRV_WERROR=OFF"
-  ];
-
-  # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \
-                '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR}
-                 -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR}
-                 -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake'
-    substituteInPlace cmake/SPIRV-Tools.pc.in \
-      --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
-    substituteInPlace cmake/SPIRV-Tools-shared.pc.in \
-      --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
-  '';
-
-  meta = with lib; {
-    description = "SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
-    homepage = "https://github.com/KhronosGroup/SPIRV-Tools";
-    license = licenses.asl20;
-    platforms = with platforms; unix ++ windows;
-    maintainers = [ maintainers.ralith ];
-  };
-}
diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix
deleted file mode 100644
index d7d0acdd813c..000000000000
--- a/pkgs/development/tools/spring-boot-cli/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils, testers, gitUpdater }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "spring-boot-cli";
-  version = "3.3.2";
-
-  src = fetchzip {
-    url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-6xHiSd+CEFOZHiSLfAeMp/xcnTuEkFpCzYLgnnNkRN4=";
-  };
-
-  nativeBuildInputs = [ makeWrapper installShellFiles ];
-
-  installPhase = ''
-    runHook preInstall
-    rm bin/spring.bat
-    installShellCompletion --bash shell-completion/bash/spring
-    installShellCompletion --zsh shell-completion/zsh/_spring
-    rm -r shell-completion
-    cp -r . $out
-    wrapProgram $out/bin/spring \
-      --set JAVA_HOME ${jdk} \
-      --set PATH /bin:${coreutils}/bin:${jdk}/bin
-    runHook postInstall
-  '';
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      command = "${lib.getExe finalAttrs.finalPackage} --version";
-      version = "v${finalAttrs.version}";
-    };
-    updateScript = gitUpdater {
-      url = "https://github.com/spring-projects/spring-boot";
-      ignoredVersions = ".*-(RC|M).*";
-      rev-prefix = "v";
-    };
-  };
-
-  meta = with lib; {
-    description = ''
-      CLI which makes it easy to create spring-based applications
-    '';
-    longDescription = ''
-      Spring Boot makes it easy to create stand-alone, production-grade
-      Spring-based Applications that you can run. We take an opinionated view
-      of the Spring platform and third-party libraries, so that you can get
-      started with minimum fuss. Most Spring Boot applications need very
-      little Spring configuration.
-
-      You can use Spring Boot to create Java applications that can be started
-      by using java -jar or more traditional war deployments. We also provide
-      a command line tool that runs “spring scripts”.
-    '';
-    homepage = "https://spring.io/projects/spring-boot";
-    changelog = "https://github.com/spring-projects/spring-boot/releases/tag/v${finalAttrs.version}";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    mainProgram = "spring";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ moaxcp ];
-  };
-})
diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock
index dab324f352f1..9359528117d1 100644
--- a/pkgs/development/tools/sqlint/Gemfile.lock
+++ b/pkgs/development/tools/sqlint/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    google-protobuf (3.25.0)
+    google-protobuf (3.25.5)
     pg_query (4.2.3)
       google-protobuf (>= 3.22.3)
     sqlint (0.3.0)
diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix
index 05925a45e69e..4ad8655564e9 100644
--- a/pkgs/development/tools/sqlint/gemset.nix
+++ b/pkgs/development/tools/sqlint/gemset.nix
@@ -4,10 +4,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm";
+      sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3";
       type = "gem";
     };
-    version = "3.25.0";
+    version = "3.25.5";
   };
   pg_query = {
     dependencies = ["google-protobuf"];
diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix
deleted file mode 100644
index 03775abeeb51..000000000000
--- a/pkgs/development/tools/tokio-console/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib
-, fetchFromGitHub
-, installShellFiles
-, rustPlatform
-, protobuf
-, stdenv
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "tokio-console";
-  version = "0.1.10";
-
-  src = fetchFromGitHub {
-    owner = "tokio-rs";
-    repo = "console";
-    rev = "tokio-console-v${version}";
-    hash = "sha256-sjfdxOeaNANYJuJMjZ/tCGc2mWM+98d8yPHAVSl4cF4=";
-  };
-
-  cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI=";
-
-  buildAndTestSubdir = "tokio-console";
-
-  nativeBuildInputs = [
-    installShellFiles
-    protobuf
-  ];
-
-  # uses currently unstable tokio features
-  RUSTFLAGS = "--cfg tokio_unstable";
-
-  checkFlags = [
-    # tests depend upon git repository at test execution time
-    "--skip bootstrap"
-    "--skip config::tests::args_example_changed"
-    "--skip config::tests::toml_example_changed"
-  ];
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd tokio-console \
-      --bash <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion bash) \
-      --fish <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion fish) \
-      --zsh <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion zsh)
-  '';
-
-  meta = with lib; {
-    description = "Debugger for asynchronous Rust code";
-    homepage = "https://github.com/tokio-rs/console";
-    mainProgram = "tokio-console";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ max-niederman ];
-  };
-}
diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix
deleted file mode 100644
index 9845c565196b..000000000000
--- a/pkgs/development/tools/trunk/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib,
-stdenv,
-rustPlatform,
-fetchFromGitHub,
-pkg-config,
-openssl,
-CoreServices,
-SystemConfiguration
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "trunk";
-  version = "0.20.3";
-
-  src = fetchFromGitHub {
-    owner = "trunk-rs";
-    repo = "trunk";
-    rev = "v${version}";
-    hash = "sha256-3p3HllZu69e2ERLoEJwSWL0OXl23lxvIPHV9HK30CqM=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = if stdenv.hostPlatform.isDarwin
-    then [ CoreServices SystemConfiguration ]
-    else [ openssl ];
-  # requires network
-  checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
-
-  cargoHash = "sha256-4b+ASz8uV17Y7gO50YKiu8Zhhq4sL+HJj1WAD7VkEE4=";
-
-  meta = with lib; {
-    homepage = "https://github.com/trunk-rs/trunk";
-    description = "Build, bundle & ship your Rust WASM application to the web";
-    mainProgram = "trunk";
-    maintainers = with maintainers; [ freezeboy ctron ];
-    license = with licenses; [ asl20 ];
-  };
-}
diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index c18c8b60f6d0..d7d2bd2c2a8c 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.9.1";
+  version = "3.10.0";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
-    sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA=";
+    sha256 = "sha256-9dm6tVQ5nsDC8X2clrT4cAl8jg4wLwcihE4bnFgdU+A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
deleted file mode 100644
index c5331ea2475f..000000000000
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ lib
-, callPackage
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, jq
-, glslang
-, libffi
-, libX11
-, libXau
-, libxcb
-, libXdmcp
-, libXrandr
-, spirv-headers
-, spirv-tools
-, vulkan-headers
-, vulkan-utility-libraries
-, wayland
-}:
-
-let
-  robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
-in
-stdenv.mkDerivation rec {
-  pname = "vulkan-validation-layers";
-  version = "1.3.290.0";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "Vulkan-ValidationLayers";
-    rev = "vulkan-sdk-${version}";
-    hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc=";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    jq
-  ];
-
-  buildInputs = [
-    glslang
-    libX11
-    libXau
-    libXdmcp
-    libXrandr
-    libffi
-    libxcb
-    robin-hood-hashing
-    spirv-headers
-    spirv-tools
-    vulkan-headers
-    vulkan-utility-libraries
-    wayland
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_LAYER_SUPPORT_FILES=ON"
-    # Hide dev warnings that are useless for packaging
-    "-Wno-dev"
-  ];
-
-  # Tests require access to vulkan-compatible GPU, which isn't
-  # available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER.
-  doCheck = false;
-
-  separateDebugInfo = true;
-
-  # Include absolute paths to layer libraries in their associated
-  # layer definition json files.
-  preFixup = ''
-    for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
-      jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
-      mv tmp.json "$f"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Official Khronos Vulkan validation layers";
-    homepage    = "https://github.com/KhronosGroup/Vulkan-ValidationLayers";
-    platforms   = platforms.linux;
-    license     = licenses.asl20;
-    maintainers = [ maintainers.ralith ];
-  };
-}
diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
deleted file mode 100644
index 3861ad43e7cc..000000000000
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
-
-buildGoModule rec {
-  pname = "vultr-cli";
-  version = "3.3.1";
-
-  src = fetchFromGitHub {
-    owner = "vultr";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-pJrujiZfIuqRFwIHReWT7xPi94Zh3owcZFz23jtpsQg=";
-  };
-
-  vendorHash = "sha256-4HRzd5p5u8h07/escAoatF97RZ/hejYqW61Dlkp27Gk=";
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  ldflags = [ "-s" "-w" ];
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd vultr-cli \
-      --bash <($out/bin/vultr-cli completion bash) \
-      --fish <($out/bin/vultr-cli completion fish) \
-      --zsh <($out/bin/vultr-cli completion zsh)
-  '';
-
-  meta = with lib; {
-    description = "Official command line tool for Vultr services";
-    homepage = "https://github.com/vultr/vultr-cli";
-    changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ Br1ght0ne ];
-    mainProgram = "vultr-cli";
-  };
-}
diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix
index 4ae5a8bd63a5..b024d5fe710c 100644
--- a/pkgs/development/tools/wails/default.nix
+++ b/pkgs/development/tools/wails/default.nix
@@ -69,7 +69,7 @@ buildGoModule rec {
     description = "Build applications using Go + HTML + CSS + JS";
     homepage = "https://wails.io";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ianmjones ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "wails";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
deleted file mode 100644
index 4b978485895d..000000000000
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-  darwin,
-  cmake,
-  pkg-config,
-  zstd,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wasm-pack";
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "rustwasm";
-    repo = "wasm-pack";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-NEujk4ZPQ2xHWBCVjBCD7H6f58P4KrwCNoDHKa0d5JE=";
-  };
-
-  cargoHash = "sha256-pFKGQcWW1/GaIIWMyWBzts4w1hMu27hTG/uUMjkfDMo=";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [
-    zstd
-  ];
-
-  # Most tests rely on external resources and build artifacts.
-  # Disabling check here to work with build sandboxing.
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Utility that builds rust-generated WebAssembly package";
-    mainProgram = "wasm-pack";
-    homepage = "https://github.com/rustwasm/wasm-pack";
-    license = with licenses; [
-      asl20 # or
-      mit
-    ];
-    maintainers = [ maintainers.dhkl ];
-  };
-}
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
deleted file mode 100644
index e30700ca2025..000000000000
--- a/pkgs/development/tools/xcbuild/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ lib, stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng
-, CoreServices, CoreGraphics, ImageIO, ninja }:
-
-let
-  googletest = fetchFromGitHub {
-    owner  = "google";
-    repo   = "googletest";
-    rev    = "43359642a1c16ad3f4fc575c7edd0cb935810815";
-    sha256 = "0y4xaah62fjr3isaryc3vfz3mn9xflr00vchdimj8785milxga4q";
-  };
-
-  linenoise = fetchFromGitHub {
-    owner  = "antirez";
-    repo   = "linenoise";
-    rev    = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
-    sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
-  };
-in stdenv.mkDerivation {
-  pname = "xcbuild";
-
-  # Once a version is released that includes
-  # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
-  # we can stop doing this -pre thing.
-  version = "0.1.2-pre";
-
-  src = fetchFromGitHub {
-    owner  = "facebook";
-    repo   = "xcbuild";
-    rev    = "32b9fbeb69bfa2682bd0351ec2f14548aaedd554";
-    sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m";
-  };
-
-  patches = [ ./includes.patch ];
-
-  prePatch = ''
-    rmdir ThirdParty/*
-    cp -r --no-preserve=all ${googletest} ThirdParty/googletest
-    cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
-  '';
-
-  postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    # Fix build on gcc-13 due to missing includes
-    sed -e '1i #include ' -i \
-      Libraries/libutil/Headers/libutil/Permissions.h \
-      Libraries/pbxbuild/Headers/pbxbuild/Tool/AuxiliaryFile.h \
-      Libraries/pbxbuild/Headers/pbxbuild/Tool/Invocation.h
-
-    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-    sed 1i'#include ' \
-      -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Apple Open Sourced LZFSE, but not libcompression, and it isn't
-    # part of an impure framework we can add
-    substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
-      --replace "#if HAVE_LIBCOMPRESSION" "#if 0"
-  '';
-
-  # TODO: instruct cmake not to put it in /usr, rather than cleaning up
-  postInstall = ''
-    mv $out/usr/* $out
-    rmdir $out/usr
-    cp liblinenoise.* $out/lib/
-  '';
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  cmakeFlags = [ "-GNinja" ];
-
-  nativeBuildInputs = [ cmake ninja ];
-  buildInputs = [ zlib libxml2 libpng ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices CoreGraphics ImageIO ];
-
-  meta = with lib; {
-    description = "Xcode-compatible build tool";
-    homepage = "https://github.com/facebook/xcbuild";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ copumpkin matthewbauer ];
-    license = with licenses; [ bsd2 bsd3 ];
-  };
-}
diff --git a/pkgs/development/tools/xcbuild/platforms.nix b/pkgs/development/tools/xcbuild/platforms.nix
deleted file mode 100644
index 333e5471b976..000000000000
--- a/pkgs/development/tools/xcbuild/platforms.nix
+++ /dev/null
@@ -1,301 +0,0 @@
-{ stdenv, runCommand, lib, sdks, xcodePlatform, writeText }:
-
-let
-
-  inherit (lib.generators) toPlist;
-
-  Info = {
-    CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}";
-    Type = "Platform";
-    Name = lib.toLower xcodePlatform;
-  };
-
-  Version = {
-    ProjectName = "OSXPlatformSupport";
-  };
-
-  # These files are all based off of Xcode spec fies found in
-  # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/PrivatePlugIns/IDEOSXSupportCore.ideplugin/Contents/Resources.
-
-  # Based off of the "MacOSX Architectures.xcspec" file. All i386 stuff
-  # is removed because NixPkgs only supports darwin-x86_64 and darwin-arm64.
-  Architectures = [
-    {
-      Identifier = "Standard";
-      Type = "Architecture";
-      Name = "Standard Architectures (Apple Silicon, 64-bit Intel)";
-      RealArchitectures = [ "arm64" "x86_64" ];
-      ArchitectureSetting = "ARCHS_STANDARD";
-    }
-    {
-      Identifier = "Universal";
-      Type = "Architecture";
-      Name = "Universal (Apple Silicon, 64-bit Intel)";
-      RealArchitectures = [ "arm64" "x86_64" ];
-      ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT";
-    }
-    {
-      Identifier = "Native";
-      Type = "Architecture";
-      Name = "Native Architecture of Build Machine";
-      ArchitectureSetting = "NATIVE_ARCH_ACTUAL";
-    }
-    {
-      Identifier = "Standard64bit";
-      Type = "Architecture";
-      Name = "Apple Silicon, 64-bit Intel";
-      RealArchitectures = [ "arm64" "x86_64" ];
-      ArchitectureSetting = "ARCHS_STANDARD_64_BIT";
-    }
-    {
-      Identifier = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
-      Type = "Architecture";
-      Name = "Apple Silicon or Intel 64-bit";
-    }
-    {
-      Identifier = "Standard_Including_64_bit";
-      Type = "Architecture";
-      Name = "Standard Architectures (including 64-bit)";
-      RealArchitectures = [ "arm64" "x86_64" ];
-      ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT";
-    }
-  ];
-
-  # Based off of the "MacOSX Package Types.xcspec" file. Only keep the
-  # bare minimum needed.
-  PackageTypes = [
-    {
-      Identifier = "com.apple.package-type.mach-o-executable";
-      Type = "PackageType";
-      Name = "Mach-O Executable";
-      DefaultBuildSettings = {
-        EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
-        EXECUTABLE_PATH = "$(EXECUTABLE_NAME)";
-      };
-      ProductReference = {
-        FileType = "compiled.mach-o.executable";
-        Name = "$(EXECUTABLE_NAME)";
-      };
-    }
-    {
-      Identifier = "com.apple.package-type.mach-o-objfile";
-      Type = "PackageType";
-      Name = "Mach-O Object File";
-      DefaultBuildSettings = {
-        EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
-        EXECUTABLE_PATH = "$(EXECUTABLE_NAME)";
-      };
-      ProductReference = {
-        FileType = "compiled.mach-o.objfile";
-        Name = "$(EXECUTABLE_NAME)";
-      };
-    }
-    {
-      Identifier = "com.apple.package-type.mach-o-dylib";
-      Type = "PackageType";
-      Name = "Mach-O Dynamic Library";
-      DefaultBuildSettings = {
-        EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
-        EXECUTABLE_PATH = "$(EXECUTABLE_NAME)";
-      };
-      ProductReference = {
-        FileType = "compiled.mach-o.dylib";
-        Name = "$(EXECUTABLE_NAME)";
-      };
-    }
-    {
-      Identifier = "com.apple.package-type.static-library";
-      Type = "PackageType";
-      Name = "Mach-O Static Library";
-      DefaultBuildSettings = {
-        EXECUTABLE_PREFIX = "lib";
-        EXECUTABLE_SUFFIX = ".a";
-        EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
-        EXECUTABLE_PATH = "$(EXECUTABLE_NAME)";
-      };
-      ProductReference = {
-        FileType = "archive.ar";
-        Name = "$(EXECUTABLE_NAME)";
-        IsLaunchable = "NO";
-      };
-    }
-    {
-      Identifier = "com.apple.package-type.wrapper";
-      Type = "PackageType";
-      Name = "Wrapper";
-      DefaultBuildSettings = {
-        WRAPPER_SUFFIX = ".bundle";
-        WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
-        CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents";
-        EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
-        EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS";
-        EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)";
-        INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist";
-        INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings";
-        PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo";
-        PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist";
-        VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist";
-        PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers";
-        PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
-        EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables";
-        FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks";
-        SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks";
-        SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport";
-        UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources";
-        LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj";
-        DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation";
-        PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns";
-        SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts";
-      };
-      ProductReference = {
-        FileType = "wrapper.cfbundle";
-        Name = "$(WRAPPER_NAME)";
-        IsLaunchable = "NO";
-      };
-    }
-    {
-      Identifier = "com.apple.package-type.wrapper.application";
-      Type = "PackageType";
-      BasedOn = "com.apple.package-type.wrapper";
-      Name = "Application Wrapper";
-      DefaultBuildSettings = {
-        GENERATE_PKGINFO_FILE = "YES";
-      };
-      ProductReference = {
-        FileType = "wrapper.application";
-        Name = "$(WRAPPER_NAME)";
-        IsLaunchable = "YES";
-      };
-    }
-  ];
-
-  # Based off of the "MacOSX Product Types.xcspec" file. All
-  # bundles/wrapper are removed, because we prefer dynamic products in
-  # NixPkgs.
-  ProductTypes = [
-    {
-      Identifier = "com.apple.product-type.tool";
-      Type = "ProductType";
-      Name = "Command-line Tool";
-      PackageTypes = [ "com.apple.package-type.mach-o-executable" ];
-    }
-    {
-      Identifier = "com.apple.product-type.objfile";
-      Type = "ProductType";
-      Name = "Object File";
-      PackageTypes = [ "com.apple.package-type.mach-o-objfile" ];
-    }
-    {
-      Identifier = "com.apple.product-type.library.dynamic";
-      Type = "ProductType";
-      Name = "Dynamic Library";
-      PackageTypes = [ "com.apple.package-type.mach-o-dylib" ];
-      DefaultBuildProperties = {
-        FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)";
-        MACH_O_TYPE = "mh_dylib";
-        REZ_EXECUTABLE = "YES";
-        EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)";
-        EXECUTABLE_EXTENSION = "dylib";
-        DYLIB_COMPATIBILITY_VERSION = "1";
-        DYLIB_CURRENT_VERSION = "1";
-        FRAMEWORK_FLAG_PREFIX = "-framework";
-        LIBRARY_FLAG_PREFIX = "-l";
-        LIBRARY_FLAG_NOSPACE = "YES";
-        STRIP_STYLE = "debugging";
-        GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
-        CODE_SIGNING_ALLOWED = "YES";
-        CODE_SIGNING_REQUIRED = "NO";
-      };
-    }
-    {
-      Identifier = "com.apple.product-type.library.static";
-      Type = "ProductType";
-      Name = "Static Library";
-      PackageTypes = [ "com.apple.package-type.static-library" ];
-      DefaultBuildProperties = {
-        FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)";
-        MACH_O_TYPE = "staticlib";
-        REZ_EXECUTABLE = "YES";
-        EXECUTABLE_PREFIX = "lib";
-        EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)";
-        EXECUTABLE_EXTENSION = "a";
-        FRAMEWORK_FLAG_PREFIX = "-framework";
-        LIBRARY_FLAG_PREFIX = "-l";
-        LIBRARY_FLAG_NOSPACE = "YES";
-        STRIP_STYLE = "debugging";
-        SEPARATE_STRIP = "YES";
-        CLANG_ENABLE_MODULE_DEBUGGING = "NO";
-      };
-    }
-    {
-      Type = "ProductType";
-      Identifier = "com.apple.product-type.bundle";
-      Name = "Bundle";
-      DefaultBuildProperties = {
-        FULL_PRODUCT_NAME = "$(WRAPPER_NAME)";
-        MACH_O_TYPE = "mh_bundle";
-        WRAPPER_PREFIX = "";
-        WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
-        WRAPPER_EXTENSION = "bundle";
-        WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
-        FRAMEWORK_FLAG_PREFIX = "-framework";
-        LIBRARY_FLAG_PREFIX = "-l";
-        LIBRARY_FLAG_NOSPACE = "YES";
-        STRIP_STYLE = "non-global";
-      };
-      PackageTypes = [ "com.apple.package-type.wrapper" ];
-      IsWrapper = "YES";
-      HasInfoPlist = "YES";
-      HasInfoPlistStrings = "YES";
-    }
-    {
-      Identifier = "com.apple.product-type.application";
-      Type = "ProductType";
-      BasedOn = "com.apple.product-type.bundle";
-      Name = "Application";
-      DefaultBuildProperties = {
-        MACH_O_TYPE = "mh_execute";
-        WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
-        WRAPPER_EXTENSION = "app";
-      };
-      PackageTypes = [ "com.apple.package-type.wrapper.application" ];
-    }
-    {
-      Type = "ProductType";
-      Identifier = "com.apple.product-type.framework";
-      Name = "Bundle";
-      DefaultBuildProperties = {
-        FULL_PRODUCT_NAME = "$(WRAPPER_NAME)";
-        MACH_O_TYPE = "mh_bundle";
-        WRAPPER_PREFIX = "";
-        WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
-        WRAPPER_EXTENSION = "bundle";
-        WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
-        FRAMEWORK_FLAG_PREFIX = "-framework";
-        LIBRARY_FLAG_PREFIX = "-l";
-        LIBRARY_FLAG_NOSPACE = "YES";
-        STRIP_STYLE = "non-global";
-      };
-      PackageTypes = [ "com.apple.package-type.wrapper" ];
-      IsWrapper = "YES";
-      HasInfoPlist = "YES";
-      HasInfoPlistStrings = "YES";
-    }
-  ];
-
-in
-
-runCommand "Platforms" {} ''
-  platform=$out/${xcodePlatform}.platform
-
-  install -D ${writeText "Info.plist" (toPlist {} Info)} $platform/Info.plist
-  install -D ${writeText "version.plist" (toPlist {} Version)} $platform/version.plist
-  install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $platform/Developer/Library/Xcode/Specifications/Architectures.xcspec
-  install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $platform/Developer/Library/Xcode/Specifications/PackageTypes.xcspec
-  install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $platform/Developer/Library/Xcode/Specifications/ProductTypes.xcspec
-
-  ln -s $platform $platform/usr
-
-  mkdir -p $platform/Developer
-  ln -s ${sdks} $platform/Developer/SDKs
-''
diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix
deleted file mode 100644
index bf16bf132d77..000000000000
--- a/pkgs/development/tools/xcbuild/sdks.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ runCommand, lib, toolchainName, sdkName
-, writeText, xcodePlatform, sdkVer, productBuildVer }:
-
-let
-  inherit (lib.generators) toPlist toJSON;
-
-  SDKSettings = {
-    CanonicalName = sdkName;
-    DisplayName = sdkName;
-    Toolchains = [ toolchainName ];
-    Version = sdkVer;
-    MaximumDeploymentTarget = sdkVer;
-    isBaseSDK = "YES";
-  };
-
-  SystemVersion = lib.optionalAttrs (productBuildVer != null) {
-    ProductBuildVersion = productBuildVer;
-  } // {
-    ProductName = "Mac OS X";
-    ProductVersion = sdkVer;
-  };
-in
-
-runCommand "SDKs" {} ''
-  sdk=$out/${sdkName}.sdk
-  install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist
-  install -D ${writeText "SDKSettings.json" (toJSON {} SDKSettings)} $sdk/SDKSettings.json
-  install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist
-  ln -s $sdk $sdk/usr
-
-  ln -s $sdk $out/${xcodePlatform}.sdk
-''
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix
deleted file mode 100644
index 2da12ba7cbcb..000000000000
--- a/pkgs/development/tools/xcbuild/toolchains.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ runCommand, toolchainName, fetchurl, stdenv
-, buildPackages, lib, writeText }:
-
-let
-
-  inherit (lib) getBin optionalString;
-  inherit (lib.generators) toPlist;
-
-  ToolchainInfo = {
-    Identifier = toolchainName;
-  };
-
-  # We could pull this out of developer_cmds but it adds an annoying
-  # loop if we want to bootstrap and this is just a tiny script so I'm
-  # not going to bother.
-  mkdep-darwin-src = fetchurl {
-    url        = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh";
-    sha256     = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541";
-    executable = true;
-  };
-in
-
-runCommand "Toolchains" {} (''
-  toolchain=$out/XcodeDefault.xctoolchain
-  mkdir -p $toolchain
-
-  install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $toolchain/ToolchainInfo.plist
-
-  ln -s $toolchain $toolchain/usr
-
-  mkdir -p $toolchain/include
-  mkdir -p $toolchain/lib
-  mkdir -p $toolchain/libexec
-  mkdir -p $toolchain/share
-  mkdir -p $toolchain/bin
-
-  for bin in ${getBin stdenv.cc}/bin/*; do
-    ln -s $bin $toolchain/bin
-  done
-
-  for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do
-    if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
-      ln -s $bin $toolchain/bin
-    fi
-  done
-
-  ln -s ${buildPackages.bison}/bin/yacc $toolchain/bin/yacc
-  ln -s ${buildPackages.bison}/bin/bison $toolchain/bin/bison
-  ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex
-  ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++
-  ln -s $toolchain/bin/flex $toolchain/bin/lex
-
-  ln -s ${buildPackages.m4}/bin/m4 $toolchain/bin/m4
-  ln -s $toolchain/bin/m4 $toolchain/bin/gm4
-
-  ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/bin/unifdef
-  ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/bin/unifdefall
-
-  ln -s ${buildPackages.gperf}/bin/gperf $toolchain/bin/gperf
-  ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent
-  ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags
-'' + optionalString stdenv.hostPlatform.isDarwin ''
-  for bin in ${getBin buildPackages.cctools}/bin/*; do
-    if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
-      ln -s $bin $toolchain/bin
-    fi
-  done
-
-  ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin
-  mkdir -p $toolchain/libexec
-  ln -s ${buildPackages.darwin.bootstrap_cmds}/libexec/migcom $toolchain/libexec
-  ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep
-'')
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
deleted file mode 100644
index 9c8c846e5cca..000000000000
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ /dev/null
@@ -1,167 +0,0 @@
-{ lib, stdenv, makeWrapper, writeText, writeTextFile, runCommand, callPackage
-, CoreServices, ImageIO, CoreGraphics
-, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
-, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
-, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12"
-, productBuildVer ? null
-}:
-
-let
-
-  toolchainName = "com.apple.dt.toolchain.XcodeDefault";
-  sdkName = "${xcodePlatform}${sdkVer}";
-  xcrunSdkName = lib.toLower xcodePlatform;
-
-  # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
-  sdkBuildVersion = "17E189";
-  xcodeSelectVersion = "2349";
-
-  xcbuild = callPackage ./default.nix {
-    inherit CoreServices ImageIO CoreGraphics stdenv;
-  };
-
-  toolchains = callPackage ./toolchains.nix {
-    inherit toolchainName stdenv;
-  };
-
-  sdks = callPackage ./sdks.nix {
-    inherit toolchainName sdkName xcodePlatform sdkVer productBuildVer;
-  };
-
-  platforms = callPackage ./platforms.nix {
-    inherit sdks xcodePlatform stdenv;
-  };
-
-  xcconfig = writeText "nix.xcconfig" ''
-    SDKROOT=${sdkName}
-  '';
-
-  xcode-select = writeText "xcode-select" ''
-#!${stdenv.shell}
-while [ $# -gt 0 ]; do
-   case "$1" in
-         -h | --help) ;; # noop
-         -s | --switch) shift;; # noop
-         -r | --reset) ;; # noop
-         -v | --version) echo xcode-select version ${xcodeSelectVersion} ;;
-         -p | -print-path | --print-path) echo @DEVELOPER_DIR@ ;;
-         --install) ;; # noop
-    esac
-    shift
-done
-  '';
-
-  xcrun = writeTextFile {
-    name = "xcrun";
-    executable = true;
-    destination = "/bin/xcrun";
-    text = ''
-#!${stdenv.shell}
-args=( "$@" )
-
-# If an SDK was requested, check that it matches.
-for ((i = 0; i < ''${#args[@]}; i++)); do
-  case "''${args[i]}" in
-    --sdk | -sdk)
-      i=$((i + 1))
-      if [[ "''${args[i]}" != '${xcrunSdkName}' ]]; then
-        echo >&2 "xcodebuild: error: SDK \"''${args[i]}\" cannot be located."
-        exit 1
-      fi
-      ;;
-  esac
-done
-
-while [ $# -gt 0 ]; do
-   case "$1" in
-         --sdk | -sdk) shift ;;
-         --toolchain | -toolchain) shift ;;
-         --find | -find | -f)
-           shift
-           command -v $1 || exit 1 ;;
-         --log | -log) ;; # noop
-         --verbose | -verbose) ;; # noop
-         --no-cache | -no-cache) ;; # noop
-         --kill-cache | -kill-cache) ;; # noop
-         --show-sdk-path | -show-sdk-path)
-           echo ${sdks}/${sdkName}.sdk ;;
-         --show-sdk-platform-path | -show-sdk-platform-path)
-           echo ${platforms}/${xcodePlatform}.platform ;;
-         --show-sdk-version | -show-sdk-version)
-           echo ${sdkVer} ;;
-         --show-sdk-build-version | -show-sdk-build-version)
-           echo ${sdkBuildVersion} ;;
-         *) break ;;
-    esac
-    shift
-done
-
-if ! [[ -z "$@" ]]; then
-   exec "$@"
-fi
-    '';
-    checkPhase = ''
-      ${stdenv.shellDryRun} "$target"
-    '';
-  };
-
-in
-
-runCommand "xcodebuild-${xcbuild.version}" {
-  nativeBuildInputs = [ makeWrapper ];
-  inherit (xcbuild) meta;
-
-  # ensure that the toolchain goes in PATH
-  propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain" ];
-
-  passthru = {
-    inherit xcbuild xcrun;
-    toolchain = "${toolchains}/XcodeDefault.xctoolchain";
-    sdk = "${sdks}/${sdkName}";
-    platform = "${platforms}/${xcodePlatform}.platform";
-  };
-
-  preferLocalBuild = true;
-} ''
-  mkdir -p $out/bin
-
-  ln -s $out $out/usr
-
-  mkdir -p $out/Library/Xcode
-  ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
-
-  ln -s ${platforms} $out/Platforms
-  ln -s ${toolchains} $out/Toolchains
-
-  mkdir -p $out/Applications/Xcode.app/Contents
-  ln -s $out $out/Applications/Xcode.app/Contents/Developer
-
-  # The native xcodebuild command supports an invocation like "xcodebuild -version -sdk" without specifying the specific SDK, so we simulate this by
-  # detecting this case and simulating the output; printing the header and appending the normal output via appending the sdk version to the positional
-  # arguments we pass through to the wrapped xcodebuild.
-  makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \
-    --add-flags "-xcconfig ${xcconfig}" \
-    --add-flags "DERIVED_DATA_DIR=." \
-    --set DEVELOPER_DIR "$out" \
-    --set SDKROOT ${sdkName} \
-    --run '[ "$#" -eq 2 ] && [ "$1" = "-version" ] && [ "$2" = "-sdk" ] && echo ${sdkName}.sdk - macOS ${sdkVer} \(macosx${sdkVer}\) && set -- "$@" "${sdkName}"' \
-    --run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \
-    --run '[ "$1" = "-license" ] && exit 0'
-
-  substitute ${xcode-select} $out/bin/xcode-select \
-    --subst-var-by DEVELOPER_DIR $out/Applications/Xcode.app/Contents/Developer
-  chmod +x $out/bin/xcode-select
-
-  cp ${xcrun}/bin/xcrun $out/bin/xcrun
-
-  for bin in PlistBuddy actool builtin-copy builtin-copyPlist \
-             builtin-copyStrings builtin-copyTiff \
-             builtin-embeddedBinaryValidationUtility \
-             builtin-infoPlistUtility builtin-lsRegisterURL \
-             builtin-productPackagingUtility builtin-validationUtility \
-             lsbom plutil; do
-    ln -s ${xcbuild}/bin/$bin $out/bin/$bin
-  done
-
-  fixupPhase
-''
diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/development/tools/xcodes/default.nix
deleted file mode 100644
index 3b92959d2f44..000000000000
--- a/pkgs/development/tools/xcodes/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, swift
-, swiftpm
-, swiftpm2nix
-, makeWrapper
-, CryptoKit
-, LocalAuthentication
-, libcompression
-, aria2
-}:
-let
-  generated = swiftpm2nix.helpers ./generated;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xcodes";
-  version = "1.5.0";
-
-  src = fetchFromGitHub {
-    owner = "XcodesOrg";
-    repo = "xcodes";
-    rev = finalAttrs.version;
-    hash = "sha256-vksfvrx0TqtjcOHn38Ey3P6jIFYF4CbD3SVICVFINSU=";
-  };
-
-  nativeBuildInputs = [ swift swiftpm makeWrapper ];
-
-  buildInputs = [
-    CryptoKit
-    LocalAuthentication
-    libcompression
-  ];
-
-  configurePhase = generated.configure;
-
-  installPhase = ''
-    runHook preInstall
-
-    binPath="$(swiftpmBinPath)"
-    install -D $binPath/xcodes $out/bin/xcodes
-    wrapProgram $out/bin/xcodes \
-      --prefix PATH : ${lib.makeBinPath [ aria2 ]}
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}";
-    description = "Command-line tool to install and switch between multiple versions of Xcode";
-    homepage = "https://github.com/XcodesOrg/xcodes";
-    license = with licenses; [
-      mit
-      # unxip
-      lgpl3Only
-    ];
-    maintainers = with maintainers; [ _0x120581f emilytrau ];
-    platforms = platforms.darwin;
-  };
-})
diff --git a/pkgs/development/tools/xcodes/generated/default.nix b/pkgs/development/tools/xcodes/generated/default.nix
deleted file mode 100644
index 669a8e300026..000000000000
--- a/pkgs/development/tools/xcodes/generated/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by swiftpm2nix.
-{
-  workspaceStateFile = ./workspace-state.json;
-  hashes = {
-    "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg";
-    "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7";
-    "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l";
-    "LegibleError" = "137hc96cqpiwsyybj2xawyfmqh7rmk1khqkiqp3616ql909mh99y";
-    "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83";
-    "PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg";
-    "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0";
-    "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9";
-    "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8";
-    "Version" = "0s5bwr1li6dnsnalfyraq1kzhqmmn9qwp1mld4msrn3q5vvjmql9";
-    "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";
-  };
-}
diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix
deleted file mode 100644
index 0287fd6f8bd8..000000000000
--- a/pkgs/development/tools/yamlfmt/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }:
-
-buildGoModule rec {
-  pname = "yamlfmt";
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI=";
-  };
-
-  vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA=";
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X main.version=${version}"
-    "-X main.commit=${src.rev}"
-  ];
-
-  passthru.tests.version = testers.testVersion {
-    package = yamlfmt;
-  };
-
-  meta = with lib; {
-    description = "Extensible command line tool or library to format yaml files";
-    homepage = "https://github.com/google/yamlfmt";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ sno2wman ];
-    mainProgram = "yamlfmt";
-  };
-}
diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix
deleted file mode 100644
index a2de21fd7a2b..000000000000
--- a/pkgs/development/tools/ytt/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  installShellFiles,
-  testers,
-  ytt,
-}:
-buildGoModule rec {
-  pname = "ytt";
-  version = "0.50.0";
-
-  src = fetchFromGitHub {
-    owner = "carvel-dev";
-    repo = "ytt";
-    rev = "v${version}";
-    sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4=";
-  };
-
-  vendorHash = null;
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X carvel.dev/ytt/pkg/version.Version=${version}"
-  ];
-
-  postInstall = ''
-    installShellCompletion --cmd ytt \
-      --bash <($out/bin/ytt completion bash) \
-      --fish <($out/bin/ytt completion fish) \
-      --zsh <($out/bin/ytt completion zsh)
-  '';
-
-  # Once `__structuredArgs` is introduced, integrate checks and
-  # set some regexes `checkFlags = [ "-skip=TestDataValues.*" ]`
-  # etc. So far we dont test because passing '*' chars through the Go builder
-  # is flawed.
-  doCheck = false;
-
-  passthru.tests.version = testers.testVersion {
-    package = ytt;
-    command = "ytt --version";
-    inherit version;
-  };
-
-  meta = with lib; {
-    description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values";
-    mainProgram = "ytt";
-    homepage = "https://get-ytt.io";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
-      brodes
-      techknowlogick
-      gabyx
-    ];
-  };
-}
diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix
deleted file mode 100644
index ee24281798d7..000000000000
--- a/pkgs/development/tools/zsv/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, perl, jq }:
-
-stdenv.mkDerivation rec {
-  pname = "zsv";
-  version = "0.3.8-alpha";
-
-  src = fetchFromGitHub {
-    owner = "liquidaty";
-    repo = "zsv";
-    rev = "v${version}";
-    hash = "sha256-+6oZvMlfLVTDLRlqOpgdZP2YxT6Zlt13wBMFlryBrXY=";
-  };
-
-  nativeBuildInputs = [ perl ];
-
-  buildInputs = [ jq ];
-
-  configureFlags = [
-    "--jq-prefix=${jq.lib}"
-  ];
-
-  meta = with lib; {
-    description = "World's fastest (simd) CSV parser, with an extensible CLI";
-    mainProgram = "zsv";
-    homepage = "https://github.com/liquidaty/zsv";
-    changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/web/edge-runtime/Cargo.lock b/pkgs/development/web/edge-runtime/Cargo.lock
deleted file mode 100644
index 6f3f1aa872b0..000000000000
--- a/pkgs/development/web/edge-runtime/Cargo.lock
+++ /dev/null
@@ -1,7119 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
-[[package]]
-name = "aead-gcm-stream"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a09ecb526d53de2842cc876ee5c9b51161ee60399edeca4cf74892a01b48177"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "aes-kw"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c"
-dependencies = [
- "aes",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
- "version_check 0.9.4",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
-
-[[package]]
-name = "approx"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "ash"
-version = "0.37.3+1.3.251"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
-dependencies = [
- "libloading 0.7.4",
-]
-
-[[package]]
-name = "asn1-rs"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
-dependencies = [
- "asn1-rs-derive",
- "asn1-rs-impl",
- "displaydoc",
- "nom 7.1.3",
- "num-traits",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "asn1-rs-derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.109",
- "synstructure",
-]
-
-[[package]]
-name = "asn1-rs-impl"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ast_node"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "async-compression"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c"
-dependencies = [
- "brotli",
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "async-tungstenite"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d"
-dependencies = [
- "futures-io",
- "futures-util",
- "log",
- "pin-project-lite",
- "tungstenite",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "auto_impl"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "823b8bb275161044e2ac7a25879cb3e2480cb403e3943022c7c769c599b756aa"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "async-tungstenite",
- "bytes",
- "cityhash",
- "cooked-waker",
- "cpu_timer",
- "ctor",
- "deno_ast",
- "deno_broadcast_channel",
- "deno_canvas",
- "deno_config",
- "deno_console",
- "deno_core",
- "deno_crypto",
- "deno_fetch",
- "deno_fs",
- "deno_http",
- "deno_io",
- "deno_net",
- "deno_npm",
- "deno_semver",
- "deno_tls",
- "deno_url",
- "deno_web",
- "deno_webgpu",
- "deno_webidl",
- "deno_websocket",
- "enum-as-inner 0.6.0",
- "eszip",
- "event_worker",
- "fastwebsockets 0.4.4",
- "flume",
- "futures-util",
- "http 0.2.11",
- "http_utils",
- "httparse",
- "hyper 0.14.28",
- "import_map",
- "log",
- "monch",
- "notify",
- "once_cell",
- "pin-project",
- "reqwest",
- "rustls-pemfile 2.1.0",
- "sb_ai",
- "sb_core",
- "sb_env",
- "sb_fs",
- "sb_graph",
- "sb_module_loader",
- "sb_node",
- "sb_npm",
- "sb_os",
- "sb_workers",
- "scopeguard",
- "serde",
- "serial_test",
- "thiserror",
- "tls-listener",
- "tokio",
- "tokio-rustls 0.25.0",
- "tokio-util",
- "tungstenite",
- "url",
- "urlencoding",
- "uuid",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-
-[[package]]
-name = "base32"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64-simd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
-dependencies = [
- "outref",
- "vsimd",
-]
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "better_scoped_tls"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de"
-dependencies = [
- "scoped-tls",
-]
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.49.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c07087f3d5731bf3fb375a81841b99597e25dc11bd3bc72d16d43adf6624a6e"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "cfg-if 0.1.10",
- "clang-sys",
- "clap 2.34.0",
- "env_logger 0.6.2",
- "fxhash",
- "lazy_static",
- "log",
- "peeking_take_while",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "regex",
- "shlex",
- "which 2.0.1",
-]
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
-dependencies = [
- "serde",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-
-[[package]]
-name = "bytemuck"
-version = "1.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-
-[[package]]
-name = "cache_control"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee"
-
-[[package]]
-name = "cauchy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff11ddd2af3b5e80dd0297fee6e56ac038d9bdc549573cdb51bd6d2efe7f05e"
-dependencies = [
- "num-complex",
- "num-traits",
- "rand",
- "serde",
-]
-
-[[package]]
-name = "cbc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "cblas-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6feecd82cce51b0204cf063f0041d69f24ce83f680d87514b004248e7b0fa65"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cexpr"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
-dependencies = [
- "nom 4.2.3",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
-dependencies = [
- "iana-time-zone",
- "num-integer",
- "num-traits",
- "winapi",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "cityhash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7ecb82e5b6394ea8408bc8f454d50c75f339ca89f9af90a6ff8694e6a1c63da"
-dependencies = [
- "bindgen",
- "cc",
- "clap 2.34.0",
- "libc",
-]
-
-[[package]]
-name = "clang-sys"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.5.2",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "term_size",
- "textwrap",
- "unicode-width",
- "vec_map",
- "yaml-rust",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
-dependencies = [
- "clap_builder",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim 0.11.0",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-
-[[package]]
-name = "cli"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "base",
- "clap 4.5.0",
- "deno_core",
- "dotenv-build",
- "env_logger 0.10.2",
- "glob",
- "log",
- "sb_graph",
- "tokio",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "cooked-waker"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[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 = "cpu_timer"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "ctor",
- "futures",
- "libc",
- "log",
- "nix",
- "once_cell",
- "signal-hook",
- "signal-hook-tokio",
- "tokio",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
-
-[[package]]
-name = "crc32fast"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "generic-array",
- "rand_core",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "rand_core",
- "typenum",
-]
-
-[[package]]
-name = "ctor"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
-dependencies = [
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "ctr"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "curve25519-dalek-derive",
- "fiat-crypto",
- "platforms",
- "rustc_version 0.4.0",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "d3d12"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
-dependencies = [
- "bitflags 2.4.2",
- "libloading 0.8.1",
- "winapi",
-]
-
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if 1.0.0",
- "hashbrown 0.14.3",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
-[[package]]
-name = "data-url"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f"
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "deno_ast"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa239d4d69bb6c61bd73e0fc23e3688c7e87e1f47f2f37f4cff7a0080017299"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "deno_media_type",
- "dprint-swc-ext",
- "serde",
- "swc_atoms",
- "swc_bundler",
- "swc_common",
- "swc_config",
- "swc_config_macro",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_codegen_macros",
- "swc_ecma_dep_graph",
- "swc_ecma_loader",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_transforms_optimization",
- "swc_ecma_transforms_proposal",
- "swc_ecma_transforms_react",
- "swc_ecma_transforms_typescript",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_eq_ignore_macros",
- "swc_graph_analyzer",
- "swc_macros_common",
- "swc_visit",
- "swc_visit_macros",
- "text_lines",
- "url",
-]
-
-[[package]]
-name = "deno_broadcast_channel"
-version = "0.130.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d0a2bcd833ba9aa02337c79108124a53e40b6491d78bb0588772fd62059c02"
-dependencies = [
- "async-trait",
- "deno_core",
- "tokio",
- "uuid",
-]
-
-[[package]]
-name = "deno_cache_dir"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbb245d9a3719b5eb2b5195aaaa25108c3c93d1762b181a20fb1af1c7703eaf"
-dependencies = [
- "anyhow",
- "deno_media_type",
- "indexmap 2.2.3",
- "log",
- "once_cell",
- "parking_lot",
- "ring",
- "serde",
- "serde_json",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "deno_canvas"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cefb86183b4156b4222f128be746c5c96e3528e95eedc6f819f3cd57ecf7b3e"
-dependencies = [
- "deno_core",
- "deno_webgpu",
- "image",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "deno_config"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aca0a5b9d2693efb14c8c80d66a052464f24cbf6b3473648037e282c0c616917"
-dependencies = [
- "anyhow",
- "glob",
- "indexmap 2.2.3",
- "jsonc-parser",
- "log",
- "percent-encoding",
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
-name = "deno_console"
-version = "0.136.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598ab6c4aeb4bd4e3e31d90b8f6dd772f25ed92fc979ff12c641074ef4553030"
-dependencies = [
- "deno_core",
-]
-
-[[package]]
-name = "deno_core"
-version = "0.256.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd5997286bcc46199bbae727f43ee65cf4bd073ac2d240a36a6ceae3bfab14ac"
-dependencies = [
- "anyhow",
- "bit-set",
- "bit-vec",
- "bytes",
- "cooked-waker",
- "deno_core_icudata",
- "deno_ops",
- "deno_unsync",
- "futures",
- "libc",
- "log",
- "memoffset 0.9.0",
- "parking_lot",
- "pin-project",
- "serde",
- "serde_json",
- "serde_v8",
- "smallvec",
- "sourcemap 7.0.1",
- "static_assertions",
- "tokio",
- "url",
- "v8",
-]
-
-[[package]]
-name = "deno_core_icudata"
-version = "0.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1"
-
-[[package]]
-name = "deno_crypto"
-version = "0.150.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe3cc83b7fe945183ef27be203c54276abef9fbda4844722f10e0af341a316fd"
-dependencies = [
- "aes",
- "aes-gcm",
- "aes-kw",
- "base64 0.21.7",
- "cbc",
- "const-oid",
- "ctr",
- "curve25519-dalek",
- "deno_core",
- "deno_web",
- "elliptic-curve",
- "num-traits",
- "once_cell",
- "p256",
- "p384",
- "p521",
- "rand",
- "ring",
- "rsa",
- "serde",
- "serde_bytes",
- "sha1",
- "sha2",
- "signature",
- "spki",
- "tokio",
- "uuid",
- "x25519-dalek",
-]
-
-[[package]]
-name = "deno_fetch"
-version = "0.160.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5860515fb73057028018761e937edc4c910207d40d9d9721bb0bb1dfc355fb54"
-dependencies = [
- "bytes",
- "data-url",
- "deno_core",
- "deno_tls",
- "dyn-clone",
- "http 0.2.11",
- "pin-project",
- "reqwest",
- "serde",
- "serde_json",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "deno_fs"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3eae95f88e4c5a348586b0f9d0d6f3e94aa89c6457f299d9cefed7f1ad4a30"
-dependencies = [
- "async-trait",
- "deno_core",
- "deno_io",
- "filetime",
- "fs3",
- "libc",
- "log",
- "nix",
- "rand",
- "rayon",
- "serde",
- "tokio",
- "winapi",
-]
-
-[[package]]
-name = "deno_graph"
-version = "0.64.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0eb6ad784fa5885867ba00e0db8ddcb2d98a4a0234fe336d50a13092e268c44"
-dependencies = [
- "anyhow",
- "async-trait",
- "data-url",
- "deno_ast",
- "deno_semver",
- "encoding_rs",
- "futures",
- "import_map",
- "indexmap 2.2.3",
- "log",
- "monch",
- "once_cell",
- "parking_lot",
- "regex",
- "serde",
- "serde_json",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "deno_http"
-version = "0.133.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94007415787d966f964fb2c46ce81721a9de3a23943f22935dae9c56dfad77ec"
-dependencies = [
- "async-compression",
- "async-trait",
- "base64 0.21.7",
- "brotli",
- "bytes",
- "cache_control",
- "deno_core",
- "deno_net",
- "deno_websocket",
- "flate2",
- "http 0.2.11",
- "http 1.0.0",
- "httparse",
- "hyper 0.14.28",
- "hyper 1.1.0",
- "hyper-util",
- "itertools 0.10.5",
- "memmem",
- "mime",
- "once_cell",
- "percent-encoding",
- "phf",
- "pin-project",
- "ring",
- "scopeguard",
- "serde",
- "smallvec",
- "thiserror",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "deno_io"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "484a121382c19f70413bb43c4a1d79a8feab6f84edd0efaaee28ef4ea3a70926"
-dependencies = [
- "async-trait",
- "deno_core",
- "filetime",
- "fs3",
- "once_cell",
- "tokio",
- "winapi",
-]
-
-[[package]]
-name = "deno_lockfile"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f348633cc4425b2a9011436e256b1ae8f6c8026ec2705d852baee8643dc5562"
-dependencies = [
- "ring",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "deno_media_type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0"
-dependencies = [
- "data-url",
- "serde",
- "url",
-]
-
-[[package]]
-name = "deno_native_certs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4785d0bdc13819b665b71e4fb7e119d859568471e4c245ec5610857e70c9345"
-dependencies = [
- "dlopen2",
- "dlopen2_derive",
- "once_cell",
- "rustls-native-certs",
- "rustls-pemfile 1.0.4",
-]
-
-[[package]]
-name = "deno_net"
-version = "0.128.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342543e781289ca794756301f4ea9e08185ecc63843c135c719b5a29f51857"
-dependencies = [
- "deno_core",
- "deno_tls",
- "enum-as-inner 0.5.1",
- "log",
- "pin-project",
- "rustls-tokio-stream",
- "serde",
- "socket2",
- "tokio",
- "trust-dns-proto",
- "trust-dns-resolver",
-]
-
-[[package]]
-name = "deno_npm"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "376262760b173ff01f8f5d05d58a64f6d863472396afb5582590fa0949342854"
-dependencies = [
- "anyhow",
- "async-trait",
- "deno_lockfile",
- "deno_semver",
- "futures",
- "log",
- "monch",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "deno_ops"
-version = "0.132.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02163d08afdd6fcf21e37c399c7425987c7170203a853052a800e80c91c2e87b"
-dependencies = [
- "proc-macro-rules",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "strum",
- "strum_macros",
- "syn 2.0.48",
- "thiserror",
-]
-
-[[package]]
-name = "deno_semver"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49e14effd9df8ed261f7a1a34ac19bbaf0fa940c59bd19a6d8313cf41525e1c"
-dependencies = [
- "monch",
- "once_cell",
- "serde",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "deno_tls"
-version = "0.123.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "334380ef454db2148df9aba7541bc8250bb4e6fb183ece9fdb293be0462eb7ad"
-dependencies = [
- "deno_core",
- "deno_native_certs",
- "once_cell",
- "rustls 0.21.11",
- "rustls-pemfile 1.0.4",
- "rustls-webpki 0.101.7",
- "serde",
- "webpki-roots",
-]
-
-[[package]]
-name = "deno_unsync"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30dff7e03584dbae188dae96a0f1876740054809b2ad0cf7c9fc5d361f20e739"
-dependencies = [
- "tokio",
-]
-
-[[package]]
-name = "deno_url"
-version = "0.136.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7978221ce33221ac7a18b649a5a18fe7983fbe2fddf5a6959fc672089c10f9a9"
-dependencies = [
- "deno_core",
- "serde",
- "urlpattern",
-]
-
-[[package]]
-name = "deno_web"
-version = "0.167.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d78f50e55155b77abbf8fa6bdc24f68442c91742e03b67b66cc258f4b31cd1"
-dependencies = [
- "async-trait",
- "base64-simd",
- "bytes",
- "deno_core",
- "encoding_rs",
- "flate2",
- "futures",
- "serde",
- "tokio",
- "uuid",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "deno_webgpu"
-version = "0.103.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef171e8bc24e2c3e6934543784832fb5c3b29f0385f23ff604fc84c103d1283"
-dependencies = [
- "deno_core",
- "raw-window-handle",
- "serde",
- "tokio",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "deno_webidl"
-version = "0.136.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41eff4e69896e0f7fc432271c369052efd1d0b57a3d352688e2df800d1aa8dd9"
-dependencies = [
- "deno_core",
-]
-
-[[package]]
-name = "deno_websocket"
-version = "0.141.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "370c0f3137a37362a4737b92a4838ce2e848ee1a99ca7a4fc840293d15d841c4"
-dependencies = [
- "bytes",
- "deno_core",
- "deno_net",
- "deno_tls",
- "fastwebsockets 0.6.0",
- "h2 0.4.4",
- "http 1.0.0",
- "http-body-util",
- "hyper 1.1.0",
- "hyper-util",
- "once_cell",
- "rustls-tokio-stream",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "deno_webstorage"
-version = "0.131.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec9b81da6c28b78b801f995b167e021c9a0f8364080cabbd5eead7112be0032"
-dependencies = [
- "deno_core",
- "deno_web",
- "rusqlite",
- "serde",
-]
-
-[[package]]
-name = "deno_whoami"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75e4caa92b98a27f09c671d1399aee0f5970aa491b9a598523aac000a2192e3"
-dependencies = [
- "libc",
- "whoami",
-]
-
-[[package]]
-name = "der"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "der-parser"
-version = "8.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
-dependencies = [
- "asn1-rs",
- "displaydoc",
- "nom 7.1.3",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
-dependencies = [
- "darling",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
-dependencies = [
- "derive_builder_core",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "rustc_version 0.4.0",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "const-oid",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "dlopen2"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03"
-dependencies = [
- "dlopen2_derive",
- "libc",
- "once_cell",
- "winapi",
-]
-
-[[package]]
-name = "dlopen2_derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "dotenv-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4547f16c17f6051a12cdb8c62b803f94bee6807c74aa7c530b30b737df981fc"
-
-[[package]]
-name = "dprint-swc-ext"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2f24ce6b89a06ae3eb08d5d4f88c05d0aef1fa58e2eba8dd92c97b84210c25"
-dependencies = [
- "bumpalo",
- "num-bigint",
- "rustc-hash",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "text_lines",
-]
-
-[[package]]
-name = "dsa"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689"
-dependencies = [
- "digest",
- "num-bigint-dig",
- "num-traits",
- "pkcs8",
- "rfc6979",
- "sha2",
- "signature",
- "zeroize",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
-
-[[package]]
-name = "ecb"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "ecdsa"
-version = "0.16.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
-dependencies = [
- "der",
- "digest",
- "elliptic-curve",
- "rfc6979",
- "signature",
- "spki",
-]
-
-[[package]]
-name = "either"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.13.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "digest",
- "ff",
- "generic-array",
- "group",
- "hkdf",
- "pem-rfc7468",
- "pkcs8",
- "rand_core",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "enum-as-inner"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
-dependencies = [
- "heck",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[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 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime 2.1.0",
- "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.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "esaxx-rs"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6"
-
-[[package]]
-name = "eszip"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a060f8bb81229bd98c26e1c0efc066be2460558ee9187e73e40a89bd2c949f06"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "deno_ast",
- "deno_graph",
- "deno_npm",
- "deno_semver",
- "futures",
- "hashlink",
- "serde",
- "serde_json",
- "sha2",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "event_worker"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "deno_core",
- "log",
- "serde",
- "strum",
- "tokio",
- "uuid",
-]
-
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
-[[package]]
-name = "faster-hex"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "fastwebsockets"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6185b6dc9dddc4db0dedd2e213047e93bcbf7a0fb092abc4c4e4f3195efdb4"
-dependencies = [
- "base64 0.21.7",
- "hyper 0.14.28",
- "pin-project",
- "rand",
- "sha1",
- "simdutf8",
- "thiserror",
- "tokio",
- "utf-8",
-]
-
-[[package]]
-name = "fastwebsockets"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1"
-dependencies = [
- "base64 0.21.7",
- "http-body-util",
- "hyper 1.1.0",
- "hyper-util",
- "pin-project",
- "rand",
- "sha1",
- "simdutf8",
- "thiserror",
- "tokio",
- "utf-8",
-]
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "ff"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
-dependencies = [
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "fiat-crypto"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
-
-[[package]]
-name = "filetime"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
-dependencies = [
- "crc32fast",
- "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 = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "spin 0.9.8",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[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 = "from_variant"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b"
-dependencies = [
- "proc-macro2 1.0.78",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "fs3"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90"
-dependencies = [
- "libc",
- "rustc_version 0.2.3",
- "winapi",
-]
-
-[[package]]
-name = "fslock"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check 0.9.4",
- "zeroize",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "libc",
- "wasi",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "ghash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "gl_generator"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-dependencies = [
- "khronos_api",
- "log",
- "xml-rs",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "glow"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "glutin_wgl_sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
-dependencies = [
- "gl_generator",
-]
-
-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.4.2",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.4.2",
-]
-
-[[package]]
-name = "gpu-allocator"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad"
-dependencies = [
- "backtrace",
- "log",
- "presser",
- "thiserror",
- "winapi",
- "windows",
-]
-
-[[package]]
-name = "gpu-descriptor"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
-dependencies = [
- "bitflags 2.4.2",
- "gpu-descriptor-types",
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "gpu-descriptor-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
-dependencies = [
- "bitflags 2.4.2",
-]
-
-[[package]]
-name = "group"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
-dependencies = [
- "ff",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.11",
- "indexmap 2.2.3",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 1.0.0",
- "indexmap 2.2.3",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
-dependencies = [
- "cfg-if 1.0.0",
- "crunchy",
-]
-
-[[package]]
-name = "halfbrown"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec"
-dependencies = [
- "hashbrown 0.13.2",
- "serde",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
-dependencies = [
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hexf-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-
-[[package]]
-name = "hkdf"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-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 = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
-]
-
-[[package]]
-name = "hstr"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "phf",
- "rustc-hash",
- "smallvec",
-]
-
-[[package]]
-name = "http"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.11",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
-dependencies = [
- "bytes",
- "http 1.0.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.0.0",
- "http-body 1.0.0",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http_utils"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "futures-util",
- "http 0.2.11",
- "hyper 0.14.28",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.11",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2 0.4.4",
- "http 1.0.0",
- "http-body 1.0.0",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.11",
- "hyper 0.14.28",
- "rustls 0.21.11",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.0.0",
- "http-body 1.0.0",
- "hyper 1.1.0",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core 0.52.0",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "if_chain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
-
-[[package]]
-name = "image"
-version = "0.24.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-traits",
- "png",
-]
-
-[[package]]
-name = "import_map"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ecd467768fe83c2860e70e5de5297a7366a230ff53e1da2158bdac2384cd39d"
-dependencies = [
- "indexmap 1.9.3",
- "log",
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.3",
- "serde",
-]
-
-[[package]]
-name = "inotify"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "block-padding",
- "generic-array",
-]
-
-[[package]]
-name = "ipconfig"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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-macro"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f"
-dependencies = [
- "Inflector",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[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.6",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-
-[[package]]
-name = "js-sys"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jsonc-parser"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7725c320caac8c21d8228c1d055af27a995d371f78cc763073d3e068323641b5"
-dependencies = [
- "serde_json",
-]
-
-[[package]]
-name = "k256"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
-dependencies = [
- "cfg-if 1.0.0",
- "ecdsa",
- "elliptic-curve",
- "once_cell",
- "sha2",
- "signature",
-]
-
-[[package]]
-name = "khronos-egl"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
-dependencies = [
- "libc",
- "libloading 0.8.1",
- "pkg-config",
-]
-
-[[package]]
-name = "khronos_api"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-
-[[package]]
-name = "kqueue"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
-[[package]]
-name = "lapack"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a7f0050af10913bc5e4f6091df38870cb5d4e45094d3dd551c1aff9d1d59b26"
-dependencies = [
- "lapack-sys",
- "libc",
- "num-complex",
-]
-
-[[package]]
-name = "lapack-sys"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d3a8a9f07310243de6c6226f039f14bce8d2f4c96b5d30ddbcfa31eb4e94ad"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "lax"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd3ec1cacffe7a44aee66f9e85d87e3ac69b472b546449884bd1fc1ca8ab359"
-dependencies = [
- "cauchy",
- "lapack",
- "num-traits",
- "thiserror",
-]
-
-[[package]]
-name = "lazy-regex"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c"
-dependencies = [
- "lazy-regex-proc_macros",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "lazy-regex-proc_macros"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "regex",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-dependencies = [
- "spin 0.5.2",
-]
-
-[[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.153"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-
-[[package]]
-name = "libloading"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-dependencies = [
- "cc",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[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.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-
-[[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 = "macro_rules_attribute"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13"
-dependencies = [
- "macro_rules_attribute-proc_macro",
- "paste",
-]
-
-[[package]]
-name = "macro_rules_attribute-proc_macro"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
-[[package]]
-name = "matrixmultiply"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if 1.0.0",
- "digest",
-]
-
-[[package]]
-name = "md4"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-
-[[package]]
-name = "memmem"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15"
-
-[[package]]
-name = "memoffset"
-version = "0.7.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"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "metal"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
-dependencies = [
- "bitflags 2.4.2",
- "block",
- "core-graphics-types",
- "foreign-types",
- "log",
- "objc",
- "paste",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "monch"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea"
-
-[[package]]
-name = "monostate"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878c2a1f1c70e5724fa28f101ca787b6a7e8ad5c5e4ae4ca3b0fa4a419fa9075"
-dependencies = [
- "monostate-impl",
- "serde",
-]
-
-[[package]]
-name = "monostate-impl"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f686d68a09079e63b1d2c64aa305095887ce50565f00a922ebfaeeee0d9ba6ce"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "naga"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
-dependencies = [
- "bit-set",
- "bitflags 2.4.2",
- "codespan-reporting",
- "hexf-parse",
- "indexmap 2.2.3",
- "log",
- "num-traits",
- "rustc-hash",
- "serde",
- "spirv",
- "termcolor",
- "thiserror",
- "unicode-xid 0.2.4",
-]
-
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "ndarray"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
-dependencies = [
- "approx",
- "cblas-sys",
- "libc",
- "matrixmultiply",
- "num-complex",
- "num-integer",
- "num-traits",
- "rawpointer",
-]
-
-[[package]]
-name = "ndarray-linalg"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f87ff36428f228c6056204d0f5cb8c5165f0db0a065429faace3edbc2718f1f"
-dependencies = [
- "cauchy",
- "lax",
- "ndarray",
- "num-complex",
- "num-traits",
- "rand",
- "thiserror",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "nix"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.7.1",
- "pin-utils",
- "static_assertions",
-]
-
-[[package]]
-name = "nom"
-version = "4.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
-dependencies = [
- "memchr",
- "version_check 0.1.5",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "notify"
-version = "6.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
-dependencies = [
- "bitflags 2.4.2",
- "filetime",
- "inotify",
- "kqueue",
- "libc",
- "log",
- "mio",
- "walkdir",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
- "rand",
- "serde",
-]
-
-[[package]]
-name = "num-bigint-dig"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
-dependencies = [
- "byteorder",
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand",
- "serde",
- "smallvec",
- "zeroize",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
-dependencies = [
- "num-traits",
- "rand",
- "serde",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.6",
- "libc",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "oid-registry"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
-dependencies = [
- "asn1-rs",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "onig"
-version = "6.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "once_cell",
- "onig_sys",
-]
-
-[[package]]
-name = "onig_sys"
-version = "69.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "ort"
-version = "2.0.0-rc.0"
-source = "git+https://github.com/pykeio/ort#2abc210f3958c5b94528cc71c6c8781813a2cc2f"
-dependencies = [
- "half",
- "libloading 0.8.1",
- "ndarray",
- "ort-sys",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "ort-sys"
-version = "2.0.0-rc.0"
-source = "git+https://github.com/pykeio/ort#2abc210f3958c5b94528cc71c6c8781813a2cc2f"
-
-[[package]]
-name = "outref"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "p224"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p256"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p384"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p521"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
-dependencies = [
- "base16ct",
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "rand_core",
- "sha2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "password-hash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
-[[package]]
-name = "path-clean"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-
-[[package]]
-name = "petgraph"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-dependencies = [
- "fixedbitset",
- "indexmap 2.2.3",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs1"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-dependencies = [
- "der",
- "pkcs8",
- "spki",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "platforms"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
-
-[[package]]
-name = "pmutil"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "png"
-version = "0.17.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "polyval"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "presser"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
-
-[[package]]
-name = "primeorder"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-dependencies = [
- "elliptic-curve",
-]
-
-[[package]]
-name = "proc-macro-rules"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
-dependencies = [
- "proc-macro-rules-macros",
- "proc-macro2 1.0.78",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "proc-macro-rules-macros"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7"
-dependencies = [
- "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "profiling"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42"
-
-[[package]]
-name = "psm"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-dependencies = [
- "proc-macro2 1.0.78",
-]
-
-[[package]]
-name = "radix_fmt"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "range-alloc"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
-name = "rayon"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-cond"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9"
-dependencies = [
- "either",
- "itertools 0.11.0",
- "rayon",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "ref-cast"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.5",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "relative-path"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
-
-[[package]]
-name = "reqwest"
-version = "0.11.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
-dependencies = [
- "async-compression",
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.11",
- "http-body 0.4.6",
- "hyper 0.14.28",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "mime_guess",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.11",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-rustls 0.24.1",
- "tokio-socks",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[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 = "rfc6979"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
-dependencies = [
- "hmac",
- "subtle",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
-dependencies = [
- "cc",
- "getrandom",
- "libc",
- "spin 0.9.8",
- "untrusted",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "ripemd"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "ron"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
-dependencies = [
- "base64 0.21.7",
- "bitflags 2.4.2",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "rsa"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
-dependencies = [
- "const-oid",
- "digest",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "pkcs1",
- "pkcs8",
- "rand_core",
- "signature",
- "spki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rusqlite"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
-dependencies = [
- "bitflags 2.4.2",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "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_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.21",
-]
-
-[[package]]
-name = "rusticata-macros"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
-dependencies = [
- "nom 7.1.3",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
-dependencies = [
- "bitflags 2.4.2",
- "errno 0.3.8",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.102.2",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.4",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b"
-dependencies = [
- "base64 0.21.7",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8"
-
-[[package]]
-name = "rustls-tokio-stream"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded7a36e8ac05b8ada77a84c5ceec95361942ee9dedb60a82f93f788a791aae8"
-dependencies = [
- "futures",
- "rustls 0.21.11",
- "socket2",
- "tokio",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "ryu"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
-
-[[package]]
-name = "ryu-js"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b"
-
-[[package]]
-name = "salsa20"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "sb_ai"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "deno_core",
- "log",
- "ndarray",
- "ndarray-linalg",
- "once_cell",
- "ort",
- "rand",
- "serde",
- "tokenizers",
- "tokio",
-]
-
-[[package]]
-name = "sb_core"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "bytes",
- "cache_control",
- "chrono",
- "data-url",
- "deno_ast",
- "deno_cache_dir",
- "deno_core",
- "deno_crypto",
- "deno_fetch",
- "deno_fs",
- "deno_graph",
- "deno_http",
- "deno_net",
- "deno_tls",
- "deno_web",
- "deno_websocket",
- "deno_webstorage",
- "encoding_rs",
- "enum-as-inner 0.6.0",
- "faster-hex",
- "fs3",
- "futures",
- "http 0.2.11",
- "httparse",
- "hyper 0.14.28",
- "import_map",
- "indexmap 2.2.3",
- "libc",
- "log",
- "memmem",
- "once_cell",
- "percent-encoding",
- "ring",
- "sb_node",
- "scopeguard",
- "serde",
- "thiserror",
- "tokio",
- "tokio-util",
- "twox-hash",
-]
-
-[[package]]
-name = "sb_env"
-version = "0.1.0"
-dependencies = [
- "deno_core",
- "sb_core",
- "sb_node",
-]
-
-[[package]]
-name = "sb_fs"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "deno_ast",
- "deno_core",
- "deno_fs",
- "deno_io",
- "deno_npm",
- "deno_semver",
- "eszip",
- "import_map",
- "log",
- "once_cell",
- "sb_core",
- "sb_node",
- "sb_npm",
- "serde",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "sb_graph"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "deno_ast",
- "deno_config",
- "deno_core",
- "deno_fs",
- "deno_lockfile",
- "deno_npm",
- "deno_semver",
- "deno_web",
- "eszip",
- "glob",
- "import_map",
- "log",
- "once_cell",
- "sb_core",
- "sb_fs",
- "sb_node",
- "sb_npm",
- "serde",
- "tokio",
- "urlencoding",
-]
-
-[[package]]
-name = "sb_module_loader"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "deno_ast",
- "deno_core",
- "deno_fs",
- "deno_npm",
- "deno_semver",
- "deno_tls",
- "eszip",
- "import_map",
- "log",
- "monch",
- "once_cell",
- "sb_core",
- "sb_fs",
- "sb_graph",
- "sb_node",
- "sb_npm",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "sb_node"
-version = "0.1.0"
-dependencies = [
- "aead-gcm-stream",
- "aes",
- "brotli",
- "bytes",
- "cbc",
- "const-oid",
- "data-encoding",
- "deno_core",
- "deno_fetch",
- "deno_fs",
- "deno_media_type",
- "deno_net",
- "deno_whoami",
- "digest",
- "dsa",
- "ecb",
- "elliptic-curve",
- "errno 0.2.8",
- "h2 0.3.26",
- "hex",
- "hkdf",
- "http 0.2.11",
- "idna 0.3.0",
- "indexmap 2.2.3",
- "k256",
- "lazy-regex",
- "libc",
- "libz-sys",
- "md-5",
- "md4",
- "nix",
- "num-bigint",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "once_cell",
- "p224",
- "p256",
- "p384",
- "path-clean",
- "pbkdf2",
- "pin-project-lite",
- "rand",
- "regex",
- "reqwest",
- "ring",
- "ripemd",
- "rsa",
- "scrypt",
- "serde",
- "sha-1",
- "sha2",
- "signature",
- "simd-json",
- "tokio",
- "typenum",
- "url",
- "winapi",
- "windows-sys 0.48.0",
- "x25519-dalek",
- "x509-parser",
-]
-
-[[package]]
-name = "sb_npm"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "base32",
- "base64 0.21.7",
- "bincode",
- "deno_ast",
- "deno_core",
- "deno_fs",
- "deno_graph",
- "deno_lockfile",
- "deno_npm",
- "deno_semver",
- "flate2",
- "hex",
- "indexmap 2.2.3",
- "log",
- "once_cell",
- "percent-encoding",
- "ring",
- "sb_core",
- "sb_node",
- "serde",
- "tar",
- "thiserror",
-]
-
-[[package]]
-name = "sb_os"
-version = "0.1.0"
-dependencies = [
- "deno_core",
- "libc",
- "sb_core",
- "serde",
-]
-
-[[package]]
-name = "sb_workers"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bytes",
- "deno_config",
- "deno_core",
- "deno_http",
- "enum-as-inner 0.6.0",
- "event_worker",
- "futures-util",
- "http_utils",
- "hyper 0.14.28",
- "log",
- "sb_core",
- "sb_graph",
- "scopeguard",
- "serde",
- "thiserror",
- "tokio",
- "tokio-util",
- "uuid",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "scrypt"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
-dependencies = [
- "password-hash",
- "pbkdf2",
- "salsa20",
- "sha2",
-]
-
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "sec1"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
-dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "serde"
-version = "1.0.196"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.196"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.113"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
-dependencies = [
- "indexmap 2.2.3",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_v8"
-version = "0.165.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88862d513bcbc04a7f93b0f454dffd0b01a5c0d8e1964c7532ec55f52b9a6351"
-dependencies = [
- "bytes",
- "derive_more",
- "num-bigint",
- "serde",
- "smallvec",
- "thiserror",
- "v8",
-]
-
-[[package]]
-name = "serial_test"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d"
-dependencies = [
- "dashmap",
- "futures",
- "lazy_static",
- "log",
- "parking_lot",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signal-hook-tokio"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e"
-dependencies = [
- "futures-core",
- "libc",
- "signal-hook",
- "tokio",
-]
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "digest",
- "rand_core",
-]
-
-[[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.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2faf8f101b9bc484337a6a6b0409cf76c139f2fb70a9e3aee6b6774be7bfbf76"
-dependencies = [
- "getrandom",
- "halfbrown",
- "lexical-core",
- "ref-cast",
- "serde",
- "serde_json",
- "simdutf8",
- "value-trait",
-]
-
-[[package]]
-name = "simdutf8"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "slotmap"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
-dependencies = [
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[package]]
-name = "smartstring"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "static_assertions",
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "sourcemap"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90"
-dependencies = [
- "data-encoding",
- "debugid",
- "if_chain",
- "rustc_version 0.2.3",
- "serde",
- "serde_json",
- "unicode-id",
- "url",
-]
-
-[[package]]
-name = "sourcemap"
-version = "7.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10da010a590ed2fa9ca8467b00ce7e9c5a8017742c0c09c45450efc172208c4b"
-dependencies = [
- "data-encoding",
- "debugid",
- "if_chain",
- "rustc_version 0.2.3",
- "serde",
- "serde_json",
- "unicode-id",
- "url",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spirv"
-version = "0.2.0+1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
-dependencies = [
- "bitflags 1.3.2",
- "num-traits",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "spm_precompiled"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326"
-dependencies = [
- "base64 0.13.1",
- "nom 7.1.3",
- "serde",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "stacker"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
-dependencies = [
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "psm",
- "winapi",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "string_enum"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strsim"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "rustversion",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
-[[package]]
-name = "swc_atoms"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0"
-dependencies = [
- "hstr",
- "once_cell",
- "rustc-hash",
- "serde",
-]
-
-[[package]]
-name = "swc_bundler"
-version = "0.223.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d7530df85b1a56f6a879ca102dc59718db4bcd6bfff55fb8bb379fbeab6c88c"
-dependencies = [
- "anyhow",
- "crc",
- "indexmap 2.2.3",
- "is-macro",
- "once_cell",
- "parking_lot",
- "petgraph",
- "radix_fmt",
- "relative-path",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_loader",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_optimization",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_fast_graph",
- "swc_graph_analyzer",
- "tracing",
-]
-
-[[package]]
-name = "swc_common"
-version = "0.33.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3ae36feceded27f0178dc9dabb49399830847ffb7f866af01798844de8f973"
-dependencies = [
- "ast_node",
- "better_scoped_tls",
- "cfg-if 1.0.0",
- "either",
- "from_variant",
- "new_debug_unreachable",
- "num-bigint",
- "once_cell",
- "rustc-hash",
- "serde",
- "siphasher",
- "sourcemap 6.4.1",
- "swc_atoms",
- "swc_eq_ignore_macros",
- "swc_visit",
- "tracing",
- "unicode-width",
- "url",
-]
-
-[[package]]
-name = "swc_config"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112884e66b60e614c0f416138b91b8b82b7fea6ed0ecc5e26bad4726c57a6c99"
-dependencies = [
- "indexmap 2.2.3",
- "serde",
- "serde_json",
- "swc_config_macro",
-]
-
-[[package]]
-name = "swc_config_macro"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "swc_ecma_ast"
-version = "0.110.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79401a45da704f4fb2552c5bf86ee2198e8636b121cb81f8036848a300edd53b"
-dependencies = [
- "bitflags 2.4.2",
- "is-macro",
- "num-bigint",
- "phf",
- "scoped-tls",
- "serde",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "unicode-id",
-]
-
-[[package]]
-name = "swc_ecma_codegen"
-version = "0.146.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b61ca275e3663238b71c4b5da8e6fb745bde9989ef37d94984dfc81fc6d009"
-dependencies = [
- "memchr",
- "num-bigint",
- "once_cell",
- "rustc-hash",
- "serde",
- "sourcemap 6.4.1",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_codegen_macros",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_codegen_macros"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "swc_ecma_dep_graph"
-version = "0.113.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fc6ac1a84afe910182dcda33d70a16545e6058529d51afb63bd6be8764370f"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_loader"
-version = "0.45.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5713ab3429530c10bdf167170ebbde75b046c8003558459e4de5aaec62ce0f1"
-dependencies = [
- "anyhow",
- "pathdiff",
- "serde",
- "swc_common",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_parser"
-version = "0.141.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d17401dd95048a6a62b777d533c0999dabdd531ef9d667e22f8ae2a2a0d294"
-dependencies = [
- "either",
- "new_debug_unreachable",
- "num-bigint",
- "num-traits",
- "phf",
- "serde",
- "smallvec",
- "smartstring",
- "stacker",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "tracing",
- "typed-arena",
-]
-
-[[package]]
-name = "swc_ecma_transforms_base"
-version = "0.135.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d4ab26ec124b03e47f54d4daade8e9a9dcd66d3a4ca3cd47045f138d267a60e"
-dependencies = [
- "better_scoped_tls",
- "bitflags 2.4.2",
- "indexmap 2.2.3",
- "once_cell",
- "phf",
- "rustc-hash",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_classes"
-version = "0.124.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fe4376c024fa04394cafb8faecafb4623722b92dbbe46532258cc0a6b569d9c"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_macros"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "swc_ecma_transforms_optimization"
-version = "0.196.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec185cf4d18e90b7c8b18b0d1f04a5707e6f4c7b57c1bfd5086392cd07b75a9"
-dependencies = [
- "dashmap",
- "indexmap 2.2.3",
- "once_cell",
- "petgraph",
- "rustc-hash",
- "serde_json",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_fast_graph",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_proposal"
-version = "0.169.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed89d6ff74f60de490fb56e1cc505b057905e36c13d405d7d61dd5c9f6ee8fc9"
-dependencies = [
- "either",
- "rustc-hash",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_react"
-version = "0.181.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31a2f879fd21d18080b6c42e633e0ae8c6f3d54b83c1de876767d82b458c999"
-dependencies = [
- "base64 0.21.7",
- "dashmap",
- "indexmap 2.2.3",
- "once_cell",
- "serde",
- "sha-1",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_typescript"
-version = "0.186.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4263372cc7cd1a3b4570ccf7438f3c1e1575f134fd05cdf074edb322480a5b"
-dependencies = [
- "ryu-js",
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_react",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_utils"
-version = "0.125.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cead1083e46b0f072a82938f16d366014468f7510350957765bb4d013496890"
-dependencies = [
- "indexmap 2.2.3",
- "num_cpus",
- "once_cell",
- "rustc-hash",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_visit",
- "tracing",
- "unicode-id",
-]
-
-[[package]]
-name = "swc_ecma_visit"
-version = "0.96.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d0100c383fb08b6f34911ab6f925950416a5d14404c1cd520d59fb8dfbb3bf"
-dependencies = [
- "num-bigint",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_eq_ignore_macros"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "swc_fast_graph"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acfc056067a0fbfe26a4763c1eb246e813fdbe6b376415d07915e96e15481b6"
-dependencies = [
- "indexmap 2.2.3",
- "petgraph",
- "rustc-hash",
- "swc_common",
-]
-
-[[package]]
-name = "swc_graph_analyzer"
-version = "0.22.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c6e0110c0433c27221f03e45419b7e18d1db4d472db309088caa458ac2f304e"
-dependencies = [
- "auto_impl",
- "petgraph",
- "swc_common",
- "swc_fast_graph",
- "tracing",
-]
-
-[[package]]
-name = "swc_macros_common"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "swc_visit"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9"
-dependencies = [
- "either",
- "swc_visit_macros",
-]
-
-[[package]]
-name = "swc_visit_macros"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d"
-dependencies = [
- "Inflector",
- "pmutil",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "swc_macros_common",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "unicode-ident",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.109",
- "unicode-xid 0.2.4",
-]
-
-[[package]]
-name = "tar"
-version = "0.4.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "term_size"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "text_lines"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "term_size",
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.3.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-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 = "tls-listener"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce110c38c3c9b6e5cc4fe72e60feb5b327750388a10a276e3d5d7d431e3dc76c"
-dependencies = [
- "futures-util",
- "pin-project-lite",
- "thiserror",
- "tokio",
- "tokio-rustls 0.25.0",
-]
-
-[[package]]
-name = "tokenizers"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dd47962b0ba36e7fd33518fbf1754d136fd1474000162bbf2a8b5fcb2d3654d"
-dependencies = [
- "aho-corasick",
- "derive_builder",
- "esaxx-rs",
- "getrandom",
- "itertools 0.12.1",
- "lazy_static",
- "log",
- "macro_rules_attribute",
- "monostate",
- "onig",
- "paste",
- "rand",
- "rayon",
- "rayon-cond",
- "regex",
- "regex-syntax 0.8.2",
- "serde",
- "serde_json",
- "spm_precompiled",
- "thiserror",
- "unicode-normalization-alignments",
- "unicode-segmentation",
- "unicode_categories",
-]
-
-[[package]]
-name = "tokio"
-version = "1.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.11",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.2",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
-dependencies = [
- "either",
- "futures-util",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-util",
- "hashbrown 0.14.3",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "trust-dns-proto"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.0",
- "data-encoding",
- "enum-as-inner 0.5.1",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "rand",
- "serde",
- "smallvec",
- "thiserror",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
-dependencies = [
- "cfg-if 1.0.0",
- "futures-util",
- "ipconfig",
- "lazy_static",
- "lru-cache",
- "parking_lot",
- "resolv-conf",
- "serde",
- "smallvec",
- "thiserror",
- "tokio",
- "tracing",
- "trust-dns-proto",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.0.0",
- "httparse",
- "log",
- "rand",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if 1.0.0",
- "rand",
- "static_assertions",
-]
-
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unic-char-property"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
-dependencies = [
- "unic-char-range",
-]
-
-[[package]]
-name = "unic-char-range"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
-
-[[package]]
-name = "unic-common"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
-
-[[package]]
-name = "unic-ucd-ident"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
-dependencies = [
- "unic-char-property",
- "unic-char-range",
- "unic-ucd-version",
-]
-
-[[package]]
-name = "unic-ucd-version"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
-dependencies = [
- "unic-common",
-]
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-id"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-normalization-alignments"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "universal-hash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
-dependencies = [
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
-dependencies = [
- "form_urlencoded",
- "idna 0.4.0",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "urlpattern"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609"
-dependencies = [
- "derive_more",
- "regex",
- "serde",
- "unic-ucd-ident",
- "url",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "uuid"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "v8"
-version = "0.83.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f6c8a960dd2eb74b22eda64f7e9f3d1688f82b80202828dc0425ebdeda826ef"
-dependencies = [
- "bitflags 2.4.2",
- "fslock",
- "once_cell",
- "which 5.0.0",
-]
-
-[[package]]
-name = "valuable"
-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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vsimd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
-
-[[package]]
-name = "walkdir"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
-dependencies = [
- "quote 1.0.35",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
-
-[[package]]
-name = "wasm-streams"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
-[[package]]
-name = "wgpu-core"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726"
-dependencies = [
- "arrayvec",
- "bit-vec",
- "bitflags 2.4.2",
- "codespan-reporting",
- "log",
- "naga",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "ron",
- "rustc-hash",
- "serde",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags 2.4.2",
- "block",
- "core-graphics-types",
- "d3d12",
- "glow",
- "glutin_wgl_sys",
- "gpu-alloc",
- "gpu-allocator",
- "gpu-descriptor",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading 0.8.1",
- "log",
- "metal",
- "naga",
- "objc",
- "once_cell",
- "parking_lot",
- "profiling",
- "range-alloc",
- "raw-window-handle",
- "rustc-hash",
- "smallvec",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types",
- "winapi",
-]
-
-[[package]]
-name = "wgpu-types"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd"
-dependencies = [
- "bitflags 2.4.2",
- "js-sys",
- "serde",
- "web-sys",
-]
-
-[[package]]
-name = "which"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
-dependencies = [
- "failure",
- "libc",
-]
-
-[[package]]
-name = "which"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "whoami"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
-dependencies = [
- "redox_syscall",
- "wasite",
- "web-sys",
-]
-
-[[package]]
-name = "widestring"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-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.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-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",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "x25519-dalek"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
-dependencies = [
- "curve25519-dalek",
- "rand_core",
- "serde",
- "zeroize",
-]
-
-[[package]]
-name = "x509-parser"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
-dependencies = [
- "asn1-rs",
- "data-encoding",
- "der-parser",
- "lazy_static",
- "nom 7.1.3",
- "oid-registry",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "xattr"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-dependencies = [
- "libc",
- "linux-raw-sys",
- "rustix",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
-
-[[package]]
-name = "yaml-rust"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix
deleted file mode 100644
index 891c4ca303ca..000000000000
--- a/pkgs/development/web/edge-runtime/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv
-, lib
-, callPackage
-, fetchFromGitHub
-, rustPlatform
-, nix-update-script
-, darwin
-, openssl
-, pkg-config
-}:
-
-let
-  pname = "edge-runtime";
-  version = "1.53.4";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
-
-  src = fetchFromGitHub {
-    owner = "supabase";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-sDgGfQiAUuI+JaF0BRB5lwvjbWWIoTV/k/tbQsBBc4E=";
-    fetchSubmodules = true;
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ort-2.0.0-rc.0" = "sha256-j3g9ES2ZLmAAcPYgszBGDG16HiFJTnohwxSvXypFGTw=";
-    };
-  };
-
-  nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]);
-
-  # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
-  # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
-  RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { };
-
-  # For version tag
-  GIT_V_TAG = version;
-
-  passthru.updateScript = nix-update-script { };
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-    $out/bin/edge-runtime --help
-    runHook postInstallCheck
-  '';
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services";
-    mainProgram = "edge-runtime";
-    homepage = "https://github.com/supabase/edge-runtime";
-    license = licenses.mit;
-    maintainers = with maintainers; [ happysalada ];
-  };
-}
diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix
deleted file mode 100644
index c08c50eea4cd..000000000000
--- a/pkgs/development/web/edge-runtime/librusty_v8.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-let
-  fetch_librusty_v8 = args: fetchurl {
-    name = "librusty_v8-${args.version}";
-    url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a";
-    sha256 = args.shas.${stdenv.hostPlatform.system};
-    meta = {
-      inherit (args) version;
-      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    };
-  };
-in
-fetch_librusty_v8 {
-  version = "0.83.2";
-  shas = {
-    x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk=";
-    aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI=";
-    x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU=";
-    aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o=";
-  };
-}
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 9e3c3a3577a1..4b0be19dad77 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -12,8 +12,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.17.0";
-  sha256 = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c";
+  version = "20.18.0";
+  sha256 = "7d9433e91fd88d82ba8de86e711ec41907638e227993d22e95126b02f6cd714a";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
@@ -23,50 +23,6 @@ buildNodejs {
     ./use-correct-env-in-tests.patch
 
     # Patches for OpenSSL 3.2
-    # Patches already in 22.7.0
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/bd42e4c6a73f61f7ee47e4426d86708fd80c6c4f.patch?full_index=1";
-      hash = "sha256-bsCLVwK5t8dD+wHd1FlFJ1wpCGtNGcwoOfq4fG5MHfo=";
-      includes = ["test/parallel/test-tls-set-sigalgs.js"];
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/e0634f58aba6a1634fe03107d5be849fd008cc02.patch?full_index=1";
-      hash = "sha256-Jh7f4JPS1H2Rpj1nEOW53E66Z+GDNEFXl0jALrvyYXQ=";
-    })
-    # Patches already in 22.8.0
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/e9cd4766e39d96693320be9ce0a1044c450e8675.patch?full_index=1";
-      hash = "sha256-RXRLRznz16B8MrfVrpIHgyqLV2edpJk2p717QBttyK4=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/2bfc9e467cb05578efa4d3db497f368fb144e5fc.patch?full_index=1";
-      hash = "sha256-TyHSd+O0T/bFR7YZuxm4HumrMljnJu2a8RRLRvz6KNM=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/01f751b529d126529f1d2019f0dcb13b8e54b787.patch?full_index=1";
-      hash = "sha256-m3IaWL7U8fQMnmP2Xch4M8Qn1AJU8Ao9GCqMPcDnqCk=";
-    })
-    # Patches already in 22.9.0
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/d9ca8b018efd172a99365ada8f536491b19bd87b.patch?full_index=1";
-      hash = "sha256-KzoWVXcgjJaMUOXDyLlkwRcN6z3SdFhTJd0KYBYfElE=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/c4f295470392db237c0adfc9832214538a99a034.patch?full_index=1";
-      hash = "sha256-sYTY+oiQ5K7bYLcI1+jSTlLFdwpteKGSu7S/bbaslLE=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/a65105ec284023960e93b3a66f6661ddd2f4121f.patch?full_index=1";
-      hash = "sha256-ZNkiHlp+UlbnonPBhMUw6rqtjWrC1b9SgI9EcGhDlwY=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/c77bcf018716e97ae35203990bcd51c143840348.patch?full_index=1";
-      hash = "sha256-EwrZKpLRzk3Yjen1WVQqKTiHKE2uLTpaPsE13czH2rY=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/18101d83a158b877ac765936aba973c664130ea2.patch?full_index=1";
-      hash = "sha256-vpHDj5+340bjYLo7gTWFu7iS4vVveBZAMypQ2eLoQzM=";
-    })
     # Patches not yet released
     (fetchpatch2 {
       url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1";
diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix
new file mode 100644
index 000000000000..2039e9385c4f
--- /dev/null
+++ b/pkgs/development/web/nodejs/v23.nix
@@ -0,0 +1,52 @@
+{
+  callPackage,
+  fetchpatch2,
+  openssl,
+  python3,
+  enableNpm ? true,
+}:
+
+let
+  buildNodejs = callPackage ./nodejs.nix {
+    inherit openssl;
+    python = python3;
+  };
+in
+buildNodejs {
+  inherit enableNpm;
+  version = "23.1.0";
+  sha256 = "57cbfd3dd51f9300ea2b8e60a8ed215b1eaa71fbde4c3903a7d31a443a4a4423";
+  patches = [
+    ./configure-emulator.patch
+    ./configure-armv6-vfpv2.patch
+    ./disable-darwin-v8-system-instrumentation-node19.patch
+    ./bypass-darwin-xcrun-node16.patch
+    ./node-npm-build-npm-package-logic.patch
+    ./use-correct-env-in-tests.patch
+    ./bin-sh-node-run-v22.patch
+
+    # Those reverts are due to a mismatch with the libuv version used upstream
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1";
+      hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q=";
+      revert = true;
+      excludes = [ "doc/*" ];
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1";
+      hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64=";
+      revert = true;
+      excludes = [ "doc/*" ];
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1";
+      hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY=";
+      revert = true;
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1";
+      hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0=";
+      revert = true;
+    })
+  ];
+}
diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix
deleted file mode 100644
index bc1119103c44..000000000000
--- a/pkgs/development/web/postman/linux.nix
+++ /dev/null
@@ -1,161 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, makeDesktopItem
-, wrapGAppsHook3
-, atk
-, at-spi2-atk
-, at-spi2-core
-, alsa-lib
-, cairo
-, cups
-, dbus
-, expat
-, gdk-pixbuf
-, glib
-, gtk3
-, freetype
-, fontconfig
-, nss
-, nspr
-, pango
-, udev
-, libsecret
-, libuuid
-, libX11
-, libxcb
-, libXi
-, libXcursor
-, libXdamage
-, libXrandr
-, libXcomposite
-, libXext
-, libXfixes
-, libXrender
-, libXtst
-, libXScrnSaver
-, libxkbcommon
-, libdrm
-, mesa
-# It's unknown which version of openssl that postman expects but it seems that
-# OpenSSL 3+ seems to work fine (cf.
-# https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently
-# around OpenSSL stuff then try changing this dependency version.
-, openssl
-, xorg
-, pname
-, version
-, meta
-, copyDesktopItems
-, makeWrapper
-}:
-
-let
-  dist = {
-    aarch64-linux = {
-      arch = "arm64";
-      sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo=";
-    };
-
-    x86_64-linux = {
-      arch = "64";
-      sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM=";
-    };
-  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-in
-stdenv.mkDerivation rec {
-  inherit pname version meta;
-
-  src = fetchurl {
-    url = "https://dl.pstmn.io/download/version/${version}/linux${dist.arch}";
-    inherit (dist) sha256;
-    name = "${pname}-${version}.tar.gz";
-  };
-
-  dontConfigure = true;
-
-  desktopItems = [
-      (makeDesktopItem {
-      name = "postman";
-      exec = "postman %U";
-      icon = "postman";
-      comment = "API Development Environment";
-      desktopName = "Postman";
-      genericName = "Postman";
-      categories = [ "Development" ];
-    })
-  ];
-
-  buildInputs = [
-    stdenv.cc.cc.lib
-    atk
-    at-spi2-atk
-    at-spi2-core
-    alsa-lib
-    cairo
-    cups
-    dbus
-    expat
-    gdk-pixbuf
-    glib
-    gtk3
-    freetype
-    fontconfig
-    mesa
-    nss
-    nspr
-    pango
-    udev
-    libdrm
-    libsecret
-    libuuid
-    libX11
-    libxcb
-    libXi
-    libXcursor
-    libXdamage
-    libXrandr
-    libXcomposite
-    libXext
-    libXfixes
-    libXrender
-    libXtst
-    libXScrnSaver
-    libxkbcommon
-    xorg.libxshmfence
-  ];
-
-  nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/postman
-    cp -R app/* $out/share/postman
-    rm $out/share/postman/Postman
-
-    mkdir -p $out/bin
-    ln -s $out/share/postman/postman $out/bin/postman
-
-    source "${makeWrapper}/nix-support/setup-hook"
-    wrapProgram $out/bin/${pname} \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
-
-    mkdir -p $out/share/icons/hicolor/128x128/apps
-    ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/postman.png
-    ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/hicolor/128x128/apps/postman.png
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    pushd $out/share/postman
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" chrome_crashpad_handler
-    for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do
-      ORIGIN=$(patchelf --print-rpath $file); \
-      patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
-    done
-    popd
-    wrapProgram $out/bin/postman --set PATH ${lib.makeBinPath [ openssl ]}
-  '';
-}
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix
deleted file mode 100644
index 0d55a703c0d5..000000000000
--- a/pkgs/games/airshipper/default.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitLab
-, openssl
-, libGL
-, vulkan-loader
-, wayland
-, wayland-protocols
-, libxkbcommon
-, libX11
-, libXrandr
-, libXi
-, libXcursor
-, udev
-, alsa-lib
-, stdenv
-, libxcb
-, bzip2
-, cmake
-, fontconfig
-, freetype
-, pkg-config
-, makeWrapper
-, writeShellScript
-, patchelf
-}:
-let
-  version = "0.14.0";
-  # Patch for airshipper to install veloren
-  patch = let
-    runtimeLibs = [
-      udev
-      alsa-lib
-      stdenv.cc.cc.lib
-      libxkbcommon
-      libxcb
-      libX11
-      libXcursor
-      libXrandr
-      libXi
-      vulkan-loader
-      libGL
-    ];
-  in
-    writeShellScript "patch" ''
-      echo "making binaries executable"
-      chmod +x {veloren-voxygen,veloren-server-cli}
-      echo "patching dynamic linkers"
-      ${patchelf}/bin/patchelf \
-        --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
-        veloren-server-cli
-      ${patchelf}/bin/patchelf \
-        --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
-        --set-rpath "${lib.makeLibraryPath runtimeLibs}" \
-        veloren-voxygen
-  '';
-in
-rustPlatform.buildRustPackage {
-  pname = "airshipper";
-  inherit version;
-
-  src = fetchFromGitLab {
-    owner = "Veloren";
-    repo = "airshipper";
-    rev = "v${version}";
-    hash = "sha256-+ZU3WAjmPDAFAevebePcIlYcgSYSJJ3LyvwbTBKGUH4=";
-  };
-
-  cargoHash = "sha256-mwfYCVcOH2zFr76W9ZC4t/LmEwO5P2eGYXRVkwn6Fm4=";
-
-  buildInputs = [
-    fontconfig
-    openssl
-    wayland
-    wayland-protocols
-    libxkbcommon
-    libX11
-    libXrandr
-    libXi
-    libXcursor
-  ];
-  nativeBuildInputs = [ cmake pkg-config makeWrapper ];
-
-  RUSTC_BOOTSTRAP = 1; # We need rust unstable features
-
-  postInstall = ''
-    install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop"
-    install -Dm444    "client/assets/net.veloren.airshipper.png"  "$out/share/icons/net.veloren.airshipper.png"
-  '';
-
-  postFixup =
-    let
-      libPath = lib.makeLibraryPath [
-        libGL
-        vulkan-loader
-        wayland
-        wayland-protocols
-        bzip2
-        fontconfig
-        freetype
-        libxkbcommon
-        libX11
-        libXrandr
-        libXi
-        libXcursor
-      ];
-    in
-    ''
-      patchelf --set-rpath "${libPath}" "$out/bin/airshipper"
-      wrapProgram "$out/bin/airshipper" --set VELOREN_PATCHER "${patch}"
-    '';
-
-  doCheck = false;
-  cargoBuildFlags = [ "--package" "airshipper" ];
-  cargoTestFlags = [ "--package" "airshipper" ];
-
-  meta = with lib; {
-    description = "Provides automatic updates for the voxel RPG Veloren";
-    mainProgram = "airshipper";
-    homepage = "https://www.veloren.net";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ yusdacra ];
-  };
-}
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
deleted file mode 100644
index dbf74aa4f3b0..000000000000
--- a/pkgs/games/alienarena/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ curl
-, fetchFromGitHub
-, freetype
-, lib
-, libGL
-, libjpeg
-, libogg
-, libvorbis
-, libX11
-, libXxf86vm
-, openal
-, pkg-config
-, stdenv
-}:
-
-stdenv.mkDerivation rec {
-  pname = "alienarena";
-  version = "7.71.6";
-
-  src = fetchFromGitHub {
-    owner = "alienarena";
-    repo = "alienarena";
-    rev = version;
-    hash = "sha256-Dml0VY5VQiWLq8LjItBSzNwJB9L4biJ/nJWmEGtG2ZY=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    curl
-    freetype
-    libGL
-    libjpeg
-    libogg
-    libvorbis
-    libX11
-    libXxf86vm
-    openal
-  ];
-
-  patchPhase = ''
-    substituteInPlace ./configure \
-      --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 \
-      --replace libGL.so.1 ${libGL}/lib/libGL.so.1
-  '';
-
-  meta = with lib; {
-    changelog = "https://github.com/alienarena/alienarena/releases/tag/${version}";
-    description = "Free, stand-alone first-person shooter computer game";
-    longDescription = ''
-      Do you like old school deathmatch with modern features? How
-      about rich, colorful, arcade-like atmospheres? How about retro
-      Sci-Fi? Then you're going to love what Alien Arena has in store
-      for you! This game combines some of the very best aspects of
-      such games as Quake III and Unreal Tournament and wraps them up
-      with a retro alien theme, while adding tons of original ideas to
-      make the game quite unique.
-    '';
-    homepage = "https://alienarena.org";
-    # Engine is under GPLv2, everything else is under
-    license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ astsmtl ];
-    platforms = platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
deleted file mode 100644
index ecd1dfc9b3cd..000000000000
--- a/pkgs/games/andyetitmoves/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib, stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }:
-
-stdenv.mkDerivation rec {
-  pname = "andyetitmoves";
-  version = "1.2.2";
-
-  src =
-    if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"
-    then
-      let
-        postfix = if stdenv.hostPlatform.system == "i686-linux" then "i386" else "x86_64";
-        commercialName = "${pname}-${version}_${postfix}.tar.gz";
-        demoUrl = "http://www.andyetitmoves.net/demo/${pname}Demo-${version}_${postfix}.tar.gz";
-      in
-      if commercialVersion
-      then
-        requireFile
-          {
-            message = ''
-              We cannot download the commercial version automatically, as you require a license.
-              Once you bought a license, you need to add your downloaded version to the nix store.
-              You can do this by using "nix-prefetch-url file:///\$PWD/${commercialName}" in the
-              directory where yousaved it.
-            '';
-            name = commercialName;
-            sha256 =
-              if stdenv.hostPlatform.system == "i686-linux"
-              then "15wvzmmidvykwjrbnq70h5jrvnjx1hcrm0357qj85q4aqbzavh01"
-              else "1v8z16qa9ka8sf7qq45knsxj87s6sipvv3a7xq11pb5xk08fb2ql";
-          }
-      else
-        fetchurl {
-          url = demoUrl;
-          sha256 =
-            if stdenv.hostPlatform.system == "i686-linux"
-            then "0f14vrrbq05hsbdajrb5y9za65fpng1lc8f0adb4aaz27x7sh525"
-            else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
-        }
-    else
-      throw "And Yet It Moves nix package only supports linux and intel cpu's.";
-
-  installPhase = ''
-    mkdir -p $out/{opt/andyetitmoves,bin}
-    cp -r * $out/opt/andyetitmoves/
-
-    fullPath=${stdenv.cc.cc.lib}/lib64
-    for i in $nativeBuildInputs; do
-      fullPath=$fullPath''${fullPath:+:}$i/lib
-    done
-
-    binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"}
-
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName
-    cat > $out/bin/$binName << EOF
-    #!${runtimeShell}
-    cd $out/opt/andyetitmoves
-    exec ./lib/$binName
-    EOF
-    chmod +x $out/bin/$binName
-  '';
-
-  buildInputs = [ libvorbis libogg libtheora SDL libXft SDL_image zlib libX11 libpng openal ];
-
-  meta = with lib; {
-    description = "Physics/Gravity Platform game";
-    longDescription = ''
-      And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards.
-    '';
-    homepage = "http://www.andyetitmoves.net/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ bluescreen303 ];
-  };
-}
diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix
deleted file mode 100644
index 9b31c41ea68a..000000000000
--- a/pkgs/games/arena/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib, stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }:
-
-# Arena is free software in the sense of "free beer" but not as in "free
-# speech". We can install it as we please, but we cannot re-distribute it in
-# any way other than the original release tarball, so we cannot include its NAR
-# into the Nixpkgs channel.
-
-let
-
-  inherit (lib) makeLibraryPath;
-  libDir = "lib64";
-
-in
-stdenv.mkDerivation rec {
-  pname = "arena";
-  version = "3.10-beta";
-
-  src = fetchurl {
-    url = "http://www.playwitharena.de/downloads/arenalinux_64bit_${lib.replaceStrings ["-"] [""] version}.tar.gz";
-    sha256 = "1pzb9sg4lzbbi4gbldvlb85p8xyl9xnplxwyb9pkk2mwzvvxkf0d";
-  };
-
-  # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way?
-  buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 stdenv.cc.cc.lib];
-
-  unpackPhase = ''
-    # This is is a tar bomb, i.e. it extract a dozen files and directories to
-    # the top-level, so we must create a sub-directory first.
-    mkdir -p $out/lib/${pname}-${version}
-    tar -C $out/lib/${pname}-${version} -xf ${src}
-
-    # Remove executable bits from data files. This matters for the find command
-    # we'll use below to find all bundled engines.
-    chmod -x $out/lib/${pname}-${version}/Engines/*/*.{txt,bin,bmp,zip}
-  '';
-
-  buildPhase = ''
-    # Arena has (at least) two executables plus a couple of bundled chess
-    # engines that we need to patch.
-    exes=( $(find $out -name '*x86_64_linux')
-           $(find $out/lib/${pname}-${version}/Engines -type f -perm /u+x)
-         )
-    for i in "''${exes[@]}"; do
-      # Arminius is statically linked.
-      if [[ $i =~ "Arminius_2017-01-01" ]]; then echo yo $i; continue; fi
-      echo Fixing interpreter and rpath paths in $i ...
-      patchelf                                                                                   \
-        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"                                \
-        --set-rpath ${makeLibraryPath buildInputs}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir}  \
-        $i
-    done
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    ln -s $out/lib/${pname}-${version}/Arena_x86_64_linux $out/bin/arena
-  '';
-
-  dontStrip = true;
-
-  meta = {
-    description = "Chess GUI for analyzing with and playing against various engines";
-    longDescription = ''
-      A free Graphical User Interface (GUI) for chess. Arena assists you in
-      analyzing and playing games as well as in testing chess engines. It runs
-      on Linux or Windows. Arena is compatible to Winboard protocol I, II and
-      UCI protocol I, II. Furthermore, compatible to Chess960, DGT electronic
-      chess board & DGT clocks and much more.
-    '';
-    license = lib.licenses.unfree;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    homepage = "http://www.playwitharena.de";
-    platforms = ["x86_64-linux"];
-  };
-
-}
diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix
deleted file mode 100644
index 5b94777dea69..000000000000
--- a/pkgs/games/augustus/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  SDL2,
-  SDL2_mixer,
-  libpng,
-  darwin,
-  libicns,
-  imagemagick,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "augustus";
-  version = "4.0.0";
-
-  src = fetchFromGitHub {
-    owner = "Keriew";
-    repo = "augustus";
-    rev = "v${version}";
-    sha256 = "sha256-UWJmxirRJJqvL4ZSjBvFepeKVvL77+WMp4YdZuFNEkg=";
-  };
-
-  patches = [ ./darwin-fixes.patch ];
-
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.sigtool
-      libicns
-      imagemagick
-    ];
-
-  buildInputs = [
-    SDL2
-    SDL2_mixer
-    libpng
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
-
-  installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    runHook preInstall
-    mkdir -p $out/Applications
-    cp -r augustus.app $out/Applications/
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes";
-    mainProgram = "augustus";
-    homepage = "https://github.com/Keriew/augustus";
-    license = licenses.agpl3Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
-      Thra11
-      matteopacini
-    ];
-  };
-}
diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix
index 6ef2bb380fff..1eb079b70b3c 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "chiaki-ng";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
     rev = "v${version}";
-    hash = "sha256-7+AixZu74y1V+rUauVswPzuWX2x6n3MJoM2A2w4zyuI=";
+    hash = "sha256-1e53lqNns0CrpUfJ1AhclPO4nkMAfJT6xIXZlxXRir8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
deleted file mode 100644
index e96adbf69d06..000000000000
--- a/pkgs/games/ckan/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper, mono, gtk2, curl }:
-
-stdenv.mkDerivation rec {
-  pname = "ckan";
-  version = "1.34.4";
-
-  src = fetchurl {
-    url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
-    sha256 = "sha256-T3SBzGmTwFZsEkd3kCK7auINKPsFx2zIYR2/Zqt5ATM=";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ mono ];
-
-  libraries = lib.makeLibraryPath [ gtk2 curl ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    install -m 644 -D $src $out/bin/ckan.exe
-    makeWrapper ${mono}/bin/mono $out/bin/ckan \
-      --add-flags $out/bin/ckan.exe \
-      --set LD_LIBRARY_PATH $libraries
-  '';
-
-  meta = with lib; {
-    description = "Mod manager for Kerbal Space Program";
-    mainProgram = "ckan";
-    homepage = "https://github.com/KSP-CKAN/CKAN";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Baughn ymarkus ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix
deleted file mode 100644
index daebe74e30b4..000000000000
--- a/pkgs/games/clonehero/default.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-, gtk3
-, zlib
-, alsa-lib
-, dbus
-, libGL
-, libXcursor
-, libXext
-, libXi
-, libXinerama
-, libxkbcommon
-, libXrandr
-, libXScrnSaver
-, libXxf86vm
-, udev
-, vulkan-loader # (not used by default, enable in settings menu)
-, wayland # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
-, makeDesktopItem
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "clonehero";
-  version = "1.0.0.4080";
-
-  src = fetchurl {
-    url = "https://github.com/clonehero-game/releases/releases/download/V${finalAttrs.version}/CloneHero-linux.tar.xz";
-    hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI=";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  nativeBuildInputs = [ autoPatchelfHook ];
-
-  buildInputs = [
-    # Load-time libraries (loaded from DT_NEEDED section in ELF binary)
-    alsa-lib
-    gtk3
-    stdenv.cc.cc.lib
-    zlib
-
-    # Run-time libraries (loaded with dlopen)
-    dbus
-    libGL
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libxkbcommon
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
-    udev
-    vulkan-loader
-    wayland
-  ];
-
-  desktopItem = makeDesktopItem {
-    name = "clonehero";
-    desktopName = "Clone Hero";
-    comment = finalAttrs.meta.description;
-    icon = "clonehero";
-    exec = "clonehero";
-    categories = [ "Game" ];
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 clonehero "$out/bin/clonehero"
-    install -Dm644 UnityPlayer.so "$out/libexec/clonehero/UnityPlayer.so"
-
-    mkdir -p "$out/share/pixmaps"
-    cp -r clonehero_Data "$out/share/clonehero"
-    ln -s "$out/share/clonehero" "$out/bin/clonehero_Data"
-    ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/pixmaps/clonehero.png"
-    install -Dm644 "$desktopItem/share/applications/clonehero.desktop" "$out/share/applications/clonehero.desktop"
-
-    mkdir -p "$doc/share/doc/clonehero"
-    cp -r CLONE_HERO_MANUAL.{pdf,txt} Custom EULA.txt THIRDPARTY.txt "$doc/share/doc/clonehero"
-
-    runHook postInstall
-  '';
-
-  # Patch required run-time libraries as load-time libraries
-  #
-  # Libraries found with:
-  # > strings UnityPlayer.so | grep '\.so'
-  # and:
-  # > LD_DEBUG=libs clonehero
-  postFixup = ''
-    patchelf \
-      --add-needed libasound.so.2 \
-      --add-needed libdbus-1.so.3 \
-      --add-needed libGL.so.1 \
-      --add-needed libpthread.so.0 \
-      --add-needed libudev.so.1 \
-      --add-needed libvulkan.so.1 \
-      --add-needed libwayland-client.so.0 \
-      --add-needed libwayland-cursor.so.0 \
-      --add-needed libwayland-egl.so.1 \
-      --add-needed libX11.so.6 \
-      --add-needed libXcursor.so.1 \
-      --add-needed libXext.so.6 \
-      --add-needed libXi.so.6 \
-      --add-needed libXinerama.so.1 \
-      --add-needed libxkbcommon.so.0 \
-      --add-needed libXrandr.so.2 \
-      --add-needed libXss.so.1 \
-      --add-needed libXxf86vm.so.1 \
-      "$out/libexec/clonehero/UnityPlayer.so"
-  '';
-
-  meta = with lib; {
-    description = "Clone of Guitar Hero and Rockband-style games";
-    homepage = "https://clonehero.net";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ kira-bruneau syboxez ];
-    platforms = [ "x86_64-linux" ];
-  };
-})
diff --git a/pkgs/games/corsix-th/default.nix b/pkgs/games/corsix-th/default.nix
deleted file mode 100644
index 4dee7418cb89..000000000000
--- a/pkgs/games/corsix-th/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, curl
-, doxygen
-, ffmpeg
-, freetype
-, lua
-, makeWrapper
-, SDL2
-, SDL2_mixer
-, timidity
-# Darwin dependencies
-, libiconv
-, Cocoa
-, CoreVideo
-, CoreMedia
-, VideoToolbox
-# Update
-, nix-update-script
-}:
-
-stdenv.mkDerivation(finalAttrs: {
-  pname = "corsix-th";
-  version = "0.68.0";
-
-  src = fetchFromGitHub {
-    owner = "CorsixTH";
-    repo = "CorsixTH";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-D8ks+fiFJxwClqW1aNtGGa5UxAFvuH2f2guwPxOEQwI=";
-  };
-
-  patches = [
-    ./darwin-cmake-no-fixup-bundle.patch
-  ];
-
-  nativeBuildInputs = [ cmake doxygen makeWrapper ];
-
-  buildInputs = let
-    luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]);
-  in [
-    curl
-    ffmpeg
-    freetype
-    lua
-    luaEnv
-    SDL2
-    SDL2_mixer
-    timidity
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    Cocoa
-    CoreVideo
-    CoreMedia
-    VideoToolbox
-  ];
-
-  cmakeFlags = [ "-Wno-dev" ];
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    wrapProgram $out/bin/corsix-th \
-    --set LUA_PATH "$LUA_PATH" \
-    --set LUA_CPATH "$LUA_CPATH"
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv $out/CorsixTH.app $out/Applications
-    wrapProgram $out/Applications/CorsixTH.app/Contents/MacOS/CorsixTH \
-      --set LUA_PATH "$LUA_PATH" \
-      --set LUA_CPATH "$LUA_CPATH"
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    description = "Reimplementation of the 1997 Bullfrog business sim Theme Hospital";
-    mainProgram = "corsix-th";
-    homepage = "https://corsixth.com/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hughobrien matteopacini ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-})
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 02dfd89f636d..820b6def9d17 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation {
   buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ]
     ++ optional (!isAtLeast50) SDL
     ++ optional enableUnfuck dwarf-fortress-unfuck
-    ++ [ stdenv.cc.cc.lib ];
+    ++ [ (lib.getLib stdenv.cc.cc) ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix
deleted file mode 100644
index 77ccc9a929c3..000000000000
--- a/pkgs/games/ecwolf/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv
-, lib
-, fetchFromBitbucket
-, cmake
-, pkg-config
-, makeWrapper
-, zlib
-, bzip2
-, libjpeg
-, SDL2
-, SDL2_net
-, SDL2_mixer
-, gtk3
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ecwolf";
-  version = "1.4.1";
-
-  src = fetchFromBitbucket {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
-  buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];
-
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit";
-
-  # ECWolf installs its binary to the games/ directory, but Nix only adds bin/
-  # directories to the PATH.
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    mv "$out/games" "$out/bin"
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/{Applications,bin}
-    cp -R ecwolf.app $out/Applications
-    makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf
-  '';
-
-  meta = with lib; {
-    description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms";
-    mainProgram = "ecwolf";
-    homepage = "https://maniacsvault.net/ecwolf/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ jayman2000 sander ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/games/everspace/default.nix b/pkgs/games/everspace/default.nix
deleted file mode 100644
index abf568d6acab..000000000000
--- a/pkgs/games/everspace/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  # Packaging Dependencies
-  lib, stdenv, requireFile, autoPatchelfHook, unzip, copyDesktopItems, makeDesktopItem,
-
-  # Everspace Dependencies
-  cairo, gdk-pixbuf, pango, gtk2-x11, libGL, openal,
-
-  # Unreal Engine 4 Dependencies
-  xorg
-}:
-
-# Known issues:
-# - Video playback (upon starting a new game) does not work (screen is black)
-stdenv.mkDerivation rec {
-  pname = "everspace";
-  version = "1.3.5.3655";
-
-  src = requireFile {
-    name = "everspace_1_3_5_3655_32896.sh";
-    url = "https://www.gog.com/";
-    sha256 = "0jlvxq14k1pxmbr08y8kar0ijlqxcnkfqlvw883j96v9zr34ynj3";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    copyDesktopItems
-    unzip
-  ];
-
-  buildInputs = [
-    cairo
-    gdk-pixbuf
-    pango
-    gtk2-x11
-    openal
-    stdenv.cc.cc.lib
-  ];
-
-  runtimeDependencies = [
-    libGL
-
-    # ue4
-    xorg.libX11
-    xorg.libXScrnSaver
-    xorg.libXau
-    xorg.libXcursor
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXxf86vm
-    xorg.libxcb
-  ];
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    # The shell script contains a zip file. Unzipping it works but will result
-    # in some error output and an error exit code.
-    unzip "$src" || true
-
-    runHook postUnpack
-  '';
-
-  postPatch = ''
-    ## Remove Bundled Libs ##
-
-    # vlc libs
-    #
-    # TODO: This is probably what breaks video playback. It would be cleaner
-    #   to remove the bundled libs and replace them with system libs but there
-    #   are so many. Copy-pasting the list from the vlc package is a good start
-    #   but still leaves us with many unresolved dependencies.
-    rm -rf ./data/noarch/game/RSG/Plugins/VlcMedia
-
-    # openal
-    rm -rf ./data/noarch/game/Engine/Binaries/ThirdParty/OpenAL
-  '';
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/opt"
-    cp -r "./data/noarch" "$out/opt/everspace"
-
-    mkdir -p "$out/bin"
-    ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace"
-
-    mkdir -p "$out/share/pixmaps"
-    ln -s "$out/opt/everspace/support/icon.png" "$out/share/pixmaps/everspace-gog.png"
-
-    runHook postInstall
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      type = "Application";
-      name = "everspace-gog";
-      desktopName = "EVERSPACE™";
-      comment = meta.description;
-      exec = "everspace";
-      icon = "everspace-gog";
-      categories = [ "Game" ];
-    })
-  ];
-
-  meta = with lib; {
-    description = "Action-focused single-player space shooter with roguelike elements";
-    homepage = "https://classic.everspace-game.com/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ jtrees ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 1a0cb892dcea..3732f4f3a06e 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "freeciv";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "freeciv";
     repo = "freeciv";
     rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-gneg43RJCf32LUjOHTHlvZxN9RnyJYeXXi6EU3r3mBw=";
+    hash = "sha256-z4BmkAjKgK0rf4fCMpAhI++HCKFrvpwKmcUvdPSF6Zw=";
   };
 
   postPatch = ''
diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix
deleted file mode 100644
index 72d0be794449..000000000000
--- a/pkgs/games/frozen-bubble/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib
-, copyDesktopItems, makeDesktopItem
-}:
-perlPackages.buildPerlModule {
-  pname = "frozen-bubble";
-  version = "2.212";
-
-  src = fetchurl {
-    url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz";
-    sha256 = "721e04ff69c5233060656bfbf4002aa1aeadd96c95351f0c57bb85b6da35a305";
-  };
-  patches = [ ./fix-compilation.patch ];
-
-  nativeBuildInputs = [ copyDesktopItems pkg-config ];
-
-  buildInputs =  [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ];
-  propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ];
-
-  perlPreHook = "export LD=$CC";
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "frozen-bubble";
-      exec = "frozen-bubble";
-      desktopName = "Frozen Bubble";
-      genericName = "Frozen Bubble";
-      comment = "Arcade/reflex colour matching game";
-      categories = [ "Game" ];
-    })
-  ];
-
-  meta = {
-    description = "Puzzle with Bubbles";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ puckipedia ];
-  };
-}
diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index cfa4717c05ee..52b5e1f2aa13 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gcompris";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchurl {
     url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Pz0cOyBfiexKHUsHXm18Zw2FKu7b7vVuwy4Vu4daBoU=";
+    hash = "sha256-Zocmq8lJxJ5TSLVeix59cAVYQghDK7lUJJeffwjyJWw=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 9ad6e3105406..6b89a806e26b 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -49,6 +49,10 @@ stdenv.mkDerivation {
     cmakeFlagsArray+=("-DLOCAL_RAPIDJSON_LIB=OFF" "-DLOCAL_GTEST_LIB=OFF" "-DEXTRA_DATA_DIR=$out/share/ja2")
   '';
 
+  # error: 'uint64_t' does not name a type
+  # gcc13 and above don't automatically include cstdint
+  env.CXXFLAGS = "-include cstdint";
+
   doInstallCheck = true;
   installCheckPhase = ''
     HOME=/tmp $out/bin/ja2 -unittests
diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix
deleted file mode 100644
index f5f5bb6d1eb4..000000000000
--- a/pkgs/games/julius/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, SDL2
-, SDL2_mixer
-, cmake
-, libpng
-, darwin
-, libicns
-, imagemagick
-}:
-stdenv.mkDerivation rec {
-  pname = "julius";
-  version = "1.7.0";
-
-  src = fetchFromGitHub {
-    owner = "bvschaik";
-    repo = "julius";
-    rev = "v${version}";
-    hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A=";
-  };
-
-  patches = [
-    # This fixes the darwin bundle generation, sets min. deployment version
-    # and patches SDL2_mixer include
-    ./darwin-fixes.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.sigtool
-    libicns
-    imagemagick
-  ];
-
-  buildInputs = [
-    SDL2
-    SDL2_mixer
-    libpng
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Cocoa
-  ];
-
-  installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    runHook preInstall
-    mkdir -p $out/Applications
-    cp -r julius.app $out/Applications/
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/bvschaik/julius";
-    description = "Open source re-implementation of Caesar III";
-    mainProgram = "julius";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ Thra11 matteopacini ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index 5715c5e029b9..d3a66ea95fb8 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -26,25 +26,25 @@ stdenv.mkDerivation {
     do
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
     done
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              launcher_$arch
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libNetwork_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libQtCoreUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtGuiUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libQtNetworkUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtWebKitUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libQtXmlUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libRakNet_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              libUnigine_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              OilRush_$arch
   '';
   installPhase = ''
diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix
index 396d756a6788..72735402047e 100644
--- a/pkgs/games/openttd/jgrpp.nix
+++ b/pkgs/games/openttd/jgrpp.nix
@@ -2,13 +2,13 @@
 
 openttd.overrideAttrs (oldAttrs: rec {
   pname = "openttd-jgrpp";
-  version = "0.60.0";
+  version = "0.62.0";
 
   src = fetchFromGitHub rec {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-R8zpEK9XRQIEOvPe597dgn0R3L5m4rx7GzP6B1Qr4EE=";
+    hash = "sha256-rl0GKKROteP2orT5Z/DHAQPkJFQu/lddQULYfq/x8w8=";
   };
 
   buildInputs = oldAttrs.buildInputs ++ [ zstd ];
@@ -16,6 +16,7 @@ openttd.overrideAttrs (oldAttrs: rec {
   meta = {
     homepage = "https://github.com/JGRennison/OpenTTD-patches";
     changelog = "https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp-${version}/jgrpp-changelog.md";
+    mainProgram = "openttd";
   };
 
 })
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
deleted file mode 100644
index 20a40922544e..000000000000
--- a/pkgs/games/performous/default.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, SDL2
-, aubio
-, boost
-, cmake
-, ffmpeg
-, fmt
-, gettext
-, glew
-, glibmm
-, glm
-, icu
-, libepoxy
-, librsvg
-, libxmlxx
-, nlohmann_json
-, pango
-, pkg-config
-, portaudio
-}:
-
-stdenv.mkDerivation rec {
-  pname = "performous";
-  version = "1.3.1";
-
-  src = fetchFromGitHub {
-    owner = "performous";
-    repo = "performous";
-    rev = "refs/tags/${version}";
-    hash = "sha256-f70IHA8LqIlkMRwJqSmszx3keStSx50nKcEWLGEjc3g=";
-  };
-
-  cedSrc = fetchFromGitHub {
-    owner = "performous";
-    repo = "compact_enc_det";
-    rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e";
-    hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec=";
-  };
-
-  patches = [
-    ./performous-cmake.patch
-    ./performous-fftw.patch
-  ];
-
-  postPatch = ''
-    mkdir ced-src
-    cp -R ${cedSrc}/* ced-src
-
-    substituteInPlace data/CMakeLists.txt \
-      --replace "/usr" "$out"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    gettext
-    pkg-config
-  ];
-
-  buildInputs = [
-    SDL2
-    aubio
-    boost
-    ffmpeg
-    fmt
-    glew
-    glibmm
-    glm
-    icu
-    libepoxy
-    librsvg
-    libxmlxx
-    nlohmann_json
-    pango
-    portaudio
-  ];
-
-  meta = with lib; {
-    description = "Karaoke, band and dancing game";
-    mainProgram = "performous";
-    homepage = "https://performous.org/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ wegank ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
deleted file mode 100644
index e99f5541f284..000000000000
--- a/pkgs/games/planetaryannihilation/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
-, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }:
-
-stdenv.mkDerivation rec {
-  pname = "planetary-annihalation";
-  version = "62857";
-
-  src = requireFile {
-    message = "This file has to be downloaded manually via nix-prefetch-url.";
-    name = "PA_Linux_${version}.tar.bz2";
-    sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k";
-  };
-
-  nativeBuildInputs = [ patchelf makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,lib}
-
-    cp -R * $out/
-    mv $out/*.so $out/lib
-    ln -s $out/PA $out/bin/PA
-
-    ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host"
-
-    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64"
-
-    for f in $out/lib/*; do
-      patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" $f
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.uberent.com/pa/";
-    description = "Next-generation RTS that takes the genre to a planetary scale";
-    license = lib.licenses.unfree;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.domenkozar ];
-  };
-}
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 3c78d0e5f233..63e07c040455 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -13,13 +13,13 @@ let
 
   yquake2 = stdenv.mkDerivation rec {
     pname = "yquake2";
-    version = "8.40";
+    version = "8.41";
 
     src = fetchFromGitHub {
       owner = "yquake2";
       repo = "yquake2";
       rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
-      sha256 = "sha256-licz659DFS56/5P/hmPSE0YuVPTp1r4yrzS7FIg4Okc=";
+      sha256 = "sha256-8xvY8XYZJa/gAVcxR+ffpE8naUTbGyM8AyAdpG6nKtA=";
     };
 
     postPatch = ''
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
index 291b4b386cc5..86cd351f2c59 100644
--- a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
@@ -1,6 +1,6 @@
 { callPackage
 , fetchFromGitHub
-, gradle_6
+, fetchpatch
 , substitute
 }:
 
@@ -16,10 +16,26 @@ callPackage ../generic.nix rec {
     hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI=";
   };
 
-  patches = [(substitute {
-    src = ./disable-git-version.patch;
-    substitutions = [ "--subst-var-by" "version" version ];
-  })];
+  patches = [
+    (substitute {
+      src = ./disable-git-version.patch;
+      substitutions = [ "--subst-var-by" "version" version ];
+    })
+    # FIXME: Remove after next release
+    (fetchpatch {
+      name = "Update-desktop-build-script-for-Gradle-7.0+";
+      url = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/5610142126e161cbdc78a07c5d5abfbcd6eaf8a6.patch";
+      hash = "sha256-zAiOz/Cu89Y+VmAyLCf7fzq0Mr0sYFZu14sqBZ/XvZU=";
+    })
+  ];
+
+  postPatch = ''
+    # Upstream patched this in https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/c8a6fdd57c49fd91bf65be48679ae6a77578ef9f,
+    # but the patch fails to apply cleanly. Manually replace the deprecated option instead.
+    # FIXME: Remove after next release
+    substituteInPlace gradle.properties \
+      --replace-fail "-XX:MaxPermSize" "-XX:MaxMetaspaceSize"
+  '';
 
   desktopName = "Summoning Pixel Dungeon";
 
@@ -28,7 +44,4 @@ callPackage ../generic.nix rec {
     downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases";
     description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics";
   };
-
-  # Probably due to https://github.com/gradle/gradle/issues/17236
-  gradle = gradle_6;
 }
diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix
deleted file mode 100644
index 2ff8c063f5f0..000000000000
--- a/pkgs/games/shipwright/default.nix
+++ /dev/null
@@ -1,199 +0,0 @@
-{ stdenv
-, cmake
-, lsb-release
-, ninja
-, lib
-, fetchFromGitHub
-, fetchurl
-, copyDesktopItems
-, makeDesktopItem
-, python3
-, libX11
-, libXrandr
-, libXinerama
-, libXcursor
-, libXi
-, libXext
-, glew
-, boost
-, SDL2
-, SDL2_net
-, pkg-config
-, libpulseaudio
-, libpng
-, imagemagick
-, zenity
-, makeWrapper
-, darwin
-, libicns
-}:
-let
-  inherit (darwin.apple_sdk_11_0.frameworks)
-    IOSurface Metal QuartzCore Cocoa AVFoundation;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "shipwright";
-  version = "8.0.6";
-
-  src = fetchFromGitHub {
-    owner = "harbourmasters";
-    repo = "shipwright";
-    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-bA+Bm7M6udeZLpFhGa8fCtagfYBeRxWWqFuAj62XwGQ=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    ./darwin-fixes.patch
-  ];
-
-  # This would get fetched at build time otherwise, see:
-  # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736
-  gamecontrollerdb = fetchurl {
-    name = "gamecontrollerdb.txt";
-    url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/075c1549075ef89a397fd7e0663d21e53a2485fd/gamecontrollerdb.txt";
-    hash = "sha256-atjc0t921l6JSUAd/Yk7uup2R7mCp5ivAh6Dr7HBY7I=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pkg-config
-    python3
-    imagemagick
-    makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    lsb-release
-    copyDesktopItems
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libicns
-    darwin.sigtool
-  ];
-
-  buildInputs = [
-    boost
-    glew
-    SDL2
-    SDL2_net
-    libpng
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
-    libpulseaudio
-    zenity
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    IOSurface
-    Metal
-    QuartzCore
-    Cocoa
-    AVFoundation
-    darwin.apple_sdk_11_0.libs.simd
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "NON_PORTABLE" true)
-    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
-  ];
-
-  env.NIX_CFLAGS_COMPILE =
-    lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int";
-
-  dontAddPrefix = true;
-
-  # Linking fails without this
-  hardeningDisable = [ "format" ];
-
-  postBuild = ''
-    cp ${finalAttrs.gamecontrollerdb} ${finalAttrs.gamecontrollerdb.name}
-    pushd ../OTRExporter
-    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver ${finalAttrs.version}
-    popd
-  '';
-
-  preInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    # Cmake likes it here for its install paths
-    cp ../OTRExporter/soh.otr ..
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    cp ../OTRExporter/soh.otr soh/soh.otr
-  '';
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    mkdir -p $out/bin
-    ln -s $out/lib/soh.elf $out/bin/soh
-    install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Recreate the macOS bundle (without using cpack)
-    # We mirror the structure of the bundle distributed by the project
-
-    mkdir -p $out/Applications/soh.app/Contents
-    cp $src/soh/macosx/Info.plist.in $out/Applications/soh.app/Contents/Info.plist
-    substituteInPlace $out/Applications/soh.app/Contents/Info.plist \
-      --replace-fail "@CMAKE_PROJECT_VERSION@" "${finalAttrs.version}"
-
-    mv $out/MacOS $out/Applications/soh.app/Contents/MacOS
-
-    # Wrapper
-    cp $src/soh/macosx/soh-macos.sh.in $out/Applications/soh.app/Contents/MacOS/soh
-    chmod +x $out/Applications/soh.app/Contents/MacOS/soh
-    patchShebangs $out/Applications/soh.app/Contents/MacOS/soh
-
-    # "lib" contains all resources that are in "Resources" in the official bundle.
-    # We move them to the right place and symlink them back to $out/lib,
-    # as that's where the game expects them.
-    mv $out/Resources $out/Applications/soh.app/Contents/Resources
-    mv $out/lib/** $out/Applications/soh.app/Contents/Resources
-    rm -rf $out/lib
-    ln -s $out/Applications/soh.app/Contents/Resources $out/lib
-
-    # Copy icons
-    cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns
-
-    # Fix executable
-    install_name_tool -change @executable_path/../Frameworks/libSDL2-2.0.0.dylib \
-                      ${SDL2}/lib/libSDL2-2.0.0.dylib \
-                      $out/Applications/soh.app/Contents/Resources/soh-macos
-    install_name_tool -change @executable_path/../Frameworks/libGLEW.2.2.0.dylib \
-                      ${glew}/lib/libGLEW.2.2.0.dylib \
-                      $out/Applications/soh.app/Contents/Resources/soh-macos
-    install_name_tool -change @executable_path/../Frameworks/libpng16.16.dylib \
-                      ${libpng}/lib/libpng16.16.dylib \
-                      $out/Applications/soh.app/Contents/Resources/soh-macos
-
-    # Codesign (ad-hoc)
-    codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos
-  '';
-
-  fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux ''
-    wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "soh";
-      icon = "soh";
-      exec = "soh";
-      comment = finalAttrs.meta.description;
-      genericName = "Ship of Harkinian";
-      desktopName = "soh";
-      categories = [ "Game" ];
-    })
-  ];
-
-  meta = {
-    homepage = "https://github.com/HarbourMasters/Shipwright";
-    description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
-    mainProgram = "soh";
-    platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ j0lol matteopacini ];
-    license = with lib.licenses; [
-      # OTRExporter, OTRGui, ZAPDTR, libultraship
-      mit
-      # Ship of Harkinian itself
-      unfree
-    ];
-  };
-})
diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
index 2679866a523b..9483561a4a1b 100644
--- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
+++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
@@ -23,7 +23,7 @@
 , gdk-pixbuf
 }:
 let
-  version = "0.29.0";
+  version = "0.29.1";
   pname = "space-station-14-launcher";
 in
 buildDotnetModule rec {
@@ -36,7 +36,7 @@ buildDotnetModule rec {
     owner = "space-wizards";
     repo = "SS14.Launcher";
     rev = "v${version}";
-    hash = "sha256-0HpHTZhGqCcSCCBk1d5923ALVCjozLn5fym4RH2Ov5Y=";
+    hash = "sha256-Gajs8zINWBJ3BvAPKYan0bCRbEVscz56pyE9WOLiOqU=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
deleted file mode 100644
index b4531fc0015d..000000000000
--- a/pkgs/games/stockfish/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub }:
-
-let
-    # The x86-64-modern may need to be refined further in the future
-    # but stdenv.hostPlatform CPU flags do not currently work on Darwin
-    # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745
-    archDarwin = if stdenv.hostPlatform.isx86_64 then "x86-64-modern" else "apple-silicon";
-    arch = if stdenv.hostPlatform.isDarwin then archDarwin else
-           if stdenv.hostPlatform.isx86_64 then "x86-64" else
-           if stdenv.hostPlatform.isi686 then "x86-32" else
-           if stdenv.hostPlatform.isAarch64 then "armv8" else
-           "unknown";
-
-    # These files can be found in src/evaluate.h
-    nnueBigFile = "nn-1111cefa1111.nnue";
-    nnueBig = fetchurl {
-      name = nnueBigFile;
-      url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
-      sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
-    };
-    nnueSmallFile = "nn-37f18f62d772.nnue";
-    nnueSmall = fetchurl {
-      name = nnueSmallFile;
-      url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
-      sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
-    };
-in
-
-stdenv.mkDerivation rec {
-  pname = "stockfish";
-  version = "17";
-
-  src = fetchFromGitHub {
-    owner = "official-stockfish";
-    repo = "Stockfish";
-    rev = "sf_${version}";
-    sha256 = "sha256-oXvLaC5TEUPlHjhm7tOxpNPY88QxYHFw+Cev3Q8NEeQ=";
-  };
-
-  postUnpack = ''
-    sourceRoot+=/src
-    cp "${nnueBig}" "$sourceRoot/${nnueBigFile}"
-    cp "${nnueSmall}" "$sourceRoot/${nnueSmallFile}"
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" "CXX=${stdenv.cc.targetPrefix}c++" ];
-  buildFlags = [ "build" ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://stockfishchess.org/";
-    description = "Strong open source chess engine";
-    mainProgram = "stockfish";
-    longDescription = ''
-      Stockfish is one of the strongest chess engines in the world. It is also
-      much stronger than the best human chess grandmasters.
-      '';
-    maintainers = with maintainers; [ luispedro siraben thibaultd ];
-    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
-    license = licenses.gpl3Only;
-  };
-
-}
diff --git a/pkgs/games/taisei/0001-lto-fix.patch b/pkgs/games/taisei/0001-lto-fix.patch
deleted file mode 100644
index eed7b845f53c..000000000000
--- a/pkgs/games/taisei/0001-lto-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 80aa58d..c7e9d0a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -17,7 +17,7 @@ project('taisei', 'c',
-         # You may want to change these for a debug build dir
-         'buildtype=release',
-         'strip=true',
--        'b_lto=true',
-+        'b_lto=false',
-         'b_ndebug=if-release',
-     ]
- )
diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix
deleted file mode 100644
index ee5712f7b7f6..000000000000
--- a/pkgs/games/taisei/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, fetchurl
-# Build depends
-, docutils, meson, ninja, pkg-config, python3
-# Runtime depends
-, glfw, SDL2, SDL2_mixer
-, cglm, freetype, libpng, libwebp, libzip, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "taisei";
-  version = "1.3.2";
-
-  src = fetchurl {
-    url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz";
-    sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v";
-  };
-
-  nativeBuildInputs = [
-    docutils meson ninja pkg-config python3
-  ];
-
-  buildInputs = [
-    glfw SDL2 SDL2_mixer
-    cglm freetype libpng libwebp libzip zlib
-  ];
-
-  patches = [ ./0001-lto-fix.patch ];
-
-  preConfigure = ''
-    patchShebangs .
-  '';
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Free and open-source Touhou Project clone and fangame";
-    mainProgram = "taisei";
-    longDescription = ''
-      Taisei is an open clone of the Tōhō Project series. Tōhō is a one-man
-      project of shoot-em-up games set in an isolated world full of Japanese
-      folklore.
-    '';
-    homepage = "https://taisei-project.org/";
-    license = [ licenses.mit licenses.cc-by-40 ];
-    maintainers = [ maintainers.lambda-11235 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
deleted file mode 100644
index 8cc5a5aece6e..000000000000
--- a/pkgs/games/ultrastardx/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ lib, stdenv
-, autoreconfHook
-, fetchFromGitHub
-, pkg-config
-, lua
-, fpc
-, pcre
-, portaudio
-, freetype
-, libpng
-, SDL2
-, SDL2_image
-, SDL2_gfx
-, SDL2_mixer
-, SDL2_net, SDL2_ttf
-, ffmpeg
-, sqlite
-, zlib
-, libX11
-, libGLU
-, libGL
-}:
-
-let
-  sharedLibs = [
-    pcre portaudio freetype
-    SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
-    sqlite lua zlib libX11 libGLU libGL ffmpeg
-  ];
-
-in stdenv.mkDerivation rec {
-  pname = "ultrastardx";
-  version = "2024.8.0";
-
-  src = fetchFromGitHub {
-    owner = "UltraStar-Deluxe";
-    repo = "USDX";
-    rev = "v${version}";
-    hash = "sha256-eji8lMrZbKAMYTqUk9d8tBIKkH083fbh4s01M0mPLpM=";
-  };
-
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
-  buildInputs = [ fpc libpng ] ++ sharedLibs;
-
-  postPatch = ''
-    substituteInPlace src/config.inc.in \
-      --subst-var-by libpcre_LIBNAME libpcre.so.1
-  '';
-
-  preBuild =
-    let items = lib.concatMapStringsSep " " (x: "-rpath ${lib.getLib x}/lib") sharedLibs;
-    in ''
-      export NIX_LDFLAGS="$NIX_LDFLAGS ${items}"
-    '';
-
-  # dlopened libgcc requires the rpath not to be shrinked
-  dontPatchELF = true;
-
-  meta = with lib; {
-    homepage = "https://usdx.eu/";
-    description = "Free and open source karaoke game";
-    mainProgram = "ultrastardx";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ Profpatsch ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
deleted file mode 100644
index 4b68bc53d086..000000000000
--- a/pkgs/games/vassal/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib
-, stdenv
-, fetchzip
-, glib
-, jre
-, makeWrapper
-, wrapGAppsHook3
-}:
-
-stdenv.mkDerivation rec {
-  pname = "VASSAL";
-  version = "3.7.14";
-
-  src = fetchzip {
-    url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
-    sha256 = "sha256-3P3f6X2c5lF1AizEs9z59MhLy0Ntg203rkPAkv+SBtw=";
-  };
-
-  buildInputs = [
-    glib
-  ];
-
-  nativeBuildInputs = [
-    makeWrapper
-    wrapGAppsHook3
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share/vassal $out/doc
-
-    cp CHANGES LICENSE README.md $out
-    cp -R lib/* $out/share/vassal
-    cp -R doc/* $out/doc
-
-    makeWrapper ${jre}/bin/java $out/bin/vassal \
-      --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \
-      VASSAL.launch.ModuleManager"
-
-    runHook postInstall
-  '';
-
-  # Don't move doc to share/, VASSAL expects it to be in the root
-  forceShare = [ "man" "info" ];
-
-  meta = with lib; {
-      description = "Free, open-source boardgame engine";
-      homepage = "https://vassalengine.org/";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.lgpl21Only;
-      maintainers = with maintainers; [ tvestelind ];
-      platforms = platforms.unix;
-      mainProgram = "vassal";
-  };
-}
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
deleted file mode 100644
index 81ab98e67bc9..000000000000
--- a/pkgs/games/warzone2100/default.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, ninja
-, p7zip
-, pkg-config
-, asciidoctor
-, gettext
-
-, SDL2
-, libtheora
-, libvorbis
-, libopus
-, openal
-, openalSoft
-, physfs
-, miniupnpc
-, libsodium
-, curl
-, libpng
-, freetype
-, harfbuzz
-, sqlite
-, which
-, vulkan-headers
-, vulkan-loader
-, shaderc
-
-, testers
-, warzone2100
-, nixosTests
-
-, gitUpdater
-
-, withVideos ? false
-}:
-
-let
-  pname = "warzone2100";
-  sequences_src = fetchurl {
-    url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz";
-    sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa";
-  };
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  inherit pname;
-  version  = "4.5.3";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz";
-    hash = "sha256-7tSfLkVth9nbGSwn1uNWeFrHx5ac+jaO3Gk9Bb+hLIk=";
-  };
-
-  buildInputs = [
-    SDL2
-    libtheora
-    libvorbis
-    libopus
-    openal
-    openalSoft
-    physfs
-    miniupnpc
-    libsodium
-    curl
-    libpng
-    freetype
-    harfbuzz
-    sqlite
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    vulkan-headers
-    vulkan-loader
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    ninja
-    p7zip
-    asciidoctor
-    gettext
-    shaderc
-  ];
-
-  postPatch = ''
-    substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
-                      --replace '"which "' '"${which}/bin/which "'
-    substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
-                      --replace "which %s" "${which}/bin/which %s"
-  '';
-
-  cmakeFlags = [
-    "-DWZ_DISTRIBUTOR=NixOS"
-    # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute
-    # path, but this results in an error:
-    #
-    # > An absolute CMAKE_INSTALL_BINDIR path cannot be used if the following
-    # > are not also absolute paths: WZ_DATADIR
-    #
-    # WZ_DATADIR is based on CMAKE_INSTALL_DATAROOTDIR, so we set that.
-    #
-    # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin".
-    "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake";
-
-  postInstall = lib.optionalString withVideos ''
-    cp ${sequences_src} $out/share/warzone2100/sequences.wz
-  '';
-
-  passthru.tests = {
-    version = testers.testVersion {
-      package = warzone2100;
-      # The command always exits with code 1
-      command = "(warzone2100 --version || [ $? -eq 1 ])";
-    };
-    nixosTest = nixosTests.warzone2100;
-  };
-
-  passthru.updateScript = gitUpdater {
-    url = "https://github.com/Warzone2100/warzone2100";
-  };
-
-  meta = with lib; {
-    description = "Free RTS game, originally developed by Pumpkin Studios";
-    mainProgram = "warzone2100";
-    longDescription = ''
-        Warzone 2100 is an open source real-time strategy and real-time tactics
-      hybrid computer game, originally developed by Pumpkin Studios and
-      published by Eidos Interactive.
-        In Warzone 2100, you command the forces of The Project in a battle to
-      rebuild the world after mankind has almost been destroyed by nuclear
-      missiles. The game offers campaign, multi-player, and single-player
-      skirmish modes. An extensive tech tree with over 400 different
-      technologies, combined with the unit design system, allows for a wide
-      variety of possible units and tactics.
-    '';
-    homepage = "https://wz2100.net";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ astsmtl fgaz ];
-    platforms = platforms.all;
-    # configure_mac.cmake tries to download stuff
-    # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-})
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
deleted file mode 100644
index a54cea0ae9f9..000000000000
--- a/pkgs/games/worldofgoo/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ lib, stdenv, requireFile, unzip, makeDesktopItem, SDL2, SDL2_mixer, libogg, libvorbis }:
-
-let
-  arch = if stdenv.system == "x86_64-linux"
-    then "x86_64"
-    else "x86";
-
-  desktopItem = makeDesktopItem {
-    desktopName = "World of Goo";
-    genericName = "World of Goo";
-    categories = [ "Game" ];
-    exec = "WorldOfGoo.bin.${arch}";
-    icon = "2dboy-worldofgoo";
-    name = "worldofgoo";
-  };
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "WorldOfGoo";
-  version = "1.53";
-
-  helpMsg = ''
-    We cannot download the full version automatically, as you require a license.
-    Once you have bought a license, you need to add your downloaded version to the nix store.
-    You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux.${version}.sh"
-    in the directory where you saved it.
-  '';
-
-  src = requireFile {
-    message = helpMsg;
-    name = "WorldOfGoo.Linux.1.53.sh";
-    sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  sourceRoot = pname;
-
-  libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer
-    libogg libvorbis ];
-
-  unpackPhase = ''
-    # The game is distributed as a shell script, with a tar of mojosetup, and a
-    # zip archive attached to the end. Therefore a simple unzip does the job.
-    # However, to avoid unzip errors, we need to strip those out first.
-    tail -c +421887 ${src} > ${src}.zip
-    unzip -q ${src}.zip -d ${pname}
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/256x256/apps
-
-    install -t $out/bin -m755 data/${arch}/WorldOfGoo.bin.${arch}
-    cp -R data/noarch/* $out/bin
-    cp data/noarch/game/gooicon.png $out/share/icons/hicolor/256x256/apps/2dboy-worldofgoo.png
-    cp ${desktopItem}/share/applications/worldofgoo.desktop \
-      $out/share/applications/worldofgoo.desktop
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath $out/bin/WorldOfGoo.bin.${arch}
-  '';
-
-  meta = with lib; {
-    description = "Physics based puzzle game";
-    longDescription = ''
-      World of Goo is a physics based puzzle / construction game. The millions of Goo
-      Balls who live in the beautiful World of Goo don't know that they are in a
-      game, or that they are extremely delicious.
-    '';
-    homepage = "https://worldofgoo.com";
-    license = licenses.unfree;
-    platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with maintainers; [ jcumming ];
-  };
-}
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
index d0b5c09a101d..08b18f38672c 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  fetchpatch,
   python3,
 }:
 mkKdeDerivation {
@@ -7,6 +8,16 @@ mkKdeDerivation {
 
   outputs = [ "out" ];
 
+  patches = [
+    # Cherry-pick fix for not finding libmount include path correctly
+    # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/486
+    # FIXME: remove in next update
+    (fetchpatch {
+      url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/1cc17521fefd7adb0631d24a03497bcf63b9512d.patch";
+      hash = "sha256-4NbhsVf14YuFHumbnXRgMcS3i/LZUDdrCWHrjHSjuo0=";
+    })
+  ];
+
   # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
   # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
   propagatedNativeBuildInputs = [
diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix
index 331bdee02b31..bc478ed582cc 100644
--- a/pkgs/kde/frameworks/kwallet/default.nix
+++ b/pkgs/kde/frameworks/kwallet/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   libgcrypt,
-  kcrash,
   kdoctools,
 }:
 mkKdeDerivation {
@@ -9,7 +8,6 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     libgcrypt
-    kcrash
     kdoctools
   ];
 }
diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix
index de9c6faa951f..04a79eae8e69 100644
--- a/pkgs/kde/gear/akonadi-search/default.nix
+++ b/pkgs/kde/gear/akonadi-search/default.nix
@@ -7,7 +7,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-E+QaicYnFF79FDIhhvuEPQLikiLk5oKIjvLA132RUZo=",
+  cargoHash ? "sha256-9cwNQSw0ueWyyL/qgWXXqIRsi4Lk/DX48CIbvQFNgP8=",
 }:
 mkKdeDerivation rec {
   pname = "akonadi-search";
diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix
index f01906491453..b535a36e1786 100644
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@@ -8,7 +8,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-B3M5tkmftR4nFbPAQqJDvvPidVGxq/8zH0KRgpBR92w=",
+  cargoHash ? "sha256-gE3wrRI8TaiA6LNqyrpEuw8ALnprGjzWQduCckG1Eo0=",
   qcoro,
 }:
 mkKdeDerivation rec {
diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix
index 39327304ac3f..7cdcd1efec63 100644
--- a/pkgs/kde/gear/kalzium/default.nix
+++ b/pkgs/kde/gear/kalzium/default.nix
@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  fetchpatch,
   pkg-config,
   ocaml,
   eigen,
@@ -11,15 +10,6 @@
 mkKdeDerivation {
   pname = "kalzium";
 
-  patches = [
-    # Fix build with Qt 6.8
-    # FIXME: remove in next major update
-    (fetchpatch {
-      url = "https://invent.kde.org/education/kalzium/-/commit/557d9bc96636f413430d0789cbf775915fc0dc45.patch";
-      hash = "sha256-KDCT/COqk7OTuF8pN7qrRrIPRU4PSGm+efpCDGbtZwA=";
-    })
-  ];
-
   # FIXME: look into how to make it find libfacile
   extraNativeBuildInputs = [
     pkg-config
diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix
index 8684233a9d42..f45370fc1426 100644
--- a/pkgs/kde/gear/kdepim-addons/default.nix
+++ b/pkgs/kde/gear/kdepim-addons/default.nix
@@ -8,7 +8,7 @@
   corrosion,
   alpaka,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-t7izRAYjuCYA0YMZaCnvwbVo2UvfTTvdlYUd69T6w/Q=",
+  cargoHash ? "sha256-2t4i7lTJxVNjsU5eO6svadZBIerSyXt6BMScpEl119s=",
 }:
 mkKdeDerivation rec {
   pname = "kdepim-addons";
diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix
index cf506b1f91cc..5a2b02b41530 100644
--- a/pkgs/kde/gear/kdevelop/default.nix
+++ b/pkgs/kde/gear/kdevelop/default.nix
@@ -39,7 +39,7 @@ mkKdeDerivation {
   ];
 
   extraCmakeFlags = [
-    "-DCLANG_BUILTIN_DIR=${libclang.lib}/lib/clang/${lib.versions.major libclang.version}/include"
+    "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include"
     "-DAPR_CONFIG_PATH=${apr.dev}/bin"
     "-DAPU_CONFIG_PATH=${aprutil.dev}/bin"
   ];
diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix
index 7953ec021b64..b021413b9328 100644
--- a/pkgs/kde/gear/kmailtransport/default.nix
+++ b/pkgs/kde/gear/kmailtransport/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kconfigwidgets,
+}:
 mkKdeDerivation {
   pname = "kmailtransport";
+
+  extraBuildInputs = [ kconfigwidgets ];
 }
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index 9bc6f8d4c125..1ac78bdc0813 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -162,7 +162,6 @@
       "kxmlgui"
     ],
     "amarok": [
-      "attica",
       "extra-cmake-modules",
       "karchive",
       "kcmutils",
@@ -172,7 +171,6 @@
       "kcoreaddons",
       "kcrash",
       "kdbusaddons",
-      "kdeclarative",
       "kdnssd",
       "kdoctools",
       "kglobalaccel",
@@ -184,6 +182,7 @@
       "knewstuff",
       "knotifications",
       "kpackage",
+      "kstatusnotifieritem",
       "ktexteditor",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -192,17 +191,6 @@
       "solid",
       "threadweaver"
     ],
-    "amor": [
-      "extra-cmake-modules",
-      "kconfig",
-      "kcoreaddons",
-      "kdbusaddons",
-      "kdoctools",
-      "ki18n",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui"
-    ],
     "analitza": [
       "extra-cmake-modules"
     ],
@@ -267,9 +255,6 @@
       "kirigami",
       "knewstuff"
     ],
-    "atcore": [
-      "extra-cmake-modules"
-    ],
     "atlantik": [
       "extra-cmake-modules",
       "kconfig",
@@ -508,7 +493,6 @@
       "kjobwidgets",
       "knotifications",
       "knotifyconfig",
-      "kparts",
       "ktextwidgets",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -573,24 +557,6 @@
       "ktextwidgets",
       "kwidgetsaddons"
     ],
-    "choqok": [
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfigwidgets",
-      "kcoreaddons",
-      "kdoctools",
-      "kglobalaccel",
-      "ki18n",
-      "kio",
-      "knotifications",
-      "knotifyconfig",
-      "ktextwidgets",
-      "kwallet",
-      "kwidgetsaddons",
-      "kxmlgui",
-      "purpose",
-      "sonnet"
-    ],
     "codevis": [
       "extra-cmake-modules",
       "kcmutils",
@@ -618,6 +584,10 @@
     "croutons": [
       "extra-cmake-modules"
     ],
+    "crow-translate": [
+      "extra-cmake-modules",
+      "kwayland"
+    ],
     "daykountdown": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -953,6 +923,7 @@
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
+      "kcrash",
       "kfilemetadata",
       "ki18n",
       "kiconthemes",
@@ -1023,6 +994,7 @@
     "itinerary": [
       "extra-cmake-modules",
       "karchive",
+      "kcolorscheme",
       "kconfig",
       "kcontacts",
       "kcoreaddons",
@@ -1049,6 +1021,7 @@
       "prison",
       "qqc2-breeze-style",
       "qqc2-desktop-style",
+      "qtkeychain",
       "selenium-webdriver-at-spi"
     ],
     "juk": [
@@ -1413,8 +1386,8 @@
     "kbookmarks": [
       "extra-cmake-modules",
       "kconfig",
-      "kconfigwidgets",
-      "kcoreaddons"
+      "kcoreaddons",
+      "kwidgetsaddons"
     ],
     "kbounce": [
       "extra-cmake-modules",
@@ -1972,9 +1945,15 @@
     ],
     "kdev-python": [
       "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
       "kdevelop",
       "ki18n",
+      "kparts",
+      "kservice",
       "ktexteditor",
+      "kwidgetsaddons",
+      "kxmlgui",
       "threadweaver"
     ],
     "kdev-ruby": [
@@ -2149,6 +2128,7 @@
     "keysmith": [
       "extra-cmake-modules",
       "kconfig",
+      "kcoreaddons",
       "kdbusaddons",
       "kguiaddons",
       "ki18n",
@@ -2380,7 +2360,7 @@
       "extra-cmake-modules",
       "karchive",
       "kcolorscheme",
-      "kconfigwidgets",
+      "kconfig",
       "ki18n",
       "kwidgetsaddons"
     ],
@@ -2517,7 +2497,6 @@
       "kcolorscheme",
       "kcompletion",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
       "kdbusaddons",
@@ -2603,16 +2582,6 @@
       "ki18n",
       "kio"
     ],
-    "kipi-plugins": [
-      "extra-cmake-modules",
-      "kconfig",
-      "ki18n",
-      "kio",
-      "kwindowsystem",
-      "kxmlgui",
-      "libkipi",
-      "libmediawiki"
-    ],
     "kirigami": [
       "extra-cmake-modules"
     ],
@@ -2695,23 +2664,6 @@
       "knotifications",
       "kwidgetsaddons"
     ],
-    "kjots": [
-      "akonadi",
-      "akonadi-notes",
-      "extra-cmake-modules",
-      "kbookmarks",
-      "kcmutils",
-      "kconfig",
-      "kconfigwidgets",
-      "kio",
-      "kmime",
-      "kontactinterface",
-      "kparts",
-      "kpimtextedit",
-      "ktextaddons",
-      "ktexttemplate",
-      "kxmlgui"
-    ],
     "kjournald": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -3096,39 +3048,6 @@
       "libkdegames",
       "libplasma"
     ],
-    "knotes": [
-      "akonadi",
-      "akonadi-notes",
-      "akonadi-search",
-      "extra-cmake-modules",
-      "grantleetheme",
-      "kcalutils",
-      "kcmutils",
-      "kcompletion",
-      "kconfig",
-      "kcoreaddons",
-      "kcrash",
-      "kdnssd",
-      "kdoctools",
-      "kglobalaccel",
-      "kiconthemes",
-      "kitemmodels",
-      "kitemviews",
-      "kmime",
-      "knewstuff",
-      "knotifications",
-      "knotifyconfig",
-      "kontactinterface",
-      "kparts",
-      "kstatusnotifieritem",
-      "ktextaddons",
-      "ktexttemplate",
-      "ktextwidgets",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui",
-      "pimcommon"
-    ],
     "knotifications": [
       "extra-cmake-modules",
       "kconfig"
@@ -3138,8 +3057,7 @@
       "ki18n",
       "kio",
       "knotifications",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "kodaskanna": [
       "extra-cmake-modules",
@@ -3238,8 +3156,10 @@
     "kongress": [
       "extra-cmake-modules",
       "kcalendarcore",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kirigami",
@@ -3374,25 +3294,6 @@
       "kholidays",
       "ki18n"
     ],
-    "kopete": [
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfig",
-      "kcontacts",
-      "kcoreaddons",
-      "kcrash",
-      "kdbusaddons",
-      "kdnssd",
-      "kdoctools",
-      "ki18n",
-      "kidentitymanagement",
-      "knotifyconfig",
-      "kparts",
-      "ktexteditor",
-      "kwallet",
-      "libkleo",
-      "phonon"
-    ],
     "korganizer": [
       "akonadi",
       "akonadi-calendar",
@@ -3486,7 +3387,6 @@
       "kwidgetsaddons",
       "kxmlgui",
       "libkdcraw",
-      "marble",
       "phonon",
       "purpose"
     ],
@@ -3591,7 +3491,6 @@
       "kcrash",
       "kdoctools",
       "ki18n",
-      "kiconthemes",
       "ktextwidgets",
       "kwidgetsaddons",
       "kxmlgui"
@@ -3697,6 +3596,7 @@
       "kitemviews",
       "knotifications",
       "kparts",
+      "kstatusnotifieritem",
       "ktextwidgets",
       "kwallet",
       "kwidgetsaddons",
@@ -3951,7 +3851,6 @@
       "kio",
       "kjobwidgets",
       "kparts",
-      "ktextwidgets",
       "kxmlgui",
       "sonnet",
       "syntax-highlighting"
@@ -3961,9 +3860,9 @@
     ],
     "ktextwidgets": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
-      "kconfigwidgets",
       "ki18n",
       "kwidgetsaddons",
       "sonnet"
@@ -3987,6 +3886,7 @@
       "kcmutils",
       "kconfig",
       "kconfigwidgets",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "ki18n",
@@ -4050,6 +3950,7 @@
       "kconfig",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kirigami",
       "kirigami-addons",
@@ -4095,6 +3996,15 @@
       "kxmlgui",
       "libkdegames"
     ],
+    "kuickshow": [
+      "extra-cmake-modules",
+      "kdoctools",
+      "ki18n",
+      "kiconthemes",
+      "kio",
+      "kwindowsystem",
+      "kxmlgui"
+    ],
     "kunifiedpush": [
       "extra-cmake-modules",
       "kcmutils",
@@ -4112,6 +4022,7 @@
       "kcmutils",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kidletime",
@@ -4131,6 +4042,7 @@
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -4392,12 +4304,6 @@
       "kcontacts",
       "kwallet"
     ],
-    "libkipi": [
-      "extra-cmake-modules",
-      "kconfig",
-      "kservice",
-      "kxmlgui"
-    ],
     "libkleo": [
       "extra-cmake-modules",
       "kcodecs",
@@ -4468,10 +4374,6 @@
       "kio",
       "solid"
     ],
-    "libmediawiki": [
-      "extra-cmake-modules",
-      "kcoreaddons"
-    ],
     "libplasma": [
       "extra-cmake-modules",
       "karchive",
@@ -4497,9 +4399,6 @@
     "libqaccessibilityclient": [
       "extra-cmake-modules"
     ],
-    "libqmycroft": [
-      "extra-cmake-modules"
-    ],
     "licensedigger": [
       "extra-cmake-modules"
     ],
@@ -4550,6 +4449,7 @@
       "libkdepim",
       "mailimporter",
       "messagelib",
+      "phonon",
       "pimcommon"
     ],
     "mailimporter": [
@@ -5344,6 +5244,7 @@
       "extra-cmake-modules",
       "kcmutils",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kirigami-addons"
@@ -5406,7 +5307,8 @@
       "solid"
     ],
     "plasma-wayland-protocols": [
-      "extra-cmake-modules"
+      "extra-cmake-modules",
+      "wayland"
     ],
     "plasma-welcome": [
       "extra-cmake-modules",
@@ -5659,6 +5561,7 @@
       "extra-cmake-modules",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kio",
       "kirigami",
@@ -5847,6 +5750,7 @@
       "knewstuff",
       "knotifyconfig",
       "kparts",
+      "krunner",
       "kwallet",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -5892,6 +5796,7 @@
       "kconfig",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kio",
@@ -6025,6 +5930,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kconfigwidgets",
+      "kcrash",
       "kdoctools",
       "kfilemetadata",
       "ki18n",
@@ -6065,6 +5971,7 @@
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdeclarative",
       "ki18n",
@@ -6081,6 +5988,11 @@
       "qtkeychain",
       "selenium-webdriver-at-spi"
     ],
+    "trojita": [
+      "akonadi-contacts",
+      "extra-cmake-modules",
+      "sonnet"
+    ],
     "umbrello": [
       "extra-cmake-modules",
       "karchive",
@@ -6192,6 +6104,7 @@
     "xwaylandvideobridge": [
       "extra-cmake-modules",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "knotifications",
       "kpipewire",
@@ -6229,5 +6142,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "10b4e2ea"
+  "version": "9fe21091"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index a4327d496d72..b9ff32e2e483 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -1921,6 +1921,7 @@
     "MIT"
   ],
   "ktexttemplate": [
+    "BSD-2-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later"
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 44709ad504a0..e3aa269e5dd0 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -372,7 +372,7 @@
     "repo_path": "games/atlantik"
   },
   "attica": {
-    "description": "Attica is a Qt library that implements the Open Collaboration Services API.\n\nMailing list: https://lists.freedesktop.org/mailman/listinfo/ocs\nInternet Relay Chat: #ocs@freenode",
+    "description": "Attica is a Qt library that implements the Open Collaboration Services API.",
     "name": "attica",
     "project_path": "frameworks/attica",
     "repo_path": "frameworks/attica"
@@ -744,7 +744,7 @@
     "repo_path": "packaging/craft-blueprints-community"
   },
   "craft-blueprints-kde": {
-    "description": "Project build blueprints for Craft \u2014 the meta build system and package manager",
+    "description": "Project build blueprints for Craft - the meta build system and package manager",
     "name": "craft-blueprints-kde",
     "project_path": "kdesupport/craft-blueprints-kde",
     "repo_path": "packaging/craft-blueprints-kde"
@@ -1073,6 +1073,12 @@
     "project_path": "extragear/edu/gcompris-data",
     "repo_path": "education/gcompris-data"
   },
+  "geonames-data": {
+    "description": "Cache of geo name exports from geonames.org",
+    "name": "geonames-data",
+    "project_path": "playground/packaging/geonames-data",
+    "repo_path": "packaging/geonames-data"
+  },
   "gestures-kde": {
     "description": "Handles gestures of multi touch input devices",
     "name": "gestures-kde",
@@ -1739,6 +1745,18 @@
     "project_path": "extragear/system/kde-inotify-survey",
     "repo_path": "system/kde-inotify-survey"
   },
+  "kde-linux": {
+    "description": "",
+    "name": "kde-linux",
+    "project_path": "kde-linux/kde-linux",
+    "repo_path": "kde-linux/kde-linux"
+  },
+  "kde-linux-packages": {
+    "description": "",
+    "name": "kde-linux-packages",
+    "project_path": "kde-linux/kde-linux-packages",
+    "repo_path": "kde-linux/kde-linux-packages"
+  },
   "kde-nomodeset": {
     "description": "Safe Graphics Mode Startup Utility",
     "name": "kde-nomodeset",
@@ -3494,7 +3512,7 @@
   "krdp": {
     "description": "Library and examples for creating an RDP server.",
     "name": "krdp",
-    "project_path": "playground/libs/krdp",
+    "project_path": "kde/workspace/krdp",
     "repo_path": "plasma/krdp"
   },
   "krecipes": {
@@ -3668,7 +3686,7 @@
   "ksanecore": {
     "description": "Library providing logic to interface scanners",
     "name": "ksanecore",
-    "project_path": "libraries/ksanecore",
+    "project_path": "extragear/libraries/ksanecore",
     "repo_path": "libraries/ksanecore"
   },
   "ksaneplugin": {
@@ -4106,7 +4124,7 @@
   "kunifiedpush": {
     "description": "UnifiedPush client components",
     "name": "kunifiedpush",
-    "project_path": "libraries/kunifiedpush",
+    "project_path": "playground/libraries/kunifiedpush",
     "repo_path": "libraries/kunifiedpush"
   },
   "kunitconversion": {
@@ -4850,7 +4868,7 @@
   "mimetreeparser": {
     "description": "Parser for MIME trees",
     "name": "mimetreeparser",
-    "project_path": "playground/pim/mimetreeparser",
+    "project_path": "kde/pim/mimetreeparser",
     "repo_path": "pim/mimetreeparser"
   },
   "ministro": {
@@ -5802,7 +5820,7 @@
     "repo_path": "libraries/pykde5"
   },
   "qca": {
-    "description": "Qt Cryptographic Architecture \u2014 straightforward cross-platform crypto API",
+    "description": "Qt Cryptographic Architecture - straightforward cross-platform crypto API",
     "name": "qca",
     "project_path": "kdesupport/qca",
     "repo_path": "libraries/qca"
@@ -5966,7 +5984,7 @@
   "repo-management": {
     "description": "This project contains the hooks and scripts that power the KDE git infrastructure.",
     "name": "repo-management",
-    "project_path": "repo-management",
+    "project_path": "sysadmin/repo-management",
     "repo_path": "sysadmin/repo-management"
   },
   "ring-kde": {
@@ -6852,7 +6870,7 @@
     "repo_path": null
   },
   "websites-20years-kde-org": {
-    "description": "Website for the \"20 years of KDE\" book \u2014 20years.kde.org",
+    "description": "Website for the \"20 years of KDE\" book - 20years.kde.org",
     "name": "websites-20years-kde-org",
     "project_path": "websites/20years-kde-org",
     "repo_path": "websites/20years-kde-org"
@@ -6918,61 +6936,61 @@
     "repo_path": "websites/akademy-registration"
   },
   "websites-akademy-schedule-kde-org": {
-    "description": "Website for the Akademy schedule \u2014 akademy-schedule.kde.org",
+    "description": "Website for the Akademy schedule - akademy-schedule.kde.org",
     "name": "websites-akademy-schedule-kde-org",
     "project_path": "websites/akademy-schedule-kde-org",
     "repo_path": "websites/akademy-schedule-kde-org"
   },
   "websites-akademy2004-kde-org": {
-    "description": "Static copy of the 2004 Conference (Akademy) website \u2014 conference2004.kde.org",
+    "description": "Static copy of the 2004 Conference (Akademy) website - conference2004.kde.org",
     "name": "websites-akademy2004-kde-org",
     "project_path": "websites/akademy2004-kde-org",
     "repo_path": "websites/akademy2004-kde-org"
   },
   "websites-akademy2005-kde-org": {
-    "description": "Static copy of the 2005 Conference (Akademy) website \u2014 conference2005.kde.org",
+    "description": "Static copy of the 2005 Conference (Akademy) website - conference2005.kde.org",
     "name": "websites-akademy2005-kde-org",
     "project_path": "websites/akademy2005-kde-org",
     "repo_path": "websites/akademy2005-kde-org"
   },
   "websites-akademy2006-kde-org": {
-    "description": "Static copy of the Akademy 2006 website \u2014 akademy2006.kde.org",
+    "description": "Static copy of the Akademy 2006 website - akademy2006.kde.org",
     "name": "websites-akademy2006-kde-org",
     "project_path": "websites/akademy2006-kde-org",
     "repo_path": "websites/akademy2006-kde-org"
   },
   "websites-akademy2007-kde-org": {
-    "description": "Static copy of the Akademy 2007 website \u2014 akademy2007.kde.org",
+    "description": "Static copy of the Akademy 2007 website - akademy2007.kde.org",
     "name": "websites-akademy2007-kde-org",
     "project_path": "websites/akademy2007-kde-org",
     "repo_path": "websites/akademy2007-kde-org"
   },
   "websites-akademy2008-kde-org": {
-    "description": "Static copy of the Akademy 2008 website \u2014 akademy2008.kde.org",
+    "description": "Static copy of the Akademy 2008 website - akademy2008.kde.org",
     "name": "websites-akademy2008-kde-org",
     "project_path": "websites/akademy2008-kde-org",
     "repo_path": "websites/akademy2008-kde-org"
   },
   "websites-akademy2009-kde-org": {
-    "description": "Static copy of the Akademy 2009 website \u2014 akademy2009.kde.org",
+    "description": "Static copy of the Akademy 2009 website - akademy2009.kde.org",
     "name": "websites-akademy2009-kde-org",
     "project_path": "websites/akademy2009-kde-org",
     "repo_path": "websites/akademy2009-kde-org"
   },
   "websites-akademy2010-kde-org": {
-    "description": "Static copy of the Akademy 2010 website \u2014 akademy2010.kde.org",
+    "description": "Static copy of the Akademy 2010 website - akademy2010.kde.org",
     "name": "websites-akademy2010-kde-org",
     "project_path": "websites/akademy2010-kde-org",
     "repo_path": "websites/akademy2010-kde-org"
   },
   "websites-akademy2012-kde-org": {
-    "description": "Static copy of the Akademy 2012 website \u2014 akademy2012.kde.org",
+    "description": "Static copy of the Akademy 2012 website - akademy2012.kde.org",
     "name": "websites-akademy2012-kde-org",
     "project_path": "websites/akademy2012-kde-org",
     "repo_path": "websites/akademy2012-kde-org"
   },
   "websites-amarok-kde-org": {
-    "description": "Static copy of the Amarok website \u2014 amarok.kde.org",
+    "description": "Static copy of the Amarok website - amarok.kde.org",
     "name": "websites-amarok-kde-org",
     "project_path": "websites/amarok-kde-org",
     "repo_path": "websites/amarok-kde-org"
@@ -6984,7 +7002,7 @@
     "repo_path": "websites/api-kde-org"
   },
   "websites-apps-kde-org": {
-    "description": "KDE application catalog \u2014 apps.kde.org",
+    "description": "KDE application catalog - apps.kde.org",
     "name": "websites-apps-kde-org",
     "project_path": "websites/apps-kde-org",
     "repo_path": "websites/apps-kde-org"
@@ -7008,7 +7026,7 @@
     "repo_path": "websites/autoconfig-kde-org"
   },
   "websites-ballot-kde-org": {
-    "description": "Ugly, simple, and very secure voting system \u2014 ballot.kde.org",
+    "description": "Ugly, simple, and very secure voting system - ballot.kde.org",
     "name": "websites-ballot-kde-org",
     "project_path": "websites/ballot-kde-org",
     "repo_path": "websites/ballot-kde-org"
@@ -7020,13 +7038,13 @@
     "repo_path": "websites/blogs-kde-org"
   },
   "websites-br-qtcon-org": {
-    "description": "Website for QtCon Brazil \u2014 br.qtcon.org",
+    "description": "Website for QtCon Brazil - br.qtcon.org",
     "name": "websites-br-qtcon-org",
     "project_path": "websites/br-qtcon-org",
     "repo_path": "websites/br-qtcon-org"
   },
   "websites-bugs-kde-org": {
-    "description": "Modified sources for the KDE Bugtracking System \u2014 bugs.kde.org",
+    "description": "Modified sources for the KDE Bugtracking System - bugs.kde.org",
     "name": "websites-bugs-kde-org",
     "project_path": "websites/bugs-kde-org",
     "repo_path": "websites/bugs-kde-org"
@@ -7038,7 +7056,7 @@
     "repo_path": "websites/buzz-kde-org"
   },
   "websites-calligra-org": {
-    "description": "Website for Calligra \u2014 calligra.org",
+    "description": "Website for Calligra - calligra.org",
     "name": "websites-calligra-org",
     "project_path": "websites/calligra-org",
     "repo_path": "websites/calligra-org"
@@ -7050,7 +7068,7 @@
     "repo_path": "websites/camp-kde-org"
   },
   "websites-cantor-kde-org": {
-    "description": "Website for Cantor \u2014 cantor.kde.org",
+    "description": "Website for Cantor - cantor.kde.org",
     "name": "websites-cantor-kde-org",
     "project_path": "websites/cantor-kde-org",
     "repo_path": "websites/cantor-kde-org"
@@ -7062,55 +7080,55 @@
     "repo_path": "websites/capacity"
   },
   "websites-choqok-kde-org": {
-    "description": "Website for Choqok \u2014 choqok.kde.org",
+    "description": "Website for Choqok - choqok.kde.org",
     "name": "websites-choqok-kde-org",
     "project_path": "websites/choqok-kde-org",
     "repo_path": "websites/choqok-kde-org"
   },
   "websites-commit-digest-kde-org": {
-    "description": "Static copy of the KDE Commit Digest \u2014 commit-digest.kde.org",
+    "description": "Static copy of the KDE Commit Digest - commit-digest.kde.org",
     "name": "websites-commit-digest-kde-org",
     "project_path": "websites/commit-digest-kde-org",
     "repo_path": "websites/commit-digest-kde-org"
   },
   "websites-conf-kde-in": {
-    "description": "Website for the KDE India Conference \u2014 conf.kde.in",
+    "description": "Website for the KDE India Conference - conf.kde.in",
     "name": "websites-conf-kde-in",
     "project_path": "websites/conf-kde-in",
     "repo_path": "websites/conf-kde-in"
   },
   "websites-conf-kde-org": {
-    "description": "Conference planning and management system \u2014 conf.kde.org",
+    "description": "Conference planning and management system - conf.kde.org",
     "name": "websites-conf-kde-org",
     "project_path": "websites/conf-kde-org",
     "repo_path": "websites/conf-kde-org"
   },
   "websites-conf-qtcon-org": {
-    "description": "Static archive of the QtCon Conference Organization system \u2014 conf.qtcon.org",
+    "description": "Static archive of the QtCon Conference Organization system - conf.qtcon.org",
     "name": "websites-conf-qtcon-org",
     "project_path": "websites/conf-qtcon-org",
     "repo_path": "websites/conf-qtcon-org"
   },
   "websites-contents-neon-kde-org": {
-    "description": "REST API for Neon package contents queries \u2014 contents.neon.kde.org",
+    "description": "REST API for Neon package contents queries - contents.neon.kde.org",
     "name": "websites-contents-neon-kde-org",
     "project_path": "websites/contents-neon-kde-org",
     "repo_path": "websites/contents-neon-kde-org"
   },
   "websites-cutehmi-kde-org": {
-    "description": "Website for CuteHMI \u2014 cutehmi.kde.org",
+    "description": "Website for CuteHMI - cutehmi.kde.org",
     "name": "websites-cutehmi-kde-org",
     "project_path": "websites/cutehmi-kde-org",
     "repo_path": "websites/cutehmi-kde-org"
   },
   "websites-desktopsummit-org": {
-    "description": "Static copy of the DesktopSummit website \u2014 desktopsummit.org",
+    "description": "Static copy of the DesktopSummit website - desktopsummit.org",
     "name": "websites-desktopsummit-org",
     "project_path": "websites/desktopsummit-org",
     "repo_path": "websites/desktopsummit-org"
   },
   "websites-digikam-org": {
-    "description": "Website for digiKam \u2014 digikam.org",
+    "description": "Website for digiKam - digikam.org",
     "name": "websites-digikam-org",
     "project_path": "websites/digikam-org",
     "repo_path": "websites/digikam-org"
@@ -7122,7 +7140,7 @@
     "repo_path": "websites/discover-kde-org"
   },
   "websites-docs-glaxnimate-org": {
-    "description": "Documentation website for Glaxnimate \u2014 docs.glaxnimate.org",
+    "description": "Documentation website for Glaxnimate - docs.glaxnimate.org",
     "name": "websites-docs-glaxnimate-org",
     "project_path": "websites/docs-glaxnimate-org",
     "repo_path": "websites/docs-glaxnimate-org"
@@ -7140,7 +7158,7 @@
     "repo_path": "websites/dot-kde-org"
   },
   "websites-download-kde-org": {
-    "description": "MirrorBrain configuration, templates, etc. \u2014 download.kde.org",
+    "description": "MirrorBrain configuration, templates, etc. - download.kde.org",
     "name": "websites-download-kde-org",
     "project_path": "websites/download-kde-org",
     "repo_path": "websites/download-kde-org"
@@ -7152,25 +7170,25 @@
     "repo_path": "websites/eco-kde-org"
   },
   "websites-edu-kde-org": {
-    "description": "Website for KDE's educational software \u2014 edu.kde.org",
+    "description": "Website for KDE's educational software - edu.kde.org",
     "name": "websites-edu-kde-org",
     "project_path": "websites/edu-kde-org",
     "repo_path": "websites/edu-kde-org"
   },
   "websites-elisa-kde-org": {
-    "description": "Website for Elisa \u2014 elisa.kde.org",
+    "description": "Website for Elisa - elisa.kde.org",
     "name": "websites-elisa-kde-org",
     "project_path": "websites/elisa-kde-org",
     "repo_path": "websites/elisa-kde-org"
   },
   "websites-ev-kde-org": {
-    "description": "Website for KDE e.V. \u2014 ev.kde.org",
+    "description": "Website for KDE e.V. - ev.kde.org",
     "name": "websites-ev-kde-org",
     "project_path": "websites/ev-kde-org",
     "repo_path": "websites/ev-kde-org"
   },
   "websites-events-kde-org": {
-    "description": "Conference and sprint attendance management system \u2014 events.kde.org",
+    "description": "Conference and sprint attendance management system - events.kde.org",
     "name": "websites-events-kde-org",
     "project_path": "websites/events-kde-org",
     "repo_path": "websites/events-kde-org"
@@ -7188,13 +7206,13 @@
     "repo_path": "websites/extensions-krita-org"
   },
   "websites-falkon-org": {
-    "description": "Website for Falkon \u2014 falkon.org",
+    "description": "Website for Falkon - falkon.org",
     "name": "websites-falkon-org",
     "project_path": "websites/falkon-org",
     "repo_path": "websites/falkon-org"
   },
   "websites-forum-kde-org": {
-    "description": "KDE Community Forum version of phpBB \u2014 forum.kde.org",
+    "description": "KDE Community Forum version of phpBB - forum.kde.org",
     "name": "websites-forum-kde-org",
     "project_path": "websites/forum-kde-org",
     "repo_path": "websites/forum-kde-org"
@@ -7212,13 +7230,13 @@
     "repo_path": "websites/fosdem-2021-website-static"
   },
   "websites-fr-kde-org": {
-    "description": "Website for the French KDE community \u2014 fr.kde.org",
+    "description": "Website for the French KDE community - fr.kde.org",
     "name": "websites-fr-kde-org",
     "project_path": "websites/fr-kde-org",
     "repo_path": "websites/fr-kde-org"
   },
   "websites-freebsd-kde-org": {
-    "description": "Website of the KDE/FreeBSD initiative \u2014 freebsd.kde.org",
+    "description": "Website of the KDE/FreeBSD initiative - freebsd.kde.org",
     "name": "websites-freebsd-kde-org",
     "project_path": "websites/freebsd-kde-org",
     "repo_path": "websites/freebsd-kde-org"
@@ -7230,13 +7248,13 @@
     "repo_path": "websites/fund-krita-org"
   },
   "websites-games-kde-org": {
-    "description": "Website for KDE's games \u2014 games.kde.org",
+    "description": "Website for KDE's games - games.kde.org",
     "name": "websites-games-kde-org",
     "project_path": "websites/games-kde-org",
     "repo_path": "websites/games-kde-org"
   },
   "websites-gcompris-net": {
-    "description": "Website for GCompris \u2014 gcompris.net",
+    "description": "Website for GCompris - gcompris.net",
     "name": "websites-gcompris-net",
     "project_path": "websites/gcompris-net",
     "repo_path": "websites/gcompris-net"
@@ -7248,7 +7266,7 @@
     "repo_path": "websites/ghostwriter-kde-org"
   },
   "websites-glaxnimate-org": {
-    "description": "Website for Glaxnimate \u2014 glaxnimate.org",
+    "description": "Website for Glaxnimate - glaxnimate.org",
     "name": "websites-glaxnimate-org",
     "project_path": "websites/glaxnimate-org",
     "repo_path": "websites/glaxnimate-org"
@@ -7290,7 +7308,7 @@
     "repo_path": "websites/hugo-kde-template"
   },
   "websites-i-kaidan-im": {
-    "description": "Easy XMPP invitation landing page for Kaidan \u2014 i.kaidan.im",
+    "description": "Easy XMPP invitation landing page for Kaidan - i.kaidan.im",
     "name": "websites-i-kaidan-im",
     "project_path": "websites/i-kaidan-im",
     "repo_path": "websites/i-kaidan-im"
@@ -7302,13 +7320,13 @@
     "repo_path": "websites/identity-kde-org"
   },
   "websites-inqlude": {
-    "description": "Tools for Inqlude, the Qt library archive \u2014 inqlude.org",
+    "description": "Tools for Inqlude, the Qt library archive - inqlude.org",
     "name": "websites-inqlude",
     "project_path": "websites/inqlude",
     "repo_path": "websites/inqlude"
   },
   "websites-inqlude-data": {
-    "description": "Metadata for Inqlude, the Qt library archive \u2014 inqlude.org",
+    "description": "Metadata for Inqlude, the Qt library archive - inqlude.org",
     "name": "websites-inqlude-data",
     "project_path": "websites/inqlude-data",
     "repo_path": "websites/inqlude-data"
@@ -7326,49 +7344,49 @@
     "repo_path": "websites/jointhegame-kde-org"
   },
   "websites-jp-kde-org": {
-    "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 \u2014 jp.kde.org",
+    "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 - jp.kde.org",
     "name": "websites-jp-kde-org",
     "project_path": "websites/jp-kde-org",
     "repo_path": "websites/jp-kde-org"
   },
   "websites-juk-kde-org": {
-    "description": "Website for JuK \u2014 juk.kde.org",
+    "description": "Website for JuK - juk.kde.org",
     "name": "websites-juk-kde-org",
     "project_path": "websites/juk-kde-org",
     "repo_path": "websites/juk-kde-org"
   },
   "websites-kaidan-im": {
-    "description": "Website for Kaidan \u2014 kaidan.im",
+    "description": "Website for Kaidan - kaidan.im",
     "name": "websites-kaidan-im",
     "project_path": "websites/kaidan-im",
     "repo_path": "websites/kaidan-im"
   },
   "websites-kate-editor-org": {
-    "description": "Website for Kate \u2014 kate-editor.org",
+    "description": "Website for Kate - kate-editor.org",
     "name": "websites-kate-editor-org",
     "project_path": "websites/kate-editor-org",
     "repo_path": "websites/kate-editor-org"
   },
   "websites-kde-china-org": {
-    "description": "Website for the Chinese KDE community \u2014 kde-china.org",
+    "description": "Website for the Chinese KDE community - kde-china.org",
     "name": "websites-kde-china-org",
     "project_path": "websites/kde-china-org",
     "repo_path": "websites/kde-china-org"
   },
   "websites-kde-in": {
-    "description": "Website for the Indian KDE community \u2014 kde.in",
+    "description": "Website for the Indian KDE community - kde.in",
     "name": "websites-kde-in",
     "project_path": "websites/kde-in",
     "repo_path": "websites/kde-in"
   },
   "websites-kde-org": {
-    "description": "Main KDE Community website \u2014 kde.org",
+    "description": "Main KDE Community website - kde.org",
     "name": "websites-kde-org",
     "project_path": "websites/kde-org",
     "repo_path": "websites/kde-org"
   },
   "websites-kde-org-announcements-releases": {
-    "description": "Website for KDE.org release announcements \u2014 kde.org/announcements/releases",
+    "description": "Website for KDE.org release announcements - kde.org/announcements/releases",
     "name": "websites-kde-org-announcements-releases",
     "project_path": "websites/kde-org-announcements-releases",
     "repo_path": "websites/kde-org-announcements-releases"
@@ -7380,25 +7398,25 @@
     "repo_path": "websites/kde-org-applications-extractor"
   },
   "websites-kde-ru": {
-    "description": "Website for the Russian KDE community \u2014 kde.ru",
+    "description": "Website for the Russian KDE community - kde.ru",
     "name": "websites-kde-ru",
     "project_path": "websites/kde-ru",
     "repo_path": "websites/kde-ru"
   },
   "websites-kdeconnect-kde-org": {
-    "description": "Website for KDE Connect \u2014 kdeconnect.kde.org",
+    "description": "Website for KDE Connect - kdeconnect.kde.org",
     "name": "websites-kdeconnect-kde-org",
     "project_path": "websites/kdeconnect-kde-org",
     "repo_path": "websites/kdeconnect-kde-org"
   },
   "websites-kdeitalia-it": {
-    "description": "Website for the Italian KDE community \u2014 kdeitalia.it",
+    "description": "Website for the Italian KDE community - kdeitalia.it",
     "name": "websites-kdeitalia-it",
     "project_path": "websites/kdeitalia-it",
     "repo_path": "websites/kdeitalia-it"
   },
   "websites-kdemail-net": {
-    "description": "E-mail service for KDE contributors \u2014 kdemail.net",
+    "description": "E-mail service for KDE contributors - kdemail.net",
     "name": "websites-kdemail-net",
     "project_path": "websites/kdemail-net",
     "repo_path": "websites/kdemail-net"
@@ -7410,13 +7428,13 @@
     "repo_path": "websites/kdenlive-org"
   },
   "websites-kdesrc-build-kde-org": {
-    "description": "Website for kdesrc-build \u2014 kdesrc-build.kde.org",
+    "description": "Website for kdesrc-build - kdesrc-build.kde.org",
     "name": "websites-kdesrc-build-kde-org",
     "project_path": "websites/kdesrc-build-kde-org",
     "repo_path": "websites/kdesrc-build-kde-org"
   },
   "websites-kdetalk-net": {
-    "description": "Website for KDE's Jabber server \u2014 kdetalk.net",
+    "description": "Website for KDE's Jabber server - kdetalk.net",
     "name": "websites-kdetalk-net",
     "project_path": "websites/kdetalk-net",
     "repo_path": "websites/kdetalk-net"
@@ -7440,19 +7458,19 @@
     "repo_path": "websites/kgeotag-kde-org"
   },
   "websites-kid3-kde-org": {
-    "description": "Website for Kid3 \u2014 kid3.kde.org",
+    "description": "Website for Kid3 - kid3.kde.org",
     "name": "websites-kid3-kde-org",
     "project_path": "websites/kid3-kde-org",
     "repo_path": "websites/kid3-kde-org"
   },
   "websites-kirogi-org": {
-    "description": "Website for Kirogi \u2014 kirogi.org",
+    "description": "Website for Kirogi - kirogi.org",
     "name": "websites-kirogi-org",
     "project_path": "websites/kirogi-org",
     "repo_path": "websites/kirogi-org"
   },
   "websites-kmymoney-org": {
-    "description": "Website for KMyMoney \u2014 kmymoney.org",
+    "description": "Website for KMyMoney - kmymoney.org",
     "name": "websites-kmymoney-org",
     "project_path": "websites/kmymoney-org",
     "repo_path": "websites/kmymoney-org"
@@ -7464,31 +7482,31 @@
     "repo_path": "websites/konqueror-org"
   },
   "websites-konsole-kde-org": {
-    "description": "Website for Konsole \u2014 konsole.kde.org",
+    "description": "Website for Konsole - konsole.kde.org",
     "name": "websites-konsole-kde-org",
     "project_path": "websites/konsole-kde-org",
     "repo_path": "websites/konsole-kde-org"
   },
   "websites-kontact-kde-org": {
-    "description": "Website for Kontact \u2014 kontact.kde.org",
+    "description": "Website for Kontact - kontact.kde.org",
     "name": "websites-kontact-kde-org",
     "project_path": "websites/kontact-kde-org",
     "repo_path": "websites/kontact-kde-org"
   },
   "websites-konversation-kde-org": {
-    "description": "Website for Konversation \u2014 konversation.kde.org",
+    "description": "Website for Konversation - konversation.kde.org",
     "name": "websites-konversation-kde-org",
     "project_path": "websites/konversation-kde-org",
     "repo_path": "websites/konversation-kde-org"
   },
   "websites-kpdf-kde-org": {
-    "description": "Static copy of the KPDF website \u2014 kpdf.kde.org",
+    "description": "Static copy of the KPDF website - kpdf.kde.org",
     "name": "websites-kpdf-kde-org",
     "project_path": "websites/kpdf-kde-org",
     "repo_path": "websites/kpdf-kde-org"
   },
   "websites-kphotoalbum-org": {
-    "description": "Website for KPhotoAlbum \u2014 kphotoalbum.org",
+    "description": "Website for KPhotoAlbum - kphotoalbum.org",
     "name": "websites-kphotoalbum-org",
     "project_path": "websites/kphotoalbum-org",
     "repo_path": "websites/kphotoalbum-org"
@@ -7506,31 +7524,31 @@
     "repo_path": "websites/krita-org-theme"
   },
   "websites-krusader-org": {
-    "description": "Website for Krusader \u2014 krusader.org",
+    "description": "Website for Krusader - krusader.org",
     "name": "websites-krusader-org",
     "project_path": "websites/krusader-org",
     "repo_path": "websites/krusader-org"
   },
   "websites-kst-plot-kde-org": {
-    "description": "Static copy of the Kst Plot website \u2014 kst-plot.kde.org",
+    "description": "Static copy of the Kst Plot website - kst-plot.kde.org",
     "name": "websites-kst-plot-kde-org",
     "project_path": "websites/kst-plot-kde-org",
     "repo_path": "websites/kst-plot-kde-org"
   },
   "websites-kstars-kde-org": {
-    "description": "Website for KStars \u2014 kstars.kde.org",
+    "description": "Website for KStars - kstars.kde.org",
     "name": "websites-kstars-kde-org",
     "project_path": "websites/kstars-kde-org",
     "repo_path": "websites/kstars-kde-org"
   },
   "websites-kube-kde-org": {
-    "description": "Website for Kube \u2014 kube-project.com",
+    "description": "Website for Kube - kube-project.com",
     "name": "websites-kube-kde-org",
     "project_path": "websites/kube-kde-org",
     "repo_path": "websites/kube-kde-org"
   },
   "websites-lakademy-kde-org": {
-    "description": "Website for LaKademy \u2014 lakademy.kde.org",
+    "description": "Website for LaKademy - lakademy.kde.org",
     "name": "websites-lakademy-kde-org",
     "project_path": "websites/lakademy-kde-org",
     "repo_path": "websites/lakademy-kde-org"
@@ -7548,13 +7566,13 @@
     "repo_path": "websites/lokalize-kde-org"
   },
   "websites-manifesto-kde-org": {
-    "description": "Website for the KDE Manifesto \u2014 manifesto.kde.org",
+    "description": "Website for the KDE Manifesto - manifesto.kde.org",
     "name": "websites-manifesto-kde-org",
     "project_path": "websites/manifesto-kde-org",
     "repo_path": "websites/manifesto-kde-org"
   },
   "websites-marble-kde-org": {
-    "description": "Website for Marble \u2014 marble.kde.org",
+    "description": "Website for Marble - marble.kde.org",
     "name": "websites-marble-kde-org",
     "project_path": "websites/marble-kde-org",
     "repo_path": "websites/marble-kde-org"
@@ -7590,13 +7608,13 @@
     "repo_path": "websites/mentorship-kde-org"
   },
   "websites-minuet-kde-org": {
-    "description": "Website for Minuet \u2014 minuet.kde.org",
+    "description": "Website for Minuet - minuet.kde.org",
     "name": "websites-minuet-kde-org",
     "project_path": "websites/minuet-kde-org",
     "repo_path": "websites/minuet-kde-org"
   },
   "websites-multimedia-kde-org": {
-    "description": "Website for KDE's multimedia software \u2014 multimedia.kde.org",
+    "description": "Website for KDE's multimedia software - multimedia.kde.org",
     "name": "websites-multimedia-kde-org",
     "project_path": "websites/multimedia-kde-org",
     "repo_path": "websites/multimedia-kde-org"
@@ -7620,7 +7638,7 @@
     "repo_path": "websites/necessitas-kde-org"
   },
   "websites-neon-kde-org": {
-    "description": "Website for Neon \u2014 neon.kde.org",
+    "description": "Website for Neon - neon.kde.org",
     "name": "websites-neon-kde-org",
     "project_path": "websites/neon-kde-org",
     "repo_path": "websites/neon-kde-org"
@@ -7632,7 +7650,7 @@
     "repo_path": "websites/neverland"
   },
   "websites-okular-kde-org": {
-    "description": "Website for Okular \u2014 okular.kde.org",
+    "description": "Website for Okular - okular.kde.org",
     "name": "websites-okular-kde-org",
     "project_path": "websites/okular-kde-org",
     "repo_path": "websites/okular-kde-org"
@@ -7644,13 +7662,13 @@
     "repo_path": "websites/paste-kde-org"
   },
   "websites-pe-kde-org": {
-    "description": "Website for the Peruvian KDE community \u2014 pe.kde.org",
+    "description": "Website for the Peruvian KDE community - pe.kde.org",
     "name": "websites-pe-kde-org",
     "project_path": "websites/pe-kde-org",
     "repo_path": "websites/pe-kde-org"
   },
   "websites-peruse-kde-org": {
-    "description": "Website for Peruse \u2014 peruse.kde.org",
+    "description": "Website for Peruse - peruse.kde.org",
     "name": "websites-peruse-kde-org",
     "project_path": "websites/peruse-kde-org",
     "repo_path": "websites/peruse-kde-org"
@@ -7662,13 +7680,13 @@
     "repo_path": "websites/phonon-kde-org"
   },
   "websites-planet-kde-org": {
-    "description": "Planet KDE website code and configuration \u2014 planet.kde.org",
+    "description": "Planet KDE website code and configuration - planet.kde.org",
     "name": "websites-planet-kde-org",
     "project_path": "websites/planet-kde-org",
     "repo_path": "websites/planet-kde-org"
   },
   "websites-plasma-bigscreen-org": {
-    "description": "Website for Plasma BigScreen \u2014 plasma-bigscreen.org",
+    "description": "Website for Plasma BigScreen - plasma-bigscreen.org",
     "name": "websites-plasma-bigscreen-org",
     "project_path": "websites/plasma-bigscreen-org",
     "repo_path": "websites/plasma-bigscreen-org"
@@ -7680,13 +7698,13 @@
     "repo_path": "websites/plasma-kde-org"
   },
   "websites-plasma-mobile-org": {
-    "description": "Website for Plasma Mobile \u2014 plasma-mobile.org",
+    "description": "Website for Plasma Mobile - plasma-mobile.org",
     "name": "websites-plasma-mobile-org",
     "project_path": "websites/plasma-mobile-org",
     "repo_path": "websites/plasma-mobile-org"
   },
   "websites-product-screenshots": {
-    "description": "Screenshots of KDE software for promotional use \u2014 cdn.kde.org/screenshots",
+    "description": "Screenshots of KDE software for promotional use - cdn.kde.org/screenshots",
     "name": "websites-product-screenshots",
     "project_path": "websites/product-screenshots",
     "repo_path": "websites/product-screenshots"
@@ -7728,7 +7746,7 @@
     "repo_path": "websites/rekonq-kde-org"
   },
   "websites-releases-neon-kde-org": {
-    "description": "Metadata of Neon releases \u2014 releases.neon.kde.org",
+    "description": "Metadata of Neon releases - releases.neon.kde.org",
     "name": "websites-releases-neon-kde-org",
     "project_path": "websites/releases-neon-kde-org",
     "repo_path": "websites/releases-neon-kde-org"
@@ -7746,13 +7764,13 @@
     "repo_path": "websites/reservoir"
   },
   "websites-rkward-kde-org": {
-    "description": "Website for RKWard \u2014 rkward.kde.org",
+    "description": "Website for RKWard - rkward.kde.org",
     "name": "websites-rkward-kde-org",
     "project_path": "websites/rkward-kde-org",
     "repo_path": "websites/rkward-kde-org"
   },
   "websites-rolisteam-org": {
-    "description": "Website for Rolisteam \u2014 rolisteam.org",
+    "description": "Website for Rolisteam - rolisteam.org",
     "name": "websites-rolisteam-org",
     "project_path": "websites/rolisteam-org",
     "repo_path": "websites/rolisteam-org"
@@ -7764,19 +7782,19 @@
     "repo_path": "websites/scripting-krita-org"
   },
   "websites-season-kde-org": {
-    "description": "Website to organize programs like Season of KDE \u2014 season.kde.org",
+    "description": "Website to organize programs like Season of KDE - season.kde.org",
     "name": "websites-season-kde-org",
     "project_path": "websites/season-kde-org",
     "repo_path": "websites/season-kde-org"
   },
   "websites-simon-kde-org": {
-    "description": "Static copy of the Drupal-based Simon website \u2014 simon.kde.org",
+    "description": "Static copy of the Drupal-based Simon website - simon.kde.org",
     "name": "websites-simon-kde-org",
     "project_path": "websites/simon-kde-org",
     "repo_path": "websites/simon-kde-org"
   },
   "websites-skrooge-org": {
-    "description": "Website for Skrooge \u2014 skrooge.org",
+    "description": "Website for Skrooge - skrooge.org",
     "name": "websites-skrooge-org",
     "project_path": "websites/skrooge-org",
     "repo_path": "websites/skrooge-org"
@@ -7812,13 +7830,13 @@
     "repo_path": "websites/sysadmin-kde-org-trellis"
   },
   "websites-telemetry-krita-org": {
-    "description": "Telemetry backend for Krita \u2014 telemetry.krita.org",
+    "description": "Telemetry backend for Krita - telemetry.krita.org",
     "name": "websites-telemetry-krita-org",
     "project_path": "websites/telemetry-krita-org",
     "repo_path": "websites/telemetry-krita-org"
   },
   "websites-timeline-kde-org": {
-    "description": "Website for community history timeline \u2014 timeline.kde.org",
+    "description": "Website for community history timeline - timeline.kde.org",
     "name": "websites-timeline-kde-org",
     "project_path": "websites/timeline-kde-org",
     "repo_path": "websites/timeline-kde-org"
@@ -7830,13 +7848,13 @@
     "repo_path": "websites/tr-kde-org"
   },
   "websites-umbrello-kde-org": {
-    "description": "Website for Umbrello \u2014 umbrello.kde.org",
+    "description": "Website for Umbrello - umbrello.kde.org",
     "name": "websites-umbrello-kde-org",
     "project_path": "websites/umbrello-kde-org",
     "repo_path": "websites/umbrello-kde-org"
   },
   "websites-utils-kde-org": {
-    "description": "Website for KDE's utilities \u2014 utils.kde.org",
+    "description": "Website for KDE's utilities - utils.kde.org",
     "name": "websites-utils-kde-org",
     "project_path": "websites/utils-kde-org",
     "repo_path": "websites/utils-kde-org"
@@ -7854,13 +7872,13 @@
     "repo_path": "websites/video-subtitles"
   },
   "websites-volunteers-akademy-kde-org": {
-    "description": "Volunteer management and coordination system \u2014 volunteers.akademy.kde.org",
+    "description": "Volunteer management and coordination system - volunteers.akademy.kde.org",
     "name": "websites-volunteers-akademy-kde-org",
     "project_path": "websites/volunteers-akademy-kde-org",
     "repo_path": "websites/volunteers-akademy-kde-org"
   },
   "websites-vvave-kde-org": {
-    "description": "Website for Vvave \u2014 vvave.kde.org",
+    "description": "Website for Vvave - vvave.kde.org",
     "name": "websites-vvave-kde-org",
     "project_path": "websites/vvave-kde-org",
     "repo_path": "websites/vvave-kde-org"
@@ -7872,25 +7890,25 @@
     "repo_path": "websites/vvave-stream-kde-org"
   },
   "websites-websvn-kde-org": {
-    "description": "KDE SVN repository browser \u2014 websvn.kde.org",
+    "description": "KDE SVN repository browser - websvn.kde.org",
     "name": "websites-websvn-kde-org",
     "project_path": "websites/websvn-kde-org",
     "repo_path": "websites/websvn-kde-org"
   },
   "websites-wiki-desktopsummit-org": {
-    "description": "Static copy of the DesktopSummit wiki \u2014 wiki.desktopsummit.org",
+    "description": "Static copy of the DesktopSummit wiki - wiki.desktopsummit.org",
     "name": "websites-wiki-desktopsummit-org",
     "project_path": "websites/wiki-desktopsummit-org",
     "repo_path": "websites/wiki-desktopsummit-org"
   },
   "websites-wiki-kde-org": {
-    "description": "Landing wiki list website \u2014 wiki.kde.org",
+    "description": "Landing wiki list website - wiki.kde.org",
     "name": "websites-wiki-kde-org",
     "project_path": "websites/wiki-kde-org",
     "repo_path": "websites/wiki-kde-org"
   },
   "websites-wiki-rolisteam-org": {
-    "description": "Rolisteam documentation (wiki) \u2014 doc.rolisteam.org",
+    "description": "Rolisteam documentation (wiki) - doc.rolisteam.org",
     "name": "websites-wiki-rolisteam-org",
     "project_path": "websites/wiki-rolisteam-org",
     "repo_path": "websites/wiki-rolisteam-org"
@@ -7914,7 +7932,7 @@
     "repo_path": "websites/yakuake-kde-org"
   },
   "websites-zanshin-kde-org": {
-    "description": "Website for Zanshin \u2014 zanshin.kde.org",
+    "description": "Website for Zanshin - zanshin.kde.org",
     "name": "websites-zanshin-kde-org",
     "project_path": "websites/zanshin-kde-org",
     "repo_path": "websites/zanshin-kde-org"
@@ -8108,7 +8126,7 @@
   "xwaylandvideobridge": {
     "description": "Utility to allow streaming Wayland windows to X applications",
     "name": "xwaylandvideobridge",
-    "project_path": "system/xwaylandvideobridge",
+    "project_path": "playground/system/xwaylandvideobridge",
     "repo_path": "system/xwaylandvideobridge"
   },
   "yakuake": {
diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index f5a2219941c7..a609999b7402 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/attica-6.7.0.tar.xz",
-    "hash": "sha256-2qXAe0dImeFrQnEOA9BZCTa84PVIACOdYz1IyqO+DX0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/attica-6.8.0.tar.xz",
+    "hash": "sha256-RDAKLQ7UZdmtsAI/rG1ns7Kb7CmaVP6j/zR32RGNH90="
   },
   "baloo": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/baloo-6.7.0.tar.xz",
-    "hash": "sha256-zowYoh7XrNWRLH0nPKxfbLGttSSgQV1Wxv3eLpZ/Z8w="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/baloo-6.8.0.tar.xz",
+    "hash": "sha256-WaWWl+fSvsUNqoPeUmh3W953z5g1EnfQ9KxVEiNLrv0="
   },
   "bluez-qt": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/bluez-qt-6.7.0.tar.xz",
-    "hash": "sha256-sGQBBphiE+Gyjyy6E9nMIu49JZdV8nUh8uhhY0M4+Ts="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/bluez-qt-6.8.0.tar.xz",
+    "hash": "sha256-NxqJ98WpyI397rLcxtGtl7OXoj7BC9b86uCoNeB0DXY="
   },
   "breeze-icons": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/breeze-icons-6.7.0.tar.xz",
-    "hash": "sha256-OQN+P8u7emUBFoXEmMrjH/SWpfJJMmnJVbspyUpoi3Q="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/breeze-icons-6.8.0.tar.xz",
+    "hash": "sha256-de4R/EQcJ1BOGZ42VpMpbtzUZfiQ22qryw3soKziLTo="
   },
   "extra-cmake-modules": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/extra-cmake-modules-6.7.0.tar.xz",
-    "hash": "sha256-2B3oJpLT0rt3EQMyplyCZiUr7MLD8wfOgUmQzlYHuNw="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/extra-cmake-modules-6.8.0.tar.xz",
+    "hash": "sha256-/4oL9yKFvsF2jjrNj3xmWibVWhUn6W1z41eJ3J8ONHI="
   },
   "frameworkintegration": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/frameworkintegration-6.7.0.tar.xz",
-    "hash": "sha256-iQEBhUu7s5N9Mh8qw1sqCo886DNCIpfd2lm9qMjKxp0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/frameworkintegration-6.8.0.tar.xz",
+    "hash": "sha256-FBvFnf2yRskFAaSIy/ATufC7wcJ6ePLyV0QzlXbtrzc="
   },
   "kapidox": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kapidox-6.7.0.tar.xz",
-    "hash": "sha256-czjx4xjrLSTLlbVtUwamHQoZLpCXe+rWBRd0HIMF4kA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kapidox-6.8.0.tar.xz",
+    "hash": "sha256-RL24w9VRMOLkqPtndDKmVt3A8lTcu4MixQqcpKbTUlo="
   },
   "karchive": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/karchive-6.7.0.tar.xz",
-    "hash": "sha256-60JD5if1HxIkqZr10Kb44wn55du3R496eONOK4VBOYo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/karchive-6.8.0.tar.xz",
+    "hash": "sha256-6QPrVLh1JYcn/VJLJInSpQGZc+J99nszu1b7qR5O7DQ="
   },
   "kauth": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kauth-6.7.0.tar.xz",
-    "hash": "sha256-FzZU7uKJGs1BU40xrOi5165ghjvH+u8crOx+IcfrEiM="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kauth-6.8.0.tar.xz",
+    "hash": "sha256-u/g6OYcPdWqu+5r7005iHV/FMoDF63Dbm9Nn/FH4x0k="
   },
   "kbookmarks": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kbookmarks-6.7.0.tar.xz",
-    "hash": "sha256-vUGjnfdlFe40598HsmAOHltnsYEsyVnsUVhfLrzFZXM="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kbookmarks-6.8.0.tar.xz",
+    "hash": "sha256-DL0hXdG/L3wwU1bRNiw+sFhbDenhlb4SURD0sJ/KUBU="
   },
   "kcalendarcore": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcalendarcore-6.7.0.tar.xz",
-    "hash": "sha256-jlKC2NegzgoaG9syEzukEC0GBwEFUT5xLa/nbjJkffs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcalendarcore-6.8.0.tar.xz",
+    "hash": "sha256-zF/DwwSxF0cHRGiYKelLr4XGzk3CRZO5lY8d6JnIdBI="
   },
   "kcmutils": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcmutils-6.7.0.tar.xz",
-    "hash": "sha256-QRg4j49iql8ROe14gjtYsAnp6/fzdV6alKtfnrpkTL4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcmutils-6.8.0.tar.xz",
+    "hash": "sha256-+BBsg++FofybQYW4EmAEjr2KZM3wXI0Ccv+D1mZcscA="
   },
   "kcodecs": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcodecs-6.7.0.tar.xz",
-    "hash": "sha256-mrSUBV4Gvc5FVot8R+2yqp7Kqd7AwPsVI2e0MhkhufI="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcodecs-6.8.0.tar.xz",
+    "hash": "sha256-lslTXG95VxzXFwNg3Atkoz1SnVnL2UV5NL/Az2z0sn8="
   },
   "kcolorscheme": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcolorscheme-6.7.0.tar.xz",
-    "hash": "sha256-G0xuhPHdlrLuYr51X2DaYNYbqA1nCe6zGG2IgucuITA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcolorscheme-6.8.0.tar.xz",
+    "hash": "sha256-L9oHaFRpGdQn40qQSb9cXo/mGh1rfnbfSbtC4iwSNN0="
   },
   "kcompletion": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcompletion-6.7.0.tar.xz",
-    "hash": "sha256-ftWparDSqxe7Uh7Kr0TW7Gt8mj1uCUAzYLpJsk2UVg8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcompletion-6.8.0.tar.xz",
+    "hash": "sha256-ipFfQqSeAhyHKbQlp5kGgzSQybqhskrwHNT8gltYxGE="
   },
   "kconfig": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kconfig-6.7.0.tar.xz",
-    "hash": "sha256-vi1d22PlZwO8CX5dmRKzmrxROsUWVN4uDYOhrtLFSxs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kconfig-6.8.0.tar.xz",
+    "hash": "sha256-P488LvOEpSga5aORij48wr4BaOsUvs/aphcQZV2LFqw="
   },
   "kconfigwidgets": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kconfigwidgets-6.7.0.tar.xz",
-    "hash": "sha256-wHnGfFeJMLqvriQbtPJSxj/dEl5E8fuVLjm648mFnNE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kconfigwidgets-6.8.0.tar.xz",
+    "hash": "sha256-ncOoLx+zJ1Dm7PeKhjpDImow4vyt11Ue7HiGkW4ctPE="
   },
   "kcontacts": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcontacts-6.7.0.tar.xz",
-    "hash": "sha256-KS+BBPnzHWLFkomjqCF2bR7FQPT8UT/8O29xl2AtQsU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcontacts-6.8.0.tar.xz",
+    "hash": "sha256-RjgiYW8R2iNo+v7Y9x4cmK1HEDyJ2/qMiP5lpBrhUFE="
   },
   "kcoreaddons": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcoreaddons-6.7.0.tar.xz",
-    "hash": "sha256-SFEenasfLoCzxIIruHwumBGG3juJd9kggtNNADsSg8U="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcoreaddons-6.8.0.tar.xz",
+    "hash": "sha256-KJd/R4vl19X1ZQh2v3uAZnTtb8YJ1wPuoymoGfpK2Zw="
   },
   "kcrash": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcrash-6.7.0.tar.xz",
-    "hash": "sha256-HcLGXY72LvmEV/irQjt2ht4+cTdmwG5k1jIqqdsm7qQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kcrash-6.8.0.tar.xz",
+    "hash": "sha256-pwKUTIfJY07v1SKT9iU1UxRHPmxMJLRy7nhUy4xolX8="
   },
   "kdav": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdav-6.7.0.tar.xz",
-    "hash": "sha256-ZinyrwBC6x4NwMCLUYCse0ja5rWZnh3Qtniu2Lh0wdc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kdav-6.8.0.tar.xz",
+    "hash": "sha256-2JXjttT/mRbRhexQ+UsIpwY2IC4oc5/MdHcuLs2SGCw="
   },
   "kdbusaddons": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdbusaddons-6.7.0.tar.xz",
-    "hash": "sha256-6H0I9tADfY+jPx59FqTjqhfX0LEsaqlvdjI/eDROFRs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kdbusaddons-6.8.0.tar.xz",
+    "hash": "sha256-bHYKDcNyrwovgltlV1v6vRlQx2wON/h94h1HzsjVi8c="
   },
   "kdeclarative": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdeclarative-6.7.0.tar.xz",
-    "hash": "sha256-8fgE9rrCsilQPP0WXr2K4JNTOIiuFeDmFHTG4yjVNbk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kdeclarative-6.8.0.tar.xz",
+    "hash": "sha256-rUYQhce/wqxo8dwlLGZpWSYe+y/6gOeSPna3gccjNqE="
   },
   "kded": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kded-6.7.0.tar.xz",
-    "hash": "sha256-IqobZUO0DglDRhOFFhMcD363inDocpaThFf9E4ZoCi8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kded-6.8.0.tar.xz",
+    "hash": "sha256-UpJj+xqXqlWCji4MeBEYcAphId9Jrb7R7lboecjsUSE="
   },
   "kdesu": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdesu-6.7.0.tar.xz",
-    "hash": "sha256-QQkepFxuIuFBHYnRU4ssi9mL3B841Z3z6cQjqsAiTig="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kdesu-6.8.0.tar.xz",
+    "hash": "sha256-DooAfEE/rKT6fiQ4KgGbrs/mtmB2ALpkEcdh57yVOY8="
   },
   "kdnssd": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdnssd-6.7.0.tar.xz",
-    "hash": "sha256-6RQEdfxuTuHg/jmiGBajwAP8sQkiIgefQi/QKtKpAqE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kdnssd-6.8.0.tar.xz",
+    "hash": "sha256-SdmskRrGQSFwszDIMUIERhCukPVxxgMYsi4ZfiiYlz4="
   },
   "kdoctools": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdoctools-6.7.0.tar.xz",
-    "hash": "sha256-n+U53/7QGDaUD6Twb5U6xO0M1PtfAjL+W2bCI2TBaS8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kdoctools-6.8.0.tar.xz",
+    "hash": "sha256-YGhj6G1qqRars+N2C3P+nbGDLB5BcnNJ0CzcjDq5a6c="
   },
   "kfilemetadata": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kfilemetadata-6.7.0.tar.xz",
-    "hash": "sha256-piQqeeZytSPr8bJVTr+DrKep1QZZKbbxUnMemFHQCNA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kfilemetadata-6.8.0.tar.xz",
+    "hash": "sha256-UEZrNpm74wF+2ww8sJRjpX4t07ZtYPX2ENnuOiHjSJQ="
   },
   "kglobalaccel": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kglobalaccel-6.7.0.tar.xz",
-    "hash": "sha256-KjW54GxmAdYCs6ReJ4xJ4R5GJ5Oc+s/7H97ggmpvbgs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kglobalaccel-6.8.0.tar.xz",
+    "hash": "sha256-yqbYWwiGfLg38Ip4l5iERyTVOSMgGTeCqD4UE19ml4M="
   },
   "kguiaddons": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kguiaddons-6.7.0.tar.xz",
-    "hash": "sha256-rEN8prr1CwF4vIvwtN0ebnDg5O8ax3AllzihxC0DW8w="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kguiaddons-6.8.0.tar.xz",
+    "hash": "sha256-ac5pgDyNab280b7OvXW9SWqdHp6m5y1cb0pc/adqI4Y="
   },
   "kholidays": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kholidays-6.7.0.tar.xz",
-    "hash": "sha256-K1Q9/etqUvQQH9+fFIAt11nQqf/wYOo3Hx87kA3TNas="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kholidays-6.8.0.tar.xz",
+    "hash": "sha256-FiuK3kLegEFTgPZHaihfv6tbsnDzWw19E7qhw0pfsWQ="
   },
   "ki18n": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ki18n-6.7.0.tar.xz",
-    "hash": "sha256-VVtbwZVGw6eRxpck4jjF0XEKlXXPh0ABL4/FRvNUEis="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/ki18n-6.8.0.tar.xz",
+    "hash": "sha256-cdc6BY5SZ4l60/2CAnTkyO13Djwu7uyryAub6NTyho4="
   },
   "kiconthemes": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kiconthemes-6.7.0.tar.xz",
-    "hash": "sha256-viW/8fX2Xt1Fsk/5vtpEsEwOItGT5yRYyWpcWRtwuWg="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kiconthemes-6.8.0.tar.xz",
+    "hash": "sha256-zF4RarvYEADSHYdfeeWGrwULMaF5M70gZLIQBDcUzao="
   },
   "kidletime": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kidletime-6.7.0.tar.xz",
-    "hash": "sha256-YKbHA4e2PmEUcCnOV/FwI3JxQRYwozcqDo1yQLgAaq8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kidletime-6.8.0.tar.xz",
+    "hash": "sha256-UQFgWPrzklFep/WC0lxmar3fOO9mq/GHUCz0bF4R5BA="
   },
   "kimageformats": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kimageformats-6.7.0.tar.xz",
-    "hash": "sha256-cihQZIrBZ+TA7mMVcf3knp/RXQBKEn3YBKFPn1ebcx8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kimageformats-6.8.0.tar.xz",
+    "hash": "sha256-2fJiZBzEfl8t0b3VbukuN5q0yzTUYN/IhP2ZElDXtBc="
   },
   "kio": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kio-6.7.0.tar.xz",
-    "hash": "sha256-3yNQGaB6zVeZIPbGVQUOAtrPhHxwb0uCeedVvkb52ZA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kio-6.8.0.tar.xz",
+    "hash": "sha256-y4rCWlMk6LYXgX/u/N93Oesg3DXc9ERLiGwdy7maVr4="
   },
   "kirigami": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kirigami-6.7.0.tar.xz",
-    "hash": "sha256-TWRaA3TTO5Rl554+FxcIguLL2hUm9FvFtrF22t2nfXY="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kirigami-6.8.0.tar.xz",
+    "hash": "sha256-DguQrJa6SWMOLAHYl3vYxRyasYCDE/yI9g3heXAHQqI="
   },
   "kitemmodels": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kitemmodels-6.7.0.tar.xz",
-    "hash": "sha256-CqAgUyO68tUZ67j5bOftVSSoFkp0QNkF+XdBi/vm00k="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kitemmodels-6.8.0.tar.xz",
+    "hash": "sha256-THraGyliGAOxZMMd42WNW9odXUzxAelzYoucL+GYI2U="
   },
   "kitemviews": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kitemviews-6.7.0.tar.xz",
-    "hash": "sha256-XmNRYpk8nx4V86EQnKMifQ0s5Xz3BwYVZRtlz3kNsEk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kitemviews-6.8.0.tar.xz",
+    "hash": "sha256-62gx/b/tozKFAP8PP1ewkBwEz75zpac4N64LEbIpJa8="
   },
   "kjobwidgets": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kjobwidgets-6.7.0.tar.xz",
-    "hash": "sha256-Ftfnq1QjXW+h6yE9PWNxguIvy9vLe0sUAyQwoCoviIo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kjobwidgets-6.8.0.tar.xz",
+    "hash": "sha256-hvIwHdm+heYt7ml4df9acxhj2wgyM7SwxgSdq2SphQE="
   },
   "knewstuff": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/knewstuff-6.7.0.tar.xz",
-    "hash": "sha256-pBhGItQwtk7HzEx3ET32fIhvNZzInMYxP7zHF2TSP6c="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/knewstuff-6.8.0.tar.xz",
+    "hash": "sha256-NhUFCfm3+h68k1FfxHRgGWKvHkcSy9RfsTYQrhvtRMo="
   },
   "knotifications": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/knotifications-6.7.0.tar.xz",
-    "hash": "sha256-npcvAV2bMbMoO/hCoy0nAJYiTRJ8E6bnlFD08EUt5ec="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/knotifications-6.8.0.tar.xz",
+    "hash": "sha256-GznXfAJeBv0hxxYAD1EkaBCixettoqP3+zzl3oLM+K8="
   },
   "knotifyconfig": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/knotifyconfig-6.7.0.tar.xz",
-    "hash": "sha256-Qifaehj5uoOzS/VLbT/BaNwHJryhSdL4lYW7VKsTgpU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/knotifyconfig-6.8.0.tar.xz",
+    "hash": "sha256-yaMdb0VmsBzd12DehPXSlihxzQOHmTgXBC/CkWmTiL8="
   },
   "kpackage": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kpackage-6.7.0.tar.xz",
-    "hash": "sha256-kWwR9ZcnYNmlA5ZD+8Vc3p0R7BjyeNPWN5Mzb/pEKGU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kpackage-6.8.0.tar.xz",
+    "hash": "sha256-0y5vYUjZzZPzIaZSz6TTP98jSa8QGWQSROKE4dLA0rY="
   },
   "kparts": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kparts-6.7.0.tar.xz",
-    "hash": "sha256-CxswUFDWH8vvpwJrCW3GtHcJ10NcabGKtWp+LqV9dZ4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kparts-6.8.0.tar.xz",
+    "hash": "sha256-CiHSq/TEQGAV99Wr6+/sBJNXWEfqTsNOoj1T21JVsyc="
   },
   "kpeople": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kpeople-6.7.0.tar.xz",
-    "hash": "sha256-02JGusUPW/QG9oP+YcksteYjpR3p/+0RBGZeXxNe+Ig="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kpeople-6.8.0.tar.xz",
+    "hash": "sha256-2QmzyTlktqnS/Cn2P+AEBhrc5O8CXcbc/e0Up6a7lTA="
   },
   "kplotting": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kplotting-6.7.0.tar.xz",
-    "hash": "sha256-Ew7twjTw/tryxBXeiVyXlFT2TDsEkEMyfUPNUJ4jhrM="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kplotting-6.8.0.tar.xz",
+    "hash": "sha256-c2yV93YcoGJYXtK1tyZWubtqXnBlSMvZ8H2k9iyPuos="
   },
   "kpty": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kpty-6.7.0.tar.xz",
-    "hash": "sha256-QswbH3DuC9rNJoEoV9MQR9IY4fWFrDX+kWWQhQGplGo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kpty-6.8.0.tar.xz",
+    "hash": "sha256-+8fzkKC4OXpRY/FrFAwGYsmU9hSgX35aUWFJPDy8PjY="
   },
   "kquickcharts": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kquickcharts-6.7.0.tar.xz",
-    "hash": "sha256-ZkBH57YiwLhl10ZoFxeUVfs4UcuxWo8sOLirnPhQmKQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kquickcharts-6.8.0.tar.xz",
+    "hash": "sha256-NugREaf67SCDYnRvhmRu0QTj4xShgukofPLSFPJhAjk="
   },
   "krunner": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/krunner-6.7.0.tar.xz",
-    "hash": "sha256-GH/+kYDpjoP7rFvTZE7GZxuh6AZspgE6mLTx10Oc/zo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/krunner-6.8.0.tar.xz",
+    "hash": "sha256-RigsSTTfvC0l33Cwu/ZRgsMNjDnCGjp0n+VmHjs0w/s="
   },
   "kservice": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kservice-6.7.0.tar.xz",
-    "hash": "sha256-OdJULjj7NDTFQFyS1bReDVumUNJlMJrfk8eHp0HVf6E="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kservice-6.8.0.tar.xz",
+    "hash": "sha256-Iwls8j7j8mJgnAk/NskME5NQ6rHRMhMuC/wCrYuBgSg="
   },
   "kstatusnotifieritem": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kstatusnotifieritem-6.7.0.tar.xz",
-    "hash": "sha256-gOriaTzbXaZptO1qgii93DmBasoP3pKPIx5IlIJ9HeA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kstatusnotifieritem-6.8.0.tar.xz",
+    "hash": "sha256-bk/4G4DXhC0qEOe3WOSXs3JPxU6jptpvCb7oBjZDmDI="
   },
   "ksvg": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ksvg-6.7.0.tar.xz",
-    "hash": "sha256-u998eGyVlwfNnGfASmflGhXbzdbv96tSsDwJVE5m8YQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/ksvg-6.8.0.tar.xz",
+    "hash": "sha256-/mWwhS10rHO6S1l/41LpG/dM9h//+ARqG9URyKhQhOM="
   },
   "ktexteditor": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ktexteditor-6.7.0.tar.xz",
-    "hash": "sha256-7Xb3IyQiWpJuAMLJcNSNfxGldulC5I0JLpg3vaedaZE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/ktexteditor-6.8.0.tar.xz",
+    "hash": "sha256-alirdMTv3fMWEXToYNIRQmRUEi6ESyX8Je9igqHnonA="
   },
   "ktexttemplate": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ktexttemplate-6.7.0.tar.xz",
-    "hash": "sha256-1rdfGT9NjYF883SHKldCdInGFzYSHHKmnE3X7mLh4jM="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/ktexttemplate-6.8.0.tar.xz",
+    "hash": "sha256-OoPa+0B1rwuwFVVqZCBQlPzKK6xbn7De5hTq/yUqBBI="
   },
   "ktextwidgets": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ktextwidgets-6.7.0.tar.xz",
-    "hash": "sha256-I7txRQ459DfAa9mvSOeJMlPDGtEGSbCQHQqOwe4YrgE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/ktextwidgets-6.8.0.tar.xz",
+    "hash": "sha256-XR0uMhM8v3frYNJE3PT9EMKFVeONpTdsAjtGK5tosrg="
   },
   "kunitconversion": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kunitconversion-6.7.0.tar.xz",
-    "hash": "sha256-swNgHGI81m7bZqZv1y6VdBW43TPnAwW+gTb6a0OxpAo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kunitconversion-6.8.0.tar.xz",
+    "hash": "sha256-5iBUeIHmNcyKqXcabsqal6bLQJJawHXTPvd0T6zB2VQ="
   },
   "kuserfeedback": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kuserfeedback-6.7.0.tar.xz",
-    "hash": "sha256-Te+NDW7yJ4B7YGbLdizsNSRSoY4OKLVq7M6O8861J2E="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kuserfeedback-6.8.0.tar.xz",
+    "hash": "sha256-fp3FceNeJjT9Q9QqRobJIQl4KPulVD1KegHvf5udrbU="
   },
   "kwallet": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kwallet-6.7.0.tar.xz",
-    "hash": "sha256-/7MZzg3+6pU4nhovSDPRCZuJTIHx33q1Dc+3luqH/6I="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kwallet-6.8.0.tar.xz",
+    "hash": "sha256-4LUxHYjZLKW95MJK6HXcOk/GfpMZ0N4qSeJdBEYehig="
   },
   "kwidgetsaddons": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kwidgetsaddons-6.7.0.tar.xz",
-    "hash": "sha256-vTY0KJOGPmEQxfEkX4rgs6M4J19OrxJLFVhdL+SSMpo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kwidgetsaddons-6.8.0.tar.xz",
+    "hash": "sha256-z4Zm7A8Kcg/qtkHqPhla8UBqQAgNEY0c9P+vEjxvqwg="
   },
   "kwindowsystem": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kwindowsystem-6.7.0.tar.xz",
-    "hash": "sha256-YsDwtKlQeTnYSu7aVbvUMAuIwE43lT5RibE5ADMQqPQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kwindowsystem-6.8.0.tar.xz",
+    "hash": "sha256-e0xSDnnC6xD5ih17TXVjPukNGHOvut+fYHUeZ7wOJDY="
   },
   "kxmlgui": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kxmlgui-6.7.0.tar.xz",
-    "hash": "sha256-pFHBbXClkd4TlzB5EV81kF48QjAvXIyK4+x112oG/KE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/kxmlgui-6.8.0.tar.xz",
+    "hash": "sha256-mX8xCkbsLBUwEPxZZ3UzkKmbxQYh0Z+SZIgWQXLFH8w="
   },
   "modemmanager-qt": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/modemmanager-qt-6.7.0.tar.xz",
-    "hash": "sha256-/EXc2K2iQ7r3kACZBi8xK2d79pT4jzZ0bVNK/pB7+PM="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/modemmanager-qt-6.8.0.tar.xz",
+    "hash": "sha256-CiLuylr897QgWbvfUGkk8lutFN9zfIhPqP0+J146Fxs="
   },
   "networkmanager-qt": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/networkmanager-qt-6.7.0.tar.xz",
-    "hash": "sha256-VjIxZEWHkYyVC8vl/aC/ajXpehL2sOm/nqpM4xQdMSI="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/networkmanager-qt-6.8.0.tar.xz",
+    "hash": "sha256-FYeSUe8aXohGW3j49Z4r49HylpTFyRUfoNVC6niUl2c="
   },
   "prison": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/prison-6.7.0.tar.xz",
-    "hash": "sha256-CgU6gL6uIyzvXaP2UlsU7mSbJ1zqZN4MD/rUHD8uwmA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/prison-6.8.0.tar.xz",
+    "hash": "sha256-uue1p2xG4ri3yBwaqvIHIdBQz99IKR0rzGb1dZCy3rM="
   },
   "purpose": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/purpose-6.7.0.tar.xz",
-    "hash": "sha256-T4u/GQIscN8dw0Wkq9gWd6UFouj+9kMxEof+jpIS1Wo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/purpose-6.8.0.tar.xz",
+    "hash": "sha256-fugYJlElHIKAp99iiNP2JXadzYtKbU/ufv5WmVQ18Go="
   },
   "qqc2-desktop-style": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/qqc2-desktop-style-6.7.0.tar.xz",
-    "hash": "sha256-tmAtIbqJGmNGGCeqRROUau8NjgFB9KgxqvssTS4/syk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/qqc2-desktop-style-6.8.0.tar.xz",
+    "hash": "sha256-6WkvANebljvcrnFsqrlkwlNHUMhdf+AvznqQgAPrTaM="
   },
   "solid": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/solid-6.7.0.tar.xz",
-    "hash": "sha256-NnPxd3bDDZUj/kC4845ivhA3YQBQ94LBNtoawEsg5uc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/solid-6.8.0.tar.xz",
+    "hash": "sha256-rOUUX1nbVIvPQjy2tw/YcP77o38HpkkWQ5SoArPKeUE="
   },
   "sonnet": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/sonnet-6.7.0.tar.xz",
-    "hash": "sha256-L5cNSQ7/1mjmTdk//vNEqA235jEwuyPfT6DWsUFQ5Yg="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/sonnet-6.8.0.tar.xz",
+    "hash": "sha256-xCG0YCFPOiWEKryyYFJRudqJtimtk2Fg051KpQJAVjY="
   },
   "syndication": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/syndication-6.7.0.tar.xz",
-    "hash": "sha256-wqSFIp2KQwhY1/Rz/osTNzfZPTOnduRu7fp3u54wuiQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/syndication-6.8.0.tar.xz",
+    "hash": "sha256-v84kBvpM+D8ikRwc19uvwleLYV+EM2i1UGm4/2MOK6k="
   },
   "syntax-highlighting": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/syntax-highlighting-6.7.0.tar.xz",
-    "hash": "sha256-bvUnqUF0C53f4FPrCOrX4RwSooOqiKXd8aGFIM2dLKc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/syntax-highlighting-6.8.0.tar.xz",
+    "hash": "sha256-7Tx9PZLBVNmvOaGro5FmsH5kEcGMMQARYgjzpEI7Elc="
   },
   "threadweaver": {
-    "version": "6.7.0",
-    "url": "mirror://kde/stable/frameworks/6.7/threadweaver-6.7.0.tar.xz",
-    "hash": "sha256-GsP8gFHzGsT3bf1dFX5cN10YO8B2IVKkThgxz1gWqVY="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/frameworks/6.8/threadweaver-6.8.0.tar.xz",
+    "hash": "sha256-iGTdMLelX3UcG6gavaeJo5NJZL4YuhyOaU4rxIdov94="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 918e347772f2..700c006d6347 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1252 +1,1252 @@
 {
   "accessibility-inspector": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/accessibility-inspector-24.08.2.tar.xz",
-    "hash": "sha256-fE4pQDnVgVZE/d0F1lndMyWtYCjeFWiv4RDlcE2mMTg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/accessibility-inspector-24.08.3.tar.xz",
+    "hash": "sha256-ikrsuKExq9w1hXSvKSiJmagDpdcFvUdQ3kcLqNkHhj4="
   },
   "akonadi": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-24.08.2.tar.xz",
-    "hash": "sha256-iy8RPrxZACC8FNNiu4xksbi7q+XnPKC6O2NkCZnB99M="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-24.08.3.tar.xz",
+    "hash": "sha256-lT4cVrjHdWgm7h7sqJHqOhlGZ7QywfX2xOoAxqD8Rms="
   },
   "akonadi-calendar": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-calendar-24.08.2.tar.xz",
-    "hash": "sha256-xq01HIIOQKxpp8X2f98qfVQfdmnT1Xh0ZF9vhfdOv54="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-calendar-24.08.3.tar.xz",
+    "hash": "sha256-UBOhptQzKHFKhsr6ixWlO2TExwMBSTouiV90PH+HPhk="
   },
   "akonadi-calendar-tools": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-calendar-tools-24.08.2.tar.xz",
-    "hash": "sha256-aGp+tN/XYu+zB6TI4eBmjfbILN04T7tggMbJvVn5tcM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-calendar-tools-24.08.3.tar.xz",
+    "hash": "sha256-/nPs2U96d0STaIaEPZasraeECRphKsGMY74UTFLaDr8="
   },
   "akonadiconsole": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadiconsole-24.08.2.tar.xz",
-    "hash": "sha256-ryud7MGLezBVtE/v8zUgpD+gHA9WrfjjioYVjb7Nbzo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadiconsole-24.08.3.tar.xz",
+    "hash": "sha256-urufCBS9ZdlP4rNPx8gi8jjwldO6GsnmvFKHEm4o2jg="
   },
   "akonadi-contacts": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-contacts-24.08.2.tar.xz",
-    "hash": "sha256-6hrY06Ttbw0wkbFYeGnHvSm0MJXSvac+gsBC4RrDf8g="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-contacts-24.08.3.tar.xz",
+    "hash": "sha256-eoKrHa74XPjS0g82n5mwj4eP0blwYdDyEH05Ai8FMco="
   },
   "akonadi-import-wizard": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-import-wizard-24.08.2.tar.xz",
-    "hash": "sha256-rXGYsdfYZjEFxQpseTHKANFxE2hZqFLfMFw9mNmZkgQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-import-wizard-24.08.3.tar.xz",
+    "hash": "sha256-EB8UKYWqdqd9g/JR8+1gm+PuqCemnmybQdUNANwaOGs="
   },
   "akonadi-mime": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-mime-24.08.2.tar.xz",
-    "hash": "sha256-+9Lgk4WmC/pAn9hPADR/rIv4uZxpAgdwa60F1RVPId0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-mime-24.08.3.tar.xz",
+    "hash": "sha256-S3hE3erZj/Pmhbg15J2+p2AGY4knmyF2DJwjn208ePo="
   },
   "akonadi-notes": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-notes-24.08.2.tar.xz",
-    "hash": "sha256-LcMOIkvqDztYXLcdbMCZdB3pvtuObj8G16nO+jSeD94="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-notes-24.08.3.tar.xz",
+    "hash": "sha256-eHd7hGiXTmYDGknBY/6QhAW2fg8LrOAwf5Hw9CRv794="
   },
   "akonadi-search": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-search-24.08.2.tar.xz",
-    "hash": "sha256-l21oZSW5zVyCfTNc0clkOvoNCdjx3amuWu72fviSnFw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-search-24.08.3.tar.xz",
+    "hash": "sha256-Y5mKH/aV876BZ7/mwmGeEXZfiSJIJS4Fp7zwor3pYGg="
   },
   "akregator": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/akregator-24.08.2.tar.xz",
-    "hash": "sha256-ZHuaCPtYNAL7KQwjTpkhxjQDT7YBwVXHqOV13hb9Wzs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/akregator-24.08.3.tar.xz",
+    "hash": "sha256-eOb4cCubMr+ti6FnUavcrECshtx3Gl9rfpeQZ51c8Bs="
   },
   "alligator": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/alligator-24.08.2.tar.xz",
-    "hash": "sha256-U5w2J6oadXXKgR1nIV/I7qDpdcpohkV3DJHLXa1XMSg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/alligator-24.08.3.tar.xz",
+    "hash": "sha256-VD8XpKJgQjeUkICbJqk93b56kk9zPKzzkb2OsbXuirA="
   },
   "analitza": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/analitza-24.08.2.tar.xz",
-    "hash": "sha256-EWID/f0+sSTOnzoeF59olHe8ODhFF3IByj9shW0Sxjo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/analitza-24.08.3.tar.xz",
+    "hash": "sha256-nwtwY+pfXXwhMdSm3MzTJ10xpJaLpusJIKcMp/yQ1o4="
   },
   "angelfish": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/angelfish-24.08.2.tar.xz",
-    "hash": "sha256-SCrngjUJodD7egcqcoEG2ID1Q4JRVirzOdpFSKZUlks="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/angelfish-24.08.3.tar.xz",
+    "hash": "sha256-jh20relCN9mA/ILlPdZNGduZYwHVzfGn9gELKtj+rfQ="
   },
   "arianna": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/arianna-24.08.2.tar.xz",
-    "hash": "sha256-4HpVzGm5ndDtrIasInezV2EhcutA+y/xHMCgeDqzxDc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/arianna-24.08.3.tar.xz",
+    "hash": "sha256-d2vSAS0NZlR8VxDhChzXTUsq2rq9/Dd+arsQ8g2xG3w="
   },
   "ark": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ark-24.08.2.tar.xz",
-    "hash": "sha256-f98HTZhbufjFHZ/Bh1gPkeA+pxiMjsU2C9Mb1dwVuDw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ark-24.08.3.tar.xz",
+    "hash": "sha256-PGoQD7uFErj4kXJidGWMUc4Q+TGNTBTbsjgKLGAvMhs="
   },
   "artikulate": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/artikulate-24.08.2.tar.xz",
-    "hash": "sha256-l8gqgXHrns7WouW9BbWPEq+YJOFzletUwzNjUXmiUF0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/artikulate-24.08.3.tar.xz",
+    "hash": "sha256-F5y9OYkvXchRMwEJXXkKFvNceVal0lrYQUlj2UPdjdI="
   },
   "audex": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/audex-24.08.2.tar.xz",
-    "hash": "sha256-eUkqCevK4BH1M8hvqamqmsxcaH77QTh6u9nAT/gfaAM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/audex-24.08.3.tar.xz",
+    "hash": "sha256-3WBag9yPArnelb0m3q7DPkYqhu29obwm1s9PW+xiZZg="
   },
   "audiocd-kio": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/audiocd-kio-24.08.2.tar.xz",
-    "hash": "sha256-o5DueitrPoJwWcmDafXqJFA0I7rsycQ7vQYsAKZ785M="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/audiocd-kio-24.08.3.tar.xz",
+    "hash": "sha256-PigOXpnXBT4S4eZfaMfuc4i0H4VWlwn4pXNk/4+4588="
   },
   "audiotube": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/audiotube-24.08.2.tar.xz",
-    "hash": "sha256-NX5Yr9/A7xMMSgeSVYYdtyrsVAI7eUugzQ9mUkVdA98="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/audiotube-24.08.3.tar.xz",
+    "hash": "sha256-1OciNBLW8+lYzfaLEBqaHTAwOMuTHVlOZmOvcjcFRwc="
   },
   "baloo-widgets": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/baloo-widgets-24.08.2.tar.xz",
-    "hash": "sha256-szeiC0aByC6N1yIxP1e1iqc34tmEIKzBUSQlek0CY/4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/baloo-widgets-24.08.3.tar.xz",
+    "hash": "sha256-eKVurIpI9FypqfZF+3C1G0s99qdQDMhEP0h0vGvJCd4="
   },
   "blinken": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/blinken-24.08.2.tar.xz",
-    "hash": "sha256-QDcvZsQKqCl58hG6PCuy7qtSRWyPz5uq2JwzMDHRFPc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/blinken-24.08.3.tar.xz",
+    "hash": "sha256-BItKlEQqZ8p2oEEtsPbPf5YoxNWvxDhdfmxoEJrvrrY="
   },
   "bomber": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/bomber-24.08.2.tar.xz",
-    "hash": "sha256-phawZVBYIG8//Db0mTxV1gWDtlR+ZMoeI4Iwtp0vXaw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/bomber-24.08.3.tar.xz",
+    "hash": "sha256-2sEpSqH49Cq6ibXPDBenkQTfr7p/XJFyNWfJBiWDRb8="
   },
   "bovo": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/bovo-24.08.2.tar.xz",
-    "hash": "sha256-kbAk70v9uXxwY3I2hwSS1KxCXUjIH1uIanZexEbHx6s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/bovo-24.08.3.tar.xz",
+    "hash": "sha256-4x6+Kc1NRWCncf8tb6NofXIge1BQv4Agzbsrq0bG7Oc="
   },
   "calendarsupport": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/calendarsupport-24.08.2.tar.xz",
-    "hash": "sha256-brRVDcxD9FnbHygjd1fklXSF3wgigRgrKJ7vwg0Ya7U="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/calendarsupport-24.08.3.tar.xz",
+    "hash": "sha256-KldhJSpAEx1asGhGf4C+7Z0Scvs4UoMJZijkNvqBsLQ="
   },
   "calindori": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/calindori-24.08.2.tar.xz",
-    "hash": "sha256-9SFNyfA+S58KYXUozOXkr89pDPAEG/wEtQGJHV2ugz4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/calindori-24.08.3.tar.xz",
+    "hash": "sha256-fadB1lggM7SMS3tyRVGcgPko73CO6Xbbuu+3aWRJcqE="
   },
   "cantor": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/cantor-24.08.2.tar.xz",
-    "hash": "sha256-CAxztAXKLYVJctCMHNvHVU6Z89MU43rm+e8ySagCvHg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/cantor-24.08.3.tar.xz",
+    "hash": "sha256-ViH2WmIHApxWlOH89IsfG/euazg3fqH/ESP51A9FyUw="
   },
   "cervisia": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/cervisia-24.08.2.tar.xz",
-    "hash": "sha256-qTpkcgLCIJwKXDuwILtoEzGjOJS85g3+U4fOim5yJ+s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/cervisia-24.08.3.tar.xz",
+    "hash": "sha256-NvYFCNEGtVy2zwxgIPOAybSUH1pdBv0oXud2vNMRuWk="
   },
   "colord-kde": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/colord-kde-24.08.2.tar.xz",
-    "hash": "sha256-f3WouENrUiPzsnkdlH3sPweZcZWkLdQ79o0Eo+z3B20="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/colord-kde-24.08.3.tar.xz",
+    "hash": "sha256-roleXP3D53v4ikgsA0p3SNAKTOfXTVIsuUtovodqAtI="
   },
   "dolphin": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/dolphin-24.08.2.tar.xz",
-    "hash": "sha256-VRUWJwditxpTUC5CyuIhBmQuElPiJyBjKoBSUENBRbE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/dolphin-24.08.3.tar.xz",
+    "hash": "sha256-lbvOh2AZ+wx8xspKX9jsH2JfcP1RH+iD3xJEalKFgG0="
   },
   "dolphin-plugins": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/dolphin-plugins-24.08.2.tar.xz",
-    "hash": "sha256-aX7Ggt6w6PfU/BTo645s+0w8CWHY10tZRdPHr9AE6A8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/dolphin-plugins-24.08.3.tar.xz",
+    "hash": "sha256-pnJZMSt27y9G8drTxf5LPsFjIlF9sU3keGHWUZvl1jA="
   },
   "dragon": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/dragon-24.08.2.tar.xz",
-    "hash": "sha256-3h+fPtM0R13uiJ8qxaiImlNgjZq6nywJD4jdNQrx5IM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/dragon-24.08.3.tar.xz",
+    "hash": "sha256-JK8QrQTxGzaPu7kKLuf8y6yJ8BZsVLS7C1WUDWy3a0w="
   },
   "elisa": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/elisa-24.08.2.tar.xz",
-    "hash": "sha256-+eTurdf9lIbjOPE8nyXF19j7S5Y3uCjW/VJUgWoHp8k="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/elisa-24.08.3.tar.xz",
+    "hash": "sha256-m2rr824F/FaCE/VDegQxqEpZX0uokYm7XgVB1R7M29c="
   },
   "eventviews": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/eventviews-24.08.2.tar.xz",
-    "hash": "sha256-lVH7Tkh0kNv1tdmKOd/6vUo2omFW1iR7Ubf2DQXbBV8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/eventviews-24.08.3.tar.xz",
+    "hash": "sha256-2jKC6BGbQH6bBrJvlwZI2EJOxmVbVWX7TEpr86lCfgM="
   },
   "falkon": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/falkon-24.08.2.tar.xz",
-    "hash": "sha256-19zRYVzuYjJVyBhFip2V6sDyDvzj8AOe76z0Yg6u80s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/falkon-24.08.3.tar.xz",
+    "hash": "sha256-xUQP2jxZ+lk/9u32FNCAsF1lOh9D6DwzP25hCQiMm5c="
   },
   "ffmpegthumbs": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ffmpegthumbs-24.08.2.tar.xz",
-    "hash": "sha256-sGrM3S/wBZ1s+hgNLrjX3ZWbmuyU0RY0vQhmkKBqxqw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ffmpegthumbs-24.08.3.tar.xz",
+    "hash": "sha256-GUU2DGjmc4gotxMPDXtbZOoSnt1YG76/ZlKW5KnDysQ="
   },
   "filelight": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/filelight-24.08.2.tar.xz",
-    "hash": "sha256-XpBM30Vz+luFeOQVfaNIrUbnKBmSv71q9ZyUMOFrqU4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/filelight-24.08.3.tar.xz",
+    "hash": "sha256-kQ6msPGxZHS2NSPhw5BhKqw1gYVwXjeTaWDcI0u/zzc="
   },
   "francis": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/francis-24.08.2.tar.xz",
-    "hash": "sha256-a4zH84wk4UwueXpiKZ1HCZlls45yBVeOMgaBjHkiroA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/francis-24.08.3.tar.xz",
+    "hash": "sha256-Q2ZDZICCXOYZYS5JpacFRt6lDtHkEL5lFS4p3uFYuhk="
   },
   "ghostwriter": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ghostwriter-24.08.2.tar.xz",
-    "hash": "sha256-g+f/Nefc4DoSCt+pmLYDAYI1CwJqn+YCjQqWKRjncuc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ghostwriter-24.08.3.tar.xz",
+    "hash": "sha256-5eT9LaBSXoLTVWpPu07BRvQCJ7V4Z6HN+U9ufTZVV6M="
   },
   "granatier": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/granatier-24.08.2.tar.xz",
-    "hash": "sha256-zOraxrRmB9j5Y4q+tXrC/0uvj51QxkP3dLwfKGhl/P4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/granatier-24.08.3.tar.xz",
+    "hash": "sha256-VFqcc7EDIJtKSIBF7OKUhl+lvT9UiQzq+Z0X8rwyJMM="
   },
   "grantlee-editor": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/grantlee-editor-24.08.2.tar.xz",
-    "hash": "sha256-GYbjU2UGuF+Vt3fUxbG56cPlvCBjn9U9NAhW6VxRXi0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/grantlee-editor-24.08.3.tar.xz",
+    "hash": "sha256-OViwMRwfldeyRR49TFh/lnGPPFmTlv1fA2SqFgtgPCU="
   },
   "grantleetheme": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/grantleetheme-24.08.2.tar.xz",
-    "hash": "sha256-wAYB40gpVIHgM+RCjrSLi0H5gV6mjC1hYOK79UqTW0M="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/grantleetheme-24.08.3.tar.xz",
+    "hash": "sha256-l5JrjXEIMlOIBhW1RS/iDxevpYvdfXMJv1O9LgRbhuo="
   },
   "gwenview": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/gwenview-24.08.2.tar.xz",
-    "hash": "sha256-HVfcSbA05E21rtbijL3CHo43c7DctN52jk8R0duk7DI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/gwenview-24.08.3.tar.xz",
+    "hash": "sha256-maUeVyrawmm/ky/JCyiXN2zAXm0i9TmjPD4Qwoerd0Y="
   },
   "incidenceeditor": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/incidenceeditor-24.08.2.tar.xz",
-    "hash": "sha256-l/67wkrUq2j84rQYbfuFCPVevs5q5NNmQy1bnRdU8XM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/incidenceeditor-24.08.3.tar.xz",
+    "hash": "sha256-wsIGNENhan5KCwXO21jnESniYKrPWypCGclQc34dy4I="
   },
   "isoimagewriter": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/isoimagewriter-24.08.2.tar.xz",
-    "hash": "sha256-djuTSkr6lMw3Sc7q9vh8mdWTyWnvC3K50moICfKa4Ik="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/isoimagewriter-24.08.3.tar.xz",
+    "hash": "sha256-kaYuI94hSJA11TsJ7CLQLoSvBnaMt/qC26gVoFBoAkI="
   },
   "itinerary": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/itinerary-24.08.2.tar.xz",
-    "hash": "sha256-MOhnRn6nnE7bTg34zdHhWj40bPF8qwEROotJfGa6NgQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/itinerary-24.08.3.tar.xz",
+    "hash": "sha256-Im8xyIfu09wQX1ApVmnBOsAY0bJ1h6ByKEccDUkTx18="
   },
   "juk": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/juk-24.08.2.tar.xz",
-    "hash": "sha256-RZB9GRHIOoVvS/uCBV/v5Q9P+4jpVnEP+gDMXlv9K/w="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/juk-24.08.3.tar.xz",
+    "hash": "sha256-NFq0AnJgBPJxdd2bbyK3IjTvvkfr6iN0FVBgbGzoLKo="
   },
   "k3b": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/k3b-24.08.2.tar.xz",
-    "hash": "sha256-rqgd0ZQsxoPHIulrM6x95YCZ/iTiI0SCcsFI9LiASm8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/k3b-24.08.3.tar.xz",
+    "hash": "sha256-vJfDSvshOMofwlvV+nnnfRyi2+FFMyMXFZ7xr7yiwZ8="
   },
   "kaccounts-integration": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kaccounts-integration-24.08.2.tar.xz",
-    "hash": "sha256-Vs40NNILzIlnOCL3uUn1DzL8dTjuckL7l2KFVMksjxY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kaccounts-integration-24.08.3.tar.xz",
+    "hash": "sha256-dq/JckZ3w0FajIa7+IDAj/rHhWLQ9fLGr9DOhyQv48Y="
   },
   "kaccounts-providers": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kaccounts-providers-24.08.2.tar.xz",
-    "hash": "sha256-FSgFjcyS+FTjHyf9bIaoLqXfNLw7erlC1p/wrH8A2EM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kaccounts-providers-24.08.3.tar.xz",
+    "hash": "sha256-r2EhrEdggNeGqQu5XXDsyLN1Bpbc0hV/05sIlh4iEOQ="
   },
   "kaddressbook": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kaddressbook-24.08.2.tar.xz",
-    "hash": "sha256-Sb5L6wgDxqkrlGci+LHBqEJalxLOzEv9AyB6NRdCwU0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kaddressbook-24.08.3.tar.xz",
+    "hash": "sha256-qUqRurguf6EViWXqcRx3i2Nw6Iu4yv5y1fhAky4T5Nc="
   },
   "kajongg": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kajongg-24.08.2.tar.xz",
-    "hash": "sha256-A3yvvln97eZBmjWRwgNdWjz0KXOLe9gctDIJZXu62Zs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kajongg-24.08.3.tar.xz",
+    "hash": "sha256-G1xhRJ5KG7xWYSqgKPi0pzVPESNaCSW66tJOq1TDMuE="
   },
   "kalarm": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kalarm-24.08.2.tar.xz",
-    "hash": "sha256-oe6wl0PTtQVUSJRGYoAbtpNXO4CXjGBQzrspvVeZSgI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kalarm-24.08.3.tar.xz",
+    "hash": "sha256-4hKVMnS6rK4hmFvjMt01HzcFEFAiPf4/s0S4VXtcD2M="
   },
   "kalgebra": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kalgebra-24.08.2.tar.xz",
-    "hash": "sha256-tWCwZESHZQci405yh08c7x8h7EEJ5LLyKUQOpvAxFQ8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kalgebra-24.08.3.tar.xz",
+    "hash": "sha256-RA9YwyNIkGFOsEzIXEnMDEMVeKKAX8G+lNaGb9cBVdU="
   },
   "kalk": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kalk-24.08.2.tar.xz",
-    "hash": "sha256-ZlfBKmcXhHt4+w56D2agfT+ULwljU3TUwKSk4ADMWs8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kalk-24.08.3.tar.xz",
+    "hash": "sha256-N6io/ll2RnAMCcN5OC8I8upudVITGBwBIMMFkYedLRg="
   },
   "kalm": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kalm-24.08.2.tar.xz",
-    "hash": "sha256-JquhkpaPF2xMyDJkHs+C1B5a7tZ5AGhfAM9VdtaTYso="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kalm-24.08.3.tar.xz",
+    "hash": "sha256-4cQ/8pPhH5Lkt3luSo+iqCwHtRSmAyR4VewMk7dZFRU="
   },
   "kalzium": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kalzium-24.08.2.tar.xz",
-    "hash": "sha256-m4yO8wMzwjqym7m849cyTPndGjavSB0ybSx7YySys1c="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kalzium-24.08.3.tar.xz",
+    "hash": "sha256-KAtY1MbdpzFjDtdtxKM+pCc35TTzKw2UtzqkrLcqxIM="
   },
   "kamera": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kamera-24.08.2.tar.xz",
-    "hash": "sha256-5OHPBtCyiyvZV1FKRXrn6kid6ZwTV20kBa32ouIHErU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kamera-24.08.3.tar.xz",
+    "hash": "sha256-t5mSc4ifJ06xr/imng8eXzQsGuN7vUqYG9ie3FKYghw="
   },
   "kamoso": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kamoso-24.08.2.tar.xz",
-    "hash": "sha256-UuCqnIRSMlkyeAvnDf2uWeJTvSf+OsnjubGaMuAtl38="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kamoso-24.08.3.tar.xz",
+    "hash": "sha256-9/AwDp6OjfNFPeWm2eAJ1KZppwJVpjiY9cCaasCZa7A="
   },
   "kanagram": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kanagram-24.08.2.tar.xz",
-    "hash": "sha256-9hxsb6MJ1Tdy/n5RwtFfzqFT35pH3I6y2A2tiGEeuGI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kanagram-24.08.3.tar.xz",
+    "hash": "sha256-l+YMa+ebiINqDyIU8o6Mobe3NBWoJE64BDgeFILYtPs="
   },
   "kapman": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kapman-24.08.2.tar.xz",
-    "hash": "sha256-cjhosHjMMQe+qFpdNBsC+ZarXI8dW3XPkIwmf9EG5U4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kapman-24.08.3.tar.xz",
+    "hash": "sha256-bhejgqZQKMdjGpcTzK1iu4BW/1pQmo/Js8VdKOVG+Y8="
   },
   "kapptemplate": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kapptemplate-24.08.2.tar.xz",
-    "hash": "sha256-TSsO+Z7VkBHuurVDUBljNUYwwbT47AmZ8khs/lVy0Ho="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kapptemplate-24.08.3.tar.xz",
+    "hash": "sha256-QF5fj5/lMiR16oQz03Ou1ey0Mc7SU5s3qpbf5tu3j4g="
   },
   "kasts": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kasts-24.08.2.tar.xz",
-    "hash": "sha256-Vkbz8IkfSYR71Dfgd/4X4Nmb5S7NqedftLveCHicdOM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kasts-24.08.3.tar.xz",
+    "hash": "sha256-GFOh83hyg24llvRA8FM6meLYytaTsa1fJSJm56as/HY="
   },
   "kate": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kate-24.08.2.tar.xz",
-    "hash": "sha256-2Ft1MYiV3KL0DpbuWOkemmAS81h+Itfz4P4Tvv+uymw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kate-24.08.3.tar.xz",
+    "hash": "sha256-zLZWQ178H94K5MLZNACiwFZgvymeZBFxS5BCQixQ1PI="
   },
   "katomic": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/katomic-24.08.2.tar.xz",
-    "hash": "sha256-5oCtP652mvujZIB77D/KfyDZEGd9kCnx7MnWXTcmYE0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/katomic-24.08.3.tar.xz",
+    "hash": "sha256-niVrZCF+R1fYxOVgSyAtBzmec6DVntgZtTCwlvXgEFE="
   },
   "kbackup": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kbackup-24.08.2.tar.xz",
-    "hash": "sha256-hxRC7eTkR+xRDb6ki1mDna2SFCEXdnXq1FClRbCvKCE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kbackup-24.08.3.tar.xz",
+    "hash": "sha256-n/D5/rj/8tBaLel4t7qyS95sXaliG2SW6R1pMVLjL40="
   },
   "kblackbox": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kblackbox-24.08.2.tar.xz",
-    "hash": "sha256-X+KB7aM4lOpHCH+6YcP9o7RDHnP1qkd7SNkjstpUYr8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kblackbox-24.08.3.tar.xz",
+    "hash": "sha256-wVCeOV4tKmSOfyyaYwKwLV8uQzb+NQ46ET7wQoK8Vlk="
   },
   "kblocks": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kblocks-24.08.2.tar.xz",
-    "hash": "sha256-pv6IWSnaJM3LL8V4ZuZOZnqRKkZQ9/rbUW1J6ns1KKw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kblocks-24.08.3.tar.xz",
+    "hash": "sha256-nZJIP93dVkmBCv7hU325JwzFwBQgdGC/1L95G1huhhw="
   },
   "kbounce": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kbounce-24.08.2.tar.xz",
-    "hash": "sha256-EMvWygDfil41cUUm0qlEmIOokvdZ0msYL4PhN+pbIdE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kbounce-24.08.3.tar.xz",
+    "hash": "sha256-yiXGShSBg/afGvzOdVG3Ore7ubIz4S9ESPY6o6qdKts="
   },
   "kbreakout": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kbreakout-24.08.2.tar.xz",
-    "hash": "sha256-0VJCGDbWOiQJiu/WqimEFeStSbj92KXc3HXfMC5vdG4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kbreakout-24.08.3.tar.xz",
+    "hash": "sha256-0lWebRFeCM4sCqoVBMLZhuLNMwguC98skSaSjoEBX9A="
   },
   "kbruch": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kbruch-24.08.2.tar.xz",
-    "hash": "sha256-I9KH/azP7/qf47GUmMTbhRyZd8qqwVI5qoYQRA1AFlw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kbruch-24.08.3.tar.xz",
+    "hash": "sha256-N0kAWFGoeBmQRxXmi+19vXFI0vIZn7bdizTBR6AvTYg="
   },
   "kcachegrind": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kcachegrind-24.08.2.tar.xz",
-    "hash": "sha256-h64CpqnNrtXPlSbtQFtZusxdaHFxX5HQwi0iLVyEdfQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kcachegrind-24.08.3.tar.xz",
+    "hash": "sha256-b1GmDkSFWxd8TXly47VgGBwHS6V1LqQnWWJOA/u/Lhs="
   },
   "kcalc": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kcalc-24.08.2.tar.xz",
-    "hash": "sha256-DyD/62b4XyqRv3RTaO/pQ8XjKsA8Rem34SSv4OSU/Uk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kcalc-24.08.3.tar.xz",
+    "hash": "sha256-fsOZmdsy8uc3D2nhgOp9AkEMjhP6vFR1XAmOt0eLBCA="
   },
   "kcalutils": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kcalutils-24.08.2.tar.xz",
-    "hash": "sha256-/4Z0PJJoowu/mYYNG49luhb8QNkmLXWs8HAu+8VfZww="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kcalutils-24.08.3.tar.xz",
+    "hash": "sha256-dofOLjEh0cOZ7F2bPaIsiUzQdAy/ziMs4uKy0s5j2CA="
   },
   "kcharselect": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kcharselect-24.08.2.tar.xz",
-    "hash": "sha256-iZ6Vb+s8HmLTWixAIEM5k0FuKKcWAOfJfvYn9I5ss4o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kcharselect-24.08.3.tar.xz",
+    "hash": "sha256-J1o3Pc6Dz54oGI5urQ2/he9yihZ8QYtCVQMJeH+7X5s="
   },
   "kclock": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kclock-24.08.2.tar.xz",
-    "hash": "sha256-vE/mn8oWtQcly5W0cRzBshz4xfAjv3TZ1/AltcaW9ig="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kclock-24.08.3.tar.xz",
+    "hash": "sha256-ZGdRhoYbINKhcbMFzNX9yaYRcc0lTbrZ4O2VP86OLJ8="
   },
   "kcolorchooser": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kcolorchooser-24.08.2.tar.xz",
-    "hash": "sha256-pjtX2K5XH49WvHZWjdarDFOCzYdkuA7+ie/OGUNJ08s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kcolorchooser-24.08.3.tar.xz",
+    "hash": "sha256-l2O//RqSAUpueQdHEA4iEOghUZt+ugslZMObSf8WQTI="
   },
   "kcron": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kcron-24.08.2.tar.xz",
-    "hash": "sha256-hl1G8QYcVnpQ9VmrevH6/Sw/7bOsKJKTZwNVBv8K5tA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kcron-24.08.3.tar.xz",
+    "hash": "sha256-XPQ6r17L90bVGawXKeE/WjDzh7eiYCjoQR05HVZxRds="
   },
   "kdebugsettings": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdebugsettings-24.08.2.tar.xz",
-    "hash": "sha256-bu5AlIpmx9xrQii3TfrS7qfaPf4236Kj3GCwKANeyOg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdebugsettings-24.08.3.tar.xz",
+    "hash": "sha256-TvfMBjUONtubiwm1EuJVn35bPMSJsXFf9BIHsRwogcg="
   },
   "kdeconnect-kde": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdeconnect-kde-24.08.2.tar.xz",
-    "hash": "sha256-1xeNlrRF72YJI/MFqQ/GrszK5AScyZo57mwXrAv1HGk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdeconnect-kde-24.08.3.tar.xz",
+    "hash": "sha256-EOBeib2qAikdi20H7Br5AECofsK8Ab+WpoyKEUNP/2g="
   },
   "kde-dev-scripts": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kde-dev-scripts-24.08.2.tar.xz",
-    "hash": "sha256-B0IgBO4xUkQ/z/LUncul58uavGKNbwLhZaSAHMROc7o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kde-dev-scripts-24.08.3.tar.xz",
+    "hash": "sha256-VH/7Tp8HFTB1BcffHveFJvrFQ9/pJ89sY/VQLui859g="
   },
   "kde-dev-utils": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kde-dev-utils-24.08.2.tar.xz",
-    "hash": "sha256-MY5Gn1LAaoasGo8DRZhSJLUTZk0Ra/77k/TejdDdg8g="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kde-dev-utils-24.08.3.tar.xz",
+    "hash": "sha256-nWu753flast8jBKbKKkYWvV5vN+LeZ6v5amk/WA0M+Q="
   },
   "kdeedu-data": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdeedu-data-24.08.2.tar.xz",
-    "hash": "sha256-XNf2MDYGKALxk147hXRMYSALKi3CL01JQD+czh+qj1o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdeedu-data-24.08.3.tar.xz",
+    "hash": "sha256-HOF+tOcHDT/6fPquzS2XscUr3zw5GH2ID3CPby/6oo8="
   },
   "kdegraphics-mobipocket": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdegraphics-mobipocket-24.08.2.tar.xz",
-    "hash": "sha256-Vr/d8kznRVE9bfLClfEZ3mhwmB68z40GoQZoIu1/OZU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdegraphics-mobipocket-24.08.3.tar.xz",
+    "hash": "sha256-7k6VmqbZdTs+cVuY2pIlHaQWIeOH/gZTHwpvrQV/o0o="
   },
   "kdegraphics-thumbnailers": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdegraphics-thumbnailers-24.08.2.tar.xz",
-    "hash": "sha256-1SBgDqNVa6IRH/TlzRWHSJpUy05t0aXmJriZwpKeGgs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdegraphics-thumbnailers-24.08.3.tar.xz",
+    "hash": "sha256-tadDr5G6LOp3zetVFLFnu6aV02isLyN4WOGgdXnHO1g="
   },
   "kde-inotify-survey": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kde-inotify-survey-24.08.2.tar.xz",
-    "hash": "sha256-w470km+siTY+Gn22H/Ofi/dzbtQJoFj+wOUt1rCEoLM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kde-inotify-survey-24.08.3.tar.xz",
+    "hash": "sha256-t9lW4bD459WTOTGBJVse2cYOwvChyIsem2wFcPdQtTo="
   },
   "kdenetwork-filesharing": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdenetwork-filesharing-24.08.2.tar.xz",
-    "hash": "sha256-elaWVNVNgwbH7GIA4JKxoD+LGnPPS3ylQ1RKx7jUTGU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdenetwork-filesharing-24.08.3.tar.xz",
+    "hash": "sha256-Tmkr7bYLRsOCCG4CEjJbhgZZPAefFnm4ui+dQ9xMXU4="
   },
   "kdenlive": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdenlive-24.08.2.tar.xz",
-    "hash": "sha256-FVZonukudpc1tZG79ntBhnGBD+7tCepWXpyKAL2/j7c="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdenlive-24.08.3.tar.xz",
+    "hash": "sha256-thtgxTu9Flf+gWuzwIlU97n3x2pi0Jn6vTzZGQo7s50="
   },
   "kdepim-addons": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdepim-addons-24.08.2.tar.xz",
-    "hash": "sha256-zkUIDKMo/ysCDPjh17CSSg19xIMBEbyUgUHB4lavqRI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdepim-addons-24.08.3.tar.xz",
+    "hash": "sha256-DbIDPDxnN2bDJnORtSiSDH7PZr8gM6imnG60/KWxpUk="
   },
   "kdepim-runtime": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdepim-runtime-24.08.2.tar.xz",
-    "hash": "sha256-JA4T/FBvA1csCMDyl/TPJtMTpGfhc8/kCLLSnsbu8Pk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdepim-runtime-24.08.3.tar.xz",
+    "hash": "sha256-bEGbV1+Hts9iul2gasKELoBagLmRi5KzfPu6Qob83m8="
   },
   "kdesdk-kio": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdesdk-kio-24.08.2.tar.xz",
-    "hash": "sha256-072EF549k2FZ3t+psVaGvY0/8Y7V/mZg4PON9tDXI6E="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdesdk-kio-24.08.3.tar.xz",
+    "hash": "sha256-T7MAV9eVkrjD5BdAMTUItt2YTv+7rrVoE7Oqr1TZUvc="
   },
   "kdesdk-thumbnailers": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdesdk-thumbnailers-24.08.2.tar.xz",
-    "hash": "sha256-f8rNnHRu2fcwKBZ9jEIhvGc29HQB2ofzvoO1+G1kj9o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdesdk-thumbnailers-24.08.3.tar.xz",
+    "hash": "sha256-t+tEx/wnARSDaVmwWCBWh6VKM61+XOM6uQ+x+W0aLfM="
   },
   "kdevelop": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdevelop-24.08.2.tar.xz",
-    "hash": "sha256-Pfw4jzWYoZPWlVVEb5F/RBgeAt6jgA/w5qC56AgdCgw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdevelop-24.08.3.tar.xz",
+    "hash": "sha256-oWkMlnLggGRRDk2cQiohS20RpUzqVlbinJRFcBr0z3E="
   },
   "kdev-php": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdev-php-24.08.2.tar.xz",
-    "hash": "sha256-Yqu92NqkVMjq3DnDC+DdnT6hkD0BPfsoc8x8eL07dcU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdev-php-24.08.3.tar.xz",
+    "hash": "sha256-kicd/IWUD0N7UiLsVg3O1xZzXxQwLtFEo3Jg20BW6LY="
   },
   "kdev-python": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdev-python-24.08.2.tar.xz",
-    "hash": "sha256-3i87y9312GpnLHgj50Ac83kmWHWGcQRkERdiDRoUk60="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdev-python-24.08.3.tar.xz",
+    "hash": "sha256-BWRMMAML/VHLVB+APwWkIBTLXt+f9evCOFghGs4N3MI="
   },
   "kdf": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdf-24.08.2.tar.xz",
-    "hash": "sha256-/H5SFpxijru+cdtu0PM5WmbLoPKQO4Y4IkWH9IoIYec="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdf-24.08.3.tar.xz",
+    "hash": "sha256-tevZjeAKkeJpDhy6olihgi2EKQRvfCUuzPnnlwWGjso="
   },
   "kdialog": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdialog-24.08.2.tar.xz",
-    "hash": "sha256-FtrMEHqOiqdTfptR3a3X2RtaxHYOVRexplrcmnP6fIA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdialog-24.08.3.tar.xz",
+    "hash": "sha256-eBoum0VlY/BtmiwNP+rFTxVra40NGAlKorehy0V5b8M="
   },
   "kdiamond": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kdiamond-24.08.2.tar.xz",
-    "hash": "sha256-ijJ/XtNhKu2HB0yidl7u0QWE/TiD9R/9zX4DDuob6qY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kdiamond-24.08.3.tar.xz",
+    "hash": "sha256-RRYTTaF73OyHfZELiZt+vuQLqW2H5YY0lWrqlKa2aK8="
   },
   "keditbookmarks": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/keditbookmarks-24.08.2.tar.xz",
-    "hash": "sha256-0sgvXfWAHsbfE40QRg6U7Dg+79O1dZ7LY0QtkuQDwAU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/keditbookmarks-24.08.3.tar.xz",
+    "hash": "sha256-BjRlRPmHer9sInI/Nv7RLlMEJWj6+5DUel5OjsgqwqE="
   },
   "keysmith": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/keysmith-24.08.2.tar.xz",
-    "hash": "sha256-TZCj+9bbc/YtMjiDE9HKIrFxM7UiS+3zGL2ZVMIeIVs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/keysmith-24.08.3.tar.xz",
+    "hash": "sha256-aXsnHd2zRWfkv7iL3MxAd/+4VRzoELFyYxV4/ZBtp7k="
   },
   "kfind": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kfind-24.08.2.tar.xz",
-    "hash": "sha256-kgZyhADD7d4ho7w9sE9/cyVYj9atPHjeOxBeP6P1REU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kfind-24.08.3.tar.xz",
+    "hash": "sha256-km7kNllo1XcAzXXComV2pCNYqBVI97ap81vT990JeUM="
   },
   "kfourinline": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kfourinline-24.08.2.tar.xz",
-    "hash": "sha256-9e1XGGOG4ZaKa/eVdpzJx4wPVuMAHJqmybHZjXqjTKI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kfourinline-24.08.3.tar.xz",
+    "hash": "sha256-WUqlmEGwomWWJcxviWi1puzmcgwSGbNP6APfjhC0ZzQ="
   },
   "kgeography": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kgeography-24.08.2.tar.xz",
-    "hash": "sha256-8dx1e9iIDufFxOaelDVWry6FR1s7GGnNdOm6agS+pKI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kgeography-24.08.3.tar.xz",
+    "hash": "sha256-zaGiscWjmQlobuybt4tM0icYTQJuhhd2dIca6GVRxjY="
   },
   "kget": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kget-24.08.2.tar.xz",
-    "hash": "sha256-aQw0IeOLNz6CVzCoMKiBOSwXGfB4zsEh1oYgqn7Sc4s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kget-24.08.3.tar.xz",
+    "hash": "sha256-7IBCjXbtObp8YWRQUudHq6QRThVp7V1LW/HnaGZ32IA="
   },
   "kgoldrunner": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kgoldrunner-24.08.2.tar.xz",
-    "hash": "sha256-BZ0vTWG7jDVA2AwCHh//VWwT0+B75yDRZ61kbyE7rEY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kgoldrunner-24.08.3.tar.xz",
+    "hash": "sha256-DORIMWh28mqh9ZtNqt57BCoRvIfqPSMK8fnD0K7g6G8="
   },
   "kgpg": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kgpg-24.08.2.tar.xz",
-    "hash": "sha256-CEtAQ/89tflnXDmSo2tp3bPGjp7G8HVT/Mz+40iY8ww="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kgpg-24.08.3.tar.xz",
+    "hash": "sha256-kLFLiBTDUYQ1yRmYrKF73ifBC/FMlOYhjhKruAuKaOo="
   },
   "kgraphviewer": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kgraphviewer-24.08.2.tar.xz",
-    "hash": "sha256-lMg+REm/0cFOVrEX/0NdF6C64Eg0VAU1kHnv3wps3JM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kgraphviewer-24.08.3.tar.xz",
+    "hash": "sha256-IrgYex2hit2HCMgR02KQ/w0UQjgQe0tRjSUA7mPCdkc="
   },
   "khangman": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/khangman-24.08.2.tar.xz",
-    "hash": "sha256-m9bXQ3NbrENOON+Q9b6FbQRxg6SUx2tlxKiB70Puu+o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/khangman-24.08.3.tar.xz",
+    "hash": "sha256-re3ADkcnULCkOX1bq99XhxkBCY+ZjQRlc6l17ZXu/IQ="
   },
   "khealthcertificate": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/khealthcertificate-24.08.2.tar.xz",
-    "hash": "sha256-g0Lr8zupMlyFLKyVPS9fB1Mo27E/BNy8507Xyfo7Z70="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/khealthcertificate-24.08.3.tar.xz",
+    "hash": "sha256-NuffNA4ZvaLEzy2cQw4DJh0E38E4wEKldB8Uvs1iI+c="
   },
   "khelpcenter": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/khelpcenter-24.08.2.tar.xz",
-    "hash": "sha256-ZYzPiHsHHWnl6y5k3poLMrJj/7Mf45zKlJvUXpvai4Q="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/khelpcenter-24.08.3.tar.xz",
+    "hash": "sha256-YLt1iVIVB81UMNaCyctcQQLOPYRIjZgJdeY2wu2+hsI="
   },
   "kidentitymanagement": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kidentitymanagement-24.08.2.tar.xz",
-    "hash": "sha256-UKbggnbv1eaNJYLB2j+Mjh3aTMRzrP9IRf7AJ9yj9xU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kidentitymanagement-24.08.3.tar.xz",
+    "hash": "sha256-judaWpDrdARnSXBKbCTz/xSuQSiv6Qke24toq0hfg00="
   },
   "kig": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kig-24.08.2.tar.xz",
-    "hash": "sha256-oNpiWtSK8ipxfEdXQPRCE8mCLMJJKPUWQ7GvLKdbOqk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kig-24.08.3.tar.xz",
+    "hash": "sha256-yO7QkHaqCy8eBxKpCI9KpNCQGPJ0MGwsV1QCS96jzzg="
   },
   "kigo": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kigo-24.08.2.tar.xz",
-    "hash": "sha256-kxzRX+w1jIC/g1bKoNaTDZI75B3SvNLab4MsM51uPa0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kigo-24.08.3.tar.xz",
+    "hash": "sha256-P0bgPd6dp01kHHIs75/F153m26G+rGLloJPYQhH1R5k="
   },
   "killbots": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/killbots-24.08.2.tar.xz",
-    "hash": "sha256-k/nu5nE+ieaLElKi2xeLuMpzaZFDPLy/XMHUG9wEot0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/killbots-24.08.3.tar.xz",
+    "hash": "sha256-OllWrbpBcE30BHXvvmD0L0czzju5b5YY/ZDEOsCbCzA="
   },
   "kimagemapeditor": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kimagemapeditor-24.08.2.tar.xz",
-    "hash": "sha256-r1twJIsYbBxa65hiX2wzJeMqHFKSoI2w8Z6pXExEjOg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kimagemapeditor-24.08.3.tar.xz",
+    "hash": "sha256-8opYtviM5Ju0hIhcftLnZg6P1ZO6bJHB30YjDTN+F8Q="
   },
   "kimap": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kimap-24.08.2.tar.xz",
-    "hash": "sha256-q93DHzE4LiESTQ0EgRgoiTQ7c7kxjcEgQ+1euq+edTU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kimap-24.08.3.tar.xz",
+    "hash": "sha256-8pGbTQl+Ez/9dKkm9vI7HMioDzaJDr4nDftkDZiNOH8="
   },
   "kio-admin": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kio-admin-24.08.2.tar.xz",
-    "hash": "sha256-9+BSkZmhYaaz0ynwN7AUhulZxe6De53rhdDHzx8YcmM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kio-admin-24.08.3.tar.xz",
+    "hash": "sha256-DnG+/5CBX2++usNrNoVQ+6WR56am2lBG+uCb80HkNHI="
   },
   "kio-extras": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kio-extras-24.08.2.tar.xz",
-    "hash": "sha256-mab1SMeqwYAX6+K3OsmTJ/JYW0GCV7wcfgZc7YK9LMc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kio-extras-24.08.3.tar.xz",
+    "hash": "sha256-9BdXF+Lypccwui9ycRPoEQw6KDxfZ2A9NpwqP1YaaKo="
   },
   "kio-gdrive": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kio-gdrive-24.08.2.tar.xz",
-    "hash": "sha256-0/qmsTsjiL729aiu2blyKg9q/oC6s8nmWwSnB0xL2v4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kio-gdrive-24.08.3.tar.xz",
+    "hash": "sha256-+GMMjTjzBwc2lphXRTDe4mvnknQJ5aVv+jfVmzTt5e0="
   },
   "kio-zeroconf": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kio-zeroconf-24.08.2.tar.xz",
-    "hash": "sha256-Cv68ADR4ybvVUcSwk5kHx//w7epXkA0hqj1w+AO/6oU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kio-zeroconf-24.08.3.tar.xz",
+    "hash": "sha256-zWKCD2yPwa1ZyHYSrPoHYsL/AuaZp+7JO37+IoKnoIQ="
   },
   "kirigami-gallery": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kirigami-gallery-24.08.2.tar.xz",
-    "hash": "sha256-iESLnXKQaz9qUgmeA7ZX0PIBBoEoFo1VDHM2w1uXX0w="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kirigami-gallery-24.08.3.tar.xz",
+    "hash": "sha256-USD7vpAZkhBduNXQ2rt2KX94YSKocA3BYEH34gzBfdg="
   },
   "kiriki": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kiriki-24.08.2.tar.xz",
-    "hash": "sha256-NROQyN1YPX6+bXhk0lJf778qGV7BTdqzi72pAqTw+5k="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kiriki-24.08.3.tar.xz",
+    "hash": "sha256-CjWYO7yDaQuNQVIzvJawTfTwLgQSIaKlaab6Ut5dR3c="
   },
   "kiten": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kiten-24.08.2.tar.xz",
-    "hash": "sha256-T2MDF8rJH7bTX3epmHMKK7+dKmhL5t7VU9mrqFpcEes="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kiten-24.08.3.tar.xz",
+    "hash": "sha256-QoMfFjzabHdT4j7vtt48Nt5m69jrMVAIrHFarEoeIyA="
   },
   "kitinerary": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kitinerary-24.08.2.tar.xz",
-    "hash": "sha256-bzyMInh90qk5OC4qQrcczczW8j/KTDHrIIDn2sWFJck="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kitinerary-24.08.3.tar.xz",
+    "hash": "sha256-8P9NEDyT4kdw2UQyr9Cs9FbvynDgDUdJ1zSl/5jP0Us="
   },
   "kjournald": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kjournald-24.08.2.tar.xz",
-    "hash": "sha256-+ynx9UmyxWBuM8Nvt3U7gITn5PmFNkfreddfujHZqlE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kjournald-24.08.3.tar.xz",
+    "hash": "sha256-r3UIG9rrG8ODQBhi3o2wKYHnr03BlCyXdo9j/L/FDBs="
   },
   "kjumpingcube": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kjumpingcube-24.08.2.tar.xz",
-    "hash": "sha256-RCQ3DCAyCjCDZIyAogMXOFNQLr3JvnXvpjTatIugpOw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kjumpingcube-24.08.3.tar.xz",
+    "hash": "sha256-o8SUexZqX7GUgsYQxCkd1hH08D8v4E8+rBXnw4IF2UU="
   },
   "kldap": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kldap-24.08.2.tar.xz",
-    "hash": "sha256-gjpCxxdpl9m4/b8xQJFs9KikON5322jH6hAx0Muk/us="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kldap-24.08.3.tar.xz",
+    "hash": "sha256-HgBc6Ber2HUosl5dd2N+N5L8LyLX2FzAS8C1lnoIJow="
   },
   "kleopatra": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kleopatra-24.08.2.tar.xz",
-    "hash": "sha256-hgPbehv8Rsi+1diYh9XbVEk923iUH9qgPBIa1pSyw5U="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kleopatra-24.08.3.tar.xz",
+    "hash": "sha256-Ts7GqwKG3ElXWoeI8jQEVPjs3/14AhQ3OdNqvhKZbxo="
   },
   "klettres": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/klettres-24.08.2.tar.xz",
-    "hash": "sha256-ZdHQfMFj0MAvw6aOSrizZZDYmQ3JoQoHsdIm35qZszE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/klettres-24.08.3.tar.xz",
+    "hash": "sha256-+qQwJ0tYlczTxRO5niYFwKi8RQ/Qucy4lTFSl8YKHp4="
   },
   "klickety": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/klickety-24.08.2.tar.xz",
-    "hash": "sha256-Si36hCgOwRWeDXN0Q6xjhG4eDcYIX5/X+HbaeBM/vhY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/klickety-24.08.3.tar.xz",
+    "hash": "sha256-ItY3y7IuzFBB9wj5VPBSbBTj6Y8ThoUVJya7T/5ZNAI="
   },
   "klines": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/klines-24.08.2.tar.xz",
-    "hash": "sha256-GMQLh5yv+QKWfHLgtpO7xnFUimOQXXK0RKprUqS539w="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/klines-24.08.3.tar.xz",
+    "hash": "sha256-IzREToGJzTBGogKzUVK37pp7vmeYm0o3bbwVN7KneOM="
   },
   "kmag": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmag-24.08.2.tar.xz",
-    "hash": "sha256-FXPLvIrXR6LHHx8bu8we3pxsabkEnpelM/jK/HrN5HY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmag-24.08.3.tar.xz",
+    "hash": "sha256-ae5hNby9eNIm2V3t0dC4ZpWX2PlBTeg/zEFnNNaGnsY="
   },
   "kmahjongg": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmahjongg-24.08.2.tar.xz",
-    "hash": "sha256-vKnxozJamIxLLu1KWUZjWEyUUXHTrfXzRDBdhObt62A="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmahjongg-24.08.3.tar.xz",
+    "hash": "sha256-HZFcM41OvIMNhWXSq/NvIy8CNnL9yprHPBirVnX7hlk="
   },
   "kmail": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmail-24.08.2.tar.xz",
-    "hash": "sha256-JpaEbLE9yDRdlkidTtGD3kkyj74jOloVVfS5CFHOY4k="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmail-24.08.3.tar.xz",
+    "hash": "sha256-VmIar1YuS0U6qyYxgDdu4gqZZK1XSys8HTbkKGBBRio="
   },
   "kmail-account-wizard": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmail-account-wizard-24.08.2.tar.xz",
-    "hash": "sha256-bvJ85SRmU3euCCqgx/Y3WJT2AaMhwXRej5qmgbp3pDk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmail-account-wizard-24.08.3.tar.xz",
+    "hash": "sha256-TpXWYUQ8m6SSgE2o0e9M4KRzPpxnEpnO6pN8VXZFhSE="
   },
   "kmailtransport": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmailtransport-24.08.2.tar.xz",
-    "hash": "sha256-9f3gtgXNis+XADBqQGe0Bd86okDcyNBpRoX+icNknWM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmailtransport-24.08.3.tar.xz",
+    "hash": "sha256-uxr6At9Ed1Pu1EAmqpDDE9QkAWRK0QMsbJE3GpE2Lmk="
   },
   "kmbox": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmbox-24.08.2.tar.xz",
-    "hash": "sha256-dN6qSzL+PAII8RUpgnnEwtI2+nV3QUnBskDLAx23bN0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmbox-24.08.3.tar.xz",
+    "hash": "sha256-Qq5ZGqMm+omcgNvXjrdAK6tlEco6R27X6cC/6B3jUSs="
   },
   "kmime": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmime-24.08.2.tar.xz",
-    "hash": "sha256-Ahj+H6XvAxik6O9igR2qCu3vFeu+ANMarlNYW0VspmE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmime-24.08.3.tar.xz",
+    "hash": "sha256-F/IfPNOpT9Pgp0HlMgwU0vjbTFazkRHDL3sMNoFDfEc="
   },
   "kmines": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmines-24.08.2.tar.xz",
-    "hash": "sha256-C6GK0MrBsXTOfiIum0ara4+nlPoUMYTq0KKTBKMm73Q="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmines-24.08.3.tar.xz",
+    "hash": "sha256-eS44yUvBCp3FsgVbIGvYEfDVQXt/lVpOujeuJeacMbo="
   },
   "kmix": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmix-24.08.2.tar.xz",
-    "hash": "sha256-gxQ0bqFj5AQIY5abO49MdL5PrH3WvJsNz70F3Po4i/w="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmix-24.08.3.tar.xz",
+    "hash": "sha256-pnF22uXTALak2jdbWk8+Ke1iv6OAoQVaWslauk8x73E="
   },
   "kmousetool": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmousetool-24.08.2.tar.xz",
-    "hash": "sha256-/Lr5RH/ua/ADYqbGg3I4ahGiT3Ln5co7mrtwOOXwme8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmousetool-24.08.3.tar.xz",
+    "hash": "sha256-3PZL9Zt1hMmIwLTYkbBF3TZbalRr1s+3GFoWID7tK5k="
   },
   "kmouth": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmouth-24.08.2.tar.xz",
-    "hash": "sha256-SyIboErUr/O0YBzss62WSoAGcmfUWCwZXykMzLfC6k4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmouth-24.08.3.tar.xz",
+    "hash": "sha256-0r7g2MmVU/PWTQ7FSHC5zY3msBh5rSFg4LzQ0gi4lE0="
   },
   "kmplot": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kmplot-24.08.2.tar.xz",
-    "hash": "sha256-AhayVF52HOZFrhl86Iypm7W4d4ze01rduLMclM/TzQc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kmplot-24.08.3.tar.xz",
+    "hash": "sha256-i4oJ1i78ChSG7ppNi4ZxHpFRczUHp+tfMyvlCwAW1Gk="
   },
   "knavalbattle": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/knavalbattle-24.08.2.tar.xz",
-    "hash": "sha256-RXAoyJACcl3bj1jh/osvt9t1bhJA3hu4/Kh61yuuATY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/knavalbattle-24.08.3.tar.xz",
+    "hash": "sha256-f/5oHCZW0+RLUIKj3z3IsB3BgGIgJYGTrOYC1CuzvgQ="
   },
   "knetwalk": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/knetwalk-24.08.2.tar.xz",
-    "hash": "sha256-qwuShnEQX3YgnijPXSCa9IcA03osLAAMFx6yOrJrVyk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/knetwalk-24.08.3.tar.xz",
+    "hash": "sha256-4Uc/eURmbg9Ljgz68s1gbZEcY0JPyKAmlv1yKRCL3D0="
   },
   "knights": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/knights-24.08.2.tar.xz",
-    "hash": "sha256-6AOkE+WULrSTBaISHl9+gjUylRreiqcgO+vtGqqki+U="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/knights-24.08.3.tar.xz",
+    "hash": "sha256-3t/8wMM4jlxVxM4lK4v5kPevpHXdqCG2gOXeiNHi24s="
   },
   "koko": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/koko-24.08.2.tar.xz",
-    "hash": "sha256-9LgcWc2vby6MGsJn6ULUWT695MdQqHFHvZoRQpZtkIo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/koko-24.08.3.tar.xz",
+    "hash": "sha256-f6pseD1xVRQBBATmYY/1STCWjlIh+cQ6LS//VpQn4Kw="
   },
   "kolf": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kolf-24.08.2.tar.xz",
-    "hash": "sha256-7QdOexrxPgWsA2J6cLuPEDpUUByXdXvmri5vZjiEHbo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kolf-24.08.3.tar.xz",
+    "hash": "sha256-XSnLSa+iZw+qSzeLJXRPVUf2koY3j5Cumu4cl9sU9dQ="
   },
   "kollision": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kollision-24.08.2.tar.xz",
-    "hash": "sha256-QQLAUw38CcYaoQwECPpu94pdAcWW1lYNw1gDf+3TvTM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kollision-24.08.3.tar.xz",
+    "hash": "sha256-JZK0jQGkD0gXLCJJgBUaMjy5ChHBeQzddxwHMsZLCro="
   },
   "kolourpaint": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kolourpaint-24.08.2.tar.xz",
-    "hash": "sha256-lCdxvhNMCHGWcBVmLeiLSHcGzXU6b86l/+2VPRL50JU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kolourpaint-24.08.3.tar.xz",
+    "hash": "sha256-Ds/4+T4Qa+z5LGU/FV0GMWfBuhRvkuypPLKhuTa68Vs="
   },
   "kompare": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kompare-24.08.2.tar.xz",
-    "hash": "sha256-c3szGmxqba/pKyNYSrX8mTAL91aK8a7zRJNnbeWqk4Q="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kompare-24.08.3.tar.xz",
+    "hash": "sha256-X5dnD25FOdVSGreQEUd039R+BF5FqJ83f77dz8WcKC4="
   },
   "kongress": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kongress-24.08.2.tar.xz",
-    "hash": "sha256-0Dzz9OXJwvb6xneFLYKA2YYontUejC0wkJ7EbWUEjPw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kongress-24.08.3.tar.xz",
+    "hash": "sha256-R/RF5/kaML9vXHaCD864w1SQYrT9/8KldenmsLFdY+I="
   },
   "konqueror": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/konqueror-24.08.2.tar.xz",
-    "hash": "sha256-N6LnTlpBiMTkqTlPeTu7cO5LcBiQ6gssP/A6JAo+Bzg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/konqueror-24.08.3.tar.xz",
+    "hash": "sha256-jeov+AcIMKUNrv07hIgs77QRU6ieJRB/4sYh+NYpBdA="
   },
   "konquest": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/konquest-24.08.2.tar.xz",
-    "hash": "sha256-KZHlAGcCsjReJa9LY/ESSx2O1eunERRQRo2OuBEBd24="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/konquest-24.08.3.tar.xz",
+    "hash": "sha256-/w4x/0J3j+DlhBZtkTottUgecW2Q7ziiU4oZevbJh40="
   },
   "konsole": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/konsole-24.08.2.tar.xz",
-    "hash": "sha256-rnLKTi2RI7m62pnS07ATmP9QgrVJs4V5z5qpTCv/1xk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/konsole-24.08.3.tar.xz",
+    "hash": "sha256-aHSYp+uAUFSf2aW8lCEvHMfzO4H+5Aa2Sh72t8ZQWNo="
   },
   "kontact": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kontact-24.08.2.tar.xz",
-    "hash": "sha256-Orw/nc1SbPn96oWc5dfcvIrrEtMvMwQP5INVO8Y5NlA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kontact-24.08.3.tar.xz",
+    "hash": "sha256-CiJXCHUnRWgbx7pdbH5pTdFkwBVCr9HQVzt7IMewWIY="
   },
   "kontactinterface": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kontactinterface-24.08.2.tar.xz",
-    "hash": "sha256-mq2qHgFLoYSCMY6uZ1WcpTwVztY4yFumTNfoW6YZaVc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kontactinterface-24.08.3.tar.xz",
+    "hash": "sha256-urEcK9nw9wCOLwRM6FY7Pffs6hBmoGBZD/AmdsC1AiU="
   },
   "kontrast": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kontrast-24.08.2.tar.xz",
-    "hash": "sha256-7WCx4in6SisFEcToonoZR5tpJ09psY93ggkize0LUQQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kontrast-24.08.3.tar.xz",
+    "hash": "sha256-wz1UlXbSMPn0ohKL+KJWf8A2bqjgQye6YbqUYsJM+cE="
   },
   "konversation": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/konversation-24.08.2.tar.xz",
-    "hash": "sha256-rCLjp9t+iDT3zQrY45hKuErK2IoE/kOz4WyR50NSbK4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/konversation-24.08.3.tar.xz",
+    "hash": "sha256-dfWmSJDP6JUhTf77CHBa+US2PqmBbGKDke8TygR8s1s="
   },
   "kopeninghours": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kopeninghours-24.08.2.tar.xz",
-    "hash": "sha256-Phl+XVjCNZiJgttT1Mm/1BfdbUS+l/2KeRhgfaOOyqY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kopeninghours-24.08.3.tar.xz",
+    "hash": "sha256-hHiA1K6Yh+CrUCypypNKYCWeO0aF3lDUpysAie2crrQ="
   },
   "korganizer": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/korganizer-24.08.2.tar.xz",
-    "hash": "sha256-44SVgn/vjYNkyNT+cFQyBo+Dy5gcv2mGu32BA/c3rjs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/korganizer-24.08.3.tar.xz",
+    "hash": "sha256-q+pQKP7oiNP046e44sLDG2eGdgCLsU/BDuaJBJjWn2A="
   },
   "kosmindoormap": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kosmindoormap-24.08.2.tar.xz",
-    "hash": "sha256-xnbTm2PDgZkjsCcjryRYSBUI8R4LKl21hO5mDJmWRcY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kosmindoormap-24.08.3.tar.xz",
+    "hash": "sha256-N+hZzMUl8PWCj32MneAqNDkoUzrCC0h5XosXkZFKcvk="
   },
   "kpat": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kpat-24.08.2.tar.xz",
-    "hash": "sha256-LZ2oYxXkJLSEBA4ZEUO+CpNupDhUPQeNlud9xSg6BPI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kpat-24.08.3.tar.xz",
+    "hash": "sha256-fg9eCn0O+OnWxhY0yDDxnwfUHRJTAw4B1a5gEngojBs="
   },
   "kpimtextedit": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kpimtextedit-24.08.2.tar.xz",
-    "hash": "sha256-VVtlkHcxQcTYRdbzoCq7Qjh+rUywD+L+wM4XhbanfIU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kpimtextedit-24.08.3.tar.xz",
+    "hash": "sha256-fSTukD/dIj69KBegeiGuewKkT3AJO4D6NCHn+rbBD5Q="
   },
   "kpkpass": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kpkpass-24.08.2.tar.xz",
-    "hash": "sha256-PwlaqwtPewP6hKSlnKq0UbVF6aPswi3E/ujttZcAy7s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kpkpass-24.08.3.tar.xz",
+    "hash": "sha256-us4qnRHXEtWlufHmHBOzOuRQop23MN6AdZfkzOxD6kg="
   },
   "kpmcore": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kpmcore-24.08.2.tar.xz",
-    "hash": "sha256-gdMPMyKssuuHUemAr2yLE/w5lGg/T5AuWIImtwpFZ5U="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kpmcore-24.08.3.tar.xz",
+    "hash": "sha256-OioQrUeXa1lu+KVhKXu0OfC5AnGU1EwRNeg/os8+wiU="
   },
   "kpublictransport": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kpublictransport-24.08.2.tar.xz",
-    "hash": "sha256-qkSjVdz7kC70RIDFSUDfdH3uj3+zYwHa+88F7DCiNOE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kpublictransport-24.08.3.tar.xz",
+    "hash": "sha256-Y1i418bcGQCO6eWF05PbjxQcbV93z8GPPTDnpNa8ZP0="
   },
   "kqtquickcharts": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kqtquickcharts-24.08.2.tar.xz",
-    "hash": "sha256-seLcgMf+J/5VUIxkIaua85DcbjxKvwMVFqGm5GMMzP4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kqtquickcharts-24.08.3.tar.xz",
+    "hash": "sha256-Q9hZNNgHAsmvpLM3KPPwqjPTC4shwfybgZwZ31gYd/s="
   },
   "krdc": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/krdc-24.08.2.tar.xz",
-    "hash": "sha256-D71VooCV08hGSc/b4S3YaN3swjIF9pjtA+gkWFyLxgs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/krdc-24.08.3.tar.xz",
+    "hash": "sha256-LwSkCENHAq7knK+cAZPDRxoEnzQbDoo2p3Pn7ZOBCvA="
   },
   "krecorder": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/krecorder-24.08.2.tar.xz",
-    "hash": "sha256-6lW1IeWyhnbcASri5Zmodmi7PRIEpm1jIKGeK3cqk5o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/krecorder-24.08.3.tar.xz",
+    "hash": "sha256-U2l3kWk7wvpzgbJ6KnBgoLkPcksFKznWy0S5lTz+03g="
   },
   "kreversi": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kreversi-24.08.2.tar.xz",
-    "hash": "sha256-CumrjLymqw2bBYRwBpVFDSmKa7azg5XklJ6BDaWojOE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kreversi-24.08.3.tar.xz",
+    "hash": "sha256-hDbTC/prjMrOAgrTTuWL9quJ9t0+QTe9KV3T3RBVf3A="
   },
   "krfb": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/krfb-24.08.2.tar.xz",
-    "hash": "sha256-wlCw4RbGk1f3sZQVqsN9eOIogLqffZhbB2doFSNeoS0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/krfb-24.08.3.tar.xz",
+    "hash": "sha256-S2IThzVr22wwZAXjDivUhZoXDHgZOasKEg+yBuKajH4="
   },
   "kross-interpreters": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kross-interpreters-24.08.2.tar.xz",
-    "hash": "sha256-k0PPK0U8xZdXgOkMobBOx6fwScCZVMjc2Samu7CTc3Y="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kross-interpreters-24.08.3.tar.xz",
+    "hash": "sha256-GRA08Sav8dWi8DgUMSgeXD7lKICyiY5rlP4PtaoSsPI="
   },
   "kruler": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kruler-24.08.2.tar.xz",
-    "hash": "sha256-E742B4bxaTk7R1akC6HxXklEvi/HxKS7T4dEM+VI5lU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kruler-24.08.3.tar.xz",
+    "hash": "sha256-BcaIHNn96y797CXKDjDywRNel3U95gt3mQZ+yETs1cY="
   },
   "ksanecore": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksanecore-24.08.2.tar.xz",
-    "hash": "sha256-+RwD6UWjRgdwZYFLJjeNmTjho5wiyIGFo2YmoFI6R00="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksanecore-24.08.3.tar.xz",
+    "hash": "sha256-ebJB7naKv2aHIeLczJRFBBoolxYgivqngylArlj+7/o="
   },
   "kshisen": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kshisen-24.08.2.tar.xz",
-    "hash": "sha256-i+eVjXDXrXmS9iz2zptphVZKSytg0RfpZWpM9LMNdUo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kshisen-24.08.3.tar.xz",
+    "hash": "sha256-+91uYtsfwGCkBe0Vk8nhFEm/TjNwtbNe/Cc/AoARJUY="
   },
   "ksirk": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksirk-24.08.2.tar.xz",
-    "hash": "sha256-t6StiVIRpvRJcx4U9P1SsNR5ZkhYvQpYrEM8pPKOSdU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksirk-24.08.3.tar.xz",
+    "hash": "sha256-RJsgK3QzWbzkxYn6sNpLF5EtrBLNygp/hdXK5sDwKKY="
   },
   "ksmtp": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksmtp-24.08.2.tar.xz",
-    "hash": "sha256-qKzU8s5G23niiUG/8AqO0Mv1Mv8hT0ltFyEnYrBNuGM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksmtp-24.08.3.tar.xz",
+    "hash": "sha256-VpdWxuAAwSzWqeBHW7PcBbIuu4KteeqVpfB425YOQbU="
   },
   "ksnakeduel": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksnakeduel-24.08.2.tar.xz",
-    "hash": "sha256-biJ1mBjUPOf/h67GpwoQniChBBV6/HTYukoJNASQ0CQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksnakeduel-24.08.3.tar.xz",
+    "hash": "sha256-9Ho1I7EpUvUj5MLjEroh3bGt5UbK/i8IsgAKZlnX3ts="
   },
   "kspaceduel": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kspaceduel-24.08.2.tar.xz",
-    "hash": "sha256-uF+cjbpgTOEhN5FefkXQjN7K6e2iAd9r2RqKOlb0+G8="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kspaceduel-24.08.3.tar.xz",
+    "hash": "sha256-WTQVrzvHqe8WDHouOMPcWVNT9b3DNy+3CAXhgaHaj08="
   },
   "ksquares": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksquares-24.08.2.tar.xz",
-    "hash": "sha256-whGNtx+TENOcwrQwVm7UC9z0wwF14zEs/bOS0JmWsWk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksquares-24.08.3.tar.xz",
+    "hash": "sha256-Nfkh8DFgTl1z+6MycQB3e+85Rzq+DdKh/y0PqHSNLog="
   },
   "ksudoku": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksudoku-24.08.2.tar.xz",
-    "hash": "sha256-Xoq3Sz9ONmLZcwHoGZwwsIeXNhu5VyEah0tcdvcUkZQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksudoku-24.08.3.tar.xz",
+    "hash": "sha256-AjEMlxORG9KQrpa9FfZKr+G2F0hhpiC1H/hwUw5qlik="
   },
   "ksystemlog": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ksystemlog-24.08.2.tar.xz",
-    "hash": "sha256-d7jmKc2cwJ/lg+mbuv/q/rN9jtobLGy0CCqUJ/qmqW4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ksystemlog-24.08.3.tar.xz",
+    "hash": "sha256-PlhOgGUOVExZQerMWH2w8YP+IaGIKsKg7n2J2cm7WfI="
   },
   "kteatime": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kteatime-24.08.2.tar.xz",
-    "hash": "sha256-c3HLUioLNkBHw+L0UFQpJ7fbM78hmGvjKhNuocyO39s="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kteatime-24.08.3.tar.xz",
+    "hash": "sha256-xcHNEXMKmLtU6T0GmWimngFtzkRfWb8yK2FUGIUDjCE="
   },
   "ktimer": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ktimer-24.08.2.tar.xz",
-    "hash": "sha256-y2Y7K86Np7pf2teDp2DKo5RtFtYZ1Ad16Za7D+0UKHY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ktimer-24.08.3.tar.xz",
+    "hash": "sha256-8t4QOabmVfH5l3jClvCB1e8wdMorqpEZbL22paKpIPU="
   },
   "ktnef": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ktnef-24.08.2.tar.xz",
-    "hash": "sha256-OI4PkxQTQplH5W380a1CnuI/2E3XkiI+uKSLHBKxhyg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ktnef-24.08.3.tar.xz",
+    "hash": "sha256-BgEjZXvjmr9X7yYpdLTpce5J3c5Qi44846J+PvyAyFg="
   },
   "ktorrent": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ktorrent-24.08.2.tar.xz",
-    "hash": "sha256-DCxxzPYJQ6AQF/a6ADYeYNlgjHrfHUTx6WesFlkW1uI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ktorrent-24.08.3.tar.xz",
+    "hash": "sha256-NwW5vb1dpR2ooNAGuaem2wMub3Bh4icJwRRqpdF8rUA="
   },
   "ktouch": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ktouch-24.08.2.tar.xz",
-    "hash": "sha256-vH63wPQAH8UIrikFUCAeWBZoSx6JI+So8FcHkboVhbA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ktouch-24.08.3.tar.xz",
+    "hash": "sha256-/6hbLejUVLQfyKntkgMuHEVoSZCHLKlYYZulNB4SfuA="
   },
   "ktrip": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ktrip-24.08.2.tar.xz",
-    "hash": "sha256-PinHfz/LMzs7KyF60K6igLWFQkCTBABrhUtK2rY3oSI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ktrip-24.08.3.tar.xz",
+    "hash": "sha256-t/hrYOMwqSxIBCPxJYfarw0/tqPKU6HFa7VGioMhVLY="
   },
   "ktuberling": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/ktuberling-24.08.2.tar.xz",
-    "hash": "sha256-YfpiOs/HC3GhfPTrC53vCT1+Jf2b4yLGzL4/NX3jtEg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/ktuberling-24.08.3.tar.xz",
+    "hash": "sha256-jiqTClaZmCccVR1TUg68Kyf7piJm43Sm1z175Eql0/U="
   },
   "kturtle": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kturtle-24.08.2.tar.xz",
-    "hash": "sha256-YgUCpPW9+QsN6fw2he48KP688UVsIrU4Xx+0bII4rak="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kturtle-24.08.3.tar.xz",
+    "hash": "sha256-Atg243ethCjZFJpfVJbwxsIt3zYvkicxMOSfS4Zkdbk="
   },
   "kubrick": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kubrick-24.08.2.tar.xz",
-    "hash": "sha256-WL2MdJ6rB+JQtDeMUc9SJmN1B5AZ82e8mRQc57KG/94="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kubrick-24.08.3.tar.xz",
+    "hash": "sha256-JSCj+3ss0ZbrFk1i4RPxcK7CJdtIaAkaD9XLWPaDVBw="
   },
   "kwalletmanager": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kwalletmanager-24.08.2.tar.xz",
-    "hash": "sha256-+hxNM3xo1jVzJ3YLiZ/VSjHCYGPNdWhoqyuMyZgrgLI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kwalletmanager-24.08.3.tar.xz",
+    "hash": "sha256-rr0MDZMnZhd0oTfxpXX0uJXv8AhfPIOyH7EAi3uxpL8="
   },
   "kwave": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kwave-24.08.2.tar.xz",
-    "hash": "sha256-AQQGXKXm8AQgt737Dr2S9SiQfC6WwpB60GkEAyij3P0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kwave-24.08.3.tar.xz",
+    "hash": "sha256-ij0Ys8OkBFHGC0mJuqsWIgK/qoQuACZeqzABPekZCIU="
   },
   "kweather": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kweather-24.08.2.tar.xz",
-    "hash": "sha256-9osHF6CnBwC9oHwGhxH2gYHElKqkvmFUfXgadWby52U="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kweather-24.08.3.tar.xz",
+    "hash": "sha256-N6CgnUlTz0wnnRcQ7K5zdiFm2O1UuLuAHMF3BJe1vU0="
   },
   "kweathercore": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kweathercore-24.08.2.tar.xz",
-    "hash": "sha256-PjkMyYg1lSNgxkFvve7tdbhzzC2/wMtf3CxyuTtn+xg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kweathercore-24.08.3.tar.xz",
+    "hash": "sha256-nIBnOFXLf6Z7VVJ1P/uAOWcqNmIPt5BpDEC7HAb9Pf0="
   },
   "kwordquiz": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/kwordquiz-24.08.2.tar.xz",
-    "hash": "sha256-6M7KqBCTNjmfo11lraebVG7x/8du8lFdhWKDXSENh34="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/kwordquiz-24.08.3.tar.xz",
+    "hash": "sha256-4vsCwjjW9nt6z8jT3E5+vUZEvmqeMMh6nsPLRTogqho="
   },
   "libgravatar": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libgravatar-24.08.2.tar.xz",
-    "hash": "sha256-W3UVMlJaKfK6VvlXWWxEYqEW6yBYwgCagCYNSo9pXdk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libgravatar-24.08.3.tar.xz",
+    "hash": "sha256-FjahE3Sx7zC69Xdku/cahT6CBTgMQU2SbuWp8GqcieM="
   },
   "libkcddb": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkcddb-24.08.2.tar.xz",
-    "hash": "sha256-qdZTAB5hG0dk5PqVnxCnMyDkdeIyshvtxle9zwJF9H0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkcddb-24.08.3.tar.xz",
+    "hash": "sha256-xCddlKTLhkzeUGEBe1I6IgypU6Y2updVvWNdne+UGxk="
   },
   "libkcompactdisc": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkcompactdisc-24.08.2.tar.xz",
-    "hash": "sha256-r1CI6BCuv/i+/8WAAVlzXgAybSCEKTFzH4GeQAAnw7Q="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkcompactdisc-24.08.3.tar.xz",
+    "hash": "sha256-jVRIC/JWigt5nGYxRZv20RE+IVPB1WSu/z5G/SwIQUU="
   },
   "libkdcraw": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkdcraw-24.08.2.tar.xz",
-    "hash": "sha256-TI/jV/L6+5V+UyDWGlWp10ZmWj7q/CTaKFGA63H7re4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkdcraw-24.08.3.tar.xz",
+    "hash": "sha256-8QbAgaNtwTlcNs6VBBG3YOvZFWsAK8eOEnHuHmItAFU="
   },
   "libkdegames": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkdegames-24.08.2.tar.xz",
-    "hash": "sha256-6n2S2qcRm40ww7xeggCZKtILdgkuWJZQHLh4JhdHgEI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkdegames-24.08.3.tar.xz",
+    "hash": "sha256-a8suDGc3+bipRunQuXQWT7BbQWVjK7WXQ/sZ4E2/lO4="
   },
   "libkdepim": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkdepim-24.08.2.tar.xz",
-    "hash": "sha256-5Gkrx28BiKP9QJ6q4Rl8bqdi5TISSEHfa4smnxsi1F0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkdepim-24.08.3.tar.xz",
+    "hash": "sha256-D4M0bjeTTt9ci+Jdr4Lj9pKh67KRL3B9LlXYl3dg/QU="
   },
   "libkeduvocdocument": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkeduvocdocument-24.08.2.tar.xz",
-    "hash": "sha256-v9e0aKUwlCHIiXCPQ1aDhf3M3vHWUt4VZm/q9Z9ZcqE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkeduvocdocument-24.08.3.tar.xz",
+    "hash": "sha256-2b/U5/Z7FZNSpebBL+7yuR6uRESVFUMvtyw0WjfE8cQ="
   },
   "libkexiv2": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkexiv2-24.08.2.tar.xz",
-    "hash": "sha256-4pJGU23AryjEZwhkFhTsf54hdOAjPq038z6ZqroJgJM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkexiv2-24.08.3.tar.xz",
+    "hash": "sha256-nzhlQRr7WUrS2p8pB+USQnf2Yr4/TGFL1NXMw2z7iQY="
   },
   "libkgapi": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkgapi-24.08.2.tar.xz",
-    "hash": "sha256-2XV586ne5xpt3Ta1JaZ6DTs04QbLi8GF3ubNGs0wYxc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkgapi-24.08.3.tar.xz",
+    "hash": "sha256-txNb+l/g3qQ5H4EtSqGNCK3BFgZ0YWjwq7weUPq6TEc="
   },
   "libkleo": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkleo-24.08.2.tar.xz",
-    "hash": "sha256-Q72tjs6nGpRK7LEB5wANuPtqDFCK/Y6FawRYhyML9g4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkleo-24.08.3.tar.xz",
+    "hash": "sha256-vnCyeQu3+MRuHiil0oAC+5Z/EC9Bavvuc4gS28T9f+o="
   },
   "libkmahjongg": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkmahjongg-24.08.2.tar.xz",
-    "hash": "sha256-oGOgduXkAcL6X0aXS8HGrAXrysEoeyp15TSAiclkrho="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkmahjongg-24.08.3.tar.xz",
+    "hash": "sha256-9bcW9cvNpNzhYdkP2al95JF++XJUBLIOJi3hs4+Xb7c="
   },
   "libkomparediff2": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libkomparediff2-24.08.2.tar.xz",
-    "hash": "sha256-8dyhIR5u2EIS9l1u5PukZ3DGThlasPAF1u5EHdCy5ow="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libkomparediff2-24.08.3.tar.xz",
+    "hash": "sha256-7ZCY7HfVbh7o4ogUwo9tA0rz8XI+q1sn3+cVJmnpemc="
   },
   "libksane": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libksane-24.08.2.tar.xz",
-    "hash": "sha256-6vNORJEOqdRvEUmw6393YkIsw5Vn4qArlm72GLlFMJE="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libksane-24.08.3.tar.xz",
+    "hash": "sha256-Z4VepFisnTeSXwn1gWyIE6HbBPScEIA7wSZbnVZt4a8="
   },
   "libksieve": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libksieve-24.08.2.tar.xz",
-    "hash": "sha256-yapayByDfwMBjI1cNXu3+RSlAATyEG08XaZVeaUOHPA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libksieve-24.08.3.tar.xz",
+    "hash": "sha256-e6J0yy3amx2+U5tLSrddChQCZ1R9gRT3sPVjxUfTrpk="
   },
   "libktorrent": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/libktorrent-24.08.2.tar.xz",
-    "hash": "sha256-gh1IFw8hfnBV7Rh806Qz3w4DhAANEfRI/Dxujv7p6Rc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/libktorrent-24.08.3.tar.xz",
+    "hash": "sha256-WCQyh+eKhqISr0AMw8/E3tGgg3ouu/aJjutntbsC1Pw="
   },
   "lokalize": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/lokalize-24.08.2.tar.xz",
-    "hash": "sha256-8iGuejWWdFSjniG4ICaOZmnNACDYTQPgNiYeEsVs/6o="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/lokalize-24.08.3.tar.xz",
+    "hash": "sha256-5Lh1/0pUlLV8CzjkHEDxkSwOiBh9ikDoOKEYd0ZNltI="
   },
   "lskat": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/lskat-24.08.2.tar.xz",
-    "hash": "sha256-/JlSqKoouA8D1jBrFKtQXSVYUPT5VjzQLrr9+ge7haM="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/lskat-24.08.3.tar.xz",
+    "hash": "sha256-LowGxV6auDlei7Tz4ZRlVkf5/+ZV4xZZOGJ9QSd+xVQ="
   },
   "mailcommon": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/mailcommon-24.08.2.tar.xz",
-    "hash": "sha256-dSHonywH6C+qG16XmU2y9q0uxqiMdRPnGC1ZfhvH0Xc="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/mailcommon-24.08.3.tar.xz",
+    "hash": "sha256-2Dp3eMKniqgGGAZRhrBOLkEYU6WX73EM2s7LMHCpZwo="
   },
   "mailimporter": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/mailimporter-24.08.2.tar.xz",
-    "hash": "sha256-dE63EAkJJOt5r/vyhar1jjS4F+FXArMttrkwQ8HVeGg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/mailimporter-24.08.3.tar.xz",
+    "hash": "sha256-yBswt2RNMVpmfRWPb1GekUSo+zNT9HTldvQdOVZDWM0="
   },
   "marble": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/marble-24.08.2.tar.xz",
-    "hash": "sha256-dUGw5kDEuUHrhoMDkHkBjQGAzHIlj5/h1Wusmy9oJzs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/marble-24.08.3.tar.xz",
+    "hash": "sha256-xTwfqnQeG0JFlMICH6TtxiBSjoYs7/KAyzyVLRryA3E="
   },
   "markdownpart": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/markdownpart-24.08.2.tar.xz",
-    "hash": "sha256-FbM0H3I/lp7tYcFODuxXpdeoqTGskBiwbRGDMRv1ujA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/markdownpart-24.08.3.tar.xz",
+    "hash": "sha256-/ieShY/VIHxv5w9b30sOvDAAH49ysIBm1htmjSMWs0c="
   },
   "massif-visualizer": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/massif-visualizer-24.08.2.tar.xz",
-    "hash": "sha256-SkUWECEUN4zfqIdDxjLiBpYgnDdwg3MwqUUnVxpTRME="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/massif-visualizer-24.08.3.tar.xz",
+    "hash": "sha256-Bb+axo5XxJy9OfSAMoamfTiem7oU9suH7vpT7BO2cts="
   },
   "mbox-importer": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/mbox-importer-24.08.2.tar.xz",
-    "hash": "sha256-W+dq6hLl6Xc2KUy+rj3JxMD5QmOqy8/I7NOvglcsj4Y="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/mbox-importer-24.08.3.tar.xz",
+    "hash": "sha256-sf/6sawemXbXdfkZrJmeTC3L3uRniHAPzD8uVJw7c8Y="
   },
   "merkuro": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/merkuro-24.08.2.tar.xz",
-    "hash": "sha256-7zv3e0rFT192IuQ9JGhegl15Hxx2ek4QbdatKm+R8BQ="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/merkuro-24.08.3.tar.xz",
+    "hash": "sha256-IFe0hLbClA9UMKTGz6+RzfJ/e7Hfd4B/BBQ6lDMflyI="
   },
   "messagelib": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/messagelib-24.08.2.tar.xz",
-    "hash": "sha256-9yfAX/+3QKCjtRZ0RmoTfCOtYC08oT090HB4B5tLQUk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/messagelib-24.08.3.tar.xz",
+    "hash": "sha256-5nzoHyJ8n61MQYGGO1Zi8tGHyIQq2OXYLFHu6ycv290="
   },
   "mimetreeparser": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/mimetreeparser-24.08.2.tar.xz",
-    "hash": "sha256-MRJOsi0CL6mCH/tRA+TZpKjrO9Cvx+wQKwdk/+OOYXo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/mimetreeparser-24.08.3.tar.xz",
+    "hash": "sha256-enTQiEyI0+0N2rD2qzNwn4qDTJHXoZ1Btmwj46lPI4Q="
   },
   "minuet": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/minuet-24.08.2.tar.xz",
-    "hash": "sha256-OkMJAuinU2FNI+Vzv4AG7Yneq7ArGJGoWge7hOxtsHA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/minuet-24.08.3.tar.xz",
+    "hash": "sha256-b88vWb5tkHniaKcKlpceuZHMrCkQDfz9l+cPpBqgX6A="
   },
   "neochat": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/neochat-24.08.2.tar.xz",
-    "hash": "sha256-hz8I817xBVsXZHCYorpaOSTcD7g1BEHTgMNZjYITwbw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/neochat-24.08.3.tar.xz",
+    "hash": "sha256-8omI9o6/QFsMRIq5+OTdrOgZ4I6G+tnWshSbuY59Dwk="
   },
   "okular": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/okular-24.08.2.tar.xz",
-    "hash": "sha256-QInHfVvmCu29RdoNS6MZ45CbFaZAzVHTYbAdla0zyPs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/okular-24.08.3.tar.xz",
+    "hash": "sha256-s5irMwLt1UDFbd2CbzHYOiRumlPIalLgMzR6uUf+3Js="
   },
   "palapeli": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/palapeli-24.08.2.tar.xz",
-    "hash": "sha256-JFhZ1nkH91hFuq7nA7DlafceA+bH9gGV9WphdZoLoy0="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/palapeli-24.08.3.tar.xz",
+    "hash": "sha256-2jllu4rBF9ldlHQ0lY1b9AkkfD7JFrdH2mhWmO1exfk="
   },
   "parley": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/parley-24.08.2.tar.xz",
-    "hash": "sha256-nblLobCcIkhdbAS5pc1IRCZZFQEVMtLkx0EdkmTOxPw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/parley-24.08.3.tar.xz",
+    "hash": "sha256-M2UVyaZ8h2xMSIcf5i3IDSYbJS9tvhp4ixJ8mIsJ1i0="
   },
   "partitionmanager": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/partitionmanager-24.08.2.tar.xz",
-    "hash": "sha256-oimr4ialV3dXjDgnZ37CIYxpxaYxpxQ28mid5g9tTqo="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/partitionmanager-24.08.3.tar.xz",
+    "hash": "sha256-ej2bp6wWA6TEAkJw3mQOCansrnYVnrynD2QCumB9+c0="
   },
   "picmi": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/picmi-24.08.2.tar.xz",
-    "hash": "sha256-JY7O2o/YZkuP1vQqXG3r2PUReukVAAESU2+cxolG1gI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/picmi-24.08.3.tar.xz",
+    "hash": "sha256-Ow5JOxfZE7+32AR7s0WIBWgWr/2s7fVwqn0P9VruWsA="
   },
   "pimcommon": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/pimcommon-24.08.2.tar.xz",
-    "hash": "sha256-NVux0isn6x+3tqbOz45daOKIpSrKSnr9NPcj+Q+UI6Y="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/pimcommon-24.08.3.tar.xz",
+    "hash": "sha256-zMJHB39dS1NPS6viAhtoLoxXGdV0M06Fn9pEAFcvOy0="
   },
   "pim-data-exporter": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/pim-data-exporter-24.08.2.tar.xz",
-    "hash": "sha256-Oj5tie3p0AplOKylrJNSZjjK4fLripWL5gq5xQ0hNDY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/pim-data-exporter-24.08.3.tar.xz",
+    "hash": "sha256-K6h8ZA7xNtT4J4GVL8AXvuUM4ZGcWUpmWcTxLMr6GXc="
   },
   "pim-sieve-editor": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/pim-sieve-editor-24.08.2.tar.xz",
-    "hash": "sha256-g98WYyHHcj0SI71ibImFnDZciZ6NZRhDtXDOL4VrjxA="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/pim-sieve-editor-24.08.3.tar.xz",
+    "hash": "sha256-ANFvMOzfcw+EowDW3HkPVvr5AaxlkSgsOJvcBwfdbrc="
   },
   "plasmatube": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/plasmatube-24.08.2.tar.xz",
-    "hash": "sha256-b2yaWcQv7t8+TQJ2qtqjwqm68yqGJp/2pOx1sww3kyw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/plasmatube-24.08.3.tar.xz",
+    "hash": "sha256-4BvTTMUVixK6qmZSVthQVo7mnVVWpDul47l4OloqvDw="
   },
   "poxml": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/poxml-24.08.2.tar.xz",
-    "hash": "sha256-4IVUj6HmzPiM3daefE5oATT1/qiLTrh45FRiqFg6JXw="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/poxml-24.08.3.tar.xz",
+    "hash": "sha256-2AucL394qkNnngQHGc94vQWCPFMV1pp2GtknA5dWBvY="
   },
   "qmlkonsole": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/qmlkonsole-24.08.2.tar.xz",
-    "hash": "sha256-M873T020YW8TsL/oxd5tgjonV14mNo1rMK3iPLZQi3I="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/qmlkonsole-24.08.3.tar.xz",
+    "hash": "sha256-teDdQaSF1nKQjq/2LKHOff4xEvohjf/6z1+K72TcgCo="
   },
   "rocs": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/rocs-24.08.2.tar.xz",
-    "hash": "sha256-0QAwFhLg0/4+0k2u4oxr0Te0C8sq+cdSZCpghH3FGFI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/rocs-24.08.3.tar.xz",
+    "hash": "sha256-JWW8s5KIXPCeQCyKPLsz7jKGVIVynIbABPFfcDsDwtE="
   },
   "signon-kwallet-extension": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/signon-kwallet-extension-24.08.2.tar.xz",
-    "hash": "sha256-1Y2CnbVI8myXtBwgqGR3dwDvRMRCSms0EALIRZCYD/w="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/signon-kwallet-extension-24.08.3.tar.xz",
+    "hash": "sha256-saRfaA3oClP876twfbrt11DDwfxjjZm9nGplwRoL/I4="
   },
   "skanlite": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/skanlite-24.08.2.tar.xz",
-    "hash": "sha256-fNuWQRIYc5UkG3EbU1EPm2DaPeexO6qT8g1XnqLXMaY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/skanlite-24.08.3.tar.xz",
+    "hash": "sha256-DnJ1elBP5zrdtBZXMrjJ3Uek2GsW8BPr6xOeWcKKxeM="
   },
   "skanpage": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/skanpage-24.08.2.tar.xz",
-    "hash": "sha256-dJ1e2txwGYLstcGHg9L/E9cuplKdnZ6OO8EnE6uwKxk="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/skanpage-24.08.3.tar.xz",
+    "hash": "sha256-J3Rqaw69+ZeHtNsutHb4IgH/deYC6cJPqcdwLX0/Dyo="
   },
   "skladnik": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/skladnik-24.08.2.tar.xz",
-    "hash": "sha256-daL1m8awJK7puBf4/oLSZup4Drs64eYEGI+VgPVP1b4="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/skladnik-24.08.3.tar.xz",
+    "hash": "sha256-yX6LSDsAkxPUGl6f+TvCNAEYKi7aBrGS+bwRIRgKDu4="
   },
   "spectacle": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/spectacle-24.08.2.tar.xz",
-    "hash": "sha256-P5D4z+M1mtlPW7ACWpJRgFoJLFiSzSqJGWXCGgmEy98="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/spectacle-24.08.3.tar.xz",
+    "hash": "sha256-RHq0YqB+zVg8q4ec5xGPv8RjWzcKAPEOFJeLH5umbfs="
   },
   "step": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/step-24.08.2.tar.xz",
-    "hash": "sha256-6f9AC8kvbJViWIwIB2FQVTMLI2RlzHpEDu1ZbCK/csI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/step-24.08.3.tar.xz",
+    "hash": "sha256-Eawo5Sfrhm3lFc3+NXFg7No1OCozkS+VJHkdKEhxZEg="
   },
   "svgpart": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/svgpart-24.08.2.tar.xz",
-    "hash": "sha256-ymFR/KYkDFL0MbzJj/5OFkku/uGI16IxLwbbZcC1xhg="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/svgpart-24.08.3.tar.xz",
+    "hash": "sha256-GknQkQ/g7Hf7vuLGQTpdBnrryKPbp1dHxiCHwpNgkd0="
   },
   "sweeper": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/sweeper-24.08.2.tar.xz",
-    "hash": "sha256-LSwg7d9nhp58JaWA5PXYgQLexfVT/3B5MF4fANhEVDU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/sweeper-24.08.3.tar.xz",
+    "hash": "sha256-pemnfrmYazZV6LZZFOZlfbZgMvIO0vmdgNPFQjrbCB8="
   },
   "telly-skout": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/telly-skout-24.08.2.tar.xz",
-    "hash": "sha256-y5577kur5lqL/hEXFWnf4qOfBj8SdGUU2XNWrSfGVsY="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/telly-skout-24.08.3.tar.xz",
+    "hash": "sha256-oKtz34mLc93/GIq3yfhgMsnzpCsJ9MEYwXrCi7JeYio="
   },
   "tokodon": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/tokodon-24.08.2.tar.xz",
-    "hash": "sha256-uEHi9gc1YsGohLJAfT2FpiyoQYvcvLk6Fpt/Pabx2SI="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/tokodon-24.08.3.tar.xz",
+    "hash": "sha256-4lBf0eCcEZAPQj+bkg5Ap4qPBy9TGSRZynz5EEDZh7g="
   },
   "umbrello": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/umbrello-24.08.2.tar.xz",
-    "hash": "sha256-HlolgPVSawdxb4spDZTaOT2BiPD+OqCHYySvtn3TPEU="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/umbrello-24.08.3.tar.xz",
+    "hash": "sha256-FtaGosz6yX8RmE3+c6PELXbqFiHMJavCJYIBeEs/nE8="
   },
   "yakuake": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/yakuake-24.08.2.tar.xz",
-    "hash": "sha256-+wij2zZISxXD0u+ydpRrmr9FqX1X62dqGBcjLUZB8ac="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/yakuake-24.08.3.tar.xz",
+    "hash": "sha256-pIevCty4BZJsptHDF6nscOPzq0tFUYshvLGgXdz5uRQ="
   },
   "zanshin": {
-    "version": "24.08.2",
-    "url": "mirror://kde/stable/release-service/24.08.2/src/zanshin-24.08.2.tar.xz",
-    "hash": "sha256-duajViqesjC1O1EZ27/IfSLAPJ2bpiNU2qlvx/lfPqs="
+    "version": "24.08.3",
+    "url": "mirror://kde/stable/release-service/24.08.3/src/zanshin-24.08.3.tar.xz",
+    "hash": "sha256-g9Iv4sC+mP7f4bpJ7lDwgFlkDJOjSUwSVlYJDbyv5to="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index f77f6653b336..13f3379e4ced 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,332 +1,332 @@
 {
   "bluedevil": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/bluedevil-6.2.2.tar.xz",
-    "hash": "sha256-0qMvgE6tLgTMJdyQ9nwlwVhRLFDUNLp+tvlql0zEyEk="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/bluedevil-6.2.3.tar.xz",
+    "hash": "sha256-gEC21kiD8wDksAm6ZiRDy0a36iaupxJ7ciNq56Pxkbs="
   },
   "breeze": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/breeze-6.2.2.tar.xz",
-    "hash": "sha256-nwdWjVQ1E7mEhwgX092iUs8VJPEWF70xOKcdK/ZYllw="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/breeze-6.2.3.tar.xz",
+    "hash": "sha256-UIzt2XlqS7LjwRWi9VZxnW5iYDIGRjR2OXkpUE+hGqQ="
   },
   "breeze-grub": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/breeze-grub-6.2.2.tar.xz",
-    "hash": "sha256-LrLd0q2RFBkI8RNNuCLLLk15nYMEGtdx664NCgYaqjA="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/breeze-grub-6.2.3.tar.xz",
+    "hash": "sha256-n+Iw30bEqVEnlboP1l7z0ygee2owmWdqY4s20YGVRLE="
   },
   "breeze-gtk": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/breeze-gtk-6.2.2.tar.xz",
-    "hash": "sha256-fMI0lLRQ0ZeahuH1YQzaXnmOJOF06CCiUTEBTHjLJKE="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/breeze-gtk-6.2.3.tar.xz",
+    "hash": "sha256-PFmy9gWbZmHvH+t05ZrTBbrTkdaSsw19Ox4NkcQSxqE="
   },
   "breeze-plymouth": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/breeze-plymouth-6.2.2.tar.xz",
-    "hash": "sha256-uWNdgObKazysk4jPbNhbQZJZX0AnRCvrbKuuFRByY1I="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/breeze-plymouth-6.2.3.tar.xz",
+    "hash": "sha256-hRaoLZYQR0am8zmPPx8VsCkVxEbuG/10Tj9wu82lFiI="
   },
   "discover": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/discover-6.2.2.tar.xz",
-    "hash": "sha256-1P76+qm1uYAFIiopjPy34+HImCDQ74wCVA4aghCNWq4="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/discover-6.2.3.tar.xz",
+    "hash": "sha256-bfLedenei/y6Va7noc64278PqzsBilkYP7yvurL7Iso="
   },
   "drkonqi": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/drkonqi-6.2.2.tar.xz",
-    "hash": "sha256-YBZQ1R4XgH+QbTEKY0ax+Pgr6chJwkWBdSgXdxjw03k="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/drkonqi-6.2.3.tar.xz",
+    "hash": "sha256-3BTgxUiF6An59uKCUyrqFX+Qo39CjVTy9ws3WaONJeY="
   },
   "flatpak-kcm": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/flatpak-kcm-6.2.2.tar.xz",
-    "hash": "sha256-hLMbgFjV3j8W12aYvFN1UKxMN2Qi79c8AlfvfvnstJU="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/flatpak-kcm-6.2.3.tar.xz",
+    "hash": "sha256-bFR+SoX2t4t2KuYNWekZiwFO3w3+wdozW8tiN/z3hrc="
   },
   "kactivitymanagerd": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kactivitymanagerd-6.2.2.tar.xz",
-    "hash": "sha256-8lCgQowfkB4Uw3Wa2+EfGycIwIiWYDessgMWXUAKLOE="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kactivitymanagerd-6.2.3.tar.xz",
+    "hash": "sha256-Sr769igaR1VTJ2kucSCqY1MlzCCuhofOues647AtDYI="
   },
   "kde-cli-tools": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kde-cli-tools-6.2.2.tar.xz",
-    "hash": "sha256-gWSpt+ok1kxZOaUK0D1hMkExfqZWtSu7AK/WU/FEMGw="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kde-cli-tools-6.2.3.tar.xz",
+    "hash": "sha256-TFffe8/SHmnFaF1yezqi5Ci9/uG5kB6PHYeiFdEm8vM="
   },
   "kdecoration": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kdecoration-6.2.2.tar.xz",
-    "hash": "sha256-t/hhoY4q9jipyF8S4YMGwFefi8HwnspsNDNfWN0se5A="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kdecoration-6.2.3.tar.xz",
+    "hash": "sha256-SWN3JuDDR2dPKgJIQI5MXrN7XjX5nhE0O3M4uMNYwGM="
   },
   "kde-gtk-config": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kde-gtk-config-6.2.2.tar.xz",
-    "hash": "sha256-uon7E143+qFUSpvimhDCpAAp39U69M6zQyicamk2UGY="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kde-gtk-config-6.2.3.tar.xz",
+    "hash": "sha256-LpiFDJiJw6jsd2ebiHMwWeorGC6lbIK3BxO2Zz7ljL4="
   },
   "kdeplasma-addons": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kdeplasma-addons-6.2.2.tar.xz",
-    "hash": "sha256-YhfbbWkGC7tvBP9MqChEgfilUyvwnXKBLPo+veoBH2w="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kdeplasma-addons-6.2.3.tar.xz",
+    "hash": "sha256-fG/qKMQHxnz2dGA4T0cgFN20dpQGPEWgju/9P8Ox8Pk="
   },
   "kgamma": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kgamma-6.2.2.tar.xz",
-    "hash": "sha256-NFIpiLp0Rea/GqeurUGf9UtuGvzNNKyKlRlBarahDc4="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kgamma-6.2.3.tar.xz",
+    "hash": "sha256-1afemiTvMQXT87HrIIMg5Ip8D1dVKxb8FuaHGmMJOgQ="
   },
   "kglobalacceld": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kglobalacceld-6.2.2.tar.xz",
-    "hash": "sha256-TMREScRF1e8lHNCgbhhICkt4D+yv08bF+6dYpW9+zmw="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kglobalacceld-6.2.3.tar.xz",
+    "hash": "sha256-2ey5OT8arFqnR6JBimjfevOm/uDZt1azqbTJfTq23qg="
   },
   "kinfocenter": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kinfocenter-6.2.2.tar.xz",
-    "hash": "sha256-QNU669MdJarDrOYBuyIil71T0rcfUQy/jqxLpZkrVHc="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kinfocenter-6.2.3.tar.xz",
+    "hash": "sha256-iX7RKqxUv5zNw966VJAJ3Ug6sRF4OaOC6/AioemszKA="
   },
   "kmenuedit": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kmenuedit-6.2.2.tar.xz",
-    "hash": "sha256-46AhY5rISrYq8qWfhtpRibge2semboy0A8ndJ19S49E="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kmenuedit-6.2.3.tar.xz",
+    "hash": "sha256-GvvsMPW8q/oHlzmlwGuR4OTsr/uh1pUpaauo9EuiDEk="
   },
   "kpipewire": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kpipewire-6.2.2.tar.xz",
-    "hash": "sha256-Einbl0R8wH5i5KHMPHxeW07djBcu4bki/Se1isN4QlU="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kpipewire-6.2.3.tar.xz",
+    "hash": "sha256-u0c/FbTU9ZR5y7q6bveB2bxIgTuXw17fs5gtCsjwMPc="
   },
   "krdp": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/krdp-6.2.2.tar.xz",
-    "hash": "sha256-BTlishksVJliNIvNAcKshO9Plk3K+htPbWc1thChynI="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/krdp-6.2.3.tar.xz",
+    "hash": "sha256-EffDMZqetNm2s9VN2L605ozIF4jgE4Nc5rJ2U7Kvx+Q="
   },
   "kscreen": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kscreen-6.2.2.tar.xz",
-    "hash": "sha256-ogCrhAx49+XkIC9GMPYS7/7ETWLtkdm6p6BexnhYRfA="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kscreen-6.2.3.tar.xz",
+    "hash": "sha256-comxlZ7iZxV/m2z+eP1/+uGBM8pqlJ9ILSJRVZu5OWk="
   },
   "kscreenlocker": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kscreenlocker-6.2.2.tar.xz",
-    "hash": "sha256-HIVj6BG9qApqEp3VSJfDX7QDRbn1qg6c2Z0eKAgqdpk="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kscreenlocker-6.2.3.tar.xz",
+    "hash": "sha256-FDjIvb2OCY7MWg9togXm+uUlQB2c8T0nn1X69xPR5U8="
   },
   "ksshaskpass": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/ksshaskpass-6.2.2.tar.xz",
-    "hash": "sha256-8WTx49yaGDbm/44FxBLvHZ9De+GdRYP5sfa4DfdqC44="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/ksshaskpass-6.2.3.tar.xz",
+    "hash": "sha256-GHIZheT2KKnSo8qIxqxB+lLZktEpvcbN3n1BQLIbkBs="
   },
   "ksystemstats": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/ksystemstats-6.2.2.tar.xz",
-    "hash": "sha256-2zr6S9irdMYDUahcrxnlwLAJWjiKJLR9OpVyg9hd3/s="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/ksystemstats-6.2.3.tar.xz",
+    "hash": "sha256-W9Q6H9vwjElVTbIrkZdrGYQSpeAA4QnQEHW9JeYGFBo="
   },
   "kwallet-pam": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kwallet-pam-6.2.2.tar.xz",
-    "hash": "sha256-J7v6r2Txvvmn36uyp2tc8ibS5w9MrZt0D/gELFuCaoc="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kwallet-pam-6.2.3.tar.xz",
+    "hash": "sha256-rETUciK0QNFM34ZimQ7NzleOj2VHXvZ1mkx7nVhRSe4="
   },
   "kwayland": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kwayland-6.2.2.tar.xz",
-    "hash": "sha256-7FNMWmBXJl/qrBK24XPMgj+MuqZcmOUKsGfK+wGDDwU="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kwayland-6.2.3.tar.xz",
+    "hash": "sha256-D9U50EKDh6TyT/qsyh0qUUEtTCrcQRltDt6VZQK7L9w="
   },
   "kwayland-integration": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kwayland-integration-6.2.2.tar.xz",
-    "hash": "sha256-kmMnAF5BHrfvVNc6xprL1PZNcpwQarXoN4BCRF31IW4="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kwayland-integration-6.2.3.tar.xz",
+    "hash": "sha256-9QDDA2QmuqcPlO6zgIfMobEE8ct8KsJAZRuolt6hTC8="
   },
   "kwin": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kwin-6.2.2.tar.xz",
-    "hash": "sha256-+1wv8+gAdyLz+lKIcuZJTcIdSMimtjK3SEhjiUhrwGE="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kwin-6.2.3.tar.xz",
+    "hash": "sha256-66IKOVKZryNY/guh1iFsAEgOzdzJ1EUvd/emDB548QE="
   },
   "kwrited": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/kwrited-6.2.2.tar.xz",
-    "hash": "sha256-Q9tHMEKQ7OumYxqBqdGeeWI9hC6hhFTe1j/SuU8ALrU="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/kwrited-6.2.3.tar.xz",
+    "hash": "sha256-fwL3PyQQmse8DuYbYa/9ztoYxh8OkWikPG/BHqbnYb4="
   },
   "layer-shell-qt": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/layer-shell-qt-6.2.2.tar.xz",
-    "hash": "sha256-B+a1sbOlQ7asOGvquwXh8P4NTTSnIPuam2K89CZAV1o="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/layer-shell-qt-6.2.3.tar.xz",
+    "hash": "sha256-AJQf7fxUIPZda+JHBLXMLwf1lx9bfAAUVmjO3HNlHhw="
   },
   "libkscreen": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/libkscreen-6.2.2.tar.xz",
-    "hash": "sha256-Nh6K8NDFpI+eSiOCFsMoNPlCTbQgQh/eQv1+OBNWUa0="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/libkscreen-6.2.3.tar.xz",
+    "hash": "sha256-p54GdZRLS2lxPobyz+PJd3V9RPJPGT8xGqVC6TgvIjg="
   },
   "libksysguard": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/libksysguard-6.2.2.tar.xz",
-    "hash": "sha256-7qiUfOWrj4L9k1JGTElBi9l0YJIbYUl+kRjQZWrw/Z8="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/libksysguard-6.2.3.tar.xz",
+    "hash": "sha256-rnsVfcys/oVw1UlOBQWKI5hg5fArjcs6O5IpSNo5CTU="
   },
   "libplasma": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/libplasma-6.2.2.tar.xz",
-    "hash": "sha256-30Panz10XO7OG8/CxnRhB1U7ufN78OwK0QJTQYx+YEg="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/libplasma-6.2.3.tar.xz",
+    "hash": "sha256-LoXzJFwQuAyEGYXER5+o9F+I9K8BprgFP9C324qcWO4="
   },
   "milou": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/milou-6.2.2.tar.xz",
-    "hash": "sha256-Z2hk5RT+xzrvNG8UC1dRSoYQiA+yUK9/jn9zv+zr1O0="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/milou-6.2.3.tar.xz",
+    "hash": "sha256-NxGG3iA+a1KNm12ZytfsPNXvXme9qWJNBsQ4WvMpAlc="
   },
   "ocean-sound-theme": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/ocean-sound-theme-6.2.2.tar.xz",
-    "hash": "sha256-bxmh2jl5BEnMkCo8ypUsLl2Tqh9GRDjHtXQDUt31l6U="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/ocean-sound-theme-6.2.3.tar.xz",
+    "hash": "sha256-7OsnYhVDzcGCQFHZw0DqAwOK/Iv0XBD+7ozd1ayIB9E="
   },
   "oxygen": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/oxygen-6.2.2.tar.xz",
-    "hash": "sha256-qIOPI2Orj8L/bo1XNcHwNKaWXDHxUVoWThQky7WKp7g="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/oxygen-6.2.3.tar.xz",
+    "hash": "sha256-LYdUmyVz4bDeDbFRFnubi+kEZ3+zUdAbU4e42ZX+z78="
   },
   "oxygen-sounds": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/oxygen-sounds-6.2.2.tar.xz",
-    "hash": "sha256-6R9fYq/fRGoPdpKBOp/QpW3QnV0Bmli2w7lZ2b9k3/w="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/oxygen-sounds-6.2.3.tar.xz",
+    "hash": "sha256-pslNLDH05ZBBJBAgKcGFYO402CG+nVkn/W9AHKWxDmk="
   },
   "plasma5support": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma5support-6.2.2.tar.xz",
-    "hash": "sha256-jiZld2i1Uzuxx67M1RZYtHphpmdQQ4v0slq5bWOoxzA="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma5support-6.2.3.tar.xz",
+    "hash": "sha256-xO7Ntf5SqWkojGPDVFAZqy0u9AS1UtcZ5g/6djFm8K0="
   },
   "plasma-activities": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-activities-6.2.2.tar.xz",
-    "hash": "sha256-sTM7vOCzaXAcmd0fv3Q1wUpnRFDD1BW9zmxEwwptT/s="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-activities-6.2.3.tar.xz",
+    "hash": "sha256-pi741F3rk0wBf6q806use2rfPHrUeRltOw+H832ziEc="
   },
   "plasma-activities-stats": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-activities-stats-6.2.2.tar.xz",
-    "hash": "sha256-Zl/uz78Ec77cbXfdYG9rJ3FWZybV6uXp8ndIgJX9EKU="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-activities-stats-6.2.3.tar.xz",
+    "hash": "sha256-W+1GyGD1NwjT3mgw9M1VRHINGFHAB0ESPohR7i2+fvs="
   },
   "plasma-browser-integration": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-browser-integration-6.2.2.tar.xz",
-    "hash": "sha256-a8Smt5Qcig0S1S0WfLsUEKIl1DoPd9NTAXsslB5naw4="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-browser-integration-6.2.3.tar.xz",
+    "hash": "sha256-/s5wowbUOiFfN8lHbYMY1bPbBQZSmcylmGE60CCMNPA="
   },
   "plasma-desktop": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-desktop-6.2.2.tar.xz",
-    "hash": "sha256-yD/mI5KyOZeUS6kJWc6ud7O0suawISI979rTaB0wrk8="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-desktop-6.2.3.tar.xz",
+    "hash": "sha256-Yh7xjmXXU3gyCIHAxdSGbzkDILCyq6/ryzPXVGFoYyo="
   },
   "plasma-dialer": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-dialer-6.2.2.tar.xz",
-    "hash": "sha256-6sfaDmcpcB9nIIg7EPimqVGLx8bofjXM84a5mFSnb2k="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-dialer-6.2.3.tar.xz",
+    "hash": "sha256-Ukz0HUt7SK7GenW1DvCxSH2lIdWfyHXpP4gCmIEbUCE="
   },
   "plasma-disks": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-disks-6.2.2.tar.xz",
-    "hash": "sha256-oBAbEN1vS7vdR5oM6K5gwvuamMyILKHhxZtTTGYaF+k="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-disks-6.2.3.tar.xz",
+    "hash": "sha256-tFtEm6azlXcsPkHrKx8c4XH0+KMFKenshhMUGk9IHLo="
   },
   "plasma-firewall": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-firewall-6.2.2.tar.xz",
-    "hash": "sha256-0slIvf/N+YHQ01Tj9ZjxXb6tGEbHwLTL/nqrH0HQstU="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-firewall-6.2.3.tar.xz",
+    "hash": "sha256-x7oY5/3Q7XK8Bq5YJengVpl42Nf6XU4j/pkL6BYyZ/4="
   },
   "plasma-integration": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-integration-6.2.2.tar.xz",
-    "hash": "sha256-0y0FS+aUdifwXdtXQmCmpJdoanyT7GLRySkWgHS/tTk="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-integration-6.2.3.tar.xz",
+    "hash": "sha256-v0Pkku9BneHnHLLcr/yWeT1FTAjz0v5LGg/tqqnMu30="
   },
   "plasma-mobile": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-mobile-6.2.2.tar.xz",
-    "hash": "sha256-DCo+14fav1i1FcdzPNqeB61b93N7+El9s7/qkNjJZ6I="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-mobile-6.2.3.tar.xz",
+    "hash": "sha256-Mma10wHNmF/2zaIEZm81m5iWsHeaL+B4Z8RPRRQFMkQ="
   },
   "plasma-nano": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-nano-6.2.2.tar.xz",
-    "hash": "sha256-XGxGvTzJAfatvAvzaYU96YNOwstvhWVQGBXdcv9uh8w="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-nano-6.2.3.tar.xz",
+    "hash": "sha256-oJX9nChafpuPR803tOAJ3NY7GuBMCovWYcx4RmpVOSc="
   },
   "plasma-nm": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-nm-6.2.2.tar.xz",
-    "hash": "sha256-jfmXvPFLEDG4soBVobz+IuVg6qSpGtKkJAKw24pExHA="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-nm-6.2.3.tar.xz",
+    "hash": "sha256-EDhCnLa135e4rudXceBR04E+rbvEgPK08j8iXRHtnHs="
   },
   "plasma-pa": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-pa-6.2.2.tar.xz",
-    "hash": "sha256-L8gxbV1IUcfwHPECE0A9PnfLekoEWEvA3GN5cenSJlQ="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-pa-6.2.3.tar.xz",
+    "hash": "sha256-AOyBDMJYzDjYYC9Tc753PBJHT73vSjyi/ZageOjpOxE="
   },
   "plasma-sdk": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-sdk-6.2.2.tar.xz",
-    "hash": "sha256-Tz/KKMFI7cHAlmiKChCCIYfXomJBakHUBLSDuMLAYg4="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-sdk-6.2.3.tar.xz",
+    "hash": "sha256-8r7AyQAargJ2AXu792WSVkPCohEqvBd1U60cSosX0t0="
   },
   "plasma-systemmonitor": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-systemmonitor-6.2.2.tar.xz",
-    "hash": "sha256-IEzWc7kWRJe5trUpLYtNaHQYDogV5yQZ7Vr3ZpPj00U="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-systemmonitor-6.2.3.tar.xz",
+    "hash": "sha256-EtnGmNN1NcHExovtFejaE9fqRjb6DJSf7dIsOI63P7w="
   },
   "plasma-thunderbolt": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-thunderbolt-6.2.2.tar.xz",
-    "hash": "sha256-lVA5UAJmaQqfr4LYLsygvAWZ3ixweXWeDGyI2e+pYOM="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-thunderbolt-6.2.3.tar.xz",
+    "hash": "sha256-yxsJTEr7U1zKFKmPMVktm05Si3he+xmHMTsHp2xN2cA="
   },
   "plasma-vault": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-vault-6.2.2.tar.xz",
-    "hash": "sha256-LBC//UbV/dx409k0q2OQ1QKxAyX19vwikszEdo702K0="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-vault-6.2.3.tar.xz",
+    "hash": "sha256-5/uDsikjQ8xUR7eCYXEzDqcnsPRBORTz9U5tLCgfUVQ="
   },
   "plasma-welcome": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-welcome-6.2.2.tar.xz",
-    "hash": "sha256-DWDzg2WLBfggY7YDIxQk6Ok8OD0b4TcvAZBJlG5AX5E="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-welcome-6.2.3.tar.xz",
+    "hash": "sha256-poSSmGAHkG4GEU3acvLTAVcGGZHBryd0PtaWlKi8698="
   },
   "plasma-workspace": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-workspace-6.2.2.tar.xz",
-    "hash": "sha256-vsyJRz1X3MV0qNnWJsyDtEbfJWekeKZj+B1Y/W6j+FM="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-workspace-6.2.3.tar.xz",
+    "hash": "sha256-n2gAe83KcBV9k/ocHpJb/9h7IdK3EAXSpQ+KbyfdWZg="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plasma-workspace-wallpapers-6.2.2.tar.xz",
-    "hash": "sha256-fpl+ezHakeFsAfbktRdbvdhKuVeq96nvMKQUAJMRzTs="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plasma-workspace-wallpapers-6.2.3.tar.xz",
+    "hash": "sha256-pvYf0CsneYc9TTXewFiHwV7NUdo0vLHLoS5ivnsUOrE="
   },
   "plymouth-kcm": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/plymouth-kcm-6.2.2.tar.xz",
-    "hash": "sha256-yzg8HH06Fk3hmEF/SB8zIiNtuKXURBqL53RN1PdZ3Zs="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/plymouth-kcm-6.2.3.tar.xz",
+    "hash": "sha256-oRuXDjHyrbr/jHWm9UiCqdlQXJgzPh1aS/hVSnf/QNc="
   },
   "polkit-kde-agent-1": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/polkit-kde-agent-1-6.2.2.tar.xz",
-    "hash": "sha256-NRA1M2Dex1xH1gUo1lUKavypHZfUZuNaTf2yVP5s9eo="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/polkit-kde-agent-1-6.2.3.tar.xz",
+    "hash": "sha256-71XQ25jSz53iQ8B8lTR/T3LnUqk/9G8laPsjN0Mti18="
   },
   "powerdevil": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/powerdevil-6.2.2.tar.xz",
-    "hash": "sha256-QAby9JV0xOADa7Jb07Gh5cR6UhsmgG+kAw2Ac/2xe9k="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/powerdevil-6.2.3.tar.xz",
+    "hash": "sha256-VM8+PQvC+jV4r5Aet7fi5Wj7WfC3Acru73AX5VlUHsY="
   },
   "print-manager": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/print-manager-6.2.2.tar.xz",
-    "hash": "sha256-iKyxTmsrMG9pPFVvIfKPH/iuOTBAkO1WE5V2rdabsSo="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/print-manager-6.2.3.tar.xz",
+    "hash": "sha256-RKyOxYO5hs27eG5AxTR9f2OCbnfOIQ+LIWHHkwDrgdY="
   },
   "qqc2-breeze-style": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/qqc2-breeze-style-6.2.2.tar.xz",
-    "hash": "sha256-7jWHLJZKFepISB/UgiAAbkJez4VakcK6pNv4sj+KQ8s="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/qqc2-breeze-style-6.2.3.tar.xz",
+    "hash": "sha256-3LJHPKYLHbnGuBd46zHhPFmA/8EdbmogSMou5PK52VI="
   },
   "sddm-kcm": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/sddm-kcm-6.2.2.tar.xz",
-    "hash": "sha256-Z8h+5THWU0xl8/y4w3e1yg/4M5yTVWW5iYbKo/wqxN4="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/sddm-kcm-6.2.3.tar.xz",
+    "hash": "sha256-mpzD46nxNAAl0UM9f+O+5Hlx05kGdpL+JyYfrd2LXV4="
   },
   "spacebar": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/spacebar-6.2.2.tar.xz",
-    "hash": "sha256-bLhNDcVKtKlGoZUD41sffLW3O59XE0Nt0gu0U26Xg3k="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/spacebar-6.2.3.tar.xz",
+    "hash": "sha256-n0z8aCp4W21m8C+8vLQVrNU160XukngScxoPDCCiP6I="
   },
   "systemsettings": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/systemsettings-6.2.2.tar.xz",
-    "hash": "sha256-pTmeHdq12GxM98Y8NNfMp1mbG2zjjLyp1AVgIs9KSEQ="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/systemsettings-6.2.3.tar.xz",
+    "hash": "sha256-RPAFD8nFR4jbaQi9+8n5o7HRqxh2OrCQfQgV0WPXwTo="
   },
   "wacomtablet": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/wacomtablet-6.2.2.tar.xz",
-    "hash": "sha256-Uj7gUVuHSXi4i77qTlbatgGliIHubbC5bQOc/yMvGEY="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/wacomtablet-6.2.3.tar.xz",
+    "hash": "sha256-poG8k45ljTrBvzcjvctRvZHk2BiOh0nRDzoPFvWlBb8="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.2.2",
-    "url": "mirror://kde/stable/plasma/6.2.2/xdg-desktop-portal-kde-6.2.2.tar.xz",
-    "hash": "sha256-Zp+cFEaptzSQw+0UKJWyJzjtqYh+7L9izNnW0QUKPdM="
+    "version": "6.2.3",
+    "url": "mirror://kde/stable/plasma/6.2.3/xdg-desktop-portal-kde-6.2.3.tar.xz",
+    "hash": "sha256-XyrRCMQga5a0h2DvCT3re5NRhYNsXM53oz5JyvPddNo="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix
index ae66125fddf4..3ab9fb6291f7 100644
--- a/pkgs/kde/misc/klevernotes/default.nix
+++ b/pkgs/kde/misc/klevernotes/default.nix
@@ -4,6 +4,7 @@
   fetchurl,
   qtsvg,
   qtwebengine,
+  kconfigwidgets,
 }:
 mkKdeDerivation rec {
   pname = "klevernotes";
@@ -17,6 +18,7 @@ mkKdeDerivation rec {
   extraBuildInputs = [
     qtsvg
     qtwebengine
+    kconfigwidgets
   ];
 
   meta.license = with lib.licenses; [
diff --git a/pkgs/kde/misc/oxygen-icons/default.nix b/pkgs/kde/misc/oxygen-icons/default.nix
index b556bd989e2c..02e1e278edbb 100644
--- a/pkgs/kde/misc/oxygen-icons/default.nix
+++ b/pkgs/kde/misc/oxygen-icons/default.nix
@@ -5,11 +5,11 @@
 }:
 mkKdeDerivation rec {
   pname = "oxygen-icons";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-icons/oxygen-icons-${version}.tar.xz";
-    hash = "sha256-KOwYKHXcwV2SePRc7RECaqOSR28fRUhxueLINwCOV3Q=";
+    hash = "sha256-FsqXEHnFBnxFB8q/G2GdyH3Wsyb9XC3Z9dQ4EPIXTWg=";
   };
 
   dontStrip = true;
diff --git a/pkgs/kde/misc/pulseaudio-qt/default.nix b/pkgs/kde/misc/pulseaudio-qt/default.nix
index 4b245616fee2..ae64cdd0e0f3 100644
--- a/pkgs/kde/misc/pulseaudio-qt/default.nix
+++ b/pkgs/kde/misc/pulseaudio-qt/default.nix
@@ -7,11 +7,11 @@
 }:
 mkKdeDerivation rec {
   pname = "pulseaudio-qt";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz";
-    hash = "sha256-G+y62ss2qdakMaDJPNtCj49n83zy0jdoZ1mDMYwK3oQ=";
+    hash = "sha256-8hvzDy/z5nDSBG+WYGncI/XmU/9Wus24kgwTdCZMvB4=";
   };
 
   extraNativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 085ecdbed827..bbfb3ec28ca7 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cups";
-  version = "2.4.10";
+  version = "2.4.11";
 
   src = fetchurl {
     url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    sha256 = "sha256-11dXwrwPeiiwLuTVLKnksaoboq/+FrmFhU9TNpQOWtc=";
+    hash = "sha256-moj+HaOimpF8P8Z85usxeDmdaOGlSMbYbHDZsTZR/XE=";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
deleted file mode 100644
index afee42090329..000000000000
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ /dev/null
@@ -1,199 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, unzip
-, autoconf
-, automake
-, libtool_1_5
-, makeWrapper
-, cups
-, jbigkit
-, glib
-, gtk3
-, gdk-pixbuf
-, pango
-, cairo
-, atk
-, pkg-config
-, libxml2
-, libredirect
-, ghostscript
-, pkgs
-, zlib
-}:
-
-let
-  system =
-    if stdenv.hostPlatform.system == "x86_64-linux" then "intel"
-    else if stdenv.hostPlatform.system == "aarch64-linux" then "arm"
-    else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}";
-  ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
-  libs = pkgs: lib.makeLibraryPath buildInputs;
-
-  version = "5.90";
-  dl = "8/0100007658/40";
-  suffix1 = "m17n";
-  suffix2 = "03";
-
-  versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version;
-  src_canon = fetchurl {
-    url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-${suffix1}-${suffix2}.tar.gz";
-    hash = "sha256-HvuRQYqkHRCwfajSJPridDcADq7VkYwBEo4qr9W5mqA=";
-  };
-
-  buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ];
-in
-stdenv.mkDerivation rec {
-  pname = "canon-cups-ufr2";
-  inherit version;
-  src = src_canon;
-
-  postUnpack = ''
-    (
-      cd $sourceRoot
-      tar -xf Sources/cnrdrvcups-lb-${version}-1.${suffix2}.tar.xz
-      sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
-      sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
-      sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
-      sed -ie "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
-      sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
-      sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
-      patchShebangs cnrdrvcups-common-${version}
-
-      sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh
-      sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh
-      sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
-      sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
-      sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
-      sed -ie "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
-      sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile
-      patchShebangs cnrdrvcups-lb-${version}
-    )
-  '';
-
-  nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 pkg-config ];
-
-  inherit buildInputs;
-
-  installPhase = ''
-    runHook preInstall
-
-    (
-      cd cnrdrvcups-common-${version}
-      ./allgen.sh
-      make install
-    )
-    (
-      cd cnrdrvcups-common-${version}/Rule
-      mkdir -p $out/share/cups/usb
-      install -m 644 *.usb-quirks $out/share/cups/usb
-    )
-    (
-      cd cnrdrvcups-lb-${version}
-      ./allgen.sh
-      make install
-
-      mkdir -p $out/share/cups/model
-      install -m 644 ppd/*.ppd $out/share/cups/model/
-    )
-
-    (
-      cd lib
-      mkdir -p $out/lib
-      install -m 755 libs64/${system}/libColorGearCufr2.so.2.0.0 $out/lib
-      install -m 755 libs64/${system}/libcaepcmufr2.so.1.0 $out/lib
-      install -m 755 libs64/${system}/libcaiocnpkbidir.so.1.0.0 $out/lib
-      install -m 755 libs64/${system}/libcaiousb.so.1.0.0 $out/lib
-      install -m 755 libs64/${system}/libcaiowrapufr2.so.1.0.0 $out/lib
-      install -m 755 libs64/${system}/libcanon_slimufr2.so.1.0.0 $out/lib
-      install -m 755 libs64/${system}/libcanonufr2r.so.1.0.0 $out/lib
-      install -m 755 libs64/${system}/libcnaccm.so.1.0 $out/lib
-      install -m 755 libs64/${system}/libcnlbcmr.so.1.0 $out/lib
-      install -m 755 libs64/${system}/libcnncapcmr.so.1.0 $out/lib
-      install -m 755 libs64/${system}/libufr2filterr.so.1.0.0 $out/lib
-
-      install -m 755 libs64/${system}/cnpdfdrv $out/bin
-      install -m 755 libs64/${system}/cnpkbidir $out/bin
-      install -m 755 libs64/${system}/cnpkmoduleufr2r $out/bin
-      install -m 755 libs64/${system}/cnrsdrvufr2 $out/bin
-      install -m 755 libs64/${system}/cnsetuputil2 $out/bin/cnsetuputil2
-
-      mkdir -p $out/share/cnpkbidir
-      install -m 644 libs64/${system}/cnpkbidir_info* $out/share/cnpkbidir
-
-      mkdir -p $out/share/ufr2filter
-      install -m 644 libs64/${system}/ThLB* $out/share/ufr2filter
-    )
-
-    (
-      cd $out/lib
-
-      ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so
-      ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so.2
-      ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so
-      ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so.1
-      ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so
-      ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so.1
-      ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so
-      ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so.1
-      ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so
-      ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so.1
-      ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so
-      ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so.1
-      ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so
-      ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so.1
-      ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
-      ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
-      ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so
-      ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1
-
-      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
-      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
-      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0
-    )
-
-    (
-      cd $out/bin
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2
-
-      wrapProgram $out/bin/cnrsdrvufr2 \
-        --prefix LD_LIBRARY_PATH ":" "$out/lib" \
-        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-        --set NIX_REDIRECTS /usr/bin/cnpkmoduleufr2r=$out/bin/cnpkmoduleufr2r:/usr/bin/cnjbigufr2=$out/bin/cnjbigufr2
-
-      wrapProgram $out/bin/cnsetuputil2 \
-        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-        --set NIX_REDIRECTS /usr/share/cnsetuputil2=$out/usr/share/cnsetuputil2
-    )
-
-    (
-      cd lib/data/ufr2
-      mkdir -p $out/share/caepcm
-      install -m 644 *.ICC $out/share/caepcm
-      install -m 644 *.icc $out/share/caepcm
-      install -m 644 *.PRF $out/share/caepcm
-      install -m 644 CnLB* $out/share/caepcm
-    )
-
-    (
-      cd cnrdrvcups-utility-${version}/data
-      mkdir -p $out/usr/share/cnsetuputil2
-      install -m 644 cnsetuputil* $out/usr/share/cnsetuputil2
-    )
-
-    makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \
-      --prefix LD_LIBRARY_PATH ":" "$out/lib" \
-      --prefix PATH ":" "$out/bin"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "CUPS Linux drivers for Canon printers";
-    homepage = "http://www.canon.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ lluchs ];
-  };
-}
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
deleted file mode 100644
index a76ecd6dcbf6..000000000000
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{ lib, stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }:
-
-let
-
-    arch = if stdenv.system == "x86_64-linux"
-      then "x86_64"
-      else "i386";
-
-in stdenv.mkDerivation rec {
-  pname = "samsung-unified-linux-driver";
-  version = "1.00.36";
-
-  src = fetchurl {
-    sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9";
-    url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
-  };
-
-  buildInputs = [
-    cups
-    libusb-compat-0_1
-    libxml2
-    perl
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin
-
-    mkdir -p $out/etc/sane.d/dll.d/
-    install -m644 noarch/etc/smfp.conf $out/etc/sane.d
-    echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf
-
-    mkdir -p $out/etc/smfp-common/scanner/share/
-    install -m644 noarch/libsane-smfp.cfg $out/etc/smfp-common/scanner/share/
-    install -m644 noarch/pagesize.xml $out/etc/smfp-common/scanner/share/
-
-    mkdir -p $out/etc/samsung/scanner/share/
-    install -m644 noarch/oem.conf $out/etc/samsung/scanner/share/
-
-    mkdir -p $out/lib
-    install -m755 ${arch}/libscmssc.so* $out/lib
-
-    mkdir -p $out/lib/cups/backend
-    ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend
-
-    mkdir -p $out/lib/cups/filter
-    ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter
-    ln -s $ghostscript/bin/gs $out/lib/cups/filter
-
-    mkdir -p $out/lib/sane
-    install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
-    ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1
-    ln -s libsane-smfp.so.1     $out/lib/sane/libsane-smfp.so
-
-    perl -pi -e \
-      's|/opt/smfp-common/scanner/.usedby/|/tmp/\0\0fp-common/scanner/.usedby/|g' \
-       $out/lib/sane/libsane-smfp.so.1.0.1
-    perl -pi -e 's|/opt|/etc|g' \
-       $out/lib/sane/libsane-smfp.so.1.0.1 \
-       $out/bin/rastertospl \
-       noarch/package_utils \
-       noarch/pre_install.sh
-
-    mkdir -p $out/lib/udev/rules.d
-    (
-      OEM_FILE=noarch/oem.conf
-      INSTALL_LOG_FILE=/dev/null
-      . noarch/scripting_utils
-      . noarch/package_utils
-      . noarch/scanner-script.pkg
-      fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules
-      chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules
-    )
-
-    mkdir -p $out/share
-    cp -R noarch/share/* $out/share
-    gzip -9 $out/share/ppd/*.ppd
-    rm -r $out/share/locale/*/*/install.mo
-
-    mkdir -p $out/share/cups
-    cd $out/share/cups
-    ln -s ../ppd .
-    ln -s ppd model
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    for bin in "$out/bin/"*; do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
-      patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin"
-    done
-
-    patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
-    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
-
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
-  '';
-
-  # all binaries are already stripped
-  dontStrip = true;
-
-  # we did this in prefixup already
-  dontPatchELF = true;
-
-  meta = with lib; {
-    description = "Unified Linux Driver for Samsung printers and scanners";
-    homepage = "http://www.bchemnet.com/suldr";
-    downloadPage = "http://www.bchemnet.com/suldr/driver/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-
-    # Tested on linux-x86_64. Might work on linux-i386.
-    # Probably won't work on anything else.
-    platforms = platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
index 59a210e6f534..326106b38878 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
     patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
     patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
 
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
   '';
 
   # all binaries are already stripped
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index eaba99839f61..b822fa140bb0 100644
--- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
@@ -24,7 +24,7 @@
 let
   installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386";
   appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64";
-  libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
+  libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}";
 in stdenv.mkDerivation rec {
   pname = "samsung-UnifiedLinuxDriver";
   version = "4.01.17";
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index b29572b436bd..bb0e1eb7b6fd 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -385,7 +385,7 @@ let plugins = {
     # for the version, look for the driver of XP-750 in the search page
     version = "2.30.4";
 
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     nativeBuildInputs = [ autoPatchelfHook ];
 
     src = fetchurl {
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
deleted file mode 100644
index 4e213a0b4c21..000000000000
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  autoreconfHook,
-  cups,
-  rpm,
-  cpio,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "epson-inkjet-printer-escpr2";
-  version = "1.2.18";
-
-  src = fetchurl {
-    # To find the most recent version go to
-    # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
-    # and retreive the download link for source package for x86 CPU
-    url = "https://download3.ebz.epson.net/dsc/f/03/00/16/25/39/fcf17405f25e851f3ee0e5ed3ce97d09f22ecb41/epson-inkjet-printer-escpr2-1.2.18-1.src.rpm";
-    sha256 = "sha256-cdCcZzi31jPGmMnlKtPCFVla0YWfrCTbXsXHSeB0Vk4=";
-  };
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    rpm2cpio $src | cpio -idmv
-    tar xvf ${pname}-${version}-1.tar.gz
-    cd ${pname}-${version}
-
-    runHook postUnpack
-  '';
-
-  buildInputs = [ cups ];
-  nativeBuildInputs = [
-    autoreconfHook
-    rpm
-    cpio
-  ];
-
-  configureFlags = [
-    "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter"
-    "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model"
-  ];
-
-  meta = with lib; {
-    homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
-    description = "ESC/P-R 2 Driver (generic driver)";
-    longDescription = ''
-      Epson Inkjet Printer Driver 2 (ESC/P-R 2) for Linux and the
-      corresponding PPD files.
-
-      Refer to the description of epson-escpr for usage.
-    '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
-      ma9e
-      ma27
-      shawn8901
-    ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch b/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch
deleted file mode 100644
index 268282e96eae..000000000000
--- a/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/spnavd.c b/src/spnavd.c
-index 2d4eca6..a5227ed 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -27,6 +27,8 @@ along with this program.  If not, see .
- #include 
- #include 
- #include 
-+#include 
-+#include 
- #include "spnavd.h"
- #include "logger.h"
- #include "dev.h"
-@@ -47,13 +49,39 @@ static void handle_events(fd_set *rset);
- static void sig_handler(int s);
- static char *fix_path(char *str);
- 
--static char *cfgfile = DEF_CFGFILE;
-+static char* config_path;
-+char* cfg_path()
-+{
-+	char* buf;
-+	if((buf = getenv("XDG_CONFIG_HOME"))) {
-+		if(config_path == NULL) {
-+			config_path = malloc(strlen(buf) + strlen("/spnavrc") + 1);
-+			if ( config_path != NULL) {
-+				sprintf(config_path, "%s/spnavrc", buf);
-+			}
-+		};
-+		return config_path;
-+	} else {
-+		if (!(buf = getenv("HOME"))) {
-+			struct passwd *pw = getpwuid(getuid());
-+			buf = pw->pw_dir;
-+		}
-+		config_path = malloc(strlen(buf) + strlen("/.config/spnavrc") + 1);
-+		if ( config_path != NULL) {
-+			sprintf(config_path, "%s/.config/spnavrc", buf);
-+		}
-+		return config_path;
-+	}
-+}
-+
-+static char *cfgfile = NULL;
- static char *logfile = DEF_LOGFILE;
- static char *pidpath = NULL;
- 
- int main(int argc, char **argv)
- {
- 	int i, pid, ret, become_daemon = 1;
-+	cfgfile = cfg_path();
- 
- 	for(i=1; i: config file path (default: " DEF_CFGFILE ")\n");
-+	printf(" -c : config file path (default: %s)\n", cfg_path());
- 	printf(" -l |syslog: log file path or log to syslog (default: " DEF_LOGFILE ")\n");
- 	printf(" -v: verbose output\n");
- 	printf(" -V,-version: print version number and exit\n");
diff --git a/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch b/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch
deleted file mode 100644
index bc2cad9784cb..000000000000
--- a/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/spnavd.c b/src/spnavd.c
-index 03080da..2d4eca6 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -42,12 +42,14 @@ static void cleanup(void);
- static void daemonize(void);
- static int write_pid_file(void);
- static int find_running_daemon(void);
-+static char *pidfile_path(void);
- static void handle_events(fd_set *rset);
- static void sig_handler(int s);
- static char *fix_path(char *str);
- 
- static char *cfgfile = DEF_CFGFILE;
- static char *logfile = DEF_LOGFILE;
-+static char *pidpath = NULL;
- 
- int main(int argc, char **argv)
- {
-@@ -270,7 +272,7 @@ static void cleanup(void)
- 		remove_device(tmp);
- 	}
- 
--	remove(PIDFILE);
-+	remove(pidfile_path());
- }
- 
- static void daemonize(void)
-@@ -314,7 +316,7 @@ static int write_pid_file(void)
- 	FILE *fp;
- 	int pid = getpid();
- 
--	if(!(fp = fopen(PIDFILE, "w"))) {
-+	if(!(fp = fopen(pidfile_path(), "w"))) {
- 		return -1;
- 	}
- 	fprintf(fp, "%d\n", pid);
-@@ -329,7 +331,7 @@ static int find_running_daemon(void)
- 	struct sockaddr_un addr;
- 
- 	/* try to open the pid-file */
--	if(!(fp = fopen(PIDFILE, "r"))) {
-+	if(!(fp = fopen(pidfile_path(), "r"))) {
- 		return -1;
- 	}
- 	if(fscanf(fp, "%d\n", &pid) != 1) {
-@@ -356,6 +358,22 @@ static int find_running_daemon(void)
- 	return pid;
- }
- 
-+char *pidfile_path(void)
-+{
-+	char *xdg_runtime_dir;
-+	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+		if ( pidpath == NULL ) {
-+			pidpath = malloc(strlen(xdg_runtime_dir) + strlen("/spnavd.pid") + 1);
-+			if ( pidpath != NULL ) {
-+				sprintf(pidpath, "%s/spnavd.pid", xdg_runtime_dir);
-+			}
-+		};
-+		return pidpath;
-+	} else {
-+		return DEFAULT_PIDFILE;
-+	}
-+}
-+
- static void handle_events(fd_set *rset)
- {
- 	int dev_fd, hotplug_fd;
-diff --git a/src/spnavd.h b/src/spnavd.h
-index 2d1c48b..17d22d3 100644
---- a/src/spnavd.h
-+++ b/src/spnavd.h
-@@ -26,7 +26,7 @@ along with this program.  If not, see .
- #define DEF_CFGFILE		"/etc/spnavrc"
- #define DEF_LOGFILE		"/var/log/spnavd.log"
- 
--#define PIDFILE		"/var/run/spnavd.pid"
-+#define DEFAULT_PIDFILE		"/run/spnavd.pid"
- #define DEFAULT_SOCK_NAME	"/run/spnav.sock"
- #define SYSLOG_ID	"spnavd"
- 
diff --git a/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/pkgs/misc/drivers/spacenavd/configure-socket-path.patch
deleted file mode 100644
index c59987dcc051..000000000000
--- a/pkgs/misc/drivers/spacenavd/configure-socket-path.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/src/proto_unix.c b/src/proto_unix.c
-index 998f234..d38452c 100644
---- a/src/proto_unix.c
-+++ b/src/proto_unix.c
-@@ -36,11 +36,14 @@ enum {
- 
- static int lsock = -1;
- 
-+static char *spath = NULL;
-+
- int init_unix(void)
- {
- 	int s;
- 	mode_t prev_umask;
- 	struct sockaddr_un addr;
-+	char *sock_path;
- 
- 	if(lsock >= 0) return 0;
- 
-@@ -49,16 +52,18 @@ int init_unix(void)
- 		return -1;
- 	}
- 
--	unlink(SOCK_NAME);	/* in case it already exists */
-+	sock_path = socket_path();
-+
-+	unlink(sock_path);	/* in case it already exists */
- 
- 	memset(&addr, 0, sizeof addr);
- 	addr.sun_family = AF_UNIX;
--	strcpy(addr.sun_path, SOCK_NAME);
-+	strcpy(addr.sun_path, sock_path);
- 
- 	prev_umask = umask(0);
- 
- 	if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
--		logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno));
-+		logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno));
- 		close(s);
- 		return -1;
- 	}
-@@ -68,7 +73,7 @@ int init_unix(void)
- 	if(listen(s, 8) == -1) {
- 		logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno));
- 		close(s);
--		unlink(SOCK_NAME);
-+		unlink(sock_path);
- 		return -1;
- 	}
- 
-@@ -82,7 +87,7 @@ void close_unix(void)
- 		close(lsock);
- 		lsock = -1;
- 
--		unlink(SOCK_NAME);
-+		unlink(socket_path());
- 	}
- }
- 
-@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset)
- 
- 	return 0;
- }
-+
-+char *socket_path(void)
-+{
-+	char *xdg_runtime_dir;
-+	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+		if ( spath == NULL ) {
-+			spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
-+			if ( spath != NULL ) {
-+				sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
-+			}
-+		};
-+		return spath;
-+	} else {
-+		return DEFAULT_SOCK_NAME;
-+	}
-+}
-diff --git a/src/proto_unix.h b/src/proto_unix.h
-index 045b379..ec4509c 100644
---- a/src/proto_unix.h
-+++ b/src/proto_unix.h
-@@ -23,6 +23,7 @@ along with this program.  If not, see .
- #include "event.h"
- #include "client.h"
- 
-+char *socket_path(void);
- int init_unix(void);
- void close_unix(void);
- int get_unix_socket(void);
-diff --git a/src/spnavd.c b/src/spnavd.c
-index cbea191..03080da 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -344,7 +344,7 @@ static int find_running_daemon(void)
- 	}
- 	memset(&addr, 0, sizeof addr);
- 	addr.sun_family = AF_UNIX;
--	strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path);
-+	strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path);
- 
- 	if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
- 		close(s);
-diff --git a/src/spnavd.h b/src/spnavd.h
-index fa0a916..2d1c48b 100644
---- a/src/spnavd.h
-+++ b/src/spnavd.h
-@@ -26,8 +26,8 @@ along with this program.  If not, see .
- #define DEF_CFGFILE		"/etc/spnavrc"
- #define DEF_LOGFILE		"/var/log/spnavd.log"
- 
--#define SOCK_NAME	"/var/run/spnav.sock"
- #define PIDFILE		"/var/run/spnavd.pid"
-+#define DEFAULT_SOCK_NAME	"/run/spnav.sock"
- #define SYSLOG_ID	"spnavd"
- 
- /* Multiple devices support */
diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix
index 27ea69943cc1..58e3d859a8fd 100644
--- a/pkgs/misc/drivers/spacenavd/default.nix
+++ b/pkgs/misc/drivers/spacenavd/default.nix
@@ -1,40 +1,37 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, libX11, IOKit }:
-
-stdenv.mkDerivation rec {
-  version = "0.8";
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  libXext,
+  libX11,
+  IOKit,
+}:
+stdenv.mkDerivation (finalAttrs: {
   pname = "spacenavd";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "spacenavd";
-    rev = "v${version}";
-    sha256 = "1zz0cm5cgvp9s5n4nzksl8rb11c7sw214bdafzra74smvqfjcjcf";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-26geQYOXjMZZ/FpPpav7zfql0davTBwB4Ir+X1oep9Q=";
   };
 
-  patches = [
-    # Fixes Darwin: https://github.com/FreeSpacenav/spacenavd/pull/38
-    (fetchpatch {
-      url = "https://github.com/FreeSpacenav/spacenavd/commit/d6a25d5c3f49b9676d039775efc8bf854737c43c.patch";
-      sha256 = "02pdgcvaqc20qf9hi3r73nb9ds7yk2ps9nnxaj0x9p50xjnhfg5c";
-    })
-    # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock
-    # to allow for a user service
-    ./configure-socket-path.patch
-    # Changes the pidfile path from /run/spnavd.pid to $XDG_RUNTIME_DIR/spnavd.pid
-    # to allow for a user service
-    ./configure-pidfile-path.patch
-    # Changes the config file path from /etc/spnavrc to $XDG_CONFIG_HOME/spnavrc or $HOME/.config/spnavrc
-    # to allow for a user service
-    ./configure-cfgfile-path.patch
-  ];
-
-  buildInputs = [ libX11 ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
+  buildInputs = [
+    libX11
+    libXext
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
 
   configureFlags = [ "--disable-debug" ];
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
+  postInstall = ''
+    install -Dm644 $src/contrib/systemd/spacenavd.service -t $out/lib/systemd/system
+    substituteInPlace $out/lib/systemd/system/spacenavd.service \
+      --replace-fail "/usr/local/bin/spacenavd" "$out/bin/spacenavd"
+  '';
+
   meta = with lib; {
     homepage = "https://spacenav.sourceforge.net/";
     description = "Device driver and SDK for 3Dconnexion 3D input devices";
@@ -43,4 +40,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ sohalt ];
   };
-}
+})
diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix
deleted file mode 100644
index 8c7fb067f1ab..000000000000
--- a/pkgs/misc/flashfocus/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, python3Packages, fetchPypi, netcat-openbsd, nix-update-script }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "flashfocus";
-  version = "2.4.1";
-
-  format = "pyproject";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE=";
-  };
-
-  postPatch = ''
-    substituteInPlace bin/nc_flash_window \
-      --replace "nc" "${lib.getExe netcat-openbsd}"
-  '';
-
-  nativeBuildInputs = with python3Packages; [
-    setuptools
-  ];
-
-  pythonRelaxDeps = [
-    "pyyaml"
-    "xcffib"
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    i3ipc
-    xcffib
-    click
-    cffi
-    xpybutil
-    marshmallow
-    pyyaml
-  ];
-
-  # Tests require access to a X session
-  doCheck = false;
-
-  pythonImportsCheck = [ "flashfocus" ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    homepage = "https://github.com/fennerm/flashfocus";
-    description = "Simple focus animations for tiling window managers";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ artturin ];
-  };
-}
diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index afef861c0dc4..98eb9c12aef0 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -1,11 +1,73 @@
-{ callPackage, fetchgit, ... } @ args:
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  gcc-arm-embedded,
+  binutils-arm-embedded,
+  makeWrapper,
+  python3Packages,
 
-callPackage ./generic.nix (args // {
-  version = "1.2.14";
+  # Default FSIJ IDs
+  vid ? "234b",
+  pid ? "0000",
+}:
 
-  src = fetchgit {
-    url = "git://git.gniibe.org/gnuk/gnuk.git";
-    rev = "177ef67edfa2306c2a369a037362385c354083e1";
-    sha256 = "16wa3xsaq4r8caw6c24hnv4j78bklacix4in2y66j35h68ggr3j1";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gnuk";
+  version = "2.2";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "gnuk-team";
+    repo = "gnuk/gnuk";
+    rev = "release/${finalAttrs.version}";
+    hash = "sha256-qY/dwkcPJiPx/+inSxH7w7a0v3cWUQDX+NYJwUjnkMY=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    gcc-arm-embedded
+    binutils-arm-embedded
+    makeWrapper
+  ];
+
+  buildInputs = with python3Packages; [
+    python
+    pyusb
+    colorama
+  ];
+
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  configureFlags = [ "--vidpid=${vid}:${pid}" ];
+
+  # TODO: Check how many of these patches are actually needed.
+  installPhase = ''
+    mkdir -p $out/bin
+
+    find . -name gnuk.bin -exec cp {} $out \;
+
+    #sed -i 's,Exception as e,IOError as e,' ../tool/stlinkv2.py
+    sed -i ../tool/stlinkv2.py \
+      -e "1a import array" \
+      -e "s,\(data_received =\) (),\1 array.array('B'),g" \
+      -e "s,\(data_received\) = data_received + \(.*\),\1.extend(\2),g"
+    cp ../tool/stlinkv2.py $out/bin/stlinkv2
+    wrapProgram $out/bin/stlinkv2 --prefix PYTHONPATH : "$PYTHONPATH"
+
+    # Some useful helpers
+    echo "#! ${stdenv.shell} -e" | tee $out/bin/{unlock,flash}
+    echo "$out/bin/stlinkv2 -u \$@" >> $out/bin/unlock
+    echo "$out/bin/stlinkv2 -b \$@ $out/gnuk.bin" >> $out/bin/flash
+    chmod +x $out/bin/{unlock,flash}
+  '';
+
+  meta = {
+    homepage = "https://www.fsij.org/category/gnuk.html";
+    description = "Implementation of USB cryptographic token for gpg";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ ];
+    broken = true; # Needs Picolib, which is not packaged in Nixpkgs.
   };
 })
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix
deleted file mode 100644
index e9cc3aff2cf6..000000000000
--- a/pkgs/misc/gnuk/generic.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper
-, python3Packages
-
-# Extra options
-, device ? "fsij", vid ? "234b", pid ? "0000"
-
-# Version specific options
-, version, src
-, ...
-}:
-
-stdenv.mkDerivation {
-  pname = "gnuk-${device}";
-
-  inherit version src;
-
-  nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ];
-  buildInputs = with python3Packages; [ python pyusb colorama ];
-
-  configurePhase = ''
-    cd src
-    patchShebangs configure
-    ./configure --vidpid=${vid}:${pid}
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    find . -name gnuk.bin -exec cp {} $out \;
-
-    #sed -i 's,Exception as e,IOError as e,' ../tool/stlinkv2.py
-    sed -i ../tool/stlinkv2.py \
-      -e "1a import array" \
-      -e "s,\(data_received =\) (),\1 array.array('B'),g" \
-      -e "s,\(data_received\) = data_received + \(.*\),\1.extend(\2),g"
-    cp ../tool/stlinkv2.py $out/bin/stlinkv2
-    wrapProgram $out/bin/stlinkv2 --prefix PYTHONPATH : "$PYTHONPATH"
-
-    # Some useful helpers
-    echo "#! ${stdenv.shell} -e" | tee $out/bin/{unlock,flash}
-    echo "$out/bin/stlinkv2 -u \$@" >> $out/bin/unlock
-    echo "$out/bin/stlinkv2 -b \$@ $out/gnuk.bin" >> $out/bin/flash
-    chmod +x $out/bin/{unlock,flash}
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.fsij.org/doc-gnuk/";
-    description = "Implementation of USB cryptographic token for gpg";
-    license = licenses.gpl3;
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 54827497f846..53087942b933 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkg-config python makeWrapper wafHook ];
+  nativeBuildInputs = [ pkg-config python wafHook ]
+    ++ lib.optionals (optDbus != null) [ makeWrapper ];
   buildInputs = [ libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix
deleted file mode 100644
index e0d20dfcb46c..000000000000
--- a/pkgs/misc/logging/pacemaker/default.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ lib
-, stdenv
-, autoconf
-, automake
-, bash
-, bzip2
-, corosync
-, dbus
-, fetchFromGitHub
-, glib
-, gnutls
-, libqb
-, libtool
-, libuuid
-, libxml2
-, libxslt
-, pam
-, pkg-config
-, python3
-, nixosTests
-
-# Pacemaker is compiled twice, once with forOCF = true to extract its
-# OCF definitions for use in the ocf-resource-agents derivation, then
-# again with forOCF = false, where the ocf-resource-agents is provided
-# as the OCF_ROOT.
-, forOCF ? false
-, ocf-resource-agents
-} :
-
-stdenv.mkDerivation rec {
-  pname = "pacemaker";
-  version = "2.1.8";
-
-  src = fetchFromGitHub {
-    owner = "ClusterLabs";
-    repo = pname;
-    rev = "Pacemaker-${version}";
-    sha256 = "sha256-J57+NSs4cL3BlEjSaXAoUTEhbMMxhWy8sUZ/K3x2nRM=";
-  };
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
-    pkg-config
-  ];
-
-  buildInputs = [
-    bash
-    bzip2
-    corosync
-    dbus.dev
-    glib
-    gnutls
-    libqb
-    libuuid
-    libxml2.dev
-    libxslt.dev
-    pam
-    python3
-  ];
-
-  preConfigure = ''
-    ./autogen.sh --prefix="$out"
-  '';
-  configureFlags = [
-    "--exec-prefix=${placeholder "out"}"
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--with-initdir=/etc/systemd/system"
-    "--with-systemdsystemunitdir=/etc/systemd/system"
-    "--with-corosync"
-    # allows Type=notify in the systemd service
-    "--enable-systemd"
-  ] ++ lib.optional (!forOCF) "--with-ocfdir=${ocf-resource-agents}/usr/lib/ocf";
-
-  installFlags = [ "DESTDIR=${placeholder "out"}" ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
-    "-Wno-error=strict-prototypes"
-    "-Wno-error=deprecated-declarations"
-  ]);
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    # pacemaker's install linking requires a weirdly nested hierarchy
-    mv $out$out/* $out
-    rm -r $out/nix
-  '';
-
-  passthru.tests = {
-    inherit (nixosTests) pacemaker;
-  };
-
-  meta = with lib; {
-    homepage = "https://clusterlabs.org/pacemaker/";
-    description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ryantm astro ];
-  };
-}
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
deleted file mode 100644
index 25ac90175914..000000000000
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, python2, pkg-config, pam, xorg }:
-
-stdenv.mkDerivation {
-  pname = "xtrlock-pam";
-  version = "3.4-post-20150909";
-
-  src = fetchFromGitHub {
-    owner = "aanatoly";
-    repo = "xtrlock-pam";
-    rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
-    sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ python2 pam xorg.libX11 ];
-
-  configurePhase = ''
-    substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h
-    substituteInPlace src/xtrlock.c --replace system-local-login xscreensaver
-    python configure --prefix=$out
-  '';
-
-  meta = {
-    homepage = "https://github.com/aanatoly/xtrlock-pam";
-    description = "PAM based X11 screen locker";
-    license = "unknown";
-    maintainers = [ ];
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/bsd-lib-mk-force-static.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/bsd-lib-mk-force-static.patch
new file mode 100644
index 000000000000..04446ce32b5e
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/bsd-lib-mk-force-static.patch
@@ -0,0 +1,81 @@
+From 197b10de54b53a089ad549f2e00787b4fa719210 Mon Sep 17 00:00:00 2001
+From: Artemis Tosini 
+Date: Sat, 2 Nov 2024 07:50:13 +0000
+Subject: [PATCH] HACK: bsd.lib.mk: Treat empty SHLIB_NAME as nonexistant
+
+Unsetting SHLIB_NAME in nix package definitions is a pain
+but we can easily set it to be empty. This is useful when
+building static libraries without unneeded static libraries.
+---
+ share/mk/bsd.lib.mk | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
+index 5f328d5378ca..89d16dc6fa41 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -242,7 +242,7 @@ PO_FLAG=-pg
+ _LIBDIR:=${LIBDIR}
+ _SHLIBDIR:=${SHLIBDIR}
+ 
+-.if defined(SHLIB_NAME)
++.if defined(SHLIB_NAME) && !empty(SHLIB_NAME)
+ .if ${MK_DEBUG_FILES} != "no"
+ SHLIB_NAME_FULL=${SHLIB_NAME}.full
+ # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
+@@ -277,7 +277,7 @@ LDFLAGS+=	-Wl,--undefined-version
+ .endif
+ .endif
+ 
+-.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME)
++.if defined(LIB) && !empty(LIB) || (defined(SHLIB_NAME) && !empty(SHLIB_NAME))
+ OBJS+=		${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/}
+ BCOBJS+=	${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.bco/g}
+ LLOBJS+=	${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.llo/g}
+@@ -320,14 +320,14 @@ lib${LIB_PRIVATE}${LIB}.ll: ${LLOBJS}
+ CLEANFILES+=	lib${LIB_PRIVATE}${LIB}.bc lib${LIB_PRIVATE}${LIB}.ll
+ .endif
+ 
+-.if defined(SHLIB_NAME) || \
++.if (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) || \
+     defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
+ SOBJS+=		${OBJS:.o=.pico}
+ DEPENDOBJS+=	${SOBJS}
+ CLEANFILES+=	${SOBJS}
+ .endif
+ 
+-.if defined(SHLIB_NAME)
++.if defined(SHLIB_NAME) && !empty(SHLIB_NAME)
+ _LIBS+=		${SHLIB_NAME}
+ 
+ SOLINKOPTS+=	-shared -Wl,-x
+@@ -435,7 +435,7 @@ all: all-man
+ CLEANFILES+=	${_LIBS}
+ 
+ _EXTRADEPEND:
+-.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME)
++.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME) && !empty(SHLIB_NAME)
+ .if defined(DPADD) && !empty(DPADD)
+ 	echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE}
+ .endif
+@@ -501,7 +501,7 @@ _libinstall:
+ 	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/
+ .endif
+ .endif
+-.if defined(SHLIB_NAME)
++.if defined(SHLIB_NAME) && !empty(SHLIB_NAME)
+ 	${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
+ 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/
+@@ -588,7 +588,7 @@ OBJS_DEPEND_GUESS+= ${SRCS:M*.h}
+ OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.po+=	${_S}
+ .endfor
+ .endif
+-.if defined(SHLIB_NAME) || \
++.if (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) || \
+     defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
+ .for _S in ${SRCS:N*.[hly]}
+ OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.pico+=	${_S}
+-- 
+2.46.1
+
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch
new file mode 100644
index 000000000000..02f1c904cd88
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch
@@ -0,0 +1,44 @@
+diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c
+index ed3f008c394f..b4fb98682a4c 100644
+--- a/usr.bin/mkimg/gpt.c
++++ b/usr.bin/mkimg/gpt.c
+@@ -50,6 +50,7 @@ static mkimg_uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
+ static mkimg_uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR;
+ static mkimg_uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA;
+ static mkimg_uuid_t gpt_uuid_prep_boot = GPT_ENT_TYPE_PREP_BOOT;
++static mkimg_uuid_t gpt_uuid_openbsd_ufs = GPT_ENT_TYPE_OPENBSD_DATA;
+ 
+ static struct mkimg_alias gpt_aliases[] = {
+     {	ALIAS_EFI, ALIAS_PTR2TYPE(&gpt_uuid_efi) },
+@@ -63,6 +64,7 @@ static struct mkimg_alias gpt_aliases[] = {
+     {	ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) },
+     {	ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) },
+     {	ALIAS_PPCBOOT, ALIAS_PTR2TYPE(&gpt_uuid_prep_boot) },
++    {	ALIAS_OPENBSD_UFS, ALIAS_PTR2TYPE(&gpt_uuid_openbsd_ufs) },
+     {	ALIAS_NONE, 0 }		/* Keep last! */
+ };
+ 
+diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c
+index 85ed94013e8d..00a3432c5328 100644
+--- a/usr.bin/mkimg/scheme.c
++++ b/usr.bin/mkimg/scheme.c
+@@ -56,6 +56,7 @@ static struct {
+ 	{ "mbr", ALIAS_MBR },
+ 	{ "ntfs", ALIAS_NTFS },
+ 	{ "prepboot", ALIAS_PPCBOOT },
++	{ "openbsd-ufs", ALIAS_OPENBSD_UFS },
+ 	{ NULL, ALIAS_NONE }		/* Keep last! */
+ };
+ 
+diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h
+index 52614255595f..0c44f8653af2 100644
+--- a/usr.bin/mkimg/scheme.h
++++ b/usr.bin/mkimg/scheme.h
+@@ -45,6 +45,7 @@ enum alias {
+ 	ALIAS_MBR,
+ 	ALIAS_NTFS,
+ 	ALIAS_PPCBOOT,
++	ALIAS_OPENBSD_UFS,
+ 	/* end */
+ 	ALIAS_COUNT		/* Keep last! */
+ };
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/init.nix b/pkgs/os-specific/bsd/freebsd/pkgs/init.nix
index 502c532b82e8..d02642c712ab 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/init.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/init.nix
@@ -1,7 +1,9 @@
-{ mkDerivation }:
+{ mkDerivation, stdenv }:
 mkDerivation {
   path = "sbin/init";
   extraPaths = [ "sbin/mount" ];
   NO_FSCHG = "yes";
   MK_TESTS = "no";
+
+  meta.broken = !stdenv.hostPlatform.isStatic;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
index 6d31b1fc49e3..7ff10d065785 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
@@ -116,6 +116,13 @@ mkDerivation {
         --replace '/usr/share/i18n' '${builtins.placeholder "out"}/share/i18n'
   '';
 
+  # NIX_CFLAGS_LINK is empty at this point except when building static,
+  # in which case the stdenv adapter adds the `-static` flag.
+  # Building with `-static` set causes linker errors.
+  postConfigure = ''
+    export NIX_CFLAGS_LINK=
+  '';
+
   nativeBuildInputs = [
     bsdSetupHook
     freebsdSetupHook
@@ -194,7 +201,7 @@ mkDerivation {
       make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags
       make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags install
 
-      ln -s $BSDSRCDIR/lib/libc/libc.so.7 $BSDSRCDIR/lib/libc/libc.so  # not sure
+      ln -s $BSDSRCDIR/lib/libc/libc.so.7 $BSDSRCDIR/lib/libc/libc.so  # otherwise these dynamic libraries try to link with libc.a
       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
@@ -266,6 +273,13 @@ mkDerivation {
       make -C $BSDSRCDIR/libexec/rtld-elf $makeFlags install
       rm -f $out/libexec/ld-elf.so.1
       mv $out/bin/ld-elf.so.1 $out/libexec
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+      mkdir $out/lib/keep_static
+      mv $out/lib/*_nonshared.a $out/lib/libgcc*.a $out/lib/libcompiler_rt.a $out/lib/keep_static
+      rm $out/lib/*.a
+      mv $out/lib/keep_static/* $out/lib
+      rmdir $out/lib/keep_static
     '';
 
   # libc should not be allowed to refer to anything other than itself
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix
index fd5591c0ffb8..f49718dc5ef1 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix
@@ -1,4 +1,8 @@
-{ mkDerivation }:
+{
+  mkDerivation,
+  stdenv,
+  lib,
+}:
 # this package is quite different from stock libcxxrt.
 # as of FreeBSD 14.0, it is vendored from APPROXIMATELY libcxxrt
 # 5d8a15823a103bbc27f1bfdcf2b5aa008fab57dd, though the vendoring mechanism is
@@ -8,11 +12,14 @@ mkDerivation {
   pname = "libcxxrt";
   path = "lib/libcxxrt";
   extraPaths = [ "contrib/libcxxrt" ];
-  outputs = [
-    "out"
-    "dev"
-    "debug"
-  ];
+  outputs =
+    [
+      "out"
+      "dev"
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
+      "debug"
+    ];
   noLibcxx = true;
   libName = "cxxrt";
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
index 1a3b0f823253..e4823e905f8e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
@@ -58,9 +58,12 @@ lib.makeOverridable (
 
       HOST_SH = stdenv'.shell;
 
-      makeFlags = [
-        "STRIP=-s" # flag to install, not command
-      ] ++ lib.optional (!stdenv'.hostPlatform.isFreeBSD) "MK_WERROR=no";
+      makeFlags =
+        [
+          "STRIP=-s" # flag to install, not command
+        ]
+        ++ lib.optional (!stdenv'.hostPlatform.isFreeBSD) "MK_WERROR=no"
+        ++ lib.optional stdenv.hostPlatform.isStatic "SHLIB_NAME=";
 
       # amd64 not x86_64 for this on unlike NetBSD
       MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv';
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix
index fa8bb690075f..b179544eaee3 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   mkDerivation,
   writeShellScript,
   mtree,
@@ -10,7 +11,8 @@
   groff,
   compatIfNeeded,
   fts,
-
+  darwin,
+  stdenv,
 }:
 
 # HACK: to ensure parent directories exist. This emulates GNU
@@ -42,7 +44,8 @@ mkDerivation {
     # fts header is needed. glibc already has this header, but musl doesn't,
     # so make sure pkgsMusl.netbsd.install still builds in case you want to
     # remove it!
-    ++ [ fts ];
+    ++ [ fts ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch
new file mode 100644
index 000000000000..6a84536e8c04
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch
@@ -0,0 +1,343 @@
+diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
+index 9fbcc5d0dbc..6b68508585a 100644
+--- a/usr.sbin/makefs/cd9660.c
++++ b/usr.sbin/makefs/cd9660.c
+@@ -97,6 +97,7 @@
+   */
+ 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
+index f3b8d2238be..178ab84bf04 100644
+--- a/usr.sbin/makefs/cd9660.h
++++ b/usr.sbin/makefs/cd9660.h
+@@ -37,7 +37,7 @@
+ #define _MAKEFS_CD9660_H
+ 
+ #include 
+-#include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/usr.sbin/makefs/cd9660/cd9660_conversion.c b/usr.sbin/makefs/cd9660/cd9660_conversion.c
+index d010c4002cf..6722891d77d 100644
+--- a/usr.sbin/makefs/cd9660/cd9660_conversion.c
++++ b/usr.sbin/makefs/cd9660/cd9660_conversion.c
+@@ -34,9 +34,9 @@
+  */
+ #include "cd9660.h"
+ 
+-#define bswap16 swap16
+-#define bswap32 swap32
+-
++#include 
++#define bswap16 htons
++#define bswap32 htonl
+ 
+ static char cd9660_compute_gm_offset(time_t);
+ 
+diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c
+index dd0622e0f10..acc9006848b 100644
+--- a/usr.sbin/makefs/cd9660/cd9660_strings.c
++++ b/usr.sbin/makefs/cd9660/cd9660_strings.c
+@@ -34,6 +34,7 @@
+  */
+ 
+ #include 
++#include 
+ 
+ #include "makefs.h"
+ 
+diff --git a/usr.sbin/makefs/cd9660/iso.h b/usr.sbin/makefs/cd9660/iso.h
+index 3ed58d1dedc..96e7b96b35a 100644
+--- a/usr.sbin/makefs/cd9660/iso.h
++++ b/usr.sbin/makefs/cd9660/iso.h
+@@ -46,6 +46,8 @@
+ #ifndef _ISOFS_CD9660_ISO_H_
+ #define _ISOFS_CD9660_ISO_H_
+ 
++#include "compat.h"
++
+ #define ISODCL(from, to) (to - from + 1)
+ 
+ struct iso_volume_descriptor {
+diff --git a/usr.sbin/makefs/compat.h b/usr.sbin/makefs/compat.h
+new file mode 100644
+index 00000000000..8cc830662bd
+--- /dev/null
++++ b/usr.sbin/makefs/compat.h
+@@ -0,0 +1,71 @@
++#pragma once
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#define u_int8_t uint8_t
++#define u_int16_t uint16_t
++#define u_int32_t uint32_t
++#define u_int64_t uint64_t
++typedef unsigned char u_char;
++typedef unsigned short u_short;
++typedef unsigned int u_int;
++typedef unsigned long u_long;
++typedef uint64_t dev_t;
++typedef int64_t off_t;
++#define __unused
++#define __dead
++#define pledge(x, y) 0
++#define unveil(x, y) 0
++#define srandom_deterministic srandom
++#define     MAXBSIZE        (64 * 1024)
++
++static inline void errc(int status, int code, const char *fmt, ...) {
++	// TODO
++	printf("You're outta here!\n");
++	exit(status);
++}
++
++static inline void warnc(int code, const char *fmt, ...) {
++	// TODO
++	printf("You're outta here!\n");
++}
++
++static inline int scan_scaled(char* number_w_scale, long long *result) {
++	int number, fraction = 0;
++	char scale[3];
++	long long tresult;
++	if (sscanf(number_w_scale, "%d.%1d%2s", &number, &fraction, &scale[0]) == 3 ||
++	    sscanf(number_w_scale, "%d%2s", &number, &scale[0]) == 2) {
++		tresult = number * 10 + fraction;
++		switch (scale[0]) {
++			case 'E':
++				tresult *= 1024;
++			case 'P':
++				tresult *= 1024;
++			case 'T':
++				tresult *= 1024;
++			case 'G':
++				tresult *= 1024;
++			case 'M':
++				tresult *= 1024;
++			case 'K':
++				tresult *= 1024;
++			case 'B':
++			case ' ':
++			case '\0':
++				break;
++			default:
++				errno = EINVAL;
++				return -1;
++		}
++		tresult /= 10;
++		*result = tresult;
++		return 0;
++	} else {
++		errno = EINVAL;
++		return -1;
++	}
++}
+diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
+index b055c62a598..c99cbfef5a7 100644
+--- a/usr.sbin/makefs/ffs.c
++++ b/usr.sbin/makefs/ffs.c
+@@ -198,7 +198,7 @@ ffs_parse_opts(const char *option, fsinfo_t *fsopts)
+ 	if (strcmp(ffs_options[rv].name, "disklabel") == 0) {
+ 		struct disklabel *dp;
+ 
+-		dp = getdiskbyname(buf);
++		dp = NULL;
+ 		if (dp == NULL)
+ 			errx(1, "unknown disk type: %s", buf);
+ 
+@@ -603,8 +603,8 @@ ffs_build_dinode1(struct ufs1_dinode *dinp, dirbuf_t *dbufp, fsnode *cur,
+ 	dinp->di_mode = cur->inode->st.st_mode;
+ 	dinp->di_nlink = cur->inode->nlink;
+ 	dinp->di_size = cur->inode->st.st_size;
+-	dinp->di_flags = cur->inode->st.st_flags;
+-	dinp->di_gen = cur->inode->st.st_gen;
++	dinp->di_flags = 0;
++	dinp->di_gen = 0;
+ 	dinp->di_uid = cur->inode->st.st_uid;
+ 	dinp->di_gid = cur->inode->st.st_gid;
+ 
+@@ -645,8 +645,8 @@ ffs_build_dinode2(struct ufs2_dinode *dinp, dirbuf_t *dbufp, fsnode *cur,
+ 	dinp->di_mode = cur->inode->st.st_mode;
+ 	dinp->di_nlink = cur->inode->nlink;
+ 	dinp->di_size = cur->inode->st.st_size;
+-	dinp->di_flags = cur->inode->st.st_flags;
+-	dinp->di_gen = cur->inode->st.st_gen;
++	dinp->di_flags = 0;
++	dinp->di_gen = 0;
+ 	dinp->di_uid = cur->inode->st.st_uid;
+ 	dinp->di_gid = cur->inode->st.st_gid;
+ 
+diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
+index ce512c7d389..8130f7e9cbc 100644
+--- a/usr.sbin/makefs/ffs/buf.c
++++ b/usr.sbin/makefs/ffs/buf.c
+@@ -47,6 +47,7 @@
+ 
+ #include "makefs.h"
+ #include "buf.h"
++#include "compat.h"
+ 
+ TAILQ_HEAD(buftailhead,mkfsbuf) buftail;
+ 
+diff --git a/usr.sbin/makefs/include/machine/disklabel.h b/usr.sbin/makefs/include/machine/disklabel.h
+new file mode 100644
+index 00000000000..7c5aa45c998
+--- /dev/null
++++ b/usr.sbin/makefs/include/machine/disklabel.h
+@@ -0,0 +1,7 @@
++#define LABELSECTOR 1
++#define LABELOFFSET 0
++#define MAXPARTITIONS 16
++
++static inline struct disklabel *getdiskbyname(const char *name) {
++	return (void*)0;
++}
+diff --git a/usr.sbin/makefs/include/msdosfs/bootsect.h b/usr.sbin/makefs/include/msdosfs/bootsect.h
+new file mode 100644
+index 00000000000..02e88ac2b9c
+--- /dev/null
++++ b/usr.sbin/makefs/include/msdosfs/bootsect.h
+@@ -0,0 +1 @@
++#include 
+diff --git a/usr.sbin/makefs/include/msdosfs/bpb.h b/usr.sbin/makefs/include/msdosfs/bpb.h
+new file mode 100644
+index 00000000000..08598cc217b
+--- /dev/null
++++ b/usr.sbin/makefs/include/msdosfs/bpb.h
+@@ -0,0 +1 @@
++#include 
+diff --git a/usr.sbin/makefs/include/sys/disklabel.h b/usr.sbin/makefs/include/sys/disklabel.h
+new file mode 100644
+index 00000000000..f382f87226c
+--- /dev/null
++++ b/usr.sbin/makefs/include/sys/disklabel.h
+@@ -0,0 +1 @@
++#include 
+diff --git a/usr.sbin/makefs/include/sys/endian.h b/usr.sbin/makefs/include/sys/endian.h
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/usr.sbin/makefs/include/sys/uuid.h b/usr.sbin/makefs/include/sys/uuid.h
+new file mode 100644
+index 00000000000..7c2abace377
+--- /dev/null
++++ b/usr.sbin/makefs/include/sys/uuid.h
+@@ -0,0 +1,2 @@
++#include "compat.h"
++#include 
+diff --git a/usr.sbin/makefs/include/ufs/ffs/fs.h b/usr.sbin/makefs/include/ufs/ffs/fs.h
+new file mode 100644
+index 00000000000..d7905d33c2a
+--- /dev/null
++++ b/usr.sbin/makefs/include/ufs/ffs/fs.h
+@@ -0,0 +1,2 @@
++#include "compat.h"
++#include 
+diff --git a/usr.sbin/makefs/include/ufs/ufs/dinode.h b/usr.sbin/makefs/include/ufs/ufs/dinode.h
+new file mode 100644
+index 00000000000..0d29007bdd1
+--- /dev/null
++++ b/usr.sbin/makefs/include/ufs/ufs/dinode.h
+@@ -0,0 +1,2 @@
++#include "compat.h"
++#include 
+diff --git a/usr.sbin/makefs/include/ufs/ufs/dir.h b/usr.sbin/makefs/include/ufs/ufs/dir.h
+new file mode 100644
+index 00000000000..9ec3e81be3d
+--- /dev/null
++++ b/usr.sbin/makefs/include/ufs/ufs/dir.h
+@@ -0,0 +1 @@
++#include 
+diff --git a/usr.sbin/makefs/include/util.h b/usr.sbin/makefs/include/util.h
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
+index af39605d996..10d86fa10e2 100644
+--- a/usr.sbin/makefs/makefs.c
++++ b/usr.sbin/makefs/makefs.c
+@@ -44,8 +44,10 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "makefs.h"
++#include "compat.h"
+ 
+ /*
+  * list of supported file systems and dispatch functions
+diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h
+index 303ec7a2c46..6d72859532e 100644
+--- a/usr.sbin/makefs/makefs.h
++++ b/usr.sbin/makefs/makefs.h
+@@ -41,6 +41,8 @@
+ 
+ #include 
+ #include 
++#include 
++#include 
+ 
+ /*
+  * fsnode -
+diff --git a/usr.sbin/makefs/msdos/denode.h b/usr.sbin/makefs/msdos/denode.h
+index 48cdf968945..baf3dc3d807 100644
+--- a/usr.sbin/makefs/msdos/denode.h
++++ b/usr.sbin/makefs/msdos/denode.h
+@@ -50,6 +50,8 @@
+ #ifndef _MSDOSFS_DENODE_H_
+ #define _MSDOSFS_DENODE_H_
+ 
++#include "compat.h"
++
+ struct genfs_node {
+ };
+ struct mkfsvnode;
+diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h
+index 77f8d7dd657..9c3a19bae8c 100644
+--- a/usr.sbin/makefs/msdos/direntry.h
++++ b/usr.sbin/makefs/msdos/direntry.h
+@@ -48,6 +48,8 @@
+  * October 1992
+  */
+ 
++#include "compat.h"
++
+ /*
+  * Structure of a dos directory entry.
+  */
+diff --git a/usr.sbin/makefs/msdos/mkfs_msdos.c b/usr.sbin/makefs/msdos/mkfs_msdos.c
+index c9aa0877b7a..e72f1680585 100644
+--- a/usr.sbin/makefs/msdos/mkfs_msdos.c
++++ b/usr.sbin/makefs/msdos/mkfs_msdos.c
+@@ -596,7 +596,6 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op)
+     tm = localtime(&now);
+     img = emalloc(bpb.bps);
+     dir = bpb.res + (bpb.spf ? bpb.spf : bpb.bspf) * bpb.nft;
+-    signal(SIGINFO, infohandler);
+     for (lsn = 0; lsn < dir + (o.fat_type == 32 ? bpb.spc : rds); lsn++) {
+         if (got_siginfo) {
+             fprintf(stderr,"%s: writing sector %u of %u (%u%%)\n",
+diff --git a/usr.sbin/makefs/msdos/msdosfs_conv.c b/usr.sbin/makefs/msdos/msdosfs_conv.c
+index 7b73c19bd6e..d38f035a87c 100644
+--- a/usr.sbin/makefs/msdos/msdosfs_conv.c
++++ b/usr.sbin/makefs/msdos/msdosfs_conv.c
+@@ -52,8 +52,8 @@
+  * System include files.
+  */
+ #include 
+-#include 
+-#include 
++#include   // howmany
++#include "compat.h"
+ 
+ /*
+  * MSDOSFS include files.
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix
new file mode 100644
index 000000000000..dbbff2975a88
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix
@@ -0,0 +1,17 @@
+{ mkDerivation, lib }:
+mkDerivation {
+  path = "usr.sbin/makefs";
+  extraPaths = [
+    "sys/sys"
+    "sys/ufs"
+    "sys/msdosfs"
+    "sys/dev"
+  ];
+  patches = [ ./compat.patch ];
+  preBuild = ''
+    mkdir -p $BSDSRCDIR/usr.sbin/makefs/include
+    ln -s $BSDSRCDIR $BSDSRCDIR/usr.sbin/makefs/include/bsdroot
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$BSDSRCDIR/usr.sbin/makefs/include"
+  '';
+  meta.platforms = lib.platforms.all;
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix b/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix
new file mode 100644
index 000000000000..4ded2fb4c3fe
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix
@@ -0,0 +1,32 @@
+{
+  mkDerivation,
+  stdenv,
+  pkgsBuildTarget,
+}:
+
+mkDerivation {
+  path = "sys/arch/amd64/stand";
+  extraPaths = [ "sys" ];
+
+  # gcc compat
+  postPatch = ''
+    find $BSDSRCDIR -name Makefile -print0 | xargs -0 sed -E -i -e 's/-nopie/-no-pie/g'
+    substituteInPlace $BSDSRCDIR/sys/arch/*/stand/boot/check-boot.pl --replace-fail /usr/bin/objdump objdump
+    substituteInPlace $BSDSRCDIR/sys/arch/*/stand/Makefile --replace-quiet " boot " " " --replace-quiet " fdboot " " "
+  '';
+
+  # expects to be able to use unprefixed programs
+  # needs gnu assembler + objdump + objcopy
+  # this is really not designed for cross...
+  preBuild = ''
+    mkdir $TMP/bin
+    export PATH=$TMP/bin:$PATH
+    ln -s ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}size $TMP/bin/size
+    ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}as $TMP/bin/as
+    ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump
+    ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objcopy $TMP/bin/objcopy
+    ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objcopy $TMP/bin/
+
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-pointer-sign"
+  '';
+}
diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix
deleted file mode 100644
index f6b0e2b79c3d..000000000000
--- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  stdenvNoCC,
-  darwin-stubs,
-}:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "CoreSymbolication";
-  inherit (darwin-stubs) version;
-
-  src = fetchFromGitHub {
-    repo = "CoreSymbolication";
-    owner = "matthewbauer";
-    rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4";
-    hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE=";
-  };
-
-  patches = [
-    # Add missing symbol definitions needed to build `zlog` in system_cmds.
-    # https://github.com/matthewbauer/CoreSymbolication/pull/2
-    (fetchpatch {
-      url = "https://github.com/matthewbauer/CoreSymbolication/commit/ae7ac6a7043dbae8e63d6ce5e63dfaf02b5977fe.patch";
-      hash = "sha256-IuXGMsaR1LIGs+BpDU1b4YlznKm9VhK5DQ+Dthtb1mI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/matthewbauer/CoreSymbolication/commit/6531da946949a94643e6d8424236174ae64fe0ca.patch";
-      hash = "sha256-+nDX04yY92yVT9KxiAFY2LxKcS7P8JpU539K+YVRqV4=";
-    })
-  ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/Headers
-
-    ln -s A $out/Library/Frameworks/CoreSymbolication.framework/Versions/Current
-    ln -s Versions/Current/Headers $out/Library/Frameworks/CoreSymbolication.framework/Headers
-    ln -s Versions/Current/CoreSymbolication.tbd $out/Library/Frameworks/CoreSymbolication.framework/CoreSymbolication.tbd
-
-    cp *.h $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/Headers
-    cp ${darwin-stubs}/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication.tbd \
-      $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication.tbd
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Reverse engineered headers for Apple's CoreSymbolication framework";
-    homepage = "https://github.com/matthewbauer/CoreSymbolication";
-    license = licenses.mit;
-    platforms = platforms.darwin;
-    maintainers = with maintainers; [ matthewbauer ];
-  };
-})
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
deleted file mode 100644
index fdc3bd45e55e..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
+++ /dev/null
@@ -1,268 +0,0 @@
-{ lib, stdenvNoCC, buildPackages, fetchurl, xar, cpio, pkgs, python3, pbzx, MacOSX-SDK }:
-
-# TODO: reorganize to make this just frameworks, and move libs to default.nix
-
-let
-  stdenv = stdenvNoCC;
-
-  standardFrameworkPath = name: private:
-    "/System/Library/${lib.optionalString private "Private"}Frameworks/${name}.framework";
-
-  mkDepsRewrites = deps:
-  let
-    mergeRewrites = x: y: {
-      prefix = lib.mergeAttrs (x.prefix or {}) (y.prefix or {});
-      const = lib.mergeAttrs (x.const or {}) (y.const or {});
-    };
-
-    rewriteArgs = { prefix ? {}, const ? {} }: lib.concatLists (
-      (lib.mapAttrsToList (from: to: [ "-p" "${from}:${to}" ]) prefix) ++
-      (lib.mapAttrsToList (from: to: [ "-c" "${from}:${to}" ]) const)
-    );
-
-    rewrites = depList: lib.fold mergeRewrites {}
-      (map (dep: dep.tbdRewrites)
-        (lib.filter (dep: dep ? tbdRewrites) depList));
-  in
-    lib.escapeShellArgs (rewriteArgs (rewrites (builtins.attrValues deps)));
-
-  mkFramework = { name, deps, private ? false }:
-    let self = stdenv.mkDerivation {
-      pname = "apple-${lib.optionalString private "private-"}framework-${name}";
-      version = MacOSX-SDK.version;
-
-      dontUnpack = true;
-
-      # because we copy files from the system
-      preferLocalBuild = true;
-
-      disallowedRequisites = [ MacOSX-SDK ];
-
-      nativeBuildInputs = [ buildPackages.darwin.rewrite-tbd ];
-
-      installPhase = ''
-        mkdir -p $out/Library/Frameworks
-
-        cp -r ${MacOSX-SDK}${standardFrameworkPath name private} $out/Library/Frameworks
-
-        if [[ -d ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule ]]; then
-          mkdir -p $out/lib/swift
-          cp -r -t $out/lib/swift \
-            ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule \
-            ${MacOSX-SDK}/usr/lib/swift/libswift${name}.tbd
-        fi
-
-        # Fix and check tbd re-export references
-        chmod u+w -R $out
-        find $out -name '*.tbd' -type f | while read tbd; do
-          echo "Fixing re-exports in $tbd"
-          rewrite-tbd \
-            -p ${standardFrameworkPath name private}/:$out/Library/Frameworks/${name}.framework/ \
-            -p /usr/lib/swift/:$out/lib/swift/ \
-            ${mkDepsRewrites deps} \
-            -r ${builtins.storeDir} \
-            "$tbd"
-        done
-      '';
-
-      propagatedBuildInputs = builtins.attrValues deps;
-
-      passthru = {
-        tbdRewrites = {
-          prefix."${standardFrameworkPath name private}/" = "${self}/Library/Frameworks/${name}.framework/";
-        };
-      };
-
-      meta = with lib; {
-        description = "Apple SDK framework ${name}";
-        maintainers = with maintainers; [ copumpkin ];
-        platforms   = platforms.darwin;
-      };
-    };
-  in self;
-
-  framework = name: deps: mkFramework { inherit name deps; private = false; };
-  privateFramework = name: deps: mkFramework { inherit name deps; private = true; };
-in rec {
-  libs = {
-    xpc = stdenv.mkDerivation {
-      name   = "apple-lib-xpc";
-      dontUnpack = true;
-
-      installPhase = ''
-        mkdir -p $out/include
-        pushd $out/include >/dev/null
-        cp -r "${MacOSX-SDK}/usr/include/xpc" $out/include/xpc
-        cp "${MacOSX-SDK}/usr/include/launch.h" $out/include/launch.h
-        popd >/dev/null
-      '';
-    };
-
-    Xplugin = stdenv.mkDerivation {
-      name   = "apple-lib-Xplugin";
-      dontUnpack = true;
-
-      propagatedBuildInputs = with frameworks; [
-        OpenGL ApplicationServices Carbon IOKit CoreGraphics CoreServices CoreText
-      ];
-
-      installPhase = ''
-        mkdir -p $out/include $out/lib
-        ln -s "${MacOSX-SDK}/include/Xplugin.h" $out/include/Xplugin.h
-        cp ${MacOSX-SDK}/usr/lib/libXplugin.1.tbd $out/lib
-        ln -s libXplugin.1.tbd $out/lib/libXplugin.tbd
-      '';
-    };
-
-    utmp = stdenv.mkDerivation {
-      name   = "apple-lib-utmp";
-      dontUnpack = true;
-
-      installPhase = ''
-        mkdir -p $out/include
-        pushd $out/include >/dev/null
-        ln -s "${MacOSX-SDK}/include/utmp.h"
-        ln -s "${MacOSX-SDK}/include/utmpx.h"
-        popd >/dev/null
-      '';
-    };
-
-    sandbox = stdenv.mkDerivation {
-      name = "apple-lib-sandbox";
-
-      dontUnpack = true;
-      dontBuild = true;
-
-      installPhase = ''
-        mkdir -p $out/include $out/lib
-        ln -s "${MacOSX-SDK}/usr/include/sandbox.h" $out/include/sandbox.h
-        cp "${MacOSX-SDK}/usr/lib/libsandbox.1.tbd" $out/lib
-        ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
-      '';
-    };
-
-    libDER = stdenv.mkDerivation {
-      name = "apple-lib-libDER";
-      dontUnpack = true;
-      installPhase = ''
-        mkdir -p $out/include
-        cp -r ${MacOSX-SDK}/usr/include/libDER $out/include
-      '';
-    };
-
-    simd = stdenv.mkDerivation {
-      name = "apple-lib-simd";
-      dontUnpack = true;
-      installPhase = ''
-        mkdir -p $out/include
-        cp -r ${MacOSX-SDK}/usr/include/simd $out/include
-      '';
-    };
-  };
-
-  frameworks = let
-    # Dependency map created by gen-frameworks.py.
-    generatedDeps = import ./frameworks.nix {
-      inherit frameworks libs;
-    };
-
-    # Additional dependencies that are not picked up by gen-frameworks.py.
-    # Some of these are simply private frameworks the generator does not see.
-    extraDeps = with libs; with frameworks; let
-      inherit (pkgs.darwin.apple_sdk_11_0) libnetwork;
-      libobjc = pkgs.darwin.apple_sdk_11_0.objc4;
-    in {
-      # Below this comment are entries migrated from before the generator was
-      # added. If, for a given framework, you are able to reverify the extra
-      # deps are really necessary on top of the generator deps, move it above
-      # this comment (and maybe document your findings).
-      AVFoundation            = { inherit ApplicationServices AVFCapture AVFCore; };
-      Accelerate              = { inherit CoreWLAN IOBluetooth; };
-      AddressBook             = { inherit AddressBookCore ContactsPersistence libobjc; };
-      AppKit                  = { inherit AudioToolbox AudioUnit UIFoundation; };
-      AudioToolbox            = { inherit AudioToolboxCore; };
-      AudioUnit               = { inherit Carbon CoreAudio; };
-      Carbon                  = { inherit IOKit QuartzCore libobjc; };
-      CoreAudio               = { inherit IOKit; };
-      CoreFoundation          = { inherit libobjc; };
-      CoreGraphics            = { inherit SystemConfiguration; };
-      CoreMIDIServer          = { inherit CoreMIDI; };
-      CoreMedia               = { inherit ApplicationServices AudioToolbox AudioUnit; };
-      CoreServices            = { inherit CoreAudio NetFS ServiceManagement; };
-      CoreWLAN                = { inherit SecurityFoundation; };
-      DiscRecording           = { inherit IOKit libobjc; };
-      Foundation              = { inherit SystemConfiguration libobjc; };
-      GameKit                 = { inherit GameCenterFoundation GameCenterUI GameCenterUICore ReplayKit; };
-      ICADevices              = { inherit Carbon libobjc; };
-      IOBluetooth             = { inherit CoreBluetooth; };
-      JavaScriptCore          = { inherit libobjc; };
-      Kernel                  = { inherit IOKit; };
-      LinkPresentation        = { inherit URLFormatting; };
-      MediaToolbox            = { inherit AudioUnit; };
-      MetricKit               = { inherit SignpostMetrics; };
-      Network                 = { inherit libnetwork; };
-      PCSC                    = { inherit CoreData; };
-      PassKit                 = { inherit PassKitCore; };
-      QTKit                   = { inherit CoreMedia CoreMediaIO MediaToolbox VideoToolbox; };
-      Quartz                  = { inherit QTKit; };
-      QuartzCore              = { inherit ApplicationServices CoreImage CoreVideo Metal OpenCL libobjc; };
-      Security                = { inherit IOKit libDER; };
-      TWAIN                   = { inherit Carbon; };
-      VideoDecodeAcceleration = { inherit CoreVideo; };
-      WebKit                  = { inherit ApplicationServices Carbon libobjc; };
-    };
-
-    # Overrides for framework derivations.
-    overrides = super: {
-      CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: {
-        setupHook = ./cf-setup-hook.sh;
-      });
-
-      # This framework doesn't exist in newer SDKs (somewhere around 10.13), but
-      # there are references to it in nixpkgs.
-      QuickTime = throw "QuickTime framework not available";
-
-      # Seems to be appropriate given https://developer.apple.com/forums/thread/666686
-      JavaVM = super.JavaNativeFoundation;
-
-      CoreVideo = lib.overrideDerivation super.CoreVideo (drv: {
-        installPhase = drv.installPhase + ''
-          # When used as a module, complains about a missing import for
-          # Darwin.C.stdint. Apparently fixed in later SDKs.
-          sed -e "/CFBase.h/ i #include " \
-            -i $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h
-        '';
-      });
-
-      System = lib.overrideDerivation super.System (drv: {
-        installPhase = drv.installPhase + ''
-          # Contrarily to the other frameworks, System framework's TBD file
-          # is a symlink pointing to ${MacOSX-SDK}/usr/lib/libSystem.B.tbd.
-          # This produces an error when installing the framework as:
-          #   1. The original file is not copied into the output directory
-          #   2. Even if it was copied, the relative path wouldn't match
-          # Thus, it is easier to replace the file than to fix the symlink.
-          cp --remove-destination ${MacOSX-SDK}/usr/lib/libSystem.B.tbd \
-            $out/Library/Frameworks/System.framework/Versions/B/System.tbd
-        '';
-      });
-    };
-
-    # Merge extraDeps into generatedDeps.
-    deps = generatedDeps // (
-      lib.mapAttrs
-        (name: deps: generatedDeps.${name} // deps)
-        extraDeps
-    );
-
-    # Create derivations, and add private frameworks.
-    bareFrameworks = (lib.mapAttrs framework deps) // (
-      lib.mapAttrs privateFramework (import ./private-frameworks.nix {
-        inherit frameworks;
-        libobjc = pkgs.darwin.apple_sdk_11_0.objc4;
-      })
-    );
-  in
-    # Apply derivation overrides.
-    bareFrameworks // overrides bareFrameworks;
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh
deleted file mode 100644
index b64eb95f2ded..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-forceLinkCoreFoundationFramework() {
-  NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks${NIX_CFLAGS_COMPILE:+ }${NIX_CFLAGS_COMPILE-}"
-  NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation.tbd"
-}
-
-preConfigureHooks+=(forceLinkCoreFoundationFramework)
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
index c64f011c0534..c3547aae44ed 100644
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
@@ -1,160 +1,305 @@
-{ stdenvNoCC, fetchurl, newScope, lib, pkgs
-, stdenv, overrideCC
-, xar, cpio, python3, pbzx }:
+# Compatibility stubs for packages that used the old SDK frameworks.
+# TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs.
+{
+  lib,
+  callPackage,
+  newScope,
+  overrideSDK,
+  pkgs,
+  stdenv,
+  stdenvNoCC,
+}:
 
 let
-  mkSusDerivation = args: stdenvNoCC.mkDerivation (args // {
-    dontBuild = true;
-    darwinDontCodeSign = true;
+  mkStub = callPackage ../apple-sdk/mk-stub.nix { } "11.0";
 
-    nativeBuildInputs = [ cpio pbzx ];
+  stdenvs =
+    {
+      stdenv = overrideSDK stdenv "11.0";
+    }
+    // builtins.listToAttrs (
+      map
+        (v: {
+          name = "llvmPackages_${v}";
+          value = pkgs."llvmPackages_${v}" // {
+            stdenv = overrideSDK pkgs."llvmPackages_${v}".stdenv "11.0";
+          };
+        })
+        [
+          "12"
+          "13"
+          "14"
+          "15"
+          "16"
+        ]
+    );
+in
+stdenvs
+// lib.genAttrs [
+  "CLTools_Executables"
+  "IOKit"
+  "Libsystem"
+  "LibsystemCross"
+  "MacOSX-SDK"
+  "configd"
+  "darwin-stubs"
+  "libcharset"
+  "libcompression"
+  "libnetwork"
+  "libpm"
+  "libunwind"
+  "objc4"
+  "sdkRoot"
+] mkStub
+// {
+  frameworks = lib.genAttrs [
+    "AGL"
+    "AVFCapture"
+    "AVFCore"
+    "AVFoundation"
+    "AVKit"
+    "Accelerate"
+    "Accessibility"
+    "Accounts"
+    "AdServices"
+    "AdSupport"
+    "AddressBook"
+    "AddressBookCore"
+    "AppKit"
+    "AppTrackingTransparency"
+    "Apple80211"
+    "AppleScriptKit"
+    "AppleScriptObjC"
+    "ApplicationServices"
+    "AudioToolbox"
+    "AudioToolboxCore"
+    "AudioUnit"
+    "AudioVideoBridging"
+    "AuthenticationServices"
+    "AutomaticAssessmentConfiguration"
+    "Automator"
+    "BackgroundTasks"
+    "BusinessChat"
+    "CFNetwork"
+    "CalendarStore"
+    "CallKit"
+    "Carbon"
+    "ClassKit"
+    "CloudKit"
+    "Cocoa"
+    "Collaboration"
+    "ColorSync"
+    "Combine"
+    "Contacts"
+    "ContactsPersistence"
+    "ContactsUI"
+    "CoreAudio"
+    "CoreAudioKit"
+    "CoreAudioTypes"
+    "CoreBluetooth"
+    "CoreData"
+    "CoreDisplay"
+    "CoreFoundation"
+    "CoreGraphics"
+    "CoreHaptics"
+    "CoreImage"
+    "CoreLocation"
+    "CoreMIDI"
+    "CoreMIDIServer"
+    "CoreML"
+    "CoreMedia"
+    "CoreMediaIO"
+    "CoreMotion"
+    "CoreServices"
+    "CoreSpotlight"
+    "CoreSymbolication"
+    "CoreTelephony"
+    "CoreText"
+    "CoreVideo"
+    "CoreWLAN"
+    "CryptoKit"
+    "CryptoTokenKit"
+    "DVDPlayback"
+    "DebugSymbols"
+    "DeveloperToolsSupport"
+    "DeviceCheck"
+    "DirectoryService"
+    "DiscRecording"
+    "DiscRecordingUI"
+    "DiskArbitration"
+    "DisplayServices"
+    "DriverKit"
+    "EventKit"
+    "ExceptionHandling"
+    "ExecutionPolicy"
+    "ExternalAccessory"
+    "FWAUserLib"
+    "FileProvider"
+    "FileProviderUI"
+    "FinderSync"
+    "ForceFeedback"
+    "Foundation"
+    "GLKit"
+    "GLUT"
+    "GSS"
+    "GameCenterFoundation"
+    "GameCenterUI"
+    "GameCenterUICore"
+    "GameController"
+    "GameKit"
+    "GameplayKit"
+    "HIDDriverKit"
+    "Hypervisor"
+    "ICADevices"
+    "IMServicePlugIn"
+    "IOBluetooth"
+    "IOBluetoothUI"
+    "IOKit"
+    "IOSurface"
+    "IOUSBHost"
+    "IdentityLookup"
+    "ImageCaptureCore"
+    "ImageIO"
+    "InputMethodKit"
+    "InstallerPlugins"
+    "InstantMessage"
+    "Intents"
+    "JavaNativeFoundation"
+    "JavaRuntimeSupport"
+    "JavaScriptCore"
+    "JavaVM"
+    "Kerberos"
+    "Kernel"
+    "KernelManagement"
+    "LDAP"
+    "LatentSemanticMapping"
+    "LinkPresentation"
+    "LocalAuthentication"
+    "MLCompute"
+    "MapKit"
+    "MediaAccessibility"
+    "MediaLibrary"
+    "MediaPlayer"
+    "MediaRemote"
+    "MediaToolbox"
+    "Message"
+    "Metal"
+    "MetalKit"
+    "MetalPerformanceShaders"
+    "MetalPerformanceShadersGraph"
+    "MetricKit"
+    "ModelIO"
+    "MultipeerConnectivity"
+    "MultitouchSupport"
+    "NaturalLanguage"
+    "NearbyInteraction"
+    "NetFS"
+    "Network"
+    "NetworkExtension"
+    "NetworkingDriverKit"
+    "NotificationCenter"
+    "OSAKit"
+    "OSLog"
+    "OpenAL"
+    "OpenCL"
+    "OpenDirectory"
+    "OpenGL"
+    "PCIDriverKit"
+    "PCSC"
+    "PDFKit"
+    "ParavirtualizedGraphics"
+    "PassKit"
+    "PassKitCore"
+    "PencilKit"
+    "Photos"
+    "PhotosUI"
+    "PreferencePanes"
+    "PushKit"
+    "Python"
+    "QTKit"
+    "Quartz"
+    "QuartzCore"
+    "QuickLook"
+    "QuickLookThumbnailing"
+    "QuickTime"
+    "RealityKit"
+    "ReplayKit"
+    "Ruby"
+    "SafariServices"
+    "SceneKit"
+    "ScreenSaver"
+    "ScreenTime"
+    "ScriptingBridge"
+    "Security"
+    "SecurityFoundation"
+    "SecurityInterface"
+    "SensorKit"
+    "ServiceManagement"
+    "SignpostMetrics"
+    "SkyLight"
+    "Social"
+    "SoundAnalysis"
+    "Speech"
+    "SpriteKit"
+    "StoreKit"
+    "SwiftUI"
+    "SyncServices"
+    "System"
+    "SystemConfiguration"
+    "SystemExtensions"
+    "TWAIN"
+    "Tcl"
+    "Tk"
+    "UIFoundation"
+    "URLFormatting"
+    "USBDriverKit"
+    "UniformTypeIdentifiers"
+    "UserNotifications"
+    "UserNotificationsUI"
+    "VideoDecodeAcceleration"
+    "VideoSubscriberAccount"
+    "VideoToolbox"
+    "Virtualization"
+    "Vision"
+    "WebKit"
+    "WidgetKit"
+    "iTunesLibrary"
+    "vmnet"
+  ] mkStub;
 
-    outputs = [ "out" ];
+  libs = lib.genAttrs [
+    "Xplugin"
+    "utmp"
+    "libDER"
+    "xpc"
+    "sandbox"
+    "simd"
+  ] mkStub;
 
-    unpackPhase = ''
-      pbzx $src | cpio -idm
-    '';
-
-    passthru = {
-      inherit (args) version;
-    };
-  });
-
-  MacOSX-SDK = mkSusDerivation {
-    pname = "MacOSX-SDK";
-    version = "11.0.0";
-
-    # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
-    src = fetchurl {
-      url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg";
-      sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf";
-    };
-
-    installPhase = ''
-      mv Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk $out
-    '';
-  };
-
-  CLTools_Executables = mkSusDerivation {
-    pname = "CLTools_Executables";
-    version = "11.0.0";
-
-    # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
-    src = fetchurl {
-      url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_Executables.pkg";
-      sha256 = "0nvb1qx7l81l2wcl8wvgbpsg5rcn51ylhivqmlfr2hrrv3zrrpl0";
-    };
-
-    installPhase = ''
-      mv Library/Developer/CommandLineTools $out
-    '';
-  };
-
-  mkCc = cc:
-    if lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11" then cc
-    else
-      cc.override {
-        bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; };
-        libc = packages.Libsystem;
-      };
-
-  mkStdenv = stdenv:
-    if lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11" then stdenv
-    else
-      let
-        darwinMinVersion = "10.12";
-        darwinSdkVersion = "11.0";
-      in
-      (overrideCC stdenv (mkCc stdenv.cc)).override {
-        extraBuildInputs = [ pkgs.darwin.apple_sdk_11_0.frameworks.CoreFoundation ];
-        buildPlatform = stdenv.buildPlatform // { inherit darwinMinVersion darwinSdkVersion; };
-        hostPlatform = stdenv.hostPlatform // { inherit darwinMinVersion darwinSdkVersion; };
-        targetPlatform = stdenv.targetPlatform // { inherit darwinMinVersion darwinSdkVersion; };
-      };
-
-  stdenvs = {
-    stdenv = mkStdenv stdenv;
-  } // builtins.listToAttrs (map
-    (v: {
-      name = "llvmPackages_${v}";
-      value = pkgs."llvmPackages_${v}" // {
-        stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv;
-        clang = mkCc pkgs."llvmPackages_${v}".clang;
-      };
-    })
-    [ "12" "13" "14" "15" "16" ]
+  callPackage = newScope (
+    lib.optionalAttrs stdenv.hostPlatform.isDarwin (
+      stdenvs // { inherit (pkgs.darwin.apple_sdk_11_0) rustPlatform; }
+    )
   );
 
-  callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; });
-
-  packages = stdenvs // {
-    inherit (callPackage ./apple_sdk.nix { }) frameworks libs;
-
-    # TODO: this is nice to be private. is it worth the callPackage above?
-    # Probably, I don't think that callPackage costs much at all.
-    inherit MacOSX-SDK CLTools_Executables;
-
-    Libsystem = callPackage ./libSystem.nix { };
-    LibsystemCross = pkgs.darwin.Libsystem;
-    libcharset = callPackage ./libcharset.nix { };
-    libcompression = callPackage ./libcompression.nix { };
-    libunwind = callPackage ./libunwind.nix { };
-    libnetwork = callPackage ./libnetwork.nix { };
-    libpm = callPackage ./libpm.nix { };
-    # Avoid introducing a new objc4 if stdenv already has one, to prevent
-    # conflicting LLVM modules.
-    objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { });
-
-    sdkRoot = pkgs.callPackage ../apple-sdk/sdkRoot.nix { sdkVersion = "11.0"; };
-
-    # questionable aliases
-    configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration;
-    inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
-
-    xcodebuild = pkgs.xcbuild.override {
-      inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
-      inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO;
-    };
-
-    rustPlatform = pkgs.makeRustPlatform {
+  rustPlatform =
+    pkgs.makeRustPlatform {
       inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
       inherit (pkgs) rustc cargo;
-    } // {
-      inherit (pkgs.callPackage ../../../build-support/rust/hooks {
-        inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
-        inherit (pkgs) cargo rustc;
-        clang = mkCc pkgs.clang;
-      }) bindgenHook;
+    }
+    // {
+      inherit
+        (pkgs.callPackage ../../../build-support/rust/hooks {
+          inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
+          inherit (pkgs) cargo rustc;
+        })
+        bindgenHook
+        ;
     };
 
-    callPackage = newScope (lib.optionalAttrs stdenv.hostPlatform.isDarwin (stdenvs // rec {
-      inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform;
-      darwin = pkgs.darwin.overrideScope (_: prev: {
-        inherit (prev.darwin.apple_sdk_11_0)
-          IOKit
-          Libsystem
-          LibsystemCross
-          Security
-          configd
-          libcharset
-          libunwind
-          objc4
-          ;
-        apple_sdk = prev.darwin.apple_sdk_11_0;
-        CF = prev.darwin.apple_sdk_11_0.CoreFoundation;
-      });
-      xcbuild = xcodebuild;
-    }));
+  stdenv = overrideSDK stdenv "11.0";
 
-    darwin-stubs = stdenvNoCC.mkDerivation {
-      pname = "darwin-stubs";
-      inherit (MacOSX-SDK) version;
+  xcodebuild = pkgs.xcodebuild;
 
-      buildCommand = ''
-        mkdir -p "$out"
-        ln -s ${MacOSX-SDK}/System "$out/System"
-        ln -s ${MacOSX-SDK}/usr "$out/usr"
-      '';
-    };
-  };
-in packages
+  version = "11.0";
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix
deleted file mode 100644
index fa6945f76718..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix
+++ /dev/null
@@ -1,196 +0,0 @@
-# This file is generated by gen-frameworks.nix.
-# Do not edit, put overrides in apple_sdk.nix instead.
-{ libs, frameworks }: with libs; with frameworks;
-{
-  AGL                              = { inherit Carbon OpenGL; };
-  AVFoundation                     = { inherit AudioToolbox CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreVideo Foundation IOKit ImageIO MediaToolbox Metal QuartzCore UniformTypeIdentifiers simd; };
-  AVKit                            = { inherit AVFoundation AppKit Cocoa Foundation; };
-  Accelerate                       = { inherit CoreFoundation CoreGraphics CoreVideo Foundation IOKit Metal; };
-  Accessibility                    = { inherit CoreGraphics Foundation; };
-  Accounts                         = { inherit Foundation; };
-  AdServices                       = { inherit Foundation; };
-  AdSupport                        = { inherit Foundation; };
-  AddressBook                      = { inherit Carbon Cocoa CoreFoundation Foundation; };
-  AppKit                           = { inherit ApplicationServices CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal OpenGL QuartzCore; };
-  AppTrackingTransparency          = { inherit Foundation; };
-  AppleScriptKit                   = {};
-  AppleScriptObjC                  = { inherit Foundation; };
-  ApplicationServices              = { inherit ColorSync CoreFoundation CoreGraphics CoreServices CoreText ImageIO; };
-  AudioToolbox                     = { inherit Carbon CoreAudio CoreAudioTypes CoreFoundation CoreMIDI Foundation; };
-  AudioUnit                        = { inherit AudioToolbox; };
-  AudioVideoBridging               = { inherit Foundation IOKit; };
-  AuthenticationServices           = { inherit AppKit Foundation; };
-  AutomaticAssessmentConfiguration = { inherit Foundation; };
-  Automator                        = { inherit AppKit Cocoa Foundation OSAKit; };
-  BackgroundTasks                  = { inherit Foundation; };
-  BusinessChat                     = { inherit Cocoa Foundation; };
-  CFNetwork                        = { inherit CoreFoundation; };
-  CalendarStore                    = {};
-  CallKit                          = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  Carbon                           = { inherit ApplicationServices CoreServices Foundation Security; };
-  ClassKit                         = { inherit CoreGraphics Foundation; };
-  CloudKit                         = { inherit CoreFoundation CoreGraphics CoreLocation Foundation IOKit; };
-  Cocoa                            = { inherit AppKit CoreData Foundation; };
-  Collaboration                    = { inherit AppKit CoreServices Foundation; };
-  ColorSync                        = { inherit CoreFoundation; };
-  Combine                          = {};
-  Contacts                         = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  ContactsUI                       = { inherit AppKit; };
-  CoreAudio                        = { inherit CoreAudioTypes CoreFoundation; };
-  CoreAudioKit                     = { inherit AppKit AudioUnit Cocoa Foundation; };
-  CoreAudioTypes                   = { inherit CoreFoundation; };
-  CoreBluetooth                    = { inherit Foundation; };
-  CoreData                         = { inherit CloudKit Combine CoreFoundation CoreGraphics CoreLocation Foundation IOKit; };
-  CoreDisplay                      = {};
-  CoreFoundation                   = {};
-  CoreGraphics                     = { inherit CoreFoundation IOKit; };
-  CoreHaptics                      = { inherit Foundation; };
-  CoreImage                        = { inherit ApplicationServices CoreFoundation CoreGraphics CoreVideo Foundation IOKit IOSurface ImageIO Metal OpenGL; };
-  CoreLocation                     = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  CoreMIDI                         = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  CoreMIDIServer                   = {};
-  CoreML                           = { inherit CoreFoundation CoreGraphics CoreVideo Foundation IOKit ImageIO Metal; };
-  CoreMedia                        = { inherit CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreVideo Foundation IOKit Metal; };
-  CoreMediaIO                      = { inherit CoreFoundation CoreMedia; };
-  CoreMotion                       = { inherit Foundation; };
-  CoreServices                     = { inherit CFNetwork CoreFoundation DiskArbitration Security; };
-  CoreSpotlight                    = { inherit Foundation UniformTypeIdentifiers; };
-  CoreTelephony                    = {};
-  CoreText                         = { inherit CoreFoundation CoreGraphics; };
-  CoreVideo                        = { inherit ApplicationServices CoreFoundation CoreGraphics IOSurface Metal OpenGL; };
-  CoreWLAN                         = { inherit Foundation IOKit; };
-  CryptoKit                        = { inherit CoreFoundation CoreGraphics Foundation IOKit LocalAuthentication Security; };
-  CryptoTokenKit                   = { inherit CoreFoundation CoreGraphics Foundation IOKit Security; };
-  DVDPlayback                      = { inherit ApplicationServices CoreFoundation Security; };
-  DeveloperToolsSupport            = { inherit Foundation; };
-  DeviceCheck                      = { inherit Foundation; };
-  DirectoryService                 = { inherit CoreFoundation; };
-  DiscRecording                    = { inherit CoreServices Foundation; };
-  DiscRecordingUI                  = { inherit Carbon Cocoa DiscRecording; };
-  DiskArbitration                  = { inherit CoreFoundation IOKit; };
-  DriverKit                        = {};
-  EventKit                         = { inherit CoreGraphics CoreLocation Foundation; };
-  ExceptionHandling                = { inherit Foundation; };
-  ExecutionPolicy                  = { inherit Foundation; };
-  ExternalAccessory                = { inherit Foundation; };
-  FWAUserLib                       = { inherit IOKit; };
-  FileProvider                     = { inherit CoreGraphics Foundation; };
-  FileProviderUI                   = { inherit AppKit FileProvider Foundation; };
-  FinderSync                       = { inherit AppKit Foundation; };
-  ForceFeedback                    = { inherit CoreFoundation IOKit; };
-  Foundation                       = { inherit ApplicationServices Combine CoreFoundation CoreGraphics CoreServices IOKit Security; };
-  GLKit                            = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal ModelIO OpenGL QuartzCore simd; };
-  GLUT                             = { inherit OpenGL; };
-  GSS                              = { inherit CoreFoundation; };
-  GameController                   = { inherit AppKit Foundation IOKit; };
-  GameKit                          = { inherit AppKit Cocoa Contacts CoreGraphics Foundation GameController GameplayKit Metal MetalKit ModelIO SceneKit SpriteKit simd; };
-  GameplayKit                      = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation GLKit IOKit Metal ModelIO QuartzCore SceneKit SpriteKit simd; };
-  HIDDriverKit                     = { inherit IOKit USBDriverKit; };
-  Hypervisor                       = {};
-  ICADevices                       = { inherit CoreFoundation CoreGraphics CoreServices IOBluetooth; };
-  IMServicePlugIn                  = { inherit Foundation; };
-  IOBluetooth                      = { inherit CoreAudio CoreFoundation CoreServices Foundation IOKit; };
-  IOBluetoothUI                    = { inherit Cocoa IOBluetooth; };
-  IOKit                            = { inherit CoreFoundation; };
-  IOSurface                        = { inherit CoreFoundation Foundation IOKit; };
-  IOUSBHost                        = { inherit Foundation IOKit; };
-  IdentityLookup                   = { inherit Foundation; };
-  ImageCaptureCore                 = { inherit Cocoa CoreGraphics Foundation; };
-  ImageIO                          = { inherit CoreFoundation CoreGraphics; };
-  InputMethodKit                   = { inherit Carbon Cocoa Foundation; };
-  InstallerPlugins                 = {};
-  InstantMessage                   = {};
-  Intents                          = { inherit CoreFoundation CoreGraphics CoreLocation Foundation IOKit; };
-  JavaNativeFoundation             = { inherit Foundation; };
-  JavaRuntimeSupport               = { inherit ApplicationServices Cocoa Foundation QuartzCore; };
-  JavaScriptCore                   = { inherit CoreFoundation CoreGraphics Foundation; };
-  Kerberos                         = {};
-  Kernel                           = {};
-  KernelManagement                 = { inherit Foundation; };
-  LDAP                             = {};
-  LatentSemanticMapping            = { inherit Carbon CoreFoundation; };
-  LinkPresentation                 = { inherit AppKit Foundation; };
-  LocalAuthentication              = { inherit Foundation; };
-  MLCompute                        = { inherit CoreFoundation CoreGraphics Foundation IOKit Metal; };
-  MapKit                           = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal QuartzCore; };
-  MediaAccessibility               = { inherit CoreFoundation CoreGraphics CoreText QuartzCore; };
-  MediaLibrary                     = { inherit Foundation; };
-  MediaPlayer                      = { inherit AVFoundation CoreGraphics Foundation; };
-  MediaToolbox                     = { inherit AudioToolbox CoreFoundation CoreMedia; };
-  Message                          = {};
-  Metal                            = { inherit CoreFoundation CoreGraphics Foundation IOKit IOSurface; };
-  MetalKit                         = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal ModelIO QuartzCore simd; };
-  MetalPerformanceShaders          = { inherit CoreGraphics Foundation Metal simd; };
-  MetalPerformanceShadersGraph     = { inherit Foundation MetalPerformanceShaders; };
-  MetricKit                        = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  ModelIO                          = { inherit CoreFoundation CoreGraphics Foundation IOKit simd; };
-  MultipeerConnectivity            = { inherit Cocoa Foundation; };
-  NaturalLanguage                  = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  NearbyInteraction                = { inherit CoreFoundation CoreGraphics Foundation IOKit simd; };
-  NetFS                            = { inherit CoreFoundation; };
-  Network                          = { inherit CoreFoundation Foundation Security; };
-  NetworkExtension                 = { inherit Foundation Network Security; };
-  NetworkingDriverKit              = {};
-  NotificationCenter               = { inherit AppKit Foundation; };
-  OSAKit                           = { inherit Carbon Cocoa; };
-  OSLog                            = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  OpenAL                           = {};
-  OpenCL                           = { inherit OpenGL; };
-  OpenDirectory                    = { inherit CoreFoundation Foundation; };
-  OpenGL                           = {};
-  PCIDriverKit                     = { inherit IOKit; };
-  PCSC                             = {};
-  PDFKit                           = { inherit AppKit Cocoa; };
-  ParavirtualizedGraphics          = { inherit AppKit CoreVideo Foundation IOSurface Metal; };
-  PassKit                          = { inherit AppKit Contacts CoreGraphics Foundation; };
-  PencilKit                        = { inherit AppKit CloudKit Cocoa CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal QuartzCore; };
-  Photos                           = { inherit AVFoundation CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia Foundation IOKit ImageIO Metal QuartzCore UniformTypeIdentifiers simd; };
-  PhotosUI                         = { inherit AppKit Foundation MapKit Photos; };
-  PreferencePanes                  = { inherit Cocoa; };
-  PushKit                          = { inherit Foundation; };
-  Python                           = { inherit Carbon; };
-  QTKit                            = {};
-  Quartz                           = { inherit AppKit ApplicationServices Cocoa Foundation ImageCaptureCore OpenGL PDFKit QuartzCore QuickLook; };
-  QuartzCore                       = { inherit CoreFoundation CoreGraphics CoreImage CoreVideo Foundation IOKit Metal OpenGL; };
-  QuickLook                        = { inherit ApplicationServices CoreFoundation; };
-  QuickLookThumbnailing            = { inherit CoreGraphics Foundation UniformTypeIdentifiers; };
-  RealityKit                       = { inherit AVFoundation AppKit AudioToolbox CloudKit Combine CoreAudio CoreData CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreText Foundation IOKit Metal MultipeerConnectivity QuartzCore simd; };
-  ReplayKit                        = { inherit AVFoundation AppKit Foundation; };
-  Ruby                             = {};
-  SafariServices                   = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal QuartzCore; };
-  SceneKit                         = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation GLKit IOKit Metal ModelIO QuartzCore simd; };
-  ScreenSaver                      = { inherit AppKit Foundation; };
-  ScreenTime                       = { inherit AppKit Foundation; };
-  ScriptingBridge                  = { inherit ApplicationServices CoreServices Foundation; };
-  Security                         = { inherit CoreFoundation; };
-  SecurityFoundation               = { inherit Foundation Security; };
-  SecurityInterface                = { inherit AppKit Cocoa Security SecurityFoundation; };
-  SensorKit                        = { inherit CoreFoundation CoreLocation Foundation; };
-  ServiceManagement                = { inherit CoreFoundation Security; };
-  Social                           = { inherit AppKit Foundation; };
-  SoundAnalysis                    = { inherit AVFoundation CoreML CoreMedia Foundation; };
-  Speech                           = { inherit AVFoundation CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia Foundation IOKit Metal QuartzCore UniformTypeIdentifiers simd; };
-  SpriteKit                        = { inherit AppKit CloudKit Cocoa CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation GLKit IOKit Metal ModelIO QuartzCore simd; };
-  StoreKit                         = { inherit AppKit CoreGraphics Foundation; };
-  SwiftUI                          = { inherit AppKit CloudKit Combine CoreData CoreFoundation CoreGraphics CoreImage CoreLocation DeveloperToolsSupport Foundation IOKit Metal QuartzCore UniformTypeIdentifiers; };
-  SyncServices                     = {};
-  System                           = {};
-  SystemConfiguration              = { inherit CoreFoundation Security; };
-  SystemExtensions                 = { inherit Foundation; };
-  TWAIN                            = {};
-  Tcl                              = {};
-  Tk                               = {};
-  USBDriverKit                     = { inherit IOKit; };
-  UniformTypeIdentifiers           = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  UserNotifications                = { inherit Foundation; };
-  UserNotificationsUI              = { inherit AppKit; };
-  VideoDecodeAcceleration          = {};
-  VideoSubscriberAccount           = { inherit Foundation; };
-  VideoToolbox                     = { inherit CoreFoundation CoreGraphics CoreMedia CoreVideo; };
-  Virtualization                   = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  Vision                           = { inherit CoreAudio CoreFoundation CoreGraphics CoreML CoreMedia CoreVideo Foundation IOKit ImageIO Metal simd; };
-  WebKit                           = { inherit AppKit CloudKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit JavaScriptCore Metal OpenGL QuartzCore; };
-  WidgetKit                        = { inherit Combine CoreFoundation CoreGraphics CoreVideo Foundation IOKit Intents Metal SwiftUI; };
-  iTunesLibrary                    = { inherit Foundation; };
-  vmnet                            = {};
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix
deleted file mode 100644
index b661da75febe..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenvNoCC, buildPackages, MacOSX-SDK }:
-
-stdenvNoCC.mkDerivation {
-  pname = "libSystem";
-  version = MacOSX-SDK.version;
-
-  dontBuild = true;
-  dontUnpack = true;
-
-  nativeBuildInputs = [ buildPackages.darwin.rewrite-tbd ];
-
-  includeDirs = [
-    "CommonCrypto" "_types" "architecture" "arpa" "atm" "bank" "bsd" "bsm"
-    "corecrypto" "corpses" "default_pager" "device" "dispatch" "hfs" "i386"
-    "iokit" "kern" "libkern" "mach" "mach-o" "mach_debug" "machine" "malloc"
-    "miscfs" "net" "netinet" "netinet6" "netkey" "nfs" "os" "osfmk" "pexpert"
-    "platform" "protocols" "pthread" "rpc" "rpcsvc" "secure" "security"
-    "servers" "sys" "uuid" "vfs" "voucher" "xlocale"
-  ] ++ [
-    "arm" "xpc" "arm64"
-  ];
-
-  csu = [
-    "bundle1.o" "crt0.o" "crt1.10.5.o" "crt1.10.6.o" "crt1.o" "dylib1.10.5.o"
-    "dylib1.o" "gcrt1.o" "lazydylib1.o"
-  ];
-
-  installPhase = ''
-    mkdir -p $out/{include,lib/swift}
-
-    for dir in $includeDirs; do
-      from=${MacOSX-SDK}/usr/include/$dir
-      if [ -e "$from" ]; then
-        cp -dr $from $out/include
-      else
-        echo "Header directory '$from' doesn't exist: skipping"
-      fi
-    done
-
-    cp -d \
-      ${MacOSX-SDK}/usr/include/*.h \
-      ${MacOSX-SDK}/usr/include/*.modulemap \
-      ${MacOSX-SDK}/usr/include/*.apinotes \
-      $out/include
-
-    rm $out/include/tk*.h $out/include/tcl*.h
-
-    cp -dr \
-      ${MacOSX-SDK}/usr/lib/libSystem.* \
-      ${MacOSX-SDK}/usr/lib/system \
-      $out/lib
-
-    # Extra libraries
-    for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.1 resolv; do
-      cp -d \
-        ${MacOSX-SDK}/usr/lib/lib$name.tbd \
-        ${MacOSX-SDK}/usr/lib/lib$name.*.tbd \
-        $out/lib
-    done
-
-    for name in os Dispatch; do
-      cp -dr \
-        ${MacOSX-SDK}/usr/lib/swift/$name.swiftmodule \
-        ${MacOSX-SDK}/usr/lib/swift/libswift$name.tbd \
-        $out/lib/swift
-    done
-
-    for f in $csu; do
-      from=${MacOSX-SDK}/usr/lib/$f
-      if [ -e "$from" ]; then
-        cp -d $from $out/lib
-      else
-        echo "Csu file '$from' doesn't exist: skipping"
-      fi
-    done
-
-    chmod u+w -R $out/lib
-    find $out -name '*.tbd' -type f | while read tbd; do
-      rewrite-tbd \
-        -c /usr/lib/libsystem.dylib:$out/lib/libsystem.dylib \
-        -p /usr/lib/system/:$out/lib/system/ \
-        -p /usr/lib/swift/:$out/lib/swift/ \
-        -r ${builtins.storeDir} \
-        "$tbd"
-    done
-  '';
-}
-
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libcharset.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libcharset.nix
deleted file mode 100644
index bf55037ab605..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libcharset.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenvNoCC, buildPackages, MacOSX-SDK }:
-
-stdenvNoCC.mkDerivation {
-  pname = "libcharset";
-  version = MacOSX-SDK.version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [ buildPackages.darwin.checkReexportsHook ];
-
-  installPhase = ''
-    mkdir -p $out/{include,lib}
-    cp ${MacOSX-SDK}/usr/lib/libcharset* $out/lib
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libcompression.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libcompression.nix
deleted file mode 100644
index 92a45b7c5a50..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libcompression.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenvNoCC, buildPackages, MacOSX-SDK }:
-
-let self = stdenvNoCC.mkDerivation {
-  pname = "libcompression";
-  version = MacOSX-SDK.version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp ${MacOSX-SDK}/usr/lib/libcompression* $out/lib
-  '';
-
-  passthru = {
-    tbdRewrites = {
-      const."/usr/lib/libcompression.dylib" = "${self}/lib/libcompression.dylib";
-    };
-  };
-}; in self
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libnetwork.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libnetwork.nix
deleted file mode 100644
index 2e5c0593bf40..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libnetwork.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenvNoCC, buildPackages, MacOSX-SDK }:
-
-let self = stdenvNoCC.mkDerivation {
-  pname = "libnetwork";
-  version = MacOSX-SDK.version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp ${MacOSX-SDK}/usr/lib/libnetwork* $out/lib
-  '';
-
-  passthru = {
-    tbdRewrites = {
-      const."/usr/lib/libnetwork.dylib" = "${self}/lib/libnetwork.dylib";
-    };
-  };
-}; in self
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix
deleted file mode 100644
index 9288097ef369..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenvNoCC, MacOSX-SDK, libcharset }:
-
-let self = stdenvNoCC.mkDerivation {
-  pname = "libobjc";
-  version = MacOSX-SDK.version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/{include,lib/swift}
-    cp -r ${MacOSX-SDK}/usr/include/objc $out/include
-    cp ${MacOSX-SDK}/usr/lib/libobjc* $out/lib
-    cp -r ${MacOSX-SDK}/usr/lib/swift/ObjectiveC.swiftmodule $out/lib/swift
-    cp ${MacOSX-SDK}/usr/lib/swift/libswiftObjectiveC.tbd $out/lib/swift
-  '';
-
-  passthru = {
-    tbdRewrites = {
-      const."/usr/lib/libobjc.A.dylib" = "${self}/lib/libobjc.A.dylib";
-      const."/usr/lib/swift/libswiftObjectiveC.dylib" = "${self}/lib/swift/libswiftObjectiveC.dylib";
-    };
-  };
-}; in self
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libpm.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libpm.nix
deleted file mode 100644
index 995f2b20ce70..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libpm.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenvNoCC, MacOSX-SDK, checkReexportsHook }:
-
-stdenvNoCC.mkDerivation {
-  pname = "libpm";
-  version = MacOSX-SDK.version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [ checkReexportsHook ];
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp ${MacOSX-SDK}/usr/lib/libpm* $out/lib
-  '';
-
-  passthru = {
-    tbdRewrites = {
-      const."/usr/lib/libpmenergy.dylib" = "${placeholder "out"}/lib/libpmenergy.dylib";
-      const."/usr/lib/libpmsample.dylib" = "${placeholder "out"}/lib/libpmsample.dylib";
-    };
-  };
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libunwind.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libunwind.nix
deleted file mode 100644
index 885780eba75c..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/libunwind.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenvNoCC, buildPackages, MacOSX-SDK }:
-
-stdenvNoCC.mkDerivation {
-  pname = "libunwind";
-  version = MacOSX-SDK.version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [ buildPackages.darwin.checkReexportsHook ];
-
-  installPhase = ''
-    mkdir -p $out/include/mach-o
-
-    cp \
-      ${MacOSX-SDK}/usr/include/libunwind.h \
-      ${MacOSX-SDK}/usr/include/unwind.h \
-      $out/include
-
-    cp \
-      ${MacOSX-SDK}/usr/include/mach-o/compact_unwind_encoding.h \
-      $out/include/mach-o
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix
deleted file mode 100644
index 4566c8af84f5..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ frameworks, libobjc }: with frameworks;
-# generated by hand to avoid exposing all private frameworks
-# frameworks here are only the necessary ones used by public frameworks.
-{
-  Apple80211 = {};
-  AVFCapture = {};
-  AVFCore = {};
-  AddressBookCore = { inherit ContactsPersistence; };
-  AudioToolboxCore = {};
-  ContactsPersistence = {};
-  GameCenterFoundation = {};
-  GameCenterUI = {};
-  GameCenterUICore = {};
-  MediaRemote = {};
-  PassKitCore = {};
-  SignpostMetrics = {};
-  SkyLight = {};
-  UIFoundation = {};
-  URLFormatting = {};
-
-  # Also expose CoreSymbolication; used by `root` package.
-  CoreSymbolication = {};
-
-  # Also expose DebugSymbols; used by `llvmPackages_8.lldb` package.
-  DebugSymbols = {};
-
-  # Also expose DisplayServices; used by `sketchybar` package.
-  DisplayServices = { inherit libobjc; };
-
-  # Also expose MultitouchSupport; used by `chuck` package.
-  MultitouchSupport = {};
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/CLTools_Executables.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/CLTools_Executables.nix
deleted file mode 100644
index f3ff413d0cae..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/CLTools_Executables.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  stdenvNoCC,
-  fetchurl,
-  cpio,
-  pbzx,
-  version,
-}:
-
-let
-  releases = builtins.fromJSON (builtins.readFile ./apple-sdk-releases.json);
-in
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "CLTools_Executables";
-  inherit version;
-
-  src = fetchurl releases.${version}.${finalAttrs.pname};
-
-  nativeBuildInputs = [
-    cpio
-    pbzx
-  ];
-
-  buildCommand = ''
-    pbzx $src | cpio -idm
-    mv Library/Developer/CommandLineTools $out
-  '';
-})
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/CLTools_macOSNMOS_SDK.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/CLTools_macOSNMOS_SDK.nix
deleted file mode 100644
index 7af2c48cc081..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/CLTools_macOSNMOS_SDK.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  cpio,
-  pbzx,
-  version,
-}:
-
-let
-  releases = builtins.fromJSON (builtins.readFile ./apple-sdk-releases.json);
-in
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "CLTools_macOSNMOS_SDK";
-  inherit version;
-
-  src = fetchurl releases.${version}.${finalAttrs.pname};
-
-  nativeBuildInputs = [
-    cpio
-    pbzx
-  ];
-
-  buildCommand = ''
-    pbzx $src | cpio -idm
-    mv Library/Developer/CommandLineTools/SDKs/MacOSX${lib.versions.majorMinor version}.sdk $out
-  '';
-})
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/apple-sdk-releases.json b/pkgs/os-specific/darwin/apple-sdk-12.3/apple-sdk-releases.json
deleted file mode 100644
index 87e01f0039ce..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/apple-sdk-releases.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "12.3": {
-    "CLTools_Executables": {
-      "hash": "sha256-XlxHwCq+rtBF3Yyfdob3UEHN7YKzb7JF84lRmZbB/50=",
-      "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_Executables.pkg"
-    },
-    "CLTools_macOSLMOS_SDK": {
-      "hash": "sha256-mY9YTlyTujV6R89WaNmkJrfOQatXnoSW8gKxnawQz5Q=",
-      "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSLMOS_SDK.pkg"
-    },
-    "CLTools_macOSNMOS_SDK": {
-      "hash": "sha256-Tr9VCeCP5udmh09U/zPQG2c4ky1LXscBwPfgpRy8uds=",
-      "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg"
-    },
-    "CLTools_macOS_SDK": {
-      "hash": "sha256-2xwYLfiYuEdck7/8NY3iqiPKvoG9HAjXt8Ewyp9c0Es=",
-      "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOS_SDK.pkg"
-    }
-  }
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix
index 85444ec95e61..468465b19277 100644
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix
@@ -1,49 +1,266 @@
+# Compatibility stubs for packages that used the old SDK frameworks.
+# TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs.
 {
   lib,
+  callPackage,
   newScope,
-  overrideCC,
+  overrideSDK,
   pkgs,
   stdenv,
   stdenvNoCC,
 }:
 
 let
-  version = "12.3";
-
-  MacOSX-SDK = callPackage ./CLTools_macOSNMOS_SDK.nix { inherit version; };
-  callPackage = newScope (pkgs.darwin // packages);
-
-  packages = {
-    # Make sure we pass our special `callPackage` instead of using packages.callPackage which
-    # does not have necessary attributes in scope.
-    frameworks = callPackage ./frameworks { inherit callPackage; };
-    libs = callPackage ./libs { inherit callPackage; };
-
-    CLTools_Executables = callPackage ./CLTools_Executables.nix { inherit version; };
-    Libsystem = callPackage ./libSystem.nix { };
-    LibsystemCross = callPackage ./libSystem.nix { };
-    libunwind = callPackage ./libunwind.nix { };
-    libnetwork = callPackage ./libnetwork.nix { };
-    libpm = callPackage ./libpm.nix { };
-    # Avoid introducing a new objc4 if stdenv already has one, to prevent
-    # conflicting LLVM modules.
-    objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { });
-
-    darwin-stubs = stdenvNoCC.mkDerivation {
-      pname = "darwin-stubs";
-      inherit (MacOSX-SDK) version;
-
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-
-      buildCommand = ''
-        mkdir -p "$out"
-        ln -s ${MacOSX-SDK}/System "$out/System"
-        ln -s ${MacOSX-SDK}/usr "$out/usr"
-      '';
-    };
-
-    sdkRoot = pkgs.callPackage ../apple-sdk/sdkRoot.nix { sdkVersion = version; };
-  };
+  mkStub = callPackage ../apple-sdk/mk-stub.nix { } "12.3";
 in
-packages
+lib.genAttrs [
+  "CLTools_Executables"
+  "Libsystem"
+  "LibsystemCross"
+  "darwin-stubs"
+  "libnetwork"
+  "libpm"
+  "libunwind"
+  "objc4"
+  "sdkRoot"
+] mkStub
+// {
+  frameworks = lib.genAttrs [
+    "AGL"
+    "AVFAudio"
+    "AVFCapture"
+    "AVFCore"
+    "AVFoundation"
+    "AVKit"
+    "Accelerate"
+    "Accessibility"
+    "Accounts"
+    "AdServices"
+    "AdSupport"
+    "AddressBook"
+    "AddressBookCore"
+    "AppKit"
+    "AppTrackingTransparency"
+    "AppleScriptKit"
+    "AppleScriptObjC"
+    "ApplicationServices"
+    "AudioToolbox"
+    "AudioToolboxCore"
+    "AudioUnit"
+    "AudioVideoBridging"
+    "AuthenticationServices"
+    "AutomaticAssessmentConfiguration"
+    "Automator"
+    "BackgroundTasks"
+    "BusinessChat"
+    "CFNetwork"
+    "CHIP"
+    "CalendarStore"
+    "CallKit"
+    "Carbon"
+    "ClassKit"
+    "CloudKit"
+    "Cocoa"
+    "Collaboration"
+    "ColorSync"
+    "Combine"
+    "Contacts"
+    "ContactsPersistence"
+    "ContactsUI"
+    "CoreAudio"
+    "CoreAudioKit"
+    "CoreAudioTypes"
+    "CoreBluetooth"
+    "CoreData"
+    "CoreDisplay"
+    "CoreFoundation"
+    "CoreGraphics"
+    "CoreHaptics"
+    "CoreImage"
+    "CoreLocation"
+    "CoreMIDI"
+    "CoreMIDIServer"
+    "CoreML"
+    "CoreMedia"
+    "CoreMediaIO"
+    "CoreMotion"
+    "CoreServices"
+    "CoreSpotlight"
+    "CoreSymbolication"
+    "CoreTelephony"
+    "CoreText"
+    "CoreVideo"
+    "CoreWLAN"
+    "CreateML"
+    "CryptoKit"
+    "CryptoTokenKit"
+    "DVDPlayback"
+    "DataDetection"
+    "DebugSymbols"
+    "DeveloperToolsSupport"
+    "DeviceActivity"
+    "DeviceCheck"
+    "DirectoryService"
+    "DiscRecording"
+    "DiscRecordingUI"
+    "DiskArbitration"
+    "DisplayServices"
+    "DriverKit"
+    "EventKit"
+    "ExceptionHandling"
+    "ExecutionPolicy"
+    "ExposureNotification"
+    "ExternalAccessory"
+    "FWAUserLib"
+    "FileProvider"
+    "FileProviderUI"
+    "FinderSync"
+    "ForceFeedback"
+    "Foundation"
+    "GLKit"
+    "GLUT"
+    "GSS"
+    "GameCenterFoundation"
+    "GameCenterUI"
+    "GameCenterUICore"
+    "GameController"
+    "GameKit"
+    "GameplayKit"
+    "GroupActivities"
+    "Hypervisor"
+    "ICADevices"
+    "IMServicePlugIn"
+    "IOBluetooth"
+    "IOBluetoothUI"
+    "IOKit"
+    "IOSurface"
+    "IOUSBHost"
+    "IdentityLookup"
+    "ImageCaptureCore"
+    "ImageIO"
+    "InputMethodKit"
+    "InstallerPlugins"
+    "InstantMessage"
+    "Intents"
+    "IntentsUI"
+    "JavaNativeFoundation"
+    "JavaRuntimeSupport"
+    "JavaScriptCore"
+    "JavaVM"
+    "Kerberos"
+    "Kernel"
+    "KernelManagement"
+    "LDAP"
+    "LatentSemanticMapping"
+    "LinkPresentation"
+    "LocalAuthentication"
+    "LocalAuthenticationEmbeddedUI"
+    "MLCompute"
+    "MailKit"
+    "ManagedSettings"
+    "MapKit"
+    "MediaAccessibility"
+    "MediaLibrary"
+    "MediaPlayer"
+    "MediaToolbox"
+    "Message"
+    "Metal"
+    "MetalKit"
+    "MetalPerformanceShaders"
+    "MetalPerformanceShadersGraph"
+    "MetricKit"
+    "ModelIO"
+    "MultipeerConnectivity"
+    "MultitouchSupport"
+    "MusicKit"
+    "NaturalLanguage"
+    "NearbyInteraction"
+    "NetFS"
+    "Network"
+    "NetworkExtension"
+    "NotificationCenter"
+    "OSAKit"
+    "OSLog"
+    "OpenAL"
+    "OpenCL"
+    "OpenDirectory"
+    "OpenGL"
+    "PCSC"
+    "PDFKit"
+    "PHASE"
+    "ParavirtualizedGraphics"
+    "PassKit"
+    "PassKitCore"
+    "PencilKit"
+    "Photos"
+    "PhotosUI"
+    "PreferencePanes"
+    "PushKit"
+    "QTKit"
+    "Quartz"
+    "QuartzCore"
+    "QuickLook"
+    "QuickLookThumbnailing"
+    "QuickLookUI"
+    "QuickTime"
+    "RealityFoundation"
+    "RealityKit"
+    "ReplayKit"
+    "Ruby"
+    "SafariServices"
+    "SceneKit"
+    "ScreenCaptureKit"
+    "ScreenSaver"
+    "ScreenTime"
+    "ScriptingBridge"
+    "Security"
+    "SecurityFoundation"
+    "SecurityInterface"
+    "SensorKit"
+    "ServiceManagement"
+    "ShazamKit"
+    "SignpostMetrics"
+    "SkyLight"
+    "Social"
+    "SoundAnalysis"
+    "Speech"
+    "SpriteKit"
+    "StoreKit"
+    "SwiftUI"
+    "SyncServices"
+    "System"
+    "SystemConfiguration"
+    "SystemExtensions"
+    "TWAIN"
+    "TabularData"
+    "Tcl"
+    "Tk"
+    "UIFoundation"
+    "URLFormatting"
+    "UniformTypeIdentifiers"
+    "UserNotifications"
+    "UserNotificationsUI"
+    "VideoDecodeAcceleration"
+    "VideoSubscriberAccount"
+    "VideoToolbox"
+    "Virtualization"
+    "Vision"
+    "WebKit"
+    "WidgetKit"
+    "iTunesLibrary"
+    "vmnet"
+  ] mkStub;
+
+  libs = lib.genAttrs [
+    "Xplugin"
+    "utmp"
+    "libDER"
+    "xpc"
+    "sandbox"
+    "simd"
+    "utmp"
+    "xpc"
+  ] mkStub;
+
+  version = "12.3";
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
deleted file mode 100644
index 8ae0cd649c93..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  buildPackages,
-  # macOS things
-  callPackage,
-  darwin-stubs,
-}:
-
-let
-  inherit (darwin-stubs) version;
-  fixup-frameworks = callPackage ./fixups.nix { };
-  private-frameworks = callPackage ./private.nix { };
-  public-frameworks = callPackage ./public.nix { };
-
-  mkDepsRewrites =
-    deps:
-    let
-      mergeRewrites = x: y: {
-        prefix = lib.mergeAttrs (x.prefix or { }) (y.prefix or { });
-        const = lib.mergeAttrs (x.const or { }) (y.const or { });
-      };
-
-      rewriteArgs =
-        {
-          prefix ? { },
-          const ? { },
-        }:
-        lib.concatLists (
-          (lib.mapAttrsToList (from: to: [
-            "-p"
-            "${from}:${to}"
-          ]) prefix)
-          ++ (lib.mapAttrsToList (from: to: [
-            "-c"
-            "${from}:${to}"
-          ]) const)
-        );
-
-      rewrites =
-        depList:
-        lib.fold mergeRewrites { } (
-          map (dep: dep.tbdRewrites) (lib.filter (dep: dep ? tbdRewrites) depList)
-        );
-    in
-    lib.escapeShellArgs (rewriteArgs (rewrites (lib.attrValues deps)));
-
-  mkFramework =
-    {
-      name,
-      deps,
-      private ? false,
-    }:
-    let
-      standardFrameworkPath =
-        name: private:
-        "/System/Library/${lib.optionalString private "Private"}Frameworks/${name}.framework";
-
-      self = stdenvNoCC.mkDerivation {
-        pname = "apple-${lib.optionalString private "private-"}framework-${name}";
-        inherit (darwin-stubs) version;
-
-        # because we copy files from the system
-        preferLocalBuild = true;
-
-        dontUnpack = true;
-        dontBuild = true;
-
-        disallowedRequisites = [ darwin-stubs ];
-
-        nativeBuildInputs = [ buildPackages.darwin.rewrite-tbd ];
-
-        installPhase = ''
-          mkdir -p $out/Library/Frameworks
-
-          cp -r ${darwin-stubs}${standardFrameworkPath name private} $out/Library/Frameworks
-
-          if [[ -d ${darwin-stubs}/usr/lib/swift/${name}.swiftmodule ]]; then
-            mkdir -p $out/lib/swift
-            cp -r -t $out/lib/swift \
-              ${darwin-stubs}/usr/lib/swift/${name}.swiftmodule \
-              ${darwin-stubs}/usr/lib/swift/libswift${name}.tbd
-          fi
-
-          # Fix and check tbd re-export references
-          chmod u+w -R $out
-          find $out -name '*.tbd' -type f | while IFS=$'\n' read tbd; do
-            echo "Fixing re-exports in $tbd"
-            rewrite-tbd \
-              -p ${standardFrameworkPath name private}/:$out/Library/Frameworks/${name}.framework/ \
-              -p /usr/lib/swift/:$out/lib/swift/ \
-              ${mkDepsRewrites deps} \
-              -r ${builtins.storeDir} \
-              "$tbd"
-          done
-        '';
-
-        propagatedBuildInputs = lib.attrValues deps;
-
-        passthru.tbdRewrites.prefix."${standardFrameworkPath name private}/" = "${self}/Library/Frameworks/${name}.framework/";
-
-        meta = with lib; {
-          description = "Apple SDK framework ${name}";
-          maintainers = [ ];
-          platforms = platforms.darwin;
-        };
-      };
-    in
-    self;
-
-  # Helper functions for creating framework derivations.
-  framework =
-    name: deps:
-    mkFramework {
-      inherit name deps;
-      private = false;
-    };
-
-  # Helper functions for creating private framework derivations.
-  privateFramework =
-    name: deps:
-    mkFramework {
-      inherit name deps;
-      private = true;
-    };
-
-  # Merge addToFrameworks into public-frameworks and remove elements of removeFromFrameworks.
-  deps =
-    let
-      inherit (fixup-frameworks) addToFrameworks removeFromFrameworks;
-      fixupDeps =
-        name: deps:
-        lib.pipe deps [
-          # Add dependencies from addToFrameworks.
-          (deps: lib.recursiveUpdate deps (addToFrameworks.${name} or { }))
-          # Keep dependencies not in removeFromFrameworks.
-          (lib.filterAttrs (depName: _: !(removeFromFrameworks.${name}.${depName} or false)))
-        ];
-    in
-    lib.mapAttrs fixupDeps public-frameworks;
-
-  # Create derivations and add private frameworks.
-  bareFrameworks =
-    (lib.mapAttrs framework deps) // (lib.mapAttrs privateFramework private-frameworks);
-in
-bareFrameworks // fixup-frameworks.overrideFrameworks bareFrameworks
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/fixups.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/fixups.nix
deleted file mode 100644
index 6068395c4ae2..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/fixups.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  lib,
-  # macOS things
-  frameworks,
-  libnetwork,
-  libs,
-  darwin-stubs,
-  objc4,
-}:
-
-{
-  # Used to add dependencies which are not picked up by gen-frameworks.py.
-  # Some of these are simply private frameworks the generator does not see.
-  # Trial and error, building things and adding dependencies when they fail.
-  addToFrameworks =
-    let
-      inherit (libs) libDER;
-      libobjc = objc4;
-    in
-    with frameworks;
-    {
-      # Below this comment are entries migrated from before the generator was
-      # added. If, for a given framework, you are able to reverify the extra
-      # deps are really necessary on top of the generator deps, move it above
-      # this comment (and maybe document your findings).
-      AVFoundation = {
-        inherit ApplicationServices AVFCapture AVFCore;
-      };
-      Accelerate = {
-        inherit CoreWLAN IOBluetooth;
-      };
-      AddressBook = {
-        inherit AddressBookCore ContactsPersistence libobjc;
-      };
-      AppKit = {
-        inherit AudioToolbox AudioUnit UIFoundation;
-      };
-      AudioToolbox = {
-        inherit AudioToolboxCore;
-      };
-      AudioUnit = {
-        inherit Carbon CoreAudio;
-      };
-      Carbon = {
-        inherit IOKit QuartzCore libobjc;
-      };
-      CoreAudio = {
-        inherit IOKit;
-      };
-      CoreData = {
-        inherit CloudKit;
-      };
-      CoreFoundation = {
-        inherit libobjc;
-      };
-      CoreGraphics = {
-        inherit SystemConfiguration;
-      };
-      CoreMIDIServer = {
-        inherit CoreMIDI;
-      };
-      CoreMedia = {
-        inherit ApplicationServices AudioToolbox AudioUnit;
-      };
-      CoreServices = {
-        inherit CoreAudio NetFS ServiceManagement;
-      };
-      CoreWLAN = {
-        inherit SecurityFoundation;
-      };
-      DiscRecording = {
-        inherit IOKit libobjc;
-      };
-      Foundation = {
-        inherit SystemConfiguration libobjc;
-      };
-      GameKit = {
-        inherit
-          GameCenterFoundation
-          GameCenterUI
-          GameCenterUICore
-          ReplayKit
-          ;
-      };
-      ICADevices = {
-        inherit Carbon libobjc;
-      };
-      IOBluetooth = {
-        inherit CoreBluetooth;
-      };
-      JavaScriptCore = {
-        inherit libobjc;
-      };
-      Kernel = {
-        inherit IOKit;
-      };
-      LinkPresentation = {
-        inherit URLFormatting;
-      };
-      MediaToolbox = {
-        inherit AudioUnit;
-      };
-      MetricKit = {
-        inherit SignpostMetrics;
-      };
-      Network = {
-        inherit libnetwork;
-      };
-      PCSC = {
-        inherit CoreData;
-      };
-      PassKit = {
-        inherit PassKitCore;
-      };
-      QTKit = {
-        inherit
-          CoreMedia
-          CoreMediaIO
-          MediaToolbox
-          VideoToolbox
-          ;
-      };
-      Quartz = {
-        inherit QTKit;
-      };
-      QuartzCore = {
-        inherit
-          ApplicationServices
-          CoreImage
-          CoreVideo
-          Metal
-          OpenCL
-          libobjc
-          ;
-      };
-      Security = {
-        inherit IOKit libDER;
-      };
-      TWAIN = {
-        inherit Carbon;
-      };
-      VideoDecodeAcceleration = {
-        inherit CoreVideo;
-      };
-      WebKit = {
-        inherit ApplicationServices Carbon libobjc;
-      };
-    };
-
-  # Used to remove dependencies which are picked up by gen-frameworks.py -- used mainly to break
-  # cyclic dependencies.
-  removeFromFrameworks = { };
-
-  # Overrides for framework derivations.
-  overrideFrameworks = super: {
-    # This framework doesn't exist in newer SDKs (somewhere around 10.13), but
-    # there are references to it in nixpkgs.
-    QuickTime = throw "QuickTime framework not available";
-
-    # Seems to be appropriate given https://developer.apple.com/forums/thread/666686
-    JavaVM = super.JavaNativeFoundation;
-  };
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/private.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/private.nix
deleted file mode 100644
index d58b28fa0271..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/private.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ objc4, frameworks }:
-
-# generated by hand to avoid exposing all private frameworks
-# frameworks here are only the necessary ones used by public frameworks.
-{
-  AVFCapture = { };
-  AVFCore = { };
-  AddressBookCore = {
-    inherit (frameworks) ContactsPersistence;
-  };
-  AudioToolboxCore = { };
-  ContactsPersistence = { };
-  UIFoundation = { };
-  GameCenterFoundation = { };
-  GameCenterUI = { };
-  GameCenterUICore = { };
-  URLFormatting = { };
-  SignpostMetrics = { };
-  PassKitCore = { };
-  SkyLight = { };
-
-  # Also expose CoreSymbolication; used by `root` package.
-  CoreSymbolication = { };
-
-  # Also expose DebugSymbols; used by `llvmPackages_8.lldb` package.
-  DebugSymbols = { };
-
-  # Also expose DisplayServices; used by `sketchybar` package.
-  DisplayServices = {
-    libobjc = objc4;
-  };
-
-  # Also expose MultitouchSupport; used by `chuck` package.
-  MultitouchSupport = { };
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/public.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/public.nix
deleted file mode 100644
index 4488c84bf124..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/public.nix
+++ /dev/null
@@ -1,209 +0,0 @@
-# This file is generated by gen-frameworks.nix.
-# Do not edit, put overrides in apple_sdk.nix instead.
-{ libs, frameworks }: with libs; with frameworks;
-{
-  AGL                              = { inherit Carbon OpenGL; };
-  AVFAudio                         = { inherit AudioToolbox CoreAudioTypes CoreMIDI CoreMedia Foundation; };
-  AVFoundation                     = { inherit AVFAudio CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreVideo Foundation IOKit ImageIO MediaToolbox Metal QuartzCore UniformTypeIdentifiers simd; };
-  AVKit                            = { inherit AVFoundation AppKit Cocoa Foundation; };
-  Accelerate                       = { inherit CoreFoundation CoreGraphics CoreVideo Foundation IOKit Metal; };
-  Accessibility                    = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  Accounts                         = { inherit Foundation; };
-  AdServices                       = { inherit Foundation; };
-  AdSupport                        = { inherit Foundation; };
-  AddressBook                      = { inherit Carbon Cocoa CoreFoundation Foundation; };
-  AppKit                           = { inherit Accessibility ApplicationServices CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal OpenGL QuartzCore; };
-  AppTrackingTransparency          = { inherit Foundation; };
-  AppleScriptKit                   = {};
-  AppleScriptObjC                  = { inherit Foundation; };
-  ApplicationServices              = { inherit ColorSync CoreFoundation CoreGraphics CoreServices CoreText ImageIO; };
-  AudioToolbox                     = { inherit Carbon CoreAudio CoreAudioTypes CoreFoundation CoreMIDI Foundation; };
-  AudioUnit                        = { inherit AudioToolbox; };
-  AudioVideoBridging               = { inherit Foundation IOKit; };
-  AuthenticationServices           = { inherit AppKit Foundation; };
-  AutomaticAssessmentConfiguration = { inherit Foundation; };
-  Automator                        = { inherit AppKit Cocoa Foundation OSAKit; };
-  BackgroundTasks                  = { inherit Foundation; };
-  BusinessChat                     = { inherit Cocoa Foundation; };
-  CFNetwork                        = { inherit CoreFoundation; };
-  CHIP                             = { inherit Foundation Security; };
-  CalendarStore                    = {};
-  CallKit                          = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  Carbon                           = { inherit ApplicationServices CoreServices Foundation Security; };
-  ClassKit                         = { inherit CoreGraphics Foundation; };
-  CloudKit                         = { inherit CoreFoundation CoreGraphics CoreLocation Foundation IOKit; };
-  Cocoa                            = { inherit AppKit CoreData Foundation; };
-  Collaboration                    = { inherit AppKit CoreServices Foundation; };
-  ColorSync                        = { inherit CoreFoundation; };
-  Combine                          = {};
-  Contacts                         = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  ContactsUI                       = { inherit AppKit; };
-  CoreAudio                        = { inherit CoreAudioTypes CoreFoundation; };
-  CoreAudioKit                     = { inherit AppKit AudioUnit Cocoa Foundation; };
-  CoreAudioTypes                   = { inherit CoreFoundation; };
-  CoreBluetooth                    = { inherit Foundation; };
-  CoreData                         = { inherit Combine CoreFoundation CoreGraphics Foundation IOKit; };
-  CoreDisplay                      = {};
-  CoreFoundation                   = {};
-  CoreGraphics                     = { inherit CoreFoundation IOKit; };
-  CoreHaptics                      = { inherit Foundation; };
-  CoreImage                        = { inherit ApplicationServices CoreFoundation CoreGraphics CoreVideo Foundation IOKit IOSurface ImageIO Metal OpenGL; };
-  CoreLocation                     = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  CoreMIDI                         = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  CoreMIDIServer                   = {};
-  CoreML                           = { inherit CoreFoundation CoreGraphics CoreVideo Foundation IOKit ImageIO Metal; };
-  CoreMedia                        = { inherit CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreVideo Foundation IOKit Metal; };
-  CoreMediaIO                      = { inherit CoreAudio CoreFoundation CoreGraphics CoreMedia Foundation IOKit Metal; };
-  CoreMotion                       = { inherit Foundation; };
-  CoreServices                     = { inherit CFNetwork CoreFoundation DiskArbitration Security; };
-  CoreSpotlight                    = { inherit Foundation UniformTypeIdentifiers; };
-  CoreTelephony                    = {};
-  CoreText                         = { inherit CoreFoundation CoreGraphics; };
-  CoreVideo                        = { inherit ApplicationServices CoreFoundation CoreGraphics IOSurface Metal OpenGL; };
-  CoreWLAN                         = { inherit Foundation IOKit; };
-  CreateML                         = { inherit AVFoundation Combine CoreAudio CoreFoundation CoreGraphics CoreImage CoreML CoreMedia CoreServices CoreVideo Foundation IOKit ImageIO Metal MetalPerformanceShaders NaturalLanguage TabularData VideoToolbox Vision simd; };
-  CryptoKit                        = { inherit CoreFoundation CoreGraphics Foundation IOKit LocalAuthentication Security; };
-  CryptoTokenKit                   = { inherit CoreFoundation CoreGraphics Foundation IOKit Security; };
-  DVDPlayback                      = { inherit ApplicationServices CoreFoundation Security; };
-  DataDetection                    = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  DeveloperToolsSupport            = {};
-  DeviceActivity                   = { inherit Foundation ManagedSettings; };
-  DeviceCheck                      = { inherit Foundation; };
-  DirectoryService                 = { inherit CoreFoundation; };
-  DiscRecording                    = { inherit CoreServices Foundation; };
-  DiscRecordingUI                  = { inherit Carbon Cocoa DiscRecording; };
-  DiskArbitration                  = { inherit CoreFoundation IOKit; };
-  DriverKit                        = {};
-  EventKit                         = { inherit CoreGraphics CoreLocation Foundation; };
-  ExceptionHandling                = { inherit Foundation; };
-  ExecutionPolicy                  = { inherit Foundation; };
-  ExposureNotification             = { inherit Foundation; };
-  ExternalAccessory                = { inherit Foundation; };
-  FWAUserLib                       = { inherit IOKit; };
-  FileProvider                     = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  FileProviderUI                   = { inherit AppKit FileProvider Foundation; };
-  FinderSync                       = { inherit AppKit Foundation; };
-  ForceFeedback                    = { inherit CoreFoundation IOKit; };
-  Foundation                       = { inherit Combine CoreFoundation CoreGraphics CoreServices IOKit Security; };
-  GLKit                            = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal ModelIO OpenGL QuartzCore simd; };
-  GLUT                             = { inherit OpenGL; };
-  GSS                              = { inherit CoreFoundation; };
-  GameController                   = { inherit AppKit Foundation IOKit; };
-  GameKit                          = { inherit AppKit Cocoa Contacts CoreGraphics Foundation GameController GameplayKit Metal MetalKit ModelIO SceneKit SpriteKit simd; };
-  GameplayKit                      = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation GLKit IOKit Metal ModelIO QuartzCore SceneKit SpriteKit simd; };
-  GroupActivities                  = { inherit AVFoundation Combine CoreGraphics CryptoKit Foundation Network UniformTypeIdentifiers; };
-  Hypervisor                       = {};
-  ICADevices                       = { inherit CoreFoundation CoreGraphics CoreServices IOBluetooth; };
-  IMServicePlugIn                  = { inherit Foundation; };
-  IOBluetooth                      = { inherit CoreAudio CoreFoundation CoreServices Foundation IOKit; };
-  IOBluetoothUI                    = { inherit Cocoa IOBluetooth; };
-  IOKit                            = { inherit CoreFoundation; };
-  IOSurface                        = { inherit CoreFoundation Foundation IOKit; };
-  IOUSBHost                        = { inherit Foundation IOKit; };
-  IdentityLookup                   = { inherit Foundation; };
-  ImageCaptureCore                 = { inherit Cocoa CoreGraphics Foundation; };
-  ImageIO                          = { inherit CoreFoundation CoreGraphics; };
-  InputMethodKit                   = { inherit Carbon Cocoa Foundation; };
-  InstallerPlugins                 = {};
-  InstantMessage                   = {};
-  Intents                          = { inherit CoreFoundation CoreGraphics CoreLocation Foundation IOKit UserNotifications; };
-  IntentsUI                        = { inherit AppKit; };
-  JavaNativeFoundation             = { inherit Foundation; };
-  JavaRuntimeSupport               = { inherit ApplicationServices Cocoa Foundation QuartzCore; };
-  JavaScriptCore                   = { inherit CoreFoundation CoreGraphics Foundation; };
-  Kerberos                         = {};
-  Kernel                           = {};
-  KernelManagement                 = { inherit Foundation; };
-  LDAP                             = {};
-  LatentSemanticMapping            = { inherit Carbon CoreFoundation; };
-  LinkPresentation                 = { inherit AppKit Foundation; };
-  LocalAuthentication              = { inherit Foundation; };
-  LocalAuthenticationEmbeddedUI    = { inherit AppKit Foundation LocalAuthentication; };
-  MLCompute                        = { inherit CoreFoundation CoreGraphics Foundation IOKit Metal; };
-  MailKit                          = { inherit AppKit Foundation; };
-  ManagedSettings                  = { inherit Combine Foundation; };
-  MapKit                           = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage CoreLocation Foundation IOKit Metal QuartzCore; };
-  MediaAccessibility               = { inherit CoreFoundation CoreGraphics CoreText; };
-  MediaLibrary                     = { inherit Foundation; };
-  MediaPlayer                      = { inherit AVFoundation CoreGraphics Foundation; };
-  MediaToolbox                     = { inherit AudioToolbox CoreFoundation CoreMedia; };
-  Message                          = {};
-  Metal                            = { inherit CoreFoundation CoreGraphics Foundation IOKit IOSurface; };
-  MetalKit                         = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal ModelIO QuartzCore simd; };
-  MetalPerformanceShaders          = { inherit CoreGraphics Foundation Metal simd; };
-  MetalPerformanceShadersGraph     = { inherit Foundation MetalPerformanceShaders; };
-  MetricKit                        = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  ModelIO                          = { inherit CoreFoundation CoreGraphics Foundation IOKit simd; };
-  MultipeerConnectivity            = { inherit Cocoa Foundation; };
-  MusicKit                         = { inherit Combine CoreGraphics Foundation; };
-  NaturalLanguage                  = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  NearbyInteraction                = { inherit CoreFoundation CoreGraphics Foundation IOKit simd; };
-  NetFS                            = { inherit CoreFoundation; };
-  Network                          = { inherit CoreFoundation Foundation Security; };
-  NetworkExtension                 = { inherit Foundation Network Security; };
-  NotificationCenter               = { inherit AppKit Foundation; };
-  OSAKit                           = { inherit Carbon Cocoa; };
-  OSLog                            = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  OpenAL                           = {};
-  OpenCL                           = { inherit OpenGL; };
-  OpenDirectory                    = { inherit CoreFoundation Foundation; };
-  OpenGL                           = {};
-  PCSC                             = {};
-  PDFKit                           = { inherit AppKit Cocoa; };
-  PHASE                            = { inherit AVFAudio AVFoundation CoreAudioTypes Foundation ModelIO simd; };
-  ParavirtualizedGraphics          = { inherit AppKit CoreVideo Foundation IOSurface Metal; };
-  PassKit                          = { inherit AppKit Contacts CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal QuartzCore; };
-  PencilKit                        = { inherit AppKit Cocoa CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal QuartzCore; };
-  Photos                           = { inherit AVFoundation CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia Foundation IOKit ImageIO Metal QuartzCore UniformTypeIdentifiers simd; };
-  PhotosUI                         = { inherit AppKit Foundation MapKit Photos; };
-  PreferencePanes                  = { inherit Cocoa; };
-  PushKit                          = { inherit Foundation; };
-  QTKit                            = {};
-  Quartz                           = { inherit AppKit ApplicationServices Cocoa Foundation ImageCaptureCore OpenGL PDFKit QuartzCore QuickLookUI; };
-  QuartzCore                       = { inherit CoreFoundation CoreGraphics CoreImage CoreVideo Foundation IOKit Metal OpenGL; };
-  QuickLook                        = { inherit ApplicationServices CoreFoundation; };
-  QuickLookThumbnailing            = { inherit CoreGraphics Foundation UniformTypeIdentifiers; };
-  QuickLookUI                      = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal PDFKit QuartzCore QuickLook UniformTypeIdentifiers; };
-  RealityFoundation                = { inherit AVFAudio AVFoundation AppKit AudioToolbox Combine CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreMotion CoreText CoreVideo Foundation IOKit Metal QuartzCore simd; };
-  RealityKit                       = { inherit AppKit Combine CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal MultipeerConnectivity QuartzCore RealityFoundation simd; };
-  ReplayKit                        = { inherit AVFoundation AppKit Foundation; };
-  Ruby                             = {};
-  SafariServices                   = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal QuartzCore; };
-  SceneKit                         = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation GLKit IOKit Metal ModelIO QuartzCore simd; };
-  ScreenCaptureKit                 = { inherit AppKit CoreGraphics CoreMedia Foundation; };
-  ScreenSaver                      = { inherit AppKit Foundation; };
-  ScreenTime                       = { inherit AppKit Foundation; };
-  ScriptingBridge                  = { inherit ApplicationServices CoreServices Foundation; };
-  Security                         = { inherit CoreFoundation; };
-  SecurityFoundation               = { inherit Foundation Security; };
-  SecurityInterface                = { inherit AppKit Cocoa Security SecurityFoundation; };
-  SensorKit                        = { inherit CoreFoundation CoreLocation Foundation; };
-  ServiceManagement                = { inherit CoreFoundation Security; };
-  ShazamKit                        = { inherit AVFAudio CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia Foundation IOKit Metal MusicKit; };
-  Social                           = { inherit AppKit Foundation; };
-  SoundAnalysis                    = { inherit AVFoundation CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreML CoreMedia Foundation IOKit Metal QuartzCore UniformTypeIdentifiers simd; };
-  Speech                           = { inherit AVFoundation CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia Foundation IOKit Metal QuartzCore UniformTypeIdentifiers simd; };
-  SpriteKit                        = { inherit AppKit Cocoa CoreData CoreFoundation CoreGraphics CoreImage Foundation GLKit IOKit Metal ModelIO QuartzCore simd; };
-  StoreKit                         = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage CryptoKit Foundation IOKit Metal QuartzCore Security; };
-  SwiftUI                          = { inherit Accessibility AppKit Combine CoreData CoreFoundation CoreGraphics CoreImage DeveloperToolsSupport Foundation IOKit Metal QuartzCore UniformTypeIdentifiers; };
-  SyncServices                     = {};
-  System                           = {};
-  SystemConfiguration              = { inherit CoreFoundation Security; };
-  SystemExtensions                 = { inherit Foundation; };
-  TWAIN                            = {};
-  TabularData                      = { inherit Combine Foundation; };
-  Tcl                              = {};
-  Tk                               = {};
-  UniformTypeIdentifiers           = { inherit CoreFoundation CoreGraphics Foundation IOKit; };
-  UserNotifications                = { inherit Foundation; };
-  UserNotificationsUI              = { inherit AppKit; };
-  VideoDecodeAcceleration          = {};
-  VideoSubscriberAccount           = { inherit Foundation; };
-  VideoToolbox                     = { inherit CoreFoundation CoreGraphics CoreMedia CoreVideo; };
-  Virtualization                   = { inherit AppKit Cocoa CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit Metal QuartzCore; };
-  Vision                           = { inherit CoreAudio CoreFoundation CoreGraphics CoreML CoreMedia CoreVideo Foundation IOKit ImageIO Metal simd; };
-  WebKit                           = { inherit AppKit CoreData CoreFoundation CoreGraphics CoreImage Foundation IOKit JavaScriptCore Metal QuartzCore; };
-  WidgetKit                        = { inherit Combine CoreFoundation CoreGraphics Foundation IOKit Intents SwiftUI UniformTypeIdentifiers; };
-  iTunesLibrary                    = { inherit Foundation; };
-  vmnet                            = {};
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libSystem.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libSystem.nix
deleted file mode 100644
index 5d57038a4657..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libSystem.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  stdenvNoCC,
-  buildPackages,
-  darwin-stubs,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "libSystem";
-  inherit (darwin-stubs) version;
-
-  nativeBuildInputs = [ buildPackages.darwin.rewrite-tbd ];
-
-  csu = [
-    "bundle1.o"
-    "crt0.o"
-    "crt1.10.5.o"
-    "crt1.10.6.o"
-    "crt1.o"
-    "dylib1.10.5.o"
-    "dylib1.o"
-    "gcrt1.o"
-    "lazydylib1.o"
-  ];
-
-  buildCommand =
-    ''
-      mkdir -p $out/{include,lib/swift}
-    ''
-    # Copy each directory in ${darwin-stubs}/usr/include into $out/include
-    + ''
-      for dir in $(ls -d ${darwin-stubs}/usr/include/*/); do
-        cp -dr $dir $out/include
-      done
-    ''
-    # Copy each header and modulemap file in ${darwin-stubs}/usr/include into $out/include
-    + ''
-      cp -d \
-        ${darwin-stubs}/usr/include/*.h \
-        ${darwin-stubs}/usr/include/*.modulemap \
-        $out/include
-    ''
-    # Remove curses.h, ncurses.h, ncurses_dll.h, and unctrl.h which conflict with ncurses.
-    # Then, remove the module map for ncurses.
-    # NOTE: The sed expression expects the module map to use consistent indentation across
-    #   releases. If this changes, the sed expression will need to be updated.
-    #
-    #   For example, right now we assume that there is one leading space before the
-    #   "explicit" keyword and that the closing brace is on its own line (also with one
-    #   leading space).
-    + ''
-      rm $out/include/{curses,ncurses,ncurses_dll,unctrl}.h
-      sed -i -e '/^ explicit module ncurses {/,/^ }$/d' $out/include/module.modulemap
-    ''
-    + ''
-      rm $out/include/tk*.h $out/include/tcl*.h
-
-      cp -dr \
-        ${darwin-stubs}/usr/lib/libSystem.* \
-        ${darwin-stubs}/usr/lib/system \
-        $out/lib
-
-      # Extra libraries
-      for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.1 resolv; do
-        cp -d \
-          ${darwin-stubs}/usr/lib/lib$name.tbd \
-          ${darwin-stubs}/usr/lib/lib$name.*.tbd \
-          $out/lib
-      done
-
-      for name in os Dispatch; do
-        cp -dr \
-          ${darwin-stubs}/usr/lib/swift/$name.swiftmodule \
-          ${darwin-stubs}/usr/lib/swift/libswift$name.tbd \
-          $out/lib/swift
-      done
-
-      for f in $csu; do
-        from=${darwin-stubs}/usr/lib/$f
-        if [ -e "$from" ]; then
-          cp -d $from $out/lib
-        else
-          echo "Csu file '$from' doesn't exist: skipping"
-        fi
-      done
-
-      chmod u+w -R $out/lib
-      find $out -name '*.tbd' -type f | while read tbd; do
-        rewrite-tbd \
-          -c /usr/lib/libsystem.dylib:$out/lib/libsystem.dylib \
-          -p /usr/lib/system/:$out/lib/system/ \
-          -p /usr/lib/swift/:$out/lib/swift/ \
-          -r ${builtins.storeDir} \
-          "$tbd"
-      done
-    '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libnetwork.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libnetwork.nix
deleted file mode 100644
index e7bae2fc77a0..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libnetwork.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenvNoCC, darwin-stubs }:
-
-let
-  self = stdenvNoCC.mkDerivation {
-    pname = "libnetwork";
-    inherit (darwin-stubs) version;
-
-    buildCommand = ''
-      mkdir -p $out/lib
-      cp ${darwin-stubs}/usr/lib/libnetwork* $out/lib
-    '';
-
-    passthru.tbdRewrites.const."/usr/lib/libnetwork.dylib" = "${self}/lib/libnetwork.dylib";
-  };
-in
-self
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libobjc.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libobjc.nix
deleted file mode 100644
index 14d7e92c8a54..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libobjc.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenvNoCC, darwin-stubs }:
-
-let
-  self = stdenvNoCC.mkDerivation {
-    pname = "libobjc";
-    inherit (darwin-stubs) version;
-
-    buildCommand = ''
-      mkdir -p $out/{include,lib/swift}
-      cp -r ${darwin-stubs}/usr/include/objc $out/include
-      cp ${darwin-stubs}/usr/lib/libobjc* $out/lib
-      cp -r ${darwin-stubs}/usr/lib/swift/ObjectiveC.swiftmodule $out/lib/swift
-      cp ${darwin-stubs}/usr/lib/swift/libswiftObjectiveC.tbd $out/lib/swift
-    '';
-
-    passthru.tbdRewrites = {
-      const."/usr/lib/libobjc.A.dylib" = "${self}/lib/libobjc.A.dylib";
-      const."/usr/lib/swift/libswiftObjectiveC.dylib" = "${self}/lib/swift/libswiftObjectiveC.dylib";
-    };
-  };
-in
-self
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libpm.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libpm.nix
deleted file mode 100644
index 110b9a1ab478..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libpm.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  stdenvNoCC,
-  buildPackages,
-  darwin-stubs,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "libpm";
-  inherit (darwin-stubs) version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [ buildPackages.darwin.checkReexportsHook ];
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp ${darwin-stubs}/usr/lib/libpm* $out/lib
-  '';
-
-  passthru.tbdRewrites = {
-    const."/usr/lib/libpmenergy.dylib" = "${placeholder "out"}/lib/libpmenergy.dylib";
-    const."/usr/lib/libpmsample.dylib" = "${placeholder "out"}/lib/libpmsample.dylib";
-  };
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/Xplugin.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/Xplugin.nix
deleted file mode 100644
index 6e125c001183..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/Xplugin.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  frameworks,
-  darwin-stubs,
-  stdenvNoCC,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "apple-lib-Xplugin";
-  inherit (darwin-stubs) version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  propagatedBuildInputs = with frameworks; [
-    OpenGL
-    ApplicationServices
-    Carbon
-    IOKit
-    CoreGraphics
-    CoreServices
-    CoreText
-  ];
-
-  installPhase = ''
-    mkdir -p $out/include $out/lib
-    cp "${darwin-stubs}/include/Xplugin.h" $out/include/Xplugin.h
-    cp ${darwin-stubs}/usr/lib/libXplugin.1.tbd $out/lib
-    ln -s libXplugin.1.tbd $out/lib/libXplugin.tbd
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/default.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/default.nix
deleted file mode 100644
index 87a36ba32b62..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage }:
-
-{
-  libDER = callPackage ./libDER.nix { };
-  sandbox = callPackage ./sandbox.nix { };
-  simd = callPackage ./simd.nix { };
-  utmp = callPackage ./utmp.nix { };
-  xpc = callPackage ./xpc.nix { };
-  Xplugin = callPackage ./Xplugin.nix { };
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/libDER.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/libDER.nix
deleted file mode 100644
index 4aa8e2bd9550..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/libDER.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ darwin-stubs, stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  pname = "apple-lib-libDER";
-  inherit (darwin-stubs) version;
-
-  buildCommand = ''
-    mkdir -p $out/include
-    cp -r ${darwin-stubs}/usr/include/libDER $out/include
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/sandbox.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/sandbox.nix
deleted file mode 100644
index f4e9955a0b9b..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/sandbox.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ darwin-stubs, stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  pname = "apple-lib-sandbox";
-  inherit (darwin-stubs) version;
-
-  buildCommand = ''
-    mkdir -p $out/include $out/lib
-    cp "${darwin-stubs}/usr/include/sandbox.h" $out/include/sandbox.h
-    cp "${darwin-stubs}/usr/lib/libsandbox.1.tbd" $out/lib
-    ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/simd.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/simd.nix
deleted file mode 100644
index 45226a5bec59..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/simd.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ darwin-stubs, stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  pname = "apple-lib-simd";
-  inherit (darwin-stubs) version;
-
-  buildCommand = ''
-    mkdir -p $out/include
-    cp -r ${darwin-stubs}/usr/include/simd $out/include
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/utmp.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/utmp.nix
deleted file mode 100644
index bc85b9be35b5..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/utmp.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ darwin-stubs, stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  pname = "apple-lib-utmp";
-  inherit (darwin-stubs) version;
-
-  buildCommand = ''
-    mkdir -p $out/include
-    cp "${darwin-stubs}/include/utmp.h" $out/include
-    cp "${darwin-stubs}/include/utmpx.h" $out/include
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/xpc.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libs/xpc.nix
deleted file mode 100644
index 8c9848daf9ca..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libs/xpc.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ darwin-stubs, stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  pname = "apple-lib-xpc";
-  inherit (darwin-stubs) version;
-
-  buildCommand = ''
-    mkdir -p $out/include
-    cp -r "${darwin-stubs}/usr/include/xpc" $out/include/xpc
-    cp "${darwin-stubs}/usr/include/launch.h" $out/include/launch.h
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/libunwind.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/libunwind.nix
deleted file mode 100644
index c1846a9bf92f..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/libunwind.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  stdenvNoCC,
-  buildPackages,
-  darwin-stubs,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "libunwind";
-  inherit (darwin-stubs) version;
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [ buildPackages.darwin.checkReexportsHook ];
-
-  installPhase = ''
-    mkdir -p $out/include/mach-o
-
-    cp \
-      ${darwin-stubs}/usr/include/libunwind.h \
-      ${darwin-stubs}/usr/include/unwind.h \
-      $out/include
-
-    cp \
-      ${darwin-stubs}/usr/include/mach-o/compact_unwind_encoding.h \
-      $out/include/mach-o
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
deleted file mode 100644
index 5d0f58f48b48..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-linkSystemCoreFoundationFramework() {
-  NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks${NIX_CFLAGS_COMPILE:+ }${NIX_CFLAGS_COMPILE-}"
-  # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not
-  # in the opensource release
-  # if the package needs private headers, we assume they also want to link with system CF
-  NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation.tbd"
-}
-
-preConfigureHooks+=(linkSystemCoreFoundationFramework)
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 1cd5afe19301..388de3730380 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,360 +1,272 @@
-{ stdenv, stdenvNoCC, fetchurl, cpio, pbzx, pkgs, lib, darwin-stubs, print-reexports }:
+# Compatibility stubs for packages that used the old SDK frameworks.
+# TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs.
+{ lib, callPackage }:
 
 let
-  # sadly needs to be exported because security_tool needs it
-  sdk = stdenv.mkDerivation rec {
-    pname = "MacOS_SDK";
-    version = "10.12";
+  mkStub = callPackage ./mk-stub.nix { } "10.12";
 
-    # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
-    #  1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
-    #  2. In the resulting file, search for a file called DevSDK ending in .pkg
-    #  3. ???
-    #  4. Profit
-    src = fetchurl {
-      url    = "http://swcdn.apple.com/content/downloads/33/36/041-90419-A_7JJ4H9ZHO2/xs88ob5wjz6riz7g6764twblnvksusg4ps/DevSDK_OSX1012.pkg";
-      sha256 = "13xq34sb7383b37hwy076gnhf96prpk1b4087p87xnwswxbrisih";
-    };
-
-    nativeBuildInputs = [ cpio pbzx ];
-
-    outputs = [ "out" "dev" "man" ];
-
-    unpackPhase = ''
-      pbzx $src | cpio -idm
-    '';
-
-    sourceRoot = ".";
-
-    installPhase = ''
-      mkdir -p $out
-
-      cp -R System/Library $out
-      cp -R usr/* $out
-
-      pushd $out/lib
-      cp ${darwin-stubs}/usr/lib/libcups*.tbd .
-      ln -s libcups.2.tbd      libcups.tbd
-      ln -s libcupscgi.1.tbd   libcupscgi.tbd
-      ln -s libcupsimage.2.tbd libcupsimage.tbd
-      ln -s libcupsmime.1.tbd  libcupsmime.tbd
-      ln -s libcupsppdc.1.tbd  libcupsppdc.tbd
-      popd
-    '';
-
-    meta = with lib; {
-      description = "Apple SDK ${version}";
-      maintainers = with maintainers; [ copumpkin ];
-      platforms   = platforms.darwin;
-    };
-  };
-
-  mkFrameworkSubs = name: deps:
-  let
-    deps' = deps // { "${name}" = placeholder "out"; };
-    substArgs = lib.concatMap (x: [ "--subst-var-by" x deps'."${x}" ]) (lib.attrNames deps');
-  in lib.escapeShellArgs substArgs;
-
-  framework = name: deps: stdenv.mkDerivation {
-    name = "apple-framework-${name}";
-
-    dontUnpack = true;
-
-    # because we copy files from the system
-    preferLocalBuild = true;
-
-    disallowedRequisites = [ sdk ];
-
-    nativeBuildInputs = [ print-reexports ];
-
-    extraTBDFiles = [];
-
-    installPhase = ''
-      linkFramework() {
-        local path="$1"
-        local nested_path="$1"
-        if [ "$path" == "JavaNativeFoundation.framework" ]; then
-          local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework"
-        fi
-        if [ "$path" == "JavaRuntimeSupport.framework" ]; then
-          local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaRuntimeSupport.framework"
-        fi
-        local name="$(basename "$path" .framework)"
-        local current="$(readlink "/System/Library/Frameworks/$nested_path/Versions/Current")"
-        if [ -z "$current" ]; then
-          current=A
-        fi
-
-        local dest="$out/Library/Frameworks/$path"
-
-        mkdir -p "$dest/Versions/$current"
-        pushd "$dest/Versions/$current" >/dev/null
-
-        if [ -d "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" ]; then
-          cp -R "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" .
-        elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then
-          current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
-          cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
-        fi
-
-        local tbd_source=${darwin-stubs}/System/Library/Frameworks/$nested_path/Versions/$current
-        if [ "${name}" != "Kernel" ]; then
-          # The Kernel.framework has headers but no actual library component.
-          cp -v $tbd_source/*.tbd .
-        fi
-
-        if [ -d "$tbd_source/Libraries" ]; then
-          mkdir Libraries
-          cp -v $tbd_source/Libraries/*.tbd Libraries/
-        fi
-
-        ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/Resources"
-
-        if [ -f "/System/Library/Frameworks/$nested_path/module.map" ]; then
-          ln -s "/System/Library/Frameworks/$nested_path/module.map"
-        fi
-
-        pushd "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current" >/dev/null
-        local children=$(echo Frameworks/*.framework)
-        popd >/dev/null
-
-        for child in $children; do
-          childpath="$path/Versions/$current/$child"
-          linkFramework "$childpath"
-        done
-
-        pushd ../.. >/dev/null
-        ln -s "$current" Versions/Current
-        ln -s Versions/Current/* .
-        popd >/dev/null
-
-        popd >/dev/null
-      }
-
-      linkFramework "${name}.framework"
-
-      # linkFramework is recursive, the rest of the processing is not.
-
-      local tbd_source=${darwin-stubs}/System/Library/Frameworks/${name}.framework
-      for tbd in $extraTBDFiles; do
-        local tbd_dest_dir=$out/Library/Frameworks/${name}.framework/$(dirname "$tbd")
-        mkdir -p "$tbd_dest_dir"
-        cp -v "$tbd_source/$tbd" "$tbd_dest_dir"
-      done
-
-      # Fix and check tbd re-export references
-      find $out -name '*.tbd' | while read tbd; do
-        echo "Fixing re-exports in $tbd"
-        substituteInPlace "$tbd" ${mkFrameworkSubs name deps}
-
-        echo "Checking re-exports in $tbd"
-        print-reexports "$tbd" | while read target; do
-          local expected="''${target%.dylib}.tbd"
-          if ! [ -e "$expected" ]; then
-            echo -e "Re-export missing:\n\t$target\n\t(expected $expected)"
-            echo -e "While processing\n\t$tbd"
-            exit 1
-          else
-            echo "Re-exported target $target ok"
-          fi
-        done
-      done
-    '';
-
-    propagatedBuildInputs = builtins.attrValues deps;
-
-    meta = with lib; {
-      description = "Apple SDK framework ${name}";
-      maintainers = with maintainers; [ copumpkin ];
-      platforms   = platforms.darwin;
-    };
-  };
-
-  tbdOnlyFramework = name: { private ? true }: stdenv.mkDerivation {
-    name = "apple-framework-${name}";
-    dontUnpack = true;
-    installPhase = ''
-      mkdir -p $out/Library/Frameworks/
-      cp -r ${darwin-stubs}/System/Library/${lib.optionalString private "Private"}Frameworks/${name}.framework \
-        $out/Library/Frameworks
-
-      cd $out/Library/Frameworks/${name}.framework
-
-      versions=(./Versions/*)
-      if [ "''${#versions[@]}" != 1 ]; then
-        echo "Unable to determine current version of framework ${name}"
-        exit 1
-      fi
-      current=$(basename ''${versions[0]})
-
-      chmod u+w -R .
-      ln -s "$current" Versions/Current
-      ln -s Versions/Current/* .
-
-      # NOTE there's no re-export checking here, this is probably wrong
-    '';
-  };
-in rec {
-  libs = {
-    xpc = stdenv.mkDerivation {
-      name   = "apple-lib-xpc";
-      dontUnpack = true;
-
-      installPhase = ''
-        mkdir -p $out/include
-        pushd $out/include >/dev/null
-        cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc
-        cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h
-        popd >/dev/null
-      '';
-    };
-
-    Xplugin = stdenv.mkDerivation {
-      name   = "apple-lib-Xplugin";
-      dontUnpack = true;
-
-      # Not enough
-      __propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ];
-
-      propagatedBuildInputs = with frameworks; [
-        OpenGL ApplicationServices Carbon IOKit CoreGraphics CoreServices CoreText
-      ];
-
-      installPhase = ''
-        mkdir -p $out/include $out/lib
-        ln -s "${lib.getDev sdk}/include/Xplugin.h" $out/include/Xplugin.h
-        cp ${darwin-stubs}/usr/lib/libXplugin.1.tbd $out/lib
-        ln -s libXplugin.1.tbd $out/lib/libXplugin.tbd
-      '';
-    };
-
-    utmp = stdenv.mkDerivation {
-      name   = "apple-lib-utmp";
-      dontUnpack = true;
-
-      installPhase = ''
-        mkdir -p $out/include
-        pushd $out/include >/dev/null
-        ln -s "${lib.getDev sdk}/include/utmp.h"
-        ln -s "${lib.getDev sdk}/include/utmpx.h"
-        popd >/dev/null
-      '';
-    };
-
-    sandbox = stdenv.mkDerivation {
-      name = "apple-lib-sandbox";
-      dontUnpack = true;
-
-      installPhase = ''
-        mkdir -p $out/include $out/lib
-        ln -s "${lib.getDev sdk}/include/sandbox.h" $out/include/sandbox.h
-        cp "${darwin-stubs}/usr/lib/libsandbox.1.tbd" $out/lib
-        ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
-      '';
-    };
-
-    simd = stdenvNoCC.mkDerivation {
-      name = "apple-lib-simd";
-
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-
-      buildCommand = "echo 'simd library not available in the 10.12 SDK'; exit 1";
-    };
-  };
-
-  overrides = super: {
-    AppKit = lib.overrideDerivation super.AppKit (drv: {
-      __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps or [] ++ [
-        "/System/Library/PrivateFrameworks/"
-      ];
-    });
-
-    Carbon = lib.overrideDerivation super.Carbon (drv: {
-      extraTBDFiles = [ "Versions/A/Frameworks/HTMLRendering.framework/Versions/A/HTMLRendering.tbd" ];
-    });
-
-    CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: {
-      setupHook = ./cf-setup-hook.sh;
-    });
-
-    CoreMedia = lib.overrideDerivation super.CoreMedia (drv: {
-      __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps or [] ++ [
-        "/System/Library/Frameworks/CoreImage.framework"
-      ];
-    });
-
-    CoreMIDI = lib.overrideDerivation super.CoreMIDI (drv: {
-      __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps or [] ++ [
-        "/System/Library/PrivateFrameworks/"
-      ];
-      setupHook = ./private-frameworks-setup-hook.sh;
-    });
-
-    IMServicePlugIn = lib.overrideDerivation super.IMServicePlugIn (drv: {
-      extraTBDFiles = [ "Versions/A/Frameworks/IMServicePlugInSupport.framework/Versions/A/IMServicePlugInSupport.tbd" ];
-    });
-
-    Security = lib.overrideDerivation super.Security (drv: {
-      setupHook = ./security-setup-hook.sh;
-    });
-
-    QuartzCore = lib.overrideDerivation super.QuartzCore (drv: {
-      installPhase = drv.installPhase + ''
-        f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h"
-        substituteInPlace "$f" \
-          --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage"
-      '';
-    });
-
-    MetalKit = lib.overrideDerivation super.MetalKit (drv: {
-      installPhase = drv.installPhase + ''
-        mkdir -p $out/include/simd
-        cp ${lib.getDev sdk}/include/simd/*.h $out/include/simd/
-      '';
-    });
-
-    System = lib.overrideDerivation super.System (drv: {
-      installPhase = ''
-        mkdir -p $out/Library/Frameworks/System.framework/Versions/B
-        ln -s $out/Library/Frameworks/System.framework/Versions/{B,Current}
-        ln -s ${pkgs.darwin.Libsystem}/lib/libSystem.B.tbd $out/Library/Frameworks/System.framework/Versions/B/System.tbd
-        ln -s $out/Library/Frameworks/System.framework/{Versions/Current/,}System.tbd
-      '';
-    });
-
-    WebKit = lib.overrideDerivation super.WebKit (drv: {
-      extraTBDFiles = [
-        "Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore.tbd"
-        "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd"
-      ];
-    });
-  } // lib.genAttrs [
+  frameworks = lib.genAttrs [
+    "AGL"
+    "AVFoundation"
+    "AVKit"
+    "Accelerate"
+    "Accounts"
+    "AddressBook"
+    "AppKit"
+    "AppKitScripting"
+    "AppleScriptKit"
+    "AppleScriptObjC"
+    "ApplicationServices"
+    "AudioToolbox"
+    "AudioUnit"
+    "AudioVideoBridging"
+    "Automator"
+    "CFNetwork"
+    "CalendarStore"
+    "Carbon"
+    "Cocoa"
+    "Collaboration"
     "ContactsPersistence"
+    "CoreAudio"
+    "CoreAudioKit"
+    "CoreBluetooth"
+    "CoreData"
+    "CoreFoundation"
+    "CoreGraphics"
+    "CoreImage"
+    "CoreLocation"
+    "CoreMIDI"
+    "CoreMIDIServer"
+    "CoreMedia"
+    "CoreMediaIO"
+    "CoreServices"
     "CoreSymbolication"
+    "CoreText"
+    "CoreVideo"
+    "CoreWLAN"
+    "DVDPlayback"
     "DebugSymbols"
+    "DirectoryService"
+    "DiscRecording"
+    "DiscRecordingUI"
+    "DiskArbitration"
     "DisplayServices"
+    "EventKit"
+    "ExceptionHandling"
+    "FWAUserLib"
+    "ForceFeedback"
+    "Foundation"
+    "GLKit"
+    "GLUT"
+    "GSS"
     "GameCenter"
+    "GameController"
+    "GameKit"
+    "GameplayKit"
+    "Hypervisor"
+    "ICADevices"
+    "IMServicePlugIn"
+    "IOBluetooth"
+    "IOBluetoothUI"
+    "IOKit"
+    "IOSurface"
+    "ImageCaptureCore"
+    "ImageIO"
+    "InputMethodKit"
+    "InstallerPlugins"
+    "InstantMessage"
+    "JavaFrameEmbedding"
+    "JavaNativeFoundation"
+    "JavaRuntimeSupport"
+    "JavaScriptCore"
+    "JavaVM"
+    "Kerberos"
+    "Kernel"
+    "LDAP"
+    "LatentSemanticMapping"
+    "LocalAuthentication"
+    "MapKit"
+    "MediaAccessibility"
+    "MediaPlayer"
+    "MediaToolbox"
+    "Metal"
+    "MetalKit"
+    "ModelIO"
     "MultitouchSupport"
+    "NetFS"
+    "OSAKit"
+    "OpenAL"
+    "OpenCL"
+    "OpenDirectory"
+    "OpenGL"
+    "PCSC"
+    "PreferencePanes"
+    "PubSub"
+    "QTKit"
+    "Quartz"
+    "QuartzCore"
+    "QuickLook"
+    "QuickTime"
+    "SceneKit"
+    "ScreenSaver"
+    "Scripting"
+    "ScriptingBridge"
+    "Security"
+    "SecurityFoundation"
+    "SecurityInterface"
+    "ServiceManagement"
     "SkyLight"
+    "Social"
+    "SpriteKit"
+    "StoreKit"
+    "SyncServices"
+    "System"
+    "SystemConfiguration"
+    "TWAIN"
+    "Tcl"
     "UIFoundation"
-  ]
-    (x: tbdOnlyFramework x {});
+    "VideoDecodeAcceleration"
+    "VideoToolbox"
+    "WebKit"
+    "vmnet"
+  ] mkStub;
 
-  bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix {
-    inherit frameworks libs;
-    inherit (pkgs.darwin) libobjc;
-  });
+  bareFrameworks = lib.genAttrs [
+    "AGL"
+    "AVFoundation"
+    "AVKit"
+    "Accelerate"
+    "Accounts"
+    "AddressBook"
+    "AppKit"
+    "AppKitScripting"
+    "AppleScriptKit"
+    "AppleScriptObjC"
+    "ApplicationServices"
+    "AudioToolbox"
+    "AudioUnit"
+    "AudioVideoBridging"
+    "Automator"
+    "CFNetwork"
+    "CalendarStore"
+    "Carbon"
+    "Cocoa"
+    "Collaboration"
+    "CoreAudio"
+    "CoreAudioKit"
+    "CoreBluetooth"
+    "CoreData"
+    "CoreFoundation"
+    "CoreGraphics"
+    "CoreImage"
+    "CoreLocation"
+    "CoreMIDI"
+    "CoreMIDIServer"
+    "CoreMedia"
+    "CoreMediaIO"
+    "CoreServices"
+    "CoreText"
+    "CoreVideo"
+    "CoreWLAN"
+    "DVDPlayback"
+    "DirectoryService"
+    "DiscRecording"
+    "DiscRecordingUI"
+    "DiskArbitration"
+    "EventKit"
+    "ExceptionHandling"
+    "FWAUserLib"
+    "ForceFeedback"
+    "Foundation"
+    "GLKit"
+    "GLUT"
+    "GSS"
+    "GameCenter"
+    "GameController"
+    "GameKit"
+    "GameplayKit"
+    "Hypervisor"
+    "ICADevices"
+    "IMServicePlugIn"
+    "IOBluetooth"
+    "IOBluetoothUI"
+    "IOKit"
+    "IOSurface"
+    "ImageCaptureCore"
+    "ImageIO"
+    "InputMethodKit"
+    "InstallerPlugins"
+    "InstantMessage"
+    "JavaFrameEmbedding"
+    "JavaNativeFoundation"
+    "JavaRuntimeSupport"
+    "JavaScriptCore"
+    "JavaVM"
+    "Kerberos"
+    "Kernel"
+    "LDAP"
+    "LatentSemanticMapping"
+    "LocalAuthentication"
+    "MapKit"
+    "MediaAccessibility"
+    "MediaPlayer"
+    "MediaToolbox"
+    "Metal"
+    "MetalKit"
+    "ModelIO"
+    "NetFS"
+    "OSAKit"
+    "OpenAL"
+    "OpenCL"
+    "OpenDirectory"
+    "OpenGL"
+    "PCSC"
+    "PreferencePanes"
+    "PubSub"
+    "QTKit"
+    "Quartz"
+    "QuartzCore"
+    "QuickLook"
+    "QuickTime"
+    "SceneKit"
+    "ScreenSaver"
+    "Scripting"
+    "ScriptingBridge"
+    "Security"
+    "SecurityFoundation"
+    "SecurityInterface"
+    "ServiceManagement"
+    "Social"
+    "SpriteKit"
+    "StoreKit"
+    "SyncServices"
+    "System"
+    "SystemConfiguration"
+    "TWAIN"
+    "Tcl"
+    "VideoDecodeAcceleration"
+    "VideoToolbox"
+    "WebKit"
+    "vmnet"
+  ] mkStub;
+in
+{
+  inherit bareFrameworks frameworks;
 
-  frameworks = bareFrameworks // overrides bareFrameworks;
+  libs = lib.genAttrs [
+    "Xplugin"
+    "sandbox"
+    "simd"
+    "utmp"
+    "xpc"
+  ] mkStub;
 
-  inherit darwin-stubs;
-
-  objc4 = pkgs.darwin.libobjc;
-
-  sdkRoot = pkgs.callPackage ./sdkRoot.nix { sdkVersion = "10.12.4"; };
-
-  inherit (pkgs.darwin) Libsystem;
-
-  inherit sdk;
+  version = "10.12";
 }
+// lib.genAttrs [
+  "darwin-stubs"
+  "Libsystem"
+  "objc4"
+  "sdk"
+  "sdkRoot"
+] mkStub
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
deleted file mode 100644
index a9fbcc066a3c..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-# Current as of 10.12
-# Epic weird knot-tying happening here.
-# TODO: clean up the process for generating this and include it
-
-{ frameworks, libs, libobjc, }:
-
-with frameworks; with libs; {
-  AGL                     = { inherit Carbon OpenGL; };
-  AVFoundation            = { inherit ApplicationServices CoreGraphics CoreMedia MediaToolbox; };
-  AVKit                   = {};
-  Accounts                = {};
-  AddressBook             = { inherit libobjc Carbon ContactsPersistence; };
-  AppKit                  = { inherit ApplicationServices AudioToolbox AudioUnit Foundation QuartzCore UIFoundation; };
-  AppKitScripting         = {};
-  AppleScriptKit          = {};
-  AppleScriptObjC         = {};
-  AudioToolbox            = { inherit CoreAudio CoreMIDI; };
-  AudioUnit               = { inherit AudioToolbox Carbon CoreAudio; };
-  AudioVideoBridging      = { inherit Foundation; };
-  Automator               = {};
-  CFNetwork               = {};
-  CalendarStore           = {};
-  Cocoa                   = { inherit AppKit CoreData; };
-  Collaboration           = {};
-  # Impure version of CoreFoundation, this should not be used unless another
-  # framework includes headers that are not available in the pure version.
-  CoreFoundation          = {};
-  CoreAudio               = { inherit IOKit; };
-  CoreAudioKit            = { inherit AudioUnit; };
-  CoreData                = {};
-  CoreGraphics            = { inherit Accelerate IOKit IOSurface SystemConfiguration; };
-  CoreImage               = {};
-  CoreLocation            = {};
-  CoreMIDI                = {};
-  CoreMIDIServer          = { inherit CoreMIDI; };
-  CoreMedia               = { inherit ApplicationServices AudioToolbox AudioUnit CoreAudio CoreGraphics CoreVideo; };
-  CoreMediaIO             = { inherit CoreMedia; };
-  CoreText                = { inherit CoreGraphics; };
-  CoreVideo               = { inherit ApplicationServices CoreGraphics IOSurface OpenGL; };
-  CoreWLAN                = { inherit SecurityFoundation; };
-  DVDPlayback             = {};
-  DirectoryService        = {};
-  DiscRecording           = { inherit libobjc CoreServices IOKit; };
-  DiscRecordingUI         = {};
-  DiskArbitration         = { inherit IOKit; };
-  EventKit                = {};
-  ExceptionHandling       = {};
-  FWAUserLib              = {};
-  ForceFeedback           = { inherit IOKit; };
-  Foundation              = { inherit libobjc CoreFoundation Security ApplicationServices SystemConfiguration; };
-  GLKit                   = {};
-  GLUT                    = { inherit OpenGL; };
-  GSS                     = {};
-  GameCenter              = {};
-  GameController          = {};
-  GameKit                 = { inherit Cocoa Foundation GameCenter GameController GameplayKit Metal MetalKit ModelIO SceneKit SpriteKit; };
-  GameplayKit             = {};
-  Hypervisor              = {};
-  ICADevices              = { inherit libobjc Carbon IOBluetooth; };
-  IMServicePlugIn         = {};
-  IOBluetoothUI           = { inherit IOBluetooth; };
-  IOKit                   = {};
-  IOSurface               = { inherit IOKit xpc; };
-  ImageCaptureCore        = {};
-  ImageIO                 = { inherit CoreGraphics; };
-  InputMethodKit          = { inherit Carbon; };
-  InstallerPlugins        = {};
-  InstantMessage          = {};
-  JavaFrameEmbedding      = {};
-  JavaNativeFoundation    = {};
-  JavaRuntimeSupport      = {};
-  JavaScriptCore          = { inherit libobjc; };
-  Kerberos                = {};
-  Kernel                  = { inherit IOKit; };
-  LDAP                    = {};
-  LatentSemanticMapping   = { inherit Carbon; };
-  LocalAuthentication     = {};
-  MapKit                  = {};
-  MediaAccessibility      = { inherit CoreGraphics CoreText QuartzCore; };
-  MediaPlayer             = {};
-  MediaToolbox            = { inherit AudioToolbox AudioUnit CoreMedia; };
-  Metal                   = {};
-  MetalKit                = { inherit ModelIO Metal; };
-  ModelIO                 = {};
-  NetFS                   = {};
-  OSAKit                  = { inherit Carbon; };
-  OpenAL                  = {};
-  OpenCL                  = { inherit IOSurface OpenGL; };
-  OpenGL                  = {};
-  PCSC                    = { inherit CoreData; };
-  PreferencePanes         = {};
-  PubSub                  = {};
-  QTKit                   = { inherit CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox; };
-  QuickLook               = { inherit ApplicationServices; };
-  SceneKit                = {};
-  ScreenSaver             = {};
-  Scripting               = {};
-  ScriptingBridge         = {};
-  Security                = { inherit IOKit; };
-  SecurityFoundation      = {};
-  SecurityInterface       = { inherit Security SecurityFoundation; };
-  ServiceManagement       = { inherit Security; };
-  Social                  = {};
-  SpriteKit               = {};
-  StoreKit                = {};
-  SyncServices            = {};
-  System                  = {};
-  SystemConfiguration     = { inherit Security; };
-  TWAIN                   = { inherit Carbon; };
-  Tcl                     = {};
-  VideoDecodeAcceleration = { inherit CoreVideo; };
-  VideoToolbox            = { inherit CoreMedia CoreVideo; };
-  WebKit                  = { inherit libobjc ApplicationServices Carbon JavaScriptCore OpenGL; };
-
-  # Umbrellas
-  Accelerate          = { inherit CoreWLAN IOBluetooth; };
-  ApplicationServices = { inherit CoreGraphics CoreServices CoreText ImageIO; };
-  Carbon              = { inherit libobjc ApplicationServices CoreServices Foundation IOKit Security QuartzCore; };
-  CoreBluetooth       = {};
-  # TODO: figure out which part of the umbrella depends on CoreFoundation and move it there.
-  CoreServices        = { inherit CFNetwork CoreFoundation CoreAudio CoreData DiskArbitration Security NetFS OpenDirectory ServiceManagement; };
-  IOBluetooth         = { inherit CoreBluetooth IOKit; };
-  JavaVM              = {};
-  OpenDirectory       = {};
-  Quartz              = { inherit QuartzCore QuickLook QTKit; };
-  QuartzCore          = { inherit libobjc ApplicationServices CoreVideo OpenCL CoreImage Metal; };
-  QuickTime           = { inherit ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore; };
-
-  vmnet = {};
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
deleted file mode 100644
index c111492f2b3d..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ /dev/null
@@ -1,256 +0,0 @@
-rec {
-  CFNetwork = [
-    "/System/Library/Frameworks/CFNetwork.framework"
-    "/usr/lib/libsqlite3.dylib"
-    "/usr/lib/libxml2.2.dylib"
-  ];
-  ForceFeedback = [
-    "/System/Library/Frameworks/ForceFeedback.framework"
-  ];
-  AGL = [
-    "/System/Library/Frameworks/AGL.framework"
-  ];
-  IOKit = [
-    "/System/Library/Frameworks/IOKit.framework"
-  ];
-  JavaScriptCore = [
-    "/System/Library/Frameworks/JavaScriptCore.framework"
-  ];
-  QuickLook = [
-    "/System/Library/Frameworks/QuickLook.framework"
-  ];
-  Quartz = [
-    "/System/Library/Frameworks/Quartz.framework"
-    "/System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo"
-    "/System/Library/PrivateFrameworks/CorePDF.framework/Versions/A/CorePDF"
-    "/usr/lib/libspindump.dylib"
-  ];
-  ImageCaptureCore = [
-    "/System/Library/Frameworks/ImageCaptureCore.framework"
-  ];
-  VideoToolbox = [
-    "/System/Library/Frameworks/VideoToolbox.framework"
-    "/System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA"
-  ];
-  QuickTime = [
-    "/System/Library/Frameworks/QuickTime.framework"
-  ];
-  CoreMedia = [
-    "/System/Library/Frameworks/CoreMedia.framework"
-  ];
-  CoreMediaIO = [
-    "/System/Library/Frameworks/CoreMediaIO.framework"
-    "/System/Library/PrivateFrameworks/AppSandbox.framework/Versions/A/AppSandbox"
-    "/System/Library/PrivateFrameworks/AppContainer.framework/Versions/A/AppContainer"
-    "/System/Library/PrivateFrameworks/SecCodeWrapper.framework/Versions/A/SecCodeWrapper"
-    "/System/Library/PrivateFrameworks/XPCService.framework/Versions/A/XPCService"
-    "/usr/lib/libsandbox.1.dylib"
-    "/usr/lib/libMatch.1.dylib"
-  ];
-  MediaToolbox = [
-    "/System/Library/Frameworks/MediaToolbox.framework"
-    "/System/Library/PrivateFrameworks/CoreAUC.framework/Versions/A/CoreAUC"
-    "/System/Library/PrivateFrameworks/NetworkStatistics.framework/Versions/A/NetworkStatistics"
-  ];
-  QTKit = [
-    "/System/Library/Frameworks/QTKit.framework"
-    "/System/Library/PrivateFrameworks/CoreMediaAuthoring.framework/Versions/A/CoreMediaAuthoring"
-  ];
-  OSAKit = [
-    "/System/Library/Frameworks/OSAKit.framework"
-    "/usr/lib/libexslt.0.dylib"
-  ];
-  WebKit = [
-    "/System/Library/Frameworks/WebKit.framework"
-  ];
-  DiskArbitration = [
-    "/System/Library/Frameworks/DiskArbitration.framework"
-  ];
-  Security = [
-    "/System/Library/Frameworks/Security.framework"
-    "/usr/lib/libbsm.0.dylib"
-    "/usr/lib/libbz2.1.0.dylib"
-    "/usr/lib/libpam.2.dylib"
-    "/usr/lib/libxar.1.dylib"
-    "/usr/lib/libxml2.2.dylib"
-    "/usr/lib/libsqlite3.dylib"
-  ];
-  GSS = [
-    "/System/Library/Frameworks/GSS.framework"
-  ];
-  Kerberos = [
-    "/System/Library/Frameworks/Kerberos.framework"
-  ];
-  CoreServices = [
-    "/System/Library/Frameworks/CoreServices.framework"
-    "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
-    "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
-    "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
-    "/usr/lib/libmecabra.dylib"
-    "/usr/lib/libcmph.dylib"
-    "/usr/lib/libiconv.2.dylib"
-    "/usr/lib/libxslt.1.dylib"
-  ] ++ Foundation;
-  IOSurface = [
-    "/System/Library/Frameworks/IOSurface.framework"
-  ];
-  CoreGraphics = [
-    "/System/Library/Frameworks/CoreGraphics.framework"
-    "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
-    "/usr/lib/libbsm.0.dylib"
-    "/usr/lib/libz.1.dylib"
-  ];
-  CoreText = [
-    "/System/Library/Frameworks/CoreText.framework"
-  ];
-  ImageIO = [
-    "/System/Library/Frameworks/ImageIO.framework"
-  ];
-  ApplicationServices = [
-    "/System/Library/Frameworks/ApplicationServices.framework"
-    "/usr/lib/libcups.2.dylib"
-    "/usr/lib/libresolv.9.dylib"
-  ] ++ AudioToolbox;
-  OpenGL = [
-    "/System/Library/Frameworks/OpenGL.framework"
-  ];
-  CoreVideo = [
-    "/System/Library/Frameworks/CoreVideo.framework"
-  ];
-  QuartzCore = [
-    "/System/Library/Frameworks/QuartzCore.framework"
-    "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
-  ];
-  PCSC = [
-    "/System/Library/Frameworks/PCSC.framework"
-  ];
-  AppKit = [
-    "/System/Library/Frameworks/AppKit.framework"
-    "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
-    "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
-    "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
-    "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
-    "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
-    "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
-    "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
-    "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
-    "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
-    "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
-    "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
-    "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
-    "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
-    "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
-    "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
-    "/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal"
-    "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/Current"
-    "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
-    "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
-    "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
-    "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
-    "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
-    "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
-    "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
-    "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
-    "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
-    "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
-    "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
-    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
-    "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
-    "/usr/lib/libCRFSuite.dylib"
-    "/usr/lib/libOpenScriptingUtil.dylib"
-    "/usr/lib/libarchive.2.dylib"
-    "/usr/lib/libbsm.0.dylib"
-    "/usr/lib/libbz2.1.0.dylib"
-    "/usr/lib/libc++.1.dylib"
-    "/usr/lib/libc++abi.dylib"
-    "/usr/lib/libcmph.dylib"
-    "/usr/lib/libcups.2.dylib"
-    "/usr/lib/libextension.dylib"
-    "/usr/lib/libheimdal-asn1.dylib"
-    "/usr/lib/libiconv.2.dylib"
-    "/usr/lib/libicucore.A.dylib"
-    "/usr/lib/liblangid.dylib"
-    "/usr/lib/liblzma.5.dylib"
-    "/usr/lib/libmecabra.dylib"
-    "/usr/lib/libpam.2.dylib"
-    "/usr/lib/libresolv.9.dylib"
-    "/usr/lib/libsqlite3.dylib"
-    "/usr/lib/libxar.1.dylib"
-    "/usr/lib/libxml2.2.dylib"
-    "/usr/lib/libxslt.1.dylib"
-    "/usr/lib/libz.1.dylib"
-  ];
-  Foundation = [
-    "/System/Library/Frameworks/Foundation.framework"
-    "/usr/lib/libextension.dylib"
-    "/usr/lib/libarchive.2.dylib"
-    "/usr/lib/liblzma.5.dylib"
-    "/usr/lib/liblangid.dylib"
-    "/usr/lib/libCRFSuite.dylib"
-  ];
-  CoreData = [
-    "/System/Library/Frameworks/CoreData.framework"
-  ];
-  Cocoa = [
-    "/System/Library/Frameworks/Cocoa.framework"
-    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
-    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A"
-  ];
-  Carbon = [
-    "/System/Library/Frameworks/Carbon.framework"
-    "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
-    "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
-    "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
-    "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
-    "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
-    "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
-    "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
-  ];
-  CoreAudio = [
-    "/System/Library/Frameworks/CoreAudio.framework"
-  ];
-  AudioUnit = [
-    "/System/Library/Frameworks/AudioUnit.framework"
-  ];
-  CoreMIDI = [
-    "/System/Library/Frameworks/CoreMIDI.framework"
-  ];
-  AudioToolbox = [
-    "/System/Library/Frameworks/AudioToolbox.framework"
-  ];
-  SystemConfiguration = [
-    "/System/Library/Frameworks/SystemConfiguration.framework"
-  ];
-  NetFS = [
-    "/System/Library/Frameworks/NetFS.framework"
-    "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
-    "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
-  ];
-  Accelerate = [
-    "/System/Library/Frameworks/Accelerate.framework"
-  ];
-  OpenDirectory = [
-    "/System/Library/Frameworks/OpenDirectory.framework"
-  ];
-  ServiceManagement = [
-    "/System/Library/Frameworks/ServiceManagement.framework"
-  ];
-  OpenCL = [
-    "/System/Library/Frameworks/OpenCL.framework"
-  ];
-  CoreWLAN = [
-    "/System/Library/Frameworks/CoreWLAN.framework"
-  ];
-  IOBluetooth = [
-    "/System/Library/Frameworks/IOBluetooth.framework"
-  ] ++ AudioUnit ++ CoreBluetooth;
-  CoreBluetooth = [
-    "/System/Library/Frameworks/CoreBluetooth.framework"
-  ];
-  SecurityFoundation = [
-    "/System/Library/Frameworks/SecurityFoundation.framework"
-  ];
-  Kernel = [
-    "/System/Library/Frameworks/Kernel.framework"
-  ];
-}
diff --git a/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix b/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix
new file mode 100644
index 000000000000..0a0b258998e3
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix
@@ -0,0 +1,14 @@
+{ stdenvNoCC }:
+
+version: pname:
+stdenvNoCC.mkDerivation {
+  inherit pname version;
+
+  buildCommand = ''
+    mkdir -p "$out"
+    echo "Individual frameworks have been deprecated. See the stdenv documentation for how to use `apple-sdk`" \
+        > "$out/README"
+  '';
+
+  passthru.isDarwinCompatStub = true;
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
deleted file mode 100644
index a351c39de130..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-addPrivateFrameworks() {
-    flag="-F/System/Library/PrivateFrameworks"
-    if [[ "${NIX_CFLAGS_COMPILE-}" != *$flag* ]]; then
-        NIX_CFLAGS_COMPILE+=" $flag"
-    fi
-}
-
-addEnvHooks "$hostOffset" addPrivateFrameworks
diff --git a/pkgs/os-specific/darwin/apple-sdk/sdkRoot.nix b/pkgs/os-specific/darwin/apple-sdk/sdkRoot.nix
deleted file mode 100644
index 67d9cbe03105..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/sdkRoot.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  runCommand,
-  writeText,
-  sdkVersion,
-}:
-
-let
-  sdkName = "MacOSX${sdkVersion}";
-  toolchainName = "com.apple.dt.toolchain.XcodeDefault";
-  productBuildVer = null;
-
-  inherit (lib.generators) toPlist toJSON;
-
-  SDKSettings = {
-    CanonicalName = "macosx${sdkVersion}";
-    DisplayName = "macOS ${sdkVersion}";
-    Toolchains = [ toolchainName ];
-    Version = sdkVersion;
-    MaximumDeploymentTarget = "${sdkVersion}.99";
-    isBaseSDK = "YES";
-  };
-
-  SystemVersion =
-    lib.optionalAttrs (productBuildVer != null) { ProductBuildVersion = productBuildVer; }
-    // {
-      ProductName = "macOS";
-      ProductVersion = sdkVersion;
-    };
-in
-runCommand "sdkroot-${sdkVersion}" { } ''
-  sdk="$out/${sdkName}.sdk"
-
-  install -D ${writeText "SDKSettings.plist" (toPlist { } SDKSettings)} "$sdk/SDKSettings.plist"
-  install -D ${writeText "SDKSettings.json" (toJSON { } SDKSettings)} "$sdk/SDKSettings.json"
-  install -D ${
-    writeText "SystemVersion.plist" (toPlist { } SystemVersion)
-  } "$sdk/System/Library/CoreServices/SystemVersion.plist"
-
-  ln -s "$sdk" "$sdk/usr"
-
-  install -D '${../../../build-support/setup-hooks/role.bash}' "$out/nix-support/setup-hook"
-  cat >> "$out/nix-support/setup-hook" <<-hook
-  #
-  # See comments in cc-wrapper's setup hook. This works exactly the same way.
-  #
-  [[ -z \''${strictDeps-} ]] || (( "\$hostOffset" < 0 )) || return 0
-
-  sdkRootHook() {
-    # See ../../../build-support/setup-hooks/role.bash
-    local role_post
-    getHostRoleEnvHook
-
-    # Only set the SDK root if one has not been set via this hook or some other means.
-    if [[ ! \$NIX_CFLAGS_COMPILE =~ isysroot ]]; then
-      export NIX_CFLAGS_COMPILE\''${role_post}+=' -isysroot $out/${sdkName}.sdk'
-    fi
-  }
-
-  # See ../../../build-support/setup-hooks/role.bash
-  getTargetRole
-
-  addEnvHooks "\$targetOffset" sdkRootHook
-
-  # No local scope in sourced file
-  unset -v role_post
-  hook
-''
diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
deleted file mode 100644
index 35cea773f98b..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-noDeprecatedDeclarations() {
-  # Security.framework has about 2000 deprecated constants, all of which the user will be
-  # warned about at compilation time
-  flag="-Wno-deprecated-declarations"
-  if [[ "${NIX_CFLAGS_COMPILE-}" != *$flag* ]]; then
-    NIX_CFLAGS_COMPILE+=" $flag"
-  fi
-}
-
-addEnvHooks "$hostOffset" noDeprecatedDeclarations
diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix
deleted file mode 100644
index c80dd6235e41..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  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 <